From 2fca6831186831a1f2aed27f40c734438ddea044 Mon Sep 17 00:00:00 2001 From: Samuel Nitsche Date: Wed, 23 May 2018 11:50:04 +0200 Subject: [PATCH 0001/1096] Test to verify there's a problem with cursor-comparison on 12.1 when there are several numbers with different precision and we make use of package-level nested table types --- .../test_expectations_cursor.pkb | 28 ++++++++++++++++++- .../test_expectations_cursor.pks | 13 +++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/test/core/expectations/compound_data/test_expectations_cursor.pkb b/test/core/expectations/compound_data/test_expectations_cursor.pkb index b805105e6..45f369e64 100644 --- a/test/core/expectations/compound_data/test_expectations_cursor.pkb +++ b/test/core/expectations/compound_data/test_expectations_cursor.pkb @@ -1040,6 +1040,32 @@ Rows: [ 2 differences ]% ut.expect(sqlcode).to_be_between(-31013,-31011); end; end; - + + procedure compare_number_pckg_type + as + l_expected sys_refcursor; + l_actual sys_refcursor; + l_expected_data t_num_tab; + begin + + l_expected_data(1).col1 := 2135; + l_expected_data(1).col4 := 2016; + l_expected_data(1).col5 := -1; + + open l_expected for select * + from table (l_expected_data); + open l_actual for select + 1 as col1 + ,2 as col2 + ,3 as col3 + ,2016 as col4 + ,-1 as col5 + from dual; + + ut3.ut.expect(l_actual).to_equal(a_expected => l_expected); + + ut.expect(expectations.failed_expectations_data()).not_to_be_null(); + end; + end; / diff --git a/test/core/expectations/compound_data/test_expectations_cursor.pks b/test/core/expectations/compound_data/test_expectations_cursor.pks index 4868b72ce..ae29ea5f9 100644 --- a/test/core/expectations/compound_data/test_expectations_cursor.pks +++ b/test/core/expectations/compound_data/test_expectations_cursor.pks @@ -198,6 +198,19 @@ create or replace package test_expectations_cursor is --%test( Fail on passing implicit column name as exclude filter ) procedure exclude_col_name_implicit; + + --%test( Comparing number types with different precisions works with package-type nested tables ) + procedure compare_number_pckg_type; + + type t_num_rec is record ( + col1 number(15,0), + col2 number(1,0), + col3 number(4,0), + col4 number(4,0), + col5 number(38,0)); + + + type t_num_tab is table of t_num_ec index by binary_integer; end; / From e528ebbadece32f35c72cba2521f286492a54a9e Mon Sep 17 00:00:00 2001 From: Samuel Nitsche Date: Wed, 23 May 2018 12:18:58 +0200 Subject: [PATCH 0002/1096] Typo --- .../expectations/compound_data/test_expectations_cursor.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/core/expectations/compound_data/test_expectations_cursor.pks b/test/core/expectations/compound_data/test_expectations_cursor.pks index ae29ea5f9..eb93bd08c 100644 --- a/test/core/expectations/compound_data/test_expectations_cursor.pks +++ b/test/core/expectations/compound_data/test_expectations_cursor.pks @@ -210,7 +210,7 @@ create or replace package test_expectations_cursor is col5 number(38,0)); - type t_num_tab is table of t_num_ec index by binary_integer; + type t_num_tab is table of t_num_rec index by binary_integer; end; / From a966451e2c3983e3fc82f6f4102701f46455f86b Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 25 Sep 2018 00:36:08 +0100 Subject: [PATCH 0003/1096] Added cardinality to SQL on xmltable to avoid excessive estimates. Resolves #752 --- .../data_values/ut_compound_data_helper.pkb | 57 ++++++++++--------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index ee01819d6..19a534ebc 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -95,37 +95,39 @@ create or replace package body ut_compound_data_helper is with expected_cols as ( select :a_expected as item_data from dual ), actual_cols as ( select :a_actual as item_data from dual ), - expected_cols_info as ( - select e.*, + expected_cols_info as ( + select /*+ cardinality(e 100) */ + e.*, replace(expected_type,'VARCHAR2','CHAR') expected_type_compare from ( - SELECT rownum expected_pos, - xt.name expected_name, - xt.type expected_type - FROM (select ]'||l_column_filter||q'[ from expected_cols ucd) x, - XMLTABLE('/ROW/*' - PASSING x.item_data - COLUMNS - name VARCHAR2(4000) PATH '@xml_valid_name', - type VARCHAR2(4000) PATH '/' - ) xt - ) e + select rownum expected_pos, + xt.name expected_name, + xt.type expected_type + from (select ]'||l_column_filter||q'[ from expected_cols ucd) x, + xmltable( + '/ROW/*' + passing x.item_data + columns + name varchar2(4000) PATH '@xml_valid_name', + type varchar2(4000) PATH '/' + ) xt + ) e ), actual_cols_info as ( - select a.*, + select /*+ cardinality(a 100) */ + a.*, replace(actual_type,'VARCHAR2','CHAR') actual_type_compare - from ( - SELECT rownum actual_pos, - xt.name actual_name, - xt.type actual_type - FROM (select ]'||l_column_filter||q'[ from actual_cols ucd) x, - XMLTABLE('/ROW/*' - PASSING x.item_data - COLUMNS - name VARCHAR2(4000) PATH '@xml_valid_name', - type VARCHAR2(4000) PATH '/' - ) xt - ) a + from (select rownum actual_pos, + xt.name actual_name, + xt.type actual_type + from (select ]'||l_column_filter||q'[ from actual_cols ucd) x, + xmltable('/ROW/*' + passing x.item_data + columns + name varchar2(4000) path '@xml_valid_name', + type varchar2(4000) path '/' + ) xt + ) a ), joined_cols as ( select e.*, a.*, @@ -134,7 +136,8 @@ create or replace package body ut_compound_data_helper is from expected_cols_info e full outer join actual_cols_info a on e.expected_name = a.actual_name ) - select case + select /*+ cardinality(joined_cols 100)*/ + case when expected_pos is null and actual_pos is not null then '+' when expected_pos is not null and actual_pos is null then '-' when expected_type_compare != actual_type_compare then 't' From eb0dab742764d52731a9eb932ee00d29e736aad2 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 25 Sep 2018 12:07:27 +0100 Subject: [PATCH 0004/1096] Additional cardinality hint. --- .../expectations/data_values/ut_compound_data_helper.pkb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 19a534ebc..92d9fb399 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -91,6 +91,7 @@ create or replace package body ut_compound_data_helper is l_results tt_column_diffs; begin l_column_filter := get_columns_row_filter(a_exclude_xpath, a_include_xpath); + --CARDINALITY hints added to address issue: https://github.com/utPLSQL/utPLSQL/issues/752 l_sql := q'[ with expected_cols as ( select :a_expected as item_data from dual ), @@ -100,7 +101,8 @@ create or replace package body ut_compound_data_helper is e.*, replace(expected_type,'VARCHAR2','CHAR') expected_type_compare from ( - select rownum expected_pos, + select /*+ cardinality(xt 100) */ + rownum expected_pos, xt.name expected_name, xt.type expected_type from (select ]'||l_column_filter||q'[ from expected_cols ucd) x, @@ -117,7 +119,8 @@ create or replace package body ut_compound_data_helper is select /*+ cardinality(a 100) */ a.*, replace(actual_type,'VARCHAR2','CHAR') actual_type_compare - from (select rownum actual_pos, + from (select /*+ cardinality(xt 100) */ + rownum actual_pos, xt.name actual_name, xt.type actual_type from (select ]'||l_column_filter||q'[ from actual_cols ucd) x, From 0f592e6572e31da1be19435b88752eedd78f6ff4 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 25 Sep 2018 23:44:54 +0100 Subject: [PATCH 0005/1096] Cleanup of cardinality hints. --- .../data_values/ut_compound_data_helper.pkb | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 92d9fb399..e6665bd10 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -97,11 +97,10 @@ create or replace package body ut_compound_data_helper is expected_cols as ( select :a_expected as item_data from dual ), actual_cols as ( select :a_actual as item_data from dual ), expected_cols_info as ( - select /*+ cardinality(e 100) */ - e.*, + select e.*, replace(expected_type,'VARCHAR2','CHAR') expected_type_compare from ( - select /*+ cardinality(xt 100) */ + select /*+ CARDINALITY(xt 100) */ rownum expected_pos, xt.name expected_name, xt.type expected_type @@ -116,10 +115,9 @@ create or replace package body ut_compound_data_helper is ) e ), actual_cols_info as ( - select /*+ cardinality(a 100) */ - a.*, + select a.*, replace(actual_type,'VARCHAR2','CHAR') actual_type_compare - from (select /*+ cardinality(xt 100) */ + from (select /*+ CARDINALITY(xt 100) */ rownum actual_pos, xt.name actual_name, xt.type actual_type @@ -139,8 +137,7 @@ create or replace package body ut_compound_data_helper is from expected_cols_info e full outer join actual_cols_info a on e.expected_name = a.actual_name ) - select /*+ cardinality(joined_cols 100)*/ - case + select case when expected_pos is null and actual_pos is not null then '+' when expected_pos is not null and actual_pos is null then '-' when expected_type_compare != actual_type_compare then 't' From a6e4e6aafb338b969a2c413f29858fd5e8af3488 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Wed, 26 Sep 2018 00:43:00 +0000 Subject: [PATCH 0006/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index ae2f6710f..a96253c58 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.3.2245-develop'; + gc_version constant varchar2(50) := 'v3.1.3.2251-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From 42d8d456a295e1e87c92780aea45edec09a877cf Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sat, 6 Oct 2018 13:02:16 +0100 Subject: [PATCH 0007/1096] Initial check in --- .../data_values/ut_compound_data_value.tpb | 42 ++++++++++++++----- .../data_values/ut_compound_data_value.tps | 3 +- .../data_values/ut_data_value_refcursor.tpb | 11 +++-- .../data_values/ut_data_value_refcursor.tps | 3 +- source/expectations/ut_expectation.tpb | 20 +++++++++ source/expectations/ut_expectation.tps | 9 +++- .../expectations/ut_expectation_compound.tpb | 31 +++++++++++++- .../expectations/ut_expectation_compound.tps | 6 +++ 8 files changed, 107 insertions(+), 18 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index 113c5153e..9f3fd078d 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -194,7 +194,8 @@ create or replace type body ut_compound_data_value as return l_result; end; - member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean ) return integer is + member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, + a_unordered boolean , a_inclusion_compare boolean := false ) return integer is l_other ut_compound_data_value; l_ut_owner varchar2(250) := ut_utils.ut_owner; l_column_filter varchar2(32767); @@ -249,7 +250,11 @@ create or replace type body ut_compound_data_value as tgt.pk_hash = src.pk_hash ]' using a_exclude_xpath, a_include_xpath,a_join_by_xpath,self.data_id, l_other.data_id; - /* Peform minus on two sets two get diffrences that will be used later on to print results */ + /*!* + * Comparision is based on type of search, for inclusion based search we will look for left join only. + * For normal two side diff we will peform minus on two sets two get diffrences. + * SELF is expected + */ execute immediate 'insert into ' || l_ut_owner || '.ut_compound_data_diff_tmp ( diff_id,item_hash,pk_hash,duplicate_no) with source_data as ( select t.data_id,t.item_hash,row_number() over (partition by t.pk_hash,t.item_hash,t.data_id order by 1,2) duplicate_no, @@ -258,30 +263,47 @@ create or replace type body ut_compound_data_value as where data_id = :self_guid or data_id = :other_guid ) select distinct :diff_id,tmp.item_hash,tmp.pk_hash,tmp.duplicate_no - from( + from( ( select t.item_hash,t. duplicate_no,t.pk_hash from source_data t - where t.data_id = :self_guid + where t.data_id = :other_guid minus select t.item_hash,t. duplicate_no,t.pk_hash from source_data t - where t.data_id = :other_guid + where t.data_id = :self_guid ) union all ( select t.item_hash,t. duplicate_no,t.pk_hash from source_data t - where t.data_id = :other_guid + where t.data_id = :self_guid ' + || + case when a_inclusion_compare then + ' and 1 = 2 ' + else + null + end || + ' minus select t.item_hash,t. duplicate_no,t.pk_hash from source_data t - where t.data_id = :self_guid - ))tmp' + where t.data_id = :other_guid ' + || + case when a_inclusion_compare then + ' and 1 = 2 ' + else + null + end || + ' + ) + ) + tmp' using self.data_id, l_other.data_id, l_diff_id, - self.data_id, l_other.data_id, - l_other.data_id,self.data_id; + l_other.data_id,self.data_id, + self.data_id, l_other.data_id; + --result is OK only if both are same if sql%rowcount = 0 and self.elements_count = l_other.elements_count then l_result := 0; diff --git a/source/expectations/data_values/ut_compound_data_value.tps b/source/expectations/data_values/ut_compound_data_value.tps index bf942c92e..f1c4e6529 100644 --- a/source/expectations/data_values/ut_compound_data_value.tps +++ b/source/expectations/data_values/ut_compound_data_value.tps @@ -44,6 +44,7 @@ create or replace type ut_compound_data_value force under ut_data_value( overriding member function diff( a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean := false ) return varchar2, member function get_data_diff(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean) return clob, member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2) return integer, - member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean ) return integer + member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, + a_unordered boolean , a_inclusion_compare boolean := false) return integer ) not final not instantiable / diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 1c7619be0..12bacd70b 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -220,7 +220,8 @@ create or replace type body ut_data_value_refcursor as return l_result_string; end; - overriding member function compare_implementation (a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean) return integer is + overriding member function compare_implementation (a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, + a_unordered boolean, a_inclusion_compare boolean := false) return integer is l_result integer := 0; l_other ut_data_value_refcursor; function is_pk_missing (a_pk_missing_tab ut_compound_data_helper.tt_missing_pk) return integer is @@ -236,7 +237,8 @@ create or replace type body ut_data_value_refcursor as --if we join by key and key is missing fail and report error if a_join_by_xpath is not null then - l_result := is_pk_missing(ut_compound_data_helper.is_pk_exists(self.key_info, l_other.key_info, a_exclude_xpath, a_include_xpath,a_join_by_xpath)); + l_result := is_pk_missing(ut_compound_data_helper.is_pk_exists(self.key_info, l_other.key_info, a_exclude_xpath, + a_include_xpath,a_join_by_xpath)); end if; if l_result = 0 then @@ -246,9 +248,10 @@ create or replace type body ut_data_value_refcursor as then l_result := 1; end if; - + if a_unordered then - l_result := l_result + (self as ut_compound_data_value).compare_implementation(a_other, a_exclude_xpath, a_include_xpath, a_join_by_xpath, a_unordered); + l_result := l_result + (self as ut_compound_data_value).compare_implementation(a_other, a_exclude_xpath, a_include_xpath, + a_join_by_xpath, a_unordered, a_inclusion_compare); else l_result := l_result + (self as ut_compound_data_value).compare_implementation(a_other, a_exclude_xpath, a_include_xpath); end if; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tps b/source/expectations/data_values/ut_data_value_refcursor.tps index 02ded0b39..38582224f 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tps +++ b/source/expectations/data_values/ut_data_value_refcursor.tps @@ -44,7 +44,8 @@ create or replace type ut_data_value_refcursor under ut_compound_data_value( member procedure init(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor), overriding member function to_string return varchar2, overriding member function diff( a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean := false ) return varchar2, - overriding member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean) return integer, + overriding member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, + a_unordered boolean, a_inclusion_compare boolean := false) return integer, overriding member function is_empty return boolean ) diff --git a/source/expectations/ut_expectation.tpb b/source/expectations/ut_expectation.tpb index 26e0c1092..0ca9c406b 100644 --- a/source/expectations/ut_expectation.tpb +++ b/source/expectations/ut_expectation.tpb @@ -679,5 +679,25 @@ create or replace type body ut_expectation as self.not_to( ut_be_less_than (a_expected) ); end; + member procedure to_include(self in ut_expectation, a_expected sys_refcursor) is + begin + self.to_( ut_include(a_expected) ); + end; + + member procedure to_contain(self in ut_expectation, a_expected sys_refcursor) is + begin + self.to_( ut_include(a_expected) ); + end; + + member procedure not_to_include(self in ut_expectation, a_expected sys_refcursor) is + begin + self.not_to( ut_include(a_expected) ); + end; + + member procedure not_to_contain(self in ut_expectation, a_expected sys_refcursor) is + begin + self.not_to( ut_include(a_expected) ); + end; + end; / diff --git a/source/expectations/ut_expectation.tps b/source/expectations/ut_expectation.tps index d27a18377..99183d022 100644 --- a/source/expectations/ut_expectation.tps +++ b/source/expectations/ut_expectation.tps @@ -158,7 +158,14 @@ create or replace type ut_expectation authid current_user as object( member procedure not_to_be_less_than(self in ut_expectation, a_expected timestamp_unconstrained), member procedure not_to_be_less_than(self in ut_expectation, a_expected timestamp_ltz_unconstrained), member procedure not_to_be_less_than(self in ut_expectation, a_expected timestamp_tz_unconstrained), - member procedure not_to_be_less_than(self in ut_expectation, a_expected yminterval_unconstrained) + member procedure not_to_be_less_than(self in ut_expectation, a_expected yminterval_unconstrained), + + member procedure to_include(self in ut_expectation, a_expected sys_refcursor), + member procedure to_contain(self in ut_expectation, a_expected sys_refcursor), + + member procedure not_to_include(self in ut_expectation, a_expected sys_refcursor), + member procedure not_to_contain(self in ut_expectation, a_expected sys_refcursor) + ) not final / diff --git a/source/expectations/ut_expectation_compound.tpb b/source/expectations/ut_expectation_compound.tpb index c620ec39c..cee16bdbd 100644 --- a/source/expectations/ut_expectation_compound.tpb +++ b/source/expectations/ut_expectation_compound.tpb @@ -34,7 +34,6 @@ create or replace type body ut_expectation_compound as self.not_to( ut_be_empty() ); end; - member procedure to_have_count(self in ut_expectation_compound, a_expected integer) is begin self.to_( ut_have_count(a_expected) ); @@ -76,6 +75,36 @@ create or replace type body ut_expectation_compound as return l_result; end; + member function to_include(a_expected sys_refcursor) return ut_expectation_compound is + l_result ut_expectation_compound := self; + begin + l_result.matcher := ut_include(a_expected); + return l_result; + end; + + member function to_contain(a_expected sys_refcursor) return ut_expectation_compound is + l_result ut_expectation_compound := self; + begin + l_result.matcher := ut_include(a_expected); + return l_result; + end; + + member function not_to_include(a_expected sys_refcursor) return ut_expectation_compound is + l_result ut_expectation_compound := self; + begin + l_result.matcher := ut_include(a_expected); + l_result.negated := ut_utils.boolean_to_int(true); + return l_result; + end; + + member function not_to_contain(a_expected sys_refcursor) return ut_expectation_compound is + l_result ut_expectation_compound := self; + begin + l_result.matcher := ut_include(a_expected); + l_result.negated := ut_utils.boolean_to_int(true); + return l_result; + end; + member function include(a_items varchar2) return ut_expectation_compound is l_result ut_expectation_compound; begin diff --git a/source/expectations/ut_expectation_compound.tps b/source/expectations/ut_expectation_compound.tps index 529b8875d..15b1874fe 100644 --- a/source/expectations/ut_expectation_compound.tps +++ b/source/expectations/ut_expectation_compound.tps @@ -29,6 +29,12 @@ create or replace type ut_expectation_compound under ut_expectation( member function to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_compound, member function not_to_equal(a_expected anydata, a_nulls_are_equal boolean := null) return ut_expectation_compound, member function not_to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_compound, + + member function to_include(a_expected sys_refcursor) return ut_expectation_compound, + member function to_contain(a_expected sys_refcursor) return ut_expectation_compound, + member function not_to_include(a_expected sys_refcursor) return ut_expectation_compound, + member function not_to_contain(a_expected sys_refcursor) return ut_expectation_compound, + member function include(a_items varchar2) return ut_expectation_compound, member function include(a_items ut_varchar2_list) return ut_expectation_compound, member procedure include(self in ut_expectation_compound, a_items varchar2), From 2360ca4f00be24b42d5b748eed216c973d973a95 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sat, 6 Oct 2018 13:27:58 +0100 Subject: [PATCH 0008/1096] First working stab. No messages defined. --- .../data_values/ut_compound_data_value.tpb | 24 ++++++++++++------- source/expectations/matchers/ut_equal.tps | 4 ++-- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index 9f3fd078d..8e0001455 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -204,6 +204,7 @@ create or replace type body ut_compound_data_value as l_row_diffs ut_compound_data_helper.tt_row_diffs; c_max_rows constant integer := 20; + l_test varchar2(32000); function get_column_pk_hash(a_join_by_xpath varchar2) return varchar2 is l_column varchar2(32767); begin @@ -267,17 +268,17 @@ create or replace type body ut_compound_data_value as ( select t.item_hash,t. duplicate_no,t.pk_hash from source_data t - where t.data_id = :other_guid + where t.data_id = :self_guid minus select t.item_hash,t. duplicate_no,t.pk_hash from source_data t - where t.data_id = :self_guid + where t.data_id = :other_guid ) union all ( select t.item_hash,t. duplicate_no,t.pk_hash from source_data t - where t.data_id = :self_guid ' + where t.data_id = :other_guid ' || case when a_inclusion_compare then ' and 1 = 2 ' @@ -288,7 +289,7 @@ create or replace type body ut_compound_data_value as minus select t.item_hash,t. duplicate_no,t.pk_hash from source_data t - where t.data_id = :other_guid ' + where t.data_id = :self_guid ' || case when a_inclusion_compare then ' and 1 = 2 ' @@ -301,11 +302,16 @@ create or replace type body ut_compound_data_value as tmp' using self.data_id, l_other.data_id, l_diff_id, - l_other.data_id,self.data_id, - self.data_id, l_other.data_id; - - --result is OK only if both are same - if sql%rowcount = 0 and self.elements_count = l_other.elements_count then + self.data_id, l_other.data_id, + l_other.data_id,self.data_id; + + /*!* + * Result OK when is not inclusion matcher and both are the same + * Resullt OK when is inclusion matcher and left contains right set + */ + if sql%rowcount = 0 and self.elements_count = l_other.elements_count and not(a_inclusion_compare ) then + l_result := 0; + elsif sql%rowcount = 0 and a_inclusion_compare then l_result := 0; else l_result := 1; diff --git a/source/expectations/matchers/ut_equal.tps b/source/expectations/matchers/ut_equal.tps index 9968dba7f..ce2c9ed92 100644 --- a/source/expectations/matchers/ut_equal.tps +++ b/source/expectations/matchers/ut_equal.tps @@ -1,4 +1,4 @@ -create or replace type ut_equal under ut_comparison_matcher( +create or replace type ut_equal force under ut_comparison_matcher( /* utPLSQL - Version 3 Copyright 2016 - 2018 utPLSQL Project @@ -70,4 +70,4 @@ create or replace type ut_equal under ut_comparison_matcher( overriding member function failure_message(a_actual ut_data_value) return varchar2, overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2 ) -/ +not final From dd639709f1f8cbb980a16b73045720ae375fcaca Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sat, 6 Oct 2018 15:03:25 +0100 Subject: [PATCH 0009/1096] Include matcher --- .../data_values/ut_compound_data_helper.pkb | 87 +++++++++++++++++++ .../data_values/ut_compound_data_helper.pks | 2 + .../data_values/ut_compound_data_value.tpb | 64 +++----------- 3 files changed, 101 insertions(+), 52 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index e6665bd10..4193c7f4a 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -540,5 +540,92 @@ create or replace package body ut_compound_data_helper is return l_no_missing_keys; end; + function get_unordered(a_owner in varchar2) return varchar2 is + l_sql varchar2(32767); + begin + l_sql := 'with source_data as + ( select t.data_id,t.item_hash,row_number() over (partition by t.pk_hash,t.item_hash,t.data_id order by 1,2) duplicate_no, + pk_hash + from ' || a_owner || '.ut_compound_data_tmp t + where data_id = :self_guid or data_id = :other_guid + ) + select distinct :diff_id,tmp.item_hash,tmp.pk_hash,tmp.duplicate_no + from( + ( + select t.item_hash,t. duplicate_no,t.pk_hash + from source_data t + where t.data_id = :self_guid + minus + select t.item_hash,t. duplicate_no,t.pk_hash + from source_data t + where t.data_id = :other_guid + ) + union all + ( + select t.item_hash,t. duplicate_no,t.pk_hash + from source_data t + where t.data_id = :other_guid + minus + select t.item_hash,t. duplicate_no,t.pk_hash + from source_data t + where t.data_id = :self_guid + ))tmp'; + return l_sql; + end; + + function get_inclusion_matcher_sql(a_owner in varchar2) return varchar2 is + l_sql varchar2(32767); + begin + l_sql := 'with source_data as + ( select t.data_id,t.item_hash,row_number() over (partition by t.pk_hash,t.item_hash,t.data_id order by 1,2) duplicate_no, + pk_hash + from ' || a_owner || '.ut_compound_data_tmp t + where data_id = :self_guid or data_id = :other_guid + ) + select distinct :diff_id,tmp.item_hash,tmp.pk_hash,tmp.duplicate_no + from( + ( + select t.item_hash,t. duplicate_no,t.pk_hash + from source_data t + where t.data_id = :self_guid + minus + select t.item_hash,t. duplicate_no,t.pk_hash + from source_data t + where t.data_id = :other_guid + ) + union all + ( + select t.item_hash,t. duplicate_no,t.pk_hash + from source_data t, + source_data s + where t.data_id = :other_guid + and s.data_id = :self_guid + and t.pk_hash = s.pk_hash + ) + ) + tmp'; + return l_sql; + end; + + function get_inclusion_matcher_not_sql(a_owner in varchar2) return varchar2 is + begin + null; + end; + + function get_refcursor_matcher_sql(a_owner in varchar2,a_inclusion_matcher boolean := false, a_negated_match boolean := false) return varchar2 is + l_sql varchar2(32767); + begin + l_sql := 'insert into ' || a_owner || '.ut_compound_data_diff_tmp ( diff_id,item_hash,pk_hash,duplicate_no)'||chr(10); + if a_inclusion_matcher and not(a_negated_match) then + l_sql := l_sql || get_inclusion_matcher_sql(a_owner); + elsif a_inclusion_matcher and a_negated_match then + null; + elsif not(a_inclusion_matcher) then + l_sql := l_sql || get_unordered(a_owner); + end if; + + return l_sql; + end; + end; / diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index ab3693920..32512e391 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -81,5 +81,7 @@ create or replace package ut_compound_data_helper authid definer is function is_pk_exists(a_expected_cursor xmltype, a_actual_cursor xmltype, a_exclude_xpath varchar2, a_include_xpath varchar2,a_join_by_xpath varchar2) return tt_missing_pk; + function get_refcursor_matcher_sql(a_owner in varchar2,a_inclusion_matcher boolean := false, a_negated_match boolean := false) return varchar2; + end; / diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index 8e0001455..a9c101ade 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -202,9 +202,9 @@ create or replace type body ut_compound_data_value as l_diff_id ut_compound_data_helper.t_hash; l_result integer; l_row_diffs ut_compound_data_helper.tt_row_diffs; - c_max_rows constant integer := 20; + c_max_rows constant integer := 20; + l_sql varchar2(32767); - l_test varchar2(32000); function get_column_pk_hash(a_join_by_xpath varchar2) return varchar2 is l_column varchar2(32767); begin @@ -254,56 +254,16 @@ create or replace type body ut_compound_data_value as /*!* * Comparision is based on type of search, for inclusion based search we will look for left join only. * For normal two side diff we will peform minus on two sets two get diffrences. - * SELF is expected + * SELF is expected. + * Due to growing complexity I have moved a dynamic SQL into helper package. */ - execute immediate 'insert into ' || l_ut_owner || '.ut_compound_data_diff_tmp ( diff_id,item_hash,pk_hash,duplicate_no) - with source_data as - ( select t.data_id,t.item_hash,row_number() over (partition by t.pk_hash,t.item_hash,t.data_id order by 1,2) duplicate_no, - pk_hash - from ' || l_ut_owner || '.ut_compound_data_tmp t - where data_id = :self_guid or data_id = :other_guid - ) - select distinct :diff_id,tmp.item_hash,tmp.pk_hash,tmp.duplicate_no - from( - ( - select t.item_hash,t. duplicate_no,t.pk_hash - from source_data t - where t.data_id = :self_guid - minus - select t.item_hash,t. duplicate_no,t.pk_hash - from source_data t - where t.data_id = :other_guid - ) - union all - ( - select t.item_hash,t. duplicate_no,t.pk_hash - from source_data t - where t.data_id = :other_guid ' - || - case when a_inclusion_compare then - ' and 1 = 2 ' - else - null - end || - ' - minus - select t.item_hash,t. duplicate_no,t.pk_hash - from source_data t - where t.data_id = :self_guid ' - || - case when a_inclusion_compare then - ' and 1 = 2 ' - else - null - end || - ' - ) - ) - tmp' - using self.data_id, l_other.data_id, - l_diff_id, - self.data_id, l_other.data_id, - l_other.data_id,self.data_id; + l_sql := ut_compound_data_helper.get_refcursor_matcher_sql(l_ut_owner,a_inclusion_compare); + + execute immediate l_sql + using self.data_id, l_other.data_id, + l_diff_id, + self.data_id, l_other.data_id, + l_other.data_id,self.data_id; /*!* * Result OK when is not inclusion matcher and both are the same @@ -311,7 +271,7 @@ create or replace type body ut_compound_data_value as */ if sql%rowcount = 0 and self.elements_count = l_other.elements_count and not(a_inclusion_compare ) then l_result := 0; - elsif sql%rowcount = 0 and a_inclusion_compare then + elsif sql%rowcount = 0 and a_inclusion_compare then l_result := 0; else l_result := 1; From 81240fbeb7507e11435fab4f01be51eba549a961 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sat, 6 Oct 2018 15:26:57 +0100 Subject: [PATCH 0010/1096] Updated install and deinstall --- source/expectations/matchers/ut_include.tpb | 65 +++++++++++++++++++++ source/expectations/matchers/ut_include.tps | 25 ++++++++ source/install.sql | 2 + source/uninstall_objects.sql | 2 + 4 files changed, 94 insertions(+) create mode 100644 source/expectations/matchers/ut_include.tpb create mode 100644 source/expectations/matchers/ut_include.tps diff --git a/source/expectations/matchers/ut_include.tpb b/source/expectations/matchers/ut_include.tpb new file mode 100644 index 000000000..cb6eedcda --- /dev/null +++ b/source/expectations/matchers/ut_include.tpb @@ -0,0 +1,65 @@ +create or replace type body ut_include as + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + member procedure init(self in out nocopy ut_include, a_expected ut_data_value) is + begin + self.self_type := $$plsql_unit; + self.expected := a_expected; + self.include_list := ut_varchar2_list(); + self.exclude_list := ut_varchar2_list(); + self.join_columns := ut_varchar2_list(); + end; + + constructor function ut_include(self in out nocopy ut_include, a_expected sys_refcursor) return self as result is + begin + init(ut_data_value_refcursor(a_expected)); + return; + end; + + member function get_inclusion_compare return boolean is + begin + return true; + end; + + overriding member function run_matcher(self in out nocopy ut_include, a_actual ut_data_value) return boolean is + l_result boolean; + begin + if self.expected.data_type = a_actual.data_type then + l_result := 0 = treat(self.expected as ut_data_value_refcursor).compare_implementation(a_actual, self.get_exclude_xpath(), self.get_include_xpath(), self.get_join_by_xpath(), + true,get_inclusion_compare()); + else + l_result := (self as ut_matcher).run_matcher(a_actual); + end if; + return l_result; + end; + + overriding member function failure_message(a_actual ut_data_value) return varchar2 is + l_result varchar2(32767); + begin + if self.expected.data_type = a_actual.data_type and self.expected.is_diffable then + l_result := + 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() + || chr(10) || 'Diff:' || expected.diff(a_actual, self.get_exclude_xpath(), self.get_include_xpath(), self.get_join_by_xpath(), true); + else + l_result := (self as ut_matcher).failure_message(a_actual) || ': '|| self.expected.to_string_report(); + end if; + return l_result; + end; + +end; +/ diff --git a/source/expectations/matchers/ut_include.tps b/source/expectations/matchers/ut_include.tps new file mode 100644 index 000000000..2896832be --- /dev/null +++ b/source/expectations/matchers/ut_include.tps @@ -0,0 +1,25 @@ +create or replace type ut_include under ut_equal( + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + member procedure init(self in out nocopy ut_include, a_expected ut_data_value), + constructor function ut_include(self in out nocopy ut_include, a_expected sys_refcursor) return self as result, + member function get_inclusion_compare return boolean, + overriding member function run_matcher(self in out nocopy ut_include, a_actual ut_data_value) return boolean, + overriding member function failure_message(a_actual ut_data_value) return varchar2 +) +/ diff --git a/source/install.sql b/source/install.sql index 902b45aba..b58fb4e24 100644 --- a/source/install.sql +++ b/source/install.sql @@ -203,6 +203,7 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/matchers/ut_be_null.tps' @@install_component.sql 'expectations/matchers/ut_be_true.tps' @@install_component.sql 'expectations/matchers/ut_equal.tps' +@@install_component.sql 'expectations/matchers/ut_include.tps' @@install_component.sql 'expectations/matchers/ut_have_count.tps' @@install_component.sql 'expectations/matchers/ut_be_between.tps' @@install_component.sql 'expectations/matchers/ut_be_empty.tps' @@ -241,6 +242,7 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/matchers/ut_be_null.tpb' @@install_component.sql 'expectations/matchers/ut_be_true.tpb' @@install_component.sql 'expectations/matchers/ut_equal.tpb' +@@install_component.sql 'expectations/matchers/ut_include.tpb' @@install_component.sql 'expectations/matchers/ut_have_count.tpb' @@install_component.sql 'expectations/matchers/ut_be_between.tpb' @@install_component.sql 'expectations/matchers/ut_be_empty.tpb' diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index cf8b3905f..0e059be56 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -69,6 +69,8 @@ drop type ut_match force; drop type ut_be_between force; +drop type ut_include force; + drop type ut_equal force; drop type ut_be_true force; From 440670b25396dfd63854cfb7e3a6bbe484c78ef3 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Wed, 10 Oct 2018 18:21:19 +0100 Subject: [PATCH 0011/1096] Update install --- source/expectations/matchers/ut_equal.tps | 1 + 1 file changed, 1 insertion(+) diff --git a/source/expectations/matchers/ut_equal.tps b/source/expectations/matchers/ut_equal.tps index ce2c9ed92..a2b984c63 100644 --- a/source/expectations/matchers/ut_equal.tps +++ b/source/expectations/matchers/ut_equal.tps @@ -71,3 +71,4 @@ create or replace type ut_equal force under ut_comparison_matcher( overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2 ) not final +/ \ No newline at end of file From a0ee1953c349a8155dd8462d9ae629ebdbf43b47 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Thu, 11 Oct 2018 12:17:51 +0100 Subject: [PATCH 0012/1096] Added tests for include --- .../data_values/ut_compound_data_helper.pkb | 4 +- .../data_values/ut_compound_data_value.tpb | 8 +- .../expectations/test_expectations_cursor.pkb | 143 ++++++++++++++++++ .../expectations/test_expectations_cursor.pks | 24 +++ 4 files changed, 172 insertions(+), 7 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 4193c7f4a..136ab1884 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -176,7 +176,6 @@ create or replace package body ut_compound_data_helper is l_results tt_row_diffs; begin l_column_filter := get_columns_row_filter(a_exclude_xpath,a_include_xpath); - /** * Since its unordered search we cannot select max rows from diffs as we miss some comparision records * We will restrict output on higher level of select @@ -600,7 +599,8 @@ create or replace package body ut_compound_data_helper is source_data s where t.data_id = :other_guid and s.data_id = :self_guid - and t.pk_hash = s.pk_hash + and t.pk_hash = s.pk_hash + and t.item_hash != s.item_hash ) ) tmp'; diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index a9c101ade..38fe9ebc4 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -107,7 +107,6 @@ create or replace type body ut_compound_data_value as l_actual := treat(a_other as ut_compound_data_value); dbms_lob.createtemporary(l_result,true); - --diff rows and row elements l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_actual.data_id); @@ -115,7 +114,6 @@ create or replace type body ut_compound_data_value as execute immediate 'select count('||case when a_join_by_xpath is not null then 'distinct pk_hash' else '*' end||') from ' || l_ut_owner || '.ut_compound_data_diff_tmp where diff_id = :diff_id' into l_diff_row_count using l_diff_id; - if l_diff_row_count > 0 then l_compare_type := ut_compound_data_helper.compare_type(a_join_by_xpath,a_unordered); l_row_diffs := ut_compound_data_helper.get_rows_diff( @@ -224,7 +222,7 @@ create or replace type body ut_compound_data_value as if not a_other is of (ut_compound_data_value) then raise value_error; end if; - + l_other := treat(a_other as ut_compound_data_value); l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); @@ -264,11 +262,11 @@ create or replace type body ut_compound_data_value as l_diff_id, self.data_id, l_other.data_id, l_other.data_id,self.data_id; - + /*!* * Result OK when is not inclusion matcher and both are the same * Resullt OK when is inclusion matcher and left contains right set - */ + */ if sql%rowcount = 0 and self.elements_count = l_other.elements_count and not(a_inclusion_compare ) then l_result := 0; elsif sql%rowcount = 0 and a_inclusion_compare then diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index d18cef5fb..3cded1aec 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -1986,6 +1986,149 @@ Diff:% ut.expect(l_actual_message).to_be_like(l_expected_message); end; + + procedure cursor_contain is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + begin + --Arrange + open l_actual for select owner, object_name,object_type from all_objects where owner = user + order by 1,2,3 asc; + open l_expected for select owner, object_name,object_type from all_objects where owner = user + and rownum < 20; + + --Act + ut3.ut.expect(l_actual).to_include(l_expected); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure cursor_contain_fail is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + --Arrange + open l_actual for select owner, object_name,object_type from all_objects where owner = user + and rownum < 5; + open l_expected for select owner, object_name,object_type from all_objects where owner = user + and rownum < 10; + + --Act + ut3.ut.expect(l_actual).to_include(l_expected); + --Assert + l_expected_message := q'[%Actual: refcursor [ count = 4 ] was expected to include: refcursor [ count = 9 ] +%Diff: +%Rows: [ 5 differences ] +%Missing: %%% +%Missing: %%% +%Missing: %%% +%Missing: %%% +%Missing: %%%%]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure cursor_contain_joinby is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + begin + --Arrange + open l_actual for select username,user_id from all_users; + open l_expected for select username ,user_id from all_users where rownum < 5; + + --Act + ut3.ut.expect(l_actual).to_include(l_expected).join_by('USERNAME'); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + procedure cursor_contain_joinby_fail is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + --Arrange + open l_actual for select username, user_id from all_users + union all + select 'TEST' username, -600 user_id from dual + order by 1 desc; + open l_expected for select username, user_id from all_users + union all + select 'TEST' username, -601 user_id from dual + order by 1 asc; + + --Act + ut3.ut.expect(l_actual).to_include(l_expected).join_by('USERNAME'); + --Assert + l_expected_message := q'[%Actual: refcursor [ count = % ] was expected to include: refcursor [ count = % ] +%Diff: +%Rows: [ 1 differences ] +%PK TEST - Actual: -600 +%PK TEST - Expected: -601%]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + + end; + + procedure contain_incl_cols_as_list + as + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + --Arrange + open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 6; + open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; + --Act + ut3.ut.expect(l_actual).to_include(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure contain_join_incl_cols_as_lst + as + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + --Arrange + open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 10; + open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; + --Act + ut3.ut.expect(l_actual).to_include(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')).join_by('RN'); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure contain_join_excl_cols_as_lst + as + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + --Arrange + open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 10; + open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; + --Act + ut3.ut.expect(l_actual).to_include(l_expected).exclude(ut3.ut_varchar2_list('//Some_Col','A_COLUMN')).join_by('RN'); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure contain_excl_cols_as_list + as + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + --Arrange + open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 10; + open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; + --Act + ut3.ut.expect(l_actual).to_include(l_expected).exclude(ut3.ut_varchar2_list('A_COLUMN|//Some_Col')); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; end; / diff --git a/test/core/expectations/test_expectations_cursor.pks b/test/core/expectations/test_expectations_cursor.pks index a1cff85d9..15abc5b23 100644 --- a/test/core/expectations/test_expectations_cursor.pks +++ b/test/core/expectations/test_expectations_cursor.pks @@ -316,5 +316,29 @@ create or replace package test_expectations_cursor is --%test(Trying to join on collection element inside record ) procedure compare_rec_coll_as_join; + --%test( Cursor contains data from another cursor) + procedure cursor_contain; + + --%test( Fail cursor contains data from another cursor ) + procedure cursor_contain_fail; + + --%test( Cursor contains data from another cursor with joinby) + procedure cursor_contain_joinby; + + --%test( Fail cursor contains data from another cursor with joinby) + procedure cursor_contain_joinby_fail; + + --%test(Cursor contains data with of columns to include) + procedure contain_incl_cols_as_list; + + --%test(Cursor contains data with of columns to include and join by value) + procedure contain_join_incl_cols_as_lst; + + --%test(Cursor contains data with of columns to exclude and join by value) + procedure contain_join_excl_cols_as_lst; + + --%test(Cursor contains data with of columns to exclude) + procedure contain_excl_cols_as_list; + end; / From 314b9984978b8bcb4bfa246c0731014971a80182 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Thu, 11 Oct 2018 12:34:30 +0100 Subject: [PATCH 0013/1096] Added test for to_contain --- .../expectations/test_expectations_cursor.pkb | 44 +++++++++++++++++++ .../expectations/test_expectations_cursor.pks | 6 +++ 2 files changed, 50 insertions(+) diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index 3cded1aec..609edb2ad 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -2025,6 +2025,50 @@ Diff:% %Missing: %%% %Missing: %%% %Missing: %%% +%Missing: %%%%]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure cursor_to_contain is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + begin + --Arrange + open l_actual for select owner, object_name,object_type from all_objects where owner = user + order by 1,2,3 asc; + open l_expected for select owner, object_name,object_type from all_objects where owner = user + and rownum < 20; + + --Act + ut3.ut.expect(l_actual).to_contain(l_expected); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure cursor_to_contain_fail is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + --Arrange + open l_actual for select owner, object_name,object_type from all_objects where owner = user + and rownum < 5; + open l_expected for select owner, object_name,object_type from all_objects where owner = user + and rownum < 10; + + --Act + ut3.ut.expect(l_actual).to_contain(l_expected); + --Assert + l_expected_message := q'[%Actual: refcursor [ count = 4 ] was expected to include: refcursor [ count = 9 ] +%Diff: +%Rows: [ 5 differences ] +%Missing: %%% +%Missing: %%% +%Missing: %%% +%Missing: %%% %Missing: %%%%]'; l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; --Assert diff --git a/test/core/expectations/test_expectations_cursor.pks b/test/core/expectations/test_expectations_cursor.pks index 15abc5b23..4d143abfc 100644 --- a/test/core/expectations/test_expectations_cursor.pks +++ b/test/core/expectations/test_expectations_cursor.pks @@ -322,6 +322,12 @@ create or replace package test_expectations_cursor is --%test( Fail cursor contains data from another cursor ) procedure cursor_contain_fail; + --%test( Cursor contains data from another cursor using second keyword) + procedure cursor_to_contain; + + --%test( Fail cursor contains data from another cursor using second keyword) + procedure cursor_to_contain_fail; + --%test( Cursor contains data from another cursor with joinby) procedure cursor_contain_joinby; From 6193ff3ca604ca54dde2575d0805de5a88fe3361 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Thu, 11 Oct 2018 14:04:36 +0100 Subject: [PATCH 0014/1096] Adding negated matcher --- .../data_values/ut_compound_data_helper.pkb | 5 ----- source/expectations/matchers/ut_include.tpb | 16 ++++++++++++++-- source/expectations/matchers/ut_include.tps | 9 +++++++++ source/expectations/ut_expectation.tpb | 5 ++--- source/expectations/ut_expectation_compound.tpb | 4 ++-- source/expectations/ut_expectation_compound.tps | 2 +- 6 files changed, 28 insertions(+), 13 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 136ab1884..8dac49f55 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -606,11 +606,6 @@ create or replace package body ut_compound_data_helper is tmp'; return l_sql; end; - - function get_inclusion_matcher_not_sql(a_owner in varchar2) return varchar2 is - begin - null; - end; function get_refcursor_matcher_sql(a_owner in varchar2,a_inclusion_matcher boolean := false, a_negated_match boolean := false) return varchar2 is l_sql varchar2(32767); diff --git a/source/expectations/matchers/ut_include.tpb b/source/expectations/matchers/ut_include.tpb index cb6eedcda..2d33a5615 100644 --- a/source/expectations/matchers/ut_include.tpb +++ b/source/expectations/matchers/ut_include.tpb @@ -36,12 +36,24 @@ create or replace type body ut_include as return true; end; + member function negated return ut_include is + l_result ut_include := self; + begin + l_result.is_negated := ut_utils.boolean_to_int(true); + return l_result; + end; + overriding member function run_matcher(self in out nocopy ut_include, a_actual ut_data_value) return boolean is l_result boolean; begin if self.expected.data_type = a_actual.data_type then - l_result := 0 = treat(self.expected as ut_data_value_refcursor).compare_implementation(a_actual, self.get_exclude_xpath(), self.get_include_xpath(), self.get_join_by_xpath(), - true,get_inclusion_compare()); + if nvl(self.is_negated,0) = 0 then + l_result := 0 = treat(self.expected as ut_data_value_refcursor).compare_implementation(a_actual, self.get_exclude_xpath(), self.get_include_xpath(), self.get_join_by_xpath(), + true,get_inclusion_compare()); + else + l_result := 0 = treat(self.expected as ut_data_value_refcursor).compare_implementation(a_actual, self.get_exclude_xpath(), self.get_include_xpath(), self.get_join_by_xpath(), + true,get_inclusion_compare()); + end if; else l_result := (self as ut_matcher).run_matcher(a_actual); end if; diff --git a/source/expectations/matchers/ut_include.tps b/source/expectations/matchers/ut_include.tps index 2896832be..ca73bd581 100644 --- a/source/expectations/matchers/ut_include.tps +++ b/source/expectations/matchers/ut_include.tps @@ -16,9 +16,18 @@ create or replace type ut_include under ut_equal( limitations under the License. */ + /** + * Due to nature of inclusion compare the not is bit diffrente than standard. + * Result is false when even one element belongs which can cause overlap. + * e.g. set can fail at same time not_include and include. By that we mean + * that false include not necessary mean true not include. + */ + is_negated number(1,0), + member procedure init(self in out nocopy ut_include, a_expected ut_data_value), constructor function ut_include(self in out nocopy ut_include, a_expected sys_refcursor) return self as result, member function get_inclusion_compare return boolean, + member function negated return ut_include, overriding member function run_matcher(self in out nocopy ut_include, a_actual ut_data_value) return boolean, overriding member function failure_message(a_actual ut_data_value) return varchar2 ) diff --git a/source/expectations/ut_expectation.tpb b/source/expectations/ut_expectation.tpb index 0ca9c406b..8db05a3f3 100644 --- a/source/expectations/ut_expectation.tpb +++ b/source/expectations/ut_expectation.tpb @@ -32,7 +32,6 @@ create or replace type body ut_expectation as l_matcher ut_matcher := a_matcher; l_message varchar2(32767); begin - l_expectation_result := l_matcher.run_matcher_negated( self.actual_data ); l_expectation_result := coalesce(l_expectation_result,false); l_message := coalesce( l_matcher.error_message( self.actual_data ), l_matcher.failure_message_when_negated( self.actual_data ) ); @@ -691,12 +690,12 @@ create or replace type body ut_expectation as member procedure not_to_include(self in ut_expectation, a_expected sys_refcursor) is begin - self.not_to( ut_include(a_expected) ); + self.not_to( ut_include(a_expected).negated ); end; member procedure not_to_contain(self in ut_expectation, a_expected sys_refcursor) is begin - self.not_to( ut_include(a_expected) ); + self.not_to( ut_include(a_expected).negated ); end; end; diff --git a/source/expectations/ut_expectation_compound.tpb b/source/expectations/ut_expectation_compound.tpb index cee16bdbd..03021bc6d 100644 --- a/source/expectations/ut_expectation_compound.tpb +++ b/source/expectations/ut_expectation_compound.tpb @@ -92,7 +92,7 @@ create or replace type body ut_expectation_compound as member function not_to_include(a_expected sys_refcursor) return ut_expectation_compound is l_result ut_expectation_compound := self; begin - l_result.matcher := ut_include(a_expected); + l_result.matcher := ut_include(a_expected).negated; l_result.negated := ut_utils.boolean_to_int(true); return l_result; end; @@ -100,7 +100,7 @@ create or replace type body ut_expectation_compound as member function not_to_contain(a_expected sys_refcursor) return ut_expectation_compound is l_result ut_expectation_compound := self; begin - l_result.matcher := ut_include(a_expected); + l_result.matcher := ut_include(a_expected).negated; l_result.negated := ut_utils.boolean_to_int(true); return l_result; end; diff --git a/source/expectations/ut_expectation_compound.tps b/source/expectations/ut_expectation_compound.tps index 15b1874fe..ffeb1c056 100644 --- a/source/expectations/ut_expectation_compound.tps +++ b/source/expectations/ut_expectation_compound.tps @@ -51,4 +51,4 @@ create or replace type ut_expectation_compound under ut_expectation( member procedure join_by(self in ut_expectation_compound, a_columns ut_varchar2_list) ) final -/ \ No newline at end of file +/ From f798e3919fed7dee7aadef54a5084b0d1493c8a6 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sun, 14 Oct 2018 09:19:57 +0100 Subject: [PATCH 0015/1096] Added tests and negated code --- .../data_values/ut_compound_data_helper.pkb | 30 ++++++- .../data_values/ut_compound_data_value.tpb | 8 +- .../data_values/ut_compound_data_value.tps | 2 +- .../data_values/ut_data_value_refcursor.tpb | 5 +- .../data_values/ut_data_value_refcursor.tps | 3 +- source/expectations/matchers/ut_include.tpb | 18 ++-- source/expectations/matchers/ut_include.tps | 4 +- source/expectations/ut_expectation.tpb | 15 +++- source/expectations/ut_expectation.tps | 1 + .../expectations/ut_expectation_compound.tpb | 58 ++++++++---- .../expectations/test_expectations_cursor.pkb | 89 +++++++++++++++++++ .../expectations/test_expectations_cursor.pks | 18 ++++ 12 files changed, 213 insertions(+), 38 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 8dac49f55..a75807f29 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -607,6 +607,34 @@ create or replace package body ut_compound_data_helper is return l_sql; end; + function get_not_inclusion_matcher_sql(a_owner in varchar2) return varchar2 is + l_sql varchar2(32767); + begin + /* Self set does not contain any values from other set */ + l_sql := 'with source_data as + ( select t.data_id,t.item_hash,row_number() over (partition by t.pk_hash,t.item_hash,t.data_id order by 1,2) duplicate_no, + pk_hash + from ' || a_owner || '.ut_compound_data_tmp t + where data_id = :self_guid or data_id = :other_guid + ) + select distinct :diff_id,tmp.item_hash,tmp.pk_hash,tmp.duplicate_no + from + ( + select act.item_hash,act. duplicate_no,act.pk_hash + from source_data act where act.data_id = :self_guid + and exists ( select 1 + from source_data exp + where exp.data_id = :other_guid + and exp.item_hash = act.item_hash + ) + union all + select null,null,null + from dual where :other_guid = :self_guid + ) + tmp'; + return l_sql; + end; + function get_refcursor_matcher_sql(a_owner in varchar2,a_inclusion_matcher boolean := false, a_negated_match boolean := false) return varchar2 is l_sql varchar2(32767); begin @@ -614,7 +642,7 @@ create or replace package body ut_compound_data_helper is if a_inclusion_matcher and not(a_negated_match) then l_sql := l_sql || get_inclusion_matcher_sql(a_owner); elsif a_inclusion_matcher and a_negated_match then - null; + l_sql := l_sql || get_not_inclusion_matcher_sql(a_owner); elsif not(a_inclusion_matcher) then l_sql := l_sql || get_unordered(a_owner); end if; diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index 38fe9ebc4..1f4935aa2 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -193,7 +193,7 @@ create or replace type body ut_compound_data_value as end; member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, - a_unordered boolean , a_inclusion_compare boolean := false ) return integer is + a_unordered boolean , a_inclusion_compare boolean := false, a_is_negated boolean := false ) return integer is l_other ut_compound_data_value; l_ut_owner varchar2(250) := ut_utils.ut_owner; l_column_filter varchar2(32767); @@ -255,14 +255,14 @@ create or replace type body ut_compound_data_value as * SELF is expected. * Due to growing complexity I have moved a dynamic SQL into helper package. */ - l_sql := ut_compound_data_helper.get_refcursor_matcher_sql(l_ut_owner,a_inclusion_compare); - + l_sql := ut_compound_data_helper.get_refcursor_matcher_sql(l_ut_owner,a_inclusion_compare,a_is_negated); + execute immediate l_sql using self.data_id, l_other.data_id, l_diff_id, self.data_id, l_other.data_id, l_other.data_id,self.data_id; - + /*!* * Result OK when is not inclusion matcher and both are the same * Resullt OK when is inclusion matcher and left contains right set diff --git a/source/expectations/data_values/ut_compound_data_value.tps b/source/expectations/data_values/ut_compound_data_value.tps index f1c4e6529..51d88c6f8 100644 --- a/source/expectations/data_values/ut_compound_data_value.tps +++ b/source/expectations/data_values/ut_compound_data_value.tps @@ -45,6 +45,6 @@ create or replace type ut_compound_data_value force under ut_data_value( member function get_data_diff(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean) return clob, member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2) return integer, member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, - a_unordered boolean , a_inclusion_compare boolean := false) return integer + a_unordered boolean , a_inclusion_compare boolean := false, a_is_negated boolean := false) return integer ) not final not instantiable / diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 12bacd70b..f380b86f8 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -221,7 +221,7 @@ create or replace type body ut_data_value_refcursor as end; overriding member function compare_implementation (a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, - a_unordered boolean, a_inclusion_compare boolean := false) return integer is + a_unordered boolean, a_inclusion_compare boolean := false, a_is_negated boolean := false) return integer is l_result integer := 0; l_other ut_data_value_refcursor; function is_pk_missing (a_pk_missing_tab ut_compound_data_helper.tt_missing_pk) return integer is @@ -251,7 +251,7 @@ create or replace type body ut_data_value_refcursor as if a_unordered then l_result := l_result + (self as ut_compound_data_value).compare_implementation(a_other, a_exclude_xpath, a_include_xpath, - a_join_by_xpath, a_unordered, a_inclusion_compare); + a_join_by_xpath, a_unordered, a_inclusion_compare, a_is_negated); else l_result := l_result + (self as ut_compound_data_value).compare_implementation(a_other, a_exclude_xpath, a_include_xpath); end if; @@ -265,6 +265,5 @@ create or replace type body ut_data_value_refcursor as return self.elements_count = 0; end; - end; / diff --git a/source/expectations/data_values/ut_data_value_refcursor.tps b/source/expectations/data_values/ut_data_value_refcursor.tps index 38582224f..36c231887 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tps +++ b/source/expectations/data_values/ut_data_value_refcursor.tps @@ -45,8 +45,7 @@ create or replace type ut_data_value_refcursor under ut_compound_data_value( overriding member function to_string return varchar2, overriding member function diff( a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean := false ) return varchar2, overriding member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, - a_unordered boolean, a_inclusion_compare boolean := false) return integer, + a_unordered boolean, a_inclusion_compare boolean := false, a_is_negated boolean := false) return integer, overriding member function is_empty return boolean - ) / diff --git a/source/expectations/matchers/ut_include.tpb b/source/expectations/matchers/ut_include.tpb index 2d33a5615..7439aea3e 100644 --- a/source/expectations/matchers/ut_include.tpb +++ b/source/expectations/matchers/ut_include.tpb @@ -43,17 +43,17 @@ create or replace type body ut_include as return l_result; end; + member function get_negated return boolean is + begin + return ut_utils.int_to_boolean(nvl(is_negated,0)); + end; + overriding member function run_matcher(self in out nocopy ut_include, a_actual ut_data_value) return boolean is l_result boolean; begin if self.expected.data_type = a_actual.data_type then - if nvl(self.is_negated,0) = 0 then - l_result := 0 = treat(self.expected as ut_data_value_refcursor).compare_implementation(a_actual, self.get_exclude_xpath(), self.get_include_xpath(), self.get_join_by_xpath(), - true,get_inclusion_compare()); - else l_result := 0 = treat(self.expected as ut_data_value_refcursor).compare_implementation(a_actual, self.get_exclude_xpath(), self.get_include_xpath(), self.get_join_by_xpath(), - true,get_inclusion_compare()); - end if; + true,self.get_inclusion_compare(), self.get_negated()); else l_result := (self as ut_matcher).run_matcher(a_actual); end if; @@ -73,5 +73,11 @@ create or replace type body ut_include as return l_result; end; + overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2 is + l_result varchar2(32767); + begin + return (self as ut_matcher).failure_message_when_negated(a_actual) || ':'|| expected.to_string_report(); + end; + end; / diff --git a/source/expectations/matchers/ut_include.tps b/source/expectations/matchers/ut_include.tps index ca73bd581..6ed32756c 100644 --- a/source/expectations/matchers/ut_include.tps +++ b/source/expectations/matchers/ut_include.tps @@ -28,7 +28,9 @@ create or replace type ut_include under ut_equal( constructor function ut_include(self in out nocopy ut_include, a_expected sys_refcursor) return self as result, member function get_inclusion_compare return boolean, member function negated return ut_include, + member function get_negated return boolean, overriding member function run_matcher(self in out nocopy ut_include, a_actual ut_data_value) return boolean, - overriding member function failure_message(a_actual ut_data_value) return varchar2 + overriding member function failure_message(a_actual ut_data_value) return varchar2, + overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2 ) / diff --git a/source/expectations/ut_expectation.tpb b/source/expectations/ut_expectation.tpb index 8db05a3f3..2b86b0502 100644 --- a/source/expectations/ut_expectation.tpb +++ b/source/expectations/ut_expectation.tpb @@ -38,6 +38,17 @@ create or replace type body ut_expectation as ut_expectation_processor.add_expectation_result( ut_expectation_result( ut_utils.to_test_result( l_expectation_result ), self.description, l_message ) ); end; + member procedure not_include(self in ut_expectation, a_matcher ut_matcher) is + l_expectation_result boolean; + l_matcher ut_matcher := a_matcher; + l_message varchar2(32767); + begin + l_expectation_result := l_matcher.run_matcher( self.actual_data ); + l_expectation_result := coalesce(l_expectation_result,false); + l_message := coalesce( l_matcher.error_message( self.actual_data ), l_matcher.failure_message_when_negated( self.actual_data ) ); + ut_expectation_processor.add_expectation_result( ut_expectation_result( ut_utils.to_test_result( l_expectation_result ), self.description, l_message ) ); + end; + member procedure to_be_null(self in ut_expectation) is begin self.to_( ut_be_null() ); @@ -690,12 +701,12 @@ create or replace type body ut_expectation as member procedure not_to_include(self in ut_expectation, a_expected sys_refcursor) is begin - self.not_to( ut_include(a_expected).negated ); + self.not_include( ut_include(a_expected).negated ); end; member procedure not_to_contain(self in ut_expectation, a_expected sys_refcursor) is begin - self.not_to( ut_include(a_expected).negated ); + self.not_include( ut_include(a_expected).negated ); end; end; diff --git a/source/expectations/ut_expectation.tps b/source/expectations/ut_expectation.tps index 99183d022..80f25e21f 100644 --- a/source/expectations/ut_expectation.tps +++ b/source/expectations/ut_expectation.tps @@ -21,6 +21,7 @@ create or replace type ut_expectation authid current_user as object( --base matcher executors member procedure to_(self in ut_expectation, a_matcher ut_matcher), member procedure not_to(self in ut_expectation, a_matcher ut_matcher), + member procedure not_include(self in ut_expectation, a_matcher ut_matcher), --shortcuts member procedure to_be_null(self in ut_expectation), diff --git a/source/expectations/ut_expectation_compound.tpb b/source/expectations/ut_expectation_compound.tpb index 03021bc6d..9dce4d84e 100644 --- a/source/expectations/ut_expectation_compound.tpb +++ b/source/expectations/ut_expectation_compound.tpb @@ -123,22 +123,30 @@ create or replace type body ut_expectation_compound as member procedure include(self in ut_expectation_compound, a_items varchar2) is begin - if ut_utils.int_to_boolean(negated) then - self.not_to( treat(matcher as ut_equal).include(a_items) ); - else - self.to_( treat(matcher as ut_equal).include(a_items) ); - end if; - end; + if ut_utils.int_to_boolean(negated) then + if (matcher is of (ut_include)) then + self.not_include( treat(matcher as ut_equal).include(a_items) ); + else + self.not_to( treat(matcher as ut_equal).include(a_items) ); + end if; + else + self.to_( treat(matcher as ut_equal).include(a_items) ); + end if; + end; member procedure include(self in ut_expectation_compound, a_items ut_varchar2_list) is begin + if ut_utils.int_to_boolean(negated) then + if (matcher is of (ut_include)) then + self.not_include( treat(matcher as ut_equal).include(a_items) ); + else + self.not_to( treat(matcher as ut_equal).include(a_items) ); + end if; + else + self.to_( treat(matcher as ut_equal).include(a_items) ); + end if; + end; - if ut_utils.int_to_boolean(negated) then - self.not_to( treat(matcher as ut_equal).include(a_items) ); - else - self.to_( treat(matcher as ut_equal).include(a_items) ); - end if; - end; member function exclude(a_items varchar2) return ut_expectation_compound is @@ -160,7 +168,11 @@ create or replace type body ut_expectation_compound as member procedure exclude(self in ut_expectation_compound, a_items varchar2) is begin if ut_utils.int_to_boolean(negated) then - self.not_to( treat(matcher as ut_equal).exclude(a_items) ); + if (matcher is of (ut_include)) then + self.not_include( treat(matcher as ut_equal).exclude(a_items) ); + else + self.not_to( treat(matcher as ut_equal).exclude(a_items) ); + end if; else self.to_( treat(matcher as ut_equal).exclude(a_items) ); end if; @@ -168,9 +180,12 @@ create or replace type body ut_expectation_compound as member procedure exclude(self in ut_expectation_compound, a_items ut_varchar2_list) is begin - if ut_utils.int_to_boolean(negated) then - self.not_to( treat(matcher as ut_equal).exclude(a_items) ); + if (matcher is of (ut_include)) then + self.not_include( treat(matcher as ut_equal).exclude(a_items) ); + else + self.not_to( treat(matcher as ut_equal).exclude(a_items) ); + end if; else self.to_( treat(matcher as ut_equal).exclude(a_items) ); end if; @@ -213,7 +228,11 @@ create or replace type body ut_expectation_compound as member procedure join_by(self in ut_expectation_compound, a_columns varchar2) is begin if ut_utils.int_to_boolean(negated) then - self.not_to( treat(matcher as ut_equal).join_by(a_columns) ); + if (matcher is of (ut_include)) then + self.not_include( treat(matcher as ut_equal).join_by(a_columns) ); + else + self.not_to( treat(matcher as ut_equal).join_by(a_columns) ); + end if; else self.to_( treat(matcher as ut_equal).join_by(a_columns) ); end if; @@ -221,9 +240,12 @@ create or replace type body ut_expectation_compound as member procedure join_by(self in ut_expectation_compound, a_columns ut_varchar2_list) is begin - if ut_utils.int_to_boolean(negated) then - self.not_to( treat(matcher as ut_equal).join_by(a_columns) ); + if (matcher is of (ut_include)) then + self.not_include( treat(matcher as ut_equal).join_by(a_columns) ); + else + self.not_to( treat(matcher as ut_equal).join_by(a_columns) ); + end if; else self.to_( treat(matcher as ut_equal).join_by(a_columns) ); end if; diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index 609edb2ad..461f58807 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -2174,5 +2174,94 @@ Diff:% --Assert ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; + + procedure cursor_not_to_contain is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + begin + --Arrange + open l_expected for select 'TEST' username, -600 user_id from dual; + + open l_actual for select username, user_id from all_users + union all + select 'TEST' username, -601 user_id from dual; + + --Act + ut3.ut.expect(l_actual).not_to_contain(l_expected); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure cursor_not_to_include is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + begin + --Arrange + open l_expected for select 'TEST' username, -600 user_id from dual; + + open l_actual for select username, user_id from all_users + union all + select 'TEST' username, -601 user_id from dual; + + --Act + ut3.ut.expect(l_actual).not_to_include(l_expected); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure cursor_not_to_contain_joinby is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + begin + --Arrange + open l_actual for select username,user_id from all_users; + open l_expected for select username||'ACT' username ,user_id from all_users where rownum < 5; + + --Act + ut3.ut.expect(l_actual).not_to_contain(l_expected).join_by('USER_ID'); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure cursor_not_to_include_joinby is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + begin + --Arrange + open l_actual for select username,user_id from all_users; + open l_expected for select username||'ACT' username ,user_id from all_users where rownum < 5; + + --Act + ut3.ut.expect(l_actual).not_to_include(l_expected).join_by('USER_ID'); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure not_cont_join_incl_cols_as_lst is + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + --Arrange + open l_actual for select rownum as rn, 'b' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 10; + open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; + --Act + ut3.ut.expect(l_actual).to_include(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')).join_by('RN'); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure not_cont_join_excl_cols_as_lst is + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + --Arrange + open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'y' SOME_COL, 'd' "Some_Col" from dual a connect by level < 10; + open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; + --Act + ut3.ut.expect(l_actual).to_include(l_expected).exclude(ut3.ut_varchar2_list('//Some_Col','A_COLUMN')).join_by('RN'); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + end; / diff --git a/test/core/expectations/test_expectations_cursor.pks b/test/core/expectations/test_expectations_cursor.pks index 4d143abfc..66689717f 100644 --- a/test/core/expectations/test_expectations_cursor.pks +++ b/test/core/expectations/test_expectations_cursor.pks @@ -346,5 +346,23 @@ create or replace package test_expectations_cursor is --%test(Cursor contains data with of columns to exclude) procedure contain_excl_cols_as_list; + --%test( Cursor not to contains data from another cursor) + procedure cursor_not_to_contain; + + --%test( Cursor not to include data from another cursor) + procedure cursor_not_to_include; + + --%test( Cursor not contains data from another cursor with joinby clause) + procedure cursor_not_to_contain_joinby; + + --%test( Cursor not include data from another cursor with joinby clause) + procedure cursor_not_to_include_joinby; + + --%test(Cursor not contains data with of columns to include and join by value) + procedure not_cont_join_incl_cols_as_lst; + + --%test(Cursor not contains data with of columns to exclude and join by value) + procedure not_cont_join_excl_cols_as_lst; + end; / From ab64302b86165d79237fd416e92e1168221f85ea Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Fri, 19 Oct 2018 17:57:26 +0200 Subject: [PATCH 0016/1096] Change CLI version to 3.1.0. It is a requirement to test the current develp branch --- development/template.env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/development/template.env.sh b/development/template.env.sh index 1e90aaed3..94004c89d 100755 --- a/development/template.env.sh +++ b/development/template.env.sh @@ -4,7 +4,7 @@ export SQLCLI=sql # For sqlcl client #export SQLCLI=sqlplus # For sqlplus client export CONNECTION_STR=127.0.0.1:1521/xe # Adjust the connect string export ORACLE_PWD=oracle # Adjust your local SYS password -export UTPLSQL_CLI_VERSION="3.0.4" +export UTPLSQL_CLI_VERSION="3.1.0" export SELFTESTING_BRANCH=develop export UTPLSQL_DIR="utPLSQL_latest_release" From 9c3b1fffcb0cce5d275661a2833a3f715b075e28 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Fri, 19 Oct 2018 17:58:12 +0200 Subject: [PATCH 0017/1096] ignore temporary files created by actions described in CONTRIBUTING.md --- .gitignore | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.gitignore b/.gitignore index 13452754f..197d0f5e9 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,13 @@ utPLSQL_latest_release/ utPLSQL-cli/ development/env.sh *.log + +# exclusions based on artifacts created via actions documented in CONTRIBUTING.md +test/dummy.sql +coverage.html_assets/ +coverage.html +coverage.json +coverage.xml +tfs_test_results.xml +junit_test_results.xml +test_results.xml From 766837e38efa11595da836d498f73ed47db360d3 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 19 Oct 2018 19:00:38 +0100 Subject: [PATCH 0018/1096] Fixing test dependency on NLS settings. Fixing test dependency on global_names (for DB links) Fixing missing privs. Resolves #765 --- .../create_synonyms_and_grants_for_public.sql | 4 +- source/create_user_grants.sql | 4 +- test/api/test_ut_run.pkb | 2 +- .../test_annot_throws_exception.pkb | 40 +++++++++---------- ....pkb => test_before_after_annotations.pkb} | 4 +- ....pks => test_before_after_annotations.pks} | 0 test/core/reporters/test_junit_reporter.pkb | 2 +- .../reporters/test_tfs_junit_reporter.pkb | 2 +- test/install_tests.sql | 4 +- 9 files changed, 31 insertions(+), 31 deletions(-) rename test/core/annotations/{test_before_after_test_annotation.pkb => test_before_after_annotations.pkb} (98%) rename test/core/annotations/{test_before_after_test_annotation.pks => test_before_after_annotations.pks} (100%) diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index 17452ec0c..1ac5bb9ea 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -76,8 +76,8 @@ grant execute on &&ut3_owner..ut_file_mapping to public; grant execute on &&ut3_owner..ut_file_mapper to public; grant execute on &&ut3_owner..ut_key_value_pairs to public; grant execute on &&ut3_owner..ut_key_value_pair to public; -grant select, insert, delete on &&ut3_owner..ut_compound_data_tmp to public; -grant select, insert, delete on &&ut3_owner..ut_compound_data_diff_tmp to public; +grant select, insert, update, delete on &&ut3_owner..ut_compound_data_tmp to public; +grant select, insert, update, delete on &&ut3_owner..ut_compound_data_diff_tmp to public; grant execute on &&ut3_owner..ut_sonar_test_reporter to public; grant execute on &&ut3_owner..ut_annotations to public; grant execute on &&ut3_owner..ut_annotation to public; diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql index bae0364be..07d9097f3 100644 --- a/source/create_user_grants.sql +++ b/source/create_user_grants.sql @@ -96,8 +96,8 @@ grant execute on &&ut3_owner..ut_file_mapping to &ut3_user; grant execute on &&ut3_owner..ut_file_mapper to &ut3_user; grant execute on &&ut3_owner..ut_key_value_pairs to &ut3_user; grant execute on &&ut3_owner..ut_key_value_pair to &ut3_user; -grant select, insert, delete on &&ut3_owner..ut_compound_data_tmp to &ut3_user; -grant select, insert, delete on &&ut3_owner..ut_compound_data_diff_tmp to &ut3_user; +grant select, insert, update, delete on &&ut3_owner..ut_compound_data_tmp to &ut3_user; +grant select, insert, update, delete on &&ut3_owner..ut_compound_data_diff_tmp to &ut3_user; grant execute on &&ut3_owner..ut_sonar_test_reporter to &ut3_user; grant execute on &&ut3_owner..ut_annotations to &ut3_user; grant execute on &&ut3_owner..ut_annotation to &ut3_user; diff --git a/test/api/test_ut_run.pkb b/test/api/test_ut_run.pkb index 704627ac9..dae7e175a 100644 --- a/test/api/test_ut_run.pkb +++ b/test/api/test_ut_run.pkb @@ -589,7 +589,7 @@ create or replace package body test_ut_run is failing_stateful_test [% sec] (FAILED - 1)% Failures:% 1) failing_stateful_test - ORA-04068: existing state of packages (DB_LOOPBACK) has been discarded + ORA-04068: existing state of packages (DB_LOOPBACK%) has been discarded ORA-04061: existing state of package body "UT3_TESTER.STATEFUL_PACKAGE" has been invalidated ORA-04065: not executed, altered or dropped package body "UT3_TESTER.STATEFUL_PACKAGE"% ORA-06512: at line 6% diff --git a/test/core/annotations/test_annot_throws_exception.pkb b/test/core/annotations/test_annot_throws_exception.pkb index 2c8c3be2c..1ad4f19a5 100644 --- a/test/core/annotations/test_annot_throws_exception.pkb +++ b/test/core/annotations/test_annot_throws_exception.pkb @@ -240,43 +240,43 @@ is procedure throws_same_annotated_except is begin - ut.expect(g_tests_results).to_match('^\s*Throws same annotated exception \[[\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Throws same annotated exception \[[,\.0-9]+ sec\]\s*$','m'); ut.expect(g_tests_results).not_to_match('raised_same_exception'); end; procedure throws_one_of_annotated_excpt is begin - ut.expect(g_tests_results).to_match('^\s*Throws one of the listed exceptions \[[\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Throws one of the listed exceptions \[[,\.0-9]+ sec\]\s*$','m'); ut.expect(g_tests_results).not_to_match('raised_one_listed_exception'); end; procedure throws_with_leading_zero is begin - ut.expect(g_tests_results).to_match('^\s*Leading zero is ignored in exception list \[[\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Leading zero is ignored in exception list \[[,\.0-9]+ sec\]\s*$','m'); ut.expect(g_tests_results).not_to_match('leading_0_exception_no'); end; procedure throws_diff_annotated_except is begin - ut.expect(g_tests_results).to_match('^\s*Throws diff exception \[[\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Throws diff exception \[[,\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); ut.expect(g_tests_results).to_match('raised_diff_exception\s+Actual: -20143 was expected to equal: -20144\s+ORA-20143: Test error\s+ORA-06512: at "UT3_TESTER.ANNOTATED_PACKAGE_WITH_THROWS"'); end; procedure throws_empty is begin - ut.expect(g_tests_results).to_match('^\s*Throws empty \[[\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Throws empty \[[,\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); ut.expect(g_tests_results).to_match('empty_throws\s*ORA-20143: Test error\s*ORA-06512: at "UT3_TESTER.ANNOTATED_PACKAGE_WITH_THROWS"'); end; procedure bad_paramters_with_except is begin - ut.expect(g_tests_results).to_match('^\s*Ignores annotation and fails when exception was thrown \[[\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Ignores annotation and fails when exception was thrown \[[,\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); ut.expect(g_tests_results).to_match('bad_paramters_with_except\s*ORA-20143: Test error\s*ORA-06512: at "UT3_TESTER.ANNOTATED_PACKAGE_WITH_THROWS"'); end; procedure bad_paramters_without_except is begin - ut.expect(g_tests_results).to_match('^\s*Ignores annotation and succeeds when no exception thrown \[[\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Ignores annotation and succeeds when no exception thrown \[[,\.0-9]+ sec\]\s*$','m'); ut.expect(g_tests_results).not_to_match('bad_paramters_without_except'); end; @@ -288,79 +288,79 @@ is procedure nothing_thrown is begin - ut.expect(g_tests_results).to_match('^\s*Gives failure when a exception is expected and nothing is thrown \[[\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Gives failure when a exception is expected and nothing is thrown \[[,\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); ut.expect(g_tests_results).to_match('nothing_thrown\s*Expected one of exceptions \(-20459, -20136, -20145\) but nothing was raised.'); end; procedure single_exc_const_pkg is begin - ut.expect(g_tests_results).to_match('^\s*Single exception defined as a constant number in package \[[\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Single exception defined as a constant number in package \[[,\.0-9]+ sec\]\s*$','m'); ut.expect(g_tests_results).not_to_match('single_exc_const_pkg'); end; procedure list_of_exc_constant is begin - ut.expect(g_tests_results).to_match('^\s*Gives success when one of annotated exception using constant is thrown \[[\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Gives success when one of annotated exception using constant is thrown \[[,\.0-9]+ sec\]\s*$','m'); ut.expect(g_tests_results).not_to_match('list_of_exc_constant'); end; procedure fail_not_match_exc is begin - ut.expect(g_tests_results).to_match('^\s*Gives failure when the raised exception is different that the annotated one using variable \[[\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Gives failure when the raised exception is different that the annotated one using variable \[[,\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); ut.expect(g_tests_results).to_match('fail_not_match_exc\s+Actual: -1403 was expected to equal: -20204\s+ORA-01403: no data found\s+ORA-06512: at "UT3_TESTER.ANNOTATED_PACKAGE_WITH_THROWS"'); end; procedure mixed_exc_list is begin - ut.expect(g_tests_results).to_match('^\s*Success when one of exception from mixed list of number and constant is thrown \[[\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Success when one of exception from mixed list of number and constant is thrown \[[,\.0-9]+ sec\]\s*$','m'); ut.expect(g_tests_results).not_to_match('mixed_exc_list'); end; procedure mixed_list_notexi is begin - ut.expect(g_tests_results).to_match('^\s*Success when match exception even if other variable on list dont exists \[[\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Success when match exception even if other variable on list dont exists \[[,\.0-9]+ sec\]\s*$','m'); ut.expect(g_tests_results).not_to_match('mixed_list_notexi'); end; procedure named_exc_pragma is begin - ut.expect(g_tests_results).to_match('^\s*Success resolve and match named exception defined in pragma exception init \[[\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Success resolve and match named exception defined in pragma exception init \[[,\.0-9]+ sec\]\s*$','m'); ut.expect(g_tests_results).not_to_match('mixed_list_notexi'); end; procedure named_exc_ora is begin - ut.expect(g_tests_results).to_match('^\s*Success resolve and match oracle named exception \[[\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Success resolve and match oracle named exception \[[,\.0-9]+ sec\]\s*$','m'); ut.expect(g_tests_results).not_to_match('named_exc_ora'); end; procedure named_exc_ora_dup_ind is begin - ut.expect(g_tests_results).to_match('^\s*Success resolve and match oracle named exception dup val index \[[\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Success resolve and match oracle named exception dup val index \[[,\.0-9]+ sec\]\s*$','m'); ut.expect(g_tests_results).not_to_match('named_exc_ora_dup_ind'); end; procedure nodata_exc_ora is begin - ut.expect(g_tests_results).to_match('^\s*Success map no data 100 to -1403 \[[\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Success map no data 100 to -1403 \[[,\.0-9]+ sec\]\s*$','m'); ut.expect(g_tests_results).not_to_match('nodata_exc_ora'); end; procedure defined_varchar_exc is begin - ut.expect(g_tests_results).to_match('^\s*Success for exception defined as varchar \[[\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Success for exception defined as varchar \[[,\.0-9]+ sec\]\s*$','m'); ut.expect(g_tests_results).not_to_match('defined_varchar_exc'); end; procedure non_existing_const is begin - ut.expect(g_tests_results).to_match('^\s*Non existing constant exception \[[\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Non existing constant exception \[[,\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); ut.expect(g_tests_results).to_match('non_existing_const\s*ORA-20143: Test error\s*ORA-06512: at "UT3_TESTER.ANNOTATED_PACKAGE_WITH_THROWS"'); end; procedure bad_exc_const is begin - ut.expect(g_tests_results).to_match('^\s*Bad exception constant \[[\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Bad exception constant \[[,\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); ut.expect(g_tests_results).to_match('bad_exc_const\s*ORA-20143: Test error\s*ORA-06512: at "UT3_TESTER.ANNOTATED_PACKAGE_WITH_THROWS"'); end; diff --git a/test/core/annotations/test_before_after_test_annotation.pkb b/test/core/annotations/test_before_after_annotations.pkb similarity index 98% rename from test/core/annotations/test_before_after_test_annotation.pkb rename to test/core/annotations/test_before_after_annotations.pkb index 06871a335..0aa9f5c39 100644 --- a/test/core/annotations/test_before_after_test_annotation.pkb +++ b/test/core/annotations/test_before_after_annotations.pkb @@ -277,7 +277,7 @@ create or replace package body test_before_after_annotations is ut.expect(l_actual).to_be_empty; ut.expect(g_tests_results).to_match( - '^\s*Stops execution at first non-existing Beforetest procedure and marks test as errored \[[\.0-9]+ sec\] \(FAILED - 1\)\s*$' + '^\s*Stops execution at first non-existing Beforetest procedure and marks test as errored \[[,\.0-9]+ sec\] \(FAILED - 1\)\s*$' ,'m' ); ut.expect(g_tests_results).to_match( @@ -297,7 +297,7 @@ create or replace package body test_before_after_annotations is ut.expect(l_actual).to_be_empty; ut.expect(g_tests_results).to_match( - '^\s*Stops execution at first non-existing Beforetest procedure and marks test as errored \[[\.0-9]+ sec\] \(FAILED - 1\)\s*$' + '^\s*Stops execution at first non-existing Beforetest procedure and marks test as errored \[[,\.0-9]+ sec\] \(FAILED - 1\)\s*$' ,'m' ); ut.expect(g_tests_results).to_match( diff --git a/test/core/annotations/test_before_after_test_annotation.pks b/test/core/annotations/test_before_after_annotations.pks similarity index 100% rename from test/core/annotations/test_before_after_test_annotation.pks rename to test/core/annotations/test_before_after_annotations.pks diff --git a/test/core/reporters/test_junit_reporter.pkb b/test/core/reporters/test_junit_reporter.pkb index 6cd67b8a3..e0a7ea00d 100644 --- a/test/core/reporters/test_junit_reporter.pkb +++ b/test/core/reporters/test_junit_reporter.pkb @@ -166,7 +166,7 @@ create or replace package body test_junit_reporter as l_nls_numeric_characters varchar2(30); begin --Arrange - select nsp.value into l_nls_numeric_characters + select replace(nsp.value,'''','''''') into l_nls_numeric_characters from nls_session_parameters nsp where parameter = 'NLS_NUMERIC_CHARACTERS'; execute immediate q'[alter session set NLS_NUMERIC_CHARACTERS=', ']'; diff --git a/test/core/reporters/test_tfs_junit_reporter.pkb b/test/core/reporters/test_tfs_junit_reporter.pkb index bd09b8682..122c665e3 100644 --- a/test/core/reporters/test_tfs_junit_reporter.pkb +++ b/test/core/reporters/test_tfs_junit_reporter.pkb @@ -149,7 +149,7 @@ create or replace package body test_tfs_junit_reporter as l_nls_numeric_characters varchar2(30); begin --Arrange - select nsp.value into l_nls_numeric_characters + select replace(nsp.value,'''','''''') into l_nls_numeric_characters from nls_session_parameters nsp where parameter = 'NLS_NUMERIC_CHARACTERS'; execute immediate q'[alter session set NLS_NUMERIC_CHARACTERS=', ']'; diff --git a/test/install_tests.sql b/test/install_tests.sql index 2aa60692c..2f1292b74 100644 --- a/test/install_tests.sql +++ b/test/install_tests.sql @@ -23,7 +23,7 @@ alter session set plsql_optimize_level=0; @@core/test_ut_test.pks @@core/annotations/test_annotation_parser.pks @@core/annotations/test_annotation_manager.pks -@@core/annotations/test_before_after_test_annotation.pks +@@core/annotations/test_before_after_annotations.pks @@core/expectations/test_expectation_processor.pks @@core/expectations/test_matchers.pks @@core/test_output_buffer.pks @@ -74,7 +74,7 @@ set define off @@core/annotations/test_annotation_manager.pkb @@core/expectations/test_expectation_processor.pkb @@core/expectations/test_matchers.pkb -@@core/annotations/test_before_after_test_annotation.pkb +@@core/annotations/test_before_after_annotations.pkb @@core/test_output_buffer.pkb @@core/test_file_mapper.pkb @@core/test_suite_manager.pkb From aa4e3d53f9eae584491710cdadc085bd55b4e2a1 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 19 Oct 2018 19:07:08 +0100 Subject: [PATCH 0019/1096] Adding fix to avoid running sonar-scanner on external pull-requests. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a6aecb53c..58aa254e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -95,7 +95,7 @@ before_script: script: - if [[ ! $TRAVIS_TAG ]]; then bash test/install_and_run_tests.sh; fi - if [[ ! $TRAVIS_TAG ]]; then bash .travis/validate_report_files.sh; fi - - if [[ ! $TRAVIS_TAG ]] && [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ]; then bash .travis/run_sonar_scanner.sh; fi + - if [[ ! $TRAVIS_TAG ]] && [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [ "${TRAVIS_PULL_REQUEST_SLUG}" = "${TRAVIS_REPO_SLUG}" ]; then bash .travis/run_sonar_scanner.sh; fi - if [[ ! $TRAVIS_TAG ]]; then bash .travis/coveralls_uploader.sh; fi notifications: From f818af4873e229f5fcd57142368740b0061ef383 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Fri, 19 Oct 2018 20:03:12 +0000 Subject: [PATCH 0020/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index a96253c58..a4388c523 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.3.2251-develop'; + gc_version constant varchar2(50) := 'v3.1.3.2276-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From db19e3089f4c605a09567ac2d96c2cf3e5b59caa Mon Sep 17 00:00:00 2001 From: Travis CI Date: Fri, 19 Oct 2018 23:12:12 +0000 Subject: [PATCH 0021/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index a4388c523..fbf9a73ae 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.3.2276-develop'; + gc_version constant varchar2(50) := 'v3.1.3.2278-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From e5df0e20cfe4e17ebc87fc8fb56550065723d4bb Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sat, 20 Oct 2018 22:20:05 +0100 Subject: [PATCH 0022/1096] fix to unordered. Due to missing duplicate_no in populated table the data results been skewed. --- .../data_values/ut_compound_data_helper.pkb | 5 +-- .../data_values/ut_compound_data_value.tpb | 23 +++++++++---- .../expectations/test_expectations_cursor.pkb | 34 ++++++++++++++++++- .../expectations/test_expectations_cursor.pks | 5 ++- 4 files changed, 56 insertions(+), 11 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index e6665bd10..c6a38e35c 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -373,8 +373,7 @@ create or replace package body ut_compound_data_helper is /** * Since its unordered search we cannot select max rows from diffs as we miss some comparision records * We will restrict output on higher level of select - */ - + */ execute immediate q'[with diff_info as (select item_hash,duplicate_no from ut_compound_data_diff_tmp ucdc where diff_id = :diff_guid) select duplicate_no, @@ -403,6 +402,7 @@ create or replace package body ut_compound_data_helper is diff_info i where ucd.data_id = :self_guid and ucd.item_hash = i.item_hash + and ucd.duplicate_no = i.duplicate_no ) r, table( xmlsequence( extract(r.item_data,'/*') ) ) ucd ) ucd @@ -417,6 +417,7 @@ create or replace package body ut_compound_data_helper is diff_info i where ucd.data_id = :other_guid and ucd.item_hash = i.item_hash + and ucd.duplicate_no = i.duplicate_no ) r, table( xmlsequence( extract(r.item_data,'/*') ) ) ucd ) ucd diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index 113c5153e..de81830dd 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -234,6 +234,13 @@ create or replace type body ut_compound_data_value as **/ execute immediate 'merge into ' || l_ut_owner || '.ut_compound_data_tmp tgt using ( + select ucd_out.item_hash, + ucd_out.pk_hash, + ucd_out.item_no, + ucd_out.data_id, + row_number() over (partition by ucd_out.pk_hash,ucd_out.item_hash,ucd_out.data_id order by 1,2) duplicate_no + from + ( select '||l_ut_owner ||'.ut_compound_data_helper.get_hash(ucd.item_data.getclobval()) item_hash, pk_hash, ucd.item_no, ucd.data_id from @@ -242,17 +249,19 @@ create or replace type body ut_compound_data_value as from ' || l_ut_owner || q'[.ut_compound_data_tmp ucd where data_id = :self_guid or data_id = :other_guid ) ucd + )ucd_out ) src on (tgt.item_no = src.item_no and tgt.data_id = src.data_id) when matched then update set tgt.item_hash = src.item_hash, - tgt.pk_hash = src.pk_hash ]' + tgt.pk_hash = src.pk_hash, + tgt.duplicate_no = src.duplicate_no]' using a_exclude_xpath, a_include_xpath,a_join_by_xpath,self.data_id, l_other.data_id; /* Peform minus on two sets two get diffrences that will be used later on to print results */ execute immediate 'insert into ' || l_ut_owner || '.ut_compound_data_diff_tmp ( diff_id,item_hash,pk_hash,duplicate_no) with source_data as - ( select t.data_id,t.item_hash,row_number() over (partition by t.pk_hash,t.item_hash,t.data_id order by 1,2) duplicate_no, + ( select t.data_id,t.item_hash,t.duplicate_no, pk_hash from ' || l_ut_owner || '.ut_compound_data_tmp t where data_id = :self_guid or data_id = :other_guid @@ -260,21 +269,21 @@ create or replace type body ut_compound_data_value as select distinct :diff_id,tmp.item_hash,tmp.pk_hash,tmp.duplicate_no from( ( - select t.item_hash,t. duplicate_no,t.pk_hash + select t.item_hash,t.duplicate_no,t.pk_hash from source_data t where t.data_id = :self_guid minus - select t.item_hash,t. duplicate_no,t.pk_hash + select t.item_hash,t.duplicate_no,t.pk_hash from source_data t where t.data_id = :other_guid ) union all ( - select t.item_hash,t. duplicate_no,t.pk_hash + select t.item_hash,t.duplicate_no,t.pk_hash from source_data t where t.data_id = :other_guid minus - select t.item_hash,t. duplicate_no,t.pk_hash + select t.item_hash,t.duplicate_no,t.pk_hash from source_data t where t.data_id = :self_guid ))tmp' @@ -282,7 +291,7 @@ create or replace type body ut_compound_data_value as l_diff_id, self.data_id, l_other.data_id, l_other.data_id,self.data_id; - --result is OK only if both are same + --result is OK only if both are same if sql%rowcount = 0 and self.elements_count = l_other.elements_count then l_result := 0; else diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index d18cef5fb..fb75b2da8 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -1986,6 +1986,38 @@ Diff:% ut.expect(l_actual_message).to_be_like(l_expected_message); end; - + + procedure unordered_fix_764 is + l_actual sys_refcursor; + l_expected sys_refcursor; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + open l_expected for + select 'Table' as name from dual + union all + select 'Desk' as name from dual + union all + select 'Table' as name from dual; + + open l_actual for + select 'Desk' as name from dual + union all + select 'Table' as name from dual; + + --Assert + ut3.ut.expect( l_actual ).to_equal( l_expected ).unordered(); + + --Assert + l_expected_message := q'[%Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 3 ] +%Diff: +%Rows: [ 1 differences ] +%Missing: Table%]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + + end; + end; / diff --git a/test/core/expectations/test_expectations_cursor.pks b/test/core/expectations/test_expectations_cursor.pks index a1cff85d9..88d59e1a3 100644 --- a/test/core/expectations/test_expectations_cursor.pks +++ b/test/core/expectations/test_expectations_cursor.pks @@ -315,6 +315,9 @@ create or replace package test_expectations_cursor is --%test(Trying to join on collection element inside record ) procedure compare_rec_coll_as_join; - + + --%test( Unordered fix for issues with duplicate no : #764 ) + procedure unordered_fix_764; + end; / From 44713a53c5dabf6299175b025b3529eec54af5fd Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 20 Oct 2018 22:41:01 +0100 Subject: [PATCH 0023/1096] Moving uninstall tests to child job no 2 - (12.1) as it is now fastest build. --- .travis/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index 7b799eaa0..528b44f20 100644 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -13,8 +13,8 @@ alter session set plsql_optimize_level=0; @install_headless.sql $UT3_OWNER $UT3_OWNER_PASSWORD SQL -#Run this step only on first job slave (11.2 - at it's fastest) -if [[ "${TRAVIS_JOB_NUMBER}" =~ \.1$ ]]; then +#Run this step only on second child job (12.1 - at it's fastest) +if [[ "${TRAVIS_JOB_NUMBER}" =~ \.2$ ]]; then #check code-style for errors time "$SQLCLI" $UT3_OWNER/$UT3_OWNER_PASSWORD@//$CONNECTION_STR @../development/utplsql_style_check.sql From 306674aa0303ebc398d2eea287da1320233258a9 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sat, 20 Oct 2018 23:27:34 +0000 Subject: [PATCH 0024/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index fbf9a73ae..a42cda124 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.3.2278-develop'; + gc_version constant varchar2(50) := 'v3.1.3.2284-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From 19290a4e8cd320510f4e4365fee02844cbbc2d12 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 21 Oct 2018 01:54:35 +0100 Subject: [PATCH 0025/1096] Disabling compilation with PLSQL compiler warnings. --- .travis/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/install.sh b/.travis/install.sh index 528b44f20..e37cfa35f 100644 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -8,7 +8,7 @@ time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL set feedback off set verify off -alter session set plsql_warnings = 'ENABLE:ALL', 'DISABLE:(5004,5018,6000,6001,6003,6009,6010,7206)'; +--alter session set plsql_warnings = 'ENABLE:ALL', 'DISABLE:(5004,5018,6000,6001,6003,6009,6010,7206)'; alter session set plsql_optimize_level=0; @install_headless.sql $UT3_OWNER $UT3_OWNER_PASSWORD SQL From 013cba3b91e6f56b0963b393fe83ecd8a4711176 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sun, 21 Oct 2018 01:24:18 +0000 Subject: [PATCH 0026/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index a42cda124..5623efa9b 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.3.2284-develop'; + gc_version constant varchar2(50) := 'v3.1.3.2297-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From 86276ec639d072c6100f51ff7c1feb117560917a Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 19 Oct 2018 19:00:38 +0100 Subject: [PATCH 0027/1096] Fixing test dependency on NLS settings. Fixing test dependency on global_names (for DB links) Fixing missing privs. Resolves #765 --- .../create_synonyms_and_grants_for_public.sql | 4 +- source/create_user_grants.sql | 4 +- test/api/test_ut_run.pkb | 2 +- .../test_annot_throws_exception.pkb | 40 +++++++++---------- ....pkb => test_before_after_annotations.pkb} | 4 +- ....pks => test_before_after_annotations.pks} | 0 test/core/reporters/test_junit_reporter.pkb | 2 +- .../reporters/test_tfs_junit_reporter.pkb | 2 +- test/install_tests.sql | 4 +- 9 files changed, 31 insertions(+), 31 deletions(-) rename test/core/annotations/{test_before_after_test_annotation.pkb => test_before_after_annotations.pkb} (98%) rename test/core/annotations/{test_before_after_test_annotation.pks => test_before_after_annotations.pks} (100%) diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index 17452ec0c..1ac5bb9ea 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -76,8 +76,8 @@ grant execute on &&ut3_owner..ut_file_mapping to public; grant execute on &&ut3_owner..ut_file_mapper to public; grant execute on &&ut3_owner..ut_key_value_pairs to public; grant execute on &&ut3_owner..ut_key_value_pair to public; -grant select, insert, delete on &&ut3_owner..ut_compound_data_tmp to public; -grant select, insert, delete on &&ut3_owner..ut_compound_data_diff_tmp to public; +grant select, insert, update, delete on &&ut3_owner..ut_compound_data_tmp to public; +grant select, insert, update, delete on &&ut3_owner..ut_compound_data_diff_tmp to public; grant execute on &&ut3_owner..ut_sonar_test_reporter to public; grant execute on &&ut3_owner..ut_annotations to public; grant execute on &&ut3_owner..ut_annotation to public; diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql index bae0364be..07d9097f3 100644 --- a/source/create_user_grants.sql +++ b/source/create_user_grants.sql @@ -96,8 +96,8 @@ grant execute on &&ut3_owner..ut_file_mapping to &ut3_user; grant execute on &&ut3_owner..ut_file_mapper to &ut3_user; grant execute on &&ut3_owner..ut_key_value_pairs to &ut3_user; grant execute on &&ut3_owner..ut_key_value_pair to &ut3_user; -grant select, insert, delete on &&ut3_owner..ut_compound_data_tmp to &ut3_user; -grant select, insert, delete on &&ut3_owner..ut_compound_data_diff_tmp to &ut3_user; +grant select, insert, update, delete on &&ut3_owner..ut_compound_data_tmp to &ut3_user; +grant select, insert, update, delete on &&ut3_owner..ut_compound_data_diff_tmp to &ut3_user; grant execute on &&ut3_owner..ut_sonar_test_reporter to &ut3_user; grant execute on &&ut3_owner..ut_annotations to &ut3_user; grant execute on &&ut3_owner..ut_annotation to &ut3_user; diff --git a/test/api/test_ut_run.pkb b/test/api/test_ut_run.pkb index 704627ac9..dae7e175a 100644 --- a/test/api/test_ut_run.pkb +++ b/test/api/test_ut_run.pkb @@ -589,7 +589,7 @@ create or replace package body test_ut_run is failing_stateful_test [% sec] (FAILED - 1)% Failures:% 1) failing_stateful_test - ORA-04068: existing state of packages (DB_LOOPBACK) has been discarded + ORA-04068: existing state of packages (DB_LOOPBACK%) has been discarded ORA-04061: existing state of package body "UT3_TESTER.STATEFUL_PACKAGE" has been invalidated ORA-04065: not executed, altered or dropped package body "UT3_TESTER.STATEFUL_PACKAGE"% ORA-06512: at line 6% diff --git a/test/core/annotations/test_annot_throws_exception.pkb b/test/core/annotations/test_annot_throws_exception.pkb index 2c8c3be2c..1ad4f19a5 100644 --- a/test/core/annotations/test_annot_throws_exception.pkb +++ b/test/core/annotations/test_annot_throws_exception.pkb @@ -240,43 +240,43 @@ is procedure throws_same_annotated_except is begin - ut.expect(g_tests_results).to_match('^\s*Throws same annotated exception \[[\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Throws same annotated exception \[[,\.0-9]+ sec\]\s*$','m'); ut.expect(g_tests_results).not_to_match('raised_same_exception'); end; procedure throws_one_of_annotated_excpt is begin - ut.expect(g_tests_results).to_match('^\s*Throws one of the listed exceptions \[[\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Throws one of the listed exceptions \[[,\.0-9]+ sec\]\s*$','m'); ut.expect(g_tests_results).not_to_match('raised_one_listed_exception'); end; procedure throws_with_leading_zero is begin - ut.expect(g_tests_results).to_match('^\s*Leading zero is ignored in exception list \[[\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Leading zero is ignored in exception list \[[,\.0-9]+ sec\]\s*$','m'); ut.expect(g_tests_results).not_to_match('leading_0_exception_no'); end; procedure throws_diff_annotated_except is begin - ut.expect(g_tests_results).to_match('^\s*Throws diff exception \[[\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Throws diff exception \[[,\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); ut.expect(g_tests_results).to_match('raised_diff_exception\s+Actual: -20143 was expected to equal: -20144\s+ORA-20143: Test error\s+ORA-06512: at "UT3_TESTER.ANNOTATED_PACKAGE_WITH_THROWS"'); end; procedure throws_empty is begin - ut.expect(g_tests_results).to_match('^\s*Throws empty \[[\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Throws empty \[[,\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); ut.expect(g_tests_results).to_match('empty_throws\s*ORA-20143: Test error\s*ORA-06512: at "UT3_TESTER.ANNOTATED_PACKAGE_WITH_THROWS"'); end; procedure bad_paramters_with_except is begin - ut.expect(g_tests_results).to_match('^\s*Ignores annotation and fails when exception was thrown \[[\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Ignores annotation and fails when exception was thrown \[[,\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); ut.expect(g_tests_results).to_match('bad_paramters_with_except\s*ORA-20143: Test error\s*ORA-06512: at "UT3_TESTER.ANNOTATED_PACKAGE_WITH_THROWS"'); end; procedure bad_paramters_without_except is begin - ut.expect(g_tests_results).to_match('^\s*Ignores annotation and succeeds when no exception thrown \[[\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Ignores annotation and succeeds when no exception thrown \[[,\.0-9]+ sec\]\s*$','m'); ut.expect(g_tests_results).not_to_match('bad_paramters_without_except'); end; @@ -288,79 +288,79 @@ is procedure nothing_thrown is begin - ut.expect(g_tests_results).to_match('^\s*Gives failure when a exception is expected and nothing is thrown \[[\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Gives failure when a exception is expected and nothing is thrown \[[,\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); ut.expect(g_tests_results).to_match('nothing_thrown\s*Expected one of exceptions \(-20459, -20136, -20145\) but nothing was raised.'); end; procedure single_exc_const_pkg is begin - ut.expect(g_tests_results).to_match('^\s*Single exception defined as a constant number in package \[[\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Single exception defined as a constant number in package \[[,\.0-9]+ sec\]\s*$','m'); ut.expect(g_tests_results).not_to_match('single_exc_const_pkg'); end; procedure list_of_exc_constant is begin - ut.expect(g_tests_results).to_match('^\s*Gives success when one of annotated exception using constant is thrown \[[\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Gives success when one of annotated exception using constant is thrown \[[,\.0-9]+ sec\]\s*$','m'); ut.expect(g_tests_results).not_to_match('list_of_exc_constant'); end; procedure fail_not_match_exc is begin - ut.expect(g_tests_results).to_match('^\s*Gives failure when the raised exception is different that the annotated one using variable \[[\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Gives failure when the raised exception is different that the annotated one using variable \[[,\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); ut.expect(g_tests_results).to_match('fail_not_match_exc\s+Actual: -1403 was expected to equal: -20204\s+ORA-01403: no data found\s+ORA-06512: at "UT3_TESTER.ANNOTATED_PACKAGE_WITH_THROWS"'); end; procedure mixed_exc_list is begin - ut.expect(g_tests_results).to_match('^\s*Success when one of exception from mixed list of number and constant is thrown \[[\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Success when one of exception from mixed list of number and constant is thrown \[[,\.0-9]+ sec\]\s*$','m'); ut.expect(g_tests_results).not_to_match('mixed_exc_list'); end; procedure mixed_list_notexi is begin - ut.expect(g_tests_results).to_match('^\s*Success when match exception even if other variable on list dont exists \[[\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Success when match exception even if other variable on list dont exists \[[,\.0-9]+ sec\]\s*$','m'); ut.expect(g_tests_results).not_to_match('mixed_list_notexi'); end; procedure named_exc_pragma is begin - ut.expect(g_tests_results).to_match('^\s*Success resolve and match named exception defined in pragma exception init \[[\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Success resolve and match named exception defined in pragma exception init \[[,\.0-9]+ sec\]\s*$','m'); ut.expect(g_tests_results).not_to_match('mixed_list_notexi'); end; procedure named_exc_ora is begin - ut.expect(g_tests_results).to_match('^\s*Success resolve and match oracle named exception \[[\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Success resolve and match oracle named exception \[[,\.0-9]+ sec\]\s*$','m'); ut.expect(g_tests_results).not_to_match('named_exc_ora'); end; procedure named_exc_ora_dup_ind is begin - ut.expect(g_tests_results).to_match('^\s*Success resolve and match oracle named exception dup val index \[[\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Success resolve and match oracle named exception dup val index \[[,\.0-9]+ sec\]\s*$','m'); ut.expect(g_tests_results).not_to_match('named_exc_ora_dup_ind'); end; procedure nodata_exc_ora is begin - ut.expect(g_tests_results).to_match('^\s*Success map no data 100 to -1403 \[[\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Success map no data 100 to -1403 \[[,\.0-9]+ sec\]\s*$','m'); ut.expect(g_tests_results).not_to_match('nodata_exc_ora'); end; procedure defined_varchar_exc is begin - ut.expect(g_tests_results).to_match('^\s*Success for exception defined as varchar \[[\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Success for exception defined as varchar \[[,\.0-9]+ sec\]\s*$','m'); ut.expect(g_tests_results).not_to_match('defined_varchar_exc'); end; procedure non_existing_const is begin - ut.expect(g_tests_results).to_match('^\s*Non existing constant exception \[[\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Non existing constant exception \[[,\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); ut.expect(g_tests_results).to_match('non_existing_const\s*ORA-20143: Test error\s*ORA-06512: at "UT3_TESTER.ANNOTATED_PACKAGE_WITH_THROWS"'); end; procedure bad_exc_const is begin - ut.expect(g_tests_results).to_match('^\s*Bad exception constant \[[\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); + ut.expect(g_tests_results).to_match('^\s*Bad exception constant \[[,\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); ut.expect(g_tests_results).to_match('bad_exc_const\s*ORA-20143: Test error\s*ORA-06512: at "UT3_TESTER.ANNOTATED_PACKAGE_WITH_THROWS"'); end; diff --git a/test/core/annotations/test_before_after_test_annotation.pkb b/test/core/annotations/test_before_after_annotations.pkb similarity index 98% rename from test/core/annotations/test_before_after_test_annotation.pkb rename to test/core/annotations/test_before_after_annotations.pkb index 06871a335..0aa9f5c39 100644 --- a/test/core/annotations/test_before_after_test_annotation.pkb +++ b/test/core/annotations/test_before_after_annotations.pkb @@ -277,7 +277,7 @@ create or replace package body test_before_after_annotations is ut.expect(l_actual).to_be_empty; ut.expect(g_tests_results).to_match( - '^\s*Stops execution at first non-existing Beforetest procedure and marks test as errored \[[\.0-9]+ sec\] \(FAILED - 1\)\s*$' + '^\s*Stops execution at first non-existing Beforetest procedure and marks test as errored \[[,\.0-9]+ sec\] \(FAILED - 1\)\s*$' ,'m' ); ut.expect(g_tests_results).to_match( @@ -297,7 +297,7 @@ create or replace package body test_before_after_annotations is ut.expect(l_actual).to_be_empty; ut.expect(g_tests_results).to_match( - '^\s*Stops execution at first non-existing Beforetest procedure and marks test as errored \[[\.0-9]+ sec\] \(FAILED - 1\)\s*$' + '^\s*Stops execution at first non-existing Beforetest procedure and marks test as errored \[[,\.0-9]+ sec\] \(FAILED - 1\)\s*$' ,'m' ); ut.expect(g_tests_results).to_match( diff --git a/test/core/annotations/test_before_after_test_annotation.pks b/test/core/annotations/test_before_after_annotations.pks similarity index 100% rename from test/core/annotations/test_before_after_test_annotation.pks rename to test/core/annotations/test_before_after_annotations.pks diff --git a/test/core/reporters/test_junit_reporter.pkb b/test/core/reporters/test_junit_reporter.pkb index 6cd67b8a3..e0a7ea00d 100644 --- a/test/core/reporters/test_junit_reporter.pkb +++ b/test/core/reporters/test_junit_reporter.pkb @@ -166,7 +166,7 @@ create or replace package body test_junit_reporter as l_nls_numeric_characters varchar2(30); begin --Arrange - select nsp.value into l_nls_numeric_characters + select replace(nsp.value,'''','''''') into l_nls_numeric_characters from nls_session_parameters nsp where parameter = 'NLS_NUMERIC_CHARACTERS'; execute immediate q'[alter session set NLS_NUMERIC_CHARACTERS=', ']'; diff --git a/test/core/reporters/test_tfs_junit_reporter.pkb b/test/core/reporters/test_tfs_junit_reporter.pkb index bd09b8682..122c665e3 100644 --- a/test/core/reporters/test_tfs_junit_reporter.pkb +++ b/test/core/reporters/test_tfs_junit_reporter.pkb @@ -149,7 +149,7 @@ create or replace package body test_tfs_junit_reporter as l_nls_numeric_characters varchar2(30); begin --Arrange - select nsp.value into l_nls_numeric_characters + select replace(nsp.value,'''','''''') into l_nls_numeric_characters from nls_session_parameters nsp where parameter = 'NLS_NUMERIC_CHARACTERS'; execute immediate q'[alter session set NLS_NUMERIC_CHARACTERS=', ']'; diff --git a/test/install_tests.sql b/test/install_tests.sql index 2aa60692c..2f1292b74 100644 --- a/test/install_tests.sql +++ b/test/install_tests.sql @@ -23,7 +23,7 @@ alter session set plsql_optimize_level=0; @@core/test_ut_test.pks @@core/annotations/test_annotation_parser.pks @@core/annotations/test_annotation_manager.pks -@@core/annotations/test_before_after_test_annotation.pks +@@core/annotations/test_before_after_annotations.pks @@core/expectations/test_expectation_processor.pks @@core/expectations/test_matchers.pks @@core/test_output_buffer.pks @@ -74,7 +74,7 @@ set define off @@core/annotations/test_annotation_manager.pkb @@core/expectations/test_expectation_processor.pkb @@core/expectations/test_matchers.pkb -@@core/annotations/test_before_after_test_annotation.pkb +@@core/annotations/test_before_after_annotations.pkb @@core/test_output_buffer.pkb @@core/test_file_mapper.pkb @@core/test_suite_manager.pkb From 7b037d47cc92102df65546314e37c02fd98920e3 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 19 Oct 2018 19:07:08 +0100 Subject: [PATCH 0028/1096] Adding fix to avoid running sonar-scanner on external pull-requests. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a6aecb53c..58aa254e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -95,7 +95,7 @@ before_script: script: - if [[ ! $TRAVIS_TAG ]]; then bash test/install_and_run_tests.sh; fi - if [[ ! $TRAVIS_TAG ]]; then bash .travis/validate_report_files.sh; fi - - if [[ ! $TRAVIS_TAG ]] && [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ]; then bash .travis/run_sonar_scanner.sh; fi + - if [[ ! $TRAVIS_TAG ]] && [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [ "${TRAVIS_PULL_REQUEST_SLUG}" = "${TRAVIS_REPO_SLUG}" ]; then bash .travis/run_sonar_scanner.sh; fi - if [[ ! $TRAVIS_TAG ]]; then bash .travis/coveralls_uploader.sh; fi notifications: From b2f1b96c186203f697f87b27c679a0b8cdd8dbc1 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Fri, 19 Oct 2018 20:03:12 +0000 Subject: [PATCH 0029/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index a96253c58..a4388c523 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.3.2251-develop'; + gc_version constant varchar2(50) := 'v3.1.3.2276-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From 80ea7d79da781938c8d1a76606d36d2ad199f962 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Fri, 19 Oct 2018 17:57:26 +0200 Subject: [PATCH 0030/1096] Change CLI version to 3.1.0. It is a requirement to test the current develp branch --- development/template.env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/development/template.env.sh b/development/template.env.sh index 1e90aaed3..94004c89d 100755 --- a/development/template.env.sh +++ b/development/template.env.sh @@ -4,7 +4,7 @@ export SQLCLI=sql # For sqlcl client #export SQLCLI=sqlplus # For sqlplus client export CONNECTION_STR=127.0.0.1:1521/xe # Adjust the connect string export ORACLE_PWD=oracle # Adjust your local SYS password -export UTPLSQL_CLI_VERSION="3.0.4" +export UTPLSQL_CLI_VERSION="3.1.0" export SELFTESTING_BRANCH=develop export UTPLSQL_DIR="utPLSQL_latest_release" From 3d3a2e82a014ef3afa9c401f8ec8d240744fa485 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Fri, 19 Oct 2018 17:58:12 +0200 Subject: [PATCH 0031/1096] ignore temporary files created by actions described in CONTRIBUTING.md --- .gitignore | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.gitignore b/.gitignore index 13452754f..197d0f5e9 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,13 @@ utPLSQL_latest_release/ utPLSQL-cli/ development/env.sh *.log + +# exclusions based on artifacts created via actions documented in CONTRIBUTING.md +test/dummy.sql +coverage.html_assets/ +coverage.html +coverage.json +coverage.xml +tfs_test_results.xml +junit_test_results.xml +test_results.xml From 7170cda123f0837b2a3a7f0e062f4505b085fa88 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Fri, 19 Oct 2018 23:12:12 +0000 Subject: [PATCH 0032/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index a4388c523..fbf9a73ae 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.3.2276-develop'; + gc_version constant varchar2(50) := 'v3.1.3.2278-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From 59b1ead8ce22c56686fa3214addcb56cef965638 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sat, 20 Oct 2018 22:20:05 +0100 Subject: [PATCH 0033/1096] fix to unordered. Due to missing duplicate_no in populated table the data results been skewed. --- .../data_values/ut_compound_data_helper.pkb | 5 +-- .../data_values/ut_compound_data_value.tpb | 11 ++++++- .../expectations/test_expectations_cursor.pkb | 32 +++++++++++++++++++ .../expectations/test_expectations_cursor.pks | 8 ++--- 4 files changed, 49 insertions(+), 7 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index a75807f29..51614d56e 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -372,8 +372,7 @@ create or replace package body ut_compound_data_helper is /** * Since its unordered search we cannot select max rows from diffs as we miss some comparision records * We will restrict output on higher level of select - */ - + */ execute immediate q'[with diff_info as (select item_hash,duplicate_no from ut_compound_data_diff_tmp ucdc where diff_id = :diff_guid) select duplicate_no, @@ -402,6 +401,7 @@ create or replace package body ut_compound_data_helper is diff_info i where ucd.data_id = :self_guid and ucd.item_hash = i.item_hash + and ucd.duplicate_no = i.duplicate_no ) r, table( xmlsequence( extract(r.item_data,'/*') ) ) ucd ) ucd @@ -416,6 +416,7 @@ create or replace package body ut_compound_data_helper is diff_info i where ucd.data_id = :other_guid and ucd.item_hash = i.item_hash + and ucd.duplicate_no = i.duplicate_no ) r, table( xmlsequence( extract(r.item_data,'/*') ) ) ucd ) ucd diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index 1f4935aa2..d12817cee 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -234,6 +234,13 @@ create or replace type body ut_compound_data_value as **/ execute immediate 'merge into ' || l_ut_owner || '.ut_compound_data_tmp tgt using ( + select ucd_out.item_hash, + ucd_out.pk_hash, + ucd_out.item_no, + ucd_out.data_id, + row_number() over (partition by ucd_out.pk_hash,ucd_out.item_hash,ucd_out.data_id order by 1,2) duplicate_no + from + ( select '||l_ut_owner ||'.ut_compound_data_helper.get_hash(ucd.item_data.getclobval()) item_hash, pk_hash, ucd.item_no, ucd.data_id from @@ -242,11 +249,13 @@ create or replace type body ut_compound_data_value as from ' || l_ut_owner || q'[.ut_compound_data_tmp ucd where data_id = :self_guid or data_id = :other_guid ) ucd + )ucd_out ) src on (tgt.item_no = src.item_no and tgt.data_id = src.data_id) when matched then update set tgt.item_hash = src.item_hash, - tgt.pk_hash = src.pk_hash ]' + tgt.pk_hash = src.pk_hash, + tgt.duplicate_no = src.duplicate_no]' using a_exclude_xpath, a_include_xpath,a_join_by_xpath,self.data_id, l_other.data_id; /*!* diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index 461f58807..cede6a7c0 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -1987,6 +1987,38 @@ Diff:% end; + procedure unordered_fix_764 is + l_actual sys_refcursor; + l_expected sys_refcursor; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + open l_expected for + select 'Table' as name from dual + union all + select 'Desk' as name from dual + union all + select 'Table' as name from dual; + + open l_actual for + select 'Desk' as name from dual + union all + select 'Table' as name from dual; + + --Assert + ut3.ut.expect( l_actual ).to_equal( l_expected ).unordered(); + + --Assert + l_expected_message := q'[%Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 3 ] +%Diff: +%Rows: [ 1 differences ] +%Missing: Table%]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + + end; + procedure cursor_contain is l_actual SYS_REFCURSOR; l_expected SYS_REFCURSOR; diff --git a/test/core/expectations/test_expectations_cursor.pks b/test/core/expectations/test_expectations_cursor.pks index 66689717f..9085bd2fc 100644 --- a/test/core/expectations/test_expectations_cursor.pks +++ b/test/core/expectations/test_expectations_cursor.pks @@ -315,10 +315,10 @@ create or replace package test_expectations_cursor is --%test(Trying to join on collection element inside record ) procedure compare_rec_coll_as_join; - - --%test( Cursor contains data from another cursor) - procedure cursor_contain; - + + --%test( Unordered fix for issues with duplicate no : #764 ) + procedure unordered_fix_764; + --%test( Fail cursor contains data from another cursor ) procedure cursor_contain_fail; From 4d2a890e823c6db919f551512e7c9754f73e93fb Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sat, 20 Oct 2018 23:27:34 +0000 Subject: [PATCH 0034/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index fbf9a73ae..a42cda124 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.3.2278-develop'; + gc_version constant varchar2(50) := 'v3.1.3.2284-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From 29e1bf75e35ce4822025d643a4479a6811a03d55 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 20 Oct 2018 22:41:01 +0100 Subject: [PATCH 0035/1096] Moving uninstall tests to child job no 2 - (12.1) as it is now fastest build. --- .travis/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index 7b799eaa0..528b44f20 100644 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -13,8 +13,8 @@ alter session set plsql_optimize_level=0; @install_headless.sql $UT3_OWNER $UT3_OWNER_PASSWORD SQL -#Run this step only on first job slave (11.2 - at it's fastest) -if [[ "${TRAVIS_JOB_NUMBER}" =~ \.1$ ]]; then +#Run this step only on second child job (12.1 - at it's fastest) +if [[ "${TRAVIS_JOB_NUMBER}" =~ \.2$ ]]; then #check code-style for errors time "$SQLCLI" $UT3_OWNER/$UT3_OWNER_PASSWORD@//$CONNECTION_STR @../development/utplsql_style_check.sql From 45448acf3958fff7b9ce7c13095a94f347d953c2 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 21 Oct 2018 01:54:35 +0100 Subject: [PATCH 0036/1096] Disabling compilation with PLSQL compiler warnings. --- .travis/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/install.sh b/.travis/install.sh index 528b44f20..e37cfa35f 100644 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -8,7 +8,7 @@ time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL set feedback off set verify off -alter session set plsql_warnings = 'ENABLE:ALL', 'DISABLE:(5004,5018,6000,6001,6003,6009,6010,7206)'; +--alter session set plsql_warnings = 'ENABLE:ALL', 'DISABLE:(5004,5018,6000,6001,6003,6009,6010,7206)'; alter session set plsql_optimize_level=0; @install_headless.sql $UT3_OWNER $UT3_OWNER_PASSWORD SQL From add5ed808d83b31d2995392d24ec22fc763e9beb Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sun, 21 Oct 2018 01:24:18 +0000 Subject: [PATCH 0037/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index a42cda124..5623efa9b 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.3.2284-develop'; + gc_version constant varchar2(50) := 'v3.1.3.2297-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From f39b96a7392ef289787454fc9ec75da1af48c401 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sun, 21 Oct 2018 19:56:32 +0100 Subject: [PATCH 0038/1096] Update not to include --- .../data_values/ut_compound_data_helper.pkb | 6 +- source/expectations/ut_expectation.tpb | 23 ++- source/expectations/ut_expectation.tps | 3 +- .../expectations/ut_expectation_compound.tpb | 36 +---- .../expectations/test_expectations_cursor.pkb | 146 ++++++++++++++++-- .../expectations/test_expectations_cursor.pks | 40 ++++- 6 files changed, 187 insertions(+), 67 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 51614d56e..fc571e372 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -544,7 +544,7 @@ create or replace package body ut_compound_data_helper is l_sql varchar2(32767); begin l_sql := 'with source_data as - ( select t.data_id,t.item_hash,row_number() over (partition by t.pk_hash,t.item_hash,t.data_id order by 1,2) duplicate_no, + ( select t.data_id,t.item_hash,t.duplicate_no, pk_hash from ' || a_owner || '.ut_compound_data_tmp t where data_id = :self_guid or data_id = :other_guid @@ -577,7 +577,7 @@ create or replace package body ut_compound_data_helper is l_sql varchar2(32767); begin l_sql := 'with source_data as - ( select t.data_id,t.item_hash,row_number() over (partition by t.pk_hash,t.item_hash,t.data_id order by 1,2) duplicate_no, + ( select t.data_id,t.item_hash,t.duplicate_no, pk_hash from ' || a_owner || '.ut_compound_data_tmp t where data_id = :self_guid or data_id = :other_guid @@ -613,7 +613,7 @@ create or replace package body ut_compound_data_helper is begin /* Self set does not contain any values from other set */ l_sql := 'with source_data as - ( select t.data_id,t.item_hash,row_number() over (partition by t.pk_hash,t.item_hash,t.data_id order by 1,2) duplicate_no, + ( select t.data_id,t.item_hash,t.duplicate_no, pk_hash from ' || a_owner || '.ut_compound_data_tmp t where data_id = :self_guid or data_id = :other_guid diff --git a/source/expectations/ut_expectation.tpb b/source/expectations/ut_expectation.tpb index 2b86b0502..2ad402459 100644 --- a/source/expectations/ut_expectation.tpb +++ b/source/expectations/ut_expectation.tpb @@ -32,18 +32,13 @@ create or replace type body ut_expectation as l_matcher ut_matcher := a_matcher; l_message varchar2(32767); begin - l_expectation_result := l_matcher.run_matcher_negated( self.actual_data ); - l_expectation_result := coalesce(l_expectation_result,false); - l_message := coalesce( l_matcher.error_message( self.actual_data ), l_matcher.failure_message_when_negated( self.actual_data ) ); - ut_expectation_processor.add_expectation_result( ut_expectation_result( ut_utils.to_test_result( l_expectation_result ), self.description, l_message ) ); - end; - - member procedure not_include(self in ut_expectation, a_matcher ut_matcher) is - l_expectation_result boolean; - l_matcher ut_matcher := a_matcher; - l_message varchar2(32767); - begin - l_expectation_result := l_matcher.run_matcher( self.actual_data ); + --Negated matcher for include option. + if (l_matcher is of (ut_include)) then + l_expectation_result := l_matcher.run_matcher( self.actual_data ); + else + l_expectation_result := l_matcher.run_matcher_negated( self.actual_data ); + end if; + l_expectation_result := coalesce(l_expectation_result,false); l_message := coalesce( l_matcher.error_message( self.actual_data ), l_matcher.failure_message_when_negated( self.actual_data ) ); ut_expectation_processor.add_expectation_result( ut_expectation_result( ut_utils.to_test_result( l_expectation_result ), self.description, l_message ) ); @@ -701,12 +696,12 @@ create or replace type body ut_expectation as member procedure not_to_include(self in ut_expectation, a_expected sys_refcursor) is begin - self.not_include( ut_include(a_expected).negated ); + self.not_to( ut_include(a_expected).negated ); end; member procedure not_to_contain(self in ut_expectation, a_expected sys_refcursor) is begin - self.not_include( ut_include(a_expected).negated ); + self.not_to( ut_include(a_expected).negated ); end; end; diff --git a/source/expectations/ut_expectation.tps b/source/expectations/ut_expectation.tps index 80f25e21f..215a0e00a 100644 --- a/source/expectations/ut_expectation.tps +++ b/source/expectations/ut_expectation.tps @@ -21,8 +21,7 @@ create or replace type ut_expectation authid current_user as object( --base matcher executors member procedure to_(self in ut_expectation, a_matcher ut_matcher), member procedure not_to(self in ut_expectation, a_matcher ut_matcher), - member procedure not_include(self in ut_expectation, a_matcher ut_matcher), - + --shortcuts member procedure to_be_null(self in ut_expectation), member procedure to_be_not_null(self in ut_expectation), diff --git a/source/expectations/ut_expectation_compound.tpb b/source/expectations/ut_expectation_compound.tpb index 9dce4d84e..b34b97c85 100644 --- a/source/expectations/ut_expectation_compound.tpb +++ b/source/expectations/ut_expectation_compound.tpb @@ -124,11 +124,7 @@ create or replace type body ut_expectation_compound as member procedure include(self in ut_expectation_compound, a_items varchar2) is begin if ut_utils.int_to_boolean(negated) then - if (matcher is of (ut_include)) then - self.not_include( treat(matcher as ut_equal).include(a_items) ); - else - self.not_to( treat(matcher as ut_equal).include(a_items) ); - end if; + self.not_to( treat(matcher as ut_equal).include(a_items) ); else self.to_( treat(matcher as ut_equal).include(a_items) ); end if; @@ -137,11 +133,7 @@ create or replace type body ut_expectation_compound as member procedure include(self in ut_expectation_compound, a_items ut_varchar2_list) is begin if ut_utils.int_to_boolean(negated) then - if (matcher is of (ut_include)) then - self.not_include( treat(matcher as ut_equal).include(a_items) ); - else - self.not_to( treat(matcher as ut_equal).include(a_items) ); - end if; + self.not_to( treat(matcher as ut_equal).include(a_items) ); else self.to_( treat(matcher as ut_equal).include(a_items) ); end if; @@ -168,11 +160,7 @@ create or replace type body ut_expectation_compound as member procedure exclude(self in ut_expectation_compound, a_items varchar2) is begin if ut_utils.int_to_boolean(negated) then - if (matcher is of (ut_include)) then - self.not_include( treat(matcher as ut_equal).exclude(a_items) ); - else - self.not_to( treat(matcher as ut_equal).exclude(a_items) ); - end if; + self.not_to( treat(matcher as ut_equal).exclude(a_items) ); else self.to_( treat(matcher as ut_equal).exclude(a_items) ); end if; @@ -181,11 +169,7 @@ create or replace type body ut_expectation_compound as member procedure exclude(self in ut_expectation_compound, a_items ut_varchar2_list) is begin if ut_utils.int_to_boolean(negated) then - if (matcher is of (ut_include)) then - self.not_include( treat(matcher as ut_equal).exclude(a_items) ); - else - self.not_to( treat(matcher as ut_equal).exclude(a_items) ); - end if; + self.not_to( treat(matcher as ut_equal).exclude(a_items) ); else self.to_( treat(matcher as ut_equal).exclude(a_items) ); end if; @@ -228,11 +212,7 @@ create or replace type body ut_expectation_compound as member procedure join_by(self in ut_expectation_compound, a_columns varchar2) is begin if ut_utils.int_to_boolean(negated) then - if (matcher is of (ut_include)) then - self.not_include( treat(matcher as ut_equal).join_by(a_columns) ); - else - self.not_to( treat(matcher as ut_equal).join_by(a_columns) ); - end if; + self.not_to( treat(matcher as ut_equal).join_by(a_columns) ); else self.to_( treat(matcher as ut_equal).join_by(a_columns) ); end if; @@ -241,11 +221,7 @@ create or replace type body ut_expectation_compound as member procedure join_by(self in ut_expectation_compound, a_columns ut_varchar2_list) is begin if ut_utils.int_to_boolean(negated) then - if (matcher is of (ut_include)) then - self.not_include( treat(matcher as ut_equal).join_by(a_columns) ); - else - self.not_to( treat(matcher as ut_equal).join_by(a_columns) ); - end if; + self.not_to( treat(matcher as ut_equal).join_by(a_columns) ); else self.to_( treat(matcher as ut_equal).join_by(a_columns) ); end if; diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index cede6a7c0..3778bd93f 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -2019,7 +2019,7 @@ Diff:% end; - procedure cursor_contain is + procedure cursor_to_include is l_actual SYS_REFCURSOR; l_expected SYS_REFCURSOR; begin @@ -2035,7 +2035,7 @@ Diff:% ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; - procedure cursor_contain_fail is + procedure cursor_to_include_fail is l_actual SYS_REFCURSOR; l_expected SYS_REFCURSOR; l_expected_message varchar2(32767); @@ -2107,7 +2107,7 @@ Diff:% ut.expect(l_actual_message).to_be_like(l_expected_message); end; - procedure cursor_contain_joinby is + procedure cursor_to_include_joinby is l_actual SYS_REFCURSOR; l_expected SYS_REFCURSOR; begin @@ -2121,7 +2121,7 @@ Diff:% ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; - procedure cursor_contain_joinby_fail is + procedure cursor_to_include_joinby_fail is l_actual SYS_REFCURSOR; l_expected SYS_REFCURSOR; l_expected_message varchar2(32767); @@ -2151,7 +2151,51 @@ Diff:% end; - procedure contain_incl_cols_as_list + procedure cursor_contain_joinby is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + begin + --Arrange + open l_actual for select username,user_id from all_users; + open l_expected for select username ,user_id from all_users where rownum < 5; + + --Act + ut3.ut.expect(l_actual).to_contain(l_expected).join_by('USERNAME'); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure cursor_contain_joinby_fail is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + --Arrange + open l_actual for select username, user_id from all_users + union all + select 'TEST' username, -600 user_id from dual + order by 1 desc; + open l_expected for select username, user_id from all_users + union all + select 'TEST' username, -601 user_id from dual + order by 1 asc; + + --Act + ut3.ut.expect(l_actual).to_contain(l_expected).join_by('USERNAME'); + --Assert + l_expected_message := q'[%Actual: refcursor [ count = % ] was expected to include: refcursor [ count = % ] +%Diff: +%Rows: [ 1 differences ] +%PK TEST - Actual: -600 +%PK TEST - Expected: -601%]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + + end; + + procedure to_include_incl_cols_as_list as l_actual sys_refcursor; l_expected sys_refcursor; @@ -2164,8 +2208,22 @@ Diff:% --Assert ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; + + procedure to_contain_cont_cols_as_list + as + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + --Arrange + open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 6; + open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; + --Act + ut3.ut.expect(l_actual).to_contain(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; - procedure contain_join_incl_cols_as_lst + procedure to_inc_join_incl_cols_as_lst as l_actual sys_refcursor; l_expected sys_refcursor; @@ -2179,7 +2237,21 @@ Diff:% ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; - procedure contain_join_excl_cols_as_lst + procedure to_cont_join_incl_cols_as_lst + as + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + --Arrange + open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 10; + open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; + --Act + ut3.ut.expect(l_actual).to_contain(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')).join_by('RN'); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure include_join_excl_cols_as_lst as l_actual sys_refcursor; l_expected sys_refcursor; @@ -2193,7 +2265,21 @@ Diff:% ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; - procedure contain_excl_cols_as_list + procedure contain_join_excl_cols_as_lst + as + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + --Arrange + open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 10; + open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; + --Act + ut3.ut.expect(l_actual).to_contain(l_expected).exclude(ut3.ut_varchar2_list('//Some_Col','A_COLUMN')).join_by('RN'); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure include_excl_cols_as_list as l_actual sys_refcursor; l_expected sys_refcursor; @@ -2205,6 +2291,20 @@ Diff:% ut3.ut.expect(l_actual).to_include(l_expected).exclude(ut3.ut_varchar2_list('A_COLUMN|//Some_Col')); --Assert ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure contain_excl_cols_as_list + as + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + --Arrange + open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 10; + open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; + --Act + ut3.ut.expect(l_actual).to_contain(l_expected).exclude(ut3.ut_varchar2_list('A_COLUMN|//Some_Col')); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; procedure cursor_not_to_contain is @@ -2268,6 +2368,19 @@ Diff:% --Assert ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; + + procedure not_inc_join_incl_cols_as_lst is + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + --Arrange + open l_actual for select rownum as rn, 'b' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 10; + open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; + --Act + ut3.ut.expect(l_actual).not_to_include(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')).join_by('RN'); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; procedure not_cont_join_incl_cols_as_lst is l_actual sys_refcursor; @@ -2277,7 +2390,20 @@ Diff:% open l_actual for select rownum as rn, 'b' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 10; open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_include(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')).join_by('RN'); + ut3.ut.expect(l_actual).not_to_contain(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')).join_by('RN'); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure not_inc_join_excl_cols_as_lst is + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + --Arrange + open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'y' SOME_COL, 'd' "Some_Col" from dual a connect by level < 10; + open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; + --Act + ut3.ut.expect(l_actual).not_to_include(l_expected).exclude(ut3.ut_varchar2_list('//Some_Col','A_COLUMN')).join_by('RN'); --Assert ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; @@ -2290,7 +2416,7 @@ Diff:% open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'y' SOME_COL, 'd' "Some_Col" from dual a connect by level < 10; open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_include(l_expected).exclude(ut3.ut_varchar2_list('//Some_Col','A_COLUMN')).join_by('RN'); + ut3.ut.expect(l_actual).not_to_contain(l_expected).exclude(ut3.ut_varchar2_list('//Some_Col','A_COLUMN')).join_by('RN'); --Assert ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; diff --git a/test/core/expectations/test_expectations_cursor.pks b/test/core/expectations/test_expectations_cursor.pks index 9085bd2fc..a9e8ab593 100644 --- a/test/core/expectations/test_expectations_cursor.pks +++ b/test/core/expectations/test_expectations_cursor.pks @@ -319,29 +319,47 @@ create or replace package test_expectations_cursor is --%test( Unordered fix for issues with duplicate no : #764 ) procedure unordered_fix_764; - --%test( Fail cursor contains data from another cursor ) - procedure cursor_contain_fail; + --%test( Fail cursor to include data from another cursor ) + procedure cursor_to_include_fail; - --%test( Cursor contains data from another cursor using second keyword) - procedure cursor_to_contain; + --%test( Cursor include data from another cursor using second keyword) + procedure cursor_to_include; --%test( Fail cursor contains data from another cursor using second keyword) procedure cursor_to_contain_fail; + --%test( Cursor include data from another cursor with joinby) + procedure cursor_to_include_joinby; + + --%test( Fail cursor include data from another cursor with joinby) + procedure cursor_to_include_joinby_fail; + --%test( Cursor contains data from another cursor with joinby) procedure cursor_contain_joinby; --%test( Fail cursor contains data from another cursor with joinby) - procedure cursor_contain_joinby_fail; + procedure cursor_contain_joinby_fail; + --%test(Cursor include data with of columns to include) + procedure to_include_incl_cols_as_list; + --%test(Cursor contains data with of columns to include) - procedure contain_incl_cols_as_list; + procedure to_contain_cont_cols_as_list; + + --%test(Cursor includes data with of columns to include and join by value) + procedure to_inc_join_incl_cols_as_lst; + + --%test(Cursor contains data with of columns to include and join by value) + procedure to_cont_join_incl_cols_as_lst; - --%test(Cursor contains data with of columns to include and join by value) - procedure contain_join_incl_cols_as_lst; + --%test(Cursor include data with of columns to exclude and join by value) + procedure include_join_excl_cols_as_lst; --%test(Cursor contains data with of columns to exclude and join by value) procedure contain_join_excl_cols_as_lst; + + --%test(Cursor include data with of columns to exclude) + procedure include_excl_cols_as_list; --%test(Cursor contains data with of columns to exclude) procedure contain_excl_cols_as_list; @@ -357,10 +375,16 @@ create or replace package test_expectations_cursor is --%test( Cursor not include data from another cursor with joinby clause) procedure cursor_not_to_include_joinby; + + --%test(Cursor not include data with of columns to include and join by value) + procedure not_inc_join_incl_cols_as_lst; --%test(Cursor not contains data with of columns to include and join by value) procedure not_cont_join_incl_cols_as_lst; + --%test(Cursor not include data with of columns to exclude and join by value) + procedure not_inc_join_excl_cols_as_lst; + --%test(Cursor not contains data with of columns to exclude and join by value) procedure not_cont_join_excl_cols_as_lst; From 5aa19ea7f1a839f0975938845277c4688ca84bce Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sun, 21 Oct 2018 20:14:40 +0100 Subject: [PATCH 0039/1096] Update some of the format --- source/expectations/data_values/ut_compound_data_helper.pkb | 1 + source/expectations/data_values/ut_compound_data_value.tpb | 4 +++- source/expectations/data_values/ut_data_value_refcursor.tpb | 3 ++- source/expectations/matchers/ut_equal.tps | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index fc571e372..d1ab6b6a4 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -176,6 +176,7 @@ create or replace package body ut_compound_data_helper is l_results tt_row_diffs; begin l_column_filter := get_columns_row_filter(a_exclude_xpath,a_include_xpath); + /** * Since its unordered search we cannot select max rows from diffs as we miss some comparision records * We will restrict output on higher level of select diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index d12817cee..3ff986d17 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -107,6 +107,7 @@ create or replace type body ut_compound_data_value as l_actual := treat(a_other as ut_compound_data_value); dbms_lob.createtemporary(l_result,true); + --diff rows and row elements l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_actual.data_id); @@ -114,6 +115,7 @@ create or replace type body ut_compound_data_value as execute immediate 'select count('||case when a_join_by_xpath is not null then 'distinct pk_hash' else '*' end||') from ' || l_ut_owner || '.ut_compound_data_diff_tmp where diff_id = :diff_id' into l_diff_row_count using l_diff_id; + if l_diff_row_count > 0 then l_compare_type := ut_compound_data_helper.compare_type(a_join_by_xpath,a_unordered); l_row_diffs := ut_compound_data_helper.get_rows_diff( @@ -222,7 +224,7 @@ create or replace type body ut_compound_data_value as if not a_other is of (ut_compound_data_value) then raise value_error; end if; - + l_other := treat(a_other as ut_compound_data_value); l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index f380b86f8..5266a90bf 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -248,7 +248,7 @@ create or replace type body ut_data_value_refcursor as then l_result := 1; end if; - + if a_unordered then l_result := l_result + (self as ut_compound_data_value).compare_implementation(a_other, a_exclude_xpath, a_include_xpath, a_join_by_xpath, a_unordered, a_inclusion_compare, a_is_negated); @@ -265,5 +265,6 @@ create or replace type body ut_data_value_refcursor as return self.elements_count = 0; end; + end; / diff --git a/source/expectations/matchers/ut_equal.tps b/source/expectations/matchers/ut_equal.tps index a2b984c63..0ccbd23c8 100644 --- a/source/expectations/matchers/ut_equal.tps +++ b/source/expectations/matchers/ut_equal.tps @@ -1,4 +1,4 @@ -create or replace type ut_equal force under ut_comparison_matcher( +create or replace type ut_equal under ut_comparison_matcher( /* utPLSQL - Version 3 Copyright 2016 - 2018 utPLSQL Project @@ -71,4 +71,4 @@ create or replace type ut_equal force under ut_comparison_matcher( overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2 ) not final -/ \ No newline at end of file +/ From b05dbd7427959e8e5a5b30475b740a2e13da15da Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sat, 27 Oct 2018 15:13:59 +0100 Subject: [PATCH 0040/1096] Fix to issue #770 when the merge statement is run via current user which can result in error due to missing privs to internal function --- .../data_values/ut_compound_data_helper.pkb | 53 +++++++++++++++++++ .../data_values/ut_compound_data_helper.pks | 3 ++ .../data_values/ut_compound_data_value.tpb | 47 ++-------------- 3 files changed, 59 insertions(+), 44 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index c6a38e35c..0fba5b0e7 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -541,5 +541,58 @@ create or replace package body ut_compound_data_helper is return l_no_missing_keys; end; + procedure update_row_and_pk_hash(a_self_data_id in raw, a_other_data_id in raw, a_exclude_xpath varchar2, + a_include_xpath varchar2, a_join_by_xpath varchar2) is + l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_column_filter varchar2(32767); + l_pk_hash_sql varchar2(32767); + + function get_column_pk_hash(a_join_by_xpath varchar2) return varchar2 is + l_column varchar2(32767); + begin + /* due to possibility of key being to columns we cannot use xmlextractvalue + usage of xmlagg is possible however it greatly complicates code and performance is impacted. + xpath to be looked at or regex + */ + if a_join_by_xpath is not null then + l_column := l_ut_owner ||'.ut_compound_data_helper.get_hash(extract(ucd.item_data,:join_by_xpath).GetClobVal()) pk_hash'; + else + l_column := ':join_by_xpath pk_hash'; + end if; + return l_column; + end; + + begin + l_column_filter := ut_compound_data_helper.get_columns_filter(a_exclude_xpath, a_include_xpath); + l_pk_hash_sql := get_column_pk_hash(a_join_by_xpath); + + execute immediate 'merge into ' || l_ut_owner || '.ut_compound_data_tmp tgt + using ( + select ucd_out.item_hash, + ucd_out.pk_hash, + ucd_out.item_no, + ucd_out.data_id, + row_number() over (partition by ucd_out.pk_hash,ucd_out.item_hash,ucd_out.data_id order by 1,2) duplicate_no + from + ( + select '||l_ut_owner ||'.ut_compound_data_helper.get_hash(ucd.item_data.getclobval()) item_hash, + pk_hash, ucd.item_no, ucd.data_id + from + ( + select '||l_column_filter||','||l_pk_hash_sql||', item_no, data_id + from ' || l_ut_owner || q'[.ut_compound_data_tmp ucd + where data_id = :self_guid or data_id = :other_guid + ) ucd + )ucd_out + ) src + on (tgt.item_no = src.item_no and tgt.data_id = src.data_id) + when matched then update + set tgt.item_hash = src.item_hash, + tgt.pk_hash = src.pk_hash, + tgt.duplicate_no = src.duplicate_no]' + using a_exclude_xpath, a_include_xpath,a_join_by_xpath,a_self_data_id, a_other_data_id; + + end; + end; / diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index ab3693920..a18c20952 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -81,5 +81,8 @@ create or replace package ut_compound_data_helper authid definer is function is_pk_exists(a_expected_cursor xmltype, a_actual_cursor xmltype, a_exclude_xpath varchar2, a_include_xpath varchar2,a_join_by_xpath varchar2) return tt_missing_pk; + procedure update_row_and_pk_hash(a_self_data_id in raw, a_other_data_id in raw, a_exclude_xpath varchar2, + a_include_xpath varchar2, a_join_by_xpath varchar2); + end; / diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index de81830dd..e5a766890 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -197,27 +197,11 @@ create or replace type body ut_compound_data_value as member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean ) return integer is l_other ut_compound_data_value; l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_column_filter varchar2(32767); l_diff_id ut_compound_data_helper.t_hash; l_result integer; l_row_diffs ut_compound_data_helper.tt_row_diffs; c_max_rows constant integer := 20; - function get_column_pk_hash(a_join_by_xpath varchar2) return varchar2 is - l_column varchar2(32767); - begin - /* due to possibility of key being to columns we cannot use xmlextractvalue - usage of xmlagg is possible however it greatly complicates code and performance is impacted. - xpath to be looked at or regex - */ - if a_join_by_xpath is not null then - l_column := l_ut_owner ||'.ut_compound_data_helper.get_hash(extract(ucd.item_data,:join_by_xpath).GetClobVal()) pk_hash'; - else - l_column := ':join_by_xpath pk_hash'; - end if; - return l_column; - end; - begin if not a_other is of (ut_compound_data_value) then raise value_error; @@ -226,37 +210,12 @@ create or replace type body ut_compound_data_value as l_other := treat(a_other as ut_compound_data_value); l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); - l_column_filter := ut_compound_data_helper.get_columns_filter(a_exclude_xpath, a_include_xpath); - + /** * Due to incompatibility issues in XML between 11 and 12.2 and 12.1 versions we will prepopulate pk_hash upfront to * avoid optimizer incorrectly rewrite and causing NULL error or ORA-600 - **/ - execute immediate 'merge into ' || l_ut_owner || '.ut_compound_data_tmp tgt - using ( - select ucd_out.item_hash, - ucd_out.pk_hash, - ucd_out.item_no, - ucd_out.data_id, - row_number() over (partition by ucd_out.pk_hash,ucd_out.item_hash,ucd_out.data_id order by 1,2) duplicate_no - from - ( - select '||l_ut_owner ||'.ut_compound_data_helper.get_hash(ucd.item_data.getclobval()) item_hash, - pk_hash, ucd.item_no, ucd.data_id - from - ( - select '||l_column_filter||','||get_column_pk_hash(a_join_by_xpath)||', item_no, data_id - from ' || l_ut_owner || q'[.ut_compound_data_tmp ucd - where data_id = :self_guid or data_id = :other_guid - ) ucd - )ucd_out - ) src - on (tgt.item_no = src.item_no and tgt.data_id = src.data_id) - when matched then update - set tgt.item_hash = src.item_hash, - tgt.pk_hash = src.pk_hash, - tgt.duplicate_no = src.duplicate_no]' - using a_exclude_xpath, a_include_xpath,a_join_by_xpath,self.data_id, l_other.data_id; + **/ + ut_compound_data_helper.update_row_and_pk_hash(self.data_id, l_other.data_id, a_exclude_xpath,a_include_xpath,a_join_by_xpath); /* Peform minus on two sets two get diffrences that will be used later on to print results */ execute immediate 'insert into ' || l_ut_owner || '.ut_compound_data_diff_tmp ( diff_id,item_hash,pk_hash,duplicate_no) From 03ad5ecc1431a97538250005fdec42bd58fb67d4 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sat, 27 Oct 2018 16:10:11 +0100 Subject: [PATCH 0041/1096] Update documentation --- docs/userguide/advanced_data_comparison.md | 97 ++++++-- docs/userguide/expectations.md | 244 +++++++++++++++++++-- 2 files changed, 309 insertions(+), 32 deletions(-) diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 3eb45fe50..2b27bf54e 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -6,7 +6,7 @@ utPLSQL expectations incorporates advanced data comparison options when comparin - object type - nested table and varray -Advanced data-comparison options are available for the [`equal`](expectations.md#equal) matcher. +Advanced data-comparison options are available for the [`equal`](expectations.md#equal) and [`include/ contain`](expectations.md#include) matcher. ## Syntax @@ -15,6 +15,10 @@ Advanced data-comparison options are available for the [`equal`](expectations.md ut.expect( a_actual {data-type} ).not_to( equal( a_expected {data-type})[.extendend_option()[.extendend_option()[...]]]) ); ut.expect( a_actual {data-type} ).to_equal( a_expected {data-type})[.extendend_option()[.extendend_option()[...]]]); ut.expect( a_actual {data-type} ).not_to_equal( a_expected {data-type})[.extendend_option()[.extendend_option()[...]]] ); + ut.expect( a_actual {data-type} ).to_contain( a_expected {data-type})[.extendend_option()[.extendend_option()[...]]]); + ut.expect( a_actual {data-type} ).to_include( a_expected {data-type})[.extendend_option()[.extendend_option()[...]]]); + ut.expect( a_actual {data-type} ).not_to_include( a_expected {data-type})[.extendend_option()[.extendend_option()[...]]]); + ut.expect( a_actual {data-type} ).not_to_contain( a_expected {data-type})[.extendend_option()[.extendend_option()[...]]]); ``` `extended_option` can be one of: @@ -23,8 +27,8 @@ Advanced data-comparison options are available for the [`equal`](expectations.md - `exclude(a_items varchar2)` - item or comma separated list of items to exclude - `include(a_items ut_varchar2_list)` - table of items to include - `exclude(a_items ut_varchar2_list)` - table of items to exclude - - `unordered` - perform compare on unordered set of data, return only missing or actual - - `join_by(a_columns varchar2)` - columns or comma seperated list of columns to join two cursors by + - `unordered` - perform compare on unordered set of data, return only missing or actual ***not supported for `include / contain`*** + - `join_by(a_columns varchar2)` - columns or comma separated list of columns to join two cursors by - `join_by(a_columns ut_varchar2_list)` - table of columns to join two cursors by Each item in the comma separated list can be: @@ -42,9 +46,9 @@ When specifying column/attribute names, keep in mind that the names are **case s ## Excluding elements from data comparison -Consider the following example +Consider the following examples ```sql -procedure test_cursors_skip_columns is +procedure test_cur_skip_columns_eq is l_expected sys_refcursor; l_actual sys_refcursor; begin @@ -52,10 +56,19 @@ begin open l_actual for select sysdate "ADate", d.* from user_tables d; ut.expect( l_actual ).to_equal( l_expected ).exclude( 'IGNORE_ME,ADate' ); end; + +procedure test_cur_skip_columns_cn is + l_expected sys_refcursor; + l_actual sys_refcursor; +begin + open l_expected for select 'text' ignore_me, d.* from user_tables d; + open l_actual for select sysdate "ADate", d.* from user_tables d; + ut.expect( l_actual ).to_include( l_expected ).exclude( 'IGNORE_ME,ADate' ); +end; ``` Columns 'ignore_me' and "ADate" will get excluded from cursor comparison. -The cursor data is equal, when those columns are excluded. +The cursor data is equal or includes expected, when those columns are excluded. This option is useful in scenarios, when you need to exclude incomparable/unpredictable column data like CREATE_DATE of a record that is maintained by default value on a table column. @@ -63,7 +76,7 @@ This option is useful in scenarios, when you need to exclude incomparable/unpred Consider the following example ```sql -procedure include_columns_as_csv is +procedure include_col_as_csv_eq is l_actual sys_refcursor; l_expected sys_refcursor; begin @@ -71,14 +84,23 @@ begin open l_actual for select rownum as rn, 'a' as "A_Column", 'x' SOME_COL, a.* from all_objects a where rownum < 4; ut.expect( l_actual ).to_equal( l_expected ).include( 'RN,A_Column,SOME_COL' ); end; + +procedure include_col_as_csv_cn is + l_actual sys_refcursor; + l_expected sys_refcursor; +begin + open l_expected for select rownum as rn, 'a' as "A_Column", 'x' SOME_COL from dual a connect by level < 4; + open l_actual for select rownum as rn, 'a' as "A_Column", 'x' SOME_COL, a.* from all_objects a where rownum < 6; + ut.expect( l_actual ).to_contain( l_expected ).include( 'RN,A_Column,SOME_COL' ); +end; ``` ## Combining include/exclude options You can chain the advanced options in an expectation and mix the `varchar2` with `ut_varchar2_list` arguments. -When doing so, the fianl list of items to include/exclude will be a concatenation of all items. +When doing so, the final list of items to include/exclude will be a concatenation of all items. ```sql -procedure include_columns_as_csv is +procedure include_col_as_csv_eq is l_actual sys_refcursor; l_expected sys_refcursor; begin @@ -89,6 +111,19 @@ begin .include( ut_varchar2_list( 'A_Column', 'SOME_COL' ) ) .exclude( 'SOME_COL' ); end; + +procedure include_col_as_csv_cn is + l_actual sys_refcursor; + l_expected sys_refcursor; +begin + open l_expected for select rownum as rn, 'a' as "A_Column", 'x' SOME_COL from dual a connect by level < 4; + open l_actual for select rownum as rn, 'a' as "A_Column", 'Y' SOME_COL, a.* from all_objects a where rownum < 6; + ut.expect( l_actual ).to_contain( l_expected ) + .include( 'RN') + .include( ut_varchar2_list( 'A_Column', 'SOME_COL' ) ) + .exclude( 'SOME_COL' ); +end; + ``` Only the columns 'RN', "A_Column" will be compared. Column 'SOME_COL' is excluded. @@ -101,6 +136,8 @@ Unordered option allows for quick comparison of two cursors without need of orde Result of such comparison will be limited to only information about row existing or not existing in given set without actual information about exact differences. +**This option is not supported for `include / contain` matcher** + ```sql @@ -169,6 +206,33 @@ This will show you difference in row 'TEST' regardless of order. Assumption is that join by is made by column name so that what will be displayed as part of results. +Consider this example using `contain / include ` + +```sql +procedure join_by_username_cn is + l_actual sys_refcursor; + l_expected sys_refcursor; +begin + open l_actual for select username, user_id from all_users; + open l_expected for select username, user_id from all_users + union all + select 'TEST' username, -610 user_id from dual; + + ut.expect( l_actual ).to_contain( l_expected ).join_by('USERNAME'); +end; +``` + +This will show you that one value is not included in actual set: + +```sql + Actual: refcursor [ count = 43 ] was expected to include: refcursor [ count = 44 ] + Diff: + Rows: [ 1 differences ] + PK TEST - Missing -610 +``` + + + Join by options currently doesn't support nested table inside cursor comparison, however is still possible to compare a collection as a whole. Example. @@ -220,9 +284,7 @@ Diff: - - -**Please note that .join_by option will take longer to process due to need of parsing via primary keys.** +***Please note that .join_by option will take longer to process due to need of parsing via primary keys.*** ## Defining item as XPath When using XPath expression, keep in mind the following: @@ -233,7 +295,7 @@ When using XPath expression, keep in mind the following: Example of a valid XPath parameter to include columns: `RN`, `A_Column`, `SOME_COL` in data comparison. ```sql -procedure include_columns_as_xpath is +procedure include_col_as_xpath_eq is l_actual sys_refcursor; l_expected sys_refcursor; begin @@ -241,4 +303,13 @@ begin open l_actual for select rownum as rn, 'a' as "A_Column", 'x' SOME_COL, a.* from all_objects a where rownum < 4; ut.expect( l_actual ).to_equal( l_expected ).include( '/ROW/RN|/ROW/A_Column|/ROW/SOME_COL' ); end; + +procedure include_col_as_xpath_cn is + l_actual sys_refcursor; + l_expected sys_refcursor; +begin + open l_expected for select rownum as rn, 'a' as "A_Column", 'x' SOME_COL from dual a connect by level < 4; + open l_actual for select rownum as rn, 'a' as "A_Column", 'x' SOME_COL, a.* from all_objects a where rownum < 6; + ut.expect( l_actual ).to_include( l_expected ).include( '/ROW/RN|/ROW/A_Column|/ROW/SOME_COL' ); +end; ``` diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 4c6f3aa68..b013a6d9a 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -145,6 +145,7 @@ utPLSQL provides the following matchers to perform checks on the expected and ac - `be_null` - `be_true` - `equal` +- `include ` / `contain` - `have_count` - `match` @@ -432,6 +433,210 @@ end; The `a_nulls_are_equal` parameter controls the behavior of a `null = null` comparison. To change the behavior of `NULL = NULL` comparison pass the `a_nulls_are_equal => false` to the `equal` matcher. +## include / contain + +This matcher supports only cursor comparison. It check if the give set contain all values from given subset. + +Test using this matcher behaves similar to `equal` in respect that it succeeds only when the compared data-types are exactly the same. + +The matcher supports all advanced comparison options as `equal` e.g. include , exclude, join_by. + +The matcher will be successful only when all of the values in expected results are part of actual set. + +Similar negated `not_to_include`/ `not_to_contain` will be successful only when none of the values from expected set are part of actual e.g. + +*Example 1.* + +Set 1 is defined as [ A , B , C ] + +*Set 2 is defined as [A , D , E ]* + +*Result : This will fail both of options to`to_include` and `not_to_include`* + + + +*Example 2.* + +Set 1 is defined as [ A , B , C , D ] + +*Set 2 is defined as [A , B , D ]* + +*Result : This will be success on option `to_include` and fail `not_to_include`* + + + +*Example 3* + +Set 1 is defined as [ A , B , C ] + +*Set 2 is defined as [D, E , F ]* + +*Result : This will be success on options `not_to_include` and fail `to_include`* + + + +Example usage + +```sql +create or replace package example_include is + --%suite(Include test) + + --%test( Cursor include data from another cursor) + procedure cursor_to_include; + + --%test( Cursor include data from another cursor) + procedure cursor_not_to_include; + + --%test( Cursor fail include) + procedure cursor_fail_include; + + --%test( Cursor fail not include) + procedure cursor_fail_not_include; +end; +/ + +create or replace package body example_include is + + procedure cursor_to_include is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + begin + --Arrange + open l_actual for + select 'a' as name from dual + union all + select 'b' as name from dual + union all + select 'c' as name from dual + union all + select 'd' as name from dual; + + open l_expected for + select 'a' as name from dual + union all + select 'b' as name from dual + union all + select 'c' as name from dual; + + --Act + ut3.ut.expect(l_actual).to_include(l_expected); + end; + + procedure cursor_not_to_include is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + begin + --Arrange + open l_actual for + select 'a' as name from dual + union all + select 'b' as name from dual + union all + select 'c' as name from dual; + + open l_expected for + select 'd' as name from dual + union all + select 'e' as name from dual + union all + select 'f' as name from dual; + + --Act + ut3.ut.expect(l_actual).not_to_include(l_expected); + end; + + procedure cursor_fail_include is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + begin + --Arrange + open l_actual for + select 'a' as name from dual + union all + select 'b' as name from dual + union all + select 'c' as name from dual; + + open l_expected for + select 'a' as name from dual + union all + select 'd' as name from dual + union all + select 'e' as name from dual; + + --Act + ut3.ut.expect(l_actual).to_include(l_expected); + end; + + procedure cursor_fail_not_include is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + begin + --Arrange + open l_actual for + select 'a' as name from dual + union all + select 'b' as name from dual + union all + select 'c' as name from dual; + + open l_expected for + select 'a' as name from dual + union all + select 'd' as name from dual + union all + select 'e' as name from dual; + + --Act + ut3.ut.expect(l_actual).not_to_include(l_expected); + end; +end; +/ +``` + + + +Above execution will provide results as follow: + +```sql +Include test + Cursor include data from another cursor [.045 sec] + Cursor include data from another cursor [.039 sec] + Cursor fail include [.046 sec] (FAILED - 1) + Cursor fail not include [.043 sec] (FAILED - 2) + +Failures: + + 1) cursor_fail_include + Actual: refcursor [ count = 3 ] was expected to include: refcursor [ count = 3 ] + Diff: + Rows: [ 2 differences ] + Missing: d + Missing: e + at "UT3.EXAMPLE_INCLUDE.CURSOR_FAIL_INCLUDE", line 71 ut3.ut.expect(l_actual).to_include(l_expected); + + + 2) cursor_fail_not_include + Actual: (refcursor [ count = 3 ]) + Data-types: + CHAR + + Data: + a + b + c + was expected not to include:(refcursor [ count = 3 ]) + Data-types: + CHAR + + Data: + a + d + e + at "UT3.EXAMPLE_INCLUDE.CURSOR_FAIL_NOT_INCLUDE", line 94 ut3.ut.expect(l_actual).not_to_include(l_expected); +``` + + ## Comparing cursors, object types, nested tables and varrays @@ -450,7 +655,7 @@ utPLSQL is capable of comparing compound data-types including: - It is possible to compare PL/SQL records, collections, varrays and associative arrays. To compare this types of data, use cursor comparison feature of utPLSQL and TABLE operator in SQL query - On Oracle 11g Release 2 - pipelined table functions are needed (see section [Implicit (Shadow) Types in this artcile](https://oracle-base.com/articles/misc/pipelined-table-functions)) - On Oracle 12c and above - use [TABLE function on nested tables/varrays/associative arrays of PL/SQL records](https://oracle-base.com/articles/12c/using-the-table-operator-with-locally-defined-types-in-plsql-12cr1) - + utPLSQL offers advanced data-comparison options, for comparing compound data-types. The options allow you to: - define columns/attributes to exclude from comparison @@ -784,23 +989,24 @@ Since NULL is neither *true* nor *false*, both expectations will report failure. The matrix below illustrates the data types supported by different matchers. -| Matcher |blob |boolean|clob |date |number|timestamp|timestamp
with
timezone|timestamp
with
local
timezone|varchar2|interval
year
to
month|interval
day
to
second|cursor|nested
table
/ varray|object| -|:----------------------|:---:|:-----:|:---:|:---:|:----:|:-------:|:---------------------------:|:------------------------------------:|:------:|:-----------------------------:|:-----------------------------:|:----:|:-------------------------:|:----:| -|**be_not_null** | X | X | X | X | X | X | X | X | X | X | X | X | X | X | -|**be_null** | X | X | X | X | X | X | X | X | X | X | X | X | X | X | -|**be_false** | | X | | | | | | | | | | | | | -|**be_true** | | X | | | | | | | | | | | | | -|**be_greater_than** | | | | X | X | X | X | X | | X | X | | | | -|**be_greater_or_equal**| | | | X | X | X | X | X | | X | X | | | | -|**be_less_or_equal** | | | | X | X | X | X | X | | X | X | | | | -|**be_less_than** | | | | X | X | X | X | X | | X | X | | | | -|**be_between** | | | | X | X | X | X | X | X | X | X | | | | -|**equal** | X | X | X | X | X | X | X | X | X | X | X | X | X | X | -|**match** | | | X | | | | | | X | | | | | | -|**be_like** | | | X | | | | | | X | | | | | | -|**be_empty** | X | | X | | | | | | | | | X | X | | -|**have_count** | | | | | | | | | | | | X | X | | - - +| Matcher | blob | boolean | clob | date | number | timestamp | timestamp
with
timezone | timestamp
with
local
timezone | varchar2 | interval
year
to
month | interval
day
to
second | cursor | nested
table
/ varray | object | +| :---------------------- | :--: | :-----: | :--: | :--: | :----: | :-------: | :---------------------------: | :------------------------------------: | :------: | :-----------------------------: | :-----------------------------: | :----: | :-------------------------: | :----: | +| **be_not_null** | X | X | X | X | X | X | X | X | X | X | X | X | X | X | +| **be_null** | X | X | X | X | X | X | X | X | X | X | X | X | X | X | +| **be_false** | | X | | | | | | | | | | | | | +| **be_true** | | X | | | | | | | | | | | | | +| **be_greater_than** | | | | X | X | X | X | X | | X | X | | | | +| **be_greater_or_equal** | | | | X | X | X | X | X | | X | X | | | | +| **be_less_or_equal** | | | | X | X | X | X | X | | X | X | | | | +| **be_less_than** | | | | X | X | X | X | X | | X | X | | | | +| **be_between** | | | | X | X | X | X | X | X | X | X | | | | +| **equal** | X | X | X | X | X | X | X | X | X | X | X | X | X | X | +| **include / contain** | | | | | | | | | | | | X | X | X | +| **match** | | | X | | | | | | X | | | | | | +| **be_like** | | | X | | | | | | X | | | | | | +| **be_empty** | X | | X | | | | | | | | | X | X | | +| **have_count** | | | | | | | | | | | | X | X | | + +​ From 94234573bad50053c8e486acd36f8d084f4d5c63 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sun, 28 Oct 2018 07:48:16 +0000 Subject: [PATCH 0042/1096] Added test for min user test --- test/install__min_usr_tests.sql | 39 ++++++++++++++++++++++ test/install_and_run_tests.sh | 30 ++++++++++++++++- test/min_grant_user/min_grant_user_exp.pkb | 19 +++++++++++ test/min_grant_user/min_grant_user_exp.pks | 9 +++++ 4 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 test/install__min_usr_tests.sql create mode 100644 test/min_grant_user/min_grant_user_exp.pkb create mode 100644 test/min_grant_user/min_grant_user_exp.pks diff --git a/test/install__min_usr_tests.sql b/test/install__min_usr_tests.sql new file mode 100644 index 000000000..fa788f8f9 --- /dev/null +++ b/test/install__min_usr_tests.sql @@ -0,0 +1,39 @@ +set define off +whenever sqlerror exit failure rollback +whenever oserror exit failure rollback + +alter session set plsql_optimize_level=0; + +--Install tests +@@min_grant_user/min_grant_user_exp.pks +@@min_grant_user/min_grant_user_exp.pkb + +set linesize 200 +set define on +set verify off +column text format a100 +column error_count noprint new_value error_count + +prompt Validating installation + +set heading on +select type, name, sequence, line, position, text, count(1) over() error_count + from all_errors + where owner = USER + and name not like 'BIN$%' --not recycled + and name != 'UT_WITH_INVALID_BODY' + -- errors only. ignore warnings + and attribute = 'ERROR' + order by name, type, sequence +/ + +begin + if to_number('&&error_count') > 0 then + raise_application_error(-20000, 'Not all sources were successfully installed.'); + else + dbms_output.put_line('Installation completed successfully'); + end if; +end; +/ + +exit; diff --git a/test/install_and_run_tests.sh b/test/install_and_run_tests.sh index a1e5e0849..04d70fb39 100644 --- a/test/install_and_run_tests.sh +++ b/test/install_and_run_tests.sh @@ -1,10 +1,35 @@ #!/bin/bash set -ev +check_result() +{ + RC1=$1 + RC2=$2 + + if [ "$RC1" != "0" ] || [ "$RC2" != "0" ]; then + return 1 + fi + return 0 +} #goto git root directory git rev-parse && cd "$(git rev-parse --show-cdup)" +cd test + +time "$SQLCLI" ${UT3_USER}/${UT3_USER_PASSWORD}@//${CONNECTION_STR} @install__min_usr_tests.sql + +cd .. + +time utPLSQL-cli/bin/utplsql run ${UT3_USER}/${UT3_USER_PASSWORD}@${CONNECTION_STR} \ +-source_path=source -owner=ut3 \ +-test_path=test -c \ +-f=ut_documentation_reporter -o=min_test_results.log -s \ +-scc + +status_line_regex="^[0-9]+ tests, ([0-9]+) failed, ([0-9]+) errored.*" + +RC1=$(cat min_test_results.log | grep -E "${status_line_regex}" | sed -re "s/${status_line_regex}/\1\2/") cd test @@ -29,6 +54,9 @@ status_line_regex="^[0-9]+ tests, ([0-9]+) failed, ([0-9]+) errored.*" #cat coverage.xml #cat test_results.xml -RC=$(cat test_results.log | grep -E "${status_line_regex}" | sed -re "s/${status_line_regex}/\1\2/") +RC2=$(cat test_results.log | grep -E "${status_line_regex}" | sed -re "s/${status_line_regex}/\1\2/") + +check_result $RC1 $RC2 +RC=$? exit $RC diff --git a/test/min_grant_user/min_grant_user_exp.pkb b/test/min_grant_user/min_grant_user_exp.pkb new file mode 100644 index 000000000..1a8089c0b --- /dev/null +++ b/test/min_grant_user/min_grant_user_exp.pkb @@ -0,0 +1,19 @@ +create or replace package body min_grant_user_exp is + + procedure test_join_by_cursor is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + begin + --Arrange + open l_actual for select owner, object_name,object_type from all_objects where owner = user + order by 1,2,3 asc; + open l_expected for select owner, object_name,object_type from all_objects where owner = user + order by 1,2,3 desc; + + --Act + ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OWNER'); + + end; + +end; +/ diff --git a/test/min_grant_user/min_grant_user_exp.pks b/test/min_grant_user/min_grant_user_exp.pks new file mode 100644 index 000000000..467d62ce0 --- /dev/null +++ b/test/min_grant_user/min_grant_user_exp.pks @@ -0,0 +1,9 @@ +create or replace package min_grant_user_exp is + + --%suite(minimum grant user tests) + + --%test(execute join by test) + procedure test_join_by_cursor; + +end; +/ From 4b3fe8afa42febfce52769e4bb5b6d9eb20180f0 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sun, 28 Oct 2018 07:57:51 +0000 Subject: [PATCH 0043/1096] Update sqlcl download --- .travis/download.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/download.sh b/.travis/download.sh index d7f0b7d0f..a071fafeb 100644 --- a/.travis/download.sh +++ b/.travis/download.sh @@ -60,7 +60,7 @@ fi if [ "$PRODUCT" == "sqlcl" ]; then agreementUrl="http://www.oracle.com/technetwork/developer-tools/sqlcl/downloads/index.html" - downloadUrl="http://download.oracle.com/otn/java/sqldeveloper/sqlcl-18.2.0.zip" + downloadUrl="http://download.oracle.com/otn/java/sqldeveloper/sqlcl-18.3.0.259.2029.zip" outputFile=sqlcl-18.2.0.zip downloadFile $agreementUrl $downloadUrl $outputFile exit 0 From 40314b6045acbd3e5f71c83b502796b3c15da018 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sun, 28 Oct 2018 08:03:23 +0000 Subject: [PATCH 0044/1096] Revert "Update sqlcl download" This reverts commit 4b3fe8afa42febfce52769e4bb5b6d9eb20180f0. --- .travis/download.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/download.sh b/.travis/download.sh index a071fafeb..d7f0b7d0f 100644 --- a/.travis/download.sh +++ b/.travis/download.sh @@ -60,7 +60,7 @@ fi if [ "$PRODUCT" == "sqlcl" ]; then agreementUrl="http://www.oracle.com/technetwork/developer-tools/sqlcl/downloads/index.html" - downloadUrl="http://download.oracle.com/otn/java/sqldeveloper/sqlcl-18.3.0.259.2029.zip" + downloadUrl="http://download.oracle.com/otn/java/sqldeveloper/sqlcl-18.2.0.zip" outputFile=sqlcl-18.2.0.zip downloadFile $agreementUrl $downloadUrl $outputFile exit 0 From 2a6c82c513dfe08681d401873762af8d40582976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Sun, 28 Oct 2018 08:01:14 +0000 Subject: [PATCH 0045/1096] Fix sqlcl download --- .travis/download.js | 4 +++- .travis/download.sh | 7 ++++--- .travis/install_sqlcl.sh | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.travis/download.js b/.travis/download.js index bc981cdf4..339001c57 100644 --- a/.travis/download.js +++ b/.travis/download.js @@ -17,6 +17,7 @@ var paramUsername = casper.cli.get(0); var paramPassword = casper.cli.get(1); var agreementUrl = casper.cli.get(2); var downloadUrl = casper.cli.get(3); +var downloaded = false; casper.start(); // TODO: Error handling. @@ -41,10 +42,11 @@ casper.thenOpen(downloadUrl).waitForUrl(/signon\.jsp$/, function (re) { }); casper.on("resource.received", function (resource) { - if (resource.url.indexOf("AuthParam") !== -1) { + if (resource.url.indexOf("AuthParam") !== -1 && !downloaded) { // this.echo("DownloadUrl:"); // Print the download url. this.echo(resource.url); + downloaded = true; // TODO: Try to download file from here. this.download is not working because of cross site request. } }); diff --git a/.travis/download.sh b/.travis/download.sh index d7f0b7d0f..fdbcdef7c 100644 --- a/.travis/download.sh +++ b/.travis/download.sh @@ -12,8 +12,9 @@ PRODUCT="" # Then download the file using curl. downloadFile() { downloadUrl=$(exec casperjs download.js $ORACLE_OTN_USER $ORACLE_OTN_PASSWORD $1 $2) + downloadUrl=${downloadUrl%$'\r'} echo "DownloadURL: $downloadUrl" - curl $downloadUrl -o $3 + curl -o $3 -L "$downloadUrl" } ############################# @@ -60,8 +61,8 @@ fi if [ "$PRODUCT" == "sqlcl" ]; then agreementUrl="http://www.oracle.com/technetwork/developer-tools/sqlcl/downloads/index.html" - downloadUrl="http://download.oracle.com/otn/java/sqldeveloper/sqlcl-18.2.0.zip" - outputFile=sqlcl-18.2.0.zip + downloadUrl="https://download.oracle.com/otn/java/sqldeveloper/sqlcl-18.3.0.259.2029.zip" + outputFile=sqlcl-18.3.0.259.2029.zip downloadFile $agreementUrl $downloadUrl $outputFile exit 0 fi diff --git a/.travis/install_sqlcl.sh b/.travis/install_sqlcl.sh index 9db262c5d..9743ddac2 100644 --- a/.travis/install_sqlcl.sh +++ b/.travis/install_sqlcl.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -SQLCL_FILE=sqlcl-18.2.0.zip +SQLCL_FILE=sqlcl-18.3.0.259.2029.zip cd .travis # Download if not present on cache dir. From 899ddcffd57b5bb66448ea8306933dafae543cc2 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Thu, 1 Nov 2018 01:18:58 +0000 Subject: [PATCH 0046/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 5623efa9b..60f189a66 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.3.2297-develop'; + gc_version constant varchar2(50) := 'v3.1.3.2321-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From 72851ff5699583671415a890d17317fe9e258ab8 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Thu, 1 Nov 2018 18:46:01 +0000 Subject: [PATCH 0047/1096] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 899ddcffd57b5bb66448ea8306933dafae543cc2 Author: Travis CI Date: Thu Nov 1 01:18:58 2018 +0000 Updated project version after build [skip ci] commit df9dac7b2f4b5323db7a54865bc8f0be42ca34a8 Merge: 013cba3b 2a6c82c5 Author: Jacek Gębal Date: Thu Nov 1 01:05:42 2018 +0000 Merge pull request #772 from utPLSQL/bugfix/fix_travis_sqlcl_download_vini Fix sqlcl download commit 2a6c82c513dfe08681d401873762af8d40582976 Author: Jacek Gębal Date: Sun Oct 28 08:01:14 2018 +0000 Fix sqlcl download --- .travis/download.js | 4 +++- .travis/download.sh | 7 ++++--- .travis/install_sqlcl.sh | 2 +- source/core/ut_utils.pks | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.travis/download.js b/.travis/download.js index bc981cdf4..339001c57 100644 --- a/.travis/download.js +++ b/.travis/download.js @@ -17,6 +17,7 @@ var paramUsername = casper.cli.get(0); var paramPassword = casper.cli.get(1); var agreementUrl = casper.cli.get(2); var downloadUrl = casper.cli.get(3); +var downloaded = false; casper.start(); // TODO: Error handling. @@ -41,10 +42,11 @@ casper.thenOpen(downloadUrl).waitForUrl(/signon\.jsp$/, function (re) { }); casper.on("resource.received", function (resource) { - if (resource.url.indexOf("AuthParam") !== -1) { + if (resource.url.indexOf("AuthParam") !== -1 && !downloaded) { // this.echo("DownloadUrl:"); // Print the download url. this.echo(resource.url); + downloaded = true; // TODO: Try to download file from here. this.download is not working because of cross site request. } }); diff --git a/.travis/download.sh b/.travis/download.sh index d7f0b7d0f..fdbcdef7c 100644 --- a/.travis/download.sh +++ b/.travis/download.sh @@ -12,8 +12,9 @@ PRODUCT="" # Then download the file using curl. downloadFile() { downloadUrl=$(exec casperjs download.js $ORACLE_OTN_USER $ORACLE_OTN_PASSWORD $1 $2) + downloadUrl=${downloadUrl%$'\r'} echo "DownloadURL: $downloadUrl" - curl $downloadUrl -o $3 + curl -o $3 -L "$downloadUrl" } ############################# @@ -60,8 +61,8 @@ fi if [ "$PRODUCT" == "sqlcl" ]; then agreementUrl="http://www.oracle.com/technetwork/developer-tools/sqlcl/downloads/index.html" - downloadUrl="http://download.oracle.com/otn/java/sqldeveloper/sqlcl-18.2.0.zip" - outputFile=sqlcl-18.2.0.zip + downloadUrl="https://download.oracle.com/otn/java/sqldeveloper/sqlcl-18.3.0.259.2029.zip" + outputFile=sqlcl-18.3.0.259.2029.zip downloadFile $agreementUrl $downloadUrl $outputFile exit 0 fi diff --git a/.travis/install_sqlcl.sh b/.travis/install_sqlcl.sh index 9db262c5d..9743ddac2 100644 --- a/.travis/install_sqlcl.sh +++ b/.travis/install_sqlcl.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -SQLCL_FILE=sqlcl-18.2.0.zip +SQLCL_FILE=sqlcl-18.3.0.259.2029.zip cd .travis # Download if not present on cache dir. diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 5623efa9b..60f189a66 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.3.2297-develop'; + gc_version constant varchar2(50) := 'v3.1.3.2321-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From 5f25daf8241da361a2f34e9adf1362ed2d9c1aad Mon Sep 17 00:00:00 2001 From: lwasylow Date: Thu, 1 Nov 2018 19:10:40 +0000 Subject: [PATCH 0048/1096] Update run test shell. --- test/install_and_run_tests.sh | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/test/install_and_run_tests.sh b/test/install_and_run_tests.sh index 04d70fb39..79dfda65e 100644 --- a/test/install_and_run_tests.sh +++ b/test/install_and_run_tests.sh @@ -1,17 +1,6 @@ #!/bin/bash set -ev -check_result() -{ - RC1=$1 - RC2=$2 - - if [ "$RC1" != "0" ] || [ "$RC2" != "0" ]; then - return 1 - fi - return 0 -} - #goto git root directory git rev-parse && cd "$(git rev-parse --show-cdup)" @@ -29,7 +18,11 @@ time utPLSQL-cli/bin/utplsql run ${UT3_USER}/${UT3_USER_PASSWORD}@${CONNECTION_S status_line_regex="^[0-9]+ tests, ([0-9]+) failed, ([0-9]+) errored.*" -RC1=$(cat min_test_results.log | grep -E "${status_line_regex}" | sed -re "s/${status_line_regex}/\1\2/") +RC=$(cat min_test_results.log | grep -E "${status_line_regex}" | sed -re "s/${status_line_regex}/\1\2/") + +if [ "$RC" == "1" ] then + exit 1 +fi cd test @@ -54,9 +47,7 @@ status_line_regex="^[0-9]+ tests, ([0-9]+) failed, ([0-9]+) errored.*" #cat coverage.xml #cat test_results.xml -RC2=$(cat test_results.log | grep -E "${status_line_regex}" | sed -re "s/${status_line_regex}/\1\2/") - -check_result $RC1 $RC2 -RC=$? +RC=$(cat test_results.log | grep -E "${status_line_regex}" | sed -re "s/${status_line_regex}/\1\2/") exit $RC + From 2df635485077cb5e26af37a2b1e5f812348781d3 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Thu, 1 Nov 2018 19:18:25 +0000 Subject: [PATCH 0049/1096] Update shell --- test/install_and_run_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/install_and_run_tests.sh b/test/install_and_run_tests.sh index 79dfda65e..b8aba77e2 100644 --- a/test/install_and_run_tests.sh +++ b/test/install_and_run_tests.sh @@ -20,7 +20,7 @@ status_line_regex="^[0-9]+ tests, ([0-9]+) failed, ([0-9]+) errored.*" RC=$(cat min_test_results.log | grep -E "${status_line_regex}" | sed -re "s/${status_line_regex}/\1\2/") -if [ "$RC" == "1" ] then +if [ "$RC" == "1" ]; then exit 1 fi From 42563e90b1f0f44cd84c8c44f735332c8de45f8e Mon Sep 17 00:00:00 2001 From: lwasylow Date: Thu, 1 Nov 2018 20:19:12 +0000 Subject: [PATCH 0050/1096] Update documentation and added additional test. --- docs/userguide/expectations.md | 35 +++++++++++++++- .../expectations/test_expectations_cursor.pkb | 41 +++++++++++++++++++ .../expectations/test_expectations_cursor.pks | 6 +++ 3 files changed, 81 insertions(+), 1 deletion(-) diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index b013a6d9a..ac74510c1 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -443,9 +443,42 @@ The matcher supports all advanced comparison options as `equal` e.g. include , e The matcher will be successful only when all of the values in expected results are part of actual set. +In situation where the duplicate is present in expected set we would also expect matching number of occurrences in actual set for matcher to be success. + +*Example 1* + +```sql + PROCEDURE ut_refcursors IS + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + begin + --Arrange + open l_actual for select rownum as rn from dual a connect by level < 10; + open l_expected for select rownum as rn from dual a connect by level < 4 + union all select rownum as rn from dual a connect by level < 4; + + --Act + ut.expect(l_actual).to_include(l_expected); + END; +``` + +Will result in failure message + +```sql + 1) ut_refcursors + Actual: refcursor [ count = 9 ] was expected to include: refcursor [ count = 6 ] + Diff: + Rows: [ 3 differences ] + Missing: 3 + Missing: 2 + Missing: 1 +``` + + + Similar negated `not_to_include`/ `not_to_contain` will be successful only when none of the values from expected set are part of actual e.g. -*Example 1.* +*Example 2.* Set 1 is defined as [ A , B , C ] diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index 3778bd93f..04bbbe5d9 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -2420,6 +2420,47 @@ Diff:% --Assert ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; + + procedure to_include_duplicates is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + begin + --Arrange + open l_actual for select rownum as rn from dual a connect by level < 10 + union all + select rownum as rn from dual a connect by level < 4; + open l_expected for select rownum as rn from dual a connect by level < 4; + + --Act + ut3.ut.expect(l_actual).to_include(l_expected); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure to_include_duplicates_fail is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + --Arrange + open l_actual for select rownum as rn from dual a connect by level < 10; + open l_expected for select rownum as rn from dual a connect by level < 4 + union all select rownum as rn from dual a connect by level < 4; + + --Act + ut3.ut.expect(l_actual).to_include(l_expected); + --Assert + l_expected_message := q'[%Actual: refcursor [ count = 9 ] was expected to include: refcursor [ count = 6 ] +%Diff: +%Rows: [ 3 differences ] +%Missing: % +%Missing: % +%Missing: %]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; end; / diff --git a/test/core/expectations/test_expectations_cursor.pks b/test/core/expectations/test_expectations_cursor.pks index a9e8ab593..ca9977f41 100644 --- a/test/core/expectations/test_expectations_cursor.pks +++ b/test/core/expectations/test_expectations_cursor.pks @@ -387,6 +387,12 @@ create or replace package test_expectations_cursor is --%test(Cursor not contains data with of columns to exclude and join by value) procedure not_cont_join_excl_cols_as_lst; + + --%test(Cursor to include duplicates) + procedure to_include_duplicates; + + --%test(Cursor to include duplicates fail) + procedure to_include_duplicates_fail; end; / From 2a133a1e91cb25af571ec145b4cd8266e52ab36f Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sat, 27 Oct 2018 15:13:59 +0100 Subject: [PATCH 0051/1096] Fix to issue #770 when the merge statement is run via current user which can result in error due to missing privs to internal function --- .../data_values/ut_compound_data_helper.pkb | 53 +++++++++++++++++++ .../data_values/ut_compound_data_helper.pks | 3 ++ .../data_values/ut_compound_data_value.tpb | 47 ++-------------- 3 files changed, 59 insertions(+), 44 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index d1ab6b6a4..9860d82bf 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -541,6 +541,59 @@ create or replace package body ut_compound_data_helper is return l_no_missing_keys; end; + procedure update_row_and_pk_hash(a_self_data_id in raw, a_other_data_id in raw, a_exclude_xpath varchar2, + a_include_xpath varchar2, a_join_by_xpath varchar2) is + l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_column_filter varchar2(32767); + l_pk_hash_sql varchar2(32767); + + function get_column_pk_hash(a_join_by_xpath varchar2) return varchar2 is + l_column varchar2(32767); + begin + /* due to possibility of key being to columns we cannot use xmlextractvalue + usage of xmlagg is possible however it greatly complicates code and performance is impacted. + xpath to be looked at or regex + */ + if a_join_by_xpath is not null then + l_column := l_ut_owner ||'.ut_compound_data_helper.get_hash(extract(ucd.item_data,:join_by_xpath).GetClobVal()) pk_hash'; + else + l_column := ':join_by_xpath pk_hash'; + end if; + return l_column; + end; + + begin + l_column_filter := ut_compound_data_helper.get_columns_filter(a_exclude_xpath, a_include_xpath); + l_pk_hash_sql := get_column_pk_hash(a_join_by_xpath); + + execute immediate 'merge into ' || l_ut_owner || '.ut_compound_data_tmp tgt + using ( + select ucd_out.item_hash, + ucd_out.pk_hash, + ucd_out.item_no, + ucd_out.data_id, + row_number() over (partition by ucd_out.pk_hash,ucd_out.item_hash,ucd_out.data_id order by 1,2) duplicate_no + from + ( + select '||l_ut_owner ||'.ut_compound_data_helper.get_hash(ucd.item_data.getclobval()) item_hash, + pk_hash, ucd.item_no, ucd.data_id + from + ( + select '||l_column_filter||','||l_pk_hash_sql||', item_no, data_id + from ' || l_ut_owner || q'[.ut_compound_data_tmp ucd + where data_id = :self_guid or data_id = :other_guid + ) ucd + )ucd_out + ) src + on (tgt.item_no = src.item_no and tgt.data_id = src.data_id) + when matched then update + set tgt.item_hash = src.item_hash, + tgt.pk_hash = src.pk_hash, + tgt.duplicate_no = src.duplicate_no]' + using a_exclude_xpath, a_include_xpath,a_join_by_xpath,a_self_data_id, a_other_data_id; + + end; + function get_unordered(a_owner in varchar2) return varchar2 is l_sql varchar2(32767); begin diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 32512e391..e992fd48b 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -83,5 +83,8 @@ create or replace package ut_compound_data_helper authid definer is function get_refcursor_matcher_sql(a_owner in varchar2,a_inclusion_matcher boolean := false, a_negated_match boolean := false) return varchar2; + procedure update_row_and_pk_hash(a_self_data_id in raw, a_other_data_id in raw, a_exclude_xpath varchar2, + a_include_xpath varchar2, a_join_by_xpath varchar2); + end; / diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index 3ff986d17..49fe272eb 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -198,28 +198,12 @@ create or replace type body ut_compound_data_value as a_unordered boolean , a_inclusion_compare boolean := false, a_is_negated boolean := false ) return integer is l_other ut_compound_data_value; l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_column_filter varchar2(32767); l_diff_id ut_compound_data_helper.t_hash; l_result integer; l_row_diffs ut_compound_data_helper.tt_row_diffs; c_max_rows constant integer := 20; l_sql varchar2(32767); - function get_column_pk_hash(a_join_by_xpath varchar2) return varchar2 is - l_column varchar2(32767); - begin - /* due to possibility of key being to columns we cannot use xmlextractvalue - usage of xmlagg is possible however it greatly complicates code and performance is impacted. - xpath to be looked at or regex - */ - if a_join_by_xpath is not null then - l_column := l_ut_owner ||'.ut_compound_data_helper.get_hash(extract(ucd.item_data,:join_by_xpath).GetClobVal()) pk_hash'; - else - l_column := ':join_by_xpath pk_hash'; - end if; - return l_column; - end; - begin if not a_other is of (ut_compound_data_value) then raise value_error; @@ -228,37 +212,12 @@ create or replace type body ut_compound_data_value as l_other := treat(a_other as ut_compound_data_value); l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); - l_column_filter := ut_compound_data_helper.get_columns_filter(a_exclude_xpath, a_include_xpath); - + /** * Due to incompatibility issues in XML between 11 and 12.2 and 12.1 versions we will prepopulate pk_hash upfront to * avoid optimizer incorrectly rewrite and causing NULL error or ORA-600 - **/ - execute immediate 'merge into ' || l_ut_owner || '.ut_compound_data_tmp tgt - using ( - select ucd_out.item_hash, - ucd_out.pk_hash, - ucd_out.item_no, - ucd_out.data_id, - row_number() over (partition by ucd_out.pk_hash,ucd_out.item_hash,ucd_out.data_id order by 1,2) duplicate_no - from - ( - select '||l_ut_owner ||'.ut_compound_data_helper.get_hash(ucd.item_data.getclobval()) item_hash, - pk_hash, ucd.item_no, ucd.data_id - from - ( - select '||l_column_filter||','||get_column_pk_hash(a_join_by_xpath)||', item_no, data_id - from ' || l_ut_owner || q'[.ut_compound_data_tmp ucd - where data_id = :self_guid or data_id = :other_guid - ) ucd - )ucd_out - ) src - on (tgt.item_no = src.item_no and tgt.data_id = src.data_id) - when matched then update - set tgt.item_hash = src.item_hash, - tgt.pk_hash = src.pk_hash, - tgt.duplicate_no = src.duplicate_no]' - using a_exclude_xpath, a_include_xpath,a_join_by_xpath,self.data_id, l_other.data_id; + **/ + ut_compound_data_helper.update_row_and_pk_hash(self.data_id, l_other.data_id, a_exclude_xpath,a_include_xpath,a_join_by_xpath); /*!* * Comparision is based on type of search, for inclusion based search we will look for left join only. From 68d43d6681493f717de6c7b1946aad2fa1781e03 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sun, 28 Oct 2018 07:48:16 +0000 Subject: [PATCH 0052/1096] Added test for min user test --- test/install__min_usr_tests.sql | 39 ++++++++++++++++++++++ test/install_and_run_tests.sh | 30 ++++++++++++++++- test/min_grant_user/min_grant_user_exp.pkb | 19 +++++++++++ test/min_grant_user/min_grant_user_exp.pks | 9 +++++ 4 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 test/install__min_usr_tests.sql create mode 100644 test/min_grant_user/min_grant_user_exp.pkb create mode 100644 test/min_grant_user/min_grant_user_exp.pks diff --git a/test/install__min_usr_tests.sql b/test/install__min_usr_tests.sql new file mode 100644 index 000000000..fa788f8f9 --- /dev/null +++ b/test/install__min_usr_tests.sql @@ -0,0 +1,39 @@ +set define off +whenever sqlerror exit failure rollback +whenever oserror exit failure rollback + +alter session set plsql_optimize_level=0; + +--Install tests +@@min_grant_user/min_grant_user_exp.pks +@@min_grant_user/min_grant_user_exp.pkb + +set linesize 200 +set define on +set verify off +column text format a100 +column error_count noprint new_value error_count + +prompt Validating installation + +set heading on +select type, name, sequence, line, position, text, count(1) over() error_count + from all_errors + where owner = USER + and name not like 'BIN$%' --not recycled + and name != 'UT_WITH_INVALID_BODY' + -- errors only. ignore warnings + and attribute = 'ERROR' + order by name, type, sequence +/ + +begin + if to_number('&&error_count') > 0 then + raise_application_error(-20000, 'Not all sources were successfully installed.'); + else + dbms_output.put_line('Installation completed successfully'); + end if; +end; +/ + +exit; diff --git a/test/install_and_run_tests.sh b/test/install_and_run_tests.sh index a1e5e0849..04d70fb39 100644 --- a/test/install_and_run_tests.sh +++ b/test/install_and_run_tests.sh @@ -1,10 +1,35 @@ #!/bin/bash set -ev +check_result() +{ + RC1=$1 + RC2=$2 + + if [ "$RC1" != "0" ] || [ "$RC2" != "0" ]; then + return 1 + fi + return 0 +} #goto git root directory git rev-parse && cd "$(git rev-parse --show-cdup)" +cd test + +time "$SQLCLI" ${UT3_USER}/${UT3_USER_PASSWORD}@//${CONNECTION_STR} @install__min_usr_tests.sql + +cd .. + +time utPLSQL-cli/bin/utplsql run ${UT3_USER}/${UT3_USER_PASSWORD}@${CONNECTION_STR} \ +-source_path=source -owner=ut3 \ +-test_path=test -c \ +-f=ut_documentation_reporter -o=min_test_results.log -s \ +-scc + +status_line_regex="^[0-9]+ tests, ([0-9]+) failed, ([0-9]+) errored.*" + +RC1=$(cat min_test_results.log | grep -E "${status_line_regex}" | sed -re "s/${status_line_regex}/\1\2/") cd test @@ -29,6 +54,9 @@ status_line_regex="^[0-9]+ tests, ([0-9]+) failed, ([0-9]+) errored.*" #cat coverage.xml #cat test_results.xml -RC=$(cat test_results.log | grep -E "${status_line_regex}" | sed -re "s/${status_line_regex}/\1\2/") +RC2=$(cat test_results.log | grep -E "${status_line_regex}" | sed -re "s/${status_line_regex}/\1\2/") + +check_result $RC1 $RC2 +RC=$? exit $RC diff --git a/test/min_grant_user/min_grant_user_exp.pkb b/test/min_grant_user/min_grant_user_exp.pkb new file mode 100644 index 000000000..1a8089c0b --- /dev/null +++ b/test/min_grant_user/min_grant_user_exp.pkb @@ -0,0 +1,19 @@ +create or replace package body min_grant_user_exp is + + procedure test_join_by_cursor is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + begin + --Arrange + open l_actual for select owner, object_name,object_type from all_objects where owner = user + order by 1,2,3 asc; + open l_expected for select owner, object_name,object_type from all_objects where owner = user + order by 1,2,3 desc; + + --Act + ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OWNER'); + + end; + +end; +/ diff --git a/test/min_grant_user/min_grant_user_exp.pks b/test/min_grant_user/min_grant_user_exp.pks new file mode 100644 index 000000000..467d62ce0 --- /dev/null +++ b/test/min_grant_user/min_grant_user_exp.pks @@ -0,0 +1,9 @@ +create or replace package min_grant_user_exp is + + --%suite(minimum grant user tests) + + --%test(execute join by test) + procedure test_join_by_cursor; + +end; +/ From afe9e2cd9735c1a235ae62acb241575efbe72f74 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sun, 28 Oct 2018 07:57:51 +0000 Subject: [PATCH 0053/1096] Update sqlcl download --- .travis/download.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis/download.sh b/.travis/download.sh index fdbcdef7c..44c3fa1cc 100644 --- a/.travis/download.sh +++ b/.travis/download.sh @@ -61,8 +61,8 @@ fi if [ "$PRODUCT" == "sqlcl" ]; then agreementUrl="http://www.oracle.com/technetwork/developer-tools/sqlcl/downloads/index.html" - downloadUrl="https://download.oracle.com/otn/java/sqldeveloper/sqlcl-18.3.0.259.2029.zip" - outputFile=sqlcl-18.3.0.259.2029.zip + downloadUrl="http://download.oracle.com/otn/java/sqldeveloper/sqlcl-18.2.0.zip" + outputFile=sqlcl-18.2.0.zip downloadFile $agreementUrl $downloadUrl $outputFile exit 0 fi From 12edb2a13f93dfc669dbd98c228adf6a25855683 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Thu, 1 Nov 2018 18:46:01 +0000 Subject: [PATCH 0054/1096] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 899ddcffd57b5bb66448ea8306933dafae543cc2 Author: Travis CI Date: Thu Nov 1 01:18:58 2018 +0000 Updated project version after build [skip ci] commit df9dac7b2f4b5323db7a54865bc8f0be42ca34a8 Merge: 013cba3b 2a6c82c5 Author: Jacek Gębal Date: Thu Nov 1 01:05:42 2018 +0000 Merge pull request #772 from utPLSQL/bugfix/fix_travis_sqlcl_download_vini Fix sqlcl download commit 2a6c82c513dfe08681d401873762af8d40582976 Author: Jacek Gębal Date: Sun Oct 28 08:01:14 2018 +0000 Fix sqlcl download --- .travis/download.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis/download.sh b/.travis/download.sh index 44c3fa1cc..fdbcdef7c 100644 --- a/.travis/download.sh +++ b/.travis/download.sh @@ -61,8 +61,8 @@ fi if [ "$PRODUCT" == "sqlcl" ]; then agreementUrl="http://www.oracle.com/technetwork/developer-tools/sqlcl/downloads/index.html" - downloadUrl="http://download.oracle.com/otn/java/sqldeveloper/sqlcl-18.2.0.zip" - outputFile=sqlcl-18.2.0.zip + downloadUrl="https://download.oracle.com/otn/java/sqldeveloper/sqlcl-18.3.0.259.2029.zip" + outputFile=sqlcl-18.3.0.259.2029.zip downloadFile $agreementUrl $downloadUrl $outputFile exit 0 fi From 9dbb4e59e009d0768e81bdf875c20b77206fef06 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Thu, 1 Nov 2018 19:10:40 +0000 Subject: [PATCH 0055/1096] Update run test shell. --- test/install_and_run_tests.sh | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/test/install_and_run_tests.sh b/test/install_and_run_tests.sh index 04d70fb39..79dfda65e 100644 --- a/test/install_and_run_tests.sh +++ b/test/install_and_run_tests.sh @@ -1,17 +1,6 @@ #!/bin/bash set -ev -check_result() -{ - RC1=$1 - RC2=$2 - - if [ "$RC1" != "0" ] || [ "$RC2" != "0" ]; then - return 1 - fi - return 0 -} - #goto git root directory git rev-parse && cd "$(git rev-parse --show-cdup)" @@ -29,7 +18,11 @@ time utPLSQL-cli/bin/utplsql run ${UT3_USER}/${UT3_USER_PASSWORD}@${CONNECTION_S status_line_regex="^[0-9]+ tests, ([0-9]+) failed, ([0-9]+) errored.*" -RC1=$(cat min_test_results.log | grep -E "${status_line_regex}" | sed -re "s/${status_line_regex}/\1\2/") +RC=$(cat min_test_results.log | grep -E "${status_line_regex}" | sed -re "s/${status_line_regex}/\1\2/") + +if [ "$RC" == "1" ] then + exit 1 +fi cd test @@ -54,9 +47,7 @@ status_line_regex="^[0-9]+ tests, ([0-9]+) failed, ([0-9]+) errored.*" #cat coverage.xml #cat test_results.xml -RC2=$(cat test_results.log | grep -E "${status_line_regex}" | sed -re "s/${status_line_regex}/\1\2/") - -check_result $RC1 $RC2 -RC=$? +RC=$(cat test_results.log | grep -E "${status_line_regex}" | sed -re "s/${status_line_regex}/\1\2/") exit $RC + From 8752509617ecdc015f1afa3fe9e5039b30e3a599 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Thu, 1 Nov 2018 19:18:25 +0000 Subject: [PATCH 0056/1096] Update shell --- test/install_and_run_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/install_and_run_tests.sh b/test/install_and_run_tests.sh index 79dfda65e..b8aba77e2 100644 --- a/test/install_and_run_tests.sh +++ b/test/install_and_run_tests.sh @@ -20,7 +20,7 @@ status_line_regex="^[0-9]+ tests, ([0-9]+) failed, ([0-9]+) errored.*" RC=$(cat min_test_results.log | grep -E "${status_line_regex}" | sed -re "s/${status_line_regex}/\1\2/") -if [ "$RC" == "1" ] then +if [ "$RC" == "1" ]; then exit 1 fi From 4138d259d5beac0a9419083512169079f63182c0 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Thu, 1 Nov 2018 20:43:10 +0000 Subject: [PATCH 0057/1096] Added extra test for duplicate. Added one test in min grant user to prove it works. --- test/min_grant_user/min_grant_user_exp.pkb | 16 +++++++++++++++- test/min_grant_user/min_grant_user_exp.pks | 3 +++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/test/min_grant_user/min_grant_user_exp.pkb b/test/min_grant_user/min_grant_user_exp.pkb index 1a8089c0b..de79219e3 100644 --- a/test/min_grant_user/min_grant_user_exp.pkb +++ b/test/min_grant_user/min_grant_user_exp.pkb @@ -14,6 +14,20 @@ create or replace package body min_grant_user_exp is ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OWNER'); end; - + + procedure test_include_cursor is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + begin + --Arrange + open l_actual for select rownum as rn from dual a connect by level < 10 + union all + select rownum as rn from dual a connect by level < 4; + open l_expected for select rownum as rn from dual a connect by level < 4; + + --Act + ut3.ut.expect(l_actual).to_include(l_expected); + end; + end; / diff --git a/test/min_grant_user/min_grant_user_exp.pks b/test/min_grant_user/min_grant_user_exp.pks index 467d62ce0..f7636d550 100644 --- a/test/min_grant_user/min_grant_user_exp.pks +++ b/test/min_grant_user/min_grant_user_exp.pks @@ -5,5 +5,8 @@ create or replace package min_grant_user_exp is --%test(execute join by test) procedure test_join_by_cursor; + --%test(execute contain test) + procedure test_include_cursor; + end; / From e41d6f9471ffa99e609e7c4f05a1e163e4948cfe Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 30 Oct 2018 23:47:28 +0000 Subject: [PATCH 0058/1096] Interim commit with lots of dirty code - got to a place where I get the infamous ORA-00600 `ORA-00600: internal error code, arguments: [pfrobj.c: invalid RTTI for Object], [], [], [], [], [], [], [], [], [], [], []`` --- .../core/annotations/ut_annotated_object.tps | 1 + .../ut_annotation_cache_manager.pkb | 19 +- .../ut_annotation_cache_manager.pks | 2 +- .../annotations/ut_annotation_manager.pkb | 54 +- .../annotations/ut_annotation_manager.pks | 3 +- source/core/types/ut_logical_suite.tpb | 2 +- source/core/types/ut_logical_suites.tps | 19 + source/core/types/ut_suite.tpb | 4 +- source/core/types/ut_suite.tps | 2 +- source/core/types/ut_suite_context.tpb | 4 +- source/core/types/ut_suite_context.tps | 2 +- source/core/types/ut_suite_item.tpb | 12 +- source/core/types/ut_suite_item.tps | 19 +- source/core/types/ut_test.tpb | 8 +- source/core/types/ut_test.tps | 2 +- source/core/ut_expectation_processor.pkb | 4 +- source/core/ut_expectation_processor.pks | 2 +- source/core/ut_suite_builder.pkb | 619 ++++++++++++++---- source/core/ut_suite_builder.pks | 32 +- source/core/ut_suite_cache.sql | 89 +++ source/core/ut_suite_cache_manager.pkb | 284 ++++++++ source/core/ut_suite_cache_manager.pks | 32 + source/core/ut_suite_cache_schema.sql | 20 + source/core/ut_suite_manager.pkb | 147 ++++- source/install.sql | 5 + source/uninstall_objects.sql | 4 + .../expectations/test_expectations_cursor.pkb | 25 +- test/core/test_suite_builder.pkb | 57 +- test/core/test_suite_builder.pks | 14 +- test/core/test_ut_executable.pkb | 12 +- test/core/test_ut_suite.pkb | 28 +- test/core/test_ut_test.pkb | 30 +- 32 files changed, 1270 insertions(+), 287 deletions(-) create mode 100644 source/core/types/ut_logical_suites.tps create mode 100644 source/core/ut_suite_cache.sql create mode 100644 source/core/ut_suite_cache_manager.pkb create mode 100644 source/core/ut_suite_cache_manager.pks create mode 100644 source/core/ut_suite_cache_schema.sql diff --git a/source/core/annotations/ut_annotated_object.tps b/source/core/annotations/ut_annotated_object.tps index 4bf141a3f..e78a2a282 100644 --- a/source/core/annotations/ut_annotated_object.tps +++ b/source/core/annotations/ut_annotated_object.tps @@ -18,6 +18,7 @@ create type ut_annotated_object as object( object_owner varchar2(250), object_name varchar2(250), object_type varchar2(50), + parse_time date, annotations ut_annotations ) / diff --git a/source/core/annotations/ut_annotation_cache_manager.pkb b/source/core/annotations/ut_annotation_cache_manager.pkb index a05914e37..e9d60730b 100644 --- a/source/core/annotations/ut_annotation_cache_manager.pkb +++ b/source/core/annotations/ut_annotation_cache_manager.pkb @@ -37,17 +37,10 @@ create or replace package body ut_annotation_cache_manager as where cache_id = l_cache_id; if a_object.annotations is not null and a_object.annotations.count > 0 then --- begin insert into ut_annotation_cache (cache_id, annotation_position, annotation_name, annotation_text, subobject_name) select l_cache_id, a.position, a.name, a.text, a.subobject_name from table(a_object.annotations) a; - --TODO - duplicate annotations found?? - should not happen, getting standalone annotations need to happen after procedure annotations were parsed --- exception --- when others then --- dbms_output.put_line(xmltype(anydata.convertCollection(a_object.annotations)).getclobval); --- raise; --- end; end if; commit; end; @@ -81,12 +74,12 @@ create or replace package body ut_annotation_cache_manager as commit; end; - function get_annotations_for_objects(a_cached_objects ut_annotation_objs_cache_info) return sys_refcursor is + function get_annotations_for_objects(a_cached_objects ut_annotation_objs_cache_info, a_parse_date date) return sys_refcursor is l_results sys_refcursor; begin - open l_results for + open l_results for q'[ select ut_annotated_object( - o.object_owner, o.object_name, o.object_type, + i.object_owner, i.object_name, i.object_type, i.parse_time, cast( collect( ut_annotation( @@ -95,11 +88,13 @@ create or replace package body ut_annotation_cache_manager as ) as ut_annotations ) ) - from table(a_cached_objects) o + from table(:a_cached_objects) o join ut_annotation_cache_info i on o.object_owner = i.object_owner and o.object_name = i.object_name and o.object_type = i.object_type join ut_annotation_cache c on i.cache_id = c.cache_id - group by o.object_owner, o.object_name, o.object_type; + where ]'|| case when a_parse_date is null then ':a_parse_date is null' else 'i.parse_time > :a_parse_date' end ||q'[ + group by i.object_owner, i.object_name, i.object_type, i.parse_time]' + using a_cached_objects, a_parse_date; return l_results; end; diff --git a/source/core/annotations/ut_annotation_cache_manager.pks b/source/core/annotations/ut_annotation_cache_manager.pks index d37212d69..7663fdc33 100644 --- a/source/core/annotations/ut_annotation_cache_manager.pks +++ b/source/core/annotations/ut_annotation_cache_manager.pks @@ -32,7 +32,7 @@ create or replace package ut_annotation_cache_manager authid definer as * * @param a_cached_objects a `ut_annotation_objs_cache_info` list with information about objects to get from cache */ - function get_annotations_for_objects(a_cached_objects ut_annotation_objs_cache_info) return sys_refcursor; + function get_annotations_for_objects(a_cached_objects ut_annotation_objs_cache_info, a_parse_date date) return sys_refcursor; /** * Removes cached information about annotations for objects on the list and updates parse_time in cache info table. diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index e44e5dd10..7c299b766 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -19,11 +19,12 @@ create or replace package body ut_annotation_manager as ------------------------------ --private definitions - function get_annotation_objs_info_cur(a_object_owner varchar2, a_object_type varchar2) return sys_refcursor is - l_result sys_refcursor; + function get_annotation_objs_info(a_object_owner varchar2, a_object_type varchar2, a_parse_date date := null) return ut_annotation_objs_cache_info is + l_rows sys_refcursor; l_ut_owner varchar2(250) := ut_utils.ut_owner; l_objects_view varchar2(200) := ut_metadata.get_dba_view('dba_objects'); - l_cursor_text long; + l_cursor_text varchar2(32767); + l_result ut_annotation_objs_cache_info; begin l_cursor_text := q'[select ]'||l_ut_owner||q'[.ut_annotation_obj_cache_info( @@ -34,10 +35,20 @@ create or replace package body ut_annotation_manager as ) from ]'||l_objects_view||q'[ o left join ]'||l_ut_owner||q'[.ut_annotation_cache_info i - on o.owner = i.object_owner and o.object_name = i.object_name and o.object_type = i.object_type + on o.owner = i.object_owner + and o.object_name = i.object_name + and o.object_type = i.object_type where o.owner = :a_object_owner - and o.object_type = :a_object_type]'; - open l_result for l_cursor_text using a_object_owner, a_object_type; + and o.object_type = :a_object_type + and ]' + || case + when a_parse_date is null + then ':a_parse_date is null' + else 'o.last_ddl_time > :a_parse_date' + end; + open l_rows for l_cursor_text using a_object_owner, a_object_type, a_parse_date; + fetch l_rows bulk collect into l_result limit 1000000; + close l_rows; return l_result; end; @@ -103,6 +114,7 @@ create or replace package body ut_annotation_manager as l_names dbms_preprocessor.source_lines_t; l_name varchar2(250); l_object_lines dbms_preprocessor.source_lines_t; + l_parse_time date := sysdate; pragma autonomous_transaction; begin ut_annotation_cache_manager.cleanup_cache(a_schema_objects); @@ -112,7 +124,7 @@ create or replace package body ut_annotation_manager as if l_names(i) != l_name then l_annotations := ut_annotation_parser.parse_object_annotations(l_object_lines); ut_annotation_cache_manager.update_cache( - ut_annotated_object(a_object_owner, l_name, a_object_type, l_annotations) + ut_annotated_object(a_object_owner, l_name, a_object_type, l_parse_time, l_annotations) ); l_object_lines.delete; end if; @@ -126,7 +138,7 @@ create or replace package body ut_annotation_manager as if a_sources_cursor%rowcount > 0 then l_annotations := ut_annotation_parser.parse_object_annotations(l_object_lines); ut_annotation_cache_manager.update_cache( - ut_annotated_object(a_object_owner, l_name, a_object_type, l_annotations) + ut_annotated_object(a_object_owner, l_name, a_object_type, l_parse_time, l_annotations) ); l_object_lines.delete; end if; @@ -140,7 +152,8 @@ create or replace package body ut_annotation_manager as l_objects_to_parse ut_annotation_objs_cache_info := ut_annotation_objs_cache_info(); begin --get list of objects in cache - select count( 1)into l_objects_in_cache_count from table(a_info_rows) x where x.needs_refresh = 'N'; + select count(1) into l_objects_in_cache_count + from table(a_info_rows) x where x.needs_refresh = 'N'; --if cache is empty and there are objects to parse if l_objects_in_cache_count = 0 and a_info_rows.count > 0 then @@ -173,30 +186,26 @@ create or replace package body ut_annotation_manager as --public definitions ------------------------------------------------------------ procedure rebuild_annotation_cache(a_object_owner varchar2, a_object_type varchar2) is - l_info_cursor sys_refcursor; - l_info_rows ut_annotation_objs_cache_info; begin - l_info_cursor := get_annotation_objs_info_cur(a_object_owner, a_object_type); - fetch l_info_cursor bulk collect into l_info_rows; - close l_info_cursor; - rebuild_annotation_cache(a_object_owner, a_object_type, l_info_rows); + rebuild_annotation_cache( + a_object_owner, + a_object_type, + get_annotation_objs_info(a_object_owner, a_object_type, null) + ); end; - function get_annotated_objects(a_object_owner varchar2, a_object_type varchar2) return ut_annotated_objects pipelined is - l_info_cursor sys_refcursor; + function get_annotated_objects(a_object_owner varchar2, a_object_type varchar2, a_parse_date date := null) return ut_annotated_objects pipelined is l_info_rows ut_annotation_objs_cache_info; l_cursor sys_refcursor; l_results ut_annotated_objects; c_object_fetch_limit constant integer := 10; begin - - l_info_cursor := get_annotation_objs_info_cur(a_object_owner, a_object_type); - fetch l_info_cursor bulk collect into l_info_rows; - close l_info_cursor; + + l_info_rows := get_annotation_objs_info(a_object_owner, a_object_type, a_parse_date); rebuild_annotation_cache(a_object_owner, a_object_type, l_info_rows); --pipe annotations from cache - l_cursor := ut_annotation_cache_manager.get_annotations_for_objects(l_info_rows); + l_cursor := ut_annotation_cache_manager.get_annotations_for_objects(l_info_rows, a_parse_date); loop fetch l_cursor bulk collect into l_results limit c_object_fetch_limit; for i in 1 .. l_results.count loop @@ -205,7 +214,6 @@ create or replace package body ut_annotation_manager as exit when l_cursor%notfound; end loop; close l_cursor; - end; procedure purge_cache(a_object_owner varchar2, a_object_type varchar2) is diff --git a/source/core/annotations/ut_annotation_manager.pks b/source/core/annotations/ut_annotation_manager.pks index a2925c388..f0468ccd5 100644 --- a/source/core/annotations/ut_annotation_manager.pks +++ b/source/core/annotations/ut_annotation_manager.pks @@ -27,9 +27,10 @@ create or replace package ut_annotation_manager authid current_user as * * @param a_object_owner owner of objects to get annotations for * @param a_object_type type of objects to get annotations for + * @param a_parse_date date when object was last parsed * @return array containing annotated objects along with annotations for each object (nested) */ - function get_annotated_objects(a_object_owner varchar2, a_object_type varchar2) return ut_annotated_objects pipelined; + function get_annotated_objects(a_object_owner varchar2, a_object_type varchar2, a_parse_date date := null) return ut_annotated_objects pipelined; /** * Rebuilds annotation cache for a specified schema and object type. diff --git a/source/core/types/ut_logical_suite.tpb b/source/core/types/ut_logical_suite.tpb index 0443bf105..1acfc776c 100644 --- a/source/core/types/ut_logical_suite.tpb +++ b/source/core/types/ut_logical_suite.tpb @@ -21,7 +21,7 @@ create or replace type body ut_logical_suite as ) return self as result is begin self.self_type := $$plsql_unit; - self.init(a_object_owner, a_object_name, a_name); + self.init(a_object_owner, a_object_name, a_name, 0); self.path := a_path; self.disabled_flag := ut_utils.boolean_to_int(false); self.items := ut_suite_items(); diff --git a/source/core/types/ut_logical_suites.tps b/source/core/types/ut_logical_suites.tps new file mode 100644 index 000000000..560f245d0 --- /dev/null +++ b/source/core/types/ut_logical_suites.tps @@ -0,0 +1,19 @@ +create or replace type ut_logical_suites as + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + table of ut_logical_suite +/ diff --git a/source/core/types/ut_suite.tpb b/source/core/types/ut_suite.tpb index 9d9a60e8d..b92804fb0 100644 --- a/source/core/types/ut_suite.tpb +++ b/source/core/types/ut_suite.tpb @@ -17,11 +17,11 @@ create or replace type body ut_suite as */ constructor function ut_suite ( - self in out nocopy ut_suite, a_object_owner varchar2, a_object_name varchar2 + self in out nocopy ut_suite, a_object_owner varchar2, a_object_name varchar2, a_line_no integer ) return self as result is begin self.self_type := $$plsql_unit; - self.init(a_object_owner, a_object_name, a_object_name); + self.init(a_object_owner, a_object_name, a_object_name, a_line_no); self.items := ut_suite_items(); before_all_list := ut_executables(); after_all_list := ut_executables(); diff --git a/source/core/types/ut_suite.tps b/source/core/types/ut_suite.tps index f56d95c08..7057e4911 100644 --- a/source/core/types/ut_suite.tps +++ b/source/core/types/ut_suite.tps @@ -27,7 +27,7 @@ create or replace type ut_suite under ut_logical_suite ( */ after_all_list ut_executables, constructor function ut_suite ( - self in out nocopy ut_suite, a_object_owner varchar2, a_object_name varchar2 + self in out nocopy ut_suite, a_object_owner varchar2, a_object_name varchar2, a_line_no integer ) return self as result, overriding member function do_execute(self in out nocopy ut_suite) return boolean, overriding member function get_error_stack_traces(self ut_suite) return ut_varchar2_list, diff --git a/source/core/types/ut_suite_context.tpb b/source/core/types/ut_suite_context.tpb index a4add114b..c8255f374 100644 --- a/source/core/types/ut_suite_context.tpb +++ b/source/core/types/ut_suite_context.tpb @@ -17,11 +17,11 @@ create or replace type body ut_suite_context as */ constructor function ut_suite_context ( - self in out nocopy ut_suite_context, a_object_owner varchar2, a_object_name varchar2, a_context_name varchar2 := null + self in out nocopy ut_suite_context, a_object_owner varchar2, a_object_name varchar2, a_context_name varchar2 := null, a_line_no integer ) return self as result is begin self.self_type := $$plsql_unit; - self.init(a_object_owner, a_object_name, a_context_name); + self.init(a_object_owner, a_object_name, a_context_name, a_line_no); self.items := ut_suite_items(); before_all_list := ut_executables(); after_all_list := ut_executables(); diff --git a/source/core/types/ut_suite_context.tps b/source/core/types/ut_suite_context.tps index 345c12a65..ce4510c39 100644 --- a/source/core/types/ut_suite_context.tps +++ b/source/core/types/ut_suite_context.tps @@ -16,7 +16,7 @@ create or replace type ut_suite_context under ut_suite ( limitations under the License. */ constructor function ut_suite_context ( - self in out nocopy ut_suite_context, a_object_owner varchar2, a_object_name varchar2, a_context_name varchar2 := null + self in out nocopy ut_suite_context, a_object_owner varchar2, a_object_name varchar2, a_context_name varchar2 := null, a_line_no integer ) return self as result ) / diff --git a/source/core/types/ut_suite_item.tpb b/source/core/types/ut_suite_item.tpb index a3319a4d8..4788a9a3c 100644 --- a/source/core/types/ut_suite_item.tpb +++ b/source/core/types/ut_suite_item.tpb @@ -16,22 +16,18 @@ create or replace type body ut_suite_item as limitations under the License. */ - member procedure init(self in out nocopy ut_suite_item, a_object_owner varchar2, a_object_name varchar2, a_name varchar2) is + member procedure init(self in out nocopy ut_suite_item, a_object_owner varchar2, a_object_name varchar2, a_name varchar2, a_line_no integer) is begin self.object_owner := a_object_owner; self.object_name := lower(trim(a_object_name)); self.name := lower(trim(a_name)); self.results_count := ut_results_counter(); - self.warnings := ut_varchar2_list(); + self.warnings := ut_varchar2_rows(); + self.line_no := a_line_no; self.transaction_invalidators := ut_varchar2_list(); self.disabled_flag := ut_utils.boolean_to_int(false); end; - member procedure set_disabled_flag(self in out nocopy ut_suite_item, a_disabled_flag boolean) is - begin - self.disabled_flag := ut_utils.boolean_to_int(a_disabled_flag); - end; - member function get_disabled_flag return boolean is begin return ut_utils.int_to_boolean(self.disabled_flag); @@ -47,7 +43,7 @@ create or replace type body ut_suite_item as return nvl(self.rollback_type, ut_utils.gc_rollback_default); end; -final member procedure do_execute(self in out nocopy ut_suite_item) is + final member procedure do_execute(self in out nocopy ut_suite_item) is l_completed_without_errors boolean; begin l_completed_without_errors := self.do_execute(); diff --git a/source/core/types/ut_suite_item.tps b/source/core/types/ut_suite_item.tps index 52b6a2a19..0f08263c4 100644 --- a/source/core/types/ut_suite_item.tps +++ b/source/core/types/ut_suite_item.tps @@ -19,15 +19,15 @@ create or replace type ut_suite_item force under ut_event_item ( /** * owner of the database object (package) */ - object_owner varchar2(4000 byte), + object_owner varchar2(250 byte), /** * name of the database object (package) */ - object_name varchar2(4000 byte), + object_name varchar2(250 byte), /** * Name of the object (suite, sub-suite, test) */ - name varchar2(4000 byte), + name varchar2(250 byte), /** * Description fo the suite item (as given by the annotation) */ @@ -45,15 +45,22 @@ create or replace type ut_suite_item force under ut_event_item ( * Indicates if the test is to be disabled by execution */ disabled_flag integer(1), + /** + * Line no where annotation identifying this item is placed in package + */ + line_no integer, + /** + * Time when the suite item was last parsed from package source + */ + parse_time date, --execution result fields start_time timestamp with time zone, end_time timestamp with time zone, result integer(1), - warnings ut_varchar2_list, + warnings ut_varchar2_rows, results_count ut_results_counter, transaction_invalidators ut_varchar2_list, - member procedure init(self in out nocopy ut_suite_item, a_object_owner varchar2, a_object_name varchar2, a_name varchar2), - member procedure set_disabled_flag(self in out nocopy ut_suite_item, a_disabled_flag boolean), + member procedure init(self in out nocopy ut_suite_item, a_object_owner varchar2, a_object_name varchar2, a_name varchar2, a_line_no integer), member function get_disabled_flag return boolean, not instantiable member procedure mark_as_skipped(self in out nocopy ut_suite_item), member procedure set_rollback_type(self in out nocopy ut_suite_item, a_rollback_type integer), diff --git a/source/core/types/ut_test.tpb b/source/core/types/ut_test.tpb index f6495ecd6..ed9692e14 100644 --- a/source/core/types/ut_test.tpb +++ b/source/core/types/ut_test.tpb @@ -18,11 +18,11 @@ create or replace type body ut_test as constructor function ut_test( self in out nocopy ut_test, a_object_owner varchar2 := null, a_object_name varchar2, a_name varchar2, - a_expected_error_codes ut_integer_list := null + a_line_no integer, a_expected_error_codes ut_integer_list := null ) return self as result is begin self.self_type := $$plsql_unit; - self.init(a_object_owner, a_object_name, a_name); + self.init(a_object_owner, a_object_name, a_name, a_line_no); self.item := ut_executable_test(a_object_owner, a_object_name, a_name, ut_utils.gc_test_execute); self.before_each_list := ut_executables(); self.before_test_list := ut_executables(); @@ -97,7 +97,7 @@ create or replace type body ut_test as end; overriding member procedure calc_execution_result(self in out nocopy ut_test) is - l_warnings ut_varchar2_list; + l_warnings ut_varchar2_rows; begin if self.get_error_stack_traces().count = 0 then self.result := ut_expectation_processor.get_status(); @@ -107,7 +107,7 @@ create or replace type body ut_test as --expectation results need to be part of test results self.all_expectations := ut_expectation_processor.get_all_expectations(); self.failed_expectations := ut_expectation_processor.get_failed_expectations(); - l_warnings := coalesce( ut_expectation_processor.get_warnings(), ut_varchar2_list() ); + l_warnings := coalesce( ut_expectation_processor.get_warnings(), ut_varchar2_rows() ); self.warnings := self.warnings multiset union all l_warnings; self.results_count.increase_warning_count( cardinality(l_warnings) ); self.results_count.set_counter_values(self.result); diff --git a/source/core/types/ut_test.tps b/source/core/types/ut_test.tps index d26e220b9..752ef3ef7 100644 --- a/source/core/types/ut_test.tps +++ b/source/core/types/ut_test.tps @@ -57,7 +57,7 @@ create or replace type ut_test under ut_suite_item ( expected_error_codes ut_integer_list, constructor function ut_test( self in out nocopy ut_test, a_object_owner varchar2 := null, a_object_name varchar2, a_name varchar2, - a_expected_error_codes ut_integer_list := null + a_line_no integer, a_expected_error_codes ut_integer_list := null ) return self as result, overriding member procedure mark_as_skipped(self in out nocopy ut_test), overriding member function do_execute(self in out nocopy ut_test) return boolean, diff --git a/source/core/ut_expectation_processor.pkb b/source/core/ut_expectation_processor.pkb index 45dfb7dee..170846125 100644 --- a/source/core/ut_expectation_processor.pkb +++ b/source/core/ut_expectation_processor.pkb @@ -22,7 +22,7 @@ create or replace package body ut_expectation_processor as g_expectations_called ut_expectation_results := ut_expectation_results(); - g_warnings ut_varchar2_list := ut_varchar2_list(); + g_warnings ut_varchar2_rows := ut_varchar2_rows(); g_nulls_are_equal boolean_not_null := gc_default_nulls_are_equal; @@ -176,7 +176,7 @@ create or replace package body ut_expectation_processor as ); end; - function get_warnings return ut_varchar2_list is + function get_warnings return ut_varchar2_rows is begin return g_warnings; end; diff --git a/source/core/ut_expectation_processor.pks b/source/core/ut_expectation_processor.pks index f5d13ccb6..f58de2441 100644 --- a/source/core/ut_expectation_processor.pks +++ b/source/core/ut_expectation_processor.pks @@ -52,7 +52,7 @@ create or replace package ut_expectation_processor authid current_user as procedure add_depreciation_warning(a_deprecated_syntax varchar2, a_new_syntax varchar2); - function get_warnings return ut_varchar2_list; + function get_warnings return ut_varchar2_rows; function invalidation_exception_found return boolean; procedure set_invalidation_exception; diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index 8558b4331..ce269280a 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -59,7 +59,7 @@ create or replace package body ut_suite_builder is ); gc_placeholder constant varchar2(3) := '\\%'; - + gc_integer_exception constant varchar2(1) := 'I'; gc_named_exception constant varchar2(1) := 'N'; @@ -73,7 +73,7 @@ create or replace package body ut_suite_builder is text t_annotation_text, procedure_name t_object_name ); - + type tt_annotations_by_line is table of t_annotation index by t_annotation_position; --list of annotation texts for a given annotation indexed by annotation position: @@ -84,17 +84,18 @@ create or replace package body ut_suite_builder is -- procedure some_test ... -- when you'd like to have two beforetest procedures executed in a single test type tt_annotation_texts is table of t_annotation_text index by t_annotation_position; - + type tt_annotations_by_name is table of tt_annotation_texts index by t_annotation_name; type tt_annotations_by_proc is table of tt_annotations_by_name index by t_object_name; type t_annotations_info is record ( - owner t_object_name, - name t_object_name, - by_line tt_annotations_by_line, - by_proc tt_annotations_by_proc, - by_name tt_annotations_by_name + owner t_object_name, + name t_object_name, + parse_time date, + by_line tt_annotations_by_line, + by_proc tt_annotations_by_proc, + by_name tt_annotations_by_name ); procedure delete_annotations_range( @@ -430,37 +431,39 @@ create or replace package body ut_suite_builder is a_suite in out nocopy ut_suite, a_tests in out nocopy tt_tests, a_procedure_name t_object_name, - a_proc_annotations tt_annotations_by_name + a_annotations t_annotations_info ) is l_test ut_test; l_annotation_texts tt_annotation_texts; l_annotation_pos binary_integer; + l_proc_annotations tt_annotations_by_name := a_annotations.by_proc(a_procedure_name); begin - if not a_proc_annotations.exists(gc_test) then + if not l_proc_annotations.exists(gc_test) then return; end if; - warning_on_duplicate_annot(a_suite, a_proc_annotations, gc_test, a_procedure_name); - warning_on_duplicate_annot(a_suite, a_proc_annotations, gc_displayname, a_procedure_name); - warning_on_duplicate_annot(a_suite, a_proc_annotations, gc_rollback, a_procedure_name); + warning_on_duplicate_annot( a_suite, l_proc_annotations, gc_test, a_procedure_name); + warning_on_duplicate_annot( a_suite, l_proc_annotations, gc_displayname, a_procedure_name); + warning_on_duplicate_annot( a_suite, l_proc_annotations, gc_rollback, a_procedure_name); warning_bad_annot_combination( - a_suite, a_procedure_name, a_proc_annotations, gc_test, + a_suite, a_procedure_name, l_proc_annotations, gc_test, ut_varchar2_list(gc_beforeeach, gc_aftereach, gc_beforeall, gc_afterall) ); - - l_test := ut_test(a_suite.object_owner, a_suite.object_name, a_procedure_name); - if a_proc_annotations.exists(gc_displayname) then - l_annotation_texts := a_proc_annotations(gc_displayname); + l_test := ut_test(a_suite.object_owner, a_suite.object_name, a_procedure_name, l_proc_annotations( gc_test).first); + l_test.parse_time := a_annotations.parse_time; + + if l_proc_annotations.exists( gc_displayname) then + l_annotation_texts := l_proc_annotations( gc_displayname); --take the last definition if more than one was provided l_test.description := l_annotation_texts(l_annotation_texts.first); --TODO if more than one - warning else - l_test.description := a_proc_annotations(gc_test)(a_proc_annotations(gc_test).first); + l_test.description := l_proc_annotations(gc_test)(l_proc_annotations(gc_test).first); end if; l_test.path := a_suite.path ||'.'||a_procedure_name; - if a_proc_annotations.exists(gc_rollback) then - l_annotation_texts := a_proc_annotations(gc_rollback); + if l_proc_annotations.exists(gc_rollback) then + l_annotation_texts := l_proc_annotations(gc_rollback); l_test.rollback_type := get_rollback_type(l_annotation_texts(l_annotation_texts.first)); if l_test.rollback_type is null then add_annotation_ignored_warning( @@ -470,22 +473,22 @@ create or replace package body ut_suite_builder is end if; end if; - if a_proc_annotations.exists(gc_beforetest) then + if l_proc_annotations.exists( gc_beforetest) then l_test.before_test_list := convert_list( - add_executables( l_test.object_owner, l_test.object_name, a_proc_annotations( gc_beforetest ), gc_beforetest ) + add_executables( l_test.object_owner, l_test.object_name, l_proc_annotations( gc_beforetest ), gc_beforetest ) ); end if; - if a_proc_annotations.exists(gc_aftertest) then + if l_proc_annotations.exists( gc_aftertest) then l_test.after_test_list := convert_list( - add_executables( l_test.object_owner, l_test.object_name, a_proc_annotations( gc_aftertest ), gc_aftertest ) + add_executables( l_test.object_owner, l_test.object_name, l_proc_annotations( gc_aftertest ), gc_aftertest ) ); end if; - if a_proc_annotations.exists(gc_throws) then - add_to_throws_numbers_list(a_suite, l_test.expected_error_codes, a_procedure_name, a_proc_annotations(gc_throws)); + if l_proc_annotations.exists( gc_throws) then + add_to_throws_numbers_list(a_suite, l_test.expected_error_codes, a_procedure_name, l_proc_annotations( gc_throws)); end if; - l_test.disabled_flag := ut_utils.boolean_to_int(a_proc_annotations.exists(gc_disabled)); + l_test.disabled_flag := ut_utils.boolean_to_int( l_proc_annotations.exists( gc_disabled)); - a_tests(a_proc_annotations(gc_test).first) := l_test; + a_tests( l_proc_annotations( gc_test).first) := l_test; end; procedure update_before_after_each( @@ -512,13 +515,37 @@ create or replace package body ut_suite_builder is end if; end; + procedure update_before_after_each( + a_suite_items in out nocopy ut_suite_items, + a_before_each_list tt_executables, + a_after_each_list tt_executables + ) is + l_test ut_test; + l_context ut_logical_suite; + begin + if a_suite_items is not null then + for i in 1 .. a_suite_items.count loop + if a_suite_items(i) is of (ut_test) then + l_test := treat( a_suite_items(i) as ut_test); + l_test.before_each_list := coalesce(convert_list(a_before_each_list),ut_executables()) multiset union all l_test.before_each_list; + l_test.after_each_list := l_test.after_each_list multiset union all coalesce(convert_list(a_after_each_list),ut_executables()); + a_suite_items(i) := l_test; + elsif a_suite_items(i) is of (ut_logical_suite) then + l_context := treat(a_suite_items(i) as ut_logical_suite); + update_before_after_each(l_context.items, a_before_each_list, a_after_each_list); + a_suite_items(i) := l_context; + end if; + end loop; + end if; + end; + procedure process_before_after_annot( a_list in out nocopy tt_executables, a_annotation_name t_annotation_name, a_procedure_name t_object_name, a_proc_annotations tt_annotations_by_name, a_suite in out nocopy ut_suite - ) is + ) is begin if a_proc_annotations.exists(a_annotation_name) and not a_proc_annotations.exists(gc_test) then a_list( a_proc_annotations(a_annotation_name).first ) := ut_executables(ut_executable(a_suite.object_owner, a_suite.object_name, a_procedure_name, a_annotation_name)); @@ -528,7 +555,7 @@ create or replace package body ut_suite_builder is end; procedure add_annotated_procedures( - a_proc_annotations tt_annotations_by_proc, + a_proc_annotations t_annotations_info, a_suite in out nocopy ut_suite, a_before_each_list in out nocopy tt_executables, a_after_each_list in out nocopy tt_executables, @@ -538,18 +565,42 @@ create or replace package body ut_suite_builder is l_procedure_name t_object_name; l_tests tt_tests; begin - l_procedure_name := a_proc_annotations.first; + l_procedure_name := a_proc_annotations.by_proc.first; while l_procedure_name is not null loop - add_test( a_suite, l_tests, l_procedure_name, a_proc_annotations(l_procedure_name) ); - process_before_after_annot(a_before_each_list, gc_beforeeach, l_procedure_name, a_proc_annotations(l_procedure_name), a_suite); - process_before_after_annot(a_after_each_list, gc_aftereach, l_procedure_name, a_proc_annotations(l_procedure_name), a_suite); - process_before_after_annot(a_before_all_list, gc_beforeall, l_procedure_name, a_proc_annotations(l_procedure_name), a_suite); - process_before_after_annot(a_after_all_list, gc_afterall, l_procedure_name, a_proc_annotations(l_procedure_name), a_suite); - l_procedure_name := a_proc_annotations.next( l_procedure_name ); + add_test( a_suite, l_tests, l_procedure_name, a_proc_annotations ); + process_before_after_annot(a_before_each_list, gc_beforeeach, l_procedure_name, a_proc_annotations.by_proc(l_procedure_name), a_suite); + process_before_after_annot(a_after_each_list, gc_aftereach, l_procedure_name, a_proc_annotations.by_proc(l_procedure_name), a_suite); + process_before_after_annot(a_before_all_list, gc_beforeall, l_procedure_name, a_proc_annotations.by_proc(l_procedure_name), a_suite); + process_before_after_annot(a_after_all_list, gc_afterall, l_procedure_name, a_proc_annotations.by_proc(l_procedure_name), a_suite); + l_procedure_name := a_proc_annotations.by_proc.next( l_procedure_name ); end loop; a_suite.items := a_suite.items multiset union all convert_list(l_tests); end; + function get_annotated_procedures( + a_proc_annotations t_annotations_info, + a_suite in out nocopy ut_suite, + a_before_each_list in out nocopy tt_executables, + a_after_each_list in out nocopy tt_executables, + a_before_all_list in out nocopy tt_executables, + a_after_all_list in out nocopy tt_executables + ) return ut_suite_items is + l_procedure_name t_object_name; + l_tests tt_tests; + + begin + l_procedure_name := a_proc_annotations.by_proc.first; + while l_procedure_name is not null loop + add_test( a_suite, l_tests, l_procedure_name, a_proc_annotations ); + process_before_after_annot(a_before_each_list, gc_beforeeach, l_procedure_name, a_proc_annotations.by_proc(l_procedure_name), a_suite); + process_before_after_annot(a_after_each_list, gc_aftereach, l_procedure_name, a_proc_annotations.by_proc(l_procedure_name), a_suite); + process_before_after_annot(a_before_all_list, gc_beforeall, l_procedure_name, a_proc_annotations.by_proc(l_procedure_name), a_suite); + process_before_after_annot(a_after_all_list, gc_afterall, l_procedure_name, a_proc_annotations.by_proc(l_procedure_name), a_suite); + l_procedure_name := a_proc_annotations.by_proc.next( l_procedure_name ); + end loop; + return convert_list(l_tests); + end; + procedure build_suitepath( a_suite in out nocopy ut_suite, a_annotations t_annotations_info @@ -630,7 +681,7 @@ create or replace package body ut_suite_builder is a_suite.disabled_flag := ut_utils.boolean_to_int(a_annotations.by_name.exists(gc_disabled)); --process procedure annotations for suite - add_annotated_procedures(a_annotations.by_proc, a_suite, l_before_each_list, l_after_each_list, l_before_all_list, l_after_all_list); + add_annotated_procedures(a_annotations, a_suite, l_before_each_list, l_after_each_list, l_before_all_list, l_after_all_list); a_suite.set_rollback_type(l_rollback_type); update_before_after_each(a_suite, l_before_each_list, l_after_each_list); @@ -638,6 +689,112 @@ create or replace package body ut_suite_builder is a_suite.after_all_list := convert_list(l_after_all_list); end; + function get_suite_items( + a_suite in out nocopy ut_suite, + a_annotations t_annotations_info + ) return ut_suite_items is + l_before_each_list tt_executables; + l_after_each_list tt_executables; + l_before_all_list tt_executables; + l_after_all_list tt_executables; + l_rollback_type ut_utils.t_rollback_type; + l_annotation_text t_annotation_text; + l_results ut_suite_items := ut_suite_items(); + begin + if a_annotations.by_name.exists(gc_displayname) then + l_annotation_text := trim(a_annotations.by_name(gc_displayname)(a_annotations.by_name(gc_displayname).first)); + if l_annotation_text is not null then + a_suite.description := l_annotation_text; + else + add_annotation_ignored_warning( + a_suite, gc_displayname, '%%% annotation requires a non-empty parameter value.', + a_annotations.by_name(gc_displayname).first + ); + end if; + warning_on_duplicate_annot(a_suite, a_annotations.by_name, gc_displayname); + end if; + + if a_annotations.by_name.exists(gc_rollback) then + l_rollback_type := get_rollback_type(a_annotations.by_name(gc_rollback)(a_annotations.by_name(gc_rollback).first)); + if l_rollback_type is null then + add_annotation_ignored_warning( + a_suite, gc_rollback, '%%% annotation requires one of values as parameter: "auto" or "manual".', + a_annotations.by_name(gc_rollback).first + ); + end if; + warning_on_duplicate_annot(a_suite, a_annotations.by_name, gc_rollback); + end if; + if a_annotations.by_name.exists(gc_beforeall) then + l_before_all_list := add_executables( a_suite.object_owner, a_suite.object_name, a_annotations.by_name(gc_beforeall), gc_beforeall ); + end if; + if a_annotations.by_name.exists(gc_afterall) then + l_after_all_list := add_executables( a_suite.object_owner, a_suite.object_name, a_annotations.by_name(gc_afterall), gc_afterall ); + end if; + + if a_annotations.by_name.exists(gc_beforeeach) then + l_before_each_list := add_executables( a_suite.object_owner, a_suite.object_name, a_annotations.by_name(gc_beforeeach), gc_beforeeach ); + end if; + if a_annotations.by_name.exists(gc_aftereach) then + l_after_each_list := add_executables( a_suite.object_owner, a_suite.object_name, a_annotations.by_name(gc_aftereach), gc_aftereach ); + end if; + + a_suite.disabled_flag := ut_utils.boolean_to_int(a_annotations.by_name.exists(gc_disabled)); + + --process procedure annotations for suite + l_results := get_annotated_procedures(a_annotations, a_suite, l_before_each_list, l_after_each_list, l_before_all_list, l_after_all_list); + + a_suite.set_rollback_type(l_rollback_type); + update_before_after_each(l_results, l_before_each_list, l_after_each_list); + a_suite.before_all_list := convert_list(l_before_all_list); + a_suite.after_all_list := convert_list(l_after_all_list); + return l_results; + end; + + function get_endcontext_position( + a_context_ann_pos t_annotation_position, + a_package_annotations in out nocopy tt_annotations_by_name + ) return t_annotation_position is + l_result t_annotation_position; + begin + if a_package_annotations.exists(gc_endcontext) then + l_result := a_package_annotations(gc_endcontext).first; + while l_result <= a_context_ann_pos loop + l_result := a_package_annotations(gc_endcontext).next(l_result); + end loop; + end if; + return l_result; + end; + + function get_annotations_in_context( + a_annotations t_annotations_info, + a_context_pos t_annotation_position, + a_end_context_pos t_annotation_position + ) return t_annotations_info is + l_result t_annotations_info; + l_position t_annotation_position; + l_procedure_name t_object_name; + l_annotation_name t_annotation_name; + l_annotation_text t_annotation_text; + begin + l_position := a_context_pos; + l_result.owner := a_annotations.owner; + l_result.name := a_annotations.name; + l_result.parse_time := a_annotations.parse_time; + while l_position is not null and l_position <= a_end_context_pos loop + l_result.by_line(l_position) := a_annotations.by_line(l_position); + l_procedure_name := l_result.by_line(l_position).procedure_name; + l_annotation_name := l_result.by_line(l_position).name; + l_annotation_text := l_result.by_line(l_position).text; + if l_procedure_name is not null then + l_result.by_proc(l_procedure_name)(l_annotation_name)(l_position) := l_annotation_text; + else + l_result.by_name(l_annotation_name)(l_position) := l_annotation_text; + end if; + l_position := a_annotations.by_line.next(l_position); + end loop; + return l_result; + end; + procedure add_suite_contexts( a_suite in out nocopy ut_suite, @@ -649,54 +806,70 @@ create or replace package body ut_suite_builder is l_ctx_annotations t_annotations_info; l_context ut_suite_context; l_context_no binary_integer := 1; + type tt_context_names is table of boolean index by t_object_name; + l_context_names tt_context_names; + begin + if not a_annotations.by_name.exists(gc_context) then + return; + end if; - function get_endcontext_position( - a_context_ann_pos t_annotation_position, - a_package_annotations in out nocopy tt_annotations_by_name - ) return t_annotation_position is - l_result t_annotation_position; - begin - if a_package_annotations.exists(gc_endcontext) then - l_result := a_package_annotations(gc_endcontext).first; - while l_result <= a_context_ann_pos loop - l_result := a_package_annotations(gc_endcontext).next(l_result); - end loop; + l_context_pos := a_annotations.by_name( gc_context).first; + + while l_context_pos is not null loop + l_end_context_pos := get_endcontext_position(l_context_pos, a_annotations.by_name ); + if l_end_context_pos is null then + exit; end if; - return l_result; - end; - function get_annotations_in_context( - a_annotations t_annotations_info, - a_context_pos t_annotation_position, - a_end_context_pos t_annotation_position - ) return t_annotations_info is - l_result t_annotations_info; - l_position t_annotation_position; - l_procedure_name t_object_name; - l_annotation_name t_annotation_name; - l_annotation_text t_annotation_text; - begin - l_position := a_context_pos; - l_result.owner := a_annotations.owner; - l_result.name := a_annotations.name; - while l_position is not null and l_position <= a_end_context_pos loop - l_result.by_line(l_position) := a_annotations.by_line(l_position); - l_procedure_name := l_result.by_line(l_position).procedure_name; - l_annotation_name := l_result.by_line(l_position).name; - l_annotation_text := l_result.by_line(l_position).text; - if l_procedure_name is not null then - l_result.by_proc(l_procedure_name)(l_annotation_name)(l_position) := l_annotation_text; - else - l_result.by_name(l_annotation_name)(l_position) := l_annotation_text; - end if; - l_position := a_annotations.by_line.next(l_position); - end loop; - return l_result; - end; + --create a sub-set of annotations to process as sub-suite (context) + l_ctx_annotations := get_annotations_in_context( a_annotations, l_context_pos, l_end_context_pos); + + l_context_name := coalesce( + l_ctx_annotations.by_line( l_context_pos ).text + , gc_context||'_'||l_context_no + ); + if l_context_names.exists(l_context_name) then + add_annotation_ignored_warning( a_suite, 'context', 'Context name must be unique in a suite. Context and all of it''s content ignored.', l_context_pos ); + else + l_context_names(l_context_name) := true; + l_context := ut_suite_context(a_suite.object_owner, a_suite.object_name, l_context_name, l_context_pos ); + + l_context.path := a_suite.path||'.'||l_context_name; + l_context.description := l_ctx_annotations.by_line( l_context_pos ).text; + + warning_on_duplicate_annot( l_context, l_ctx_annotations.by_name, gc_context ); + + populate_suite_contents( l_context, l_ctx_annotations ); + + a_suite.add_item(l_context); + end if; + -- remove annotations within context after processing them + delete_annotations_range(a_annotations, l_context_pos, l_end_context_pos); + + exit when not a_annotations.by_name.exists( gc_context); + + l_context_pos := a_annotations.by_name( gc_context).next( l_context_pos); + l_context_no := l_context_no + 1; + end loop; + end; + + function get_suite_contexts_items( + a_suite in out nocopy ut_suite, + a_annotations in out nocopy t_annotations_info + ) return ut_suite_items is + l_context_pos t_annotation_position; + l_end_context_pos t_annotation_position; + l_context_name t_object_name; + l_ctx_annotations t_annotations_info; + l_context ut_suite_context; + l_context_no binary_integer := 1; + type tt_context_names is table of boolean index by t_object_name; + l_context_names tt_context_names; + l_results ut_suite_items := ut_suite_items(); begin if not a_annotations.by_name.exists(gc_context) then - return; + return l_results; end if; l_context_pos := a_annotations.by_name( gc_context).first; @@ -714,18 +887,23 @@ create or replace package body ut_suite_builder is l_ctx_annotations.by_line( l_context_pos ).text , gc_context||'_'||l_context_no ); + if l_context_names.exists(l_context_name) then + add_annotation_ignored_warning( a_suite, 'context', 'Context name must be unique in a suite. Context and all of it''s content ignored.', l_context_pos ); + else + l_context_names(l_context_name) := true; - l_context := ut_suite_context(a_suite.object_owner, a_suite.object_name, l_context_name ); - - l_context.path := a_suite.path||'.'||l_context_name; - l_context.description := l_ctx_annotations.by_line( l_context_pos ).text; - - warning_on_duplicate_annot( l_context, l_ctx_annotations.by_name, gc_context ); + l_context := ut_suite_context(a_suite.object_owner, a_suite.object_name, l_context_name, l_context_pos ); - populate_suite_contents( l_context, l_ctx_annotations ); + l_context.path := a_suite.path||'.'||l_context_name; + l_context.description := l_ctx_annotations.by_line( l_context_pos ).text; + l_context.parse_time := a_annotations.parse_time; - a_suite.add_item(l_context); + warning_on_duplicate_annot( l_context, l_ctx_annotations.by_name, gc_context ); + l_results := l_results multiset union all get_suite_items( l_context, l_ctx_annotations ); + l_results.extend; + l_results(l_results.last) := l_context; + end if; -- remove annotations within context after processing them delete_annotations_range(a_annotations, l_context_pos, l_end_context_pos); @@ -734,6 +912,7 @@ create or replace package body ut_suite_builder is l_context_pos := a_annotations.by_name( gc_context).next( l_context_pos); l_context_no := l_context_no + 1; end loop; + return l_results; end; procedure warning_on_incomplete_context( @@ -794,9 +973,9 @@ create or replace package body ut_suite_builder is if l_annotations.by_name.exists( gc_suite) then --create an incomplete suite - l_suite := ut_suite(l_annotations.owner, l_annotations.name); - l_annotation_pos := l_annotations.by_name( gc_suite).first; - l_suite.description := l_annotations.by_name( gc_suite)( l_annotation_pos); + l_annotation_pos := l_annotations.by_name(gc_suite).first; + l_suite := ut_suite(l_annotations.owner, l_annotations.name, l_annotation_pos); + l_suite.description := l_annotations.by_name(gc_suite)(l_annotation_pos); warning_on_unknown_annotations(l_suite, l_annotations.by_line); warning_on_duplicate_annot( l_suite, l_annotations.by_name, gc_suite ); @@ -813,7 +992,54 @@ create or replace package body ut_suite_builder is return l_suite; end; - function build_suites_hierarchy(a_suites_by_path tt_schema_suites) return tt_schema_suites is + function build_parent_suites_for_path(a_suite ut_suite) return ut_suite_items is + l_results ut_suite_items := ut_suite_items(); + l_path varchar2(200); + l_name varchar2(200); + begin + l_path := a_suite.path; + loop + l_path := substr( l_path, 1, instr(l_path,'.',-1)-1); + exit when l_path is null; + l_name := substr( l_path, instr(l_path,'.',-1)+1); + l_results.extend; + l_results(l_results.last) := + ut_logical_suite( + a_object_owner => a_suite.object_owner, + a_object_name => l_name, a_name => l_name, a_path => l_path + ); + l_results(l_results.last).parse_time := a_suite.parse_time; + end loop; + return l_results; + end; + function create_suite_items( a_annotations t_annotations_info ) return ut_suite_items is + l_annotations t_annotations_info := a_annotations; + l_annotation_pos t_annotation_position; + l_suite ut_suite; + l_results ut_suite_items; + begin + if l_annotations.by_name.exists(gc_suite) then + l_annotation_pos := l_annotations.by_name(gc_suite).first; + l_suite := ut_suite(l_annotations.owner, l_annotations.name, l_annotation_pos); + l_suite.description := l_annotations.by_name( gc_suite)( l_annotation_pos); + l_suite.parse_time := l_annotations.parse_time; + warning_on_unknown_annotations(l_suite, l_annotations.by_line); + + warning_on_duplicate_annot( l_suite, l_annotations.by_name, gc_suite ); + + build_suitepath( l_suite, l_annotations ); + l_results := get_suite_contexts_items( l_suite, l_annotations ) multiset union all get_suite_items( l_suite, l_annotations ); + + --by this time all contexts were consumed and l_annotations should not have any context/endcontext annotation in it. + warning_on_incomplete_context( l_suite, l_annotations.by_name ); + l_results.extend; + l_results(l_results.last) := l_suite; + l_results := l_results multiset union all build_parent_suites_for_path(l_suite); + end if; + return l_results; + end; + + function build_suites_hierarchy( a_suites_by_path tt_schema_suites ) return tt_schema_suites is l_result tt_schema_suites; l_suite_path varchar2(4000 char); l_parent_path varchar2(4000 char); @@ -856,49 +1082,53 @@ create or replace package body ut_suite_builder is return l_result; end; + function convert_package_annotations(a_object ut_annotated_object) return t_annotations_info is + l_result t_annotations_info; + l_annotation t_annotation; + l_annotation_no binary_integer; + l_annotation_pos binary_integer; + begin + l_result.owner := a_object.object_owner; + l_result.name := lower(trim(a_object.object_name)); + l_result.parse_time := a_object.parse_time; + l_annotation_no := a_object.annotations.first; + while l_annotation_no is not null loop + l_annotation_pos := a_object.annotations(l_annotation_no).position; + l_annotation.name := a_object.annotations(l_annotation_no).name; + l_annotation.text := a_object.annotations(l_annotation_no).text; + l_annotation.procedure_name := lower(trim(a_object.annotations(l_annotation_no).subobject_name)); + l_result.by_line( l_annotation_pos) := l_annotation; + if l_annotation.procedure_name is null then + l_result.by_name( l_annotation.name)( l_annotation_pos) := l_annotation.text; + else + l_result.by_proc(l_annotation.procedure_name)(l_annotation.name)(l_annotation_pos) := l_annotation.text; + end if; + l_annotation_no := a_object.annotations.next(l_annotation_no); + end loop; + return l_result; + end; + + function build_suites(a_annotated_objects sys_refcursor) return t_schema_suites_info is l_suite ut_logical_suite; l_annotated_objects ut_annotated_objects; l_all_suites tt_schema_suites; l_result t_schema_suites_info; - - function convert_package_annotations(a_object ut_annotated_object) return t_annotations_info is - l_result t_annotations_info; - l_annotation t_annotation; - l_annotation_no binary_integer; - l_annotation_pos binary_integer; - begin - l_result.owner := a_object.object_owner; - l_result.name := lower(trim(a_object.object_name)); - l_annotation_no := a_object.annotations.first; - while l_annotation_no is not null loop - l_annotation_pos := a_object.annotations(l_annotation_no).position; - l_annotation.name := a_object.annotations(l_annotation_no).name; - l_annotation.text := a_object.annotations(l_annotation_no).text; - l_annotation.procedure_name := lower(trim(a_object.annotations(l_annotation_no).subobject_name)); - l_result.by_line( l_annotation_pos) := l_annotation; - if l_annotation.procedure_name is null then - l_result.by_name( l_annotation.name)( l_annotation_pos) := l_annotation.text; - else - l_result.by_proc(l_annotation.procedure_name)(l_annotation.name)(l_annotation_pos) := l_annotation.text; + begin + loop + fetch a_annotated_objects bulk collect into l_annotated_objects limit 10; + + for i in 1 .. l_annotated_objects.count loop + l_suite := create_suite(convert_package_annotations(l_annotated_objects(i))); + ut_suite_cache_manager.save_cache( create_suite_items(convert_package_annotations(l_annotated_objects(i))) ); + if l_suite is not null then + l_all_suites(l_suite.path) := l_suite; + l_result.suite_paths(l_suite.object_name) := l_suite.path; end if; - l_annotation_no := a_object.annotations.next(l_annotation_no); end loop; - return l_result; - end; - - begin - fetch a_annotated_objects bulk collect into l_annotated_objects; - close a_annotated_objects; - - for i in 1 .. l_annotated_objects.count loop - l_suite := create_suite(convert_package_annotations(l_annotated_objects(i))); - if l_suite is not null then - l_all_suites(l_suite.path) := l_suite; - l_result.suite_paths(l_suite.object_name) := l_suite.path; - end if; + exit when a_annotated_objects%notfound; end loop; - + close a_annotated_objects; --build hierarchical structure of the suite -- Restructure single-dimension list into hierarchy of suites by the value of %suitepath attribute value l_result.schema_suites := build_suites_hierarchy(l_all_suites); @@ -906,7 +1136,77 @@ create or replace package body ut_suite_builder is return l_result; end; - function build_schema_suites(a_owner_name varchar2) return t_schema_suites_info is + procedure refresh_suite_cache(a_annotated_objects sys_refcursor) is + l_suite ut_logical_suite; + l_annotated_objects ut_annotated_objects; + l_all_suites tt_schema_suites; + l_result t_schema_suites_info; + begin + loop + fetch a_annotated_objects bulk collect into l_annotated_objects limit 10; + + for i in 1 .. l_annotated_objects.count loop + ut_suite_cache_manager.save_cache( create_suite_items(convert_package_annotations(l_annotated_objects(i))) ); + end loop; + exit when a_annotated_objects%notfound; + end loop; + close a_annotated_objects; + end; + + procedure reconstruct_from_cache( + a_suites in out nocopy ut_suite_items, + a_suite_data_cursor sys_refcursor + ) is + type t_item_levels is table of ut_suite_items index by binary_integer; + l_items_at_level t_item_levels; + l_tests ut_suite_items; + l_logical_suites ut_logical_suites; + l_levels ut_integer_list; + l_cursor_idx integer; + l_prev_level integer; + begin + a_suites := ut_suite_items(); + loop + if l_cursor_idx is null then + fetch a_suite_data_cursor bulk collect into l_tests, l_logical_suites, l_levels limit 1000; + l_cursor_idx := l_levels.first; + end if; + exit when l_cursor_idx is null; + if l_levels(l_cursor_idx) > 1 then + if l_prev_level > l_levels(l_cursor_idx) then + l_logical_suites(l_cursor_idx).items := l_items_at_level(l_prev_level); + l_items_at_level(l_prev_level).delete; + end if; + if not l_items_at_level.exists((l_levels(l_cursor_idx))) then + l_items_at_level(l_levels(l_cursor_idx)) := ut_suite_items(); + end if; + l_items_at_level(l_levels(l_cursor_idx)).extend; + if l_tests(l_cursor_idx) is not null then + l_items_at_level(l_levels(l_cursor_idx))(l_items_at_level(l_levels(l_cursor_idx)).last) + := l_tests(l_cursor_idx); + else + l_items_at_level(l_levels(l_cursor_idx))(l_items_at_level(l_levels(l_cursor_idx)).last) + := l_logical_suites(l_cursor_idx); + end if; + else + if l_prev_level > l_levels(l_cursor_idx) then + l_logical_suites(l_cursor_idx).items := l_items_at_level(l_prev_level); + l_items_at_level(l_prev_level).delete; + end if; + a_suites.extend; + if l_tests(l_cursor_idx) is not null then + a_suites(a_suites.last) := l_tests(l_cursor_idx); + else + a_suites(a_suites.last) := l_logical_suites(l_cursor_idx); + end if; + end if; + l_prev_level := l_levels(l_cursor_idx); + l_cursor_idx := l_levels.next(l_cursor_idx); + end loop; + close a_suite_data_cursor; + end; + + function build_schema_suites_old(a_owner_name varchar2) return t_schema_suites_info is l_annotations_cursor sys_refcursor; begin -- form the single-dimension list of suites constructed from parsed packages @@ -920,5 +1220,66 @@ create or replace package body ut_suite_builder is return build_suites(l_annotations_cursor); end; + function get_build_suites(a_owner_name varchar2) return ut_suite_items is + l_suites t_schema_suites_info; + l_results ut_suite_items := ut_suite_items(); + l_index varchar2(4000); + begin + l_suites := build_schema_suites_old(a_owner_name); + l_index := l_suites.schema_suites.first; + while l_index is not null loop + l_results.extend; + l_results(l_results.last) := l_suites.schema_suites(l_index); + l_index := l_suites.schema_suites.next(l_index); + end loop; + return l_results; + end; + + + procedure refresh_suite_cache(a_owner_name varchar2) is + l_annotations_cursor sys_refcursor; + begin + open l_annotations_cursor for + q'[select value(x) + from table( + ]'||ut_utils.ut_owner||q'[.ut_annotation_manager.get_annotated_objects(:a_owner_name, 'PACKAGE') + )x ]' + using a_owner_name; + refresh_suite_cache(l_annotations_cursor); + end; + + function build_schema_suites(a_owner_name varchar2) return ut_suite_items is + l_suites ut_suite_items; + begin + refresh_suite_cache(a_owner_name); + reconstruct_from_cache(l_suites, ut_suite_cache_manager.cached_suite_by_schema(a_owner_name)); + for i in 1 .. l_suites.count loop + l_suites(i).set_rollback_type(l_suites(i).get_rollback_type); + end loop; + return l_suites; + end; + + function build_schema_suites(a_owner_name varchar2,a_object_name varchar2,a_procedure_name varchar2) return ut_suite_items is + l_suites ut_suite_items; + begin + refresh_suite_cache(a_owner_name); + reconstruct_from_cache(l_suites, ut_suite_cache_manager.cached_suite_by_package(a_owner_name, a_object_name, a_procedure_name)); + for i in 1 .. l_suites.count loop + l_suites(i).set_rollback_type(l_suites(i).get_rollback_type); + end loop; + return l_suites; + end; + + function build_schema_suites(a_owner_name varchar2,a_path varchar2) return ut_suite_items is + l_suites ut_suite_items; + begin + refresh_suite_cache(a_owner_name); + reconstruct_from_cache(l_suites, ut_suite_cache_manager.cached_suite_by_path(a_owner_name, a_path)); + for i in 1 .. l_suites.count loop + l_suites(i).set_rollback_type(l_suites(i).get_rollback_type); + end loop; + return l_suites; + end; + end ut_suite_builder; / diff --git a/source/core/ut_suite_builder.pks b/source/core/ut_suite_builder.pks index 2ae40f4d3..0f4d97c76 100644 --- a/source/core/ut_suite_builder.pks +++ b/source/core/ut_suite_builder.pks @@ -20,10 +20,10 @@ create or replace package ut_suite_builder authid current_user is * Responsible for converting annotations into unit test suites */ - --table of ut_suites indexed by object name ( suite_paths('object_name') = ut_logical_suite + --table of ut_suites indexed by suite path - tt_schema_suites('suite.path') gives ut_logical_suite type tt_schema_suites is table of ut_logical_suite index by varchar2(4000 char); - --table of suite paths indexed by object name ( suite_paths('object_name') = 'suitepath.to.object' + --table of suite paths indexed by object name - t_object_suite_path('object_name') = 'suitepath.to.object' type t_object_suite_path is table of varchar2(4000) index by varchar2(4000 char); type t_schema_suites_info is record ( @@ -34,11 +34,32 @@ create or replace package ut_suite_builder authid current_user is /** * Builds set of hierarchical suites for a given schema * - * @param a_owner_name name of the schema to builds suites for + * @param a_owner_name name of the schema to builds suite for * @return list of suites organized into hierarchy * */ - function build_schema_suites(a_owner_name varchar2) return t_schema_suites_info; + function build_schema_suites(a_owner_name varchar2) return ut_suite_items; + + /** + * Builds set of hierarchical suites for a given schema + * + * @param a_owner_name name of the schema to builds suite for + * @param a_object_name object name to build suite for + * @param a_object_name procedure name to build suite for (can be null) + * @return list of suites organized into hierarchy + * + */ + function build_schema_suites(a_owner_name varchar2, a_object_name varchar2,a_procedure_name varchar2) return ut_suite_items; + + /** + * Builds set of hierarchical suites for a given schema + * + * @param a_owner_name name of the schema to builds suite for + * @param a_path suite path to build suite for + * @return list of suites organized into hierarchy + * + */ + function build_schema_suites(a_owner_name varchar2,a_path varchar2) return ut_suite_items; /** * Builds set of hierarchical suites for given annotations @@ -49,5 +70,8 @@ create or replace package ut_suite_builder authid current_user is */ function build_suites(a_annotated_objects sys_refcursor) return t_schema_suites_info; + function get_build_suites(a_owner_name varchar2) return ut_suite_items; + function build_schema_suites_old(a_owner_name varchar2) return t_schema_suites_info; + end ut_suite_builder; / diff --git a/source/core/ut_suite_cache.sql b/source/core/ut_suite_cache.sql new file mode 100644 index 000000000..183f4cf35 --- /dev/null +++ b/source/core/ut_suite_cache.sql @@ -0,0 +1,89 @@ +create or replace type ut_suite_contexts as table of ut_suite_context +/ +create or replace type ut_tests as table of ut_test +/ + +create table ut_suite_cache ( + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + self_type, + path, + object_owner, + object_name, + name, + line_no, + parse_time, + description, + rollback_type, + disabled_flag, + warnings, + before_all_list, + after_all_list, + before_each_list, + before_test_list, + after_each_list, + after_test_list, + expected_error_codes, + item +) + nested table warnings store as ut_suite_cache_warnings + nested table before_all_list store as ut_suite_cache_before_all + nested table after_all_list store as ut_suite_cache_after_all + nested table before_each_list store as ut_suite_cache_before_each + nested table after_each_list store as ut_suite_cache_after_each + nested table before_test_list store as ut_suite_cache_before_test + nested table after_test_list store as ut_suite_cache_after_test + nested table expected_error_codes store as ut_suite_cache_trhows + as + select + c.self_type, + c.path, + c.object_owner, + c.object_name, + c.name, + c.line_no, + c.parse_time, + c.description, + c.rollback_type, + c.disabled_flag, + c.warnings, + c.before_all_list, + c.after_all_list, + t.before_each_list, + t.before_test_list, + t.after_each_list, + t.after_test_list, + t.expected_error_codes, + t.item + from table(ut_suite_contexts(ut_suite_context(user,'package_name','ctx_name',1))) c + cross join table(ut_tests(ut_test(user,'package_name','test_name',1))) t + where rownum < 0 +/ + +alter table ut_suite_cache modify (object_owner not null, path not null, self_type not null, object_name not null, name not null, parse_time not null) +/ +alter table ut_suite_cache add constraint ut_suite_cache_pk primary key (object_owner, path) +/ +create unique index ut_suite_cache_uk on ut_suite_cache(object_owner, object_name, line_no) +/ +create index ut_suite_cache_nu1 on ut_suite_cache(object_owner, object_name) +/ +alter table ut_suite_cache add constraint ut_suite_cache_schema_fk foreign key (object_owner) references ut_suite_cache_schema(object_owner) +/ + +drop type ut_tests +/ + +drop type ut_suite_contexts +/ diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb new file mode 100644 index 000000000..a51ee14a7 --- /dev/null +++ b/source/core/ut_suite_cache_manager.pkb @@ -0,0 +1,284 @@ +create or replace package body ut_suite_cache_manager is + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + function get_suite_by(a_schema_name varchar2, a_path varchar2 := null, a_object_name varchar2 := null, a_procedure_name varchar2 := null) return sys_refcursor is + l_result sys_refcursor; + begin + open l_result for + select + case self_type + when 'UT_TEST' + then ut_test( + self_type => self_type, + object_owner => object_owner, object_name => object_name, name => name, + description => description, path => path, rollback_type => rollback_type, + disabled_flag => disabled_flag, line_no => line_no, parse_time => parse_time, + start_time => null, end_time => null, result => null, warnings => warnings, + results_count => ut_results_counter(), transaction_invalidators => null, + before_each_list => before_each_list, before_test_list => before_test_list, + item => item, after_test_list => after_test_list, after_each_list => after_each_list, + all_expectations => null, failed_expectations => null, + parent_error_stack_trace => null, expected_error_codes => expected_error_codes + ) + end as test_item, + case self_type + when 'UT_SUITE' + then ut_suite( + self_type => self_type, + object_owner => object_owner, object_name => object_name, name => name, + description => description, path => path, rollback_type => rollback_type, + disabled_flag => disabled_flag, line_no => line_no, parse_time => parse_time, + start_time => null, end_time => null, result => null, warnings => warnings, + results_count => ut_results_counter(), transaction_invalidators => null, + items => ut_suite_items(), + before_all_list => before_all_list, after_all_list => after_all_list + ) + when 'UT_SUITE_CONTEXT' + then ut_suite_context( + self_type => self_type, + object_owner => object_owner, object_name => object_name, name => name, + description => description, path => path, rollback_type => rollback_type, + disabled_flag => disabled_flag, line_no => line_no, parse_time => parse_time, + start_time => null, end_time => null, result => null, warnings => warnings, + results_count => ut_results_counter(), transaction_invalidators => null, + items => ut_suite_items(), + before_all_list => before_all_list, after_all_list => after_all_list + ) + when 'UT_LOGICAL_SUITE' + then ut_logical_suite( + self_type => self_type, + object_owner => object_owner, object_name => object_name, name => name, + description => description, path => path, rollback_type => rollback_type, + disabled_flag => disabled_flag, line_no => line_no, parse_time => parse_time, + start_time => null, end_time => null, result => null, warnings => warnings, + results_count => ut_results_counter(), transaction_invalidators => null, + items => ut_suite_items() + ) + end as logical_suite, + length(path) - length( replace(path, '.') )+1 as path_level + from ut_suite_cache x + where ( a_path like path ||'.'||'%' + or ( path like a_path || '%' + and object_name = nvl(lower(a_object_name), object_name) + and name = nvl(lower(a_procedure_name), name) + ) + ) + and object_owner = upper(a_schema_name) + order by path desc, object_name, line_no; + + return l_result; + end; + +-- function get_suite_by(a_schema_name varchar2, a_path varchar2 := null, a_object_name varchar2 := null, a_procedure_name varchar2 := null) return sys_refcursor is +-- l_filter varchar2(1000); +-- l_result sys_refcursor; +-- l_owner varchar2(250) := ut_utils.ut_owner(); +-- begin +-- if a_object_name is not null then +-- l_filter := ' object_name = lower(:a_object_name)'; +-- if a_procedure_name is not null then +-- l_filter := l_filter || ' and name = lower(:a_procedure_name)'; +-- else +-- l_filter := l_filter || ' and :a_procedure_name is null'; +-- end if; +-- else +-- l_filter := ' :a_object_name is null and :a_procedure_name is null'; +-- end if; +-- open l_result for q'[ +-- select +-- case self_type +-- when 'UT_TEST' +-- then ]'||l_owner||q'[.ut_test( +-- self_type => self_type, +-- object_owner => object_owner, object_name => object_name, name => name, +-- description => description, path => path, rollback_type => rollback_type, +-- disabled_flag => disabled_flag, line_no => line_no, parse_time => parse_time, +-- start_time => null, end_time => null, result => null, warnings => warnings, +-- results_count => ut_results_counter(), transaction_invalidators => null, +-- before_each_list => before_each_list, before_test_list => before_test_list, +-- item => item, after_test_list => after_test_list, after_each_list => after_each_list, +-- all_expectations => null, failed_expectations => null, +-- parent_error_stack_trace => null, expected_error_codes => expected_error_codes +-- ) +-- end as test_item, +-- case self_type +-- when 'UT_SUITE' +-- then ]'||l_owner||q'[.ut_suite( +-- self_type => self_type, +-- object_owner => object_owner, object_name => object_name, name => name, +-- description => description, path => path, rollback_type => rollback_type, +-- disabled_flag => disabled_flag, line_no => line_no, parse_time => parse_time, +-- start_time => null, end_time => null, result => null, warnings => warnings, +-- results_count => ]'||l_owner||q'[.ut_results_counter(), transaction_invalidators => null, +-- items => ut_suite_items(), +-- before_all_list => before_all_list, after_all_list => after_all_list +-- ) +-- when 'UT_SUITE_CONTEXT' +-- then ]'||l_owner||q'[.ut_suite_context( +-- self_type => self_type, +-- object_owner => object_owner, object_name => object_name, name => name, +-- description => description, path => path, rollback_type => rollback_type, +-- disabled_flag => disabled_flag, line_no => line_no, parse_time => parse_time, +-- start_time => null, end_time => null, result => null, warnings => warnings, +-- results_count => ]'||l_owner||q'[.ut_results_counter(), transaction_invalidators => null, +-- items => ut_suite_items(), +-- before_all_list => before_all_list, after_all_list => after_all_list +-- ) +-- when 'UT_LOGICAL_SUITE' +-- then ]'||l_owner||q'[.ut_logical_suite( +-- self_type => self_type, +-- object_owner => object_owner, object_name => object_name, name => name, +-- description => description, path => path, rollback_type => rollback_type, +-- disabled_flag => disabled_flag, line_no => line_no, parse_time => parse_time, +-- start_time => null, end_time => null, result => null, warnings => warnings, +-- results_count => ]'||l_owner||q'[.ut_results_counter(), transaction_invalidators => null, +-- items => ut_suite_items() +-- ) +-- end as logical_suite, +-- length(path) - length( replace(path, '.') )+1 as path_level +-- from ]'||l_owner||q'[.ut_suite_cache x +-- where ( :a_path like path ||'.'||'%' +-- or path like :a_path ||'%' and ]'||l_filter||q'[ ) +-- and object_owner = upper(:a_schema_name) +-- order by path desc, object_name, line_no]' +-- using a_path, a_path, a_object_name, a_procedure_name, a_schema_name; +-- +-- return l_result; +-- end; +-- + function cached_suite_by_path(a_schema_name varchar2, a_path varchar2) return sys_refcursor is + begin + return get_suite_by(a_schema_name, a_path); + end; + + function cached_suite_by_package(a_schema_name varchar2, a_object_name varchar2, a_procedure_name varchar2) return sys_refcursor is + l_path varchar2(4000); + begin + select min(path) into l_path + from ut_suite_cache + where object_owner = upper(a_schema_name) + and object_name = lower(a_object_name) + and name = nvl(lower(a_procedure_name),name); + + return get_suite_by(a_schema_name, l_path, a_object_name, a_procedure_name ); + end; + + function cached_suite_by_schema(a_schema_name varchar2) return sys_refcursor is + begin + return get_suite_by(a_schema_name); + end; + + procedure save_cache(a_suite_items ut_suite_items) is + pragma autonomous_transaction; + l_annotation_parse_time date; + l_suite_parse_time date; + begin + if a_suite_items.count = 0 then + return; + end if; + if a_suite_items(1).self_type != 'UT_LOGICAL_SUITE' then + select min(parse_time) + into l_suite_parse_time from ut_suite_cache t + where t.object_name = a_suite_items(1).object_name + and t.object_owner = a_suite_items(1).object_owner + and rownum = 1; + end if; + + l_annotation_parse_time := a_suite_items(1).parse_time; + + if l_annotation_parse_time > l_suite_parse_time or l_suite_parse_time is null then + + merge into ut_suite_cache_schema t + using(select object_owner, max(parse_time) parse_time from table(a_suite_items) group by object_owner) s + on (s.object_owner = t.object_owner) + when matched then update + set t.parse_time = s.parse_time + where s.parse_time > t.parse_time + when not matched then + insert (object_owner, parse_time) + values (s.object_owner, s.parse_time); + + delete from ut_suite_cache t + where (t.object_name, t.object_owner) + in (select s.object_name, s.object_owner from table(a_suite_items) s where s.self_type != 'UT_LOGICAL_SUITE'); + + merge into ut_suite_cache t + using ( + select self_type, path, object_owner, object_name, name, + line_no, parse_time, description, + rollback_type, disabled_flag, warnings + from table(a_suite_items) x where x.self_type = 'UT_LOGICAL_SUITE' + ) s + on (t.object_name = s.object_name and t.object_owner = s.object_owner) + when not matched then + insert ( + self_type, path, object_owner, object_name, name, + line_no, parse_time, description, + rollback_type, disabled_flag, warnings + ) + values ( + s.self_type, s.path, s.object_owner, s.object_name, s.name, + s.line_no, s.parse_time, s.description, + s.rollback_type, s.disabled_flag, s.warnings + ); + + + insert into ut_suite_cache t + ( + self_type, path, object_owner, object_name, name, + line_no, parse_time, description, + rollback_type, disabled_flag, warnings, + before_all_list, after_all_list, + before_each_list, after_each_list, + before_test_list, after_test_list, + expected_error_codes, item + ) + with + suite_items as ( select value(x) item from table(a_suite_items) x ), + suites as ( + select treat(item as ut_suite) i from suite_items s + where s.item.self_type in ('UT_SUITE','UT_SUITE_CONTEXT') + ), + tests as ( + select treat(item as ut_test) t from suite_items s + where s.item.self_type in ('UT_TEST') + ) + select s.i.self_type as self_type, s.i.path as path, + s.i.object_owner as object_owner, s.i.object_name as object_name, s.i.name as name, + s.i.line_no as line_no, s.i.parse_time as parse_time, s.i.description as description, + s.i.rollback_type as rollback_type, s.i.disabled_flag as disabled_flag, s.i.warnings as warnings, + s.i.before_all_list as before_all_list, s.i.after_all_list as after_all_list, + null before_each_list, null after_each_list, + null before_test_list, null after_test_list, + null expected_error_codes, null item + from suites s + union all + select s.t.self_type as self_type, s.t.path as path, + s.t.object_owner as object_owner, s.t.object_name as object_name, s.t.name as name, + s.t.line_no as line_no, s.t.parse_time as parse_time, s.t.description as description, + s.t.rollback_type as rollback_type, s.t.disabled_flag as disabled_flag, s.t.warnings as warnings, + null before_all_list, null after_all_list, + s.t.before_each_list as before_each_list, s.t.after_each_list as after_each_list, + s.t.before_test_list as before_test_list, s.t.after_test_list as after_test_list, + s.t.expected_error_codes as expected_error_codes, s.t.item as item + from tests s; + end if; + commit; + end; +end ut_suite_cache_manager; +/ diff --git a/source/core/ut_suite_cache_manager.pks b/source/core/ut_suite_cache_manager.pks new file mode 100644 index 000000000..1b2d1f2f6 --- /dev/null +++ b/source/core/ut_suite_cache_manager.pks @@ -0,0 +1,32 @@ +create or replace package ut_suite_cache_manager authid definer is + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + /** + * Responsible for storing and retrieving suite data from cache + */ + + procedure save_cache(a_suite_items ut_suite_items); + + function cached_suite_by_path(a_schema_name varchar2, a_path varchar2) return sys_refcursor; + + function cached_suite_by_package(a_schema_name varchar2, a_object_name varchar2, a_procedure_name varchar2) return sys_refcursor; + + function cached_suite_by_schema(a_schema_name varchar2) return sys_refcursor; + +end ut_suite_cache_manager; +/ diff --git a/source/core/ut_suite_cache_schema.sql b/source/core/ut_suite_cache_schema.sql new file mode 100644 index 000000000..890c72e0b --- /dev/null +++ b/source/core/ut_suite_cache_schema.sql @@ -0,0 +1,20 @@ +create table ut_suite_cache_schema ( + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + object_owner varchar2(250) not null, + parse_time date not null, + constraint ut_suite_cache_schema_pk primary key(object_owner) +) organization index +/ + diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index ca438813d..dd9ffb5de 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -33,7 +33,15 @@ create or replace package body ut_suite_manager is g_schema_suites tt_schema_suites_list; - type t_schema_paths is table of ut_varchar2_list index by varchar2(4000 char); +-- type t_schema_paths is table of ut_varchar2_list index by varchar2(4000 char); + + type t_path_item is record ( + object_name varchar2(250), + procedure_name varchar2(250), + suite_path varchar2(4000) + ); + type t_path_items is table of t_path_item; + type t_schema_paths is table of t_path_items index by varchar2(250 char); ------------------ @@ -88,7 +96,7 @@ create or replace package body ut_suite_manager is l_result.suite_paths := g_schema_suites(a_schema_name).suite_paths; else ut_utils.debug_log('Rescanning schema ' || a_schema_name); - l_result := ut_suite_builder.build_schema_suites(a_schema_name); + l_result := ut_suite_builder.build_schema_suites_old(a_schema_name); update_cache(a_schema_name, l_result, get_schema_info(a_schema_name).obj_cnt ); end if; @@ -144,7 +152,7 @@ create or replace package body ut_suite_manager is end if; end; - function clean_paths(a_paths ut_varchar2_list) return ut_varchar2_list is + function trim_and_lower_paths( a_paths ut_varchar2_list) return ut_varchar2_list is l_paths_temp ut_varchar2_list := ut_varchar2_list(); begin l_paths_temp.extend(a_paths.count); @@ -160,7 +168,7 @@ create or replace package body ut_suite_manager is l_schema_names ut_varchar2_rows := ut_varchar2_rows(); c_current_schema constant all_tables.owner%type := sys_context('USERENV','CURRENT_SCHEMA'); begin - a_paths := set( clean_paths(a_paths) ); + a_paths := set( trim_and_lower_paths( a_paths) ); validate_paths(a_paths); @@ -310,29 +318,104 @@ create or replace package body ut_suite_manager is return l_path; end; +-- function group_paths_by_schema(a_paths ut_varchar2_list) return t_schema_paths is +-- l_result t_schema_paths; +-- l_schema varchar2(4000); +-- begin +-- for i in 1 .. a_paths.count loop +-- l_schema := upper(regexp_substr(a_paths(i),'^[^.:]+')); +-- if l_result.exists(l_schema) then +-- l_result(l_schema).extend; +-- l_result(l_schema)(l_result(l_schema).last) := a_paths(i); +-- else +-- l_result(l_schema) := ut_varchar2_list(a_paths(i)); +-- end if; +-- end loop; +-- return l_result; +-- end; +-- +-- function configure_execution_by_path(a_paths in ut_varchar2_list) return ut_suite_items is +-- l_paths ut_varchar2_list := a_paths; +-- l_path varchar2(32767); +-- l_schema varchar2(4000); +-- l_suites_info t_schema_suites_info; +-- l_index varchar2(4000 char); +-- l_suite ut_logical_suite; +-- l_objects_to_run ut_suite_items; +-- l_schema_paths t_schema_paths; +-- begin +-- --resolve schema names from paths and group paths by schema name +-- resolve_schema_names(l_paths); +-- +-- l_schema_paths := group_paths_by_schema(l_paths); +-- +-- l_objects_to_run := ut_suite_items(); +-- +-- l_schema := l_schema_paths.first; +-- while l_schema is not null loop +-- l_paths := l_schema_paths(l_schema); +-- l_suites_info := get_schema_suites(l_schema); +-- +-- for i in 1 .. l_paths.count loop +-- l_path := l_paths(i); +-- --run whole schema +-- if regexp_like(l_path, '^[A-Za-z0-9$#_]+$') then +-- l_index := l_suites_info.schema_suites.first; +-- while l_index is not null loop +-- l_objects_to_run.extend; +-- l_objects_to_run(l_objects_to_run.count) := l_suites_info.schema_suites(l_index); +-- l_index := l_suites_info.schema_suites.next(l_index); +-- end loop; +-- else +-- l_suite := get_suite_filtered_by_path( convert_to_suite_path( l_path, l_suites_info.suite_paths ), l_suites_info.schema_suites ); +-- l_objects_to_run.extend; +-- l_objects_to_run(l_objects_to_run.count) := l_suite; +-- end if; +-- end loop; +-- l_schema := l_schema_paths.next(l_schema); +-- end loop; +-- +-- --propagate rollback type to suite items after organizing suites into hierarchy +-- for i in 1 .. l_objects_to_run.count loop +-- l_objects_to_run(i).set_rollback_type( l_objects_to_run(i).get_rollback_type() ); +-- end loop; +-- +-- return l_objects_to_run; +-- end configure_execution_by_path; + function group_paths_by_schema(a_paths ut_varchar2_list) return t_schema_paths is - l_result t_schema_paths; - l_schema varchar2(4000); + c_package_path_regex constant varchar2(100) := '^([A-Za-z0-9$#_]+)(\.([A-Za-z0-9$#_]+))?(\.([A-Za-z0-9$#_]+))?$'; + l_schema varchar2(4000); + l_empty_result t_path_item; + l_result t_path_item; + l_results t_schema_paths; begin for i in 1 .. a_paths.count loop - l_schema := upper(regexp_substr(a_paths(i),'^[^.:]+')); - if l_result.exists(l_schema) then - l_result(l_schema).extend; - l_result(l_schema)(l_result(l_schema).last) := a_paths(i); + l_result := l_empty_result; + if a_paths(i) like '%:%' then + l_schema := upper(regexp_substr(a_paths(i),'^[^.:]+')); + l_result.suite_path := ltrim(regexp_substr(a_paths(i),'[.:].*$'),':'); + else + l_schema := regexp_substr(a_paths(i), c_package_path_regex, subexpression => 1); + l_result.object_name := regexp_substr(a_paths(i), c_package_path_regex, subexpression => 3); + l_result.procedure_name := regexp_substr(a_paths(i), c_package_path_regex, subexpression => 5); + end if; + if l_results.exists(l_schema) then + l_results(l_schema).extend; + l_results(l_schema)(l_results(l_schema).last) := l_result; else - l_result(l_schema) := ut_varchar2_list(a_paths(i)); + l_results(l_schema) := t_path_items(l_result); end if; end loop; - return l_result; + return l_results; end; - function configure_execution_by_path(a_paths in ut_varchar2_list) return ut_suite_items is l_paths ut_varchar2_list := a_paths; - l_path varchar2(32767); + l_path_items t_path_items; + l_path_item t_path_item; l_schema varchar2(4000); - l_suites_info t_schema_suites_info; + l_suites ut_suite_items; l_index varchar2(4000 char); - l_suite ut_logical_suite; l_objects_to_run ut_suite_items; l_schema_paths t_schema_paths; begin @@ -345,24 +428,24 @@ create or replace package body ut_suite_manager is l_schema := l_schema_paths.first; while l_schema is not null loop - l_paths := l_schema_paths(l_schema); - l_suites_info := get_schema_suites(l_schema); - - for i in 1 .. l_paths.count loop - l_path := l_paths(i); - --run whole schema - if regexp_like(l_path, '^[A-Za-z0-9$#_]+$') then - l_index := l_suites_info.schema_suites.first; - while l_index is not null loop - l_objects_to_run.extend; - l_objects_to_run(l_objects_to_run.count) := l_suites_info.schema_suites(l_index); - l_index := l_suites_info.schema_suites.next(l_index); - end loop; + l_path_items := l_schema_paths(l_schema); + for i in 1 .. l_path_items.count loop + l_path_item := l_path_items(i); + --whole schema + if l_path_item.object_name is null and l_path_item.suite_path is null then + l_suites := ut_suite_builder.build_schema_suites(upper(l_schema)); + --suite path + elsif l_path_item.suite_path is not null then + l_suites := ut_suite_builder.build_schema_suites(upper(l_schema), l_path_item.suite_path); else - l_suite := get_suite_filtered_by_path( convert_to_suite_path( l_path, l_suites_info.suite_paths ), l_suites_info.schema_suites ); - l_objects_to_run.extend; - l_objects_to_run(l_objects_to_run.count) := l_suite; + l_suites := ut_suite_builder.build_schema_suites(upper(l_schema), l_path_item.object_name, l_path_item.procedure_name); end if; + l_index := l_suites.first; + while l_index is not null loop + l_objects_to_run.extend; + l_objects_to_run(l_objects_to_run.count) := l_suites(l_index); + l_index := l_suites.next(l_index); + end loop; end loop; l_schema := l_schema_paths.next(l_schema); end loop; diff --git a/source/install.sql b/source/install.sql index 902b45aba..d71dcb1d1 100644 --- a/source/install.sql +++ b/source/install.sql @@ -70,6 +70,7 @@ alter session set current_schema = &&ut3_owner; @@install_component.sql 'core/types/ut_executable_test.tps' @@install_component.sql 'core/types/ut_test.tps' @@install_component.sql 'core/types/ut_logical_suite.tps' +@@install_component.sql 'core/types/ut_logical_suites.tps' @@install_component.sql 'core/types/ut_suite.tps' @@install_component.sql 'core/types/ut_suite_context.tps' @@install_component.sql 'core/types/ut_file_mapping.tps' @@ -109,6 +110,10 @@ alter session set current_schema = &&ut3_owner; @@install_component.sql 'core/annotations/ut_annotation_manager.pkb' --suite builder +@@install_component.sql 'core/ut_suite_cache_schema.sql' +@@install_component.sql 'core/ut_suite_cache.sql' +@@install_component.sql 'core/ut_suite_cache_manager.pks' +@@install_component.sql 'core/ut_suite_cache_manager.pkb' @@install_component.sql 'core/ut_suite_builder.pks' @@install_component.sql 'core/ut_suite_builder.pkb' --suite manager diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index cf8b3905f..754a16a34 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -55,6 +55,10 @@ drop package ut_suite_manager; drop package ut_suite_builder; +drop table ut_suite_cache; + +drop table ut_suite_cache_schema; + drop package ut; drop table ut_dbms_output_cache; diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index fb75b2da8..ac4fc9acf 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -1814,13 +1814,13 @@ Diff:% l_expected_message varchar2(32767); l_actual_message varchar2(32767); begin - select ut3.ut_annotated_object('TEST','TEST','TEST', + select ut3.ut_annotated_object('TEST','TEST','TEST', SYSDATE, ut3.ut_annotations(ut3.ut_annotation(1,'test','test','test'), ut3.ut_annotation(2,'test','test','test')) ) into l_actual_tab from dual; - select ut3.ut_annotated_object('TEST','TEST','TEST', + select ut3.ut_annotated_object('TEST','TEST','TEST', SYSDATE, ut3.ut_annotations(ut3.ut_annotation(1,'test','test','test'), ut3.ut_annotation(2,'test','test','test')) ) @@ -1846,13 +1846,13 @@ Diff:% l_expected_message varchar2(32767); l_actual_message varchar2(32767); begin - select ut3.ut_annotated_object('TEST','TEST','TEST', + select ut3.ut_annotated_object('TEST','TEST','TEST', SYSDATE, ut3.ut_annotations(ut3.ut_annotation(1,'test','test','test'), ut3.ut_annotation(2,'test','test','test')) ) into l_actual_tab from dual; - select ut3.ut_annotated_object('TEST','TEST','TEST', + select ut3.ut_annotated_object('TEST','TEST','TEST', SYSDATE, ut3.ut_annotations(ut3.ut_annotation(1,'test','test','test'), ut3.ut_annotation(2,'test','test','test')) ) @@ -1878,13 +1878,13 @@ Diff:% l_expected_message varchar2(32767); l_actual_message varchar2(32767); begin - select ut3.ut_annotated_object('TEST','TEST','TEST', + select ut3.ut_annotated_object('TEST','TEST','TEST', SYSDATE, ut3.ut_annotations(ut3.ut_annotation(1,'test','test','test'), ut3.ut_annotation(2,'test','test','test')) ) into l_actual_tab from dual; - select ut3.ut_annotated_object('TEST','TEST','TEST', + select ut3.ut_annotated_object('TEST','TEST','TEST', SYSDATE, ut3.ut_annotations(ut3.ut_annotation(1,'test','test','test'), ut3.ut_annotation(2,'test','test','test')) ) @@ -1909,15 +1909,16 @@ Diff:% l_expected_tab ut3.ut_annotated_object; l_expected_message varchar2(32767); l_actual_message varchar2(32767); + l_date date := sysdate; begin - select ut3.ut_annotated_object('TEST','TEST','TEST', + select ut3.ut_annotated_object('TEST','TEST','TEST', l_date, ut3.ut_annotations(ut3.ut_annotation(1,'test','test','test'), ut3.ut_annotation(2,'test','test','test')) ) into l_actual_tab from dual; - select ut3.ut_annotated_object('TEST','TEST','TEST', + select ut3.ut_annotated_object('TEST','TEST','TEST', l_date, ut3.ut_annotations(ut3.ut_annotation(1,'1test','test','test'), ut3.ut_annotation(2,'test','test','test')) ) @@ -1938,8 +1939,8 @@ Diff:% l_expected_message := q'[%Actual: refcursor [ count = 1 ] was expected to equal: refcursor [ count = 1 ] %Diff: %Rows: [ 1 differences ] -%PK TEST - Actual: TESTTESTTEST1testtesttest2testtesttest% -%PK TEST - Expected: TESTTESTTEST11testtesttest2testtesttest%]'; +%PK TEST - Actual: TESTTESTTEST%1testtesttest2testtesttest% +%PK TEST - Expected: TESTTESTTEST%11testtesttest2testtesttest%]'; l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); @@ -1954,13 +1955,13 @@ Diff:% l_expected_message varchar2(32767); l_actual_message varchar2(32767); begin - select ut3.ut_annotated_object('TEST','TEST','TEST', + select ut3.ut_annotated_object('TEST','TEST','TEST', SYSDATE, ut3.ut_annotations(ut3.ut_annotation(1,'1test','test','test'), ut3.ut_annotation(2,'test','test','test')) ) into l_actual_tab from dual; - select ut3.ut_annotated_object('TEST','TEST','TEST', + select ut3.ut_annotated_object('TEST','TEST','TEST', SYSDATE, ut3.ut_annotations(ut3.ut_annotation(1,'test','test','test'), ut3.ut_annotation(2,'test','test','test')) ) diff --git a/test/core/test_suite_builder.pkb b/test/core/test_suite_builder.pkb index 19ea81aa0..3216da333 100644 --- a/test/core/test_suite_builder.pkb +++ b/test/core/test_suite_builder.pkb @@ -11,7 +11,7 @@ create or replace package body test_suite_builder is begin open l_cursor for select value(x) from table( ut3.ut_annotated_objects( - ut3.ut_annotated_object('UT3_TESTER', a_package_name, 'PACKAGE', a_annotations) + ut3.ut_annotated_object('UT3_TESTER', a_package_name, 'PACKAGE', SYSDATE, a_annotations) ) ) x; l_suites := ut3.ut_suite_builder.build_suites(l_cursor).schema_suites; l_suite := l_suites(l_suites.first); @@ -843,6 +843,61 @@ create or replace package body test_suite_builder is ); end; + --%test(Gives warning when two contexts have the same name) + procedure duplicate_context_name is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(2, 'beforeall',null, 'suite_level_beforeall'), + ut3.ut_annotation(3, 'test','In suite', 'suite_level_test'), + ut3.ut_annotation(4, 'context','a_context', null), + ut3.ut_annotation(5, 'displayname','A context', null), + ut3.ut_annotation(6, 'beforeall',null, 'context_setup'), + ut3.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), + ut3.ut_annotation(8, 'endcontext',null, null), + ut3.ut_annotation(9, 'context','a_context', null), + ut3.ut_annotation(10, 'displayname','A context', null), + ut3.ut_annotation(11, 'beforeall',null, 'setup_in_duplicated_context'), + ut3.ut_annotation(12, 'test', 'In duplicated context', 'test_in_duplicated_context'), + ut3.ut_annotation(13, 'endcontext',null, null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%Context name must be unique in a suite. Context and all of it's content ignored.%at "UT3_TESTER.SOME_PACKAGE", line 9%' + ,'\' + ); + ut.expect(l_actual).to_be_like( + '' || + '%' || + '' || + '%a_contextA contextsome_package.a_context' || + '%' || + '' || + '%test_in_a_contextIn contextsome_package.a_context.test_in_a_context' || + '%' || + '' || + '' || + '%some_packagecontext_setup' || + '%' || + '' || + '' || + '' || + '%suite_level_testIn suitesome_package.suite_level_test' || + '%' || + '' || + '' || + '%some_packagesuite_level_beforeall' || + '%' || + '' || + '' + ); + end; + procedure throws_value_empty is l_actual clob; l_annotations ut3.ut_annotations; diff --git a/test/core/test_suite_builder.pks b/test/core/test_suite_builder.pks index 36517432b..21ca58206 100644 --- a/test/core/test_suite_builder.pks +++ b/test/core/test_suite_builder.pks @@ -39,6 +39,9 @@ create or replace package test_suite_builder is --%test(Gives warning if more than one --%test annotation used) procedure test_annot_duplicated; + --%test(Is added to suite according to annotation order in package spec) + procedure test_annotation_ordering; + --%endcontext --%context(suitepath) @@ -125,6 +128,9 @@ create or replace package test_suite_builder is --%test(Gives warning if --%endcontext is missing a preceding --%context) procedure endcontext_without_context; + --%test(Gives warning when two contexts have the same name and ignores duplicated context) + procedure duplicate_context_name; + --%endcontext --%context(throws) @@ -155,14 +161,6 @@ create or replace package test_suite_builder is --%endcontext - --%context(test) - --%displayname(--%test annontation) - - --%test(Is added to suite according to annotation order in package spec) - procedure test_annotation_ordering; - - --%endcontext - --%context(unknown_annotation) --%displayname(--%bad_annotation) diff --git a/test/core/test_ut_executable.pkb b/test/core/test_ut_executable.pkb index 2d4cde518..d09a25a6d 100644 --- a/test/core/test_ut_executable.pkb +++ b/test/core/test_ut_executable.pkb @@ -8,7 +8,7 @@ create or replace package body test_ut_executable is l_result boolean; begin --Arrange - l_test := ut3.ut_test(a_object_name => 'test_ut_executable',a_name => 'test_ut_executable'); + l_test := ut3.ut_test(a_object_name => 'test_ut_executable',a_name => 'test_ut_executable', a_line_no=> 1); l_executable := ut3.ut_executable_test( null, 'test_ut_executable', 'passing_proc', ut3.ut_utils.gc_test_execute ); --Act l_result := l_executable.do_execute(l_test); @@ -24,7 +24,7 @@ create or replace package body test_ut_executable is l_result boolean; begin --Arrange - l_test := ut3.ut_test(a_object_name => 'test_ut_executable',a_name => 'test_ut_executable'); + l_test := ut3.ut_test(a_object_name => 'test_ut_executable',a_name => 'test_ut_executable', a_line_no=> 1); l_executable := ut3.ut_executable_test( user, 'test_ut_executable', 'output_proc', ut3.ut_utils.gc_test_execute ); --Act l_result := l_executable.do_execute(l_test); @@ -40,7 +40,7 @@ create or replace package body test_ut_executable is l_result boolean; begin --Arrange - l_test := ut3.ut_test(a_object_name => 'test_ut_executable',a_name => 'test_ut_executable'); + l_test := ut3.ut_test(a_object_name => 'test_ut_executable',a_name => 'test_ut_executable', a_line_no=> 1); l_executable := ut3.ut_executable_test( user, 'test_ut_executable', 'throwing_proc', ut3.ut_utils.gc_test_execute ); --Act l_result := l_executable.do_execute(l_test); @@ -80,10 +80,10 @@ create or replace package body test_ut_executable is procedure form_name is begin - ut.expect(ut3.ut_executable_test( user, 'package', 'proc', null ).form_name()).to_equal(user||'.package.proc'); - ut.expect(ut3.ut_executable_test( null, 'package', 'proc', null ).form_name()).to_equal('package.proc'); + ut.expect(ut3.ut_executable_test( user, ' package ', 'proc', null ).form_name()).to_equal(user||'.package.proc'); + ut.expect(ut3.ut_executable_test( null, 'package', ' proc ', null ).form_name()).to_equal('package.proc'); ut.expect(ut3.ut_executable_test( null, 'proc', null, null ).form_name()).to_equal('proc'); - ut.expect(ut3.ut_executable_test( user, 'proc', null, null ).form_name()).to_equal(user||'.proc'); + ut.expect(ut3.ut_executable_test( ' '||user||' ', 'proc', null, null ).form_name()).to_equal(user||'.proc'); end; procedure passing_proc is diff --git a/test/core/test_ut_suite.pkb b/test/core/test_ut_suite.pkb index c66e25af3..9955aa048 100644 --- a/test/core/test_ut_suite.pkb +++ b/test/core/test_ut_suite.pkb @@ -9,13 +9,13 @@ create or replace package body test_ut_suite is l_suite ut3.ut_suite; begin --Arrange - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS'); + l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); l_suite.path := 'ut_example_tests'; l_suite.disabled_flag := ut3.ut_utils.boolean_to_int(true); l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'set_g_number_0', ut3.ut_utils.gc_before_all)); l_suite.after_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'add_1_to_g_number', ut3.ut_utils.gc_before_all)); - l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number')); - l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number')); + l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1)); + l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1)); --Act l_suite.do_execute(); --Assert @@ -32,10 +32,10 @@ create or replace package body test_ut_suite is l_suite ut3.ut_suite; begin --Arrange - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS'); + l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); l_suite.path := 'ut_example_tests'; l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'failing_procedure', ut3.ut_utils.gc_before_all)); - l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'set_g_number_0')); + l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'set_g_number_0', a_line_no=> 1)); --Act l_suite.do_execute(); --Assert @@ -52,12 +52,12 @@ create or replace package body test_ut_suite is l_suite ut3.ut_suite; begin --Arrange - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS'); + l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); l_suite.path := 'ut_example_tests'; l_suite.after_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'failing_procedure', ut3.ut_utils.gc_after_all)); - l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'set_g_number_0')); - l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number')); + l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'set_g_number_0', a_line_no=> 1)); + l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1)); --Act l_suite.do_execute(); --Assert @@ -73,9 +73,9 @@ create or replace package body test_ut_suite is procedure package_without_body is l_suite ut3.ut_suite; begin - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_WITHOUT_BODY'); + l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_WITHOUT_BODY', a_line_no=> 1); l_suite.path := 'UT_WITHOUT_BODY'; - l_suite.add_item(ut3.ut_test(a_object_name => 'ut_without_body',a_name => 'test1'/*, a_rollback_type => ut3.ut_utils.gc_rollback_auto*/)); + l_suite.add_item(ut3.ut_test(a_object_name => 'ut_without_body',a_name => 'test1', a_line_no=> 1)); --Act l_suite.do_execute(); --Assert @@ -85,9 +85,9 @@ create or replace package body test_ut_suite is procedure package_with_invalid_body is l_suite ut3.ut_suite; begin - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_WITH_INVALID_BODY'); + l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_WITH_INVALID_BODY', a_line_no=> 1); l_suite.path := 'UT_WITH_INVALID_BODY'; - l_suite.add_item(ut3.ut_test(a_object_name => 'ut_with_invalid_body',a_name => 'test1'/*, a_rollback_type => ut3.ut_utils.gc_rollback_auto*/)); + l_suite.add_item(ut3.ut_test(a_object_name => 'ut_with_invalid_body',a_name => 'test1', a_line_no=> 1)); --Act l_suite.do_execute(); --Assert @@ -99,10 +99,10 @@ create or replace package body test_ut_suite is begin --Arrange execute immediate 'delete from ut$test_table'; - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_TRANSACTION_CONTROL'); + l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_TRANSACTION_CONTROL', a_line_no=> 1); l_suite.path := 'ut_transaction_control'; l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_TRANSACTION_CONTROL', 'setup', ut3.ut_utils.gc_before_all)); - l_suite.add_item(ut3.ut_test(a_object_owner => USER, a_object_name => 'ut_transaction_control',a_name => a_procedure_name)); + l_suite.add_item(ut3.ut_test(a_object_owner => USER, a_object_name => 'ut_transaction_control',a_name => a_procedure_name, a_line_no=> 1)); l_suite.set_rollback_type(a_rollback_type); --Act diff --git a/test/core/test_ut_test.pkb b/test/core/test_ut_test.pkb index ecce27c3c..857ef5e99 100644 --- a/test/core/test_ut_test.pkb +++ b/test/core/test_ut_test.pkb @@ -10,12 +10,12 @@ create or replace package body test_ut_test is l_test ut3.ut_test; begin --Arrange - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS'); + l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); l_suite.path := 'ut_example_tests'; l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'set_g_number_0', ut3.ut_utils.gc_before_all)); - l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number')); - l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number')); + l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1)); + l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 2)); l_suite.items(l_suite.items.last).disabled_flag := ut3.ut_utils.boolean_to_int(true); --Act l_suite.do_execute(); @@ -34,15 +34,15 @@ create or replace package body test_ut_test is l_test ut3.ut_test; begin --Arrange - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS'); + l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); l_suite.path := 'ut_example_tests'; l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'set_g_number_0', ut3.ut_utils.gc_before_all)); - l_test := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number'); + l_test := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); l_test.before_test_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'add_1_to_g_number', ut3.ut_utils.gc_before_test)); l_test.after_test_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'failing_procedure', ut3.ut_utils.gc_after_test)); l_suite.add_item(l_test); - l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number')); + l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1)); --Act l_suite.do_execute(); --Assert @@ -60,13 +60,13 @@ create or replace package body test_ut_test is l_test ut3.ut_test; begin --Arrange - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS'); + l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'set_g_number_0', ut3.ut_utils.gc_before_all)); - l_test := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number'); + l_test := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); l_test.before_each_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'add_1_to_g_number', ut3.ut_utils.gc_before_each)); l_test.after_each_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'failing_procedure', ut3.ut_utils.gc_after_each)); l_suite.add_item(l_test); - l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number')); + l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1)); --Act l_suite.do_execute(); --Assert @@ -84,13 +84,13 @@ create or replace package body test_ut_test is l_test ut3.ut_test; begin --Arrange - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS'); + l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'set_g_number_0', ut3.ut_utils.gc_before_all)); - l_test := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number'); + l_test := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); l_test.before_test_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'failing_procedure', ut3.ut_utils.gc_before_test)); l_test.after_test_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'add_1_to_g_number', ut3.ut_utils.gc_after_test)); l_suite.add_item(l_test); - l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number')); + l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1)); --Act l_suite.do_execute(); --Assert @@ -108,13 +108,13 @@ create or replace package body test_ut_test is l_test ut3.ut_test; begin --Arrange - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS'); + l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'set_g_number_0', ut3.ut_utils.gc_before_all)); - l_test := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number'); + l_test := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); l_test.before_each_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'failing_procedure', ut3.ut_utils.gc_before_each)); l_test.after_each_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'add_1_to_g_number', ut3.ut_utils.gc_after_each)); l_suite.add_item(l_test); - l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number')); + l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1)); --Act l_suite.do_execute(); --Assert From f475b7cfea9d7e080b937c31ef88c9c2074ea566 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 2 Nov 2018 02:18:46 +0000 Subject: [PATCH 0059/1096] Added `suite_cache`. Refactored lots of code for suite parsing/building. (Acceptance) tests need rework due to changes in test execution ordering. --- .../core/annotations/ut_annotated_object.tps | 2 +- .../annotations/ut_annotation_cache_info.sql | 2 +- .../ut_annotation_cache_manager.pkb | 14 +- .../ut_annotation_cache_manager.pks | 2 +- .../annotations/ut_annotation_manager.pkb | 38 +- .../annotations/ut_annotation_manager.pks | 2 +- source/core/types/ut_logical_suite.tpb | 24 +- source/core/types/ut_logical_suite.tps | 7 +- source/core/types/ut_run.tpb | 10 + source/core/types/ut_run.tps | 6 + source/core/types/ut_suite_item.tps | 8 +- source/core/types/ut_test.tpb | 10 + source/core/types/ut_test.tps | 6 + source/core/ut_suite_builder.pkb | 597 ++++++------------ source/core/ut_suite_builder.pks | 62 +- source/core/ut_suite_cache.sql | 4 +- source/core/ut_suite_cache_manager.pkb | 329 ++++------ source/core/ut_suite_cache_manager.pks | 16 +- source/core/ut_suite_cache_schema.sql | 2 +- source/core/ut_suite_manager.pkb | 286 +-------- test/core/test_suite_builder.pkb | 20 +- 21 files changed, 463 insertions(+), 984 deletions(-) diff --git a/source/core/annotations/ut_annotated_object.tps b/source/core/annotations/ut_annotated_object.tps index e78a2a282..1bfefed69 100644 --- a/source/core/annotations/ut_annotated_object.tps +++ b/source/core/annotations/ut_annotated_object.tps @@ -18,7 +18,7 @@ create type ut_annotated_object as object( object_owner varchar2(250), object_name varchar2(250), object_type varchar2(50), - parse_time date, + parse_time timestamp, annotations ut_annotations ) / diff --git a/source/core/annotations/ut_annotation_cache_info.sql b/source/core/annotations/ut_annotation_cache_info.sql index 48f8a606c..fa7eabeec 100644 --- a/source/core/annotations/ut_annotation_cache_info.sql +++ b/source/core/annotations/ut_annotation_cache_info.sql @@ -16,7 +16,7 @@ create table ut_annotation_cache_info ( object_owner varchar2(250) not null, object_name varchar2(250) not null, object_type varchar2(250) not null, - parse_time date not null, + parse_time timestamp not null, constraint ut_annotation_cache_info_pk primary key(cache_id), constraint ut_annotation_cache_info_uk unique (object_owner, object_name, object_type) ) organization index; diff --git a/source/core/annotations/ut_annotation_cache_manager.pkb b/source/core/annotations/ut_annotation_cache_manager.pkb index e9d60730b..c54d7eec3 100644 --- a/source/core/annotations/ut_annotation_cache_manager.pkb +++ b/source/core/annotations/ut_annotation_cache_manager.pkb @@ -22,14 +22,14 @@ create or replace package body ut_annotation_cache_manager as pragma autonomous_transaction; begin update ut_annotation_cache_info i - set i.parse_time = sysdate + set i.parse_time = systimestamp where (i.object_owner, i.object_name, i.object_type) in ((a_object.object_owner, a_object.object_name, a_object.object_type)) returning cache_id into l_cache_id; if sql%rowcount = 0 then insert into ut_annotation_cache_info (cache_id, object_owner, object_name, object_type, parse_time) - values (ut_annotation_cache_seq.nextval, a_object.object_owner, a_object.object_name, a_object.object_type, sysdate) + values (ut_annotation_cache_seq.nextval, a_object.object_owner, a_object.object_name, a_object.object_type, systimestamp) returning cache_id into l_cache_id; end if; @@ -66,15 +66,15 @@ create or replace package body ut_annotation_cache_manager as on (o.object_name = i.object_name and o.object_type = i.object_type and o.object_owner = i.object_owner) - when matched then update set parse_time = sysdate + when matched then update set parse_time = systimestamp when not matched then insert (cache_id, object_owner, object_name, object_type, parse_time) - values (ut_annotation_cache_seq.nextval, o.object_owner, o.object_name, o.object_type, sysdate); + values (ut_annotation_cache_seq.nextval, o.object_owner, o.object_name, o.object_type, systimestamp); commit; end; - function get_annotations_for_objects(a_cached_objects ut_annotation_objs_cache_info, a_parse_date date) return sys_refcursor is + function get_annotations_for_objects(a_cached_objects ut_annotation_objs_cache_info, a_parse_time timestamp) return sys_refcursor is l_results sys_refcursor; begin open l_results for q'[ @@ -92,9 +92,9 @@ create or replace package body ut_annotation_cache_manager as join ut_annotation_cache_info i on o.object_owner = i.object_owner and o.object_name = i.object_name and o.object_type = i.object_type join ut_annotation_cache c on i.cache_id = c.cache_id - where ]'|| case when a_parse_date is null then ':a_parse_date is null' else 'i.parse_time > :a_parse_date' end ||q'[ + where ]'|| case when a_parse_time is null then ':a_parse_date is null' else 'i.parse_time > :a_parse_time' end ||q'[ group by i.object_owner, i.object_name, i.object_type, i.parse_time]' - using a_cached_objects, a_parse_date; + using a_cached_objects, a_parse_time; return l_results; end; diff --git a/source/core/annotations/ut_annotation_cache_manager.pks b/source/core/annotations/ut_annotation_cache_manager.pks index 7663fdc33..2ee586d12 100644 --- a/source/core/annotations/ut_annotation_cache_manager.pks +++ b/source/core/annotations/ut_annotation_cache_manager.pks @@ -32,7 +32,7 @@ create or replace package ut_annotation_cache_manager authid definer as * * @param a_cached_objects a `ut_annotation_objs_cache_info` list with information about objects to get from cache */ - function get_annotations_for_objects(a_cached_objects ut_annotation_objs_cache_info, a_parse_date date) return sys_refcursor; + function get_annotations_for_objects(a_cached_objects ut_annotation_objs_cache_info, a_parse_time timestamp) return sys_refcursor; /** * Removes cached information about annotations for objects on the list and updates parse_time in cache info table. diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index 7c299b766..9ad1a9e79 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -19,7 +19,7 @@ create or replace package body ut_annotation_manager as ------------------------------ --private definitions - function get_annotation_objs_info(a_object_owner varchar2, a_object_type varchar2, a_parse_date date := null) return ut_annotation_objs_cache_info is + function get_annotation_objs_info(a_object_owner varchar2, a_object_type varchar2, a_parse_date timestamp := null) return ut_annotation_objs_cache_info is l_rows sys_refcursor; l_ut_owner varchar2(250) := ut_utils.ut_owner; l_objects_view varchar2(200) := ut_metadata.get_dba_view('dba_objects'); @@ -31,7 +31,7 @@ create or replace package body ut_annotation_manager as object_owner => o.owner, object_name => o.object_name, object_type => o.object_type, - needs_refresh => case when o.last_ddl_time < i.parse_time then 'N' else 'Y' end + needs_refresh => case when o.last_ddl_time < cast(i.parse_time as date) then 'N' else 'Y' end ) from ]'||l_objects_view||q'[ o left join ]'||l_ut_owner||q'[.ut_annotation_cache_info i @@ -44,7 +44,7 @@ create or replace package body ut_annotation_manager as || case when a_parse_date is null then ':a_parse_date is null' - else 'o.last_ddl_time > :a_parse_date' + else 'o.last_ddl_time > cast(:a_parse_date as date)' end; open l_rows for l_cursor_text using a_object_owner, a_object_type, a_parse_date; fetch l_rows bulk collect into l_result limit 1000000; @@ -148,37 +148,17 @@ create or replace package body ut_annotation_manager as procedure rebuild_annotation_cache( a_object_owner varchar2, a_object_type varchar2, a_info_rows ut_annotation_objs_cache_info) is - l_objects_in_cache_count integer; l_objects_to_parse ut_annotation_objs_cache_info := ut_annotation_objs_cache_info(); begin - --get list of objects in cache - select count(1) into l_objects_in_cache_count - from table(a_info_rows) x where x.needs_refresh = 'N'; - - --if cache is empty and there are objects to parse - if l_objects_in_cache_count = 0 and a_info_rows.count > 0 then + select value(x)bulk collect into l_objects_to_parse from table(a_info_rows) x where x.needs_refresh = 'Y'; + --if some source needs parsing and putting into cache + if l_objects_to_parse.count > 0 then build_annot_cache_for_sources( a_object_owner, a_object_type, - --all schema objects - get_sources_to_annotate(a_object_owner, a_object_type), - a_info_rows + get_sources_to_annotate(a_object_owner, a_object_type, l_objects_to_parse), + l_objects_to_parse ); - - --if not all in cache, get list of objects to rebuild cache for - elsif l_objects_in_cache_count < a_info_rows.count then - - select value(x)bulk collect into l_objects_to_parse from table(a_info_rows) x where x.needs_refresh = 'Y'; - - --if some source needs parsing and putting into cache - if l_objects_to_parse.count > 0 then - build_annot_cache_for_sources( - a_object_owner, a_object_type, - get_sources_to_annotate(a_object_owner, a_object_type, l_objects_to_parse), - l_objects_to_parse - ); - end if; - end if; end; @@ -194,7 +174,7 @@ create or replace package body ut_annotation_manager as ); end; - function get_annotated_objects(a_object_owner varchar2, a_object_type varchar2, a_parse_date date := null) return ut_annotated_objects pipelined is + function get_annotated_objects(a_object_owner varchar2, a_object_type varchar2, a_parse_date timestamp := null) return ut_annotated_objects pipelined is l_info_rows ut_annotation_objs_cache_info; l_cursor sys_refcursor; l_results ut_annotated_objects; diff --git a/source/core/annotations/ut_annotation_manager.pks b/source/core/annotations/ut_annotation_manager.pks index f0468ccd5..829142bd5 100644 --- a/source/core/annotations/ut_annotation_manager.pks +++ b/source/core/annotations/ut_annotation_manager.pks @@ -30,7 +30,7 @@ create or replace package ut_annotation_manager authid current_user as * @param a_parse_date date when object was last parsed * @return array containing annotated objects along with annotations for each object (nested) */ - function get_annotated_objects(a_object_owner varchar2, a_object_type varchar2, a_parse_date date := null) return ut_annotated_objects pipelined; + function get_annotated_objects(a_object_owner varchar2, a_object_type varchar2, a_parse_date timestamp := null) return ut_annotated_objects pipelined; /** * Rebuilds annotation cache for a specified schema and object type. diff --git a/source/core/types/ut_logical_suite.tpb b/source/core/types/ut_logical_suite.tpb index 1acfc776c..70e0ca462 100644 --- a/source/core/types/ut_logical_suite.tpb +++ b/source/core/types/ut_logical_suite.tpb @@ -21,7 +21,7 @@ create or replace type body ut_logical_suite as ) return self as result is begin self.self_type := $$plsql_unit; - self.init(a_object_owner, a_object_name, a_name, 0); + self.init(a_object_owner, a_object_name, a_name, null); self.path := a_path; self.disabled_flag := ut_utils.boolean_to_int(false); self.items := ut_suite_items(); @@ -33,10 +33,26 @@ create or replace type body ut_logical_suite as return true; end; - member procedure add_item(self in out nocopy ut_logical_suite, a_item ut_suite_item) is + overriding member procedure add_item( + self in out nocopy ut_logical_suite, + a_item ut_suite_item, + a_expected_level integer := 1, + a_current_level integer :=1 + ) is begin - self.items.extend; - self.items(self.items.last) := a_item; + if a_expected_level > a_current_level then + if self.items.last is not null then + self.items(self.items.last).add_item(a_item, a_expected_level, a_current_level+1); + else + 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'); + end if; + else + if self.items is null then + self.items := ut_suite_items(); + end if; + self.items.extend; + self.items(self.items.last) := a_item; + end if; end; overriding member procedure mark_as_skipped(self in out nocopy ut_logical_suite) is diff --git a/source/core/types/ut_logical_suite.tps b/source/core/types/ut_logical_suite.tps index 85bb80870..2672cacd3 100644 --- a/source/core/types/ut_logical_suite.tps +++ b/source/core/types/ut_logical_suite.tps @@ -25,7 +25,12 @@ create or replace type ut_logical_suite under ut_suite_item ( self in out nocopy ut_logical_suite, a_object_owner varchar2, a_object_name varchar2, a_name varchar2, a_path varchar2 ) return self as result, member function is_valid(self in out nocopy ut_logical_suite) return boolean, - member procedure add_item(self in out nocopy ut_logical_suite, a_item ut_suite_item), + overriding member procedure add_item( + self in out nocopy ut_logical_suite, + a_item ut_suite_item, + a_expected_level integer := 1, + a_current_level integer :=1 + ), overriding member procedure mark_as_skipped(self in out nocopy ut_logical_suite), overriding member procedure set_rollback_type(self in out nocopy ut_logical_suite, a_rollback_type integer), overriding member function do_execute(self in out nocopy ut_logical_suite) return boolean, diff --git a/source/core/types/ut_run.tpb b/source/core/types/ut_run.tpb index 0db9f38c0..f7756cf37 100644 --- a/source/core/types/ut_run.tpb +++ b/source/core/types/ut_run.tpb @@ -51,6 +51,16 @@ create or replace type body ut_run as null; end; + overriding member procedure add_item( + self in out nocopy ut_run, + a_item ut_suite_item, + a_expected_level integer := 1, + a_current_level integer :=1 + ) is + begin + raise_application_error(-20000, 'Cannot add a suite item to ut_run'); + end; + overriding member function do_execute(self in out nocopy ut_run) return boolean is l_completed_without_errors boolean; begin diff --git a/source/core/types/ut_run.tps b/source/core/types/ut_run.tps index 5dc8e0399..3807a2a75 100644 --- a/source/core/types/ut_run.tps +++ b/source/core/types/ut_run.tps @@ -36,6 +36,12 @@ create or replace type ut_run under ut_suite_item ( a_client_character_set varchar2 := null ) return self as result, overriding member procedure mark_as_skipped(self in out nocopy ut_run), + overriding member procedure add_item( + self in out nocopy ut_run, + a_item ut_suite_item, + a_expected_level integer := 1, + a_current_level integer :=1 + ), overriding member function do_execute(self in out nocopy ut_run) return boolean, overriding member procedure calc_execution_result(self in out nocopy ut_run), overriding member procedure mark_as_errored(self in out nocopy ut_run, a_error_stack_trace varchar2), diff --git a/source/core/types/ut_suite_item.tps b/source/core/types/ut_suite_item.tps index 0f08263c4..927ad3807 100644 --- a/source/core/types/ut_suite_item.tps +++ b/source/core/types/ut_suite_item.tps @@ -52,7 +52,7 @@ create or replace type ut_suite_item force under ut_event_item ( /** * Time when the suite item was last parsed from package source */ - parse_time date, + parse_time timestamp, --execution result fields start_time timestamp with time zone, end_time timestamp with time zone, @@ -63,6 +63,12 @@ create or replace type ut_suite_item force under ut_event_item ( member procedure init(self in out nocopy ut_suite_item, a_object_owner varchar2, a_object_name varchar2, a_name varchar2, a_line_no integer), member function get_disabled_flag return boolean, not instantiable member procedure mark_as_skipped(self in out nocopy ut_suite_item), + not instantiable member procedure add_item( + self in out nocopy ut_suite_item, + a_item ut_suite_item, + a_expected_level integer := 1, + a_current_level integer :=1 + ), member procedure set_rollback_type(self in out nocopy ut_suite_item, a_rollback_type integer), member function get_rollback_type return integer, member function create_savepoint_if_needed return varchar2, diff --git a/source/core/types/ut_test.tpb b/source/core/types/ut_test.tpb index ed9692e14..d68b19a87 100644 --- a/source/core/types/ut_test.tpb +++ b/source/core/types/ut_test.tpb @@ -34,6 +34,16 @@ create or replace type body ut_test as return; end; + overriding member procedure add_item( + self in out nocopy ut_test, + a_item ut_suite_item, + a_expected_level integer := 1, + a_current_level integer :=1 + ) is + begin + raise_application_error(-20000, 'Cannot add a suite item to ut_test'); + end; + overriding member procedure mark_as_skipped(self in out nocopy ut_test) is begin ut_event_manager.trigger_event(ut_utils.gc_before_test, self); diff --git a/source/core/types/ut_test.tps b/source/core/types/ut_test.tps index 752ef3ef7..9e26508e4 100644 --- a/source/core/types/ut_test.tps +++ b/source/core/types/ut_test.tps @@ -60,6 +60,12 @@ create or replace type ut_test under ut_suite_item ( a_line_no integer, a_expected_error_codes ut_integer_list := null ) return self as result, overriding member procedure mark_as_skipped(self in out nocopy ut_test), + overriding member procedure add_item( + self in out nocopy ut_test, + a_item ut_suite_item, + a_expected_level integer := 1, + a_current_level integer :=1 + ), overriding member function do_execute(self in out nocopy ut_test) return boolean, overriding member procedure calc_execution_result(self in out nocopy ut_test), overriding member procedure mark_as_errored(self in out nocopy ut_test, a_error_stack_trace varchar2), diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index ce269280a..21e784f7e 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -92,7 +92,7 @@ create or replace package body ut_suite_builder is type t_annotations_info is record ( owner t_object_name, name t_object_name, - parse_time date, + parse_time timestamp, by_line tt_annotations_by_line, by_proc tt_annotations_by_proc, by_name tt_annotations_by_name @@ -121,6 +121,15 @@ create or replace package body ut_suite_builder is a_annotations.by_line.delete(a_start_pos, a_end_pos); end; + + procedure add_items_to_list(a_list in out nocopy ut_suite_items, a_items ut_suite_items) is + begin + for i in 1 .. a_items.count loop + a_list.extend(); + a_list(a_list.last) := a_items(i); + end loop; + end; + ----------------------------------------------- -- Processing annotations ----------------------------------------------- @@ -429,13 +438,12 @@ create or replace package body ut_suite_builder is procedure add_test( a_suite in out nocopy ut_suite, - a_tests in out nocopy tt_tests, + a_suite_items in out nocopy ut_suite_items, a_procedure_name t_object_name, a_annotations t_annotations_info ) is l_test ut_test; l_annotation_texts tt_annotation_texts; - l_annotation_pos binary_integer; l_proc_annotations tt_annotations_by_name := a_annotations.by_proc(a_procedure_name); begin if not l_proc_annotations.exists(gc_test) then @@ -488,10 +496,11 @@ create or replace package body ut_suite_builder is end if; l_test.disabled_flag := ut_utils.boolean_to_int( l_proc_annotations.exists( gc_disabled)); - a_tests( l_proc_annotations( gc_test).first) := l_test; + a_suite_items.extend; + a_suite_items( a_suite_items.last ) := l_test; end; - procedure update_before_after_each( + procedure propagate_before_after_each( a_suite in out nocopy ut_logical_suite, a_before_each_list tt_executables, a_after_each_list tt_executables @@ -508,14 +517,14 @@ create or replace package body ut_suite_builder is a_suite.items(i) := l_test; elsif a_suite.items(i) is of (ut_logical_suite) then l_context := treat(a_suite.items(i) as ut_logical_suite); - update_before_after_each(l_context, a_before_each_list, a_after_each_list); + propagate_before_after_each( l_context, a_before_each_list, a_after_each_list); a_suite.items(i) := l_context; end if; end loop; end if; end; - procedure update_before_after_each( + procedure propagate_before_after_each( a_suite_items in out nocopy ut_suite_items, a_before_each_list tt_executables, a_after_each_list tt_executables @@ -532,7 +541,7 @@ create or replace package body ut_suite_builder is a_suite_items(i) := l_test; elsif a_suite_items(i) is of (ut_logical_suite) then l_context := treat(a_suite_items(i) as ut_logical_suite); - update_before_after_each(l_context.items, a_before_each_list, a_after_each_list); + propagate_before_after_each( l_context.items, a_before_each_list, a_after_each_list); a_suite_items(i) := l_context; end if; end loop; @@ -554,9 +563,10 @@ create or replace package body ut_suite_builder is end if; end; - procedure add_annotated_procedures( + procedure get_annotated_procedures( a_proc_annotations t_annotations_info, a_suite in out nocopy ut_suite, + a_suite_items in out nocopy ut_suite_items, a_before_each_list in out nocopy tt_executables, a_after_each_list in out nocopy tt_executables, a_before_all_list in out nocopy tt_executables, @@ -564,41 +574,17 @@ create or replace package body ut_suite_builder is ) is l_procedure_name t_object_name; l_tests tt_tests; - begin - l_procedure_name := a_proc_annotations.by_proc.first; - while l_procedure_name is not null loop - add_test( a_suite, l_tests, l_procedure_name, a_proc_annotations ); - process_before_after_annot(a_before_each_list, gc_beforeeach, l_procedure_name, a_proc_annotations.by_proc(l_procedure_name), a_suite); - process_before_after_annot(a_after_each_list, gc_aftereach, l_procedure_name, a_proc_annotations.by_proc(l_procedure_name), a_suite); - process_before_after_annot(a_before_all_list, gc_beforeall, l_procedure_name, a_proc_annotations.by_proc(l_procedure_name), a_suite); - process_before_after_annot(a_after_all_list, gc_afterall, l_procedure_name, a_proc_annotations.by_proc(l_procedure_name), a_suite); - l_procedure_name := a_proc_annotations.by_proc.next( l_procedure_name ); - end loop; - a_suite.items := a_suite.items multiset union all convert_list(l_tests); - end; - - function get_annotated_procedures( - a_proc_annotations t_annotations_info, - a_suite in out nocopy ut_suite, - a_before_each_list in out nocopy tt_executables, - a_after_each_list in out nocopy tt_executables, - a_before_all_list in out nocopy tt_executables, - a_after_all_list in out nocopy tt_executables - ) return ut_suite_items is - l_procedure_name t_object_name; - l_tests tt_tests; begin l_procedure_name := a_proc_annotations.by_proc.first; while l_procedure_name is not null loop - add_test( a_suite, l_tests, l_procedure_name, a_proc_annotations ); + add_test( a_suite, a_suite_items, l_procedure_name, a_proc_annotations ); process_before_after_annot(a_before_each_list, gc_beforeeach, l_procedure_name, a_proc_annotations.by_proc(l_procedure_name), a_suite); process_before_after_annot(a_after_each_list, gc_aftereach, l_procedure_name, a_proc_annotations.by_proc(l_procedure_name), a_suite); process_before_after_annot(a_before_all_list, gc_beforeall, l_procedure_name, a_proc_annotations.by_proc(l_procedure_name), a_suite); process_before_after_annot(a_after_all_list, gc_afterall, l_procedure_name, a_proc_annotations.by_proc(l_procedure_name), a_suite); l_procedure_name := a_proc_annotations.by_proc.next( l_procedure_name ); end loop; - return convert_list(l_tests); end; procedure build_suitepath( @@ -629,15 +615,15 @@ create or replace package body ut_suite_builder is a_suite.path := lower(coalesce(a_suite.path, a_suite.object_name)); end; - procedure populate_suite_contents( + procedure add_suite_tests( a_suite in out nocopy ut_suite, - a_annotations t_annotations_info + a_annotations t_annotations_info, + a_suite_items in out nocopy ut_suite_items ) is l_before_each_list tt_executables; l_after_each_list tt_executables; l_before_all_list tt_executables; l_after_all_list tt_executables; - l_executables ut_executables; l_rollback_type ut_utils.t_rollback_type; l_annotation_text t_annotation_text; begin @@ -681,75 +667,14 @@ create or replace package body ut_suite_builder is a_suite.disabled_flag := ut_utils.boolean_to_int(a_annotations.by_name.exists(gc_disabled)); --process procedure annotations for suite - add_annotated_procedures(a_annotations, a_suite, l_before_each_list, l_after_each_list, l_before_all_list, l_after_all_list); + get_annotated_procedures(a_annotations, a_suite, a_suite_items, l_before_each_list, l_after_each_list, l_before_all_list, l_after_all_list); a_suite.set_rollback_type(l_rollback_type); - update_before_after_each(a_suite, l_before_each_list, l_after_each_list); + propagate_before_after_each( a_suite_items, l_before_each_list, l_after_each_list); a_suite.before_all_list := convert_list(l_before_all_list); a_suite.after_all_list := convert_list(l_after_all_list); end; - function get_suite_items( - a_suite in out nocopy ut_suite, - a_annotations t_annotations_info - ) return ut_suite_items is - l_before_each_list tt_executables; - l_after_each_list tt_executables; - l_before_all_list tt_executables; - l_after_all_list tt_executables; - l_rollback_type ut_utils.t_rollback_type; - l_annotation_text t_annotation_text; - l_results ut_suite_items := ut_suite_items(); - begin - if a_annotations.by_name.exists(gc_displayname) then - l_annotation_text := trim(a_annotations.by_name(gc_displayname)(a_annotations.by_name(gc_displayname).first)); - if l_annotation_text is not null then - a_suite.description := l_annotation_text; - else - add_annotation_ignored_warning( - a_suite, gc_displayname, '%%% annotation requires a non-empty parameter value.', - a_annotations.by_name(gc_displayname).first - ); - end if; - warning_on_duplicate_annot(a_suite, a_annotations.by_name, gc_displayname); - end if; - - if a_annotations.by_name.exists(gc_rollback) then - l_rollback_type := get_rollback_type(a_annotations.by_name(gc_rollback)(a_annotations.by_name(gc_rollback).first)); - if l_rollback_type is null then - add_annotation_ignored_warning( - a_suite, gc_rollback, '%%% annotation requires one of values as parameter: "auto" or "manual".', - a_annotations.by_name(gc_rollback).first - ); - end if; - warning_on_duplicate_annot(a_suite, a_annotations.by_name, gc_rollback); - end if; - if a_annotations.by_name.exists(gc_beforeall) then - l_before_all_list := add_executables( a_suite.object_owner, a_suite.object_name, a_annotations.by_name(gc_beforeall), gc_beforeall ); - end if; - if a_annotations.by_name.exists(gc_afterall) then - l_after_all_list := add_executables( a_suite.object_owner, a_suite.object_name, a_annotations.by_name(gc_afterall), gc_afterall ); - end if; - - if a_annotations.by_name.exists(gc_beforeeach) then - l_before_each_list := add_executables( a_suite.object_owner, a_suite.object_name, a_annotations.by_name(gc_beforeeach), gc_beforeeach ); - end if; - if a_annotations.by_name.exists(gc_aftereach) then - l_after_each_list := add_executables( a_suite.object_owner, a_suite.object_name, a_annotations.by_name(gc_aftereach), gc_aftereach ); - end if; - - a_suite.disabled_flag := ut_utils.boolean_to_int(a_annotations.by_name.exists(gc_disabled)); - - --process procedure annotations for suite - l_results := get_annotated_procedures(a_annotations, a_suite, l_before_each_list, l_after_each_list, l_before_all_list, l_after_all_list); - - a_suite.set_rollback_type(l_rollback_type); - update_before_after_each(l_results, l_before_each_list, l_after_each_list); - a_suite.before_all_list := convert_list(l_before_all_list); - a_suite.after_all_list := convert_list(l_after_all_list); - return l_results; - end; - function get_endcontext_position( a_context_ann_pos t_annotation_position, a_package_annotations in out nocopy tt_annotations_by_name @@ -795,10 +720,10 @@ create or replace package body ut_suite_builder is return l_result; end; - - procedure add_suite_contexts( + procedure get_suite_contexts_items( a_suite in out nocopy ut_suite, - a_annotations in out nocopy t_annotations_info + a_annotations in out nocopy t_annotations_info, + a_suite_items out nocopy ut_suite_items ) is l_context_pos t_annotation_position; l_end_context_pos t_annotation_position; @@ -806,9 +731,11 @@ create or replace package body ut_suite_builder is l_ctx_annotations t_annotations_info; l_context ut_suite_context; l_context_no binary_integer := 1; + l_context_items ut_suite_items; type tt_context_names is table of boolean index by t_object_name; l_context_names tt_context_names; begin + a_suite_items := ut_suite_items(); if not a_annotations.by_name.exists(gc_context) then return; end if; @@ -821,65 +748,7 @@ create or replace package body ut_suite_builder is exit; end if; - --create a sub-set of annotations to process as sub-suite (context) - l_ctx_annotations := get_annotations_in_context( a_annotations, l_context_pos, l_end_context_pos); - - l_context_name := coalesce( - l_ctx_annotations.by_line( l_context_pos ).text - , gc_context||'_'||l_context_no - ); - if l_context_names.exists(l_context_name) then - add_annotation_ignored_warning( a_suite, 'context', 'Context name must be unique in a suite. Context and all of it''s content ignored.', l_context_pos ); - else - l_context_names(l_context_name) := true; - l_context := ut_suite_context(a_suite.object_owner, a_suite.object_name, l_context_name, l_context_pos ); - - l_context.path := a_suite.path||'.'||l_context_name; - l_context.description := l_ctx_annotations.by_line( l_context_pos ).text; - - warning_on_duplicate_annot( l_context, l_ctx_annotations.by_name, gc_context ); - - populate_suite_contents( l_context, l_ctx_annotations ); - - a_suite.add_item(l_context); - - end if; - -- remove annotations within context after processing them - delete_annotations_range(a_annotations, l_context_pos, l_end_context_pos); - - exit when not a_annotations.by_name.exists( gc_context); - - l_context_pos := a_annotations.by_name( gc_context).next( l_context_pos); - l_context_no := l_context_no + 1; - end loop; - end; - - function get_suite_contexts_items( - a_suite in out nocopy ut_suite, - a_annotations in out nocopy t_annotations_info - ) return ut_suite_items is - l_context_pos t_annotation_position; - l_end_context_pos t_annotation_position; - l_context_name t_object_name; - l_ctx_annotations t_annotations_info; - l_context ut_suite_context; - l_context_no binary_integer := 1; - type tt_context_names is table of boolean index by t_object_name; - l_context_names tt_context_names; - l_results ut_suite_items := ut_suite_items(); - begin - if not a_annotations.by_name.exists(gc_context) then - return l_results; - end if; - - l_context_pos := a_annotations.by_name( gc_context).first; - - while l_context_pos is not null loop - l_end_context_pos := get_endcontext_position(l_context_pos, a_annotations.by_name ); - if l_end_context_pos is null then - exit; - end if; - + l_context_items := ut_suite_items(); --create a sub-set of annotations to process as sub-suite (context) l_ctx_annotations := get_annotations_in_context( a_annotations, l_context_pos, l_end_context_pos); @@ -900,9 +769,10 @@ create or replace package body ut_suite_builder is warning_on_duplicate_annot( l_context, l_ctx_annotations.by_name, gc_context ); - l_results := l_results multiset union all get_suite_items( l_context, l_ctx_annotations ); - l_results.extend; - l_results(l_results.last) := l_context; + add_suite_tests( l_context, l_ctx_annotations, l_context_items ); + add_items_to_list(a_suite_items, l_context_items); + a_suite_items.extend; + a_suite_items(a_suite_items.last) := l_context; end if; -- remove annotations within context after processing them delete_annotations_range(a_annotations, l_context_pos, l_end_context_pos); @@ -912,7 +782,6 @@ create or replace package body ut_suite_builder is l_context_pos := a_annotations.by_name( gc_context).next( l_context_pos); l_context_no := l_context_no + 1; end loop; - return l_results; end; procedure warning_on_incomplete_context( @@ -963,37 +832,7 @@ create or replace package body ut_suite_builder is end loop; end; - function create_suite( - a_annotations t_annotations_info - ) return ut_logical_suite is - l_annotations t_annotations_info := a_annotations; - l_annotation_pos t_annotation_position; - l_suite ut_suite; - begin - if l_annotations.by_name.exists( gc_suite) then - - --create an incomplete suite - l_annotation_pos := l_annotations.by_name(gc_suite).first; - l_suite := ut_suite(l_annotations.owner, l_annotations.name, l_annotation_pos); - l_suite.description := l_annotations.by_name(gc_suite)(l_annotation_pos); - warning_on_unknown_annotations(l_suite, l_annotations.by_line); - - warning_on_duplicate_annot( l_suite, l_annotations.by_name, gc_suite ); - - build_suitepath( l_suite, l_annotations ); - - add_suite_contexts( l_suite, l_annotations ); - --by this time all contexts were consumed and l_annotations should not have any context/endcontext annotation in it. - warning_on_incomplete_context( l_suite, l_annotations.by_name ); - - populate_suite_contents( l_suite, l_annotations ); - - end if; - return l_suite; - end; - - function build_parent_suites_for_path(a_suite ut_suite) return ut_suite_items is - l_results ut_suite_items := ut_suite_items(); + procedure add_parent_logical_suites( a_suite ut_suite, a_suite_items in out nocopy ut_suite_items) is l_path varchar2(200); l_name varchar2(200); begin @@ -1002,21 +841,20 @@ create or replace package body ut_suite_builder is l_path := substr( l_path, 1, instr(l_path,'.',-1)-1); exit when l_path is null; l_name := substr( l_path, instr(l_path,'.',-1)+1); - l_results.extend; - l_results(l_results.last) := - ut_logical_suite( - a_object_owner => a_suite.object_owner, - a_object_name => l_name, a_name => l_name, a_path => l_path - ); - l_results(l_results.last).parse_time := a_suite.parse_time; + a_suite_items.extend; + a_suite_items( a_suite_items.last) := + ut_logical_suite( + a_object_owner => a_suite.object_owner, + a_object_name => l_name, a_name => l_name, a_path => l_path + ); + a_suite_items( a_suite_items.last).parse_time := a_suite.parse_time; end loop; - return l_results; end; - function create_suite_items( a_annotations t_annotations_info ) return ut_suite_items is - l_annotations t_annotations_info := a_annotations; - l_annotation_pos t_annotation_position; - l_suite ut_suite; - l_results ut_suite_items; + + procedure create_suite_item_list( a_annotations t_annotations_info, a_suite_items out nocopy ut_suite_items ) is + l_annotations t_annotations_info := a_annotations; + l_annotation_pos t_annotation_position; + l_suite ut_suite; begin if l_annotations.by_name.exists(gc_suite) then l_annotation_pos := l_annotations.by_name(gc_suite).first; @@ -1028,58 +866,17 @@ create or replace package body ut_suite_builder is warning_on_duplicate_annot( l_suite, l_annotations.by_name, gc_suite ); build_suitepath( l_suite, l_annotations ); - l_results := get_suite_contexts_items( l_suite, l_annotations ) multiset union all get_suite_items( l_suite, l_annotations ); + get_suite_contexts_items( l_suite, l_annotations, a_suite_items ); + --create suite tests and add + add_suite_tests( l_suite, l_annotations, a_suite_items ); --by this time all contexts were consumed and l_annotations should not have any context/endcontext annotation in it. warning_on_incomplete_context( l_suite, l_annotations.by_name ); - l_results.extend; - l_results(l_results.last) := l_suite; - l_results := l_results multiset union all build_parent_suites_for_path(l_suite); - end if; - return l_results; - end; - function build_suites_hierarchy( a_suites_by_path tt_schema_suites ) return tt_schema_suites is - l_result tt_schema_suites; - l_suite_path varchar2(4000 char); - l_parent_path varchar2(4000 char); - l_name varchar2(4000 char); - l_suites_by_path tt_schema_suites; - begin - l_suites_by_path := a_suites_by_path; - --were iterating in reverse order of the index by path table - -- so the first paths will be the leafs of hierarchy and next will their parents - l_suite_path := l_suites_by_path.last; - ut_utils.debug_log('Input suites to process = '||l_suites_by_path.count); - - while l_suite_path is not null loop - l_parent_path := substr( l_suite_path, 1, instr(l_suite_path,'.',-1)-1); - ut_utils.debug_log('Processing l_suite_path = "'||l_suite_path||'", l_parent_path = "'||l_parent_path||'"'); - --no parent => I'm a root element - if l_parent_path is null then - ut_utils.debug_log(' suite "'||l_suite_path||'" is a root element - adding to return list.'); - l_result(l_suite_path) := l_suites_by_path(l_suite_path); - -- not a root suite - need to add it to a parent suite - else - --parent does not exist and needs to be added - if not l_suites_by_path.exists(l_parent_path) then - l_name := substr( l_parent_path, instr(l_parent_path,'.',-1)+1); - ut_utils.debug_log(' Parent suite "'||l_parent_path||'" not found in the list - Adding suite "'||l_name||'"'); - l_suites_by_path(l_parent_path) := - ut_logical_suite( - a_object_owner => l_suites_by_path(l_suite_path).object_owner, - a_object_name => l_name, a_name => l_name, a_path => l_parent_path - ); - else - ut_utils.debug_log(' Parent suite "'||l_parent_path||'" found in list of suites'); - end if; - ut_utils.debug_log(' adding suite "'||l_suite_path||'" to "'||l_parent_path||'" items'); - l_suites_by_path(l_parent_path).add_item( l_suites_by_path(l_suite_path) ); - end if; - l_suite_path := l_suites_by_path.prior(l_suite_path); - end loop; - ut_utils.debug_log(l_result.count||' root suites created.'); - return l_result; + a_suite_items.extend; + a_suite_items( a_suite_items.last) := l_suite; + add_parent_logical_suites( l_suite, a_suite_items ); + end if; end; function convert_package_annotations(a_object ut_annotated_object) return t_annotations_info is @@ -1108,177 +905,195 @@ create or replace package body ut_suite_builder is return l_result; end; - - function build_suites(a_annotated_objects sys_refcursor) return t_schema_suites_info is - l_suite ut_logical_suite; - l_annotated_objects ut_annotated_objects; - l_all_suites tt_schema_suites; - l_result t_schema_suites_info; - begin - loop - fetch a_annotated_objects bulk collect into l_annotated_objects limit 10; - - for i in 1 .. l_annotated_objects.count loop - l_suite := create_suite(convert_package_annotations(l_annotated_objects(i))); - ut_suite_cache_manager.save_cache( create_suite_items(convert_package_annotations(l_annotated_objects(i))) ); - if l_suite is not null then - l_all_suites(l_suite.path) := l_suite; - l_result.suite_paths(l_suite.object_name) := l_suite.path; - end if; - end loop; - exit when a_annotated_objects%notfound; - end loop; - close a_annotated_objects; - --build hierarchical structure of the suite - -- Restructure single-dimension list into hierarchy of suites by the value of %suitepath attribute value - l_result.schema_suites := build_suites_hierarchy(l_all_suites); - - return l_result; - end; - - procedure refresh_suite_cache(a_annotated_objects sys_refcursor) is - l_suite ut_logical_suite; - l_annotated_objects ut_annotated_objects; - l_all_suites tt_schema_suites; - l_result t_schema_suites_info; - begin - loop - fetch a_annotated_objects bulk collect into l_annotated_objects limit 10; - - for i in 1 .. l_annotated_objects.count loop - ut_suite_cache_manager.save_cache( create_suite_items(convert_package_annotations(l_annotated_objects(i))) ); - end loop; - exit when a_annotated_objects%notfound; - end loop; - close a_annotated_objects; - end; - procedure reconstruct_from_cache( a_suites in out nocopy ut_suite_items, a_suite_data_cursor sys_refcursor ) is type t_item_levels is table of ut_suite_items index by binary_integer; l_items_at_level t_item_levels; - l_tests ut_suite_items; - l_logical_suites ut_logical_suites; - l_levels ut_integer_list; - l_cursor_idx integer; - l_prev_level integer; + l_rows ut_suite_cache_manager.tt_cached_suites; +-- l_items ut_suite_items := ut_suite_items(); + l_tests ut_suite_items := ut_suite_items(); + l_logical_suites ut_logical_suites := ut_logical_suites(); + l_level pls_integer; + l_prev_level pls_integer; + l_idx integer; begin a_suites := ut_suite_items(); loop - if l_cursor_idx is null then - fetch a_suite_data_cursor bulk collect into l_tests, l_logical_suites, l_levels limit 1000; - l_cursor_idx := l_levels.first; + if l_idx is null then + fetch a_suite_data_cursor bulk collect into l_rows limit 1000; +-- l_items.delete; +-- l_items.extend(l_rows.count); + l_tests.delete; + l_tests.extend(l_rows.count); + l_logical_suites.delete; + l_logical_suites.extend(l_rows.count); + for i in 1 .. l_rows.count loop + case l_rows(i).self_type + when 'UT_TEST' then +-- l_items(i) := + l_tests(i) := + ut_test( + self_type => l_rows(i).self_type, + object_owner => l_rows(i).object_owner, object_name => l_rows(i).object_name, + name => l_rows(i).name, description => l_rows(i).description, path => l_rows(i).path, + rollback_type => l_rows(i).rollback_type, disabled_flag => l_rows(i).disabled_flag, + line_no => l_rows(i).line_no, parse_time => l_rows(i).parse_time, + start_time => null, end_time => null, result => null, warnings => l_rows(i).warnings, + results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), + before_each_list => l_rows(i).before_each_list, before_test_list => l_rows(i).before_test_list, + item => l_rows(i).item, + after_test_list => l_rows(i).after_test_list, after_each_list => l_rows(i).after_each_list, + all_expectations => ut_expectation_results(), failed_expectations => ut_expectation_results(), + parent_error_stack_trace => null, expected_error_codes => l_rows(i).expected_error_codes + ); + when 'UT_SUITE' then +-- l_items(i) := + l_logical_suites(i) := + ut_suite( + self_type => l_rows(i).self_type, + object_owner => l_rows(i).object_owner, object_name => l_rows(i).object_name, + name => l_rows(i).name, description => l_rows(i).description, path => l_rows(i).path, + rollback_type => l_rows(i).rollback_type, disabled_flag => l_rows(i).disabled_flag, + line_no => l_rows(i).line_no, parse_time => l_rows(i).parse_time, + start_time => null, end_time => null, result => null, warnings => l_rows(i).warnings, + results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), + items => ut_suite_items(), + before_all_list => l_rows(i).before_all_list, after_all_list => l_rows(i).after_all_list + ); + when 'UT_SUITE_CONTEXT' then +-- l_items(i) := + l_logical_suites(i) := + ut_suite_context( + self_type => l_rows(i).self_type, + object_owner => l_rows(i).object_owner, object_name => l_rows(i).object_name, name => l_rows(i).name, + description => l_rows(i).description, path => l_rows(i).path, rollback_type => l_rows(i).rollback_type, + disabled_flag => l_rows(i).disabled_flag, line_no => l_rows(i).line_no, parse_time => l_rows(i).parse_time, + start_time => null, end_time => null, result => null, warnings => l_rows(i).warnings, + results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), + items => ut_suite_items(), + before_all_list => l_rows(i).before_all_list, after_all_list => l_rows(i).after_all_list + ); + when 'UT_LOGICAL_SUITE' then +-- l_items(i) := + l_logical_suites(i) := + ut_logical_suite( + self_type => l_rows(i).self_type, + object_owner => l_rows(i).object_owner, object_name => l_rows(i).object_name, name => l_rows(i).name, + description => l_rows(i).description, path => l_rows(i).path, rollback_type => l_rows(i).rollback_type, + disabled_flag => l_rows(i).disabled_flag, line_no => l_rows(i).line_no, parse_time => l_rows(i).parse_time, + start_time => null, end_time => null, result => null, warnings => l_rows(i).warnings, + results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), + items => ut_suite_items() + ); + end case; + end loop; + l_idx := l_rows.first; end if; - exit when l_cursor_idx is null; - if l_levels(l_cursor_idx) > 1 then - if l_prev_level > l_levels(l_cursor_idx) then - l_logical_suites(l_cursor_idx).items := l_items_at_level(l_prev_level); + exit when l_idx is null; + l_level := length(l_rows(l_idx).path) - length( replace(l_rows(l_idx).path, '.') ) + 1; + if l_level > 1 then + if l_prev_level > l_level then + l_logical_suites(l_idx).items := l_items_at_level(l_prev_level); l_items_at_level(l_prev_level).delete; end if; - if not l_items_at_level.exists((l_levels(l_cursor_idx))) then - l_items_at_level(l_levels(l_cursor_idx)) := ut_suite_items(); + if not l_items_at_level.exists((l_level)) then + l_items_at_level(l_level) := ut_suite_items(); end if; - l_items_at_level(l_levels(l_cursor_idx)).extend; - if l_tests(l_cursor_idx) is not null then - l_items_at_level(l_levels(l_cursor_idx))(l_items_at_level(l_levels(l_cursor_idx)).last) - := l_tests(l_cursor_idx); + l_items_at_level(l_level).extend; + if l_tests(l_idx) is not null then + l_items_at_level(l_level)(l_items_at_level(l_level).last) := l_tests(l_idx); else - l_items_at_level(l_levels(l_cursor_idx))(l_items_at_level(l_levels(l_cursor_idx)).last) - := l_logical_suites(l_cursor_idx); + l_items_at_level(l_level)(l_items_at_level(l_level).last) := l_logical_suites(l_idx); end if; else - if l_prev_level > l_levels(l_cursor_idx) then - l_logical_suites(l_cursor_idx).items := l_items_at_level(l_prev_level); + if l_prev_level > l_level then + l_logical_suites(l_idx).items := l_items_at_level(l_prev_level); l_items_at_level(l_prev_level).delete; end if; a_suites.extend; - if l_tests(l_cursor_idx) is not null then - a_suites(a_suites.last) := l_tests(l_cursor_idx); + if l_tests(l_idx) is not null then + a_suites(a_suites.last) := l_tests(l_idx); else - a_suites(a_suites.last) := l_logical_suites(l_cursor_idx); + a_suites(a_suites.last) := l_logical_suites(l_idx); end if; end if; - l_prev_level := l_levels(l_cursor_idx); - l_cursor_idx := l_levels.next(l_cursor_idx); +-- if l_level = 0 then +-- a_suites.extend; +-- a_suites(a_suites.last) := l_items(l_idx); +-- else +-- a_suites(a_suites.last).add_item( l_items(l_idx), l_level ); +-- end if; + l_prev_level := l_level; + l_idx := l_rows.next(l_idx); end loop; close a_suite_data_cursor; end; - function build_schema_suites_old(a_owner_name varchar2) return t_schema_suites_info is + function build_suites_from_annotations( + a_owner_name varchar2, + a_annotated_objects sys_refcursor, + a_path varchar2 := null, + a_object_name varchar2 := null, + a_procedure_name varchar2 := null + ) return ut_suite_items is + l_suites ut_suite_items; l_annotations_cursor sys_refcursor; + l_annotated_objects ut_annotated_objects; + l_suite_items ut_suite_items; begin - -- form the single-dimension list of suites constructed from parsed packages - open l_annotations_cursor for - q'[select value(x) - from table( - ]'||ut_utils.ut_owner||q'[.ut_annotation_manager.get_annotated_objects(:a_owner_name, 'PACKAGE') - )x ]' - using a_owner_name; - - return build_suites(l_annotations_cursor); - end; + loop + fetch a_annotated_objects bulk collect into l_annotated_objects limit 10; - function get_build_suites(a_owner_name varchar2) return ut_suite_items is - l_suites t_schema_suites_info; - l_results ut_suite_items := ut_suite_items(); - l_index varchar2(4000); - begin - l_suites := build_schema_suites_old(a_owner_name); - l_index := l_suites.schema_suites.first; - while l_index is not null loop - l_results.extend; - l_results(l_results.last) := l_suites.schema_suites(l_index); - l_index := l_suites.schema_suites.next(l_index); + for i in 1 .. l_annotated_objects.count loop + create_suite_item_list( + convert_package_annotations( l_annotated_objects( i ) ), + l_suite_items + ); + ut_suite_cache_manager.save_cache( a_owner_name, l_suite_items ); + end loop; + exit when a_annotated_objects%notfound; end loop; - return l_results; - end; - - - procedure refresh_suite_cache(a_owner_name varchar2) is - l_annotations_cursor sys_refcursor; - begin - open l_annotations_cursor for - q'[select value(x) - from table( - ]'||ut_utils.ut_owner||q'[.ut_annotation_manager.get_annotated_objects(:a_owner_name, 'PACKAGE') - )x ]' - using a_owner_name; - refresh_suite_cache(l_annotations_cursor); - end; + close a_annotated_objects; - function build_schema_suites(a_owner_name varchar2) return ut_suite_items is - l_suites ut_suite_items; - begin - refresh_suite_cache(a_owner_name); - reconstruct_from_cache(l_suites, ut_suite_cache_manager.cached_suite_by_schema(a_owner_name)); + reconstruct_from_cache( + l_suites, + ut_suite_cache_manager.get_cached_suite_data( + a_owner_name, + a_path, + a_object_name, + a_procedure_name ) + ); for i in 1 .. l_suites.count loop - l_suites(i).set_rollback_type(l_suites(i).get_rollback_type); + l_suites( i ).set_rollback_type( l_suites( i ).get_rollback_type ); end loop; return l_suites; end; - function build_schema_suites(a_owner_name varchar2,a_object_name varchar2,a_procedure_name varchar2) return ut_suite_items is - l_suites ut_suite_items; + function build_schema_suites( + a_owner_name varchar2, + a_path varchar2 := null, + a_object_name varchar2 := null, + a_procedure_name varchar2 := null + ) return ut_suite_items is + l_annotations_cursor sys_refcursor; begin - refresh_suite_cache(a_owner_name); - reconstruct_from_cache(l_suites, ut_suite_cache_manager.cached_suite_by_package(a_owner_name, a_object_name, a_procedure_name)); - for i in 1 .. l_suites.count loop - l_suites(i).set_rollback_type(l_suites(i).get_rollback_type); - end loop; - return l_suites; - end; - function build_schema_suites(a_owner_name varchar2,a_path varchar2) return ut_suite_items is - l_suites ut_suite_items; - begin - refresh_suite_cache(a_owner_name); - reconstruct_from_cache(l_suites, ut_suite_cache_manager.cached_suite_by_path(a_owner_name, a_path)); - for i in 1 .. l_suites.count loop - l_suites(i).set_rollback_type(l_suites(i).get_rollback_type); - end loop; - return l_suites; + open l_annotations_cursor for + q'[select value(x) + from table( + ]' || ut_utils.ut_owner || q'[.ut_annotation_manager.get_annotated_objects(:a_owner_name, 'PACKAGE', :a_suite_cache_parse_time) + )x ]' + using a_owner_name, ut_suite_cache_manager.get_schema_parse_time(a_owner_name); + + return build_suites_from_annotations( + a_owner_name, + l_annotations_cursor, + a_path, + a_object_name, + a_procedure_name + ); end; end ut_suite_builder; diff --git a/source/core/ut_suite_builder.pks b/source/core/ut_suite_builder.pks index 0f4d97c76..b3d07b0a8 100644 --- a/source/core/ut_suite_builder.pks +++ b/source/core/ut_suite_builder.pks @@ -20,58 +20,30 @@ create or replace package ut_suite_builder authid current_user is * Responsible for converting annotations into unit test suites */ - --table of ut_suites indexed by suite path - tt_schema_suites('suite.path') gives ut_logical_suite - type tt_schema_suites is table of ut_logical_suite index by varchar2(4000 char); - - --table of suite paths indexed by object name - t_object_suite_path('object_name') = 'suitepath.to.object' - type t_object_suite_path is table of varchar2(4000) index by varchar2(4000 char); - - type t_schema_suites_info is record ( - schema_suites tt_schema_suites, - suite_paths t_object_suite_path - ); - /** * Builds set of hierarchical suites for a given schema * * @param a_owner_name name of the schema to builds suite for + * @param a_path suite path to build suite for (optional) + * @param a_object_name object name to build suite for (optional) + * @param a_object_name procedure name to build suite for (optional) * @return list of suites organized into hierarchy * */ - function build_schema_suites(a_owner_name varchar2) return ut_suite_items; - - /** - * Builds set of hierarchical suites for a given schema - * - * @param a_owner_name name of the schema to builds suite for - * @param a_object_name object name to build suite for - * @param a_object_name procedure name to build suite for (can be null) - * @return list of suites organized into hierarchy - * - */ - function build_schema_suites(a_owner_name varchar2, a_object_name varchar2,a_procedure_name varchar2) return ut_suite_items; - - /** - * Builds set of hierarchical suites for a given schema - * - * @param a_owner_name name of the schema to builds suite for - * @param a_path suite path to build suite for - * @return list of suites organized into hierarchy - * - */ - function build_schema_suites(a_owner_name varchar2,a_path varchar2) return ut_suite_items; - - /** - * Builds set of hierarchical suites for given annotations - * - * @param a_annotated_objects cursor returning ut_annotated_object type - * @return list of suites organized into hierarchy - * - */ - function build_suites(a_annotated_objects sys_refcursor) return t_schema_suites_info; + function build_schema_suites( + a_owner_name varchar2, + a_path varchar2 := null, + a_object_name varchar2 := null, + a_procedure_name varchar2 := null + ) return ut_suite_items; + + function build_suites_from_annotations( + a_owner_name varchar2, + a_annotated_objects sys_refcursor, + a_path varchar2 := null, + a_object_name varchar2 := null, + a_procedure_name varchar2 := null + ) return ut_suite_items; - function get_build_suites(a_owner_name varchar2) return ut_suite_items; - function build_schema_suites_old(a_owner_name varchar2) return t_schema_suites_info; - end ut_suite_builder; / diff --git a/source/core/ut_suite_cache.sql b/source/core/ut_suite_cache.sql index 183f4cf35..09211722b 100644 --- a/source/core/ut_suite_cache.sql +++ b/source/core/ut_suite_cache.sql @@ -75,9 +75,7 @@ alter table ut_suite_cache modify (object_owner not null, path not null, self_ty / alter table ut_suite_cache add constraint ut_suite_cache_pk primary key (object_owner, path) / -create unique index ut_suite_cache_uk on ut_suite_cache(object_owner, object_name, line_no) -/ -create index ut_suite_cache_nu1 on ut_suite_cache(object_owner, object_name) +create index ut_suite_cache_nu1 on ut_suite_cache(object_owner, object_name, parse_time desc) / alter table ut_suite_cache add constraint ut_suite_cache_schema_fk foreign key (object_owner) references ut_suite_cache_schema(object_owner) / diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index a51ee14a7..33712c589 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -16,227 +16,130 @@ create or replace package body ut_suite_cache_manager is limitations under the License. */ - function get_suite_by(a_schema_name varchar2, a_path varchar2 := null, a_object_name varchar2 := null, a_procedure_name varchar2 := null) return sys_refcursor is + function get_cached_suite_data( + a_schema_name varchar2, + a_path varchar2 := null, + a_object_name varchar2 := null, + a_procedure_name varchar2 := null + ) return t_cached_suites_cursor is + l_path varchar2( 4000 ); l_result sys_refcursor; begin + if a_path is null and a_object_name is not null then + select min(path) into l_path + from ut_suite_cache + where object_owner = upper(a_schema_name) and object_name = lower(a_object_name) and + name = nvl(lower(a_procedure_name), name); + else + l_path := lower( a_path ); + end if; + + open l_result for - select - case self_type - when 'UT_TEST' - then ut_test( - self_type => self_type, - object_owner => object_owner, object_name => object_name, name => name, - description => description, path => path, rollback_type => rollback_type, - disabled_flag => disabled_flag, line_no => line_no, parse_time => parse_time, - start_time => null, end_time => null, result => null, warnings => warnings, - results_count => ut_results_counter(), transaction_invalidators => null, - before_each_list => before_each_list, before_test_list => before_test_list, - item => item, after_test_list => after_test_list, after_each_list => after_each_list, - all_expectations => null, failed_expectations => null, - parent_error_stack_trace => null, expected_error_codes => expected_error_codes - ) - end as test_item, - case self_type - when 'UT_SUITE' - then ut_suite( - self_type => self_type, - object_owner => object_owner, object_name => object_name, name => name, - description => description, path => path, rollback_type => rollback_type, - disabled_flag => disabled_flag, line_no => line_no, parse_time => parse_time, - start_time => null, end_time => null, result => null, warnings => warnings, - results_count => ut_results_counter(), transaction_invalidators => null, - items => ut_suite_items(), - before_all_list => before_all_list, after_all_list => after_all_list - ) - when 'UT_SUITE_CONTEXT' - then ut_suite_context( - self_type => self_type, - object_owner => object_owner, object_name => object_name, name => name, - description => description, path => path, rollback_type => rollback_type, - disabled_flag => disabled_flag, line_no => line_no, parse_time => parse_time, - start_time => null, end_time => null, result => null, warnings => warnings, - results_count => ut_results_counter(), transaction_invalidators => null, - items => ut_suite_items(), - before_all_list => before_all_list, after_all_list => after_all_list - ) - when 'UT_LOGICAL_SUITE' - then ut_logical_suite( - self_type => self_type, - object_owner => object_owner, object_name => object_name, name => name, - description => description, path => path, rollback_type => rollback_type, - disabled_flag => disabled_flag, line_no => line_no, parse_time => parse_time, - start_time => null, end_time => null, result => null, warnings => warnings, - results_count => ut_results_counter(), transaction_invalidators => null, - items => ut_suite_items() - ) - end as logical_suite, - length(path) - length( replace(path, '.') )+1 as path_level - from ut_suite_cache x - where ( a_path like path ||'.'||'%' - or ( path like a_path || '%' - and object_name = nvl(lower(a_object_name), object_name) - and name = nvl(lower(a_procedure_name), name) - ) - ) - and object_owner = upper(a_schema_name) - order by path desc, object_name, line_no; - + select c.* + from ut_suite_cache c + -- join all_objects a + -- on a.owner = x.object_owner + -- and a.object_name = x.object_name + -- and a.object_type = 'PACKAGE' + where ( l_path like c.path || '.' || '%' + or ( c.path like l_path || '%' + and c.object_name = nvl(lower(a_object_name), c.object_name) + and c.name = nvl(lower(a_procedure_name), c.name) + ) + ) and c.object_owner = upper(a_schema_name) + order by c.object_owner, + replace(case + when c.self_type in ( 'UT_TEST' ) + then substr(c.path, 1, instr(c.path, '.', -1) - 1) + else c.path + end, '.', chr(0)) desc nulls last, + c.object_name desc, + c.line_no desc; + return l_result; end; - --- function get_suite_by(a_schema_name varchar2, a_path varchar2 := null, a_object_name varchar2 := null, a_procedure_name varchar2 := null) return sys_refcursor is --- l_filter varchar2(1000); --- l_result sys_refcursor; --- l_owner varchar2(250) := ut_utils.ut_owner(); --- begin --- if a_object_name is not null then --- l_filter := ' object_name = lower(:a_object_name)'; --- if a_procedure_name is not null then --- l_filter := l_filter || ' and name = lower(:a_procedure_name)'; --- else --- l_filter := l_filter || ' and :a_procedure_name is null'; --- end if; --- else --- l_filter := ' :a_object_name is null and :a_procedure_name is null'; --- end if; --- open l_result for q'[ --- select --- case self_type --- when 'UT_TEST' --- then ]'||l_owner||q'[.ut_test( --- self_type => self_type, --- object_owner => object_owner, object_name => object_name, name => name, --- description => description, path => path, rollback_type => rollback_type, --- disabled_flag => disabled_flag, line_no => line_no, parse_time => parse_time, --- start_time => null, end_time => null, result => null, warnings => warnings, --- results_count => ut_results_counter(), transaction_invalidators => null, --- before_each_list => before_each_list, before_test_list => before_test_list, --- item => item, after_test_list => after_test_list, after_each_list => after_each_list, --- all_expectations => null, failed_expectations => null, --- parent_error_stack_trace => null, expected_error_codes => expected_error_codes --- ) --- end as test_item, --- case self_type --- when 'UT_SUITE' --- then ]'||l_owner||q'[.ut_suite( --- self_type => self_type, --- object_owner => object_owner, object_name => object_name, name => name, --- description => description, path => path, rollback_type => rollback_type, --- disabled_flag => disabled_flag, line_no => line_no, parse_time => parse_time, --- start_time => null, end_time => null, result => null, warnings => warnings, --- results_count => ]'||l_owner||q'[.ut_results_counter(), transaction_invalidators => null, --- items => ut_suite_items(), --- before_all_list => before_all_list, after_all_list => after_all_list --- ) --- when 'UT_SUITE_CONTEXT' --- then ]'||l_owner||q'[.ut_suite_context( --- self_type => self_type, --- object_owner => object_owner, object_name => object_name, name => name, --- description => description, path => path, rollback_type => rollback_type, --- disabled_flag => disabled_flag, line_no => line_no, parse_time => parse_time, --- start_time => null, end_time => null, result => null, warnings => warnings, --- results_count => ]'||l_owner||q'[.ut_results_counter(), transaction_invalidators => null, --- items => ut_suite_items(), --- before_all_list => before_all_list, after_all_list => after_all_list --- ) --- when 'UT_LOGICAL_SUITE' --- then ]'||l_owner||q'[.ut_logical_suite( --- self_type => self_type, --- object_owner => object_owner, object_name => object_name, name => name, --- description => description, path => path, rollback_type => rollback_type, --- disabled_flag => disabled_flag, line_no => line_no, parse_time => parse_time, --- start_time => null, end_time => null, result => null, warnings => warnings, --- results_count => ]'||l_owner||q'[.ut_results_counter(), transaction_invalidators => null, --- items => ut_suite_items() --- ) --- end as logical_suite, --- length(path) - length( replace(path, '.') )+1 as path_level --- from ]'||l_owner||q'[.ut_suite_cache x --- where ( :a_path like path ||'.'||'%' --- or path like :a_path ||'%' and ]'||l_filter||q'[ ) --- and object_owner = upper(:a_schema_name) --- order by path desc, object_name, line_no]' --- using a_path, a_path, a_object_name, a_procedure_name, a_schema_name; --- --- return l_result; --- end; --- - function cached_suite_by_path(a_schema_name varchar2, a_path varchar2) return sys_refcursor is - begin - return get_suite_by(a_schema_name, a_path); - end; - function cached_suite_by_package(a_schema_name varchar2, a_object_name varchar2, a_procedure_name varchar2) return sys_refcursor is - l_path varchar2(4000); - begin - select min(path) into l_path - from ut_suite_cache - where object_owner = upper(a_schema_name) - and object_name = lower(a_object_name) - and name = nvl(lower(a_procedure_name),name); - return get_suite_by(a_schema_name, l_path, a_object_name, a_procedure_name ); + function get_schema_ut_packages( a_schema_names ut_varchar2_rows ) return ut_object_names is + l_results ut_object_names := ut_object_names( ); + l_schema_names ut_varchar2_rows; + l_object_names ut_varchar2_rows; + begin + select distinct c.object_owner, c.object_name + bulk collect into l_schema_names, l_object_names + from ut_suite_cache c + -- join all_objects a + -- on a.owner = c.object_owner + -- and a.object_name = c.object_name + -- and a.object_type = 'PACKAGE' + join table ( a_schema_names ) s on c.object_owner = upper(s.column_value); + l_results.extend( l_schema_names.count ); + for i in 1 .. l_schema_names.count loop + l_results( i ) := ut_object_name( l_schema_names( i ), l_object_names( i ) ); + end loop; + return l_results; end; - function cached_suite_by_schema(a_schema_name varchar2) return sys_refcursor is + function get_schema_parse_time(a_schema_name varchar2) return timestamp result_cache is + l_cache_parse_time timestamp; begin - return get_suite_by(a_schema_name); + select min(t.parse_time) + into l_cache_parse_time + from ut_suite_cache_schema t + where object_owner = a_schema_name; + return l_cache_parse_time; end; - procedure save_cache(a_suite_items ut_suite_items) is + procedure save_cache(a_object_owner varchar2, a_suite_items ut_suite_items) is pragma autonomous_transaction; - l_annotation_parse_time date; - l_suite_parse_time date; + l_parse_time timestamp; + l_cached_parse_time timestamp; begin if a_suite_items.count = 0 then return; end if; + if a_suite_items(1).self_type != 'UT_LOGICAL_SUITE' then select min(parse_time) - into l_suite_parse_time from ut_suite_cache t + into l_cached_parse_time + from ut_suite_cache t where t.object_name = a_suite_items(1).object_name - and t.object_owner = a_suite_items(1).object_owner - and rownum = 1; + and t.object_owner = a_suite_items(1).object_owner + and rownum = 1; end if; - l_annotation_parse_time := a_suite_items(1).parse_time; + select max(parse_time) into l_parse_time from table(a_suite_items) s; - if l_annotation_parse_time > l_suite_parse_time or l_suite_parse_time is null then + if l_parse_time > l_cached_parse_time or l_cached_parse_time is null then - merge into ut_suite_cache_schema t - using(select object_owner, max(parse_time) parse_time from table(a_suite_items) group by object_owner) s - on (s.object_owner = t.object_owner) - when matched then update - set t.parse_time = s.parse_time - where s.parse_time > t.parse_time - when not matched then - insert (object_owner, parse_time) - values (s.object_owner, s.parse_time); + update ut_suite_cache_schema t + set t.parse_time = l_parse_time + where object_owner = a_object_owner; + + if sql%rowcount = 0 then + insert into ut_suite_cache_schema + (object_owner, parse_time) + values (a_object_owner, l_parse_time); + end if; delete from ut_suite_cache t where (t.object_name, t.object_owner) in (select s.object_name, s.object_owner from table(a_suite_items) s where s.self_type != 'UT_LOGICAL_SUITE'); - merge into ut_suite_cache t - using ( - select self_type, path, object_owner, object_name, name, - line_no, parse_time, description, - rollback_type, disabled_flag, warnings - from table(a_suite_items) x where x.self_type = 'UT_LOGICAL_SUITE' - ) s - on (t.object_name = s.object_name and t.object_owner = s.object_owner) - when not matched then - insert ( + + insert into ut_suite_cache t + ( self_type, path, object_owner, object_name, name, line_no, parse_time, description, rollback_type, disabled_flag, warnings ) - values ( - s.self_type, s.path, s.object_owner, s.object_name, s.name, - s.line_no, s.parse_time, s.description, - s.rollback_type, s.disabled_flag, s.warnings - ); - + select self_type, path, object_owner, object_name, name, + line_no, parse_time, description, + rollback_type, disabled_flag, warnings + from table(a_suite_items) s + where s.self_type = 'UT_LOGICAL_SUITE' + and (s.object_owner, s.path) not in (select c.object_owner, c.path from ut_suite_cache c); insert into ut_suite_cache t ( @@ -248,16 +151,9 @@ create or replace package body ut_suite_cache_manager is before_test_list, after_test_list, expected_error_codes, item ) - with - suite_items as ( select value(x) item from table(a_suite_items) x ), - suites as ( - select treat(item as ut_suite) i from suite_items s - where s.item.self_type in ('UT_SUITE','UT_SUITE_CONTEXT') - ), - tests as ( - select treat(item as ut_test) t from suite_items s - where s.item.self_type in ('UT_TEST') - ) + with suites as ( select treat(value(x) as ut_suite) i + from table(a_suite_items) x + where x.self_type in( 'UT_SUITE', 'UT_SUITE_CONTEXT' ) ) select s.i.self_type as self_type, s.i.path as path, s.i.object_owner as object_owner, s.i.object_name as object_name, s.i.name as name, s.i.line_no as line_no, s.i.parse_time as parse_time, s.i.description as description, @@ -266,19 +162,34 @@ create or replace package body ut_suite_cache_manager is null before_each_list, null after_each_list, null before_test_list, null after_test_list, null expected_error_codes, null item - from suites s - union all - select s.t.self_type as self_type, s.t.path as path, - s.t.object_owner as object_owner, s.t.object_name as object_name, s.t.name as name, - s.t.line_no as line_no, s.t.parse_time as parse_time, s.t.description as description, - s.t.rollback_type as rollback_type, s.t.disabled_flag as disabled_flag, s.t.warnings as warnings, - null before_all_list, null after_all_list, - s.t.before_each_list as before_each_list, s.t.after_each_list as after_each_list, - s.t.before_test_list as before_test_list, s.t.after_test_list as after_test_list, - s.t.expected_error_codes as expected_error_codes, s.t.item as item + from suites s; + + insert into ut_suite_cache t + ( + self_type, path, object_owner, object_name, name, + line_no, parse_time, description, + rollback_type, disabled_flag, warnings, + before_all_list, after_all_list, + before_each_list, after_each_list, + before_test_list, after_test_list, + expected_error_codes, item + ) + with tests as ( select treat(value(x) as ut_test) t + from table ( a_suite_items ) x + where x.self_type in ( 'UT_TEST' ) ) + select s.t.self_type as self_type, s.t.path as path, + s.t.object_owner as object_owner, s.t.object_name as object_name, s.t.name as name, + s.t.line_no as line_no, s.t.parse_time as parse_time, s.t.description as description, + s.t.rollback_type as rollback_type, s.t.disabled_flag as disabled_flag, s.t.warnings as warnings, + null before_all_list, null after_all_list, + s.t.before_each_list as before_each_list, s.t.after_each_list as after_each_list, + s.t.before_test_list as before_test_list, s.t.after_test_list as after_test_list, + s.t.expected_error_codes as expected_error_codes, s.t.item as item from tests s; + + commit; end if; - commit; end; + end ut_suite_cache_manager; / diff --git a/source/core/ut_suite_cache_manager.pks b/source/core/ut_suite_cache_manager.pks index 1b2d1f2f6..f5da97ec7 100644 --- a/source/core/ut_suite_cache_manager.pks +++ b/source/core/ut_suite_cache_manager.pks @@ -19,14 +19,22 @@ create or replace package ut_suite_cache_manager authid definer is /** * Responsible for storing and retrieving suite data from cache */ + subtype t_cached_suite is ut_suite_cache%rowtype; + type tt_cached_suites is table of t_cached_suite; + type t_cached_suites_cursor is ref cursor return t_cached_suite; - procedure save_cache(a_suite_items ut_suite_items); + procedure save_cache(a_object_owner varchar2, a_suite_items ut_suite_items); - function cached_suite_by_path(a_schema_name varchar2, a_path varchar2) return sys_refcursor; + function get_cached_suite_data( + a_schema_name varchar2, + a_path varchar2 := null, + a_object_name varchar2 := null, + a_procedure_name varchar2 := null + ) return t_cached_suites_cursor; - function cached_suite_by_package(a_schema_name varchar2, a_object_name varchar2, a_procedure_name varchar2) return sys_refcursor; + function get_schema_ut_packages(a_schema_names ut_varchar2_rows) return ut_object_names; - function cached_suite_by_schema(a_schema_name varchar2) return sys_refcursor; + function get_schema_parse_time(a_schema_name varchar2) return timestamp result_cache; end ut_suite_cache_manager; / diff --git a/source/core/ut_suite_cache_schema.sql b/source/core/ut_suite_cache_schema.sql index 890c72e0b..ba257dafd 100644 --- a/source/core/ut_suite_cache_schema.sql +++ b/source/core/ut_suite_cache_schema.sql @@ -13,7 +13,7 @@ create table ut_suite_cache_schema ( limitations under the License. */ object_owner varchar2(250) not null, - parse_time date not null, + parse_time timestamp not null, constraint ut_suite_cache_schema_pk primary key(object_owner) ) organization index / diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index dd9ffb5de..04bc26f10 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -16,24 +16,6 @@ create or replace package body ut_suite_manager is limitations under the License. */ - subtype tt_schema_suites is ut_suite_builder.tt_schema_suites; - subtype t_object_suite_path is ut_suite_builder.t_object_suite_path; - subtype t_schema_suites_info is ut_suite_builder.t_schema_suites_info; - - type t_schema_info is record (changed_at date, obj_cnt integer); - - type t_schema_cache is record( - schema_suites tt_schema_suites - ,changed_at date - ,obj_cnt integer - ,suite_paths t_object_suite_path - ); - type tt_schema_suites_list is table of t_schema_cache index by varchar2(128 char); - - g_schema_suites tt_schema_suites_list; - - --- type t_schema_paths is table of ut_varchar2_list index by varchar2(4000 char); type t_path_item is record ( object_name varchar2(250), @@ -45,96 +27,9 @@ create or replace package body ut_suite_manager is ------------------ - function get_schema_info(a_owner_name varchar2) return t_schema_info is - l_info t_schema_info; - l_view_name varchar2(200) := ut_metadata.get_dba_view('dba_objects'); - begin - execute immediate q'[ - select nvl(max(t.last_ddl_time), date '4999-12-31'), count(*) - from ]'||l_view_name||q'[ t - where t.owner = :a_owner_name - and t.object_type in ('PACKAGE')]' - into l_info using a_owner_name; - return l_info; - end; - - procedure update_cache(a_owner_name varchar2, a_suites_info t_schema_suites_info, a_total_obj_cnt integer) is - begin - if a_suites_info.schema_suites.count > 0 then - g_schema_suites(a_owner_name).schema_suites := a_suites_info.schema_suites; - g_schema_suites(a_owner_name).changed_at := sysdate; - g_schema_suites(a_owner_name).obj_cnt := a_total_obj_cnt; - g_schema_suites(a_owner_name).suite_paths := a_suites_info.suite_paths; - elsif g_schema_suites.exists(a_owner_name) then - g_schema_suites.delete(a_owner_name); - end if; - end; - - function cache_valid(a_schema_name varchar2) return boolean is - l_info t_schema_info; - l_result boolean := true; - begin - if not g_schema_suites.exists(a_schema_name) then - l_result := false; - else - l_info := get_schema_info(a_schema_name); - if g_schema_suites(a_schema_name).changed_at <= l_info.changed_at or g_schema_suites(a_schema_name).obj_cnt != l_info.obj_cnt then - l_result := false; - else - l_result := true; - end if; - end if; - return l_result; - end; - - function get_schema_suites(a_schema_name in varchar2) return t_schema_suites_info is - l_result t_schema_suites_info; - begin - -- Currently cache invalidation on DDL is not implemented so schema is rescaned each time - if cache_valid(a_schema_name) then - l_result.schema_suites := g_schema_suites(a_schema_name).schema_suites; - l_result.suite_paths := g_schema_suites(a_schema_name).suite_paths; - else - ut_utils.debug_log('Rescanning schema ' || a_schema_name); - l_result := ut_suite_builder.build_schema_suites_old(a_schema_name); - update_cache(a_schema_name, l_result, get_schema_info(a_schema_name).obj_cnt ); - end if; - - return l_result; - end get_schema_suites; - function get_schema_ut_packages(a_schema_names ut_varchar2_rows) return ut_object_names is - l_schema_ut_packages ut_object_names := ut_object_names(); - l_schema_suites tt_schema_suites; - l_iter varchar2(4000); - procedure populate_suite_ut_packages(a_suite ut_logical_suite, a_packages in out nocopy ut_object_names) is - l_sub_suite ut_logical_suite; - begin - if a_suite is of (ut_suite) then - a_packages.extend; - a_packages(a_packages.last) := ut_object_name(a_suite.object_owner, a_suite.object_name); - end if; - for i in 1 .. a_suite.items.count loop - if a_suite.items(i) is of (ut_logical_suite) then - l_sub_suite := treat(a_suite.items(i) as ut_logical_suite); - populate_suite_ut_packages(l_sub_suite, a_packages); - end if; - end loop; - end; begin - if a_schema_names is not null then - for i in 1 .. a_schema_names.count loop - l_schema_suites := get_schema_suites(a_schema_names(i)).schema_suites; - l_iter := l_schema_suites.first; - while l_iter is not null loop - populate_suite_ut_packages(l_schema_suites(l_iter), l_schema_ut_packages); - l_iter := l_schema_suites.next(l_iter); - end loop; - end loop; - l_schema_ut_packages := set(l_schema_ut_packages); - end if; - - return l_schema_ut_packages; + return ut_suite_cache_manager.get_schema_ut_packages(a_schema_names); end; procedure validate_paths(a_paths in ut_varchar2_list) is @@ -220,169 +115,6 @@ create or replace package body ut_suite_manager is return resolve_schema_names(l_paths); end; - procedure filter_suite_by_path(a_suite in out nocopy ut_suite_item, a_path varchar2) is - c_item_name constant varchar2(32767) := lower(regexp_substr(a_path, '[A-Za-z0-9$#_]+')); - c_child_filter_path constant varchar2(32767) := regexp_substr(a_path, '\.(.+)', subexpression => 1); - l_suite ut_logical_suite; - l_item ut_suite_item; - l_items ut_suite_items := ut_suite_items(); - - function find_item_in_suite(a_suite ut_logical_suite, a_item_name varchar2) return ut_suite_item is - l_item_index binary_integer; - begin - l_item_index := a_suite.items.first; - while l_item_index is not null loop - if lower(a_suite.items(l_item_index).name) = a_item_name then - return a_suite.items(l_item_index); - end if; - l_item_index := a_suite.items.next(l_item_index); - end loop; - return null; - end; - - function find_item_in_suite_contexts(a_suite ut_logical_suite, a_item_name varchar2) return ut_suite_item is - l_item_index binary_integer; - l_context ut_suite_context; - l_item ut_suite_item; - begin - l_item_index := a_suite.items.first; - while l_item_index is not null loop - if a_suite.items(l_item_index) is of (ut_suite_context) then - l_item := find_item_in_suite( - treat(a_suite.items(l_item_index) as ut_suite_context) - , a_item_name - ); - end if; - - if l_item is not null then - l_context := treat(a_suite.items(l_item_index) as ut_suite_context); - l_context.items := ut_suite_items(l_item); - exit; - end if; - l_item_index := a_suite.items.next(l_item_index); - end loop; - return l_context; - end; - begin - if a_suite is of (ut_logical_suite) then - l_suite := treat(a_suite as ut_logical_suite); - - l_item := coalesce( - find_item_in_suite(l_suite, c_item_name) - , find_item_in_suite_contexts(l_suite, c_item_name) - ); - if l_item is not null then - if c_child_filter_path is not null then - filter_suite_by_path(l_item, c_child_filter_path); - end if; - l_items.extend; - l_items(l_items.count) := l_item; - else - raise_application_error(-20203, 'Suite item '||c_item_name||' not found'); - end if; - - l_suite.items := l_items; - a_suite := l_suite; - end if; - end filter_suite_by_path; - - function get_suite_filtered_by_path(a_path varchar2, a_schema_suites tt_schema_suites) return ut_logical_suite is - l_suite ut_logical_suite; - c_suite_path constant varchar2(32767) := regexp_substr(a_path, ':(.+)', subexpression => 1); - c_root_suite_name constant varchar2(32767) := regexp_substr(c_suite_path, '^[A-Za-z0-9$#_]+'); - c_child_filter_path constant varchar2(32767) := regexp_substr(c_suite_path, '\.(.+)', subexpression => 1); - begin - l_suite := a_schema_suites(c_root_suite_name); - if c_child_filter_path is not null then - filter_suite_by_path(l_suite, c_child_filter_path); - end if; - return l_suite; - exception - when no_data_found then - raise_application_error(-20203, 'Suite ' || c_root_suite_name || ' does not exist or is invalid'); - end; - - function convert_to_suite_path(a_path varchar2, a_suite_paths t_object_suite_path) return varchar2 is - c_package_path_regex constant varchar2(100) := '^([A-Za-z0-9$#_]+)\.([A-Za-z0-9$#_]+)(\.([A-Za-z0-9$#_]+))?$'; - l_schema_name varchar2(4000) := regexp_substr(a_path, c_package_path_regex, subexpression => 1); - l_package_name varchar2(4000) := regexp_substr(a_path, c_package_path_regex, subexpression => 2); - l_procedure_name varchar2(4000) := regexp_substr(a_path, c_package_path_regex, subexpression => 4); - l_path varchar2(4000) := a_path; - begin - if regexp_like(l_path, c_package_path_regex) then - if not a_suite_paths.exists(l_package_name) then - raise_application_error(ut_utils.gc_suite_package_not_found,'Suite package '||l_schema_name||'.'||l_package_name|| ' not found'); - end if; - l_path := rtrim(l_schema_name || ':' || a_suite_paths(l_package_name) || '.' || l_procedure_name, '.'); - end if; - return l_path; - end; - --- function group_paths_by_schema(a_paths ut_varchar2_list) return t_schema_paths is --- l_result t_schema_paths; --- l_schema varchar2(4000); --- begin --- for i in 1 .. a_paths.count loop --- l_schema := upper(regexp_substr(a_paths(i),'^[^.:]+')); --- if l_result.exists(l_schema) then --- l_result(l_schema).extend; --- l_result(l_schema)(l_result(l_schema).last) := a_paths(i); --- else --- l_result(l_schema) := ut_varchar2_list(a_paths(i)); --- end if; --- end loop; --- return l_result; --- end; --- --- function configure_execution_by_path(a_paths in ut_varchar2_list) return ut_suite_items is --- l_paths ut_varchar2_list := a_paths; --- l_path varchar2(32767); --- l_schema varchar2(4000); --- l_suites_info t_schema_suites_info; --- l_index varchar2(4000 char); --- l_suite ut_logical_suite; --- l_objects_to_run ut_suite_items; --- l_schema_paths t_schema_paths; --- begin --- --resolve schema names from paths and group paths by schema name --- resolve_schema_names(l_paths); --- --- l_schema_paths := group_paths_by_schema(l_paths); --- --- l_objects_to_run := ut_suite_items(); --- --- l_schema := l_schema_paths.first; --- while l_schema is not null loop --- l_paths := l_schema_paths(l_schema); --- l_suites_info := get_schema_suites(l_schema); --- --- for i in 1 .. l_paths.count loop --- l_path := l_paths(i); --- --run whole schema --- if regexp_like(l_path, '^[A-Za-z0-9$#_]+$') then --- l_index := l_suites_info.schema_suites.first; --- while l_index is not null loop --- l_objects_to_run.extend; --- l_objects_to_run(l_objects_to_run.count) := l_suites_info.schema_suites(l_index); --- l_index := l_suites_info.schema_suites.next(l_index); --- end loop; --- else --- l_suite := get_suite_filtered_by_path( convert_to_suite_path( l_path, l_suites_info.suite_paths ), l_suites_info.schema_suites ); --- l_objects_to_run.extend; --- l_objects_to_run(l_objects_to_run.count) := l_suite; --- end if; --- end loop; --- l_schema := l_schema_paths.next(l_schema); --- end loop; --- --- --propagate rollback type to suite items after organizing suites into hierarchy --- for i in 1 .. l_objects_to_run.count loop --- l_objects_to_run(i).set_rollback_type( l_objects_to_run(i).get_rollback_type() ); --- end loop; --- --- return l_objects_to_run; --- end configure_execution_by_path; - function group_paths_by_schema(a_paths ut_varchar2_list) return t_schema_paths is c_package_path_regex constant varchar2(100) := '^([A-Za-z0-9$#_]+)(\.([A-Za-z0-9$#_]+))?(\.([A-Za-z0-9$#_]+))?$'; l_schema varchar2(4000); @@ -409,6 +141,7 @@ create or replace package body ut_suite_manager is end loop; return l_results; end; + function configure_execution_by_path(a_paths in ut_varchar2_list) return ut_suite_items is l_paths ut_varchar2_list := a_paths; l_path_items t_path_items; @@ -431,15 +164,12 @@ create or replace package body ut_suite_manager is l_path_items := l_schema_paths(l_schema); for i in 1 .. l_path_items.count loop l_path_item := l_path_items(i); - --whole schema - if l_path_item.object_name is null and l_path_item.suite_path is null then - l_suites := ut_suite_builder.build_schema_suites(upper(l_schema)); - --suite path - elsif l_path_item.suite_path is not null then - l_suites := ut_suite_builder.build_schema_suites(upper(l_schema), l_path_item.suite_path); - else - l_suites := ut_suite_builder.build_schema_suites(upper(l_schema), l_path_item.object_name, l_path_item.procedure_name); - end if; + l_suites := ut_suite_builder.build_schema_suites( + upper(l_schema), + l_path_item.suite_path, + l_path_item.object_name, + l_path_item.procedure_name + ); l_index := l_suites.first; while l_index is not null loop l_objects_to_run.extend; diff --git a/test/core/test_suite_builder.pkb b/test/core/test_suite_builder.pkb index 3216da333..edbee1e1a 100644 --- a/test/core/test_suite_builder.pkb +++ b/test/core/test_suite_builder.pkb @@ -4,17 +4,23 @@ create or replace package body test_suite_builder is a_annotations ut3.ut_annotations, a_package_name varchar2 := 'TEST_SUITE_BUILDER_PACKAGE' ) return clob is - l_suites ut3.ut_suite_builder.tt_schema_suites; + l_suites ut3.ut_suite_items; l_suite ut3.ut_logical_suite; l_cursor sys_refcursor; l_xml xmltype; begin open l_cursor for select value(x) from table( ut3.ut_annotated_objects( - ut3.ut_annotated_object('UT3_TESTER', a_package_name, 'PACKAGE', SYSDATE, a_annotations) + ut3.ut_annotated_object('UT3_TESTER', a_package_name, 'PACKAGE', systimestamp, a_annotations) ) ) x; - l_suites := ut3.ut_suite_builder.build_suites(l_cursor).schema_suites; - l_suite := l_suites(l_suites.first); + + l_suites := ut3.ut_suite_builder.build_suites_from_annotations( + a_owner_name => 'UT3_TESTER', + a_annotated_objects => l_cursor, + a_path => null, + a_object_name => a_package_name + ); + l_suite := treat( l_suites(l_suites.first) as ut3.ut_logical_suite); select deletexml( xmltype(l_suite), @@ -634,6 +640,9 @@ create or replace package body test_suite_builder is '%' || '%' || '%' || + '' || + '%suite_level_testIn suitesome_package.suite_level_test' || + '%' || '' || '%a_contextA contextsome_package.a_context' || '%' || @@ -646,9 +655,6 @@ create or replace package body test_suite_builder is '%' || '' || '' || - '' || - '%suite_level_testIn suitesome_package.suite_level_test' || - '%' || '' || '' || '%some_packagesuite_level_beforeall' || From 4dc48e676f14bae492c5c511f2ac500afa6a2674 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 4 Nov 2018 01:32:48 +0000 Subject: [PATCH 0060/1096] Interim commit - performance check on Travis. --- .../ut_annotation_cache_manager.pkb | 2 +- .../annotations/ut_annotation_manager.pkb | 2 +- source/core/ut_suite_builder.pkb | 244 ++++++++++++++---- source/core/ut_suite_builder.pks | 5 +- source/core/ut_suite_cache_manager.pkb | 81 +----- source/core/ut_suite_cache_manager.pks | 12 - source/core/ut_suite_manager.pkb | 11 +- .../create_synonyms_and_grants_for_public.sql | 4 + source/create_user_grants.sql | 4 + test/core/test_suite_builder.pkb | 11 +- test/core/test_suite_manager.pkb | 37 +-- 11 files changed, 244 insertions(+), 169 deletions(-) diff --git a/source/core/annotations/ut_annotation_cache_manager.pkb b/source/core/annotations/ut_annotation_cache_manager.pkb index c54d7eec3..9d7d1b95e 100644 --- a/source/core/annotations/ut_annotation_cache_manager.pkb +++ b/source/core/annotations/ut_annotation_cache_manager.pkb @@ -92,7 +92,7 @@ create or replace package body ut_annotation_cache_manager as join ut_annotation_cache_info i on o.object_owner = i.object_owner and o.object_name = i.object_name and o.object_type = i.object_type join ut_annotation_cache c on i.cache_id = c.cache_id - where ]'|| case when a_parse_time is null then ':a_parse_date is null' else 'i.parse_time > :a_parse_time' end ||q'[ + where ]'|| case when a_parse_time is null then ':a_parse_date is null' else 'i.parse_time >= :a_parse_time' end ||q'[ group by i.object_owner, i.object_name, i.object_type, i.parse_time]' using a_cached_objects, a_parse_time; return l_results; diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index 9ad1a9e79..afa66b2e4 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -44,7 +44,7 @@ create or replace package body ut_annotation_manager as || case when a_parse_date is null then ':a_parse_date is null' - else 'o.last_ddl_time > cast(:a_parse_date as date)' + else 'o.last_ddl_time >= cast(:a_parse_date as date)' end; open l_rows for l_cursor_text using a_object_owner, a_object_type, a_parse_date; fetch l_rows bulk collect into l_result limit 1000000; diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index 21e784f7e..358a563f4 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -98,6 +98,10 @@ create or replace package body ut_suite_builder is by_name tt_annotations_by_name ); + subtype t_cached_suite is ut_suite_cache%rowtype; + type tt_cached_suites is table of t_cached_suite; + type t_cached_suites_cursor is ref cursor return t_cached_suite; + procedure delete_annotations_range( a_annotations in out nocopy t_annotations_info, a_start_pos t_annotation_position, @@ -318,7 +322,10 @@ create or replace package body ut_suite_builder is l_pos t_annotation_position := a_list.first; begin while l_pos is not null loop - l_result := l_result multiset union all a_list(l_pos); + for i in 1 .. a_list(l_pos).count loop + l_result.extend; + l_result(l_result.last) := a_list(l_pos)(i); + end loop; l_pos := a_list.next(l_pos); end loop; return l_result; @@ -832,25 +839,6 @@ create or replace package body ut_suite_builder is end loop; end; - procedure add_parent_logical_suites( a_suite ut_suite, a_suite_items in out nocopy ut_suite_items) is - l_path varchar2(200); - l_name varchar2(200); - begin - l_path := a_suite.path; - loop - l_path := substr( l_path, 1, instr(l_path,'.',-1)-1); - exit when l_path is null; - l_name := substr( l_path, instr(l_path,'.',-1)+1); - a_suite_items.extend; - a_suite_items( a_suite_items.last) := - ut_logical_suite( - a_object_owner => a_suite.object_owner, - a_object_name => l_name, a_name => l_name, a_path => l_path - ); - a_suite_items( a_suite_items.last).parse_time := a_suite.parse_time; - end loop; - end; - procedure create_suite_item_list( a_annotations t_annotations_info, a_suite_items out nocopy ut_suite_items ) is l_annotations t_annotations_info := a_annotations; l_annotation_pos t_annotation_position; @@ -875,7 +863,6 @@ create or replace package body ut_suite_builder is a_suite_items.extend; a_suite_items( a_suite_items.last) := l_suite; - add_parent_logical_suites( l_suite, a_suite_items ); end if; end; @@ -905,14 +892,31 @@ create or replace package body ut_suite_builder is return l_result; end; + procedure copy_list_reverse_order( + a_list in out nocopy ut_suite_items + ) is + l_start_idx pls_integer; + l_end_idx pls_integer; + l_item ut_suite_item; + begin + l_start_idx := a_list.first; + l_end_idx := a_list.last; + while l_start_idx < l_end_idx loop + l_item := a_list(l_start_idx); + a_list(l_start_idx) := a_list(l_end_idx); + a_list(l_end_idx) := l_item; + l_end_idx := a_list.prior(l_end_idx); + l_start_idx := a_list.next(l_start_idx); + end loop; + end; + procedure reconstruct_from_cache( - a_suites in out nocopy ut_suite_items, + a_suites out nocopy ut_suite_items, a_suite_data_cursor sys_refcursor ) is type t_item_levels is table of ut_suite_items index by binary_integer; l_items_at_level t_item_levels; - l_rows ut_suite_cache_manager.tt_cached_suites; --- l_items ut_suite_items := ut_suite_items(); + l_rows tt_cached_suites; l_tests ut_suite_items := ut_suite_items(); l_logical_suites ut_logical_suites := ut_logical_suites(); l_level pls_integer; @@ -923,8 +927,6 @@ create or replace package body ut_suite_builder is loop if l_idx is null then fetch a_suite_data_cursor bulk collect into l_rows limit 1000; --- l_items.delete; --- l_items.extend(l_rows.count); l_tests.delete; l_tests.extend(l_rows.count); l_logical_suites.delete; @@ -932,12 +934,11 @@ create or replace package body ut_suite_builder is for i in 1 .. l_rows.count loop case l_rows(i).self_type when 'UT_TEST' then --- l_items(i) := l_tests(i) := ut_test( self_type => l_rows(i).self_type, - object_owner => l_rows(i).object_owner, object_name => l_rows(i).object_name, - name => l_rows(i).name, description => l_rows(i).description, path => l_rows(i).path, + object_owner => l_rows(i).object_owner, object_name => lower(l_rows(i).object_name), + name => lower(l_rows(i).name), description => l_rows(i).description, path => l_rows(i).path, rollback_type => l_rows(i).rollback_type, disabled_flag => l_rows(i).disabled_flag, line_no => l_rows(i).line_no, parse_time => l_rows(i).parse_time, start_time => null, end_time => null, result => null, warnings => l_rows(i).warnings, @@ -949,12 +950,11 @@ create or replace package body ut_suite_builder is parent_error_stack_trace => null, expected_error_codes => l_rows(i).expected_error_codes ); when 'UT_SUITE' then --- l_items(i) := l_logical_suites(i) := ut_suite( self_type => l_rows(i).self_type, - object_owner => l_rows(i).object_owner, object_name => l_rows(i).object_name, - name => l_rows(i).name, description => l_rows(i).description, path => l_rows(i).path, + object_owner => l_rows(i).object_owner, object_name => lower(l_rows(i).object_name), + name => lower(l_rows(i).name), description => l_rows(i).description, path => l_rows(i).path, rollback_type => l_rows(i).rollback_type, disabled_flag => l_rows(i).disabled_flag, line_no => l_rows(i).line_no, parse_time => l_rows(i).parse_time, start_time => null, end_time => null, result => null, warnings => l_rows(i).warnings, @@ -963,26 +963,26 @@ create or replace package body ut_suite_builder is before_all_list => l_rows(i).before_all_list, after_all_list => l_rows(i).after_all_list ); when 'UT_SUITE_CONTEXT' then --- l_items(i) := l_logical_suites(i) := ut_suite_context( self_type => l_rows(i).self_type, - object_owner => l_rows(i).object_owner, object_name => l_rows(i).object_name, name => l_rows(i).name, - description => l_rows(i).description, path => l_rows(i).path, rollback_type => l_rows(i).rollback_type, - disabled_flag => l_rows(i).disabled_flag, line_no => l_rows(i).line_no, parse_time => l_rows(i).parse_time, + object_owner => l_rows(i).object_owner, object_name => lower(l_rows(i).object_name), + name => lower(l_rows(i).name), description => l_rows(i).description, path => l_rows(i).path, + rollback_type => l_rows(i).rollback_type, disabled_flag => l_rows(i).disabled_flag, + line_no => l_rows(i).line_no, parse_time => l_rows(i).parse_time, start_time => null, end_time => null, result => null, warnings => l_rows(i).warnings, results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), items => ut_suite_items(), before_all_list => l_rows(i).before_all_list, after_all_list => l_rows(i).after_all_list ); when 'UT_LOGICAL_SUITE' then --- l_items(i) := l_logical_suites(i) := ut_logical_suite( self_type => l_rows(i).self_type, - object_owner => l_rows(i).object_owner, object_name => l_rows(i).object_name, name => l_rows(i).name, - description => l_rows(i).description, path => l_rows(i).path, rollback_type => l_rows(i).rollback_type, - disabled_flag => l_rows(i).disabled_flag, line_no => l_rows(i).line_no, parse_time => l_rows(i).parse_time, + object_owner => l_rows(i).object_owner, object_name => lower(l_rows(i).object_name), + name => lower(l_rows(i).name), description => l_rows(i).description, path => l_rows(i).path, + rollback_type => l_rows(i).rollback_type, disabled_flag => l_rows(i).disabled_flag, + line_no => l_rows(i).line_no, parse_time => l_rows(i).parse_time, start_time => null, end_time => null, result => null, warnings => l_rows(i).warnings, results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), items => ut_suite_items() @@ -992,13 +992,15 @@ create or replace package body ut_suite_builder is l_idx := l_rows.first; end if; exit when l_idx is null; + l_level := length(l_rows(l_idx).path) - length( replace(l_rows(l_idx).path, '.') ) + 1; + if l_level > 1 then if l_prev_level > l_level then l_logical_suites(l_idx).items := l_items_at_level(l_prev_level); l_items_at_level(l_prev_level).delete; end if; - if not l_items_at_level.exists((l_level)) then + if not l_items_at_level.exists(l_level) then l_items_at_level(l_level) := ut_suite_items(); end if; l_items_at_level(l_level).extend; @@ -1019,29 +1021,140 @@ create or replace package body ut_suite_builder is a_suites(a_suites.last) := l_logical_suites(l_idx); end if; end if; --- if l_level = 0 then --- a_suites.extend; --- a_suites(a_suites.last) := l_items(l_idx); --- else --- a_suites(a_suites.last).add_item( l_items(l_idx), l_level ); --- end if; l_prev_level := l_level; l_idx := l_rows.next(l_idx); end loop; + copy_list_reverse_order( a_suites ); close a_suite_data_cursor; end; + function get_cached_suite_data( + a_object_owner varchar2, + a_path varchar2 := null, + a_object_name varchar2 := null, + a_procedure_name varchar2 := null, + a_skip_all_objects boolean := false + ) return t_cached_suites_cursor is + l_path varchar2( 4000 ); + l_result sys_refcursor; + l_ut_owner varchar2(250) := ut_utils.ut_owner; + begin + if a_path is null and a_object_name is not null then + execute immediate 'select min(path) + from '||l_ut_owner||q'[.ut_suite_cache + where object_owner = :a_object_owner + and object_name = :a_object_name + and name = nvl(:a_procedure_name, name)]' + into l_path using upper(a_object_owner), upper(a_object_name), upper(a_procedure_name); + else + l_path := lower( a_path ); + end if; + + open l_result for + q'[with + suite_items as ( + select c.* + from ]'||l_ut_owner||q'[.ut_suite_cache c + where 1 = 1 ]'||case when a_skip_all_objects is null then q'[ + and exists + ( select 1 + from all_objects a + where a.object_name = c.object_name + and a.owner = c.object_owner + and a.object_type = 'PACKAGE' + )]' end ||q'[ + and c.object_owner = :a_object_owner + and ( ]' || case when l_path is not null then q'[ + :l_path||'.' like c.path || '.%' /*all children and self*/ + or ( c.path||'.' like :l_path || '.%' --all parents + ]' + else ' :l_path is null and ( :l_path is null ' end + || case when a_object_name is not null + then 'and c.object_name = :a_object_name ' + else 'and :a_object_name is null' end ||' + '|| case when a_procedure_name is not null + then 'and c.name = :a_procedure_name' + else 'and :a_procedure_name is null' end ||q'[ + ) + ) + ), + gen as ( + select rownum as pos + from xmltable('1 to 100') + ), + suitepaths as ( + select distinct substr(path,1,instr(path,'.',-1)-1) as suitepath, + path, + object_owner + from suite_items + where self_type = 'UT_SUITE' + ), + gen as ( + select rownum as pos + from xmltable('1 to 10') + ), + suitepath_part AS ( + select distinct + substr(b.suitepath, 1, instr(b.suitepath || '.', '.', 1, g.pos) -1) as path, + object_owner + from suitepaths b + join gen g + on g.pos <= regexp_count(b.suitepath, '\w+') + ), + logical_suite_data as ( + select 'UT_LOGICAL_SUITE' as self_type, p.path, p.object_owner, + upper( substr(p.path, instr( p.path, '.', -1 ) + 1 ) ) as object_name, + cast(null as ]'||l_ut_owner||q'[.ut_executables) as x, + cast(null as ]'||l_ut_owner||q'[.ut_integer_list) as y, + cast(null as ]'||l_ut_owner||q'[.ut_executable_test) as z + from suitepath_part p + where p.path + not in (select s.path from suitepaths s) + ), + logical_suites as ( + select s.self_type, s.path, s.object_owner, s.object_name, + s.object_name as name, null as line_no, null as parse_time, + null as description, null as rollback_type, 0 as disabled_flag, + ]'||l_ut_owner||q'[.ut_varchar2_rows() as warnings, + s.x as before_all_list, s.x as after_all_list, + s.x as before_each_list, s.x as before_test_list, + s.x as after_each_list, s.x as after_test_list, + s.y as expected_error_codes, s.z as item + from logical_suite_data s + ), + items as ( + select * from suite_items + union all + select * from logical_suites + ) + select c.* + from items c + order by c.object_owner, + replace(case + when c.self_type in ( 'UT_TEST' ) + then substr(c.path, 1, instr(c.path, '.', -1) ) + else c.path + end, '.', chr(0)) desc nulls last, + c.object_name desc, + c.line_no]' + using upper(a_object_owner), l_path, l_path, upper(a_object_name), upper(a_procedure_name); + + return l_result; + end; + function build_suites_from_annotations( a_owner_name varchar2, a_annotated_objects sys_refcursor, a_path varchar2 := null, a_object_name varchar2 := null, - a_procedure_name varchar2 := null + a_procedure_name varchar2 := null, + a_skip_all_objects boolean := false ) return ut_suite_items is l_suites ut_suite_items; l_annotations_cursor sys_refcursor; l_annotated_objects ut_annotated_objects; l_suite_items ut_suite_items; + l_suite_data_cursor sys_refcursor; begin loop fetch a_annotated_objects bulk collect into l_annotated_objects limit 10; @@ -1059,11 +1172,13 @@ create or replace package body ut_suite_builder is reconstruct_from_cache( l_suites, - ut_suite_cache_manager.get_cached_suite_data( + get_cached_suite_data( a_owner_name, a_path, a_object_name, - a_procedure_name ) + a_procedure_name, + a_skip_all_objects + ) ); for i in 1 .. l_suites.count loop l_suites( i ).set_rollback_type( l_suites( i ).get_rollback_type ); @@ -1078,14 +1193,15 @@ create or replace package body ut_suite_builder is a_procedure_name varchar2 := null ) return ut_suite_items is l_annotations_cursor sys_refcursor; + l_suite_cache_time timestamp; begin - + l_suite_cache_time := ut_suite_cache_manager.get_schema_parse_time(a_owner_name); open l_annotations_cursor for q'[select value(x) from table( ]' || ut_utils.ut_owner || q'[.ut_annotation_manager.get_annotated_objects(:a_owner_name, 'PACKAGE', :a_suite_cache_parse_time) )x ]' - using a_owner_name, ut_suite_cache_manager.get_schema_parse_time(a_owner_name); + using a_owner_name, l_suite_cache_time; return build_suites_from_annotations( a_owner_name, @@ -1096,5 +1212,29 @@ create or replace package body ut_suite_builder is ); end; + function get_schema_ut_packages( a_schema_names ut_varchar2_rows ) return ut_object_names is + l_results ut_object_names := ut_object_names( ); + l_schema_names ut_varchar2_rows; + l_object_names ut_varchar2_rows; + l_ut_owner varchar2(250) := ut_utils.ut_owner; + begin + execute immediate 'select distinct c.object_owner, c.object_name + from '||l_ut_owner||q'[.ut_suite_cache c + join table ( :a_schema_names ) s + on c.object_owner = upper(s.column_value) +-- where exists +-- (select 1 from all_objects a +-- where a.owner = c.object_owner +-- and a.object_name = c.object_name +-- and a.object_type = 'PACKAGE') + ]' + bulk collect into l_schema_names, l_object_names using a_schema_names; + l_results.extend( l_schema_names.count ); + for i in 1 .. l_schema_names.count loop + l_results( i ) := ut_object_name( l_schema_names( i ), l_object_names( i ) ); + end loop; + return l_results; + end; + end ut_suite_builder; / diff --git a/source/core/ut_suite_builder.pks b/source/core/ut_suite_builder.pks index b3d07b0a8..881df24c9 100644 --- a/source/core/ut_suite_builder.pks +++ b/source/core/ut_suite_builder.pks @@ -37,12 +37,15 @@ create or replace package ut_suite_builder authid current_user is a_procedure_name varchar2 := null ) return ut_suite_items; + function get_schema_ut_packages(a_schema_names ut_varchar2_rows) return ut_object_names; + function build_suites_from_annotations( a_owner_name varchar2, a_annotated_objects sys_refcursor, a_path varchar2 := null, a_object_name varchar2 := null, - a_procedure_name varchar2 := null + a_procedure_name varchar2 := null, + a_skip_all_objects boolean := false ) return ut_suite_items; end ut_suite_builder; diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index 33712c589..cad718ee3 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -16,71 +16,6 @@ create or replace package body ut_suite_cache_manager is limitations under the License. */ - function get_cached_suite_data( - a_schema_name varchar2, - a_path varchar2 := null, - a_object_name varchar2 := null, - a_procedure_name varchar2 := null - ) return t_cached_suites_cursor is - l_path varchar2( 4000 ); - l_result sys_refcursor; - begin - if a_path is null and a_object_name is not null then - select min(path) into l_path - from ut_suite_cache - where object_owner = upper(a_schema_name) and object_name = lower(a_object_name) and - name = nvl(lower(a_procedure_name), name); - else - l_path := lower( a_path ); - end if; - - - open l_result for - select c.* - from ut_suite_cache c - -- join all_objects a - -- on a.owner = x.object_owner - -- and a.object_name = x.object_name - -- and a.object_type = 'PACKAGE' - where ( l_path like c.path || '.' || '%' - or ( c.path like l_path || '%' - and c.object_name = nvl(lower(a_object_name), c.object_name) - and c.name = nvl(lower(a_procedure_name), c.name) - ) - ) and c.object_owner = upper(a_schema_name) - order by c.object_owner, - replace(case - when c.self_type in ( 'UT_TEST' ) - then substr(c.path, 1, instr(c.path, '.', -1) - 1) - else c.path - end, '.', chr(0)) desc nulls last, - c.object_name desc, - c.line_no desc; - - return l_result; - end; - - - function get_schema_ut_packages( a_schema_names ut_varchar2_rows ) return ut_object_names is - l_results ut_object_names := ut_object_names( ); - l_schema_names ut_varchar2_rows; - l_object_names ut_varchar2_rows; - begin - select distinct c.object_owner, c.object_name - bulk collect into l_schema_names, l_object_names - from ut_suite_cache c - -- join all_objects a - -- on a.owner = c.object_owner - -- and a.object_name = c.object_name - -- and a.object_type = 'PACKAGE' - join table ( a_schema_names ) s on c.object_owner = upper(s.column_value); - l_results.extend( l_schema_names.count ); - for i in 1 .. l_schema_names.count loop - l_results( i ) := ut_object_name( l_schema_names( i ), l_object_names( i ) ); - end loop; - return l_results; - end; - function get_schema_parse_time(a_schema_name varchar2) return timestamp result_cache is l_cache_parse_time timestamp; begin @@ -95,6 +30,7 @@ create or replace package body ut_suite_cache_manager is pragma autonomous_transaction; l_parse_time timestamp; l_cached_parse_time timestamp; + l_object_owner varchar2(250) := upper(a_object_owner); begin if a_suite_items.count = 0 then return; @@ -115,17 +51,20 @@ create or replace package body ut_suite_cache_manager is update ut_suite_cache_schema t set t.parse_time = l_parse_time - where object_owner = a_object_owner; + where object_owner = l_object_owner; if sql%rowcount = 0 then insert into ut_suite_cache_schema (object_owner, parse_time) - values (a_object_owner, l_parse_time); + values (l_object_owner, l_parse_time); end if; delete from ut_suite_cache t where (t.object_name, t.object_owner) - in (select s.object_name, s.object_owner from table(a_suite_items) s where s.self_type != 'UT_LOGICAL_SUITE'); + in ( + select upper(s.object_name), upper(s.object_owner) + from table(a_suite_items) s where s.self_type != 'UT_LOGICAL_SUITE' + ); insert into ut_suite_cache t @@ -134,7 +73,7 @@ create or replace package body ut_suite_cache_manager is line_no, parse_time, description, rollback_type, disabled_flag, warnings ) - select self_type, path, object_owner, object_name, name, + select self_type, path, upper(object_owner), upper(object_name), upper(name), line_no, parse_time, description, rollback_type, disabled_flag, warnings from table(a_suite_items) s @@ -155,7 +94,7 @@ create or replace package body ut_suite_cache_manager is from table(a_suite_items) x where x.self_type in( 'UT_SUITE', 'UT_SUITE_CONTEXT' ) ) select s.i.self_type as self_type, s.i.path as path, - s.i.object_owner as object_owner, s.i.object_name as object_name, s.i.name as name, + upper(s.i.object_owner) as object_owner, upper(s.i.object_name) as object_name, upper(s.i.name) as name, s.i.line_no as line_no, s.i.parse_time as parse_time, s.i.description as description, s.i.rollback_type as rollback_type, s.i.disabled_flag as disabled_flag, s.i.warnings as warnings, s.i.before_all_list as before_all_list, s.i.after_all_list as after_all_list, @@ -178,7 +117,7 @@ create or replace package body ut_suite_cache_manager is from table ( a_suite_items ) x where x.self_type in ( 'UT_TEST' ) ) select s.t.self_type as self_type, s.t.path as path, - s.t.object_owner as object_owner, s.t.object_name as object_name, s.t.name as name, + upper(s.t.object_owner) as object_owner, upper(s.t.object_name) as object_name, upper(s.t.name) as name, s.t.line_no as line_no, s.t.parse_time as parse_time, s.t.description as description, s.t.rollback_type as rollback_type, s.t.disabled_flag as disabled_flag, s.t.warnings as warnings, null before_all_list, null after_all_list, diff --git a/source/core/ut_suite_cache_manager.pks b/source/core/ut_suite_cache_manager.pks index f5da97ec7..919196efa 100644 --- a/source/core/ut_suite_cache_manager.pks +++ b/source/core/ut_suite_cache_manager.pks @@ -19,21 +19,9 @@ create or replace package ut_suite_cache_manager authid definer is /** * Responsible for storing and retrieving suite data from cache */ - subtype t_cached_suite is ut_suite_cache%rowtype; - type tt_cached_suites is table of t_cached_suite; - type t_cached_suites_cursor is ref cursor return t_cached_suite; procedure save_cache(a_object_owner varchar2, a_suite_items ut_suite_items); - function get_cached_suite_data( - a_schema_name varchar2, - a_path varchar2 := null, - a_object_name varchar2 := null, - a_procedure_name varchar2 := null - ) return t_cached_suites_cursor; - - function get_schema_ut_packages(a_schema_names ut_varchar2_rows) return ut_object_names; - function get_schema_parse_time(a_schema_name varchar2) return timestamp result_cache; end ut_suite_cache_manager; diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 04bc26f10..4aab5503b 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -29,7 +29,7 @@ create or replace package body ut_suite_manager is function get_schema_ut_packages(a_schema_names ut_varchar2_rows) return ut_object_names is begin - return ut_suite_cache_manager.get_schema_ut_packages(a_schema_names); + return ut_suite_builder.get_schema_ut_packages(a_schema_names); end; procedure validate_paths(a_paths in ut_varchar2_list) is @@ -170,6 +170,15 @@ create or replace package body ut_suite_manager is l_path_item.object_name, l_path_item.procedure_name ); + if l_suites.count = 0 then + if l_path_item.suite_path is not null then + raise_application_error(ut_utils.gc_suite_package_not_found,'No suite packages found for path '||l_schema||':'||l_path_item.suite_path|| '.'); + elsif l_path_item.procedure_name is not null then + raise_application_error(ut_utils.gc_suite_package_not_found,'Suite test '||l_schema||'.'||l_path_item.object_name|| '.'||l_path_item.procedure_name||' does not exist'); + else + raise_application_error(ut_utils.gc_suite_package_not_found,'Suite package '||l_schema||'.'||l_path_item.object_name|| ' does not exist'); + end if; + end if; l_index := l_suites.first; while l_index is not null loop l_objects_to_run.extend; diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index 1ac5bb9ea..f22a61121 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -86,6 +86,10 @@ grant execute on &&ut3_owner..ut_annotated_object to public; grant execute on &&ut3_owner..ut_annotated_objects to public; grant select on &&ut3_owner..ut_annotation_cache_info to public; grant select on &&ut3_owner..ut_annotation_cache to public; +grant execute on &&ut3_owner..ut_executables to public; +grant execute on &&ut3_owner..ut_executable_test to public; +grant select on &&ut3_owner..ut_suite_cache to public; +grant select on &&ut3_owner..ut_suite_cache_schema to public; grant execute on &&ut3_owner..ut_annotation_cache_manager to public; grant execute on &&ut3_owner..ut_annotation_parser to public; grant execute on &&ut3_owner..ut_annotation_objs_cache_info to public; diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql index 07d9097f3..723fcca58 100644 --- a/source/create_user_grants.sql +++ b/source/create_user_grants.sql @@ -106,6 +106,10 @@ grant execute on &&ut3_owner..ut_annotated_object to &ut3_user; grant execute on &&ut3_owner..ut_annotated_objects to &ut3_user; grant select on &&ut3_owner..ut_annotation_cache_info to &ut3_user; grant select on &&ut3_owner..ut_annotation_cache to &ut3_user; +grant execute on &&ut3_owner..ut_executables to &ut3_user; +grant execute on &&ut3_owner..ut_executable_test to &ut3_user; +grant select on &&ut3_owner..ut_suite_cache to &ut3_user; +grant select on &&ut3_owner..ut_suite_cache_schema to &ut3_user; grant execute on &&ut3_owner..ut_annotation_cache_manager to &ut3_user; grant execute on &&ut3_owner..ut_annotation_parser to &ut3_user; grant execute on &&ut3_owner..ut_annotation_objs_cache_info to &ut3_user; diff --git a/test/core/test_suite_builder.pkb b/test/core/test_suite_builder.pkb index edbee1e1a..e55830266 100644 --- a/test/core/test_suite_builder.pkb +++ b/test/core/test_suite_builder.pkb @@ -18,7 +18,8 @@ create or replace package body test_suite_builder is a_owner_name => 'UT3_TESTER', a_annotated_objects => l_cursor, a_path => null, - a_object_name => a_package_name + a_object_name => a_package_name, + a_skip_all_objects => true ); l_suite := treat( l_suites(l_suites.first) as ut3.ut_logical_suite); @@ -395,7 +396,7 @@ create or replace package body test_suite_builder is ut3.ut_annotation(1, 'suite','Cool', null), ut3.ut_annotation(2, 'beforeall',null, 'first_before_all'), ut3.ut_annotation(3, 'beforeall',null, 'another_before_all'), - ut3.ut_annotation(4, 'beforeeach',null, 'first_bfore_each'), + ut3.ut_annotation(4, 'beforeeach',null, 'first_before_each'), ut3.ut_annotation(5, 'beforeeach',null, 'another_before_each'), ut3.ut_annotation(6, 'aftereach',null, 'first_after_each'), ut3.ut_annotation(7, 'aftereach',null, 'another_after_each'), @@ -640,9 +641,6 @@ create or replace package body test_suite_builder is '%' || '%' || '%' || - '' || - '%suite_level_testIn suitesome_package.suite_level_test' || - '%' || '' || '%a_contextA contextsome_package.a_context' || '%' || @@ -655,6 +653,9 @@ create or replace package body test_suite_builder is '%' || '' || '' || + '' || + '%suite_level_testIn suitesome_package.suite_level_test' || + '%' || '' || '' || '%some_packagesuite_level_beforeall' || diff --git a/test/core/test_suite_manager.pkb b/test/core/test_suite_manager.pkb index 59f1f42ea..5d7e91f3d 100644 --- a/test/core/test_suite_manager.pkb +++ b/test/core/test_suite_manager.pkb @@ -313,7 +313,7 @@ end test_package_with_ctx;]'; ut.expect(l_test1_suite.name).to_equal('test_package_1'); ut.expect(l_test1_suite.items.count).to_equal(3); ut.expect(l_test1_suite.rollback_type).to_equal(ut3.ut_utils.gc_rollback_manual); - l_test2_suite := treat(l_test1_suite.items(3) as ut3.ut_logical_suite); + l_test2_suite := treat(l_test1_suite.items(1) as ut3.ut_logical_suite); ut.expect(l_test2_suite.name).to_equal('test_package_2'); ut.expect(l_test2_suite.items.count).to_equal(3); @@ -515,7 +515,6 @@ end test_package_with_ctx;]'; l_test0_suite ut3.ut_logical_suite; l_test1_suite ut3.ut_suite; - l_test2_suite ut3.ut_suite; begin --Act l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); @@ -529,7 +528,7 @@ end test_package_with_ctx;]'; l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_suite); ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.items.count).to_equal(3); + ut.expect(l_test1_suite.items.count).to_equal(2); ut.expect(l_test1_suite.items(1).name).to_equal('test1'); ut.expect(l_test1_suite.items(1).description).to_equal('Test1 from test package 1'); @@ -545,12 +544,6 @@ end test_package_with_ctx;]'; ut.expect(treat(l_test1_suite.items(2) as ut3.ut_test).before_each_list.count).to_be_greater_than(0); ut.expect(treat(l_test1_suite.items(2) as ut3.ut_test).disabled_flag).to_equal(0); - -- temporary behavior. - -- decided that when executed by package, not path, only that package has to execute - l_test2_suite := treat(l_test1_suite.items(3) as ut3.ut_suite); - - ut.expect(l_test2_suite.name).to_equal('test_package_2'); - ut.expect(l_test2_suite.items.count).to_equal(3); end; procedure test_top_pack_by_name_cu is @@ -573,7 +566,7 @@ end test_package_with_ctx;]'; l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_suite); ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.items.count).to_equal(3); + ut.expect(l_test1_suite.items.count).to_equal(2); ut.expect(l_test1_suite.items(1).name).to_equal('test1'); ut.expect(l_test1_suite.items(1).description).to_equal('Test1 from test package 1'); @@ -589,12 +582,6 @@ end test_package_with_ctx;]'; ut.expect(treat(l_test1_suite.items(2) as ut3.ut_test).before_each_list.count).to_be_greater_than(0); ut.expect(treat(l_test1_suite.items(2) as ut3.ut_test).disabled_flag).to_equal(0); - -- temporary behavior. - -- decided that when executed by package, not path, only that package has to execute - l_test2_suite := treat(l_test1_suite.items(3) as ut3.ut_suite); - - ut.expect(l_test2_suite.name).to_equal('test_package_2'); - ut.expect(l_test2_suite.items.count).to_equal(3); end; procedure test_top_pack_by_path is @@ -618,7 +605,7 @@ end test_package_with_ctx;]'; ut.expect(l_test1_suite.name).to_equal('test_package_1'); ut.expect(l_test1_suite.items.count).to_equal(3); - l_test2_suite := treat(l_test1_suite.items(3) as ut3.ut_logical_suite); + l_test2_suite := treat(l_test1_suite.items(1) as ut3.ut_logical_suite); ut.expect(l_test2_suite.name).to_equal('test_package_2'); ut.expect(l_test2_suite.items.count).to_equal(3); @@ -645,7 +632,7 @@ end test_package_with_ctx;]'; ut.expect(l_test1_suite.name).to_equal('test_package_1'); ut.expect(l_test1_suite.items.count).to_equal(3); - l_test2_suite := treat(l_test1_suite.items(3) as ut3.ut_logical_suite); + l_test2_suite := treat(l_test1_suite.items(1) as ut3.ut_logical_suite); ut.expect(l_test2_suite.name).to_equal('test_package_2'); ut.expect(l_test2_suite.items.count).to_equal(3); @@ -942,7 +929,7 @@ end;]'; l_objects_to_run ut3.ut_suite_items; begin l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('ut3.failing_non_existing')); - ut.fail('Non existing package didnt raised exception'); + ut.fail('Non existing package did not raise exception'); exception when others then ut.expect(sqlerrm).to_be_like('%failing_non_existing%'); @@ -952,7 +939,7 @@ end;]'; l_objects_to_run ut3.ut_suite_items; begin l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('failing_non_existing')); - ut.fail('Non existing package without schema didnt raised exception'); + ut.fail('Non existing package without schema did not raise exception'); exception when others then ut.expect(sqlerrm).to_be_like('%ORA-44001: invalid schema%'); @@ -979,10 +966,10 @@ end;]'; ut.expect(l_test.name).to_equal('test1'); ut.expect(l_test.description).to_equal('A test description, though with comma, is assigned by suite_manager'); - l_test := treat(l_suite.items(2) as ut3.ut_test); - - ut.expect(l_test.name).to_equal('test2'); - ut.expect(l_test.description).to_equal('A test description, though with comma, is assigned by suite_manager'); +-- l_test := treat(l_suite.items(2) as ut3.ut_test); +-- +-- ut.expect(l_test.name).to_equal('test2'); +-- ut.expect(l_test.description).to_equal('A test description, though with comma, is assigned by suite_manager'); end; procedure setup_desc_with_comma is @@ -1029,7 +1016,7 @@ end;'; ut.fail('Cache not invalidated on package drop'); exception when others then - ut.expect(sqlerrm).to_be_like('%tst_package_to_be_dropped%not found%'); + ut.expect(sqlerrm).to_be_like('%tst_package_to_be_dropped%does not exist%'); end; end; From 8388276e6a937c52ce64889559d89e564d09bd9d Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sat, 3 Nov 2018 21:06:58 +0000 Subject: [PATCH 0061/1096] First stab --- .../data_values/ut_compound_data_diff_tmp.sql | 12 +- .../data_values/ut_compound_data_helper.pkb | 174 +++++++++++++++++- .../data_values/ut_compound_data_helper.pks | 14 +- .../data_values/ut_compound_data_value.tpb | 95 +++++++++- .../data_values/ut_compound_data_value.tps | 3 +- .../ut_curr_usr_compound_helper.pkb | 54 +++++- .../ut_curr_usr_compound_helper.pks | 3 +- .../data_values/ut_data_value_refcursor.tpb | 60 ++++-- .../data_values/ut_data_value_refcursor.tps | 6 + test/install_and_run_tests.sh | 1 + 10 files changed, 373 insertions(+), 49 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_diff_tmp.sql b/source/expectations/data_values/ut_compound_data_diff_tmp.sql index a7959d4aa..c285d78fd 100644 --- a/source/expectations/data_values/ut_compound_data_diff_tmp.sql +++ b/source/expectations/data_values/ut_compound_data_diff_tmp.sql @@ -12,10 +12,14 @@ create global temporary table ut_compound_data_diff_tmp( See the License for the specific language governing permissions and limitations under the License. */ - diff_id raw(128), - item_no integer, - pk_hash raw(128), - item_hash raw(128), + diff_id raw(128), + act_data_id raw(32), + exp_data_id raw(32), + act_item_data xmltype, + exp_item_data xmltype, + item_no integer, + pk_hash raw(128), + item_hash raw(128), duplicate_no integer, constraint ut_compound_data_diff_tmp_uk1 unique (diff_id,duplicate_no,item_no,item_hash, pk_hash), constraint ut_compound_data_diff_tmp_chk check( diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 9860d82bf..eaa24d1f6 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -166,6 +166,54 @@ create or replace package body ut_compound_data_helper is select replace((extract(a_item_data,a_join_by_xpath).getclobval()),chr(10)) into l_pk_value from dual; return l_pk_value; end; + + function get_rows_diff_by_sql( + a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, + a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2, + a_join_by_xpath varchar2 + ) return tt_row_diffs is + l_column_filter varchar2(32767); + l_results tt_row_diffs; + begin + l_column_filter := get_columns_row_filter(a_exclude_xpath,a_include_xpath); + + execute immediate q'[with diff_info as + ( select act_data_id, exp_data_id, + act_item_data,exp_item_data, :join_by join_by, item_no + from ut_compound_data_diff_tmp + where diff_id = :diff_id ), + exp as ( + select exp_item_data, exp_data_id, item_no rn,rownum col_no, + nvl2(exp_item_data,ut3.ut_compound_data_helper.get_pk_value(i.join_by,exp_item_data),null) pk_value, + s.column_value col, s.column_value.getRootElement() col_name, s.column_value.getclobval() col_val + from diff_info i, + table( xmlsequence( extract(i.exp_item_data,'/*/*') ) ) s + where i.exp_data_id = :self_guid), + act as ( + select act_item_data, act_data_id, item_no rn, rownum col_no, + nvl2(act_item_data,ut3.ut_compound_data_helper.get_pk_value(i.join_by,act_item_data),null) pk_value, + s.column_value col, s.column_value.getRootElement() col_name, s.column_value.getclobval() col_val + from diff_info i, + table( xmlsequence( extract(i.act_item_data,'/*/*') ) ) s + where i.act_data_id = :other_guid) + select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, pk_value pk_value + from ( + select nvl(exp.rn, act.rn) rn, nvl(exp.pk_value, act.pk_value) pk_value, exp.col exp_item, act.col act_item + from exp join act + on exp.rn = act.rn and exp.col_name = act.col_name + where dbms_lob.compare(exp.col_val, act.col_val) != 0) + unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:') ) + union all + select item_no as rn, case when exp_data_id is null then 'Extra' else 'Missing' end as diff_type, + xmlserialize(content nvl(exp_item_data, act_item_data) no indent) diffed_row, + nvl2(i.join_by,ut3.ut_compound_data_helper.get_pk_value(i.join_by,coalesce(exp_item_data,act_item_data)),null) pk_value + from diff_info i + where act_data_id is null or exp_data_id is null]' + bulk collect into l_results + using a_join_by_xpath, a_diff_id, a_expected_dataset_guid,a_actual_dataset_guid; + + return l_results; + end; function get_rows_diff( a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, @@ -438,9 +486,11 @@ create or replace package body ut_compound_data_helper is end; - function compare_type(a_join_by_xpath in varchar2,a_unordered boolean) return varchar2 is + function compare_type(a_join_by_xpath in varchar2,a_unordered boolean, a_is_sql_diffable integer := 0) return varchar2 is begin case + when a_is_sql_diffable = 1 then + return gc_compare_sql; when a_join_by_xpath is not null then return gc_compare_join_by; when a_unordered then @@ -453,23 +503,26 @@ create or replace package body ut_compound_data_helper is function get_rows_diff( a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2, - a_join_by_xpath varchar2,a_unorderdered boolean + a_join_by_xpath varchar2,a_unorderdered boolean, a_is_sql_diffable integer ) return tt_row_diffs is - l_results tt_row_diffs; - l_compare_type varchar2(10):= compare_type(a_join_by_xpath,a_unorderdered); + l_result tt_row_diffs := tt_row_diffs(); + l_compare_type varchar2(10):= compare_type(a_join_by_xpath,a_unorderdered, a_is_sql_diffable); begin case + when l_compare_type = gc_compare_sql then + l_result := get_rows_diff_by_sql(a_expected_dataset_guid, a_actual_dataset_guid, a_diff_id, + a_max_rows, a_exclude_xpath, a_include_xpath ,a_join_by_xpath); when l_compare_type = gc_compare_join_by then - return get_rows_diff(a_expected_dataset_guid, a_actual_dataset_guid, a_diff_id, + l_result := get_rows_diff(a_expected_dataset_guid, a_actual_dataset_guid, a_diff_id, a_max_rows, a_exclude_xpath, a_include_xpath ,a_join_by_xpath); when l_compare_type = gc_compare_unordered then - return get_rows_diff_unordered(a_expected_dataset_guid, a_actual_dataset_guid, a_diff_id, + l_result := get_rows_diff_unordered(a_expected_dataset_guid, a_actual_dataset_guid, a_diff_id, a_max_rows, a_exclude_xpath, a_include_xpath); else - return get_rows_diff(a_expected_dataset_guid, a_actual_dataset_guid, a_diff_id, + l_result := get_rows_diff(a_expected_dataset_guid, a_actual_dataset_guid, a_diff_id, a_max_rows, a_exclude_xpath, a_include_xpath); end case; - + return l_result; end; function get_hash(a_data raw, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash is @@ -565,7 +618,8 @@ create or replace package body ut_compound_data_helper is begin l_column_filter := ut_compound_data_helper.get_columns_filter(a_exclude_xpath, a_include_xpath); l_pk_hash_sql := get_column_pk_hash(a_join_by_xpath); - + + --Use a item hash as pk hash for unordered execute immediate 'merge into ' || l_ut_owner || '.ut_compound_data_tmp tgt using ( select ucd_out.item_hash, @@ -690,6 +744,7 @@ create or replace package body ut_compound_data_helper is return l_sql; end; + -- TODO:Rebuild as the unordered can be done using join_by compare function get_refcursor_matcher_sql(a_owner in varchar2,a_inclusion_matcher boolean := false, a_negated_match boolean := false) return varchar2 is l_sql varchar2(32767); begin @@ -704,6 +759,105 @@ create or replace package body ut_compound_data_helper is return l_sql; end; - + + function generate_xmltab_stmt (a_column_info xmltype) return varchar2 is + l_sql_stmt varchar2(32767); + begin + for i in (select /*+ CARDINALITY(xt 100) */ + xt.name + from (select a_column_info item_data from dual) x, + xmltable( + '/ROW/*' + passing x.item_data + columns + name varchar2(4000) PATH '@xml_valid_name' + ) xt) + loop + l_sql_stmt := l_sql_stmt || case when l_sql_stmt is null then null else ',' end ||i.name||q'[ varchar2(4000) PATH ']'||i.name||q'[']'; + end loop; + return l_sql_stmt; + end; + + function generate_equal_sql (a_column_info xmltype) return varchar2 is + l_sql_stmt varchar2(32767); + begin + for i in (select /*+ CARDINALITY(xt 100) */ + xt.name + from (select a_column_info item_data from dual) x, + xmltable( + '/ROW/*' + passing x.item_data + columns + name varchar2(4000) PATH '@xml_valid_name' + ) xt) + loop + l_sql_stmt := l_sql_stmt || case when l_sql_stmt is null then null else ' and ' end ||' a.'||i.name||q'[ = ]'||' e.'||i.name; + end loop; + return l_sql_stmt; + end; + + function generate_not_equal_sql (a_column_info xmltype, a_join_by_xpath varchar2) return varchar2 is + l_sql_stmt varchar2(32767); + l_pk_xpath_tabs ut_varchar2_list := ut_varchar2_list(); + begin + l_pk_xpath_tabs := ut_utils.string_to_table(a_join_by_xpath,'|'); + + for i in ( + with xpaths_tab as (select column_value xpath from table(l_pk_xpath_tabs)), + pk_names as (select REGEXP_SUBSTR (xpath,'[^(/\*/)](.+)$') name + from xpaths_tab) + select /*+ CARDINALITY(xt 100) */ + xt.name + from (select a_column_info item_data from dual) x, + xmltable( + '/ROW/*' + passing x.item_data + columns + name varchar2(4000) PATH '@xml_valid_name' + ) xt + where not exists (select 1 from pk_names p where lower(p.name) = lower(xt.name)) + ) + loop + l_sql_stmt := l_sql_stmt || case when l_sql_stmt is null then null else ' or ' end ||' a.'||i.name||q'[ <> ]'||' e.'||i.name; + end loop; + return l_sql_stmt; + end; + + function generate_join_by_on_stmt (a_column_info xmltype, a_join_by_xpath varchar2) return varchar2 is + l_sql_stmt varchar2(32767); + l_pk_xpath_tabs ut_varchar2_list := ut_varchar2_list(); + + begin + l_pk_xpath_tabs := ut_utils.string_to_table(a_join_by_xpath,'|'); + + for i in (with xpaths_tab as (select column_value xpath from table(l_pk_xpath_tabs)) + select REGEXP_SUBSTR (xpath,'[^(/\*/)](.+)$') name + from xpaths_tab) + loop + l_sql_stmt := l_sql_stmt || case when l_sql_stmt is null then null else ' and ' end ||' a.'||i.name||q'[ = ]'||' e.'||i.name; + end loop; + return l_sql_stmt; + end; + + function generate_join_null_sql (a_column_info xmltype, a_join_by_xpath varchar2) return varchar2 is + l_sql_stmt varchar2(32767); + l_pk_xpath_tabs ut_varchar2_list := ut_varchar2_list(); + + begin + l_pk_xpath_tabs := ut_utils.string_to_table(a_join_by_xpath,'|'); + + for i in (with xpaths_tab as (select column_value xpath from table(l_pk_xpath_tabs)) + select REGEXP_SUBSTR (xpath,'[^(/\*/)](.+)$') name + from xpaths_tab) + loop + l_sql_stmt := l_sql_stmt || case + when l_sql_stmt is null + then null + else ' or ' + end ||' a.'||i.name||q'[ is null or ]'||' e.'||i.name||q'[ is null]'; + end loop; + return l_sql_stmt; + end; + end; / diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index e992fd48b..e092576a8 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -19,6 +19,7 @@ create or replace package ut_compound_data_helper authid definer is gc_compare_join_by constant varchar2(10):='join_by'; gc_compare_unordered constant varchar2(10):='unordered'; gc_compare_normal constant varchar2(10):='normal'; + gc_compare_sql constant varchar2(10):='sql'; type t_column_diffs is record( diff_type varchar2(1), @@ -61,12 +62,12 @@ create or replace package ut_compound_data_helper authid definer is function get_pk_value (a_join_by_xpath varchar2,a_item_data xmltype) return clob; - function compare_type(a_join_by_xpath in varchar2,a_unordered boolean) return varchar2; + function compare_type(a_join_by_xpath in varchar2,a_unordered boolean, a_is_sql_diffable integer := 0) return varchar2; function get_rows_diff( a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2, - a_join_by_xpath varchar2,a_unorderdered boolean + a_join_by_xpath varchar2,a_unorderdered boolean, a_is_sql_diffable integer ) return tt_row_diffs; subtype t_hash is raw(128); @@ -85,6 +86,15 @@ create or replace package ut_compound_data_helper authid definer is procedure update_row_and_pk_hash(a_self_data_id in raw, a_other_data_id in raw, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2); + + function generate_xmltab_stmt (a_column_info xmltype) return varchar2; + + function generate_equal_sql (a_column_info xmltype) return varchar2; + function generate_not_equal_sql (a_column_info xmltype, a_join_by_xpath varchar2) return varchar2; + + function generate_join_by_on_stmt (a_column_info xmltype, a_join_by_xpath varchar2) return varchar2; + + function generate_join_null_sql (a_column_info xmltype, a_join_by_xpath varchar2) return varchar2; end; / diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index 49fe272eb..5dc099189 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -88,14 +88,18 @@ create or replace type body ut_compound_data_value as l_diff_id ut_compound_data_helper.t_hash; l_row_diffs ut_compound_data_helper.tt_row_diffs; l_compare_type varchar2(10); + l_self ut_compound_data_value; + l_is_sql_diff integer := 0; function get_diff_message (a_row_diff ut_compound_data_helper.t_row_diffs,a_compare_type varchar2) return varchar2 is begin - if a_compare_type = ut_compound_data_helper.gc_compare_join_by and a_row_diff.pk_value is not null then + if a_compare_type in (ut_compound_data_helper.gc_compare_join_by,ut_compound_data_helper.gc_compare_sql) + and a_row_diff.pk_value is not null then return ' PK '||a_row_diff.pk_value||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; elsif a_compare_type = ut_compound_data_helper.gc_compare_join_by or a_compare_type = ut_compound_data_helper.gc_compare_normal then return ' Row No. '||a_row_diff.rn||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; - elsif a_compare_type = ut_compound_data_helper.gc_compare_unordered then + elsif a_compare_type in (ut_compound_data_helper.gc_compare_unordered,ut_compound_data_helper.gc_compare_sql) + and a_row_diff.pk_value is null then return rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; end if; end; @@ -104,6 +108,11 @@ create or replace type body ut_compound_data_value as if not a_other is of (ut_compound_data_value) then raise value_error; end if; + + if self is of (ut_data_value_refcursor) then + l_is_sql_diff := treat(self as ut_data_value_refcursor).is_sql_diffable; + end if; + l_actual := treat(a_other as ut_compound_data_value); dbms_lob.createtemporary(l_result,true); @@ -112,14 +121,20 @@ create or replace type body ut_compound_data_value as l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_actual.data_id); -- First tell how many rows are different - execute immediate 'select count('||case when a_join_by_xpath is not null then 'distinct pk_hash' else '*' end||') from ' - || l_ut_owner || '.ut_compound_data_diff_tmp - where diff_id = :diff_id' into l_diff_row_count using l_diff_id; + execute immediate 'select count(' + ||case when ( a_join_by_xpath is not null and l_is_sql_diff = 0 ) + then 'distinct pk_hash' + else '*' + end + ||') from '|| l_ut_owner || '.ut_compound_data_diff_tmp ' + ||'where diff_id = :diff_id' + into l_diff_row_count using l_diff_id; if l_diff_row_count > 0 then - l_compare_type := ut_compound_data_helper.compare_type(a_join_by_xpath,a_unordered); + l_compare_type := ut_compound_data_helper.compare_type(a_join_by_xpath,a_unordered, l_is_sql_diff); l_row_diffs := ut_compound_data_helper.get_rows_diff( - self.data_id, l_actual.data_id, l_diff_id, c_max_rows, a_exclude_xpath, a_include_xpath, a_join_by_xpath, a_unordered); + self.data_id, l_actual.data_id, l_diff_id, c_max_rows, a_exclude_xpath, + a_include_xpath, a_join_by_xpath, a_unordered, l_is_sql_diff); l_message := chr(10) ||'Rows: [ ' || l_diff_row_count ||' differences' || case when l_diff_row_count > c_max_rows and l_row_diffs.count > 0 then ', showing first '||c_max_rows end @@ -247,5 +262,71 @@ create or replace type body ut_compound_data_value as return l_result; end; + member function compare_implementation_by_sql(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_inclusion_compare boolean := false) return integer is + l_compare_sql varchar2(32767); + l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_actual ut_data_value_refcursor := treat(a_other as ut_data_value_refcursor); + l_diff_id ut_compound_data_helper.t_hash; + l_table_stmt varchar2(32767); + l_where_stmt varchar2(32767); + l_join_by_stmt varchar2(32767); + l_exec_sql varchar2(32767); + l_other ut_compound_data_value; + l_result integer; + begin + + -- TODO : Add column filters!!!! + l_other := treat(a_other as ut_compound_data_value); + l_table_stmt := ut_compound_data_helper.generate_xmltab_stmt(l_actual.columns_info); + l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); + + l_compare_sql := q'[with exp as (select xt.*,x.item_no,x.data_id from (select item_data,item_no,data_id from ]' || l_ut_owner || q'[.ut_compound_data_tmp where data_id = :self_guid) x,]' + ||q'[xmltable('/ROWSET/ROW' passing x.item_data columns ]' + ||l_table_stmt||q'[ ,item_data xmltype PATH '*' ) xt),]' + ||q'[act as (select xt.*, x.item_no,x.data_id from (select item_data,item_no,data_id from ]' || l_ut_owner || q'[.ut_compound_data_tmp where data_id = :other_guid) x,]' + ||q'[xmltable('/ROWSET/ROW' passing x.item_data columns ]' || + l_table_stmt||q'[ ,item_data xmltype PATH '*') xt)]'; + + if a_join_by_xpath is null then + -- If no key defined do the join on all columns + l_join_by_stmt := ut_compound_data_helper.generate_equal_sql(l_actual.columns_info); + l_compare_sql := l_compare_sql || q'[select a.item_data act_item_data, a.data_id act_data_id, e.item_data exp_item_data, e.data_id exp_data_id ]' + || q'[from act a full outer join exp e on ( ]' + ||l_join_by_stmt||q'[ ) where a.data_id is null or e.data_id is null]'; + else + -- If key defined do the join or these and where on diffrences + l_where_stmt := ut_compound_data_helper.generate_not_equal_sql(l_actual.columns_info, a_join_by_xpath); + --l_join_is_null := ut_compound_data_helper.generate_join_null_sql(l_actual.columns_info, a_join_by_xpath); + l_join_by_stmt := ut_compound_data_helper.generate_join_by_on_stmt (l_actual.columns_info, a_join_by_xpath); + l_compare_sql := l_compare_sql || 'select a.item_data act_item_data, a.data_id act_data_id,' + ||' e.item_data exp_item_data, e.data_id exp_data_id from act a full outer join exp e on ( ' + ||l_join_by_stmt||' ) ' + ||' where '|| + case + when l_where_stmt is null then + null + else + '( '||l_where_stmt||' ) or' + end + ||'( a.data_id is null or e.data_id is null )'; + end if; + + l_exec_sql := 'insert into ' || l_ut_owner || '.ut_compound_data_diff_tmp ' + ||'( diff_id, act_item_data, act_data_id, exp_item_data, exp_data_id, item_no )' + ||' select :diff_id, nvl2(act_item_data,xmlelement( name "ROW", act_item_data),null) act_item_data, act_data_id,' + ||' nvl2(exp_item_data,xmlelement( name "ROW", exp_item_data),null) exp_item_data, exp_data_id , rownum ' + ||'from ( '|| l_compare_sql ||')'; + + execute immediate l_exec_sql using l_diff_id, self.data_id,l_actual.data_id; + --result is OK only if both are same + if sql%rowcount = 0 and self.elements_count = l_other.elements_count then + l_result := 0; + else + l_result := 1; + end if; + return l_result; + + end; + end; / diff --git a/source/expectations/data_values/ut_compound_data_value.tps b/source/expectations/data_values/ut_compound_data_value.tps index 51d88c6f8..76a3b09e8 100644 --- a/source/expectations/data_values/ut_compound_data_value.tps +++ b/source/expectations/data_values/ut_compound_data_value.tps @@ -45,6 +45,7 @@ create or replace type ut_compound_data_value force under ut_data_value( member function get_data_diff(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean) return clob, member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2) return integer, member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, - a_unordered boolean , a_inclusion_compare boolean := false, a_is_negated boolean := false) return integer + a_unordered boolean , a_inclusion_compare boolean := false, a_is_negated boolean := false) return integer, + member function compare_implementation_by_sql(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_inclusion_compare boolean := false) return integer ) not final not instantiable / diff --git a/source/expectations/data_values/ut_curr_usr_compound_helper.pkb b/source/expectations/data_values/ut_curr_usr_compound_helper.pkb index b610ee13c..de8aa6614 100644 --- a/source/expectations/data_values/ut_curr_usr_compound_helper.pkb +++ b/source/expectations/data_values/ut_curr_usr_compound_helper.pkb @@ -6,7 +6,8 @@ create or replace package body ut_curr_usr_compound_helper is g_anytype_collection_name t_type_name_map; g_user_defined_type pls_integer := dbms_sql.user_defined_type; g_is_collection boolean := false; - + g_is_sql_diffable boolean := false; + procedure set_collection_state(a_is_collection boolean) is begin --Make sure that we set a g_is_collection only once so we dont reset from true to false. @@ -15,6 +16,28 @@ create or replace package body ut_curr_usr_compound_helper is end if; end; + procedure set_sql_diff_state(a_is_sql_diff boolean) is + begin + --Make sure that we set a g_is_collection only once so we dont reset from true to false. + if not g_is_sql_diffable then + g_is_sql_diffable := a_is_sql_diff; + end if; + end; + + function is_sql_compare_allowed(a_type_name varchar2) return boolean is + begin + --clob/blob/xmltype/object/nestedcursor/nestedtable + if a_type_name IN (g_anytype_name_map(dbms_types.typecode_blob), + g_anytype_name_map(dbms_types.typecode_clob), + g_anytype_name_map(dbms_types.typecode_bfile), + g_anytype_name_map(dbms_types.typecode_varray)) + then + return false; + else + return true; + end if; + end; + function get_column_type(a_desc_rec dbms_sql.desc_rec3, a_desc_user_types boolean := false) return ut_key_anyval_pair is l_data ut_data_value; l_result ut_key_anyval_pair; @@ -34,16 +57,26 @@ create or replace package body ut_curr_usr_compound_helper is begin if g_type_name_map.exists(a_desc_rec.col_type) then l_data := ut_data_value_varchar2(g_type_name_map(a_desc_rec.col_type)); + set_sql_diff_state(is_sql_compare_allowed(g_type_name_map(a_desc_rec.col_type))); /*If its a collection regardless is we want to describe user defined types we will return just a name and capture that name */ elsif a_desc_rec.col_type = g_user_defined_type and is_collection(a_desc_rec.col_schema_name,a_desc_rec.col_type_name) then l_data := ut_data_value_varchar2(a_desc_rec.col_schema_name||'.'||a_desc_rec.col_type_name); + set_sql_diff_state(false); set_collection_state(true); elsif a_desc_rec.col_type = g_user_defined_type and a_desc_user_types then - l_data :=ut_data_value_xmltype(get_user_defined_type(a_desc_rec.col_schema_name,a_desc_rec.col_type_name)); + if a_desc_rec.col_type_name = 'XMLTYPE' + then + l_data := ut_data_value_varchar2(a_desc_rec.col_type_name); + else + l_data :=ut_data_value_xmltype(get_user_defined_type(a_desc_rec.col_schema_name,a_desc_rec.col_type_name)); + end if; + set_sql_diff_state(false); elsif a_desc_rec.col_schema_name is not null and a_desc_rec.col_type_name is not null then l_data := ut_data_value_varchar2(a_desc_rec.col_schema_name||'.'||a_desc_rec.col_type_name); + set_sql_diff_state(false); end if; + return ut_key_anyval_pair(a_desc_rec.col_name,l_data); end; @@ -56,6 +89,7 @@ create or replace package body ut_curr_usr_compound_helper is l_result.extend; l_result(l_result.last) := get_column_type(a_columns_tab(i),a_desc_user_types); end loop; + return l_result; end; @@ -83,7 +117,8 @@ create or replace package body ut_curr_usr_compound_helper is a_cursor in out nocopy sys_refcursor, a_columns_info out nocopy xmltype, a_join_by_info out nocopy xmltype, - a_contains_collection out nocopy number + a_contains_collection out nocopy number, + a_is_sql_diffable out nocopy number ) is l_columns_info xmltype; l_join_by_info xmltype; @@ -110,6 +145,7 @@ create or replace package body ut_curr_usr_compound_helper is into a_columns_info,a_join_by_info from dual; a_contains_collection := ut_utils.boolean_to_int(g_is_collection); + a_is_sql_diffable := ut_utils.boolean_to_int(g_is_sql_diffable); end; function get_anytype_attribute_count (a_anytype anytype) return pls_integer is @@ -133,7 +169,7 @@ create or replace package body ut_curr_usr_compound_helper is schema_name => l_schema_name, type_name => l_type_name, version => l_version, - numelems => l_attributes); + numelems => l_attributes); return l_attributes; end; @@ -147,7 +183,11 @@ create or replace package body ut_curr_usr_compound_helper is l_csid pls_integer; l_csfrm pls_integer; l_attr_elt_type anytype; + l_attributes_cnt pls_integer; begin + l_attributes_cnt := NVL(get_anytype_attribute_count(a_anytype),0); + + if l_attributes_cnt > 0 then for i in 1..get_anytype_attribute_count(a_anytype) loop l_attribute_typecode := a_anytype.getAttrElemInfo( pos => i, --First attribute @@ -166,6 +206,9 @@ create or replace package body ut_curr_usr_compound_helper is set_collection_state(true); end if; end loop; + end if; + + return l_result; end; @@ -174,8 +217,7 @@ create or replace package body ut_curr_usr_compound_helper is l_anytype anytype; l_typecode pls_integer; l_result xmltype; - l_columns_tab ut_key_value_pairs := ut_key_value_pairs(); - + l_columns_tab ut_key_value_pairs := ut_key_value_pairs(); begin execute immediate 'declare l_v '||a_owner||'.'||a_type_name||'; diff --git a/source/expectations/data_values/ut_curr_usr_compound_helper.pks b/source/expectations/data_values/ut_curr_usr_compound_helper.pks index d662f51f9..039b8bfe9 100644 --- a/source/expectations/data_values/ut_curr_usr_compound_helper.pks +++ b/source/expectations/data_values/ut_curr_usr_compound_helper.pks @@ -4,7 +4,8 @@ create or replace package ut_curr_usr_compound_helper authid current_user is a_cursor in out nocopy sys_refcursor, a_columns_info out nocopy xmltype, a_join_by_info out nocopy xmltype, - a_contains_collection out nocopy number + a_contains_collection out nocopy number, + a_is_sql_diffable out nocopy number ); function get_user_defined_type(a_owner varchar2, a_type_name varchar2) return xmltype; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 5266a90bf..e253abfc6 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -23,13 +23,15 @@ create or replace type body ut_data_value_refcursor as end; member procedure init(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) is - c_bulk_rows constant integer := 1000; + c_bulk_rows constant integer := 5000; l_cursor sys_refcursor := a_value; l_ctx number; l_xml xmltype; l_current_date_format varchar2(4000); cursor_not_open exception; l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_set_id integer := 1; + begin self.is_data_null := ut_utils.boolean_to_int(a_value is null); self.self_type := $$plsql_unit; @@ -38,11 +40,11 @@ create or replace type body ut_data_value_refcursor as if l_cursor is not null then if l_cursor%isopen then --Get some more info regarding cursor, including if it containts collection columns and what is their name - + ut_curr_usr_compound_helper.get_columns_info(l_cursor,self.columns_info,self.key_info, - self.contain_collection); - + self.contain_collection,self.is_sql_diffable); self.elements_count := 0; + -- We use DBMS_XMLGEN in order to: -- 1) be able to process data in bulks (set of rows) -- 2) be able to influence the ROWSET/ROW tags @@ -60,20 +62,35 @@ create or replace type body ut_data_value_refcursor as dbms_xmlgen.setNullHandling(l_ctx, dbms_xmlgen.empty_tag); dbms_xmlgen.setMaxRows(l_ctx, c_bulk_rows); - loop - l_xml := dbms_xmlgen.getxmltype(l_ctx); - - execute immediate - 'insert into ' || l_ut_owner || '.ut_compound_data_tmp(data_id, item_no, item_data) ' || - 'select :self_guid, :self_row_count + rownum, value(a) ' || - ' from table( xmlsequence( extract(:l_xml,''ROWSET/*'') ) ) a' - using in self.data_id, self.elements_count, l_xml; + if self.is_sql_diffable = 1 then + loop + l_xml := dbms_xmlgen.getxmltype(l_ctx); + exit when dbms_xmlgen.getNumRowsProcessed(l_ctx) = 0; - exit when sql%rowcount = 0; + self.elements_count := self.elements_count + dbms_xmlgen.getNumRowsProcessed(l_ctx); + execute immediate + 'insert into ' || l_ut_owner || '.ut_compound_data_tmp(data_id, item_no, item_data) ' || + 'values (:self_guid, :self_row_count, :l_xml)' + using in self.data_id, l_set_id, l_xml; + + l_set_id := l_set_id + 1; + end loop; + else + loop + l_xml := dbms_xmlgen.getxmltype(l_ctx); + execute immediate + 'insert into ' || l_ut_owner || '.ut_compound_data_tmp(data_id, item_no, item_data) ' || + 'select :self_guid, :self_row_count + rownum, value(a) ' || + ' from table( xmlsequence( extract(:l_xml,''ROWSET/*'') ) ) a' + using in self.data_id, self.elements_count, l_xml; - self.elements_count := self.elements_count + sql%rowcount; - end loop; - + exit when sql%rowcount = 0; + + self.elements_count := self.elements_count + sql%rowcount; + end loop; + + end if; + ut_expectation_processor.reset_nls_params(); if l_cursor%isopen then close l_cursor; @@ -250,8 +267,15 @@ create or replace type body ut_data_value_refcursor as end if; if a_unordered then - l_result := l_result + (self as ut_compound_data_value).compare_implementation(a_other, a_exclude_xpath, a_include_xpath, - a_join_by_xpath, a_unordered, a_inclusion_compare, a_is_negated); + if self.is_sql_diffable = 1 then + --TODO: :Treat unorder as pk by on all rows + l_result := l_result + (self as ut_compound_data_value).compare_implementation_by_sql(a_other, a_exclude_xpath, a_include_xpath, + a_join_by_xpath, a_inclusion_compare); + else + --We will make a decision about type of data inside whether we dump into table or do normal row by row + l_result := l_result + (self as ut_compound_data_value).compare_implementation(a_other, a_exclude_xpath, a_include_xpath, + a_join_by_xpath, a_unordered, a_inclusion_compare); + end if; else l_result := l_result + (self as ut_compound_data_value).compare_implementation(a_other, a_exclude_xpath, a_include_xpath); end if; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tps b/source/expectations/data_values/ut_data_value_refcursor.tps index 36c231887..5972f710c 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tps +++ b/source/expectations/data_values/ut_data_value_refcursor.tps @@ -40,6 +40,12 @@ create or replace type ut_data_value_refcursor under ut_compound_data_value( */ key_info xmltype, + /** + * Hold info if type contain any of the nonstandard user types which defines way we do compare later. + * Types of clob/blob/xmltype/object/nestedcursor/nestedtable will force into hash + */ + is_sql_diffable number(1,0), + constructor function ut_data_value_refcursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) return self as result, member procedure init(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor), overriding member function to_string return varchar2, diff --git a/test/install_and_run_tests.sh b/test/install_and_run_tests.sh index b8aba77e2..80a777c10 100644 --- a/test/install_and_run_tests.sh +++ b/test/install_and_run_tests.sh @@ -30,6 +30,7 @@ time "$SQLCLI" ${UT3_TESTER}/${UT3_TESTER_PASSWORD}@//${CONNECTION_STR} @install cd .. + time utPLSQL-cli/bin/utplsql run ${UT3_TESTER}/${UT3_TESTER_PASSWORD}@${CONNECTION_STR} \ -source_path=source -owner=ut3 \ -test_path=test -c \ From 1611e09b15c5896c9146fe60c7f8b836250c3cea Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 4 Nov 2018 18:30:31 +0000 Subject: [PATCH 0062/1096] Interim commit some fixes to old tests, examples and code itself. One problem to be solved. Oracle nested tables are **unordered!** and we need an ordered list of before/after items that contain CLOB column, so cannot be varray. --- ...nExampleComplexSuiteWithCustomReporter.sql | 8 +- .../RunExampleTestSuite.sql | 6 +- ...nExampleTestSuiteWithCompositeReporter.sql | 6 +- .../RunExampleTestSuiteWithCustomReporter.sql | 6 +- ...rter.providesCorrectLineFromStacktrace.sql | 2 +- ...e_manager.CacheInvalidaesOnPackageDrop.sql | 12 +- ..._packages.IncludesPackagesWithSutePath.sql | 13 +- .../ut_test/ut_test.AfterEachExecuted.sql | 5 +- .../ut_test.AfterEachProcedureNameInvalid.sql | 5 +- .../ut_test.AfterEachProcedureNameNull.sql | 5 +- .../ut_test/ut_test.BeforeEachExecuted.sql | 5 +- ...ut_test.BeforeEachProcedureNameInvalid.sql | 5 +- .../ut_test.BeforeEachProcedureNameNull.sql | 5 +- ...est.IgnoreTollbackToSavepointException.sql | 2 +- .../ut_test/ut_test.OwnerNameInvalid.sql | 6 +- old_tests/ut_test/ut_test.OwnerNameNull.sql | 6 +- .../ut_test/ut_test.PackageInInvalidState.sql | 2 +- .../ut_test/ut_test.PackageNameInvalid.sql | 2 +- old_tests/ut_test/ut_test.PackageNameNull.sql | 2 +- .../ut_test/ut_test.ProcedureNameInvalid.sql | 2 +- .../ut_test/ut_test.ProcedureNameNull.sql | 2 +- .../ut_test.SetupExecutedBeforeTest.sql | 5 +- .../ut_test.SetupProcedureNameInvalid.sql | 5 +- .../ut_test.SetupProcedureNameNull.sql | 5 +- .../ut_test.TeardownExecutedAfterTest.sql | 5 +- .../ut_test.TeardownProcedureNameInvalid.sql | 5 +- .../ut_test.TeardownProcedureNameNull.sql | 5 +- .../annotations/ut_annotation_cache_seq.sql | 2 +- source/core/ut_suite_builder.pkb | 18 +- source/core/ut_suite_cache.sql | 12 +- source/core/ut_suite_cache_manager.pkb | 185 +++++++++--------- source/core/ut_suite_cache_manager.pks | 7 +- source/core/ut_suite_cache_package.sql | 23 +++ source/core/ut_suite_cache_seq.sql | 16 ++ .../create_synonyms_and_grants_for_public.sql | 1 + source/create_user_grants.sql | 1 + source/install.sql | 2 + test/core/test_suite_builder.pkb | 2 +- 38 files changed, 250 insertions(+), 156 deletions(-) create mode 100644 source/core/ut_suite_cache_package.sql create mode 100644 source/core/ut_suite_cache_seq.sql diff --git a/examples/developer_examples/RunExampleComplexSuiteWithCustomReporter.sql b/examples/developer_examples/RunExampleComplexSuiteWithCustomReporter.sql index 1b9e94bfb..406a1cba2 100644 --- a/examples/developer_examples/RunExampleComplexSuiteWithCustomReporter.sql +++ b/examples/developer_examples/RunExampleComplexSuiteWithCustomReporter.sql @@ -22,8 +22,8 @@ begin ut_event_manager.initialize(); l_parent_suite := ut_logical_suite( a_object_owner=>null, a_object_name => null, a_name => 'complex_test_suite', a_path => null); - l_suite := ut_suite(user, 'ut_exampletest'); - l_test := ut_test(user, 'ut_exampletest','ut_exAmpletest'); + l_suite := ut_suite(user, 'ut_exampletest',a_line_no=>1); + l_test := ut_test(user, 'ut_exampletest','ut_exAmpletest',a_line_no=>3); l_test.description := 'Example test1'; l_test.before_test_list := ut_executables(ut_executable(user, 'ut_exampletest','Setup',ut_utils.gc_before_test)); l_test.after_test_list := ut_executables(ut_executable(user, 'ut_exampletest','tEardown',ut_utils.gc_after_test)); @@ -32,8 +32,8 @@ begin l_parent_suite.add_item(l_suite); - l_suite := ut_suite(user, 'ut_exampletest2'); - l_test := ut_test(user, 'UT_EXAMPLETEST2','UT_EXAMPLETEST'); + l_suite := ut_suite(user, 'ut_exampletest2',a_line_no=>1); + l_test := ut_test(user, 'UT_EXAMPLETEST2','UT_EXAMPLETEST',a_line_no=>3); l_test.before_test_list := ut_executables(ut_executable(user, 'UT_EXAMPLETEST2','SETUP',ut_utils.gc_before_test)); l_test.after_test_list := ut_executables(ut_executable(user, 'UT_EXAMPLETEST2','TEARDOWN',ut_utils.gc_after_test)); diff --git a/examples/developer_examples/RunExampleTestSuite.sql b/examples/developer_examples/RunExampleTestSuite.sql index a0a470e46..7b01d1154 100644 --- a/examples/developer_examples/RunExampleTestSuite.sql +++ b/examples/developer_examples/RunExampleTestSuite.sql @@ -15,15 +15,15 @@ declare l_test ut_test; l_expectation ut_expectation_result; begin - l_suite := ut_suite(user, 'ut_exampletest'); + l_suite := ut_suite(user, 'ut_exampletest',a_line_no=>1); l_suite.description := 'Test Suite Name'; - l_test := ut_test(user, 'ut_exampletest','ut_exAmpletest'); + l_test := ut_test(user, 'ut_exampletest','ut_exAmpletest',a_line_no=>3); l_test.description := 'Example test1'; l_test.before_test_list := ut_executables(ut_executable(user, 'ut_exampletest','Setup',ut_utils.gc_before_test)); l_test.after_test_list := ut_executables(ut_executable(user, 'ut_exampletest','tEardown',ut_utils.gc_after_test)); l_suite.add_item(l_test); - l_test := ut_test(user, 'UT_EXAMPLETEST2','ut_exAmpletest'); + l_test := ut_test(user, 'UT_EXAMPLETEST2','ut_exAmpletest',a_line_no=>6); l_test.description := 'Another example test'; l_test.before_test_list := ut_executables(ut_executable(user, 'UT_EXAMPLETEST2','SETUP',ut_utils.gc_before_test)); l_test.after_test_list := ut_executables(ut_executable(user, 'UT_EXAMPLETEST2','TEARDOWN',ut_utils.gc_after_test)); diff --git a/examples/developer_examples/RunExampleTestSuiteWithCompositeReporter.sql b/examples/developer_examples/RunExampleTestSuiteWithCompositeReporter.sql index 4f9172510..8876f0874 100644 --- a/examples/developer_examples/RunExampleTestSuiteWithCompositeReporter.sql +++ b/examples/developer_examples/RunExampleTestSuiteWithCompositeReporter.sql @@ -21,11 +21,11 @@ begin ut_event_manager.add_listener(l_doc_reporter); ut_event_manager.add_listener(l_tc_reporter); - suite := ut_suite(user, 'ut_exampletest'); + suite := ut_suite(user, 'ut_exampletest',a_line_no=>1); suite.description := 'Test Suite Name'; - suite.add_item(ut_test(user,'ut_exampletest','ut_exAmpletest')); - suite.add_item(ut_test(user, 'UT_EXAMPLETEST2','UT_EXAMPLETEST')); + suite.add_item(ut_test(user,'ut_exampletest','ut_exAmpletest',a_line_no=>3)); + suite.add_item(ut_test(user, 'UT_EXAMPLETEST2','UT_EXAMPLETEST',a_line_no=>6)); -- provide a reporter to process results l_run := ut_run(ut_suite_items(suite)); diff --git a/examples/developer_examples/RunExampleTestSuiteWithCustomReporter.sql b/examples/developer_examples/RunExampleTestSuiteWithCustomReporter.sql index 59fe15662..e9403809e 100644 --- a/examples/developer_examples/RunExampleTestSuiteWithCustomReporter.sql +++ b/examples/developer_examples/RunExampleTestSuiteWithCustomReporter.sql @@ -22,15 +22,15 @@ begin ut_event_manager.initialize(); -- Install ut_custom_reporter first from example folder - l_suite := ut_suite(user, 'ut_exampletest'); + l_suite := ut_suite(user, 'ut_exampletest',a_line_no=>1); - l_test := ut_test(user, 'ut_exampletest','ut_exAmpletest'); + l_test := ut_test(user, 'ut_exampletest','ut_exAmpletest',a_line_no=>3); l_test.description := 'Example test1'; l_test.before_test_list := ut_executables(ut_executable(user, 'ut_exampletest','Setup',ut_utils.gc_before_test)); l_test.after_test_list := ut_executables(ut_executable(user, 'ut_exampletest','tEardown',ut_utils.gc_after_test)); l_suite.add_item(l_test); - l_test := ut_test(user, 'UT_EXAMPLETEST2','ut_exAmpletest'); + l_test := ut_test(user, 'UT_EXAMPLETEST2','ut_exAmpletest',a_line_no=>6); l_test.description := 'Another example test'; l_test.before_test_list := ut_executables(ut_executable(user, 'ut_exampletest','SETUP',ut_utils.gc_before_test)); l_test.after_test_list := ut_executables(ut_executable(user, 'ut_exampletest','TEARDOWN',ut_utils.gc_after_test)); diff --git a/old_tests/ut_reporters/ut_documentation_reporter.providesCorrectLineFromStacktrace.sql b/old_tests/ut_reporters/ut_documentation_reporter.providesCorrectLineFromStacktrace.sql index 66cf41b32..f155117fe 100644 --- a/old_tests/ut_reporters/ut_documentation_reporter.providesCorrectLineFromStacktrace.sql +++ b/old_tests/ut_reporters/ut_documentation_reporter.providesCorrectLineFromStacktrace.sql @@ -18,7 +18,7 @@ Finished % --act select * bulk collect into l_output_data - from table(ut.run('test_reporters',ut_documentation_reporter())); + from table(ut.run(':org.utplsql.utplsql.test.test_reporters',ut_documentation_reporter())); l_output := ut_utils.table_to_clob(l_output_data); diff --git a/old_tests/ut_suite_manager/ut_suite_manager.CacheInvalidaesOnPackageDrop.sql b/old_tests/ut_suite_manager/ut_suite_manager.CacheInvalidaesOnPackageDrop.sql index 6581a9eeb..9715eae8b 100644 --- a/old_tests/ut_suite_manager/ut_suite_manager.CacheInvalidaesOnPackageDrop.sql +++ b/old_tests/ut_suite_manager/ut_suite_manager.CacheInvalidaesOnPackageDrop.sql @@ -28,19 +28,23 @@ drop package tst_package_to_be_dropped set termout on declare - l_test_report ut_varchar2_list; + l_test_report ut_varchar2_list; + l_error_message varchar2(4000); + l_expected varchar2(4000); begin + l_expected := '%tst_package_to_be_dropped%does not exist%'; begin select * bulk collect into l_test_report from table(ut.run(user || '.tst_package_to_be_dropped')); exception when others then - if sqlerrm like '%tst_package_to_be_dropped%not found%' then + l_error_message := sqlerrm; + if l_error_message like l_expected then :test_result := ut_utils.gc_success; end if; end; if :test_result != ut_utils.gc_success or :test_result is null then - dbms_output.put_line('Failed: Expected exception with text like ''%tst_package_to_be_dropped%not found%'' but got:''' || - sqlerrm || ''''); + dbms_output.put_line('Failed: Expected exception with text like '''||l_expected||''' but got:''' || + l_error_message || ''''); end if; end; / diff --git a/old_tests/ut_suite_manager/ut_suite_manager.get_schema_ut_packages.IncludesPackagesWithSutePath.sql b/old_tests/ut_suite_manager/ut_suite_manager.get_schema_ut_packages.IncludesPackagesWithSutePath.sql index 3023c28f0..0f446b7bf 100644 --- a/old_tests/ut_suite_manager/ut_suite_manager.get_schema_ut_packages.IncludesPackagesWithSutePath.sql +++ b/old_tests/ut_suite_manager/ut_suite_manager.get_schema_ut_packages.IncludesPackagesWithSutePath.sql @@ -6,8 +6,9 @@ end; set termout on declare - l_expected ut_object_names; - l_actual ut_object_names; + l_expected ut_object_names; + l_actual ut_object_names; + l_not_found ut_object_names := ut_object_names(); begin l_expected := ut_object_names( ut_object_name(user,'TEST_PACKAGE_1'), @@ -17,7 +18,13 @@ begin ut_object_name(user,'TEST_REPORTERS') ); l_actual := ut_suite_manager.get_schema_ut_packages(ut_varchar2_rows(user)); - if l_actual = l_expected then + for i in 1 .. l_expected.count loop + if l_expected(i) not member of l_actual then + l_not_found.extend; + l_not_found(l_not_found.last) := l_expected(i); + end if; + end loop; + if l_not_found is empty then :test_result := ut_utils.gc_success; else dbms_output.put_line('actual:'||xmltype(anydata.convertcollection(l_actual)).getclobval()); diff --git a/old_tests/ut_test/ut_test.AfterEachExecuted.sql b/old_tests/ut_test/ut_test.AfterEachExecuted.sql index e35564b7b..5711c38e9 100644 --- a/old_tests/ut_test/ut_test.AfterEachExecuted.sql +++ b/old_tests/ut_test/ut_test.AfterEachExecuted.sql @@ -3,8 +3,9 @@ PROMPT Invoke aftereach procedure --Arrange declare simple_test ut_test := ut_test( - a_object_name => 'ut_example_tests' - ,a_name => 'ut_passing_test' + a_object_name => 'ut_example_tests', + a_name => 'ut_passing_test', + a_line_no => null ); begin simple_test.after_each_list := ut_executables(ut_executable(user, 'ut_example_tests', 'aftereach', ut_utils.gc_after_each)); diff --git a/old_tests/ut_test/ut_test.AfterEachProcedureNameInvalid.sql b/old_tests/ut_test/ut_test.AfterEachProcedureNameInvalid.sql index 4d12cd513..15765a811 100644 --- a/old_tests/ut_test/ut_test.AfterEachProcedureNameInvalid.sql +++ b/old_tests/ut_test/ut_test.AfterEachProcedureNameInvalid.sql @@ -3,8 +3,9 @@ PROMPT Does not execute test and reports error when test aftereach procedure nam --Arrange declare simple_test ut_test := ut_test( - a_object_name => 'ut_example_tests' - ,a_name => 'ut_exampletest' + a_object_name => 'ut_example_tests', + a_name => 'ut_exampletest', + a_line_no => null ); begin simple_test.after_each_list := ut_executables(ut_executable(user, 'ut_example_tests', 'invalid setup name', ut_utils.gc_after_each)); diff --git a/old_tests/ut_test/ut_test.AfterEachProcedureNameNull.sql b/old_tests/ut_test/ut_test.AfterEachProcedureNameNull.sql index 2700e1a10..f40ee8c04 100644 --- a/old_tests/ut_test/ut_test.AfterEachProcedureNameNull.sql +++ b/old_tests/ut_test/ut_test.AfterEachProcedureNameNull.sql @@ -3,8 +3,9 @@ PROMPT Does not invoke aftereach procedure when aftereach procedure name for a t --Arrange declare simple_test ut_test := ut_test( - a_object_name => 'ut_example_tests' - ,a_name => 'ut_passing_test' + a_object_name => 'ut_example_tests', + a_name => 'ut_passing_test', + a_line_no => null ); begin simple_test.after_each_list := ut_executables(ut_executable(user, 'ut_example_tests', '', ut_utils.gc_after_each)); diff --git a/old_tests/ut_test/ut_test.BeforeEachExecuted.sql b/old_tests/ut_test/ut_test.BeforeEachExecuted.sql index 5015d69fd..9d40441ac 100644 --- a/old_tests/ut_test/ut_test.BeforeEachExecuted.sql +++ b/old_tests/ut_test/ut_test.BeforeEachExecuted.sql @@ -3,8 +3,9 @@ PROMPT Invoke beforeeach procedure --Arrange declare simple_test ut_test := ut_test( - a_object_name => 'ut_example_tests' - ,a_name => 'ut_passing_test' + a_object_name => 'ut_example_tests', + a_name => 'ut_passing_test', + a_line_no => null ); begin simple_test.before_each_list := ut_executables(ut_executable(user, 'ut_example_tests', 'beforeeach', ut_utils.gc_before_each)); diff --git a/old_tests/ut_test/ut_test.BeforeEachProcedureNameInvalid.sql b/old_tests/ut_test/ut_test.BeforeEachProcedureNameInvalid.sql index f03b76f08..5a9d40a58 100644 --- a/old_tests/ut_test/ut_test.BeforeEachProcedureNameInvalid.sql +++ b/old_tests/ut_test/ut_test.BeforeEachProcedureNameInvalid.sql @@ -3,8 +3,9 @@ PROMPT Does not execute test and reports error when test beforeeach procedure na --Arrange declare simple_test ut_test := ut_test( - a_object_name => 'ut_example_tests' - ,a_name => 'ut_exampletest' + a_object_name => 'ut_example_tests', + a_name => 'ut_exampletest', + a_line_no => null ); begin simple_test.before_each_list := ut_executables(ut_executable(user, 'ut_example_tests', 'invalid setup name', ut_utils.gc_before_each)); diff --git a/old_tests/ut_test/ut_test.BeforeEachProcedureNameNull.sql b/old_tests/ut_test/ut_test.BeforeEachProcedureNameNull.sql index e717b128f..66107c462 100644 --- a/old_tests/ut_test/ut_test.BeforeEachProcedureNameNull.sql +++ b/old_tests/ut_test/ut_test.BeforeEachProcedureNameNull.sql @@ -3,8 +3,9 @@ PROMPT Does not invoke setup procedure when beforeeach procedure name for a test --Arrange declare simple_test ut_test := ut_test( - a_object_name => 'ut_example_tests' - ,a_name => 'ut_passing_test' + a_object_name => 'ut_example_tests', + a_name => 'ut_passing_test', + a_line_no => null ); begin simple_test.before_each_list := ut_executables(ut_executable(user, 'ut_example_tests', '', ut_utils.gc_before_each)); diff --git a/old_tests/ut_test/ut_test.IgnoreTollbackToSavepointException.sql b/old_tests/ut_test/ut_test.IgnoreTollbackToSavepointException.sql index 94ad60c3d..3e3c1a814 100644 --- a/old_tests/ut_test/ut_test.IgnoreTollbackToSavepointException.sql +++ b/old_tests/ut_test/ut_test.IgnoreTollbackToSavepointException.sql @@ -2,7 +2,7 @@ PROMPT Checks that rollback exception does not make run to fail --Arrange declare - simple_test ut_test := ut_test(a_object_name => 'ut_example_tests', a_name => 'ut_commit_test'); + simple_test ut_test := ut_test(a_object_name => 'ut_example_tests', a_name => 'ut_commit_test', a_line_no => null); begin simple_test.rollback_type := ut_utils.gc_rollback_auto; --Act diff --git a/old_tests/ut_test/ut_test.OwnerNameInvalid.sql b/old_tests/ut_test/ut_test.OwnerNameInvalid.sql index ba19e0767..5207af574 100644 --- a/old_tests/ut_test/ut_test.OwnerNameInvalid.sql +++ b/old_tests/ut_test/ut_test.OwnerNameInvalid.sql @@ -2,7 +2,11 @@ PROMPT Reports error when test owner name for a test is invalid --Arrange declare - simple_test ut_test := ut_test( a_object_owner => 'invalid owner name', a_object_name => 'ut_example_tests', a_name => 'ut_passing_test'); + simple_test ut_test := ut_test( + a_object_owner => 'invalid owner name', + a_object_name => 'ut_example_tests', + a_name => 'ut_passing_test', + a_line_no => null); begin --Act simple_test.do_execute(); diff --git a/old_tests/ut_test/ut_test.OwnerNameNull.sql b/old_tests/ut_test/ut_test.OwnerNameNull.sql index 68acf9144..f57aebf92 100644 --- a/old_tests/ut_test/ut_test.OwnerNameNull.sql +++ b/old_tests/ut_test/ut_test.OwnerNameNull.sql @@ -2,7 +2,11 @@ PROMPT Executes test in current schema when test owner name for a test is null --Arrange declare - simple_test ut_test:= ut_test(a_object_owner => null, a_object_name => 'ut_example_tests', a_name => 'ut_passing_test'); + simple_test ut_test:= ut_test( + a_object_owner => null, + a_object_name => 'ut_example_tests', + a_name => 'ut_passing_test', + a_line_no => null); begin --Act simple_test.do_execute(); diff --git a/old_tests/ut_test/ut_test.PackageInInvalidState.sql b/old_tests/ut_test/ut_test.PackageInInvalidState.sql index 31056dcfd..0b87a13d6 100644 --- a/old_tests/ut_test/ut_test.PackageInInvalidState.sql +++ b/old_tests/ut_test/ut_test.PackageInInvalidState.sql @@ -8,7 +8,7 @@ end; set termout on declare - simple_test ut_test := ut_test(a_object_name => 'invalid_package', a_name => 'ut_exampletest'); + simple_test ut_test := ut_test(a_object_name => 'invalid_package', a_name => 'ut_exampletest', a_line_no => null); begin --Act simple_test.do_execute(); diff --git a/old_tests/ut_test/ut_test.PackageNameInvalid.sql b/old_tests/ut_test/ut_test.PackageNameInvalid.sql index 246af45db..b615e7589 100644 --- a/old_tests/ut_test/ut_test.PackageNameInvalid.sql +++ b/old_tests/ut_test/ut_test.PackageNameInvalid.sql @@ -2,7 +2,7 @@ PROMPT Reports error when unit test package name for a test is invalid --Arrange declare - simple_test ut_test := ut_test(a_object_name => 'invalid test package name', a_name => 'ut_passing_test'); + simple_test ut_test := ut_test(a_object_name => 'invalid test package name', a_name => 'ut_passing_test', a_line_no => null); begin --Act simple_test.do_execute(); diff --git a/old_tests/ut_test/ut_test.PackageNameNull.sql b/old_tests/ut_test/ut_test.PackageNameNull.sql index f4420b6b0..59612fa3d 100644 --- a/old_tests/ut_test/ut_test.PackageNameNull.sql +++ b/old_tests/ut_test/ut_test.PackageNameNull.sql @@ -2,7 +2,7 @@ PROMPT Reports error when unit test package name for a test is null --Arrange declare - simple_test ut_test := ut_test(a_object_name => null, a_name => 'ut_passing_test'); + simple_test ut_test := ut_test(a_object_name => null, a_name => 'ut_passing_test', a_line_no => null); begin --Act simple_test.do_execute(); diff --git a/old_tests/ut_test/ut_test.ProcedureNameInvalid.sql b/old_tests/ut_test/ut_test.ProcedureNameInvalid.sql index a66f0deff..2a8e80a9e 100644 --- a/old_tests/ut_test/ut_test.ProcedureNameInvalid.sql +++ b/old_tests/ut_test/ut_test.ProcedureNameInvalid.sql @@ -2,7 +2,7 @@ PROMPT Reports error when test procedure name for a test is invalid --Arrange declare - simple_test ut_test := ut_test(a_object_name => 'ut_example_tests' ,a_name => 'invalid procedure name'); + simple_test ut_test := ut_test(a_object_name => 'ut_example_tests' ,a_name => 'invalid procedure name', a_line_no => null); begin --Act simple_test.do_execute(); diff --git a/old_tests/ut_test/ut_test.ProcedureNameNull.sql b/old_tests/ut_test/ut_test.ProcedureNameNull.sql index 1e702ab2c..df4f0e593 100644 --- a/old_tests/ut_test/ut_test.ProcedureNameNull.sql +++ b/old_tests/ut_test/ut_test.ProcedureNameNull.sql @@ -2,7 +2,7 @@ PROMPT Reports error when test procedure name for a test is null --Arrange declare - simple_test ut_test := ut_test(a_object_name => 'ut_example_tests', a_name => null); + simple_test ut_test := ut_test(a_object_name => 'ut_example_tests', a_name => null, a_line_no => null); begin --Act simple_test.do_execute(); diff --git a/old_tests/ut_test/ut_test.SetupExecutedBeforeTest.sql b/old_tests/ut_test/ut_test.SetupExecutedBeforeTest.sql index e928443f3..2a80cf586 100644 --- a/old_tests/ut_test/ut_test.SetupExecutedBeforeTest.sql +++ b/old_tests/ut_test/ut_test.SetupExecutedBeforeTest.sql @@ -3,8 +3,9 @@ PROMPT Invoke setup procedure before test when setup procedure name is defined --Arrange declare simple_test ut_test := ut_test( - a_object_name => 'ut_example_tests' - ,a_name => 'ut_passing_test' + a_object_name => 'ut_example_tests', + a_name => 'ut_passing_test', + a_line_no => null ); begin simple_test.before_test_list := ut_executables(ut_executable(user, 'ut_example_tests', 'setup', ut_utils.gc_before_test)); diff --git a/old_tests/ut_test/ut_test.SetupProcedureNameInvalid.sql b/old_tests/ut_test/ut_test.SetupProcedureNameInvalid.sql index 3f6fab022..d81141031 100644 --- a/old_tests/ut_test/ut_test.SetupProcedureNameInvalid.sql +++ b/old_tests/ut_test/ut_test.SetupProcedureNameInvalid.sql @@ -3,8 +3,9 @@ PROMPT Does not execute test and reports error when test setup procedure name fo --Arrange declare simple_test ut_test := ut_test( - a_object_name => 'ut_example_tests' - ,a_name => 'ut_exampletest' + a_object_name => 'ut_example_tests', + a_name => 'ut_exampletest', + a_line_no => null ); begin simple_test.before_test_list := ut_executables(ut_executable(user, 'ut_example_tests', 'invalid setup name', ut_utils.gc_before_test)); diff --git a/old_tests/ut_test/ut_test.SetupProcedureNameNull.sql b/old_tests/ut_test/ut_test.SetupProcedureNameNull.sql index 0622a2295..9269fdd92 100644 --- a/old_tests/ut_test/ut_test.SetupProcedureNameNull.sql +++ b/old_tests/ut_test/ut_test.SetupProcedureNameNull.sql @@ -3,8 +3,9 @@ PROMPT Does not invoke setup procedure when setup procedure name for a test is n --Arrange declare simple_test ut_test := ut_test( - a_object_name => 'ut_example_tests' - ,a_name => 'ut_passing_test' + a_object_name => 'ut_example_tests', + a_name => 'ut_passing_test', + a_line_no => null ); begin simple_test.before_test_list := ut_executables(ut_executable(user, 'ut_example_tests', null, ut_utils.gc_before_test)); diff --git a/old_tests/ut_test/ut_test.TeardownExecutedAfterTest.sql b/old_tests/ut_test/ut_test.TeardownExecutedAfterTest.sql index 55c0026c1..bc733614b 100644 --- a/old_tests/ut_test/ut_test.TeardownExecutedAfterTest.sql +++ b/old_tests/ut_test/ut_test.TeardownExecutedAfterTest.sql @@ -3,8 +3,9 @@ PROMPT Invoke teardown procedure after test when teardown procedure name is defi --Arrange declare simple_test ut_test := ut_test( - a_object_name => 'ut_example_tests' - ,a_name => 'ut_passing_test' + a_object_name => 'ut_example_tests', + a_name => 'ut_passing_test', + a_line_no => null ); begin simple_test.after_test_list := ut_executables(ut_executable(user, 'ut_example_tests', 'teardown', ut_utils.gc_after_test)); diff --git a/old_tests/ut_test/ut_test.TeardownProcedureNameInvalid.sql b/old_tests/ut_test/ut_test.TeardownProcedureNameInvalid.sql index 86bdff66a..5ae61cc13 100644 --- a/old_tests/ut_test/ut_test.TeardownProcedureNameInvalid.sql +++ b/old_tests/ut_test/ut_test.TeardownProcedureNameInvalid.sql @@ -3,8 +3,9 @@ PROMPT Does not execute test and reports error when test teardown procedure name --Arrange declare simple_test ut_test := ut_test( - a_object_name => 'ut_example_tests' - ,a_name => 'ut_exampletest' + a_object_name => 'ut_example_tests', + a_name => 'ut_exampletest', + a_line_no => null ); begin simple_test.after_test_list := ut_executables(ut_executable(user, 'ut_example_tests', 'invalid setup name', ut_utils.gc_after_test)); diff --git a/old_tests/ut_test/ut_test.TeardownProcedureNameNull.sql b/old_tests/ut_test/ut_test.TeardownProcedureNameNull.sql index a1837d20c..7460ca788 100644 --- a/old_tests/ut_test/ut_test.TeardownProcedureNameNull.sql +++ b/old_tests/ut_test/ut_test.TeardownProcedureNameNull.sql @@ -3,8 +3,9 @@ PROMPT Does not invoke teardown procedure when teardown procedure name for a tes --Arrange declare simple_test ut_test := ut_test( - a_object_name => 'ut_example_tests' - ,a_name => 'ut_passing_test' + a_object_name => 'ut_example_tests', + a_name => 'ut_passing_test', + a_line_no => null ); begin simple_test.after_test_list := ut_executables(ut_executable(user, 'ut_example_tests', null, ut_utils.gc_after_test)); diff --git a/source/core/annotations/ut_annotation_cache_seq.sql b/source/core/annotations/ut_annotation_cache_seq.sql index 028225ddb..1cc97086e 100644 --- a/source/core/annotations/ut_annotation_cache_seq.sql +++ b/source/core/annotations/ut_annotation_cache_seq.sql @@ -12,5 +12,5 @@ create sequence ut_annotation_cache_seq See the License for the specific language governing permissions and limitations under the License. */ -cache 20; +cache 100; diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index 358a563f4..cc2b32309 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -992,7 +992,6 @@ create or replace package body ut_suite_builder is l_idx := l_rows.first; end if; exit when l_idx is null; - l_level := length(l_rows(l_idx).path) - length( replace(l_rows(l_idx).path, '.') ) + 1; if l_level > 1 then @@ -1055,7 +1054,7 @@ create or replace package body ut_suite_builder is suite_items as ( select c.* from ]'||l_ut_owner||q'[.ut_suite_cache c - where 1 = 1 ]'||case when a_skip_all_objects is null then q'[ + where 1 = 1 ]'||case when not a_skip_all_objects /*1 = 0*/ then q'[ and exists ( select 1 from all_objects a @@ -1112,7 +1111,7 @@ create or replace package body ut_suite_builder is not in (select s.path from suitepaths s) ), logical_suites as ( - select s.self_type, s.path, s.object_owner, s.object_name, + select to_number(null) as id, s.self_type, s.path, s.object_owner, s.object_name, s.object_name as name, null as line_no, null as parse_time, null as description, null as rollback_type, 0 as disabled_flag, ]'||l_ut_owner||q'[.ut_varchar2_rows() as warnings, @@ -1164,7 +1163,12 @@ create or replace package body ut_suite_builder is convert_package_annotations( l_annotated_objects( i ) ), l_suite_items ); - ut_suite_cache_manager.save_cache( a_owner_name, l_suite_items ); + ut_suite_cache_manager.save_object_cache( + a_owner_name, + l_annotated_objects( i ).object_name, + l_annotated_objects( i ).parse_time, + l_suite_items + ); end loop; exit when a_annotated_objects%notfound; end loop; @@ -1202,7 +1206,7 @@ create or replace package body ut_suite_builder is ]' || ut_utils.ut_owner || q'[.ut_annotation_manager.get_annotated_objects(:a_owner_name, 'PACKAGE', :a_suite_cache_parse_time) )x ]' using a_owner_name, l_suite_cache_time; - + return build_suites_from_annotations( a_owner_name, l_annotations_cursor, @@ -1218,8 +1222,8 @@ create or replace package body ut_suite_builder is l_object_names ut_varchar2_rows; l_ut_owner varchar2(250) := ut_utils.ut_owner; begin - execute immediate 'select distinct c.object_owner, c.object_name - from '||l_ut_owner||q'[.ut_suite_cache c + execute immediate 'select c.object_owner, c.object_name + from '||l_ut_owner||q'[.ut_suite_cache_package c join table ( :a_schema_names ) s on c.object_owner = upper(s.column_value) -- where exists diff --git a/source/core/ut_suite_cache.sql b/source/core/ut_suite_cache.sql index 09211722b..adbdf1734 100644 --- a/source/core/ut_suite_cache.sql +++ b/source/core/ut_suite_cache.sql @@ -17,6 +17,7 @@ create table ut_suite_cache ( See the License for the specific language governing permissions and limitations under the License. */ + id, self_type, path, object_owner, @@ -47,6 +48,7 @@ create table ut_suite_cache ( nested table expected_error_codes store as ut_suite_cache_trhows as select + cast(null as number(22)) id, c.self_type, c.path, c.object_owner, @@ -73,11 +75,15 @@ create table ut_suite_cache ( alter table ut_suite_cache modify (object_owner not null, path not null, self_type not null, object_name not null, name not null, parse_time not null) / -alter table ut_suite_cache add constraint ut_suite_cache_pk primary key (object_owner, path) +alter table ut_suite_cache add constraint ut_suite_cache_pk primary key (id) / -create index ut_suite_cache_nu1 on ut_suite_cache(object_owner, object_name, parse_time desc) +alter table ut_suite_cache add constraint ut_suite_cache_uk1 unique (object_owner, path) / -alter table ut_suite_cache add constraint ut_suite_cache_schema_fk foreign key (object_owner) references ut_suite_cache_schema(object_owner) +alter table ut_suite_cache add constraint ut_suite_cache_uk2 unique (object_owner, object_name, line_no) +/ + +alter table ut_suite_cache add constraint ut_suite_cache_schema_fk foreign key (object_owner, object_name) +references ut_suite_cache_package(object_owner, object_name) on delete cascade / drop type ut_tests diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index cad718ee3..9caf8a946 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -26,108 +26,113 @@ create or replace package body ut_suite_cache_manager is return l_cache_parse_time; end; - procedure save_cache(a_object_owner varchar2, a_suite_items ut_suite_items) is + procedure save_object_cache( + a_object_owner varchar2, + a_object_name varchar2, + a_parse_time timestamp, + a_suite_items ut_suite_items + ) is pragma autonomous_transaction; - l_parse_time timestamp; l_cached_parse_time timestamp; l_object_owner varchar2(250) := upper(a_object_owner); + l_object_name varchar2(250) := upper(a_object_name); begin if a_suite_items.count = 0 then - return; - end if; - if a_suite_items(1).self_type != 'UT_LOGICAL_SUITE' then - select min(parse_time) - into l_cached_parse_time - from ut_suite_cache t - where t.object_name = a_suite_items(1).object_name - and t.object_owner = a_suite_items(1).object_owner - and rownum = 1; - end if; - - select max(parse_time) into l_parse_time from table(a_suite_items) s; + delete from ut_suite_cache t + where t.object_owner = l_object_owner + and t.object_name = l_object_name; - if l_parse_time > l_cached_parse_time or l_cached_parse_time is null then + delete from ut_suite_cache_package t + where t.object_owner = l_object_owner + and t.object_name = l_object_name; - update ut_suite_cache_schema t - set t.parse_time = l_parse_time - where object_owner = l_object_owner; + else - if sql%rowcount = 0 then - insert into ut_suite_cache_schema - (object_owner, parse_time) - values (l_object_owner, l_parse_time); - end if; - - delete from ut_suite_cache t - where (t.object_name, t.object_owner) - in ( - select upper(s.object_name), upper(s.object_owner) - from table(a_suite_items) s where s.self_type != 'UT_LOGICAL_SUITE' - ); - - - insert into ut_suite_cache t - ( - self_type, path, object_owner, object_name, name, - line_no, parse_time, description, - rollback_type, disabled_flag, warnings - ) - select self_type, path, upper(object_owner), upper(object_name), upper(name), - line_no, parse_time, description, - rollback_type, disabled_flag, warnings - from table(a_suite_items) s - where s.self_type = 'UT_LOGICAL_SUITE' - and (s.object_owner, s.path) not in (select c.object_owner, c.path from ut_suite_cache c); - - insert into ut_suite_cache t + select min(parse_time) + into l_cached_parse_time + from ut_suite_cache_package t + where t.object_name = l_object_name + and t.object_owner = l_object_owner; + + if a_parse_time > l_cached_parse_time or l_cached_parse_time is null then + + update ut_suite_cache_schema t + set t.parse_time = a_parse_time + where object_owner = l_object_owner; + + if sql%rowcount = 0 then + insert into ut_suite_cache_schema + (object_owner, parse_time) + values (l_object_owner, a_parse_time); + end if; + + update ut_suite_cache_package t + set t.parse_time = a_parse_time + where t.object_owner = l_object_owner + and t.object_name = l_object_name; + + if sql%rowcount = 0 then + insert into ut_suite_cache_package + (object_owner, object_name, parse_time) + values (l_object_owner, l_object_name, a_parse_time ); + end if; + + delete from ut_suite_cache t + where t.object_owner = l_object_owner + and t.object_name = l_object_name; + + insert into ut_suite_cache t + ( + id, self_type, path, object_owner, object_name, name, + line_no, parse_time, description, + rollback_type, disabled_flag, warnings, + before_all_list, after_all_list, + before_each_list, after_each_list, + before_test_list, after_test_list, + expected_error_codes, item + ) + with suites as ( + select treat(value(x) as ut_suite) i + from table(a_suite_items) x + where x.self_type in( 'UT_SUITE', 'UT_SUITE_CONTEXT' ) ) + select ut_suite_cache_seq.nextval, s.i.self_type as self_type, s.i.path as path, + upper(s.i.object_owner) as object_owner, upper(s.i.object_name) as object_name, upper(s.i.name) as name, + s.i.line_no as line_no, s.i.parse_time as parse_time, s.i.description as description, + s.i.rollback_type as rollback_type, s.i.disabled_flag as disabled_flag, s.i.warnings as warnings, + s.i.before_all_list as before_all_list, s.i.after_all_list as after_all_list, + null before_each_list, null after_each_list, + null before_test_list, null after_test_list, + null expected_error_codes, null item + from suites s; + + insert into ut_suite_cache t ( - self_type, path, object_owner, object_name, name, - line_no, parse_time, description, - rollback_type, disabled_flag, warnings, - before_all_list, after_all_list, - before_each_list, after_each_list, - before_test_list, after_test_list, - expected_error_codes, item + id, self_type, path, object_owner, object_name, name, + line_no, parse_time, description, + rollback_type, disabled_flag, warnings, + before_all_list, after_all_list, + before_each_list, after_each_list, + before_test_list, after_test_list, + expected_error_codes, item ) - with suites as ( select treat(value(x) as ut_suite) i - from table(a_suite_items) x - where x.self_type in( 'UT_SUITE', 'UT_SUITE_CONTEXT' ) ) - select s.i.self_type as self_type, s.i.path as path, - upper(s.i.object_owner) as object_owner, upper(s.i.object_name) as object_name, upper(s.i.name) as name, - s.i.line_no as line_no, s.i.parse_time as parse_time, s.i.description as description, - s.i.rollback_type as rollback_type, s.i.disabled_flag as disabled_flag, s.i.warnings as warnings, - s.i.before_all_list as before_all_list, s.i.after_all_list as after_all_list, - null before_each_list, null after_each_list, - null before_test_list, null after_test_list, - null expected_error_codes, null item - from suites s; - - insert into ut_suite_cache t - ( - self_type, path, object_owner, object_name, name, - line_no, parse_time, description, - rollback_type, disabled_flag, warnings, - before_all_list, after_all_list, - before_each_list, after_each_list, - before_test_list, after_test_list, - expected_error_codes, item - ) - with tests as ( select treat(value(x) as ut_test) t - from table ( a_suite_items ) x - where x.self_type in ( 'UT_TEST' ) ) - select s.t.self_type as self_type, s.t.path as path, - upper(s.t.object_owner) as object_owner, upper(s.t.object_name) as object_name, upper(s.t.name) as name, - s.t.line_no as line_no, s.t.parse_time as parse_time, s.t.description as description, - s.t.rollback_type as rollback_type, s.t.disabled_flag as disabled_flag, s.t.warnings as warnings, - null before_all_list, null after_all_list, - s.t.before_each_list as before_each_list, s.t.after_each_list as after_each_list, - s.t.before_test_list as before_test_list, s.t.after_test_list as after_test_list, - s.t.expected_error_codes as expected_error_codes, s.t.item as item - from tests s; - - commit; + with tests as ( + select treat(value(x) as ut_test) t + from table ( a_suite_items ) x + where x.self_type in ( 'UT_TEST' ) ) + select ut_suite_cache_seq.nextval, s.t.self_type as self_type, s.t.path as path, + upper(s.t.object_owner) as object_owner, upper(s.t.object_name) as object_name, upper(s.t.name) as name, + s.t.line_no as line_no, s.t.parse_time as parse_time, s.t.description as description, + s.t.rollback_type as rollback_type, s.t.disabled_flag as disabled_flag, s.t.warnings as warnings, + null before_all_list, null after_all_list, + s.t.before_each_list as before_each_list, s.t.after_each_list as after_each_list, + s.t.before_test_list as before_test_list, s.t.after_test_list as after_test_list, + s.t.expected_error_codes as expected_error_codes, s.t.item as item + from tests s; + + end if; end if; + commit; end; end ut_suite_cache_manager; diff --git a/source/core/ut_suite_cache_manager.pks b/source/core/ut_suite_cache_manager.pks index 919196efa..3d5a21f10 100644 --- a/source/core/ut_suite_cache_manager.pks +++ b/source/core/ut_suite_cache_manager.pks @@ -20,7 +20,12 @@ create or replace package ut_suite_cache_manager authid definer is * Responsible for storing and retrieving suite data from cache */ - procedure save_cache(a_object_owner varchar2, a_suite_items ut_suite_items); + procedure save_object_cache( + a_object_owner varchar2, + a_object_name varchar2, + a_parse_time timestamp, + a_suite_items ut_suite_items + ); function get_schema_parse_time(a_schema_name varchar2) return timestamp result_cache; diff --git a/source/core/ut_suite_cache_package.sql b/source/core/ut_suite_cache_package.sql new file mode 100644 index 000000000..46f49e915 --- /dev/null +++ b/source/core/ut_suite_cache_package.sql @@ -0,0 +1,23 @@ +create table ut_suite_cache_package ( + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + object_owner varchar2(250) not null, + object_name varchar2(250) not null, + parse_time timestamp not null, + constraint ut_suite_cache_package_pk primary key(object_owner, object_name), + constraint ut_suite_cache_package_fk foreign key (object_owner) references ut_suite_cache_schema(object_owner) on delete cascade +) organization index +/ + + diff --git a/source/core/ut_suite_cache_seq.sql b/source/core/ut_suite_cache_seq.sql new file mode 100644 index 000000000..0c9c835b8 --- /dev/null +++ b/source/core/ut_suite_cache_seq.sql @@ -0,0 +1,16 @@ +create sequence ut_suite_cache_seq + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ +cache 100; + diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index f22a61121..4928022eb 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -89,6 +89,7 @@ grant select on &&ut3_owner..ut_annotation_cache to public; grant execute on &&ut3_owner..ut_executables to public; grant execute on &&ut3_owner..ut_executable_test to public; grant select on &&ut3_owner..ut_suite_cache to public; +grant select on &&ut3_owner..ut_suite_cache_package to public; grant select on &&ut3_owner..ut_suite_cache_schema to public; grant execute on &&ut3_owner..ut_annotation_cache_manager to public; grant execute on &&ut3_owner..ut_annotation_parser to public; diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql index 723fcca58..0967a0e8c 100644 --- a/source/create_user_grants.sql +++ b/source/create_user_grants.sql @@ -109,6 +109,7 @@ grant select on &&ut3_owner..ut_annotation_cache to &ut3_user; grant execute on &&ut3_owner..ut_executables to &ut3_user; grant execute on &&ut3_owner..ut_executable_test to &ut3_user; grant select on &&ut3_owner..ut_suite_cache to &ut3_user; +grant select on &&ut3_owner..ut_suite_cache_package to public; grant select on &&ut3_owner..ut_suite_cache_schema to &ut3_user; grant execute on &&ut3_owner..ut_annotation_cache_manager to &ut3_user; grant execute on &&ut3_owner..ut_annotation_parser to &ut3_user; diff --git a/source/install.sql b/source/install.sql index d71dcb1d1..2a7ff8343 100644 --- a/source/install.sql +++ b/source/install.sql @@ -111,6 +111,8 @@ alter session set current_schema = &&ut3_owner; --suite builder @@install_component.sql 'core/ut_suite_cache_schema.sql' +@@install_component.sql 'core/ut_suite_cache_package.sql' +@@install_component.sql 'core/ut_suite_cache_seq.sql' @@install_component.sql 'core/ut_suite_cache.sql' @@install_component.sql 'core/ut_suite_cache_manager.pks' @@install_component.sql 'core/ut_suite_cache_manager.pkb' diff --git a/test/core/test_suite_builder.pkb b/test/core/test_suite_builder.pkb index e55830266..423e29c0a 100644 --- a/test/core/test_suite_builder.pkb +++ b/test/core/test_suite_builder.pkb @@ -414,7 +414,7 @@ create or replace package body test_suite_builder is ut.expect(l_actual).to_be_like( '%%some_package%some_test' || '%' || - '%some_packagefirst_bfore_each' || + '%some_packagefirst_before_each' || '%some_packageanother_before_each' || '%' || '%' || From 15163a82f610bd5198ec0541105818501e82c44d Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 4 Nov 2018 19:52:45 +0000 Subject: [PATCH 0063/1096] Resolved issue with sorting of nested-tables. Added `seq_no`, numbering before storage and sorting after retrieval. --- source/core/types/ut_executable.tps | 4 ++ source/core/ut_suite_builder.pkb | 96 +++++++++++++++++------------ test/api/test_ut_run.pks | 2 - 3 files changed, 59 insertions(+), 43 deletions(-) diff --git a/source/core/types/ut_executable.tps b/source/core/types/ut_executable.tps index 5fa4f3566..8186e4bae 100644 --- a/source/core/types/ut_executable.tps +++ b/source/core/types/ut_executable.tps @@ -25,6 +25,10 @@ create or replace type ut_executable under ut_event_item( error_backtrace varchar2(4000), error_stack varchar2(4000), serveroutput clob, + /** + * Used for ordering of executables, as Oracle doesn not guarantee ordering of items in a nested table. + */ + seq_no integer, constructor function ut_executable( self in out nocopy ut_executable, a_owner varchar2, a_package varchar2, a_procedure_name varchar2, a_executable_type varchar2) return self as result, member function form_name return varchar2, member procedure do_execute(self in out nocopy ut_executable, a_item in out nocopy ut_suite_item), diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index cc2b32309..6191bc7e8 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -65,9 +65,6 @@ create or replace package body ut_suite_builder is type tt_executables is table of ut_executables index by t_annotation_position; - type tt_tests is table of ut_test index by t_annotation_position; - - type t_annotation is record( name t_annotation_name, text t_annotation_text, @@ -315,35 +312,46 @@ create or replace package body ut_suite_builder is end loop; end; - function convert_list( - a_list tt_executables + procedure set_seq_no( + a_list in out nocopy ut_executables + ) is + begin + if a_list is not null then + for i in 1 .. a_list.count loop + a_list(i).seq_no := i; + end loop; + end if; + end; + + function sort_by_seq_no( + a_list ut_executables ) return ut_executables is - l_result ut_executables := ut_executables(); - l_pos t_annotation_position := a_list.first; - begin - while l_pos is not null loop - for i in 1 .. a_list(l_pos).count loop - l_result.extend; - l_result(l_result.last) := a_list(l_pos)(i); - end loop; - l_pos := a_list.next(l_pos); + l_results ut_executables := ut_executables(); + begin + if a_list is not null then + l_results.extend(a_list.count); + for i in 1 .. a_list.count loop + l_results(a_list(i).seq_no) := a_list(i); end loop; - return l_result; - end; + end if; + return l_results; + end; function convert_list( - a_list tt_tests - ) return ut_suite_items is - l_result ut_suite_items := ut_suite_items(); + a_list tt_executables + ) return ut_executables is + l_result ut_executables := ut_executables(); l_pos t_annotation_position := a_list.first; - begin - while l_pos is not null loop + begin + while l_pos is not null loop + for i in 1 .. a_list(l_pos).count loop l_result.extend; - l_result(l_result.last) := a_list(l_pos); - l_pos := a_list.next(l_pos); + l_result(l_result.last) := a_list(l_pos)(i); end loop; - return l_result; - end; + l_pos := a_list.next(l_pos); + end loop; + return l_result; + end; function add_executables( a_owner t_object_name, @@ -492,11 +500,13 @@ create or replace package body ut_suite_builder is l_test.before_test_list := convert_list( add_executables( l_test.object_owner, l_test.object_name, l_proc_annotations( gc_beforetest ), gc_beforetest ) ); + set_seq_no(l_test.before_test_list); end if; if l_proc_annotations.exists( gc_aftertest) then l_test.after_test_list := convert_list( add_executables( l_test.object_owner, l_test.object_name, l_proc_annotations( gc_aftertest ), gc_aftertest ) ); + set_seq_no(l_test.after_test_list); end if; if l_proc_annotations.exists( gc_throws) then add_to_throws_numbers_list(a_suite, l_test.expected_error_codes, a_procedure_name, l_proc_annotations( gc_throws)); @@ -519,8 +529,10 @@ create or replace package body ut_suite_builder is for i in 1 .. a_suite.items.count loop if a_suite.items(i) is of (ut_test) then l_test := treat( a_suite.items(i) as ut_test); - l_test.before_each_list := coalesce(convert_list(a_before_each_list),ut_executables()) multiset union all l_test.before_each_list; - l_test.after_each_list := l_test.after_each_list multiset union all coalesce(convert_list(a_after_each_list),ut_executables()); + l_test.before_each_list := convert_list(a_before_each_list) multiset union all l_test.before_each_list; + set_seq_no(l_test.before_each_list); + l_test.after_each_list := l_test.after_each_list multiset union all convert_list(a_after_each_list); + set_seq_no(l_test.after_each_list); a_suite.items(i) := l_test; elsif a_suite.items(i) is of (ut_logical_suite) then l_context := treat(a_suite.items(i) as ut_logical_suite); @@ -543,8 +555,10 @@ create or replace package body ut_suite_builder is for i in 1 .. a_suite_items.count loop if a_suite_items(i) is of (ut_test) then l_test := treat( a_suite_items(i) as ut_test); - l_test.before_each_list := coalesce(convert_list(a_before_each_list),ut_executables()) multiset union all l_test.before_each_list; - l_test.after_each_list := l_test.after_each_list multiset union all coalesce(convert_list(a_after_each_list),ut_executables()); + l_test.before_each_list := convert_list(a_before_each_list) multiset union all l_test.before_each_list; + set_seq_no(l_test.before_each_list); + l_test.after_each_list := l_test.after_each_list multiset union all convert_list(a_after_each_list); + set_seq_no(l_test.after_each_list); a_suite_items(i) := l_test; elsif a_suite_items(i) is of (ut_logical_suite) then l_context := treat(a_suite_items(i) as ut_logical_suite); @@ -580,8 +594,6 @@ create or replace package body ut_suite_builder is a_after_all_list in out nocopy tt_executables ) is l_procedure_name t_object_name; - l_tests tt_tests; - begin l_procedure_name := a_proc_annotations.by_proc.first; while l_procedure_name is not null loop @@ -679,7 +691,9 @@ create or replace package body ut_suite_builder is a_suite.set_rollback_type(l_rollback_type); propagate_before_after_each( a_suite_items, l_before_each_list, l_after_each_list); a_suite.before_all_list := convert_list(l_before_all_list); + set_seq_no(a_suite.before_all_list); a_suite.after_all_list := convert_list(l_after_all_list); + set_seq_no(a_suite.after_all_list); end; function get_endcontext_position( @@ -943,9 +957,9 @@ create or replace package body ut_suite_builder is line_no => l_rows(i).line_no, parse_time => l_rows(i).parse_time, start_time => null, end_time => null, result => null, warnings => l_rows(i).warnings, results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), - before_each_list => l_rows(i).before_each_list, before_test_list => l_rows(i).before_test_list, + before_each_list => sort_by_seq_no(l_rows(i).before_each_list), before_test_list => sort_by_seq_no(l_rows(i).before_test_list), item => l_rows(i).item, - after_test_list => l_rows(i).after_test_list, after_each_list => l_rows(i).after_each_list, + after_test_list => sort_by_seq_no(l_rows(i).after_test_list), after_each_list => sort_by_seq_no(l_rows(i).after_each_list), all_expectations => ut_expectation_results(), failed_expectations => ut_expectation_results(), parent_error_stack_trace => null, expected_error_codes => l_rows(i).expected_error_codes ); @@ -960,7 +974,7 @@ create or replace package body ut_suite_builder is start_time => null, end_time => null, result => null, warnings => l_rows(i).warnings, results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), items => ut_suite_items(), - before_all_list => l_rows(i).before_all_list, after_all_list => l_rows(i).after_all_list + before_all_list => sort_by_seq_no(l_rows(i).before_all_list), after_all_list => sort_by_seq_no(l_rows(i).after_all_list) ); when 'UT_SUITE_CONTEXT' then l_logical_suites(i) := @@ -973,7 +987,7 @@ create or replace package body ut_suite_builder is start_time => null, end_time => null, result => null, warnings => l_rows(i).warnings, results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), items => ut_suite_items(), - before_all_list => l_rows(i).before_all_list, after_all_list => l_rows(i).after_all_list + before_all_list => sort_by_seq_no(l_rows(i).before_all_list), after_all_list => sort_by_seq_no(l_rows(i).after_all_list) ); when 'UT_LOGICAL_SUITE' then l_logical_suites(i) := @@ -1054,7 +1068,7 @@ create or replace package body ut_suite_builder is suite_items as ( select c.* from ]'||l_ut_owner||q'[.ut_suite_cache c - where 1 = 1 ]'||case when not a_skip_all_objects /*1 = 0*/ then q'[ + where 1 = 1 ]'||case when not a_skip_all_objects then q'[ and exists ( select 1 from all_objects a @@ -1226,11 +1240,11 @@ create or replace package body ut_suite_builder is from '||l_ut_owner||q'[.ut_suite_cache_package c join table ( :a_schema_names ) s on c.object_owner = upper(s.column_value) --- where exists --- (select 1 from all_objects a --- where a.owner = c.object_owner --- and a.object_name = c.object_name --- and a.object_type = 'PACKAGE') + where exists + (select 1 from all_objects a + where a.owner = c.object_owner + and a.object_name = c.object_name + and a.object_type = 'PACKAGE') ]' bulk collect into l_schema_names, l_object_names using a_schema_names; l_results.extend( l_schema_names.count ); diff --git a/test/api/test_ut_run.pks b/test/api/test_ut_run.pks index cfc06c80d..927abf6e2 100644 --- a/test/api/test_ut_run.pks +++ b/test/api/test_ut_run.pks @@ -24,7 +24,6 @@ create or replace package test_ut_run is --%test(Runs all tests in current schema with coverage file list) procedure run_proc_cov_file_list; - --%disabled(TODO - currently it executes the package and all child packages) --%test(Runs given package only with package name given as path) procedure run_proc_pkg_name; --%test(Runs all from given package with package name given as path and coverage file list) @@ -57,7 +56,6 @@ create or replace package test_ut_run is --%test(Runs all tests in current schema with coverage file list) procedure run_func_cov_file_list; - --%disabled(TODO - currently it executes the package and all child packages) --%test(Runs given package only with package name given as path) procedure run_func_pkg_name; --%test(Runs all from given package with package name given as path and coverage file list) From 1b14bb5a0909a9a74c153d7d7d0969b3b1b7db2c Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 4 Nov 2018 19:55:37 +0000 Subject: [PATCH 0064/1096] Fixing re-enabled test. --- test/api/test_ut_run.pkb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/api/test_ut_run.pkb b/test/api/test_ut_run.pkb index dae7e175a..9709058d4 100644 --- a/test/api/test_ut_run.pkb +++ b/test/api/test_ut_run.pkb @@ -391,7 +391,7 @@ create or replace package body test_ut_run is execute immediate 'begin :l_results := ut3$user#.test_package_1.run(:a_path); end;' using out l_results, in 'test_package_1'; --Assert - ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( '%test_package_bal%' ); + ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( '%test_package_1%' ); ut.expect( ut3.ut_utils.table_to_clob(l_results) ).not_to_be_like( '%test_package_2%' ); ut.expect( ut3.ut_utils.table_to_clob(l_results) ).not_to_be_like( '%test_package_3%' ); end; From 3bc8da55d8b7ef6bb8da56c4c1b3121c7126f90a Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 4 Nov 2018 20:43:25 +0000 Subject: [PATCH 0065/1096] Adding missing items to uninstall. --- source/uninstall_objects.sql | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index 754a16a34..119695b6d 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -57,6 +57,10 @@ drop package ut_suite_builder; drop table ut_suite_cache; +drop sequence ut_suite_cache_seq; + +drop table ut_suite_cache_package; + drop table ut_suite_cache_schema; drop package ut; From 9741948bbad71506ab57189307a2512ae0d35b6c Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sun, 4 Nov 2018 20:49:08 +0000 Subject: [PATCH 0066/1096] Added belt and braces for big cartesian --- .../data_values/ut_compound_data_diff_tmp.sql | 4 +- .../data_values/ut_compound_data_helper.pkb | 8 ++- .../data_values/ut_compound_data_value.tpb | 52 ++++++++++++++++--- 3 files changed, 53 insertions(+), 11 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_diff_tmp.sql b/source/expectations/data_values/ut_compound_data_diff_tmp.sql index c285d78fd..5fdb53e10 100644 --- a/source/expectations/data_values/ut_compound_data_diff_tmp.sql +++ b/source/expectations/data_values/ut_compound_data_diff_tmp.sql @@ -15,8 +15,8 @@ create global temporary table ut_compound_data_diff_tmp( diff_id raw(128), act_data_id raw(32), exp_data_id raw(32), - act_item_data xmltype, - exp_item_data xmltype, + act_item_data clob, + exp_item_data clob, item_no integer, pk_hash raw(128), item_hash raw(128), diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index eaa24d1f6..7f48e4262 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -174,12 +174,14 @@ create or replace package body ut_compound_data_helper is ) return tt_row_diffs is l_column_filter varchar2(32767); l_results tt_row_diffs; + t1 integer; begin l_column_filter := get_columns_row_filter(a_exclude_xpath,a_include_xpath); + t1 := dbms_utility.get_time; execute immediate q'[with diff_info as ( select act_data_id, exp_data_id, - act_item_data,exp_item_data, :join_by join_by, item_no + xmltype(act_item_data) act_item_data, xmltype(exp_item_data) exp_item_data, :join_by join_by, item_no from ut_compound_data_diff_tmp where diff_id = :diff_id ), exp as ( @@ -211,7 +213,9 @@ create or replace package body ut_compound_data_helper is where act_data_id is null or exp_data_id is null]' bulk collect into l_results using a_join_by_xpath, a_diff_id, a_expected_dataset_guid,a_actual_dataset_guid; - + + dbms_output.put_line((dbms_utility.get_time - t1)/100 || ' seconds - get col info'); + return l_results; end; diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index 5dc099189..4730f23d4 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -263,16 +263,36 @@ create or replace type body ut_compound_data_value as end; member function compare_implementation_by_sql(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_inclusion_compare boolean := false) return integer is - l_compare_sql varchar2(32767); + l_ut_owner varchar2(250) := ut_utils.ut_owner; l_actual ut_data_value_refcursor := treat(a_other as ut_data_value_refcursor); l_diff_id ut_compound_data_helper.t_hash; + + --Variable for dynamic SQL - to review and simplify ?? l_table_stmt varchar2(32767); l_where_stmt varchar2(32767); l_join_by_stmt varchar2(32767); l_exec_sql varchar2(32767); + l_compare_sql varchar2(32767); + l_other ut_compound_data_value; l_result integer; + --Max rows to prevent out of memory for too much diffs especially on join by non unique + l_max_rows integer := greatest(self.elements_count,1000); + l_loop_curs sys_refcursor; + type t_diff_rec is record ( + act_item_data clob, + act_data_id raw(32), + exp_item_data clob, + exp_data_id raw(32), + item_no integer + ); + type t_diff_tab is table of t_diff_rec; + l_diff_tab t_diff_tab; + + --TEST + t1 pls_integer; + begin -- TODO : Add column filters!!!! @@ -290,7 +310,7 @@ create or replace type body ut_compound_data_value as if a_join_by_xpath is null then -- If no key defined do the join on all columns l_join_by_stmt := ut_compound_data_helper.generate_equal_sql(l_actual.columns_info); - l_compare_sql := l_compare_sql || q'[select a.item_data act_item_data, a.data_id act_data_id, e.item_data exp_item_data, e.data_id exp_data_id ]' + l_compare_sql := l_compare_sql || q'[select xmlelement( name "ROW", a.item_data) act_item_data, a.data_id act_data_id, xmlelement( name "ROW", e.item_data) exp_item_data, e.data_id exp_data_id, rownum item_no ]' || q'[from act a full outer join exp e on ( ]' ||l_join_by_stmt||q'[ ) where a.data_id is null or e.data_id is null]'; else @@ -298,8 +318,8 @@ create or replace type body ut_compound_data_value as l_where_stmt := ut_compound_data_helper.generate_not_equal_sql(l_actual.columns_info, a_join_by_xpath); --l_join_is_null := ut_compound_data_helper.generate_join_null_sql(l_actual.columns_info, a_join_by_xpath); l_join_by_stmt := ut_compound_data_helper.generate_join_by_on_stmt (l_actual.columns_info, a_join_by_xpath); - l_compare_sql := l_compare_sql || 'select a.item_data act_item_data, a.data_id act_data_id,' - ||' e.item_data exp_item_data, e.data_id exp_data_id from act a full outer join exp e on ( ' + l_compare_sql := l_compare_sql || 'select xmlserialize(content (xmlelement( name "ROW", a.item_data)) no indent) act_item_data, a.data_id act_data_id,' + ||' xmlserialize(content (xmlelement( name "ROW", e.item_data)) no indent) exp_item_data, e.data_id exp_data_id, rownum item_no from act a full outer join exp e on ( ' ||l_join_by_stmt||' ) ' ||' where '|| case @@ -313,11 +333,29 @@ create or replace type body ut_compound_data_value as l_exec_sql := 'insert into ' || l_ut_owner || '.ut_compound_data_diff_tmp ' ||'( diff_id, act_item_data, act_data_id, exp_item_data, exp_data_id, item_no )' - ||' select :diff_id, nvl2(act_item_data,xmlelement( name "ROW", act_item_data),null) act_item_data, act_data_id,' - ||' nvl2(exp_item_data,xmlelement( name "ROW", exp_item_data),null) exp_item_data, exp_data_id , rownum ' + ||' select :diff_id, act_item_data, act_data_id,' + ||' exp_item_data, exp_data_id , item_no ' ||'from ( '|| l_compare_sql ||')'; - execute immediate l_exec_sql using l_diff_id, self.data_id,l_actual.data_id; + open l_loop_curs for l_compare_sql using self.data_id,l_actual.data_id; + + loop + fetch l_loop_curs bulk collect into l_diff_tab limit l_max_rows; + exit when l_diff_tab.count = 0; + --Pass it to helper as authid as definer + t1 := dbms_utility.get_time; + + forall idx in 1..l_diff_tab.count + insert into ut3.ut_compound_data_diff_tmp + ( diff_id, act_item_data, act_data_id, exp_item_data, exp_data_id, item_no ) + values + (l_diff_id, l_diff_tab(idx).act_item_data, l_diff_tab(idx).act_data_id, l_diff_tab(idx).exp_item_data, l_diff_tab(idx).exp_data_id,l_diff_tab(idx).item_no); + dbms_output.put_line((dbms_utility.get_time - t1)/100 || ' seconds - get col info'); + --Exit after first fetch of max rows (to look later) + exit; + end loop; + + --execute immediate l_exec_sql using l_diff_id, self.data_id,l_actual.data_id; --result is OK only if both are same if sql%rowcount = 0 and self.elements_count = l_other.elements_count then l_result := 0; From be55366ded0dd27a30cd3d6861e6a1bef77bd086 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Mon, 5 Nov 2018 14:09:23 +0000 Subject: [PATCH 0067/1096] Inserting only first max display rows --- source/core/ut_utils.pks | 3 ++ .../data_values/ut_compound_data_helper.pkb | 9 ++++ .../data_values/ut_compound_data_helper.pks | 12 +++++ .../data_values/ut_compound_data_value.tpb | 53 +++++++++---------- 4 files changed, 50 insertions(+), 27 deletions(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 60f189a66..99ca0ed16 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -126,6 +126,9 @@ create or replace package ut_utils authid definer is gc_null_string constant varchar2(4) := 'NULL'; gc_empty_string constant varchar2(5) := 'EMPTY'; + gc_bc_fetch_limit constant integer := 1000; + gc_diff_max_rows constant integer := 20; + type t_version is record( major natural, minor natural, diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 7f48e4262..3d57100aa 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -863,5 +863,14 @@ create or replace package body ut_compound_data_helper is return l_sql_stmt; end; + procedure insert_diffs_result(a_diff_tab t_diff_tab, a_diff_id raw) is + begin + forall idx in 1..a_diff_tab.count + insert into ut3.ut_compound_data_diff_tmp + ( diff_id, act_item_data, act_data_id, exp_item_data, exp_data_id, item_no ) + values + (a_diff_id, a_diff_tab(idx).act_item_data, a_diff_tab(idx).act_data_id, a_diff_tab(idx).exp_item_data, a_diff_tab(idx).exp_data_id,a_diff_tab(idx).item_no); + end; + end; / diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index e092576a8..96887a01f 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -49,6 +49,15 @@ create or replace package ut_compound_data_helper authid definer is type tt_row_diffs is table of t_row_diffs; + type t_diff_rec is record ( + act_item_data clob, + act_data_id raw(32), + exp_item_data clob, + exp_data_id raw(32), + item_no integer + ); + type t_diff_tab is table of t_diff_rec; + function get_column_info_xml(a_column_details ut_key_anyval_pair) return xmltype; function get_columns_filter( @@ -96,5 +105,8 @@ create or replace package ut_compound_data_helper authid definer is function generate_join_by_on_stmt (a_column_info xmltype, a_join_by_xpath varchar2) return varchar2; function generate_join_null_sql (a_column_info xmltype, a_join_by_xpath varchar2) return varchar2; + + procedure insert_diffs_result(a_diff_tab t_diff_tab, a_diff_id raw); + end; / diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index 4730f23d4..022022aa1 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -78,7 +78,7 @@ create or replace type body ut_compound_data_value as member function get_data_diff(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean) return clob is - c_max_rows constant integer := 20; + c_max_rows integer := ut_utils.gc_diff_max_rows; l_result clob; l_results ut_utils.t_clob_tab := ut_utils.t_clob_tab(); l_message varchar2(32767); @@ -269,27 +269,21 @@ create or replace type body ut_compound_data_value as l_diff_id ut_compound_data_helper.t_hash; --Variable for dynamic SQL - to review and simplify ?? - l_table_stmt varchar2(32767); - l_where_stmt varchar2(32767); - l_join_by_stmt varchar2(32767); - l_exec_sql varchar2(32767); - l_compare_sql varchar2(32767); + l_table_stmt clob; + l_where_stmt clob; + l_join_by_stmt clob; + l_exec_sql clob; + l_compare_sql clob; l_other ut_compound_data_value; l_result integer; - --Max rows to prevent out of memory for too much diffs especially on join by non unique - l_max_rows integer := greatest(self.elements_count,1000); - l_loop_curs sys_refcursor; - type t_diff_rec is record ( - act_item_data clob, - act_data_id raw(32), - exp_item_data clob, - exp_data_id raw(32), - item_no integer - ); - type t_diff_tab is table of t_diff_rec; - l_diff_tab t_diff_tab; + --We will start with number od differences being displayed. + l_max_rows integer := ut_utils.gc_diff_max_rows; + l_loop_curs sys_refcursor; + l_diff_tab ut_compound_data_helper.t_diff_tab; + l_sql_rowcount integer :=0; + --TEST t1 pls_integer; @@ -345,19 +339,24 @@ create or replace type body ut_compound_data_value as --Pass it to helper as authid as definer t1 := dbms_utility.get_time; - forall idx in 1..l_diff_tab.count - insert into ut3.ut_compound_data_diff_tmp - ( diff_id, act_item_data, act_data_id, exp_item_data, exp_data_id, item_no ) - values - (l_diff_id, l_diff_tab(idx).act_item_data, l_diff_tab(idx).act_data_id, l_diff_tab(idx).exp_item_data, l_diff_tab(idx).exp_data_id,l_diff_tab(idx).item_no); - dbms_output.put_line((dbms_utility.get_time - t1)/100 || ' seconds - get col info'); - --Exit after first fetch of max rows (to look later) - exit; + if (ut_utils.gc_diff_max_rows > l_sql_rowcount ) then + ut_compound_data_helper.insert_diffs_result(l_diff_tab,l_diff_id); + end if; + + l_sql_rowcount := l_sql_rowcount + l_diff_tab.count; + + if (ut_utils.gc_diff_max_rows <= l_sql_rowcount and l_max_rows != ut_utils.gc_bc_fetch_limit ) then + l_max_rows := ut_utils.gc_bc_fetch_limit; + end if; + + dbms_output.put_line((dbms_utility.get_time - t1)/100 || ' seconds - get col info , values'||l_sql_rowcount); end loop; + --l_actual.set_difference_count(l_sql_rowcount); + --execute immediate l_exec_sql using l_diff_id, self.data_id,l_actual.data_id; --result is OK only if both are same - if sql%rowcount = 0 and self.elements_count = l_other.elements_count then + if l_sql_rowcount = 0 and self.elements_count = l_other.elements_count then l_result := 0; else l_result := 1; From ae3d34f820d26af5ccc3f3ec1c142828a29680c3 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Mon, 5 Nov 2018 17:25:12 +0000 Subject: [PATCH 0068/1096] Remove clob transformation --- source/expectations/data_values/ut_compound_data_diff_tmp.sql | 4 ++-- source/expectations/data_values/ut_compound_data_helper.pkb | 4 ++-- source/expectations/data_values/ut_compound_data_helper.pks | 4 ++-- source/expectations/data_values/ut_compound_data_value.tpb | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_diff_tmp.sql b/source/expectations/data_values/ut_compound_data_diff_tmp.sql index 5fdb53e10..c285d78fd 100644 --- a/source/expectations/data_values/ut_compound_data_diff_tmp.sql +++ b/source/expectations/data_values/ut_compound_data_diff_tmp.sql @@ -15,8 +15,8 @@ create global temporary table ut_compound_data_diff_tmp( diff_id raw(128), act_data_id raw(32), exp_data_id raw(32), - act_item_data clob, - exp_item_data clob, + act_item_data xmltype, + exp_item_data xmltype, item_no integer, pk_hash raw(128), item_hash raw(128), diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 3d57100aa..119c8be7c 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -181,7 +181,7 @@ create or replace package body ut_compound_data_helper is execute immediate q'[with diff_info as ( select act_data_id, exp_data_id, - xmltype(act_item_data) act_item_data, xmltype(exp_item_data) exp_item_data, :join_by join_by, item_no + act_item_data act_item_data, exp_item_data exp_item_data, :join_by join_by, item_no from ut_compound_data_diff_tmp where diff_id = :diff_id ), exp as ( @@ -869,7 +869,7 @@ create or replace package body ut_compound_data_helper is insert into ut3.ut_compound_data_diff_tmp ( diff_id, act_item_data, act_data_id, exp_item_data, exp_data_id, item_no ) values - (a_diff_id, a_diff_tab(idx).act_item_data, a_diff_tab(idx).act_data_id, a_diff_tab(idx).exp_item_data, a_diff_tab(idx).exp_data_id,a_diff_tab(idx).item_no); + (a_diff_id, xmlelement( name "ROW", a_diff_tab(idx).act_item_data), a_diff_tab(idx).act_data_id,xmlelement( name "ROW", a_diff_tab(idx).exp_item_data), a_diff_tab(idx).exp_data_id,a_diff_tab(idx).item_no); end; end; diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 96887a01f..a0aaaea91 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -50,9 +50,9 @@ create or replace package ut_compound_data_helper authid definer is type tt_row_diffs is table of t_row_diffs; type t_diff_rec is record ( - act_item_data clob, + act_item_data xmltype, act_data_id raw(32), - exp_item_data clob, + exp_item_data xmltype, exp_data_id raw(32), item_no integer ); diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index 022022aa1..8b6b15aee 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -312,8 +312,8 @@ create or replace type body ut_compound_data_value as l_where_stmt := ut_compound_data_helper.generate_not_equal_sql(l_actual.columns_info, a_join_by_xpath); --l_join_is_null := ut_compound_data_helper.generate_join_null_sql(l_actual.columns_info, a_join_by_xpath); l_join_by_stmt := ut_compound_data_helper.generate_join_by_on_stmt (l_actual.columns_info, a_join_by_xpath); - l_compare_sql := l_compare_sql || 'select xmlserialize(content (xmlelement( name "ROW", a.item_data)) no indent) act_item_data, a.data_id act_data_id,' - ||' xmlserialize(content (xmlelement( name "ROW", e.item_data)) no indent) exp_item_data, e.data_id exp_data_id, rownum item_no from act a full outer join exp e on ( ' + l_compare_sql := l_compare_sql || 'select a.item_data act_item_data, a.data_id act_data_id,' + ||' e.item_data exp_item_data, e.data_id exp_data_id, rownum item_no from act a full outer join exp e on ( ' ||l_join_by_stmt||' ) ' ||' where '|| case From 8911f974e6d832f90cb0213f93df88ba53636f3a Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 5 Nov 2018 23:25:28 +0000 Subject: [PATCH 0069/1096] Small improvements and cleanup. --- .../annotations/ut_annotation_manager.pkb | 61 ++--- source/core/types/ut_logical_suites.tps | 19 -- source/core/ut_suite_builder.pkb | 219 ++++++++---------- source/install.sql | 1 - 4 files changed, 126 insertions(+), 174 deletions(-) delete mode 100644 source/core/types/ut_logical_suites.tps diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index afa66b2e4..12eac0190 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -58,17 +58,18 @@ create or replace package body ut_annotation_manager as begin open l_result for q'[select s.name, s.text - from ]'||l_sources_view||q'[ s - where s.type = :a_object_type - and s.owner = :a_object_owner - and s.name - in (select x.name - from ]'||l_sources_view||q'[ x - where x.type = :a_object_type - and x.owner = :a_object_owner - and x.text like '%--%\%%' escape '\' - ) - order by name, line]' + from (select s.name, s.text, s.line, + max(case when s.text like '%--%\%%' escape '\' + and regexp_like(s.text,'--\s*%') + then 'Y' else 'N' end + ) + over(partition by s.name) is_annotated + from ]'||l_sources_view||q'[ s + where s.type = :a_object_type + and s.owner = :a_object_owner + ) s + where s.is_annotated = 'Y' + order by s.name, s.line]' using a_object_type, a_object_owner, a_object_type, a_object_owner; return l_result; @@ -81,25 +82,25 @@ create or replace package body ut_annotation_manager as begin l_card := ut_utils.scale_cardinality(cardinality(a_objects_to_refresh)); open l_result for - q'[select /*+ cardinality( r ]'||l_card||q'[ )*/ - s.name, s.text - from table(:a_objects_to_refresh) r - join ]'||l_sources_view||q'[ s - on s.name = r.object_name - where s.type = :a_object_type - and s.owner = :a_object_owner - and s.name - in (select /*+ cardinality( t ]'||l_card||q'[ )*/ - x.name - from table(:a_objects_to_refresh) t - join ]'||l_sources_view||q'[ x - on x.name = t.object_name - where x.type = :a_object_type - and x.owner = :a_object_owner - and x.text like '%--%\%%' escape '\' - ) - order by name, line]' - using a_objects_to_refresh, a_object_type, a_object_owner, a_objects_to_refresh, a_object_type, a_object_owner; + q'[select s.name, s.text + from (select /*+ cardinality( r ]'||l_card||q'[ )*/ + s.name, s.text, s.line, + max(case when s.text like '%--%\%%' escape '\' + and regexp_like(s.text,'--\s*%') + then 'Y' else 'N' end + ) + over(partition by s.name) is_annotated + from table(:a_objects_to_refresh) r + join ]'||l_sources_view||q'[ s + on s.name = r.object_name + and s.owner = r.object_owner + and s.type = r.object_type + where s.type = :a_object_type + and s.owner = :a_object_owner + ) s + where s.is_annotated = 'Y' + order by s.name, s.line]' + using a_objects_to_refresh, a_object_type, a_object_owner; return l_result; end; diff --git a/source/core/types/ut_logical_suites.tps b/source/core/types/ut_logical_suites.tps deleted file mode 100644 index 560f245d0..000000000 --- a/source/core/types/ut_logical_suites.tps +++ /dev/null @@ -1,19 +0,0 @@ -create or replace type ut_logical_suites as - /* - utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project - - Licensed under the Apache License, Version 2.0 (the "License"): - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - table of ut_logical_suite -/ diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index 6191bc7e8..f63088811 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -517,32 +517,6 @@ create or replace package body ut_suite_builder is a_suite_items( a_suite_items.last ) := l_test; end; - procedure propagate_before_after_each( - a_suite in out nocopy ut_logical_suite, - a_before_each_list tt_executables, - a_after_each_list tt_executables - ) is - l_test ut_test; - l_context ut_logical_suite; - begin - if a_suite.items is not null then - for i in 1 .. a_suite.items.count loop - if a_suite.items(i) is of (ut_test) then - l_test := treat( a_suite.items(i) as ut_test); - l_test.before_each_list := convert_list(a_before_each_list) multiset union all l_test.before_each_list; - set_seq_no(l_test.before_each_list); - l_test.after_each_list := l_test.after_each_list multiset union all convert_list(a_after_each_list); - set_seq_no(l_test.after_each_list); - a_suite.items(i) := l_test; - elsif a_suite.items(i) is of (ut_logical_suite) then - l_context := treat(a_suite.items(i) as ut_logical_suite); - propagate_before_after_each( l_context, a_before_each_list, a_after_each_list); - a_suite.items(i) := l_context; - end if; - end loop; - end if; - end; - procedure propagate_before_after_each( a_suite_items in out nocopy ut_suite_items, a_before_each_list tt_executables, @@ -929,113 +903,110 @@ create or replace package body ut_suite_builder is a_suite_data_cursor sys_refcursor ) is type t_item_levels is table of ut_suite_items index by binary_integer; + c_bulk_limit constant pls_integer := 1000; l_items_at_level t_item_levels; l_rows tt_cached_suites; - l_tests ut_suite_items := ut_suite_items(); - l_logical_suites ut_logical_suites := ut_logical_suites(); + l_test ut_test; + l_logical_suite ut_logical_suite; l_level pls_integer; l_prev_level pls_integer; l_idx integer; begin a_suites := ut_suite_items(); loop - if l_idx is null then - fetch a_suite_data_cursor bulk collect into l_rows limit 1000; - l_tests.delete; - l_tests.extend(l_rows.count); - l_logical_suites.delete; - l_logical_suites.extend(l_rows.count); - for i in 1 .. l_rows.count loop - case l_rows(i).self_type - when 'UT_TEST' then - l_tests(i) := - ut_test( - self_type => l_rows(i).self_type, - object_owner => l_rows(i).object_owner, object_name => lower(l_rows(i).object_name), - name => lower(l_rows(i).name), description => l_rows(i).description, path => l_rows(i).path, - rollback_type => l_rows(i).rollback_type, disabled_flag => l_rows(i).disabled_flag, - line_no => l_rows(i).line_no, parse_time => l_rows(i).parse_time, - start_time => null, end_time => null, result => null, warnings => l_rows(i).warnings, - results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), - before_each_list => sort_by_seq_no(l_rows(i).before_each_list), before_test_list => sort_by_seq_no(l_rows(i).before_test_list), - item => l_rows(i).item, - after_test_list => sort_by_seq_no(l_rows(i).after_test_list), after_each_list => sort_by_seq_no(l_rows(i).after_each_list), - all_expectations => ut_expectation_results(), failed_expectations => ut_expectation_results(), - parent_error_stack_trace => null, expected_error_codes => l_rows(i).expected_error_codes - ); - when 'UT_SUITE' then - l_logical_suites(i) := - ut_suite( - self_type => l_rows(i).self_type, - object_owner => l_rows(i).object_owner, object_name => lower(l_rows(i).object_name), - name => lower(l_rows(i).name), description => l_rows(i).description, path => l_rows(i).path, - rollback_type => l_rows(i).rollback_type, disabled_flag => l_rows(i).disabled_flag, - line_no => l_rows(i).line_no, parse_time => l_rows(i).parse_time, - start_time => null, end_time => null, result => null, warnings => l_rows(i).warnings, - results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), - items => ut_suite_items(), - before_all_list => sort_by_seq_no(l_rows(i).before_all_list), after_all_list => sort_by_seq_no(l_rows(i).after_all_list) - ); - when 'UT_SUITE_CONTEXT' then - l_logical_suites(i) := - ut_suite_context( - self_type => l_rows(i).self_type, - object_owner => l_rows(i).object_owner, object_name => lower(l_rows(i).object_name), - name => lower(l_rows(i).name), description => l_rows(i).description, path => l_rows(i).path, - rollback_type => l_rows(i).rollback_type, disabled_flag => l_rows(i).disabled_flag, - line_no => l_rows(i).line_no, parse_time => l_rows(i).parse_time, - start_time => null, end_time => null, result => null, warnings => l_rows(i).warnings, - results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), - items => ut_suite_items(), - before_all_list => sort_by_seq_no(l_rows(i).before_all_list), after_all_list => sort_by_seq_no(l_rows(i).after_all_list) - ); - when 'UT_LOGICAL_SUITE' then - l_logical_suites(i) := - ut_logical_suite( - self_type => l_rows(i).self_type, - object_owner => l_rows(i).object_owner, object_name => lower(l_rows(i).object_name), - name => lower(l_rows(i).name), description => l_rows(i).description, path => l_rows(i).path, - rollback_type => l_rows(i).rollback_type, disabled_flag => l_rows(i).disabled_flag, - line_no => l_rows(i).line_no, parse_time => l_rows(i).parse_time, - start_time => null, end_time => null, result => null, warnings => l_rows(i).warnings, - results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), - items => ut_suite_items() - ); - end case; - end loop; - l_idx := l_rows.first; - end if; - exit when l_idx is null; - l_level := length(l_rows(l_idx).path) - length( replace(l_rows(l_idx).path, '.') ) + 1; + fetch a_suite_data_cursor bulk collect into l_rows limit c_bulk_limit; + exit when l_rows.count = 0; - if l_level > 1 then - if l_prev_level > l_level then - l_logical_suites(l_idx).items := l_items_at_level(l_prev_level); - l_items_at_level(l_prev_level).delete; - end if; - if not l_items_at_level.exists(l_level) then - l_items_at_level(l_level) := ut_suite_items(); - end if; - l_items_at_level(l_level).extend; - if l_tests(l_idx) is not null then - l_items_at_level(l_level)(l_items_at_level(l_level).last) := l_tests(l_idx); - else - l_items_at_level(l_level)(l_items_at_level(l_level).last) := l_logical_suites(l_idx); - end if; - else - if l_prev_level > l_level then - l_logical_suites(l_idx).items := l_items_at_level(l_prev_level); - l_items_at_level(l_prev_level).delete; - end if; - a_suites.extend; - if l_tests(l_idx) is not null then - a_suites(a_suites.last) := l_tests(l_idx); + l_idx := l_rows.first; + loop + l_test := null; + l_logical_suite := null; + case l_rows(l_idx).self_type + when 'UT_TEST' then + l_test := + ut_test( + self_type => l_rows(l_idx).self_type, + object_owner => l_rows(l_idx).object_owner, object_name => lower(l_rows(l_idx).object_name), + name => lower(l_rows(l_idx).name), description => l_rows(l_idx).description, path => l_rows(l_idx).path, + rollback_type => l_rows(l_idx).rollback_type, disabled_flag => l_rows(l_idx).disabled_flag, + line_no => l_rows(l_idx).line_no, parse_time => l_rows(l_idx).parse_time, + start_time => null, end_time => null, result => null, warnings => l_rows(l_idx).warnings, + results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), + before_each_list => sort_by_seq_no(l_rows(l_idx).before_each_list), before_test_list => sort_by_seq_no(l_rows(l_idx).before_test_list), + item => l_rows(l_idx).item, + after_test_list => sort_by_seq_no(l_rows(l_idx).after_test_list), after_each_list => sort_by_seq_no(l_rows(l_idx).after_each_list), + all_expectations => ut_expectation_results(), failed_expectations => ut_expectation_results(), + parent_error_stack_trace => null, expected_error_codes => l_rows(l_idx).expected_error_codes + ); + when 'UT_SUITE' then + l_logical_suite := + ut_suite( + self_type => l_rows(l_idx).self_type, + object_owner => l_rows(l_idx).object_owner, object_name => lower(l_rows(l_idx).object_name), + name => lower(l_rows(l_idx).name), description => l_rows(l_idx).description, path => l_rows(l_idx).path, + rollback_type => l_rows(l_idx).rollback_type, disabled_flag => l_rows(l_idx).disabled_flag, + line_no => l_rows(l_idx).line_no, parse_time => l_rows(l_idx).parse_time, + start_time => null, end_time => null, result => null, warnings => l_rows(l_idx).warnings, + results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), + items => ut_suite_items(), + before_all_list => sort_by_seq_no(l_rows(l_idx).before_all_list), after_all_list => sort_by_seq_no(l_rows(l_idx).after_all_list) + ); + when 'UT_SUITE_CONTEXT' then + l_logical_suite := + ut_suite_context( + self_type => l_rows(l_idx).self_type, + object_owner => l_rows(l_idx).object_owner, object_name => lower(l_rows(l_idx).object_name), + name => lower(l_rows(l_idx).name), description => l_rows(l_idx).description, path => l_rows(l_idx).path, + rollback_type => l_rows(l_idx).rollback_type, disabled_flag => l_rows(l_idx).disabled_flag, + line_no => l_rows(l_idx).line_no, parse_time => l_rows(l_idx).parse_time, + start_time => null, end_time => null, result => null, warnings => l_rows(l_idx).warnings, + results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), + items => ut_suite_items(), + before_all_list => sort_by_seq_no(l_rows(l_idx).before_all_list), after_all_list => sort_by_seq_no(l_rows(l_idx).after_all_list) + ); + when 'UT_LOGICAL_SUITE' then + l_logical_suite := + ut_logical_suite( + self_type => l_rows(l_idx).self_type, + object_owner => l_rows(l_idx).object_owner, object_name => lower(l_rows(l_idx).object_name), + name => lower(l_rows(l_idx).name), description => l_rows(l_idx).description, path => l_rows(l_idx).path, + rollback_type => l_rows(l_idx).rollback_type, disabled_flag => l_rows(l_idx).disabled_flag, + line_no => l_rows(l_idx).line_no, parse_time => l_rows(l_idx).parse_time, + start_time => null, end_time => null, result => null, warnings => l_rows(l_idx).warnings, + results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), + items => ut_suite_items() + ); + end case; + + l_level := length(l_rows(l_idx).path) - length( replace(l_rows(l_idx).path, '.') ) + 1; + + if l_level > 1 then + if l_prev_level > l_level then + l_logical_suite.items := l_items_at_level(l_prev_level); + l_items_at_level(l_prev_level).delete; + end if; + if not l_items_at_level.exists(l_level) then + l_items_at_level(l_level) := ut_suite_items(); + end if; + l_items_at_level(l_level).extend; + if l_test is not null then + l_items_at_level(l_level)(l_items_at_level(l_level).last) := l_test; + else + l_items_at_level(l_level)(l_items_at_level(l_level).last) := l_logical_suite; + end if; else - a_suites(a_suites.last) := l_logical_suites(l_idx); + if l_prev_level > l_level then + l_logical_suite.items := l_items_at_level(l_prev_level); + l_items_at_level(l_prev_level).delete; + end if; + a_suites.extend; + a_suites(a_suites.last) := l_logical_suite; end if; - end if; - l_prev_level := l_level; - l_idx := l_rows.next(l_idx); + l_prev_level := l_level; + l_idx := l_rows.next(l_idx); + exit when l_idx is null; + end loop; + exit when l_rows.count < c_bulk_limit; end loop; copy_list_reverse_order( a_suites ); close a_suite_data_cursor; @@ -1066,7 +1037,7 @@ create or replace package body ut_suite_builder is open l_result for q'[with suite_items as ( - select c.* + select /*+ cardinality(c 100) */ c.* from ]'||l_ut_owner||q'[.ut_suite_cache c where 1 = 1 ]'||case when not a_skip_all_objects then q'[ and exists @@ -1093,7 +1064,7 @@ create or replace package body ut_suite_builder is ), gen as ( select rownum as pos - from xmltable('1 to 100') + from xmltable('1 to 20') ), suitepaths as ( select distinct substr(path,1,instr(path,'.',-1)-1) as suitepath, diff --git a/source/install.sql b/source/install.sql index 2a7ff8343..31b91a941 100644 --- a/source/install.sql +++ b/source/install.sql @@ -70,7 +70,6 @@ alter session set current_schema = &&ut3_owner; @@install_component.sql 'core/types/ut_executable_test.tps' @@install_component.sql 'core/types/ut_test.tps' @@install_component.sql 'core/types/ut_logical_suite.tps' -@@install_component.sql 'core/types/ut_logical_suites.tps' @@install_component.sql 'core/types/ut_suite.tps' @@install_component.sql 'core/types/ut_suite_context.tps' @@install_component.sql 'core/types/ut_file_mapping.tps' From a1f6b3499cc048d6ea4887546097c0e884845cd7 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 6 Nov 2018 00:33:39 +0000 Subject: [PATCH 0070/1096] Removing duplicate with block. --- source/core/ut_suite_builder.pkb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index f63088811..f6aceae89 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -1062,10 +1062,6 @@ create or replace package body ut_suite_builder is ) ) ), - gen as ( - select rownum as pos - from xmltable('1 to 20') - ), suitepaths as ( select distinct substr(path,1,instr(path,'.',-1)-1) as suitepath, path, @@ -1075,7 +1071,7 @@ create or replace package body ut_suite_builder is ), gen as ( select rownum as pos - from xmltable('1 to 10') + from xmltable('1 to 20') ), suitepath_part AS ( select distinct From b4113fd13e71eb2782eb16cefacc01feb572fc89 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Tue, 6 Nov 2018 07:42:02 +0000 Subject: [PATCH 0071/1096] Check in progress of working version. Still to define include and exclude. --- source/api/ut_runner.pkb | 1 + .../data_values/ut_compound_data_helper.pkb | 18 ++++++++++++- .../data_values/ut_compound_data_helper.pks | 6 +++++ .../data_values/ut_compound_data_value.tpb | 25 ++++++++----------- .../data_values/ut_compound_data_value.tps | 2 +- .../expectations/test_expectations_cursor.pkb | 14 +++++------ 6 files changed, 43 insertions(+), 23 deletions(-) diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index c04fa5112..39862de61 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -49,6 +49,7 @@ create or replace package body ut_runner is ut_metadata.reset_source_definition_cache; ut_utils.read_cache_to_dbms_output(); ut_coverage_helper.cleanup_tmp_table(); + ut_compound_data_helper.cleanup_diff(); end; diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 119c8be7c..a07f15fdd 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -17,6 +17,7 @@ create or replace package body ut_compound_data_helper is */ g_user_defined_type pls_integer := dbms_sql.user_defined_type; + gc_diff_count integer; function get_column_info_xml(a_column_details ut_key_anyval_pair) return xmltype is l_result varchar2(4000); @@ -822,7 +823,7 @@ create or replace package body ut_compound_data_helper is where not exists (select 1 from pk_names p where lower(p.name) = lower(xt.name)) ) loop - l_sql_stmt := l_sql_stmt || case when l_sql_stmt is null then null else ' or ' end ||' a.'||i.name||q'[ <> ]'||' e.'||i.name; + l_sql_stmt := l_sql_stmt || case when l_sql_stmt is null then null else ' or ' end ||' (decode(a.'||i.name||','||' e.'||i.name||',1,0) = 0)'; end loop; return l_sql_stmt; end; @@ -872,5 +873,20 @@ create or replace package body ut_compound_data_helper is (a_diff_id, xmlelement( name "ROW", a_diff_tab(idx).act_item_data), a_diff_tab(idx).act_data_id,xmlelement( name "ROW", a_diff_tab(idx).exp_item_data), a_diff_tab(idx).exp_data_id,a_diff_tab(idx).item_no); end; + procedure set_rows_diff(a_rows_diff integer) is + begin + gc_diff_count := a_rows_diff; + end; + + procedure cleanup_diff is + begin + gc_diff_count := 0; + end; + + function get_rows_diff return integer is + begin + return gc_diff_count; + end; + end; / diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index a0aaaea91..9fe410647 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -108,5 +108,11 @@ create or replace package ut_compound_data_helper authid definer is procedure insert_diffs_result(a_diff_tab t_diff_tab, a_diff_id raw); + procedure set_rows_diff(a_rows_diff integer); + + procedure cleanup_diff; + + function get_rows_diff return integer; + end; / diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index 8b6b15aee..cf3caf911 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -121,7 +121,12 @@ create or replace type body ut_compound_data_value as l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_actual.data_id); -- First tell how many rows are different - execute immediate 'select count(' + + --REDO that is a bit mess ?? + if l_is_sql_diff = 1 then + l_diff_row_count := ut_compound_data_helper.get_rows_diff; + else + execute immediate 'select count(' ||case when ( a_join_by_xpath is not null and l_is_sql_diff = 0 ) then 'distinct pk_hash' else '*' @@ -129,7 +134,8 @@ create or replace type body ut_compound_data_value as ||') from '|| l_ut_owner || '.ut_compound_data_diff_tmp ' ||'where diff_id = :diff_id' into l_diff_row_count using l_diff_id; - + end if; + if l_diff_row_count > 0 then l_compare_type := ut_compound_data_helper.compare_type(a_join_by_xpath,a_unordered, l_is_sql_diff); l_row_diffs := ut_compound_data_helper.get_rows_diff( @@ -324,12 +330,6 @@ create or replace type body ut_compound_data_value as end ||'( a.data_id is null or e.data_id is null )'; end if; - - l_exec_sql := 'insert into ' || l_ut_owner || '.ut_compound_data_diff_tmp ' - ||'( diff_id, act_item_data, act_data_id, exp_item_data, exp_data_id, item_no )' - ||' select :diff_id, act_item_data, act_data_id,' - ||' exp_item_data, exp_data_id , item_no ' - ||'from ( '|| l_compare_sql ||')'; open l_loop_curs for l_compare_sql using self.data_id,l_actual.data_id; @@ -337,8 +337,7 @@ create or replace type body ut_compound_data_value as fetch l_loop_curs bulk collect into l_diff_tab limit l_max_rows; exit when l_diff_tab.count = 0; --Pass it to helper as authid as definer - t1 := dbms_utility.get_time; - + if (ut_utils.gc_diff_max_rows > l_sql_rowcount ) then ut_compound_data_helper.insert_diffs_result(l_diff_tab,l_diff_id); end if; @@ -349,12 +348,10 @@ create or replace type body ut_compound_data_value as l_max_rows := ut_utils.gc_bc_fetch_limit; end if; - dbms_output.put_line((dbms_utility.get_time - t1)/100 || ' seconds - get col info , values'||l_sql_rowcount); end loop; + + ut_compound_data_helper.set_rows_diff(l_sql_rowcount); - --l_actual.set_difference_count(l_sql_rowcount); - - --execute immediate l_exec_sql using l_diff_id, self.data_id,l_actual.data_id; --result is OK only if both are same if l_sql_rowcount = 0 and self.elements_count = l_other.elements_count then l_result := 0; diff --git a/source/expectations/data_values/ut_compound_data_value.tps b/source/expectations/data_values/ut_compound_data_value.tps index 76a3b09e8..97370eea6 100644 --- a/source/expectations/data_values/ut_compound_data_value.tps +++ b/source/expectations/data_values/ut_compound_data_value.tps @@ -34,7 +34,7 @@ create or replace type ut_compound_data_value force under ut_data_value( * Holds unique id for retrieving the data from ut_compound_data_tmp temp table */ data_id raw(16), - + overriding member function get_object_info return varchar2, overriding member function is_null return boolean, overriding member function is_diffable return boolean, diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index 04bbbe5d9..00236f99e 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -1087,13 +1087,13 @@ Rows: [ 2 differences ]% l_expected SYS_REFCURSOR; begin --Arrange - open l_actual for select owner, object_name,object_type from all_objects where owner = user + open l_actual for select object_id, owner, object_name,object_type from all_objects where owner = user order by 1,2,3 asc; - open l_expected for select owner, object_name,object_type from all_objects where owner = user + open l_expected for select object_id, owner, object_name,object_type from all_objects where owner = user order by 1,2,3 desc; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OWNER'); + ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OBJECT_ID'); --Assert ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; @@ -1109,7 +1109,7 @@ Rows: [ 2 differences ]% order by 1,2,3 desc; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by(ut3.ut_varchar2_list('OWNER,OBJECT_NAME')); + ut3.ut.expect(l_actual).to_equal(l_expected).join_by(ut3.ut_varchar2_list('OBJECT_NAME,OBJECT_TYPE')); --Assert ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; @@ -1257,10 +1257,10 @@ Diff:% l_expected SYS_REFCURSOR; begin --Arrange - open l_actual for select object_name from all_objects where rownum <=1100; - open l_expected for select object_name from all_objects where rownum <=1100; + open l_actual for select level object_id, level || '_TEST' object_name from dual connect by level <=1100; + open l_expected for select level object_id, level || '_TEST' object_name from dual connect by level <=1100; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OBJECT_NAME'); + ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OBJECT_ID'); --Assert ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; From 816a1c1a17a49c770318e91338563d38bccfbe49 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Tue, 6 Nov 2018 13:25:20 +0000 Subject: [PATCH 0072/1096] Beautify sql generation --- .../data_values/ut_compound_data_helper.pkb | 198 ++++++++++-------- .../data_values/ut_compound_data_helper.pks | 13 +- .../data_values/ut_compound_data_value.tpb | 61 +----- 3 files changed, 125 insertions(+), 147 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index a07f15fdd..245a8b525 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -175,10 +175,8 @@ create or replace package body ut_compound_data_helper is ) return tt_row_diffs is l_column_filter varchar2(32767); l_results tt_row_diffs; - t1 integer; begin l_column_filter := get_columns_row_filter(a_exclude_xpath,a_include_xpath); - t1 := dbms_utility.get_time; execute immediate q'[with diff_info as ( select act_data_id, exp_data_id, @@ -214,9 +212,7 @@ create or replace package body ut_compound_data_helper is where act_data_id is null or exp_data_id is null]' bulk collect into l_results using a_join_by_xpath, a_diff_id, a_expected_dataset_guid,a_actual_dataset_guid; - - dbms_output.put_line((dbms_utility.get_time - t1)/100 || ' seconds - get col info'); - + return l_results; end; @@ -765,105 +761,141 @@ create or replace package body ut_compound_data_helper is return l_sql; end; - function generate_xmltab_stmt (a_column_info xmltype) return varchar2 is - l_sql_stmt varchar2(32767); - begin - for i in (select /*+ CARDINALITY(xt 100) */ - xt.name - from (select a_column_info item_data from dual) x, - xmltable( - '/ROW/*' - passing x.item_data - columns - name varchar2(4000) PATH '@xml_valid_name' - ) xt) - loop - l_sql_stmt := l_sql_stmt || case when l_sql_stmt is null then null else ',' end ||i.name||q'[ varchar2(4000) PATH ']'||i.name||q'[']'; + function generate_xmltab_stmt (a_column_info ut_varchar2_list, a_inc_filter ut_varchar2_list, a_exc_filter ut_varchar2_list) return clob is + l_sql_stmt clob; + begin + for i in 1..a_column_info.count loop + l_sql_stmt := l_sql_stmt || case when l_sql_stmt is null then null else ',' end ||a_column_info(i)||q'[ varchar2(4000) PATH ']'||a_column_info(i)||q'[']'; end loop; return l_sql_stmt; end; - - function generate_equal_sql (a_column_info xmltype) return varchar2 is - l_sql_stmt varchar2(32767); + + function generate_equal_sql (a_column_info ut_varchar2_list, a_inc_filter ut_varchar2_list, a_exc_filter ut_varchar2_list) return clob is + l_sql_stmt clob; begin - for i in (select /*+ CARDINALITY(xt 100) */ - xt.name - from (select a_column_info item_data from dual) x, - xmltable( - '/ROW/*' - passing x.item_data - columns - name varchar2(4000) PATH '@xml_valid_name' - ) xt) + for i in 1..a_column_info.count loop + l_sql_stmt := l_sql_stmt || case when l_sql_stmt is null then null else ' and ' end ||' a.'||a_column_info(i)||q'[ = ]'||' e.'||a_column_info(i); + end loop; + + return l_sql_stmt; + end; + + function generate_join_by_on_stmt (a_join_by_xpath_tab ut_varchar2_list) return clob is + l_sql_stmt clob; + begin + for i in (with xpaths_tab as (select column_value xpath from table(a_join_by_xpath_tab)) + select REGEXP_SUBSTR (xpath,'[^(/\*/)](.+)$') name + from xpaths_tab) loop l_sql_stmt := l_sql_stmt || case when l_sql_stmt is null then null else ' and ' end ||' a.'||i.name||q'[ = ]'||' e.'||i.name; end loop; return l_sql_stmt; end; - - function generate_not_equal_sql (a_column_info xmltype, a_join_by_xpath varchar2) return varchar2 is - l_sql_stmt varchar2(32767); - l_pk_xpath_tabs ut_varchar2_list := ut_varchar2_list(); - begin - l_pk_xpath_tabs := ut_utils.string_to_table(a_join_by_xpath,'|'); - + + function generate_not_equal_sql (a_column_info ut_varchar2_list, a_join_by_xpath ut_varchar2_list) return clob is + l_sql_stmt clob; + begin for i in ( - with xpaths_tab as (select column_value xpath from table(l_pk_xpath_tabs)), + with xpaths_tab as (select column_value xpath from table(a_join_by_xpath)), pk_names as (select REGEXP_SUBSTR (xpath,'[^(/\*/)](.+)$') name from xpaths_tab) - select /*+ CARDINALITY(xt 100) */ - xt.name - from (select a_column_info item_data from dual) x, - xmltable( - '/ROW/*' - passing x.item_data - columns - name varchar2(4000) PATH '@xml_valid_name' - ) xt - where not exists (select 1 from pk_names p where lower(p.name) = lower(xt.name)) - ) + select /*+ CARDINALITY(xt 100) */ + column_value as name + from table(a_column_info) xt + where not exists (select 1 from pk_names p where lower(p.name) = lower(xt.column_value)) + ) loop l_sql_stmt := l_sql_stmt || case when l_sql_stmt is null then null else ' or ' end ||' (decode(a.'||i.name||','||' e.'||i.name||',1,0) = 0)'; end loop; return l_sql_stmt; - end; + end; - function generate_join_by_on_stmt (a_column_info xmltype, a_join_by_xpath varchar2) return varchar2 is - l_sql_stmt varchar2(32767); - l_pk_xpath_tabs ut_varchar2_list := ut_varchar2_list(); + function gen_compare_sql(a_column_info xmltype, a_exclude_xpath varchar2, + a_include_xpath varchar2, a_join_by_xpath varchar2) return clob is + l_compare_sql clob; + l_column_filter varchar2(32767); + l_temp_string varchar2(32767); - begin - l_pk_xpath_tabs := ut_utils.string_to_table(a_join_by_xpath,'|'); - - for i in (with xpaths_tab as (select column_value xpath from table(l_pk_xpath_tabs)) - select REGEXP_SUBSTR (xpath,'[^(/\*/)](.+)$') name - from xpaths_tab) - loop - l_sql_stmt := l_sql_stmt || case when l_sql_stmt is null then null else ' and ' end ||' a.'||i.name||q'[ = ]'||' e.'||i.name; - end loop; - return l_sql_stmt; - end; - - function generate_join_null_sql (a_column_info xmltype, a_join_by_xpath varchar2) return varchar2 is - l_sql_stmt varchar2(32767); l_pk_xpath_tabs ut_varchar2_list := ut_varchar2_list(); + l_xpath_inc_tab ut_varchar2_list := ut_varchar2_list(); + l_xpath_exc_tab ut_varchar2_list := ut_varchar2_list(); + l_col_info_tab ut_varchar2_list := ut_varchar2_list(); + + l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_xmltable_stmt clob; + l_where_stmt clob; + function get_columns_names (a_xpath_tab in ut_varchar2_list) return ut_varchar2_list is + l_names_tab ut_varchar2_list := ut_varchar2_list(); + begin + select REGEXP_SUBSTR (column_value,'[^(/\*/)](.+)$') + bulk collect into l_names_tab + from table(a_xpath_tab); + return l_names_tab; + end; + + function get_columns_info (a_columns_info in xmltype) return ut_varchar2_list is + l_columns_info ut_varchar2_list := ut_varchar2_list(); + begin + select /*+ CARDINALITY(xt 100) */ + xt.name + bulk collect into l_columns_info + from (select a_column_info item_data from dual) x, + xmltable( + '/ROW/*' + passing x.item_data + columns + name varchar2(4000) PATH '@xml_valid_name' + ) xt; + return l_columns_info; + end; + begin - l_pk_xpath_tabs := ut_utils.string_to_table(a_join_by_xpath,'|'); - - for i in (with xpaths_tab as (select column_value xpath from table(l_pk_xpath_tabs)) - select REGEXP_SUBSTR (xpath,'[^(/\*/)](.+)$') name - from xpaths_tab) - loop - l_sql_stmt := l_sql_stmt || case - when l_sql_stmt is null - then null - else ' or ' - end ||' a.'||i.name||q'[ is null or ]'||' e.'||i.name||q'[ is null]'; - end loop; - return l_sql_stmt; - end; - + dbms_lob.createtemporary(l_compare_sql, true); + l_column_filter := ut_compound_data_helper.get_columns_filter(a_exclude_xpath, a_include_xpath); + l_pk_xpath_tabs := get_columns_names(ut_utils.string_to_table(a_join_by_xpath,'|')); + l_xpath_inc_tab := get_columns_names(ut_utils.string_to_table(a_include_xpath,'|')); + l_xpath_exc_tab := get_columns_names(ut_utils.string_to_table(a_exclude_xpath,'|')); + l_col_info_tab := get_columns_info(a_column_info); + l_xmltable_stmt := generate_xmltab_stmt(l_col_info_tab, l_xpath_inc_tab, l_xpath_exc_tab); + + l_temp_string := q'[with exp as (select ucd.*,x.item_no,x.data_id from (select item_data,item_no,data_id from ]' || l_ut_owner || q'[.ut_compound_data_tmp where data_id = :self_guid) x,]' + ||q'[xmltable('/ROWSET/ROW' passing x.item_data columns ]'; + ut_utils.append_to_clob(l_compare_sql, l_temp_string); + ut_utils.append_to_clob(l_compare_sql,l_xmltable_stmt); + + l_temp_string := q'[ ,item_data xmltype PATH '*' ) ucd),]' + ||q'[act as (select ucd.*, x.item_no,x.data_id from (select item_data,item_no,data_id from ]' || l_ut_owner || q'[.ut_compound_data_tmp where data_id = :other_guid) x,]' + ||q'[xmltable('/ROWSET/ROW' passing x.item_data columns ]' ; + ut_utils.append_to_clob(l_compare_sql,l_temp_string); + ut_utils.append_to_clob(l_compare_sql,l_xmltable_stmt||q'[ ,item_data xmltype PATH '*') ucd)]'); + + if a_join_by_xpath is null then + -- If no key defined do the join on all columns + l_temp_string := q'[select xmlelement( name "ROW", a.item_data) act_item_data, a.data_id act_data_id, xmlelement( name "ROW", e.item_data) exp_item_data, e.data_id exp_data_id, rownum item_no ]' + || q'[from act a full outer join exp e on ( ]'; + ut_utils.append_to_clob(l_compare_sql,l_temp_string); + ut_utils.append_to_clob(l_compare_sql,ut_compound_data_helper.generate_equal_sql(l_col_info_tab, l_xpath_inc_tab, l_xpath_exc_tab)||q'[ ) where a.data_id is null or e.data_id is null]'); + else + -- If key defined do the join or these and where on diffrences + l_temp_string := 'select a.item_data act_item_data, a.data_id act_data_id,' + ||' e.item_data exp_item_data, e.data_id exp_data_id, rownum item_no from act a full outer join exp e on ( '; + ut_utils.append_to_clob(l_compare_sql,l_temp_string); + + ut_utils.append_to_clob(l_compare_sql,ut_compound_data_helper.generate_join_by_on_stmt (l_pk_xpath_tabs)||' ) where '); + + l_where_stmt := ut_compound_data_helper.generate_not_equal_sql(l_col_info_tab, l_pk_xpath_tabs); + case + when l_where_stmt is null then + null; + else + ut_utils.append_to_clob(l_compare_sql,'( '||l_where_stmt||' ) or ( a.data_id is null or e.data_id is null )'); + end case; + end if; + + return l_compare_sql; + end; + procedure insert_diffs_result(a_diff_tab t_diff_tab, a_diff_id raw) is begin forall idx in 1..a_diff_tab.count diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 9fe410647..7c1933a16 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -96,16 +96,9 @@ create or replace package ut_compound_data_helper authid definer is procedure update_row_and_pk_hash(a_self_data_id in raw, a_other_data_id in raw, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2); - function generate_xmltab_stmt (a_column_info xmltype) return varchar2; - - function generate_equal_sql (a_column_info xmltype) return varchar2; - - function generate_not_equal_sql (a_column_info xmltype, a_join_by_xpath varchar2) return varchar2; - - function generate_join_by_on_stmt (a_column_info xmltype, a_join_by_xpath varchar2) return varchar2; - - function generate_join_null_sql (a_column_info xmltype, a_join_by_xpath varchar2) return varchar2; - + function gen_compare_sql(a_column_info xmltype, a_exclude_xpath varchar2, + a_include_xpath varchar2, a_join_by_xpath varchar2) return clob; + procedure insert_diffs_result(a_diff_tab t_diff_tab, a_diff_id raw); procedure set_rows_diff(a_rows_diff integer); diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index cf3caf911..af8a4f748 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -270,17 +270,9 @@ create or replace type body ut_compound_data_value as member function compare_implementation_by_sql(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_inclusion_compare boolean := false) return integer is - l_ut_owner varchar2(250) := ut_utils.ut_owner; l_actual ut_data_value_refcursor := treat(a_other as ut_data_value_refcursor); l_diff_id ut_compound_data_helper.t_hash; - - --Variable for dynamic SQL - to review and simplify ?? - l_table_stmt clob; - l_where_stmt clob; - l_join_by_stmt clob; - l_exec_sql clob; - l_compare_sql clob; - + l_other ut_compound_data_value; l_result integer; --We will start with number od differences being displayed. @@ -289,55 +281,18 @@ create or replace type body ut_compound_data_value as l_loop_curs sys_refcursor; l_diff_tab ut_compound_data_helper.t_diff_tab; l_sql_rowcount integer :=0; - - --TEST - t1 pls_integer; begin - -- TODO : Add column filters!!!! - l_other := treat(a_other as ut_compound_data_value); - l_table_stmt := ut_compound_data_helper.generate_xmltab_stmt(l_actual.columns_info); - l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); - - l_compare_sql := q'[with exp as (select xt.*,x.item_no,x.data_id from (select item_data,item_no,data_id from ]' || l_ut_owner || q'[.ut_compound_data_tmp where data_id = :self_guid) x,]' - ||q'[xmltable('/ROWSET/ROW' passing x.item_data columns ]' - ||l_table_stmt||q'[ ,item_data xmltype PATH '*' ) xt),]' - ||q'[act as (select xt.*, x.item_no,x.data_id from (select item_data,item_no,data_id from ]' || l_ut_owner || q'[.ut_compound_data_tmp where data_id = :other_guid) x,]' - ||q'[xmltable('/ROWSET/ROW' passing x.item_data columns ]' || - l_table_stmt||q'[ ,item_data xmltype PATH '*') xt)]'; - - if a_join_by_xpath is null then - -- If no key defined do the join on all columns - l_join_by_stmt := ut_compound_data_helper.generate_equal_sql(l_actual.columns_info); - l_compare_sql := l_compare_sql || q'[select xmlelement( name "ROW", a.item_data) act_item_data, a.data_id act_data_id, xmlelement( name "ROW", e.item_data) exp_item_data, e.data_id exp_data_id, rownum item_no ]' - || q'[from act a full outer join exp e on ( ]' - ||l_join_by_stmt||q'[ ) where a.data_id is null or e.data_id is null]'; - else - -- If key defined do the join or these and where on diffrences - l_where_stmt := ut_compound_data_helper.generate_not_equal_sql(l_actual.columns_info, a_join_by_xpath); - --l_join_is_null := ut_compound_data_helper.generate_join_null_sql(l_actual.columns_info, a_join_by_xpath); - l_join_by_stmt := ut_compound_data_helper.generate_join_by_on_stmt (l_actual.columns_info, a_join_by_xpath); - l_compare_sql := l_compare_sql || 'select a.item_data act_item_data, a.data_id act_data_id,' - ||' e.item_data exp_item_data, e.data_id exp_data_id, rownum item_no from act a full outer join exp e on ( ' - ||l_join_by_stmt||' ) ' - ||' where '|| - case - when l_where_stmt is null then - null - else - '( '||l_where_stmt||' ) or' - end - ||'( a.data_id is null or e.data_id is null )'; - end if; - - open l_loop_curs for l_compare_sql using self.data_id,l_actual.data_id; - + l_other := treat(a_other as ut_compound_data_value); + l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); + + open l_loop_curs for ut_compound_data_helper.gen_compare_sql(l_actual.columns_info, a_exclude_xpath, + a_include_xpath, a_join_by_xpath) using self.data_id,l_actual.data_id; loop fetch l_loop_curs bulk collect into l_diff_tab limit l_max_rows; exit when l_diff_tab.count = 0; --Pass it to helper as authid as definer - if (ut_utils.gc_diff_max_rows > l_sql_rowcount ) then ut_compound_data_helper.insert_diffs_result(l_diff_tab,l_diff_id); end if; @@ -347,11 +302,9 @@ create or replace type body ut_compound_data_value as if (ut_utils.gc_diff_max_rows <= l_sql_rowcount and l_max_rows != ut_utils.gc_bc_fetch_limit ) then l_max_rows := ut_utils.gc_bc_fetch_limit; end if; - end loop; - ut_compound_data_helper.set_rows_diff(l_sql_rowcount); - + ut_compound_data_helper.set_rows_diff(l_sql_rowcount); --result is OK only if both are same if l_sql_rowcount = 0 and self.elements_count = l_other.elements_count then l_result := 0; From e5de7d20a26ec576fd8d8937ba7632133cdfa074 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Tue, 6 Nov 2018 20:14:39 +0000 Subject: [PATCH 0073/1096] Tidy up Add include and exclude filters --- .../data_values/ut_compound_data_helper.pkb | 79 +++++++++++-------- .../data_values/ut_compound_data_value.tpb | 2 +- 2 files changed, 46 insertions(+), 35 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 245a8b525..6bfe0af6f 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -173,15 +173,18 @@ create or replace package body ut_compound_data_helper is a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2 ) return tt_row_diffs is - l_column_filter varchar2(32767); + + l_act_col_filter varchar2(32767); + l_exp_col_filter varchar2(32767); l_results tt_row_diffs; begin - l_column_filter := get_columns_row_filter(a_exclude_xpath,a_include_xpath); + l_act_col_filter := get_columns_row_filter(a_exclude_xpath,a_include_xpath,'ucd','act_item_data'); + l_exp_col_filter := get_columns_row_filter(a_exclude_xpath,a_include_xpath,'ucd','exp_item_data'); execute immediate q'[with diff_info as - ( select act_data_id, exp_data_id, - act_item_data act_item_data, exp_item_data exp_item_data, :join_by join_by, item_no - from ut_compound_data_diff_tmp + ( select act_data_id, exp_data_id,]' + ||l_act_col_filter||','|| l_exp_col_filter||q'[, :join_by join_by, item_no + from ut_compound_data_diff_tmp ucd where diff_id = :diff_id ), exp as ( select exp_item_data, exp_data_id, item_no rn,rownum col_no, @@ -206,12 +209,14 @@ create or replace package body ut_compound_data_helper is unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:') ) union all select item_no as rn, case when exp_data_id is null then 'Extra' else 'Missing' end as diff_type, - xmlserialize(content nvl(exp_item_data, act_item_data) no indent) diffed_row, - nvl2(i.join_by,ut3.ut_compound_data_helper.get_pk_value(i.join_by,coalesce(exp_item_data,act_item_data)),null) pk_value + xmlserialize(content (case when exp_data_id is null then act_item_data else exp_item_data end) no indent) diffed_row, + nvl2(i.join_by,ut3.ut_compound_data_helper.get_pk_value(i.join_by,case when exp_data_id is null then act_item_data else exp_item_data end),null) pk_value from diff_info i where act_data_id is null or exp_data_id is null]' bulk collect into l_results - using a_join_by_xpath, a_diff_id, a_expected_dataset_guid,a_actual_dataset_guid; + using a_exclude_xpath,a_include_xpath, + a_exclude_xpath,a_include_xpath, + a_join_by_xpath, a_diff_id, a_expected_dataset_guid,a_actual_dataset_guid; return l_results; end; @@ -761,7 +766,7 @@ create or replace package body ut_compound_data_helper is return l_sql; end; - function generate_xmltab_stmt (a_column_info ut_varchar2_list, a_inc_filter ut_varchar2_list, a_exc_filter ut_varchar2_list) return clob is + function generate_xmltab_stmt (a_column_info ut_varchar2_list) return clob is l_sql_stmt clob; begin for i in 1..a_column_info.count loop @@ -770,7 +775,7 @@ create or replace package body ut_compound_data_helper is return l_sql_stmt; end; - function generate_equal_sql (a_column_info ut_varchar2_list, a_inc_filter ut_varchar2_list, a_exc_filter ut_varchar2_list) return clob is + function generate_equal_sql (a_column_info ut_varchar2_list) return clob is l_sql_stmt clob; begin for i in 1..a_column_info.count loop @@ -812,18 +817,15 @@ create or replace package body ut_compound_data_helper is function gen_compare_sql(a_column_info xmltype, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2) return clob is - l_compare_sql clob; - l_column_filter varchar2(32767); - l_temp_string varchar2(32767); + l_compare_sql clob; + l_temp_string varchar2(32767); - l_pk_xpath_tabs ut_varchar2_list := ut_varchar2_list(); - l_xpath_inc_tab ut_varchar2_list := ut_varchar2_list(); - l_xpath_exc_tab ut_varchar2_list := ut_varchar2_list(); - l_col_info_tab ut_varchar2_list := ut_varchar2_list(); + l_pk_xpath_tabs ut_varchar2_list := ut_varchar2_list(); + l_act_col_tab ut_varchar2_list := ut_varchar2_list(); - l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_xmltable_stmt clob; - l_where_stmt clob; + l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_xmltable_stmt clob; + l_where_stmt clob; function get_columns_names (a_xpath_tab in ut_varchar2_list) return ut_varchar2_list is l_names_tab ut_varchar2_list := ut_varchar2_list(); @@ -852,12 +854,22 @@ create or replace package body ut_compound_data_helper is begin dbms_lob.createtemporary(l_compare_sql, true); - l_column_filter := ut_compound_data_helper.get_columns_filter(a_exclude_xpath, a_include_xpath); - l_pk_xpath_tabs := get_columns_names(ut_utils.string_to_table(a_join_by_xpath,'|')); - l_xpath_inc_tab := get_columns_names(ut_utils.string_to_table(a_include_xpath,'|')); - l_xpath_exc_tab := get_columns_names(ut_utils.string_to_table(a_exclude_xpath,'|')); - l_col_info_tab := get_columns_info(a_column_info); - l_xmltable_stmt := generate_xmltab_stmt(l_col_info_tab, l_xpath_inc_tab, l_xpath_exc_tab); + + --Check include and exclude columns and create an actual column list that have to be compared. + --TODO :Reformat + if a_include_xpath is null and a_exclude_xpath is null then + l_act_col_tab := get_columns_info(a_column_info); + elsif a_include_xpath is not null and a_exclude_xpath is null then + l_act_col_tab := get_columns_names(ut_utils.string_to_table(a_include_xpath,'|')); + elsif a_include_xpath is null and a_exclude_xpath is not null then + l_act_col_tab := get_columns_info(a_column_info) multiset except get_columns_names(ut_utils.string_to_table(a_exclude_xpath,'|')); + elsif a_include_xpath is not null and a_exclude_xpath is not null then + l_act_col_tab := get_columns_names(ut_utils.string_to_table(a_include_xpath,'|')) multiset except get_columns_names(ut_utils.string_to_table(a_exclude_xpath,'|')); + end if; + + l_pk_xpath_tabs := get_columns_names(ut_utils.string_to_table(a_join_by_xpath,'|')); + + l_xmltable_stmt := generate_xmltab_stmt(l_act_col_tab); l_temp_string := q'[with exp as (select ucd.*,x.item_no,x.data_id from (select item_data,item_no,data_id from ]' || l_ut_owner || q'[.ut_compound_data_tmp where data_id = :self_guid) x,]' ||q'[xmltable('/ROWSET/ROW' passing x.item_data columns ]'; @@ -872,27 +884,26 @@ create or replace package body ut_compound_data_helper is if a_join_by_xpath is null then -- If no key defined do the join on all columns - l_temp_string := q'[select xmlelement( name "ROW", a.item_data) act_item_data, a.data_id act_data_id, xmlelement( name "ROW", e.item_data) exp_item_data, e.data_id exp_data_id, rownum item_no ]' + l_temp_string := q'[ select a.item_data as act_item_data, a.data_id act_data_id, e.item_data as exp_item_data, e.data_id exp_data_id, rownum item_no ]' || q'[from act a full outer join exp e on ( ]'; ut_utils.append_to_clob(l_compare_sql,l_temp_string); - ut_utils.append_to_clob(l_compare_sql,ut_compound_data_helper.generate_equal_sql(l_col_info_tab, l_xpath_inc_tab, l_xpath_exc_tab)||q'[ ) where a.data_id is null or e.data_id is null]'); + ut_utils.append_to_clob(l_compare_sql,ut_compound_data_helper.generate_equal_sql(l_act_col_tab)||q'[ ) where a.data_id is null or e.data_id is null]'); else -- If key defined do the join or these and where on diffrences - l_temp_string := 'select a.item_data act_item_data, a.data_id act_data_id,' - ||' e.item_data exp_item_data, e.data_id exp_data_id, rownum item_no from act a full outer join exp e on ( '; + l_temp_string := q'[ select a.item_data act_item_data, a.data_id act_data_id,]' + ||' e.item_data exp_item_data, e.data_id exp_data_id, rownum item_no from act a full outer join exp e on ( '; ut_utils.append_to_clob(l_compare_sql,l_temp_string); - ut_utils.append_to_clob(l_compare_sql,ut_compound_data_helper.generate_join_by_on_stmt (l_pk_xpath_tabs)||' ) where '); + ut_utils.append_to_clob(l_compare_sql,ut_compound_data_helper.generate_join_by_on_stmt (l_pk_xpath_tabs)||' ) '); - l_where_stmt := ut_compound_data_helper.generate_not_equal_sql(l_col_info_tab, l_pk_xpath_tabs); + l_where_stmt := ut_compound_data_helper.generate_not_equal_sql(l_act_col_tab, l_pk_xpath_tabs); case when l_where_stmt is null then null; else - ut_utils.append_to_clob(l_compare_sql,'( '||l_where_stmt||' ) or ( a.data_id is null or e.data_id is null )'); + ut_utils.append_to_clob(l_compare_sql,' where ( '||l_where_stmt||' ) or ( a.data_id is null or e.data_id is null )'); end case; end if; - return l_compare_sql; end; diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index af8a4f748..9d3741803 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -296,7 +296,7 @@ create or replace type body ut_compound_data_value as if (ut_utils.gc_diff_max_rows > l_sql_rowcount ) then ut_compound_data_helper.insert_diffs_result(l_diff_tab,l_diff_id); end if; - + l_sql_rowcount := l_sql_rowcount + l_diff_tab.count; if (ut_utils.gc_diff_max_rows <= l_sql_rowcount and l_max_rows != ut_utils.gc_bc_fetch_limit ) then From 9843e143b5fbcf8c5e92fd3c696ac692c16b1079 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Thu, 8 Nov 2018 17:32:32 +0000 Subject: [PATCH 0074/1096] Code updates for pure sql --- .../data_values/ut_compound_data_diff_tmp.sql | 8 +- .../data_values/ut_compound_data_helper.pkb | 544 ++++++------------ .../data_values/ut_compound_data_helper.pks | 19 +- .../data_values/ut_compound_data_value.tpb | 93 +-- .../data_values/ut_compound_data_value.tps | 4 +- .../ut_curr_usr_compound_helper.pkb | 29 +- .../ut_curr_usr_compound_helper.pks | 6 +- .../data_values/ut_data_value_refcursor.tpb | 34 +- .../expectations/test_expectations_cursor.pkb | 24 +- 9 files changed, 285 insertions(+), 476 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_diff_tmp.sql b/source/expectations/data_values/ut_compound_data_diff_tmp.sql index c285d78fd..242d6c2fc 100644 --- a/source/expectations/data_values/ut_compound_data_diff_tmp.sql +++ b/source/expectations/data_values/ut_compound_data_diff_tmp.sql @@ -18,13 +18,9 @@ create global temporary table ut_compound_data_diff_tmp( act_item_data xmltype, exp_item_data xmltype, item_no integer, - pk_hash raw(128), - item_hash raw(128), duplicate_no integer, - constraint ut_compound_data_diff_tmp_uk1 unique (diff_id,duplicate_no,item_no,item_hash, pk_hash), + constraint ut_compound_data_diff_tmp_uk1 unique (diff_id,duplicate_no,item_no), constraint ut_compound_data_diff_tmp_chk check( - item_no is not null and pk_hash is null and duplicate_no is null - or item_no is null and item_hash is not null and duplicate_no is not null - or item_no is null and pk_hash is not null and duplicate_no is not null + item_no is not null ) ) on commit preserve rows; diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 6bfe0af6f..99ae439d6 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -24,12 +24,14 @@ create or replace package body ut_compound_data_helper is l_res xmltype; l_data ut_data_value := a_column_details.value; l_key varchar2(4000) := ut_utils.xmlgen_escaped_string(a_column_details.KEY); + l_is_diff number; begin - l_result := '<'||l_key||' xml_valid_name="'||l_key||'">'; + l_result := '<'||l_key||' xml_valid_name="'||l_key; if l_data is of(ut_data_value_xmltype) then - l_result := l_result || (treat(l_data as ut_data_value_xmltype).to_string); + l_result := l_result||'" sql_diffable="0">' || (treat(l_data as ut_data_value_xmltype).to_string); else - l_result := l_result || ut_utils.xmlgen_escaped_string((treat(l_data as ut_data_value_varchar2).data_value)); + l_is_diff := ut_curr_usr_compound_helper.is_sql_compare_int((treat(l_data as ut_data_value_varchar2).data_value)); + l_result := l_result||'" sql_diffable="'||l_is_diff||'">' || ut_utils.xmlgen_escaped_string((treat(l_data as ut_data_value_varchar2).data_value)); end if; l_result := l_result ||''; @@ -208,11 +210,12 @@ create or replace package body ut_compound_data_helper is where dbms_lob.compare(exp.col_val, act.col_val) != 0) unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:') ) union all - select item_no as rn, case when exp_data_id is null then 'Extra' else 'Missing' end as diff_type, + select item_no as rn, case when exp_data_id is null then 'Extra:' else 'Missing:' end as diff_type, xmlserialize(content (case when exp_data_id is null then act_item_data else exp_item_data end) no indent) diffed_row, nvl2(i.join_by,ut3.ut_compound_data_helper.get_pk_value(i.join_by,case when exp_data_id is null then act_item_data else exp_item_data end),null) pk_value from diff_info i - where act_data_id is null or exp_data_id is null]' + where act_data_id is null or exp_data_id is null + order by 1 , 2]' bulk collect into l_results using a_exclude_xpath,a_include_xpath, a_exclude_xpath,a_include_xpath, @@ -221,125 +224,6 @@ create or replace package body ut_compound_data_helper is return l_results; end; - function get_rows_diff( - a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, - a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2, - a_join_by_xpath varchar2 - ) return tt_row_diffs is - l_column_filter varchar2(32767); - l_results tt_row_diffs; - begin - l_column_filter := get_columns_row_filter(a_exclude_xpath,a_include_xpath); - - /** - * Since its unordered search we cannot select max rows from diffs as we miss some comparision records - * We will restrict output on higher level of select - * NO_MERGE hint was introduced to prevent optimizer from merging views and rewriting query which in some cases - * lead to second value being null depend on execution plan that been chosen - **/ - execute immediate q'[ - with diff_info as (select item_hash,pk_hash,duplicate_no from ut_compound_data_diff_tmp ucdc where diff_id = :diff_guid) - select rn,diff_type,diffed_row,pk_value from - ( - select - diff_type, diffed_row, - dense_rank() over (order by case when diff_type in ('Extra','Missing') then diff_type end, - case when diff_type in ('Actual','Expected') then pk_hash end, - case when diff_type in ('Extra','Missing') then pk_hash end, - case when diff_type in ('Actual','Expected') then diff_type end) rn, - pk_value, pk_hash - from - ( - select diff_type,diffed_row,pk_hash,pk_value from - (select diff_type,data_item diffed_row,pk_hash,pk_value - from - (select /*+NO_MERGE*/ nvl(exp.pk_hash, act.pk_hash) pk_hash,nvl(exp.pk_value, act.pk_value) pk_value, - xmlserialize(content exp.row_data no indent) exp_item, - xmlserialize(content act.row_data no indent) act_item - from - (select ucd.* - from - (select ucd.column_value row_data, - r.item_hash row_hash, - r.pk_hash , - r.duplicate_no, - ucd.column_value.getclobval() col_val, - ucd.column_value.getRootElement() col_name, - ut_compound_data_helper.get_pk_value(:join_xpath,r.item_data) pk_value - from - (select ]'||l_column_filter||q'[, ucd.item_no, ucd.item_hash, i.pk_hash, i.duplicate_no - from ut_compound_data_tmp ucd, - diff_info i - where ucd.data_id = :self_guid - and ucd.item_hash = i.item_hash - ) r, - table( xmlsequence( extract(r.item_data,'/*/*') ) ) ucd - ) ucd - ) exp - join ( - select ucd.* - from - (select ucd.column_value row_data, - r.item_hash row_hash, - r.pk_hash , - r.duplicate_no, - ucd.column_value.getclobval() col_val, - ucd.column_value.getRootElement() col_name, - ut_compound_data_helper.get_pk_value(:join_xpath,r.item_data) pk_value - from - (select ]'||l_column_filter||q'[, ucd.item_no, ucd.item_hash, i.pk_hash, i.duplicate_no - from ut_compound_data_tmp ucd, - diff_info i - where ucd.data_id = :other_guid - and ucd.item_hash = i.item_hash - ) r, - table( xmlsequence( extract(r.item_data,'/*/*') ) ) ucd - ) ucd - ) act - on exp.pk_hash = act.pk_hash and exp.col_name = act.col_name - and exp.duplicate_no = act.duplicate_no - where dbms_lob.compare(exp.col_val, act.col_val) != 0 - ) - unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:') ) - ) - union all - select case when exp.pk_hash is null then 'Extra' else 'Missing' end as diff_type, - xmlserialize(content nvl(exp.item_data, act.item_data) no indent) diffed_row, - coalesce(exp.pk_hash,act.pk_hash) pk_hash, - coalesce(exp.pk_value,act.pk_value) pk_value - from (select extract(deletexml(ucd.item_data, :join_by),'/*/*') item_data,i.pk_hash, - ut_compound_data_helper.get_pk_value(:join_by,item_data) pk_value - from ut_compound_data_tmp ucd, - diff_info i - where ucd.data_id = :self_guid - and ucd.item_hash = i.item_hash - ) exp - full outer join ( - select extract(deletexml(ucd.item_data, :join_by),'/*/*') item_data,i.pk_hash, - ut_compound_data_helper.get_pk_value(:join_by,item_data) pk_value - from ut_compound_data_tmp ucd, - diff_info i - where ucd.data_id = :other_guid - and ucd.item_hash = i.item_hash - )act - on exp.pk_hash = act.pk_hash - where exp.pk_hash is null or act.pk_hash is null - ) - ) where rn <= :max_rows - order by rn, pk_hash, diff_type - ]' - bulk collect into l_results - using a_diff_id, - a_join_by_xpath, - a_exclude_xpath, a_include_xpath, a_expected_dataset_guid, - a_join_by_xpath, - a_exclude_xpath, a_include_xpath, a_actual_dataset_guid, - a_join_by_xpath,a_join_by_xpath,a_expected_dataset_guid,a_join_by_xpath,a_join_by_xpath, a_actual_dataset_guid, - a_max_rows; - - return l_results; - end; - function get_rows_diff( a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2 @@ -348,11 +232,12 @@ create or replace package body ut_compound_data_helper is l_results tt_row_diffs; begin l_column_filter := get_columns_filter(a_exclude_xpath,a_include_xpath); + execute immediate q'[ with - diff_info as ( select item_no + diff_info as ( select item_no ,exp_item_data, act_item_data,exp_data_id, act_data_id from - (select item_no from ut_compound_data_diff_tmp ucdc where diff_id = :diff_guid order by item_no asc) + (select item_no,exp_item_data,exp_data_id, act_item_data, act_data_id from ut_compound_data_diff_tmp ucdc where diff_id = :diff_guid order by item_no asc) where rownum <= :max_rows) select * from (select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, null pk_value @@ -361,24 +246,30 @@ create or replace package body ut_compound_data_helper is xmlagg(act.col order by act.col_no) act_item from (select r.item_no as rn, rownum col_no, s.column_value col, s.column_value.getRootElement() col_name, - s.column_value.getclobval() col_val - from (select ]'||l_column_filter||q'[, ucd.item_no, ucd.item_data item_data_no_filter - from ut_compound_data_tmp ucd, - diff_info i - where ucd.data_id = :self_guid - and ucd.item_no = i.item_no + s.column_value.getclobval() col_val, + r.data_id + from ( + select ]'||l_column_filter||q'[, ucd.item_no, ucd.exp_data_id as data_id + from + ( select exp_item_data as item_data, i.item_no, i.exp_data_id + from diff_info i + where i.exp_data_id = :self_guid + ) ucd ) r, table( xmlsequence( extract(r.item_data,'/*/*') ) ) s ) exp - join ( + join ( select item_no as rn, rownum col_no, s.column_value col, s.column_value.getRootElement() col_name, - s.column_value.getclobval() col_val - from (select ]'||l_column_filter||q'[, ucd.item_no, ucd.item_data item_data_no_filter - from ut_compound_data_tmp ucd, - diff_info i - where ucd.data_id = :other_guid - and ucd.item_no = i.item_no + s.column_value.getclobval() col_val, + r.data_id + from (select ]'||l_column_filter||q'[, ucd.item_no, ucd.act_data_id as data_id + from + ( + select act_item_data as item_data, i.item_no,i.act_data_id + from diff_info i + where i.act_data_id = :other_guid + ) ucd ) r, table( xmlsequence( extract(r.item_data,'/*/*') ) ) s ) act @@ -390,22 +281,20 @@ create or replace package body ut_compound_data_helper is ) union all select nvl(exp.item_no, act.item_no) rn, - case when exp.item_no is null then 'Extra:' else 'Missing:' end as diff_type, - xmlserialize(content nvl(exp.item_data, act.item_data) no indent) diffed_row, + case when exp.data_id is null then 'Extra:' else 'Missing:' end as diff_type, + xmlserialize(content (case when exp.data_id is null then act.item_data else exp.item_data end) no indent) diffed_row, null pk_value - from (select ucd.item_no, extract(ucd.item_data,'/*/*') item_data - from ut_compound_data_tmp ucd - where ucd.data_id = :self_guid - and ucd.item_no in (select i.item_no from diff_info i) + from (select ucd.item_no, extract(ucd.exp_item_data,'/*/*') item_data, ucd.exp_data_id data_id + from diff_info ucd + where ucd.exp_data_id = :self_guid ) exp full outer join ( - select ucd.item_no, extract(ucd.item_data,'/*/*') item_data - from ut_compound_data_tmp ucd - where ucd.data_id = :other_guid - and ucd.item_no in (select i.item_no from diff_info i) + select ucd.item_no, extract(ucd.act_item_data,'/*/*') item_data, ucd.act_data_id data_id + from diff_info ucd + where ucd.act_data_id = :other_guid )act on exp.item_no = act.item_no - where exp.item_no is null or act.item_no is null + where exp.data_id is null or act.data_id is null order by 1, 2]' bulk collect into l_results using a_diff_id, a_max_rows, @@ -415,115 +304,17 @@ create or replace package body ut_compound_data_helper is return l_results; end; - function get_rows_diff_unordered( - a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, - a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2 - ) return tt_row_diffs is - l_column_filter varchar2(32767); - l_results tt_row_diffs; - begin - l_column_filter := get_columns_filter(a_exclude_xpath,a_include_xpath); - - /** - * Since its unordered search we cannot select max rows from diffs as we miss some comparision records - * We will restrict output on higher level of select - */ - execute immediate q'[with - diff_info as (select item_hash,duplicate_no from ut_compound_data_diff_tmp ucdc where diff_id = :diff_guid) - select duplicate_no, - diffed_type, - diffed_row, - null pk_value - from - (select - coalesce(exp.duplicate_no,act.duplicate_no) duplicate_no, - case - when act.row_hash is null then - 'Missing:' - else 'Extra:' - end diffed_type, - case when exp.row_hash is null then - xmlserialize(content act.row_data no indent) - when act.row_hash is null then - xmlserialize(content exp.row_data no indent) - end diffed_row - from (select ucd.* - from (select ucd.column_value row_data, - r.item_hash row_hash, - r.duplicate_no - from (select ]'||l_column_filter||q'[, ucd.item_no, i.item_hash, i.duplicate_no - from ut_compound_data_tmp ucd, - diff_info i - where ucd.data_id = :self_guid - and ucd.item_hash = i.item_hash - and ucd.duplicate_no = i.duplicate_no - ) r, - table( xmlsequence( extract(r.item_data,'/*') ) ) ucd - ) ucd - ) exp - full outer join - (select ucd.* - from (select ucd.column_value row_data, - r.item_hash row_hash, - r.duplicate_no - from (select ]'||l_column_filter||q'[, ucd.item_no, i.item_hash, i.duplicate_no - from ut_compound_data_tmp ucd, - diff_info i - where ucd.data_id = :other_guid - and ucd.item_hash = i.item_hash - and ucd.duplicate_no = i.duplicate_no - ) r, - table( xmlsequence( extract(r.item_data,'/*') ) ) ucd - ) ucd - ) act - on exp.row_hash = act.row_hash - and exp.duplicate_no = act.duplicate_no - where exp.row_hash is null or act.row_hash is null - order by diffed_type, coalesce(exp.row_hash,act.row_hash), duplicate_no - ) - where rownum < :max_rows ]' - bulk collect into l_results - using a_diff_id, - a_exclude_xpath, a_include_xpath, a_expected_dataset_guid, - a_exclude_xpath, a_include_xpath, a_actual_dataset_guid, - a_max_rows; - - return l_results; - - end; - - function compare_type(a_join_by_xpath in varchar2,a_unordered boolean, a_is_sql_diffable integer := 0) return varchar2 is - begin - case - when a_is_sql_diffable = 1 then - return gc_compare_sql; - when a_join_by_xpath is not null then - return gc_compare_join_by; - when a_unordered then - return gc_compare_unordered; - else - return gc_compare_normal; - end case; - end; - function get_rows_diff( a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2, - a_join_by_xpath varchar2,a_unorderdered boolean, a_is_sql_diffable integer + a_join_by_xpath varchar2,a_unorderdered boolean ) return tt_row_diffs is - l_result tt_row_diffs := tt_row_diffs(); - l_compare_type varchar2(10):= compare_type(a_join_by_xpath,a_unorderdered, a_is_sql_diffable); + l_result tt_row_diffs := tt_row_diffs(); begin case - when l_compare_type = gc_compare_sql then + when a_unorderdered then l_result := get_rows_diff_by_sql(a_expected_dataset_guid, a_actual_dataset_guid, a_diff_id, a_max_rows, a_exclude_xpath, a_include_xpath ,a_join_by_xpath); - when l_compare_type = gc_compare_join_by then - l_result := get_rows_diff(a_expected_dataset_guid, a_actual_dataset_guid, a_diff_id, - a_max_rows, a_exclude_xpath, a_include_xpath ,a_join_by_xpath); - when l_compare_type = gc_compare_unordered then - l_result := get_rows_diff_unordered(a_expected_dataset_guid, a_actual_dataset_guid, a_diff_id, - a_max_rows, a_exclude_xpath, a_include_xpath); else l_result := get_rows_diff(a_expected_dataset_guid, a_actual_dataset_guid, a_diff_id, a_max_rows, a_exclude_xpath, a_include_xpath); @@ -600,93 +391,6 @@ create or replace package body ut_compound_data_helper is return l_no_missing_keys; end; - procedure update_row_and_pk_hash(a_self_data_id in raw, a_other_data_id in raw, a_exclude_xpath varchar2, - a_include_xpath varchar2, a_join_by_xpath varchar2) is - l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_column_filter varchar2(32767); - l_pk_hash_sql varchar2(32767); - - function get_column_pk_hash(a_join_by_xpath varchar2) return varchar2 is - l_column varchar2(32767); - begin - /* due to possibility of key being to columns we cannot use xmlextractvalue - usage of xmlagg is possible however it greatly complicates code and performance is impacted. - xpath to be looked at or regex - */ - if a_join_by_xpath is not null then - l_column := l_ut_owner ||'.ut_compound_data_helper.get_hash(extract(ucd.item_data,:join_by_xpath).GetClobVal()) pk_hash'; - else - l_column := ':join_by_xpath pk_hash'; - end if; - return l_column; - end; - - begin - l_column_filter := ut_compound_data_helper.get_columns_filter(a_exclude_xpath, a_include_xpath); - l_pk_hash_sql := get_column_pk_hash(a_join_by_xpath); - - --Use a item hash as pk hash for unordered - execute immediate 'merge into ' || l_ut_owner || '.ut_compound_data_tmp tgt - using ( - select ucd_out.item_hash, - ucd_out.pk_hash, - ucd_out.item_no, - ucd_out.data_id, - row_number() over (partition by ucd_out.pk_hash,ucd_out.item_hash,ucd_out.data_id order by 1,2) duplicate_no - from - ( - select '||l_ut_owner ||'.ut_compound_data_helper.get_hash(ucd.item_data.getclobval()) item_hash, - pk_hash, ucd.item_no, ucd.data_id - from - ( - select '||l_column_filter||','||l_pk_hash_sql||', item_no, data_id - from ' || l_ut_owner || q'[.ut_compound_data_tmp ucd - where data_id = :self_guid or data_id = :other_guid - ) ucd - )ucd_out - ) src - on (tgt.item_no = src.item_no and tgt.data_id = src.data_id) - when matched then update - set tgt.item_hash = src.item_hash, - tgt.pk_hash = src.pk_hash, - tgt.duplicate_no = src.duplicate_no]' - using a_exclude_xpath, a_include_xpath,a_join_by_xpath,a_self_data_id, a_other_data_id; - - end; - - function get_unordered(a_owner in varchar2) return varchar2 is - l_sql varchar2(32767); - begin - l_sql := 'with source_data as - ( select t.data_id,t.item_hash,t.duplicate_no, - pk_hash - from ' || a_owner || '.ut_compound_data_tmp t - where data_id = :self_guid or data_id = :other_guid - ) - select distinct :diff_id,tmp.item_hash,tmp.pk_hash,tmp.duplicate_no - from( - ( - select t.item_hash,t. duplicate_no,t.pk_hash - from source_data t - where t.data_id = :self_guid - minus - select t.item_hash,t. duplicate_no,t.pk_hash - from source_data t - where t.data_id = :other_guid - ) - union all - ( - select t.item_hash,t. duplicate_no,t.pk_hash - from source_data t - where t.data_id = :other_guid - minus - select t.item_hash,t. duplicate_no,t.pk_hash - from source_data t - where t.data_id = :self_guid - ))tmp'; - return l_sql; - end; - function get_inclusion_matcher_sql(a_owner in varchar2) return varchar2 is l_sql varchar2(32767); begin @@ -759,18 +463,103 @@ create or replace package body ut_compound_data_helper is l_sql := l_sql || get_inclusion_matcher_sql(a_owner); elsif a_inclusion_matcher and a_negated_match then l_sql := l_sql || get_not_inclusion_matcher_sql(a_owner); - elsif not(a_inclusion_matcher) then - l_sql := l_sql || get_unordered(a_owner); end if; return l_sql; end; - function generate_xmltab_stmt (a_column_info ut_varchar2_list) return clob is + function generate_select_stmt(a_column_info ut_varchar2_list,a_xml_column_info xmltype) return clob is l_sql_stmt clob; + l_col_type varchar2(4000); + l_alias varchar2(10) := 'ucd.'; + l_col_syntax varchar2(4000); + l_ut_owner varchar2(250) := ut_utils.ut_owner; begin - for i in 1..a_column_info.count loop - l_sql_stmt := l_sql_stmt || case when l_sql_stmt is null then null else ',' end ||a_column_info(i)||q'[ varchar2(4000) PATH ']'||a_column_info(i)||q'[']'; + for i in (select /*+ CARDINALITY(xt 100) */ + distinct + t.column_value, + xt.is_sql_diff, + xt.type + from + (select a_xml_column_info item_data from dual) x, + xmltable( + '/ROW/*' + passing x.item_data + columns + name varchar2(4000) PATH '@xml_valid_name', + type varchar2(4000) PATH '/', + is_sql_diff varchar2(4000) PATH '@sql_diffable' + ) xt, + table(a_column_info) t + where xt.name = t.column_value) + loop + if i.is_sql_diff = 0 then + l_col_syntax := l_ut_owner ||'.ut_compound_data_helper.get_hash('||l_alias||i.column_value||'.getClobVal()) as '|| i.column_value ; + else + l_col_syntax := l_alias||i.column_value||' as '|| i.column_value ; + end if; + + l_sql_stmt := l_sql_stmt || case + when l_sql_stmt is null then + null + else ',' + end||l_col_syntax; + end loop; + return l_sql_stmt; + end; + + function generate_partition_stmt(a_column_info ut_varchar2_list) return clob is + l_sql_stmt clob; + l_alias varchar2(10) := 'ucd.'; + + begin + for i in 1..a_column_info.count + loop + l_sql_stmt := l_sql_stmt || case + when l_sql_stmt is null then + null + else ',' + end||l_alias||a_column_info(i); + end loop; + l_sql_stmt := 'row_number() over (partition by '|| l_sql_stmt || ' order by '||l_sql_stmt||' ) dup_no '; + return l_sql_stmt; + end; + + function generate_xmltab_stmt (a_column_info ut_varchar2_list,a_xml_column_info xmltype) return clob is + l_sql_stmt clob; + l_col_type varchar2(4000); + begin + for i in (select /*+ CARDINALITY(xt 100) */ + distinct + t.column_value, + xt.is_sql_diff, + xt.type + from + (select a_xml_column_info item_data from dual) x, + xmltable( + '/ROW/*' + passing x.item_data + columns + name varchar2(4000) PATH '@xml_valid_name', + type varchar2(4000) PATH '/', + is_sql_diff varchar2(4000) PATH '@sql_diffable' + ) xt, + table(a_column_info) t + where xt.name = t.column_value) + loop + if i.is_sql_diff = 0 then + l_col_type := 'XMLTYPE'; + elsif i.is_sql_diff = 1 and (i.type IN ('CHAR','VARCHAR2','VARCHAR')) then + l_col_type := 'VARCHAR2(4000)'; + else + l_col_type := i.type; + end if; + + l_sql_stmt := l_sql_stmt || case + when l_sql_stmt is null then + null + else ',' + end ||i.column_value||' '||l_col_type||q'[ PATH ']'||i.column_value||q'[']'; end loop; return l_sql_stmt; end; @@ -822,15 +611,17 @@ create or replace package body ut_compound_data_helper is l_pk_xpath_tabs ut_varchar2_list := ut_varchar2_list(); l_act_col_tab ut_varchar2_list := ut_varchar2_list(); - + l_ut_owner varchar2(250) := ut_utils.ut_owner; l_xmltable_stmt clob; l_where_stmt clob; + l_select_stmt clob; + l_partition_stmt clob; function get_columns_names (a_xpath_tab in ut_varchar2_list) return ut_varchar2_list is l_names_tab ut_varchar2_list := ut_varchar2_list(); begin - select REGEXP_SUBSTR (column_value,'[^(/\*/)](.+)$') + select distinct REGEXP_SUBSTR (column_value,'[^(/\*/)](.+)$') bulk collect into l_names_tab from table(a_xpath_tab); return l_names_tab; @@ -840,7 +631,7 @@ create or replace package body ut_compound_data_helper is l_columns_info ut_varchar2_list := ut_varchar2_list(); begin select /*+ CARDINALITY(xt 100) */ - xt.name + distinct xt.name bulk collect into l_columns_info from (select a_column_info item_data from dual) x, xmltable( @@ -851,7 +642,7 @@ create or replace package body ut_compound_data_helper is ) xt; return l_columns_info; end; - + begin dbms_lob.createtemporary(l_compare_sql, true); @@ -869,51 +660,78 @@ create or replace package body ut_compound_data_helper is l_pk_xpath_tabs := get_columns_names(ut_utils.string_to_table(a_join_by_xpath,'|')); - l_xmltable_stmt := generate_xmltab_stmt(l_act_col_tab); + l_xmltable_stmt := generate_xmltab_stmt(l_act_col_tab,a_column_info); + l_select_stmt := generate_select_stmt(l_act_col_tab,a_column_info); + l_partition_stmt := generate_partition_stmt(l_act_col_tab); + + l_temp_string := 'with exp as ( select ucd.* , '; + ut_utils.append_to_clob(l_compare_sql, l_temp_string); + ut_utils.append_to_clob(l_compare_sql, l_partition_stmt); - l_temp_string := q'[with exp as (select ucd.*,x.item_no,x.data_id from (select item_data,item_no,data_id from ]' || l_ut_owner || q'[.ut_compound_data_tmp where data_id = :self_guid) x,]' + l_temp_string := 'from (select ucd.item_data, '; + ut_utils.append_to_clob(l_compare_sql, l_temp_string); + ut_utils.append_to_clob(l_compare_sql, l_select_stmt); + + l_temp_string := q'[,x.item_no,x.data_id from (select item_data,item_no,data_id from ]' || l_ut_owner || q'[.ut_compound_data_tmp where data_id = :self_guid) x,]' ||q'[xmltable('/ROWSET/ROW' passing x.item_data columns ]'; ut_utils.append_to_clob(l_compare_sql, l_temp_string); ut_utils.append_to_clob(l_compare_sql,l_xmltable_stmt); - l_temp_string := q'[ ,item_data xmltype PATH '*' ) ucd),]' - ||q'[act as (select ucd.*, x.item_no,x.data_id from (select item_data,item_no,data_id from ]' || l_ut_owner || q'[.ut_compound_data_tmp where data_id = :other_guid) x,]' + l_temp_string := q'[ ,item_data xmltype PATH '*' ) ucd ) ucd ) ,]'; + ut_utils.append_to_clob(l_compare_sql,l_temp_string); + + l_temp_string :='act as ( select ucd.* , '; + ut_utils.append_to_clob(l_compare_sql, l_temp_string); + ut_utils.append_to_clob(l_compare_sql, l_partition_stmt); + + l_temp_string := 'from (select ucd.item_data, '; + ut_utils.append_to_clob(l_compare_sql,l_temp_string); + ut_utils.append_to_clob(l_compare_sql, l_select_stmt); + + l_temp_string := q'[, x.item_no,x.data_id from (select item_data,item_no,data_id from ]' || l_ut_owner || q'[.ut_compound_data_tmp where data_id = :other_guid) x,]' ||q'[xmltable('/ROWSET/ROW' passing x.item_data columns ]' ; ut_utils.append_to_clob(l_compare_sql,l_temp_string); - ut_utils.append_to_clob(l_compare_sql,l_xmltable_stmt||q'[ ,item_data xmltype PATH '*') ucd)]'); + ut_utils.append_to_clob(l_compare_sql,l_xmltable_stmt||q'[ ,item_data xmltype PATH '*') ucd ) ucd ) ]'); if a_join_by_xpath is null then -- If no key defined do the join on all columns - l_temp_string := q'[ select a.item_data as act_item_data, a.data_id act_data_id, e.item_data as exp_item_data, e.data_id exp_data_id, rownum item_no ]' - || q'[from act a full outer join exp e on ( ]'; + l_temp_string := ' select a.item_data as act_item_data, a.data_id act_data_id,' + ||'e.item_data as exp_item_data, e.data_id exp_data_id, rownum item_no, nvl(e.dup_no,a.dup_no) dup_no ' + ||'from act a full outer join exp e on ( '; ut_utils.append_to_clob(l_compare_sql,l_temp_string); - ut_utils.append_to_clob(l_compare_sql,ut_compound_data_helper.generate_equal_sql(l_act_col_tab)||q'[ ) where a.data_id is null or e.data_id is null]'); + ut_utils.append_to_clob(l_compare_sql,generate_equal_sql(l_act_col_tab)||q'[ and e.dup_no = a.dup_no ) where a.data_id is null or e.data_id is null]'); else -- If key defined do the join or these and where on diffrences - l_temp_string := q'[ select a.item_data act_item_data, a.data_id act_data_id,]' - ||' e.item_data exp_item_data, e.data_id exp_data_id, rownum item_no from act a full outer join exp e on ( '; + l_temp_string := q'[ select a.item_data act_item_data, a.data_id act_data_id, ]' + ||' e.item_data exp_item_data, e.data_id exp_data_id, rownum item_no,nvl(e.dup_no,a.dup_no) dup_no from act a full outer join exp e on ( e.dup_no = a.dup_no and '; ut_utils.append_to_clob(l_compare_sql,l_temp_string); - ut_utils.append_to_clob(l_compare_sql,ut_compound_data_helper.generate_join_by_on_stmt (l_pk_xpath_tabs)||' ) '); + ut_utils.append_to_clob(l_compare_sql,generate_join_by_on_stmt (l_pk_xpath_tabs)||' ) '); - l_where_stmt := ut_compound_data_helper.generate_not_equal_sql(l_act_col_tab, l_pk_xpath_tabs); + l_where_stmt := generate_not_equal_sql(l_act_col_tab, l_pk_xpath_tabs); case when l_where_stmt is null then - null; + ut_utils.append_to_clob(l_compare_sql,' where a.data_id is null or e.data_id is null'); else ut_utils.append_to_clob(l_compare_sql,' where ( '||l_where_stmt||' ) or ( a.data_id is null or e.data_id is null )'); end case; end if; - return l_compare_sql; + + --TEST + dbms_output.put_line( l_compare_sql); + return l_compare_sql; end; procedure insert_diffs_result(a_diff_tab t_diff_tab, a_diff_id raw) is begin forall idx in 1..a_diff_tab.count insert into ut3.ut_compound_data_diff_tmp - ( diff_id, act_item_data, act_data_id, exp_item_data, exp_data_id, item_no ) + ( diff_id, act_item_data, act_data_id, exp_item_data, exp_data_id, item_no, duplicate_no ) values - (a_diff_id, xmlelement( name "ROW", a_diff_tab(idx).act_item_data), a_diff_tab(idx).act_data_id,xmlelement( name "ROW", a_diff_tab(idx).exp_item_data), a_diff_tab(idx).exp_data_id,a_diff_tab(idx).item_no); + (a_diff_id, + xmlelement( name "ROW", a_diff_tab(idx).act_item_data), a_diff_tab(idx).act_data_id, + xmlelement( name "ROW", a_diff_tab(idx).exp_item_data), a_diff_tab(idx).exp_data_id, + a_diff_tab(idx).item_no, a_diff_tab(idx).dup_no); end; procedure set_rows_diff(a_rows_diff integer) is diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 7c1933a16..23c6636e8 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -16,10 +16,8 @@ create or replace package ut_compound_data_helper authid definer is limitations under the License. */ - gc_compare_join_by constant varchar2(10):='join_by'; gc_compare_unordered constant varchar2(10):='unordered'; gc_compare_normal constant varchar2(10):='normal'; - gc_compare_sql constant varchar2(10):='sql'; type t_column_diffs is record( diff_type varchar2(1), @@ -54,10 +52,12 @@ create or replace package ut_compound_data_helper authid definer is act_data_id raw(32), exp_item_data xmltype, exp_data_id raw(32), - item_no integer + item_no integer, + dup_no integer ); - type t_diff_tab is table of t_diff_rec; - + + type t_diff_tab is table of t_diff_rec; + function get_column_info_xml(a_column_details ut_key_anyval_pair) return xmltype; function get_columns_filter( @@ -71,13 +71,11 @@ create or replace package ut_compound_data_helper authid definer is function get_pk_value (a_join_by_xpath varchar2,a_item_data xmltype) return clob; - function compare_type(a_join_by_xpath in varchar2,a_unordered boolean, a_is_sql_diffable integer := 0) return varchar2; - function get_rows_diff( a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2, - a_join_by_xpath varchar2,a_unorderdered boolean, a_is_sql_diffable integer - ) return tt_row_diffs; + a_join_by_xpath varchar2,a_unorderdered boolean + ) return tt_row_diffs; subtype t_hash is raw(128); @@ -92,9 +90,6 @@ create or replace package ut_compound_data_helper authid definer is return tt_missing_pk; function get_refcursor_matcher_sql(a_owner in varchar2,a_inclusion_matcher boolean := false, a_negated_match boolean := false) return varchar2; - - procedure update_row_and_pk_hash(a_self_data_id in raw, a_other_data_id in raw, a_exclude_xpath varchar2, - a_include_xpath varchar2, a_join_by_xpath varchar2); function gen_compare_sql(a_column_info xmltype, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2) return clob; diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index 9d3741803..94c448092 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -89,29 +89,25 @@ create or replace type body ut_compound_data_value as l_row_diffs ut_compound_data_helper.tt_row_diffs; l_compare_type varchar2(10); l_self ut_compound_data_value; - l_is_sql_diff integer := 0; - function get_diff_message (a_row_diff ut_compound_data_helper.t_row_diffs,a_compare_type varchar2) return varchar2 is + function get_diff_message (a_row_diff ut_compound_data_helper.t_row_diffs,a_is_unordered boolean) return varchar2 is begin - if a_compare_type in (ut_compound_data_helper.gc_compare_join_by,ut_compound_data_helper.gc_compare_sql) - and a_row_diff.pk_value is not null then - return ' PK '||a_row_diff.pk_value||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; - elsif a_compare_type = ut_compound_data_helper.gc_compare_join_by or a_compare_type = ut_compound_data_helper.gc_compare_normal then + + if a_is_unordered then + if a_row_diff.pk_value is not null then + return ' PK '||a_row_diff.pk_value||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; + else + return rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; + end if; + else return ' Row No. '||a_row_diff.rn||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; - elsif a_compare_type in (ut_compound_data_helper.gc_compare_unordered,ut_compound_data_helper.gc_compare_sql) - and a_row_diff.pk_value is null then - return rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; - end if; + end if; end; begin if not a_other is of (ut_compound_data_value) then raise value_error; - end if; - - if self is of (ut_data_value_refcursor) then - l_is_sql_diff := treat(self as ut_data_value_refcursor).is_sql_diffable; - end if; + end if; l_actual := treat(a_other as ut_compound_data_value); @@ -122,12 +118,12 @@ create or replace type body ut_compound_data_value as -- First tell how many rows are different - --REDO that is a bit mess ?? - if l_is_sql_diff = 1 then + --TODO: that is a bit mess ?? Can we use global variable for all matchers. + if a_unordered then l_diff_row_count := ut_compound_data_helper.get_rows_diff; else execute immediate 'select count(' - ||case when ( a_join_by_xpath is not null and l_is_sql_diff = 0 ) + ||case when ( a_join_by_xpath is not null ) then 'distinct pk_hash' else '*' end @@ -137,10 +133,9 @@ create or replace type body ut_compound_data_value as end if; if l_diff_row_count > 0 then - l_compare_type := ut_compound_data_helper.compare_type(a_join_by_xpath,a_unordered, l_is_sql_diff); l_row_diffs := ut_compound_data_helper.get_rows_diff( self.data_id, l_actual.data_id, l_diff_id, c_max_rows, a_exclude_xpath, - a_include_xpath, a_join_by_xpath, a_unordered, l_is_sql_diff); + a_include_xpath, a_join_by_xpath, a_unordered); l_message := chr(10) ||'Rows: [ ' || l_diff_row_count ||' differences' || case when l_diff_row_count > c_max_rows and l_row_diffs.count > 0 then ', showing first '||c_max_rows end @@ -150,7 +145,7 @@ create or replace type body ut_compound_data_value as ut_utils.append_to_clob( l_result, l_message ); for i in 1 .. l_row_diffs.count loop l_results.extend; - l_results(l_results.last) := get_diff_message(l_row_diffs(i),l_compare_type); + l_results(l_results.last) := get_diff_message(l_row_diffs(i),a_unordered); end loop; ut_utils.append_to_clob(l_result,l_results); end if; @@ -164,6 +159,9 @@ create or replace type body ut_compound_data_value as l_column_filter varchar2(32767); l_diff_id ut_compound_data_helper.t_hash; l_result integer; + + l_sql varchar2(32767); + --the XML stylesheet is applied on XML representation of data to exclude column names from comparison --column names and data-types are compared separately --user CHR(38) instead of ampersand to eliminate define request when installing through some IDEs @@ -184,20 +182,40 @@ create or replace type body ut_compound_data_value as if not a_other is of (ut_compound_data_value) then raise value_error; end if; - + l_other := treat(a_other as ut_compound_data_value); l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); l_column_filter := ut_compound_data_helper.get_columns_filter(a_exclude_xpath, a_include_xpath); -- Find differences - execute immediate 'insert into ' || l_ut_owner || '.ut_compound_data_diff_tmp ( diff_id, item_no ) - select :diff_id, nvl(exp.item_no, act.item_no) - from (select '||l_column_filter||', ucd.item_no - from ' || l_ut_owner || '.ut_compound_data_tmp ucd where ucd.data_id = :self_guid) exp + execute immediate 'insert into ' || l_ut_owner || '.ut_compound_data_diff_tmp ( diff_id, item_no,exp_item_data, act_item_data,exp_data_id, act_data_id ) + select :diff_id, nvl(exp.item_no, act.item_no) , exp.item_data, act.item_data, exp.data_id, act.data_id + from ( select '||l_column_filter||', rownum item_no, ucd.data_id + from + (select xmlelement(name "ROW" ,xt.item_data) item_data, t.data_id + from ' || l_ut_owner || q'[.ut_compound_data_tmp t, + xmltable('/ROWSET/ROW' + passing t.item_data + columns + item_data xmltype path '*' + ) xt + where t.data_id = :self_guid) ucd + ) exp full outer join - (select '||l_column_filter||', ucd.item_no - from ' || l_ut_owner || '.ut_compound_data_tmp ucd where ucd.data_id = :l_other_guid) act - on exp.item_no = act.item_no '|| + (select ]'||l_column_filter||', rownum item_no, ucd.data_id + from + ( + select xmlelement(name "ROW" ,xt.item_data) item_data, t.data_id + from ' || l_ut_owner || q'[.ut_compound_data_tmp t, + xmltable('/ROWSET/ROW' + passing t.item_data + columns + item_data xmltype path '*' + ) xt + where t.data_id = :l_other_guid + ) ucd + ) act + on exp.item_no = act.item_no ]'|| 'where nvl( dbms_lob.compare(' || /*the xmltransform removes column names and leaves column data to be compared only*/ ' xmltransform(exp.item_data, :l_xml_data_fmt).getclobval()' || @@ -206,6 +224,7 @@ create or replace type body ut_compound_data_value as ') != 0' using in l_diff_id, a_exclude_xpath, a_include_xpath, self.data_id, a_exclude_xpath, a_include_xpath, l_other.data_id, l_xml_data_fmt, l_xml_data_fmt; + --result is OK only if both are same if sql%rowcount = 0 and self.elements_count = l_other.elements_count then l_result := 0; @@ -234,12 +253,6 @@ create or replace type body ut_compound_data_value as l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); - /** - * Due to incompatibility issues in XML between 11 and 12.2 and 12.1 versions we will prepopulate pk_hash upfront to - * avoid optimizer incorrectly rewrite and causing NULL error or ORA-600 - **/ - ut_compound_data_helper.update_row_and_pk_hash(self.data_id, l_other.data_id, a_exclude_xpath,a_include_xpath,a_join_by_xpath); - /*!* * Comparision is based on type of search, for inclusion based search we will look for left join only. * For normal two side diff we will peform minus on two sets two get diffrences. @@ -283,7 +296,7 @@ create or replace type body ut_compound_data_value as l_sql_rowcount integer :=0; begin - + --TODO : Error on xml when same column is more then once in item data xml.Do we need to cleanup ?? l_other := treat(a_other as ut_compound_data_value); l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); @@ -292,7 +305,6 @@ create or replace type body ut_compound_data_value as loop fetch l_loop_curs bulk collect into l_diff_tab limit l_max_rows; exit when l_diff_tab.count = 0; - --Pass it to helper as authid as definer if (ut_utils.gc_diff_max_rows > l_sql_rowcount ) then ut_compound_data_helper.insert_diffs_result(l_diff_tab,l_diff_id); end if; @@ -303,14 +315,15 @@ create or replace type body ut_compound_data_value as l_max_rows := ut_utils.gc_bc_fetch_limit; end if; end loop; - + ut_compound_data_helper.set_rows_diff(l_sql_rowcount); - --result is OK only if both are same + --result is OK only if both are same if l_sql_rowcount = 0 and self.elements_count = l_other.elements_count then - l_result := 0; + l_result := 0; else l_result := 1; end if; + return l_result; end; diff --git a/source/expectations/data_values/ut_compound_data_value.tps b/source/expectations/data_values/ut_compound_data_value.tps index 97370eea6..e1ff43319 100644 --- a/source/expectations/data_values/ut_compound_data_value.tps +++ b/source/expectations/data_values/ut_compound_data_value.tps @@ -44,8 +44,8 @@ create or replace type ut_compound_data_value force under ut_data_value( overriding member function diff( a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean := false ) return varchar2, member function get_data_diff(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean) return clob, member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2) return integer, + member function compare_implementation_by_sql(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_inclusion_compare boolean := false) return integer, member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, - a_unordered boolean , a_inclusion_compare boolean := false, a_is_negated boolean := false) return integer, - member function compare_implementation_by_sql(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_inclusion_compare boolean := false) return integer + a_unordered boolean , a_inclusion_compare boolean := false, a_is_negated boolean := false ) return integer ) not final not instantiable / diff --git a/source/expectations/data_values/ut_curr_usr_compound_helper.pkb b/source/expectations/data_values/ut_curr_usr_compound_helper.pkb index de8aa6614..5c18c6743 100644 --- a/source/expectations/data_values/ut_curr_usr_compound_helper.pkb +++ b/source/expectations/data_values/ut_curr_usr_compound_helper.pkb @@ -6,7 +6,7 @@ create or replace package body ut_curr_usr_compound_helper is g_anytype_collection_name t_type_name_map; g_user_defined_type pls_integer := dbms_sql.user_defined_type; g_is_collection boolean := false; - g_is_sql_diffable boolean := false; + g_is_sql_diffable boolean := true; procedure set_collection_state(a_is_collection boolean) is begin @@ -18,8 +18,8 @@ create or replace package body ut_curr_usr_compound_helper is procedure set_sql_diff_state(a_is_sql_diff boolean) is begin - --Make sure that we set a g_is_collection only once so we dont reset from true to false. - if not g_is_sql_diffable then + --Make sure that we set a g_is_collection only once so we dont reset from false to true. + if g_is_sql_diffable then g_is_sql_diffable := a_is_sql_diff; end if; end; @@ -27,17 +27,25 @@ create or replace package body ut_curr_usr_compound_helper is function is_sql_compare_allowed(a_type_name varchar2) return boolean is begin --clob/blob/xmltype/object/nestedcursor/nestedtable - if a_type_name IN (g_anytype_name_map(dbms_types.typecode_blob), - g_anytype_name_map(dbms_types.typecode_clob), - g_anytype_name_map(dbms_types.typecode_bfile), - g_anytype_name_map(dbms_types.typecode_varray)) - then + + + if a_type_name IN (g_type_name_map(dbms_sql.blob_type), + g_type_name_map(dbms_sql.clob_type), + g_type_name_map(dbms_sql.bfile_type), + g_type_name_map(dbms_sql.user_defined_type)) + then return false; else return true; end if; end; + function is_sql_compare_int(a_type_name varchar2) return integer is + begin + --raise_application_error(-20111,'no '||a_type_name||ut_utils.boolean_to_int(is_sql_compare_allowed(a_type_name))); + return ut_utils.boolean_to_int(is_sql_compare_allowed(a_type_name)); + end; + function get_column_type(a_desc_rec dbms_sql.desc_rec3, a_desc_user_types boolean := false) return ut_key_anyval_pair is l_data ut_data_value; l_result ut_key_anyval_pair; @@ -54,7 +62,7 @@ create or replace package body ut_curr_usr_compound_helper is return l_typecode = 'COLLECTION'; end; - begin + begin if g_type_name_map.exists(a_desc_rec.col_type) then l_data := ut_data_value_varchar2(g_type_name_map(a_desc_rec.col_type)); set_sql_diff_state(is_sql_compare_allowed(g_type_name_map(a_desc_rec.col_type))); @@ -76,7 +84,7 @@ create or replace package body ut_curr_usr_compound_helper is l_data := ut_data_value_varchar2(a_desc_rec.col_schema_name||'.'||a_desc_rec.col_type_name); set_sql_diff_state(false); end if; - + return ut_key_anyval_pair(a_desc_rec.col_name,l_data); end; @@ -281,6 +289,7 @@ create or replace package body ut_curr_usr_compound_helper is g_type_name_map( dbms_sql.number_type ) := 'NUMBER'; g_type_name_map( dbms_sql.rowid_type ) := 'ROWID'; g_type_name_map( dbms_sql.urowid_type ) := 'UROWID'; + g_type_name_map( dbms_sql.user_defined_type ) := 'USER_DEFINED_TYPE'; end; / diff --git a/source/expectations/data_values/ut_curr_usr_compound_helper.pks b/source/expectations/data_values/ut_curr_usr_compound_helper.pks index 039b8bfe9..396c5d3b6 100644 --- a/source/expectations/data_values/ut_curr_usr_compound_helper.pks +++ b/source/expectations/data_values/ut_curr_usr_compound_helper.pks @@ -1,5 +1,9 @@ create or replace package ut_curr_usr_compound_helper authid current_user is + function is_sql_compare_allowed(a_type_name varchar2) return boolean; + + function is_sql_compare_int(a_type_name varchar2) return integer; + procedure get_columns_info( a_cursor in out nocopy sys_refcursor, a_columns_info out nocopy xmltype, @@ -9,6 +13,6 @@ create or replace package ut_curr_usr_compound_helper authid current_user is ); function get_user_defined_type(a_owner varchar2, a_type_name varchar2) return xmltype; - + end; / diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index e253abfc6..6cf8c27b4 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -61,9 +61,8 @@ create or replace type body ut_data_value_refcursor as l_ctx := dbms_xmlgen.newContext(l_cursor); dbms_xmlgen.setNullHandling(l_ctx, dbms_xmlgen.empty_tag); dbms_xmlgen.setMaxRows(l_ctx, c_bulk_rows); - - if self.is_sql_diffable = 1 then - loop + + loop l_xml := dbms_xmlgen.getxmltype(l_ctx); exit when dbms_xmlgen.getNumRowsProcessed(l_ctx) = 0; @@ -74,23 +73,8 @@ create or replace type body ut_data_value_refcursor as using in self.data_id, l_set_id, l_xml; l_set_id := l_set_id + 1; - end loop; - else - loop - l_xml := dbms_xmlgen.getxmltype(l_ctx); - execute immediate - 'insert into ' || l_ut_owner || '.ut_compound_data_tmp(data_id, item_no, item_data) ' || - 'select :self_guid, :self_row_count + rownum, value(a) ' || - ' from table( xmlsequence( extract(:l_xml,''ROWSET/*'') ) ) a' - using in self.data_id, self.elements_count, l_xml; - - exit when sql%rowcount = 0; - - self.elements_count := self.elements_count + sql%rowcount; - end loop; + end loop; - end if; - ut_expectation_processor.reset_nls_params(); if l_cursor%isopen then close l_cursor; @@ -265,17 +249,11 @@ create or replace type body ut_data_value_refcursor as then l_result := 1; end if; - + + if a_unordered then - if self.is_sql_diffable = 1 then - --TODO: :Treat unorder as pk by on all rows - l_result := l_result + (self as ut_compound_data_value).compare_implementation_by_sql(a_other, a_exclude_xpath, a_include_xpath, + l_result := l_result + (self as ut_compound_data_value).compare_implementation_by_sql(a_other, a_exclude_xpath, a_include_xpath, a_join_by_xpath, a_inclusion_compare); - else - --We will make a decision about type of data inside whether we dump into table or do normal row by row - l_result := l_result + (self as ut_compound_data_value).compare_implementation(a_other, a_exclude_xpath, a_include_xpath, - a_join_by_xpath, a_unordered, a_inclusion_compare); - end if; else l_result := l_result + (self as ut_compound_data_value).compare_implementation(a_other, a_exclude_xpath, a_include_xpath); end if; diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index 00236f99e..7ac4e0843 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -1087,10 +1087,8 @@ Rows: [ 2 differences ]% l_expected SYS_REFCURSOR; begin --Arrange - open l_actual for select object_id, owner, object_name,object_type from all_objects where owner = user - order by 1,2,3 asc; - open l_expected for select object_id, owner, object_name,object_type from all_objects where owner = user - order by 1,2,3 desc; + open l_actual for select object_id, owner, object_name,object_type from all_objects where owner = user; + open l_expected for select object_id, owner, object_name,object_type from all_objects where owner = user; --Act ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OBJECT_ID'); @@ -1103,13 +1101,11 @@ Rows: [ 2 differences ]% l_expected SYS_REFCURSOR; begin --Arrange - open l_actual for select owner, object_name,object_type from all_objects where owner = user - order by 1,2,3 asc; - open l_expected for select owner, object_name,object_type from all_objects where owner = user - order by 1,2,3 desc; + open l_actual for select object_id, owner, object_name,object_type from all_objects where owner = user; + open l_expected for select object_id, owner, object_name,object_type from all_objects where owner = user; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by(ut3.ut_varchar2_list('OBJECT_NAME,OBJECT_TYPE')); + ut3.ut.expect(l_actual).to_equal(l_expected).join_by(ut3.ut_varchar2_list('OBJECT_ID,OBJECT_NAME')); --Assert ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; @@ -1310,8 +1306,8 @@ Diff:% l_expected_message := q'[%Actual: refcursor [ count = % ] was expected to equal: refcursor [ count = % ] %Diff:% %Rows: [ 2 differences ]% -%PK TEST-610 - Extra% -%PK TEST-600 - Missing%]'; +%PK TEST-610 - Extra: TEST-610% +%PK TEST-600 - Missing: TEST-600%]'; l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); @@ -1366,7 +1362,7 @@ Diff:% open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 4; open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')).join_by('SOME_COL'); + ut3.ut.expect(l_actual).to_equal(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')).join_by('RN'); --Assert ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; @@ -1380,7 +1376,7 @@ Diff:% open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 4; open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).exclude(ut3.ut_varchar2_list('//Some_Col','A_COLUMN')).join_by('SOME_COL'); + ut3.ut.expect(l_actual).to_equal(l_expected).exclude(ut3.ut_varchar2_list('//Some_Col','A_COLUMN')).join_by('RN'); --Assert ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; @@ -1726,7 +1722,7 @@ Diff:% --Assert l_expected_message := q'[%Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 2 ]% %Diff:% -%Rows: [ 2 differences ]% +%Rows: [ 4 differences ]% %PK %%%%%%%%%%%%%Extra%%% %PK %%%%%%%%%%%%%Extra%%% %PK %%%%%%%%%%%%%Missing%%% From ab593d97bd34b5399fd5d8f4c8f73dc13dadf1d4 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 9 Nov 2018 22:19:31 +0000 Subject: [PATCH 0075/1096] Update code to consolidate compare sqls into one place where is generated dynamically --- .../data_values/ut_compound_data_helper.pkb | 184 +++++++----------- .../data_values/ut_compound_data_helper.pks | 6 +- .../data_values/ut_compound_data_value.tpb | 64 +----- .../data_values/ut_compound_data_value.tps | 5 +- .../ut_curr_usr_compound_helper.pkb | 68 +++---- .../ut_curr_usr_compound_helper.pks | 7 +- .../data_values/ut_data_value_refcursor.tpb | 6 +- .../data_values/ut_data_value_refcursor.tps | 6 - .../expectations/test_expectations_cursor.pkb | 4 +- 9 files changed, 122 insertions(+), 228 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 99ae439d6..d1c36b1d0 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -25,16 +25,15 @@ create or replace package body ut_compound_data_helper is l_data ut_data_value := a_column_details.value; l_key varchar2(4000) := ut_utils.xmlgen_escaped_string(a_column_details.KEY); l_is_diff number; - begin + begin l_result := '<'||l_key||' xml_valid_name="'||l_key; if l_data is of(ut_data_value_xmltype) then - l_result := l_result||'" sql_diffable="0">' || (treat(l_data as ut_data_value_xmltype).to_string); + l_result := l_result||'" sql_diffable="0" user_defined="1" >' ||trim( both '''' from (treat(l_data as ut_data_value_xmltype).to_string)); else l_is_diff := ut_curr_usr_compound_helper.is_sql_compare_int((treat(l_data as ut_data_value_varchar2).data_value)); - l_result := l_result||'" sql_diffable="'||l_is_diff||'">' || ut_utils.xmlgen_escaped_string((treat(l_data as ut_data_value_varchar2).data_value)); + l_result := l_result||'" sql_diffable="'||l_is_diff||'" user_defined="0">' || ut_utils.xmlgen_escaped_string((treat(l_data as ut_data_value_varchar2).data_value)); end if; - - l_result := l_result ||''; + l_result := l_result ||''; return xmltype(l_result); end; @@ -202,6 +201,8 @@ create or replace package body ut_compound_data_helper is from diff_info i, table( xmlsequence( extract(i.act_item_data,'/*/*') ) ) s where i.act_data_id = :other_guid) + select rn, diff_type, diffed_row, pk_value pk_value + from ( select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, pk_value pk_value from ( select nvl(exp.rn, act.rn) rn, nvl(exp.pk_value, act.pk_value) pk_value, exp.col exp_item, act.col act_item @@ -215,7 +216,8 @@ create or replace package body ut_compound_data_helper is nvl2(i.join_by,ut3.ut_compound_data_helper.get_pk_value(i.join_by,case when exp_data_id is null then act_item_data else exp_item_data end),null) pk_value from diff_info i where act_data_id is null or exp_data_id is null - order by 1 , 2]' + ) + order by 2, 1]' bulk collect into l_results using a_exclude_xpath,a_include_xpath, a_exclude_xpath,a_include_xpath, @@ -359,7 +361,7 @@ create or replace package body ut_compound_data_helper is if a_join_by_xpath is not null then l_pk_xpath_tabs := ut_utils.string_to_table(a_join_by_xpath,'|'); l_column_filter := get_columns_row_filter(a_exclude_xpath, a_include_xpath); - + execute immediate q'[ with xpaths_tab as (select column_value xpath from table(:xpath_tabs)), expected_column_info as ( select :expected as item_data from dual ), @@ -390,84 +392,7 @@ create or replace package body ut_compound_data_helper is return l_no_missing_keys; end; - - function get_inclusion_matcher_sql(a_owner in varchar2) return varchar2 is - l_sql varchar2(32767); - begin - l_sql := 'with source_data as - ( select t.data_id,t.item_hash,t.duplicate_no, - pk_hash - from ' || a_owner || '.ut_compound_data_tmp t - where data_id = :self_guid or data_id = :other_guid - ) - select distinct :diff_id,tmp.item_hash,tmp.pk_hash,tmp.duplicate_no - from( - ( - select t.item_hash,t. duplicate_no,t.pk_hash - from source_data t - where t.data_id = :self_guid - minus - select t.item_hash,t. duplicate_no,t.pk_hash - from source_data t - where t.data_id = :other_guid - ) - union all - ( - select t.item_hash,t. duplicate_no,t.pk_hash - from source_data t, - source_data s - where t.data_id = :other_guid - and s.data_id = :self_guid - and t.pk_hash = s.pk_hash - and t.item_hash != s.item_hash - ) - ) - tmp'; - return l_sql; - end; - - function get_not_inclusion_matcher_sql(a_owner in varchar2) return varchar2 is - l_sql varchar2(32767); - begin - /* Self set does not contain any values from other set */ - l_sql := 'with source_data as - ( select t.data_id,t.item_hash,t.duplicate_no, - pk_hash - from ' || a_owner || '.ut_compound_data_tmp t - where data_id = :self_guid or data_id = :other_guid - ) - select distinct :diff_id,tmp.item_hash,tmp.pk_hash,tmp.duplicate_no - from - ( - select act.item_hash,act. duplicate_no,act.pk_hash - from source_data act where act.data_id = :self_guid - and exists ( select 1 - from source_data exp - where exp.data_id = :other_guid - and exp.item_hash = act.item_hash - ) - union all - select null,null,null - from dual where :other_guid = :self_guid - ) - tmp'; - return l_sql; - end; - - -- TODO:Rebuild as the unordered can be done using join_by compare - function get_refcursor_matcher_sql(a_owner in varchar2,a_inclusion_matcher boolean := false, a_negated_match boolean := false) return varchar2 is - l_sql varchar2(32767); - begin - l_sql := 'insert into ' || a_owner || '.ut_compound_data_diff_tmp ( diff_id,item_hash,pk_hash,duplicate_no)'||chr(10); - if a_inclusion_matcher and not(a_negated_match) then - l_sql := l_sql || get_inclusion_matcher_sql(a_owner); - elsif a_inclusion_matcher and a_negated_match then - l_sql := l_sql || get_not_inclusion_matcher_sql(a_owner); - end if; - - return l_sql; - end; - + function generate_select_stmt(a_column_info ut_varchar2_list,a_xml_column_info xmltype) return clob is l_sql_stmt clob; l_col_type varchar2(4000); @@ -570,19 +495,41 @@ create or replace package body ut_compound_data_helper is for i in 1..a_column_info.count loop l_sql_stmt := l_sql_stmt || case when l_sql_stmt is null then null else ' and ' end ||' a.'||a_column_info(i)||q'[ = ]'||' e.'||a_column_info(i); end loop; - return l_sql_stmt; end; - function generate_join_by_on_stmt (a_join_by_xpath_tab ut_varchar2_list) return clob is + function generate_join_by_on_stmt (a_join_by_xpath_tab ut_varchar2_list, a_columns_info xmltype, a_join_by_xpath in varchar2) return clob is l_sql_stmt clob; - begin - for i in (with xpaths_tab as (select column_value xpath from table(a_join_by_xpath_tab)) - select REGEXP_SUBSTR (xpath,'[^(/\*/)](.+)$') name - from xpaths_tab) + l_non_diff_var varchar2(32767); + l_ut_owner varchar2(250) := ut_utils.ut_owner; + begin + for i in (select /*+ CARDINALITY(xt 100) */ + distinct + t.column_value, + xt.is_sql_diff + from + (select a_columns_info item_data from dual) x, + xmltable( + '/ROW/*' + passing x.item_data + columns + name varchar2(4000) PATH '@xml_valid_name', + is_sql_diff varchar2(4000) PATH '@sql_diffable' + ) xt, + table(a_join_by_xpath_tab) t + where xt.name = t.column_value) loop - l_sql_stmt := l_sql_stmt || case when l_sql_stmt is null then null else ' and ' end ||' a.'||i.name||q'[ = ]'||' e.'||i.name; + + if i.is_sql_diff = 0 then + l_non_diff_var := l_ut_owner ||'.ut_compound_data_helper.get_hash((extract( a.'||i.column_value||','||a_join_by_xpath||')).getclobval()) = ' + ||l_ut_owner ||'.ut_compound_data_helper.get_hash((extract( e.'||i.column_value||','||a_join_by_xpath||')).getclobval())'; + l_sql_stmt := l_sql_stmt || case when l_sql_stmt is null then null else ' and ' end ||' a.'||i.column_value||q'[ = ]'||' e.'||i.column_value; + elsif i.is_sql_diff = 1 then + l_sql_stmt := l_sql_stmt || case when l_sql_stmt is null then null else ' and ' end ||' a.'||i.column_value||q'[ = ]'||' e.'||i.column_value; + end if; + end loop; + return l_sql_stmt; end; @@ -605,7 +552,7 @@ create or replace package body ut_compound_data_helper is end; function gen_compare_sql(a_column_info xmltype, a_exclude_xpath varchar2, - a_include_xpath varchar2, a_join_by_xpath varchar2) return clob is + a_include_xpath varchar2, a_join_by_xpath varchar2, a_inclusion_type boolean, a_is_negated boolean ) return clob is l_compare_sql clob; l_temp_string varchar2(32767); @@ -621,7 +568,7 @@ create or replace package body ut_compound_data_helper is function get_columns_names (a_xpath_tab in ut_varchar2_list) return ut_varchar2_list is l_names_tab ut_varchar2_list := ut_varchar2_list(); begin - select distinct REGEXP_SUBSTR (column_value,'[^(/\*/)](.+)$') + select distinct REGEXP_SUBSTR (column_value,'[^(\/*\/)]+',1,1) bulk collect into l_names_tab from table(a_xpath_tab); return l_names_tab; @@ -642,12 +589,23 @@ create or replace package body ut_compound_data_helper is ) xt; return l_columns_info; end; - + + function get_join_type(a_inclusion_compare in boolean,a_negated in boolean) return varchar2 is + begin + if a_inclusion_compare and not(a_negated) then + return ' right outer join '; + elsif a_inclusion_compare and a_negated then + return ' inner join '; + else + return ' full outer join '; + end if; + end; + begin dbms_lob.createtemporary(l_compare_sql, true); + --TODO: Resolve issues with collection and nested tables, can we extract by internal column name if defined e.g. xml of colval.id.getclobval() --Check include and exclude columns and create an actual column list that have to be compared. - --TODO :Reformat if a_include_xpath is null and a_exclude_xpath is null then l_act_col_tab := get_columns_info(a_column_info); elsif a_include_xpath is not null and a_exclude_xpath is null then @@ -697,28 +655,34 @@ create or replace package body ut_compound_data_helper is -- If no key defined do the join on all columns l_temp_string := ' select a.item_data as act_item_data, a.data_id act_data_id,' ||'e.item_data as exp_item_data, e.data_id exp_data_id, rownum item_no, nvl(e.dup_no,a.dup_no) dup_no ' - ||'from act a full outer join exp e on ( '; + ||'from act a '||get_join_type(a_inclusion_type,a_is_negated)||' exp e on ( '; ut_utils.append_to_clob(l_compare_sql,l_temp_string); - ut_utils.append_to_clob(l_compare_sql,generate_equal_sql(l_act_col_tab)||q'[ and e.dup_no = a.dup_no ) where a.data_id is null or e.data_id is null]'); + ut_utils.append_to_clob(l_compare_sql,generate_equal_sql(l_act_col_tab)||q'[ and e.dup_no = a.dup_no ) where ]'); else -- If key defined do the join or these and where on diffrences l_temp_string := q'[ select a.item_data act_item_data, a.data_id act_data_id, ]' - ||' e.item_data exp_item_data, e.data_id exp_data_id, rownum item_no,nvl(e.dup_no,a.dup_no) dup_no from act a full outer join exp e on ( e.dup_no = a.dup_no and '; + ||' e.item_data exp_item_data, e.data_id exp_data_id, rownum item_no,nvl(e.dup_no,a.dup_no) dup_no from act a '||get_join_type(a_inclusion_type,a_is_negated)||' exp e on ( e.dup_no = a.dup_no and '; ut_utils.append_to_clob(l_compare_sql,l_temp_string); - ut_utils.append_to_clob(l_compare_sql,generate_join_by_on_stmt (l_pk_xpath_tabs)||' ) '); + ut_utils.append_to_clob(l_compare_sql,generate_join_by_on_stmt (l_pk_xpath_tabs,a_column_info,a_join_by_xpath)||' ) where'); - l_where_stmt := generate_not_equal_sql(l_act_col_tab, l_pk_xpath_tabs); - case - when l_where_stmt is null then - ut_utils.append_to_clob(l_compare_sql,' where a.data_id is null or e.data_id is null'); - else - ut_utils.append_to_clob(l_compare_sql,' where ( '||l_where_stmt||' ) or ( a.data_id is null or e.data_id is null )'); - end case; + + if not a_is_negated then + l_where_stmt := generate_not_equal_sql(l_act_col_tab, l_pk_xpath_tabs); + if l_where_stmt is not null then + ut_utils.append_to_clob(l_compare_sql,' ( '||l_where_stmt||' ) or '); + end if; + end if; end if; - - --TEST - dbms_output.put_line( l_compare_sql); + + --If its inlcusion we expect a actual set to fully match and have no extra elements over expected + if a_inclusion_type and not(a_is_negated) then + l_temp_string := ' ( a.data_id is null ) '; + else + l_temp_string := ' (a.data_id is null or e.data_id is null) '; + end if; + ut_utils.append_to_clob(l_compare_sql,l_temp_string); + return l_compare_sql; end; diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 23c6636e8..5c72edf90 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -88,11 +88,9 @@ create or replace package ut_compound_data_helper authid definer is function is_pk_exists(a_expected_cursor xmltype, a_actual_cursor xmltype, a_exclude_xpath varchar2, a_include_xpath varchar2,a_join_by_xpath varchar2) return tt_missing_pk; - - function get_refcursor_matcher_sql(a_owner in varchar2,a_inclusion_matcher boolean := false, a_negated_match boolean := false) return varchar2; - + function gen_compare_sql(a_column_info xmltype, a_exclude_xpath varchar2, - a_include_xpath varchar2, a_join_by_xpath varchar2) return clob; + a_include_xpath varchar2, a_join_by_xpath varchar2, a_inclusion_type boolean, a_is_negated boolean ) return clob; procedure insert_diffs_result(a_diff_tab t_diff_tab, a_diff_id raw); diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index 94c448092..f48aec888 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -234,58 +234,10 @@ create or replace type body ut_compound_data_value as return l_result; end; - member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, - a_unordered boolean , a_inclusion_compare boolean := false, a_is_negated boolean := false ) return integer is - l_other ut_compound_data_value; - l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_diff_id ut_compound_data_helper.t_hash; - l_result integer; - l_row_diffs ut_compound_data_helper.tt_row_diffs; - c_max_rows constant integer := 20; - l_sql varchar2(32767); - - begin - if not a_other is of (ut_compound_data_value) then - raise value_error; - end if; - - l_other := treat(a_other as ut_compound_data_value); - - l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); - - /*!* - * Comparision is based on type of search, for inclusion based search we will look for left join only. - * For normal two side diff we will peform minus on two sets two get diffrences. - * SELF is expected. - * Due to growing complexity I have moved a dynamic SQL into helper package. - */ - l_sql := ut_compound_data_helper.get_refcursor_matcher_sql(l_ut_owner,a_inclusion_compare,a_is_negated); + member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, + a_join_by_xpath varchar2,a_unordered boolean, a_inclusion_compare boolean := false, a_is_negated boolean := false ) return integer is - execute immediate l_sql - using self.data_id, l_other.data_id, - l_diff_id, - self.data_id, l_other.data_id, - l_other.data_id,self.data_id; - - /*!* - * Result OK when is not inclusion matcher and both are the same - * Resullt OK when is inclusion matcher and left contains right set - */ - if sql%rowcount = 0 and self.elements_count = l_other.elements_count and not(a_inclusion_compare ) then - l_result := 0; - elsif sql%rowcount = 0 and a_inclusion_compare then - l_result := 0; - else - l_result := 1; - end if; - return l_result; - end; - - member function compare_implementation_by_sql(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_inclusion_compare boolean := false) return integer is - - l_actual ut_data_value_refcursor := treat(a_other as ut_data_value_refcursor); - l_diff_id ut_compound_data_helper.t_hash; - + l_diff_id ut_compound_data_helper.t_hash; l_other ut_compound_data_value; l_result integer; --We will start with number od differences being displayed. @@ -299,16 +251,16 @@ create or replace type body ut_compound_data_value as --TODO : Error on xml when same column is more then once in item data xml.Do we need to cleanup ?? l_other := treat(a_other as ut_compound_data_value); l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); - - open l_loop_curs for ut_compound_data_helper.gen_compare_sql(l_actual.columns_info, a_exclude_xpath, - a_include_xpath, a_join_by_xpath) using self.data_id,l_actual.data_id; + + open l_loop_curs for ut_compound_data_helper.gen_compare_sql(treat(a_other as ut_data_value_refcursor).columns_info, a_exclude_xpath, + a_include_xpath, a_join_by_xpath, a_inclusion_compare, a_is_negated) using self.data_id,l_other.data_id; loop fetch l_loop_curs bulk collect into l_diff_tab limit l_max_rows; exit when l_diff_tab.count = 0; if (ut_utils.gc_diff_max_rows > l_sql_rowcount ) then ut_compound_data_helper.insert_diffs_result(l_diff_tab,l_diff_id); end if; - + l_sql_rowcount := l_sql_rowcount + l_diff_tab.count; if (ut_utils.gc_diff_max_rows <= l_sql_rowcount and l_max_rows != ut_utils.gc_bc_fetch_limit ) then @@ -318,7 +270,7 @@ create or replace type body ut_compound_data_value as ut_compound_data_helper.set_rows_diff(l_sql_rowcount); --result is OK only if both are same - if l_sql_rowcount = 0 and self.elements_count = l_other.elements_count then + if l_sql_rowcount = 0 and ( self.elements_count = l_other.elements_count or a_inclusion_compare )then l_result := 0; else l_result := 1; diff --git a/source/expectations/data_values/ut_compound_data_value.tps b/source/expectations/data_values/ut_compound_data_value.tps index e1ff43319..2e76bb8f8 100644 --- a/source/expectations/data_values/ut_compound_data_value.tps +++ b/source/expectations/data_values/ut_compound_data_value.tps @@ -44,8 +44,7 @@ create or replace type ut_compound_data_value force under ut_data_value( overriding member function diff( a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean := false ) return varchar2, member function get_data_diff(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean) return clob, member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2) return integer, - member function compare_implementation_by_sql(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_inclusion_compare boolean := false) return integer, - member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, - a_unordered boolean , a_inclusion_compare boolean := false, a_is_negated boolean := false ) return integer + member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, + a_join_by_xpath varchar2, a_unordered boolean, a_inclusion_compare boolean := false,a_is_negated boolean := false ) return integer ) not final not instantiable / diff --git a/source/expectations/data_values/ut_curr_usr_compound_helper.pkb b/source/expectations/data_values/ut_curr_usr_compound_helper.pkb index 5c18c6743..5efd64e9e 100644 --- a/source/expectations/data_values/ut_curr_usr_compound_helper.pkb +++ b/source/expectations/data_values/ut_curr_usr_compound_helper.pkb @@ -6,7 +6,6 @@ create or replace package body ut_curr_usr_compound_helper is g_anytype_collection_name t_type_name_map; g_user_defined_type pls_integer := dbms_sql.user_defined_type; g_is_collection boolean := false; - g_is_sql_diffable boolean := true; procedure set_collection_state(a_is_collection boolean) is begin @@ -16,23 +15,13 @@ create or replace package body ut_curr_usr_compound_helper is end if; end; - procedure set_sql_diff_state(a_is_sql_diff boolean) is - begin - --Make sure that we set a g_is_collection only once so we dont reset from false to true. - if g_is_sql_diffable then - g_is_sql_diffable := a_is_sql_diff; - end if; - end; - function is_sql_compare_allowed(a_type_name varchar2) return boolean is begin --clob/blob/xmltype/object/nestedcursor/nestedtable - if a_type_name IN (g_type_name_map(dbms_sql.blob_type), g_type_name_map(dbms_sql.clob_type), - g_type_name_map(dbms_sql.bfile_type), - g_type_name_map(dbms_sql.user_defined_type)) + g_type_name_map(dbms_sql.bfile_type)) then return false; else @@ -42,7 +31,6 @@ create or replace package body ut_curr_usr_compound_helper is function is_sql_compare_int(a_type_name varchar2) return integer is begin - --raise_application_error(-20111,'no '||a_type_name||ut_utils.boolean_to_int(is_sql_compare_allowed(a_type_name))); return ut_utils.boolean_to_int(is_sql_compare_allowed(a_type_name)); end; @@ -61,32 +49,37 @@ create or replace package body ut_curr_usr_compound_helper is return l_typecode = 'COLLECTION'; end; - + --TODO: Review the types in and resolving begin + if g_type_name_map.exists(a_desc_rec.col_type) then l_data := ut_data_value_varchar2(g_type_name_map(a_desc_rec.col_type)); - set_sql_diff_state(is_sql_compare_allowed(g_type_name_map(a_desc_rec.col_type))); + return ut_key_anyval_pair(a_desc_rec.col_name,l_data); + end if; /*If its a collection regardless is we want to describe user defined types we will return just a name and capture that name */ - elsif a_desc_rec.col_type = g_user_defined_type and is_collection(a_desc_rec.col_schema_name,a_desc_rec.col_type_name) then + + if a_desc_rec.col_type = g_user_defined_type and is_collection(a_desc_rec.col_schema_name,a_desc_rec.col_type_name) then l_data := ut_data_value_varchar2(a_desc_rec.col_schema_name||'.'||a_desc_rec.col_type_name); - set_sql_diff_state(false); set_collection_state(true); - elsif a_desc_rec.col_type = g_user_defined_type and a_desc_user_types then - if a_desc_rec.col_type_name = 'XMLTYPE' - then + return ut_key_anyval_pair(a_desc_rec.col_name,l_data); + end if; + + if a_desc_rec.col_type = g_user_defined_type and a_desc_user_types then + if a_desc_rec.col_type_name = 'XMLTYPE' then l_data := ut_data_value_varchar2(a_desc_rec.col_type_name); else + --This is only time we return xml if its user defined. This is important as its used later. l_data :=ut_data_value_xmltype(get_user_defined_type(a_desc_rec.col_schema_name,a_desc_rec.col_type_name)); end if; - set_sql_diff_state(false); - elsif a_desc_rec.col_schema_name is not null and a_desc_rec.col_type_name is not null then + return ut_key_anyval_pair(a_desc_rec.col_name,l_data); + end if; + + if a_desc_rec.col_schema_name is not null and a_desc_rec.col_type_name is not null then l_data := ut_data_value_varchar2(a_desc_rec.col_schema_name||'.'||a_desc_rec.col_type_name); - set_sql_diff_state(false); + return ut_key_anyval_pair(a_desc_rec.col_name,l_data); end if; - - return ut_key_anyval_pair(a_desc_rec.col_name,l_data); - end; + end; function get_columns_info( a_columns_tab dbms_sql.desc_tab3, a_columns_count integer, a_desc_user_types boolean := false @@ -117,7 +110,7 @@ create or replace package body ut_curr_usr_compound_helper is l_cursor_number := dbms_sql.to_cursor_number( a_cursor ); dbms_sql.describe_columns3( l_cursor_number, l_columns_count, l_columns_desc ); a_cursor := dbms_sql.to_refcursor( l_cursor_number ); - a_columns_tab := get_columns_info( l_columns_desc, l_columns_count, false); + a_columns_tab := get_columns_info( l_columns_desc, l_columns_count, true); a_join_by_tab := get_columns_info( l_columns_desc, l_columns_count, true); end; @@ -125,8 +118,7 @@ create or replace package body ut_curr_usr_compound_helper is a_cursor in out nocopy sys_refcursor, a_columns_info out nocopy xmltype, a_join_by_info out nocopy xmltype, - a_contains_collection out nocopy number, - a_is_sql_diffable out nocopy number + a_contains_collection out nocopy number ) is l_columns_info xmltype; l_join_by_info xmltype; @@ -134,7 +126,7 @@ create or replace package body ut_curr_usr_compound_helper is l_columns_tab ut_key_anyval_pairs; l_join_by_tab ut_key_anyval_pairs; begin - + get_descr_cursor(a_cursor,l_columns_tab,l_join_by_tab); for i in 1..l_columns_tab.COUNT @@ -151,9 +143,8 @@ create or replace package body ut_curr_usr_compound_helper is select XMLELEMENT("ROW",l_columns_info ),XMLELEMENT("ROW",l_join_by_info ) into a_columns_info,a_join_by_info from dual; - + a_contains_collection := ut_utils.boolean_to_int(g_is_collection); - a_is_sql_diffable := ut_utils.boolean_to_int(g_is_sql_diffable); end; function get_anytype_attribute_count (a_anytype anytype) return pls_integer is @@ -215,8 +206,7 @@ create or replace package body ut_curr_usr_compound_helper is end if; end loop; end if; - - + return l_result; end; @@ -235,16 +225,15 @@ create or replace package body ut_curr_usr_compound_helper is l_typecode := l_anydata.gettype(l_anytype); l_columns_tab := get_anytype_attributes_info(l_anytype); - + select xmlagg(xmlelement(evalname key,value)) - into l_result from table(l_columns_tab); - + into l_result from table(l_columns_tab); + return l_result; - end; begin - g_anytype_name_map(dbms_types.typecode_date) :=' DATE'; + g_anytype_name_map(dbms_types.typecode_date) := 'DATE'; g_anytype_name_map(dbms_types.typecode_number) := 'NUMBER'; g_anytype_name_map(dbms_types.typecode_raw) := 'RAW'; g_anytype_name_map(dbms_types.typecode_char) := 'CHAR'; @@ -289,7 +278,6 @@ create or replace package body ut_curr_usr_compound_helper is g_type_name_map( dbms_sql.number_type ) := 'NUMBER'; g_type_name_map( dbms_sql.rowid_type ) := 'ROWID'; g_type_name_map( dbms_sql.urowid_type ) := 'UROWID'; - g_type_name_map( dbms_sql.user_defined_type ) := 'USER_DEFINED_TYPE'; end; / diff --git a/source/expectations/data_values/ut_curr_usr_compound_helper.pks b/source/expectations/data_values/ut_curr_usr_compound_helper.pks index 396c5d3b6..bbbba0fa3 100644 --- a/source/expectations/data_values/ut_curr_usr_compound_helper.pks +++ b/source/expectations/data_values/ut_curr_usr_compound_helper.pks @@ -1,15 +1,14 @@ create or replace package ut_curr_usr_compound_helper authid current_user is - + function is_sql_compare_allowed(a_type_name varchar2) return boolean; function is_sql_compare_int(a_type_name varchar2) return integer; - + procedure get_columns_info( a_cursor in out nocopy sys_refcursor, a_columns_info out nocopy xmltype, a_join_by_info out nocopy xmltype, - a_contains_collection out nocopy number, - a_is_sql_diffable out nocopy number + a_contains_collection out nocopy number ); function get_user_defined_type(a_owner varchar2, a_type_name varchar2) return xmltype; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 6cf8c27b4..e73a641f7 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -42,7 +42,7 @@ create or replace type body ut_data_value_refcursor as --Get some more info regarding cursor, including if it containts collection columns and what is their name ut_curr_usr_compound_helper.get_columns_info(l_cursor,self.columns_info,self.key_info, - self.contain_collection,self.is_sql_diffable); + self.contain_collection); self.elements_count := 0; -- We use DBMS_XMLGEN in order to: @@ -252,8 +252,8 @@ create or replace type body ut_data_value_refcursor as if a_unordered then - l_result := l_result + (self as ut_compound_data_value).compare_implementation_by_sql(a_other, a_exclude_xpath, a_include_xpath, - a_join_by_xpath, a_inclusion_compare); + l_result := l_result + (self as ut_compound_data_value).compare_implementation(a_other, a_exclude_xpath, a_include_xpath, + a_join_by_xpath,a_unordered, a_inclusion_compare, a_is_negated); else l_result := l_result + (self as ut_compound_data_value).compare_implementation(a_other, a_exclude_xpath, a_include_xpath); end if; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tps b/source/expectations/data_values/ut_data_value_refcursor.tps index 5972f710c..36c231887 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tps +++ b/source/expectations/data_values/ut_data_value_refcursor.tps @@ -40,12 +40,6 @@ create or replace type ut_data_value_refcursor under ut_compound_data_value( */ key_info xmltype, - /** - * Hold info if type contain any of the nonstandard user types which defines way we do compare later. - * Types of clob/blob/xmltype/object/nestedcursor/nestedtable will force into hash - */ - is_sql_diffable number(1,0), - constructor function ut_data_value_refcursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) return self as result, member procedure init(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor), overriding member function to_string return varchar2, diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index 7ac4e0843..086ad9193 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -2342,8 +2342,8 @@ Diff:% l_expected SYS_REFCURSOR; begin --Arrange - open l_actual for select username,user_id from all_users; - open l_expected for select username||'ACT' username ,user_id from all_users where rownum < 5; + open l_actual for select username,rownum * 10 user_id from all_users where rownum < 5; + open l_expected for select username ,rownum user_id from all_users where rownum < 5; --Act ut3.ut.expect(l_actual).not_to_contain(l_expected).join_by('USER_ID'); From 4d3dadcfc8efe3ba0f8d18569cc1f67ce4144ea9 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 9 Nov 2018 23:37:01 +0000 Subject: [PATCH 0076/1096] Update for 11g where error about inline with was raised. Update test for min grant user as it produces cartesian --- .../data_values/ut_compound_data_helper.pkb | 63 ++++++++++--------- .../ut_curr_usr_compound_helper.pkb | 4 +- test/min_grant_user/min_grant_user_exp.pkb | 6 +- 3 files changed, 40 insertions(+), 33 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index d1c36b1d0..2a3a095e9 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -17,7 +17,7 @@ create or replace package body ut_compound_data_helper is */ g_user_defined_type pls_integer := dbms_sql.user_defined_type; - gc_diff_count integer; + g_diff_count integer; function get_column_info_xml(a_column_details ut_key_anyval_pair) return xmltype is l_result varchar2(4000); @@ -182,46 +182,53 @@ create or replace package body ut_compound_data_helper is l_act_col_filter := get_columns_row_filter(a_exclude_xpath,a_include_xpath,'ucd','act_item_data'); l_exp_col_filter := get_columns_row_filter(a_exclude_xpath,a_include_xpath,'ucd','exp_item_data'); - execute immediate q'[with diff_info as - ( select act_data_id, exp_data_id,]' - ||l_act_col_filter||','|| l_exp_col_filter||q'[, :join_by join_by, item_no - from ut_compound_data_diff_tmp ucd - where diff_id = :diff_id ), - exp as ( + execute immediate q'[with exp as ( select exp_item_data, exp_data_id, item_no rn,rownum col_no, nvl2(exp_item_data,ut3.ut_compound_data_helper.get_pk_value(i.join_by,exp_item_data),null) pk_value, s.column_value col, s.column_value.getRootElement() col_name, s.column_value.getclobval() col_val - from diff_info i, + from ( + select exp_data_id, ]'||l_exp_col_filter||q'[, :join_by join_by, item_no + from ut_compound_data_diff_tmp ucd + where diff_id = :diff_id + and ucd.exp_data_id = :self_guid) i, table( xmlsequence( extract(i.exp_item_data,'/*/*') ) ) s - where i.exp_data_id = :self_guid), + ), act as ( select act_item_data, act_data_id, item_no rn, rownum col_no, nvl2(act_item_data,ut3.ut_compound_data_helper.get_pk_value(i.join_by,act_item_data),null) pk_value, s.column_value col, s.column_value.getRootElement() col_name, s.column_value.getclobval() col_val - from diff_info i, + from ( + select act_data_id, ]'||l_act_col_filter||q'[, :join_by join_by, item_no + from ut_compound_data_diff_tmp ucd + where diff_id = :diff_id + and ucd.exp_data_id = :other_guid ) i, table( xmlsequence( extract(i.act_item_data,'/*/*') ) ) s - where i.act_data_id = :other_guid) + ) select rn, diff_type, diffed_row, pk_value pk_value from ( - select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, pk_value pk_value - from ( - select nvl(exp.rn, act.rn) rn, nvl(exp.pk_value, act.pk_value) pk_value, exp.col exp_item, act.col act_item - from exp join act - on exp.rn = act.rn and exp.col_name = act.col_name - where dbms_lob.compare(exp.col_val, act.col_val) != 0) - unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:') ) + select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, pk_value pk_value + from + (select nvl(exp.rn, act.rn) rn, nvl(exp.pk_value, act.pk_value) pk_value, exp.col exp_item, act.col act_item + from exp join act on exp.rn = act.rn and exp.col_name = act.col_name + where dbms_lob.compare(exp.col_val, act.col_val) != 0) + unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:') + ) union all - select item_no as rn, case when exp_data_id is null then 'Extra:' else 'Missing:' end as diff_type, + select + item_no as rn, case when exp_data_id is null then 'Extra:' else 'Missing:' end as diff_type, xmlserialize(content (case when exp_data_id is null then act_item_data else exp_item_data end) no indent) diffed_row, - nvl2(i.join_by,ut3.ut_compound_data_helper.get_pk_value(i.join_by,case when exp_data_id is null then act_item_data else exp_item_data end),null) pk_value - from diff_info i - where act_data_id is null or exp_data_id is null + nvl2(:join_by,ut3.ut_compound_data_helper.get_pk_value(:join_by,case when exp_data_id is null then act_item_data else exp_item_data end),null) pk_value + from ut_compound_data_diff_tmp i + where diff_id = :diff_id + and act_data_id is null or exp_data_id is null ) order by 2, 1]' bulk collect into l_results - using a_exclude_xpath,a_include_xpath, - a_exclude_xpath,a_include_xpath, - a_join_by_xpath, a_diff_id, a_expected_dataset_guid,a_actual_dataset_guid; + using a_exclude_xpath, a_include_xpath, a_join_by_xpath, + a_diff_id, a_expected_dataset_guid, + a_exclude_xpath,a_include_xpath, a_join_by_xpath, + a_diff_id, a_actual_dataset_guid, + a_join_by_xpath,a_join_by_xpath, a_diff_id; return l_results; end; @@ -700,17 +707,17 @@ create or replace package body ut_compound_data_helper is procedure set_rows_diff(a_rows_diff integer) is begin - gc_diff_count := a_rows_diff; + g_diff_count := a_rows_diff; end; procedure cleanup_diff is begin - gc_diff_count := 0; + g_diff_count := 0; end; function get_rows_diff return integer is begin - return gc_diff_count; + return g_diff_count; end; end; diff --git a/source/expectations/data_values/ut_curr_usr_compound_helper.pkb b/source/expectations/data_values/ut_curr_usr_compound_helper.pkb index 5efd64e9e..8ea1ab5bb 100644 --- a/source/expectations/data_values/ut_curr_usr_compound_helper.pkb +++ b/source/expectations/data_values/ut_curr_usr_compound_helper.pkb @@ -56,9 +56,9 @@ create or replace package body ut_curr_usr_compound_helper is l_data := ut_data_value_varchar2(g_type_name_map(a_desc_rec.col_type)); return ut_key_anyval_pair(a_desc_rec.col_name,l_data); end if; + /*If its a collection regardless is we want to describe user defined types we will return just a name - and capture that name */ - + and capture that name */ if a_desc_rec.col_type = g_user_defined_type and is_collection(a_desc_rec.col_schema_name,a_desc_rec.col_type_name) then l_data := ut_data_value_varchar2(a_desc_rec.col_schema_name||'.'||a_desc_rec.col_type_name); set_collection_state(true); diff --git a/test/min_grant_user/min_grant_user_exp.pkb b/test/min_grant_user/min_grant_user_exp.pkb index de79219e3..c1600e432 100644 --- a/test/min_grant_user/min_grant_user_exp.pkb +++ b/test/min_grant_user/min_grant_user_exp.pkb @@ -5,13 +5,13 @@ create or replace package body min_grant_user_exp is l_expected SYS_REFCURSOR; begin --Arrange - open l_actual for select owner, object_name,object_type from all_objects where owner = user + open l_actual for select object_id, owner, object_name,object_type from all_objects where owner = user order by 1,2,3 asc; - open l_expected for select owner, object_name,object_type from all_objects where owner = user + open l_expected for select object_id, owner, object_name,object_type from all_objects where owner = user order by 1,2,3 desc; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OWNER'); + ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OBJECT_ID'); end; From d9ccc838eb2c413bdf6b1ec67fafe20851e1ceae Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 9 Nov 2018 23:52:00 +0000 Subject: [PATCH 0077/1096] Fix to sql diff to resolve 11g optimizer rewrite error --- source/expectations/data_values/ut_compound_data_helper.pkb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 2a3a095e9..d4d79c4c3 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -178,6 +178,7 @@ create or replace package body ut_compound_data_helper is l_act_col_filter varchar2(32767); l_exp_col_filter varchar2(32767); l_results tt_row_diffs; + begin l_act_col_filter := get_columns_row_filter(a_exclude_xpath,a_include_xpath,'ucd','act_item_data'); l_exp_col_filter := get_columns_row_filter(a_exclude_xpath,a_include_xpath,'ucd','exp_item_data'); @@ -201,7 +202,7 @@ create or replace package body ut_compound_data_helper is select act_data_id, ]'||l_act_col_filter||q'[, :join_by join_by, item_no from ut_compound_data_diff_tmp ucd where diff_id = :diff_id - and ucd.exp_data_id = :other_guid ) i, + and ucd.act_data_id = :other_guid ) i, table( xmlsequence( extract(i.act_item_data,'/*/*') ) ) s ) select rn, diff_type, diffed_row, pk_value pk_value From c009a8608416e5eba468b79a84f4fda702cbba8d Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sat, 10 Nov 2018 20:40:10 +0000 Subject: [PATCH 0078/1096] Update code to bring all code into one place. Still few issues to resolve. TODO : Nested table, collections and some errors to investigate. TODO : Bring a diffs row into one place. --- .../data_values/ut_compound_data_helper.pkb | 82 ++++++++++++------- .../data_values/ut_compound_data_helper.pks | 7 +- .../data_values/ut_compound_data_value.tpb | 60 +++----------- .../data_values/ut_data_value_refcursor.tpb | 7 +- 4 files changed, 72 insertions(+), 84 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index d4d79c4c3..18a34c6d1 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -183,6 +183,8 @@ create or replace package body ut_compound_data_helper is l_act_col_filter := get_columns_row_filter(a_exclude_xpath,a_include_xpath,'ucd','act_item_data'); l_exp_col_filter := get_columns_row_filter(a_exclude_xpath,a_include_xpath,'ucd','exp_item_data'); + --TODO: Generate a dynamic SQL based on input e.g. no need for PK during unordered and consolidate get_rows_diff + execute immediate q'[with exp as ( select exp_item_data, exp_data_id, item_no rn,rownum col_no, nvl2(exp_item_data,ut3.ut_compound_data_helper.get_pk_value(i.join_by,exp_item_data),null) pk_value, @@ -317,12 +319,12 @@ create or replace package body ut_compound_data_helper is function get_rows_diff( a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2, - a_join_by_xpath varchar2,a_unorderdered boolean + a_join_by_xpath varchar2,a_unordered boolean ) return tt_row_diffs is l_result tt_row_diffs := tt_row_diffs(); begin case - when a_unorderdered then + when a_unordered then l_result := get_rows_diff_by_sql(a_expected_dataset_guid, a_actual_dataset_guid, a_diff_id, a_max_rows, a_exclude_xpath, a_include_xpath ,a_join_by_xpath); else @@ -559,8 +561,9 @@ create or replace package body ut_compound_data_helper is return l_sql_stmt; end; - function gen_compare_sql(a_column_info xmltype, a_exclude_xpath varchar2, - a_include_xpath varchar2, a_join_by_xpath varchar2, a_inclusion_type boolean, a_is_negated boolean ) return clob is + function gen_compare_sql(a_column_info xmltype, a_exclude_xpath varchar2, a_include_xpath varchar2, + a_join_by_xpath varchar2, a_inclusion_type boolean, a_is_negated boolean, + a_unordered boolean) return clob is l_compare_sql clob; l_temp_string varchar2(32767); @@ -613,6 +616,7 @@ create or replace package body ut_compound_data_helper is dbms_lob.createtemporary(l_compare_sql, true); --TODO: Resolve issues with collection and nested tables, can we extract by internal column name if defined e.g. xml of colval.id.getclobval() + --TODO: Comment better all pieces --Check include and exclude columns and create an actual column list that have to be compared. if a_include_xpath is null and a_exclude_xpath is null then l_act_col_tab := get_columns_info(a_column_info); @@ -638,12 +642,19 @@ create or replace package body ut_compound_data_helper is ut_utils.append_to_clob(l_compare_sql, l_temp_string); ut_utils.append_to_clob(l_compare_sql, l_select_stmt); - l_temp_string := q'[,x.item_no,x.data_id from (select item_data,item_no,data_id from ]' || l_ut_owner || q'[.ut_compound_data_tmp where data_id = :self_guid) x,]' + l_temp_string := ',x.data_id ,' + || case when not a_unordered then 'position ' else 'rownum ' end + ||'item_no from '|| l_ut_owner || '.ut_compound_data_tmp x, ' ||q'[xmltable('/ROWSET/ROW' passing x.item_data columns ]'; - ut_utils.append_to_clob(l_compare_sql, l_temp_string); + ut_utils.append_to_clob(l_compare_sql, l_temp_string); + + if not a_unordered then + ut_utils.append_to_clob(l_compare_sql,'POSITION for ordinality, '); + end if; + ut_utils.append_to_clob(l_compare_sql,l_xmltable_stmt); - l_temp_string := q'[ ,item_data xmltype PATH '*' ) ucd ) ucd ) ,]'; + l_temp_string := q'[ ,item_data xmltype PATH '*' ) ucd where data_id = :self_guid ) ucd ) ,]'; ut_utils.append_to_clob(l_compare_sql,l_temp_string); l_temp_string :='act as ( select ucd.* , '; @@ -654,35 +665,50 @@ create or replace package body ut_compound_data_helper is ut_utils.append_to_clob(l_compare_sql,l_temp_string); ut_utils.append_to_clob(l_compare_sql, l_select_stmt); - l_temp_string := q'[, x.item_no,x.data_id from (select item_data,item_no,data_id from ]' || l_ut_owner || q'[.ut_compound_data_tmp where data_id = :other_guid) x,]' + l_temp_string := ',x.data_id, ' + || case when not a_unordered then 'position ' else 'rownum ' end + ||'item_no from ' || l_ut_owner || '.ut_compound_data_tmp x,' ||q'[xmltable('/ROWSET/ROW' passing x.item_data columns ]' ; ut_utils.append_to_clob(l_compare_sql,l_temp_string); - ut_utils.append_to_clob(l_compare_sql,l_xmltable_stmt||q'[ ,item_data xmltype PATH '*') ucd ) ucd ) ]'); - - if a_join_by_xpath is null then - -- If no key defined do the join on all columns - l_temp_string := ' select a.item_data as act_item_data, a.data_id act_data_id,' - ||'e.item_data as exp_item_data, e.data_id exp_data_id, rownum item_no, nvl(e.dup_no,a.dup_no) dup_no ' + + if not a_unordered then + ut_utils.append_to_clob(l_compare_sql,'POSITION for ordinality, '); + end if; + + ut_utils.append_to_clob(l_compare_sql,l_xmltable_stmt||q'[ ,item_data xmltype PATH '*') ucd where data_id = :other_guid ) ucd ) ]'); + + l_temp_string := ' select a.item_data as act_item_data, a.data_id act_data_id,' + ||'e.item_data as exp_item_data, e.data_id exp_data_id, '|| + case when a_unordered then 'rownum item_no' else 'nvl(e.item_no,a.item_no) item_no' end ||', nvl(e.dup_no,a.dup_no) dup_no ' ||'from act a '||get_join_type(a_inclusion_type,a_is_negated)||' exp e on ( '; - ut_utils.append_to_clob(l_compare_sql,l_temp_string); - ut_utils.append_to_clob(l_compare_sql,generate_equal_sql(l_act_col_tab)||q'[ and e.dup_no = a.dup_no ) where ]'); - else - -- If key defined do the join or these and where on diffrences - l_temp_string := q'[ select a.item_data act_item_data, a.data_id act_data_id, ]' - ||' e.item_data exp_item_data, e.data_id exp_data_id, rownum item_no,nvl(e.dup_no,a.dup_no) dup_no from act a '||get_join_type(a_inclusion_type,a_is_negated)||' exp e on ( e.dup_no = a.dup_no and '; - ut_utils.append_to_clob(l_compare_sql,l_temp_string); - - ut_utils.append_to_clob(l_compare_sql,generate_join_by_on_stmt (l_pk_xpath_tabs,a_column_info,a_join_by_xpath)||' ) where'); - + ut_utils.append_to_clob(l_compare_sql,l_temp_string); + + if a_unordered then + ut_utils.append_to_clob(l_compare_sql,' e.dup_no = a.dup_no and '); + end if; + + if a_join_by_xpath is null and a_unordered then + -- If no key defined do the join on all columns + ut_utils.append_to_clob(l_compare_sql,generate_equal_sql(l_act_col_tab)); + elsif a_join_by_xpath is not null and a_unordered then + -- If key defined do the join or these and where on diffrences + ut_utils.append_to_clob(l_compare_sql,generate_join_by_on_stmt (l_pk_xpath_tabs,a_column_info,a_join_by_xpath)); + elsif not a_unordered then + ut_utils.append_to_clob(l_compare_sql, 'a.item_no = e.item_no ' ); + end if; - if not a_is_negated then + ut_utils.append_to_clob(l_compare_sql,' ) where '); + + if (a_join_by_xpath is not null) and (a_unordered) and (a_inclusion_type) and (not a_is_negated) then l_where_stmt := generate_not_equal_sql(l_act_col_tab, l_pk_xpath_tabs); if l_where_stmt is not null then ut_utils.append_to_clob(l_compare_sql,' ( '||l_where_stmt||' ) or '); end if; - end if; - end if; - + elsif not a_unordered then + l_where_stmt := generate_not_equal_sql(l_act_col_tab, l_pk_xpath_tabs); + ut_utils.append_to_clob(l_compare_sql,' ( '||l_where_stmt||' ) or '); + end if; + --If its inlcusion we expect a actual set to fully match and have no extra elements over expected if a_inclusion_type and not(a_is_negated) then l_temp_string := ' ( a.data_id is null ) '; diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 5c72edf90..a73fae8dd 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -74,7 +74,7 @@ create or replace package ut_compound_data_helper authid definer is function get_rows_diff( a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2, - a_join_by_xpath varchar2,a_unorderdered boolean + a_join_by_xpath varchar2,a_unordered boolean ) return tt_row_diffs; subtype t_hash is raw(128); @@ -89,8 +89,9 @@ create or replace package ut_compound_data_helper authid definer is function is_pk_exists(a_expected_cursor xmltype, a_actual_cursor xmltype, a_exclude_xpath varchar2, a_include_xpath varchar2,a_join_by_xpath varchar2) return tt_missing_pk; - function gen_compare_sql(a_column_info xmltype, a_exclude_xpath varchar2, - a_include_xpath varchar2, a_join_by_xpath varchar2, a_inclusion_type boolean, a_is_negated boolean ) return clob; + function gen_compare_sql(a_column_info xmltype, a_exclude_xpath varchar2, a_include_xpath varchar2, + a_join_by_xpath varchar2, a_inclusion_type boolean, a_is_negated boolean, + a_unordered boolean ) return clob; procedure insert_diffs_result(a_diff_tab t_diff_tab, a_diff_id raw); diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index f48aec888..76a591366 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -119,18 +119,7 @@ create or replace type body ut_compound_data_value as -- First tell how many rows are different --TODO: that is a bit mess ?? Can we use global variable for all matchers. - if a_unordered then - l_diff_row_count := ut_compound_data_helper.get_rows_diff; - else - execute immediate 'select count(' - ||case when ( a_join_by_xpath is not null ) - then 'distinct pk_hash' - else '*' - end - ||') from '|| l_ut_owner || '.ut_compound_data_diff_tmp ' - ||'where diff_id = :diff_id' - into l_diff_row_count using l_diff_id; - end if; + l_diff_row_count := ut_compound_data_helper.get_rows_diff; if l_diff_row_count > 0 then l_row_diffs := ut_compound_data_helper.get_rows_diff( @@ -159,9 +148,6 @@ create or replace type body ut_compound_data_value as l_column_filter varchar2(32767); l_diff_id ut_compound_data_helper.t_hash; l_result integer; - - l_sql varchar2(32767); - --the XML stylesheet is applied on XML representation of data to exclude column names from comparison --column names and data-types are compared separately --user CHR(38) instead of ampersand to eliminate define request when installing through some IDEs @@ -182,40 +168,20 @@ create or replace type body ut_compound_data_value as if not a_other is of (ut_compound_data_value) then raise value_error; end if; - + l_other := treat(a_other as ut_compound_data_value); l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); l_column_filter := ut_compound_data_helper.get_columns_filter(a_exclude_xpath, a_include_xpath); -- Find differences - execute immediate 'insert into ' || l_ut_owner || '.ut_compound_data_diff_tmp ( diff_id, item_no,exp_item_data, act_item_data,exp_data_id, act_data_id ) - select :diff_id, nvl(exp.item_no, act.item_no) , exp.item_data, act.item_data, exp.data_id, act.data_id - from ( select '||l_column_filter||', rownum item_no, ucd.data_id - from - (select xmlelement(name "ROW" ,xt.item_data) item_data, t.data_id - from ' || l_ut_owner || q'[.ut_compound_data_tmp t, - xmltable('/ROWSET/ROW' - passing t.item_data - columns - item_data xmltype path '*' - ) xt - where t.data_id = :self_guid) ucd - ) exp + execute immediate 'insert into ' || l_ut_owner || '.ut_compound_data_diff_tmp ( diff_id, item_no ) + select :diff_id, nvl(exp.item_no, act.item_no) + from (select '||l_column_filter||', ucd.item_no + from ' || l_ut_owner || '.ut_compound_data_tmp ucd where ucd.data_id = :self_guid) exp full outer join - (select ]'||l_column_filter||', rownum item_no, ucd.data_id - from - ( - select xmlelement(name "ROW" ,xt.item_data) item_data, t.data_id - from ' || l_ut_owner || q'[.ut_compound_data_tmp t, - xmltable('/ROWSET/ROW' - passing t.item_data - columns - item_data xmltype path '*' - ) xt - where t.data_id = :l_other_guid - ) ucd - ) act - on exp.item_no = act.item_no ]'|| + (select '||l_column_filter||', ucd.item_no + from ' || l_ut_owner || '.ut_compound_data_tmp ucd where ucd.data_id = :l_other_guid) act + on exp.item_no = act.item_no '|| 'where nvl( dbms_lob.compare(' || /*the xmltransform removes column names and leaves column data to be compared only*/ ' xmltransform(exp.item_data, :l_xml_data_fmt).getclobval()' || @@ -224,11 +190,11 @@ create or replace type body ut_compound_data_value as ') != 0' using in l_diff_id, a_exclude_xpath, a_include_xpath, self.data_id, a_exclude_xpath, a_include_xpath, l_other.data_id, l_xml_data_fmt, l_xml_data_fmt; - --result is OK only if both are same if sql%rowcount = 0 and self.elements_count = l_other.elements_count then l_result := 0; else + ut_compound_data_helper.set_rows_diff(sql%rowcount); l_result := 1; end if; return l_result; @@ -253,7 +219,7 @@ create or replace type body ut_compound_data_value as l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); open l_loop_curs for ut_compound_data_helper.gen_compare_sql(treat(a_other as ut_data_value_refcursor).columns_info, a_exclude_xpath, - a_include_xpath, a_join_by_xpath, a_inclusion_compare, a_is_negated) using self.data_id,l_other.data_id; + a_include_xpath, a_join_by_xpath, a_inclusion_compare, a_is_negated, a_unordered ) using self.data_id,l_other.data_id; loop fetch l_loop_curs bulk collect into l_diff_tab limit l_max_rows; exit when l_diff_tab.count = 0; @@ -267,12 +233,12 @@ create or replace type body ut_compound_data_value as l_max_rows := ut_utils.gc_bc_fetch_limit; end if; end loop; - - ut_compound_data_helper.set_rows_diff(l_sql_rowcount); + --result is OK only if both are same if l_sql_rowcount = 0 and ( self.elements_count = l_other.elements_count or a_inclusion_compare )then l_result := 0; else + ut_compound_data_helper.set_rows_diff(l_sql_rowcount); l_result := 1; end if; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index e73a641f7..0d93e2abf 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -250,13 +250,8 @@ create or replace type body ut_data_value_refcursor as l_result := 1; end if; - - if a_unordered then - l_result := l_result + (self as ut_compound_data_value).compare_implementation(a_other, a_exclude_xpath, a_include_xpath, + l_result := l_result + (self as ut_compound_data_value).compare_implementation(a_other, a_exclude_xpath, a_include_xpath, a_join_by_xpath,a_unordered, a_inclusion_compare, a_is_negated); - else - l_result := l_result + (self as ut_compound_data_value).compare_implementation(a_other, a_exclude_xpath, a_include_xpath); - end if; end if; return l_result; From ecaf48a5e632ee5f902e750dd6a136d98ecc1059 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sat, 10 Nov 2018 21:25:16 +0000 Subject: [PATCH 0079/1096] Add some bigger tests --- .../data_values/ut_compound_data_value.tpb | 1 + .../expectations/test_expectations_cursor.pkb | 28 +++++++++++++++++++ .../expectations/test_expectations_cursor.pks | 6 ++++ 3 files changed, 35 insertions(+) diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index 76a591366..cdec16b98 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -215,6 +215,7 @@ create or replace type body ut_compound_data_value as begin --TODO : Error on xml when same column is more then once in item data xml.Do we need to cleanup ?? + --TODO : Bring diffs row into same place for ref data cursor especially (how we going to do that so we dont break anyval etc) l_other := treat(a_other as ut_compound_data_value); l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index 086ad9193..1ac1a7485 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -901,6 +901,21 @@ Rows: [ 4 differences ] --Assert ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; + + procedure compares_over_10000_rows + as + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + --Arrange + open l_actual for select object_name from all_objects where rownum <=11000; + open l_expected for select object_name from all_objects where rownum <=11000; + --Act + ut3.ut.expect(l_actual).to_equal(l_expected); + + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; function get_cursor return sys_refcursor is l_cursor sys_refcursor; @@ -1261,6 +1276,19 @@ Diff:% ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; + procedure cursor_joinby_compare_10000 is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + begin + --Arrange + open l_actual for select level object_id, level || '_TEST' object_name from dual connect by level <=11000; + open l_expected for select level object_id, level || '_TEST' object_name from dual connect by level <=11000; + --Act + ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OBJECT_ID'); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + procedure cursor_joinby_compare_fail is l_actual SYS_REFCURSOR; l_expected SYS_REFCURSOR; diff --git a/test/core/expectations/test_expectations_cursor.pks b/test/core/expectations/test_expectations_cursor.pks index ca9977f41..42d6f8cab 100644 --- a/test/core/expectations/test_expectations_cursor.pks +++ b/test/core/expectations/test_expectations_cursor.pks @@ -169,6 +169,9 @@ create or replace package test_expectations_cursor is --%test(Compares cursors with more than 1000 rows) procedure compares_over_1000_rows; + --%test(Compares cursors with more than 10000 rows) + procedure compares_over_10000_rows; + --%test(Adds a warning when using depreciated syntax to_equal( a_expected sys_refcursor, a_exclude varchar2 )) procedure deprec_to_equal_excl_varch; @@ -231,6 +234,9 @@ create or replace package test_expectations_cursor is --%test( Compare cursors join by single key more than 1000 rows) procedure cursor_joinby_compare_1000; + + --%test( Compare cursors join by single key more than 10000 rows) + procedure cursor_joinby_compare_10000; --%test( Compare two column cursors join by and fail to match ) procedure cursor_joinby_compare_fail; From af8b49a3685c6f6713d9a9888b0cc309b0f73a33 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sun, 11 Nov 2018 06:40:56 +0000 Subject: [PATCH 0080/1096] Update rownumber generated --- source/expectations/data_values/ut_compound_data_helper.pkb | 4 ++-- source/expectations/data_values/ut_compound_data_tmp.sql | 4 ++-- source/expectations/data_values/ut_data_value_refcursor.tpb | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 18a34c6d1..848dd9ddc 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -643,7 +643,7 @@ create or replace package body ut_compound_data_helper is ut_utils.append_to_clob(l_compare_sql, l_select_stmt); l_temp_string := ',x.data_id ,' - || case when not a_unordered then 'position ' else 'rownum ' end + || case when not a_unordered then 'position + x.item_no ' else 'rownum ' end ||'item_no from '|| l_ut_owner || '.ut_compound_data_tmp x, ' ||q'[xmltable('/ROWSET/ROW' passing x.item_data columns ]'; ut_utils.append_to_clob(l_compare_sql, l_temp_string); @@ -666,7 +666,7 @@ create or replace package body ut_compound_data_helper is ut_utils.append_to_clob(l_compare_sql, l_select_stmt); l_temp_string := ',x.data_id, ' - || case when not a_unordered then 'position ' else 'rownum ' end + || case when not a_unordered then 'position + x.item_no ' else 'rownum ' end ||'item_no from ' || l_ut_owner || '.ut_compound_data_tmp x,' ||q'[xmltable('/ROWSET/ROW' passing x.item_data columns ]' ; ut_utils.append_to_clob(l_compare_sql,l_temp_string); diff --git a/source/expectations/data_values/ut_compound_data_tmp.sql b/source/expectations/data_values/ut_compound_data_tmp.sql index a4c6516af..1d471362f 100644 --- a/source/expectations/data_values/ut_compound_data_tmp.sql +++ b/source/expectations/data_values/ut_compound_data_tmp.sql @@ -18,5 +18,5 @@ create global temporary table ut_compound_data_tmp( item_hash raw(128), pk_hash raw(128), duplicate_no integer, - constraint ut_cmp_data_tmp_hash_pk unique (data_id,item_no, item_hash , duplicate_no) -) on commit preserve rows; + constraint ut_cmp_data_tmp_hash_pk unique (data_id, item_no, duplicate_no) +) on commit preserve rows; \ No newline at end of file diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 0d93e2abf..0fe5544f7 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -23,14 +23,14 @@ create or replace type body ut_data_value_refcursor as end; member procedure init(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) is - c_bulk_rows constant integer := 5000; + c_bulk_rows constant integer := 10000; l_cursor sys_refcursor := a_value; l_ctx number; l_xml xmltype; l_current_date_format varchar2(4000); cursor_not_open exception; l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_set_id integer := 1; + l_set_id integer := 0; begin self.is_data_null := ut_utils.boolean_to_int(a_value is null); @@ -72,7 +72,7 @@ create or replace type body ut_data_value_refcursor as 'values (:self_guid, :self_row_count, :l_xml)' using in self.data_id, l_set_id, l_xml; - l_set_id := l_set_id + 1; + l_set_id := l_set_id + c_bulk_rows; end loop; ut_expectation_processor.reset_nls_params(); From 59f773835e44baf785079d837985d22eebb2013b Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 11 Nov 2018 12:04:04 +0000 Subject: [PATCH 0081/1096] Adding cache cleanup and "intelligent" join to all_source, only when needed. --- .../ut_annotation_cache_manager.pkb | 17 ++- .../ut_annotation_cache_manager.pks | 9 +- .../annotations/ut_annotation_manager.pkb | 101 ++++++++++++++---- source/core/ut_metadata.pkb | 27 ++++- source/core/ut_metadata.pks | 12 +++ source/core/ut_suite_builder.pkb | 57 +++++++++- source/core/ut_suite_cache_manager.pkb | 12 +++ source/core/ut_suite_cache_manager.pks | 2 + .../annotations/test_annotation_manager.pkb | 54 +++++++++- .../annotations/test_annotation_manager.pks | 13 ++- 10 files changed, 268 insertions(+), 36 deletions(-) diff --git a/source/core/annotations/ut_annotation_cache_manager.pkb b/source/core/annotations/ut_annotation_cache_manager.pkb index 9d7d1b95e..4f9129650 100644 --- a/source/core/annotations/ut_annotation_cache_manager.pkb +++ b/source/core/annotations/ut_annotation_cache_manager.pkb @@ -74,6 +74,21 @@ create or replace package body ut_annotation_cache_manager as commit; end; + procedure remove_from_cache(a_objects ut_annotation_objs_cache_info) is + pragma autonomous_transaction; + begin + + delete from ut_annotation_cache_info i + where exists ( + select 1 from table (a_objects) o + where o.object_name = i.object_name + and o.object_type = i.object_type + and o.object_owner = i.object_owner + ); + + commit; + end; + function get_annotations_for_objects(a_cached_objects ut_annotation_objs_cache_info, a_parse_time timestamp) return sys_refcursor is l_results sys_refcursor; begin @@ -92,7 +107,7 @@ create or replace package body ut_annotation_cache_manager as join ut_annotation_cache_info i on o.object_owner = i.object_owner and o.object_name = i.object_name and o.object_type = i.object_type join ut_annotation_cache c on i.cache_id = c.cache_id - where ]'|| case when a_parse_time is null then ':a_parse_date is null' else 'i.parse_time >= :a_parse_time' end ||q'[ + where ]'|| case when a_parse_time is null then ':a_parse_date is null' else 'i.parse_time > :a_parse_time' end ||q'[ group by i.object_owner, i.object_name, i.object_type, i.parse_time]' using a_cached_objects, a_parse_time; return l_results; diff --git a/source/core/annotations/ut_annotation_cache_manager.pks b/source/core/annotations/ut_annotation_cache_manager.pks index 2ee586d12..1279c8cc3 100644 --- a/source/core/annotations/ut_annotation_cache_manager.pks +++ b/source/core/annotations/ut_annotation_cache_manager.pks @@ -37,10 +37,17 @@ create or replace package ut_annotation_cache_manager authid definer as /** * Removes cached information about annotations for objects on the list and updates parse_time in cache info table. * - * @param a_objects a `ut_annotation_objs_cache_info` list with information about objects to remove from cache + * @param a_objects a `ut_annotation_objs_cache_info` list with information about objects to remove annotations for */ procedure cleanup_cache(a_objects ut_annotation_objs_cache_info); + /** + * Removes information about objects on the list + * + * @param a_objects a `ut_annotation_objs_cache_info` list with information about objects to remove from cache + */ + procedure remove_from_cache(a_objects ut_annotation_objs_cache_info); + /** * Removes cached information about annotations for objects of specified type and specified owner * diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index 12eac0190..3559982cf 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -19,6 +19,38 @@ create or replace package body ut_annotation_manager as ------------------------------ --private definitions +-- function get_missing_objects(a_object_owner varchar2, a_object_type varchar2) return ut_annotation_objs_cache_info is +-- l_rows sys_refcursor; +-- l_ut_owner varchar2(250) := ut_utils.ut_owner; +-- l_objects_view varchar2(200) := ut_metadata.get_dba_view('dba_objects'); +-- l_cursor_text varchar2(32767); +-- l_result ut_annotation_objs_cache_info; +-- begin +-- l_cursor_text := +-- q'[select ]'||l_ut_owner||q'[.ut_annotation_obj_cache_info( +-- object_owner => i.object_owner, +-- object_name => i.object_name, +-- object_type => i.object_type, +-- needs_refresh => null +-- ) +-- from ]'||l_ut_owner||q'[.ut_annotation_cache_info i +-- where +-- not exists ( +-- select 1 from ]'||l_objects_view||q'[ o +-- where o.owner = i.object_owner +-- and o.object_name = i.object_name +-- and o.object_type = i.object_type +-- and o.owner = :a_object_owner +-- and o.object_type = :a_object_type +-- ) +-- and i.object_owner = :a_object_owner +-- and i.object_type = :a_object_type]'; +-- open l_rows for l_cursor_text using a_object_owner, a_object_type, a_object_owner, a_object_type; +-- fetch l_rows bulk collect into l_result limit 1000000; +-- close l_rows; +-- return l_result; +-- end; + function get_annotation_objs_info(a_object_owner varchar2, a_object_type varchar2, a_parse_date timestamp := null) return ut_annotation_objs_cache_info is l_rows sys_refcursor; l_ut_owner varchar2(250) := ut_utils.ut_owner; @@ -28,25 +60,36 @@ create or replace package body ut_annotation_manager as begin l_cursor_text := q'[select ]'||l_ut_owner||q'[.ut_annotation_obj_cache_info( - object_owner => o.owner, - object_name => o.object_name, - object_type => o.object_type, - needs_refresh => case when o.last_ddl_time < cast(i.parse_time as date) then 'N' else 'Y' end + object_owner => nvl( o.owner, i.object_owner ), + object_name => nvl( o.object_name, i.object_name ), + object_type => nvl( o.object_type, i.object_type ), + needs_refresh => + case + when o.last_ddl_time < cast(i.parse_time as date) then 'N' + when o.owner is null then null + else 'Y' + end ) - from ]'||l_objects_view||q'[ o - left join ]'||l_ut_owner||q'[.ut_annotation_cache_info i + from ( + select * from ]'||l_objects_view||q'[ o + where o.owner = :a_object_owner + and o.object_type = :a_object_type + ) o + full outer join ( + select * from ]'||l_ut_owner||q'[.ut_annotation_cache_info i + where i.object_owner = :a_object_owner + and i.object_type = :a_object_type + ) i on o.owner = i.object_owner and o.object_name = i.object_name and o.object_type = i.object_type - where o.owner = :a_object_owner - and o.object_type = :a_object_type - and ]' + where ]' || case when a_parse_date is null then ':a_parse_date is null' - else 'o.last_ddl_time >= cast(:a_parse_date as date)' + else 'o.last_ddl_time >= cast(:a_parse_date as date) or o.last_ddl_time is null' end; - open l_rows for l_cursor_text using a_object_owner, a_object_type, a_parse_date; + open l_rows for l_cursor_text using a_object_owner, a_object_type, a_object_owner, a_object_type, a_parse_date; fetch l_rows bulk collect into l_result limit 1000000; close l_rows; return l_result; @@ -106,8 +149,9 @@ create or replace package body ut_annotation_manager as end; procedure build_annot_cache_for_sources( - a_object_owner varchar2, a_object_type varchar2, a_sources_cursor sys_refcursor, - a_schema_objects ut_annotation_objs_cache_info + a_object_owner varchar2, + a_object_type varchar2, + a_sources_cursor sys_refcursor ) is l_annotations ut_annotations; c_lines_fetch_limit constant integer := 1000; @@ -118,7 +162,6 @@ create or replace package body ut_annotation_manager as l_parse_time date := sysdate; pragma autonomous_transaction; begin - ut_annotation_cache_manager.cleanup_cache(a_schema_objects); loop fetch a_sources_cursor bulk collect into l_names, l_lines limit c_lines_fetch_limit; for i in 1 .. l_names.count loop @@ -148,17 +191,37 @@ create or replace package body ut_annotation_manager as end; - procedure rebuild_annotation_cache( a_object_owner varchar2, a_object_type varchar2, a_info_rows ut_annotation_objs_cache_info) is - l_objects_to_parse ut_annotation_objs_cache_info := ut_annotation_objs_cache_info(); + procedure rebuild_annotation_cache( + a_object_owner varchar2, + a_object_type varchar2, + a_info_rows ut_annotation_objs_cache_info + ) is + l_objects_to_parse ut_annotation_objs_cache_info; + l_objects_to_remove ut_annotation_objs_cache_info; begin - select value(x)bulk collect into l_objects_to_parse from table(a_info_rows) x where x.needs_refresh = 'Y'; + select value(x)bulk collect into l_objects_to_parse + from table(a_info_rows) x where x.needs_refresh = 'Y'; + + ut_annotation_cache_manager.cleanup_cache(l_objects_to_parse); + + if sys_context('userenv','current_schema') = a_object_owner + or ut_metadata.is_object_visible('ut3.ut_utils') + or ut_metadata.is_object_visible('dba_objects') + then + select value(x)bulk collect into l_objects_to_remove + from table(a_info_rows) x where x.needs_refresh is null; + + ut_annotation_cache_manager.remove_from_cache(l_objects_to_remove); +-- ut_annotation_cache_manager.remove_from_cache( +-- get_missing_objects(a_object_owner, a_object_type) +-- ); + end if; --if some source needs parsing and putting into cache if l_objects_to_parse.count > 0 then build_annot_cache_for_sources( a_object_owner, a_object_type, - get_sources_to_annotate(a_object_owner, a_object_type, l_objects_to_parse), - l_objects_to_parse + get_sources_to_annotate(a_object_owner, a_object_type, l_objects_to_parse) ); end if; end; diff --git a/source/core/ut_metadata.pkb b/source/core/ut_metadata.pkb index 30b0da64e..1693066ec 100644 --- a/source/core/ut_metadata.pkb +++ b/source/core/ut_metadata.pkb @@ -148,15 +148,34 @@ create or replace package body ut_metadata as end; function get_dba_view(a_dba_view_name varchar2) return varchar2 is - l_invalid_object_name exception; l_result varchar2(128) := lower(a_dba_view_name); + begin + if not is_object_visible(a_dba_view_name) then + l_result := replace(l_result,'dba_','all_'); + end if; + return l_result; + end; + + function user_has_execute_any_proc return boolean is + l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_dummy varchar2(250); + begin + execute immediate 'select '||l_ut_owner||'.ut_utils.ut_owner from dual' + into l_dummy; + return true; + exception + when others then + return false; + end; + + function is_object_visible(a_object_name varchar2) return boolean is + l_invalid_object_name exception; pragma exception_init(l_invalid_object_name,-44002); begin - l_result := dbms_assert.sql_object_name(l_result); - return l_result; + return dbms_assert.sql_object_name(a_object_name) is not null; exception when l_invalid_object_name then - return replace(l_result,'dba_','all_'); + return false; end; function package_exists_in_cur_schema(a_object_name varchar2) return boolean is diff --git a/source/core/ut_metadata.pks b/source/core/ut_metadata.pks index 121524a0b..d06c1ea9d 100644 --- a/source/core/ut_metadata.pks +++ b/source/core/ut_metadata.pks @@ -69,6 +69,18 @@ create or replace package ut_metadata authid current_user as */ function get_dba_view(a_dba_view_name varchar2) return varchar2; + /** + * Returns true if object is accessible to current user + * @param a_object_name fully qualified object name (with schema name) + */ + function is_object_visible(a_object_name varchar2) return boolean; + + /** + * Returns true if current user has execute any procedure privilege + * The check is performed by checking if user can execute ut_utils package + */ + function user_has_execute_any_proc return boolean; + /** * Returns true if given object is a package and it exists in current schema * @param a_object_name the name of the object to be checked diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index f6aceae89..4638f5dba 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -1012,6 +1012,31 @@ create or replace package body ut_suite_builder is close a_suite_data_cursor; end; + function get_missing_objects(a_object_owner varchar2) return ut_varchar2_rows is + l_rows sys_refcursor; + l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_objects_view varchar2(200) := ut_metadata.get_dba_view('dba_objects'); + l_cursor_text varchar2(32767); + l_result ut_varchar2_rows; + begin + l_cursor_text := + q'[select i.object_name + from ]'||l_ut_owner||q'[.ut_suite_cache_package i + where + not exists ( + select 1 from ]'||l_objects_view||q'[ o + where o.owner = i.object_owner + and o.object_name = i.object_name + and o.object_type = 'PACKAGE' + and o.owner = :a_object_owner + ) + and i.object_owner = :a_object_owner]'; + open l_rows for l_cursor_text using a_object_owner, a_object_owner; + fetch l_rows bulk collect into l_result limit 1000000; + close l_rows; + return l_result; + end; + function get_cached_suite_data( a_object_owner varchar2, a_path varchar2 := null, @@ -1177,8 +1202,9 @@ create or replace package body ut_suite_builder is a_object_name varchar2 := null, a_procedure_name varchar2 := null ) return ut_suite_items is - l_annotations_cursor sys_refcursor; - l_suite_cache_time timestamp; + l_annotations_cursor sys_refcursor; + l_suite_cache_time timestamp; + l_skip_all_objects_scan boolean := false; begin l_suite_cache_time := ut_suite_cache_manager.get_schema_parse_time(a_owner_name); open l_annotations_cursor for @@ -1188,12 +1214,23 @@ create or replace package body ut_suite_builder is )x ]' using a_owner_name, l_suite_cache_time; + -- if current user is the onwer or current user has execute any procedure privilege + if sys_context('userenv','current_schema') = a_owner_name + or ut_metadata.is_object_visible('ut3.ut_utils') + then + l_skip_all_objects_scan := true; + end if; + if l_skip_all_objects_scan or ut_metadata.is_object_visible('dba_objects') then + ut_suite_cache_manager.remove_from_cache( a_owner_name, get_missing_objects(a_owner_name) ); + end if; + return build_suites_from_annotations( a_owner_name, l_annotations_cursor, a_path, a_object_name, - a_procedure_name + a_procedure_name, + l_skip_all_objects_scan ); end; @@ -1202,17 +1239,27 @@ create or replace package body ut_suite_builder is l_schema_names ut_varchar2_rows; l_object_names ut_varchar2_rows; l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_need_all_objects_scan boolean := true; begin + -- if current user is the onwer or current user has execute any procedure privilege + if ut_metadata.is_object_visible('ut3.ut_utils') + or (a_schema_names is not null and a_schema_names.count = 1 + and sys_context('userenv','current_schema') = a_schema_names(1)) + then + l_need_all_objects_scan := false; + end if; + execute immediate 'select c.object_owner, c.object_name from '||l_ut_owner||q'[.ut_suite_cache_package c join table ( :a_schema_names ) s - on c.object_owner = upper(s.column_value) + on c.object_owner = upper(s.column_value)]' + || case when l_need_all_objects_scan then q'[ where exists (select 1 from all_objects a where a.owner = c.object_owner and a.object_name = c.object_name and a.object_type = 'PACKAGE') - ]' + ]' end bulk collect into l_schema_names, l_object_names using a_schema_names; l_results.extend( l_schema_names.count ); for i in 1 .. l_schema_names.count loop diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index 9caf8a946..081b2d590 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -135,5 +135,17 @@ create or replace package body ut_suite_cache_manager is commit; end; + procedure remove_from_cache(a_schema_name varchar2, a_objects ut_varchar2_rows) is + pragma autonomous_transaction; + begin + delete + from ut_suite_cache_package i + where i.object_owner = a_schema_name + and i.object_name in ( select column_value from table (a_objects) ); + + commit; + end; + + end ut_suite_cache_manager; / diff --git a/source/core/ut_suite_cache_manager.pks b/source/core/ut_suite_cache_manager.pks index 3d5a21f10..02c47988e 100644 --- a/source/core/ut_suite_cache_manager.pks +++ b/source/core/ut_suite_cache_manager.pks @@ -29,5 +29,7 @@ create or replace package ut_suite_cache_manager authid definer is function get_schema_parse_time(a_schema_name varchar2) return timestamp result_cache; + procedure remove_from_cache(a_schema_name varchar2, a_objects ut_varchar2_rows); + end ut_suite_cache_manager; / diff --git a/test/core/annotations/test_annotation_manager.pkb b/test/core/annotations/test_annotation_manager.pkb index 98bea7452..1fb8115ba 100644 --- a/test/core/annotations/test_annotation_manager.pkb +++ b/test/core/annotations/test_annotation_manager.pkb @@ -31,6 +31,7 @@ create or replace package body test_annotation_manager is --%beforetest(some_procedure) procedure some_dummy_test_procedure; end;]'; + execute immediate q'[grant execute on dummy_test_package to public]'; end; procedure modify_dummy_test_package is @@ -56,6 +57,28 @@ create or replace package body test_annotation_manager is execute immediate q'[alter package dummy_test_package compile]'; end; + procedure create_parse_proc_as_ut3$user# is + pragma autonomous_transaction; + begin + execute immediate q'[ + create or replace procedure ut3$user#.parse_annotations is + begin + ut3.ut_annotation_manager.rebuild_annotation_cache('UT3_TESTER','PACKAGE'); + end;]'; + end; + + procedure parse_dummy_test_as_ut3$user# is + pragma autonomous_transaction; + begin + execute immediate 'begin ut3$user#.parse_annotations; end;'; + end; + + procedure drop_parse_proc_as_ut3$user# is + pragma autonomous_transaction; + begin + execute immediate 'drop procedure ut3$user#.parse_annotations'; + end; + procedure cleanup_annotation_cache is pragma autonomous_transaction; begin @@ -204,12 +227,11 @@ create or replace package body test_annotation_manager is l_expected sys_refcursor; l_start_date date; begin - --Arrange - ut3.ut_annotation_manager.rebuild_annotation_cache(user,'PACKAGE'); + parse_dummy_test_as_ut3$user#(); l_start_date := sysdate; drop_dummy_test_package(); --Act - ut3.ut_annotation_manager.rebuild_annotation_cache(user,'PACKAGE'); + parse_dummy_test_as_ut3$user#(); --Assert select max(cache_id) into l_actual_cache_id @@ -217,7 +239,7 @@ create or replace package body test_annotation_manager is where object_owner = user and object_type = 'PACKAGE' and object_name = 'DUMMY_TEST_PACKAGE' and parse_time >= l_start_date; - ut.expect(l_actual_cache_id).to_be_not_null; + ut.expect(l_actual_cache_id).not_to_be_null(); open l_actual for select annotation_position, annotation_name, annotation_text, subobject_name @@ -252,5 +274,29 @@ create or replace package body test_annotation_manager is ut.expect(l_actual).to_be_empty(); end; + procedure cleanup_dropped_data_in_cache is + l_cache_count integer; + l_actual sys_refcursor; + l_expected sys_refcursor; + l_start_date date; + begin + --Arrange + ut3.ut_annotation_manager.rebuild_annotation_cache(user,'PACKAGE'); + l_start_date := sysdate; + drop_dummy_test_package(); + --Act + ut3.ut_annotation_manager.rebuild_annotation_cache(user,'PACKAGE'); + --Assert + select count(1) + into l_cache_count + from ut3.ut_annotation_cache_info + where object_owner = user + and object_type = 'PACKAGE' + and object_name = 'DUMMY_TEST_PACKAGE'; + + ut.expect(l_cache_count).to_equal(0); + + end; + end test_annotation_manager; / diff --git a/test/core/annotations/test_annotation_manager.pks b/test/core/annotations/test_annotation_manager.pks index fb5e0299d..0726c8256 100644 --- a/test/core/annotations/test_annotation_manager.pks +++ b/test/core/annotations/test_annotation_manager.pks @@ -12,6 +12,10 @@ create or replace package test_annotation_manager is procedure create_dummy_test_package; + procedure create_parse_proc_as_ut3$user#; + + procedure drop_parse_proc_as_ut3$user#; + procedure drop_dummy_test_package; --%test(Adds new package to annotation cache info) @@ -34,13 +38,18 @@ create or replace package test_annotation_manager is --%aftertest(drop_dummy_test_package) procedure update_modified_test_package; - --%test(Keeps annotations in cache after object was removed) - --%beforetest(create_dummy_test_package) + --%test(Keeps annotations in cache when object was removed but user can't see whole schema) + --%beforetest(create_dummy_test_package,create_parse_proc_as_ut3$user#) + --%aftertest(drop_parse_proc_as_ut3$user#) procedure keep_dropped_data_in_cache; --%test(Does not return data for dropped object) --%beforetest(create_dummy_test_package) procedure no_data_for_dropped_object; + --%test(Remove object from cache when object dropped and user can see whole schema) + --%beforetest(create_dummy_test_package) + procedure cleanup_dropped_data_in_cache; + end test_annotation_manager; / From cb9cf9790c869286f29363cffcce6aa48770e5fc Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 11 Nov 2018 12:35:01 +0000 Subject: [PATCH 0082/1096] Resolving some sonar violations. --- .../ut_annotation_cache_manager.pkb | 1 - source/core/ut_metadata.pkb | 1 - source/core/ut_suite_builder.pkb | 32 +++++++------------ 3 files changed, 11 insertions(+), 23 deletions(-) diff --git a/source/core/annotations/ut_annotation_cache_manager.pkb b/source/core/annotations/ut_annotation_cache_manager.pkb index 4f9129650..5c40be5b7 100644 --- a/source/core/annotations/ut_annotation_cache_manager.pkb +++ b/source/core/annotations/ut_annotation_cache_manager.pkb @@ -18,7 +18,6 @@ create or replace package body ut_annotation_cache_manager as procedure update_cache(a_object ut_annotated_object) is l_cache_id integer; - l_current_schema varchar2(250) := ut_utils.ut_owner; pragma autonomous_transaction; begin update ut_annotation_cache_info i diff --git a/source/core/ut_metadata.pkb b/source/core/ut_metadata.pkb index 1693066ec..1795c1a0c 100644 --- a/source/core/ut_metadata.pkb +++ b/source/core/ut_metadata.pkb @@ -116,7 +116,6 @@ create or replace package body ut_metadata as end; function get_source_definition_line(a_owner varchar2, a_object_name varchar2, a_line_no integer) return varchar2 is - l_cursor sys_refcursor; l_view_name varchar2(128) := get_dba_view('dba_source'); l_line all_source.text%type; c_key constant varchar2(500) := a_owner || '.' || a_object_name; diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index 4638f5dba..aa0b8ed29 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -58,8 +58,6 @@ create or replace package body ut_suite_builder is gc_endcontext ); - gc_placeholder constant varchar2(3) := '\\%'; - gc_integer_exception constant varchar2(1) := 'I'; gc_named_exception constant varchar2(1) := 'N'; @@ -218,7 +216,6 @@ create or replace package body ut_suite_builder is function get_exception_number (a_exception_var in varchar2) return integer is l_exc_no integer; l_exc_type varchar2(50); - l_sql varchar2(32767); function remap_no_data_found (a_number integer) return integer is begin return case a_number when 100 then -1403 else a_number end; @@ -260,7 +257,7 @@ create or replace package body ut_suite_builder is l_exception_number_list ut_integer_list := ut_integer_list(); c_regexp_for_exception_no constant varchar2(30) := '^-?[[:digit:]]{1,5}$'; begin - /*the a_expected_error_codes is converted to a ut_varchar2_list after that is trimmed and filtered to left only valid exception numbers*/ + --the a_expected_error_codes is converted to a ut_varchar2_list after that is trimmed and filtered to left only valid exception numbers l_throws_list := ut_utils.trim_list_elements(ut_utils.string_to_table(a_annotation_text, ',', 'Y')); for i in 1 .. l_throws_list.count @@ -407,18 +404,15 @@ create or replace package body ut_suite_builder is a_for_annotation varchar2, a_procedure_name t_object_name := null ) is - l_annotation_name t_annotation_name; l_line_no binary_integer; begin - if a_annotations.exists(a_for_annotation) then - if a_annotations(a_for_annotation).count > 1 then - --start from second occurrence of annotation - l_line_no := a_annotations(a_for_annotation).next( a_annotations(a_for_annotation).first ); - while l_line_no is not null loop - add_annotation_ignored_warning( a_suite, a_for_annotation, 'Duplicate annotation %%%.', l_line_no, a_procedure_name ); - l_line_no := a_annotations(a_for_annotation).next( l_line_no ); - end loop; - end if; + if a_annotations.exists(a_for_annotation) and a_annotations(a_for_annotation).count > 1 then + --start from second occurrence of annotation + l_line_no := a_annotations(a_for_annotation).next( a_annotations(a_for_annotation).first ); + while l_line_no is not null loop + add_annotation_ignored_warning( a_suite, a_for_annotation, 'Duplicate annotation %%%.', l_line_no, a_procedure_name ); + l_line_no := a_annotations(a_for_annotation).next( l_line_no ); + end loop; end if; end; @@ -430,8 +424,7 @@ create or replace package body ut_suite_builder is a_invalid_annotations ut_varchar2_list ) is l_annotation_name t_annotation_name; - l_warning varchar2(32767); - l_line_no binary_integer; + l_line_no binary_integer; begin if a_proc_annotations.exists(a_for_annotation) then l_annotation_name := a_proc_annotations.first; @@ -739,9 +732,8 @@ create or replace package body ut_suite_builder is while l_context_pos is not null loop l_end_context_pos := get_endcontext_position(l_context_pos, a_annotations.by_name ); - if l_end_context_pos is null then - exit; - end if; + + exit when l_end_context_pos is null; l_context_items := ut_suite_items(); --create a sub-set of annotations to process as sub-suite (context) @@ -1156,10 +1148,8 @@ create or replace package body ut_suite_builder is a_skip_all_objects boolean := false ) return ut_suite_items is l_suites ut_suite_items; - l_annotations_cursor sys_refcursor; l_annotated_objects ut_annotated_objects; l_suite_items ut_suite_items; - l_suite_data_cursor sys_refcursor; begin loop fetch a_annotated_objects bulk collect into l_annotated_objects limit 10; From 8779025d8ff01fc03a935e16e9199978d8877d52 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 11 Nov 2018 13:09:44 +0000 Subject: [PATCH 0083/1096] Moving away from full outer join. Added static schema name rather than bind variable. --- .../annotations/ut_annotation_manager.pkb | 112 ++++++++---------- source/core/ut_suite_builder.pkb | 13 +- 2 files changed, 55 insertions(+), 70 deletions(-) diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index 3559982cf..80de4d1a7 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -19,37 +19,37 @@ create or replace package body ut_annotation_manager as ------------------------------ --private definitions --- function get_missing_objects(a_object_owner varchar2, a_object_type varchar2) return ut_annotation_objs_cache_info is --- l_rows sys_refcursor; --- l_ut_owner varchar2(250) := ut_utils.ut_owner; --- l_objects_view varchar2(200) := ut_metadata.get_dba_view('dba_objects'); --- l_cursor_text varchar2(32767); --- l_result ut_annotation_objs_cache_info; --- begin --- l_cursor_text := --- q'[select ]'||l_ut_owner||q'[.ut_annotation_obj_cache_info( --- object_owner => i.object_owner, --- object_name => i.object_name, --- object_type => i.object_type, --- needs_refresh => null --- ) --- from ]'||l_ut_owner||q'[.ut_annotation_cache_info i --- where --- not exists ( --- select 1 from ]'||l_objects_view||q'[ o --- where o.owner = i.object_owner --- and o.object_name = i.object_name --- and o.object_type = i.object_type --- and o.owner = :a_object_owner --- and o.object_type = :a_object_type --- ) --- and i.object_owner = :a_object_owner --- and i.object_type = :a_object_type]'; --- open l_rows for l_cursor_text using a_object_owner, a_object_type, a_object_owner, a_object_type; --- fetch l_rows bulk collect into l_result limit 1000000; --- close l_rows; --- return l_result; --- end; + function get_missing_objects(a_object_owner varchar2, a_object_type varchar2) return ut_annotation_objs_cache_info is + l_rows sys_refcursor; + l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_objects_view varchar2(200) := ut_metadata.get_dba_view('dba_objects'); + l_cursor_text varchar2(32767); + l_result ut_annotation_objs_cache_info; + begin + l_cursor_text := + q'[select ]'||l_ut_owner||q'[.ut_annotation_obj_cache_info( + object_owner => i.object_owner, + object_name => i.object_name, + object_type => i.object_type, + needs_refresh => null + ) + from ]'||l_ut_owner||q'[.ut_annotation_cache_info i + where + not exists ( + select 1 from ]'||l_objects_view||q'[ o + where o.owner = i.object_owner + and o.object_name = i.object_name + and o.object_type = i.object_type + and o.owner = :a_object_owner + and o.object_type = :a_object_type + ) + and i.object_owner = :a_object_owner + and i.object_type = :a_object_type]'; + open l_rows for l_cursor_text using a_object_owner, a_object_type, a_object_owner, a_object_type; + fetch l_rows bulk collect into l_result limit 1000000; + close l_rows; + return l_result; + end; function get_annotation_objs_info(a_object_owner varchar2, a_object_type varchar2, a_parse_date timestamp := null) return ut_annotation_objs_cache_info is l_rows sys_refcursor; @@ -60,36 +60,25 @@ create or replace package body ut_annotation_manager as begin l_cursor_text := q'[select ]'||l_ut_owner||q'[.ut_annotation_obj_cache_info( - object_owner => nvl( o.owner, i.object_owner ), - object_name => nvl( o.object_name, i.object_name ), - object_type => nvl( o.object_type, i.object_type ), - needs_refresh => - case - when o.last_ddl_time < cast(i.parse_time as date) then 'N' - when o.owner is null then null - else 'Y' - end + object_owner => o.owner, + object_name => o.object_name, + object_type => o.object_type, + needs_refresh => case when o.last_ddl_time < cast(i.parse_time as date) then 'N' else 'Y' end ) - from ( - select * from ]'||l_objects_view||q'[ o - where o.owner = :a_object_owner - and o.object_type = :a_object_type - ) o - full outer join ( - select * from ]'||l_ut_owner||q'[.ut_annotation_cache_info i - where i.object_owner = :a_object_owner - and i.object_type = :a_object_type - ) i + from ]'||l_objects_view||q'[ o + left join ]'||l_ut_owner||q'[.ut_annotation_cache_info i on o.owner = i.object_owner and o.object_name = i.object_name and o.object_type = i.object_type - where ]' - || case + where o.owner = ']'||a_object_owner||q'[' + and o.object_type = ']'||a_object_type||q'[' + and ]' + || case when a_parse_date is null - then ':a_parse_date is null' - else 'o.last_ddl_time >= cast(:a_parse_date as date) or o.last_ddl_time is null' - end; - open l_rows for l_cursor_text using a_object_owner, a_object_type, a_object_owner, a_object_type, a_parse_date; + then ':a_parse_date is null' + else 'o.last_ddl_time >= cast(:a_parse_date as date)' + end; + open l_rows for l_cursor_text using a_parse_date; fetch l_rows bulk collect into l_result limit 1000000; close l_rows; return l_result; @@ -197,7 +186,6 @@ create or replace package body ut_annotation_manager as a_info_rows ut_annotation_objs_cache_info ) is l_objects_to_parse ut_annotation_objs_cache_info; - l_objects_to_remove ut_annotation_objs_cache_info; begin select value(x)bulk collect into l_objects_to_parse from table(a_info_rows) x where x.needs_refresh = 'Y'; @@ -208,13 +196,9 @@ create or replace package body ut_annotation_manager as or ut_metadata.is_object_visible('ut3.ut_utils') or ut_metadata.is_object_visible('dba_objects') then - select value(x)bulk collect into l_objects_to_remove - from table(a_info_rows) x where x.needs_refresh is null; - - ut_annotation_cache_manager.remove_from_cache(l_objects_to_remove); --- ut_annotation_cache_manager.remove_from_cache( --- get_missing_objects(a_object_owner, a_object_type) --- ); + ut_annotation_cache_manager.remove_from_cache( + get_missing_objects(a_object_owner, a_object_type) + ); end if; --if some source needs parsing and putting into cache diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index aa0b8ed29..fee7524b4 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -1020,10 +1020,10 @@ create or replace package body ut_suite_builder is where o.owner = i.object_owner and o.object_name = i.object_name and o.object_type = 'PACKAGE' - and o.owner = :a_object_owner + and o.owner = ']'||a_object_owner||q'[' ) - and i.object_owner = :a_object_owner]'; - open l_rows for l_cursor_text using a_object_owner, a_object_owner; + and i.object_owner = ']'||a_object_owner||q'[']'; + open l_rows for l_cursor_text; fetch l_rows bulk collect into l_result limit 1000000; close l_rows; return l_result; @@ -1061,10 +1061,11 @@ create or replace package body ut_suite_builder is ( select 1 from all_objects a where a.object_name = c.object_name + and a.object_owner = ']'||upper(a_object_owner)||q'[' and a.owner = c.object_owner and a.object_type = 'PACKAGE' )]' end ||q'[ - and c.object_owner = :a_object_owner + and c.object_owner = ']'||upper(a_object_owner)||q'[' and ( ]' || case when l_path is not null then q'[ :l_path||'.' like c.path || '.%' /*all children and self*/ or ( c.path||'.' like :l_path || '.%' --all parents @@ -1134,7 +1135,7 @@ create or replace package body ut_suite_builder is end, '.', chr(0)) desc nulls last, c.object_name desc, c.line_no]' - using upper(a_object_owner), l_path, l_path, upper(a_object_name), upper(a_procedure_name); + using l_path, l_path, upper(a_object_name), upper(a_procedure_name); return l_result; end; @@ -1238,7 +1239,7 @@ create or replace package body ut_suite_builder is then l_need_all_objects_scan := false; end if; - + execute immediate 'select c.object_owner, c.object_name from '||l_ut_owner||q'[.ut_suite_cache_package c join table ( :a_schema_names ) s From c633ff5eab7c77c7a3fdaf393cdc90f18f60f18d Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sun, 11 Nov 2018 20:43:08 +0000 Subject: [PATCH 0084/1096] Update code with bug fixes --- .../data_values/ut_compound_data_helper.pkb | 185 ++++++++---------- .../data_values/ut_compound_data_helper.pks | 5 +- .../data_values/ut_compound_data_tmp.sql | 2 +- .../data_values/ut_compound_data_value.tpb | 34 ++-- .../ut_curr_usr_compound_helper.pkb | 9 + .../ut_curr_usr_compound_helper.pks | 2 + .../data_values/ut_data_value_anydata.tpb | 2 + .../data_values/ut_data_value_refcursor.tpb | 7 +- .../data_values/ut_data_value_refcursor.tps | 4 + .../expectations/test_expectations_cursor.pkb | 88 ++++++--- .../expectations/test_expectations_cursor.pks | 6 + 11 files changed, 186 insertions(+), 158 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 848dd9ddc..bdd56a71c 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -28,10 +28,10 @@ create or replace package body ut_compound_data_helper is begin l_result := '<'||l_key||' xml_valid_name="'||l_key; if l_data is of(ut_data_value_xmltype) then - l_result := l_result||'" sql_diffable="0" user_defined="1" >' ||trim( both '''' from (treat(l_data as ut_data_value_xmltype).to_string)); + l_result := l_result||'" sql_diffable="0">' ||trim( both '''' from (treat(l_data as ut_data_value_xmltype).to_string)); else l_is_diff := ut_curr_usr_compound_helper.is_sql_compare_int((treat(l_data as ut_data_value_varchar2).data_value)); - l_result := l_result||'" sql_diffable="'||l_is_diff||'" user_defined="0">' || ut_utils.xmlgen_escaped_string((treat(l_data as ut_data_value_varchar2).data_value)); + l_result := l_result||'" sql_diffable="'||l_is_diff||'">' || ut_utils.xmlgen_escaped_string((treat(l_data as ut_data_value_varchar2).data_value)); end if; l_result := l_result ||''; return xmltype(l_result); @@ -219,13 +219,13 @@ create or replace package body ut_compound_data_helper is union all select item_no as rn, case when exp_data_id is null then 'Extra:' else 'Missing:' end as diff_type, - xmlserialize(content (case when exp_data_id is null then act_item_data else exp_item_data end) no indent) diffed_row, + xmlserialize(content (extract((case when exp_data_id is null then act_item_data else exp_item_data end),'/*/*')) no indent) diffed_row, nvl2(:join_by,ut3.ut_compound_data_helper.get_pk_value(:join_by,case when exp_data_id is null then act_item_data else exp_item_data end),null) pk_value from ut_compound_data_diff_tmp i where diff_id = :diff_id and act_data_id is null or exp_data_id is null ) - order by 2, 1]' + order by rn ,diff_type ]' bulk collect into l_results using a_exclude_xpath, a_include_xpath, a_join_by_xpath, a_diff_id, a_expected_dataset_guid, @@ -244,12 +244,11 @@ create or replace package body ut_compound_data_helper is l_results tt_row_diffs; begin l_column_filter := get_columns_filter(a_exclude_xpath,a_include_xpath); - execute immediate q'[ with - diff_info as ( select item_no ,exp_item_data, act_item_data,exp_data_id, act_data_id + diff_info as ( select item_no from - (select item_no,exp_item_data,exp_data_id, act_item_data, act_data_id from ut_compound_data_diff_tmp ucdc where diff_id = :diff_guid order by item_no asc) + (select item_no from ut_compound_data_diff_tmp ucdc where diff_id = :diff_guid order by item_no asc) where rownum <= :max_rows) select * from (select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, null pk_value @@ -258,30 +257,24 @@ create or replace package body ut_compound_data_helper is xmlagg(act.col order by act.col_no) act_item from (select r.item_no as rn, rownum col_no, s.column_value col, s.column_value.getRootElement() col_name, - s.column_value.getclobval() col_val, - r.data_id - from ( - select ]'||l_column_filter||q'[, ucd.item_no, ucd.exp_data_id as data_id - from - ( select exp_item_data as item_data, i.item_no, i.exp_data_id - from diff_info i - where i.exp_data_id = :self_guid - ) ucd + s.column_value.getclobval() col_val + from (select ]'||l_column_filter||q'[, ucd.item_no, ucd.item_data item_data_no_filter + from ut_compound_data_tmp ucd, + diff_info i + where ucd.data_id = :self_guid + and ucd.item_no = i.item_no ) r, table( xmlsequence( extract(r.item_data,'/*/*') ) ) s ) exp - join ( + join ( select item_no as rn, rownum col_no, s.column_value col, s.column_value.getRootElement() col_name, - s.column_value.getclobval() col_val, - r.data_id - from (select ]'||l_column_filter||q'[, ucd.item_no, ucd.act_data_id as data_id - from - ( - select act_item_data as item_data, i.item_no,i.act_data_id - from diff_info i - where i.act_data_id = :other_guid - ) ucd + s.column_value.getclobval() col_val + from (select ]'||l_column_filter||q'[, ucd.item_no, ucd.item_data item_data_no_filter + from ut_compound_data_tmp ucd, + diff_info i + where ucd.data_id = :other_guid + and ucd.item_no = i.item_no ) r, table( xmlsequence( extract(r.item_data,'/*/*') ) ) s ) act @@ -293,20 +286,22 @@ create or replace package body ut_compound_data_helper is ) union all select nvl(exp.item_no, act.item_no) rn, - case when exp.data_id is null then 'Extra:' else 'Missing:' end as diff_type, - xmlserialize(content (case when exp.data_id is null then act.item_data else exp.item_data end) no indent) diffed_row, + case when exp.item_no is null then 'Extra:' else 'Missing:' end as diff_type, + xmlserialize(content nvl(exp.item_data, act.item_data) no indent) diffed_row, null pk_value - from (select ucd.item_no, extract(ucd.exp_item_data,'/*/*') item_data, ucd.exp_data_id data_id - from diff_info ucd - where ucd.exp_data_id = :self_guid + from (select ucd.item_no, extract(ucd.item_data,'/*/*') item_data + from ut_compound_data_tmp ucd + where ucd.data_id = :self_guid + and ucd.item_no in (select i.item_no from diff_info i) ) exp full outer join ( - select ucd.item_no, extract(ucd.act_item_data,'/*/*') item_data, ucd.act_data_id data_id - from diff_info ucd - where ucd.act_data_id = :other_guid + select ucd.item_no, extract(ucd.item_data,'/*/*') item_data + from ut_compound_data_tmp ucd + where ucd.data_id = :other_guid + and ucd.item_no in (select i.item_no from diff_info i) )act on exp.item_no = act.item_no - where exp.data_id is null or act.data_id is null + where exp.item_no is null or act.item_no is null order by 1, 2]' bulk collect into l_results using a_diff_id, a_max_rows, @@ -319,12 +314,12 @@ create or replace package body ut_compound_data_helper is function get_rows_diff( a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2, - a_join_by_xpath varchar2,a_unordered boolean + a_join_by_xpath varchar2,a_refcursor boolean ) return tt_row_diffs is l_result tt_row_diffs := tt_row_diffs(); begin case - when a_unordered then + when a_refcursor then l_result := get_rows_diff_by_sql(a_expected_dataset_guid, a_actual_dataset_guid, a_diff_id, a_max_rows, a_exclude_xpath, a_include_xpath ,a_join_by_xpath); else @@ -426,19 +421,15 @@ create or replace package body ut_compound_data_helper is is_sql_diff varchar2(4000) PATH '@sql_diffable' ) xt, table(a_column_info) t - where xt.name = t.column_value) + where '"'||xt.name||'"' = t.column_value) loop if i.is_sql_diff = 0 then - l_col_syntax := l_ut_owner ||'.ut_compound_data_helper.get_hash('||l_alias||i.column_value||'.getClobVal()) as '|| i.column_value ; + l_col_syntax := l_ut_owner ||'.ut_compound_data_helper.get_hash('||l_alias||i.column_value||'.getClobVal()) as '||i.column_value ; else - l_col_syntax := l_alias||i.column_value||' as '|| i.column_value ; + l_col_syntax := l_alias||i.column_value||' as '|| i.column_value; end if; - l_sql_stmt := l_sql_stmt || case - when l_sql_stmt is null then - null - else ',' - end||l_col_syntax; + l_sql_stmt := l_sql_stmt ||','||l_col_syntax; end loop; return l_sql_stmt; end; @@ -448,15 +439,19 @@ create or replace package body ut_compound_data_helper is l_alias varchar2(10) := 'ucd.'; begin - for i in 1..a_column_info.count - loop - l_sql_stmt := l_sql_stmt || case + if a_column_info.count > 0 or a_column_info is null then + for i in 1..a_column_info.count + loop + l_sql_stmt := l_sql_stmt || case when l_sql_stmt is null then null else ',' end||l_alias||a_column_info(i); - end loop; - l_sql_stmt := 'row_number() over (partition by '|| l_sql_stmt || ' order by '||l_sql_stmt||' ) dup_no '; + end loop; + l_sql_stmt := ', row_number() over (partition by '|| l_sql_stmt || ' order by '||l_sql_stmt||' ) dup_no '; + else + l_sql_stmt := ', 1 dup_no '; + end if; return l_sql_stmt; end; @@ -480,21 +475,19 @@ create or replace package body ut_compound_data_helper is is_sql_diff varchar2(4000) PATH '@sql_diffable' ) xt, table(a_column_info) t - where xt.name = t.column_value) + where '"'||xt.name||'"' = t.column_value) loop if i.is_sql_diff = 0 then l_col_type := 'XMLTYPE'; elsif i.is_sql_diff = 1 and (i.type IN ('CHAR','VARCHAR2','VARCHAR')) then l_col_type := 'VARCHAR2(4000)'; + elsif i.is_sql_diff = 1 and i.type = 'DATE' then + l_col_type := 'TIMESTAMP'; else l_col_type := i.type; end if; - l_sql_stmt := l_sql_stmt || case - when l_sql_stmt is null then - null - else ',' - end ||i.column_value||' '||l_col_type||q'[ PATH ']'||i.column_value||q'[']'; + l_sql_stmt := l_sql_stmt||i.column_value||' '||l_col_type||q'[ PATH ']'||TRIM(BOTH '"' FROM i.column_value)||q'[',]'; end loop; return l_sql_stmt; end; @@ -527,12 +520,12 @@ create or replace package body ut_compound_data_helper is is_sql_diff varchar2(4000) PATH '@sql_diffable' ) xt, table(a_join_by_xpath_tab) t - where xt.name = t.column_value) + where '"'||xt.name||'"' = t.column_value) loop if i.is_sql_diff = 0 then - l_non_diff_var := l_ut_owner ||'.ut_compound_data_helper.get_hash((extract( a.'||i.column_value||','||a_join_by_xpath||')).getclobval()) = ' - ||l_ut_owner ||'.ut_compound_data_helper.get_hash((extract( e.'||i.column_value||','||a_join_by_xpath||')).getclobval())'; + l_non_diff_var := l_ut_owner ||'.ut_compound_data_helper.get_hash((extract( a.'||i.column_value||', '||a_join_by_xpath||')).getclobval()) = ' + ||l_ut_owner ||'.ut_compound_data_helper.get_hash((extract( e.'||i.column_value||', '||a_join_by_xpath||')).getclobval())'; l_sql_stmt := l_sql_stmt || case when l_sql_stmt is null then null else ' and ' end ||' a.'||i.column_value||q'[ = ]'||' e.'||i.column_value; elsif i.is_sql_diff = 1 then l_sql_stmt := l_sql_stmt || case when l_sql_stmt is null then null else ' and ' end ||' a.'||i.column_value||q'[ = ]'||' e.'||i.column_value; @@ -548,7 +541,7 @@ create or replace package body ut_compound_data_helper is begin for i in ( with xpaths_tab as (select column_value xpath from table(a_join_by_xpath)), - pk_names as (select REGEXP_SUBSTR (xpath,'[^(/\*/)](.+)$') name + pk_names as (select '"'||REGEXP_SUBSTR (xpath,'[^(/\*/)](.+)$')||'"' name from xpaths_tab) select /*+ CARDINALITY(xt 100) */ column_value as name @@ -569,36 +562,23 @@ create or replace package body ut_compound_data_helper is l_pk_xpath_tabs ut_varchar2_list := ut_varchar2_list(); l_act_col_tab ut_varchar2_list := ut_varchar2_list(); - + l_ut_owner varchar2(250) := ut_utils.ut_owner; l_xmltable_stmt clob; l_where_stmt clob; l_select_stmt clob; l_partition_stmt clob; + l_column_filter varchar2(32767); - function get_columns_names (a_xpath_tab in ut_varchar2_list) return ut_varchar2_list is - l_names_tab ut_varchar2_list := ut_varchar2_list(); - begin - select distinct REGEXP_SUBSTR (column_value,'[^(\/*\/)]+',1,1) - bulk collect into l_names_tab - from table(a_xpath_tab); - return l_names_tab; - end; - - function get_columns_info (a_columns_info in xmltype) return ut_varchar2_list is + function get_filtered_columns_name (a_columns_info in xmltype, a_exclude_xpath varchar2, a_include_xpath varchar2) return ut_varchar2_list is l_columns_info ut_varchar2_list := ut_varchar2_list(); begin - select /*+ CARDINALITY(xt 100) */ - distinct xt.name - bulk collect into l_columns_info - from (select a_column_info item_data from dual) x, - xmltable( - '/ROW/*' - passing x.item_data - columns - name varchar2(4000) PATH '@xml_valid_name' - ) xt; - return l_columns_info; + execute immediate 'with xmlt as ( select :xml_data as item_data from dual ),' + ||'filtered as (select '||get_columns_row_filter(a_exclude_xpath,a_include_xpath) ||' from xmlt ucd) ' + ||q'[select '"'||xt.name||'"' from filtered f, xmltable( '/ROW/*' passing f.item_data columns ]' + ||q'[name VARCHAR2(4000) PATH '@xml_valid_name') xt]' bulk collect into l_columns_info + using a_columns_info,a_exclude_xpath,a_include_xpath; + return l_columns_info; end; function get_join_type(a_inclusion_compare in boolean,a_negated in boolean) return varchar2 is @@ -617,28 +597,21 @@ create or replace package body ut_compound_data_helper is --TODO: Resolve issues with collection and nested tables, can we extract by internal column name if defined e.g. xml of colval.id.getclobval() --TODO: Comment better all pieces - --Check include and exclude columns and create an actual column list that have to be compared. - if a_include_xpath is null and a_exclude_xpath is null then - l_act_col_tab := get_columns_info(a_column_info); - elsif a_include_xpath is not null and a_exclude_xpath is null then - l_act_col_tab := get_columns_names(ut_utils.string_to_table(a_include_xpath,'|')); - elsif a_include_xpath is null and a_exclude_xpath is not null then - l_act_col_tab := get_columns_info(a_column_info) multiset except get_columns_names(ut_utils.string_to_table(a_exclude_xpath,'|')); - elsif a_include_xpath is not null and a_exclude_xpath is not null then - l_act_col_tab := get_columns_names(ut_utils.string_to_table(a_include_xpath,'|')) multiset except get_columns_names(ut_utils.string_to_table(a_exclude_xpath,'|')); - end if; + l_column_filter := get_columns_row_filter(a_exclude_xpath, a_include_xpath); - l_pk_xpath_tabs := get_columns_names(ut_utils.string_to_table(a_join_by_xpath,'|')); + l_act_col_tab := get_filtered_columns_name(a_column_info,a_exclude_xpath,a_include_xpath); + + l_pk_xpath_tabs := get_filtered_columns_name(a_column_info,null,a_join_by_xpath); l_xmltable_stmt := generate_xmltab_stmt(l_act_col_tab,a_column_info); l_select_stmt := generate_select_stmt(l_act_col_tab,a_column_info); l_partition_stmt := generate_partition_stmt(l_act_col_tab); - l_temp_string := 'with exp as ( select ucd.* , '; + l_temp_string := 'with exp as ( select ucd.* '; ut_utils.append_to_clob(l_compare_sql, l_temp_string); - ut_utils.append_to_clob(l_compare_sql, l_partition_stmt); + ut_utils.append_to_clob(l_compare_sql,l_partition_stmt); - l_temp_string := 'from (select ucd.item_data, '; + l_temp_string := 'from (select ucd.item_data '; ut_utils.append_to_clob(l_compare_sql, l_temp_string); ut_utils.append_to_clob(l_compare_sql, l_select_stmt); @@ -654,14 +627,14 @@ create or replace package body ut_compound_data_helper is ut_utils.append_to_clob(l_compare_sql,l_xmltable_stmt); - l_temp_string := q'[ ,item_data xmltype PATH '*' ) ucd where data_id = :self_guid ) ucd ) ,]'; + l_temp_string := q'[ item_data xmltype PATH '*' ) ucd where data_id = :self_guid ) ucd ) ,]'; ut_utils.append_to_clob(l_compare_sql,l_temp_string); - l_temp_string :='act as ( select ucd.* , '; + l_temp_string :='act as ( select ucd.* '; ut_utils.append_to_clob(l_compare_sql, l_temp_string); ut_utils.append_to_clob(l_compare_sql, l_partition_stmt); - l_temp_string := 'from (select ucd.item_data, '; + l_temp_string := 'from (select ucd.item_data '; ut_utils.append_to_clob(l_compare_sql,l_temp_string); ut_utils.append_to_clob(l_compare_sql, l_select_stmt); @@ -675,7 +648,7 @@ create or replace package body ut_compound_data_helper is ut_utils.append_to_clob(l_compare_sql,'POSITION for ordinality, '); end if; - ut_utils.append_to_clob(l_compare_sql,l_xmltable_stmt||q'[ ,item_data xmltype PATH '*') ucd where data_id = :other_guid ) ucd ) ]'); + ut_utils.append_to_clob(l_compare_sql,l_xmltable_stmt||q'[ item_data xmltype PATH '*') ucd where data_id = :other_guid ) ucd ) ]'); l_temp_string := ' select a.item_data as act_item_data, a.data_id act_data_id,' ||'e.item_data as exp_item_data, e.data_id exp_data_id, '|| @@ -699,16 +672,18 @@ create or replace package body ut_compound_data_helper is ut_utils.append_to_clob(l_compare_sql,' ) where '); - if (a_join_by_xpath is not null) and (a_unordered) and (a_inclusion_type) and (not a_is_negated) then + if (a_join_by_xpath is not null) and (a_unordered) and (not a_is_negated) then l_where_stmt := generate_not_equal_sql(l_act_col_tab, l_pk_xpath_tabs); if l_where_stmt is not null then ut_utils.append_to_clob(l_compare_sql,' ( '||l_where_stmt||' ) or '); end if; elsif not a_unordered then l_where_stmt := generate_not_equal_sql(l_act_col_tab, l_pk_xpath_tabs); - ut_utils.append_to_clob(l_compare_sql,' ( '||l_where_stmt||' ) or '); + if l_where_stmt is not null then + ut_utils.append_to_clob(l_compare_sql,' ( '||l_where_stmt||' ) or '); + end if; end if; - + --If its inlcusion we expect a actual set to fully match and have no extra elements over expected if a_inclusion_type and not(a_is_negated) then l_temp_string := ' ( a.data_id is null ) '; @@ -716,7 +691,7 @@ create or replace package body ut_compound_data_helper is l_temp_string := ' (a.data_id is null or e.data_id is null) '; end if; ut_utils.append_to_clob(l_compare_sql,l_temp_string); - + return l_compare_sql; end; @@ -742,7 +717,7 @@ create or replace package body ut_compound_data_helper is g_diff_count := 0; end; - function get_rows_diff return integer is + function get_rows_diff_count return integer is begin return g_diff_count; end; diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index a73fae8dd..0d7a460a7 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -71,10 +71,11 @@ create or replace package ut_compound_data_helper authid definer is function get_pk_value (a_join_by_xpath varchar2,a_item_data xmltype) return clob; + --TODO : Can this be done better ?? function get_rows_diff( a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2, - a_join_by_xpath varchar2,a_unordered boolean + a_join_by_xpath varchar2,a_refcursor boolean ) return tt_row_diffs; subtype t_hash is raw(128); @@ -99,7 +100,7 @@ create or replace package ut_compound_data_helper authid definer is procedure cleanup_diff; - function get_rows_diff return integer; + function get_rows_diff_count return integer; end; / diff --git a/source/expectations/data_values/ut_compound_data_tmp.sql b/source/expectations/data_values/ut_compound_data_tmp.sql index 1d471362f..7beb1e9cd 100644 --- a/source/expectations/data_values/ut_compound_data_tmp.sql +++ b/source/expectations/data_values/ut_compound_data_tmp.sql @@ -19,4 +19,4 @@ create global temporary table ut_compound_data_tmp( pk_hash raw(128), duplicate_no integer, constraint ut_cmp_data_tmp_hash_pk unique (data_id, item_no, duplicate_no) -) on commit preserve rows; \ No newline at end of file +) on commit preserve rows xmltype column item_data store as binary xml; \ No newline at end of file diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index cdec16b98..cb5d5aa2c 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -53,10 +53,13 @@ create or replace type body ut_compound_data_value as --return first c_max_rows rows execute immediate ' select xmlserialize( content ucd.item_data no indent) - from '|| ut_utils.ut_owner ||'.ut_compound_data_tmp ucd - where ucd.data_id = :data_id - and ucd.item_no <= :max_rows' - bulk collect into l_results using self.data_id, c_max_rows; + from '|| ut_utils.ut_owner ||q'[.ut_compound_data_tmp tmp + ,xmltable ( '/ROWSET' passing tmp.item_data + columns item_data xmltype PATH '*' + ) ucd + where tmp.data_id = :data_id + and rownum <= :max_rows]' + bulk collect into l_results using self.data_id, ut_utils.gc_diff_max_rows; ut_utils.append_to_clob(l_result,l_results); @@ -113,18 +116,15 @@ create or replace type body ut_compound_data_value as dbms_lob.createtemporary(l_result,true); - --diff rows and row elements l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_actual.data_id); - + -- First tell how many rows are different - - --TODO: that is a bit mess ?? Can we use global variable for all matchers. - l_diff_row_count := ut_compound_data_helper.get_rows_diff; - + l_diff_row_count := ut_compound_data_helper.get_rows_diff_count; + if l_diff_row_count > 0 then l_row_diffs := ut_compound_data_helper.get_rows_diff( self.data_id, l_actual.data_id, l_diff_id, c_max_rows, a_exclude_xpath, - a_include_xpath, a_join_by_xpath, a_unordered); + a_include_xpath, a_join_by_xpath, a_other is of (ut_data_value_refcursor)); l_message := chr(10) ||'Rows: [ ' || l_diff_row_count ||' differences' || case when l_diff_row_count > c_max_rows and l_row_diffs.count > 0 then ', showing first '||c_max_rows end @@ -168,7 +168,7 @@ create or replace type body ut_compound_data_value as if not a_other is of (ut_compound_data_value) then raise value_error; end if; - + l_other := treat(a_other as ut_compound_data_value); l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); @@ -194,7 +194,7 @@ create or replace type body ut_compound_data_value as if sql%rowcount = 0 and self.elements_count = l_other.elements_count then l_result := 0; else - ut_compound_data_helper.set_rows_diff(sql%rowcount); + ut_compound_data_helper.set_rows_diff(sql%rowcount); l_result := 1; end if; return l_result; @@ -216,10 +216,11 @@ create or replace type body ut_compound_data_value as begin --TODO : Error on xml when same column is more then once in item data xml.Do we need to cleanup ?? --TODO : Bring diffs row into same place for ref data cursor especially (how we going to do that so we dont break anyval etc) + --TODO : Test binary xml storage (didnt seems to make a diffrence, docker and datafiles layer ??) l_other := treat(a_other as ut_compound_data_value); l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); - open l_loop_curs for ut_compound_data_helper.gen_compare_sql(treat(a_other as ut_data_value_refcursor).columns_info, a_exclude_xpath, + open l_loop_curs for ut_compound_data_helper.gen_compare_sql(treat(a_other as ut_data_value_refcursor).col_info_desc, a_exclude_xpath, a_include_xpath, a_join_by_xpath, a_inclusion_compare, a_is_negated, a_unordered ) using self.data_id,l_other.data_id; loop fetch l_loop_curs bulk collect into l_diff_tab limit l_max_rows; @@ -233,15 +234,14 @@ create or replace type body ut_compound_data_value as if (ut_utils.gc_diff_max_rows <= l_sql_rowcount and l_max_rows != ut_utils.gc_bc_fetch_limit ) then l_max_rows := ut_utils.gc_bc_fetch_limit; end if; - end loop; - + end loop; --result is OK only if both are same if l_sql_rowcount = 0 and ( self.elements_count = l_other.elements_count or a_inclusion_compare )then l_result := 0; else ut_compound_data_helper.set_rows_diff(l_sql_rowcount); l_result := 1; - end if; + end if; return l_result; diff --git a/source/expectations/data_values/ut_curr_usr_compound_helper.pkb b/source/expectations/data_values/ut_curr_usr_compound_helper.pkb index 8ea1ab5bb..0cf12f633 100644 --- a/source/expectations/data_values/ut_curr_usr_compound_helper.pkb +++ b/source/expectations/data_values/ut_curr_usr_compound_helper.pkb @@ -232,6 +232,15 @@ create or replace package body ut_curr_usr_compound_helper is return l_result; end; + function extract_min_col_info(a_full_col_info xmltype) return xmltype is + l_result xmltype; + begin + SELECT deleteXML(a_full_col_info,'/ROW/*/@sql_diffable') + into l_result + from dual; + return l_result ; + end; + begin g_anytype_name_map(dbms_types.typecode_date) := 'DATE'; g_anytype_name_map(dbms_types.typecode_number) := 'NUMBER'; diff --git a/source/expectations/data_values/ut_curr_usr_compound_helper.pks b/source/expectations/data_values/ut_curr_usr_compound_helper.pks index bbbba0fa3..b4230a29d 100644 --- a/source/expectations/data_values/ut_curr_usr_compound_helper.pks +++ b/source/expectations/data_values/ut_curr_usr_compound_helper.pks @@ -13,5 +13,7 @@ create or replace package ut_curr_usr_compound_helper authid current_user is function get_user_defined_type(a_owner varchar2, a_type_name varchar2) return xmltype; + function extract_min_col_info(a_full_col_info xmltype) return xmltype; + end; / diff --git a/source/expectations/data_values/ut_data_value_anydata.tpb b/source/expectations/data_values/ut_data_value_anydata.tpb index 7d5322cca..0be830afb 100644 --- a/source/expectations/data_values/ut_data_value_anydata.tpb +++ b/source/expectations/data_values/ut_data_value_anydata.tpb @@ -36,6 +36,8 @@ create or replace type body ut_data_value_anydata as else self.is_data_null := 1; end if; + + ut_compound_data_helper.cleanup_diff; if not self.is_null() then ut_expectation_processor.set_xml_nls_params(); open l_query for select a_value val from dual; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 0fe5544f7..42b65ecf2 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -37,13 +37,16 @@ create or replace type body ut_data_value_refcursor as self.self_type := $$plsql_unit; self.data_id := sys_guid(); self.data_type := 'refcursor'; + ut_compound_data_helper.cleanup_diff; + if l_cursor is not null then if l_cursor%isopen then --Get some more info regarding cursor, including if it containts collection columns and what is their name - ut_curr_usr_compound_helper.get_columns_info(l_cursor,self.columns_info,self.key_info, + ut_curr_usr_compound_helper.get_columns_info(l_cursor,self.col_info_desc,self.key_info, self.contain_collection); self.elements_count := 0; + self.columns_info := ut_curr_usr_compound_helper.extract_min_col_info(self.col_info_desc); -- We use DBMS_XMLGEN in order to: -- 1) be able to process data in bulks (set of rows) @@ -80,7 +83,7 @@ create or replace type body ut_data_value_refcursor as close l_cursor; end if; dbms_xmlgen.closeContext(l_ctx); - + elsif not l_cursor%isopen then raise cursor_not_open; end if; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tps b/source/expectations/data_values/ut_data_value_refcursor.tps index 36c231887..29ee3b702 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tps +++ b/source/expectations/data_values/ut_data_value_refcursor.tps @@ -35,6 +35,10 @@ create or replace type ut_data_value_refcursor under ut_compound_data_value( */ columns_info xmltype, + /** + * Holds information about column names and column data-types and also some supporting attributes + */ + col_info_desc xmltype, /** * Holds more detailed information regarding the pk joins */ diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index 1ac1a7485..bb5221d4d 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -62,6 +62,7 @@ create or replace package body test_expectations_cursor is l_actual sys_refcursor; begin -- Arrange + ut.set_nls; open l_expected for select 1 as my_num, 'This is my test string' as my_string, @@ -74,6 +75,7 @@ create or replace package body test_expectations_cursor is to_clob('This is an even longer test clob') as my_clob, to_date('1984-09-05', 'YYYY-MM-DD') as my_date from dual; + ut.reset_nls; --Act ut3.ut.expect( l_actual ).to_equal( l_expected ); --Assert @@ -661,9 +663,7 @@ Diff: Columns: Column is misplaced. Expected position: 2, actual position: 4. Column is misplaced. Expected position: 3, actual position: 2. - Column is misplaced. Expected position: 4, actual position: 3. -Rows: [ 2 differences ] - All rows are different as the columns are not matching.]'; + Column is misplaced. Expected position: 4, actual position: 3.]'; l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); @@ -893,8 +893,8 @@ Rows: [ 4 differences ] l_expected sys_refcursor; begin --Arrange - open l_actual for select object_name from all_objects where rownum <=1100; - open l_expected for select object_name from all_objects where rownum <=1100; + open l_actual for select object_name from all_objects where rownum <=1100 order by object_id; + open l_expected for select object_name from all_objects where rownum <=1100 order by object_id; --Act ut3.ut.expect(l_actual).to_equal(l_expected); @@ -908,8 +908,8 @@ Rows: [ 4 differences ] l_expected sys_refcursor; begin --Arrange - open l_actual for select object_name from all_objects where rownum <=11000; - open l_expected for select object_name from all_objects where rownum <=11000; + open l_actual for select object_name from all_objects where rownum <=11000 order by object_id; + open l_expected for select object_name from all_objects where rownum <=11000 order by object_id; --Act ut3.ut.expect(l_actual).to_equal(l_expected); @@ -1090,8 +1090,8 @@ Rows: [ 2 differences ]% l_expected_message := q'[%Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 2 ]% %Diff:% %Rows: [ 2 differences ]% -%Extra: test-666% -%Missing: test-667%]'; +%Extra: test-666% +%Missing: test-667%]'; l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); @@ -1289,6 +1289,32 @@ Diff:% ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; + procedure cursor_unorder_compare_1000 is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + begin + --Arrange + open l_actual for select level object_id, level || '_TEST' object_name from dual connect by level <=1100; + open l_expected for select level object_id, level || '_TEST' object_name from dual connect by level <=1100; + --Act + ut3.ut.expect(l_actual).to_equal(l_expected).unordered; + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure cursor_unorder_compare_10000 is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + begin + --Arrange + open l_actual for select level object_id, level || '_TEST' object_name from dual connect by level <=11000; + open l_expected for select level object_id, level || '_TEST' object_name from dual connect by level <=11000; + --Act + ut3.ut.expect(l_actual).to_equal(l_expected).unordered; + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + procedure cursor_joinby_compare_fail is l_actual SYS_REFCURSOR; l_expected SYS_REFCURSOR; @@ -1334,8 +1360,8 @@ Diff:% l_expected_message := q'[%Actual: refcursor [ count = % ] was expected to equal: refcursor [ count = % ] %Diff:% %Rows: [ 2 differences ]% -%PK TEST-610 - Extra: TEST-610% -%PK TEST-600 - Missing: TEST-600%]'; +%PK TEST-610 - Extra: TEST-610% +%PK TEST-600 - Missing: TEST-600%]'; l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); @@ -1516,12 +1542,12 @@ Diff:% ut3.ut.expect(l_actual).to_equal(l_expected).unordered; l_expected_message := q'[%Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 3 ]% Diff:% -Rows: [ 5 differences ] -%Extra: 2Something 22% -%Extra: 1Something 11% -%Missing: 1Somethings 11% -%Missing: 2Somethings 22% -%Missing: 3Somethings 33%]'; +Rows: [ 5 differences 1 +%Extra: 1Something 11% +%Extra: 2Something 22% +%Missing: 1Somethings 11% +%Missing: 2Somethings 22% +%Missing: 3Somethings 33%]'; l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); @@ -2036,7 +2062,7 @@ Diff:% l_expected_message := q'[%Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 3 ] %Diff: %Rows: [ 1 differences ] -%Missing: Table%]'; +%Missing: Table%]'; l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); @@ -2077,11 +2103,11 @@ Diff:% l_expected_message := q'[%Actual: refcursor [ count = 4 ] was expected to include: refcursor [ count = 9 ] %Diff: %Rows: [ 5 differences ] -%Missing: %%% -%Missing: %%% -%Missing: %%% -%Missing: %%% -%Missing: %%%%]'; +%Missing: %%%% +%Missing: %%%% +%Missing: %%%% +%Missing: %%%% +%Missing: %%%%]'; l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); @@ -2121,11 +2147,11 @@ Diff:% l_expected_message := q'[%Actual: refcursor [ count = 4 ] was expected to include: refcursor [ count = 9 ] %Diff: %Rows: [ 5 differences ] -%Missing: %%% -%Missing: %%% -%Missing: %%% -%Missing: %%% -%Missing: %%%%]'; +%Missing: %%%% +%Missing: %%%% +%Missing: %%%% +%Missing: %%%% +%Missing: %%%%]'; l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); @@ -2478,9 +2504,9 @@ Diff:% l_expected_message := q'[%Actual: refcursor [ count = 9 ] was expected to include: refcursor [ count = 6 ] %Diff: %Rows: [ 3 differences ] -%Missing: % -%Missing: % -%Missing: %]'; +%Missing: % +%Missing: % +%Missing: %]'; l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); diff --git a/test/core/expectations/test_expectations_cursor.pks b/test/core/expectations/test_expectations_cursor.pks index 42d6f8cab..e70bb8cdf 100644 --- a/test/core/expectations/test_expectations_cursor.pks +++ b/test/core/expectations/test_expectations_cursor.pks @@ -237,6 +237,12 @@ create or replace package test_expectations_cursor is --%test( Compare cursors join by single key more than 10000 rows) procedure cursor_joinby_compare_10000; + + --%test( Compare cursors unorder more than 1000 rows) + procedure cursor_unorder_compare_1000; + + --%test( Compare cursors unorder more than 10000 rows) + procedure cursor_unorder_compare_10000; --%test( Compare two column cursors join by and fail to match ) procedure cursor_joinby_compare_fail; From ee7bdf27988eb33cd6bd5bfd33a92946ac2eef94 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sun, 11 Nov 2018 21:45:08 +0000 Subject: [PATCH 0085/1096] Update order --- .../data_values/ut_compound_data_helper.pkb | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index bdd56a71c..ac9c8af78 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -183,7 +183,7 @@ create or replace package body ut_compound_data_helper is l_act_col_filter := get_columns_row_filter(a_exclude_xpath,a_include_xpath,'ucd','act_item_data'); l_exp_col_filter := get_columns_row_filter(a_exclude_xpath,a_include_xpath,'ucd','exp_item_data'); - --TODO: Generate a dynamic SQL based on input e.g. no need for PK during unordered and consolidate get_rows_diff + --TODO: Generate SQL based on input as unorder join should aggregate execute immediate q'[with exp as ( select exp_item_data, exp_data_id, item_no rn,rownum col_no, @@ -209,23 +209,31 @@ create or replace package body ut_compound_data_helper is ) select rn, diff_type, diffed_row, pk_value pk_value from ( + select rn, diff_type, diffed_row, pk_value + ,case when diff_type = 'Actual:' then 1 else 2 end rnk + ,1 final_order + from ( select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, pk_value pk_value from - (select nvl(exp.rn, act.rn) rn, nvl(exp.pk_value, act.pk_value) pk_value, exp.col exp_item, act.col act_item + (select nvl(exp.rn, act.rn) rn, nvl(exp.pk_value, act.pk_value) pk_value, exp.col exp_item, act.col act_item from exp join act on exp.rn = act.rn and exp.col_name = act.col_name where dbms_lob.compare(exp.col_val, act.col_val) != 0) unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:') - ) + )) union all select item_no as rn, case when exp_data_id is null then 'Extra:' else 'Missing:' end as diff_type, xmlserialize(content (extract((case when exp_data_id is null then act_item_data else exp_item_data end),'/*/*')) no indent) diffed_row, nvl2(:join_by,ut3.ut_compound_data_helper.get_pk_value(:join_by,case when exp_data_id is null then act_item_data else exp_item_data end),null) pk_value + ,case when exp_data_id is null then 1 else 2 end rnk + ,2 final_order from ut_compound_data_diff_tmp i where diff_id = :diff_id and act_data_id is null or exp_data_id is null ) - order by rn ,diff_type ]' + order by final_order, + case when final_order = 1 then rn else rnk end, + case when final_order = 1 then rnk else rn end ]' bulk collect into l_results using a_exclude_xpath, a_include_xpath, a_join_by_xpath, a_diff_id, a_expected_dataset_guid, From b3e98bec52c70450336dcfdded55a278782c4846 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 11 Nov 2018 23:15:44 +0000 Subject: [PATCH 0086/1096] Reorganizing code a bit. --- source/core/ut_suite_builder.pkb | 443 ++----------------------------- source/core/ut_suite_builder.pks | 30 +-- source/core/ut_suite_manager.pkb | 430 +++++++++++++++++++++++++++++- source/core/ut_suite_manager.pks | 15 ++ test/core/test_suite_builder.pkb | 2 +- 5 files changed, 457 insertions(+), 463 deletions(-) diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index fee7524b4..d946b2a5d 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -93,10 +93,6 @@ create or replace package body ut_suite_builder is by_name tt_annotations_by_name ); - subtype t_cached_suite is ut_suite_cache%rowtype; - type tt_cached_suites is table of t_cached_suite; - type t_cached_suites_cursor is ref cursor return t_cached_suite; - procedure delete_annotations_range( a_annotations in out nocopy t_annotations_info, a_start_pos t_annotation_position, @@ -320,20 +316,6 @@ create or replace package body ut_suite_builder is end if; end; - function sort_by_seq_no( - a_list ut_executables - ) return ut_executables is - l_results ut_executables := ut_executables(); - begin - if a_list is not null then - l_results.extend(a_list.count); - for i in 1 .. a_list.count loop - l_results(a_list(i).seq_no) := a_list(i); - end loop; - end if; - return l_results; - end; - function convert_list( a_list tt_executables ) return ut_executables is @@ -819,33 +801,6 @@ create or replace package body ut_suite_builder is end loop; end; - procedure create_suite_item_list( a_annotations t_annotations_info, a_suite_items out nocopy ut_suite_items ) is - l_annotations t_annotations_info := a_annotations; - l_annotation_pos t_annotation_position; - l_suite ut_suite; - begin - if l_annotations.by_name.exists(gc_suite) then - l_annotation_pos := l_annotations.by_name(gc_suite).first; - l_suite := ut_suite(l_annotations.owner, l_annotations.name, l_annotation_pos); - l_suite.description := l_annotations.by_name( gc_suite)( l_annotation_pos); - l_suite.parse_time := l_annotations.parse_time; - warning_on_unknown_annotations(l_suite, l_annotations.by_line); - - warning_on_duplicate_annot( l_suite, l_annotations.by_name, gc_suite ); - - build_suitepath( l_suite, l_annotations ); - get_suite_contexts_items( l_suite, l_annotations, a_suite_items ); - --create suite tests and add - add_suite_tests( l_suite, l_annotations, a_suite_items ); - - --by this time all contexts were consumed and l_annotations should not have any context/endcontext annotation in it. - warning_on_incomplete_context( l_suite, l_annotations.by_name ); - - a_suite_items.extend; - a_suite_items( a_suite_items.last) := l_suite; - end if; - end; - function convert_package_annotations(a_object ut_annotated_object) return t_annotations_info is l_result t_annotations_info; l_annotation t_annotation; @@ -872,391 +827,33 @@ create or replace package body ut_suite_builder is return l_result; end; - procedure copy_list_reverse_order( - a_list in out nocopy ut_suite_items - ) is - l_start_idx pls_integer; - l_end_idx pls_integer; - l_item ut_suite_item; - begin - l_start_idx := a_list.first; - l_end_idx := a_list.last; - while l_start_idx < l_end_idx loop - l_item := a_list(l_start_idx); - a_list(l_start_idx) := a_list(l_end_idx); - a_list(l_end_idx) := l_item; - l_end_idx := a_list.prior(l_end_idx); - l_start_idx := a_list.next(l_start_idx); - end loop; - end; - - procedure reconstruct_from_cache( - a_suites out nocopy ut_suite_items, - a_suite_data_cursor sys_refcursor - ) is - type t_item_levels is table of ut_suite_items index by binary_integer; - c_bulk_limit constant pls_integer := 1000; - l_items_at_level t_item_levels; - l_rows tt_cached_suites; - l_test ut_test; - l_logical_suite ut_logical_suite; - l_level pls_integer; - l_prev_level pls_integer; - l_idx integer; - begin - a_suites := ut_suite_items(); - loop - fetch a_suite_data_cursor bulk collect into l_rows limit c_bulk_limit; - exit when l_rows.count = 0; - - l_idx := l_rows.first; - loop - l_test := null; - l_logical_suite := null; - case l_rows(l_idx).self_type - when 'UT_TEST' then - l_test := - ut_test( - self_type => l_rows(l_idx).self_type, - object_owner => l_rows(l_idx).object_owner, object_name => lower(l_rows(l_idx).object_name), - name => lower(l_rows(l_idx).name), description => l_rows(l_idx).description, path => l_rows(l_idx).path, - rollback_type => l_rows(l_idx).rollback_type, disabled_flag => l_rows(l_idx).disabled_flag, - line_no => l_rows(l_idx).line_no, parse_time => l_rows(l_idx).parse_time, - start_time => null, end_time => null, result => null, warnings => l_rows(l_idx).warnings, - results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), - before_each_list => sort_by_seq_no(l_rows(l_idx).before_each_list), before_test_list => sort_by_seq_no(l_rows(l_idx).before_test_list), - item => l_rows(l_idx).item, - after_test_list => sort_by_seq_no(l_rows(l_idx).after_test_list), after_each_list => sort_by_seq_no(l_rows(l_idx).after_each_list), - all_expectations => ut_expectation_results(), failed_expectations => ut_expectation_results(), - parent_error_stack_trace => null, expected_error_codes => l_rows(l_idx).expected_error_codes - ); - when 'UT_SUITE' then - l_logical_suite := - ut_suite( - self_type => l_rows(l_idx).self_type, - object_owner => l_rows(l_idx).object_owner, object_name => lower(l_rows(l_idx).object_name), - name => lower(l_rows(l_idx).name), description => l_rows(l_idx).description, path => l_rows(l_idx).path, - rollback_type => l_rows(l_idx).rollback_type, disabled_flag => l_rows(l_idx).disabled_flag, - line_no => l_rows(l_idx).line_no, parse_time => l_rows(l_idx).parse_time, - start_time => null, end_time => null, result => null, warnings => l_rows(l_idx).warnings, - results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), - items => ut_suite_items(), - before_all_list => sort_by_seq_no(l_rows(l_idx).before_all_list), after_all_list => sort_by_seq_no(l_rows(l_idx).after_all_list) - ); - when 'UT_SUITE_CONTEXT' then - l_logical_suite := - ut_suite_context( - self_type => l_rows(l_idx).self_type, - object_owner => l_rows(l_idx).object_owner, object_name => lower(l_rows(l_idx).object_name), - name => lower(l_rows(l_idx).name), description => l_rows(l_idx).description, path => l_rows(l_idx).path, - rollback_type => l_rows(l_idx).rollback_type, disabled_flag => l_rows(l_idx).disabled_flag, - line_no => l_rows(l_idx).line_no, parse_time => l_rows(l_idx).parse_time, - start_time => null, end_time => null, result => null, warnings => l_rows(l_idx).warnings, - results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), - items => ut_suite_items(), - before_all_list => sort_by_seq_no(l_rows(l_idx).before_all_list), after_all_list => sort_by_seq_no(l_rows(l_idx).after_all_list) - ); - when 'UT_LOGICAL_SUITE' then - l_logical_suite := - ut_logical_suite( - self_type => l_rows(l_idx).self_type, - object_owner => l_rows(l_idx).object_owner, object_name => lower(l_rows(l_idx).object_name), - name => lower(l_rows(l_idx).name), description => l_rows(l_idx).description, path => l_rows(l_idx).path, - rollback_type => l_rows(l_idx).rollback_type, disabled_flag => l_rows(l_idx).disabled_flag, - line_no => l_rows(l_idx).line_no, parse_time => l_rows(l_idx).parse_time, - start_time => null, end_time => null, result => null, warnings => l_rows(l_idx).warnings, - results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), - items => ut_suite_items() - ); - end case; - - l_level := length(l_rows(l_idx).path) - length( replace(l_rows(l_idx).path, '.') ) + 1; - - if l_level > 1 then - if l_prev_level > l_level then - l_logical_suite.items := l_items_at_level(l_prev_level); - l_items_at_level(l_prev_level).delete; - end if; - if not l_items_at_level.exists(l_level) then - l_items_at_level(l_level) := ut_suite_items(); - end if; - l_items_at_level(l_level).extend; - if l_test is not null then - l_items_at_level(l_level)(l_items_at_level(l_level).last) := l_test; - else - l_items_at_level(l_level)(l_items_at_level(l_level).last) := l_logical_suite; - end if; - else - if l_prev_level > l_level then - l_logical_suite.items := l_items_at_level(l_prev_level); - l_items_at_level(l_prev_level).delete; - end if; - a_suites.extend; - a_suites(a_suites.last) := l_logical_suite; - end if; - l_prev_level := l_level; - l_idx := l_rows.next(l_idx); - exit when l_idx is null; - end loop; - exit when l_rows.count < c_bulk_limit; - end loop; - copy_list_reverse_order( a_suites ); - close a_suite_data_cursor; - end; - - function get_missing_objects(a_object_owner varchar2) return ut_varchar2_rows is - l_rows sys_refcursor; - l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_objects_view varchar2(200) := ut_metadata.get_dba_view('dba_objects'); - l_cursor_text varchar2(32767); - l_result ut_varchar2_rows; - begin - l_cursor_text := - q'[select i.object_name - from ]'||l_ut_owner||q'[.ut_suite_cache_package i - where - not exists ( - select 1 from ]'||l_objects_view||q'[ o - where o.owner = i.object_owner - and o.object_name = i.object_name - and o.object_type = 'PACKAGE' - and o.owner = ']'||a_object_owner||q'[' - ) - and i.object_owner = ']'||a_object_owner||q'[']'; - open l_rows for l_cursor_text; - fetch l_rows bulk collect into l_result limit 1000000; - close l_rows; - return l_result; - end; - - function get_cached_suite_data( - a_object_owner varchar2, - a_path varchar2 := null, - a_object_name varchar2 := null, - a_procedure_name varchar2 := null, - a_skip_all_objects boolean := false - ) return t_cached_suites_cursor is - l_path varchar2( 4000 ); - l_result sys_refcursor; - l_ut_owner varchar2(250) := ut_utils.ut_owner; + procedure create_suite_item_list( a_annotated_object ut_annotated_object, a_suite_items out nocopy ut_suite_items ) is + l_annotations t_annotations_info; + l_annotation_pos t_annotation_position; + l_suite ut_suite; begin - if a_path is null and a_object_name is not null then - execute immediate 'select min(path) - from '||l_ut_owner||q'[.ut_suite_cache - where object_owner = :a_object_owner - and object_name = :a_object_name - and name = nvl(:a_procedure_name, name)]' - into l_path using upper(a_object_owner), upper(a_object_name), upper(a_procedure_name); - else - l_path := lower( a_path ); - end if; - - open l_result for - q'[with - suite_items as ( - select /*+ cardinality(c 100) */ c.* - from ]'||l_ut_owner||q'[.ut_suite_cache c - where 1 = 1 ]'||case when not a_skip_all_objects then q'[ - and exists - ( select 1 - from all_objects a - where a.object_name = c.object_name - and a.object_owner = ']'||upper(a_object_owner)||q'[' - and a.owner = c.object_owner - and a.object_type = 'PACKAGE' - )]' end ||q'[ - and c.object_owner = ']'||upper(a_object_owner)||q'[' - and ( ]' || case when l_path is not null then q'[ - :l_path||'.' like c.path || '.%' /*all children and self*/ - or ( c.path||'.' like :l_path || '.%' --all parents - ]' - else ' :l_path is null and ( :l_path is null ' end - || case when a_object_name is not null - then 'and c.object_name = :a_object_name ' - else 'and :a_object_name is null' end ||' - '|| case when a_procedure_name is not null - then 'and c.name = :a_procedure_name' - else 'and :a_procedure_name is null' end ||q'[ - ) - ) - ), - suitepaths as ( - select distinct substr(path,1,instr(path,'.',-1)-1) as suitepath, - path, - object_owner - from suite_items - where self_type = 'UT_SUITE' - ), - gen as ( - select rownum as pos - from xmltable('1 to 20') - ), - suitepath_part AS ( - select distinct - substr(b.suitepath, 1, instr(b.suitepath || '.', '.', 1, g.pos) -1) as path, - object_owner - from suitepaths b - join gen g - on g.pos <= regexp_count(b.suitepath, '\w+') - ), - logical_suite_data as ( - select 'UT_LOGICAL_SUITE' as self_type, p.path, p.object_owner, - upper( substr(p.path, instr( p.path, '.', -1 ) + 1 ) ) as object_name, - cast(null as ]'||l_ut_owner||q'[.ut_executables) as x, - cast(null as ]'||l_ut_owner||q'[.ut_integer_list) as y, - cast(null as ]'||l_ut_owner||q'[.ut_executable_test) as z - from suitepath_part p - where p.path - not in (select s.path from suitepaths s) - ), - logical_suites as ( - select to_number(null) as id, s.self_type, s.path, s.object_owner, s.object_name, - s.object_name as name, null as line_no, null as parse_time, - null as description, null as rollback_type, 0 as disabled_flag, - ]'||l_ut_owner||q'[.ut_varchar2_rows() as warnings, - s.x as before_all_list, s.x as after_all_list, - s.x as before_each_list, s.x as before_test_list, - s.x as after_each_list, s.x as after_test_list, - s.y as expected_error_codes, s.z as item - from logical_suite_data s - ), - items as ( - select * from suite_items - union all - select * from logical_suites - ) - select c.* - from items c - order by c.object_owner, - replace(case - when c.self_type in ( 'UT_TEST' ) - then substr(c.path, 1, instr(c.path, '.', -1) ) - else c.path - end, '.', chr(0)) desc nulls last, - c.object_name desc, - c.line_no]' - using l_path, l_path, upper(a_object_name), upper(a_procedure_name); - - return l_result; - end; + l_annotations := convert_package_annotations( a_annotated_object ); - function build_suites_from_annotations( - a_owner_name varchar2, - a_annotated_objects sys_refcursor, - a_path varchar2 := null, - a_object_name varchar2 := null, - a_procedure_name varchar2 := null, - a_skip_all_objects boolean := false - ) return ut_suite_items is - l_suites ut_suite_items; - l_annotated_objects ut_annotated_objects; - l_suite_items ut_suite_items; - begin - loop - fetch a_annotated_objects bulk collect into l_annotated_objects limit 10; + if l_annotations.by_name.exists(gc_suite) then + l_annotation_pos := l_annotations.by_name(gc_suite).first; + l_suite := ut_suite(l_annotations.owner, l_annotations.name, l_annotation_pos); + l_suite.description := l_annotations.by_name( gc_suite)( l_annotation_pos); + l_suite.parse_time := l_annotations.parse_time; + warning_on_unknown_annotations(l_suite, l_annotations.by_line); - for i in 1 .. l_annotated_objects.count loop - create_suite_item_list( - convert_package_annotations( l_annotated_objects( i ) ), - l_suite_items - ); - ut_suite_cache_manager.save_object_cache( - a_owner_name, - l_annotated_objects( i ).object_name, - l_annotated_objects( i ).parse_time, - l_suite_items - ); - end loop; - exit when a_annotated_objects%notfound; - end loop; - close a_annotated_objects; - - reconstruct_from_cache( - l_suites, - get_cached_suite_data( - a_owner_name, - a_path, - a_object_name, - a_procedure_name, - a_skip_all_objects - ) - ); - for i in 1 .. l_suites.count loop - l_suites( i ).set_rollback_type( l_suites( i ).get_rollback_type ); - end loop; - return l_suites; - end; + warning_on_duplicate_annot( l_suite, l_annotations.by_name, gc_suite ); - function build_schema_suites( - a_owner_name varchar2, - a_path varchar2 := null, - a_object_name varchar2 := null, - a_procedure_name varchar2 := null - ) return ut_suite_items is - l_annotations_cursor sys_refcursor; - l_suite_cache_time timestamp; - l_skip_all_objects_scan boolean := false; - begin - l_suite_cache_time := ut_suite_cache_manager.get_schema_parse_time(a_owner_name); - open l_annotations_cursor for - q'[select value(x) - from table( - ]' || ut_utils.ut_owner || q'[.ut_annotation_manager.get_annotated_objects(:a_owner_name, 'PACKAGE', :a_suite_cache_parse_time) - )x ]' - using a_owner_name, l_suite_cache_time; - - -- if current user is the onwer or current user has execute any procedure privilege - if sys_context('userenv','current_schema') = a_owner_name - or ut_metadata.is_object_visible('ut3.ut_utils') - then - l_skip_all_objects_scan := true; - end if; - if l_skip_all_objects_scan or ut_metadata.is_object_visible('dba_objects') then - ut_suite_cache_manager.remove_from_cache( a_owner_name, get_missing_objects(a_owner_name) ); - end if; + build_suitepath( l_suite, l_annotations ); + get_suite_contexts_items( l_suite, l_annotations, a_suite_items ); + --create suite tests and add + add_suite_tests( l_suite, l_annotations, a_suite_items ); - return build_suites_from_annotations( - a_owner_name, - l_annotations_cursor, - a_path, - a_object_name, - a_procedure_name, - l_skip_all_objects_scan - ); - end; + --by this time all contexts were consumed and l_annotations should not have any context/endcontext annotation in it. + warning_on_incomplete_context( l_suite, l_annotations.by_name ); - function get_schema_ut_packages( a_schema_names ut_varchar2_rows ) return ut_object_names is - l_results ut_object_names := ut_object_names( ); - l_schema_names ut_varchar2_rows; - l_object_names ut_varchar2_rows; - l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_need_all_objects_scan boolean := true; - begin - -- if current user is the onwer or current user has execute any procedure privilege - if ut_metadata.is_object_visible('ut3.ut_utils') - or (a_schema_names is not null and a_schema_names.count = 1 - and sys_context('userenv','current_schema') = a_schema_names(1)) - then - l_need_all_objects_scan := false; + a_suite_items.extend; + a_suite_items( a_suite_items.last) := l_suite; end if; - - execute immediate 'select c.object_owner, c.object_name - from '||l_ut_owner||q'[.ut_suite_cache_package c - join table ( :a_schema_names ) s - on c.object_owner = upper(s.column_value)]' - || case when l_need_all_objects_scan then q'[ - where exists - (select 1 from all_objects a - where a.owner = c.object_owner - and a.object_name = c.object_name - and a.object_type = 'PACKAGE') - ]' end - bulk collect into l_schema_names, l_object_names using a_schema_names; - l_results.extend( l_schema_names.count ); - for i in 1 .. l_schema_names.count loop - l_results( i ) := ut_object_name( l_schema_names( i ), l_object_names( i ) ); - end loop; - return l_results; end; end ut_suite_builder; diff --git a/source/core/ut_suite_builder.pks b/source/core/ut_suite_builder.pks index 881df24c9..5e2624a30 100644 --- a/source/core/ut_suite_builder.pks +++ b/source/core/ut_suite_builder.pks @@ -21,32 +21,12 @@ create or replace package ut_suite_builder authid current_user is */ /** - * Builds set of hierarchical suites for a given schema - * - * @param a_owner_name name of the schema to builds suite for - * @param a_path suite path to build suite for (optional) - * @param a_object_name object name to build suite for (optional) - * @param a_object_name procedure name to build suite for (optional) - * @return list of suites organized into hierarchy - * + * Creates a list of suite items for an annotated object */ - function build_schema_suites( - a_owner_name varchar2, - a_path varchar2 := null, - a_object_name varchar2 := null, - a_procedure_name varchar2 := null - ) return ut_suite_items; - - function get_schema_ut_packages(a_schema_names ut_varchar2_rows) return ut_object_names; - - function build_suites_from_annotations( - a_owner_name varchar2, - a_annotated_objects sys_refcursor, - a_path varchar2 := null, - a_object_name varchar2 := null, - a_procedure_name varchar2 := null, - a_skip_all_objects boolean := false - ) return ut_suite_items; + procedure create_suite_item_list( + a_annotated_object ut_annotated_object, + a_suite_items out nocopy ut_suite_items + ); end ut_suite_builder; / diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 4aab5503b..5e296f02e 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -25,12 +25,11 @@ create or replace package body ut_suite_manager is type t_path_items is table of t_path_item; type t_schema_paths is table of t_path_items index by varchar2(250 char); - ------------------ + subtype t_cached_suite is ut_suite_cache%rowtype; + type tt_cached_suites is table of t_cached_suite; + type t_cached_suites_cursor is ref cursor return t_cached_suite; - function get_schema_ut_packages(a_schema_names ut_varchar2_rows) return ut_object_names is - begin - return ut_suite_builder.get_schema_ut_packages(a_schema_names); - end; + ------------------ procedure validate_paths(a_paths in ut_varchar2_list) is l_path varchar2(32767); @@ -108,13 +107,6 @@ create or replace package body ut_suite_manager is l_schema_names := resolve_schema_names(a_paths); end; - function get_schema_names(a_paths ut_varchar2_list) return ut_varchar2_rows is - l_paths ut_varchar2_list; - begin - l_paths := a_paths; - return resolve_schema_names(l_paths); - end; - function group_paths_by_schema(a_paths ut_varchar2_list) return t_schema_paths is c_package_path_regex constant varchar2(100) := '^([A-Za-z0-9$#_]+)(\.([A-Za-z0-9$#_]+))?(\.([A-Za-z0-9$#_]+))?$'; l_schema varchar2(4000); @@ -141,7 +133,417 @@ create or replace package body ut_suite_manager is end loop; return l_results; end; - + + + function sort_by_seq_no( + a_list ut_executables + ) return ut_executables is + l_results ut_executables := ut_executables(); + begin + if a_list is not null then + l_results.extend(a_list.count); + for i in 1 .. a_list.count loop + l_results(a_list(i).seq_no) := a_list(i); + end loop; + end if; + return l_results; + end; + + procedure copy_list_reverse_order( + a_list in out nocopy ut_suite_items + ) is + l_start_idx pls_integer; + l_end_idx pls_integer; + l_item ut_suite_item; + begin + l_start_idx := a_list.first; + l_end_idx := a_list.last; + while l_start_idx < l_end_idx loop + l_item := a_list(l_start_idx); + a_list(l_start_idx) := a_list(l_end_idx); + a_list(l_end_idx) := l_item; + l_end_idx := a_list.prior(l_end_idx); + l_start_idx := a_list.next(l_start_idx); + end loop; + end; + + procedure reconstruct_from_cache( + a_suites out nocopy ut_suite_items, + a_suite_data_cursor sys_refcursor + ) is + type t_item_levels is table of ut_suite_items index by binary_integer; + c_bulk_limit constant pls_integer := 1000; + l_items_at_level t_item_levels; + l_rows tt_cached_suites; + l_test ut_test; + l_logical_suite ut_logical_suite; + l_level pls_integer; + l_prev_level pls_integer; + l_idx integer; + begin + a_suites := ut_suite_items(); + loop + fetch a_suite_data_cursor bulk collect into l_rows limit c_bulk_limit; + exit when l_rows.count = 0; + + l_idx := l_rows.first; + loop + l_test := null; + l_logical_suite := null; + case l_rows(l_idx).self_type + when 'UT_TEST' then + l_test := + ut_test( + self_type => l_rows(l_idx).self_type, + object_owner => l_rows(l_idx).object_owner, object_name => lower(l_rows(l_idx).object_name), + name => lower(l_rows(l_idx).name), description => l_rows(l_idx).description, path => l_rows(l_idx).path, + rollback_type => l_rows(l_idx).rollback_type, disabled_flag => l_rows(l_idx).disabled_flag, + line_no => l_rows(l_idx).line_no, parse_time => l_rows(l_idx).parse_time, + start_time => null, end_time => null, result => null, warnings => l_rows(l_idx).warnings, + results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), + before_each_list => sort_by_seq_no(l_rows(l_idx).before_each_list), before_test_list => sort_by_seq_no(l_rows(l_idx).before_test_list), + item => l_rows(l_idx).item, + after_test_list => sort_by_seq_no(l_rows(l_idx).after_test_list), after_each_list => sort_by_seq_no(l_rows(l_idx).after_each_list), + all_expectations => ut_expectation_results(), failed_expectations => ut_expectation_results(), + parent_error_stack_trace => null, expected_error_codes => l_rows(l_idx).expected_error_codes + ); + when 'UT_SUITE' then + l_logical_suite := + ut_suite( + self_type => l_rows(l_idx).self_type, + object_owner => l_rows(l_idx).object_owner, object_name => lower(l_rows(l_idx).object_name), + name => lower(l_rows(l_idx).name), description => l_rows(l_idx).description, path => l_rows(l_idx).path, + rollback_type => l_rows(l_idx).rollback_type, disabled_flag => l_rows(l_idx).disabled_flag, + line_no => l_rows(l_idx).line_no, parse_time => l_rows(l_idx).parse_time, + start_time => null, end_time => null, result => null, warnings => l_rows(l_idx).warnings, + results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), + items => ut_suite_items(), + before_all_list => sort_by_seq_no(l_rows(l_idx).before_all_list), after_all_list => sort_by_seq_no(l_rows(l_idx).after_all_list) + ); + when 'UT_SUITE_CONTEXT' then + l_logical_suite := + ut_suite_context( + self_type => l_rows(l_idx).self_type, + object_owner => l_rows(l_idx).object_owner, object_name => lower(l_rows(l_idx).object_name), + name => lower(l_rows(l_idx).name), description => l_rows(l_idx).description, path => l_rows(l_idx).path, + rollback_type => l_rows(l_idx).rollback_type, disabled_flag => l_rows(l_idx).disabled_flag, + line_no => l_rows(l_idx).line_no, parse_time => l_rows(l_idx).parse_time, + start_time => null, end_time => null, result => null, warnings => l_rows(l_idx).warnings, + results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), + items => ut_suite_items(), + before_all_list => sort_by_seq_no(l_rows(l_idx).before_all_list), after_all_list => sort_by_seq_no(l_rows(l_idx).after_all_list) + ); + when 'UT_LOGICAL_SUITE' then + l_logical_suite := + ut_logical_suite( + self_type => l_rows(l_idx).self_type, + object_owner => l_rows(l_idx).object_owner, object_name => lower(l_rows(l_idx).object_name), + name => lower(l_rows(l_idx).name), description => l_rows(l_idx).description, path => l_rows(l_idx).path, + rollback_type => l_rows(l_idx).rollback_type, disabled_flag => l_rows(l_idx).disabled_flag, + line_no => l_rows(l_idx).line_no, parse_time => l_rows(l_idx).parse_time, + start_time => null, end_time => null, result => null, warnings => l_rows(l_idx).warnings, + results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), + items => ut_suite_items() + ); + end case; + + l_level := length(l_rows(l_idx).path) - length( replace(l_rows(l_idx).path, '.') ) + 1; + + if l_level > 1 then + if l_prev_level > l_level then + l_logical_suite.items := l_items_at_level(l_prev_level); + l_items_at_level(l_prev_level).delete; + end if; + if not l_items_at_level.exists(l_level) then + l_items_at_level(l_level) := ut_suite_items(); + end if; + l_items_at_level(l_level).extend; + if l_test is not null then + l_items_at_level(l_level)(l_items_at_level(l_level).last) := l_test; + else + l_items_at_level(l_level)(l_items_at_level(l_level).last) := l_logical_suite; + end if; + else + if l_prev_level > l_level then + l_logical_suite.items := l_items_at_level(l_prev_level); + l_items_at_level(l_prev_level).delete; + end if; + a_suites.extend; + a_suites(a_suites.last) := l_logical_suite; + end if; + l_prev_level := l_level; + l_idx := l_rows.next(l_idx); + exit when l_idx is null; + end loop; + exit when l_rows.count < c_bulk_limit; + end loop; + copy_list_reverse_order( a_suites ); + close a_suite_data_cursor; + end; + + function get_missing_objects(a_object_owner varchar2) return ut_varchar2_rows is + l_rows sys_refcursor; + l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_objects_view varchar2(200) := ut_metadata.get_dba_view('dba_objects'); + l_cursor_text varchar2(32767); + l_result ut_varchar2_rows; + begin + l_cursor_text := + q'[select i.object_name + from ]'||l_ut_owner||q'[.ut_suite_cache_package i + where + not exists ( + select 1 from ]'||l_objects_view||q'[ o + where o.owner = i.object_owner + and o.object_name = i.object_name + and o.object_type = 'PACKAGE' + and o.owner = ']'||a_object_owner||q'[' + ) + and i.object_owner = ']'||a_object_owner||q'[']'; + open l_rows for l_cursor_text; + fetch l_rows bulk collect into l_result limit 1000000; + close l_rows; + return l_result; + end; + + function get_cached_suite_data( + a_object_owner varchar2, + a_path varchar2 := null, + a_object_name varchar2 := null, + a_procedure_name varchar2 := null, + a_skip_all_objects boolean := false + ) return t_cached_suites_cursor is + l_path varchar2( 4000 ); + l_result sys_refcursor; + l_ut_owner varchar2(250) := ut_utils.ut_owner; + begin + if a_path is null and a_object_name is not null then + execute immediate 'select min(path) + from '||l_ut_owner||q'[.ut_suite_cache + where object_owner = :a_object_owner + and object_name = :a_object_name + and name = nvl(:a_procedure_name, name)]' + into l_path using upper(a_object_owner), upper(a_object_name), upper(a_procedure_name); + else + l_path := lower( a_path ); + end if; + + open l_result for + q'[with + suite_items as ( + select /*+ cardinality(c 100) */ c.* + from ]'||l_ut_owner||q'[.ut_suite_cache c + where 1 = 1 ]'||case when not a_skip_all_objects then q'[ + and exists + ( select 1 + from all_objects a + where a.object_name = c.object_name + and a.object_owner = ']'||upper(a_object_owner)||q'[' + and a.owner = c.object_owner + and a.object_type = 'PACKAGE' + )]' end ||q'[ + and c.object_owner = ']'||upper(a_object_owner)||q'[' + and ( ]' || case when l_path is not null then q'[ + :l_path||'.' like c.path || '.%' /*all children and self*/ + or ( c.path||'.' like :l_path || '.%' --all parents + ]' + else ' :l_path is null and ( :l_path is null ' end + || case when a_object_name is not null + then 'and c.object_name = :a_object_name ' + else 'and :a_object_name is null' end ||' + '|| case when a_procedure_name is not null + then 'and c.name = :a_procedure_name' + else 'and :a_procedure_name is null' end ||q'[ + ) + ) + ), + suitepaths as ( + select distinct substr(path,1,instr(path,'.',-1)-1) as suitepath, + path, + object_owner + from suite_items + where self_type = 'UT_SUITE' + ), + gen as ( + select rownum as pos + from xmltable('1 to 20') + ), + suitepath_part AS ( + select distinct + substr(b.suitepath, 1, instr(b.suitepath || '.', '.', 1, g.pos) -1) as path, + object_owner + from suitepaths b + join gen g + on g.pos <= regexp_count(b.suitepath, '\w+') + ), + logical_suite_data as ( + select 'UT_LOGICAL_SUITE' as self_type, p.path, p.object_owner, + upper( substr(p.path, instr( p.path, '.', -1 ) + 1 ) ) as object_name, + cast(null as ]'||l_ut_owner||q'[.ut_executables) as x, + cast(null as ]'||l_ut_owner||q'[.ut_integer_list) as y, + cast(null as ]'||l_ut_owner||q'[.ut_executable_test) as z + from suitepath_part p + where p.path + not in (select s.path from suitepaths s) + ), + logical_suites as ( + select to_number(null) as id, s.self_type, s.path, s.object_owner, s.object_name, + s.object_name as name, null as line_no, null as parse_time, + null as description, null as rollback_type, 0 as disabled_flag, + ]'||l_ut_owner||q'[.ut_varchar2_rows() as warnings, + s.x as before_all_list, s.x as after_all_list, + s.x as before_each_list, s.x as before_test_list, + s.x as after_each_list, s.x as after_test_list, + s.y as expected_error_codes, s.z as item + from logical_suite_data s + ), + items as ( + select * from suite_items + union all + select * from logical_suites + ) + select c.* + from items c + order by c.object_owner, + replace(case + when c.self_type in ( 'UT_TEST' ) + then substr(c.path, 1, instr(c.path, '.', -1) ) + else c.path + end, '.', chr(0)) desc nulls last, + c.object_name desc, + c.line_no]' + using l_path, l_path, upper(a_object_name), upper(a_procedure_name); + + return l_result; + end; + + function build_schema_suites( + a_owner_name varchar2, + a_path varchar2 := null, + a_object_name varchar2 := null, + a_procedure_name varchar2 := null + ) return ut_suite_items is + l_annotations_cursor sys_refcursor; + l_suite_cache_time timestamp; + l_skip_all_objects_scan boolean := false; + begin + l_suite_cache_time := ut_suite_cache_manager.get_schema_parse_time(a_owner_name); + open l_annotations_cursor for + q'[select value(x) + from table( + ]' || ut_utils.ut_owner || q'[.ut_annotation_manager.get_annotated_objects(:a_owner_name, 'PACKAGE', :a_suite_cache_parse_time) + )x ]' + using a_owner_name, l_suite_cache_time; + + -- if current user is the onwer or current user has execute any procedure privilege + if sys_context('userenv','current_schema') = a_owner_name + or ut_metadata.is_object_visible('ut3.ut_utils') + then + l_skip_all_objects_scan := true; + end if; + if l_skip_all_objects_scan or ut_metadata.is_object_visible('dba_objects') then + ut_suite_cache_manager.remove_from_cache( a_owner_name, get_missing_objects(a_owner_name) ); + end if; + + return build_suites_from_annotations( + a_owner_name, + l_annotations_cursor, + a_path, + a_object_name, + a_procedure_name, + l_skip_all_objects_scan + ); + end; + + ----------------------------------------------- + ----------------------------------------------- + ------------- Public definitions ------------- + + function build_suites_from_annotations( + a_owner_name varchar2, + a_annotated_objects sys_refcursor, + a_path varchar2 := null, + a_object_name varchar2 := null, + a_procedure_name varchar2 := null, + a_skip_all_objects boolean := false + ) return ut_suite_items is + l_suites ut_suite_items; + l_annotated_objects ut_annotated_objects; + l_suite_items ut_suite_items; + begin + loop + fetch a_annotated_objects bulk collect into l_annotated_objects limit 10; + + for i in 1 .. l_annotated_objects.count loop + ut_suite_builder.create_suite_item_list( l_annotated_objects( i ), l_suite_items ); + ut_suite_cache_manager.save_object_cache( + a_owner_name, + l_annotated_objects( i ).object_name, + l_annotated_objects( i ).parse_time, + l_suite_items + ); + end loop; + exit when a_annotated_objects%notfound; + end loop; + close a_annotated_objects; + + reconstruct_from_cache( + l_suites, + get_cached_suite_data( + a_owner_name, + a_path, + a_object_name, + a_procedure_name, + a_skip_all_objects + ) + ); + for i in 1 .. l_suites.count loop + l_suites( i ).set_rollback_type( l_suites( i ).get_rollback_type ); + end loop; + return l_suites; + end; + + function get_schema_ut_packages(a_schema_names ut_varchar2_rows) return ut_object_names is + l_results ut_object_names := ut_object_names( ); + l_schema_names ut_varchar2_rows; + l_object_names ut_varchar2_rows; + l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_need_all_objects_scan boolean := true; + begin + -- if current user is the onwer or current user has execute any procedure privilege + if ut_metadata.is_object_visible('ut3.ut_utils') + or (a_schema_names is not null and a_schema_names.count = 1 + and sys_context('userenv','current_schema') = a_schema_names(1)) + then + l_need_all_objects_scan := false; + end if; + + execute immediate 'select c.object_owner, c.object_name + from '||l_ut_owner||q'[.ut_suite_cache_package c + join table ( :a_schema_names ) s + on c.object_owner = upper(s.column_value)]' + || case when l_need_all_objects_scan then q'[ + where exists + (select 1 from all_objects a + where a.owner = c.object_owner + and a.object_name = c.object_name + and a.object_type = 'PACKAGE') + ]' end + bulk collect into l_schema_names, l_object_names using a_schema_names; + l_results.extend( l_schema_names.count ); + for i in 1 .. l_schema_names.count loop + l_results( i ) := ut_object_name( l_schema_names( i ), l_object_names( i ) ); + end loop; + return l_results; + end; + + function get_schema_names(a_paths ut_varchar2_list) return ut_varchar2_rows is + l_paths ut_varchar2_list; + begin + l_paths := a_paths; + return resolve_schema_names(l_paths); + end; + function configure_execution_by_path(a_paths in ut_varchar2_list) return ut_suite_items is l_paths ut_varchar2_list := a_paths; l_path_items t_path_items; @@ -164,7 +566,7 @@ create or replace package body ut_suite_manager is l_path_items := l_schema_paths(l_schema); for i in 1 .. l_path_items.count loop l_path_item := l_path_items(i); - l_suites := ut_suite_builder.build_schema_suites( + l_suites := build_schema_suites( upper(l_schema), l_path_item.suite_path, l_path_item.object_name, diff --git a/source/core/ut_suite_manager.pks b/source/core/ut_suite_manager.pks index 3fde7f6b5..22c27fea9 100644 --- a/source/core/ut_suite_manager.pks +++ b/source/core/ut_suite_manager.pks @@ -45,5 +45,20 @@ create or replace package ut_suite_manager authid current_user is */ function get_schema_names(a_paths ut_varchar2_list) return ut_varchar2_rows; + + /** + * Constructs a list of suites based on the list of annotations passed + * the suites are stored in cache + */ + function build_suites_from_annotations( + a_owner_name varchar2, + a_annotated_objects sys_refcursor, + a_path varchar2 := null, + a_object_name varchar2 := null, + a_procedure_name varchar2 := null, + a_skip_all_objects boolean := false + ) return ut_suite_items; + + end ut_suite_manager; / diff --git a/test/core/test_suite_builder.pkb b/test/core/test_suite_builder.pkb index 423e29c0a..bd76e88d8 100644 --- a/test/core/test_suite_builder.pkb +++ b/test/core/test_suite_builder.pkb @@ -14,7 +14,7 @@ create or replace package body test_suite_builder is ut3.ut_annotated_object('UT3_TESTER', a_package_name, 'PACKAGE', systimestamp, a_annotations) ) ) x; - l_suites := ut3.ut_suite_builder.build_suites_from_annotations( + l_suites := ut3.ut_suite_manager.build_suites_from_annotations( a_owner_name => 'UT3_TESTER', a_annotated_objects => l_cursor, a_path => null, From 64dfb41ab3ca8165ca976c0ab9624820ee7b8692 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 12 Nov 2018 01:18:20 +0000 Subject: [PATCH 0087/1096] Output buffer&reporters performance improvements --- .../output_buffers/ut_output_buffer_base.tps | 1 + .../output_buffers/ut_output_table_buffer.tpb | 23 +++-- .../output_buffers/ut_output_table_buffer.tps | 1 + source/core/types/ut_output_reporter_base.tpb | 5 ++ source/core/types/ut_output_reporter_base.tps | 2 +- source/core/ut_utils.pkb | 48 +++++++++- source/core/ut_utils.pks | 15 ++++ .../ut_coverage_cobertura_reporter.tpb | 79 +++++++++-------- .../reporters/ut_coverage_html_reporter.tpb | 3 +- .../ut_coverage_report_html_helper.pkb | 87 +++++++++---------- .../ut_coverage_report_html_helper.pks | 2 +- .../reporters/ut_coverage_sonar_reporter.tpb | 65 +++++++------- source/reporters/ut_coveralls_reporter.tpb | 48 +++++----- source/reporters/ut_junit_reporter.tpb | 82 +++++++++-------- source/reporters/ut_sonar_test_reporter.tpb | 27 +++--- source/reporters/ut_teamcity_reporter.tpb | 56 ++++++++---- source/reporters/ut_tfs_junit_reporter.tpb | 55 ++++++------ .../test_cov_cobertura_reporter.pkb | 7 +- .../test_coverage/test_coveralls_reporter.pkb | 15 +++- 19 files changed, 372 insertions(+), 249 deletions(-) diff --git a/source/core/output_buffers/ut_output_buffer_base.tps b/source/core/output_buffers/ut_output_buffer_base.tps index f1d71c502..6f69047d9 100644 --- a/source/core/output_buffers/ut_output_buffer_base.tps +++ b/source/core/output_buffers/ut_output_buffer_base.tps @@ -20,6 +20,7 @@ create or replace type ut_output_buffer_base authid definer as object( member procedure init(self in out nocopy ut_output_buffer_base), not instantiable member procedure close(self in ut_output_buffer_base), not instantiable member procedure send_line(self in ut_output_buffer_base, a_text varchar2), + not instantiable member procedure send_lines(self in ut_output_buffer_base, a_text_list ut_varchar2_rows), not instantiable member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_varchar2_rows pipelined, not instantiable member function get_lines_cursor(a_initial_timeout natural := null, a_timeout_sec natural := null) return sys_refcursor, not instantiable member procedure lines_to_dbms_output(self in ut_output_buffer_base, a_initial_timeout natural := null, a_timeout_sec natural := null) diff --git a/source/core/output_buffers/ut_output_table_buffer.tpb b/source/core/output_buffers/ut_output_table_buffer.tpb index 0cc68b76b..e7045b9df 100644 --- a/source/core/output_buffers/ut_output_table_buffer.tpb +++ b/source/core/output_buffers/ut_output_table_buffer.tpb @@ -47,16 +47,15 @@ create or replace type body ut_output_table_buffer is end; overriding member procedure send_line(self in ut_output_table_buffer, a_text varchar2) is - l_text_list ut_varchar2_rows; pragma autonomous_transaction; begin if a_text is not null then if length(a_text) > ut_utils.gc_max_storage_varchar2_len then - l_text_list := ut_utils.convert_collection(ut_utils.clob_to_table(a_text, ut_utils.gc_max_storage_varchar2_len)); - insert - into ut_output_buffer_tmp(output_id, message_id, text) - select self.output_id, ut_message_id_seq.nextval, t.column_value - from table(l_text_list) t; + self.send_lines( + ut_utils.convert_collection( + ut_utils.clob_to_table(a_text, ut_utils.gc_max_storage_varchar2_len) + ) + ); else insert into ut_output_buffer_tmp(output_id, message_id, text) values (self.output_id, ut_message_id_seq.nextval, a_text); @@ -65,6 +64,18 @@ create or replace type body ut_output_table_buffer is end if; end; + overriding member procedure send_lines(self in ut_output_table_buffer, a_text_list ut_varchar2_rows) is + pragma autonomous_transaction; + begin + insert into ut_output_buffer_tmp(output_id, message_id, text) + select self.output_id, ut_message_id_seq.nextval, t.column_value + from table(a_text_list) t + where t.column_value is not null; + + commit; + end; + + overriding member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_varchar2_rows pipelined is l_buffer_data ut_varchar2_rows; l_already_waited_for number(10,2) := 0; diff --git a/source/core/output_buffers/ut_output_table_buffer.tps b/source/core/output_buffers/ut_output_table_buffer.tps index 96628de77..0e6f83770 100644 --- a/source/core/output_buffers/ut_output_table_buffer.tps +++ b/source/core/output_buffers/ut_output_table_buffer.tps @@ -20,6 +20,7 @@ create or replace type ut_output_table_buffer under ut_output_buffer_base ( constructor function ut_output_table_buffer(self in out nocopy ut_output_table_buffer, a_output_id raw := null) return self as result, overriding member procedure init(self in out nocopy ut_output_table_buffer), overriding member procedure send_line(self in ut_output_table_buffer, a_text varchar2), + overriding member procedure send_lines(self in ut_output_table_buffer, a_text_list ut_varchar2_rows), overriding member procedure close(self in ut_output_table_buffer), overriding member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_varchar2_rows pipelined, overriding member function get_lines_cursor(a_initial_timeout natural := null, a_timeout_sec natural := null) return sys_refcursor, diff --git a/source/core/types/ut_output_reporter_base.tpb b/source/core/types/ut_output_reporter_base.tpb index 32e8b225b..3f62d6546 100644 --- a/source/core/types/ut_output_reporter_base.tpb +++ b/source/core/types/ut_output_reporter_base.tpb @@ -46,6 +46,11 @@ create or replace type body ut_output_reporter_base is self.output_buffer.send_line(a_text); end; + member procedure print_text_lines(self in out nocopy ut_output_reporter_base, a_text_lines ut_varchar2_rows) is + begin + self.output_buffer.send_lines(a_text_lines); + end; + final member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural) return ut_varchar2_rows pipelined is begin for i in (select column_value from table(self.output_buffer.get_lines(a_initial_timeout, a_timeout_sec))) loop diff --git a/source/core/types/ut_output_reporter_base.tps b/source/core/types/ut_output_reporter_base.tps index a0a9f63f6..e23ac9273 100644 --- a/source/core/types/ut_output_reporter_base.tps +++ b/source/core/types/ut_output_reporter_base.tps @@ -22,7 +22,7 @@ create or replace type ut_output_reporter_base under ut_reporter_base( overriding member procedure before_calling_run(self in out nocopy ut_output_reporter_base, a_run in ut_run), member procedure print_text(self in out nocopy ut_output_reporter_base, a_text varchar2), - + member procedure print_text_lines(self in out nocopy ut_output_reporter_base, a_text_lines ut_varchar2_rows), member procedure print_clob(self in out nocopy ut_output_reporter_base, a_clob clob), final member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_varchar2_rows pipelined, diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 2528c04e7..d70357462 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -326,7 +326,51 @@ create or replace package body ut_utils is end if; end append_to_list; -procedure append_to_clob(a_src_clob in out nocopy clob, a_clob_table t_clob_tab, a_delimiter varchar2:= chr(10)) is + procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_items ut_varchar2_rows) is + begin + if a_items is not null then + if a_list is null then + a_list := ut_varchar2_rows(); + end if; + for i in 1 .. a_items.count loop + a_list.extend; + a_list(a_list.last) := a_items(i); + end loop; + end if; + end; + + procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_item clob) is + begin + append_to_list( + a_list, + convert_collection( + clob_to_table( a_item, ut_utils.gc_max_storage_varchar2_len ) + ) + ); + end; + + procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_item varchar2) is + l_items ut_varchar2_rows; + begin + if a_item is not null then + if a_list is null then + a_list := ut_varchar2_rows(); + end if; + if length(a_item) > gc_max_storage_varchar2_len then + append_to_list( + a_list, + ut_utils.convert_collection( + ut_utils.clob_to_table( a_item, gc_max_storage_varchar2_len ) + ) + ); + else + a_list.extend; + a_list(a_list.last) := a_item; + end if; + end if; + end append_to_list; + + procedure append_to_clob(a_src_clob in out nocopy clob, a_clob_table t_clob_tab, a_delimiter varchar2:= chr(10)) is begin if a_clob_table is not null and cardinality(a_clob_table) > 0 then if a_src_clob is null then @@ -522,7 +566,7 @@ procedure append_to_clob(a_src_clob in out nocopy clob, a_clob_table t_clob_tab, ||'?>'; end; - function trim_list_elements(a_list IN ut_varchar2_list, a_regexp_to_trim in varchar2 default '[:space:]') return ut_varchar2_list is + function trim_list_elements(a_list ut_varchar2_list, a_regexp_to_trim varchar2 default '[:space:]') return ut_varchar2_list is l_trimmed_list ut_varchar2_list; l_index integer; begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 60f189a66..2a892c1e9 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -247,6 +247,21 @@ create or replace package ut_utils authid definer is */ procedure append_to_list(a_list in out nocopy ut_varchar2_list, a_item varchar2); + /** + * Append a item to the end of ut_varchar2_rows + */ + procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_item varchar2); + + /** + * Append a item to the end of ut_varchar2_rows + */ + procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_item clob); + + /** + * Append a list of items to the end of ut_varchar2_rows + */ + procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_items ut_varchar2_rows); + procedure append_to_clob(a_src_clob in out nocopy clob, a_clob_table t_clob_tab, a_delimiter varchar2 := chr(10)); procedure append_to_clob(a_src_clob in out nocopy clob, a_new_data clob); diff --git a/source/reporters/ut_coverage_cobertura_reporter.tpb b/source/reporters/ut_coverage_cobertura_reporter.tpb index 0d702dbbd..18221e3d9 100644 --- a/source/reporters/ut_coverage_cobertura_reporter.tpb +++ b/source/reporters/ut_coverage_cobertura_reporter.tpb @@ -39,8 +39,7 @@ create or replace type body ut_coverage_cobertura_reporter is l_line_no := a_unit_coverage.lines.first; if l_line_no is null then for i in 1 .. a_unit_coverage.total_lines loop - l_file_part := ''||chr(10); - ut_utils.append_to_clob(l_result, l_file_part); + ut_utils.append_to_clob(l_result, ''); end loop; else while l_line_no is not null loop @@ -68,71 +67,75 @@ create or replace type body ut_coverage_cobertura_reporter is function get_coverage_xml( a_coverage_data ut_coverage.t_coverage, a_run ut_run - ) return clob is + ) return ut_varchar2_rows is l_file_part varchar2(32767); - l_result clob; + l_result ut_varchar2_rows := ut_varchar2_rows(); l_unit ut_coverage.t_full_name; l_obj_name ut_coverage.t_object_name; - c_coverage_def constant varchar2(200) := ''||chr(10); - c_file_footer constant varchar2(30) := ''||chr(10); + c_coverage_def constant varchar2(200) := ''; + c_file_footer constant varchar2(30) := ''; c_coverage_footer constant varchar2(30) := ''; - c_sources_footer constant varchar2(30) := ''||chr(10); - c_packages_footer constant varchar2(30) := ''||chr(10); - c_package_footer constant varchar2(30) := ''||chr(10); - c_class_footer constant varchar2(30) := ''||chr(10); - c_lines_footer constant varchar2(30) := ''||chr(10); + c_sources_footer constant varchar2(30) := ''; + c_packages_footer constant varchar2(30) := ''; + c_package_footer constant varchar2(30) := ''; + c_class_footer constant varchar2(30) := ''; + c_lines_footer constant varchar2(30) := ''; l_epoch varchar2(50) := (sysdate - to_date('01-01-1970 00:00:00', 'dd-mm-yyyy hh24:mi:ss')) * 24 * 60 * 60; begin - dbms_lob.createtemporary(l_result,true); - - ut_utils.append_to_clob(l_result, ut_utils.get_xml_header(a_run.client_character_set)||chr(10)); - ut_utils.append_to_clob(l_result, c_coverage_def); + ut_utils.append_to_list( l_result, ut_utils.get_xml_header(a_run.client_character_set) ); + ut_utils.append_to_list( l_result, c_coverage_def ); --write header - l_file_part:= ''; - ut_utils.append_to_clob(l_result, l_file_part); + ut_utils.append_to_list( + l_result, + '' + ); --Write sources l_unit := a_coverage_data.objects.first; - l_file_part := ''||CHR(10); - ut_utils.append_to_clob(l_result, l_file_part); + ut_utils.append_to_list( l_result, '' ); while l_unit is not null loop - l_file_part := ''||dbms_xmlgen.convert(l_unit)||''||chr(10); - ut_utils.append_to_clob(l_result, l_file_part); + ut_utils.append_to_list(l_result, ''||dbms_xmlgen.convert(l_unit)||''); l_unit := a_coverage_data.objects.next(l_unit); end loop; - ut_utils.append_to_clob(l_result, c_sources_footer); + ut_utils.append_to_list(l_result, c_sources_footer); --write packages l_unit := a_coverage_data.objects.first; - l_file_part := ''||CHR(10); - ut_utils.append_to_clob(l_result, l_file_part); + ut_utils.append_to_list(l_result, ''); while l_unit is not null loop l_obj_name := a_coverage_data.objects(l_unit).name; - l_file_part := ''||CHR(10); - ut_utils.append_to_clob(l_result, l_file_part); + ut_utils.append_to_list( + l_result, + '' + ); - l_file_part := ''||CHR(10); - ut_utils.append_to_clob(l_result, l_file_part); + ut_utils.append_to_list( + l_result, + '' + ); - l_file_part := ''||CHR(10); - ut_utils.append_to_clob(l_result, l_file_part); - - dbms_lob.append(l_result,get_lines_xml(a_coverage_data.objects(l_unit))); + ut_utils.append_to_list(l_result, ''); + + ut_utils.append_to_list( l_result, get_lines_xml(a_coverage_data.objects(l_unit)) ); - ut_utils.append_to_clob(l_result, c_lines_footer); - ut_utils.append_to_clob(l_result, c_class_footer); - ut_utils.append_to_clob(l_result, c_package_footer); + ut_utils.append_to_list(l_result, c_lines_footer); + ut_utils.append_to_list(l_result, c_class_footer); + ut_utils.append_to_list(l_result, c_package_footer); l_unit := a_coverage_data.objects.next(l_unit); end loop; - ut_utils.append_to_clob(l_result, c_packages_footer); - ut_utils.append_to_clob(l_result, c_coverage_footer); + ut_utils.append_to_list(l_result, c_packages_footer); + ut_utils.append_to_list(l_result, c_coverage_footer); return l_result; end; begin @@ -140,7 +143,7 @@ create or replace type body ut_coverage_cobertura_reporter is l_coverage_data := ut_coverage.get_coverage_data(a_run.coverage_options); - self.print_clob( get_coverage_xml( l_coverage_data, a_run ) ); + self.print_text_lines( get_coverage_xml( l_coverage_data, a_run ) ); (self as ut_reporter_base).after_calling_run(a_run); end; diff --git a/source/reporters/ut_coverage_html_reporter.tpb b/source/reporters/ut_coverage_html_reporter.tpb index a6b5b4517..77d4b46ff 100644 --- a/source/reporters/ut_coverage_html_reporter.tpb +++ b/source/reporters/ut_coverage_html_reporter.tpb @@ -29,13 +29,12 @@ create or replace type body ut_coverage_html_reporter is end; overriding member procedure after_calling_run(self in out nocopy ut_coverage_html_reporter, a_run in ut_run) as - l_report_lines ut_varchar2_list; l_coverage_data ut_coverage.t_coverage; begin ut_coverage.coverage_stop(); l_coverage_data := ut_coverage.get_coverage_data(a_run.coverage_options); - self.print_clob( + self.print_text_lines( ut_coverage_report_html_helper.get_index( a_coverage_data => l_coverage_data, a_assets_path => self.assets_path, diff --git a/source/reporters/ut_coverage_report_html_helper.pkb b/source/reporters/ut_coverage_report_html_helper.pkb index 725a232f2..3ab0b1fb6 100644 --- a/source/reporters/ut_coverage_report_html_helper.pkb +++ b/source/reporters/ut_coverage_report_html_helper.pkb @@ -101,11 +101,12 @@ create or replace package body ut_coverage_report_html_helper is -function get_details_file_content(a_object_id varchar2, a_unit ut_object_name, a_unit_coverage ut_coverage.t_unit_coverage) - return clob is - l_source_code ut_varchar2_list; - l_result clob; - + function get_details_file_content( + a_object_id varchar2, + a_unit ut_object_name, + a_unit_coverage ut_coverage.t_unit_coverage + ) return ut_varchar2_rows is + function get_block_file_attributes(a_coverage_unit ut_coverage.t_unit_coverage) return varchar2 is l_result varchar2(32767); begin @@ -129,15 +130,14 @@ function get_details_file_content(a_object_id varchar2, a_unit ut_object_name, a end; function build_details_file_content(a_object_id varchar2, a_object_full_name varchar2, a_source_code ut_varchar2_list, a_coverage_unit ut_coverage.t_unit_coverage) - return clob is - l_file_part varchar2(32767); - l_result clob; - l_coverage_pct number(5, 2); + return ut_varchar2_rows is + l_file_part varchar2(32767); + l_result ut_varchar2_rows := ut_varchar2_rows(); + l_coverage_pct number(5, 2); l_coverage_block_pct number(5, 2); - l_hits varchar2(30); - l_blocks varchar2(30); + l_hits varchar2(30); + l_blocks varchar2(30); begin - dbms_lob.createtemporary(l_result, true); l_coverage_pct := coverage_pct(a_coverage_unit.covered_lines, a_coverage_unit.uncovered_lines); @@ -145,7 +145,7 @@ function get_details_file_content(a_object_id varchar2, a_unit ut_object_name, a dbms_xmlgen.convert(a_object_full_name) || '

' || l_coverage_pct || ' % lines covered

' ||get_common_file_attributes(a_coverage_unit) ||'
    ';
-      ut_utils.append_to_clob(l_result, l_file_part);
+      ut_utils.append_to_list(l_result, l_file_part);
     
       for line_no in 1 .. a_source_code.count loop
         if not a_coverage_unit.lines.exists(line_no) then
@@ -191,22 +191,20 @@ function get_details_file_content(a_object_id varchar2, a_unit ut_object_name, a
               ' || (dbms_xmlgen.convert(a_source_code(line_no))) ||
                          '';
         end if;
-        ut_utils.append_to_clob(l_result, l_file_part);
+        ut_utils.append_to_list(l_result, l_file_part);
       end loop;
     
       l_file_part := '
'; - ut_utils.append_to_clob(l_result, l_file_part); + ut_utils.append_to_list(l_result, l_file_part); return l_result; end; begin - l_source_code := ut_coverage_helper.get_tmp_table_object_lines(a_unit.owner, a_unit.name); - dbms_lob.createtemporary(l_result, true); - l_result := build_details_file_content(a_object_id - ,a_unit.identity - ,l_source_code - ,a_unit_coverage - ); - return l_result; + return build_details_file_content( + a_object_id, + a_unit.identity, + ut_coverage_helper.get_tmp_table_object_lines(a_unit.owner, a_unit.name), + a_unit_coverage + ); end; function get_block_list_attributes(a_coverage_unit ut_coverage.t_coverage) return varchar2 is @@ -220,20 +218,18 @@ function get_details_file_content(a_object_id varchar2, a_unit ut_object_name, a return l_result; end; - function file_list(a_title varchar2, a_coverage ut_coverage.t_coverage) return clob is + function file_list(a_title varchar2, a_coverage ut_coverage.t_coverage) return ut_varchar2_rows is l_file_part varchar2(32767); l_title varchar2(100) := 'All files'; l_coverage_pct number(5, 2); l_coverage_block_pct number(5, 2); - l_result clob; + l_result ut_varchar2_rows; l_id varchar2(50) := object_id(a_title); l_unit_coverage ut_coverage.t_unit_coverage; l_unit ut_coverage.t_object_name; begin l_coverage_pct := coverage_pct(a_coverage.covered_lines, a_coverage.uncovered_lines); - dbms_lob.createtemporary(l_result, true); - l_file_part := '
' || '

' || l_title || '' || ' (' || l_coverage_pct || '%' || ' lines covered'|| @@ -251,7 +247,7 @@ function get_details_file_content(a_object_id varchar2, a_unit ut_object_name, a 'File% coveredLinesRelevant LinesLines coveredLines missed' ||'Avg. Hits / Line ' || ''; - ut_utils.append_to_clob(l_result, l_file_part); + ut_utils.append_to_list( l_result, l_file_part ); l_unit := a_coverage.objects.first; loop exit when l_unit is null; @@ -266,11 +262,11 @@ function get_details_file_content(a_object_id varchar2, a_unit ut_object_name, a '' || to_char(executions_per_line(l_unit_coverage.executions ,l_unit_coverage.uncovered_lines + l_unit_coverage.covered_lines)) || ''; - ut_utils.append_to_clob(l_result, l_file_part); + ut_utils.append_to_list( l_result, l_file_part ); l_unit := a_coverage.objects.next(l_unit); end loop; l_file_part := '

'; - ut_utils.append_to_clob(l_result, l_file_part); + ut_utils.append_to_list( l_result, l_file_part ); return l_result; end; @@ -283,10 +279,10 @@ function get_details_file_content(a_object_id varchar2, a_unit ut_object_name, a a_project_name varchar2 := null, a_command_line varchar2 := null, a_charset varchar2 := null - ) return clob is + ) return ut_varchar2_rows is l_file_part varchar2(32767); - l_result clob; + l_result ut_varchar2_rows := ut_varchar2_rows(); l_title varchar2(250); l_coverage_pct number(5, 2); l_time_str varchar2(50); @@ -302,8 +298,6 @@ function get_details_file_content(a_object_id varchar2, a_unit ut_object_name, a when a_command_line is not null then '
using ' || dbms_xmlgen.convert(a_command_line) end; - dbms_lob.createtemporary(l_result, true); - l_title := case when a_project_name is null then 'Code coverage' @@ -323,32 +317,35 @@ function get_details_file_content(a_object_id varchar2, a_unit ut_object_name, a ''; - ut_utils.append_to_clob(l_result, l_file_part); + ut_utils.append_to_list(l_result, l_file_part); return l_result; end; diff --git a/source/reporters/ut_coverage_report_html_helper.pks b/source/reporters/ut_coverage_report_html_helper.pks index d140588ad..bc4d025f3 100644 --- a/source/reporters/ut_coverage_report_html_helper.pks +++ b/source/reporters/ut_coverage_report_html_helper.pks @@ -37,7 +37,7 @@ create or replace package ut_coverage_report_html_helper authid current_user is a_project_name varchar2 := null, a_command_line varchar2 := null, a_charset varchar2 := null - ) return clob; + ) return ut_varchar2_rows; end; / diff --git a/source/reporters/ut_coverage_sonar_reporter.tpb b/source/reporters/ut_coverage_sonar_reporter.tpb index 249736f92..fcc213665 100644 --- a/source/reporters/ut_coverage_sonar_reporter.tpb +++ b/source/reporters/ut_coverage_sonar_reporter.tpb @@ -26,73 +26,72 @@ create or replace type body ut_coverage_sonar_reporter is overriding member procedure after_calling_run(self in out nocopy ut_coverage_sonar_reporter, a_run in ut_run) as - l_report_lines ut_varchar2_list; - l_coverage_data ut_coverage.t_coverage; - function get_lines_xml(a_unit_coverage ut_coverage.t_unit_coverage) return clob is + + function get_lines_xml(a_unit_coverage ut_coverage.t_unit_coverage) return ut_varchar2_rows is l_file_part varchar2(32767); - l_result clob; + l_result ut_varchar2_rows := ut_varchar2_rows(); l_line_no binary_integer; begin - dbms_lob.createtemporary(l_result, true); l_line_no := a_unit_coverage.lines.first; if l_line_no is null then for i in 1 .. a_unit_coverage.total_lines loop - l_file_part := ''||chr(10); - ut_utils.append_to_clob(l_result, l_file_part); + ut_utils.append_to_list(l_result, ''); end loop; else while l_line_no is not null loop if a_unit_coverage.lines(l_line_no).executions = 0 then - l_file_part := ''||chr(10); + l_file_part := ''; else l_file_part := ''||chr(10); + l_file_part := l_file_part ||'/>'; end if; - ut_utils.append_to_clob(l_result, l_file_part); + ut_utils.append_to_list(l_result, l_file_part); l_line_no := a_unit_coverage.lines.next(l_line_no); end loop; end if; return l_result; end; + function get_coverage_xml( a_coverage_data ut_coverage.t_coverage, a_run ut_run - ) return clob is - l_file_part varchar2(32767); - l_result clob; + ) return ut_varchar2_rows is + l_result ut_varchar2_rows := ut_varchar2_rows(); l_unit ut_coverage.t_full_name; - c_coverage_header constant varchar2(30) := ''||chr(10); - c_file_footer constant varchar2(30) := ''||chr(10); + c_coverage_header constant varchar2(30) := ''; + c_file_footer constant varchar2(30) := ''; c_coverage_footer constant varchar2(30) := ''; - begin - dbms_lob.createtemporary(l_result,true); + begin - ut_utils.append_to_clob(l_result, ut_utils.get_xml_header(a_run.client_character_set)||chr(10)); - ut_utils.append_to_clob(l_result, c_coverage_header); - l_unit := a_coverage_data.objects.first; - while l_unit is not null loop - l_file_part := ''||chr(10); - ut_utils.append_to_clob(l_result, l_file_part); + ut_utils.append_to_list(l_result, ut_utils.get_xml_header(a_run.client_character_set)); + ut_utils.append_to_list(l_result, c_coverage_header); + l_unit := a_coverage_data.objects.first; + while l_unit is not null loop + ut_utils.append_to_list(l_result, ''); - dbms_lob.append(l_result,get_lines_xml(a_coverage_data.objects(l_unit))); + ut_utils.append_to_list(l_result,get_lines_xml(a_coverage_data.objects(l_unit))); - ut_utils.append_to_clob(l_result, c_file_footer); + ut_utils.append_to_list(l_result, c_file_footer); - l_unit := a_coverage_data.objects.next(l_unit); - end loop; - ut_utils.append_to_clob(l_result, c_coverage_footer); - return l_result; - end; + l_unit := a_coverage_data.objects.next(l_unit); + end loop; + ut_utils.append_to_list(l_result, c_coverage_footer); + return l_result; + end; + begin ut_coverage.coverage_stop(); - l_coverage_data := ut_coverage.get_coverage_data(a_run.coverage_options); - - self.print_clob( get_coverage_xml( l_coverage_data, a_run ) ); + self.print_text_lines( + get_coverage_xml( + ut_coverage.get_coverage_data(a_run.coverage_options), + a_run + ) + ); end; overriding member function get_description return varchar2 as diff --git a/source/reporters/ut_coveralls_reporter.tpb b/source/reporters/ut_coveralls_reporter.tpb index 3681147f3..8be96715f 100644 --- a/source/reporters/ut_coveralls_reporter.tpb +++ b/source/reporters/ut_coveralls_reporter.tpb @@ -25,22 +25,19 @@ create or replace type body ut_coveralls_reporter is end; overriding member procedure after_calling_run(self in out nocopy ut_coveralls_reporter, a_run in ut_run) as - l_report_lines ut_varchar2_list; - l_coverage_data ut_coverage.t_coverage; - function get_lines_json(a_unit_coverage ut_coverage.t_unit_coverage) return clob is + function get_lines_json(a_unit_coverage ut_coverage.t_unit_coverage) return ut_varchar2_rows is l_file_part varchar2(32767); - l_result clob; + l_result ut_varchar2_rows := ut_varchar2_rows(); l_last_line_no binary_integer; c_coverage_header constant varchar2(30) := '"coverage": ['; c_null constant varchar2(4) := 'null'; begin - dbms_lob.createtemporary(l_result, true); - ut_utils.append_to_clob(l_result, c_coverage_header); + ut_utils.append_to_list(l_result, c_coverage_header); l_last_line_no := a_unit_coverage.lines.last; if l_last_line_no is null then - ut_utils.append_to_clob( + ut_utils.append_to_list( l_result , rpad( to_clob( '0' ), ( a_unit_coverage.total_lines * 3 ) - 2, ','||chr(10)||'0' ) ); @@ -54,48 +51,47 @@ create or replace type body ut_coveralls_reporter is if line_no < l_last_line_no then l_file_part := l_file_part ||','; end if; - ut_utils.append_to_clob(l_result, l_file_part||chr(10)); + ut_utils.append_to_list(l_result, l_file_part); end loop; end if; - ut_utils.append_to_clob(l_result, ']'); + ut_utils.append_to_list(l_result, ']'); return l_result; end; function get_coverage_json( a_coverage_data ut_coverage.t_coverage - ) return clob is + ) return ut_varchar2_rows is l_file_part varchar2(32767); - l_result clob; + l_result ut_varchar2_rows := ut_varchar2_rows(); l_unit ut_coverage.t_full_name; - c_coverage_header constant varchar2(30) := '{"source_files":['||chr(10); - c_coverage_footer constant varchar2(30) := ']}'||chr(10)||chr(10)||chr(10)||chr(10)||' '; - begin - dbms_lob.createtemporary(l_result,true); - - ut_utils.append_to_clob(l_result, c_coverage_header); + c_coverage_header constant varchar2(30) := '{"source_files":['; + c_coverage_footer constant varchar2(30) := ']}'||chr(10)||' '; + begin + ut_utils.append_to_list(l_result, c_coverage_header); l_unit := a_coverage_data.objects.first; while l_unit is not null loop - l_file_part := '{ "name": "'||l_unit||'",'||chr(10); - ut_utils.append_to_clob(l_result, l_file_part); + ut_utils.append_to_list(l_result, '{ "name": "'||l_unit||'",'); - dbms_lob.append(l_result,get_lines_json(a_coverage_data.objects(l_unit))); + ut_utils.append_to_list(l_result,get_lines_json(a_coverage_data.objects(l_unit))); - ut_utils.append_to_clob(l_result, '}'); + ut_utils.append_to_list(l_result, '}'); l_unit := a_coverage_data.objects.next(l_unit); if l_unit is not null then - ut_utils.append_to_clob(l_result, ','||chr(10)); + ut_utils.append_to_list(l_result, ','); end if; end loop; - ut_utils.append_to_clob(l_result, c_coverage_footer); + ut_utils.append_to_list(l_result, c_coverage_footer); return l_result; end; begin ut_coverage.coverage_stop(); - l_coverage_data := ut_coverage.get_coverage_data(a_run.coverage_options); - - self.print_clob( get_coverage_json( l_coverage_data ) ); + self.print_text_lines( + get_coverage_json( + ut_coverage.get_coverage_data(a_run.coverage_options) + ) + ); end; overriding member function get_description return varchar2 as diff --git a/source/reporters/ut_junit_reporter.tpb b/source/reporters/ut_junit_reporter.tpb index 63d256aab..bc88aa8af 100644 --- a/source/reporters/ut_junit_reporter.tpb +++ b/source/reporters/ut_junit_reporter.tpb @@ -35,48 +35,54 @@ create or replace type body ut_junit_reporter is end; procedure print_test_elements(a_test ut_test) is - l_lines ut_varchar2_list; + l_results ut_varchar2_rows := ut_varchar2_rows(); + l_lines ut_varchar2_list; l_output clob; begin - self.print_text(''); + ut_utils.append_to_list( + l_results, + '' + ); if a_test.result = ut_utils.gc_disabled then - self.print_text(''); + ut_utils.append_to_list( l_results, '' ); end if; if a_test.result = ut_utils.gc_error then - self.print_text(''); - self.print_text(c_cddata_tag_start); - self.print_clob(ut_utils.table_to_clob(a_test.get_error_stack_traces())); - self.print_text(c_cddata_tag_end); - self.print_text(''); + ut_utils.append_to_list( l_results, ''); + ut_utils.append_to_list( l_results, c_cddata_tag_start); + ut_utils.append_to_list( l_results, ut_utils.convert_collection(a_test.get_error_stack_traces()) ); + ut_utils.append_to_list( l_results, c_cddata_tag_end); + ut_utils.append_to_list( l_results, ''); elsif a_test.result > ut_utils.gc_success then - self.print_text(''); + ut_utils.append_to_list( l_results, ''); for i in 1 .. a_test.failed_expectations.count loop l_lines := a_test.failed_expectations(i).get_result_lines(); for j in 1 .. l_lines.count loop - self.print_text(dbms_xmlgen.convert(l_lines(j))); + ut_utils.append_to_list( l_results, dbms_xmlgen.convert(l_lines(j)) ); end loop; - self.print_text(dbms_xmlgen.convert(a_test.failed_expectations(i).caller_info)); + ut_utils.append_to_list( l_results, dbms_xmlgen.convert(a_test.failed_expectations(i).caller_info) ); end loop; - self.print_text(''); + ut_utils.append_to_list( l_results, ''); end if; -- TODO - decide if we need/want to use the tag too l_output := a_test.get_serveroutputs(); if l_output is not null then - self.print_text(''); - self.print_text(c_cddata_tag_start); - self.print_clob(l_output); - self.print_text(c_cddata_tag_end); - self.print_text(''); + ut_utils.append_to_list( l_results, ''); + ut_utils.append_to_list( l_results, c_cddata_tag_start); + ut_utils.append_to_list( l_results, l_output); + ut_utils.append_to_list( l_results, c_cddata_tag_end ); + ut_utils.append_to_list( l_results, '' ); else - self.print_text(''); + ut_utils.append_to_list( l_results, ''); end if; - self.print_text(''); - self.print_text(''); + ut_utils.append_to_list( l_results, ''); + ut_utils.append_to_list( l_results, ''); + + self.print_text_lines(l_results); end; procedure print_suite_elements(a_suite ut_logical_suite, a_suite_id in out nocopy integer) is @@ -84,6 +90,7 @@ create or replace type body ut_junit_reporter is a_suite.results_count.failure_count + a_suite.results_count.errored_count; l_suite ut_suite; l_tests ut_suite_items := ut_suite_items(); + l_results ut_varchar2_rows := ut_varchar2_rows(); l_data clob; l_errors ut_varchar2_list; begin @@ -111,28 +118,31 @@ create or replace type body ut_junit_reporter is l_data := l_suite.get_serveroutputs(); if l_data is not null and l_data != empty_clob() then - self.print_text(''); - self.print_text(c_cddata_tag_start); - self.print_clob(l_data); - self.print_text(c_cddata_tag_end); - self.print_text(''); + ut_utils.append_to_list( l_results, ''); + ut_utils.append_to_list( l_results, c_cddata_tag_start); + ut_utils.append_to_list( l_results, l_data); + ut_utils.append_to_list( l_results, c_cddata_tag_end); + ut_utils.append_to_list( l_results, ''); else - self.print_text(''); + ut_utils.append_to_list( l_results, ''); end if; l_errors := l_suite.get_error_stack_traces(); if l_errors is not empty then - self.print_text(''); - self.print_text(c_cddata_tag_start); - self.print_clob(ut_utils.table_to_clob(l_errors)); - self.print_text(c_cddata_tag_end); - self.print_text(''); + ut_utils.append_to_list( l_results, ''); + ut_utils.append_to_list( l_results, c_cddata_tag_start); + ut_utils.append_to_list( l_results, ut_utils.table_to_clob(l_errors)); + ut_utils.append_to_list( l_results, c_cddata_tag_end); + ut_utils.append_to_list( l_results, ''); else - self.print_text(''); + ut_utils.append_to_list( l_results, ''); end if; end if; - self.print_text(''); + ut_utils.append_to_list( l_results, ''); + + self.print_text_lines(l_results); end; + begin l_suite_id := 0; self.print_text(ut_utils.get_xml_header(a_run.client_character_set)); diff --git a/source/reporters/ut_sonar_test_reporter.tpb b/source/reporters/ut_sonar_test_reporter.tpb index 913ae8b50..1da349d83 100644 --- a/source/reporters/ut_sonar_test_reporter.tpb +++ b/source/reporters/ut_sonar_test_reporter.tpb @@ -43,28 +43,31 @@ create or replace type body ut_sonar_test_reporter is end; procedure print_test_results(a_test ut_test) is - l_lines ut_varchar2_list; + l_results ut_varchar2_rows := ut_varchar2_rows(); + l_lines ut_varchar2_list; begin - self.print_text(''); + ut_utils.append_to_list( l_results, ''); if a_test.result = ut_utils.gc_disabled then - self.print_text(''); + ut_utils.append_to_list( l_results, ''); elsif a_test.result = ut_utils.gc_error then - self.print_text(''); - self.print_text(''); - self.print_text(''); + ut_utils.append_to_list( l_results, ''); + ut_utils.append_to_list( l_results, ''); + ut_utils.append_to_list( l_results, ''); elsif a_test.result > ut_utils.gc_success then - self.print_text(''); + ut_utils.append_to_list( l_results, ''); for i in 1 .. a_test.failed_expectations.count loop l_lines := a_test.failed_expectations(i).get_result_lines(); for i in 1 .. l_lines.count loop - self.print_text(dbms_xmlgen.convert(l_lines(i))); + ut_utils.append_to_list( l_results, dbms_xmlgen.convert(l_lines(i))); end loop; end loop; - self.print_text(''); + ut_utils.append_to_list( l_results, ''); end if; - self.print_text(''); + ut_utils.append_to_list( l_results, ''); + + self.print_text_lines(l_results); end; procedure print_suite_results(a_suite ut_logical_suite, a_file_mappings ut_file_mappings) is diff --git a/source/reporters/ut_teamcity_reporter.tpb b/source/reporters/ut_teamcity_reporter.tpb index 086775254..a8a7ad45b 100644 --- a/source/reporters/ut_teamcity_reporter.tpb +++ b/source/reporters/ut_teamcity_reporter.tpb @@ -57,6 +57,7 @@ create or replace type body ut_teamcity_reporter is end; overriding member procedure after_calling_test(self in out nocopy ut_teamcity_reporter, a_test in ut_test) is + l_results ut_varchar2_rows := ut_varchar2_rows(); l_test_full_name varchar2(4000); l_std_err_msg varchar2(32767); begin @@ -64,10 +65,10 @@ create or replace type body ut_teamcity_reporter is lower(a_test.item.procedure_name); if a_test.result = ut_utils.gc_disabled then - self.print_text(ut_teamcity_reporter_helper.test_disabled(l_test_full_name)); + ut_utils.append_to_list( l_results, ut_teamcity_reporter_helper.test_disabled(l_test_full_name)); else - self.print_clob(a_test.get_serveroutputs()); + ut_utils.append_to_list( l_results, a_test.get_serveroutputs()); if a_test.result = ut_utils.gc_error then for i in 1 .. a_test.before_each_list.count loop @@ -98,27 +99,52 @@ create or replace type body ut_teamcity_reporter is end if; end loop; - self.print_text(ut_teamcity_reporter_helper.test_std_err(a_test_name => l_test_full_name - ,a_out => trim(l_std_err_msg))); - self.print_text(ut_teamcity_reporter_helper.test_failed(a_test_name => l_test_full_name - ,a_msg => 'Error occured' - ,a_details => trim(l_std_err_msg) || case when a_test.failed_expectations is not null and a_test.failed_expectations.count>0 then a_test.failed_expectations(1) - .message end)); + ut_utils.append_to_list( + l_results, + ut_teamcity_reporter_helper.test_std_err( + a_test_name => l_test_full_name, + a_out => trim(l_std_err_msg) + ) + ); + ut_utils.append_to_list( + l_results, + ut_teamcity_reporter_helper.test_failed( + a_test_name => l_test_full_name, + a_msg => 'Error occured', + a_details => + trim(l_std_err_msg) + || case when a_test.failed_expectations is not null + and a_test.failed_expectations.count>0 + then a_test.failed_expectations(1).message end + ) + ); elsif a_test.failed_expectations is not null and a_test.failed_expectations.count > 0 then -- Teamcity supports only a single failure message - self.print_text(ut_teamcity_reporter_helper.test_failed(a_test_name => l_test_full_name - ,a_msg => a_test.failed_expectations(a_test.failed_expectations.first).description - ,a_details => a_test.failed_expectations(a_test.failed_expectations.first).message )); + ut_utils.append_to_list( + l_results, + ut_teamcity_reporter_helper.test_failed( + a_test_name => l_test_full_name, + a_msg => a_test.failed_expectations(a_test.failed_expectations.first).description, + a_details => a_test.failed_expectations(a_test.failed_expectations.first).message ) + ); elsif a_test.result = ut_utils.gc_failure then - self.print_text(ut_teamcity_reporter_helper.test_failed(a_test_name => l_test_full_name - ,a_msg => 'Test failed')); + ut_utils.append_to_list( + l_results, + ut_teamcity_reporter_helper.test_failed( + a_test_name => l_test_full_name, + a_msg => 'Test failed' + ) + ); end if; - self.print_text(ut_teamcity_reporter_helper.test_finished(l_test_full_name, trunc(a_test.execution_time * 1e3))); + ut_utils.append_to_list( + l_results, + ut_teamcity_reporter_helper.test_finished(l_test_full_name, trunc(a_test.execution_time * 1e3)) + ); end if; - + self.print_text_lines(l_results); end; overriding member function get_description return varchar2 as diff --git a/source/reporters/ut_tfs_junit_reporter.tpb b/source/reporters/ut_tfs_junit_reporter.tpb index d3edd1208..5f3770b23 100644 --- a/source/reporters/ut_tfs_junit_reporter.tpb +++ b/source/reporters/ut_tfs_junit_reporter.tpb @@ -54,8 +54,8 @@ create or replace type body ut_tfs_junit_reporter is end; procedure print_test_results(a_test ut_test) is - l_lines ut_varchar2_list; - l_output clob; + l_results ut_varchar2_rows := ut_varchar2_rows(); + l_lines ut_varchar2_list; begin self.print_text(''); @@ -68,30 +68,33 @@ create or replace type body ut_tfs_junit_reporter is */ if a_test.result = ut_utils.gc_error then - self.print_text(''); - self.print_text(''); - self.print_text(''); + ut_utils.append_to_list( l_results, ''); + ut_utils.append_to_list( l_results, ''); + ut_utils.append_to_list( l_results, ''); -- Do not count error as failure elsif a_test.result = ut_utils.gc_failure then - self.print_text(''); + ut_utils.append_to_list( l_results, ''); for i in 1 .. a_test.failed_expectations.count loop l_lines := a_test.failed_expectations(i).get_result_lines(); for j in 1 .. l_lines.count loop - self.print_text(dbms_xmlgen.convert(l_lines(j))); + ut_utils.append_to_list( l_results, dbms_xmlgen.convert(l_lines(j))); end loop; - self.print_text(dbms_xmlgen.convert(a_test.failed_expectations(i).caller_info)); + ut_utils.append_to_list( l_results, dbms_xmlgen.convert(a_test.failed_expectations(i).caller_info)); end loop; - self.print_text(''); + ut_utils.append_to_list( l_results, ''); end if; - self.print_text(''); + ut_utils.append_to_list( l_results, ''); + + self.print_text_lines(l_results); end; procedure print_suite_results(a_suite ut_logical_suite, a_suite_id in out nocopy integer) is l_tests_count integer := a_suite.results_count.disabled_count + a_suite.results_count.success_count + a_suite.results_count.failure_count + a_suite.results_count.errored_count; + l_results ut_varchar2_rows := ut_varchar2_rows(); l_suite ut_suite; l_outputs clob; l_errors ut_varchar2_list; @@ -116,26 +119,28 @@ create or replace type body ut_tfs_junit_reporter is l_suite := treat(a_suite as ut_suite); l_outputs := l_suite.get_serveroutputs(); if l_outputs is not null and l_outputs != empty_clob() then - self.print_text(''); - self.print_text(''); - self.print_text(''); + ut_utils.append_to_list( l_results, ''); + ut_utils.append_to_list( l_results, ''); + ut_utils.append_to_list( l_results, ''); else - self.print_text(''); + ut_utils.append_to_list( l_results, ''); end if; l_errors := l_suite.get_error_stack_traces(); if l_errors is not empty then - self.print_text(''); - self.print_text(''); - self.print_text(''); + ut_utils.append_to_list( l_results, ''); + ut_utils.append_to_list( l_results, ''); + ut_utils.append_to_list( l_results, ''); else - self.print_text(''); + ut_utils.append_to_list( l_results, ''); end if; - self.print_text(''); + ut_utils.append_to_list( l_results, ''); + + self.print_text_lines(l_results); end if; end; diff --git a/test/core/reporters/test_coverage/test_cov_cobertura_reporter.pkb b/test/core/reporters/test_coverage/test_cov_cobertura_reporter.pkb index e89fbd283..cabf64e90 100644 --- a/test/core/reporters/test_coverage/test_cov_cobertura_reporter.pkb +++ b/test/core/reporters/test_coverage/test_cov_cobertura_reporter.pkb @@ -7,9 +7,10 @@ create or replace package body test_cov_cobertura_reporter is begin --Arrange l_expected := - ' + q'[ - + + test/ut3.dummy_coverage.pkb @@ -23,7 +24,7 @@ create or replace package body test_cov_cobertura_reporter is -'; +]'; --Act select * bulk collect into l_results diff --git a/test/core/reporters/test_coverage/test_coveralls_reporter.pkb b/test/core/reporters/test_coverage/test_coveralls_reporter.pkb index 3b6b88346..774e796a0 100644 --- a/test/core/reporters/test_coverage/test_coveralls_reporter.pkb +++ b/test/core/reporters/test_coverage/test_coveralls_reporter.pkb @@ -8,14 +8,17 @@ create or replace package body test_coveralls_reporter is --Arrange l_expected := q'[{"source_files":[ { "name": "test/ut3.dummy_coverage.pkb", -"coverage": [null, +"coverage": [ +null, null, null, 1, 0, null, 1 -]}]} +] +} +]} ]'; --Act select * @@ -42,7 +45,8 @@ null, --Arrange l_expected := q'[{"source_files":[ { "name": "ut3.dummy_coverage", -"coverage": [0, +"coverage": [ +0, 0, 0, 0, @@ -51,7 +55,10 @@ null, 0, 0, 0, -0]}]} +0 +] +} +]} ]'; test_coverage.cleanup_dummy_coverage; From 9ea805b61eb7392deed411da6b04fe5fdcc4ccd8 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 12 Nov 2018 01:37:48 +0000 Subject: [PATCH 0088/1096] Increased fetch size for coverage sources tmp seeding. --- source/core/coverage/ut_coverage.pkb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/coverage/ut_coverage.pkb b/source/core/coverage/ut_coverage.pkb index 64d625d84..06a738f0c 100644 --- a/source/core/coverage/ut_coverage.pkb +++ b/source/core/coverage/ut_coverage.pkb @@ -135,7 +135,7 @@ create or replace package body ut_coverage is l_cov_sources_crsr := get_cov_sources_cursor(a_coverage_options,a_sql); loop - fetch l_cov_sources_crsr bulk collect into l_cov_sources_data limit 1000; + fetch l_cov_sources_crsr bulk collect into l_cov_sources_data limit 10000; ut_coverage_helper.insert_into_tmp_table(l_cov_sources_data); From 5b46ab0a3374659b4e07167d6544be96ca6d74c4 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Mon, 12 Nov 2018 06:55:46 +0000 Subject: [PATCH 0089/1096] Updated code for tests. --- .../data_values/ut_compound_data_helper.pkb | 38 ++++++++++++++----- .../data_values/ut_compound_data_helper.pks | 2 +- .../data_values/ut_compound_data_value.tpb | 2 +- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index ac9c8af78..c75543ef3 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -172,20 +172,20 @@ create or replace package body ut_compound_data_helper is function get_rows_diff_by_sql( a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2, - a_join_by_xpath varchar2 + a_join_by_xpath varchar2, a_unordered boolean ) return tt_row_diffs is l_act_col_filter varchar2(32767); l_exp_col_filter varchar2(32767); l_results tt_row_diffs; - + l_sql varchar2(32767); begin l_act_col_filter := get_columns_row_filter(a_exclude_xpath,a_include_xpath,'ucd','act_item_data'); l_exp_col_filter := get_columns_row_filter(a_exclude_xpath,a_include_xpath,'ucd','exp_item_data'); --TODO: Generate SQL based on input as unorder join should aggregate - execute immediate q'[with exp as ( + l_sql := q'[with exp as ( select exp_item_data, exp_data_id, item_no rn,rownum col_no, nvl2(exp_item_data,ut3.ut_compound_data_helper.get_pk_value(i.join_by,exp_item_data),null) pk_value, s.column_value col, s.column_value.getRootElement() col_name, s.column_value.getclobval() col_val @@ -212,15 +212,31 @@ create or replace package body ut_compound_data_helper is select rn, diff_type, diffed_row, pk_value ,case when diff_type = 'Actual:' then 1 else 2 end rnk ,1 final_order - from ( - select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, pk_value pk_value + from ( ]'; + + if a_unordered then + l_sql := l_sql || q'[select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, pk_value pk_value from (select nvl(exp.rn, act.rn) rn, nvl(exp.pk_value, act.pk_value) pk_value, exp.col exp_item, act.col act_item from exp join act on exp.rn = act.rn and exp.col_name = act.col_name where dbms_lob.compare(exp.col_val, act.col_val) != 0) unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:') - )) - union all + ))]'; + else + l_sql := l_sql || q'[ select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, null pk_value + from + (select nvl(exp.rn, act.rn) rn, + xmlagg(exp.col order by exp.col_no) exp_item, + xmlagg(act.col order by act.col_no) act_item + from exp exp join act act on exp.rn = act.rn and exp.col_name = act.col_name + where dbms_lob.compare(exp.col_val, act.col_val) != 0 + group by exp.rn, act.rn + ) + unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:')) + )]'; + end if; + + l_sql := l_sql || q'[union all select item_no as rn, case when exp_data_id is null then 'Extra:' else 'Missing:' end as diff_type, xmlserialize(content (extract((case when exp_data_id is null then act_item_data else exp_item_data end),'/*/*')) no indent) diffed_row, @@ -233,7 +249,9 @@ create or replace package body ut_compound_data_helper is ) order by final_order, case when final_order = 1 then rn else rnk end, - case when final_order = 1 then rnk else rn end ]' + case when final_order = 1 then rnk else rn end ]'; + + execute immediate l_sql bulk collect into l_results using a_exclude_xpath, a_include_xpath, a_join_by_xpath, a_diff_id, a_expected_dataset_guid, @@ -322,14 +340,14 @@ create or replace package body ut_compound_data_helper is function get_rows_diff( a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2, - a_join_by_xpath varchar2,a_refcursor boolean + a_join_by_xpath varchar2,a_refcursor boolean, a_unordered boolean ) return tt_row_diffs is l_result tt_row_diffs := tt_row_diffs(); begin case when a_refcursor then l_result := get_rows_diff_by_sql(a_expected_dataset_guid, a_actual_dataset_guid, a_diff_id, - a_max_rows, a_exclude_xpath, a_include_xpath ,a_join_by_xpath); + a_max_rows, a_exclude_xpath, a_include_xpath ,a_join_by_xpath, a_unordered); else l_result := get_rows_diff(a_expected_dataset_guid, a_actual_dataset_guid, a_diff_id, a_max_rows, a_exclude_xpath, a_include_xpath); diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 0d7a460a7..046191aa1 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -75,7 +75,7 @@ create or replace package ut_compound_data_helper authid definer is function get_rows_diff( a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2, - a_join_by_xpath varchar2,a_refcursor boolean + a_join_by_xpath varchar2,a_refcursor boolean, a_unordered boolean ) return tt_row_diffs; subtype t_hash is raw(128); diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index cb5d5aa2c..51b2e22cc 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -124,7 +124,7 @@ create or replace type body ut_compound_data_value as if l_diff_row_count > 0 then l_row_diffs := ut_compound_data_helper.get_rows_diff( self.data_id, l_actual.data_id, l_diff_id, c_max_rows, a_exclude_xpath, - a_include_xpath, a_join_by_xpath, a_other is of (ut_data_value_refcursor)); + a_include_xpath, a_join_by_xpath, a_other is of (ut_data_value_refcursor), a_unordered); l_message := chr(10) ||'Rows: [ ' || l_diff_row_count ||' differences' || case when l_diff_row_count > c_max_rows and l_row_diffs.count > 0 then ', showing first '||c_max_rows end From 248bf8c7c4f50195ef33865a657e7bf3904fa596 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 13 Nov 2018 00:56:43 +0000 Subject: [PATCH 0090/1096] Small refactoring. Adding new function to return list of suites and tests. --- source/core/ut_suite_manager.pkb | 215 +++++++++++++++++++++++-------- source/core/ut_suite_manager.pks | 15 +++ 2 files changed, 177 insertions(+), 53 deletions(-) diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 5e296f02e..82376a846 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -149,7 +149,7 @@ create or replace package body ut_suite_manager is return l_results; end; - procedure copy_list_reverse_order( + procedure reverse_list_order( a_list in out nocopy ut_suite_items ) is l_start_idx pls_integer; @@ -277,9 +277,14 @@ create or replace package body ut_suite_manager is end loop; exit when l_rows.count < c_bulk_limit; end loop; - copy_list_reverse_order( a_suites ); + + reverse_list_order( a_suites ); + + for i in 1 .. a_suites.count loop + a_suites( i ).set_rollback_type( a_suites( i ).get_rollback_type ); + end loop; close a_suite_data_cursor; - end; + end reconstruct_from_cache; function get_missing_objects(a_object_owner varchar2) return ut_varchar2_rows is l_rows sys_refcursor; @@ -338,7 +343,7 @@ create or replace package body ut_suite_manager is ( select 1 from all_objects a where a.object_name = c.object_name - and a.object_owner = ']'||upper(a_object_owner)||q'[' + and a.owner = ']'||upper(a_object_owner)||q'[' and a.owner = c.object_owner and a.object_type = 'PACKAGE' )]' end ||q'[ @@ -417,44 +422,91 @@ create or replace package body ut_suite_manager is return l_result; end; - function build_schema_suites( - a_owner_name varchar2, - a_path varchar2 := null, - a_object_name varchar2 := null, - a_procedure_name varchar2 := null - ) return ut_suite_items is + function can_skip_all_objects_scan( + a_owner_name varchar2 + ) return boolean is + begin + return sys_context( 'userenv', 'current_schema' ) = a_owner_name or ut_metadata.is_object_visible( ut_utils.ut_owner ||'.ut_utils' ); + end; + + procedure build_and_cache_suites( + a_owner_name varchar2, + a_annotated_objects sys_refcursor + ) is + l_annotated_objects ut_annotated_objects; + l_suite_items ut_suite_items; + begin + loop + fetch a_annotated_objects bulk collect into l_annotated_objects limit 10; + + for i in 1 .. l_annotated_objects.count loop + ut_suite_builder.create_suite_item_list( l_annotated_objects( i ), l_suite_items ); + ut_suite_cache_manager.save_object_cache( + a_owner_name, + l_annotated_objects( i ).object_name, + l_annotated_objects( i ).parse_time, + l_suite_items + ); + end loop; + exit when a_annotated_objects%notfound; + end loop; + close a_annotated_objects; + + end; + + procedure refresh_cache( + a_owner_name varchar2, + a_annotations_cursor sys_refcursor := null + ) is l_annotations_cursor sys_refcursor; l_suite_cache_time timestamp; - l_skip_all_objects_scan boolean := false; begin l_suite_cache_time := ut_suite_cache_manager.get_schema_parse_time(a_owner_name); - open l_annotations_cursor for - q'[select value(x) - from table( - ]' || ut_utils.ut_owner || q'[.ut_annotation_manager.get_annotated_objects(:a_owner_name, 'PACKAGE', :a_suite_cache_parse_time) - )x ]' - using a_owner_name, l_suite_cache_time; - - -- if current user is the onwer or current user has execute any procedure privilege - if sys_context('userenv','current_schema') = a_owner_name - or ut_metadata.is_object_visible('ut3.ut_utils') - then - l_skip_all_objects_scan := true; + if a_annotations_cursor is not null then + l_annotations_cursor := a_annotations_cursor; + else + open l_annotations_cursor for + q'[select value(x) + from table( + ]' || ut_utils.ut_owner || q'[.ut_annotation_manager.get_annotated_objects( + :a_owner_name, 'PACKAGE', :a_suite_cache_parse_time + ) + )x ]' + using a_owner_name, l_suite_cache_time; end if; - if l_skip_all_objects_scan or ut_metadata.is_object_visible('dba_objects') then + + build_and_cache_suites(a_owner_name, l_annotations_cursor); + + if can_skip_all_objects_scan(a_owner_name) or ut_metadata.is_object_visible( 'dba_objects') then ut_suite_cache_manager.remove_from_cache( a_owner_name, get_missing_objects(a_owner_name) ); end if; - return build_suites_from_annotations( - a_owner_name, - l_annotations_cursor, - a_path, - a_object_name, - a_procedure_name, - l_skip_all_objects_scan - ); end; + function get_suites_for_path( + a_owner_name varchar2, + a_path varchar2 := null, + a_object_name varchar2 := null, + a_procedure_name varchar2 := null + ) return ut_suite_items is + l_suites ut_suite_items; + begin + refresh_cache(a_owner_name); + + reconstruct_from_cache( + l_suites, + get_cached_suite_data( + a_owner_name, + a_path, + a_object_name, + a_procedure_name, + can_skip_all_objects_scan(a_owner_name) + ) + ); + return l_suites; + + end get_suites_for_path; + ----------------------------------------------- ----------------------------------------------- ------------- Public definitions ------------- @@ -468,24 +520,8 @@ create or replace package body ut_suite_manager is a_skip_all_objects boolean := false ) return ut_suite_items is l_suites ut_suite_items; - l_annotated_objects ut_annotated_objects; - l_suite_items ut_suite_items; begin - loop - fetch a_annotated_objects bulk collect into l_annotated_objects limit 10; - - for i in 1 .. l_annotated_objects.count loop - ut_suite_builder.create_suite_item_list( l_annotated_objects( i ), l_suite_items ); - ut_suite_cache_manager.save_object_cache( - a_owner_name, - l_annotated_objects( i ).object_name, - l_annotated_objects( i ).parse_time, - l_suite_items - ); - end loop; - exit when a_annotated_objects%notfound; - end loop; - close a_annotated_objects; + build_and_cache_suites(a_owner_name, a_annotated_objects); reconstruct_from_cache( l_suites, @@ -497,9 +533,6 @@ create or replace package body ut_suite_manager is a_skip_all_objects ) ); - for i in 1 .. l_suites.count loop - l_suites( i ).set_rollback_type( l_suites( i ).get_rollback_type ); - end loop; return l_suites; end; @@ -566,7 +599,7 @@ create or replace package body ut_suite_manager is l_path_items := l_schema_paths(l_schema); for i in 1 .. l_path_items.count loop l_path_item := l_path_items(i); - l_suites := build_schema_suites( + l_suites := get_suites_for_path( upper(l_schema), l_path_item.suite_path, l_path_item.object_name, @@ -599,5 +632,81 @@ create or replace package body ut_suite_manager is return l_objects_to_run; end configure_execution_by_path; + function get_suites_info(a_owner_name varchar2) return tt_suite_items pipelined is + l_cursor sys_refcursor; + l_ut_owner varchar2(250) := ut_utils.ut_owner; + c_bulk_limit constant integer := 100; + l_results tt_suite_items; + begin + refresh_cache(a_owner_name); + + open l_cursor for + q'[with + suite_items as ( + select /*+ cardinality(c 100) */ c.* + from ]'||l_ut_owner||q'[.ut_suite_cache c + where 1 = 1 ]'||case when can_skip_all_objects_scan(a_owner_name) then q'[ + and exists + ( select 1 + from all_objects a + where a.object_name = c.object_name + and a.owner = ']'||upper(a_owner_name)||q'[' + and a.owner = c.object_owner + and a.object_type = 'PACKAGE' + )]' end ||q'[ + and c.object_owner = ']'||upper(a_owner_name)||q'[' + ), + suitepaths as ( + select distinct + substr(path,1,instr(path,'.',-1)-1) as suitepath, + path, + object_owner + from suite_items + where self_type = 'UT_SUITE' + ), + gen as ( + select rownum as pos + from xmltable('1 to 20') + ), + suitepath_part AS ( + select distinct + substr(b.suitepath, 1, instr(b.suitepath || '.', '.', 1, g.pos) -1) as path, + object_owner + from suitepaths b + join gen g + on g.pos <= regexp_count(b.suitepath, '\w+') + ), + logical_suites as ( + select 'UT_LOGICAL_SUITE' as item_type, + p.path, p.object_owner, + upper( substr(p.path, instr( p.path, '.', -1 ) + 1 ) ) as object_name + from suitepath_part p + where p.path + not in (select s.path from suitepaths s) + ), + items as ( + select object_owner, object_name, name as item_name, + description as item_description, self_type as item_type, line_no as item_line_no, + path, disabled_flag + from suite_items + union all + select object_owner, object_name, object_name as item_name, + null as item_description, item_type, null as item_line_no, + s.path, 0 as disabled_flag + from logical_suites s + ) + select c.* + from items c]'; + loop + fetch l_cursor bulk collect into l_results limit c_bulk_limit; + for i in 1 .. l_results.count loop + pipe row (l_results(i)); + end loop; + exit when l_cursor%notfound; + end loop; + close l_cursor; + + end; + end ut_suite_manager; / diff --git a/source/core/ut_suite_manager.pks b/source/core/ut_suite_manager.pks index 22c27fea9..65440b22b 100644 --- a/source/core/ut_suite_manager.pks +++ b/source/core/ut_suite_manager.pks @@ -59,6 +59,21 @@ create or replace package ut_suite_manager authid current_user is a_skip_all_objects boolean := false ) return ut_suite_items; + type t_suite_item_rec is record ( + object_owner varchar2(250), + object_name varchar2(250), + item_name varchar2(250), + item_description varchar2(250), + item_type varchar2(250), + item_line_no varchar2(250), + path varchar2(4000), + disabled_flag integer + ); + + type tt_suite_items is table of t_suite_item_rec; + + function get_suites_info(a_owner_name varchar2) return tt_suite_items pipelined; + end ut_suite_manager; / From c997616408c5479a1e16e99aad24b14f91a86ed2 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Tue, 13 Nov 2018 08:36:00 +0000 Subject: [PATCH 0091/1096] Added cursor info code --- source/core/types/ut_cursor_info.tps | 22 +++ .../data_values/ut_column_info.tpb | 29 ++++ .../data_values/ut_column_info.tps | 25 ++++ .../data_values/ut_column_info_rec.tpb | 131 ++++++++++++++++++ .../data_values/ut_column_info_rec.tps | 28 ++++ .../data_values/ut_column_info_tab.tps | 2 + .../data_values/ut_cursor_info.tpb | 31 +++++ .../data_values/ut_cursor_info.tps | 7 + 8 files changed, 275 insertions(+) create mode 100644 source/core/types/ut_cursor_info.tps create mode 100644 source/expectations/data_values/ut_column_info.tpb create mode 100644 source/expectations/data_values/ut_column_info.tps create mode 100644 source/expectations/data_values/ut_column_info_rec.tpb create mode 100644 source/expectations/data_values/ut_column_info_rec.tps create mode 100644 source/expectations/data_values/ut_column_info_tab.tps create mode 100644 source/expectations/data_values/ut_cursor_info.tpb create mode 100644 source/expectations/data_values/ut_cursor_info.tps diff --git a/source/core/types/ut_cursor_info.tps b/source/core/types/ut_cursor_info.tps new file mode 100644 index 000000000..0577264f0 --- /dev/null +++ b/source/core/types/ut_cursor_info.tps @@ -0,0 +1,22 @@ +create or replace type ut_column_info as object ( + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ +column_name varchar2(100), +xml_valid_name varchar2(100), + +) + diff --git a/source/expectations/data_values/ut_column_info.tpb b/source/expectations/data_values/ut_column_info.tpb new file mode 100644 index 000000000..5e913bf31 --- /dev/null +++ b/source/expectations/data_values/ut_column_info.tpb @@ -0,0 +1,29 @@ +create or replace type body ut_column_info as + member function get_data_type(a_type_code in integer,a_user_defined in boolean) return varchar2 is + begin + return ut_curr_usr_compound_helper.get_column_type(a_type_code,a_user_defined); + end; + + member procedure init(self in out nocopy ut_column_info, + a_col_type binary_integer, + a_col_name varchar2, + a_col_schema_name varchar2, + a_col_type_name varchar2, + a_col_prec integer, + a_col_scale integer, + a_col_len integer, + a_dbms_sql_desc boolean := false) is + begin + self.is_user_defined := 0; + self.column_prec := a_col_prec; + self.column_len := a_col_len; + self.column_scale := a_col_scale; + self.xml_valid_name := '"'||a_col_name||'"'; + self.column_name := a_col_name; + self.column_type := get_data_type(a_col_type,a_dbms_sql_desc); + self.column_schema := a_col_schema_name; + self.is_sql_diffable := ut_utils.boolean_to_int(ut_curr_usr_compound_helper.is_sql_compare_allowed(self.column_type)); + self.is_collection := 0; + end; +end; +/ diff --git a/source/expectations/data_values/ut_column_info.tps b/source/expectations/data_values/ut_column_info.tps new file mode 100644 index 000000000..331ab3d2e --- /dev/null +++ b/source/expectations/data_values/ut_column_info.tps @@ -0,0 +1,25 @@ +create or replace type ut_column_info force authid current_user as object +( + xml_valid_name varchar2(100), + column_name varchar2(100), + column_type varchar2(100), + column_schema varchar2(100), + column_prec integer, + column_len integer, + column_scale integer, + is_sql_diffable number(1, 0), + is_collection number(1, 0), + is_user_defined number(1, 0), + member function get_data_type(a_type_code in integer,a_user_defined in boolean) return varchar2, + member procedure init(self in out nocopy ut_column_info, + a_col_type binary_integer, + a_col_name varchar2, + a_col_schema_name varchar2, + a_col_type_name varchar2, + a_col_prec integer, + a_col_scale integer, + a_col_len integer, + a_dbms_sql_desc boolean := false) +) +not final not instantiable +/ diff --git a/source/expectations/data_values/ut_column_info_rec.tpb b/source/expectations/data_values/ut_column_info_rec.tpb new file mode 100644 index 000000000..19d6ab13a --- /dev/null +++ b/source/expectations/data_values/ut_column_info_rec.tpb @@ -0,0 +1,131 @@ +create or replace type body ut_column_info_rec as + + member function get_anytype_attributes_info(a_anytype anytype) + return ut_column_info_tab is + l_result ut_column_info_tab := ut_column_info_tab(); + l_attribute_typecode pls_integer; + l_aname varchar2(32767); + l_prec pls_integer; + l_scale pls_integer; + l_len pls_integer; + l_csid pls_integer; + l_csfrm pls_integer; + l_attr_elt_type anytype; + + function get_anytype_attribute_count(a_anytype anytype) return pls_integer is + l_attribute_typecode pls_integer; + l_schema_name varchar2(32767); + l_version varchar2(32767); + l_type_name varchar2(32767); + l_attributes pls_integer; + l_prec pls_integer; + l_scale pls_integer; + l_len pls_integer; + l_csid pls_integer; + l_csfrm pls_integer; + begin + l_attribute_typecode := a_anytype.getinfo(prec => l_prec, + scale => l_scale, + len => l_len, + csid => l_csid, + csfrm => l_csfrm, + schema_name => l_schema_name, + type_name => l_type_name, + version => l_version, + numelems => l_attributes); + return l_attributes; + end; + + begin + for i in 1 .. get_anytype_attribute_count(a_anytype) loop + l_attribute_typecode := a_anytype.getattreleminfo(pos => i, --First attribute + prec => l_prec, + scale => l_scale, + len => l_len, + csid => l_csid, + csfrm => l_csfrm, + attr_elt_type => l_attr_elt_type, + aname => l_aname); + + l_result.extend; + l_result(l_result.last) := ut_column_info_rec(l_attribute_typecode, + l_aname, + null, + null, + l_prec, + l_scale, + l_len); + end loop; + return l_result; + end; + + member function get_user_defined_type(a_owner varchar2, a_type_name varchar2) + return anytype is + l_anydata anydata; + l_anytype anytype; + l_typecode pls_integer; + + begin + execute immediate 'declare + l_v ' || a_owner || '.' || + a_type_name || '; + begin + :anydata := anydata.convertobject(l_v); + end;' + using in out l_anydata; + + l_typecode := l_anydata.gettype(l_anytype); + + return l_anytype; + end; + + overriding member procedure init(self in out nocopy ut_column_info_rec, + a_col_type binary_integer, + a_col_name varchar2, + a_col_schema_name varchar2, + a_col_type_name varchar2, + a_col_prec integer, + a_col_scale integer, + a_col_len integer, + a_dbms_sql_desc boolean := false) is + l_anytype anytype; + begin + self.column_prec := a_col_prec; + self.column_len := a_col_len; + self.column_scale := a_col_scale; + self.xml_valid_name := '"'||a_col_name||'"'; + self.column_name := a_col_name; + self.column_type := a_col_type_name; + self.column_schema := a_col_schema_name; + self.is_sql_diffable := 0; + self.is_collection := ut_utils.boolean_to_int(ut_curr_usr_compound_helper.is_collection(a_col_schema_name,a_col_type_name)); + self.is_user_defined := 1; + + l_anytype := get_user_defined_type(a_col_schema_name, a_col_type_name); + self.nested_details := get_anytype_attributes_info(l_anytype); + end; + + constructor function ut_column_info_rec(self in out nocopy ut_column_info_rec, + a_col_type binary_integer, + a_col_name varchar2, + a_col_schema_name varchar2, + a_col_type_name varchar2, + a_col_prec integer, + a_col_scale integer, + a_col_len integer, + a_dbms_sql_desc boolean := false) + return self as result is + begin + if a_col_type = dbms_sql.user_defined_type then + self.init(a_col_type, a_col_name, a_col_schema_name, a_col_type_name,a_col_prec,a_col_scale,a_col_len); + else + (self as ut_column_info).init(a_col_type, + a_col_name, + a_col_schema_name, + a_col_type_name,a_col_prec,a_col_scale,a_col_len, + a_dbms_sql_desc); + end if; + return; + end; +end; +/ diff --git a/source/expectations/data_values/ut_column_info_rec.tps b/source/expectations/data_values/ut_column_info_rec.tps new file mode 100644 index 000000000..eeb1b93a1 --- /dev/null +++ b/source/expectations/data_values/ut_column_info_rec.tps @@ -0,0 +1,28 @@ +create or replace type ut_column_info_rec under ut_column_info +( + nested_details ut_column_info_tab, + member function get_anytype_attributes_info(a_anytype anytype) + return ut_column_info_tab, + member function get_user_defined_type(a_owner varchar2, a_type_name varchar2) + return anytype, + overriding member procedure init(self in out nocopy ut_column_info_rec, + a_col_type binary_integer, + a_col_name varchar2, + a_col_schema_name varchar2, + a_col_type_name varchar2, + a_col_prec integer, + a_col_scale integer, + a_col_len integer, + a_dbms_sql_desc boolean := false), + constructor function ut_column_info_rec(self in out nocopy ut_column_info_rec, + a_col_type binary_integer, + a_col_name varchar2, + a_col_schema_name varchar2, + a_col_type_name varchar2, + a_col_prec integer, + a_col_scale integer, + a_col_len integer, + a_dbms_sql_desc boolean := false) + return self as result +) +/ diff --git a/source/expectations/data_values/ut_column_info_tab.tps b/source/expectations/data_values/ut_column_info_tab.tps new file mode 100644 index 000000000..27dc44a93 --- /dev/null +++ b/source/expectations/data_values/ut_column_info_tab.tps @@ -0,0 +1,2 @@ +CREATE OR REPLACE TYPE ut_column_info_tab FORCE AS TABLE OF ut_column_info; +/ diff --git a/source/expectations/data_values/ut_cursor_info.tpb b/source/expectations/data_values/ut_cursor_info.tpb new file mode 100644 index 000000000..34e5946cc --- /dev/null +++ b/source/expectations/data_values/ut_cursor_info.tpb @@ -0,0 +1,31 @@ +create or replace type body ut_cursor_info as + constructor function ut_cursor_info(self in out nocopy ut_cursor_info, + a_cursor in out nocopy sys_refcursor) + return self as result is + l_cursor_number integer; + l_columns_count pls_integer; + l_columns_desc dbms_sql.desc_tab3; + begin + self.cursor_info := ut_column_info_tab(); + l_cursor_number := dbms_sql.to_cursor_number(a_cursor); + dbms_sql.describe_columns3(l_cursor_number, + l_columns_count, + l_columns_desc); + a_cursor := dbms_sql.to_refcursor(l_cursor_number); + + for i in 1 .. l_columns_count loop + self.cursor_info.extend; + self.cursor_info(cursor_info.last) := ut_column_info_rec(l_columns_desc(i).col_type, + l_columns_desc(i).col_name, + l_columns_desc(i).col_schema_name, + l_columns_desc(i).col_type_name, + l_columns_desc(i).col_precision, + l_columns_desc(i).col_scale, + l_columns_desc(i).col_name_len, + true); + end loop; + + return; + end ut_cursor_info; +end; +/ diff --git a/source/expectations/data_values/ut_cursor_info.tps b/source/expectations/data_values/ut_cursor_info.tps new file mode 100644 index 000000000..d373ef9a0 --- /dev/null +++ b/source/expectations/data_values/ut_cursor_info.tps @@ -0,0 +1,7 @@ +create or replace type ut_cursor_info force authid current_user as object +( + cursor_info ut_column_info_tab, + constructor function ut_cursor_info(self in out nocopy ut_cursor_info,a_cursor in out nocopy sys_refcursor) + return self as result +) +/ From 8fc2ea6e3364ad9e1180700f8e214641089ec09d Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 15 Nov 2018 00:25:39 +0000 Subject: [PATCH 0092/1096] Further optimizations to suite parsing. Changed functions to procedures to avoid copying of large memmory segments. --- source/api/ut_runner.pkb | 3 +- .../core/annotations/ut_annotation_parser.pkb | 2 +- source/core/ut_suite_cache_manager.pkb | 7 +- source/core/ut_suite_manager.pkb | 200 +++++++++++------- source/core/ut_suite_manager.pks | 9 + 5 files changed, 136 insertions(+), 85 deletions(-) diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index c04fa5112..3a2d6583b 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -128,7 +128,7 @@ create or replace package body ut_runner is l_include_object_names := to_ut_object_list(a_include_objects, l_coverage_schema_names); l_run := ut_run( - ut_suite_manager.configure_execution_by_path(l_paths), + null, l_paths, l_coverage_schema_names, l_exclude_object_names, @@ -137,6 +137,7 @@ create or replace package body ut_runner is set(a_test_file_mappings), a_client_character_set ); + ut_suite_manager.configure_execution_by_path(l_paths, l_run.items); l_run.do_execute(); finish_run(l_run); diff --git a/source/core/annotations/ut_annotation_parser.pkb b/source/core/annotations/ut_annotation_parser.pkb index 2467c6262..aec9e7585 100644 --- a/source/core/annotations/ut_annotation_parser.pkb +++ b/source/core/annotations/ut_annotation_parser.pkb @@ -155,7 +155,7 @@ create or replace package body ut_annotation_parser as -- position index is shifted by 1 because gc_annot_comment_pattern contains ^ as first sign -- but after instr index already points to the char on that line l_comment_pos := l_comment_pos-1; - l_comment_line := regexp_count(substr(a_source,1,l_comment_pos),chr(10),1,'m')+1; + l_comment_line := length(substr(a_source,1,l_comment_pos))-length(replace(substr(a_source,1,l_comment_pos),chr(10)))+1; l_comments(l_comment_line) := trim(regexp_substr(srcstr => a_source ,pattern => gc_annot_comment_pattern ,occurrence => 1 diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index 081b2d590..ba51a242f 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -138,8 +138,11 @@ create or replace package body ut_suite_cache_manager is procedure remove_from_cache(a_schema_name varchar2, a_objects ut_varchar2_rows) is pragma autonomous_transaction; begin - delete - from ut_suite_cache_package i + delete from ut_suite_cache i + where i.object_owner = a_schema_name + and i.object_name in ( select column_value from table (a_objects) ); + + delete from ut_suite_cache_package i where i.object_owner = a_schema_name and i.object_name in ( select column_value from table (a_objects) ); diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 82376a846..4c2d06ab9 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -29,6 +29,7 @@ create or replace package body ut_suite_manager is type tt_cached_suites is table of t_cached_suite; type t_cached_suites_cursor is ref cursor return t_cached_suite; + type t_item_levels is table of ut_suite_items index by binary_integer; ------------------ procedure validate_paths(a_paths in ut_varchar2_list) is @@ -167,33 +168,19 @@ create or replace package body ut_suite_manager is end loop; end; - procedure reconstruct_from_cache( - a_suites out nocopy ut_suite_items, - a_suite_data_cursor sys_refcursor - ) is - type t_item_levels is table of ut_suite_items index by binary_integer; - c_bulk_limit constant pls_integer := 1000; - l_items_at_level t_item_levels; - l_rows tt_cached_suites; - l_test ut_test; - l_logical_suite ut_logical_suite; - l_level pls_integer; - l_prev_level pls_integer; - l_idx integer; + function get_logical_suite( + l_rows tt_cached_suites, + l_idx pls_integer, + l_level pls_integer, + l_prev_level pls_integer, + l_items_at_level t_item_levels + ) return ut_logical_suite is begin - a_suites := ut_suite_items(); - loop - fetch a_suite_data_cursor bulk collect into l_rows limit c_bulk_limit; - exit when l_rows.count = 0; - - l_idx := l_rows.first; - loop - l_test := null; - l_logical_suite := null; - case l_rows(l_idx).self_type - when 'UT_TEST' then - l_test := - ut_test( + return + case l_rows(l_idx).self_type + when 'UT_SUITE' then + case when l_prev_level > l_level then + ut_suite( self_type => l_rows(l_idx).self_type, object_owner => l_rows(l_idx).object_owner, object_name => lower(l_rows(l_idx).object_name), name => lower(l_rows(l_idx).name), description => l_rows(l_idx).description, path => l_rows(l_idx).path, @@ -201,14 +188,10 @@ create or replace package body ut_suite_manager is line_no => l_rows(l_idx).line_no, parse_time => l_rows(l_idx).parse_time, start_time => null, end_time => null, result => null, warnings => l_rows(l_idx).warnings, results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), - before_each_list => sort_by_seq_no(l_rows(l_idx).before_each_list), before_test_list => sort_by_seq_no(l_rows(l_idx).before_test_list), - item => l_rows(l_idx).item, - after_test_list => sort_by_seq_no(l_rows(l_idx).after_test_list), after_each_list => sort_by_seq_no(l_rows(l_idx).after_each_list), - all_expectations => ut_expectation_results(), failed_expectations => ut_expectation_results(), - parent_error_stack_trace => null, expected_error_codes => l_rows(l_idx).expected_error_codes - ); - when 'UT_SUITE' then - l_logical_suite := + items => l_items_at_level(l_prev_level), + before_all_list => sort_by_seq_no(l_rows(l_idx).before_all_list), after_all_list => sort_by_seq_no(l_rows(l_idx).after_all_list) + ) + else ut_suite( self_type => l_rows(l_idx).self_type, object_owner => l_rows(l_idx).object_owner, object_name => lower(l_rows(l_idx).object_name), @@ -219,9 +202,22 @@ create or replace package body ut_suite_manager is results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), items => ut_suite_items(), before_all_list => sort_by_seq_no(l_rows(l_idx).before_all_list), after_all_list => sort_by_seq_no(l_rows(l_idx).after_all_list) - ); - when 'UT_SUITE_CONTEXT' then - l_logical_suite := + ) + end + when 'UT_SUITE_CONTEXT' then + case when l_prev_level > l_level then + ut_suite_context( + self_type => l_rows(l_idx).self_type, + object_owner => l_rows(l_idx).object_owner, object_name => lower(l_rows(l_idx).object_name), + name => lower(l_rows(l_idx).name), description => l_rows(l_idx).description, path => l_rows(l_idx).path, + rollback_type => l_rows(l_idx).rollback_type, disabled_flag => l_rows(l_idx).disabled_flag, + line_no => l_rows(l_idx).line_no, parse_time => l_rows(l_idx).parse_time, + start_time => null, end_time => null, result => null, warnings => l_rows(l_idx).warnings, + results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), + items => l_items_at_level(l_prev_level), + before_all_list => sort_by_seq_no(l_rows(l_idx).before_all_list), after_all_list => sort_by_seq_no(l_rows(l_idx).after_all_list) + ) + else ut_suite_context( self_type => l_rows(l_idx).self_type, object_owner => l_rows(l_idx).object_owner, object_name => lower(l_rows(l_idx).object_name), @@ -232,9 +228,21 @@ create or replace package body ut_suite_manager is results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), items => ut_suite_items(), before_all_list => sort_by_seq_no(l_rows(l_idx).before_all_list), after_all_list => sort_by_seq_no(l_rows(l_idx).after_all_list) - ); - when 'UT_LOGICAL_SUITE' then - l_logical_suite := + ) + end + when 'UT_LOGICAL_SUITE' then + case when l_prev_level > l_level then + ut_logical_suite( + self_type => l_rows(l_idx).self_type, + object_owner => l_rows(l_idx).object_owner, object_name => lower(l_rows(l_idx).object_name), + name => lower(l_rows(l_idx).name), description => l_rows(l_idx).description, path => l_rows(l_idx).path, + rollback_type => l_rows(l_idx).rollback_type, disabled_flag => l_rows(l_idx).disabled_flag, + line_no => l_rows(l_idx).line_no, parse_time => l_rows(l_idx).parse_time, + start_time => null, end_time => null, result => null, warnings => l_rows(l_idx).warnings, + results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), + items => l_items_at_level(l_prev_level) + ) + else ut_logical_suite( self_type => l_rows(l_idx).self_type, object_owner => l_rows(l_idx).object_owner, object_name => lower(l_rows(l_idx).object_name), @@ -244,32 +252,62 @@ create or replace package body ut_suite_manager is start_time => null, end_time => null, result => null, warnings => l_rows(l_idx).warnings, results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), items => ut_suite_items() - ); - end case; + ) + end + end; + end; + + procedure reconstruct_from_cache( + a_suites in out nocopy ut_suite_items, + a_suite_data_cursor sys_refcursor + ) is + c_bulk_limit constant pls_integer := 1000; + l_items_at_level t_item_levels; + l_rows tt_cached_suites; + l_logical_suite ut_logical_suite; + l_level pls_integer; + l_prev_level pls_integer; + l_idx integer; + begin + loop + fetch a_suite_data_cursor bulk collect into l_rows limit c_bulk_limit; + exit when l_rows.count = 0; + l_idx := l_rows.first; + loop l_level := length(l_rows(l_idx).path) - length( replace(l_rows(l_idx).path, '.') ) + 1; - if l_level > 1 then - if l_prev_level > l_level then - l_logical_suite.items := l_items_at_level(l_prev_level); - l_items_at_level(l_prev_level).delete; - end if; if not l_items_at_level.exists(l_level) then l_items_at_level(l_level) := ut_suite_items(); end if; l_items_at_level(l_level).extend; - if l_test is not null then - l_items_at_level(l_level)(l_items_at_level(l_level).last) := l_test; + if l_rows(l_idx).self_type = 'UT_TEST' then + l_items_at_level(l_level)(l_items_at_level(l_level).last) := + ut_test( + self_type => l_rows(l_idx).self_type, + object_owner => l_rows(l_idx).object_owner, object_name => lower(l_rows(l_idx).object_name), + name => lower(l_rows(l_idx).name), description => l_rows(l_idx).description, path => l_rows(l_idx).path, + rollback_type => l_rows(l_idx).rollback_type, disabled_flag => l_rows(l_idx).disabled_flag, + line_no => l_rows(l_idx).line_no, parse_time => l_rows(l_idx).parse_time, + start_time => null, end_time => null, result => null, warnings => l_rows(l_idx).warnings, + results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), + before_each_list => sort_by_seq_no(l_rows(l_idx).before_each_list), before_test_list => sort_by_seq_no(l_rows(l_idx).before_test_list), + item => l_rows(l_idx).item, + after_test_list => sort_by_seq_no(l_rows(l_idx).after_test_list), after_each_list => sort_by_seq_no(l_rows(l_idx).after_each_list), + all_expectations => ut_expectation_results(), failed_expectations => ut_expectation_results(), + parent_error_stack_trace => null, expected_error_codes => l_rows(l_idx).expected_error_codes + ); else - l_items_at_level(l_level)(l_items_at_level(l_level).last) := l_logical_suite; - end if; + pragma inline(get_logical_suite, 'YES'); + l_items_at_level(l_level)(l_items_at_level(l_level).last) := get_logical_suite(l_rows, l_idx, l_level,l_prev_level, l_items_at_level ); + end if; else - if l_prev_level > l_level then - l_logical_suite.items := l_items_at_level(l_prev_level); - l_items_at_level(l_prev_level).delete; - end if; a_suites.extend; - a_suites(a_suites.last) := l_logical_suite; + pragma inline(get_logical_suite, 'YES'); + a_suites(a_suites.last) := get_logical_suite(l_rows, l_idx, l_level,l_prev_level, l_items_at_level ); + end if; + if l_prev_level > l_level then + l_items_at_level(l_prev_level).delete; end if; l_prev_level := l_level; l_idx := l_rows.next(l_idx); @@ -483,18 +521,18 @@ create or replace package body ut_suite_manager is end; - function get_suites_for_path( + procedure add_suites_for_path( a_owner_name varchar2, a_path varchar2 := null, a_object_name varchar2 := null, - a_procedure_name varchar2 := null - ) return ut_suite_items is - l_suites ut_suite_items; + a_procedure_name varchar2 := null, + a_suites in out nocopy ut_suite_items + ) is begin refresh_cache(a_owner_name); reconstruct_from_cache( - l_suites, + a_suites, get_cached_suite_data( a_owner_name, a_path, @@ -503,9 +541,8 @@ create or replace package body ut_suite_manager is can_skip_all_objects_scan(a_owner_name) ) ); - return l_suites; - end get_suites_for_path; + end; ----------------------------------------------- ----------------------------------------------- @@ -519,7 +556,7 @@ create or replace package body ut_suite_manager is a_procedure_name varchar2 := null, a_skip_all_objects boolean := false ) return ut_suite_items is - l_suites ut_suite_items; + l_suites ut_suite_items := ut_suite_items(); begin build_and_cache_suites(a_owner_name, a_annotated_objects); @@ -578,58 +615,59 @@ create or replace package body ut_suite_manager is end; function configure_execution_by_path(a_paths in ut_varchar2_list) return ut_suite_items is + l_suites ut_suite_items := ut_suite_items(); + begin + configure_execution_by_path(a_paths, l_suites ); + return l_suites; + end; + + procedure configure_execution_by_path(a_paths in ut_varchar2_list, a_suites out nocopy ut_suite_items) is l_paths ut_varchar2_list := a_paths; l_path_items t_path_items; l_path_item t_path_item; l_schema varchar2(4000); - l_suites ut_suite_items; + l_suites_count pls_integer := 0; l_index varchar2(4000 char); - l_objects_to_run ut_suite_items; l_schema_paths t_schema_paths; begin + a_suites := ut_suite_items(); --resolve schema names from paths and group paths by schema name resolve_schema_names(l_paths); l_schema_paths := group_paths_by_schema(l_paths); - l_objects_to_run := ut_suite_items(); - l_schema := l_schema_paths.first; while l_schema is not null loop l_path_items := l_schema_paths(l_schema); for i in 1 .. l_path_items.count loop l_path_item := l_path_items(i); - l_suites := get_suites_for_path( + add_suites_for_path( upper(l_schema), l_path_item.suite_path, l_path_item.object_name, - l_path_item.procedure_name + l_path_item.procedure_name, + a_suites ); - if l_suites.count = 0 then + if a_suites.count = l_suites_count then if l_path_item.suite_path is not null then raise_application_error(ut_utils.gc_suite_package_not_found,'No suite packages found for path '||l_schema||':'||l_path_item.suite_path|| '.'); elsif l_path_item.procedure_name is not null then raise_application_error(ut_utils.gc_suite_package_not_found,'Suite test '||l_schema||'.'||l_path_item.object_name|| '.'||l_path_item.procedure_name||' does not exist'); - else + elsif l_path_item.object_name is not null then raise_application_error(ut_utils.gc_suite_package_not_found,'Suite package '||l_schema||'.'||l_path_item.object_name|| ' does not exist'); end if; end if; - l_index := l_suites.first; - while l_index is not null loop - l_objects_to_run.extend; - l_objects_to_run(l_objects_to_run.count) := l_suites(l_index); - l_index := l_suites.next(l_index); - end loop; + l_index := a_suites.first; + l_suites_count := a_suites.count; end loop; l_schema := l_schema_paths.next(l_schema); end loop; --propagate rollback type to suite items after organizing suites into hierarchy - for i in 1 .. l_objects_to_run.count loop - l_objects_to_run(i).set_rollback_type( l_objects_to_run(i).get_rollback_type() ); + for i in 1 .. a_suites.count loop + a_suites(i).set_rollback_type( a_suites(i).get_rollback_type() ); end loop; - return l_objects_to_run; end configure_execution_by_path; function get_suites_info(a_owner_name varchar2) return tt_suite_items pipelined is diff --git a/source/core/ut_suite_manager.pks b/source/core/ut_suite_manager.pks index 65440b22b..408a8a355 100644 --- a/source/core/ut_suite_manager.pks +++ b/source/core/ut_suite_manager.pks @@ -39,6 +39,15 @@ create or replace package ut_suite_manager authid current_user is */ function configure_execution_by_path(a_paths in ut_varchar2_list) return ut_suite_items; + /** + * Builds a hierarchical suites based on given suite-paths + * + * @param a_paths list of suite-paths or procedure names or package names or schema names + * @param a_suites returned array containing root suites-ready to be executed + * + */ + procedure configure_execution_by_path(a_paths in ut_varchar2_list, a_suites out nocopy ut_suite_items); + /** * Cleanup paths by removing leading/trailing whitespace and making paths lowercase * Get list of schema names from execution paths. From 3543e3d905dfe76c322ab527ca5d5007a34f901f Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 15 Nov 2018 00:26:55 +0000 Subject: [PATCH 0093/1096] Disabled `PLSQL_OPTIMIZE_LEVEL=0` for testing --- .travis/install.sh | 4 ++-- .travis/install_utplsql_release.sh | 2 +- test/core.pkb | 2 +- test/install_tests.sql | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index e37cfa35f..03b69a8b1 100644 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -9,7 +9,7 @@ set feedback off set verify off --alter session set plsql_warnings = 'ENABLE:ALL', 'DISABLE:(5004,5018,6000,6001,6003,6009,6010,7206)'; -alter session set plsql_optimize_level=0; +--alter session set plsql_optimize_level=0; @install_headless.sql $UT3_OWNER $UT3_OWNER_PASSWORD SQL @@ -45,7 +45,7 @@ SQL set feedback off set verify off - alter session set plsql_optimize_level=0; + --alter session set plsql_optimize_level=0; @install.sql $UT3_OWNER SQL diff --git a/.travis/install_utplsql_release.sh b/.travis/install_utplsql_release.sh index 889e098da..7d1c24df7 100644 --- a/.travis/install_utplsql_release.sh +++ b/.travis/install_utplsql_release.sh @@ -37,7 +37,7 @@ end; SQL "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA < Date: Thu, 15 Nov 2018 00:33:56 +0000 Subject: [PATCH 0094/1096] Fixed formal parameter names --- source/core/ut_suite_manager.pkb | 108 ++++++++++++++++--------------- 1 file changed, 56 insertions(+), 52 deletions(-) diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 4c2d06ab9..03eb35a86 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -169,87 +169,91 @@ create or replace package body ut_suite_manager is end; function get_logical_suite( - l_rows tt_cached_suites, - l_idx pls_integer, - l_level pls_integer, - l_prev_level pls_integer, - l_items_at_level t_item_levels + a_rows tt_cached_suites, + a_idx pls_integer, + a_level pls_integer, + a_prev_level pls_integer, + a_items_at_level t_item_levels ) return ut_logical_suite is begin return - case l_rows(l_idx).self_type + case a_rows( a_idx ).self_type when 'UT_SUITE' then - case when l_prev_level > l_level then + case when a_prev_level > a_level then ut_suite( - self_type => l_rows(l_idx).self_type, - object_owner => l_rows(l_idx).object_owner, object_name => lower(l_rows(l_idx).object_name), - name => lower(l_rows(l_idx).name), description => l_rows(l_idx).description, path => l_rows(l_idx).path, - rollback_type => l_rows(l_idx).rollback_type, disabled_flag => l_rows(l_idx).disabled_flag, - line_no => l_rows(l_idx).line_no, parse_time => l_rows(l_idx).parse_time, - start_time => null, end_time => null, result => null, warnings => l_rows(l_idx).warnings, + self_type => a_rows( a_idx ).self_type, + object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), + name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, + rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, + line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, + start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), - items => l_items_at_level(l_prev_level), - before_all_list => sort_by_seq_no(l_rows(l_idx).before_all_list), after_all_list => sort_by_seq_no(l_rows(l_idx).after_all_list) + items => a_items_at_level(a_prev_level), + before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( + a_rows( a_idx ).after_all_list) ) else ut_suite( - self_type => l_rows(l_idx).self_type, - object_owner => l_rows(l_idx).object_owner, object_name => lower(l_rows(l_idx).object_name), - name => lower(l_rows(l_idx).name), description => l_rows(l_idx).description, path => l_rows(l_idx).path, - rollback_type => l_rows(l_idx).rollback_type, disabled_flag => l_rows(l_idx).disabled_flag, - line_no => l_rows(l_idx).line_no, parse_time => l_rows(l_idx).parse_time, - start_time => null, end_time => null, result => null, warnings => l_rows(l_idx).warnings, + self_type => a_rows( a_idx ).self_type, + object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), + name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, + rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, + line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, + start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), items => ut_suite_items(), - before_all_list => sort_by_seq_no(l_rows(l_idx).before_all_list), after_all_list => sort_by_seq_no(l_rows(l_idx).after_all_list) + before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( + a_rows( a_idx ).after_all_list) ) end when 'UT_SUITE_CONTEXT' then - case when l_prev_level > l_level then + case when a_prev_level > a_level then ut_suite_context( - self_type => l_rows(l_idx).self_type, - object_owner => l_rows(l_idx).object_owner, object_name => lower(l_rows(l_idx).object_name), - name => lower(l_rows(l_idx).name), description => l_rows(l_idx).description, path => l_rows(l_idx).path, - rollback_type => l_rows(l_idx).rollback_type, disabled_flag => l_rows(l_idx).disabled_flag, - line_no => l_rows(l_idx).line_no, parse_time => l_rows(l_idx).parse_time, - start_time => null, end_time => null, result => null, warnings => l_rows(l_idx).warnings, + self_type => a_rows( a_idx ).self_type, + object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), + name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, + rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, + line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, + start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), - items => l_items_at_level(l_prev_level), - before_all_list => sort_by_seq_no(l_rows(l_idx).before_all_list), after_all_list => sort_by_seq_no(l_rows(l_idx).after_all_list) + items => a_items_at_level(a_prev_level), + before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( + a_rows( a_idx ).after_all_list) ) else ut_suite_context( - self_type => l_rows(l_idx).self_type, - object_owner => l_rows(l_idx).object_owner, object_name => lower(l_rows(l_idx).object_name), - name => lower(l_rows(l_idx).name), description => l_rows(l_idx).description, path => l_rows(l_idx).path, - rollback_type => l_rows(l_idx).rollback_type, disabled_flag => l_rows(l_idx).disabled_flag, - line_no => l_rows(l_idx).line_no, parse_time => l_rows(l_idx).parse_time, - start_time => null, end_time => null, result => null, warnings => l_rows(l_idx).warnings, + self_type => a_rows( a_idx ).self_type, + object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), + name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, + rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, + line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, + start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), items => ut_suite_items(), - before_all_list => sort_by_seq_no(l_rows(l_idx).before_all_list), after_all_list => sort_by_seq_no(l_rows(l_idx).after_all_list) + before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( + a_rows( a_idx ).after_all_list) ) end when 'UT_LOGICAL_SUITE' then - case when l_prev_level > l_level then + case when a_prev_level > a_level then ut_logical_suite( - self_type => l_rows(l_idx).self_type, - object_owner => l_rows(l_idx).object_owner, object_name => lower(l_rows(l_idx).object_name), - name => lower(l_rows(l_idx).name), description => l_rows(l_idx).description, path => l_rows(l_idx).path, - rollback_type => l_rows(l_idx).rollback_type, disabled_flag => l_rows(l_idx).disabled_flag, - line_no => l_rows(l_idx).line_no, parse_time => l_rows(l_idx).parse_time, - start_time => null, end_time => null, result => null, warnings => l_rows(l_idx).warnings, + self_type => a_rows( a_idx ).self_type, + object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), + name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, + rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, + line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, + start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), - items => l_items_at_level(l_prev_level) + items => a_items_at_level(a_prev_level) ) else ut_logical_suite( - self_type => l_rows(l_idx).self_type, - object_owner => l_rows(l_idx).object_owner, object_name => lower(l_rows(l_idx).object_name), - name => lower(l_rows(l_idx).name), description => l_rows(l_idx).description, path => l_rows(l_idx).path, - rollback_type => l_rows(l_idx).rollback_type, disabled_flag => l_rows(l_idx).disabled_flag, - line_no => l_rows(l_idx).line_no, parse_time => l_rows(l_idx).parse_time, - start_time => null, end_time => null, result => null, warnings => l_rows(l_idx).warnings, + self_type => a_rows( a_idx ).self_type, + object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), + name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, + rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, + line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, + start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), items => ut_suite_items() ) From f7f68116bbe600ea9dc049b8dff6fd41ce4dd981 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 15 Nov 2018 01:09:49 +0000 Subject: [PATCH 0095/1096] Revert "Disabled `PLSQL_OPTIMIZE_LEVEL=0` for testing" This reverts commit 3543e3d --- .travis/install.sh | 4 ++-- .travis/install_utplsql_release.sh | 2 +- test/core.pkb | 2 +- test/install_tests.sql | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index 03b69a8b1..e37cfa35f 100644 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -9,7 +9,7 @@ set feedback off set verify off --alter session set plsql_warnings = 'ENABLE:ALL', 'DISABLE:(5004,5018,6000,6001,6003,6009,6010,7206)'; ---alter session set plsql_optimize_level=0; +alter session set plsql_optimize_level=0; @install_headless.sql $UT3_OWNER $UT3_OWNER_PASSWORD SQL @@ -45,7 +45,7 @@ SQL set feedback off set verify off - --alter session set plsql_optimize_level=0; + alter session set plsql_optimize_level=0; @install.sql $UT3_OWNER SQL diff --git a/.travis/install_utplsql_release.sh b/.travis/install_utplsql_release.sh index 7d1c24df7..889e098da 100644 --- a/.travis/install_utplsql_release.sh +++ b/.travis/install_utplsql_release.sh @@ -37,7 +37,7 @@ end; SQL "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA < Date: Thu, 15 Nov 2018 12:16:09 +0000 Subject: [PATCH 0096/1096] Capture cursor info and filter it out --- .../data_values/ut_compound_data_helper.pkb | 131 +++++++++++++++++- .../data_values/ut_compound_data_helper.pks | 3 + .../data_values/ut_compound_data_tmp.sql | 3 +- .../ut_curr_usr_compound_helper.pkb | 23 ++- .../ut_curr_usr_compound_helper.pks | 6 +- .../data_values/ut_data_value_refcursor.tpb | 14 +- .../data_values/ut_data_value_refcursor.tps | 8 +- source/expectations/matchers/ut_equal.tpb | 6 +- 8 files changed, 177 insertions(+), 17 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index c75543ef3..bb0b8c1a5 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -18,6 +18,7 @@ create or replace package body ut_compound_data_helper is g_user_defined_type pls_integer := dbms_sql.user_defined_type; g_diff_count integer; + g_filter_tab ut_varchar2_list; function get_column_info_xml(a_column_details ut_key_anyval_pair) return xmltype is l_result varchar2(4000); @@ -620,7 +621,7 @@ create or replace package body ut_compound_data_helper is begin dbms_lob.createtemporary(l_compare_sql, true); - + --TODO: Resolve issues with collection and nested tables, can we extract by internal column name if defined e.g. xml of colval.id.getclobval() --TODO: Comment better all pieces l_column_filter := get_columns_row_filter(a_exclude_xpath, a_include_xpath); @@ -717,7 +718,7 @@ create or replace package body ut_compound_data_helper is l_temp_string := ' (a.data_id is null or e.data_id is null) '; end if; ut_utils.append_to_clob(l_compare_sql,l_temp_string); - + return l_compare_sql; end; @@ -748,5 +749,129 @@ create or replace package body ut_compound_data_helper is return g_diff_count; end; -end; + function populate_filter_columns (a_column_string in varchar2, a_column_info ut_column_info_tab) return ut_column_info_rec is + l_result ut_column_info_rec; + l_column_from_string varchar2(32767); + l_rest_of_path varchar2(32767); + begin + --check if string has a path + l_column_from_string := regexp_substr(a_column_string,'^([^\/]*)?\/?(.*)',1,1,null,1); + for col in 1..a_column_info.count loop + if l_column_from_string = a_column_info(col).column_name then + if a_column_string like '%/%' then + l_rest_of_path := regexp_substr(a_column_string,'^([^\/]*)?\/(.*)',1,1,null,2); + l_result := treat(a_column_info(col) as ut_column_info_rec); + l_result.nested_details := ut_column_info_tab(); + l_result.nested_details.extend; + l_result.nested_details(l_result.nested_details.last) := populate_filter_columns (l_rest_of_path,treat(a_column_info(col) as ut_column_info_rec).nested_details); + else + l_result := treat(a_column_info(col) as ut_column_info_rec); + end if; + end if; + end loop; + return l_result; + end; + + function get_child(a_parent in varchar2 default null) return ut_varchar2_list is + l_out_tab ut_varchar2_list := ut_varchar2_list(); + cursor c_child(cp_parent in varchar2) is + with sorted as + (select r_num, + regexp_substr(t.column_value, '[^/]+', 1, commas.column_value) as colval, + commas.column_value lev + from (select row_number() over(order by 1) r_num, + column_value + from ((table(g_filter_tab)))) t, + table(cast(multiset + (select level + from dual + connect by level <= + length(regexp_replace(t.column_value, + '[^/]+')) + 1) as + sys.odcinumberlist)) commas + order by r_num, + lev), + hier as + (select r_num, + lev, + colval, + lag(colval, 1) over(partition by r_num order by lev) parent + from sorted) + select distinct colval + from hier + where nvl(parent, 1) = nvl(cp_parent, 1); + + begin + open c_child(a_parent); + fetch c_child bulk collect + into l_out_tab; + close c_child; + return l_out_tab; + end; + + function exc_inc_cursors_columns(a_column_info_tab ut_column_info_tab,a_current_list ut_varchar2_list) + return ut_column_info_tab is + l_result ut_column_info_tab := ut_column_info_tab(); + l_record ut_column_info_rec; + l_index integer := 1; + begin + --TODO : Optimize search using while or exists operator ? + for lst in 1..a_current_list.count loop + for i in 1..a_column_info_tab.count loop + if a_current_list(lst) = a_column_info_tab(i).column_name then + l_result.extend; + if a_column_info_tab(i) is of (ut_column_info_rec) then + l_record := treat(a_column_info_tab(i) as ut_column_info_rec); + l_record.nested_details := exc_inc_cursors_columns(treat(a_column_info_tab(i) as ut_column_info_rec).nested_details,get_child(a_column_info_tab(i).column_name)); + end if; + l_result(l_result.last) := l_record; + end if; + end loop; + end loop; + return l_result; + end; + + function inc_exc_columns_from_cursor (a_cursor_info ut_column_info_tab, a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) + return ut_column_info_tab is + l_filtered_set ut_varchar2_list := ut_varchar2_list(); + l_result ut_column_info_tab := ut_column_info_tab(); + begin + g_filter_tab := ut_varchar2_list(); + + -- if include and exclude is not null its columns from include minus exclude + -- If inlcude is not null and exclude is null cursor will have only include + -- If exclude is not null and include is null cursor will have all except exclude + + if a_include_xpath.count > 0 and a_exclude_xpath.count > 0 then + select col_names bulk collect into l_filtered_set + from( + select regexp_replace(column_value,'^((/ROW/)|^(//)|^(/\*/))?(.*)','\5') col_names + from table(a_include_xpath) + minus + select regexp_replace(column_value,'^((/ROW/)|^(//)|^(/\*/))?(.*)','\5') col_names + from table(a_exclude_xpath) + ); + elsif a_include_xpath.count > 0 and a_exclude_xpath.count = 0 then + select regexp_replace(column_value,'^((/ROW/)|^(//)|^(/\*/))?(.*)','\5') col_names + bulk collect into l_filtered_set + from table(a_include_xpath); + elsif a_include_xpath.count = 0 and a_exclude_xpath.count > 0 then + select regexp_replace(column_value,'^((/ROW/)|^(//)|^(/\*/))?(.*)','\5') col_names + bulk collect into l_filtered_set + from table(a_exclude_xpath); + elsif a_cursor_info is not null then + l_result:= a_cursor_info; + else + l_result := ut_column_info_tab(); + end if; + + g_filter_tab := l_filtered_set; + if g_filter_tab.count <> 0 then + l_result := exc_inc_cursors_columns(a_cursor_info,get_child()); + end if; + + return l_result; + end; + +end; / diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 046191aa1..4c844774d 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -102,5 +102,8 @@ create or replace package ut_compound_data_helper authid definer is function get_rows_diff_count return integer; + function inc_exc_columns_from_cursor (a_cursor_info ut_column_info_tab, a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) + return ut_column_info_tab; + end; / diff --git a/source/expectations/data_values/ut_compound_data_tmp.sql b/source/expectations/data_values/ut_compound_data_tmp.sql index 7beb1e9cd..0fb5f9544 100644 --- a/source/expectations/data_values/ut_compound_data_tmp.sql +++ b/source/expectations/data_values/ut_compound_data_tmp.sql @@ -19,4 +19,5 @@ create global temporary table ut_compound_data_tmp( pk_hash raw(128), duplicate_no integer, constraint ut_cmp_data_tmp_hash_pk unique (data_id, item_no, duplicate_no) -) on commit preserve rows xmltype column item_data store as binary xml; \ No newline at end of file +) on commit preserve rows; +--xmltype column item_data store as binary xml; \ No newline at end of file diff --git a/source/expectations/data_values/ut_curr_usr_compound_helper.pkb b/source/expectations/data_values/ut_curr_usr_compound_helper.pkb index 0cf12f633..15f764062 100644 --- a/source/expectations/data_values/ut_curr_usr_compound_helper.pkb +++ b/source/expectations/data_values/ut_curr_usr_compound_helper.pkb @@ -34,12 +34,7 @@ create or replace package body ut_curr_usr_compound_helper is return ut_utils.boolean_to_int(is_sql_compare_allowed(a_type_name)); end; - function get_column_type(a_desc_rec dbms_sql.desc_rec3, a_desc_user_types boolean := false) return ut_key_anyval_pair is - l_data ut_data_value; - l_result ut_key_anyval_pair; - l_data_type varchar2(500) := 'unknown datatype'; - - function is_collection (a_owner varchar2,a_type_name varchar2) return boolean is + function is_collection (a_owner varchar2,a_type_name varchar2) return boolean is l_type_view varchar2(200) := ut_metadata.get_dba_view('dba_types'); l_typecode varchar2(100); begin @@ -48,7 +43,16 @@ create or replace package body ut_curr_usr_compound_helper is into l_typecode using a_owner,a_type_name; return l_typecode = 'COLLECTION'; + exception + when no_data_found then + return false; end; + + function get_column_type(a_desc_rec dbms_sql.desc_rec3, a_desc_user_types boolean := false) return ut_key_anyval_pair is + l_data ut_data_value; + l_result ut_key_anyval_pair; + l_data_type varchar2(500) := 'unknown datatype'; + --TODO: Review the types in and resolving begin @@ -241,6 +245,11 @@ create or replace package body ut_curr_usr_compound_helper is return l_result ; end; + function get_column_type(a_type_code in integer, a_dbms_sql_desc in boolean) return varchar2 is + begin + return case when not a_dbms_sql_desc then g_anytype_name_map(a_type_code) else g_type_name_map(a_type_code) end; + end; + begin g_anytype_name_map(dbms_types.typecode_date) := 'DATE'; g_anytype_name_map(dbms_types.typecode_number) := 'NUMBER'; @@ -262,7 +271,7 @@ create or replace package body ut_curr_usr_compound_helper is g_anytype_name_map(dbms_types.typecode_varray) := 'VARRRAY'; g_anytype_name_map(dbms_types.typecode_table) := 'TABLE'; g_anytype_name_map(dbms_types.typecode_namedcollection) := 'NAMEDCOLLECTION'; - + g_anytype_collection_name(dbms_types.typecode_varray) := 'VARRRAY'; g_anytype_collection_name(dbms_types.typecode_table) := 'TABLE'; g_anytype_collection_name(dbms_types.typecode_namedcollection) := 'NAMEDCOLLECTION'; diff --git a/source/expectations/data_values/ut_curr_usr_compound_helper.pks b/source/expectations/data_values/ut_curr_usr_compound_helper.pks index b4230a29d..46404b93c 100644 --- a/source/expectations/data_values/ut_curr_usr_compound_helper.pks +++ b/source/expectations/data_values/ut_curr_usr_compound_helper.pks @@ -3,7 +3,9 @@ create or replace package ut_curr_usr_compound_helper authid current_user is function is_sql_compare_allowed(a_type_name varchar2) return boolean; function is_sql_compare_int(a_type_name varchar2) return integer; - + + function is_collection (a_owner varchar2,a_type_name varchar2) return boolean; + procedure get_columns_info( a_cursor in out nocopy sys_refcursor, a_columns_info out nocopy xmltype, @@ -15,5 +17,7 @@ create or replace package ut_curr_usr_compound_helper authid current_user is function extract_min_col_info(a_full_col_info xmltype) return xmltype; + function get_column_type(a_type_code in integer, a_dbms_sql_desc in boolean) return varchar2; + end; / diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 42b65ecf2..5e4d2a5cb 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -48,6 +48,8 @@ create or replace type body ut_data_value_refcursor as self.elements_count := 0; self.columns_info := ut_curr_usr_compound_helper.extract_min_col_info(self.col_info_desc); + self.cursor_col_info := ut_cursor_info(l_cursor); + -- We use DBMS_XMLGEN in order to: -- 1) be able to process data in bulks (set of rows) -- 2) be able to influence the ROWSET/ROW tags @@ -99,7 +101,7 @@ create or replace type body ut_data_value_refcursor as dbms_xmlgen.closeContext(l_ctx); raise; end; - + overriding member function to_string return varchar2 is l_result clob; l_result_string varchar2(32767); @@ -236,7 +238,7 @@ create or replace type body ut_data_value_refcursor as if not a_other is of (ut_data_value_refcursor) then raise value_error; end if; - + l_other := treat(a_other as ut_data_value_refcursor); --if we join by key and key is missing fail and report error @@ -265,6 +267,14 @@ create or replace type body ut_data_value_refcursor as return self.elements_count = 0; end; + member function filter_cursor (a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) return ut_data_value_refcursor is + l_result ut_data_value_refcursor := self; + begin + if l_result.cursor_col_info.cursor_info is not null then + l_result.cursor_col_info.cursor_info := ut_compound_data_helper.inc_exc_columns_from_cursor(l_result.cursor_col_info.cursor_info,a_exclude_xpath,a_include_xpath); + end if; + return l_result; + end; end; / diff --git a/source/expectations/data_values/ut_data_value_refcursor.tps b/source/expectations/data_values/ut_data_value_refcursor.tps index 29ee3b702..fa6e41483 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tps +++ b/source/expectations/data_values/ut_data_value_refcursor.tps @@ -44,12 +44,18 @@ create or replace type ut_data_value_refcursor under ut_compound_data_value( */ key_info xmltype, + /* + *columns info + */ + cursor_col_info ut_cursor_info, + constructor function ut_data_value_refcursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) return self as result, member procedure init(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor), overriding member function to_string return varchar2, overriding member function diff( a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean := false ) return varchar2, overriding member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean, a_inclusion_compare boolean := false, a_is_negated boolean := false) return integer, - overriding member function is_empty return boolean + overriding member function is_empty return boolean, + member function filter_cursor (a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) return ut_data_value_refcursor ) / diff --git a/source/expectations/matchers/ut_equal.tpb b/source/expectations/matchers/ut_equal.tpb index 611b1cd1c..8e857ad80 100644 --- a/source/expectations/matchers/ut_equal.tpb +++ b/source/expectations/matchers/ut_equal.tpb @@ -25,7 +25,7 @@ create or replace type body ut_equal as self.exclude_list := ut_varchar2_list(); self.join_columns := ut_varchar2_list(); end; - + member function equal_with_nulls(a_assert_result boolean, a_actual ut_data_value) return boolean is begin ut_utils.debug_log('ut_equal.equal_with_nulls :' || ut_utils.to_test_result(a_assert_result) || ':'); @@ -228,12 +228,14 @@ create or replace type body ut_equal as overriding member function run_matcher(self in out nocopy ut_equal, a_actual ut_data_value) return boolean is l_result boolean; + l_actual ut_data_value; begin if self.expected.data_type = a_actual.data_type then if self.expected is of (ut_data_value_anydata) then l_result := 0 = treat(self.expected as ut_data_value_anydata).compare_implementation(a_actual, get_exclude_xpath(), get_include_xpath()); elsif self.expected is of (ut_data_value_refcursor) then - l_result := 0 = treat(self.expected as ut_data_value_refcursor).compare_implementation(a_actual, get_exclude_xpath(), get_include_xpath(), get_join_by_xpath(), get_unordered()); + l_actual := treat(a_actual as ut_data_value_refcursor).filter_cursor(exclude_list, include_list); + l_result := 0 = treat(self.expected as ut_data_value_refcursor).filter_cursor(exclude_list, include_list).compare_implementation(a_actual, get_exclude_xpath(), get_include_xpath(), get_join_by_xpath(), get_unordered()); else l_result := equal_with_nulls((self.expected = a_actual), a_actual); end if; From d002d18fb170537ccefa6a738d0ea3988401a1d9 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 16 Nov 2018 01:11:03 +0000 Subject: [PATCH 0097/1096] Refactored procedure `get_unit_test_info` to return more relevant information based on info suite cache. Suite cache is refreshed when calling procedure (as needed). --- source/api/ut_runner.pkb | 15 ++------- source/api/ut_runner.pks | 16 ++-------- source/api/ut_suite_item_info.tps | 27 ++++++++++++++++ source/api/ut_suite_items_info.tps | 19 +++++++++++ source/core/ut_suite_manager.pkb | 32 +++++++++---------- source/core/ut_suite_manager.pks | 20 ++++-------- .../create_synonyms_and_grants_for_public.sql | 4 +++ source/install.sql | 2 ++ source/uninstall_objects.sql | 4 +++ test/api/test_ut_runner.pkb | 14 +++++--- 10 files changed, 94 insertions(+), 59 deletions(-) create mode 100644 source/api/ut_suite_item_info.tps create mode 100644 source/api/ut_suite_items_info.tps diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index 3a2d6583b..e59caccb6 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -165,21 +165,12 @@ create or replace package body ut_runner is ut_annotation_manager.purge_cache(a_object_owner, a_object_type); end; - function get_unit_test_info(a_owner varchar2, a_package_name varchar2 := null) return tt_annotations pipelined is + function get_unit_test_info(a_owner varchar2, a_package_name varchar2 ) return ut_suite_items_info pipelined is l_cursor sys_refcursor; - l_filter varchar2(100); - l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_results tt_annotations; + l_results ut_suite_items_info; c_bulk_limit constant integer := 10; begin - l_filter := case when a_package_name is null then 'is null' else '= o.object_name' end; - open l_cursor for - 'select o.object_owner, o.object_name, upper(a.subobject_name),' || - ' a.position, a.name, a.text' || - ' from table('||l_ut_owner||'.ut_annotation_manager.get_annotated_objects(:a_owner, ''PACKAGE'')) o,' || - ' table(o.annotations) a' || - ' where :a_package_name ' || l_filter - using a_owner, a_package_name; + l_cursor := ut_suite_manager.get_suites_info( a_owner, a_package_name ); loop fetch l_cursor bulk collect into l_results limit c_bulk_limit; for i in 1 .. l_results.count loop diff --git a/source/api/ut_runner.pks b/source/api/ut_runner.pks index 45b8cb642..e7e53a5e2 100644 --- a/source/api/ut_runner.pks +++ b/source/api/ut_runner.pks @@ -87,24 +87,14 @@ create or replace package ut_runner authid current_user is procedure purge_cache(a_object_owner varchar2 := null, a_object_type varchar2 := null); - type t_annotation_rec is record ( - package_owner varchar2(250), - package_name varchar2(250), - procedure_name varchar2(250), - annotation_pos number(5,0), - annotation_name varchar2(1000), - annotation_text varchar2(4000) - ); - type tt_annotations is table of t_annotation_rec; - /** - * Returns a pipelined collection containing information about unit tests package/packages for a given owner + * Returns a pipelined collection containing information about unit test suites and the tests contained in them * * @param a_owner owner of unit tests to retrieve * @param a_package_name optional name of unit test package to retrieve, if NULLm all unit test packages are returned - * @return tt_annotations table of records + * @return ut_suite_items_info table of objects */ - function get_unit_test_info(a_owner varchar2, a_package_name varchar2 := null) return tt_annotations pipelined; + function get_unit_test_info(a_owner varchar2, a_package_name varchar2) return ut_suite_items_info pipelined; type t_reporter_rec is record ( reporter_object_name varchar2(250), diff --git a/source/api/ut_suite_item_info.tps b/source/api/ut_suite_item_info.tps new file mode 100644 index 000000000..eefef4db0 --- /dev/null +++ b/source/api/ut_suite_item_info.tps @@ -0,0 +1,27 @@ +create or replace type ut_suite_item_info as object ( + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + object_owner varchar2(250), + object_name varchar2(250), + item_name varchar2(250), + item_description varchar2(250), + item_type varchar2(250), + item_line_no integer, + path varchar2(4000), + disabled_flag integer +) +/ diff --git a/source/api/ut_suite_items_info.tps b/source/api/ut_suite_items_info.tps new file mode 100644 index 000000000..d84ed9092 --- /dev/null +++ b/source/api/ut_suite_items_info.tps @@ -0,0 +1,19 @@ +create or replace type ut_suite_items_info as + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + table of ut_suite_item_info +/ diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 03eb35a86..628350b10 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -674,15 +674,14 @@ create or replace package body ut_suite_manager is end configure_execution_by_path; - function get_suites_info(a_owner_name varchar2) return tt_suite_items pipelined is - l_cursor sys_refcursor; + function get_suites_info(a_owner_name varchar2, a_package_name varchar2) return sys_refcursor is + l_result sys_refcursor; l_ut_owner varchar2(250) := ut_utils.ut_owner; - c_bulk_limit constant integer := 100; - l_results tt_suite_items; begin + refresh_cache(a_owner_name); - open l_cursor for + open l_result for q'[with suite_items as ( select /*+ cardinality(c 100) */ c.* @@ -696,7 +695,12 @@ create or replace package body ut_suite_manager is and a.owner = c.object_owner and a.object_type = 'PACKAGE' )]' end ||q'[ - and c.object_owner = ']'||upper(a_owner_name)||q'[' + and c.object_owner = ']'||upper(a_owner_name) ||q'[' + and ]' + || case when a_package_name is not null + then 'c.object_name = :a_package_name' + else ':a_package_name is null' end + || q'[ ), suitepaths as ( select distinct @@ -737,17 +741,13 @@ create or replace package body ut_suite_manager is s.path, 0 as disabled_flag from logical_suites s ) - select c.* - from items c]'; - loop - fetch l_cursor bulk collect into l_results limit c_bulk_limit; - for i in 1 .. l_results.count loop - pipe row (l_results(i)); - end loop; - exit when l_cursor%notfound; - end loop; - close l_cursor; + select ]'||l_ut_owner||q'[.ut_suite_item_info( + object_owner, object_name, item_name, item_description, + item_type, item_line_no, path, disabled_flag + ) + from items c]' using upper(a_package_name); + return l_result; end; end ut_suite_manager; diff --git a/source/core/ut_suite_manager.pks b/source/core/ut_suite_manager.pks index 408a8a355..6e87b08a8 100644 --- a/source/core/ut_suite_manager.pks +++ b/source/core/ut_suite_manager.pks @@ -68,20 +68,14 @@ create or replace package ut_suite_manager authid current_user is a_skip_all_objects boolean := false ) return ut_suite_items; - type t_suite_item_rec is record ( - object_owner varchar2(250), - object_name varchar2(250), - item_name varchar2(250), - item_description varchar2(250), - item_type varchar2(250), - item_line_no varchar2(250), - path varchar2(4000), - disabled_flag integer - ); - type tt_suite_items is table of t_suite_item_rec; - - function get_suites_info(a_owner_name varchar2) return tt_suite_items pipelined; + /** + * Returns a ref cursor containing information about unit test suites and the tests contained in them + * + * @param a_owner owner of unit tests to retrieve + * @return ut_suite_items_info table of objects + */ + function get_suites_info(a_owner_name varchar2, a_package_name varchar2) return sys_refcursor; end ut_suite_manager; diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index 4928022eb..b8daca313 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -95,6 +95,8 @@ grant execute on &&ut3_owner..ut_annotation_cache_manager to public; grant execute on &&ut3_owner..ut_annotation_parser to public; grant execute on &&ut3_owner..ut_annotation_objs_cache_info to public; grant execute on &&ut3_owner..ut_annotation_obj_cache_info to public; +grant execute on &&ut3_owner..ut_suite_items_info to public; +grant execute on &&ut3_owner..ut_suite_item_info to public; begin $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then execute immediate 'grant select, insert, delete, update on &&ut3_owner..dbmspcc_blocks to public'; @@ -152,6 +154,8 @@ create public synonym ut_file_mapper for &&ut3_owner..ut_file_mapper; create public synonym ut_key_value_pairs for &&ut3_owner..ut_key_value_pairs; create public synonym ut_key_value_pair for &&ut3_owner..ut_key_value_pair; create public synonym ut_sonar_test_reporter for &&ut3_owner..ut_sonar_test_reporter; +create public synonym ut_suite_items_info for &&ut3_owner..ut_suite_items_info; +create public synonym ut_suite_item_info for &&ut3_owner..ut_suite_item_info; begin $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then execute immediate 'create public synonym dbmspcc_blocks for &&ut3_owner..dbmspcc_blocks'; diff --git a/source/install.sql b/source/install.sql index 31b91a941..50d70c944 100644 --- a/source/install.sql +++ b/source/install.sql @@ -259,6 +259,8 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'reporters/ut_documentation_reporter.tpb' --plugin interface API for running utPLSQL +@@install_component.sql 'api/ut_suite_item_info.tps' +@@install_component.sql 'api/ut_suite_items_info.tps' @@install_component.sql 'api/ut_runner.pks' @@install_component.sql 'api/ut_runner.pkb' diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index 119695b6d..97f2c5a5d 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -51,6 +51,10 @@ drop package ut_teamcity_reporter_helper; drop package ut_runner; +drop type ut_suite_items_info force; + +drop type ut_suite_item_info force; + drop package ut_suite_manager; drop package ut_suite_builder; diff --git a/test/api/test_ut_runner.pkb b/test/api/test_ut_runner.pkb index 3a8f6f670..5a9e4830a 100644 --- a/test/api/test_ut_runner.pkb +++ b/test/api/test_ut_runner.pkb @@ -273,12 +273,16 @@ end;'; begin --Arrange open l_expected for - select 'UT3_TESTER' package_owner, 'DUMMY_TEST_PACKAGE' package_name, - to_char(null) procedure_name, 2 annotation_pos, 'suite' annotation_name, 'dummy_test_suite' annotation_text + select + 'UT3_TESTER' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'DUMMY_TEST_PACKAGE' item_name, + 'dummy_test_suite' item_description, 'UT_SUITE' item_type, 2 item_line_no, + 'dummy_test_package' path, 0 disabled_flag from dual union all - select 'UT3_TESTER', 'DUMMY_TEST_PACKAGE', to_char(null), 3, 'rollback', 'manual' from dual union all - select 'UT3_TESTER', 'DUMMY_TEST_PACKAGE', 'SOME_DUMMY_TEST_PROCEDURE', 5, 'test', 'dummy_test' from dual union all - select 'UT3_TESTER', 'DUMMY_TEST_PACKAGE', 'SOME_DUMMY_TEST_PROCEDURE', 6, 'beforetest', 'some_procedure' from dual; + select + 'UT3_TESTER' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'SOME_DUMMY_TEST_PROCEDURE' item_name, + 'dummy_test' item_description, 'UT_TEST' item_type, 5 item_line_no, + 'dummy_test_package.some_dummy_test_procedure' path, 0 disabled_flag + from dual; --Act open l_actual for select * from table(ut3.ut_runner.get_unit_test_info('UT3_TESTER','DUMMY_TEST_PACKAGE')); --Assert From fc905ace49a6146fe1ed3da23d9f33871afdeca5 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 16 Nov 2018 23:30:15 +0000 Subject: [PATCH 0098/1096] Saving progress --- .../data_values/ut_column_info.tpb | 16 +- .../data_values/ut_column_info.tps | 6 +- .../data_values/ut_column_info_rec.tpb | 36 +- .../data_values/ut_column_info_rec.tps | 13 +- .../data_values/ut_compound_data_helper.pkb | 387 +++++++++--------- .../data_values/ut_compound_data_helper.pks | 6 +- .../data_values/ut_compound_data_value.tpb | 6 +- .../data_values/ut_compound_data_value.tps | 3 +- .../data_values/ut_cursor_info.tpb | 2 +- .../data_values/ut_data_value_refcursor.tpb | 5 +- .../data_values/ut_data_value_refcursor.tps | 3 +- source/expectations/matchers/ut_equal.tpb | 51 ++- source/expectations/matchers/ut_equal.tps | 6 + source/expectations/matchers/ut_include.tpb | 7 +- 14 files changed, 298 insertions(+), 249 deletions(-) diff --git a/source/expectations/data_values/ut_column_info.tpb b/source/expectations/data_values/ut_column_info.tpb index 5e913bf31..3bd99f15d 100644 --- a/source/expectations/data_values/ut_column_info.tpb +++ b/source/expectations/data_values/ut_column_info.tpb @@ -11,15 +11,21 @@ create or replace type body ut_column_info as a_col_type_name varchar2, a_col_prec integer, a_col_scale integer, - a_col_len integer, - a_dbms_sql_desc boolean := false) is + a_col_max_len integer, + a_dbms_sql_desc boolean := false, + a_parent_name varchar2 := null) is begin self.is_user_defined := 0; self.column_prec := a_col_prec; - self.column_len := a_col_len; + self.column_len := a_col_max_len; self.column_scale := a_col_scale; - self.xml_valid_name := '"'||a_col_name||'"'; - self.column_name := a_col_name; + self.column_name := TRIM( BOTH '''' FROM a_col_name); + self.xml_valid_name := '"'||self.column_name||'"'; + self.hashed_name := case when a_parent_name is not null then + ut_compound_data_helper.get_hash(utl_raw.cast_to_raw(a_parent_name||self.column_name)) + else + null + end; self.column_type := get_data_type(a_col_type,a_dbms_sql_desc); self.column_schema := a_col_schema_name; self.is_sql_diffable := ut_utils.boolean_to_int(ut_curr_usr_compound_helper.is_sql_compare_allowed(self.column_type)); diff --git a/source/expectations/data_values/ut_column_info.tps b/source/expectations/data_values/ut_column_info.tps index 331ab3d2e..27639771f 100644 --- a/source/expectations/data_values/ut_column_info.tps +++ b/source/expectations/data_values/ut_column_info.tps @@ -1,6 +1,7 @@ create or replace type ut_column_info force authid current_user as object ( xml_valid_name varchar2(100), + hashed_name raw(30), column_name varchar2(100), column_type varchar2(100), column_schema varchar2(100), @@ -18,8 +19,9 @@ create or replace type ut_column_info force authid current_user as object a_col_type_name varchar2, a_col_prec integer, a_col_scale integer, - a_col_len integer, - a_dbms_sql_desc boolean := false) + a_col_max_len integer, + a_dbms_sql_desc boolean := false, + a_parent_name varchar2 := null) ) not final not instantiable / diff --git a/source/expectations/data_values/ut_column_info_rec.tpb b/source/expectations/data_values/ut_column_info_rec.tpb index 19d6ab13a..efdbcced1 100644 --- a/source/expectations/data_values/ut_column_info_rec.tpb +++ b/source/expectations/data_values/ut_column_info_rec.tpb @@ -1,6 +1,6 @@ create or replace type body ut_column_info_rec as - member function get_anytype_attributes_info(a_anytype anytype) + member function get_anytype_attributes_info(a_anytype anytype, a_col_name varchar2) return ut_column_info_tab is l_result ut_column_info_tab := ut_column_info_tab(); l_attribute_typecode pls_integer; @@ -54,7 +54,9 @@ create or replace type body ut_column_info_rec as null, l_prec, l_scale, - l_len); + l_len, + false, + a_col_name); end loop; return l_result; end; @@ -86,15 +88,21 @@ create or replace type body ut_column_info_rec as a_col_type_name varchar2, a_col_prec integer, a_col_scale integer, - a_col_len integer, - a_dbms_sql_desc boolean := false) is + a_col_max_len integer, + a_dbms_sql_desc boolean := false, + a_parent_name varchar2) is l_anytype anytype; begin self.column_prec := a_col_prec; - self.column_len := a_col_len; + self.column_len := a_col_max_len; self.column_scale := a_col_scale; - self.xml_valid_name := '"'||a_col_name||'"'; - self.column_name := a_col_name; + self.column_name := TRIM(BOTH '''' FROM a_col_name); + self.xml_valid_name := '"'||self.column_name||'"'; + self.hashed_name := case when a_parent_name is not null then + ut_compound_data_helper.get_hash(utl_raw.cast_to_raw(a_parent_name||self.column_name)) + else + null + end; self.column_type := a_col_type_name; self.column_schema := a_col_schema_name; self.is_sql_diffable := 0; @@ -102,7 +110,7 @@ create or replace type body ut_column_info_rec as self.is_user_defined := 1; l_anytype := get_user_defined_type(a_col_schema_name, a_col_type_name); - self.nested_details := get_anytype_attributes_info(l_anytype); + self.nested_details := get_anytype_attributes_info(l_anytype, self.column_name); end; constructor function ut_column_info_rec(self in out nocopy ut_column_info_rec, @@ -112,18 +120,20 @@ create or replace type body ut_column_info_rec as a_col_type_name varchar2, a_col_prec integer, a_col_scale integer, - a_col_len integer, - a_dbms_sql_desc boolean := false) + a_col_max_len integer, + a_dbms_sql_desc boolean := false, + a_parent_name varchar2 := null) return self as result is begin if a_col_type = dbms_sql.user_defined_type then - self.init(a_col_type, a_col_name, a_col_schema_name, a_col_type_name,a_col_prec,a_col_scale,a_col_len); + self.init(a_col_type, a_col_name, a_col_schema_name, a_col_type_name,a_col_prec,a_col_scale,a_col_max_len); else (self as ut_column_info).init(a_col_type, a_col_name, a_col_schema_name, - a_col_type_name,a_col_prec,a_col_scale,a_col_len, - a_dbms_sql_desc); + a_col_type_name,a_col_prec,a_col_scale,a_col_max_len, + a_dbms_sql_desc, + a_parent_name); end if; return; end; diff --git a/source/expectations/data_values/ut_column_info_rec.tps b/source/expectations/data_values/ut_column_info_rec.tps index eeb1b93a1..0059bd08d 100644 --- a/source/expectations/data_values/ut_column_info_rec.tps +++ b/source/expectations/data_values/ut_column_info_rec.tps @@ -1,7 +1,8 @@ create or replace type ut_column_info_rec under ut_column_info ( nested_details ut_column_info_tab, - member function get_anytype_attributes_info(a_anytype anytype) + parent_name varchar2(100), + member function get_anytype_attributes_info(a_anytype anytype, a_col_name varchar2) return ut_column_info_tab, member function get_user_defined_type(a_owner varchar2, a_type_name varchar2) return anytype, @@ -12,8 +13,9 @@ create or replace type ut_column_info_rec under ut_column_info a_col_type_name varchar2, a_col_prec integer, a_col_scale integer, - a_col_len integer, - a_dbms_sql_desc boolean := false), + a_col_max_len integer, + a_dbms_sql_desc boolean := false, + a_parent_name varchar2 := null), constructor function ut_column_info_rec(self in out nocopy ut_column_info_rec, a_col_type binary_integer, a_col_name varchar2, @@ -21,8 +23,9 @@ create or replace type ut_column_info_rec under ut_column_info a_col_type_name varchar2, a_col_prec integer, a_col_scale integer, - a_col_len integer, - a_dbms_sql_desc boolean := false) + a_col_max_len integer, + a_dbms_sql_desc boolean := false, + a_parent_name varchar2 := null) return self as result ) / diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index bb0b8c1a5..613b97bb8 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -424,179 +424,147 @@ create or replace package body ut_compound_data_helper is return l_no_missing_keys; end; - - function generate_select_stmt(a_column_info ut_varchar2_list,a_xml_column_info xmltype) return clob is - l_sql_stmt clob; - l_col_type varchar2(4000); - l_alias varchar2(10) := 'ucd.'; - l_col_syntax varchar2(4000); - l_ut_owner varchar2(250) := ut_utils.ut_owner; - begin - for i in (select /*+ CARDINALITY(xt 100) */ - distinct - t.column_value, - xt.is_sql_diff, - xt.type - from - (select a_xml_column_info item_data from dual) x, - xmltable( - '/ROW/*' - passing x.item_data - columns - name varchar2(4000) PATH '@xml_valid_name', - type varchar2(4000) PATH '/', - is_sql_diff varchar2(4000) PATH '@sql_diffable' - ) xt, - table(a_column_info) t - where '"'||xt.name||'"' = t.column_value) + + procedure generate_not_equal_stmt(a_data_info ut_column_info, a_pk_table ut_varchar2_list, a_not_equal_stmt in out nocopy clob) is + l_pk_tab ut_varchar2_list := coalesce(a_pk_table,ut_varchar2_list()); + l_index integer; + l_sql_stmt varchar2(32767); + l_exists boolean := false; + begin + l_index := l_pk_tab.first; + if l_pk_tab.count > 0 then + loop + if a_data_info.column_name = l_pk_tab(l_index) then + l_exists := true; + end if; + exit when l_index = l_pk_tab.count or (a_data_info.column_name = l_pk_tab(l_index)); + l_index := a_pk_table.next(l_index); + end loop; + end if; + + if not(l_exists) then + l_sql_stmt := l_sql_stmt || case when a_not_equal_stmt is null then null else ' or ' end + ||' (decode(a.'||a_data_info.xml_valid_name||','||' e.'||a_data_info.xml_valid_name||',1,0) = 0)'; + ut_utils.append_to_clob(a_not_equal_stmt,l_sql_stmt); + end if; + end; + + procedure generate_join_by_stmt(a_data_info ut_column_info, a_pk_table ut_varchar2_list, a_join_by_stmt in out nocopy clob) is + l_pk_tab ut_varchar2_list := coalesce(a_pk_table,ut_varchar2_list()); + l_index integer ; + l_sql_stmt varchar2(32767); + begin + if l_pk_tab.count <> 0 then + l_index:= l_pk_tab.first; loop - if i.is_sql_diff = 0 then - l_col_syntax := l_ut_owner ||'.ut_compound_data_helper.get_hash('||l_alias||i.column_value||'.getClobVal()) as '||i.column_value ; - else - l_col_syntax := l_alias||i.column_value||' as '|| i.column_value; + if a_data_info.column_name = a_pk_table(l_index) then + l_sql_stmt := l_sql_stmt || case when a_join_by_stmt is null then null else ' and ' end; + if a_data_info.is_sql_diffable = 0 then + --TODO : Non diffable is more complex as to hash we need to know how to cast it to raw or clob ? + /*l_sql_stmt := l_ut_owner ||'.ut_compound_data_helper.get_hash( a.'||a_data_info.xml_valid_name||') = ' + ||l_ut_owner ||'.ut_compound_data_helper.get_hash( e.'||a_data_info.xml_valid_name||')';*/ + l_sql_stmt := l_sql_stmt ||' a.'||a_data_info.xml_valid_name||q'[ = ]'||' e.'||a_data_info.xml_valid_name; + elsif a_data_info.is_sql_diffable = 1 then + l_sql_stmt := l_sql_stmt ||' a.'||a_data_info.xml_valid_name||q'[ = ]'||' e.'||a_data_info.xml_valid_name; + end if; end if; - - l_sql_stmt := l_sql_stmt ||','||l_col_syntax; + exit when (a_data_info.column_name = a_pk_table(l_index)) or l_index = a_pk_table.count; + l_index := a_pk_table.next(l_index); end loop; - return l_sql_stmt; + ut_utils.append_to_clob(a_join_by_stmt,l_sql_stmt); + end if; end; - function generate_partition_stmt(a_column_info ut_varchar2_list) return clob is - l_sql_stmt clob; - l_alias varchar2(10) := 'ucd.'; + procedure generate_equal_sql(a_data_info ut_column_info,a_equal_stmt in out nocopy clob) is + l_sql_stmt varchar2(32767); + begin + l_sql_stmt := case when a_equal_stmt is null then null else ' and ' end ||' a.'||a_data_info.xml_valid_name||q'[ = ]'||' e.'||a_data_info.xml_valid_name; + ut_utils.append_to_clob(a_equal_stmt,l_sql_stmt); + end; + procedure generate_partition_stmt(a_data_info ut_column_info,a_partition_stmt in out nocopy clob) is + l_alias varchar2(10) := 'ucd.'; begin - if a_column_info.count > 0 or a_column_info is null then - for i in 1..a_column_info.count - loop - l_sql_stmt := l_sql_stmt || case - when l_sql_stmt is null then - null - else ',' - end||l_alias||a_column_info(i); - end loop; - l_sql_stmt := ', row_number() over (partition by '|| l_sql_stmt || ' order by '||l_sql_stmt||' ) dup_no '; - else - l_sql_stmt := ', 1 dup_no '; - end if; - return l_sql_stmt; - end; - - function generate_xmltab_stmt (a_column_info ut_varchar2_list,a_xml_column_info xmltype) return clob is + ut_utils.append_to_clob(a_partition_stmt,case when a_partition_stmt is null then null else ',' end||l_alias||a_data_info.xml_valid_name); + end; + + procedure generate_select_stmt(a_data_info ut_column_info,a_sql_stmt in out nocopy clob) is l_sql_stmt clob; + l_alias varchar2(10) := 'ucd.'; + l_col_syntax varchar2(4000); + l_ut_owner varchar2(250) := ut_utils.ut_owner; + begin + if a_data_info.is_sql_diffable = 0 then + l_col_syntax := l_ut_owner ||'.ut_compound_data_helper.get_hash('||l_alias||a_data_info.xml_valid_name||'.getClobVal()) as '||a_data_info.xml_valid_name ; + else + l_col_syntax := l_alias||a_data_info.xml_valid_name||' as '|| a_data_info.xml_valid_name; + end if; + ut_utils.append_to_clob(a_sql_stmt,','||l_col_syntax); + end; + + procedure generate_xmltab_stmt(a_data_info ut_column_info,a_sql_stmt in out nocopy clob) is + l_sql_stmt varchar2(32767); l_col_type varchar2(4000); begin - for i in (select /*+ CARDINALITY(xt 100) */ - distinct - t.column_value, - xt.is_sql_diff, - xt.type - from - (select a_xml_column_info item_data from dual) x, - xmltable( - '/ROW/*' - passing x.item_data - columns - name varchar2(4000) PATH '@xml_valid_name', - type varchar2(4000) PATH '/', - is_sql_diff varchar2(4000) PATH '@sql_diffable' - ) xt, - table(a_column_info) t - where '"'||xt.name||'"' = t.column_value) - loop - if i.is_sql_diff = 0 then - l_col_type := 'XMLTYPE'; - elsif i.is_sql_diff = 1 and (i.type IN ('CHAR','VARCHAR2','VARCHAR')) then - l_col_type := 'VARCHAR2(4000)'; - elsif i.is_sql_diff = 1 and i.type = 'DATE' then - l_col_type := 'TIMESTAMP'; - else - l_col_type := i.type; - end if; - - l_sql_stmt := l_sql_stmt||i.column_value||' '||l_col_type||q'[ PATH ']'||TRIM(BOTH '"' FROM i.column_value)||q'[',]'; - end loop; - return l_sql_stmt; + if a_data_info.is_sql_diffable = 0 then + l_col_type := 'XMLTYPE'; + elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type = 'DATE' then + l_col_type := 'TIMESTAMP'; + else + l_col_type := a_data_info.column_type||'('||a_data_info.column_len||')'; + end if; + l_sql_stmt := ' '||a_data_info.xml_valid_name||' '||l_col_type||q'[ PATH ']'||a_data_info.column_name||q'[',]'; + ut_utils.append_to_clob(a_sql_stmt, l_sql_stmt); end; - - function generate_equal_sql (a_column_info ut_varchar2_list) return clob is - l_sql_stmt clob; + + procedure gen_sql_pieces_out_of_cursor(a_data_info ut_data_value_refcursor,a_pk_table ut_varchar2_list, a_xml_stmt out nocopy clob, + a_select_stmt out nocopy clob ,a_partition_stmt out nocopy clob, a_equal_stmt out nocopy clob, a_join_by_stmt out nocopy clob, + a_not_equal_stmt out nocopy clob) is + l_cursor_info ut_column_info_tab := a_data_info.cursor_col_info.cursor_info; + l_partition_tmp clob; begin - for i in 1..a_column_info.count loop - l_sql_stmt := l_sql_stmt || case when l_sql_stmt is null then null else ' and ' end ||' a.'||a_column_info(i)||q'[ = ]'||' e.'||a_column_info(i); - end loop; - return l_sql_stmt; - end; - - function generate_join_by_on_stmt (a_join_by_xpath_tab ut_varchar2_list, a_columns_info xmltype, a_join_by_xpath in varchar2) return clob is - l_sql_stmt clob; - l_non_diff_var varchar2(32767); - l_ut_owner varchar2(250) := ut_utils.ut_owner; - begin - for i in (select /*+ CARDINALITY(xt 100) */ - distinct - t.column_value, - xt.is_sql_diff - from - (select a_columns_info item_data from dual) x, - xmltable( - '/ROW/*' - passing x.item_data - columns - name varchar2(4000) PATH '@xml_valid_name', - is_sql_diff varchar2(4000) PATH '@sql_diffable' - ) xt, - table(a_join_by_xpath_tab) t - where '"'||xt.name||'"' = t.column_value) - loop - - if i.is_sql_diff = 0 then - l_non_diff_var := l_ut_owner ||'.ut_compound_data_helper.get_hash((extract( a.'||i.column_value||', '||a_join_by_xpath||')).getclobval()) = ' - ||l_ut_owner ||'.ut_compound_data_helper.get_hash((extract( e.'||i.column_value||', '||a_join_by_xpath||')).getclobval())'; - l_sql_stmt := l_sql_stmt || case when l_sql_stmt is null then null else ' and ' end ||' a.'||i.column_value||q'[ = ]'||' e.'||i.column_value; - elsif i.is_sql_diff = 1 then - l_sql_stmt := l_sql_stmt || case when l_sql_stmt is null then null else ' and ' end ||' a.'||i.column_value||q'[ = ]'||' e.'||i.column_value; - end if; - - end loop; - - return l_sql_stmt; + if l_cursor_info is not null then + --Parition by piece + ut_utils.append_to_clob(a_partition_stmt,', row_number() over (partition by '); + --TODO : Handle nested objects... + for i in 1..l_cursor_info.count loop + --Get XMLTABLE column list + generate_xmltab_stmt(l_cursor_info(i),a_xml_stmt); + --Get Select statment list of columns + generate_select_stmt(l_cursor_info(i),a_select_stmt); + --Get columns by which we partition + generate_partition_stmt(l_cursor_info(i),l_partition_tmp); + --Get equal statement + generate_equal_sql(l_cursor_info(i),a_equal_stmt); + --Generate join by stmt + generate_join_by_stmt(l_cursor_info(i),a_pk_table,a_join_by_stmt); + --Generate not equal stmt + generate_not_equal_stmt(l_cursor_info(i),a_pk_table,a_not_equal_stmt); + end loop; + --Finish parition by + ut_utils.append_to_clob(a_partition_stmt,l_partition_tmp||' order by '||l_partition_tmp||' ) dup_no '); + else + --Partition by piece when no data + ut_utils.append_to_clob(a_partition_stmt,', 1 dup_no '); + end if; end; - - function generate_not_equal_sql (a_column_info ut_varchar2_list, a_join_by_xpath ut_varchar2_list) return clob is - l_sql_stmt clob; - begin - for i in ( - with xpaths_tab as (select column_value xpath from table(a_join_by_xpath)), - pk_names as (select '"'||REGEXP_SUBSTR (xpath,'[^(/\*/)](.+)$')||'"' name - from xpaths_tab) - select /*+ CARDINALITY(xt 100) */ - column_value as name - from table(a_column_info) xt - where not exists (select 1 from pk_names p where lower(p.name) = lower(xt.column_value)) - ) - loop - l_sql_stmt := l_sql_stmt || case when l_sql_stmt is null then null else ' or ' end ||' (decode(a.'||i.name||','||' e.'||i.name||',1,0) = 0)'; - end loop; - return l_sql_stmt; - end; function gen_compare_sql(a_column_info xmltype, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_inclusion_type boolean, a_is_negated boolean, - a_unordered boolean) return clob is + a_unordered boolean, a_other ut_data_value_refcursor :=null, a_join_by_list ut_varchar2_list:=null ) return clob is l_compare_sql clob; l_temp_string varchar2(32767); - l_pk_xpath_tabs ut_varchar2_list := ut_varchar2_list(); - l_act_col_tab ut_varchar2_list := ut_varchar2_list(); - l_ut_owner varchar2(250) := ut_utils.ut_owner; l_xmltable_stmt clob; l_where_stmt clob; l_select_stmt clob; l_partition_stmt clob; + l_equal_stmt clob; + l_join_on_stmt clob; + l_not_equal_stmt clob; l_column_filter varchar2(32767); - + function get_filtered_columns_name (a_columns_info in xmltype, a_exclude_xpath varchar2, a_include_xpath varchar2) return ut_varchar2_list is l_columns_info ut_varchar2_list := ut_varchar2_list(); begin @@ -626,14 +594,10 @@ create or replace package body ut_compound_data_helper is --TODO: Comment better all pieces l_column_filter := get_columns_row_filter(a_exclude_xpath, a_include_xpath); - l_act_col_tab := get_filtered_columns_name(a_column_info,a_exclude_xpath,a_include_xpath); - - l_pk_xpath_tabs := get_filtered_columns_name(a_column_info,null,a_join_by_xpath); - - l_xmltable_stmt := generate_xmltab_stmt(l_act_col_tab,a_column_info); - l_select_stmt := generate_select_stmt(l_act_col_tab,a_column_info); - l_partition_stmt := generate_partition_stmt(l_act_col_tab); - + gen_sql_pieces_out_of_cursor(a_other, a_join_by_list, + l_xmltable_stmt, l_select_stmt, l_partition_stmt, l_equal_stmt, + l_join_on_stmt, l_not_equal_stmt); + l_temp_string := 'with exp as ( select ucd.* '; ut_utils.append_to_clob(l_compare_sql, l_temp_string); ut_utils.append_to_clob(l_compare_sql,l_partition_stmt); @@ -689,10 +653,10 @@ create or replace package body ut_compound_data_helper is if a_join_by_xpath is null and a_unordered then -- If no key defined do the join on all columns - ut_utils.append_to_clob(l_compare_sql,generate_equal_sql(l_act_col_tab)); + ut_utils.append_to_clob(l_compare_sql,l_equal_stmt); elsif a_join_by_xpath is not null and a_unordered then -- If key defined do the join or these and where on diffrences - ut_utils.append_to_clob(l_compare_sql,generate_join_by_on_stmt (l_pk_xpath_tabs,a_column_info,a_join_by_xpath)); + ut_utils.append_to_clob(l_compare_sql,l_join_on_stmt); elsif not a_unordered then ut_utils.append_to_clob(l_compare_sql, 'a.item_no = e.item_no ' ); end if; @@ -700,14 +664,12 @@ create or replace package body ut_compound_data_helper is ut_utils.append_to_clob(l_compare_sql,' ) where '); if (a_join_by_xpath is not null) and (a_unordered) and (not a_is_negated) then - l_where_stmt := generate_not_equal_sql(l_act_col_tab, l_pk_xpath_tabs); - if l_where_stmt is not null then - ut_utils.append_to_clob(l_compare_sql,' ( '||l_where_stmt||' ) or '); + if l_not_equal_stmt is not null then + ut_utils.append_to_clob(l_compare_sql,' ( '||l_not_equal_stmt||' ) or '); end if; elsif not a_unordered then - l_where_stmt := generate_not_equal_sql(l_act_col_tab, l_pk_xpath_tabs); - if l_where_stmt is not null then - ut_utils.append_to_clob(l_compare_sql,' ( '||l_where_stmt||' ) or '); + if l_not_equal_stmt is not null then + ut_utils.append_to_clob(l_compare_sql,' ( '||l_not_equal_stmt||' ) or '); end if; end if; @@ -718,7 +680,8 @@ create or replace package body ut_compound_data_helper is l_temp_string := ' (a.data_id is null or e.data_id is null) '; end if; ut_utils.append_to_clob(l_compare_sql,l_temp_string); - + + --dbms_output.put_line(l_compare_sql); return l_compare_sql; end; @@ -749,29 +712,6 @@ create or replace package body ut_compound_data_helper is return g_diff_count; end; - function populate_filter_columns (a_column_string in varchar2, a_column_info ut_column_info_tab) return ut_column_info_rec is - l_result ut_column_info_rec; - l_column_from_string varchar2(32767); - l_rest_of_path varchar2(32767); - begin - --check if string has a path - l_column_from_string := regexp_substr(a_column_string,'^([^\/]*)?\/?(.*)',1,1,null,1); - for col in 1..a_column_info.count loop - if l_column_from_string = a_column_info(col).column_name then - if a_column_string like '%/%' then - l_rest_of_path := regexp_substr(a_column_string,'^([^\/]*)?\/(.*)',1,1,null,2); - l_result := treat(a_column_info(col) as ut_column_info_rec); - l_result.nested_details := ut_column_info_tab(); - l_result.nested_details.extend; - l_result.nested_details(l_result.nested_details.last) := populate_filter_columns (l_rest_of_path,treat(a_column_info(col) as ut_column_info_rec).nested_details); - else - l_result := treat(a_column_info(col) as ut_column_info_rec); - end if; - end if; - end loop; - return l_result; - end; - function get_child(a_parent in varchar2 default null) return ut_varchar2_list is l_out_tab ut_varchar2_list := ut_varchar2_list(); cursor c_child(cp_parent in varchar2) is @@ -809,39 +749,75 @@ create or replace package body ut_compound_data_helper is return l_out_tab; end; - function exc_inc_cursors_columns(a_column_info_tab ut_column_info_tab,a_current_list ut_varchar2_list) + function inc_cursors_columns(a_column_info_tab ut_column_info_tab,a_current_list ut_varchar2_list) return ut_column_info_tab is l_result ut_column_info_tab := ut_column_info_tab(); l_record ut_column_info_rec; - l_index integer := 1; + l_index integer; begin - --TODO : Optimize search using while or exists operator ? for lst in 1..a_current_list.count loop - for i in 1..a_column_info_tab.count loop - if a_current_list(lst) = a_column_info_tab(i).column_name then + l_index := a_column_info_tab.first; + loop + if a_current_list(lst) = a_column_info_tab(l_index).column_name then l_result.extend; - if a_column_info_tab(i) is of (ut_column_info_rec) then - l_record := treat(a_column_info_tab(i) as ut_column_info_rec); - l_record.nested_details := exc_inc_cursors_columns(treat(a_column_info_tab(i) as ut_column_info_rec).nested_details,get_child(a_column_info_tab(i).column_name)); + l_record := treat(a_column_info_tab(l_index) as ut_column_info_rec); + + if treat(a_column_info_tab(l_index) as ut_column_info_rec).nested_details is not null then + l_record.nested_details := inc_cursors_columns(treat(a_column_info_tab(l_index) as ut_column_info_rec).nested_details,get_child(a_column_info_tab(l_index).column_name)); end if; + l_result(l_result.last) := l_record; end if; + exit when (a_current_list(lst) = a_column_info_tab(l_index).column_name) or (l_index = a_column_info_tab.count); + l_index := a_column_info_tab.next(l_index); end loop; end loop; + + return l_result; + end; + + function exc_cursors_columns(a_column_info_tab ut_column_info_tab,a_current_list ut_varchar2_list) + return ut_column_info_tab is + l_result ut_column_info_tab := ut_column_info_tab(); + l_record ut_column_info_rec; + l_index integer; + l_exists boolean := false; + begin + --TODO : Optimize search using while or exists operator ? + for lst in 1..a_column_info_tab.count loop + l_index := a_current_list.first; + loop + if a_current_list(l_index) = a_column_info_tab(lst).column_name then + l_exists := true; + end if; + exit when (a_current_list(l_index) = a_column_info_tab(lst).column_name) or (l_index = a_current_list.count); + l_index := a_current_list.next(l_index); + end loop; + + if not(l_exists) then + l_result.extend; + l_record := treat(a_column_info_tab(lst) as ut_column_info_rec); + if treat(a_column_info_tab(lst) as ut_column_info_rec).nested_details is not null then + l_record.nested_details := exc_cursors_columns(treat(a_column_info_tab(lst) as ut_column_info_rec).nested_details,get_child(a_column_info_tab(lst).column_name)); + end if; + l_result(l_result.last) := l_record; + end if; + l_exists := false; + end loop; return l_result; end; function inc_exc_columns_from_cursor (a_cursor_info ut_column_info_tab, a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) return ut_column_info_tab is l_filtered_set ut_varchar2_list := ut_varchar2_list(); - l_result ut_column_info_tab := ut_column_info_tab(); + l_result ut_column_info_tab := ut_column_info_tab(); + l_include boolean; begin g_filter_tab := ut_varchar2_list(); - + -- if include and exclude is not null its columns from include minus exclude -- If inlcude is not null and exclude is null cursor will have only include -- If exclude is not null and include is null cursor will have all except exclude - if a_include_xpath.count > 0 and a_exclude_xpath.count > 0 then select col_names bulk collect into l_filtered_set from( @@ -851,23 +827,28 @@ create or replace package body ut_compound_data_helper is select regexp_replace(column_value,'^((/ROW/)|^(//)|^(/\*/))?(.*)','\5') col_names from table(a_exclude_xpath) ); + l_include := true; elsif a_include_xpath.count > 0 and a_exclude_xpath.count = 0 then select regexp_replace(column_value,'^((/ROW/)|^(//)|^(/\*/))?(.*)','\5') col_names bulk collect into l_filtered_set from table(a_include_xpath); + l_include := true; elsif a_include_xpath.count = 0 and a_exclude_xpath.count > 0 then select regexp_replace(column_value,'^((/ROW/)|^(//)|^(/\*/))?(.*)','\5') col_names bulk collect into l_filtered_set from table(a_exclude_xpath); + l_include := false; elsif a_cursor_info is not null then l_result:= a_cursor_info; else l_result := ut_column_info_tab(); end if; - - g_filter_tab := l_filtered_set; - if g_filter_tab.count <> 0 then - l_result := exc_inc_cursors_columns(a_cursor_info,get_child()); + + g_filter_tab := l_filtered_set; + if l_filtered_set.count <> 0 and l_include then + l_result := inc_cursors_columns(a_cursor_info,get_child()); + elsif l_filtered_set.count <> 0 and not(l_include) then + l_result := exc_cursors_columns(a_cursor_info,get_child()); end if; return l_result; diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 4c844774d..924593c62 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -52,8 +52,8 @@ create or replace package ut_compound_data_helper authid definer is act_data_id raw(32), exp_item_data xmltype, exp_data_id raw(32), - item_no integer, - dup_no integer + item_no number, + dup_no number ); type t_diff_tab is table of t_diff_rec; @@ -92,7 +92,7 @@ create or replace package ut_compound_data_helper authid definer is function gen_compare_sql(a_column_info xmltype, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_inclusion_type boolean, a_is_negated boolean, - a_unordered boolean ) return clob; + a_unordered boolean, a_other ut_data_value_refcursor :=null, a_join_by_list ut_varchar2_list:=null ) return clob; procedure insert_diffs_result(a_diff_tab t_diff_tab, a_diff_id raw); diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index 51b2e22cc..9b37dd8ea 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -201,7 +201,8 @@ create or replace type body ut_compound_data_value as end; member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, - a_join_by_xpath varchar2,a_unordered boolean, a_inclusion_compare boolean := false, a_is_negated boolean := false ) return integer is + a_join_by_xpath varchar2,a_unordered boolean, a_inclusion_compare boolean := false, + a_is_negated boolean := false, a_join_by_list ut_varchar2_list:=null ) return integer is l_diff_id ut_compound_data_helper.t_hash; l_other ut_compound_data_value; @@ -221,7 +222,8 @@ create or replace type body ut_compound_data_value as l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); open l_loop_curs for ut_compound_data_helper.gen_compare_sql(treat(a_other as ut_data_value_refcursor).col_info_desc, a_exclude_xpath, - a_include_xpath, a_join_by_xpath, a_inclusion_compare, a_is_negated, a_unordered ) using self.data_id,l_other.data_id; + a_include_xpath, a_join_by_xpath, a_inclusion_compare, a_is_negated, a_unordered, + treat(a_other as ut_data_value_refcursor), a_join_by_list ) using self.data_id,l_other.data_id; loop fetch l_loop_curs bulk collect into l_diff_tab limit l_max_rows; exit when l_diff_tab.count = 0; diff --git a/source/expectations/data_values/ut_compound_data_value.tps b/source/expectations/data_values/ut_compound_data_value.tps index 2e76bb8f8..ce14c494e 100644 --- a/source/expectations/data_values/ut_compound_data_value.tps +++ b/source/expectations/data_values/ut_compound_data_value.tps @@ -45,6 +45,7 @@ create or replace type ut_compound_data_value force under ut_data_value( member function get_data_diff(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean) return clob, member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2) return integer, member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, - a_join_by_xpath varchar2, a_unordered boolean, a_inclusion_compare boolean := false,a_is_negated boolean := false ) return integer + a_join_by_xpath varchar2, a_unordered boolean, a_inclusion_compare boolean := false, + a_is_negated boolean := false, a_join_by_list ut_varchar2_list:=null ) return integer ) not final not instantiable / diff --git a/source/expectations/data_values/ut_cursor_info.tpb b/source/expectations/data_values/ut_cursor_info.tpb index 34e5946cc..819ac704a 100644 --- a/source/expectations/data_values/ut_cursor_info.tpb +++ b/source/expectations/data_values/ut_cursor_info.tpb @@ -21,7 +21,7 @@ create or replace type body ut_cursor_info as l_columns_desc(i).col_type_name, l_columns_desc(i).col_precision, l_columns_desc(i).col_scale, - l_columns_desc(i).col_name_len, + l_columns_desc(i).col_max_len, true); end loop; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 5e4d2a5cb..84552ed4a 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -227,7 +227,8 @@ create or replace type body ut_data_value_refcursor as end; overriding member function compare_implementation (a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, - a_unordered boolean, a_inclusion_compare boolean := false, a_is_negated boolean := false) return integer is + a_unordered boolean, a_inclusion_compare boolean := false, + a_is_negated boolean := false, a_join_by_list ut_varchar2_list:=null) return integer is l_result integer := 0; l_other ut_data_value_refcursor; function is_pk_missing (a_pk_missing_tab ut_compound_data_helper.tt_missing_pk) return integer is @@ -256,7 +257,7 @@ create or replace type body ut_data_value_refcursor as end if; l_result := l_result + (self as ut_compound_data_value).compare_implementation(a_other, a_exclude_xpath, a_include_xpath, - a_join_by_xpath,a_unordered, a_inclusion_compare, a_is_negated); + a_join_by_xpath,a_unordered, a_inclusion_compare, a_is_negated, a_join_by_list); end if; return l_result; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tps b/source/expectations/data_values/ut_data_value_refcursor.tps index fa6e41483..790ddf895 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tps +++ b/source/expectations/data_values/ut_data_value_refcursor.tps @@ -54,7 +54,8 @@ create or replace type ut_data_value_refcursor under ut_compound_data_value( overriding member function to_string return varchar2, overriding member function diff( a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean := false ) return varchar2, overriding member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, - a_unordered boolean, a_inclusion_compare boolean := false, a_is_negated boolean := false) return integer, + a_unordered boolean, a_inclusion_compare boolean := false, + a_is_negated boolean := false, a_join_by_list ut_varchar2_list:=null) return integer, overriding member function is_empty return boolean, member function filter_cursor (a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) return ut_data_value_refcursor ) diff --git a/source/expectations/matchers/ut_equal.tpb b/source/expectations/matchers/ut_equal.tpb index 8e857ad80..854b4eef0 100644 --- a/source/expectations/matchers/ut_equal.tpb +++ b/source/expectations/matchers/ut_equal.tpb @@ -158,28 +158,44 @@ create or replace type body ut_equal as member function include(a_items varchar2) return ut_equal is l_result ut_equal := self; begin - ut_utils.append_to_list(l_result.include_list, a_items); + l_result.include_list := l_result.include_list multiset union all coalesce(ut_utils.string_to_table(a_items,','),ut_varchar2_list()); + l_result.include_list := l_result.include_list multiset union all coalesce(ut_utils.string_to_table(a_items,'|'),ut_varchar2_list()); return l_result; end; member function include(a_items ut_varchar2_list) return ut_equal is l_result ut_equal := self; - begin - l_result.include_list := l_result.include_list multiset union all coalesce(a_items,ut_varchar2_list()); + l_items ut_varchar2_list := ut_varchar2_list(); + begin + --Split exclude into single expressions so we cater for concat operator like | + for i in 1..a_items.count loop + l_items := l_items multiset union all coalesce(ut_utils.string_to_table(a_items(i),'|'),ut_varchar2_list()); + l_items := l_items multiset union all coalesce(ut_utils.string_to_table(a_items(i),','),ut_varchar2_list()); + end loop; + l_result.include_list := l_result.include_list multiset union all coalesce(l_items,ut_varchar2_list()); return l_result; end; member function exclude(a_items varchar2) return ut_equal is l_result ut_equal := self; begin - ut_utils.append_to_list(l_result.exclude_list, a_items); + l_result.exclude_list := l_result.exclude_list multiset union all coalesce(ut_utils.string_to_table(a_items,','),ut_varchar2_list()); + l_result.exclude_list := l_result.exclude_list multiset union all coalesce(ut_utils.string_to_table(a_items,'|'),ut_varchar2_list()); return l_result; end; member function exclude(a_items ut_varchar2_list) return ut_equal is l_result ut_equal := self; - begin - l_result.exclude_list := l_result.exclude_list multiset union all coalesce(a_items,ut_varchar2_list()); + l_items ut_varchar2_list := ut_varchar2_list(); + begin + --Split exclude into single expressions so we cater for concat operator like | + for i in 1..a_items.count loop + --TODO : idoiot proof solution for both include and exclude + l_items := l_items multiset union all coalesce(ut_utils.string_to_table(a_items(i),'|'),ut_varchar2_list()); + l_items := l_items multiset union all coalesce(ut_utils.string_to_table(a_items(i),','),ut_varchar2_list()); + end loop; + + l_result.exclude_list := l_result.exclude_list multiset union all coalesce(l_items,ut_varchar2_list()); return l_result; end; @@ -194,15 +210,31 @@ create or replace type body ut_equal as l_result ut_equal := self; begin l_result.is_unordered := ut_utils.boolean_to_int(true); - ut_utils.append_to_list(l_result.join_columns, a_columns); + l_result.join_columns := l_result.join_columns multiset union all coalesce(ut_utils.string_to_table(a_columns,','),ut_varchar2_list()); + l_result.join_columns := l_result.join_columns multiset union all coalesce(ut_utils.string_to_table(a_columns,'|'),ut_varchar2_list()); + + select regexp_replace(column_value,'^((/ROW/)|^(//)|^(/\*/))?(.*)','\5') col_names + bulk collect into l_result.join_on_list + from table(l_result.join_columns); return l_result; end; member function join_by(a_columns ut_varchar2_list) return ut_equal is l_result ut_equal := self; + l_items ut_varchar2_list := ut_varchar2_list(); begin l_result.is_unordered := ut_utils.boolean_to_int(true); - l_result.join_columns := l_result.join_columns multiset union all coalesce(a_columns,ut_varchar2_list()); + for i in 1..a_columns.count loop + --TODO : idoiot proof solution for both include and exclude + l_items := l_items multiset union all coalesce(ut_utils.string_to_table(a_columns(i),'|'),ut_varchar2_list()); + l_items := l_items multiset union all coalesce(ut_utils.string_to_table(a_columns(i),','),ut_varchar2_list()); + end loop; + l_result.join_columns := l_result.join_columns multiset union all coalesce(l_items,ut_varchar2_list()); + + select regexp_replace(column_value,'^((/ROW/)|^(//)|^(/\*/))?(.*)','\5') col_names + bulk collect into l_result.join_on_list + from table(l_result.join_columns); + return l_result; end; @@ -235,7 +267,8 @@ create or replace type body ut_equal as l_result := 0 = treat(self.expected as ut_data_value_anydata).compare_implementation(a_actual, get_exclude_xpath(), get_include_xpath()); elsif self.expected is of (ut_data_value_refcursor) then l_actual := treat(a_actual as ut_data_value_refcursor).filter_cursor(exclude_list, include_list); - l_result := 0 = treat(self.expected as ut_data_value_refcursor).filter_cursor(exclude_list, include_list).compare_implementation(a_actual, get_exclude_xpath(), get_include_xpath(), get_join_by_xpath(), get_unordered()); + l_result := 0 = treat(self.expected as ut_data_value_refcursor).filter_cursor(exclude_list, include_list).compare_implementation(l_actual, get_exclude_xpath(), + get_include_xpath(), get_join_by_xpath(), get_unordered(), false, false, join_on_list ); else l_result := equal_with_nulls((self.expected = a_actual), a_actual); end if; diff --git a/source/expectations/matchers/ut_equal.tps b/source/expectations/matchers/ut_equal.tps index 0ccbd23c8..3380306e7 100644 --- a/source/expectations/matchers/ut_equal.tps +++ b/source/expectations/matchers/ut_equal.tps @@ -36,6 +36,12 @@ create or replace type ut_equal under ut_comparison_matcher( */ join_columns ut_varchar2_list, + /** + * Holds list of columns to be used as a join PK on sys_refcursor comparision, prefiltered to remvoe + * xpath tag from from + */ + join_on_list ut_varchar2_list, + member procedure init(self in out nocopy ut_equal, a_expected ut_data_value, a_nulls_are_equal boolean), member function equal_with_nulls( self in ut_equal, a_assert_result boolean, a_actual ut_data_value) return boolean, constructor function ut_equal(self in out nocopy ut_equal, a_expected anydata, a_nulls_are_equal boolean := null) return self as result, diff --git a/source/expectations/matchers/ut_include.tpb b/source/expectations/matchers/ut_include.tpb index 7439aea3e..0e570a719 100644 --- a/source/expectations/matchers/ut_include.tpb +++ b/source/expectations/matchers/ut_include.tpb @@ -50,10 +50,13 @@ create or replace type body ut_include as overriding member function run_matcher(self in out nocopy ut_include, a_actual ut_data_value) return boolean is l_result boolean; + l_actual ut_data_value; begin if self.expected.data_type = a_actual.data_type then - l_result := 0 = treat(self.expected as ut_data_value_refcursor).compare_implementation(a_actual, self.get_exclude_xpath(), self.get_include_xpath(), self.get_join_by_xpath(), - true,self.get_inclusion_compare(), self.get_negated()); + l_actual := treat(a_actual as ut_data_value_refcursor).filter_cursor(exclude_list, include_list); + l_result := 0 = treat(self.expected as ut_data_value_refcursor).filter_cursor(exclude_list, include_list).compare_implementation(l_actual, + self.get_exclude_xpath(), self.get_include_xpath(), self.get_join_by_xpath(), + true,self.get_inclusion_compare(), self.get_negated(), join_on_list); else l_result := (self as ut_matcher).run_matcher(a_actual); end if; From e1f1eec2024126a50168c2613bfeb9b2e989f7c1 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 16 Nov 2018 23:35:06 +0000 Subject: [PATCH 0099/1096] Renamed `get_unit_test_info` to `get_suites_info` - the latter one was not used uin prior versions. Added functions `is_test`, `is_suite`, `has_suite` to perform checks for test/suite existance at prcedure, package, schema level. --- source/api/ut_runner.pkb | 38 ++++++++++++++++- source/api/ut_runner.pks | 28 ++++++++++++- source/core/ut_suite_cache_manager.pkb | 2 +- source/core/ut_suite_manager.pkb | 51 ++++++++++++++++++++++- source/core/ut_suite_manager.pks | 25 ++++++++++- test/api/test_ut_runner.pkb | 57 +++++++++++++++++++++++++- test/api/test_ut_runner.pks | 40 +++++++++++++++++- 7 files changed, 231 insertions(+), 10 deletions(-) diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index e59caccb6..64faf91ed 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -165,7 +165,7 @@ create or replace package body ut_runner is ut_annotation_manager.purge_cache(a_object_owner, a_object_type); end; - function get_unit_test_info(a_owner varchar2, a_package_name varchar2 ) return ut_suite_items_info pipelined is + function get_suites_info(a_owner varchar2, a_package_name varchar2 := null) return ut_suite_items_info pipelined is l_cursor sys_refcursor; l_results ut_suite_items_info; c_bulk_limit constant integer := 10; @@ -182,6 +182,42 @@ create or replace package body ut_runner is return; end; + function is_test(a_owner varchar2, a_package_name varchar2, a_procedure_name varchar2) return boolean is + l_result boolean := false; + begin + if a_owner is not null and a_package_name is not null and a_procedure_name is not null then + + l_result := ut_suite_manager.suite_item_exists( a_owner, a_package_name, a_procedure_name ); + + end if; + + return l_result; + end; + + function is_suite(a_owner varchar2, a_package_name varchar2) return boolean is + l_result boolean := false; + begin + if a_owner is not null and a_package_name is not null then + + l_result := ut_suite_manager.suite_item_exists( a_owner, a_package_name ); + + end if; + + return l_result; + end; + + function has_suites(a_owner varchar2) return boolean is + l_result boolean := false; + begin + if a_owner is not null then + + l_result := ut_suite_manager.suite_item_exists( a_owner ); + + end if; + + return l_result; + end; + function get_reporters_list return tt_reporters_info pipelined is l_cursor sys_refcursor; l_owner varchar2(128) := upper(ut_utils.ut_owner()); diff --git a/source/api/ut_runner.pks b/source/api/ut_runner.pks index e7e53a5e2..9dc18b9b9 100644 --- a/source/api/ut_runner.pks +++ b/source/api/ut_runner.pks @@ -94,7 +94,33 @@ create or replace package ut_runner authid current_user is * @param a_package_name optional name of unit test package to retrieve, if NULLm all unit test packages are returned * @return ut_suite_items_info table of objects */ - function get_unit_test_info(a_owner varchar2, a_package_name varchar2) return ut_suite_items_info pipelined; + function get_suites_info(a_owner varchar2, a_package_name varchar2 := null) return ut_suite_items_info pipelined; + + + /** + * Returns true if given procedure is a test in a test suite, false otherwise + * + * @param a_owner owner of test package + * @param a_package_name name of test package + * @param a_procedure_name name of test procedure + */ + function is_test(a_owner varchar2, a_package_name varchar2, a_procedure_name varchar2) return boolean; + + /** + * Returns true if given package is a test suite, false otherwise + * + * @param a_owner owner of test package + * @param a_package_name name of test package + */ + function is_suite(a_owner varchar2, a_package_name varchar2) return boolean; + + /** + * Returns true if given schema contains test suites, false otherwise + * + * @param a_owner owner of test package + */ + function has_suites(a_owner varchar2) return boolean; + type t_reporter_rec is record ( reporter_object_name varchar2(250), diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index ba51a242f..ce7f018e0 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -37,7 +37,7 @@ create or replace package body ut_suite_cache_manager is l_object_owner varchar2(250) := upper(a_object_owner); l_object_name varchar2(250) := upper(a_object_name); begin - if a_suite_items.count = 0 then + if a_suite_items is not null and a_suite_items.count = 0 then delete from ut_suite_cache t where t.object_owner = l_object_owner diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 628350b10..5dfeedfc8 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -674,7 +674,10 @@ create or replace package body ut_suite_manager is end configure_execution_by_path; - function get_suites_info(a_owner_name varchar2, a_package_name varchar2) return sys_refcursor is + function get_suites_info( + a_owner_name varchar2, + a_package_name varchar2 := null + ) return sys_refcursor is l_result sys_refcursor; l_ut_owner varchar2(250) := ut_utils.ut_owner; begin @@ -750,5 +753,51 @@ create or replace package body ut_suite_manager is return l_result; end; + function suite_item_exists( + a_owner_name varchar2, + a_package_name varchar2 := null, + a_procedure_name varchar2 := null, + a_item_type varchar2 := null + ) return boolean is + l_result integer; + l_ut_owner varchar2(250) := ut_utils.ut_owner; + begin + refresh_cache(a_owner_name); + + execute immediate q'[ + select count(1) from dual + where exists ( + select 1 + from ]'||l_ut_owner||q'[.ut_suite_cache c + where 1 = 1 ]'||case when can_skip_all_objects_scan(a_owner_name) then q'[ + and exists + ( select 1 + from all_objects a + where a.object_name = c.object_name + and a.owner = :a_owner_name + and a.owner = c.object_owner + and a.object_type = 'PACKAGE' + )]' else q'[ + and :a_owner_name is not null ]' end ||q'[ + and c.object_owner = :a_owner_name + and ]' + || case when a_package_name is not null + then 'c.object_name = :a_package_name' + else ':a_package_name is null' end + || q'[ + and ]' + || case when a_procedure_name is not null + then 'c.name = :a_procedure_name' + else ':a_procedure_name is null' end + || q'[ + )]' + into l_result + using + upper(a_owner_name), upper(a_owner_name), + upper(a_package_name), upper(a_procedure_name); + + return l_result > 0; + end; + end ut_suite_manager; / diff --git a/source/core/ut_suite_manager.pks b/source/core/ut_suite_manager.pks index 6e87b08a8..5fd82f9be 100644 --- a/source/core/ut_suite_manager.pks +++ b/source/core/ut_suite_manager.pks @@ -72,10 +72,31 @@ create or replace package ut_suite_manager authid current_user is /** * Returns a ref cursor containing information about unit test suites and the tests contained in them * - * @param a_owner owner of unit tests to retrieve + * @param a_owner owner of unit tests to retrieve + * @param a_package_name name of test package (optional) + * @param a_procedure_name name of test procedure (optional) * @return ut_suite_items_info table of objects */ - function get_suites_info(a_owner_name varchar2, a_package_name varchar2) return sys_refcursor; + function get_suites_info( + a_owner_name varchar2, + a_package_name varchar2 := null + ) return sys_refcursor; + + /** + * Returns true if given suite item exists + * + * @param a_owner owner of items to retrieve + * @param a_package_name name of suite package (optional) + * @param a_procedure_name name of suite item (optional) + * @param a_item_type suite_item type (optional) + * @return ut_suite_items_info table of objects + */ + function suite_item_exists( + a_owner_name varchar2, + a_package_name varchar2 := null, + a_procedure_name varchar2 := null, + a_item_type varchar2 := null + ) return boolean; end ut_suite_manager; diff --git a/test/api/test_ut_runner.pkb b/test/api/test_ut_runner.pkb index 5a9e4830a..496099b77 100644 --- a/test/api/test_ut_runner.pkb +++ b/test/api/test_ut_runner.pkb @@ -267,7 +267,7 @@ end;'; ut.expect(l_actual).to_equal(0); end; - procedure test_get_unit_test_info is + procedure test_get_suites_info is l_expected sys_refcursor; l_actual sys_refcursor; begin @@ -284,7 +284,7 @@ end;'; 'dummy_test_package.some_dummy_test_procedure' path, 0 disabled_flag from dual; --Act - open l_actual for select * from table(ut3.ut_runner.get_unit_test_info('UT3_TESTER','DUMMY_TEST_PACKAGE')); + open l_actual for select * from table(ut3.ut_runner.get_suites_info('UT3_TESTER','DUMMY_TEST_PACKAGE')); --Assert ut.expect(l_actual).to_equal(l_expected); end; @@ -534,6 +534,59 @@ end;'; ut.expect(l_actual).to_be_like('%Finished in % seconds %2 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%'); end; + + procedure is_test_true is + begin + ut.expect( + ut3.ut_runner.is_test( + a_owner => 'UT3_TESTER', + a_package_name => 'DUMMY_TEST_PACKAGE', + a_procedure_name => 'SOME_DUMMY_TEST_PROCEDURE' + ) + ).to_be_true(); + ut.expect( ut3.ut_runner.is_test( 'ut3_tester','dummy_test_package','some_dummy_test_procedure' ) ).to_be_true(); + end; + + procedure is_test_false is + begin + ut.expect( ut3.ut_runner.is_test( 'UT3_TESTER','DUMMY_TEST_PACKAGE', 'BAD' ) ).to_be_false(); + ut.expect( ut3.ut_runner.is_test( 'UT3_TESTER','DUMMY_TEST_PACKAGE', null ) ).to_be_false(); + ut.expect( ut3.ut_runner.is_test( 'UT3_TESTER',null,'some_dummy_test_procedure' ) ).to_be_false(); + ut.expect( ut3.ut_runner.is_test( null,'DUMMY_TEST_PACKAGE','some_dummy_test_procedure' ) ).to_be_false(); + end; + + procedure is_suite_true is + begin + ut.expect( + ut3.ut_runner.is_suite( + a_owner => 'UT3_TESTER', + a_package_name => 'DUMMY_TEST_PACKAGE' + ) + ).to_be_true(); + + ut.expect( ut3.ut_runner.is_suite( 'ut3_tester','dummy_test_package' ) ).to_be_true(); + end; + + procedure is_suite_false is + begin + ut.expect( ut3.ut_runner.is_suite( 'UT3_TESTER','BAD' ) ).to_be_false(); + ut.expect( ut3.ut_runner.is_suite( 'UT3_TESTER', null ) ).to_be_false(); + ut.expect( ut3.ut_runner.is_suite( null,'DUMMY_TEST_PACKAGE' ) ).to_be_false(); + end; + + procedure has_suites_true is + begin + ut.expect( ut3.ut_runner.has_suites( a_owner => 'UT3_TESTER' ) ).to_be_true(); + + ut.expect( ut3.ut_runner.has_suites( 'ut3_tester' ) ).to_be_true(); + end; + + procedure has_suites_false is + begin + ut.expect( ut3.ut_runner.has_suites( 'UT3' ) ).to_be_false(); + ut.expect( ut3.ut_runner.has_suites( 'BAD' ) ).to_be_false(); + ut.expect( ut3.ut_runner.has_suites( null ) ).to_be_false(); + end; end; / diff --git a/test/api/test_ut_runner.pks b/test/api/test_ut_runner.pks index 74c93dbae..54300af1b 100644 --- a/test/api/test_ut_runner.pks +++ b/test/api/test_ut_runner.pks @@ -43,10 +43,10 @@ create or replace package test_ut_runner is --%aftertest(cleanup_cache) procedure test_rebuild_cache_schema_type; - --%test(get_unit_tests_info returns a cursor containing records for a newly created test) + --%test(get_suites_info returns a cursor containing records for a newly created test) --%beforetest(setup_cache_objects) --%aftertest(cleanup_cache) - procedure test_get_unit_test_info; + procedure test_get_suites_info; --%test(get_reporters_list returns a cursor containing all built-in reporters and information about output-reporter) --%beforetest(setup_cache_objects) @@ -91,5 +91,41 @@ create or replace package test_ut_runner is --%endcontext + --%context(is_test) + --%beforeall(setup_cache_objects) + --%afterall(cleanup_cache) + + --%test(Returns true when procedure is a test) + procedure is_test_true; + + --%test(Returns false when procedure is not a test) + procedure is_test_false; + + --%endcontext + + --%context(is_suite) + --%beforeall(setup_cache_objects) + --%afterall(cleanup_cache) + + --%test(Returns true when package is a test suite) + procedure is_suite_true; + + --%test(Returns false when package is not a test suite) + procedure is_suite_false; + + --%endcontext + + --%context(has_suites) + --%beforeall(setup_cache_objects) + --%afterall(cleanup_cache) + + --%test(Returns true when schema contains test suites) + procedure has_suites_true; + + --%test(Returns false when schema does not contain test suites) + procedure has_suites_false; + + --%endcontext + end; / From d8d251fad3c877f86f9cd66ebcde5ee0d885c793 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 16 Nov 2018 23:36:16 +0000 Subject: [PATCH 0100/1096] Improved automation of `refresh_sources.sh` The script will now automatically copy `*.jar` files into `/utPLSQL-cli/lib` directory. --- .gitignore | 1 + CONTRIBUTING.md | 8 ++++++-- development/refresh_sources.sh | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 197d0f5e9..a6f721188 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ node_modules/ utPLSQL_latest_release/ utPLSQL-cli/ development/env.sh +development/*.jar *.log # exclusions based on artifacts created via actions documented in CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0e82a4ce4..ffb8bba69 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -89,14 +89,18 @@ export CONNECTION_STR=127.0.0.1:1521/xe # Adjust the connect string export ORACLE_PWD=oracle # Adjust your local SYS password ``` +### Download Oracle JDBC drivers + +Download `ojdbc8-xxx.jar` and `orai18n-xxx.jar` from [Oracle](https://www.oracle.com/technetwork/database/features/jdbc/jdbc-ucp-122-3110062.html). +Place them in `development` directory of the project. + + ### Download utPLSQL release sources and utplsq-cli The below script is fetching latest release version from utPLSQL repository. Latest release version is used for self-testing. ```bash development/refresh_sources.sh ``` -> **Important notice:** -> You'll have to provide the ojdbc.jar in the folder utPLSQL-cli/lib manually due to Oracle licensing restrictions. ### Setup local database for utPLSQL development diff --git a/development/refresh_sources.sh b/development/refresh_sources.sh index e051787a1..9474c3553 100755 --- a/development/refresh_sources.sh +++ b/development/refresh_sources.sh @@ -16,3 +16,4 @@ curl -Lk -o utPLSQL-cli.zip https://github.com/utPLSQL/utPLSQL-cli/releases/down # unzip utPLSQL-cli and remove the zip file unzip utPLSQL-cli.zip && chmod u+x utPLSQL-cli/bin/utplsql && rm utPLSQL-cli.zip +cp development/*.jar utPLSQL-cli/lib/ From eb3df218fc958977735f196bb7474628ae8ac40e Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 16 Nov 2018 23:54:37 +0000 Subject: [PATCH 0101/1096] Fixing failing test. --- test/api/test_ut_runner.pkb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/api/test_ut_runner.pkb b/test/api/test_ut_runner.pkb index 496099b77..0b9b85f9a 100644 --- a/test/api/test_ut_runner.pkb +++ b/test/api/test_ut_runner.pkb @@ -583,7 +583,7 @@ end;'; procedure has_suites_false is begin - ut.expect( ut3.ut_runner.has_suites( 'UT3' ) ).to_be_false(); + ut.expect( ut3.ut_runner.has_suites( 'UT3_LATEST_RELEASE' ) ).to_be_false(); ut.expect( ut3.ut_runner.has_suites( 'BAD' ) ).to_be_false(); ut.expect( ut3.ut_runner.has_suites( null ) ).to_be_false(); end; From d21134858d2ec73a955070fb2048e408c9a7e7ae Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 17 Nov 2018 02:01:24 +0000 Subject: [PATCH 0102/1096] Added control over rollback behavior in `ut_runner.run` Fixed failing test. --- source/api/ut_runner.pkb | 11 ++++++++--- source/api/ut_runner.pks | 6 +++++- source/core/annotations/ut_annotation_manager.pkb | 8 ++++---- source/core/coverage/ut_coverage.pkb | 2 +- source/core/ut_metadata.pkb | 15 +++++++++++++-- source/core/ut_metadata.pks | 12 +++++++++++- source/core/ut_suite_manager.pkb | 9 +++------ source/core/ut_utils.pkb | 1 - source/reporters/ut_coveralls_reporter.tpb | 1 - test/api/test_ut_runner.pkb | 7 ++----- test/api/test_ut_runner.pks | 12 ++++++++---- 11 files changed, 55 insertions(+), 29 deletions(-) diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index 64faf91ed..f6d7a6d92 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -83,7 +83,8 @@ create or replace package body ut_runner is a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_fail_on_errors boolean := false, - a_client_character_set varchar2 := null + a_client_character_set varchar2 := null, + a_perform_rollback boolean := true ) is l_run ut_run; l_coverage_schema_names ut_varchar2_rows; @@ -141,13 +142,17 @@ create or replace package body ut_runner is l_run.do_execute(); finish_run(l_run); - rollback; + if a_perform_rollback then + rollback; + end if; exception when others then finish_run(l_run); dbms_output.put_line(dbms_utility.format_error_backtrace); dbms_output.put_line(dbms_utility.format_error_stack); - rollback; + if a_perform_rollback then + rollback; + end if; raise; end; if a_fail_on_errors and l_run.result in (ut_utils.gc_failure, ut_utils.gc_error) then diff --git a/source/api/ut_runner.pks b/source/api/ut_runner.pks index 9dc18b9b9..1ea997031 100644 --- a/source/api/ut_runner.pks +++ b/source/api/ut_runner.pks @@ -43,6 +43,9 @@ create or replace package ut_runner authid current_user is * @param a_include_objects list of database objects (in format 'owner.name') that coverage should be reported on * @param a_exclude_objects list of database objects (in format 'owner.name') that coverage should be skipped for * @param a_fail_on_errors true/false - should an exception be thrown when tests are completed with failures/errors + * @param a_client_character_set if provided, affects some of reporters by setting specific character set for XML/HTML reports + * @param a_perform_rollback true/false - should rollback be performed as part of test execution (default true) + * * @example * Parameter `a_paths` accepts values of the following formats: @@ -65,7 +68,8 @@ create or replace package ut_runner authid current_user is a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_fail_on_errors boolean := false, - a_client_character_set varchar2 := null + a_client_character_set varchar2 := null, + a_perform_rollback boolean := true ); /** diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index 80de4d1a7..1c7e39273 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -22,7 +22,7 @@ create or replace package body ut_annotation_manager as function get_missing_objects(a_object_owner varchar2, a_object_type varchar2) return ut_annotation_objs_cache_info is l_rows sys_refcursor; l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_objects_view varchar2(200) := ut_metadata.get_dba_view('dba_objects'); + l_objects_view varchar2(200) := ut_metadata.get_objects_view_name(); l_cursor_text varchar2(32767); l_result ut_annotation_objs_cache_info; begin @@ -54,7 +54,7 @@ create or replace package body ut_annotation_manager as function get_annotation_objs_info(a_object_owner varchar2, a_object_type varchar2, a_parse_date timestamp := null) return ut_annotation_objs_cache_info is l_rows sys_refcursor; l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_objects_view varchar2(200) := ut_metadata.get_dba_view('dba_objects'); + l_objects_view varchar2(200) := ut_metadata.get_objects_view_name(); l_cursor_text varchar2(32767); l_result ut_annotation_objs_cache_info; begin @@ -86,7 +86,7 @@ create or replace package body ut_annotation_manager as function get_sources_to_annotate(a_object_owner varchar2, a_object_type varchar2) return sys_refcursor is l_result sys_refcursor; - l_sources_view varchar2(200) := ut_metadata.get_dba_view('dba_source'); + l_sources_view varchar2(200) := ut_metadata.get_source_view_name(); begin open l_result for q'[select s.name, s.text @@ -109,7 +109,7 @@ create or replace package body ut_annotation_manager as function get_sources_to_annotate(a_object_owner varchar2, a_object_type varchar2, a_objects_to_refresh ut_annotation_objs_cache_info) return sys_refcursor is l_result sys_refcursor; - l_sources_view varchar2(200) := ut_metadata.get_dba_view('dba_source'); + l_sources_view varchar2(200) := ut_metadata.get_source_view_name(); l_card natural; begin l_card := ut_utils.scale_cardinality(cardinality(a_objects_to_refresh)); diff --git a/source/core/coverage/ut_coverage.pkb b/source/core/coverage/ut_coverage.pkb index 06a738f0c..6acca42bd 100644 --- a/source/core/coverage/ut_coverage.pkb +++ b/source/core/coverage/ut_coverage.pkb @@ -38,7 +38,7 @@ create or replace package body ut_coverage is function get_cov_sources_sql(a_coverage_options ut_coverage_options) return varchar2 is l_result varchar2(32767); l_full_name varchar2(100); - l_view_name varchar2(200) := ut_metadata.get_dba_view('dba_source'); + l_view_name varchar2(200) := ut_metadata.get_source_view_name(); begin if a_coverage_options.file_mappings is not null and a_coverage_options.file_mappings.count > 0 then l_full_name := 'f.file_name'; diff --git a/source/core/ut_metadata.pkb b/source/core/ut_metadata.pkb index 1795c1a0c..d500bff61 100644 --- a/source/core/ut_metadata.pkb +++ b/source/core/ut_metadata.pkb @@ -66,7 +66,7 @@ create or replace package body ut_metadata as l_schema varchar2(200); l_package_name varchar2(200); l_procedure_name varchar2(200); - l_view_name varchar2(200) := get_dba_view('dba_objects'); + l_view_name varchar2(200) := get_objects_view_name; begin l_schema := a_owner_name; @@ -116,7 +116,7 @@ create or replace package body ut_metadata as end; function get_source_definition_line(a_owner varchar2, a_object_name varchar2, a_line_no integer) return varchar2 is - l_view_name varchar2(128) := get_dba_view('dba_source'); + l_view_name varchar2(128) := get_source_view_name(); l_line all_source.text%type; c_key constant varchar2(500) := a_owner || '.' || a_object_name; begin @@ -155,6 +155,17 @@ create or replace package body ut_metadata as return l_result; end; + function get_source_view_name return varchar2 is + begin + return get_dba_view('dba_source'); + end; + + + function get_objects_view_name return varchar2 is + begin + return get_dba_view('dba_objects'); + end; + function user_has_execute_any_proc return boolean is l_ut_owner varchar2(250) := ut_utils.ut_owner; l_dummy varchar2(250); diff --git a/source/core/ut_metadata.pks b/source/core/ut_metadata.pks index d06c1ea9d..16172a1f1 100644 --- a/source/core/ut_metadata.pks +++ b/source/core/ut_metadata.pks @@ -64,11 +64,21 @@ create or replace package ut_metadata authid current_user as procedure reset_source_definition_cache; /** - * Returns dba_... view name if it is accessible, otherwise it returns all_xxx view + * Returns dba_... view name if it is accessible, otherwise it returns all_... view * @param a_dba_view_name the name of dba view requested */ function get_dba_view(a_dba_view_name varchar2) return varchar2; + /** + * Returns dba_source if accessible otherwise returns all_source + */ + function get_source_view_name return varchar2; + + /** + * Returns dba_objects if accessible otherwise returns all_objects + */ + function get_objects_view_name return varchar2; + /** * Returns true if object is accessible to current user * @param a_object_name fully qualified object name (with schema name) diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 5dfeedfc8..fe76b2ed7 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -268,17 +268,15 @@ create or replace package body ut_suite_manager is c_bulk_limit constant pls_integer := 1000; l_items_at_level t_item_levels; l_rows tt_cached_suites; - l_logical_suite ut_logical_suite; l_level pls_integer; l_prev_level pls_integer; l_idx integer; begin loop fetch a_suite_data_cursor bulk collect into l_rows limit c_bulk_limit; - exit when l_rows.count = 0; l_idx := l_rows.first; - loop + while l_idx is not null loop l_level := length(l_rows(l_idx).path) - length( replace(l_rows(l_idx).path, '.') ) + 1; if l_level > 1 then if not l_items_at_level.exists(l_level) then @@ -315,9 +313,8 @@ create or replace package body ut_suite_manager is end if; l_prev_level := l_level; l_idx := l_rows.next(l_idx); - exit when l_idx is null; end loop; - exit when l_rows.count < c_bulk_limit; + exit when a_suite_data_cursor%NOTFOUND; end loop; reverse_list_order( a_suites ); @@ -331,7 +328,7 @@ create or replace package body ut_suite_manager is function get_missing_objects(a_object_owner varchar2) return ut_varchar2_rows is l_rows sys_refcursor; l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_objects_view varchar2(200) := ut_metadata.get_dba_view('dba_objects'); + l_objects_view varchar2(200) := ut_metadata.get_objects_view_name(); l_cursor_text varchar2(32767); l_result ut_varchar2_rows; begin diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index d70357462..928da6ca1 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -350,7 +350,6 @@ create or replace package body ut_utils is end; procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_item varchar2) is - l_items ut_varchar2_rows; begin if a_item is not null then if a_list is null then diff --git a/source/reporters/ut_coveralls_reporter.tpb b/source/reporters/ut_coveralls_reporter.tpb index 8be96715f..46c0947d0 100644 --- a/source/reporters/ut_coveralls_reporter.tpb +++ b/source/reporters/ut_coveralls_reporter.tpb @@ -61,7 +61,6 @@ create or replace type body ut_coveralls_reporter is function get_coverage_json( a_coverage_data ut_coverage.t_coverage ) return ut_varchar2_rows is - l_file_part varchar2(32767); l_result ut_varchar2_rows := ut_varchar2_rows(); l_unit ut_coverage.t_full_name; c_coverage_header constant varchar2(30) := '{"source_files":['; diff --git a/test/api/test_ut_runner.pkb b/test/api/test_ut_runner.pkb index 0b9b85f9a..8b0b6f630 100644 --- a/test/api/test_ut_runner.pkb +++ b/test/api/test_ut_runner.pkb @@ -81,16 +81,13 @@ end;'; procedure keep_an_open_transaction is l_expected varchar2(300); - l_output_data dbms_output.chararr; - l_num_lines integer := 100000; begin --Arrange create_test_spec(); create_test_body(0); l_expected := dbms_transaction.local_transaction_id(true); --Act - ut3.ut.run('test_cache'); - dbms_output.get_lines( l_output_data, l_num_lines); + ut3.ut_runner.run(ut3.ut_varchar2_list('test_cache'),null, a_perform_rollback => false); --Assert ut.expect(dbms_transaction.local_transaction_id()).to_equal(l_expected); drop_test_package(); @@ -105,7 +102,7 @@ end;'; create_test_body(0); rollback; --Act - ut3.ut.run('test_cache'); + ut3.ut_runner.run(ut3.ut_varchar2_list('test_cache'),null); dbms_output.get_lines( l_output_data, l_num_lines); --Assert ut.expect(dbms_transaction.local_transaction_id()).to_be_null(); diff --git a/test/api/test_ut_runner.pks b/test/api/test_ut_runner.pks index 54300af1b..d67ee45fc 100644 --- a/test/api/test_ut_runner.pks +++ b/test/api/test_ut_runner.pks @@ -10,18 +10,22 @@ create or replace package test_ut_runner is --%test(closes open transactions if no transaction was open before run) procedure close_newly_opened_transaction; - --%test(version_compatibility_check compares major, minor and bugfix number) + --%context(version_compatibility_check) + + --%test(compares major, minor and bugfix number) procedure version_comp_check_compare; - --%test(version_compatibility_check ignores build number) + --%test(ignores build number) procedure version_comp_check_ignore; - --%test(version_compatibility_check compares short version to a full version) + --%test(compares short version to a full version) procedure version_comp_check_short; - --%test(version_compatibility_check raises exception when invalid version passed) + --%test(raises exception when invalid version passed) procedure version_comp_check_exception; + --%endcontext + --%test(run resets cache of package body after every run) procedure run_reset_package_body_cache; From 107a30bb02337984fdc21b4a1e67e43bf60164a4 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sat, 17 Nov 2018 17:26:26 +0000 Subject: [PATCH 0103/1096] Updated progress by capturing a nested types in hierarchy structured object type. --- .../data_values/ut_column_info.tpb | 35 --- .../data_values/ut_column_info.tps | 27 --- .../data_values/ut_column_info_rec.tpb | 141 ----------- .../data_values/ut_column_info_rec.tps | 31 --- .../data_values/ut_column_info_tab.tps | 2 - .../data_values/ut_compound_data_helper.pkb | 220 ++++++------------ .../data_values/ut_compound_data_helper.pks | 6 +- .../data_values/ut_cursor_column.tpb | 42 ++++ .../data_values/ut_cursor_column.tps | 33 +++ .../data_values/ut_cursor_column_tab.tps | 2 + .../data_values/ut_cursor_details.tpb | 115 +++++++++ .../data_values/ut_cursor_details.tps | 9 + .../data_values/ut_cursor_info.tpb | 31 --- .../data_values/ut_cursor_info.tps | 7 - .../data_values/ut_data_value_refcursor.tpb | 8 +- .../data_values/ut_data_value_refcursor.tps | 4 +- source/expectations/matchers/ut_equal.tpb | 19 +- source/install.sql | 5 + source/uninstall_objects.sql | 6 + 19 files changed, 301 insertions(+), 442 deletions(-) delete mode 100644 source/expectations/data_values/ut_column_info.tpb delete mode 100644 source/expectations/data_values/ut_column_info.tps delete mode 100644 source/expectations/data_values/ut_column_info_rec.tpb delete mode 100644 source/expectations/data_values/ut_column_info_rec.tps delete mode 100644 source/expectations/data_values/ut_column_info_tab.tps create mode 100644 source/expectations/data_values/ut_cursor_column.tpb create mode 100644 source/expectations/data_values/ut_cursor_column.tps create mode 100644 source/expectations/data_values/ut_cursor_column_tab.tps create mode 100644 source/expectations/data_values/ut_cursor_details.tpb create mode 100644 source/expectations/data_values/ut_cursor_details.tps delete mode 100644 source/expectations/data_values/ut_cursor_info.tpb delete mode 100644 source/expectations/data_values/ut_cursor_info.tps diff --git a/source/expectations/data_values/ut_column_info.tpb b/source/expectations/data_values/ut_column_info.tpb deleted file mode 100644 index 3bd99f15d..000000000 --- a/source/expectations/data_values/ut_column_info.tpb +++ /dev/null @@ -1,35 +0,0 @@ -create or replace type body ut_column_info as - member function get_data_type(a_type_code in integer,a_user_defined in boolean) return varchar2 is - begin - return ut_curr_usr_compound_helper.get_column_type(a_type_code,a_user_defined); - end; - - member procedure init(self in out nocopy ut_column_info, - a_col_type binary_integer, - a_col_name varchar2, - a_col_schema_name varchar2, - a_col_type_name varchar2, - a_col_prec integer, - a_col_scale integer, - a_col_max_len integer, - a_dbms_sql_desc boolean := false, - a_parent_name varchar2 := null) is - begin - self.is_user_defined := 0; - self.column_prec := a_col_prec; - self.column_len := a_col_max_len; - self.column_scale := a_col_scale; - self.column_name := TRIM( BOTH '''' FROM a_col_name); - self.xml_valid_name := '"'||self.column_name||'"'; - self.hashed_name := case when a_parent_name is not null then - ut_compound_data_helper.get_hash(utl_raw.cast_to_raw(a_parent_name||self.column_name)) - else - null - end; - self.column_type := get_data_type(a_col_type,a_dbms_sql_desc); - self.column_schema := a_col_schema_name; - self.is_sql_diffable := ut_utils.boolean_to_int(ut_curr_usr_compound_helper.is_sql_compare_allowed(self.column_type)); - self.is_collection := 0; - end; -end; -/ diff --git a/source/expectations/data_values/ut_column_info.tps b/source/expectations/data_values/ut_column_info.tps deleted file mode 100644 index 27639771f..000000000 --- a/source/expectations/data_values/ut_column_info.tps +++ /dev/null @@ -1,27 +0,0 @@ -create or replace type ut_column_info force authid current_user as object -( - xml_valid_name varchar2(100), - hashed_name raw(30), - column_name varchar2(100), - column_type varchar2(100), - column_schema varchar2(100), - column_prec integer, - column_len integer, - column_scale integer, - is_sql_diffable number(1, 0), - is_collection number(1, 0), - is_user_defined number(1, 0), - member function get_data_type(a_type_code in integer,a_user_defined in boolean) return varchar2, - member procedure init(self in out nocopy ut_column_info, - a_col_type binary_integer, - a_col_name varchar2, - a_col_schema_name varchar2, - a_col_type_name varchar2, - a_col_prec integer, - a_col_scale integer, - a_col_max_len integer, - a_dbms_sql_desc boolean := false, - a_parent_name varchar2 := null) -) -not final not instantiable -/ diff --git a/source/expectations/data_values/ut_column_info_rec.tpb b/source/expectations/data_values/ut_column_info_rec.tpb deleted file mode 100644 index efdbcced1..000000000 --- a/source/expectations/data_values/ut_column_info_rec.tpb +++ /dev/null @@ -1,141 +0,0 @@ -create or replace type body ut_column_info_rec as - - member function get_anytype_attributes_info(a_anytype anytype, a_col_name varchar2) - return ut_column_info_tab is - l_result ut_column_info_tab := ut_column_info_tab(); - l_attribute_typecode pls_integer; - l_aname varchar2(32767); - l_prec pls_integer; - l_scale pls_integer; - l_len pls_integer; - l_csid pls_integer; - l_csfrm pls_integer; - l_attr_elt_type anytype; - - function get_anytype_attribute_count(a_anytype anytype) return pls_integer is - l_attribute_typecode pls_integer; - l_schema_name varchar2(32767); - l_version varchar2(32767); - l_type_name varchar2(32767); - l_attributes pls_integer; - l_prec pls_integer; - l_scale pls_integer; - l_len pls_integer; - l_csid pls_integer; - l_csfrm pls_integer; - begin - l_attribute_typecode := a_anytype.getinfo(prec => l_prec, - scale => l_scale, - len => l_len, - csid => l_csid, - csfrm => l_csfrm, - schema_name => l_schema_name, - type_name => l_type_name, - version => l_version, - numelems => l_attributes); - return l_attributes; - end; - - begin - for i in 1 .. get_anytype_attribute_count(a_anytype) loop - l_attribute_typecode := a_anytype.getattreleminfo(pos => i, --First attribute - prec => l_prec, - scale => l_scale, - len => l_len, - csid => l_csid, - csfrm => l_csfrm, - attr_elt_type => l_attr_elt_type, - aname => l_aname); - - l_result.extend; - l_result(l_result.last) := ut_column_info_rec(l_attribute_typecode, - l_aname, - null, - null, - l_prec, - l_scale, - l_len, - false, - a_col_name); - end loop; - return l_result; - end; - - member function get_user_defined_type(a_owner varchar2, a_type_name varchar2) - return anytype is - l_anydata anydata; - l_anytype anytype; - l_typecode pls_integer; - - begin - execute immediate 'declare - l_v ' || a_owner || '.' || - a_type_name || '; - begin - :anydata := anydata.convertobject(l_v); - end;' - using in out l_anydata; - - l_typecode := l_anydata.gettype(l_anytype); - - return l_anytype; - end; - - overriding member procedure init(self in out nocopy ut_column_info_rec, - a_col_type binary_integer, - a_col_name varchar2, - a_col_schema_name varchar2, - a_col_type_name varchar2, - a_col_prec integer, - a_col_scale integer, - a_col_max_len integer, - a_dbms_sql_desc boolean := false, - a_parent_name varchar2) is - l_anytype anytype; - begin - self.column_prec := a_col_prec; - self.column_len := a_col_max_len; - self.column_scale := a_col_scale; - self.column_name := TRIM(BOTH '''' FROM a_col_name); - self.xml_valid_name := '"'||self.column_name||'"'; - self.hashed_name := case when a_parent_name is not null then - ut_compound_data_helper.get_hash(utl_raw.cast_to_raw(a_parent_name||self.column_name)) - else - null - end; - self.column_type := a_col_type_name; - self.column_schema := a_col_schema_name; - self.is_sql_diffable := 0; - self.is_collection := ut_utils.boolean_to_int(ut_curr_usr_compound_helper.is_collection(a_col_schema_name,a_col_type_name)); - self.is_user_defined := 1; - - l_anytype := get_user_defined_type(a_col_schema_name, a_col_type_name); - self.nested_details := get_anytype_attributes_info(l_anytype, self.column_name); - end; - - constructor function ut_column_info_rec(self in out nocopy ut_column_info_rec, - a_col_type binary_integer, - a_col_name varchar2, - a_col_schema_name varchar2, - a_col_type_name varchar2, - a_col_prec integer, - a_col_scale integer, - a_col_max_len integer, - a_dbms_sql_desc boolean := false, - a_parent_name varchar2 := null) - return self as result is - begin - if a_col_type = dbms_sql.user_defined_type then - self.init(a_col_type, a_col_name, a_col_schema_name, a_col_type_name,a_col_prec,a_col_scale,a_col_max_len); - else - (self as ut_column_info).init(a_col_type, - a_col_name, - a_col_schema_name, - a_col_type_name,a_col_prec,a_col_scale,a_col_max_len, - a_dbms_sql_desc, - a_parent_name); - end if; - return; - end; -end; -/ diff --git a/source/expectations/data_values/ut_column_info_rec.tps b/source/expectations/data_values/ut_column_info_rec.tps deleted file mode 100644 index 0059bd08d..000000000 --- a/source/expectations/data_values/ut_column_info_rec.tps +++ /dev/null @@ -1,31 +0,0 @@ -create or replace type ut_column_info_rec under ut_column_info -( - nested_details ut_column_info_tab, - parent_name varchar2(100), - member function get_anytype_attributes_info(a_anytype anytype, a_col_name varchar2) - return ut_column_info_tab, - member function get_user_defined_type(a_owner varchar2, a_type_name varchar2) - return anytype, - overriding member procedure init(self in out nocopy ut_column_info_rec, - a_col_type binary_integer, - a_col_name varchar2, - a_col_schema_name varchar2, - a_col_type_name varchar2, - a_col_prec integer, - a_col_scale integer, - a_col_max_len integer, - a_dbms_sql_desc boolean := false, - a_parent_name varchar2 := null), - constructor function ut_column_info_rec(self in out nocopy ut_column_info_rec, - a_col_type binary_integer, - a_col_name varchar2, - a_col_schema_name varchar2, - a_col_type_name varchar2, - a_col_prec integer, - a_col_scale integer, - a_col_max_len integer, - a_dbms_sql_desc boolean := false, - a_parent_name varchar2 := null) - return self as result -) -/ diff --git a/source/expectations/data_values/ut_column_info_tab.tps b/source/expectations/data_values/ut_column_info_tab.tps deleted file mode 100644 index 27dc44a93..000000000 --- a/source/expectations/data_values/ut_column_info_tab.tps +++ /dev/null @@ -1,2 +0,0 @@ -CREATE OR REPLACE TYPE ut_column_info_tab FORCE AS TABLE OF ut_column_info; -/ diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 613b97bb8..8a7b02079 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -425,7 +425,8 @@ create or replace package body ut_compound_data_helper is return l_no_missing_keys; end; - procedure generate_not_equal_stmt(a_data_info ut_column_info, a_pk_table ut_varchar2_list, a_not_equal_stmt in out nocopy clob) is + procedure generate_not_equal_stmt(a_data_info ut_cursor_column, a_pk_table ut_varchar2_list, a_not_equal_stmt in out nocopy clob, + a_col_name varchar2) is l_pk_tab ut_varchar2_list := coalesce(a_pk_table,ut_varchar2_list()); l_index integer; l_sql_stmt varchar2(32767); @@ -444,14 +445,15 @@ create or replace package body ut_compound_data_helper is if not(l_exists) then l_sql_stmt := l_sql_stmt || case when a_not_equal_stmt is null then null else ' or ' end - ||' (decode(a.'||a_data_info.xml_valid_name||','||' e.'||a_data_info.xml_valid_name||',1,0) = 0)'; + ||' (decode(a.'||a_col_name||','||' e.'||a_col_name||',1,0) = 0)'; ut_utils.append_to_clob(a_not_equal_stmt,l_sql_stmt); end if; end; - procedure generate_join_by_stmt(a_data_info ut_column_info, a_pk_table ut_varchar2_list, a_join_by_stmt in out nocopy clob) is + procedure generate_join_by_stmt(a_data_info ut_cursor_column, a_pk_table ut_varchar2_list, a_join_by_stmt in out nocopy clob, + a_col_name varchar2) is l_pk_tab ut_varchar2_list := coalesce(a_pk_table,ut_varchar2_list()); - l_index integer ; + l_index integer; l_sql_stmt varchar2(32767); begin if l_pk_tab.count <> 0 then @@ -459,14 +461,7 @@ create or replace package body ut_compound_data_helper is loop if a_data_info.column_name = a_pk_table(l_index) then l_sql_stmt := l_sql_stmt || case when a_join_by_stmt is null then null else ' and ' end; - if a_data_info.is_sql_diffable = 0 then - --TODO : Non diffable is more complex as to hash we need to know how to cast it to raw or clob ? - /*l_sql_stmt := l_ut_owner ||'.ut_compound_data_helper.get_hash( a.'||a_data_info.xml_valid_name||') = ' - ||l_ut_owner ||'.ut_compound_data_helper.get_hash( e.'||a_data_info.xml_valid_name||')';*/ - l_sql_stmt := l_sql_stmt ||' a.'||a_data_info.xml_valid_name||q'[ = ]'||' e.'||a_data_info.xml_valid_name; - elsif a_data_info.is_sql_diffable = 1 then - l_sql_stmt := l_sql_stmt ||' a.'||a_data_info.xml_valid_name||q'[ = ]'||' e.'||a_data_info.xml_valid_name; - end if; + l_sql_stmt := l_sql_stmt ||' a.'||a_col_name||q'[ = ]'||' e.'||a_col_name; end if; exit when (a_data_info.column_name = a_pk_table(l_index)) or l_index = a_pk_table.count; l_index := a_pk_table.next(l_index); @@ -475,34 +470,34 @@ create or replace package body ut_compound_data_helper is end if; end; - procedure generate_equal_sql(a_data_info ut_column_info,a_equal_stmt in out nocopy clob) is + procedure generate_equal_sql(a_equal_stmt in out nocopy clob,a_col_name in varchar2) is l_sql_stmt varchar2(32767); begin - l_sql_stmt := case when a_equal_stmt is null then null else ' and ' end ||' a.'||a_data_info.xml_valid_name||q'[ = ]'||' e.'||a_data_info.xml_valid_name; + l_sql_stmt := case when a_equal_stmt is null then null else ' and ' end ||' a.'||a_col_name||q'[ = ]'||' e.'||a_col_name; ut_utils.append_to_clob(a_equal_stmt,l_sql_stmt); end; - procedure generate_partition_stmt(a_data_info ut_column_info,a_partition_stmt in out nocopy clob) is + procedure generate_partition_stmt(a_partition_stmt in out nocopy clob,a_col_name in varchar2) is l_alias varchar2(10) := 'ucd.'; begin - ut_utils.append_to_clob(a_partition_stmt,case when a_partition_stmt is null then null else ',' end||l_alias||a_data_info.xml_valid_name); + ut_utils.append_to_clob(a_partition_stmt,case when a_partition_stmt is null then null else ',' end||l_alias||a_col_name); end; - procedure generate_select_stmt(a_data_info ut_column_info,a_sql_stmt in out nocopy clob) is + procedure generate_select_stmt(a_data_info ut_cursor_column,a_sql_stmt in out nocopy clob, a_col_name varchar2) is l_sql_stmt clob; l_alias varchar2(10) := 'ucd.'; l_col_syntax varchar2(4000); l_ut_owner varchar2(250) := ut_utils.ut_owner; begin if a_data_info.is_sql_diffable = 0 then - l_col_syntax := l_ut_owner ||'.ut_compound_data_helper.get_hash('||l_alias||a_data_info.xml_valid_name||'.getClobVal()) as '||a_data_info.xml_valid_name ; + l_col_syntax := l_ut_owner ||'.ut_compound_data_helper.get_hash('||l_alias||a_col_name||'.getClobVal()) as '||a_col_name ; else - l_col_syntax := l_alias||a_data_info.xml_valid_name||' as '|| a_data_info.xml_valid_name; + l_col_syntax := l_alias||a_col_name||' as '|| a_col_name; end if; ut_utils.append_to_clob(a_sql_stmt,','||l_col_syntax); end; - procedure generate_xmltab_stmt(a_data_info ut_column_info,a_sql_stmt in out nocopy clob) is + procedure generate_xmltab_stmt(a_data_info ut_cursor_column,a_sql_stmt in out nocopy clob, a_col_name varchar2) is l_sql_stmt varchar2(32767); l_col_type varchar2(4000); begin @@ -513,33 +508,39 @@ create or replace package body ut_compound_data_helper is else l_col_type := a_data_info.column_type||'('||a_data_info.column_len||')'; end if; - l_sql_stmt := ' '||a_data_info.xml_valid_name||' '||l_col_type||q'[ PATH ']'||a_data_info.column_name||q'[',]'; + l_sql_stmt := ' '||a_col_name||' '||l_col_type||q'[ PATH ']'||a_data_info.access_path||q'[',]'; ut_utils.append_to_clob(a_sql_stmt, l_sql_stmt); end; procedure gen_sql_pieces_out_of_cursor(a_data_info ut_data_value_refcursor,a_pk_table ut_varchar2_list, a_xml_stmt out nocopy clob, a_select_stmt out nocopy clob ,a_partition_stmt out nocopy clob, a_equal_stmt out nocopy clob, a_join_by_stmt out nocopy clob, a_not_equal_stmt out nocopy clob) is - l_cursor_info ut_column_info_tab := a_data_info.cursor_col_info.cursor_info; + l_cursor_info ut_cursor_column_tab := a_data_info.cursor_details.cursor_info; l_partition_tmp clob; + l_col_name varchar2(30); begin if l_cursor_info is not null then --Parition by piece ut_utils.append_to_clob(a_partition_stmt,', row_number() over (partition by '); --TODO : Handle nested objects... for i in 1..l_cursor_info.count loop + l_col_name := case when l_cursor_info(i).parent_name is null then + l_cursor_info(i).xml_valid_name + else + utl_raw.cast_to_varchar2(l_cursor_info(i).nested_name) + end; --Get XMLTABLE column list - generate_xmltab_stmt(l_cursor_info(i),a_xml_stmt); + generate_xmltab_stmt(l_cursor_info(i),a_xml_stmt,l_col_name); --Get Select statment list of columns - generate_select_stmt(l_cursor_info(i),a_select_stmt); + generate_select_stmt(l_cursor_info(i),a_select_stmt,l_col_name); --Get columns by which we partition - generate_partition_stmt(l_cursor_info(i),l_partition_tmp); + generate_partition_stmt(l_partition_tmp,l_col_name); --Get equal statement - generate_equal_sql(l_cursor_info(i),a_equal_stmt); + generate_equal_sql(a_equal_stmt,l_col_name); --Generate join by stmt - generate_join_by_stmt(l_cursor_info(i),a_pk_table,a_join_by_stmt); + generate_join_by_stmt(l_cursor_info(i),a_pk_table,a_join_by_stmt,l_col_name); --Generate not equal stmt - generate_not_equal_stmt(l_cursor_info(i),a_pk_table,a_not_equal_stmt); + generate_not_equal_stmt(l_cursor_info(i),a_pk_table,a_not_equal_stmt,l_col_name); end loop; --Finish parition by ut_utils.append_to_clob(a_partition_stmt,l_partition_tmp||' order by '||l_partition_tmp||' ) dup_no '); @@ -563,18 +564,6 @@ create or replace package body ut_compound_data_helper is l_equal_stmt clob; l_join_on_stmt clob; l_not_equal_stmt clob; - l_column_filter varchar2(32767); - - function get_filtered_columns_name (a_columns_info in xmltype, a_exclude_xpath varchar2, a_include_xpath varchar2) return ut_varchar2_list is - l_columns_info ut_varchar2_list := ut_varchar2_list(); - begin - execute immediate 'with xmlt as ( select :xml_data as item_data from dual ),' - ||'filtered as (select '||get_columns_row_filter(a_exclude_xpath,a_include_xpath) ||' from xmlt ucd) ' - ||q'[select '"'||xt.name||'"' from filtered f, xmltable( '/ROW/*' passing f.item_data columns ]' - ||q'[name VARCHAR2(4000) PATH '@xml_valid_name') xt]' bulk collect into l_columns_info - using a_columns_info,a_exclude_xpath,a_include_xpath; - return l_columns_info; - end; function get_join_type(a_inclusion_compare in boolean,a_negated in boolean) return varchar2 is begin @@ -590,9 +579,7 @@ create or replace package body ut_compound_data_helper is begin dbms_lob.createtemporary(l_compare_sql, true); - --TODO: Resolve issues with collection and nested tables, can we extract by internal column name if defined e.g. xml of colval.id.getclobval() - --TODO: Comment better all pieces - l_column_filter := get_columns_row_filter(a_exclude_xpath, a_include_xpath); + --TODO: Resolve issues with collection and nested tables, can we extract by internal column name if defined e.g. xml of colval.id.getclobval() gen_sql_pieces_out_of_cursor(a_other, a_join_by_list, l_xmltable_stmt, l_select_stmt, l_partition_stmt, l_equal_stmt, @@ -711,110 +698,52 @@ create or replace package body ut_compound_data_helper is begin return g_diff_count; end; - - function get_child(a_parent in varchar2 default null) return ut_varchar2_list is - l_out_tab ut_varchar2_list := ut_varchar2_list(); - cursor c_child(cp_parent in varchar2) is - with sorted as - (select r_num, - regexp_substr(t.column_value, '[^/]+', 1, commas.column_value) as colval, - commas.column_value lev - from (select row_number() over(order by 1) r_num, - column_value - from ((table(g_filter_tab)))) t, - table(cast(multiset - (select level - from dual - connect by level <= - length(regexp_replace(t.column_value, - '[^/]+')) + 1) as - sys.odcinumberlist)) commas - order by r_num, - lev), - hier as - (select r_num, - lev, - colval, - lag(colval, 1) over(partition by r_num order by lev) parent - from sorted) - select distinct colval - from hier - where nvl(parent, 1) = nvl(cp_parent, 1); - - begin - open c_child(a_parent); - fetch c_child bulk collect - into l_out_tab; - close c_child; - return l_out_tab; - end; - function inc_cursors_columns(a_column_info_tab ut_column_info_tab,a_current_list ut_varchar2_list) - return ut_column_info_tab is - l_result ut_column_info_tab := ut_column_info_tab(); - l_record ut_column_info_rec; - l_index integer; - begin - for lst in 1..a_current_list.count loop - l_index := a_column_info_tab.first; - loop - if a_current_list(lst) = a_column_info_tab(l_index).column_name then - l_result.extend; - l_record := treat(a_column_info_tab(l_index) as ut_column_info_rec); - - if treat(a_column_info_tab(l_index) as ut_column_info_rec).nested_details is not null then - l_record.nested_details := inc_cursors_columns(treat(a_column_info_tab(l_index) as ut_column_info_rec).nested_details,get_child(a_column_info_tab(l_index).column_name)); - end if; - - l_result(l_result.last) := l_record; - end if; - exit when (a_current_list(lst) = a_column_info_tab(l_index).column_name) or (l_index = a_column_info_tab.count); - l_index := a_column_info_tab.next(l_index); - end loop; - end loop; - - return l_result; - end; + function filter_out_cols(a_cursor_info ut_cursor_column_tab, a_current_list ut_varchar2_list,a_include boolean) + return ut_cursor_column_tab is + l_sql varchar2(32767) := + q'[with + sorted as + (select r_num,regexp_substr(t.column_value, '[^/]+', 1, commas.column_value) as colval,commas.column_value lev + from (select row_number() over(order by 1) r_num, column_value from ((table(:a_current_list)))) t, + table(cast(multiset + (select level from dual connect by level <= length(regexp_replace(t.column_value,'[^/]+')) + 1) as sys.odcinumberlist)) commas + order by r_num,lev), + hier as + (select r_num,lev,colval column_name,lag(colval, 1) over(partition by r_num order by lev) parent_name from sorted), + constructed as ( + select lev,column_name,parent_name from hier), + t1(column_name, parent_name) AS ( + select column_name,parent_name from table(:a_cursor_info) where parent_name is null + union all + select t2.column_name,t2.parent_name from table(:a_cursor_info) t2, t1 where t2.parent_name = t1.column_name) + select ut_cursor_column(i.column_name,i.column_schema,i.column_type_name, i.column_prec,i.column_scale,i.column_len, i.parent_name, + i.hierarchy_level,i.column_position, i.column_type) + from t1 join table(:a_cursor_info) i on ( nvl(t1.parent_name,1) = nvl(i.parent_name,1) and t1.column_name = i.column_name) + ]'; - function exc_cursors_columns(a_column_info_tab ut_column_info_tab,a_current_list ut_varchar2_list) - return ut_column_info_tab is - l_result ut_column_info_tab := ut_column_info_tab(); - l_record ut_column_info_rec; - l_index integer; - l_exists boolean := false; + l_result ut_cursor_column_tab := ut_cursor_column_tab(); begin - --TODO : Optimize search using while or exists operator ? - for lst in 1..a_column_info_tab.count loop - l_index := a_current_list.first; - loop - if a_current_list(l_index) = a_column_info_tab(lst).column_name then - l_exists := true; - end if; - exit when (a_current_list(l_index) = a_column_info_tab(lst).column_name) or (l_index = a_current_list.count); - l_index := a_current_list.next(l_index); - end loop; - - if not(l_exists) then - l_result.extend; - l_record := treat(a_column_info_tab(lst) as ut_column_info_rec); - if treat(a_column_info_tab(lst) as ut_column_info_rec).nested_details is not null then - l_record.nested_details := exc_cursors_columns(treat(a_column_info_tab(lst) as ut_column_info_rec).nested_details,get_child(a_column_info_tab(lst).column_name)); - end if; - l_result(l_result.last) := l_record; - end if; - l_exists := false; - end loop; - return l_result; + --TODO : Get this query tidy up + if a_include then + l_sql := l_sql || ' join constructed c on ( nvl(t1.parent_name,1) = nvl(c.parent_name,1) and t1.column_name = c.column_name)'; + else + l_sql := l_sql ||'left outer join constructed c on ( nvl(t1.parent_name,1) = nvl(c.parent_name,1) and t1.column_name = c.column_name) + where c.column_name is null'; + end if; + + execute immediate l_sql bulk collect into l_result + using a_current_list,a_cursor_info,a_cursor_info,a_cursor_info; + + return l_result; end; - - function inc_exc_columns_from_cursor (a_cursor_info ut_column_info_tab, a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) - return ut_column_info_tab is + + function inc_exc_columns_from_cursor (a_cursor_info ut_cursor_column_tab, a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) + return ut_cursor_column_tab is l_filtered_set ut_varchar2_list := ut_varchar2_list(); - l_result ut_column_info_tab := ut_column_info_tab(); + l_result ut_cursor_column_tab := ut_cursor_column_tab(); l_include boolean; begin - g_filter_tab := ut_varchar2_list(); - -- if include and exclude is not null its columns from include minus exclude -- If inlcude is not null and exclude is null cursor will have only include -- If exclude is not null and include is null cursor will have all except exclude @@ -841,15 +770,12 @@ create or replace package body ut_compound_data_helper is elsif a_cursor_info is not null then l_result:= a_cursor_info; else - l_result := ut_column_info_tab(); + l_result := ut_cursor_column_tab(); end if; - g_filter_tab := l_filtered_set; - if l_filtered_set.count <> 0 and l_include then - l_result := inc_cursors_columns(a_cursor_info,get_child()); - elsif l_filtered_set.count <> 0 and not(l_include) then - l_result := exc_cursors_columns(a_cursor_info,get_child()); - end if; + if l_filtered_set.count > 0 then + l_result := filter_out_cols(a_cursor_info,l_filtered_set,l_include); + end if; return l_result; end; diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 924593c62..98913531e 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -101,9 +101,9 @@ create or replace package ut_compound_data_helper authid definer is procedure cleanup_diff; function get_rows_diff_count return integer; - - function inc_exc_columns_from_cursor (a_cursor_info ut_column_info_tab, a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) - return ut_column_info_tab; + + function inc_exc_columns_from_cursor (a_cursor_info ut_cursor_column_tab, a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) + return ut_cursor_column_tab; end; / diff --git a/source/expectations/data_values/ut_cursor_column.tpb b/source/expectations/data_values/ut_cursor_column.tpb new file mode 100644 index 000000000..dbf37b518 --- /dev/null +++ b/source/expectations/data_values/ut_cursor_column.tpb @@ -0,0 +1,42 @@ +create or replace type body ut_cursor_column as + + member procedure init(self in out nocopy ut_cursor_column, + a_col_name varchar2, a_col_schema_name varchar2, + a_col_type_name varchar2, a_col_prec integer, a_col_scale integer, + a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level number := 1, + a_col_position number, a_col_type varchar2) is + begin + self.parent_name := null; + self.hierarchy_level := a_hierarchy_level; + self.column_position := a_col_position; + self.is_user_defined := 0; + self.column_prec := a_col_prec; + self.column_len := a_col_max_len; + self.column_scale := a_col_scale; + self.column_name := TRIM( BOTH '''' FROM a_col_name); + self.column_type_name := a_col_type_name; + self.access_path := case when self.parent_name is null then self.column_name else self.parent_name||'/'||self.column_name end; + self.nested_name := case when self.parent_name is null then + null + else + ut_compound_data_helper.get_hash(utl_raw.cast_to_raw(self.parent_name||'/'||self.column_name)) + end; + self.xml_valid_name := '"'||self.column_name||'"'; + self.column_type := a_col_type; + self.column_schema := a_col_schema_name; + self.is_sql_diffable := ut_utils.boolean_to_int(ut_curr_usr_compound_helper.is_sql_compare_allowed(self.column_type)); + self.is_collection := 0; + end; + + constructor function ut_cursor_column( self in out nocopy ut_cursor_column, + a_col_name varchar2, a_col_schema_name varchar2, + a_col_type_name varchar2, a_col_prec integer, a_col_scale integer, + a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level number := 1, + a_col_position number, a_col_type in varchar2) return self as result is + begin + init(a_col_name, a_col_schema_name, a_col_type_name, a_col_prec, + a_col_scale, a_col_max_len, a_parent_name,a_hierarchy_level, a_col_position, a_col_type); + return; + end; +end; +/ diff --git a/source/expectations/data_values/ut_cursor_column.tps b/source/expectations/data_values/ut_cursor_column.tps new file mode 100644 index 000000000..0602b1ceb --- /dev/null +++ b/source/expectations/data_values/ut_cursor_column.tps @@ -0,0 +1,33 @@ +create or replace type ut_cursor_column force authid current_user as object +( + parent_name varchar2(100), + access_path varchar2(500), + nested_name raw(30), + hierarchy_level number, + column_position number, + xml_valid_name varchar2(100), + column_name varchar2(100), + column_type varchar2(100), + column_type_name varchar2(100), + column_schema varchar2(100), + column_prec integer, + column_len integer, + column_scale integer, + is_sql_diffable number(1, 0), + is_collection number(1, 0), + is_user_defined number(1, 0), + + member procedure init(self in out nocopy ut_cursor_column, + a_col_name varchar2, a_col_schema_name varchar2, + a_col_type_name varchar2, a_col_prec integer, a_col_scale integer, + a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level number := 1, + a_col_position number, a_col_type in varchar2), + + constructor function ut_cursor_column( self in out nocopy ut_cursor_column, + a_col_name varchar2, a_col_schema_name varchar2, + a_col_type_name varchar2, a_col_prec integer, a_col_scale integer, + a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level number := 1, + a_col_position number, a_col_type in varchar2) + return self as result +) +/ diff --git a/source/expectations/data_values/ut_cursor_column_tab.tps b/source/expectations/data_values/ut_cursor_column_tab.tps new file mode 100644 index 000000000..05516854a --- /dev/null +++ b/source/expectations/data_values/ut_cursor_column_tab.tps @@ -0,0 +1,2 @@ +create or replace type ut_cursor_column_tab as table of ut_cursor_column +/ \ No newline at end of file diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb new file mode 100644 index 000000000..2d0b5a67f --- /dev/null +++ b/source/expectations/data_values/ut_cursor_details.tpb @@ -0,0 +1,115 @@ +create or replace type body ut_cursor_details as + + member function get_anytype_attribute_count(a_anytype anytype) return pls_integer is + l_attribute_typecode pls_integer; + l_schema_name varchar2(32767); + l_version varchar2(32767); + l_type_name varchar2(32767); + l_attributes pls_integer; + l_prec pls_integer; + l_scale pls_integer; + l_len pls_integer; + l_csid pls_integer; + l_csfrm pls_integer; + begin + l_attribute_typecode := a_anytype.getinfo(prec => l_prec, + scale => l_scale, + len => l_len, + csid => l_csid, + csfrm => l_csfrm, + schema_name => l_schema_name, + type_name => l_type_name, + version => l_version, + numelems => l_attributes); + return l_attributes; + end; + + member function get_user_defined_type(a_owner varchar2, a_type_name varchar2) + return anytype is + l_anydata anydata; + l_anytype anytype; + l_typecode pls_integer; + + begin + execute immediate 'declare + l_v ' || a_owner || '.' || + a_type_name || '; + begin + :anydata := anydata.convertobject(l_v); + end;' + using in out l_anydata; + + l_typecode := l_anydata.gettype(l_anytype); + + return l_anytype; + end; + + constructor function ut_cursor_details(self in out nocopy ut_cursor_details, + a_cursor in out nocopy sys_refcursor) + return self as result is + l_cursor_number integer; + l_columns_count pls_integer; + l_columns_desc dbms_sql.desc_tab3; + l_attribute_typecode pls_integer; + l_aname varchar2(32767); + l_prec pls_integer; + l_scale pls_integer; + l_len pls_integer; + l_csid pls_integer; + l_csfrm pls_integer; + l_attr_elt_type anytype; + l_anytype anytype; + + begin + self.cursor_info := ut_cursor_column_tab(); + l_cursor_number := dbms_sql.to_cursor_number(a_cursor); + dbms_sql.describe_columns3(l_cursor_number, + l_columns_count, + l_columns_desc); + a_cursor := dbms_sql.to_refcursor(l_cursor_number); + + for cur in 1 .. l_columns_count loop + self.cursor_info.extend; + self.cursor_info(cursor_info.last) := ut_cursor_column( l_columns_desc(cur).col_name, + l_columns_desc(cur).col_schema_name, + l_columns_desc(cur).col_type_name, + l_columns_desc(cur).col_precision, + l_columns_desc(cur).col_scale, + l_columns_desc(cur).col_max_len, + null, + 1, + cur, + ut_curr_usr_compound_helper.get_column_type(l_columns_desc(cur).col_type,false) + ); + if l_columns_desc(cur).col_type = dbms_sql.user_defined_type then + l_anytype := get_user_defined_type(l_columns_desc(cur).col_schema_name , l_columns_desc(cur).col_type_name ); + for i in 1 .. get_anytype_attribute_count(l_anytype) loop + l_attribute_typecode := l_anytype.getattreleminfo(pos => i, --First attribute + prec => l_prec, + scale => l_scale, + len => l_len, + csid => l_csid, + csfrm => l_csfrm, + attr_elt_type => l_attr_elt_type, + aname => l_aname); + + self.cursor_info.extend; + self.cursor_info(cursor_info.last) := ut_cursor_column( l_aname, + null, + null, + l_prec, + l_scale, + l_len, + l_columns_desc(i).col_name, + 2, + i, + ut_curr_usr_compound_helper.get_column_type(l_attribute_typecode,true) + ); + end loop; + end if; + end loop; + + return; + end; +end; +/ diff --git a/source/expectations/data_values/ut_cursor_details.tps b/source/expectations/data_values/ut_cursor_details.tps new file mode 100644 index 000000000..00f03e676 --- /dev/null +++ b/source/expectations/data_values/ut_cursor_details.tps @@ -0,0 +1,9 @@ +create or replace type ut_cursor_details force authid current_user as object +( + cursor_info ut_cursor_column_tab, + member function get_anytype_attribute_count(a_anytype anytype) return pls_integer, + member function get_user_defined_type(a_owner varchar2, a_type_name varchar2) return anytype, + constructor function ut_cursor_details(self in out nocopy ut_cursor_details,a_cursor in out nocopy sys_refcursor) + return self as result +) +/ diff --git a/source/expectations/data_values/ut_cursor_info.tpb b/source/expectations/data_values/ut_cursor_info.tpb deleted file mode 100644 index 819ac704a..000000000 --- a/source/expectations/data_values/ut_cursor_info.tpb +++ /dev/null @@ -1,31 +0,0 @@ -create or replace type body ut_cursor_info as - constructor function ut_cursor_info(self in out nocopy ut_cursor_info, - a_cursor in out nocopy sys_refcursor) - return self as result is - l_cursor_number integer; - l_columns_count pls_integer; - l_columns_desc dbms_sql.desc_tab3; - begin - self.cursor_info := ut_column_info_tab(); - l_cursor_number := dbms_sql.to_cursor_number(a_cursor); - dbms_sql.describe_columns3(l_cursor_number, - l_columns_count, - l_columns_desc); - a_cursor := dbms_sql.to_refcursor(l_cursor_number); - - for i in 1 .. l_columns_count loop - self.cursor_info.extend; - self.cursor_info(cursor_info.last) := ut_column_info_rec(l_columns_desc(i).col_type, - l_columns_desc(i).col_name, - l_columns_desc(i).col_schema_name, - l_columns_desc(i).col_type_name, - l_columns_desc(i).col_precision, - l_columns_desc(i).col_scale, - l_columns_desc(i).col_max_len, - true); - end loop; - - return; - end ut_cursor_info; -end; -/ diff --git a/source/expectations/data_values/ut_cursor_info.tps b/source/expectations/data_values/ut_cursor_info.tps deleted file mode 100644 index d373ef9a0..000000000 --- a/source/expectations/data_values/ut_cursor_info.tps +++ /dev/null @@ -1,7 +0,0 @@ -create or replace type ut_cursor_info force authid current_user as object -( - cursor_info ut_column_info_tab, - constructor function ut_cursor_info(self in out nocopy ut_cursor_info,a_cursor in out nocopy sys_refcursor) - return self as result -) -/ diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 84552ed4a..c63583469 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -48,7 +48,7 @@ create or replace type body ut_data_value_refcursor as self.elements_count := 0; self.columns_info := ut_curr_usr_compound_helper.extract_min_col_info(self.col_info_desc); - self.cursor_col_info := ut_cursor_info(l_cursor); + self.cursor_details := ut_cursor_details(l_cursor); -- We use DBMS_XMLGEN in order to: -- 1) be able to process data in bulks (set of rows) @@ -271,9 +271,9 @@ create or replace type body ut_data_value_refcursor as member function filter_cursor (a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) return ut_data_value_refcursor is l_result ut_data_value_refcursor := self; begin - if l_result.cursor_col_info.cursor_info is not null then - l_result.cursor_col_info.cursor_info := ut_compound_data_helper.inc_exc_columns_from_cursor(l_result.cursor_col_info.cursor_info,a_exclude_xpath,a_include_xpath); - end if; + if l_result.cursor_details.cursor_info is not null then + l_result.cursor_details.cursor_info := ut_compound_data_helper.inc_exc_columns_from_cursor(l_result.cursor_details.cursor_info,a_exclude_xpath,a_include_xpath); + end if; return l_result; end; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tps b/source/expectations/data_values/ut_data_value_refcursor.tps index 790ddf895..01b35d745 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tps +++ b/source/expectations/data_values/ut_data_value_refcursor.tps @@ -46,8 +46,8 @@ create or replace type ut_data_value_refcursor under ut_compound_data_value( /* *columns info - */ - cursor_col_info ut_cursor_info, + */ + cursor_details ut_cursor_details, constructor function ut_data_value_refcursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) return self as result, member procedure init(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor), diff --git a/source/expectations/matchers/ut_equal.tpb b/source/expectations/matchers/ut_equal.tpb index 854b4eef0..0e80d9aea 100644 --- a/source/expectations/matchers/ut_equal.tpb +++ b/source/expectations/matchers/ut_equal.tpb @@ -158,8 +158,8 @@ create or replace type body ut_equal as member function include(a_items varchar2) return ut_equal is l_result ut_equal := self; begin - l_result.include_list := l_result.include_list multiset union all coalesce(ut_utils.string_to_table(a_items,','),ut_varchar2_list()); - l_result.include_list := l_result.include_list multiset union all coalesce(ut_utils.string_to_table(a_items,'|'),ut_varchar2_list()); + --TODO : thats poorly done + l_result.include_list := l_result.include_list multiset union coalesce(ut_utils.string_to_table(REPLACE(a_items,'|',','),','),ut_varchar2_list()); return l_result; end; @@ -169,8 +169,7 @@ create or replace type body ut_equal as begin --Split exclude into single expressions so we cater for concat operator like | for i in 1..a_items.count loop - l_items := l_items multiset union all coalesce(ut_utils.string_to_table(a_items(i),'|'),ut_varchar2_list()); - l_items := l_items multiset union all coalesce(ut_utils.string_to_table(a_items(i),','),ut_varchar2_list()); + l_items := l_items multiset union all coalesce(ut_utils.string_to_table(REPLACE(a_items(i),'|',','),','),ut_varchar2_list()); end loop; l_result.include_list := l_result.include_list multiset union all coalesce(l_items,ut_varchar2_list()); return l_result; @@ -179,8 +178,7 @@ create or replace type body ut_equal as member function exclude(a_items varchar2) return ut_equal is l_result ut_equal := self; begin - l_result.exclude_list := l_result.exclude_list multiset union all coalesce(ut_utils.string_to_table(a_items,','),ut_varchar2_list()); - l_result.exclude_list := l_result.exclude_list multiset union all coalesce(ut_utils.string_to_table(a_items,'|'),ut_varchar2_list()); + l_result.exclude_list := l_result.exclude_list multiset union all coalesce(ut_utils.string_to_table(REPLACE(a_items,'|',','),','),ut_varchar2_list()); return l_result; end; @@ -191,8 +189,7 @@ create or replace type body ut_equal as --Split exclude into single expressions so we cater for concat operator like | for i in 1..a_items.count loop --TODO : idoiot proof solution for both include and exclude - l_items := l_items multiset union all coalesce(ut_utils.string_to_table(a_items(i),'|'),ut_varchar2_list()); - l_items := l_items multiset union all coalesce(ut_utils.string_to_table(a_items(i),','),ut_varchar2_list()); + l_items := l_items multiset union all coalesce(ut_utils.string_to_table(REPLACE(a_items(i),'|',','),','),ut_varchar2_list()); end loop; l_result.exclude_list := l_result.exclude_list multiset union all coalesce(l_items,ut_varchar2_list()); @@ -210,8 +207,7 @@ create or replace type body ut_equal as l_result ut_equal := self; begin l_result.is_unordered := ut_utils.boolean_to_int(true); - l_result.join_columns := l_result.join_columns multiset union all coalesce(ut_utils.string_to_table(a_columns,','),ut_varchar2_list()); - l_result.join_columns := l_result.join_columns multiset union all coalesce(ut_utils.string_to_table(a_columns,'|'),ut_varchar2_list()); + l_result.join_columns := l_result.join_columns multiset union all coalesce(ut_utils.string_to_table(REPLACE(a_columns,'|',','),','),ut_varchar2_list()); select regexp_replace(column_value,'^((/ROW/)|^(//)|^(/\*/))?(.*)','\5') col_names bulk collect into l_result.join_on_list @@ -226,8 +222,7 @@ create or replace type body ut_equal as l_result.is_unordered := ut_utils.boolean_to_int(true); for i in 1..a_columns.count loop --TODO : idoiot proof solution for both include and exclude - l_items := l_items multiset union all coalesce(ut_utils.string_to_table(a_columns(i),'|'),ut_varchar2_list()); - l_items := l_items multiset union all coalesce(ut_utils.string_to_table(a_columns(i),','),ut_varchar2_list()); + l_items := l_items multiset union all coalesce(ut_utils.string_to_table(REPLACE(a_columns(i),'|',','),','),ut_varchar2_list()); end loop; l_result.join_columns := l_result.join_columns multiset union all coalesce(l_items,ut_varchar2_list()); diff --git a/source/install.sql b/source/install.sql index b58fb4e24..6ae9ecf95 100644 --- a/source/install.sql +++ b/source/install.sql @@ -169,6 +169,9 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema --expectations and matchers @@install_component.sql 'expectations/data_values/ut_compound_data_tmp.sql' @@install_component.sql 'expectations/data_values/ut_compound_data_diff_tmp.sql' +@@install_component.sql 'expectations/data_values/ut_cursor_column.tps' +@@install_component.sql 'expectations/data_values/ut_cursor_column_tab.tps' +@@install_component.sql 'expectations/data_values/ut_cursor_details.tps' @@install_component.sql 'expectations/data_values/ut_data_value.tps' @@install_component.sql 'expectations/data_values/ut_compound_data_value.tps' @@install_component.sql 'expectations/data_values/ut_data_value_anydata.tps' @@ -209,6 +212,8 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/matchers/ut_be_empty.tps' @@install_component.sql 'expectations/matchers/ut_match.tps' @@install_component.sql 'expectations/ut_expectation.tps' +@@install_component.sql 'expectations/data_values/ut_cursor_column.tpb' +@@install_component.sql 'expectations/data_values/ut_cursor_details.tpb' @@install_component.sql 'expectations/ut_expectation_compound.tps' @@install_component.sql 'expectations/data_values/ut_data_value.tpb' @@install_component.sql 'expectations/data_values/ut_compound_data_value.tpb' diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index 0e059be56..b54c3b96c 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -131,6 +131,12 @@ drop type ut_data_value_xmltype force; drop type ut_data_value force; +drop type ut_cursor_details force; + +drop type ut_cursor_column_tab force; + +drop type ut_cursor_column force; + drop table ut_compound_data_tmp; drop table ut_compound_data_diff_tmp; From d887889275bfeb4faab7be6e270a4290b80d4615 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sat, 17 Nov 2018 20:31:20 +0000 Subject: [PATCH 0104/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 60f189a66..c384bb693 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.3.2321-develop'; + gc_version constant varchar2(50) := 'v3.1.3.2365-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From f3421958d1cfa6bb90924cd923cb25cadced80f7 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 17 Nov 2018 21:11:56 +0000 Subject: [PATCH 0105/1096] Reverting rollback changes - they should go as a separate PR. --- development/releasing.md | 3 ++- source/api/ut_runner.pkb | 11 +++-------- source/api/ut_runner.pks | 5 +---- source/api/ut_suite_item_info.tps | 16 ++++++++-------- test/api/test_ut_runner.pkb | 7 +++++-- 5 files changed, 19 insertions(+), 23 deletions(-) diff --git a/development/releasing.md b/development/releasing.md index added5a92..7c8d779ef 100644 --- a/development/releasing.md +++ b/development/releasing.md @@ -9,7 +9,8 @@ To create a release: - wait for th build to complete successfully - merge the release branch to master and wait for master build to complete successfully - create a release from the master branch using [github releases page](https://github.com/utPLSQL/utPLSQL/releases) and populate release description using information found on the issues and pull requests since previous release. - To find issues closed after certain date use [advanced filters](https://help.github.com/articles/searching-issues-and-pull-requests/#search-by-open-or-closed-state) + To find issues closed after certain date use [advanced filters](https://help.github.com/articles/searching-issues-and-pull-requests/#search-by-open-or-closed-state). + Example: [`is:issue closed:>2018-07-22`](https://github.com/utPLSQL/utPLSQL/issues?utf8=%E2%9C%93&q=is%3Aissue+closed%3A%3E2018-07-22+) The following will happen: - build executed on branch `release/vX.Y.Z-[something]` updates files `sonar-project.properties`, `VERSION` with project version derived from the release branch name diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index f6d7a6d92..64faf91ed 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -83,8 +83,7 @@ create or replace package body ut_runner is a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_fail_on_errors boolean := false, - a_client_character_set varchar2 := null, - a_perform_rollback boolean := true + a_client_character_set varchar2 := null ) is l_run ut_run; l_coverage_schema_names ut_varchar2_rows; @@ -142,17 +141,13 @@ create or replace package body ut_runner is l_run.do_execute(); finish_run(l_run); - if a_perform_rollback then - rollback; - end if; + rollback; exception when others then finish_run(l_run); dbms_output.put_line(dbms_utility.format_error_backtrace); dbms_output.put_line(dbms_utility.format_error_stack); - if a_perform_rollback then - rollback; - end if; + rollback; raise; end; if a_fail_on_errors and l_run.result in (ut_utils.gc_failure, ut_utils.gc_error) then diff --git a/source/api/ut_runner.pks b/source/api/ut_runner.pks index 1ea997031..8791a4e36 100644 --- a/source/api/ut_runner.pks +++ b/source/api/ut_runner.pks @@ -44,8 +44,6 @@ create or replace package ut_runner authid current_user is * @param a_exclude_objects list of database objects (in format 'owner.name') that coverage should be skipped for * @param a_fail_on_errors true/false - should an exception be thrown when tests are completed with failures/errors * @param a_client_character_set if provided, affects some of reporters by setting specific character set for XML/HTML reports - * @param a_perform_rollback true/false - should rollback be performed as part of test execution (default true) - * * @example * Parameter `a_paths` accepts values of the following formats: @@ -68,8 +66,7 @@ create or replace package ut_runner authid current_user is a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_fail_on_errors boolean := false, - a_client_character_set varchar2 := null, - a_perform_rollback boolean := true + a_client_character_set varchar2 := null ); /** diff --git a/source/api/ut_suite_item_info.tps b/source/api/ut_suite_item_info.tps index eefef4db0..bf6fd6ecf 100644 --- a/source/api/ut_suite_item_info.tps +++ b/source/api/ut_suite_item_info.tps @@ -15,13 +15,13 @@ create or replace type ut_suite_item_info as object ( See the License for the specific language governing permissions and limitations under the License. */ - object_owner varchar2(250), - object_name varchar2(250), - item_name varchar2(250), - item_description varchar2(250), - item_type varchar2(250), - item_line_no integer, - path varchar2(4000), - disabled_flag integer + object_owner varchar2( 250 ), -- the owner of test suite packages + object_name varchar2( 250 ), -- the name of test suite package + item_name varchar2( 250 ), -- the name of suite/test + item_description varchar2( 250 ), -- the description of suite/suite item + item_type varchar2( 250 ), -- the type of item (UT_SUITE/UT_SUITE_CONTEXT/UT_TEST) + item_line_no integer, -- line_number where annotation identifying the item exists + path varchar2( 4000 ),-- suitepath of the item + disabled_flag integer -- 0 (zero) if item is not disabled, 1 if item is disabled by --%disabled annotation ) / diff --git a/test/api/test_ut_runner.pkb b/test/api/test_ut_runner.pkb index 8b0b6f630..0b9b85f9a 100644 --- a/test/api/test_ut_runner.pkb +++ b/test/api/test_ut_runner.pkb @@ -81,13 +81,16 @@ end;'; procedure keep_an_open_transaction is l_expected varchar2(300); + l_output_data dbms_output.chararr; + l_num_lines integer := 100000; begin --Arrange create_test_spec(); create_test_body(0); l_expected := dbms_transaction.local_transaction_id(true); --Act - ut3.ut_runner.run(ut3.ut_varchar2_list('test_cache'),null, a_perform_rollback => false); + ut3.ut.run('test_cache'); + dbms_output.get_lines( l_output_data, l_num_lines); --Assert ut.expect(dbms_transaction.local_transaction_id()).to_equal(l_expected); drop_test_package(); @@ -102,7 +105,7 @@ end;'; create_test_body(0); rollback; --Act - ut3.ut_runner.run(ut3.ut_varchar2_list('test_cache'),null); + ut3.ut.run('test_cache'); dbms_output.get_lines( l_output_data, l_num_lines); --Assert ut.expect(dbms_transaction.local_transaction_id()).to_be_null(); From eeae79be2df3efad9c8a58a54407470afbda1d8a Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 17 Nov 2018 21:55:19 +0000 Subject: [PATCH 0106/1096] Added documentation for new functionality. Added default value for owner, when calling `get_suites_info` --- docs/index.md | 1 + docs/userguide/querying_suites.md | 83 ++++++++++++++++++++++++++++ docs/userguide/running-unit-tests.md | 4 +- mkdocs.yml | 1 + source/api/ut_runner.pkb | 4 +- source/api/ut_runner.pks | 6 +- test/api/test_ut_runner.pkb | 2 +- 7 files changed, 93 insertions(+), 8 deletions(-) create mode 100644 docs/userguide/querying_suites.md diff --git a/docs/index.md b/docs/index.md index 693c8076b..b92a78688 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,6 +10,7 @@ The framework follows industry standards and best patterns of modern Unit Testin - [Expectations](userguide/expectations.md) - [Advanced data comparison](userguide/advanced_data_comparison.md) - [Running unit tests](userguide/running-unit-tests.md) + - [Querying for test suites](userguide/querying_suites.md) - [Testing best pracitces](userguide/best-practices.md) - [Upgrade utPLSQL](userguide/upgrade.md) - Reporting diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md new file mode 100644 index 000000000..1b1c64185 --- /dev/null +++ b/docs/userguide/querying_suites.md @@ -0,0 +1,83 @@ +# Qyerying for test suites + + +## Obtaining information about suites + +utPLSQL framework provides ability to read inforamtion about unit test suites that exist in a schema. + +Pipelined table function `ut_runner.get_suites_info(a_owner, a_package_name)` allows you to retrieve information about: + +- all suites that exist in a given user/schema +- individual test suite pacakage + +Querying the data from function provides the follwing details: + +- `object_owner` - the owner of test suite packages +- `object_name` - the name of test suite package +- `item_name` - the name of suite/test +- `item_description` - the description of suite/suite item +- `item_type` - the type of item (UT_SUITE/UT_SUITE_CONTEXT/UT_TEST/UT_LOGICAL_SUITE) +- `item_line_no` - line_number where annotation identifying the item exists +- `path` - suitepath of the item +- `disabled_flag` - (0/1) indicator if item is disabled by --%disabled annotation + +To get list of all test suites in current schema +```sql +select * from table(ut_runner.get_suites_info()) where item_type = 'UT_SUITE'; +``` + +To get list of all tests for test suite `TEST_STUFF` in current user schema +```sql +select * from table(ut_runner.get_suites_info(USER, 'TEST_STUFF')) where item_type = 'UT_TEST'; +``` + +To get a full information about suite `TEST_STUFF` including suite description, all contexts and tests in a suite +```sql +select * from table(ut_runner.get_suites_info(USER, 'TEST_STUFF')) where item_type = 'UT_TEST'; +``` + +## Checking if schema contains tests + +Function `ut_runner.has_suites(a_owner)` returns boolean value indicating if given schema contains test suites. + +Example: +```sql +begin + if ut_runner.has_suites(USER) then + dbms_output.put_line( 'User '||USER||' owns test suites' ); + else + dbms_output.put_line( 'User '||USER||' does not own test suites' ); + end if; +end; +``` + +## Checking if package is a test suite + +Function `ut_runner.is_suite(a_owner, a_package_name) ` returns boolean value indicating if given package is a test suites. + +Example: +```sql +begin + if ut_runner.is_suite(USER,'TEST_STUFF') then + dbms_output.put_line( 'Package '||USER||'.TEST_STUFF is a test suite' ); + else + dbms_output.put_line( 'Package '||USER||'.TEST_STUFF is not a test suite' ); + end if; +end; +``` + +## Checking if procedure is a test within a suite + +Function `ut_runner.is_test(a_owner, a_package_name, a_procedure_name) ` returns boolean value indicating if given package is a test suites. + +Example: +```sql +begin + if ut_runner.is_test(USER,'TEST_STUFF','A_TEST_TO_CHECK_STUFF') then + dbms_output.put_line( 'Procedure '||USER||'.TEST_STUFF.A_TEST_TO_CHECK_STUFF is a test' ); + else + dbms_output.put_line( 'Procedure '||USER||'.TEST_STUFF.A_TEST_TO_CHECK_STUFF is not a test' ); + end if; +end; +``` + diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 54116cf65..f680a2e38 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,12 +1,12 @@ # Running tests -The utPLSQL framework provides two main entry points to run unit tests from within the database: +utPLSQL framework provides two main entry points to run unit tests from within the database: - `ut.run` procedures and functions - `ut_runner.run` procedures These two entry points differ in purpose and behavior. -Most of the time you will want to use `ut.run` as `ut_runner` is designed for API integration and does not output the results to the screen directly. +Most of the time you will want to use `ut.run` as `ut_runner.run` is designed for API integration and does not display the results to the screen. # Running from CI servers and command line diff --git a/mkdocs.yml b/mkdocs.yml index 7bffe0c71..f9a2687a8 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -18,6 +18,7 @@ nav: - Expectations: userguide/expectations.md - Advanced data comparison: userguide/advanced_data_comparison.md - Running unit tests: userguide/running-unit-tests.md + - Querying for test suites: userguide/querying_suites.md - Testing best pracitces: userguide/best-practices.md - Upgrade utPLSQL: userguide/upgrade.md - Reporting: diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index 64faf91ed..816e9e302 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -165,12 +165,12 @@ create or replace package body ut_runner is ut_annotation_manager.purge_cache(a_object_owner, a_object_type); end; - function get_suites_info(a_owner varchar2, a_package_name varchar2 := null) return ut_suite_items_info pipelined is + function get_suites_info(a_owner varchar2 := null, a_package_name varchar2 := null) return ut_suite_items_info pipelined is l_cursor sys_refcursor; l_results ut_suite_items_info; c_bulk_limit constant integer := 10; begin - l_cursor := ut_suite_manager.get_suites_info( a_owner, a_package_name ); + l_cursor := ut_suite_manager.get_suites_info( nvl(a_owner,sys_context('userenv', 'current_schema')), a_package_name ); loop fetch l_cursor bulk collect into l_results limit c_bulk_limit; for i in 1 .. l_results.count loop diff --git a/source/api/ut_runner.pks b/source/api/ut_runner.pks index 8791a4e36..acef16c50 100644 --- a/source/api/ut_runner.pks +++ b/source/api/ut_runner.pks @@ -91,11 +91,11 @@ create or replace package ut_runner authid current_user is /** * Returns a pipelined collection containing information about unit test suites and the tests contained in them * - * @param a_owner owner of unit tests to retrieve - * @param a_package_name optional name of unit test package to retrieve, if NULLm all unit test packages are returned + * @param a_owner owner of unit tests to retrieve (optional), if NULL, current schema is used + * @param a_package_name name of unit test package to retrieve (optional), if NULL all unit test packages are returned * @return ut_suite_items_info table of objects */ - function get_suites_info(a_owner varchar2, a_package_name varchar2 := null) return ut_suite_items_info pipelined; + function get_suites_info(a_owner varchar2 := null, a_package_name varchar2 := null) return ut_suite_items_info pipelined; /** diff --git a/test/api/test_ut_runner.pkb b/test/api/test_ut_runner.pkb index 0b9b85f9a..96ae08a94 100644 --- a/test/api/test_ut_runner.pkb +++ b/test/api/test_ut_runner.pkb @@ -284,7 +284,7 @@ end;'; 'dummy_test_package.some_dummy_test_procedure' path, 0 disabled_flag from dual; --Act - open l_actual for select * from table(ut3.ut_runner.get_suites_info('UT3_TESTER','DUMMY_TEST_PACKAGE')); + open l_actual for select * from table(ut3.ut_runner.get_suites_info(NULL,'DUMMY_TEST_PACKAGE')); --Assert ut.expect(l_actual).to_equal(l_expected); end; From 6bf2c8e39e2b43e4132c3555d35cd27d10130485 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 18 Nov 2018 00:26:21 +0000 Subject: [PATCH 0107/1096] Added ability to control rollback bekavior of a test-run. --- source/api/ut.pkb | 91 +++++++++++-------- source/api/ut.pks | 18 ++-- source/api/ut_runner.pkb | 18 ++-- source/api/ut_runner.pks | 4 +- source/core/types/ut_logical_suite.tpb | 6 +- source/core/types/ut_logical_suite.tps | 2 +- source/core/types/ut_run.tpb | 8 ++ source/core/types/ut_run.tps | 1 + source/core/types/ut_suite_item.tpb | 4 +- source/core/types/ut_suite_item.tps | 2 +- test/api/test_ut_run.pkb | 116 +++++++++++++++++++++++++ test/api/test_ut_run.pks | 15 ++++ 12 files changed, 231 insertions(+), 54 deletions(-) diff --git a/source/api/ut.pkb b/source/api/ut.pkb index bd241ce13..bb599704e 100644 --- a/source/api/ut.pkb +++ b/source/api/ut.pkb @@ -18,6 +18,7 @@ create or replace package body ut is */ g_nls_date_format varchar2(4000); + gc_fail_on_errors constant boolean := false; function version return varchar2 is begin @@ -117,7 +118,6 @@ create or replace package body ut is a_client_character_set varchar2 := null ) is pragma autonomous_transaction; - c_fail_on_errors constant boolean := false; begin a_reporter := coalesce(a_reporter,ut_documentation_reporter()); ut_runner.run( @@ -129,7 +129,7 @@ create or replace package body ut is a_test_file_mappings, a_include_objects, a_exclude_objects, - c_fail_on_errors, + gc_fail_on_errors, a_client_character_set ); rollback; @@ -147,7 +147,6 @@ create or replace package body ut is a_client_character_set varchar2 := null ) is pragma autonomous_transaction; - c_fail_on_errors constant boolean := false; begin a_reporter := coalesce(a_reporter,ut_documentation_reporter()); ut_runner.run( @@ -159,7 +158,7 @@ create or replace package body ut is ut_file_mapper.build_file_mappings(a_test_files), a_include_objects, a_exclude_objects, - c_fail_on_errors, + gc_fail_on_errors, a_client_character_set ); rollback; @@ -406,21 +405,39 @@ create or replace package body ut is a_test_file_mappings ut_file_mappings := null, a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, - a_client_character_set varchar2 := null + a_client_character_set varchar2 := null, + a_force_manual_rollback boolean := false ) is l_reporter ut_reporter_base := a_reporter; begin - run_autonomous( - a_paths, - l_reporter, - ut_utils.boolean_to_int(a_color_console), - a_coverage_schemes, - a_source_file_mappings, - a_test_file_mappings, - a_include_objects, - a_exclude_objects, - a_client_character_set - ); + if a_force_manual_rollback then + l_reporter := coalesce(l_reporter,ut_documentation_reporter()); + ut_runner.run( + a_paths, + ut_reporters(l_reporter), + a_color_console, + a_coverage_schemes, + a_source_file_mappings, + a_test_file_mappings, + a_include_objects, + a_exclude_objects, + gc_fail_on_errors, + a_client_character_set, + a_force_manual_rollback + ); + else + run_autonomous( + a_paths, + l_reporter, + ut_utils.boolean_to_int(a_color_console), + a_coverage_schemes, + a_source_file_mappings, + a_test_file_mappings, + a_include_objects, + a_exclude_objects, + a_client_character_set + ); + end if; if l_reporter is of (ut_output_reporter_base) then treat(l_reporter as ut_output_reporter_base).lines_to_dbms_output(); end if; @@ -436,25 +453,23 @@ create or replace package body ut is a_test_files ut_varchar2_list, a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, - a_client_character_set varchar2 := null + a_client_character_set varchar2 := null, + a_force_manual_rollback boolean := false ) is l_reporter ut_reporter_base := a_reporter; begin - run_autonomous( + ut.run( a_paths, l_reporter, - ut_utils.boolean_to_int(a_color_console), + a_color_console, a_coverage_schemes, - a_source_files, - a_test_files, + ut_file_mapper.build_file_mappings(a_source_files), + ut_file_mapper.build_file_mappings(a_test_files), a_include_objects, a_exclude_objects, - a_client_character_set + a_client_character_set, + a_force_manual_rollback ); - if l_reporter is of (ut_output_reporter_base) then - treat(l_reporter as ut_output_reporter_base).lines_to_dbms_output(); - end if; - raise_if_packages_invalidated(); end; procedure run( @@ -465,7 +480,8 @@ create or replace package body ut is a_test_file_mappings ut_file_mappings := null, a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, - a_client_character_set varchar2 := null + a_client_character_set varchar2 := null, + a_force_manual_rollback boolean := false ) is begin ut.run( @@ -477,7 +493,8 @@ create or replace package body ut is a_test_file_mappings, a_include_objects, a_exclude_objects, - a_client_character_set + a_client_character_set, + a_force_manual_rollback ); end; @@ -489,7 +506,8 @@ create or replace package body ut is a_test_files ut_varchar2_list, a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, - a_client_character_set varchar2 := null + a_client_character_set varchar2 := null, + a_force_manual_rollback boolean := false ) is begin ut.run( @@ -501,7 +519,8 @@ create or replace package body ut is a_test_files, a_include_objects, a_exclude_objects, - a_client_character_set + a_client_character_set, + a_force_manual_rollback ); end; @@ -514,7 +533,8 @@ create or replace package body ut is a_test_file_mappings ut_file_mappings := null, a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, - a_client_character_set varchar2 := null + a_client_character_set varchar2 := null, + a_force_manual_rollback boolean := false ) is begin ut.run( @@ -526,7 +546,8 @@ create or replace package body ut is a_test_file_mappings, a_include_objects, a_exclude_objects, - a_client_character_set + a_client_character_set, + a_force_manual_rollback ); end; @@ -539,7 +560,8 @@ create or replace package body ut is a_test_files ut_varchar2_list, a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, - a_client_character_set varchar2 := null + a_client_character_set varchar2 := null, + a_force_manual_rollback boolean := false ) is begin ut.run( @@ -551,7 +573,8 @@ create or replace package body ut is a_test_files, a_include_objects, a_exclude_objects, - a_client_character_set + a_client_character_set, + a_force_manual_rollback ); end; diff --git a/source/api/ut.pks b/source/api/ut.pks index 59c709a33..25c9e6493 100644 --- a/source/api/ut.pks +++ b/source/api/ut.pks @@ -125,7 +125,8 @@ create or replace package ut authid current_user as a_test_file_mappings ut_file_mappings := null, a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, - a_client_character_set varchar2 := null + a_client_character_set varchar2 := null, + a_force_manual_rollback boolean := false ); procedure run( @@ -136,7 +137,8 @@ create or replace package ut authid current_user as a_test_files ut_varchar2_list, a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, - a_client_character_set varchar2 := null + a_client_character_set varchar2 := null, + a_force_manual_rollback boolean := false ); procedure run( @@ -148,7 +150,8 @@ create or replace package ut authid current_user as a_test_file_mappings ut_file_mappings := null, a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, - a_client_character_set varchar2 := null + a_client_character_set varchar2 := null, + a_force_manual_rollback boolean := false ); procedure run( @@ -160,7 +163,8 @@ create or replace package ut authid current_user as a_test_files ut_varchar2_list, a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, - a_client_character_set varchar2 := null + a_client_character_set varchar2 := null, + a_force_manual_rollback boolean := false ); procedure run( @@ -172,7 +176,8 @@ create or replace package ut authid current_user as a_test_file_mappings ut_file_mappings := null, a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, - a_client_character_set varchar2 := null + a_client_character_set varchar2 := null, + a_force_manual_rollback boolean := false ); procedure run( @@ -184,7 +189,8 @@ create or replace package ut authid current_user as a_test_files ut_varchar2_list, a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, - a_client_character_set varchar2 := null + a_client_character_set varchar2 := null, + a_force_manual_rollback boolean := false ); /** diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index c04fa5112..a4c2b3dc6 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -42,13 +42,16 @@ create or replace package body ut_runner is return l_result; end; - procedure finish_run(a_run ut_run) is + procedure finish_run(a_run ut_run, a_force_manual_rollback boolean) is begin ut_utils.cleanup_temp_tables; ut_event_manager.trigger_event(ut_utils.gc_finalize, a_run); ut_metadata.reset_source_definition_cache; ut_utils.read_cache_to_dbms_output(); ut_coverage_helper.cleanup_tmp_table(); + if not a_force_manual_rollback then + rollback; + end if; end; @@ -83,7 +86,8 @@ create or replace package body ut_runner is a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_fail_on_errors boolean := false, - a_client_character_set varchar2 := null + a_client_character_set varchar2 := null, + a_force_manual_rollback boolean := false ) is l_run ut_run; l_coverage_schema_names ut_varchar2_rows; @@ -137,16 +141,18 @@ create or replace package body ut_runner is set(a_test_file_mappings), a_client_character_set ); + if a_force_manual_rollback then + l_run.set_rollback_type(ut_utils.gc_rollback_manual, a_force=>true); + end if; + l_run.do_execute(); - finish_run(l_run); - rollback; + finish_run(l_run, a_force_manual_rollback); exception when others then - finish_run(l_run); + finish_run(l_run, a_force_manual_rollback); dbms_output.put_line(dbms_utility.format_error_backtrace); dbms_output.put_line(dbms_utility.format_error_stack); - rollback; raise; end; if a_fail_on_errors and l_run.result in (ut_utils.gc_failure, ut_utils.gc_error) then diff --git a/source/api/ut_runner.pks b/source/api/ut_runner.pks index 45b8cb642..b1511c623 100644 --- a/source/api/ut_runner.pks +++ b/source/api/ut_runner.pks @@ -43,6 +43,7 @@ create or replace package ut_runner authid current_user is * @param a_include_objects list of database objects (in format 'owner.name') that coverage should be reported on * @param a_exclude_objects list of database objects (in format 'owner.name') that coverage should be skipped for * @param a_fail_on_errors true/false - should an exception be thrown when tests are completed with failures/errors + * @param a_force_manual_rollback true/false - should the transaction control be forced to --%rollback(manual) and no rollback issued at the end of the run * * @example * Parameter `a_paths` accepts values of the following formats: @@ -65,7 +66,8 @@ create or replace package ut_runner authid current_user is a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_fail_on_errors boolean := false, - a_client_character_set varchar2 := null + a_client_character_set varchar2 := null, + a_force_manual_rollback boolean := false ); /** diff --git a/source/core/types/ut_logical_suite.tpb b/source/core/types/ut_logical_suite.tpb index 0443bf105..97c089ecb 100644 --- a/source/core/types/ut_logical_suite.tpb +++ b/source/core/types/ut_logical_suite.tpb @@ -51,11 +51,11 @@ create or replace type body ut_logical_suite as self.calc_execution_result(); end; - overriding member procedure set_rollback_type(self in out nocopy ut_logical_suite, a_rollback_type integer) is + overriding member procedure set_rollback_type(self in out nocopy ut_logical_suite, a_rollback_type integer, a_force boolean := false) is begin - self.rollback_type := coalesce(self.rollback_type, a_rollback_type); + self.rollback_type := case when a_force then a_rollback_type else coalesce(self.rollback_type, a_rollback_type) end; for i in 1 .. self.items.count loop - self.items(i).set_rollback_type(self.rollback_type); + self.items(i).set_rollback_type(self.rollback_type, a_force); end loop; end; diff --git a/source/core/types/ut_logical_suite.tps b/source/core/types/ut_logical_suite.tps index 85bb80870..e9ee20a93 100644 --- a/source/core/types/ut_logical_suite.tps +++ b/source/core/types/ut_logical_suite.tps @@ -27,7 +27,7 @@ create or replace type ut_logical_suite under ut_suite_item ( member function is_valid(self in out nocopy ut_logical_suite) return boolean, member procedure add_item(self in out nocopy ut_logical_suite, a_item ut_suite_item), overriding member procedure mark_as_skipped(self in out nocopy ut_logical_suite), - overriding member procedure set_rollback_type(self in out nocopy ut_logical_suite, a_rollback_type integer), + overriding member procedure set_rollback_type(self in out nocopy ut_logical_suite, a_rollback_type integer, a_force boolean := false), overriding member function do_execute(self in out nocopy ut_logical_suite) return boolean, overriding member procedure calc_execution_result(self in out nocopy ut_logical_suite), overriding member procedure mark_as_errored(self in out nocopy ut_logical_suite, a_error_stack_trace varchar2), diff --git a/source/core/types/ut_run.tpb b/source/core/types/ut_run.tpb index 0db9f38c0..d77999a57 100644 --- a/source/core/types/ut_run.tpb +++ b/source/core/types/ut_run.tpb @@ -75,6 +75,14 @@ create or replace type body ut_run as return l_completed_without_errors; end; + overriding member procedure set_rollback_type(self in out nocopy ut_run, a_rollback_type integer, a_force boolean := false) is + begin + self.rollback_type := case when a_force then a_rollback_type else coalesce(self.rollback_type, a_rollback_type) end; + for i in 1 .. self.items.count loop + self.items(i).set_rollback_type(self.rollback_type, a_force); + end loop; + end; + overriding member procedure calc_execution_result(self in out nocopy ut_run) is l_result integer(1); begin diff --git a/source/core/types/ut_run.tps b/source/core/types/ut_run.tps index 5dc8e0399..e4309e126 100644 --- a/source/core/types/ut_run.tps +++ b/source/core/types/ut_run.tps @@ -37,6 +37,7 @@ create or replace type ut_run under ut_suite_item ( ) return self as result, overriding member procedure mark_as_skipped(self in out nocopy ut_run), overriding member function do_execute(self in out nocopy ut_run) return boolean, + overriding member procedure set_rollback_type(self in out nocopy ut_run, a_rollback_type integer, a_force boolean := false), overriding member procedure calc_execution_result(self in out nocopy ut_run), overriding member procedure mark_as_errored(self in out nocopy ut_run, a_error_stack_trace varchar2), overriding member function get_error_stack_traces return ut_varchar2_list, diff --git a/source/core/types/ut_suite_item.tpb b/source/core/types/ut_suite_item.tpb index a3319a4d8..0d1faffa3 100644 --- a/source/core/types/ut_suite_item.tpb +++ b/source/core/types/ut_suite_item.tpb @@ -37,9 +37,9 @@ create or replace type body ut_suite_item as return ut_utils.int_to_boolean(self.disabled_flag); end; - member procedure set_rollback_type(self in out nocopy ut_suite_item, a_rollback_type integer) is + member procedure set_rollback_type(self in out nocopy ut_suite_item, a_rollback_type integer, a_force boolean := false) is begin - self.rollback_type := coalesce(self.rollback_type, a_rollback_type); + self.rollback_type := case when a_force then a_rollback_type else coalesce(self.rollback_type, a_rollback_type) end; end; member function get_rollback_type return integer is diff --git a/source/core/types/ut_suite_item.tps b/source/core/types/ut_suite_item.tps index 52b6a2a19..f0821fbb8 100644 --- a/source/core/types/ut_suite_item.tps +++ b/source/core/types/ut_suite_item.tps @@ -56,7 +56,7 @@ create or replace type ut_suite_item force under ut_event_item ( member procedure set_disabled_flag(self in out nocopy ut_suite_item, a_disabled_flag boolean), member function get_disabled_flag return boolean, not instantiable member procedure mark_as_skipped(self in out nocopy ut_suite_item), - member procedure set_rollback_type(self in out nocopy ut_suite_item, a_rollback_type integer), + member procedure set_rollback_type(self in out nocopy ut_suite_item, a_rollback_type integer, a_force boolean := false), member function get_rollback_type return integer, member function create_savepoint_if_needed return varchar2, member procedure rollback_to_savepoint(self in out nocopy ut_suite_item, a_savepoint varchar2), diff --git a/test/api/test_ut_run.pkb b/test/api/test_ut_run.pkb index dae7e175a..50612e53c 100644 --- a/test/api/test_ut_run.pkb +++ b/test/api/test_ut_run.pkb @@ -355,6 +355,122 @@ create or replace package body test_ut_run is ut.expect( l_results ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); end; + procedure transaction_setup is + pragma autonomous_transaction; + begin + execute immediate 'create table transaction_test_table(message varchar2(100))'; + execute immediate 'create or replace package test_transaction is + --%suite + + --%test + procedure insert_row; + + --%test + procedure insert_and_raise; + end; + '; + execute immediate 'create or replace package body test_transaction is + procedure insert_row is + begin + insert into transaction_test_table values (''2 - inside the test_transaction.insert_row test''); + end; + procedure insert_and_raise is + begin + insert into transaction_test_table values (''2 - inside the test_transaction.insert_row test''); + raise no_data_found; + end; + end; + '; + + end; + + procedure transaction_cleanup is + pragma autonomous_transaction; + begin + begin + execute immediate 'drop table transaction_test_table'; + exception + when others then null; + end; + begin + execute immediate 'drop pacakge test_transaction'; + exception + when others then null; + end; + end; + + procedure run_proc_keep_test_data is + l_expected sys_refcursor; + l_actual sys_refcursor; + l_results clob; + begin + --Arrange + execute immediate ' + insert into transaction_test_table values (''1 - inside the test_ut_run.run_proc_keep_test_changes test'')'; + + --Act + ut3.ut.run('test_transaction.insert_row', a_force_manual_rollback => true); + l_results := get_dbms_output_as_clob(); + + --Assert + open l_expected for + select '1 - inside the test_ut_run.run_proc_keep_test_changes test' as message from dual + union all + select '2 - inside the test_transaction.insert_row test' from dual + order by 1; + + open l_actual for 'select * from transaction_test_table order by 1'; + + ut.expect( l_actual ).to_equal(l_expected); + end; + + procedure run_proc_keep_test_data_raise is + l_expected sys_refcursor; + l_actual sys_refcursor; + l_results clob; + begin + --Arrange + execute immediate ' + insert into transaction_test_table values (''1 - inside the test_ut_run.run_proc_keep_test_changes test'')'; + + --Act + ut3.ut.run('test_transaction.insert_and_raise', a_force_manual_rollback => true); + l_results := get_dbms_output_as_clob(); + + --Assert + open l_expected for + select '1 - inside the test_ut_run.run_proc_keep_test_changes test' as message from dual + union all + select '2 - inside the test_transaction.insert_row test' from dual + order by 1; + + open l_actual for 'select * from transaction_test_table order by 1'; + + ut.expect( l_actual ).to_equal(l_expected); + end; + + procedure run_proc_discard_test_data is + l_expected sys_refcursor; + l_actual sys_refcursor; + l_results clob; + begin + --Arrange + execute immediate ' + insert into transaction_test_table values (''1 - inside the test_ut_run.run_proc_keep_test_changes test'')'; + + --Act + ut3.ut.run('test_transaction.insert_row'); + l_results := get_dbms_output_as_clob(); + + --Assert + open l_expected for + select '1 - inside the test_ut_run.run_proc_keep_test_changes test' as message from dual; + + open l_actual for 'select * from transaction_test_table order by 1'; + + ut.expect( l_actual ).to_equal(l_expected); + end; + procedure run_func_no_params is l_results ut3.ut_varchar2_list; begin diff --git a/test/api/test_ut_run.pks b/test/api/test_ut_run.pks index cfc06c80d..b5fa8bd69 100644 --- a/test/api/test_ut_run.pks +++ b/test/api/test_ut_run.pks @@ -44,6 +44,21 @@ create or replace package test_ut_run is --%endcontext + --%context(run_proc_transaction_control) + + --%beforeall + procedure transaction_setup; + --%afterall + procedure transaction_cleanup; + --%test(Leaves transaction open and uncommitted with a_force_manual_rollback) + procedure run_proc_keep_test_data; + --%test(Leaves transaction open and uncommitted with a_force_manual_rollback with exceptions) + procedure run_proc_keep_test_data_raise; + --%test(Does not impact current transaction when ran without a_force_manual_rollback) + procedure run_proc_discard_test_data; + + --%endcontext + --%context(ut_run_function) --%displayname(ut.run() function options) From 4e3a654adde8c1fcb4c316d002ca3a4383d4bb98 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 18 Nov 2018 00:40:04 +0000 Subject: [PATCH 0108/1096] Updated documentation. --- docs/userguide/running-unit-tests.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 54116cf65..b67569b8f 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -131,6 +131,26 @@ Executes all tests from package _HR.TEST_APPLY_BONUS_ and provide outputs to DBM For details on build-in reporters look at [reporters documentation](reporters.md). +## Keeping uncommited data after test-run + +utPLSQL by default runs tests in autonomous transaction and performs automatic rollback to assure that tests do not impact one-another and do not have impact on the current session in your IDE. + +If you would like to keep your uncommited data persisted after running tests, you can do so by using `a_force_manual_rollback` flag. +Setting this flag to true has following side-effects: + +- test execution is done in current transaction - if while running tests commit or rollback is issued your current session data will get commited too. +- automatic rollback is forced to be disabled in test-run even if it was explicitly enabled by using annotation `--%rollback(manual) + +Example invocation: +```sql +begin + ut.run('hr.test_apply_bonus', a_force_manual_rollback => true); +end; +``` + + +This option is not anvailable when running tests using `ut.run` as a table function. + ## ut.run functions The `ut.run` functions provide exactly the same functionality as the `ut.run` procedures. From 611092353d6e748b775cc51177007f5588771e7a Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 18 Nov 2018 01:10:07 +0000 Subject: [PATCH 0109/1096] Updated documentation to include infrmation about reports encoding. --- docs/userguide/reporters.md | 8 ++++---- docs/userguide/running-unit-tests.md | 20 +++++++++++++++++--- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 2fddbbfd7..6d3e8a326 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -42,7 +42,7 @@ Example outputs from documentation reporter. # JUnit reporter Most of continuous integration servers (like Jenkins) are capable of consuming unit test execution results in [JUnit](https://en.wikipedia.org/wiki/JUnit) format. -The `ut_junit_reporter` in earlier version referred as ut_xunit_reporter is producing outcomes as JUnit-compatible XML unit test report, that can be used by CI servers to display their custom reports and provide metrics (like tests execution trends). +The `ut_junit_reporter` in earlier version referred as `ut_xunit_reporter` is producing outcomes as JUnit-compatible XML unit test report, that can be used by CI servers to display their custom reports and provide metrics (like tests execution trends). Please note that in previous versions it was called ut_xunit_reporter and for backward compatibility that name still exists. Invocation of tests with JUnit reporter. @@ -63,7 +63,7 @@ Example of failure report details # Teamcity reporter -[Teamcity](https://www.jetbrains.com/teamcity/) is a CI server by Jetbrains. It supports XUnit reporting and additionally has it's own format of reporting that allows tracking of progress of a CI step/task as it executes. +[Teamcity](https://www.jetbrains.com/teamcity/) is a CI server by Jetbrains. It supports JUnit reporting and additionally has it's own format of reporting that allows tracking of progress of a CI step/task as it executes. The TeamCity format developed by Jetbrains is supported by utPLSQL with `ut_teamcity_reporter`. Invocation of tests with Teamcity reporter. @@ -74,11 +74,11 @@ The `ut_teamcity_reporter` doesn't accept any arguments. Example of unit test report from Teamcity CI server. -![xunit_reporter_outputs](../images/teamcity_report_example.png) +![junit_reporter_outputs](../images/teamcity_report_example.png) Example of failure report details -![xunit_reporter_outputs](../images/teamcity_report_example_errors.png) +![junit_reporter_outputs_errors](../images/teamcity_report_example_errors.png) # Sonar test reporter diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 54116cf65..afe2c7ac9 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -123,10 +123,10 @@ You can execute any set of tests with any of the predefined reporters. ```sql begin - ut.run('hr.test_apply_bonus', ut_xunit_reporter()); + ut.run('hr.test_apply_bonus', ut_junit_reporter()); end; ``` -Executes all tests from package _HR.TEST_APPLY_BONUS_ and provide outputs to DBMS_OUTPUT using the XUnit reporter. +Executes all tests from package _HR.TEST_APPLY_BONUS_ and provide outputs to DBMS_OUTPUT using the JUnit reporter. For details on build-in reporters look at [reporters documentation](reporters.md). @@ -140,7 +140,7 @@ Functions provide output as a pipelined stream and therefore need to be executed Example. ```sql -select * from table(ut.run('hr.test_apply_bonus', ut_xunit_reporter())); +select * from table(ut.run('hr.test_apply_bonus', ut_junit_reporter())); ``` # ut_runner.run procedures @@ -158,3 +158,17 @@ The concept is pretty simple. - as a separate thread, start `ut_runner.run` and pass reporters with previously defined output_ids. - for each reporter start a separate thread and read outputs from the `ut_output_buffer.get_lines` table function by providing the output_id defined in the main thread. +# Reports characterset encoding + +To get properly encoded reports, when running utPLSQL with HTML/XML reports on data containing national characters you need to provide your client character set when calling `ut.run` functions and procedures. + +If you run your tests using `utPLSQL-cli`, this is done automatically and no action needs to be taken. + +To make sure that the reports will display your national characters properly when running from IDE like SQLDeveloper/TOAD/SQLPlus or sqlcl you need to provide the charaterset manualy to `ut.run`. + +Example call with characterset provided: +```sql +begin + ut.run('hr.test_apply_bonus', ut_junit_reporter(), a_client_character_set => 'Windows-1251'); +end; +``` \ No newline at end of file From 74ec9a1f3cefa713d49cf777c731290552bb1c8b Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 18 Nov 2018 14:50:10 +0000 Subject: [PATCH 0110/1096] 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. --- examples/RunDeveloperExamples.sql | 2 - ...nExampleComplexSuiteWithCustomReporter.sql | 56 ------------ .../RunExampleTestSuite.sql | 6 +- ...nExampleTestSuiteWithCompositeReporter.sql | 14 +-- .../RunExampleTestSuiteWithCustomReporter.sql | 6 +- .../annotations/ut_annotation_manager.pkb | 2 +- .../core/types/ut_console_reporter_base.tpb | 10 --- .../core/types/ut_console_reporter_base.tps | 6 +- source/core/types/ut_logical_suite.tpb | 39 -------- source/core/types/ut_logical_suite.tps | 10 --- source/core/types/ut_run.tpb | 24 +---- source/core/types/ut_run.tps | 6 -- source/core/types/ut_suite_item.tps | 6 -- source/core/types/ut_test.tpb | 10 --- source/core/types/ut_test.tps | 6 -- source/core/ut_metadata.pkb | 20 +---- source/core/ut_metadata.pks | 6 -- source/core/ut_suite_manager.pkb | 4 +- source/core/ut_utils.pkb | 16 +--- source/core/ut_utils.pks | 6 -- source/reporters/ut_ansiconsole_helper.pkb | 10 --- source/reporters/ut_ansiconsole_helper.pks | 4 - source/reporters/ut_teamcity_reporter.tpb | 51 +++++------ test/api/test_ut_run.pkb | 88 +++++++++++++++++++ test/api/test_ut_run.pks | 15 ++++ test/core/test_ut_suite.pkb | 24 +++-- test/core/test_ut_test.pkb | 30 ++++--- 27 files changed, 186 insertions(+), 291 deletions(-) delete mode 100644 examples/developer_examples/RunExampleComplexSuiteWithCustomReporter.sql diff --git a/examples/RunDeveloperExamples.sql b/examples/RunDeveloperExamples.sql index ec4301e88..d34914b58 100644 --- a/examples/RunDeveloperExamples.sql +++ b/examples/RunDeveloperExamples.sql @@ -6,8 +6,6 @@ set linesize 1000 exec ut_ansiconsole_helper.color_enabled(true); --developer examples -prompt RunExampleComplexSuiteWithCustomReporter -@@developer_examples/RunExampleComplexSuiteWithCustomReporter.sql prompt RunExampleTestSuiteWithCustomReporter @@developer_examples/RunExampleTestSuiteWithCustomReporter.sql prompt RunExampleTestAnnotationsParsingTimeHugePackage diff --git a/examples/developer_examples/RunExampleComplexSuiteWithCustomReporter.sql b/examples/developer_examples/RunExampleComplexSuiteWithCustomReporter.sql deleted file mode 100644 index 406a1cba2..000000000 --- a/examples/developer_examples/RunExampleComplexSuiteWithCustomReporter.sql +++ /dev/null @@ -1,56 +0,0 @@ ---Shows how to create a test suite with the default reporter which is dbms_output ---No tables are used for this. ---Suite Management packages are when developed will make this easier. ---Clear Screen -Set Serveroutput On Size Unlimited format truncated -set echo off ---install the example unit test packages -@@ut_exampletest.pks -@@ut_exampletest.pkb -@@ut_exampletest2.pks -@@ut_exampletest2.pkb -@@ut_custom_reporter.tps -@@ut_custom_reporter.tpb - -declare - l_parent_suite ut_logical_suite; - l_suite ut_suite; - l_test ut_test; - l_reporter ut_output_reporter_base; - l_run ut_run; -begin - ut_event_manager.initialize(); - l_parent_suite := ut_logical_suite( a_object_owner=>null, a_object_name => null, a_name => 'complex_test_suite', a_path => null); - - l_suite := ut_suite(user, 'ut_exampletest',a_line_no=>1); - l_test := ut_test(user, 'ut_exampletest','ut_exAmpletest',a_line_no=>3); - l_test.description := 'Example test1'; - l_test.before_test_list := ut_executables(ut_executable(user, 'ut_exampletest','Setup',ut_utils.gc_before_test)); - l_test.after_test_list := ut_executables(ut_executable(user, 'ut_exampletest','tEardown',ut_utils.gc_after_test)); - - l_suite.add_item(l_test); - l_parent_suite.add_item(l_suite); - - - l_suite := ut_suite(user, 'ut_exampletest2',a_line_no=>1); - l_test := ut_test(user, 'UT_EXAMPLETEST2','UT_EXAMPLETEST',a_line_no=>3); - l_test.before_test_list := ut_executables(ut_executable(user, 'UT_EXAMPLETEST2','SETUP',ut_utils.gc_before_test)); - l_test.after_test_list := ut_executables(ut_executable(user, 'UT_EXAMPLETEST2','TEARDOWN',ut_utils.gc_after_test)); - - l_suite.add_item(l_test); - l_parent_suite.add_item(l_suite); - - -- provide a reporter to process results - l_reporter := ut_custom_reporter(a_tab_size => 2); - ut_event_manager.add_listener(l_reporter); - l_run := ut_run(ut_suite_items(l_parent_suite)); - l_run.do_execute(); - ut_event_manager.trigger_event(ut_utils.gc_finalize, l_run); - l_reporter.lines_to_dbms_output(); -end; -/ - -drop type ut_custom_reporter; -drop package ut_exampletest; -drop package ut_exampletest2; -exec dbms_session.reset_package; diff --git a/examples/developer_examples/RunExampleTestSuite.sql b/examples/developer_examples/RunExampleTestSuite.sql index 7b01d1154..950450cd5 100644 --- a/examples/developer_examples/RunExampleTestSuite.sql +++ b/examples/developer_examples/RunExampleTestSuite.sql @@ -21,13 +21,15 @@ begin l_test.description := 'Example test1'; l_test.before_test_list := ut_executables(ut_executable(user, 'ut_exampletest','Setup',ut_utils.gc_before_test)); l_test.after_test_list := ut_executables(ut_executable(user, 'ut_exampletest','tEardown',ut_utils.gc_after_test)); - l_suite.add_item(l_test); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := l_test; l_test := ut_test(user, 'UT_EXAMPLETEST2','ut_exAmpletest',a_line_no=>6); l_test.description := 'Another example test'; l_test.before_test_list := ut_executables(ut_executable(user, 'UT_EXAMPLETEST2','SETUP',ut_utils.gc_before_test)); l_test.after_test_list := ut_executables(ut_executable(user, 'UT_EXAMPLETEST2','TEARDOWN',ut_utils.gc_after_test)); - l_suite.add_item(l_test); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := l_test; l_suite.do_execute(); diff --git a/examples/developer_examples/RunExampleTestSuiteWithCompositeReporter.sql b/examples/developer_examples/RunExampleTestSuiteWithCompositeReporter.sql index 8876f0874..f247e06db 100644 --- a/examples/developer_examples/RunExampleTestSuiteWithCompositeReporter.sql +++ b/examples/developer_examples/RunExampleTestSuiteWithCompositeReporter.sql @@ -12,7 +12,7 @@ set echo off PROMPT Runs test report using composite reporter declare - suite ut_logical_suite; + l_suite ut_logical_suite; l_doc_reporter ut_output_reporter_base := ut_documentation_reporter(); l_tc_reporter ut_output_reporter_base := ut_teamcity_reporter(); l_run ut_run; @@ -21,14 +21,16 @@ begin ut_event_manager.add_listener(l_doc_reporter); ut_event_manager.add_listener(l_tc_reporter); - suite := ut_suite(user, 'ut_exampletest',a_line_no=>1); - suite.description := 'Test Suite Name'; + l_suite := ut_suite(user, 'ut_exampletest',a_line_no=>1); + l_suite.description := 'Test Suite Name'; - suite.add_item(ut_test(user,'ut_exampletest','ut_exAmpletest',a_line_no=>3)); - suite.add_item(ut_test(user, 'UT_EXAMPLETEST2','UT_EXAMPLETEST',a_line_no=>6)); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut_test(user,'ut_exampletest','ut_exAmpletest',a_line_no=>3); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut_test(user, 'UT_EXAMPLETEST2','UT_EXAMPLETEST',a_line_no=>6); -- provide a reporter to process results - l_run := ut_run(ut_suite_items(suite)); + l_run := ut_run(ut_suite_items(l_suite)); l_run.do_execute(); ut_event_manager.trigger_event(ut_utils.gc_finalize, l_run); diff --git a/examples/developer_examples/RunExampleTestSuiteWithCustomReporter.sql b/examples/developer_examples/RunExampleTestSuiteWithCustomReporter.sql index e9403809e..2cae9db53 100644 --- a/examples/developer_examples/RunExampleTestSuiteWithCustomReporter.sql +++ b/examples/developer_examples/RunExampleTestSuiteWithCustomReporter.sql @@ -28,13 +28,15 @@ begin l_test.description := 'Example test1'; l_test.before_test_list := ut_executables(ut_executable(user, 'ut_exampletest','Setup',ut_utils.gc_before_test)); l_test.after_test_list := ut_executables(ut_executable(user, 'ut_exampletest','tEardown',ut_utils.gc_after_test)); - l_suite.add_item(l_test); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := l_test; l_test := ut_test(user, 'UT_EXAMPLETEST2','ut_exAmpletest',a_line_no=>6); l_test.description := 'Another example test'; l_test.before_test_list := ut_executables(ut_executable(user, 'ut_exampletest','SETUP',ut_utils.gc_before_test)); l_test.after_test_list := ut_executables(ut_executable(user, 'ut_exampletest','TEARDOWN',ut_utils.gc_after_test)); - l_suite.add_item(l_test); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := l_test; -- provide a reporter to process results tabbing each hierarcy level by tab_size l_reporter := ut_custom_reporter(a_tab_size => 2); diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index 1c7e39273..6dbe1d3ec 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -193,7 +193,7 @@ create or replace package body ut_annotation_manager as ut_annotation_cache_manager.cleanup_cache(l_objects_to_parse); if sys_context('userenv','current_schema') = a_object_owner - or ut_metadata.is_object_visible('ut3.ut_utils') + or ut_metadata.user_has_execute_any_proc() or ut_metadata.is_object_visible('dba_objects') then ut_annotation_cache_manager.remove_from_cache( diff --git a/source/core/types/ut_console_reporter_base.tpb b/source/core/types/ut_console_reporter_base.tpb index 70513223c..0245edde3 100644 --- a/source/core/types/ut_console_reporter_base.tpb +++ b/source/core/types/ut_console_reporter_base.tpb @@ -36,20 +36,10 @@ create or replace type body ut_console_reporter_base is self.print_text(ut_ansiconsole_helper.yellow(a_text)); end; - member procedure print_blue_text(self in out nocopy ut_console_reporter_base, a_text varchar2) is - begin - self.print_text(ut_ansiconsole_helper.red(a_text)); - end; - member procedure print_cyan_text(self in out nocopy ut_console_reporter_base, a_text varchar2) is begin self.print_text(ut_ansiconsole_helper.cyan(a_text)); end; - member procedure print_magenta_text(self in out nocopy ut_console_reporter_base, a_text varchar2) is - begin - self.print_text(ut_ansiconsole_helper.magenta(a_text)); - end; - end; / diff --git a/source/core/types/ut_console_reporter_base.tps b/source/core/types/ut_console_reporter_base.tps index b74b08033..3736e4d33 100644 --- a/source/core/types/ut_console_reporter_base.tps +++ b/source/core/types/ut_console_reporter_base.tps @@ -23,11 +23,7 @@ create or replace type ut_console_reporter_base under ut_output_reporter_base( member procedure print_yellow_text(self in out nocopy ut_console_reporter_base, a_text varchar2), - member procedure print_blue_text(self in out nocopy ut_console_reporter_base, a_text varchar2), - - member procedure print_cyan_text(self in out nocopy ut_console_reporter_base, a_text varchar2), - - member procedure print_magenta_text(self in out nocopy ut_console_reporter_base, a_text varchar2) + member procedure print_cyan_text(self in out nocopy ut_console_reporter_base, a_text varchar2) ) not final not instantiable / diff --git a/source/core/types/ut_logical_suite.tpb b/source/core/types/ut_logical_suite.tpb index 70e0ca462..306ef3b36 100644 --- a/source/core/types/ut_logical_suite.tpb +++ b/source/core/types/ut_logical_suite.tpb @@ -16,45 +16,6 @@ create or replace type body ut_logical_suite as limitations under the License. */ - constructor function ut_logical_suite( - self in out nocopy ut_logical_suite,a_object_owner varchar2, a_object_name varchar2, a_name varchar2, a_path varchar2 - ) return self as result is - begin - self.self_type := $$plsql_unit; - self.init(a_object_owner, a_object_name, a_name, null); - self.path := a_path; - self.disabled_flag := ut_utils.boolean_to_int(false); - self.items := ut_suite_items(); - return; - end; - - member function is_valid(self in out nocopy ut_logical_suite) return boolean is - begin - return true; - end; - - overriding member procedure add_item( - self in out nocopy ut_logical_suite, - a_item ut_suite_item, - a_expected_level integer := 1, - a_current_level integer :=1 - ) is - begin - if a_expected_level > a_current_level then - if self.items.last is not null then - self.items(self.items.last).add_item(a_item, a_expected_level, a_current_level+1); - else - 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'); - end if; - else - if self.items is null then - self.items := ut_suite_items(); - end if; - self.items.extend; - self.items(self.items.last) := a_item; - end if; - end; - overriding member procedure mark_as_skipped(self in out nocopy ut_logical_suite) is begin ut_event_manager.trigger_event(ut_utils.gc_before_suite, self); diff --git a/source/core/types/ut_logical_suite.tps b/source/core/types/ut_logical_suite.tps index 2672cacd3..a9043c87e 100644 --- a/source/core/types/ut_logical_suite.tps +++ b/source/core/types/ut_logical_suite.tps @@ -21,16 +21,6 @@ create or replace type ut_logical_suite under ut_suite_item ( */ items ut_suite_items, - constructor function ut_logical_suite( - self in out nocopy ut_logical_suite, a_object_owner varchar2, a_object_name varchar2, a_name varchar2, a_path varchar2 - ) return self as result, - member function is_valid(self in out nocopy ut_logical_suite) return boolean, - overriding member procedure add_item( - self in out nocopy ut_logical_suite, - a_item ut_suite_item, - a_expected_level integer := 1, - a_current_level integer :=1 - ), overriding member procedure mark_as_skipped(self in out nocopy ut_logical_suite), overriding member procedure set_rollback_type(self in out nocopy ut_logical_suite, a_rollback_type integer), overriding member function do_execute(self in out nocopy ut_logical_suite) return boolean, diff --git a/source/core/types/ut_run.tpb b/source/core/types/ut_run.tpb index f7756cf37..a1ee19bd2 100644 --- a/source/core/types/ut_run.tpb +++ b/source/core/types/ut_run.tpb @@ -51,16 +51,6 @@ create or replace type body ut_run as null; end; - overriding member procedure add_item( - self in out nocopy ut_run, - a_item ut_suite_item, - a_expected_level integer := 1, - a_current_level integer :=1 - ) is - begin - raise_application_error(-20000, 'Cannot add a suite item to ut_run'); - end; - overriding member function do_execute(self in out nocopy ut_run) return boolean is l_completed_without_errors boolean; begin @@ -103,19 +93,7 @@ create or replace type body ut_run as overriding member procedure mark_as_errored(self in out nocopy ut_run, a_error_stack_trace varchar2) is begin - ut_utils.debug_log('ut_run.fail'); - - ut_event_manager.trigger_event(ut_utils.gc_before_run, self); - self.start_time := current_timestamp; - - for i in 1 .. self.items.count loop - self.items(i).mark_as_errored(a_error_stack_trace); - end loop; - - self.calc_execution_result(); - self.end_time := self.start_time; - - ut_event_manager.trigger_event(ut_utils.gc_after_run, self); + null; end; overriding member function get_error_stack_traces return ut_varchar2_list is diff --git a/source/core/types/ut_run.tps b/source/core/types/ut_run.tps index 3807a2a75..5dc8e0399 100644 --- a/source/core/types/ut_run.tps +++ b/source/core/types/ut_run.tps @@ -36,12 +36,6 @@ create or replace type ut_run under ut_suite_item ( a_client_character_set varchar2 := null ) return self as result, overriding member procedure mark_as_skipped(self in out nocopy ut_run), - overriding member procedure add_item( - self in out nocopy ut_run, - a_item ut_suite_item, - a_expected_level integer := 1, - a_current_level integer :=1 - ), overriding member function do_execute(self in out nocopy ut_run) return boolean, overriding member procedure calc_execution_result(self in out nocopy ut_run), overriding member procedure mark_as_errored(self in out nocopy ut_run, a_error_stack_trace varchar2), diff --git a/source/core/types/ut_suite_item.tps b/source/core/types/ut_suite_item.tps index 927ad3807..e91b2afd0 100644 --- a/source/core/types/ut_suite_item.tps +++ b/source/core/types/ut_suite_item.tps @@ -63,12 +63,6 @@ create or replace type ut_suite_item force under ut_event_item ( member procedure init(self in out nocopy ut_suite_item, a_object_owner varchar2, a_object_name varchar2, a_name varchar2, a_line_no integer), member function get_disabled_flag return boolean, not instantiable member procedure mark_as_skipped(self in out nocopy ut_suite_item), - not instantiable member procedure add_item( - self in out nocopy ut_suite_item, - a_item ut_suite_item, - a_expected_level integer := 1, - a_current_level integer :=1 - ), member procedure set_rollback_type(self in out nocopy ut_suite_item, a_rollback_type integer), member function get_rollback_type return integer, member function create_savepoint_if_needed return varchar2, diff --git a/source/core/types/ut_test.tpb b/source/core/types/ut_test.tpb index d68b19a87..ed9692e14 100644 --- a/source/core/types/ut_test.tpb +++ b/source/core/types/ut_test.tpb @@ -34,16 +34,6 @@ create or replace type body ut_test as return; end; - overriding member procedure add_item( - self in out nocopy ut_test, - a_item ut_suite_item, - a_expected_level integer := 1, - a_current_level integer :=1 - ) is - begin - raise_application_error(-20000, 'Cannot add a suite item to ut_test'); - end; - overriding member procedure mark_as_skipped(self in out nocopy ut_test) is begin ut_event_manager.trigger_event(ut_utils.gc_before_test, self); diff --git a/source/core/types/ut_test.tps b/source/core/types/ut_test.tps index 9e26508e4..752ef3ef7 100644 --- a/source/core/types/ut_test.tps +++ b/source/core/types/ut_test.tps @@ -60,12 +60,6 @@ create or replace type ut_test under ut_suite_item ( a_line_no integer, a_expected_error_codes ut_integer_list := null ) return self as result, overriding member procedure mark_as_skipped(self in out nocopy ut_test), - overriding member procedure add_item( - self in out nocopy ut_test, - a_item ut_suite_item, - a_expected_level integer := 1, - a_current_level integer :=1 - ), overriding member function do_execute(self in out nocopy ut_test) return boolean, overriding member procedure calc_execution_result(self in out nocopy ut_test), overriding member procedure mark_as_errored(self in out nocopy ut_test, a_error_stack_trace varchar2), diff --git a/source/core/ut_metadata.pkb b/source/core/ut_metadata.pkb index d500bff61..92afa706e 100644 --- a/source/core/ut_metadata.pkb +++ b/source/core/ut_metadata.pkb @@ -22,12 +22,6 @@ create or replace package body ut_metadata as ------------------------------ --public definitions - procedure do_resolve(a_owner in out nocopy varchar2, a_object in out nocopy varchar2) is - l_procedure_name varchar2(200); - begin - do_resolve(a_owner, a_object, l_procedure_name ); - end do_resolve; - procedure do_resolve(a_owner in out nocopy varchar2, a_object in out nocopy varchar2, a_procedure_name in out nocopy varchar2) is l_name varchar2(200); l_context integer := 1; --plsql @@ -83,9 +77,6 @@ create or replace package body ut_metadata as -- expect both package and body to be valid return l_cnt = 1; - exception - when others then - return false; end; function procedure_exists(a_owner_name varchar2, a_package_name in varchar2, a_procedure_name in varchar2) @@ -110,9 +101,6 @@ create or replace package body ut_metadata as --expect one method only for the package with that name. return l_cnt = 1; - exception - when others then - return false; end; function get_source_definition_line(a_owner varchar2, a_object_name varchar2, a_line_no integer) return varchar2 is @@ -168,14 +156,8 @@ create or replace package body ut_metadata as function user_has_execute_any_proc return boolean is l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_dummy varchar2(250); begin - execute immediate 'select '||l_ut_owner||'.ut_utils.ut_owner from dual' - into l_dummy; - return true; - exception - when others then - return false; + return is_object_visible(l_ut_owner||'.ut_utils'); end; function is_object_visible(a_object_name varchar2) return boolean is diff --git a/source/core/ut_metadata.pks b/source/core/ut_metadata.pks index 16172a1f1..9a0ac2b00 100644 --- a/source/core/ut_metadata.pks +++ b/source/core/ut_metadata.pks @@ -39,12 +39,6 @@ create or replace package ut_metadata authid current_user as function procedure_exists(a_owner_name varchar2, a_package_name in varchar2, a_procedure_name in varchar2) return boolean; - /** - * Resolves [owner.]object using dbms_utility.name_resolve and returns resolved parts - * - */ - procedure do_resolve(a_owner in out nocopy varchar2, a_object in out nocopy varchar2); - /** * Resolves [owner.]object[.procedure] using dbms_utility.name_resolve and returns resolved parts * diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index fe76b2ed7..19862992d 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -465,7 +465,7 @@ create or replace package body ut_suite_manager is a_owner_name varchar2 ) return boolean is begin - return sys_context( 'userenv', 'current_schema' ) = a_owner_name or ut_metadata.is_object_visible( ut_utils.ut_owner ||'.ut_utils' ); + return sys_context( 'userenv', 'current_schema' ) = a_owner_name or ut_metadata.user_has_execute_any_proc(); end; procedure build_and_cache_suites( @@ -582,7 +582,7 @@ create or replace package body ut_suite_manager is l_need_all_objects_scan boolean := true; begin -- if current user is the onwer or current user has execute any procedure privilege - if ut_metadata.is_object_visible('ut3.ut_utils') + if ut_metadata.user_has_execute_any_proc() or (a_schema_names is not null and a_schema_names.count = 1 and sys_context('userenv','current_schema') = a_schema_names(1)) then diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 928da6ca1..dbe57f866 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -55,18 +55,6 @@ create or replace package body ut_utils is return '"'|| utl_raw.cast_to_varchar2(utl_encode.base64_encode(sys_guid()))||'"'; end; - /* - Procedure: validate_rollback_type - - Validates passed value against supported rollback types - */ - procedure validate_rollback_type(a_rollback_type number) is - begin - if a_rollback_type not in (gc_rollback_auto, gc_rollback_manual) then - raise_application_error(-20200,'Rollback type is not supported'); - end if; - end validate_rollback_type; - procedure debug_log(a_message varchar2) is begin $if $$ut_trace $then @@ -604,15 +592,13 @@ create or replace package body ut_utils is end; function xmlgen_escaped_string(a_string in varchar2) return varchar2 is - l_result varchar2(4000); + l_result varchar2(4000) := a_string; l_sql varchar2(32767) := q'!select q'[!'||a_string||q'!]' as "!'||a_string||'" from dual'; begin if a_string is not null then select extract(dbms_xmlgen.getxmltype(l_sql),'/*/*/*').getRootElement() into l_result from dual; - else - l_result := a_string; end if; return l_result; end; diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 2a892c1e9..40b084d30 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -183,12 +183,6 @@ create or replace package ut_utils authid definer is function int_to_boolean(a_value integer) return boolean; - /** - * Validates passed value against supported rollback types - */ - procedure validate_rollback_type(a_rollback_type number); - - /** * * Splits a given string into table of string by delimiter. diff --git a/source/reporters/ut_ansiconsole_helper.pkb b/source/reporters/ut_ansiconsole_helper.pkb index ceb0cf53f..d9c0617e0 100644 --- a/source/reporters/ut_ansiconsole_helper.pkb +++ b/source/reporters/ut_ansiconsole_helper.pkb @@ -53,16 +53,6 @@ create or replace package body ut_ansiconsole_helper as return add_color(a_text, gc_yellow); end; - function blue(a_text varchar2) return varchar2 is - begin - return add_color(a_text, gc_blue); - end; - - function magenta(a_text varchar2) return varchar2 is - begin - return add_color(a_text, gc_magenta); - end; - function cyan(a_text varchar2) return varchar2 is begin return add_color(a_text, gc_cyan); diff --git a/source/reporters/ut_ansiconsole_helper.pks b/source/reporters/ut_ansiconsole_helper.pks index 29d746c7b..f34ff12bd 100644 --- a/source/reporters/ut_ansiconsole_helper.pks +++ b/source/reporters/ut_ansiconsole_helper.pks @@ -23,10 +23,6 @@ create or replace package ut_ansiconsole_helper as function yellow(a_text varchar2) return varchar2; - function blue(a_text varchar2) return varchar2; - - function magenta(a_text varchar2) return varchar2; - function cyan(a_text varchar2) return varchar2; end; / diff --git a/source/reporters/ut_teamcity_reporter.tpb b/source/reporters/ut_teamcity_reporter.tpb index a8a7ad45b..d01e85153 100644 --- a/source/reporters/ut_teamcity_reporter.tpb +++ b/source/reporters/ut_teamcity_reporter.tpb @@ -60,6 +60,25 @@ create or replace type body ut_teamcity_reporter is l_results ut_varchar2_rows := ut_varchar2_rows(); l_test_full_name varchar2(4000); l_std_err_msg varchar2(32767); + function add_error_message( a_message varchar2, a_message_name varchar2) return varchar2 is + begin + return + case + when a_message is not null + then a_message_name || chr(10) || a_message || chr(10) + end; + end; + function add_error_messages(a_executables ut_executables, a_message_name varchar2) return varchar2 is + l_message varchar2(32767); + l_idx binary_integer; + begin + l_idx := a_executables.first; + while l_idx is not null loop + l_message := l_message || add_error_message(a_executables(l_idx).error_backtrace, a_message_name); + l_idx := a_executables.next(l_idx); + end loop; + return l_message; + end; begin l_test_full_name := lower(a_test.item.owner_name) || '.' || lower(a_test.item.object_name) || '.' || lower(a_test.item.procedure_name); @@ -71,33 +90,11 @@ create or replace type body ut_teamcity_reporter is ut_utils.append_to_list( l_results, a_test.get_serveroutputs()); if a_test.result = ut_utils.gc_error then - for i in 1 .. a_test.before_each_list.count loop - if a_test.before_each_list(i).error_backtrace is not null then - l_std_err_msg := l_std_err_msg || 'Before each exception:' || chr(10) || a_test.before_each_list(i).error_backtrace || chr(10); - end if; - end loop; - - for i in 1 .. a_test.before_test_list.count loop - if a_test.before_test_list(i).error_backtrace is not null then - l_std_err_msg := l_std_err_msg || 'Before test exception:' || chr(10) || a_test.before_test_list(i).error_backtrace || chr(10); - end if; - end loop; - - if a_test.item.error_backtrace is not null then - l_std_err_msg := l_std_err_msg || 'Test exception:' || chr(10) || a_test.item.error_backtrace || chr(10); - end if; - - for i in 1 .. a_test.after_test_list.count loop - if a_test.after_test_list(i).error_backtrace is not null then - l_std_err_msg := l_std_err_msg || 'After test exception:' || chr(10) || a_test.after_test_list(i).error_backtrace || chr(10); - end if; - end loop; - - for i in 1 .. a_test.after_each_list.count loop - if a_test.after_each_list(i).error_backtrace is not null then - l_std_err_msg := l_std_err_msg || 'After each exception:' || chr(10) || a_test.after_each_list(i).error_backtrace || chr(10); - end if; - end loop; + l_std_err_msg := l_std_err_msg || add_error_messages(a_test.before_each_list, 'Before each exception:'); + l_std_err_msg := l_std_err_msg || add_error_messages(a_test.before_test_list, 'Before test exception:'); + l_std_err_msg := l_std_err_msg || add_error_message(a_test.item.error_backtrace, 'Test exception:'); + l_std_err_msg := l_std_err_msg || add_error_messages(a_test.after_test_list, 'After test exception:'); + l_std_err_msg := l_std_err_msg || add_error_messages(a_test.after_each_list, 'After each exception:'); ut_utils.append_to_list( l_results, diff --git a/test/api/test_ut_run.pkb b/test/api/test_ut_run.pkb index 9709058d4..ecf123d5e 100644 --- a/test/api/test_ut_run.pkb +++ b/test/api/test_ut_run.pkb @@ -355,6 +355,94 @@ create or replace package body test_ut_run is ut.expect( l_results ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); end; + procedure create_suite_with_commit is + pragma autonomous_transaction; + begin + execute immediate 'create or replace package test_commit_warning is + --%suite + --%suitepath(ut.run.transaction) + + --%test + procedure does_commit; + end;'; + execute immediate 'create or replace package body test_commit_warning is + procedure does_commit is + begin + ut3.ut.expect(1).to_equal(1); + commit; + end; + end;'; + end; + + procedure drop_suite_with_commit is + pragma autonomous_transaction; + begin + execute immediate 'drop package test_commit_warning'; + end; + + procedure run_proc_warn_on_commit is + l_results clob; + begin + ut3.ut.run('test_commit_warning'); + l_results := get_dbms_output_as_clob(); + ut.expect(l_results).to_be_like( + '%Unable to perform automatic rollback after test%'|| + 'An implicit or explicit commit/rollback occurred in procedures:%' || + 'does_commit%' || + 'Use the "--%rollback(manual)" annotation or remove commit/rollback/ddl statements that are causing the issue.%' + ); + end; + + procedure create_failing_beforeall_suite is + pragma autonomous_transaction; + begin + execute immediate 'create or replace package parent_suite is + --%suite + --%suitepath(ut.run.failing_setup) + + --%beforeall + procedure failing_setup; + end;'; + execute immediate 'create or replace package body parent_suite is + procedure failing_setup is + begin + raise no_data_found; + end; + end;'; + execute immediate 'create or replace package child_suite is + --%suite + --%suitepath(ut.run.failing_setup.parent_suite.some_sub_suite) + + --%test + procedure does_stuff; + end;'; + execute immediate 'create or replace package body child_suite is + procedure does_stuff is + begin + ut3.ut.expect(1).to_equal(1); + end; + end;'; + end; + + procedure drop_failing_beforeall_suite is + pragma autonomous_transaction; + begin + execute immediate 'drop package parent_suite'; + execute immediate 'drop package child_suite'; + end; + + procedure run_proc_fail_child_suites is + l_results clob; + begin + ut3.ut.run('child_suite'); + l_results := get_dbms_output_as_clob(); + ut.expect(l_results).to_be_like( + '%1) does_stuff%' || + 'ORA-01403: no data found%' || + 'ORA-06512: at "UT3_TESTER.PARENT_SUITE%' + ); + end; + procedure run_func_no_params is l_results ut3.ut_varchar2_list; begin diff --git a/test/api/test_ut_run.pks b/test/api/test_ut_run.pks index 927abf6e2..81eb801a3 100644 --- a/test/api/test_ut_run.pks +++ b/test/api/test_ut_run.pks @@ -41,6 +41,21 @@ create or replace package test_ut_run is --%test(Runs all tests in current schema with empty path list given) procedure run_proc_empty_path_list; + procedure create_suite_with_commit; + procedure drop_suite_with_commit; + --%test(Reports a warning if transaction was invalidated by test with automatic rollback) + --%beforetest(create_suite_with_commit) + --%aftertest(drop_suite_with_commit) + procedure run_proc_warn_on_commit; + + + procedure create_failing_beforeall_suite; + procedure drop_failing_beforeall_suite; + --%test(Marks child suite as failed when parent's suite beforeall fails) + --%beforetest(create_failing_beforeall_suite) + --%aftertest(drop_failing_beforeall_suite) + procedure run_proc_fail_child_suites; + --%endcontext diff --git a/test/core/test_ut_suite.pkb b/test/core/test_ut_suite.pkb index 9955aa048..557d3cb7b 100644 --- a/test/core/test_ut_suite.pkb +++ b/test/core/test_ut_suite.pkb @@ -14,8 +14,10 @@ create or replace package body test_ut_suite is l_suite.disabled_flag := ut3.ut_utils.boolean_to_int(true); l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'set_g_number_0', ut3.ut_utils.gc_before_all)); l_suite.after_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'add_1_to_g_number', ut3.ut_utils.gc_before_all)); - l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1)); - l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1)); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); --Act l_suite.do_execute(); --Assert @@ -35,7 +37,8 @@ create or replace package body test_ut_suite is l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); l_suite.path := 'ut_example_tests'; l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'failing_procedure', ut3.ut_utils.gc_before_all)); - l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'set_g_number_0', a_line_no=> 1)); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'set_g_number_0', a_line_no=> 1); --Act l_suite.do_execute(); --Assert @@ -56,8 +59,10 @@ create or replace package body test_ut_suite is l_suite.path := 'ut_example_tests'; l_suite.after_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'failing_procedure', ut3.ut_utils.gc_after_all)); - l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'set_g_number_0', a_line_no=> 1)); - l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1)); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'set_g_number_0', a_line_no=> 1); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); --Act l_suite.do_execute(); --Assert @@ -75,7 +80,8 @@ create or replace package body test_ut_suite is begin l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_WITHOUT_BODY', a_line_no=> 1); l_suite.path := 'UT_WITHOUT_BODY'; - l_suite.add_item(ut3.ut_test(a_object_name => 'ut_without_body',a_name => 'test1', a_line_no=> 1)); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_name => 'ut_without_body',a_name => 'test1', a_line_no=> 1); --Act l_suite.do_execute(); --Assert @@ -87,7 +93,8 @@ create or replace package body test_ut_suite is begin l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_WITH_INVALID_BODY', a_line_no=> 1); l_suite.path := 'UT_WITH_INVALID_BODY'; - l_suite.add_item(ut3.ut_test(a_object_name => 'ut_with_invalid_body',a_name => 'test1', a_line_no=> 1)); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_name => 'ut_with_invalid_body',a_name => 'test1', a_line_no=> 1); --Act l_suite.do_execute(); --Assert @@ -102,7 +109,8 @@ create or replace package body test_ut_suite is l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_TRANSACTION_CONTROL', a_line_no=> 1); l_suite.path := 'ut_transaction_control'; l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_TRANSACTION_CONTROL', 'setup', ut3.ut_utils.gc_before_all)); - l_suite.add_item(ut3.ut_test(a_object_owner => USER, a_object_name => 'ut_transaction_control',a_name => a_procedure_name, a_line_no=> 1)); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => USER, a_object_name => 'ut_transaction_control',a_name => a_procedure_name, a_line_no=> 1); l_suite.set_rollback_type(a_rollback_type); --Act diff --git a/test/core/test_ut_test.pkb b/test/core/test_ut_test.pkb index 857ef5e99..5b401463c 100644 --- a/test/core/test_ut_test.pkb +++ b/test/core/test_ut_test.pkb @@ -14,8 +14,10 @@ create or replace package body test_ut_test is l_suite.path := 'ut_example_tests'; l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'set_g_number_0', ut3.ut_utils.gc_before_all)); - l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1)); - l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 2)); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 2); l_suite.items(l_suite.items.last).disabled_flag := ut3.ut_utils.boolean_to_int(true); --Act l_suite.do_execute(); @@ -41,8 +43,10 @@ create or replace package body test_ut_test is l_test := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); l_test.before_test_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'add_1_to_g_number', ut3.ut_utils.gc_before_test)); l_test.after_test_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'failing_procedure', ut3.ut_utils.gc_after_test)); - l_suite.add_item(l_test); - l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1)); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := l_test; + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); --Act l_suite.do_execute(); --Assert @@ -65,8 +69,10 @@ create or replace package body test_ut_test is l_test := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); l_test.before_each_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'add_1_to_g_number', ut3.ut_utils.gc_before_each)); l_test.after_each_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'failing_procedure', ut3.ut_utils.gc_after_each)); - l_suite.add_item(l_test); - l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1)); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := l_test; + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); --Act l_suite.do_execute(); --Assert @@ -89,8 +95,10 @@ create or replace package body test_ut_test is l_test := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); l_test.before_test_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'failing_procedure', ut3.ut_utils.gc_before_test)); l_test.after_test_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'add_1_to_g_number', ut3.ut_utils.gc_after_test)); - l_suite.add_item(l_test); - l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1)); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := l_test; + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); --Act l_suite.do_execute(); --Assert @@ -113,8 +121,10 @@ create or replace package body test_ut_test is l_test := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); l_test.before_each_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'failing_procedure', ut3.ut_utils.gc_before_each)); l_test.after_each_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'add_1_to_g_number', ut3.ut_utils.gc_after_each)); - l_suite.add_item(l_test); - l_suite.add_item(ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1)); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := l_test; + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); --Act l_suite.do_execute(); --Assert From 44d61d921406077a58080c3538448217d07b5d7d Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 18 Nov 2018 15:35:50 +0000 Subject: [PATCH 0111/1096] Recovering exception handlers as they are needed for handling invalid object names. --- source/core/ut_metadata.pkb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/source/core/ut_metadata.pkb b/source/core/ut_metadata.pkb index 92afa706e..c905ebefe 100644 --- a/source/core/ut_metadata.pkb +++ b/source/core/ut_metadata.pkb @@ -77,6 +77,9 @@ create or replace package body ut_metadata as -- expect both package and body to be valid return l_cnt = 1; + exception + when others then + return false; end; function procedure_exists(a_owner_name varchar2, a_package_name in varchar2, a_procedure_name in varchar2) @@ -101,6 +104,9 @@ create or replace package body ut_metadata as --expect one method only for the package with that name. return l_cnt = 1; + exception + when others then + return false; end; function get_source_definition_line(a_owner varchar2, a_object_name varchar2, a_line_no integer) return varchar2 is From 360a8895645d9065cb48ebf3d8af6fb175c4eec9 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 18 Nov 2018 18:26:05 +0000 Subject: [PATCH 0112/1096] Moved some of old tests into new tests. Disabled coverage gathering on old tests. --- old_tests/RunAll.sql | 633 +++++++++--------- ...e_manager.CacheInvalidaesOnPackageDrop.sql | 50 -- .../ut_suite_manager.emptySuitePath.sql | 41 -- .../ut_test/ut_test.AfterEachExecuted.sql | 20 - .../ut_test.AfterEachProcedureNameInvalid.sql | 21 - .../ut_test.AfterEachProcedureNameNull.sql | 21 - .../ut_test.ApplicationInfoOnExecution.sql | 149 ----- .../ut_test/ut_test.BeforeEachExecuted.sql | 21 - ...ut_test.BeforeEachProcedureNameInvalid.sql | 20 - .../ut_test.BeforeEachProcedureNameNull.sql | 22 - ...est.IgnoreTollbackToSavepointException.sql | 17 - .../ut_test/ut_test.OwnerNameInvalid.sql | 21 - old_tests/ut_test/ut_test.OwnerNameNull.sql | 18 - .../ut_test/ut_test.PackageInInvalidState.sql | 27 - .../ut_test/ut_test.PackageNameInvalid.sql | 16 - old_tests/ut_test/ut_test.PackageNameNull.sql | 16 - .../ut_test/ut_test.ProcedureNameInvalid.sql | 16 - .../ut_test/ut_test.ProcedureNameNull.sql | 16 - .../ut_test.ReportWarningOnRollbackFailed.sql | 58 -- .../ut_test.SetupExecutedBeforeTest.sql | 21 - .../ut_test.SetupProcedureNameInvalid.sql | 20 - .../ut_test.SetupProcedureNameNull.sql | 22 - .../ut_test.TeardownExecutedAfterTest.sql | 20 - .../ut_test.TeardownProcedureNameInvalid.sql | 20 - .../ut_test.TeardownProcedureNameNull.sql | 21 - .../ut_test/ut_test.TestOutputGathering.sql | 103 --- .../ut_test.TestOutputGatheringWhenEmpty.sql | 55 -- sonar-project.properties | 2 +- test/core/test_ut_test.pkb | 556 +++++++++++++++ test/core/test_ut_test.pks | 66 ++ test/helpers/ut_example_tests.pkb | 4 + test/helpers/ut_example_tests.pks | 12 +- 32 files changed, 936 insertions(+), 1189 deletions(-) delete mode 100644 old_tests/ut_suite_manager/ut_suite_manager.CacheInvalidaesOnPackageDrop.sql delete mode 100644 old_tests/ut_suite_manager/ut_suite_manager.emptySuitePath.sql delete mode 100644 old_tests/ut_test/ut_test.AfterEachExecuted.sql delete mode 100644 old_tests/ut_test/ut_test.AfterEachProcedureNameInvalid.sql delete mode 100644 old_tests/ut_test/ut_test.AfterEachProcedureNameNull.sql delete mode 100644 old_tests/ut_test/ut_test.ApplicationInfoOnExecution.sql delete mode 100644 old_tests/ut_test/ut_test.BeforeEachExecuted.sql delete mode 100644 old_tests/ut_test/ut_test.BeforeEachProcedureNameInvalid.sql delete mode 100644 old_tests/ut_test/ut_test.BeforeEachProcedureNameNull.sql delete mode 100644 old_tests/ut_test/ut_test.IgnoreTollbackToSavepointException.sql delete mode 100644 old_tests/ut_test/ut_test.OwnerNameInvalid.sql delete mode 100644 old_tests/ut_test/ut_test.OwnerNameNull.sql delete mode 100644 old_tests/ut_test/ut_test.PackageInInvalidState.sql delete mode 100644 old_tests/ut_test/ut_test.PackageNameInvalid.sql delete mode 100644 old_tests/ut_test/ut_test.PackageNameNull.sql delete mode 100644 old_tests/ut_test/ut_test.ProcedureNameInvalid.sql delete mode 100644 old_tests/ut_test/ut_test.ProcedureNameNull.sql delete mode 100644 old_tests/ut_test/ut_test.ReportWarningOnRollbackFailed.sql delete mode 100644 old_tests/ut_test/ut_test.SetupExecutedBeforeTest.sql delete mode 100644 old_tests/ut_test/ut_test.SetupProcedureNameInvalid.sql delete mode 100644 old_tests/ut_test/ut_test.SetupProcedureNameNull.sql delete mode 100644 old_tests/ut_test/ut_test.TeardownExecutedAfterTest.sql delete mode 100644 old_tests/ut_test/ut_test.TeardownProcedureNameInvalid.sql delete mode 100644 old_tests/ut_test/ut_test.TeardownProcedureNameNull.sql delete mode 100644 old_tests/ut_test/ut_test.TestOutputGathering.sql delete mode 100644 old_tests/ut_test/ut_test.TestOutputGatheringWhenEmpty.sql diff --git a/old_tests/RunAll.sql b/old_tests/RunAll.sql index f785aabc1..282a01ff7 100644 --- a/old_tests/RunAll.sql +++ b/old_tests/RunAll.sql @@ -50,41 +50,14 @@ exec ut_coverage.set_develop_mode(true); @@lib/RunTest.sql ut_reporters/ut_html_reporter.UserOverrideSchemaCoverage.sql @@lib/RunTest.sql ut_suite_manager/ut_suite_manager.AllowsDescriptionsWithComma.sql -@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.emptySuitePath.sql @@lib/RunTest.sql ut_suite_manager/ut_suite_manager.get_schema_ut_packages.IncludesPackagesWithSutePath.sql @@lib/RunTest.sql ut_suite_manager/ut_suite_manager.IncludesInvalidPackageBodiesInTheRun.sql -@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.CacheInvalidaesOnPackageDrop.sql @@lib/RunTest.sql ut_suite_manager/ut_suite_manager.PackageWithDollarSign.sql @@lib/RunTest.sql ut_suite_manager/ut_suite_manager.PackageWithHash.sql @@lib/RunTest.sql ut_suite_manager/ut_suite_manager.TestWithDollarSign.sql @@lib/RunTest.sql ut_suite_manager/ut_suite_manager.TestWithHashSign.sql -@@lib/RunTest.sql ut_test/ut_test.OwnerNameInvalid.sql -@@lib/RunTest.sql ut_test/ut_test.OwnerNameNull.sql -@@lib/RunTest.sql ut_test/ut_test.PackageInInvalidState.sql -@@lib/RunTest.sql ut_test/ut_test.PackageNameInvalid.sql -@@lib/RunTest.sql ut_test/ut_test.PackageNameNull.sql -@@lib/RunTest.sql ut_test/ut_test.ProcedureNameInvalid.sql -@@lib/RunTest.sql ut_test/ut_test.ProcedureNameNull.sql -@@lib/RunTest.sql ut_test/ut_test.SetupExecutedBeforeTest.sql -@@lib/RunTest.sql ut_test/ut_test.SetupProcedureNameInvalid.sql -@@lib/RunTest.sql ut_test/ut_test.SetupProcedureNameNull.sql -@@lib/RunTest.sql ut_test/ut_test.TeardownExecutedAfterTest.sql -@@lib/RunTest.sql ut_test/ut_test.TeardownProcedureNameInvalid.sql -@@lib/RunTest.sql ut_test/ut_test.TeardownProcedureNameNull.sql -@@lib/RunTest.sql ut_test/ut_test.IgnoreTollbackToSavepointException.sql -@@lib/RunTest.sql ut_test/ut_test.AfterEachExecuted.sql -@@lib/RunTest.sql ut_test/ut_test.AfterEachProcedureNameInvalid.sql -@@lib/RunTest.sql ut_test/ut_test.AfterEachProcedureNameNull.sql -@@lib/RunTest.sql ut_test/ut_test.BeforeEachExecuted.sql -@@lib/RunTest.sql ut_test/ut_test.BeforeEachProcedureNameInvalid.sql -@@lib/RunTest.sql ut_test/ut_test.BeforeEachProcedureNameNull.sql -@@lib/RunTest.sql ut_test/ut_test.TestOutputGathering.sql -@@lib/RunTest.sql ut_test/ut_test.TestOutputGatheringWhenEmpty.sql -@@lib/RunTest.sql ut_test/ut_test.ReportWarningOnRollbackFailed.sql -@@lib/RunTest.sql ut_test/ut_test.ApplicationInfoOnExecution.sql - @@ut_utils/ut_utils.clob_to_table.sql @@ut_utils/ut_utils.table_to_clob.sql @@lib/RunTest.sql ut_utils/ut_utils.append_to_clob.worksWithMultiByteChars.sql @@ -110,309 +83,309 @@ drop type utplsql_test_reporter; drop package test_reporters; drop package ut3$user#.html_coverage_test; -set timing on -prompt Generating coverage data to reporter outputs - -var html_reporter_id varchar2(32); -var sonar_reporter_id varchar2(32); -var coveralls_reporter_id varchar2(32); -declare - l_reporter ut_reporter_base; - l_project_file_list ut_varchar2_list; - l_test_run ut_run; -begin - l_project_file_list := ut_varchar2_list( - 'source/api', - 'source/core', - 'source/create_synonyms_and_grants_for_public.sql', - 'source/create_synonyms_and_grants_for_user.sql', - 'source/create_utplsql_owner.sql', - 'source/expectations', - 'source/install.log', - 'source/install.sql', - 'source/install_headless.sql', - 'source/license.txt', - 'source/readme.md', - 'source/reporters', - 'source/uninstall.log', - 'source/uninstall.sql', - 'source/api/be_between.syn', - 'source/api/be_empty.syn', - 'source/api/be_false.syn', - 'source/api/be_greater_or_equal.syn', - 'source/api/be_greater_than.syn', - 'source/api/be_less_or_equal.syn', - 'source/api/be_less_than.syn', - 'source/api/be_like.syn', - 'source/api/be_not_null.syn', - 'source/api/be_null.syn', - 'source/api/be_true.syn', - 'source/api/equal.syn', - 'source/api/match.syn', - 'source/api/ut.pkb', - 'source/api/ut.pks', - 'source/api/ut_runner.pkb', - 'source/api/ut_runner.pks', - 'source/core/coverage', - 'source/core/output_buffers', - 'source/core/types', - 'source/core/annotations/ut_annotation_manager.pkb', - 'source/core/annotations/ut_annotation_manager.pks', - 'source/core/annotations/ut_annotation_parser.pkb', - 'source/core/annotations/ut_annotation_parser.pks', - 'source/core/annotations/ut_annotation_cache_manager.pkb', - 'source/core/annotations/ut_annotation_cache_manager.pks', - 'source/core/ut_expectation_processor.pkb', - 'source/core/ut_expectation_processor.pks', - 'source/core/ut_file_mapper.pkb', - 'source/core/ut_file_mapper.pks', - 'source/core/ut_metadata.pkb', - 'source/core/ut_metadata.pks', - 'source/core/ut_suite_manager.pkb', - 'source/core/ut_suite_manager.pks', - 'source/core/ut_utils.pkb', - 'source/core/ut_utils.pks', - 'source/core/coverage/proftab.sql', - 'source/core/coverage/ut_coverage.pkb', - 'source/core/coverage/ut_coverage.pks', - 'source/core/coverage/ut_coverage_helper.pkb', - 'source/core/coverage/ut_coverage_helper.pks', - 'source/core/coverage/ut_coverage_sources_tmp.sql', - 'source/core/coverage/ut_coverage_reporter_base.tpb', - 'source/core/coverage/ut_coverage_reporter_base.tps', - 'source/core/output_buffers/ut_message_id_seq.sql', - 'source/core/output_buffers/ut_output_buffer_base.tps', - 'source/core/output_buffers/ut_output_buffer_info_tmp.sql', - 'source/core/output_buffers/ut_output_buffer_tmp.sql', - 'source/core/output_buffers/ut_output_table_buffer.tpb', - 'source/core/output_buffers/ut_output_table_buffer.tps', - 'source/core/types/ut_console_reporter_base.tpb', - 'source/core/types/ut_console_reporter_base.tps', - 'source/core/types/ut_coverage_options.tps', - 'source/core/types/ut_event_listener.tpb', - 'source/core/types/ut_event_listener.tps', - 'source/core/types/ut_event_listener_base.tps', - 'source/core/types/ut_executable.tpb', - 'source/core/types/ut_executable.tps', - 'source/core/types/ut_expectation_result.tpb', - 'source/core/types/ut_expectation_result.tps', - 'source/core/types/ut_expectation_results.tps', - 'source/core/types/ut_file_mapping.tpb', - 'source/core/types/ut_file_mapping.tps', - 'source/core/types/ut_file_mappings.tps', - 'source/core/types/ut_key_value_pair.tps', - 'source/core/types/ut_key_value_pairs.tps', - 'source/core/types/ut_logical_suite.tpb', - 'source/core/types/ut_logical_suite.tps', - 'source/core/types/ut_object_name.tpb', - 'source/core/types/ut_object_name.tps', - 'source/core/types/ut_object_names.tps', - 'source/core/types/ut_output_reporter_base.tpb', - 'source/core/types/ut_output_reporter_base.tps', - 'source/core/types/ut_reporters.tps', - 'source/core/types/ut_reporter_base.tpb', - 'source/core/types/ut_reporter_base.tps', - 'source/core/types/ut_results_counter.tpb', - 'source/core/types/ut_results_counter.tps', - 'source/core/types/ut_run.tpb', - 'source/core/types/ut_run.tps', - 'source/core/types/ut_suite.tpb', - 'source/core/types/ut_suite.tps', - 'source/core/types/ut_suite_item.tpb', - 'source/core/types/ut_suite_item.tps', - 'source/core/types/ut_suite_items.tps', - 'source/core/types/ut_test.tpb', - 'source/core/types/ut_test.tps', - 'source/core/types/ut_varchar2_list.tps', - 'source/core/types/ut_varchar2_rows.tps', - 'source/expectations/data_values', - 'source/expectations/matchers', - 'source/expectations/ut_expectation.tpb', - 'source/expectations/ut_expectation.tps', - 'source/expectations/ut_expectation_anydata.tpb', - 'source/expectations/ut_expectation_anydata.tps', - 'source/expectations/ut_expectation_blob.tpb', - 'source/expectations/ut_expectation_blob.tps', - 'source/expectations/ut_expectation_boolean.tpb', - 'source/expectations/ut_expectation_boolean.tps', - 'source/expectations/ut_expectation_clob.tpb', - 'source/expectations/ut_expectation_clob.tps', - 'source/expectations/ut_expectation_date.tpb', - 'source/expectations/ut_expectation_date.tps', - 'source/expectations/ut_expectation_dsinterval.tpb', - 'source/expectations/ut_expectation_dsinterval.tps', - 'source/expectations/ut_expectation_number.tpb', - 'source/expectations/ut_expectation_number.tps', - 'source/expectations/ut_expectation_refcursor.tpb', - 'source/expectations/ut_expectation_refcursor.tps', - 'source/expectations/ut_expectation_timestamp.tpb', - 'source/expectations/ut_expectation_timestamp.tps', - 'source/expectations/ut_expectation_timestamp_ltz.tpb', - 'source/expectations/ut_expectation_timestamp_ltz.tps', - 'source/expectations/ut_expectation_timestamp_tz.tpb', - 'source/expectations/ut_expectation_timestamp_tz.tps', - 'source/expectations/ut_expectation_varchar2.tpb', - 'source/expectations/ut_expectation_varchar2.tps', - 'source/expectations/ut_expectation_yminterval.tpb', - 'source/expectations/ut_expectation_yminterval.tps', - 'source/expectations/data_values/ut_cursor_data.sql', - 'source/expectations/data_values/ut_data_value.tpb', - 'source/expectations/data_values/ut_data_value.tps', - 'source/expectations/data_values/ut_data_value_anydata.tpb', - 'source/expectations/data_values/ut_data_value_anydata.tps', - 'source/expectations/data_values/ut_data_value_blob.tpb', - 'source/expectations/data_values/ut_data_value_blob.tps', - 'source/expectations/data_values/ut_data_value_boolean.tpb', - 'source/expectations/data_values/ut_data_value_boolean.tps', - 'source/expectations/data_values/ut_data_value_clob.tpb', - 'source/expectations/data_values/ut_data_value_clob.tps', - 'source/expectations/data_values/ut_data_value_collection.tpb', - 'source/expectations/data_values/ut_data_value_collection.tps', - 'source/expectations/data_values/ut_data_value_date.tpb', - 'source/expectations/data_values/ut_data_value_date.tps', - 'source/expectations/data_values/ut_data_value_dsinterval.tpb', - 'source/expectations/data_values/ut_data_value_dsinterval.tps', - 'source/expectations/data_values/ut_data_value_number.tpb', - 'source/expectations/data_values/ut_data_value_number.tps', - 'source/expectations/data_values/ut_data_value_object.tpb', - 'source/expectations/data_values/ut_data_value_object.tps', - 'source/expectations/data_values/ut_data_value_refcursor.tpb', - 'source/expectations/data_values/ut_data_value_refcursor.tps', - 'source/expectations/data_values/ut_data_value_timestamp.tpb', - 'source/expectations/data_values/ut_data_value_timestamp.tps', - 'source/expectations/data_values/ut_data_value_timestamp_ltz.tpb', - 'source/expectations/data_values/ut_data_value_timestamp_ltz.tps', - 'source/expectations/data_values/ut_data_value_timestamp_tz.tpb', - 'source/expectations/data_values/ut_data_value_timestamp_tz.tps', - 'source/expectations/data_values/ut_data_value_varchar2.tpb', - 'source/expectations/data_values/ut_data_value_varchar2.tps', - 'source/expectations/data_values/ut_data_value_yminterval.tpb', - 'source/expectations/data_values/ut_data_value_yminterval.tps', - 'source/expectations/matchers/ut_be_between.tpb', - 'source/expectations/matchers/ut_be_between.tps', - 'source/expectations/matchers/ut_be_empty.tpb', - 'source/expectations/matchers/ut_be_empty.tps', - 'source/expectations/matchers/ut_be_false.tpb', - 'source/expectations/matchers/ut_be_false.tps', - 'source/expectations/matchers/ut_be_greater_or_equal.tpb', - 'source/expectations/matchers/ut_be_greater_or_equal.tps', - 'source/expectations/matchers/ut_be_greater_than.tpb', - 'source/expectations/matchers/ut_be_greater_than.tps', - 'source/expectations/matchers/ut_be_less_or_equal.tpb', - 'source/expectations/matchers/ut_be_less_or_equal.tps', - 'source/expectations/matchers/ut_be_less_than.tpb', - 'source/expectations/matchers/ut_be_less_than.tps', - 'source/expectations/matchers/ut_be_like.tpb', - 'source/expectations/matchers/ut_be_like.tps', - 'source/expectations/matchers/ut_be_not_null.tpb', - 'source/expectations/matchers/ut_be_not_null.tps', - 'source/expectations/matchers/ut_be_null.tpb', - 'source/expectations/matchers/ut_be_null.tps', - 'source/expectations/matchers/ut_be_true.tpb', - 'source/expectations/matchers/ut_be_true.tps', - 'source/expectations/matchers/ut_equal.tpb', - 'source/expectations/matchers/ut_equal.tps', - 'source/expectations/matchers/ut_match.tpb', - 'source/expectations/matchers/ut_match.tps', - 'source/expectations/matchers/ut_matcher.tpb', - 'source/expectations/matchers/ut_matcher.tps', - 'source/expectations/matchers/ut_comparison_matcher.tpb', - 'source/expectations/matchers/ut_comparison_matcher.tps', - 'source/reporters/ut_ansiconsole_helper.pkb', - 'source/reporters/ut_ansiconsole_helper.pks', - 'source/reporters/ut_coverage_html_reporter.tpb', - 'source/reporters/ut_coverage_html_reporter.tps', - 'source/reporters/ut_coverage_report_html_helper.pkb', - 'source/reporters/ut_coverage_report_html_helper.pks', - 'source/reporters/ut_coveralls_reporter.tpb', - 'source/reporters/ut_coveralls_reporter.tps', - 'source/reporters/ut_coverage_sonar_reporter.tpb', - 'source/reporters/ut_coverage_sonar_reporter.tps', - 'source/reporters/ut_documentation_reporter.tpb', - 'source/reporters/ut_documentation_reporter.tps', - 'source/reporters/ut_sonar_test_reporter.tpb', - 'source/reporters/ut_sonar_test_reporter.tps', - 'source/reporters/ut_teamcity_reporter.tpb', - 'source/reporters/ut_teamcity_reporter.tps', - 'source/reporters/ut_teamcity_reporter_helper.pkb', - 'source/reporters/ut_teamcity_reporter_helper.pks'); - - l_test_run := ut_run(a_items => ut_suite_items(), a_project_file_mappings => ut_file_mapper.build_file_mappings( user,l_project_file_list)); - - --run for the first time to gather coverage and timings on reporters too - l_reporter := ut_coverage_html_reporter(a_project_name => 'utPLSQL v3'); - l_reporter.after_calling_run(l_test_run); - l_reporter.on_finalize(l_test_run); - - l_reporter := ut_coverage_sonar_reporter(); - l_reporter.after_calling_run(l_test_run); - l_reporter.on_finalize(l_test_run); - - l_reporter := ut_coveralls_reporter(); - l_reporter.after_calling_run(l_test_run); - l_reporter.on_finalize(l_test_run); - - ut_coverage.set_develop_mode(false); - ut_coverage.coverage_stop(); - - --run for the second time to get the coverage report - l_reporter := ut_coverage_html_reporter(a_project_name => 'utPLSQL v3'); - l_reporter.after_calling_run(l_test_run); - l_reporter.on_finalize(l_test_run); - :html_reporter_id := l_reporter.get_reporter_id; - - l_reporter := ut_coverage_sonar_reporter(); - l_reporter.after_calling_run(l_test_run); - l_reporter.on_finalize(l_test_run); - :sonar_reporter_id := l_reporter.get_reporter_id; - - l_reporter := ut_coveralls_reporter(); - l_reporter.after_calling_run(l_test_run); - l_reporter.on_finalize(l_test_run); - :coveralls_reporter_id := l_reporter.get_reporter_id; -end; -/ - -set timing off -prompt Spooling outcomes to coverage.xml -set termout off -set feedback off -set arraysize 50 -spool coverage.xml -declare - l_reporter ut_output_reporter_base := ut_coverage_sonar_reporter(); -begin - l_reporter.set_reporter_id(:sonar_reporter_id); - l_reporter.lines_to_dbms_output(a_initial_timeout=>1, a_timeout_sec=>1); -end; -/ -spool off - -set termout on -prompt Spooling outcomes to coverage.json -set termout off -spool coverage.json -declare - l_reporter ut_output_reporter_base := ut_coveralls_reporter(); -begin - l_reporter.set_reporter_id(:coveralls_reporter_id); - l_reporter.lines_to_dbms_output(a_initial_timeout=>1, a_timeout_sec=>1); -end; -/ -spool off - -set termout on -prompt Spooling outcomes to coverage.html -set termout off -spool coverage.html -declare - l_reporter ut_output_reporter_base := ut_coverage_html_reporter(); -begin - l_reporter.set_reporter_id(:html_reporter_id); - l_reporter.lines_to_dbms_output(a_initial_timeout=>1, a_timeout_sec=>1); -end; -/ -spool off +-- set timing on +-- prompt Generating coverage data to reporter outputs +-- +-- var html_reporter_id varchar2(32); +-- var sonar_reporter_id varchar2(32); +-- var coveralls_reporter_id varchar2(32); +-- declare +-- l_reporter ut_reporter_base; +-- l_project_file_list ut_varchar2_list; +-- l_test_run ut_run; +-- begin +-- l_project_file_list := ut_varchar2_list( +-- 'source/api', +-- 'source/core', +-- 'source/create_synonyms_and_grants_for_public.sql', +-- 'source/create_synonyms_and_grants_for_user.sql', +-- 'source/create_utplsql_owner.sql', +-- 'source/expectations', +-- 'source/install.log', +-- 'source/install.sql', +-- 'source/install_headless.sql', +-- 'source/license.txt', +-- 'source/readme.md', +-- 'source/reporters', +-- 'source/uninstall.log', +-- 'source/uninstall.sql', +-- 'source/api/be_between.syn', +-- 'source/api/be_empty.syn', +-- 'source/api/be_false.syn', +-- 'source/api/be_greater_or_equal.syn', +-- 'source/api/be_greater_than.syn', +-- 'source/api/be_less_or_equal.syn', +-- 'source/api/be_less_than.syn', +-- 'source/api/be_like.syn', +-- 'source/api/be_not_null.syn', +-- 'source/api/be_null.syn', +-- 'source/api/be_true.syn', +-- 'source/api/equal.syn', +-- 'source/api/match.syn', +-- 'source/api/ut.pkb', +-- 'source/api/ut.pks', +-- 'source/api/ut_runner.pkb', +-- 'source/api/ut_runner.pks', +-- 'source/core/coverage', +-- 'source/core/output_buffers', +-- 'source/core/types', +-- 'source/core/annotations/ut_annotation_manager.pkb', +-- 'source/core/annotations/ut_annotation_manager.pks', +-- 'source/core/annotations/ut_annotation_parser.pkb', +-- 'source/core/annotations/ut_annotation_parser.pks', +-- 'source/core/annotations/ut_annotation_cache_manager.pkb', +-- 'source/core/annotations/ut_annotation_cache_manager.pks', +-- 'source/core/ut_expectation_processor.pkb', +-- 'source/core/ut_expectation_processor.pks', +-- 'source/core/ut_file_mapper.pkb', +-- 'source/core/ut_file_mapper.pks', +-- 'source/core/ut_metadata.pkb', +-- 'source/core/ut_metadata.pks', +-- 'source/core/ut_suite_manager.pkb', +-- 'source/core/ut_suite_manager.pks', +-- 'source/core/ut_utils.pkb', +-- 'source/core/ut_utils.pks', +-- 'source/core/coverage/proftab.sql', +-- 'source/core/coverage/ut_coverage.pkb', +-- 'source/core/coverage/ut_coverage.pks', +-- 'source/core/coverage/ut_coverage_helper.pkb', +-- 'source/core/coverage/ut_coverage_helper.pks', +-- 'source/core/coverage/ut_coverage_sources_tmp.sql', +-- 'source/core/coverage/ut_coverage_reporter_base.tpb', +-- 'source/core/coverage/ut_coverage_reporter_base.tps', +-- 'source/core/output_buffers/ut_message_id_seq.sql', +-- 'source/core/output_buffers/ut_output_buffer_base.tps', +-- 'source/core/output_buffers/ut_output_buffer_info_tmp.sql', +-- 'source/core/output_buffers/ut_output_buffer_tmp.sql', +-- 'source/core/output_buffers/ut_output_table_buffer.tpb', +-- 'source/core/output_buffers/ut_output_table_buffer.tps', +-- 'source/core/types/ut_console_reporter_base.tpb', +-- 'source/core/types/ut_console_reporter_base.tps', +-- 'source/core/types/ut_coverage_options.tps', +-- 'source/core/types/ut_event_listener.tpb', +-- 'source/core/types/ut_event_listener.tps', +-- 'source/core/types/ut_event_listener_base.tps', +-- 'source/core/types/ut_executable.tpb', +-- 'source/core/types/ut_executable.tps', +-- 'source/core/types/ut_expectation_result.tpb', +-- 'source/core/types/ut_expectation_result.tps', +-- 'source/core/types/ut_expectation_results.tps', +-- 'source/core/types/ut_file_mapping.tpb', +-- 'source/core/types/ut_file_mapping.tps', +-- 'source/core/types/ut_file_mappings.tps', +-- 'source/core/types/ut_key_value_pair.tps', +-- 'source/core/types/ut_key_value_pairs.tps', +-- 'source/core/types/ut_logical_suite.tpb', +-- 'source/core/types/ut_logical_suite.tps', +-- 'source/core/types/ut_object_name.tpb', +-- 'source/core/types/ut_object_name.tps', +-- 'source/core/types/ut_object_names.tps', +-- 'source/core/types/ut_output_reporter_base.tpb', +-- 'source/core/types/ut_output_reporter_base.tps', +-- 'source/core/types/ut_reporters.tps', +-- 'source/core/types/ut_reporter_base.tpb', +-- 'source/core/types/ut_reporter_base.tps', +-- 'source/core/types/ut_results_counter.tpb', +-- 'source/core/types/ut_results_counter.tps', +-- 'source/core/types/ut_run.tpb', +-- 'source/core/types/ut_run.tps', +-- 'source/core/types/ut_suite.tpb', +-- 'source/core/types/ut_suite.tps', +-- 'source/core/types/ut_suite_item.tpb', +-- 'source/core/types/ut_suite_item.tps', +-- 'source/core/types/ut_suite_items.tps', +-- 'source/core/types/ut_test.tpb', +-- 'source/core/types/ut_test.tps', +-- 'source/core/types/ut_varchar2_list.tps', +-- 'source/core/types/ut_varchar2_rows.tps', +-- 'source/expectations/data_values', +-- 'source/expectations/matchers', +-- 'source/expectations/ut_expectation.tpb', +-- 'source/expectations/ut_expectation.tps', +-- 'source/expectations/ut_expectation_anydata.tpb', +-- 'source/expectations/ut_expectation_anydata.tps', +-- 'source/expectations/ut_expectation_blob.tpb', +-- 'source/expectations/ut_expectation_blob.tps', +-- 'source/expectations/ut_expectation_boolean.tpb', +-- 'source/expectations/ut_expectation_boolean.tps', +-- 'source/expectations/ut_expectation_clob.tpb', +-- 'source/expectations/ut_expectation_clob.tps', +-- 'source/expectations/ut_expectation_date.tpb', +-- 'source/expectations/ut_expectation_date.tps', +-- 'source/expectations/ut_expectation_dsinterval.tpb', +-- 'source/expectations/ut_expectation_dsinterval.tps', +-- 'source/expectations/ut_expectation_number.tpb', +-- 'source/expectations/ut_expectation_number.tps', +-- 'source/expectations/ut_expectation_refcursor.tpb', +-- 'source/expectations/ut_expectation_refcursor.tps', +-- 'source/expectations/ut_expectation_timestamp.tpb', +-- 'source/expectations/ut_expectation_timestamp.tps', +-- 'source/expectations/ut_expectation_timestamp_ltz.tpb', +-- 'source/expectations/ut_expectation_timestamp_ltz.tps', +-- 'source/expectations/ut_expectation_timestamp_tz.tpb', +-- 'source/expectations/ut_expectation_timestamp_tz.tps', +-- 'source/expectations/ut_expectation_varchar2.tpb', +-- 'source/expectations/ut_expectation_varchar2.tps', +-- 'source/expectations/ut_expectation_yminterval.tpb', +-- 'source/expectations/ut_expectation_yminterval.tps', +-- 'source/expectations/data_values/ut_cursor_data.sql', +-- 'source/expectations/data_values/ut_data_value.tpb', +-- 'source/expectations/data_values/ut_data_value.tps', +-- 'source/expectations/data_values/ut_data_value_anydata.tpb', +-- 'source/expectations/data_values/ut_data_value_anydata.tps', +-- 'source/expectations/data_values/ut_data_value_blob.tpb', +-- 'source/expectations/data_values/ut_data_value_blob.tps', +-- 'source/expectations/data_values/ut_data_value_boolean.tpb', +-- 'source/expectations/data_values/ut_data_value_boolean.tps', +-- 'source/expectations/data_values/ut_data_value_clob.tpb', +-- 'source/expectations/data_values/ut_data_value_clob.tps', +-- 'source/expectations/data_values/ut_data_value_collection.tpb', +-- 'source/expectations/data_values/ut_data_value_collection.tps', +-- 'source/expectations/data_values/ut_data_value_date.tpb', +-- 'source/expectations/data_values/ut_data_value_date.tps', +-- 'source/expectations/data_values/ut_data_value_dsinterval.tpb', +-- 'source/expectations/data_values/ut_data_value_dsinterval.tps', +-- 'source/expectations/data_values/ut_data_value_number.tpb', +-- 'source/expectations/data_values/ut_data_value_number.tps', +-- 'source/expectations/data_values/ut_data_value_object.tpb', +-- 'source/expectations/data_values/ut_data_value_object.tps', +-- 'source/expectations/data_values/ut_data_value_refcursor.tpb', +-- 'source/expectations/data_values/ut_data_value_refcursor.tps', +-- 'source/expectations/data_values/ut_data_value_timestamp.tpb', +-- 'source/expectations/data_values/ut_data_value_timestamp.tps', +-- 'source/expectations/data_values/ut_data_value_timestamp_ltz.tpb', +-- 'source/expectations/data_values/ut_data_value_timestamp_ltz.tps', +-- 'source/expectations/data_values/ut_data_value_timestamp_tz.tpb', +-- 'source/expectations/data_values/ut_data_value_timestamp_tz.tps', +-- 'source/expectations/data_values/ut_data_value_varchar2.tpb', +-- 'source/expectations/data_values/ut_data_value_varchar2.tps', +-- 'source/expectations/data_values/ut_data_value_yminterval.tpb', +-- 'source/expectations/data_values/ut_data_value_yminterval.tps', +-- 'source/expectations/matchers/ut_be_between.tpb', +-- 'source/expectations/matchers/ut_be_between.tps', +-- 'source/expectations/matchers/ut_be_empty.tpb', +-- 'source/expectations/matchers/ut_be_empty.tps', +-- 'source/expectations/matchers/ut_be_false.tpb', +-- 'source/expectations/matchers/ut_be_false.tps', +-- 'source/expectations/matchers/ut_be_greater_or_equal.tpb', +-- 'source/expectations/matchers/ut_be_greater_or_equal.tps', +-- 'source/expectations/matchers/ut_be_greater_than.tpb', +-- 'source/expectations/matchers/ut_be_greater_than.tps', +-- 'source/expectations/matchers/ut_be_less_or_equal.tpb', +-- 'source/expectations/matchers/ut_be_less_or_equal.tps', +-- 'source/expectations/matchers/ut_be_less_than.tpb', +-- 'source/expectations/matchers/ut_be_less_than.tps', +-- 'source/expectations/matchers/ut_be_like.tpb', +-- 'source/expectations/matchers/ut_be_like.tps', +-- 'source/expectations/matchers/ut_be_not_null.tpb', +-- 'source/expectations/matchers/ut_be_not_null.tps', +-- 'source/expectations/matchers/ut_be_null.tpb', +-- 'source/expectations/matchers/ut_be_null.tps', +-- 'source/expectations/matchers/ut_be_true.tpb', +-- 'source/expectations/matchers/ut_be_true.tps', +-- 'source/expectations/matchers/ut_equal.tpb', +-- 'source/expectations/matchers/ut_equal.tps', +-- 'source/expectations/matchers/ut_match.tpb', +-- 'source/expectations/matchers/ut_match.tps', +-- 'source/expectations/matchers/ut_matcher.tpb', +-- 'source/expectations/matchers/ut_matcher.tps', +-- 'source/expectations/matchers/ut_comparison_matcher.tpb', +-- 'source/expectations/matchers/ut_comparison_matcher.tps', +-- 'source/reporters/ut_ansiconsole_helper.pkb', +-- 'source/reporters/ut_ansiconsole_helper.pks', +-- 'source/reporters/ut_coverage_html_reporter.tpb', +-- 'source/reporters/ut_coverage_html_reporter.tps', +-- 'source/reporters/ut_coverage_report_html_helper.pkb', +-- 'source/reporters/ut_coverage_report_html_helper.pks', +-- 'source/reporters/ut_coveralls_reporter.tpb', +-- 'source/reporters/ut_coveralls_reporter.tps', +-- 'source/reporters/ut_coverage_sonar_reporter.tpb', +-- 'source/reporters/ut_coverage_sonar_reporter.tps', +-- 'source/reporters/ut_documentation_reporter.tpb', +-- 'source/reporters/ut_documentation_reporter.tps', +-- 'source/reporters/ut_sonar_test_reporter.tpb', +-- 'source/reporters/ut_sonar_test_reporter.tps', +-- 'source/reporters/ut_teamcity_reporter.tpb', +-- 'source/reporters/ut_teamcity_reporter.tps', +-- 'source/reporters/ut_teamcity_reporter_helper.pkb', +-- 'source/reporters/ut_teamcity_reporter_helper.pks'); +-- +-- l_test_run := ut_run(a_items => ut_suite_items(), a_project_file_mappings => ut_file_mapper.build_file_mappings( user,l_project_file_list)); +-- +-- --run for the first time to gather coverage and timings on reporters too +-- l_reporter := ut_coverage_html_reporter(a_project_name => 'utPLSQL v3'); +-- l_reporter.after_calling_run(l_test_run); +-- l_reporter.on_finalize(l_test_run); +-- +-- l_reporter := ut_coverage_sonar_reporter(); +-- l_reporter.after_calling_run(l_test_run); +-- l_reporter.on_finalize(l_test_run); +-- +-- l_reporter := ut_coveralls_reporter(); +-- l_reporter.after_calling_run(l_test_run); +-- l_reporter.on_finalize(l_test_run); +-- +-- ut_coverage.set_develop_mode(false); +-- ut_coverage.coverage_stop(); +-- +-- --run for the second time to get the coverage report +-- l_reporter := ut_coverage_html_reporter(a_project_name => 'utPLSQL v3'); +-- l_reporter.after_calling_run(l_test_run); +-- l_reporter.on_finalize(l_test_run); +-- :html_reporter_id := l_reporter.get_reporter_id; +-- +-- l_reporter := ut_coverage_sonar_reporter(); +-- l_reporter.after_calling_run(l_test_run); +-- l_reporter.on_finalize(l_test_run); +-- :sonar_reporter_id := l_reporter.get_reporter_id; +-- +-- l_reporter := ut_coveralls_reporter(); +-- l_reporter.after_calling_run(l_test_run); +-- l_reporter.on_finalize(l_test_run); +-- :coveralls_reporter_id := l_reporter.get_reporter_id; +-- end; +-- / +-- +-- set timing off +-- prompt Spooling outcomes to coverage.xml +-- set termout off +-- set feedback off +-- set arraysize 50 +-- spool coverage.xml +-- declare +-- l_reporter ut_output_reporter_base := ut_coverage_sonar_reporter(); +-- begin +-- l_reporter.set_reporter_id(:sonar_reporter_id); +-- l_reporter.lines_to_dbms_output(a_initial_timeout=>1, a_timeout_sec=>1); +-- end; +-- / +-- spool off +-- +-- set termout on +-- prompt Spooling outcomes to coverage.json +-- set termout off +-- spool coverage.json +-- declare +-- l_reporter ut_output_reporter_base := ut_coveralls_reporter(); +-- begin +-- l_reporter.set_reporter_id(:coveralls_reporter_id); +-- l_reporter.lines_to_dbms_output(a_initial_timeout=>1, a_timeout_sec=>1); +-- end; +-- / +-- spool off +-- +-- set termout on +-- prompt Spooling outcomes to coverage.html +-- set termout off +-- spool coverage.html +-- declare +-- l_reporter ut_output_reporter_base := ut_coverage_html_reporter(); +-- begin +-- l_reporter.set_reporter_id(:html_reporter_id); +-- l_reporter.lines_to_dbms_output(a_initial_timeout=>1, a_timeout_sec=>1); +-- end; +-- / +-- spool off set termout on spool stats.log diff --git a/old_tests/ut_suite_manager/ut_suite_manager.CacheInvalidaesOnPackageDrop.sql b/old_tests/ut_suite_manager/ut_suite_manager.CacheInvalidaesOnPackageDrop.sql deleted file mode 100644 index 9715eae8b..000000000 --- a/old_tests/ut_suite_manager/ut_suite_manager.CacheInvalidaesOnPackageDrop.sql +++ /dev/null @@ -1,50 +0,0 @@ -set termout off -create or replace package tst_package_to_be_dropped as - --%suite - - --%test - procedure test1; -end; -/ - -create or replace package body tst_package_to_be_dropped as - procedure test1 is begin ut.expect(1).to_equal(1); end; - procedure test2 is begin ut.expect(1).to_equal(1); end; -end; -/ - -set termout on - -declare - l_test_report ut_varchar2_list; -begin - select * bulk collect into l_test_report from table(ut.run(USER||'.tst_package_to_be_dropped')); -end; -/ - -set termout off -drop package tst_package_to_be_dropped -/ -set termout on - -declare - l_test_report ut_varchar2_list; - l_error_message varchar2(4000); - l_expected varchar2(4000); -begin - l_expected := '%tst_package_to_be_dropped%does not exist%'; - begin - select * bulk collect into l_test_report from table(ut.run(user || '.tst_package_to_be_dropped')); - exception - when others then - l_error_message := sqlerrm; - if l_error_message like l_expected then - :test_result := ut_utils.gc_success; - end if; - end; - if :test_result != ut_utils.gc_success or :test_result is null then - dbms_output.put_line('Failed: Expected exception with text like '''||l_expected||''' but got:''' || - l_error_message || ''''); - end if; -end; -/ diff --git a/old_tests/ut_suite_manager/ut_suite_manager.emptySuitePath.sql b/old_tests/ut_suite_manager/ut_suite_manager.emptySuitePath.sql deleted file mode 100644 index a957f7873..000000000 --- a/old_tests/ut_suite_manager/ut_suite_manager.emptySuitePath.sql +++ /dev/null @@ -1,41 +0,0 @@ -set termout off -create or replace package tst_empty_suite_path as - --%suite - --%suitepath - - --%test - procedure test1; -end; -/ - -create or replace package body tst_empty_suite_path as - procedure test1 is begin ut.expect(1).to_equal(1); end; -end; -/ - -set termout on - -declare - l_objects_to_run ut_suite_items; - l_suite ut_suite; -begin - - --act - l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list('tst_empty_suite_path')); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - - l_suite := treat(l_objects_to_run(1) as ut_suite); - - ut.expect(l_suite.name).to_equal('tst_empty_suite_path'); - - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - end if; - -end; -/ - -drop package tst_empty_suite_path -/ diff --git a/old_tests/ut_test/ut_test.AfterEachExecuted.sql b/old_tests/ut_test/ut_test.AfterEachExecuted.sql deleted file mode 100644 index 5711c38e9..000000000 --- a/old_tests/ut_test/ut_test.AfterEachExecuted.sql +++ /dev/null @@ -1,20 +0,0 @@ -PROMPT Invoke aftereach procedure - ---Arrange -declare - simple_test ut_test := ut_test( - a_object_name => 'ut_example_tests', - a_name => 'ut_passing_test', - a_line_no => null - ); -begin - simple_test.after_each_list := ut_executables(ut_executable(user, 'ut_example_tests', 'aftereach', ut_utils.gc_after_each)); ---Act - simple_test.do_execute(); ---Assert - if simple_test.result = ut_utils.gc_success and ut_example_tests.g_char2 = 'F' then - :test_result := ut_utils.gc_success; - end if; -end; -/ - diff --git a/old_tests/ut_test/ut_test.AfterEachProcedureNameInvalid.sql b/old_tests/ut_test/ut_test.AfterEachProcedureNameInvalid.sql deleted file mode 100644 index 15765a811..000000000 --- a/old_tests/ut_test/ut_test.AfterEachProcedureNameInvalid.sql +++ /dev/null @@ -1,21 +0,0 @@ -PROMPT Does not execute test and reports error when test aftereach procedure name for a test is invalid - ---Arrange -declare - simple_test ut_test := ut_test( - a_object_name => 'ut_example_tests', - a_name => 'ut_exampletest', - a_line_no => null - ); -begin - simple_test.after_each_list := ut_executables(ut_executable(user, 'ut_example_tests', 'invalid setup name', ut_utils.gc_after_each)); - ut_example_tests.g_char := 'x'; - ut_example_tests.g_char2 := 'x'; ---Act - simple_test.do_execute(); ---Assert - if ut_example_tests.g_char2 = 'x' and simple_test.result = ut_utils.gc_error then - :test_result := ut_utils.gc_success; - end if; -end; -/ diff --git a/old_tests/ut_test/ut_test.AfterEachProcedureNameNull.sql b/old_tests/ut_test/ut_test.AfterEachProcedureNameNull.sql deleted file mode 100644 index f40ee8c04..000000000 --- a/old_tests/ut_test/ut_test.AfterEachProcedureNameNull.sql +++ /dev/null @@ -1,21 +0,0 @@ -PROMPT Does not invoke aftereach procedure when aftereach procedure name for a test is null - ---Arrange -declare - simple_test ut_test := ut_test( - a_object_name => 'ut_example_tests', - a_name => 'ut_passing_test', - a_line_no => null - ); -begin - simple_test.after_each_list := ut_executables(ut_executable(user, 'ut_example_tests', '', ut_utils.gc_after_each)); ---Act - simple_test.do_execute(); ---Assert - if ut_example_tests.g_char2 = 'a' then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: ut_example_tests.g_char = ''a'', got: '||ut_example_tests.g_char2 ); - end if; -end; -/ diff --git a/old_tests/ut_test/ut_test.ApplicationInfoOnExecution.sql b/old_tests/ut_test/ut_test.ApplicationInfoOnExecution.sql deleted file mode 100644 index 1ffa7fc11..000000000 --- a/old_tests/ut_test/ut_test.ApplicationInfoOnExecution.sql +++ /dev/null @@ -1,149 +0,0 @@ -create or replace package ut_output_tests -as - --%suite - - gv_before_all_client_info varchar2(200); - gv_before_each_client_info varchar2(200); - gv_before_test_client_info varchar2(200); - gv_after_test_client_info varchar2(200); - gv_after_each_client_info varchar2(200); - gv_after_all_client_info varchar2(200); - - --%test - --%beforetest(before_test) - --%aftertest(after_test) - procedure the_test; - - --%beforeall - procedure beforeall; - - --%beforeeach - procedure beforeeach; - - procedure before_test; - procedure after_test; - - --%aftereach - procedure aftereach; - - --%afterall - procedure afterall; - -end; -/ - -create or replace package body ut_output_tests -as - - procedure the_test - as - l_module_name varchar2(4000); - l_action_name varchar2(4000); - l_client_info varchar2(4000); - begin - --Generate empty output - dbms_output.put_line(''); - ut.expect(1,'Test 1 Should Pass').to_equal(1); - dbms_application_info.read_module(module_name => l_module_name, action_name => l_action_name); - dbms_application_info.read_client_info(l_client_info); - ut.expect(l_module_name).to_equal('utPLSQL'); - ut.expect(l_action_name).to_be_like('ut_output_tests'); - ut.expect(l_client_info).to_be_like('the_test'); - end; - - procedure beforeall is - begin - dbms_application_info.read_client_info(gv_before_all_client_info); - end; - - procedure beforeeach is - begin - dbms_application_info.read_client_info(gv_before_each_client_info); - end; - - procedure before_test is - begin - dbms_application_info.read_client_info(gv_before_test_client_info); - end; - procedure after_test is - begin - dbms_application_info.read_client_info(gv_after_test_client_info); - end; - - procedure aftereach is - begin - dbms_application_info.read_client_info(gv_after_each_client_info); - end; - - procedure afterall is - begin - dbms_application_info.read_client_info(gv_after_all_client_info); - end; - -end; -/ - -declare - l_output_data dbms_output.chararr; - l_num_lines integer := 100000; - l_output clob; - l_result boolean := true; - l_client_info varchar2(4000); -begin - --act - ut.run('ut_output_tests'); - - --assert - dbms_output.get_lines( l_output_data, l_num_lines); - dbms_lob.createtemporary(l_output,true); - for i in 1 .. l_num_lines loop - dbms_lob.append(l_output,l_output_data(i)); - end loop; - - execute immediate 'begin :i := ut_output_tests.gv_before_all_client_info; end;' using out l_client_info; - if not nvl(l_client_info = 'beforeall', false) then - dbms_output.put_line('Wrong before all text: '||l_client_info); - l_result := false; - end if; - execute immediate 'begin :i := ut_output_tests.gv_before_each_client_info; end;' using out l_client_info; - if not nvl(l_client_info = 'beforeeach', false) then - dbms_output.put_line('Wrong before each text: '||l_client_info); - l_result := false; - end if; - execute immediate 'begin :i := ut_output_tests.gv_before_test_client_info; end;' using out l_client_info; - if not nvl(l_client_info = 'before_test', false) then - dbms_output.put_line('Wrong before test text: '||l_client_info); - l_result := false; - end if; - execute immediate 'begin :i := ut_output_tests.gv_after_test_client_info; end;' using out l_client_info; - if not nvl(l_client_info = 'after_test', false) then - dbms_output.put_line('Wrong after test text: '||l_client_info); - l_result := false; - end if; - execute immediate 'begin :i := ut_output_tests.gv_after_each_client_info; end;' using out l_client_info; - if not nvl(l_client_info = 'aftereach', false) then - dbms_output.put_line('Wrong after each text: '||l_client_info); - l_result := false; - end if; - execute immediate 'begin :i := ut_output_tests.gv_after_all_client_info; end;' using out l_client_info; - if not nvl(l_client_info = 'afterall', false) then - dbms_output.put_line('Wrong after all text: '||l_client_info); - l_result := false; - end if; - - if not nvl(l_output like '%0 failed, 0 errored, 0 disabled, 0 warning(s)%',false) then - l_result := false; - for i in 1 .. l_num_lines loop - dbms_output.put_line(l_output_data(i)); - end loop; - dbms_output.put_line('Failed: Wrong output'); - end if; - if l_result then - :test_result := ut_utils.gc_success; - end if; -end; -/ - -drop package ut_output_tests -/ - diff --git a/old_tests/ut_test/ut_test.BeforeEachExecuted.sql b/old_tests/ut_test/ut_test.BeforeEachExecuted.sql deleted file mode 100644 index 9d40441ac..000000000 --- a/old_tests/ut_test/ut_test.BeforeEachExecuted.sql +++ /dev/null @@ -1,21 +0,0 @@ -PROMPT Invoke beforeeach procedure - ---Arrange -declare - simple_test ut_test := ut_test( - a_object_name => 'ut_example_tests', - a_name => 'ut_passing_test', - a_line_no => null - ); -begin - simple_test.before_each_list := ut_executables(ut_executable(user, 'ut_example_tests', 'beforeeach', ut_utils.gc_before_each)); - ut_example_tests.g_number2 := null; ---Act - simple_test.do_execute(); ---Assert - if ut_example_tests.g_number2 = 1 then - :test_result := ut_utils.gc_success; - end if; -end; -/ - diff --git a/old_tests/ut_test/ut_test.BeforeEachProcedureNameInvalid.sql b/old_tests/ut_test/ut_test.BeforeEachProcedureNameInvalid.sql deleted file mode 100644 index 5a9d40a58..000000000 --- a/old_tests/ut_test/ut_test.BeforeEachProcedureNameInvalid.sql +++ /dev/null @@ -1,20 +0,0 @@ -PROMPT Does not execute test and reports error when test beforeeach procedure name for a test is invalid - ---Arrange -declare - simple_test ut_test := ut_test( - a_object_name => 'ut_example_tests', - a_name => 'ut_exampletest', - a_line_no => null - ); -begin - simple_test.before_each_list := ut_executables(ut_executable(user, 'ut_example_tests', 'invalid setup name', ut_utils.gc_before_each)); - ut_example_tests.g_char2 := null; ---Act - simple_test.do_execute(); ---Assert - if simple_test.result = ut_utils.gc_error and ut_example_tests.g_char2 is null then - :test_result := ut_utils.gc_success; - end if; -end; -/ diff --git a/old_tests/ut_test/ut_test.BeforeEachProcedureNameNull.sql b/old_tests/ut_test/ut_test.BeforeEachProcedureNameNull.sql deleted file mode 100644 index 66107c462..000000000 --- a/old_tests/ut_test/ut_test.BeforeEachProcedureNameNull.sql +++ /dev/null @@ -1,22 +0,0 @@ -PROMPT Does not invoke setup procedure when beforeeach procedure name for a test is null - ---Arrange -declare - simple_test ut_test := ut_test( - a_object_name => 'ut_example_tests', - a_name => 'ut_passing_test', - a_line_no => null - ); -begin - simple_test.before_each_list := ut_executables(ut_executable(user, 'ut_example_tests', '', ut_utils.gc_before_each)); - ut_example_tests.g_number2 := null; ---Act - simple_test.do_execute(); ---Assert - if ut_example_tests.g_number2 is null then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: ut_example_tests.g_number is null, got: '||ut_example_tests.g_number2 ); - end if; -end; -/ diff --git a/old_tests/ut_test/ut_test.IgnoreTollbackToSavepointException.sql b/old_tests/ut_test/ut_test.IgnoreTollbackToSavepointException.sql deleted file mode 100644 index 3e3c1a814..000000000 --- a/old_tests/ut_test/ut_test.IgnoreTollbackToSavepointException.sql +++ /dev/null @@ -1,17 +0,0 @@ -PROMPT Checks that rollback exception does not make run to fail - ---Arrange -declare - simple_test ut_test := ut_test(a_object_name => 'ut_example_tests', a_name => 'ut_commit_test', a_line_no => null); -begin - simple_test.rollback_type := ut_utils.gc_rollback_auto; ---Act - simple_test.do_execute(); ---Assert - if simple_test.result = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('simple_test.result = '||ut_utils.test_result_to_char(simple_test.result)); - end if; -end; -/ diff --git a/old_tests/ut_test/ut_test.OwnerNameInvalid.sql b/old_tests/ut_test/ut_test.OwnerNameInvalid.sql deleted file mode 100644 index 5207af574..000000000 --- a/old_tests/ut_test/ut_test.OwnerNameInvalid.sql +++ /dev/null @@ -1,21 +0,0 @@ -PROMPT Reports error when test owner name for a test is invalid - ---Arrange -declare - simple_test ut_test := ut_test( - a_object_owner => 'invalid owner name', - a_object_name => 'ut_example_tests', - a_name => 'ut_passing_test', - a_line_no => null); -begin ---Act - simple_test.do_execute(); - ---Assert - if simple_test.result = ut_utils.gc_error then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('simple_test.result = '||ut_utils.test_result_to_char(simple_test.result)); - end if; -end; -/ diff --git a/old_tests/ut_test/ut_test.OwnerNameNull.sql b/old_tests/ut_test/ut_test.OwnerNameNull.sql deleted file mode 100644 index f57aebf92..000000000 --- a/old_tests/ut_test/ut_test.OwnerNameNull.sql +++ /dev/null @@ -1,18 +0,0 @@ -PROMPT Executes test in current schema when test owner name for a test is null - ---Arrange -declare - simple_test ut_test:= ut_test( - a_object_owner => null, - a_object_name => 'ut_example_tests', - a_name => 'ut_passing_test', - a_line_no => null); -begin ---Act - simple_test.do_execute(); ---Assert - if ut_example_tests.g_char = 'a' then - :test_result := simple_test.result; - end if; -end; -/ diff --git a/old_tests/ut_test/ut_test.PackageInInvalidState.sql b/old_tests/ut_test/ut_test.PackageInInvalidState.sql deleted file mode 100644 index 0b87a13d6..000000000 --- a/old_tests/ut_test/ut_test.PackageInInvalidState.sql +++ /dev/null @@ -1,27 +0,0 @@ -set termout off ---Arrange -create or replace package invalid_package is - v_variable non_existing_type; - procedure ut_exampletest; -end; -/ -set termout on - -declare - simple_test ut_test := ut_test(a_object_name => 'invalid_package', a_name => 'ut_exampletest', a_line_no => null); -begin ---Act - simple_test.do_execute(); ---Assert - if simple_test.result = ut_utils.gc_error then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('simple_test.result = '||ut_utils.test_result_to_char(simple_test.result)); - end if; -end; -/ - -set termout off ---Cleanup -drop package invalid_package; -set termout off diff --git a/old_tests/ut_test/ut_test.PackageNameInvalid.sql b/old_tests/ut_test/ut_test.PackageNameInvalid.sql deleted file mode 100644 index b615e7589..000000000 --- a/old_tests/ut_test/ut_test.PackageNameInvalid.sql +++ /dev/null @@ -1,16 +0,0 @@ -PROMPT Reports error when unit test package name for a test is invalid - ---Arrange -declare - simple_test ut_test := ut_test(a_object_name => 'invalid test package name', a_name => 'ut_passing_test', a_line_no => null); -begin ---Act - simple_test.do_execute(); ---Assert - if simple_test.result = ut_utils.gc_error then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('simple_test.result = '||ut_utils.test_result_to_char(simple_test.result)); - end if; -end; -/ diff --git a/old_tests/ut_test/ut_test.PackageNameNull.sql b/old_tests/ut_test/ut_test.PackageNameNull.sql deleted file mode 100644 index 59612fa3d..000000000 --- a/old_tests/ut_test/ut_test.PackageNameNull.sql +++ /dev/null @@ -1,16 +0,0 @@ -PROMPT Reports error when unit test package name for a test is null - ---Arrange -declare - simple_test ut_test := ut_test(a_object_name => null, a_name => 'ut_passing_test', a_line_no => null); -begin ---Act - simple_test.do_execute(); ---Assert - if simple_test.result = ut_utils.gc_error then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('simple_test.result = '||ut_utils.test_result_to_char(simple_test.result)); - end if; -end; -/ diff --git a/old_tests/ut_test/ut_test.ProcedureNameInvalid.sql b/old_tests/ut_test/ut_test.ProcedureNameInvalid.sql deleted file mode 100644 index 2a8e80a9e..000000000 --- a/old_tests/ut_test/ut_test.ProcedureNameInvalid.sql +++ /dev/null @@ -1,16 +0,0 @@ -PROMPT Reports error when test procedure name for a test is invalid - ---Arrange -declare - simple_test ut_test := ut_test(a_object_name => 'ut_example_tests' ,a_name => 'invalid procedure name', a_line_no => null); -begin ---Act - simple_test.do_execute(); ---Assert - if simple_test.result = ut_utils.gc_error then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('simple_test.result = '||ut_utils.test_result_to_char(simple_test.result)); - end if; -end; -/ diff --git a/old_tests/ut_test/ut_test.ProcedureNameNull.sql b/old_tests/ut_test/ut_test.ProcedureNameNull.sql deleted file mode 100644 index df4f0e593..000000000 --- a/old_tests/ut_test/ut_test.ProcedureNameNull.sql +++ /dev/null @@ -1,16 +0,0 @@ -PROMPT Reports error when test procedure name for a test is null - ---Arrange -declare - simple_test ut_test := ut_test(a_object_name => 'ut_example_tests', a_name => null, a_line_no => null); -begin ---Act - simple_test.do_execute(); ---Assert - if simple_test.result = ut_utils.gc_error then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('simple_test.result = '||ut_utils.test_result_to_char(simple_test.result)); - end if; -end; -/ diff --git a/old_tests/ut_test/ut_test.ReportWarningOnRollbackFailed.sql b/old_tests/ut_test/ut_test.ReportWarningOnRollbackFailed.sql deleted file mode 100644 index 0e54d401c..000000000 --- a/old_tests/ut_test/ut_test.ReportWarningOnRollbackFailed.sql +++ /dev/null @@ -1,58 +0,0 @@ -create or replace package ut_output_test_rollback -as - --%suite - - --%test - procedure tt; - -end; -/ - -create or replace package body ut_output_test_rollback -as - - procedure tt is - begin - commit; - end; - -end; -/ - -declare - l_lines ut_varchar2_list; - l_results clob; -begin - --act - select * bulk collect into l_lines from table(ut.run('ut_output_test_rollback')); - - l_results := ut_utils.table_to_clob(l_lines); - - --assert - if l_results like q'[%Warnings: -% - 1) ut_output_test_rollback.tt - Unable to perform automatic rollback after test. An implicit or explicit commit/rollback occurred in procedures: - ut3.ut_output_test_rollback.tt - Use the "--%rollback(manual)" annotation or remove commit/rollback/ddl statements that are causing the issue. -% - 2) ut_output_test_rollback - Unable to perform automatic rollback after test suite. An implicit or explicit commit/rollback occurred in procedures: - ut3.ut_output_test_rollback.tt - Use the "--%rollback(manual)" annotation or remove commit/rollback/ddl statements that are causing the issue. -% -Finished in % seconds -1 tests, 0 failed, 0 errored, 0 disabled, 2 warning(s)%]' then - :test_result := ut_utils.gc_success; - else - for i in 1 .. l_lines.count loop - dbms_output.put_line(l_lines(i)); - end loop; - dbms_output.put_line('Failed: Wrong output'); - end if; -end; -/ - -drop package ut_output_test_rollback -/ - diff --git a/old_tests/ut_test/ut_test.SetupExecutedBeforeTest.sql b/old_tests/ut_test/ut_test.SetupExecutedBeforeTest.sql deleted file mode 100644 index 2a80cf586..000000000 --- a/old_tests/ut_test/ut_test.SetupExecutedBeforeTest.sql +++ /dev/null @@ -1,21 +0,0 @@ -PROMPT Invoke setup procedure before test when setup procedure name is defined - ---Arrange -declare - simple_test ut_test := ut_test( - a_object_name => 'ut_example_tests', - a_name => 'ut_passing_test', - a_line_no => null - ); -begin - simple_test.before_test_list := ut_executables(ut_executable(user, 'ut_example_tests', 'setup', ut_utils.gc_before_test)); - ut_example_tests.g_number := null; ---Act - simple_test.do_execute(); ---Assert - if ut_example_tests.g_number = 1 then - :test_result := ut_utils.gc_success; - end if; -end; -/ - diff --git a/old_tests/ut_test/ut_test.SetupProcedureNameInvalid.sql b/old_tests/ut_test/ut_test.SetupProcedureNameInvalid.sql deleted file mode 100644 index d81141031..000000000 --- a/old_tests/ut_test/ut_test.SetupProcedureNameInvalid.sql +++ /dev/null @@ -1,20 +0,0 @@ -PROMPT Does not execute test and reports error when test setup procedure name for a test is invalid - ---Arrange -declare - simple_test ut_test := ut_test( - a_object_name => 'ut_example_tests', - a_name => 'ut_exampletest', - a_line_no => null - ); -begin - simple_test.before_test_list := ut_executables(ut_executable(user, 'ut_example_tests', 'invalid setup name', ut_utils.gc_before_test)); - ut_example_tests.g_char := null; ---Act - simple_test.do_execute(); ---Assert - if simple_test.result = ut_utils.gc_error and ut_example_tests.g_char is null then - :test_result := ut_utils.gc_success; - end if; -end; -/ diff --git a/old_tests/ut_test/ut_test.SetupProcedureNameNull.sql b/old_tests/ut_test/ut_test.SetupProcedureNameNull.sql deleted file mode 100644 index 9269fdd92..000000000 --- a/old_tests/ut_test/ut_test.SetupProcedureNameNull.sql +++ /dev/null @@ -1,22 +0,0 @@ -PROMPT Does not invoke setup procedure when setup procedure name for a test is null - ---Arrange -declare - simple_test ut_test := ut_test( - a_object_name => 'ut_example_tests', - a_name => 'ut_passing_test', - a_line_no => null - ); -begin - simple_test.before_test_list := ut_executables(ut_executable(user, 'ut_example_tests', null, ut_utils.gc_before_test)); - ut_example_tests.g_number := null; ---Act - simple_test.do_execute(); ---Assert - if ut_example_tests.g_number is null then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: ut_example_tests.g_number is null, got: '||ut_example_tests.g_number ); - end if; -end; -/ diff --git a/old_tests/ut_test/ut_test.TeardownExecutedAfterTest.sql b/old_tests/ut_test/ut_test.TeardownExecutedAfterTest.sql deleted file mode 100644 index bc733614b..000000000 --- a/old_tests/ut_test/ut_test.TeardownExecutedAfterTest.sql +++ /dev/null @@ -1,20 +0,0 @@ -PROMPT Invoke teardown procedure after test when teardown procedure name is defined - ---Arrange -declare - simple_test ut_test := ut_test( - a_object_name => 'ut_example_tests', - a_name => 'ut_passing_test', - a_line_no => null - ); -begin - simple_test.after_test_list := ut_executables(ut_executable(user, 'ut_example_tests', 'teardown', ut_utils.gc_after_test)); ---Act - simple_test.do_execute(); ---Assert - if simple_test.result = ut_utils.gc_success and ut_example_tests.g_char is null then - :test_result := ut_utils.gc_success; - end if; -end; -/ - diff --git a/old_tests/ut_test/ut_test.TeardownProcedureNameInvalid.sql b/old_tests/ut_test/ut_test.TeardownProcedureNameInvalid.sql deleted file mode 100644 index 5ae61cc13..000000000 --- a/old_tests/ut_test/ut_test.TeardownProcedureNameInvalid.sql +++ /dev/null @@ -1,20 +0,0 @@ -PROMPT Does not execute test and reports error when test teardown procedure name for a test is invalid - ---Arrange -declare - simple_test ut_test := ut_test( - a_object_name => 'ut_example_tests', - a_name => 'ut_exampletest', - a_line_no => null - ); -begin - simple_test.after_test_list := ut_executables(ut_executable(user, 'ut_example_tests', 'invalid setup name', ut_utils.gc_after_test)); - ut_example_tests.g_char := 'x'; ---Act - simple_test.do_execute(); ---Assert - if ut_example_tests.g_char = 'x' and simple_test.result = ut_utils.gc_error then - :test_result := ut_utils.gc_success; - end if; -end; -/ diff --git a/old_tests/ut_test/ut_test.TeardownProcedureNameNull.sql b/old_tests/ut_test/ut_test.TeardownProcedureNameNull.sql deleted file mode 100644 index 7460ca788..000000000 --- a/old_tests/ut_test/ut_test.TeardownProcedureNameNull.sql +++ /dev/null @@ -1,21 +0,0 @@ -PROMPT Does not invoke teardown procedure when teardown procedure name for a test is null - ---Arrange -declare - simple_test ut_test := ut_test( - a_object_name => 'ut_example_tests', - a_name => 'ut_passing_test', - a_line_no => null - ); -begin - simple_test.after_test_list := ut_executables(ut_executable(user, 'ut_example_tests', null, ut_utils.gc_after_test)); ---Act - simple_test.do_execute(); ---Assert - if ut_example_tests.g_char = 'a' then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: ut_example_tests.g_char = ''a'', got: '''||ut_example_tests.g_char||'''' ); - end if; -end; -/ diff --git a/old_tests/ut_test/ut_test.TestOutputGathering.sql b/old_tests/ut_test/ut_test.TestOutputGathering.sql deleted file mode 100644 index 14181a4b0..000000000 --- a/old_tests/ut_test/ut_test.TestOutputGathering.sql +++ /dev/null @@ -1,103 +0,0 @@ -create or replace package ut_output_tests -as - --%suite - - --%beforeeach - procedure beforeeach; - - --%aftereach - procedure aftereach; - - --%test - --%beforetest(beforetest) - --%aftertest(aftertest) - procedure ut_passing_test; - - procedure beforetest; - - procedure aftertest; - - --%beforeall - procedure beforeall; - --%afterall - procedure afterall; - -end; -/ - -create or replace package body ut_output_tests -as - - procedure beforetest as - begin - dbms_output.put_line(''); - end; - - procedure aftertest - as - begin - dbms_output.put_line(''); - end; - - procedure beforeeach as - begin - dbms_output.put_line(''); - end; - - procedure aftereach - as - begin - dbms_output.put_line(''); - end; - - procedure ut_passing_test - as - begin - dbms_output.put_line(''); - ut.expect(1,'Test 1 Should Pass').to_equal(1); - end; - - procedure beforeall is - begin - dbms_output.put_line(''); - end; - - procedure afterall is - begin - dbms_output.put_line(''); - end; - -end; -/ - -declare - l_output_data dbms_output.chararr; - l_num_lines integer := 100000; - l_output clob; -begin - --act - ut.run('ut_output_tests'); - - --assert - dbms_output.get_lines( l_output_data, l_num_lines); - dbms_lob.createtemporary(l_output,true); - for i in 1 .. l_num_lines loop - dbms_lob.append(l_output,l_output_data(i)); - end loop; - - if l_output like '%%%%%%%%1 tests, 0 failed, 0 errored%' then - :test_result := ut_utils.gc_success; - end if; - - if :test_result != ut_utils.gc_success or :test_result is null then - for i in 1 .. l_num_lines loop - dbms_output.put_line(l_output_data(i)); - end loop; - dbms_output.put_line('Failed: Wrong output'); - end if; -end; -/ - -drop package ut_output_tests -/ - diff --git a/old_tests/ut_test/ut_test.TestOutputGatheringWhenEmpty.sql b/old_tests/ut_test/ut_test.TestOutputGatheringWhenEmpty.sql deleted file mode 100644 index dcd82fbad..000000000 --- a/old_tests/ut_test/ut_test.TestOutputGatheringWhenEmpty.sql +++ /dev/null @@ -1,55 +0,0 @@ -create or replace package ut_output_tests -as - --%suite - - --%test - procedure ut_passing_test; - -end; -/ - -create or replace package body ut_output_tests -as - - procedure ut_passing_test - as - begin - --Generate empty output - dbms_output.put_line(''); - ut.expect(1,'Test 1 Should Pass').to_equal(1); - end; - -end; -/ - -declare - l_output_data dbms_output.chararr; - l_num_lines integer := 100000; - l_output clob; -begin - --act - ut.run('ut_output_tests'); - - --assert - dbms_output.get_lines( l_output_data, l_num_lines); - dbms_lob.createtemporary(l_output,true); - for i in 1 .. l_num_lines loop - dbms_lob.append(l_output,l_output_data(i)); - end loop; - - if l_output like '%0 failed, 0 errored, 0 disabled, 0 warning(s)%' then - :test_result := ut_utils.gc_success; - end if; - - if :test_result != ut_utils.gc_success or :test_result is null then - for i in 1 .. l_num_lines loop - dbms_output.put_line(l_output_data(i)); - end loop; - dbms_output.put_line('Failed: Wrong output'); - end if; -end; -/ - -drop package ut_output_tests -/ - diff --git a/sonar-project.properties b/sonar-project.properties index a1fabbede..e13de646b 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -9,7 +9,7 @@ sonar.projectVersion=v3.1.3-develop # If not set, SonarQube starts looking for source code from the directory containing # the sonar-project.properties file. sonar.sources=./source -sonar.coverageReportPaths=./old_tests/coverage.xml,coverage.xml +sonar.coverageReportPaths=coverage.xml sonar.tests=./test sonar.testExecutionReportPaths=./test_results.xml sonar.links.issue=https://github.com/utPLSQL/utPLSQL/issues diff --git a/test/core/test_ut_test.pkb b/test/core/test_ut_test.pkb index 5b401463c..b521d6841 100644 --- a/test/core/test_ut_test.pkb +++ b/test/core/test_ut_test.pkb @@ -137,5 +137,561 @@ create or replace package body test_ut_test is ut.expect(l_suite.results_count.errored_count).to_equal(1); end; + procedure after_each_executed is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_name => 'ut_example_tests', + a_name => 'set_g_number_0', + a_line_no => null + ); + begin + l_test.after_each_list := ut3.ut_executables(ut3.ut_executable(user, 'ut_example_tests', 'add_1_to_g_number', ut3.ut_utils.gc_after_each)); + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_success); + ut.expect(ut_example_tests.g_number).to_equal(1); + end; + + procedure after_each_proc_name_invalid is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_name => 'ut_example_tests', + a_name => 'set_g_number_0', + a_line_no => null + ); + begin + l_test.after_each_list := ut3.ut_executables( + ut3.ut_executable(user, 'ut_example_tests', 'invalid setup name', ut3.ut_utils.gc_after_each) + ); + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(ut_example_tests.g_number).to_equal(0); + end; + + procedure after_each_procedure_name_null is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_name => 'ut_example_tests', + a_name => 'set_g_number_0', + a_line_no => null + ); + begin + l_test.after_each_list := ut3.ut_executables( + ut3.ut_executable(user, 'ut_example_tests', null, ut3.ut_utils.gc_after_each) + ); + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(ut_example_tests.g_number).to_equal(0); + end; + + procedure create_app_info_package is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package ut_output_tests + as + --%suite + + gv_before_all_client_info varchar2(200); + gv_before_each_client_info varchar2(200); + gv_before_test_client_info varchar2(200); + gv_after_test_client_info varchar2(200); + gv_after_each_client_info varchar2(200); + gv_after_all_client_info varchar2(200); + + --%test + --%beforetest(before_test) + --%aftertest(after_test) + procedure the_test; + + --%beforeall + procedure beforeall; + + --%beforeeach + procedure beforeeach; + + procedure before_test; + procedure after_test; + + --%aftereach + procedure aftereach; + + --%afterall + procedure afterall; + + end;]'; + execute immediate q'[create or replace package body ut_output_tests + as + + procedure the_test + as + l_module_name varchar2(4000); + l_action_name varchar2(4000); + l_client_info varchar2(4000); + begin + --Generate empty output + dbms_output.put_line(''); + ut.expect(1,'Test 1 Should Pass').to_equal(1); + dbms_application_info.read_module(module_name => l_module_name, action_name => l_action_name); + dbms_application_info.read_client_info(l_client_info); + ut.expect(l_module_name).to_equal('utPLSQL'); + ut.expect(l_action_name).to_be_like('ut_output_tests'); + ut.expect(l_client_info).to_be_like('the_test'); + end; + + procedure beforeall is + begin + dbms_application_info.read_client_info(gv_before_all_client_info); + end; + + procedure beforeeach is + begin + dbms_application_info.read_client_info(gv_before_each_client_info); + end; + + procedure before_test is + begin + dbms_application_info.read_client_info(gv_before_test_client_info); + end; + procedure after_test is + begin + dbms_application_info.read_client_info(gv_after_test_client_info); + end; + + procedure aftereach is + begin + dbms_application_info.read_client_info(gv_after_each_client_info); + end; + + procedure afterall is + begin + dbms_application_info.read_client_info(gv_after_all_client_info); + end; + + end;]'; + end; + + procedure drop_app_info_package is + pragma autonomous_transaction; + begin + execute immediate q'[drop package ut_output_tests]'; + end; + + procedure application_info_on_execution is + l_output_data ut3.ut_varchar2_list; + l_output clob; + function get_test_value(a_variable_name varchar2) return varchar2 is + l_result varchar2(4000); + begin + execute immediate 'begin :i := ut_output_tests.'||a_variable_name||'; end;' using out l_result; + return l_result; + end; + begin + --act + select * bulk collect into l_output_data + from table(ut3.ut.run('ut_output_tests')); + l_output := ut3.ut_utils.table_to_clob(l_output_data); + --assert + + ut.expect(get_test_value('gv_before_all_client_info')).to_equal('beforeall'); + ut.expect(get_test_value('gv_before_each_client_info')).to_equal('beforeeach'); + ut.expect(get_test_value('gv_before_test_client_info')).to_equal('before_test'); + ut.expect(get_test_value('gv_after_test_client_info')).to_equal('after_test'); + ut.expect(get_test_value('gv_after_each_client_info')).to_equal('aftereach'); + ut.expect(get_test_value('gv_after_all_client_info')).to_equal('afterall'); + ut.expect(l_output).to_be_like('%0 failed, 0 errored, 0 disabled, 0 warning(s)%'); + end; + + procedure before_each_executed is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_name => 'ut_example_tests', + a_name => 'add_1_to_g_number', + a_line_no => null + ); + begin + l_test.before_each_list := ut3.ut_executables(ut3.ut_executable(user, 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_each)); + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_success); + ut.expect(ut_example_tests.g_number).to_equal(1); + end; + + + procedure before_each_proc_name_invalid is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_name => 'ut_example_tests', + a_name => 'set_g_number_0', + a_line_no => null + ); + begin + l_test.before_each_list := ut3.ut_executables( + ut3.ut_executable(user, 'ut_example_tests', 'invalid setup name', ut3.ut_utils.gc_before_each) + ); + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(ut_example_tests.g_number).to_be_null; + end; + + procedure before_each_proc_name_null is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_name => 'ut_example_tests', + a_name => 'set_g_number_0', + a_line_no => null + ); + begin + l_test.before_each_list := ut3.ut_executables( + ut3.ut_executable(user, 'ut_example_tests', null, ut3.ut_utils.gc_before_each) + ); + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(ut_example_tests.g_number).to_be_null; + end; + + procedure ignore_savepoint_exception is + pragma autonomous_transaction; + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_name => 'ut_example_tests', + a_name => 'ut_commit_test', + a_line_no => null + ); + begin + l_test.rollback_type := ut3.ut_utils.gc_rollback_auto; + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_success); + end; + + procedure owner_name_invalid is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_owner => 'invalid owner name', + a_object_name => 'ut_example_tests', + a_name => 'set_g_number_0', + a_line_no => null + ); + begin + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + end; + + procedure owner_name_null is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_owner => null, + a_object_name => 'ut_example_tests', + a_name => 'set_g_number_0', + a_line_no => null + ); + begin + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_success); + ut.expect(ut_example_tests.g_number).to_equal(0); + end; + + + procedure create_invalid_package is + pragma autonomous_transaction; + begin + execute immediate 'create or replace package invalid_package is + v_variable non_existing_type; + procedure ut_exampletest; + end;'; + exception when others then + null; + end; + + procedure drop_invalid_package is + pragma autonomous_transaction; + begin + execute immediate 'drop package invalid_package'; + exception when others then + null; + end; + + procedure package_in_invalid_state is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_name => 'invalid_package', + a_name => 'ut_exampletest', + a_line_no => null + ); + begin + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + end; + + procedure package_name_invalid is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_name => 'invalid package name', + a_name => 'set_g_number_0', + a_line_no => null + ); + begin + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + end; + + procedure package_name_null is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_name => null, + a_name => 'set_g_number_0', + a_line_no => null + ); + begin + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + end; + + procedure procedure_name_invalid is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_name => 'ut_example_tests', + a_name => 'invalid procedure name', + a_line_no => null + ); + begin + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + end; + + procedure procedure_name_null is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_name => 'ut_example_tests', + a_name => null, + a_line_no => null + ); + begin + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + end; + + procedure before_test_executed is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_name => 'ut_example_tests', + a_name => 'add_1_to_g_number', + a_line_no => null + ); + begin + l_test.before_test_list := ut3.ut_executables(ut3.ut_executable(user, 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_test)); + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_success); + ut.expect(ut_example_tests.g_number).to_equal(1); + end; + + procedure before_test_proc_name_invalid is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_name => 'ut_example_tests', + a_name => 'set_g_number_0', + a_line_no => null + ); + begin + l_test.before_test_list := ut3.ut_executables( + ut3.ut_executable(user, 'ut_example_tests', 'invalid setup name', ut3.ut_utils.gc_before_test) + ); + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(ut_example_tests.g_number).to_be_null; + end; + + procedure before_test_proc_name_null is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_name => 'ut_example_tests', + a_name => 'set_g_number_0', + a_line_no => null + ); + begin + l_test.before_test_list := ut3.ut_executables( + ut3.ut_executable(user, 'ut_example_tests', null, ut3.ut_utils.gc_before_test) + ); + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(ut_example_tests.g_number).to_be_null; + end; + + procedure after_test_executed is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_name => 'ut_example_tests', + a_name => 'set_g_number_0', + a_line_no => null + ); + begin + l_test.after_test_list := ut3.ut_executables(ut3.ut_executable(user, 'ut_example_tests', 'add_1_to_g_number', ut3.ut_utils.gc_after_test)); + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_success); + ut.expect(ut_example_tests.g_number).to_equal(1); + end; + + procedure after_test_proce_name_invalid is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_name => 'ut_example_tests', + a_name => 'set_g_number_0', + a_line_no => null + ); + begin + l_test.after_test_list := ut3.ut_executables( + ut3.ut_executable(user, 'ut_example_tests', 'invalid procedure name', ut3.ut_utils.gc_after_test) + ); + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(ut_example_tests.g_number).to_equal(0); + end; + + procedure after_test_proc_name_null is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_name => 'ut_example_tests', + a_name => 'set_g_number_0', + a_line_no => null + ); + begin + l_test.after_test_list := ut3.ut_executables( + ut3.ut_executable(user, 'ut_example_tests', null, ut3.ut_utils.gc_after_test) + ); + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(ut_example_tests.g_number).to_equal(0); + end; + + procedure create_output_package is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package ut_output_tests + as + --%suite + + --%beforeeach + procedure beforeeach; + + --%aftereach + procedure aftereach; + + --%test + --%beforetest(beforetest) + --%aftertest(aftertest) + procedure ut_passing_test; + + procedure beforetest; + + procedure aftertest; + + --%beforeall + procedure beforeall; + --%afterall + procedure afterall; + + end;]'; + execute immediate q'[create or replace package body ut_output_tests + as + + procedure beforetest is + begin + dbms_output.put_line(''); + end; + + procedure aftertest is + begin + dbms_output.put_line(''); + end; + + procedure beforeeach is + begin + dbms_output.put_line(''); + end; + + procedure aftereach is + begin + dbms_output.put_line(''); + end; + + procedure ut_passing_test is + begin + dbms_output.put_line(''); + ut.expect(1,'Test 1 Should Pass').to_equal(1); + end; + + procedure beforeall is + begin + dbms_output.put_line(''); + end; + + procedure afterall is + begin + dbms_output.put_line(''); + end; + + end;]'; + exception when others then + null; + end; + + procedure drop_output_package is + pragma autonomous_transaction; + begin + execute immediate 'drop package ut_output_tests'; + exception when others then + null; + end; + + procedure test_output_gathering is + l_output_data ut3.ut_varchar2_list; + l_output clob; + begin + select * bulk collect into l_output_data + from table(ut3.ut.run('ut_output_tests')); + l_output := ut3.ut_utils.table_to_clob(l_output_data); + ut.expect(l_output).to_be_like( + '%%%%%%%%1 tests, 0 failed, 0 errored%' + ); + end; + + end; / diff --git a/test/core/test_ut_test.pks b/test/core/test_ut_test.pks index de6107326..5ee6e35ce 100644 --- a/test/core/test_ut_test.pks +++ b/test/core/test_ut_test.pks @@ -22,5 +22,71 @@ create or replace package test_ut_test is procedure beforeeach_errors; + --%context(executables in test) + + --%test(Executes aftereach procedure) + procedure after_each_executed; + + --%test(Fails test when aftereach procedure name invalid) + procedure after_each_proc_name_invalid; + --%test(Tails test when aftereach procedure name null) + procedure after_each_procedure_name_null; + + procedure create_app_info_package; + procedure drop_app_info_package; + --%beforetest(create_app_info_package) + --%aftertest(drop_app_info_package) + --%test(Sets application_info on execution of individual items) + procedure application_info_on_execution; + + --%test(Executes beforeeach procedure) + procedure before_each_executed; + --%test(Fails test when beforeeach procedure name invalid) + procedure before_each_proc_name_invalid; + --%test(Fails test when beforeeach procedure name null) + procedure before_each_proc_name_null; + --%test(Does not raise exception when rollback to savepoint fails) + procedure ignore_savepoint_exception; + --%test(Fails when owner name invalid) + procedure owner_name_invalid; + --%test(Runs test as current schema when owner name null) + procedure owner_name_null; + + procedure create_invalid_package; + procedure drop_invalid_package; + --%beforetest(create_app_info_package) + --%aftertest(drop_app_info_package) + --%test(Fails the test that references package with compilation errors) + procedure package_in_invalid_state; + --%test(Fails the test when package name is invalid) + procedure package_name_invalid; + --%test(Fails the test when package name is null) + procedure package_name_null; + --%test(Fails the test when procedure name invalid) + procedure procedure_name_invalid; + --%test(Fails the test when procedure name null) + procedure procedure_name_null; + + + --%test(Executes befroretest procedure) + procedure before_test_executed; + --%test(Fails test when befroretest procedure name invalid) + procedure before_test_proc_name_invalid; + --%test(Fails test when befroretest procedure name is null) + procedure before_test_proc_name_null; + --%test(Executes aftertest procedure) + procedure after_test_executed; + --%test(Fails test when aftertest procedure name invalid) + procedure after_test_proce_name_invalid; + --%test(Fails test when aftertest procedure name is null) + procedure after_test_proc_name_null; + + procedure create_output_package; + procedure drop_output_package; + --%beforetest(create_output_package) + --%aftertest(drop_output_package) + --%test(Test output gathering) + procedure test_output_gathering; + end; / diff --git a/test/helpers/ut_example_tests.pkb b/test/helpers/ut_example_tests.pkb index 5059103b6..d8afd592a 100644 --- a/test/helpers/ut_example_tests.pkb +++ b/test/helpers/ut_example_tests.pkb @@ -16,5 +16,9 @@ as g_number := 1 / 0; end; + procedure ut_commit_test is + begin + commit; + end; end; / diff --git a/test/helpers/ut_example_tests.pks b/test/helpers/ut_example_tests.pks index 7ff75ce12..428d55743 100644 --- a/test/helpers/ut_example_tests.pks +++ b/test/helpers/ut_example_tests.pks @@ -1,8 +1,8 @@ -create or replace package ut_example_tests -as - g_number number; - procedure set_g_number_0; - procedure add_1_to_g_number; - procedure failing_procedure; +create or replace package ut_example_tests as + g_number number; + procedure set_g_number_0; + procedure add_1_to_g_number; + procedure failing_procedure; + procedure ut_commit_test; end; / From 0ee3ce26f5c4567581869d80e73929dcbba5cbac Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 18 Nov 2018 18:42:18 +0000 Subject: [PATCH 0113/1096] Added missing endcontext in `test_ut_test` --- test/core/test_ut_test.pks | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/core/test_ut_test.pks b/test/core/test_ut_test.pks index 5ee6e35ce..ee888ecd3 100644 --- a/test/core/test_ut_test.pks +++ b/test/core/test_ut_test.pks @@ -88,5 +88,7 @@ create or replace package test_ut_test is --%test(Test output gathering) procedure test_output_gathering; + --%endcontext + end; / From 48aa33819d94636b4286c6ca9f589c90ae88bff2 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 18 Nov 2018 19:04:05 +0000 Subject: [PATCH 0114/1096] Removed unused constants. --- source/reporters/ut_ansiconsole_helper.pkb | 2 -- 1 file changed, 2 deletions(-) diff --git a/source/reporters/ut_ansiconsole_helper.pkb b/source/reporters/ut_ansiconsole_helper.pkb index d9c0617e0..07d9ee9a7 100644 --- a/source/reporters/ut_ansiconsole_helper.pkb +++ b/source/reporters/ut_ansiconsole_helper.pkb @@ -18,8 +18,6 @@ create or replace package body ut_ansiconsole_helper as gc_red constant varchar2(7) := chr(27) || '[31m'; gc_green constant varchar2(7) := chr(27) || '[32m'; gc_yellow constant varchar2(7) := chr(27) || '[33m'; - gc_blue constant varchar2(7) := chr(27) || '[34m'; - gc_magenta constant varchar2(7) := chr(27) || '[35m'; gc_cyan constant varchar2(7) := chr(27) || '[36m'; gc_reset constant varchar2(7) := chr(27) || '[0m'; g_enabled boolean := false; From b33aaaee70db13038760f8401c101767b80e2309 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 18 Nov 2018 20:41:28 +0000 Subject: [PATCH 0115/1096] Added additional test for display of parser warnings. Fixed issue with warnings not getting shown. --- source/core/ut_suite_manager.pkb | 201 ++++++++++++++++--------------- test/api/test_ut_run.pkb | 42 ++++++- test/api/test_ut_run.pks | 6 + 3 files changed, 148 insertions(+), 101 deletions(-) diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 19862992d..3c2c713eb 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -174,91 +174,112 @@ create or replace package body ut_suite_manager is a_level pls_integer, a_prev_level pls_integer, a_items_at_level t_item_levels - ) return ut_logical_suite is + ) return ut_suite_item is + l_result ut_suite_item; begin - return case a_rows( a_idx ).self_type when 'UT_SUITE' then - case when a_prev_level > a_level then - ut_suite( - self_type => a_rows( a_idx ).self_type, - object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), - name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, - rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, - line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, - start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, - results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), - items => a_items_at_level(a_prev_level), - before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( - a_rows( a_idx ).after_all_list) - ) - else - ut_suite( - self_type => a_rows( a_idx ).self_type, - object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), - name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, - rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, - line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, - start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, - results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), - items => ut_suite_items(), - before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( - a_rows( a_idx ).after_all_list) - ) - end + l_result := + case when a_prev_level > a_level then + ut_suite( + self_type => a_rows( a_idx ).self_type, + object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), + name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, + rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, + line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, + start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, + results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), + items => a_items_at_level(a_prev_level), + before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( + a_rows( a_idx ).after_all_list) + ) + else + ut_suite( + self_type => a_rows( a_idx ).self_type, + object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), + name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, + rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, + line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, + start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, + results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), + items => ut_suite_items(), + before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( + a_rows( a_idx ).after_all_list) + ) + end; when 'UT_SUITE_CONTEXT' then - case when a_prev_level > a_level then - ut_suite_context( - self_type => a_rows( a_idx ).self_type, - object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), - name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, - rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, - line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, - start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, - results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), - items => a_items_at_level(a_prev_level), - before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( - a_rows( a_idx ).after_all_list) - ) - else - ut_suite_context( - self_type => a_rows( a_idx ).self_type, - object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), - name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, - rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, - line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, - start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, - results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), - items => ut_suite_items(), - before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( - a_rows( a_idx ).after_all_list) - ) - end + l_result := + case when a_prev_level > a_level then + ut_suite_context( + self_type => a_rows( a_idx ).self_type, + object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), + name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, + rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, + line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, + start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, + results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), + items => a_items_at_level(a_prev_level), + before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( + a_rows( a_idx ).after_all_list) + ) + else + ut_suite_context( + self_type => a_rows( a_idx ).self_type, + object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), + name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, + rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, + line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, + start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, + results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), + items => ut_suite_items(), + before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( + a_rows( a_idx ).after_all_list) + ) + end; when 'UT_LOGICAL_SUITE' then - case when a_prev_level > a_level then - ut_logical_suite( - self_type => a_rows( a_idx ).self_type, - object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), - name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, - rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, - line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, - start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, - results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), - items => a_items_at_level(a_prev_level) - ) - else - ut_logical_suite( - self_type => a_rows( a_idx ).self_type, - object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), - name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, - rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, - line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, - start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, + l_result := + case when a_prev_level > a_level then + ut_logical_suite( + self_type => a_rows( a_idx ).self_type, + object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), + name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, + rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, + line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, + start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, + results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), + items => a_items_at_level(a_prev_level) + ) + else + ut_logical_suite( + self_type => a_rows( a_idx ).self_type, + object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), + name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, + rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, + line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, + start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, + results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), + items => ut_suite_items() + ) + end; + when 'UT_TEST' then + l_result := + ut_test( + self_type => a_rows(a_idx).self_type, + object_owner => a_rows(a_idx).object_owner, object_name => lower(a_rows(a_idx).object_name), + name => lower(a_rows(a_idx).name), description => a_rows(a_idx).description, path => a_rows(a_idx).path, + rollback_type => a_rows(a_idx).rollback_type, disabled_flag => a_rows(a_idx).disabled_flag, + line_no => a_rows(a_idx).line_no, parse_time => a_rows(a_idx).parse_time, + start_time => null, end_time => null, result => null, warnings => a_rows(a_idx).warnings, results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), - items => ut_suite_items() - ) - end - end; + before_each_list => sort_by_seq_no(a_rows(a_idx).before_each_list), before_test_list => sort_by_seq_no(a_rows(a_idx).before_test_list), + item => a_rows(a_idx).item, + after_test_list => sort_by_seq_no(a_rows(a_idx).after_test_list), after_each_list => sort_by_seq_no(a_rows(a_idx).after_each_list), + all_expectations => ut_expectation_results(), failed_expectations => ut_expectation_results(), + parent_error_stack_trace => null, expected_error_codes => a_rows(a_idx).expected_error_codes + ); + end case; + l_result.results_count.warnings_count := l_result.warnings.count; + return l_result; end; procedure reconstruct_from_cache( @@ -283,26 +304,8 @@ create or replace package body ut_suite_manager is l_items_at_level(l_level) := ut_suite_items(); end if; l_items_at_level(l_level).extend; - if l_rows(l_idx).self_type = 'UT_TEST' then - l_items_at_level(l_level)(l_items_at_level(l_level).last) := - ut_test( - self_type => l_rows(l_idx).self_type, - object_owner => l_rows(l_idx).object_owner, object_name => lower(l_rows(l_idx).object_name), - name => lower(l_rows(l_idx).name), description => l_rows(l_idx).description, path => l_rows(l_idx).path, - rollback_type => l_rows(l_idx).rollback_type, disabled_flag => l_rows(l_idx).disabled_flag, - line_no => l_rows(l_idx).line_no, parse_time => l_rows(l_idx).parse_time, - start_time => null, end_time => null, result => null, warnings => l_rows(l_idx).warnings, - results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), - before_each_list => sort_by_seq_no(l_rows(l_idx).before_each_list), before_test_list => sort_by_seq_no(l_rows(l_idx).before_test_list), - item => l_rows(l_idx).item, - after_test_list => sort_by_seq_no(l_rows(l_idx).after_test_list), after_each_list => sort_by_seq_no(l_rows(l_idx).after_each_list), - all_expectations => ut_expectation_results(), failed_expectations => ut_expectation_results(), - parent_error_stack_trace => null, expected_error_codes => l_rows(l_idx).expected_error_codes - ); - else - pragma inline(get_logical_suite, 'YES'); - l_items_at_level(l_level)(l_items_at_level(l_level).last) := get_logical_suite(l_rows, l_idx, l_level,l_prev_level, l_items_at_level ); - end if; + pragma inline(get_logical_suite, 'YES'); + l_items_at_level(l_level)(l_items_at_level(l_level).last) := get_logical_suite(l_rows, l_idx, l_level,l_prev_level, l_items_at_level ); else a_suites.extend; pragma inline(get_logical_suite, 'YES'); diff --git a/test/api/test_ut_run.pkb b/test/api/test_ut_run.pkb index ecf123d5e..c52551b33 100644 --- a/test/api/test_ut_run.pkb +++ b/test/api/test_ut_run.pkb @@ -806,7 +806,45 @@ Failures:% begin execute immediate 'drop package invalid_pckag_that_revalidates'; execute immediate 'drop package parent_specs'; - end; - + end; + + procedure run_and_report_warnings is + l_results ut3.ut_varchar2_list; + l_actual clob; + begin + + select * bulk collect into l_results from table(ut3.ut.run('bad_annotations')); + l_actual := ut3.ut_utils.table_to_clob(l_results); + + ut.expect(l_actual).to_be_like('%Invalid annotation "--%context". Cannot find following "--%endcontext". Annotation ignored.% +%1 tests, 0 failed, 0 errored, 0 disabled, 1 warning(s)%'); + + end; + + procedure create_bad_annot is + pragma autonomous_transaction; + begin + execute immediate q'[ + create or replace package bad_annotations as + --%suite + + --%context + + --%test(invalidspecs) + procedure test1; + + end;]'; + + execute immediate q'[ + create or replace package body bad_annotations as + procedure test1 is begin ut.expect(1).to_equal(1); end; + end;]'; + + end; + procedure drop_bad_annot is + pragma autonomous_transaction; + begin + execute immediate 'drop package bad_annotations'; + end; end; / diff --git a/test/api/test_ut_run.pks b/test/api/test_ut_run.pks index 81eb801a3..2ed325b86 100644 --- a/test/api/test_ut_run.pks +++ b/test/api/test_ut_run.pks @@ -114,6 +114,12 @@ create or replace package test_ut_run is procedure generate_invalid_spec; procedure drop_invalid_spec; + --%test(Provides warnings on invalid annotations) + --%beforetest(create_bad_annot) + --%aftertest(drop_bad_annot) + procedure run_and_report_warnings; + procedure create_bad_annot; + procedure drop_bad_annot; --%endcontext end; From 1e5681b5e79fbd1bd8eb21006d8907237cbe80f2 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sun, 18 Nov 2018 21:43:10 +0000 Subject: [PATCH 0116/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index b35bc3302..f4b59da5a 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.3.2365-develop'; + gc_version constant varchar2(50) := 'v3.1.3.2389-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From 5bb077d3ea1bebdc44dbea5883e27ee1b95062e2 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sun, 18 Nov 2018 22:06:38 +0000 Subject: [PATCH 0117/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index f4b59da5a..195b2b6cb 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.3.2389-develop'; + gc_version constant varchar2(50) := 'v3.1.3.2390-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From 6726f1a1d0aa0136a99a49bc0dd45728c1aa7bf8 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sun, 18 Nov 2018 22:22:41 +0000 Subject: [PATCH 0118/1096] Saving progress --- .../data_values/ut_compound_data_helper.pkb | 94 ++++++++++---- .../data_values/ut_compound_data_helper.pks | 15 ++- .../data_values/ut_compound_data_value.tpb | 19 +-- .../data_values/ut_compound_data_value.tps | 5 +- .../ut_curr_usr_compound_helper.pkb | 9 +- .../ut_curr_usr_compound_helper.pks | 3 +- .../data_values/ut_cursor_column.tpb | 9 +- .../data_values/ut_cursor_column.tps | 2 +- .../data_values/ut_cursor_details.tpb | 122 ++++++++++-------- .../data_values/ut_cursor_details.tps | 1 + .../data_values/ut_data_value_refcursor.tpb | 36 +++--- .../data_values/ut_data_value_refcursor.tps | 5 +- source/expectations/matchers/ut_equal.tpb | 18 ++- source/expectations/matchers/ut_equal.tps | 1 + source/expectations/matchers/ut_include.tpb | 6 +- source/expectations/ut_expectation.tpb | 1 - .../expectations/test_expectations_cursor.pkb | 76 +++++++++-- .../expectations/test_expectations_cursor.pks | 8 +- 18 files changed, 279 insertions(+), 151 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 8a7b02079..69eca4f3d 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -184,9 +184,7 @@ create or replace package body ut_compound_data_helper is l_act_col_filter := get_columns_row_filter(a_exclude_xpath,a_include_xpath,'ucd','act_item_data'); l_exp_col_filter := get_columns_row_filter(a_exclude_xpath,a_include_xpath,'ucd','exp_item_data'); - --TODO: Generate SQL based on input as unorder join should aggregate - - l_sql := q'[with exp as ( + l_sql := q'[with exp as ( select exp_item_data, exp_data_id, item_no rn,rownum col_no, nvl2(exp_item_data,ut3.ut_compound_data_helper.get_pk_value(i.join_by,exp_item_data),null) pk_value, s.column_value col, s.column_value.getRootElement() col_name, s.column_value.getclobval() col_val @@ -366,6 +364,11 @@ create or replace package body ut_compound_data_helper is return dbms_crypto.hash(a_data, a_hash_type); end; + function get_fixed_size_hash(a_string varchar2, a_base integer :=0,a_size integer :=30) return number is + begin + return dbms_utility.get_hash_value(a_string,a_base,a_size); + end; + function columns_hash( a_data_value_cursor ut_data_value_refcursor, a_exclude_xpath varchar2, a_include_xpath varchar2, a_hash_type binary_integer := dbms_crypto.hash_sh1 @@ -435,10 +438,10 @@ create or replace package body ut_compound_data_helper is l_index := l_pk_tab.first; if l_pk_tab.count > 0 then loop - if a_data_info.column_name = l_pk_tab(l_index) then + if a_data_info.access_path = l_pk_tab(l_index) then l_exists := true; end if; - exit when l_index = l_pk_tab.count or (a_data_info.column_name = l_pk_tab(l_index)); + exit when l_index = l_pk_tab.count or (a_data_info.access_path = l_pk_tab(l_index)); l_index := a_pk_table.next(l_index); end loop; end if; @@ -459,12 +462,12 @@ create or replace package body ut_compound_data_helper is if l_pk_tab.count <> 0 then l_index:= l_pk_tab.first; loop - if a_data_info.column_name = a_pk_table(l_index) then - l_sql_stmt := l_sql_stmt || case when a_join_by_stmt is null then null else ' and ' end; + if a_data_info.access_path = l_pk_tab(l_index) then + l_sql_stmt := case when a_join_by_stmt is null then null else ' and ' end; l_sql_stmt := l_sql_stmt ||' a.'||a_col_name||q'[ = ]'||' e.'||a_col_name; end if; - exit when (a_data_info.column_name = a_pk_table(l_index)) or l_index = a_pk_table.count; - l_index := a_pk_table.next(l_index); + exit when (a_data_info.access_path = l_pk_tab(l_index)) or l_index = l_pk_tab.count; + l_index := l_pk_tab.next(l_index); end loop; ut_utils.append_to_clob(a_join_by_stmt,l_sql_stmt); end if; @@ -477,10 +480,26 @@ create or replace package body ut_compound_data_helper is ut_utils.append_to_clob(a_equal_stmt,l_sql_stmt); end; - procedure generate_partition_stmt(a_partition_stmt in out nocopy clob,a_col_name in varchar2) is + procedure generate_partition_stmt(a_data_info ut_cursor_column, a_partition_stmt in out nocopy clob,a_pk_table in ut_varchar2_list,a_col_name in varchar2) is l_alias varchar2(10) := 'ucd.'; + l_pk_tab ut_varchar2_list := coalesce(a_pk_table,ut_varchar2_list()); + l_index integer; + l_sql_stmt varchar2(32767); begin - ut_utils.append_to_clob(a_partition_stmt,case when a_partition_stmt is null then null else ',' end||l_alias||a_col_name); + if l_pk_tab.count <> 0 then + l_index:= l_pk_tab.first; + loop + if a_data_info.access_path = l_pk_tab(l_index) then + l_sql_stmt := case when a_partition_stmt is null then null else ',' end; + l_sql_stmt := l_sql_stmt ||l_alias||a_col_name; + end if; + exit when (a_data_info.access_path = l_pk_tab(l_index)) or l_index = l_pk_tab.count; + l_index := l_pk_tab.next(l_index); + end loop; + else + l_sql_stmt := case when a_partition_stmt is null then null else ',' end ||l_alias||a_col_name; + end if; + ut_utils.append_to_clob(a_partition_stmt,l_sql_stmt); end; procedure generate_select_stmt(a_data_info ut_cursor_column,a_sql_stmt in out nocopy clob, a_col_name varchar2) is @@ -506,7 +525,7 @@ create or replace package body ut_compound_data_helper is elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type = 'DATE' then l_col_type := 'TIMESTAMP'; else - l_col_type := a_data_info.column_type||'('||a_data_info.column_len||')'; + l_col_type := a_data_info.column_type||case when a_data_info.column_len is not null then '('||a_data_info.column_len||')' else null end; end if; l_sql_stmt := ' '||a_col_name||' '||l_col_type||q'[ PATH ']'||a_data_info.access_path||q'[',]'; ut_utils.append_to_clob(a_sql_stmt, l_sql_stmt); @@ -517,30 +536,32 @@ create or replace package body ut_compound_data_helper is a_not_equal_stmt out nocopy clob) is l_cursor_info ut_cursor_column_tab := a_data_info.cursor_details.cursor_info; l_partition_tmp clob; - l_col_name varchar2(30); + l_col_name varchar2(100); begin if l_cursor_info is not null then - --Parition by piece + --Parition by piece + --TODO : Collection is intersting exmaple that we probably has to extract full xml and hash it. ut_utils.append_to_clob(a_partition_stmt,', row_number() over (partition by '); - --TODO : Handle nested objects... for i in 1..l_cursor_info.count loop + if l_cursor_info(i).is_user_defined = 0 then l_col_name := case when l_cursor_info(i).parent_name is null then l_cursor_info(i).xml_valid_name else - utl_raw.cast_to_varchar2(l_cursor_info(i).nested_name) + l_cursor_info(i).nested_name end; --Get XMLTABLE column list generate_xmltab_stmt(l_cursor_info(i),a_xml_stmt,l_col_name); --Get Select statment list of columns generate_select_stmt(l_cursor_info(i),a_select_stmt,l_col_name); --Get columns by which we partition - generate_partition_stmt(l_partition_tmp,l_col_name); + generate_partition_stmt(l_cursor_info(i),l_partition_tmp,a_pk_table,l_col_name); --Get equal statement generate_equal_sql(a_equal_stmt,l_col_name); --Generate join by stmt generate_join_by_stmt(l_cursor_info(i),a_pk_table,a_join_by_stmt,l_col_name); --Generate not equal stmt generate_not_equal_stmt(l_cursor_info(i),a_pk_table,a_not_equal_stmt,l_col_name); + end if; end loop; --Finish parition by ut_utils.append_to_clob(a_partition_stmt,l_partition_tmp||' order by '||l_partition_tmp||' ) dup_no '); @@ -550,9 +571,8 @@ create or replace package body ut_compound_data_helper is end if; end; - function gen_compare_sql(a_column_info xmltype, a_exclude_xpath varchar2, a_include_xpath varchar2, - a_join_by_xpath varchar2, a_inclusion_type boolean, a_is_negated boolean, - a_unordered boolean, a_other ut_data_value_refcursor :=null, a_join_by_list ut_varchar2_list:=null ) return clob is + function gen_compare_sql(a_column_info xmltype,a_inclusion_type boolean, a_is_negated boolean,a_unordered boolean, + a_other ut_data_value_refcursor :=null, a_join_by_list ut_varchar2_list:=ut_varchar2_list() ) return clob is l_compare_sql clob; l_temp_string varchar2(32767); @@ -638,10 +658,10 @@ create or replace package body ut_compound_data_helper is ut_utils.append_to_clob(l_compare_sql,' e.dup_no = a.dup_no and '); end if; - if a_join_by_xpath is null and a_unordered then + if (a_join_by_list.count = 0) and a_unordered then -- If no key defined do the join on all columns ut_utils.append_to_clob(l_compare_sql,l_equal_stmt); - elsif a_join_by_xpath is not null and a_unordered then + elsif (a_join_by_list.count > 0) and a_unordered then -- If key defined do the join or these and where on diffrences ut_utils.append_to_clob(l_compare_sql,l_join_on_stmt); elsif not a_unordered then @@ -650,7 +670,7 @@ create or replace package body ut_compound_data_helper is ut_utils.append_to_clob(l_compare_sql,' ) where '); - if (a_join_by_xpath is not null) and (a_unordered) and (not a_is_negated) then + if (a_join_by_list.count > 0) and (a_unordered) and (not a_is_negated) then if l_not_equal_stmt is not null then ut_utils.append_to_clob(l_compare_sql,' ( '||l_not_equal_stmt||' ) or '); end if; @@ -663,6 +683,8 @@ create or replace package body ut_compound_data_helper is --If its inlcusion we expect a actual set to fully match and have no extra elements over expected if a_inclusion_type and not(a_is_negated) then l_temp_string := ' ( a.data_id is null ) '; + elsif a_inclusion_type and a_is_negated then + l_temp_string := ' 1 = 1 '; else l_temp_string := ' (a.data_id is null or e.data_id is null) '; end if; @@ -699,9 +721,8 @@ create or replace package body ut_compound_data_helper is return g_diff_count; end; - function filter_out_cols(a_cursor_info ut_cursor_column_tab, a_current_list ut_varchar2_list,a_include boolean) - return ut_cursor_column_tab is - l_sql varchar2(32767) := + function get_cursor_vs_list_sql return varchar2 is + l_sql varchar2(32767) := q'[with sorted as (select r_num,regexp_substr(t.column_value, '[^/]+', 1, commas.column_value) as colval,commas.column_value lev @@ -721,10 +742,15 @@ create or replace package body ut_compound_data_helper is i.hierarchy_level,i.column_position, i.column_type) from t1 join table(:a_cursor_info) i on ( nvl(t1.parent_name,1) = nvl(i.parent_name,1) and t1.column_name = i.column_name) ]'; + begin + return l_sql; + end; + function filter_out_cols(a_cursor_info ut_cursor_column_tab, a_current_list ut_varchar2_list,a_include boolean := true) + return ut_cursor_column_tab is + l_sql varchar2(32767) := get_cursor_vs_list_sql; l_result ut_cursor_column_tab := ut_cursor_column_tab(); begin - --TODO : Get this query tidy up if a_include then l_sql := l_sql || ' join constructed c on ( nvl(t1.parent_name,1) = nvl(c.parent_name,1) and t1.column_name = c.column_name)'; else @@ -738,6 +764,20 @@ create or replace package body ut_compound_data_helper is return l_result; end; + function compare_cursor_to_columns(a_cursor_info ut_cursor_column_tab, a_current_list ut_varchar2_list) + return ut_cursor_column_tab is + l_sql varchar2(32767) := get_cursor_vs_list_sql; + l_result ut_cursor_column_tab := ut_cursor_column_tab(); + begin + l_sql := l_sql ||'right outer join constructed c on ( nvl(t1.parent_name,1) = nvl(c.parent_name,1) and t1.column_name = c.column_name) + where t1.column_name is null'; + + execute immediate l_sql bulk collect into l_result + using a_current_list,a_cursor_info,a_cursor_info,a_cursor_info; + return l_result; + end; + + function inc_exc_columns_from_cursor (a_cursor_info ut_cursor_column_tab, a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) return ut_cursor_column_tab is l_filtered_set ut_varchar2_list := ut_varchar2_list(); diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 98913531e..09781225d 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -71,7 +71,6 @@ create or replace package ut_compound_data_helper authid definer is function get_pk_value (a_join_by_xpath varchar2,a_item_data xmltype) return clob; - --TODO : Can this be done better ?? function get_rows_diff( a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2, @@ -82,6 +81,9 @@ create or replace package ut_compound_data_helper authid definer is function get_hash(a_data raw, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash; function get_hash(a_data clob, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash; + + function get_fixed_size_hash(a_string varchar2, a_base integer :=0,a_size integer :=30) return number; + function columns_hash( a_data_value_cursor ut_data_value_refcursor, a_exclude_xpath varchar2, a_include_xpath varchar2, a_hash_type binary_integer := dbms_crypto.hash_sh1 @@ -90,9 +92,8 @@ create or replace package ut_compound_data_helper authid definer is function is_pk_exists(a_expected_cursor xmltype, a_actual_cursor xmltype, a_exclude_xpath varchar2, a_include_xpath varchar2,a_join_by_xpath varchar2) return tt_missing_pk; - function gen_compare_sql(a_column_info xmltype, a_exclude_xpath varchar2, a_include_xpath varchar2, - a_join_by_xpath varchar2, a_inclusion_type boolean, a_is_negated boolean, - a_unordered boolean, a_other ut_data_value_refcursor :=null, a_join_by_list ut_varchar2_list:=null ) return clob; + function gen_compare_sql(a_column_info xmltype, a_inclusion_type boolean, a_is_negated boolean, a_unordered boolean, + a_other ut_data_value_refcursor :=null, a_join_by_list ut_varchar2_list:=ut_varchar2_list() ) return clob; procedure insert_diffs_result(a_diff_tab t_diff_tab, a_diff_id raw); @@ -102,6 +103,12 @@ create or replace package ut_compound_data_helper authid definer is function get_rows_diff_count return integer; + function filter_out_cols(a_cursor_info ut_cursor_column_tab, a_current_list ut_varchar2_list,a_include boolean := true) + return ut_cursor_column_tab; + + function compare_cursor_to_columns(a_cursor_info ut_cursor_column_tab, a_current_list ut_varchar2_list) + return ut_cursor_column_tab; + function inc_exc_columns_from_cursor (a_cursor_info ut_cursor_column_tab, a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) return ut_cursor_column_tab; diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index 9b37dd8ea..b1d126df1 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -120,7 +120,7 @@ create or replace type body ut_compound_data_value as -- First tell how many rows are different l_diff_row_count := ut_compound_data_helper.get_rows_diff_count; - + --TODO : Change message when the types not matching if l_diff_row_count > 0 then l_row_diffs := ut_compound_data_helper.get_rows_diff( self.data_id, l_actual.data_id, l_diff_id, c_max_rows, a_exclude_xpath, @@ -200,9 +200,8 @@ create or replace type body ut_compound_data_value as return l_result; end; - member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, - a_join_by_xpath varchar2,a_unordered boolean, a_inclusion_compare boolean := false, - a_is_negated boolean := false, a_join_by_list ut_varchar2_list:=null ) return integer is + member function compare_implementation(a_other ut_data_value, a_unordered boolean, a_inclusion_compare boolean, + a_is_negated boolean, a_join_by_list ut_varchar2_list:=ut_varchar2_list()) return integer is l_diff_id ut_compound_data_helper.t_hash; l_other ut_compound_data_value; @@ -215,15 +214,13 @@ create or replace type body ut_compound_data_value as l_sql_rowcount integer :=0; begin - --TODO : Error on xml when same column is more then once in item data xml.Do we need to cleanup ?? --TODO : Bring diffs row into same place for ref data cursor especially (how we going to do that so we dont break anyval etc) - --TODO : Test binary xml storage (didnt seems to make a diffrence, docker and datafiles layer ??) l_other := treat(a_other as ut_compound_data_value); l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); - open l_loop_curs for ut_compound_data_helper.gen_compare_sql(treat(a_other as ut_data_value_refcursor).col_info_desc, a_exclude_xpath, - a_include_xpath, a_join_by_xpath, a_inclusion_compare, a_is_negated, a_unordered, - treat(a_other as ut_data_value_refcursor), a_join_by_list ) using self.data_id,l_other.data_id; + open l_loop_curs for ut_compound_data_helper.gen_compare_sql(treat(a_other as ut_data_value_refcursor).col_info_desc, + a_inclusion_compare, a_is_negated, a_unordered, treat(a_other as ut_data_value_refcursor), + a_join_by_list ) using self.data_id,l_other.data_id; loop fetch l_loop_curs bulk collect into l_diff_tab limit l_max_rows; exit when l_diff_tab.count = 0; @@ -232,19 +229,17 @@ create or replace type body ut_compound_data_value as end if; l_sql_rowcount := l_sql_rowcount + l_diff_tab.count; - if (ut_utils.gc_diff_max_rows <= l_sql_rowcount and l_max_rows != ut_utils.gc_bc_fetch_limit ) then l_max_rows := ut_utils.gc_bc_fetch_limit; end if; end loop; - --result is OK only if both are same + --result is OK only if both are same if l_sql_rowcount = 0 and ( self.elements_count = l_other.elements_count or a_inclusion_compare )then l_result := 0; else ut_compound_data_helper.set_rows_diff(l_sql_rowcount); l_result := 1; end if; - return l_result; end; diff --git a/source/expectations/data_values/ut_compound_data_value.tps b/source/expectations/data_values/ut_compound_data_value.tps index ce14c494e..771a2f3d2 100644 --- a/source/expectations/data_values/ut_compound_data_value.tps +++ b/source/expectations/data_values/ut_compound_data_value.tps @@ -44,8 +44,7 @@ create or replace type ut_compound_data_value force under ut_data_value( overriding member function diff( a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean := false ) return varchar2, member function get_data_diff(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean) return clob, member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2) return integer, - member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, - a_join_by_xpath varchar2, a_unordered boolean, a_inclusion_compare boolean := false, - a_is_negated boolean := false, a_join_by_list ut_varchar2_list:=null ) return integer + member function compare_implementation(a_other ut_data_value, a_unordered boolean, a_inclusion_compare boolean, + a_is_negated boolean, a_join_by_list ut_varchar2_list:=ut_varchar2_list() ) return integer ) not final not instantiable / diff --git a/source/expectations/data_values/ut_curr_usr_compound_helper.pkb b/source/expectations/data_values/ut_curr_usr_compound_helper.pkb index 15f764062..c12162593 100644 --- a/source/expectations/data_values/ut_curr_usr_compound_helper.pkb +++ b/source/expectations/data_values/ut_curr_usr_compound_helper.pkb @@ -18,7 +18,6 @@ create or replace package body ut_curr_usr_compound_helper is function is_sql_compare_allowed(a_type_name varchar2) return boolean is begin --clob/blob/xmltype/object/nestedcursor/nestedtable - if a_type_name IN (g_type_name_map(dbms_sql.blob_type), g_type_name_map(dbms_sql.clob_type), g_type_name_map(dbms_sql.bfile_type)) @@ -53,7 +52,6 @@ create or replace package body ut_curr_usr_compound_helper is l_result ut_key_anyval_pair; l_data_type varchar2(500) := 'unknown datatype'; - --TODO: Review the types in and resolving begin if g_type_name_map.exists(a_desc_rec.col_type) then @@ -245,9 +243,9 @@ create or replace package body ut_curr_usr_compound_helper is return l_result ; end; - function get_column_type(a_type_code in integer, a_dbms_sql_desc in boolean) return varchar2 is + function get_column_type_desc(a_type_code in integer, a_dbms_sql_desc in boolean) return varchar2 is begin - return case when not a_dbms_sql_desc then g_anytype_name_map(a_type_code) else g_type_name_map(a_type_code) end; + return case when a_dbms_sql_desc then g_type_name_map(a_type_code) else g_anytype_name_map(a_type_code) end; end; begin @@ -296,6 +294,9 @@ create or replace package body ut_curr_usr_compound_helper is g_type_name_map( dbms_sql.number_type ) := 'NUMBER'; g_type_name_map( dbms_sql.rowid_type ) := 'ROWID'; g_type_name_map( dbms_sql.urowid_type ) := 'UROWID'; + g_type_name_map( dbms_sql.user_defined_type ) := 'USER_DEFINED_TYPE'; + g_type_name_map( dbms_sql.ref_type ) := 'REF_TYPE'; + end; / diff --git a/source/expectations/data_values/ut_curr_usr_compound_helper.pks b/source/expectations/data_values/ut_curr_usr_compound_helper.pks index 46404b93c..eb70963ca 100644 --- a/source/expectations/data_values/ut_curr_usr_compound_helper.pks +++ b/source/expectations/data_values/ut_curr_usr_compound_helper.pks @@ -6,6 +6,7 @@ create or replace package ut_curr_usr_compound_helper authid current_user is function is_collection (a_owner varchar2,a_type_name varchar2) return boolean; + --TODO Depracate once switch fully to type procedure get_columns_info( a_cursor in out nocopy sys_refcursor, a_columns_info out nocopy xmltype, @@ -17,7 +18,7 @@ create or replace package ut_curr_usr_compound_helper authid current_user is function extract_min_col_info(a_full_col_info xmltype) return xmltype; - function get_column_type(a_type_code in integer, a_dbms_sql_desc in boolean) return varchar2; + function get_column_type_desc(a_type_code in integer, a_dbms_sql_desc in boolean) return varchar2; end; / diff --git a/source/expectations/data_values/ut_cursor_column.tpb b/source/expectations/data_values/ut_cursor_column.tpb index dbf37b518..e266f818d 100644 --- a/source/expectations/data_values/ut_cursor_column.tpb +++ b/source/expectations/data_values/ut_cursor_column.tpb @@ -6,10 +6,9 @@ create or replace type body ut_cursor_column as a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level number := 1, a_col_position number, a_col_type varchar2) is begin - self.parent_name := null; + self.parent_name := a_parent_name; self.hierarchy_level := a_hierarchy_level; self.column_position := a_col_position; - self.is_user_defined := 0; self.column_prec := a_col_prec; self.column_len := a_col_max_len; self.column_scale := a_col_scale; @@ -19,13 +18,15 @@ create or replace type body ut_cursor_column as self.nested_name := case when self.parent_name is null then null else - ut_compound_data_helper.get_hash(utl_raw.cast_to_raw(self.parent_name||'/'||self.column_name)) + '"'||ut_compound_data_helper.get_fixed_size_hash(self.parent_name||self.column_name)||'"' end; self.xml_valid_name := '"'||self.column_name||'"'; self.column_type := a_col_type; self.column_schema := a_col_schema_name; self.is_sql_diffable := ut_utils.boolean_to_int(ut_curr_usr_compound_helper.is_sql_compare_allowed(self.column_type)); - self.is_collection := 0; + self.is_collection := ut_utils.boolean_to_int(ut_curr_usr_compound_helper.is_collection(a_col_schema_name,a_col_type_name)); + --TODO : fix that as is nasty hardcode + self.is_user_defined := case when lower(self.column_type) = 'user_defined_type' then 1 else 0 end; end; constructor function ut_cursor_column( self in out nocopy ut_cursor_column, diff --git a/source/expectations/data_values/ut_cursor_column.tps b/source/expectations/data_values/ut_cursor_column.tps index 0602b1ceb..dcd352377 100644 --- a/source/expectations/data_values/ut_cursor_column.tps +++ b/source/expectations/data_values/ut_cursor_column.tps @@ -2,7 +2,7 @@ create or replace type ut_cursor_column force authid current_user as object ( parent_name varchar2(100), access_path varchar2(500), - nested_name raw(30), + nested_name varchar2(32), hierarchy_level number, column_position number, xml_valid_name varchar2(100), diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb index 2d0b5a67f..016fd2ac5 100644 --- a/source/expectations/data_values/ut_cursor_details.tpb +++ b/source/expectations/data_values/ut_cursor_details.tpb @@ -1,65 +1,75 @@ create or replace type body ut_cursor_details as - member function get_anytype_attribute_count(a_anytype anytype) return pls_integer is - l_attribute_typecode pls_integer; - l_schema_name varchar2(32767); - l_version varchar2(32767); - l_type_name varchar2(32767); - l_attributes pls_integer; - l_prec pls_integer; - l_scale pls_integer; - l_len pls_integer; - l_csid pls_integer; - l_csfrm pls_integer; - begin - l_attribute_typecode := a_anytype.getinfo(prec => l_prec, - scale => l_scale, - len => l_len, - csid => l_csid, - csfrm => l_csfrm, - schema_name => l_schema_name, - type_name => l_type_name, - version => l_version, - numelems => l_attributes); - return l_attributes; - end; + order member function compare(a_other ut_cursor_details) return integer is + l_diffs integer; + begin + select count(1) into l_diffs + from table(self.cursor_info) a full outer join table(a_other.cursor_info) e + on ( decode(a.parent_name,e.parent_name,1,0)= 1 and a.column_name = e.column_name and + REPLACE(a.column_type,'VARCHAR','CHAR') = REPLACE(e.column_type,'VARCHAR','CHAR') + and a.column_position = e.column_position ) + where a.column_name is null or e.column_name is null; + return l_diffs; + end; + + member function get_anytype_attribute_count(a_anytype anytype) return pls_integer is + l_attribute_typecode pls_integer; + l_schema_name varchar2(32767); + l_version varchar2(32767); + l_type_name varchar2(32767); + l_attributes pls_integer; + l_prec pls_integer; + l_scale pls_integer; + l_len pls_integer; + l_csid pls_integer; + l_csfrm pls_integer; + begin + l_attribute_typecode := a_anytype.getinfo(prec => l_prec, + scale => l_scale, + len => l_len, + csid => l_csid, + csfrm => l_csfrm, + schema_name => l_schema_name, + type_name => l_type_name, + version => l_version, + numelems => l_attributes); + return l_attributes; + end; member function get_user_defined_type(a_owner varchar2, a_type_name varchar2) - return anytype is - l_anydata anydata; - l_anytype anytype; - l_typecode pls_integer; - - begin - execute immediate 'declare - l_v ' || a_owner || '.' || - a_type_name || '; + return anytype is + l_anydata anydata; + l_anytype anytype; + l_typecode pls_integer; + begin + execute immediate 'declare + l_v ' || a_owner || '.' || + a_type_name || '; begin :anydata := anydata.convertobject(l_v); end;' - using in out l_anydata; + using in out l_anydata; - l_typecode := l_anydata.gettype(l_anytype); + l_typecode := l_anydata.gettype(l_anytype); - return l_anytype; - end; + return l_anytype; + end; constructor function ut_cursor_details(self in out nocopy ut_cursor_details, a_cursor in out nocopy sys_refcursor) - return self as result is - l_cursor_number integer; - l_columns_count pls_integer; - l_columns_desc dbms_sql.desc_tab3; - l_attribute_typecode pls_integer; - l_aname varchar2(32767); - l_prec pls_integer; - l_scale pls_integer; - l_len pls_integer; - l_csid pls_integer; - l_csfrm pls_integer; - l_attr_elt_type anytype; - l_anytype anytype; - + return self as result is + l_cursor_number integer; + l_columns_count pls_integer; + l_columns_desc dbms_sql.desc_tab3; + l_attribute_typecode pls_integer; + l_aname varchar2(32767); + l_prec pls_integer; + l_scale pls_integer; + l_len pls_integer; + l_csid pls_integer; + l_csfrm pls_integer; + l_attr_elt_type anytype; + l_anytype anytype; begin self.cursor_info := ut_cursor_column_tab(); l_cursor_number := dbms_sql.to_cursor_number(a_cursor); @@ -79,9 +89,11 @@ create or replace type body ut_cursor_details as null, 1, cur, - ut_curr_usr_compound_helper.get_column_type(l_columns_desc(cur).col_type,false) - ); - if l_columns_desc(cur).col_type = dbms_sql.user_defined_type then + ut_curr_usr_compound_helper.get_column_type_desc(l_columns_desc(cur).col_type,true) + ); + if l_columns_desc(cur).col_type = dbms_sql.user_defined_type + and + not ut_curr_usr_compound_helper.is_collection(l_columns_desc(cur).col_schema_name,l_columns_desc(cur).col_type_name) then l_anytype := get_user_defined_type(l_columns_desc(cur).col_schema_name , l_columns_desc(cur).col_type_name ); for i in 1 .. get_anytype_attribute_count(l_anytype) loop l_attribute_typecode := l_anytype.getattreleminfo(pos => i, --First attribute @@ -100,10 +112,10 @@ create or replace type body ut_cursor_details as l_prec, l_scale, l_len, - l_columns_desc(i).col_name, + l_columns_desc(cur).col_name, 2, i, - ut_curr_usr_compound_helper.get_column_type(l_attribute_typecode,true) + ut_curr_usr_compound_helper.get_column_type_desc(l_attribute_typecode,false) ); end loop; end if; diff --git a/source/expectations/data_values/ut_cursor_details.tps b/source/expectations/data_values/ut_cursor_details.tps index 00f03e676..2cb77dade 100644 --- a/source/expectations/data_values/ut_cursor_details.tps +++ b/source/expectations/data_values/ut_cursor_details.tps @@ -1,6 +1,7 @@ create or replace type ut_cursor_details force authid current_user as object ( cursor_info ut_cursor_column_tab, + order member function compare(a_other ut_cursor_details) return integer, member function get_anytype_attribute_count(a_anytype anytype) return pls_integer, member function get_user_defined_type(a_owner varchar2, a_type_name varchar2) return anytype, constructor function ut_cursor_details(self in out nocopy ut_cursor_details,a_cursor in out nocopy sys_refcursor) diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index c63583469..9b495221c 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -47,9 +47,7 @@ create or replace type body ut_data_value_refcursor as self.contain_collection); self.elements_count := 0; self.columns_info := ut_curr_usr_compound_helper.extract_min_col_info(self.col_info_desc); - self.cursor_details := ut_cursor_details(l_cursor); - -- We use DBMS_XMLGEN in order to: -- 1) be able to process data in bulks (set of rows) -- 2) be able to influence the ROWSET/ROW tags @@ -226,11 +224,15 @@ create or replace type body ut_data_value_refcursor as return l_result_string; end; - overriding member function compare_implementation (a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, - a_unordered boolean, a_inclusion_compare boolean := false, - a_is_negated boolean := false, a_join_by_list ut_varchar2_list:=null) return integer is + overriding member function compare_implementation (a_other ut_data_value, a_unordered boolean, a_inclusion_compare boolean := false, + a_is_negated boolean := false, a_join_by_list ut_varchar2_list:=ut_varchar2_list()) + return integer is l_result integer := 0; l_other ut_data_value_refcursor; + + l_act_pk ut_cursor_column_tab; + l_exp_pk ut_cursor_column_tab; + function is_pk_missing (a_pk_missing_tab ut_compound_data_helper.tt_missing_pk) return integer is begin return case when a_pk_missing_tab.count > 0 then 1 else 0 end; @@ -243,21 +245,19 @@ create or replace type body ut_data_value_refcursor as l_other := treat(a_other as ut_data_value_refcursor); --if we join by key and key is missing fail and report error - if a_join_by_xpath is not null then - l_result := is_pk_missing(ut_compound_data_helper.is_pk_exists(self.key_info, l_other.key_info, a_exclude_xpath, - a_include_xpath,a_join_by_xpath)); + if a_join_by_list.count > 0 then + l_act_pk := ut_compound_data_helper.compare_cursor_to_columns(self.cursor_details.cursor_info ,a_join_by_list); + l_exp_pk := ut_compound_data_helper.compare_cursor_to_columns(l_other.cursor_details.cursor_info,a_join_by_list); + l_result := case when (l_act_pk.count > 0) or (l_exp_pk.count > 0) then 1 else 0 end; end if; - - if l_result = 0 then - --if column names/types are not equal - build a diff of column names and types - if ut_compound_data_helper.columns_hash( self, a_exclude_xpath, a_include_xpath ) - != ut_compound_data_helper.columns_hash( l_other, a_exclude_xpath, a_include_xpath ) - then - l_result := 1; - end if; - l_result := l_result + (self as ut_compound_data_value).compare_implementation(a_other, a_exclude_xpath, a_include_xpath, - a_join_by_xpath,a_unordered, a_inclusion_compare, a_is_negated, a_join_by_list); + + if l_result = 0 then + if (self.cursor_details is not null and l_other.cursor_details is not null) and (self.cursor_details != l_other.cursor_details) then + l_result := 1; + end if; + l_result := l_result + (self as ut_compound_data_value).compare_implementation(a_other,a_unordered, a_inclusion_compare, + a_is_negated, a_join_by_list); end if; return l_result; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tps b/source/expectations/data_values/ut_data_value_refcursor.tps index 01b35d745..76deb005f 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tps +++ b/source/expectations/data_values/ut_data_value_refcursor.tps @@ -53,9 +53,8 @@ create or replace type ut_data_value_refcursor under ut_compound_data_value( member procedure init(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor), overriding member function to_string return varchar2, overriding member function diff( a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean := false ) return varchar2, - overriding member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, - a_unordered boolean, a_inclusion_compare boolean := false, - a_is_negated boolean := false, a_join_by_list ut_varchar2_list:=null) return integer, + overriding member function compare_implementation(a_other ut_data_value, a_unordered boolean, a_inclusion_compare boolean := false, + a_is_negated boolean := false, a_join_by_list ut_varchar2_list:=ut_varchar2_list()) return integer, overriding member function is_empty return boolean, member function filter_cursor (a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) return ut_data_value_refcursor ) diff --git a/source/expectations/matchers/ut_equal.tpb b/source/expectations/matchers/ut_equal.tpb index 0e80d9aea..c60d0d48e 100644 --- a/source/expectations/matchers/ut_equal.tpb +++ b/source/expectations/matchers/ut_equal.tpb @@ -158,7 +158,7 @@ create or replace type body ut_equal as member function include(a_items varchar2) return ut_equal is l_result ut_equal := self; begin - --TODO : thats poorly done + --TODO : move that logic split into get_include after removed all calls to incl and excl l_result.include_list := l_result.include_list multiset union coalesce(ut_utils.string_to_table(REPLACE(a_items,'|',','),','),ut_varchar2_list()); return l_result; end; @@ -167,7 +167,7 @@ create or replace type body ut_equal as l_result ut_equal := self; l_items ut_varchar2_list := ut_varchar2_list(); begin - --Split exclude into single expressions so we cater for concat operator like | + --TODO : move that logic split into get_include after removed all calls to incl and excl for i in 1..a_items.count loop l_items := l_items multiset union all coalesce(ut_utils.string_to_table(REPLACE(a_items(i),'|',','),','),ut_varchar2_list()); end loop; @@ -178,6 +178,7 @@ create or replace type body ut_equal as member function exclude(a_items varchar2) return ut_equal is l_result ut_equal := self; begin + --TODO : move that logic split into get_include after removed all calls to incl and excl l_result.exclude_list := l_result.exclude_list multiset union all coalesce(ut_utils.string_to_table(REPLACE(a_items,'|',','),','),ut_varchar2_list()); return l_result; end; @@ -186,9 +187,8 @@ create or replace type body ut_equal as l_result ut_equal := self; l_items ut_varchar2_list := ut_varchar2_list(); begin - --Split exclude into single expressions so we cater for concat operator like | + --TODO : move that logic split into get_include after removed all calls to incl and excl for i in 1..a_items.count loop - --TODO : idoiot proof solution for both include and exclude l_items := l_items multiset union all coalesce(ut_utils.string_to_table(REPLACE(a_items(i),'|',','),','),ut_varchar2_list()); end loop; @@ -253,6 +253,12 @@ create or replace type body ut_equal as return ut_utils.to_xpath( coalesce(join_columns, ut_varchar2_list()) ); end; + member function get_join_by_list return ut_varchar2_list is + begin + --TODO : zamiast zmieniac path zmodyfikuj get functions + return ( coalesce(join_columns, ut_varchar2_list()) ); + end; + overriding member function run_matcher(self in out nocopy ut_equal, a_actual ut_data_value) return boolean is l_result boolean; l_actual ut_data_value; @@ -262,8 +268,8 @@ create or replace type body ut_equal as l_result := 0 = treat(self.expected as ut_data_value_anydata).compare_implementation(a_actual, get_exclude_xpath(), get_include_xpath()); elsif self.expected is of (ut_data_value_refcursor) then l_actual := treat(a_actual as ut_data_value_refcursor).filter_cursor(exclude_list, include_list); - l_result := 0 = treat(self.expected as ut_data_value_refcursor).filter_cursor(exclude_list, include_list).compare_implementation(l_actual, get_exclude_xpath(), - get_include_xpath(), get_join_by_xpath(), get_unordered(), false, false, join_on_list ); + l_result := 0 = treat(self.expected as ut_data_value_refcursor).filter_cursor(exclude_list, include_list).compare_implementation(l_actual, + get_unordered(), false, false, get_join_by_list() ); else l_result := equal_with_nulls((self.expected = a_actual), a_actual); end if; diff --git a/source/expectations/matchers/ut_equal.tps b/source/expectations/matchers/ut_equal.tps index 3380306e7..e53fda40b 100644 --- a/source/expectations/matchers/ut_equal.tps +++ b/source/expectations/matchers/ut_equal.tps @@ -72,6 +72,7 @@ create or replace type ut_equal under ut_comparison_matcher( member function get_exclude_xpath return varchar2, member function get_unordered return boolean, member function get_join_by_xpath return varchar2, + member function get_join_by_list return ut_varchar2_list, overriding member function run_matcher(self in out nocopy ut_equal, a_actual ut_data_value) return boolean, overriding member function failure_message(a_actual ut_data_value) return varchar2, overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2 diff --git a/source/expectations/matchers/ut_include.tpb b/source/expectations/matchers/ut_include.tpb index 0e570a719..620f3267d 100644 --- a/source/expectations/matchers/ut_include.tpb +++ b/source/expectations/matchers/ut_include.tpb @@ -52,11 +52,11 @@ create or replace type body ut_include as l_result boolean; l_actual ut_data_value; begin + --TODO : Join by exclude an include should show differences if self.expected.data_type = a_actual.data_type then l_actual := treat(a_actual as ut_data_value_refcursor).filter_cursor(exclude_list, include_list); - l_result := 0 = treat(self.expected as ut_data_value_refcursor).filter_cursor(exclude_list, include_list).compare_implementation(l_actual, - self.get_exclude_xpath(), self.get_include_xpath(), self.get_join_by_xpath(), - true,self.get_inclusion_compare(), self.get_negated(), join_on_list); + l_result := 0 = treat(self.expected as ut_data_value_refcursor).filter_cursor(exclude_list, include_list).compare_implementation(l_actual, + true,self.get_inclusion_compare(), self.get_negated(), self.get_join_by_list()); else l_result := (self as ut_matcher).run_matcher(a_actual); end if; diff --git a/source/expectations/ut_expectation.tpb b/source/expectations/ut_expectation.tpb index 2ad402459..19775c707 100644 --- a/source/expectations/ut_expectation.tpb +++ b/source/expectations/ut_expectation.tpb @@ -38,7 +38,6 @@ create or replace type body ut_expectation as else l_expectation_result := l_matcher.run_matcher_negated( self.actual_data ); end if; - l_expectation_result := coalesce(l_expectation_result,false); l_message := coalesce( l_matcher.error_message( self.actual_data ), l_matcher.failure_message_when_negated( self.actual_data ) ); ut_expectation_processor.add_expectation_result( ut_expectation_result( ut_utils.to_test_result( l_expectation_result ), self.description, l_message ) ); diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index bb5221d4d..83cf23e2f 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -2356,39 +2356,99 @@ Diff:% --Assert ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; + + procedure cursor_not_to_contain + as + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + open l_expected for select 'TEST' username, -600 user_id from dual; + + open l_actual for select username, user_id from all_users + union all + select 'TEST1' username, -601 user_id from dual; + + --Act + ut3.ut.expect(l_actual).not_to_contain(l_expected); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; - procedure cursor_not_to_contain is + procedure cursor_not_to_include + as + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + open l_expected for select 'TEST' username, -600 user_id from dual; + + open l_actual for select username, user_id from all_users + union all + select 'TEST1' username, -601 user_id from dual; + + --Act + ut3.ut.expect(l_actual).not_to_include(l_expected); + --Asserty + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure cursor_not_to_contain_fail is l_actual SYS_REFCURSOR; l_expected SYS_REFCURSOR; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); begin --Arrange open l_expected for select 'TEST' username, -600 user_id from dual; open l_actual for select username, user_id from all_users union all - select 'TEST' username, -601 user_id from dual; + select 'TEST' username, -600 user_id from dual; --Act ut3.ut.expect(l_actual).not_to_contain(l_expected); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + l_expected_message := q'[%Actual: (refcursor [ count = 18 ])% +%Data-types:% +%VARCHAR2NUMBER% +%Data:% +%was expected not to include:(refcursor [ count = 1 ])% +%Data-types:% +%CHARNUMBER% +%Data:% +%TEST-600%]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); end; - procedure cursor_not_to_include is + procedure cursor_not_to_include_fail is l_actual SYS_REFCURSOR; l_expected SYS_REFCURSOR; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); begin --Arrange open l_expected for select 'TEST' username, -600 user_id from dual; open l_actual for select username, user_id from all_users union all - select 'TEST' username, -601 user_id from dual; + select 'TEST' username, -600 user_id from dual; --Act ut3.ut.expect(l_actual).not_to_include(l_expected); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + l_expected_message := q'[%Actual: (refcursor [ count = 18 ])% +%Data-types:% +%VARCHAR2NUMBER% +%Data:% +%was expected not to include:(refcursor [ count = 1 ])% +%Data-types:% +%CHARNUMBER% +%Data:% +%TEST-600%]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); end; procedure cursor_not_to_contain_joinby is @@ -2410,8 +2470,8 @@ Diff:% l_expected SYS_REFCURSOR; begin --Arrange - open l_actual for select username,user_id from all_users; - open l_expected for select username||'ACT' username ,user_id from all_users where rownum < 5; + open l_actual for select username,rownum * 10 user_id from all_users where rownum < 5; + open l_expected for select username ,rownum user_id from all_users where rownum < 5; --Act ut3.ut.expect(l_actual).not_to_include(l_expected).join_by('USER_ID'); diff --git a/test/core/expectations/test_expectations_cursor.pks b/test/core/expectations/test_expectations_cursor.pks index e70bb8cdf..f6e3de27c 100644 --- a/test/core/expectations/test_expectations_cursor.pks +++ b/test/core/expectations/test_expectations_cursor.pks @@ -380,7 +380,13 @@ create or replace package test_expectations_cursor is procedure cursor_not_to_contain; --%test( Cursor not to include data from another cursor) - procedure cursor_not_to_include; + procedure cursor_not_to_include; + + --%test( Cursor fail not to contains data from another cursor) + procedure cursor_not_to_contain_fail; + + --%test( Cursor fail not to include data from another cursor) + procedure cursor_not_to_include_fail; --%test( Cursor not contains data from another cursor with joinby clause) procedure cursor_not_to_contain_joinby; From cad7bad100688ff7c8fb8271313c0bf53ed4bf50 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 18 Nov 2018 23:49:50 +0000 Subject: [PATCH 0119/1096] Added description fo timestamp bind-variable comparison in cursor. Resolves #771 --- docs/userguide/expectations.md | 96 ++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 4c6f3aa68..b02605605 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -445,6 +445,8 @@ utPLSQL is capable of comparing compound data-types including: - Cursors, nested table and varray types are compared as **ordered lists of elements**. If order of elements differ, expectation will fail. - Comparison of compound data is data-type aware. So a column `ID NUMBER` in a cursor is not the same as `ID VARCHAR2(100)`, even if they both hold the same numeric values. - Comparison of cursor columns containing `DATE` will only compare date part **and ignore time** by default. See [Comparing cursor data containing DATE fields](#comparing-cursor-data-containing-date-fields) to check how to enable date-time comparison in cursors. +- Comparison of cursor returning `TIMESTAMP` **columns** against cursor returning `TIMESTAMP` **bind variables** requires variables to be casted to proper precision. This is an Oracle SQL - PLSQL compatibility issue and usage of CAST is the only known workaround for now. +See [Comparing cursor data containing TIMESTAMP bind variables](#comparing-cursor-data-containing-timestamp-bind-variables) for examples. - To compare nested table/varray type you need to convert it to `anydata` by using `anydata.convertCollection()` - To compare object type you need to convert it to `anydata` by using `anydata.convertObject()` - It is possible to compare PL/SQL records, collections, varrays and associative arrays. To compare this types of data, use cursor comparison feature of utPLSQL and TABLE operator in SQL query @@ -749,6 +751,100 @@ In the above example: - The test `get_events_for_date_range` will succeed, as the `l_expected_bad_date` cursor contains different date-time then the cursor returned by `get_events` function call. - The test `bad_test` will fail, as the column `event_date` will get compared as DATE without TIME. +### Comparing cursor data containing TIMESTAMP bind variables + +To properly compare `timestamp` column data returned by cursor against bind variable data from another cursor, a conversion needs to be done. + +This applies to `timestamp`,`timestamp with timezone`, `timestamp with local timezone` data types. + +Example below illustrates usage of `cast` operator to assure appropriate precision is applied on timestamp bind-variables in cursor result-set +```sql +drop table timestamps; +create table timestamps ( + ts3 timestamp (3), + ts6 timestamp (6), + ts9 timestamp (9) +); + +create or replace package timestamps_api is + procedure load ( + i_timestamp3 timestamps.ts3%type, + i_timestamp6 timestamps.ts6%type, + i_timestamp9 timestamps.ts9%type + ); +end; +/ + +create or replace package body timestamps_api is + procedure load ( + i_timestamp3 timestamps.ts3%type, + i_timestamp6 timestamps.ts6%type, + i_timestamp9 timestamps.ts9%type + ) + is + begin + insert into timestamps (ts3, ts6, ts9) + values (i_timestamp3, i_timestamp6, i_timestamp9); + end; +end; +/ + + +create or replace package test_timestamps_api is + -- %suite + + -- %test(Loads data into timestamps table) + procedure test_load; +end; +/ + +create or replace package body test_timestamps_api is + procedure test_load is + l_time timestamp(9); + l_expected sys_refcursor; + l_actual sys_refcursor; + begin + --Arrange + l_time := systimestamp; + + open l_expected for + select + cast(l_time as timestamp(3)) as ts3, + cast(l_time as timestamp(6)) as ts6, + cast(l_time as timestamp(9)) as ts9 + from dual; + + --Act + timestamps_api.load ( + l_time, l_time, l_time + ); + + --Assert + open l_actual for + select ts3, ts6, ts9 + from timestamps; + + ut.expect (l_actual).to_equal (l_expected); + + end; +end; +/ + +begin + ut.run ('test_timestamps_api'); +end; +/ +``` + +The execution of the above runs successfully +``` +test_timestamps_api + Loads data into timestamps table [.046 sec] + +Finished in .048181 seconds +1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s) +``` + # Negating a matcher Expectations provide a very convenient way to perform a check on a negated matcher. From e4043b5cc95db4bed05a94d244d3956b64df1234 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Mon, 19 Nov 2018 07:14:28 +0000 Subject: [PATCH 0120/1096] Updates to include nested an collections --- .../expectations/data_values/ut_compound_data_helper.pkb | 3 +-- source/expectations/data_values/ut_cursor_column.tpb | 9 +++++++-- source/expectations/data_values/ut_cursor_column.tps | 2 +- test/core/expectations/test_expectations_cursor.pkb | 4 ++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 69eca4f3d..d61140732 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -543,7 +543,7 @@ create or replace package body ut_compound_data_helper is --TODO : Collection is intersting exmaple that we probably has to extract full xml and hash it. ut_utils.append_to_clob(a_partition_stmt,', row_number() over (partition by '); for i in 1..l_cursor_info.count loop - if l_cursor_info(i).is_user_defined = 0 then + if l_cursor_info(i).has_nested_col = 0 then l_col_name := case when l_cursor_info(i).parent_name is null then l_cursor_info(i).xml_valid_name else @@ -690,7 +690,6 @@ create or replace package body ut_compound_data_helper is end if; ut_utils.append_to_clob(l_compare_sql,l_temp_string); - --dbms_output.put_line(l_compare_sql); return l_compare_sql; end; diff --git a/source/expectations/data_values/ut_cursor_column.tpb b/source/expectations/data_values/ut_cursor_column.tpb index e266f818d..6223ea9a4 100644 --- a/source/expectations/data_values/ut_cursor_column.tpb +++ b/source/expectations/data_values/ut_cursor_column.tpb @@ -23,10 +23,15 @@ create or replace type body ut_cursor_column as self.xml_valid_name := '"'||self.column_name||'"'; self.column_type := a_col_type; self.column_schema := a_col_schema_name; - self.is_sql_diffable := ut_utils.boolean_to_int(ut_curr_usr_compound_helper.is_sql_compare_allowed(self.column_type)); + self.is_sql_diffable := case when lower(self.column_type) = 'user_defined_type' then + 0 + else + ut_utils.boolean_to_int(ut_curr_usr_compound_helper.is_sql_compare_allowed(self.column_type)) + end; + --TODO : Part of the constructor same as has nested ?? self.is_collection := ut_utils.boolean_to_int(ut_curr_usr_compound_helper.is_collection(a_col_schema_name,a_col_type_name)); --TODO : fix that as is nasty hardcode - self.is_user_defined := case when lower(self.column_type) = 'user_defined_type' then 1 else 0 end; + self.has_nested_col := case when lower(self.column_type) = 'user_defined_type' and self.is_collection = 0 then 1 else 0 end; end; constructor function ut_cursor_column( self in out nocopy ut_cursor_column, diff --git a/source/expectations/data_values/ut_cursor_column.tps b/source/expectations/data_values/ut_cursor_column.tps index dcd352377..c15e73458 100644 --- a/source/expectations/data_values/ut_cursor_column.tps +++ b/source/expectations/data_values/ut_cursor_column.tps @@ -2,6 +2,7 @@ create or replace type ut_cursor_column force authid current_user as object ( parent_name varchar2(100), access_path varchar2(500), + has_nested_col number(1,0), nested_name varchar2(32), hierarchy_level number, column_position number, @@ -15,7 +16,6 @@ create or replace type ut_cursor_column force authid current_user as object column_scale integer, is_sql_diffable number(1, 0), is_collection number(1, 0), - is_user_defined number(1, 0), member procedure init(self in out nocopy ut_cursor_column, a_col_name varchar2, a_col_schema_name varchar2, diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index 83cf23e2f..d37ad7572 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -1542,9 +1542,9 @@ Diff:% ut3.ut.expect(l_actual).to_equal(l_expected).unordered; l_expected_message := q'[%Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 3 ]% Diff:% -Rows: [ 5 differences 1 -%Extra: 1Something 11% +Rows: [ 5 differences% %Extra: 2Something 22% +%Extra: 1Something 11% %Missing: 1Somethings 11% %Missing: 2Somethings 22% %Missing: 3Somethings 33%]'; From c2e75866afc299005f64344544a95a5116b3be9a Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 19 Nov 2018 12:00:27 +0000 Subject: [PATCH 0121/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 195b2b6cb..36d056a26 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.3.2390-develop'; + gc_version constant varchar2(50) := 'v3.1.3.2394-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From 3e5d1ba9004d6ee2d2a195e51a2846063c371604 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 20 Nov 2018 00:08:45 +0000 Subject: [PATCH 0122/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 36d056a26..835a30cea 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.3.2394-develop'; + gc_version constant varchar2(50) := 'v3.1.3.2397-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From 816873698ab8c4924a46961fe7583ec30c57643d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 20 Nov 2018 00:31:09 +0000 Subject: [PATCH 0123/1096] Update readme.md --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index 5dbec9166..7d04ae81a 100644 --- a/readme.md +++ b/readme.md @@ -233,3 +233,4 @@ __Project Directories__ * examples - Example source code and unit tests * source - The installation code for utPLSQL * tests - Tests for utPLSQL framework + From d13b0ef156f5a42b1e3a7cd15e16153db9384e79 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 20 Nov 2018 00:40:23 +0000 Subject: [PATCH 0124/1096] Updated project version after build [skip ci] --- VERSION | 2 +- sonar-project.properties | 2 +- source/core/ut_utils.pks | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index ed4f9d9f8..66cfae52b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.3-develop +v3.1.3 diff --git a/sonar-project.properties b/sonar-project.properties index e13de646b..a0288a65d 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,7 @@ sonar.projectKey=utPLSQL # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=utPLSQL -sonar.projectVersion=v3.1.3-develop +sonar.projectVersion=v3.1.3 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # Since SonarQube 4.2, this property is optional if sonar.modules is set. diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 835a30cea..e5de6d623 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.3.2397-develop'; + gc_version constant varchar2(50) := 'v3.1.3.2398'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From 0bcaf9cee38fc5d73daae420461ee1e529fe2df6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 20 Nov 2018 00:56:20 +0000 Subject: [PATCH 0125/1096] Update VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 66cfae52b..6eef43b75 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.3 +v3.1.4 From 6cb5fe7d629889185ff3fae6db44040b912080d2 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Tue, 20 Nov 2018 00:07:48 +0000 Subject: [PATCH 0126/1096] Further deprecation of Xpath --- .../data_values/ut_compound_data_helper.pkb | 137 ++++++++---------- .../data_values/ut_compound_data_helper.pks | 12 +- .../data_values/ut_compound_data_value.tpb | 8 +- .../ut_curr_usr_compound_helper.pkb | 3 +- .../data_values/ut_cursor_column.tpb | 5 + .../data_values/ut_data_value_refcursor.tpb | 40 +++-- .../data_values/ut_data_value_refcursor.tps | 3 +- source/expectations/matchers/ut_equal.tpb | 14 +- source/expectations/matchers/ut_include.tpb | 14 +- .../expectations/test_expectations_cursor.pkb | 47 ++---- .../expectations/test_expectations_cursor.pks | 3 - 11 files changed, 141 insertions(+), 145 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index d61140732..61591e383 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -85,81 +85,45 @@ create or replace package body ut_compound_data_helper is end if; return l_filter; end; - - function get_columns_diff( - a_expected xmltype, a_actual xmltype, a_exclude_xpath varchar2, a_include_xpath varchar2 - ) return tt_column_diffs is + + function get_columns_diff(a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab) + return tt_column_diffs is l_column_filter varchar2(32767); l_sql varchar2(32767); l_results tt_column_diffs; begin - l_column_filter := get_columns_row_filter(a_exclude_xpath, a_include_xpath); - --CARDINALITY hints added to address issue: https://github.com/utPLSQL/utPLSQL/issues/752 - l_sql := q'[ - with - expected_cols as ( select :a_expected as item_data from dual ), - actual_cols as ( select :a_actual as item_data from dual ), - expected_cols_info as ( - select e.*, - replace(expected_type,'VARCHAR2','CHAR') expected_type_compare - from ( - select /*+ CARDINALITY(xt 100) */ - rownum expected_pos, - xt.name expected_name, - xt.type expected_type - from (select ]'||l_column_filter||q'[ from expected_cols ucd) x, - xmltable( - '/ROW/*' - passing x.item_data - columns - name varchar2(4000) PATH '@xml_valid_name', - type varchar2(4000) PATH '/' - ) xt - ) e - ), - actual_cols_info as ( - select a.*, - replace(actual_type,'VARCHAR2','CHAR') actual_type_compare - from (select /*+ CARDINALITY(xt 100) */ - rownum actual_pos, - xt.name actual_name, - xt.type actual_type - from (select ]'||l_column_filter||q'[ from actual_cols ucd) x, - xmltable('/ROW/*' - passing x.item_data - columns - name varchar2(4000) path '@xml_valid_name', - type varchar2(4000) path '/' - ) xt - ) a - ), - joined_cols as ( - select e.*, a.*, - row_number() over(partition by case when actual_pos + expected_pos is not null then 1 end order by actual_pos) a_pos_nn, - row_number() over(partition by case when actual_pos + expected_pos is not null then 1 end order by expected_pos) e_pos_nn - from expected_cols_info e - full outer join actual_cols_info a on e.expected_name = a.actual_name - ) + with + expected_cols as + (select access_path exp_column_name,column_position exp_col_pos, + replace(column_type,'VARCHAR2','CHAR') exp_col_type_compare, column_type exp_col_type + from table(a_expected)), + actual_cols as + (select access_path act_column_name,column_position act_col_pos, + replace(column_type,'VARCHAR2','CHAR') act_col_type_compare, column_type act_col_type + from table(a_actual)), + joined_cols as + (select e.*,a.*, + row_number() over(partition by case when a.act_col_pos + e.exp_col_pos is not null then 1 end order by a.act_col_pos) a_pos_nn, + row_number() over(partition by case when a.act_col_pos + e.exp_col_pos is not null then 1 end order by e.exp_col_pos) e_pos_nn + from expected_cols e + full outer join actual_cols a on e.exp_column_name = a.act_column_name) select case - when expected_pos is null and actual_pos is not null then '+' - when expected_pos is not null and actual_pos is null then '-' - when expected_type_compare != actual_type_compare then 't' + when exp_col_pos is null and act_col_pos is not null then '+' + when exp_col_pos is not null and act_col_pos is null then '-' + when exp_col_type_compare != act_col_type_compare then 't' else 'p' end as diff_type, - expected_name, expected_type, expected_pos, - actual_name, actual_type, actual_pos + exp_column_name, exp_col_type, exp_col_pos, + act_column_name, act_col_type, act_col_pos + bulk collect into l_results from joined_cols --column is unexpected (extra) or missing - where actual_pos is null or expected_pos is null + where act_col_pos is null or exp_col_pos is null --column type is not matching (except CHAR/VARCHAR2) - or actual_type_compare != expected_type_compare + or act_col_type_compare != exp_col_type_compare --column position is not matching (both when excluded extra/missing columns as well as when they are included) - or (a_pos_nn != e_pos_nn and expected_pos != actual_pos) - order by expected_pos, actual_pos]'; - execute immediate l_sql - bulk collect into l_results - using a_expected, a_actual, a_exclude_xpath, a_include_xpath, a_exclude_xpath, a_include_xpath; - + or (a_pos_nn != e_pos_nn and exp_col_pos != act_col_pos) + order by exp_col_pos, act_col_pos; return l_results; end; @@ -690,6 +654,7 @@ create or replace package body ut_compound_data_helper is end if; ut_utils.append_to_clob(l_compare_sql,l_temp_string); + dbms_output.put_line(l_compare_sql); return l_compare_sql; end; @@ -735,12 +700,8 @@ create or replace package body ut_compound_data_helper is select lev,column_name,parent_name from hier), t1(column_name, parent_name) AS ( select column_name,parent_name from table(:a_cursor_info) where parent_name is null - union all - select t2.column_name,t2.parent_name from table(:a_cursor_info) t2, t1 where t2.parent_name = t1.column_name) - select ut_cursor_column(i.column_name,i.column_schema,i.column_type_name, i.column_prec,i.column_scale,i.column_len, i.parent_name, - i.hierarchy_level,i.column_position, i.column_type) - from t1 join table(:a_cursor_info) i on ( nvl(t1.parent_name,1) = nvl(i.parent_name,1) and t1.column_name = i.column_name) - ]'; + union all + select t2.column_name,t2.parent_name from table(:a_cursor_info) t2, t1 where t2.parent_name = t1.column_name)]'; begin return l_sql; end; @@ -750,10 +711,13 @@ create or replace package body ut_compound_data_helper is l_sql varchar2(32767) := get_cursor_vs_list_sql; l_result ut_cursor_column_tab := ut_cursor_column_tab(); begin + l_sql := l_sql || q'[select ut_cursor_column(i.column_name,i.column_schema,i.column_type_name, i.column_prec,i.column_scale,i.column_len, i.parent_name, + i.hierarchy_level,i.column_position, i.column_type) + from t1 join table(:a_cursor_info) i on ( nvl(t1.parent_name,1) = nvl(i.parent_name,1) and t1.column_name = i.column_name)]'; if a_include then l_sql := l_sql || ' join constructed c on ( nvl(t1.parent_name,1) = nvl(c.parent_name,1) and t1.column_name = c.column_name)'; else - l_sql := l_sql ||'left outer join constructed c on ( nvl(t1.parent_name,1) = nvl(c.parent_name,1) and t1.column_name = c.column_name) + l_sql := l_sql ||' left outer join constructed c on ( nvl(t1.parent_name,1) = nvl(c.parent_name,1) and t1.column_name = c.column_name) where c.column_name is null'; end if; @@ -764,10 +728,12 @@ create or replace package body ut_compound_data_helper is end; function compare_cursor_to_columns(a_cursor_info ut_cursor_column_tab, a_current_list ut_varchar2_list) - return ut_cursor_column_tab is + return ut_varchar2_list is l_sql varchar2(32767) := get_cursor_vs_list_sql; - l_result ut_cursor_column_tab := ut_cursor_column_tab(); + l_result ut_varchar2_list := ut_varchar2_list(); begin + l_sql := l_sql || q'[select c.parent_name || case when c.parent_name is null then null else '/' end ||c.column_name + from t1 join table(:a_cursor_info) i on ( nvl(t1.parent_name,1) = nvl(i.parent_name,1) and t1.column_name = i.column_name)]'; l_sql := l_sql ||'right outer join constructed c on ( nvl(t1.parent_name,1) = nvl(c.parent_name,1) and t1.column_name = c.column_name) where t1.column_name is null'; @@ -775,7 +741,22 @@ create or replace package body ut_compound_data_helper is using a_current_list,a_cursor_info,a_cursor_info,a_cursor_info; return l_result; end; - + + function get_missing_pk(a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab, a_current_list ut_varchar2_list) + return tt_missing_pk is + l_actual ut_varchar2_list := coalesce(compare_cursor_to_columns(a_actual,a_current_list),ut_varchar2_list()); + l_expected ut_varchar2_list := coalesce(compare_cursor_to_columns(a_expected,a_current_list),ut_varchar2_list()); + l_missing_pk tt_missing_pk; + begin + select name,type + bulk collect into l_missing_pk + from + (select act.column_value name, 'e' type from table(l_expected) act + union all + select exp.column_value name, 'a' type from table(l_actual) exp) + order by type desc,name; + return l_missing_pk; + end; function inc_exc_columns_from_cursor (a_cursor_info ut_cursor_column_tab, a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) return ut_cursor_column_tab is @@ -819,5 +800,13 @@ create or replace package body ut_compound_data_helper is return l_result; end; + function contains_collection (a_cursor_info ut_cursor_column_tab) return number is + l_collection_elements number; + begin + select count(1) into l_collection_elements from + table(a_cursor_info) c where c.is_collection = 1; + return l_collection_elements; + end; + end; / diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 09781225d..f2b31f82e 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -65,9 +65,8 @@ create or replace package ut_compound_data_helper authid definer is a_table_alias varchar2 := 'ucd', a_column_alias varchar2 := 'item_data' ) return varchar2; - function get_columns_diff( - a_expected xmltype, a_actual xmltype, a_exclude_xpath varchar2, a_include_xpath varchar2 - ) return tt_column_diffs; + function get_columns_diff(a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab) + return tt_column_diffs; function get_pk_value (a_join_by_xpath varchar2,a_item_data xmltype) return clob; @@ -107,10 +106,15 @@ create or replace package ut_compound_data_helper authid definer is return ut_cursor_column_tab; function compare_cursor_to_columns(a_cursor_info ut_cursor_column_tab, a_current_list ut_varchar2_list) - return ut_cursor_column_tab; + return ut_varchar2_list; + + function get_missing_pk(a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab, a_current_list ut_varchar2_list) + return tt_missing_pk; function inc_exc_columns_from_cursor (a_cursor_info ut_cursor_column_tab, a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) return ut_cursor_column_tab; + function contains_collection (a_cursor_info ut_cursor_column_tab) return number; + end; / diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index b1d126df1..12396c756 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -79,6 +79,7 @@ create or replace type body ut_compound_data_value as return l_result_string; end; + -- TODO : Rework to exclude xpath member function get_data_diff(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean) return clob is c_max_rows integer := ut_utils.gc_diff_max_rows; @@ -128,15 +129,16 @@ create or replace type body ut_compound_data_value as l_message := chr(10) ||'Rows: [ ' || l_diff_row_count ||' differences' || case when l_diff_row_count > c_max_rows and l_row_diffs.count > 0 then ', showing first '||c_max_rows end - ||' ]' || chr(10) - || case when l_row_diffs.count = 0 - then ' All rows are different as the columns are not matching.' end; + ||' ]'||chr(10)|| case when l_row_diffs.count = 0 then ' All rows are different as the columns are not matching.' else null end; ut_utils.append_to_clob( l_result, l_message ); for i in 1 .. l_row_diffs.count loop l_results.extend; l_results(l_results.last) := get_diff_message(l_row_diffs(i),a_unordered); end loop; ut_utils.append_to_clob(l_result,l_results); + else + l_message:= chr(10)||'Rows: [ all different ]'||chr(10)||' All rows are different as the columns are not matching.'; + ut_utils.append_to_clob( l_result, l_message ); end if; return l_result; end; diff --git a/source/expectations/data_values/ut_curr_usr_compound_helper.pkb b/source/expectations/data_values/ut_curr_usr_compound_helper.pkb index c12162593..f829a9c0a 100644 --- a/source/expectations/data_values/ut_curr_usr_compound_helper.pkb +++ b/source/expectations/data_values/ut_curr_usr_compound_helper.pkb @@ -20,7 +20,8 @@ create or replace package body ut_curr_usr_compound_helper is --clob/blob/xmltype/object/nestedcursor/nestedtable if a_type_name IN (g_type_name_map(dbms_sql.blob_type), g_type_name_map(dbms_sql.clob_type), - g_type_name_map(dbms_sql.bfile_type)) + g_type_name_map(dbms_sql.bfile_type), + g_anytype_name_map(dbms_types.typecode_namedcollection)) then return false; else diff --git a/source/expectations/data_values/ut_cursor_column.tpb b/source/expectations/data_values/ut_cursor_column.tpb index 6223ea9a4..b9216ec4d 100644 --- a/source/expectations/data_values/ut_cursor_column.tpb +++ b/source/expectations/data_values/ut_cursor_column.tpb @@ -34,6 +34,11 @@ create or replace type body ut_cursor_column as self.has_nested_col := case when lower(self.column_type) = 'user_defined_type' and self.is_collection = 0 then 1 else 0 end; end; + --TODO : Scenarios : + --namedcollection xmltype getclobhash + --collection xml type get clob hash + -- user defined type + constructor function ut_cursor_column( self in out nocopy ut_cursor_column, a_col_name varchar2, a_col_schema_name varchar2, a_col_type_name varchar2, a_col_prec integer, a_col_scale integer, diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 9b495221c..2d12fe9f7 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -116,14 +116,17 @@ create or replace type body ut_data_value_refcursor as return l_result_string; end; - overriding member function diff( a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean := false ) return varchar2 is + member function diff( a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, + a_unordered boolean := false, a_join_by_list ut_varchar2_list:=ut_varchar2_list() ) return varchar2 is l_result clob; l_results ut_utils.t_clob_tab := ut_utils.t_clob_tab(); l_result_string varchar2(32767); l_actual ut_data_value_refcursor; l_column_diffs ut_compound_data_helper.tt_column_diffs := ut_compound_data_helper.tt_column_diffs(); l_exclude_xpath varchar2(32767) := a_exclude_xpath; + l_missing_pk ut_compound_data_helper.tt_missing_pk := ut_compound_data_helper.tt_missing_pk(); + l_col_diffs ut_compound_data_helper.tt_column_diffs := ut_compound_data_helper.tt_column_diffs(); function get_col_diff_text(a_col ut_compound_data_helper.t_column_diffs) return varchar2 is begin @@ -143,7 +146,6 @@ create or replace type body ut_data_value_refcursor as function get_missing_key_message(a_missing_keys ut_compound_data_helper.t_missing_pk) return varchar2 is l_message varchar2(200); begin - if a_missing_keys.diff_type = 'a' then l_message := ' Join key '||a_missing_keys.missingxpath||' does not exists in actual'; elsif a_missing_keys.diff_type = 'e' then @@ -184,7 +186,7 @@ create or replace type body ut_data_value_refcursor as --diff columns if not self.is_null and not l_actual.is_null then - l_column_diffs := ut_compound_data_helper.get_columns_diff(self.columns_info, l_actual.columns_info, a_exclude_xpath, a_include_xpath); + l_column_diffs := ut_compound_data_helper.get_columns_diff(self.cursor_details.cursor_info,l_actual.cursor_details.cursor_info); if l_column_diffs.count > 0 then ut_utils.append_to_clob(l_result,chr(10) || 'Columns:' || chr(10)); @@ -199,8 +201,8 @@ create or replace type body ut_data_value_refcursor as end if; --check for missing pk - if (a_join_by_xpath is not null) then - l_missing_pk := ut_compound_data_helper.is_pk_exists(self.key_info, l_actual.key_info, a_exclude_xpath, a_include_xpath,a_join_by_xpath); + if a_join_by_list.count > 0 then + l_missing_pk := ut_compound_data_helper.get_missing_pk(self.cursor_details.cursor_info,l_actual.cursor_details.cursor_info,a_join_by_list); end if; --diff rows and row elements if the pk is not missing @@ -213,7 +215,8 @@ create or replace type body ut_data_value_refcursor as ut_utils.append_to_clob(l_result, get_missing_key_message(l_missing_pk(i))|| chr(10)); end loop; - if ut_utils.int_to_boolean(self.contain_collection) or ut_utils.int_to_boolean(l_actual.contain_collection) then + if ut_compound_data_helper.contains_collection(self.cursor_details.cursor_info) > 0 + or ut_compound_data_helper.contains_collection(l_actual.cursor_details.cursor_info) > 0 then ut_utils.append_to_clob(l_result,' Please make sure that your join clause is not refferring to collection element'|| chr(10)); end if; @@ -228,36 +231,29 @@ create or replace type body ut_data_value_refcursor as a_is_negated boolean := false, a_join_by_list ut_varchar2_list:=ut_varchar2_list()) return integer is l_result integer := 0; - l_other ut_data_value_refcursor; - - l_act_pk ut_cursor_column_tab; - l_exp_pk ut_cursor_column_tab; + l_actual ut_data_value_refcursor; + + l_pk_missing_tab ut_compound_data_helper.tt_missing_pk; - function is_pk_missing (a_pk_missing_tab ut_compound_data_helper.tt_missing_pk) return integer is - begin - return case when a_pk_missing_tab.count > 0 then 1 else 0 end; - end; begin if not a_other is of (ut_data_value_refcursor) then raise value_error; end if; - l_other := treat(a_other as ut_data_value_refcursor); + l_actual := treat(a_other as ut_data_value_refcursor); --if we join by key and key is missing fail and report error if a_join_by_list.count > 0 then - l_act_pk := ut_compound_data_helper.compare_cursor_to_columns(self.cursor_details.cursor_info ,a_join_by_list); - l_exp_pk := ut_compound_data_helper.compare_cursor_to_columns(l_other.cursor_details.cursor_info,a_join_by_list); - l_result := case when (l_act_pk.count > 0) or (l_exp_pk.count > 0) then 1 else 0 end; + l_pk_missing_tab := ut_compound_data_helper.get_missing_pk(self.cursor_details.cursor_info,l_actual.cursor_details.cursor_info,a_join_by_list); + l_result := case when (l_pk_missing_tab.count > 0) then 1 else 0 end; end if; - if l_result = 0 then - if (self.cursor_details is not null and l_other.cursor_details is not null) and (self.cursor_details != l_other.cursor_details) then + if (self.cursor_details is not null and l_actual.cursor_details is not null) and (self.cursor_details != l_actual.cursor_details) then l_result := 1; - end if; + end if; l_result := l_result + (self as ut_compound_data_value).compare_implementation(a_other,a_unordered, a_inclusion_compare, - a_is_negated, a_join_by_list); + a_is_negated, a_join_by_list); end if; return l_result; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tps b/source/expectations/data_values/ut_data_value_refcursor.tps index 76deb005f..ca740f191 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tps +++ b/source/expectations/data_values/ut_data_value_refcursor.tps @@ -52,7 +52,8 @@ create or replace type ut_data_value_refcursor under ut_compound_data_value( constructor function ut_data_value_refcursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) return self as result, member procedure init(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor), overriding member function to_string return varchar2, - overriding member function diff( a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean := false ) return varchar2, + member function diff( a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean := false + ,a_join_by_list ut_varchar2_list:=ut_varchar2_list()) return varchar2, overriding member function compare_implementation(a_other ut_data_value, a_unordered boolean, a_inclusion_compare boolean := false, a_is_negated boolean := false, a_join_by_list ut_varchar2_list:=ut_varchar2_list()) return integer, overriding member function is_empty return boolean, diff --git a/source/expectations/matchers/ut_equal.tpb b/source/expectations/matchers/ut_equal.tpb index c60d0d48e..489e9f41f 100644 --- a/source/expectations/matchers/ut_equal.tpb +++ b/source/expectations/matchers/ut_equal.tpb @@ -282,11 +282,19 @@ create or replace type body ut_equal as overriding member function failure_message(a_actual ut_data_value) return varchar2 is l_result varchar2(32767); + l_actual ut_data_value; begin if self.expected.data_type = a_actual.data_type and self.expected.is_diffable then - l_result := - 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() - || chr(10) || 'Diff:' || expected.diff(a_actual, get_exclude_xpath(), get_include_xpath(), get_join_by_xpath(), get_unordered()); + if self.expected is of (ut_data_value_refcursor) then + l_actual := treat(a_actual as ut_data_value_refcursor).filter_cursor(exclude_list, include_list); + l_result := + 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() + || chr(10) || 'Diff:' || treat(expected as ut_data_value_refcursor).filter_cursor(exclude_list, include_list).diff(l_actual, get_exclude_xpath(), get_include_xpath(), get_join_by_xpath(), get_unordered(),get_join_by_list()); + else + l_result := + 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() + || chr(10) || 'Diff:' || expected.diff(a_actual, get_exclude_xpath(), get_include_xpath(), get_join_by_xpath(), get_unordered()); + end if; else l_result := (self as ut_matcher).failure_message(a_actual) || ': '|| self.expected.to_string_report(); end if; diff --git a/source/expectations/matchers/ut_include.tpb b/source/expectations/matchers/ut_include.tpb index 620f3267d..696e89a14 100644 --- a/source/expectations/matchers/ut_include.tpb +++ b/source/expectations/matchers/ut_include.tpb @@ -65,11 +65,19 @@ create or replace type body ut_include as overriding member function failure_message(a_actual ut_data_value) return varchar2 is l_result varchar2(32767); + l_actual ut_data_value; begin if self.expected.data_type = a_actual.data_type and self.expected.is_diffable then - l_result := - 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() - || chr(10) || 'Diff:' || expected.diff(a_actual, self.get_exclude_xpath(), self.get_include_xpath(), self.get_join_by_xpath(), true); + if self.expected is of (ut_data_value_refcursor) then + l_actual := treat(a_actual as ut_data_value_refcursor).filter_cursor(exclude_list, include_list); + l_result := + 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() + || chr(10) || 'Diff:' || treat(expected as ut_data_value_refcursor).filter_cursor(self.exclude_list, self.include_list).diff(a_actual, self.get_exclude_xpath(), self.get_include_xpath(), self.get_join_by_xpath(), true); + else + l_result := + 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() + || chr(10) || 'Diff:' || expected.diff(a_actual, self.get_exclude_xpath(), self.get_include_xpath(), self.get_join_by_xpath(), true); + end if; else l_result := (self as ut_matcher).failure_message(a_actual) || ': '|| self.expected.to_string_report(); end if; diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index d37ad7572..41fbaa3c4 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -481,25 +481,6 @@ create or replace package body test_expectations_cursor is ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; - procedure include_columns_xpath_invalid - as - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; - begin - --Arrange - open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 4; - open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; - begin - --Act - ut3.ut.expect(l_actual).to_equal(l_expected).include('/ROW/RN,\\//A_Column,//SOME_COL'); - --Assert - ut.fail('Expected exception but nothing was raised'); - exception - when others then - ut.expect(sqlcode).to_be_between(-31013,-31011); - end; - end; - procedure include_columns_xpath as l_actual sys_refcursor; @@ -617,7 +598,9 @@ Rows: [ 1 differences ] l_expected_message := q'[Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 2 ] Diff: Columns: - Column data-type is invalid. Expected: NUMBER, actual: VARCHAR2.]'; + Column data-type is invalid. Expected: NUMBER, actual: VARCHAR2. +Rows: [ all different ] + All rows are different as the columns are not matching.]'; l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); @@ -663,7 +646,9 @@ Diff: Columns: Column is misplaced. Expected position: 2, actual position: 4. Column is misplaced. Expected position: 3, actual position: 2. - Column is misplaced. Expected position: 4, actual position: 3.]'; + Column is misplaced. Expected position: 4, actual position: 3. +Rows: [ all different ] + All rows are different as the columns are not matching.]'; l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); @@ -990,15 +975,15 @@ Rows: [ 4 differences ] --Act ut3.ut.expect(l_actual).to_equal(l_expected); - l_expected_message := q'[Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 2 ]% -Diff:% -Columns:% - Column [data-type: NUMBER] is missing. Expected column position: 1.% - Column [data-type: NUMBER] is missing. Expected column position: 2.% - Column <%1%> [position: 1, data-type: CHAR] is not expected in results.% - Column <%2%> [position: 2, data-type: CHAR] is not expected in results.% -Rows: [ 2 differences ]% - All rows are different as the columns are not matching.%]'; + l_expected_message := q'[%Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 2 ] +%Diff: +%Columns: +%Column [data-type: NUMBER] is missing. Expected column position: 1. +%Column [data-type: NUMBER] is missing. Expected column position: 2. +%Column <1> [position: 1, data-type: CHAR] is not expected in results. +%Column <2> [position: 2, data-type: CHAR] is not expected in results. +%Rows: [ all different ] +%All rows are different as the columns are not matching.]'; l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); @@ -1026,7 +1011,7 @@ Rows: [ 2 differences ]% begin --Arrange open l_actual for select rownum as rn, 'a', 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 4; - open l_expected for select rownum as rn, 'a', 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; + open l_expected for select rownum as rn, 'a', 'd' as A_COLUMN, 'c' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; begin --Act ut3.ut.expect(l_actual).to_equal(l_expected).include(q'!/ROW/RN,'a',//SOME_COL!'); diff --git a/test/core/expectations/test_expectations_cursor.pks b/test/core/expectations/test_expectations_cursor.pks index f6e3de27c..0bd3e81d5 100644 --- a/test/core/expectations/test_expectations_cursor.pks +++ b/test/core/expectations/test_expectations_cursor.pks @@ -107,9 +107,6 @@ create or replace package test_expectations_cursor is --%test(Comma separated list of columns to include is case sensitive) procedure include_columns_as_csv; - --%test(Include columns fails on invalid XPath) - procedure include_columns_xpath_invalid; - --%test(Include columns by XPath is case sensitive) procedure include_columns_xpath; From 80ff76c6a6f2b024eb99192f038206685d20ae37 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 20 Nov 2018 08:04:31 +0000 Subject: [PATCH 0127/1096] Updated project version after build [skip ci] --- VERSION | 2 +- sonar-project.properties | 2 +- source/core/ut_utils.pks | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 6eef43b75..a85121415 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.4 +v3.1.4-develop diff --git a/sonar-project.properties b/sonar-project.properties index a0288a65d..816b63607 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,7 @@ sonar.projectKey=utPLSQL # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=utPLSQL -sonar.projectVersion=v3.1.3 +sonar.projectVersion=v3.1.4-develop # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # Since SonarQube 4.2, this property is optional if sonar.modules is set. diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index e5de6d623..14048bbae 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.3.2398'; + gc_version constant varchar2(50) := 'v3.1.4.2403-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From 1356f39ef70082d9b7e3933834c40dd869099d1b Mon Sep 17 00:00:00 2001 From: lwasylow Date: Tue, 20 Nov 2018 20:42:18 +0000 Subject: [PATCH 0128/1096] Update to cursor comparision --- .../data_values/ut_compound_data_helper.pkb | 27 ++++++++++++++----- .../data_values/ut_compound_data_value.tpb | 19 ++++++------- .../ut_curr_usr_compound_helper.pkb | 17 ++++++++---- .../ut_curr_usr_compound_helper.pks | 2 +- .../data_values/ut_cursor_column.tpb | 12 ++++----- .../data_values/ut_cursor_column.tps | 8 +++--- .../data_values/ut_cursor_details.tpb | 21 +++++++++------ .../data_values/ut_data_value_refcursor.tpb | 1 + source/expectations/matchers/ut_include.tpb | 1 + source/expectations/ut_expectation.tpb | 7 ++--- .../expectations/test_expectations_cursor.pkb | 4 +-- 11 files changed, 72 insertions(+), 47 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 61591e383..139e3fb8e 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -444,6 +444,7 @@ create or replace package body ut_compound_data_helper is ut_utils.append_to_clob(a_equal_stmt,l_sql_stmt); end; + --TODO : Scenario where join by is on whole type not a column of type e.g. NESTEDTABLE procedure generate_partition_stmt(a_data_info ut_cursor_column, a_partition_stmt in out nocopy clob,a_pk_table in ut_varchar2_list,a_col_name in varchar2) is l_alias varchar2(10) := 'ucd.'; l_pk_tab ut_varchar2_list := coalesce(a_pk_table,ut_varchar2_list()); @@ -486,10 +487,20 @@ create or replace package body ut_compound_data_helper is begin if a_data_info.is_sql_diffable = 0 then l_col_type := 'XMLTYPE'; + --TODO : Is it right to use timestamp ? elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type = 'DATE' then l_col_type := 'TIMESTAMP'; + elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('TIMESTAMP','TIMESTAMP WITH TIME ZONE') then + l_col_type := a_data_info.column_type; + --TODO : Oracle bug : https://community.oracle.com/thread/1957521 + elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type = 'TIMESTAMP WITH LOCAL TIME ZONE' then + l_col_type := 'VARCHAR2(50)'; + elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('INTERVAL DAY TO SECOND','INTERVAL YEAR TO MONTH') then + l_col_type := a_data_info.column_type; else - l_col_type := a_data_info.column_type||case when a_data_info.column_len is not null then '('||a_data_info.column_len||')' else null end; + l_col_type := a_data_info.column_type||case when a_data_info.column_len is not null then + '('||a_data_info.column_len||')' + else null end; end if; l_sql_stmt := ' '||a_col_name||' '||l_col_type||q'[ PATH ']'||a_data_info.access_path||q'[',]'; ut_utils.append_to_clob(a_sql_stmt, l_sql_stmt); @@ -654,7 +665,7 @@ create or replace package body ut_compound_data_helper is end if; ut_utils.append_to_clob(l_compare_sql,l_temp_string); - dbms_output.put_line(l_compare_sql); + --dbms_output.put_line(l_compare_sql); return l_compare_sql; end; @@ -689,15 +700,17 @@ create or replace package body ut_compound_data_helper is l_sql varchar2(32767) := q'[with sorted as - (select r_num,regexp_substr(t.column_value, '[^/]+', 1, commas.column_value) as colval,commas.column_value lev + (select r_num,regexp_substr(t.column_value, '[^/]+', 1, commas.column_value) as colval,commas.column_value lev, + t.column_value access_path from (select row_number() over(order by 1) r_num, column_value from ((table(:a_current_list)))) t, table(cast(multiset (select level from dual connect by level <= length(regexp_replace(t.column_value,'[^/]+')) + 1) as sys.odcinumberlist)) commas order by r_num,lev), hier as - (select r_num,lev,colval column_name,lag(colval, 1) over(partition by r_num order by lev) parent_name from sorted), + (select r_num,lev,colval column_name,lag(colval, 1) over(partition by r_num order by lev) parent_name , access_path + from sorted), constructed as ( - select lev,column_name,parent_name from hier), + select lev,column_name,parent_name,access_path from hier), t1(column_name, parent_name) AS ( select column_name,parent_name from table(:a_cursor_info) where parent_name is null union all @@ -712,7 +725,7 @@ create or replace package body ut_compound_data_helper is l_result ut_cursor_column_tab := ut_cursor_column_tab(); begin l_sql := l_sql || q'[select ut_cursor_column(i.column_name,i.column_schema,i.column_type_name, i.column_prec,i.column_scale,i.column_len, i.parent_name, - i.hierarchy_level,i.column_position, i.column_type) + i.hierarchy_level,i.column_position, i.column_type, i.is_collection) from t1 join table(:a_cursor_info) i on ( nvl(t1.parent_name,1) = nvl(i.parent_name,1) and t1.column_name = i.column_name)]'; if a_include then l_sql := l_sql || ' join constructed c on ( nvl(t1.parent_name,1) = nvl(c.parent_name,1) and t1.column_name = c.column_name)'; @@ -732,7 +745,7 @@ create or replace package body ut_compound_data_helper is l_sql varchar2(32767) := get_cursor_vs_list_sql; l_result ut_varchar2_list := ut_varchar2_list(); begin - l_sql := l_sql || q'[select c.parent_name || case when c.parent_name is null then null else '/' end ||c.column_name + l_sql := l_sql || q'[select c.access_path from t1 join table(:a_cursor_info) i on ( nvl(t1.parent_name,1) = nvl(i.parent_name,1) and t1.column_name = i.column_name)]'; l_sql := l_sql ||'right outer join constructed c on ( nvl(t1.parent_name,1) = nvl(c.parent_name,1) and t1.column_name = c.column_name) where t1.column_name is null'; diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index 12396c756..8db8071df 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -229,20 +229,21 @@ create or replace type body ut_compound_data_value as if (ut_utils.gc_diff_max_rows > l_sql_rowcount ) then ut_compound_data_helper.insert_diffs_result(l_diff_tab,l_diff_id); end if; - l_sql_rowcount := l_sql_rowcount + l_diff_tab.count; if (ut_utils.gc_diff_max_rows <= l_sql_rowcount and l_max_rows != ut_utils.gc_bc_fetch_limit ) then l_max_rows := ut_utils.gc_bc_fetch_limit; end if; - end loop; + end loop; + + ut_compound_data_helper.set_rows_diff(l_sql_rowcount); --result is OK only if both are same - if l_sql_rowcount = 0 and ( self.elements_count = l_other.elements_count or a_inclusion_compare )then - l_result := 0; - else - ut_compound_data_helper.set_rows_diff(l_sql_rowcount); - l_result := 1; - end if; - return l_result; + if l_sql_rowcount = 0 and ( self.elements_count = l_other.elements_count or a_inclusion_compare )then + l_result := 0; + else + l_result := 1; + end if; + + return l_result; end; diff --git a/source/expectations/data_values/ut_curr_usr_compound_helper.pkb b/source/expectations/data_values/ut_curr_usr_compound_helper.pkb index f829a9c0a..8c7b53c92 100644 --- a/source/expectations/data_values/ut_curr_usr_compound_helper.pkb +++ b/source/expectations/data_values/ut_curr_usr_compound_helper.pkb @@ -34,15 +34,22 @@ create or replace package body ut_curr_usr_compound_helper is return ut_utils.boolean_to_int(is_sql_compare_allowed(a_type_name)); end; - function is_collection (a_owner varchar2,a_type_name varchar2) return boolean is + function is_collection (a_owner varchar2,a_type_name varchar2, a_anytype_code in integer :=null) return boolean is l_type_view varchar2(200) := ut_metadata.get_dba_view('dba_types'); l_typecode varchar2(100); begin - execute immediate 'select typecode from '||l_type_view ||' - where owner = :owner and type_name = :typename' - into l_typecode using a_owner,a_type_name; - return l_typecode = 'COLLECTION'; + if a_anytype_code is null then + + execute immediate 'select typecode from '||l_type_view ||' + where owner = :owner and type_name = :typename' + into l_typecode using a_owner,a_type_name; + + return l_typecode = 'COLLECTION'; + else + return a_anytype_code in (dbms_types.typecode_varray,dbms_types.typecode_table,dbms_types.typecode_namedcollection); + end if; + exception when no_data_found then return false; diff --git a/source/expectations/data_values/ut_curr_usr_compound_helper.pks b/source/expectations/data_values/ut_curr_usr_compound_helper.pks index eb70963ca..71427b686 100644 --- a/source/expectations/data_values/ut_curr_usr_compound_helper.pks +++ b/source/expectations/data_values/ut_curr_usr_compound_helper.pks @@ -4,7 +4,7 @@ create or replace package ut_curr_usr_compound_helper authid current_user is function is_sql_compare_int(a_type_name varchar2) return integer; - function is_collection (a_owner varchar2,a_type_name varchar2) return boolean; + function is_collection (a_owner varchar2,a_type_name varchar2, a_anytype_code in integer :=null) return boolean; --TODO Depracate once switch fully to type procedure get_columns_info( diff --git a/source/expectations/data_values/ut_cursor_column.tpb b/source/expectations/data_values/ut_cursor_column.tpb index b9216ec4d..1c650708e 100644 --- a/source/expectations/data_values/ut_cursor_column.tpb +++ b/source/expectations/data_values/ut_cursor_column.tpb @@ -3,8 +3,8 @@ create or replace type body ut_cursor_column as member procedure init(self in out nocopy ut_cursor_column, a_col_name varchar2, a_col_schema_name varchar2, a_col_type_name varchar2, a_col_prec integer, a_col_scale integer, - a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level number := 1, - a_col_position number, a_col_type varchar2) is + a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, + a_col_position integer, a_col_type varchar2, a_collection integer) is begin self.parent_name := a_parent_name; self.hierarchy_level := a_hierarchy_level; @@ -29,7 +29,7 @@ create or replace type body ut_cursor_column as ut_utils.boolean_to_int(ut_curr_usr_compound_helper.is_sql_compare_allowed(self.column_type)) end; --TODO : Part of the constructor same as has nested ?? - self.is_collection := ut_utils.boolean_to_int(ut_curr_usr_compound_helper.is_collection(a_col_schema_name,a_col_type_name)); + self.is_collection := a_collection; --TODO : fix that as is nasty hardcode self.has_nested_col := case when lower(self.column_type) = 'user_defined_type' and self.is_collection = 0 then 1 else 0 end; end; @@ -42,11 +42,11 @@ create or replace type body ut_cursor_column as constructor function ut_cursor_column( self in out nocopy ut_cursor_column, a_col_name varchar2, a_col_schema_name varchar2, a_col_type_name varchar2, a_col_prec integer, a_col_scale integer, - a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level number := 1, - a_col_position number, a_col_type in varchar2) return self as result is + a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, + a_col_position integer, a_col_type in varchar2, a_collection integer) return self as result is begin init(a_col_name, a_col_schema_name, a_col_type_name, a_col_prec, - a_col_scale, a_col_max_len, a_parent_name,a_hierarchy_level, a_col_position, a_col_type); + a_col_scale, a_col_max_len, a_parent_name,a_hierarchy_level, a_col_position, a_col_type, a_collection); return; end; end; diff --git a/source/expectations/data_values/ut_cursor_column.tps b/source/expectations/data_values/ut_cursor_column.tps index c15e73458..82ec96f02 100644 --- a/source/expectations/data_values/ut_cursor_column.tps +++ b/source/expectations/data_values/ut_cursor_column.tps @@ -20,14 +20,14 @@ create or replace type ut_cursor_column force authid current_user as object member procedure init(self in out nocopy ut_cursor_column, a_col_name varchar2, a_col_schema_name varchar2, a_col_type_name varchar2, a_col_prec integer, a_col_scale integer, - a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level number := 1, - a_col_position number, a_col_type in varchar2), + a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, + a_col_position integer, a_col_type in varchar2, a_collection integer), constructor function ut_cursor_column( self in out nocopy ut_cursor_column, a_col_name varchar2, a_col_schema_name varchar2, a_col_type_name varchar2, a_col_prec integer, a_col_scale integer, - a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level number := 1, - a_col_position number, a_col_type in varchar2) + a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, + a_col_position integer, a_col_type in varchar2, a_collection integer) return self as result ) / diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb index 016fd2ac5..7323d7e13 100644 --- a/source/expectations/data_values/ut_cursor_details.tpb +++ b/source/expectations/data_values/ut_cursor_details.tpb @@ -3,12 +3,14 @@ create or replace type body ut_cursor_details as order member function compare(a_other ut_cursor_details) return integer is l_diffs integer; begin + select count(1) into l_diffs from table(self.cursor_info) a full outer join table(a_other.cursor_info) e on ( decode(a.parent_name,e.parent_name,1,0)= 1 and a.column_name = e.column_name and - REPLACE(a.column_type,'VARCHAR','CHAR') = REPLACE(e.column_type,'VARCHAR','CHAR') + REPLACE(a.column_type,'VARCHAR2','CHAR') = REPLACE(e.column_type,'VARCHAR2','CHAR') and a.column_position = e.column_position ) where a.column_name is null or e.column_name is null; + return l_diffs; end; @@ -69,7 +71,8 @@ create or replace type body ut_cursor_details as l_csid pls_integer; l_csfrm pls_integer; l_attr_elt_type anytype; - l_anytype anytype; + l_anytype anytype; + l_is_collection boolean; begin self.cursor_info := ut_cursor_column_tab(); l_cursor_number := dbms_sql.to_cursor_number(a_cursor); @@ -79,6 +82,7 @@ create or replace type body ut_cursor_details as a_cursor := dbms_sql.to_refcursor(l_cursor_number); for cur in 1 .. l_columns_count loop + l_is_collection := ut_curr_usr_compound_helper.is_collection(l_columns_desc(cur).col_schema_name,l_columns_desc(cur).col_type_name); self.cursor_info.extend; self.cursor_info(cursor_info.last) := ut_cursor_column( l_columns_desc(cur).col_name, l_columns_desc(cur).col_schema_name, @@ -89,11 +93,10 @@ create or replace type body ut_cursor_details as null, 1, cur, - ut_curr_usr_compound_helper.get_column_type_desc(l_columns_desc(cur).col_type,true) + ut_curr_usr_compound_helper.get_column_type_desc(l_columns_desc(cur).col_type,true), + ut_utils.boolean_to_int(l_is_collection) ); - if l_columns_desc(cur).col_type = dbms_sql.user_defined_type - and - not ut_curr_usr_compound_helper.is_collection(l_columns_desc(cur).col_schema_name,l_columns_desc(cur).col_type_name) then + if l_columns_desc(cur).col_type = dbms_sql.user_defined_type and not l_is_collection then l_anytype := get_user_defined_type(l_columns_desc(cur).col_schema_name , l_columns_desc(cur).col_type_name ); for i in 1 .. get_anytype_attribute_count(l_anytype) loop l_attribute_typecode := l_anytype.getattreleminfo(pos => i, --First attribute @@ -105,9 +108,10 @@ create or replace type body ut_cursor_details as attr_elt_type => l_attr_elt_type, aname => l_aname); + l_is_collection := ut_curr_usr_compound_helper.is_collection(l_columns_desc(cur).col_schema_name,l_columns_desc(cur).col_type_name,l_attribute_typecode); self.cursor_info.extend; self.cursor_info(cursor_info.last) := ut_cursor_column( l_aname, - null, + l_columns_desc(cur).col_schema_name, null, l_prec, l_scale, @@ -115,7 +119,8 @@ create or replace type body ut_cursor_details as l_columns_desc(cur).col_name, 2, i, - ut_curr_usr_compound_helper.get_column_type_desc(l_attribute_typecode,false) + ut_curr_usr_compound_helper.get_column_type_desc(l_attribute_typecode,false), + ut_utils.boolean_to_int(l_is_collection) ); end loop; end if; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 2d12fe9f7..3114d61c6 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -248,6 +248,7 @@ create or replace type body ut_data_value_refcursor as l_result := case when (l_pk_missing_tab.count > 0) then 1 else 0 end; end if; + if l_result = 0 then if (self.cursor_details is not null and l_actual.cursor_details is not null) and (self.cursor_details != l_actual.cursor_details) then l_result := 1; diff --git a/source/expectations/matchers/ut_include.tpb b/source/expectations/matchers/ut_include.tpb index 696e89a14..8928452fd 100644 --- a/source/expectations/matchers/ut_include.tpb +++ b/source/expectations/matchers/ut_include.tpb @@ -51,6 +51,7 @@ create or replace type body ut_include as overriding member function run_matcher(self in out nocopy ut_include, a_actual ut_data_value) return boolean is l_result boolean; l_actual ut_data_value; + l_result1 integer; begin --TODO : Join by exclude an include should show differences if self.expected.data_type = a_actual.data_type then diff --git a/source/expectations/ut_expectation.tpb b/source/expectations/ut_expectation.tpb index 19775c707..0372e0ddf 100644 --- a/source/expectations/ut_expectation.tpb +++ b/source/expectations/ut_expectation.tpb @@ -33,12 +33,9 @@ create or replace type body ut_expectation as l_message varchar2(32767); begin --Negated matcher for include option. - if (l_matcher is of (ut_include)) then - l_expectation_result := l_matcher.run_matcher( self.actual_data ); - else - l_expectation_result := l_matcher.run_matcher_negated( self.actual_data ); - end if; + l_expectation_result := l_matcher.run_matcher_negated( self.actual_data ); l_expectation_result := coalesce(l_expectation_result,false); + l_message := coalesce( l_matcher.error_message( self.actual_data ), l_matcher.failure_message_when_negated( self.actual_data ) ); ut_expectation_processor.add_expectation_result( ut_expectation_result( ut_utils.to_test_result( l_expectation_result ), self.description, l_message ) ); end; diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index 41fbaa3c4..eee70653a 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -2442,7 +2442,7 @@ Diff:% begin --Arrange open l_actual for select username,rownum * 10 user_id from all_users where rownum < 5; - open l_expected for select username ,rownum user_id from all_users where rownum < 5; + open l_expected for select username||to_char(rownum) username ,rownum user_id from all_users where rownum < 5; --Act ut3.ut.expect(l_actual).not_to_contain(l_expected).join_by('USER_ID'); @@ -2456,7 +2456,7 @@ Diff:% begin --Arrange open l_actual for select username,rownum * 10 user_id from all_users where rownum < 5; - open l_expected for select username ,rownum user_id from all_users where rownum < 5; + open l_expected for select username||to_char(rownum) username ,rownum user_id from all_users where rownum < 5; --Act ut3.ut.expect(l_actual).not_to_include(l_expected).join_by('USER_ID'); From b094911993db65ed74cccc2f2258691ec3260e05 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Wed, 21 Nov 2018 07:29:31 +0000 Subject: [PATCH 0129/1096] Update tests --- .../data_values/ut_compound_data_helper.pkb | 2 +- .../data_values/ut_data_value_refcursor.tpb | 2 +- source/expectations/matchers/ut_include.tpb | 5 +++++ source/expectations/matchers/ut_include.tps | 1 + .../expectations/test_expectations_cursor.pkb | 22 +++++++++++++++---- .../expectations/test_expectations_cursor.pks | 2 +- 6 files changed, 27 insertions(+), 7 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 139e3fb8e..9fef0ad08 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -665,7 +665,7 @@ create or replace package body ut_compound_data_helper is end if; ut_utils.append_to_clob(l_compare_sql,l_temp_string); - --dbms_output.put_line(l_compare_sql); + dbms_output.put_line(l_compare_sql); return l_compare_sql; end; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 3114d61c6..682911f5d 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -249,7 +249,7 @@ create or replace type body ut_data_value_refcursor as end if; - if l_result = 0 then + if l_result = 0 then if (self.cursor_details is not null and l_actual.cursor_details is not null) and (self.cursor_details != l_actual.cursor_details) then l_result := 1; end if; diff --git a/source/expectations/matchers/ut_include.tpb b/source/expectations/matchers/ut_include.tpb index 8928452fd..7859e24ff 100644 --- a/source/expectations/matchers/ut_include.tpb +++ b/source/expectations/matchers/ut_include.tpb @@ -64,6 +64,11 @@ create or replace type body ut_include as return l_result; end; + overriding member function run_matcher_negated(self in out nocopy ut_include, a_actual ut_data_value) return boolean is + begin + return run_matcher(a_actual); + end; + overriding member function failure_message(a_actual ut_data_value) return varchar2 is l_result varchar2(32767); l_actual ut_data_value; diff --git a/source/expectations/matchers/ut_include.tps b/source/expectations/matchers/ut_include.tps index 6ed32756c..b0e8a4bd3 100644 --- a/source/expectations/matchers/ut_include.tps +++ b/source/expectations/matchers/ut_include.tps @@ -30,6 +30,7 @@ create or replace type ut_include under ut_equal( member function negated return ut_include, member function get_negated return boolean, overriding member function run_matcher(self in out nocopy ut_include, a_actual ut_data_value) return boolean, + overriding member function run_matcher_negated(self in out nocopy ut_include, a_actual ut_data_value) return boolean, overriding member function failure_message(a_actual ut_data_value) return varchar2, overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2 ) diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index eee70653a..4e16d53e3 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -2467,6 +2467,8 @@ Diff:% procedure not_inc_join_incl_cols_as_lst is l_actual sys_refcursor; l_expected sys_refcursor; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); begin --Arrange open l_actual for select rownum as rn, 'b' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 10; @@ -2474,7 +2476,19 @@ Diff:% --Act ut3.ut.expect(l_actual).not_to_include(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')).join_by('RN'); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + l_expected_message := q'[%Actual: (refcursor [ count = 9 ]) +%Data-types: +%NUMBERCHARCHARCHARCHAR +%Data: +%% +%was expected not to include:(refcursor [ count = 3 ]) +%Data-types: +%NUMBERCHARCHARCHARCHAR +%Data: +%1adxc2adxc3adxc]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); end; procedure not_cont_join_incl_cols_as_lst is @@ -2483,7 +2497,7 @@ Diff:% begin --Arrange open l_actual for select rownum as rn, 'b' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 10; - open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; + open l_expected for select rownum * 20 rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; --Act ut3.ut.expect(l_actual).not_to_contain(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')).join_by('RN'); --Assert @@ -2496,7 +2510,7 @@ Diff:% begin --Arrange open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'y' SOME_COL, 'd' "Some_Col" from dual a connect by level < 10; - open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; + open l_expected for select rownum * 20 as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; --Act ut3.ut.expect(l_actual).not_to_include(l_expected).exclude(ut3.ut_varchar2_list('//Some_Col','A_COLUMN')).join_by('RN'); --Assert @@ -2509,7 +2523,7 @@ Diff:% begin --Arrange open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'y' SOME_COL, 'd' "Some_Col" from dual a connect by level < 10; - open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; + open l_expected for select rownum * 20 as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; --Act ut3.ut.expect(l_actual).not_to_contain(l_expected).exclude(ut3.ut_varchar2_list('//Some_Col','A_COLUMN')).join_by('RN'); --Assert diff --git a/test/core/expectations/test_expectations_cursor.pks b/test/core/expectations/test_expectations_cursor.pks index 0bd3e81d5..cbb029b9b 100644 --- a/test/core/expectations/test_expectations_cursor.pks +++ b/test/core/expectations/test_expectations_cursor.pks @@ -391,7 +391,7 @@ create or replace package test_expectations_cursor is --%test( Cursor not include data from another cursor with joinby clause) procedure cursor_not_to_include_joinby; - --%test(Cursor not include data with of columns to include and join by value) + --%test(Cursor not include data with of columns to include and join by value - Fail) procedure not_inc_join_incl_cols_as_lst; --%test(Cursor not contains data with of columns to include and join by value) From 21dca2b3dc5db4eca293af92ce762ed27a9cf180 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Wed, 21 Nov 2018 08:39:49 +0000 Subject: [PATCH 0130/1096] Resolve issue with nested table being join Removing XPATH --- .../data_values/ut_compound_data_helper.pkb | 29 +++- .../data_values/ut_compound_data_helper.pks | 2 + .../data_values/ut_data_value_refcursor.tpb | 142 +++++++++++++++--- .../data_values/ut_data_value_refcursor.tps | 2 + 4 files changed, 151 insertions(+), 24 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 9fef0ad08..2a6eefe34 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -429,7 +429,12 @@ create or replace package body ut_compound_data_helper is if a_data_info.access_path = l_pk_tab(l_index) then l_sql_stmt := case when a_join_by_stmt is null then null else ' and ' end; l_sql_stmt := l_sql_stmt ||' a.'||a_col_name||q'[ = ]'||' e.'||a_col_name; - end if; + elsif a_data_info.parent_name = l_pk_tab(l_index)then + --When then table is nested and join is on whole table + --TODO : Can this be done smarter ? + l_sql_stmt := case when a_join_by_stmt is null then null else ' and ' end; + l_sql_stmt := l_sql_stmt ||' a.'||a_col_name||q'[ = ]'||' e.'||a_col_name; + end if; exit when (a_data_info.access_path = l_pk_tab(l_index)) or l_index = l_pk_tab.count; l_index := l_pk_tab.next(l_index); end loop; @@ -457,7 +462,13 @@ create or replace package body ut_compound_data_helper is if a_data_info.access_path = l_pk_tab(l_index) then l_sql_stmt := case when a_partition_stmt is null then null else ',' end; l_sql_stmt := l_sql_stmt ||l_alias||a_col_name; + elsif a_data_info.parent_name = l_pk_tab(l_index)then + --When then table is nested and join is on whole table + --TODO : Can this be done smarter ? + l_sql_stmt := case when a_partition_stmt is null then null else ',' end; + l_sql_stmt := l_sql_stmt ||l_alias||a_col_name; end if; + exit when (a_data_info.access_path = l_pk_tab(l_index)) or l_index = l_pk_tab.count; l_index := l_pk_tab.next(l_index); end loop; @@ -515,7 +526,6 @@ create or replace package body ut_compound_data_helper is begin if l_cursor_info is not null then --Parition by piece - --TODO : Collection is intersting exmaple that we probably has to extract full xml and hash it. ut_utils.append_to_clob(a_partition_stmt,', row_number() over (partition by '); for i in 1..l_cursor_info.count loop if l_cursor_info(i).has_nested_col = 0 then @@ -665,7 +675,6 @@ create or replace package body ut_compound_data_helper is end if; ut_utils.append_to_clob(l_compare_sql,l_temp_string); - dbms_output.put_line(l_compare_sql); return l_compare_sql; end; @@ -821,5 +830,19 @@ create or replace package body ut_compound_data_helper is return l_collection_elements; end; + function remove_incomparable_cols( a_cursor_details ut_cursor_column_tab,a_incomparable_cols ut_varchar2_list) return ut_cursor_column_tab is + l_result ut_cursor_column_tab; + begin + select ut_cursor_column(i.column_name,i.column_schema,i.column_type_name, i.column_prec,i.column_scale,i.column_len, i.parent_name, + i.hierarchy_level,i.column_position, i.column_type, i.is_collection) + bulk collect into l_result + from table(a_cursor_details) i + left outer join table(a_incomparable_cols) c + on (i.access_path = c.column_value) + where c.column_value is null; + + return l_result; + end; + end; / diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index f2b31f82e..84e8f787e 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -116,5 +116,7 @@ create or replace package ut_compound_data_helper authid definer is function contains_collection (a_cursor_info ut_cursor_column_tab) return number; + function remove_incomparable_cols( a_cursor_details ut_cursor_column_tab,a_incomparable_cols ut_varchar2_list) return ut_cursor_column_tab; + end; / diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 682911f5d..51c4c7f02 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -116,6 +116,69 @@ create or replace type body ut_data_value_refcursor as return l_result_string; end; + member function get_data_diff(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, + a_join_by_xpath varchar2, a_unordered boolean,a_join_by_list ut_varchar2_list:=ut_varchar2_list()) return clob is + c_max_rows integer := ut_utils.gc_diff_max_rows; + l_result clob; + l_results ut_utils.t_clob_tab := ut_utils.t_clob_tab(); + l_message varchar2(32767); + l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_diff_row_count integer; + l_actual ut_compound_data_value; + l_diff_id ut_compound_data_helper.t_hash; + l_row_diffs ut_compound_data_helper.tt_row_diffs; + l_compare_type varchar2(10); + l_self ut_compound_data_value; + + function get_diff_message (a_row_diff ut_compound_data_helper.t_row_diffs,a_is_unordered boolean) return varchar2 is + begin + + if a_is_unordered then + if a_row_diff.pk_value is not null then + return ' PK '||a_row_diff.pk_value||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; + else + return rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; + end if; + else + return ' Row No. '||a_row_diff.rn||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; + end if; + end; + + begin + if not a_other is of (ut_compound_data_value) then + raise value_error; + end if; + + l_actual := treat(a_other as ut_compound_data_value); + + dbms_lob.createtemporary(l_result,true); + + l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_actual.data_id); + + -- First tell how many rows are different + l_diff_row_count := ut_compound_data_helper.get_rows_diff_count; + --TODO : Change message when the types not matching + if l_diff_row_count > 0 then + l_row_diffs := ut_compound_data_helper.get_rows_diff( + self.data_id, l_actual.data_id, l_diff_id, c_max_rows, a_exclude_xpath, + a_include_xpath, a_join_by_xpath, a_other is of (ut_data_value_refcursor), a_unordered); + l_message := chr(10) + ||'Rows: [ ' || l_diff_row_count ||' differences' + || case when l_diff_row_count > c_max_rows and l_row_diffs.count > 0 then ', showing first '||c_max_rows end + ||' ]'||chr(10)|| case when l_row_diffs.count = 0 then ' All rows are different as the columns are not matching.' else null end; + ut_utils.append_to_clob( l_result, l_message ); + for i in 1 .. l_row_diffs.count loop + l_results.extend; + l_results(l_results.last) := get_diff_message(l_row_diffs(i),a_unordered); + end loop; + ut_utils.append_to_clob(l_result,l_results); + else + l_message:= chr(10)||'Rows: [ all different ]'||chr(10)||' All rows are different as the columns are not matching.'; + ut_utils.append_to_clob( l_result, l_message ); + end if; + return l_result; + end; + member function diff( a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean := false, a_join_by_list ut_varchar2_list:=ut_varchar2_list() ) return varchar2 is l_result clob; @@ -123,11 +186,19 @@ create or replace type body ut_data_value_refcursor as l_result_string varchar2(32767); l_actual ut_data_value_refcursor; l_column_diffs ut_compound_data_helper.tt_column_diffs := ut_compound_data_helper.tt_column_diffs(); - l_exclude_xpath varchar2(32767) := a_exclude_xpath; + l_act_cols ut_cursor_column_tab; + l_exp_cols ut_cursor_column_tab; + l_missing_pk ut_compound_data_helper.tt_missing_pk := ut_compound_data_helper.tt_missing_pk(); l_col_diffs ut_compound_data_helper.tt_column_diffs := ut_compound_data_helper.tt_column_diffs(); + c_max_rows integer := ut_utils.gc_diff_max_rows; + l_diff_id ut_compound_data_helper.t_hash; + l_diff_row_count integer; + l_row_diffs ut_compound_data_helper.tt_row_diffs; + l_message varchar2(32767); + function get_col_diff_text(a_col ut_compound_data_helper.t_column_diffs) return varchar2 is begin return @@ -155,35 +226,44 @@ create or replace type body ut_data_value_refcursor as return l_message; end; - function add_incomparable_cols_to_xpath( - a_column_diffs ut_compound_data_helper.tt_column_diffs, a_exclude_xpath varchar2 - ) return varchar2 is + function remove_incomparable_cols( a_cursor_details ut_cursor_column_tab,a_column_diffs ut_compound_data_helper.tt_column_diffs) return ut_cursor_column_tab is l_incomparable_cols ut_varchar2_list := ut_varchar2_list(); - l_result varchar2(32767); + l_filter_out ut_cursor_column_tab; begin for i in 1 .. a_column_diffs.count loop if a_column_diffs(i).diff_type in ('-','+') then l_incomparable_cols.extend; - l_incomparable_cols(l_incomparable_cols.last) := ut_utils.xmlgen_escaped_string(coalesce(a_column_diffs(i).expected_name,a_column_diffs(i).actual_name)); - end if; + l_incomparable_cols(l_incomparable_cols.last) := coalesce(a_column_diffs(i).expected_name,a_column_diffs(i).actual_name); + end if; end loop; - l_result := ut_utils.to_xpath(l_incomparable_cols); - if a_exclude_xpath is not null and l_result is not null then - l_result := l_result ||'|'||a_exclude_xpath; - else - l_result := coalesce(a_exclude_xpath, l_result); - end if; - return l_result; + + return ut_compound_data_helper.remove_incomparable_cols(a_cursor_details,l_incomparable_cols); end; + function get_diff_message (a_row_diff ut_compound_data_helper.t_row_diffs,a_is_unordered boolean) return varchar2 is + begin + + if a_is_unordered then + if a_row_diff.pk_value is not null then + return ' PK '||a_row_diff.pk_value||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; + else + return rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; + end if; + else + return ' Row No. '||a_row_diff.rn||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; + end if; + end; + begin if not a_other is of (ut_data_value_refcursor) then raise value_error; end if; l_actual := treat(a_other as ut_data_value_refcursor); - dbms_lob.createtemporary(l_result,true); + l_act_cols := l_actual.cursor_details.cursor_info; + l_exp_cols := self.cursor_details.cursor_info; + dbms_lob.createtemporary(l_result,true); --diff columns if not self.is_null and not l_actual.is_null then l_column_diffs := ut_compound_data_helper.get_columns_diff(self.cursor_details.cursor_info,l_actual.cursor_details.cursor_info); @@ -191,23 +271,45 @@ create or replace type body ut_data_value_refcursor as if l_column_diffs.count > 0 then ut_utils.append_to_clob(l_result,chr(10) || 'Columns:' || chr(10)); end if; - for i in 1 .. l_column_diffs.count loop l_results.extend; l_results(l_results.last) := get_col_diff_text(l_column_diffs(i)); end loop; ut_utils.append_to_clob(l_result, l_results); - l_exclude_xpath := add_incomparable_cols_to_xpath(l_column_diffs, a_exclude_xpath); + l_act_cols := remove_incomparable_cols(l_actual.cursor_details.cursor_info,l_column_diffs); + l_exp_cols := remove_incomparable_cols(self.cursor_details.cursor_info,l_column_diffs); end if; --check for missing pk if a_join_by_list.count > 0 then - l_missing_pk := ut_compound_data_helper.get_missing_pk(self.cursor_details.cursor_info,l_actual.cursor_details.cursor_info,a_join_by_list); + l_missing_pk := ut_compound_data_helper.get_missing_pk(l_exp_cols,l_act_cols,a_join_by_list); end if; --diff rows and row elements if the pk is not missing if l_missing_pk.count = 0 then - ut_utils.append_to_clob(l_result, self.get_data_diff(a_other, a_exclude_xpath, a_include_xpath, a_join_by_xpath, a_unordered)); + l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_actual.data_id); + + -- First tell how many rows are different + l_diff_row_count := ut_compound_data_helper.get_rows_diff_count; + l_results := ut_utils.t_clob_tab(); + if l_diff_row_count > 0 then + l_row_diffs := ut_compound_data_helper.get_rows_diff( + self.data_id, l_actual.data_id, l_diff_id, c_max_rows, a_exclude_xpath, + a_include_xpath, a_join_by_xpath, a_other is of (ut_data_value_refcursor), a_unordered); + l_message := chr(10) + ||'Rows: [ ' || l_diff_row_count ||' differences' + || case when l_diff_row_count > c_max_rows and l_row_diffs.count > 0 then ', showing first '||c_max_rows end + ||' ]'||chr(10)|| case when l_row_diffs.count = 0 then ' All rows are different as the columns are not matching.' else null end; + ut_utils.append_to_clob( l_result, l_message ); + for i in 1 .. l_row_diffs.count loop + l_results.extend; + l_results(l_results.last) := get_diff_message(l_row_diffs(i),a_unordered); + end loop; + ut_utils.append_to_clob(l_result,l_results); + else + l_message:= chr(10)||'Rows: [ all different ]'||chr(10)||' All rows are different as the columns are not matching.'; + ut_utils.append_to_clob( l_result, l_message ); + end if; else ut_utils.append_to_clob(l_result,chr(10) || 'Unable to join sets:' || chr(10)); for i in 1 .. l_missing_pk.count loop @@ -242,13 +344,11 @@ create or replace type body ut_data_value_refcursor as l_actual := treat(a_other as ut_data_value_refcursor); - --if we join by key and key is missing fail and report error if a_join_by_list.count > 0 then l_pk_missing_tab := ut_compound_data_helper.get_missing_pk(self.cursor_details.cursor_info,l_actual.cursor_details.cursor_info,a_join_by_list); l_result := case when (l_pk_missing_tab.count > 0) then 1 else 0 end; end if; - if l_result = 0 then if (self.cursor_details is not null and l_actual.cursor_details is not null) and (self.cursor_details != l_actual.cursor_details) then l_result := 1; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tps b/source/expectations/data_values/ut_data_value_refcursor.tps index ca740f191..ec1771846 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tps +++ b/source/expectations/data_values/ut_data_value_refcursor.tps @@ -52,6 +52,8 @@ create or replace type ut_data_value_refcursor under ut_compound_data_value( constructor function ut_data_value_refcursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) return self as result, member procedure init(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor), overriding member function to_string return varchar2, + member function get_data_diff(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, + a_join_by_xpath varchar2, a_unordered boolean,a_join_by_list ut_varchar2_list:=ut_varchar2_list()) return clob, member function diff( a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean := false ,a_join_by_list ut_varchar2_list:=ut_varchar2_list()) return varchar2, overriding member function compare_implementation(a_other ut_data_value, a_unordered boolean, a_inclusion_compare boolean := false, From 9dc266e256df344e717cc01ae433f401b3767f98 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Wed, 21 Nov 2018 21:46:28 +0000 Subject: [PATCH 0131/1096] Update test to be more generic --- test/core/expectations/test_expectations_cursor.pkb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index b71f89d1f..06b8cbf17 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -2393,7 +2393,7 @@ Diff:% --Act ut3.ut.expect(l_actual).not_to_contain(l_expected); --Assert - l_expected_message := q'[%Actual: (refcursor [ count = 18 ])% + l_expected_message := q'[%Actual: (refcursor [ count = % ])% %Data-types:% %VARCHAR2NUMBER% %Data:% @@ -2423,7 +2423,7 @@ Diff:% --Act ut3.ut.expect(l_actual).not_to_include(l_expected); --Assert - l_expected_message := q'[%Actual: (refcursor [ count = 18 ])% + l_expected_message := q'[%Actual: (refcursor [ count = % ])% %Data-types:% %VARCHAR2NUMBER% %Data:% From d96d602d83be1af655b1f057517605644ba803b9 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Wed, 21 Nov 2018 22:46:26 +0000 Subject: [PATCH 0132/1096] remove schema quantifier --- .../expectations/data_values/ut_compound_data_helper.pkb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 2a6eefe34..4c2b29949 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -150,7 +150,7 @@ create or replace package body ut_compound_data_helper is l_sql := q'[with exp as ( select exp_item_data, exp_data_id, item_no rn,rownum col_no, - nvl2(exp_item_data,ut3.ut_compound_data_helper.get_pk_value(i.join_by,exp_item_data),null) pk_value, + nvl2(exp_item_data,ut_compound_data_helper.get_pk_value(i.join_by,exp_item_data),null) pk_value, s.column_value col, s.column_value.getRootElement() col_name, s.column_value.getclobval() col_val from ( select exp_data_id, ]'||l_exp_col_filter||q'[, :join_by join_by, item_no @@ -161,7 +161,7 @@ create or replace package body ut_compound_data_helper is ), act as ( select act_item_data, act_data_id, item_no rn, rownum col_no, - nvl2(act_item_data,ut3.ut_compound_data_helper.get_pk_value(i.join_by,act_item_data),null) pk_value, + nvl2(act_item_data,ut_compound_data_helper.get_pk_value(i.join_by,act_item_data),null) pk_value, s.column_value col, s.column_value.getRootElement() col_name, s.column_value.getclobval() col_val from ( select act_data_id, ]'||l_act_col_filter||q'[, :join_by join_by, item_no @@ -203,7 +203,7 @@ create or replace package body ut_compound_data_helper is select item_no as rn, case when exp_data_id is null then 'Extra:' else 'Missing:' end as diff_type, xmlserialize(content (extract((case when exp_data_id is null then act_item_data else exp_item_data end),'/*/*')) no indent) diffed_row, - nvl2(:join_by,ut3.ut_compound_data_helper.get_pk_value(:join_by,case when exp_data_id is null then act_item_data else exp_item_data end),null) pk_value + nvl2(:join_by,ut_compound_data_helper.get_pk_value(:join_by,case when exp_data_id is null then act_item_data else exp_item_data end),null) pk_value ,case when exp_data_id is null then 1 else 2 end rnk ,2 final_order from ut_compound_data_diff_tmp i @@ -681,7 +681,7 @@ create or replace package body ut_compound_data_helper is procedure insert_diffs_result(a_diff_tab t_diff_tab, a_diff_id raw) is begin forall idx in 1..a_diff_tab.count - insert into ut3.ut_compound_data_diff_tmp + insert into ut_compound_data_diff_tmp ( diff_id, act_item_data, act_data_id, exp_item_data, exp_data_id, item_no, duplicate_no ) values (a_diff_id, From 2b90c4b2f3aa9fb34715c75e526839df2799493c Mon Sep 17 00:00:00 2001 From: lwasylow Date: Wed, 21 Nov 2018 22:46:26 +0000 Subject: [PATCH 0133/1096] remove schema quantifier Changes to remove xpath from diff rows. Signed-off-by: lwasylow --- source/core/ut_utils.pkb | 5 + source/core/ut_utils.pks | 3 + .../data_values/ut_compound_data_helper.pkb | 578 +++++++++--------- .../data_values/ut_compound_data_helper.pks | 13 +- .../data_values/ut_compound_data_value.tpb | 3 +- .../data_values/ut_cursor_column.tpb | 28 +- .../data_values/ut_cursor_column.tps | 30 +- .../data_values/ut_data_value_refcursor.tpb | 86 +-- .../data_values/ut_data_value_refcursor.tps | 12 +- source/expectations/matchers/ut_equal.tpb | 6 +- source/expectations/matchers/ut_include.tpb | 2 +- .../expectations/test_expectations_cursor.pkb | 62 +- .../expectations/test_expectations_cursor.pks | 8 +- 13 files changed, 377 insertions(+), 459 deletions(-) diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index dbe57f866..5e13e608c 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -692,5 +692,10 @@ create or replace package body ut_utils is return l_result; end; + function serialize_data (a_data clob) return clob is + begin + return replace(a_data,chr(10)); + end; + end ut_utils; / diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 83261584f..1b6dea73c 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -354,5 +354,8 @@ create or replace package ut_utils authid definer is */ function replace_multiline_comments(a_source clob) return clob; + --TODO optimize clob replace to be more efficient as might not work replace on large clobs + function serialize_data (a_data clob) return clob; + end ut_utils; / diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 2a6eefe34..6033322dc 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -132,266 +132,8 @@ create or replace package body ut_compound_data_helper is begin select replace((extract(a_item_data,a_join_by_xpath).getclobval()),chr(10)) into l_pk_value from dual; return l_pk_value; - end; - - function get_rows_diff_by_sql( - a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, - a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2, - a_join_by_xpath varchar2, a_unordered boolean - ) return tt_row_diffs is - - l_act_col_filter varchar2(32767); - l_exp_col_filter varchar2(32767); - l_results tt_row_diffs; - l_sql varchar2(32767); - begin - l_act_col_filter := get_columns_row_filter(a_exclude_xpath,a_include_xpath,'ucd','act_item_data'); - l_exp_col_filter := get_columns_row_filter(a_exclude_xpath,a_include_xpath,'ucd','exp_item_data'); - - l_sql := q'[with exp as ( - select exp_item_data, exp_data_id, item_no rn,rownum col_no, - nvl2(exp_item_data,ut3.ut_compound_data_helper.get_pk_value(i.join_by,exp_item_data),null) pk_value, - s.column_value col, s.column_value.getRootElement() col_name, s.column_value.getclobval() col_val - from ( - select exp_data_id, ]'||l_exp_col_filter||q'[, :join_by join_by, item_no - from ut_compound_data_diff_tmp ucd - where diff_id = :diff_id - and ucd.exp_data_id = :self_guid) i, - table( xmlsequence( extract(i.exp_item_data,'/*/*') ) ) s - ), - act as ( - select act_item_data, act_data_id, item_no rn, rownum col_no, - nvl2(act_item_data,ut3.ut_compound_data_helper.get_pk_value(i.join_by,act_item_data),null) pk_value, - s.column_value col, s.column_value.getRootElement() col_name, s.column_value.getclobval() col_val - from ( - select act_data_id, ]'||l_act_col_filter||q'[, :join_by join_by, item_no - from ut_compound_data_diff_tmp ucd - where diff_id = :diff_id - and ucd.act_data_id = :other_guid ) i, - table( xmlsequence( extract(i.act_item_data,'/*/*') ) ) s - ) - select rn, diff_type, diffed_row, pk_value pk_value - from ( - select rn, diff_type, diffed_row, pk_value - ,case when diff_type = 'Actual:' then 1 else 2 end rnk - ,1 final_order - from ( ]'; - - if a_unordered then - l_sql := l_sql || q'[select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, pk_value pk_value - from - (select nvl(exp.rn, act.rn) rn, nvl(exp.pk_value, act.pk_value) pk_value, exp.col exp_item, act.col act_item - from exp join act on exp.rn = act.rn and exp.col_name = act.col_name - where dbms_lob.compare(exp.col_val, act.col_val) != 0) - unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:') - ))]'; - else - l_sql := l_sql || q'[ select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, null pk_value - from - (select nvl(exp.rn, act.rn) rn, - xmlagg(exp.col order by exp.col_no) exp_item, - xmlagg(act.col order by act.col_no) act_item - from exp exp join act act on exp.rn = act.rn and exp.col_name = act.col_name - where dbms_lob.compare(exp.col_val, act.col_val) != 0 - group by exp.rn, act.rn - ) - unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:')) - )]'; - end if; - - l_sql := l_sql || q'[union all - select - item_no as rn, case when exp_data_id is null then 'Extra:' else 'Missing:' end as diff_type, - xmlserialize(content (extract((case when exp_data_id is null then act_item_data else exp_item_data end),'/*/*')) no indent) diffed_row, - nvl2(:join_by,ut3.ut_compound_data_helper.get_pk_value(:join_by,case when exp_data_id is null then act_item_data else exp_item_data end),null) pk_value - ,case when exp_data_id is null then 1 else 2 end rnk - ,2 final_order - from ut_compound_data_diff_tmp i - where diff_id = :diff_id - and act_data_id is null or exp_data_id is null - ) - order by final_order, - case when final_order = 1 then rn else rnk end, - case when final_order = 1 then rnk else rn end ]'; - - execute immediate l_sql - bulk collect into l_results - using a_exclude_xpath, a_include_xpath, a_join_by_xpath, - a_diff_id, a_expected_dataset_guid, - a_exclude_xpath,a_include_xpath, a_join_by_xpath, - a_diff_id, a_actual_dataset_guid, - a_join_by_xpath,a_join_by_xpath, a_diff_id; - - return l_results; - end; - - function get_rows_diff( - a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, - a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2 - ) return tt_row_diffs is - l_column_filter varchar2(32767); - l_results tt_row_diffs; - begin - l_column_filter := get_columns_filter(a_exclude_xpath,a_include_xpath); - execute immediate q'[ - with - diff_info as ( select item_no - from - (select item_no from ut_compound_data_diff_tmp ucdc where diff_id = :diff_guid order by item_no asc) - where rownum <= :max_rows) - select * - from (select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, null pk_value - from (select nvl(exp.rn, act.rn) rn, - xmlagg(exp.col order by exp.col_no) exp_item, - xmlagg(act.col order by act.col_no) act_item - from (select r.item_no as rn, rownum col_no, s.column_value col, - s.column_value.getRootElement() col_name, - s.column_value.getclobval() col_val - from (select ]'||l_column_filter||q'[, ucd.item_no, ucd.item_data item_data_no_filter - from ut_compound_data_tmp ucd, - diff_info i - where ucd.data_id = :self_guid - and ucd.item_no = i.item_no - ) r, - table( xmlsequence( extract(r.item_data,'/*/*') ) ) s - ) exp - join ( - select item_no as rn, rownum col_no, s.column_value col, - s.column_value.getRootElement() col_name, - s.column_value.getclobval() col_val - from (select ]'||l_column_filter||q'[, ucd.item_no, ucd.item_data item_data_no_filter - from ut_compound_data_tmp ucd, - diff_info i - where ucd.data_id = :other_guid - and ucd.item_no = i.item_no - ) r, - table( xmlsequence( extract(r.item_data,'/*/*') ) ) s - ) act - on exp.rn = act.rn and exp.col_name = act.col_name - where dbms_lob.compare(exp.col_val, act.col_val) != 0 - group by exp.rn, act.rn - ) - unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:') ) - ) - union all - select nvl(exp.item_no, act.item_no) rn, - case when exp.item_no is null then 'Extra:' else 'Missing:' end as diff_type, - xmlserialize(content nvl(exp.item_data, act.item_data) no indent) diffed_row, - null pk_value - from (select ucd.item_no, extract(ucd.item_data,'/*/*') item_data - from ut_compound_data_tmp ucd - where ucd.data_id = :self_guid - and ucd.item_no in (select i.item_no from diff_info i) - ) exp - full outer join ( - select ucd.item_no, extract(ucd.item_data,'/*/*') item_data - from ut_compound_data_tmp ucd - where ucd.data_id = :other_guid - and ucd.item_no in (select i.item_no from diff_info i) - )act - on exp.item_no = act.item_no - where exp.item_no is null or act.item_no is null - order by 1, 2]' - bulk collect into l_results - using a_diff_id, a_max_rows, - a_exclude_xpath, a_include_xpath, a_expected_dataset_guid, - a_exclude_xpath, a_include_xpath, a_actual_dataset_guid, - a_expected_dataset_guid, a_actual_dataset_guid; - return l_results; - end; - - function get_rows_diff( - a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, - a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2, - a_join_by_xpath varchar2,a_refcursor boolean, a_unordered boolean - ) return tt_row_diffs is - l_result tt_row_diffs := tt_row_diffs(); - begin - case - when a_refcursor then - l_result := get_rows_diff_by_sql(a_expected_dataset_guid, a_actual_dataset_guid, a_diff_id, - a_max_rows, a_exclude_xpath, a_include_xpath ,a_join_by_xpath, a_unordered); - else - l_result := get_rows_diff(a_expected_dataset_guid, a_actual_dataset_guid, a_diff_id, - a_max_rows, a_exclude_xpath, a_include_xpath); - end case; - return l_result; - end; - - function get_hash(a_data raw, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash is - begin - return dbms_crypto.hash(a_data, a_hash_type); - end; - - function get_hash(a_data clob, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash is - begin - return dbms_crypto.hash(a_data, a_hash_type); - end; - - function get_fixed_size_hash(a_string varchar2, a_base integer :=0,a_size integer :=30) return number is - begin - return dbms_utility.get_hash_value(a_string,a_base,a_size); - end; - - function columns_hash( - a_data_value_cursor ut_data_value_refcursor, a_exclude_xpath varchar2, a_include_xpath varchar2, - a_hash_type binary_integer := dbms_crypto.hash_sh1 - ) return t_hash is - l_cols_hash t_hash; - begin - if not a_data_value_cursor.is_null then - execute immediate - q'[select dbms_crypto.hash(replace(x.item_data.getclobval(),'>CHAR<','>VARCHAR2<'),]'||a_hash_type||') ' || - ' from ( select '||get_columns_filter(a_exclude_xpath, a_include_xpath)|| - ' from (select :columns_info as item_data from dual ) ucd' || - ' ) x' - into l_cols_hash using a_exclude_xpath,a_include_xpath, a_data_value_cursor.columns_info; - end if; - return l_cols_hash; - end; - - function is_pk_exists(a_expected_cursor xmltype,a_actual_cursor xmltype, a_exclude_xpath varchar2, a_include_xpath varchar2,a_join_by_xpath varchar2) - return tt_missing_pk is - l_pk_xpath_tabs ut_varchar2_list := ut_varchar2_list(); - l_column_filter varchar2(32767); - l_no_missing_keys tt_missing_pk := tt_missing_pk(); - - begin - if a_join_by_xpath is not null then - l_pk_xpath_tabs := ut_utils.string_to_table(a_join_by_xpath,'|'); - l_column_filter := get_columns_row_filter(a_exclude_xpath, a_include_xpath); - - execute immediate q'[ - with xpaths_tab as (select column_value xpath from table(:xpath_tabs)), - expected_column_info as ( select :expected as item_data from dual ), - actual_column_info as ( select :actual as item_data from dual ) - select REGEXP_SUBSTR (xpath,'[^(/\*/)](.+)$'),diif_type from - ( - (select xpath,'e' diif_type from xpaths_tab - minus - select xpath,'e' diif_type - from ( select ]'||l_column_filter||q'[ from expected_column_info ucd) x - ,xpaths_tab - where xmlexists (xpaths_tab.xpath passing x.item_data) - ) - union all - (select xpath,'a' diif_type from xpaths_tab - minus - select xpath,'a' diif_type - from ( select ]'||l_column_filter||q'[ from actual_column_info ucd) x - ,xpaths_tab - where xmlexists (xpaths_tab.xpath passing x.item_data) - ) - )]' bulk collect into l_no_missing_keys - using l_pk_xpath_tabs,a_expected_cursor,a_actual_cursor, - a_exclude_xpath, a_include_xpath, - a_exclude_xpath, a_include_xpath; - - end if; - - return l_no_missing_keys; - end; - + end; + procedure generate_not_equal_stmt(a_data_info ut_cursor_column, a_pk_table ut_varchar2_list, a_not_equal_stmt in out nocopy clob, a_col_name varchar2) is l_pk_tab ut_varchar2_list := coalesce(a_pk_table,ut_varchar2_list()); @@ -449,9 +191,10 @@ create or replace package body ut_compound_data_helper is ut_utils.append_to_clob(a_equal_stmt,l_sql_stmt); end; - --TODO : Scenario where join by is on whole type not a column of type e.g. NESTEDTABLE - procedure generate_partition_stmt(a_data_info ut_cursor_column, a_partition_stmt in out nocopy clob,a_pk_table in ut_varchar2_list,a_col_name in varchar2) is - l_alias varchar2(10) := 'ucd.'; + procedure generate_partition_stmt(a_data_info ut_cursor_column, a_partition_stmt in out nocopy clob, + a_pk_table in ut_varchar2_list,a_col_name in varchar2,a_alias varchar2 := 'ucd.') is + + l_alias varchar2(10) := a_alias; l_pk_tab ut_varchar2_list := coalesce(a_pk_table,ut_varchar2_list()); l_index integer; l_sql_stmt varchar2(32767); @@ -478,9 +221,9 @@ create or replace package body ut_compound_data_helper is ut_utils.append_to_clob(a_partition_stmt,l_sql_stmt); end; - procedure generate_select_stmt(a_data_info ut_cursor_column,a_sql_stmt in out nocopy clob, a_col_name varchar2) is + procedure generate_select_stmt(a_data_info ut_cursor_column,a_sql_stmt in out nocopy clob, a_col_name varchar2,a_alias varchar2 := 'ucd.') is l_sql_stmt clob; - l_alias varchar2(10) := 'ucd.'; + l_alias varchar2(10) := a_alias; l_col_syntax varchar2(4000); l_ut_owner varchar2(250) := ut_utils.ut_owner; begin @@ -491,7 +234,7 @@ create or replace package body ut_compound_data_helper is end if; ut_utils.append_to_clob(a_sql_stmt,','||l_col_syntax); end; - + procedure generate_xmltab_stmt(a_data_info ut_cursor_column,a_sql_stmt in out nocopy clob, a_col_name varchar2) is l_sql_stmt varchar2(32767); l_col_type varchar2(4000); @@ -513,7 +256,7 @@ create or replace package body ut_compound_data_helper is '('||a_data_info.column_len||')' else null end; end if; - l_sql_stmt := ' '||a_col_name||' '||l_col_type||q'[ PATH ']'||a_data_info.access_path||q'[',]'; + l_sql_stmt := case when a_sql_stmt is null then '' else ', ' end ||a_col_name||' '||l_col_type||q'[ PATH ']'||a_data_info.access_path||q'[']'; ut_utils.append_to_clob(a_sql_stmt, l_sql_stmt); end; @@ -529,11 +272,7 @@ create or replace package body ut_compound_data_helper is ut_utils.append_to_clob(a_partition_stmt,', row_number() over (partition by '); for i in 1..l_cursor_info.count loop if l_cursor_info(i).has_nested_col = 0 then - l_col_name := case when l_cursor_info(i).parent_name is null then - l_cursor_info(i).xml_valid_name - else - l_cursor_info(i).nested_name - end; + l_col_name := l_cursor_info(i).transformed_name; --Get XMLTABLE column list generate_xmltab_stmt(l_cursor_info(i),a_xml_stmt,l_col_name); --Get Select statment list of columns @@ -583,13 +322,10 @@ create or replace package body ut_compound_data_helper is begin dbms_lob.createtemporary(l_compare_sql, true); - - --TODO: Resolve issues with collection and nested tables, can we extract by internal column name if defined e.g. xml of colval.id.getclobval() - gen_sql_pieces_out_of_cursor(a_other, a_join_by_list, l_xmltable_stmt, l_select_stmt, l_partition_stmt, l_equal_stmt, l_join_on_stmt, l_not_equal_stmt); - + l_temp_string := 'with exp as ( select ucd.* '; ut_utils.append_to_clob(l_compare_sql, l_temp_string); ut_utils.append_to_clob(l_compare_sql,l_partition_stmt); @@ -604,13 +340,14 @@ create or replace package body ut_compound_data_helper is ||q'[xmltable('/ROWSET/ROW' passing x.item_data columns ]'; ut_utils.append_to_clob(l_compare_sql, l_temp_string); + ut_utils.append_to_clob(l_compare_sql,l_xmltable_stmt); + ut_utils.append_to_clob(l_compare_sql,case when l_xmltable_stmt is null then '' else ',' end||q'[ item_data xmltype PATH '*']'); + if not a_unordered then - ut_utils.append_to_clob(l_compare_sql,'POSITION for ordinality, '); + ut_utils.append_to_clob(l_compare_sql,', POSITION for ordinality '); end if; - ut_utils.append_to_clob(l_compare_sql,l_xmltable_stmt); - - l_temp_string := q'[ item_data xmltype PATH '*' ) ucd where data_id = :self_guid ) ucd ) ,]'; + l_temp_string := q'[) ucd where data_id = :self_guid ) ucd ) ,]'; ut_utils.append_to_clob(l_compare_sql,l_temp_string); l_temp_string :='act as ( select ucd.* '; @@ -627,11 +364,14 @@ create or replace package body ut_compound_data_helper is ||q'[xmltable('/ROWSET/ROW' passing x.item_data columns ]' ; ut_utils.append_to_clob(l_compare_sql,l_temp_string); + ut_utils.append_to_clob(l_compare_sql,l_xmltable_stmt); + ut_utils.append_to_clob(l_compare_sql,case when l_xmltable_stmt is null then '' else ',' end||q'[ item_data xmltype PATH '*']'); + if not a_unordered then - ut_utils.append_to_clob(l_compare_sql,'POSITION for ordinality, '); + ut_utils.append_to_clob(l_compare_sql,', POSITION for ordinality '); end if; - ut_utils.append_to_clob(l_compare_sql,l_xmltable_stmt||q'[ item_data xmltype PATH '*') ucd where data_id = :other_guid ) ucd ) ]'); + ut_utils.append_to_clob(l_compare_sql,q'[ ) ucd where data_id = :other_guid ) ucd ) ]'); l_temp_string := ' select a.item_data as act_item_data, a.data_id act_data_id,' ||'e.item_data as exp_item_data, e.data_id exp_data_id, '|| @@ -677,11 +417,260 @@ create or replace package body ut_compound_data_helper is return l_compare_sql; end; - + + function get_column_extract_path(a_cursor_info ut_cursor_column_tab) return ut_varchar2_list is + l_column_list ut_varchar2_list := ut_varchar2_list(); + begin + for i in 1..a_cursor_info.count loop + l_column_list.extend; + l_column_list(l_column_list.last) := a_cursor_info(i).access_path; + end loop; + return l_column_list; + end; + + + function get_rows_diff_by_sql(a_act_cursor_info ut_cursor_column_tab,a_exp_cursor_info ut_cursor_column_tab, + a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, + a_join_by_list ut_varchar2_list, a_unordered boolean + ) return tt_row_diffs is + + l_act_col_filter varchar2(32767); + l_exp_col_filter varchar2(32767); + l_act_extract_xpath varchar2(32767):= ut_utils.to_xpath(get_column_extract_path(a_act_cursor_info)); + l_exp_extract_xpath varchar2(32767):= ut_utils.to_xpath(get_column_extract_path(a_exp_cursor_info)); + l_join_xpath varchar2(32767) := ut_utils.to_xpath(a_join_by_list); + l_results tt_row_diffs; + l_sql varchar2(32767); + begin + + l_sql := q'[with exp as ( + select exp_item_data, exp_data_id, item_no rn,rownum col_no, pk_value, + s.column_value col, s.column_value.getRootElement() col_name, s.column_value.getclobval() col_val + from ( + select exp_data_id, extract( ucd.exp_item_data, :column_path ) exp_item_data, item_no, + ut_compound_data_helper.get_pk_value(:join_by, ucd.exp_item_data) pk_value + from ut_compound_data_diff_tmp ucd + where diff_id = :diff_id + and ucd.exp_data_id = :self_guid) i, + table( xmlsequence( extract(i.exp_item_data,'/*') ) ) s + ), + act as ( + select act_item_data, act_data_id, item_no rn, rownum col_no, pk_value, + s.column_value col, s.column_value.getRootElement() col_name, s.column_value.getclobval() col_val + from ( + select act_data_id, extract( ucd.act_item_data, :column_path ) act_item_data, item_no, + ut_compound_data_helper.get_pk_value(:join_by, ucd.act_item_data) pk_value + from ut_compound_data_diff_tmp ucd + where diff_id = :diff_id + and ucd.act_data_id = :other_guid ) i, + table( xmlsequence( extract(i.act_item_data,'/*') ) ) s + ) + select rn, diff_type, diffed_row, pk_value pk_value + from ( + select rn, diff_type, diffed_row, pk_value + ,case when diff_type = 'Actual:' then 1 else 2 end rnk + ,1 final_order + from ( ]'; + + if a_unordered then + l_sql := l_sql || q'[select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, pk_value pk_value + from + (select nvl(exp.rn, act.rn) rn, nvl(exp.pk_value, act.pk_value) pk_value, exp.col exp_item, act.col act_item + from exp join act on exp.rn = act.rn and exp.col_name = act.col_name + where dbms_lob.compare(exp.col_val, act.col_val) != 0) + unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:') + ))]'; + else + l_sql := l_sql || q'[ select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, null pk_value + from + (select nvl(exp.rn, act.rn) rn, + xmlagg(exp.col order by exp.col_no) exp_item, + xmlagg(act.col order by act.col_no) act_item + from exp exp join act act on exp.rn = act.rn and exp.col_name = act.col_name + where dbms_lob.compare(exp.col_val, act.col_val) != 0 + group by exp.rn, act.rn + ) + unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:')) + )]'; + end if; + + l_sql := l_sql || q'[union all + select + item_no as rn, case when exp_data_id is null then 'Extra:' else 'Missing:' end as diff_type, + xmlserialize(content (extract((case when exp_data_id is null then act_item_data else exp_item_data end),'/*/*')) no indent) diffed_row, + nvl2(:join_by,ut_compound_data_helper.get_pk_value(:join_by,case when exp_data_id is null then act_item_data else exp_item_data end),null) pk_value + ,case when exp_data_id is null then 1 else 2 end rnk + ,2 final_order + from ut_compound_data_diff_tmp i + where diff_id = :diff_id + and act_data_id is null or exp_data_id is null + ) + order by final_order, + case when final_order = 1 then rn else rnk end, + case when final_order = 1 then rnk else rn end ]'; + + execute immediate l_sql + bulk collect into l_results + using l_exp_extract_xpath,l_join_xpath,a_diff_id, a_expected_dataset_guid, + l_act_extract_xpath,l_join_xpath,a_diff_id, a_actual_dataset_guid, + l_join_xpath,l_join_xpath,a_diff_id; + + return l_results; + end; + + function get_rows_diff( + a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, + a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2 + ) return tt_row_diffs is + l_column_filter varchar2(32767); + l_results tt_row_diffs; + begin + l_column_filter := get_columns_filter(a_exclude_xpath,a_include_xpath); + execute immediate q'[ + with + diff_info as ( select item_no + from + (select item_no from ut_compound_data_diff_tmp ucdc where diff_id = :diff_guid order by item_no asc) + where rownum <= :max_rows) + select * + from (select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, null pk_value + from (select nvl(exp.rn, act.rn) rn, + xmlagg(exp.col order by exp.col_no) exp_item, + xmlagg(act.col order by act.col_no) act_item + from (select r.item_no as rn, rownum col_no, s.column_value col, + s.column_value.getRootElement() col_name, + s.column_value.getclobval() col_val + from (select ]'||l_column_filter||q'[, ucd.item_no, ucd.item_data item_data_no_filter + from ut_compound_data_tmp ucd, + diff_info i + where ucd.data_id = :self_guid + and ucd.item_no = i.item_no + ) r, + table( xmlsequence( extract(r.item_data,'/*/*') ) ) s + ) exp + join ( + select item_no as rn, rownum col_no, s.column_value col, + s.column_value.getRootElement() col_name, + s.column_value.getclobval() col_val + from (select ]'||l_column_filter||q'[, ucd.item_no, ucd.item_data item_data_no_filter + from ut_compound_data_tmp ucd, + diff_info i + where ucd.data_id = :other_guid + and ucd.item_no = i.item_no + ) r, + table( xmlsequence( extract(r.item_data,'/*/*') ) ) s + ) act + on exp.rn = act.rn and exp.col_name = act.col_name + where dbms_lob.compare(exp.col_val, act.col_val) != 0 + group by exp.rn, act.rn + ) + unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:') ) + ) + union all + select nvl(exp.item_no, act.item_no) rn, + case when exp.item_no is null then 'Extra:' else 'Missing:' end as diff_type, + xmlserialize(content nvl(exp.item_data, act.item_data) no indent) diffed_row, + null pk_value + from (select ucd.item_no, extract(ucd.item_data,'/*/*') item_data + from ut_compound_data_tmp ucd + where ucd.data_id = :self_guid + and ucd.item_no in (select i.item_no from diff_info i) + ) exp + full outer join ( + select ucd.item_no, extract(ucd.item_data,'/*/*') item_data + from ut_compound_data_tmp ucd + where ucd.data_id = :other_guid + and ucd.item_no in (select i.item_no from diff_info i) + )act + on exp.item_no = act.item_no + where exp.item_no is null or act.item_no is null + order by 1, 2]' + bulk collect into l_results + using a_diff_id, a_max_rows, + a_exclude_xpath, a_include_xpath, a_expected_dataset_guid, + a_exclude_xpath, a_include_xpath, a_actual_dataset_guid, + a_expected_dataset_guid, a_actual_dataset_guid; + return l_results; + end; + + function get_hash(a_data raw, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash is + begin + return dbms_crypto.hash(a_data, a_hash_type); + end; + + function get_hash(a_data clob, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash is + begin + return dbms_crypto.hash(a_data, a_hash_type); + end; + + function get_fixed_size_hash(a_string varchar2, a_base integer :=0,a_size integer :=30) return number is + begin + return dbms_utility.get_hash_value(a_string,a_base,a_size); + end; + + function columns_hash( + a_data_value_cursor ut_data_value_refcursor, a_exclude_xpath varchar2, a_include_xpath varchar2, + a_hash_type binary_integer := dbms_crypto.hash_sh1 + ) return t_hash is + l_cols_hash t_hash; + begin + if not a_data_value_cursor.is_null then + execute immediate + q'[select dbms_crypto.hash(replace(x.item_data.getclobval(),'>CHAR<','>VARCHAR2<'),]'||a_hash_type||') ' || + ' from ( select '||get_columns_filter(a_exclude_xpath, a_include_xpath)|| + ' from (select :columns_info as item_data from dual ) ucd' || + ' ) x' + into l_cols_hash using a_exclude_xpath,a_include_xpath, a_data_value_cursor.columns_info; + end if; + return l_cols_hash; + end; + + function is_pk_exists(a_expected_cursor xmltype,a_actual_cursor xmltype, a_exclude_xpath varchar2, a_include_xpath varchar2,a_join_by_xpath varchar2) + return tt_missing_pk is + l_pk_xpath_tabs ut_varchar2_list := ut_varchar2_list(); + l_column_filter varchar2(32767); + l_no_missing_keys tt_missing_pk := tt_missing_pk(); + + begin + if a_join_by_xpath is not null then + l_pk_xpath_tabs := ut_utils.string_to_table(a_join_by_xpath,'|'); + l_column_filter := get_columns_row_filter(a_exclude_xpath, a_include_xpath); + + execute immediate q'[ + with xpaths_tab as (select column_value xpath from table(:xpath_tabs)), + expected_column_info as ( select :expected as item_data from dual ), + actual_column_info as ( select :actual as item_data from dual ) + select REGEXP_SUBSTR (xpath,'[^(/\*/)](.+)$'),diif_type from + ( + (select xpath,'e' diif_type from xpaths_tab + minus + select xpath,'e' diif_type + from ( select ]'||l_column_filter||q'[ from expected_column_info ucd) x + ,xpaths_tab + where xmlexists (xpaths_tab.xpath passing x.item_data) + ) + union all + (select xpath,'a' diif_type from xpaths_tab + minus + select xpath,'a' diif_type + from ( select ]'||l_column_filter||q'[ from actual_column_info ucd) x + ,xpaths_tab + where xmlexists (xpaths_tab.xpath passing x.item_data) + ) + )]' bulk collect into l_no_missing_keys + using l_pk_xpath_tabs,a_expected_cursor,a_actual_cursor, + a_exclude_xpath, a_include_xpath, + a_exclude_xpath, a_include_xpath; + + end if; + + return l_no_missing_keys; + end; + procedure insert_diffs_result(a_diff_tab t_diff_tab, a_diff_id raw) is begin forall idx in 1..a_diff_tab.count - insert into ut3.ut_compound_data_diff_tmp + insert into ut_compound_data_diff_tmp ( diff_id, act_item_data, act_data_id, exp_item_data, exp_data_id, item_no, duplicate_no ) values (a_diff_id, @@ -779,6 +768,18 @@ create or replace package body ut_compound_data_helper is order by type desc,name; return l_missing_pk; end; + + function validate_attributes(a_cursor_info ut_cursor_column_tab,a_filter_list ut_varchar2_list) + return ut_varchar2_list is + l_result ut_varchar2_list := ut_varchar2_list(); + begin + select col_name bulk collect into l_result + from (select regexp_replace(column_value,'^((/ROW/)|^(//)|^(/\*/))?(.*)','\5') col_name + from table(a_filter_list)) flr left outer join table(a_cursor_info) cur + on (flr.col_name = cur.access_path) where cur.access_path is null; + + return l_result; + end; function inc_exc_columns_from_cursor (a_cursor_info ut_cursor_column_tab, a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) return ut_cursor_column_tab is @@ -844,5 +845,14 @@ create or replace package body ut_compound_data_helper is return l_result; end; + function generate_missing_cols_warn_msg(a_missing_columns ut_varchar2_list,a_attribute in varchar2) return varchar2 is + l_warn_msg varchar2(32767) := 'For specified option :'||a_attribute||' following columns not exists in cursor:'||chr(10); + begin + for i in 1..a_missing_columns.count loop + l_warn_msg := l_warn_msg||a_missing_columns(i)||chr(10); + end loop; + return l_warn_msg; + end; + end; / diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 84e8f787e..50d70974d 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -58,6 +58,7 @@ create or replace package ut_compound_data_helper authid definer is type t_diff_tab is table of t_diff_rec; + function get_column_info_xml(a_column_details ut_key_anyval_pair) return xmltype; function get_columns_filter( @@ -72,10 +73,14 @@ create or replace package ut_compound_data_helper authid definer is function get_rows_diff( a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, - a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2, - a_join_by_xpath varchar2,a_refcursor boolean, a_unordered boolean + a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2 ) return tt_row_diffs; + function get_rows_diff_by_sql(a_act_cursor_info ut_cursor_column_tab,a_exp_cursor_info ut_cursor_column_tab, + a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, + a_join_by_list ut_varchar2_list, a_unordered boolean + ) return tt_row_diffs; + subtype t_hash is raw(128); function get_hash(a_data raw, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash; @@ -111,6 +116,8 @@ create or replace package ut_compound_data_helper authid definer is function get_missing_pk(a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab, a_current_list ut_varchar2_list) return tt_missing_pk; + function validate_attributes(a_cursor_info ut_cursor_column_tab, a_filter_list ut_varchar2_list) return ut_varchar2_list; + function inc_exc_columns_from_cursor (a_cursor_info ut_cursor_column_tab, a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) return ut_cursor_column_tab; @@ -118,5 +125,7 @@ create or replace package ut_compound_data_helper authid definer is function remove_incomparable_cols( a_cursor_details ut_cursor_column_tab,a_incomparable_cols ut_varchar2_list) return ut_cursor_column_tab; + function generate_missing_cols_warn_msg(a_missing_columns ut_varchar2_list,a_attribute in varchar2) return varchar2; + end; / diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index 8db8071df..a1cb14993 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -118,14 +118,13 @@ create or replace type body ut_compound_data_value as dbms_lob.createtemporary(l_result,true); l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_actual.data_id); - -- First tell how many rows are different l_diff_row_count := ut_compound_data_helper.get_rows_diff_count; --TODO : Change message when the types not matching if l_diff_row_count > 0 then l_row_diffs := ut_compound_data_helper.get_rows_diff( self.data_id, l_actual.data_id, l_diff_id, c_max_rows, a_exclude_xpath, - a_include_xpath, a_join_by_xpath, a_other is of (ut_data_value_refcursor), a_unordered); + a_include_xpath); l_message := chr(10) ||'Rows: [ ' || l_diff_row_count ||' differences' || case when l_diff_row_count > c_max_rows and l_row_diffs.count > 0 then ', showing first '||c_max_rows end diff --git a/source/expectations/data_values/ut_cursor_column.tpb b/source/expectations/data_values/ut_cursor_column.tpb index 1c650708e..aba9236cc 100644 --- a/source/expectations/data_values/ut_cursor_column.tpb +++ b/source/expectations/data_values/ut_cursor_column.tpb @@ -6,24 +6,24 @@ create or replace type body ut_cursor_column as a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, a_col_position integer, a_col_type varchar2, a_collection integer) is begin - self.parent_name := a_parent_name; - self.hierarchy_level := a_hierarchy_level; - self.column_position := a_col_position; - self.column_prec := a_col_prec; - self.column_len := a_col_max_len; - self.column_scale := a_col_scale; - self.column_name := TRIM( BOTH '''' FROM a_col_name); + self.parent_name := a_parent_name; + self.hierarchy_level := a_hierarchy_level; + self.column_position := a_col_position; + self.column_prec := a_col_prec; + self.column_len := a_col_max_len; + self.column_scale := a_col_scale; + self.column_name := TRIM( BOTH '''' FROM a_col_name); self.column_type_name := a_col_type_name; - self.access_path := case when self.parent_name is null then self.column_name else self.parent_name||'/'||self.column_name end; - self.nested_name := case when self.parent_name is null then - null + self.access_path := case when self.parent_name is null then self.column_name else self.parent_name||'/'||self.column_name end; + self.xml_valid_name := '"'||self.column_name||'"'; + self.transformed_name := case when self.parent_name is null then + self.xml_valid_name else '"'||ut_compound_data_helper.get_fixed_size_hash(self.parent_name||self.column_name)||'"' end; - self.xml_valid_name := '"'||self.column_name||'"'; - self.column_type := a_col_type; - self.column_schema := a_col_schema_name; - self.is_sql_diffable := case when lower(self.column_type) = 'user_defined_type' then + self.column_type := a_col_type; + self.column_schema := a_col_schema_name; + self.is_sql_diffable := case when lower(self.column_type) = 'user_defined_type' then 0 else ut_utils.boolean_to_int(ut_curr_usr_compound_helper.is_sql_compare_allowed(self.column_type)) diff --git a/source/expectations/data_values/ut_cursor_column.tps b/source/expectations/data_values/ut_cursor_column.tps index 82ec96f02..7782a0d8e 100644 --- a/source/expectations/data_values/ut_cursor_column.tps +++ b/source/expectations/data_values/ut_cursor_column.tps @@ -1,21 +1,21 @@ create or replace type ut_cursor_column force authid current_user as object ( - parent_name varchar2(100), - access_path varchar2(500), - has_nested_col number(1,0), - nested_name varchar2(32), - hierarchy_level number, - column_position number, - xml_valid_name varchar2(100), - column_name varchar2(100), - column_type varchar2(100), + parent_name varchar2(100), + access_path varchar2(500), + has_nested_col number(1,0), + transformed_name varchar2(32), + hierarchy_level number, + column_position number, + xml_valid_name varchar2(100), + column_name varchar2(100), + column_type varchar2(100), column_type_name varchar2(100), - column_schema varchar2(100), - column_prec integer, - column_len integer, - column_scale integer, - is_sql_diffable number(1, 0), - is_collection number(1, 0), + column_schema varchar2(100), + column_prec integer, + column_len integer, + column_scale integer, + is_sql_diffable number(1, 0), + is_collection number(1, 0), member procedure init(self in out nocopy ut_cursor_column, a_col_name varchar2, a_col_schema_name varchar2, diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 51c4c7f02..06fe0fdc9 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -116,71 +116,7 @@ create or replace type body ut_data_value_refcursor as return l_result_string; end; - member function get_data_diff(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, - a_join_by_xpath varchar2, a_unordered boolean,a_join_by_list ut_varchar2_list:=ut_varchar2_list()) return clob is - c_max_rows integer := ut_utils.gc_diff_max_rows; - l_result clob; - l_results ut_utils.t_clob_tab := ut_utils.t_clob_tab(); - l_message varchar2(32767); - l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_diff_row_count integer; - l_actual ut_compound_data_value; - l_diff_id ut_compound_data_helper.t_hash; - l_row_diffs ut_compound_data_helper.tt_row_diffs; - l_compare_type varchar2(10); - l_self ut_compound_data_value; - - function get_diff_message (a_row_diff ut_compound_data_helper.t_row_diffs,a_is_unordered boolean) return varchar2 is - begin - - if a_is_unordered then - if a_row_diff.pk_value is not null then - return ' PK '||a_row_diff.pk_value||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; - else - return rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; - end if; - else - return ' Row No. '||a_row_diff.rn||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; - end if; - end; - - begin - if not a_other is of (ut_compound_data_value) then - raise value_error; - end if; - - l_actual := treat(a_other as ut_compound_data_value); - - dbms_lob.createtemporary(l_result,true); - - l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_actual.data_id); - - -- First tell how many rows are different - l_diff_row_count := ut_compound_data_helper.get_rows_diff_count; - --TODO : Change message when the types not matching - if l_diff_row_count > 0 then - l_row_diffs := ut_compound_data_helper.get_rows_diff( - self.data_id, l_actual.data_id, l_diff_id, c_max_rows, a_exclude_xpath, - a_include_xpath, a_join_by_xpath, a_other is of (ut_data_value_refcursor), a_unordered); - l_message := chr(10) - ||'Rows: [ ' || l_diff_row_count ||' differences' - || case when l_diff_row_count > c_max_rows and l_row_diffs.count > 0 then ', showing first '||c_max_rows end - ||' ]'||chr(10)|| case when l_row_diffs.count = 0 then ' All rows are different as the columns are not matching.' else null end; - ut_utils.append_to_clob( l_result, l_message ); - for i in 1 .. l_row_diffs.count loop - l_results.extend; - l_results(l_results.last) := get_diff_message(l_row_diffs(i),a_unordered); - end loop; - ut_utils.append_to_clob(l_result,l_results); - else - l_message:= chr(10)||'Rows: [ all different ]'||chr(10)||' All rows are different as the columns are not matching.'; - ut_utils.append_to_clob( l_result, l_message ); - end if; - return l_result; - end; - - member function diff( a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, - a_unordered boolean := false, a_join_by_list ut_varchar2_list:=ut_varchar2_list() ) return varchar2 is + member function diff( a_other ut_data_value, a_unordered boolean := false, a_join_by_list ut_varchar2_list:=ut_varchar2_list() ) return varchar2 is l_result clob; l_results ut_utils.t_clob_tab := ut_utils.t_clob_tab(); l_result_string varchar2(32767); @@ -293,9 +229,9 @@ create or replace type body ut_data_value_refcursor as l_diff_row_count := ut_compound_data_helper.get_rows_diff_count; l_results := ut_utils.t_clob_tab(); if l_diff_row_count > 0 then - l_row_diffs := ut_compound_data_helper.get_rows_diff( - self.data_id, l_actual.data_id, l_diff_id, c_max_rows, a_exclude_xpath, - a_include_xpath, a_join_by_xpath, a_other is of (ut_data_value_refcursor), a_unordered); + --TODO : since columns can differ we need to pass both list or get common denominator + l_row_diffs := ut_compound_data_helper.get_rows_diff_by_sql( + l_exp_cols,l_act_cols, self.data_id, l_actual.data_id, l_diff_id,a_join_by_list , a_unordered); l_message := chr(10) ||'Rows: [ ' || l_diff_row_count ||' differences' || case when l_diff_row_count > c_max_rows and l_row_diffs.count > 0 then ', showing first '||c_max_rows end @@ -329,21 +265,19 @@ create or replace type body ut_data_value_refcursor as return l_result_string; end; - overriding member function compare_implementation (a_other ut_data_value, a_unordered boolean, a_inclusion_compare boolean := false, - a_is_negated boolean := false, a_join_by_list ut_varchar2_list:=ut_varchar2_list()) - return integer is + overriding member function compare_implementation(a_other ut_data_value, a_unordered boolean, a_inclusion_compare boolean := false, a_is_negated boolean := false, + a_join_by_list ut_varchar2_list:=ut_varchar2_list()) return integer is l_result integer := 0; l_actual ut_data_value_refcursor; - l_pk_missing_tab ut_compound_data_helper.tt_missing_pk; begin if not a_other is of (ut_data_value_refcursor) then raise value_error; end if; - + l_actual := treat(a_other as ut_data_value_refcursor); - + if a_join_by_list.count > 0 then l_pk_missing_tab := ut_compound_data_helper.get_missing_pk(self.cursor_details.cursor_info,l_actual.cursor_details.cursor_info,a_join_by_list); l_result := case when (l_pk_missing_tab.count > 0) then 1 else 0 end; @@ -365,9 +299,9 @@ create or replace type body ut_data_value_refcursor as return self.elements_count = 0; end; - member function filter_cursor (a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) return ut_data_value_refcursor is + member function filter_cursor (a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) return ut_data_value_refcursor is l_result ut_data_value_refcursor := self; - begin + begin if l_result.cursor_details.cursor_info is not null then l_result.cursor_details.cursor_info := ut_compound_data_helper.inc_exc_columns_from_cursor(l_result.cursor_details.cursor_info,a_exclude_xpath,a_include_xpath); end if; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tps b/source/expectations/data_values/ut_data_value_refcursor.tps index ec1771846..2a6b58ba1 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tps +++ b/source/expectations/data_values/ut_data_value_refcursor.tps @@ -52,13 +52,9 @@ create or replace type ut_data_value_refcursor under ut_compound_data_value( constructor function ut_data_value_refcursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) return self as result, member procedure init(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor), overriding member function to_string return varchar2, - member function get_data_diff(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, - a_join_by_xpath varchar2, a_unordered boolean,a_join_by_list ut_varchar2_list:=ut_varchar2_list()) return clob, - member function diff( a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean := false - ,a_join_by_list ut_varchar2_list:=ut_varchar2_list()) return varchar2, - overriding member function compare_implementation(a_other ut_data_value, a_unordered boolean, a_inclusion_compare boolean := false, - a_is_negated boolean := false, a_join_by_list ut_varchar2_list:=ut_varchar2_list()) return integer, + member function diff( a_other ut_data_value, a_unordered boolean := false, a_join_by_list ut_varchar2_list:=ut_varchar2_list() ) return varchar2, + overriding member function compare_implementation(a_other ut_data_value, a_unordered boolean, a_inclusion_compare boolean := false, a_is_negated boolean := false, + a_join_by_list ut_varchar2_list:=ut_varchar2_list()) return integer, overriding member function is_empty return boolean, - member function filter_cursor (a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) return ut_data_value_refcursor -) + member function filter_cursor (a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) return ut_data_value_refcursor) / diff --git a/source/expectations/matchers/ut_equal.tpb b/source/expectations/matchers/ut_equal.tpb index 489e9f41f..d790118af 100644 --- a/source/expectations/matchers/ut_equal.tpb +++ b/source/expectations/matchers/ut_equal.tpb @@ -255,7 +255,6 @@ create or replace type body ut_equal as member function get_join_by_list return ut_varchar2_list is begin - --TODO : zamiast zmieniac path zmodyfikuj get functions return ( coalesce(join_columns, ut_varchar2_list()) ); end; @@ -268,8 +267,7 @@ create or replace type body ut_equal as l_result := 0 = treat(self.expected as ut_data_value_anydata).compare_implementation(a_actual, get_exclude_xpath(), get_include_xpath()); elsif self.expected is of (ut_data_value_refcursor) then l_actual := treat(a_actual as ut_data_value_refcursor).filter_cursor(exclude_list, include_list); - l_result := 0 = treat(self.expected as ut_data_value_refcursor).filter_cursor(exclude_list, include_list).compare_implementation(l_actual, - get_unordered(), false, false, get_join_by_list() ); + l_result := 0 = treat(self.expected as ut_data_value_refcursor).filter_cursor(exclude_list, include_list).compare_implementation(l_actual, get_unordered(), false, false, get_join_by_list() ); else l_result := equal_with_nulls((self.expected = a_actual), a_actual); end if; @@ -289,7 +287,7 @@ create or replace type body ut_equal as l_actual := treat(a_actual as ut_data_value_refcursor).filter_cursor(exclude_list, include_list); l_result := 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() - || chr(10) || 'Diff:' || treat(expected as ut_data_value_refcursor).filter_cursor(exclude_list, include_list).diff(l_actual, get_exclude_xpath(), get_include_xpath(), get_join_by_xpath(), get_unordered(),get_join_by_list()); + || chr(10) || 'Diff:' || treat(expected as ut_data_value_refcursor).filter_cursor(exclude_list, include_list).filter_cursor(exclude_list, include_list).diff(l_actual, get_unordered(),get_join_by_list()); else l_result := 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() diff --git a/source/expectations/matchers/ut_include.tpb b/source/expectations/matchers/ut_include.tpb index 7859e24ff..07ba65f5d 100644 --- a/source/expectations/matchers/ut_include.tpb +++ b/source/expectations/matchers/ut_include.tpb @@ -78,7 +78,7 @@ create or replace type body ut_include as l_actual := treat(a_actual as ut_data_value_refcursor).filter_cursor(exclude_list, include_list); l_result := 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() - || chr(10) || 'Diff:' || treat(expected as ut_data_value_refcursor).filter_cursor(self.exclude_list, self.include_list).diff(a_actual, self.get_exclude_xpath(), self.get_include_xpath(), self.get_join_by_xpath(), true); + || chr(10) || 'Diff:' || treat(expected as ut_data_value_refcursor).filter_cursor(self.exclude_list, self.include_list).diff(l_actual, true, self.get_join_by_list()); else l_result := 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index 06b8cbf17..8775b764c 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -409,20 +409,27 @@ create or replace package body test_expectations_cursor is as l_actual SYS_REFCURSOR; l_expected SYS_REFCURSOR; - l_error_code integer := -31011; --xpath_error + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); begin --Arrange open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 4; open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; - begin --Act - ut3.ut.expect(l_actual).to_equal(l_expected, a_exclude=>'/ROW/A_COLUMN,\\//Some_Col'); + ut3.ut.expect(l_actual).to_equal(l_expected, a_exclude=>'/ROW/A_COLUMN,\\//Some_Col'); --Assert - ut.fail('Expected '||l_error_code||' but nothing was raised'); - exception - when others then - ut.expect(sqlcode).to_equal(l_error_code); - end; + l_expected_message := q'[Actual: refcursor [ count = 3 ] was expected to equal: refcursor [ count = 3 ] +%Diff: +%Rows: [ 3 differences ] +%Row No. 1 - Actual: d +%Row No. 1 - Expected: c +%Row No. 2 - Actual: d +%Row No. 2 - Expected: c +%Row No. 3 - Actual: d +%Row No. 3 - Expected: c]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); end; procedure exclude_columns_xpath @@ -1003,44 +1010,7 @@ Rows: [ 4 differences ] --Assert ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; - - - procedure include_col_name_implicit is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; - begin - --Arrange - open l_actual for select rownum as rn, 'a', 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 4; - open l_expected for select rownum as rn, 'a', 'd' as A_COLUMN, 'c' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; - begin - --Act - ut3.ut.expect(l_actual).to_equal(l_expected).include(q'!/ROW/RN,'a',//SOME_COL!'); - --Assert - ut.fail('Expected exception but nothing was raised'); - exception - when others then - ut.expect(sqlcode).to_be_between(-31013,-31011); - end; - end; - - procedure exclude_col_name_implicit is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; - begin - --Arrange - open l_actual for select rownum as rn, 'a', 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 4; - open l_expected for select rownum as rn, 'a', 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; - begin - --Act - ut3.ut.expect(l_actual).to_equal(l_expected).exclude(q'!/ROW/RN,'a',//SOME_COL!'); - --Assert - ut.fail('Expected exception but nothing was raised'); - exception - when others then - ut.expect(sqlcode).to_be_between(-31013,-31011); - end; - end; - + procedure cursor_unorderd_compr_success is l_actual SYS_REFCURSOR; l_expected SYS_REFCURSOR; diff --git a/test/core/expectations/test_expectations_cursor.pks b/test/core/expectations/test_expectations_cursor.pks index cbb029b9b..ce02623dd 100644 --- a/test/core/expectations/test_expectations_cursor.pks +++ b/test/core/expectations/test_expectations_cursor.pks @@ -92,7 +92,7 @@ create or replace package test_expectations_cursor is --%test(Excludes comma separated list of mixed columns and XPath) procedure exclude_columns_as_mix_csv_lst; - --%test(Exclude columns fails on invalid XPath) + --%test(Exclude column with invalid filter will result in column being included ) procedure exclude_columns_xpath_invalid; --%test(Exclude columns by XPath is case sensitive) @@ -193,12 +193,6 @@ create or replace package test_expectations_cursor is --%test(Reports column match on cursor with column name implicit ) procedure col_mtch_on_col_name_implicit; - --%test( Fail on passing implicit column name as include filter ) - procedure include_col_name_implicit; - - --%test( Fail on passing implicit column name as exclude filter ) - procedure exclude_col_name_implicit; - --%test( Compare cursors using unordered method success) procedure cursor_unorderd_compr_success; From 69b577caa464c4a2216362f73df095e97e47dcea Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 24 Nov 2018 19:54:05 +0000 Subject: [PATCH 0134/1096] Removed unneeded `sed` from test-runner Changed `sed -r` to `sed -E` Resolves #796 --- .travis/get_project_build_version.sh | 2 +- .travis/get_project_version.sh | 2 +- test/install_and_run_tests.sh | 12 ------------ 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/.travis/get_project_build_version.sh b/.travis/get_project_build_version.sh index 6f759bf99..838523b05 100644 --- a/.travis/get_project_build_version.sh +++ b/.travis/get_project_build_version.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -echo `sed -r "s/(v?[0-9]+\.)([0-9]+\.)([0-9]+)(-.*)?/\1\2\3\.${UTPLSQL_BUILD_NO}\4/" <<< "${UTPLSQL_VERSION}"` +echo `sed -E "s/(v?[0-9]+\.)([0-9]+\.)([0-9]+)(-.*)?/\1\2\3\.${UTPLSQL_BUILD_NO}\4/" <<< "${UTPLSQL_VERSION}"` diff --git a/.travis/get_project_version.sh b/.travis/get_project_version.sh index 2ac4c6ab4..20a658ed9 100644 --- a/.travis/get_project_version.sh +++ b/.travis/get_project_version.sh @@ -8,7 +8,7 @@ else version=`cat VERSION` #When on develop branch, add "-develop" to the version text if [[ "${CURRENT_BRANCH}" == "develop" ]]; then - version=`sed -r "s/(v?[0-9]+\.[0-9]+\.[0-9]+).*/\1-develop/" <<< "${version}"` + version=`sed -E "s/(v?[0-9]+\.[0-9]+\.[0-9]+).*/\1-develop/" <<< "${version}"` fi fi echo ${version} diff --git a/test/install_and_run_tests.sh b/test/install_and_run_tests.sh index b8aba77e2..ffe56278e 100644 --- a/test/install_and_run_tests.sh +++ b/test/install_and_run_tests.sh @@ -16,14 +16,6 @@ time utPLSQL-cli/bin/utplsql run ${UT3_USER}/${UT3_USER_PASSWORD}@${CONNECTION_S -f=ut_documentation_reporter -o=min_test_results.log -s \ -scc -status_line_regex="^[0-9]+ tests, ([0-9]+) failed, ([0-9]+) errored.*" - -RC=$(cat min_test_results.log | grep -E "${status_line_regex}" | sed -re "s/${status_line_regex}/\1\2/") - -if [ "$RC" == "1" ]; then - exit 1 -fi - cd test time "$SQLCLI" ${UT3_TESTER}/${UT3_TESTER_PASSWORD}@//${CONNECTION_STR} @install_tests.sql @@ -44,10 +36,6 @@ time utPLSQL-cli/bin/utplsql run ${UT3_TESTER}/${UT3_TESTER_PASSWORD}@${CONNECTI status_line_regex="^[0-9]+ tests, ([0-9]+) failed, ([0-9]+) errored.*" -#cat coverage.xml -#cat test_results.xml - -RC=$(cat test_results.log | grep -E "${status_line_regex}" | sed -re "s/${status_line_regex}/\1\2/") exit $RC From abfa2916503a322db2c42ee2588496c4d5079140 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sat, 24 Nov 2018 20:21:36 +0000 Subject: [PATCH 0135/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 14048bbae..f3c542a1a 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.4.2403-develop'; + gc_version constant varchar2(50) := 'v3.1.4.2414-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From 7aa2a7cacc985871fbfa0b1c63d99498fa429315 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sun, 25 Nov 2018 14:57:34 +0100 Subject: [PATCH 0136/1096] make all shell scripts executable --- .travis/build_docs.sh | 0 .travis/build_release_archive.sh | 0 .travis/coveralls_uploader.sh | 0 .travis/download.sh | 0 .travis/get_project_build_version.sh | 0 .travis/get_project_version.sh | 0 .travis/install.sh | 0 .travis/install_sqlcl.sh | 0 .travis/install_utplsql_release.sh | 0 .travis/maven_cfg.sh | 0 .travis/push_docs_to_gh_pages.sh | 0 .travis/push_release_version.sh | 0 .travis/run_examples.sh | 0 .travis/run_old_tests.sh | 0 .travis/start_db.sh | 0 .travis/trigger_travis.sh | 0 .travis/update_project_version.sh | 0 .travis/validate_report_files.sh | 0 development/refresh_ut3.sh | 0 test/install_and_run_tests.sh | 0 20 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .travis/build_docs.sh mode change 100644 => 100755 .travis/build_release_archive.sh mode change 100644 => 100755 .travis/coveralls_uploader.sh mode change 100644 => 100755 .travis/download.sh mode change 100644 => 100755 .travis/get_project_build_version.sh mode change 100644 => 100755 .travis/get_project_version.sh mode change 100644 => 100755 .travis/install.sh mode change 100644 => 100755 .travis/install_sqlcl.sh mode change 100644 => 100755 .travis/install_utplsql_release.sh mode change 100644 => 100755 .travis/maven_cfg.sh mode change 100644 => 100755 .travis/push_docs_to_gh_pages.sh mode change 100644 => 100755 .travis/push_release_version.sh mode change 100644 => 100755 .travis/run_examples.sh mode change 100644 => 100755 .travis/run_old_tests.sh mode change 100644 => 100755 .travis/start_db.sh mode change 100644 => 100755 .travis/trigger_travis.sh mode change 100644 => 100755 .travis/update_project_version.sh mode change 100644 => 100755 .travis/validate_report_files.sh mode change 100644 => 100755 development/refresh_ut3.sh mode change 100644 => 100755 test/install_and_run_tests.sh diff --git a/.travis/build_docs.sh b/.travis/build_docs.sh old mode 100644 new mode 100755 diff --git a/.travis/build_release_archive.sh b/.travis/build_release_archive.sh old mode 100644 new mode 100755 diff --git a/.travis/coveralls_uploader.sh b/.travis/coveralls_uploader.sh old mode 100644 new mode 100755 diff --git a/.travis/download.sh b/.travis/download.sh old mode 100644 new mode 100755 diff --git a/.travis/get_project_build_version.sh b/.travis/get_project_build_version.sh old mode 100644 new mode 100755 diff --git a/.travis/get_project_version.sh b/.travis/get_project_version.sh old mode 100644 new mode 100755 diff --git a/.travis/install.sh b/.travis/install.sh old mode 100644 new mode 100755 diff --git a/.travis/install_sqlcl.sh b/.travis/install_sqlcl.sh old mode 100644 new mode 100755 diff --git a/.travis/install_utplsql_release.sh b/.travis/install_utplsql_release.sh old mode 100644 new mode 100755 diff --git a/.travis/maven_cfg.sh b/.travis/maven_cfg.sh old mode 100644 new mode 100755 diff --git a/.travis/push_docs_to_gh_pages.sh b/.travis/push_docs_to_gh_pages.sh old mode 100644 new mode 100755 diff --git a/.travis/push_release_version.sh b/.travis/push_release_version.sh old mode 100644 new mode 100755 diff --git a/.travis/run_examples.sh b/.travis/run_examples.sh old mode 100644 new mode 100755 diff --git a/.travis/run_old_tests.sh b/.travis/run_old_tests.sh old mode 100644 new mode 100755 diff --git a/.travis/start_db.sh b/.travis/start_db.sh old mode 100644 new mode 100755 diff --git a/.travis/trigger_travis.sh b/.travis/trigger_travis.sh old mode 100644 new mode 100755 diff --git a/.travis/update_project_version.sh b/.travis/update_project_version.sh old mode 100644 new mode 100755 diff --git a/.travis/validate_report_files.sh b/.travis/validate_report_files.sh old mode 100644 new mode 100755 diff --git a/development/refresh_ut3.sh b/development/refresh_ut3.sh old mode 100644 new mode 100755 diff --git a/test/install_and_run_tests.sh b/test/install_and_run_tests.sh old mode 100644 new mode 100755 From f839c9067e4e4b0de2f9662808e0cf9a5cc09ba5 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sun, 25 Nov 2018 16:54:02 +0000 Subject: [PATCH 0137/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index f3c542a1a..0fcd848ff 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.4.2414-develop'; + gc_version constant varchar2(50) := 'v3.1.4.2416-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From 4edc05d6b99eefdadb8680c875c25a644905cde8 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 26 Nov 2018 00:25:21 +0000 Subject: [PATCH 0138/1096] Removed `old_tests`. Consolidated minimal user tests. Added missing test for `get_schema_ut_packages` Fixed bug in `get_schema_ut_packages` where cache was not refreshed as needed. Resolves #475 --- .travis.yml | 1 - .travis/run_old_tests.sh | 10 - CONTRIBUTING.md | 11 +- .../lib => development}/mystats/README.md | 0 .../lib => development}/mystats/mystats.sql | 0 .../mystats/mystats_pkg.sql | 0 old_tests/RunAll.sql | 396 ------------------ old_tests/helpers/department.tps | 4 - old_tests/helpers/department1.tps | 4 - old_tests/helpers/html_coverage_test.pck | 25 -- old_tests/helpers/test_package_1.pck | 71 ---- old_tests/helpers/test_package_2.pck | 69 --- old_tests/helpers/test_package_3.pck | 80 ---- old_tests/helpers/test_reporters.pkb | 67 --- old_tests/helpers/test_reporters.pks | 38 -- old_tests/helpers/test_reporters_1.pkb | 11 - old_tests/helpers/test_reporters_1.pks | 10 - old_tests/helpers/ut_example_tests.pkb | 43 -- old_tests/helpers/ut_example_tests.pks | 14 - old_tests/helpers/utplsql_test_reporter.typ | 20 - old_tests/lib/RunSummary.sql | 16 - old_tests/lib/RunTest.sql | 30 -- old_tests/lib/RunVars.sql | 9 - old_tests/readme.md | 1 - old_tests/runAll.sh | 8 - ...aisesExceptionWhenTryingToSetNullValue.sql | 12 - ...xpectation_processor.stackOnFailedTest.sql | 41 -- ...ut_expectation_processor.stackOnUtFail.sql | 41 -- ...ta.form_name.TrimStandaloneProgramName.sql | 17 - ...rter.providesCorrectLineFromStacktrace.sql | 32 -- ...tation_reporter.reportMultipleWarnings.sql | 75 ---- ...ocumentation_reporter.reportTestTiming.sql | 50 --- ...ut_html_reporter.DefaultSchemaCoverage.sql | 19 - ...ml_reporter.UserOverrideSchemaCoverage.sql | 20 - ...te_manager.AllowsDescriptionsWithComma.sql | 67 --- ...r.IncludesInvalidPackageBodiesInTheRun.sql | 31 -- ...ut_suite_manager.PackageWithDollarSign.sql | 38 -- .../ut_suite_manager.PackageWithHash.sql | 40 -- .../ut_suite_manager.TestWithDollarSign.sql | 45 -- .../ut_suite_manager.TestWithHashSign.sql | 46 -- ..._packages.IncludesPackagesWithSutePath.sql | 40 -- .../common/ut_utils.clob_to_table.sql | 43 -- .../common/ut_utils.table_to_clob.sql | 17 - ...append_to_clob.worksWithMultiByteChars.sql | 43 -- old_tests/ut_utils/ut_utils.clob_to_table.sql | 7 - .../ut_utils.clob_to_table_multibyte.sql | 22 - old_tests/ut_utils/ut_utils.table_to_clob.sql | 7 - ...t_result_to_char.RunsWithInvalidValues.sql | 15 - ....test_result_to_char.RunsWithNullValue.sql | 15 - .../ut_utils.test_result_to_char.Success.sql | 15 - source/core/ut_suite_manager.pkb | 4 + test/api/test_ut_run.pkb | 54 +-- test/core.pkb | 19 + test/core.pks | 2 +- .../min_grant_user/test_min_grant_user.pkb | 62 +++ .../min_grant_user/test_min_grant_user.pks | 16 + test/core/reporters/test_coverage.pkb | 1 - test/core/reporters/test_coverage.pks | 2 + test/core/test_suite_manager.pkb | 31 ++ test/core/test_suite_manager.pks | 11 + test/install__min_usr_tests.sql | 39 -- test/install_and_run_tests.sh | 18 - test/install_tests.sql | 2 + test/min_grant_user/min_grant_user_exp.pkb | 19 - test/min_grant_user/min_grant_user_exp.pks | 9 - 65 files changed, 167 insertions(+), 1858 deletions(-) delete mode 100755 .travis/run_old_tests.sh rename {old_tests/lib => development}/mystats/README.md (100%) rename {old_tests/lib => development}/mystats/mystats.sql (100%) rename {old_tests/lib => development}/mystats/mystats_pkg.sql (100%) delete mode 100644 old_tests/RunAll.sql delete mode 100644 old_tests/helpers/department.tps delete mode 100644 old_tests/helpers/department1.tps delete mode 100644 old_tests/helpers/html_coverage_test.pck delete mode 100644 old_tests/helpers/test_package_1.pck delete mode 100644 old_tests/helpers/test_package_2.pck delete mode 100644 old_tests/helpers/test_package_3.pck delete mode 100644 old_tests/helpers/test_reporters.pkb delete mode 100644 old_tests/helpers/test_reporters.pks delete mode 100644 old_tests/helpers/test_reporters_1.pkb delete mode 100644 old_tests/helpers/test_reporters_1.pks delete mode 100644 old_tests/helpers/ut_example_tests.pkb delete mode 100644 old_tests/helpers/ut_example_tests.pks delete mode 100644 old_tests/helpers/utplsql_test_reporter.typ delete mode 100644 old_tests/lib/RunSummary.sql delete mode 100644 old_tests/lib/RunTest.sql delete mode 100644 old_tests/lib/RunVars.sql delete mode 100644 old_tests/readme.md delete mode 100755 old_tests/runAll.sh delete mode 100644 old_tests/ut_expectations/ut_expectation_processor.nulls_are_equal.raisesExceptionWhenTryingToSetNullValue.sql delete mode 100644 old_tests/ut_expectations/ut_expectation_processor.stackOnFailedTest.sql delete mode 100644 old_tests/ut_expectations/ut_expectation_processor.stackOnUtFail.sql delete mode 100644 old_tests/ut_metadata/ut_metadata.form_name.TrimStandaloneProgramName.sql delete mode 100644 old_tests/ut_reporters/ut_documentation_reporter.providesCorrectLineFromStacktrace.sql delete mode 100644 old_tests/ut_reporters/ut_documentation_reporter.reportMultipleWarnings.sql delete mode 100644 old_tests/ut_reporters/ut_documentation_reporter.reportTestTiming.sql delete mode 100644 old_tests/ut_reporters/ut_html_reporter.DefaultSchemaCoverage.sql delete mode 100644 old_tests/ut_reporters/ut_html_reporter.UserOverrideSchemaCoverage.sql delete mode 100644 old_tests/ut_suite_manager/ut_suite_manager.AllowsDescriptionsWithComma.sql delete mode 100644 old_tests/ut_suite_manager/ut_suite_manager.IncludesInvalidPackageBodiesInTheRun.sql delete mode 100644 old_tests/ut_suite_manager/ut_suite_manager.PackageWithDollarSign.sql delete mode 100644 old_tests/ut_suite_manager/ut_suite_manager.PackageWithHash.sql delete mode 100644 old_tests/ut_suite_manager/ut_suite_manager.TestWithDollarSign.sql delete mode 100644 old_tests/ut_suite_manager/ut_suite_manager.TestWithHashSign.sql delete mode 100644 old_tests/ut_suite_manager/ut_suite_manager.get_schema_ut_packages.IncludesPackagesWithSutePath.sql delete mode 100644 old_tests/ut_utils/common/ut_utils.clob_to_table.sql delete mode 100644 old_tests/ut_utils/common/ut_utils.table_to_clob.sql delete mode 100644 old_tests/ut_utils/ut_utils.append_to_clob.worksWithMultiByteChars.sql delete mode 100644 old_tests/ut_utils/ut_utils.clob_to_table.sql delete mode 100644 old_tests/ut_utils/ut_utils.clob_to_table_multibyte.sql delete mode 100644 old_tests/ut_utils/ut_utils.table_to_clob.sql delete mode 100644 old_tests/ut_utils/ut_utils.test_result_to_char.RunsWithInvalidValues.sql delete mode 100644 old_tests/ut_utils/ut_utils.test_result_to_char.RunsWithNullValue.sql delete mode 100644 old_tests/ut_utils/ut_utils.test_result_to_char.Success.sql create mode 100644 test/core/min_grant_user/test_min_grant_user.pkb create mode 100644 test/core/min_grant_user/test_min_grant_user.pks delete mode 100644 test/install__min_usr_tests.sql delete mode 100644 test/min_grant_user/min_grant_user_exp.pkb delete mode 100644 test/min_grant_user/min_grant_user_exp.pks diff --git a/.travis.yml b/.travis.yml index 58aa254e8..b396da748 100644 --- a/.travis.yml +++ b/.travis.yml @@ -90,7 +90,6 @@ before_script: - if [[ ! $TRAVIS_TAG ]]; then bash .travis/install.sh; fi - if [[ ! $TRAVIS_TAG ]]; then bash .travis/install_utplsql_release.sh; fi - if [[ ! $TRAVIS_TAG ]]; then bash .travis/run_examples.sh; fi - - if [[ ! $TRAVIS_TAG ]]; then bash .travis/run_old_tests.sh; fi script: - if [[ ! $TRAVIS_TAG ]]; then bash test/install_and_run_tests.sh; fi diff --git a/.travis/run_old_tests.sh b/.travis/run_old_tests.sh deleted file mode 100755 index 4e8dcbce9..000000000 --- a/.travis/run_old_tests.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -set -ev - -cd old_tests - -"$SQLCLI" $UT3_OWNER/$UT3_OWNER_PASSWORD@//$CONNECTION_STR < We do our best to keep utPLSQL covered with unit tests. > Lack of sufficient unit testing is a perfect reason for PR to be rejected. -To suite of legacy unit tests execute: -```bash -development/env.sh -old_tests/runAll.sh -``` To run a full suite of unit tests execute: ```bash development/env.sh test/install_and_run_tests.sh ``` -You can review the results of tests as well as see information about code coverage in `./old_tests/coverage.html, ./coverage.html` files. +You can review the results of tests as well as see information about code coverage in `./coverage.html` file. ## Modules diff --git a/old_tests/lib/mystats/README.md b/development/mystats/README.md similarity index 100% rename from old_tests/lib/mystats/README.md rename to development/mystats/README.md diff --git a/old_tests/lib/mystats/mystats.sql b/development/mystats/mystats.sql similarity index 100% rename from old_tests/lib/mystats/mystats.sql rename to development/mystats/mystats.sql diff --git a/old_tests/lib/mystats/mystats_pkg.sql b/development/mystats/mystats_pkg.sql similarity index 100% rename from old_tests/lib/mystats/mystats_pkg.sql rename to development/mystats/mystats_pkg.sql diff --git a/old_tests/RunAll.sql b/old_tests/RunAll.sql deleted file mode 100644 index 282a01ff7..000000000 --- a/old_tests/RunAll.sql +++ /dev/null @@ -1,396 +0,0 @@ -set trimspool on -set echo off -set feedback off -set verify off -Clear Screen -set linesize 32767 -set pagesize 0 -set long 200000000 -set longchunksize 1000000 -set serveroutput on size unlimited format truncated -@@lib/RunVars.sql - -@@lib/mystats/mystats_pkg.sql -exec mystats_pkg.ms_start; - -spool RunAll.log - ---Global setup -@@helpers/ut_example_tests.pks -@@helpers/ut_example_tests.pkb ---@@helpers/cre_tab_ut_test_table.sql -create table ut$test_table (val varchar2(1)); -@@helpers/department.tps -@@helpers/department1.tps -@@helpers/test_package_3.pck -@@helpers/test_package_1.pck -@@helpers/test_package_2.pck -@@helpers/utplsql_test_reporter.typ -@@helpers/test_reporters.pks -@@helpers/test_reporters.pkb -@@helpers/html_coverage_test.pck -@@helpers/test_reporters_1.pks -@@helpers/test_reporters_1.pkb - ---Start coverage in develop mode (coverage for utPLSQL framework) ---Regular coverage excludes the framework -exec ut_coverage.coverage_start(); -exec ut_coverage.set_develop_mode(true); - -@@lib/RunTest.sql ut_expectations/ut_expectation_processor.nulls_are_equal.raisesExceptionWhenTryingToSetNullValue.sql -@@lib/RunTest.sql ut_expectations/ut_expectation_processor.stackOnFailedTest.sql -@@lib/RunTest.sql ut_expectations/ut_expectation_processor.stackOnUtFail.sql - -@@lib/RunTest.sql ut_metadata/ut_metadata.form_name.TrimStandaloneProgramName.sql - -@@lib/RunTest.sql ut_reporters/ut_documentation_reporter.providesCorrectLineFromStacktrace.sql -@@lib/RunTest.sql ut_reporters/ut_documentation_reporter.reportMultipleWarnings.sql -@@lib/RunTest.sql ut_reporters/ut_documentation_reporter.reportTestTiming.sql -@@lib/RunTest.sql ut_reporters/ut_html_reporter.DefaultSchemaCoverage.sql -@@lib/RunTest.sql ut_reporters/ut_html_reporter.UserOverrideSchemaCoverage.sql - -@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.AllowsDescriptionsWithComma.sql -@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.get_schema_ut_packages.IncludesPackagesWithSutePath.sql -@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.IncludesInvalidPackageBodiesInTheRun.sql -@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.PackageWithDollarSign.sql -@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.PackageWithHash.sql -@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.TestWithDollarSign.sql -@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.TestWithHashSign.sql - - -@@ut_utils/ut_utils.clob_to_table.sql -@@ut_utils/ut_utils.table_to_clob.sql -@@lib/RunTest.sql ut_utils/ut_utils.append_to_clob.worksWithMultiByteChars.sql -@@lib/RunTest.sql ut_utils/ut_utils.test_result_to_char.RunsWithInvalidValues.sql -@@lib/RunTest.sql ut_utils/ut_utils.test_result_to_char.RunsWithNullValue.sql -@@lib/RunTest.sql ut_utils/ut_utils.test_result_to_char.Success.sql - ---Finally -@@lib/RunSummary - -spool off - ---Global cleanup ---removing objects that should not be part of coverage report -drop package ut_example_tests; -drop table ut$test_table; -drop type department$; -drop type department1$; -drop package test_package_1; -drop package test_package_2; -drop package test_package_3; -drop type utplsql_test_reporter; -drop package test_reporters; -drop package ut3$user#.html_coverage_test; - --- set timing on --- prompt Generating coverage data to reporter outputs --- --- var html_reporter_id varchar2(32); --- var sonar_reporter_id varchar2(32); --- var coveralls_reporter_id varchar2(32); --- declare --- l_reporter ut_reporter_base; --- l_project_file_list ut_varchar2_list; --- l_test_run ut_run; --- begin --- l_project_file_list := ut_varchar2_list( --- 'source/api', --- 'source/core', --- 'source/create_synonyms_and_grants_for_public.sql', --- 'source/create_synonyms_and_grants_for_user.sql', --- 'source/create_utplsql_owner.sql', --- 'source/expectations', --- 'source/install.log', --- 'source/install.sql', --- 'source/install_headless.sql', --- 'source/license.txt', --- 'source/readme.md', --- 'source/reporters', --- 'source/uninstall.log', --- 'source/uninstall.sql', --- 'source/api/be_between.syn', --- 'source/api/be_empty.syn', --- 'source/api/be_false.syn', --- 'source/api/be_greater_or_equal.syn', --- 'source/api/be_greater_than.syn', --- 'source/api/be_less_or_equal.syn', --- 'source/api/be_less_than.syn', --- 'source/api/be_like.syn', --- 'source/api/be_not_null.syn', --- 'source/api/be_null.syn', --- 'source/api/be_true.syn', --- 'source/api/equal.syn', --- 'source/api/match.syn', --- 'source/api/ut.pkb', --- 'source/api/ut.pks', --- 'source/api/ut_runner.pkb', --- 'source/api/ut_runner.pks', --- 'source/core/coverage', --- 'source/core/output_buffers', --- 'source/core/types', --- 'source/core/annotations/ut_annotation_manager.pkb', --- 'source/core/annotations/ut_annotation_manager.pks', --- 'source/core/annotations/ut_annotation_parser.pkb', --- 'source/core/annotations/ut_annotation_parser.pks', --- 'source/core/annotations/ut_annotation_cache_manager.pkb', --- 'source/core/annotations/ut_annotation_cache_manager.pks', --- 'source/core/ut_expectation_processor.pkb', --- 'source/core/ut_expectation_processor.pks', --- 'source/core/ut_file_mapper.pkb', --- 'source/core/ut_file_mapper.pks', --- 'source/core/ut_metadata.pkb', --- 'source/core/ut_metadata.pks', --- 'source/core/ut_suite_manager.pkb', --- 'source/core/ut_suite_manager.pks', --- 'source/core/ut_utils.pkb', --- 'source/core/ut_utils.pks', --- 'source/core/coverage/proftab.sql', --- 'source/core/coverage/ut_coverage.pkb', --- 'source/core/coverage/ut_coverage.pks', --- 'source/core/coverage/ut_coverage_helper.pkb', --- 'source/core/coverage/ut_coverage_helper.pks', --- 'source/core/coverage/ut_coverage_sources_tmp.sql', --- 'source/core/coverage/ut_coverage_reporter_base.tpb', --- 'source/core/coverage/ut_coverage_reporter_base.tps', --- 'source/core/output_buffers/ut_message_id_seq.sql', --- 'source/core/output_buffers/ut_output_buffer_base.tps', --- 'source/core/output_buffers/ut_output_buffer_info_tmp.sql', --- 'source/core/output_buffers/ut_output_buffer_tmp.sql', --- 'source/core/output_buffers/ut_output_table_buffer.tpb', --- 'source/core/output_buffers/ut_output_table_buffer.tps', --- 'source/core/types/ut_console_reporter_base.tpb', --- 'source/core/types/ut_console_reporter_base.tps', --- 'source/core/types/ut_coverage_options.tps', --- 'source/core/types/ut_event_listener.tpb', --- 'source/core/types/ut_event_listener.tps', --- 'source/core/types/ut_event_listener_base.tps', --- 'source/core/types/ut_executable.tpb', --- 'source/core/types/ut_executable.tps', --- 'source/core/types/ut_expectation_result.tpb', --- 'source/core/types/ut_expectation_result.tps', --- 'source/core/types/ut_expectation_results.tps', --- 'source/core/types/ut_file_mapping.tpb', --- 'source/core/types/ut_file_mapping.tps', --- 'source/core/types/ut_file_mappings.tps', --- 'source/core/types/ut_key_value_pair.tps', --- 'source/core/types/ut_key_value_pairs.tps', --- 'source/core/types/ut_logical_suite.tpb', --- 'source/core/types/ut_logical_suite.tps', --- 'source/core/types/ut_object_name.tpb', --- 'source/core/types/ut_object_name.tps', --- 'source/core/types/ut_object_names.tps', --- 'source/core/types/ut_output_reporter_base.tpb', --- 'source/core/types/ut_output_reporter_base.tps', --- 'source/core/types/ut_reporters.tps', --- 'source/core/types/ut_reporter_base.tpb', --- 'source/core/types/ut_reporter_base.tps', --- 'source/core/types/ut_results_counter.tpb', --- 'source/core/types/ut_results_counter.tps', --- 'source/core/types/ut_run.tpb', --- 'source/core/types/ut_run.tps', --- 'source/core/types/ut_suite.tpb', --- 'source/core/types/ut_suite.tps', --- 'source/core/types/ut_suite_item.tpb', --- 'source/core/types/ut_suite_item.tps', --- 'source/core/types/ut_suite_items.tps', --- 'source/core/types/ut_test.tpb', --- 'source/core/types/ut_test.tps', --- 'source/core/types/ut_varchar2_list.tps', --- 'source/core/types/ut_varchar2_rows.tps', --- 'source/expectations/data_values', --- 'source/expectations/matchers', --- 'source/expectations/ut_expectation.tpb', --- 'source/expectations/ut_expectation.tps', --- 'source/expectations/ut_expectation_anydata.tpb', --- 'source/expectations/ut_expectation_anydata.tps', --- 'source/expectations/ut_expectation_blob.tpb', --- 'source/expectations/ut_expectation_blob.tps', --- 'source/expectations/ut_expectation_boolean.tpb', --- 'source/expectations/ut_expectation_boolean.tps', --- 'source/expectations/ut_expectation_clob.tpb', --- 'source/expectations/ut_expectation_clob.tps', --- 'source/expectations/ut_expectation_date.tpb', --- 'source/expectations/ut_expectation_date.tps', --- 'source/expectations/ut_expectation_dsinterval.tpb', --- 'source/expectations/ut_expectation_dsinterval.tps', --- 'source/expectations/ut_expectation_number.tpb', --- 'source/expectations/ut_expectation_number.tps', --- 'source/expectations/ut_expectation_refcursor.tpb', --- 'source/expectations/ut_expectation_refcursor.tps', --- 'source/expectations/ut_expectation_timestamp.tpb', --- 'source/expectations/ut_expectation_timestamp.tps', --- 'source/expectations/ut_expectation_timestamp_ltz.tpb', --- 'source/expectations/ut_expectation_timestamp_ltz.tps', --- 'source/expectations/ut_expectation_timestamp_tz.tpb', --- 'source/expectations/ut_expectation_timestamp_tz.tps', --- 'source/expectations/ut_expectation_varchar2.tpb', --- 'source/expectations/ut_expectation_varchar2.tps', --- 'source/expectations/ut_expectation_yminterval.tpb', --- 'source/expectations/ut_expectation_yminterval.tps', --- 'source/expectations/data_values/ut_cursor_data.sql', --- 'source/expectations/data_values/ut_data_value.tpb', --- 'source/expectations/data_values/ut_data_value.tps', --- 'source/expectations/data_values/ut_data_value_anydata.tpb', --- 'source/expectations/data_values/ut_data_value_anydata.tps', --- 'source/expectations/data_values/ut_data_value_blob.tpb', --- 'source/expectations/data_values/ut_data_value_blob.tps', --- 'source/expectations/data_values/ut_data_value_boolean.tpb', --- 'source/expectations/data_values/ut_data_value_boolean.tps', --- 'source/expectations/data_values/ut_data_value_clob.tpb', --- 'source/expectations/data_values/ut_data_value_clob.tps', --- 'source/expectations/data_values/ut_data_value_collection.tpb', --- 'source/expectations/data_values/ut_data_value_collection.tps', --- 'source/expectations/data_values/ut_data_value_date.tpb', --- 'source/expectations/data_values/ut_data_value_date.tps', --- 'source/expectations/data_values/ut_data_value_dsinterval.tpb', --- 'source/expectations/data_values/ut_data_value_dsinterval.tps', --- 'source/expectations/data_values/ut_data_value_number.tpb', --- 'source/expectations/data_values/ut_data_value_number.tps', --- 'source/expectations/data_values/ut_data_value_object.tpb', --- 'source/expectations/data_values/ut_data_value_object.tps', --- 'source/expectations/data_values/ut_data_value_refcursor.tpb', --- 'source/expectations/data_values/ut_data_value_refcursor.tps', --- 'source/expectations/data_values/ut_data_value_timestamp.tpb', --- 'source/expectations/data_values/ut_data_value_timestamp.tps', --- 'source/expectations/data_values/ut_data_value_timestamp_ltz.tpb', --- 'source/expectations/data_values/ut_data_value_timestamp_ltz.tps', --- 'source/expectations/data_values/ut_data_value_timestamp_tz.tpb', --- 'source/expectations/data_values/ut_data_value_timestamp_tz.tps', --- 'source/expectations/data_values/ut_data_value_varchar2.tpb', --- 'source/expectations/data_values/ut_data_value_varchar2.tps', --- 'source/expectations/data_values/ut_data_value_yminterval.tpb', --- 'source/expectations/data_values/ut_data_value_yminterval.tps', --- 'source/expectations/matchers/ut_be_between.tpb', --- 'source/expectations/matchers/ut_be_between.tps', --- 'source/expectations/matchers/ut_be_empty.tpb', --- 'source/expectations/matchers/ut_be_empty.tps', --- 'source/expectations/matchers/ut_be_false.tpb', --- 'source/expectations/matchers/ut_be_false.tps', --- 'source/expectations/matchers/ut_be_greater_or_equal.tpb', --- 'source/expectations/matchers/ut_be_greater_or_equal.tps', --- 'source/expectations/matchers/ut_be_greater_than.tpb', --- 'source/expectations/matchers/ut_be_greater_than.tps', --- 'source/expectations/matchers/ut_be_less_or_equal.tpb', --- 'source/expectations/matchers/ut_be_less_or_equal.tps', --- 'source/expectations/matchers/ut_be_less_than.tpb', --- 'source/expectations/matchers/ut_be_less_than.tps', --- 'source/expectations/matchers/ut_be_like.tpb', --- 'source/expectations/matchers/ut_be_like.tps', --- 'source/expectations/matchers/ut_be_not_null.tpb', --- 'source/expectations/matchers/ut_be_not_null.tps', --- 'source/expectations/matchers/ut_be_null.tpb', --- 'source/expectations/matchers/ut_be_null.tps', --- 'source/expectations/matchers/ut_be_true.tpb', --- 'source/expectations/matchers/ut_be_true.tps', --- 'source/expectations/matchers/ut_equal.tpb', --- 'source/expectations/matchers/ut_equal.tps', --- 'source/expectations/matchers/ut_match.tpb', --- 'source/expectations/matchers/ut_match.tps', --- 'source/expectations/matchers/ut_matcher.tpb', --- 'source/expectations/matchers/ut_matcher.tps', --- 'source/expectations/matchers/ut_comparison_matcher.tpb', --- 'source/expectations/matchers/ut_comparison_matcher.tps', --- 'source/reporters/ut_ansiconsole_helper.pkb', --- 'source/reporters/ut_ansiconsole_helper.pks', --- 'source/reporters/ut_coverage_html_reporter.tpb', --- 'source/reporters/ut_coverage_html_reporter.tps', --- 'source/reporters/ut_coverage_report_html_helper.pkb', --- 'source/reporters/ut_coverage_report_html_helper.pks', --- 'source/reporters/ut_coveralls_reporter.tpb', --- 'source/reporters/ut_coveralls_reporter.tps', --- 'source/reporters/ut_coverage_sonar_reporter.tpb', --- 'source/reporters/ut_coverage_sonar_reporter.tps', --- 'source/reporters/ut_documentation_reporter.tpb', --- 'source/reporters/ut_documentation_reporter.tps', --- 'source/reporters/ut_sonar_test_reporter.tpb', --- 'source/reporters/ut_sonar_test_reporter.tps', --- 'source/reporters/ut_teamcity_reporter.tpb', --- 'source/reporters/ut_teamcity_reporter.tps', --- 'source/reporters/ut_teamcity_reporter_helper.pkb', --- 'source/reporters/ut_teamcity_reporter_helper.pks'); --- --- l_test_run := ut_run(a_items => ut_suite_items(), a_project_file_mappings => ut_file_mapper.build_file_mappings( user,l_project_file_list)); --- --- --run for the first time to gather coverage and timings on reporters too --- l_reporter := ut_coverage_html_reporter(a_project_name => 'utPLSQL v3'); --- l_reporter.after_calling_run(l_test_run); --- l_reporter.on_finalize(l_test_run); --- --- l_reporter := ut_coverage_sonar_reporter(); --- l_reporter.after_calling_run(l_test_run); --- l_reporter.on_finalize(l_test_run); --- --- l_reporter := ut_coveralls_reporter(); --- l_reporter.after_calling_run(l_test_run); --- l_reporter.on_finalize(l_test_run); --- --- ut_coverage.set_develop_mode(false); --- ut_coverage.coverage_stop(); --- --- --run for the second time to get the coverage report --- l_reporter := ut_coverage_html_reporter(a_project_name => 'utPLSQL v3'); --- l_reporter.after_calling_run(l_test_run); --- l_reporter.on_finalize(l_test_run); --- :html_reporter_id := l_reporter.get_reporter_id; --- --- l_reporter := ut_coverage_sonar_reporter(); --- l_reporter.after_calling_run(l_test_run); --- l_reporter.on_finalize(l_test_run); --- :sonar_reporter_id := l_reporter.get_reporter_id; --- --- l_reporter := ut_coveralls_reporter(); --- l_reporter.after_calling_run(l_test_run); --- l_reporter.on_finalize(l_test_run); --- :coveralls_reporter_id := l_reporter.get_reporter_id; --- end; --- / --- --- set timing off --- prompt Spooling outcomes to coverage.xml --- set termout off --- set feedback off --- set arraysize 50 --- spool coverage.xml --- declare --- l_reporter ut_output_reporter_base := ut_coverage_sonar_reporter(); --- begin --- l_reporter.set_reporter_id(:sonar_reporter_id); --- l_reporter.lines_to_dbms_output(a_initial_timeout=>1, a_timeout_sec=>1); --- end; --- / --- spool off --- --- set termout on --- prompt Spooling outcomes to coverage.json --- set termout off --- spool coverage.json --- declare --- l_reporter ut_output_reporter_base := ut_coveralls_reporter(); --- begin --- l_reporter.set_reporter_id(:coveralls_reporter_id); --- l_reporter.lines_to_dbms_output(a_initial_timeout=>1, a_timeout_sec=>1); --- end; --- / --- spool off --- --- set termout on --- prompt Spooling outcomes to coverage.html --- set termout off --- spool coverage.html --- declare --- l_reporter ut_output_reporter_base := ut_coverage_html_reporter(); --- begin --- l_reporter.set_reporter_id(:html_reporter_id); --- l_reporter.lines_to_dbms_output(a_initial_timeout=>1, a_timeout_sec=>1); --- end; --- / --- spool off - -set termout on -spool stats.log -exec mystats_pkg.ms_stop(1000); -spool off - ---can be used by CI to check for tests status -exit :failures_count diff --git a/old_tests/helpers/department.tps b/old_tests/helpers/department.tps deleted file mode 100644 index b2c76a343..000000000 --- a/old_tests/helpers/department.tps +++ /dev/null @@ -1,4 +0,0 @@ -create or replace type department$ as object( - dept_name varchar2(30) -) -/ diff --git a/old_tests/helpers/department1.tps b/old_tests/helpers/department1.tps deleted file mode 100644 index 2450f7b74..000000000 --- a/old_tests/helpers/department1.tps +++ /dev/null @@ -1,4 +0,0 @@ -create or replace type department1$ as object( - dept_name varchar2(30) -) -/ diff --git a/old_tests/helpers/html_coverage_test.pck b/old_tests/helpers/html_coverage_test.pck deleted file mode 100644 index 58b80e7b2..000000000 --- a/old_tests/helpers/html_coverage_test.pck +++ /dev/null @@ -1,25 +0,0 @@ -create or replace package ut3$user#.html_coverage_test is - - -- Author : LUW07 - -- Created : 23/05/2017 09:37:29 - -- Purpose : Supporting html coverage procedure - - -- Public type declarations - procedure run_if_statment(o_result out number); -end html_coverage_test; -/ -create or replace package body ut3$user#.html_coverage_test is - - -- Private type declarations - procedure run_if_statment(o_result out number) is - l_testedvalue number := 1; - l_success number := 0; - begin - if l_testedvalue = 1 then - l_success := 1; - end if; - - o_result := l_success; - end run_if_statment; -end html_coverage_test; -/ diff --git a/old_tests/helpers/test_package_1.pck b/old_tests/helpers/test_package_1.pck deleted file mode 100644 index 8b221f354..000000000 --- a/old_tests/helpers/test_package_1.pck +++ /dev/null @@ -1,71 +0,0 @@ -create or replace package test_package_1 is - - --%suite - --%displayname(test_package_1) - --%suitepath(tests) - - gv_glob_val number; - - --%beforeeach - procedure global_setup; - - --%aftereach - procedure global_teardown; - - --%test - --%displayname(Test1 from test package 1) - procedure test1; - - --%test(Test2 from test package 1) - --%beforetest(test2_setup) - --%aftertest(test2_teardown) - procedure test2; - - procedure test2_setup; - - procedure test2_teardown; - -end test_package_1; -/ -create or replace package body test_package_1 is - - gv_var_1 number; - - gv_var_1_temp number; - - procedure global_setup is - begin - gv_var_1 := 1; - gv_glob_val := 1; - end; - - procedure global_teardown is - begin - gv_var_1 := 0; - gv_glob_val := 0; - end; - - procedure test1 is - begin - ut.expect(gv_var_1,'Some expectation').to_equal(1); - end; - - procedure test2 is - begin - ut.expect(gv_var_1,'Some expectation').to_equal(2); - end; - - procedure test2_setup is - begin - gv_var_1_temp := gv_var_1; - gv_var_1 := 2; - end; - - procedure test2_teardown is - begin - gv_var_1 := gv_var_1_temp; - gv_var_1_temp := null; - end; - -end test_package_1; -/ diff --git a/old_tests/helpers/test_package_2.pck b/old_tests/helpers/test_package_2.pck deleted file mode 100644 index 871a4f2a8..000000000 --- a/old_tests/helpers/test_package_2.pck +++ /dev/null @@ -1,69 +0,0 @@ -create or replace package test_package_2 is - - --%suite - --%suitepath(tests.test_package_1) - - gv_glob_val varchar2(1); - - --%beforeeach - procedure global_setup; - - --%aftereach - procedure global_teardown; - - --%test - procedure test1; - - --%test - --%beforetest(test2_setup) - --%aftertest(test2_teardown) - procedure test2; - - procedure test2_setup; - - procedure test2_teardown; - -end test_package_2; -/ -create or replace package body test_package_2 is - - gv_var_1 varchar2(1); - - gv_var_1_temp varchar2(1); - - procedure global_setup is - begin - gv_var_1 := 'a'; - gv_glob_val := 'z'; - end; - - procedure global_teardown is - begin - gv_var_1 := 'n'; - gv_glob_val := 'n'; - end; - - procedure test1 is - begin - ut.expect(gv_var_1).to_equal('a'); - end; - - procedure test2 is - begin - ut.expect(gv_var_1).to_equal('b'); - end; - - procedure test2_setup is - begin - gv_var_1_temp := gv_var_1; - gv_var_1 := 'b'; - end; - - procedure test2_teardown is - begin - gv_var_1 := gv_var_1_temp; - gv_var_1_temp := null; - end; - -end test_package_2; -/ diff --git a/old_tests/helpers/test_package_3.pck b/old_tests/helpers/test_package_3.pck deleted file mode 100644 index 11352369e..000000000 --- a/old_tests/helpers/test_package_3.pck +++ /dev/null @@ -1,80 +0,0 @@ -create or replace package test_package_3 is - - --%suite - --%suitepath(tests2) - --%rollback(auto) - - gv_glob_val number; - - --%beforeeach - procedure global_setup; - - --%aftereach - procedure global_teardown; - - --%test - --%rollback(auto) - procedure test1; - - --%test - --%beforetest(test2_setup) - --%aftertest(test2_teardown) - procedure test2; - - procedure test2_setup; - - procedure test2_teardown; - - --%test - --%disabled - procedure disabled_test; - -end test_package_3; -/ -create or replace package body test_package_3 is - - gv_var_1 number; - - gv_var_1_temp number; - - procedure global_setup is - begin - gv_var_1 := 1; - gv_glob_val := 1; - end; - - procedure global_teardown is - begin - gv_var_1 := 0; - gv_glob_val := 0; - end; - - procedure test1 is - begin - ut.expect(gv_var_1).to_equal(1); - end; - - procedure test2 is - begin - ut.expect(gv_var_1).to_equal(2); - end; - - procedure test2_setup is - begin - gv_var_1_temp := gv_var_1; - gv_var_1 := 2; - end; - - procedure test2_teardown is - begin - gv_var_1 := gv_var_1_temp; - gv_var_1_temp := null; - end; - - procedure disabled_test is - begin - null; - end; - -end test_package_3; -/ diff --git a/old_tests/helpers/test_reporters.pkb b/old_tests/helpers/test_reporters.pkb deleted file mode 100644 index 774690d06..000000000 --- a/old_tests/helpers/test_reporters.pkb +++ /dev/null @@ -1,67 +0,0 @@ -create or replace package body test_reporters -as - - procedure beforetest is - begin - dbms_output.put_line(''); - end; - - procedure aftertest - is - begin - dbms_output.put_line(''); - end; - - procedure beforeeach is - begin - dbms_output.put_line(''); - end; - - procedure aftereach is - begin - dbms_output.put_line(''); - end; - - procedure passing_test - is - begin - dbms_output.put_line(''); - ut.expect(1,'Test 1 Should Pass').to_equal(1); - end; - - procedure failing_test - is - begin - dbms_output.put_line(''); - ut.expect(1,'Fails as values are different').to_equal(2); - end; - - procedure erroring_test - is - l_variable integer; - begin - dbms_output.put_line(''); - l_variable := 'a string'; - ut.expect(l_variable).to_equal(1); - end; - - procedure disabled_test - is - begin - dbms_output.put_line(''); - ut.expect(1,'this should not execute').to_equal(1); - end; - - procedure beforeall is - begin - dbms_output.put_line(''); - end; - - procedure afterall is - begin - dbms_output.put_line(''); - end; - -end; -/ - diff --git a/old_tests/helpers/test_reporters.pks b/old_tests/helpers/test_reporters.pks deleted file mode 100644 index ae040bbef..000000000 --- a/old_tests/helpers/test_reporters.pks +++ /dev/null @@ -1,38 +0,0 @@ -create or replace package test_reporters -as - --%suite(A suite for testing different outcomes from reporters) - --%suitepath(org.utplsql.utplsql.test) - - --%beforeall - procedure beforeall; - - --%beforeeach - procedure beforeeach; - - --%test - --%beforetest(beforetest) - --%aftertest(aftertest) - procedure passing_test; - - procedure beforetest; - - procedure aftertest; - - --%test(a test with failing assertion) - procedure failing_test; - - --%test(a test raising unhandled exception) - procedure erroring_test; - - --%test(a disabled test) - --%disabled - procedure disabled_test; - - --%aftereach - procedure aftereach; - - --%afterall - procedure afterall; - -end; -/ diff --git a/old_tests/helpers/test_reporters_1.pkb b/old_tests/helpers/test_reporters_1.pkb deleted file mode 100644 index 6ac9e6035..000000000 --- a/old_tests/helpers/test_reporters_1.pkb +++ /dev/null @@ -1,11 +0,0 @@ -create or replace package body test_reporters_1 -as - procedure diffrentowner_test - is - l_result number; - begin - ut3$user#.html_coverage_test.run_if_statment(l_result); - ut.expect(l_result).to_equal(1); - end; -end; -/ diff --git a/old_tests/helpers/test_reporters_1.pks b/old_tests/helpers/test_reporters_1.pks deleted file mode 100644 index c64820744..000000000 --- a/old_tests/helpers/test_reporters_1.pks +++ /dev/null @@ -1,10 +0,0 @@ -create or replace package test_reporters_1 -as - --%suite(A suite for testing html coverage options) - --%suitepath(org.utplsql.utplsql.test.test_reporters) - - --%test(a test calling package outside schema) - procedure diffrentowner_test; - -end; -/ diff --git a/old_tests/helpers/ut_example_tests.pkb b/old_tests/helpers/ut_example_tests.pkb deleted file mode 100644 index b04953303..000000000 --- a/old_tests/helpers/ut_example_tests.pkb +++ /dev/null @@ -1,43 +0,0 @@ -create or replace package body ut_example_tests -as - - procedure setup as - begin - g_number := 0; - end; - - procedure teardown - as - begin - g_char := null; - end; - - procedure beforeeach as - begin - g_number2 := 0; - end; - - procedure aftereach - as - begin - g_char2 := 'F'; - end; - - procedure ut_passing_test - as - begin - g_number := g_number + 1; - g_number2 := g_number2 + 1; - g_char := 'a'; - g_char2 := 'a'; - ut.expect(1,'Test 1 Should Pass').to_equal(1); - end; - - procedure ut_commit_test - is - begin - commit; - end; - -end; -/ diff --git a/old_tests/helpers/ut_example_tests.pks b/old_tests/helpers/ut_example_tests.pks deleted file mode 100644 index 56d9e32fe..000000000 --- a/old_tests/helpers/ut_example_tests.pks +++ /dev/null @@ -1,14 +0,0 @@ -create or replace package ut_example_tests -as - g_number number; - g_number2 number; - g_char varchar2(1); - g_char2 varchar2(1); - procedure setup; - procedure teardown; - procedure beforeeach; - procedure aftereach; - procedure ut_passing_test; - procedure ut_commit_test; -end; -/ diff --git a/old_tests/helpers/utplsql_test_reporter.typ b/old_tests/helpers/utplsql_test_reporter.typ deleted file mode 100644 index 874777341..000000000 --- a/old_tests/helpers/utplsql_test_reporter.typ +++ /dev/null @@ -1,20 +0,0 @@ -create or replace type utplsql_test_reporter under ut_output_reporter_base( - constructor function utplsql_test_reporter(self in out nocopy utplsql_test_reporter) return self as result, - overriding member procedure after_calling_run(self in out nocopy utplsql_test_reporter, a_run in ut_run) -) -/ - -create or replace type body utplsql_test_reporter is - constructor function utplsql_test_reporter(self in out nocopy utplsql_test_reporter) return self as result is - begin - self.init($$plsql_unit); - return; - end; - - overriding member procedure after_calling_run(self in out nocopy utplsql_test_reporter, a_run in ut_run) is - begin - self.print_text(a_run.result); - end; -end; -/ - diff --git a/old_tests/lib/RunSummary.sql b/old_tests/lib/RunSummary.sql deleted file mode 100644 index 60c7c8e71..000000000 --- a/old_tests/lib/RunSummary.sql +++ /dev/null @@ -1,16 +0,0 @@ -prompt -prompt ************************************************************************************ -begin - dbms_output.put_line( - 'tests: '||to_char(:failures_count + :successes_count) - ||' , success: '||:successes_count - ||' , failure: '||:failures_count - ||' , executed in '||((dbms_utility.get_time - :run_start_time)/100)||' second(s)' - ); - if :failures_count > 0 then - dbms_output.put_line( ' Some tests have failed, please review results!'); - else - dbms_output.put_line( ' All tests have passed.'); - end if; -end; -/ diff --git a/old_tests/lib/RunTest.sql b/old_tests/lib/RunTest.sql deleted file mode 100644 index 59075f045..000000000 --- a/old_tests/lib/RunTest.sql +++ /dev/null @@ -1,30 +0,0 @@ -var test_result number -exec :test_result := null; - -prompt Executing test: &1 -exec :test_start_time := dbms_utility.get_time; -@@&1 -set serveroutput on size unlimited format truncated -set termout on -declare - l_duration_str varchar2(300) := ', executed in: '||((dbms_utility.get_time - :test_start_time)/100)||' second(s)'; -begin - case - when :test_result = ut_utils.gc_success then - :successes_count := :successes_count + 1; - else - dbms_output.put_line('---------------------------------------'); - dbms_output.put_line(' Failure'||l_duration_str); - dbms_output.put_line('---------------------------------------'); - :failures_count := :failures_count + 1; - end case; -end; -/ - -rollback; -begin - ut_expectation_processor.clear_expectations; - ut_utils.cleanup_temp_tables; -end; -/ - diff --git a/old_tests/lib/RunVars.sql b/old_tests/lib/RunVars.sql deleted file mode 100644 index bbc0f3124..000000000 --- a/old_tests/lib/RunVars.sql +++ /dev/null @@ -1,9 +0,0 @@ -var successes_count number -var failures_count number -var test_result number -var run_start_time number -var test_start_time number -exec :successes_count := 0; -exec :failures_count := 0; -exec :test_result := 0; -exec :run_start_time := dbms_utility.get_time; diff --git a/old_tests/readme.md b/old_tests/readme.md deleted file mode 100644 index 51e6cc05a..000000000 --- a/old_tests/readme.md +++ /dev/null @@ -1 +0,0 @@ -Contains tests used to test utPLSQL. \ No newline at end of file diff --git a/old_tests/runAll.sh b/old_tests/runAll.sh deleted file mode 100755 index a8b52979a..000000000 --- a/old_tests/runAll.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash -set -ev -#goto git root directory -git rev-parse && cd "$(git rev-parse --show-cdup)" - -cd old_tests - -"$SQLCLI" ${UT3_OWNER}/${UT3_OWNER_PASSWORD}@//${CONNECTION_STR} @RunAll.sql diff --git a/old_tests/ut_expectations/ut_expectation_processor.nulls_are_equal.raisesExceptionWhenTryingToSetNullValue.sql b/old_tests/ut_expectations/ut_expectation_processor.nulls_are_equal.raisesExceptionWhenTryingToSetNullValue.sql deleted file mode 100644 index 49eb501ba..000000000 --- a/old_tests/ut_expectations/ut_expectation_processor.nulls_are_equal.raisesExceptionWhenTryingToSetNullValue.sql +++ /dev/null @@ -1,12 +0,0 @@ -declare - e_numeric_or_value_error exception; - pragma exception_init(e_numeric_or_value_error, -6502); - l_value boolean := null; -begin - ut_expectation_processor.nulls_Are_equal(l_value); - :test_result := ut_utils.gc_failure; - exception - when e_numeric_or_value_error then - :test_result := ut_utils.gc_success; -end; -/ diff --git a/old_tests/ut_expectations/ut_expectation_processor.stackOnFailedTest.sql b/old_tests/ut_expectations/ut_expectation_processor.stackOnFailedTest.sql deleted file mode 100644 index 4a94cbf0d..000000000 --- a/old_tests/ut_expectations/ut_expectation_processor.stackOnFailedTest.sql +++ /dev/null @@ -1,41 +0,0 @@ -set termout off -create or replace package tst_stack_on_failed_test as - --%suite - - --%test - procedure test; -end; -/ - -create or replace package body tst_stack_on_failed_test as - procedure test is begin ut.expect(1).to_equal(2); end; -end; -/ - -set termout on - -declare - l_test_report ut_varchar2_list; - l_output_data ut_varchar2_list; - l_output varchar2(32767); - l_expected varchar2(32767); -begin - l_expected := q'[%Failures:%at "UT3.TST_STACK_ON_FAIL%", line 2%]'; - - --act - select * - bulk collect into l_output_data - from table(ut.run('tst_stack_on_failed_test',ut_documentation_reporter())); - - l_output := ut_utils.table_to_clob(l_output_data); - - --assert - if l_output like l_expected then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('Actual:"'||l_output||'"'); - end if; -end; -/ - -drop package tst_stack_on_failed_test; diff --git a/old_tests/ut_expectations/ut_expectation_processor.stackOnUtFail.sql b/old_tests/ut_expectations/ut_expectation_processor.stackOnUtFail.sql deleted file mode 100644 index 13e64b1ac..000000000 --- a/old_tests/ut_expectations/ut_expectation_processor.stackOnUtFail.sql +++ /dev/null @@ -1,41 +0,0 @@ -set termout off -create or replace package tst_stack_on_fail as - --%suite - - --%test - procedure test; -end; -/ - -create or replace package body tst_stack_on_fail as - procedure test is begin ut.fail('test failure'); end; -end; -/ - -set termout on - -declare - l_test_report ut_varchar2_list; - l_output_data ut_varchar2_list; - l_output varchar2(32767); - l_expected varchar2(32767); -begin - l_expected := q'[%Failures:%at "UT3.TST_STACK_ON_FAIL%", line 2%]'; - - --act - select * - bulk collect into l_output_data - from table(ut.run('tst_stack_on_fail',ut_documentation_reporter())); - - l_output := ut_utils.table_to_clob(l_output_data); - - --assert - if l_output like l_expected then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('Actual:"'||l_output||'"'); - end if; -end; -/ - -drop package tst_stack_on_fail; diff --git a/old_tests/ut_metadata/ut_metadata.form_name.TrimStandaloneProgramName.sql b/old_tests/ut_metadata/ut_metadata.form_name.TrimStandaloneProgramName.sql deleted file mode 100644 index d2679dc51..000000000 --- a/old_tests/ut_metadata/ut_metadata.form_name.TrimStandaloneProgramName.sql +++ /dev/null @@ -1,17 +0,0 @@ -PROMPT Trims a name for standalone program - ---Arrange -declare - l_expected varchar2(20) := 'some_procedure'; - l_result varchar2(20); -begin ---Act - l_result := ut_metadata.form_name(NULL, ' '||l_expected||' '); ---Assert - if l_result = l_expected then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '''||l_expected||''', got: '''||l_result||'''' ); - end if; -end; -/ diff --git a/old_tests/ut_reporters/ut_documentation_reporter.providesCorrectLineFromStacktrace.sql b/old_tests/ut_reporters/ut_documentation_reporter.providesCorrectLineFromStacktrace.sql deleted file mode 100644 index f155117fe..000000000 --- a/old_tests/ut_reporters/ut_documentation_reporter.providesCorrectLineFromStacktrace.sql +++ /dev/null @@ -1,32 +0,0 @@ -declare - l_output_data ut_varchar2_list; - l_output varchar2(32767); - l_expected varchar2(32767); -begin - l_expected := q'[% -%Failures:% -%1)%failing_test% -%"Fails as values are different"% -%Actual: 1 (number) was expected to equal: 2 (number)% -%at "%.TEST_REPORTERS%", line% -%2)%erroring_test% -%ORA-06502% -%ORA-06512% -Finished % -5 tests, 1 failed, 1 errored%]'; - - --act - select * - bulk collect into l_output_data - from table(ut.run(':org.utplsql.utplsql.test.test_reporters',ut_documentation_reporter())); - - l_output := ut_utils.table_to_clob(l_output_data); - - --assert - if l_output like l_expected then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('Actual:"'||l_output||'"'); - end if; -end; -/ diff --git a/old_tests/ut_reporters/ut_documentation_reporter.reportMultipleWarnings.sql b/old_tests/ut_reporters/ut_documentation_reporter.reportMultipleWarnings.sql deleted file mode 100644 index 3ebfa5790..000000000 --- a/old_tests/ut_reporters/ut_documentation_reporter.reportMultipleWarnings.sql +++ /dev/null @@ -1,75 +0,0 @@ -set termout off -create or replace package ut_output_test_rollback as - --%suite - - --%beforeall - procedure ba; - --%beforeeach - procedure be; - --%test - procedure test; - --%test - --%rollback(manual) - procedure t_manual; - --%afterall - procedure aa; - --%aftereach - procedure ae; -end; -/ - -create or replace package body ut_output_test_rollback as - procedure ba is begin commit; end; - procedure be is begin commit; end; - procedure test is begin null; end; - procedure t_manual is begin commit; end; - procedure aa is begin commit; end; - procedure ae is begin commit; end; -end; -/ - -set termout on - -declare - l_test_report ut_varchar2_list; - l_output_data ut_varchar2_list; - l_output varchar2(32767); - l_expected varchar2(32767); -begin - l_expected := q'[% - 1) ut_output_test_rollback.test - Unable to perform automatic rollback after test. An implicit or explicit commit/rollback occurred in procedures: - ut3.ut_output_test_rollback.be - ut3.ut_output_test_rollback.ae - Use the "--%rollback(manual)" annotation or remove commit/rollback/ddl statements that are causing the issue. -% - 2) ut_output_test_rollback - Unable to perform automatic rollback after test suite. An implicit or explicit commit/rollback occurred in procedures: - ut3.ut_output_test_rollback.ba - ut3.ut_output_test_rollback.aa - ut3.ut_output_test_rollback.be - ut3.ut_output_test_rollback.ae - ut3.ut_output_test_rollback.t_manual - Use the "--%rollback(manual)" annotation or remove commit/rollback/ddl statements that are causing the issue. -% -Finished in % seconds -2 tests, 0 failed, 0 errored, 0 disabled, 2 warning(s)%]'; - - --act - select * - bulk collect into l_output_data - from table(ut.run(ut_varchar2_list('ut_output_test_rollback'),ut_documentation_reporter())); - - l_output := ut_utils.table_to_clob(l_output_data); - - --assert - if l_output like l_expected then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('Actual:"'||l_output||'"'); - dbms_output.put_line('Expected:"'||l_expected||'"'); - end if; -end; -/ - -drop package ut_output_test_rollback; diff --git a/old_tests/ut_reporters/ut_documentation_reporter.reportTestTiming.sql b/old_tests/ut_reporters/ut_documentation_reporter.reportTestTiming.sql deleted file mode 100644 index f7b0dd265..000000000 --- a/old_tests/ut_reporters/ut_documentation_reporter.reportTestTiming.sql +++ /dev/null @@ -1,50 +0,0 @@ -set termout off -create or replace package tst_doc_reporter_timing as - --%suite - - --%test - procedure test1; - - --%test - procedure test2; -end; -/ - -create or replace package body tst_doc_reporter_timing as - procedure test1 is begin ut.expect(1).to_equal(1); end; - procedure test2 is begin ut.expect(1).to_equal(2); end; -end; -/ - -set termout on - -declare - l_test_report ut_varchar2_list; - l_output_data ut_varchar2_list; - l_output varchar2(32767); - l_expected varchar2(32767); -begin - l_expected := q'[tst_doc_reporter_timing -%test1 [%sec] -%test2 [%sec] (FAILED - 1) -%Failures:% -Finished in % seconds -2 tests, 1 failed, 0 errored, 0 disabled, 0 warning(s)%]'; - - --act - select * - bulk collect into l_output_data - from table(ut.run('tst_doc_reporter_timing',ut_documentation_reporter())); - - l_output := ut_utils.table_to_clob(l_output_data); - - --assert - if l_output like l_expected then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('Actual:"'||l_output||'"'); - end if; -end; -/ - -drop package tst_doc_reporter_timing; diff --git a/old_tests/ut_reporters/ut_html_reporter.DefaultSchemaCoverage.sql b/old_tests/ut_reporters/ut_html_reporter.DefaultSchemaCoverage.sql deleted file mode 100644 index 5cc14f02b..000000000 --- a/old_tests/ut_reporters/ut_html_reporter.DefaultSchemaCoverage.sql +++ /dev/null @@ -1,19 +0,0 @@ -DECLARE - l_results ut_varchar2_list; - l_clob CLOB; - l_expected VARCHAR2(32767); -BEGIN - l_expected := '%

UT3.TEST_REPORTERS_1

%'; - SELECT * BULK COLLECT - INTO l_results - FROM TABLE(ut.run('test_reporters_1', ut_coverage_html_reporter())); - l_clob := ut3.ut_utils.table_to_clob(l_results); - - IF l_clob LIKE l_expected THEN - :test_result := ut3.ut_utils.gc_success; - ELSE - dbms_output.put_line('Failed to match to default schema'); - END IF; - -END; -/ \ No newline at end of file diff --git a/old_tests/ut_reporters/ut_html_reporter.UserOverrideSchemaCoverage.sql b/old_tests/ut_reporters/ut_html_reporter.UserOverrideSchemaCoverage.sql deleted file mode 100644 index ba2dd3ab6..000000000 --- a/old_tests/ut_reporters/ut_html_reporter.UserOverrideSchemaCoverage.sql +++ /dev/null @@ -1,20 +0,0 @@ -DECLARE - l_results ut_varchar2_list; - l_clob CLOB; - l_expected VARCHAR2(32767); -BEGIN - l_expected := '%

UT3$USER#.HTML_COVERAGE_TEST

%'; - SELECT * BULK COLLECT - INTO l_results - FROM TABLE(ut.run('test_reporters_1', ut_coverage_html_reporter(), - a_coverage_schemes => ut_varchar2_list('ut3$user#'))); - l_clob := ut3.ut_utils.table_to_clob(l_results); - - IF l_clob LIKE l_expected THEN - :test_result := ut3.ut_utils.gc_success; - ELSE - dbms_output.put_line('Failed to run coverage outside schema'); - END IF; - -END; -/ diff --git a/old_tests/ut_suite_manager/ut_suite_manager.AllowsDescriptionsWithComma.sql b/old_tests/ut_suite_manager/ut_suite_manager.AllowsDescriptionsWithComma.sql deleted file mode 100644 index 3ef89840a..000000000 --- a/old_tests/ut_suite_manager/ut_suite_manager.AllowsDescriptionsWithComma.sql +++ /dev/null @@ -1,67 +0,0 @@ -set termout off -create or replace package tst_package_to_be_dropped as - --%suite(A suite description, though with comma, is assigned by suite_manager) - - --%test(A test description, though with comma, is assigned by suite_manager) - procedure test1; - - --%test - --%displayname(A test description, though with comma, is assigned by suite_manager) - procedure test2; -end; -/ - -create or replace package body tst_package_to_be_dropped as - procedure test1 is begin ut.expect(1).to_equal(1); end; - procedure test2 is begin ut.expect(1).to_equal(1); end; -end; -/ - -set termout on - -set termout on - -declare - l_objects_to_run ut_suite_items; - l_suite ut_suite; - l_test ut_test; - l_results ut_expectation_results; -begin - l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list('tst_package_to_be_dropped')); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - - l_suite := treat(l_objects_to_run(1) as ut_suite); - - ut.expect(l_suite.name).to_equal('tst_package_to_be_dropped'); - ut.expect(l_suite.description).to_equal('A suite description, though with comma, is assigned by suite_manager'); - ut.expect(l_suite.items.count).to_equal(2); - - l_test := treat(l_suite.items(1) as ut_test); - - ut.expect(l_test.name).to_equal('test1'); - ut.expect(l_test.description).to_equal('A test description, though with comma, is assigned by suite_manager'); - - l_test := treat(l_suite.items(2) as ut_test); - - ut.expect(l_test.name).to_equal('test2'); - ut.expect(l_test.description).to_equal('A test description, though with comma, is assigned by suite_manager'); - - - l_results := ut_expectation_processor.get_failed_expectations(); - - :test_result := ut_utils.gc_success; - for i in 1 .. l_results.count loop - :test_result := greatest(:test_result, l_results(i).status); - if l_results(i).status != ut_utils.gc_success then - dbms_output.put_line(l_results(i).get_result_clob); - end if; - end loop; -end; -/ - -set termout off -drop package tst_package_to_be_dropped -/ -set termout on diff --git a/old_tests/ut_suite_manager/ut_suite_manager.IncludesInvalidPackageBodiesInTheRun.sql b/old_tests/ut_suite_manager/ut_suite_manager.IncludesInvalidPackageBodiesInTheRun.sql deleted file mode 100644 index f601dc070..000000000 --- a/old_tests/ut_suite_manager/ut_suite_manager.IncludesInvalidPackageBodiesInTheRun.sql +++ /dev/null @@ -1,31 +0,0 @@ -set termout off -create table test_dependency_table (id integer); -create or replace package test_dependencies as - -- %suite - - -- %test - procedure dependant; -end; -/ -create or replace package body test_dependencies as - gc_dependant_variable test_dependency_table.id%type; - procedure dependant is begin null; end; -end; -/ -alter table test_dependency_table modify id number; -set termout on - -declare - l_result integer; -begin - select * - into l_result - from table(ut.run('test_dependencies',utplsql_test_reporter())); - :test_result := l_result; -end; -/ - -set termout off -drop table test_dependency_table; -drop package test_dependencies; -set termout on diff --git a/old_tests/ut_suite_manager/ut_suite_manager.PackageWithDollarSign.sql b/old_tests/ut_suite_manager/ut_suite_manager.PackageWithDollarSign.sql deleted file mode 100644 index d69aabe1f..000000000 --- a/old_tests/ut_suite_manager/ut_suite_manager.PackageWithDollarSign.sql +++ /dev/null @@ -1,38 +0,0 @@ -set termout off -create or replace package tst_package_with$dollar as - --%suite - - --%test - procedure test1; -end; -/ - -create or replace package body tst_package_with$dollar as - procedure test1 is begin ut.expect(1).to_equal(1); end; - procedure test2 is begin ut.expect(1).to_equal(1); end; -end; -/ - -set termout on - -declare - l_objects_to_run ut_suite_items; - l_suite ut_suite; -begin - --act - l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list('tst_package_with$dollar')); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - - l_suite := treat(l_objects_to_run(1) as ut_suite); - ut.expect(l_suite.name).to_equal('tst_package_with$dollar'); - - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - end if; -end; -/ - -drop package tst_package_with$dollar -/ diff --git a/old_tests/ut_suite_manager/ut_suite_manager.PackageWithHash.sql b/old_tests/ut_suite_manager/ut_suite_manager.PackageWithHash.sql deleted file mode 100644 index 0cb113226..000000000 --- a/old_tests/ut_suite_manager/ut_suite_manager.PackageWithHash.sql +++ /dev/null @@ -1,40 +0,0 @@ -set termout off -create or replace package tst_package_with#hash as - --%suite - - --%test - procedure test1; -end; -/ - -create or replace package body tst_package_with#hash as - procedure test1 is begin ut.expect(1).to_equal(1); end; - procedure test2 is begin ut.expect(1).to_equal(1); end; -end; -/ - -set termout on - -declare - l_objects_to_run ut_suite_items; - l_suite ut_suite; -begin - - --act - l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list('tst_package_with#hash')); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - - l_suite := treat(l_objects_to_run(1) as ut_suite); - ut.expect(l_suite.name).to_equal('tst_package_with#hash'); - - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - end if; - -end; -/ - -drop package tst_package_with#hash -/ diff --git a/old_tests/ut_suite_manager/ut_suite_manager.TestWithDollarSign.sql b/old_tests/ut_suite_manager/ut_suite_manager.TestWithDollarSign.sql deleted file mode 100644 index 4d58b704f..000000000 --- a/old_tests/ut_suite_manager/ut_suite_manager.TestWithDollarSign.sql +++ /dev/null @@ -1,45 +0,0 @@ -set termout off -create or replace package tst_package_with_dollar_test as - --%suite - - --%test - procedure test$1; -end; -/ - -create or replace package body tst_package_with_dollar_test as - procedure test$1 is begin ut.expect(1).to_equal(1); end; -end; -/ - -set termout on - -declare - l_objects_to_run ut_suite_items; - l_suite ut_suite; - l_test ut_test; -begin - --act - l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list('tst_package_with_dollar_test.test$1')); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - - l_suite := treat(l_objects_to_run(1) as ut_suite); - - ut.expect(l_suite.name).to_equal('tst_package_with_dollar_test'); - ut.expect(l_suite.items.count).to_equal(1); - - l_test := treat(l_suite.items(1) as ut_test); - - ut.expect(l_test.name).to_equal('test$1'); - - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - end if; - -end; -/ - -drop package tst_package_with_dollar_test -/ diff --git a/old_tests/ut_suite_manager/ut_suite_manager.TestWithHashSign.sql b/old_tests/ut_suite_manager/ut_suite_manager.TestWithHashSign.sql deleted file mode 100644 index ef965509c..000000000 --- a/old_tests/ut_suite_manager/ut_suite_manager.TestWithHashSign.sql +++ /dev/null @@ -1,46 +0,0 @@ -set termout off -create or replace package tst_package_with_hash_test as - --%suite - - --%test - procedure test#1; -end; -/ - -create or replace package body tst_package_with_hash_test as - procedure test#1 is begin ut.expect(1).to_equal(1); end; -end; -/ - -set termout on - -declare - l_objects_to_run ut_suite_items; - l_suite ut_suite; - l_test ut_test; -begin - - --act - l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list('tst_package_with_hash_test.test#1')); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - - l_suite := treat(l_objects_to_run(1) as ut_suite); - - ut.expect(l_suite.name).to_equal('tst_package_with_hash_test'); - ut.expect(l_suite.items.count).to_equal(1); - - l_test := treat(l_suite.items(1) as ut_test); - - ut.expect(l_test.name).to_equal('test#1'); - - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - end if; - -end; -/ - -drop package tst_package_with_hash_test -/ diff --git a/old_tests/ut_suite_manager/ut_suite_manager.get_schema_ut_packages.IncludesPackagesWithSutePath.sql b/old_tests/ut_suite_manager/ut_suite_manager.get_schema_ut_packages.IncludesPackagesWithSutePath.sql deleted file mode 100644 index 0f446b7bf..000000000 --- a/old_tests/ut_suite_manager/ut_suite_manager.get_schema_ut_packages.IncludesPackagesWithSutePath.sql +++ /dev/null @@ -1,40 +0,0 @@ -set termout off -create or replace package tests as - procedure dummy; -end; -/ -set termout on - -declare - l_expected ut_object_names; - l_actual ut_object_names; - l_not_found ut_object_names := ut_object_names(); -begin - l_expected := ut_object_names( - ut_object_name(user,'TEST_PACKAGE_1'), - ut_object_name(user,'TEST_PACKAGE_2'), - ut_object_name(user,'TEST_PACKAGE_3'), - ut_object_name(user,'TEST_REPORTERS_1'), - ut_object_name(user,'TEST_REPORTERS') - ); - l_actual := ut_suite_manager.get_schema_ut_packages(ut_varchar2_rows(user)); - for i in 1 .. l_expected.count loop - if l_expected(i) not member of l_actual then - l_not_found.extend; - l_not_found(l_not_found.last) := l_expected(i); - end if; - end loop; - if l_not_found is empty then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('actual:'||xmltype(anydata.convertcollection(l_actual)).getclobval()); - dbms_output.put_line('expected:'||xmltype(anydata.convertcollection(l_expected)).getclobval()); - end if; -end; -/ - -set termout off -drop package tests -/ -set termout on - diff --git a/old_tests/ut_utils/common/ut_utils.clob_to_table.sql b/old_tests/ut_utils/common/ut_utils.clob_to_table.sql deleted file mode 100644 index 9fc831576..000000000 --- a/old_tests/ut_utils/common/ut_utils.clob_to_table.sql +++ /dev/null @@ -1,43 +0,0 @@ ---Arrange -declare - l_clob clob := '&1'; - l_delimiter varchar2(1) := '&2'; - l_expected ut_varchar2_list := &3; - l_result ut_varchar2_list; - l_limit integer := &4; - l_result_str varchar2(32767); - l_errors integer := 0; - function compare_element(a_element_id integer, a_expected ut_varchar2_list, a_actual ut_varchar2_list) return integer is - begin - if a_expected.exists(a_element_id) and a_actual.exists(a_element_id) then - if a_expected(a_element_id) = a_actual(a_element_id) or a_expected(a_element_id) is null and a_actual(a_element_id) is null then - return 0; - else - dbms_output.put('a_expected('||a_element_id||')='||a_expected(a_element_id)||' | a_actual('||a_element_id||')='||a_actual(a_element_id)); - end if; - end if; - if not a_expected.exists(a_element_id) then - dbms_output.put('a_expected('||a_element_id||') does not exist '); - end if; - if not a_actual.exists(a_element_id) then - dbms_output.put('a_actual('||a_element_id||') does not exist '); - end if; - dbms_output.put_line(null); - return 1; - end; -begin ---Act - select column_value bulk collect into l_result from table( ut_utils.clob_to_table(l_clob, l_limit, l_delimiter) ); - for i in 1 .. l_result.count loop - l_result_str := l_result_str||''''||l_result(i)||''''||l_delimiter; - end loop; - l_result_str := rtrim(l_result_str,l_delimiter); ---Assert - for i in 1 .. greatest(l_expected.count, l_result.count) loop - l_errors := l_errors + compare_element(i, l_expected, l_result); - end loop; - if l_errors = 0 then - :test_result := ut_utils.gc_success; - end if; -end; -/ diff --git a/old_tests/ut_utils/common/ut_utils.table_to_clob.sql b/old_tests/ut_utils/common/ut_utils.table_to_clob.sql deleted file mode 100644 index fa319d731..000000000 --- a/old_tests/ut_utils/common/ut_utils.table_to_clob.sql +++ /dev/null @@ -1,17 +0,0 @@ ---Arrange -declare - l_delimiter varchar2(1) := &2; - l_expected clob := &3; - l_result clob; -begin ---Act - l_result := ut_utils.table_to_clob(&1, l_delimiter); ---Assert - if l_expected is null and l_result is null or l_expected = l_result then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('Expected: "'||l_expected||'"'); - dbms_output.put_line('Actual: "'||l_result||'"'); - end if; -end; -/ diff --git a/old_tests/ut_utils/ut_utils.append_to_clob.worksWithMultiByteChars.sql b/old_tests/ut_utils/ut_utils.append_to_clob.worksWithMultiByteChars.sql deleted file mode 100644 index 80dfddcdf..000000000 --- a/old_tests/ut_utils/ut_utils.append_to_clob.worksWithMultiByteChars.sql +++ /dev/null @@ -1,43 +0,0 @@ -column nls_lang noprint new_value v_nls_lang - -select value as nls_lang from nls_session_parameters where parameter = 'NLS_DATE_LANGUAGE'; - ---Arrange -alter session set nls_date_language=ENGLISH; -create or replace package tst_chars as --- 2) Status of the process = ‘PE’ with no linked data -end; -/ - -alter session set nls_date_language=RUSSIAN; - ---Act -declare - l_lines sys.dbms_preprocessor.source_lines_t; - l_result clob; -begin - l_lines := sys.dbms_preprocessor.get_post_processed_source( - object_type => 'PACKAGE', - schema_name => user, - object_name => 'TST_CHARS' - ); - :test_result := ut_utils.gc_success; - for i in 1..l_lines.count loop - l_result := null; - ut_utils.append_to_clob(l_result, l_lines(i)); - - --Assert - :test_result := coalesce(:test_result, ut_utils.gc_success); - if dbms_lob.getlength(l_result) != dbms_lob.getlength(l_lines(i)) then - :test_result := ut_utils.gc_failure; - dbms_output.put_line('Expected: "'||l_lines(i)||'"'); - dbms_output.put_line('Actual: "'||l_result||'"'); - end if; - end loop; -end; -/ - -alter session set nls_date_language=&&v_nls_lang; - -undef v_nls_lang; -drop package tst_chars; diff --git a/old_tests/ut_utils/ut_utils.clob_to_table.sql b/old_tests/ut_utils/ut_utils.clob_to_table.sql deleted file mode 100644 index 5c45c729a..000000000 --- a/old_tests/ut_utils/ut_utils.clob_to_table.sql +++ /dev/null @@ -1,7 +0,0 @@ -@@lib/RunTest.sql "ut_utils/common/ut_utils.clob_to_table.sql 'a,b,c,d' ',' ut_varchar2_list('a','b','c','d') 1000" -@@lib/RunTest.sql "ut_utils/common/ut_utils.clob_to_table.sql '' ',' ut_varchar2_list() 1000" -@@lib/RunTest.sql "ut_utils/common/ut_utils.clob_to_table.sql '1,b,c,d' '' ut_varchar2_list('1,b,','c,d') 4" -@@lib/RunTest.sql "ut_utils/common/ut_utils.clob_to_table.sql 'abcdefg,hijk,axa,a' ',' ut_varchar2_list('abc','def','g','hij','k','axa','a') 3" -@@lib/RunTest.sql "ut_utils/common/ut_utils.clob_to_table.sql ',a,,c,d,' ',' ut_varchar2_list('','a','','c','d','') 1000" - - diff --git a/old_tests/ut_utils/ut_utils.clob_to_table_multibyte.sql b/old_tests/ut_utils/ut_utils.clob_to_table_multibyte.sql deleted file mode 100644 index 9926a5dff..000000000 --- a/old_tests/ut_utils/ut_utils.clob_to_table_multibyte.sql +++ /dev/null @@ -1,22 +0,0 @@ ---Arrange -declare - l_varchar2_byte_limit integer := 32767; - l_workaround_byte_limit integer := 8191; - l_singlebyte_string_max_size varchar2(32767 char) := rpad('x',l_varchar2_byte_limit,'x'); - l_twobyte_character char(1 char) := 'ж'; - l_clob_multibyte clob := l_twobyte_character||l_singlebyte_string_max_size; --here we have 32769(2+32767) bytes and 32768 chars - l_expected ut_varchar2_list := ut_varchar2_list(); - l_result ut_varchar2_list; -begin - l_expected.extend(1); - l_expected(1) := l_twobyte_character||substr(l_singlebyte_string_max_size,1,l_workaround_byte_limit-1); ---Act - l_result := ut_utils.clob_to_table(l_clob_multibyte); ---Assert - if l_result(1) = l_expected(1) then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: 1st string length '||length(l_expected(1))||', got 1st string length: '||length(l_result(1))); - end if; -end; -/ \ No newline at end of file diff --git a/old_tests/ut_utils/ut_utils.table_to_clob.sql b/old_tests/ut_utils/ut_utils.table_to_clob.sql deleted file mode 100644 index 8fe37ff92..000000000 --- a/old_tests/ut_utils/ut_utils.table_to_clob.sql +++ /dev/null @@ -1,7 +0,0 @@ -@@lib/RunTest.sql "ut_utils/common/ut_utils.table_to_clob.sql "cast(null as ut_varchar2_list)" ''',''' ''''''" -@@lib/RunTest.sql "ut_utils/common/ut_utils.table_to_clob.sql ut_varchar2_list() ''',''' ''''''" -@@lib/RunTest.sql "ut_utils/common/ut_utils.table_to_clob.sql ut_varchar2_list('a','b','c','d') ''',''' '''a,b,c,d''' " -@@lib/RunTest.sql "ut_utils/common/ut_utils.table_to_clob.sql ut_varchar2_list('1,b,','c,d') ''',''' '''1,b,,c,d'''" -@@lib/RunTest.sql "ut_utils/common/ut_utils.table_to_clob.sql ut_varchar2_list('','a','','c','d','') ''',''' ''',a,,c,d,'''" - - diff --git a/old_tests/ut_utils/ut_utils.test_result_to_char.RunsWithInvalidValues.sql b/old_tests/ut_utils/ut_utils.test_result_to_char.RunsWithInvalidValues.sql deleted file mode 100644 index 012e03c5c..000000000 --- a/old_tests/ut_utils/ut_utils.test_result_to_char.RunsWithInvalidValues.sql +++ /dev/null @@ -1,15 +0,0 @@ ---Arrange -declare - l_expected varchar2(20) := 'Unknown(-1)'; - l_result varchar2(20); -begin ---Act - l_result := ut_utils.test_result_to_char(-1); ---Assert - if l_result = l_expected then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '||l_expected||', got: '||l_result ); - end if; -end; -/ diff --git a/old_tests/ut_utils/ut_utils.test_result_to_char.RunsWithNullValue.sql b/old_tests/ut_utils/ut_utils.test_result_to_char.RunsWithNullValue.sql deleted file mode 100644 index c4f7a6962..000000000 --- a/old_tests/ut_utils/ut_utils.test_result_to_char.RunsWithNullValue.sql +++ /dev/null @@ -1,15 +0,0 @@ ---Arrange -declare - l_expected varchar2(20) := 'Unknown(NULL)'; - l_result varchar2(20); -begin ---Act - l_result := ut_utils.test_result_to_char(NULL); ---Assert - if l_result = l_expected then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '||l_expected||', got: '||l_result ); - end if; -end; -/ diff --git a/old_tests/ut_utils/ut_utils.test_result_to_char.Success.sql b/old_tests/ut_utils/ut_utils.test_result_to_char.Success.sql deleted file mode 100644 index a0ce237f5..000000000 --- a/old_tests/ut_utils/ut_utils.test_result_to_char.Success.sql +++ /dev/null @@ -1,15 +0,0 @@ ---Arrange -declare - l_expected varchar2(20) := ut_utils.gc_success_char; - l_result varchar2(20); -begin ---Act - l_result := ut_utils.test_result_to_char(ut_utils.gc_success); ---Assert - if l_result = l_expected then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '||l_expected||', got: '||l_result ); - end if; -end; -/ diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 3c2c713eb..d5338a4c9 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -592,6 +592,10 @@ create or replace package body ut_suite_manager is l_need_all_objects_scan := false; end if; + for i in 1 .. a_schema_names.count loop + refresh_cache(a_schema_names(i)); + end loop; + execute immediate 'select c.object_owner, c.object_name from '||l_ut_owner||q'[.ut_suite_cache_package c join table ( :a_schema_names ) s diff --git a/test/api/test_ut_run.pkb b/test/api/test_ut_run.pkb index 3f61fe60f..74e9a42d4 100644 --- a/test/api/test_ut_run.pkb +++ b/test/api/test_ut_run.pkb @@ -19,26 +19,6 @@ create or replace package body test_ut_run is ut3.ut_expectation_processor.clear_expectations(); end; - - function get_dbms_output_as_clob return clob is - l_status number; - l_line varchar2(32767); - l_result clob; - begin - - dbms_output.get_line(line => l_line, status => l_status); - if l_status != 1 then - dbms_lob.createtemporary(l_result, true, dur => dbms_lob.session); - end if; - while l_status != 1 loop - if l_line is not null then - ut3.ut_utils.append_to_clob(l_result, l_line||chr(10)); - end if; - dbms_output.get_line(line => l_line, status => l_status); - end loop; - return l_result; - end; - procedure create_ut3$user#_tests is pragma autonomous_transaction; begin @@ -227,7 +207,7 @@ create or replace package body test_ut_run is l_results clob; begin execute immediate 'begin ut3$user#.test_package_1.run(); end;'; - l_results := get_dbms_output_as_clob(); + l_results := core.get_dbms_output_as_clob(); --Assert ut.expect( l_results ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); end; @@ -238,7 +218,7 @@ create or replace package body test_ut_run is --Act execute immediate 'begin ut3$user#.test_package_1.run(:a_reporter); end;' using in ut3.ut_documentation_reporter(); - l_results := get_dbms_output_as_clob(); + l_results := core.get_dbms_output_as_clob(); --Assert ut.expect( l_results ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); end; @@ -251,7 +231,7 @@ create or replace package body test_ut_run is using in ut3.ut_varchar2_list('tests/ut3$user#.test_package_1.pkb','tests/ut3$user#.test_package_2.pkb','tests/ut3$user#.test_package_3.pkb'), in ut3.ut_sonar_test_reporter(); - l_results := get_dbms_output_as_clob(); + l_results := core.get_dbms_output_as_clob(); --Assert ut.expect( l_results ).to_be_like( '%tests/ut3$user#.test_package_2.pkb%tests/ut3$user#.test_package_1.pkb%tests/ut3$user#.test_package_3.pkb%' ); end; @@ -261,7 +241,7 @@ create or replace package body test_ut_run is begin execute immediate 'begin ut3$user#.test_package_1.run(:a_path); end;' using in 'test_package_1'; - l_results := get_dbms_output_as_clob(); + l_results := core.get_dbms_output_as_clob(); --Assert ut.expect( l_results ).to_be_like( '%test_package_1%' ); ut.expect( l_results ).not_to_be_like( '%test_package_2%' ); @@ -276,7 +256,7 @@ create or replace package body test_ut_run is in 'test_package_3', in ut3.ut_varchar2_list('tests/ut3$user#.test_package_1.pkb','tests/ut3$user#.test_package_2.pkb','tests/ut3$user#.test_package_3.pkb'), in ut3.ut_sonar_test_reporter(); - l_results := get_dbms_output_as_clob(); + l_results := core.get_dbms_output_as_clob(); --Assert ut.expect( l_results ).to_be_like( '%tests/ut3$user#.test_package_3.pkb%' ); ut.expect( l_results ).not_to_be_like( '%tests/ut3$user#.test_package_1.pkb%' ); @@ -288,7 +268,7 @@ create or replace package body test_ut_run is begin execute immediate 'begin ut3$user#.test_package_1.run(:a_paths); end;' using in ut3.ut_varchar2_list(':tests.test_package_1',':tests'); - l_results := get_dbms_output_as_clob(); + l_results := core.get_dbms_output_as_clob(); --Assert ut.expect( l_results ).to_be_like( '%test_package_1%' ); ut.expect( l_results ).to_be_like( '%test_package_2%' ); @@ -303,7 +283,7 @@ create or replace package body test_ut_run is in ut3.ut_varchar2_list(':tests.test_package_1',':tests'), in ut3.ut_varchar2_list('tests/ut3$user#.test_package_1.pkb','tests/ut3$user#.test_package_2.pkb','tests/ut3$user#.test_package_3.pkb'), in ut3.ut_sonar_test_reporter(); - l_results := get_dbms_output_as_clob(); + l_results := core.get_dbms_output_as_clob(); --Assert ut.expect( l_results ).to_be_like( '%tests/ut3$user#.test_package_1.pkb%' ); ut.expect( l_results ).to_be_like( '%tests/ut3$user#.test_package_2.pkb%' ); @@ -316,7 +296,7 @@ create or replace package body test_ut_run is --Act execute immediate 'begin ut3$user#.test_package_1.run(:a_reporter); end;' using in cast(null as ut3.ut_reporter_base); - l_results := get_dbms_output_as_clob(); + l_results := core.get_dbms_output_as_clob(); --Assert ut.expect( l_results ).to_be_like( '%tests%test_package_1%test_package_2%tests2%test_package_3%' ); end; @@ -327,7 +307,7 @@ create or replace package body test_ut_run is --Act execute immediate 'begin ut3$user#.test_package_1.run(:a_path); end;' using in cast(null as varchar2); - l_results := get_dbms_output_as_clob(); + l_results := core.get_dbms_output_as_clob(); --Assert ut.expect( l_results ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); end; @@ -339,7 +319,7 @@ create or replace package body test_ut_run is --Act execute immediate 'begin ut3$user#.test_package_1.run(:a_paths); end;' using in l_paths; - l_results := get_dbms_output_as_clob(); + l_results := core.get_dbms_output_as_clob(); --Assert ut.expect( l_results ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); end; @@ -350,7 +330,7 @@ create or replace package body test_ut_run is --Act execute immediate 'begin ut3$user#.test_package_1.run(:a_paths); end;' using in ut3.ut_varchar2_list(); - l_results := get_dbms_output_as_clob(); + l_results := core.get_dbms_output_as_clob(); --Assert ut.expect( l_results ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); end; @@ -384,7 +364,7 @@ create or replace package body test_ut_run is l_results clob; begin ut3.ut.run('test_commit_warning'); - l_results := get_dbms_output_as_clob(); + l_results := core.get_dbms_output_as_clob(); ut.expect(l_results).to_be_like( '%Unable to perform automatic rollback after test%'|| 'An implicit or explicit commit/rollback occurred in procedures:%' || @@ -435,7 +415,7 @@ create or replace package body test_ut_run is l_results clob; begin ut3.ut.run('child_suite'); - l_results := get_dbms_output_as_clob(); + l_results := core.get_dbms_output_as_clob(); ut.expect(l_results).to_be_like( '%1) does_stuff%' || 'ORA-01403: no data found%' || @@ -481,7 +461,7 @@ create or replace package body test_ut_run is when others then null; end; begin - execute immediate 'drop pacakge test_transaction'; + execute immediate 'drop package test_transaction'; exception when others then null; end; @@ -498,7 +478,7 @@ create or replace package body test_ut_run is --Act ut3.ut.run('test_transaction.insert_row', a_force_manual_rollback => true); - l_results := get_dbms_output_as_clob(); + l_results := core.get_dbms_output_as_clob(); --Assert open l_expected for @@ -523,7 +503,7 @@ create or replace package body test_ut_run is --Act ut3.ut.run('test_transaction.insert_and_raise', a_force_manual_rollback => true); - l_results := get_dbms_output_as_clob(); + l_results := core.get_dbms_output_as_clob(); --Assert open l_expected for @@ -548,7 +528,7 @@ create or replace package body test_ut_run is --Act ut3.ut.run('test_transaction.insert_row'); - l_results := get_dbms_output_as_clob(); + l_results := core.get_dbms_output_as_clob(); --Assert open l_expected for diff --git a/test/core.pkb b/test/core.pkb index 7ace9f7ce..60baa0190 100644 --- a/test/core.pkb +++ b/test/core.pkb @@ -1,5 +1,24 @@ create or replace package body core is + function get_dbms_output_as_clob return clob is + l_status number; + l_line varchar2(32767); + l_result clob; + begin + + dbms_output.get_line(line => l_line, status => l_status); + if l_status != 1 then + dbms_lob.createtemporary(l_result, true, dur => dbms_lob.session); + end if; + while l_status != 1 loop + if l_line is not null then + ut3.ut_utils.append_to_clob(l_result, l_line||chr(10)); + end if; + dbms_output.get_line(line => l_line, status => l_status); + end loop; + return l_result; + end; + procedure global_setup is begin ut3.ut_coverage.set_develop_mode(true); diff --git a/test/core.pks b/test/core.pks index 92285c4bf..d23ab6be0 100644 --- a/test/core.pks +++ b/test/core.pks @@ -15,7 +15,7 @@ create or replace package core is function get_value(a_variable varchar2) return integer; - + function get_dbms_output_as_clob return clob; end; / diff --git a/test/core/min_grant_user/test_min_grant_user.pkb b/test/core/min_grant_user/test_min_grant_user.pkb new file mode 100644 index 000000000..906906fe1 --- /dev/null +++ b/test/core/min_grant_user/test_min_grant_user.pkb @@ -0,0 +1,62 @@ +create or replace package body test_min_grant_user is + + procedure create_ut3$user#_tests is + pragma autonomous_transaction; + begin + execute immediate q'[ + create or replace package ut3$user#.test_cursor_grants is + --%suite() + + procedure run; + + --%test(execute join by test) + procedure test_join_by_cursor; + end; + ]'; + execute immediate q'[ + create or replace package body ut3$user#.test_cursor_grants is + procedure run is + begin + ut3.ut.run('test_cursor_grants'); + end; + procedure test_join_by_cursor is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + begin + --Arrange + open l_actual for select owner, object_name,object_type from all_objects where owner = user + order by 1,2,3 asc; + open l_expected for select owner, object_name,object_type from all_objects where owner = user + order by 1,2,3 desc; + + --Act + ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OWNER'); + + end; + + + end; + ]'; + end; + + procedure drop_ut3$user#_tests is + pragma autonomous_transaction; + begin + execute immediate q'[drop package ut3$user#.test_cursor_grants]'; + end; + + + + procedure test_join_by_cursor is + l_results clob; + begin + execute immediate 'begin ut3$user#.test_cursor_grants.run(); end;'; + l_results := core.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%execute join by test [.% sec]' || + '%1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%' ); + + end; + +end; +/ diff --git a/test/core/min_grant_user/test_min_grant_user.pks b/test/core/min_grant_user/test_min_grant_user.pks new file mode 100644 index 000000000..02f3ac8da --- /dev/null +++ b/test/core/min_grant_user/test_min_grant_user.pks @@ -0,0 +1,16 @@ +create or replace package test_min_grant_user is + + --%suite(minimum grant user tests) + --%suitepath(utplsql.core) + + --%beforeall + procedure create_ut3$user#_tests; + + --%afterall + procedure drop_ut3$user#_tests; + + --%test(execute join by test) + procedure test_join_by_cursor; + +end; +/ diff --git a/test/core/reporters/test_coverage.pkb b/test/core/reporters/test_coverage.pkb index 4e3846af8..2c67dc8c9 100644 --- a/test/core/reporters/test_coverage.pkb +++ b/test/core/reporters/test_coverage.pkb @@ -256,7 +256,6 @@ create or replace package body test_coverage is ut.expect(l_actual).to_equal(to_clob(' ')); - drop_dummy_coverage_test_1; end; end; diff --git a/test/core/reporters/test_coverage.pks b/test/core/reporters/test_coverage.pks index 65e99666b..51eb175ec 100644 --- a/test/core/reporters/test_coverage.pks +++ b/test/core/reporters/test_coverage.pks @@ -32,7 +32,9 @@ create or replace package test_coverage is --%test(Coverage data is not cached between runs - issue #562 ) --%aftertest(create_dummy_coverage_pkg) --%aftertest(setup_dummy_coverage) + --%aftertest(drop_dummy_coverage_test_1) procedure coverage_tmp_data_refresh; + procedure drop_dummy_coverage_test_1; end; / diff --git a/test/core/test_suite_manager.pkb b/test/core/test_suite_manager.pkb index 5d7e91f3d..59ed002d3 100644 --- a/test/core/test_suite_manager.pkb +++ b/test/core/test_suite_manager.pkb @@ -1420,5 +1420,36 @@ end;]'; ut.expect(l_test_proc.name).to_equal('test1'); end; + procedure test_get_schema_ut_packages is + l_expected ut3.ut_object_names; + l_actual ut3.ut_object_names; + begin + l_expected := ut3.ut_object_names( + ut3.ut_object_name('UT3','SOME_TEST_PACKAGE') + ); + l_actual := ut3.ut_suite_manager.get_schema_ut_packages(ut3.ut_varchar2_rows('UT3')); + + ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); + end; + procedure create_ut3_suite is + pragma autonomous_transaction; + begin + execute immediate q'[ + create or replace package ut3.some_test_package + as + --%suite + + --%test + procedure some_test; + + end;]'; + end; + + procedure drop_ut3_suite is + pragma autonomous_transaction; + begin + execute immediate q'[drop package ut3.some_test_package]'; + end; + end test_suite_manager; / diff --git a/test/core/test_suite_manager.pks b/test/core/test_suite_manager.pks index 45466b9d2..d200fcd2f 100644 --- a/test/core/test_suite_manager.pks +++ b/test/core/test_suite_manager.pks @@ -151,5 +151,16 @@ create or replace package test_suite_manager is --%test(Prepare runner for a package procedure inside context by path) procedure pck_proc_in_ctx_by_path; + --%context(get_schema_ut_packages) + + --%test(returns list of all unit test packages in given schema) + --%beforetest(create_ut3_suite) + --%aftertest(drop_ut3_suite) + procedure test_get_schema_ut_packages; + procedure create_ut3_suite; + procedure drop_ut3_suite; + + --%endcontext + end test_suite_manager; / diff --git a/test/install__min_usr_tests.sql b/test/install__min_usr_tests.sql deleted file mode 100644 index fa788f8f9..000000000 --- a/test/install__min_usr_tests.sql +++ /dev/null @@ -1,39 +0,0 @@ -set define off -whenever sqlerror exit failure rollback -whenever oserror exit failure rollback - -alter session set plsql_optimize_level=0; - ---Install tests -@@min_grant_user/min_grant_user_exp.pks -@@min_grant_user/min_grant_user_exp.pkb - -set linesize 200 -set define on -set verify off -column text format a100 -column error_count noprint new_value error_count - -prompt Validating installation - -set heading on -select type, name, sequence, line, position, text, count(1) over() error_count - from all_errors - where owner = USER - and name not like 'BIN$%' --not recycled - and name != 'UT_WITH_INVALID_BODY' - -- errors only. ignore warnings - and attribute = 'ERROR' - order by name, type, sequence -/ - -begin - if to_number('&&error_count') > 0 then - raise_application_error(-20000, 'Not all sources were successfully installed.'); - else - dbms_output.put_line('Installation completed successfully'); - end if; -end; -/ - -exit; diff --git a/test/install_and_run_tests.sh b/test/install_and_run_tests.sh index ffe56278e..bd04495b5 100755 --- a/test/install_and_run_tests.sh +++ b/test/install_and_run_tests.sh @@ -6,18 +6,6 @@ git rev-parse && cd "$(git rev-parse --show-cdup)" cd test -time "$SQLCLI" ${UT3_USER}/${UT3_USER_PASSWORD}@//${CONNECTION_STR} @install__min_usr_tests.sql - -cd .. - -time utPLSQL-cli/bin/utplsql run ${UT3_USER}/${UT3_USER_PASSWORD}@${CONNECTION_STR} \ --source_path=source -owner=ut3 \ --test_path=test -c \ --f=ut_documentation_reporter -o=min_test_results.log -s \ --scc - -cd test - time "$SQLCLI" ${UT3_TESTER}/${UT3_TESTER_PASSWORD}@//${CONNECTION_STR} @install_tests.sql cd .. @@ -33,9 +21,3 @@ time utPLSQL-cli/bin/utplsql run ${UT3_TESTER}/${UT3_TESTER_PASSWORD}@${CONNECTI -f=ut_junit_reporter -o=junit_test_results.xml \ -f=ut_tfs_junit_reporter -o=tfs_test_results.xml \ -scc - -status_line_regex="^[0-9]+ tests, ([0-9]+) failed, ([0-9]+) errored.*" - - -exit $RC - diff --git a/test/install_tests.sql b/test/install_tests.sql index 2f1292b74..af67534d7 100644 --- a/test/install_tests.sql +++ b/test/install_tests.sql @@ -16,6 +16,7 @@ alter session set plsql_optimize_level=0; --Install tests @@core.pks +@@core/min_grant_user/test_min_grant_user.pks @@api/test_ut_runner.pks @@api/test_ut_run.pks @@core/test_ut_utils.pks @@ -65,6 +66,7 @@ set define off @@core/annotations/test_annot_throws_exception.pks @@core.pkb +@@core/min_grant_user/test_min_grant_user.pkb @@api/test_ut_runner.pkb @@api/test_ut_run.pkb @@core/test_ut_utils.pkb diff --git a/test/min_grant_user/min_grant_user_exp.pkb b/test/min_grant_user/min_grant_user_exp.pkb deleted file mode 100644 index 1a8089c0b..000000000 --- a/test/min_grant_user/min_grant_user_exp.pkb +++ /dev/null @@ -1,19 +0,0 @@ -create or replace package body min_grant_user_exp is - - procedure test_join_by_cursor is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; - begin - --Arrange - open l_actual for select owner, object_name,object_type from all_objects where owner = user - order by 1,2,3 asc; - open l_expected for select owner, object_name,object_type from all_objects where owner = user - order by 1,2,3 desc; - - --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OWNER'); - - end; - -end; -/ diff --git a/test/min_grant_user/min_grant_user_exp.pks b/test/min_grant_user/min_grant_user_exp.pks deleted file mode 100644 index 467d62ce0..000000000 --- a/test/min_grant_user/min_grant_user_exp.pks +++ /dev/null @@ -1,9 +0,0 @@ -create or replace package min_grant_user_exp is - - --%suite(minimum grant user tests) - - --%test(execute join by test) - procedure test_join_by_cursor; - -end; -/ From e4525aa45477510ce4c0c48e26a4b14d91379df9 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 26 Nov 2018 01:02:27 +0000 Subject: [PATCH 0139/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 0fcd848ff..50f5ae039 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.4.2416-develop'; + gc_version constant varchar2(50) := 'v3.1.4.2419-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From 3759e90cffdd1bbc3a787031888622d3df04ed43 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Mon, 26 Nov 2018 12:51:28 +0000 Subject: [PATCH 0140/1096] Phase 2. Removal of x path and clean-up deprecated code --- .../data_values/ut_compound_data_helper.pkb | 213 ++++++------ .../data_values/ut_compound_data_helper.pks | 23 +- .../data_values/ut_compound_data_value.tpb | 5 +- .../ut_curr_usr_compound_helper.pkb | 310 ------------------ .../ut_curr_usr_compound_helper.pks | 24 -- .../data_values/ut_cursor_column.tpb | 2 +- .../data_values/ut_cursor_details.tpb | 8 +- .../data_values/ut_data_value_refcursor.tpb | 14 +- .../data_values/ut_data_value_refcursor.tps | 21 +- source/install.sql | 2 - source/uninstall_objects.sql | 2 - .../expectations/test_expectations_cursor.pkb | 12 +- 12 files changed, 140 insertions(+), 496 deletions(-) delete mode 100644 source/expectations/data_values/ut_curr_usr_compound_helper.pkb delete mode 100644 source/expectations/data_values/ut_curr_usr_compound_helper.pks diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 6033322dc..960da59a1 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -20,23 +20,10 @@ create or replace package body ut_compound_data_helper is g_diff_count integer; g_filter_tab ut_varchar2_list; - function get_column_info_xml(a_column_details ut_key_anyval_pair) return xmltype is - l_result varchar2(4000); - l_res xmltype; - l_data ut_data_value := a_column_details.value; - l_key varchar2(4000) := ut_utils.xmlgen_escaped_string(a_column_details.KEY); - l_is_diff number; - begin - l_result := '<'||l_key||' xml_valid_name="'||l_key; - if l_data is of(ut_data_value_xmltype) then - l_result := l_result||'" sql_diffable="0">' ||trim( both '''' from (treat(l_data as ut_data_value_xmltype).to_string)); - else - l_is_diff := ut_curr_usr_compound_helper.is_sql_compare_int((treat(l_data as ut_data_value_varchar2).data_value)); - l_result := l_result||'" sql_diffable="'||l_is_diff||'">' || ut_utils.xmlgen_escaped_string((treat(l_data as ut_data_value_varchar2).data_value)); - end if; - l_result := l_result ||''; - return xmltype(l_result); - end; + type t_type_name_map is table of varchar2(100) index by binary_integer; + g_type_name_map t_type_name_map; + g_anytype_name_map t_type_name_map; + g_anytype_collection_name t_type_name_map; function get_columns_filter( a_exclude_xpath varchar2, a_include_xpath varchar2, @@ -60,32 +47,6 @@ create or replace package body ut_compound_data_helper is return l_filter; end; - /** - * Current get column filter shaving off ROW tag during extract, this not working well with include and XMLTABLE option - * so when there is extract we artificially inject removed tag - **/ - function get_columns_row_filter( - a_exclude_xpath varchar2, a_include_xpath varchar2, - a_table_alias varchar2 := 'ucd', a_column_alias varchar2 := 'item_data' - ) return varchar2 is - l_filter varchar2(32767); - l_source_column varchar2(500) := a_table_alias||'.'||a_column_alias; - begin - -- this SQL statement is constructed in a way that we always get the same number and ordering of substitution variables - -- That is, we always get: l_exclude_xpath, l_include_xpath - -- regardless if the variables are NULL (not to be used) or NOT NULL and will be used for filtering - if a_exclude_xpath is null and a_include_xpath is null then - l_filter := ':l_exclude_xpath, :l_include_xpath, '||l_source_column||' as '||a_column_alias; - elsif a_exclude_xpath is not null and a_include_xpath is null then - l_filter := 'deletexml( '||l_source_column||', :l_exclude_xpath ) as '||a_column_alias||', :l_include_xpath'; - elsif a_exclude_xpath is null and a_include_xpath is not null then - l_filter := ':l_exclude_xpath, xmlelement("ROW",extract( '||l_source_column||', :l_include_xpath )) as '||a_column_alias; - elsif a_exclude_xpath is not null and a_include_xpath is not null then - l_filter := 'xmlelement("ROW",extract( deletexml( '||l_source_column||', :l_exclude_xpath ), :l_include_xpath )) as '||a_column_alias; - end if; - return l_filter; - end; - function get_columns_diff(a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab) return tt_column_diffs is l_column_filter varchar2(32767); @@ -295,8 +256,8 @@ create or replace package body ut_compound_data_helper is end if; end; - function gen_compare_sql(a_column_info xmltype,a_inclusion_type boolean, a_is_negated boolean,a_unordered boolean, - a_other ut_data_value_refcursor :=null, a_join_by_list ut_varchar2_list:=ut_varchar2_list() ) return clob is + function gen_compare_sql(a_inclusion_type boolean, a_is_negated boolean,a_unordered boolean, + a_other ut_data_value_refcursor :=null, a_join_by_list ut_varchar2_list:=ut_varchar2_list() ) return clob is l_compare_sql clob; l_temp_string varchar2(32767); @@ -428,7 +389,6 @@ create or replace package body ut_compound_data_helper is return l_column_list; end; - function get_rows_diff_by_sql(a_act_cursor_info ut_cursor_column_tab,a_exp_cursor_info ut_cursor_column_tab, a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, a_join_by_list ut_varchar2_list, a_unordered boolean @@ -608,65 +568,6 @@ create or replace package body ut_compound_data_helper is return dbms_utility.get_hash_value(a_string,a_base,a_size); end; - function columns_hash( - a_data_value_cursor ut_data_value_refcursor, a_exclude_xpath varchar2, a_include_xpath varchar2, - a_hash_type binary_integer := dbms_crypto.hash_sh1 - ) return t_hash is - l_cols_hash t_hash; - begin - if not a_data_value_cursor.is_null then - execute immediate - q'[select dbms_crypto.hash(replace(x.item_data.getclobval(),'>CHAR<','>VARCHAR2<'),]'||a_hash_type||') ' || - ' from ( select '||get_columns_filter(a_exclude_xpath, a_include_xpath)|| - ' from (select :columns_info as item_data from dual ) ucd' || - ' ) x' - into l_cols_hash using a_exclude_xpath,a_include_xpath, a_data_value_cursor.columns_info; - end if; - return l_cols_hash; - end; - - function is_pk_exists(a_expected_cursor xmltype,a_actual_cursor xmltype, a_exclude_xpath varchar2, a_include_xpath varchar2,a_join_by_xpath varchar2) - return tt_missing_pk is - l_pk_xpath_tabs ut_varchar2_list := ut_varchar2_list(); - l_column_filter varchar2(32767); - l_no_missing_keys tt_missing_pk := tt_missing_pk(); - - begin - if a_join_by_xpath is not null then - l_pk_xpath_tabs := ut_utils.string_to_table(a_join_by_xpath,'|'); - l_column_filter := get_columns_row_filter(a_exclude_xpath, a_include_xpath); - - execute immediate q'[ - with xpaths_tab as (select column_value xpath from table(:xpath_tabs)), - expected_column_info as ( select :expected as item_data from dual ), - actual_column_info as ( select :actual as item_data from dual ) - select REGEXP_SUBSTR (xpath,'[^(/\*/)](.+)$'),diif_type from - ( - (select xpath,'e' diif_type from xpaths_tab - minus - select xpath,'e' diif_type - from ( select ]'||l_column_filter||q'[ from expected_column_info ucd) x - ,xpaths_tab - where xmlexists (xpaths_tab.xpath passing x.item_data) - ) - union all - (select xpath,'a' diif_type from xpaths_tab - minus - select xpath,'a' diif_type - from ( select ]'||l_column_filter||q'[ from actual_column_info ucd) x - ,xpaths_tab - where xmlexists (xpaths_tab.xpath passing x.item_data) - ) - )]' bulk collect into l_no_missing_keys - using l_pk_xpath_tabs,a_expected_cursor,a_actual_cursor, - a_exclude_xpath, a_include_xpath, - a_exclude_xpath, a_include_xpath; - - end if; - - return l_no_missing_keys; - end; - procedure insert_diffs_result(a_diff_tab t_diff_tab, a_diff_id raw) is begin forall idx in 1..a_diff_tab.count @@ -853,6 +754,106 @@ create or replace package body ut_compound_data_helper is end loop; return l_warn_msg; end; + + function getxmlchildren(p_parent_name varchar2,a_cursor_table ut_cursor_column_tab) + return xmltype is + l_result xmltype; + begin + + select xmlagg(xmlelement(evalname t.column_name,t.column_type, + getxmlchildren(t.column_name,a_cursor_table))) + into l_result + from table(a_cursor_table) t + where (p_parent_name is not null and parent_name = p_parent_name) + or (p_parent_name is null and parent_name is null) + having count(*) > 0; + + + return l_result; + end; + + function is_sql_compare_allowed(a_type_name varchar2) return boolean is + begin + --clob/blob/xmltype/object/nestedcursor/nestedtable + if a_type_name IN (g_type_name_map(dbms_sql.blob_type), + g_type_name_map(dbms_sql.clob_type), + g_type_name_map(dbms_sql.bfile_type), + g_anytype_name_map(dbms_types.typecode_namedcollection)) + then + return false; + else + return true; + end if; + end; + + function is_collection (a_owner varchar2,a_type_name varchar2, a_anytype_code in integer :=null) return boolean is + l_type_view varchar2(200) := ut_metadata.get_dba_view('dba_types'); + l_typecode varchar2(100); + begin + if a_anytype_code is null then + execute immediate 'select typecode from '||l_type_view ||' + where owner = :owner and type_name = :typename' + into l_typecode using a_owner,a_type_name; + + return l_typecode = 'COLLECTION'; + else + return a_anytype_code in (dbms_types.typecode_varray,dbms_types.typecode_table,dbms_types.typecode_namedcollection); + end if; + + exception + when no_data_found then + return false; + end; + + function get_column_type_desc(a_type_code in integer, a_dbms_sql_desc in boolean) return varchar2 is + begin + return case when a_dbms_sql_desc then g_type_name_map(a_type_code) else g_anytype_name_map(a_type_code) end; + end; + + +begin + g_anytype_name_map(dbms_types.typecode_date) := 'DATE'; + g_anytype_name_map(dbms_types.typecode_number) := 'NUMBER'; + g_anytype_name_map(dbms_types.typecode_raw) := 'RAW'; + g_anytype_name_map(dbms_types.typecode_char) := 'CHAR'; + g_anytype_name_map(dbms_types.typecode_varchar2) := 'VARCHAR2'; + g_anytype_name_map(dbms_types.typecode_varchar) := 'VARCHAR'; + g_anytype_name_map(dbms_types.typecode_blob) := 'BLOB'; + g_anytype_name_map(dbms_types.typecode_bfile) := 'BFILE'; + g_anytype_name_map(dbms_types.typecode_clob) := 'CLOB'; + g_anytype_name_map(dbms_types.typecode_timestamp) := 'TIMESTAMP'; + g_anytype_name_map(dbms_types.typecode_timestamp_tz) := 'TIMESTAMP WITH TIME ZONE'; + g_anytype_name_map(dbms_types.typecode_timestamp_ltz) := 'TIMESTAMP WITH LOCAL TIME ZONE'; + g_anytype_name_map(dbms_types.typecode_interval_ym) := 'INTERVAL YEAR TO MONTH'; + g_anytype_name_map(dbms_types.typecode_interval_ds) := 'INTERVAL DAY TO SECOND'; + g_anytype_name_map(dbms_types.typecode_bfloat) := 'BINARY_FLOAT'; + g_anytype_name_map(dbms_types.typecode_bdouble) := 'BINARY_DOUBLE'; + g_anytype_name_map(dbms_types.typecode_urowid) := 'UROWID'; + g_anytype_name_map(dbms_types.typecode_varray) := 'VARRRAY'; + g_anytype_name_map(dbms_types.typecode_table) := 'TABLE'; + g_anytype_name_map(dbms_types.typecode_namedcollection) := 'NAMEDCOLLECTION'; + + g_type_name_map( dbms_sql.binary_bouble_type ) := 'BINARY_DOUBLE'; + g_type_name_map( dbms_sql.bfile_type ) := 'BFILE'; + g_type_name_map( dbms_sql.binary_float_type ) := 'BINARY_FLOAT'; + g_type_name_map( dbms_sql.blob_type ) := 'BLOB'; + g_type_name_map( dbms_sql.long_raw_type ) := 'LONG RAW'; + g_type_name_map( dbms_sql.char_type ) := 'CHAR'; + g_type_name_map( dbms_sql.clob_type ) := 'CLOB'; + g_type_name_map( dbms_sql.long_type ) := 'LONG'; + g_type_name_map( dbms_sql.date_type ) := 'DATE'; + g_type_name_map( dbms_sql.interval_day_to_second_type ) := 'INTERVAL DAY TO SECOND'; + g_type_name_map( dbms_sql.interval_year_to_month_type ) := 'INTERVAL YEAR TO MONTH'; + g_type_name_map( dbms_sql.raw_type ) := 'RAW'; + g_type_name_map( dbms_sql.timestamp_type ) := 'TIMESTAMP'; + g_type_name_map( dbms_sql.timestamp_with_tz_type ) := 'TIMESTAMP WITH TIME ZONE'; + g_type_name_map( dbms_sql.timestamp_with_local_tz_type ) := 'TIMESTAMP WITH LOCAL TIME ZONE'; + g_type_name_map( dbms_sql.varchar2_type ) := 'VARCHAR2'; + g_type_name_map( dbms_sql.number_type ) := 'NUMBER'; + g_type_name_map( dbms_sql.rowid_type ) := 'ROWID'; + g_type_name_map( dbms_sql.urowid_type ) := 'UROWID'; + g_type_name_map( dbms_sql.user_defined_type ) := 'USER_DEFINED_TYPE'; + g_type_name_map( dbms_sql.ref_type ) := 'REF_TYPE'; -end; +end; / diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 50d70974d..5e8671d13 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -58,9 +58,6 @@ create or replace package ut_compound_data_helper authid definer is type t_diff_tab is table of t_diff_rec; - - function get_column_info_xml(a_column_details ut_key_anyval_pair) return xmltype; - function get_columns_filter( a_exclude_xpath varchar2, a_include_xpath varchar2, a_table_alias varchar2 := 'ucd', a_column_alias varchar2 := 'item_data' @@ -87,17 +84,9 @@ create or replace package ut_compound_data_helper authid definer is function get_hash(a_data clob, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash; function get_fixed_size_hash(a_string varchar2, a_base integer :=0,a_size integer :=30) return number; - - function columns_hash( - a_data_value_cursor ut_data_value_refcursor, a_exclude_xpath varchar2, a_include_xpath varchar2, - a_hash_type binary_integer := dbms_crypto.hash_sh1 - ) return t_hash; - - function is_pk_exists(a_expected_cursor xmltype, a_actual_cursor xmltype, a_exclude_xpath varchar2, a_include_xpath varchar2,a_join_by_xpath varchar2) - return tt_missing_pk; - function gen_compare_sql(a_column_info xmltype, a_inclusion_type boolean, a_is_negated boolean, a_unordered boolean, - a_other ut_data_value_refcursor :=null, a_join_by_list ut_varchar2_list:=ut_varchar2_list() ) return clob; + function gen_compare_sql(a_inclusion_type boolean, a_is_negated boolean, a_unordered boolean, + a_other ut_data_value_refcursor :=null, a_join_by_list ut_varchar2_list:=ut_varchar2_list() ) return clob; procedure insert_diffs_result(a_diff_tab t_diff_tab, a_diff_id raw); @@ -127,5 +116,13 @@ create or replace package ut_compound_data_helper authid definer is function generate_missing_cols_warn_msg(a_missing_columns ut_varchar2_list,a_attribute in varchar2) return varchar2; + function getxmlchildren(p_parent_name varchar2,a_cursor_table ut_cursor_column_tab) return xmltype; + + function is_sql_compare_allowed(a_type_name varchar2) return boolean; + + function is_collection (a_owner varchar2,a_type_name varchar2, a_anytype_code in integer :=null) return boolean; + + function get_column_type_desc(a_type_code in integer, a_dbms_sql_desc in boolean) return varchar2; + end; / diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index a1cb14993..a06ac1d14 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -219,9 +219,8 @@ create or replace type body ut_compound_data_value as l_other := treat(a_other as ut_compound_data_value); l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); - open l_loop_curs for ut_compound_data_helper.gen_compare_sql(treat(a_other as ut_data_value_refcursor).col_info_desc, - a_inclusion_compare, a_is_negated, a_unordered, treat(a_other as ut_data_value_refcursor), - a_join_by_list ) using self.data_id,l_other.data_id; + open l_loop_curs for ut_compound_data_helper.gen_compare_sql(a_inclusion_compare, a_is_negated, a_unordered, + treat(a_other as ut_data_value_refcursor), a_join_by_list ) using self.data_id,l_other.data_id; loop fetch l_loop_curs bulk collect into l_diff_tab limit l_max_rows; exit when l_diff_tab.count = 0; diff --git a/source/expectations/data_values/ut_curr_usr_compound_helper.pkb b/source/expectations/data_values/ut_curr_usr_compound_helper.pkb deleted file mode 100644 index 8c7b53c92..000000000 --- a/source/expectations/data_values/ut_curr_usr_compound_helper.pkb +++ /dev/null @@ -1,310 +0,0 @@ -create or replace package body ut_curr_usr_compound_helper is - - type t_type_name_map is table of varchar2(100) index by binary_integer; - g_type_name_map t_type_name_map; - g_anytype_name_map t_type_name_map; - g_anytype_collection_name t_type_name_map; - g_user_defined_type pls_integer := dbms_sql.user_defined_type; - g_is_collection boolean := false; - - procedure set_collection_state(a_is_collection boolean) is - begin - --Make sure that we set a g_is_collection only once so we dont reset from true to false. - if not g_is_collection then - g_is_collection := a_is_collection; - end if; - end; - - function is_sql_compare_allowed(a_type_name varchar2) return boolean is - begin - --clob/blob/xmltype/object/nestedcursor/nestedtable - if a_type_name IN (g_type_name_map(dbms_sql.blob_type), - g_type_name_map(dbms_sql.clob_type), - g_type_name_map(dbms_sql.bfile_type), - g_anytype_name_map(dbms_types.typecode_namedcollection)) - then - return false; - else - return true; - end if; - end; - - function is_sql_compare_int(a_type_name varchar2) return integer is - begin - return ut_utils.boolean_to_int(is_sql_compare_allowed(a_type_name)); - end; - - function is_collection (a_owner varchar2,a_type_name varchar2, a_anytype_code in integer :=null) return boolean is - l_type_view varchar2(200) := ut_metadata.get_dba_view('dba_types'); - l_typecode varchar2(100); - begin - - if a_anytype_code is null then - - execute immediate 'select typecode from '||l_type_view ||' - where owner = :owner and type_name = :typename' - into l_typecode using a_owner,a_type_name; - - return l_typecode = 'COLLECTION'; - else - return a_anytype_code in (dbms_types.typecode_varray,dbms_types.typecode_table,dbms_types.typecode_namedcollection); - end if; - - exception - when no_data_found then - return false; - end; - - function get_column_type(a_desc_rec dbms_sql.desc_rec3, a_desc_user_types boolean := false) return ut_key_anyval_pair is - l_data ut_data_value; - l_result ut_key_anyval_pair; - l_data_type varchar2(500) := 'unknown datatype'; - - begin - - if g_type_name_map.exists(a_desc_rec.col_type) then - l_data := ut_data_value_varchar2(g_type_name_map(a_desc_rec.col_type)); - return ut_key_anyval_pair(a_desc_rec.col_name,l_data); - end if; - - /*If its a collection regardless is we want to describe user defined types we will return just a name - and capture that name */ - if a_desc_rec.col_type = g_user_defined_type and is_collection(a_desc_rec.col_schema_name,a_desc_rec.col_type_name) then - l_data := ut_data_value_varchar2(a_desc_rec.col_schema_name||'.'||a_desc_rec.col_type_name); - set_collection_state(true); - return ut_key_anyval_pair(a_desc_rec.col_name,l_data); - end if; - - if a_desc_rec.col_type = g_user_defined_type and a_desc_user_types then - if a_desc_rec.col_type_name = 'XMLTYPE' then - l_data := ut_data_value_varchar2(a_desc_rec.col_type_name); - else - --This is only time we return xml if its user defined. This is important as its used later. - l_data :=ut_data_value_xmltype(get_user_defined_type(a_desc_rec.col_schema_name,a_desc_rec.col_type_name)); - end if; - return ut_key_anyval_pair(a_desc_rec.col_name,l_data); - end if; - - if a_desc_rec.col_schema_name is not null and a_desc_rec.col_type_name is not null then - l_data := ut_data_value_varchar2(a_desc_rec.col_schema_name||'.'||a_desc_rec.col_type_name); - return ut_key_anyval_pair(a_desc_rec.col_name,l_data); - end if; - end; - - function get_columns_info( - a_columns_tab dbms_sql.desc_tab3, a_columns_count integer, a_desc_user_types boolean := false - ) return ut_key_anyval_pairs is - l_result ut_key_anyval_pairs := ut_key_anyval_pairs(); - begin - for i in 1 .. a_columns_count loop - l_result.extend; - l_result(l_result.last) := get_column_type(a_columns_tab(i),a_desc_user_types); - end loop; - - return l_result; - end; - - procedure get_descr_cursor( - a_cursor in out nocopy sys_refcursor, - a_columns_tab in out nocopy ut_key_anyval_pairs, - a_join_by_tab in out nocopy ut_key_anyval_pairs - ) is - l_cursor_number integer; - l_columns_count pls_integer; - l_columns_desc dbms_sql.desc_tab3; - begin - if a_cursor is null or not a_cursor%isopen then - a_columns_tab := null; - a_join_by_tab := null; - end if; - l_cursor_number := dbms_sql.to_cursor_number( a_cursor ); - dbms_sql.describe_columns3( l_cursor_number, l_columns_count, l_columns_desc ); - a_cursor := dbms_sql.to_refcursor( l_cursor_number ); - a_columns_tab := get_columns_info( l_columns_desc, l_columns_count, true); - a_join_by_tab := get_columns_info( l_columns_desc, l_columns_count, true); - end; - - procedure get_columns_info( - a_cursor in out nocopy sys_refcursor, - a_columns_info out nocopy xmltype, - a_join_by_info out nocopy xmltype, - a_contains_collection out nocopy number - ) is - l_columns_info xmltype; - l_join_by_info xmltype; - l_result_tmp xmltype; - l_columns_tab ut_key_anyval_pairs; - l_join_by_tab ut_key_anyval_pairs; - begin - - get_descr_cursor(a_cursor,l_columns_tab,l_join_by_tab); - - for i in 1..l_columns_tab.COUNT - loop - l_result_tmp := ut_compound_data_helper.get_column_info_xml(l_columns_tab(i)); - select xmlconcat(l_columns_info,l_result_tmp) into l_columns_info from dual; - end loop; - - for i in 1..l_join_by_tab.COUNT - loop - l_result_tmp := ut_compound_data_helper.get_column_info_xml(l_join_by_tab(i)); - select xmlconcat(l_join_by_info,l_result_tmp) into l_join_by_info from dual; - end loop; - - select XMLELEMENT("ROW",l_columns_info ),XMLELEMENT("ROW",l_join_by_info ) - into a_columns_info,a_join_by_info from dual; - - a_contains_collection := ut_utils.boolean_to_int(g_is_collection); - end; - - function get_anytype_attribute_count (a_anytype anytype) return pls_integer is - l_attribute_typecode pls_integer; - l_schema_name varchar2(32767); - l_version varchar2(32767); - l_type_name varchar2(32767); - l_attributes pls_integer; - l_prec pls_integer; - l_scale pls_integer; - l_len pls_integer; - l_csid pls_integer; - l_csfrm pls_integer; - begin - l_attribute_typecode := a_anytype.getinfo( - prec => l_prec, - scale => l_scale, - len => l_len, - csid => l_csid, - csfrm => l_csfrm, - schema_name => l_schema_name, - type_name => l_type_name, - version => l_version, - numelems => l_attributes); - return l_attributes; - end; - - function get_anytype_attributes_info (a_anytype anytype) return ut_key_value_pairs is - l_result ut_key_value_pairs := ut_key_value_pairs(); - l_attribute_typecode pls_integer; - l_aname varchar2(32767); - l_prec pls_integer; - l_scale pls_integer; - l_len pls_integer; - l_csid pls_integer; - l_csfrm pls_integer; - l_attr_elt_type anytype; - l_attributes_cnt pls_integer; - begin - l_attributes_cnt := NVL(get_anytype_attribute_count(a_anytype),0); - - if l_attributes_cnt > 0 then - for i in 1..get_anytype_attribute_count(a_anytype) loop - l_attribute_typecode := a_anytype.getAttrElemInfo( - pos => i, --First attribute - prec => l_prec, - scale => l_scale, - len => l_len, - csid => l_csid, - csfrm => l_csfrm, - attr_elt_type => l_attr_elt_type, - aname => l_aname); - - l_result.extend; - l_result(l_result.last) := ut_key_value_pair(l_aname, g_anytype_name_map(l_attribute_typecode)); - --check for collection - if g_anytype_collection_name.exists(l_attribute_typecode) then - set_collection_state(true); - end if; - end loop; - end if; - - return l_result; - end; - - function get_user_defined_type(a_owner varchar2,a_type_name varchar2) return xmltype is - l_anydata anydata; - l_anytype anytype; - l_typecode pls_integer; - l_result xmltype; - l_columns_tab ut_key_value_pairs := ut_key_value_pairs(); - begin - execute immediate 'declare - l_v '||a_owner||'.'||a_type_name||'; - begin - :anydata := anydata.convertobject(l_v); - end;' USING IN OUT l_anydata; - - l_typecode := l_anydata.gettype(l_anytype); - l_columns_tab := get_anytype_attributes_info(l_anytype); - - select xmlagg(xmlelement(evalname key,value)) - into l_result from table(l_columns_tab); - - return l_result; - end; - - function extract_min_col_info(a_full_col_info xmltype) return xmltype is - l_result xmltype; - begin - SELECT deleteXML(a_full_col_info,'/ROW/*/@sql_diffable') - into l_result - from dual; - return l_result ; - end; - - function get_column_type_desc(a_type_code in integer, a_dbms_sql_desc in boolean) return varchar2 is - begin - return case when a_dbms_sql_desc then g_type_name_map(a_type_code) else g_anytype_name_map(a_type_code) end; - end; - - begin - g_anytype_name_map(dbms_types.typecode_date) := 'DATE'; - g_anytype_name_map(dbms_types.typecode_number) := 'NUMBER'; - g_anytype_name_map(dbms_types.typecode_raw) := 'RAW'; - g_anytype_name_map(dbms_types.typecode_char) := 'CHAR'; - g_anytype_name_map(dbms_types.typecode_varchar2) := 'VARCHAR2'; - g_anytype_name_map(dbms_types.typecode_varchar) := 'VARCHAR'; - g_anytype_name_map(dbms_types.typecode_blob) := 'BLOB'; - g_anytype_name_map(dbms_types.typecode_bfile) := 'BFILE'; - g_anytype_name_map(dbms_types.typecode_clob) := 'CLOB'; - g_anytype_name_map(dbms_types.typecode_timestamp) := 'TIMESTAMP'; - g_anytype_name_map(dbms_types.typecode_timestamp_tz) := 'TIMESTAMP WITH TIME ZONE'; - g_anytype_name_map(dbms_types.typecode_timestamp_ltz) := 'TIMESTAMP WITH LOCAL TIME ZONE'; - g_anytype_name_map(dbms_types.typecode_interval_ym) := 'INTERVAL YEAR TO MONTH'; - g_anytype_name_map(dbms_types.typecode_interval_ds) := 'INTERVAL DAY TO SECOND'; - g_anytype_name_map(dbms_types.typecode_bfloat) := 'BINARY_FLOAT'; - g_anytype_name_map(dbms_types.typecode_bdouble) := 'BINARY_DOUBLE'; - g_anytype_name_map(dbms_types.typecode_urowid) := 'UROWID'; - g_anytype_name_map(dbms_types.typecode_varray) := 'VARRRAY'; - g_anytype_name_map(dbms_types.typecode_table) := 'TABLE'; - g_anytype_name_map(dbms_types.typecode_namedcollection) := 'NAMEDCOLLECTION'; - - g_anytype_collection_name(dbms_types.typecode_varray) := 'VARRRAY'; - g_anytype_collection_name(dbms_types.typecode_table) := 'TABLE'; - g_anytype_collection_name(dbms_types.typecode_namedcollection) := 'NAMEDCOLLECTION'; - - - g_type_name_map( dbms_sql.binary_bouble_type ) := 'BINARY_DOUBLE'; - g_type_name_map( dbms_sql.bfile_type ) := 'BFILE'; - g_type_name_map( dbms_sql.binary_float_type ) := 'BINARY_FLOAT'; - g_type_name_map( dbms_sql.blob_type ) := 'BLOB'; - g_type_name_map( dbms_sql.long_raw_type ) := 'LONG RAW'; - g_type_name_map( dbms_sql.char_type ) := 'CHAR'; - g_type_name_map( dbms_sql.clob_type ) := 'CLOB'; - g_type_name_map( dbms_sql.long_type ) := 'LONG'; - g_type_name_map( dbms_sql.date_type ) := 'DATE'; - g_type_name_map( dbms_sql.interval_day_to_second_type ) := 'INTERVAL DAY TO SECOND'; - g_type_name_map( dbms_sql.interval_year_to_month_type ) := 'INTERVAL YEAR TO MONTH'; - g_type_name_map( dbms_sql.raw_type ) := 'RAW'; - g_type_name_map( dbms_sql.timestamp_type ) := 'TIMESTAMP'; - g_type_name_map( dbms_sql.timestamp_with_tz_type ) := 'TIMESTAMP WITH TIME ZONE'; - g_type_name_map( dbms_sql.timestamp_with_local_tz_type ) := 'TIMESTAMP WITH LOCAL TIME ZONE'; - g_type_name_map( dbms_sql.varchar2_type ) := 'VARCHAR2'; - g_type_name_map( dbms_sql.number_type ) := 'NUMBER'; - g_type_name_map( dbms_sql.rowid_type ) := 'ROWID'; - g_type_name_map( dbms_sql.urowid_type ) := 'UROWID'; - g_type_name_map( dbms_sql.user_defined_type ) := 'USER_DEFINED_TYPE'; - g_type_name_map( dbms_sql.ref_type ) := 'REF_TYPE'; - - -end; -/ diff --git a/source/expectations/data_values/ut_curr_usr_compound_helper.pks b/source/expectations/data_values/ut_curr_usr_compound_helper.pks deleted file mode 100644 index 71427b686..000000000 --- a/source/expectations/data_values/ut_curr_usr_compound_helper.pks +++ /dev/null @@ -1,24 +0,0 @@ -create or replace package ut_curr_usr_compound_helper authid current_user is - - function is_sql_compare_allowed(a_type_name varchar2) return boolean; - - function is_sql_compare_int(a_type_name varchar2) return integer; - - function is_collection (a_owner varchar2,a_type_name varchar2, a_anytype_code in integer :=null) return boolean; - - --TODO Depracate once switch fully to type - procedure get_columns_info( - a_cursor in out nocopy sys_refcursor, - a_columns_info out nocopy xmltype, - a_join_by_info out nocopy xmltype, - a_contains_collection out nocopy number - ); - - function get_user_defined_type(a_owner varchar2, a_type_name varchar2) return xmltype; - - function extract_min_col_info(a_full_col_info xmltype) return xmltype; - - function get_column_type_desc(a_type_code in integer, a_dbms_sql_desc in boolean) return varchar2; - -end; -/ diff --git a/source/expectations/data_values/ut_cursor_column.tpb b/source/expectations/data_values/ut_cursor_column.tpb index aba9236cc..a5ae42e62 100644 --- a/source/expectations/data_values/ut_cursor_column.tpb +++ b/source/expectations/data_values/ut_cursor_column.tpb @@ -26,7 +26,7 @@ create or replace type body ut_cursor_column as self.is_sql_diffable := case when lower(self.column_type) = 'user_defined_type' then 0 else - ut_utils.boolean_to_int(ut_curr_usr_compound_helper.is_sql_compare_allowed(self.column_type)) + ut_utils.boolean_to_int(ut_compound_data_helper.is_sql_compare_allowed(self.column_type)) end; --TODO : Part of the constructor same as has nested ?? self.is_collection := a_collection; diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb index 7323d7e13..1c491ab84 100644 --- a/source/expectations/data_values/ut_cursor_details.tpb +++ b/source/expectations/data_values/ut_cursor_details.tpb @@ -82,7 +82,7 @@ create or replace type body ut_cursor_details as a_cursor := dbms_sql.to_refcursor(l_cursor_number); for cur in 1 .. l_columns_count loop - l_is_collection := ut_curr_usr_compound_helper.is_collection(l_columns_desc(cur).col_schema_name,l_columns_desc(cur).col_type_name); + l_is_collection := ut_compound_data_helper.is_collection(l_columns_desc(cur).col_schema_name,l_columns_desc(cur).col_type_name); self.cursor_info.extend; self.cursor_info(cursor_info.last) := ut_cursor_column( l_columns_desc(cur).col_name, l_columns_desc(cur).col_schema_name, @@ -93,7 +93,7 @@ create or replace type body ut_cursor_details as null, 1, cur, - ut_curr_usr_compound_helper.get_column_type_desc(l_columns_desc(cur).col_type,true), + ut_compound_data_helper.get_column_type_desc(l_columns_desc(cur).col_type,true), ut_utils.boolean_to_int(l_is_collection) ); if l_columns_desc(cur).col_type = dbms_sql.user_defined_type and not l_is_collection then @@ -108,7 +108,7 @@ create or replace type body ut_cursor_details as attr_elt_type => l_attr_elt_type, aname => l_aname); - l_is_collection := ut_curr_usr_compound_helper.is_collection(l_columns_desc(cur).col_schema_name,l_columns_desc(cur).col_type_name,l_attribute_typecode); + l_is_collection := ut_compound_data_helper.is_collection(l_columns_desc(cur).col_schema_name,l_columns_desc(cur).col_type_name,l_attribute_typecode); self.cursor_info.extend; self.cursor_info(cursor_info.last) := ut_cursor_column( l_aname, l_columns_desc(cur).col_schema_name, @@ -119,7 +119,7 @@ create or replace type body ut_cursor_details as l_columns_desc(cur).col_name, 2, i, - ut_curr_usr_compound_helper.get_column_type_desc(l_attribute_typecode,false), + ut_compound_data_helper.get_column_type_desc(l_attribute_typecode,false), ut_utils.boolean_to_int(l_is_collection) ); end loop; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 06fe0fdc9..f3fc6ff0f 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -42,11 +42,8 @@ create or replace type body ut_data_value_refcursor as if l_cursor is not null then if l_cursor%isopen then --Get some more info regarding cursor, including if it containts collection columns and what is their name - - ut_curr_usr_compound_helper.get_columns_info(l_cursor,self.col_info_desc,self.key_info, - self.contain_collection); + self.elements_count := 0; - self.columns_info := ut_curr_usr_compound_helper.extract_min_col_info(self.col_info_desc); self.cursor_details := ut_cursor_details(l_cursor); -- We use DBMS_XMLGEN in order to: -- 1) be able to process data in bulks (set of rows) @@ -103,12 +100,19 @@ create or replace type body ut_data_value_refcursor as overriding member function to_string return varchar2 is l_result clob; l_result_string varchar2(32767); + l_cursor_details ut_cursor_column_tab := self.cursor_details.cursor_info; + + l_query varchar2(32767); + l_column_info xmltype; + begin if not self.is_null() then dbms_lob.createtemporary(l_result, true); ut_utils.append_to_clob(l_result, 'Data-types:'||chr(10)); - ut_utils.append_to_clob(l_result, self.columns_info.getclobval()); + + l_column_info := ut_compound_data_helper.getxmlchildren(null,l_cursor_details); + ut_utils.append_to_clob(l_result, l_column_info.getclobval()); ut_utils.append_to_clob(l_result,chr(10)||(self as ut_compound_data_value).to_string()); l_result_string := ut_utils.to_string(l_result,null); dbms_lob.freetemporary(l_result); diff --git a/source/expectations/data_values/ut_data_value_refcursor.tps b/source/expectations/data_values/ut_data_value_refcursor.tps index 2a6b58ba1..f2a748abd 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tps +++ b/source/expectations/data_values/ut_data_value_refcursor.tps @@ -24,26 +24,7 @@ create or replace type ut_data_value_refcursor under ut_compound_data_value( * Determines if the cursor is null */ is_cursor_null integer, - - /** - * hold information if the cursor contains collection object - */ - contain_collection number(1,0), - - /** - * Holds information about column names and column data-types - */ - columns_info xmltype, - - /** - * Holds information about column names and column data-types and also some supporting attributes - */ - col_info_desc xmltype, - /** - * Holds more detailed information regarding the pk joins - */ - key_info xmltype, - + /* *columns info */ diff --git a/source/install.sql b/source/install.sql index 1de0697b2..59283a5de 100644 --- a/source/install.sql +++ b/source/install.sql @@ -199,7 +199,6 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/data_values/ut_key_anyval_pair.tps' @@install_component.sql 'expectations/data_values/ut_key_anyval_pairs.tps' @@install_component.sql 'expectations/data_values/ut_compound_data_helper.pks' -@@install_component.sql 'expectations/data_values/ut_curr_usr_compound_helper.pks' @@install_component.sql 'expectations/matchers/ut_matcher.tps' @@install_component.sql 'expectations/matchers/ut_comparison_matcher.tps' @@install_component.sql 'expectations/matchers/ut_be_false.tps' @@ -224,7 +223,6 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/data_values/ut_data_value.tpb' @@install_component.sql 'expectations/data_values/ut_compound_data_value.tpb' @@install_component.sql 'expectations/data_values/ut_compound_data_helper.pkb' -@@install_component.sql 'expectations/data_values/ut_curr_usr_compound_helper.pkb' @@install_component.sql 'expectations/data_values/ut_data_value_anydata.tpb' @@install_component.sql 'expectations/data_values/ut_data_value_object.tpb' @@install_component.sql 'expectations/data_values/ut_data_value_collection.tpb' diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index f183ce30c..0475e347d 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -279,8 +279,6 @@ drop package ut_coverage_profiler; drop package ut_compound_data_helper; -drop package ut_curr_usr_compound_helper; - drop package ut_coverage_helper_profiler; drop type ut_have_count; diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index 8775b764c..54dafd37a 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -2365,11 +2365,11 @@ Diff:% --Assert l_expected_message := q'[%Actual: (refcursor [ count = % ])% %Data-types:% -%VARCHAR2NUMBER% +%VARCHAR2NUMBER% %Data:% %was expected not to include:(refcursor [ count = 1 ])% %Data-types:% -%CHARNUMBER% +%CHARNUMBER% %Data:% %TEST-600%]'; l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; @@ -2395,11 +2395,11 @@ Diff:% --Assert l_expected_message := q'[%Actual: (refcursor [ count = % ])% %Data-types:% -%VARCHAR2NUMBER% +%VARCHAR2NUMBER% %Data:% %was expected not to include:(refcursor [ count = 1 ])% %Data-types:% -%CHARNUMBER% +%CHARNUMBER% %Data:% %TEST-600%]'; l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; @@ -2449,12 +2449,12 @@ Diff:% --Assert l_expected_message := q'[%Actual: (refcursor [ count = 9 ]) %Data-types: -%NUMBERCHARCHARCHARCHAR +%NUMBERCHARCHARCHARCHAR %Data: %% %was expected not to include:(refcursor [ count = 3 ]) %Data-types: -%NUMBERCHARCHARCHARCHAR +%NUMBERCHARCHARCHARCHAR %Data: %1adxc2adxc3adxc]'; l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; From 29fe2e195eeaffa95e6351f50089af84a1491e27 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Mon, 26 Nov 2018 20:37:23 +0000 Subject: [PATCH 0141/1096] Update stylecheck --- source/expectations/data_values/ut_compound_data_helper.pkb | 6 +++--- source/expectations/data_values/ut_compound_data_helper.pks | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 960da59a1..7d8f89158 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -755,7 +755,7 @@ create or replace package body ut_compound_data_helper is return l_warn_msg; end; - function getxmlchildren(p_parent_name varchar2,a_cursor_table ut_cursor_column_tab) + function getxmlchildren(a_parent_name varchar2,a_cursor_table ut_cursor_column_tab) return xmltype is l_result xmltype; begin @@ -764,8 +764,8 @@ create or replace package body ut_compound_data_helper is getxmlchildren(t.column_name,a_cursor_table))) into l_result from table(a_cursor_table) t - where (p_parent_name is not null and parent_name = p_parent_name) - or (p_parent_name is null and parent_name is null) + where (a_parent_name is not null and parent_name = a_parent_name) + or (a_parent_name is null and parent_name is null) having count(*) > 0; diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 5e8671d13..f4ab72856 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -116,7 +116,7 @@ create or replace package ut_compound_data_helper authid definer is function generate_missing_cols_warn_msg(a_missing_columns ut_varchar2_list,a_attribute in varchar2) return varchar2; - function getxmlchildren(p_parent_name varchar2,a_cursor_table ut_cursor_column_tab) return xmltype; + function getxmlchildren(a_parent_name varchar2,a_cursor_table ut_cursor_column_tab) return xmltype; function is_sql_compare_allowed(a_type_name varchar2) return boolean; From 1c0582b781d76a96d3936d35bd7cd99e90d2c122 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Mon, 26 Nov 2018 20:55:09 +0000 Subject: [PATCH 0142/1096] Update test time exec --- test/core/min_grant_user/test_min_grant_user.pkb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/core/min_grant_user/test_min_grant_user.pkb b/test/core/min_grant_user/test_min_grant_user.pkb index 906906fe1..0955e6313 100644 --- a/test/core/min_grant_user/test_min_grant_user.pkb +++ b/test/core/min_grant_user/test_min_grant_user.pkb @@ -53,7 +53,7 @@ create or replace package body test_min_grant_user is execute immediate 'begin ut3$user#.test_cursor_grants.run(); end;'; l_results := core.get_dbms_output_as_clob(); --Assert - ut.expect( l_results ).to_be_like( '%execute join by test [.% sec]' || + ut.expect( l_results ).to_be_like( '%execute join by test [% sec]' || '%1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%' ); end; From 7837eb46fc3a119c8c6b6419cf0b1da608b4195b Mon Sep 17 00:00:00 2001 From: lwasylow Date: Wed, 28 Nov 2018 12:16:14 +0000 Subject: [PATCH 0143/1096] Anydata refactoring. --- .../data_values/ut_compound_data_helper.pkb | 4 +- .../data_values/ut_cursor_column.tpb | 11 +-- .../data_values/ut_cursor_column.tps | 8 +- .../data_values/ut_cursor_details.tpb | 74 ++++++++-------- .../data_values/ut_cursor_details.tps | 5 +- .../data_values/ut_data_value_refcursor.tpb | 86 ++++++++++--------- .../data_values/ut_data_value_refcursor.tps | 1 + 7 files changed, 96 insertions(+), 93 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 7d8f89158..5c2a881d3 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -623,7 +623,7 @@ create or replace package body ut_compound_data_helper is l_sql varchar2(32767) := get_cursor_vs_list_sql; l_result ut_cursor_column_tab := ut_cursor_column_tab(); begin - l_sql := l_sql || q'[select ut_cursor_column(i.column_name,i.column_schema,i.column_type_name, i.column_prec,i.column_scale,i.column_len, i.parent_name, + l_sql := l_sql || q'[select ut_cursor_column(i.column_name,i.column_schema,i.column_type_name,i.column_len, i.parent_name, i.hierarchy_level,i.column_position, i.column_type, i.is_collection) from t1 join table(:a_cursor_info) i on ( nvl(t1.parent_name,1) = nvl(i.parent_name,1) and t1.column_name = i.column_name)]'; if a_include then @@ -735,7 +735,7 @@ create or replace package body ut_compound_data_helper is function remove_incomparable_cols( a_cursor_details ut_cursor_column_tab,a_incomparable_cols ut_varchar2_list) return ut_cursor_column_tab is l_result ut_cursor_column_tab; begin - select ut_cursor_column(i.column_name,i.column_schema,i.column_type_name, i.column_prec,i.column_scale,i.column_len, i.parent_name, + select ut_cursor_column(i.column_name,i.column_schema,i.column_type_name,i.column_len, i.parent_name, i.hierarchy_level,i.column_position, i.column_type, i.is_collection) bulk collect into l_result from table(a_cursor_details) i diff --git a/source/expectations/data_values/ut_cursor_column.tpb b/source/expectations/data_values/ut_cursor_column.tpb index a5ae42e62..85241804f 100644 --- a/source/expectations/data_values/ut_cursor_column.tpb +++ b/source/expectations/data_values/ut_cursor_column.tpb @@ -2,16 +2,13 @@ create or replace type body ut_cursor_column as member procedure init(self in out nocopy ut_cursor_column, a_col_name varchar2, a_col_schema_name varchar2, - a_col_type_name varchar2, a_col_prec integer, a_col_scale integer, - a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, + a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, a_col_position integer, a_col_type varchar2, a_collection integer) is begin self.parent_name := a_parent_name; self.hierarchy_level := a_hierarchy_level; self.column_position := a_col_position; - self.column_prec := a_col_prec; self.column_len := a_col_max_len; - self.column_scale := a_col_scale; self.column_name := TRIM( BOTH '''' FROM a_col_name); self.column_type_name := a_col_type_name; self.access_path := case when self.parent_name is null then self.column_name else self.parent_name||'/'||self.column_name end; @@ -41,12 +38,10 @@ create or replace type body ut_cursor_column as constructor function ut_cursor_column( self in out nocopy ut_cursor_column, a_col_name varchar2, a_col_schema_name varchar2, - a_col_type_name varchar2, a_col_prec integer, a_col_scale integer, - a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, + a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, a_col_position integer, a_col_type in varchar2, a_collection integer) return self as result is begin - init(a_col_name, a_col_schema_name, a_col_type_name, a_col_prec, - a_col_scale, a_col_max_len, a_parent_name,a_hierarchy_level, a_col_position, a_col_type, a_collection); + init(a_col_name, a_col_schema_name, a_col_type_name, a_col_max_len, a_parent_name,a_hierarchy_level, a_col_position, a_col_type, a_collection); return; end; end; diff --git a/source/expectations/data_values/ut_cursor_column.tps b/source/expectations/data_values/ut_cursor_column.tps index 7782a0d8e..771e20d2c 100644 --- a/source/expectations/data_values/ut_cursor_column.tps +++ b/source/expectations/data_values/ut_cursor_column.tps @@ -11,22 +11,18 @@ create or replace type ut_cursor_column force authid current_user as object column_type varchar2(100), column_type_name varchar2(100), column_schema varchar2(100), - column_prec integer, column_len integer, - column_scale integer, is_sql_diffable number(1, 0), is_collection number(1, 0), member procedure init(self in out nocopy ut_cursor_column, a_col_name varchar2, a_col_schema_name varchar2, - a_col_type_name varchar2, a_col_prec integer, a_col_scale integer, - a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, + a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, a_col_position integer, a_col_type in varchar2, a_collection integer), constructor function ut_cursor_column( self in out nocopy ut_cursor_column, a_col_name varchar2, a_col_schema_name varchar2, - a_col_type_name varchar2, a_col_prec integer, a_col_scale integer, - a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, + a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, a_col_position integer, a_col_type in varchar2, a_collection integer) return self as result ) diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb index 1c491ab84..9044e478a 100644 --- a/source/expectations/data_values/ut_cursor_details.tpb +++ b/source/expectations/data_values/ut_cursor_details.tpb @@ -13,31 +13,45 @@ create or replace type body ut_cursor_details as return l_diffs; end; - - member function get_anytype_attribute_count(a_anytype anytype) return pls_integer is - l_attribute_typecode pls_integer; - l_schema_name varchar2(32767); + + member procedure get_anytype_members_info(a_anytype anytype, a_attribute_typecode out pls_integer, + a_schema_name out varchar2, a_type_name out varchar2, a_len out pls_integer,a_elements_count out pls_integer) is l_version varchar2(32767); - l_type_name varchar2(32767); - l_attributes pls_integer; l_prec pls_integer; l_scale pls_integer; - l_len pls_integer; l_csid pls_integer; l_csfrm pls_integer; begin - l_attribute_typecode := a_anytype.getinfo(prec => l_prec, + a_attribute_typecode := a_anytype.getinfo(prec => l_prec, scale => l_scale, - len => l_len, + len => a_len, csid => l_csid, csfrm => l_csfrm, - schema_name => l_schema_name, - type_name => l_type_name, + schema_name => a_schema_name, + type_name => a_type_name, version => l_version, - numelems => l_attributes); - return l_attributes; + numelems => a_elements_count); end; + member procedure getattreleminfo(a_anytype anytype,a_pos pls_integer, a_attribute_typecode out pls_integer, + a_type_name out varchar2, a_len out pls_integer) is + l_version varchar2(32767); + l_prec pls_integer; + l_scale pls_integer; + l_csid pls_integer; + l_csfrm pls_integer; + l_attr_elt_type anytype; + begin + a_attribute_typecode := a_anytype.getattreleminfo(pos => a_pos, --First attribute + prec => l_prec, + scale => l_scale, + len => a_len, + csid => l_csid, + csfrm => l_csfrm, + attr_elt_type => l_attr_elt_type, + aname => a_type_name); + end; + member function get_user_defined_type(a_owner varchar2, a_type_name varchar2) return anytype is l_anydata anydata; @@ -65,14 +79,12 @@ create or replace type body ut_cursor_details as l_columns_desc dbms_sql.desc_tab3; l_attribute_typecode pls_integer; l_aname varchar2(32767); - l_prec pls_integer; - l_scale pls_integer; l_len pls_integer; - l_csid pls_integer; - l_csfrm pls_integer; - l_attr_elt_type anytype; l_anytype anytype; l_is_collection boolean; + l_elements_count pls_integer; + l_schema_name varchar2(100); + l_type_name varchar2(100); begin self.cursor_info := ut_cursor_column_tab(); l_cursor_number := dbms_sql.to_cursor_number(a_cursor); @@ -87,8 +99,6 @@ create or replace type body ut_cursor_details as self.cursor_info(cursor_info.last) := ut_cursor_column( l_columns_desc(cur).col_name, l_columns_desc(cur).col_schema_name, l_columns_desc(cur).col_type_name, - l_columns_desc(cur).col_precision, - l_columns_desc(cur).col_scale, l_columns_desc(cur).col_max_len, null, 1, @@ -96,25 +106,19 @@ create or replace type body ut_cursor_details as ut_compound_data_helper.get_column_type_desc(l_columns_desc(cur).col_type,true), ut_utils.boolean_to_int(l_is_collection) ); + if l_columns_desc(cur).col_type = dbms_sql.user_defined_type and not l_is_collection then l_anytype := get_user_defined_type(l_columns_desc(cur).col_schema_name , l_columns_desc(cur).col_type_name ); - for i in 1 .. get_anytype_attribute_count(l_anytype) loop - l_attribute_typecode := l_anytype.getattreleminfo(pos => i, --First attribute - prec => l_prec, - scale => l_scale, - len => l_len, - csid => l_csid, - csfrm => l_csfrm, - attr_elt_type => l_attr_elt_type, - aname => l_aname); - - l_is_collection := ut_compound_data_helper.is_collection(l_columns_desc(cur).col_schema_name,l_columns_desc(cur).col_type_name,l_attribute_typecode); - self.cursor_info.extend; - self.cursor_info(cursor_info.last) := ut_cursor_column( l_aname, + + get_anytype_members_info(l_anytype,l_attribute_typecode,l_schema_name,l_type_name,l_len,l_elements_count); + + for i in 1 .. l_elements_count loop + getattreleminfo(l_anytype,i,l_attribute_typecode,l_aname,l_len); + l_is_collection := ut_compound_data_helper.is_collection(l_columns_desc(cur).col_schema_name,l_columns_desc(cur).col_type_name,l_attribute_typecode); + self.cursor_info.extend; + self.cursor_info(cursor_info.last) := ut_cursor_column( l_aname, l_columns_desc(cur).col_schema_name, null, - l_prec, - l_scale, l_len, l_columns_desc(cur).col_name, 2, diff --git a/source/expectations/data_values/ut_cursor_details.tps b/source/expectations/data_values/ut_cursor_details.tps index 2cb77dade..7fd2a478e 100644 --- a/source/expectations/data_values/ut_cursor_details.tps +++ b/source/expectations/data_values/ut_cursor_details.tps @@ -2,7 +2,10 @@ create or replace type ut_cursor_details force authid current_user as object ( cursor_info ut_cursor_column_tab, order member function compare(a_other ut_cursor_details) return integer, - member function get_anytype_attribute_count(a_anytype anytype) return pls_integer, + member procedure get_anytype_members_info(a_anytype anytype, a_attribute_typecode out pls_integer, + a_schema_name out varchar2, a_type_name out varchar2, a_len out pls_integer,a_elements_count out pls_integer), + member procedure getattreleminfo(a_anytype anytype,a_pos pls_integer, a_attribute_typecode out pls_integer, + a_type_name out varchar2, a_len out pls_integer), member function get_user_defined_type(a_owner varchar2, a_type_name varchar2) return anytype, constructor function ut_cursor_details(self in out nocopy ut_cursor_details,a_cursor in out nocopy sys_refcursor) return self as result diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index f3fc6ff0f..cc2e92710 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -22,16 +22,55 @@ create or replace type body ut_data_value_refcursor as return; end; - member procedure init(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) is + member procedure extract_cursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) is c_bulk_rows constant integer := 10000; l_cursor sys_refcursor := a_value; l_ctx number; l_xml xmltype; - l_current_date_format varchar2(4000); - cursor_not_open exception; l_ut_owner varchar2(250) := ut_utils.ut_owner; l_set_id integer := 0; + begin + -- We use DBMS_XMLGEN in order to: + -- 1) be able to process data in bulks (set of rows) + -- 2) be able to influence the ROWSET/ROW tags + -- 3) be able to influence the way NULL values are handled (empty TAG) + -- 4) be able to influence the way TIMESTAMP is formatted. + -- Due to Oracle feature/bug, it is not possible to change the DATE formatting of cursor data + -- AFTER the cursor was opened. + -- The only solution for this is to change NLS settings before opening the cursor. + -- + -- This would work fine if we could use DBMS_XMLGEN.restartQuery. + -- The restartQuery fails however if PLSQL variables of TIMESTAMP/INTERVAL or CLOB/BLOB are used. + ut_expectation_processor.set_xml_nls_params(); + l_ctx := dbms_xmlgen.newContext(l_cursor); + dbms_xmlgen.setNullHandling(l_ctx, dbms_xmlgen.empty_tag); + dbms_xmlgen.setMaxRows(l_ctx, c_bulk_rows); + + loop + l_xml := dbms_xmlgen.getxmltype(l_ctx); + exit when dbms_xmlgen.getNumRowsProcessed(l_ctx) = 0; + + self.elements_count := self.elements_count + dbms_xmlgen.getNumRowsProcessed(l_ctx); + execute immediate + 'insert into ' || l_ut_owner || '.ut_compound_data_tmp(data_id, item_no, item_data) ' || + 'values (:self_guid, :self_row_count, :l_xml)' + using in self.data_id, l_set_id, l_xml; + + l_set_id := l_set_id + c_bulk_rows; + end loop; + + ut_expectation_processor.reset_nls_params(); + dbms_xmlgen.closeContext(l_ctx); + exception + when others then + ut_expectation_processor.reset_nls_params(); + dbms_xmlgen.closeContext(l_ctx); + raise; + end; + member procedure init(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) is + l_cursor sys_refcursor := a_value; + cursor_not_open exception; begin self.is_data_null := ut_utils.boolean_to_int(a_value is null); self.self_type := $$plsql_unit; @@ -41,46 +80,13 @@ create or replace type body ut_data_value_refcursor as if l_cursor is not null then if l_cursor%isopen then - --Get some more info regarding cursor, including if it containts collection columns and what is their name - + --Get some more info regarding cursor, including if it containts collection columns and what is their name self.elements_count := 0; self.cursor_details := ut_cursor_details(l_cursor); - -- We use DBMS_XMLGEN in order to: - -- 1) be able to process data in bulks (set of rows) - -- 2) be able to influence the ROWSET/ROW tags - -- 3) be able to influence the way NULL values are handled (empty TAG) - -- 4) be able to influence the way TIMESTAMP is formatted. - -- Due to Oracle feature/bug, it is not possible to change the DATE formatting of cursor data - -- AFTER the cursor was opened. - -- The only solution for this is to change NLS settings before opening the cursor. - -- - -- This would work fine if we could use DBMS_XMLGEN.restartQuery. - -- The restartQuery fails however if PLSQL variables of TIMESTAMP/INTERVAL or CLOB/BLOB are used. - - ut_expectation_processor.set_xml_nls_params(); - l_ctx := dbms_xmlgen.newContext(l_cursor); - dbms_xmlgen.setNullHandling(l_ctx, dbms_xmlgen.empty_tag); - dbms_xmlgen.setMaxRows(l_ctx, c_bulk_rows); - - loop - l_xml := dbms_xmlgen.getxmltype(l_ctx); - exit when dbms_xmlgen.getNumRowsProcessed(l_ctx) = 0; - - self.elements_count := self.elements_count + dbms_xmlgen.getNumRowsProcessed(l_ctx); - execute immediate - 'insert into ' || l_ut_owner || '.ut_compound_data_tmp(data_id, item_no, item_data) ' || - 'values (:self_guid, :self_row_count, :l_xml)' - using in self.data_id, l_set_id, l_xml; - - l_set_id := l_set_id + c_bulk_rows; - end loop; - - ut_expectation_processor.reset_nls_params(); + extract_cursor(l_cursor); if l_cursor%isopen then close l_cursor; - end if; - dbms_xmlgen.closeContext(l_ctx); - + end if; elsif not l_cursor%isopen then raise cursor_not_open; end if; @@ -89,11 +95,9 @@ create or replace type body ut_data_value_refcursor as when cursor_not_open then raise_application_error(-20155, 'Cursor is not open'); when others then - ut_expectation_processor.reset_nls_params(); if l_cursor%isopen then close l_cursor; end if; - dbms_xmlgen.closeContext(l_ctx); raise; end; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tps b/source/expectations/data_values/ut_data_value_refcursor.tps index f2a748abd..c3270270f 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tps +++ b/source/expectations/data_values/ut_data_value_refcursor.tps @@ -31,6 +31,7 @@ create or replace type ut_data_value_refcursor under ut_compound_data_value( cursor_details ut_cursor_details, constructor function ut_data_value_refcursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) return self as result, + member procedure extract_cursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor), member procedure init(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor), overriding member function to_string return varchar2, member function diff( a_other ut_data_value, a_unordered boolean := false, a_join_by_list ut_varchar2_list:=ut_varchar2_list() ) return varchar2, From e082b75c89340b75df3df8e5b33e08f93f851b01 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sat, 1 Dec 2018 19:55:43 +0000 Subject: [PATCH 0144/1096] Improvements to extraction of cursor details using anydata to allow get into any level of depth ( fix issue with collection object). Simplify a way the cursor filter is done and check for missing column. Full access path is capture as part of cursor describe. Removal of nft test for over 10k rows. --- .../data_values/ut_compound_data_helper.pkb | 105 +++++------ .../data_values/ut_compound_data_helper.pks | 7 +- .../data_values/ut_cursor_column.tpb | 47 ++--- .../data_values/ut_cursor_column.tps | 8 +- .../data_values/ut_cursor_details.tpb | 171 +++++++++++++----- .../data_values/ut_cursor_details.tps | 11 +- .../data_values/ut_data_value_refcursor.tpb | 18 +- .../expectations/test_expectations_cursor.pkb | 45 +---- .../expectations/test_expectations_cursor.pks | 9 - 9 files changed, 224 insertions(+), 197 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 5c2a881d3..5e97cf275 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -375,7 +375,6 @@ create or replace package body ut_compound_data_helper is l_temp_string := ' (a.data_id is null or e.data_id is null) '; end if; ut_utils.append_to_clob(l_compare_sql,l_temp_string); - return l_compare_sql; end; @@ -402,7 +401,6 @@ create or replace package body ut_compound_data_helper is l_results tt_row_diffs; l_sql varchar2(32767); begin - l_sql := q'[with exp as ( select exp_item_data, exp_data_id, item_no rn,rownum col_no, pk_value, s.column_value col, s.column_value.getRootElement() col_name, s.column_value.getclobval() col_val @@ -563,7 +561,7 @@ create or replace package body ut_compound_data_helper is return dbms_crypto.hash(a_data, a_hash_type); end; - function get_fixed_size_hash(a_string varchar2, a_base integer :=0,a_size integer :=30) return number is + function get_fixed_size_hash(a_string varchar2, a_base integer :=0,a_size integer := 9999999) return number is begin return dbms_utility.get_hash_value(a_string,a_base,a_size); end; @@ -595,69 +593,42 @@ create or replace package body ut_compound_data_helper is return g_diff_count; end; - function get_cursor_vs_list_sql return varchar2 is - l_sql varchar2(32767) := - q'[with - sorted as - (select r_num,regexp_substr(t.column_value, '[^/]+', 1, commas.column_value) as colval,commas.column_value lev, - t.column_value access_path - from (select row_number() over(order by 1) r_num, column_value from ((table(:a_current_list)))) t, - table(cast(multiset - (select level from dual connect by level <= length(regexp_replace(t.column_value,'[^/]+')) + 1) as sys.odcinumberlist)) commas - order by r_num,lev), - hier as - (select r_num,lev,colval column_name,lag(colval, 1) over(partition by r_num order by lev) parent_name , access_path - from sorted), - constructed as ( - select lev,column_name,parent_name,access_path from hier), - t1(column_name, parent_name) AS ( - select column_name,parent_name from table(:a_cursor_info) where parent_name is null - union all - select t2.column_name,t2.parent_name from table(:a_cursor_info) t2, t1 where t2.parent_name = t1.column_name)]'; - begin - return l_sql; - end; - + --Filter out columns from cursor based on include (exists) or exclude (not exists) function filter_out_cols(a_cursor_info ut_cursor_column_tab, a_current_list ut_varchar2_list,a_include boolean := true) return ut_cursor_column_tab is - l_sql varchar2(32767) := get_cursor_vs_list_sql; l_result ut_cursor_column_tab := ut_cursor_column_tab(); - begin - l_sql := l_sql || q'[select ut_cursor_column(i.column_name,i.column_schema,i.column_type_name,i.column_len, i.parent_name, - i.hierarchy_level,i.column_position, i.column_type, i.is_collection) - from t1 join table(:a_cursor_info) i on ( nvl(t1.parent_name,1) = nvl(i.parent_name,1) and t1.column_name = i.column_name)]'; - if a_include then - l_sql := l_sql || ' join constructed c on ( nvl(t1.parent_name,1) = nvl(c.parent_name,1) and t1.column_name = c.column_name)'; - else - l_sql := l_sql ||' left outer join constructed c on ( nvl(t1.parent_name,1) = nvl(c.parent_name,1) and t1.column_name = c.column_name) - where c.column_name is null'; - end if; - - execute immediate l_sql bulk collect into l_result - using a_current_list,a_cursor_info,a_cursor_info,a_cursor_info; + l_filter_sql varchar2(32767); + begin + l_filter_sql := + q'[with + coltab as ( + select i.parent_name,i.access_path,i.has_nested_col,i.transformed_name,i.hierarchy_level,i.column_position , + i.xml_valid_name,i.column_name,i.column_type,i.column_type_name ,i.column_schema,i.column_len,i.is_sql_diffable ,i.is_collection + from table(:cursor_info) i), + filter as (select column_value from table(:current_list)) + select ut_cursor_column(i.parent_name,i.access_path,i.has_nested_col,i.transformed_name,i.hierarchy_level,i.column_position , + i.xml_valid_name,i.column_name,i.column_type,i.column_type_name ,i.column_schema,i.column_len,i.is_sql_diffable ,i.is_collection) + from coltab i where ]'||case when a_include then null else ' not ' end + ||q'[exists (select 1 from filter f where regexp_like(i.access_path, '^'||f.column_value||'($|/.*)'))]'; + execute immediate l_filter_sql bulk collect into l_result using a_cursor_info,a_current_list; return l_result; end; - - function compare_cursor_to_columns(a_cursor_info ut_cursor_column_tab, a_current_list ut_varchar2_list) - return ut_varchar2_list is - l_sql varchar2(32767) := get_cursor_vs_list_sql; + + function get_missing_filter_columns(a_cursor_info ut_cursor_column_tab, a_column_filter_list ut_varchar2_list) return ut_varchar2_list is l_result ut_varchar2_list := ut_varchar2_list(); - begin - l_sql := l_sql || q'[select c.access_path - from t1 join table(:a_cursor_info) i on ( nvl(t1.parent_name,1) = nvl(i.parent_name,1) and t1.column_name = i.column_name)]'; - l_sql := l_sql ||'right outer join constructed c on ( nvl(t1.parent_name,1) = nvl(c.parent_name,1) and t1.column_name = c.column_name) - where t1.column_name is null'; - - execute immediate l_sql bulk collect into l_result - using a_current_list,a_cursor_info,a_cursor_info,a_cursor_info; - return l_result; + begin + select fl.column_value + bulk collect into l_result + from table(a_column_filter_list) fl + where not exists (select 1 from table(a_cursor_info) c where regexp_like(c.access_path, '^'||fl.column_value||'($|/.*)')); + return l_result; end; - + function get_missing_pk(a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab, a_current_list ut_varchar2_list) return tt_missing_pk is - l_actual ut_varchar2_list := coalesce(compare_cursor_to_columns(a_actual,a_current_list),ut_varchar2_list()); - l_expected ut_varchar2_list := coalesce(compare_cursor_to_columns(a_expected,a_current_list),ut_varchar2_list()); + l_actual ut_varchar2_list := coalesce(get_missing_filter_columns(a_actual,a_current_list),ut_varchar2_list()); + l_expected ut_varchar2_list := coalesce(get_missing_filter_columns(a_expected,a_current_list),ut_varchar2_list()); l_missing_pk tt_missing_pk; begin select name,type @@ -735,14 +706,14 @@ create or replace package body ut_compound_data_helper is function remove_incomparable_cols( a_cursor_details ut_cursor_column_tab,a_incomparable_cols ut_varchar2_list) return ut_cursor_column_tab is l_result ut_cursor_column_tab; begin - select ut_cursor_column(i.column_name,i.column_schema,i.column_type_name,i.column_len, i.parent_name, - i.hierarchy_level,i.column_position, i.column_type, i.is_collection) + select ut_cursor_column(i.parent_name,i.access_path,i.has_nested_col,i.transformed_name,i.hierarchy_level,i.column_position , + i.xml_valid_name,i.column_name,i.column_type,i.column_type_name ,i.column_schema,i.column_len,i.is_sql_diffable ,i.is_collection) bulk collect into l_result from table(a_cursor_details) i left outer join table(a_incomparable_cols) c on (i.access_path = c.column_value) where c.column_value is null; - + return l_result; end; @@ -759,13 +730,12 @@ create or replace package body ut_compound_data_helper is return xmltype is l_result xmltype; begin - select xmlagg(xmlelement(evalname t.column_name,t.column_type, getxmlchildren(t.column_name,a_cursor_table))) into l_result from table(a_cursor_table) t - where (a_parent_name is not null and parent_name = a_parent_name) - or (a_parent_name is null and parent_name is null) + where (a_parent_name is not null and parent_name = a_parent_name and hierarchy_level > 1 and column_name is not null) + or (a_parent_name is null and parent_name is null and hierarchy_level = 1 and column_name is not null) having count(*) > 0; @@ -805,6 +775,14 @@ create or replace package body ut_compound_data_helper is return false; end; + function is_collection (a_anytype_code in integer) return boolean is + l_type_view varchar2(200) := ut_metadata.get_dba_view('dba_types'); + l_typecode varchar2(100); + begin + return a_anytype_code in (dbms_types.typecode_varray,dbms_types.typecode_table,dbms_types.typecode_namedcollection); + end; + + --TODO Look at simplify that option function get_column_type_desc(a_type_code in integer, a_dbms_sql_desc in boolean) return varchar2 is begin return case when a_dbms_sql_desc then g_type_name_map(a_type_code) else g_anytype_name_map(a_type_code) end; @@ -832,7 +810,8 @@ begin g_anytype_name_map(dbms_types.typecode_varray) := 'VARRRAY'; g_anytype_name_map(dbms_types.typecode_table) := 'TABLE'; g_anytype_name_map(dbms_types.typecode_namedcollection) := 'NAMEDCOLLECTION'; - + g_anytype_name_map(dbms_types.typecode_object) := 'OBJECT'; + g_type_name_map( dbms_sql.binary_bouble_type ) := 'BINARY_DOUBLE'; g_type_name_map( dbms_sql.bfile_type ) := 'BFILE'; g_type_name_map( dbms_sql.binary_float_type ) := 'BINARY_FLOAT'; diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index f4ab72856..858c22fe0 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -83,7 +83,7 @@ create or replace package ut_compound_data_helper authid definer is function get_hash(a_data raw, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash; function get_hash(a_data clob, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash; - function get_fixed_size_hash(a_string varchar2, a_base integer :=0,a_size integer :=30) return number; + function get_fixed_size_hash(a_string varchar2, a_base integer :=0,a_size integer :=9999999) return number; function gen_compare_sql(a_inclusion_type boolean, a_is_negated boolean, a_unordered boolean, a_other ut_data_value_refcursor :=null, a_join_by_list ut_varchar2_list:=ut_varchar2_list() ) return clob; @@ -99,9 +99,6 @@ create or replace package ut_compound_data_helper authid definer is function filter_out_cols(a_cursor_info ut_cursor_column_tab, a_current_list ut_varchar2_list,a_include boolean := true) return ut_cursor_column_tab; - function compare_cursor_to_columns(a_cursor_info ut_cursor_column_tab, a_current_list ut_varchar2_list) - return ut_varchar2_list; - function get_missing_pk(a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab, a_current_list ut_varchar2_list) return tt_missing_pk; @@ -122,6 +119,8 @@ create or replace package ut_compound_data_helper authid definer is function is_collection (a_owner varchar2,a_type_name varchar2, a_anytype_code in integer :=null) return boolean; + function is_collection (a_anytype_code in integer) return boolean; + function get_column_type_desc(a_type_code in integer, a_dbms_sql_desc in boolean) return varchar2; end; diff --git a/source/expectations/data_values/ut_cursor_column.tpb b/source/expectations/data_values/ut_cursor_column.tpb index 85241804f..46f589feb 100644 --- a/source/expectations/data_values/ut_cursor_column.tpb +++ b/source/expectations/data_values/ut_cursor_column.tpb @@ -3,46 +3,49 @@ create or replace type body ut_cursor_column as member procedure init(self in out nocopy ut_cursor_column, a_col_name varchar2, a_col_schema_name varchar2, a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, - a_col_position integer, a_col_type varchar2, a_collection integer) is + a_col_position integer, a_col_type varchar2, a_collection integer,a_access_path in varchar2) is begin - self.parent_name := a_parent_name; - self.hierarchy_level := a_hierarchy_level; - self.column_position := a_col_position; - self.column_len := a_col_max_len; - self.column_name := TRIM( BOTH '''' FROM a_col_name); - self.column_type_name := a_col_type_name; - self.access_path := case when self.parent_name is null then self.column_name else self.parent_name||'/'||self.column_name end; - self.xml_valid_name := '"'||self.column_name||'"'; + self.parent_name := a_parent_name; --Name of the parent if its nested + self.hierarchy_level := a_hierarchy_level; --Hierarchy level + self.column_position := a_col_position; --Position of the column in cursor/ type + self.column_len := a_col_max_len; --length of column + self.column_name := TRIM( BOTH '''' FROM a_col_name); --name of the column + self.column_type_name := a_col_type_name; --type name e.g. test_dummy_object or varchar2 + self.access_path := case when a_access_path is null then + self.column_name + else + a_access_path||'/'||self.column_name + end; --Access path used for incldue exclude eg/ TEST_DUMMY_OBJECT/VARCHAR2 + self.xml_valid_name := '"'||self.column_name||'"'; --User friendly column name self.transformed_name := case when self.parent_name is null then self.xml_valid_name else '"'||ut_compound_data_helper.get_fixed_size_hash(self.parent_name||self.column_name)||'"' - end; - self.column_type := a_col_type; - self.column_schema := a_col_schema_name; + end; --when is nestd we need to hash name to make sure we dont exceed 30 char + self.column_type := a_col_type; --column type e.g. user_defined , varchar2 + self.column_schema := a_col_schema_name; -- schema name self.is_sql_diffable := case when lower(self.column_type) = 'user_defined_type' then 0 else ut_utils.boolean_to_int(ut_compound_data_helper.is_sql_compare_allowed(self.column_type)) - end; - --TODO : Part of the constructor same as has nested ?? + end; --can we directly compare or do we need to hash value self.is_collection := a_collection; --TODO : fix that as is nasty hardcode self.has_nested_col := case when lower(self.column_type) = 'user_defined_type' and self.is_collection = 0 then 1 else 0 end; end; - - --TODO : Scenarios : - --namedcollection xmltype getclobhash - --collection xml type get clob hash - -- user defined type - + constructor function ut_cursor_column( self in out nocopy ut_cursor_column, a_col_name varchar2, a_col_schema_name varchar2, a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, - a_col_position integer, a_col_type in varchar2, a_collection integer) return self as result is + a_col_position integer, a_col_type in varchar2, a_collection integer,a_access_path in varchar2) return self as result is begin - init(a_col_name, a_col_schema_name, a_col_type_name, a_col_max_len, a_parent_name,a_hierarchy_level, a_col_position, a_col_type, a_collection); + init(a_col_name, a_col_schema_name, a_col_type_name, a_col_max_len, a_parent_name,a_hierarchy_level, a_col_position, a_col_type, a_collection,a_access_path); return; end; + + constructor function ut_cursor_column( self in out nocopy ut_cursor_column) return self as result is + begin + return; + end; end; / diff --git a/source/expectations/data_values/ut_cursor_column.tps b/source/expectations/data_values/ut_cursor_column.tps index 771e20d2c..6a4929d2d 100644 --- a/source/expectations/data_values/ut_cursor_column.tps +++ b/source/expectations/data_values/ut_cursor_column.tps @@ -18,12 +18,14 @@ create or replace type ut_cursor_column force authid current_user as object member procedure init(self in out nocopy ut_cursor_column, a_col_name varchar2, a_col_schema_name varchar2, a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, - a_col_position integer, a_col_type in varchar2, a_collection integer), + a_col_position integer, a_col_type in varchar2, a_collection integer,a_access_path in varchar2), constructor function ut_cursor_column( self in out nocopy ut_cursor_column, a_col_name varchar2, a_col_schema_name varchar2, a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, - a_col_position integer, a_col_type in varchar2, a_collection integer) - return self as result + a_col_position integer, a_col_type in varchar2, a_collection integer,a_access_path in varchar2) + return self as result, + + constructor function ut_cursor_column( self in out nocopy ut_cursor_column) return self as result ) / diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb index 9044e478a..eba4bc884 100644 --- a/source/expectations/data_values/ut_cursor_details.tpb +++ b/source/expectations/data_values/ut_cursor_details.tpb @@ -2,15 +2,13 @@ create or replace type body ut_cursor_details as order member function compare(a_other ut_cursor_details) return integer is l_diffs integer; - begin - + begin select count(1) into l_diffs from table(self.cursor_info) a full outer join table(a_other.cursor_info) e on ( decode(a.parent_name,e.parent_name,1,0)= 1 and a.column_name = e.column_name and REPLACE(a.column_type,'VARCHAR2','CHAR') = REPLACE(e.column_type,'VARCHAR2','CHAR') and a.column_position = e.column_position ) - where a.column_name is null or e.column_name is null; - + where a.column_name is null or e.column_name is null; return l_diffs; end; @@ -34,7 +32,7 @@ create or replace type body ut_cursor_details as end; member procedure getattreleminfo(a_anytype anytype,a_pos pls_integer, a_attribute_typecode out pls_integer, - a_type_name out varchar2, a_len out pls_integer) is + a_type_name out varchar2, a_len out pls_integer, a_attr_elt_type out anytype) is l_version varchar2(32767); l_prec pls_integer; l_scale pls_integer; @@ -70,29 +68,133 @@ create or replace type body ut_cursor_details as return l_anytype; end; + + member function get_user_defined_type(a_data anydata) return anytype is + l_anytype anytype; + l_typecode pls_integer; + begin + l_typecode:=a_data.gettype(l_anytype); + return l_anytype; + end; + + member function get_anydata_from_compound_data(a_owner varchar2, a_type_name varchar2,a_type varchar2) return anydata is + l_anydata anydata; + begin + execute immediate ' + declare + l_obj '||a_owner||'.'||a_type_name||'; + begin + :anydata := sys.anydata.convert'||a_type||'(l_obj); + end;' + using out l_anydata; + return l_anydata; + end; + + member function get_anytype_of_coll_element(a_collection_owner in varchar2, a_collection_name in varchar2) + return anytype is + l_anytype anytype; + l_anydata anydata; + l_owner varchar2(100); + l_type_name varchar2(100); + begin + l_anydata := get_anydata_from_compound_data(a_collection_owner,a_collection_name,'collection'); + execute immediate' + declare + l_data '||a_collection_owner||'.'||a_collection_name||'; + l_value anydata := :a_value; + l_status integer; + l_loc_query sys_refcursor; + l_cursor_number number; + l_columns_count pls_integer; + l_columns_desc dbms_sql.desc_tab3; + begin + l_status := l_value.getcollection(l_data); + l_data := '||a_collection_owner||'.'||a_collection_name||q'[(); + l_data.extend; + open l_loc_query for select l_data(1) from dual; + l_cursor_number := dbms_sql.to_cursor_number(l_loc_query); + dbms_sql.describe_columns3(l_cursor_number, + l_columns_count, + l_columns_desc); + :owner := l_columns_desc(1).col_schema_name; + :type_name := l_columns_desc(1).col_type_name; + dbms_sql.close_cursor(l_cursor_number); + end;]' using l_anydata, out l_owner,out l_type_name; + l_anytype := get_user_defined_type(l_owner, l_type_name); + return l_anytype; + end; + + member procedure desc_compound_data(self in out nocopy ut_cursor_details,a_compound_data anytype, + a_parent_name in varchar2,a_level in integer, a_access_path in varchar2) is + l_idx pls_integer := 1; + l_elements_count pls_integer; + l_attribute_typecode pls_integer; + l_aname varchar2(32767); + l_len pls_integer; + l_is_collection boolean; + l_schema_name varchar2(100); + l_hierarchy_level integer := a_level; + l_object_type varchar2(10); + l_anydata anydata; + l_attr_elt_type anytype; + begin + get_anytype_members_info(a_compound_data,l_attribute_typecode,l_schema_name,l_aname,l_len,l_elements_count); + while l_idx <= nvl(l_elements_count,1) loop + if l_elements_count is not null then + getattreleminfo(a_compound_data,l_idx,l_attribute_typecode,l_aname,l_len,l_attr_elt_type); + elsif l_attribute_typecode in (dbms_types.typecode_table, dbms_types.typecode_varray, dbms_types.typecode_namedcollection) then + l_attr_elt_type := get_anytype_of_coll_element(l_schema_name, l_aname); + end if; + + l_is_collection := ut_compound_data_helper.is_collection(l_attribute_typecode); + self.cursor_info.extend; + self.cursor_info(cursor_info.last) := ut_cursor_column( l_aname, + l_schema_name, + null, + l_len, + a_parent_name, + l_hierarchy_level, + l_idx, + ut_compound_data_helper.get_column_type_desc(l_attribute_typecode,false), + ut_utils.boolean_to_int(l_is_collection), + a_access_path + ); + if l_attr_elt_type is not null then + desc_compound_data(l_attr_elt_type,l_aname,l_hierarchy_level+1,a_access_path||'/'||l_aname); + end if; + l_idx := l_idx + 1; + end loop; + end; + + constructor function ut_cursor_details(self in out nocopy ut_cursor_details) return self as result is + begin + self.cursor_info := ut_cursor_column_tab(); + return; + end; - constructor function ut_cursor_details(self in out nocopy ut_cursor_details, - a_cursor in out nocopy sys_refcursor) + constructor function ut_cursor_details(self in out nocopy ut_cursor_details + ,a_cursor_number in number) return self as result is l_cursor_number integer; l_columns_count pls_integer; l_columns_desc dbms_sql.desc_tab3; - l_attribute_typecode pls_integer; - l_aname varchar2(32767); - l_len pls_integer; - l_anytype anytype; + l_anydata anydata; l_is_collection boolean; - l_elements_count pls_integer; - l_schema_name varchar2(100); - l_type_name varchar2(100); + l_object_type varchar2(10); + l_hierarchy_level integer := 1; + l_anytype anytype; begin self.cursor_info := ut_cursor_column_tab(); - l_cursor_number := dbms_sql.to_cursor_number(a_cursor); - dbms_sql.describe_columns3(l_cursor_number, + dbms_sql.describe_columns3(a_cursor_number, l_columns_count, l_columns_desc); - a_cursor := dbms_sql.to_refcursor(l_cursor_number); - + + /** + * Due to a bug with object being part of cursor in anydata scanario + * oracle fails to revert number to cursor. We ar using dbms_sql.close cursor to close it + * to avoid leaving open cursors behind. + * a_cursor := dbms_sql.to_refcursor(l_cursor_number); + **/ for cur in 1 .. l_columns_count loop l_is_collection := ut_compound_data_helper.is_collection(l_columns_desc(cur).col_schema_name,l_columns_desc(cur).col_type_name); self.cursor_info.extend; @@ -101,36 +203,23 @@ create or replace type body ut_cursor_details as l_columns_desc(cur).col_type_name, l_columns_desc(cur).col_max_len, null, - 1, + l_hierarchy_level, cur, ut_compound_data_helper.get_column_type_desc(l_columns_desc(cur).col_type,true), - ut_utils.boolean_to_int(l_is_collection) + ut_utils.boolean_to_int(l_is_collection), + null ); - if l_columns_desc(cur).col_type = dbms_sql.user_defined_type and not l_is_collection then - l_anytype := get_user_defined_type(l_columns_desc(cur).col_schema_name , l_columns_desc(cur).col_type_name ); - - get_anytype_members_info(l_anytype,l_attribute_typecode,l_schema_name,l_type_name,l_len,l_elements_count); - - for i in 1 .. l_elements_count loop - getattreleminfo(l_anytype,i,l_attribute_typecode,l_aname,l_len); - l_is_collection := ut_compound_data_helper.is_collection(l_columns_desc(cur).col_schema_name,l_columns_desc(cur).col_type_name,l_attribute_typecode); - self.cursor_info.extend; - self.cursor_info(cursor_info.last) := ut_cursor_column( l_aname, - l_columns_desc(cur).col_schema_name, - null, - l_len, - l_columns_desc(cur).col_name, - 2, - i, - ut_compound_data_helper.get_column_type_desc(l_attribute_typecode,false), - ut_utils.boolean_to_int(l_is_collection) - ); - end loop; + if l_columns_desc(cur).col_type = dbms_sql.user_defined_type or l_is_collection then + l_object_type := case when l_is_collection then 'collection' else 'object' end; + l_anydata := get_anydata_from_compound_data(l_columns_desc(cur).col_schema_name, l_columns_desc(cur).col_type_name, + l_object_type); + l_anytype := get_user_defined_type(l_anydata); + desc_compound_data(l_anytype,l_columns_desc(cur).col_name,l_hierarchy_level+1,l_columns_desc(cur).col_name); end if; end loop; - return; end; + end; / diff --git a/source/expectations/data_values/ut_cursor_details.tps b/source/expectations/data_values/ut_cursor_details.tps index 7fd2a478e..b38fec0fb 100644 --- a/source/expectations/data_values/ut_cursor_details.tps +++ b/source/expectations/data_values/ut_cursor_details.tps @@ -5,9 +5,16 @@ create or replace type ut_cursor_details force authid current_user as object member procedure get_anytype_members_info(a_anytype anytype, a_attribute_typecode out pls_integer, a_schema_name out varchar2, a_type_name out varchar2, a_len out pls_integer,a_elements_count out pls_integer), member procedure getattreleminfo(a_anytype anytype,a_pos pls_integer, a_attribute_typecode out pls_integer, - a_type_name out varchar2, a_len out pls_integer), + a_type_name out varchar2, a_len out pls_integer,a_attr_elt_type out anytype), + member function get_anytype_of_coll_element(a_collection_owner in varchar2, a_collection_name in varchar2) + return anytype, + member procedure desc_compound_data(self in out nocopy ut_cursor_details,a_compound_data anytype, + a_parent_name in varchar2,a_level in integer,a_access_path in varchar2), + member function get_anydata_from_compound_data(a_owner varchar2, a_type_name varchar2,a_type varchar2) return anydata, member function get_user_defined_type(a_owner varchar2, a_type_name varchar2) return anytype, - constructor function ut_cursor_details(self in out nocopy ut_cursor_details,a_cursor in out nocopy sys_refcursor) + member function get_user_defined_type(a_data anydata) return anytype, + constructor function ut_cursor_details(self in out nocopy ut_cursor_details) return self as result, + constructor function ut_cursor_details(self in out nocopy ut_cursor_details,a_cursor_number in number) return self as result ) / diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index cc2e92710..5738638ec 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -41,11 +41,11 @@ create or replace type body ut_data_value_refcursor as -- -- This would work fine if we could use DBMS_XMLGEN.restartQuery. -- The restartQuery fails however if PLSQL variables of TIMESTAMP/INTERVAL or CLOB/BLOB are used. + ut_expectation_processor.set_xml_nls_params(); l_ctx := dbms_xmlgen.newContext(l_cursor); dbms_xmlgen.setNullHandling(l_ctx, dbms_xmlgen.empty_tag); - dbms_xmlgen.setMaxRows(l_ctx, c_bulk_rows); - + dbms_xmlgen.setMaxRows(l_ctx, c_bulk_rows); loop l_xml := dbms_xmlgen.getxmltype(l_ctx); exit when dbms_xmlgen.getNumRowsProcessed(l_ctx) = 0; @@ -54,11 +54,9 @@ create or replace type body ut_data_value_refcursor as execute immediate 'insert into ' || l_ut_owner || '.ut_compound_data_tmp(data_id, item_no, item_data) ' || 'values (:self_guid, :self_row_count, :l_xml)' - using in self.data_id, l_set_id, l_xml; - - l_set_id := l_set_id + c_bulk_rows; + using in self.data_id, l_set_id, l_xml; + l_set_id := l_set_id + c_bulk_rows; end loop; - ut_expectation_processor.reset_nls_params(); dbms_xmlgen.closeContext(l_ctx); exception @@ -71,6 +69,7 @@ create or replace type body ut_data_value_refcursor as member procedure init(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) is l_cursor sys_refcursor := a_value; cursor_not_open exception; + l_cursor_number number; begin self.is_data_null := ut_utils.boolean_to_int(a_value is null); self.self_type := $$plsql_unit; @@ -82,11 +81,10 @@ create or replace type body ut_data_value_refcursor as if l_cursor%isopen then --Get some more info regarding cursor, including if it containts collection columns and what is their name self.elements_count := 0; - self.cursor_details := ut_cursor_details(l_cursor); extract_cursor(l_cursor); - if l_cursor%isopen then - close l_cursor; - end if; + l_cursor_number := dbms_sql.to_cursor_number(l_cursor); + self.cursor_details := ut_cursor_details(l_cursor_number); + dbms_sql.close_cursor(l_cursor_number); elsif not l_cursor%isopen then raise cursor_not_open; end if; diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index 54dafd37a..ca6faad5b 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -894,21 +894,6 @@ Rows: [ 4 differences ] ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; - procedure compares_over_10000_rows - as - l_actual sys_refcursor; - l_expected sys_refcursor; - begin - --Arrange - open l_actual for select object_name from all_objects where rownum <=11000 order by object_id; - open l_expected for select object_name from all_objects where rownum <=11000 order by object_id; - --Act - ut3.ut.expect(l_actual).to_equal(l_expected); - - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - function get_cursor return sys_refcursor is l_cursor sys_refcursor; begin @@ -1230,21 +1215,8 @@ Diff:% --Assert ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; - - procedure cursor_joinby_compare_10000 is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; - begin - --Arrange - open l_actual for select level object_id, level || '_TEST' object_name from dual connect by level <=11000; - open l_expected for select level object_id, level || '_TEST' object_name from dual connect by level <=11000; - --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OBJECT_ID'); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure cursor_unorder_compare_1000 is + + procedure cursor_unorder_compare_1000 is l_actual SYS_REFCURSOR; l_expected SYS_REFCURSOR; begin @@ -1256,19 +1228,6 @@ Diff:% --Assert ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; - - procedure cursor_unorder_compare_10000 is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; - begin - --Arrange - open l_actual for select level object_id, level || '_TEST' object_name from dual connect by level <=11000; - open l_expected for select level object_id, level || '_TEST' object_name from dual connect by level <=11000; - --Act - ut3.ut.expect(l_actual).to_equal(l_expected).unordered; - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; procedure cursor_joinby_compare_fail is l_actual SYS_REFCURSOR; diff --git a/test/core/expectations/test_expectations_cursor.pks b/test/core/expectations/test_expectations_cursor.pks index ce02623dd..ae52d741c 100644 --- a/test/core/expectations/test_expectations_cursor.pks +++ b/test/core/expectations/test_expectations_cursor.pks @@ -166,9 +166,6 @@ create or replace package test_expectations_cursor is --%test(Compares cursors with more than 1000 rows) procedure compares_over_1000_rows; - --%test(Compares cursors with more than 10000 rows) - procedure compares_over_10000_rows; - --%test(Adds a warning when using depreciated syntax to_equal( a_expected sys_refcursor, a_exclude varchar2 )) procedure deprec_to_equal_excl_varch; @@ -225,15 +222,9 @@ create or replace package test_expectations_cursor is --%test( Compare cursors join by single key more than 1000 rows) procedure cursor_joinby_compare_1000; - - --%test( Compare cursors join by single key more than 10000 rows) - procedure cursor_joinby_compare_10000; --%test( Compare cursors unorder more than 1000 rows) procedure cursor_unorder_compare_1000; - - --%test( Compare cursors unorder more than 10000 rows) - procedure cursor_unorder_compare_10000; --%test( Compare two column cursors join by and fail to match ) procedure cursor_joinby_compare_fail; From 815deacebef62195076690588a20ac4145e64219 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sun, 2 Dec 2018 13:46:20 +0000 Subject: [PATCH 0145/1096] Updates to documentation Cleanup of te code --- docs/about/authors.md | 4 ++-- docs/userguide/advanced_data_comparison.md | 20 ++++++++---------- .../data_values/ut_compound_data_helper.pkb | 21 ------------------- .../data_values/ut_compound_data_helper.pks | 4 ---- .../data_values/ut_compound_data_value.tpb | 11 +--------- source/expectations/matchers/ut_include.tpb | 14 ++++--------- .../expectations/test_expectations_cursor.pkb | 11 +++++----- 7 files changed, 22 insertions(+), 63 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 55f85642d..76bb24e5f 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -7,11 +7,11 @@ | ---------------- | -------------- | David Pyke | [Shoelace](https://github.com/Shoelace) | Jacek Gebal | [jgebal](https://github.com/jgebal) +| Lukasz Wasylow | [lwasylow](https://github.com/lwasylow/) | Pavel Kaplya | [Pazus](https://github.com/Pazus) | Robert Love | [rlove](https://github.com/rlove) -| Vinicius Avellar | [viniciusam](https://github.com/viniciusam/) | Samuel Nitsche | [pesse](https://github.com/pesse/) -| Lukasz Wasylow | [lwasylow](https://github.com/lwasylow/) +| Vinicius Avellar | [viniciusam](https://github.com/viniciusam/) diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 2b27bf54e..c5e751526 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -35,15 +35,12 @@ Each item in the comma separated list can be: - a column name of cursor to be compared - an attribute name of object type to be compared - an attribute name of object type within a table of objects to be compared -- an [XPath](http://zvon.org/xxl/XPathTutorial/Output/example1.html) expression representing column/attribute - Include and exclude option will not support implicit colum names that starts with single quota, or in fact any other special characters e.g. <, >, & Each element in `ut_varchar2_list` nested table can be an item or a comma separated list of items. When specifying column/attribute names, keep in mind that the names are **case sensitive**. -**XPath expressions with comma are not supported.** - ## Excluding elements from data comparison Consider the following examples @@ -286,30 +283,31 @@ Diff: ***Please note that .join_by option will take longer to process due to need of parsing via primary keys.*** -## Defining item as XPath -When using XPath expression, keep in mind the following: +## Defining item lists in option +XPath expressions are deprecated. They are currently still supported but in future versions they can be removed completely. Please use a current standard of defining items filter. + +When using item list expression, keep in mind the following: -- cursor columns are nested under `` element - object type attributes are nested under `` element - nested table and varray items type attributes are nested under `` elements -Example of a valid XPath parameter to include columns: `RN`, `A_Column`, `SOME_COL` in data comparison. +Example of a valid parameter to include columns: `RN`, `A_Column`, `SOME_COL` in data comparison. ```sql -procedure include_col_as_xpath_eq is +procedure include_col_list_eq is l_actual sys_refcursor; l_expected sys_refcursor; begin open l_expected for select rownum as rn, 'a' as "A_Column", 'x' SOME_COL from dual a connect by level < 4; open l_actual for select rownum as rn, 'a' as "A_Column", 'x' SOME_COL, a.* from all_objects a where rownum < 4; - ut.expect( l_actual ).to_equal( l_expected ).include( '/ROW/RN|/ROW/A_Column|/ROW/SOME_COL' ); + ut.expect( l_actual ).to_equal( l_expected ).include( 'RN,A_Column,SOME_COL' ); end; -procedure include_col_as_xpath_cn is +procedure include_col_list_eq is l_actual sys_refcursor; l_expected sys_refcursor; begin open l_expected for select rownum as rn, 'a' as "A_Column", 'x' SOME_COL from dual a connect by level < 4; open l_actual for select rownum as rn, 'a' as "A_Column", 'x' SOME_COL, a.* from all_objects a where rownum < 6; - ut.expect( l_actual ).to_include( l_expected ).include( '/ROW/RN|/ROW/A_Column|/ROW/SOME_COL' ); + ut.expect( l_actual ).to_include( l_expected ).include( 'RN,A_Column,SOME_COL' ); end; ``` diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 5e97cf275..88feb394f 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -640,18 +640,6 @@ create or replace package body ut_compound_data_helper is order by type desc,name; return l_missing_pk; end; - - function validate_attributes(a_cursor_info ut_cursor_column_tab,a_filter_list ut_varchar2_list) - return ut_varchar2_list is - l_result ut_varchar2_list := ut_varchar2_list(); - begin - select col_name bulk collect into l_result - from (select regexp_replace(column_value,'^((/ROW/)|^(//)|^(/\*/))?(.*)','\5') col_name - from table(a_filter_list)) flr left outer join table(a_cursor_info) cur - on (flr.col_name = cur.access_path) where cur.access_path is null; - - return l_result; - end; function inc_exc_columns_from_cursor (a_cursor_info ut_cursor_column_tab, a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) return ut_cursor_column_tab is @@ -716,15 +704,6 @@ create or replace package body ut_compound_data_helper is return l_result; end; - - function generate_missing_cols_warn_msg(a_missing_columns ut_varchar2_list,a_attribute in varchar2) return varchar2 is - l_warn_msg varchar2(32767) := 'For specified option :'||a_attribute||' following columns not exists in cursor:'||chr(10); - begin - for i in 1..a_missing_columns.count loop - l_warn_msg := l_warn_msg||a_missing_columns(i)||chr(10); - end loop; - return l_warn_msg; - end; function getxmlchildren(a_parent_name varchar2,a_cursor_table ut_cursor_column_tab) return xmltype is diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 858c22fe0..80bae9c36 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -102,8 +102,6 @@ create or replace package ut_compound_data_helper authid definer is function get_missing_pk(a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab, a_current_list ut_varchar2_list) return tt_missing_pk; - function validate_attributes(a_cursor_info ut_cursor_column_tab, a_filter_list ut_varchar2_list) return ut_varchar2_list; - function inc_exc_columns_from_cursor (a_cursor_info ut_cursor_column_tab, a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) return ut_cursor_column_tab; @@ -111,8 +109,6 @@ create or replace package ut_compound_data_helper authid definer is function remove_incomparable_cols( a_cursor_details ut_cursor_column_tab,a_incomparable_cols ut_varchar2_list) return ut_cursor_column_tab; - function generate_missing_cols_warn_msg(a_missing_columns ut_varchar2_list,a_attribute in varchar2) return varchar2; - function getxmlchildren(a_parent_name varchar2,a_cursor_table ut_cursor_column_tab) return xmltype; function is_sql_compare_allowed(a_type_name varchar2) return boolean; diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index a06ac1d14..2d1b52914 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -96,16 +96,7 @@ create or replace type body ut_compound_data_value as function get_diff_message (a_row_diff ut_compound_data_helper.t_row_diffs,a_is_unordered boolean) return varchar2 is begin - - if a_is_unordered then - if a_row_diff.pk_value is not null then - return ' PK '||a_row_diff.pk_value||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; - else - return rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; - end if; - else - return ' Row No. '||a_row_diff.rn||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; - end if; + return ' Row No. '||a_row_diff.rn||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; end; begin diff --git a/source/expectations/matchers/ut_include.tpb b/source/expectations/matchers/ut_include.tpb index 07ba65f5d..c34f19a60 100644 --- a/source/expectations/matchers/ut_include.tpb +++ b/source/expectations/matchers/ut_include.tpb @@ -74,16 +74,10 @@ create or replace type body ut_include as l_actual ut_data_value; begin if self.expected.data_type = a_actual.data_type and self.expected.is_diffable then - if self.expected is of (ut_data_value_refcursor) then - l_actual := treat(a_actual as ut_data_value_refcursor).filter_cursor(exclude_list, include_list); - l_result := - 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() - || chr(10) || 'Diff:' || treat(expected as ut_data_value_refcursor).filter_cursor(self.exclude_list, self.include_list).diff(l_actual, true, self.get_join_by_list()); - else - l_result := - 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() - || chr(10) || 'Diff:' || expected.diff(a_actual, self.get_exclude_xpath(), self.get_include_xpath(), self.get_join_by_xpath(), true); - end if; + l_actual := treat(a_actual as ut_data_value_refcursor).filter_cursor(exclude_list, include_list); + l_result := + 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() + || chr(10) || 'Diff:' || treat(expected as ut_data_value_refcursor).filter_cursor(self.exclude_list, self.include_list).diff(l_actual, true, self.get_join_by_list()); else l_result := (self as ut_matcher).failure_message(a_actual) || ': '|| self.expected.to_string_report(); end if; diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index ca6faad5b..5e786ff21 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -1755,15 +1755,16 @@ Diff:% from dual connect by level <=2; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('NESTED_TABLE/UT_KEY_VALUE_PAIR'); + ut3.ut.expect(l_actual).to_equal(l_expected).join_by('NESTED_TABLE/UT_KEY_VALUE_PAIRS'); --Assert l_expected_message := q'[%Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 2 ] %Diff: -%Unable to join sets: -%Join key NESTED_TABLE/UT_KEY_VALUE_PAIR does not exists in expected% -%Join key NESTED_TABLE/UT_KEY_VALUE_PAIR does not exists in actual% -%Please make sure that your join clause is not refferring to collection element%]'; +%Rows: [ 4 differences ] +%Extra: 21Something 12Something 2 +%Extra: 11Something 12Something 2 +%Missing: 11Somethings 12Somethings 2 +%Missing: 21Somethings 12Somethings 2%]'; l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); From cf0c592ea9655f0ed1ee04a9eb63eea19a1db9da Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sun, 2 Dec 2018 14:11:54 +0000 Subject: [PATCH 0146/1096] Sorting out some duplicate code. --- .../data_values/ut_compound_data_helper.pkb | 73 ++++++++----------- 1 file changed, 30 insertions(+), 43 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 88feb394f..895e63c2f 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -256,12 +256,37 @@ create or replace package body ut_compound_data_helper is end if; end; + procedure get_act_and_exp_set(a_current_stmt in out nocopy clob, a_partition_stmt clob, a_select_stmt clob, + a_xmltable_stmt clob, a_unordered boolean,a_type varchar2) is + l_temp_string varchar2(32767); + l_ut_owner varchar2(250) := ut_utils.ut_owner; + begin + ut_utils.append_to_clob(a_current_stmt, a_partition_stmt); + + l_temp_string := 'from (select ucd.item_data '; + ut_utils.append_to_clob(a_current_stmt,l_temp_string); + ut_utils.append_to_clob(a_current_stmt, a_select_stmt); + + l_temp_string := ',x.data_id, ' + || case when not a_unordered then 'position + x.item_no ' else 'rownum ' end + ||'item_no from ' || l_ut_owner || '.ut_compound_data_tmp x,' + ||q'[xmltable('/ROWSET/ROW' passing x.item_data columns ]' ; + ut_utils.append_to_clob(a_current_stmt,l_temp_string); + + ut_utils.append_to_clob(a_current_stmt,a_xmltable_stmt); + ut_utils.append_to_clob(a_current_stmt,case when a_xmltable_stmt is null then '' else ',' end||q'[ item_data xmltype PATH '*']'); + if not a_unordered then + ut_utils.append_to_clob(a_current_stmt,', POSITION for ordinality '); + end if; + ut_utils.append_to_clob(a_current_stmt,' ) ucd where data_id = :'||a_type||'_guid ) ucd ) '); + end; + + function gen_compare_sql(a_inclusion_type boolean, a_is_negated boolean,a_unordered boolean, a_other ut_data_value_refcursor :=null, a_join_by_list ut_varchar2_list:=ut_varchar2_list() ) return clob is l_compare_sql clob; l_temp_string varchar2(32767); - l_ut_owner varchar2(250) := ut_utils.ut_owner; l_xmltable_stmt clob; l_where_stmt clob; l_select_stmt clob; @@ -289,50 +314,12 @@ create or replace package body ut_compound_data_helper is l_temp_string := 'with exp as ( select ucd.* '; ut_utils.append_to_clob(l_compare_sql, l_temp_string); - ut_utils.append_to_clob(l_compare_sql,l_partition_stmt); + get_act_and_exp_set(l_compare_sql, l_partition_stmt,l_select_stmt, l_xmltable_stmt, a_unordered,'exp'); - l_temp_string := 'from (select ucd.item_data '; - ut_utils.append_to_clob(l_compare_sql, l_temp_string); - ut_utils.append_to_clob(l_compare_sql, l_select_stmt); - - l_temp_string := ',x.data_id ,' - || case when not a_unordered then 'position + x.item_no ' else 'rownum ' end - ||'item_no from '|| l_ut_owner || '.ut_compound_data_tmp x, ' - ||q'[xmltable('/ROWSET/ROW' passing x.item_data columns ]'; - ut_utils.append_to_clob(l_compare_sql, l_temp_string); - - ut_utils.append_to_clob(l_compare_sql,l_xmltable_stmt); - ut_utils.append_to_clob(l_compare_sql,case when l_xmltable_stmt is null then '' else ',' end||q'[ item_data xmltype PATH '*']'); - - if not a_unordered then - ut_utils.append_to_clob(l_compare_sql,', POSITION for ordinality '); - end if; - - l_temp_string := q'[) ucd where data_id = :self_guid ) ucd ) ,]'; - ut_utils.append_to_clob(l_compare_sql,l_temp_string); - - l_temp_string :='act as ( select ucd.* '; + + l_temp_string :=',act as ( select ucd.* '; ut_utils.append_to_clob(l_compare_sql, l_temp_string); - ut_utils.append_to_clob(l_compare_sql, l_partition_stmt); - - l_temp_string := 'from (select ucd.item_data '; - ut_utils.append_to_clob(l_compare_sql,l_temp_string); - ut_utils.append_to_clob(l_compare_sql, l_select_stmt); - - l_temp_string := ',x.data_id, ' - || case when not a_unordered then 'position + x.item_no ' else 'rownum ' end - ||'item_no from ' || l_ut_owner || '.ut_compound_data_tmp x,' - ||q'[xmltable('/ROWSET/ROW' passing x.item_data columns ]' ; - ut_utils.append_to_clob(l_compare_sql,l_temp_string); - - ut_utils.append_to_clob(l_compare_sql,l_xmltable_stmt); - ut_utils.append_to_clob(l_compare_sql,case when l_xmltable_stmt is null then '' else ',' end||q'[ item_data xmltype PATH '*']'); - - if not a_unordered then - ut_utils.append_to_clob(l_compare_sql,', POSITION for ordinality '); - end if; - - ut_utils.append_to_clob(l_compare_sql,q'[ ) ucd where data_id = :other_guid ) ucd ) ]'); + get_act_and_exp_set(l_compare_sql, l_partition_stmt,l_select_stmt, l_xmltable_stmt, a_unordered,'act'); l_temp_string := ' select a.item_data as act_item_data, a.data_id act_data_id,' ||'e.item_data as exp_item_data, e.data_id exp_data_id, '|| From c156852786c1bc209ddf34a7338b74139e41dc91 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sun, 2 Dec 2018 14:34:43 +0000 Subject: [PATCH 0147/1096] Cleanup of code --- source/expectations/data_values/ut_compound_data_helper.pkb | 4 ---- source/expectations/data_values/ut_compound_data_value.tpb | 2 -- source/expectations/data_values/ut_cursor_column.tpb | 1 - source/expectations/data_values/ut_data_value_refcursor.tpb | 1 - source/expectations/matchers/ut_equal.tpb | 4 ---- source/expectations/matchers/ut_include.tpb | 1 - 6 files changed, 13 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 895e63c2f..49414cd11 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -134,7 +134,6 @@ create or replace package body ut_compound_data_helper is l_sql_stmt := l_sql_stmt ||' a.'||a_col_name||q'[ = ]'||' e.'||a_col_name; elsif a_data_info.parent_name = l_pk_tab(l_index)then --When then table is nested and join is on whole table - --TODO : Can this be done smarter ? l_sql_stmt := case when a_join_by_stmt is null then null else ' and ' end; l_sql_stmt := l_sql_stmt ||' a.'||a_col_name||q'[ = ]'||' e.'||a_col_name; end if; @@ -168,7 +167,6 @@ create or replace package body ut_compound_data_helper is l_sql_stmt := l_sql_stmt ||l_alias||a_col_name; elsif a_data_info.parent_name = l_pk_tab(l_index)then --When then table is nested and join is on whole table - --TODO : Can this be done smarter ? l_sql_stmt := case when a_partition_stmt is null then null else ',' end; l_sql_stmt := l_sql_stmt ||l_alias||a_col_name; end if; @@ -202,7 +200,6 @@ create or replace package body ut_compound_data_helper is begin if a_data_info.is_sql_diffable = 0 then l_col_type := 'XMLTYPE'; - --TODO : Is it right to use timestamp ? elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type = 'DATE' then l_col_type := 'TIMESTAMP'; elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('TIMESTAMP','TIMESTAMP WITH TIME ZONE') then @@ -748,7 +745,6 @@ create or replace package body ut_compound_data_helper is return a_anytype_code in (dbms_types.typecode_varray,dbms_types.typecode_table,dbms_types.typecode_namedcollection); end; - --TODO Look at simplify that option function get_column_type_desc(a_type_code in integer, a_dbms_sql_desc in boolean) return varchar2 is begin return case when a_dbms_sql_desc then g_type_name_map(a_type_code) else g_anytype_name_map(a_type_code) end; diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index 2d1b52914..81e9d8c39 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -111,7 +111,6 @@ create or replace type body ut_compound_data_value as l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_actual.data_id); -- First tell how many rows are different l_diff_row_count := ut_compound_data_helper.get_rows_diff_count; - --TODO : Change message when the types not matching if l_diff_row_count > 0 then l_row_diffs := ut_compound_data_helper.get_rows_diff( self.data_id, l_actual.data_id, l_diff_id, c_max_rows, a_exclude_xpath, @@ -206,7 +205,6 @@ create or replace type body ut_compound_data_value as l_sql_rowcount integer :=0; begin - --TODO : Bring diffs row into same place for ref data cursor especially (how we going to do that so we dont break anyval etc) l_other := treat(a_other as ut_compound_data_value); l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); diff --git a/source/expectations/data_values/ut_cursor_column.tpb b/source/expectations/data_values/ut_cursor_column.tpb index 46f589feb..52be9a3d4 100644 --- a/source/expectations/data_values/ut_cursor_column.tpb +++ b/source/expectations/data_values/ut_cursor_column.tpb @@ -30,7 +30,6 @@ create or replace type body ut_cursor_column as ut_utils.boolean_to_int(ut_compound_data_helper.is_sql_compare_allowed(self.column_type)) end; --can we directly compare or do we need to hash value self.is_collection := a_collection; - --TODO : fix that as is nasty hardcode self.has_nested_col := case when lower(self.column_type) = 'user_defined_type' and self.is_collection = 0 then 1 else 0 end; end; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 5738638ec..b2314cf48 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -235,7 +235,6 @@ create or replace type body ut_data_value_refcursor as l_diff_row_count := ut_compound_data_helper.get_rows_diff_count; l_results := ut_utils.t_clob_tab(); if l_diff_row_count > 0 then - --TODO : since columns can differ we need to pass both list or get common denominator l_row_diffs := ut_compound_data_helper.get_rows_diff_by_sql( l_exp_cols,l_act_cols, self.data_id, l_actual.data_id, l_diff_id,a_join_by_list , a_unordered); l_message := chr(10) diff --git a/source/expectations/matchers/ut_equal.tpb b/source/expectations/matchers/ut_equal.tpb index d790118af..65bc81306 100644 --- a/source/expectations/matchers/ut_equal.tpb +++ b/source/expectations/matchers/ut_equal.tpb @@ -158,7 +158,6 @@ create or replace type body ut_equal as member function include(a_items varchar2) return ut_equal is l_result ut_equal := self; begin - --TODO : move that logic split into get_include after removed all calls to incl and excl l_result.include_list := l_result.include_list multiset union coalesce(ut_utils.string_to_table(REPLACE(a_items,'|',','),','),ut_varchar2_list()); return l_result; end; @@ -167,7 +166,6 @@ create or replace type body ut_equal as l_result ut_equal := self; l_items ut_varchar2_list := ut_varchar2_list(); begin - --TODO : move that logic split into get_include after removed all calls to incl and excl for i in 1..a_items.count loop l_items := l_items multiset union all coalesce(ut_utils.string_to_table(REPLACE(a_items(i),'|',','),','),ut_varchar2_list()); end loop; @@ -178,7 +176,6 @@ create or replace type body ut_equal as member function exclude(a_items varchar2) return ut_equal is l_result ut_equal := self; begin - --TODO : move that logic split into get_include after removed all calls to incl and excl l_result.exclude_list := l_result.exclude_list multiset union all coalesce(ut_utils.string_to_table(REPLACE(a_items,'|',','),','),ut_varchar2_list()); return l_result; end; @@ -187,7 +184,6 @@ create or replace type body ut_equal as l_result ut_equal := self; l_items ut_varchar2_list := ut_varchar2_list(); begin - --TODO : move that logic split into get_include after removed all calls to incl and excl for i in 1..a_items.count loop l_items := l_items multiset union all coalesce(ut_utils.string_to_table(REPLACE(a_items(i),'|',','),','),ut_varchar2_list()); end loop; diff --git a/source/expectations/matchers/ut_include.tpb b/source/expectations/matchers/ut_include.tpb index c34f19a60..7045fa1d2 100644 --- a/source/expectations/matchers/ut_include.tpb +++ b/source/expectations/matchers/ut_include.tpb @@ -53,7 +53,6 @@ create or replace type body ut_include as l_actual ut_data_value; l_result1 integer; begin - --TODO : Join by exclude an include should show differences if self.expected.data_type = a_actual.data_type then l_actual := treat(a_actual as ut_data_value_refcursor).filter_cursor(exclude_list, include_list); l_result := 0 = treat(self.expected as ut_data_value_refcursor).filter_cursor(exclude_list, include_list).compare_implementation(l_actual, From d8525d60c8bb94ef1a1ad2a11d274078a5035e3f Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sun, 2 Dec 2018 17:23:35 +0000 Subject: [PATCH 0148/1096] Change behaviour to compare columns regardless of column position in ref cursor. --- docs/userguide/expectations.md | 29 +++- .../data_values/ut_compound_data_helper.pkb | 91 ++++++++++-- .../data_values/ut_compound_data_helper.pks | 6 +- .../data_values/ut_compound_data_value.tpb | 2 +- .../data_values/ut_cursor_details.tpb | 27 +++- .../data_values/ut_cursor_details.tps | 4 +- .../data_values/ut_data_value_refcursor.tpb | 15 +- .../data_values/ut_data_value_refcursor.tps | 3 +- source/expectations/matchers/ut_equal.tpb | 20 ++- source/expectations/matchers/ut_equal.tps | 11 +- source/expectations/matchers/ut_include.tpb | 8 +- .../expectations/ut_expectation_compound.tpb | 18 +++ .../expectations/ut_expectation_compound.tps | 4 +- .../expectations/test_expectations_cursor.pkb | 129 ++++++++++++++++-- .../expectations/test_expectations_cursor.pks | 21 ++- 15 files changed, 328 insertions(+), 60 deletions(-) diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 80a5667dc..66a352669 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -680,13 +680,36 @@ utPLSQL is capable of comparing compound data-types including: ### Notes on comparison of compound data - Compound data can contain elements of any data-type. This includes blob, clob, object type, nested table, varray or even a nested-cursor within a cursor. -- Cursors, nested table and varray types are compared as **ordered lists of elements**. If order of elements differ, expectation will fail. + +- Nested table and varray types are compared as **ordered lists of elements**. If order of elements differ, expectation will fail. + +- Cursors are compared as **unordered list of elements** by default. If order of elements is of importance the option has to be passed to enforce column order comparison `ordered_columns` e.g. + + ```sql + procedure ut_refcursors1 is + l_actual sys_refcursor; + l_expected sys_refcursor; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + open l_actual for select 1 user_id,'s' a_col,'test' username from dual; + open l_expected for select 'test' username,'s' a_col,1 user_id from dual; + --Act + ut3.ut.expect(l_actual).to_equal(l_expected).join_by('USER_ID').ordered_columns; + end; + ``` + - Comparison of compound data is data-type aware. So a column `ID NUMBER` in a cursor is not the same as `ID VARCHAR2(100)`, even if they both hold the same numeric values. + - Comparison of cursor columns containing `DATE` will only compare date part **and ignore time** by default. See [Comparing cursor data containing DATE fields](#comparing-cursor-data-containing-date-fields) to check how to enable date-time comparison in cursors. + - Comparison of cursor returning `TIMESTAMP` **columns** against cursor returning `TIMESTAMP` **bind variables** requires variables to be casted to proper precision. This is an Oracle SQL - PLSQL compatibility issue and usage of CAST is the only known workaround for now. -See [Comparing cursor data containing TIMESTAMP bind variables](#comparing-cursor-data-containing-timestamp-bind-variables) for examples. + See [Comparing cursor data containing TIMESTAMP bind variables](#comparing-cursor-data-containing-timestamp-bind-variables) for examples. + - To compare nested table/varray type you need to convert it to `anydata` by using `anydata.convertCollection()` + - To compare object type you need to convert it to `anydata` by using `anydata.convertObject()` + - It is possible to compare PL/SQL records, collections, varrays and associative arrays. To compare this types of data, use cursor comparison feature of utPLSQL and TABLE operator in SQL query - On Oracle 11g Release 2 - pipelined table functions are needed (see section [Implicit (Shadow) Types in this artcile](https://oracle-base.com/articles/misc/pipelined-table-functions)) - On Oracle 12c and above - use [TABLE function on nested tables/varrays/associative arrays of PL/SQL records](https://oracle-base.com/articles/12c/using-the-table-operator-with-locally-defined-types-in-plsql-12cr1) @@ -768,7 +791,7 @@ create or replace package body test_cursor_compare as from dual union all select 'M' AS GENDER, 'LUKE' as FIRST_NAME, 'SKYWALKER' AS LAST_NAME, 2 as ID, '1000' AS SALARY from dual; - ut.expect(l_actual).to_equal(l_expected); + ut.expect(l_actual).to_equal(l_expected).ordered_columns; end; end; / diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 49414cd11..678da0ce9 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -46,8 +46,8 @@ create or replace package body ut_compound_data_helper is end if; return l_filter; end; - - function get_columns_diff(a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab) + + function get_columns_diff_ordered(a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab) return tt_column_diffs is l_column_filter varchar2(32767); l_sql varchar2(32767); @@ -88,6 +88,53 @@ create or replace package body ut_compound_data_helper is return l_results; end; + function get_columns_diff_unordered(a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab) + return tt_column_diffs is + l_column_filter varchar2(32767); + l_sql varchar2(32767); + l_results tt_column_diffs; + begin + with + expected_cols as + (select access_path exp_column_name,column_position exp_col_pos, + replace(column_type,'VARCHAR2','CHAR') exp_col_type_compare, column_type exp_col_type + from table(a_expected)), + actual_cols as + (select access_path act_column_name,column_position act_col_pos, + replace(column_type,'VARCHAR2','CHAR') act_col_type_compare, column_type act_col_type + from table(a_actual)), + joined_cols as + (select e.*,a.* + from expected_cols e + full outer join actual_cols a on e.exp_column_name = a.act_column_name) + select case + when exp_col_pos is null and act_col_pos is not null then '+' + when exp_col_pos is not null and act_col_pos is null then '-' + when exp_col_type_compare != act_col_type_compare then 't' + else 'p' + end as diff_type, + exp_column_name, exp_col_type, exp_col_pos, + act_column_name, act_col_type, act_col_pos + bulk collect into l_results + from joined_cols + --column is unexpected (extra) or missing + where act_col_pos is null or exp_col_pos is null + --column type is not matching (except CHAR/VARCHAR2) + or act_col_type_compare != exp_col_type_compare + order by exp_col_pos, act_col_pos; + return l_results; + end; + + function get_columns_diff(a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab,a_order_enforced boolean := false) + return tt_column_diffs is + begin + if a_order_enforced then + return get_columns_diff_ordered(a_expected,a_actual); + else + return get_columns_diff_unordered(a_expected,a_actual); + end if; + end; + function get_pk_value (a_join_by_xpath varchar2,a_item_data xmltype) return clob is l_pk_value clob; begin @@ -218,10 +265,10 @@ create or replace package body ut_compound_data_helper is ut_utils.append_to_clob(a_sql_stmt, l_sql_stmt); end; - procedure gen_sql_pieces_out_of_cursor(a_data_info ut_data_value_refcursor,a_pk_table ut_varchar2_list, a_xml_stmt out nocopy clob, + procedure gen_sql_pieces_out_of_cursor(a_data_info ut_cursor_column_tab,a_pk_table ut_varchar2_list, a_xml_stmt out nocopy clob, a_select_stmt out nocopy clob ,a_partition_stmt out nocopy clob, a_equal_stmt out nocopy clob, a_join_by_stmt out nocopy clob, a_not_equal_stmt out nocopy clob) is - l_cursor_info ut_cursor_column_tab := a_data_info.cursor_details.cursor_info; + l_cursor_info ut_cursor_column_tab := a_data_info; l_partition_tmp clob; l_col_name varchar2(100); begin @@ -305,7 +352,7 @@ create or replace package body ut_compound_data_helper is begin dbms_lob.createtemporary(l_compare_sql, true); - gen_sql_pieces_out_of_cursor(a_other, a_join_by_list, + gen_sql_pieces_out_of_cursor(a_other.cursor_details.cursor_info, a_join_by_list, l_xmltable_stmt, l_select_stmt, l_partition_stmt, l_equal_stmt, l_join_on_stmt, l_not_equal_stmt); @@ -374,9 +421,8 @@ create or replace package body ut_compound_data_helper is function get_rows_diff_by_sql(a_act_cursor_info ut_cursor_column_tab,a_exp_cursor_info ut_cursor_column_tab, a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, - a_join_by_list ut_varchar2_list, a_unordered boolean + a_join_by_list ut_varchar2_list, a_unordered boolean, a_enforce_column_order boolean := false ) return tt_row_diffs is - l_act_col_filter varchar2(32767); l_exp_col_filter varchar2(32767); l_act_extract_xpath varchar2(32767):= ut_utils.to_xpath(get_column_extract_path(a_act_cursor_info)); @@ -412,25 +458,28 @@ create or replace package body ut_compound_data_helper is select rn, diff_type, diffed_row, pk_value ,case when diff_type = 'Actual:' then 1 else 2 end rnk ,1 final_order + ,col_name from ( ]'; if a_unordered then - l_sql := l_sql || q'[select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, pk_value pk_value + l_sql := l_sql || q'[select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, pk_value,col_name from - (select nvl(exp.rn, act.rn) rn, nvl(exp.pk_value, act.pk_value) pk_value, exp.col exp_item, act.col act_item + (select nvl(exp.rn, act.rn) rn, nvl(exp.pk_value, act.pk_value) pk_value, exp.col exp_item, act.col act_item , + nvl(exp.col_name,act.col_name) col_name from exp join act on exp.rn = act.rn and exp.col_name = act.col_name where dbms_lob.compare(exp.col_val, act.col_val) != 0) unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:') ))]'; else - l_sql := l_sql || q'[ select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, null pk_value + l_sql := l_sql || q'[ select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, null pk_value,col_name from (select nvl(exp.rn, act.rn) rn, xmlagg(exp.col order by exp.col_no) exp_item, - xmlagg(act.col order by act.col_no) act_item + xmlagg(act.col order by act.col_no) act_item, + max(nvl(exp.col_name,act.col_name)) col_name from exp exp join act act on exp.rn = act.rn and exp.col_name = act.col_name where dbms_lob.compare(exp.col_val, act.col_val) != 0 - group by exp.rn, act.rn + group by (exp.rn, act.rn) ) unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:')) )]'; @@ -443,14 +492,26 @@ create or replace package body ut_compound_data_helper is nvl2(:join_by,ut_compound_data_helper.get_pk_value(:join_by,case when exp_data_id is null then act_item_data else exp_item_data end),null) pk_value ,case when exp_data_id is null then 1 else 2 end rnk ,2 final_order + ,null col_name from ut_compound_data_diff_tmp i where diff_id = :diff_id and act_data_id is null or exp_data_id is null ) - order by final_order, - case when final_order = 1 then rn else rnk end, - case when final_order = 1 then rnk else rn end ]'; + order by final_order,]'; + if a_enforce_column_order then + l_sql := l_sql ||q'[case when final_order = 1 then rn else rnk end, + case when final_order = 1 then rnk else rn end ]'; + elsif not(a_enforce_column_order) and not(a_unordered) then + l_sql := l_sql ||q'[case when final_order = 1 then rn else rnk end, + case when final_order = 1 then rnk else rn end ]'; + elsif a_unordered then + l_sql := l_sql ||q'[case when final_order = 1 then col_name else to_char(rnk) end, + case when final_order = 1 then to_char(rn) else col_name end, + case when final_order = 1 then to_char(rnk) else col_name end + ]'; + end if; + execute immediate l_sql bulk collect into l_results using l_exp_extract_xpath,l_join_xpath,a_diff_id, a_expected_dataset_guid, diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 80bae9c36..290c101cc 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -57,13 +57,13 @@ create or replace package ut_compound_data_helper authid definer is ); type t_diff_tab is table of t_diff_rec; - + function get_columns_filter( a_exclude_xpath varchar2, a_include_xpath varchar2, a_table_alias varchar2 := 'ucd', a_column_alias varchar2 := 'item_data' ) return varchar2; - function get_columns_diff(a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab) + function get_columns_diff(a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab,a_order_enforced boolean := false) return tt_column_diffs; function get_pk_value (a_join_by_xpath varchar2,a_item_data xmltype) return clob; @@ -75,7 +75,7 @@ create or replace package ut_compound_data_helper authid definer is function get_rows_diff_by_sql(a_act_cursor_info ut_cursor_column_tab,a_exp_cursor_info ut_cursor_column_tab, a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, - a_join_by_list ut_varchar2_list, a_unordered boolean + a_join_by_list ut_varchar2_list, a_unordered boolean, a_enforce_column_order boolean := false ) return tt_row_diffs; subtype t_hash is raw(128); diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index 81e9d8c39..a8323eecd 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -223,7 +223,7 @@ create or replace type body ut_compound_data_value as end loop; ut_compound_data_helper.set_rows_diff(l_sql_rowcount); - --result is OK only if both are same + --result is OK only if both are same if l_sql_rowcount = 0 and ( self.elements_count = l_other.elements_count or a_inclusion_compare )then l_result := 0; else diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb index eba4bc884..9f9f4bb52 100644 --- a/source/expectations/data_values/ut_cursor_details.tpb +++ b/source/expectations/data_values/ut_cursor_details.tpb @@ -2,13 +2,21 @@ create or replace type body ut_cursor_details as order member function compare(a_other ut_cursor_details) return integer is l_diffs integer; - begin - select count(1) into l_diffs - from table(self.cursor_info) a full outer join table(a_other.cursor_info) e - on ( decode(a.parent_name,e.parent_name,1,0)= 1 and a.column_name = e.column_name and - REPLACE(a.column_type,'VARCHAR2','CHAR') = REPLACE(e.column_type,'VARCHAR2','CHAR') - and a.column_position = e.column_position ) - where a.column_name is null or e.column_name is null; + begin + if self.is_column_order_enforced = 1 then + select count(1) into l_diffs + from table(self.cursor_info) a full outer join table(a_other.cursor_info) e + on ( decode(a.parent_name,e.parent_name,1,0)= 1 and a.column_name = e.column_name and + REPLACE(a.column_type,'VARCHAR2','CHAR') = REPLACE(e.column_type,'VARCHAR2','CHAR') + and a.column_position = e.column_position ) + where a.column_name is null or e.column_name is null; + else + select count(1) into l_diffs + from table(self.cursor_info) a full outer join table(a_other.cursor_info) e + on ( decode(a.parent_name,e.parent_name,1,0)= 1 and a.column_name = e.column_name and + REPLACE(a.column_type,'VARCHAR2','CHAR') = REPLACE(e.column_type,'VARCHAR2','CHAR')) + where a.column_name is null or e.column_name is null; + end if; return l_diffs; end; @@ -221,5 +229,10 @@ create or replace type body ut_cursor_details as return; end; + member procedure ordered_columns(self in out nocopy ut_cursor_details,a_ordered_columns boolean := false) is + begin + self.is_column_order_enforced := ut_utils.boolean_to_int(a_ordered_columns); + end; + end; / diff --git a/source/expectations/data_values/ut_cursor_details.tps b/source/expectations/data_values/ut_cursor_details.tps index b38fec0fb..a64a6dd55 100644 --- a/source/expectations/data_values/ut_cursor_details.tps +++ b/source/expectations/data_values/ut_cursor_details.tps @@ -1,6 +1,7 @@ create or replace type ut_cursor_details force authid current_user as object ( cursor_info ut_cursor_column_tab, + is_column_order_enforced number(1,0), order member function compare(a_other ut_cursor_details) return integer, member procedure get_anytype_members_info(a_anytype anytype, a_attribute_typecode out pls_integer, a_schema_name out varchar2, a_type_name out varchar2, a_len out pls_integer,a_elements_count out pls_integer), @@ -15,6 +16,7 @@ create or replace type ut_cursor_details force authid current_user as object member function get_user_defined_type(a_data anydata) return anytype, constructor function ut_cursor_details(self in out nocopy ut_cursor_details) return self as result, constructor function ut_cursor_details(self in out nocopy ut_cursor_details,a_cursor_number in number) - return self as result + return self as result, + member procedure ordered_columns(self in out nocopy ut_cursor_details,a_ordered_columns boolean := false) ) / diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index b2314cf48..c62163758 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -141,6 +141,8 @@ create or replace type body ut_data_value_refcursor as l_row_diffs ut_compound_data_helper.tt_row_diffs; l_message varchar2(32767); + l_column_order_enforce boolean := ut_utils.int_to_boolean(self.cursor_details.is_column_order_enforced); + function get_col_diff_text(a_col ut_compound_data_helper.t_column_diffs) return varchar2 is begin return @@ -208,8 +210,8 @@ create or replace type body ut_data_value_refcursor as dbms_lob.createtemporary(l_result,true); --diff columns if not self.is_null and not l_actual.is_null then - l_column_diffs := ut_compound_data_helper.get_columns_diff(self.cursor_details.cursor_info,l_actual.cursor_details.cursor_info); - + l_column_diffs := ut_compound_data_helper.get_columns_diff(self.cursor_details.cursor_info,l_actual.cursor_details.cursor_info,l_column_order_enforce); + if l_column_diffs.count > 0 then ut_utils.append_to_clob(l_result,chr(10) || 'Columns:' || chr(10)); end if; @@ -234,9 +236,9 @@ create or replace type body ut_data_value_refcursor as -- First tell how many rows are different l_diff_row_count := ut_compound_data_helper.get_rows_diff_count; l_results := ut_utils.t_clob_tab(); - if l_diff_row_count > 0 then + if l_diff_row_count > 0 then l_row_diffs := ut_compound_data_helper.get_rows_diff_by_sql( - l_exp_cols,l_act_cols, self.data_id, l_actual.data_id, l_diff_id,a_join_by_list , a_unordered); + l_exp_cols,l_act_cols, self.data_id, l_actual.data_id, l_diff_id,a_join_by_list , a_unordered, l_column_order_enforce); l_message := chr(10) ||'Rows: [ ' || l_diff_row_count ||' differences' || case when l_diff_row_count > c_max_rows and l_row_diffs.count > 0 then ', showing first '||c_max_rows end @@ -248,7 +250,7 @@ create or replace type body ut_data_value_refcursor as end loop; ut_utils.append_to_clob(l_result,l_results); else - l_message:= chr(10)||'Rows: [ all different ]'||chr(10)||' All rows are different as the columns are not matching.'; + l_message:= chr(10)||'Rows: [ all different ]'||chr(10)||' All rows are different as the columns position is not matching.'; ut_utils.append_to_clob( l_result, l_message ); end if; else @@ -304,11 +306,12 @@ create or replace type body ut_data_value_refcursor as return self.elements_count = 0; end; - member function filter_cursor (a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) return ut_data_value_refcursor is + member function update_cursor_details (a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list,a_ordered_columns boolean := false) return ut_data_value_refcursor is l_result ut_data_value_refcursor := self; begin if l_result.cursor_details.cursor_info is not null then l_result.cursor_details.cursor_info := ut_compound_data_helper.inc_exc_columns_from_cursor(l_result.cursor_details.cursor_info,a_exclude_xpath,a_include_xpath); + l_result.cursor_details.ordered_columns(a_ordered_columns); end if; return l_result; end; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tps b/source/expectations/data_values/ut_data_value_refcursor.tps index c3270270f..d8fb2c891 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tps +++ b/source/expectations/data_values/ut_data_value_refcursor.tps @@ -38,5 +38,6 @@ create or replace type ut_data_value_refcursor under ut_compound_data_value( overriding member function compare_implementation(a_other ut_data_value, a_unordered boolean, a_inclusion_compare boolean := false, a_is_negated boolean := false, a_join_by_list ut_varchar2_list:=ut_varchar2_list()) return integer, overriding member function is_empty return boolean, - member function filter_cursor (a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) return ut_data_value_refcursor) + member function update_cursor_details (a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list,a_ordered_columns boolean := false) return ut_data_value_refcursor +) / diff --git a/source/expectations/matchers/ut_equal.tpb b/source/expectations/matchers/ut_equal.tpb index 65bc81306..d575dc36c 100644 --- a/source/expectations/matchers/ut_equal.tpb +++ b/source/expectations/matchers/ut_equal.tpb @@ -253,6 +253,18 @@ create or replace type body ut_equal as begin return ( coalesce(join_columns, ut_varchar2_list()) ); end; + + member function ordered_columns return ut_equal is + l_result ut_equal := self; + begin + l_result.is_column_order_enforced := ut_utils.boolean_to_int(true); + return l_result; + end; + + member function get_ordered_columns return boolean is + begin + return ut_utils.int_to_boolean(nvl(is_column_order_enforced,0)); + end; overriding member function run_matcher(self in out nocopy ut_equal, a_actual ut_data_value) return boolean is l_result boolean; @@ -262,8 +274,8 @@ create or replace type body ut_equal as if self.expected is of (ut_data_value_anydata) then l_result := 0 = treat(self.expected as ut_data_value_anydata).compare_implementation(a_actual, get_exclude_xpath(), get_include_xpath()); elsif self.expected is of (ut_data_value_refcursor) then - l_actual := treat(a_actual as ut_data_value_refcursor).filter_cursor(exclude_list, include_list); - l_result := 0 = treat(self.expected as ut_data_value_refcursor).filter_cursor(exclude_list, include_list).compare_implementation(l_actual, get_unordered(), false, false, get_join_by_list() ); + l_actual := treat(a_actual as ut_data_value_refcursor).update_cursor_details(exclude_list, include_list,get_ordered_columns()); + l_result := 0 = treat(self.expected as ut_data_value_refcursor).update_cursor_details(exclude_list, include_list,get_ordered_columns()).compare_implementation(l_actual, get_unordered(), false, false, get_join_by_list()); else l_result := equal_with_nulls((self.expected = a_actual), a_actual); end if; @@ -280,10 +292,10 @@ create or replace type body ut_equal as begin if self.expected.data_type = a_actual.data_type and self.expected.is_diffable then if self.expected is of (ut_data_value_refcursor) then - l_actual := treat(a_actual as ut_data_value_refcursor).filter_cursor(exclude_list, include_list); + l_actual := treat(a_actual as ut_data_value_refcursor).update_cursor_details(exclude_list, include_list,get_ordered_columns()); l_result := 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() - || chr(10) || 'Diff:' || treat(expected as ut_data_value_refcursor).filter_cursor(exclude_list, include_list).filter_cursor(exclude_list, include_list).diff(l_actual, get_unordered(),get_join_by_list()); + || chr(10) || 'Diff:' || treat(expected as ut_data_value_refcursor).update_cursor_details(exclude_list, include_list,get_ordered_columns()).diff(l_actual, get_unordered(),get_join_by_list()); else l_result := 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() diff --git a/source/expectations/matchers/ut_equal.tps b/source/expectations/matchers/ut_equal.tps index e53fda40b..de8fa4561 100644 --- a/source/expectations/matchers/ut_equal.tps +++ b/source/expectations/matchers/ut_equal.tps @@ -1,4 +1,4 @@ -create or replace type ut_equal under ut_comparison_matcher( +create or replace type ut_equal force under ut_comparison_matcher( /* utPLSQL - Version 3 Copyright 2016 - 2018 utPLSQL Project @@ -42,6 +42,11 @@ create or replace type ut_equal under ut_comparison_matcher( */ join_on_list ut_varchar2_list, + /** + * Flag to force cursor comparision into ordered mode + */ + is_column_order_enforced number(1,0), + member procedure init(self in out nocopy ut_equal, a_expected ut_data_value, a_nulls_are_equal boolean), member function equal_with_nulls( self in ut_equal, a_assert_result boolean, a_actual ut_data_value) return boolean, constructor function ut_equal(self in out nocopy ut_equal, a_expected anydata, a_nulls_are_equal boolean := null) return self as result, @@ -75,7 +80,9 @@ create or replace type ut_equal under ut_comparison_matcher( member function get_join_by_list return ut_varchar2_list, overriding member function run_matcher(self in out nocopy ut_equal, a_actual ut_data_value) return boolean, overriding member function failure_message(a_actual ut_data_value) return varchar2, - overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2 + overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2, + member function ordered_columns return ut_equal, + member function get_ordered_columns return boolean ) not final / diff --git a/source/expectations/matchers/ut_include.tpb b/source/expectations/matchers/ut_include.tpb index 7045fa1d2..a0e463184 100644 --- a/source/expectations/matchers/ut_include.tpb +++ b/source/expectations/matchers/ut_include.tpb @@ -54,8 +54,8 @@ create or replace type body ut_include as l_result1 integer; begin if self.expected.data_type = a_actual.data_type then - l_actual := treat(a_actual as ut_data_value_refcursor).filter_cursor(exclude_list, include_list); - l_result := 0 = treat(self.expected as ut_data_value_refcursor).filter_cursor(exclude_list, include_list).compare_implementation(l_actual, + l_actual := treat(a_actual as ut_data_value_refcursor).update_cursor_details(exclude_list, include_list,self.get_ordered_columns()); + l_result := 0 = treat(self.expected as ut_data_value_refcursor).update_cursor_details(exclude_list, include_list,self.get_ordered_columns()).compare_implementation(l_actual, true,self.get_inclusion_compare(), self.get_negated(), self.get_join_by_list()); else l_result := (self as ut_matcher).run_matcher(a_actual); @@ -73,10 +73,10 @@ create or replace type body ut_include as l_actual ut_data_value; begin if self.expected.data_type = a_actual.data_type and self.expected.is_diffable then - l_actual := treat(a_actual as ut_data_value_refcursor).filter_cursor(exclude_list, include_list); + l_actual := treat(a_actual as ut_data_value_refcursor).update_cursor_details(exclude_list, include_list,self.get_ordered_columns()); l_result := 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() - || chr(10) || 'Diff:' || treat(expected as ut_data_value_refcursor).filter_cursor(self.exclude_list, self.include_list).diff(l_actual, true, self.get_join_by_list()); + || chr(10) || 'Diff:' || treat(expected as ut_data_value_refcursor).update_cursor_details(exclude_list, include_list,self.get_ordered_columns()).diff(l_actual, true, self.get_join_by_list()); else l_result := (self as ut_matcher).failure_message(a_actual) || ': '|| self.expected.to_string_report(); end if; diff --git a/source/expectations/ut_expectation_compound.tpb b/source/expectations/ut_expectation_compound.tpb index b34b97c85..d899c87a3 100644 --- a/source/expectations/ut_expectation_compound.tpb +++ b/source/expectations/ut_expectation_compound.tpb @@ -227,5 +227,23 @@ create or replace type body ut_expectation_compound as end if; end; + member function ordered_columns return ut_expectation_compound is + l_result ut_expectation_compound; + begin + l_result := self; + l_result.matcher := treat(l_result.matcher as ut_equal).ordered_columns; + return l_result; + end; + + member procedure ordered_columns(self in ut_expectation_compound) is + begin + + if ut_utils.int_to_boolean(negated) then + self.not_to( treat(matcher as ut_equal).ordered_columns ); + else + self.to_( treat(matcher as ut_equal).ordered_columns ); + end if; + end; + end; / diff --git a/source/expectations/ut_expectation_compound.tps b/source/expectations/ut_expectation_compound.tps index ffeb1c056..6dd34e077 100644 --- a/source/expectations/ut_expectation_compound.tps +++ b/source/expectations/ut_expectation_compound.tps @@ -48,7 +48,9 @@ create or replace type ut_expectation_compound under ut_expectation( member function join_by(a_columns varchar2) return ut_expectation_compound, member function join_by(a_columns ut_varchar2_list) return ut_expectation_compound, member procedure join_by(self in ut_expectation_compound, a_columns varchar2), - member procedure join_by(self in ut_expectation_compound, a_columns ut_varchar2_list) + member procedure join_by(self in ut_expectation_compound, a_columns ut_varchar2_list), + member function ordered_columns return ut_expectation_compound, + member procedure ordered_columns(self in ut_expectation_compound) ) final / diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index 5e786ff21..d38dfb402 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -300,11 +300,48 @@ create or replace package body test_expectations_cursor is open l_expected for select 1 as col_1, 2 as col_2 from dual; open l_actual for select 2 as col_2, 1 as col_1 from dual; --Act - ut3.ut.expect( l_actual ).to_equal( l_expected ); + ut3.ut.expect( l_actual ).to_equal( l_expected ).ordered_columns; --Assert ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); end; + procedure pass_on_different_column_order + as + l_expected sys_refcursor; + l_actual sys_refcursor; + begin + --Arrange + open l_expected for select 1 as col_1, 2 as col_2 from dual; + open l_actual for select 2 as col_2, 1 as col_1 from dual; + --Act + ut3.ut.expect( l_actual ).to_equal( l_expected ); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure fail_on_multi_diff_col_order + as + l_expected sys_refcursor; + l_actual sys_refcursor; + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + open l_expected for select 1 as col_1, 2 as col_2,3 as col_3, 4 as col_4,5 col_5 from dual; + open l_actual for select 2 as col_2, 1 as col_1,40 as col_4, 5 as col_5, 30 col_3 from dual; + --Act + ut3.ut.expect( l_actual ).to_equal( l_expected ); + --Assert + l_expected_message := q'[Actual: refcursor [ count = 1 ] was expected to equal: refcursor [ count = 1 ] +%Diff: +%Rows: [ 1 differences ] +%Row No. 1 - Actual: 4030 +%Row No. 1 - Expected: 34]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + procedure fail_on_different_row_order as l_expected sys_refcursor; @@ -600,14 +637,14 @@ Rows: [ 1 differences ] open l_actual for select to_char(rownum) rn, rownum another_rn from dual connect by level <=2; open l_expected for select rownum rn, rownum another_rn from dual connect by level <=2; --Act - ut3.ut.expect(l_actual).to_equal(l_expected); + ut3.ut.expect(l_actual).to_equal(l_expected).ordered_columns; l_expected_message := q'[Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 2 ] Diff: Columns: Column data-type is invalid. Expected: NUMBER, actual: VARCHAR2. Rows: [ all different ] - All rows are different as the columns are not matching.]'; + All rows are different as the columns position is not matching.]'; l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); @@ -635,7 +672,6 @@ Columns:% ut.expect(l_actual_message).to_be_like(l_expected_message); end; - --%test(Reports column diff on cusror with different column positions) procedure column_diff_on_col_position is l_actual sys_refcursor; l_expected sys_refcursor; @@ -646,7 +682,7 @@ Columns:% open l_actual for select rownum+1 col_1, rownum+2 col_2, rownum+3 col_3, rownum+4 col_4 from dual connect by level <=2; open l_expected for select rownum+1 col_1, rownum+4 col_4, rownum+2 col_2, rownum+3 col_3 from dual connect by level <=2; --Act - ut3.ut.expect(l_actual).to_equal(l_expected); + ut3.ut.expect(l_actual).to_equal(l_expected).ordered_columns; l_expected_message := q'[Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 2 ] Diff: @@ -655,12 +691,26 @@ Columns: Column is misplaced. Expected position: 3, actual position: 2. Column is misplaced. Expected position: 4, actual position: 3. Rows: [ all different ] - All rows are different as the columns are not matching.]'; + All rows are different as the columns position is not matching.]'; l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; + procedure column_diff_on_col_pos_unord is + l_actual sys_refcursor; + l_expected sys_refcursor; + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + open l_actual for select rownum+1 col_1, rownum+2 col_2, rownum+3 col_3, rownum+4 col_4 from dual connect by level <=2; + open l_expected for select rownum+1 col_1, rownum+4 col_4, rownum+2 col_2, rownum+3 col_3 from dual connect by level <=2; + --Act + ut3.ut.expect(l_actual).to_equal(l_expected); + + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; --%test(Reports only mismatched columns on column data mismatch) procedure data_diff_on_col_data_mismatch is @@ -741,7 +791,7 @@ Rows: [ 60 differences, showing first 20 ] select 'F' AS GENDER, 'JESSICA' as FIRST_NAME, 'JONES' AS LAST_NAME, 4 as ID, '2345' AS SALARY from dual union all select 'M' AS GENDER, 'LUKE' as FIRST_NAME, 'SKYWALKER' AS LAST_NAME, 2 as ID, '1000' AS SALARY from dual; --Act - ut3.ut.expect(l_actual).to_equal(l_expected); + ut3.ut.expect(l_actual).to_equal(l_expected).ordered_columns; l_expected_message := q'[Actual: refcursor [ count = 4 ] was expected to equal: refcursor [ count = 3 ] Diff: Columns: @@ -761,6 +811,42 @@ Rows: [ 4 differences ] ut.expect(l_actual_message).to_be_like(l_expected_message); end; + procedure col_and_data_diff_not_ordered is + l_actual sys_refcursor; + l_expected sys_refcursor; + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + open l_expected for + select 1 as ID, 'JACK' as FIRST_NAME, 'SPARROW' AS LAST_NAME, 10000 AS SALARY from dual union all + select 2 as ID, 'LUKE' as FIRST_NAME, 'SKYWALKER' AS LAST_NAME, 1000 AS SALARY from dual union all + select 3 as ID, 'TONY' as FIRST_NAME, 'STARK' AS LAST_NAME, 100000 AS SALARY from dual; + open l_actual for + select 'M' AS GENDER, 'JACK' as FIRST_NAME, 'SPARROW' AS LAST_NAME, 1 as ID, '25000' AS SALARY from dual union all + select 'M' AS GENDER, 'TONY' as FIRST_NAME, 'STARK' AS LAST_NAME, 3 as ID, '100000' AS SALARY from dual union all + select 'F' AS GENDER, 'JESSICA' as FIRST_NAME, 'JONES' AS LAST_NAME, 4 as ID, '2345' AS SALARY from dual union all + select 'M' AS GENDER, 'LUKE' as FIRST_NAME, 'SKYWALKER' AS LAST_NAME, 2 as ID, '1000' AS SALARY from dual; + --Act + ut3.ut.expect(l_actual).to_equal(l_expected); + l_expected_message := q'[Actual: refcursor [ count = 4 ] was expected to equal: refcursor [ count = 3 ] +Diff: +Columns: + Column data-type is invalid. Expected: NUMBER, actual: VARCHAR2. + Column [position: 1, data-type: CHAR] is not expected in results. +Rows: [ 4 differences ] + Row No. 1 - Actual: 25000 + Row No. 1 - Expected: 10000 + Row No. 2 - Actual: TONYSTARK3100000 + Row No. 2 - Expected: 2LUKESKYWALKER1000 + Row No. 3 - Actual: JESSICAJONES42345 + Row No. 3 - Expected: 3TONYSTARK100000 + Row No. 4 - Extra: MLUKESKYWALKER21000]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + procedure prepare_table as pragma autonomous_transaction; @@ -965,7 +1051,7 @@ Rows: [ 4 differences ] open l_actual for select '1' , '2' from dual connect by level <=2; open l_expected for select rownum , rownum expected_column_name from dual connect by level <=2; --Act - ut3.ut.expect(l_actual).to_equal(l_expected); + ut3.ut.expect(l_actual).to_equal(l_expected).ordered_columns; l_expected_message := q'[%Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 2 ] %Diff: @@ -975,7 +1061,7 @@ Rows: [ 4 differences ] %Column <1> [position: 1, data-type: CHAR] is not expected in results. %Column <2> [position: 2, data-type: CHAR] is not expected in results. %Rows: [ all different ] -%All rows are different as the columns are not matching.]'; +%All rows are different as the columns position is not matching.]'; l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); @@ -1051,6 +1137,31 @@ Rows: [ 4 differences ] ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; + procedure cursor_joinby_col_not_ord + as + l_expected sys_refcursor; + l_actual sys_refcursor; + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + open l_expected for select 1 as col_1, 2 as col_2,3 as col_3, 4 as col_4,5 col_5 from dual; + open l_actual for select 2 as col_2, 1 as col_1,40 as col_4, 5 as col_5, 30 col_3 from dual; + --Act + ut3.ut.expect( l_actual ).to_equal( l_expected ).join_by('COL_1'); + --Assert + l_expected_message := q'[Actual: refcursor [ count = 1 ] was expected to equal: refcursor [ count = 1 ] +%Diff: +%Rows: [ 1 differences ] +%PK 1 - Actual: 30 +%PK 1 - Expected: 3 +%PK 1 - Actual: 40 +%PK 1 - Expected: 4]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + procedure cursor_joinby_compare_twocols is l_actual SYS_REFCURSOR; l_expected SYS_REFCURSOR; diff --git a/test/core/expectations/test_expectations_cursor.pks b/test/core/expectations/test_expectations_cursor.pks index ae52d741c..a4db867ae 100644 --- a/test/core/expectations/test_expectations_cursor.pks +++ b/test/core/expectations/test_expectations_cursor.pks @@ -68,9 +68,15 @@ create or replace package test_expectations_cursor is --%test(Gives failure when different column name is used in cursors) procedure fail_on_different_column_name; - --%test(Gives failure when different column ordering is used in cursors) + --%test(Gives failure when different column ordering is used in cursors when enforced column order) procedure fail_on_different_column_order; + --%test(Pass when different column ordering is used in cursors) + procedure pass_on_different_column_order; + + --%test(Fail and highlight diffrence between columns when columns are unordered and different value) + procedure fail_on_multi_diff_col_order; + --%test(Gives failure when different row ordering is used in cursors) procedure fail_on_different_row_order; @@ -131,18 +137,24 @@ create or replace package test_expectations_cursor is --%test(Reports column diff on cursor with different column name) procedure column_diff_on_col_name_diff; - --%test(Reports column diff on cursor with different column positions) + --%test(Reports column diff on cursor with different column positions when column order is enforced) procedure column_diff_on_col_position; + --%test(Reports column diff on cursor with different column positions) + procedure column_diff_on_col_pos_unord; + --%test(Reports only mismatched columns on row data mismatch) procedure data_diff_on_col_data_mismatch; --%test(Reports only first 20 rows of diff and gives a full diff count) procedure data_diff_on_20_rows_only; - --%test(Reports data diff and column diff when both are different) + --%test(Reports data diff and column diff when both are different with enforced ordered columns) procedure column_and_data_diff; + --%test(Reports data diff and column diff when both are different when columns are not ordered) + procedure col_and_data_diff_not_ordered; + procedure prepare_table; procedure cleanup_table; @@ -199,6 +211,9 @@ create or replace package test_expectations_cursor is --%test( Compare cursors join by single key ) procedure cursor_joinby_compare; + --%test(Compare cursors by single key with unordered columns position) + procedure cursor_joinby_col_not_ord; + --%test( Compare cursors join by composite key) procedure cursor_joinby_compare_twocols; From 48ad81e7d572e8573328535590c88fe508bebe87 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 7 Dec 2018 12:53:03 +0000 Subject: [PATCH 0149/1096] Small fixes and updates regarding peer review. Updated documentation --- docs/images/venn21.gif | Bin 0 -> 3213 bytes docs/images/venn22.gif | Bin 0 -> 3482 bytes docs/userguide/advanced_data_comparison.md | 4 +- docs/userguide/expectations.md | 67 +++++++++++++++--- source/core/types/ut_cursor_info.tps | 22 ------ source/core/ut_utils.pkb | 5 -- source/core/ut_utils.pks | 3 - .../data_values/ut_compound_data_helper.pkb | 4 +- .../data_values/ut_cursor_column.tps | 14 ++-- .../data_values/ut_cursor_details.tpb | 16 ++--- .../data_values/ut_cursor_details.tps | 2 +- .../data_values/ut_data_value_refcursor.tpb | 22 +++--- 12 files changed, 88 insertions(+), 71 deletions(-) create mode 100644 docs/images/venn21.gif create mode 100644 docs/images/venn22.gif delete mode 100644 source/core/types/ut_cursor_info.tps diff --git a/docs/images/venn21.gif b/docs/images/venn21.gif new file mode 100644 index 0000000000000000000000000000000000000000..0efecae076a09e18dfb67f0b430e8e251e620d55 GIT binary patch literal 3213 zcmeH`>pxTp1IN#qb7tlYLx&l185;Llp%IBl2ZI@5N2W}r{Y)<9-c%}Cab}ELrW%)W z$!au;VvFczZ^vzy+A?9$QmKUQY1P`c@;v*zeEx?0z4*QPz50DWpKq`r$kS_kF|Zvd z0R9OK!w7=V>2wrDnM|gMi3y9vVzb${wzeD&$H~cw%jLSeyL)#XO4F(0x1R1THgQXu=xf#da*Q3IW5Bso-(SXwthGIN>CDXvuGb}{pzUl}iQBGc z6a8)u1E;WUALt?NoW8oC6_(rIk^&JrlWmJ(m(Op6X>3s+O6t|M4=&B*WtJA*ZCfTA zUJ%MUagx4E3UVig!dMpY_Srq}9%`AXlYh!JEe^;i#=gUV|6KEC*P(^z+Rs!>NL2_Yw~G#SL99kY^LV2==k zoYf9i;qz7LEC!Z>5%9>|0c$?%+4Mst<#&FBo*}9QW8dD2GR|2eln~TF_xuUf^wY72 zIc6K&d#Gf|2c_yFg>y3kWmUZI?KcNFWbV1P3=5{B2+_1gU=*vHdtz+ zeNyBWEyPF`YDv^rIaMtni5w?|QWMvlvpM;RCL@8Sp$F~>tWl!V(Cb41DcX8Lr3qT2 z(Bhy|OTW7M*!?m4!u1J@Lad@<%UKLQo#}apPU92Zr3U_LLeI}%Cq5{-+C&5Ce#|`i zjb#;v>i}}Q6eY1=6hLA)$?TfM`$HP8{USK|ELWSBu7LHq9!dGsEcN)cURtLgDZ6O( zuBHp86E*sDA(6;OH%vh!%Q*8~ur#DEB05*~(5p5>6_@#Sh;)oMOV{qpL#y(bZYFqrRfT0u@bu2US_1A*plYk_gUy6Ee{ zYf!Eth`$|O2yzsvh9OtweFG{>UF(99>CF+a-3f&PaH&!FlP~Q}hrtuKYtkqd(sl(P zsB|X*M^C!<0BbGc0GNxH`@J;LTSYuI?*%#q2-4myp!ZD->O-_y9J9-+&jn5Y>ggd_ z?2b3or=We5@JF)g_!WVCln-JtZN&=;i1xS;#&$Rr)4-trN)3jemg}Nn95+`vM&H?4 zyf7fsW?~shLq9I5bwJXGa4b$zYF2Ym?re%MRD^;8u)*b1QS?P-gHJJ=U05Gct?Teu zW@N%=uWqN){(e`Qi%n8JC-k5$sxvtMt%o*bgok1!WTc*Icl|zfF9&@-4?qA481A0R zg`~T8Y^K}%B$1*}emz1GYeLc!j15S5j$J$7Ks8+kgw6=av#j16 zywYrWk~o=eb<1#_ZVUxk2&gl-`@WvMP!JOYfQzg$P$t3)man;`cbb1e*pc#;MkL43 zbC*BeYqi#|w8^zbztgGBW4mzIe?SZs(WUuh`^u20+Q5W{zs=+Ww-1--6Ucgjc-$}S zu#LVck@PC%d@kQH@(<)8XqB-so{4>{E}5*^`tnRx%LrgR(VkMRw?U>1A$15wQYj&K z6O6d5F2|vY(m6cQ$a_otVrpdjAJ)Y21)ZwuZ3184zN%zuM}MBt_Oc(#e-Cxr+R^CO zNJjXziSLsb_R6*lQ?Lt6;u;TcfXO;yvml-dc-uQA`Jww&U^ME9?OP7NIOJ?=E16wfJ^SDx5 zcHt&dQxeURjU$b?_>gy+o)D1PYt*|OEzh6L{upDl76(86R(RBn3sPVdpd=9RN)&R5 zy|ySdsBBSfFoY<$*G=bxvTwR;N{{ZFqR_ta0n$Y#ASmVos1`>gIApbm9O;Rz?)A+vpHK&S z{A^w=n!4h1x1rXPlYEljx+ik_`i1`9lC|@-qaSCO4r4brlD2-o=G|}B7RiHQsk;yP ziTtbb&JTony!%{hc0u{_%ALBjf#Qeb$?FGh#iZ7bbtHYWarLP$dDG#4c8q^|wf|T@ zKkw(Usn5|Tqt<;V&PW@N4KtsuHuA138hqDV;Bv<9snFL|0{;R9<~s;Wj(#sNFzdPV zcAcxnVO6P|8XC!_s&CN3%Ngr(Kie+nfMfuJjwE1!g}O67oA|&ilFBarR0Jsr_*p!U z21;X2WQ^fc)So&I#{$4<(Z}r5h3xsP>`*QiV08@uE_}yN(m$J%XodRaf1%9|Eob9$ z7${yEfkWEH`NMG=K5@Nd%km~cAnug)+Q|S|Y9xyI8hnzuaMi$5x{cwQ4QdZ9y#skn pl9*zd3y@>{Fl=Pzp!so}Gk1stk{Fg6lU*L=1%iP0e*hiSTP9j84`$qlwwfOC@4E2KxB|n zL8TfB%BVsFu|jcEpoB@8rLAJ*AhnKQwbr&ar#*M)f9Sec7w_HrJ_$j7z{>NR~L`R69@z{nM|Qjs8lMAMx)c|34z`#Hb zhZ7na8WtAD=kp^YBcr3E1pD2K_xA1E2!ad@3=9qq4i68j)#|aavGMWoyLazS zPEKkO?XzdkoeZ{&)m5!l`@gLJ+P?(;kAUra3>p9qaQWx@PbYw`7C^dGPP?){ zSJ%WjTHRhZP(ZNfkrfSJ4HZ$`Qtqoe>W52d0fkg<1%0T3@kvYci0biZ<%WdOTJH7B zK{cBXJ-t72-R{l>R<6F)`$J7r^}$8+sTJrTMPpd_az&7}?VTCAu<~jQ3Tr1;)Ok34dfJzXkDL?+54A`qgbDtOS7j#mQ< z?tu|Hg-YocT}~DbxyYg69ADnT@1d; zLIyJ*T6V;_`@ty5nigtWj384q{%NS#3^``zYkFL;JznE?XwG52{Dhh7qkdo`FL)@N zKYDZTzIPsv7InWX542-%XSTD_*ZbZiVvUP+mL#^8?`#hkhlwdNv&EYUr>w1|2$qMj zAeCE8FhQa7h}Sx_If!~x$V~7!X@jaOe-_rU^Hs>ubE>Tkt@c}3{>UHkd5H9<-Day5I1R2Mdk4O( zt%5d_@_mH0{U|-&ESc6cWM1GdA6_^7<4c@JU*LwtMVX|Kkz5#ITqykvE;t@w%S75K2Rv+eFxX?9Ef=vio=9=k6XC1))vg4#Yjw;VvDtX%(6c= zYbG~YRTvn%+$o>_=u4NQ9BfS?2|aYnVH!Gm@Xe<>)Xt3BP-+HD`uS?ntaMc6c47)r z-4fjl38um%9rt(E(|1qm$4wC>-Ww~RmQp#qG@m;NQY_Q=$*>O!MAG9PCSlt+*0X)Y zPf0#~+k%bCB@e35oePs9mz1=966VZCjq?V<>!6|XWrDTZaVG3*V?-U9S=mwz3bk@6Qt+b zlo&DqhT2p+sN~A$a(C&7jkoPYfnCp& zdpx&9Ipzeu_L1r!%Fl8b4K%>sTLv9yex_4*$N>nrBQsN_*|p=k_$Q~kVq&p6=+*w9 z;=c({cRNN#TaZq)2c69ppXKY>l9IkAnk-K{O(#5_-`QLrsE@%Y=xPHIN-L$FYteg;~{qGSdQ8LMPm0(wNBxa>~u0G4;lQtgTLMI#o4s^M0)KBHp+wffEUya|h(`@^3(}t3BHYm26y-RzXN8VPaZ#qIyE=WqyVYrTGrXyy1@M%dbtVxTcbtyakKzhj$;zcbhPj95INz z$To6yTfPFFrN#7(&i7s!g{=pAh1Ubgj4Ql5nMj7qH*|T>d7

IPR9KGO%Op+X3b&OG+2DfrawyVv@9DF%2 zHvhvq13I$6o`R)^RZ0vqYsMm63T;MG7gII9cm9x~$&*`+?ab7k-LPb%iNX^Z!2HLR$>wH)*ia|NNE7G-|4 zPWaW@uxGU=E3X@coAm#fuuf-+6%b*^3IlpD+Ej`*{2P(Re$gEE%p{su`9;*DJ>sbZ z4caNslt%Zj^pnhWU~n*)?+2GLuqDI9g}>8s4Fn2^?68o-Z+QcB6ri!qZOs7<RCI^R=zEVYT0U$ragut}WPC#NxBJuQ!t4)fPQ*Bd{mtH9%k zEAP^*L-8kmUc?ZRh_EglqPzjNiNucp_+mw|X)44V3jGDEIK+uNaSxNUaIzpBXdDV% zr8|CT$bIl;N3)`^ca3LSxAUWNP}qPr6{7W+AcRrmD%=I&T^waGXy4Vchle>$G9v(5 Q7_=V(ddL@#O$fmIze`HySO5S3 literal 0 HcmV?d00001 diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index c5e751526..6929b9845 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -6,7 +6,7 @@ utPLSQL expectations incorporates advanced data comparison options when comparin - object type - nested table and varray -Advanced data-comparison options are available for the [`equal`](expectations.md#equal) and [`include/ contain`](expectations.md#include) matcher. +Advanced data-comparison options are available for the [`equal`](expectations.md#equal) and [`include / contain`](expectations.md#include) matcher. ## Syntax @@ -27,7 +27,7 @@ Advanced data-comparison options are available for the [`equal`](expectations.md - `exclude(a_items varchar2)` - item or comma separated list of items to exclude - `include(a_items ut_varchar2_list)` - table of items to include - `exclude(a_items ut_varchar2_list)` - table of items to exclude - - `unordered` - perform compare on unordered set of data, return only missing or actual ***not supported for `include / contain`*** + - `unordered` - perform compare on unordered set of data, return only missing or actual, ***not supported for `include / contain`*** , as alternative `join_by` can be used - `join_by(a_columns varchar2)` - columns or comma separated list of columns to join two cursors by - `join_by(a_columns ut_varchar2_list)` - table of columns to join two cursors by diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 66a352669..a2f31f4c1 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -437,15 +437,17 @@ To change the behavior of `NULL = NULL` comparison pass the `a_nulls_are_equal = This matcher supports only cursor comparison. It check if the give set contain all values from given subset. -Test using this matcher behaves similar to `equal` in respect that it succeeds only when the compared data-types are exactly the same. +when comparing data using `include / contain` matcher, the data-types of columns for compared cursors must be exactly the same. The matcher supports all advanced comparison options as `equal` e.g. include , exclude, join_by. -The matcher will be successful only when all of the values in expected results are part of actual set. +The matcher is successful when all of the values from expected results are included in actual data set. -In situation where the duplicate is present in expected set we would also expect matching number of occurrences in actual set for matcher to be success. +The matcher will cause a test to fail if any of expected values are not included in actual data set. -*Example 1* +![](D:\Oracle\Devwork\mygit\utPLSQL_pure_sql_cursor\docs\images\venn21.gif) + +*Example 1*. ```sql PROCEDURE ut_refcursors IS @@ -474,11 +476,56 @@ Will result in failure message Missing: 1 ``` +When duplicate rows are present in expected data set, actual data set must also include the same amount of duplicate. + +*Example 2.* -Similar negated `not_to_include`/ `not_to_contain` will be successful only when none of the values from expected set are part of actual e.g. -*Example 2.* +```sql +create or replace package ut_duplicate_test is + + --%suite(Sample Test Suite) + + --%test(Ref Cursor contain duplicates) + procedure ut_duplicate_include; + +end ut_duplicate_test; +/ + +create or replace package body ut_duplicate_test is + procedure ut_duplicate_include is + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + open l_expected for select mod(level,2) as rn from dual connect by level < 5; + open l_actual for select mod(level,8) as rn from dual connect by level < 9; + ut.expect(l_actual).to_include(l_expected); + end; + +end ut_duplicate_test; +``` + +Will result in failure test message + +```sql + 1) ut_duplicate_include + Actual: refcursor [ count = 8 ] was expected to include: refcursor [ count = 4 ] + Diff: + Rows: [ 2 differences ] + Missing: 0 + Missing: 1 +``` + + + +The negated version of `include / contain` ( `not_to_include`/ `not_to_contain` ) is successful only when all values from expected set are not part of actual (they are disjoint and there is no overlap). + + + +![](D:\Oracle\Devwork\mygit\utPLSQL_pure_sql_cursor\docs\images\venn22.gif) + +*Example 3.* Set 1 is defined as [ A , B , C ] @@ -488,7 +535,7 @@ Set 1 is defined as [ A , B , C ] -*Example 2.* +*Example 4.* Set 1 is defined as [ A , B , C , D ] @@ -498,7 +545,7 @@ Set 1 is defined as [ A , B , C , D ] -*Example 3* +*Example 5. Set 1 is defined as [ A , B , C ] @@ -681,9 +728,9 @@ utPLSQL is capable of comparing compound data-types including: ### Notes on comparison of compound data - Compound data can contain elements of any data-type. This includes blob, clob, object type, nested table, varray or even a nested-cursor within a cursor. -- Nested table and varray types are compared as **ordered lists of elements**. If order of elements differ, expectation will fail. +- Attributes in nested table and array types are compared as **ordered lists of elements**. If order of attributes in nested table and array differ, expectation will fail. -- Cursors are compared as **unordered list of elements** by default. If order of elements is of importance the option has to be passed to enforce column order comparison `ordered_columns` e.g. +- Columns in cursors are compared as **unordered list of elements** by default. If order of columns in cursor is of importance the option has to be passed to enforce column order comparison `ordered_columns` e.g. ```sql procedure ut_refcursors1 is diff --git a/source/core/types/ut_cursor_info.tps b/source/core/types/ut_cursor_info.tps deleted file mode 100644 index 0577264f0..000000000 --- a/source/core/types/ut_cursor_info.tps +++ /dev/null @@ -1,22 +0,0 @@ -create or replace type ut_column_info as object ( - /* - utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project - - Licensed under the Apache License, Version 2.0 (the "License"): - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ -column_name varchar2(100), -xml_valid_name varchar2(100), - -) - diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 5e13e608c..dbe57f866 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -692,10 +692,5 @@ create or replace package body ut_utils is return l_result; end; - function serialize_data (a_data clob) return clob is - begin - return replace(a_data,chr(10)); - end; - end ut_utils; / diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index afaf50c28..5a0394813 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -354,8 +354,5 @@ create or replace package ut_utils authid definer is */ function replace_multiline_comments(a_source clob) return clob; - --TODO optimize clob replace to be more efficient as might not work replace on large clobs - function serialize_data (a_data clob) return clob; - end ut_utils; / diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 678da0ce9..7504a4d2b 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -20,7 +20,7 @@ create or replace package body ut_compound_data_helper is g_diff_count integer; g_filter_tab ut_varchar2_list; - type t_type_name_map is table of varchar2(100) index by binary_integer; + type t_type_name_map is table of varchar2(128) index by binary_integer; g_type_name_map t_type_name_map; g_anytype_name_map t_type_name_map; g_anytype_collection_name t_type_name_map; @@ -352,7 +352,7 @@ create or replace package body ut_compound_data_helper is begin dbms_lob.createtemporary(l_compare_sql, true); - gen_sql_pieces_out_of_cursor(a_other.cursor_details.cursor_info, a_join_by_list, + gen_sql_pieces_out_of_cursor(a_other.cursor_details.cursor_columns_info, a_join_by_list, l_xmltable_stmt, l_select_stmt, l_partition_stmt, l_equal_stmt, l_join_on_stmt, l_not_equal_stmt); diff --git a/source/expectations/data_values/ut_cursor_column.tps b/source/expectations/data_values/ut_cursor_column.tps index 6a4929d2d..dae1fc16d 100644 --- a/source/expectations/data_values/ut_cursor_column.tps +++ b/source/expectations/data_values/ut_cursor_column.tps @@ -1,16 +1,16 @@ create or replace type ut_cursor_column force authid current_user as object ( - parent_name varchar2(100), - access_path varchar2(500), + parent_name varchar2(4000), + access_path varchar2(4000), has_nested_col number(1,0), transformed_name varchar2(32), hierarchy_level number, column_position number, - xml_valid_name varchar2(100), - column_name varchar2(100), - column_type varchar2(100), - column_type_name varchar2(100), - column_schema varchar2(100), + xml_valid_name varchar2(128), + column_name varchar2(128), + column_type varchar2(128), + column_type_name varchar2(128), + column_schema varchar2(128), column_len integer, is_sql_diffable number(1, 0), is_collection number(1, 0), diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb index 9f9f4bb52..446ea8942 100644 --- a/source/expectations/data_values/ut_cursor_details.tpb +++ b/source/expectations/data_values/ut_cursor_details.tpb @@ -5,14 +5,14 @@ create or replace type body ut_cursor_details as begin if self.is_column_order_enforced = 1 then select count(1) into l_diffs - from table(self.cursor_info) a full outer join table(a_other.cursor_info) e + from table(self.cursor_columns_info) a full outer join table(a_other.cursor_columns_info) e on ( decode(a.parent_name,e.parent_name,1,0)= 1 and a.column_name = e.column_name and REPLACE(a.column_type,'VARCHAR2','CHAR') = REPLACE(e.column_type,'VARCHAR2','CHAR') and a.column_position = e.column_position ) where a.column_name is null or e.column_name is null; else select count(1) into l_diffs - from table(self.cursor_info) a full outer join table(a_other.cursor_info) e + from table(self.cursor_columns_info) a full outer join table(a_other.cursor_columns_info) e on ( decode(a.parent_name,e.parent_name,1,0)= 1 and a.column_name = e.column_name and REPLACE(a.column_type,'VARCHAR2','CHAR') = REPLACE(e.column_type,'VARCHAR2','CHAR')) where a.column_name is null or e.column_name is null; @@ -155,8 +155,8 @@ create or replace type body ut_cursor_details as end if; l_is_collection := ut_compound_data_helper.is_collection(l_attribute_typecode); - self.cursor_info.extend; - self.cursor_info(cursor_info.last) := ut_cursor_column( l_aname, + self.cursor_columns_info.extend; + self.cursor_columns_info(cursor_columns_info.last) := ut_cursor_column( l_aname, l_schema_name, null, l_len, @@ -176,7 +176,7 @@ create or replace type body ut_cursor_details as constructor function ut_cursor_details(self in out nocopy ut_cursor_details) return self as result is begin - self.cursor_info := ut_cursor_column_tab(); + self.cursor_columns_info := ut_cursor_column_tab(); return; end; @@ -192,7 +192,7 @@ create or replace type body ut_cursor_details as l_hierarchy_level integer := 1; l_anytype anytype; begin - self.cursor_info := ut_cursor_column_tab(); + self.cursor_columns_info := ut_cursor_column_tab(); dbms_sql.describe_columns3(a_cursor_number, l_columns_count, l_columns_desc); @@ -205,8 +205,8 @@ create or replace type body ut_cursor_details as **/ for cur in 1 .. l_columns_count loop l_is_collection := ut_compound_data_helper.is_collection(l_columns_desc(cur).col_schema_name,l_columns_desc(cur).col_type_name); - self.cursor_info.extend; - self.cursor_info(cursor_info.last) := ut_cursor_column( l_columns_desc(cur).col_name, + self.cursor_columns_info.extend; + self.cursor_columns_info(cursor_columns_info.last) := ut_cursor_column( l_columns_desc(cur).col_name, l_columns_desc(cur).col_schema_name, l_columns_desc(cur).col_type_name, l_columns_desc(cur).col_max_len, diff --git a/source/expectations/data_values/ut_cursor_details.tps b/source/expectations/data_values/ut_cursor_details.tps index a64a6dd55..eb0f09f96 100644 --- a/source/expectations/data_values/ut_cursor_details.tps +++ b/source/expectations/data_values/ut_cursor_details.tps @@ -1,6 +1,6 @@ create or replace type ut_cursor_details force authid current_user as object ( - cursor_info ut_cursor_column_tab, + cursor_columns_info ut_cursor_column_tab, is_column_order_enforced number(1,0), order member function compare(a_other ut_cursor_details) return integer, member procedure get_anytype_members_info(a_anytype anytype, a_attribute_typecode out pls_integer, diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index c62163758..965bc4c54 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -102,7 +102,7 @@ create or replace type body ut_data_value_refcursor as overriding member function to_string return varchar2 is l_result clob; l_result_string varchar2(32767); - l_cursor_details ut_cursor_column_tab := self.cursor_details.cursor_info; + l_cursor_details ut_cursor_column_tab := self.cursor_details.cursor_columns_info; l_query varchar2(32767); l_column_info xmltype; @@ -204,13 +204,13 @@ create or replace type body ut_data_value_refcursor as end if; l_actual := treat(a_other as ut_data_value_refcursor); - l_act_cols := l_actual.cursor_details.cursor_info; - l_exp_cols := self.cursor_details.cursor_info; + l_act_cols := l_actual.cursor_details.cursor_columns_info; + l_exp_cols := self.cursor_details.cursor_columns_info; dbms_lob.createtemporary(l_result,true); --diff columns if not self.is_null and not l_actual.is_null then - l_column_diffs := ut_compound_data_helper.get_columns_diff(self.cursor_details.cursor_info,l_actual.cursor_details.cursor_info,l_column_order_enforce); + l_column_diffs := ut_compound_data_helper.get_columns_diff(self.cursor_details.cursor_columns_info,l_actual.cursor_details.cursor_columns_info,l_column_order_enforce); if l_column_diffs.count > 0 then ut_utils.append_to_clob(l_result,chr(10) || 'Columns:' || chr(10)); @@ -220,8 +220,8 @@ create or replace type body ut_data_value_refcursor as l_results(l_results.last) := get_col_diff_text(l_column_diffs(i)); end loop; ut_utils.append_to_clob(l_result, l_results); - l_act_cols := remove_incomparable_cols(l_actual.cursor_details.cursor_info,l_column_diffs); - l_exp_cols := remove_incomparable_cols(self.cursor_details.cursor_info,l_column_diffs); + l_act_cols := remove_incomparable_cols(l_actual.cursor_details.cursor_columns_info,l_column_diffs); + l_exp_cols := remove_incomparable_cols(self.cursor_details.cursor_columns_info,l_column_diffs); end if; --check for missing pk @@ -260,8 +260,8 @@ create or replace type body ut_data_value_refcursor as ut_utils.append_to_clob(l_result, get_missing_key_message(l_missing_pk(i))|| chr(10)); end loop; - if ut_compound_data_helper.contains_collection(self.cursor_details.cursor_info) > 0 - or ut_compound_data_helper.contains_collection(l_actual.cursor_details.cursor_info) > 0 then + if ut_compound_data_helper.contains_collection(self.cursor_details.cursor_columns_info) > 0 + or ut_compound_data_helper.contains_collection(l_actual.cursor_details.cursor_columns_info) > 0 then ut_utils.append_to_clob(l_result,' Please make sure that your join clause is not refferring to collection element'|| chr(10)); end if; @@ -286,7 +286,7 @@ create or replace type body ut_data_value_refcursor as l_actual := treat(a_other as ut_data_value_refcursor); if a_join_by_list.count > 0 then - l_pk_missing_tab := ut_compound_data_helper.get_missing_pk(self.cursor_details.cursor_info,l_actual.cursor_details.cursor_info,a_join_by_list); + l_pk_missing_tab := ut_compound_data_helper.get_missing_pk(self.cursor_details.cursor_columns_info,l_actual.cursor_details.cursor_columns_info,a_join_by_list); l_result := case when (l_pk_missing_tab.count > 0) then 1 else 0 end; end if; @@ -309,8 +309,8 @@ create or replace type body ut_data_value_refcursor as member function update_cursor_details (a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list,a_ordered_columns boolean := false) return ut_data_value_refcursor is l_result ut_data_value_refcursor := self; begin - if l_result.cursor_details.cursor_info is not null then - l_result.cursor_details.cursor_info := ut_compound_data_helper.inc_exc_columns_from_cursor(l_result.cursor_details.cursor_info,a_exclude_xpath,a_include_xpath); + if l_result.cursor_details.cursor_columns_info is not null then + l_result.cursor_details.cursor_columns_info := ut_compound_data_helper.inc_exc_columns_from_cursor(l_result.cursor_details.cursor_columns_info,a_exclude_xpath,a_include_xpath); l_result.cursor_details.ordered_columns(a_ordered_columns); end if; return l_result; From 3ff1e2703f9e4647ce2979ee7fa543fbe722ff32 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 9 Dec 2018 14:59:49 +0000 Subject: [PATCH 0150/1096] Updated paths to venn diagram images --- docs/userguide/expectations.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index a2f31f4c1..5ba07e48f 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -445,7 +445,7 @@ The matcher is successful when all of the values from expected results are inclu The matcher will cause a test to fail if any of expected values are not included in actual data set. -![](D:\Oracle\Devwork\mygit\utPLSQL_pure_sql_cursor\docs\images\venn21.gif) +![included_set](../images/venn21.gif) *Example 1*. @@ -523,7 +523,7 @@ The negated version of `include / contain` ( `not_to_include`/ `not_to_contain` -![](D:\Oracle\Devwork\mygit\utPLSQL_pure_sql_cursor\docs\images\venn22.gif) +![not_overlapping_set](../images/venn22.gif) *Example 3.* From 69da762f1dc35735085f76fd3c4d7b86485d24e4 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 9 Dec 2018 15:07:46 +0000 Subject: [PATCH 0151/1096] Fixed formatting of examples. --- docs/userguide/expectations.md | 338 ++++++++++++++++----------------- 1 file changed, 159 insertions(+), 179 deletions(-) diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 5ba07e48f..04a5fef18 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -112,7 +112,7 @@ create or replace package body test_divide is procedure divides_numbers is begin - ut3.ut.expect(divide(6,2)).to_equal(3); + ut.expect(divide(6,2)).to_equal(3); end; procedure raises_divisor_exception is @@ -124,7 +124,7 @@ create or replace package body test_divide is end; / -exec ut3.ut.run('test_divide'); +exec ut.run('test_divide'); ``` For details see documentation of the [`--%throws` annotation.](annotations.md#throws-annotation) @@ -364,68 +364,68 @@ end; create or replace package test_animals_getter is - --%suite(Animals getter tests) - - --%test(get_animal - returns a dog) - procedure test_variant_1_get_animal; - --%test(get_animal - returns a dog) - procedure test_variant_2_get_animal; - --%test(get_animal - returns a dog) - procedure test_variant_3_get_animal; - --%test(get_animal - returns a dog) - procedure test_variant_4_get_animal; - --%test(get_animal - returns a dog) - procedure test_variant_5_get_animal; + --%suite(Animals getter tests) + + --%test(get_animal - returns a dog) + procedure test_variant_1_get_animal; + --%test(get_animal - returns a dog) + procedure test_variant_2_get_animal; + --%test(get_animal - returns a dog) + procedure test_variant_3_get_animal; + --%test(get_animal - returns a dog) + procedure test_variant_4_get_animal; + --%test(get_animal - returns a dog) + procedure test_variant_5_get_animal; end; / create or replace package body test_animals_getter is - --The below tests perform exactly the same check. - --They use different syntax to achieve the goal. - procedure test_variant_1_get_animal is - l_actual varchar2(100) := 'a dog'; - l_expected varchar2(100); - begin - --Arrange - l_actual := 'a dog'; - --Act - l_expected := get_animal(); - --Assert - ut.expect( l_actual ).to_equal( l_expected ); - end; + --The below tests perform exactly the same check. + --They use different syntax to achieve the goal. + procedure test_variant_1_get_animal is + l_actual varchar2(100) := 'a dog'; + l_expected varchar2(100); + begin + --Arrange + l_actual := 'a dog'; + --Act + l_expected := get_animal(); + --Assert + ut.expect( l_actual ).to_equal( l_expected ); + end; - procedure test_variant_2_get_animal is - l_expected varchar2(100); - begin - --Act - l_expected := get_animal(); - --Assert - ut.expect( l_expected ).to_equal( 'a dog' ); - end; + procedure test_variant_2_get_animal is + l_expected varchar2(100); + begin + --Act + l_expected := get_animal(); + --Assert + ut.expect( l_expected ).to_equal( 'a dog' ); + end; - procedure test_variant_3_get_animal is - begin - --Act / Assert - ut.expect( get_animal() ).to_equal( 'a dog' ); - end; + procedure test_variant_3_get_animal is + begin + --Act / Assert + ut.expect( get_animal() ).to_equal( 'a dog' ); + end; - procedure test_variant_4_get_animal is - begin - --Act / Assert - ut.expect( get_animal() ).to_equal( 'a dog', a_nulls_are_equal => true ); - end; + procedure test_variant_4_get_animal is + begin + --Act / Assert + ut.expect( get_animal() ).to_equal( 'a dog', a_nulls_are_equal => true ); + end; - procedure test_variant_5_get_animal is - begin - --Act / Assert - ut.expect( get_animal() ).to_( equal( 'a dog' ) ); - end; + procedure test_variant_5_get_animal is + begin + --Act / Assert + ut.expect( get_animal() ).to_( equal( 'a dog' ) ); + end; - procedure test_variant_6_get_animal is - begin - --Act / Assert - ut.expect( get_animal() ).to_( equal( 'a dog', a_nulls_are_equal => true ) ); - end; + procedure test_variant_6_get_animal is + begin + --Act / Assert + ut.expect( get_animal() ).to_( equal( 'a dog', a_nulls_are_equal => true ) ); + end; end; ``` @@ -450,7 +450,7 @@ The matcher will cause a test to fail if any of expected values are not included *Example 1*. ```sql - PROCEDURE ut_refcursors IS + procedure ut_refcursors is l_actual SYS_REFCURSOR; l_expected SYS_REFCURSOR; begin @@ -461,7 +461,7 @@ The matcher will cause a test to fail if any of expected values are not included --Act ut.expect(l_actual).to_include(l_expected); - END; + end; ``` Will result in failure message @@ -495,8 +495,8 @@ end ut_duplicate_test; create or replace package body ut_duplicate_test is procedure ut_duplicate_include is - l_actual sys_refcursor; - l_expected sys_refcursor; + l_actual sys_refcursor; + l_expected sys_refcursor; begin open l_expected for select mod(level,2) as rn from dual connect by level < 5; open l_actual for select mod(level,8) as rn from dual connect by level < 9; @@ -559,117 +559,100 @@ Example usage ```sql create or replace package example_include is - --%suite(Include test) + --%suite(Include test) + + --%test( Cursor include data from another cursor) + procedure cursor_to_include; + + --%test( Cursor include data from another cursor) + procedure cursor_not_to_include; + + --%test( Cursor fail include) + procedure cursor_fail_include; - --%test( Cursor include data from another cursor) - procedure cursor_to_include; - - --%test( Cursor include data from another cursor) - procedure cursor_not_to_include; - - --%test( Cursor fail include) - procedure cursor_fail_include; - - --%test( Cursor fail not include) - procedure cursor_fail_not_include; + --%test( Cursor fail not include) + procedure cursor_fail_not_include; end; / create or replace package body example_include is - procedure cursor_to_include is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; - begin - --Arrange - open l_actual for - select 'a' as name from dual - union all - select 'b' as name from dual - union all - select 'c' as name from dual - union all - select 'd' as name from dual; - - open l_expected for - select 'a' as name from dual - union all - select 'b' as name from dual - union all - select 'c' as name from dual; - - --Act - ut3.ut.expect(l_actual).to_include(l_expected); - end; - - procedure cursor_not_to_include is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; - begin - --Arrange - open l_actual for - select 'a' as name from dual - union all - select 'b' as name from dual - union all - select 'c' as name from dual; - - open l_expected for - select 'd' as name from dual - union all - select 'e' as name from dual - union all - select 'f' as name from dual; - - --Act - ut3.ut.expect(l_actual).not_to_include(l_expected); - end; + procedure cursor_to_include is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + begin + --Arrange + open l_actual for + select 'a' as name from dual union all + select 'b' as name from dual union all + select 'c' as name from dual union all + select 'd' as name from dual; - procedure cursor_fail_include is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; - begin - --Arrange - open l_actual for - select 'a' as name from dual - union all - select 'b' as name from dual - union all - select 'c' as name from dual; - - open l_expected for - select 'a' as name from dual - union all - select 'd' as name from dual - union all - select 'e' as name from dual; - - --Act - ut3.ut.expect(l_actual).to_include(l_expected); - end; - - procedure cursor_fail_not_include is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; - begin - --Arrange - open l_actual for - select 'a' as name from dual - union all - select 'b' as name from dual - union all - select 'c' as name from dual; - - open l_expected for - select 'a' as name from dual - union all - select 'd' as name from dual - union all - select 'e' as name from dual; - - --Act - ut3.ut.expect(l_actual).not_to_include(l_expected); - end; + open l_expected for + select 'a' as name from dual union all + select 'b' as name from dual union all + select 'c' as name from dual; + + --Act + ut.expect(l_actual).to_include(l_expected); + end; + + procedure cursor_not_to_include is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + begin + --Arrange + open l_actual for + select 'a' as name from dual union all + select 'b' as name from dual union all + select 'c' as name from dual; + + open l_expected for + select 'd' as name from dual union all + select 'e' as name from dual union all + select 'f' as name from dual; + + --Act + ut.expect(l_actual).not_to_include(l_expected); + end; + + procedure cursor_fail_include is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + begin + --Arrange + open l_actual for + select 'a' as name from dual union all + select 'b' as name from dual union all + select 'c' as name from dual; + + open l_expected for + select 'a' as name from dual union all + select 'd' as name from dual union all + select 'e' as name from dual; + + --Act + ut.expect(l_actual).to_include(l_expected); + end; + + procedure cursor_fail_not_include is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + begin + --Arrange + open l_actual for + select 'a' as name from dual union all + select 'b' as name from dual union all + select 'c' as name from dual; + + open l_expected for + select 'a' as name from dual union all + select 'd' as name from dual union all + select 'e' as name from dual; + + --Act + ut.expect(l_actual).not_to_include(l_expected); + end; end; / ``` @@ -693,7 +676,7 @@ Failures: Rows: [ 2 differences ] Missing: d Missing: e - at "UT3.EXAMPLE_INCLUDE.CURSOR_FAIL_INCLUDE", line 71 ut3.ut.expect(l_actual).to_include(l_expected); + at "UT3.EXAMPLE_INCLUDE.CURSOR_FAIL_INCLUDE", line 71 ut.expect(l_actual).to_include(l_expected); 2) cursor_fail_not_include @@ -713,7 +696,7 @@ Failures: a d e - at "UT3.EXAMPLE_INCLUDE.CURSOR_FAIL_NOT_INCLUDE", line 94 ut3.ut.expect(l_actual).not_to_include(l_expected); + at "UT3.EXAMPLE_INCLUDE.CURSOR_FAIL_NOT_INCLUDE", line 94 ut.expect(l_actual).not_to_include(l_expected); ``` @@ -734,15 +717,15 @@ utPLSQL is capable of comparing compound data-types including: ```sql procedure ut_refcursors1 is - l_actual sys_refcursor; - l_expected sys_refcursor; - l_expected_message varchar2(32767); - l_actual_message varchar2(32767); + l_actual sys_refcursor; + l_expected sys_refcursor; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); begin - open l_actual for select 1 user_id,'s' a_col,'test' username from dual; - open l_expected for select 'test' username,'s' a_col,1 user_id from dual; - --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('USER_ID').ordered_columns; + open l_actual for select 1 user_id,'s' a_col,'test' username from dual; + open l_expected for select 'test' username,'s' a_col,1 user_id from dual; + --Act + ut.expect(l_actual).to_equal(l_expected).join_by('USER_ID').ordered_columns; end; ``` @@ -1069,9 +1052,9 @@ Example below illustrates usage of `cast` operator to assure appropriate precisi ```sql drop table timestamps; create table timestamps ( - ts3 timestamp (3), - ts6 timestamp (6), - ts9 timestamp (9) + ts3 timestamp (3), + ts6 timestamp (6), + ts9 timestamp (9) ); create or replace package timestamps_api is @@ -1206,6 +1189,3 @@ The matrix below illustrates the data types supported by different matchers. | **be_empty** | X | | X | | | | | | | | | X | X | | | **have_count** | | | | | | | | | | | | X | X | | -​ - - From 8697cea7ed2c359d14d4176892f68eda097563e4 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 9 Dec 2018 18:09:36 +0000 Subject: [PATCH 0152/1096] Added missing synonyms for new matchers `contain / include` Fixed public synonyms - they are now pointing to private ut3 synonyms for matchers. --- source/api/contain.syn | 1 + source/api/include.syn | 1 + .../create_synonyms_and_grants_for_public.sql | 30 +++++++++++-------- source/create_user_synonyms.sql | 2 ++ source/install.sql | 2 ++ source/uninstall_objects.sql | 4 +++ .../expectations/test_expectations_cursor.pkb | 4 +-- 7 files changed, 29 insertions(+), 15 deletions(-) create mode 100644 source/api/contain.syn create mode 100644 source/api/include.syn diff --git a/source/api/contain.syn b/source/api/contain.syn new file mode 100644 index 000000000..34609ef8b --- /dev/null +++ b/source/api/contain.syn @@ -0,0 +1 @@ +create synonym contain for ut_include; diff --git a/source/api/include.syn b/source/api/include.syn new file mode 100644 index 000000000..855700e1e --- /dev/null +++ b/source/api/include.syn @@ -0,0 +1 @@ +create synonym include for ut_include; diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index b8daca313..b745449bf 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -112,20 +112,24 @@ prompt Creating synonyms for UTPLSQL objects in &&ut3_owner schema to PUBLIC create public synonym ut_expectation for &&ut3_owner..ut_expectation; create public synonym ut_expectation_compound for &&ut3_owner..ut_expectation_compound; -create public synonym be_between for &&ut3_owner..ut_be_between; -create public synonym be_empty for &&ut3_owner..ut_be_empty; -create public synonym be_false for &&ut3_owner..ut_be_false; -create public synonym be_greater_or_equal for &&ut3_owner..ut_be_greater_or_equal; -create public synonym be_greater_than for &&ut3_owner..ut_be_greater_than; -create public synonym be_less_or_equal for &&ut3_owner..ut_be_less_or_equal; -create public synonym be_less_than for &&ut3_owner..ut_be_less_than; -create public synonym be_like for &&ut3_owner..ut_be_like; -create public synonym be_not_null for &&ut3_owner..ut_be_not_null; -create public synonym be_null for &&ut3_owner..ut_be_null; -create public synonym be_true for &&ut3_owner..ut_be_true; -create public synonym equal for &&ut3_owner..ut_equal; + +create public synonym be_between for &&ut3_owner..be_between; +create public synonym be_empty for &&ut3_owner..be_empty; +create public synonym be_false for &&ut3_owner..be_false; +create public synonym be_greater_or_equal for &&ut3_owner..be_greater_or_equal; +create public synonym be_greater_than for &&ut3_owner..be_greater_than; +create public synonym be_less_or_equal for &&ut3_owner..be_less_or_equal; +create public synonym be_less_than for &&ut3_owner..be_less_than; +create public synonym be_like for &&ut3_owner..be_like; +create public synonym be_not_null for &&ut3_owner..be_not_null; +create public synonym be_null for &&ut3_owner..be_null; +create public synonym be_true for &&ut3_owner..be_true; +create public synonym contain for &&ut3_owner..include; +create public synonym equal for &&ut3_owner..equal; create public synonym have_count for &&ut3_owner..have_count; -create public synonym match for &&ut3_owner..ut_match; +create public synonym include for &&ut3_owner..include; +create public synonym match for &&ut3_owner..match; + create public synonym ut for &&ut3_owner..ut; create public synonym ut_runner for &&ut3_owner..ut_runner; create public synonym ut_teamcity_reporter for &&ut3_owner..ut_teamcity_reporter; diff --git a/source/create_user_synonyms.sql b/source/create_user_synonyms.sql index 9a087f61a..3c75c590b 100644 --- a/source/create_user_synonyms.sql +++ b/source/create_user_synonyms.sql @@ -55,6 +55,7 @@ prompt Creating synonyms for UTPLSQL objects in &&ut3_owner schema to user &&ut3 create or replace synonym &ut3_user..ut_expectation for &&ut3_owner..ut_expectation; create or replace synonym &ut3_user..ut_expectation_compound for &&ut3_owner..ut_expectation_compound; + create or replace synonym &ut3_user..be_between for &&ut3_owner..be_between; create or replace synonym &ut3_user..be_empty for &&ut3_owner..be_empty; create or replace synonym &ut3_user..be_false for &&ut3_owner..be_false; @@ -69,6 +70,7 @@ create or replace synonym &ut3_user..be_true for &&ut3_owner..be_true; create or replace synonym &ut3_user..equal for &&ut3_owner..equal; create or replace synonym &ut3_user..have_count for &&ut3_owner..have_count; create or replace synonym &ut3_user..match for &&ut3_owner..match; + create or replace synonym &ut3_user..ut for &&ut3_owner..ut; create or replace synonym &ut3_user..ut_runner for &&ut3_owner..ut_runner; create or replace synonym &ut3_user..ut_teamcity_reporter for &&ut3_owner..ut_teamcity_reporter; diff --git a/source/install.sql b/source/install.sql index 59283a5de..c029baaef 100644 --- a/source/install.sql +++ b/source/install.sql @@ -312,6 +312,8 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'api/equal.syn' @@install_component.sql 'api/have_count.syn' @@install_component.sql 'api/match.syn' +@@install_component.sql 'api/contain.syn' +@@install_component.sql 'api/include.syn' set linesize 200 set define on diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index 0475e347d..a268acc8a 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -5,6 +5,10 @@ drop synonym have_count; drop synonym match; +drop synonym include; + +drop synonym contain; + drop synonym be_false; drop synonym be_empty; diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index d38dfb402..f47a72339 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -2107,7 +2107,7 @@ Diff:% and rownum < 20; --Act - ut3.ut.expect(l_actual).to_include(l_expected); + ut3.ut.expect(l_actual).to_( ut3.include(l_expected) ); --Assert ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; @@ -2151,7 +2151,7 @@ Diff:% and rownum < 20; --Act - ut3.ut.expect(l_actual).to_contain(l_expected); + ut3.ut.expect(l_actual).to_( ut3.contain(l_expected) ); --Assert ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; From 1645445adb843704e1947e8bfd1fea48637dcb20 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 9 Dec 2018 18:40:35 +0000 Subject: [PATCH 0153/1096] Formatting fixes. --- .../data_values/ut_compound_data_value.tpb | 69 +++++++++++-------- .../data_values/ut_data_value_refcursor.tpb | 16 ++--- 2 files changed, 47 insertions(+), 38 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index a8323eecd..f5d3968cc 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -69,7 +69,10 @@ create or replace type body ut_compound_data_value as return l_result_string; end; - overriding member function diff( a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean := false ) return varchar2 is + overriding member function diff( + a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, + a_join_by_xpath varchar2, a_unordered boolean := false + ) return varchar2 is l_result clob; l_result_string varchar2(32767); begin @@ -80,8 +83,10 @@ create or replace type body ut_compound_data_value as end; -- TODO : Rework to exclude xpath - member function get_data_diff(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, - a_join_by_xpath varchar2, a_unordered boolean) return clob is + member function get_data_diff( + a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, + a_join_by_xpath varchar2, a_unordered boolean + ) return clob is c_max_rows integer := ut_utils.gc_diff_max_rows; l_result clob; l_results ut_utils.t_clob_tab := ut_utils.t_clob_tab(); @@ -191,8 +196,10 @@ create or replace type body ut_compound_data_value as return l_result; end; - member function compare_implementation(a_other ut_data_value, a_unordered boolean, a_inclusion_compare boolean, - a_is_negated boolean, a_join_by_list ut_varchar2_list:=ut_varchar2_list()) return integer is + member function compare_implementation( + a_other ut_data_value, a_unordered boolean, a_inclusion_compare boolean, + a_is_negated boolean, a_join_by_list ut_varchar2_list := ut_varchar2_list() + ) return integer is l_diff_id ut_compound_data_helper.t_hash; l_other ut_compound_data_value; @@ -205,33 +212,35 @@ create or replace type body ut_compound_data_value as l_sql_rowcount integer :=0; begin - l_other := treat(a_other as ut_compound_data_value); - l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); - - open l_loop_curs for ut_compound_data_helper.gen_compare_sql(a_inclusion_compare, a_is_negated, a_unordered, - treat(a_other as ut_data_value_refcursor), a_join_by_list ) using self.data_id,l_other.data_id; - loop - fetch l_loop_curs bulk collect into l_diff_tab limit l_max_rows; - exit when l_diff_tab.count = 0; - if (ut_utils.gc_diff_max_rows > l_sql_rowcount ) then - ut_compound_data_helper.insert_diffs_result(l_diff_tab,l_diff_id); - end if; - l_sql_rowcount := l_sql_rowcount + l_diff_tab.count; - if (ut_utils.gc_diff_max_rows <= l_sql_rowcount and l_max_rows != ut_utils.gc_bc_fetch_limit ) then - l_max_rows := ut_utils.gc_bc_fetch_limit; - end if; - end loop; - - ut_compound_data_helper.set_rows_diff(l_sql_rowcount); - --result is OK only if both are same - if l_sql_rowcount = 0 and ( self.elements_count = l_other.elements_count or a_inclusion_compare )then - l_result := 0; - else - l_result := 1; - end if; + l_other := treat(a_other as ut_compound_data_value); + l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); + + open l_loop_curs for + ut_compound_data_helper.gen_compare_sql( + a_inclusion_compare, a_is_negated, a_unordered, + treat(a_other as ut_data_value_refcursor), a_join_by_list + ) using self.data_id,l_other.data_id; + loop + fetch l_loop_curs bulk collect into l_diff_tab limit l_max_rows; + exit when l_diff_tab.count = 0; + if (ut_utils.gc_diff_max_rows > l_sql_rowcount ) then + ut_compound_data_helper.insert_diffs_result(l_diff_tab,l_diff_id); + end if; + l_sql_rowcount := l_sql_rowcount + l_diff_tab.count; + if (ut_utils.gc_diff_max_rows <= l_sql_rowcount and l_max_rows != ut_utils.gc_bc_fetch_limit ) then + l_max_rows := ut_utils.gc_bc_fetch_limit; + end if; + end loop; - return l_result; + ut_compound_data_helper.set_rows_diff(l_sql_rowcount); + --result is OK only if both are same + if l_sql_rowcount = 0 and ( self.elements_count = l_other.elements_count or a_inclusion_compare ) then + l_result := 0; + else + l_result := 1; + end if; + return l_result; end; end; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 965bc4c54..10be342ea 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -25,10 +25,10 @@ create or replace type body ut_data_value_refcursor as member procedure extract_cursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) is c_bulk_rows constant integer := 10000; l_cursor sys_refcursor := a_value; - l_ctx number; - l_xml xmltype; - l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_set_id integer := 0; + l_ctx number; + l_xml xmltype; + l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_set_id integer := 0; begin -- We use DBMS_XMLGEN in order to: -- 1) be able to process data in bulks (set of rows) @@ -67,8 +67,8 @@ create or replace type body ut_data_value_refcursor as end; member procedure init(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) is - l_cursor sys_refcursor := a_value; - cursor_not_open exception; + l_cursor sys_refcursor := a_value; + cursor_not_open exception; l_cursor_number number; begin self.is_data_null := ut_utils.boolean_to_int(a_value is null); @@ -80,13 +80,13 @@ create or replace type body ut_data_value_refcursor as if l_cursor is not null then if l_cursor%isopen then --Get some more info regarding cursor, including if it containts collection columns and what is their name - self.elements_count := 0; + self.elements_count := 0; extract_cursor(l_cursor); l_cursor_number := dbms_sql.to_cursor_number(l_cursor); self.cursor_details := ut_cursor_details(l_cursor_number); dbms_sql.close_cursor(l_cursor_number); elsif not l_cursor%isopen then - raise cursor_not_open; + raise cursor_not_open; end if; end if; exception From 62c12cd5ed72d64d4f3457e1d278342f910b219b Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 9 Dec 2018 18:44:09 +0000 Subject: [PATCH 0154/1096] Removed unused variables. --- source/expectations/data_values/ut_compound_data_value.tpb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index f5d3968cc..860bc2ae3 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -43,7 +43,6 @@ create or replace type body ut_compound_data_value as overriding member function to_string return varchar2 is l_results ut_utils.t_clob_tab; - c_max_rows constant integer := 20; l_result clob; l_result_string varchar2(32767); begin @@ -91,14 +90,11 @@ create or replace type body ut_compound_data_value as l_result clob; l_results ut_utils.t_clob_tab := ut_utils.t_clob_tab(); l_message varchar2(32767); - l_ut_owner varchar2(250) := ut_utils.ut_owner; l_diff_row_count integer; l_actual ut_compound_data_value; l_diff_id ut_compound_data_helper.t_hash; l_row_diffs ut_compound_data_helper.tt_row_diffs; - l_compare_type varchar2(10); - l_self ut_compound_data_value; - + function get_diff_message (a_row_diff ut_compound_data_helper.t_row_diffs,a_is_unordered boolean) return varchar2 is begin return ' Row No. '||a_row_diff.rn||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; From ca9f8ebfaeaaa687479f4cf1b26fc70ff931ea6a Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 9 Dec 2018 19:20:00 +0000 Subject: [PATCH 0155/1096] Formatting fixes. --- .../data_values/ut_compound_data_helper.pkb | 16 +- .../data_values/ut_cursor_column.tpb | 103 ++-- .../data_values/ut_cursor_details.tpb | 488 +++++++++--------- source/expectations/matchers/ut_include.tpb | 15 +- 4 files changed, 322 insertions(+), 300 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 7504a4d2b..0e3ffdcfa 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -780,7 +780,12 @@ create or replace package body ut_compound_data_helper is end if; end; - function is_collection (a_owner varchar2,a_type_name varchar2, a_anytype_code in integer :=null) return boolean is + function is_collection (a_anytype_code in integer) return boolean is + begin + return a_anytype_code in (dbms_types.typecode_varray,dbms_types.typecode_table,dbms_types.typecode_namedcollection); + end; + + function is_collection (a_owner varchar2, a_type_name varchar2, a_anytype_code in integer :=null) return boolean is l_type_view varchar2(200) := ut_metadata.get_dba_view('dba_types'); l_typecode varchar2(100); begin @@ -791,7 +796,7 @@ create or replace package body ut_compound_data_helper is return l_typecode = 'COLLECTION'; else - return a_anytype_code in (dbms_types.typecode_varray,dbms_types.typecode_table,dbms_types.typecode_namedcollection); + return is_collection(a_anytype_code); end if; exception @@ -799,13 +804,6 @@ create or replace package body ut_compound_data_helper is return false; end; - function is_collection (a_anytype_code in integer) return boolean is - l_type_view varchar2(200) := ut_metadata.get_dba_view('dba_types'); - l_typecode varchar2(100); - begin - return a_anytype_code in (dbms_types.typecode_varray,dbms_types.typecode_table,dbms_types.typecode_namedcollection); - end; - function get_column_type_desc(a_type_code in integer, a_dbms_sql_desc in boolean) return varchar2 is begin return case when a_dbms_sql_desc then g_type_name_map(a_type_code) else g_anytype_name_map(a_type_code) end; diff --git a/source/expectations/data_values/ut_cursor_column.tpb b/source/expectations/data_values/ut_cursor_column.tpb index 52be9a3d4..a956164f5 100644 --- a/source/expectations/data_values/ut_cursor_column.tpb +++ b/source/expectations/data_values/ut_cursor_column.tpb @@ -1,50 +1,53 @@ -create or replace type body ut_cursor_column as - - member procedure init(self in out nocopy ut_cursor_column, - a_col_name varchar2, a_col_schema_name varchar2, - a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, - a_col_position integer, a_col_type varchar2, a_collection integer,a_access_path in varchar2) is - begin - self.parent_name := a_parent_name; --Name of the parent if its nested - self.hierarchy_level := a_hierarchy_level; --Hierarchy level - self.column_position := a_col_position; --Position of the column in cursor/ type - self.column_len := a_col_max_len; --length of column - self.column_name := TRIM( BOTH '''' FROM a_col_name); --name of the column - self.column_type_name := a_col_type_name; --type name e.g. test_dummy_object or varchar2 - self.access_path := case when a_access_path is null then - self.column_name - else - a_access_path||'/'||self.column_name - end; --Access path used for incldue exclude eg/ TEST_DUMMY_OBJECT/VARCHAR2 - self.xml_valid_name := '"'||self.column_name||'"'; --User friendly column name - self.transformed_name := case when self.parent_name is null then - self.xml_valid_name - else - '"'||ut_compound_data_helper.get_fixed_size_hash(self.parent_name||self.column_name)||'"' - end; --when is nestd we need to hash name to make sure we dont exceed 30 char - self.column_type := a_col_type; --column type e.g. user_defined , varchar2 - self.column_schema := a_col_schema_name; -- schema name - self.is_sql_diffable := case when lower(self.column_type) = 'user_defined_type' then - 0 - else - ut_utils.boolean_to_int(ut_compound_data_helper.is_sql_compare_allowed(self.column_type)) - end; --can we directly compare or do we need to hash value - self.is_collection := a_collection; - self.has_nested_col := case when lower(self.column_type) = 'user_defined_type' and self.is_collection = 0 then 1 else 0 end; - end; - - constructor function ut_cursor_column( self in out nocopy ut_cursor_column, - a_col_name varchar2, a_col_schema_name varchar2, - a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, - a_col_position integer, a_col_type in varchar2, a_collection integer,a_access_path in varchar2) return self as result is - begin - init(a_col_name, a_col_schema_name, a_col_type_name, a_col_max_len, a_parent_name,a_hierarchy_level, a_col_position, a_col_type, a_collection,a_access_path); - return; - end; - - constructor function ut_cursor_column( self in out nocopy ut_cursor_column) return self as result is - begin - return; - end; -end; -/ +create or replace type body ut_cursor_column as + + member procedure init( + self in out nocopy ut_cursor_column, + a_col_name varchar2, a_col_schema_name varchar2, + a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, + a_col_position integer, a_col_type varchar2, a_collection integer,a_access_path in varchar2 + ) is + begin + self.parent_name := a_parent_name; --Name of the parent if its nested + self.hierarchy_level := a_hierarchy_level; --Hierarchy level + self.column_position := a_col_position; --Position of the column in cursor/ type + self.column_len := a_col_max_len; --length of column + self.column_name := TRIM( BOTH '''' FROM a_col_name); --name of the column + self.column_type_name := a_col_type_name; --type name e.g. test_dummy_object or varchar2 + self.access_path := case when a_access_path is null then + self.column_name + else + a_access_path||'/'||self.column_name + end; --Access path used for incldue exclude eg/ TEST_DUMMY_OBJECT/VARCHAR2 + self.xml_valid_name := '"'||self.column_name||'"'; --User friendly column name + self.transformed_name := case when self.parent_name is null then + self.xml_valid_name + else + '"'||ut_compound_data_helper.get_fixed_size_hash(self.parent_name||self.column_name)||'"' + end; --when is nestd we need to hash name to make sure we dont exceed 30 char + self.column_type := a_col_type; --column type e.g. user_defined , varchar2 + self.column_schema := a_col_schema_name; -- schema name + self.is_sql_diffable := case when lower(self.column_type) = 'user_defined_type' then + 0 + else + ut_utils.boolean_to_int(ut_compound_data_helper.is_sql_compare_allowed(self.column_type)) + end; --can we directly compare or do we need to hash value + self.is_collection := a_collection; + self.has_nested_col := case when lower(self.column_type) = 'user_defined_type' and self.is_collection = 0 then 1 else 0 end; + end; + + constructor function ut_cursor_column( self in out nocopy ut_cursor_column, + a_col_name varchar2, a_col_schema_name varchar2, + a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, + a_col_position integer, a_col_type in varchar2, a_collection integer,a_access_path in varchar2 + ) return self as result is + begin + init(a_col_name, a_col_schema_name, a_col_type_name, a_col_max_len, a_parent_name,a_hierarchy_level, a_col_position, a_col_type, a_collection,a_access_path); + return; + end; + + constructor function ut_cursor_column( self in out nocopy ut_cursor_column) return self as result is + begin + return; + end; +end; +/ diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb index 446ea8942..beb60e44d 100644 --- a/source/expectations/data_values/ut_cursor_details.tpb +++ b/source/expectations/data_values/ut_cursor_details.tpb @@ -1,238 +1,250 @@ -create or replace type body ut_cursor_details as - - order member function compare(a_other ut_cursor_details) return integer is - l_diffs integer; - begin - if self.is_column_order_enforced = 1 then - select count(1) into l_diffs - from table(self.cursor_columns_info) a full outer join table(a_other.cursor_columns_info) e - on ( decode(a.parent_name,e.parent_name,1,0)= 1 and a.column_name = e.column_name and - REPLACE(a.column_type,'VARCHAR2','CHAR') = REPLACE(e.column_type,'VARCHAR2','CHAR') - and a.column_position = e.column_position ) - where a.column_name is null or e.column_name is null; - else - select count(1) into l_diffs - from table(self.cursor_columns_info) a full outer join table(a_other.cursor_columns_info) e - on ( decode(a.parent_name,e.parent_name,1,0)= 1 and a.column_name = e.column_name and - REPLACE(a.column_type,'VARCHAR2','CHAR') = REPLACE(e.column_type,'VARCHAR2','CHAR')) - where a.column_name is null or e.column_name is null; - end if; - return l_diffs; - end; - - member procedure get_anytype_members_info(a_anytype anytype, a_attribute_typecode out pls_integer, - a_schema_name out varchar2, a_type_name out varchar2, a_len out pls_integer,a_elements_count out pls_integer) is - l_version varchar2(32767); - l_prec pls_integer; - l_scale pls_integer; - l_csid pls_integer; - l_csfrm pls_integer; - begin - a_attribute_typecode := a_anytype.getinfo(prec => l_prec, - scale => l_scale, - len => a_len, - csid => l_csid, - csfrm => l_csfrm, - schema_name => a_schema_name, - type_name => a_type_name, - version => l_version, - numelems => a_elements_count); - end; - - member procedure getattreleminfo(a_anytype anytype,a_pos pls_integer, a_attribute_typecode out pls_integer, - a_type_name out varchar2, a_len out pls_integer, a_attr_elt_type out anytype) is - l_version varchar2(32767); - l_prec pls_integer; - l_scale pls_integer; - l_csid pls_integer; - l_csfrm pls_integer; - l_attr_elt_type anytype; - begin - a_attribute_typecode := a_anytype.getattreleminfo(pos => a_pos, --First attribute - prec => l_prec, - scale => l_scale, - len => a_len, - csid => l_csid, - csfrm => l_csfrm, - attr_elt_type => l_attr_elt_type, - aname => a_type_name); - end; - - member function get_user_defined_type(a_owner varchar2, a_type_name varchar2) - return anytype is - l_anydata anydata; - l_anytype anytype; - l_typecode pls_integer; - begin - execute immediate 'declare - l_v ' || a_owner || '.' || - a_type_name || '; - begin - :anydata := anydata.convertobject(l_v); - end;' - using in out l_anydata; - - l_typecode := l_anydata.gettype(l_anytype); - - return l_anytype; - end; - - member function get_user_defined_type(a_data anydata) return anytype is - l_anytype anytype; - l_typecode pls_integer; - begin - l_typecode:=a_data.gettype(l_anytype); - return l_anytype; - end; - - member function get_anydata_from_compound_data(a_owner varchar2, a_type_name varchar2,a_type varchar2) return anydata is - l_anydata anydata; - begin - execute immediate ' - declare - l_obj '||a_owner||'.'||a_type_name||'; - begin - :anydata := sys.anydata.convert'||a_type||'(l_obj); - end;' - using out l_anydata; - return l_anydata; - end; - - member function get_anytype_of_coll_element(a_collection_owner in varchar2, a_collection_name in varchar2) - return anytype is - l_anytype anytype; - l_anydata anydata; - l_owner varchar2(100); - l_type_name varchar2(100); - begin - l_anydata := get_anydata_from_compound_data(a_collection_owner,a_collection_name,'collection'); - execute immediate' - declare - l_data '||a_collection_owner||'.'||a_collection_name||'; - l_value anydata := :a_value; - l_status integer; - l_loc_query sys_refcursor; - l_cursor_number number; - l_columns_count pls_integer; - l_columns_desc dbms_sql.desc_tab3; - begin - l_status := l_value.getcollection(l_data); - l_data := '||a_collection_owner||'.'||a_collection_name||q'[(); - l_data.extend; - open l_loc_query for select l_data(1) from dual; - l_cursor_number := dbms_sql.to_cursor_number(l_loc_query); - dbms_sql.describe_columns3(l_cursor_number, - l_columns_count, - l_columns_desc); - :owner := l_columns_desc(1).col_schema_name; - :type_name := l_columns_desc(1).col_type_name; - dbms_sql.close_cursor(l_cursor_number); - end;]' using l_anydata, out l_owner,out l_type_name; - l_anytype := get_user_defined_type(l_owner, l_type_name); - return l_anytype; - end; - - member procedure desc_compound_data(self in out nocopy ut_cursor_details,a_compound_data anytype, - a_parent_name in varchar2,a_level in integer, a_access_path in varchar2) is - l_idx pls_integer := 1; - l_elements_count pls_integer; - l_attribute_typecode pls_integer; - l_aname varchar2(32767); - l_len pls_integer; - l_is_collection boolean; - l_schema_name varchar2(100); - l_hierarchy_level integer := a_level; - l_object_type varchar2(10); - l_anydata anydata; - l_attr_elt_type anytype; - begin - get_anytype_members_info(a_compound_data,l_attribute_typecode,l_schema_name,l_aname,l_len,l_elements_count); - while l_idx <= nvl(l_elements_count,1) loop - if l_elements_count is not null then - getattreleminfo(a_compound_data,l_idx,l_attribute_typecode,l_aname,l_len,l_attr_elt_type); - elsif l_attribute_typecode in (dbms_types.typecode_table, dbms_types.typecode_varray, dbms_types.typecode_namedcollection) then - l_attr_elt_type := get_anytype_of_coll_element(l_schema_name, l_aname); - end if; - - l_is_collection := ut_compound_data_helper.is_collection(l_attribute_typecode); - self.cursor_columns_info.extend; - self.cursor_columns_info(cursor_columns_info.last) := ut_cursor_column( l_aname, - l_schema_name, - null, - l_len, - a_parent_name, - l_hierarchy_level, - l_idx, - ut_compound_data_helper.get_column_type_desc(l_attribute_typecode,false), - ut_utils.boolean_to_int(l_is_collection), - a_access_path - ); - if l_attr_elt_type is not null then - desc_compound_data(l_attr_elt_type,l_aname,l_hierarchy_level+1,a_access_path||'/'||l_aname); - end if; - l_idx := l_idx + 1; - end loop; - end; - - constructor function ut_cursor_details(self in out nocopy ut_cursor_details) return self as result is - begin - self.cursor_columns_info := ut_cursor_column_tab(); - return; - end; - - constructor function ut_cursor_details(self in out nocopy ut_cursor_details - ,a_cursor_number in number) - return self as result is - l_cursor_number integer; - l_columns_count pls_integer; - l_columns_desc dbms_sql.desc_tab3; - l_anydata anydata; - l_is_collection boolean; - l_object_type varchar2(10); - l_hierarchy_level integer := 1; - l_anytype anytype; - begin - self.cursor_columns_info := ut_cursor_column_tab(); - dbms_sql.describe_columns3(a_cursor_number, - l_columns_count, - l_columns_desc); - - /** - * Due to a bug with object being part of cursor in anydata scanario - * oracle fails to revert number to cursor. We ar using dbms_sql.close cursor to close it - * to avoid leaving open cursors behind. - * a_cursor := dbms_sql.to_refcursor(l_cursor_number); - **/ - for cur in 1 .. l_columns_count loop - l_is_collection := ut_compound_data_helper.is_collection(l_columns_desc(cur).col_schema_name,l_columns_desc(cur).col_type_name); - self.cursor_columns_info.extend; - self.cursor_columns_info(cursor_columns_info.last) := ut_cursor_column( l_columns_desc(cur).col_name, - l_columns_desc(cur).col_schema_name, - l_columns_desc(cur).col_type_name, - l_columns_desc(cur).col_max_len, - null, - l_hierarchy_level, - cur, - ut_compound_data_helper.get_column_type_desc(l_columns_desc(cur).col_type,true), - ut_utils.boolean_to_int(l_is_collection), - null - ); - - if l_columns_desc(cur).col_type = dbms_sql.user_defined_type or l_is_collection then - l_object_type := case when l_is_collection then 'collection' else 'object' end; - l_anydata := get_anydata_from_compound_data(l_columns_desc(cur).col_schema_name, l_columns_desc(cur).col_type_name, - l_object_type); - l_anytype := get_user_defined_type(l_anydata); - desc_compound_data(l_anytype,l_columns_desc(cur).col_name,l_hierarchy_level+1,l_columns_desc(cur).col_name); - end if; - end loop; - return; - end; - - member procedure ordered_columns(self in out nocopy ut_cursor_details,a_ordered_columns boolean := false) is - begin - self.is_column_order_enforced := ut_utils.boolean_to_int(a_ordered_columns); - end; - -end; -/ +create or replace type body ut_cursor_details as + + order member function compare(a_other ut_cursor_details) return integer is + l_diffs integer; + begin + if self.is_column_order_enforced = 1 then + select count(1) into l_diffs + from table(self.cursor_columns_info) a + full outer join table(a_other.cursor_columns_info) e + on decode(a.parent_name,e.parent_name,1,0)= 1 + and a.column_name = e.column_name + and replace(a.column_type,'VARCHAR2','CHAR') = replace(e.column_type,'VARCHAR2','CHAR') + and a.column_position = e.column_position + where a.column_name is null or e.column_name is null; + else + select count(1) into l_diffs + from table(self.cursor_columns_info) a + full outer join table(a_other.cursor_columns_info) e + on decode(a.parent_name,e.parent_name,1,0)= 1 + and a.column_name = e.column_name + and replace(a.column_type,'VARCHAR2','CHAR') = replace(e.column_type,'VARCHAR2','CHAR') + where a.column_name is null or e.column_name is null; + end if; + return l_diffs; + end; + + member procedure get_anytype_members_info(a_anytype anytype, a_attribute_typecode out pls_integer, + a_schema_name out varchar2, a_type_name out varchar2, a_len out pls_integer,a_elements_count out pls_integer) is + l_version varchar2(32767); + l_prec pls_integer; + l_scale pls_integer; + l_csid pls_integer; + l_csfrm pls_integer; + begin + a_attribute_typecode := a_anytype.getinfo( + prec => l_prec, + scale => l_scale, + len => a_len, + csid => l_csid, + csfrm => l_csfrm, + schema_name => a_schema_name, + type_name => a_type_name, + version => l_version, + numelems => a_elements_count + ); + end; + + member procedure getattreleminfo(a_anytype anytype,a_pos pls_integer, a_attribute_typecode out pls_integer, + a_type_name out varchar2, a_len out pls_integer, a_attr_elt_type out anytype) is + l_prec pls_integer; + l_scale pls_integer; + l_csid pls_integer; + l_csfrm pls_integer; + l_attr_elt_type anytype; + begin + a_attribute_typecode := a_anytype.getattreleminfo( + pos => a_pos, --First attribute + prec => l_prec, + scale => l_scale, + len => a_len, + csid => l_csid, + csfrm => l_csfrm, + attr_elt_type => l_attr_elt_type, + aname => a_type_name + ); + end; + + member function get_user_defined_type(a_owner varchar2, a_type_name varchar2) + return anytype is + l_anydata anydata; + l_anytype anytype; + l_typecode pls_integer; + begin + execute immediate 'declare + l_v ' || a_owner || '.' || a_type_name || '; + begin + :anydata := anydata.convertobject(l_v); + end;' + using in out l_anydata; + + l_typecode := l_anydata.gettype(l_anytype); + + return l_anytype; + end; + + member function get_user_defined_type(a_data anydata) return anytype is + l_anytype anytype; + l_typecode pls_integer; + begin + l_typecode:=a_data.gettype(l_anytype); + return l_anytype; + end; + + member function get_anydata_from_compound_data(a_owner varchar2, a_type_name varchar2,a_type varchar2) return anydata is + l_anydata anydata; + begin + execute immediate ' + declare + l_obj '||a_owner||'.'||a_type_name||'; + begin + :anydata := sys.anydata.convert'||a_type||'(l_obj); + end;' + using out l_anydata; + return l_anydata; + end; + + member function get_anytype_of_coll_element(a_collection_owner in varchar2, a_collection_name in varchar2) + return anytype is + l_anytype anytype; + l_anydata anydata; + l_owner varchar2(100); + l_type_name varchar2(100); + begin + l_anydata := get_anydata_from_compound_data(a_collection_owner,a_collection_name,'collection'); + execute immediate' + declare + l_data '||a_collection_owner||'.'||a_collection_name||'; + l_value anydata := :a_value; + l_status integer; + l_loc_query sys_refcursor; + l_cursor_number number; + l_columns_count pls_integer; + l_columns_desc dbms_sql.desc_tab3; + begin + l_status := l_value.getcollection(l_data); + l_data := '||a_collection_owner||'.'||a_collection_name||q'[(); + l_data.extend; + open l_loc_query for select l_data(1) from dual; + l_cursor_number := dbms_sql.to_cursor_number(l_loc_query); + dbms_sql.describe_columns3(l_cursor_number, + l_columns_count, + l_columns_desc); + :owner := l_columns_desc(1).col_schema_name; + :type_name := l_columns_desc(1).col_type_name; + dbms_sql.close_cursor(l_cursor_number); + end;]' using l_anydata, out l_owner,out l_type_name; + l_anytype := get_user_defined_type(l_owner, l_type_name); + return l_anytype; + end; + + member procedure desc_compound_data(self in out nocopy ut_cursor_details,a_compound_data anytype, + a_parent_name in varchar2,a_level in integer, a_access_path in varchar2) is + l_idx pls_integer := 1; + l_elements_count pls_integer; + l_attribute_typecode pls_integer; + l_aname varchar2(32767); + l_len pls_integer; + l_is_collection boolean; + l_schema_name varchar2(100); + l_hierarchy_level integer := a_level; + l_attr_elt_type anytype; + begin + get_anytype_members_info(a_compound_data,l_attribute_typecode,l_schema_name,l_aname,l_len,l_elements_count); + while l_idx <= nvl(l_elements_count,1) loop + if l_elements_count is not null then + getattreleminfo(a_compound_data,l_idx,l_attribute_typecode,l_aname,l_len,l_attr_elt_type); + elsif l_attribute_typecode in (dbms_types.typecode_table, dbms_types.typecode_varray, dbms_types.typecode_namedcollection) then + l_attr_elt_type := get_anytype_of_coll_element(l_schema_name, l_aname); + end if; + + l_is_collection := ut_compound_data_helper.is_collection(l_attribute_typecode); + self.cursor_columns_info.extend; + self.cursor_columns_info(cursor_columns_info.last) := + ut_cursor_column( + l_aname, + l_schema_name, + null, + l_len, + a_parent_name, + l_hierarchy_level, + l_idx, + ut_compound_data_helper.get_column_type_desc(l_attribute_typecode,false), + ut_utils.boolean_to_int(l_is_collection), + a_access_path + ); + if l_attr_elt_type is not null then + desc_compound_data(l_attr_elt_type,l_aname,l_hierarchy_level+1,a_access_path||'/'||l_aname); + end if; + l_idx := l_idx + 1; + end loop; + end; + + constructor function ut_cursor_details(self in out nocopy ut_cursor_details) return self as result is + begin + self.cursor_columns_info := ut_cursor_column_tab(); + return; + end; + + constructor function ut_cursor_details( + self in out nocopy ut_cursor_details, + a_cursor_number in number + ) return self as result is + l_columns_count pls_integer; + l_columns_desc dbms_sql.desc_tab3; + l_anydata anydata; + l_is_collection boolean; + l_object_type varchar2(10); + l_hierarchy_level integer := 1; + l_anytype anytype; + begin + self.cursor_columns_info := ut_cursor_column_tab(); + dbms_sql.describe_columns3(a_cursor_number, l_columns_count, l_columns_desc); + + /** + * Due to a bug with object being part of cursor in anydata scanario + * oracle fails to revert number to cursor. We ar using dbms_sql.close cursor to close it + * to avoid leaving open cursors behind. + * a_cursor := dbms_sql.to_refcursor(l_cursor_number); + **/ + for cur in 1 .. l_columns_count loop + l_is_collection := ut_compound_data_helper.is_collection( + l_columns_desc(cur).col_schema_name, + l_columns_desc(cur).col_type_name + ); + self.cursor_columns_info.extend; + self.cursor_columns_info(cursor_columns_info.last) := + ut_cursor_column( + l_columns_desc(cur).col_name, + l_columns_desc(cur).col_schema_name, + l_columns_desc(cur).col_type_name, + l_columns_desc(cur).col_max_len, + null, + l_hierarchy_level, + cur, + ut_compound_data_helper.get_column_type_desc(l_columns_desc(cur).col_type,true), + ut_utils.boolean_to_int(l_is_collection), + null + ); + + if l_columns_desc(cur).col_type = dbms_sql.user_defined_type or l_is_collection then + l_object_type := case when l_is_collection then 'collection' else 'object' end; + l_anydata := get_anydata_from_compound_data( + l_columns_desc(cur).col_schema_name, + l_columns_desc(cur).col_type_name, + l_object_type + ); + l_anytype := get_user_defined_type(l_anydata); + desc_compound_data( l_anytype, l_columns_desc(cur).col_name, l_hierarchy_level+1, l_columns_desc(cur).col_name ); + end if; + end loop; + return; + end; + + member procedure ordered_columns(self in out nocopy ut_cursor_details,a_ordered_columns boolean := false) is + begin + self.is_column_order_enforced := ut_utils.boolean_to_int(a_ordered_columns); + end; + +end; +/ diff --git a/source/expectations/matchers/ut_include.tpb b/source/expectations/matchers/ut_include.tpb index a0e463184..dbf014eb8 100644 --- a/source/expectations/matchers/ut_include.tpb +++ b/source/expectations/matchers/ut_include.tpb @@ -55,8 +55,14 @@ create or replace type body ut_include as begin if self.expected.data_type = a_actual.data_type then l_actual := treat(a_actual as ut_data_value_refcursor).update_cursor_details(exclude_list, include_list,self.get_ordered_columns()); - l_result := 0 = treat(self.expected as ut_data_value_refcursor).update_cursor_details(exclude_list, include_list,self.get_ordered_columns()).compare_implementation(l_actual, - true,self.get_inclusion_compare(), self.get_negated(), self.get_join_by_list()); + l_result := + ( 0 + = treat( self.expected as ut_data_value_refcursor ).update_cursor_details( + exclude_list, include_list, self.get_ordered_columns( ) + ).compare_implementation( + l_actual, true, self.get_inclusion_compare( ), self.get_negated( ), self.get_join_by_list( ) + ) + ); else l_result := (self as ut_matcher).run_matcher(a_actual); end if; @@ -76,7 +82,10 @@ create or replace type body ut_include as l_actual := treat(a_actual as ut_data_value_refcursor).update_cursor_details(exclude_list, include_list,self.get_ordered_columns()); l_result := 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() - || chr(10) || 'Diff:' || treat(expected as ut_data_value_refcursor).update_cursor_details(exclude_list, include_list,self.get_ordered_columns()).diff(l_actual, true, self.get_join_by_list()); + || chr(10) || 'Diff:' + || treat(expected as ut_data_value_refcursor).update_cursor_details( + exclude_list, include_list, self.get_ordered_columns() + ).diff(l_actual, true, self.get_join_by_list()); else l_result := (self as ut_matcher).failure_message(a_actual) || ': '|| self.expected.to_string_report(); end if; From 9b4635a2e90037fe69bcfbb0dd4f660227b78245 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Mon, 10 Dec 2018 10:15:04 +0000 Subject: [PATCH 0156/1096] Update create_utplsql_owner.sql Resolves #804 --- source/create_utplsql_owner.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/create_utplsql_owner.sql b/source/create_utplsql_owner.sql index 6bdda5611..740acddf5 100644 --- a/source/create_utplsql_owner.sql +++ b/source/create_utplsql_owner.sql @@ -27,7 +27,7 @@ define ut3_tablespace = &3 prompt Creating utPLSQL user &&ut3_user -create user &ut3_user identified by &ut3_password default tablespace &ut3_tablespace quota unlimited on &ut3_tablespace; +create user &ut3_user identified by "&ut3_password" default tablespace &ut3_tablespace quota unlimited on &ut3_tablespace; grant create session, create sequence, create procedure, create type, create table, create view, create synonym to &ut3_user; From f69d65cd107d8b2009d96538281b4dd157bb6a9e Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 10 Dec 2018 13:38:14 +0000 Subject: [PATCH 0157/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 50f5ae039..0b8121e57 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.4.2419-develop'; + gc_version constant varchar2(50) := 'v3.1.4.2443-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From 004b5370ad716c14bdc9344b6e2902c4f7afb38d Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 10 Dec 2018 22:32:27 +0000 Subject: [PATCH 0158/1096] Refactoring recursive calls for resolving complex types in cursor. Changed `is_collection` and moved to `ut_cursor_column` Changed `get_anytype_members_info`, `get_attr_elem_info` and moved to `ut_compound_data_helper` Fixes to formatting. --- .../data_values/ut_compound_data_helper.pkb | 69 +++-- .../data_values/ut_compound_data_helper.pks | 74 +++-- .../data_values/ut_compound_data_value.tpb | 5 +- .../data_values/ut_cursor_column.tps | 77 +++-- .../data_values/ut_cursor_column_tab.tps | 19 +- .../data_values/ut_cursor_details.tpb | 280 ++++++++---------- .../data_values/ut_cursor_details.tps | 60 ++-- 7 files changed, 316 insertions(+), 268 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 0e3ffdcfa..8bc556e78 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -16,15 +16,12 @@ create or replace package body ut_compound_data_helper is limitations under the License. */ - g_user_defined_type pls_integer := dbms_sql.user_defined_type; g_diff_count integer; - g_filter_tab ut_varchar2_list; - + type t_type_name_map is table of varchar2(128) index by binary_integer; g_type_name_map t_type_name_map; g_anytype_name_map t_type_name_map; - g_anytype_collection_name t_type_name_map; - + function get_columns_filter( a_exclude_xpath varchar2, a_include_xpath varchar2, a_table_alias varchar2 := 'ucd', a_column_alias varchar2 := 'item_data' @@ -228,7 +225,6 @@ create or replace package body ut_compound_data_helper is end; procedure generate_select_stmt(a_data_info ut_cursor_column,a_sql_stmt in out nocopy clob, a_col_name varchar2,a_alias varchar2 := 'ucd.') is - l_sql_stmt clob; l_alias varchar2(10) := a_alias; l_col_syntax varchar2(4000); l_ut_owner varchar2(250) := ut_utils.ut_owner; @@ -326,13 +322,14 @@ create or replace package body ut_compound_data_helper is end; - function gen_compare_sql(a_inclusion_type boolean, a_is_negated boolean,a_unordered boolean, - a_other ut_data_value_refcursor :=null, a_join_by_list ut_varchar2_list:=ut_varchar2_list() ) return clob is + function gen_compare_sql( + a_inclusion_type boolean, a_is_negated boolean, a_unordered boolean, + a_other ut_data_value_refcursor := null, a_join_by_list ut_varchar2_list := ut_varchar2_list() + ) return clob is l_compare_sql clob; l_temp_string varchar2(32767); l_xmltable_stmt clob; - l_where_stmt clob; l_select_stmt clob; l_partition_stmt clob; l_equal_stmt clob; @@ -780,35 +777,47 @@ create or replace package body ut_compound_data_helper is end if; end; - function is_collection (a_anytype_code in integer) return boolean is + function get_column_type_desc(a_type_code in integer, a_dbms_sql_desc in boolean) return varchar2 is begin - return a_anytype_code in (dbms_types.typecode_varray,dbms_types.typecode_table,dbms_types.typecode_namedcollection); + return case when a_dbms_sql_desc then g_type_name_map(a_type_code) else g_anytype_name_map(a_type_code) end; end; - function is_collection (a_owner varchar2, a_type_name varchar2, a_anytype_code in integer :=null) return boolean is - l_type_view varchar2(200) := ut_metadata.get_dba_view('dba_types'); - l_typecode varchar2(100); - begin - if a_anytype_code is null then - execute immediate 'select typecode from '||l_type_view ||' - where owner = :owner and type_name = :typename' - into l_typecode using a_owner,a_type_name; - - return l_typecode = 'COLLECTION'; - else - return is_collection(a_anytype_code); + function get_anytype_members_info( a_anytype anytype ) return t_anytype_members_rec is + l_result t_anytype_members_rec; + begin + if a_anytype is not null then + l_result.type_code := a_anytype.getinfo( + prec => l_result.precision, + scale => l_result.scale, + len => l_result.length, + csid => l_result.char_set_id, + csfrm => l_result.char_set_frm, + schema_name => l_result.schema_name, + type_name => l_result.type_name, + version => l_result.version, + numelems => l_result.elements_count + ); end if; - - exception - when no_data_found then - return false; + return l_result; end; - function get_column_type_desc(a_type_code in integer, a_dbms_sql_desc in boolean) return varchar2 is + function get_attr_elem_info( a_anytype anytype, a_pos pls_integer := null ) return t_anytype_elem_info_rec is + l_result t_anytype_elem_info_rec; begin - return case when a_dbms_sql_desc then g_type_name_map(a_type_code) else g_anytype_name_map(a_type_code) end; + if a_anytype is not null then + l_result.type_code := a_anytype.getattreleminfo( + pos => a_pos, + prec => l_result.precision, + scale => l_result.scale, + len => l_result.length, + csid => l_result.char_set_id, + csfrm => l_result.char_set_frm, + attr_elt_type => l_result.attr_elt_type, + aname => l_result.attribute_name + ); + end if; + return l_result; end; - begin g_anytype_name_map(dbms_types.typecode_date) := 'DATE'; diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 290c101cc..de988e489 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -54,8 +54,33 @@ create or replace package ut_compound_data_helper authid definer is exp_data_id raw(32), item_no number, dup_no number - ); - + ); + + type t_anytype_members_rec is record ( + type_code pls_integer, + schema_name varchar2(128), + type_name varchar2(128), + length pls_integer, + elements_count pls_integer, + version varchar2(32767), + precision pls_integer, + scale pls_integer, + char_set_id pls_integer, + char_set_frm pls_integer + ); + + type t_anytype_elem_info_rec is record ( + type_code pls_integer, + attribute_name varchar2(260), + length pls_integer, + version varchar2(32767), + precision pls_integer, + scale pls_integer, + char_set_id pls_integer, + char_set_frm pls_integer, + attr_elt_type anytype + ); + type t_diff_tab is table of t_diff_rec; function get_columns_filter( @@ -63,15 +88,16 @@ create or replace package ut_compound_data_helper authid definer is a_table_alias varchar2 := 'ucd', a_column_alias varchar2 := 'item_data' ) return varchar2; - function get_columns_diff(a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab,a_order_enforced boolean := false) - return tt_column_diffs; + function get_columns_diff( + a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab,a_order_enforced boolean := false + ) return tt_column_diffs; - function get_pk_value (a_join_by_xpath varchar2,a_item_data xmltype) return clob; + function get_pk_value (a_join_by_xpath varchar2,a_item_data xmltype) return clob; - function get_rows_diff( + function get_rows_diff( a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2 - ) return tt_row_diffs; + ) return tt_row_diffs; function get_rows_diff_by_sql(a_act_cursor_info ut_cursor_column_tab,a_exp_cursor_info ut_cursor_column_tab, a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, @@ -85,8 +111,10 @@ create or replace package ut_compound_data_helper authid definer is function get_fixed_size_hash(a_string varchar2, a_base integer :=0,a_size integer :=9999999) return number; - function gen_compare_sql(a_inclusion_type boolean, a_is_negated boolean, a_unordered boolean, - a_other ut_data_value_refcursor :=null, a_join_by_list ut_varchar2_list:=ut_varchar2_list() ) return clob; + function gen_compare_sql( + a_inclusion_type boolean, a_is_negated boolean, a_unordered boolean, + a_other ut_data_value_refcursor :=null, a_join_by_list ut_varchar2_list:=ut_varchar2_list() + ) return clob; procedure insert_diffs_result(a_diff_tab t_diff_tab, a_diff_id raw); @@ -96,28 +124,34 @@ create or replace package ut_compound_data_helper authid definer is function get_rows_diff_count return integer; - function filter_out_cols(a_cursor_info ut_cursor_column_tab, a_current_list ut_varchar2_list,a_include boolean := true) - return ut_cursor_column_tab; + function filter_out_cols( + a_cursor_info ut_cursor_column_tab, a_current_list ut_varchar2_list,a_include boolean := true + ) return ut_cursor_column_tab; - function get_missing_pk(a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab, a_current_list ut_varchar2_list) - return tt_missing_pk; + function get_missing_pk( + a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab, a_current_list ut_varchar2_list + ) return tt_missing_pk; - function inc_exc_columns_from_cursor (a_cursor_info ut_cursor_column_tab, a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) - return ut_cursor_column_tab; + function inc_exc_columns_from_cursor ( + a_cursor_info ut_cursor_column_tab, a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list + ) return ut_cursor_column_tab; function contains_collection (a_cursor_info ut_cursor_column_tab) return number; - function remove_incomparable_cols( a_cursor_details ut_cursor_column_tab,a_incomparable_cols ut_varchar2_list) return ut_cursor_column_tab; + function remove_incomparable_cols( + a_cursor_details ut_cursor_column_tab,a_incomparable_cols ut_varchar2_list + ) return ut_cursor_column_tab; function getxmlchildren(a_parent_name varchar2,a_cursor_table ut_cursor_column_tab) return xmltype; function is_sql_compare_allowed(a_type_name varchar2) return boolean; - function is_collection (a_owner varchar2,a_type_name varchar2, a_anytype_code in integer :=null) return boolean; + function get_column_type_desc(a_type_code in integer, a_dbms_sql_desc in boolean) return varchar2; - function is_collection (a_anytype_code in integer) return boolean; - function get_column_type_desc(a_type_code in integer, a_dbms_sql_desc in boolean) return varchar2; - + function get_anytype_members_info( a_anytype anytype ) return t_anytype_members_rec; + + function get_attr_elem_info( a_anytype anytype, a_pos pls_integer := null ) return t_anytype_elem_info_rec; + end; / diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index 860bc2ae3..6c67060fb 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -210,7 +210,10 @@ create or replace type body ut_compound_data_value as begin l_other := treat(a_other as ut_compound_data_value); l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); - +-- dbms_output.put_line(ut_compound_data_helper.gen_compare_sql( +-- a_inclusion_compare, a_is_negated, a_unordered, +-- treat(a_other as ut_data_value_refcursor), a_join_by_list +-- )); open l_loop_curs for ut_compound_data_helper.gen_compare_sql( a_inclusion_compare, a_is_negated, a_unordered, diff --git a/source/expectations/data_values/ut_cursor_column.tps b/source/expectations/data_values/ut_cursor_column.tps index dae1fc16d..4b436051a 100644 --- a/source/expectations/data_values/ut_cursor_column.tps +++ b/source/expectations/data_values/ut_cursor_column.tps @@ -1,31 +1,46 @@ -create or replace type ut_cursor_column force authid current_user as object -( - parent_name varchar2(4000), - access_path varchar2(4000), - has_nested_col number(1,0), - transformed_name varchar2(32), - hierarchy_level number, - column_position number, - xml_valid_name varchar2(128), - column_name varchar2(128), - column_type varchar2(128), - column_type_name varchar2(128), - column_schema varchar2(128), - column_len integer, - is_sql_diffable number(1, 0), - is_collection number(1, 0), - - member procedure init(self in out nocopy ut_cursor_column, - a_col_name varchar2, a_col_schema_name varchar2, - a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, - a_col_position integer, a_col_type in varchar2, a_collection integer,a_access_path in varchar2), - - constructor function ut_cursor_column( self in out nocopy ut_cursor_column, - a_col_name varchar2, a_col_schema_name varchar2, - a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, - a_col_position integer, a_col_type in varchar2, a_collection integer,a_access_path in varchar2) - return self as result, - - constructor function ut_cursor_column( self in out nocopy ut_cursor_column) return self as result -) -/ +create or replace type ut_cursor_column force authid current_user as object ( + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + parent_name varchar2(4000), + access_path varchar2(4000), + has_nested_col number(1,0), + transformed_name varchar2(32), + hierarchy_level number, + column_position number, + xml_valid_name varchar2(128), + column_name varchar2(128), + column_type varchar2(128), + column_type_name varchar2(128), + column_schema varchar2(128), + column_len integer, + is_sql_diffable number(1, 0), + is_collection number(1, 0), + + member procedure init(self in out nocopy ut_cursor_column, + a_col_name varchar2, a_col_schema_name varchar2, + a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, + a_col_position integer, a_col_type in varchar2, a_collection integer,a_access_path in varchar2), + + constructor function ut_cursor_column( self in out nocopy ut_cursor_column, + a_col_name varchar2, a_col_schema_name varchar2, + a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, + a_col_position integer, a_col_type in varchar2, a_collection integer, a_access_path in varchar2) + return self as result, + + constructor function ut_cursor_column( self in out nocopy ut_cursor_column) return self as result +) +/ diff --git a/source/expectations/data_values/ut_cursor_column_tab.tps b/source/expectations/data_values/ut_cursor_column_tab.tps index 05516854a..1b7a1698f 100644 --- a/source/expectations/data_values/ut_cursor_column_tab.tps +++ b/source/expectations/data_values/ut_cursor_column_tab.tps @@ -1,2 +1,19 @@ -create or replace type ut_cursor_column_tab as table of ut_cursor_column +create or replace type ut_cursor_column_tab as + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ +table of ut_cursor_column / \ No newline at end of file diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb index beb60e44d..8204c95b5 100644 --- a/source/expectations/data_values/ut_cursor_details.tpb +++ b/source/expectations/data_values/ut_cursor_details.tpb @@ -23,161 +23,90 @@ create or replace type body ut_cursor_details as end if; return l_diffs; end; - - member procedure get_anytype_members_info(a_anytype anytype, a_attribute_typecode out pls_integer, - a_schema_name out varchar2, a_type_name out varchar2, a_len out pls_integer,a_elements_count out pls_integer) is - l_version varchar2(32767); - l_prec pls_integer; - l_scale pls_integer; - l_csid pls_integer; - l_csfrm pls_integer; - begin - a_attribute_typecode := a_anytype.getinfo( - prec => l_prec, - scale => l_scale, - len => a_len, - csid => l_csid, - csfrm => l_csfrm, - schema_name => a_schema_name, - type_name => a_type_name, - version => l_version, - numelems => a_elements_count - ); - end; - - member procedure getattreleminfo(a_anytype anytype,a_pos pls_integer, a_attribute_typecode out pls_integer, - a_type_name out varchar2, a_len out pls_integer, a_attr_elt_type out anytype) is - l_prec pls_integer; - l_scale pls_integer; - l_csid pls_integer; - l_csfrm pls_integer; - l_attr_elt_type anytype; - begin - a_attribute_typecode := a_anytype.getattreleminfo( - pos => a_pos, --First attribute - prec => l_prec, - scale => l_scale, - len => a_len, - csid => l_csid, - csfrm => l_csfrm, - attr_elt_type => l_attr_elt_type, - aname => a_type_name - ); - end; - - member function get_user_defined_type(a_owner varchar2, a_type_name varchar2) - return anytype is - l_anydata anydata; - l_anytype anytype; - l_typecode pls_integer; + + member function get_user_defined_type(a_owner varchar2, a_type_name varchar2) return anytype is + l_anytype anytype; + not_found exception; + pragma exception_init(not_found,-22303); begin - execute immediate 'declare - l_v ' || a_owner || '.' || a_type_name || '; - begin - :anydata := anydata.convertobject(l_v); - end;' - using in out l_anydata; - - l_typecode := l_anydata.gettype(l_anytype); - + begin + $if dbms_db_version.version <= 12 $then + l_anytype := anytype.getpersistent( a_owner, a_type_name ); + $else + l_anytype := getanytypefrompersistent( a_owner, a_type_name ); + $end + exception + when not_found then + null; + end; return l_anytype; end; - member function get_user_defined_type(a_data anydata) return anytype is - l_anytype anytype; - l_typecode pls_integer; - begin - l_typecode:=a_data.gettype(l_anytype); - return l_anytype; - end; - - member function get_anydata_from_compound_data(a_owner varchar2, a_type_name varchar2,a_type varchar2) return anydata is - l_anydata anydata; - begin - execute immediate ' - declare - l_obj '||a_owner||'.'||a_type_name||'; - begin - :anydata := sys.anydata.convert'||a_type||'(l_obj); - end;' - using out l_anydata; - return l_anydata; - end; - - member function get_anytype_of_coll_element(a_collection_owner in varchar2, a_collection_name in varchar2) - return anytype is - l_anytype anytype; - l_anydata anydata; - l_owner varchar2(100); - l_type_name varchar2(100); - begin - l_anydata := get_anydata_from_compound_data(a_collection_owner,a_collection_name,'collection'); - execute immediate' - declare - l_data '||a_collection_owner||'.'||a_collection_name||'; - l_value anydata := :a_value; - l_status integer; - l_loc_query sys_refcursor; - l_cursor_number number; - l_columns_count pls_integer; - l_columns_desc dbms_sql.desc_tab3; - begin - l_status := l_value.getcollection(l_data); - l_data := '||a_collection_owner||'.'||a_collection_name||q'[(); - l_data.extend; - open l_loc_query for select l_data(1) from dual; - l_cursor_number := dbms_sql.to_cursor_number(l_loc_query); - dbms_sql.describe_columns3(l_cursor_number, - l_columns_count, - l_columns_desc); - :owner := l_columns_desc(1).col_schema_name; - :type_name := l_columns_desc(1).col_type_name; - dbms_sql.close_cursor(l_cursor_number); - end;]' using l_anydata, out l_owner,out l_type_name; - l_anytype := get_user_defined_type(l_owner, l_type_name); - return l_anytype; - end; - - member procedure desc_compound_data(self in out nocopy ut_cursor_details,a_compound_data anytype, - a_parent_name in varchar2,a_level in integer, a_access_path in varchar2) is + member procedure desc_compound_data( + self in out nocopy ut_cursor_details, a_compound_data anytype, + a_parent_name in varchar2, a_level in integer, a_access_path in varchar2 + ) is l_idx pls_integer := 1; - l_elements_count pls_integer; - l_attribute_typecode pls_integer; - l_aname varchar2(32767); - l_len pls_integer; + l_elements_info ut_compound_data_helper.t_anytype_members_rec; + l_element_info ut_compound_data_helper.t_anytype_elem_info_rec; l_is_collection boolean; - l_schema_name varchar2(100); - l_hierarchy_level integer := a_level; - l_attr_elt_type anytype; begin - get_anytype_members_info(a_compound_data,l_attribute_typecode,l_schema_name,l_aname,l_len,l_elements_count); - while l_idx <= nvl(l_elements_count,1) loop - if l_elements_count is not null then - getattreleminfo(a_compound_data,l_idx,l_attribute_typecode,l_aname,l_len,l_attr_elt_type); - elsif l_attribute_typecode in (dbms_types.typecode_table, dbms_types.typecode_varray, dbms_types.typecode_namedcollection) then - l_attr_elt_type := get_anytype_of_coll_element(l_schema_name, l_aname); - end if; - - l_is_collection := ut_compound_data_helper.is_collection(l_attribute_typecode); + + l_elements_info := ut_compound_data_helper.get_anytype_members_info( a_compound_data ); + + l_is_collection := is_collection(l_elements_info.type_code); + + if l_elements_info.elements_count is null then + + l_element_info := ut_compound_data_helper.get_attr_elem_info( a_compound_data ); + self.cursor_columns_info.extend; self.cursor_columns_info(cursor_columns_info.last) := ut_cursor_column( - l_aname, - l_schema_name, + l_elements_info.type_name, + l_elements_info.schema_name, null, - l_len, + l_elements_info.length, a_parent_name, - l_hierarchy_level, + a_level, l_idx, - ut_compound_data_helper.get_column_type_desc(l_attribute_typecode,false), + ut_compound_data_helper.get_column_type_desc(l_elements_info.type_code,false), ut_utils.boolean_to_int(l_is_collection), a_access_path ); - if l_attr_elt_type is not null then - desc_compound_data(l_attr_elt_type,l_aname,l_hierarchy_level+1,a_access_path||'/'||l_aname); + if l_element_info.attr_elt_type is not null then + desc_compound_data( + l_element_info.attr_elt_type, l_elements_info.type_name, + a_level + 1, a_access_path || '/' || l_elements_info.type_name + ); end if; - l_idx := l_idx + 1; - end loop; + else + while l_idx <= l_elements_info.elements_count loop + l_element_info := ut_compound_data_helper.get_attr_elem_info( a_compound_data, l_idx ); + + self.cursor_columns_info.extend; + self.cursor_columns_info(cursor_columns_info.last) := + ut_cursor_column( + l_element_info.attribute_name, + l_elements_info.schema_name, + null, + l_element_info.length, + a_parent_name, + a_level, + l_idx, + ut_compound_data_helper.get_column_type_desc(l_element_info.type_code,false), + ut_utils.boolean_to_int(l_is_collection), + a_access_path + ); + if l_element_info.attr_elt_type is not null then + desc_compound_data( + l_element_info.attr_elt_type, l_element_info.attribute_name, + a_level + 1, a_access_path || '/' || l_element_info.attribute_name + ); + end if; + l_idx := l_idx + 1; + end loop; + end if; end; constructor function ut_cursor_details(self in out nocopy ut_cursor_details) return self as result is @@ -192,55 +121,80 @@ create or replace type body ut_cursor_details as ) return self as result is l_columns_count pls_integer; l_columns_desc dbms_sql.desc_tab3; - l_anydata anydata; l_is_collection boolean; - l_object_type varchar2(10); l_hierarchy_level integer := 1; - l_anytype anytype; begin self.cursor_columns_info := ut_cursor_column_tab(); dbms_sql.describe_columns3(a_cursor_number, l_columns_count, l_columns_desc); /** - * Due to a bug with object being part of cursor in anydata scanario + * Due to a bug with object being part of cursor in ANYDATA scenario * oracle fails to revert number to cursor. We ar using dbms_sql.close cursor to close it * to avoid leaving open cursors behind. * a_cursor := dbms_sql.to_refcursor(l_cursor_number); **/ - for cur in 1 .. l_columns_count loop - l_is_collection := ut_compound_data_helper.is_collection( - l_columns_desc(cur).col_schema_name, - l_columns_desc(cur).col_type_name - ); + for pos in 1 .. l_columns_count loop + l_is_collection := is_collection( l_columns_desc(pos).col_schema_name, l_columns_desc(pos).col_type_name ); self.cursor_columns_info.extend; - self.cursor_columns_info(cursor_columns_info.last) := + self.cursor_columns_info(self.cursor_columns_info.last) := ut_cursor_column( - l_columns_desc(cur).col_name, - l_columns_desc(cur).col_schema_name, - l_columns_desc(cur).col_type_name, - l_columns_desc(cur).col_max_len, + l_columns_desc(pos).col_name, + l_columns_desc(pos).col_schema_name, + l_columns_desc(pos).col_type_name, + l_columns_desc(pos).col_max_len, null, l_hierarchy_level, - cur, - ut_compound_data_helper.get_column_type_desc(l_columns_desc(cur).col_type,true), + pos, + ut_compound_data_helper.get_column_type_desc(l_columns_desc(pos).col_type,true), ut_utils.boolean_to_int(l_is_collection), null ); - - if l_columns_desc(cur).col_type = dbms_sql.user_defined_type or l_is_collection then - l_object_type := case when l_is_collection then 'collection' else 'object' end; - l_anydata := get_anydata_from_compound_data( - l_columns_desc(cur).col_schema_name, - l_columns_desc(cur).col_type_name, - l_object_type + if l_columns_desc(pos).col_type = dbms_sql.user_defined_type or l_is_collection then + desc_compound_data( + get_user_defined_type( l_columns_desc(pos).col_schema_name, l_columns_desc(pos).col_type_name ), + l_columns_desc(pos).col_name, + l_hierarchy_level + 1, + l_columns_desc(pos).col_name ); - l_anytype := get_user_defined_type(l_anydata); - desc_compound_data( l_anytype, l_columns_desc(cur).col_name, l_hierarchy_level+1, l_columns_desc(cur).col_name ); end if; end loop; return; end; + member function get_anytype_from_name( + a_owner in varchar2, a_type_name in varchar2 + ) return anytype is + l_result anytype; + e_not_found exception; + pragma exception_init(e_not_found,-22303); + begin + begin + $if dbms_db_version.version <= 12 $then + l_result := anytype.getpersistent( a_owner, a_type_name ); + $else + l_result := getanytypefrompersistent( a_owner, a_type_name ); + $end + exception + when e_not_found then + null; + end; + return l_result; + end; + + member function is_collection (a_anytype_code in integer) return boolean is + begin + return coalesce(a_anytype_code in (dbms_types.typecode_varray,dbms_types.typecode_table,dbms_types.typecode_namedcollection),false); + end; + + member function is_collection (a_owner varchar2, a_type_name varchar2) return boolean is + begin + return is_collection( + ut_compound_data_helper.get_anytype_members_info( + get_anytype_from_name(a_owner, a_type_name) + ).type_code + ); + end; + member procedure ordered_columns(self in out nocopy ut_cursor_details,a_ordered_columns boolean := false) is begin self.is_column_order_enforced := ut_utils.boolean_to_int(a_ordered_columns); diff --git a/source/expectations/data_values/ut_cursor_details.tps b/source/expectations/data_values/ut_cursor_details.tps index eb0f09f96..545106d35 100644 --- a/source/expectations/data_values/ut_cursor_details.tps +++ b/source/expectations/data_values/ut_cursor_details.tps @@ -1,22 +1,38 @@ -create or replace type ut_cursor_details force authid current_user as object -( - cursor_columns_info ut_cursor_column_tab, - is_column_order_enforced number(1,0), - order member function compare(a_other ut_cursor_details) return integer, - member procedure get_anytype_members_info(a_anytype anytype, a_attribute_typecode out pls_integer, - a_schema_name out varchar2, a_type_name out varchar2, a_len out pls_integer,a_elements_count out pls_integer), - member procedure getattreleminfo(a_anytype anytype,a_pos pls_integer, a_attribute_typecode out pls_integer, - a_type_name out varchar2, a_len out pls_integer,a_attr_elt_type out anytype), - member function get_anytype_of_coll_element(a_collection_owner in varchar2, a_collection_name in varchar2) - return anytype, - member procedure desc_compound_data(self in out nocopy ut_cursor_details,a_compound_data anytype, - a_parent_name in varchar2,a_level in integer,a_access_path in varchar2), - member function get_anydata_from_compound_data(a_owner varchar2, a_type_name varchar2,a_type varchar2) return anydata, - member function get_user_defined_type(a_owner varchar2, a_type_name varchar2) return anytype, - member function get_user_defined_type(a_data anydata) return anytype, - constructor function ut_cursor_details(self in out nocopy ut_cursor_details) return self as result, - constructor function ut_cursor_details(self in out nocopy ut_cursor_details,a_cursor_number in number) - return self as result, - member procedure ordered_columns(self in out nocopy ut_cursor_details,a_ordered_columns boolean := false) -) -/ +create or replace type ut_cursor_details force authid current_user as object ( + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + cursor_columns_info ut_cursor_column_tab, + is_column_order_enforced number(1,0), + + constructor function ut_cursor_details(self in out nocopy ut_cursor_details) return self as result, + constructor function ut_cursor_details( + self in out nocopy ut_cursor_details,a_cursor_number in number + ) return self as result, + order member function compare(a_other ut_cursor_details) return integer, + member procedure desc_compound_data( + self in out nocopy ut_cursor_details, a_compound_data anytype, + a_parent_name in varchar2, a_level in integer, a_access_path in varchar2 + ), + member function get_user_defined_type(a_owner varchar2, a_type_name varchar2) return anytype, + member function get_anytype_from_name( + a_owner in varchar2, a_type_name in varchar2 + ) return anytype, + member function is_collection(a_anytype_code in integer) return boolean, + member function is_collection(a_owner varchar2, a_type_name varchar2) return boolean, + member procedure ordered_columns(self in out nocopy ut_cursor_details, a_ordered_columns boolean := false) +) +/ From ada957d5a73348906bb8d9b3a62119032e05f2c9 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 10 Dec 2018 23:27:21 +0000 Subject: [PATCH 0159/1096] Fixed exception handling on `anytype.getpersistent` --- source/expectations/data_values/ut_cursor_details.tpb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb index 8204c95b5..36bc9d6a1 100644 --- a/source/expectations/data_values/ut_cursor_details.tpb +++ b/source/expectations/data_values/ut_cursor_details.tpb @@ -165,8 +165,6 @@ create or replace type body ut_cursor_details as a_owner in varchar2, a_type_name in varchar2 ) return anytype is l_result anytype; - e_not_found exception; - pragma exception_init(e_not_found,-22303); begin begin $if dbms_db_version.version <= 12 $then @@ -175,7 +173,7 @@ create or replace type body ut_cursor_details as l_result := getanytypefrompersistent( a_owner, a_type_name ); $end exception - when e_not_found then + when others then null; end; return l_result; From 2ff110d4b1269e41ba7ebb40e56675446eaaaa6a Mon Sep 17 00:00:00 2001 From: lwasylow Date: Tue, 11 Dec 2018 12:44:10 +0000 Subject: [PATCH 0160/1096] Change cursor behaviour to be ordered columns by default. --- docs/userguide/expectations.md | 6 +++--- source/expectations/matchers/ut_equal.tpb | 6 +++--- source/expectations/matchers/ut_equal.tps | 2 +- .../expectations/ut_expectation_compound.tpb | 10 +++++----- .../expectations/ut_expectation_compound.tps | 4 ++-- .../expectations/test_expectations_cursor.pkb | 20 +++++++++---------- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 04a5fef18..bccc027f8 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -713,7 +713,7 @@ utPLSQL is capable of comparing compound data-types including: - Attributes in nested table and array types are compared as **ordered lists of elements**. If order of attributes in nested table and array differ, expectation will fail. -- Columns in cursors are compared as **unordered list of elements** by default. If order of columns in cursor is of importance the option has to be passed to enforce column order comparison `ordered_columns` e.g. +- Columns in cursors are compared as **ordered list of elements** by default. If order of columns in cursor is not of importance the option has to be passed to enforce column order comparison ` unordered_columns` e.g. ```sql procedure ut_refcursors1 is @@ -725,7 +725,7 @@ utPLSQL is capable of comparing compound data-types including: open l_actual for select 1 user_id,'s' a_col,'test' username from dual; open l_expected for select 'test' username,'s' a_col,1 user_id from dual; --Act - ut.expect(l_actual).to_equal(l_expected).join_by('USER_ID').ordered_columns; + ut.expect(l_actual).to_equal(l_expected).join_by('USER_ID').unordered_columns; end; ``` @@ -821,7 +821,7 @@ create or replace package body test_cursor_compare as from dual union all select 'M' AS GENDER, 'LUKE' as FIRST_NAME, 'SKYWALKER' AS LAST_NAME, 2 as ID, '1000' AS SALARY from dual; - ut.expect(l_actual).to_equal(l_expected).ordered_columns; + ut.expect(l_actual).to_equal(l_expected); end; end; / diff --git a/source/expectations/matchers/ut_equal.tpb b/source/expectations/matchers/ut_equal.tpb index d575dc36c..50c6b74a1 100644 --- a/source/expectations/matchers/ut_equal.tpb +++ b/source/expectations/matchers/ut_equal.tpb @@ -254,16 +254,16 @@ create or replace type body ut_equal as return ( coalesce(join_columns, ut_varchar2_list()) ); end; - member function ordered_columns return ut_equal is + member function unordered_columns return ut_equal is l_result ut_equal := self; begin - l_result.is_column_order_enforced := ut_utils.boolean_to_int(true); + l_result.is_column_order_enforced := ut_utils.boolean_to_int(false); return l_result; end; member function get_ordered_columns return boolean is begin - return ut_utils.int_to_boolean(nvl(is_column_order_enforced,0)); + return ut_utils.int_to_boolean(nvl(is_column_order_enforced,1)); end; overriding member function run_matcher(self in out nocopy ut_equal, a_actual ut_data_value) return boolean is diff --git a/source/expectations/matchers/ut_equal.tps b/source/expectations/matchers/ut_equal.tps index de8fa4561..8278f2ed1 100644 --- a/source/expectations/matchers/ut_equal.tps +++ b/source/expectations/matchers/ut_equal.tps @@ -81,7 +81,7 @@ create or replace type ut_equal force under ut_comparison_matcher( overriding member function run_matcher(self in out nocopy ut_equal, a_actual ut_data_value) return boolean, overriding member function failure_message(a_actual ut_data_value) return varchar2, overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2, - member function ordered_columns return ut_equal, + member function unordered_columns return ut_equal, member function get_ordered_columns return boolean ) not final diff --git a/source/expectations/ut_expectation_compound.tpb b/source/expectations/ut_expectation_compound.tpb index d899c87a3..7e855c2ce 100644 --- a/source/expectations/ut_expectation_compound.tpb +++ b/source/expectations/ut_expectation_compound.tpb @@ -227,21 +227,21 @@ create or replace type body ut_expectation_compound as end if; end; - member function ordered_columns return ut_expectation_compound is + member function unordered_columns return ut_expectation_compound is l_result ut_expectation_compound; begin l_result := self; - l_result.matcher := treat(l_result.matcher as ut_equal).ordered_columns; + l_result.matcher := treat(l_result.matcher as ut_equal).unordered_columns; return l_result; end; - member procedure ordered_columns(self in ut_expectation_compound) is + member procedure unordered_columns(self in ut_expectation_compound) is begin if ut_utils.int_to_boolean(negated) then - self.not_to( treat(matcher as ut_equal).ordered_columns ); + self.not_to( treat(matcher as ut_equal).unordered_columns ); else - self.to_( treat(matcher as ut_equal).ordered_columns ); + self.to_( treat(matcher as ut_equal).unordered_columns ); end if; end; diff --git a/source/expectations/ut_expectation_compound.tps b/source/expectations/ut_expectation_compound.tps index 6dd34e077..12b43a4fd 100644 --- a/source/expectations/ut_expectation_compound.tps +++ b/source/expectations/ut_expectation_compound.tps @@ -49,8 +49,8 @@ create or replace type ut_expectation_compound under ut_expectation( member function join_by(a_columns ut_varchar2_list) return ut_expectation_compound, member procedure join_by(self in ut_expectation_compound, a_columns varchar2), member procedure join_by(self in ut_expectation_compound, a_columns ut_varchar2_list), - member function ordered_columns return ut_expectation_compound, - member procedure ordered_columns(self in ut_expectation_compound) + member function unordered_columns return ut_expectation_compound, + member procedure unordered_columns(self in ut_expectation_compound) ) final / diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index f47a72339..ce0b6e0bf 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -300,7 +300,7 @@ create or replace package body test_expectations_cursor is open l_expected for select 1 as col_1, 2 as col_2 from dual; open l_actual for select 2 as col_2, 1 as col_1 from dual; --Act - ut3.ut.expect( l_actual ).to_equal( l_expected ).ordered_columns; + ut3.ut.expect( l_actual ).to_equal( l_expected ); --Assert ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); end; @@ -314,7 +314,7 @@ create or replace package body test_expectations_cursor is open l_expected for select 1 as col_1, 2 as col_2 from dual; open l_actual for select 2 as col_2, 1 as col_1 from dual; --Act - ut3.ut.expect( l_actual ).to_equal( l_expected ); + ut3.ut.expect( l_actual ).to_equal( l_expected ).unordered_columns; --Assert ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; @@ -330,7 +330,7 @@ create or replace package body test_expectations_cursor is open l_expected for select 1 as col_1, 2 as col_2,3 as col_3, 4 as col_4,5 col_5 from dual; open l_actual for select 2 as col_2, 1 as col_1,40 as col_4, 5 as col_5, 30 col_3 from dual; --Act - ut3.ut.expect( l_actual ).to_equal( l_expected ); + ut3.ut.expect( l_actual ).to_equal( l_expected ).unordered_columns; --Assert l_expected_message := q'[Actual: refcursor [ count = 1 ] was expected to equal: refcursor [ count = 1 ] %Diff: @@ -637,7 +637,7 @@ Rows: [ 1 differences ] open l_actual for select to_char(rownum) rn, rownum another_rn from dual connect by level <=2; open l_expected for select rownum rn, rownum another_rn from dual connect by level <=2; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).ordered_columns; + ut3.ut.expect(l_actual).to_equal(l_expected); l_expected_message := q'[Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 2 ] Diff: @@ -682,7 +682,7 @@ Columns:% open l_actual for select rownum+1 col_1, rownum+2 col_2, rownum+3 col_3, rownum+4 col_4 from dual connect by level <=2; open l_expected for select rownum+1 col_1, rownum+4 col_4, rownum+2 col_2, rownum+3 col_3 from dual connect by level <=2; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).ordered_columns; + ut3.ut.expect(l_actual).to_equal(l_expected); l_expected_message := q'[Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 2 ] Diff: @@ -707,7 +707,7 @@ Rows: [ all different ] open l_actual for select rownum+1 col_1, rownum+2 col_2, rownum+3 col_3, rownum+4 col_4 from dual connect by level <=2; open l_expected for select rownum+1 col_1, rownum+4 col_4, rownum+2 col_2, rownum+3 col_3 from dual connect by level <=2; --Act - ut3.ut.expect(l_actual).to_equal(l_expected); + ut3.ut.expect(l_actual).to_equal(l_expected).unordered_columns; ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; @@ -791,7 +791,7 @@ Rows: [ 60 differences, showing first 20 ] select 'F' AS GENDER, 'JESSICA' as FIRST_NAME, 'JONES' AS LAST_NAME, 4 as ID, '2345' AS SALARY from dual union all select 'M' AS GENDER, 'LUKE' as FIRST_NAME, 'SKYWALKER' AS LAST_NAME, 2 as ID, '1000' AS SALARY from dual; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).ordered_columns; + ut3.ut.expect(l_actual).to_equal(l_expected); l_expected_message := q'[Actual: refcursor [ count = 4 ] was expected to equal: refcursor [ count = 3 ] Diff: Columns: @@ -828,7 +828,7 @@ Rows: [ 4 differences ] select 'F' AS GENDER, 'JESSICA' as FIRST_NAME, 'JONES' AS LAST_NAME, 4 as ID, '2345' AS SALARY from dual union all select 'M' AS GENDER, 'LUKE' as FIRST_NAME, 'SKYWALKER' AS LAST_NAME, 2 as ID, '1000' AS SALARY from dual; --Act - ut3.ut.expect(l_actual).to_equal(l_expected); + ut3.ut.expect(l_actual).to_equal(l_expected).unordered_columns; l_expected_message := q'[Actual: refcursor [ count = 4 ] was expected to equal: refcursor [ count = 3 ] Diff: Columns: @@ -1051,7 +1051,7 @@ Rows: [ 4 differences ] open l_actual for select '1' , '2' from dual connect by level <=2; open l_expected for select rownum , rownum expected_column_name from dual connect by level <=2; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).ordered_columns; + ut3.ut.expect(l_actual).to_equal(l_expected); l_expected_message := q'[%Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 2 ] %Diff: @@ -1148,7 +1148,7 @@ Rows: [ 4 differences ] open l_expected for select 1 as col_1, 2 as col_2,3 as col_3, 4 as col_4,5 col_5 from dual; open l_actual for select 2 as col_2, 1 as col_1,40 as col_4, 5 as col_5, 30 col_3 from dual; --Act - ut3.ut.expect( l_actual ).to_equal( l_expected ).join_by('COL_1'); + ut3.ut.expect( l_actual ).to_equal( l_expected ).join_by('COL_1').unordered_columns; --Assert l_expected_message := q'[Actual: refcursor [ count = 1 ] was expected to equal: refcursor [ count = 1 ] %Diff: From bd54710e40a43058c5edba47d00a92bbf8949bb1 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Tue, 11 Dec 2018 17:24:37 +0000 Subject: [PATCH 0161/1096] Adding short-name for unordered columns option UC. --- docs/userguide/expectations.md | 5 +- source/expectations/matchers/ut_equal.tpb | 5 ++ source/expectations/matchers/ut_equal.tps | 1 + .../expectations/ut_expectation_compound.tpb | 11 ++++ .../expectations/ut_expectation_compound.tps | 4 +- .../expectations/test_expectations_cursor.pkb | 64 +++++++++++++++++++ .../expectations/test_expectations_cursor.pks | 12 ++++ 7 files changed, 99 insertions(+), 3 deletions(-) diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index bccc027f8..a1eb1f1dc 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -713,7 +713,7 @@ utPLSQL is capable of comparing compound data-types including: - Attributes in nested table and array types are compared as **ordered lists of elements**. If order of attributes in nested table and array differ, expectation will fail. -- Columns in cursors are compared as **ordered list of elements** by default. If order of columns in cursor is not of importance the option has to be passed to enforce column order comparison ` unordered_columns` e.g. +- Columns in cursors are compared as **ordered list of elements** by default. If order of columns in cursor is not of importance the option has to be passed to enforce column order comparison ` unordered_columns` or a short version `uc` e.g. ```sql procedure ut_refcursors1 is @@ -725,7 +725,8 @@ utPLSQL is capable of comparing compound data-types including: open l_actual for select 1 user_id,'s' a_col,'test' username from dual; open l_expected for select 'test' username,'s' a_col,1 user_id from dual; --Act - ut.expect(l_actual).to_equal(l_expected).join_by('USER_ID').unordered_columns; + ut.expect(l_actual).to_equal(l_expected).join_by('USER_ID').unordered_columns(); + ut.expect(l_actual).to_equal(l_expected).join_by('USER_ID').uc(); end; ``` diff --git a/source/expectations/matchers/ut_equal.tpb b/source/expectations/matchers/ut_equal.tpb index 50c6b74a1..000d3a10c 100644 --- a/source/expectations/matchers/ut_equal.tpb +++ b/source/expectations/matchers/ut_equal.tpb @@ -254,6 +254,11 @@ create or replace type body ut_equal as return ( coalesce(join_columns, ut_varchar2_list()) ); end; + member function uc return ut_equal is + begin + return unordered_columns; + end; + member function unordered_columns return ut_equal is l_result ut_equal := self; begin diff --git a/source/expectations/matchers/ut_equal.tps b/source/expectations/matchers/ut_equal.tps index 8278f2ed1..3a065d7c0 100644 --- a/source/expectations/matchers/ut_equal.tps +++ b/source/expectations/matchers/ut_equal.tps @@ -82,6 +82,7 @@ create or replace type ut_equal force under ut_comparison_matcher( overriding member function failure_message(a_actual ut_data_value) return varchar2, overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2, member function unordered_columns return ut_equal, + member function uc return ut_equal, member function get_ordered_columns return boolean ) not final diff --git a/source/expectations/ut_expectation_compound.tpb b/source/expectations/ut_expectation_compound.tpb index 7e855c2ce..5b8e6e33c 100644 --- a/source/expectations/ut_expectation_compound.tpb +++ b/source/expectations/ut_expectation_compound.tpb @@ -245,5 +245,16 @@ create or replace type body ut_expectation_compound as end if; end; + member function uc return ut_expectation_compound is + l_result ut_expectation_compound; + begin + return unordered_columns; + end; + + member procedure uc(self in ut_expectation_compound) is + begin + unordered_columns; + end; + end; / diff --git a/source/expectations/ut_expectation_compound.tps b/source/expectations/ut_expectation_compound.tps index 12b43a4fd..3cf141047 100644 --- a/source/expectations/ut_expectation_compound.tps +++ b/source/expectations/ut_expectation_compound.tps @@ -50,7 +50,9 @@ create or replace type ut_expectation_compound under ut_expectation( member procedure join_by(self in ut_expectation_compound, a_columns varchar2), member procedure join_by(self in ut_expectation_compound, a_columns ut_varchar2_list), member function unordered_columns return ut_expectation_compound, - member procedure unordered_columns(self in ut_expectation_compound) + member procedure unordered_columns(self in ut_expectation_compound), + member function uc return ut_expectation_compound, + member procedure uc(self in ut_expectation_compound) ) final / diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index ce0b6e0bf..ea3d50363 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -319,6 +319,20 @@ create or replace package body test_expectations_cursor is ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; + procedure pass_on_diff_column_ord_uc + as + l_expected sys_refcursor; + l_actual sys_refcursor; + begin + --Arrange + open l_expected for select 1 as col_1, 2 as col_2 from dual; + open l_actual for select 2 as col_2, 1 as col_1 from dual; + --Act + ut3.ut.expect( l_actual ).to_equal( l_expected ).uc; + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + procedure fail_on_multi_diff_col_order as l_expected sys_refcursor; @@ -342,6 +356,29 @@ create or replace package body test_expectations_cursor is ut.expect(l_actual_message).to_be_like(l_expected_message); end; + procedure fail_on_multi_diff_col_ord_uc + as + l_expected sys_refcursor; + l_actual sys_refcursor; + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + open l_expected for select 1 as col_1, 2 as col_2,3 as col_3, 4 as col_4,5 col_5 from dual; + open l_actual for select 2 as col_2, 1 as col_1,40 as col_4, 5 as col_5, 30 col_3 from dual; + --Act + ut3.ut.expect( l_actual ).to_equal( l_expected ).uc; + --Assert + l_expected_message := q'[Actual: refcursor [ count = 1 ] was expected to equal: refcursor [ count = 1 ] +%Diff: +%Rows: [ 1 differences ] +%Row No. 1 - Actual: 4030 +%Row No. 1 - Expected: 34]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + procedure fail_on_different_row_order as l_expected sys_refcursor; @@ -1095,6 +1132,19 @@ Rows: [ 4 differences ] ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; + procedure cursor_unord_compr_success_uc is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + begin + --Arrange + open l_actual for select user_id, username from all_users order by username asc; + open l_expected for select username , user_id from all_users order by username desc; + --Act + ut3.ut.expect(l_actual).to_equal(l_expected).unordered().uc(); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + procedure cursor_unordered_compare_fail is l_actual SYS_REFCURSOR; l_expected SYS_REFCURSOR; @@ -1122,6 +1172,20 @@ Rows: [ 4 differences ] --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; + + procedure cursor_joinby_compare_uc is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + begin + --Arrange + open l_actual for select owner, object_id, object_name,object_type from all_objects where owner = user; + open l_expected for select object_id, owner, object_name,object_type from all_objects where owner = user; + + --Act + ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OBJECT_ID').uc(); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; procedure cursor_joinby_compare is l_actual SYS_REFCURSOR; diff --git a/test/core/expectations/test_expectations_cursor.pks b/test/core/expectations/test_expectations_cursor.pks index a4db867ae..ea942ddff 100644 --- a/test/core/expectations/test_expectations_cursor.pks +++ b/test/core/expectations/test_expectations_cursor.pks @@ -74,9 +74,15 @@ create or replace package test_expectations_cursor is --%test(Pass when different column ordering is used in cursors) procedure pass_on_different_column_order; + --%test(Pass when different column ordering is used in cursors - shortname) + procedure pass_on_diff_column_ord_uc; + --%test(Fail and highlight diffrence between columns when columns are unordered and different value) procedure fail_on_multi_diff_col_order; + --%test(Fail and highlight diffrence between columns when columns are unordered and different value - shortname) + procedure fail_on_multi_diff_col_ord_uc; + --%test(Gives failure when different row ordering is used in cursors) procedure fail_on_different_row_order; @@ -205,12 +211,18 @@ create or replace package test_expectations_cursor is --%test( Compare cursors using unordered method success) procedure cursor_unorderd_compr_success; + --%test( Compare cursors using unordered method success and unordered columns position) + procedure cursor_unord_compr_success_uc; + --%test( Compare cursors using unordered method failure) procedure cursor_unordered_compare_fail; --%test( Compare cursors join by single key ) procedure cursor_joinby_compare; + --%test( Compare cursors join by single key with unordered columns position using shortname) + procedure cursor_joinby_compare_uc; + --%test(Compare cursors by single key with unordered columns position) procedure cursor_joinby_col_not_ord; From 6f830dc12028512450b654357511f7ade67fb4a1 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 12 Dec 2018 20:31:06 +0000 Subject: [PATCH 0162/1096] Minor formatting and warnings fixed --- .../data_values/ut_compound_data_helper.pkb | 52 ++++++++----------- .../expectations/ut_expectation_compound.tpb | 3 +- 2 files changed, 24 insertions(+), 31 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 8bc556e78..895a7add5 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -173,12 +173,9 @@ create or replace package body ut_compound_data_helper is if l_pk_tab.count <> 0 then l_index:= l_pk_tab.first; loop - if a_data_info.access_path = l_pk_tab(l_index) then - l_sql_stmt := case when a_join_by_stmt is null then null else ' and ' end; - l_sql_stmt := l_sql_stmt ||' a.'||a_col_name||q'[ = ]'||' e.'||a_col_name; - elsif a_data_info.parent_name = l_pk_tab(l_index)then + if l_pk_tab(l_index) in (a_data_info.access_path, a_data_info.parent_name) then --When then table is nested and join is on whole table - l_sql_stmt := case when a_join_by_stmt is null then null else ' and ' end; + l_sql_stmt := case when a_join_by_stmt is null then null else ' and ' end; l_sql_stmt := l_sql_stmt ||' a.'||a_col_name||q'[ = ]'||' e.'||a_col_name; end if; exit when (a_data_info.access_path = l_pk_tab(l_index)) or l_index = l_pk_tab.count; @@ -206,12 +203,9 @@ create or replace package body ut_compound_data_helper is if l_pk_tab.count <> 0 then l_index:= l_pk_tab.first; loop - if a_data_info.access_path = l_pk_tab(l_index) then - l_sql_stmt := case when a_partition_stmt is null then null else ',' end; - l_sql_stmt := l_sql_stmt ||l_alias||a_col_name; - elsif a_data_info.parent_name = l_pk_tab(l_index)then + if l_pk_tab(l_index) in (a_data_info.access_path, a_data_info.parent_name) then --When then table is nested and join is on whole table - l_sql_stmt := case when a_partition_stmt is null then null else ',' end; + l_sql_stmt := case when a_partition_stmt is null then null else ',' end; l_sql_stmt := l_sql_stmt ||l_alias||a_col_name; end if; @@ -261,9 +255,11 @@ create or replace package body ut_compound_data_helper is ut_utils.append_to_clob(a_sql_stmt, l_sql_stmt); end; - procedure gen_sql_pieces_out_of_cursor(a_data_info ut_cursor_column_tab,a_pk_table ut_varchar2_list, a_xml_stmt out nocopy clob, - a_select_stmt out nocopy clob ,a_partition_stmt out nocopy clob, a_equal_stmt out nocopy clob, a_join_by_stmt out nocopy clob, - a_not_equal_stmt out nocopy clob) is + procedure gen_sql_pieces_out_of_cursor( + a_data_info ut_cursor_column_tab,a_pk_table ut_varchar2_list, a_xml_stmt out nocopy clob, + a_select_stmt out nocopy clob ,a_partition_stmt out nocopy clob, a_equal_stmt out nocopy clob, a_join_by_stmt out nocopy clob, + a_not_equal_stmt out nocopy clob + ) is l_cursor_info ut_cursor_column_tab := a_data_info; l_partition_tmp clob; l_col_name varchar2(100); @@ -338,13 +334,12 @@ create or replace package body ut_compound_data_helper is function get_join_type(a_inclusion_compare in boolean,a_negated in boolean) return varchar2 is begin - if a_inclusion_compare and not(a_negated) then - return ' right outer join '; - elsif a_inclusion_compare and a_negated then - return ' inner join '; - else - return ' full outer join '; - end if; + return + case + when a_inclusion_compare and not(a_negated) then ' right outer join ' + when a_inclusion_compare and a_negated then ' inner join ' + else ' full outer join ' + end; end; begin @@ -388,10 +383,8 @@ create or replace package body ut_compound_data_helper is if l_not_equal_stmt is not null then ut_utils.append_to_clob(l_compare_sql,' ( '||l_not_equal_stmt||' ) or '); end if; - elsif not a_unordered then - if l_not_equal_stmt is not null then - ut_utils.append_to_clob(l_compare_sql,' ( '||l_not_equal_stmt||' ) or '); - end if; + elsif not a_unordered and l_not_equal_stmt is not null then + ut_utils.append_to_clob(l_compare_sql,' ( '||l_not_equal_stmt||' ) or '); end if; --If its inlcusion we expect a actual set to fully match and have no extra elements over expected @@ -420,8 +413,6 @@ create or replace package body ut_compound_data_helper is a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, a_join_by_list ut_varchar2_list, a_unordered boolean, a_enforce_column_order boolean := false ) return tt_row_diffs is - l_act_col_filter varchar2(32767); - l_exp_col_filter varchar2(32767); l_act_extract_xpath varchar2(32767):= ut_utils.to_xpath(get_column_extract_path(a_act_cursor_info)); l_exp_extract_xpath varchar2(32767):= ut_utils.to_xpath(get_column_extract_path(a_exp_cursor_info)); l_join_xpath varchar2(32767) := ut_utils.to_xpath(a_join_by_list); @@ -636,8 +627,11 @@ create or replace package body ut_compound_data_helper is end; --Filter out columns from cursor based on include (exists) or exclude (not exists) - function filter_out_cols(a_cursor_info ut_cursor_column_tab, a_current_list ut_varchar2_list,a_include boolean := true) - return ut_cursor_column_tab is + function filter_out_cols( + a_cursor_info ut_cursor_column_tab, + a_current_list ut_varchar2_list, + a_include boolean := true + ) return ut_cursor_column_tab is l_result ut_cursor_column_tab := ut_cursor_column_tab(); l_filter_sql varchar2(32767); begin @@ -690,7 +684,7 @@ create or replace package body ut_compound_data_helper is l_include boolean; begin -- if include and exclude is not null its columns from include minus exclude - -- If inlcude is not null and exclude is null cursor will have only include + -- If include is not null and exclude is null cursor will have only include -- If exclude is not null and include is null cursor will have all except exclude if a_include_xpath.count > 0 and a_exclude_xpath.count > 0 then select col_names bulk collect into l_filtered_set diff --git a/source/expectations/ut_expectation_compound.tpb b/source/expectations/ut_expectation_compound.tpb index 5b8e6e33c..f15911aab 100644 --- a/source/expectations/ut_expectation_compound.tpb +++ b/source/expectations/ut_expectation_compound.tpb @@ -185,7 +185,6 @@ create or replace type body ut_expectation_compound as member procedure unordered(self in ut_expectation_compound) is begin - if ut_utils.int_to_boolean(negated) then self.not_to( treat(matcher as ut_equal).unordered ); else @@ -193,7 +192,7 @@ create or replace type body ut_expectation_compound as end if; end; - member function join_by(a_columns varchar2) return ut_expectation_compound is + member function join_by(a_columns varchar2) return ut_expectation_compound is l_result ut_expectation_compound; begin l_result := self; From 45643e094b45da02642687b0fdf54d8f4ce52713 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Thu, 13 Dec 2018 10:35:11 +0000 Subject: [PATCH 0163/1096] Tidy up code --- source/core/ut_utils.pks | 4 + .../data_values/ut_compound_data_helper.pkb | 117 ++++++++++-------- .../data_values/ut_compound_data_helper.pks | 3 +- .../data_values/ut_data_value_refcursor.tpb | 12 +- 4 files changed, 82 insertions(+), 54 deletions(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index f6d39638e..26dd1f253 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -114,6 +114,10 @@ create or replace package ut_utils authid definer is gc_invalid_package constant pls_integer := -6550; pragma exception_init(ex_invalid_package, -6550); + ex_failure_for_all exception; + gc_failure_for_all constant pls_integer := -24381; + pragma exception_init (ex_failure_for_all, -24381); + gc_max_storage_varchar2_len constant integer := 4000; gc_max_output_string_length constant integer := 4000; gc_max_input_string_length constant integer := gc_max_output_string_length - 2; --we need to remove 2 chars for quotes around string diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 895a7add5..59e6f9c63 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -17,7 +17,7 @@ create or replace package body ut_compound_data_helper is */ g_diff_count integer; - + gc_xpath_extract_reg constant varchar2(50) := '^((/ROW/)|^(//)|^(/\*/))?(.*)'; type t_type_name_map is table of varchar2(128) index by binary_integer; g_type_name_map t_type_name_map; g_anytype_name_map t_type_name_map; @@ -46,8 +46,6 @@ create or replace package body ut_compound_data_helper is function get_columns_diff_ordered(a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab) return tt_column_diffs is - l_column_filter varchar2(32767); - l_sql varchar2(32767); l_results tt_column_diffs; begin with @@ -87,8 +85,6 @@ create or replace package body ut_compound_data_helper is function get_columns_diff_unordered(a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab) return tt_column_diffs is - l_column_filter varchar2(32767); - l_sql varchar2(32767); l_results tt_column_diffs; begin with @@ -125,11 +121,11 @@ create or replace package body ut_compound_data_helper is function get_columns_diff(a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab,a_order_enforced boolean := false) return tt_column_diffs is begin - if a_order_enforced then - return get_columns_diff_ordered(a_expected,a_actual); - else - return get_columns_diff_unordered(a_expected,a_actual); - end if; + return + case + when a_order_enforced then get_columns_diff_ordered(a_expected,a_actual) + else get_columns_diff_unordered(a_expected,a_actual) + end; end; function get_pk_value (a_join_by_xpath varchar2,a_item_data xmltype) return clob is @@ -139,8 +135,10 @@ create or replace package body ut_compound_data_helper is return l_pk_value; end; - procedure generate_not_equal_stmt(a_data_info ut_cursor_column, a_pk_table ut_varchar2_list, a_not_equal_stmt in out nocopy clob, - a_col_name varchar2) is + procedure generate_not_equal_stmt( + a_data_info ut_cursor_column, a_pk_table ut_varchar2_list, + a_not_equal_stmt in out nocopy clob, a_col_name varchar2 + ) is l_pk_tab ut_varchar2_list := coalesce(a_pk_table,ut_varchar2_list()); l_index integer; l_sql_stmt varchar2(32767); @@ -164,8 +162,10 @@ create or replace package body ut_compound_data_helper is end if; end; - procedure generate_join_by_stmt(a_data_info ut_cursor_column, a_pk_table ut_varchar2_list, a_join_by_stmt in out nocopy clob, - a_col_name varchar2) is + procedure generate_join_by_stmt( + a_data_info ut_cursor_column, a_pk_table ut_varchar2_list, + a_join_by_stmt in out nocopy clob, a_col_name varchar2 + ) is l_pk_tab ut_varchar2_list := coalesce(a_pk_table,ut_varchar2_list()); l_index integer; l_sql_stmt varchar2(32767); @@ -192,9 +192,10 @@ create or replace package body ut_compound_data_helper is ut_utils.append_to_clob(a_equal_stmt,l_sql_stmt); end; - procedure generate_partition_stmt(a_data_info ut_cursor_column, a_partition_stmt in out nocopy clob, - a_pk_table in ut_varchar2_list,a_col_name in varchar2,a_alias varchar2 := 'ucd.') is - + procedure generate_partition_stmt( + a_data_info ut_cursor_column, a_partition_stmt in out nocopy clob, + a_pk_table in ut_varchar2_list,a_col_name in varchar2,a_alias varchar2 := 'ucd.' + ) is l_alias varchar2(10) := a_alias; l_pk_tab ut_varchar2_list := coalesce(a_pk_table,ut_varchar2_list()); l_index integer; @@ -284,7 +285,7 @@ create or replace package body ut_compound_data_helper is generate_not_equal_stmt(l_cursor_info(i),a_pk_table,a_not_equal_stmt,l_col_name); end if; end loop; - --Finish parition by + --Finish partition by ut_utils.append_to_clob(a_partition_stmt,l_partition_tmp||' order by '||l_partition_tmp||' ) dup_no '); else --Partition by piece when no data @@ -292,8 +293,10 @@ create or replace package body ut_compound_data_helper is end if; end; - procedure get_act_and_exp_set(a_current_stmt in out nocopy clob, a_partition_stmt clob, a_select_stmt clob, - a_xmltable_stmt clob, a_unordered boolean,a_type varchar2) is + procedure get_act_and_exp_set( + a_current_stmt in out nocopy clob, a_partition_stmt clob, a_select_stmt clob, + a_xmltable_stmt clob, a_unordered boolean,a_type varchar2 + ) is l_temp_string varchar2(32767); l_ut_owner varchar2(250) := ut_utils.ut_owner; begin @@ -409,7 +412,8 @@ create or replace package body ut_compound_data_helper is return l_column_list; end; - function get_rows_diff_by_sql(a_act_cursor_info ut_cursor_column_tab,a_exp_cursor_info ut_cursor_column_tab, + function get_rows_diff_by_sql( + a_act_cursor_info ut_cursor_column_tab,a_exp_cursor_info ut_cursor_column_tab, a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, a_join_by_list ut_varchar2_list, a_unordered boolean, a_enforce_column_order boolean := false ) return tt_row_diffs is @@ -601,7 +605,7 @@ create or replace package body ut_compound_data_helper is procedure insert_diffs_result(a_diff_tab t_diff_tab, a_diff_id raw) is begin - forall idx in 1..a_diff_tab.count + forall idx in 1..a_diff_tab.count save exceptions insert into ut_compound_data_diff_tmp ( diff_id, act_item_data, act_data_id, exp_item_data, exp_data_id, item_no, duplicate_no ) values @@ -609,6 +613,9 @@ create or replace package body ut_compound_data_helper is xmlelement( name "ROW", a_diff_tab(idx).act_item_data), a_diff_tab(idx).act_data_id, xmlelement( name "ROW", a_diff_tab(idx).exp_item_data), a_diff_tab(idx).exp_data_id, a_diff_tab(idx).item_no, a_diff_tab(idx).dup_no); + exception + when ut_utils.ex_failure_for_all then + raise_application_error(ut_utils.gc_failure_for_all,'Failure to insert a diff tmp data.'); end; procedure set_rows_diff(a_rows_diff integer) is @@ -651,7 +658,8 @@ create or replace package body ut_compound_data_helper is return l_result; end; - function get_missing_filter_columns(a_cursor_info ut_cursor_column_tab, a_column_filter_list ut_varchar2_list) return ut_varchar2_list is + function get_missing_filter_columns(a_cursor_info ut_cursor_column_tab, a_column_filter_list ut_varchar2_list) + return ut_varchar2_list is l_result ut_varchar2_list := ut_varchar2_list(); begin select fl.column_value @@ -689,20 +697,20 @@ create or replace package body ut_compound_data_helper is if a_include_xpath.count > 0 and a_exclude_xpath.count > 0 then select col_names bulk collect into l_filtered_set from( - select regexp_replace(column_value,'^((/ROW/)|^(//)|^(/\*/))?(.*)','\5') col_names + select regexp_replace(column_value,gc_xpath_extract_reg,'\5') col_names from table(a_include_xpath) minus - select regexp_replace(column_value,'^((/ROW/)|^(//)|^(/\*/))?(.*)','\5') col_names + select regexp_replace(column_value,gc_xpath_extract_reg,'\5') col_names from table(a_exclude_xpath) ); l_include := true; elsif a_include_xpath.count > 0 and a_exclude_xpath.count = 0 then - select regexp_replace(column_value,'^((/ROW/)|^(//)|^(/\*/))?(.*)','\5') col_names + select regexp_replace(column_value,gc_xpath_extract_reg,'\5') col_names bulk collect into l_filtered_set from table(a_include_xpath); l_include := true; elsif a_include_xpath.count = 0 and a_exclude_xpath.count > 0 then - select regexp_replace(column_value,'^((/ROW/)|^(//)|^(/\*/))?(.*)','\5') col_names + select regexp_replace(column_value,gc_xpath_extract_reg,'\5') col_names bulk collect into l_filtered_set from table(a_exclude_xpath); l_include := false; @@ -719,7 +727,8 @@ create or replace package body ut_compound_data_helper is return l_result; end; - function contains_collection (a_cursor_info ut_cursor_column_tab) return number is + function contains_collection (a_cursor_info ut_cursor_column_tab) + return number is l_collection_elements number; begin select count(1) into l_collection_elements from @@ -727,7 +736,8 @@ create or replace package body ut_compound_data_helper is return l_collection_elements; end; - function remove_incomparable_cols( a_cursor_details ut_cursor_column_tab,a_incomparable_cols ut_varchar2_list) return ut_cursor_column_tab is + function remove_incomparable_cols( a_cursor_details ut_cursor_column_tab,a_incomparable_cols ut_varchar2_list) + return ut_cursor_column_tab is l_result ut_cursor_column_tab; begin select ut_cursor_column(i.parent_name,i.access_path,i.has_nested_col,i.transformed_name,i.hierarchy_level,i.column_position , @@ -742,22 +752,23 @@ create or replace package body ut_compound_data_helper is end; function getxmlchildren(a_parent_name varchar2,a_cursor_table ut_cursor_column_tab) - return xmltype is - l_result xmltype; - begin - select xmlagg(xmlelement(evalname t.column_name,t.column_type, - getxmlchildren(t.column_name,a_cursor_table))) - into l_result - from table(a_cursor_table) t - where (a_parent_name is not null and parent_name = a_parent_name and hierarchy_level > 1 and column_name is not null) - or (a_parent_name is null and parent_name is null and hierarchy_level = 1 and column_name is not null) - having count(*) > 0; - + return xmltype is + l_result xmltype; + begin + select xmlagg(xmlelement(evalname t.column_name,t.column_type, + getxmlchildren(t.column_name,a_cursor_table))) + into l_result + from table(a_cursor_table) t + where (a_parent_name is not null and parent_name = a_parent_name and hierarchy_level > 1 and column_name is not null) + or (a_parent_name is null and parent_name is null and hierarchy_level = 1 and column_name is not null) + having count(*) > 0; - return l_result; - end; + return l_result; + end; - function is_sql_compare_allowed(a_type_name varchar2) return boolean is + function is_sql_compare_allowed(a_type_name varchar2) + return boolean is + l_assert boolean; begin --clob/blob/xmltype/object/nestedcursor/nestedtable if a_type_name IN (g_type_name_map(dbms_sql.blob_type), @@ -765,18 +776,25 @@ create or replace package body ut_compound_data_helper is g_type_name_map(dbms_sql.bfile_type), g_anytype_name_map(dbms_types.typecode_namedcollection)) then - return false; + l_assert := false; else - return true; + l_assert := true; end if; + return l_assert; end; - function get_column_type_desc(a_type_code in integer, a_dbms_sql_desc in boolean) return varchar2 is + function get_column_type_desc(a_type_code in integer, a_dbms_sql_desc in boolean) + return varchar2 is begin - return case when a_dbms_sql_desc then g_type_name_map(a_type_code) else g_anytype_name_map(a_type_code) end; + return + case + when a_dbms_sql_desc then g_type_name_map(a_type_code) + else g_anytype_name_map(a_type_code) + end; end; - function get_anytype_members_info( a_anytype anytype ) return t_anytype_members_rec is + function get_anytype_members_info( a_anytype anytype ) + return t_anytype_members_rec is l_result t_anytype_members_rec; begin if a_anytype is not null then @@ -795,7 +813,8 @@ create or replace package body ut_compound_data_helper is return l_result; end; - function get_attr_elem_info( a_anytype anytype, a_pos pls_integer := null ) return t_anytype_elem_info_rec is + function get_attr_elem_info( a_anytype anytype, a_pos pls_integer := null ) + return t_anytype_elem_info_rec is l_result t_anytype_elem_info_rec; begin if a_anytype is not null then diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index de988e489..79c90f4c5 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -99,7 +99,8 @@ create or replace package ut_compound_data_helper authid definer is a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2 ) return tt_row_diffs; - function get_rows_diff_by_sql(a_act_cursor_info ut_cursor_column_tab,a_exp_cursor_info ut_cursor_column_tab, + function get_rows_diff_by_sql( + a_act_cursor_info ut_cursor_column_tab,a_exp_cursor_info ut_cursor_column_tab, a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, a_join_by_list ut_varchar2_list, a_unordered boolean, a_enforce_column_order boolean := false ) return tt_row_diffs; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 10be342ea..2ac8b99ec 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -16,7 +16,8 @@ create or replace type body ut_data_value_refcursor as limitations under the License. */ - constructor function ut_data_value_refcursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) return self as result is + constructor function ut_data_value_refcursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) + return self as result is begin init(a_value); return; @@ -122,7 +123,9 @@ create or replace type body ut_data_value_refcursor as return l_result_string; end; - member function diff( a_other ut_data_value, a_unordered boolean := false, a_join_by_list ut_varchar2_list:=ut_varchar2_list() ) return varchar2 is + member function diff( + a_other ut_data_value, a_unordered boolean := false, a_join_by_list ut_varchar2_list:=ut_varchar2_list() + ) return varchar2 is l_result clob; l_results ut_utils.t_clob_tab := ut_utils.t_clob_tab(); l_result_string varchar2(32767); @@ -170,7 +173,9 @@ create or replace type body ut_data_value_refcursor as return l_message; end; - function remove_incomparable_cols( a_cursor_details ut_cursor_column_tab,a_column_diffs ut_compound_data_helper.tt_column_diffs) return ut_cursor_column_tab is + function remove_incomparable_cols( + a_cursor_details ut_cursor_column_tab,a_column_diffs ut_compound_data_helper.tt_column_diffs + ) return ut_cursor_column_tab is l_incomparable_cols ut_varchar2_list := ut_varchar2_list(); l_filter_out ut_cursor_column_tab; begin @@ -186,7 +191,6 @@ create or replace type body ut_data_value_refcursor as function get_diff_message (a_row_diff ut_compound_data_helper.t_row_diffs,a_is_unordered boolean) return varchar2 is begin - if a_is_unordered then if a_row_diff.pk_value is not null then return ' PK '||a_row_diff.pk_value||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; From 1e71c99607b1220d1ed3afcac1daeefb1d9cd9d6 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Thu, 13 Dec 2018 13:21:21 +0000 Subject: [PATCH 0164/1096] Adding a new expectation type to specialize unordered_columns only to sys_refcursor --- source/api/ut.pkb | 4 +- source/api/ut.pks | 2 +- .../create_synonyms_and_grants_for_public.sql | 2 + source/create_user_grants.sql | 2 + source/create_user_synonyms.sql | 1 + .../expectations/ut_expectation_compound.tpb | 73 -------- .../expectations/ut_expectation_compound.tps | 17 +- .../expectations/ut_expectation_refcursor.tpb | 158 ++++++++++++++++++ .../expectations/ut_expectation_refcursor.tps | 43 +++++ source/install.sql | 2 + source/uninstall_objects.sql | 2 + 11 files changed, 216 insertions(+), 90 deletions(-) create mode 100644 source/expectations/ut_expectation_refcursor.tpb create mode 100644 source/expectations/ut_expectation_refcursor.tps diff --git a/source/api/ut.pkb b/source/api/ut.pkb index bb599704e..0878801bc 100644 --- a/source/api/ut.pkb +++ b/source/api/ut.pkb @@ -75,9 +75,9 @@ create or replace package body ut is return ut_expectation(ut_data_value_varchar2(a_actual), a_message); end; - function expect(a_actual in sys_refcursor, a_message varchar2 := null) return ut_expectation_compound is + function expect(a_actual in sys_refcursor, a_message varchar2 := null) return ut_expectation_refcursor is begin - return ut_expectation_compound(ut_data_value_refcursor(a_actual), a_message); + return ut_expectation_refcursor(ut_data_value_refcursor(a_actual), a_message); end; function expect(a_actual in yminterval_unconstrained, a_message varchar2 := null) return ut_expectation is diff --git a/source/api/ut.pks b/source/api/ut.pks index 25c9e6493..d1bc0c61a 100644 --- a/source/api/ut.pks +++ b/source/api/ut.pks @@ -31,7 +31,7 @@ create or replace package ut authid current_user as function expect(a_actual in number, a_message varchar2 := null) return ut_expectation; - function expect(a_actual in sys_refcursor, a_message varchar2 := null) return ut_expectation_compound; + function expect(a_actual in sys_refcursor, a_message varchar2 := null) return ut_expectation_refcursor; function expect(a_actual in timestamp_unconstrained, a_message varchar2 := null) return ut_expectation; diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index b745449bf..665b8a4f9 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -33,6 +33,7 @@ alter session set current_schema = &&ut3_owner; grant execute on &&ut3_owner..ut_expectation to public; grant execute on &&ut3_owner..ut_expectation_compound to public; +grant execute on &&ut3_owner..ut_expectation_refcursor to public; grant execute on &&ut3_owner..ut_be_between to public; grant execute on &&ut3_owner..ut_be_empty to public; grant execute on &&ut3_owner..ut_be_false to public; @@ -112,6 +113,7 @@ prompt Creating synonyms for UTPLSQL objects in &&ut3_owner schema to PUBLIC create public synonym ut_expectation for &&ut3_owner..ut_expectation; create public synonym ut_expectation_compound for &&ut3_owner..ut_expectation_compound; +create public synonym ut_expectation_refcursor for &&ut3_owner..ut_expectation_refcursor; create public synonym be_between for &&ut3_owner..be_between; create public synonym be_empty for &&ut3_owner..be_empty; diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql index 0967a0e8c..1a1a252d4 100644 --- a/source/create_user_grants.sql +++ b/source/create_user_grants.sql @@ -53,6 +53,8 @@ alter session set current_schema = &&ut3_owner; grant execute on &&ut3_owner..ut_expectation to &ut3_user; grant execute on &&ut3_owner..ut_expectation_compound to &ut3_user; +grant execute on &&ut3_owner..ut_expectation_refcursor to &ut3_user; + grant execute on &&ut3_owner..ut_be_between to &ut3_user; grant execute on &&ut3_owner..ut_be_empty to &ut3_user; grant execute on &&ut3_owner..ut_be_false to &ut3_user; diff --git a/source/create_user_synonyms.sql b/source/create_user_synonyms.sql index 3c75c590b..394dbbab7 100644 --- a/source/create_user_synonyms.sql +++ b/source/create_user_synonyms.sql @@ -55,6 +55,7 @@ prompt Creating synonyms for UTPLSQL objects in &&ut3_owner schema to user &&ut3 create or replace synonym &ut3_user..ut_expectation for &&ut3_owner..ut_expectation; create or replace synonym &ut3_user..ut_expectation_compound for &&ut3_owner..ut_expectation_compound; +create or replace synonym &ut3_user..ut_expectation_refcursor for &&ut3_owner..ut_expectation_refcursor; create or replace synonym &ut3_user..be_between for &&ut3_owner..be_between; create or replace synonym &ut3_user..be_empty for &&ut3_owner..be_empty; diff --git a/source/expectations/ut_expectation_compound.tpb b/source/expectations/ut_expectation_compound.tpb index f15911aab..9d9220a8a 100644 --- a/source/expectations/ut_expectation_compound.tpb +++ b/source/expectations/ut_expectation_compound.tpb @@ -52,57 +52,13 @@ create or replace type body ut_expectation_compound as return l_result; end; - member function to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_compound is - l_result ut_expectation_compound := self; - begin - l_result.matcher := ut_equal(a_expected, a_nulls_are_equal); - return l_result; - end; - member function not_to_equal(a_expected anydata, a_nulls_are_equal boolean := null) return ut_expectation_compound is l_result ut_expectation_compound := self; begin l_result.matcher := ut_equal(a_expected, a_nulls_are_equal); l_result.negated := ut_utils.boolean_to_int(true); return l_result; - end; - - member function not_to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_compound is - l_result ut_expectation_compound := self; - begin - l_result.matcher := ut_equal(a_expected, a_nulls_are_equal); - l_result.negated := ut_utils.boolean_to_int(true); - return l_result; - end; - - member function to_include(a_expected sys_refcursor) return ut_expectation_compound is - l_result ut_expectation_compound := self; - begin - l_result.matcher := ut_include(a_expected); - return l_result; - end; - - member function to_contain(a_expected sys_refcursor) return ut_expectation_compound is - l_result ut_expectation_compound := self; - begin - l_result.matcher := ut_include(a_expected); - return l_result; - end; - - member function not_to_include(a_expected sys_refcursor) return ut_expectation_compound is - l_result ut_expectation_compound := self; - begin - l_result.matcher := ut_include(a_expected).negated; - l_result.negated := ut_utils.boolean_to_int(true); - return l_result; - end; - member function not_to_contain(a_expected sys_refcursor) return ut_expectation_compound is - l_result ut_expectation_compound := self; - begin - l_result.matcher := ut_include(a_expected).negated; - l_result.negated := ut_utils.boolean_to_int(true); - return l_result; end; member function include(a_items varchar2) return ut_expectation_compound is @@ -226,34 +182,5 @@ create or replace type body ut_expectation_compound as end if; end; - member function unordered_columns return ut_expectation_compound is - l_result ut_expectation_compound; - begin - l_result := self; - l_result.matcher := treat(l_result.matcher as ut_equal).unordered_columns; - return l_result; - end; - - member procedure unordered_columns(self in ut_expectation_compound) is - begin - - if ut_utils.int_to_boolean(negated) then - self.not_to( treat(matcher as ut_equal).unordered_columns ); - else - self.to_( treat(matcher as ut_equal).unordered_columns ); - end if; - end; - - member function uc return ut_expectation_compound is - l_result ut_expectation_compound; - begin - return unordered_columns; - end; - - member procedure uc(self in ut_expectation_compound) is - begin - unordered_columns; - end; - end; / diff --git a/source/expectations/ut_expectation_compound.tps b/source/expectations/ut_expectation_compound.tps index 3cf141047..e96daa055 100644 --- a/source/expectations/ut_expectation_compound.tps +++ b/source/expectations/ut_expectation_compound.tps @@ -26,15 +26,8 @@ create or replace type ut_expectation_compound under ut_expectation( member procedure not_to_have_count(self in ut_expectation_compound, a_expected integer), member function to_equal(a_expected anydata, a_nulls_are_equal boolean := null) return ut_expectation_compound, - member function to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_compound, member function not_to_equal(a_expected anydata, a_nulls_are_equal boolean := null) return ut_expectation_compound, - member function not_to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_compound, - - member function to_include(a_expected sys_refcursor) return ut_expectation_compound, - member function to_contain(a_expected sys_refcursor) return ut_expectation_compound, - member function not_to_include(a_expected sys_refcursor) return ut_expectation_compound, - member function not_to_contain(a_expected sys_refcursor) return ut_expectation_compound, - + member function include(a_items varchar2) return ut_expectation_compound, member function include(a_items ut_varchar2_list) return ut_expectation_compound, member procedure include(self in ut_expectation_compound, a_items varchar2), @@ -48,11 +41,7 @@ create or replace type ut_expectation_compound under ut_expectation( member function join_by(a_columns varchar2) return ut_expectation_compound, member function join_by(a_columns ut_varchar2_list) return ut_expectation_compound, member procedure join_by(self in ut_expectation_compound, a_columns varchar2), - member procedure join_by(self in ut_expectation_compound, a_columns ut_varchar2_list), - member function unordered_columns return ut_expectation_compound, - member procedure unordered_columns(self in ut_expectation_compound), - member function uc return ut_expectation_compound, - member procedure uc(self in ut_expectation_compound) + member procedure join_by(self in ut_expectation_compound, a_columns ut_varchar2_list) ) -final +not final / diff --git a/source/expectations/ut_expectation_refcursor.tpb b/source/expectations/ut_expectation_refcursor.tpb new file mode 100644 index 000000000..883f4d588 --- /dev/null +++ b/source/expectations/ut_expectation_refcursor.tpb @@ -0,0 +1,158 @@ +create or replace type body ut_expectation_refcursor as + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + constructor function ut_expectation_refcursor(self in out nocopy ut_expectation_refcursor, a_actual_data ut_data_value, a_description varchar2) return self as result is + begin + self.actual_data := a_actual_data; + self.description := a_description; + negated := ut_utils.boolean_to_int(false); + return; + end; + + member function to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_refcursor is + l_result ut_expectation_refcursor := self; + begin + l_result.matcher := ut_equal(a_expected, a_nulls_are_equal); + return l_result; + end; + + member function not_to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_refcursor is + l_result ut_expectation_refcursor := self; + begin + l_result.matcher := ut_equal(a_expected, a_nulls_are_equal); + l_result.negated := ut_utils.boolean_to_int(true); + return l_result; + end; + + member function to_include(a_expected sys_refcursor) return ut_expectation_refcursor is + l_result ut_expectation_refcursor := self; + begin + l_result.matcher := ut_include(a_expected); + return l_result; + end; + + member function to_contain(a_expected sys_refcursor) return ut_expectation_refcursor is + l_result ut_expectation_refcursor := self; + begin + l_result.matcher := ut_include(a_expected); + return l_result; + end; + + member function not_to_include(a_expected sys_refcursor) return ut_expectation_refcursor is + l_result ut_expectation_refcursor := self; + begin + l_result.matcher := ut_include(a_expected).negated; + l_result.negated := ut_utils.boolean_to_int(true); + return l_result; + end; + + member function not_to_contain(a_expected sys_refcursor) return ut_expectation_refcursor is + l_result ut_expectation_refcursor := self; + begin + l_result.matcher := ut_include(a_expected).negated; + l_result.negated := ut_utils.boolean_to_int(true); + return l_result; + end; + + overriding member function include(a_items varchar2) return ut_expectation_refcursor is + l_result ut_expectation_refcursor; + begin + l_result := self; + l_result.matcher := treat(l_result.matcher as ut_equal).include(a_items); + return l_result; + end; + + overriding member function include(a_items ut_varchar2_list) return ut_expectation_refcursor is + l_result ut_expectation_refcursor; + begin + l_result := self; + l_result.matcher := treat(l_result.matcher as ut_equal).include(a_items); + return l_result; + end; + + overriding member function exclude(a_items varchar2) return ut_expectation_refcursor is + l_result ut_expectation_refcursor; + begin + l_result := self; + l_result.matcher := treat(l_result.matcher as ut_equal).exclude(a_items); + return l_result; + end; + + overriding member function exclude(a_items ut_varchar2_list) return ut_expectation_refcursor is + l_result ut_expectation_refcursor; + begin + l_result := self; + l_result.matcher := treat(l_result.matcher as ut_equal).exclude(a_items); + return l_result; + end; + + overriding member function unordered return ut_expectation_refcursor is + l_result ut_expectation_refcursor; + begin + l_result := self; + l_result.matcher := treat(l_result.matcher as ut_equal).unordered; + return l_result; + end; + + overriding member function join_by(a_columns varchar2) return ut_expectation_refcursor is + l_result ut_expectation_refcursor; + begin + l_result := self; + l_result.matcher := treat(l_result.matcher as ut_equal).join_by(a_columns); + return l_result; + end; + + overriding member function join_by(a_columns ut_varchar2_list) return ut_expectation_refcursor is + l_result ut_expectation_refcursor; + begin + l_result := self; + l_result.matcher := treat(l_result.matcher as ut_equal).join_by(a_columns); + return l_result; + end; + + member function unordered_columns return ut_expectation_refcursor is + l_result ut_expectation_refcursor; + begin + l_result := self; + l_result.matcher := treat(l_result.matcher as ut_equal).unordered_columns; + return l_result; + end; + + member procedure unordered_columns(self in ut_expectation_refcursor) is + begin + + if ut_utils.int_to_boolean(negated) then + self.not_to( treat(matcher as ut_equal).unordered_columns ); + else + self.to_( treat(matcher as ut_equal).unordered_columns ); + end if; + end; + + member function uc return ut_expectation_refcursor is + l_result ut_expectation_refcursor; + begin + return unordered_columns; + end; + + member procedure uc(self in ut_expectation_refcursor) is + begin + unordered_columns; + end; + +end; +/ diff --git a/source/expectations/ut_expectation_refcursor.tps b/source/expectations/ut_expectation_refcursor.tps new file mode 100644 index 000000000..84e255ad4 --- /dev/null +++ b/source/expectations/ut_expectation_refcursor.tps @@ -0,0 +1,43 @@ +create or replace type ut_expectation_refcursor under ut_expectation_compound( + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + constructor function ut_expectation_refcursor( + self in out nocopy ut_expectation_refcursor, a_actual_data ut_data_value, a_description varchar2 + ) return self as result, + + member function to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_refcursor, + member function to_include(a_expected sys_refcursor) return ut_expectation_refcursor, + member function not_to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_refcursor, + member function to_contain(a_expected sys_refcursor) return ut_expectation_refcursor, + member function not_to_include(a_expected sys_refcursor) return ut_expectation_refcursor, + member function not_to_contain(a_expected sys_refcursor) return ut_expectation_refcursor, + + overriding member function include(a_items varchar2) return ut_expectation_refcursor, + overriding member function include(a_items ut_varchar2_list) return ut_expectation_refcursor, + overriding member function exclude(a_items varchar2) return ut_expectation_refcursor, + overriding member function exclude(a_items ut_varchar2_list) return ut_expectation_refcursor, + overriding member function unordered return ut_expectation_refcursor, + overriding member function join_by(a_columns varchar2) return ut_expectation_refcursor, + overriding member function join_by(a_columns ut_varchar2_list) return ut_expectation_refcursor, + member function unordered_columns return ut_expectation_refcursor, + member procedure unordered_columns(self in ut_expectation_refcursor), + member function uc return ut_expectation_refcursor, + member procedure uc(self in ut_expectation_refcursor) +) +final +/ diff --git a/source/install.sql b/source/install.sql index c029baaef..d2a2cd527 100644 --- a/source/install.sql +++ b/source/install.sql @@ -220,6 +220,7 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/data_values/ut_cursor_column.tpb' @@install_component.sql 'expectations/data_values/ut_cursor_details.tpb' @@install_component.sql 'expectations/ut_expectation_compound.tps' +@@install_component.sql 'expectations/ut_expectation_refcursor.tps' @@install_component.sql 'expectations/data_values/ut_data_value.tpb' @@install_component.sql 'expectations/data_values/ut_compound_data_value.tpb' @@install_component.sql 'expectations/data_values/ut_compound_data_helper.pkb' @@ -258,6 +259,7 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/matchers/ut_match.tpb' @@install_component.sql 'expectations/ut_expectation.tpb' @@install_component.sql 'expectations/ut_expectation_compound.tpb' +@@install_component.sql 'expectations/ut_expectation_refcursor.tpb' --core reporter @@install_component.sql 'reporters/ut_documentation_reporter.tps' diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index a268acc8a..5807927cb 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -75,6 +75,8 @@ drop package ut; drop table ut_dbms_output_cache; +drop type ut_expectation_refcursor force; + drop type ut_expectation_compound force; drop type ut_expectation force; From b1f632389af6bc7912a75d44103908a2a447cbb0 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Mon, 17 Dec 2018 19:11:04 +0100 Subject: [PATCH 0165/1096] Initial, incomplete version of reporter --- source/reporters/ut_sqldev_reporter.tpb | 93 +++++++++++++++++++++++++ source/reporters/ut_sqldev_reporter.tps | 56 +++++++++++++++ 2 files changed, 149 insertions(+) create mode 100644 source/reporters/ut_sqldev_reporter.tpb create mode 100644 source/reporters/ut_sqldev_reporter.tps diff --git a/source/reporters/ut_sqldev_reporter.tpb b/source/reporters/ut_sqldev_reporter.tpb new file mode 100644 index 000000000..2288dfa86 --- /dev/null +++ b/source/reporters/ut_sqldev_reporter.tpb @@ -0,0 +1,93 @@ +create or replace type body ut_sqldev_reporter is + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + constructor function ut_sqldev_reporter(self in out nocopy ut_sqldev_reporter) return self as result is + begin + self.init($$plsql_unit); + return; + end; + + overriding member procedure before_calling_run(self in out nocopy ut_sqldev_reporter, a_run in ut_run) is + procedure print_test_elements(a_test ut_test) is + begin + self.print_text(''); + end; + + procedure print_suite_elements(a_suite ut_logical_suite) is + begin + self.print_text(''); + for i in 1 .. a_suite.items.count loop + if a_suite.items(i) is of(ut_test) then + print_test_elements(treat(a_suite.items(i) as ut_test)); + elsif a_suite.items(i) is of(ut_logical_suite) then + print_suite_elements(treat(a_suite.items(i) as ut_logical_suite)); + end if; + end loop; + self.print_text(''); + end; + + begin + self.print_text(ut_utils.get_xml_header(a_run.client_character_set)); + self.print_text(''); + self.print_text(''); + self.print_text(''); + for i in 1 .. a_run.items.count loop + print_suite_elements(treat(a_run.items(i) as ut_logical_suite)); + end loop; + self.print_text(''); + self.print_text(''); + self.print_text(''); + end; + + overriding member procedure before_calling_test(self in out nocopy ut_sqldev_reporter, a_test in ut_test) as + begin + self.print_text(''); + end; + + overriding member procedure after_calling_test(self in out nocopy ut_sqldev_reporter, a_test in ut_test) as + begin + self.print_text(''); + end; + + overriding member procedure after_calling_run(self in out nocopy ut_sqldev_reporter, a_run in ut_run) as + begin + self.print_text(''); + self.print_text(''); + end; + + overriding member function get_description return varchar2 as + begin + return 'Provides test results in a XML format, to consumed by clients such as SQL Developer interested progressing details.'; + end; + +end; +/ diff --git a/source/reporters/ut_sqldev_reporter.tps b/source/reporters/ut_sqldev_reporter.tps new file mode 100644 index 000000000..c5c4dc64e --- /dev/null +++ b/source/reporters/ut_sqldev_reporter.tps @@ -0,0 +1,56 @@ +create or replace type ut_sqldev_reporter force under ut_output_reporter_base( + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + -- TODO: grant execute on ut_sqldev_reporter to public; + -- TODO: handle public synonym + -- TODO: unit test + + /** + * The SQL Developer reporter. + * Provides test results in a XML format, to consumed by clients such as SQL Developer interested progressing details. + */ + constructor function ut_sqldev_reporter(self in out nocopy ut_sqldev_reporter) return self as result, + + /** + * Provides meta data of complete run in advance. + * Used in IDE to show total tests and initialize a progress bar. + */ + overriding member procedure before_calling_run(self in out nocopy ut_sqldev_reporter, a_run in ut_run), + + /** + * Provides meta data of test to be called. + */ + overriding member procedure before_calling_test(self in out nocopy ut_sqldev_reporter, a_test in ut_test), + + /** + * Provides meta data of a completed test with runtime, status, + */ + overriding member procedure after_calling_test(self in out nocopy ut_sqldev_reporter, a_test in ut_test), + + /** + * Provides closing tag with runtime summary. + */ + overriding member procedure after_calling_run(self in out nocopy ut_sqldev_reporter, a_run in ut_run), + + /** + * Provides the description of this reporter. + */ + overriding member function get_description return varchar2 +) +not final +/ From e83eeaf64d08b0c4649a1e2d0f4bb2353c7b63bb Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Mon, 17 Dec 2018 19:52:35 +0100 Subject: [PATCH 0166/1096] added grants ans synonyms for ut_sqldev_reporter --- source/create_synonyms_and_grants_for_public.sql | 2 ++ source/create_user_grants.sql | 1 + source/create_user_synonyms.sql | 1 + source/install.sql | 2 ++ source/uninstall_objects.sql | 2 ++ 5 files changed, 8 insertions(+) diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index b8daca313..e24b8880d 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -97,6 +97,7 @@ grant execute on &&ut3_owner..ut_annotation_objs_cache_info to public; grant execute on &&ut3_owner..ut_annotation_obj_cache_info to public; grant execute on &&ut3_owner..ut_suite_items_info to public; grant execute on &&ut3_owner..ut_suite_item_info to public; +grant execute on &&ut3_owner..ut_sqldev_reporter to public; begin $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then execute immediate 'grant select, insert, delete, update on &&ut3_owner..dbmspcc_blocks to public'; @@ -156,6 +157,7 @@ create public synonym ut_key_value_pair for &&ut3_owner..ut_key_value_pair; create public synonym ut_sonar_test_reporter for &&ut3_owner..ut_sonar_test_reporter; create public synonym ut_suite_items_info for &&ut3_owner..ut_suite_items_info; create public synonym ut_suite_item_info for &&ut3_owner..ut_suite_item_info; +create public synonym ut_sqldev_reporter for &&ut3_owner..ut_sqldev_reporter; begin $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then execute immediate 'create public synonym dbmspcc_blocks for &&ut3_owner..dbmspcc_blocks'; diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql index 0967a0e8c..17f20ee09 100644 --- a/source/create_user_grants.sql +++ b/source/create_user_grants.sql @@ -115,6 +115,7 @@ grant execute on &&ut3_owner..ut_annotation_cache_manager to &ut3_user; grant execute on &&ut3_owner..ut_annotation_parser to &ut3_user; grant execute on &&ut3_owner..ut_annotation_objs_cache_info to &ut3_user; grant execute on &&ut3_owner..ut_annotation_obj_cache_info to &ut3_user; +grant execute on &&ut3_owner..ut_sqldev_reporter to &ut3_user; begin $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then execute immediate 'grant select, insert, delete, update on &&ut3_owner..dbmspcc_blocks to &ut3_user'; diff --git a/source/create_user_synonyms.sql b/source/create_user_synonyms.sql index 9a087f61a..88b48eee0 100644 --- a/source/create_user_synonyms.sql +++ b/source/create_user_synonyms.sql @@ -98,6 +98,7 @@ create or replace synonym &ut3_user..ut_key_value_pairs for &&ut3_owner..ut_key_ create or replace synonym &ut3_user..ut_key_value_pair for &&ut3_owner..ut_key_value_pair; create or replace synonym &ut3_user..ut_compound_data_tmp for &&ut3_owner..ut_cursor_data; create or replace synonym &ut3_user..ut_sonar_test_reporter for &&ut3_owner..ut_sonar_test_reporter; +create or replace synonym &ut3_user..ut_sqldev_reporter for &&ut3_owner..ut_sqldev_reporter; begin $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then execute immediate 'create or replace synonym &ut3_user..dbmspcc_blocks for &&ut3_owner..dbmspcc_blocks'; diff --git a/source/install.sql b/source/install.sql index 50d70c944..defa3da49 100644 --- a/source/install.sql +++ b/source/install.sql @@ -292,6 +292,8 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'reporters/ut_coveralls_reporter.tpb' @@install_component.sql 'reporters/ut_coverage_cobertura_reporter.tps' @@install_component.sql 'reporters/ut_coverage_cobertura_reporter.tpb' +@@install_component.sql 'reporters/ut_sqldev_reporter.tps' +@@install_component.sql 'reporters/ut_sqldev_reporter.tpb' @@install_component.sql 'api/be_between.syn' @@install_component.sql 'api/be_empty.syn' diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index 97f2c5a5d..681ab862a 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -39,6 +39,8 @@ drop type ut_coverage_html_reporter force; drop type ut_sonar_test_reporter force; +drop type ut_sqldev_reporter force; + drop package ut_coverage; drop package ut_coverage_helper; From 99c1d31f97c1bf76fefbb4e904b37c86fcccdff0 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Thu, 27 Dec 2018 16:28:54 +0100 Subject: [PATCH 0167/1096] rename ut_sqldev_reporter to ut_realtime_reporter --- source/create_synonyms_and_grants_for_public.sql | 4 ++-- source/create_user_grants.sql | 2 +- source/create_user_synonyms.sql | 2 +- source/install.sql | 4 ++-- ...ldev_reporter.tpb => ut_realtime_reporter.tpb} | 12 ++++++------ ...ldev_reporter.tps => ut_realtime_reporter.tps} | 15 +++++++-------- source/uninstall_objects.sql | 2 +- 7 files changed, 20 insertions(+), 21 deletions(-) rename source/reporters/{ut_sqldev_reporter.tpb => ut_realtime_reporter.tpb} (90%) rename source/reporters/{ut_sqldev_reporter.tps => ut_realtime_reporter.tps} (77%) diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index e24b8880d..5bacdb60c 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -97,7 +97,7 @@ grant execute on &&ut3_owner..ut_annotation_objs_cache_info to public; grant execute on &&ut3_owner..ut_annotation_obj_cache_info to public; grant execute on &&ut3_owner..ut_suite_items_info to public; grant execute on &&ut3_owner..ut_suite_item_info to public; -grant execute on &&ut3_owner..ut_sqldev_reporter to public; +grant execute on &&ut3_owner..ut_realtime_reporter to public; begin $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then execute immediate 'grant select, insert, delete, update on &&ut3_owner..dbmspcc_blocks to public'; @@ -157,7 +157,7 @@ create public synonym ut_key_value_pair for &&ut3_owner..ut_key_value_pair; create public synonym ut_sonar_test_reporter for &&ut3_owner..ut_sonar_test_reporter; create public synonym ut_suite_items_info for &&ut3_owner..ut_suite_items_info; create public synonym ut_suite_item_info for &&ut3_owner..ut_suite_item_info; -create public synonym ut_sqldev_reporter for &&ut3_owner..ut_sqldev_reporter; +create public synonym ut_realtime_reporter for &&ut3_owner..ut_realtime_reporter; begin $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then execute immediate 'create public synonym dbmspcc_blocks for &&ut3_owner..dbmspcc_blocks'; diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql index 17f20ee09..a8f3d5cb4 100644 --- a/source/create_user_grants.sql +++ b/source/create_user_grants.sql @@ -115,7 +115,7 @@ grant execute on &&ut3_owner..ut_annotation_cache_manager to &ut3_user; grant execute on &&ut3_owner..ut_annotation_parser to &ut3_user; grant execute on &&ut3_owner..ut_annotation_objs_cache_info to &ut3_user; grant execute on &&ut3_owner..ut_annotation_obj_cache_info to &ut3_user; -grant execute on &&ut3_owner..ut_sqldev_reporter to &ut3_user; +grant execute on &&ut3_owner..ut_realtime_reporter to &ut3_user; begin $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then execute immediate 'grant select, insert, delete, update on &&ut3_owner..dbmspcc_blocks to &ut3_user'; diff --git a/source/create_user_synonyms.sql b/source/create_user_synonyms.sql index 88b48eee0..806f02e6e 100644 --- a/source/create_user_synonyms.sql +++ b/source/create_user_synonyms.sql @@ -98,7 +98,7 @@ create or replace synonym &ut3_user..ut_key_value_pairs for &&ut3_owner..ut_key_ create or replace synonym &ut3_user..ut_key_value_pair for &&ut3_owner..ut_key_value_pair; create or replace synonym &ut3_user..ut_compound_data_tmp for &&ut3_owner..ut_cursor_data; create or replace synonym &ut3_user..ut_sonar_test_reporter for &&ut3_owner..ut_sonar_test_reporter; -create or replace synonym &ut3_user..ut_sqldev_reporter for &&ut3_owner..ut_sqldev_reporter; +create or replace synonym &ut3_user..ut_realtime_reporter for &&ut3_owner..ut_realtime_reporter; begin $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then execute immediate 'create or replace synonym &ut3_user..dbmspcc_blocks for &&ut3_owner..dbmspcc_blocks'; diff --git a/source/install.sql b/source/install.sql index defa3da49..a3a1dc715 100644 --- a/source/install.sql +++ b/source/install.sql @@ -292,8 +292,8 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'reporters/ut_coveralls_reporter.tpb' @@install_component.sql 'reporters/ut_coverage_cobertura_reporter.tps' @@install_component.sql 'reporters/ut_coverage_cobertura_reporter.tpb' -@@install_component.sql 'reporters/ut_sqldev_reporter.tps' -@@install_component.sql 'reporters/ut_sqldev_reporter.tpb' +@@install_component.sql 'reporters/ut_realtime_reporter.tps' +@@install_component.sql 'reporters/ut_realtime_reporter.tpb' @@install_component.sql 'api/be_between.syn' @@install_component.sql 'api/be_empty.syn' diff --git a/source/reporters/ut_sqldev_reporter.tpb b/source/reporters/ut_realtime_reporter.tpb similarity index 90% rename from source/reporters/ut_sqldev_reporter.tpb rename to source/reporters/ut_realtime_reporter.tpb index 2288dfa86..0f76ba8de 100644 --- a/source/reporters/ut_sqldev_reporter.tpb +++ b/source/reporters/ut_realtime_reporter.tpb @@ -1,4 +1,4 @@ -create or replace type body ut_sqldev_reporter is +create or replace type body ut_realtime_reporter is /* utPLSQL - Version 3 Copyright 2016 - 2018 utPLSQL Project @@ -16,13 +16,13 @@ create or replace type body ut_sqldev_reporter is limitations under the License. */ - constructor function ut_sqldev_reporter(self in out nocopy ut_sqldev_reporter) return self as result is + constructor function ut_realtime_reporter(self in out nocopy ut_realtime_reporter) return self as result is begin self.init($$plsql_unit); return; end; - overriding member procedure before_calling_run(self in out nocopy ut_sqldev_reporter, a_run in ut_run) is + overriding member procedure before_calling_run(self in out nocopy ut_realtime_reporter, a_run in ut_run) is procedure print_test_elements(a_test ut_test) is begin self.print_text(''); end; - overriding member procedure before_calling_test(self in out nocopy ut_sqldev_reporter, a_test in ut_test) as + overriding member procedure before_calling_test(self in out nocopy ut_realtime_reporter, a_test in ut_test) as begin self.print_text(''); end; - overriding member procedure after_calling_test(self in out nocopy ut_sqldev_reporter, a_test in ut_test) as + overriding member procedure after_calling_test(self in out nocopy ut_realtime_reporter, a_test in ut_test) as begin self.print_text(''); end; - overriding member procedure after_calling_run(self in out nocopy ut_sqldev_reporter, a_run in ut_run) as + overriding member procedure after_calling_run(self in out nocopy ut_realtime_reporter, a_run in ut_run) as begin self.print_text(''); self.print_text(''); diff --git a/source/reporters/ut_sqldev_reporter.tps b/source/reporters/ut_realtime_reporter.tps similarity index 77% rename from source/reporters/ut_sqldev_reporter.tps rename to source/reporters/ut_realtime_reporter.tps index c5c4dc64e..455361f79 100644 --- a/source/reporters/ut_sqldev_reporter.tps +++ b/source/reporters/ut_realtime_reporter.tps @@ -1,4 +1,4 @@ -create or replace type ut_sqldev_reporter force under ut_output_reporter_base( +create or replace type ut_realtime_reporter force under ut_output_reporter_base( /* utPLSQL - Version 3 Copyright 2016 - 2018 utPLSQL Project @@ -16,36 +16,35 @@ create or replace type ut_sqldev_reporter force under ut_output_reporter_base( limitations under the License. */ - -- TODO: grant execute on ut_sqldev_reporter to public; - -- TODO: handle public synonym -- TODO: unit test + -- TODO: add after suite to handle dbms_output and warnings on this level. /** * The SQL Developer reporter. * Provides test results in a XML format, to consumed by clients such as SQL Developer interested progressing details. */ - constructor function ut_sqldev_reporter(self in out nocopy ut_sqldev_reporter) return self as result, + constructor function ut_realtime_reporter(self in out nocopy ut_realtime_reporter) return self as result, /** * Provides meta data of complete run in advance. * Used in IDE to show total tests and initialize a progress bar. */ - overriding member procedure before_calling_run(self in out nocopy ut_sqldev_reporter, a_run in ut_run), + overriding member procedure before_calling_run(self in out nocopy ut_realtime_reporter, a_run in ut_run), /** * Provides meta data of test to be called. */ - overriding member procedure before_calling_test(self in out nocopy ut_sqldev_reporter, a_test in ut_test), + overriding member procedure before_calling_test(self in out nocopy ut_realtime_reporter, a_test in ut_test), /** * Provides meta data of a completed test with runtime, status, */ - overriding member procedure after_calling_test(self in out nocopy ut_sqldev_reporter, a_test in ut_test), + overriding member procedure after_calling_test(self in out nocopy ut_realtime_reporter, a_test in ut_test), /** * Provides closing tag with runtime summary. */ - overriding member procedure after_calling_run(self in out nocopy ut_sqldev_reporter, a_run in ut_run), + overriding member procedure after_calling_run(self in out nocopy ut_realtime_reporter, a_run in ut_run), /** * Provides the description of this reporter. diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index 681ab862a..c20868079 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -39,7 +39,7 @@ drop type ut_coverage_html_reporter force; drop type ut_sonar_test_reporter force; -drop type ut_sqldev_reporter force; +drop type ut_realtime_reporter force; drop package ut_coverage; From 6531e08e538fdeeec17df51c040f39feec7ae2ab Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Fri, 28 Dec 2018 09:14:20 +0100 Subject: [PATCH 0168/1096] add initial test suite for ut_realtime_reporter --- .../core/reporters/test_realtime_reporter.pkb | 85 +++++++++++++++++++ .../core/reporters/test_realtime_reporter.pks | 15 ++++ 2 files changed, 100 insertions(+) create mode 100644 test/core/reporters/test_realtime_reporter.pkb create mode 100644 test/core/reporters/test_realtime_reporter.pks diff --git a/test/core/reporters/test_realtime_reporter.pkb b/test/core/reporters/test_realtime_reporter.pkb new file mode 100644 index 000000000..e6345d86c --- /dev/null +++ b/test/core/reporters/test_realtime_reporter.pkb @@ -0,0 +1,85 @@ +create or replace package body test_realtime_reporter as + + procedure create_test_suites is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package ut3_tester.check_realtime_reporting1 is + --%suite(suite ) + --%suitepath(realtime_reporting) + + --%context(test context) + + --%test(test 1 - OK) + procedure test_1_ok; + + --%test(test 2 - NOK) + procedure test_2_nok; + + --%endcontext + end;]'; + execute immediate q'[create or replace package body ut3_tester.check_realtime_reporting1 is + procedure test_1_ok is + begin + ut3.ut.expect(1).to_equal(1); + end; + + procedure test_2_nok is + begin + ut3.ut.expect(1).to_equal(2); + end; + end;]'; + + execute immediate q'[create or replace package ut3_tester.check_realtime_reporting2 is + --%suite + --%suitepath(realtime_reporting) + + --%test + procedure test_3_ok; + + --%test + procedure test_4_nok; + + --%test + --%disabled + procedure test_5; + end;]'; + execute immediate q'[create or replace package body ut3_tester.check_realtime_reporting2 is + procedure test_3_ok is + begin + ut3.ut.expect(2).to_equal(2); + end; + + procedure test_4_nok is + begin + ut3.ut.expect(2).to_equal(3); + end; + + procedure test_5 is + begin + null; + end; + end;]'; + commit; + end; + + procedure report_produces_expected_out is + l_results ut3.ut_varchar2_list; + l_actual clob; + l_expected varchar2(32767) := q'[%]'; + begin + select * + bulk collect into l_results + from table(ut3.ut.run('ut3_tester:realtime_reporting', ut3.ut_realtime_reporter())); + l_actual := ut3.ut_utils.table_to_clob(l_results); + ut.expect(l_actual).to_be_like(l_expected); + end; + + procedure remove_test_suites is + pragma autonomous_transaction; + begin + execute immediate 'drop package ut3_tester.check_realtime_reporting1'; + execute immediate 'drop package ut3_tester.check_realtime_reporting2'; + end; + +end; +/ diff --git a/test/core/reporters/test_realtime_reporter.pks b/test/core/reporters/test_realtime_reporter.pks new file mode 100644 index 000000000..8ced907e4 --- /dev/null +++ b/test/core/reporters/test_realtime_reporter.pks @@ -0,0 +1,15 @@ +create or replace package test_realtime_reporter as + + --%suite(ut_realtime_reporter) + --%suitepath(utplsql.core.reporters) + + --%beforeall + procedure create_test_suites; + + --%test(Report produces expected output) + procedure report_produces_expected_out; + + --%afterall + procedure remove_test_suites; +end; +/ From 28a1a73d8e7ddaa3df5f4e8f509a2c7335b74984 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Fri, 28 Dec 2018 09:15:05 +0100 Subject: [PATCH 0169/1096] install test_realtime_reporter --- test/install_tests.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/install_tests.sql b/test/install_tests.sql index af67534d7..72e9a75e0 100644 --- a/test/install_tests.sql +++ b/test/install_tests.sql @@ -42,6 +42,7 @@ set define off @@core/reporters/test_coverage/test_coveralls_reporter.pks @@core/reporters/test_coverage/test_cov_cobertura_reporter.pks @@core/reporters/test_junit_reporter.pks +@@core/reporters/test_realtime_reporter.pks set define on @@install_below_12_2.sql 'core/reporters/test_coverage/test_html_proftab_reporter.pks' set define off @@ -92,6 +93,7 @@ set define off @@core/reporters/test_coverage/test_coveralls_reporter.pkb @@core/reporters/test_coverage/test_cov_cobertura_reporter.pkb @@core/reporters/test_junit_reporter.pkb +@@core/reporters/test_realtime_reporter.pkb set define on @@install_below_12_2.sql 'core/reporters/test_coverage/test_html_proftab_reporter.pkb' set define off From 010b8fd15d524a24120b41a6b4e2aa14515d7686 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Fri, 28 Dec 2018 09:16:19 +0100 Subject: [PATCH 0170/1096] add ut_realtime_reporter to list of core reporters --- test/api/test_ut_runner.pkb | 1 + 1 file changed, 1 insertion(+) diff --git a/test/api/test_ut_runner.pkb b/test/api/test_ut_runner.pkb index 96ae08a94..1cbf5d188 100644 --- a/test/api/test_ut_runner.pkb +++ b/test/api/test_ut_runner.pkb @@ -301,6 +301,7 @@ end;'; select 'UT3.UT_COVERALLS_REPORTER', 'Y' from dual union all select 'UT3.UT_DOCUMENTATION_REPORTER', 'Y' from dual union all select 'UT3.UT_JUNIT_REPORTER', 'Y' from dual union all + select 'UT3.UT_REALTIME_REPORTER', 'Y' from dual union all select 'UT3.UT_SONAR_TEST_REPORTER', 'Y' from dual union all select 'UT3.UT_TEAMCITY_REPORTER', 'Y' from dual union all select 'UT3.UT_TFS_JUNIT_REPORTER', 'Y' from dual union all From 9e79e6f8e2238a3216b821e0fa766276b7bbd8a7 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Fri, 28 Dec 2018 09:20:31 +0100 Subject: [PATCH 0171/1096] use print_xml_fragment for pretty printing --- source/reporters/ut_realtime_reporter.tpb | 52 +++++++++++++++-------- source/reporters/ut_realtime_reporter.tps | 44 ++++++++++++++++--- 2 files changed, 72 insertions(+), 24 deletions(-) diff --git a/source/reporters/ut_realtime_reporter.tpb b/source/reporters/ut_realtime_reporter.tpb index 0f76ba8de..ade156c69 100644 --- a/source/reporters/ut_realtime_reporter.tpb +++ b/source/reporters/ut_realtime_reporter.tpb @@ -19,13 +19,14 @@ create or replace type body ut_realtime_reporter is constructor function ut_realtime_reporter(self in out nocopy ut_realtime_reporter) return self as result is begin self.init($$plsql_unit); + current_indent := 0; return; end; overriding member procedure before_calling_run(self in out nocopy ut_realtime_reporter, a_run in ut_run) is procedure print_test_elements(a_test ut_test) is begin - self.print_text(''); + || ' description="' || a_suite.description || '">', 0, 1); for i in 1 .. a_suite.items.count loop if a_suite.items(i) is of(ut_test) then print_test_elements(treat(a_suite.items(i) as ut_test)); @@ -47,41 +48,46 @@ create or replace type body ut_realtime_reporter is print_suite_elements(treat(a_suite.items(i) as ut_logical_suite)); end if; end loop; - self.print_text(''); + self.print_xml_fragment('', -1); end; begin - self.print_text(ut_utils.get_xml_header(a_run.client_character_set)); - self.print_text(''); - self.print_text(''); - self.print_text(''); + self.print_xml_fragment(ut_utils.get_xml_header(a_run.client_character_set)); + self.print_xml_fragment('', 0, 1); + self.print_xml_fragment('', 0, 1); + self.print_xml_fragment('', 0, 1); for i in 1 .. a_run.items.count loop print_suite_elements(treat(a_run.items(i) as ut_logical_suite)); end loop; - self.print_text(''); - self.print_text(''); - self.print_text(''); + self.print_xml_fragment('', -1); + self.print_xml_fragment('', -1); + self.print_xml_fragment('', 0, 1); end; overriding member procedure before_calling_test(self in out nocopy ut_realtime_reporter, a_test in ut_test) as begin - self.print_text(''); + || ' disabled="' || case when a_test.get_disabled_flag() then 'true' else 'false' end || '"/>', 1, -1); end; overriding member procedure after_calling_test(self in out nocopy ut_realtime_reporter, a_test in ut_test) as begin - self.print_text(''); + self.print_xml_fragment(''); end; - + + overriding member procedure after_calling_suite(self in out nocopy ut_realtime_reporter, a_suite in ut_logical_suite) as + begin + self.print_xml_fragment(''); + end; + overriding member procedure after_calling_run(self in out nocopy ut_realtime_reporter, a_run in ut_run) as begin - self.print_text(''); - self.print_text(''); + self.print_xml_fragment('', -1); + self.print_xml_fragment('', -1); end; overriding member function get_description return varchar2 as @@ -89,5 +95,17 @@ create or replace type body ut_realtime_reporter is return 'Provides test results in a XML format, to consumed by clients such as SQL Developer interested progressing details.'; end; + member procedure print_xml_fragment( + self in out nocopy ut_realtime_reporter, + a_fragment in varchar2, + a_indent_summand_before in integer default 0, + a_indent_summand_after in integer default 0 + ) as + begin + current_indent := current_indent + a_indent_summand_before; + self.print_text(lpad(' ', 2 * current_indent) || a_fragment); + current_indent := current_indent + a_indent_summand_after; + end; + end; / diff --git a/source/reporters/ut_realtime_reporter.tps b/source/reporters/ut_realtime_reporter.tps index 455361f79..880bab080 100644 --- a/source/reporters/ut_realtime_reporter.tps +++ b/source/reporters/ut_realtime_reporter.tps @@ -15,19 +15,31 @@ create or replace type ut_realtime_reporter force under ut_output_reporter_base( See the License for the specific language governing permissions and limitations under the License. */ - - -- TODO: unit test - -- TODO: add after suite to handle dbms_output and warnings on this level. /** - * The SQL Developer reporter. + * Private attribute containing the total number of all tests in the run (incl. disabled tests). + */ + total_number_of_tests integer, + + /** + * Private attribute containing the currently executed test. + */ + current_test_number integer, + + /** + * Private attribute containing the current indentation in logical tabs. + */ + current_indent integer, + + /** + * The realtime reporter. * Provides test results in a XML format, to consumed by clients such as SQL Developer interested progressing details. */ constructor function ut_realtime_reporter(self in out nocopy ut_realtime_reporter) return self as result, /** * Provides meta data of complete run in advance. - * Used in IDE to show total tests and initialize a progress bar. + * Used to show total tests and initialize a progress bar. */ overriding member procedure before_calling_run(self in out nocopy ut_realtime_reporter, a_run in ut_run), @@ -37,10 +49,15 @@ create or replace type ut_realtime_reporter force under ut_output_reporter_base( overriding member procedure before_calling_test(self in out nocopy ut_realtime_reporter, a_test in ut_test), /** - * Provides meta data of a completed test with runtime, status, + * Provides meta data of a completed test with runtime and status. */ overriding member procedure after_calling_test(self in out nocopy ut_realtime_reporter, a_test in ut_test), + /** + * Provides meta data of completed test suite with runtime. + */ + overriding member procedure after_calling_suite(self in out nocopy ut_realtime_reporter, a_suite in ut_logical_suite), + /** * Provides closing tag with runtime summary. */ @@ -49,7 +66,20 @@ create or replace type ut_realtime_reporter force under ut_output_reporter_base( /** * Provides the description of this reporter. */ - overriding member function get_description return varchar2 + overriding member function get_description return varchar2, + + /** + * Private procedure to print a line of the resulting XML document using the current indentation. + * a_indent_summand_before is added before printing a line. + * a_indent_summand_after is added after printing a line. + * All output is produced through this function. + */ + member procedure print_xml_fragment( + self in out nocopy ut_realtime_reporter, + a_fragment in varchar2, + a_indent_summand_before in integer default 0, + a_indent_summand_after in integer default 0 + ) ) not final / From 4b29c564643f270358b4215c8a7827694b37f419 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Fri, 28 Dec 2018 19:49:57 +0100 Subject: [PATCH 0172/1096] changed formatting and comments --- source/reporters/ut_realtime_reporter.tps | 95 +++++++++++++++++++---- 1 file changed, 78 insertions(+), 17 deletions(-) diff --git a/source/reporters/ut_realtime_reporter.tps b/source/reporters/ut_realtime_reporter.tps index 880bab080..d6c7776cc 100644 --- a/source/reporters/ut_realtime_reporter.tps +++ b/source/reporters/ut_realtime_reporter.tps @@ -17,51 +17,77 @@ create or replace type ut_realtime_reporter force under ut_output_reporter_base( */ /** - * Private attribute containing the total number of all tests in the run (incl. disabled tests). + * Total number of all tests in the run (incl. disabled tests). */ total_number_of_tests integer, /** - * Private attribute containing the currently executed test. + * Currently executed test number. */ current_test_number integer, /** - * Private attribute containing the current indentation in logical tabs. + * Current indentation in logical tabs. */ current_indent integer, /** * The realtime reporter. - * Provides test results in a XML format, to consumed by clients such as SQL Developer interested progressing details. + * Provides test results in a XML format, for clients such as SQL Developer interested progressing details. */ - constructor function ut_realtime_reporter(self in out nocopy ut_realtime_reporter) return self as result, + constructor function ut_realtime_reporter( + self in out nocopy ut_realtime_reporter + ) return self as result, /** * Provides meta data of complete run in advance. * Used to show total tests and initialize a progress bar. */ - overriding member procedure before_calling_run(self in out nocopy ut_realtime_reporter, a_run in ut_run), + overriding member procedure before_calling_run( + self in out nocopy ut_realtime_reporter, + a_run in ut_run + ), /** - * Provides meta data of test to be called. + * Provides closing tag with runtime summary. */ - overriding member procedure before_calling_test(self in out nocopy ut_realtime_reporter, a_test in ut_test), + overriding member procedure after_calling_run( + self in out nocopy ut_realtime_reporter, + a_run in ut_run + ), /** - * Provides meta data of a completed test with runtime and status. + * Indicates the start of a test suite execution. */ - overriding member procedure after_calling_test(self in out nocopy ut_realtime_reporter, a_test in ut_test), + overriding member procedure before_calling_suite( + self in out nocopy ut_realtime_reporter, + a_suite in ut_logical_suite + ), /** * Provides meta data of completed test suite with runtime. */ - overriding member procedure after_calling_suite(self in out nocopy ut_realtime_reporter, a_suite in ut_logical_suite), + overriding member procedure after_calling_suite( + self in out nocopy ut_realtime_reporter, + a_suite in ut_logical_suite + ), + /** - * Provides closing tag with runtime summary. + * Indicates the start of a test. + */ + overriding member procedure before_calling_test( + self in out nocopy ut_realtime_reporter, + a_test in ut_test + ), + + /** + * Provides meta data of a completed test with runtime and status. */ - overriding member procedure after_calling_run(self in out nocopy ut_realtime_reporter, a_run in ut_run), + overriding member procedure after_calling_test( + self in out nocopy ut_realtime_reporter, + a_test in ut_test + ), /** * Provides the description of this reporter. @@ -69,16 +95,51 @@ create or replace type ut_realtime_reporter force under ut_output_reporter_base( overriding member function get_description return varchar2, /** - * Private procedure to print a line of the resulting XML document using the current indentation. + * Prints the start tag of an XML with an optional id attribute. + */ + member procedure print_start_node( + self in out nocopy ut_realtime_reporter, + a_name in varchar2, + a_id in varchar2 default null + ), + + /** + * Prints the end tag of an XML node. + */ + member procedure print_end_node( + self in out nocopy ut_realtime_reporter, + a_name in varchar2 + ), + + /** + * Prints a child node with content. Content will be XML encoded. + */ + member procedure print_node( + self in out nocopy ut_realtime_reporter, + a_name in varchar2, + a_content in clob + ), + + /** + * Prints a child node with content. Content is passed 1:1 incl. new lines, etc. using CDATA. + */ + member procedure print_cdata_node( + self in out nocopy ut_realtime_reporter, + a_name in varchar2, + a_content in clob + ), + + /** + * Prints a line of the resulting XML document using the current indentation. * a_indent_summand_before is added before printing a line. * a_indent_summand_after is added after printing a line. * All output is produced through this function. */ member procedure print_xml_fragment( self in out nocopy ut_realtime_reporter, - a_fragment in varchar2, - a_indent_summand_before in integer default 0, - a_indent_summand_after in integer default 0 + a_fragment in clob, + a_indent_summand_before in integer default 0, + a_indent_summand_after in integer default 0 ) ) not final From 2f22a8955e2f42ea06c9e5a5ecf8dfbb5201ef8b Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Fri, 28 Dec 2018 19:51:07 +0100 Subject: [PATCH 0173/1096] new XML report format, using XML attributes for id only --- source/reporters/ut_realtime_reporter.tpb | 231 +++++++++++++++++----- 1 file changed, 177 insertions(+), 54 deletions(-) diff --git a/source/reporters/ut_realtime_reporter.tpb b/source/reporters/ut_realtime_reporter.tpb index ade156c69..179cab95c 100644 --- a/source/reporters/ut_realtime_reporter.tpb +++ b/source/reporters/ut_realtime_reporter.tpb @@ -16,96 +16,219 @@ create or replace type body ut_realtime_reporter is limitations under the License. */ - constructor function ut_realtime_reporter(self in out nocopy ut_realtime_reporter) return self as result is + constructor function ut_realtime_reporter( + self in out nocopy ut_realtime_reporter + ) return self as result is begin self.init($$plsql_unit); + total_number_of_tests := 0; + current_test_number := 0; current_indent := 0; return; end; - overriding member procedure before_calling_run(self in out nocopy ut_realtime_reporter, a_run in ut_run) is - procedure print_test_elements(a_test ut_test) is + overriding member procedure before_calling_run( + self in out nocopy ut_realtime_reporter, + a_run in ut_run + ) is + procedure print_test_elements( + a_test in ut_test + ) is begin - self.print_xml_fragment(''); - end; + total_number_of_tests := total_number_of_tests + 1; + self.print_start_node('test', a_test.path); + self.print_node('executableType', a_test.item.executable_type); + self.print_node('ownerName', a_test.item.owner_name); + self.print_node('objectName', a_test.item.object_name); + self.print_node('procedureName', a_test.item.procedure_name); + self.print_node('disabled', case when a_test.get_disabled_flag() then 'true' else 'false' end); + self.print_node('name', a_test.name); + self.print_node('description', a_test.description); + self.print_node('testNumber', to_char(total_number_of_tests)); + self.print_end_node('test'); + end print_test_elements; - procedure print_suite_elements(a_suite ut_logical_suite) is + procedure print_suite_elements( + a_suite in ut_logical_suite + ) is begin - self.print_xml_fragment('', 0, 1); + self.print_start_node('suite', a_suite.path); + self.print_node('name', a_suite.name); + self.print_node('description', a_suite.description); + <> for i in 1 .. a_suite.items.count loop if a_suite.items(i) is of(ut_test) then print_test_elements(treat(a_suite.items(i) as ut_test)); elsif a_suite.items(i) is of(ut_logical_suite) then print_suite_elements(treat(a_suite.items(i) as ut_logical_suite)); end if; - end loop; - self.print_xml_fragment('', -1); - end; - + end loop suite_elements; + self.print_end_node('suite'); + end print_suite_elements; begin self.print_xml_fragment(ut_utils.get_xml_header(a_run.client_character_set)); - self.print_xml_fragment('', 0, 1); - self.print_xml_fragment('', 0, 1); - self.print_xml_fragment('', 0, 1); + self.print_start_node('report'); + self.print_start_node('preRun'); + self.print_start_node('suites'); + <> for i in 1 .. a_run.items.count loop print_suite_elements(treat(a_run.items(i) as ut_logical_suite)); - end loop; - self.print_xml_fragment('', -1); - self.print_xml_fragment('', -1); - self.print_xml_fragment('', 0, 1); - end; + end loop items; + self.print_end_node('suites'); + self.print_node('totalNumberOfTests', to_char(total_number_of_tests)); + self.print_end_node('preRun'); + self.print_start_node('runEvents'); + end before_calling_run; + + overriding member procedure after_calling_run( + self in out nocopy ut_realtime_reporter, + a_run in ut_run + ) is + begin + self.print_xml_fragment('', -1); + self.print_xml_fragment('', -1); + end after_calling_run; - overriding member procedure before_calling_test(self in out nocopy ut_realtime_reporter, a_test in ut_test) as + overriding member procedure before_calling_suite( + self in out nocopy ut_realtime_reporter, + a_suite in ut_logical_suite + ) is begin - self.print_xml_fragment('', 1, -1); - end; + self.print_start_node('startSuiteEvent', a_suite.path); + self.print_end_node('startSuiteEvent'); + end before_calling_suite; + + overriding member procedure after_calling_suite( + self in out nocopy ut_realtime_reporter, + a_suite in ut_logical_suite + ) is + begin + self.print_start_node('endSuiteEvent', a_suite.path); + self.print_node('startTime', to_char(a_suite.start_time, 'YYYY-MM-DD"T"HH24:MI:SS.FF6')); + self.print_node('endTime', to_char(a_suite.end_time, 'YYYY-MM-DD"T"HH24:MI:SS.FF6')); + self.print_node('executionTime', ut_utils.to_xml_number_format(a_suite.execution_time())); + self.print_start_node('counter'); + self.print_node('disabled', to_char(a_suite.results_count.disabled_count)); + self.print_node('success', to_char(a_suite.results_count.success_count)); + self.print_node('failure', to_char(a_suite.results_count.failure_count)); + self.print_node('error', to_char(a_suite.results_count.errored_count)); + self.print_node('warning', to_char(a_suite.results_count.warnings_count)); + self.print_end_node('counter'); + self.print_cdata_node('errorStack', ut_utils.table_to_clob(a_suite.get_error_stack_traces())); + self.print_cdata_node('serverOutput', a_suite.get_serveroutputs()); + self.print_end_node('endSuiteEvent'); + end after_calling_suite; + + overriding member procedure before_calling_test( + self in out nocopy ut_realtime_reporter, + a_test in ut_test + ) is + begin + current_test_number := current_test_number + 1; + self.print_start_node('startTestEvent', a_test.path); + self.print_node('testNumber', to_char(current_test_number)); + self.print_node('totalNumberOfTests', to_char(total_number_of_tests)); + self.print_end_node('startTestEvent'); + end before_calling_test; - overriding member procedure after_calling_test(self in out nocopy ut_realtime_reporter, a_test in ut_test) as + overriding member procedure after_calling_test( + self in out nocopy ut_realtime_reporter, + a_test in ut_test + ) is begin - self.print_xml_fragment(''); - end; + self.print_start_node('endTestEvent', a_test.path); + self.print_node('testNumber', to_char(current_test_number)); + self.print_node('totalNumberOfTests', to_char(total_number_of_tests)); + self.print_node('startTime', to_char(a_test.start_time, 'YYYY-MM-DD"T"HH24:MI:SS.FF6')); + self.print_node('endTime', to_char(a_test.end_time, 'YYYY-MM-DD"T"HH24:MI:SS.FF6')); + self.print_node('executionTime', ut_utils.to_xml_number_format(a_test.execution_time())); + self.print_start_node('counter'); + self.print_node('disabled', to_char(a_test.results_count.disabled_count)); + self.print_node('success', to_char(a_test.results_count.success_count)); + self.print_node('failure', to_char(a_test.results_count.failure_count)); + self.print_node('error', to_char(a_test.results_count.errored_count)); + self.print_node('warning', to_char(a_test.results_count.warnings_count)); + self.print_end_node('counter'); + self.print_cdata_node('errorStack', ut_utils.table_to_clob(a_test.get_error_stack_traces())); + self.print_cdata_node('serverOutput', a_test.get_serveroutputs()); + if a_test.failed_expectations.count > 0 then + self.print_start_node('failedExpectations'); + <> + for i in 1 .. a_test.failed_expectations.count loop + self.print_start_node('expectation'); + self.print_node('description', a_test.failed_expectations(i).description); + self.print_cdata_node('message', a_test.failed_expectations(i).message); + self.print_cdata_node('caller', a_test.failed_expectations(i).caller_info); + self.print_end_node('expectation'); + end loop expectations; + self.print_end_node('failedExpectations'); + end if; + self.print_end_node('endTestEvent'); + end after_calling_test; - overriding member procedure after_calling_suite(self in out nocopy ut_realtime_reporter, a_suite in ut_logical_suite) as + overriding member function get_description return varchar2 is begin - self.print_xml_fragment(''); - end; + return 'Provides test results in a XML format, for clients such as SQL Developer interested progressing details.'; + end get_description; - overriding member procedure after_calling_run(self in out nocopy ut_realtime_reporter, a_run in ut_run) as + member procedure print_start_node( + self in out nocopy ut_realtime_reporter, + a_name in varchar2, + a_id in varchar2 default null + ) is begin - self.print_xml_fragment('', -1); - self.print_xml_fragment('', -1); - end; + self.print_xml_fragment( + '<' || a_name + || case + when a_id is not null then + ' id="' || dbms_xmlgen.convert(a_id) || '"' + end + || '>', + 0, 1 + ); + end print_start_node; + + member procedure print_end_node( + self in out nocopy ut_realtime_reporter, + a_name in varchar2 + ) is + begin + self.print_xml_fragment('', -1); + end print_end_node; - overriding member function get_description return varchar2 as + member procedure print_node( + self in out nocopy ut_realtime_reporter, + a_name in varchar2, + a_content in clob + ) is begin - return 'Provides test results in a XML format, to consumed by clients such as SQL Developer interested progressing details.'; - end; + if a_content is not null then + self.print_xml_fragment('<' || a_name || '>' || dbms_xmlgen.convert(a_content) || ''); + end if; + end print_node; + + member procedure print_cdata_node( + self in out nocopy ut_realtime_reporter, + a_name in varchar2, + a_content in clob + ) is + begin + if a_content is not null then + self.print_xml_fragment('<' || a_name || '>'); + end if; + end print_cdata_node; member procedure print_xml_fragment( self in out nocopy ut_realtime_reporter, - a_fragment in varchar2, - a_indent_summand_before in integer default 0, - a_indent_summand_after in integer default 0 - ) as + a_fragment in clob, + a_indent_summand_before in integer default 0, + a_indent_summand_after in integer default 0 + ) is begin current_indent := current_indent + a_indent_summand_before; self.print_text(lpad(' ', 2 * current_indent) || a_fragment); current_indent := current_indent + a_indent_summand_after; - end; + end print_xml_fragment; end; / From d45c88ceb1fdb2772f1f77baba5370735d81ca46 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Fri, 28 Dec 2018 19:52:36 +0100 Subject: [PATCH 0174/1096] extended unit test, reasonable coverage, helps understanding the reporter --- .../core/reporters/test_realtime_reporter.pkb | 271 ++++++++++++++++-- .../core/reporters/test_realtime_reporter.pks | 42 ++- 2 files changed, 293 insertions(+), 20 deletions(-) diff --git a/test/core/reporters/test_realtime_reporter.pkb b/test/core/reporters/test_realtime_reporter.pkb index e6345d86c..d1a027025 100644 --- a/test/core/reporters/test_realtime_reporter.pkb +++ b/test/core/reporters/test_realtime_reporter.pkb @@ -1,6 +1,8 @@ create or replace package body test_realtime_reporter as - procedure create_test_suites is + g_actual_xml_report xmltype; + + procedure create_test_suites_and_run is pragma autonomous_transaction; begin execute immediate q'[create or replace package ut3_tester.check_realtime_reporting1 is @@ -52,6 +54,7 @@ create or replace package body test_realtime_reporter as procedure test_4_nok is begin ut3.ut.expect(2).to_equal(3); + ut3.ut.expect(2).to_equal(4); end; procedure test_5 is @@ -59,27 +62,263 @@ create or replace package body test_realtime_reporter as null; end; end;]'; - commit; - end; + + execute immediate q'[create or replace package ut3_tester.check_realtime_reporting3 is + --%suite + --%suitepath(realtime_reporting) + + --%test + procedure test_6_with_runtime_error; + + --%test + procedure test_7_with_serveroutput; + + --%afterall + procedure print_and_raise; + end;]'; + execute immediate q'[create or replace package body ut3_tester.check_realtime_reporting3 is + procedure test_6_with_runtime_error is + l_actual integer; + begin + execute immediate 'select 6 from non_existing_table' into l_actual; + ut3.ut.expect(6).to_equal(l_actual); + end; + + procedure test_7_with_serveroutput is + begin + dbms_output.put_line('before test 7'); + ut3.ut.expect(7).to_equal(7); + dbms_output.put_line('after test 7'); + end; + + procedure print_and_raise is + begin + dbms_output.put_line('Now, a no_data_found exception is raised'); + dbms_output.put_line('dbms_output and error stack is reported for this suite.'); + dbms_output.put_line('A runtime error in afterall is counted as a warning.'); + raise no_data_found; + end; + end;]'; + + <> + declare + l_results ut3.ut_varchar2_list; + begin + select * + bulk collect into l_results + from table(ut3.ut.run('ut3_tester:realtime_reporting', ut3.ut_realtime_reporter())); + g_actual_xml_report := xmltype(ut3.ut_utils.table_to_clob(l_results)); + end run_report_and_cache_result; + end create_test_suites_and_run; + + procedure xml_report_structure is + l_actual clob; + l_expected_list ut3.ut_varchar2_list; + l_expected clob; + begin + l_actual := g_actual_xml_report.getclobval(); + ut3.ut_utils.append_to_list(l_expected_list, ''); + ut3.ut_utils.append_to_list(l_expected_list, '%'); + ut3.ut_utils.append_to_list(l_expected_list, '% '); + ut3.ut_utils.append_to_list(l_expected_list, '% '); + ut3.ut_utils.append_to_list(l_expected_list, '% '); + ut3.ut_utils.append_to_list(l_expected_list, '% %'); + ut3.ut_utils.append_to_list(l_expected_list, '% %'); + ut3.ut_utils.append_to_list(l_expected_list, '% '); + ut3.ut_utils.append_to_list(l_expected_list, '% '); + ut3.ut_utils.append_to_list(l_expected_list, '% %'); + ut3.ut_utils.append_to_list(l_expected_list, '% '); + ut3.ut_utils.append_to_list(l_expected_list, '% '); + ut3.ut_utils.append_to_list(l_expected_list, '% '); + ut3.ut_utils.append_to_list(l_expected_list, '% '); + ut3.ut_utils.append_to_list(l_expected_list, '% '); + ut3.ut_utils.append_to_list(l_expected_list, '% '); + ut3.ut_utils.append_to_list(l_expected_list, '% '); + ut3.ut_utils.append_to_list(l_expected_list, '% '); + ut3.ut_utils.append_to_list(l_expected_list, '% '); + ut3.ut_utils.append_to_list(l_expected_list, '% '); + ut3.ut_utils.append_to_list(l_expected_list, '% '); + ut3.ut_utils.append_to_list(l_expected_list, '%'); + l_expected := ut3.ut_utils.table_to_clob(l_expected_list, null); + ut.expect(l_actual).to_be_like(l_expected); + end xml_report_structure; + + procedure total_number_of_tests is + l_actual integer; + l_expected integer := 7; + begin + l_actual := g_actual_xml_report.extract('/report/preRun/totalNumberOfTests/text()').getnumberval(); + ut.expect(l_actual).to_equal(l_expected); + end total_number_of_tests; + + procedure escaped_characters is + l_actual varchar2(32767); + l_expected varchar2(20) := 'suite <A>'; + begin + l_actual := + g_actual_xml_report.extract( + '//suite[@id="realtime_reporting.check_realtime_reporting1"]/description/text()' + ).getstringval(); + ut.expect(l_actual).to_equal(l_expected); + end escaped_characters; + + procedure number_of_starttestevent_nodes is + l_actual integer; + l_expected integer := 7; + begin + select count(*) + into l_actual + from xmltable( + '/report/runEvents/startTestEvent' + passing g_actual_xml_report + columns id varchar2(4000) path '@id', + test_number integer path 'testNumber', + total_number_of_tests integer path 'totalNumberOfTests' + ) + where id is not null + and test_number is not null + and total_number_of_tests is not null; + ut.expect(l_actual).to_equal(l_expected); + end number_of_starttestevent_nodes; + + procedure endtestevent_nodes is + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + open l_actual for + select test_number, total_number_of_tests + from xmltable( + '/report/runEvents/endTestEvent' + passing g_actual_xml_report + columns id varchar2(4000) path '@id', + test_number integer path 'testNumber', + total_number_of_tests integer path 'totalNumberOfTests' + ) + where id is not null + and test_number is not null + and total_number_of_tests is not null; + open l_expected for + select level as test_number, + 7 as total_number_of_tests + from dual + connect by level <= 7; + ut.expect(l_actual).to_equal(l_expected).unordered; + end endtestevent_nodes; - procedure report_produces_expected_out is - l_results ut3.ut_varchar2_list; - l_actual clob; - l_expected varchar2(32767) := q'[%]'; + + procedure single_failed_message is + l_actual varchar2(32767); + l_expected varchar2(80) := ''; + begin + l_actual := + g_actual_xml_report.extract( + '/report/runEvents/endTestEvent[@id="realtime_reporting.check_realtime_reporting1.test context.test_2_nok"]/failedExpectations/expectation[1]/message/text()' + ).getstringval(); + ut.expect(l_actual).to_equal(l_expected); + end single_failed_message; + + procedure multiple_failed_messages is + l_actual integer; + l_expected integer := 2; + begin + select count(*) + into l_actual + from xmltable( + '/report/runEvents/endTestEvent[@id="realtime_reporting.check_realtime_reporting2.test_4_nok"]/failedExpectations/expectation' + passing g_actual_xml_report + columns message clob path 'message', + caller clob path 'caller' + ) + where message is not null + and caller is not null; + ut.expect(l_actual).to_equal(l_expected); + end multiple_failed_messages; + + procedure serveroutput_of_test is + l_actual clob; + l_expected_list ut3.ut_varchar2_list; + l_expected clob; begin - select * - bulk collect into l_results - from table(ut3.ut.run('ut3_tester:realtime_reporting', ut3.ut_realtime_reporter())); - l_actual := ut3.ut_utils.table_to_clob(l_results); - ut.expect(l_actual).to_be_like(l_expected); - end; + l_actual := + g_actual_xml_report.extract( + '/report/runEvents/endTestEvent[@id="realtime_reporting.check_realtime_reporting3.test_7_with_serveroutput"]/serverOutput/text()' + ).getclobval(); + ut3.ut_utils.append_to_list(l_expected_list, ''); + l_expected := ut3.ut_utils.table_to_clob(l_expected_list); + ut.expect(l_actual).to_equal(l_expected); + end serveroutput_of_test; + + procedure serveroutput_of_testsuite is + l_actual clob; + l_expected_list ut3.ut_varchar2_list; + l_expected clob; + begin + l_actual := + g_actual_xml_report.extract( + '/report/runEvents/endSuiteEvent[@id="realtime_reporting.check_realtime_reporting3"]/serverOutput/text()' + ).getclobval(); + ut3.ut_utils.append_to_list(l_expected_list, ''); + l_expected := ut3.ut_utils.table_to_clob(l_expected_list); + ut.expect(l_actual).to_equal(l_expected); + end serveroutput_of_testsuite; + + procedure error_stack_of_test is + l_actual clob; + l_expected_list ut3.ut_varchar2_list; + l_expected clob; + begin + l_actual := + g_actual_xml_report.extract( + '/report/runEvents/endTestEvent[@id="realtime_reporting.check_realtime_reporting3.test_6_with_runtime_error"]/errorStack/text()' + ).getclobval(); + ut3.ut_utils.append_to_list(l_expected_list, ''); + l_expected := ut3.ut_utils.table_to_clob(l_expected_list); + ut.expect(l_actual).to_equal(l_expected); + end error_stack_of_test; + + procedure error_stack_of_testsuite is + l_actual clob; + l_expected_list ut3.ut_varchar2_list; + l_expected clob; + begin + l_actual := + g_actual_xml_report.extract( + '/report/runEvents/endSuiteEvent[@id="realtime_reporting.check_realtime_reporting3"]/errorStack/text()' + ).getclobval(); + ut3.ut_utils.append_to_list(l_expected_list, ''); + l_expected := ut3.ut_utils.table_to_clob(l_expected_list); + ut.expect(l_actual).to_equal(l_expected); + end error_stack_of_testsuite; + + procedure get_description is + l_reporter ut3.ut_realtime_reporter; + l_actual varchar2(4000); + l_expected varchar2(80) := '%SQL Developer%'; + begin + l_reporter := ut3.ut_realtime_reporter(); + l_actual := l_reporter.get_description(); + ut.expect(l_actual).to_be_like(l_expected); + end get_description; procedure remove_test_suites is pragma autonomous_transaction; - begin + begin/* execute immediate 'drop package ut3_tester.check_realtime_reporting1'; execute immediate 'drop package ut3_tester.check_realtime_reporting2'; - end; + execute immediate 'drop package ut3_tester.check_realtime_reporting3'; + */ null; + end remove_test_suites; -end; +end test_realtime_reporter; / diff --git a/test/core/reporters/test_realtime_reporter.pks b/test/core/reporters/test_realtime_reporter.pks index 8ced907e4..98446aa5c 100644 --- a/test/core/reporters/test_realtime_reporter.pks +++ b/test/core/reporters/test_realtime_reporter.pks @@ -4,12 +4,46 @@ create or replace package test_realtime_reporter as --%suitepath(utplsql.core.reporters) --%beforeall - procedure create_test_suites; + procedure create_test_suites_and_run; - --%test(Report produces expected output) - procedure report_produces_expected_out; + --%test(Check XML report structure) + procedure xml_report_structure; + --%test(Check total number of tests) + procedure total_number_of_tests; + + --%test(Check escaped characters in test suite description) + procedure escaped_characters; + + --%test(Check number of startTestEvent nodes) + procedure number_of_starttestevent_nodes; + + --%test(Check testNumber and totalNumberOfTests in endTestEvent nodes) + procedure endtestevent_nodes; + + --%test(Check expectation message for a failed test) + procedure single_failed_message; + + --%test(Check existence of multiple expectation messages for a failed test) + procedure multiple_failed_messages; + + --%test(Check for serveroutput of test) + procedure serveroutput_of_test; + + --%test(Check for serveroutput of testsuite) + procedure serveroutput_of_testsuite; + + --%test(Check for error stack of test) + procedure error_stack_of_test; + + --%test(Check for error stack of testsuite) + procedure error_stack_of_testsuite; + + --%test(Check description of reporter) + procedure get_description; + --%afterall procedure remove_test_suites; -end; + +end test_realtime_reporter; / From b37b188abd430df040e10625e525d9e5d1053bf5 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Fri, 28 Dec 2018 19:58:20 +0100 Subject: [PATCH 0175/1096] enable drop of test packages --- test/core/reporters/test_realtime_reporter.pkb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/core/reporters/test_realtime_reporter.pkb b/test/core/reporters/test_realtime_reporter.pkb index d1a027025..9dc4787db 100644 --- a/test/core/reporters/test_realtime_reporter.pkb +++ b/test/core/reporters/test_realtime_reporter.pkb @@ -313,11 +313,10 @@ create or replace package body test_realtime_reporter as procedure remove_test_suites is pragma autonomous_transaction; - begin/* + begin execute immediate 'drop package ut3_tester.check_realtime_reporting1'; execute immediate 'drop package ut3_tester.check_realtime_reporting2'; execute immediate 'drop package ut3_tester.check_realtime_reporting3'; - */ null; end remove_test_suites; end test_realtime_reporter; From 8c1c561acb135cd33a1c3b9c48ce4d369c2708ac Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Fri, 28 Dec 2018 22:00:56 +0100 Subject: [PATCH 0176/1096] remove hard-coded owner ut3_tester --- .../core/reporters/test_realtime_reporter.pkb | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/test/core/reporters/test_realtime_reporter.pkb b/test/core/reporters/test_realtime_reporter.pkb index 9dc4787db..468a65769 100644 --- a/test/core/reporters/test_realtime_reporter.pkb +++ b/test/core/reporters/test_realtime_reporter.pkb @@ -5,7 +5,7 @@ create or replace package body test_realtime_reporter as procedure create_test_suites_and_run is pragma autonomous_transaction; begin - execute immediate q'[create or replace package ut3_tester.check_realtime_reporting1 is + execute immediate q'[create or replace package check_realtime_reporting1 is --%suite(suite ) --%suitepath(realtime_reporting) @@ -19,7 +19,7 @@ create or replace package body test_realtime_reporter as --%endcontext end;]'; - execute immediate q'[create or replace package body ut3_tester.check_realtime_reporting1 is + execute immediate q'[create or replace package body check_realtime_reporting1 is procedure test_1_ok is begin ut3.ut.expect(1).to_equal(1); @@ -31,7 +31,7 @@ create or replace package body test_realtime_reporter as end; end;]'; - execute immediate q'[create or replace package ut3_tester.check_realtime_reporting2 is + execute immediate q'[create or replace package check_realtime_reporting2 is --%suite --%suitepath(realtime_reporting) @@ -45,7 +45,7 @@ create or replace package body test_realtime_reporter as --%disabled procedure test_5; end;]'; - execute immediate q'[create or replace package body ut3_tester.check_realtime_reporting2 is + execute immediate q'[create or replace package body check_realtime_reporting2 is procedure test_3_ok is begin ut3.ut.expect(2).to_equal(2); @@ -63,7 +63,7 @@ create or replace package body test_realtime_reporter as end; end;]'; - execute immediate q'[create or replace package ut3_tester.check_realtime_reporting3 is + execute immediate q'[create or replace package check_realtime_reporting3 is --%suite --%suitepath(realtime_reporting) @@ -76,7 +76,7 @@ create or replace package body test_realtime_reporter as --%afterall procedure print_and_raise; end;]'; - execute immediate q'[create or replace package body ut3_tester.check_realtime_reporting3 is + execute immediate q'[create or replace package body check_realtime_reporting3 is procedure test_6_with_runtime_error is l_actual integer; begin @@ -277,11 +277,11 @@ create or replace package body test_realtime_reporter as '/report/runEvents/endTestEvent[@id="realtime_reporting.check_realtime_reporting3.test_6_with_runtime_error"]/errorStack/text()' ).getclobval(); ut3.ut_utils.append_to_list(l_expected_list, ''); l_expected := ut3.ut_utils.table_to_clob(l_expected_list); - ut.expect(l_actual).to_equal(l_expected); + ut.expect(l_actual).to_be_like(l_expected); end error_stack_of_test; procedure error_stack_of_testsuite is @@ -294,11 +294,11 @@ create or replace package body test_realtime_reporter as '/report/runEvents/endSuiteEvent[@id="realtime_reporting.check_realtime_reporting3"]/errorStack/text()' ).getclobval(); ut3.ut_utils.append_to_list(l_expected_list, ''); l_expected := ut3.ut_utils.table_to_clob(l_expected_list); - ut.expect(l_actual).to_equal(l_expected); + ut.expect(l_actual).to_be_like(l_expected); end error_stack_of_testsuite; procedure get_description is @@ -314,9 +314,9 @@ create or replace package body test_realtime_reporter as procedure remove_test_suites is pragma autonomous_transaction; begin - execute immediate 'drop package ut3_tester.check_realtime_reporting1'; - execute immediate 'drop package ut3_tester.check_realtime_reporting2'; - execute immediate 'drop package ut3_tester.check_realtime_reporting3'; + execute immediate 'drop package check_realtime_reporting1'; + execute immediate 'drop package check_realtime_reporting2'; + execute immediate 'drop package check_realtime_reporting3'; end remove_test_suites; end test_realtime_reporter; From bcf16063ce1d10244b4f37383217a2fa887cecf9 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Fri, 28 Dec 2018 23:45:36 +0100 Subject: [PATCH 0177/1096] make complete event a.s.a.p. visible in consuming session Even with "set arraysize 1" the last row in an output table is not consumed delayed. Inserting a new row after the closing event tag, makes the complete event immediately visible in the consuming session. The XML is still valid with these additional whitespaces (spaces based on indentation and new line). As a positive side effect, the different events are more visible. --- source/reporters/ut_realtime_reporter.tpb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/reporters/ut_realtime_reporter.tpb b/source/reporters/ut_realtime_reporter.tpb index 179cab95c..97e7c2b3d 100644 --- a/source/reporters/ut_realtime_reporter.tpb +++ b/source/reporters/ut_realtime_reporter.tpb @@ -194,6 +194,10 @@ create or replace type body ut_realtime_reporter is ) is begin self.print_xml_fragment('', -1); + if a_name like '%Event' then + -- force new line to make complete event a.s.a.p. visible in consuming session + self.print_xml_fragment(null); + end if; end print_end_node; member procedure print_node( From d4b09c7df2033c486d145cc18f4b2fdb63356cb2 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 29 Dec 2018 08:10:06 +0100 Subject: [PATCH 0178/1096] fix incompatibility to 12.1 --- test/core/reporters/test_realtime_reporter.pkb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/core/reporters/test_realtime_reporter.pkb b/test/core/reporters/test_realtime_reporter.pkb index 468a65769..06449b70e 100644 --- a/test/core/reporters/test_realtime_reporter.pkb +++ b/test/core/reporters/test_realtime_reporter.pkb @@ -278,8 +278,7 @@ create or replace package body test_realtime_reporter as ).getclobval(); ut3.ut_utils.append_to_list(l_expected_list, ''); + ut3.ut_utils.append_to_list(l_expected_list, '%ORA-06512: at line 6]]>'); l_expected := ut3.ut_utils.table_to_clob(l_expected_list); ut.expect(l_actual).to_be_like(l_expected); end error_stack_of_test; @@ -295,8 +294,7 @@ create or replace package body test_realtime_reporter as ).getclobval(); ut3.ut_utils.append_to_list(l_expected_list, ''); + ut3.ut_utils.append_to_list(l_expected_list, '%ORA-06512: at line 6]]>'); l_expected := ut3.ut_utils.table_to_clob(l_expected_list); ut.expect(l_actual).to_be_like(l_expected); end error_stack_of_testsuite; From c2cc292cac46cba23db9bd24eae80d8aa6818657 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 29 Dec 2018 08:21:16 +0100 Subject: [PATCH 0179/1096] Fixed typos in comments and made comments more precise. --- source/reporters/ut_realtime_reporter.tps | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/source/reporters/ut_realtime_reporter.tps b/source/reporters/ut_realtime_reporter.tps index d6c7776cc..8c596c956 100644 --- a/source/reporters/ut_realtime_reporter.tps +++ b/source/reporters/ut_realtime_reporter.tps @@ -33,7 +33,7 @@ create or replace type ut_realtime_reporter force under ut_output_reporter_base( /** * The realtime reporter. - * Provides test results in a XML format, for clients such as SQL Developer interested progressing details. + * Provides test results in a XML format, for clients such as SQL Developer interested in showing progressing details. */ constructor function ut_realtime_reporter( self in out nocopy ut_realtime_reporter @@ -41,7 +41,6 @@ create or replace type ut_realtime_reporter force under ut_output_reporter_base( /** * Provides meta data of complete run in advance. - * Used to show total tests and initialize a progress bar. */ overriding member procedure before_calling_run( self in out nocopy ut_realtime_reporter, @@ -49,7 +48,7 @@ create or replace type ut_realtime_reporter force under ut_output_reporter_base( ), /** - * Provides closing tag with runtime summary. + * Provides closing tags. */ overriding member procedure after_calling_run( self in out nocopy ut_realtime_reporter, @@ -65,7 +64,7 @@ create or replace type ut_realtime_reporter force under ut_output_reporter_base( ), /** - * Provides meta data of completed test suite with runtime. + * Provides meta data of completed test suite. */ overriding member procedure after_calling_suite( self in out nocopy ut_realtime_reporter, @@ -82,7 +81,7 @@ create or replace type ut_realtime_reporter force under ut_output_reporter_base( ), /** - * Provides meta data of a completed test with runtime and status. + * Provides meta data of a completed test. */ overriding member procedure after_calling_test( self in out nocopy ut_realtime_reporter, @@ -95,7 +94,7 @@ create or replace type ut_realtime_reporter force under ut_output_reporter_base( overriding member function get_description return varchar2, /** - * Prints the start tag of an XML with an optional id attribute. + * Prints the start tag of a XML node with an optional id attribute. */ member procedure print_start_node( self in out nocopy ut_realtime_reporter, @@ -104,7 +103,7 @@ create or replace type ut_realtime_reporter force under ut_output_reporter_base( ), /** - * Prints the end tag of an XML node. + * Prints the end tag of a XML node. */ member procedure print_end_node( self in out nocopy ut_realtime_reporter, @@ -112,7 +111,7 @@ create or replace type ut_realtime_reporter force under ut_output_reporter_base( ), /** - * Prints a child node with content. Content will be XML encoded. + * Prints a child node with content. Special characters are encoded. */ member procedure print_node( self in out nocopy ut_realtime_reporter, @@ -121,7 +120,7 @@ create or replace type ut_realtime_reporter force under ut_output_reporter_base( ), /** - * Prints a child node with content. Content is passed 1:1 incl. new lines, etc. using CDATA. + * Prints a child node with content. Content is passed 1:1 using CDATA. */ member procedure print_cdata_node( self in out nocopy ut_realtime_reporter, From 0c6a0adb4a57e15cea3881fcb6f87da9ba488e78 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 29 Dec 2018 08:23:30 +0100 Subject: [PATCH 0180/1096] get_description synchronized with type specification. --- source/reporters/ut_realtime_reporter.tpb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/reporters/ut_realtime_reporter.tpb b/source/reporters/ut_realtime_reporter.tpb index 97e7c2b3d..a4e1fdd49 100644 --- a/source/reporters/ut_realtime_reporter.tpb +++ b/source/reporters/ut_realtime_reporter.tpb @@ -168,7 +168,7 @@ create or replace type body ut_realtime_reporter is overriding member function get_description return varchar2 is begin - return 'Provides test results in a XML format, for clients such as SQL Developer interested progressing details.'; + return 'Provides test results in a XML format, for clients such as SQL Developer interested in showing progressing details.'; end get_description; member procedure print_start_node( From 7134f130681741b0d090facb7bd4fdd6085c5a64 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 29 Dec 2018 08:31:17 +0100 Subject: [PATCH 0181/1096] use print_end_node to close tags --- source/reporters/ut_realtime_reporter.tpb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/reporters/ut_realtime_reporter.tpb b/source/reporters/ut_realtime_reporter.tpb index a4e1fdd49..c245063e0 100644 --- a/source/reporters/ut_realtime_reporter.tpb +++ b/source/reporters/ut_realtime_reporter.tpb @@ -85,8 +85,8 @@ create or replace type body ut_realtime_reporter is a_run in ut_run ) is begin - self.print_xml_fragment('', -1); - self.print_xml_fragment('', -1); + self.print_end_node('runEvents'); + self.print_end_node('report'); end after_calling_run; overriding member procedure before_calling_suite( From 257756673001f112863fab44ba88c28d5972518a Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 29 Dec 2018 08:36:05 +0100 Subject: [PATCH 0182/1096] removed duplicate line feed --- source/reporters/ut_realtime_reporter.tps | 1 - 1 file changed, 1 deletion(-) diff --git a/source/reporters/ut_realtime_reporter.tps b/source/reporters/ut_realtime_reporter.tps index 8c596c956..8c0dcf379 100644 --- a/source/reporters/ut_realtime_reporter.tps +++ b/source/reporters/ut_realtime_reporter.tps @@ -71,7 +71,6 @@ create or replace type ut_realtime_reporter force under ut_output_reporter_base( a_suite in ut_logical_suite ), - /** * Indicates the start of a test. */ From 16722482bd314ed81a97db108f8eb340ef796350 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 29 Dec 2018 08:41:14 +0100 Subject: [PATCH 0183/1096] removed duplicate line feed --- test/core/reporters/test_realtime_reporter.pkb | 1 - 1 file changed, 1 deletion(-) diff --git a/test/core/reporters/test_realtime_reporter.pkb b/test/core/reporters/test_realtime_reporter.pkb index 06449b70e..2eb7b2c21 100644 --- a/test/core/reporters/test_realtime_reporter.pkb +++ b/test/core/reporters/test_realtime_reporter.pkb @@ -205,7 +205,6 @@ create or replace package body test_realtime_reporter as ut.expect(l_actual).to_equal(l_expected).unordered; end endtestevent_nodes; - procedure single_failed_message is l_actual varchar2(32767); l_expected varchar2(80) := ''; From 42cf8ee11f120ccbce2dadce7b864943d209df37 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 29 Dec 2018 16:39:53 +0100 Subject: [PATCH 0184/1096] change description of the tests to reflect the requirements as suggested by jgebal --- .../core/reporters/test_realtime_reporter.pks | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/test/core/reporters/test_realtime_reporter.pks b/test/core/reporters/test_realtime_reporter.pks index 98446aa5c..fa5bbd3ac 100644 --- a/test/core/reporters/test_realtime_reporter.pks +++ b/test/core/reporters/test_realtime_reporter.pks @@ -6,40 +6,40 @@ create or replace package test_realtime_reporter as --%beforeall procedure create_test_suites_and_run; - --%test(Check XML report structure) + --%test(Provide a report structure with pre-run information and event based messages per suite and per test) procedure xml_report_structure; - --%test(Check total number of tests) + --%test(Provide the total number of tests as part of the pre-run information structure) procedure total_number_of_tests; - --%test(Check escaped characters in test suite description) + --%test(Escape special characters in data such as the test suite description) procedure escaped_characters; - --%test(Check number of startTestEvent nodes) + --%test(Provide a startTestEvent node before starting a test with testNumber and totalNumberOfTests) procedure number_of_starttestevent_nodes; - --%test(Check testNumber and totalNumberOfTests in endTestEvent nodes) + --%test(Provide a endTestEvent node after completion of a test with test results) procedure endtestevent_nodes; - --%test(Check expectation message for a failed test) + --%test(Provide expectation message for a failed test) procedure single_failed_message; - --%test(Check existence of multiple expectation messages for a failed test) + --%test(Provide expectation messages for each failed assertion of a failed test) procedure multiple_failed_messages; - --%test(Check for serveroutput of test) + --%test(Provide dbms_output produced in a test) procedure serveroutput_of_test; - --%test(Check for serveroutput of testsuite) + --%test(Provide dbms_output produced in a testsuite) procedure serveroutput_of_testsuite; - --%test(Check for error stack of test) + --%test(Provide the error stack of a test) procedure error_stack_of_test; - --%test(Check for error stack of testsuite) + --%test(Provide the error stack of a testsuite) procedure error_stack_of_testsuite; - --%test(Check description of reporter) + --%test(Provide a description of the reporter explaining the use for SQL Developer) procedure get_description; --%afterall From 6512cf8c719aa62e5c31cda5e0dab6fc87779cab Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 29 Dec 2018 16:44:10 +0100 Subject: [PATCH 0185/1096] replace granular self.print_text_lines calls with a few self.print_text calls to optimize runtime performance as suggested by jgebal --- source/reporters/ut_realtime_reporter.tpb | 17 ++++++++++++++++- source/reporters/ut_realtime_reporter.tps | 12 ++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/source/reporters/ut_realtime_reporter.tpb b/source/reporters/ut_realtime_reporter.tpb index c245063e0..c6568cd04 100644 --- a/source/reporters/ut_realtime_reporter.tpb +++ b/source/reporters/ut_realtime_reporter.tpb @@ -24,6 +24,7 @@ create or replace type body ut_realtime_reporter is total_number_of_tests := 0; current_test_number := 0; current_indent := 0; + print_buffer := ut_varchar2_rows(); return; end; @@ -78,6 +79,7 @@ create or replace type body ut_realtime_reporter is self.print_node('totalNumberOfTests', to_char(total_number_of_tests)); self.print_end_node('preRun'); self.print_start_node('runEvents'); + self.flush_print_buffer(); end before_calling_run; overriding member procedure after_calling_run( @@ -87,6 +89,7 @@ create or replace type body ut_realtime_reporter is begin self.print_end_node('runEvents'); self.print_end_node('report'); + self.flush_print_buffer(); end after_calling_run; overriding member procedure before_calling_suite( @@ -96,6 +99,7 @@ create or replace type body ut_realtime_reporter is begin self.print_start_node('startSuiteEvent', a_suite.path); self.print_end_node('startSuiteEvent'); + self.flush_print_buffer(); end before_calling_suite; overriding member procedure after_calling_suite( @@ -117,6 +121,7 @@ create or replace type body ut_realtime_reporter is self.print_cdata_node('errorStack', ut_utils.table_to_clob(a_suite.get_error_stack_traces())); self.print_cdata_node('serverOutput', a_suite.get_serveroutputs()); self.print_end_node('endSuiteEvent'); + self.flush_print_buffer(); end after_calling_suite; overriding member procedure before_calling_test( @@ -129,6 +134,7 @@ create or replace type body ut_realtime_reporter is self.print_node('testNumber', to_char(current_test_number)); self.print_node('totalNumberOfTests', to_char(total_number_of_tests)); self.print_end_node('startTestEvent'); + self.flush_print_buffer(); end before_calling_test; overriding member procedure after_calling_test( @@ -164,6 +170,7 @@ create or replace type body ut_realtime_reporter is self.print_end_node('failedExpectations'); end if; self.print_end_node('endTestEvent'); + self.flush_print_buffer(); end after_calling_test; overriding member function get_description return varchar2 is @@ -230,9 +237,17 @@ create or replace type body ut_realtime_reporter is ) is begin current_indent := current_indent + a_indent_summand_before; - self.print_text(lpad(' ', 2 * current_indent) || a_fragment); + ut_utils.append_to_list(print_buffer, lpad(' ', 2 * current_indent) || a_fragment); current_indent := current_indent + a_indent_summand_after; end print_xml_fragment; + + member procedure flush_print_buffer( + self in out nocopy ut_realtime_reporter + ) is + begin + self.print_text_lines(print_buffer); + print_buffer.delete; + end flush_print_buffer; end; / diff --git a/source/reporters/ut_realtime_reporter.tps b/source/reporters/ut_realtime_reporter.tps index 8c0dcf379..685ece7e4 100644 --- a/source/reporters/ut_realtime_reporter.tps +++ b/source/reporters/ut_realtime_reporter.tps @@ -31,6 +31,11 @@ create or replace type ut_realtime_reporter force under ut_output_reporter_base( */ current_indent integer, + /** + * Buffers lines to be printed. + */ + print_buffer ut_varchar2_rows, + /** * The realtime reporter. * Provides test results in a XML format, for clients such as SQL Developer interested in showing progressing details. @@ -138,6 +143,13 @@ create or replace type ut_realtime_reporter force under ut_output_reporter_base( a_fragment in clob, a_indent_summand_before in integer default 0, a_indent_summand_after in integer default 0 + ), + + /** + * Flushes the local print buffer to the output buffer. + */ + member procedure flush_print_buffer( + self in out nocopy ut_realtime_reporter ) ) not final From c1273afe1fc19ffa11dd066cd576b4157bd6b797 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 29 Dec 2018 23:46:35 +0100 Subject: [PATCH 0186/1096] added text_xmltype_list collection type for test_realtime_reporter --- test/helpers/test_xmltype_list.tps | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 test/helpers/test_xmltype_list.tps diff --git a/test/helpers/test_xmltype_list.tps b/test/helpers/test_xmltype_list.tps new file mode 100644 index 000000000..9c1bd4445 --- /dev/null +++ b/test/helpers/test_xmltype_list.tps @@ -0,0 +1,2 @@ +create or replace type test_xmltype_list as table of xmltype; +/ From b05760d135e42ccc20865f80aa824815954e1090 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 29 Dec 2018 23:47:07 +0100 Subject: [PATCH 0187/1096] install new collection type test_xmltype_list for test_realtime_reporter --- test/install_tests.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/test/install_tests.sql b/test/install_tests.sql index 72e9a75e0..3f758de3f 100644 --- a/test/install_tests.sql +++ b/test/install_tests.sql @@ -13,6 +13,7 @@ alter session set plsql_optimize_level=0; @@helpers/other_dummy_object.tps @@helpers/test_dummy_object.tps @@helpers/test_dummy_object_list.tps +@@helpers/test_xmltype_list.tps --Install tests @@core.pks From 93e4ea8020a0b4c64d5f71fab850152dba196de0 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 29 Dec 2018 23:48:41 +0100 Subject: [PATCH 0188/1096] add xml_header attribute, used for each produced document --- source/reporters/ut_realtime_reporter.tps | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/source/reporters/ut_realtime_reporter.tps b/source/reporters/ut_realtime_reporter.tps index 685ece7e4..f4a5d799d 100644 --- a/source/reporters/ut_realtime_reporter.tps +++ b/source/reporters/ut_realtime_reporter.tps @@ -15,6 +15,11 @@ create or replace type ut_realtime_reporter force under ut_output_reporter_base( See the License for the specific language governing permissions and limitations under the License. */ + + /** + * Cached XML header to be used for every XML document + */ + xml_header varchar2(4000), /** * Total number of all tests in the run (incl. disabled tests). From 290ca30aed176c41946adf4d1e97b0795cfcc5ad Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 29 Dec 2018 23:50:37 +0100 Subject: [PATCH 0189/1096] replace hard-coded id attribute with name and value for an optional attribute --- source/reporters/ut_realtime_reporter.tps | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/source/reporters/ut_realtime_reporter.tps b/source/reporters/ut_realtime_reporter.tps index f4a5d799d..645351a17 100644 --- a/source/reporters/ut_realtime_reporter.tps +++ b/source/reporters/ut_realtime_reporter.tps @@ -103,12 +103,13 @@ create or replace type ut_realtime_reporter force under ut_output_reporter_base( overriding member function get_description return varchar2, /** - * Prints the start tag of a XML node with an optional id attribute. + * Prints the start tag of a XML node with an optional attribute. */ member procedure print_start_node( - self in out nocopy ut_realtime_reporter, - a_name in varchar2, - a_id in varchar2 default null + self in out nocopy ut_realtime_reporter, + a_node_name in varchar2, + a_attr_name in varchar2 default null, + a_attr_value in varchar2 default null ), /** From e570e48126d9d3f5d7b4fcc83fbabca57ea42eaa Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 29 Dec 2018 23:52:41 +0100 Subject: [PATCH 0190/1096] produce an XML document for each event resulting in a new output structure --- source/reporters/ut_realtime_reporter.tpb | 63 ++++++++++++++--------- 1 file changed, 38 insertions(+), 25 deletions(-) diff --git a/source/reporters/ut_realtime_reporter.tpb b/source/reporters/ut_realtime_reporter.tpb index c6568cd04..0e0b212fc 100644 --- a/source/reporters/ut_realtime_reporter.tpb +++ b/source/reporters/ut_realtime_reporter.tpb @@ -37,7 +37,7 @@ create or replace type body ut_realtime_reporter is ) is begin total_number_of_tests := total_number_of_tests + 1; - self.print_start_node('test', a_test.path); + self.print_start_node('test', 'id', a_test.path); self.print_node('executableType', a_test.item.executable_type); self.print_node('ownerName', a_test.item.owner_name); self.print_node('objectName', a_test.item.object_name); @@ -53,7 +53,7 @@ create or replace type body ut_realtime_reporter is a_suite in ut_logical_suite ) is begin - self.print_start_node('suite', a_suite.path); + self.print_start_node('suite', 'id', a_suite.path); self.print_node('name', a_suite.name); self.print_node('description', a_suite.description); <> @@ -67,9 +67,9 @@ create or replace type body ut_realtime_reporter is self.print_end_node('suite'); end print_suite_elements; begin - self.print_xml_fragment(ut_utils.get_xml_header(a_run.client_character_set)); - self.print_start_node('report'); - self.print_start_node('preRun'); + xml_header := ut_utils.get_xml_header(a_run.client_character_set); + self.print_xml_fragment(xml_header); + self.print_start_node('event', 'type', 'pre-run'); self.print_start_node('suites'); <> for i in 1 .. a_run.items.count loop @@ -77,8 +77,7 @@ create or replace type body ut_realtime_reporter is end loop items; self.print_end_node('suites'); self.print_node('totalNumberOfTests', to_char(total_number_of_tests)); - self.print_end_node('preRun'); - self.print_start_node('runEvents'); + self.print_end_node('event'); self.flush_print_buffer(); end before_calling_run; @@ -87,8 +86,9 @@ create or replace type body ut_realtime_reporter is a_run in ut_run ) is begin - self.print_end_node('runEvents'); - self.print_end_node('report'); + self.print_xml_fragment(xml_header); + self.print_start_node('event', 'type', 'post-run'); + self.print_end_node('event'); self.flush_print_buffer(); end after_calling_run; @@ -97,8 +97,11 @@ create or replace type body ut_realtime_reporter is a_suite in ut_logical_suite ) is begin - self.print_start_node('startSuiteEvent', a_suite.path); - self.print_end_node('startSuiteEvent'); + self.print_xml_fragment(xml_header); + self.print_start_node('event', 'type', 'pre-suite'); + self.print_start_node('suite', 'id', a_suite.path); + self.print_end_node('suite'); + self.print_end_node('event'); self.flush_print_buffer(); end before_calling_suite; @@ -107,7 +110,9 @@ create or replace type body ut_realtime_reporter is a_suite in ut_logical_suite ) is begin - self.print_start_node('endSuiteEvent', a_suite.path); + self.print_xml_fragment(xml_header); + self.print_start_node('event', 'type', 'post-suite'); + self.print_start_node('suite', 'id', a_suite.path); self.print_node('startTime', to_char(a_suite.start_time, 'YYYY-MM-DD"T"HH24:MI:SS.FF6')); self.print_node('endTime', to_char(a_suite.end_time, 'YYYY-MM-DD"T"HH24:MI:SS.FF6')); self.print_node('executionTime', ut_utils.to_xml_number_format(a_suite.execution_time())); @@ -120,7 +125,8 @@ create or replace type body ut_realtime_reporter is self.print_end_node('counter'); self.print_cdata_node('errorStack', ut_utils.table_to_clob(a_suite.get_error_stack_traces())); self.print_cdata_node('serverOutput', a_suite.get_serveroutputs()); - self.print_end_node('endSuiteEvent'); + self.print_end_node('suite'); + self.print_end_node('event'); self.flush_print_buffer(); end after_calling_suite; @@ -130,10 +136,13 @@ create or replace type body ut_realtime_reporter is ) is begin current_test_number := current_test_number + 1; - self.print_start_node('startTestEvent', a_test.path); + self.print_xml_fragment(xml_header); + self.print_start_node('event', 'type', 'pre-test'); + self.print_start_node('test', 'id', a_test.path); self.print_node('testNumber', to_char(current_test_number)); self.print_node('totalNumberOfTests', to_char(total_number_of_tests)); - self.print_end_node('startTestEvent'); + self.print_end_node('test'); + self.print_end_node('event'); self.flush_print_buffer(); end before_calling_test; @@ -142,7 +151,9 @@ create or replace type body ut_realtime_reporter is a_test in ut_test ) is begin - self.print_start_node('endTestEvent', a_test.path); + self.print_xml_fragment(xml_header); + self.print_start_node('event', 'type', 'post-test'); + self.print_start_node('test', 'id', a_test.path); self.print_node('testNumber', to_char(current_test_number)); self.print_node('totalNumberOfTests', to_char(total_number_of_tests)); self.print_node('startTime', to_char(a_test.start_time, 'YYYY-MM-DD"T"HH24:MI:SS.FF6')); @@ -169,7 +180,8 @@ create or replace type body ut_realtime_reporter is end loop expectations; self.print_end_node('failedExpectations'); end if; - self.print_end_node('endTestEvent'); + self.print_end_node('test'); + self.print_end_node('event'); self.flush_print_buffer(); end after_calling_test; @@ -179,16 +191,17 @@ create or replace type body ut_realtime_reporter is end get_description; member procedure print_start_node( - self in out nocopy ut_realtime_reporter, - a_name in varchar2, - a_id in varchar2 default null + self in out nocopy ut_realtime_reporter, + a_node_name in varchar2, + a_attr_name in varchar2 default null, + a_attr_value in varchar2 default null ) is begin self.print_xml_fragment( - '<' || a_name + '<' || a_node_name || case - when a_id is not null then - ' id="' || dbms_xmlgen.convert(a_id) || '"' + when a_attr_name is not null and a_attr_value is not null then + ' ' || a_attr_name || '="' || dbms_xmlgen.convert(a_attr_value) || '"' end || '>', 0, 1 @@ -201,9 +214,9 @@ create or replace type body ut_realtime_reporter is ) is begin self.print_xml_fragment('', -1); - if a_name like '%Event' then + if a_name = 'event' then -- force new line to make complete event a.s.a.p. visible in consuming session - self.print_xml_fragment(null); + self.print_xml_fragment(' '); end if; end print_end_node; From 17ed19824f6159731fa466673db7205fbcfa25bf Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 29 Dec 2018 23:53:10 +0100 Subject: [PATCH 0191/1096] changed name and description to match new output structure --- test/core/reporters/test_realtime_reporter.pks | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/core/reporters/test_realtime_reporter.pks b/test/core/reporters/test_realtime_reporter.pks index fa5bbd3ac..7b5862b15 100644 --- a/test/core/reporters/test_realtime_reporter.pks +++ b/test/core/reporters/test_realtime_reporter.pks @@ -15,11 +15,11 @@ create or replace package test_realtime_reporter as --%test(Escape special characters in data such as the test suite description) procedure escaped_characters; - --%test(Provide a startTestEvent node before starting a test with testNumber and totalNumberOfTests) - procedure number_of_starttestevent_nodes; + --%test(Provide a node before starting a test with testNumber and totalNumberOfTests) + procedure pre_test_nodes; - --%test(Provide a endTestEvent node after completion of a test with test results) - procedure endtestevent_nodes; + --%test(Provide a node after completion of a test with test results) + procedure post_test_nodes; --%test(Provide expectation message for a failed test) procedure single_failed_message; From eef59388f36bea4d963967d039db29222547e64b Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 29 Dec 2018 23:54:50 +0100 Subject: [PATCH 0192/1096] test 26 event-based XML documents produced by the revised reporter --- .../core/reporters/test_realtime_reporter.pkb | 240 +++++++++++------- 1 file changed, 143 insertions(+), 97 deletions(-) diff --git a/test/core/reporters/test_realtime_reporter.pkb b/test/core/reporters/test_realtime_reporter.pkb index 2eb7b2c21..bd1df040a 100644 --- a/test/core/reporters/test_realtime_reporter.pkb +++ b/test/core/reporters/test_realtime_reporter.pkb @@ -1,6 +1,6 @@ create or replace package body test_realtime_reporter as - g_actual_xml_report xmltype; + g_xml_reports test_xmltype_list := test_xmltype_list(); procedure create_test_suites_and_run is pragma autonomous_transaction; @@ -101,118 +101,157 @@ create or replace package body test_realtime_reporter as end;]'; <> - declare - l_results ut3.ut_varchar2_list; + declare + l_clob clob; begin - select * - bulk collect into l_results - from table(ut3.ut.run('ut3_tester:realtime_reporting', ut3.ut_realtime_reporter())); - g_actual_xml_report := xmltype(ut3.ut_utils.table_to_clob(l_results)); + g_xml_reports.delete; + <> + for r in ( + with + base as ( + select sum(case when column_value like ''); - ut3.ut_utils.append_to_list(l_expected_list, '%'); - ut3.ut_utils.append_to_list(l_expected_list, '% '); - ut3.ut_utils.append_to_list(l_expected_list, '% '); - ut3.ut_utils.append_to_list(l_expected_list, '% '); - ut3.ut_utils.append_to_list(l_expected_list, '% %'); - ut3.ut_utils.append_to_list(l_expected_list, '% %'); - ut3.ut_utils.append_to_list(l_expected_list, '% '); - ut3.ut_utils.append_to_list(l_expected_list, '% '); - ut3.ut_utils.append_to_list(l_expected_list, '% %'); - ut3.ut_utils.append_to_list(l_expected_list, '% '); - ut3.ut_utils.append_to_list(l_expected_list, '% '); - ut3.ut_utils.append_to_list(l_expected_list, '% '); - ut3.ut_utils.append_to_list(l_expected_list, '% '); - ut3.ut_utils.append_to_list(l_expected_list, '% '); - ut3.ut_utils.append_to_list(l_expected_list, '% '); - ut3.ut_utils.append_to_list(l_expected_list, '% '); - ut3.ut_utils.append_to_list(l_expected_list, '% '); - ut3.ut_utils.append_to_list(l_expected_list, '% '); - ut3.ut_utils.append_to_list(l_expected_list, '% '); - ut3.ut_utils.append_to_list(l_expected_list, '% '); - ut3.ut_utils.append_to_list(l_expected_list, '%'); - l_expected := ut3.ut_utils.table_to_clob(l_expected_list, null); - ut.expect(l_actual).to_be_like(l_expected); + open l_actual for + select t.column_value.extract('/event/@type').getstringval() as event_type, + t.column_value.extract('/event/suite/@id|/event/test/@id').getstringval() as item_id + from table(g_xml_reports) t; + open l_expected for + select 'pre-run' as event_type, null as item_id from dual union all + select 'pre-suite' as event_type, 'realtime_reporting' as item_id from dual union all + select 'pre-suite' as event_type, 'realtime_reporting.check_realtime_reporting3' as item_id from dual union all + select 'pre-test' as event_type, 'realtime_reporting.check_realtime_reporting3.test_6_with_runtime_error' as item_id from dual union all + select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting3.test_6_with_runtime_error' as item_id from dual union all + select 'pre-test' as event_type, 'realtime_reporting.check_realtime_reporting3.test_7_with_serveroutput' as item_id from dual union all + select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting3.test_7_with_serveroutput' as item_id from dual union all + select 'post-suite' as event_type, 'realtime_reporting.check_realtime_reporting3' as item_id from dual union all + select 'pre-suite' as event_type, 'realtime_reporting.check_realtime_reporting2' as item_id from dual union all + select 'pre-test' as event_type, 'realtime_reporting.check_realtime_reporting2.test_3_ok' as item_id from dual union all + select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting2.test_3_ok' as item_id from dual union all + select 'pre-test' as event_type, 'realtime_reporting.check_realtime_reporting2.test_4_nok' as item_id from dual union all + select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting2.test_4_nok' as item_id from dual union all + select 'pre-test' as event_type, 'realtime_reporting.check_realtime_reporting2.test_5' as item_id from dual union all + select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting2.test_5' as item_id from dual union all + select 'post-suite' as event_type, 'realtime_reporting.check_realtime_reporting2' as item_id from dual union all + select 'pre-suite' as event_type, 'realtime_reporting.check_realtime_reporting1' as item_id from dual union all + select 'pre-suite' as event_type, 'realtime_reporting.check_realtime_reporting1.test context' as item_id from dual union all + select 'pre-test' as event_type, 'realtime_reporting.check_realtime_reporting1.test context.test_1_ok' as item_id from dual union all + select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting1.test context.test_1_ok' as item_id from dual union all + select 'pre-test' as event_type, 'realtime_reporting.check_realtime_reporting1.test context.test_2_nok' as item_id from dual union all + select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting1.test context.test_2_nok' as item_id from dual union all + select 'post-suite' as event_type, 'realtime_reporting.check_realtime_reporting1.test context' as item_id from dual union all + select 'post-suite' as event_type, 'realtime_reporting.check_realtime_reporting1' as item_id from dual union all + select 'post-suite' as event_type, 'realtime_reporting' as item_id from dual union all + select 'post-run' as event_type, null as item_id from dual; + ut.expect(l_actual).to_equal(l_expected); end xml_report_structure; procedure total_number_of_tests is l_actual integer; l_expected integer := 7; begin - l_actual := g_actual_xml_report.extract('/report/preRun/totalNumberOfTests/text()').getnumberval(); - ut.expect(l_actual).to_equal(l_expected); + select t.column_value.extract('/event/totalNumberOfTests/text()').getnumberval() + into l_actual + from table(g_xml_reports) t + where t.column_value.extract('/event/@type').getstringval() = 'pre-run'; end total_number_of_tests; procedure escaped_characters is l_actual varchar2(32767); l_expected varchar2(20) := 'suite <A>'; begin - l_actual := - g_actual_xml_report.extract( - '//suite[@id="realtime_reporting.check_realtime_reporting1"]/description/text()' - ).getstringval(); + select t.column_value.extract( + '//suite[@id="realtime_reporting.check_realtime_reporting1"]/description/text()' + ).getstringval() + into l_actual + from table(g_xml_reports) t + where t.column_value.extract('/event/@type').getstringval() = 'pre-run'; ut.expect(l_actual).to_equal(l_expected); end escaped_characters; - procedure number_of_starttestevent_nodes is - l_actual integer; - l_expected integer := 7; + procedure pre_test_nodes is + l_actual sys_refcursor; + l_expected sys_refcursor; begin - select count(*) - into l_actual - from xmltable( - '/report/runEvents/startTestEvent' - passing g_actual_xml_report - columns id varchar2(4000) path '@id', - test_number integer path 'testNumber', - total_number_of_tests integer path 'totalNumberOfTests' - ) - where id is not null - and test_number is not null - and total_number_of_tests is not null; - ut.expect(l_actual).to_equal(l_expected); - end number_of_starttestevent_nodes; + open l_actual for + select t.column_value.extract('//test/testNumber/text()') + .getnumberval() as test_number, + t.column_value.extract('//test/totalNumberOfTests/text()') + .getnumberval() as total_number_of_tests + from table(g_xml_reports) t + where t.column_value.extract('/event/@type').getstringval() = 'pre-test' + and t.column_value.extract('//test/@id').getstringval() is not null; + open l_expected for + select level as test_number, + 7 as total_number_of_tests + from dual + connect by level <= 7; + ut.expect(l_actual).to_equal(l_expected).unordered; + end pre_test_nodes; - procedure endtestevent_nodes is + procedure post_test_nodes is l_actual sys_refcursor; l_expected sys_refcursor; begin open l_actual for - select test_number, total_number_of_tests - from xmltable( - '/report/runEvents/endTestEvent' - passing g_actual_xml_report - columns id varchar2(4000) path '@id', - test_number integer path 'testNumber', - total_number_of_tests integer path 'totalNumberOfTests' - ) - where id is not null - and test_number is not null - and total_number_of_tests is not null; + select t.column_value.extract('//test/testNumber/text()') + .getnumberval() as test_number, + t.column_value.extract('//test/totalNumberOfTests/text()') + .getnumberval() as total_number_of_tests + from table(g_xml_reports) t + where t.column_value.extract('/event/@type').getstringval() = 'post-test' + and t.column_value.extract('//test/@id').getstringval() is not null + and t.column_value.extract('//test/startTime/text()').getstringval() is not null + and t.column_value.extract('//test/endTime/text()').getstringval() is not null + and t.column_value.extract('//test/executionTime/text()').getnumberval() is not null + and t.column_value.extract('//test/counter/disabled/text()').getnumberval() is not null + and t.column_value.extract('//test/counter/success/text()').getnumberval() is not null + and t.column_value.extract('//test/counter/failure/text()').getnumberval() is not null + and t.column_value.extract('//test/counter/error/text()').getnumberval() is not null + and t.column_value.extract('//test/counter/warning/text()').getnumberval() is not null; open l_expected for select level as test_number, 7 as total_number_of_tests from dual connect by level <= 7; ut.expect(l_actual).to_equal(l_expected).unordered; - end endtestevent_nodes; + end post_test_nodes; procedure single_failed_message is l_actual varchar2(32767); l_expected varchar2(80) := ''; begin - l_actual := - g_actual_xml_report.extract( - '/report/runEvents/endTestEvent[@id="realtime_reporting.check_realtime_reporting1.test context.test_2_nok"]/failedExpectations/expectation[1]/message/text()' - ).getstringval(); + select t.column_value.extract( + '/event/test/failedExpectations/expectation[1]/message/text()' + ).getstringval() + into l_actual + from table(g_xml_reports) t + where t.column_value.extract('/event[@type="post-test"]/test/@id').getstringval() + = 'realtime_reporting.check_realtime_reporting1.test context.test_2_nok'; ut.expect(l_actual).to_equal(l_expected); end single_failed_message; @@ -222,14 +261,17 @@ create or replace package body test_realtime_reporter as begin select count(*) into l_actual - from xmltable( - '/report/runEvents/endTestEvent[@id="realtime_reporting.check_realtime_reporting2.test_4_nok"]/failedExpectations/expectation' - passing g_actual_xml_report + from table(g_xml_reports) t, + xmltable( + '/event/test/failedExpectations/expectation' + passing t.column_value columns message clob path 'message', caller clob path 'caller' - ) - where message is not null - and caller is not null; + ) x + where t.column_value.extract('/event[@type="post-test"]/test/@id').getstringval() + = 'realtime_reporting.check_realtime_reporting2.test_4_nok' + and x.message is not null + and x.caller is not null; ut.expect(l_actual).to_equal(l_expected); end multiple_failed_messages; @@ -238,10 +280,11 @@ create or replace package body test_realtime_reporter as l_expected_list ut3.ut_varchar2_list; l_expected clob; begin - l_actual := - g_actual_xml_report.extract( - '/report/runEvents/endTestEvent[@id="realtime_reporting.check_realtime_reporting3.test_7_with_serveroutput"]/serverOutput/text()' - ).getclobval(); + select t.column_value.extract('//event/test/serverOutput/text()').getstringval() + into l_actual + from table(g_xml_reports) t + where t.column_value.extract('/event[@type="post-test"]/test/@id').getstringval() + = 'realtime_reporting.check_realtime_reporting3.test_7_with_serveroutput'; ut3.ut_utils.append_to_list(l_expected_list, ''); @@ -254,10 +297,11 @@ create or replace package body test_realtime_reporter as l_expected_list ut3.ut_varchar2_list; l_expected clob; begin - l_actual := - g_actual_xml_report.extract( - '/report/runEvents/endSuiteEvent[@id="realtime_reporting.check_realtime_reporting3"]/serverOutput/text()' - ).getclobval(); + select t.column_value.extract('//event/suite/serverOutput/text()').getstringval() + into l_actual + from table(g_xml_reports) t + where t.column_value.extract('/event[@type="post-suite"]/suite/@id').getstringval() + = 'realtime_reporting.check_realtime_reporting3'; ut3.ut_utils.append_to_list(l_expected_list, ''); @@ -287,10 +332,11 @@ create or replace package body test_realtime_reporter as l_expected_list ut3.ut_varchar2_list; l_expected clob; begin - l_actual := - g_actual_xml_report.extract( - '/report/runEvents/endSuiteEvent[@id="realtime_reporting.check_realtime_reporting3"]/errorStack/text()' - ).getclobval(); + select t.column_value.extract('//event/suite/errorStack/text()').getstringval() + into l_actual + from table(g_xml_reports) t + where t.column_value.extract('/event[@type="post-suite"]/suite/@id').getstringval() + = 'realtime_reporting.check_realtime_reporting3'; ut3.ut_utils.append_to_list(l_expected_list, ''); From eba2e9eee2801476dbd421a6a1423c644356aefc Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sun, 30 Dec 2018 11:10:18 +0100 Subject: [PATCH 0193/1096] change comment to reflect new role of the member procedure --- source/reporters/ut_realtime_reporter.tps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/reporters/ut_realtime_reporter.tps b/source/reporters/ut_realtime_reporter.tps index 645351a17..5d8b315ec 100644 --- a/source/reporters/ut_realtime_reporter.tps +++ b/source/reporters/ut_realtime_reporter.tps @@ -58,7 +58,7 @@ create or replace type ut_realtime_reporter force under ut_output_reporter_base( ), /** - * Provides closing tags. + * Indicates the end of the test run. */ overriding member procedure after_calling_run( self in out nocopy ut_realtime_reporter, From 8f5b73678a2821344f88c97f4e5538f17a30f0cf Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 30 Dec 2018 20:45:01 +0000 Subject: [PATCH 0194/1096] Added `item_type` attribute to output buffer. Converted `text` in output bugger to be CLOB. Refactored `ut.run` to continue providing output as text. --- source/api/ut.pkb | 114 +++++++++++------- .../output_buffers/ut_output_buffer_base.tps | 7 +- .../output_buffers/ut_output_buffer_tmp.sql | 5 +- .../output_buffers/ut_output_data_row.tps | 21 ++++ .../output_buffers/ut_output_data_rows.tps | 19 +++ .../output_buffers/ut_output_table_buffer.tpb | 80 ++++++------ .../output_buffers/ut_output_table_buffer.tps | 7 +- source/core/types/ut_output_reporter_base.tpb | 14 +-- source/core/types/ut_output_reporter_base.tps | 2 +- .../create_synonyms_and_grants_for_public.sql | 4 + source/create_user_grants.sql | 2 + source/create_user_synonyms.sql | 2 + source/install.sql | 2 + .../reporters/ut_documentation_reporter.tpb | 15 +++ .../reporters/ut_documentation_reporter.tps | 1 + test/core/test_output_buffer.pkb | 41 ++++--- test/core/test_output_buffer.pks | 2 +- 17 files changed, 229 insertions(+), 109 deletions(-) create mode 100644 source/core/output_buffers/ut_output_data_row.tps create mode 100644 source/core/output_buffers/ut_output_data_rows.tps diff --git a/source/api/ut.pkb b/source/api/ut.pkb index bb599704e..daa0b6df5 100644 --- a/source/api/ut.pkb +++ b/source/api/ut.pkb @@ -175,8 +175,10 @@ create or replace package body ut is a_client_character_set varchar2 := null ) return ut_varchar2_rows pipelined is l_reporter ut_reporter_base := a_reporter; - l_lines sys_refcursor; - l_line varchar2(4000); + l_data sys_refcursor; + l_clob clob; + l_item_type varchar2(32767); + l_lines ut_varchar2_list; begin run_autonomous( ut_varchar2_list(), @@ -190,13 +192,16 @@ create or replace package body ut is a_client_character_set ); if l_reporter is of (ut_output_reporter_base) then - l_lines := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); + l_data := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); loop - fetch l_lines into l_line; - exit when l_lines%notfound; - pipe row(l_line); + fetch l_data into l_clob, l_item_type; + exit when l_data%notfound; + l_lines := ut_utils.clob_to_table(l_clob, ut_utils.gc_max_storage_varchar2_len); + for i in 1 .. l_lines.count loop + pipe row(l_lines(i)); + end loop; end loop; - close l_lines; + close l_data; end if; raise_if_packages_invalidated(); return; @@ -213,8 +218,10 @@ create or replace package body ut is a_client_character_set varchar2 := null ) return ut_varchar2_rows pipelined is l_reporter ut_reporter_base := a_reporter; - l_lines sys_refcursor; - l_line varchar2(4000); + l_data sys_refcursor; + l_clob clob; + l_item_type varchar2(32767); + l_lines ut_varchar2_list; begin run_autonomous( ut_varchar2_list(), @@ -228,13 +235,16 @@ create or replace package body ut is a_client_character_set ); if l_reporter is of (ut_output_reporter_base) then - l_lines := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); + l_data := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); loop - fetch l_lines into l_line; - exit when l_lines%notfound; - pipe row(l_line); + fetch l_data into l_clob, l_item_type; + exit when l_data%notfound; + l_lines := ut_utils.clob_to_table(l_clob, ut_utils.gc_max_storage_varchar2_len); + for i in 1 .. l_lines.count loop + pipe row(l_lines(i)); + end loop; end loop; - close l_lines; + close l_data; end if; raise_if_packages_invalidated(); return; @@ -252,8 +262,10 @@ create or replace package body ut is a_client_character_set varchar2 := null ) return ut_varchar2_rows pipelined is l_reporter ut_reporter_base := a_reporter; - l_lines sys_refcursor; - l_line varchar2(4000); + l_data sys_refcursor; + l_clob clob; + l_item_type varchar2(32767); + l_lines ut_varchar2_list; begin run_autonomous( a_paths, @@ -267,13 +279,16 @@ create or replace package body ut is a_client_character_set ); if l_reporter is of (ut_output_reporter_base) then - l_lines := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); + l_data := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); loop - fetch l_lines into l_line; - exit when l_lines%notfound; - pipe row(l_line); + fetch l_data into l_clob, l_item_type; + exit when l_data%notfound; + l_lines := ut_utils.clob_to_table(l_clob, ut_utils.gc_max_storage_varchar2_len); + for i in 1 .. l_lines.count loop + pipe row(l_lines(i)); + end loop; end loop; - close l_lines; + close l_data; end if; raise_if_packages_invalidated(); return; @@ -291,8 +306,10 @@ create or replace package body ut is a_client_character_set varchar2 := null ) return ut_varchar2_rows pipelined is l_reporter ut_reporter_base := a_reporter; - l_lines sys_refcursor; - l_line varchar2(4000); + l_data sys_refcursor; + l_clob clob; + l_item_type varchar2(32767); + l_lines ut_varchar2_list; begin run_autonomous( a_paths, @@ -306,13 +323,16 @@ create or replace package body ut is a_client_character_set ); if l_reporter is of (ut_output_reporter_base) then - l_lines := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); + l_data := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); loop - fetch l_lines into l_line; - exit when l_lines%notfound; - pipe row(l_line); + fetch l_data into l_clob, l_item_type; + exit when l_data%notfound; + l_lines := ut_utils.clob_to_table(l_clob, ut_utils.gc_max_storage_varchar2_len); + for i in 1 .. l_lines.count loop + pipe row(l_lines(i)); + end loop; end loop; - close l_lines; + close l_data; end if; raise_if_packages_invalidated(); return; @@ -330,8 +350,10 @@ create or replace package body ut is a_client_character_set varchar2 := null ) return ut_varchar2_rows pipelined is l_reporter ut_reporter_base := a_reporter; - l_lines sys_refcursor; - l_line varchar2(4000); + l_data sys_refcursor; + l_clob clob; + l_item_type varchar2(32767); + l_lines ut_varchar2_list; begin run_autonomous( ut_varchar2_list(a_path), @@ -345,13 +367,16 @@ create or replace package body ut is a_client_character_set ); if l_reporter is of (ut_output_reporter_base) then - l_lines := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); + l_data := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); loop - fetch l_lines into l_line; - exit when l_lines%notfound; - pipe row(l_line); + fetch l_data into l_clob, l_item_type; + exit when l_data%notfound; + l_lines := ut_utils.clob_to_table(l_clob, ut_utils.gc_max_storage_varchar2_len); + for i in 1 .. l_lines.count loop + pipe row(l_lines(i)); + end loop; end loop; - close l_lines; + close l_data; end if; raise_if_packages_invalidated(); return; @@ -369,8 +394,10 @@ create or replace package body ut is a_client_character_set varchar2 := null ) return ut_varchar2_rows pipelined is l_reporter ut_reporter_base := a_reporter; - l_lines sys_refcursor; - l_line varchar2(4000); + l_data sys_refcursor; + l_clob clob; + l_item_type varchar2(32767); + l_lines ut_varchar2_list; begin run_autonomous( ut_varchar2_list(a_path), @@ -384,13 +411,16 @@ create or replace package body ut is a_client_character_set ); if l_reporter is of (ut_output_reporter_base) then - l_lines := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); + l_data := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); loop - fetch l_lines into l_line; - exit when l_lines%notfound; - pipe row(l_line); + fetch l_data into l_clob, l_item_type; + exit when l_data%notfound; + l_lines := ut_utils.clob_to_table(l_clob, ut_utils.gc_max_storage_varchar2_len); + for i in 1 .. l_lines.count loop + pipe row(l_lines(i)); + end loop; end loop; - close l_lines; + close l_data; end if; raise_if_packages_invalidated(); return; diff --git a/source/core/output_buffers/ut_output_buffer_base.tps b/source/core/output_buffers/ut_output_buffer_base.tps index 6f69047d9..42c4a0d72 100644 --- a/source/core/output_buffers/ut_output_buffer_base.tps +++ b/source/core/output_buffers/ut_output_buffer_base.tps @@ -19,9 +19,10 @@ create or replace type ut_output_buffer_base authid definer as object( output_id raw(32), member procedure init(self in out nocopy ut_output_buffer_base), not instantiable member procedure close(self in ut_output_buffer_base), - not instantiable member procedure send_line(self in ut_output_buffer_base, a_text varchar2), - not instantiable member procedure send_lines(self in ut_output_buffer_base, a_text_list ut_varchar2_rows), - not instantiable member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_varchar2_rows pipelined, + not instantiable member procedure send_line(self in ut_output_buffer_base, a_text varchar2, a_item_type varchar2 := null), + not instantiable member procedure send_lines(self in ut_output_buffer_base, a_text_list ut_varchar2_rows, a_item_type varchar2 := null), + not instantiable member procedure send_clob(self in ut_output_buffer_base, a_text clob, a_item_type varchar2 := null), + not instantiable member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined, not instantiable member function get_lines_cursor(a_initial_timeout natural := null, a_timeout_sec natural := null) return sys_refcursor, not instantiable member procedure lines_to_dbms_output(self in ut_output_buffer_base, a_initial_timeout natural := null, a_timeout_sec natural := null) ) not final not instantiable diff --git a/source/core/output_buffers/ut_output_buffer_tmp.sql b/source/core/output_buffers/ut_output_buffer_tmp.sql index e8127e237..71f8d8178 100644 --- a/source/core/output_buffers/ut_output_buffer_tmp.sql +++ b/source/core/output_buffers/ut_output_buffer_tmp.sql @@ -19,12 +19,14 @@ create table ut_output_buffer_tmp$( */ output_id raw(32) not null, message_id number(38,0) not null, - text varchar2(4000), + text clob, + item_type varchar2(1000), is_finished number(1,0) default 0 not null, constraint ut_output_buffer_tmp_pk primary key(output_id, message_id), constraint ut_output_buffer_tmp_ck check(is_finished = 0 and text is not null or is_finished = 1 and text is null), constraint ut_output_buffer_fk1 foreign key (output_id) references ut_output_buffer_info_tmp$(output_id) ) organization index overflow nologging initrans 100 + lob(text) store as securefile ut_output_text(retention none) ; -- This is needed to be EBR ready as editioning view can only be created by edition enabled user @@ -58,6 +60,7 @@ limitations under the License. select output_id ,message_id ,text + ,item_type ,is_finished from ut_output_buffer_tmp$'; diff --git a/source/core/output_buffers/ut_output_data_row.tps b/source/core/output_buffers/ut_output_data_row.tps new file mode 100644 index 000000000..ddcb65710 --- /dev/null +++ b/source/core/output_buffers/ut_output_data_row.tps @@ -0,0 +1,21 @@ +create or replace type ut_output_data_row as object ( + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + text clob, + item_type varchar2(1000) +) +/ diff --git a/source/core/output_buffers/ut_output_data_rows.tps b/source/core/output_buffers/ut_output_data_rows.tps new file mode 100644 index 000000000..9575231ba --- /dev/null +++ b/source/core/output_buffers/ut_output_data_rows.tps @@ -0,0 +1,19 @@ +create or replace type ut_output_data_rows as + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + table of ut_output_data_row +/ diff --git a/source/core/output_buffers/ut_output_table_buffer.tpb b/source/core/output_buffers/ut_output_table_buffer.tpb index e7045b9df..54adb0f97 100644 --- a/source/core/output_buffers/ut_output_table_buffer.tpb +++ b/source/core/output_buffers/ut_output_table_buffer.tpb @@ -46,38 +46,40 @@ create or replace type body ut_output_table_buffer is commit; end; - overriding member procedure send_line(self in ut_output_table_buffer, a_text varchar2) is + overriding member procedure send_line(self in ut_output_table_buffer, a_text varchar2, a_item_type varchar2 := null) is pragma autonomous_transaction; begin if a_text is not null then - if length(a_text) > ut_utils.gc_max_storage_varchar2_len then - self.send_lines( - ut_utils.convert_collection( - ut_utils.clob_to_table(a_text, ut_utils.gc_max_storage_varchar2_len) - ) - ); - else - insert into ut_output_buffer_tmp(output_id, message_id, text) - values (self.output_id, ut_message_id_seq.nextval, a_text); - end if; - commit; + insert into ut_output_buffer_tmp(output_id, message_id, text, item_type) + values (self.output_id, ut_message_id_seq.nextval, a_text, a_item_type); end if; + commit; end; - overriding member procedure send_lines(self in ut_output_table_buffer, a_text_list ut_varchar2_rows) is + overriding member procedure send_lines(self in ut_output_table_buffer, a_text_list ut_varchar2_rows, a_item_type varchar2 := null) is pragma autonomous_transaction; begin - insert into ut_output_buffer_tmp(output_id, message_id, text) - select self.output_id, ut_message_id_seq.nextval, t.column_value + insert into ut_output_buffer_tmp(output_id, message_id, text, item_type) + select self.output_id, ut_message_id_seq.nextval, t.column_value, a_item_type from table(a_text_list) t where t.column_value is not null; commit; end; + overriding member procedure send_clob(self in ut_output_table_buffer, a_text clob, a_item_type varchar2 := null) is + pragma autonomous_transaction; + begin + if a_text is not null and a_text != empty_clob() then + insert into ut_output_buffer_tmp(output_id, message_id, text, item_type) + values (self.output_id, ut_message_id_seq.nextval, a_text, a_item_type); + end if; + commit; + end; - overriding member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_varchar2_rows pipelined is - l_buffer_data ut_varchar2_rows; + overriding member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined is + l_buffer_data ut_output_data_rows; + l_message_ids ut_integer_list; l_already_waited_for number(10,2) := 0; l_finished boolean := false; lc_init_wait_sec constant naturaln := coalesce(a_initial_timeout, 60 * 60 * 4 ); -- 4 hours @@ -87,22 +89,24 @@ create or replace type body ut_output_table_buffer is lc_long_sleep_time constant number(1) := 1; --sleep for 1 s when waiting long lc_long_wait_time constant number(1) := 1; --waiting more than 1 sec l_sleep_time number(2,1) := lc_short_sleep_time; - function get_data_from_buffer return ut_varchar2_rows is - l_results ut_varchar2_rows; + + procedure remove_read_data(a_message_ids ut_integer_list) is pragma autonomous_transaction; begin - delete from ( - select * - from ut_output_buffer_tmp where output_id = self.output_id order by message_id - ) - returning text bulk collect into l_results; + delete from ut_output_buffer_tmp a + where a.output_id = self.output_id + and a.message_id in (select column_value from table(a_message_ids)); commit; - return l_results; end; begin loop - l_buffer_data := get_data_from_buffer(); + select a.message_id, ut_output_data_row(a.text, a.item_type) + bulk collect into l_message_ids, l_buffer_data + from ut_output_buffer_tmp a + where a.output_id = self.output_id + order by a.message_id; + --nothing fetched from output, wait and try again if l_buffer_data.count = 0 then dbms_lock.sleep(l_sleep_time); @@ -117,7 +121,7 @@ create or replace type body ut_output_table_buffer is l_already_waited_for := 0; l_sleep_time := lc_short_sleep_time; for i in 1 .. l_buffer_data.count loop - if l_buffer_data(i) is not null then + if l_buffer_data(i).text is not null then pipe row(l_buffer_data(i)); else l_finished := true; @@ -125,6 +129,7 @@ create or replace type body ut_output_table_buffer is end if; end loop; end if; + remove_read_data(l_message_ids); exit when l_already_waited_for >= l_wait_for or l_finished; end loop; return; @@ -134,22 +139,27 @@ create or replace type body ut_output_table_buffer is l_lines sys_refcursor; begin open l_lines for - select column_value as text + select text, item_type from table(self.get_lines(a_initial_timeout, a_timeout_sec)); return l_lines; end; overriding member procedure lines_to_dbms_output(self in ut_output_table_buffer, a_initial_timeout natural := null, a_timeout_sec natural := null) is - l_lines sys_refcursor; - l_line varchar2(32767); + l_data sys_refcursor; + l_clob clob; + l_item_type varchar2(32767); + l_lines ut_varchar2_list; begin - l_lines := self.get_lines_cursor(a_initial_timeout, a_timeout_sec); + l_data := self.get_lines_cursor(a_initial_timeout, a_timeout_sec); loop - fetch l_lines into l_line; - exit when l_lines%notfound; - dbms_output.put_line(l_line); + fetch l_data into l_clob, l_item_type; + exit when l_data%notfound; + l_lines := ut_utils.clob_to_table(l_clob); + for i in 1 .. l_lines.count loop + dbms_output.put_line(l_lines(i)); + end loop; end loop; - close l_lines; + close l_data; end; member procedure cleanup_buffer(self in ut_output_table_buffer, a_retention_time_sec natural := null) is diff --git a/source/core/output_buffers/ut_output_table_buffer.tps b/source/core/output_buffers/ut_output_table_buffer.tps index 0e6f83770..1c9acbd1d 100644 --- a/source/core/output_buffers/ut_output_table_buffer.tps +++ b/source/core/output_buffers/ut_output_table_buffer.tps @@ -19,10 +19,11 @@ create or replace type ut_output_table_buffer under ut_output_buffer_base ( start_date date, constructor function ut_output_table_buffer(self in out nocopy ut_output_table_buffer, a_output_id raw := null) return self as result, overriding member procedure init(self in out nocopy ut_output_table_buffer), - overriding member procedure send_line(self in ut_output_table_buffer, a_text varchar2), - overriding member procedure send_lines(self in ut_output_table_buffer, a_text_list ut_varchar2_rows), + overriding member procedure send_line(self in ut_output_table_buffer, a_text varchar2, a_item_type varchar2 := null), + overriding member procedure send_lines(self in ut_output_table_buffer, a_text_list ut_varchar2_rows, a_item_type varchar2 := null), + overriding member procedure send_clob(self in ut_output_table_buffer, a_text clob, a_item_type varchar2 := null), overriding member procedure close(self in ut_output_table_buffer), - overriding member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_varchar2_rows pipelined, + overriding member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined, overriding member function get_lines_cursor(a_initial_timeout natural := null, a_timeout_sec natural := null) return sys_refcursor, overriding member procedure lines_to_dbms_output(self in ut_output_table_buffer, a_initial_timeout natural := null, a_timeout_sec natural := null), member procedure cleanup_buffer(self in ut_output_table_buffer, a_retention_time_sec natural := null) diff --git a/source/core/types/ut_output_reporter_base.tpb b/source/core/types/ut_output_reporter_base.tpb index 3f62d6546..1dae9180b 100644 --- a/source/core/types/ut_output_reporter_base.tpb +++ b/source/core/types/ut_output_reporter_base.tpb @@ -51,10 +51,10 @@ create or replace type body ut_output_reporter_base is self.output_buffer.send_lines(a_text_lines); end; - final member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural) return ut_varchar2_rows pipelined is + final member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural) return ut_output_data_rows pipelined is begin - for i in (select column_value from table(self.output_buffer.get_lines(a_initial_timeout, a_timeout_sec))) loop - pipe row (i.column_value); + for i in (select value(x) val from table(self.output_buffer.get_lines(a_initial_timeout, a_timeout_sec)) x ) loop + pipe row (i.val); end loop; end; @@ -69,13 +69,11 @@ create or replace type body ut_output_reporter_base is end; member procedure print_clob(self in out nocopy ut_output_reporter_base, a_clob clob) is - l_lines ut_varchar2_list; begin if a_clob is not null and dbms_lob.getlength(a_clob) > 0 then - l_lines := ut_utils.clob_to_table(a_clob); - for i in 1 .. l_lines.count loop - self.print_text(l_lines(i)); - end loop; + self.print_text_lines( + ut_utils.convert_collection( ut_utils.clob_to_table( a_clob, ut_utils.gc_max_storage_varchar2_len ) ) + ); end if; end; diff --git a/source/core/types/ut_output_reporter_base.tps b/source/core/types/ut_output_reporter_base.tps index e23ac9273..6d9844493 100644 --- a/source/core/types/ut_output_reporter_base.tps +++ b/source/core/types/ut_output_reporter_base.tps @@ -25,7 +25,7 @@ create or replace type ut_output_reporter_base under ut_reporter_base( member procedure print_text_lines(self in out nocopy ut_output_reporter_base, a_text_lines ut_varchar2_rows), member procedure print_clob(self in out nocopy ut_output_reporter_base, a_clob clob), - final member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_varchar2_rows pipelined, + final member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined, final member function get_lines_cursor(a_initial_timeout natural := null, a_timeout_sec natural := null) return sys_refcursor, final member procedure lines_to_dbms_output(self in ut_output_reporter_base, a_initial_timeout natural := null, a_timeout_sec natural := null), overriding final member procedure on_finalize(self in out nocopy ut_output_reporter_base, a_run in ut_run) diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index 5bacdb60c..6eaaa669c 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -64,6 +64,8 @@ grant execute on &&ut3_owner..ut_varchar2_rows to public; grant execute on &&ut3_owner..ut_integer_list to public; grant execute on &&ut3_owner..ut_reporter_base to public; grant execute on &&ut3_owner..ut_output_reporter_base to public; +grant execute on &&ut3_owner..ut_output_data_row to public; +grant execute on &&ut3_owner..ut_output_data_rows to public; grant execute on &&ut3_owner..ut_coverage_reporter_base to public; grant execute on &&ut3_owner..ut_console_reporter_base to public; grant execute on &&ut3_owner..ut_coverage to public; @@ -144,6 +146,8 @@ create public synonym ut_varchar2_rows for &&ut3_owner..ut_varchar2_rows; create public synonym ut_integer_list for &&ut3_owner..ut_integer_list; create public synonym ut_reporter_base for &&ut3_owner..ut_reporter_base; create public synonym ut_output_reporter_base for &&ut3_owner..ut_output_reporter_base; +create public synonym ut_output_data_row for &&ut3_owner..ut_output_data_row; +create public synonym ut_output_data_rows for &&ut3_owner..ut_output_data_rows; create public synonym ut_coverage for &&ut3_owner..ut_coverage; create public synonym ut_coverage_options for &&ut3_owner..ut_coverage_options; create public synonym ut_coverage_helper for &&ut3_owner..ut_coverage_helper; diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql index a8f3d5cb4..bf49e36f1 100644 --- a/source/create_user_grants.sql +++ b/source/create_user_grants.sql @@ -90,6 +90,8 @@ grant execute on &&ut3_owner..ut_coverage to &ut3_user; grant execute on &&ut3_owner..ut_coverage_options to &ut3_user; grant execute on &&ut3_owner..ut_coverage_helper to &ut3_user; grant execute on &&ut3_owner..ut_output_buffer_base to &ut3_user; +grant execute on &&ut3_owner..ut_output_data_row to &ut3_user; +grant execute on &&ut3_owner..ut_output_data_rows to &ut3_user; grant execute on &&ut3_owner..ut_output_table_buffer to &ut3_user; grant execute on &&ut3_owner..ut_file_mappings to &ut3_user; grant execute on &&ut3_owner..ut_file_mapping to &ut3_user; diff --git a/source/create_user_synonyms.sql b/source/create_user_synonyms.sql index 806f02e6e..97726b1bb 100644 --- a/source/create_user_synonyms.sql +++ b/source/create_user_synonyms.sql @@ -86,6 +86,8 @@ create or replace synonym &ut3_user..ut_varchar2_rows for &&ut3_owner..ut_varcha create or replace synonym &ut3_user..ut_integer_list for &&ut3_owner..ut_integer_list; create or replace synonym &ut3_user..ut_reporter_base for &&ut3_owner..ut_reporter_base; create or replace synonym &ut3_user..ut_output_reporter_base for &&ut3_owner..ut_output_reporter_base; +create or replace synonym &ut3_user..ut_output_data_row for &&ut3_owner..ut_output_data_row; +create or replace synonym &ut3_user..ut_output_data_rows for &&ut3_owner..ut_output_data_rows; create or replace synonym &ut3_user..ut_coverage for &&ut3_owner..ut_coverage; create or replace synonym &ut3_user..ut_coverage_options for &&ut3_owner..ut_coverage_options; create or replace synonym &ut3_user..ut_coverage_helper for &&ut3_owner..ut_coverage_helper; diff --git a/source/install.sql b/source/install.sql index a3a1dc715..e1478b536 100644 --- a/source/install.sql +++ b/source/install.sql @@ -80,6 +80,8 @@ alter session set current_schema = &&ut3_owner; @@install_component.sql 'core/types/ut_reporters.tps' --output buffer base api +@@install_component.sql 'core/output_buffers/ut_output_data_row.tps' +@@install_component.sql 'core/output_buffers/ut_output_data_rows.tps' @@install_component.sql 'core/output_buffers/ut_output_buffer_base.tps' --output buffer table @@install_component.sql 'core/output_buffers/ut_output_buffer_info_tmp.sql' diff --git a/source/reporters/ut_documentation_reporter.tpb b/source/reporters/ut_documentation_reporter.tpb index 73ac3bf1a..a17b2fb4e 100644 --- a/source/reporters/ut_documentation_reporter.tpb +++ b/source/reporters/ut_documentation_reporter.tpb @@ -29,6 +29,21 @@ create or replace type body ut_documentation_reporter is return rpad(' ', self.lvl * 2); end tab; + overriding member procedure print_clob(self in out nocopy ut_documentation_reporter, a_clob clob) is + l_lines ut_varchar2_list; + l_out_lines ut_varchar2_rows := ut_varchar2_rows(); + begin + if a_clob is not null and dbms_lob.getlength(a_clob) > 0 then + l_lines := ut_utils.clob_to_table(a_clob, ut_utils.gc_max_storage_varchar2_len - length(tab())); + for i in 1 .. l_lines.count loop + if l_lines(i) is not null then + ut_utils.append_to_list(l_out_lines, tab() || l_lines(i) ); + end if; + end loop; + (self as ut_output_reporter_base).print_text_lines(l_out_lines); + end if; + end; + overriding member procedure print_text(self in out nocopy ut_documentation_reporter, a_text varchar2) is l_lines ut_varchar2_list; begin diff --git a/source/reporters/ut_documentation_reporter.tps b/source/reporters/ut_documentation_reporter.tps index 717ab3cd7..b35cf081b 100644 --- a/source/reporters/ut_documentation_reporter.tps +++ b/source/reporters/ut_documentation_reporter.tps @@ -20,6 +20,7 @@ create or replace type ut_documentation_reporter under ut_console_reporter_base( constructor function ut_documentation_reporter(self in out nocopy ut_documentation_reporter) return self as result, member function tab(self in ut_documentation_reporter) return varchar2, + overriding member procedure print_clob(self in out nocopy ut_documentation_reporter, a_clob clob), overriding member procedure print_text(self in out nocopy ut_documentation_reporter, a_text varchar2), overriding member procedure before_calling_suite(self in out nocopy ut_documentation_reporter, a_suite ut_logical_suite), overriding member procedure after_calling_test(self in out nocopy ut_documentation_reporter, a_test ut_test), diff --git a/test/core/test_output_buffer.pkb b/test/core/test_output_buffer.pkb index a22f3772d..f7d3cbb8b 100644 --- a/test/core/test_output_buffer.pkb +++ b/test/core/test_output_buffer.pkb @@ -1,18 +1,30 @@ create or replace package body test_output_buffer is - procedure test_recieve is - l_result varchar2(4000); - l_remaining integer; - l_expected varchar2(4000); - l_buffer ut3.ut_output_buffer_base := ut3.ut_output_table_buffer(); + procedure test_receive is + l_actual_text clob; + l_actual_item_type varchar2(1000); + l_remaining integer; + l_expected_text clob; + l_expected_item_type varchar2(1000); + l_buffer ut3.ut_output_buffer_base; begin - --Act - l_expected := lpad('a text',4000,',a text'); - l_buffer.send_line(l_expected); + --Arrange + l_buffer := ut3.ut_output_table_buffer(); + l_expected_text := to_clob(lpad('a text', 31000, ',a text')) + || chr(10) || to_clob(lpad('a text', 31000, ',a text')) + || chr(13) || to_clob(lpad('a text', 31000, ',a text')) + || chr(13) || chr(10) || to_clob(lpad('a text', 31000, ',a text')) || to_clob(lpad('a text', 31000, ',a text')); + l_expected_item_type := lpad('some item type',1000,'-'); + --Act + l_buffer.send_clob(l_expected_text, l_expected_item_type); - select * into l_result from table(l_buffer.get_lines(0,0)); + select text, item_type + into l_actual_text, l_actual_item_type + from table(l_buffer.get_lines(0,0)); - ut.expect(l_result).to_equal(l_expected); + --Assert + ut.expect(l_actual_text).to_equal(l_expected_text); + ut.expect(l_actual_item_type).to_equal(l_expected_item_type); select count(1) into l_remaining from ut3.ut_output_buffer_tmp where output_id = l_buffer.output_id; @@ -45,18 +57,18 @@ create or replace package body test_output_buffer is end; procedure test_waiting_for_data is - l_result varchar2(4000); + l_result clob; l_remaining integer; - l_expected varchar2(4000); + l_expected clob; l_buffer ut3.ut_output_buffer_base := ut3.ut_output_table_buffer(); l_start timestamp; l_duration interval day to second; begin --Act - l_expected := lpad('a text',4000,',a text'); + l_expected := 'a text'; l_buffer.send_line(l_expected); l_start := localtimestamp; - select * into l_result from table(l_buffer.get_lines(1,1)); + select text into l_result from table(l_buffer.get_lines(1,1)); l_duration := localtimestamp - l_start; ut.expect(l_result).to_equal(l_expected); @@ -64,7 +76,6 @@ create or replace package body test_output_buffer is select count(1) into l_remaining from ut3.ut_output_buffer_tmp where output_id = l_buffer.output_id; ut.expect(l_remaining).to_equal(0); - end; end test_output_buffer; diff --git a/test/core/test_output_buffer.pks b/test/core/test_output_buffer.pks index 1392b39ad..417b1ce09 100644 --- a/test/core/test_output_buffer.pks +++ b/test/core/test_output_buffer.pks @@ -4,7 +4,7 @@ create or replace package test_output_buffer is --%suitepath(utplsql.core) --%test(Receives a line from buffer table and deletes) - procedure test_recieve; + procedure test_receive; --%test(Does not send line if null text given) procedure test_doesnt_send_on_null_text; From e02d238c2c2f271b63d785bd8f2d77ea8639dd1f Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 30 Dec 2018 21:07:31 +0000 Subject: [PATCH 0195/1096] Added `item_type` attribute to output reporters. Added missing items in uninstall. --- source/core/types/ut_output_reporter_base.tpb | 22 ++++++++----------- source/core/types/ut_output_reporter_base.tps | 6 ++--- .../reporters/ut_documentation_reporter.tpb | 8 +++---- .../reporters/ut_documentation_reporter.tps | 4 ++-- source/uninstall_objects.sql | 4 ++++ 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/source/core/types/ut_output_reporter_base.tpb b/source/core/types/ut_output_reporter_base.tpb index 1dae9180b..7b875c9e9 100644 --- a/source/core/types/ut_output_reporter_base.tpb +++ b/source/core/types/ut_output_reporter_base.tpb @@ -41,14 +41,19 @@ create or replace type body ut_output_reporter_base is l_output_table_buffer := treat(self.output_buffer as ut_output_table_buffer); end; - member procedure print_text(self in out nocopy ut_output_reporter_base, a_text varchar2) is + member procedure print_text(self in out nocopy ut_output_reporter_base, a_text varchar2, a_item_type varchar2 := null) is begin - self.output_buffer.send_line(a_text); + self.output_buffer.send_line(a_text, a_item_type); end; - member procedure print_text_lines(self in out nocopy ut_output_reporter_base, a_text_lines ut_varchar2_rows) is + member procedure print_text_lines(self in out nocopy ut_output_reporter_base, a_text_lines ut_varchar2_rows, a_item_type varchar2 := null) is begin - self.output_buffer.send_lines(a_text_lines); + self.output_buffer.send_lines(a_text_lines, a_item_type); + end; + + member procedure print_clob(self in out nocopy ut_output_reporter_base, a_clob clob, a_item_type varchar2 := null) is + begin + self.output_buffer.send_clob( a_clob, a_item_type ); end; final member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural) return ut_output_data_rows pipelined is @@ -68,15 +73,6 @@ create or replace type body ut_output_reporter_base is self.output_buffer.lines_to_dbms_output(a_initial_timeout, a_timeout_sec); end; - member procedure print_clob(self in out nocopy ut_output_reporter_base, a_clob clob) is - begin - if a_clob is not null and dbms_lob.getlength(a_clob) > 0 then - self.print_text_lines( - ut_utils.convert_collection( ut_utils.clob_to_table( a_clob, ut_utils.gc_max_storage_varchar2_len ) ) - ); - end if; - end; - overriding final member procedure on_finalize(self in out nocopy ut_output_reporter_base, a_run in ut_run) is begin self.output_buffer.close(); diff --git a/source/core/types/ut_output_reporter_base.tps b/source/core/types/ut_output_reporter_base.tps index 6d9844493..cb5c81ea5 100644 --- a/source/core/types/ut_output_reporter_base.tps +++ b/source/core/types/ut_output_reporter_base.tps @@ -21,9 +21,9 @@ create or replace type ut_output_reporter_base under ut_reporter_base( overriding member procedure set_reporter_id(self in out nocopy ut_output_reporter_base, a_reporter_id raw), overriding member procedure before_calling_run(self in out nocopy ut_output_reporter_base, a_run in ut_run), - member procedure print_text(self in out nocopy ut_output_reporter_base, a_text varchar2), - member procedure print_text_lines(self in out nocopy ut_output_reporter_base, a_text_lines ut_varchar2_rows), - member procedure print_clob(self in out nocopy ut_output_reporter_base, a_clob clob), + member procedure print_text(self in out nocopy ut_output_reporter_base, a_text varchar2, a_item_type varchar2 := null), + member procedure print_text_lines(self in out nocopy ut_output_reporter_base, a_text_lines ut_varchar2_rows, a_item_type varchar2 := null), + member procedure print_clob(self in out nocopy ut_output_reporter_base, a_clob clob, a_item_type varchar2 := null), final member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined, final member function get_lines_cursor(a_initial_timeout natural := null, a_timeout_sec natural := null) return sys_refcursor, diff --git a/source/reporters/ut_documentation_reporter.tpb b/source/reporters/ut_documentation_reporter.tpb index a17b2fb4e..ebb3cd262 100644 --- a/source/reporters/ut_documentation_reporter.tpb +++ b/source/reporters/ut_documentation_reporter.tpb @@ -29,7 +29,7 @@ create or replace type body ut_documentation_reporter is return rpad(' ', self.lvl * 2); end tab; - overriding member procedure print_clob(self in out nocopy ut_documentation_reporter, a_clob clob) is + overriding member procedure print_clob(self in out nocopy ut_documentation_reporter, a_clob clob, a_item_type varchar2 := null) is l_lines ut_varchar2_list; l_out_lines ut_varchar2_rows := ut_varchar2_rows(); begin @@ -40,17 +40,17 @@ create or replace type body ut_documentation_reporter is ut_utils.append_to_list(l_out_lines, tab() || l_lines(i) ); end if; end loop; - (self as ut_output_reporter_base).print_text_lines(l_out_lines); + (self as ut_output_reporter_base).print_text_lines(l_out_lines, a_item_type); end if; end; - overriding member procedure print_text(self in out nocopy ut_documentation_reporter, a_text varchar2) is + overriding member procedure print_text(self in out nocopy ut_documentation_reporter, a_text varchar2, a_item_type varchar2 := null) is l_lines ut_varchar2_list; begin if a_text is not null then l_lines := ut_utils.string_to_table(a_text); for i in 1 .. l_lines.count loop - (self as ut_output_reporter_base).print_text(tab || l_lines(i)); + (self as ut_output_reporter_base).print_text(tab || l_lines(i), a_item_type); end loop; end if; end; diff --git a/source/reporters/ut_documentation_reporter.tps b/source/reporters/ut_documentation_reporter.tps index b35cf081b..275408a35 100644 --- a/source/reporters/ut_documentation_reporter.tps +++ b/source/reporters/ut_documentation_reporter.tps @@ -20,8 +20,8 @@ create or replace type ut_documentation_reporter under ut_console_reporter_base( constructor function ut_documentation_reporter(self in out nocopy ut_documentation_reporter) return self as result, member function tab(self in ut_documentation_reporter) return varchar2, - overriding member procedure print_clob(self in out nocopy ut_documentation_reporter, a_clob clob), - overriding member procedure print_text(self in out nocopy ut_documentation_reporter, a_text varchar2), + overriding member procedure print_clob(self in out nocopy ut_documentation_reporter, a_clob clob, a_item_type varchar2 := null), + overriding member procedure print_text(self in out nocopy ut_documentation_reporter, a_text varchar2, a_item_type varchar2 := null), overriding member procedure before_calling_suite(self in out nocopy ut_documentation_reporter, a_suite ut_logical_suite), overriding member procedure after_calling_test(self in out nocopy ut_documentation_reporter, a_test ut_test), overriding member procedure after_calling_after_all (self in out nocopy ut_documentation_reporter, a_executable in ut_executable), diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index c20868079..f510acc2a 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -241,6 +241,10 @@ drop table ut_output_buffer_info_tmp$; drop sequence ut_message_id_seq; +drop type ut_output_data_rows force; + +drop type ut_output_data_row force; + drop type ut_results_counter force; drop type ut_expectation_results force; From fc0f0e99648a4a28b55a62b165b1715811bd94b9 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 30 Dec 2018 21:50:47 +0000 Subject: [PATCH 0196/1096] Fixed failing examples. --- examples/developer_examples/ut_custom_reporter.tpb | 4 ++-- examples/developer_examples/ut_custom_reporter.tps | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/developer_examples/ut_custom_reporter.tpb b/examples/developer_examples/ut_custom_reporter.tpb index 09991107c..48e8f4a96 100644 --- a/examples/developer_examples/ut_custom_reporter.tpb +++ b/examples/developer_examples/ut_custom_reporter.tpb @@ -16,9 +16,9 @@ create or replace type body ut_custom_reporter is return tab_str; end tab; - overriding member procedure print_text(a_text varchar2) is + overriding member procedure print_text(a_text varchar2, a_item_type varchar2 := null) is begin - (self as ut_documentation_reporter).print_text(tab || a_text); + (self as ut_documentation_reporter).print_text(tab || a_text, a_item_type); end; overriding member procedure before_calling_suite(self in out nocopy ut_custom_reporter, a_suite ut_logical_suite) as diff --git a/examples/developer_examples/ut_custom_reporter.tps b/examples/developer_examples/ut_custom_reporter.tps index aa68c03ad..cc7de666e 100644 --- a/examples/developer_examples/ut_custom_reporter.tps +++ b/examples/developer_examples/ut_custom_reporter.tps @@ -5,7 +5,7 @@ create or replace type ut_custom_reporter under ut_documentation_reporter -- Member functions and procedures constructor function ut_custom_reporter(a_tab_size integer default 4) return self as result, overriding member function tab(self in ut_custom_reporter) return varchar2, - overriding member procedure print_text(a_text varchar2), + overriding member procedure print_text(a_text varchar2, a_item_type varchar2 := null), overriding member procedure before_calling_suite(self in out nocopy ut_custom_reporter, a_suite ut_logical_suite), overriding member procedure before_calling_test(self in out nocopy ut_custom_reporter, a_test ut_test), overriding member procedure after_calling_test(self in out nocopy ut_custom_reporter, a_test ut_test), From fb965116444951b57838190eed70adac956a667d Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Mon, 31 Dec 2018 01:55:36 +0100 Subject: [PATCH 0197/1096] create object type and collection type for test_realtime_reporter --- test/helpers/test_event_list.tps | 2 ++ test/helpers/test_event_object.tps | 15 +++++++++++++++ test/helpers/test_xmltype_list.tps | 2 -- test/install_tests.sql | 3 ++- 4 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 test/helpers/test_event_list.tps create mode 100644 test/helpers/test_event_object.tps delete mode 100644 test/helpers/test_xmltype_list.tps diff --git a/test/helpers/test_event_list.tps b/test/helpers/test_event_list.tps new file mode 100644 index 000000000..8abf71b13 --- /dev/null +++ b/test/helpers/test_event_list.tps @@ -0,0 +1,2 @@ +create or replace type test_event_list as table of test_event_object; +/ diff --git a/test/helpers/test_event_object.tps b/test/helpers/test_event_object.tps new file mode 100644 index 000000000..da458d2c2 --- /dev/null +++ b/test/helpers/test_event_object.tps @@ -0,0 +1,15 @@ +declare + l_exists integer; +begin + select count(1) into l_exists from user_types where type_name = 'TEST_EVENT_OBJECT'; + if l_exists > 0 then + execute immediate 'drop type test_event_object force'; + end if; +end; +/ + +create or replace type test_event_object as object ( + event_type varchar2(1000), + event_doc xmltype +) +/ \ No newline at end of file diff --git a/test/helpers/test_xmltype_list.tps b/test/helpers/test_xmltype_list.tps deleted file mode 100644 index 9c1bd4445..000000000 --- a/test/helpers/test_xmltype_list.tps +++ /dev/null @@ -1,2 +0,0 @@ -create or replace type test_xmltype_list as table of xmltype; -/ diff --git a/test/install_tests.sql b/test/install_tests.sql index 3f758de3f..96d2702f8 100644 --- a/test/install_tests.sql +++ b/test/install_tests.sql @@ -13,7 +13,8 @@ alter session set plsql_optimize_level=0; @@helpers/other_dummy_object.tps @@helpers/test_dummy_object.tps @@helpers/test_dummy_object_list.tps -@@helpers/test_xmltype_list.tps +@@helpers/test_event_object.tps +@@helpers/test_event_list.tps --Install tests @@core.pks From 957e5c95bc25104cc46cc39e783c6ad498c0c1ab Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Mon, 31 Dec 2018 01:59:37 +0100 Subject: [PATCH 0198/1096] produce 1 row per event document using new output buffer --- source/reporters/ut_realtime_reporter.tpb | 27 +++-- source/reporters/ut_realtime_reporter.tps | 3 +- .../core/reporters/test_realtime_reporter.pkb | 106 ++++++++---------- 3 files changed, 62 insertions(+), 74 deletions(-) diff --git a/source/reporters/ut_realtime_reporter.tpb b/source/reporters/ut_realtime_reporter.tpb index 0e0b212fc..5d6d3eca5 100644 --- a/source/reporters/ut_realtime_reporter.tpb +++ b/source/reporters/ut_realtime_reporter.tpb @@ -78,7 +78,7 @@ create or replace type body ut_realtime_reporter is self.print_end_node('suites'); self.print_node('totalNumberOfTests', to_char(total_number_of_tests)); self.print_end_node('event'); - self.flush_print_buffer(); + self.flush_print_buffer('pre-run'); end before_calling_run; overriding member procedure after_calling_run( @@ -89,7 +89,7 @@ create or replace type body ut_realtime_reporter is self.print_xml_fragment(xml_header); self.print_start_node('event', 'type', 'post-run'); self.print_end_node('event'); - self.flush_print_buffer(); + self.flush_print_buffer('post-run'); end after_calling_run; overriding member procedure before_calling_suite( @@ -102,7 +102,7 @@ create or replace type body ut_realtime_reporter is self.print_start_node('suite', 'id', a_suite.path); self.print_end_node('suite'); self.print_end_node('event'); - self.flush_print_buffer(); + self.flush_print_buffer('pre-suite'); end before_calling_suite; overriding member procedure after_calling_suite( @@ -127,7 +127,7 @@ create or replace type body ut_realtime_reporter is self.print_cdata_node('serverOutput', a_suite.get_serveroutputs()); self.print_end_node('suite'); self.print_end_node('event'); - self.flush_print_buffer(); + self.flush_print_buffer('post-suite'); end after_calling_suite; overriding member procedure before_calling_test( @@ -143,7 +143,7 @@ create or replace type body ut_realtime_reporter is self.print_node('totalNumberOfTests', to_char(total_number_of_tests)); self.print_end_node('test'); self.print_end_node('event'); - self.flush_print_buffer(); + self.flush_print_buffer('pre-test'); end before_calling_test; overriding member procedure after_calling_test( @@ -182,7 +182,7 @@ create or replace type body ut_realtime_reporter is end if; self.print_end_node('test'); self.print_end_node('event'); - self.flush_print_buffer(); + self.flush_print_buffer('post-test'); end after_calling_test; overriding member function get_description return varchar2 is @@ -214,10 +214,6 @@ create or replace type body ut_realtime_reporter is ) is begin self.print_xml_fragment('', -1); - if a_name = 'event' then - -- force new line to make complete event a.s.a.p. visible in consuming session - self.print_xml_fragment(' '); - end if; end print_end_node; member procedure print_node( @@ -255,10 +251,17 @@ create or replace type body ut_realtime_reporter is end print_xml_fragment; member procedure flush_print_buffer( - self in out nocopy ut_realtime_reporter + self in out nocopy ut_realtime_reporter, + a_item_type in varchar2 ) is + l_doc clob; + l_rows integer := print_buffer.count; begin - self.print_text_lines(print_buffer); + for i in 1 .. l_rows loop + ut_utils.append_to_clob(l_doc, print_buffer(i)); + ut_utils.append_to_clob(l_doc, chr(10)); + end loop; + self.print_clob(l_doc, a_item_type); print_buffer.delete; end flush_print_buffer; diff --git a/source/reporters/ut_realtime_reporter.tps b/source/reporters/ut_realtime_reporter.tps index 5d8b315ec..49305b247 100644 --- a/source/reporters/ut_realtime_reporter.tps +++ b/source/reporters/ut_realtime_reporter.tps @@ -155,7 +155,8 @@ create or replace type ut_realtime_reporter force under ut_output_reporter_base( * Flushes the local print buffer to the output buffer. */ member procedure flush_print_buffer( - self in out nocopy ut_realtime_reporter + self in out nocopy ut_realtime_reporter, + a_item_type in varchar2 ) ) not final diff --git a/test/core/reporters/test_realtime_reporter.pkb b/test/core/reporters/test_realtime_reporter.pkb index bd1df040a..2ecc222dc 100644 --- a/test/core/reporters/test_realtime_reporter.pkb +++ b/test/core/reporters/test_realtime_reporter.pkb @@ -1,6 +1,6 @@ create or replace package body test_realtime_reporter as - g_xml_reports test_xmltype_list := test_xmltype_list(); + g_xml_reports test_event_list := test_event_list(); procedure create_test_suites_and_run is pragma autonomous_transaction; @@ -102,33 +102,17 @@ create or replace package body test_realtime_reporter as <> declare - l_clob clob; + l_reporter ut3.ut_realtime_reporter := ut3.ut_realtime_reporter(); begin - g_xml_reports.delete; - <> - for r in ( - with - base as ( - select sum(case when column_value like ' ut3.ut_varchar2_list(':realtime_reporting'), + a_reporters => ut3.ut_reporters(l_reporter) + ); + -- consume + select test_event_object(item_type, xmltype(text)) + bulk collect into g_xml_reports + from table(ut3.ut_output_table_buffer(l_reporter.output_buffer.output_id).get_lines()); end run_report_and_cache_result; end create_test_suites_and_run; @@ -137,8 +121,8 @@ create or replace package body test_realtime_reporter as l_expected sys_refcursor; begin open l_actual for - select t.column_value.extract('/event/@type').getstringval() as event_type, - t.column_value.extract('/event/suite/@id|/event/test/@id').getstringval() as item_id + select t.event_doc.extract('/event/@type').getstringval() as event_type, + t.event_doc.extract('/event/suite/@id|/event/test/@id').getstringval() as item_id from table(g_xml_reports) t; open l_expected for select 'pre-run' as event_type, null as item_id from dual union all @@ -174,22 +158,22 @@ create or replace package body test_realtime_reporter as l_actual integer; l_expected integer := 7; begin - select t.column_value.extract('/event/totalNumberOfTests/text()').getnumberval() + select t.event_doc.extract('/event/totalNumberOfTests/text()').getnumberval() into l_actual from table(g_xml_reports) t - where t.column_value.extract('/event/@type').getstringval() = 'pre-run'; + where t.event_type = 'pre-run'; end total_number_of_tests; procedure escaped_characters is l_actual varchar2(32767); l_expected varchar2(20) := 'suite <A>'; begin - select t.column_value.extract( + select t.event_doc.extract( '//suite[@id="realtime_reporting.check_realtime_reporting1"]/description/text()' ).getstringval() into l_actual from table(g_xml_reports) t - where t.column_value.extract('/event/@type').getstringval() = 'pre-run'; + where t.event_type = 'pre-run'; ut.expect(l_actual).to_equal(l_expected); end escaped_characters; @@ -198,13 +182,13 @@ create or replace package body test_realtime_reporter as l_expected sys_refcursor; begin open l_actual for - select t.column_value.extract('//test/testNumber/text()') + select t.event_doc.extract('//test/testNumber/text()') .getnumberval() as test_number, - t.column_value.extract('//test/totalNumberOfTests/text()') + t.event_doc.extract('//test/totalNumberOfTests/text()') .getnumberval() as total_number_of_tests from table(g_xml_reports) t - where t.column_value.extract('/event/@type').getstringval() = 'pre-test' - and t.column_value.extract('//test/@id').getstringval() is not null; + where t.event_type = 'pre-test' + and t.event_doc.extract('//test/@id').getstringval() is not null; open l_expected for select level as test_number, 7 as total_number_of_tests @@ -218,21 +202,21 @@ create or replace package body test_realtime_reporter as l_expected sys_refcursor; begin open l_actual for - select t.column_value.extract('//test/testNumber/text()') + select t.event_doc.extract('//test/testNumber/text()') .getnumberval() as test_number, - t.column_value.extract('//test/totalNumberOfTests/text()') + t.event_doc.extract('//test/totalNumberOfTests/text()') .getnumberval() as total_number_of_tests from table(g_xml_reports) t - where t.column_value.extract('/event/@type').getstringval() = 'post-test' - and t.column_value.extract('//test/@id').getstringval() is not null - and t.column_value.extract('//test/startTime/text()').getstringval() is not null - and t.column_value.extract('//test/endTime/text()').getstringval() is not null - and t.column_value.extract('//test/executionTime/text()').getnumberval() is not null - and t.column_value.extract('//test/counter/disabled/text()').getnumberval() is not null - and t.column_value.extract('//test/counter/success/text()').getnumberval() is not null - and t.column_value.extract('//test/counter/failure/text()').getnumberval() is not null - and t.column_value.extract('//test/counter/error/text()').getnumberval() is not null - and t.column_value.extract('//test/counter/warning/text()').getnumberval() is not null; + where t.event_type = 'post-test' + and t.event_doc.extract('//test/@id').getstringval() is not null + and t.event_doc.extract('//test/startTime/text()').getstringval() is not null + and t.event_doc.extract('//test/endTime/text()').getstringval() is not null + and t.event_doc.extract('//test/executionTime/text()').getnumberval() is not null + and t.event_doc.extract('//test/counter/disabled/text()').getnumberval() is not null + and t.event_doc.extract('//test/counter/success/text()').getnumberval() is not null + and t.event_doc.extract('//test/counter/failure/text()').getnumberval() is not null + and t.event_doc.extract('//test/counter/error/text()').getnumberval() is not null + and t.event_doc.extract('//test/counter/warning/text()').getnumberval() is not null; open l_expected for select level as test_number, 7 as total_number_of_tests @@ -245,12 +229,12 @@ create or replace package body test_realtime_reporter as l_actual varchar2(32767); l_expected varchar2(80) := ''; begin - select t.column_value.extract( + select t.event_doc.extract( '/event/test/failedExpectations/expectation[1]/message/text()' ).getstringval() into l_actual from table(g_xml_reports) t - where t.column_value.extract('/event[@type="post-test"]/test/@id').getstringval() + where t.event_doc.extract('/event[@type="post-test"]/test/@id').getstringval() = 'realtime_reporting.check_realtime_reporting1.test context.test_2_nok'; ut.expect(l_actual).to_equal(l_expected); end single_failed_message; @@ -264,11 +248,11 @@ create or replace package body test_realtime_reporter as from table(g_xml_reports) t, xmltable( '/event/test/failedExpectations/expectation' - passing t.column_value + passing t.event_doc columns message clob path 'message', caller clob path 'caller' ) x - where t.column_value.extract('/event[@type="post-test"]/test/@id').getstringval() + where t.event_doc.extract('/event[@type="post-test"]/test/@id').getstringval() = 'realtime_reporting.check_realtime_reporting2.test_4_nok' and x.message is not null and x.caller is not null; @@ -280,10 +264,10 @@ create or replace package body test_realtime_reporter as l_expected_list ut3.ut_varchar2_list; l_expected clob; begin - select t.column_value.extract('//event/test/serverOutput/text()').getstringval() + select t.event_doc.extract('//event/test/serverOutput/text()').getstringval() into l_actual from table(g_xml_reports) t - where t.column_value.extract('/event[@type="post-test"]/test/@id').getstringval() + where t.event_doc.extract('/event[@type="post-test"]/test/@id').getstringval() = 'realtime_reporting.check_realtime_reporting3.test_7_with_serveroutput'; ut3.ut_utils.append_to_list(l_expected_list, ' Date: Mon, 31 Dec 2018 02:22:44 +0100 Subject: [PATCH 0199/1096] renamed package persistent variable --- .../core/reporters/test_realtime_reporter.pkb | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/test/core/reporters/test_realtime_reporter.pkb b/test/core/reporters/test_realtime_reporter.pkb index 2ecc222dc..aec0faee2 100644 --- a/test/core/reporters/test_realtime_reporter.pkb +++ b/test/core/reporters/test_realtime_reporter.pkb @@ -1,6 +1,6 @@ create or replace package body test_realtime_reporter as - g_xml_reports test_event_list := test_event_list(); + g_events test_event_list := test_event_list(); procedure create_test_suites_and_run is pragma autonomous_transaction; @@ -111,7 +111,7 @@ create or replace package body test_realtime_reporter as ); -- consume select test_event_object(item_type, xmltype(text)) - bulk collect into g_xml_reports + bulk collect into g_events from table(ut3.ut_output_table_buffer(l_reporter.output_buffer.output_id).get_lines()); end run_report_and_cache_result; end create_test_suites_and_run; @@ -123,7 +123,7 @@ create or replace package body test_realtime_reporter as open l_actual for select t.event_doc.extract('/event/@type').getstringval() as event_type, t.event_doc.extract('/event/suite/@id|/event/test/@id').getstringval() as item_id - from table(g_xml_reports) t; + from table(g_events) t; open l_expected for select 'pre-run' as event_type, null as item_id from dual union all select 'pre-suite' as event_type, 'realtime_reporting' as item_id from dual union all @@ -160,7 +160,7 @@ create or replace package body test_realtime_reporter as begin select t.event_doc.extract('/event/totalNumberOfTests/text()').getnumberval() into l_actual - from table(g_xml_reports) t + from table(g_events) t where t.event_type = 'pre-run'; end total_number_of_tests; @@ -172,7 +172,7 @@ create or replace package body test_realtime_reporter as '//suite[@id="realtime_reporting.check_realtime_reporting1"]/description/text()' ).getstringval() into l_actual - from table(g_xml_reports) t + from table(g_events) t where t.event_type = 'pre-run'; ut.expect(l_actual).to_equal(l_expected); end escaped_characters; @@ -186,7 +186,7 @@ create or replace package body test_realtime_reporter as .getnumberval() as test_number, t.event_doc.extract('//test/totalNumberOfTests/text()') .getnumberval() as total_number_of_tests - from table(g_xml_reports) t + from table(g_events) t where t.event_type = 'pre-test' and t.event_doc.extract('//test/@id').getstringval() is not null; open l_expected for @@ -206,7 +206,7 @@ create or replace package body test_realtime_reporter as .getnumberval() as test_number, t.event_doc.extract('//test/totalNumberOfTests/text()') .getnumberval() as total_number_of_tests - from table(g_xml_reports) t + from table(g_events) t where t.event_type = 'post-test' and t.event_doc.extract('//test/@id').getstringval() is not null and t.event_doc.extract('//test/startTime/text()').getstringval() is not null @@ -233,7 +233,7 @@ create or replace package body test_realtime_reporter as '/event/test/failedExpectations/expectation[1]/message/text()' ).getstringval() into l_actual - from table(g_xml_reports) t + from table(g_events) t where t.event_doc.extract('/event[@type="post-test"]/test/@id').getstringval() = 'realtime_reporting.check_realtime_reporting1.test context.test_2_nok'; ut.expect(l_actual).to_equal(l_expected); @@ -245,7 +245,7 @@ create or replace package body test_realtime_reporter as begin select count(*) into l_actual - from table(g_xml_reports) t, + from table(g_events) t, xmltable( '/event/test/failedExpectations/expectation' passing t.event_doc @@ -266,7 +266,7 @@ create or replace package body test_realtime_reporter as begin select t.event_doc.extract('//event/test/serverOutput/text()').getstringval() into l_actual - from table(g_xml_reports) t + from table(g_events) t where t.event_doc.extract('/event[@type="post-test"]/test/@id').getstringval() = 'realtime_reporting.check_realtime_reporting3.test_7_with_serveroutput'; ut3.ut_utils.append_to_list(l_expected_list, ' Date: Mon, 31 Dec 2018 11:03:11 +0100 Subject: [PATCH 0200/1096] Fix crash due to null value. --- source/reporters/ut_documentation_reporter.tpb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/reporters/ut_documentation_reporter.tpb b/source/reporters/ut_documentation_reporter.tpb index ebb3cd262..df6c25ab0 100644 --- a/source/reporters/ut_documentation_reporter.tpb +++ b/source/reporters/ut_documentation_reporter.tpb @@ -34,7 +34,7 @@ create or replace type body ut_documentation_reporter is l_out_lines ut_varchar2_rows := ut_varchar2_rows(); begin if a_clob is not null and dbms_lob.getlength(a_clob) > 0 then - l_lines := ut_utils.clob_to_table(a_clob, ut_utils.gc_max_storage_varchar2_len - length(tab())); + l_lines := ut_utils.clob_to_table(a_clob, ut_utils.gc_max_storage_varchar2_len - length(nvl(tab(),0))); for i in 1 .. l_lines.count loop if l_lines(i) is not null then ut_utils.append_to_list(l_out_lines, tab() || l_lines(i) ); From 73669ebbff7fda715fc5e5a3b32f562a568c7089 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Tue, 1 Jan 2019 09:51:56 +0100 Subject: [PATCH 0201/1096] Fixed issues with nested runs Introduced a stack of suspended event managers to support tested test runs. --- source/core/events/ut_event_manager.pkb | 34 +++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/source/core/events/ut_event_manager.pkb b/source/core/events/ut_event_manager.pkb index 7ae0ad0b3..b48b6d7f4 100644 --- a/source/core/events/ut_event_manager.pkb +++ b/source/core/events/ut_event_manager.pkb @@ -21,15 +21,42 @@ create or replace package body ut_event_manager as type t_listener_numbers is table of boolean index by t_listener_number; type t_events_listeners is table of t_listener_numbers index by t_event_name; - g_event_listeners_index t_events_listeners; - g_listeners t_listeners; + type t_event_manager is record ( + event_listener_index t_events_listeners, + listeners t_listeners + ); + type t_event_managers is table of t_event_manager; + + g_event_listeners_index t_events_listeners; + g_listeners t_listeners; + g_suspended_event_managers t_event_managers; procedure initialize is begin + if g_listeners is not null and g_listeners.count > 0 then + if g_suspended_event_managers is null then + g_suspended_event_managers := t_event_managers(); + end if; + g_suspended_event_managers.extend; + g_suspended_event_managers(g_suspended_event_managers.count).event_listener_index := g_event_listeners_index; + g_suspended_event_managers(g_suspended_event_managers.count).listeners := g_listeners; + end if; g_event_listeners_index.delete; g_listeners := t_listeners(); end; + procedure dispose_listeners is + begin + if g_suspended_event_managers is not null and g_suspended_event_managers.count > 0 then + g_event_listeners_index := g_suspended_event_managers(g_suspended_event_managers.count).event_listener_index; + g_listeners := g_suspended_event_managers(g_suspended_event_managers.count).listeners; + g_suspended_event_managers.trim(1); + else + g_event_listeners_index.delete; + g_listeners := t_listeners(); + end if; + end; + procedure trigger_event( a_event_name t_event_name, a_event_object ut_event_item ) is begin if a_event_name is not null and g_event_listeners_index.exists(a_event_name) @@ -39,6 +66,9 @@ create or replace package body ut_event_manager as for listener_number in 1 .. g_event_listeners_index(a_event_name).count loop g_listeners(listener_number).on_event(a_event_name, a_event_object); end loop; + if a_event_name = ut_utils.gc_finalize then + dispose_listeners; + end if; end if; end; From cc3a7e4e23f0b4885c8db00706878e609189f4b1 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 1 Jan 2019 16:08:27 +0000 Subject: [PATCH 0202/1096] Extracted duplicated code from pipelined functions into `get_report_outputs` iterator function. --- source/api/ut.pkb | 126 +++++++++++++++++----------------------------- 1 file changed, 47 insertions(+), 79 deletions(-) diff --git a/source/api/ut.pkb b/source/api/ut.pkb index daa0b6df5..5710f78c4 100644 --- a/source/api/ut.pkb +++ b/source/api/ut.pkb @@ -20,6 +20,9 @@ create or replace package body ut is g_nls_date_format varchar2(4000); gc_fail_on_errors constant boolean := false; + g_result_line_no binary_integer; + g_result_lines ut_varchar2_list := ut_varchar2_list(); + function version return varchar2 is begin return ut_runner.version(); @@ -164,6 +167,31 @@ create or replace package body ut is rollback; end; + function get_report_outputs( a_cursor sys_refcursor ) return varchar2 is + l_clob clob; + l_item_type varchar2(32767); + l_result varchar2(4000); + begin + if g_result_line_no is null then + fetch a_cursor into l_clob, l_item_type; + if a_cursor%notfound then + close a_cursor; + g_result_line_no := null; + g_result_lines := ut_varchar2_list(); + raise_if_packages_invalidated(); + raise no_data_found; + end if; + g_result_lines := ut_utils.clob_to_table(l_clob, ut_utils.gc_max_storage_varchar2_len); + g_result_line_no := g_result_lines.first; + end if; + + if g_result_line_no is not null then + l_result := g_result_lines(g_result_line_no); + g_result_line_no := g_result_lines.next(g_result_line_no); + end if; + return l_result; + end; + function run( a_reporter ut_reporter_base := null, a_color_console integer := 0, @@ -175,10 +203,7 @@ create or replace package body ut is a_client_character_set varchar2 := null ) return ut_varchar2_rows pipelined is l_reporter ut_reporter_base := a_reporter; - l_data sys_refcursor; - l_clob clob; - l_item_type varchar2(32767); - l_lines ut_varchar2_list; + l_results sys_refcursor; begin run_autonomous( ut_varchar2_list(), @@ -192,18 +217,11 @@ create or replace package body ut is a_client_character_set ); if l_reporter is of (ut_output_reporter_base) then - l_data := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); + l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); loop - fetch l_data into l_clob, l_item_type; - exit when l_data%notfound; - l_lines := ut_utils.clob_to_table(l_clob, ut_utils.gc_max_storage_varchar2_len); - for i in 1 .. l_lines.count loop - pipe row(l_lines(i)); - end loop; + pipe row( get_report_outputs( l_results ) ); end loop; - close l_data; end if; - raise_if_packages_invalidated(); return; end; @@ -218,10 +236,7 @@ create or replace package body ut is a_client_character_set varchar2 := null ) return ut_varchar2_rows pipelined is l_reporter ut_reporter_base := a_reporter; - l_data sys_refcursor; - l_clob clob; - l_item_type varchar2(32767); - l_lines ut_varchar2_list; + l_results sys_refcursor; begin run_autonomous( ut_varchar2_list(), @@ -235,18 +250,11 @@ create or replace package body ut is a_client_character_set ); if l_reporter is of (ut_output_reporter_base) then - l_data := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); + l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); loop - fetch l_data into l_clob, l_item_type; - exit when l_data%notfound; - l_lines := ut_utils.clob_to_table(l_clob, ut_utils.gc_max_storage_varchar2_len); - for i in 1 .. l_lines.count loop - pipe row(l_lines(i)); - end loop; + pipe row( get_report_outputs( l_results ) ); end loop; - close l_data; end if; - raise_if_packages_invalidated(); return; end; @@ -262,10 +270,7 @@ create or replace package body ut is a_client_character_set varchar2 := null ) return ut_varchar2_rows pipelined is l_reporter ut_reporter_base := a_reporter; - l_data sys_refcursor; - l_clob clob; - l_item_type varchar2(32767); - l_lines ut_varchar2_list; + l_results sys_refcursor; begin run_autonomous( a_paths, @@ -279,18 +284,11 @@ create or replace package body ut is a_client_character_set ); if l_reporter is of (ut_output_reporter_base) then - l_data := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); + l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); loop - fetch l_data into l_clob, l_item_type; - exit when l_data%notfound; - l_lines := ut_utils.clob_to_table(l_clob, ut_utils.gc_max_storage_varchar2_len); - for i in 1 .. l_lines.count loop - pipe row(l_lines(i)); - end loop; + pipe row( get_report_outputs( l_results ) ); end loop; - close l_data; end if; - raise_if_packages_invalidated(); return; end; @@ -306,10 +304,7 @@ create or replace package body ut is a_client_character_set varchar2 := null ) return ut_varchar2_rows pipelined is l_reporter ut_reporter_base := a_reporter; - l_data sys_refcursor; - l_clob clob; - l_item_type varchar2(32767); - l_lines ut_varchar2_list; + l_results sys_refcursor; begin run_autonomous( a_paths, @@ -323,18 +318,11 @@ create or replace package body ut is a_client_character_set ); if l_reporter is of (ut_output_reporter_base) then - l_data := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); + l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); loop - fetch l_data into l_clob, l_item_type; - exit when l_data%notfound; - l_lines := ut_utils.clob_to_table(l_clob, ut_utils.gc_max_storage_varchar2_len); - for i in 1 .. l_lines.count loop - pipe row(l_lines(i)); - end loop; + pipe row( get_report_outputs( l_results ) ); end loop; - close l_data; end if; - raise_if_packages_invalidated(); return; end; @@ -349,11 +337,8 @@ create or replace package body ut is a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null ) return ut_varchar2_rows pipelined is - l_reporter ut_reporter_base := a_reporter; - l_data sys_refcursor; - l_clob clob; - l_item_type varchar2(32767); - l_lines ut_varchar2_list; + l_reporter ut_reporter_base := a_reporter; + l_results sys_refcursor; begin run_autonomous( ut_varchar2_list(a_path), @@ -367,18 +352,11 @@ create or replace package body ut is a_client_character_set ); if l_reporter is of (ut_output_reporter_base) then - l_data := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); + l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); loop - fetch l_data into l_clob, l_item_type; - exit when l_data%notfound; - l_lines := ut_utils.clob_to_table(l_clob, ut_utils.gc_max_storage_varchar2_len); - for i in 1 .. l_lines.count loop - pipe row(l_lines(i)); - end loop; + pipe row( get_report_outputs( l_results ) ); end loop; - close l_data; end if; - raise_if_packages_invalidated(); return; end; @@ -394,10 +372,7 @@ create or replace package body ut is a_client_character_set varchar2 := null ) return ut_varchar2_rows pipelined is l_reporter ut_reporter_base := a_reporter; - l_data sys_refcursor; - l_clob clob; - l_item_type varchar2(32767); - l_lines ut_varchar2_list; + l_results sys_refcursor; begin run_autonomous( ut_varchar2_list(a_path), @@ -411,18 +386,11 @@ create or replace package body ut is a_client_character_set ); if l_reporter is of (ut_output_reporter_base) then - l_data := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); + l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); loop - fetch l_data into l_clob, l_item_type; - exit when l_data%notfound; - l_lines := ut_utils.clob_to_table(l_clob, ut_utils.gc_max_storage_varchar2_len); - for i in 1 .. l_lines.count loop - pipe row(l_lines(i)); - end loop; + pipe row( get_report_outputs( l_results ) ); end loop; - close l_data; end if; - raise_if_packages_invalidated(); return; end; From abe684823af3a4575c177cac12bd83ddc6f21401 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 1 Jan 2019 18:23:49 +0000 Subject: [PATCH 0203/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 0b8121e57..b23ae1d8e 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.4.2443-develop'; + gc_version constant varchar2(50) := 'v3.1.4.2480-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From 470bb32883f984b250ed52c85e21bd0dfafe2ee9 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 3 Jan 2019 23:46:15 +0000 Subject: [PATCH 0204/1096] A bit of code cleanup --- source/check_object_grants.sql | 2 +- source/core/ut_metadata.pkb | 1 - .../data_values/ut_compound_data_value.tpb | 4 ---- .../data_values/ut_cursor_details.tpb | 24 +++---------------- .../data_values/ut_cursor_details.tps | 3 --- 5 files changed, 4 insertions(+), 30 deletions(-) diff --git a/source/check_object_grants.sql b/source/check_object_grants.sql index 705882bd2..be8cfee39 100644 --- a/source/check_object_grants.sql +++ b/source/check_object_grants.sql @@ -6,7 +6,7 @@ declare l_owner_column varchar2(128); function get_view(a_dba_view_name varchar2) return varchar2 is - l_invalid_object_name exception; + l_invalid_object_name exception; l_result varchar2(128) := lower(a_dba_view_name); pragma exception_init(l_invalid_object_name,-44002); begin diff --git a/source/core/ut_metadata.pkb b/source/core/ut_metadata.pkb index c905ebefe..b3b6bbdea 100644 --- a/source/core/ut_metadata.pkb +++ b/source/core/ut_metadata.pkb @@ -189,6 +189,5 @@ create or replace package body ut_metadata as return l_cnt > 0; end; - end; / diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index 6c67060fb..2d03e93c0 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -210,10 +210,6 @@ create or replace type body ut_compound_data_value as begin l_other := treat(a_other as ut_compound_data_value); l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); --- dbms_output.put_line(ut_compound_data_helper.gen_compare_sql( --- a_inclusion_compare, a_is_negated, a_unordered, --- treat(a_other as ut_data_value_refcursor), a_join_by_list --- )); open l_loop_curs for ut_compound_data_helper.gen_compare_sql( a_inclusion_compare, a_is_negated, a_unordered, diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb index 36bc9d6a1..1712c71a2 100644 --- a/source/expectations/data_values/ut_cursor_details.tpb +++ b/source/expectations/data_values/ut_cursor_details.tpb @@ -40,8 +40,8 @@ create or replace type body ut_cursor_details as null; end; return l_anytype; - end; - + end; + member procedure desc_compound_data( self in out nocopy ut_cursor_details, a_compound_data anytype, a_parent_name in varchar2, a_level in integer, a_access_path in varchar2 @@ -161,24 +161,6 @@ create or replace type body ut_cursor_details as return; end; - member function get_anytype_from_name( - a_owner in varchar2, a_type_name in varchar2 - ) return anytype is - l_result anytype; - begin - begin - $if dbms_db_version.version <= 12 $then - l_result := anytype.getpersistent( a_owner, a_type_name ); - $else - l_result := getanytypefrompersistent( a_owner, a_type_name ); - $end - exception - when others then - null; - end; - return l_result; - end; - member function is_collection (a_anytype_code in integer) return boolean is begin return coalesce(a_anytype_code in (dbms_types.typecode_varray,dbms_types.typecode_table,dbms_types.typecode_namedcollection),false); @@ -188,7 +170,7 @@ create or replace type body ut_cursor_details as begin return is_collection( ut_compound_data_helper.get_anytype_members_info( - get_anytype_from_name(a_owner, a_type_name) + get_user_defined_type(a_owner, a_type_name) ).type_code ); end; diff --git a/source/expectations/data_values/ut_cursor_details.tps b/source/expectations/data_values/ut_cursor_details.tps index 545106d35..37a702002 100644 --- a/source/expectations/data_values/ut_cursor_details.tps +++ b/source/expectations/data_values/ut_cursor_details.tps @@ -28,9 +28,6 @@ create or replace type ut_cursor_details force authid current_user as object ( a_parent_name in varchar2, a_level in integer, a_access_path in varchar2 ), member function get_user_defined_type(a_owner varchar2, a_type_name varchar2) return anytype, - member function get_anytype_from_name( - a_owner in varchar2, a_type_name in varchar2 - ) return anytype, member function is_collection(a_anytype_code in integer) return boolean, member function is_collection(a_owner varchar2, a_type_name varchar2) return boolean, member procedure ordered_columns(self in out nocopy ut_cursor_details, a_ordered_columns boolean := false) From b64443d7c70bdce9bcdf6bb2d9996e321ec65b2e Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 4 Jan 2019 00:24:33 +0000 Subject: [PATCH 0205/1096] Fixed cleanup issues. --- .../data_values/ut_cursor_details.tpb | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb index 1712c71a2..a153201fc 100644 --- a/source/expectations/data_values/ut_cursor_details.tpb +++ b/source/expectations/data_values/ut_cursor_details.tpb @@ -29,16 +29,20 @@ create or replace type body ut_cursor_details as not_found exception; pragma exception_init(not_found,-22303); begin - begin - $if dbms_db_version.version <= 12 $then - l_anytype := anytype.getpersistent( a_owner, a_type_name ); - $else - l_anytype := getanytypefrompersistent( a_owner, a_type_name ); - $end - exception - when not_found then - null; - end; + if a_type_name is not null then + begin + if ut_metadata.IS_OBJECT_VISIBLE('GETANYTYPEFROMPERSISTENT') then + execute immediate 'begin :l_anytype := getanytypefrompersistent( :a_owner, :a_type_name ); end;' + using out l_anytype, in nvl(a_owner,sys_context('userenv','current_schema')), in a_type_name; + else + execute immediate 'begin :l_anytype := anytype.getpersistent( :a_owner, :a_type_name ); end;' + using out l_anytype, in nvl(a_owner,sys_context('userenv','current_schema')), in a_type_name; + end if; + exception + when not_found then + null; + end; + end if; return l_anytype; end; From c2d52ae8ca998f700f5d9f767cba67891a2b3424 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 5 Jan 2019 13:17:51 +0000 Subject: [PATCH 0206/1096] resolved sonar violations --- source/expectations/data_values/ut_compound_data_helper.pkb | 5 +---- source/expectations/ut_expectation_refcursor.tpb | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 59e6f9c63..89a12b09b 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -491,12 +491,9 @@ create or replace package body ut_compound_data_helper is ) order by final_order,]'; - if a_enforce_column_order then + if a_enforce_column_order or (not(a_enforce_column_order) and not(a_unordered)) then l_sql := l_sql ||q'[case when final_order = 1 then rn else rnk end, case when final_order = 1 then rnk else rn end ]'; - elsif not(a_enforce_column_order) and not(a_unordered) then - l_sql := l_sql ||q'[case when final_order = 1 then rn else rnk end, - case when final_order = 1 then rnk else rn end ]'; elsif a_unordered then l_sql := l_sql ||q'[case when final_order = 1 then col_name else to_char(rnk) end, case when final_order = 1 then to_char(rn) else col_name end, diff --git a/source/expectations/ut_expectation_refcursor.tpb b/source/expectations/ut_expectation_refcursor.tpb index 883f4d588..c87cf2ef8 100644 --- a/source/expectations/ut_expectation_refcursor.tpb +++ b/source/expectations/ut_expectation_refcursor.tpb @@ -144,7 +144,6 @@ create or replace type body ut_expectation_refcursor as end; member function uc return ut_expectation_refcursor is - l_result ut_expectation_refcursor; begin return unordered_columns; end; From d85f88d24f54ed0fc4bc7205d4c580df119280da Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 12 Jan 2019 11:28:58 +0000 Subject: [PATCH 0207/1096] Improved performance of `get_reporters_list` by avoiding the costly and slow `connect by` Resolves #814 --- source/api/ut_runner.pkb | 31 ++++++++----------------- source/api/ut_runner.pks | 4 ++-- source/core/types/ut_reporter_info.tps | 23 ++++++++++++++++++ source/core/types/ut_reporters_info.tps | 19 +++++++++++++++ source/core/ut_utils.pkb | 27 +++++++++++++++++++++ source/core/ut_utils.pks | 5 ++++ source/install.sql | 2 ++ source/uninstall_objects.sql | 4 ++++ 8 files changed, 92 insertions(+), 23 deletions(-) create mode 100644 source/core/types/ut_reporter_info.tps create mode 100644 source/core/types/ut_reporters_info.tps diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index 526b365c7..6edf545bf 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -225,32 +225,21 @@ create or replace package body ut_runner is end; function get_reporters_list return tt_reporters_info pipelined is - l_cursor sys_refcursor; l_owner varchar2(128) := upper(ut_utils.ut_owner()); - l_results tt_reporters_info; - c_bulk_limit constant integer := 10; - l_view_name varchar2(200) := ut_metadata.get_dba_view('dba_types'); + l_reporters ut_reporters_info; + l_result t_reporter_rec; begin - open l_cursor for q'[ - SELECT - owner || '.' || type_name, - CASE - WHEN sys_connect_by_path(owner||'.'||type_name,',') LIKE '%]' || l_owner || q'[.UT_OUTPUT_REPORTER_BASE%' - THEN 'Y' - ELSE 'N' - END is_output_reporter - FROM ]'||l_view_name||q'[ t - WHERE instantiable = 'YES' - CONNECT BY supertype_name = PRIOR type_name AND supertype_owner = PRIOR owner - START WITH type_name = 'UT_REPORTER_BASE' AND owner = ']'|| l_owner || ''''; loop - fetch l_cursor bulk collect into l_results limit c_bulk_limit; - for i in 1 .. l_results.count loop - pipe row (l_results(i)); + l_reporters := ut_utils.get_child_reporters( l_reporters ); + exit when l_reporters is null or l_reporters.count = 0; + for i in 1 .. l_reporters.count loop + if l_reporters(i).is_instantiable = 'Y' then + l_result.reporter_object_name := l_owner||'.'||l_reporters(i).object_name; + l_result.is_output_reporter := l_reporters(i).is_output_reporter; + pipe row( l_result ); + end if; end loop; - exit when l_cursor%notfound; end loop; - close l_cursor; end; end ut_runner; diff --git a/source/api/ut_runner.pks b/source/api/ut_runner.pks index e0b708eaa..e111933b5 100644 --- a/source/api/ut_runner.pks +++ b/source/api/ut_runner.pks @@ -126,8 +126,8 @@ create or replace package ut_runner authid current_user is type t_reporter_rec is record ( - reporter_object_name varchar2(250), - is_output_reporter varchar2(1) --Y/N flag + reporter_object_name varchar2(250), -- full reporter name in format: owner.name + is_output_reporter varchar2(1) -- Y/N indication of reporter providing output for API ); type tt_reporters_info is table of t_reporter_rec ; diff --git a/source/core/types/ut_reporter_info.tps b/source/core/types/ut_reporter_info.tps new file mode 100644 index 000000000..7426498d5 --- /dev/null +++ b/source/core/types/ut_reporter_info.tps @@ -0,0 +1,23 @@ +create or replace type ut_reporter_info as object ( + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + object_name varchar2(250), + is_output_reporter varchar2(1), + is_instantiable varchar2(1), + is_final varchar2(1) +) +/ diff --git a/source/core/types/ut_reporters_info.tps b/source/core/types/ut_reporters_info.tps new file mode 100644 index 000000000..fa9484641 --- /dev/null +++ b/source/core/types/ut_reporters_info.tps @@ -0,0 +1,19 @@ +create or replace type ut_reporters_info as + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ +table of ut_reporter_info; +/ \ No newline at end of file diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index dbe57f866..79d2df10f 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -692,5 +692,32 @@ create or replace package body ut_utils is return l_result; end; + function get_child_reporters(a_for_reporters ut_reporters_info := null) return ut_reporters_info is + l_for_reporters ut_reporters_info := a_for_reporters; + l_results ut_reporters_info; + begin + if l_for_reporters is null then + l_for_reporters := ut_reporters_info(ut_reporter_info('UT_REPORTER_BASE','N','N','N')); + end if; + + select /*+ cardinality(f 10) */ + ut_reporter_info( + object_name => t.type_name, + is_output_reporter => + case + when f.is_output_reporter = 'Y' or t.type_name = 'UT_OUTPUT_REPORTER_BASE' + then 'Y' else 'N' + end, + is_instantiable => case when t.instantiable = 'YES' then 'Y' else 'N' end, + is_final => case when t.final = 'YES' then 'Y' else 'N' end + ) + bulk collect into l_results + from user_types t + join (select * from table(l_for_reporters) where is_final = 'N' ) f + on f.object_name = supertype_name; + + return l_results; + end; + end ut_utils; / diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index b23ae1d8e..88c032794 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -351,5 +351,10 @@ create or replace package ut_utils authid definer is */ function replace_multiline_comments(a_source clob) return clob; + /** + * Returns list of sub-type reporters for given list of super-type reporters + */ + function get_child_reporters(a_for_reporters ut_reporters_info := null) return ut_reporters_info; + end ut_utils; / diff --git a/source/install.sql b/source/install.sql index e1478b536..29a9bac4c 100644 --- a/source/install.sql +++ b/source/install.sql @@ -46,6 +46,8 @@ alter session set current_schema = &&ut3_owner; @@install_component.sql 'core/types/ut_object_names.tps' @@install_component.sql 'core/types/ut_key_value_pair.tps' @@install_component.sql 'core/types/ut_key_value_pairs.tps' +@@install_component.sql 'core/types/ut_reporter_info.tps' +@@install_component.sql 'core/types/ut_reporters_info.tps' @@install_component.sql 'core/ut_utils.pks' @@install_component.sql 'core/ut_metadata.pks' @@install_component.sql 'core/ut_utils.pkb' diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index f510acc2a..e6ea76a3a 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -255,6 +255,10 @@ drop package ut_event_manager; drop type ut_event_item force; +drop type ut_reporters_info force; + +drop type ut_reporter_info force; + drop type ut_key_anyval_pair force; drop type ut_key_anyval_pairs force; From 4737fde0c9bd4d127b4181296cacb9268e2df30d Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 12 Jan 2019 13:17:22 +0000 Subject: [PATCH 0208/1096] Added select with row limit to assure we dont overload memory when reading data on after-run. --- .../output_buffers/ut_output_buffer_tmp.sql | 22 ++++++++++--- .../output_buffers/ut_output_table_buffer.tpb | 33 +++++++++++++++---- test/install_and_run_tests.sh | 2 +- 3 files changed, 45 insertions(+), 12 deletions(-) diff --git a/source/core/output_buffers/ut_output_buffer_tmp.sql b/source/core/output_buffers/ut_output_buffer_tmp.sql index 71f8d8178..7cde2cc6f 100644 --- a/source/core/output_buffers/ut_output_buffer_tmp.sql +++ b/source/core/output_buffers/ut_output_buffer_tmp.sql @@ -1,4 +1,9 @@ -create table ut_output_buffer_tmp$( +declare + v_table_sql varchar2(32767); + e_non_assm exception; + pragma exception_init(e_non_assm, -43853); +begin + v_table_sql := 'create table ut_output_buffer_tmp$( /* utPLSQL - Version 3 Copyright 2016 - 2018 utPLSQL Project @@ -25,9 +30,18 @@ create table ut_output_buffer_tmp$( constraint ut_output_buffer_tmp_pk primary key(output_id, message_id), constraint ut_output_buffer_tmp_ck check(is_finished = 0 and text is not null or is_finished = 1 and text is null), constraint ut_output_buffer_fk1 foreign key (output_id) references ut_output_buffer_info_tmp$(output_id) -) organization index overflow nologging initrans 100 - lob(text) store as securefile ut_output_text(retention none) -; +) organization index overflow nologging initrans 100 '; + begin + execute immediate + v_table_sql || 'lob(text) store as securefile ut_output_text(retention none)'; + exception + when e_non_assm then + execute immediate + v_table_sql || 'lob(text) store as basicfile ut_output_text(pctversion 0)'; + + end; +end; +/ -- This is needed to be EBR ready as editioning view can only be created by edition enabled user declare diff --git a/source/core/output_buffers/ut_output_table_buffer.tpb b/source/core/output_buffers/ut_output_table_buffer.tpb index 54adb0f97..ea4ee0045 100644 --- a/source/core/output_buffers/ut_output_table_buffer.tpb +++ b/source/core/output_buffers/ut_output_table_buffer.tpb @@ -89,6 +89,7 @@ create or replace type body ut_output_table_buffer is lc_long_sleep_time constant number(1) := 1; --sleep for 1 s when waiting long lc_long_wait_time constant number(1) := 1; --waiting more than 1 sec l_sleep_time number(2,1) := lc_short_sleep_time; + lc_bulk_limit constant integer := 100; procedure remove_read_data(a_message_ids ut_integer_list) is pragma autonomous_transaction; @@ -99,13 +100,26 @@ create or replace type body ut_output_table_buffer is commit; end; - begin - loop - select a.message_id, ut_output_data_row(a.text, a.item_type) + procedure remove_buffer_info is + pragma autonomous_transaction; + begin + delete from ut_output_buffer_info_tmp a + where a.output_id = self.output_id; + commit; + end; + + begin + while not l_finished loop + with ordered_buffer as ( + select a.message_id, ut_output_data_row(a.text, a.item_type) + from ut_output_buffer_tmp a + where a.output_id = self.output_id + order by a.message_id + ) + select b.* bulk collect into l_message_ids, l_buffer_data - from ut_output_buffer_tmp a - where a.output_id = self.output_id - order by a.message_id; + from ordered_buffer b + where rownum <= lc_bulk_limit; --nothing fetched from output, wait and try again if l_buffer_data.count = 0 then @@ -130,7 +144,12 @@ create or replace type body ut_output_table_buffer is end loop; end if; remove_read_data(l_message_ids); - exit when l_already_waited_for >= l_wait_for or l_finished; + if l_finished then + remove_buffer_info(); + end if; + if l_already_waited_for >= l_wait_for then + l_finished := true; + end if; end loop; return; end; diff --git a/test/install_and_run_tests.sh b/test/install_and_run_tests.sh index bd04495b5..4e00a01c9 100755 --- a/test/install_and_run_tests.sh +++ b/test/install_and_run_tests.sh @@ -13,11 +13,11 @@ cd .. time utPLSQL-cli/bin/utplsql run ${UT3_TESTER}/${UT3_TESTER_PASSWORD}@${CONNECTION_STR} \ -source_path=source -owner=ut3 \ -test_path=test -c \ --f=ut_documentation_reporter -o=test_results.log -s \ -f=ut_coverage_sonar_reporter -o=coverage.xml \ -f=ut_coverage_html_reporter -o=coverage.html \ -f=ut_coveralls_reporter -o=coverage.json \ -f=ut_sonar_test_reporter -o=test_results.xml \ -f=ut_junit_reporter -o=junit_test_results.xml \ -f=ut_tfs_junit_reporter -o=tfs_test_results.xml \ +-f=ut_documentation_reporter -o=test_results.log -s \ -scc From cff3ca21dbb1dc5156a57455c0b4c5f3b9a221c3 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sat, 12 Jan 2019 14:26:33 +0000 Subject: [PATCH 0209/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index b23ae1d8e..c939e0366 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.4.2480-develop'; + gc_version constant varchar2(50) := 'v3.1.4.2493-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From a3c04804bbbebd41af57ec761b6bc5af46bf9b3d Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 12 Jan 2019 17:27:03 +0100 Subject: [PATCH 0210/1096] Fixes #817 - more meta data for post-run event --- source/reporters/ut_realtime_reporter.tpb | 14 ++++++++++++++ source/reporters/ut_realtime_reporter.tps | 2 +- test/core/reporters/test_realtime_reporter.pkb | 13 ++++++++++++- test/core/reporters/test_realtime_reporter.pks | 3 +++ 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/source/reporters/ut_realtime_reporter.tpb b/source/reporters/ut_realtime_reporter.tpb index 5d6d3eca5..4d9320598 100644 --- a/source/reporters/ut_realtime_reporter.tpb +++ b/source/reporters/ut_realtime_reporter.tpb @@ -88,6 +88,20 @@ create or replace type body ut_realtime_reporter is begin self.print_xml_fragment(xml_header); self.print_start_node('event', 'type', 'post-run'); + self.print_start_node('run'); + self.print_node('startTime', to_char(a_run.start_time, 'YYYY-MM-DD"T"HH24:MI:SS.FF6')); + self.print_node('endTime', to_char(a_run.end_time, 'YYYY-MM-DD"T"HH24:MI:SS.FF6')); + self.print_node('executionTime', ut_utils.to_xml_number_format(a_run.execution_time())); + self.print_start_node('counter'); + self.print_node('disabled', to_char(a_run.results_count.disabled_count)); + self.print_node('success', to_char(a_run.results_count.success_count)); + self.print_node('failure', to_char(a_run.results_count.failure_count)); + self.print_node('error', to_char(a_run.results_count.errored_count)); + self.print_node('warning', to_char(a_run.results_count.warnings_count)); + self.print_end_node('counter'); + self.print_cdata_node('errorStack', ut_utils.table_to_clob(a_run.get_error_stack_traces())); + self.print_cdata_node('serverOutput', a_run.get_serveroutputs()); + self.print_end_node('run'); self.print_end_node('event'); self.flush_print_buffer('post-run'); end after_calling_run; diff --git a/source/reporters/ut_realtime_reporter.tps b/source/reporters/ut_realtime_reporter.tps index 49305b247..096ebe8ee 100644 --- a/source/reporters/ut_realtime_reporter.tps +++ b/source/reporters/ut_realtime_reporter.tps @@ -58,7 +58,7 @@ create or replace type ut_realtime_reporter force under ut_output_reporter_base( ), /** - * Indicates the end of the test run. + * Provides meta data of a completed run. */ overriding member procedure after_calling_run( self in out nocopy ut_realtime_reporter, diff --git a/test/core/reporters/test_realtime_reporter.pkb b/test/core/reporters/test_realtime_reporter.pkb index aec0faee2..6a529a0f8 100644 --- a/test/core/reporters/test_realtime_reporter.pkb +++ b/test/core/reporters/test_realtime_reporter.pkb @@ -162,7 +162,18 @@ create or replace package body test_realtime_reporter as into l_actual from table(g_events) t where t.event_type = 'pre-run'; - end total_number_of_tests; + ut.expect(l_actual).to_equal(l_expected); + end total_number_of_tests; + + procedure execution_time_of_run is + l_actual number; + begin + select t.event_doc.extract('/event/run/executionTime/text()').getnumberval() + into l_actual + from table(g_events) t + where t.event_type = 'post-run'; + ut.expect(l_actual).to_be_not_null; + end execution_time_of_run; procedure escaped_characters is l_actual varchar2(32767); diff --git a/test/core/reporters/test_realtime_reporter.pks b/test/core/reporters/test_realtime_reporter.pks index 7b5862b15..6e6106923 100644 --- a/test/core/reporters/test_realtime_reporter.pks +++ b/test/core/reporters/test_realtime_reporter.pks @@ -12,6 +12,9 @@ create or replace package test_realtime_reporter as --%test(Provide the total number of tests as part of the pre-run information structure) procedure total_number_of_tests; + --%test(Provide the execution time as part of the post-run information structure) + procedure execution_time_of_run; + --%test(Escape special characters in data such as the test suite description) procedure escaped_characters; From eaa1029b10acc66ea82fe1ed91e86b6d47ae4ba3 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sat, 12 Jan 2019 18:18:00 +0000 Subject: [PATCH 0211/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 0e27e2fa0..8b1897ba2 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.4.2493-develop'; + gc_version constant varchar2(50) := 'v3.1.4.2496-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From 055d2de3292fce274c88b061d12dfd0cb75c0526 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 12 Jan 2019 19:18:24 +0100 Subject: [PATCH 0212/1096] Fixes #818 - composite items (item is either a suite or test) --- source/reporters/ut_realtime_reporter.tpb | 6 ++- .../core/reporters/test_realtime_reporter.pkb | 39 +++++++++++++++++++ .../core/reporters/test_realtime_reporter.pks | 3 ++ 3 files changed, 46 insertions(+), 2 deletions(-) diff --git a/source/reporters/ut_realtime_reporter.tpb b/source/reporters/ut_realtime_reporter.tpb index 4d9320598..e712c8f85 100644 --- a/source/reporters/ut_realtime_reporter.tpb +++ b/source/reporters/ut_realtime_reporter.tpb @@ -57,6 +57,7 @@ create or replace type body ut_realtime_reporter is self.print_node('name', a_suite.name); self.print_node('description', a_suite.description); <> + self.print_start_node('items'); for i in 1 .. a_suite.items.count loop if a_suite.items(i) is of(ut_test) then print_test_elements(treat(a_suite.items(i) as ut_test)); @@ -64,18 +65,19 @@ create or replace type body ut_realtime_reporter is print_suite_elements(treat(a_suite.items(i) as ut_logical_suite)); end if; end loop suite_elements; + self.print_end_node('items'); self.print_end_node('suite'); end print_suite_elements; begin xml_header := ut_utils.get_xml_header(a_run.client_character_set); self.print_xml_fragment(xml_header); self.print_start_node('event', 'type', 'pre-run'); - self.print_start_node('suites'); + self.print_start_node('items'); <> for i in 1 .. a_run.items.count loop print_suite_elements(treat(a_run.items(i) as ut_logical_suite)); end loop items; - self.print_end_node('suites'); + self.print_end_node('items'); self.print_node('totalNumberOfTests', to_char(total_number_of_tests)); self.print_end_node('event'); self.flush_print_buffer('pre-run'); diff --git a/test/core/reporters/test_realtime_reporter.pkb b/test/core/reporters/test_realtime_reporter.pkb index 6a529a0f8..f11e5d7b3 100644 --- a/test/core/reporters/test_realtime_reporter.pkb +++ b/test/core/reporters/test_realtime_reporter.pkb @@ -153,6 +153,45 @@ create or replace package body test_realtime_reporter as select 'post-run' as event_type, null as item_id from dual; ut.expect(l_actual).to_equal(l_expected); end xml_report_structure; + + procedure pre_run_composite_nodes is + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + open l_actual for + select x.node_path + from table(g_events) t, + xmltable( + q'[ + for $i in //(event|items|suite|test) + return {$i/string-join(ancestor-or-self::*/name(.), '/')} + ]' + passing t.event_doc + columns node_path varchar2(128) path '.' + ) x + where event_type = 'pre-run'; + open l_expected for + select 'event' as node_path from dual union all + select 'event/items' as node_path from dual union all + select 'event/items/suite' as node_path from dual union all + select 'event/items/suite/items' as node_path from dual union all + select 'event/items/suite/items/suite' as node_path from dual union all + select 'event/items/suite/items/suite/items' as node_path from dual union all + select 'event/items/suite/items/suite/items/test' as node_path from dual union all + select 'event/items/suite/items/suite/items/test' as node_path from dual union all + select 'event/items/suite/items/suite' as node_path from dual union all + select 'event/items/suite/items/suite/items' as node_path from dual union all + select 'event/items/suite/items/suite/items/test' as node_path from dual union all + select 'event/items/suite/items/suite/items/test' as node_path from dual union all + select 'event/items/suite/items/suite/items/test' as node_path from dual union all + select 'event/items/suite/items/suite' as node_path from dual union all + select 'event/items/suite/items/suite/items' as node_path from dual union all + select 'event/items/suite/items/suite/items/suite' as node_path from dual union all + select 'event/items/suite/items/suite/items/suite/items' as node_path from dual union all + select 'event/items/suite/items/suite/items/suite/items/test' as node_path from dual union all + select 'event/items/suite/items/suite/items/suite/items/test' as node_path from dual; + ut.expect(l_actual).to_equal(l_expected); + end pre_run_composite_nodes; procedure total_number_of_tests is l_actual integer; diff --git a/test/core/reporters/test_realtime_reporter.pks b/test/core/reporters/test_realtime_reporter.pks index 6e6106923..b59313895 100644 --- a/test/core/reporters/test_realtime_reporter.pks +++ b/test/core/reporters/test_realtime_reporter.pks @@ -12,6 +12,9 @@ create or replace package test_realtime_reporter as --%test(Provide the total number of tests as part of the pre-run information structure) procedure total_number_of_tests; + --%test(Provide composite structure for items, an item is either a suite or a test, suites may have nested items) + procedure pre_run_composite_nodes; + --%test(Provide the execution time as part of the post-run information structure) procedure execution_time_of_run; From daaceb482a3170c954f344dfe2156123a1478fe9 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sat, 12 Jan 2019 20:32:05 +0000 Subject: [PATCH 0213/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 8b1897ba2..48dbb536b 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.4.2496-develop'; + gc_version constant varchar2(50) := 'v3.1.4.2503-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From 39e9affaee48a34a677219efb34fd3cc7c2d4b86 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 14 Jan 2019 00:53:51 +0000 Subject: [PATCH 0214/1096] Added support for `dbms_session.seep` on Oracle 18 and above Resolves 806 --- docs/userguide/install.md | 2 ++ source/check_object_grants.sql | 7 +++++-- source/core/output_buffers/ut_output_table_buffer.tpb | 6 +++++- source/create_utplsql_owner.sql | 9 ++++++++- test/core/annotations/test_annotation_manager.pkb | 6 +++++- test/core/test_ut_executable.pkb | 6 +++++- 6 files changed, 30 insertions(+), 6 deletions(-) diff --git a/docs/userguide/install.md b/docs/userguide/install.md index ef0bef2bd..c960f93f6 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -80,6 +80,8 @@ sqlplus sys/sys_pass@db as sysdba @install_headless.sql utp3 my_verySecret_passw The script needs to be executed by `SYSDBA`, in order to grant access to `DBMS_LOCK` and `DBMS_CRYPTO` system packages. +*Note:* Grant on `DBMS_LOCK` is required on Oracle versions below 18c + # Recommended Schema It is highly recommended to install utPLSQL in it's own schema. You are free to choose any name for this schema. diff --git a/source/check_object_grants.sql b/source/check_object_grants.sql index 705882bd2..130818040 100644 --- a/source/check_object_grants.sql +++ b/source/check_object_grants.sql @@ -1,6 +1,9 @@ declare - c_expected_grants constant dbmsoutput_linesarray := dbmsoutput_linesarray('DBMS_LOCK','DBMS_CRYPTO'); - + $if dbms_db_version.version >= 18 $then + c_expected_grants constant dbmsoutput_linesarray := dbmsoutput_linesarray('DBMS_CRYPTO'); + $else + c_expected_grants constant dbmsoutput_linesarray := dbmsoutput_linesarray('DBMS_LOCK','DBMS_CRYPTO'); + $end l_missing_grants varchar2(4000); l_target_table varchar2(128); l_owner_column varchar2(128); diff --git a/source/core/output_buffers/ut_output_table_buffer.tpb b/source/core/output_buffers/ut_output_table_buffer.tpb index ea4ee0045..b7d19db43 100644 --- a/source/core/output_buffers/ut_output_table_buffer.tpb +++ b/source/core/output_buffers/ut_output_table_buffer.tpb @@ -123,7 +123,11 @@ create or replace type body ut_output_table_buffer is --nothing fetched from output, wait and try again if l_buffer_data.count = 0 then - dbms_lock.sleep(l_sleep_time); + $if dbms_db_version.version >= 18 $then + dbms_session.sleep(l_sleep_time); + $else + dbms_lock.sleep(l_sleep_time); + $end l_already_waited_for := l_already_waited_for + l_sleep_time; if l_already_waited_for > lc_long_wait_time then l_sleep_time := lc_long_sleep_time; diff --git a/source/create_utplsql_owner.sql b/source/create_utplsql_owner.sql index 740acddf5..a74ee6c44 100644 --- a/source/create_utplsql_owner.sql +++ b/source/create_utplsql_owner.sql @@ -31,7 +31,14 @@ create user &ut3_user identified by "&ut3_password" default tablespace &ut3_tabl grant create session, create sequence, create procedure, create type, create table, create view, create synonym to &ut3_user; -grant execute on dbms_lock to &ut3_user; +begin + $if dbms_db_version.version < 18 $then + execute immediate 'grant execute on dbms_lock to &ut3_user'; + $else + null; + $end +end; +/ grant execute on dbms_crypto to &ut3_user; diff --git a/test/core/annotations/test_annotation_manager.pkb b/test/core/annotations/test_annotation_manager.pkb index 1fb8115ba..804980a39 100644 --- a/test/core/annotations/test_annotation_manager.pkb +++ b/test/core/annotations/test_annotation_manager.pkb @@ -124,7 +124,11 @@ create or replace package body test_annotation_manager is ut3.ut_annotation_manager.rebuild_annotation_cache(user,'PACKAGE'); recompile_dummy_package(); l_start_date := sysdate; - dbms_lock.sleep(1); + $if dbms_db_version.version >= 18 $then + dbms_session.sleep(1); + $else + dbms_lock.sleep(1); + $end --Act ut3.ut_annotation_manager.rebuild_annotation_cache(user,'PACKAGE'); --Assert diff --git a/test/core/test_ut_executable.pkb b/test/core/test_ut_executable.pkb index d09a25a6d..1d2e74ff3 100644 --- a/test/core/test_ut_executable.pkb +++ b/test/core/test_ut_executable.pkb @@ -70,7 +70,11 @@ create or replace package body test_ut_executable is auto_drop => TRUE, comments => 'one-time job' ); - dbms_lock.sleep(0.4); + $if dbms_db_version.version >= 18 $then + dbms_session.sleep(0.4); + $else + dbms_lock.sleep(0.4); + $end while l_cnt > 0 loop select count(1) into l_cnt from dba_scheduler_running_jobs srj From 54ff178e0a522456c18555ed11068c682c71f355 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 14 Jan 2019 01:55:45 +0000 Subject: [PATCH 0215/1096] Replaced conditional install with conditional compilation For 12.2 code coverage, all source and tables are pre-created now. Upgrade from 12.1 to 12.2 will only require schema-recompile for utPLSQL to work. Resolves #803 --- source/core/coverage/dbms_plssqlcode.sql | 165 +++++++++++++++++- source/core/coverage/ut_coverage_block.pkb | 4 +- .../coverage/ut_coverage_helper_block.pkb | 42 +++-- .../create_synonyms_and_grants_for_public.sql | 26 +-- source/create_user_grants.sql | 13 +- source/create_user_synonyms.sql | 13 +- source/install.sql | 8 +- 7 files changed, 204 insertions(+), 67 deletions(-) diff --git a/source/core/coverage/dbms_plssqlcode.sql b/source/core/coverage/dbms_plssqlcode.sql index e3aa2ec9a..065563ef7 100644 --- a/source/core/coverage/dbms_plssqlcode.sql +++ b/source/core/coverage/dbms_plssqlcode.sql @@ -1,8 +1,163 @@ +declare + l_tab_exist number; begin - $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then - dbms_plsql_code_coverage.create_coverage_tables(force_it => true); - $else - null; - $end + select count(*) into l_tab_exist from + (select table_name from all_tables where table_name = 'DBMSPCC_BLOCKS' and owner = sys_context('USERENV','CURRENT_SCHEMA') + union all + select synonym_name from all_synonyms where synonym_name = 'DBMSPCC_BLOCKS' and owner = sys_context('USERENV','CURRENT_SCHEMA')); + if l_tab_exist = 0 then + execute immediate q'[ + create table dbmspcc_blocks ( + run_id number(38, 0), + object_id number(38, 0), + block number(38, 0), + line number(38, 0), + col number(38, 0), + covered number(1, 0), + not_feasible number(1, 0) + )]'; + execute immediate q'[ + create unique index dbmspcc_blocks_pk on + dbmspcc_blocks ( + run_id, + object_id, + block + )]'; + execute immediate q'[ + alter table dbmspcc_blocks modify ( + line + constraint dbmspcc_blocks_line_nn not null enable + )]'; + execute immediate q'[ + alter table dbmspcc_blocks modify ( + col + constraint dbmspcc_blocks_col_nn not null enable + )]'; + execute immediate q'[ + alter table dbmspcc_blocks modify ( + covered + constraint dbmspcc_blocks_covered_nn not null enable + )]'; + execute immediate q'[ + alter table dbmspcc_blocks modify ( + not_feasible + constraint dbmspcc_blocks_not_feasible_nn not null enable + )]'; + execute immediate q'[ + alter table dbmspcc_blocks + add constraint dbmspcc_blocks_block_ck check ( block >= 0 ) enable]'; + execute immediate q'[ + alter table dbmspcc_blocks + add constraint dbmspcc_blocks_line_ck check ( line >= 0 ) enable]'; + execute immediate q'[ + alter table dbmspcc_blocks + add constraint dbmspcc_blocks_col_ck check ( col >= 0 ) enable]'; + execute immediate q'[ + alter table dbmspcc_blocks + add constraint dbmspcc_blocks_covered_ck check ( covered in ( + 0, + 1 + ) ) enable]'; + execute immediate q'[ + alter table dbmspcc_blocks + add constraint dbmspcc_blocks_not_feasible_ck check ( not_feasible in ( + 0, + 1 + ) ) enable]'; + execute immediate q'[ + alter table dbmspcc_blocks + add constraint dbmspcc_blocks_pk primary key ( run_id, + object_id, + block ) + using index enable]'; + end if; +end; +/ +declare + l_tab_exist number; +begin + select count(*) into l_tab_exist from + (select table_name from all_tables where table_name = 'DBMSPCC_RUNS' and owner = sys_context('USERENV','CURRENT_SCHEMA') + union all + select synonym_name from all_synonyms where synonym_name = 'DBMSPCC_RUNS' and owner = sys_context('USERENV','CURRENT_SCHEMA')); + if l_tab_exist = 0 then + execute immediate q'[ + create table dbmspcc_runs ( + run_id number(38, 0), + run_comment varchar2(4000 byte), + run_owner varchar2(128 byte), + run_timestamp date + )]'; + execute immediate q'[ + create unique index dbmspcc_runs_pk on + dbmspcc_runs ( + run_id + )]'; + execute immediate q'[ + alter table dbmspcc_runs modify ( + run_owner + constraint dbmspcc_runs_run_owner_nn not null enable + )]'; + execute immediate q'[ + alter table dbmspcc_runs modify ( + run_timestamp + constraint dbmspcc_runs_run_timestamp_nn not null enable + )]'; + execute immediate q'[ + alter table dbmspcc_runs + add constraint dbmspcc_runs_pk primary key ( run_id ) + using index enable]'; + end if; +end; +/ +declare + l_tab_exist number; +begin + select count(*) into l_tab_exist from + (select table_name from all_tables where table_name = 'DBMSPCC_UNITS' and owner = sys_context('USERENV','CURRENT_SCHEMA') + union all + select synonym_name from all_synonyms where synonym_name = 'DBMSPCC_UNITS' and owner = sys_context('USERENV','CURRENT_SCHEMA')); + if l_tab_exist = 0 then + execute immediate q'[ + create table dbmspcc_units ( + run_id number(38, 0), + object_id number(38, 0), + owner varchar2(128 byte), + name varchar2(128 byte), + type varchar2(12 byte), + last_ddl_time date + )]'; + execute immediate q'[ + create unique index dbmspcc_units_pk on + dbmspcc_units ( + run_id, + object_id + )]'; + execute immediate q'[ + alter table dbmspcc_units modify ( + owner + constraint dbmspcc_units_owner_nn not null enable + )]'; + execute immediate q'[ + alter table dbmspcc_units modify ( + name + constraint dbmspcc_units_name_nn not null enable + )]'; + execute immediate q'[ + alter table dbmspcc_units modify ( + type + constraint dbmspcc_units_type_nn not null enable + )]'; + execute immediate q'[ + alter table dbmspcc_units modify ( + last_ddl_time + constraint dbmspcc_units_last_ddl_time_nn not null enable + )]'; + execute immediate q'[ + alter table dbmspcc_units + add constraint dbmspcc_units_pk primary key ( run_id, + object_id ) + using index enable]'; + end if; end; / diff --git a/source/core/coverage/ut_coverage_block.pkb b/source/core/coverage/ut_coverage_block.pkb index 7da62ff80..8e7688c91 100644 --- a/source/core/coverage/ut_coverage_block.pkb +++ b/source/core/coverage/ut_coverage_block.pkb @@ -32,6 +32,7 @@ create or replace package body ut_coverage_block is l_source_object ut_coverage_helper.t_tmp_table_object; begin + $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then l_source_objects_crsr := ut_coverage_helper.get_tmp_table_objects_cursor(); loop fetch l_source_objects_crsr @@ -150,7 +151,8 @@ create or replace package body ut_coverage_block is end loop; close l_source_objects_crsr; - + $end + return l_result; end get_coverage_data; diff --git a/source/core/coverage/ut_coverage_helper_block.pkb b/source/core/coverage/ut_coverage_helper_block.pkb index 865576b3e..c5c30d12c 100644 --- a/source/core/coverage/ut_coverage_helper_block.pkb +++ b/source/core/coverage/ut_coverage_helper_block.pkb @@ -32,12 +32,20 @@ create or replace package body ut_coverage_helper_block is procedure coverage_start(a_run_comment varchar2, a_coverage_id out integer) is begin - a_coverage_id := dbms_plsql_code_coverage.start_coverage(run_comment => a_run_comment); + $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then + a_coverage_id := dbms_plsql_code_coverage.start_coverage(run_comment => a_run_comment); + $else + null; + $end end; procedure coverage_stop is begin - dbms_plsql_code_coverage.stop_coverage(); + $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then + dbms_plsql_code_coverage.stop_coverage(); + $else + null; + $end end; function block_results(a_object_owner varchar2, a_object_name varchar2, a_coverage_id integer) return t_block_rows is @@ -70,22 +78,22 @@ create or replace package body ut_coverage_helper_block is l_results ut_coverage_helper.t_unit_line_calls; begin - l_tmp_data := block_results(a_object_owner, a_object_name, a_coverage_id); - - for i in 1 .. l_tmp_data.count loop - l_results(l_tmp_data(i).line).blocks := l_tmp_data(i).blocks; - l_results(l_tmp_data(i).line).covered_blocks := l_tmp_data(i).covered_blocks; - l_results(l_tmp_data(i).line).partcovered := case - when (l_tmp_data(i).covered_blocks > 0) and - (l_tmp_data(i).blocks > l_tmp_data(i).covered_blocks) then - 1 - else - 0 - end; - end loop; + $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then + l_tmp_data := block_results(a_object_owner, a_object_name, a_coverage_id); + + for i in 1 .. l_tmp_data.count loop + l_results(l_tmp_data(i).line).blocks := l_tmp_data(i).blocks; + l_results(l_tmp_data(i).line).covered_blocks := l_tmp_data(i).covered_blocks; + l_results(l_tmp_data(i).line).partcovered := case + when (l_tmp_data(i).covered_blocks > 0) and + (l_tmp_data(i).blocks > l_tmp_data(i).covered_blocks) then + 1 + else + 0 + end; + end loop; + $end return l_results; end; - - end; / diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index 6eaaa669c..fdc60ec11 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -100,16 +100,9 @@ grant execute on &&ut3_owner..ut_annotation_obj_cache_info to public; grant execute on &&ut3_owner..ut_suite_items_info to public; grant execute on &&ut3_owner..ut_suite_item_info to public; grant execute on &&ut3_owner..ut_realtime_reporter to public; -begin - $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then - execute immediate 'grant select, insert, delete, update on &&ut3_owner..dbmspcc_blocks to public'; - execute immediate 'grant select, insert, delete, update on &&ut3_owner..dbmspcc_runs to public'; - execute immediate 'grant select, insert, delete, update on &&ut3_owner..dbmspcc_units to public'; - $else - null; - $end -end; -/ +grant select, insert, delete, update on &&ut3_owner..dbmspcc_blocks to public; +grant select, insert, delete, update on &&ut3_owner..dbmspcc_runs to public; +grant select, insert, delete, update on &&ut3_owner..dbmspcc_units to public; prompt Creating synonyms for UTPLSQL objects in &&ut3_owner schema to PUBLIC @@ -162,13 +155,6 @@ create public synonym ut_sonar_test_reporter for &&ut3_owner..ut_sonar_test_repo create public synonym ut_suite_items_info for &&ut3_owner..ut_suite_items_info; create public synonym ut_suite_item_info for &&ut3_owner..ut_suite_item_info; create public synonym ut_realtime_reporter for &&ut3_owner..ut_realtime_reporter; -begin - $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then - execute immediate 'create public synonym dbmspcc_blocks for &&ut3_owner..dbmspcc_blocks'; - execute immediate 'create public synonym dbmspcc_runs for &&ut3_owner..dbmspcc_runs'; - execute immediate 'create public synonym dbmspcc_units for &&ut3_owner..dbmspcc_units'; - $else - null; - $end -end; -/ +create public synonym dbmspcc_blocks for &&ut3_owner..dbmspcc_blocks; +create public synonym dbmspcc_runs for &&ut3_owner..dbmspcc_runs; +create public synonym dbmspcc_units for &&ut3_owner..dbmspcc_units; diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql index bf49e36f1..9ad3c6549 100644 --- a/source/create_user_grants.sql +++ b/source/create_user_grants.sql @@ -118,13 +118,6 @@ grant execute on &&ut3_owner..ut_annotation_parser to &ut3_user; grant execute on &&ut3_owner..ut_annotation_objs_cache_info to &ut3_user; grant execute on &&ut3_owner..ut_annotation_obj_cache_info to &ut3_user; grant execute on &&ut3_owner..ut_realtime_reporter to &ut3_user; -begin - $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then - execute immediate 'grant select, insert, delete, update on &&ut3_owner..dbmspcc_blocks to &ut3_user'; - execute immediate 'grant select, insert, delete, update on &&ut3_owner..dbmspcc_runs to &ut3_user'; - execute immediate 'grant select, insert, delete, update on &&ut3_owner..dbmspcc_units to &ut3_user'; - $else - null; - $end -end; -/ +grant select, insert, delete, update on &&ut3_owner..dbmspcc_blocks to &ut3_user; +grant select, insert, delete, update on &&ut3_owner..dbmspcc_runs to &ut3_user; +grant select, insert, delete, update on &&ut3_owner..dbmspcc_units to &ut3_user; diff --git a/source/create_user_synonyms.sql b/source/create_user_synonyms.sql index 97726b1bb..746354b9e 100644 --- a/source/create_user_synonyms.sql +++ b/source/create_user_synonyms.sql @@ -101,13 +101,6 @@ create or replace synonym &ut3_user..ut_key_value_pair for &&ut3_owner..ut_key_v create or replace synonym &ut3_user..ut_compound_data_tmp for &&ut3_owner..ut_cursor_data; create or replace synonym &ut3_user..ut_sonar_test_reporter for &&ut3_owner..ut_sonar_test_reporter; create or replace synonym &ut3_user..ut_realtime_reporter for &&ut3_owner..ut_realtime_reporter; -begin - $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then - execute immediate 'create or replace synonym &ut3_user..dbmspcc_blocks for &&ut3_owner..dbmspcc_blocks'; - execute immediate 'create or replace synonym &ut3_user..dbmspcc_runs for &&ut3_owner..dbmspcc_runs'; - execute immediate 'create or replace synonym &ut3_user..dbmspcc_units for &&ut3_owner..dbmspcc_units'; - $else - null; - $end -end; -/ +create or replace synonym &ut3_user..dbmspcc_blocks for &&ut3_owner..dbmspcc_blocks; +create or replace synonym &ut3_user..dbmspcc_runs for &&ut3_owner..dbmspcc_runs; +create or replace synonym &ut3_user..dbmspcc_units for &&ut3_owner..dbmspcc_units; diff --git a/source/install.sql b/source/install.sql index 29a9bac4c..e5cc60c23 100644 --- a/source/install.sql +++ b/source/install.sql @@ -145,17 +145,17 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema --gathering coverage @@install_component.sql 'core/coverage/ut_coverage_sources_tmp.sql' @@install_component.sql 'core/coverage/ut_coverage_helper.pks' -@@install_above_12_1.sql 'core/coverage/ut_coverage_helper_block.pks' +@@install_component.sql 'core/coverage/ut_coverage_helper_block.pks' @@install_component.sql 'core/coverage/ut_coverage_helper_profiler.pks' @@install_component.sql 'core/coverage/ut_coverage.pks' -@@install_above_12_1.sql 'core/coverage/ut_coverage_block.pks' +@@install_component.sql 'core/coverage/ut_coverage_block.pks' @@install_component.sql 'core/coverage/ut_coverage_profiler.pks' @@install_component.sql 'core/coverage/ut_coverage_reporter_base.tps' @@install_component.sql 'core/coverage/ut_coverage_helper.pkb' -@@install_above_12_1.sql 'core/coverage/ut_coverage_helper_block.pkb' +@@install_component.sql 'core/coverage/ut_coverage_helper_block.pkb' @@install_component.sql 'core/coverage/ut_coverage_helper_profiler.pkb' @@install_component.sql 'core/coverage/ut_coverage.pkb' -@@install_above_12_1.sql 'core/coverage/ut_coverage_block.pkb' +@@install_component.sql 'core/coverage/ut_coverage_block.pkb' @@install_component.sql 'core/coverage/ut_coverage_profiler.pkb' @@install_component.sql 'core/coverage/ut_coverage_reporter_base.tpb' From 4f46c519923fa0f88daaaf163c0ceceadc5cd193 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 14 Jan 2019 02:02:10 +0000 Subject: [PATCH 0216/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 48dbb536b..5516933dd 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.4.2503-develop'; + gc_version constant varchar2(50) := 'v3.1.4.2508-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From ad54806ebefb83baaa16cf02980470d61c43e920 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Thu, 31 Jan 2019 13:17:45 +0000 Subject: [PATCH 0217/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 5516933dd..1431f382b 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.4.2508-develop'; + gc_version constant varchar2(50) := 'v3.1.4.2513-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From 62e5d800008fe4b8eb04466729a8bf740a215924 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 4 Feb 2019 22:06:38 +0000 Subject: [PATCH 0218/1096] Fixed doc link --- docs/userguide/advanced_data_comparison.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 6929b9845..1e10e08b2 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -6,7 +6,7 @@ utPLSQL expectations incorporates advanced data comparison options when comparin - object type - nested table and varray -Advanced data-comparison options are available for the [`equal`](expectations.md#equal) and [`include / contain`](expectations.md#include) matcher. +Advanced data-comparison options are available for the [`equal`](expectations.md#equal) and [`include / contain`](expectations.md#include--contain) matcher. ## Syntax From d7a271160e672a6f5bb6d9b95b27da9adb795e31 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 5 Feb 2019 00:17:55 +0000 Subject: [PATCH 0219/1096] Fixed issue with spaces in column lists. Updated documentation. --- docs/userguide/advanced_data_comparison.md | 230 +++++++++++------- source/core/ut_utils.pks | 8 +- .../data_values/ut_compound_data_helper.pkb | 3 +- .../data_values/ut_data_value_refcursor.tpb | 3 +- source/expectations/matchers/ut_equal.tpb | 12 +- .../expectations/test_expectations_cursor.pkb | 4 +- 6 files changed, 163 insertions(+), 97 deletions(-) diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 1e10e08b2..823f95c12 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -28,7 +28,7 @@ Advanced data-comparison options are available for the [`equal`](expectations.md - `include(a_items ut_varchar2_list)` - table of items to include - `exclude(a_items ut_varchar2_list)` - table of items to exclude - `unordered` - perform compare on unordered set of data, return only missing or actual, ***not supported for `include / contain`*** , as alternative `join_by` can be used - - `join_by(a_columns varchar2)` - columns or comma separated list of columns to join two cursors by + - `join_by(a_columns varchar2)` - column or comma separated list of columns to join two cursors by - `join_by(a_columns ut_varchar2_list)` - table of columns to join two cursors by Each item in the comma separated list can be: @@ -58,7 +58,7 @@ procedure test_cur_skip_columns_cn is l_expected sys_refcursor; l_actual sys_refcursor; begin - open l_expected for select 'text' ignore_me, d.* from user_tables d; + open l_expected for select 'text' ignore_me, d.* from user_tables d where rownum = 1; open l_actual for select sysdate "ADate", d.* from user_tables d; ut.expect( l_actual ).to_include( l_expected ).exclude( 'IGNORE_ME,ADate' ); end; @@ -127,39 +127,33 @@ Only the columns 'RN', "A_Column" will be compared. Column 'SOME_COL' is exclude This option can be useful in scenarios where you need to narrow-down the scope of test so that the test is only focused on very specific data. -##Unordered +## Unordered Unordered option allows for quick comparison of two cursors without need of ordering them in any way. Result of such comparison will be limited to only information about row existing or not existing in given set without actual information about exact differences. -**This option is not supported for `include / contain` matcher** - - - ```sql procedure unordered_tst is l_actual sys_refcursor; l_expected sys_refcursor; begin - open l_expected for select username, user_id from all_users - union all - select 'TEST' username, -600 user_id from dual - order by 1 desc; - open l_actual for select username, user_id from all_users - union all - select 'TEST' username, -610 user_id from dual - order by 1 asc; + open l_expected for + select username, user_id from all_users + union all + select 'TEST' username, -600 user_id from dual + order by 1 desc; + open l_actual for + select username, user_id from all_users + union all + select 'TEST' username, -610 user_id from dual + order by 1 asc; ut.expect( l_actual ).to_equal( l_expected ).unordered; end; ``` - - Above test will result in two differences of one row extra and one row missing. - - ```sql Diff: Rows: [ 2 differences ] @@ -167,33 +161,43 @@ Above test will result in two differences of one row extra and one row missing. Extra: TEST-610 ``` +**Note** - +> `include / contain` matcher is not considering order of compared data-sets by default so using `unordered` makes no difference (it's default) ## Join By option -You can now join two cursors by defining a primary key or composite key that will be used to uniquely identify and compare rows. This option allows us to exactly show which rows are missing, extra and which are different without ordering clause. In the situation where the join key is not unique, join will partition set over rows with a same key and join on row number as well as given join key. The extra rows or missing will be presented to user as well as not matching rows. +The `join_by` syntax enables comparison of unordered cursors by joining cursor data using specified columns. -Join by option can be used in conjunction with include or exclude options. However if any of the join keys is part of exclude set, comparison will fail and report to user that sets could not be joined on specific key (excluded). +You can join two cursors by defining join column(s) that will be used to uniquely identify and compare rows. +With this option, framework is able to identify which rows are missing, which are extra and which are different without need to have both cursors uniformly ordered. +When the specified join column(s) are not unique, join will partition set over rows with the same key and join on row number as well as given join key. +The extra or missing rows will be presented to user as well as all non-matching rows. + +Join by option can be used in conjunction with include or exclude options. +However if any of the join keys is part of exclude set, comparison will fail and report to user that sets could not be joined on specific key, as the key was excluded. ```sql procedure join_by_username is l_actual sys_refcursor; l_expected sys_refcursor; begin - open l_expected for select username, user_id from all_users - union all - select 'TEST' username, -600 user_id from dual - order by 1 desc; - open l_actual for select username, user_id from all_users - union all - select 'TEST' username, -610 user_id from dual - order by 1 asc; + open l_expected for + select username, user_id from all_users + union all + select 'TEST' username, -600 user_id from dual + order by 1 desc; + open l_actual for + select username, user_id from all_users + union all + select 'TEST' username, -610 user_id from dual + order by 1 asc; ut.expect( l_actual ).to_equal( l_expected ).join_by('USERNAME'); end; ``` -This will show you difference in row 'TEST' regardless of order. + +Above test will result in a difference in row 'TEST' regardless of data order. ```sql Rows: [ 1 differences ] @@ -201,25 +205,28 @@ This will show you difference in row 'TEST' regardless of order. PK TEST - Actual: -610 ``` -Assumption is that join by is made by column name so that what will be displayed as part of results. +**Note** -Consider this example using `contain / include ` +> When using `join_by`, the join column(s) are displayed first (as PK) to help you identify the mismatched rows/columns. + +You can use `join_by` extended syntax in combination with `contain / include ` matcher. ```sql procedure join_by_username_cn is l_actual sys_refcursor; l_expected sys_refcursor; begin - open l_actual for select username, user_id from all_users; - open l_expected for select username, user_id from all_users - union all - select 'TEST' username, -610 user_id from dual; + open l_actual for select username, user_id from all_users; + open l_expected for + select username, user_id from all_users + union all + select 'TEST' username, -610 user_id from dual; ut.expect( l_actual ).to_contain( l_expected ).join_by('USERNAME'); end; ``` -This will show you that one value is not included in actual set: +Above test will indicate that in actual data-set ```sql Actual: refcursor [ count = 43 ] was expected to include: refcursor [ count = 44 ] @@ -229,59 +236,120 @@ This will show you that one value is not included in actual set: ``` +### Joining cursors using multiple columns -Join by options currently doesn't support nested table inside cursor comparison, however is still possible to compare a collection as a whole. - -Example. +You can specify multiple columns in `join_by` ```sql - procedure compare_collection_in_rec is +procedure test_join_by_many_columns is l_actual sys_refcursor; l_expected sys_refcursor; - l_actual_tab ut3.ut_annotated_object; - l_expected_tab ut3.ut_annotated_object; - l_expected_message varchar2(32767); - l_actual_message varchar2(32767); - begin - select ut3.ut_annotated_object('TEST','TEST','TEST', - ut3.ut_annotations(ut3.ut_annotation(1,'test','test','test'), - ut3.ut_annotation(2,'test','test','test')) - ) - into l_actual_tab from dual; +begin + open l_expected for + select username, user_id, created from all_users + order by 1 desc; + open l_actual for + select username, user_id, created from all_users + union all + select 'TEST' username, -610 user_id, sysdate from dual + order by 1 asc; + ut.expect( l_actual ).to_equal( l_expected ).join_by('USERNAME, USER_ID'); +end; +``` - select ut3.ut_annotated_object('TEST','TEST','TEST', - ut3.ut_annotations(ut3.ut_annotation(1,'test','test','test'), - ut3.ut_annotation(2,'test','test','test')) - ) - into l_expected_tab from dual; - - --Arrange - open l_actual for select l_actual_tab as nested_table from dual; - - open l_expected for select l_expected_tab as nested_table from dual; - - --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('NESTED_TABLE/ANNOTATIONS'); +### Joining cursors using attributes of object in column list - end; -``` +`join_by` allows for joining cursor data by attributes of object from column list of the compared cursors. + +To reference attribute as PK, use slash symbol `/` to separate nested elements. + +In the below example, cursors are joined using the `NAME` attribute of object in column `SOMEONE` + +```sql +create or replace type person as object( + name varchar2(100), + age integer +) +/ +create or replace type people as table of person +/ + +create or replace package test_join_by is +--%suite + +--%test +procedure test_join_by_object_attribute; + +end; +/ +create or replace package body test_join_by is + procedure test_join_by_object_attribute is + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + open l_expected for + select person('Jack',42) someone from dual union all + select person('Pat', 44) someone from dual union all + select person('Matt',45) someone from dual; + open l_actual for + select person('Matt',55) someone from dual union all + select person('Pat', 44) someone from dual; + ut.expect( l_actual ).to_equal( l_expected ).join_by( 'SOMEONE/NAME' ); + end; +end; +/ -In case when a there is detected collection inside cursor and we cannot join key. Comparison will present a failed joins and also a message about collection being detected. +``` + +**Note** +> `join_by` does not support joining on individual elements of nested table. You can still use data of the nested table as a PK value. +> When collection is referenced in `join_by`, test will fail with appropriate message, as it cannot perform a join. ```sql +create or replace type person as object( + name varchar2(100), + age integer +) +/ +create or replace type people as table of person +/ + +create or replace package test_join_by is +--%suite + +--%test +procedure test_join_by_collection_elem; + +end; +/ + +create or replace package body test_join_by is + procedure test_join_by_collection_elem is + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + open l_expected for select people(person('Matt',45)) persons from dual; + open l_actual for select people(person('Matt',45)) persons from dual; + ut.expect( l_actual ).to_equal( l_expected ).join_by('PERSONS/PERSON/NAME'); + end; + +end; +/ +``` + +``` Actual: refcursor [ count = 1 ] was expected to equal: refcursor [ count = 1 ] Diff: - Unable to join sets: - Join key NESTED_TABLE/ANNOTATIONS/TEXT does not exists in expected - Join key NESTED_TABLE/ANNOTATIONS/TEXT does not exists in actual - Please make sure that your join clause is not refferring to collection element +Unable to join sets: + Join key PERSONS/PERSON/NAME does not exists in expected + Join key PERSONS/PERSON/NAME does not exists in actual + Please make sure that your join clause is not refferring to collection element ``` - - -***Please note that .join_by option will take longer to process due to need of parsing via primary keys.*** +***Note*** +>`join_by` option is slower to process as it needs to perform a cursor join. ## Defining item lists in option XPath expressions are deprecated. They are currently still supported but in future versions they can be removed completely. Please use a current standard of defining items filter. @@ -293,21 +361,13 @@ When using item list expression, keep in mind the following: Example of a valid parameter to include columns: `RN`, `A_Column`, `SOME_COL` in data comparison. ```sql -procedure include_col_list_eq is +procedure include_col_list is l_actual sys_refcursor; l_expected sys_refcursor; begin open l_expected for select rownum as rn, 'a' as "A_Column", 'x' SOME_COL from dual a connect by level < 4; open l_actual for select rownum as rn, 'a' as "A_Column", 'x' SOME_COL, a.* from all_objects a where rownum < 4; ut.expect( l_actual ).to_equal( l_expected ).include( 'RN,A_Column,SOME_COL' ); -end; - -procedure include_col_list_eq is - l_actual sys_refcursor; - l_expected sys_refcursor; -begin - open l_expected for select rownum as rn, 'a' as "A_Column", 'x' SOME_COL from dual a connect by level < 4; - open l_actual for select rownum as rn, 'a' as "A_Column", 'x' SOME_COL, a.* from all_objects a where rownum < 6; - ut.expect( l_actual ).to_include( l_expected ).include( 'RN,A_Column,SOME_COL' ); + ut.expect( l_actual ).to_equal( l_expected ).include( ut_varchar2_list( 'RN', 'A_Column', 'SOME_COL' ) ); end; ``` diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index ebbe13da6..4e8ec7376 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -344,10 +344,14 @@ create or replace package ut_utils authid definer is function get_xml_header(a_encoding varchar2) return varchar2; - /*It takes a collection of type ut_varchar2_list and it trims the characters passed as arguments for every element*/ + /** + * Takes a collection of type ut_varchar2_list and it trims the characters passed as arguments for every element + */ function trim_list_elements(a_list IN ut_varchar2_list, a_regexp_to_trim in varchar2 default '[:space:]') return ut_varchar2_list; - /*It takes a collection of type ut_varchar2_list and it only returns the elements which meets the regular expression*/ + /** + * Takes a collection of type ut_varchar2_list and it only returns the elements which meets the regular expression + */ function filter_list(a_list IN ut_varchar2_list, a_regexp_filter in varchar2) return ut_varchar2_list; -- Generates XMLGEN escaped string diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 89a12b09b..5f4aa3146 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -413,7 +413,7 @@ create or replace package body ut_compound_data_helper is end; function get_rows_diff_by_sql( - a_act_cursor_info ut_cursor_column_tab,a_exp_cursor_info ut_cursor_column_tab, + a_act_cursor_info ut_cursor_column_tab, a_exp_cursor_info ut_cursor_column_tab, a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, a_join_by_list ut_varchar2_list, a_unordered boolean, a_enforce_column_order boolean := false ) return tt_row_diffs is @@ -832,6 +832,7 @@ create or replace package body ut_compound_data_helper is begin g_anytype_name_map(dbms_types.typecode_date) := 'DATE'; g_anytype_name_map(dbms_types.typecode_number) := 'NUMBER'; + g_anytype_name_map(3 /*INTEGER in object type*/) := 'NUMBER'; g_anytype_name_map(dbms_types.typecode_raw) := 'RAW'; g_anytype_name_map(dbms_types.typecode_char) := 'CHAR'; g_anytype_name_map(dbms_types.typecode_varchar2) := 'VARCHAR2'; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 2ac8b99ec..595e6cbd6 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -242,7 +242,8 @@ create or replace type body ut_data_value_refcursor as l_results := ut_utils.t_clob_tab(); if l_diff_row_count > 0 then l_row_diffs := ut_compound_data_helper.get_rows_diff_by_sql( - l_exp_cols,l_act_cols, self.data_id, l_actual.data_id, l_diff_id,a_join_by_list , a_unordered, l_column_order_enforce); + l_exp_cols, l_act_cols, self.data_id, l_actual.data_id, l_diff_id, a_join_by_list , a_unordered, l_column_order_enforce + ); l_message := chr(10) ||'Rows: [ ' || l_diff_row_count ||' differences' || case when l_diff_row_count > c_max_rows and l_row_diffs.count > 0 then ', showing first '||c_max_rows end diff --git a/source/expectations/matchers/ut_equal.tpb b/source/expectations/matchers/ut_equal.tpb index 000d3a10c..48f9b6b37 100644 --- a/source/expectations/matchers/ut_equal.tpb +++ b/source/expectations/matchers/ut_equal.tpb @@ -158,7 +158,7 @@ create or replace type body ut_equal as member function include(a_items varchar2) return ut_equal is l_result ut_equal := self; begin - l_result.include_list := l_result.include_list multiset union coalesce(ut_utils.string_to_table(REPLACE(a_items,'|',','),','),ut_varchar2_list()); + l_result.include_list := l_result.include_list multiset union ut_utils.trim_list_elements(ut_utils.string_to_table(replace(a_items,'|',','),',')); return l_result; end; @@ -167,7 +167,7 @@ create or replace type body ut_equal as l_items ut_varchar2_list := ut_varchar2_list(); begin for i in 1..a_items.count loop - l_items := l_items multiset union all coalesce(ut_utils.string_to_table(REPLACE(a_items(i),'|',','),','),ut_varchar2_list()); + l_items := l_items multiset union all ut_utils.trim_list_elements(ut_utils.string_to_table(replace(a_items(i),'|',','),',')); end loop; l_result.include_list := l_result.include_list multiset union all coalesce(l_items,ut_varchar2_list()); return l_result; @@ -176,7 +176,7 @@ create or replace type body ut_equal as member function exclude(a_items varchar2) return ut_equal is l_result ut_equal := self; begin - l_result.exclude_list := l_result.exclude_list multiset union all coalesce(ut_utils.string_to_table(REPLACE(a_items,'|',','),','),ut_varchar2_list()); + l_result.exclude_list := l_result.exclude_list multiset union all ut_utils.trim_list_elements(ut_utils.string_to_table(replace(a_items,'|',','),',')); return l_result; end; @@ -185,7 +185,7 @@ create or replace type body ut_equal as l_items ut_varchar2_list := ut_varchar2_list(); begin for i in 1..a_items.count loop - l_items := l_items multiset union all coalesce(ut_utils.string_to_table(REPLACE(a_items(i),'|',','),','),ut_varchar2_list()); + l_items := l_items multiset union all ut_utils.trim_list_elements(ut_utils.string_to_table(replace(a_items(i),'|',','),',')); end loop; l_result.exclude_list := l_result.exclude_list multiset union all coalesce(l_items,ut_varchar2_list()); @@ -203,7 +203,7 @@ create or replace type body ut_equal as l_result ut_equal := self; begin l_result.is_unordered := ut_utils.boolean_to_int(true); - l_result.join_columns := l_result.join_columns multiset union all coalesce(ut_utils.string_to_table(REPLACE(a_columns,'|',','),','),ut_varchar2_list()); + l_result.join_columns := l_result.join_columns multiset union all ut_utils.trim_list_elements(ut_utils.string_to_table(replace(a_columns,'|',','),',')); select regexp_replace(column_value,'^((/ROW/)|^(//)|^(/\*/))?(.*)','\5') col_names bulk collect into l_result.join_on_list @@ -218,7 +218,7 @@ create or replace type body ut_equal as l_result.is_unordered := ut_utils.boolean_to_int(true); for i in 1..a_columns.count loop --TODO : idoiot proof solution for both include and exclude - l_items := l_items multiset union all coalesce(ut_utils.string_to_table(REPLACE(a_columns(i),'|',','),','),ut_varchar2_list()); + l_items := l_items multiset union all ut_utils.trim_list_elements(ut_utils.string_to_table(replace(a_columns(i),'|',','),',')); end loop; l_result.join_columns := l_result.join_columns multiset union all coalesce(l_items,ut_varchar2_list()); diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index ea3d50363..09c9d7a88 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -557,7 +557,7 @@ create or replace package body test_expectations_cursor is open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 4; open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).include('RN,//A_Column,SOME_COL'); + ut3.ut.expect(l_actual).to_equal(l_expected).include('RN,//A_Column, SOME_COL'); --Assert ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; @@ -585,7 +585,7 @@ create or replace package body test_expectations_cursor is open l_actual for select rownum as rn, 'c' as A_COLUMN from dual a connect by level < 4; open l_expected for select rownum as rn, 'd' as A_COLUMN from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).include(ut3.ut_varchar2_list('RN','non_existing_column')); + ut3.ut.expect(l_actual).to_equal(l_expected).include(ut3.ut_varchar2_list(' RN ',' non_existing_column ')); --Assert ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; From 97cd07909355705b73c0c3489681836dbdfb2e45 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 12 Feb 2019 22:23:41 +0000 Subject: [PATCH 0220/1096] Improved documentation for `unordered` and `unordered_columns` options. Added more tests to document how things work. --- docs/userguide/advanced_data_comparison.md | 55 ++++- docs/userguide/expectations.md | 35 +-- .../expectations/test_expectations_cursor.pkb | 204 ++++++++++++------ .../expectations/test_expectations_cursor.pks | 21 +- 4 files changed, 212 insertions(+), 103 deletions(-) diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 823f95c12..ce0e053a1 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -27,9 +27,10 @@ Advanced data-comparison options are available for the [`equal`](expectations.md - `exclude(a_items varchar2)` - item or comma separated list of items to exclude - `include(a_items ut_varchar2_list)` - table of items to include - `exclude(a_items ut_varchar2_list)` - table of items to exclude - - `unordered` - perform compare on unordered set of data, return only missing or actual, ***not supported for `include / contain`*** , as alternative `join_by` can be used + - `unordered` - ignore order of data sets when comparing data. Default when comparing data-sets with `to_inclide` / `to_contain` - `join_by(a_columns varchar2)` - column or comma separated list of columns to join two cursors by - `join_by(a_columns ut_varchar2_list)` - table of columns to join two cursors by + - `unordered_columns` / `uc` - ignore the ordering of columns / attributes in compared data-sets. Column/attribute names will be used to identify data to be compared and the position will be ignored. Each item in the comma separated list can be: - a column name of cursor to be compared @@ -163,7 +164,7 @@ Above test will result in two differences of one row extra and one row missing. **Note** -> `include / contain` matcher is not considering order of compared data-sets by default so using `unordered` makes no difference (it's default) +> `include / contain` matcher is not considering order of compared data-sets. Using `unordered` makes no difference (it's default) ## Join By option @@ -371,3 +372,53 @@ begin ut.expect( l_actual ).to_equal( l_expected ).include( ut_varchar2_list( 'RN', 'A_Column', 'SOME_COL' ) ); end; ``` + +## Unordered columns / uc option + +If you need to perform data comparison of cursors without strictly deending on column order in the returned result-set, use the `unordered_columns` option. +Shortcut name `uc` is also available for that option. + +Expectations that compare cursor data with `unordered_Columns` option, will not fail when columns are ordered differently. + +This option can be useful whn we have no control over the ordering of the column or the column order is not of importance from testing perspective. + +```sql +create or replace package test_unordered_columns as + --%suite + + --%test + procedure cursor_include_unordered_cols; +end; +/ + +create or replace package body test_unordered_columns as + + procedure cursor_include_unordered_cols is + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + --Arrange + open l_actual for select owner, object_name,object_type from all_objects where owner = user + order by 1,2,3 asc; + open l_expected for select object_type, owner, object_name from all_objects where owner = user + and rownum < 20; + + --Assert + ut.expect(l_actual).to_include(l_expected).unordered_columns(); + end; +end; +/ + +exec ut.run('test_unordered_columns'); +``` + +The above test is successful despite the fact that column ordering in cursor is different. + +``` +test_unordered_columns + cursor_include_unordered_cols [.042 sec] + +Finished in .046193 seconds +1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s) +``` + diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index a1eb1f1dc..207488554 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -709,38 +709,15 @@ utPLSQL is capable of comparing compound data-types including: - nested table/varray types ### Notes on comparison of compound data -- Compound data can contain elements of any data-type. This includes blob, clob, object type, nested table, varray or even a nested-cursor within a cursor. - -- Attributes in nested table and array types are compared as **ordered lists of elements**. If order of attributes in nested table and array differ, expectation will fail. - -- Columns in cursors are compared as **ordered list of elements** by default. If order of columns in cursor is not of importance the option has to be passed to enforce column order comparison ` unordered_columns` or a short version `uc` e.g. - - ```sql - procedure ut_refcursors1 is - l_actual sys_refcursor; - l_expected sys_refcursor; - l_expected_message varchar2(32767); - l_actual_message varchar2(32767); - begin - open l_actual for select 1 user_id,'s' a_col,'test' username from dual; - open l_expected for select 'test' username,'s' a_col,1 user_id from dual; - --Act - ut.expect(l_actual).to_equal(l_expected).join_by('USER_ID').unordered_columns(); - ut.expect(l_actual).to_equal(l_expected).join_by('USER_ID').uc(); - end; - ``` +- Compound data can contain elements of any data-type. This includes blob, clob, object type, nested table, varray or even a nested-cursor within a cursor. +- Attributes in nested table and array types are compared as **ordered lists of elements**. If order of attributes in nested table and array differ, expectation will fail. +- Columns in cursors are compared as **ordered list of elements** by default. Use `unordered_columns` option when order of columns in cursor is not relevant - Comparison of compound data is data-type aware. So a column `ID NUMBER` in a cursor is not the same as `ID VARCHAR2(100)`, even if they both hold the same numeric values. - - Comparison of cursor columns containing `DATE` will only compare date part **and ignore time** by default. See [Comparing cursor data containing DATE fields](#comparing-cursor-data-containing-date-fields) to check how to enable date-time comparison in cursors. - -- Comparison of cursor returning `TIMESTAMP` **columns** against cursor returning `TIMESTAMP` **bind variables** requires variables to be casted to proper precision. This is an Oracle SQL - PLSQL compatibility issue and usage of CAST is the only known workaround for now. - See [Comparing cursor data containing TIMESTAMP bind variables](#comparing-cursor-data-containing-timestamp-bind-variables) for examples. - +- Comparison of cursor returning `TIMESTAMP` **columns** against cursor returning `TIMESTAMP` **bind variables** requires variables to be casted to proper precision. This is an Oracle SQL - PLSQL compatibility issue and usage of CAST is the only known workaround for now. See [Comparing cursor data containing TIMESTAMP bind variables](#comparing-cursor-data-containing-timestamp-bind-variables) for examples. - To compare nested table/varray type you need to convert it to `anydata` by using `anydata.convertCollection()` - - To compare object type you need to convert it to `anydata` by using `anydata.convertObject()` - - It is possible to compare PL/SQL records, collections, varrays and associative arrays. To compare this types of data, use cursor comparison feature of utPLSQL and TABLE operator in SQL query - On Oracle 11g Release 2 - pipelined table functions are needed (see section [Implicit (Shadow) Types in this artcile](https://oracle-base.com/articles/misc/pipelined-table-functions)) - On Oracle 12c and above - use [TABLE function on nested tables/varrays/associative arrays of PL/SQL records](https://oracle-base.com/articles/12c/using-the-table-operator-with-locally-defined-types-in-plsql-12cr1) @@ -749,7 +726,7 @@ utPLSQL is capable of comparing compound data-types including: utPLSQL offers advanced data-comparison options, for comparing compound data-types. The options allow you to: - define columns/attributes to exclude from comparison - define columns/attributes to include in comparison -- and more +- and more ... For details on available options and how to use them, read the [advanced data comparison](advanced_data_comparison.md) guide. @@ -780,7 +757,7 @@ And the actual cursor data: | M | LUKE | SKYWALKER | 1000 | 2 | -The two datasets above have the following differences: +The two data-sets above have the following differences: - column ID is misplaced (should be first column but is last) - column SALARY has data-type VARCHAR2 but should be NUMBER - column GENDER exists in actual but not in the expected (it is an Extra column) diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index 09c9d7a88..e63494306 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -481,8 +481,8 @@ create or replace package body test_expectations_cursor is procedure exclude_columns_xpath_invalid as - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; l_actual_message varchar2(32767); l_expected_message varchar2(32767); begin @@ -1079,8 +1079,8 @@ Rows: [ 4 differences ] end; procedure col_diff_on_col_name_implicit is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; l_actual_message varchar2(32767); l_expected_message varchar2(32767); begin @@ -1105,8 +1105,8 @@ Rows: [ 4 differences ] end; procedure col_mtch_on_col_name_implicit is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; l_actual_message varchar2(32767); l_expected_message varchar2(32767); begin @@ -1120,8 +1120,8 @@ Rows: [ 4 differences ] end; procedure cursor_unorderd_compr_success is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; begin --Arrange open l_actual for select username , user_id from all_users order by username asc; @@ -1133,8 +1133,8 @@ Rows: [ 4 differences ] end; procedure cursor_unord_compr_success_uc is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; begin --Arrange open l_actual for select user_id, username from all_users order by username asc; @@ -1146,8 +1146,8 @@ Rows: [ 4 differences ] end; procedure cursor_unordered_compare_fail is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; l_actual_message varchar2(32767); l_expected_message varchar2(32767); begin @@ -1174,8 +1174,8 @@ Rows: [ 4 differences ] end; procedure cursor_joinby_compare_uc is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; begin --Arrange open l_actual for select owner, object_id, object_name,object_type from all_objects where owner = user; @@ -1188,8 +1188,8 @@ Rows: [ 4 differences ] end; procedure cursor_joinby_compare is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; begin --Arrange open l_actual for select object_id, owner, object_name,object_type from all_objects where owner = user; @@ -1227,8 +1227,8 @@ Rows: [ 4 differences ] end; procedure cursor_joinby_compare_twocols is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; begin --Arrange open l_actual for select object_id, owner, object_name,object_type from all_objects where owner = user; @@ -1241,8 +1241,8 @@ Rows: [ 4 differences ] end; procedure cursor_joinby_compare_nokey is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; l_actual_message varchar2(32767); l_expected_message varchar2(32767); begin @@ -1264,8 +1264,8 @@ Diff:% end; procedure cur_joinby_comp_twocols_nokey is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; l_actual_message varchar2(32767); l_expected_message varchar2(32767); begin @@ -1289,8 +1289,8 @@ Diff:% end; procedure cursor_joinby_compare_exkey is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; l_actual_message varchar2(32767); l_expected_message varchar2(32767); begin @@ -1312,8 +1312,8 @@ Diff:% end; procedure cur_joinby_comp_twocols_exkey is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; l_actual_message varchar2(32767); l_expected_message varchar2(32767); begin @@ -1335,8 +1335,8 @@ Diff:% end; procedure cursor_joinby_comp_nokey_ex is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; l_actual_message varchar2(32767); l_expected_message varchar2(32767); begin @@ -1357,8 +1357,8 @@ Diff:% end; procedure cursor_joinby_comp_nokey_ac is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; l_actual_message varchar2(32767); l_expected_message varchar2(32767); begin @@ -1379,8 +1379,8 @@ Diff:% end; procedure cursor_joinby_compare_1000 is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; begin --Arrange open l_actual for select level object_id, level || '_TEST' object_name from dual connect by level <=1100; @@ -1392,8 +1392,8 @@ Diff:% end; procedure cursor_unorder_compare_1000 is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; begin --Arrange open l_actual for select level object_id, level || '_TEST' object_name from dual connect by level <=1100; @@ -1405,8 +1405,8 @@ Diff:% end; procedure cursor_joinby_compare_fail is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; l_actual_message varchar2(32767); l_expected_message varchar2(32767); begin @@ -1431,8 +1431,8 @@ Diff:% end; procedure cursor_joinby_cmp_twocol_fail is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; l_actual_message varchar2(32767); l_expected_message varchar2(32767); begin @@ -1457,8 +1457,8 @@ Diff:% end; procedure cur_joinby_cmp_threcol_fail is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; l_actual_message varchar2(32767); l_expected_message varchar2(32767); begin @@ -2161,8 +2161,8 @@ Diff:% end; procedure cursor_to_include is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; begin --Arrange open l_actual for select owner, object_name,object_type from all_objects where owner = user @@ -2175,10 +2175,76 @@ Diff:% --Assert ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; - + + procedure cursor_to_contain_uc is + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + --Arrange + open l_actual for select owner, object_name, object_type from all_objects where owner = user + order by 1,2,3 asc; + open l_expected for select object_type, owner, object_name from all_objects where owner = user + and rownum < 20; + + --Act + ut3.ut.expect(l_actual).to_( ut3.contain(l_expected).uc() ); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure cursor_to_contain_unordered is + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + --Arrange + open l_actual for + select owner, object_name,object_type from all_objects where owner = user + order by 1,2,3 asc; + open l_expected for + select owner, object_name,object_type from all_objects where owner = user and rownum < 20; + + --Act + ut3.ut.expect(l_actual).to_( ut3.contain(l_expected).unordered() ); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure cursor_to_include_unordered is + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + --Arrange + open l_actual for + select owner, object_name,object_type from all_objects where owner = user + order by 1,2,3 asc; + open l_expected for + select owner, object_name,object_type from all_objects where owner = user and rownum < 20; + + --Act + ut3.ut.expect(l_actual).to_( ut3.include(l_expected).unordered() ); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure cursor_to_include_uc is + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + --Arrange + open l_actual for select owner, object_name,object_type from all_objects where owner = user + order by 1,2,3 asc; + open l_expected for select object_type, owner, object_name from all_objects where owner = user + and rownum < 20; + + --Act + ut3.ut.expect(l_actual).to_include(l_expected).uc(); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + procedure cursor_to_include_fail is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; l_expected_message varchar2(32767); l_actual_message varchar2(32767); begin @@ -2205,8 +2271,8 @@ Diff:% end; procedure cursor_to_contain is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; begin --Arrange open l_actual for select owner, object_name,object_type from all_objects where owner = user @@ -2221,8 +2287,8 @@ Diff:% end; procedure cursor_to_contain_fail is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; l_expected_message varchar2(32767); l_actual_message varchar2(32767); begin @@ -2249,8 +2315,8 @@ Diff:% end; procedure cursor_to_include_joinby is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; begin --Arrange open l_actual for select username,user_id from all_users; @@ -2263,8 +2329,8 @@ Diff:% end; procedure cursor_to_include_joinby_fail is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; l_expected_message varchar2(32767); l_actual_message varchar2(32767); begin @@ -2293,8 +2359,8 @@ Diff:% end; procedure cursor_contain_joinby is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; begin --Arrange open l_actual for select username,user_id from all_users; @@ -2307,8 +2373,8 @@ Diff:% end; procedure cursor_contain_joinby_fail is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; l_expected_message varchar2(32767); l_actual_message varchar2(32767); begin @@ -2483,8 +2549,8 @@ Diff:% end; procedure cursor_not_to_contain_fail is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; l_expected_message varchar2(32767); l_actual_message varchar2(32767); begin @@ -2513,8 +2579,8 @@ Diff:% end; procedure cursor_not_to_include_fail is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; l_expected_message varchar2(32767); l_actual_message varchar2(32767); begin @@ -2543,8 +2609,8 @@ Diff:% end; procedure cursor_not_to_contain_joinby is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; begin --Arrange open l_actual for select username,rownum * 10 user_id from all_users where rownum < 5; @@ -2557,8 +2623,8 @@ Diff:% end; procedure cursor_not_to_include_joinby is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; begin --Arrange open l_actual for select username,rownum * 10 user_id from all_users where rownum < 5; @@ -2637,8 +2703,8 @@ Diff:% end; procedure to_include_duplicates is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; begin --Arrange open l_actual for select rownum as rn from dual a connect by level < 10 @@ -2653,8 +2719,8 @@ Diff:% end; procedure to_include_duplicates_fail is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; + l_actual sys_refcursor; + l_expected sys_refcursor; l_expected_message varchar2(32767); l_actual_message varchar2(32767); begin diff --git a/test/core/expectations/test_expectations_cursor.pks b/test/core/expectations/test_expectations_cursor.pks index ea942ddff..54c1451b0 100644 --- a/test/core/expectations/test_expectations_cursor.pks +++ b/test/core/expectations/test_expectations_cursor.pks @@ -347,9 +347,24 @@ create or replace package test_expectations_cursor is procedure cursor_to_include; --%test( Fail cursor contains data from another cursor using second keyword) - procedure cursor_to_contain_fail; - - --%test( Cursor include data from another cursor with joinby) + procedure cursor_to_contain_fail; + + --%test( Success cursor to contain cursor with unordered columns) + procedure cursor_to_contain_uc; + + --%test( Does not fail when comparing cursor to contain cursor with unordered rows option) + procedure cursor_to_contain_unordered; + + --%test( Does not fail when comparing cursor to include cursor with unordered rows option) + procedure cursor_to_include_unordered; + + --%test( Success cursor to include cursor with unordered columns) + procedure cursor_to_include_uc; + + --%test( Cursor contain data from another cursor using second keyword) + procedure cursor_to_contain; + + --%test( Cursor include data from another cursor with joinby) procedure cursor_to_include_joinby; --%test( Fail cursor include data from another cursor with joinby) From 94e58a0cdaf797667ec3cc452998d503be24fec4 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 14 Feb 2019 01:08:01 +0000 Subject: [PATCH 0221/1096] Refactoring - to be continued. Moved some of responsibilities. Created `ut_matcher_config` --- .../create_synonyms_and_grants_for_public.sql | 2 + source/create_user_grants.sql | 3 + .../data_values/ut_compound_data_helper.pkb | 68 ----------- .../data_values/ut_compound_data_helper.pks | 10 +- .../data_values/ut_compound_data_value.tpb | 7 +- .../data_values/ut_data_value_refcursor.tpb | 51 ++++++-- .../data_values/ut_data_value_refcursor.tps | 2 +- source/expectations/matchers/ut_equal.tpb | 114 +++++------------- source/expectations/matchers/ut_equal.tps | 41 +------ source/expectations/matchers/ut_include.tpb | 27 ++--- source/expectations/matchers/ut_include.tps | 1 - .../matchers/ut_matcher_config.tpb | 105 ++++++++++++++++ .../matchers/ut_matcher_config.tps | 66 ++++++++++ .../matchers/ut_matcher_config_items.tpb | 56 +++++++++ .../matchers/ut_matcher_config_items.tps | 29 +++++ source/install.sql | 6 +- source/uninstall_objects.sql | 4 + 17 files changed, 365 insertions(+), 227 deletions(-) create mode 100644 source/expectations/matchers/ut_matcher_config.tpb create mode 100644 source/expectations/matchers/ut_matcher_config.tps create mode 100644 source/expectations/matchers/ut_matcher_config_items.tpb create mode 100644 source/expectations/matchers/ut_matcher_config_items.tps diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index 598d32459..1e378318d 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -104,6 +104,8 @@ grant execute on &&ut3_owner..ut_realtime_reporter to public; grant select, insert, delete, update on &&ut3_owner..dbmspcc_blocks to public; grant select, insert, delete, update on &&ut3_owner..dbmspcc_runs to public; grant select, insert, delete, update on &&ut3_owner..dbmspcc_units to public; +grant execute on &&ut3_owner..ut_matcher_config to public; +grant execute on &&ut3_owner..ut_matcher_config_items to public; prompt Creating synonyms for UTPLSQL objects in &&ut3_owner schema to PUBLIC diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql index c1f249d6a..7580ee2a0 100644 --- a/source/create_user_grants.sql +++ b/source/create_user_grants.sql @@ -123,3 +123,6 @@ grant execute on &&ut3_owner..ut_realtime_reporter to &ut3_user; grant select, insert, delete, update on &&ut3_owner..dbmspcc_blocks to &ut3_user; grant select, insert, delete, update on &&ut3_owner..dbmspcc_runs to &ut3_user; grant select, insert, delete, update on &&ut3_owner..dbmspcc_units to &ut3_user; +grant execute on &&ut3_owner..ut_matcher_config to &ut3_user; +grant execute on &&ut3_owner..ut_matcher_config_items to &ut3_user; + diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 5f4aa3146..20dd31586 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -17,7 +17,6 @@ create or replace package body ut_compound_data_helper is */ g_diff_count integer; - gc_xpath_extract_reg constant varchar2(50) := '^((/ROW/)|^(//)|^(/\*/))?(.*)'; type t_type_name_map is table of varchar2(128) index by binary_integer; g_type_name_map t_type_name_map; g_anytype_name_map t_type_name_map; @@ -630,31 +629,6 @@ create or replace package body ut_compound_data_helper is return g_diff_count; end; - --Filter out columns from cursor based on include (exists) or exclude (not exists) - function filter_out_cols( - a_cursor_info ut_cursor_column_tab, - a_current_list ut_varchar2_list, - a_include boolean := true - ) return ut_cursor_column_tab is - l_result ut_cursor_column_tab := ut_cursor_column_tab(); - l_filter_sql varchar2(32767); - begin - l_filter_sql := - q'[with - coltab as ( - select i.parent_name,i.access_path,i.has_nested_col,i.transformed_name,i.hierarchy_level,i.column_position , - i.xml_valid_name,i.column_name,i.column_type,i.column_type_name ,i.column_schema,i.column_len,i.is_sql_diffable ,i.is_collection - from table(:cursor_info) i), - filter as (select column_value from table(:current_list)) - select ut_cursor_column(i.parent_name,i.access_path,i.has_nested_col,i.transformed_name,i.hierarchy_level,i.column_position , - i.xml_valid_name,i.column_name,i.column_type,i.column_type_name ,i.column_schema,i.column_len,i.is_sql_diffable ,i.is_collection) - from coltab i where ]'||case when a_include then null else ' not ' end - ||q'[exists (select 1 from filter f where regexp_like(i.access_path, '^'||f.column_value||'($|/.*)'))]'; - - execute immediate l_filter_sql bulk collect into l_result using a_cursor_info,a_current_list; - return l_result; - end; - function get_missing_filter_columns(a_cursor_info ut_cursor_column_tab, a_column_filter_list ut_varchar2_list) return ut_varchar2_list is l_result ut_varchar2_list := ut_varchar2_list(); @@ -681,49 +655,7 @@ create or replace package body ut_compound_data_helper is order by type desc,name; return l_missing_pk; end; - - function inc_exc_columns_from_cursor (a_cursor_info ut_cursor_column_tab, a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list) - return ut_cursor_column_tab is - l_filtered_set ut_varchar2_list := ut_varchar2_list(); - l_result ut_cursor_column_tab := ut_cursor_column_tab(); - l_include boolean; - begin - -- if include and exclude is not null its columns from include minus exclude - -- If include is not null and exclude is null cursor will have only include - -- If exclude is not null and include is null cursor will have all except exclude - if a_include_xpath.count > 0 and a_exclude_xpath.count > 0 then - select col_names bulk collect into l_filtered_set - from( - select regexp_replace(column_value,gc_xpath_extract_reg,'\5') col_names - from table(a_include_xpath) - minus - select regexp_replace(column_value,gc_xpath_extract_reg,'\5') col_names - from table(a_exclude_xpath) - ); - l_include := true; - elsif a_include_xpath.count > 0 and a_exclude_xpath.count = 0 then - select regexp_replace(column_value,gc_xpath_extract_reg,'\5') col_names - bulk collect into l_filtered_set - from table(a_include_xpath); - l_include := true; - elsif a_include_xpath.count = 0 and a_exclude_xpath.count > 0 then - select regexp_replace(column_value,gc_xpath_extract_reg,'\5') col_names - bulk collect into l_filtered_set - from table(a_exclude_xpath); - l_include := false; - elsif a_cursor_info is not null then - l_result:= a_cursor_info; - else - l_result := ut_cursor_column_tab(); - end if; - if l_filtered_set.count > 0 then - l_result := filter_out_cols(a_cursor_info,l_filtered_set,l_include); - end if; - - return l_result; - end; - function contains_collection (a_cursor_info ut_cursor_column_tab) return number is l_collection_elements number; diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 79c90f4c5..0c5a08e84 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -125,18 +125,10 @@ create or replace package ut_compound_data_helper authid definer is function get_rows_diff_count return integer; - function filter_out_cols( - a_cursor_info ut_cursor_column_tab, a_current_list ut_varchar2_list,a_include boolean := true - ) return ut_cursor_column_tab; - function get_missing_pk( a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab, a_current_list ut_varchar2_list ) return tt_missing_pk; - - function inc_exc_columns_from_cursor ( - a_cursor_info ut_cursor_column_tab, a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list - ) return ut_cursor_column_tab; - + function contains_collection (a_cursor_info ut_cursor_column_tab) return number; function remove_incomparable_cols( diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index 2d03e93c0..f238d978f 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -193,8 +193,11 @@ create or replace type body ut_compound_data_value as end; member function compare_implementation( - a_other ut_data_value, a_unordered boolean, a_inclusion_compare boolean, - a_is_negated boolean, a_join_by_list ut_varchar2_list := ut_varchar2_list() + a_other ut_data_value, + a_unordered boolean, + a_inclusion_compare boolean, + a_is_negated boolean, + a_join_by_list ut_varchar2_list := ut_varchar2_list() ) return integer is l_diff_id ut_compound_data_helper.t_hash; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 595e6cbd6..ac02959c2 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -277,8 +277,13 @@ create or replace type body ut_data_value_refcursor as return l_result_string; end; - overriding member function compare_implementation(a_other ut_data_value, a_unordered boolean, a_inclusion_compare boolean := false, a_is_negated boolean := false, - a_join_by_list ut_varchar2_list:=ut_varchar2_list()) return integer is + overriding member function compare_implementation( + a_other ut_data_value, + a_unordered boolean, + a_inclusion_compare boolean := false, + a_is_negated boolean := false, + a_join_by_list ut_varchar2_list := ut_varchar2_list() + ) return integer is l_result integer := 0; l_actual ut_data_value_refcursor; l_pk_missing_tab ut_compound_data_helper.tt_missing_pk; @@ -299,8 +304,10 @@ create or replace type body ut_data_value_refcursor as if (self.cursor_details is not null and l_actual.cursor_details is not null) and (self.cursor_details != l_actual.cursor_details) then l_result := 1; end if; - l_result := l_result + (self as ut_compound_data_value).compare_implementation(a_other,a_unordered, a_inclusion_compare, - a_is_negated, a_join_by_list); + l_result := l_result + + (self as ut_compound_data_value).compare_implementation( + a_other,a_unordered, a_inclusion_compare, a_is_negated, a_join_by_list + ); end if; return l_result; @@ -311,12 +318,38 @@ create or replace type body ut_data_value_refcursor as return self.elements_count = 0; end; - member function update_cursor_details (a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list,a_ordered_columns boolean := false) return ut_data_value_refcursor is - l_result ut_data_value_refcursor := self; - begin + member function update_cursor_details (a_match_options ut_matcher_config) return ut_data_value_refcursor is + l_result ut_data_value_refcursor := self; + c_xpath_extract_reg constant varchar2(50) := '^((/ROW/)|^(//)|^(/\*/))?(.*)'; + begin if l_result.cursor_details.cursor_columns_info is not null then - l_result.cursor_details.cursor_columns_info := ut_compound_data_helper.inc_exc_columns_from_cursor(l_result.cursor_details.cursor_columns_info,a_exclude_xpath,a_include_xpath); - l_result.cursor_details.ordered_columns(a_ordered_columns); + if a_match_options.include().count > 0 then + with included_columns as ( + select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names + from table(a_match_options.include()) + minus + select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names + from table(a_match_options.exclude()) + ) + select value(x) + bulk collect into l_result.cursor_details.cursor_columns_info + from table(self.cursor_details.cursor_columns_info) x + where exists( + select 1 from included_columns f where regexp_like( x.access_path, '^'||f.col_names||'($|/.*)' ) + ); + elsif a_match_options.exclude().count > 0 then + with excluded_columns as ( + select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names + from table(a_match_options.exclude()) + ) + select value(x) + bulk collect into l_result.cursor_details.cursor_columns_info + from table(self.cursor_details.cursor_columns_info) x + where not exists( + select 1 from excluded_columns f where regexp_like( x.access_path, '^'||f.col_names||'($|/.*)' ) + ); + end if; + l_result.cursor_details.ordered_columns(a_match_options.ordered_columns()); end if; return l_result; end; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tps b/source/expectations/data_values/ut_data_value_refcursor.tps index d8fb2c891..591e2576b 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tps +++ b/source/expectations/data_values/ut_data_value_refcursor.tps @@ -38,6 +38,6 @@ create or replace type ut_data_value_refcursor under ut_compound_data_value( overriding member function compare_implementation(a_other ut_data_value, a_unordered boolean, a_inclusion_compare boolean := false, a_is_negated boolean := false, a_join_by_list ut_varchar2_list:=ut_varchar2_list()) return integer, overriding member function is_empty return boolean, - member function update_cursor_details (a_exclude_xpath ut_varchar2_list, a_include_xpath ut_varchar2_list,a_ordered_columns boolean := false) return ut_data_value_refcursor + member function update_cursor_details ( a_match_options ut_matcher_config ) return ut_data_value_refcursor ) / diff --git a/source/expectations/matchers/ut_equal.tpb b/source/expectations/matchers/ut_equal.tpb index 48f9b6b37..8f29a2ebf 100644 --- a/source/expectations/matchers/ut_equal.tpb +++ b/source/expectations/matchers/ut_equal.tpb @@ -16,20 +16,17 @@ create or replace type body ut_equal as limitations under the License. */ - member procedure init(self in out nocopy ut_equal, a_expected ut_data_value, a_nulls_are_equal boolean) is + member procedure init(self in out nocopy ut_equal, a_expected ut_data_value, a_nulls_are_equal boolean, a_self_type varchar2 := null) is begin - self.nulls_are_equal_flag := ut_utils.boolean_to_int( coalesce(a_nulls_are_equal, ut_expectation_processor.nulls_are_equal()) ); - self.self_type := $$plsql_unit; self.expected := a_expected; - self.include_list := ut_varchar2_list(); - self.exclude_list := ut_varchar2_list(); - self.join_columns := ut_varchar2_list(); + self.options := ut_matcher_config( a_nulls_are_equal ); + self.self_type := nvl( a_self_type, $$plsql_unit ); end; member function equal_with_nulls(a_assert_result boolean, a_actual ut_data_value) return boolean is begin ut_utils.debug_log('ut_equal.equal_with_nulls :' || ut_utils.to_test_result(a_assert_result) || ':'); - return ( a_assert_result or ( self.expected.is_null() and a_actual.is_null() and ut_utils.int_to_boolean( nulls_are_equal_flag ) ) ); + return ( a_assert_result or ( self.expected.is_null() and a_actual.is_null() and options.nulls_are_equal ) ); end; constructor function ut_equal(self in out nocopy ut_equal, a_expected anydata, a_nulls_are_equal boolean := null) return self as result is @@ -46,7 +43,7 @@ create or replace type body ut_equal as 'equal( a_expected anydata ).exclude( a_exclude varchar2 )' ); init(ut_data_value_anydata.get_instance(a_expected), a_nulls_are_equal); - exclude_list := ut_varchar2_list(a_exclude); + self.options.exclude(a_exclude); return; end; @@ -57,7 +54,7 @@ create or replace type body ut_equal as 'equal( a_expected anydata ).exclude( a_exclude ut_varchar2_list )' ); init(ut_data_value_anydata.get_instance(a_expected), a_nulls_are_equal); - exclude_list := coalesce(a_exclude, ut_varchar2_list()); + self.options.exclude(a_exclude); return; end; @@ -104,7 +101,7 @@ create or replace type body ut_equal as 'equal( a_expected sys_refcursor ).exclude( a_exclude varchar2 )' ); init(ut_data_value_refcursor(a_expected), a_nulls_are_equal); - exclude_list := ut_varchar2_list(a_exclude); + self.options.exclude(a_exclude); return; end; @@ -115,7 +112,7 @@ create or replace type body ut_equal as 'equal( a_expected sys_refcursor ).exclude( a_exclude ut_varchar2_list )' ); init(ut_data_value_refcursor(a_expected), a_nulls_are_equal); - exclude_list := coalesce(a_exclude, ut_varchar2_list()); + self.options.exclude(a_exclude); return; end; @@ -158,102 +155,54 @@ create or replace type body ut_equal as member function include(a_items varchar2) return ut_equal is l_result ut_equal := self; begin - l_result.include_list := l_result.include_list multiset union ut_utils.trim_list_elements(ut_utils.string_to_table(replace(a_items,'|',','),',')); + l_result.options.include(a_items); return l_result; end; member function include(a_items ut_varchar2_list) return ut_equal is l_result ut_equal := self; - l_items ut_varchar2_list := ut_varchar2_list(); begin - for i in 1..a_items.count loop - l_items := l_items multiset union all ut_utils.trim_list_elements(ut_utils.string_to_table(replace(a_items(i),'|',','),',')); - end loop; - l_result.include_list := l_result.include_list multiset union all coalesce(l_items,ut_varchar2_list()); + l_result.options.include(a_items); return l_result; end; member function exclude(a_items varchar2) return ut_equal is l_result ut_equal := self; begin - l_result.exclude_list := l_result.exclude_list multiset union all ut_utils.trim_list_elements(ut_utils.string_to_table(replace(a_items,'|',','),',')); + l_result.options.exclude(a_items); return l_result; end; member function exclude(a_items ut_varchar2_list) return ut_equal is l_result ut_equal := self; - l_items ut_varchar2_list := ut_varchar2_list(); begin - for i in 1..a_items.count loop - l_items := l_items multiset union all ut_utils.trim_list_elements(ut_utils.string_to_table(replace(a_items(i),'|',','),',')); - end loop; - - l_result.exclude_list := l_result.exclude_list multiset union all coalesce(l_items,ut_varchar2_list()); + l_result.options.exclude(a_items); return l_result; end; member function unordered return ut_equal is l_result ut_equal := self; begin - l_result.is_unordered := ut_utils.boolean_to_int(true); + l_result.options.unordered(); return l_result; end; member function join_by(a_columns varchar2) return ut_equal is l_result ut_equal := self; begin - l_result.is_unordered := ut_utils.boolean_to_int(true); - l_result.join_columns := l_result.join_columns multiset union all ut_utils.trim_list_elements(ut_utils.string_to_table(replace(a_columns,'|',','),',')); - - select regexp_replace(column_value,'^((/ROW/)|^(//)|^(/\*/))?(.*)','\5') col_names - bulk collect into l_result.join_on_list - from table(l_result.join_columns); + l_result.options.unordered(); + l_result.options.join_by(a_columns); return l_result; end; member function join_by(a_columns ut_varchar2_list) return ut_equal is l_result ut_equal := self; - l_items ut_varchar2_list := ut_varchar2_list(); begin - l_result.is_unordered := ut_utils.boolean_to_int(true); - for i in 1..a_columns.count loop - --TODO : idoiot proof solution for both include and exclude - l_items := l_items multiset union all ut_utils.trim_list_elements(ut_utils.string_to_table(replace(a_columns(i),'|',','),',')); - end loop; - l_result.join_columns := l_result.join_columns multiset union all coalesce(l_items,ut_varchar2_list()); - - select regexp_replace(column_value,'^((/ROW/)|^(//)|^(/\*/))?(.*)','\5') col_names - bulk collect into l_result.join_on_list - from table(l_result.join_columns); - + l_result.options.unordered(); + l_result.options.join_by(a_columns); return l_result; end; - member function get_include_xpath return varchar2 is - begin - return ut_utils.to_xpath( coalesce(include_list, ut_varchar2_list()) ); - end; - - member function get_exclude_xpath return varchar2 is - begin - return ut_utils.to_xpath( coalesce(exclude_list, ut_varchar2_list()) ); - end; - - member function get_unordered return boolean is - begin - return ut_utils.int_to_boolean(nvl(is_unordered,0)); - end; - - member function get_join_by_xpath return varchar2 is - begin - return ut_utils.to_xpath( coalesce(join_columns, ut_varchar2_list()) ); - end; - - member function get_join_by_list return ut_varchar2_list is - begin - return ( coalesce(join_columns, ut_varchar2_list()) ); - end; - member function uc return ut_equal is begin return unordered_columns; @@ -262,25 +211,23 @@ create or replace type body ut_equal as member function unordered_columns return ut_equal is l_result ut_equal := self; begin - l_result.is_column_order_enforced := ut_utils.boolean_to_int(false); + l_result.options.unordered_columns(); return l_result; end; - - member function get_ordered_columns return boolean is - begin - return ut_utils.int_to_boolean(nvl(is_column_order_enforced,1)); - end; - + overriding member function run_matcher(self in out nocopy ut_equal, a_actual ut_data_value) return boolean is l_result boolean; l_actual ut_data_value; begin if self.expected.data_type = a_actual.data_type then if self.expected is of (ut_data_value_anydata) then - l_result := 0 = treat(self.expected as ut_data_value_anydata).compare_implementation(a_actual, get_exclude_xpath(), get_include_xpath()); + l_result := 0 = treat(self.expected as ut_data_value_anydata).compare_implementation(a_actual, options.exclude_list.to_xpath(), options.include_list.to_xpath()); elsif self.expected is of (ut_data_value_refcursor) then - l_actual := treat(a_actual as ut_data_value_refcursor).update_cursor_details(exclude_list, include_list,get_ordered_columns()); - l_result := 0 = treat(self.expected as ut_data_value_refcursor).update_cursor_details(exclude_list, include_list,get_ordered_columns()).compare_implementation(l_actual, get_unordered(), false, false, get_join_by_list()); + l_actual := treat(a_actual as ut_data_value_refcursor).update_cursor_details( options ); + l_result := 0 = treat(self.expected as ut_data_value_refcursor).update_cursor_details( options ) + .compare_implementation( + l_actual, options.unordered(), false, false, options.join_by() + ); else l_result := equal_with_nulls((self.expected = a_actual), a_actual); end if; @@ -297,14 +244,19 @@ create or replace type body ut_equal as begin if self.expected.data_type = a_actual.data_type and self.expected.is_diffable then if self.expected is of (ut_data_value_refcursor) then - l_actual := treat(a_actual as ut_data_value_refcursor).update_cursor_details(exclude_list, include_list,get_ordered_columns()); + l_actual := treat(a_actual as ut_data_value_refcursor).update_cursor_details( options ); l_result := 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() - || chr(10) || 'Diff:' || treat(expected as ut_data_value_refcursor).update_cursor_details(exclude_list, include_list,get_ordered_columns()).diff(l_actual, get_unordered(),get_join_by_list()); + || chr(10) || 'Diff:' || + treat(expected as ut_data_value_refcursor).update_cursor_details( options ) + .diff( l_actual, options.unordered(), options.join_by() ); else l_result := 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() - || chr(10) || 'Diff:' || expected.diff(a_actual, get_exclude_xpath(), get_include_xpath(), get_join_by_xpath(), get_unordered()); + || chr(10) || 'Diff:' || + expected.diff( + a_actual, options.exclude_list.to_xpath(), options.include_list.to_xpath(), options.join_by_list.to_xpath(), options.unordered() + ); end if; else l_result := (self as ut_matcher).failure_message(a_actual) || ': '|| self.expected.to_string_report(); diff --git a/source/expectations/matchers/ut_equal.tps b/source/expectations/matchers/ut_equal.tps index 3a065d7c0..fa6215b55 100644 --- a/source/expectations/matchers/ut_equal.tps +++ b/source/expectations/matchers/ut_equal.tps @@ -15,39 +15,14 @@ create or replace type ut_equal force under ut_comparison_matcher( See the License for the specific language governing permissions and limitations under the License. */ - nulls_are_equal_flag number(1,0), - /** - * Holds (list of columns/attributes) to exclude when comparing compound types - */ - exclude_list ut_varchar2_list, - /** - * Holds (list of columns/attributes) to incude when comparing compound types - */ - include_list ut_varchar2_list, - - /** - * Holds value if comparision on refcursor to be performed as unordered set - */ - is_unordered number(1,0), /** - * Holds list of columns to be used as a join PK on sys_refcursor comparision - */ - join_columns ut_varchar2_list, - - /** - * Holds list of columns to be used as a join PK on sys_refcursor comparision, prefiltered to remvoe - * xpath tag from from - */ - join_on_list ut_varchar2_list, - - /** - * Flag to force cursor comparision into ordered mode + * Holds information about mather options */ - is_column_order_enforced number(1,0), - - member procedure init(self in out nocopy ut_equal, a_expected ut_data_value, a_nulls_are_equal boolean), + options ut_matcher_config, + + member procedure init(self in out nocopy ut_equal, a_expected ut_data_value, a_nulls_are_equal boolean, a_self_type varchar2 := null), member function equal_with_nulls( self in ut_equal, a_assert_result boolean, a_actual ut_data_value) return boolean, constructor function ut_equal(self in out nocopy ut_equal, a_expected anydata, a_nulls_are_equal boolean := null) return self as result, constructor function ut_equal(self in out nocopy ut_equal, a_expected anydata, a_exclude varchar2, a_nulls_are_equal boolean := null) return self as result, @@ -73,17 +48,11 @@ create or replace type ut_equal force under ut_comparison_matcher( member function unordered return ut_equal, member function join_by(a_columns varchar2) return ut_equal, member function join_by(a_columns ut_varchar2_list) return ut_equal, - member function get_include_xpath return varchar2, - member function get_exclude_xpath return varchar2, - member function get_unordered return boolean, - member function get_join_by_xpath return varchar2, - member function get_join_by_list return ut_varchar2_list, overriding member function run_matcher(self in out nocopy ut_equal, a_actual ut_data_value) return boolean, overriding member function failure_message(a_actual ut_data_value) return varchar2, overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2, member function unordered_columns return ut_equal, - member function uc return ut_equal, - member function get_ordered_columns return boolean + member function uc return ut_equal ) not final / diff --git a/source/expectations/matchers/ut_include.tpb b/source/expectations/matchers/ut_include.tpb index dbf014eb8..147c1d761 100644 --- a/source/expectations/matchers/ut_include.tpb +++ b/source/expectations/matchers/ut_include.tpb @@ -16,18 +16,10 @@ create or replace type body ut_include as limitations under the License. */ - member procedure init(self in out nocopy ut_include, a_expected ut_data_value) is - begin - self.self_type := $$plsql_unit; - self.expected := a_expected; - self.include_list := ut_varchar2_list(); - self.exclude_list := ut_varchar2_list(); - self.join_columns := ut_varchar2_list(); - end; - constructor function ut_include(self in out nocopy ut_include, a_expected sys_refcursor) return self as result is begin - init(ut_data_value_refcursor(a_expected)); + self.init(ut_data_value_refcursor(a_expected), null, $$plsql_unit); + self.options.unordered(); return; end; @@ -54,13 +46,12 @@ create or replace type body ut_include as l_result1 integer; begin if self.expected.data_type = a_actual.data_type then - l_actual := treat(a_actual as ut_data_value_refcursor).update_cursor_details(exclude_list, include_list,self.get_ordered_columns()); + l_actual := treat(a_actual as ut_data_value_refcursor).update_cursor_details( self.options ); l_result := ( 0 - = treat( self.expected as ut_data_value_refcursor ).update_cursor_details( - exclude_list, include_list, self.get_ordered_columns( ) - ).compare_implementation( - l_actual, true, self.get_inclusion_compare( ), self.get_negated( ), self.get_join_by_list( ) + = treat( self.expected as ut_data_value_refcursor ).update_cursor_details( self.options ) + .compare_implementation( + l_actual, self.options.unordered(), get_inclusion_compare( ), get_negated( ), options.join_by( ) ) ); else @@ -79,13 +70,11 @@ create or replace type body ut_include as l_actual ut_data_value; begin if self.expected.data_type = a_actual.data_type and self.expected.is_diffable then - l_actual := treat(a_actual as ut_data_value_refcursor).update_cursor_details(exclude_list, include_list,self.get_ordered_columns()); + l_actual := treat(a_actual as ut_data_value_refcursor).update_cursor_details( self.options ); l_result := 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() || chr(10) || 'Diff:' - || treat(expected as ut_data_value_refcursor).update_cursor_details( - exclude_list, include_list, self.get_ordered_columns() - ).diff(l_actual, true, self.get_join_by_list()); + || treat(expected as ut_data_value_refcursor).update_cursor_details( self.options ).diff(l_actual, self.options.unordered(), self.options.join_by()); else l_result := (self as ut_matcher).failure_message(a_actual) || ': '|| self.expected.to_string_report(); end if; diff --git a/source/expectations/matchers/ut_include.tps b/source/expectations/matchers/ut_include.tps index b0e8a4bd3..bad9c2a5f 100644 --- a/source/expectations/matchers/ut_include.tps +++ b/source/expectations/matchers/ut_include.tps @@ -24,7 +24,6 @@ create or replace type ut_include under ut_equal( */ is_negated number(1,0), - member procedure init(self in out nocopy ut_include, a_expected ut_data_value), constructor function ut_include(self in out nocopy ut_include, a_expected sys_refcursor) return self as result, member function get_inclusion_compare return boolean, member function negated return ut_include, diff --git a/source/expectations/matchers/ut_matcher_config.tpb b/source/expectations/matchers/ut_matcher_config.tpb new file mode 100644 index 000000000..177fb6055 --- /dev/null +++ b/source/expectations/matchers/ut_matcher_config.tpb @@ -0,0 +1,105 @@ +create or replace type body ut_matcher_config as + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + constructor function ut_matcher_config(self in out nocopy ut_matcher_config, a_nulls_are_equal in boolean := null) return self as result is + begin + nulls_are_equal_flag := ut_utils.boolean_to_int( coalesce(a_nulls_are_equal, ut_expectation_processor.nulls_are_equal()) ); + is_unordered := ut_utils.boolean_to_int(false); + columns_are_unordered_flag := ut_utils.boolean_to_int(false); + include_list := ut_matcher_config_items(); + exclude_list := ut_matcher_config_items(); + join_by_list := ut_matcher_config_items(); + return; + end; + + member procedure nulls_are_equal(self in out nocopy ut_matcher_config) is + begin + self.nulls_are_equal_flag := ut_utils.boolean_to_int(true); + end; + + member function nulls_are_equal return boolean is + begin + return ut_utils.int_to_boolean(self.nulls_are_equal_flag); + end; + + member procedure include(self in out nocopy ut_matcher_config, a_include varchar2) is + begin + include_list.add_items(a_include); + end; + + member procedure include(self in out nocopy ut_matcher_config, a_include ut_varchar2_list) is + begin + include_list.add_items(a_include); + end; + + member function include return ut_varchar2_list is + begin + return include_list.items; + end; + + member procedure exclude(self in out nocopy ut_matcher_config, a_exclude varchar2) is + begin + exclude_list.add_items(a_exclude); + end; + + member procedure exclude(self in out nocopy ut_matcher_config, a_exclude ut_varchar2_list) is + begin + exclude_list.add_items(a_exclude); + end; + + member function exclude return ut_varchar2_list is + begin + return exclude_list.items; + end; + + member procedure join_by(self in out nocopy ut_matcher_config, a_join_by varchar2) is + begin + join_by_list.add_items(a_join_by); + end; + + member procedure join_by(self in out nocopy ut_matcher_config, a_join_by ut_varchar2_list) is + begin + join_by_list.add_items(a_join_by); + end; + + member function join_by return ut_varchar2_list is + begin + return join_by_list.items; + end; + + member procedure unordered_columns(self in out nocopy ut_matcher_config) is + begin + columns_are_unordered_flag := ut_utils.boolean_to_int(true); + end; + + member function ordered_columns return boolean is + begin + return not ut_utils.int_to_boolean(columns_are_unordered_flag); + end; + + member procedure unordered(self in out nocopy ut_matcher_config) is + begin + is_unordered := ut_utils.boolean_to_int(true); + end; + + member function unordered return boolean is + begin + return ut_utils.int_to_boolean(is_unordered); + end; +end; +/ diff --git a/source/expectations/matchers/ut_matcher_config.tps b/source/expectations/matchers/ut_matcher_config.tps new file mode 100644 index 000000000..4ff15a062 --- /dev/null +++ b/source/expectations/matchers/ut_matcher_config.tps @@ -0,0 +1,66 @@ +create or replace type ut_matcher_config authid current_user as object( + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + /** + * Flag to force cursor comparision into ordered mode + */ + columns_are_unordered_flag number(1,0), + + /** + * Flag indicating that order of elements is to be ignored + */ + is_unordered number(1,0), + + /** + * Flag determining how to react to null values + */ + nulls_are_equal_flag number(1,0), + + /** + * Holds (list of columns/attributes) to exclude when comparing compound types + */ + exclude_list ut_matcher_config_items, + + /** + * Holds (list of columns/attributes) to incude when comparing compound types + */ + include_list ut_matcher_config_items, + + /** + * Holds list of columns to be used as a join PK on sys_refcursor comparision + */ + join_by_list ut_matcher_config_items, + + constructor function ut_matcher_config(self in out nocopy ut_matcher_config, a_nulls_are_equal in boolean := null) return self as result, + member procedure nulls_are_equal(self in out nocopy ut_matcher_config), + member function nulls_are_equal return boolean, + member procedure include(self in out nocopy ut_matcher_config, a_include varchar2), + member procedure include(self in out nocopy ut_matcher_config, a_include ut_varchar2_list), + member function include return ut_varchar2_list, + member procedure exclude(self in out nocopy ut_matcher_config, a_exclude varchar2), + member procedure exclude(self in out nocopy ut_matcher_config, a_exclude ut_varchar2_list), + member function exclude return ut_varchar2_list, + member procedure join_by(self in out nocopy ut_matcher_config, a_join_by varchar2), + member procedure join_by(self in out nocopy ut_matcher_config, a_join_by ut_varchar2_list), + member function join_by return ut_varchar2_list, + member procedure unordered_columns(self in out nocopy ut_matcher_config), + member function ordered_columns return boolean, + member procedure unordered(self in out nocopy ut_matcher_config), + member function unordered return boolean +) +/ diff --git a/source/expectations/matchers/ut_matcher_config_items.tpb b/source/expectations/matchers/ut_matcher_config_items.tpb new file mode 100644 index 000000000..044cd59a1 --- /dev/null +++ b/source/expectations/matchers/ut_matcher_config_items.tpb @@ -0,0 +1,56 @@ +create or replace type body ut_matcher_config_items is + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + constructor function ut_matcher_config_items(self in out nocopy ut_matcher_config_items) return self as result is + begin + items := ut_varchar2_list(); + return; + end; + + member procedure add_items(self in out nocopy ut_matcher_config_items, a_items varchar2) is + begin + items := + items + multiset union all + ut_utils.filter_list( + ut_utils.trim_list_elements( + ut_utils.string_to_table( replace( a_items , '|', ',' ), ',' ) + ) + , '.+' + ); + end; + + member procedure add_items(self in out nocopy ut_matcher_config_items, a_items ut_varchar2_list) is + l_idx binary_integer; + begin + if a_items is not null then + l_idx := a_items.first; + while l_idx is not null loop + add_items( a_items(l_idx) ); + l_idx := a_items.next(l_idx); + end loop; + end if; + end; + + member function to_xpath return varchar2 is + begin + return ut_utils.to_xpath(items); + end; + +end; +/ \ No newline at end of file diff --git a/source/expectations/matchers/ut_matcher_config_items.tps b/source/expectations/matchers/ut_matcher_config_items.tps new file mode 100644 index 000000000..8aa665fcd --- /dev/null +++ b/source/expectations/matchers/ut_matcher_config_items.tps @@ -0,0 +1,29 @@ +create or replace type ut_matcher_config_items authid current_user as object( + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + /** + * Attributes / columns list + */ + items ut_varchar2_list, + + constructor function ut_matcher_config_items(self in out nocopy ut_matcher_config_items) return self as result, + member procedure add_items(self in out nocopy ut_matcher_config_items, a_items varchar2), + member procedure add_items(self in out nocopy ut_matcher_config_items, a_items ut_varchar2_list), + member function to_xpath return varchar2 +) +/ diff --git a/source/install.sql b/source/install.sql index a8e64e46d..42dd23dd3 100644 --- a/source/install.sql +++ b/source/install.sql @@ -95,7 +95,7 @@ alter session set current_schema = &&ut3_owner; @@install_component.sql 'core/types/ut_output_reporter_base.tps' ---annoations +--annotations @@install_component.sql 'core/annotations/ut_annotation.tps' @@install_component.sql 'core/annotations/ut_annotations.tps' @@install_component.sql 'core/annotations/ut_annotated_object.tps' @@ -203,6 +203,8 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/data_values/ut_key_anyval_pair.tps' @@install_component.sql 'expectations/data_values/ut_key_anyval_pairs.tps' @@install_component.sql 'expectations/data_values/ut_compound_data_helper.pks' +@@install_component.sql 'expectations/matchers/ut_matcher_config_items.tps' +@@install_component.sql 'expectations/matchers/ut_matcher_config.tps' @@install_component.sql 'expectations/matchers/ut_matcher.tps' @@install_component.sql 'expectations/matchers/ut_comparison_matcher.tps' @@install_component.sql 'expectations/matchers/ut_be_false.tps' @@ -244,6 +246,8 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/data_values/ut_data_value_varchar2.tpb' @@install_component.sql 'expectations/data_values/ut_data_value_yminterval.tpb' @@install_component.sql 'expectations/data_values/ut_data_value_xmltype.tpb' +@@install_component.sql 'expectations/matchers/ut_matcher_config_items.tpb' +@@install_component.sql 'expectations/matchers/ut_matcher_config.tpb' @@install_component.sql 'expectations/matchers/ut_matcher.tpb' @@install_component.sql 'expectations/matchers/ut_comparison_matcher.tpb' @@install_component.sql 'expectations/matchers/ut_be_false.tpb' diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index 94e2f3f05..2c3425617 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -117,6 +117,10 @@ drop type ut_comparison_matcher force; drop type ut_matcher force; +drop type ut_matcher_config force; + +drop type ut_matcher_config_items force; + drop type ut_data_value_yminterval force; drop type ut_data_value_varchar2 force; From 08ed9abef02e2d98c1a0394edc6139e3746263f8 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 15 Feb 2019 02:10:48 +0000 Subject: [PATCH 0222/1096] Refactoring - to be continued. --- source/core/ut_metadata.pkb | 75 ++++++ source/core/ut_metadata.pks | 50 ++++ .../create_synonyms_and_grants_for_public.sql | 4 +- source/create_user_grants.sql | 4 +- .../data_values/ut_compound_data_helper.pkb | 100 +------- .../data_values/ut_compound_data_helper.pks | 47 ---- .../data_values/ut_compound_data_value.tpb | 81 ++----- .../data_values/ut_compound_data_value.tps | 8 +- .../data_values/ut_cursor_details.tpb | 63 ++--- .../data_values/ut_cursor_details.tps | 12 +- .../data_values/ut_data_value.tpb | 2 +- .../data_values/ut_data_value.tps | 2 +- .../data_values/ut_data_value_refcursor.tpb | 219 +++++++++++------- .../data_values/ut_data_value_refcursor.tps | 12 +- source/expectations/matchers/ut_equal.tpb | 34 ++- source/expectations/matchers/ut_equal.tps | 2 +- source/expectations/matchers/ut_include.tpb | 6 +- ...cher_config.tpb => ut_matcher_options.tpb} | 61 +---- ...cher_config.tps => ut_matcher_options.tps} | 29 +-- ...items.tpb => ut_matcher_options_items.tpb} | 8 +- ...items.tps => ut_matcher_options_items.tps} | 8 +- source/install.sql | 9 +- source/uninstall_objects.sql | 8 +- 23 files changed, 377 insertions(+), 467 deletions(-) rename source/expectations/matchers/{ut_matcher_config.tpb => ut_matcher_options.tpb} (50%) rename source/expectations/matchers/{ut_matcher_config.tps => ut_matcher_options.tps} (52%) rename source/expectations/matchers/{ut_matcher_config_items.tpb => ut_matcher_options_items.tpb} (77%) rename source/expectations/matchers/{ut_matcher_config_items.tps => ut_matcher_options_items.tps} (65%) diff --git a/source/core/ut_metadata.pkb b/source/core/ut_metadata.pkb index b3b6bbdea..7619c316b 100644 --- a/source/core/ut_metadata.pkb +++ b/source/core/ut_metadata.pkb @@ -189,5 +189,80 @@ create or replace package body ut_metadata as return l_cnt > 0; end; + function is_collection (a_anytype_code in integer) return boolean is + begin + return coalesce(a_anytype_code in (dbms_types.typecode_varray,dbms_types.typecode_table,dbms_types.typecode_namedcollection),false); + end; + + function is_collection (a_owner varchar2, a_type_name varchar2) return boolean is + begin + return is_collection( + get_anytype_members_info( + get_user_defined_type(a_owner, a_type_name) + ).type_code + ); + end; + + function get_attr_elem_info( a_anytype anytype, a_pos pls_integer := null ) + return t_anytype_elem_info_rec is + l_result t_anytype_elem_info_rec; + begin + if a_anytype is not null then + l_result.type_code := a_anytype.getattreleminfo( + pos => a_pos, + prec => l_result.precision, + scale => l_result.scale, + len => l_result.length, + csid => l_result.char_set_id, + csfrm => l_result.char_set_frm, + attr_elt_type => l_result.attr_elt_type, + aname => l_result.attribute_name + ); + end if; + return l_result; + end; + + function get_anytype_members_info( a_anytype anytype ) + return t_anytype_members_rec is + l_result t_anytype_members_rec; + begin + if a_anytype is not null then + l_result.type_code := a_anytype.getinfo( + prec => l_result.precision, + scale => l_result.scale, + len => l_result.length, + csid => l_result.char_set_id, + csfrm => l_result.char_set_frm, + schema_name => l_result.schema_name, + type_name => l_result.type_name, + version => l_result.version, + numelems => l_result.elements_count + ); + end if; + return l_result; + end; + + function get_user_defined_type(a_owner varchar2, a_type_name varchar2) return anytype is + l_anytype anytype; + not_found exception; + pragma exception_init(not_found,-22303); + begin + if a_type_name is not null then + begin + if ut_metadata.is_object_visible('GETANYTYPEFROMPERSISTENT') then + execute immediate 'begin :l_anytype := getanytypefrompersistent( :a_owner, :a_type_name ); end;' + using out l_anytype, in nvl(a_owner,sys_context('userenv','current_schema')), in a_type_name; + else + execute immediate 'begin :l_anytype := anytype.getpersistent( :a_owner, :a_type_name ); end;' + using out l_anytype, in nvl(a_owner,sys_context('userenv','current_schema')), in a_type_name; + end if; + exception + when not_found then + null; + end; + end if; + return l_anytype; + end; + end; / diff --git a/source/core/ut_metadata.pks b/source/core/ut_metadata.pks index 9a0ac2b00..845cff61f 100644 --- a/source/core/ut_metadata.pks +++ b/source/core/ut_metadata.pks @@ -20,6 +20,31 @@ create or replace package ut_metadata authid current_user as * Common package for all code that reads from the system tables. */ + type t_anytype_members_rec is record ( + type_code pls_integer, + schema_name varchar2(128), + type_name varchar2(128), + length pls_integer, + elements_count pls_integer, + version varchar2(32767), + precision pls_integer, + scale pls_integer, + char_set_id pls_integer, + char_set_frm pls_integer + ); + + type t_anytype_elem_info_rec is record ( + type_code pls_integer, + attribute_name varchar2(260), + length pls_integer, + version varchar2(32767), + precision pls_integer, + scale pls_integer, + char_set_id pls_integer, + char_set_frm pls_integer, + attr_elt_type anytype + ); + /** * Forms correct object/subprogram name to call as owner.object[.subprogram] * @@ -91,5 +116,30 @@ create or replace package ut_metadata authid current_user as */ function package_exists_in_cur_schema(a_object_name varchar2) return boolean; + /** + * Returns true if given typecode is a collection typecode + */ + function is_collection(a_anytype_code in integer) return boolean; + + /** + * Returns true if given object is a collection + */ + function is_collection(a_owner varchar2, a_type_name varchar2) return boolean; + + /** + * Returns a descriptor of anytype + */ + function get_anytype_members_info( a_anytype anytype ) return t_anytype_members_rec; + + /** + * Returns a descriptor of anytype attribute + */ + function get_attr_elem_info( a_anytype anytype, a_pos pls_integer := null ) return t_anytype_elem_info_rec; + + /** + * Returns ANYTYPE descriptor of an object type + */ + function get_user_defined_type(a_owner varchar2, a_type_name varchar2) return anytype; + end ut_metadata; / diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index 1e378318d..965954594 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -104,8 +104,8 @@ grant execute on &&ut3_owner..ut_realtime_reporter to public; grant select, insert, delete, update on &&ut3_owner..dbmspcc_blocks to public; grant select, insert, delete, update on &&ut3_owner..dbmspcc_runs to public; grant select, insert, delete, update on &&ut3_owner..dbmspcc_units to public; -grant execute on &&ut3_owner..ut_matcher_config to public; -grant execute on &&ut3_owner..ut_matcher_config_items to public; +grant execute on &&ut3_owner..ut_matcher_options to public; +grant execute on &&ut3_owner..ut_matcher_options_items to public; prompt Creating synonyms for UTPLSQL objects in &&ut3_owner schema to PUBLIC diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql index 7580ee2a0..7785c09fb 100644 --- a/source/create_user_grants.sql +++ b/source/create_user_grants.sql @@ -123,6 +123,6 @@ grant execute on &&ut3_owner..ut_realtime_reporter to &ut3_user; grant select, insert, delete, update on &&ut3_owner..dbmspcc_blocks to &ut3_user; grant select, insert, delete, update on &&ut3_owner..dbmspcc_runs to &ut3_user; grant select, insert, delete, update on &&ut3_owner..dbmspcc_units to &ut3_user; -grant execute on &&ut3_owner..ut_matcher_config to &ut3_user; -grant execute on &&ut3_owner..ut_matcher_config_items to &ut3_user; +grant execute on &&ut3_owner..ut_matcher_options to &ut3_user; +grant execute on &&ut3_owner..ut_matcher_options_items to &ut3_user; diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 20dd31586..80dbf46c2 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -346,18 +346,20 @@ create or replace package body ut_compound_data_helper is begin dbms_lob.createtemporary(l_compare_sql, true); - gen_sql_pieces_out_of_cursor(a_other.cursor_details.cursor_columns_info, a_join_by_list, + gen_sql_pieces_out_of_cursor( + a_other.cursor_details.cursor_columns_info, a_join_by_list, l_xmltable_stmt, l_select_stmt, l_partition_stmt, l_equal_stmt, - l_join_on_stmt, l_not_equal_stmt); + l_join_on_stmt, l_not_equal_stmt + ); l_temp_string := 'with exp as ( select ucd.* '; ut_utils.append_to_clob(l_compare_sql, l_temp_string); - get_act_and_exp_set(l_compare_sql, l_partition_stmt,l_select_stmt, l_xmltable_stmt, a_unordered,'exp'); + get_act_and_exp_set(l_compare_sql, l_partition_stmt, l_select_stmt, l_xmltable_stmt, a_unordered,'exp'); l_temp_string :=',act as ( select ucd.* '; ut_utils.append_to_clob(l_compare_sql, l_temp_string); - get_act_and_exp_set(l_compare_sql, l_partition_stmt,l_select_stmt, l_xmltable_stmt, a_unordered,'act'); + get_act_and_exp_set(l_compare_sql, l_partition_stmt, l_select_stmt, l_xmltable_stmt, a_unordered,'act'); l_temp_string := ' select a.item_data as act_item_data, a.data_id act_data_id,' ||'e.item_data as exp_item_data, e.data_id exp_data_id, '|| @@ -629,57 +631,6 @@ create or replace package body ut_compound_data_helper is return g_diff_count; end; - function get_missing_filter_columns(a_cursor_info ut_cursor_column_tab, a_column_filter_list ut_varchar2_list) - return ut_varchar2_list is - l_result ut_varchar2_list := ut_varchar2_list(); - begin - select fl.column_value - bulk collect into l_result - from table(a_column_filter_list) fl - where not exists (select 1 from table(a_cursor_info) c where regexp_like(c.access_path, '^'||fl.column_value||'($|/.*)')); - return l_result; - end; - - function get_missing_pk(a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab, a_current_list ut_varchar2_list) - return tt_missing_pk is - l_actual ut_varchar2_list := coalesce(get_missing_filter_columns(a_actual,a_current_list),ut_varchar2_list()); - l_expected ut_varchar2_list := coalesce(get_missing_filter_columns(a_expected,a_current_list),ut_varchar2_list()); - l_missing_pk tt_missing_pk; - begin - select name,type - bulk collect into l_missing_pk - from - (select act.column_value name, 'e' type from table(l_expected) act - union all - select exp.column_value name, 'a' type from table(l_actual) exp) - order by type desc,name; - return l_missing_pk; - end; - - function contains_collection (a_cursor_info ut_cursor_column_tab) - return number is - l_collection_elements number; - begin - select count(1) into l_collection_elements from - table(a_cursor_info) c where c.is_collection = 1; - return l_collection_elements; - end; - - function remove_incomparable_cols( a_cursor_details ut_cursor_column_tab,a_incomparable_cols ut_varchar2_list) - return ut_cursor_column_tab is - l_result ut_cursor_column_tab; - begin - select ut_cursor_column(i.parent_name,i.access_path,i.has_nested_col,i.transformed_name,i.hierarchy_level,i.column_position , - i.xml_valid_name,i.column_name,i.column_type,i.column_type_name ,i.column_schema,i.column_len,i.is_sql_diffable ,i.is_collection) - bulk collect into l_result - from table(a_cursor_details) i - left outer join table(a_incomparable_cols) c - on (i.access_path = c.column_value) - where c.column_value is null; - - return l_result; - end; - function getxmlchildren(a_parent_name varchar2,a_cursor_table ut_cursor_column_tab) return xmltype is l_result xmltype; @@ -722,45 +673,6 @@ create or replace package body ut_compound_data_helper is end; end; - function get_anytype_members_info( a_anytype anytype ) - return t_anytype_members_rec is - l_result t_anytype_members_rec; - begin - if a_anytype is not null then - l_result.type_code := a_anytype.getinfo( - prec => l_result.precision, - scale => l_result.scale, - len => l_result.length, - csid => l_result.char_set_id, - csfrm => l_result.char_set_frm, - schema_name => l_result.schema_name, - type_name => l_result.type_name, - version => l_result.version, - numelems => l_result.elements_count - ); - end if; - return l_result; - end; - - function get_attr_elem_info( a_anytype anytype, a_pos pls_integer := null ) - return t_anytype_elem_info_rec is - l_result t_anytype_elem_info_rec; - begin - if a_anytype is not null then - l_result.type_code := a_anytype.getattreleminfo( - pos => a_pos, - prec => l_result.precision, - scale => l_result.scale, - len => l_result.length, - csid => l_result.char_set_id, - csfrm => l_result.char_set_frm, - attr_elt_type => l_result.attr_elt_type, - aname => l_result.attribute_name - ); - end if; - return l_result; - end; - begin g_anytype_name_map(dbms_types.typecode_date) := 'DATE'; g_anytype_name_map(dbms_types.typecode_number) := 'NUMBER'; diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 0c5a08e84..4d1d9398c 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -31,13 +31,6 @@ create or replace package ut_compound_data_helper authid definer is type tt_column_diffs is table of t_column_diffs; - type t_missing_pk is record( - missingxpath varchar2(250), - diff_type varchar2(1) - ); - - type tt_missing_pk is table of t_missing_pk; - type t_row_diffs is record( rn integer, diff_type varchar2(250), @@ -56,31 +49,6 @@ create or replace package ut_compound_data_helper authid definer is dup_no number ); - type t_anytype_members_rec is record ( - type_code pls_integer, - schema_name varchar2(128), - type_name varchar2(128), - length pls_integer, - elements_count pls_integer, - version varchar2(32767), - precision pls_integer, - scale pls_integer, - char_set_id pls_integer, - char_set_frm pls_integer - ); - - type t_anytype_elem_info_rec is record ( - type_code pls_integer, - attribute_name varchar2(260), - length pls_integer, - version varchar2(32767), - precision pls_integer, - scale pls_integer, - char_set_id pls_integer, - char_set_frm pls_integer, - attr_elt_type anytype - ); - type t_diff_tab is table of t_diff_rec; function get_columns_filter( @@ -125,26 +93,11 @@ create or replace package ut_compound_data_helper authid definer is function get_rows_diff_count return integer; - function get_missing_pk( - a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab, a_current_list ut_varchar2_list - ) return tt_missing_pk; - - function contains_collection (a_cursor_info ut_cursor_column_tab) return number; - - function remove_incomparable_cols( - a_cursor_details ut_cursor_column_tab,a_incomparable_cols ut_varchar2_list - ) return ut_cursor_column_tab; - function getxmlchildren(a_parent_name varchar2,a_cursor_table ut_cursor_column_tab) return xmltype; function is_sql_compare_allowed(a_type_name varchar2) return boolean; function get_column_type_desc(a_type_code in integer, a_dbms_sql_desc in boolean) return varchar2; - - function get_anytype_members_info( a_anytype anytype ) return t_anytype_members_rec; - - function get_attr_elem_info( a_anytype anytype, a_pos pls_integer := null ) return t_anytype_elem_info_rec; - end; / diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index f238d978f..67bd9ed77 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -38,7 +38,7 @@ create or replace type body ut_compound_data_value as overriding member function compare_implementation(a_other ut_data_value) return integer is begin - return compare_implementation( a_other, null, null); + return compare_implementation( a_other, null ); end; overriding member function to_string return varchar2 is @@ -68,24 +68,18 @@ create or replace type body ut_compound_data_value as return l_result_string; end; - overriding member function diff( - a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, - a_join_by_xpath varchar2, a_unordered boolean := false - ) return varchar2 is + overriding member function diff( a_other ut_data_value, a_match_options ut_matcher_options ) return varchar2 is l_result clob; l_result_string varchar2(32767); begin - l_result := get_data_diff(a_other, a_exclude_xpath, a_include_xpath, a_join_by_xpath,a_unordered); + l_result := get_data_diff( a_other, a_match_options ); l_result_string := ut_utils.to_string(l_result,null); dbms_lob.freetemporary(l_result); return l_result_string; end; -- TODO : Rework to exclude xpath - member function get_data_diff( - a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, - a_join_by_xpath varchar2, a_unordered boolean - ) return clob is + member function get_data_diff( a_other ut_data_value, a_match_options ut_matcher_options ) return clob is c_max_rows integer := ut_utils.gc_diff_max_rows; l_result clob; l_results ut_utils.t_clob_tab := ut_utils.t_clob_tab(); @@ -95,7 +89,7 @@ create or replace type body ut_compound_data_value as l_diff_id ut_compound_data_helper.t_hash; l_row_diffs ut_compound_data_helper.tt_row_diffs; - function get_diff_message (a_row_diff ut_compound_data_helper.t_row_diffs,a_is_unordered boolean) return varchar2 is + function get_diff_message (a_row_diff ut_compound_data_helper.t_row_diffs) return varchar2 is begin return ' Row No. '||a_row_diff.rn||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; end; @@ -114,8 +108,10 @@ create or replace type body ut_compound_data_value as l_diff_row_count := ut_compound_data_helper.get_rows_diff_count; if l_diff_row_count > 0 then l_row_diffs := ut_compound_data_helper.get_rows_diff( - self.data_id, l_actual.data_id, l_diff_id, c_max_rows, a_exclude_xpath, - a_include_xpath); + self.data_id, l_actual.data_id, l_diff_id, c_max_rows, + a_match_options.exclude.to_xpath(), + a_match_options.exclude.to_xpath() + ); l_message := chr(10) ||'Rows: [ ' || l_diff_row_count ||' differences' || case when l_diff_row_count > c_max_rows and l_row_diffs.count > 0 then ', showing first '||c_max_rows end @@ -123,7 +119,7 @@ create or replace type body ut_compound_data_value as ut_utils.append_to_clob( l_result, l_message ); for i in 1 .. l_row_diffs.count loop l_results.extend; - l_results(l_results.last) := get_diff_message(l_row_diffs(i),a_unordered); + l_results(l_results.last) := get_diff_message( l_row_diffs(i) ); end loop; ut_utils.append_to_clob(l_result,l_results); else @@ -134,7 +130,7 @@ create or replace type body ut_compound_data_value as end; - member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2) return integer is + member function compare_implementation(a_other ut_data_value, a_match_options ut_matcher_options) return integer is l_other ut_compound_data_value; l_ut_owner varchar2(250) := ut_utils.ut_owner; l_column_filter varchar2(32767); @@ -164,7 +160,7 @@ create or replace type body ut_compound_data_value as l_other := treat(a_other as ut_compound_data_value); l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); - l_column_filter := ut_compound_data_helper.get_columns_filter(a_exclude_xpath, a_include_xpath); + l_column_filter := ut_compound_data_helper.get_columns_filter( a_match_options.exclude.to_xpath(), a_match_options.include.to_xpath() ); -- Find differences execute immediate 'insert into ' || l_ut_owner || '.ut_compound_data_diff_tmp ( diff_id, item_no ) select :diff_id, nvl(exp.item_no, act.item_no) @@ -180,8 +176,8 @@ create or replace type body ut_compound_data_value as ', xmltransform(act.item_data, :l_xml_data_fmt).getclobval())' || ',1' || ') != 0' - using in l_diff_id, a_exclude_xpath, a_include_xpath, self.data_id, - a_exclude_xpath, a_include_xpath, l_other.data_id, l_xml_data_fmt, l_xml_data_fmt; + using in l_diff_id, a_match_options.exclude.to_xpath(), a_match_options.include.to_xpath(), self.data_id, + a_match_options.exclude.to_xpath(), a_match_options.include.to_xpath(), l_other.data_id, l_xml_data_fmt, l_xml_data_fmt; --result is OK only if both are same if sql%rowcount = 0 and self.elements_count = l_other.elements_count then l_result := 0; @@ -192,54 +188,5 @@ create or replace type body ut_compound_data_value as return l_result; end; - member function compare_implementation( - a_other ut_data_value, - a_unordered boolean, - a_inclusion_compare boolean, - a_is_negated boolean, - a_join_by_list ut_varchar2_list := ut_varchar2_list() - ) return integer is - - l_diff_id ut_compound_data_helper.t_hash; - l_other ut_compound_data_value; - l_result integer; - --We will start with number od differences being displayed. - l_max_rows integer := ut_utils.gc_diff_max_rows; - - l_loop_curs sys_refcursor; - l_diff_tab ut_compound_data_helper.t_diff_tab; - l_sql_rowcount integer :=0; - - begin - l_other := treat(a_other as ut_compound_data_value); - l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); - open l_loop_curs for - ut_compound_data_helper.gen_compare_sql( - a_inclusion_compare, a_is_negated, a_unordered, - treat(a_other as ut_data_value_refcursor), a_join_by_list - ) using self.data_id,l_other.data_id; - loop - fetch l_loop_curs bulk collect into l_diff_tab limit l_max_rows; - exit when l_diff_tab.count = 0; - if (ut_utils.gc_diff_max_rows > l_sql_rowcount ) then - ut_compound_data_helper.insert_diffs_result(l_diff_tab,l_diff_id); - end if; - l_sql_rowcount := l_sql_rowcount + l_diff_tab.count; - if (ut_utils.gc_diff_max_rows <= l_sql_rowcount and l_max_rows != ut_utils.gc_bc_fetch_limit ) then - l_max_rows := ut_utils.gc_bc_fetch_limit; - end if; - end loop; - - ut_compound_data_helper.set_rows_diff(l_sql_rowcount); - --result is OK only if both are same - if l_sql_rowcount = 0 and ( self.elements_count = l_other.elements_count or a_inclusion_compare ) then - l_result := 0; - else - l_result := 1; - end if; - - return l_result; - end; - end; / diff --git a/source/expectations/data_values/ut_compound_data_value.tps b/source/expectations/data_values/ut_compound_data_value.tps index 771a2f3d2..57c5838ae 100644 --- a/source/expectations/data_values/ut_compound_data_value.tps +++ b/source/expectations/data_values/ut_compound_data_value.tps @@ -41,10 +41,8 @@ create or replace type ut_compound_data_value force under ut_data_value( overriding member function to_string return varchar2, overriding member function is_multi_line return boolean, overriding member function compare_implementation(a_other ut_data_value) return integer, - overriding member function diff( a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean := false ) return varchar2, - member function get_data_diff(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean) return clob, - member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2) return integer, - member function compare_implementation(a_other ut_data_value, a_unordered boolean, a_inclusion_compare boolean, - a_is_negated boolean, a_join_by_list ut_varchar2_list:=ut_varchar2_list() ) return integer + overriding member function diff( a_other ut_data_value, a_match_options ut_matcher_options ) return varchar2, + member function get_data_diff( a_other ut_data_value, a_match_options ut_matcher_options ) return clob, + member function compare_implementation( a_other ut_data_value, a_match_options ut_matcher_options ) return integer ) not final not instantiable / diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb index a153201fc..7eada79f2 100644 --- a/source/expectations/data_values/ut_cursor_details.tpb +++ b/source/expectations/data_values/ut_cursor_details.tpb @@ -24,45 +24,23 @@ create or replace type body ut_cursor_details as return l_diffs; end; - member function get_user_defined_type(a_owner varchar2, a_type_name varchar2) return anytype is - l_anytype anytype; - not_found exception; - pragma exception_init(not_found,-22303); - begin - if a_type_name is not null then - begin - if ut_metadata.IS_OBJECT_VISIBLE('GETANYTYPEFROMPERSISTENT') then - execute immediate 'begin :l_anytype := getanytypefrompersistent( :a_owner, :a_type_name ); end;' - using out l_anytype, in nvl(a_owner,sys_context('userenv','current_schema')), in a_type_name; - else - execute immediate 'begin :l_anytype := anytype.getpersistent( :a_owner, :a_type_name ); end;' - using out l_anytype, in nvl(a_owner,sys_context('userenv','current_schema')), in a_type_name; - end if; - exception - when not_found then - null; - end; - end if; - return l_anytype; - end; - member procedure desc_compound_data( self in out nocopy ut_cursor_details, a_compound_data anytype, a_parent_name in varchar2, a_level in integer, a_access_path in varchar2 ) is l_idx pls_integer := 1; - l_elements_info ut_compound_data_helper.t_anytype_members_rec; - l_element_info ut_compound_data_helper.t_anytype_elem_info_rec; + l_elements_info ut_metadata.t_anytype_members_rec; + l_element_info ut_metadata.t_anytype_elem_info_rec; l_is_collection boolean; begin - l_elements_info := ut_compound_data_helper.get_anytype_members_info( a_compound_data ); + l_elements_info := ut_metadata.get_anytype_members_info( a_compound_data ); - l_is_collection := is_collection(l_elements_info.type_code); + l_is_collection := ut_metadata.is_collection(l_elements_info.type_code); if l_elements_info.elements_count is null then - l_element_info := ut_compound_data_helper.get_attr_elem_info( a_compound_data ); + l_element_info := ut_metadata.get_attr_elem_info( a_compound_data ); self.cursor_columns_info.extend; self.cursor_columns_info(cursor_columns_info.last) := @@ -86,7 +64,7 @@ create or replace type body ut_cursor_details as end if; else while l_idx <= l_elements_info.elements_count loop - l_element_info := ut_compound_data_helper.get_attr_elem_info( a_compound_data, l_idx ); + l_element_info := ut_metadata.get_attr_elem_info( a_compound_data, l_idx ); self.cursor_columns_info.extend; self.cursor_columns_info(cursor_columns_info.last) := @@ -138,7 +116,7 @@ create or replace type body ut_cursor_details as * a_cursor := dbms_sql.to_refcursor(l_cursor_number); **/ for pos in 1 .. l_columns_count loop - l_is_collection := is_collection( l_columns_desc(pos).col_schema_name, l_columns_desc(pos).col_type_name ); + l_is_collection := ut_metadata.is_collection( l_columns_desc(pos).col_schema_name, l_columns_desc(pos).col_type_name ); self.cursor_columns_info.extend; self.cursor_columns_info(self.cursor_columns_info.last) := ut_cursor_column( @@ -155,7 +133,7 @@ create or replace type body ut_cursor_details as ); if l_columns_desc(pos).col_type = dbms_sql.user_defined_type or l_is_collection then desc_compound_data( - get_user_defined_type( l_columns_desc(pos).col_schema_name, l_columns_desc(pos).col_type_name ), + ut_metadata.get_user_defined_type( l_columns_desc(pos).col_schema_name, l_columns_desc(pos).col_type_name ), l_columns_desc(pos).col_name, l_hierarchy_level + 1, l_columns_desc(pos).col_name @@ -165,18 +143,27 @@ create or replace type body ut_cursor_details as return; end; - member function is_collection (a_anytype_code in integer) return boolean is + member function contains_collection return boolean is + l_collection_elements number; begin - return coalesce(a_anytype_code in (dbms_types.typecode_varray,dbms_types.typecode_table,dbms_types.typecode_namedcollection),false); + select count(1) into l_collection_elements + from table(cursor_columns_info) c + where c.is_collection = 1 and rownum = 1; + return l_collection_elements > 0; end; - member function is_collection (a_owner varchar2, a_type_name varchar2) return boolean is + member function get_missing_filter_columns( a_expected_columns ut_varchar2_list ) return ut_varchar2_list is + l_result ut_varchar2_list; begin - return is_collection( - ut_compound_data_helper.get_anytype_members_info( - get_user_defined_type(a_owner, a_type_name) - ).type_code - ); + select fl.column_value + bulk collect into l_result + from table(a_expected_columns) fl + where not exists ( + select 1 from table(self.cursor_columns_info) c + where regexp_like(c.access_path, '^'||fl.column_value||'($|/.*)') + ) + order by fl.column_value; + return l_result; end; member procedure ordered_columns(self in out nocopy ut_cursor_details,a_ordered_columns boolean := false) is diff --git a/source/expectations/data_values/ut_cursor_details.tps b/source/expectations/data_values/ut_cursor_details.tps index 37a702002..c65e68ff0 100644 --- a/source/expectations/data_values/ut_cursor_details.tps +++ b/source/expectations/data_values/ut_cursor_details.tps @@ -24,12 +24,14 @@ create or replace type ut_cursor_details force authid current_user as object ( ) return self as result, order member function compare(a_other ut_cursor_details) return integer, member procedure desc_compound_data( - self in out nocopy ut_cursor_details, a_compound_data anytype, - a_parent_name in varchar2, a_level in integer, a_access_path in varchar2 + self in out nocopy ut_cursor_details, + a_compound_data anytype, + a_parent_name in varchar2, + a_level in integer, + a_access_path in varchar2 ), - member function get_user_defined_type(a_owner varchar2, a_type_name varchar2) return anytype, - member function is_collection(a_anytype_code in integer) return boolean, - member function is_collection(a_owner varchar2, a_type_name varchar2) return boolean, + member function contains_collection return boolean, + member function get_missing_filter_columns( a_expected_columns ut_varchar2_list ) return ut_varchar2_list, member procedure ordered_columns(self in out nocopy ut_cursor_details, a_ordered_columns boolean := false) ) / diff --git a/source/expectations/data_values/ut_data_value.tpb b/source/expectations/data_values/ut_data_value.tpb index 4237ba040..8c8e677fb 100644 --- a/source/expectations/data_values/ut_data_value.tpb +++ b/source/expectations/data_values/ut_data_value.tpb @@ -30,7 +30,7 @@ create or replace type body ut_data_value as raise value_error; end; - member function diff( a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean :=false ) return varchar2 is + member function diff( a_other ut_data_value, a_match_options ut_matcher_options ) return varchar2 is begin return null; end; diff --git a/source/expectations/data_values/ut_data_value.tps b/source/expectations/data_values/ut_data_value.tps index 793a25942..425fbeb54 100644 --- a/source/expectations/data_values/ut_data_value.tps +++ b/source/expectations/data_values/ut_data_value.tps @@ -25,7 +25,7 @@ create or replace type ut_data_value force authid current_user as object ( order member function compare( a_other ut_data_value ) return integer, member function is_diffable return boolean, member function is_empty return boolean, - member function diff( a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2, a_join_by_xpath varchar2, a_unordered boolean := false ) return varchar2, + member function diff( a_other ut_data_value, a_match_options ut_matcher_options ) return varchar2, not instantiable member function compare_implementation( a_other ut_data_value ) return integer ) not final not instantiable / diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index ac02959c2..f7a7805ec 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -72,7 +72,7 @@ create or replace type body ut_data_value_refcursor as cursor_not_open exception; l_cursor_number number; begin - self.is_data_null := ut_utils.boolean_to_int(a_value is null); + self.is_data_null := ut_utils.boolean_to_int(l_cursor is null); self.self_type := $$plsql_unit; self.data_id := sys_guid(); self.data_type := 'refcursor'; @@ -123,19 +123,18 @@ create or replace type body ut_data_value_refcursor as return l_result_string; end; - member function diff( - a_other ut_data_value, a_unordered boolean := false, a_join_by_list ut_varchar2_list:=ut_varchar2_list() - ) return varchar2 is + overriding member function diff( a_other ut_data_value, a_match_options ut_matcher_options ) return varchar2 is l_result clob; l_results ut_utils.t_clob_tab := ut_utils.t_clob_tab(); l_result_string varchar2(32767); - l_actual ut_data_value_refcursor; + l_other ut_data_value_refcursor; l_column_diffs ut_compound_data_helper.tt_column_diffs := ut_compound_data_helper.tt_column_diffs(); l_act_cols ut_cursor_column_tab; l_exp_cols ut_cursor_column_tab; - l_missing_pk ut_compound_data_helper.tt_missing_pk := ut_compound_data_helper.tt_missing_pk(); + l_act_missing_pk ut_varchar2_list := ut_varchar2_list(); + l_exp_missing_pk ut_varchar2_list := ut_varchar2_list(); l_col_diffs ut_compound_data_helper.tt_column_diffs := ut_compound_data_helper.tt_column_diffs(); c_max_rows integer := ut_utils.gc_diff_max_rows; @@ -160,36 +159,23 @@ create or replace type body ut_data_value_refcursor as ' Column <'||a_col.actual_name||'> is misplaced. Expected position: '||a_col.expected_pos||',' ||' actual position: '||a_col.actual_pos||'.' end; end; - - function get_missing_key_message(a_missing_keys ut_compound_data_helper.t_missing_pk) return varchar2 is - l_message varchar2(200); - begin - if a_missing_keys.diff_type = 'a' then - l_message := ' Join key '||a_missing_keys.missingxpath||' does not exists in actual'; - elsif a_missing_keys.diff_type = 'e' then - l_message := ' Join key '||a_missing_keys.missingxpath||' does not exists in expected'; - end if; - return l_message; - end; - function remove_incomparable_cols( a_cursor_details ut_cursor_column_tab,a_column_diffs ut_compound_data_helper.tt_column_diffs ) return ut_cursor_column_tab is - l_incomparable_cols ut_varchar2_list := ut_varchar2_list(); - l_filter_out ut_cursor_column_tab; + l_result ut_cursor_column_tab; begin - for i in 1 .. a_column_diffs.count loop - if a_column_diffs(i).diff_type in ('-','+') then - l_incomparable_cols.extend; - l_incomparable_cols(l_incomparable_cols.last) := coalesce(a_column_diffs(i).expected_name,a_column_diffs(i).actual_name); - end if; - end loop; - - return ut_compound_data_helper.remove_incomparable_cols(a_cursor_details,l_incomparable_cols); + select value(i) bulk collect into l_result + from table(a_cursor_details) i + where i.access_path not in ( + select coalesce( c.expected_name, c.actual_name ) + from table(a_column_diffs) c + where c.diff_type in ('-','+') + ); + return l_result; end; - function get_diff_message (a_row_diff ut_compound_data_helper.t_row_diffs,a_is_unordered boolean) return varchar2 is + function get_diff_message (a_row_diff ut_compound_data_helper.t_row_diffs, a_is_unordered boolean) return varchar2 is begin if a_is_unordered then if a_row_diff.pk_value is not null then @@ -206,15 +192,15 @@ create or replace type body ut_data_value_refcursor as if not a_other is of (ut_data_value_refcursor) then raise value_error; end if; - l_actual := treat(a_other as ut_data_value_refcursor); + l_other := treat(a_other as ut_data_value_refcursor); - l_act_cols := l_actual.cursor_details.cursor_columns_info; + l_act_cols := l_other.cursor_details.cursor_columns_info; l_exp_cols := self.cursor_details.cursor_columns_info; dbms_lob.createtemporary(l_result,true); --diff columns - if not self.is_null and not l_actual.is_null then - l_column_diffs := ut_compound_data_helper.get_columns_diff(self.cursor_details.cursor_columns_info,l_actual.cursor_details.cursor_columns_info,l_column_order_enforce); + if not self.is_null and not l_other.is_null then + l_column_diffs := ut_compound_data_helper.get_columns_diff(self.cursor_details.cursor_columns_info,l_other.cursor_details.cursor_columns_info,l_column_order_enforce); if l_column_diffs.count > 0 then ut_utils.append_to_clob(l_result,chr(10) || 'Columns:' || chr(10)); @@ -224,25 +210,26 @@ create or replace type body ut_data_value_refcursor as l_results(l_results.last) := get_col_diff_text(l_column_diffs(i)); end loop; ut_utils.append_to_clob(l_result, l_results); - l_act_cols := remove_incomparable_cols(l_actual.cursor_details.cursor_columns_info,l_column_diffs); - l_exp_cols := remove_incomparable_cols(self.cursor_details.cursor_columns_info,l_column_diffs); + l_act_cols := remove_incomparable_cols(l_other.cursor_details.cursor_columns_info, l_column_diffs); + l_exp_cols := remove_incomparable_cols(self.cursor_details.cursor_columns_info, l_column_diffs); end if; --check for missing pk - if a_join_by_list.count > 0 then - l_missing_pk := ut_compound_data_helper.get_missing_pk(l_exp_cols,l_act_cols,a_join_by_list); + if a_match_options.join_by.items.count > 0 then + l_act_missing_pk := l_other.cursor_details.get_missing_filter_columns( a_match_options.join_by.items ); + l_exp_missing_pk := self.cursor_details.get_missing_filter_columns( a_match_options.join_by.items ); end if; --diff rows and row elements if the pk is not missing - if l_missing_pk.count = 0 then - l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_actual.data_id); + if l_act_missing_pk.count + l_exp_missing_pk.count = 0 then + l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); -- First tell how many rows are different l_diff_row_count := ut_compound_data_helper.get_rows_diff_count; l_results := ut_utils.t_clob_tab(); if l_diff_row_count > 0 then l_row_diffs := ut_compound_data_helper.get_rows_diff_by_sql( - l_exp_cols, l_act_cols, self.data_id, l_actual.data_id, l_diff_id, a_join_by_list , a_unordered, l_column_order_enforce + l_exp_cols, l_act_cols, self.data_id, l_other.data_id, l_diff_id, a_match_options.join_by.items , a_match_options.unordered, l_column_order_enforce ); l_message := chr(10) ||'Rows: [ ' || l_diff_row_count ||' differences' @@ -251,7 +238,7 @@ create or replace type body ut_data_value_refcursor as ut_utils.append_to_clob( l_result, l_message ); for i in 1 .. l_row_diffs.count loop l_results.extend; - l_results(l_results.last) := get_diff_message(l_row_diffs(i),a_unordered); + l_results(l_results.last) := get_diff_message(l_row_diffs(i),a_match_options.unordered); end loop; ut_utils.append_to_clob(l_result,l_results); else @@ -259,16 +246,21 @@ create or replace type body ut_data_value_refcursor as ut_utils.append_to_clob( l_result, l_message ); end if; else - ut_utils.append_to_clob(l_result,chr(10) || 'Unable to join sets:' || chr(10)); - for i in 1 .. l_missing_pk.count loop - l_results.extend; - ut_utils.append_to_clob(l_result, get_missing_key_message(l_missing_pk(i))|| chr(10)); - end loop; - - if ut_compound_data_helper.contains_collection(self.cursor_details.cursor_columns_info) > 0 - or ut_compound_data_helper.contains_collection(l_actual.cursor_details.cursor_columns_info) > 0 then - ut_utils.append_to_clob(l_result,' Please make sure that your join clause is not refferring to collection element'|| chr(10)); - end if; + ut_utils.append_to_clob(l_result,chr(10) || 'Unable to join sets:' || chr(10)); + + for i in 1 .. l_exp_missing_pk.count loop + l_results.extend; + ut_utils.append_to_clob(l_result, ' Join key '||l_exp_missing_pk(i)||' does not exists in expected'||chr(10)); + end loop; + + for i in 1 .. l_act_missing_pk.count loop + l_results.extend; + ut_utils.append_to_clob(l_result, ' Join key '||l_act_missing_pk(i)||' does not exists in actual'||chr(10)); + end loop; + + if self.cursor_details.contains_collection() or l_other.cursor_details.contains_collection() then + ut_utils.append_to_clob(l_result,' Please make sure that your join clause is not refferring to collection element'|| chr(10)); + end if; end if; @@ -277,39 +269,82 @@ create or replace type body ut_data_value_refcursor as return l_result_string; end; - overriding member function compare_implementation( + member function compare_implementation( a_other ut_data_value, - a_unordered boolean, + a_match_options ut_matcher_options, a_inclusion_compare boolean := false, - a_is_negated boolean := false, - a_join_by_list ut_varchar2_list := ut_varchar2_list() + a_is_negated boolean := false ) return integer is l_result integer := 0; - l_actual ut_data_value_refcursor; - l_pk_missing_tab ut_compound_data_helper.tt_missing_pk; - - begin + l_other ut_data_value_refcursor; + function compare_data( + a_other ut_data_value_refcursor, + a_match_options ut_matcher_options, + a_inclusion_compare boolean, + a_is_negated boolean + ) return integer is + + l_diff_id ut_compound_data_helper.t_hash; + l_result integer; + --We will start with number od differences being displayed. + l_max_rows integer := ut_utils.gc_diff_max_rows; + + l_loop_curs sys_refcursor; + l_diff_tab ut_compound_data_helper.t_diff_tab; + l_sql_rowcount integer :=0; + + begin + l_diff_id := ut_compound_data_helper.get_hash(self.data_id||a_other.data_id); + open l_loop_curs for + ut_compound_data_helper.gen_compare_sql( + a_inclusion_compare, + a_is_negated, + a_match_options.unordered(), + a_other, + a_match_options.join_by.items + ) using self.data_id, a_other.data_id; + loop + fetch l_loop_curs bulk collect into l_diff_tab limit l_max_rows; + exit when l_diff_tab.count = 0; + if (ut_utils.gc_diff_max_rows > l_sql_rowcount ) then + ut_compound_data_helper.insert_diffs_result( l_diff_tab, l_diff_id ); + end if; + l_sql_rowcount := l_sql_rowcount + l_diff_tab.count; + if (ut_utils.gc_diff_max_rows <= l_sql_rowcount and l_max_rows != ut_utils.gc_bc_fetch_limit ) then + l_max_rows := ut_utils.gc_bc_fetch_limit; + end if; + end loop; + + ut_compound_data_helper.set_rows_diff(l_sql_rowcount); + --result is OK only if both are same + if l_sql_rowcount = 0 and ( self.elements_count = a_other.elements_count or a_inclusion_compare ) then + l_result := 0; + else + l_result := 1; + end if; + + return l_result; + end; + + begin if not a_other is of (ut_data_value_refcursor) then raise value_error; end if; - l_actual := treat(a_other as ut_data_value_refcursor); + l_other := treat(a_other as ut_data_value_refcursor); - if a_join_by_list.count > 0 then - l_pk_missing_tab := ut_compound_data_helper.get_missing_pk(self.cursor_details.cursor_columns_info,l_actual.cursor_details.cursor_columns_info,a_join_by_list); - l_result := case when (l_pk_missing_tab.count > 0) then 1 else 0 end; + if a_match_options.join_by.items.count > 0 then + l_result := + self.cursor_details.get_missing_filter_columns( a_match_options.join_by.items ).count + + l_other.cursor_details.get_missing_filter_columns( a_match_options.join_by.items ).count; end if; - - if l_result = 0 then - if (self.cursor_details is not null and l_actual.cursor_details is not null) and (self.cursor_details != l_actual.cursor_details) then - l_result := 1; + + if l_result = 0 then + if not self.is_null() and not l_other.is_null() and self.cursor_details != l_other.cursor_details then + l_result := 1; end if; - l_result := l_result - + (self as ut_compound_data_value).compare_implementation( - a_other,a_unordered, a_inclusion_compare, a_is_negated, a_join_by_list - ); + l_result := l_result + compare_data( l_other, a_match_options, a_inclusion_compare, a_is_negated ); end if; - return l_result; end; @@ -318,29 +353,34 @@ create or replace type body ut_data_value_refcursor as return self.elements_count = 0; end; - member function update_cursor_details (a_match_options ut_matcher_config) return ut_data_value_refcursor is + member function update_cursor_details (a_match_options ut_matcher_options) return ut_data_value_refcursor is l_result ut_data_value_refcursor := self; c_xpath_extract_reg constant varchar2(50) := '^((/ROW/)|^(//)|^(/\*/))?(.*)'; begin if l_result.cursor_details.cursor_columns_info is not null then - if a_match_options.include().count > 0 then - with included_columns as ( - select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names - from table(a_match_options.include()) - minus - select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names - from table(a_match_options.exclude()) - ) - select value(x) - bulk collect into l_result.cursor_details.cursor_columns_info - from table(self.cursor_details.cursor_columns_info) x - where exists( - select 1 from included_columns f where regexp_like( x.access_path, '^'||f.col_names||'($|/.*)' ) - ); - elsif a_match_options.exclude().count > 0 then + + --limit columns to those on the include items minus exclude items + if a_match_options.include.items.count > 0 then + -- if include - exclude = 0 then keep all columns + if a_match_options.include.items != a_match_options.exclude.items then + with included_columns as ( + select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names + from table(a_match_options.include.items) + minus + select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names + from table(a_match_options.exclude.items) + ) + select value(x) + bulk collect into l_result.cursor_details.cursor_columns_info + from table(self.cursor_details.cursor_columns_info) x + where exists( + select 1 from included_columns f where regexp_like( x.access_path, '^'||f.col_names||'($|/.*)' ) + ); + end if; + elsif a_match_options.exclude.items.count > 0 then with excluded_columns as ( select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names - from table(a_match_options.exclude()) + from table(a_match_options.exclude.items) ) select value(x) bulk collect into l_result.cursor_details.cursor_columns_info @@ -349,6 +389,7 @@ create or replace type body ut_data_value_refcursor as select 1 from excluded_columns f where regexp_like( x.access_path, '^'||f.col_names||'($|/.*)' ) ); end if; + l_result.cursor_details.ordered_columns(a_match_options.ordered_columns()); end if; return l_result; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tps b/source/expectations/data_values/ut_data_value_refcursor.tps index 591e2576b..52d4b1c44 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tps +++ b/source/expectations/data_values/ut_data_value_refcursor.tps @@ -34,10 +34,14 @@ create or replace type ut_data_value_refcursor under ut_compound_data_value( member procedure extract_cursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor), member procedure init(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor), overriding member function to_string return varchar2, - member function diff( a_other ut_data_value, a_unordered boolean := false, a_join_by_list ut_varchar2_list:=ut_varchar2_list() ) return varchar2, - overriding member function compare_implementation(a_other ut_data_value, a_unordered boolean, a_inclusion_compare boolean := false, a_is_negated boolean := false, - a_join_by_list ut_varchar2_list:=ut_varchar2_list()) return integer, + overriding member function diff( a_other ut_data_value, a_match_options ut_matcher_options ) return varchar2, + member function compare_implementation( + a_other ut_data_value, + a_match_options ut_matcher_options, + a_inclusion_compare boolean := false, + a_is_negated boolean := false + ) return integer, overriding member function is_empty return boolean, - member function update_cursor_details ( a_match_options ut_matcher_config ) return ut_data_value_refcursor + member function update_cursor_details ( a_match_options ut_matcher_options ) return ut_data_value_refcursor ) / diff --git a/source/expectations/matchers/ut_equal.tpb b/source/expectations/matchers/ut_equal.tpb index 8f29a2ebf..027517266 100644 --- a/source/expectations/matchers/ut_equal.tpb +++ b/source/expectations/matchers/ut_equal.tpb @@ -19,7 +19,7 @@ create or replace type body ut_equal as member procedure init(self in out nocopy ut_equal, a_expected ut_data_value, a_nulls_are_equal boolean, a_self_type varchar2 := null) is begin self.expected := a_expected; - self.options := ut_matcher_config( a_nulls_are_equal ); + self.options := ut_matcher_options( a_nulls_are_equal ); self.self_type := nvl( a_self_type, $$plsql_unit ); end; @@ -43,7 +43,7 @@ create or replace type body ut_equal as 'equal( a_expected anydata ).exclude( a_exclude varchar2 )' ); init(ut_data_value_anydata.get_instance(a_expected), a_nulls_are_equal); - self.options.exclude(a_exclude); + self.options.exclude.add_items(a_exclude); return; end; @@ -54,7 +54,7 @@ create or replace type body ut_equal as 'equal( a_expected anydata ).exclude( a_exclude ut_varchar2_list )' ); init(ut_data_value_anydata.get_instance(a_expected), a_nulls_are_equal); - self.options.exclude(a_exclude); + self.options.exclude.add_items(a_exclude); return; end; @@ -101,7 +101,7 @@ create or replace type body ut_equal as 'equal( a_expected sys_refcursor ).exclude( a_exclude varchar2 )' ); init(ut_data_value_refcursor(a_expected), a_nulls_are_equal); - self.options.exclude(a_exclude); + self.options.exclude.add_items(a_exclude); return; end; @@ -112,7 +112,7 @@ create or replace type body ut_equal as 'equal( a_expected sys_refcursor ).exclude( a_exclude ut_varchar2_list )' ); init(ut_data_value_refcursor(a_expected), a_nulls_are_equal); - self.options.exclude(a_exclude); + self.options.exclude.add_items(a_exclude); return; end; @@ -155,28 +155,28 @@ create or replace type body ut_equal as member function include(a_items varchar2) return ut_equal is l_result ut_equal := self; begin - l_result.options.include(a_items); + l_result.options.include.add_items(a_items); return l_result; end; member function include(a_items ut_varchar2_list) return ut_equal is l_result ut_equal := self; begin - l_result.options.include(a_items); + l_result.options.include.add_items(a_items); return l_result; end; member function exclude(a_items varchar2) return ut_equal is l_result ut_equal := self; begin - l_result.options.exclude(a_items); + l_result.options.exclude.add_items(a_items); return l_result; end; member function exclude(a_items ut_varchar2_list) return ut_equal is l_result ut_equal := self; begin - l_result.options.exclude(a_items); + l_result.options.exclude.add_items(a_items); return l_result; end; @@ -191,7 +191,7 @@ create or replace type body ut_equal as l_result ut_equal := self; begin l_result.options.unordered(); - l_result.options.join_by(a_columns); + l_result.options.join_by.add_items(a_columns); return l_result; end; @@ -199,7 +199,7 @@ create or replace type body ut_equal as l_result ut_equal := self; begin l_result.options.unordered(); - l_result.options.join_by(a_columns); + l_result.options.join_by.add_items(a_columns); return l_result; end; @@ -221,13 +221,11 @@ create or replace type body ut_equal as begin if self.expected.data_type = a_actual.data_type then if self.expected is of (ut_data_value_anydata) then - l_result := 0 = treat(self.expected as ut_data_value_anydata).compare_implementation(a_actual, options.exclude_list.to_xpath(), options.include_list.to_xpath()); + l_result := 0 = treat(self.expected as ut_data_value_anydata).compare_implementation( a_actual, options ); elsif self.expected is of (ut_data_value_refcursor) then l_actual := treat(a_actual as ut_data_value_refcursor).update_cursor_details( options ); l_result := 0 = treat(self.expected as ut_data_value_refcursor).update_cursor_details( options ) - .compare_implementation( - l_actual, options.unordered(), false, false, options.join_by() - ); + .compare_implementation( l_actual, options ); else l_result := equal_with_nulls((self.expected = a_actual), a_actual); end if; @@ -249,14 +247,12 @@ create or replace type body ut_equal as 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() || chr(10) || 'Diff:' || treat(expected as ut_data_value_refcursor).update_cursor_details( options ) - .diff( l_actual, options.unordered(), options.join_by() ); + .diff( l_actual, options ); else l_result := 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() || chr(10) || 'Diff:' || - expected.diff( - a_actual, options.exclude_list.to_xpath(), options.include_list.to_xpath(), options.join_by_list.to_xpath(), options.unordered() - ); + expected.diff( a_actual, options ); end if; else l_result := (self as ut_matcher).failure_message(a_actual) || ': '|| self.expected.to_string_report(); diff --git a/source/expectations/matchers/ut_equal.tps b/source/expectations/matchers/ut_equal.tps index fa6215b55..68997fbcc 100644 --- a/source/expectations/matchers/ut_equal.tps +++ b/source/expectations/matchers/ut_equal.tps @@ -20,7 +20,7 @@ create or replace type ut_equal force under ut_comparison_matcher( /** * Holds information about mather options */ - options ut_matcher_config, + options ut_matcher_options, member procedure init(self in out nocopy ut_equal, a_expected ut_data_value, a_nulls_are_equal boolean, a_self_type varchar2 := null), member function equal_with_nulls( self in ut_equal, a_assert_result boolean, a_actual ut_data_value) return boolean, diff --git a/source/expectations/matchers/ut_include.tpb b/source/expectations/matchers/ut_include.tpb index 147c1d761..b0dd0b8c4 100644 --- a/source/expectations/matchers/ut_include.tpb +++ b/source/expectations/matchers/ut_include.tpb @@ -50,9 +50,7 @@ create or replace type body ut_include as l_result := ( 0 = treat( self.expected as ut_data_value_refcursor ).update_cursor_details( self.options ) - .compare_implementation( - l_actual, self.options.unordered(), get_inclusion_compare( ), get_negated( ), options.join_by( ) - ) + .compare_implementation( l_actual, self.options, get_inclusion_compare(), get_negated() ) ); else l_result := (self as ut_matcher).run_matcher(a_actual); @@ -74,7 +72,7 @@ create or replace type body ut_include as l_result := 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() || chr(10) || 'Diff:' - || treat(expected as ut_data_value_refcursor).update_cursor_details( self.options ).diff(l_actual, self.options.unordered(), self.options.join_by()); + || treat(expected as ut_data_value_refcursor).update_cursor_details( self.options ).diff( l_actual, self.options ); else l_result := (self as ut_matcher).failure_message(a_actual) || ': '|| self.expected.to_string_report(); end if; diff --git a/source/expectations/matchers/ut_matcher_config.tpb b/source/expectations/matchers/ut_matcher_options.tpb similarity index 50% rename from source/expectations/matchers/ut_matcher_config.tpb rename to source/expectations/matchers/ut_matcher_options.tpb index 177fb6055..7741747d5 100644 --- a/source/expectations/matchers/ut_matcher_config.tpb +++ b/source/expectations/matchers/ut_matcher_options.tpb @@ -1,4 +1,4 @@ -create or replace type body ut_matcher_config as +create or replace type body ut_matcher_options as /* utPLSQL - Version 3 Copyright 2016 - 2018 utPLSQL Project @@ -16,18 +16,18 @@ create or replace type body ut_matcher_config as limitations under the License. */ - constructor function ut_matcher_config(self in out nocopy ut_matcher_config, a_nulls_are_equal in boolean := null) return self as result is + constructor function ut_matcher_options(self in out nocopy ut_matcher_options, a_nulls_are_equal in boolean := null) return self as result is begin nulls_are_equal_flag := ut_utils.boolean_to_int( coalesce(a_nulls_are_equal, ut_expectation_processor.nulls_are_equal()) ); is_unordered := ut_utils.boolean_to_int(false); columns_are_unordered_flag := ut_utils.boolean_to_int(false); - include_list := ut_matcher_config_items(); - exclude_list := ut_matcher_config_items(); - join_by_list := ut_matcher_config_items(); + include := ut_matcher_options_items(); + exclude := ut_matcher_options_items(); + join_by := ut_matcher_options_items(); return; end; - member procedure nulls_are_equal(self in out nocopy ut_matcher_config) is + member procedure nulls_are_equal(self in out nocopy ut_matcher_options) is begin self.nulls_are_equal_flag := ut_utils.boolean_to_int(true); end; @@ -37,52 +37,7 @@ create or replace type body ut_matcher_config as return ut_utils.int_to_boolean(self.nulls_are_equal_flag); end; - member procedure include(self in out nocopy ut_matcher_config, a_include varchar2) is - begin - include_list.add_items(a_include); - end; - - member procedure include(self in out nocopy ut_matcher_config, a_include ut_varchar2_list) is - begin - include_list.add_items(a_include); - end; - - member function include return ut_varchar2_list is - begin - return include_list.items; - end; - - member procedure exclude(self in out nocopy ut_matcher_config, a_exclude varchar2) is - begin - exclude_list.add_items(a_exclude); - end; - - member procedure exclude(self in out nocopy ut_matcher_config, a_exclude ut_varchar2_list) is - begin - exclude_list.add_items(a_exclude); - end; - - member function exclude return ut_varchar2_list is - begin - return exclude_list.items; - end; - - member procedure join_by(self in out nocopy ut_matcher_config, a_join_by varchar2) is - begin - join_by_list.add_items(a_join_by); - end; - - member procedure join_by(self in out nocopy ut_matcher_config, a_join_by ut_varchar2_list) is - begin - join_by_list.add_items(a_join_by); - end; - - member function join_by return ut_varchar2_list is - begin - return join_by_list.items; - end; - - member procedure unordered_columns(self in out nocopy ut_matcher_config) is + member procedure unordered_columns(self in out nocopy ut_matcher_options) is begin columns_are_unordered_flag := ut_utils.boolean_to_int(true); end; @@ -92,7 +47,7 @@ create or replace type body ut_matcher_config as return not ut_utils.int_to_boolean(columns_are_unordered_flag); end; - member procedure unordered(self in out nocopy ut_matcher_config) is + member procedure unordered(self in out nocopy ut_matcher_options) is begin is_unordered := ut_utils.boolean_to_int(true); end; diff --git a/source/expectations/matchers/ut_matcher_config.tps b/source/expectations/matchers/ut_matcher_options.tps similarity index 52% rename from source/expectations/matchers/ut_matcher_config.tps rename to source/expectations/matchers/ut_matcher_options.tps index 4ff15a062..cae062bf1 100644 --- a/source/expectations/matchers/ut_matcher_config.tps +++ b/source/expectations/matchers/ut_matcher_options.tps @@ -1,4 +1,4 @@ -create or replace type ut_matcher_config authid current_user as object( +create or replace type ut_matcher_options authid current_user as object( /* utPLSQL - Version 3 Copyright 2016 - 2018 utPLSQL Project @@ -17,12 +17,12 @@ create or replace type ut_matcher_config authid current_user as object( */ /** - * Flag to force cursor comparision into ordered mode + * Flag indicating that columns order is to be ignored */ columns_are_unordered_flag number(1,0), /** - * Flag indicating that order of elements is to be ignored + * Flag indicating that rows/items order is to be ignored */ is_unordered number(1,0), @@ -34,33 +34,24 @@ create or replace type ut_matcher_config authid current_user as object( /** * Holds (list of columns/attributes) to exclude when comparing compound types */ - exclude_list ut_matcher_config_items, + exclude ut_matcher_options_items, /** * Holds (list of columns/attributes) to incude when comparing compound types */ - include_list ut_matcher_config_items, + include ut_matcher_options_items, /** * Holds list of columns to be used as a join PK on sys_refcursor comparision */ - join_by_list ut_matcher_config_items, + join_by ut_matcher_options_items, - constructor function ut_matcher_config(self in out nocopy ut_matcher_config, a_nulls_are_equal in boolean := null) return self as result, - member procedure nulls_are_equal(self in out nocopy ut_matcher_config), + constructor function ut_matcher_options(self in out nocopy ut_matcher_options, a_nulls_are_equal in boolean := null) return self as result, + member procedure nulls_are_equal(self in out nocopy ut_matcher_options), member function nulls_are_equal return boolean, - member procedure include(self in out nocopy ut_matcher_config, a_include varchar2), - member procedure include(self in out nocopy ut_matcher_config, a_include ut_varchar2_list), - member function include return ut_varchar2_list, - member procedure exclude(self in out nocopy ut_matcher_config, a_exclude varchar2), - member procedure exclude(self in out nocopy ut_matcher_config, a_exclude ut_varchar2_list), - member function exclude return ut_varchar2_list, - member procedure join_by(self in out nocopy ut_matcher_config, a_join_by varchar2), - member procedure join_by(self in out nocopy ut_matcher_config, a_join_by ut_varchar2_list), - member function join_by return ut_varchar2_list, - member procedure unordered_columns(self in out nocopy ut_matcher_config), + member procedure unordered_columns(self in out nocopy ut_matcher_options), member function ordered_columns return boolean, - member procedure unordered(self in out nocopy ut_matcher_config), + member procedure unordered(self in out nocopy ut_matcher_options), member function unordered return boolean ) / diff --git a/source/expectations/matchers/ut_matcher_config_items.tpb b/source/expectations/matchers/ut_matcher_options_items.tpb similarity index 77% rename from source/expectations/matchers/ut_matcher_config_items.tpb rename to source/expectations/matchers/ut_matcher_options_items.tpb index 044cd59a1..575537417 100644 --- a/source/expectations/matchers/ut_matcher_config_items.tpb +++ b/source/expectations/matchers/ut_matcher_options_items.tpb @@ -1,4 +1,4 @@ -create or replace type body ut_matcher_config_items is +create or replace type body ut_matcher_options_items is /* utPLSQL - Version 3 Copyright 2016 - 2018 utPLSQL Project @@ -16,13 +16,13 @@ create or replace type body ut_matcher_config_items is limitations under the License. */ - constructor function ut_matcher_config_items(self in out nocopy ut_matcher_config_items) return self as result is + constructor function ut_matcher_options_items(self in out nocopy ut_matcher_options_items) return self as result is begin items := ut_varchar2_list(); return; end; - member procedure add_items(self in out nocopy ut_matcher_config_items, a_items varchar2) is + member procedure add_items(self in out nocopy ut_matcher_options_items, a_items varchar2) is begin items := items @@ -35,7 +35,7 @@ create or replace type body ut_matcher_config_items is ); end; - member procedure add_items(self in out nocopy ut_matcher_config_items, a_items ut_varchar2_list) is + member procedure add_items(self in out nocopy ut_matcher_options_items, a_items ut_varchar2_list) is l_idx binary_integer; begin if a_items is not null then diff --git a/source/expectations/matchers/ut_matcher_config_items.tps b/source/expectations/matchers/ut_matcher_options_items.tps similarity index 65% rename from source/expectations/matchers/ut_matcher_config_items.tps rename to source/expectations/matchers/ut_matcher_options_items.tps index 8aa665fcd..81ee17897 100644 --- a/source/expectations/matchers/ut_matcher_config_items.tps +++ b/source/expectations/matchers/ut_matcher_options_items.tps @@ -1,4 +1,4 @@ -create or replace type ut_matcher_config_items authid current_user as object( +create or replace type ut_matcher_options_items authid current_user as object( /* utPLSQL - Version 3 Copyright 2016 - 2018 utPLSQL Project @@ -21,9 +21,9 @@ create or replace type ut_matcher_config_items authid current_user as object( */ items ut_varchar2_list, - constructor function ut_matcher_config_items(self in out nocopy ut_matcher_config_items) return self as result, - member procedure add_items(self in out nocopy ut_matcher_config_items, a_items varchar2), - member procedure add_items(self in out nocopy ut_matcher_config_items, a_items ut_varchar2_list), + constructor function ut_matcher_options_items(self in out nocopy ut_matcher_options_items) return self as result, + member procedure add_items(self in out nocopy ut_matcher_options_items, a_items varchar2), + member procedure add_items(self in out nocopy ut_matcher_options_items, a_items ut_varchar2_list), member function to_xpath return varchar2 ) / diff --git a/source/install.sql b/source/install.sql index 42dd23dd3..a4c05053c 100644 --- a/source/install.sql +++ b/source/install.sql @@ -182,6 +182,8 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/data_values/ut_cursor_column.tps' @@install_component.sql 'expectations/data_values/ut_cursor_column_tab.tps' @@install_component.sql 'expectations/data_values/ut_cursor_details.tps' +@@install_component.sql 'expectations/matchers/ut_matcher_options_items.tps' +@@install_component.sql 'expectations/matchers/ut_matcher_options.tps' @@install_component.sql 'expectations/data_values/ut_data_value.tps' @@install_component.sql 'expectations/data_values/ut_compound_data_value.tps' @@install_component.sql 'expectations/data_values/ut_data_value_anydata.tps' @@ -203,8 +205,6 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/data_values/ut_key_anyval_pair.tps' @@install_component.sql 'expectations/data_values/ut_key_anyval_pairs.tps' @@install_component.sql 'expectations/data_values/ut_compound_data_helper.pks' -@@install_component.sql 'expectations/matchers/ut_matcher_config_items.tps' -@@install_component.sql 'expectations/matchers/ut_matcher_config.tps' @@install_component.sql 'expectations/matchers/ut_matcher.tps' @@install_component.sql 'expectations/matchers/ut_comparison_matcher.tps' @@install_component.sql 'expectations/matchers/ut_be_false.tps' @@ -227,6 +227,9 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/data_values/ut_cursor_details.tpb' @@install_component.sql 'expectations/ut_expectation_compound.tps' @@install_component.sql 'expectations/ut_expectation_refcursor.tps' + +@@install_component.sql 'expectations/matchers/ut_matcher_options_items.tpb' +@@install_component.sql 'expectations/matchers/ut_matcher_options.tpb' @@install_component.sql 'expectations/data_values/ut_data_value.tpb' @@install_component.sql 'expectations/data_values/ut_compound_data_value.tpb' @@install_component.sql 'expectations/data_values/ut_compound_data_helper.pkb' @@ -246,8 +249,6 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/data_values/ut_data_value_varchar2.tpb' @@install_component.sql 'expectations/data_values/ut_data_value_yminterval.tpb' @@install_component.sql 'expectations/data_values/ut_data_value_xmltype.tpb' -@@install_component.sql 'expectations/matchers/ut_matcher_config_items.tpb' -@@install_component.sql 'expectations/matchers/ut_matcher_config.tpb' @@install_component.sql 'expectations/matchers/ut_matcher.tpb' @@install_component.sql 'expectations/matchers/ut_comparison_matcher.tpb' @@install_component.sql 'expectations/matchers/ut_be_false.tpb' diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index 2c3425617..7e6e74cfa 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -117,10 +117,6 @@ drop type ut_comparison_matcher force; drop type ut_matcher force; -drop type ut_matcher_config force; - -drop type ut_matcher_config_items force; - drop type ut_data_value_yminterval force; drop type ut_data_value_varchar2 force; @@ -155,6 +151,10 @@ drop type ut_data_value_xmltype force; drop type ut_data_value force; +drop type ut_matcher_options force; + +drop type ut_matcher_options_items force; + drop type ut_cursor_details force; drop type ut_cursor_column_tab force; From 90aca9f94b9e9f66d5274fddc8c1b9f3c0f907ff Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 15 Feb 2019 02:26:52 +0000 Subject: [PATCH 0223/1096] Refactoring - to be continued. --- .../data_values/ut_data_value_refcursor.tpb | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index f7a7805ec..c31c15c50 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -161,16 +161,22 @@ create or replace type body ut_data_value_refcursor as end; function remove_incomparable_cols( - a_cursor_details ut_cursor_column_tab,a_column_diffs ut_compound_data_helper.tt_column_diffs + a_cursor_details ut_cursor_column_tab, a_column_diffs ut_compound_data_helper.tt_column_diffs ) return ut_cursor_column_tab is - l_result ut_cursor_column_tab; + l_missing_cols ut_varchar2_list := ut_varchar2_list(); + l_result ut_cursor_column_tab; begin + for i in 1 .. a_column_diffs.count loop + if a_column_diffs(i).diff_type in ('-','+') then + l_missing_cols.extend; + l_missing_cols(l_missing_cols.last) := coalesce(a_column_diffs(i).expected_name, a_column_diffs(i).actual_name); + end if; + end loop; select value(i) bulk collect into l_result from table(a_cursor_details) i where i.access_path not in ( - select coalesce( c.expected_name, c.actual_name ) - from table(a_column_diffs) c - where c.diff_type in ('-','+') + select c.column_value + from table(l_missing_cols) c ); return l_result; end; From 24c14f9afb25593cde48eaa88a3171505b5972a4 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 16 Feb 2019 00:58:41 +0000 Subject: [PATCH 0224/1096] Refactoring - to be continued. --- .../data_values/ut_compound_data_helper.pkb | 76 +++---- .../data_values/ut_compound_data_helper.pks | 9 +- .../data_values/ut_cursor_details.tpb | 80 +++++-- .../data_values/ut_cursor_details.tps | 8 +- .../data_values/ut_data_value_refcursor.tpb | 203 +++++++----------- .../data_values/ut_data_value_refcursor.tps | 3 +- source/expectations/matchers/ut_equal.tpb | 10 +- source/expectations/matchers/ut_include.tpb | 10 +- 8 files changed, 185 insertions(+), 214 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 80dbf46c2..66d433b23 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -264,7 +264,7 @@ create or replace package body ut_compound_data_helper is l_partition_tmp clob; l_col_name varchar2(100); begin - if l_cursor_info is not null then + if l_cursor_info is not empty then --Parition by piece ut_utils.append_to_clob(a_partition_stmt,', row_number() over (partition by '); for i in 1..l_cursor_info.count loop @@ -321,8 +321,11 @@ create or replace package body ut_compound_data_helper is function gen_compare_sql( - a_inclusion_type boolean, a_is_negated boolean, a_unordered boolean, - a_other ut_data_value_refcursor := null, a_join_by_list ut_varchar2_list := ut_varchar2_list() + a_other ut_data_value_refcursor, + a_join_by_list ut_varchar2_list, + a_unordered boolean, + a_inclusion_type boolean, + a_is_negated boolean ) return clob is l_compare_sql clob; l_temp_string varchar2(32767); @@ -372,35 +375,35 @@ create or replace package body ut_compound_data_helper is end if; if (a_join_by_list.count = 0) and a_unordered then - -- If no key defined do the join on all columns - ut_utils.append_to_clob(l_compare_sql,l_equal_stmt); - elsif (a_join_by_list.count > 0) and a_unordered then - -- If key defined do the join or these and where on diffrences - ut_utils.append_to_clob(l_compare_sql,l_join_on_stmt); - elsif not a_unordered then - ut_utils.append_to_clob(l_compare_sql, 'a.item_no = e.item_no ' ); - end if; + -- If no key defined do the join on all columns + ut_utils.append_to_clob(l_compare_sql,l_equal_stmt); + elsif (a_join_by_list.count > 0) and a_unordered then + -- If key defined do the join or these and where on diffrences + ut_utils.append_to_clob(l_compare_sql,l_join_on_stmt); + elsif not a_unordered then + ut_utils.append_to_clob(l_compare_sql, 'a.item_no = e.item_no ' ); + end if; - ut_utils.append_to_clob(l_compare_sql,' ) where '); + ut_utils.append_to_clob(l_compare_sql,' ) where '); - if (a_join_by_list.count > 0) and (a_unordered) and (not a_is_negated) then - if l_not_equal_stmt is not null then - ut_utils.append_to_clob(l_compare_sql,' ( '||l_not_equal_stmt||' ) or '); - end if; - elsif not a_unordered and l_not_equal_stmt is not null then - ut_utils.append_to_clob(l_compare_sql,' ( '||l_not_equal_stmt||' ) or '); - end if; + if (a_join_by_list.count > 0) and (a_unordered) and (not a_is_negated) then + if l_not_equal_stmt is not null then + ut_utils.append_to_clob(l_compare_sql,' ( '||l_not_equal_stmt||' ) or '); + end if; + elsif not a_unordered and l_not_equal_stmt is not null then + ut_utils.append_to_clob(l_compare_sql,' ( '||l_not_equal_stmt||' ) or '); + end if; - --If its inlcusion we expect a actual set to fully match and have no extra elements over expected - if a_inclusion_type and not(a_is_negated) then - l_temp_string := ' ( a.data_id is null ) '; - elsif a_inclusion_type and a_is_negated then - l_temp_string := ' 1 = 1 '; - else - l_temp_string := ' (a.data_id is null or e.data_id is null) '; - end if; - ut_utils.append_to_clob(l_compare_sql,l_temp_string); - return l_compare_sql; + --If its inlcusion we expect a actual set to fully match and have no extra elements over expected + if a_inclusion_type and not(a_is_negated) then + l_temp_string := ' ( a.data_id is null ) '; + elsif a_inclusion_type and a_is_negated then + l_temp_string := ' 1 = 1 '; + else + l_temp_string := ' (a.data_id is null or e.data_id is null) '; + end if; + ut_utils.append_to_clob(l_compare_sql,l_temp_string); + return l_compare_sql; end; function get_column_extract_path(a_cursor_info ut_cursor_column_tab) return ut_varchar2_list is @@ -631,21 +634,6 @@ create or replace package body ut_compound_data_helper is return g_diff_count; end; - function getxmlchildren(a_parent_name varchar2,a_cursor_table ut_cursor_column_tab) - return xmltype is - l_result xmltype; - begin - select xmlagg(xmlelement(evalname t.column_name,t.column_type, - getxmlchildren(t.column_name,a_cursor_table))) - into l_result - from table(a_cursor_table) t - where (a_parent_name is not null and parent_name = a_parent_name and hierarchy_level > 1 and column_name is not null) - or (a_parent_name is null and parent_name is null and hierarchy_level = 1 and column_name is not null) - having count(*) > 0; - - return l_result; - end; - function is_sql_compare_allowed(a_type_name varchar2) return boolean is l_assert boolean; diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 4d1d9398c..3ecb8adc3 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -81,8 +81,11 @@ create or replace package ut_compound_data_helper authid definer is function get_fixed_size_hash(a_string varchar2, a_base integer :=0,a_size integer :=9999999) return number; function gen_compare_sql( - a_inclusion_type boolean, a_is_negated boolean, a_unordered boolean, - a_other ut_data_value_refcursor :=null, a_join_by_list ut_varchar2_list:=ut_varchar2_list() + a_other ut_data_value_refcursor, + a_join_by_list ut_varchar2_list, + a_unordered boolean, + a_inclusion_type boolean, + a_is_negated boolean ) return clob; procedure insert_diffs_result(a_diff_tab t_diff_tab, a_diff_id raw); @@ -92,8 +95,6 @@ create or replace package ut_compound_data_helper authid definer is procedure cleanup_diff; function get_rows_diff_count return integer; - - function getxmlchildren(a_parent_name varchar2,a_cursor_table ut_cursor_column_tab) return xmltype; function is_sql_compare_allowed(a_type_name varchar2) return boolean; diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb index 7eada79f2..3b6e8a3a4 100644 --- a/source/expectations/data_values/ut_cursor_details.tpb +++ b/source/expectations/data_values/ut_cursor_details.tpb @@ -1,27 +1,17 @@ create or replace type body ut_cursor_details as - order member function compare(a_other ut_cursor_details) return integer is + member function equals( a_other ut_cursor_details, a_match_options ut_matcher_options ) return boolean is l_diffs integer; begin - if self.is_column_order_enforced = 1 then - select count(1) into l_diffs + select count(1) into l_diffs from table(self.cursor_columns_info) a full outer join table(a_other.cursor_columns_info) e - on decode(a.parent_name,e.parent_name,1,0)= 1 - and a.column_name = e.column_name - and replace(a.column_type,'VARCHAR2','CHAR') = replace(e.column_type,'VARCHAR2','CHAR') - and a.column_position = e.column_position - where a.column_name is null or e.column_name is null; - else - select count(1) into l_diffs - from table(self.cursor_columns_info) a - full outer join table(a_other.cursor_columns_info) e - on decode(a.parent_name,e.parent_name,1,0)= 1 - and a.column_name = e.column_name - and replace(a.column_type,'VARCHAR2','CHAR') = replace(e.column_type,'VARCHAR2','CHAR') - where a.column_name is null or e.column_name is null; - end if; - return l_diffs; + on decode(a.parent_name,e.parent_name,1,0)= 1 + and a.column_name = e.column_name + and replace(a.column_type,'VARCHAR2','CHAR') = replace(e.column_type,'VARCHAR2','CHAR') + and ( a.column_position = e.column_position or a_match_options.columns_are_unordered_flag = 1 ) + where a.column_name is null or e.column_name is null; + return l_diffs = 0; end; member procedure desc_compound_data( @@ -152,7 +142,7 @@ create or replace type body ut_cursor_details as return l_collection_elements > 0; end; - member function get_missing_filter_columns( a_expected_columns ut_varchar2_list ) return ut_varchar2_list is + member function get_missing_join_by_columns( a_expected_columns ut_varchar2_list ) return ut_varchar2_list is l_result ut_varchar2_list; begin select fl.column_value @@ -166,10 +156,58 @@ create or replace type body ut_cursor_details as return l_result; end; - member procedure ordered_columns(self in out nocopy ut_cursor_details,a_ordered_columns boolean := false) is + member procedure filter_columns(self in out nocopy ut_cursor_details, a_match_options ut_matcher_options) is + l_result ut_cursor_details := self; + c_xpath_extract_reg constant varchar2(50) := '^((/ROW/)|^(//)|^(/\*/))?(.*)'; begin - self.is_column_order_enforced := ut_utils.boolean_to_int(a_ordered_columns); + if l_result.cursor_columns_info is not null then + + --limit columns to those on the include items minus exclude items + if a_match_options.include.items.count > 0 then + -- if include - exclude = 0 then keep all columns + if a_match_options.include.items != a_match_options.exclude.items then + with included_columns as ( + select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names + from table(a_match_options.include.items) + minus + select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names + from table(a_match_options.exclude.items) + ) + select value(x) + bulk collect into l_result.cursor_columns_info + from table(self.cursor_columns_info) x + where exists( + select 1 from included_columns f where regexp_like( x.access_path, '^'||f.col_names||'($|/.*)' ) + ); + end if; + elsif a_match_options.exclude.items.count > 0 then + with excluded_columns as ( + select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names + from table(a_match_options.exclude.items) + ) + select value(x) + bulk collect into l_result.cursor_columns_info + from table(self.cursor_columns_info) x + where not exists( + select 1 from excluded_columns f where regexp_like( x.access_path, '^'||f.col_names||'($|/.*)' ) + ); + end if; + self := l_result; + end if; end; + member function get_xml_children(a_parent_name varchar2 := null) return xmltype is + l_result xmltype; + begin + select xmlagg(xmlelement(evalname t.column_name,t.column_type, + self.get_xml_children(t.column_name))) + into l_result + from table(self.cursor_columns_info) t + where (a_parent_name is not null and parent_name = a_parent_name and hierarchy_level > 1 and column_name is not null) + or (a_parent_name is null and parent_name is null and hierarchy_level = 1 and column_name is not null) + having count(*) > 0; + + return l_result; + end; end; / diff --git a/source/expectations/data_values/ut_cursor_details.tps b/source/expectations/data_values/ut_cursor_details.tps index c65e68ff0..c2aa98066 100644 --- a/source/expectations/data_values/ut_cursor_details.tps +++ b/source/expectations/data_values/ut_cursor_details.tps @@ -16,13 +16,12 @@ create or replace type ut_cursor_details force authid current_user as object ( limitations under the License. */ cursor_columns_info ut_cursor_column_tab, - is_column_order_enforced number(1,0), constructor function ut_cursor_details(self in out nocopy ut_cursor_details) return self as result, constructor function ut_cursor_details( self in out nocopy ut_cursor_details,a_cursor_number in number ) return self as result, - order member function compare(a_other ut_cursor_details) return integer, + member function equals(a_other ut_cursor_details, a_match_options ut_matcher_options) return boolean, member procedure desc_compound_data( self in out nocopy ut_cursor_details, a_compound_data anytype, @@ -31,7 +30,8 @@ create or replace type ut_cursor_details force authid current_user as object ( a_access_path in varchar2 ), member function contains_collection return boolean, - member function get_missing_filter_columns( a_expected_columns ut_varchar2_list ) return ut_varchar2_list, - member procedure ordered_columns(self in out nocopy ut_cursor_details, a_ordered_columns boolean := false) + member function get_missing_join_by_columns( a_expected_columns ut_varchar2_list ) return ut_varchar2_list, + member procedure filter_columns(self in out nocopy ut_cursor_details, a_match_options ut_matcher_options), + member function get_xml_children(a_parent_name varchar2 := null) return xmltype ) / diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index c31c15c50..0696f336d 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -77,7 +77,8 @@ create or replace type body ut_data_value_refcursor as self.data_id := sys_guid(); self.data_type := 'refcursor'; ut_compound_data_helper.cleanup_diff; - + self.cursor_details := ut_cursor_details(); + if l_cursor is not null then if l_cursor%isopen then --Get some more info regarding cursor, including if it containts collection columns and what is their name @@ -103,19 +104,12 @@ create or replace type body ut_data_value_refcursor as overriding member function to_string return varchar2 is l_result clob; l_result_string varchar2(32767); - l_cursor_details ut_cursor_column_tab := self.cursor_details.cursor_columns_info; - - l_query varchar2(32767); - l_column_info xmltype; - begin if not self.is_null() then dbms_lob.createtemporary(l_result, true); ut_utils.append_to_clob(l_result, 'Data-types:'||chr(10)); - - l_column_info := ut_compound_data_helper.getxmlchildren(null,l_cursor_details); - ut_utils.append_to_clob(l_result, l_column_info.getclobval()); + ut_utils.append_to_clob( l_result, self.cursor_details.get_xml_children().getclobval() ); ut_utils.append_to_clob(l_result,chr(10)||(self as ut_compound_data_value).to_string()); l_result_string := ut_utils.to_string(l_result,null); dbms_lob.freetemporary(l_result); @@ -128,23 +122,21 @@ create or replace type body ut_data_value_refcursor as l_results ut_utils.t_clob_tab := ut_utils.t_clob_tab(); l_result_string varchar2(32767); l_other ut_data_value_refcursor; - l_column_diffs ut_compound_data_helper.tt_column_diffs := ut_compound_data_helper.tt_column_diffs(); + l_self ut_data_value_refcursor := self; + l_column_diffs ut_compound_data_helper.tt_column_diffs; - l_act_cols ut_cursor_column_tab; - l_exp_cols ut_cursor_column_tab; + l_other_cols ut_cursor_column_tab; + l_self_cols ut_cursor_column_tab; l_act_missing_pk ut_varchar2_list := ut_varchar2_list(); l_exp_missing_pk ut_varchar2_list := ut_varchar2_list(); - l_col_diffs ut_compound_data_helper.tt_column_diffs := ut_compound_data_helper.tt_column_diffs(); - + c_max_rows integer := ut_utils.gc_diff_max_rows; l_diff_id ut_compound_data_helper.t_hash; l_diff_row_count integer; l_row_diffs ut_compound_data_helper.tt_row_diffs; l_message varchar2(32767); - l_column_order_enforce boolean := ut_utils.int_to_boolean(self.cursor_details.is_column_order_enforced); - function get_col_diff_text(a_col ut_compound_data_helper.t_column_diffs) return varchar2 is begin return @@ -199,49 +191,57 @@ create or replace type body ut_data_value_refcursor as raise value_error; end if; l_other := treat(a_other as ut_data_value_refcursor); + l_other.cursor_details.filter_columns(a_match_options); + l_self.cursor_details.filter_columns(a_match_options); - l_act_cols := l_other.cursor_details.cursor_columns_info; - l_exp_cols := self.cursor_details.cursor_columns_info; + l_other_cols := l_other.cursor_details.cursor_columns_info; + l_self_cols := l_self.cursor_details.cursor_columns_info; dbms_lob.createtemporary(l_result,true); --diff columns - if not self.is_null and not l_other.is_null then - l_column_diffs := ut_compound_data_helper.get_columns_diff(self.cursor_details.cursor_columns_info,l_other.cursor_details.cursor_columns_info,l_column_order_enforce); + if not l_self.is_null and not l_other.is_null then + l_column_diffs := ut_compound_data_helper.get_columns_diff( + l_self.cursor_details.cursor_columns_info, + l_other.cursor_details.cursor_columns_info, + a_match_options.ordered_columns() + ); if l_column_diffs.count > 0 then ut_utils.append_to_clob(l_result,chr(10) || 'Columns:' || chr(10)); + l_other_cols := remove_incomparable_cols( l_other_cols, l_column_diffs ); + l_self_cols := remove_incomparable_cols( l_self_cols, l_column_diffs ); + for i in 1 .. l_column_diffs.count loop + l_results.extend; + l_results(l_results.last) := get_col_diff_text(l_column_diffs(i)); + end loop; + ut_utils.append_to_clob(l_result, l_results); end if; - for i in 1 .. l_column_diffs.count loop - l_results.extend; - l_results(l_results.last) := get_col_diff_text(l_column_diffs(i)); - end loop; - ut_utils.append_to_clob(l_result, l_results); - l_act_cols := remove_incomparable_cols(l_other.cursor_details.cursor_columns_info, l_column_diffs); - l_exp_cols := remove_incomparable_cols(self.cursor_details.cursor_columns_info, l_column_diffs); end if; --check for missing pk if a_match_options.join_by.items.count > 0 then - l_act_missing_pk := l_other.cursor_details.get_missing_filter_columns( a_match_options.join_by.items ); - l_exp_missing_pk := self.cursor_details.get_missing_filter_columns( a_match_options.join_by.items ); + l_act_missing_pk := l_other.cursor_details.get_missing_join_by_columns( a_match_options.join_by.items ); + l_exp_missing_pk := l_self.cursor_details.get_missing_join_by_columns( a_match_options.join_by.items ); end if; --diff rows and row elements if the pk is not missing if l_act_missing_pk.count + l_exp_missing_pk.count = 0 then - l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); + l_diff_id := ut_compound_data_helper.get_hash( l_self.data_id || l_other.data_id ); - -- First tell how many rows are different - l_diff_row_count := ut_compound_data_helper.get_rows_diff_count; - l_results := ut_utils.t_clob_tab(); + -- First tell how many rows are different + l_diff_row_count := ut_compound_data_helper.get_rows_diff_count; if l_diff_row_count > 0 then l_row_diffs := ut_compound_data_helper.get_rows_diff_by_sql( - l_exp_cols, l_act_cols, self.data_id, l_other.data_id, l_diff_id, a_match_options.join_by.items , a_match_options.unordered, l_column_order_enforce - ); + l_self_cols, l_other_cols, l_self.data_id, l_other.data_id, + l_diff_id, a_match_options.join_by.items, a_match_options.unordered, + a_match_options.ordered_columns() + ); l_message := chr(10) ||'Rows: [ ' || l_diff_row_count ||' differences' || case when l_diff_row_count > c_max_rows and l_row_diffs.count > 0 then ', showing first '||c_max_rows end ||' ]'||chr(10)|| case when l_row_diffs.count = 0 then ' All rows are different as the columns are not matching.' else null end; ut_utils.append_to_clob( l_result, l_message ); + l_results := ut_utils.t_clob_tab(); for i in 1 .. l_row_diffs.count loop l_results.extend; l_results(l_results.last) := get_diff_message(l_row_diffs(i),a_match_options.unordered); @@ -255,16 +255,14 @@ create or replace type body ut_data_value_refcursor as ut_utils.append_to_clob(l_result,chr(10) || 'Unable to join sets:' || chr(10)); for i in 1 .. l_exp_missing_pk.count loop - l_results.extend; ut_utils.append_to_clob(l_result, ' Join key '||l_exp_missing_pk(i)||' does not exists in expected'||chr(10)); end loop; for i in 1 .. l_act_missing_pk.count loop - l_results.extend; ut_utils.append_to_clob(l_result, ' Join key '||l_act_missing_pk(i)||' does not exists in actual'||chr(10)); end loop; - if self.cursor_details.contains_collection() or l_other.cursor_details.contains_collection() then + if l_self.cursor_details.contains_collection() or l_other.cursor_details.contains_collection() then ut_utils.append_to_clob(l_result,' Please make sure that your join clause is not refferring to collection element'|| chr(10)); end if; @@ -276,80 +274,79 @@ create or replace type body ut_data_value_refcursor as end; member function compare_implementation( - a_other ut_data_value, - a_match_options ut_matcher_options, + a_other ut_data_value, + a_match_options ut_matcher_options, a_inclusion_compare boolean := false, - a_is_negated boolean := false + a_is_negated boolean := false ) return integer is - l_result integer := 0; - l_other ut_data_value_refcursor; + l_result integer := 0; + l_self ut_data_value_refcursor := self; + l_other ut_data_value_refcursor; + l_diff_cursor_text clob; + function compare_data( - a_other ut_data_value_refcursor, - a_match_options ut_matcher_options, - a_inclusion_compare boolean, - a_is_negated boolean + a_self ut_data_value_refcursor, + a_other ut_data_value_refcursor, + a_diff_cursor_text clob ) return integer is - l_diff_id ut_compound_data_helper.t_hash; l_result integer; --We will start with number od differences being displayed. - l_max_rows integer := ut_utils.gc_diff_max_rows; - - l_loop_curs sys_refcursor; + l_cursor sys_refcursor; l_diff_tab ut_compound_data_helper.t_diff_tab; - l_sql_rowcount integer :=0; - + l_diif_rowcount integer :=0; begin - l_diff_id := ut_compound_data_helper.get_hash(self.data_id||a_other.data_id); - open l_loop_curs for - ut_compound_data_helper.gen_compare_sql( - a_inclusion_compare, - a_is_negated, - a_match_options.unordered(), - a_other, - a_match_options.join_by.items - ) using self.data_id, a_other.data_id; + l_diff_id := ut_compound_data_helper.get_hash(a_self.data_id||a_other.data_id); + open l_cursor for a_diff_cursor_text using a_self.data_id, a_other.data_id; + --fetch and save rows for display of diff + fetch l_cursor bulk collect into l_diff_tab limit ut_utils.gc_diff_max_rows; + ut_compound_data_helper.insert_diffs_result( l_diff_tab, l_diff_id ); + --fetch rows for count only loop - fetch l_loop_curs bulk collect into l_diff_tab limit l_max_rows; exit when l_diff_tab.count = 0; - if (ut_utils.gc_diff_max_rows > l_sql_rowcount ) then - ut_compound_data_helper.insert_diffs_result( l_diff_tab, l_diff_id ); - end if; - l_sql_rowcount := l_sql_rowcount + l_diff_tab.count; - if (ut_utils.gc_diff_max_rows <= l_sql_rowcount and l_max_rows != ut_utils.gc_bc_fetch_limit ) then - l_max_rows := ut_utils.gc_bc_fetch_limit; - end if; + l_diif_rowcount := l_diif_rowcount + l_diff_tab.count; + fetch l_cursor bulk collect into l_diff_tab limit ut_utils.gc_bc_fetch_limit; end loop; - ut_compound_data_helper.set_rows_diff(l_sql_rowcount); + ut_compound_data_helper.set_rows_diff(l_diif_rowcount); + --result is OK only if both are same - if l_sql_rowcount = 0 and ( self.elements_count = a_other.elements_count or a_inclusion_compare ) then + if l_diif_rowcount = 0 and a_self.is_null = a_other.is_null then l_result := 0; else l_result := 1; end if; - + close l_cursor; return l_result; end; - - begin + begin if not a_other is of (ut_data_value_refcursor) then raise value_error; end if; - - l_other := treat(a_other as ut_data_value_refcursor); - + + l_other := treat(a_other as ut_data_value_refcursor); + l_other.cursor_details.filter_columns( a_match_options ); + l_self.cursor_details.filter_columns( a_match_options ); + if a_match_options.join_by.items.count > 0 then l_result := - self.cursor_details.get_missing_filter_columns( a_match_options.join_by.items ).count - + l_other.cursor_details.get_missing_filter_columns( a_match_options.join_by.items ).count; + l_self.cursor_details.get_missing_join_by_columns( a_match_options.join_by.items ).count + + l_other.cursor_details.get_missing_join_by_columns( a_match_options.join_by.items ).count; end if; if l_result = 0 then - if not self.is_null() and not l_other.is_null() and self.cursor_details != l_other.cursor_details then + if not l_self.is_null() and not l_other.is_null() and not l_self.cursor_details.equals( l_other.cursor_details, a_match_options ) then l_result := 1; end if; - l_result := l_result + compare_data( l_other, a_match_options, a_inclusion_compare, a_is_negated ); + l_diff_cursor_text := ut_compound_data_helper.gen_compare_sql( + l_other, + a_match_options.join_by.items, + a_match_options.unordered(), + a_inclusion_compare, + a_is_negated + ); + -- dbms_output.put_line(substr(l_cursor_text,1,32767)); + l_result := l_result + compare_data( l_self, l_other, l_diff_cursor_text ); end if; return l_result; end; @@ -359,47 +356,5 @@ create or replace type body ut_data_value_refcursor as return self.elements_count = 0; end; - member function update_cursor_details (a_match_options ut_matcher_options) return ut_data_value_refcursor is - l_result ut_data_value_refcursor := self; - c_xpath_extract_reg constant varchar2(50) := '^((/ROW/)|^(//)|^(/\*/))?(.*)'; - begin - if l_result.cursor_details.cursor_columns_info is not null then - - --limit columns to those on the include items minus exclude items - if a_match_options.include.items.count > 0 then - -- if include - exclude = 0 then keep all columns - if a_match_options.include.items != a_match_options.exclude.items then - with included_columns as ( - select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names - from table(a_match_options.include.items) - minus - select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names - from table(a_match_options.exclude.items) - ) - select value(x) - bulk collect into l_result.cursor_details.cursor_columns_info - from table(self.cursor_details.cursor_columns_info) x - where exists( - select 1 from included_columns f where regexp_like( x.access_path, '^'||f.col_names||'($|/.*)' ) - ); - end if; - elsif a_match_options.exclude.items.count > 0 then - with excluded_columns as ( - select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names - from table(a_match_options.exclude.items) - ) - select value(x) - bulk collect into l_result.cursor_details.cursor_columns_info - from table(self.cursor_details.cursor_columns_info) x - where not exists( - select 1 from excluded_columns f where regexp_like( x.access_path, '^'||f.col_names||'($|/.*)' ) - ); - end if; - - l_result.cursor_details.ordered_columns(a_match_options.ordered_columns()); - end if; - return l_result; - end; - end; / diff --git a/source/expectations/data_values/ut_data_value_refcursor.tps b/source/expectations/data_values/ut_data_value_refcursor.tps index 52d4b1c44..dfd9228af 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tps +++ b/source/expectations/data_values/ut_data_value_refcursor.tps @@ -41,7 +41,6 @@ create or replace type ut_data_value_refcursor under ut_compound_data_value( a_inclusion_compare boolean := false, a_is_negated boolean := false ) return integer, - overriding member function is_empty return boolean, - member function update_cursor_details ( a_match_options ut_matcher_options ) return ut_data_value_refcursor + overriding member function is_empty return boolean ) / diff --git a/source/expectations/matchers/ut_equal.tpb b/source/expectations/matchers/ut_equal.tpb index 027517266..a9fa25b71 100644 --- a/source/expectations/matchers/ut_equal.tpb +++ b/source/expectations/matchers/ut_equal.tpb @@ -217,15 +217,12 @@ create or replace type body ut_equal as overriding member function run_matcher(self in out nocopy ut_equal, a_actual ut_data_value) return boolean is l_result boolean; - l_actual ut_data_value; begin if self.expected.data_type = a_actual.data_type then if self.expected is of (ut_data_value_anydata) then l_result := 0 = treat(self.expected as ut_data_value_anydata).compare_implementation( a_actual, options ); elsif self.expected is of (ut_data_value_refcursor) then - l_actual := treat(a_actual as ut_data_value_refcursor).update_cursor_details( options ); - l_result := 0 = treat(self.expected as ut_data_value_refcursor).update_cursor_details( options ) - .compare_implementation( l_actual, options ); + l_result := 0 = treat(self.expected as ut_data_value_refcursor).compare_implementation( a_actual, options ); else l_result := equal_with_nulls((self.expected = a_actual), a_actual); end if; @@ -238,16 +235,13 @@ create or replace type body ut_equal as overriding member function failure_message(a_actual ut_data_value) return varchar2 is l_result varchar2(32767); - l_actual ut_data_value; begin if self.expected.data_type = a_actual.data_type and self.expected.is_diffable then if self.expected is of (ut_data_value_refcursor) then - l_actual := treat(a_actual as ut_data_value_refcursor).update_cursor_details( options ); l_result := 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() || chr(10) || 'Diff:' || - treat(expected as ut_data_value_refcursor).update_cursor_details( options ) - .diff( l_actual, options ); + treat(expected as ut_data_value_refcursor).diff( a_actual, options ); else l_result := 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() diff --git a/source/expectations/matchers/ut_include.tpb b/source/expectations/matchers/ut_include.tpb index b0dd0b8c4..bf830e34d 100644 --- a/source/expectations/matchers/ut_include.tpb +++ b/source/expectations/matchers/ut_include.tpb @@ -42,15 +42,13 @@ create or replace type body ut_include as overriding member function run_matcher(self in out nocopy ut_include, a_actual ut_data_value) return boolean is l_result boolean; - l_actual ut_data_value; l_result1 integer; begin if self.expected.data_type = a_actual.data_type then - l_actual := treat(a_actual as ut_data_value_refcursor).update_cursor_details( self.options ); l_result := ( 0 - = treat( self.expected as ut_data_value_refcursor ).update_cursor_details( self.options ) - .compare_implementation( l_actual, self.options, get_inclusion_compare(), get_negated() ) + = treat( self.expected as ut_data_value_refcursor ) + .compare_implementation( a_actual, self.options, get_inclusion_compare(), get_negated() ) ); else l_result := (self as ut_matcher).run_matcher(a_actual); @@ -65,14 +63,12 @@ create or replace type body ut_include as overriding member function failure_message(a_actual ut_data_value) return varchar2 is l_result varchar2(32767); - l_actual ut_data_value; begin if self.expected.data_type = a_actual.data_type and self.expected.is_diffable then - l_actual := treat(a_actual as ut_data_value_refcursor).update_cursor_details( self.options ); l_result := 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() || chr(10) || 'Diff:' - || treat(expected as ut_data_value_refcursor).update_cursor_details( self.options ).diff( l_actual, self.options ); + || treat(expected as ut_data_value_refcursor).diff( a_actual, self.options ); else l_result := (self as ut_matcher).failure_message(a_actual) || ': '|| self.expected.to_string_report(); end if; From f850428452ea6f76476fae512d03bb47b29adc35 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 16 Feb 2019 01:23:09 +0000 Subject: [PATCH 0225/1096] Fixed issue with DBMS_LOB.COMPARE when empty XML produced. --- source/expectations/data_values/ut_compound_data_value.tpb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index 67bd9ed77..a20b1c765 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -172,8 +172,9 @@ create or replace type body ut_compound_data_value as on exp.item_no = act.item_no '|| 'where nvl( dbms_lob.compare(' || /*the xmltransform removes column names and leaves column data to be compared only*/ - ' xmltransform(exp.item_data, :l_xml_data_fmt).getclobval()' || - ', xmltransform(act.item_data, :l_xml_data_fmt).getclobval())' || + ' coalesce( xmltransform(exp.item_data, :l_xml_data_fmt).getclobval(), empty_clob() )' || + ', coalesce( xmltransform(act.item_data, :l_xml_data_fmt).getclobval(), empty_clob() )' || + ')' || ',1' || ') != 0' using in l_diff_id, a_match_options.exclude.to_xpath(), a_match_options.include.to_xpath(), self.data_id, From 917828c211fb7b9ecb2a570a5c03e8be1b061ebd Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 17 Feb 2019 23:58:36 +0000 Subject: [PATCH 0226/1096] Refactoring. Moved `is_negated_flag` to `ut_matcher` Changed behavior of `to_` function to consider the `negated` flag. Started refactoring `ut_compound_data_helper` --- .../data_values/ut_compound_data_helper.pkb | 192 +++++++++--------- .../data_values/ut_compound_data_helper.pks | 3 +- source/expectations/matchers/ut_include.tpb | 28 +-- source/expectations/matchers/ut_include.tps | 6 +- source/expectations/matchers/ut_matcher.tpb | 17 ++ source/expectations/matchers/ut_matcher.tps | 6 +- source/expectations/ut_expectation.tpb | 19 +- .../expectations/ut_expectation_compound.tpb | 99 +++------ .../expectations/ut_expectation_compound.tps | 3 +- .../expectations/ut_expectation_refcursor.tpb | 38 +--- 10 files changed, 174 insertions(+), 237 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 66d433b23..238a1aabf 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -48,20 +48,22 @@ create or replace package body ut_compound_data_helper is l_results tt_column_diffs; begin with - expected_cols as - (select access_path exp_column_name,column_position exp_col_pos, - replace(column_type,'VARCHAR2','CHAR') exp_col_type_compare, column_type exp_col_type - from table(a_expected)), - actual_cols as - (select access_path act_column_name,column_position act_col_pos, - replace(column_type,'VARCHAR2','CHAR') act_col_type_compare, column_type act_col_type - from table(a_actual)), - joined_cols as - (select e.*,a.*, - row_number() over(partition by case when a.act_col_pos + e.exp_col_pos is not null then 1 end order by a.act_col_pos) a_pos_nn, - row_number() over(partition by case when a.act_col_pos + e.exp_col_pos is not null then 1 end order by e.exp_col_pos) e_pos_nn - from expected_cols e - full outer join actual_cols a on e.exp_column_name = a.act_column_name) + expected_cols as ( + select access_path exp_column_name,column_position exp_col_pos, + replace(column_type,'VARCHAR2','CHAR') exp_col_type_compare, column_type exp_col_type + from table(a_expected)), + actual_cols as ( + select access_path act_column_name,column_position act_col_pos, + replace(column_type,'VARCHAR2','CHAR') act_col_type_compare, column_type act_col_type + from table(a_actual)), + joined_cols as ( + select e.*,a.*, + row_number() over(partition by case when a.act_col_pos + e.exp_col_pos is not null then 1 end order by a.act_col_pos) a_pos_nn, + row_number() over(partition by case when a.act_col_pos + e.exp_col_pos is not null then 1 end order by e.exp_col_pos) e_pos_nn + from expected_cols e + full outer join actual_cols a + on e.exp_column_name = a.act_column_name + ) select case when exp_col_pos is null and act_col_pos is not null then '+' when exp_col_pos is not null and act_col_pos is null then '-' @@ -87,18 +89,21 @@ create or replace package body ut_compound_data_helper is l_results tt_column_diffs; begin with - expected_cols as - (select access_path exp_column_name,column_position exp_col_pos, - replace(column_type,'VARCHAR2','CHAR') exp_col_type_compare, column_type exp_col_type - from table(a_expected)), - actual_cols as - (select access_path act_column_name,column_position act_col_pos, - replace(column_type,'VARCHAR2','CHAR') act_col_type_compare, column_type act_col_type - from table(a_actual)), - joined_cols as - (select e.*,a.* - from expected_cols e - full outer join actual_cols a on e.exp_column_name = a.act_column_name) + expected_cols as ( + select access_path exp_column_name,column_position exp_col_pos, + replace(column_type,'VARCHAR2','CHAR') exp_col_type_compare, column_type exp_col_type + from table(a_expected) + ), + actual_cols as ( + select access_path act_column_name,column_position act_col_pos, + replace(column_type,'VARCHAR2','CHAR') act_col_type_compare, column_type act_col_type + from table(a_actual)), + joined_cols as ( + select e.*,a.* + from expected_cols e + full outer join actual_cols a + on e.exp_column_name = a.act_column_name + ) select case when exp_col_pos is null and act_col_pos is not null then '+' when exp_col_pos is not null and act_col_pos is null then '-' @@ -126,14 +131,7 @@ create or replace package body ut_compound_data_helper is else get_columns_diff_unordered(a_expected,a_actual) end; end; - - function get_pk_value (a_join_by_xpath varchar2,a_item_data xmltype) return clob is - l_pk_value clob; - begin - select replace((extract(a_item_data,a_join_by_xpath).getclobval()),chr(10)) into l_pk_value from dual; - return l_pk_value; - end; - + procedure generate_not_equal_stmt( a_data_info ut_cursor_column, a_pk_table ut_varchar2_list, a_not_equal_stmt in out nocopy clob, a_col_name varchar2 @@ -149,8 +147,8 @@ create or replace package body ut_compound_data_helper is if a_data_info.access_path = l_pk_tab(l_index) then l_exists := true; end if; - exit when l_index = l_pk_tab.count or (a_data_info.access_path = l_pk_tab(l_index)); - l_index := a_pk_table.next(l_index); + exit when l_index = l_pk_tab.count or (a_data_info.access_path = l_pk_tab(l_index)); + l_index := a_pk_table.next(l_index); end loop; end if; @@ -177,14 +175,14 @@ create or replace package body ut_compound_data_helper is l_sql_stmt := case when a_join_by_stmt is null then null else ' and ' end; l_sql_stmt := l_sql_stmt ||' a.'||a_col_name||q'[ = ]'||' e.'||a_col_name; end if; - exit when (a_data_info.access_path = l_pk_tab(l_index)) or l_index = l_pk_tab.count; - l_index := l_pk_tab.next(l_index); + exit when (a_data_info.access_path = l_pk_tab(l_index)) or l_index = l_pk_tab.count; + l_index := l_pk_tab.next(l_index); end loop; ut_utils.append_to_clob(a_join_by_stmt,l_sql_stmt); end if; end; - procedure generate_equal_sql(a_equal_stmt in out nocopy clob,a_col_name in varchar2) is + procedure generate_equal_sql(a_equal_stmt in out nocopy clob, a_col_name in varchar2) is l_sql_stmt varchar2(32767); begin l_sql_stmt := case when a_equal_stmt is null then null else ' and ' end ||' a.'||a_col_name||q'[ = ]'||' e.'||a_col_name; @@ -225,13 +223,13 @@ create or replace package body ut_compound_data_helper is begin if a_data_info.is_sql_diffable = 0 then l_col_syntax := l_ut_owner ||'.ut_compound_data_helper.get_hash('||l_alias||a_col_name||'.getClobVal()) as '||a_col_name ; - else + else l_col_syntax := l_alias||a_col_name||' as '|| a_col_name; end if; ut_utils.append_to_clob(a_sql_stmt,','||l_col_syntax); end; - procedure generate_xmltab_stmt(a_data_info ut_cursor_column,a_sql_stmt in out nocopy clob, a_col_name varchar2) is + procedure generate_xmltab_stmt(a_data_info ut_cursor_column, a_sql_stmt in out nocopy clob, a_col_name varchar2) is l_sql_stmt varchar2(32767); l_col_type varchar2(4000); begin @@ -247,17 +245,24 @@ create or replace package body ut_compound_data_helper is elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('INTERVAL DAY TO SECOND','INTERVAL YEAR TO MONTH') then l_col_type := a_data_info.column_type; else - l_col_type := a_data_info.column_type||case when a_data_info.column_len is not null then - '('||a_data_info.column_len||')' - else null end; + l_col_type := a_data_info.column_type + ||case when a_data_info.column_len is not null + then '('||a_data_info.column_len||')' + else null + end; end if; - l_sql_stmt := case when a_sql_stmt is null then '' else ', ' end ||a_col_name||' '||l_col_type||q'[ PATH ']'||a_data_info.access_path||q'[']'; + l_sql_stmt := case when a_sql_stmt is not null then ', ' end + ||a_col_name||' '||l_col_type||q'[ PATH ']'||a_data_info.access_path||q'[']'; ut_utils.append_to_clob(a_sql_stmt, l_sql_stmt); end; procedure gen_sql_pieces_out_of_cursor( - a_data_info ut_cursor_column_tab,a_pk_table ut_varchar2_list, a_xml_stmt out nocopy clob, - a_select_stmt out nocopy clob ,a_partition_stmt out nocopy clob, a_equal_stmt out nocopy clob, a_join_by_stmt out nocopy clob, + a_data_info ut_cursor_column_tab, a_pk_table ut_varchar2_list, + a_xml_stmt out nocopy clob, + a_select_stmt out nocopy clob, + a_partition_stmt out nocopy clob, + a_equal_stmt out nocopy clob, + a_join_by_stmt out nocopy clob, a_not_equal_stmt out nocopy clob ) is l_cursor_info ut_cursor_column_tab := a_data_info; @@ -265,27 +270,25 @@ create or replace package body ut_compound_data_helper is l_col_name varchar2(100); begin if l_cursor_info is not empty then - --Parition by piece - ut_utils.append_to_clob(a_partition_stmt,', row_number() over (partition by '); for i in 1..l_cursor_info.count loop if l_cursor_info(i).has_nested_col = 0 then - l_col_name := l_cursor_info(i).transformed_name; - --Get XMLTABLE column list - generate_xmltab_stmt(l_cursor_info(i),a_xml_stmt,l_col_name); - --Get Select statment list of columns - generate_select_stmt(l_cursor_info(i),a_select_stmt,l_col_name); - --Get columns by which we partition - generate_partition_stmt(l_cursor_info(i),l_partition_tmp,a_pk_table,l_col_name); - --Get equal statement - generate_equal_sql(a_equal_stmt,l_col_name); - --Generate join by stmt - generate_join_by_stmt(l_cursor_info(i),a_pk_table,a_join_by_stmt,l_col_name); - --Generate not equal stmt - generate_not_equal_stmt(l_cursor_info(i),a_pk_table,a_not_equal_stmt,l_col_name); - end if; + l_col_name := l_cursor_info(i).transformed_name; + --Get XMLTABLE column list + generate_xmltab_stmt(l_cursor_info(i),a_xml_stmt,l_col_name); + --Get Select statment list of columns + generate_select_stmt(l_cursor_info(i),a_select_stmt,l_col_name); + --Get columns by which we partition + generate_partition_stmt(l_cursor_info(i),l_partition_tmp,a_pk_table,l_col_name); + --Get equal statement + generate_equal_sql(a_equal_stmt,l_col_name); + --Generate join by stmt + generate_join_by_stmt(l_cursor_info(i),a_pk_table,a_join_by_stmt,l_col_name); + --Generate not equal stmt + generate_not_equal_stmt(l_cursor_info(i),a_pk_table,a_not_equal_stmt,l_col_name); + end if; end loop; - --Finish partition by - ut_utils.append_to_clob(a_partition_stmt,l_partition_tmp||' order by '||l_partition_tmp||' ) dup_no '); + ut_utils.append_to_clob(a_partition_stmt,', row_number() over (partition by '); + ut_utils.append_to_clob(a_partition_stmt, l_partition_tmp||' order by '||l_partition_tmp||' ) dup_no '); else --Partition by piece when no data ut_utils.append_to_clob(a_partition_stmt,', 1 dup_no '); @@ -294,10 +297,10 @@ create or replace package body ut_compound_data_helper is procedure get_act_and_exp_set( a_current_stmt in out nocopy clob, a_partition_stmt clob, a_select_stmt clob, - a_xmltable_stmt clob, a_unordered boolean,a_type varchar2 + a_xmltable_stmt clob, a_unordered boolean, a_type varchar2 ) is l_temp_string varchar2(32767); - l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_ut_owner varchar2(250) := ut_utils.ut_owner; begin ut_utils.append_to_clob(a_current_stmt, a_partition_stmt); @@ -308,15 +311,15 @@ create or replace package body ut_compound_data_helper is l_temp_string := ',x.data_id, ' || case when not a_unordered then 'position + x.item_no ' else 'rownum ' end ||'item_no from ' || l_ut_owner || '.ut_compound_data_tmp x,' - ||q'[xmltable('/ROWSET/ROW' passing x.item_data columns ]' ; - ut_utils.append_to_clob(a_current_stmt,l_temp_string); + ||q'[ xmltable('/ROWSET/ROW' passing x.item_data columns ]' ; + ut_utils.append_to_clob(a_current_stmt, l_temp_string); - ut_utils.append_to_clob(a_current_stmt,a_xmltable_stmt); - ut_utils.append_to_clob(a_current_stmt,case when a_xmltable_stmt is null then '' else ',' end||q'[ item_data xmltype PATH '*']'); + ut_utils.append_to_clob(a_current_stmt, a_xmltable_stmt); + ut_utils.append_to_clob(a_current_stmt, case when a_xmltable_stmt is null then '' else ',' end||q'[ item_data xmltype PATH '*']'); if not a_unordered then - ut_utils.append_to_clob(a_current_stmt,', POSITION for ordinality '); + ut_utils.append_to_clob(a_current_stmt, ', position for ordinality '); end if; - ut_utils.append_to_clob(a_current_stmt,' ) ucd where data_id = :'||a_type||'_guid ) ucd ) '); + ut_utils.append_to_clob(a_current_stmt, ' ) ucd where data_id = :'||a_type||'_guid ) ucd ) '); end; @@ -357,12 +360,12 @@ create or replace package body ut_compound_data_helper is l_temp_string := 'with exp as ( select ucd.* '; ut_utils.append_to_clob(l_compare_sql, l_temp_string); - get_act_and_exp_set(l_compare_sql, l_partition_stmt, l_select_stmt, l_xmltable_stmt, a_unordered,'exp'); + get_act_and_exp_set(l_compare_sql, l_partition_stmt, l_select_stmt, l_xmltable_stmt, a_unordered ,'exp'); l_temp_string :=',act as ( select ucd.* '; ut_utils.append_to_clob(l_compare_sql, l_temp_string); - get_act_and_exp_set(l_compare_sql, l_partition_stmt, l_select_stmt, l_xmltable_stmt, a_unordered,'act'); + get_act_and_exp_set(l_compare_sql, l_partition_stmt, l_select_stmt, l_xmltable_stmt, a_unordered ,'act'); l_temp_string := ' select a.item_data as act_item_data, a.data_id act_data_id,' ||'e.item_data as exp_item_data, e.data_id exp_data_id, '|| @@ -373,32 +376,28 @@ create or replace package body ut_compound_data_helper is if a_unordered then ut_utils.append_to_clob(l_compare_sql,' e.dup_no = a.dup_no and '); end if; - - if (a_join_by_list.count = 0) and a_unordered then - -- If no key defined do the join on all columns - ut_utils.append_to_clob(l_compare_sql,l_equal_stmt); - elsif (a_join_by_list.count > 0) and a_unordered then + + if (a_join_by_list.count > 0) then -- If key defined do the join or these and where on diffrences ut_utils.append_to_clob(l_compare_sql,l_join_on_stmt); - elsif not a_unordered then + elsif a_unordered then + -- If no key defined do the join on all columns + ut_utils.append_to_clob(l_compare_sql,l_equal_stmt); + else ut_utils.append_to_clob(l_compare_sql, 'a.item_no = e.item_no ' ); end if; - + ut_utils.append_to_clob(l_compare_sql,' ) where '); - - if (a_join_by_list.count > 0) and (a_unordered) and (not a_is_negated) then - if l_not_equal_stmt is not null then + + if l_not_equal_stmt is not null then + if (a_join_by_list.count > 0 and not a_is_negated) or (not a_unordered) then ut_utils.append_to_clob(l_compare_sql,' ( '||l_not_equal_stmt||' ) or '); end if; - elsif not a_unordered and l_not_equal_stmt is not null then - ut_utils.append_to_clob(l_compare_sql,' ( '||l_not_equal_stmt||' ) or '); end if; - --If its inlcusion we expect a actual set to fully match and have no extra elements over expected - if a_inclusion_type and not(a_is_negated) then - l_temp_string := ' ( a.data_id is null ) '; - elsif a_inclusion_type and a_is_negated then - l_temp_string := ' 1 = 1 '; + --If its inclusion we expect a actual set to fully match and have no extra elements over expected + if a_inclusion_type then + l_temp_string := case when a_is_negated then ' 1 = 1 ' else ' ( a.data_id is null ) ' end; else l_temp_string := ' (a.data_id is null or e.data_id is null) '; end if; @@ -432,7 +431,7 @@ create or replace package body ut_compound_data_helper is s.column_value col, s.column_value.getRootElement() col_name, s.column_value.getclobval() col_val from ( select exp_data_id, extract( ucd.exp_item_data, :column_path ) exp_item_data, item_no, - ut_compound_data_helper.get_pk_value(:join_by, ucd.exp_item_data) pk_value + replace((extract( ucd.exp_item_data, :join_by ).getclobval()), chr(10)) pk_value from ut_compound_data_diff_tmp ucd where diff_id = :diff_id and ucd.exp_data_id = :self_guid) i, @@ -443,7 +442,7 @@ create or replace package body ut_compound_data_helper is s.column_value col, s.column_value.getRootElement() col_name, s.column_value.getclobval() col_val from ( select act_data_id, extract( ucd.act_item_data, :column_path ) act_item_data, item_no, - ut_compound_data_helper.get_pk_value(:join_by, ucd.act_item_data) pk_value + replace((extract( ucd.act_item_data, :join_by ).getclobval()), chr(10)) pk_value from ut_compound_data_diff_tmp ucd where diff_id = :diff_id and ucd.act_data_id = :other_guid ) i, @@ -485,7 +484,10 @@ create or replace package body ut_compound_data_helper is select item_no as rn, case when exp_data_id is null then 'Extra:' else 'Missing:' end as diff_type, xmlserialize(content (extract((case when exp_data_id is null then act_item_data else exp_item_data end),'/*/*')) no indent) diffed_row, - nvl2(:join_by,ut_compound_data_helper.get_pk_value(:join_by,case when exp_data_id is null then act_item_data else exp_item_data end),null) pk_value + nvl2(:join_by, + replace((extract( case when exp_data_id is null then act_item_data else exp_item_data end, :join_by ).getclobval()),chr(10)), + null + ) pk_value ,case when exp_data_id is null then 1 else 2 end rnk ,2 final_order ,null col_name diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 3ecb8adc3..71a35206d 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -60,8 +60,6 @@ create or replace package ut_compound_data_helper authid definer is a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab,a_order_enforced boolean := false ) return tt_column_diffs; - function get_pk_value (a_join_by_xpath varchar2,a_item_data xmltype) return clob; - function get_rows_diff( a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2 @@ -76,6 +74,7 @@ create or replace package ut_compound_data_helper authid definer is subtype t_hash is raw(128); function get_hash(a_data raw, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash; + function get_hash(a_data clob, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash; function get_fixed_size_hash(a_string varchar2, a_base integer :=0,a_size integer :=9999999) return number; diff --git a/source/expectations/matchers/ut_include.tpb b/source/expectations/matchers/ut_include.tpb index bf830e34d..efcc9c5b8 100644 --- a/source/expectations/matchers/ut_include.tpb +++ b/source/expectations/matchers/ut_include.tpb @@ -23,33 +23,15 @@ create or replace type body ut_include as return; end; - member function get_inclusion_compare return boolean is - begin - return true; - end; - - member function negated return ut_include is - l_result ut_include := self; - begin - l_result.is_negated := ut_utils.boolean_to_int(true); - return l_result; - end; - - member function get_negated return boolean is - begin - return ut_utils.int_to_boolean(nvl(is_negated,0)); - end; - overriding member function run_matcher(self in out nocopy ut_include, a_actual ut_data_value) return boolean is l_result boolean; - l_result1 integer; begin if self.expected.data_type = a_actual.data_type then - l_result := - ( 0 - = treat( self.expected as ut_data_value_refcursor ) - .compare_implementation( a_actual, self.options, get_inclusion_compare(), get_negated() ) - ); + l_result := + ( 0 + = treat( self.expected as ut_data_value_refcursor ) + .compare_implementation( a_actual, self.options, true, self.is_negated() ) + ); else l_result := (self as ut_matcher).run_matcher(a_actual); end if; diff --git a/source/expectations/matchers/ut_include.tps b/source/expectations/matchers/ut_include.tps index bad9c2a5f..de3effe3b 100644 --- a/source/expectations/matchers/ut_include.tps +++ b/source/expectations/matchers/ut_include.tps @@ -22,12 +22,8 @@ create or replace type ut_include under ut_equal( * e.g. set can fail at same time not_include and include. By that we mean * that false include not necessary mean true not include. */ - is_negated number(1,0), - + constructor function ut_include(self in out nocopy ut_include, a_expected sys_refcursor) return self as result, - member function get_inclusion_compare return boolean, - member function negated return ut_include, - member function get_negated return boolean, overriding member function run_matcher(self in out nocopy ut_include, a_actual ut_data_value) return boolean, overriding member function run_matcher_negated(self in out nocopy ut_include, a_actual ut_data_value) return boolean, overriding member function failure_message(a_actual ut_data_value) return varchar2, diff --git a/source/expectations/matchers/ut_matcher.tpb b/source/expectations/matchers/ut_matcher.tpb index 78b05a827..4f3b324b4 100644 --- a/source/expectations/matchers/ut_matcher.tpb +++ b/source/expectations/matchers/ut_matcher.tpb @@ -67,5 +67,22 @@ create or replace type body ut_matcher as return 'Actual: ' || a_actual.to_string_report(true) || description_when_negated(); end; + member procedure negated is + begin + is_negated_flag := ut_utils.boolean_to_int(true); + end; + + member function negated return ut_matcher is + l_result ut_matcher := self; + begin + l_result.negated(); + return l_result; + end; + + member function is_negated return boolean is + begin + return coalesce(ut_utils.int_to_boolean(is_negated_flag), false); + end; + end; / diff --git a/source/expectations/matchers/ut_matcher.tps b/source/expectations/matchers/ut_matcher.tps index 7aefb8ad9..f4c082af0 100644 --- a/source/expectations/matchers/ut_matcher.tps +++ b/source/expectations/matchers/ut_matcher.tps @@ -17,6 +17,7 @@ create or replace type ut_matcher authid current_user as object( */ self_type varchar2(250), is_errored integer, + is_negated_flag number(1,0), /* function: run_matcher @@ -35,6 +36,9 @@ create or replace type ut_matcher authid current_user as object( member function description_when_negated return varchar2, member function error_message(a_actual ut_data_value) return varchar2, member function failure_message(a_actual ut_data_value) return varchar2, - member function failure_message_when_negated(a_actual ut_data_value) return varchar2 + member function failure_message_when_negated(a_actual ut_data_value) return varchar2, + member procedure negated, + member function negated return ut_matcher, + member function is_negated return boolean ) not final not instantiable / diff --git a/source/expectations/ut_expectation.tpb b/source/expectations/ut_expectation.tpb index 0372e0ddf..1862bfaf6 100644 --- a/source/expectations/ut_expectation.tpb +++ b/source/expectations/ut_expectation.tpb @@ -20,11 +20,14 @@ create or replace type body ut_expectation as l_matcher ut_matcher := a_matcher; l_message varchar2(32767); begin - - l_expectation_result := l_matcher.run_matcher( self.actual_data ); - l_expectation_result := coalesce(l_expectation_result,false); - l_message := coalesce( l_matcher.error_message( self.actual_data ), l_matcher.failure_message( self.actual_data ) ); - ut_expectation_processor.add_expectation_result( ut_expectation_result( ut_utils.to_test_result( l_expectation_result ), self.description, l_message ) ); + if a_matcher.is_negated() then + self.not_to( a_matcher ); + else + l_expectation_result := l_matcher.run_matcher( self.actual_data ); + l_expectation_result := coalesce(l_expectation_result,false); + l_message := coalesce( l_matcher.error_message( self.actual_data ), l_matcher.failure_message( self.actual_data ) ); + ut_expectation_processor.add_expectation_result( ut_expectation_result( ut_utils.to_test_result( l_expectation_result ), self.description, l_message ) ); + end if; end; member procedure not_to(self in ut_expectation, a_matcher ut_matcher) is @@ -682,7 +685,7 @@ create or replace type body ut_expectation as member procedure to_include(self in ut_expectation, a_expected sys_refcursor) is begin - self.to_( ut_include(a_expected) ); + to_contain( a_expected ); end; member procedure to_contain(self in ut_expectation, a_expected sys_refcursor) is @@ -692,12 +695,12 @@ create or replace type body ut_expectation as member procedure not_to_include(self in ut_expectation, a_expected sys_refcursor) is begin - self.not_to( ut_include(a_expected).negated ); + not_to_contain( a_expected ); end; member procedure not_to_contain(self in ut_expectation, a_expected sys_refcursor) is begin - self.not_to( ut_include(a_expected).negated ); + self.not_to( ut_include(a_expected).negated() ); end; end; diff --git a/source/expectations/ut_expectation_compound.tpb b/source/expectations/ut_expectation_compound.tpb index 9d9220a8a..538a0becb 100644 --- a/source/expectations/ut_expectation_compound.tpb +++ b/source/expectations/ut_expectation_compound.tpb @@ -20,7 +20,6 @@ create or replace type body ut_expectation_compound as begin self.actual_data := a_actual_data; self.description := a_description; - negated := ut_utils.boolean_to_int(false); return; end; @@ -55,105 +54,69 @@ create or replace type body ut_expectation_compound as member function not_to_equal(a_expected anydata, a_nulls_are_equal boolean := null) return ut_expectation_compound is l_result ut_expectation_compound := self; begin - l_result.matcher := ut_equal(a_expected, a_nulls_are_equal); - l_result.negated := ut_utils.boolean_to_int(true); + l_result.matcher := ut_equal(a_expected, a_nulls_are_equal).negated(); return l_result; - end; member function include(a_items varchar2) return ut_expectation_compound is - l_result ut_expectation_compound; begin - l_result := self; - l_result.matcher := treat(l_result.matcher as ut_equal).include(a_items); - return l_result; + return include( ut_varchar2_list( a_items ) ); end; member function include(a_items ut_varchar2_list) return ut_expectation_compound is - l_result ut_expectation_compound; + l_result ut_expectation_compound := self; begin - l_result := self; l_result.matcher := treat(l_result.matcher as ut_equal).include(a_items); return l_result; end; member procedure include(self in ut_expectation_compound, a_items varchar2) is begin - if ut_utils.int_to_boolean(negated) then - self.not_to( treat(matcher as ut_equal).include(a_items) ); - else - self.to_( treat(matcher as ut_equal).include(a_items) ); - end if; - end; + include( ut_varchar2_list( a_items ) ); + end; member procedure include(self in ut_expectation_compound, a_items ut_varchar2_list) is begin - if ut_utils.int_to_boolean(negated) then - self.not_to( treat(matcher as ut_equal).include(a_items) ); - else - self.to_( treat(matcher as ut_equal).include(a_items) ); - end if; - end; - - + self.to_( treat(matcher as ut_equal).include(a_items) ); + end; member function exclude(a_items varchar2) return ut_expectation_compound is - l_result ut_expectation_compound; - begin - l_result := self; - l_result.matcher := treat(l_result.matcher as ut_equal).exclude(a_items); - return l_result; - end; + begin + return exclude( ut_varchar2_list( a_items ) ); + end; member function exclude(a_items ut_varchar2_list) return ut_expectation_compound is - l_result ut_expectation_compound; - begin - l_result := self; - l_result.matcher := treat(l_result.matcher as ut_equal).exclude(a_items); - return l_result; - end; + l_result ut_expectation_compound := self; + begin + l_result.matcher := treat(l_result.matcher as ut_equal).exclude(a_items); + return l_result; + end; member procedure exclude(self in ut_expectation_compound, a_items varchar2) is - begin - if ut_utils.int_to_boolean(negated) then - self.not_to( treat(matcher as ut_equal).exclude(a_items) ); - else - self.to_( treat(matcher as ut_equal).exclude(a_items) ); - end if; - end; + begin + exclude( ut_varchar2_list( a_items ) ); + end; member procedure exclude(self in ut_expectation_compound, a_items ut_varchar2_list) is - begin - if ut_utils.int_to_boolean(negated) then - self.not_to( treat(matcher as ut_equal).exclude(a_items) ); - else - self.to_( treat(matcher as ut_equal).exclude(a_items) ); - end if; - end; + begin + self.to_( treat(matcher as ut_equal).exclude(a_items) ); + end; member function unordered return ut_expectation_compound is - l_result ut_expectation_compound; + l_result ut_expectation_compound := self; begin - l_result := self; - l_result.matcher := treat(l_result.matcher as ut_equal).unordered; + l_result.matcher := treat(l_result.matcher as ut_equal).unordered(); return l_result; end; member procedure unordered(self in ut_expectation_compound) is begin - if ut_utils.int_to_boolean(negated) then - self.not_to( treat(matcher as ut_equal).unordered ); - else - self.to_( treat(matcher as ut_equal).unordered ); - end if; + self.to_( treat(matcher as ut_equal).unordered() ); end; member function join_by(a_columns varchar2) return ut_expectation_compound is - l_result ut_expectation_compound; begin - l_result := self; - l_result.matcher := treat(l_result.matcher as ut_equal).join_by(a_columns); - return l_result; + return join_by( ut_varchar2_list( a_columns ) ); end; member function join_by(a_columns ut_varchar2_list) return ut_expectation_compound is @@ -166,20 +129,12 @@ create or replace type body ut_expectation_compound as member procedure join_by(self in ut_expectation_compound, a_columns varchar2) is begin - if ut_utils.int_to_boolean(negated) then - self.not_to( treat(matcher as ut_equal).join_by(a_columns) ); - else - self.to_( treat(matcher as ut_equal).join_by(a_columns) ); - end if; + join_by( ut_varchar2_list( a_columns ) ); end; member procedure join_by(self in ut_expectation_compound, a_columns ut_varchar2_list) is begin - if ut_utils.int_to_boolean(negated) then - self.not_to( treat(matcher as ut_equal).join_by(a_columns) ); - else - self.to_( treat(matcher as ut_equal).join_by(a_columns) ); - end if; + self.to_( treat(matcher as ut_equal).join_by(a_columns) ); end; end; diff --git a/source/expectations/ut_expectation_compound.tps b/source/expectations/ut_expectation_compound.tps index e96daa055..7978bb78f 100644 --- a/source/expectations/ut_expectation_compound.tps +++ b/source/expectations/ut_expectation_compound.tps @@ -1,4 +1,4 @@ -create or replace type ut_expectation_compound under ut_expectation( +create or replace type ut_expectation_compound force under ut_expectation( /* utPLSQL - Version 3 Copyright 2016 - 2018 utPLSQL Project @@ -16,7 +16,6 @@ create or replace type ut_expectation_compound under ut_expectation( limitations under the License. */ matcher ut_matcher, - negated integer, constructor function ut_expectation_compound(self in out nocopy ut_expectation_compound, a_actual_data ut_data_value, a_description varchar2) return self as result, diff --git a/source/expectations/ut_expectation_refcursor.tpb b/source/expectations/ut_expectation_refcursor.tpb index c87cf2ef8..fe1b653e1 100644 --- a/source/expectations/ut_expectation_refcursor.tpb +++ b/source/expectations/ut_expectation_refcursor.tpb @@ -20,7 +20,6 @@ create or replace type body ut_expectation_refcursor as begin self.actual_data := a_actual_data; self.description := a_description; - negated := ut_utils.boolean_to_int(false); return; end; @@ -34,8 +33,7 @@ create or replace type body ut_expectation_refcursor as member function not_to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_refcursor is l_result ut_expectation_refcursor := self; begin - l_result.matcher := ut_equal(a_expected, a_nulls_are_equal); - l_result.negated := ut_utils.boolean_to_int(true); + l_result.matcher := ut_equal(a_expected, a_nulls_are_equal).negated(); return l_result; end; @@ -54,27 +52,20 @@ create or replace type body ut_expectation_refcursor as end; member function not_to_include(a_expected sys_refcursor) return ut_expectation_refcursor is - l_result ut_expectation_refcursor := self; begin - l_result.matcher := ut_include(a_expected).negated; - l_result.negated := ut_utils.boolean_to_int(true); - return l_result; + return not_to_contain( a_expected ); end; member function not_to_contain(a_expected sys_refcursor) return ut_expectation_refcursor is l_result ut_expectation_refcursor := self; begin - l_result.matcher := ut_include(a_expected).negated; - l_result.negated := ut_utils.boolean_to_int(true); + l_result.matcher := ut_include(a_expected).negated(); return l_result; end; overriding member function include(a_items varchar2) return ut_expectation_refcursor is - l_result ut_expectation_refcursor; begin - l_result := self; - l_result.matcher := treat(l_result.matcher as ut_equal).include(a_items); - return l_result; + return include( ut_varchar2_list( a_items ) ); end; overriding member function include(a_items ut_varchar2_list) return ut_expectation_refcursor is @@ -86,12 +77,9 @@ create or replace type body ut_expectation_refcursor as end; overriding member function exclude(a_items varchar2) return ut_expectation_refcursor is - l_result ut_expectation_refcursor; - begin - l_result := self; - l_result.matcher := treat(l_result.matcher as ut_equal).exclude(a_items); - return l_result; - end; + begin + return exclude( ut_varchar2_list( a_items ) ); + end; overriding member function exclude(a_items ut_varchar2_list) return ut_expectation_refcursor is l_result ut_expectation_refcursor; @@ -110,11 +98,8 @@ create or replace type body ut_expectation_refcursor as end; overriding member function join_by(a_columns varchar2) return ut_expectation_refcursor is - l_result ut_expectation_refcursor; begin - l_result := self; - l_result.matcher := treat(l_result.matcher as ut_equal).join_by(a_columns); - return l_result; + return join_by( ut_varchar2_list( a_columns ) ); end; overriding member function join_by(a_columns ut_varchar2_list) return ut_expectation_refcursor is @@ -135,12 +120,7 @@ create or replace type body ut_expectation_refcursor as member procedure unordered_columns(self in ut_expectation_refcursor) is begin - - if ut_utils.int_to_boolean(negated) then - self.not_to( treat(matcher as ut_equal).unordered_columns ); - else - self.to_( treat(matcher as ut_equal).unordered_columns ); - end if; + self.to_( treat(matcher as ut_equal).unordered_columns ); end; member function uc return ut_expectation_refcursor is From 80563f87c42de636796a68f74b6255c1c7db3254 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 19 Feb 2019 22:41:20 +0000 Subject: [PATCH 0227/1096] Refactoring. --- .../data_values/ut_compound_data_helper.pkb | 375 +++++++++--------- .../data_values/ut_data_value_refcursor.tpb | 2 +- test/install_and_run_tests.sh | 2 +- 3 files changed, 180 insertions(+), 199 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 238a1aabf..de6915115 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -42,99 +42,59 @@ create or replace package body ut_compound_data_helper is end if; return l_filter; end; - - function get_columns_diff_ordered(a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab) - return tt_column_diffs is - l_results tt_column_diffs; - begin - with - expected_cols as ( - select access_path exp_column_name,column_position exp_col_pos, - replace(column_type,'VARCHAR2','CHAR') exp_col_type_compare, column_type exp_col_type - from table(a_expected)), - actual_cols as ( - select access_path act_column_name,column_position act_col_pos, - replace(column_type,'VARCHAR2','CHAR') act_col_type_compare, column_type act_col_type - from table(a_actual)), - joined_cols as ( - select e.*,a.*, - row_number() over(partition by case when a.act_col_pos + e.exp_col_pos is not null then 1 end order by a.act_col_pos) a_pos_nn, - row_number() over(partition by case when a.act_col_pos + e.exp_col_pos is not null then 1 end order by e.exp_col_pos) e_pos_nn - from expected_cols e - full outer join actual_cols a - on e.exp_column_name = a.act_column_name - ) - select case - when exp_col_pos is null and act_col_pos is not null then '+' - when exp_col_pos is not null and act_col_pos is null then '-' - when exp_col_type_compare != act_col_type_compare then 't' - else 'p' - end as diff_type, - exp_column_name, exp_col_type, exp_col_pos, - act_column_name, act_col_type, act_col_pos - bulk collect into l_results - from joined_cols - --column is unexpected (extra) or missing - where act_col_pos is null or exp_col_pos is null - --column type is not matching (except CHAR/VARCHAR2) - or act_col_type_compare != exp_col_type_compare - --column position is not matching (both when excluded extra/missing columns as well as when they are included) - or (a_pos_nn != e_pos_nn and exp_col_pos != act_col_pos) - order by exp_col_pos, act_col_pos; - return l_results; - end; - - function get_columns_diff_unordered(a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab) - return tt_column_diffs is + + function get_columns_diff( + a_expected ut_cursor_column_tab, + a_actual ut_cursor_column_tab, + a_order_enforced boolean := false + ) return tt_column_diffs is l_results tt_column_diffs; begin - with - expected_cols as ( - select access_path exp_column_name,column_position exp_col_pos, - replace(column_type,'VARCHAR2','CHAR') exp_col_type_compare, column_type exp_col_type - from table(a_expected) - ), - actual_cols as ( - select access_path act_column_name,column_position act_col_pos, - replace(column_type,'VARCHAR2','CHAR') act_col_type_compare, column_type act_col_type - from table(a_actual)), - joined_cols as ( - select e.*,a.* - from expected_cols e - full outer join actual_cols a - on e.exp_column_name = a.act_column_name - ) - select case - when exp_col_pos is null and act_col_pos is not null then '+' - when exp_col_pos is not null and act_col_pos is null then '-' - when exp_col_type_compare != act_col_type_compare then 't' - else 'p' - end as diff_type, - exp_column_name, exp_col_type, exp_col_pos, - act_column_name, act_col_type, act_col_pos - bulk collect into l_results - from joined_cols - --column is unexpected (extra) or missing - where act_col_pos is null or exp_col_pos is null - --column type is not matching (except CHAR/VARCHAR2) - or act_col_type_compare != exp_col_type_compare - order by exp_col_pos, act_col_pos; + execute immediate q'[with + expected_cols as ( + select access_path exp_column_name,column_position exp_col_pos, + replace(column_type,'VARCHAR2','CHAR') exp_col_type_compare, column_type exp_col_type + from table(:a_expected) + ), + actual_cols as ( + select access_path act_column_name,column_position act_col_pos, + replace(column_type,'VARCHAR2','CHAR') act_col_type_compare, column_type act_col_type + from table(:a_actual)), + joined_cols as ( + select e.*,a.*]' + || case when a_order_enforced then ', + row_number() over(partition by case when a.act_col_pos + e.exp_col_pos is not null then 1 end order by a.act_col_pos) a_pos_nn, + row_number() over(partition by case when a.act_col_pos + e.exp_col_pos is not null then 1 end order by e.exp_col_pos) e_pos_nn' + end ||q'[ + from expected_cols e + full outer join actual_cols a + on e.exp_column_name = a.act_column_name + ) + select case + when exp_col_pos is null and act_col_pos is not null then '+' + when exp_col_pos is not null and act_col_pos is null then '-' + when exp_col_type_compare != act_col_type_compare then 't' + else 'p' + end as diff_type, + exp_column_name, exp_col_type, exp_col_pos, + act_column_name, act_col_type, act_col_pos + from joined_cols + --column is unexpected (extra) or missing + where act_col_pos is null or exp_col_pos is null + --column type is not matching (except CHAR/VARCHAR2) + or act_col_type_compare != exp_col_type_compare]' + || case when a_order_enforced then q'[ + --column position is not matching (both when excluded extra/missing columns as well as when they are included) + or (a_pos_nn != e_pos_nn and exp_col_pos != act_col_pos)]' + end ||q'[ + order by exp_col_pos, act_col_pos]' + bulk collect into l_results using a_expected, a_actual; return l_results; end; - function get_columns_diff(a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab,a_order_enforced boolean := false) - return tt_column_diffs is - begin - return - case - when a_order_enforced then get_columns_diff_ordered(a_expected,a_actual) - else get_columns_diff_unordered(a_expected,a_actual) - end; - end; - procedure generate_not_equal_stmt( a_data_info ut_cursor_column, a_pk_table ut_varchar2_list, - a_not_equal_stmt in out nocopy clob, a_col_name varchar2 + a_not_equal_stmt in out nocopy clob ) is l_pk_tab ut_varchar2_list := coalesce(a_pk_table,ut_varchar2_list()); l_index integer; @@ -154,14 +114,14 @@ create or replace package body ut_compound_data_helper is if not(l_exists) then l_sql_stmt := l_sql_stmt || case when a_not_equal_stmt is null then null else ' or ' end - ||' (decode(a.'||a_col_name||','||' e.'||a_col_name||',1,0) = 0)'; + ||' (decode(a.'||a_data_info.transformed_name||','||' e.'||a_data_info.transformed_name||',1,0) = 0)'; ut_utils.append_to_clob(a_not_equal_stmt,l_sql_stmt); end if; end; procedure generate_join_by_stmt( a_data_info ut_cursor_column, a_pk_table ut_varchar2_list, - a_join_by_stmt in out nocopy clob, a_col_name varchar2 + a_join_by_stmt in out nocopy clob ) is l_pk_tab ut_varchar2_list := coalesce(a_pk_table,ut_varchar2_list()); l_index integer; @@ -173,7 +133,7 @@ create or replace package body ut_compound_data_helper is if l_pk_tab(l_index) in (a_data_info.access_path, a_data_info.parent_name) then --When then table is nested and join is on whole table l_sql_stmt := case when a_join_by_stmt is null then null else ' and ' end; - l_sql_stmt := l_sql_stmt ||' a.'||a_col_name||q'[ = ]'||' e.'||a_col_name; + l_sql_stmt := l_sql_stmt ||' a.'||a_data_info.transformed_name||q'[ = ]'||' e.'||a_data_info.transformed_name; end if; exit when (a_data_info.access_path = l_pk_tab(l_index)) or l_index = l_pk_tab.count; l_index := l_pk_tab.next(l_index); @@ -191,49 +151,47 @@ create or replace package body ut_compound_data_helper is procedure generate_partition_stmt( a_data_info ut_cursor_column, a_partition_stmt in out nocopy clob, - a_pk_table in ut_varchar2_list,a_col_name in varchar2,a_alias varchar2 := 'ucd.' + a_pk_table in ut_varchar2_list, a_alias varchar2 := 'ucd.' ) is - l_alias varchar2(10) := a_alias; - l_pk_tab ut_varchar2_list := coalesce(a_pk_table,ut_varchar2_list()); l_index integer; l_sql_stmt varchar2(32767); begin - if l_pk_tab.count <> 0 then - l_index:= l_pk_tab.first; + if a_pk_table is not empty then + l_index:= a_pk_table.first; loop - if l_pk_tab(l_index) in (a_data_info.access_path, a_data_info.parent_name) then + if a_pk_table(l_index) in (a_data_info.access_path, a_data_info.parent_name) then --When then table is nested and join is on whole table l_sql_stmt := case when a_partition_stmt is null then null else ',' end; - l_sql_stmt := l_sql_stmt ||l_alias||a_col_name; + l_sql_stmt := l_sql_stmt ||a_alias||a_data_info.transformed_name; end if; - exit when (a_data_info.access_path = l_pk_tab(l_index)) or l_index = l_pk_tab.count; - l_index := l_pk_tab.next(l_index); + exit when (a_data_info.access_path = a_pk_table(l_index)) or l_index = a_pk_table.count; + l_index := a_pk_table.next(l_index); end loop; else - l_sql_stmt := case when a_partition_stmt is null then null else ',' end ||l_alias||a_col_name; + l_sql_stmt := case when a_partition_stmt is null then null else ',' end ||a_alias||a_data_info.transformed_name; end if; ut_utils.append_to_clob(a_partition_stmt,l_sql_stmt); end; - procedure generate_select_stmt(a_data_info ut_cursor_column,a_sql_stmt in out nocopy clob, a_col_name varchar2,a_alias varchar2 := 'ucd.') is + procedure generate_select_stmt(a_data_info ut_cursor_column,a_sql_stmt in out nocopy clob, a_alias varchar2 := 'ucd.') is l_alias varchar2(10) := a_alias; l_col_syntax varchar2(4000); l_ut_owner varchar2(250) := ut_utils.ut_owner; begin if a_data_info.is_sql_diffable = 0 then - l_col_syntax := l_ut_owner ||'.ut_compound_data_helper.get_hash('||l_alias||a_col_name||'.getClobVal()) as '||a_col_name ; + l_col_syntax := l_ut_owner ||'.ut_compound_data_helper.get_hash('||l_alias||a_data_info.transformed_name||'.getClobVal()) as '||a_data_info.transformed_name ; else - l_col_syntax := l_alias||a_col_name||' as '|| a_col_name; + l_col_syntax := l_alias||a_data_info.transformed_name||' as '|| a_data_info.transformed_name; end if; ut_utils.append_to_clob(a_sql_stmt,','||l_col_syntax); end; - procedure generate_xmltab_stmt(a_data_info ut_cursor_column, a_sql_stmt in out nocopy clob, a_col_name varchar2) is + procedure generate_xmltab_stmt(a_data_info ut_cursor_column, a_sql_stmt in out nocopy clob) is l_sql_stmt varchar2(32767); l_col_type varchar2(4000); - begin - if a_data_info.is_sql_diffable = 0 then + begin + if a_data_info.is_sql_diffable = 0 then l_col_type := 'XMLTYPE'; elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type = 'DATE' then l_col_type := 'TIMESTAMP'; @@ -252,39 +210,37 @@ create or replace package body ut_compound_data_helper is end; end if; l_sql_stmt := case when a_sql_stmt is not null then ', ' end - ||a_col_name||' '||l_col_type||q'[ PATH ']'||a_data_info.access_path||q'[']'; + ||a_data_info.transformed_name||' '||l_col_type||q'[ PATH ']'||a_data_info.access_path||q'[']'; ut_utils.append_to_clob(a_sql_stmt, l_sql_stmt); end; procedure gen_sql_pieces_out_of_cursor( - a_data_info ut_cursor_column_tab, a_pk_table ut_varchar2_list, - a_xml_stmt out nocopy clob, + a_data_info ut_cursor_column_tab, + a_pk_table ut_varchar2_list, + a_xml_stmt out nocopy clob, a_select_stmt out nocopy clob, a_partition_stmt out nocopy clob, a_equal_stmt out nocopy clob, a_join_by_stmt out nocopy clob, a_not_equal_stmt out nocopy clob ) is - l_cursor_info ut_cursor_column_tab := a_data_info; l_partition_tmp clob; - l_col_name varchar2(100); begin - if l_cursor_info is not empty then - for i in 1..l_cursor_info.count loop - if l_cursor_info(i).has_nested_col = 0 then - l_col_name := l_cursor_info(i).transformed_name; + if a_data_info is not empty then + for i in 1..a_data_info.count loop + if a_data_info(i).has_nested_col = 0 then --Get XMLTABLE column list - generate_xmltab_stmt(l_cursor_info(i),a_xml_stmt,l_col_name); + generate_xmltab_stmt(a_data_info(i), a_xml_stmt); --Get Select statment list of columns - generate_select_stmt(l_cursor_info(i),a_select_stmt,l_col_name); + generate_select_stmt(a_data_info(i), a_select_stmt); --Get columns by which we partition - generate_partition_stmt(l_cursor_info(i),l_partition_tmp,a_pk_table,l_col_name); + generate_partition_stmt(a_data_info(i), l_partition_tmp, a_pk_table); --Get equal statement - generate_equal_sql(a_equal_stmt,l_col_name); + generate_equal_sql(a_equal_stmt, a_data_info(i).transformed_name); --Generate join by stmt - generate_join_by_stmt(l_cursor_info(i),a_pk_table,a_join_by_stmt,l_col_name); + generate_join_by_stmt(a_data_info(i), a_pk_table, a_join_by_stmt); --Generate not equal stmt - generate_not_equal_stmt(l_cursor_info(i),a_pk_table,a_not_equal_stmt,l_col_name); + generate_not_equal_stmt(a_data_info(i), a_pk_table, a_not_equal_stmt); end if; end loop; ut_utils.append_to_clob(a_partition_stmt,', row_number() over (partition by '); @@ -426,92 +382,117 @@ create or replace package body ut_compound_data_helper is l_results tt_row_diffs; l_sql varchar2(32767); begin - l_sql := q'[with exp as ( - select exp_item_data, exp_data_id, item_no rn,rownum col_no, pk_value, - s.column_value col, s.column_value.getRootElement() col_name, s.column_value.getclobval() col_val - from ( - select exp_data_id, extract( ucd.exp_item_data, :column_path ) exp_item_data, item_no, - replace((extract( ucd.exp_item_data, :join_by ).getclobval()), chr(10)) pk_value - from ut_compound_data_diff_tmp ucd - where diff_id = :diff_id - and ucd.exp_data_id = :self_guid) i, - table( xmlsequence( extract(i.exp_item_data,'/*') ) ) s + l_sql := q'[ + with exp as ( + select + exp_item_data, exp_data_id, item_no rn, rownum col_no, pk_value, + s.column_value col, s.column_value.getRootElement() col_name, + s.column_value.getclobval() col_val + from ( + select + exp_data_id, extract( ucd.exp_item_data, :column_path ) exp_item_data, item_no, + replace( extract( ucd.exp_item_data, :join_by ).getclobval(), chr(10) ) pk_value + from ut_compound_data_diff_tmp ucd + where diff_id = :diff_id + and ucd.exp_data_id = :self_guid + ) i, + table( xmlsequence( extract(i.exp_item_data,'/*') ) ) s ), act as ( - select act_item_data, act_data_id, item_no rn, rownum col_no, pk_value, - s.column_value col, s.column_value.getRootElement() col_name, s.column_value.getclobval() col_val - from ( - select act_data_id, extract( ucd.act_item_data, :column_path ) act_item_data, item_no, - replace((extract( ucd.act_item_data, :join_by ).getclobval()), chr(10)) pk_value - from ut_compound_data_diff_tmp ucd - where diff_id = :diff_id - and ucd.act_data_id = :other_guid ) i, - table( xmlsequence( extract(i.act_item_data,'/*') ) ) s + select + act_item_data, act_data_id, item_no rn, rownum col_no, pk_value, + s.column_value col, s.column_value.getRootElement() col_name, + s.column_value.getclobval() col_val + from ( + select + act_data_id, extract( ucd.act_item_data, :column_path ) act_item_data, item_no, + replace( extract( ucd.act_item_data, :join_by ).getclobval(), chr(10) ) pk_value + from ut_compound_data_diff_tmp ucd + where diff_id = :diff_id + and ucd.act_data_id = :other_guid + ) i, + table( xmlsequence( extract(i.act_item_data,'/*') ) ) s ) select rn, diff_type, diffed_row, pk_value pk_value from ( - select rn, diff_type, diffed_row, pk_value - ,case when diff_type = 'Actual:' then 1 else 2 end rnk - ,1 final_order - ,col_name - from ( ]'; - - if a_unordered then - l_sql := l_sql || q'[select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, pk_value,col_name - from - (select nvl(exp.rn, act.rn) rn, nvl(exp.pk_value, act.pk_value) pk_value, exp.col exp_item, act.col act_item , - nvl(exp.col_name,act.col_name) col_name - from exp join act on exp.rn = act.rn and exp.col_name = act.col_name - where dbms_lob.compare(exp.col_val, act.col_val) != 0) - unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:') - ))]'; - else - l_sql := l_sql || q'[ select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, null pk_value,col_name - from - (select nvl(exp.rn, act.rn) rn, - xmlagg(exp.col order by exp.col_no) exp_item, - xmlagg(act.col order by act.col_no) act_item, - max(nvl(exp.col_name,act.col_name)) col_name - from exp exp join act act on exp.rn = act.rn and exp.col_name = act.col_name - where dbms_lob.compare(exp.col_val, act.col_val) != 0 - group by (exp.rn, act.rn) - ) - unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:')) - )]'; - end if; - - l_sql := l_sql || q'[union all - select - item_no as rn, case when exp_data_id is null then 'Extra:' else 'Missing:' end as diff_type, - xmlserialize(content (extract((case when exp_data_id is null then act_item_data else exp_item_data end),'/*/*')) no indent) diffed_row, - nvl2(:join_by, - replace((extract( case when exp_data_id is null then act_item_data else exp_item_data end, :join_by ).getclobval()),chr(10)), - null - ) pk_value - ,case when exp_data_id is null then 1 else 2 end rnk - ,2 final_order - ,null col_name - from ut_compound_data_diff_tmp i - where diff_id = :diff_id - and act_data_id is null or exp_data_id is null + select rn, diff_type, diffed_row, pk_value, + case when diff_type = 'Actual:' then 1 else 2 end rnk, + 1 final_order, + col_name + from ( ]' + || case when a_unordered then q'[ + select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, pk_value, col_name + from ( + select nvl(exp.rn, act.rn) rn, + nvl(exp.pk_value, act.pk_value) pk_value, + exp.col exp_item, + act.col act_item, + nvl(exp.col_name,act.col_name) col_name + from exp + join act + on exp.rn = act.rn and exp.col_name = act.col_name + where dbms_lob.compare(exp.col_val, act.col_val) != 0 + ) + unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:') ) ]' + else q'[ + select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, null pk_value, col_name + from ( + select nvl(exp.rn, act.rn) rn, + xmlagg(exp.col order by exp.col_no) exp_item, + xmlagg(act.col order by act.col_no) act_item, + max(nvl(exp.col_name,act.col_name)) col_name + from exp exp + join act act + on exp.rn = act.rn and exp.col_name = act.col_name + where dbms_lob.compare(exp.col_val, act.col_val) != 0 + group by (exp.rn, act.rn) + ) + unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:') ) ]' + end ||q'[ + ) + union all + select + item_no as rn, + case when exp_data_id is null then 'Extra:' else 'Missing:' end as diff_type, + xmlserialize( + content ( + extract( (case when exp_data_id is null then act_item_data else exp_item_data end),'/*/*') + ) no indent + ) diffed_row, + nvl2( + :join_by, + replace( + extract( case when exp_data_id is null then act_item_data else exp_item_data end, :join_by ).getclobval(), + chr(10) + ), + null + ) pk_value, + case when exp_data_id is null then 1 else 2 end rnk, + 2 final_order, + null col_name + from ut_compound_data_diff_tmp i + where diff_id = :diff_id + and act_data_id is null or exp_data_id is null ) - order by final_order,]'; - - if a_enforce_column_order or (not(a_enforce_column_order) and not(a_unordered)) then - l_sql := l_sql ||q'[case when final_order = 1 then rn else rnk end, - case when final_order = 1 then rnk else rn end ]'; - elsif a_unordered then - l_sql := l_sql ||q'[case when final_order = 1 then col_name else to_char(rnk) end, - case when final_order = 1 then to_char(rn) else col_name end, - case when final_order = 1 then to_char(rnk) else col_name end - ]'; - end if; + order by final_order,]' + ||case when a_enforce_column_order or (not(a_enforce_column_order) and not(a_unordered)) then + q'[ + case when final_order = 1 then rn else rnk end, + case when final_order = 1 then rnk else rn end + ]' + when a_unordered then + q'[ + case when final_order = 1 then col_name else to_char(rnk) end, + case when final_order = 1 then to_char(rn) else col_name end, + case when final_order = 1 then to_char(rnk) else col_name end + ]' + end; execute immediate l_sql bulk collect into l_results - using l_exp_extract_xpath,l_join_xpath,a_diff_id, a_expected_dataset_guid, - l_act_extract_xpath,l_join_xpath,a_diff_id, a_actual_dataset_guid, - l_join_xpath,l_join_xpath,a_diff_id; + using l_exp_extract_xpath, l_join_xpath, a_diff_id, a_expected_dataset_guid, + l_act_extract_xpath, l_join_xpath, a_diff_id, a_actual_dataset_guid, + l_join_xpath, l_join_xpath, a_diff_id; return l_results; end; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 0696f336d..f57cc6374 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -345,7 +345,7 @@ create or replace type body ut_data_value_refcursor as a_inclusion_compare, a_is_negated ); - -- dbms_output.put_line(substr(l_cursor_text,1,32767)); +-- dbms_output.put_line(substr(l_diff_cursor_text,1,32767)); l_result := l_result + compare_data( l_self, l_other, l_diff_cursor_text ); end if; return l_result; diff --git a/test/install_and_run_tests.sh b/test/install_and_run_tests.sh index 385cb46a4..f899a306d 100755 --- a/test/install_and_run_tests.sh +++ b/test/install_and_run_tests.sh @@ -12,7 +12,7 @@ cd .. time utPLSQL-cli/bin/utplsql run ${UT3_TESTER}/${UT3_TESTER_PASSWORD}@${CONNECTION_STR} \ --source_path=source -owner=ut3 \ +-p=test_expectations_cursor -source_path=source -owner=ut3 \ -test_path=test -c \ -f=ut_coverage_sonar_reporter -o=coverage.xml \ -f=ut_coverage_html_reporter -o=coverage.html \ From 6b6b5337052ce19a270167e74afbbd0a92992d65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Wed, 20 Feb 2019 12:13:19 +0000 Subject: [PATCH 0228/1096] Create CODE_OF_CONDUCT.md --- CODE_OF_CONDUCT.md | 76 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 CODE_OF_CONDUCT.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 000000000..b90e5e80e --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,76 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, sex characteristics, gender identity and expression, +level of experience, education, socio-economic status, nationality, personal +appearance, race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or + advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at utplsql@utplsql.org. All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html + +[homepage]: https://www.contributor-covenant.org + +For answers to common questions about this code of conduct, see +https://www.contributor-covenant.org/faq From fbc24b9ec9d83dc7c3c47eb899a386dec614d4c7 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 21 Feb 2019 23:28:17 +0000 Subject: [PATCH 0229/1096] Added trimming of warning when list of procedures invalidating transaction is too long. Resolves #834 --- source/core/types/ut_suite_item.tpb | 10 ++++++++-- test/core/test_ut_suite.pkb | 15 +++++++++++++++ test/core/test_ut_suite.pks | 3 +++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/source/core/types/ut_suite_item.tpb b/source/core/types/ut_suite_item.tpb index 556c9df0b..ef71975e5 100644 --- a/source/core/types/ut_suite_item.tpb +++ b/source/core/types/ut_suite_item.tpb @@ -61,6 +61,7 @@ create or replace type body ut_suite_item as member procedure rollback_to_savepoint(self in out nocopy ut_suite_item, a_savepoint varchar2) is ex_savepoint_not_exists exception; + l_transaction_invalidators clob; pragma exception_init(ex_savepoint_not_exists, -1086); begin if get_rollback_type() = ut_utils.gc_rollback_auto and a_savepoint is not null then @@ -68,11 +69,16 @@ create or replace type body ut_suite_item as end if; exception when ex_savepoint_not_exists then + l_transaction_invalidators := + lower( ut_utils.indent_lines( ut_utils.table_to_clob( self.get_transaction_invalidators() ), 2, true ) ); + if length(l_transaction_invalidators) > 3000 then + l_transaction_invalidators := substr(l_transaction_invalidators,1,3000)||'...'; + end if; put_warning( 'Unable to perform automatic rollback after test' - || case when self_type like '%SUITE' then ' suite' end || '. ' + || case when self_type like '%SUITE' then ' suite' when self_type like '%CONTEXT' then ' context' end || '. ' ||'An implicit or explicit commit/rollback occurred in procedures:'||chr(10) - ||lower(ut_utils.indent_lines(ut_utils.table_to_clob(self.get_transaction_invalidators()), 2, true))||chr(10) + ||l_transaction_invalidators||chr(10) ||'Use the "--%rollback(manual)" annotation or remove commit/rollback/ddl statements that are causing the issue.' ); end; diff --git a/test/core/test_ut_suite.pkb b/test/core/test_ut_suite.pkb index 557d3cb7b..04d75277a 100644 --- a/test/core/test_ut_suite.pkb +++ b/test/core/test_ut_suite.pkb @@ -140,5 +140,20 @@ create or replace package body test_ut_suite is begin test_rollback_type('test_failure', ut3.ut_utils.gc_rollback_manual, be_greater_than(0) ); end; + + procedure trim_transaction_invalidators is + l_suite ut3.ut_suite; + begin + --arrange + l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); + for i in 1 .. 100 loop + l_suite.add_transaction_invalidator('schema_name.package_name.procedure_name'||i); + end loop; + --Act + l_suite.rollback_to_savepoint('dummy_savepoint'); + --Assert + ut.expect(l_suite.warnings.count).to_equal(1); + end; + end; / \ No newline at end of file diff --git a/test/core/test_ut_suite.pks b/test/core/test_ut_suite.pks index ba8386297..cc4de8528 100644 --- a/test/core/test_ut_suite.pks +++ b/test/core/test_ut_suite.pks @@ -33,5 +33,8 @@ create or replace package test_ut_suite is --%test(rollback(manual) - disables automatic rollback after a suite even if test fails) procedure rollback_manual_on_failure; + --%test(Transaction invalidators list is trimmed in warnings when too long) + procedure trim_transaction_invalidators; + end; / From 150b68ff26217819b2c98549870ade86b0e5214b Mon Sep 17 00:00:00 2001 From: Travis CI Date: Fri, 22 Feb 2019 09:31:59 +0000 Subject: [PATCH 0230/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 1431f382b..f9bad9764 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.4.2513-develop'; + gc_version constant varchar2(50) := 'v3.1.4.2538-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From faf3d1227212cf1809ba634b414bd1b9a1d5d231 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 22 Feb 2019 12:36:20 +0000 Subject: [PATCH 0231/1096] Rework dynamic sql generation to more readible format. --- .../data_values/ut_compound_data_helper.pkb | 257 ++++++++++-------- 1 file changed, 147 insertions(+), 110 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index de6915115..1a177d44c 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -21,6 +21,54 @@ create or replace package body ut_compound_data_helper is g_type_name_map t_type_name_map; g_anytype_name_map t_type_name_map; + gc_compare_sql_template varchar2(4000) := + q'[ + with exp as ( + select + ucd.*, + {:duplicate_number:} dup_no + from ( + select + ucd.item_data + ,x.data_id data_id + ,{:item_no:} item_no + {:columns:} + from {:ut3_owner:}.ut_compound_data_tmp x, + xmltable('/ROWSET/ROW' passing x.item_data columns + item_data xmltype path '*' + ,position for ordinality + {:xml_to_columns:} ) ucd + where data_id = :exp_guid + ) ucd + ) + , act as ( + select + ucd.*, + {:duplicate_number:} dup_no + from ( + select + ucd.item_data + ,x.data_id data_id + ,{:item_no:} item_no + {:columns:} + from {:ut3_owner:}.ut_compound_data_tmp x, + xmltable('/ROWSET/ROW' passing x.item_data columns + item_data xmltype path '*' + ,position for ordinality + {:xml_to_columns:} ) ucd + where data_id = :act_guid + ) ucd + ) + select + a.item_data as act_item_data, + a.data_id act_data_id, + e.item_data as exp_item_data, + e.data_id exp_data_id, + {:item_no_select:} as item_no, + nvl(e.dup_no,a.dup_no) dup_no + from act a {:join_type:} exp e on ( {:join_condition:} ) + where {:where_condition:}]'; + function get_columns_filter( a_exclude_xpath varchar2, a_include_xpath varchar2, a_table_alias varchar2 := 'ucd', a_column_alias varchar2 := 'item_data' @@ -92,10 +140,10 @@ create or replace package body ut_compound_data_helper is return l_results; end; - procedure generate_not_equal_stmt( - a_data_info ut_cursor_column, a_pk_table ut_varchar2_list, - a_not_equal_stmt in out nocopy clob - ) is + function generate_not_equal_stmt( + a_data_info ut_cursor_column, a_pk_table ut_varchar2_list + ) return varchar2 + is l_pk_tab ut_varchar2_list := coalesce(a_pk_table,ut_varchar2_list()); l_index integer; l_sql_stmt varchar2(32767); @@ -110,19 +158,17 @@ create or replace package body ut_compound_data_helper is exit when l_index = l_pk_tab.count or (a_data_info.access_path = l_pk_tab(l_index)); l_index := a_pk_table.next(l_index); end loop; - end if; - - if not(l_exists) then - l_sql_stmt := l_sql_stmt || case when a_not_equal_stmt is null then null else ' or ' end - ||' (decode(a.'||a_data_info.transformed_name||','||' e.'||a_data_info.transformed_name||',1,0) = 0)'; - ut_utils.append_to_clob(a_not_equal_stmt,l_sql_stmt); end if; + if not(l_exists) then + l_sql_stmt := ' (decode(a.'||a_data_info.transformed_name||','||' e.'||a_data_info.transformed_name||',1,0) = 0)'; + end if; + return l_sql_stmt; end; - procedure generate_join_by_stmt( - a_data_info ut_cursor_column, a_pk_table ut_varchar2_list, - a_join_by_stmt in out nocopy clob - ) is + function generate_join_by_stmt( + a_data_info ut_cursor_column, a_pk_table ut_varchar2_list + ) return varchar2 + is l_pk_tab ut_varchar2_list := coalesce(a_pk_table,ut_varchar2_list()); l_index integer; l_sql_stmt varchar2(32767); @@ -132,27 +178,24 @@ create or replace package body ut_compound_data_helper is loop if l_pk_tab(l_index) in (a_data_info.access_path, a_data_info.parent_name) then --When then table is nested and join is on whole table - l_sql_stmt := case when a_join_by_stmt is null then null else ' and ' end; l_sql_stmt := l_sql_stmt ||' a.'||a_data_info.transformed_name||q'[ = ]'||' e.'||a_data_info.transformed_name; end if; exit when (a_data_info.access_path = l_pk_tab(l_index)) or l_index = l_pk_tab.count; l_index := l_pk_tab.next(l_index); - end loop; - ut_utils.append_to_clob(a_join_by_stmt,l_sql_stmt); - end if; + end loop; + end if; + return l_sql_stmt; end; - procedure generate_equal_sql(a_equal_stmt in out nocopy clob, a_col_name in varchar2) is - l_sql_stmt varchar2(32767); + function generate_equal_sql(a_col_name in varchar2) return varchar2 is begin - l_sql_stmt := case when a_equal_stmt is null then null else ' and ' end ||' a.'||a_col_name||q'[ = ]'||' e.'||a_col_name; - ut_utils.append_to_clob(a_equal_stmt,l_sql_stmt); + return ' a.'||a_col_name||q'[ = ]'||' e.'||a_col_name; end; - procedure generate_partition_stmt( - a_data_info ut_cursor_column, a_partition_stmt in out nocopy clob, - a_pk_table in ut_varchar2_list, a_alias varchar2 := 'ucd.' - ) is + function generate_partition_stmt( + a_data_info ut_cursor_column, a_pk_table in ut_varchar2_list, a_alias varchar2 := 'ucd.' + ) return varchar2 + is l_index integer; l_sql_stmt varchar2(32767); begin @@ -161,20 +204,20 @@ create or replace package body ut_compound_data_helper is loop if a_pk_table(l_index) in (a_data_info.access_path, a_data_info.parent_name) then --When then table is nested and join is on whole table - l_sql_stmt := case when a_partition_stmt is null then null else ',' end; l_sql_stmt := l_sql_stmt ||a_alias||a_data_info.transformed_name; - end if; - + end if; exit when (a_data_info.access_path = a_pk_table(l_index)) or l_index = a_pk_table.count; l_index := a_pk_table.next(l_index); end loop; else - l_sql_stmt := case when a_partition_stmt is null then null else ',' end ||a_alias||a_data_info.transformed_name; + l_sql_stmt := a_alias||a_data_info.transformed_name; end if; - ut_utils.append_to_clob(a_partition_stmt,l_sql_stmt); + return l_sql_stmt; end; - procedure generate_select_stmt(a_data_info ut_cursor_column,a_sql_stmt in out nocopy clob, a_alias varchar2 := 'ucd.') is + function generate_select_stmt(a_data_info ut_cursor_column, a_alias varchar2 := 'ucd.') + return varchar2 + is l_alias varchar2(10) := a_alias; l_col_syntax varchar2(4000); l_ut_owner varchar2(250) := ut_utils.ut_owner; @@ -183,12 +226,11 @@ create or replace package body ut_compound_data_helper is l_col_syntax := l_ut_owner ||'.ut_compound_data_helper.get_hash('||l_alias||a_data_info.transformed_name||'.getClobVal()) as '||a_data_info.transformed_name ; else l_col_syntax := l_alias||a_data_info.transformed_name||' as '|| a_data_info.transformed_name; - end if; - ut_utils.append_to_clob(a_sql_stmt,','||l_col_syntax); + end if; + return l_col_syntax; end; - procedure generate_xmltab_stmt(a_data_info ut_cursor_column, a_sql_stmt in out nocopy clob) is - l_sql_stmt varchar2(32767); + function generate_xmltab_stmt(a_data_info ut_cursor_column) return varchar2 is l_col_type varchar2(4000); begin if a_data_info.is_sql_diffable = 0 then @@ -209,9 +251,7 @@ create or replace package body ut_compound_data_helper is else null end; end if; - l_sql_stmt := case when a_sql_stmt is not null then ', ' end - ||a_data_info.transformed_name||' '||l_col_type||q'[ PATH ']'||a_data_info.access_path||q'[']'; - ut_utils.append_to_clob(a_sql_stmt, l_sql_stmt); + return a_data_info.transformed_name||' '||l_col_type||q'[ PATH ']'||a_data_info.access_path||q'[']'; end; procedure gen_sql_pieces_out_of_cursor( @@ -225,60 +265,54 @@ create or replace package body ut_compound_data_helper is a_not_equal_stmt out nocopy clob ) is l_partition_tmp clob; + l_xmltab_list ut_varchar2_list := ut_varchar2_list(); + l_select_list ut_varchar2_list := ut_varchar2_list(); + l_partition_list ut_varchar2_list := ut_varchar2_list(); + l_equal_list ut_varchar2_list := ut_varchar2_list(); + l_join_by_list ut_varchar2_list := ut_varchar2_list(); + l_not_equal_list ut_varchar2_list := ut_varchar2_list(); + + procedure add_element_to_list(a_list in out ut_varchar2_list, a_list_element in varchar2) + is + begin + if a_list_element is not null then + a_list.extend; + a_list(a_list.last) := a_list_element; + end if; + end; + begin if a_data_info is not empty then for i in 1..a_data_info.count loop if a_data_info(i).has_nested_col = 0 then --Get XMLTABLE column list - generate_xmltab_stmt(a_data_info(i), a_xml_stmt); + add_element_to_list(l_xmltab_list,generate_xmltab_stmt(a_data_info(i))); --Get Select statment list of columns - generate_select_stmt(a_data_info(i), a_select_stmt); + add_element_to_list(l_select_list, generate_select_stmt(a_data_info(i))); --Get columns by which we partition - generate_partition_stmt(a_data_info(i), l_partition_tmp, a_pk_table); + add_element_to_list(l_partition_list,generate_partition_stmt(a_data_info(i), a_pk_table)); --Get equal statement - generate_equal_sql(a_equal_stmt, a_data_info(i).transformed_name); + add_element_to_list(l_equal_list,generate_equal_sql(a_data_info(i).transformed_name)); --Generate join by stmt - generate_join_by_stmt(a_data_info(i), a_pk_table, a_join_by_stmt); + add_element_to_list(l_join_by_list,generate_join_by_stmt(a_data_info(i), a_pk_table)); --Generate not equal stmt - generate_not_equal_stmt(a_data_info(i), a_pk_table, a_not_equal_stmt); + add_element_to_list(l_not_equal_list,generate_not_equal_stmt(a_data_info(i), a_pk_table)); end if; end loop; - ut_utils.append_to_clob(a_partition_stmt,', row_number() over (partition by '); - ut_utils.append_to_clob(a_partition_stmt, l_partition_tmp||' order by '||l_partition_tmp||' ) dup_no '); + + a_xml_stmt := nullif(','||ut_utils.table_to_clob(l_xmltab_list, ' , '),','); + a_select_stmt := nullif(','||ut_utils.table_to_clob(l_select_list, ' , '),','); + l_partition_tmp := ut_utils.table_to_clob(l_partition_list, ' , '); + ut_utils.append_to_clob(a_partition_stmt,' row_number() over (partition by '||l_partition_tmp||' order by '||l_partition_tmp||' ) '); + a_equal_stmt := ut_utils.table_to_clob(l_equal_list, ' and '); + a_join_by_stmt := ut_utils.table_to_clob(l_join_by_list, ' and '); + a_not_equal_stmt := ut_utils.table_to_clob(l_not_equal_list, ' or '); else --Partition by piece when no data - ut_utils.append_to_clob(a_partition_stmt,', 1 dup_no '); + ut_utils.append_to_clob(a_partition_stmt,' 1 '); end if; end; - procedure get_act_and_exp_set( - a_current_stmt in out nocopy clob, a_partition_stmt clob, a_select_stmt clob, - a_xmltable_stmt clob, a_unordered boolean, a_type varchar2 - ) is - l_temp_string varchar2(32767); - l_ut_owner varchar2(250) := ut_utils.ut_owner; - begin - ut_utils.append_to_clob(a_current_stmt, a_partition_stmt); - - l_temp_string := 'from (select ucd.item_data '; - ut_utils.append_to_clob(a_current_stmt,l_temp_string); - ut_utils.append_to_clob(a_current_stmt, a_select_stmt); - - l_temp_string := ',x.data_id, ' - || case when not a_unordered then 'position + x.item_no ' else 'rownum ' end - ||'item_no from ' || l_ut_owner || '.ut_compound_data_tmp x,' - ||q'[ xmltable('/ROWSET/ROW' passing x.item_data columns ]' ; - ut_utils.append_to_clob(a_current_stmt, l_temp_string); - - ut_utils.append_to_clob(a_current_stmt, a_xmltable_stmt); - ut_utils.append_to_clob(a_current_stmt, case when a_xmltable_stmt is null then '' else ',' end||q'[ item_data xmltype PATH '*']'); - if not a_unordered then - ut_utils.append_to_clob(a_current_stmt, ', position for ordinality '); - end if; - ut_utils.append_to_clob(a_current_stmt, ' ) ucd where data_id = :'||a_type||'_guid ) ucd ) '); - end; - - function gen_compare_sql( a_other ut_data_value_refcursor, a_join_by_list ut_varchar2_list, @@ -286,15 +320,15 @@ create or replace package body ut_compound_data_helper is a_inclusion_type boolean, a_is_negated boolean ) return clob is - l_compare_sql clob; - l_temp_string varchar2(32767); - + l_compare_sql clob; l_xmltable_stmt clob; l_select_stmt clob; l_partition_stmt clob; l_equal_stmt clob; l_join_on_stmt clob; l_not_equal_stmt clob; + l_where_stmt clob; + l_ut_owner varchar2(250) := ut_utils.ut_owner; function get_join_type(a_inclusion_compare in boolean,a_negated in boolean) return varchar2 is begin @@ -305,62 +339,65 @@ create or replace package body ut_compound_data_helper is else ' full outer join ' end; end; - + + function get_item_no(a_unordered boolean) return varchar2 is + begin + return + case + when not a_unordered then 'position + x.item_no ' + else 'rownum ' + end; + end; + begin - dbms_lob.createtemporary(l_compare_sql, true); + dbms_lob.createtemporary(l_compare_sql, true); + --Initiate a SQL template with placeholders + ut_utils.append_to_clob(l_compare_sql, gc_compare_sql_template); + --Generate a pieceso of dynamic SQL that will substitute placeholders gen_sql_pieces_out_of_cursor( a_other.cursor_details.cursor_columns_info, a_join_by_list, l_xmltable_stmt, l_select_stmt, l_partition_stmt, l_equal_stmt, l_join_on_stmt, l_not_equal_stmt ); - l_temp_string := 'with exp as ( select ucd.* '; - ut_utils.append_to_clob(l_compare_sql, l_temp_string); - get_act_and_exp_set(l_compare_sql, l_partition_stmt, l_select_stmt, l_xmltable_stmt, a_unordered ,'exp'); + l_compare_sql := replace(l_compare_sql,'{:duplicate_number:}',l_partition_stmt); + l_compare_sql := replace(l_compare_sql,'{:columns:}',l_select_stmt); + l_compare_sql := replace(l_compare_sql,'{:item_no:}',get_item_no(a_unordered)); + l_compare_sql := replace(l_compare_sql,'{:ut3_owner:}',l_ut_owner); + l_compare_sql := replace(l_compare_sql,'{:xml_to_columns:}',l_xmltable_stmt); + l_compare_sql := replace(l_compare_sql,'{:item_no_select:}',case when a_unordered then 'rownum' else 'nvl(e.item_no,a.item_no)' end); + l_compare_sql := replace(l_compare_sql,'{:join_type:}',get_join_type(a_inclusion_type,a_is_negated)); - - l_temp_string :=',act as ( select ucd.* '; - ut_utils.append_to_clob(l_compare_sql, l_temp_string); - get_act_and_exp_set(l_compare_sql, l_partition_stmt, l_select_stmt, l_xmltable_stmt, a_unordered ,'act'); - - l_temp_string := ' select a.item_data as act_item_data, a.data_id act_data_id,' - ||'e.item_data as exp_item_data, e.data_id exp_data_id, '|| - case when a_unordered then 'rownum item_no' else 'nvl(e.item_no,a.item_no) item_no' end ||', nvl(e.dup_no,a.dup_no) dup_no ' - ||'from act a '||get_join_type(a_inclusion_type,a_is_negated)||' exp e on ( '; - ut_utils.append_to_clob(l_compare_sql,l_temp_string); - - if a_unordered then - ut_utils.append_to_clob(l_compare_sql,' e.dup_no = a.dup_no and '); - end if; - + --TODO : Refactor as equal and join is single stmt if (a_join_by_list.count > 0) then -- If key defined do the join or these and where on diffrences - ut_utils.append_to_clob(l_compare_sql,l_join_on_stmt); + l_compare_sql := replace(l_compare_sql,'{:join_condition:}',l_join_on_stmt); elsif a_unordered then -- If no key defined do the join on all columns - ut_utils.append_to_clob(l_compare_sql,l_equal_stmt); + l_compare_sql := replace(l_compare_sql,'{:join_condition:}',' e.dup_no = a.dup_no and '||l_equal_stmt); else - ut_utils.append_to_clob(l_compare_sql, 'a.item_no = e.item_no ' ); + l_compare_sql := replace(l_compare_sql,'{:join_condition:}','a.item_no = e.item_no '); end if; - ut_utils.append_to_clob(l_compare_sql,' ) where '); - if l_not_equal_stmt is not null then if (a_join_by_list.count > 0 and not a_is_negated) or (not a_unordered) then - ut_utils.append_to_clob(l_compare_sql,' ( '||l_not_equal_stmt||' ) or '); + ut_utils.append_to_clob(l_where_stmt,' ( '||l_not_equal_stmt||' ) or '); end if; end if; --If its inclusion we expect a actual set to fully match and have no extra elements over expected if a_inclusion_type then - l_temp_string := case when a_is_negated then ' 1 = 1 ' else ' ( a.data_id is null ) ' end; + ut_utils.append_to_clob(l_where_stmt,case when a_is_negated then ' 1 = 1 ' else ' ( a.data_id is null ) ' end); else - l_temp_string := ' (a.data_id is null or e.data_id is null) '; - end if; - ut_utils.append_to_clob(l_compare_sql,l_temp_string); + ut_utils.append_to_clob(l_where_stmt,' (a.data_id is null or e.data_id is null) '); + end if; + + l_compare_sql := replace(l_compare_sql,'{:where_condition:}',l_where_stmt); + + --dbms_output.put_line(l_compare_sql); return l_compare_sql; end; - + function get_column_extract_path(a_cursor_info ut_cursor_column_tab) return ut_varchar2_list is l_column_list ut_varchar2_list := ut_varchar2_list(); begin From 6306af69fcd7eb95b50c0c231785f3cbbbb480ed Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 22 Feb 2019 13:05:07 +0000 Subject: [PATCH 0232/1096] Rework dynamic sql generation to more readible format. --- .../data_values/ut_compound_data_helper.pkb | 40 +++++++++---------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 1a177d44c..eb9d73773 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -21,7 +21,7 @@ create or replace package body ut_compound_data_helper is g_type_name_map t_type_name_map; g_anytype_name_map t_type_name_map; - gc_compare_sql_template varchar2(4000) := + g_compare_sql_template varchar2(4000) := q'[ with exp as ( select @@ -257,10 +257,10 @@ create or replace package body ut_compound_data_helper is procedure gen_sql_pieces_out_of_cursor( a_data_info ut_cursor_column_tab, a_pk_table ut_varchar2_list, + a_unordered boolean, a_xml_stmt out nocopy clob, a_select_stmt out nocopy clob, a_partition_stmt out nocopy clob, - a_equal_stmt out nocopy clob, a_join_by_stmt out nocopy clob, a_not_equal_stmt out nocopy clob ) is @@ -304,12 +304,22 @@ create or replace package body ut_compound_data_helper is a_select_stmt := nullif(','||ut_utils.table_to_clob(l_select_list, ' , '),','); l_partition_tmp := ut_utils.table_to_clob(l_partition_list, ' , '); ut_utils.append_to_clob(a_partition_stmt,' row_number() over (partition by '||l_partition_tmp||' order by '||l_partition_tmp||' ) '); - a_equal_stmt := ut_utils.table_to_clob(l_equal_list, ' and '); - a_join_by_stmt := ut_utils.table_to_clob(l_join_by_list, ' and '); + + if a_pk_table.count > 0 then + -- If key defined do the join or these and where on diffrences + a_join_by_stmt := ut_utils.table_to_clob(l_join_by_list, ' and '); + elsif a_unordered then + -- If no key defined do the join on all columns + a_join_by_stmt := ' e.dup_no = a.dup_no and '||ut_utils.table_to_clob(l_equal_list, ' and '); + else + -- Else join on rownumber + a_join_by_stmt := 'a.item_no = e.item_no '; + end if; a_not_equal_stmt := ut_utils.table_to_clob(l_not_equal_list, ' or '); else --Partition by piece when no data ut_utils.append_to_clob(a_partition_stmt,' 1 '); + a_join_by_stmt := 'a.item_no = e.item_no '; end if; end; @@ -352,12 +362,12 @@ create or replace package body ut_compound_data_helper is begin dbms_lob.createtemporary(l_compare_sql, true); --Initiate a SQL template with placeholders - ut_utils.append_to_clob(l_compare_sql, gc_compare_sql_template); + ut_utils.append_to_clob(l_compare_sql, g_compare_sql_template); --Generate a pieceso of dynamic SQL that will substitute placeholders gen_sql_pieces_out_of_cursor( - a_other.cursor_details.cursor_columns_info, a_join_by_list, - l_xmltable_stmt, l_select_stmt, l_partition_stmt, l_equal_stmt, - l_join_on_stmt, l_not_equal_stmt + a_other.cursor_details.cursor_columns_info, a_join_by_list, a_unordered, + l_xmltable_stmt, l_select_stmt, l_partition_stmt, l_join_on_stmt, + l_not_equal_stmt ); l_compare_sql := replace(l_compare_sql,'{:duplicate_number:}',l_partition_stmt); @@ -367,24 +377,13 @@ create or replace package body ut_compound_data_helper is l_compare_sql := replace(l_compare_sql,'{:xml_to_columns:}',l_xmltable_stmt); l_compare_sql := replace(l_compare_sql,'{:item_no_select:}',case when a_unordered then 'rownum' else 'nvl(e.item_no,a.item_no)' end); l_compare_sql := replace(l_compare_sql,'{:join_type:}',get_join_type(a_inclusion_type,a_is_negated)); - - --TODO : Refactor as equal and join is single stmt - if (a_join_by_list.count > 0) then - -- If key defined do the join or these and where on diffrences - l_compare_sql := replace(l_compare_sql,'{:join_condition:}',l_join_on_stmt); - elsif a_unordered then - -- If no key defined do the join on all columns - l_compare_sql := replace(l_compare_sql,'{:join_condition:}',' e.dup_no = a.dup_no and '||l_equal_stmt); - else - l_compare_sql := replace(l_compare_sql,'{:join_condition:}','a.item_no = e.item_no '); - end if; + l_compare_sql := replace(l_compare_sql,'{:join_condition:}',l_join_on_stmt); if l_not_equal_stmt is not null then if (a_join_by_list.count > 0 and not a_is_negated) or (not a_unordered) then ut_utils.append_to_clob(l_where_stmt,' ( '||l_not_equal_stmt||' ) or '); end if; end if; - --If its inclusion we expect a actual set to fully match and have no extra elements over expected if a_inclusion_type then ut_utils.append_to_clob(l_where_stmt,case when a_is_negated then ' 1 = 1 ' else ' ( a.data_id is null ) ' end); @@ -394,7 +393,6 @@ create or replace package body ut_compound_data_helper is l_compare_sql := replace(l_compare_sql,'{:where_condition:}',l_where_stmt); - --dbms_output.put_line(l_compare_sql); return l_compare_sql; end; From daa8ec3e35127efd81843ff78902bfa1aa8ce699 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sat, 23 Feb 2019 14:31:43 +0000 Subject: [PATCH 0233/1096] fixing issue with order of data. instead of rownum force order from cardinality of xml --- source/core/ut_utils.pks | 4 ++++ .../data_values/ut_compound_data_helper.pkb | 15 +++++++-------- .../expectations/test_expectations_cursor.pkb | 18 +++++++++--------- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 4e8ec7376..dbeaa031b 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -118,6 +118,10 @@ create or replace package ut_utils authid definer is gc_failure_for_all constant pls_integer := -24381; pragma exception_init (ex_failure_for_all, -24381); + ex_dml_for_all exception; + gc_dml_for_all constant pls_integer := -20215; + pragma exception_init (ex_dml_for_all, -20215); + gc_max_storage_varchar2_len constant integer := 4000; gc_max_output_string_length constant integer := 4000; gc_max_input_string_length constant integer := gc_max_output_string_length - 2; --we need to remove 2 chars for quotes around string diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index eb9d73773..aa7d32f79 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -31,7 +31,7 @@ create or replace package body ut_compound_data_helper is select ucd.item_data ,x.data_id data_id - ,{:item_no:} item_no + ,position + x.item_no item_no {:columns:} from {:ut3_owner:}.ut_compound_data_tmp x, xmltable('/ROWSET/ROW' passing x.item_data columns @@ -49,7 +49,7 @@ create or replace package body ut_compound_data_helper is select ucd.item_data ,x.data_id data_id - ,{:item_no:} item_no + ,position + x.item_no item_no {:columns:} from {:ut3_owner:}.ut_compound_data_tmp x, xmltable('/ROWSET/ROW' passing x.item_data columns @@ -64,7 +64,7 @@ create or replace package body ut_compound_data_helper is a.data_id act_data_id, e.item_data as exp_item_data, e.data_id exp_data_id, - {:item_no_select:} as item_no, + {:item_no:} as item_no, nvl(e.dup_no,a.dup_no) dup_no from act a {:join_type:} exp e on ( {:join_condition:} ) where {:where_condition:}]'; @@ -354,8 +354,8 @@ create or replace package body ut_compound_data_helper is begin return case - when not a_unordered then 'position + x.item_no ' - else 'rownum ' + when a_unordered then 'row_number() over ( order by nvl(e.item_no,a.item_no))' + else 'nvl(e.item_no,a.item_no) ' end; end; @@ -372,10 +372,9 @@ create or replace package body ut_compound_data_helper is l_compare_sql := replace(l_compare_sql,'{:duplicate_number:}',l_partition_stmt); l_compare_sql := replace(l_compare_sql,'{:columns:}',l_select_stmt); - l_compare_sql := replace(l_compare_sql,'{:item_no:}',get_item_no(a_unordered)); l_compare_sql := replace(l_compare_sql,'{:ut3_owner:}',l_ut_owner); l_compare_sql := replace(l_compare_sql,'{:xml_to_columns:}',l_xmltable_stmt); - l_compare_sql := replace(l_compare_sql,'{:item_no_select:}',case when a_unordered then 'rownum' else 'nvl(e.item_no,a.item_no)' end); + l_compare_sql := replace(l_compare_sql,'{:item_no:}',get_item_no(a_unordered)); l_compare_sql := replace(l_compare_sql,'{:join_type:}',get_join_type(a_inclusion_type,a_is_negated)); l_compare_sql := replace(l_compare_sql,'{:join_condition:}',l_join_on_stmt); @@ -634,7 +633,7 @@ create or replace package body ut_compound_data_helper is a_diff_tab(idx).item_no, a_diff_tab(idx).dup_no); exception when ut_utils.ex_failure_for_all then - raise_application_error(ut_utils.gc_failure_for_all,'Failure to insert a diff tmp data.'); + raise_application_error(ut_utils.gc_dml_for_all,'Failure to insert a diff tmp data.'); end; procedure set_rows_diff(a_rows_diff integer) is diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index e63494306..8d4a9de9a 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -1632,11 +1632,11 @@ Diff:% l_expected_message := q'[%Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 3 ]% Diff:% Rows: [ 5 differences% -%Extra: 2Something 22% %Extra: 1Something 11% -%Missing: 1Somethings 11% +%Extra: 2Something 22% +%Missing: 3Somethings 33% %Missing: 2Somethings 22% -%Missing: 3Somethings 33%]'; +%Missing: 1Somethings 11%]'; l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); @@ -1914,11 +1914,11 @@ Diff:% l_expected_message varchar2(32767); l_actual_message varchar2(32767); begin - select ut3.ut_key_value_pair(rownum,'Something '||rownum) + select ut3.ut_key_value_pair(rownum,'Apples '||rownum) bulk collect into l_actual_tab from dual connect by level <=2; - select ut3.ut_key_value_pair(rownum,'Somethings '||rownum) + select ut3.ut_key_value_pair(rownum,'Peaches '||rownum) bulk collect into l_expected_tab from dual connect by level <=2; @@ -1936,10 +1936,10 @@ Diff:% l_expected_message := q'[%Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 2 ] %Diff: %Rows: [ 4 differences ] -%Extra: 21Something 12Something 2 -%Extra: 11Something 12Something 2 -%Missing: 11Somethings 12Somethings 2 -%Missing: 21Somethings 12Somethings 2%]'; +%Extra: 11Apples 12Apples 2 +%Extra: 21Apples 12Apples 2 +%Missing: 11Peaches 12Peaches 2 +%Missing: 21Peaches 12Peaches 2%]'; l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); From ab55d1243a1fd859de4bc0c53c0b773bb5e2a5fd Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sat, 23 Feb 2019 14:31:43 +0000 Subject: [PATCH 0234/1096] fixing issue with order of data. instead of rownum force order from cardinality of xml. fix error when raising for all the valid range for user-specified error numbers is -20000 to -20999 inclusively. --- source/core/ut_utils.pks | 4 ++++ .../data_values/ut_compound_data_helper.pkb | 15 +++++++-------- .../expectations/test_expectations_cursor.pkb | 18 +++++++++--------- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 4e8ec7376..dbeaa031b 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -118,6 +118,10 @@ create or replace package ut_utils authid definer is gc_failure_for_all constant pls_integer := -24381; pragma exception_init (ex_failure_for_all, -24381); + ex_dml_for_all exception; + gc_dml_for_all constant pls_integer := -20215; + pragma exception_init (ex_dml_for_all, -20215); + gc_max_storage_varchar2_len constant integer := 4000; gc_max_output_string_length constant integer := 4000; gc_max_input_string_length constant integer := gc_max_output_string_length - 2; --we need to remove 2 chars for quotes around string diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index eb9d73773..aa7d32f79 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -31,7 +31,7 @@ create or replace package body ut_compound_data_helper is select ucd.item_data ,x.data_id data_id - ,{:item_no:} item_no + ,position + x.item_no item_no {:columns:} from {:ut3_owner:}.ut_compound_data_tmp x, xmltable('/ROWSET/ROW' passing x.item_data columns @@ -49,7 +49,7 @@ create or replace package body ut_compound_data_helper is select ucd.item_data ,x.data_id data_id - ,{:item_no:} item_no + ,position + x.item_no item_no {:columns:} from {:ut3_owner:}.ut_compound_data_tmp x, xmltable('/ROWSET/ROW' passing x.item_data columns @@ -64,7 +64,7 @@ create or replace package body ut_compound_data_helper is a.data_id act_data_id, e.item_data as exp_item_data, e.data_id exp_data_id, - {:item_no_select:} as item_no, + {:item_no:} as item_no, nvl(e.dup_no,a.dup_no) dup_no from act a {:join_type:} exp e on ( {:join_condition:} ) where {:where_condition:}]'; @@ -354,8 +354,8 @@ create or replace package body ut_compound_data_helper is begin return case - when not a_unordered then 'position + x.item_no ' - else 'rownum ' + when a_unordered then 'row_number() over ( order by nvl(e.item_no,a.item_no))' + else 'nvl(e.item_no,a.item_no) ' end; end; @@ -372,10 +372,9 @@ create or replace package body ut_compound_data_helper is l_compare_sql := replace(l_compare_sql,'{:duplicate_number:}',l_partition_stmt); l_compare_sql := replace(l_compare_sql,'{:columns:}',l_select_stmt); - l_compare_sql := replace(l_compare_sql,'{:item_no:}',get_item_no(a_unordered)); l_compare_sql := replace(l_compare_sql,'{:ut3_owner:}',l_ut_owner); l_compare_sql := replace(l_compare_sql,'{:xml_to_columns:}',l_xmltable_stmt); - l_compare_sql := replace(l_compare_sql,'{:item_no_select:}',case when a_unordered then 'rownum' else 'nvl(e.item_no,a.item_no)' end); + l_compare_sql := replace(l_compare_sql,'{:item_no:}',get_item_no(a_unordered)); l_compare_sql := replace(l_compare_sql,'{:join_type:}',get_join_type(a_inclusion_type,a_is_negated)); l_compare_sql := replace(l_compare_sql,'{:join_condition:}',l_join_on_stmt); @@ -634,7 +633,7 @@ create or replace package body ut_compound_data_helper is a_diff_tab(idx).item_no, a_diff_tab(idx).dup_no); exception when ut_utils.ex_failure_for_all then - raise_application_error(ut_utils.gc_failure_for_all,'Failure to insert a diff tmp data.'); + raise_application_error(ut_utils.gc_dml_for_all,'Failure to insert a diff tmp data.'); end; procedure set_rows_diff(a_rows_diff integer) is diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index e63494306..8d4a9de9a 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -1632,11 +1632,11 @@ Diff:% l_expected_message := q'[%Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 3 ]% Diff:% Rows: [ 5 differences% -%Extra: 2Something 22% %Extra: 1Something 11% -%Missing: 1Somethings 11% +%Extra: 2Something 22% +%Missing: 3Somethings 33% %Missing: 2Somethings 22% -%Missing: 3Somethings 33%]'; +%Missing: 1Somethings 11%]'; l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); @@ -1914,11 +1914,11 @@ Diff:% l_expected_message varchar2(32767); l_actual_message varchar2(32767); begin - select ut3.ut_key_value_pair(rownum,'Something '||rownum) + select ut3.ut_key_value_pair(rownum,'Apples '||rownum) bulk collect into l_actual_tab from dual connect by level <=2; - select ut3.ut_key_value_pair(rownum,'Somethings '||rownum) + select ut3.ut_key_value_pair(rownum,'Peaches '||rownum) bulk collect into l_expected_tab from dual connect by level <=2; @@ -1936,10 +1936,10 @@ Diff:% l_expected_message := q'[%Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 2 ] %Diff: %Rows: [ 4 differences ] -%Extra: 21Something 12Something 2 -%Extra: 11Something 12Something 2 -%Missing: 11Somethings 12Somethings 2 -%Missing: 21Somethings 12Somethings 2%]'; +%Extra: 11Apples 12Apples 2 +%Extra: 21Apples 12Apples 2 +%Missing: 11Peaches 12Peaches 2 +%Missing: 21Peaches 12Peaches 2%]'; l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); From dd7e86869d69421011b23aa0b164cf89a158fd2d Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 24 Feb 2019 14:57:44 +0000 Subject: [PATCH 0235/1096] Renamed `ut_include` to `ut_contain`. --- docs/userguide/advanced_data_comparison.md | 10 +- docs/userguide/expectations.md | 102 +++--- source/api/contain.syn | 2 +- source/api/include.syn | 1 - .../create_synonyms_and_grants_for_public.sql | 3 +- source/create_user_synonyms.sql | 1 + .../{ut_include.tpb => ut_contain.tpb} | 8 +- .../{ut_include.tps => ut_contain.tps} | 8 +- source/expectations/ut_expectation.tpb | 20 +- source/expectations/ut_expectation.tps | 3 - .../expectations/ut_expectation_refcursor.tpb | 16 +- .../expectations/ut_expectation_refcursor.tps | 2 - source/install.sql | 5 +- source/uninstall_objects.sql | 4 +- .../expectations/test_expectations_cursor.pkb | 304 +----------------- .../expectations/test_expectations_cursor.pks | 69 +--- test/install_and_run_tests.sh | 2 +- 17 files changed, 104 insertions(+), 456 deletions(-) delete mode 100644 source/api/include.syn rename source/expectations/matchers/{ut_include.tpb => ut_contain.tpb} (88%) rename source/expectations/matchers/{ut_include.tps => ut_contain.tps} (81%) diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index ce0e053a1..83d1af5ed 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -15,9 +15,9 @@ Advanced data-comparison options are available for the [`equal`](expectations.md ut.expect( a_actual {data-type} ).not_to( equal( a_expected {data-type})[.extendend_option()[.extendend_option()[...]]]) ); ut.expect( a_actual {data-type} ).to_equal( a_expected {data-type})[.extendend_option()[.extendend_option()[...]]]); ut.expect( a_actual {data-type} ).not_to_equal( a_expected {data-type})[.extendend_option()[.extendend_option()[...]]] ); + ut.expect( a_actual {data-type} ).to_( contain( a_expected {data-type})[.extendend_option()[.extendend_option()[...]]]); + ut.expect( a_actual {data-type} ).not_to( contain( a_expected {data-type})[.extendend_option()[.extendend_option()[...]]]) ); ut.expect( a_actual {data-type} ).to_contain( a_expected {data-type})[.extendend_option()[.extendend_option()[...]]]); - ut.expect( a_actual {data-type} ).to_include( a_expected {data-type})[.extendend_option()[.extendend_option()[...]]]); - ut.expect( a_actual {data-type} ).not_to_include( a_expected {data-type})[.extendend_option()[.extendend_option()[...]]]); ut.expect( a_actual {data-type} ).not_to_contain( a_expected {data-type})[.extendend_option()[.extendend_option()[...]]]); ``` @@ -61,7 +61,7 @@ procedure test_cur_skip_columns_cn is begin open l_expected for select 'text' ignore_me, d.* from user_tables d where rownum = 1; open l_actual for select sysdate "ADate", d.* from user_tables d; - ut.expect( l_actual ).to_include( l_expected ).exclude( 'IGNORE_ME,ADate' ); + ut.expect( l_actual ).to_contain( l_expected ).exclude( 'IGNORE_ME,ADate' ); end; ``` @@ -230,7 +230,7 @@ end; Above test will indicate that in actual data-set ```sql - Actual: refcursor [ count = 43 ] was expected to include: refcursor [ count = 44 ] + Actual: refcursor [ count = 43 ] was expected to contain: refcursor [ count = 44 ] Diff: Rows: [ 1 differences ] PK TEST - Missing -610 @@ -404,7 +404,7 @@ create or replace package body test_unordered_columns as and rownum < 20; --Assert - ut.expect(l_actual).to_include(l_expected).unordered_columns(); + ut.expect(l_actual).to_contain(l_expected).unordered_columns(); end; end; / diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 207488554..a7d3ef5dd 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -145,7 +145,7 @@ utPLSQL provides the following matchers to perform checks on the expected and ac - `be_null` - `be_true` - `equal` -- `include ` / `contain` +- `contain` - `have_count` - `match` @@ -433,17 +433,17 @@ end; The `a_nulls_are_equal` parameter controls the behavior of a `null = null` comparison. To change the behavior of `NULL = NULL` comparison pass the `a_nulls_are_equal => false` to the `equal` matcher. -## include / contain +## contain This matcher supports only cursor comparison. It check if the give set contain all values from given subset. -when comparing data using `include / contain` matcher, the data-types of columns for compared cursors must be exactly the same. +When comparing data using `contain` matcher, the data-types of columns for compared cursors must be exactly the same. -The matcher supports all advanced comparison options as `equal` e.g. include , exclude, join_by. +The matcher supports all advanced comparison options as `equal` like: `include` , `exclude`, `join_by` etc.. -The matcher is successful when all of the values from expected results are included in actual data set. +The matcher is successful when actual data set contains all of the values from expected results. -The matcher will cause a test to fail if any of expected values are not included in actual data set. +The matcher will cause a test to fail if actual data set does not contain any of expected values. ![included_set](../images/venn21.gif) @@ -460,7 +460,7 @@ The matcher will cause a test to fail if any of expected values are not included union all select rownum as rn from dual a connect by level < 4; --Act - ut.expect(l_actual).to_include(l_expected); + ut.expect(l_actual).to_contain(l_expected); end; ``` @@ -468,7 +468,7 @@ Will result in failure message ```sql 1) ut_refcursors - Actual: refcursor [ count = 9 ] was expected to include: refcursor [ count = 6 ] + Actual: refcursor [ count = 9 ] was expected to contain: refcursor [ count = 6 ] Diff: Rows: [ 3 differences ] Missing: 3 @@ -476,7 +476,7 @@ Will result in failure message Missing: 1 ``` -When duplicate rows are present in expected data set, actual data set must also include the same amount of duplicate. +When duplicate rows are present in expected data set, actual data set must also include the same amount of duplicates. *Example 2.* @@ -488,19 +488,19 @@ create or replace package ut_duplicate_test is --%suite(Sample Test Suite) --%test(Ref Cursor contain duplicates) - procedure ut_duplicate_include; + procedure ut_duplicate_contain; end ut_duplicate_test; / create or replace package body ut_duplicate_test is - procedure ut_duplicate_include is + procedure ut_duplicate_contain is l_actual sys_refcursor; l_expected sys_refcursor; begin open l_expected for select mod(level,2) as rn from dual connect by level < 5; open l_actual for select mod(level,8) as rn from dual connect by level < 9; - ut.expect(l_actual).to_include(l_expected); + ut.expect(l_actual).to_contain(l_expected); end; end ut_duplicate_test; @@ -509,8 +509,8 @@ end ut_duplicate_test; Will result in failure test message ```sql - 1) ut_duplicate_include - Actual: refcursor [ count = 8 ] was expected to include: refcursor [ count = 4 ] + 1) ut_duplicate_contain + Actual: refcursor [ count = 8 ] was expected to contain: refcursor [ count = 4 ] Diff: Rows: [ 2 differences ] Missing: 0 @@ -519,7 +519,7 @@ Will result in failure test message -The negated version of `include / contain` ( `not_to_include`/ `not_to_contain` ) is successful only when all values from expected set are not part of actual (they are disjoint and there is no overlap). +The negated version of `contain` ( `not_to_contain` ) is successful only when all values from expected set are not part of actual (they are disjoint and there is no overlap). @@ -531,7 +531,7 @@ Set 1 is defined as [ A , B , C ] *Set 2 is defined as [A , D , E ]* -*Result : This will fail both of options to`to_include` and `not_to_include`* +*Result : This will fail both of options to `to_contain` and `not_to_contain`* @@ -541,7 +541,7 @@ Set 1 is defined as [ A , B , C , D ] *Set 2 is defined as [A , B , D ]* -*Result : This will be success on option `to_include` and fail `not_to_include`* +*Result : This will be success on option `to_contain` and fail `not_to_contain`* @@ -551,33 +551,33 @@ Set 1 is defined as [ A , B , C ] *Set 2 is defined as [D, E , F ]* -*Result : This will be success on options `not_to_include` and fail `to_include`* +*Result : This will be success on options `not_to_contain` and fail `to_contain`* Example usage ```sql -create or replace package example_include is - --%suite(Include test) +create or replace package example_contain is + --%suite(Contain test) - --%test( Cursor include data from another cursor) - procedure cursor_to_include; + --%test( Cursor contains data from another cursor) + procedure cursor_to_contain; - --%test( Cursor include data from another cursor) - procedure cursor_not_to_include; + --%test( Cursor contains data from another cursor) + procedure cursor_not_to_contain; - --%test( Cursor fail include) - procedure cursor_fail_include; + --%test( Cursor fail on to_contain) + procedure cursor_fail_contain; - --%test( Cursor fail not include) - procedure cursor_fail_not_include; + --%test( Cursor fail not_to_contain) + procedure cursor_fail_not_contain; end; / -create or replace package body example_include is +create or replace package body example_contain is - procedure cursor_to_include is + procedure cursor_to_contain is l_actual SYS_REFCURSOR; l_expected SYS_REFCURSOR; begin @@ -594,10 +594,10 @@ create or replace package body example_include is select 'c' as name from dual; --Act - ut.expect(l_actual).to_include(l_expected); + ut.expect(l_actual).to_contain(l_expected); end; - procedure cursor_not_to_include is + procedure cursor_not_to_contain is l_actual SYS_REFCURSOR; l_expected SYS_REFCURSOR; begin @@ -613,10 +613,10 @@ create or replace package body example_include is select 'f' as name from dual; --Act - ut.expect(l_actual).not_to_include(l_expected); + ut.expect(l_actual).not_to_contain(l_expected); end; - procedure cursor_fail_include is + procedure cursor_fail_contain is l_actual SYS_REFCURSOR; l_expected SYS_REFCURSOR; begin @@ -632,10 +632,10 @@ create or replace package body example_include is select 'e' as name from dual; --Act - ut.expect(l_actual).to_include(l_expected); + ut.expect(l_actual).to_contain(l_expected); end; - procedure cursor_fail_not_include is + procedure cursor_fail_not_contain is l_actual SYS_REFCURSOR; l_expected SYS_REFCURSOR; begin @@ -651,7 +651,7 @@ create or replace package body example_include is select 'e' as name from dual; --Act - ut.expect(l_actual).not_to_include(l_expected); + ut.expect(l_actual).not_to_contain(l_expected); end; end; / @@ -660,26 +660,30 @@ end; Above execution will provide results as follow: +Cursor contains data from another cursor +Cursor contains data from another cursor +Cursor fail on to_contain +Cursor fail not_to_contain ```sql -Include test - Cursor include data from another cursor [.045 sec] - Cursor include data from another cursor [.039 sec] - Cursor fail include [.046 sec] (FAILED - 1) - Cursor fail not include [.043 sec] (FAILED - 2) +Contain test + Cursor contains data from another cursor [.045 sec] + Cursor contains data from another cursor [.039 sec] + Cursor fail on to_contain [.046 sec] (FAILED - 1) + Cursor fail not_to_contain [.043 sec] (FAILED - 2) Failures: - 1) cursor_fail_include - Actual: refcursor [ count = 3 ] was expected to include: refcursor [ count = 3 ] + 1) cursor_fail_contain + Actual: refcursor [ count = 3 ] was expected to contain: refcursor [ count = 3 ] Diff: Rows: [ 2 differences ] Missing: d Missing: e - at "UT3.EXAMPLE_INCLUDE.CURSOR_FAIL_INCLUDE", line 71 ut.expect(l_actual).to_include(l_expected); + at "UT3.EXAMPLE_CONTAIN.CURSOR_FAIL_CONTAIN", line 71 ut.expect(l_actual).to_contain(l_expected); - 2) cursor_fail_not_include + 2) cursor_fail_not_contain Actual: (refcursor [ count = 3 ]) Data-types: CHAR @@ -688,7 +692,7 @@ Failures: a b c - was expected not to include:(refcursor [ count = 3 ]) + was expected not to contain:(refcursor [ count = 3 ]) Data-types: CHAR @@ -696,7 +700,7 @@ Failures: a d e - at "UT3.EXAMPLE_INCLUDE.CURSOR_FAIL_NOT_INCLUDE", line 94 ut.expect(l_actual).not_to_include(l_expected); + at "UT3.EXAMPLE_CONTAIN.CURSOR_FAIL_NOT_CONTAIN", line 94 ut.expect(l_actual).not_to_contain(l_expected); ``` @@ -1161,7 +1165,7 @@ The matrix below illustrates the data types supported by different matchers. | **be_less_than** | | | | X | X | X | X | X | | X | X | | | | | **be_between** | | | | X | X | X | X | X | X | X | X | | | | | **equal** | X | X | X | X | X | X | X | X | X | X | X | X | X | X | -| **include / contain** | | | | | | | | | | | | X | X | X | +| **contain** | | | | | | | | | | | | X | X | X | | **match** | | | X | | | | | | X | | | | | | | **be_like** | | | X | | | | | | X | | | | | | | **be_empty** | X | | X | | | | | | | | | X | X | | diff --git a/source/api/contain.syn b/source/api/contain.syn index 34609ef8b..5bce7d1d2 100644 --- a/source/api/contain.syn +++ b/source/api/contain.syn @@ -1 +1 @@ -create synonym contain for ut_include; +create synonym contain for ut_contain; diff --git a/source/api/include.syn b/source/api/include.syn deleted file mode 100644 index 855700e1e..000000000 --- a/source/api/include.syn +++ /dev/null @@ -1 +0,0 @@ -create synonym include for ut_include; diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index 965954594..e1ee84d0b 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -124,10 +124,9 @@ create public synonym be_like for &&ut3_owner..be_like; create public synonym be_not_null for &&ut3_owner..be_not_null; create public synonym be_null for &&ut3_owner..be_null; create public synonym be_true for &&ut3_owner..be_true; -create public synonym contain for &&ut3_owner..include; +create public synonym contain for &&ut3_owner..contain; create public synonym equal for &&ut3_owner..equal; create public synonym have_count for &&ut3_owner..have_count; -create public synonym include for &&ut3_owner..include; create public synonym match for &&ut3_owner..match; create public synonym ut for &&ut3_owner..ut; diff --git a/source/create_user_synonyms.sql b/source/create_user_synonyms.sql index dfd3e4edf..70663024a 100644 --- a/source/create_user_synonyms.sql +++ b/source/create_user_synonyms.sql @@ -68,6 +68,7 @@ create or replace synonym &ut3_user..be_like for &&ut3_owner..be_like; create or replace synonym &ut3_user..be_not_null for &&ut3_owner..be_not_null; create or replace synonym &ut3_user..be_null for &&ut3_owner..be_null; create or replace synonym &ut3_user..be_true for &&ut3_owner..be_true; +create or replace synonym &ut3_user..contain for &&ut3_owner..contain; create or replace synonym &ut3_user..equal for &&ut3_owner..equal; create or replace synonym &ut3_user..have_count for &&ut3_owner..have_count; create or replace synonym &ut3_user..match for &&ut3_owner..match; diff --git a/source/expectations/matchers/ut_include.tpb b/source/expectations/matchers/ut_contain.tpb similarity index 88% rename from source/expectations/matchers/ut_include.tpb rename to source/expectations/matchers/ut_contain.tpb index efcc9c5b8..5c823ccc4 100644 --- a/source/expectations/matchers/ut_include.tpb +++ b/source/expectations/matchers/ut_contain.tpb @@ -1,4 +1,4 @@ -create or replace type body ut_include as +create or replace type body ut_contain as /* utPLSQL - Version 3 Copyright 2016 - 2018 utPLSQL Project @@ -16,14 +16,14 @@ create or replace type body ut_include as limitations under the License. */ - constructor function ut_include(self in out nocopy ut_include, a_expected sys_refcursor) return self as result is + constructor function ut_contain(self in out nocopy ut_contain, a_expected sys_refcursor) return self as result is begin self.init(ut_data_value_refcursor(a_expected), null, $$plsql_unit); self.options.unordered(); return; end; - overriding member function run_matcher(self in out nocopy ut_include, a_actual ut_data_value) return boolean is + overriding member function run_matcher(self in out nocopy ut_contain, a_actual ut_data_value) return boolean is l_result boolean; begin if self.expected.data_type = a_actual.data_type then @@ -38,7 +38,7 @@ create or replace type body ut_include as return l_result; end; - overriding member function run_matcher_negated(self in out nocopy ut_include, a_actual ut_data_value) return boolean is + overriding member function run_matcher_negated(self in out nocopy ut_contain, a_actual ut_data_value) return boolean is begin return run_matcher(a_actual); end; diff --git a/source/expectations/matchers/ut_include.tps b/source/expectations/matchers/ut_contain.tps similarity index 81% rename from source/expectations/matchers/ut_include.tps rename to source/expectations/matchers/ut_contain.tps index de3effe3b..f0b1c0ddb 100644 --- a/source/expectations/matchers/ut_include.tps +++ b/source/expectations/matchers/ut_contain.tps @@ -1,4 +1,4 @@ -create or replace type ut_include under ut_equal( +create or replace type ut_contain under ut_equal( /* utPLSQL - Version 3 Copyright 2016 - 2018 utPLSQL Project @@ -23,9 +23,9 @@ create or replace type ut_include under ut_equal( * that false include not necessary mean true not include. */ - constructor function ut_include(self in out nocopy ut_include, a_expected sys_refcursor) return self as result, - overriding member function run_matcher(self in out nocopy ut_include, a_actual ut_data_value) return boolean, - overriding member function run_matcher_negated(self in out nocopy ut_include, a_actual ut_data_value) return boolean, + constructor function ut_contain(self in out nocopy ut_contain, a_expected sys_refcursor) return self as result, + overriding member function run_matcher(self in out nocopy ut_contain, a_actual ut_data_value) return boolean, + overriding member function run_matcher_negated(self in out nocopy ut_contain, a_actual ut_data_value) return boolean, overriding member function failure_message(a_actual ut_data_value) return varchar2, overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2 ) diff --git a/source/expectations/ut_expectation.tpb b/source/expectations/ut_expectation.tpb index 1862bfaf6..97ce1d195 100644 --- a/source/expectations/ut_expectation.tpb +++ b/source/expectations/ut_expectation.tpb @@ -35,10 +35,8 @@ create or replace type body ut_expectation as l_matcher ut_matcher := a_matcher; l_message varchar2(32767); begin - --Negated matcher for include option. - l_expectation_result := l_matcher.run_matcher_negated( self.actual_data ); - l_expectation_result := coalesce(l_expectation_result,false); - + l_expectation_result := coalesce( l_matcher.run_matcher_negated( self.actual_data ), false ); + l_message := coalesce( l_matcher.error_message( self.actual_data ), l_matcher.failure_message_when_negated( self.actual_data ) ); ut_expectation_processor.add_expectation_result( ut_expectation_result( ut_utils.to_test_result( l_expectation_result ), self.description, l_message ) ); end; @@ -683,24 +681,14 @@ create or replace type body ut_expectation as self.not_to( ut_be_less_than (a_expected) ); end; - member procedure to_include(self in ut_expectation, a_expected sys_refcursor) is - begin - to_contain( a_expected ); - end; - member procedure to_contain(self in ut_expectation, a_expected sys_refcursor) is begin - self.to_( ut_include(a_expected) ); - end; - - member procedure not_to_include(self in ut_expectation, a_expected sys_refcursor) is - begin - not_to_contain( a_expected ); + self.to_( ut_contain(a_expected) ); end; member procedure not_to_contain(self in ut_expectation, a_expected sys_refcursor) is begin - self.not_to( ut_include(a_expected).negated() ); + self.not_to( ut_contain(a_expected).negated() ); end; end; diff --git a/source/expectations/ut_expectation.tps b/source/expectations/ut_expectation.tps index 215a0e00a..5f3dfaabf 100644 --- a/source/expectations/ut_expectation.tps +++ b/source/expectations/ut_expectation.tps @@ -160,10 +160,7 @@ create or replace type ut_expectation authid current_user as object( member procedure not_to_be_less_than(self in ut_expectation, a_expected timestamp_tz_unconstrained), member procedure not_to_be_less_than(self in ut_expectation, a_expected yminterval_unconstrained), - member procedure to_include(self in ut_expectation, a_expected sys_refcursor), member procedure to_contain(self in ut_expectation, a_expected sys_refcursor), - - member procedure not_to_include(self in ut_expectation, a_expected sys_refcursor), member procedure not_to_contain(self in ut_expectation, a_expected sys_refcursor) ) diff --git a/source/expectations/ut_expectation_refcursor.tpb b/source/expectations/ut_expectation_refcursor.tpb index fe1b653e1..90b1c0765 100644 --- a/source/expectations/ut_expectation_refcursor.tpb +++ b/source/expectations/ut_expectation_refcursor.tpb @@ -37,29 +37,17 @@ create or replace type body ut_expectation_refcursor as return l_result; end; - member function to_include(a_expected sys_refcursor) return ut_expectation_refcursor is - l_result ut_expectation_refcursor := self; - begin - l_result.matcher := ut_include(a_expected); - return l_result; - end; - member function to_contain(a_expected sys_refcursor) return ut_expectation_refcursor is l_result ut_expectation_refcursor := self; begin - l_result.matcher := ut_include(a_expected); + l_result.matcher := ut_contain(a_expected); return l_result; end; - member function not_to_include(a_expected sys_refcursor) return ut_expectation_refcursor is - begin - return not_to_contain( a_expected ); - end; - member function not_to_contain(a_expected sys_refcursor) return ut_expectation_refcursor is l_result ut_expectation_refcursor := self; begin - l_result.matcher := ut_include(a_expected).negated(); + l_result.matcher := ut_contain(a_expected).negated(); return l_result; end; diff --git a/source/expectations/ut_expectation_refcursor.tps b/source/expectations/ut_expectation_refcursor.tps index 84e255ad4..f4197d282 100644 --- a/source/expectations/ut_expectation_refcursor.tps +++ b/source/expectations/ut_expectation_refcursor.tps @@ -21,10 +21,8 @@ create or replace type ut_expectation_refcursor under ut_expectation_compound( ) return self as result, member function to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_refcursor, - member function to_include(a_expected sys_refcursor) return ut_expectation_refcursor, member function not_to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_refcursor, member function to_contain(a_expected sys_refcursor) return ut_expectation_refcursor, - member function not_to_include(a_expected sys_refcursor) return ut_expectation_refcursor, member function not_to_contain(a_expected sys_refcursor) return ut_expectation_refcursor, overriding member function include(a_items varchar2) return ut_expectation_refcursor, diff --git a/source/install.sql b/source/install.sql index a4c05053c..d55a9cdbd 100644 --- a/source/install.sql +++ b/source/install.sql @@ -217,7 +217,7 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/matchers/ut_be_null.tps' @@install_component.sql 'expectations/matchers/ut_be_true.tps' @@install_component.sql 'expectations/matchers/ut_equal.tps' -@@install_component.sql 'expectations/matchers/ut_include.tps' +@@install_component.sql 'expectations/matchers/ut_contain.tps' @@install_component.sql 'expectations/matchers/ut_have_count.tps' @@install_component.sql 'expectations/matchers/ut_be_between.tps' @@install_component.sql 'expectations/matchers/ut_be_empty.tps' @@ -261,7 +261,7 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/matchers/ut_be_null.tpb' @@install_component.sql 'expectations/matchers/ut_be_true.tpb' @@install_component.sql 'expectations/matchers/ut_equal.tpb' -@@install_component.sql 'expectations/matchers/ut_include.tpb' +@@install_component.sql 'expectations/matchers/ut_contain.tpb' @@install_component.sql 'expectations/matchers/ut_have_count.tpb' @@install_component.sql 'expectations/matchers/ut_be_between.tpb' @@install_component.sql 'expectations/matchers/ut_be_empty.tpb' @@ -326,7 +326,6 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'api/have_count.syn' @@install_component.sql 'api/match.syn' @@install_component.sql 'api/contain.syn' -@@install_component.sql 'api/include.syn' set linesize 200 set define on diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index 7e6e74cfa..2c52558ca 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -5,8 +5,6 @@ drop synonym have_count; drop synonym match; -drop synonym include; - drop synonym contain; drop synonym be_false; @@ -89,7 +87,7 @@ drop type ut_match force; drop type ut_be_between force; -drop type ut_include force; +drop type ut_contain force; drop type ut_equal force; diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index 8d4a9de9a..599745de7 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -2160,7 +2160,7 @@ Diff:% end; - procedure cursor_to_include is + procedure cursor_to_contain is l_actual sys_refcursor; l_expected sys_refcursor; begin @@ -2171,7 +2171,7 @@ Diff:% and rownum < 20; --Act - ut3.ut.expect(l_actual).to_( ut3.include(l_expected) ); + ut3.ut.expect(l_actual).to_( ut3.contain(l_expected) ); --Assert ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; @@ -2209,83 +2209,6 @@ Diff:% ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; - procedure cursor_to_include_unordered is - l_actual sys_refcursor; - l_expected sys_refcursor; - begin - --Arrange - open l_actual for - select owner, object_name,object_type from all_objects where owner = user - order by 1,2,3 asc; - open l_expected for - select owner, object_name,object_type from all_objects where owner = user and rownum < 20; - - --Act - ut3.ut.expect(l_actual).to_( ut3.include(l_expected).unordered() ); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure cursor_to_include_uc is - l_actual sys_refcursor; - l_expected sys_refcursor; - begin - --Arrange - open l_actual for select owner, object_name,object_type from all_objects where owner = user - order by 1,2,3 asc; - open l_expected for select object_type, owner, object_name from all_objects where owner = user - and rownum < 20; - - --Act - ut3.ut.expect(l_actual).to_include(l_expected).uc(); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure cursor_to_include_fail is - l_actual sys_refcursor; - l_expected sys_refcursor; - l_expected_message varchar2(32767); - l_actual_message varchar2(32767); - begin - --Arrange - open l_actual for select owner, object_name,object_type from all_objects where owner = user - and rownum < 5; - open l_expected for select owner, object_name,object_type from all_objects where owner = user - and rownum < 10; - - --Act - ut3.ut.expect(l_actual).to_include(l_expected); - --Assert - l_expected_message := q'[%Actual: refcursor [ count = 4 ] was expected to include: refcursor [ count = 9 ] -%Diff: -%Rows: [ 5 differences ] -%Missing: %%%% -%Missing: %%%% -%Missing: %%%% -%Missing: %%%% -%Missing: %%%%]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); - end; - - procedure cursor_to_contain is - l_actual sys_refcursor; - l_expected sys_refcursor; - begin - --Arrange - open l_actual for select owner, object_name,object_type from all_objects where owner = user - order by 1,2,3 asc; - open l_expected for select owner, object_name,object_type from all_objects where owner = user - and rownum < 20; - - --Act - ut3.ut.expect(l_actual).to_( ut3.contain(l_expected) ); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - procedure cursor_to_contain_fail is l_actual sys_refcursor; l_expected sys_refcursor; @@ -2301,7 +2224,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_contain(l_expected); --Assert - l_expected_message := q'[%Actual: refcursor [ count = 4 ] was expected to include: refcursor [ count = 9 ] + l_expected_message := q'[%Actual: refcursor [ count = 4 ] was expected to contain: refcursor [ count = 9 ] %Diff: %Rows: [ 5 differences ] %Missing: %%%% @@ -2314,50 +2237,6 @@ Diff:% ut.expect(l_actual_message).to_be_like(l_expected_message); end; - procedure cursor_to_include_joinby is - l_actual sys_refcursor; - l_expected sys_refcursor; - begin - --Arrange - open l_actual for select username,user_id from all_users; - open l_expected for select username ,user_id from all_users where rownum < 5; - - --Act - ut3.ut.expect(l_actual).to_include(l_expected).join_by('USERNAME'); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure cursor_to_include_joinby_fail is - l_actual sys_refcursor; - l_expected sys_refcursor; - l_expected_message varchar2(32767); - l_actual_message varchar2(32767); - begin - --Arrange - open l_actual for select username, user_id from all_users - union all - select 'TEST' username, -600 user_id from dual - order by 1 desc; - open l_expected for select username, user_id from all_users - union all - select 'TEST' username, -601 user_id from dual - order by 1 asc; - - --Act - ut3.ut.expect(l_actual).to_include(l_expected).join_by('USERNAME'); - --Assert - l_expected_message := q'[%Actual: refcursor [ count = % ] was expected to include: refcursor [ count = % ] -%Diff: -%Rows: [ 1 differences ] -%PK TEST - Actual: -600 -%PK TEST - Expected: -601%]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); - - end; - procedure cursor_contain_joinby is l_actual sys_refcursor; l_expected sys_refcursor; @@ -2391,7 +2270,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_contain(l_expected).join_by('USERNAME'); --Assert - l_expected_message := q'[%Actual: refcursor [ count = % ] was expected to include: refcursor [ count = % ] + l_expected_message := q'[%Actual: refcursor [ count = % ] was expected to contain: refcursor [ count = % ] %Diff: %Rows: [ 1 differences ] %PK TEST - Actual: -600 @@ -2402,21 +2281,7 @@ Diff:% end; - procedure to_include_incl_cols_as_list - as - l_actual sys_refcursor; - l_expected sys_refcursor; - begin - --Arrange - open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 6; - open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; - --Act - ut3.ut.expect(l_actual).to_include(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure to_contain_cont_cols_as_list + procedure to_contain_incl_cols_as_list as l_actual sys_refcursor; l_expected sys_refcursor; @@ -2430,20 +2295,6 @@ Diff:% ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; - procedure to_inc_join_incl_cols_as_lst - as - l_actual sys_refcursor; - l_expected sys_refcursor; - begin - --Arrange - open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 10; - open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; - --Act - ut3.ut.expect(l_actual).to_include(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')).join_by('RN'); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - procedure to_cont_join_incl_cols_as_lst as l_actual sys_refcursor; @@ -2458,20 +2309,6 @@ Diff:% ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; - procedure include_join_excl_cols_as_lst - as - l_actual sys_refcursor; - l_expected sys_refcursor; - begin - --Arrange - open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 10; - open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; - --Act - ut3.ut.expect(l_actual).to_include(l_expected).exclude(ut3.ut_varchar2_list('//Some_Col','A_COLUMN')).join_by('RN'); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - procedure contain_join_excl_cols_as_lst as l_actual sys_refcursor; @@ -2486,20 +2323,6 @@ Diff:% ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; - procedure include_excl_cols_as_list - as - l_actual sys_refcursor; - l_expected sys_refcursor; - begin - --Arrange - open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 10; - open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; - --Act - ut3.ut.expect(l_actual).to_include(l_expected).exclude(ut3.ut_varchar2_list('A_COLUMN|//Some_Col')); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - procedure contain_excl_cols_as_list as l_actual sys_refcursor; @@ -2531,23 +2354,6 @@ Diff:% ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; - procedure cursor_not_to_include - as - l_actual sys_refcursor; - l_expected sys_refcursor; - begin - open l_expected for select 'TEST' username, -600 user_id from dual; - - open l_actual for select username, user_id from all_users - union all - select 'TEST1' username, -601 user_id from dual; - - --Act - ut3.ut.expect(l_actual).not_to_include(l_expected); - --Asserty - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - procedure cursor_not_to_contain_fail is l_actual sys_refcursor; l_expected sys_refcursor; @@ -2568,37 +2374,7 @@ Diff:% %Data-types:% %VARCHAR2NUMBER% %Data:% -%was expected not to include:(refcursor [ count = 1 ])% -%Data-types:% -%CHARNUMBER% -%Data:% -%TEST-600%]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); - end; - - procedure cursor_not_to_include_fail is - l_actual sys_refcursor; - l_expected sys_refcursor; - l_expected_message varchar2(32767); - l_actual_message varchar2(32767); - begin - --Arrange - open l_expected for select 'TEST' username, -600 user_id from dual; - - open l_actual for select username, user_id from all_users - union all - select 'TEST' username, -600 user_id from dual; - - --Act - ut3.ut.expect(l_actual).not_to_include(l_expected); - --Assert - l_expected_message := q'[%Actual: (refcursor [ count = % ])% -%Data-types:% -%VARCHAR2NUMBER% -%Data:% -%was expected not to include:(refcursor [ count = 1 ])% +%was expected not to contain:(refcursor [ count = 1 ])% %Data-types:% %CHARNUMBER% %Data:% @@ -2607,7 +2383,7 @@ Diff:% --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; - + procedure cursor_not_to_contain_joinby is l_actual sys_refcursor; l_expected sys_refcursor; @@ -2622,47 +2398,6 @@ Diff:% ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; - procedure cursor_not_to_include_joinby is - l_actual sys_refcursor; - l_expected sys_refcursor; - begin - --Arrange - open l_actual for select username,rownum * 10 user_id from all_users where rownum < 5; - open l_expected for select username||to_char(rownum) username ,rownum user_id from all_users where rownum < 5; - - --Act - ut3.ut.expect(l_actual).not_to_include(l_expected).join_by('USER_ID'); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure not_inc_join_incl_cols_as_lst is - l_actual sys_refcursor; - l_expected sys_refcursor; - l_expected_message varchar2(32767); - l_actual_message varchar2(32767); - begin - --Arrange - open l_actual for select rownum as rn, 'b' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 10; - open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; - --Act - ut3.ut.expect(l_actual).not_to_include(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')).join_by('RN'); - --Assert - l_expected_message := q'[%Actual: (refcursor [ count = 9 ]) -%Data-types: -%NUMBERCHARCHARCHARCHAR -%Data: -%% -%was expected not to include:(refcursor [ count = 3 ]) -%Data-types: -%NUMBERCHARCHARCHARCHAR -%Data: -%1adxc2adxc3adxc]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); - end; - procedure not_cont_join_incl_cols_as_lst is l_actual sys_refcursor; l_expected sys_refcursor; @@ -2676,19 +2411,6 @@ Diff:% ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; - procedure not_inc_join_excl_cols_as_lst is - l_actual sys_refcursor; - l_expected sys_refcursor; - begin - --Arrange - open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'y' SOME_COL, 'd' "Some_Col" from dual a connect by level < 10; - open l_expected for select rownum * 20 as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; - --Act - ut3.ut.expect(l_actual).not_to_include(l_expected).exclude(ut3.ut_varchar2_list('//Some_Col','A_COLUMN')).join_by('RN'); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - procedure not_cont_join_excl_cols_as_lst is l_actual sys_refcursor; l_expected sys_refcursor; @@ -2701,8 +2423,8 @@ Diff:% --Assert ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; - - procedure to_include_duplicates is + + procedure to_contain_duplicates is l_actual sys_refcursor; l_expected sys_refcursor; begin @@ -2713,12 +2435,12 @@ Diff:% open l_expected for select rownum as rn from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_include(l_expected); + ut3.ut.expect(l_actual).to_contain(l_expected); --Assert ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; - procedure to_include_duplicates_fail is + procedure to_contain_duplicates_fail is l_actual sys_refcursor; l_expected sys_refcursor; l_expected_message varchar2(32767); @@ -2730,9 +2452,9 @@ Diff:% union all select rownum as rn from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_include(l_expected); + ut3.ut.expect(l_actual).to_contain(l_expected); --Assert - l_expected_message := q'[%Actual: refcursor [ count = 9 ] was expected to include: refcursor [ count = 6 ] + l_expected_message := q'[%Actual: refcursor [ count = 9 ] was expected to contain: refcursor [ count = 6 ] %Diff: %Rows: [ 3 differences ] %Missing: % diff --git a/test/core/expectations/test_expectations_cursor.pks b/test/core/expectations/test_expectations_cursor.pks index 54c1451b0..ca4b9e85b 100644 --- a/test/core/expectations/test_expectations_cursor.pks +++ b/test/core/expectations/test_expectations_cursor.pks @@ -340,11 +340,8 @@ create or replace package test_expectations_cursor is --%test( Unordered fix for issues with duplicate no : #764 ) procedure unordered_fix_764; - --%test( Fail cursor to include data from another cursor ) - procedure cursor_to_include_fail; - - --%test( Cursor include data from another cursor using second keyword) - procedure cursor_to_include; + --%test( Success when cursor contains data from another cursor) + procedure cursor_to_contain; --%test( Fail cursor contains data from another cursor using second keyword) procedure cursor_to_contain_fail; @@ -355,86 +352,44 @@ create or replace package test_expectations_cursor is --%test( Does not fail when comparing cursor to contain cursor with unordered rows option) procedure cursor_to_contain_unordered; - --%test( Does not fail when comparing cursor to include cursor with unordered rows option) - procedure cursor_to_include_unordered; - - --%test( Success cursor to include cursor with unordered columns) - procedure cursor_to_include_uc; - - --%test( Cursor contain data from another cursor using second keyword) - procedure cursor_to_contain; - - --%test( Cursor include data from another cursor with joinby) - procedure cursor_to_include_joinby; - - --%test( Fail cursor include data from another cursor with joinby) - procedure cursor_to_include_joinby_fail; - - --%test( Cursor contains data from another cursor with joinby) + --%test( Cursor contains data from another cursor with joinby) procedure cursor_contain_joinby; --%test( Fail cursor contains data from another cursor with joinby) procedure cursor_contain_joinby_fail; - --%test(Cursor include data with of columns to include) - procedure to_include_incl_cols_as_list; - - --%test(Cursor contains data with of columns to include) - procedure to_contain_cont_cols_as_list; + --%test(Cursor contains data with list of columns to include) + procedure to_contain_incl_cols_as_list; - --%test(Cursor includes data with of columns to include and join by value) - procedure to_inc_join_incl_cols_as_lst; - - --%test(Cursor contains data with of columns to include and join by value) + --%test(Cursor contains data with of columns to include and join by value) procedure to_cont_join_incl_cols_as_lst; - --%test(Cursor include data with of columns to exclude and join by value) - procedure include_join_excl_cols_as_lst; - --%test(Cursor contains data with of columns to exclude and join by value) procedure contain_join_excl_cols_as_lst; - --%test(Cursor include data with of columns to exclude) - procedure include_excl_cols_as_list; - --%test(Cursor contains data with of columns to exclude) procedure contain_excl_cols_as_list; --%test( Cursor not to contains data from another cursor) procedure cursor_not_to_contain; - --%test( Cursor not to include data from another cursor) - procedure cursor_not_to_include; - - --%test( Cursor fail not to contains data from another cursor) + --%test( Cursor fail not to contains data from another cursor) procedure cursor_not_to_contain_fail; - --%test( Cursor fail not to include data from another cursor) - procedure cursor_not_to_include_fail; - - --%test( Cursor not contains data from another cursor with joinby clause) + --%test( Cursor not contains data from another cursor with joinby clause) procedure cursor_not_to_contain_joinby; - --%test( Cursor not include data from another cursor with joinby clause) - procedure cursor_not_to_include_joinby; - - --%test(Cursor not include data with of columns to include and join by value - Fail) - procedure not_inc_join_incl_cols_as_lst; - --%test(Cursor not contains data with of columns to include and join by value) procedure not_cont_join_incl_cols_as_lst; - --%test(Cursor not include data with of columns to exclude and join by value) - procedure not_inc_join_excl_cols_as_lst; - --%test(Cursor not contains data with of columns to exclude and join by value) procedure not_cont_join_excl_cols_as_lst; - --%test(Cursor to include duplicates) - procedure to_include_duplicates; + --%test(Cursor to contain duplicates) + procedure to_contain_duplicates; - --%test(Cursor to include duplicates fail) - procedure to_include_duplicates_fail; + --%test(Cursor to contain duplicates fail) + procedure to_contain_duplicates_fail; end; / diff --git a/test/install_and_run_tests.sh b/test/install_and_run_tests.sh index f899a306d..385cb46a4 100755 --- a/test/install_and_run_tests.sh +++ b/test/install_and_run_tests.sh @@ -12,7 +12,7 @@ cd .. time utPLSQL-cli/bin/utplsql run ${UT3_TESTER}/${UT3_TESTER_PASSWORD}@${CONNECTION_STR} \ --p=test_expectations_cursor -source_path=source -owner=ut3 \ +-source_path=source -owner=ut3 \ -test_path=test -c \ -f=ut_coverage_sonar_reporter -o=coverage.xml \ -f=ut_coverage_html_reporter -o=coverage.html \ From 9fccd1d55db7936ade3862d8ebb4bdfd4fa424ac Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sat, 23 Feb 2019 23:05:36 +0000 Subject: [PATCH 0236/1096] Wrapping up anydata into cursor --- source/api/ut.pkb | 4 +- source/api/ut.pks | 2 +- .../data_values/ut_cursor_details.tpb | 12 +-- .../data_values/ut_data_value_anydata.tpb | 81 +++++++++++++------ .../data_values/ut_data_value_anydata.tps | 16 +++- .../data_values/ut_data_value_refcursor.tpb | 2 - .../data_values/ut_data_value_refcursor.tps | 4 +- source/expectations/matchers/ut_equal.tpb | 6 +- .../expectations/matchers/ut_have_count.tpb | 2 +- source/install.sql | 8 +- .../expectations/test_expectation_anydata.pkb | 54 +++---------- .../expectations/test_expectation_anydata.pks | 6 -- 12 files changed, 96 insertions(+), 101 deletions(-) diff --git a/source/api/ut.pkb b/source/api/ut.pkb index 981508b9f..fd7a06988 100644 --- a/source/api/ut.pkb +++ b/source/api/ut.pkb @@ -28,9 +28,9 @@ create or replace package body ut is return ut_runner.version(); end; - function expect(a_actual in anydata, a_message varchar2 := null) return ut_expectation_compound is + function expect(a_actual in anydata, a_message varchar2 := null) return ut_expectation_refcursor is begin - return ut_expectation_compound(ut_data_value_anydata.get_instance(a_actual), a_message); + return ut_expectation_refcursor(ut_data_value_anydata(a_actual), a_message); end; function expect(a_actual in blob, a_message varchar2 := null) return ut_expectation is diff --git a/source/api/ut.pks b/source/api/ut.pks index d1bc0c61a..3ca3c08ff 100644 --- a/source/api/ut.pks +++ b/source/api/ut.pks @@ -19,7 +19,7 @@ create or replace package ut authid current_user as function version return varchar2; - function expect(a_actual in anydata, a_message varchar2 := null) return ut_expectation_compound; + function expect(a_actual in anydata, a_message varchar2 := null) return ut_expectation_refcursor; function expect(a_actual in blob, a_message varchar2 := null) return ut_expectation; diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb index 3b6e8a3a4..f6162aac2 100644 --- a/source/expectations/data_values/ut_cursor_details.tpb +++ b/source/expectations/data_values/ut_cursor_details.tpb @@ -23,15 +23,10 @@ create or replace type body ut_cursor_details as l_element_info ut_metadata.t_anytype_elem_info_rec; l_is_collection boolean; begin - l_elements_info := ut_metadata.get_anytype_members_info( a_compound_data ); - l_is_collection := ut_metadata.is_collection(l_elements_info.type_code); - if l_elements_info.elements_count is null then - l_element_info := ut_metadata.get_attr_elem_info( a_compound_data ); - self.cursor_columns_info.extend; self.cursor_columns_info(cursor_columns_info.last) := ut_cursor_column( @@ -98,7 +93,7 @@ create or replace type body ut_cursor_details as begin self.cursor_columns_info := ut_cursor_column_tab(); dbms_sql.describe_columns3(a_cursor_number, l_columns_count, l_columns_desc); - + /** * Due to a bug with object being part of cursor in ANYDATA scenario * oracle fails to revert number to cursor. We ar using dbms_sql.close cursor to close it @@ -121,6 +116,7 @@ create or replace type body ut_cursor_details as ut_utils.boolean_to_int(l_is_collection), null ); + if l_columns_desc(pos).col_type = dbms_sql.user_defined_type or l_is_collection then desc_compound_data( ut_metadata.get_user_defined_type( l_columns_desc(pos).col_schema_name, l_columns_desc(pos).col_type_name ), @@ -177,7 +173,7 @@ create or replace type body ut_cursor_details as bulk collect into l_result.cursor_columns_info from table(self.cursor_columns_info) x where exists( - select 1 from included_columns f where regexp_like( x.access_path, '^'||f.col_names||'($|/.*)' ) + select 1 from included_columns f where regexp_like( x.access_path, '^/?'||f.col_names||'($|/.*)' ) ); end if; elsif a_match_options.exclude.items.count > 0 then @@ -189,7 +185,7 @@ create or replace type body ut_cursor_details as bulk collect into l_result.cursor_columns_info from table(self.cursor_columns_info) x where not exists( - select 1 from excluded_columns f where regexp_like( x.access_path, '^'||f.col_names||'($|/.*)' ) + select 1 from excluded_columns f where regexp_like( '/'||x.access_path, '^/?'||f.col_names||'($|/.*)' ) ); end if; self := l_result; diff --git a/source/expectations/data_values/ut_data_value_anydata.tpb b/source/expectations/data_values/ut_data_value_anydata.tpb index 0be830afb..1ac5676a2 100644 --- a/source/expectations/data_values/ut_data_value_anydata.tpb +++ b/source/expectations/data_values/ut_data_value_anydata.tpb @@ -16,48 +16,60 @@ create or replace type body ut_data_value_anydata as limitations under the License. */ - final member procedure init(self in out nocopy ut_data_value_anydata, a_value anydata, a_data_object_type varchar2, a_extract_path varchar2) is + member procedure init(self in out nocopy ut_data_value_anydata, a_value anydata) is l_query sys_refcursor; l_ctx number; l_ut_owner varchar2(250) := ut_utils.ut_owner; + cursor_not_open exception; + l_cursor_number number; + l_type_name varchar2(100); + l_schema varchar(100); + l_part1 varchar(30); + l_part2 varchar(30); + l_dblink varchar(30); + l_part1_type number; + l_objectid number; begin - self.data_type := case when a_value is not null then lower(a_value.gettypename) else 'undefined' end; + self.data_type := case when a_value is not null then lower(a_value.gettypename()) else 'undefined' end; + --TODO : Move that to helper ?? self.data_id := sys_guid(); + self.self_type := $$plsql_unit; + self.cursor_details := ut_cursor_details(); if a_value is not null then + dbms_utility.name_resolve(self.data_type,7, l_schema, l_part1, l_part2, l_dblink, l_part1_type, l_objectid); execute immediate ' declare l_data '||self.data_type||'; l_value anydata := :a_value; l_status integer; + l_tmp_refcursor sys_refcursor; + l_refcursor sys_refcursor; begin - l_status := l_value.get'||a_data_object_type||'(l_data); + l_status := l_value.get'||get_instance(a_value)||'(l_data); :l_data_is_null := case when l_data is null then 1 else 0 end; - end;' using in a_value, out self.is_data_null; + open l_tmp_refcursor for select l_data '||l_part1||' from dual; + :l_refcursor := l_tmp_refcursor; + end;' using in a_value, out self.is_data_null, out l_query; + else self.is_data_null := 1; end if; - ut_compound_data_helper.cleanup_diff; if not self.is_null() then - ut_expectation_processor.set_xml_nls_params(); - open l_query for select a_value val from dual; - l_ctx := sys.dbms_xmlgen.newcontext( l_query ); - dbms_xmlgen.setrowtag(l_ctx, ''); - dbms_xmlgen.setrowsettag(l_ctx, ''); - dbms_xmlgen.setnullhandling(l_ctx,2); - execute immediate - 'insert into ' || l_ut_owner || '.ut_compound_data_tmp(data_id, item_no, item_data) ' || - 'select :self_guid, rownum, value(a) ' || - ' from table( xmlsequence( extract(:l_xml, :xpath ) ) ) a' - using in self.data_id, dbms_xmlgen.getXMLtype(l_ctx), a_extract_path; - self.elements_count := sql%rowcount; - dbms_xmlgen.closecontext (l_ctx); - ut_expectation_processor.reset_nls_params(); + self.elements_count := 0; + if l_query%isopen then + self.extract_cursor(l_query); + l_cursor_number := dbms_sql.to_cursor_number(l_query); + self.cursor_details := ut_cursor_details(l_cursor_number); + dbms_sql.close_cursor(l_cursor_number); + elsif not l_query%isopen then + raise cursor_not_open; + end if; end if; end; - static function get_instance(a_data_value anydata) return ut_data_value_anydata is - l_result ut_data_value_anydata := ut_data_value_object(null); + member function get_instance(a_data_value anydata) return varchar2 is + l_result varchar2(30); l_type anytype; l_type_code integer; begin @@ -65,9 +77,9 @@ create or replace type body ut_data_value_anydata as l_type_code := a_data_value.gettype(l_type); if l_type_code in (dbms_types.typecode_table, dbms_types.typecode_varray, dbms_types.typecode_namedcollection, dbms_types.typecode_object) then if l_type_code = dbms_types.typecode_object then - l_result := ut_data_value_object(a_data_value); + l_result := 'object'; else - l_result := ut_data_value_collection(a_data_value); + l_result := 'collection'; end if; else raise_application_error(-20000, 'Data type '||a_data_value.gettypename||' in ANYDATA is not supported by utPLSQL'); @@ -76,5 +88,28 @@ create or replace type body ut_data_value_anydata as return l_result; end; + constructor function ut_data_value_anydata(self in out nocopy ut_data_value_anydata, a_value anydata) return self as result + is + begin + init(a_value); + return; + end; + + overriding member function compare_implementation( + a_other ut_data_value, + a_match_options ut_matcher_options, + a_inclusion_compare boolean := false, + a_is_negated boolean := false + ) return integer is + l_result integer := 0; + begin + if not a_other is of (ut_data_value_anydata) then + raise value_error; + end if; + + l_result := l_result + (self as ut_data_value_refcursor).compare_implementation(a_other,a_match_options,a_inclusion_compare,a_is_negated); + return l_result; + end; + end; / diff --git a/source/expectations/data_values/ut_data_value_anydata.tps b/source/expectations/data_values/ut_data_value_anydata.tps index caabe36b6..27439c3c9 100644 --- a/source/expectations/data_values/ut_data_value_anydata.tps +++ b/source/expectations/data_values/ut_data_value_anydata.tps @@ -1,4 +1,4 @@ -create or replace type ut_data_value_anydata under ut_compound_data_value( +create or replace type ut_data_value_anydata under ut_data_value_refcursor( /* utPLSQL - Version 3 Copyright 2016 - 2018 utPLSQL Project @@ -16,7 +16,15 @@ create or replace type ut_data_value_anydata under ut_compound_data_value( limitations under the License. */ - final member procedure init(self in out nocopy ut_data_value_anydata, a_value anydata, a_data_object_type varchar2, a_extract_path varchar2), - static function get_instance(a_data_value anydata) return ut_data_value_anydata -) not final not instantiable + + member procedure init(self in out nocopy ut_data_value_anydata, a_value anydata), + member function get_instance(a_data_value anydata) return varchar2, + constructor function ut_data_value_anydata(self in out nocopy ut_data_value_anydata, a_value anydata) return self as result, + overriding member function compare_implementation( + a_other ut_data_value, + a_match_options ut_matcher_options, + a_inclusion_compare boolean := false, + a_is_negated boolean := false + ) return integer +) / diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index f57cc6374..774604d99 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -50,7 +50,6 @@ create or replace type body ut_data_value_refcursor as loop l_xml := dbms_xmlgen.getxmltype(l_ctx); exit when dbms_xmlgen.getNumRowsProcessed(l_ctx) = 0; - self.elements_count := self.elements_count + dbms_xmlgen.getNumRowsProcessed(l_ctx); execute immediate 'insert into ' || l_ut_owner || '.ut_compound_data_tmp(data_id, item_no, item_data) ' || @@ -345,7 +344,6 @@ create or replace type body ut_data_value_refcursor as a_inclusion_compare, a_is_negated ); --- dbms_output.put_line(substr(l_diff_cursor_text,1,32767)); l_result := l_result + compare_data( l_self, l_other, l_diff_cursor_text ); end if; return l_result; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tps b/source/expectations/data_values/ut_data_value_refcursor.tps index dfd9228af..ab6728559 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tps +++ b/source/expectations/data_values/ut_data_value_refcursor.tps @@ -42,5 +42,5 @@ create or replace type ut_data_value_refcursor under ut_compound_data_value( a_is_negated boolean := false ) return integer, overriding member function is_empty return boolean -) -/ +) not final +/ \ No newline at end of file diff --git a/source/expectations/matchers/ut_equal.tpb b/source/expectations/matchers/ut_equal.tpb index a9fa25b71..a666caaa3 100644 --- a/source/expectations/matchers/ut_equal.tpb +++ b/source/expectations/matchers/ut_equal.tpb @@ -31,7 +31,7 @@ create or replace type body ut_equal as constructor function ut_equal(self in out nocopy ut_equal, a_expected anydata, a_nulls_are_equal boolean := null) return self as result is begin - init(ut_data_value_anydata.get_instance(a_expected), a_nulls_are_equal); + init(ut_data_value_anydata(a_expected), a_nulls_are_equal); return; end; @@ -42,7 +42,7 @@ create or replace type body ut_equal as 'equal( a_expected anydata, a_exclude varchar2 )', 'equal( a_expected anydata ).exclude( a_exclude varchar2 )' ); - init(ut_data_value_anydata.get_instance(a_expected), a_nulls_are_equal); + init(ut_data_value_anydata(a_expected), a_nulls_are_equal); self.options.exclude.add_items(a_exclude); return; end; @@ -53,7 +53,7 @@ create or replace type body ut_equal as 'equal( a_expected anydata, a_exclude ut_varchar2_list )', 'equal( a_expected anydata ).exclude( a_exclude ut_varchar2_list )' ); - init(ut_data_value_anydata.get_instance(a_expected), a_nulls_are_equal); + init(ut_data_value_anydata(a_expected), a_nulls_are_equal); self.options.exclude.add_items(a_exclude); return; end; diff --git a/source/expectations/matchers/ut_have_count.tpb b/source/expectations/matchers/ut_have_count.tpb index de2d64d1c..ffa32290b 100644 --- a/source/expectations/matchers/ut_have_count.tpb +++ b/source/expectations/matchers/ut_have_count.tpb @@ -26,7 +26,7 @@ create or replace type body ut_have_count as overriding member function run_matcher(self in out nocopy ut_have_count, a_actual ut_data_value) return boolean is l_result boolean; begin - if a_actual is of(ut_data_value_refcursor, ut_data_value_collection) then + if a_actual is of(ut_data_value_refcursor) then l_result := ( self.expected = treat(a_actual as ut_compound_data_value).elements_count ); else l_result := (self as ut_matcher).run_matcher(a_actual); diff --git a/source/install.sql b/source/install.sql index a4c05053c..53bcb5267 100644 --- a/source/install.sql +++ b/source/install.sql @@ -186,9 +186,6 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/matchers/ut_matcher_options.tps' @@install_component.sql 'expectations/data_values/ut_data_value.tps' @@install_component.sql 'expectations/data_values/ut_compound_data_value.tps' -@@install_component.sql 'expectations/data_values/ut_data_value_anydata.tps' -@@install_component.sql 'expectations/data_values/ut_data_value_collection.tps' -@@install_component.sql 'expectations/data_values/ut_data_value_object.tps' @@install_component.sql 'expectations/data_values/ut_data_value_blob.tps' @@install_component.sql 'expectations/data_values/ut_data_value_boolean.tps' @@install_component.sql 'expectations/data_values/ut_data_value_clob.tps' @@ -196,6 +193,7 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/data_values/ut_data_value_dsinterval.tps' @@install_component.sql 'expectations/data_values/ut_data_value_number.tps' @@install_component.sql 'expectations/data_values/ut_data_value_refcursor.tps' +@@install_component.sql 'expectations/data_values/ut_data_value_anydata.tps' @@install_component.sql 'expectations/data_values/ut_data_value_timestamp.tps' @@install_component.sql 'expectations/data_values/ut_data_value_timestamp_tz.tps' @@install_component.sql 'expectations/data_values/ut_data_value_timestamp_ltz.tps' @@ -233,9 +231,6 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/data_values/ut_data_value.tpb' @@install_component.sql 'expectations/data_values/ut_compound_data_value.tpb' @@install_component.sql 'expectations/data_values/ut_compound_data_helper.pkb' -@@install_component.sql 'expectations/data_values/ut_data_value_anydata.tpb' -@@install_component.sql 'expectations/data_values/ut_data_value_object.tpb' -@@install_component.sql 'expectations/data_values/ut_data_value_collection.tpb' @@install_component.sql 'expectations/data_values/ut_data_value_blob.tpb' @@install_component.sql 'expectations/data_values/ut_data_value_boolean.tpb' @@install_component.sql 'expectations/data_values/ut_data_value_clob.tpb' @@ -243,6 +238,7 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/data_values/ut_data_value_dsinterval.tpb' @@install_component.sql 'expectations/data_values/ut_data_value_number.tpb' @@install_component.sql 'expectations/data_values/ut_data_value_refcursor.tpb' +@@install_component.sql 'expectations/data_values/ut_data_value_anydata.tpb' @@install_component.sql 'expectations/data_values/ut_data_value_timestamp.tpb' @@install_component.sql 'expectations/data_values/ut_data_value_timestamp_tz.tpb' @@install_component.sql 'expectations/data_values/ut_data_value_timestamp_ltz.tpb' diff --git a/test/core/expectations/test_expectation_anydata.pkb b/test/core/expectations/test_expectation_anydata.pkb index bade26652..a510b2317 100644 --- a/test/core/expectations/test_expectation_anydata.pkb +++ b/test/core/expectations/test_expectation_anydata.pkb @@ -189,7 +189,7 @@ create or replace package body test_expectation_anydata is l_list ut3.ut_varchar2_list; begin --Arrange - l_list := ut3.ut_varchar2_list('Value','/TEST_DUMMY_OBJECT/ID'); + l_list := ut3.ut_varchar2_list('TEST_DUMMY_OBJECT/Value','/TEST_DUMMY_OBJECT/ID'); g_test_expected := anydata.convertObject( test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); g_test_actual := anydata.convertObject( test_dummy_object(id=>3, "name"=>'A',"Value"=>'1') ); --Act @@ -202,7 +202,7 @@ create or replace package body test_expectation_anydata is l_list varchar2(100); begin --Arrange - l_list := 'Value,ID'; + l_list := 'TEST_DUMMY_OBJECT/Value,TEST_DUMMY_OBJECT/ID'; g_test_expected := anydata.convertObject( test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); g_test_actual := anydata.convertObject( test_dummy_object(id=>2, "name"=>'A',"Value"=>'1') ); --Act @@ -211,27 +211,11 @@ create or replace package body test_expectation_anydata is ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; - procedure exclude_attrib_xpath_invalid is - l_anydata_object anydata; - l_xpath varchar2(100); - begin - --Arrange - l_xpath := '//KEY,\\//Value'; - l_anydata_object := anydata.convertObject( test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); - --Act - ut3.ut.expect( l_anydata_object ).to_equal( l_anydata_object, a_exclude=> l_xpath ); - --Assert - ut.fail('Expected exception -31011 but nothing was raised'); - exception - when others then - ut.expect(sqlcode).to_equal(-31011); - end; - procedure exclude_attributes_xpath is l_xpath varchar2(100); begin --Arrange - l_xpath := '//Value|//ID'; + l_xpath := '//TEST_DUMMY_OBJECT/Value|//TEST_DUMMY_OBJECT/ID'; g_test_expected := anydata.convertObject( test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); g_test_actual := anydata.convertObject( test_dummy_object(id=>2, "name"=>'A',"Value"=>'1') ); --Act @@ -257,7 +241,7 @@ create or replace package body test_expectation_anydata is l_list ut3.ut_varchar2_list; begin --Arrange - l_list := ut3.ut_varchar2_list('Value','ID'); + l_list := ut3.ut_varchar2_list('TEST_DUMMY_OBJECT/Value','TEST_DUMMY_OBJECT/ID'); g_test_expected := anydata.convertObject( test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); g_test_actual := anydata.convertObject( test_dummy_object(id=>1, "name"=>'b',"Value"=>'0') ); --Act @@ -270,7 +254,7 @@ create or replace package body test_expectation_anydata is l_xpath varchar2(100); begin --Arrange - l_xpath := 'key,ID'; + l_xpath := 'TEST_DUMMY_OBJECT/key,TEST_DUMMY_OBJECT/ID'; g_test_expected := anydata.convertObject( test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); g_test_actual := anydata.convertObject( test_dummy_object(id=>1, "name"=>'A',"Value"=>'1') ); --Act @@ -279,27 +263,11 @@ create or replace package body test_expectation_anydata is ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; - procedure include_attrib_xpath_invalid is - l_anydata_object anydata; - l_xpath varchar2(100); - begin - --Arrange - l_xpath := '//KEY,\\//Value'; - l_anydata_object := anydata.convertObject( test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); - --Act - ut3.ut.expect( l_anydata_object ).to_equal( l_anydata_object ).include( l_xpath ); - --Assert - ut.fail('Expected exception -31011 but nothing was raised'); - exception - when others then - ut.expect(sqlcode).to_be_between(-31013,-31011); - end; - procedure include_attributes_xpath is l_xpath varchar2(100); begin --Arrange - l_xpath := '//key|//ID'; + l_xpath := '//TEST_DUMMY_OBJECT/key|//TEST_DUMMY_OBJECT/ID'; g_test_expected := anydata.convertObject( test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); g_test_actual := anydata.convertObject( test_dummy_object(id=>1, "name"=>'A',"Value"=>'1') ); --Act @@ -312,7 +280,7 @@ create or replace package body test_expectation_anydata is l_include varchar2(100); begin --Arrange - l_include := ' BadAttributeName, ID '; + l_include := ' BadAttributeName, TEST_DUMMY_OBJECT/ID '; g_test_expected := anydata.convertObject( test_dummy_object(id=>1, "name"=>'B',"Value"=>'0') ); g_test_actual := anydata.convertObject( test_dummy_object(id=>1, "name"=>'A',"Value"=>'1') ); --Act @@ -326,8 +294,8 @@ create or replace package body test_expectation_anydata is l_include varchar2(100); begin --Arrange - l_include := 'key,ID,Value'; - l_exclude := '//key|//Value'; + l_include := 'TEST_DUMMY_OBJECT/key,TEST_DUMMY_OBJECT/ID,TEST_DUMMY_OBJECT/Value'; + l_exclude := '//TEST_DUMMY_OBJECT/key|//TEST_DUMMY_OBJECT/Value'; g_test_expected := anydata.convertObject( test_dummy_object(id=>1, "name"=>'B',"Value"=>'0') ); g_test_actual := anydata.convertObject( test_dummy_object(id=>1, "name"=>'A',"Value"=>'1') ); --Act @@ -341,8 +309,8 @@ create or replace package body test_expectation_anydata is l_include ut3.ut_varchar2_list; begin --Arrange - l_include := ut3.ut_varchar2_list('key','ID','Value'); - l_exclude := ut3.ut_varchar2_list('key','Value'); + l_include := ut3.ut_varchar2_list('TEST_DUMMY_OBJECT/key','TEST_DUMMY_OBJECT/ID','TEST_DUMMY_OBJECT/Value'); + l_exclude := ut3.ut_varchar2_list('TEST_DUMMY_OBJECT/key','TEST_DUMMY_OBJECT/Value'); g_test_expected := anydata.convertObject( test_dummy_object(id=>1, "name"=>'B',"Value"=>'0') ); g_test_actual := anydata.convertObject( test_dummy_object(id=>1, "name"=>'A',"Value"=>'1') ); --Act diff --git a/test/core/expectations/test_expectation_anydata.pks b/test/core/expectations/test_expectation_anydata.pks index fedec586c..5d7c0c1ad 100644 --- a/test/core/expectations/test_expectation_anydata.pks +++ b/test/core/expectations/test_expectation_anydata.pks @@ -57,9 +57,6 @@ create or replace package test_expectation_anydata is --%test(Comma separated list of attributes to exclude is case sensitive) procedure exclude_attributes_as_csv; - --%test(Exclude attributes fails on invalid XPath) - procedure exclude_attrib_xpath_invalid; - --%test(Exclude attributes by XPath is case sensitive) procedure exclude_attributes_xpath; @@ -72,9 +69,6 @@ create or replace package test_expectation_anydata is --%test(Comma separated list of attributes to include is case sensitive) procedure include_attributes_as_csv; - --%test(Include attributes fails on invalid XPath) - procedure include_attrib_xpath_invalid; - --%test(Include attributes by XPath is case sensitive) procedure include_attributes_xpath; From 061895aa8f143dc8ccb84735903a045c836a8668 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sun, 24 Feb 2019 18:38:34 +0000 Subject: [PATCH 0237/1096] Wrapping up anydata into cursor --- .../data_values/ut_compound_data_helper.pkb | 1 - .../data_values/ut_data_value_anydata.tpb | 43 +++++++++++++------ 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index aa7d32f79..d55fa65d8 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -391,7 +391,6 @@ create or replace package body ut_compound_data_helper is end if; l_compare_sql := replace(l_compare_sql,'{:where_condition:}',l_where_stmt); - return l_compare_sql; end; diff --git a/source/expectations/data_values/ut_data_value_anydata.tpb b/source/expectations/data_values/ut_data_value_anydata.tpb index 1ac5676a2..bdcbcba94 100644 --- a/source/expectations/data_values/ut_data_value_anydata.tpb +++ b/source/expectations/data_values/ut_data_value_anydata.tpb @@ -14,29 +14,34 @@ create or replace type body ut_data_value_anydata as WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - */ - + */ member procedure init(self in out nocopy ut_data_value_anydata, a_value anydata) is l_query sys_refcursor; l_ctx number; l_ut_owner varchar2(250) := ut_utils.ut_owner; cursor_not_open exception; l_cursor_number number; - l_type_name varchar2(100); - l_schema varchar(100); - l_part1 varchar(30); - l_part2 varchar(30); - l_dblink varchar(30); + l_anydata_type varchar2(100) := get_instance(a_value); + l_element_count number; + + --Used by dbms_utility... + l_type_name varchar2(250); + l_schema varchar(250); + l_part1 varchar(250); + l_part2 varchar(250); + l_dblink varchar(250); l_part1_type number; l_objectid number; + begin self.data_type := case when a_value is not null then lower(a_value.gettypename()) else 'undefined' end; - --TODO : Move that to helper ?? self.data_id := sys_guid(); self.self_type := $$plsql_unit; self.cursor_details := ut_cursor_details(); if a_value is not null then + --TODO : Move that to helper ?? dbms_utility.name_resolve(self.data_type,7, l_schema, l_part1, l_part2, l_dblink, l_part1_type, l_objectid); + --TODO: Refactor into something nicer execute immediate ' declare l_data '||self.data_type||'; @@ -45,12 +50,18 @@ create or replace type body ut_data_value_anydata as l_tmp_refcursor sys_refcursor; l_refcursor sys_refcursor; begin - l_status := l_value.get'||get_instance(a_value)||'(l_data); - :l_data_is_null := case when l_data is null then 1 else 0 end; - open l_tmp_refcursor for select l_data '||l_part1||' from dual; - :l_refcursor := l_tmp_refcursor; - end;' using in a_value, out self.is_data_null, out l_query; - + l_status := l_value.get'||l_anydata_type||'(l_data); + :l_data_is_null := case when l_data is null then 1 else 0 end; '|| + case when l_anydata_type = 'collection' then + ' open l_tmp_refcursor for select * from table(l_data);' + else + ' open l_tmp_refcursor for select l_data '||l_part1||' from dual;' + end || + q'[ :l_refcursor := l_tmp_refcursor; + if l_data is not null then + :l_count := ]'|| case when l_anydata_type = 'collection' then 'l_data.count; ' else '0; ' end || + 'end if; + end;' using in a_value, out self.is_data_null, out l_query, out l_element_count; else self.is_data_null := 1; end if; @@ -59,6 +70,10 @@ create or replace type body ut_data_value_anydata as self.elements_count := 0; if l_query%isopen then self.extract_cursor(l_query); + --For collection we have to overwrite a number due to being calculated not correctly + if l_anydata_type = 'collection' then + self.elements_count := l_element_count; + end if; l_cursor_number := dbms_sql.to_cursor_number(l_query); self.cursor_details := ut_cursor_details(l_cursor_number); dbms_sql.close_cursor(l_cursor_number); From 7bb5533b296c7f1349f822be7cd1da52a3c64261 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Tue, 26 Feb 2019 13:43:22 +0000 Subject: [PATCH 0238/1096] Fixing issue with null object and counts --- source/core/ut_metadata.pkb | 30 +++- source/core/ut_metadata.pks | 13 +- .../data_values/ut_compound_data_helper.pkb | 17 +- .../data_values/ut_compound_data_helper.pks | 3 +- .../data_values/ut_compound_data_value.tps | 7 +- .../data_values/ut_data_value_anydata.tpb | 141 +++++++++++------ .../data_values/ut_data_value_anydata.tps | 8 +- .../data_values/ut_data_value_refcursor.tpb | 19 ++- .../data_values/ut_data_value_refcursor.tps | 9 +- source/expectations/matchers/ut_equal.tpb | 1 + .../expectations/matchers/ut_have_count.tpb | 5 +- .../expectations/test_expectation_anydata.pkb | 146 ++++++++++++++++-- .../expectations/test_expectation_anydata.pks | 9 ++ .../unary/test_expect_to_have_count.pkb | 14 +- 14 files changed, 334 insertions(+), 88 deletions(-) diff --git a/source/core/ut_metadata.pkb b/source/core/ut_metadata.pkb index 7619c316b..630adfad3 100644 --- a/source/core/ut_metadata.pkb +++ b/source/core/ut_metadata.pkb @@ -30,18 +30,25 @@ create or replace package body ut_metadata as l_object_number number; begin l_name := form_name(a_owner, a_object, a_procedure_name); + do_resolve(l_name,l_context,a_owner,a_object, a_procedure_name); + end do_resolve; - dbms_utility.name_resolve(name => l_name - ,context => l_context + procedure do_resolve(a_fully_qualified_name in varchar2,a_context in integer,a_owner out nocopy varchar2, a_object out nocopy varchar2, + a_procedure_name out nocopy varchar2) is + l_dblink varchar2(200); + l_part1_type number; + l_object_number number; + begin + dbms_utility.name_resolve(name => a_fully_qualified_name + ,context => a_context ,schema => a_owner ,part1 => a_object ,part2 => a_procedure_name ,dblink => l_dblink ,part1_type => l_part1_type ,object_number => l_object_number); - - end do_resolve; - + end; + function form_name(a_owner_name varchar2, a_object varchar2, a_subprogram varchar2 default null) return varchar2 is l_name varchar2(200); begin @@ -264,5 +271,18 @@ create or replace package body ut_metadata as return l_anytype; end; + function get_collection_element(a_anydata in anydata) return varchar2 + is + l_anytype anytype; + l_nested_type t_anytype_members_rec; + l_type_code integer; + begin + l_type_code := a_anydata.gettype(l_anytype); + if is_collection(l_type_code) then + l_nested_type := get_anytype_members_info(ut_metadata.get_attr_elem_info(l_anytype).attr_elt_type); + end if; + return l_nested_type.schema_name || '.' ||l_nested_type.type_name; + end; + end; / diff --git a/source/core/ut_metadata.pks b/source/core/ut_metadata.pks index 845cff61f..27782589e 100644 --- a/source/core/ut_metadata.pks +++ b/source/core/ut_metadata.pks @@ -70,6 +70,12 @@ create or replace package ut_metadata authid current_user as */ procedure do_resolve(a_owner in out nocopy varchar2, a_object in out nocopy varchar2, a_procedure_name in out nocopy varchar2); + /** + * Resolves single string [owner.]object[.procedure] using dbms_utility.name_resolve and returns parts [owner] [object] [procedure] + */ + procedure do_resolve(a_fully_qualified_name in varchar2,a_context in integer,a_owner out nocopy varchar2, + a_object out nocopy varchar2, a_procedure_name out nocopy varchar2); + /** * Return the text of the source line for a given object (body). It excludes package spec and type spec */ @@ -140,6 +146,11 @@ create or replace package ut_metadata authid current_user as * Returns ANYTYPE descriptor of an object type */ function get_user_defined_type(a_owner varchar2, a_type_name varchar2) return anytype; - + + /** + * Return fully qualified name of the object from collection, if not collection returns null + */ + function get_collection_element(a_anydata in anydata) return varchar2; + end ut_metadata; / diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index d55fa65d8..057c8b696 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -391,6 +391,7 @@ create or replace package body ut_compound_data_helper is end if; l_compare_sql := replace(l_compare_sql,'{:where_condition:}',l_where_stmt); + return l_compare_sql; end; @@ -407,7 +408,8 @@ create or replace package body ut_compound_data_helper is function get_rows_diff_by_sql( a_act_cursor_info ut_cursor_column_tab, a_exp_cursor_info ut_cursor_column_tab, a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, - a_join_by_list ut_varchar2_list, a_unordered boolean, a_enforce_column_order boolean := false + a_join_by_list ut_varchar2_list, a_unordered boolean, a_enforce_column_order boolean := false, + a_extract_path varchar2 ) return tt_row_diffs is l_act_extract_xpath varchar2(32767):= ut_utils.to_xpath(get_column_extract_path(a_act_cursor_info)); l_exp_extract_xpath varchar2(32767):= ut_utils.to_xpath(get_column_extract_path(a_exp_cursor_info)); @@ -429,7 +431,7 @@ create or replace package body ut_compound_data_helper is where diff_id = :diff_id and ucd.exp_data_id = :self_guid ) i, - table( xmlsequence( extract(i.exp_item_data,'/*') ) ) s + table( xmlsequence( extract(i.exp_item_data,:extract_path) ) ) s ), act as ( select @@ -444,7 +446,7 @@ create or replace package body ut_compound_data_helper is where diff_id = :diff_id and ucd.act_data_id = :other_guid ) i, - table( xmlsequence( extract(i.act_item_data,'/*') ) ) s + table( xmlsequence( extract(i.act_item_data,:extract_path) ) ) s ) select rn, diff_type, diffed_row, pk_value pk_value from ( @@ -520,16 +522,15 @@ create or replace package body ut_compound_data_helper is case when final_order = 1 then to_char(rnk) else col_name end ]' end; - execute immediate l_sql bulk collect into l_results - using l_exp_extract_xpath, l_join_xpath, a_diff_id, a_expected_dataset_guid, - l_act_extract_xpath, l_join_xpath, a_diff_id, a_actual_dataset_guid, - l_join_xpath, l_join_xpath, a_diff_id; - + using l_exp_extract_xpath, l_join_xpath, a_diff_id, a_expected_dataset_guid,a_extract_path, + l_act_extract_xpath, l_join_xpath, a_diff_id, a_actual_dataset_guid,a_extract_path, + l_join_xpath, l_join_xpath, a_diff_id; return l_results; end; + --TODO : removal function get_rows_diff( a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2 diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 71a35206d..63d5df8f0 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -68,7 +68,8 @@ create or replace package ut_compound_data_helper authid definer is function get_rows_diff_by_sql( a_act_cursor_info ut_cursor_column_tab,a_exp_cursor_info ut_cursor_column_tab, a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, - a_join_by_list ut_varchar2_list, a_unordered boolean, a_enforce_column_order boolean := false + a_join_by_list ut_varchar2_list, a_unordered boolean, a_enforce_column_order boolean := false, + a_extract_path varchar2 ) return tt_row_diffs; subtype t_hash is raw(128); diff --git a/source/expectations/data_values/ut_compound_data_value.tps b/source/expectations/data_values/ut_compound_data_value.tps index 57c5838ae..44532c2e4 100644 --- a/source/expectations/data_values/ut_compound_data_value.tps +++ b/source/expectations/data_values/ut_compound_data_value.tps @@ -34,7 +34,12 @@ create or replace type ut_compound_data_value force under ut_data_value( * Holds unique id for retrieving the data from ut_compound_data_tmp temp table */ data_id raw(16), - + + /** + * Holds name for the type of compound + */ + compound_type varchar2(50), + overriding member function get_object_info return varchar2, overriding member function is_null return boolean, overriding member function is_diffable return boolean, diff --git a/source/expectations/data_values/ut_data_value_anydata.tpb b/source/expectations/data_values/ut_data_value_anydata.tpb index bdcbcba94..bfd907562 100644 --- a/source/expectations/data_values/ut_data_value_anydata.tpb +++ b/source/expectations/data_values/ut_data_value_anydata.tpb @@ -15,34 +15,72 @@ create or replace type body ut_data_value_anydata as See the License for the specific language governing permissions and limitations under the License. */ - member procedure init(self in out nocopy ut_data_value_anydata, a_value anydata) is - l_query sys_refcursor; - l_ctx number; - l_ut_owner varchar2(250) := ut_utils.ut_owner; - cursor_not_open exception; - l_cursor_number number; - l_anydata_type varchar2(100) := get_instance(a_value); - l_element_count number; + + member function is_null(a_value in anydata) return number is + l_result integer := 0; + l_anydata_sql varchar2(4000); + begin + if a_value is not null and self.compound_type = 'object' then + l_anydata_sql := ' + declare + l_data '||self.data_type||'; + l_value anydata := :a_value; + l_status integer; + begin + l_status := l_value.get'||self.compound_type||'(l_data); + :l_data_is_null := case when l_data is null then 1 else 0 end; + end;'; + execute immediate l_anydata_sql using in a_value, out l_result; + --TODO : Refactor + elsif a_value is not null and self.compound_type = 'collection' then + l_anydata_sql := ' + declare + l_data '||self.data_type||'; + l_value anydata := :a_value; + l_status integer; + begin + l_status := l_value.get'||self.compound_type||'(l_data); + :l_data_is_null := case + when l_data is null then 1 + when l_data is empty then 1 + else 0 end; + end;'; + execute immediate l_anydata_sql using in a_value, out l_result; + else + l_result := 1; + end if; + return l_result; + end; + + overriding member function get_object_info return varchar2 is + begin + return self.data_type || case when self.compound_type = 'collection' then ' [ count = '||self.elements_count||' ]' else null end; + end; + + member procedure get_cursor_from_anydata(a_value in anydata, a_refcursor out sys_refcursor) is + l_anydata_sql varchar2(4000); + + function resolve_name(a_object_name in varchar2) return varchar2 is + l_schema varchar(250); + l_object varchar(250); + l_procedure_name varchar(250); + begin + ut_metadata.do_resolve(a_object_name,7,l_schema,l_object, l_procedure_name); + return l_object; + end; + + function get_object_name(a_value anydata) return varchar2 is + begin + return resolve_name(ut_metadata.get_collection_element(a_value)); + end; - --Used by dbms_utility... - l_type_name varchar2(250); - l_schema varchar(250); - l_part1 varchar(250); - l_part2 varchar(250); - l_dblink varchar(250); - l_part1_type number; - l_objectid number; + function get_object_name(a_datatype in varchar2) return varchar2 is + begin + return resolve_name(a_datatype); + end; begin - self.data_type := case when a_value is not null then lower(a_value.gettypename()) else 'undefined' end; - self.data_id := sys_guid(); - self.self_type := $$plsql_unit; - self.cursor_details := ut_cursor_details(); - if a_value is not null then - --TODO : Move that to helper ?? - dbms_utility.name_resolve(self.data_type,7, l_schema, l_part1, l_part2, l_dblink, l_part1_type, l_objectid); - --TODO: Refactor into something nicer - execute immediate ' + l_anydata_sql := ' declare l_data '||self.data_type||'; l_value anydata := :a_value; @@ -50,34 +88,45 @@ create or replace type body ut_data_value_anydata as l_tmp_refcursor sys_refcursor; l_refcursor sys_refcursor; begin - l_status := l_value.get'||l_anydata_type||'(l_data); - :l_data_is_null := case when l_data is null then 1 else 0 end; '|| - case when l_anydata_type = 'collection' then - ' open l_tmp_refcursor for select * from table(l_data);' + l_status := l_value.get'||self.compound_type||'(l_data); '|| + case when self.compound_type = 'collection' then + ' open l_tmp_refcursor for select value(x) as '||get_object_name(a_value)||' from table(l_data) x;' else - ' open l_tmp_refcursor for select l_data '||l_part1||' from dual;' + ' open l_tmp_refcursor for select l_data '||get_object_name(self.data_type)||' from dual;' end || - q'[ :l_refcursor := l_tmp_refcursor; - if l_data is not null then - :l_count := ]'|| case when l_anydata_type = 'collection' then 'l_data.count; ' else '0; ' end || - 'end if; - end;' using in a_value, out self.is_data_null, out l_query, out l_element_count; - else - self.is_data_null := 1; + ' :l_refcursor := l_tmp_refcursor; + end;'; + execute immediate l_anydata_sql using in a_value, out a_refcursor; + end; + + member procedure init(self in out nocopy ut_data_value_anydata, a_value anydata) is + l_refcursor sys_refcursor; + l_ctx number; + l_ut_owner varchar2(250) := ut_utils.ut_owner; + cursor_not_open exception; + l_cursor_number number; + + begin + self.data_type := case when a_value is not null then lower(a_value.gettypename()) else 'undefined' end; + self.compound_type := get_instance(a_value); + self.extract_path := '/*/*'; + self.data_id := sys_guid(); + self.self_type := $$plsql_unit; + self.cursor_details := ut_cursor_details(); + self.is_data_null := is_null(a_value); + self.elements_count := 0; + if not self.is_null() then + get_cursor_from_anydata(a_value,l_refcursor); end if; + ut_compound_data_helper.cleanup_diff; if not self.is_null() then - self.elements_count := 0; - if l_query%isopen then - self.extract_cursor(l_query); - --For collection we have to overwrite a number due to being calculated not correctly - if l_anydata_type = 'collection' then - self.elements_count := l_element_count; - end if; - l_cursor_number := dbms_sql.to_cursor_number(l_query); + if l_refcursor%isopen then + self.elements_count := self.extract_cursor(l_refcursor); + l_cursor_number := dbms_sql.to_cursor_number(l_refcursor); self.cursor_details := ut_cursor_details(l_cursor_number); dbms_sql.close_cursor(l_cursor_number); - elsif not l_query%isopen then + elsif not l_refcursor%isopen then raise cursor_not_open; end if; end if; diff --git a/source/expectations/data_values/ut_data_value_anydata.tps b/source/expectations/data_values/ut_data_value_anydata.tps index 27439c3c9..15e5bfaca 100644 --- a/source/expectations/data_values/ut_data_value_anydata.tps +++ b/source/expectations/data_values/ut_data_value_anydata.tps @@ -15,8 +15,10 @@ create or replace type ut_data_value_anydata under ut_data_value_refcursor( See the License for the specific language governing permissions and limitations under the License. */ - - + + member function is_null(a_value in anydata) return number, + member procedure get_cursor_from_anydata(a_value in anydata, a_refcursor out sys_refcursor), + overriding member function get_object_info return varchar2, member procedure init(self in out nocopy ut_data_value_anydata, a_value anydata), member function get_instance(a_data_value anydata) return varchar2, constructor function ut_data_value_anydata(self in out nocopy ut_data_value_anydata, a_value anydata) return self as result, @@ -27,4 +29,4 @@ create or replace type ut_data_value_anydata under ut_data_value_refcursor( a_is_negated boolean := false ) return integer ) -/ + diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 774604d99..3aa8e271c 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -15,7 +15,7 @@ create or replace type body ut_data_value_refcursor as See the License for the specific language governing permissions and limitations under the License. */ - + constructor function ut_data_value_refcursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) return self as result is begin @@ -23,13 +23,16 @@ create or replace type body ut_data_value_refcursor as return; end; - member procedure extract_cursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) is + member function extract_cursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) + return number + is c_bulk_rows constant integer := 10000; l_cursor sys_refcursor := a_value; l_ctx number; l_xml xmltype; l_ut_owner varchar2(250) := ut_utils.ut_owner; l_set_id integer := 0; + l_elements_count number := 0; begin -- We use DBMS_XMLGEN in order to: -- 1) be able to process data in bulks (set of rows) @@ -46,11 +49,11 @@ create or replace type body ut_data_value_refcursor as ut_expectation_processor.set_xml_nls_params(); l_ctx := dbms_xmlgen.newContext(l_cursor); dbms_xmlgen.setNullHandling(l_ctx, dbms_xmlgen.empty_tag); - dbms_xmlgen.setMaxRows(l_ctx, c_bulk_rows); + dbms_xmlgen.setMaxRows(l_ctx, c_bulk_rows); loop l_xml := dbms_xmlgen.getxmltype(l_ctx); exit when dbms_xmlgen.getNumRowsProcessed(l_ctx) = 0; - self.elements_count := self.elements_count + dbms_xmlgen.getNumRowsProcessed(l_ctx); + l_elements_count := l_elements_count + dbms_xmlgen.getNumRowsProcessed(l_ctx); execute immediate 'insert into ' || l_ut_owner || '.ut_compound_data_tmp(data_id, item_no, item_data) ' || 'values (:self_guid, :self_row_count, :l_xml)' @@ -59,6 +62,7 @@ create or replace type body ut_data_value_refcursor as end loop; ut_expectation_processor.reset_nls_params(); dbms_xmlgen.closeContext(l_ctx); + return l_elements_count; exception when others then ut_expectation_processor.reset_nls_params(); @@ -75,14 +79,15 @@ create or replace type body ut_data_value_refcursor as self.self_type := $$plsql_unit; self.data_id := sys_guid(); self.data_type := 'refcursor'; + self.compound_type := 'refcursor'; + self.extract_path := '/*'; ut_compound_data_helper.cleanup_diff; self.cursor_details := ut_cursor_details(); if l_cursor is not null then if l_cursor%isopen then --Get some more info regarding cursor, including if it containts collection columns and what is their name - self.elements_count := 0; - extract_cursor(l_cursor); + self.elements_count := extract_cursor(l_cursor); l_cursor_number := dbms_sql.to_cursor_number(l_cursor); self.cursor_details := ut_cursor_details(l_cursor_number); dbms_sql.close_cursor(l_cursor_number); @@ -233,7 +238,7 @@ create or replace type body ut_data_value_refcursor as l_row_diffs := ut_compound_data_helper.get_rows_diff_by_sql( l_self_cols, l_other_cols, l_self.data_id, l_other.data_id, l_diff_id, a_match_options.join_by.items, a_match_options.unordered, - a_match_options.ordered_columns() + a_match_options.ordered_columns(), self.extract_path ); l_message := chr(10) ||'Rows: [ ' || l_diff_row_count ||' differences' diff --git a/source/expectations/data_values/ut_data_value_refcursor.tps b/source/expectations/data_values/ut_data_value_refcursor.tps index ab6728559..049285f88 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tps +++ b/source/expectations/data_values/ut_data_value_refcursor.tps @@ -30,8 +30,13 @@ create or replace type ut_data_value_refcursor under ut_compound_data_value( */ cursor_details ut_cursor_details, + /* + * extract path of elements, important for collectiosn and objects + */ + extract_path varchar2(10), + constructor function ut_data_value_refcursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) return self as result, - member procedure extract_cursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor), + member function extract_cursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) return number, member procedure init(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor), overriding member function to_string return varchar2, overriding member function diff( a_other ut_data_value, a_match_options ut_matcher_options ) return varchar2, @@ -43,4 +48,4 @@ create or replace type ut_data_value_refcursor under ut_compound_data_value( ) return integer, overriding member function is_empty return boolean ) not final -/ \ No newline at end of file +/ diff --git a/source/expectations/matchers/ut_equal.tpb b/source/expectations/matchers/ut_equal.tpb index a666caaa3..4fc06c850 100644 --- a/source/expectations/matchers/ut_equal.tpb +++ b/source/expectations/matchers/ut_equal.tpb @@ -237,6 +237,7 @@ create or replace type body ut_equal as l_result varchar2(32767); begin if self.expected.data_type = a_actual.data_type and self.expected.is_diffable then + --TODO : Refactor if self.expected is of (ut_data_value_refcursor) then l_result := 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() diff --git a/source/expectations/matchers/ut_have_count.tpb b/source/expectations/matchers/ut_have_count.tpb index ffa32290b..6b4b29fe2 100644 --- a/source/expectations/matchers/ut_have_count.tpb +++ b/source/expectations/matchers/ut_have_count.tpb @@ -26,8 +26,9 @@ create or replace type body ut_have_count as overriding member function run_matcher(self in out nocopy ut_have_count, a_actual ut_data_value) return boolean is l_result boolean; begin - if a_actual is of(ut_data_value_refcursor) then - l_result := ( self.expected = treat(a_actual as ut_compound_data_value).elements_count ); + --TODO : Refactor + if a_actual is of(ut_data_value_refcursor) and ( treat (a_actual as ut_data_value_refcursor).compound_type != 'object') then + l_result := ( self.expected = treat(a_actual as ut_data_value_refcursor).elements_count ); else l_result := (self as ut_matcher).run_matcher(a_actual); end if; diff --git a/test/core/expectations/test_expectation_anydata.pkb b/test/core/expectations/test_expectation_anydata.pkb index a510b2317..15de20512 100644 --- a/test/core/expectations/test_expectation_anydata.pkb +++ b/test/core/expectations/test_expectation_anydata.pkb @@ -16,6 +16,8 @@ create or replace package body test_expectation_anydata is end; procedure fail_on_different_type_null is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); begin --Arrange g_test_expected := anydata.convertObject( cast(null as test_dummy_object) ); @@ -23,10 +25,15 @@ create or replace package body test_expectation_anydata is --Act ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); + l_expected_message := q'[%Actual (ut3_tester.other_dummy_object) cannot be compared to Expected (ut3_tester.test_dummy_object) using matcher 'equal'.]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); end; procedure fail_on_different_type is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); begin --Arrange g_test_expected := anydata.convertObject( test_dummy_object(1, 'A', '0') ); @@ -34,7 +41,10 @@ create or replace package body test_expectation_anydata is --Act ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); + l_expected_message := q'[%Actual (ut3_tester.other_dummy_object) cannot be compared to Expected (ut3_tester.test_dummy_object) using matcher 'equal'.]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); end; procedure fail_on_different_object_data is @@ -49,6 +59,8 @@ create or replace package body test_expectation_anydata is end; procedure fail_on_one_object_null is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); begin --Arrange g_test_expected := anydata.convertObject( test_dummy_object(1, 'A', '0') ); @@ -56,10 +68,19 @@ create or replace package body test_expectation_anydata is --Act ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); + l_expected_message := q'[%Actual: ut3_tester.test_dummy_object was expected to equal: ut3_tester.test_dummy_object +%Diff: +%Rows: [ 1 differences ] +%Row No. 1 - Missing: 1A0]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; procedure fail_on_collection_vs_object is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); begin --Arrange g_test_expected := anydata.convertObject( test_dummy_object(1, 'A', '0') ); @@ -67,11 +88,16 @@ create or replace package body test_expectation_anydata is --Act ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); + l_expected_message := q'[%Actual (ut3_tester.test_dummy_object_list) cannot be compared to Expected (ut3_tester.test_dummy_object) using matcher 'equal'.]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); end; procedure fail_on_null_vs_empty_coll is l_null_list test_dummy_object_list; + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); begin --Arrange g_test_expected := anydata.convertCollection( test_dummy_object_list() ); @@ -79,11 +105,20 @@ create or replace package body test_expectation_anydata is --Act ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); + l_expected_message := q'[%Actual: ut3_tester.test_dummy_object_list [ count = ] was expected to equal: ut3_tester.test_dummy_object_list [ count = 0 ] +%Diff: +%Rows: [ all different ] +%All rows are different as the columns position is not matching.]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; procedure fail_on_one_collection_null is l_null_list test_dummy_object_list; + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); begin --Arrange g_test_expected := anydata.convertCollection( test_dummy_object_list(test_dummy_object(1, 'A', '0')) ); @@ -91,10 +126,18 @@ create or replace package body test_expectation_anydata is --Act ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); + l_expected_message := q'[%Actual: ut3_tester.test_dummy_object_list [ count = ] was expected to equal: ut3_tester.test_dummy_object_list [ count = 1 ] +%Diff: +%Rows: [ 1 differences ] +%Row No. 1 - Missing: 1A0]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); end; procedure fail_on_one_collection_empty is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); begin --Arrange g_test_expected := anydata.convertCollection( test_dummy_object_list(test_dummy_object(1, 'A', '0')) ); @@ -102,10 +145,19 @@ create or replace package body test_expectation_anydata is --Act ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); + l_expected_message := q'[%Actual: ut3_tester.test_dummy_object_list [ count = 0 ] was expected to equal: ut3_tester.test_dummy_object_list [ count = 1 ] +%Diff: +%Rows: [ 1 differences ] +%Row No. 1 - Missing: 1A0]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; procedure fail_on_different_coll_data is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); l_obj test_dummy_object := test_dummy_object(1, 'A', '0'); begin --Arrange @@ -114,7 +166,13 @@ create or replace package body test_expectation_anydata is --Act ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); + l_expected_message := q'[%Actual: ut3_tester.test_dummy_object_list [ count = 2 ] was expected to equal: ut3_tester.test_dummy_object_list [ count = 1 ] +%Diff: +%Rows: [ 1 differences ] +%Row No. 2 - Extra: 1A0]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); end; --%test(Gives success when both anydata are NULL) @@ -162,6 +220,8 @@ create or replace package body test_expectation_anydata is end; procedure fail_on_coll_different_order is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); l_first_obj test_dummy_object := test_dummy_object(1, 'A', '0'); l_second_obj test_dummy_object := test_dummy_object(2, 'b', '1'); begin @@ -307,6 +367,8 @@ create or replace package body test_expectation_anydata is procedure include_exclude_attrib_list is l_exclude ut3.ut_varchar2_list; l_include ut3.ut_varchar2_list; + l_expected varchar2(32767); + l_actual varchar2(32767); begin --Arrange l_include := ut3.ut_varchar2_list('TEST_DUMMY_OBJECT/key','TEST_DUMMY_OBJECT/ID','TEST_DUMMY_OBJECT/Value'); @@ -350,7 +412,7 @@ Rows: [ 1 differences ] l_expected := q'[Actual: ut3_tester.test_dummy_object_list [ count = 2 ] was expected to equal: ut3_tester.test_dummy_object_list [ count = 1 ] Diff: Rows: [ 1 differences ] - Row No. 2 - Extra: 1A0]'; + Row No. 2 - Extra: 1A0]'; --Act ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); --Assert @@ -417,7 +479,6 @@ Rows: [ 1 differences ] ut.expect(ut3.ut_expectation_processor.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); end; - --%test(Reports only mismatched columns on column data mismatch) procedure data_diff_on_atr_data_mismatch is l_actual test_dummy_object_list; l_expected test_dummy_object_list; @@ -482,5 +543,70 @@ Rows: [ 60 differences, showing first 20 ] ut.expect(l_actual_message).to_be_like(l_expected_message); end; + procedure collection_include_list is + l_actual test_dummy_object_list; + l_expected test_dummy_object_list; + l_list ut3.ut_varchar2_list; + begin + l_list := ut3.ut_varchar2_list('TEST_DUMMY_OBJECT/Value','TEST_DUMMY_OBJECT/ID'); + --Arrange + select test_dummy_object( rownum, 'SomethingsDifferent '||rownum, rownum) + bulk collect into l_actual + from dual connect by level <=2; + select test_dummy_object( rownum, 'Something '||rownum, rownum) + bulk collect into l_expected + from dual connect by level <=2; + --Act + ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).include( l_list ); + + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure collection_exclude_list is + l_actual test_dummy_object_list; + l_expected test_dummy_object_list; + l_list ut3.ut_varchar2_list; + begin + l_list := ut3.ut_varchar2_list('TEST_DUMMY_OBJECT/Value','TEST_DUMMY_OBJECT/ID'); + --Arrange + select test_dummy_object( rownum*2, 'Something '||rownum, rownum*2) + bulk collect into l_actual + from dual connect by level <=2; + select test_dummy_object( rownum, 'Something '||rownum, rownum) + bulk collect into l_expected + from dual connect by level <=2; + --Act + ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).exclude( l_list ); + + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure collection_include_list_fail is + l_actual test_dummy_object_list; + l_expected test_dummy_object_list; + l_list ut3.ut_varchar2_list; + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + l_list := ut3.ut_varchar2_list('TEST_DUMMY_OBJECT/name'); + --Arrange + select test_dummy_object( rownum, 'SomethingsDifferent '||rownum, rownum) + bulk collect into l_actual + from dual connect by level <=2; + select test_dummy_object( rownum, 'Something '||rownum, rownum) + bulk collect into l_expected + from dual connect by level <=2; + --Act + ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).include( l_list ); + + l_expected_message := q'[%Actual: ut3_tester.test_dummy_object_list [ count = 2 ] was expected to equal: ut3_tester.test_dummy_object_list [ count = 2 ] +%Diff: +%Rows: [ 2 differences ] +%All rows are different as the columns are not matching.]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + end; / \ No newline at end of file diff --git a/test/core/expectations/test_expectation_anydata.pks b/test/core/expectations/test_expectation_anydata.pks index 5d7c0c1ad..9cef7da11 100644 --- a/test/core/expectations/test_expectation_anydata.pks +++ b/test/core/expectations/test_expectation_anydata.pks @@ -111,5 +111,14 @@ create or replace package test_expectation_anydata is --%test(Reports only first 20 rows of diff and gives a full diff count) procedure data_diff_on_20_rows_only; + --%test(Validate include list on collections of objects) + procedure collection_include_list; + + --%test(Validate exclude list on collections of objects) + procedure collection_exclude_list; + + --%test(Validate include list on collections of objects fail) + procedure collection_include_list_fail; + end; / diff --git a/test/core/expectations/unary/test_expect_to_have_count.pkb b/test/core/expectations/unary/test_expect_to_have_count.pkb index 663f60962..a95a6778a 100644 --- a/test/core/expectations/unary/test_expect_to_have_count.pkb +++ b/test/core/expectations/unary/test_expect_to_have_count.pkb @@ -158,22 +158,32 @@ create or replace package body test_expect_to_have_count is end; procedure fail_have_count_number is + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); begin -- Act ut3.ut.expect( 1 ).to_( ut3.have_count(0) ); --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); + l_expected_message := q'[%The matcher 'have count' cannot be used with data type (number).%]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); end; procedure fail_not_have_count_object is l_actual anydata; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); begin --Arrange l_actual := anydata.convertObject(ut3.ut_data_value_number(1)); -- Act ut3.ut.expect(l_actual).not_to_have_count(0); --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); + l_expected_message := q'[%The matcher 'have count' cannot be used with data type (ut3.ut_data_value_number).%]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); end; procedure fail_not_have_count_null_obj is From 05631bd6c0dd0dc7366928315aa461487f46ca68 Mon Sep 17 00:00:00 2001 From: Samuel Nitsche Date: Thu, 28 Feb 2019 22:51:32 +0100 Subject: [PATCH 0239/1096] Add new README-section "Supporters" --- docs/images/supported_by_redgate_100.png | Bin 0 -> 7674 bytes readme.md | 10 ++++++++++ 2 files changed, 10 insertions(+) create mode 100644 docs/images/supported_by_redgate_100.png diff --git a/docs/images/supported_by_redgate_100.png b/docs/images/supported_by_redgate_100.png new file mode 100644 index 0000000000000000000000000000000000000000..ea9f93ac5cc204e2afd93c1356f8e61e17512041 GIT binary patch literal 7674 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D9gj&wK~#8N?Oh3g z6vesz`j~s?*x6n7fIZk#zT> zsxA~{2_~T2Id`ry2GGOXx4Z3$gklSYys5S}r>d$ByU#bsh(>M6aExLnt%v#m-Q$7b zav5qO(UgqG!^q1^C2h90xZR%gR8&MRn>Q~(g`(GI2SM33ID@oG_!%!4m_tR0MK*ckqguP`ZQ*yp1aa0x1 zGNZ=Q$SU$ zcbP;^`sY7|48{AWL|5qrR7I+qQZ+RKU2i9OZd5&UZd{m?jQIp}4| zE4SQIFnH^h$;JmCo|&w#pJ;T3N1BO5fNt98L4|Aipa~p<=vk4RZv%><=vq{DI=5+g zd2bq3!HL%ukNJ$0Ny>xj zi2fWH5pGY!K{5hRW!O~)Hey@Sb99QHab5O_8InbUu}cGTE+zB+GSgzqV&pVX-z z?k>q+xALmQu3cBB+C!y8l%2%s{|7sVfI$kHnrnxBXw|aNdtn*T z&gv@or(Fcq<)SNAEYGQ@!h6oyAPZm48GNT_S_h`rJNhJHT7Di1Z@&%Y_bx=)y$ewO zdEHgVM+)hRJpg=7GM|oTQpBF5SH*ye;xv#|C|&!9i=M1K|1e87RE@X4K7}kH&`{M$Y8Z;3zFcvZ)F7@-ieE_P{o@0?rY`kqU?5nS3h9 zT9zYcB-zpg&$#h$R9C}!!e}_Fs*tR!hmlA?&(B8=rSClPL>OINFhcEc({KCm;c$)| z1+5?-1=m~)|3zOwQf~3IUtt}s;<-XC%}996nU@fq?6G4+;cG6 z+9>x5a?bcPTqlmDd^E#eQGsM*Bb>vA!#1Q0sXYzQsVuH>Sr-_$cv_=A5(bmdBt!h0ptZVJI` zu14gow~;&jQmXkMLN6#n-nG|28&pVXtwZtcx0CdI9MUs!G+LVP6TJof~~xQu9_&GcPBzGE<NW6QbP;l>vW(U?)ZFk@G~TlS29ewo+*D&5D8298g4#Rh z!FSeKi0#@1h4fs`XQskE=@dlPtVXJ}HQk60j*lgb6L6H3A-;PTcFej`h;xq`g+Vue z8;Z?F?gQmU+CPUhh_DpZuF=wh*!CSzJswHOh=h@%CYRX0UETf+)EGC{7om@4t^^xD$;JK8V)E&!he2<%n+F2-n1k zaFfntr4Q*GdKTM+lXNY|$)V=Sm6>d8LTKqS%I5?kxfNaO-;*leuj&uL$LcVCSZba! zocpCK;63}ZNRgzpJn#_0t5zZBv`@i*?s-srKB?XC8*d=`fv+c9(ha% zba9|eJFBYE^xH)UzxpcGbO^b#uM|BKUbPy{)YNq9l~p3W^R?GV7>F!Qhwp+5V3L%y zJ@Y&2OeVumy(XIwvCUi1@%n325#y2j#fzyTeI!XC(oHW?2ht&BaM1f~q)u4BIY*2@ z%j1tDvSI}h9~S-D{^zCWeEs$GXz)Rh)?v!ivu95jv3SXAW+alEzO@h1^(>O04;n=F zjTp>5*Ds6{6@iB$^tfW5^+0R&e7@s3S8Z^5&ad%7emGRik6d z8Q<%Z(ic!O;VwMBZ7WhFN#v}{J=P2H9XmwKQ&eC!E21B45>mT%Y!`87pCZ0Vzx?Rj$NO@;Q+r*P>lkK8V0n zQ?o^)+@X6UnVg=yhjcOGG3jOVueu7Ie|-(n_tvLlemp)_!uk!87>!H-qbo`U=P5J` zY&5cDbW6?A2DJvAY&=#8DUwvip$16%EMffyk-^f|lPm@srTa+D(FV1UWPJmSXjF*m z>uBZ*nFe}Eu@%Ua;E@uQd|8ge z=0zs0{nH#M9Qj_d7i0>@YL%^ZJ(vqSk8Y5QWv{M=ot$hvFAth0N9-|;eNu{RCK6-< zB*;+iq~5HZOp_Wigg->rdm9k@Xe;9NwbHrtOux8)2EAVm2G5|Fp(50tY`9R@LzBt^guuy zW9uH>O-qyo{@wH3Lgoq+c;J0X#cqdt%xDC!oJD%ho^{=pb)_$(4&*?K_)wv_iS0|& z;e(T5iBuJh>Lo3O>3i8i)(K<2+LtXu?f1Tq#{2I>>x)YfUb7mpni?cYk;^z0S=}Z% z6vsg-oo=lr5Js)((ZUk)>D`GrRs1JX-c1)~yCfqBG%3ntg4 zv{cq^Mp>Z~nLPaBaYOU@#4)xF9!w+-g|n)XOb_Z+siUw3$^4*u97mo@|2<9!qry;$ z+^0{Gp_k;Y8ah|uoH!m@Zcs)Fq*;bLVRnYa5jK-aaf~w%%31%BWNL1gjD$EwkCBNM zd+88LkLemX!m`{;vOXfhCY^%v-#!dmWtF9uB2g6Ib{nde{t4B~U&gSPUqa;{|A?W_ zJdM(Y3s5+J9tv*!76LP8!h6nHaE>1bJ2hQ}yn;ks9XkK|S43B>k~a)Avaj^h%`#`| zRFpsTAoQU_(Y0w4YHq$6aVorH$PlvlMF{4X4f$WW9wl>b#gJeB3Kfq%imD}x zF^r_A`jzFVTJ|D}Z@rcDnog3KS@rD}(>+dG6O~S zmyLQpp5W!C$UUPOizCIoX?;DqHg863<3@mb(hT_njVw1wONzW_osFSSJb|IV{~aoy zeHK-V7o(bbMGoZ;|5g^XFatapT>kiDsCwxoQSenSaae|G{!QLO^^2tR=l=+*%VE9X zC?LxcmOk=mgwrW=gIZ1wG%s24E97^xI5B4FYvJj=|o`rNh7tZ0s;Tkbg zR^6~!!9zkhlTU^FgfTL)d$f?{Ua|*BPqCwH{Z1c9{MeB7efF~`d-y@J?2FMtwpi_) zIY_qh+$R~a)cm+va$tpTCfKMwS`CukJP@vt{|lc-!8g7k)Ba|dta&pZ959T^O~mV!_DK?d7n66jeTNMr(S8ip=fM1;*4aKf^#^tm)L zR>kB{fqCtzN{%!4g!Zyh(p4kjo-h#}>M?m8YT)88A~5|@*b58gSqB-c#dq9+Aqy6u z?9oLi{QmdE#ONk;fRSY#MiN6M3tV&&${%}77O4!S9kOQpr9$TF5G48H?OrQHkL6>F|Ay z?69ey5%=*kYpQOK)tgfAlV?zRKlPXaKN{xGNAshPA{7mj;To58 zt%f-8$g+en($-kId~)diL)Td+aZebD%0iVyZJk*1(Y0&E(&r^fsc00n-~T?jR#%|m z7r&HIT6xy0j{!y2l|Gj#|Lb2v@!UJ4w=+6J;FZw47K}rpt`>=U@)H{xk!ac@i}F(B ztb>#{_oBR1$>gO`Cdn1|2BZ&dMTMv!edZ-H*(_mcJ8pVOCQL6Xl4a_=#537JWUxII zW1EU3i+fG(5JX_;4+)+O3OdMlbh)AXsj24XLN6Qydr1lGLx+;NF+$ucjqh<>BJ;Q+ zjA1oECWPgI&d5yQ@p{%*ylh;Cq)P^q@k*rd&@@^8wo*DLqSQbT8hHs~n(*8s_qrJf zVaLswzC{$95xf+@HmCqPk>MyUgFb|g6nGNE#%m~uG+rve4!1=Lr@&8J5R%j9Y|ib2 z0VFKTO5c*Nz-5<`^Sl&8$#ke7^J4HXevYDBZb6Wgxc4(t<%l0lckQO0FKiLP?oBU+KP->{%cO5OOg?6TF|RoNxX^LZv#Ka10*? B)nRGJgu92klORTXm@-cZDZJ!=6-PAzj$mj;yXFOUF z-}VtA@2;1x+q%}RC)=%=j9+URe6}!PW<>@}+TH@uFCM|j$&ubuFBl{}s7h{-=FPEs zNfA$yCXyQYMyQDl-9|EO8=K_g1+n&Jv}6CYvx5OAtS_+Cw#cI}kQwI5_@vpV<=_|~ zv!cJSD3c%@@t>nlR!c#~N<+EqUh!M!WXc}CTCc#!xOuk`Mnh)0*7m8O_dp~=Qd|JahtSBzG z?7R|s{dKfH@`$Y9agIGf)?&C%odkOkr_qJ3EnCoZ{{!SxzDur_M~1b7*Iy6M8B@^u z>>uQFY43UGQaDfiSpN7vUb`FZ&pwB?CC^*)1^qyuc1Gz5-kGHIzJ)T^$RDknt*x?( zF#oEnWfv6kmaVO2h!j@n_VQAM{_+|Mzx!QTx5~~m&o%PgqHF9Js%@7n4`5j+yZ=5o zDy!)Edf8Wkr{MyZULs4OqHEs8;JfZZaQ2ljqfsjjx0^^lTXrM}Eq_I(@OWvJjmYG! zX=3khlm#!P3+|EK1d@C9$QljzDU&Gw)6li~1H?9NvZPQ-cL?-#XO#WH>$jZ4su6zs zEt&S({-s%ntbAMce~5kX0k+S&65B7IiLIATm%Si7r<^LI60R|0gos^VxgI;N{4zeG z`;B+sL;kh(k-Kx)FlsV+X!!Lnv5nKcVitB@dmYT?7WmFQOO~MX21#A(*I~!3+1T;r ztK=Q+Bt=e=9M|}9QfMZ#cFqs6b=t)UQAO~oA11BwS9fFEjLWg@lIf_s;|^*1In;#Z z8vw~c-_UQu?0E$;6qDS#UG}p`hCc=~xu%vRcx@xzF>M+-ya! z@dODMo!-YguSD0ZkzpTaWu>HV#G*2cq!$**aFMmBc<*ROU(s*EmpeU-z$B?8O@+7LifUe*N1=G$Jc?o>zN3cT-M^vj{+ks%Jx1mLD@z{vWMszMc`uv# zAI-;}dlsPa*Z+mx|Mnf!-FmxhtkF9g^gNNyl46a_9~@jPk)WQCH1}Rh=SGg*X;EH{ z&agDehF|^?jrZJ(x*z`-JFmMQZO=VR2D2q)eMSGx3L;4Y{mx|7BnjfdJT1qE@LO-8 z<>{x<{JY`8GraM7hJa-&yo>Wqevo4I04pO>eQ1gP) z$#kt*OA7u{47zm=c=NSXM<XuEE_36X#NBVDpXBQt>5Z?l4DXjmsj-+2eo&6`C;dGdi@%%Xi+~ z5y z{BeZ;=YO&DnrmbgkGz?EM%GQ#>+-&0vdJ4Gt&d~}0`@7n*G?wrUG!f527s?KX*{XI z6_cJ5V5CzxC=PpwTKHk5K`+aYC552C=e!P;Hyx6#@raC`ari_w4&wV%(+Y1W#MkJq zeOMLBh@1*?#!KeUqb58LMYr89&ARJ@O)}{raVaoSLWbmluJMrz&+nH!@C;MfG9Tpq z^oOVRsC97Oz-je^te)t9FWCbbqB7|1#eK;P$1y^kNbcMrn>wZhn4C4@ z^!M;+P_=zs=)l;Fu!pUjd&G)=#KO(@cqkgsXwA1c7=c%VQ?Ze1ZKlnlJi1q8I zs(=5-Y$Fo>v=L7PNy*8S;qgjch9EAVl#~B;ElulGY>w4>S?Npd<4^qKM!$bs=HEB! zm4`)h=Q=A^uN$Acde!I2aGYi&W5W?o+K)%lxJ)VbximelIbC}+uYaYPm-kftu*#Kh zo_J!z{{Q^gAvqw%l|SEbLuo}_-DG3!+H+EEZ6}if2RS!xtS+gk zIVE1Rdvq!pAFG;Xm69@Yjg+BLG|30!fYH&T2>u71G(}08irQl8dc9(|ePs9g*Mhb> zBBx;tPPT>0OkK^RES8v&uwoii?{<404AZU}DWrJFh?wOJ@qiC!jYZZPqoC`m236xO zNJ*uVsb;#CB%PBmQ_1ZVKWZC1B-#~?zHbZoLSeu6qp&}(Bb=Al+)+@_?g<1Uhx2bq z_J$)$*rCAxM&;;G$QFx6y=Z8Fo=hqUx7%+flQ!ANo5P`Cw@aX=Wya$1HhVOhL}4Mw oj_j;0F3vn`^yS}(JbVEE2S)hJuAGBhRR91007*qoM6N<$f=B%zmjD0& literal 0 HcmV?d00001 diff --git a/readme.md b/readme.md index 7d04ae81a..03fde5cb6 100644 --- a/readme.md +++ b/readme.md @@ -234,3 +234,13 @@ __Project Directories__ * source - The installation code for utPLSQL * tests - Tests for utPLSQL framework +----------- +# Supporters + +__Disclaimer__: The utPLSQL project is completely free and independent from any commercial intent. Companies who support the project +are listed here with a complete description of their contribution. Although we are grateful for the support, being mentioned does not mean endorsement of + or recommendation for the companys' products by utPLSQL or its development team. + +| | | +| --- | --- | +| [![supported_by_redgate](docs/images/supported_by_redgate_100.png)](https://www.red-gate.com/hub/events/open-source-projects) | utPLSQL has been supported by Redgate in the form of sponsored stickers and t-shirts. Thank you for helping us spreading the word! | From bd67f1768705f416df0da153fef1b837fa35f616 Mon Sep 17 00:00:00 2001 From: Samuel Nitsche Date: Thu, 28 Feb 2019 22:56:53 +0100 Subject: [PATCH 0240/1096] Try out html-table --- readme.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/readme.md b/readme.md index 03fde5cb6..7563170d8 100644 --- a/readme.md +++ b/readme.md @@ -241,6 +241,11 @@ __Disclaimer__: The utPLSQL project is completely free and independent from any are listed here with a complete description of their contribution. Although we are grateful for the support, being mentioned does not mean endorsement of or recommendation for the companys' products by utPLSQL or its development team. -| | | -| --- | --- | -| [![supported_by_redgate](docs/images/supported_by_redgate_100.png)](https://www.red-gate.com/hub/events/open-source-projects) | utPLSQL has been supported by Redgate in the form of sponsored stickers and t-shirts. Thank you for helping us spreading the word! | + + + + + + + +
supported_by_redgateutPLSQL has been supported by Redgate in the form of sponsored stickers and t-shirts. Thank you for helping us spreading the word!
\ No newline at end of file From 25cc8c9053b7675ef9637d24f60b0f4b1b0bbb0b Mon Sep 17 00:00:00 2001 From: Travis CI Date: Fri, 1 Mar 2019 09:04:14 +0000 Subject: [PATCH 0241/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index f9bad9764..b60355574 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.4.2538-develop'; + gc_version constant varchar2(50) := 'v3.1.4.2553-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From be09a1e19ec4864eaec888ab85971f98e01a6ffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Fri, 1 Mar 2019 09:43:07 +0000 Subject: [PATCH 0242/1096] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 50 +++++++++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 26 ++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 000000000..b3e52a19a --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,50 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: '' +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**Provide version info** +Information about utPLSQL and Database version, +```sql +set serveroutput on +declare + l_version varchar2(255); + l_compatibility varchar2(255); +begin + dbms_utility.db_version( l_version, l_compatibility ); + dbms_output.put_line( l_version ); + dbms_output.put_line( l_compatibility ); +end; +/ +select substr(ut.version(),1,60) as ut_version from dual; +select * from v$version; +select * from nls_session_parameters; +select substr(dbms_utility.port_string,1,60) as port_string from dual; +``` + +**Information about client software** +What client was used to run utPLSQL tests? Was it from TOAD, SQLDeveloper, SQLPlus, PLSQL Developer etc... + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Example code** +If applicable, add sample code to help explain your problem. +Please avoid putting your company private/protected code in an issue, as it might violate your company's privacy and security policies. + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 000000000..c54bff550 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,26 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: '' +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. + +**Note** +> Please do not create issues for generic SQL or PL/SQL questions. There are other forums and communities to help you with those. See [ASKTom](https://asktom.oracle.com) for example. + +**Want to discuss** +If you want to discuss your issue, join [our SLACK chat](http://utplsql-slack-invite.herokuapp.com/). From 9a98385a28ba8302f53ae396ca9ea38149627b87 Mon Sep 17 00:00:00 2001 From: Samuel Nitsche Date: Fri, 1 Mar 2019 13:38:06 +0100 Subject: [PATCH 0243/1096] Change disclaimer to be not overly defensive. The transparency we build by detailing the contributions is enough --- readme.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/readme.md b/readme.md index 7563170d8..c602890c8 100644 --- a/readme.md +++ b/readme.md @@ -237,9 +237,7 @@ __Project Directories__ ----------- # Supporters -__Disclaimer__: The utPLSQL project is completely free and independent from any commercial intent. Companies who support the project -are listed here with a complete description of their contribution. Although we are grateful for the support, being mentioned does not mean endorsement of - or recommendation for the companys' products by utPLSQL or its development team. +The utPLSQL project is community-driven and is not commercially motivated. Nonetheless, donations and other contributions are always welcome, and are detailed below. From 6d05b2f79ba40653027631e8ff767c31ca920fe7 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Fri, 1 Mar 2019 12:55:51 +0000 Subject: [PATCH 0244/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index b60355574..0b7d77890 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.4.2553-develop'; + gc_version constant varchar2(50) := 'v3.1.4.2558-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From 3da6d22579f70335cbcee87bad86e531e55cb5f8 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Fri, 1 Mar 2019 14:20:03 +0000 Subject: [PATCH 0245/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 0b7d77890..84ae277a8 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.4.2558-develop'; + gc_version constant varchar2(50) := 'v3.1.4.2559-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From 239abb22d4e5cc8570ee266c93cddbd7852dc5b3 Mon Sep 17 00:00:00 2001 From: Samuel Nitsche Date: Fri, 1 Mar 2019 17:12:27 +0100 Subject: [PATCH 0246/1096] Include new logo into readme --- ...tPLSQL-testing-framework-transparent_120.png | Bin 0 -> 18821 bytes readme.md | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 docs/images/utPLSQL-testing-framework-transparent_120.png diff --git a/docs/images/utPLSQL-testing-framework-transparent_120.png b/docs/images/utPLSQL-testing-framework-transparent_120.png new file mode 100644 index 0000000000000000000000000000000000000000..98a24faf0720e0b1d8a3e3253e8355197eaba1ee GIT binary patch literal 18821 zcmb^YRal%|6D^A3?gV!W?hxEvg1fr}x8RMt2X~hcG`PE4W5L~B1C5`~_pi0jv+wr> zEf>vvtLB(hHOHumQc;pYMIuCkfPg@ila*A1fPi8LfA&Iv1HVF-7kh)>Al=kt#35>? ziBG^^V64Tyia|isCm_F?!h*jeI?L+1K|r7l{QH9(ajLL@fRH1UlN8hNGP=lx4mS~p>Df3V7Zu!g6j*H#l(;lv!^51!IXlXV{J32DcLMVz}0|} z2;cU1ob9lKpKerDV*m341MvM6W9EzcJ`#E{->dcI;t$f|% zIEl{1@be~dYZ$cjq!+Ui3=0*GvdnP$`S#pmofz%(y_!(`b>;) zD8nLV^)2_7hn-1NQ`(Fz60=)dJwzxAUCxw(h?~WQ&;>1`wP8kx^>~el3?~Lrf+@d{ zsPS0{p{rhw+0FCR-=pgsFZ7!CE`bynYmZ-nY&P0W`_G?KeBqg-1hfmA;K(;qIw87X z>QVE8-l2u!ehWq(kPUy$xQ1u?1s98-r*6b7h$tNs2FqsQsCL=j2X@^wh=?>zh#kh) z1t5dwP2JB5o$5B$j;=WrX`3Vre;n=@qBT(Ql#4)*Js#=Za8IM+MIq4Ry->lJ(s6mR z)p}En+O`hGTQ1Srnzpc}RxB-#1>I)gsCcPcl4-FJjr(5!3s%zO}T!6PL z_DEUxrm8paxHD0V8E6SKWaDoZB~xJ^j~}05!5P7XTifFXVi}lR1wXn0*9!OV3aaC{ zQ*jiYDSp~mLY}0?G}-+*NA@SMd?itPqfg5Z+eExLNY~evGVS7udi~0tRff>&bp81P z%Vr{LbMvUst{|j!jvd5HRrV)oq#&5|;2sn3o&;~%=Oc5HK`WB2p#d#i1Y&2&dK4?R zP`SzQ=Kme!&>MqEhCLY!LZC{RZH85w9S`G1H)c>;sXN$FkfIOs06zlao+W#Zr#POt zpMeISild?G-#Ja`?;*m7LI@Iv5q9kzTXf>^$P3&h{Da`FiC<@a%hm9rc1P~vH-YXc ziuXKKEQqV36*FY`hS-U^8W=-&bx0f{`Y{}5ZK}@_W<;{ue6TibYVU2sz?gO~0e*z3 z=f7ueY(|HaZxP$Ms9o|^bg(H)Db>R53~09trKy%d=@UZBYx8d5(Yi*Bg8sJN3SeLO z{97E|)99boZEJ8!B;9j&RsZ z-REA0?U!$_hZZ@syhXE8@&QS8+Bd|JPL6UK?cL%Y1^7cM zQet^!KgKnn(t8v6jN3>w!DdRpx`h4=nHJo|Cx^lr|0P54?Ng3DQzb*%D{@IunTaq< zjl+0u7UiuA7ncFt4fm$_y@Pdfv=*-Y$r;$YP;Q|zjNSnaPCY+IPC zYS!-?ljAhS8o)~&R*xI%YLJ}9#SwiW4)kdWYc6KNsbwM;8qY#6ElPzgkcVJ1E%a$|3i#dIOf{Hw>Sb$;ndFYgD>F71J+LO-KIpUQqgW zS&D)YgmjQfF-{?*S-K6;P*JIK%bFOihm%Ma<`*G$^bZw5 z>lE9m6t6^HmBHRXO<xUm6RQfvi(8eXT|zU9(oX7{ zs#$B&>c^qyO5lWQA*T=0;<>xJa^$`|e&VCrv z8B>4_SM#pGddkq_uMFfg`$qB>sRnNvcsq`9kVqPJN%{>$o5>5tFyxc!A6JkW7l8ot z0HJFe;`jv}l|R_gkwchs<#i66h75YTqCP3yWYMY?lXGJK&!_9oFOdy5t9Ry~BnWnB zg#c(CqFZ6YkY7VLkx8I0(ChJzn|K``f{m&N_iS_qnjL%#$U7vM_PR$ua)Hh^pWVOQ zbK4LAj58B*ZLGM~{9%ogzQ31QA-F|3%jofyjJxJcLrL_fcIJKsvK}J<_9%fspxIGaAh0FT>zd)D+d6$lW zkrS_Dy5o-mPl@l14%^9f%zv5{vr?Y2T{jF3cV^IZZfP*RSu++^^*r-QoTU}xI3M8A z4|{SY>mCn1w-aS3UpX)W((Un4sNmr9bgK}&mj2S5RH1d6Pa?pxxw7q@kpu9rosVHE zyfg?j1d2^{xry_TjQK!w-m_7o(NH7AYKgK(kQpBJ4%DEC}mT&fK zMX8~n!_8wz!_J+2N<+x>UI`kBzvZ*J>~0b0Fy6a+xO8WGV_3Tj*9yV-PwuZA0s`a2V?NpzlH|znaODOlVAWIP$>XF;a|WG2WKD; z8P=_AsPU_}X+a;+=10`P6LEWBcN~$z6NE*;U4`n@xRAy1$%*Z{cX{q~Xfm9R7Zms6 zw3XX1p0&VYexf=<#2q7;&m9d_Pp3;Z+6(_-pZO5wN|S+8yJh~29~XIaD^ zS6_q?{$Vk|lZTnm5-eaUQ1z$0GU-nG8C1E2wyKuurr*=RUv&?ZMdccE;$a-JDo+^2 z99|cbh2z;Jlu`7x4T4z2f;!=?*OSo$*Ae>iVgs+uZjAIN2lMDz3wsj6Wb<4|^KEZh z(IO!asivPSqUI*+D(of*u?ft;dgroyQ=-2-gEE?neKQSc^jEz`&4o6yZJbMjhvDT* zp8G;rnA8K%)=V5VI>!h-C<{4Q`rZ}2RCti!vW454REQa>7DW{^ZgGxv33ggO==V(t zPYMC26^d`Wv}kFT_tQvNY5x~Z2fNBVQHMvXxR?r$ql|j%mA|jX1sqy-$`nFOu6yF%Ub` zIxUcrb9=TTe{#Gf1K~P3B&E2t6ndfyi(uG9m6g3MBVA<^Bte!1hYPYFgk=zjF!0(b z8ViNf;Ia;6@S#7Kj$TmNePKEa()llZmxO-xqj!@FvL;%7@)sa<<2#Sd3s4xKp_`DvI5MGv%kr%$V z2m#~2brI0G48Iv}YMQ|~AJ2NLhwldf%V zXy1o?j}i})t6@|kdBSCZZ}-O(JatRM&mL!>Z#EAd0b{4^<|Cg0Zk8LXO)KyZhb?QpO*wlk7em5sCYqMGDCoxb_PJ zEUCB}l$#a@eE@{q-NyCRl;x$I3#?jm~|9I!3a= zY=msbX~%<`G#`Cr#eg>viBQLOBF!5ZE=w9%+RYCKG4LMcKfyMV>Y*5-8lt#-F`VA& z7wcGwgN?Bt$(oDTNr_KO|H&^h47(DWQBbNekjYF7^~uMp8jGO=>m9**TRX#Jen~g! z9TB7%IU42B8H7C5J!Baw3vJ+u3<-(1zpT0qRO) zKIr*H?V=Cci{lAo>XQ0{3f6|xxcR|dhrT&IsYO)3@D&_ITtb5{dTlT(5%dVS-k?{r zG|KRQZ{^rLq3h|Ru+I^(7Y$j=*T+dPR}cyX8XXX0MfTq+KewN#+Ly>jAPKr+lCN{H zIiDWeVtQF3{5wT0*T0}CuNfu%m_@;78`qJ77wFDzP*X#@FUVTa!)mvt5?fYcqc)+_ z2#Ti$PHT)mEYa6^`UsSDbYu%5o%l2ZyTf@;*2bW3-5~Y~?l9Zoe2|bFkSi%arOAyh z(;9_eMtl)Z7pL`UThA^`lBIA#D@WjX933v*p5!D6$o#68DSoyS^;Mbo7D41=^d4!62omg7ey9X0$Q*LeBbZ>RwvW;kPxE!leQCB z0!Vl75s8bF(U=41;Gyf5N3vE-03Pz4m{hA$7cjf%Z%6?WPe3AGDCIcyzIJvc3;usc z7yRI^I5kU9+mm?UybCsp;8Yftbf<#Y>OI~bbO8@bYiAf+q*3l1{o-EG#U&LWQf@?m zpZJneZ+sF>;VPh*CHNG;X5|>}7}$;CkHL?~599L}jkTu}y2wTJGHLWx(uQdP>T5WN zeVlL9HxFy$6==@Lg}eLu^(rDh@P)aK+6Z#M!s!@Xwj6&tRy&pfR;#SjVi1%N#7s92|zbJ zlnk;iE>-+O*2Tl<^?Q7=U!87@S%0G~G@I2s(i6tk{PCw(+vBU6oWlse3^7NrK|_)}p#vf5G$6 z6sN1fpvTcr?rt!aK;U~v2Cdaa7WXUuG0MrrB=g>Ig7PcJ7nYi_yFr_g%KDfb5!2nl z_Dothhb9CZ)X2T32*Ae(h=> z{Ft{=R#-ivi_Wu}uY1FB3U9hUG)YKk{2^S&7k*wc{^3tvB|}&K9^sI@B}f4-1458b zs)ZWt)+3+#LcaYLz^GIjrBY2*Lw3CkPtfX%e46(6q!Re+K+D>rrtCSzcW~QWi z8ND5gj~JVwsY9)#gD2)gHGC&79or@_sNy7z0`CA&dZuJ!8O3xMV<&kOBev0djg>pO zl@Asv*7;0`lM{F=cRVATk9{vB>@r8KgsZJ(Ge|yfMmAz^EUg%eDKpvBkunh}m&D3) zh+L+aefYT}2Bw-iJ1M>wj9e~PG38z$#6hZ5**{8#bg+Hw+~U2kQxoIkU+|9fapss1 z6F+4Aboz&;AI+L7@) zadA>_(=L{?t7LBC-M~e5*&duM$XsZDRNI<}%ahAfAIQ^SmT+E9hp`kdEbqJ1>FHXD z90SMEx^Ih>Bmx5b@e$qO5B^l4A7L-CKYxgkmdzcWv7W_QP{A=%t#Vu=M1(r-XvYzQ zA`s~8W<9VW7a^WL?O%K(St3_cJ^jwK8%Mvzg3qL{QLDs8(^6P@&-$?n&)@?zr5t5c zAqo1jY0>O9cI+_L_?11n?1!jNJIDUeQrZgVGwiV{K1Y{I`xR*_c8cmxOn##0sZ-5g z?<;NJG-=)0?*SmYLyreA27JW^3YEqD>8`F+eY&IlNgEk8a556;Wd!RJlJ(MF5|V)_ zR(44LRkD|zsHiOulPfJ{WVCTl!eq4G)}K^){z0OvYd0ZT+W*Cf?{hee?nJUqg#oqk zm#C%d;_e2tBS8clb8y8%Bcwzq;JBU`kh8Eh&&iZNQJTHfuk->!#Ksz#CntN!z&G#6 z?g-m`jbdi@xZ{l~=pyZ-e3JpqHJN*}C1|SDzgigiO*&gC*q!y9jEP%YA5FKa?4vp; ztoTP)K#O4ay2u0s0nmjYZjz9;SYGzfzJC3%v9+cDY0Ix&vpzd<0E!IX`s#x{=)^Ev zxA&O534Z}ef{^;o&o#ShonBT}=HgnDso`E_pgWh5@$=H<2OaP6ED9v#9dU1p3*_V zZm3+uE@(5>Z~V}3e-n~dgi%??>8<34M`_hOWM9M0vyU$**S}HWRE5YmN%|Xt3!9!- zs`ptEJ@^Dwo(+A~jD%4}|BfSnO-4%!KwC;Mc0u7qsB)#{7oC8gJwFq5mi5-Y#%My% zbU?l=2ZX%EiDk)u?s*Fh_VfE6^va?~W4h3LE>F)V{mRLbt*~Z(T2fS!s?MGMWjJOA z_5pW*9R+*!<7DN7G_=iol3^pF!~^$VB12q^kxQSeA~JjCV!GG;zQv;nPr;A@tsd~9(V^NY)&7R-kW z!N>IH;Wq}=gnlu@^YIpYhOOlM+}L=XGzfLV2vz)M)|{^*M=qr9;;kxm3m54$r-`cx ze@q7IU`)%gd}KIA3zu1x)7BkJA7Q8#{0MQ3s0jxVpFtdBRxq%UWfRYqoJXk=E!(SN z7C_db6b|TU$3#*NFMO?q?h2y1)*!YrXU<0Zcek3Xo$g?e9OA4{_3`z2Fqoge`)VJ< z*d`>7M~vj+PSdOH)ez$6K6IeGNQJGhmu6Nk`^;3)e223XPE&jf)U3ZK1#_|!XK z+WJ?pQCa!?@fihjWx%;k>0}AR=Aj5|C9V!F1M6|iIcKOKwTY|Z}da^&M(I0blk*BFbdbTJY_%HK>HStON*0&PxQvSTRf=sRx=b#Sf_B* zdCmtO#i?EDQAc3kD)GwlVq9wi*HVWiA|wV1TjqsT~Z52_4MlHWqGt^ZU^JJ zod)qC_D{!lo;FT4_@@(l3G?{pFgK`7X;HO3chWgSguP_b`2%8f#LxpYN3%PkRu7{t z5bQ_3Pqg>cXy*aSnZiPgk4^kqH7Ls8t!;g=MWmCDxSN`rN=cVHT!*5MgSy6^STg?n z0cVx@Oj)Yo`Oh6xJ`(+zk70r(hjAIROPl%m=kX=AL~loquaY=%_-^oM(Ix%J6C)y9 zCn86qes2t-RhZ@}D@BjZA1v~wZ%ITtje=q5@=Y} z4qwaq6XpCGC8^+^aD`S3ajD91Pju=jEe0)C;9BMEzD<}7HnzwRveVxhvUQ=wW$cg0 z2@6)-L&q3xB|XY&023+PHZ;7r>r&(XtN#D7TfaCyha!gvXWCRz~f_-__907qc*w>Yd<7+Ym4uNke^1P}May`ujAYGspcj5%0w-$lo!Q zPHI~*u`TrF2Bi@hc~@S{xFo;?^Gb>a>3BcbAra#WO9hR67?yJ-avx#rZix4UT!ir1 zMp4Z#IQPG+Q5D1;$PD|Mi@-eiY{mUon*E`XqLtaX1g!Vdrv);AJ}-mP>t4xFLgm=y zr*#%n8PXl}Kesd0c86ESYYEBSzQ*q^YAU7Rs!Vg#Id2VIT%`u&+{blXNdqDdVqmm4 zsb-N%`Np`jr-g3q4{8wXe0&uMutR=lrOw8PAV}tTF=&)+T>=-}CtF?i)M&Pvd_3e5 zlEF8NKY#a1sI_X1-f(j;62igs5N`nDi19hZP#*2CR`jdLPMv0n!bj24Y3hmm9*^4; z`UHhqk{jN!yWkNyf;&I^(?(l~XO}toJr^~?y}^Va%d!zUMl({{(oxU8djih&4E)^Q zNU^npY}S8lKx224hr~eS4dL`C9zji~Oc6sVF25$bnY0l!l{CtE90O5(T7m&8Rd_9g zcB~FnSvP75*JSSU+;5#WZ2IxYv8AV1xnx=aDl35^x5Y|&9Rnm13aH#B;BswFU0gS67Df+IuiKsR$JFltD4D_z%m;@XxAj${e-D5{4UuYii&fV3IsmfMi zQV}U}=Whlx(CH9?a9|;uq8Y3!&gDT=IYGu0P?eFqm~=ddvpp$d#5c_I52tC2ZT8`2YLV?PMNz=U8R|4un$e@vt7l${KUae< z!h*V1W**koa^_}w8+#=e|7wQy{OA+Sr~Z_m>LTUqTKrm72!~NOKd*1b_>A&GN&D(= zS(!3=_+W1E=*`nqfg$D@#ecr_4I({Bn3k0*H?%m-`!grm3C!JNlce` zwj0+r#f0QlY*Jd9{f+{ML&Zm4`p``y_ZT=0+~$=uABddmVf64{s1^hvNToH|k=ooD znYzMV5JjST5M8e9Aduz!r*)d=|9^a_M6s88rix)V;V3>mi23VkzjXi0Qg9dmc~e9d zbCE&E*v#R*2>>Eg9oTJiVzxs(Q@dlj6S(uaw zW1t;Tttp=F@}x(x+SG#%2Wk24^id_4!F{6JnkV11s1OA374%|&6})f;xZ4K$pMn}v zDo+xxMw1b6CcTQ^91e1|>O-%NZ%^Q(D`~gS%i=H6@dk|@jDa`}AGC(h7{&FVdXKyj zo_yiJgM8P+Q&Fmy zw5*-#C+(qSo9aP4?zgU2xOBQ&6il@4BAq?2j)sDw$=};Q_S;p5;{VJ{(JcVh2vi3^Q9hd&F$Jj2&R`h}b(geBG$F z4|9s#pP$jw{$483tZnvySosMK4(@!5OB^8AzZGOVU%tg#U45YuX`BXN?k|(Tljs7H zD9V*+{}Ut!ZA^ubH=wJ7x}oBN(Hz#BFB}{=ttK;t&7}p3h3P2fEI!4uL z9#X+Lm$Q_qYk9Y-0wEAe^#PxJz7stbZ{hKDd8Uf8KSoy*MOF~)@bEF9{eD#zd%EXf z0CVSPClq~lLELf1v=V(oS!P@@48h}D;2h@_D+s-Tcw_E*L@t1`FqxiVL?-z~r7P$i?; zNOf$_Ns`ui)Or%NJsnAN_7xBp>SQzE;wQY;`%^#?SHN8!eEqhYT8cKSV4!w*g|mN? zyYi*TQRHI3rkJ#W2i{!Nj+#U?|Boe3)HjXsM#` zDj~nO%t3%oJRIUt_cnyYbG|tLM-G>_E4`=6&trq8=si+iCGxCDev11QaMh)CKZQQB zJzMX3z*7$jy|<;l+S69d7S08CNieRiJq69R$Qyqq4M|e_v(&n_wq|?J#f^r-SP#{*f&SbX8)d>ju``PsvlzC^iKy=L>{*?O~~CLKS?XKMO{zDDWEDVUH`CFDMRw8`UPR{GI$l#f)>{SxeVTR3 zn$vIhgk|il(%xY9`F$hV-9xbdZzfyg`MBCK#G`z2?eSjB=NUg2^bSDP#EaYLTLOB1`Js}C+* zSLYu+%5bDRqg1bjF<|ld;W^>~yGCySd&Y={&ThEV`mM%ETN@?N{Q88^1oXI_5Y2sA-WdtJxyA=J@#gLK7x8dH;CIp#Hg6ffq#AApci zWTQ}Yd~dZKMWo?Su!`1k`F>;gTU*=dj~=(J5S*Urv~j$&d?)6f7{_4*vCG;H;;$KN zOR|!Vc+v!WiSPjM=pc>E`AtVVrF|mMCem3B47e3200Ky<+$9B!;-02Ss52c+L51iTV9MpR>d=BFuMk6X#mcB1W%aGle=jaGAYA^xn6V#w^ z6&J5f-$Luvbmk7Tp=g}asT6(KG-ktR{>UTw?iKf7~hIs>qt8kD8}<6~ziTi8Qmkp*g?w)GA(h3Z3xg)Uss zHf&s$vIP<|kF56w-<@;)k^76i@Atc*5gg8P$et>LaclTz+NS3Ape};In;R6|(yhgD z|Ipeb0NJirME-7x@1v;1K+kW*LeJY7yNWx^7ERCgeml=czn3fVStEW$#8>Br1&(TmVQbMTklMvRlgp(r}H%yGicYv1eo zbkq4B|J115N`2XQ*e-Frea#aEhty7dJ>ySwgVUw(GZm*o2vHb3i*|~|^ za>9`o_9 z8)jLZVgRwtC`sc%Cl#YGYvjyz?Is^_%vZpUTAF%-LloKTZ0-*~Jub6-Vs6Y&mV^8A zSNUAtzd6k~0+HQ`a3@NYO&xvXj=5=6re2Zm+MSKp&KzfZuo>kEu1HaRHiy* zqhH?_8u#LzvN$Z|D~p(oo9&TsN#?Yz`aO0~FC>8e7`~)@1-aNOH?w%YA-trsJqRyC z&s^7D*b}5E({V#l!Y5YBf=5cG$`704xi#rDh5jB)?6i|vLcVdX)@I-sfLsSEykC(s z{!KZi;+c<>8YQiGUQ&Hx6mZw6$y7vFVx*>}QCoEjru`|vI*BF!u65zxEcoeQ_YxV( zbq-)wd}i9!s4q2`EsWU)@_S9X)18|ya+%0F5?NQ@=ULfmxZFvmt9$QLivH8sCyUE9 zQ7GLy?Du$xS9%R)&d8fVVVH6sR4 zX?{u*^xJW&QoBBDghR<>cl%rejjAkb498^2nh577ARZyEUWhL7D%qD_f68w|uz>6k zz8rGrM$_(69I+=cY-%w5`~rJC0HllLystF!F3F&VHI(CMB{TIOH$-8ay8oIQT3u6y zg8!qWsQ#dqF-Su?Hhse1sHC*q`t$TFl+1P#0?)@NG;1dsxR=4lUuKgEQ;b8<`84B1 zB}j$^DpX&Awo&QvpGN=4^vRAwJNPRe$y7qHAprwb6ifN#7}YDg$Deu5C7GZtm|?`B z0t7yJ>+wcg)&k}pBef1!0hx*{ytk6h3NyNsM`;3&)UHnH=d$s3=GewmubUa9o=>?W zd5$_r?Q<2>_D^fzfG#Ih=lpQKBDHlqoyB>?$7B;~IijVlPIzCcI=g(!W7&&gC|AN^ z_J^4_v36(d2xv7tPDJdu${_OJZSjx0-#^{fQ<2|F4@}_69%~^+{-5o`l;d?=_1m01 zKdj>CQ$AntbF4xd;-F8_4yTK_2Y1xKMVt7O%+6C@k1vmvMD5WD7zY)VYd$`r$5h&u zsDOxm7MZk{nxrUeGdH28A}Tz$gQ>Zm!fW%fPm>vZclxqddE^dZ@|;>U#f!9Rg!eQ* z!3OzmGH>?wYBEUE8*v&ws9Z7*FDl4Se^uD)zm-)wCa!%MX)N|{|~B*kR%`+xf3rl_eUB^8;s@G6La3> zi;zNBtgamI1WDMN1ZOxvSVakLK_|zcj<(XPA7kqK_vyxy`6tZIgz!~W?04x(Iwo(J z-BWza;k1Yvu4O=ZXipLYk^*V>HIG(i{XS;oFLR3>Up84#xS3Vr=HRCj>j5oV@E-hU zRQ6l}`mUsh^-P{XI$1GO)Qa2TD~b1Y7E!u!mAv>2k31ZToEnX+!(f%ZGeplQpRtz; zp)R>5SC{+0!}QO|jOgVy3B6Rr-k~CgP*s>pwAZqs*#S(JST0Qv|1da^SHbxuKft{* zs*qtQO_{6#E#?XdJqGuaGT(ov^Pe#8@%ewE{mRYSJf%xHxQp~hF>hH@lRw!-i>#9Z z_<%JheFYKyn$)>P7+ge@?|&dN&a6*WwMBSbe?@GU=5OG1`@;lqr4e!FM^rFGD*3-V zgZlgf283`t3GN7emG)799|m&EzR+5Mx&Gx-yYWB@IR--g_jWAVEo|sNx!*1RwV3%3Hn0Tq}P+|I?hCp>e=K;0E}ptSFzx>y))L-3ZX1z+-${W1y~y zR#jcTy%}0$uViSxwe8=M#R;QH5H%nvo&>j|b~*rQIIX7r)P@+4@Hu*VgPp#j;h*5i zhjde?##W=Wqu^tef2xB&+-o?R)TQn^FdxbN&QB0?AD&d*UB<-5r6grOv6TWF{wzjRzsN)7%5E-+Sh74>V#Xt*7|K1|y|AAjn zE5CFm``mQsyS~K#whkE9Q$HR`<8KJEi@p;xHx7@})z45!iPhEBPCmDzTZLuDDi3bUph7tYB>ne)Cd%oK+7BlFB@^EN z!h{x{HbJ}yX`Uup3zJi16h<25e1|^wBSw(223NH9|3rUyB@#{&2C%TF%=#+RAE;aX z%02WaX7h%giC1nuU$RYV#k@JBbQ8-bWnKpKG-9ACJ;}ir4epH_8F6;4>H+Cbl}&=y z=)}SHDC*3iN2#V@u>;ONrpqSrZL|BgbS(RS0AypasGz5tT#--`Smm9(Gx&TTx_|;n zWWKNsJ%DQSU&ZubP-}h#K)?b8F1!np@WO;#s;|sjh|iwf~xJa{za6!5;Ck}YC71Q{yZU%k>0?a zS9%=NKj$kk1v~?C=2=h9YVCr}&zb-2q3Ohy21S5`jX)Z<%MP)y@8vq#WWI>VGjksY zr}bth4c!uvYWQ8jNEMA@2spF-+fpfW#*kVVwW;Ooa4@g`@r6k*(Uvjo3MYsu#5wWb zweogQrF9wseBFkL7wjjiLaj|ukYNGo#B%yMhVh$rt`BS%jz$@`#?dCSt1zCDyhq!b zb`2o(L?;<9`A=A0#pl+yG!#>Dnb&68L%pe&DS2={XaznTOwgK%#r44*3=PQ-U*IT5 zV=EEdc3|M`Efe^vK3>OmeMUT}vdY$AV|_ro#yPb-XU3$^v;vnVf_NmbUFf@tZ8`Sw z*ejZ8pI!>14)D0%y*PWn@5>PI#qKKMW1+B`+!RU8yXAQ`KYO~B4?-tB+IV#LA&7siXRS*)7FQ!JVD;7wMc znx=%S>Lx#lG?0ys=*{JcB!MuD3=MQ13U)PBqj{LTULu>SK)?(Io6-*rF z(~aj5Ky&I(w>}KN9xT#6Pdgi_Yl+WJ0B$PBu`zBw$6!JmC>yF@z9t?0_>NL;JtN(Z zNDpw3KKC|^jB)M6Y_Qj@!c-6AfYYF0g>!wU1L)@CZLAem+Y}4bRq>@U8BN;tiea!S zzD|=oN&yH19RXj+-?-@uFTTbu-~T?^_=v~wjR!?Rw|^`oP6)AEPv;CKd}1|fy{2XY zHQ5l_qm$1*&gAmco-QRz@oWrUiPjr>$GUADdFPFQ99Q({sR&wvl*5ft<1w*EDx5Z6 zzG(z)Y}SfPeV1_n$ub(Fb*XMozJNurYdm~5cNZ98PnCz?*G)DyYnpmIH)p~3Iz zHn%RW?ZR0x+CPX4Z&Jie$t74mKIzB3w-B%0!};=vC7W6N03}Fxnmnc6z36Ut4;he? zjJMXaXLVBxCRva~+FdkKq>%Akx4sQaof$A~O|d!Hy?tNn?RB|3nyEc4w=L3Xb*4yg zd6>JF7!@3Tiu-v!Aggx%qMG8R*oi|x%@ZL z1u+ayM(;2E98JD%?snSwbQe&v9?!8Gi~rxS7gKNI69q1Ei89r0k{U5+s8juLrgoGk z?UcZJ@V}p9_Vp7vo%aTF?tT8z-zPULN- zW{i$>&?(^OI;^{==h62q2OfZ;9d)C~J(RoW^c^m`ljC8!K{feSi-}9o{gA7`?GcF# zq-=;M#fW%-WKMphD6*cw8}tp5be`SWRsZu=bT9sw$G;c*2d=MJSH6YNg#i+t+bx#< zLQeB#Uj@E+Z7Lo#-LUSr>9rw?b{*1}qxYXZIn1b|0hCiTMG9He@*&d(bOBn@u+qe;rWxw63Tc`dGzZk)B~@%)ryk$liGPIAUf z$#wJJ89fn7`nEW8=^O{0BpRqrw;#89cinC9FcTvL&Oj9*C_Q^o!neVtE);XE25l1L zaS3L9w#7?SXslnfFs}TVx*7aYu`zipMor#Qb*>vO(#ct}%<5f8Sd`g(c+ z_&t_H)WHvWVM7)tb{WxIvt)sPJH2LQ0W^)cXHP*qjFG-yaE;T28C$j=*K3h_ot^~V zyNO&rM~M!Vb$7p|+|lP)c)MWPUtVp2n;MNGAA=r7u1IkhnaKSK_j8zH!aEVq9wA@f z0Vho%T-~8VQghn9U%_*C5i+s(m?<+bJx9Wm{%s`QQy4)IJ6yti6ZB^;Qxj{=xgtLI z$LXy#I*Erz^`M-4-6xpwYlj0Ch@PXNRLjz&Zh-+V8}d8ec4?oB-pCd3IL3lhlJpi- zNxhPf0`$Q_{UArSAgn*klg>;nOwSt!u3)Vn(amy<8kcNL!-Nr%gP7jHKb#3bA#d_t z-z1M&g8a`Fn?OPdV>9Ap!S)`?g2q@ScRWl+ac-jmE`F(tt?moLVBOa-0#Gm}BA2ye zd)Yp@1$w5pfE74;sVjgS#6FWDH&XG&I*RhruE2J&$5Xw=+q?6_;yw8F>Ku&1X=7+geQ82LI$joH=6dnj}(sT@z>(xwfyD zlH8>;=0%DMO~}@R`|efDgO=^$2|1W-iEE>n;UMM^T6BFUT-Z~aVBCjezusDpIo#)S zj7hhU3^EXrx2C`36AR&1Lnq1_XJXHz`0X->(}ja6}4m zl$!`xd{FficOxLDr63hoW27eE% zk?u?|&rEX?e;1y1LpbaDWP2WC$=8NkbTe$8e^kaJKEaTv3^^JiMEPDn@=Dbg2fvmm zO^u50h`#Ap-;#XvOGGSR!snbOE<~F9(R2>_#wx9gLBt9I#5K1~%#0>Oow=#hk2cg{ zo`=9PESD}|LJ5l7!oI_K{d~#-L;_4C1OEcGULP#}g#x!aFSOlUr`==kK@sGbUxh4# zPB=k`+dR6yX3K_M*zQETJ;(}>f67mz!~~7@4@J+#N#j}zW!!aUZ0nwUzn9MUG9q@- zTA7%bBpj+1gO(X^q?IST>Coe(A;-r$=GlRGn9~B)Iv5{tOotK-@FAC8xnij7S{A^i1!?k7imc?%k&@fuDU>wvj;KJ2_y6pIz|^(+?N# zi6;)9UA&R+&rScRz|jn)aEk+E_Ve@iVJ92l?aeXIb~j9qwQ@RyZC!d$7rEbkE80n{ zc`NGRUthBtsm_Eb(Lm>B0n|U%^E&OSd$CV z>C=-t^w1u{l{|@IW?;Rh_3T~c-w0l9P-SP6VKRQw`7mYbmf@*t8IX=A_GaDq?4yjb zYKh($!z&EV0NmcL*>w>Yf+-0OYFKp1Ti9+WbHzKKML{Gw*R!iD2rUo96iT{2W{FDA zMj2nT9|qe7dc6Iyci|JnlhBUDcAl~la6;OT$*PKQDH2>yr!s@ByD)@cjWSqHI>CNNVry|YhLm%-5?IxGbNh>7Ib0tS3Dks_p zCzf4&c}Ryi2zf=0qr~dw>PNB97?g@rUh5Mm?C-(Q@>TVyYr5j=h^Y2<{|EoUVN@=h zVpBKuL^8)Ls$={CrQjI)KvdeW^gtT3z8Cb))=w6#32|3GLK-d;(2Ifxbht@=f!Kb+ z8h*@!#f;Kt*S7Vm6u0HTqnoBxYPf~(d+$on;o;O|S1Ch*^w6D{{!vvv!xx0H77k?csLXJBwLwQ%UZ9wH*3Qd5c1Namf^v6qJ_XF=VP#9Tv zUrN4&={NSj?=6rloVR6leGiHJtXzZ&*Y zB{gpMuSag()XZL;M3WR37PyQf?;D>E3hL0O0q7>=b z1RKsQ#_QYn8kA!Hu~1+%;4H>3?cWp2y%*>&x9TY3TrMgkDs2ayO<0si+p(?| zTtw^jlQv$78O3=?L*ZwNd3AWntI}*Fy}h;1&~5Z%ILf%;UPDsgvJvx>?~+1mG!h0m zdXxFdpr3AiG3K1{PM>59GFJ3^c`Ut_TA_v|-O(jT<2A{5`C8lYIX<+{JLi@9wr4*9 zw{NZxL=auh``uba?`|}-mVM1HfB9|Z!*uklaPn5!Mv$P%WCO2v-X~Y|CFZ)8omT|uOa`&F;KA~sRwzqwh4TLSjOw=*@%MV9!7!{bnh-t>iqQ8N zKwzDL@eq4$6>O;JcgKMAaZ#dOVaa49G0)0`asAAemEq7ETPn#%+o78}Mo| zP*1+-Ja*PtjC}gWlD?*n*AF7*#Uy505;Z69o^nA6u1T~b1O$eZ?m}<=4tAXz-5tuo zBRA?)IhTCBA#;+ai39HzHT9sb)mkb6h3;6MXZ!!x%AL5gVK8tUcc<-0g#{(V-e_456eB4@ zN`tMAzNL+0n7GoKBux=@#F@I1OoO(gR7Iv`XQ z;r%y0&-eGkKs6BVC`u4?$5Jf(UP><1cJVmp2%|R7VMjH++J&fXt#?l%yWcbvpq(mJ zf;aLrnu6NvwSiXjh5WtomJ~_@KAoMxYSW$0==Q8@MX$8cfOSOsFAR;7trz>&eeJ?=hIB!)!H$m5VTW`p(_}xeHi2kL zWP8|Fd&gYumVjWTgPHoWpj(Ath?3n@nbNwPW*!9bfaFIod`NpKVE z#2)*kBe9z}P6{?jcyZbOYSkK8UC<#3#Xfn#@;<6CkQtj1xKFGbm8ooJ(lXVdYV$7Z zVYqm@_!!Sn;%*tZ>5I>ys!d@z)#$TpN`IZ>=OO^TTFQ%U2bM;4XOC0%B+`TBo_{nw zRu41zl=N&y5gBxFVSrWwb3;|+7Ya)i+>Gq@ zRj~5w6RgRyd0fwpXE9%Q-W*tJ1WCvvJ6)oS=iv?nLL;QOpo>Vr%bOTOiwXTmw_#@5 z&q99XSn~n#_CnOeyBZA!eBz;$XJ0-7YmP(Ryi9BapH8ix#4dL?nnMV5v4OlYiAZ#W zcXnzcj`)nY5Kh^D6tk>1Fh|S78%;bb0=mc#TZII2xa_r<=k-xzIyUBXMay{kW9}hT z{gODwA@5?H#UpbiVE6=XxBZ8)P)geTd^pl{auk};SLlS_YLQ*a!lNEBLxxqWEX{;t zH`txuS?4s6o{4xk&4zCPtPL=xUNa%=F0tQa9cojl5JuLDn^`uXn2jY4b9AWS8un4F z9O?YQe3JYqXlizKt>TB_2P!}}E7xoHU(`s{P9aM-1?;RDxoNpOvXGtzaqUFS9#cOs z?d^bWUdg8CYW*e+U8TUV>- z=bk=3RNQVaAgW4r^>X9A9}6Y(^V;9e^`vboC!a`d^B2QO$Oy@q7s|t_#-VHVO8e< zUG_>f{*Tk05FcU0@L?1+?pJCiV#?}FGe}pz`YG<-8G=nO z<0F_?_#l<}uWg^`bj&YiW~+xko`Kpc&7=)oY7BVUj)>CJnareOTO)VJvtpABLOhKG z97!DxiQH4s_2K!IDi>rkTz4b0(qnQLxtDbzGDmC*X?mA2sG?SIpP|mB1)*U%`j5I9M?_P<0SG{<9XUiA=%qzADlF!wqJ{=bojjgg-)V{WSG#!r~BOFfaur0aS)Ch zmIQGssYa`o^+_+NQ@jFn;UZ>p_P=Lgm7on%2GfMtZ(IhJf*pYqvsDMCC2s{VkFh+? zC0<2Xa(>y_H!Xjph%C;EXnka5X*F+iqsz_<*G)*89tQ(4y_7ave~O`H8I8nK6kI3V zijEzzczvfOQ2n`2)V&fdyG{Rsve7(-j*fv1))*jfK^NPC6h2Erh0(K=sXw)L(BGp@ zoo9{H50M&`Zy5#f*fv>D->Ij3TQ92Y%tHLj)kGJX?sqBMlX_6dWUreZf;>{jeb|Vw z44kN6;emR3a7z&e&53qhcMNFtbiICkZkb~20SP*;h&z%VQC018g_ZZ&#}Uc&86o`X zuPg6ovKZlHKJq9)m$pSpz#&DcCtB7p)`9!+$hW;~*OipNgtmxHujQnT{<`4Vn_k$Y zjZPIyPJgw^+4#hNrfZ*gs-Pr zj|qb}B7$%XUxB)^ilkrO*d>-$+r97MaWT%z>BQE!N$hBo*U7CIRt1}lUqB-uNR>AdCt-JfeeAu|*2Mf+iHvXiJ5k%xagv?%Pt4UdopZb#IzycxC>)OgKS^wjs zD9YbxRnhI;EYP9z3!uySVTk5`vCKstHai)Y{A%uryY1@V&B-hOzjL7@wQ@x{waFCc YqiCQhrI^N}>m)h1D<00jUk* | Powerful PL/SQL Unit Testing Framework +![utPLSQL v3 | Powerful PL/SQL Unit Testing Framework](docs/images/utPLSQL-testing-framework-transparent_120.png) + +---------- [![latest-release](https://img.shields.io/github/release/utPLSQL/utPLSQL.svg)](https://github.com/utPLSQL/utPLSQL/releases) [![license](https://img.shields.io/github/license/utPLSQL/utPLSQL.svg)](https://www.apache.org/licenses/LICENSE-2.0) From 147a5066fb4c2540b7d64d1b2fa6008e41a3f9b1 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 1 Mar 2019 23:25:37 +0000 Subject: [PATCH 0247/1096] Fixing issues with null and empty objects / collections --- docs/userguide/expectations.md | 54 +++++ source/core/ut_metadata.pkb | 52 ++++- source/core/ut_metadata.pks | 15 ++ .../data_values/ut_data_value_anydata.tpb | 82 +++---- .../data_values/ut_data_value_anydata.tps | 8 +- .../expectations/test_expectation_anydata.pkb | 218 ++++++++++++++++++ .../expectations/test_expectation_anydata.pks | 56 ++++- .../unary/test_expect_to_be_empty.pkb | 6 +- .../unary/test_expect_to_be_empty.pks | 2 +- test/helpers/test_tab_varchar2.tps | 12 + test/helpers/test_tab_varray.tps | 13 ++ test/install_tests.sql | 2 + 12 files changed, 464 insertions(+), 56 deletions(-) create mode 100644 test/helpers/test_tab_varchar2.tps create mode 100644 test/helpers/test_tab_varray.tps diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index a7d3ef5dd..ec2934615 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -941,6 +941,60 @@ drop type departments; drop type department; ``` +Some of the possible combinations of the anydata and their results: + +```sql +create or replace type t_tab_varchar is table of varchar2(1) +/ + +create or replace type dummy_obj as object ( + id number, + "name" varchar2(30), + "Value" varchar2(30) +) +/ + +create or replace type dummy_obj_lst as table of dummy_obj +/ + +create or replace type t_varray is varray(1) of number +/ + +``` + + + + + +| Type A | Comparisoon | Type B | Result | +| :------------------------------------- | :-----------: | :------------------------------------ | -----: | +| t_tab_varchar('A') | equal | t_tab_varchar('A') | Pass | +| t_tab_varchar('A') | equal | t_tab_varchar('B') | Fail | +| t_tab_varchar | is_null | | Pass | +| t_tab_varchar | equal | t_tab_varchar | Pass | +| t_tab_varchar | equal | t_tab_varchar('A') | Fail | +| t_tab_varchar() | have_count(0) | | Pass | +| t_tab_varchar() | equal | t_tab_varchar() | Pass | +| t_tab_varchar() | equal | t_tab_varchar('A') | Fail | +| dummy_obj_lst (dummy_obj(1, 'A', '0')) | equal | dummy_obj_lst(dummy_obj(1, 'A', '0')) | Pass | +| dummy_obj_lst (dummy_obj(1, 'A', '0')) | equal | dummy_obj_lst(dummy_obj(2, 'A', '0')) | Fail | +| dummy_obj_lst | equal | dummy_obj_lst(dummy_obj(1, 'A', '0')) | Fail | +| dummy_obj_lst | is_null | | Pass | +| dummy_obj_lst | equal | dummy_obj_lst | Pass | +| dummy_obj_lst() | have_count(0) | | Pass | +| dummy_obj_lst() | equal | dummy_obj_lst(dummy_obj(1, 'A', '0')) | Fail | +| dummy_obj_lst() | equal | dummy_obj_lst() | Pass | +| t_varray | is null | | Pass | +| t_varray | equal | t_varray | Pass | +| t_varray | equal | t_varray(1) | Fail | +| t_varray() | have_count(0) | | Pass | +| t_varray() | equal | t_varray() | Pass | +| t_varray() | equal | t_varray(1) | Fail | +| t_varray(1) | equal | t_varray(1) | Pass | +| t_varray(1) | equal | t_varray(2) | Fail | + + + ### Comparing cursor data containing DATE fields **Important note** diff --git a/source/core/ut_metadata.pkb b/source/core/ut_metadata.pkb index 630adfad3..c1193a2f8 100644 --- a/source/core/ut_metadata.pkb +++ b/source/core/ut_metadata.pkb @@ -274,15 +274,63 @@ create or replace package body ut_metadata as function get_collection_element(a_anydata in anydata) return varchar2 is l_anytype anytype; - l_nested_type t_anytype_members_rec; + l_nested_type t_anytype_members_rec; + l_elements_rec t_anytype_elem_info_rec; l_type_code integer; begin l_type_code := a_anydata.gettype(l_anytype); if is_collection(l_type_code) then - l_nested_type := get_anytype_members_info(ut_metadata.get_attr_elem_info(l_anytype).attr_elt_type); + l_elements_rec := get_attr_elem_info(l_anytype); + if l_elements_rec.attr_elt_type is null then + l_nested_type := get_anytype_members_info(l_anytype); + else + l_nested_type := get_anytype_members_info(l_elements_rec.attr_elt_type); + end if; end if; return l_nested_type.schema_name || '.' ||l_nested_type.type_name; + end; + + function has_collection_members (a_anydata in anydata) return boolean is + l_anytype anytype; + l_nested_type t_anytype_members_rec; + l_elements_rec t_anytype_elem_info_rec; + l_type_code integer; + begin + l_type_code := a_anydata.gettype(l_anytype); + l_elements_rec := get_attr_elem_info(l_anytype); + if l_elements_rec.attr_elt_type is null then + return false; + else + return true; + end if; end; + function get_anydata_typename(a_data_value anydata) return varchar2 + is + begin + return case when a_data_value is not null then lower(a_data_value.gettypename()) else 'undefined' end; + end; + + function is_anytype_null(a_value in anydata, a_compound_type in varchar2) return number is + l_result integer := 0; + l_anydata_sql varchar2(4000); + begin + if a_value is not null then + l_anydata_sql := ' + declare + l_data '||get_anydata_typename(a_value)||'; + l_value anydata := :a_value; + l_status integer; + begin + l_status := l_value.get'||a_compound_type||'(l_data); + :l_data_is_null := case when l_data is null then 1 else 0 end; + end;'; + execute immediate l_anydata_sql using in a_value, out l_result; + else + l_result := 1; + end if; + return l_result; + end; + end; / diff --git a/source/core/ut_metadata.pks b/source/core/ut_metadata.pks index 27782589e..832d48b6e 100644 --- a/source/core/ut_metadata.pks +++ b/source/core/ut_metadata.pks @@ -151,6 +151,21 @@ create or replace package ut_metadata authid current_user as * Return fully qualified name of the object from collection, if not collection returns null */ function get_collection_element(a_anydata in anydata) return varchar2; + + /** + * Check if collection got elements + */ + function has_collection_members (a_anydata in anydata) return boolean; + + /** + * Get typename from anydata + */ + function get_anydata_typename(a_data_value anydata) return varchar2; + + /** + * Is anydata object/collection is null + */ + function is_anytype_null(a_value in anydata, a_compound_type in varchar2) return number; end ut_metadata; / diff --git a/source/expectations/data_values/ut_data_value_anydata.tpb b/source/expectations/data_values/ut_data_value_anydata.tpb index bfd907562..2000f4eb1 100644 --- a/source/expectations/data_values/ut_data_value_anydata.tpb +++ b/source/expectations/data_values/ut_data_value_anydata.tpb @@ -15,51 +15,16 @@ create or replace type body ut_data_value_anydata as See the License for the specific language governing permissions and limitations under the License. */ - - member function is_null(a_value in anydata) return number is - l_result integer := 0; - l_anydata_sql varchar2(4000); - begin - if a_value is not null and self.compound_type = 'object' then - l_anydata_sql := ' - declare - l_data '||self.data_type||'; - l_value anydata := :a_value; - l_status integer; - begin - l_status := l_value.get'||self.compound_type||'(l_data); - :l_data_is_null := case when l_data is null then 1 else 0 end; - end;'; - execute immediate l_anydata_sql using in a_value, out l_result; - --TODO : Refactor - elsif a_value is not null and self.compound_type = 'collection' then - l_anydata_sql := ' - declare - l_data '||self.data_type||'; - l_value anydata := :a_value; - l_status integer; - begin - l_status := l_value.get'||self.compound_type||'(l_data); - :l_data_is_null := case - when l_data is null then 1 - when l_data is empty then 1 - else 0 end; - end;'; - execute immediate l_anydata_sql using in a_value, out l_result; - else - l_result := 1; - end if; - return l_result; - end; overriding member function get_object_info return varchar2 is begin return self.data_type || case when self.compound_type = 'collection' then ' [ count = '||self.elements_count||' ]' else null end; end; - + member procedure get_cursor_from_anydata(a_value in anydata, a_refcursor out sys_refcursor) is l_anydata_sql varchar2(4000); - + l_cursor_sql varchar2(2000); + function resolve_name(a_object_name in varchar2) return varchar2 is l_schema varchar(250); l_object varchar(250); @@ -79,7 +44,7 @@ create or replace type body ut_data_value_anydata as return resolve_name(a_datatype); end; - begin + begin l_anydata_sql := ' declare l_data '||self.data_type||'; @@ -98,7 +63,22 @@ create or replace type body ut_data_value_anydata as end;'; execute immediate l_anydata_sql using in a_value, out a_refcursor; end; - + + member function get_extract_path(a_data_value anydata) return varchar2 is + l_path varchar2(10); + begin + if self.compound_type = 'object' then + l_path := '/*/*'; + else + case when ut_metadata.has_collection_members(a_data_value) then + l_path := '/*/*'; + else + l_path := '/*'; + end case; + end if; + return l_path; + end; + member procedure init(self in out nocopy ut_data_value_anydata, a_value anydata) is l_refcursor sys_refcursor; l_ctx number; @@ -107,20 +87,18 @@ create or replace type body ut_data_value_anydata as l_cursor_number number; begin - self.data_type := case when a_value is not null then lower(a_value.gettypename()) else 'undefined' end; + self.data_type := ut_metadata.get_anydata_typename(a_value); self.compound_type := get_instance(a_value); - self.extract_path := '/*/*'; + self.is_data_null := ut_metadata.is_anytype_null(a_value,self.compound_type); self.data_id := sys_guid(); self.self_type := $$plsql_unit; self.cursor_details := ut_cursor_details(); - self.is_data_null := is_null(a_value); - self.elements_count := 0; - if not self.is_null() then - get_cursor_from_anydata(a_value,l_refcursor); - end if; ut_compound_data_helper.cleanup_diff; + if not self.is_null() then + self.extract_path := get_extract_path(a_value); + get_cursor_from_anydata(a_value,l_refcursor); if l_refcursor%isopen then self.elements_count := self.extract_cursor(l_refcursor); l_cursor_number := dbms_sql.to_cursor_number(l_refcursor); @@ -174,6 +152,14 @@ create or replace type body ut_data_value_anydata as l_result := l_result + (self as ut_data_value_refcursor).compare_implementation(a_other,a_match_options,a_inclusion_compare,a_is_negated); return l_result; end; - + + overriding member function is_empty return boolean is + begin + if self.compound_type = 'collection' then + return self.elements_count = 0; + else + raise value_error; + end if; + end; end; / diff --git a/source/expectations/data_values/ut_data_value_anydata.tps b/source/expectations/data_values/ut_data_value_anydata.tps index 15e5bfaca..264127fc6 100644 --- a/source/expectations/data_values/ut_data_value_anydata.tps +++ b/source/expectations/data_values/ut_data_value_anydata.tps @@ -16,9 +16,10 @@ create or replace type ut_data_value_anydata under ut_data_value_refcursor( limitations under the License. */ - member function is_null(a_value in anydata) return number, + member procedure get_cursor_from_anydata(a_value in anydata, a_refcursor out sys_refcursor), overriding member function get_object_info return varchar2, + member function get_extract_path(a_data_value anydata) return varchar2, member procedure init(self in out nocopy ut_data_value_anydata, a_value anydata), member function get_instance(a_data_value anydata) return varchar2, constructor function ut_data_value_anydata(self in out nocopy ut_data_value_anydata, a_value anydata) return self as result, @@ -27,6 +28,7 @@ create or replace type ut_data_value_anydata under ut_data_value_refcursor( a_match_options ut_matcher_options, a_inclusion_compare boolean := false, a_is_negated boolean := false - ) return integer + ) return integer, + overriding member function is_empty return boolean ) - +/ diff --git a/test/core/expectations/test_expectation_anydata.pkb b/test/core/expectations/test_expectation_anydata.pkb index 15de20512..e422817a8 100644 --- a/test/core/expectations/test_expectation_anydata.pkb +++ b/test/core/expectations/test_expectation_anydata.pkb @@ -608,5 +608,223 @@ Rows: [ 60 differences, showing first 20 ] ut.expect(l_actual_message).to_be_like(l_expected_message); end; + procedure array_same_data is + begin + --Arrange + g_test_expected := anydata.convertCollection( t_tab_varchar('A') ); + g_test_actual := anydata.convertCollection( t_tab_varchar('A') ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure array_diff_data is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + g_test_expected := anydata.convertCollection( t_tab_varchar('A') ); + g_test_actual := anydata.convertCollection( t_tab_varchar('B') ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + l_expected_message := q'[%Actual: ut3_tester.t_tab_varchar [ count = 1 ] was expected to equal: ut3_tester.t_tab_varchar [ count = 1 ] +%Diff: +%Rows: [ 1 differences ] +%Row No. 1 - Actual: B +%Row No. 1 - Expected: A]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure array_is_null is + l_is_null t_tab_varchar ; + begin + ut3.ut.expect( anydata.convertCollection( l_is_null ) ).to_be_null; + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure array_null_equal_array_null is + l_is_null t_tab_varchar ; + l_is_null_bis t_tab_varchar ; + begin + ut3.ut.expect( anydata.convertCollection( l_is_null ) ).to_equal(anydata.convertCollection( l_is_null_bis )); + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure array_null_equal_array_notnull is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + l_is_null t_tab_varchar ; + begin + --Arrange + g_test_expected := anydata.convertCollection( l_is_null ); + g_test_actual := anydata.convertCollection( t_tab_varchar('A') ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + l_expected_message := q'[%Actual: ut3_tester.t_tab_varchar [ count = 1 ] was expected to equal: ut3_tester.t_tab_varchar [ count = ] +%Diff: +%Rows: [ 1 differences ] +%Row No. 1 - Extra: A]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure empty_array_have_zero_elem is + begin + ut3.ut.expect( anydata.convertCollection(t_tab_varchar())).to_have_count(0); + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure array_empty_equal_array_empty is + begin + --Arrange + g_test_expected := anydata.convertCollection(t_tab_varchar()); + g_test_actual := anydata.convertCollection(t_tab_varchar()); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure array_empty_equal_array_notempty is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + l_is_null t_tab_varchar ; + begin + --Arrange + g_test_expected := anydata.convertCollection( t_tab_varchar() ); + g_test_actual := anydata.convertCollection( t_tab_varchar('A') ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + l_expected_message := q'[%Actual: ut3_tester.t_tab_varchar [ count = 1 ] was expected to equal: ut3_tester.t_tab_varchar [ count = 0 ] +%Diff: +%Rows: [ 1 differences ] +%Row No. 1 - Extra: A]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure collection_is_null is + l_null_list test_dummy_object_list; + begin + --Arrange + g_test_actual := anydata.convertCollection( l_null_list ); + --Act + ut3.ut.expect( g_test_actual ).to_be_null; + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure collection_is_empty is + begin + --Arrange + g_test_actual := anydata.convertCollection( test_dummy_object_list() ); + --Act + ut3.ut.expect( g_test_actual ).to_have_count(0); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + + end; + + procedure varray_same_data is + begin + --Arrange + g_test_expected := anydata.convertCollection( t_varray(1) ); + g_test_actual := anydata.convertCollection( t_varray(1) ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure varray_diff_data is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + g_test_expected := anydata.convertCollection( t_varray(1) ); + g_test_actual := anydata.convertCollection( t_varray(2) ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + l_expected_message := q'[%Actual: ut3_tester.t_varray [ count = 1 ] was expected to equal: ut3_tester.t_varray [ count = 1 ] +%Diff: +%Rows: [ 1 differences ] +%Row No. 1 - Actual: 2 +%Row No. 1 - Expected: 1]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure varray_is_null is + l_is_null t_varray ; + begin + ut3.ut.expect( anydata.convertCollection( l_is_null ) ).to_be_null; + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure varray_null_equal_varray_null is + l_is_null t_varray ; + l_is_null_bis t_varray ; + begin + ut3.ut.expect( anydata.convertCollection( l_is_null ) ).to_equal(anydata.convertCollection( l_is_null_bis )); + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure varray_null_equal_varray_notnull is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + l_is_null t_varray ; + begin + --Arrange + g_test_expected := anydata.convertCollection( l_is_null ); + g_test_actual := anydata.convertCollection( t_varray(1) ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + l_expected_message := q'[%Actual: ut3_tester.t_varray [ count = 1 ] was expected to equal: ut3_tester.t_varray [ count = ] +%Diff: +%Rows: [ 1 differences ] +%Row No. 1 - Extra: 1]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure empty_varray_have_zero_elem is + begin + ut3.ut.expect( anydata.convertCollection(t_varray())).to_have_count(0); + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure varray_empty_equal_varray_empty is + begin + --Arrange + g_test_expected := anydata.convertCollection(t_varray()); + g_test_actual := anydata.convertCollection(t_varray()); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure varray_empty_equal_varray_notempty is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + l_is_null t_varray ; + begin + --Arrange + g_test_expected := anydata.convertCollection( t_varray() ); + g_test_actual := anydata.convertCollection( t_varray(1) ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + l_expected_message := q'[%Actual: ut3_tester.t_varray [ count = 1 ] was expected to equal: ut3_tester.t_varray [ count = 0 ] +%Diff: +%Rows: [ 1 differences ] +%Row No. 1 - Extra: 1]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + end; / \ No newline at end of file diff --git a/test/core/expectations/test_expectation_anydata.pks b/test/core/expectations/test_expectation_anydata.pks index 9cef7da11..eca9d3beb 100644 --- a/test/core/expectations/test_expectation_anydata.pks +++ b/test/core/expectations/test_expectation_anydata.pks @@ -118,7 +118,61 @@ create or replace package test_expectation_anydata is procedure collection_exclude_list; --%test(Validate include list on collections of objects fail) - procedure collection_include_list_fail; + procedure collection_include_list_fail; + + --%test(Two ARRAYS with same data) + procedure array_same_data; + + --%test(Two ARRAYS with different data) + procedure array_diff_data; + + --%test(ARRAY is atomically null) + procedure array_is_null; + + --%test(Compare two null ARRAYs) + procedure array_null_equal_array_null; + + --%test(Compare null ARRAY to ARRAY with data) + procedure array_null_equal_array_notnull; + + --%test(Empty ARRAY have count of 0) + procedure empty_array_have_zero_elem; + + --%test(Compare two empty ARRAYs) + procedure array_empty_equal_array_empty; + + --%test(Compare empty ARRAY to ARRAY with data) + procedure array_empty_equal_array_notempty; + + --%test(Collection is atomically NULL) + procedure collection_is_null; + + --%test(Collection is empty) + procedure collection_is_empty; + + --%test(Two VARRAYS with same data) + procedure varray_same_data; + + --%test(Two VARRAYS with different data) + procedure varray_diff_data; + + --%test(VARRAY is atomically null) + procedure varray_is_null; + + --%test(Compare two null VARRAYs) + procedure varray_null_equal_varray_null; + + --%test(Compare null VARRAY to VARRAY with data) + procedure varray_null_equal_varray_notnull; + + --%test(Empty VARRAY have count of 0) + procedure empty_varray_have_zero_elem; + + --%test(Compare two empty VARRAYs) + procedure varray_empty_equal_varray_empty; + + --%test(Compare empty VARRAY to VARRAY with data) + procedure varray_empty_equal_varray_notempty; end; / diff --git a/test/core/expectations/unary/test_expect_to_be_empty.pkb b/test/core/expectations/unary/test_expect_to_be_empty.pkb index ef4c34c12..0db499906 100644 --- a/test/core/expectations/unary/test_expect_to_be_empty.pkb +++ b/test/core/expectations/unary/test_expect_to_be_empty.pkb @@ -166,7 +166,11 @@ was expected to be empty%%]'; --Assert ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); end; - + + /** + * https://docs.oracle.com/en/database/oracle/oracle-database/18/adobj/declaring-initializing-objects-in-plsql.html#GUID-23135172-82E2-4C3E-800D-E584B43B578E + * User-defined types, just like collections, are atomically null, until you initialize the object by calling the constructor for its object type. That is, the object itself is null, not just its attributes. + */ procedure fail_not_be_empty_object is l_actual anydata; begin diff --git a/test/core/expectations/unary/test_expect_to_be_empty.pks b/test/core/expectations/unary/test_expect_to_be_empty.pks index f48db600f..92a7e0bef 100644 --- a/test/core/expectations/unary/test_expect_to_be_empty.pks +++ b/test/core/expectations/unary/test_expect_to_be_empty.pks @@ -66,7 +66,7 @@ create or replace package test_expect_to_be_empty is --%test(Gives failure for an empty collection) procedure fail_not_be_empty_null_coll; - --%test(Gives failure for an object) + --%test(Gives failure for an empty object) procedure fail_not_be_empty_object; --%test(Gives failure for a null object) diff --git a/test/helpers/test_tab_varchar2.tps b/test/helpers/test_tab_varchar2.tps new file mode 100644 index 000000000..17086292a --- /dev/null +++ b/test/helpers/test_tab_varchar2.tps @@ -0,0 +1,12 @@ +declare + l_exists integer; +begin + select count(1) into l_exists from user_types where type_name = 'T_TAB_VARCHAR'; + if l_exists > 0 then + execute immediate 'drop type t_tab_varchar force'; + end if; +end; +/ + +create or replace type t_tab_varchar is table of varchar2(1) +/ \ No newline at end of file diff --git a/test/helpers/test_tab_varray.tps b/test/helpers/test_tab_varray.tps new file mode 100644 index 000000000..3c684afca --- /dev/null +++ b/test/helpers/test_tab_varray.tps @@ -0,0 +1,13 @@ +declare + l_exists integer; +begin + select count(1) into l_exists from user_types where type_name = 'T_VARRAY'; + if l_exists > 0 then + execute immediate 'drop type t_varray force'; + end if; +end; +/ + + +create or replace type t_varray is varray(1) of number +/ \ No newline at end of file diff --git a/test/install_tests.sql b/test/install_tests.sql index 96d2702f8..5ed1a460d 100644 --- a/test/install_tests.sql +++ b/test/install_tests.sql @@ -15,6 +15,8 @@ alter session set plsql_optimize_level=0; @@helpers/test_dummy_object_list.tps @@helpers/test_event_object.tps @@helpers/test_event_list.tps +@@helpers/test_tab_varchar2.tps +@@helpers/test_tab_varray.tps --Install tests @@core.pks From 5dd4d42d2de0a0121be3a40ca64a62dbc4fbe99d Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sat, 2 Mar 2019 13:02:22 +0000 Subject: [PATCH 0248/1096] Shorter tests names and removal of unused types files. --- .../data_values/ut_data_value_collection.tpb | 45 ------------------- .../data_values/ut_data_value_collection.tps | 23 ---------- .../data_values/ut_data_value_object.tpb | 32 ------------- .../data_values/ut_data_value_object.tps | 21 --------- .../expectations/test_expectation_anydata.pkb | 8 ++-- .../expectations/test_expectation_anydata.pks | 8 ++-- 6 files changed, 8 insertions(+), 129 deletions(-) delete mode 100644 source/expectations/data_values/ut_data_value_collection.tpb delete mode 100644 source/expectations/data_values/ut_data_value_collection.tps delete mode 100644 source/expectations/data_values/ut_data_value_object.tpb delete mode 100644 source/expectations/data_values/ut_data_value_object.tps diff --git a/source/expectations/data_values/ut_data_value_collection.tpb b/source/expectations/data_values/ut_data_value_collection.tpb deleted file mode 100644 index 15298c801..000000000 --- a/source/expectations/data_values/ut_data_value_collection.tpb +++ /dev/null @@ -1,45 +0,0 @@ -create or replace type body ut_data_value_collection as - /* - utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project - - Licensed under the Apache License, Version 2.0 (the "License"): - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - - constructor function ut_data_value_collection(self in out nocopy ut_data_value_collection, a_value anydata) return self as result is - begin - self.self_type := $$plsql_unit; - self.init(a_value, 'collection', '/*/*/*'); - if a_value is not null then - execute immediate ' - declare - l_data '||a_value.gettypename()||'; - l_value anydata := :a_value; - l_status integer; - begin - l_status := l_value.getCollection(l_data); - if l_data is not null then - :l_count := l_data.count; - end if; - end;' using in a_value, out self.elements_count; - end if; - return; - end; - - overriding member function is_empty return boolean is - begin - return self.elements_count = 0; - end; - -end; -/ diff --git a/source/expectations/data_values/ut_data_value_collection.tps b/source/expectations/data_values/ut_data_value_collection.tps deleted file mode 100644 index 7c5d5285c..000000000 --- a/source/expectations/data_values/ut_data_value_collection.tps +++ /dev/null @@ -1,23 +0,0 @@ -create or replace type ut_data_value_collection under ut_data_value_anydata( - /* - utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project - - Licensed under the Apache License, Version 2.0 (the "License"): - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - - constructor function ut_data_value_collection(self in out nocopy ut_data_value_collection, a_value anydata) return self as result, - overriding member function is_empty return boolean - -) -/ diff --git a/source/expectations/data_values/ut_data_value_object.tpb b/source/expectations/data_values/ut_data_value_object.tpb deleted file mode 100644 index 89e49abc1..000000000 --- a/source/expectations/data_values/ut_data_value_object.tpb +++ /dev/null @@ -1,32 +0,0 @@ -create or replace type body ut_data_value_object as - /* - utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project - - Licensed under the Apache License, Version 2.0 (the "License"): - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - - constructor function ut_data_value_object(self in out nocopy ut_data_value_object, a_value anydata) return self as result is - begin - self.self_type := $$plsql_unit; - self.init(a_value, 'object', '/*/*'); - return; - end; - - overriding member function get_object_info return varchar2 is - begin - return self.data_type; - end; - -end; -/ diff --git a/source/expectations/data_values/ut_data_value_object.tps b/source/expectations/data_values/ut_data_value_object.tps deleted file mode 100644 index cf1dc631d..000000000 --- a/source/expectations/data_values/ut_data_value_object.tps +++ /dev/null @@ -1,21 +0,0 @@ -create or replace type ut_data_value_object under ut_data_value_anydata( - /* - utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project - - Licensed under the Apache License, Version 2.0 (the "License"): - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - constructor function ut_data_value_object(self in out nocopy ut_data_value_object, a_value anydata) return self as result, - overriding member function get_object_info return varchar2 -) -/ diff --git a/test/core/expectations/test_expectation_anydata.pkb b/test/core/expectations/test_expectation_anydata.pkb index e422817a8..51d60b44e 100644 --- a/test/core/expectations/test_expectation_anydata.pkb +++ b/test/core/expectations/test_expectation_anydata.pkb @@ -687,7 +687,7 @@ Rows: [ 60 differences, showing first 20 ] ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; - procedure array_empty_equal_array_notempty is + procedure arr_empty_equal_arr_notempty is l_actual_message varchar2(32767); l_expected_message varchar2(32767); l_is_null t_tab_varchar ; @@ -772,7 +772,7 @@ Rows: [ 60 differences, showing first 20 ] ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; - procedure varray_null_equal_varray_notnull is + procedure varr_null_equal_varr_notnull is l_actual_message varchar2(32767); l_expected_message varchar2(32767); l_is_null t_varray ; @@ -797,7 +797,7 @@ Rows: [ 60 differences, showing first 20 ] ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; - procedure varray_empty_equal_varray_empty is + procedure varr_empty_equal_varr_empty is begin --Arrange g_test_expected := anydata.convertCollection(t_varray()); @@ -807,7 +807,7 @@ Rows: [ 60 differences, showing first 20 ] ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; - procedure varray_empty_equal_varray_notempty is + procedure varr_empty_equal_varr_notempty is l_actual_message varchar2(32767); l_expected_message varchar2(32767); l_is_null t_varray ; diff --git a/test/core/expectations/test_expectation_anydata.pks b/test/core/expectations/test_expectation_anydata.pks index eca9d3beb..99c44346c 100644 --- a/test/core/expectations/test_expectation_anydata.pks +++ b/test/core/expectations/test_expectation_anydata.pks @@ -142,7 +142,7 @@ create or replace package test_expectation_anydata is procedure array_empty_equal_array_empty; --%test(Compare empty ARRAY to ARRAY with data) - procedure array_empty_equal_array_notempty; + procedure arr_empty_equal_arr_notempty; --%test(Collection is atomically NULL) procedure collection_is_null; @@ -163,16 +163,16 @@ create or replace package test_expectation_anydata is procedure varray_null_equal_varray_null; --%test(Compare null VARRAY to VARRAY with data) - procedure varray_null_equal_varray_notnull; + procedure varr_null_equal_varr_notnull; --%test(Empty VARRAY have count of 0) procedure empty_varray_have_zero_elem; --%test(Compare two empty VARRAYs) - procedure varray_empty_equal_varray_empty; + procedure varr_empty_equal_varr_empty; --%test(Compare empty VARRAY to VARRAY with data) - procedure varray_empty_equal_varray_notempty; + procedure varr_empty_equal_varr_notempty; end; / From 01e93e7e073966877439aec381a8efaff70d09a8 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sat, 2 Mar 2019 13:41:09 +0000 Subject: [PATCH 0249/1096] Wrapping in the quota column name in cursor as it uses a type value which causing error in 11g. --- source/expectations/data_values/ut_data_value_anydata.tpb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/expectations/data_values/ut_data_value_anydata.tpb b/source/expectations/data_values/ut_data_value_anydata.tpb index 2000f4eb1..389181f17 100644 --- a/source/expectations/data_values/ut_data_value_anydata.tpb +++ b/source/expectations/data_values/ut_data_value_anydata.tpb @@ -55,9 +55,9 @@ create or replace type body ut_data_value_anydata as begin l_status := l_value.get'||self.compound_type||'(l_data); '|| case when self.compound_type = 'collection' then - ' open l_tmp_refcursor for select value(x) as '||get_object_name(a_value)||' from table(l_data) x;' + q'[ open l_tmp_refcursor for select value(x) as "]'||get_object_name(a_value)||q'[" from table(l_data) x;]' else - ' open l_tmp_refcursor for select l_data '||get_object_name(self.data_type)||' from dual;' + q'[ open l_tmp_refcursor for select l_data as "]'||get_object_name(self.data_type)||q'[" from dual;]' end || ' :l_refcursor := l_tmp_refcursor; end;'; From 2c8cd32957c18235eaaecad9fa628f6bee9e111e Mon Sep 17 00:00:00 2001 From: lwasylow Date: Mon, 4 Mar 2019 07:23:07 +0000 Subject: [PATCH 0250/1096] Fixing issue with refcursor in anydata. --- .../expectations/data_values/ut_data_value_anydata.tpb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/source/expectations/data_values/ut_data_value_anydata.tpb b/source/expectations/data_values/ut_data_value_anydata.tpb index 389181f17..b9eeae2d9 100644 --- a/source/expectations/data_values/ut_data_value_anydata.tpb +++ b/source/expectations/data_values/ut_data_value_anydata.tpb @@ -55,13 +55,12 @@ create or replace type body ut_data_value_anydata as begin l_status := l_value.get'||self.compound_type||'(l_data); '|| case when self.compound_type = 'collection' then - q'[ open l_tmp_refcursor for select value(x) as "]'||get_object_name(a_value)||q'[" from table(l_data) x;]' + q'[ open :l_tmp_refcursor for select value(x) as "]'||get_object_name(a_value)||q'[" from table(l_data) x;]' else - q'[ open l_tmp_refcursor for select l_data as "]'||get_object_name(self.data_type)||q'[" from dual;]' + q'[ open :l_tmp_refcursor for select l_data as "]'||get_object_name(self.data_type)||q'[" from dual;]' end || - ' :l_refcursor := l_tmp_refcursor; - end;'; - execute immediate l_anydata_sql using in a_value, out a_refcursor; + 'end;'; + execute immediate l_anydata_sql using in a_value, in out a_refcursor; end; member function get_extract_path(a_data_value anydata) return varchar2 is From bbb90203521e193dfd38caa957525407f4d9ec09 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Mon, 4 Mar 2019 07:47:03 +0000 Subject: [PATCH 0251/1096] Adding cursor closure --- source/expectations/data_values/ut_data_value_anydata.tpb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/source/expectations/data_values/ut_data_value_anydata.tpb b/source/expectations/data_values/ut_data_value_anydata.tpb index b9eeae2d9..975a314a4 100644 --- a/source/expectations/data_values/ut_data_value_anydata.tpb +++ b/source/expectations/data_values/ut_data_value_anydata.tpb @@ -107,6 +107,14 @@ create or replace type body ut_data_value_anydata as raise cursor_not_open; end if; end if; + exception + when cursor_not_open then + raise_application_error(-20155, 'Cursor is not open'); + when others then + if l_refcursor%isopen then + close l_refcursor; + end if; + raise; end; member function get_instance(a_data_value anydata) return varchar2 is From 09b43daf1b3c0f053bc2595d1ff2a1079ef8c746 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Mon, 4 Mar 2019 07:51:07 +0000 Subject: [PATCH 0252/1096] Adding in out --- source/expectations/data_values/ut_data_value_anydata.tpb | 5 ++++- source/expectations/data_values/ut_data_value_anydata.tps | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/source/expectations/data_values/ut_data_value_anydata.tpb b/source/expectations/data_values/ut_data_value_anydata.tpb index 975a314a4..eb6634b7a 100644 --- a/source/expectations/data_values/ut_data_value_anydata.tpb +++ b/source/expectations/data_values/ut_data_value_anydata.tpb @@ -21,7 +21,8 @@ create or replace type body ut_data_value_anydata as return self.data_type || case when self.compound_type = 'collection' then ' [ count = '||self.elements_count||' ]' else null end; end; - member procedure get_cursor_from_anydata(a_value in anydata, a_refcursor out sys_refcursor) is + member procedure get_cursor_from_anydata(self in out nocopy ut_data_value_anydata, a_value in anydata, + a_refcursor out nocopy sys_refcursor) is l_anydata_sql varchar2(4000); l_cursor_sql varchar2(2000); @@ -107,6 +108,8 @@ create or replace type body ut_data_value_anydata as raise cursor_not_open; end if; end if; + + exception when cursor_not_open then raise_application_error(-20155, 'Cursor is not open'); diff --git a/source/expectations/data_values/ut_data_value_anydata.tps b/source/expectations/data_values/ut_data_value_anydata.tps index 264127fc6..61195f9de 100644 --- a/source/expectations/data_values/ut_data_value_anydata.tps +++ b/source/expectations/data_values/ut_data_value_anydata.tps @@ -17,7 +17,8 @@ create or replace type ut_data_value_anydata under ut_data_value_refcursor( */ - member procedure get_cursor_from_anydata(a_value in anydata, a_refcursor out sys_refcursor), + member procedure get_cursor_from_anydata(self in out nocopy ut_data_value_anydata, a_value in anydata, + a_refcursor out nocopy sys_refcursor), overriding member function get_object_info return varchar2, member function get_extract_path(a_data_value anydata) return varchar2, member procedure init(self in out nocopy ut_data_value_anydata, a_value anydata), From 9334747a4ad9ef17cbb40bac551ad614564f16fb Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 4 Mar 2019 11:38:17 +0000 Subject: [PATCH 0253/1096] Fixed annotations on CANADIAN FRENCH NLS settings Fixed issue with `modifier => 'i'` causing strange behavior when parsing annotations on `CANADIAN FRENCH` `NLS` settings. Resolves #844 --- .../core/annotations/ut_annotation_parser.pkb | 15 +++---- .../annotations/test_annotation_parser.pkb | 42 +++++++++++++++++++ .../annotations/test_annotation_parser.pks | 3 ++ 3 files changed, 51 insertions(+), 9 deletions(-) diff --git a/source/core/annotations/ut_annotation_parser.pkb b/source/core/annotations/ut_annotation_parser.pkb index aec9e7585..8d3cee3ad 100644 --- a/source/core/annotations/ut_annotation_parser.pkb +++ b/source/core/annotations/ut_annotation_parser.pkb @@ -19,13 +19,13 @@ create or replace package body ut_annotation_parser as ------------------------------ --private definitions - type tt_comment_list is table of varchar2(32767) index by pls_integer; + type tt_comment_list is table of varchar2(32767) index by binary_integer; gc_annotation_qualifier constant varchar2(1) := '%'; gc_annot_comment_pattern constant varchar2(30) := '^( |'||chr(09)||')*-- *('||gc_annotation_qualifier||'.*?)$'; -- chr(09) is a tab character gc_comment_replacer_patter constant varchar2(50) := '{COMMENT#%N%}'; gc_comment_replacer_regex_ptrn constant varchar2(25) := '{COMMENT#(\d+)}'; - gc_regexp_identifier constant varchar2(50) := '[a-z][a-z0-9#_$]*'; + gc_regexp_identifier constant varchar2(50) := '[a-zA-Z][a-zA-Z0-9#_$]*'; gc_annotation_block_pattern constant varchar2(200) := '(({COMMENT#.+}'||chr(10)||')+)( |'||chr(09)||')*(procedure|function)\s+(' || gc_regexp_identifier || ')'; gc_annotation_pattern constant varchar2(50) := gc_annotation_qualifier || gc_regexp_identifier || '[ '||chr(9)||']*(\(.*?\)\s*?$)?'; @@ -46,10 +46,7 @@ create or replace package body ut_annotation_parser as if l_annotation_str is not null then -- get the annotation name and it's parameters if present - l_annotation_name := lower(regexp_substr(l_annotation_str - ,'%(' || gc_regexp_identifier || ')' - ,modifier => 'i' - ,subexpression => 1)); + l_annotation_name := lower(regexp_substr(l_annotation_str ,'%(' || gc_regexp_identifier || ')', subexpression => 1)); l_annotation_text := trim(regexp_substr(l_annotation_str, '\((.*?)\)\s*$', subexpression => 1)); a_annotations.extend; @@ -59,7 +56,7 @@ create or replace package body ut_annotation_parser as end; procedure delete_processed_comments( a_comments in out nocopy tt_comment_list, a_annotations ut_annotations ) is - l_loop_index pls_integer := 1; + l_loop_index binary_integer := 1; begin l_loop_index := a_annotations.first; while l_loop_index is not null loop @@ -74,8 +71,8 @@ create or replace package body ut_annotation_parser as a_comments tt_comment_list, a_subobject_name varchar2 := null ) is - l_loop_index pls_integer := 1; - l_annotation_index pls_integer; + l_loop_index binary_integer := 1; + l_annotation_index binary_integer; begin -- loop while there are unprocessed comment blocks while 0 != nvl(regexp_instr(srcstr => a_source diff --git a/test/core/annotations/test_annotation_parser.pkb b/test/core/annotations/test_annotation_parser.pkb index 6f7bdbf59..5345e3a50 100644 --- a/test/core/annotations/test_annotation_parser.pkb +++ b/test/core/annotations/test_annotation_parser.pkb @@ -414,6 +414,48 @@ END;'; ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); end; + procedure test_upper_annot is + l_source clob; + l_actual ut3.ut_annotations; + l_expected ut3.ut_annotations; + begin + l_source := 'PACKAGE test_tt AS + -- %SUITE + -- %DISPLAYNAME(Name of suite) + -- %SUITEPATH(all.globaltests) + + -- %ANN1(Name of suite) + -- %ANN2(all.globaltests) + + --%TEST + procedure foo; + + -- %ANN3(Name of suite) + -- %ANN4(all.globaltests) + + --%TEST + procedure bar; + END;'; + + --Act + l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); + + --Assert + l_expected := ut3.ut_annotations( + ut3.ut_annotation( 2, 'suite', null, null ), + ut3.ut_annotation( 3, 'displayname', 'Name of suite', null ), + ut3.ut_annotation( 4, 'suitepath', 'all.globaltests', null ), + ut3.ut_annotation( 6, 'ann1', 'Name of suite', null ), + ut3.ut_annotation( 7, 'ann2', 'all.globaltests', null ), + ut3.ut_annotation( 9, 'test', null, 'foo'), + ut3.ut_annotation( 12, 'ann3', 'Name of suite', null ), + ut3.ut_annotation( 13, 'ann4', 'all.globaltests', null ), + ut3.ut_annotation( 15, 'test', null, 'bar') + ); + + ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); + + end; end test_annotation_parser; / diff --git a/test/core/annotations/test_annotation_parser.pks b/test/core/annotations/test_annotation_parser.pks index e606c438f..19b98ae63 100644 --- a/test/core/annotations/test_annotation_parser.pks +++ b/test/core/annotations/test_annotation_parser.pks @@ -35,5 +35,8 @@ create or replace package test_annotation_parser is -- %test(Parses annotations with very long object names) procedure test_annot_very_long_name; + -- %test(Parses upper case annotations) + procedure test_upper_annot; + end test_annotation_parser; / From 9961dbc319568360ad9d39b8b333b0cfc15e64f9 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Tue, 5 Mar 2019 12:54:17 +0000 Subject: [PATCH 0254/1096] Testing fix for issue with cursors --- .../data_values/ut_cursor_column.tpb | 6 +- .../data_values/ut_data_value_anydata.tpb | 128 ++++++++++++------ .../data_values/ut_data_value_anydata.tps | 4 +- .../data_values/ut_data_value_refcursor.tpb | 8 +- .../data_values/ut_data_value_refcursor.tps | 2 +- 5 files changed, 93 insertions(+), 55 deletions(-) diff --git a/source/expectations/data_values/ut_cursor_column.tpb b/source/expectations/data_values/ut_cursor_column.tpb index a956164f5..923dd0cd4 100644 --- a/source/expectations/data_values/ut_cursor_column.tpb +++ b/source/expectations/data_values/ut_cursor_column.tpb @@ -26,8 +26,12 @@ create or replace type body ut_cursor_column as end; --when is nestd we need to hash name to make sure we dont exceed 30 char self.column_type := a_col_type; --column type e.g. user_defined , varchar2 self.column_schema := a_col_schema_name; -- schema name - self.is_sql_diffable := case when lower(self.column_type) = 'user_defined_type' then + self.is_sql_diffable := case + when lower(self.column_type) = 'user_defined_type' then 0 + -- Due to bug in 11g/12.1 collection fails on varchar 4000+ + when (lower(self.column_type) in ('varchar2','char')) and (self.column_len >= 4000) then + 0 else ut_utils.boolean_to_int(ut_compound_data_helper.is_sql_compare_allowed(self.column_type)) end; --can we directly compare or do we need to hash value diff --git a/source/expectations/data_values/ut_data_value_anydata.tpb b/source/expectations/data_values/ut_data_value_anydata.tpb index eb6634b7a..f892c9c88 100644 --- a/source/expectations/data_values/ut_data_value_anydata.tpb +++ b/source/expectations/data_values/ut_data_value_anydata.tpb @@ -21,8 +21,72 @@ create or replace type body ut_data_value_anydata as return self.data_type || case when self.compound_type = 'collection' then ' [ count = '||self.elements_count||' ]' else null end; end; - member procedure get_cursor_from_anydata(self in out nocopy ut_data_value_anydata, a_value in anydata, - a_refcursor out nocopy sys_refcursor) is + member function get_extract_path(a_data_value anydata) return varchar2 is + l_path varchar2(10); + begin + if self.compound_type = 'object' then + l_path := '/*/*'; + else + case when ut_metadata.has_collection_members(a_data_value) then + l_path := '/*/*'; + else + l_path := '/*'; + end case; + end if; + return l_path; + end; + + overriding member procedure extract_cursor(self in out nocopy ut_data_value_anydata, a_value sys_refcursor) + is + c_bulk_rows constant integer := 10000; + l_cursor sys_refcursor := a_value; + l_ctx number; + l_xml xmltype; + l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_set_id integer := 0; + l_elements_count number := 0; + begin + -- We use DBMS_XMLGEN in order to: + -- 1) be able to process data in bulks (set of rows) + -- 2) be able to influence the ROWSET/ROW tags + -- 3) be able to influence the way NULL values are handled (empty TAG) + -- 4) be able to influence the way TIMESTAMP is formatted. + -- Due to Oracle feature/bug, it is not possible to change the DATE formatting of cursor data + -- AFTER the cursor was opened. + -- The only solution for this is to change NLS settings before opening the cursor. + -- + -- This would work fine if we could use DBMS_XMLGEN.restartQuery. + -- The restartQuery fails however if PLSQL variables of TIMESTAMP/INTERVAL or CLOB/BLOB are used. + ut_expectation_processor.set_xml_nls_params(); + l_ctx := dbms_xmlgen.newContext(l_cursor); + dbms_xmlgen.setNullHandling(l_ctx, dbms_xmlgen.empty_tag); + dbms_xmlgen.setMaxRows(l_ctx, c_bulk_rows); + loop + l_xml := dbms_xmlgen.getxmltype(l_ctx); + exit when dbms_xmlgen.getNumRowsProcessed(l_ctx) = 0; + l_elements_count := l_elements_count + dbms_xmlgen.getNumRowsProcessed(l_ctx); + execute immediate + 'insert into ' || l_ut_owner || '.ut_compound_data_tmp(data_id, item_no, item_data) ' || + 'values (:self_guid, :self_row_count, :l_xml)' + using in self.data_id, l_set_id, l_xml; + l_set_id := l_set_id + c_bulk_rows; + end loop; + ut_expectation_processor.reset_nls_params(); + dbms_xmlgen.closeContext(l_ctx); + self.elements_count := l_elements_count; + exception + when others then + ut_expectation_processor.reset_nls_params(); + dbms_xmlgen.closeContext(l_ctx); + raise; + end; + + member procedure init(self in out nocopy ut_data_value_anydata, a_value anydata) is + l_refcursor sys_refcursor; + l_ctx number; + l_ut_owner varchar2(250) := ut_utils.ut_owner; + cursor_not_open exception; + l_cursor_number number; l_anydata_sql varchar2(4000); l_cursor_sql varchar2(2000); @@ -45,14 +109,25 @@ create or replace type body ut_data_value_anydata as return resolve_name(a_datatype); end; - begin - l_anydata_sql := ' + begin + self.data_type := ut_metadata.get_anydata_typename(a_value); + self.compound_type := get_instance(a_value); + self.is_data_null := ut_metadata.is_anytype_null(a_value,self.compound_type); + self.data_id := sys_guid(); + self.self_type := $$plsql_unit; + self.cursor_details := ut_cursor_details(); + + ut_compound_data_helper.cleanup_diff; + + if not self.is_null() then + self.extract_path := get_extract_path(a_value); + --get_cursor_from_anydata(a_value,l_refcursor); + l_anydata_sql := ' declare l_data '||self.data_type||'; l_value anydata := :a_value; l_status integer; l_tmp_refcursor sys_refcursor; - l_refcursor sys_refcursor; begin l_status := l_value.get'||self.compound_type||'(l_data); '|| case when self.compound_type = 'collection' then @@ -61,46 +136,10 @@ create or replace type body ut_data_value_anydata as q'[ open :l_tmp_refcursor for select l_data as "]'||get_object_name(self.data_type)||q'[" from dual;]' end || 'end;'; - execute immediate l_anydata_sql using in a_value, in out a_refcursor; - end; - - member function get_extract_path(a_data_value anydata) return varchar2 is - l_path varchar2(10); - begin - if self.compound_type = 'object' then - l_path := '/*/*'; - else - case when ut_metadata.has_collection_members(a_data_value) then - l_path := '/*/*'; - else - l_path := '/*'; - end case; - end if; - return l_path; - end; - - member procedure init(self in out nocopy ut_data_value_anydata, a_value anydata) is - l_refcursor sys_refcursor; - l_ctx number; - l_ut_owner varchar2(250) := ut_utils.ut_owner; - cursor_not_open exception; - l_cursor_number number; - - begin - self.data_type := ut_metadata.get_anydata_typename(a_value); - self.compound_type := get_instance(a_value); - self.is_data_null := ut_metadata.is_anytype_null(a_value,self.compound_type); - self.data_id := sys_guid(); - self.self_type := $$plsql_unit; - self.cursor_details := ut_cursor_details(); - - ut_compound_data_helper.cleanup_diff; - - if not self.is_null() then - self.extract_path := get_extract_path(a_value); - get_cursor_from_anydata(a_value,l_refcursor); + execute immediate l_anydata_sql using in a_value, in out l_refcursor; + if l_refcursor%isopen then - self.elements_count := self.extract_cursor(l_refcursor); + extract_cursor(l_refcursor); l_cursor_number := dbms_sql.to_cursor_number(l_refcursor); self.cursor_details := ut_cursor_details(l_cursor_number); dbms_sql.close_cursor(l_cursor_number); @@ -109,7 +148,6 @@ create or replace type body ut_data_value_anydata as end if; end if; - exception when cursor_not_open then raise_application_error(-20155, 'Cursor is not open'); diff --git a/source/expectations/data_values/ut_data_value_anydata.tps b/source/expectations/data_values/ut_data_value_anydata.tps index 61195f9de..f82be3036 100644 --- a/source/expectations/data_values/ut_data_value_anydata.tps +++ b/source/expectations/data_values/ut_data_value_anydata.tps @@ -16,11 +16,9 @@ create or replace type ut_data_value_anydata under ut_data_value_refcursor( limitations under the License. */ - - member procedure get_cursor_from_anydata(self in out nocopy ut_data_value_anydata, a_value in anydata, - a_refcursor out nocopy sys_refcursor), overriding member function get_object_info return varchar2, member function get_extract_path(a_data_value anydata) return varchar2, + overriding member procedure extract_cursor(self in out nocopy ut_data_value_anydata, a_value sys_refcursor), member procedure init(self in out nocopy ut_data_value_anydata, a_value anydata), member function get_instance(a_data_value anydata) return varchar2, constructor function ut_data_value_anydata(self in out nocopy ut_data_value_anydata, a_value anydata) return self as result, diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 3aa8e271c..ad55b7073 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -23,8 +23,7 @@ create or replace type body ut_data_value_refcursor as return; end; - member function extract_cursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) - return number + member procedure extract_cursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) is c_bulk_rows constant integer := 10000; l_cursor sys_refcursor := a_value; @@ -45,7 +44,6 @@ create or replace type body ut_data_value_refcursor as -- -- This would work fine if we could use DBMS_XMLGEN.restartQuery. -- The restartQuery fails however if PLSQL variables of TIMESTAMP/INTERVAL or CLOB/BLOB are used. - ut_expectation_processor.set_xml_nls_params(); l_ctx := dbms_xmlgen.newContext(l_cursor); dbms_xmlgen.setNullHandling(l_ctx, dbms_xmlgen.empty_tag); @@ -62,7 +60,7 @@ create or replace type body ut_data_value_refcursor as end loop; ut_expectation_processor.reset_nls_params(); dbms_xmlgen.closeContext(l_ctx); - return l_elements_count; + self.elements_count := l_elements_count; exception when others then ut_expectation_processor.reset_nls_params(); @@ -87,7 +85,7 @@ create or replace type body ut_data_value_refcursor as if l_cursor is not null then if l_cursor%isopen then --Get some more info regarding cursor, including if it containts collection columns and what is their name - self.elements_count := extract_cursor(l_cursor); + extract_cursor(l_cursor); l_cursor_number := dbms_sql.to_cursor_number(l_cursor); self.cursor_details := ut_cursor_details(l_cursor_number); dbms_sql.close_cursor(l_cursor_number); diff --git a/source/expectations/data_values/ut_data_value_refcursor.tps b/source/expectations/data_values/ut_data_value_refcursor.tps index 049285f88..4e100398e 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tps +++ b/source/expectations/data_values/ut_data_value_refcursor.tps @@ -36,7 +36,7 @@ create or replace type ut_data_value_refcursor under ut_compound_data_value( extract_path varchar2(10), constructor function ut_data_value_refcursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) return self as result, - member function extract_cursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) return number, + member procedure extract_cursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor), member procedure init(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor), overriding member function to_string return varchar2, overriding member function diff( a_other ut_data_value, a_match_options ut_matcher_options ) return varchar2, From 2534c96e698c6fd0645993153685d1b8f7cefde0 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Tue, 5 Mar 2019 18:02:59 +0000 Subject: [PATCH 0255/1096] fixing cursor issue Before refactoring. --- source/expectations/data_values/ut_cursor_column.tpb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/expectations/data_values/ut_cursor_column.tpb b/source/expectations/data_values/ut_cursor_column.tpb index 923dd0cd4..ab83ff339 100644 --- a/source/expectations/data_values/ut_cursor_column.tpb +++ b/source/expectations/data_values/ut_cursor_column.tpb @@ -30,7 +30,7 @@ create or replace type body ut_cursor_column as when lower(self.column_type) = 'user_defined_type' then 0 -- Due to bug in 11g/12.1 collection fails on varchar 4000+ - when (lower(self.column_type) in ('varchar2','char')) and (self.column_len >= 4000) then + when (lower(self.column_type) in ('varchar2','char')) and (self.column_len > 4000) then 0 else ut_utils.boolean_to_int(ut_compound_data_helper.is_sql_compare_allowed(self.column_type)) From 293e0f3350c4c8a31faf5de8fa4c303b748cc3cf Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 5 Mar 2019 21:27:34 +0000 Subject: [PATCH 0256/1096] `ut_output_table_buffer` will now throw an exception on timeout. Default initial timeout was changed from 4 hours to 15 seconds. All output reporters will now produce an extra leading line at the start of a test run. Resolves #840 --- ...nExampleTestSuiteWithCompositeReporter.sql | 2 +- .../RunExampleTestSuiteWithCustomReporter.sql | 2 +- source/api/ut_runner.pkb | 7 +- source/core/events/ut_event_manager.pkb | 4 +- source/core/events/ut_event_manager.pks | 34 ++++++++ .../output_buffers/ut_output_buffer_tmp.sql | 4 +- .../output_buffers/ut_output_table_buffer.tpb | 28 +++--- source/core/types/ut_logical_suite.tpb | 12 +-- source/core/types/ut_output_reporter_base.tpb | 5 ++ source/core/types/ut_output_reporter_base.tps | 3 +- source/core/types/ut_reporter_base.tpb | 87 ++++++++++--------- source/core/types/ut_reporter_base.tps | 3 + source/core/types/ut_run.tpb | 4 +- source/core/types/ut_suite.tpb | 4 +- source/core/types/ut_test.tpb | 12 +-- source/core/ut_suite_builder.pkb | 2 +- source/core/ut_utils.pks | 29 ++----- .../core/reporters/test_realtime_reporter.pkb | 3 +- test/core/test_output_buffer.pkb | 25 ++++-- 19 files changed, 160 insertions(+), 110 deletions(-) diff --git a/examples/developer_examples/RunExampleTestSuiteWithCompositeReporter.sql b/examples/developer_examples/RunExampleTestSuiteWithCompositeReporter.sql index f247e06db..468d176ed 100644 --- a/examples/developer_examples/RunExampleTestSuiteWithCompositeReporter.sql +++ b/examples/developer_examples/RunExampleTestSuiteWithCompositeReporter.sql @@ -33,7 +33,7 @@ begin l_run := ut_run(ut_suite_items(l_suite)); l_run.do_execute(); - ut_event_manager.trigger_event(ut_utils.gc_finalize, l_run); + ut_event_manager.trigger_event(ut_event_manager.gc_finalize, l_run); l_doc_reporter.lines_to_dbms_output(0,0); l_tc_reporter.lines_to_dbms_output(0,0); end; diff --git a/examples/developer_examples/RunExampleTestSuiteWithCustomReporter.sql b/examples/developer_examples/RunExampleTestSuiteWithCustomReporter.sql index 2cae9db53..285cbf9a1 100644 --- a/examples/developer_examples/RunExampleTestSuiteWithCustomReporter.sql +++ b/examples/developer_examples/RunExampleTestSuiteWithCustomReporter.sql @@ -43,7 +43,7 @@ begin ut_event_manager.add_listener(l_reporter); l_run := ut_run(ut_suite_items(l_suite)); l_run.do_execute(); - ut_event_manager.trigger_event(ut_utils.gc_finalize, l_run); + ut_event_manager.trigger_event(ut_event_manager.gc_finalize, l_run); l_reporter.lines_to_dbms_output(0,0); end; / diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index 6edf545bf..dcc8e59f3 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -45,7 +45,7 @@ create or replace package body ut_runner is procedure finish_run(a_run ut_run, a_force_manual_rollback boolean) is begin ut_utils.cleanup_temp_tables; - ut_event_manager.trigger_event(ut_utils.gc_finalize, a_run); + ut_event_manager.trigger_event(ut_event_manager.gc_finalize, a_run); ut_metadata.reset_source_definition_cache; ut_utils.read_cache_to_dbms_output(); ut_coverage_helper.cleanup_tmp_table(); @@ -141,9 +141,12 @@ create or replace package body ut_runner is set(a_test_file_mappings), a_client_character_set ); + + ut_event_manager.trigger_event(ut_event_manager.gc_initialize, l_run); + ut_suite_manager.configure_execution_by_path(l_paths, l_run.items); if a_force_manual_rollback then - l_run.set_rollback_type(ut_utils.gc_rollback_manual, a_force=>true); + l_run.set_rollback_type( a_rollback_type => ut_utils.gc_rollback_manual, a_force => true ); end if; l_run.do_execute(); diff --git a/source/core/events/ut_event_manager.pkb b/source/core/events/ut_event_manager.pkb index b48b6d7f4..aface1f59 100644 --- a/source/core/events/ut_event_manager.pkb +++ b/source/core/events/ut_event_manager.pkb @@ -60,13 +60,11 @@ create or replace package body ut_event_manager as procedure trigger_event( a_event_name t_event_name, a_event_object ut_event_item ) is begin if a_event_name is not null and g_event_listeners_index.exists(a_event_name) - -- disabled due to compiler warning: PLW-06023: invocation of IS NOT NULL computes trivial value --- and g_event_listeners_index(a_event_name) is not null then for listener_number in 1 .. g_event_listeners_index(a_event_name).count loop g_listeners(listener_number).on_event(a_event_name, a_event_object); end loop; - if a_event_name = ut_utils.gc_finalize then + if a_event_name = ut_event_manager.gc_finalize then dispose_listeners; end if; end if; diff --git a/source/core/events/ut_event_manager.pks b/source/core/events/ut_event_manager.pks index fa0da4a00..9fdba575f 100644 --- a/source/core/events/ut_event_manager.pks +++ b/source/core/events/ut_event_manager.pks @@ -15,8 +15,42 @@ create or replace package ut_event_manager authid current_user as See the License for the specific language governing permissions and limitations under the License. */ + /* Constants: Event names */ subtype t_event_name is varchar2(250); + gc_initialize constant t_event_name := 'initialize'; + + gc_before_run constant t_event_name := 'before_run'; + gc_before_suite constant t_event_name := 'before_suite'; + + gc_before_before_all constant t_event_name := 'before_beforeall'; + gc_after_before_all constant t_event_name := 'after_beforeall'; + + gc_before_test constant t_event_name := 'beforetest'; + + gc_before_before_each constant t_event_name := 'before_beforeeach'; + gc_after_before_each constant t_event_name := 'after_beforeeach'; + gc_before_before_test constant t_event_name := 'before_beforetest'; + gc_after_before_test constant t_event_name := 'after_beforetest'; + + gc_before_test_execute constant t_event_name := 'before_test'; + gc_after_test_execute constant t_event_name := 'after_test'; + + gc_before_after_test constant t_event_name := 'before_aftertest'; + gc_after_after_test constant t_event_name := 'after_aftertest'; + gc_before_after_each constant t_event_name := 'before_aftereach'; + gc_after_after_each constant t_event_name := 'after_aftereach'; + + gc_after_test constant t_event_name := 'aftertest'; + + gc_before_after_all constant t_event_name := 'before_afterall'; + gc_after_after_all constant t_event_name := 'after_afterall'; + + gc_after_suite constant t_event_name := 'after_suite'; + gc_after_run constant t_event_name := 'after_run'; + + gc_finalize constant t_event_name := 'finalize'; + procedure trigger_event( a_event_name t_event_name, a_event_object ut_event_item ); procedure initialize; diff --git a/source/core/output_buffers/ut_output_buffer_tmp.sql b/source/core/output_buffers/ut_output_buffer_tmp.sql index 7cde2cc6f..e7cb49817 100644 --- a/source/core/output_buffers/ut_output_buffer_tmp.sql +++ b/source/core/output_buffers/ut_output_buffer_tmp.sql @@ -28,7 +28,9 @@ begin item_type varchar2(1000), is_finished number(1,0) default 0 not null, constraint ut_output_buffer_tmp_pk primary key(output_id, message_id), - constraint ut_output_buffer_tmp_ck check(is_finished = 0 and text is not null or is_finished = 1 and text is null), + constraint ut_output_buffer_tmp_ck check( + is_finished = 0 and (text is not null or item_type is not null ) + or is_finished = 1 and text is null and item_type is null ), constraint ut_output_buffer_fk1 foreign key (output_id) references ut_output_buffer_info_tmp$(output_id) ) organization index overflow nologging initrans 100 '; begin diff --git a/source/core/output_buffers/ut_output_table_buffer.tpb b/source/core/output_buffers/ut_output_table_buffer.tpb index b7d19db43..667ddbf16 100644 --- a/source/core/output_buffers/ut_output_table_buffer.tpb +++ b/source/core/output_buffers/ut_output_table_buffer.tpb @@ -49,7 +49,7 @@ create or replace type body ut_output_table_buffer is overriding member procedure send_line(self in ut_output_table_buffer, a_text varchar2, a_item_type varchar2 := null) is pragma autonomous_transaction; begin - if a_text is not null then + if a_text is not null or a_item_type is not null then insert into ut_output_buffer_tmp(output_id, message_id, text, item_type) values (self.output_id, ut_message_id_seq.nextval, a_text, a_item_type); end if; @@ -62,7 +62,7 @@ create or replace type body ut_output_table_buffer is insert into ut_output_buffer_tmp(output_id, message_id, text, item_type) select self.output_id, ut_message_id_seq.nextval, t.column_value, a_item_type from table(a_text_list) t - where t.column_value is not null; + where t.column_value is not null or a_item_type is not null; commit; end; @@ -70,7 +70,7 @@ create or replace type body ut_output_table_buffer is overriding member procedure send_clob(self in ut_output_table_buffer, a_text clob, a_item_type varchar2 := null) is pragma autonomous_transaction; begin - if a_text is not null and a_text != empty_clob() then + if a_text is not null and a_text != empty_clob() or a_item_type is not null then insert into ut_output_buffer_tmp(output_id, message_id, text, item_type) values (self.output_id, ut_message_id_seq.nextval, a_text, a_item_type); end if; @@ -80,9 +80,10 @@ create or replace type body ut_output_table_buffer is overriding member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined is l_buffer_data ut_output_data_rows; l_message_ids ut_integer_list; + l_finished_flags ut_integer_list; l_already_waited_for number(10,2) := 0; l_finished boolean := false; - lc_init_wait_sec constant naturaln := coalesce(a_initial_timeout, 60 * 60 * 4 ); -- 4 hours + lc_init_wait_sec constant naturaln := coalesce(a_initial_timeout, 15 ); -- 15 seconds lc_max_wait_sec constant naturaln := coalesce(a_timeout_sec, 60 * 60 * 4); -- 4 hours l_wait_for integer := lc_init_wait_sec; lc_short_sleep_time constant number(1,1) := 0.1; --sleep for 100 ms between checks @@ -111,13 +112,13 @@ create or replace type body ut_output_table_buffer is begin while not l_finished loop with ordered_buffer as ( - select a.message_id, ut_output_data_row(a.text, a.item_type) + select a.message_id, ut_output_data_row(a.text, a.item_type), is_finished from ut_output_buffer_tmp a where a.output_id = self.output_id order by a.message_id ) select b.* - bulk collect into l_message_ids, l_buffer_data + bulk collect into l_message_ids, l_buffer_data, l_finished_flags from ordered_buffer b where rownum <= lc_bulk_limit; @@ -141,18 +142,21 @@ create or replace type body ut_output_table_buffer is for i in 1 .. l_buffer_data.count loop if l_buffer_data(i).text is not null then pipe row(l_buffer_data(i)); - else + elsif l_finished_flags(i) = 1 then l_finished := true; exit; end if; end loop; + remove_read_data(l_message_ids); end if; - remove_read_data(l_message_ids); - if l_finished then + if l_finished or l_already_waited_for >= l_wait_for then remove_buffer_info(); - end if; - if l_already_waited_for >= l_wait_for then - l_finished := true; + if l_already_waited_for > 0 and l_already_waited_for >= l_wait_for then + raise_application_error( + ut_utils.gc_out_buffer_timeout, + 'Timeout occurred while waiting for output data. Waited for: '||l_already_waited_for||' seconds.' + ); + end if; end if; end loop; return; diff --git a/source/core/types/ut_logical_suite.tpb b/source/core/types/ut_logical_suite.tpb index f58c8cc0f..4dca71b3e 100644 --- a/source/core/types/ut_logical_suite.tpb +++ b/source/core/types/ut_logical_suite.tpb @@ -18,13 +18,13 @@ create or replace type body ut_logical_suite as overriding member procedure mark_as_skipped(self in out nocopy ut_logical_suite) is begin - ut_event_manager.trigger_event(ut_utils.gc_before_suite, self); + ut_event_manager.trigger_event(ut_event_manager.gc_before_suite, self); self.start_time := current_timestamp; for i in 1 .. self.items.count loop self.items(i).mark_as_skipped(); end loop; self.end_time := self.start_time; - ut_event_manager.trigger_event(ut_utils.gc_after_suite, self); + ut_event_manager.trigger_event(ut_event_manager.gc_after_suite, self); self.calc_execution_result(); end; @@ -43,7 +43,7 @@ create or replace type body ut_logical_suite as begin ut_utils.debug_log('ut_logical_suite.execute'); - ut_event_manager.trigger_event(ut_utils.gc_before_suite, self); + ut_event_manager.trigger_event(ut_event_manager.gc_before_suite, self); self.start_time := current_timestamp; for i in 1 .. self.items.count loop @@ -54,7 +54,7 @@ create or replace type body ut_logical_suite as self.calc_execution_result(); self.end_time := current_timestamp; - ut_event_manager.trigger_event(ut_utils.gc_after_suite, self); + ut_event_manager.trigger_event(ut_event_manager.gc_after_suite, self); return l_completed_without_errors; end; @@ -78,7 +78,7 @@ create or replace type body ut_logical_suite as overriding member procedure mark_as_errored(self in out nocopy ut_logical_suite, a_error_stack_trace varchar2) is begin ut_utils.debug_log('ut_logical_suite.fail'); - ut_event_manager.trigger_event(ut_utils.gc_before_suite, self); + ut_event_manager.trigger_event(ut_event_manager.gc_before_suite, self); self.start_time := current_timestamp; for i in 1 .. self.items.count loop -- execute the item (test or suite) @@ -86,7 +86,7 @@ create or replace type body ut_logical_suite as end loop; self.calc_execution_result(); self.end_time := self.start_time; - ut_event_manager.trigger_event(ut_utils.gc_after_suite, self); + ut_event_manager.trigger_event(ut_event_manager.gc_after_suite, self); end; overriding member function get_error_stack_traces return ut_varchar2_list is diff --git a/source/core/types/ut_output_reporter_base.tpb b/source/core/types/ut_output_reporter_base.tpb index 7b875c9e9..1f682070b 100644 --- a/source/core/types/ut_output_reporter_base.tpb +++ b/source/core/types/ut_output_reporter_base.tpb @@ -78,5 +78,10 @@ create or replace type body ut_output_reporter_base is self.output_buffer.close(); end; + overriding member procedure on_initialize(self in out nocopy ut_output_reporter_base, a_run in ut_run) is + begin + self.output_buffer.send_line(null, 'initialize'); + end; + end; / diff --git a/source/core/types/ut_output_reporter_base.tps b/source/core/types/ut_output_reporter_base.tps index cb5c81ea5..ba550fb0f 100644 --- a/source/core/types/ut_output_reporter_base.tps +++ b/source/core/types/ut_output_reporter_base.tps @@ -28,7 +28,8 @@ create or replace type ut_output_reporter_base under ut_reporter_base( final member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined, final member function get_lines_cursor(a_initial_timeout natural := null, a_timeout_sec natural := null) return sys_refcursor, final member procedure lines_to_dbms_output(self in ut_output_reporter_base, a_initial_timeout natural := null, a_timeout_sec natural := null), - overriding final member procedure on_finalize(self in out nocopy ut_output_reporter_base, a_run in ut_run) + overriding final member procedure on_finalize(self in out nocopy ut_output_reporter_base, a_run in ut_run), + overriding member procedure on_initialize(self in out nocopy ut_output_reporter_base, a_run in ut_run) ) not final not instantiable / diff --git a/source/core/types/ut_reporter_base.tpb b/source/core/types/ut_reporter_base.tpb index 487b7685e..006cbd4f3 100644 --- a/source/core/types/ut_reporter_base.tpb +++ b/source/core/types/ut_reporter_base.tpb @@ -139,74 +139,77 @@ create or replace type body ut_reporter_base is overriding member function get_supported_events return ut_varchar2_list is begin return ut_varchar2_list( - ut_utils.gc_before_run, - ut_utils.gc_before_suite, - ut_utils.gc_before_test, - ut_utils.gc_before_before_all, - ut_utils.gc_before_before_each, - ut_utils.gc_before_before_test, - ut_utils.gc_before_test_execute, - ut_utils.gc_before_after_test, - ut_utils.gc_before_after_each, - ut_utils.gc_before_after_all, - ut_utils.gc_after_run, - ut_utils.gc_after_suite, - ut_utils.gc_after_test, - ut_utils.gc_after_before_all, - ut_utils.gc_after_before_each, - ut_utils.gc_after_before_test, - ut_utils.gc_after_test_execute, - ut_utils.gc_after_after_test, - ut_utils.gc_after_after_each, - ut_utils.gc_after_after_all, - ut_utils.gc_finalize + ut_event_manager.gc_initialize, + ut_event_manager.gc_before_run, + ut_event_manager.gc_before_suite, + ut_event_manager.gc_before_test, + ut_event_manager.gc_before_before_all, + ut_event_manager.gc_before_before_each, + ut_event_manager.gc_before_before_test, + ut_event_manager.gc_before_test_execute, + ut_event_manager.gc_before_after_test, + ut_event_manager.gc_before_after_each, + ut_event_manager.gc_before_after_all, + ut_event_manager.gc_after_run, + ut_event_manager.gc_after_suite, + ut_event_manager.gc_after_test, + ut_event_manager.gc_after_before_all, + ut_event_manager.gc_after_before_each, + ut_event_manager.gc_after_before_test, + ut_event_manager.gc_after_test_execute, + ut_event_manager.gc_after_after_test, + ut_event_manager.gc_after_after_each, + ut_event_manager.gc_after_after_all, + ut_event_manager.gc_finalize ); end; overriding member procedure on_event( self in out nocopy ut_reporter_base, a_event_name varchar2, a_event_item ut_event_item) is begin case a_event_name - when ut_utils.gc_before_run + when ut_event_manager.gc_initialize + then self.on_initialize(treat(a_event_item as ut_run)); + when ut_event_manager.gc_before_run then self.before_calling_run(treat(a_event_item as ut_run)); - when ut_utils.gc_before_suite + when ut_event_manager.gc_before_suite then self.before_calling_suite(treat(a_event_item as ut_logical_suite)); - when ut_utils.gc_before_before_all + when ut_event_manager.gc_before_before_all then self.before_calling_before_all(treat(a_event_item as ut_executable)); - when ut_utils.gc_before_before_each + when ut_event_manager.gc_before_before_each then self.before_calling_before_each(treat(a_event_item as ut_executable)); - when ut_utils.gc_before_test + when ut_event_manager.gc_before_test then self.before_calling_test(treat(a_event_item as ut_test)); - when ut_utils.gc_before_before_test + when ut_event_manager.gc_before_before_test then self.before_calling_before_test(treat(a_event_item as ut_executable)); - when ut_utils.gc_before_test_execute + when ut_event_manager.gc_before_test_execute then self.before_calling_test_execute(treat(a_event_item as ut_executable)); - when ut_utils.gc_before_after_test + when ut_event_manager.gc_before_after_test then self.before_calling_after_test(treat(a_event_item as ut_executable)); - when ut_utils.gc_before_after_each + when ut_event_manager.gc_before_after_each then self.before_calling_after_each(treat(a_event_item as ut_executable)); - when ut_utils.gc_before_after_all + when ut_event_manager.gc_before_after_all then self.before_calling_after_all(treat(a_event_item as ut_executable)); - when ut_utils.gc_after_run + when ut_event_manager.gc_after_run then self.after_calling_run(treat(a_event_item as ut_run)); - when ut_utils.gc_after_suite + when ut_event_manager.gc_after_suite then self.after_calling_suite(treat(a_event_item as ut_logical_suite)); - when ut_utils.gc_after_before_all + when ut_event_manager.gc_after_before_all then self.after_calling_before_all(treat(a_event_item as ut_executable)); - when ut_utils.gc_after_before_each + when ut_event_manager.gc_after_before_each then self.after_calling_before_each(treat(a_event_item as ut_executable)); - when ut_utils.gc_after_test + when ut_event_manager.gc_after_test then self.after_calling_test(treat(a_event_item as ut_test)); - when ut_utils.gc_after_before_test + when ut_event_manager.gc_after_before_test then self.after_calling_before_test(treat(a_event_item as ut_executable)); - when ut_utils.gc_after_test_execute + when ut_event_manager.gc_after_test_execute then self.after_calling_test_execute(treat(a_event_item as ut_executable)); - when ut_utils.gc_after_after_test + when ut_event_manager.gc_after_after_test then self.after_calling_after_test(treat(a_event_item as ut_executable)); - when ut_utils.gc_after_after_each + when ut_event_manager.gc_after_after_each then self.after_calling_after_each(treat(a_event_item as ut_executable)); - when ut_utils.gc_after_after_all + when ut_event_manager.gc_after_after_all then self.after_calling_after_all(treat(a_event_item as ut_executable)); - when ut_utils.gc_finalize + when ut_event_manager.gc_finalize then self.on_finalize(treat(a_event_item as ut_run)); end case; end; diff --git a/source/core/types/ut_reporter_base.tps b/source/core/types/ut_reporter_base.tps index 9543486f1..4f8216294 100644 --- a/source/core/types/ut_reporter_base.tps +++ b/source/core/types/ut_reporter_base.tps @@ -64,6 +64,9 @@ create or replace type ut_reporter_base under ut_event_listener ( -- This way, you may close all open outputs, files, connections etc. that need closing before the run finishes not instantiable member procedure on_finalize(self in out nocopy ut_reporter_base, a_run in ut_run), + -- This method is executed when run is getting initialized + not instantiable member procedure on_initialize(self in out nocopy ut_reporter_base, a_run in ut_run), + /** * Returns the list of events that are supported by particular implementation of the reporter */ diff --git a/source/core/types/ut_run.tpb b/source/core/types/ut_run.tpb index 258d2154a..21a5ef36e 100644 --- a/source/core/types/ut_run.tpb +++ b/source/core/types/ut_run.tpb @@ -56,7 +56,7 @@ create or replace type body ut_run as begin ut_utils.debug_log('ut_run.execute'); - ut_event_manager.trigger_event(ut_utils.gc_before_run, self); + ut_event_manager.trigger_event(ut_event_manager.gc_before_run, self); self.start_time := current_timestamp; -- clear anything that might stay in the session's cache @@ -70,7 +70,7 @@ create or replace type body ut_run as self.end_time := current_timestamp; - ut_event_manager.trigger_event(ut_utils.gc_after_run, self); + ut_event_manager.trigger_event(ut_event_manager.gc_after_run, self); return l_completed_without_errors; end; diff --git a/source/core/types/ut_suite.tpb b/source/core/types/ut_suite.tpb index b92804fb0..14a457623 100644 --- a/source/core/types/ut_suite.tpb +++ b/source/core/types/ut_suite.tpb @@ -46,7 +46,7 @@ create or replace type body ut_suite as if self.get_disabled_flag() then self.mark_as_skipped(); else - ut_event_manager.trigger_event(ut_utils.gc_before_suite, self); + ut_event_manager.trigger_event(ut_event_manager.gc_before_suite, self); self.start_time := current_timestamp; l_suite_savepoint := self.create_savepoint_if_needed(); @@ -78,7 +78,7 @@ create or replace type body ut_suite as self.calc_execution_result(); self.end_time := current_timestamp; - ut_event_manager.trigger_event(ut_utils.gc_after_suite, self); + ut_event_manager.trigger_event(ut_event_manager.gc_after_suite, self); end if; ut_utils.set_action(null); diff --git a/source/core/types/ut_test.tpb b/source/core/types/ut_test.tpb index ed9692e14..14620b24b 100644 --- a/source/core/types/ut_test.tpb +++ b/source/core/types/ut_test.tpb @@ -36,13 +36,13 @@ create or replace type body ut_test as overriding member procedure mark_as_skipped(self in out nocopy ut_test) is begin - ut_event_manager.trigger_event(ut_utils.gc_before_test, self); + ut_event_manager.trigger_event(ut_event_manager.gc_before_test, self); self.start_time := current_timestamp; self.result := ut_utils.gc_disabled; ut_utils.debug_log('ut_test.execute - disabled'); self.results_count.set_counter_values(self.result); self.end_time := self.start_time; - ut_event_manager.trigger_event(ut_utils.gc_after_test, self); + ut_event_manager.trigger_event(ut_event_manager.gc_after_test, self); end; overriding member function do_execute(self in out nocopy ut_test) return boolean is @@ -55,7 +55,7 @@ create or replace type body ut_test as if self.get_disabled_flag() then mark_as_skipped(); else - ut_event_manager.trigger_event(ut_utils.gc_before_test, self); + ut_event_manager.trigger_event(ut_event_manager.gc_before_test, self); self.start_time := current_timestamp; l_savepoint := self.create_savepoint_if_needed(); @@ -91,7 +91,7 @@ create or replace type body ut_test as self.calc_execution_result(); self.end_time := current_timestamp; - ut_event_manager.trigger_event(ut_utils.gc_after_test, self); + ut_event_manager.trigger_event(ut_event_manager.gc_after_test, self); end if; return l_no_errors; end; @@ -117,12 +117,12 @@ create or replace type body ut_test as overriding member procedure mark_as_errored(self in out nocopy ut_test, a_error_stack_trace varchar2) is begin ut_utils.debug_log('ut_test.fail'); - ut_event_manager.trigger_event(ut_utils.gc_before_test, self); + ut_event_manager.trigger_event(ut_event_manager.gc_before_test, self); self.start_time := current_timestamp; self.parent_error_stack_trace := a_error_stack_trace; self.calc_execution_result(); self.end_time := self.start_time; - ut_event_manager.trigger_event(ut_utils.gc_after_test, self); + ut_event_manager.trigger_event(ut_event_manager.gc_after_test, self); end; overriding member function get_error_stack_traces(self ut_test) return ut_varchar2_list is diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index d946b2a5d..b9e5b1b22 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -336,7 +336,7 @@ create or replace package body ut_suite_builder is a_owner t_object_name, a_package_name t_object_name, a_annotation_texts tt_annotation_texts, - a_event_name ut_utils.t_event_name + a_event_name ut_event_manager.t_event_name ) return tt_executables is l_executables ut_executables; l_result tt_executables; diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 84ae277a8..7f2ed442d 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -23,28 +23,6 @@ create or replace package ut_utils authid definer is gc_version constant varchar2(50) := 'v3.1.4.2559-develop'; - /* Constants: Event names */ - subtype t_event_name is varchar2(30); - gc_before_run constant t_event_name := 'before_run'; - gc_before_suite constant t_event_name := 'before_suite'; - gc_before_before_all constant t_event_name := 'before_beforeall'; - gc_before_before_each constant t_event_name := 'before_beforeeach'; - gc_before_before_test constant t_event_name := 'before_beforetest'; - gc_before_test_execute constant t_event_name := 'before_test'; - gc_before_after_test constant t_event_name := 'before_aftertest'; - gc_before_after_each constant t_event_name := 'before_aftereach'; - gc_before_after_all constant t_event_name := 'before_afterall'; - gc_after_run constant t_event_name := 'after_run'; - gc_after_suite constant t_event_name := 'after_suite'; - gc_after_before_all constant t_event_name := 'after_beforeall'; - gc_after_before_each constant t_event_name := 'after_beforeeach'; - gc_after_before_test constant t_event_name := 'after_beforetest'; - gc_after_test_execute constant t_event_name := 'after_test'; - gc_after_after_test constant t_event_name := 'after_aftertest'; - gc_after_after_each constant t_event_name := 'after_aftereach'; - gc_after_after_all constant t_event_name := 'after_afterall'; - gc_finalize constant t_event_name := 'finalize'; - subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; gc_before_each constant t_executable_type := 'beforeeach'; @@ -105,11 +83,16 @@ create or replace package ut_utils authid definer is gc_some_tests_failed constant pls_integer := -20213; pragma exception_init(ex_some_tests_failed, -20213); - -- Any of tests failed + -- Version number provided is not in valid format ex_invalid_version_no exception; gc_invalid_version_no constant pls_integer := -20214; pragma exception_init(ex_invalid_version_no, -20214); + -- Version number provided is not in valid format + ex_out_buffer_timeout exception; + gc_out_buffer_timeout constant pls_integer := -20215; + pragma exception_init(ex_out_buffer_timeout, -20215); + ex_invalid_package exception; gc_invalid_package constant pls_integer := -6550; pragma exception_init(ex_invalid_package, -6550); diff --git a/test/core/reporters/test_realtime_reporter.pkb b/test/core/reporters/test_realtime_reporter.pkb index f11e5d7b3..c4ceb9d5d 100644 --- a/test/core/reporters/test_realtime_reporter.pkb +++ b/test/core/reporters/test_realtime_reporter.pkb @@ -112,7 +112,8 @@ create or replace package body test_realtime_reporter as -- consume select test_event_object(item_type, xmltype(text)) bulk collect into g_events - from table(ut3.ut_output_table_buffer(l_reporter.output_buffer.output_id).get_lines()); + from table(ut3.ut_output_table_buffer(l_reporter.output_buffer.output_id).get_lines()) + where trim(text) is not null and item_type is not null; end run_report_and_cache_result; end create_test_suites_and_run; diff --git a/test/core/test_output_buffer.pkb b/test/core/test_output_buffer.pkb index f7d3cbb8b..848824ea8 100644 --- a/test/core/test_output_buffer.pkb +++ b/test/core/test_output_buffer.pkb @@ -17,6 +17,7 @@ create or replace package body test_output_buffer is l_expected_item_type := lpad('some item type',1000,'-'); --Act l_buffer.send_clob(l_expected_text, l_expected_item_type); + l_buffer.close(); select text, item_type into l_actual_text, l_actual_item_type @@ -64,18 +65,30 @@ create or replace package body test_output_buffer is l_start timestamp; l_duration interval day to second; begin - --Act + --Arrange l_expected := 'a text'; l_buffer.send_line(l_expected); l_start := localtimestamp; - select text into l_result from table(l_buffer.get_lines(1,1)); - l_duration := localtimestamp - l_start; + --Act + begin + select text into l_result from table(l_buffer.get_lines(1,1)); + ut.fail('Expected a timeout exception but nothing was raised'); + exception + when others then + l_duration := localtimestamp - l_start; + --Assert + --Fetches data from output + ut.expect(l_result).to_equal(l_expected); + --Throws a timeout exception + ut.expect(dbms_utility.format_error_stack()).to_match('ORA'||ut3.ut_utils.gc_out_buffer_timeout); + --Waited for one second + ut.expect(l_duration).to_be_greater_than(interval '0.99' second); + end; - ut.expect(l_result).to_equal(l_expected); - ut.expect(l_duration).to_be_greater_than(interval '0.99' second); select count(1) into l_remaining from ut3.ut_output_buffer_tmp where output_id = l_buffer.output_id; - + --Data got removed from output buffer ut.expect(l_remaining).to_equal(0); + end; end test_output_buffer; From 24e4a2aabff290de67ead3a6edd4a06f18fd6c02 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 5 Mar 2019 21:53:29 +0000 Subject: [PATCH 0257/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 84ae277a8..9919cf659 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.4.2559-develop'; + gc_version constant varchar2(50) := 'v3.1.4.2589-develop'; /* Constants: Event names */ subtype t_event_name is varchar2(30); From d8d12cbd5ae7e01ac9313788b411499e429b1bd5 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 5 Mar 2019 22:49:46 +0000 Subject: [PATCH 0258/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 46eee8b76..d08ddc85c 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.4.2589-develop'; + gc_version constant varchar2(50) := 'v3.1.4.2590-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From dea6d3c871eb479899732ff305568361854877d6 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Tue, 5 Mar 2019 18:02:59 +0000 Subject: [PATCH 0259/1096] Refactoring. --- source/core/ut_metadata.pkb | 9 +++ source/core/ut_metadata.pks | 5 ++ .../data_values/ut_cursor_column.tpb | 2 +- .../data_values/ut_data_value_anydata.tpb | 77 ++----------------- .../data_values/ut_data_value_anydata.tps | 1 - 5 files changed, 22 insertions(+), 72 deletions(-) diff --git a/source/core/ut_metadata.pkb b/source/core/ut_metadata.pkb index c1193a2f8..fd876fbd5 100644 --- a/source/core/ut_metadata.pkb +++ b/source/core/ut_metadata.pkb @@ -331,6 +331,15 @@ create or replace package body ut_metadata as end if; return l_result; end; + + function get_object_name(a_full_object_name in varchar2) return varchar2 is + l_schema varchar(250); + l_object varchar(250); + l_procedure_name varchar(250); + begin + ut_metadata.do_resolve(a_full_object_name,7,l_schema,l_object, l_procedure_name); + return l_object; + end; end; / diff --git a/source/core/ut_metadata.pks b/source/core/ut_metadata.pks index 832d48b6e..6c9c8db46 100644 --- a/source/core/ut_metadata.pks +++ b/source/core/ut_metadata.pks @@ -167,5 +167,10 @@ create or replace package ut_metadata authid current_user as */ function is_anytype_null(a_value in anydata, a_compound_type in varchar2) return number; + /** + * Get object name from fully qualified name e.g ut3.test -> test + */ + function get_object_name(a_full_object_name in varchar2) return varchar2; + end ut_metadata; / diff --git a/source/expectations/data_values/ut_cursor_column.tpb b/source/expectations/data_values/ut_cursor_column.tpb index 923dd0cd4..ab83ff339 100644 --- a/source/expectations/data_values/ut_cursor_column.tpb +++ b/source/expectations/data_values/ut_cursor_column.tpb @@ -30,7 +30,7 @@ create or replace type body ut_cursor_column as when lower(self.column_type) = 'user_defined_type' then 0 -- Due to bug in 11g/12.1 collection fails on varchar 4000+ - when (lower(self.column_type) in ('varchar2','char')) and (self.column_len >= 4000) then + when (lower(self.column_type) in ('varchar2','char')) and (self.column_len > 4000) then 0 else ut_utils.boolean_to_int(ut_compound_data_helper.is_sql_compare_allowed(self.column_type)) diff --git a/source/expectations/data_values/ut_data_value_anydata.tpb b/source/expectations/data_values/ut_data_value_anydata.tpb index f892c9c88..ebb23ae35 100644 --- a/source/expectations/data_values/ut_data_value_anydata.tpb +++ b/source/expectations/data_values/ut_data_value_anydata.tpb @@ -36,79 +36,13 @@ create or replace type body ut_data_value_anydata as return l_path; end; - overriding member procedure extract_cursor(self in out nocopy ut_data_value_anydata, a_value sys_refcursor) - is - c_bulk_rows constant integer := 10000; - l_cursor sys_refcursor := a_value; - l_ctx number; - l_xml xmltype; - l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_set_id integer := 0; - l_elements_count number := 0; - begin - -- We use DBMS_XMLGEN in order to: - -- 1) be able to process data in bulks (set of rows) - -- 2) be able to influence the ROWSET/ROW tags - -- 3) be able to influence the way NULL values are handled (empty TAG) - -- 4) be able to influence the way TIMESTAMP is formatted. - -- Due to Oracle feature/bug, it is not possible to change the DATE formatting of cursor data - -- AFTER the cursor was opened. - -- The only solution for this is to change NLS settings before opening the cursor. - -- - -- This would work fine if we could use DBMS_XMLGEN.restartQuery. - -- The restartQuery fails however if PLSQL variables of TIMESTAMP/INTERVAL or CLOB/BLOB are used. - ut_expectation_processor.set_xml_nls_params(); - l_ctx := dbms_xmlgen.newContext(l_cursor); - dbms_xmlgen.setNullHandling(l_ctx, dbms_xmlgen.empty_tag); - dbms_xmlgen.setMaxRows(l_ctx, c_bulk_rows); - loop - l_xml := dbms_xmlgen.getxmltype(l_ctx); - exit when dbms_xmlgen.getNumRowsProcessed(l_ctx) = 0; - l_elements_count := l_elements_count + dbms_xmlgen.getNumRowsProcessed(l_ctx); - execute immediate - 'insert into ' || l_ut_owner || '.ut_compound_data_tmp(data_id, item_no, item_data) ' || - 'values (:self_guid, :self_row_count, :l_xml)' - using in self.data_id, l_set_id, l_xml; - l_set_id := l_set_id + c_bulk_rows; - end loop; - ut_expectation_processor.reset_nls_params(); - dbms_xmlgen.closeContext(l_ctx); - self.elements_count := l_elements_count; - exception - when others then - ut_expectation_processor.reset_nls_params(); - dbms_xmlgen.closeContext(l_ctx); - raise; - end; - member procedure init(self in out nocopy ut_data_value_anydata, a_value anydata) is l_refcursor sys_refcursor; l_ctx number; l_ut_owner varchar2(250) := ut_utils.ut_owner; cursor_not_open exception; l_cursor_number number; - l_anydata_sql varchar2(4000); - l_cursor_sql varchar2(2000); - - function resolve_name(a_object_name in varchar2) return varchar2 is - l_schema varchar(250); - l_object varchar(250); - l_procedure_name varchar(250); - begin - ut_metadata.do_resolve(a_object_name,7,l_schema,l_object, l_procedure_name); - return l_object; - end; - - function get_object_name(a_value anydata) return varchar2 is - begin - return resolve_name(ut_metadata.get_collection_element(a_value)); - end; - - function get_object_name(a_datatype in varchar2) return varchar2 is - begin - return resolve_name(a_datatype); - end; - + l_anydata_sql varchar2(4000); begin self.data_type := ut_metadata.get_anydata_typename(a_value); self.compound_type := get_instance(a_value); @@ -131,15 +65,18 @@ create or replace type body ut_data_value_anydata as begin l_status := l_value.get'||self.compound_type||'(l_data); '|| case when self.compound_type = 'collection' then - q'[ open :l_tmp_refcursor for select value(x) as "]'||get_object_name(a_value)||q'[" from table(l_data) x;]' + q'[ open :l_tmp_refcursor for select value(x) as "]'|| + ut_metadata.get_object_name(ut_metadata.get_collection_element(a_value))|| + q'[" from table(l_data) x;]' else - q'[ open :l_tmp_refcursor for select l_data as "]'||get_object_name(self.data_type)||q'[" from dual;]' + q'[ open :l_tmp_refcursor for select l_data as "]'||ut_metadata.get_object_name(self.data_type)|| + q'[" from dual;]' end || 'end;'; execute immediate l_anydata_sql using in a_value, in out l_refcursor; if l_refcursor%isopen then - extract_cursor(l_refcursor); + self.extract_cursor(l_refcursor); l_cursor_number := dbms_sql.to_cursor_number(l_refcursor); self.cursor_details := ut_cursor_details(l_cursor_number); dbms_sql.close_cursor(l_cursor_number); diff --git a/source/expectations/data_values/ut_data_value_anydata.tps b/source/expectations/data_values/ut_data_value_anydata.tps index f82be3036..5d0c67ea7 100644 --- a/source/expectations/data_values/ut_data_value_anydata.tps +++ b/source/expectations/data_values/ut_data_value_anydata.tps @@ -18,7 +18,6 @@ create or replace type ut_data_value_anydata under ut_data_value_refcursor( overriding member function get_object_info return varchar2, member function get_extract_path(a_data_value anydata) return varchar2, - overriding member procedure extract_cursor(self in out nocopy ut_data_value_anydata, a_value sys_refcursor), member procedure init(self in out nocopy ut_data_value_anydata, a_value anydata), member function get_instance(a_data_value anydata) return varchar2, constructor function ut_data_value_anydata(self in out nocopy ut_data_value_anydata, a_value anydata) return self as result, From e32d7004a398968d0d949a95ff016a66fa49a9cb Mon Sep 17 00:00:00 2001 From: lwasylow Date: Wed, 6 Mar 2019 13:29:03 +0000 Subject: [PATCH 0260/1096] Refactoring --- source/core/ut_metadata.pkb | 19 +++ source/core/ut_metadata.pks | 5 + .../data_values/ut_compound_data_helper.pkb | 98 -------------- .../data_values/ut_compound_data_helper.pks | 10 -- .../data_values/ut_compound_data_value.tpb | 126 ------------------ .../data_values/ut_compound_data_value.tps | 6 +- .../data_values/ut_data_value_anydata.tpb | 65 ++++----- .../data_values/ut_data_value_anydata.tps | 1 + .../data_values/ut_data_value_refcursor.tpb | 5 + .../data_values/ut_data_value_refcursor.tps | 1 + 10 files changed, 61 insertions(+), 275 deletions(-) diff --git a/source/core/ut_metadata.pkb b/source/core/ut_metadata.pkb index fd876fbd5..e282a16cd 100644 --- a/source/core/ut_metadata.pkb +++ b/source/core/ut_metadata.pkb @@ -341,5 +341,24 @@ create or replace package body ut_metadata as return l_object; end; + function get_anydata_compound_type(a_data_value anydata) return varchar2 is + l_result varchar2(30); + l_type anytype; + l_type_code integer; + begin + if a_data_value is not null then + l_type_code := a_data_value.gettype(l_type); + if l_type_code in (dbms_types.typecode_table, dbms_types.typecode_varray, dbms_types.typecode_namedcollection, + dbms_types.typecode_object) then + if l_type_code = dbms_types.typecode_object then + l_result := 'object'; + else + l_result := 'collection'; + end if; + end if; + end if; + return l_result; + end; + end; / diff --git a/source/core/ut_metadata.pks b/source/core/ut_metadata.pks index 6c9c8db46..184943f2a 100644 --- a/source/core/ut_metadata.pks +++ b/source/core/ut_metadata.pks @@ -171,6 +171,11 @@ create or replace package ut_metadata authid current_user as * Get object name from fully qualified name e.g ut3.test -> test */ function get_object_name(a_full_object_name in varchar2) return varchar2; + + /** + * Based on anydata decide if its a object or collection + */ + function get_anydata_compound_type(a_data_value anydata) return varchar2; end ut_metadata; / diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 057c8b696..643909efb 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -69,28 +69,6 @@ create or replace package body ut_compound_data_helper is from act a {:join_type:} exp e on ( {:join_condition:} ) where {:where_condition:}]'; - function get_columns_filter( - a_exclude_xpath varchar2, a_include_xpath varchar2, - a_table_alias varchar2 := 'ucd', a_column_alias varchar2 := 'item_data' - ) return varchar2 is - l_filter varchar2(32767); - l_source_column varchar2(500) := a_table_alias||'.'||a_column_alias; - begin - -- this SQL statement is constructed in a way that we always get the same number and ordering of substitution variables - -- That is, we always get: l_exclude_xpath, l_include_xpath - -- regardless if the variables are NULL (not to be used) or NOT NULL and will be used for filtering - if a_exclude_xpath is null and a_include_xpath is null then - l_filter := ':l_exclude_xpath, :l_include_xpath, '||l_source_column||' as '||a_column_alias; - elsif a_exclude_xpath is not null and a_include_xpath is null then - l_filter := 'deletexml( '||l_source_column||', :l_exclude_xpath ) as '||a_column_alias||', :l_include_xpath'; - elsif a_exclude_xpath is null and a_include_xpath is not null then - l_filter := ':l_exclude_xpath, extract( '||l_source_column||', :l_include_xpath ) as '||a_column_alias; - elsif a_exclude_xpath is not null and a_include_xpath is not null then - l_filter := 'extract( deletexml( '||l_source_column||', :l_exclude_xpath ), :l_include_xpath ) as '||a_column_alias; - end if; - return l_filter; - end; - function get_columns_diff( a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab, @@ -530,82 +508,6 @@ create or replace package body ut_compound_data_helper is return l_results; end; - --TODO : removal - function get_rows_diff( - a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, - a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2 - ) return tt_row_diffs is - l_column_filter varchar2(32767); - l_results tt_row_diffs; - begin - l_column_filter := get_columns_filter(a_exclude_xpath,a_include_xpath); - execute immediate q'[ - with - diff_info as ( select item_no - from - (select item_no from ut_compound_data_diff_tmp ucdc where diff_id = :diff_guid order by item_no asc) - where rownum <= :max_rows) - select * - from (select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, null pk_value - from (select nvl(exp.rn, act.rn) rn, - xmlagg(exp.col order by exp.col_no) exp_item, - xmlagg(act.col order by act.col_no) act_item - from (select r.item_no as rn, rownum col_no, s.column_value col, - s.column_value.getRootElement() col_name, - s.column_value.getclobval() col_val - from (select ]'||l_column_filter||q'[, ucd.item_no, ucd.item_data item_data_no_filter - from ut_compound_data_tmp ucd, - diff_info i - where ucd.data_id = :self_guid - and ucd.item_no = i.item_no - ) r, - table( xmlsequence( extract(r.item_data,'/*/*') ) ) s - ) exp - join ( - select item_no as rn, rownum col_no, s.column_value col, - s.column_value.getRootElement() col_name, - s.column_value.getclobval() col_val - from (select ]'||l_column_filter||q'[, ucd.item_no, ucd.item_data item_data_no_filter - from ut_compound_data_tmp ucd, - diff_info i - where ucd.data_id = :other_guid - and ucd.item_no = i.item_no - ) r, - table( xmlsequence( extract(r.item_data,'/*/*') ) ) s - ) act - on exp.rn = act.rn and exp.col_name = act.col_name - where dbms_lob.compare(exp.col_val, act.col_val) != 0 - group by exp.rn, act.rn - ) - unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:') ) - ) - union all - select nvl(exp.item_no, act.item_no) rn, - case when exp.item_no is null then 'Extra:' else 'Missing:' end as diff_type, - xmlserialize(content nvl(exp.item_data, act.item_data) no indent) diffed_row, - null pk_value - from (select ucd.item_no, extract(ucd.item_data,'/*/*') item_data - from ut_compound_data_tmp ucd - where ucd.data_id = :self_guid - and ucd.item_no in (select i.item_no from diff_info i) - ) exp - full outer join ( - select ucd.item_no, extract(ucd.item_data,'/*/*') item_data - from ut_compound_data_tmp ucd - where ucd.data_id = :other_guid - and ucd.item_no in (select i.item_no from diff_info i) - )act - on exp.item_no = act.item_no - where exp.item_no is null or act.item_no is null - order by 1, 2]' - bulk collect into l_results - using a_diff_id, a_max_rows, - a_exclude_xpath, a_include_xpath, a_expected_dataset_guid, - a_exclude_xpath, a_include_xpath, a_actual_dataset_guid, - a_expected_dataset_guid, a_actual_dataset_guid; - return l_results; - end; - function get_hash(a_data raw, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash is begin return dbms_crypto.hash(a_data, a_hash_type); diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 63d5df8f0..679c13692 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -51,20 +51,10 @@ create or replace package ut_compound_data_helper authid definer is type t_diff_tab is table of t_diff_rec; - function get_columns_filter( - a_exclude_xpath varchar2, a_include_xpath varchar2, - a_table_alias varchar2 := 'ucd', a_column_alias varchar2 := 'item_data' - ) return varchar2; - function get_columns_diff( a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab,a_order_enforced boolean := false ) return tt_column_diffs; - function get_rows_diff( - a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, - a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2 - ) return tt_row_diffs; - function get_rows_diff_by_sql( a_act_cursor_info ut_cursor_column_tab,a_exp_cursor_info ut_cursor_column_tab, a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index a20b1c765..4aecdb81f 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -36,11 +36,6 @@ create or replace type body ut_compound_data_value as return not self.is_null(); end; - overriding member function compare_implementation(a_other ut_data_value) return integer is - begin - return compare_implementation( a_other, null ); - end; - overriding member function to_string return varchar2 is l_results ut_utils.t_clob_tab; l_result clob; @@ -68,126 +63,5 @@ create or replace type body ut_compound_data_value as return l_result_string; end; - overriding member function diff( a_other ut_data_value, a_match_options ut_matcher_options ) return varchar2 is - l_result clob; - l_result_string varchar2(32767); - begin - l_result := get_data_diff( a_other, a_match_options ); - l_result_string := ut_utils.to_string(l_result,null); - dbms_lob.freetemporary(l_result); - return l_result_string; - end; - - -- TODO : Rework to exclude xpath - member function get_data_diff( a_other ut_data_value, a_match_options ut_matcher_options ) return clob is - c_max_rows integer := ut_utils.gc_diff_max_rows; - l_result clob; - l_results ut_utils.t_clob_tab := ut_utils.t_clob_tab(); - l_message varchar2(32767); - l_diff_row_count integer; - l_actual ut_compound_data_value; - l_diff_id ut_compound_data_helper.t_hash; - l_row_diffs ut_compound_data_helper.tt_row_diffs; - - function get_diff_message (a_row_diff ut_compound_data_helper.t_row_diffs) return varchar2 is - begin - return ' Row No. '||a_row_diff.rn||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; - end; - - begin - if not a_other is of (ut_compound_data_value) then - raise value_error; - end if; - - l_actual := treat(a_other as ut_compound_data_value); - - dbms_lob.createtemporary(l_result,true); - - l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_actual.data_id); - -- First tell how many rows are different - l_diff_row_count := ut_compound_data_helper.get_rows_diff_count; - if l_diff_row_count > 0 then - l_row_diffs := ut_compound_data_helper.get_rows_diff( - self.data_id, l_actual.data_id, l_diff_id, c_max_rows, - a_match_options.exclude.to_xpath(), - a_match_options.exclude.to_xpath() - ); - l_message := chr(10) - ||'Rows: [ ' || l_diff_row_count ||' differences' - || case when l_diff_row_count > c_max_rows and l_row_diffs.count > 0 then ', showing first '||c_max_rows end - ||' ]'||chr(10)|| case when l_row_diffs.count = 0 then ' All rows are different as the columns are not matching.' else null end; - ut_utils.append_to_clob( l_result, l_message ); - for i in 1 .. l_row_diffs.count loop - l_results.extend; - l_results(l_results.last) := get_diff_message( l_row_diffs(i) ); - end loop; - ut_utils.append_to_clob(l_result,l_results); - else - l_message:= chr(10)||'Rows: [ all different ]'||chr(10)||' All rows are different as the columns are not matching.'; - ut_utils.append_to_clob( l_result, l_message ); - end if; - return l_result; - end; - - - member function compare_implementation(a_other ut_data_value, a_match_options ut_matcher_options) return integer is - l_other ut_compound_data_value; - l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_column_filter varchar2(32767); - l_diff_id ut_compound_data_helper.t_hash; - l_result integer; - --the XML stylesheet is applied on XML representation of data to exclude column names from comparison - --column names and data-types are compared separately - --user CHR(38) instead of ampersand to eliminate define request when installing through some IDEs - l_xml_data_fmt constant xmltype := xmltype( - q'[ - - - - - - '||CHR(38)||'#xD; - , - - - - ]'); - begin - if not a_other is of (ut_compound_data_value) then - raise value_error; - end if; - - l_other := treat(a_other as ut_compound_data_value); - - l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); - l_column_filter := ut_compound_data_helper.get_columns_filter( a_match_options.exclude.to_xpath(), a_match_options.include.to_xpath() ); - -- Find differences - execute immediate 'insert into ' || l_ut_owner || '.ut_compound_data_diff_tmp ( diff_id, item_no ) - select :diff_id, nvl(exp.item_no, act.item_no) - from (select '||l_column_filter||', ucd.item_no - from ' || l_ut_owner || '.ut_compound_data_tmp ucd where ucd.data_id = :self_guid) exp - full outer join - (select '||l_column_filter||', ucd.item_no - from ' || l_ut_owner || '.ut_compound_data_tmp ucd where ucd.data_id = :l_other_guid) act - on exp.item_no = act.item_no '|| - 'where nvl( dbms_lob.compare(' || - /*the xmltransform removes column names and leaves column data to be compared only*/ - ' coalesce( xmltransform(exp.item_data, :l_xml_data_fmt).getclobval(), empty_clob() )' || - ', coalesce( xmltransform(act.item_data, :l_xml_data_fmt).getclobval(), empty_clob() )' || - ')' || - ',1' || - ') != 0' - using in l_diff_id, a_match_options.exclude.to_xpath(), a_match_options.include.to_xpath(), self.data_id, - a_match_options.exclude.to_xpath(), a_match_options.include.to_xpath(), l_other.data_id, l_xml_data_fmt, l_xml_data_fmt; - --result is OK only if both are same - if sql%rowcount = 0 and self.elements_count = l_other.elements_count then - l_result := 0; - else - ut_compound_data_helper.set_rows_diff(sql%rowcount); - l_result := 1; - end if; - return l_result; - end; - end; / diff --git a/source/expectations/data_values/ut_compound_data_value.tps b/source/expectations/data_values/ut_compound_data_value.tps index 44532c2e4..8e42765f5 100644 --- a/source/expectations/data_values/ut_compound_data_value.tps +++ b/source/expectations/data_values/ut_compound_data_value.tps @@ -44,10 +44,6 @@ create or replace type ut_compound_data_value force under ut_data_value( overriding member function is_null return boolean, overriding member function is_diffable return boolean, overriding member function to_string return varchar2, - overriding member function is_multi_line return boolean, - overriding member function compare_implementation(a_other ut_data_value) return integer, - overriding member function diff( a_other ut_data_value, a_match_options ut_matcher_options ) return varchar2, - member function get_data_diff( a_other ut_data_value, a_match_options ut_matcher_options ) return clob, - member function compare_implementation( a_other ut_data_value, a_match_options ut_matcher_options ) return integer + overriding member function is_multi_line return boolean ) not final not instantiable / diff --git a/source/expectations/data_values/ut_data_value_anydata.tpb b/source/expectations/data_values/ut_data_value_anydata.tpb index ebb23ae35..19917633a 100644 --- a/source/expectations/data_values/ut_data_value_anydata.tpb +++ b/source/expectations/data_values/ut_data_value_anydata.tpb @@ -35,6 +35,29 @@ create or replace type body ut_data_value_anydata as end if; return l_path; end; + + member function get_cursor_sql_from_anydata(a_data_value anydata) return varchar2 is + l_cursor_sql varchar2(32767); + begin + l_cursor_sql := ' + declare + l_data '||self.data_type||'; + l_value anydata := :a_value; + l_status integer; + l_tmp_refcursor sys_refcursor; + begin + l_status := l_value.get'||self.compound_type||'(l_data); '|| + case when self.compound_type = 'collection' then + q'[ open :l_tmp_refcursor for select value(x) as "]'|| + ut_metadata.get_object_name(ut_metadata.get_collection_element(a_data_value))|| + q'[" from table(l_data) x;]' + else + q'[ open :l_tmp_refcursor for select l_data as "]'||ut_metadata.get_object_name(self.data_type)|| + q'[" from dual;]' + end || + 'end;'; + return l_cursor_sql; + end; member procedure init(self in out nocopy ut_data_value_anydata, a_value anydata) is l_refcursor sys_refcursor; @@ -42,7 +65,7 @@ create or replace type body ut_data_value_anydata as l_ut_owner varchar2(250) := ut_utils.ut_owner; cursor_not_open exception; l_cursor_number number; - l_anydata_sql varchar2(4000); + l_anydata_sql varchar2(32767); begin self.data_type := ut_metadata.get_anydata_typename(a_value); self.compound_type := get_instance(a_value); @@ -55,26 +78,8 @@ create or replace type body ut_data_value_anydata as if not self.is_null() then self.extract_path := get_extract_path(a_value); - --get_cursor_from_anydata(a_value,l_refcursor); - l_anydata_sql := ' - declare - l_data '||self.data_type||'; - l_value anydata := :a_value; - l_status integer; - l_tmp_refcursor sys_refcursor; - begin - l_status := l_value.get'||self.compound_type||'(l_data); '|| - case when self.compound_type = 'collection' then - q'[ open :l_tmp_refcursor for select value(x) as "]'|| - ut_metadata.get_object_name(ut_metadata.get_collection_element(a_value))|| - q'[" from table(l_data) x;]' - else - q'[ open :l_tmp_refcursor for select l_data as "]'||ut_metadata.get_object_name(self.data_type)|| - q'[" from dual;]' - end || - 'end;'; - execute immediate l_anydata_sql using in a_value, in out l_refcursor; - + l_anydata_sql := get_cursor_sql_from_anydata(a_value); + execute immediate l_anydata_sql using in a_value, in out l_refcursor; if l_refcursor%isopen then self.extract_cursor(l_refcursor); l_cursor_number := dbms_sql.to_cursor_number(l_refcursor); @@ -84,7 +89,6 @@ create or replace type body ut_data_value_anydata as raise cursor_not_open; end if; end if; - exception when cursor_not_open then raise_application_error(-20155, 'Cursor is not open'); @@ -97,20 +101,10 @@ create or replace type body ut_data_value_anydata as member function get_instance(a_data_value anydata) return varchar2 is l_result varchar2(30); - l_type anytype; - l_type_code integer; begin - if a_data_value is not null then - l_type_code := a_data_value.gettype(l_type); - if l_type_code in (dbms_types.typecode_table, dbms_types.typecode_varray, dbms_types.typecode_namedcollection, dbms_types.typecode_object) then - if l_type_code = dbms_types.typecode_object then - l_result := 'object'; - else - l_result := 'collection'; - end if; - else - raise_application_error(-20000, 'Data type '||a_data_value.gettypename||' in ANYDATA is not supported by utPLSQL'); - end if; + l_result := ut_metadata.get_anydata_compound_type(a_data_value); + if l_result not in ('object','collection') then + raise_application_error(-20000, 'Data type '||a_data_value.gettypename||' in ANYDATA is not supported by utPLSQL'); end if; return l_result; end; @@ -133,7 +127,6 @@ create or replace type body ut_data_value_anydata as if not a_other is of (ut_data_value_anydata) then raise value_error; end if; - l_result := l_result + (self as ut_data_value_refcursor).compare_implementation(a_other,a_match_options,a_inclusion_compare,a_is_negated); return l_result; end; diff --git a/source/expectations/data_values/ut_data_value_anydata.tps b/source/expectations/data_values/ut_data_value_anydata.tps index 5d0c67ea7..c0ee6137b 100644 --- a/source/expectations/data_values/ut_data_value_anydata.tps +++ b/source/expectations/data_values/ut_data_value_anydata.tps @@ -18,6 +18,7 @@ create or replace type ut_data_value_anydata under ut_data_value_refcursor( overriding member function get_object_info return varchar2, member function get_extract_path(a_data_value anydata) return varchar2, + member function get_cursor_sql_from_anydata(a_data_value anydata) return varchar2, member procedure init(self in out nocopy ut_data_value_anydata, a_value anydata), member function get_instance(a_data_value anydata) return varchar2, constructor function ut_data_value_anydata(self in out nocopy ut_data_value_anydata, a_value anydata) return self as result, diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index ad55b7073..53c881693 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -275,6 +275,11 @@ create or replace type body ut_data_value_refcursor as return l_result_string; end; + overriding member function compare_implementation(a_other ut_data_value) return integer is + begin + return compare_implementation( a_other, null ); + end; + member function compare_implementation( a_other ut_data_value, a_match_options ut_matcher_options, diff --git a/source/expectations/data_values/ut_data_value_refcursor.tps b/source/expectations/data_values/ut_data_value_refcursor.tps index 4e100398e..7556ec3de 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tps +++ b/source/expectations/data_values/ut_data_value_refcursor.tps @@ -40,6 +40,7 @@ create or replace type ut_data_value_refcursor under ut_compound_data_value( member procedure init(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor), overriding member function to_string return varchar2, overriding member function diff( a_other ut_data_value, a_match_options ut_matcher_options ) return varchar2, + overriding member function compare_implementation(a_other ut_data_value) return integer, member function compare_implementation( a_other ut_data_value, a_match_options ut_matcher_options, From 282ad5e9d4861579df4212caf4a552c602ffc98d Mon Sep 17 00:00:00 2001 From: Travis CI Date: Wed, 6 Mar 2019 19:40:44 +0000 Subject: [PATCH 0261/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index d08ddc85c..905f96b87 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.4.2590-develop'; + gc_version constant varchar2(50) := 'v3.1.4.2595-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 5c1ef6927fd954f1663d576e5a1e9b9b9127dd40 Mon Sep 17 00:00:00 2001 From: Lukasz Date: Wed, 6 Mar 2019 20:19:48 +0000 Subject: [PATCH 0262/1096] Update sonar sh --- .travis/run_sonar_scanner.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis/run_sonar_scanner.sh b/.travis/run_sonar_scanner.sh index 5cad42e29..ad2ce743f 100755 --- a/.travis/run_sonar_scanner.sh +++ b/.travis/run_sonar_scanner.sh @@ -53,4 +53,5 @@ else fi #Execute Sonar scanner -sonar-scanner \ No newline at end of file +echo "Executing sonar scanner" +sonar-scanner From 71fd66d0767bd10e71370fb5e777de966fa9192b Mon Sep 17 00:00:00 2001 From: lwasylow Date: Wed, 6 Mar 2019 22:43:42 +0000 Subject: [PATCH 0263/1096] Fix condition where the pull request analysis was run but not on branches. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b396da748..c2447d81c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -94,7 +94,7 @@ before_script: script: - if [[ ! $TRAVIS_TAG ]]; then bash test/install_and_run_tests.sh; fi - if [[ ! $TRAVIS_TAG ]]; then bash .travis/validate_report_files.sh; fi - - if [[ ! $TRAVIS_TAG ]] && [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [ "${TRAVIS_PULL_REQUEST_SLUG}" = "${TRAVIS_REPO_SLUG}" ]; then bash .travis/run_sonar_scanner.sh; fi + - if [[ ! $TRAVIS_TAG ]] && [[ ("${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" && "$(TRAVIS_PULL_REQUEST)" == false) || ("${TRAVIS_PULL_REQUEST_SLUG}" = "${UTPLSQL_REPO}") ]]; then bash .travis/run_sonar_scanner.sh; fi - if [[ ! $TRAVIS_TAG ]]; then bash .travis/coveralls_uploader.sh; fi notifications: From 46b3ff5cba0a97975f0b257b96151683fd0decb2 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Wed, 6 Mar 2019 23:05:37 +0000 Subject: [PATCH 0264/1096] Fix condition where the pull request analysis was run but not on branches. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c2447d81c..e850ecad6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -94,7 +94,7 @@ before_script: script: - if [[ ! $TRAVIS_TAG ]]; then bash test/install_and_run_tests.sh; fi - if [[ ! $TRAVIS_TAG ]]; then bash .travis/validate_report_files.sh; fi - - if [[ ! $TRAVIS_TAG ]] && [[ ("${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" && "$(TRAVIS_PULL_REQUEST)" == false) || ("${TRAVIS_PULL_REQUEST_SLUG}" = "${UTPLSQL_REPO}") ]]; then bash .travis/run_sonar_scanner.sh; fi + - if [[ ! $TRAVIS_TAG ]] && [[ ("${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" && "${TRAVIS_PULL_REQUEST}" == false) || ("${TRAVIS_PULL_REQUEST_SLUG}" = "${UTPLSQL_REPO}") ]]; then bash .travis/run_sonar_scanner.sh; fi - if [[ ! $TRAVIS_TAG ]]; then bash .travis/coveralls_uploader.sh; fi notifications: From b91ea69809e6312cd0cd40cacd148e6e169acc01 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Wed, 6 Mar 2019 23:19:43 +0000 Subject: [PATCH 0265/1096] Fixing SONAR errors --- source/core/ut_metadata.pkb | 16 ++++------------ .../data_values/ut_compound_data_helper.pkb | 11 +++++++---- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/source/core/ut_metadata.pkb b/source/core/ut_metadata.pkb index e282a16cd..a254529f8 100644 --- a/source/core/ut_metadata.pkb +++ b/source/core/ut_metadata.pkb @@ -25,9 +25,6 @@ create or replace package body ut_metadata as procedure do_resolve(a_owner in out nocopy varchar2, a_object in out nocopy varchar2, a_procedure_name in out nocopy varchar2) is l_name varchar2(200); l_context integer := 1; --plsql - l_dblink varchar2(200); - l_part1_type number; - l_object_number number; begin l_name := form_name(a_owner, a_object, a_procedure_name); do_resolve(l_name,l_context,a_owner,a_object, a_procedure_name); @@ -292,17 +289,12 @@ create or replace package body ut_metadata as function has_collection_members (a_anydata in anydata) return boolean is l_anytype anytype; - l_nested_type t_anytype_members_rec; l_elements_rec t_anytype_elem_info_rec; l_type_code integer; begin l_type_code := a_anydata.gettype(l_anytype); l_elements_rec := get_attr_elem_info(l_anytype); - if l_elements_rec.attr_elt_type is null then - return false; - else - return true; - end if; + return l_elements_rec.attr_elt_type is not null; end; function get_anydata_typename(a_data_value anydata) return varchar2 @@ -333,9 +325,9 @@ create or replace package body ut_metadata as end; function get_object_name(a_full_object_name in varchar2) return varchar2 is - l_schema varchar(250); - l_object varchar(250); - l_procedure_name varchar(250); + l_schema varchar2(250); + l_object varchar2(250); + l_procedure_name varchar2(250); begin ut_metadata.do_resolve(a_full_object_name,7,l_schema,l_object, l_procedure_name); return l_object; diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 643909efb..a139bf991 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -91,6 +91,8 @@ create or replace package body ut_compound_data_helper is || case when a_order_enforced then ', row_number() over(partition by case when a.act_col_pos + e.exp_col_pos is not null then 1 end order by a.act_col_pos) a_pos_nn, row_number() over(partition by case when a.act_col_pos + e.exp_col_pos is not null then 1 end order by e.exp_col_pos) e_pos_nn' + else + null end ||q'[ from expected_cols e full outer join actual_cols a @@ -112,6 +114,8 @@ create or replace package body ut_compound_data_helper is || case when a_order_enforced then q'[ --column position is not matching (both when excluded extra/missing columns as well as when they are included) or (a_pos_nn != e_pos_nn and exp_col_pos != act_col_pos)]' + else + null end ||q'[ order by exp_col_pos, act_col_pos]' bulk collect into l_results using a_expected, a_actual; @@ -312,7 +316,6 @@ create or replace package body ut_compound_data_helper is l_xmltable_stmt clob; l_select_stmt clob; l_partition_stmt clob; - l_equal_stmt clob; l_join_on_stmt clob; l_not_equal_stmt clob; l_where_stmt clob; @@ -356,10 +359,8 @@ create or replace package body ut_compound_data_helper is l_compare_sql := replace(l_compare_sql,'{:join_type:}',get_join_type(a_inclusion_type,a_is_negated)); l_compare_sql := replace(l_compare_sql,'{:join_condition:}',l_join_on_stmt); - if l_not_equal_stmt is not null then - if (a_join_by_list.count > 0 and not a_is_negated) or (not a_unordered) then + if l_not_equal_stmt is not null and ((a_join_by_list.count > 0 and not a_is_negated) or (not a_unordered)) then ut_utils.append_to_clob(l_where_stmt,' ( '||l_not_equal_stmt||' ) or '); - end if; end if; --If its inclusion we expect a actual set to fully match and have no extra elements over expected if a_inclusion_type then @@ -499,6 +500,8 @@ create or replace package body ut_compound_data_helper is case when final_order = 1 then to_char(rn) else col_name end, case when final_order = 1 then to_char(rnk) else col_name end ]' + else + null end; execute immediate l_sql bulk collect into l_results From afdafbf2452b16690a5a56cef541f35606900f52 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Wed, 6 Mar 2019 23:44:25 +0000 Subject: [PATCH 0266/1096] Narrowing focus of analysis to exclude installation files as this creates false picture. --- sonar-project.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/sonar-project.properties b/sonar-project.properties index 816b63607..9f5f555ae 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -18,6 +18,7 @@ sonar.links.homepage=https://github.com/utPLSQL/utPLSQL sonar.projectDescription=PL/SQL Unit Testing Framework sonar.plsql.file.suffixes=sql,tab,pkb,tpb sonar.language=plsql +sonar.inclusions=./source/reporters/** , ./source/api/** , ./source/core/** , ./source/expectations/** sonar.pullrequest.provider=github sonar.pullrequest.github.endpoint=https://api.github.com/ From f7dd4e15b2fbaad25238b96bbabbd5f46aef0437 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Wed, 6 Mar 2019 23:59:04 +0000 Subject: [PATCH 0267/1096] Backout inclusions not working as expected. --- sonar-project.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index 9f5f555ae..816b63607 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -18,7 +18,6 @@ sonar.links.homepage=https://github.com/utPLSQL/utPLSQL sonar.projectDescription=PL/SQL Unit Testing Framework sonar.plsql.file.suffixes=sql,tab,pkb,tpb sonar.language=plsql -sonar.inclusions=./source/reporters/** , ./source/api/** , ./source/core/** , ./source/expectations/** sonar.pullrequest.provider=github sonar.pullrequest.github.endpoint=https://api.github.com/ From 0c3e6952f8e284fe3b755311f1b8da59c9d079a8 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Thu, 7 Mar 2019 00:02:46 +0000 Subject: [PATCH 0268/1096] Trying to use exclusions --- sonar-project.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sonar-project.properties b/sonar-project.properties index 816b63607..cad03d30d 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -19,6 +19,9 @@ sonar.projectDescription=PL/SQL Unit Testing Framework sonar.plsql.file.suffixes=sql,tab,pkb,tpb sonar.language=plsql +sonar.exclusions=create_synonyms_and_grants_for_public.sql, create_user_grants.sql, create_user_synonyms.sql, create_utplsql_owner.sql, define_ut3_owner_param.sql, install.sql, install_above_12_1.sql, install_component.sql, install_headless.sql, uninstall.sql, uninstall_all.sql, uninstall_coverage_tables.sql + + sonar.pullrequest.provider=github sonar.pullrequest.github.endpoint=https://api.github.com/ sonar.pullrequest.github.repository=utPLSQL/utPLSQL From 52146fc6023d1486ec7bedc022e29329c6ef0d75 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Thu, 7 Mar 2019 07:12:26 +0000 Subject: [PATCH 0269/1096] Addressing issue on short living branches. Could not find ref 'develop' in refs/heads or refs/remotes/origin. You may see unexpected issues and changes. Please make sure to fetch this ref before pull request analysis. --- .travis/run_sonar_scanner.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis/run_sonar_scanner.sh b/.travis/run_sonar_scanner.sh index 5cad42e29..bd6810291 100755 --- a/.travis/run_sonar_scanner.sh +++ b/.travis/run_sonar_scanner.sh @@ -52,5 +52,8 @@ else echo "No need to update sonar we building on release or develop" fi +#Address issue : Could not find ref 'develop' in refs/heads or refs/remotes/origin +git fetch --no-tags https://github.com/utPLSQL/utPLSQL.git +refs/heads/develop:refs/remotes/origin/develop + #Execute Sonar scanner sonar-scanner \ No newline at end of file From 3d9e7e49fc94a9bed9baa8f80d28c08c0d1f13e1 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 7 Mar 2019 15:27:16 +0000 Subject: [PATCH 0270/1096] Initial commit of `ut_debug_reporter` --- source/api/ut_runner.pkb | 20 +++---- source/core/events/ut_event_item.tpb | 26 +++++++++ source/core/events/ut_event_item.tps | 4 +- source/core/events/ut_event_manager.pkb | 30 +++++++---- source/core/events/ut_event_manager.pks | 7 ++- source/core/types/ut_reporter_base.tpb | 1 + source/core/types/ut_run_info.tpb | 48 +++++++++++++++++ source/core/types/ut_run_info.tps | 28 ++++++++++ .../create_synonyms_and_grants_for_public.sql | 2 + source/create_user_grants.sql | 1 + source/create_user_synonyms.sql | 1 + source/install.sql | 6 +++ source/reporters/ut_debug_reporter.tpb | 54 +++++++++++++++++++ source/reporters/ut_debug_reporter.tps | 31 +++++++++++ source/uninstall_objects.sql | 4 ++ test/api/test_ut_runner.pkb | 4 +- 16 files changed, 244 insertions(+), 23 deletions(-) create mode 100644 source/core/events/ut_event_item.tpb create mode 100644 source/core/types/ut_run_info.tpb create mode 100644 source/core/types/ut_run_info.tps create mode 100644 source/reporters/ut_debug_reporter.tpb create mode 100644 source/reporters/ut_debug_reporter.tps diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index dcc8e59f3..aa6280a99 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -96,6 +96,17 @@ create or replace package body ut_runner is l_paths ut_varchar2_list := ut_varchar2_list(); begin ut_event_manager.initialize(); + if a_reporters is not empty then + for i in 1 .. a_reporters.count loop + ut_event_manager.add_listener( a_reporters(i) ); + end loop; + else + ut_event_manager.add_listener( ut_documentation_reporter() ); + end if; + + ut_event_manager.trigger_event(ut_event_manager.gc_initialize); + ut_event_manager.trigger_event(ut_event_manager.gc_debug, ut_run_info()); + if a_paths is null or a_paths is empty or a_paths.count = 1 and a_paths(1) is null then l_paths := ut_varchar2_list(sys_context('userenv', 'current_schema')); else @@ -109,13 +120,6 @@ create or replace package body ut_runner is ut_utils.save_dbms_output_to_cache(); ut_console_reporter_base.set_color_enabled(a_color_console); - if a_reporters is null or a_reporters.count = 0 then - ut_event_manager.add_listener(ut_documentation_reporter()); - else - for i in 1 .. a_reporters.count loop - ut_event_manager.add_listener(a_reporters(i)); - end loop; - end if; if a_coverage_schemes is not empty then l_coverage_schema_names := ut_utils.convert_collection(a_coverage_schemes); @@ -142,8 +146,6 @@ create or replace package body ut_runner is a_client_character_set ); - ut_event_manager.trigger_event(ut_event_manager.gc_initialize, l_run); - ut_suite_manager.configure_execution_by_path(l_paths, l_run.items); if a_force_manual_rollback then l_run.set_rollback_type( a_rollback_type => ut_utils.gc_rollback_manual, a_force => true ); diff --git a/source/core/events/ut_event_item.tpb b/source/core/events/ut_event_item.tpb new file mode 100644 index 000000000..efbab5041 --- /dev/null +++ b/source/core/events/ut_event_item.tpb @@ -0,0 +1,26 @@ +create or replace type body ut_event_item is + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + member function to_clob return clob is + l_clob clob; + begin + select xmlserialize( content deletexml(xmltype(self),'/*/ITEMS') as clob indent size = 2 ) into l_clob from dual; + return l_clob; + end; +end; +/ diff --git a/source/core/events/ut_event_item.tps b/source/core/events/ut_event_item.tps index 398cc2ac0..4f7eec758 100644 --- a/source/core/events/ut_event_item.tps +++ b/source/core/events/ut_event_item.tps @@ -20,7 +20,7 @@ create or replace type ut_event_item authid current_user as object ( * Object type is a pre-declaration to be referenced by ut_event_listener_base * The true abstract type is ut_suite_item */ - self_type varchar2(250 byte) - + self_type varchar2(250 byte), + member function to_clob return clob ) not final not instantiable / diff --git a/source/core/events/ut_event_manager.pkb b/source/core/events/ut_event_manager.pkb index aface1f59..2c014f4b1 100644 --- a/source/core/events/ut_event_manager.pkb +++ b/source/core/events/ut_event_manager.pkb @@ -57,15 +57,26 @@ create or replace package body ut_event_manager as end if; end; - procedure trigger_event( a_event_name t_event_name, a_event_object ut_event_item ) is - begin - if a_event_name is not null and g_event_listeners_index.exists(a_event_name) - then - for listener_number in 1 .. g_event_listeners_index(a_event_name).count loop - g_listeners(listener_number).on_event(a_event_name, a_event_object); + procedure trigger_event( a_event_name t_event_name, a_event_object ut_event_item := null ) is + procedure trigger_listener_event( a_listener_numbers t_listener_numbers, a_event_name t_event_name, a_event_object ut_event_item ) is + l_listener_number t_listener_number; + begin + l_listener_number := a_listener_numbers.first; + while l_listener_number is not null loop + g_listeners(l_listener_number).on_event(a_event_name, a_event_object); + l_listener_number := a_listener_numbers.next(l_listener_number); end loop; + end; + begin + if a_event_name is not null then + if g_event_listeners_index.exists(gc_all) then + trigger_listener_event( g_event_listeners_index(gc_all), a_event_name, a_event_object ); + end if; + if g_event_listeners_index.exists(a_event_name) then + trigger_listener_event( g_event_listeners_index(a_event_name), a_event_name, a_event_object ); + end if; if a_event_name = ut_event_manager.gc_finalize then - dispose_listeners; + dispose_listeners(); end if; end if; end; @@ -78,7 +89,7 @@ create or replace package body ut_event_manager as procedure add_events( a_event_names ut_varchar2_list, a_listener_pos binary_integer ) is begin for i in 1 .. a_event_names.count loop - add_event(a_event_names(i), a_listener_pos); + add_event( a_event_names(i), a_listener_pos ); end loop; end; @@ -98,10 +109,9 @@ create or replace package body ut_event_manager as if a_listener is not null then l_event_names := a_listener.get_supported_events(); if l_event_names is not empty then - add_events( l_event_names, add_listener(a_listener ) ); + add_events( l_event_names, add_listener( a_listener ) ); end if; end if; - end; end; diff --git a/source/core/events/ut_event_manager.pks b/source/core/events/ut_event_manager.pks index 9fdba575f..948a9550c 100644 --- a/source/core/events/ut_event_manager.pks +++ b/source/core/events/ut_event_manager.pks @@ -18,6 +18,11 @@ create or replace package ut_event_manager authid current_user as /* Constants: Event names */ subtype t_event_name is varchar2(250); + --capture all events + gc_all constant t_event_name := 'all'; + + gc_debug constant t_event_name := 'debug'; + gc_initialize constant t_event_name := 'initialize'; gc_before_run constant t_event_name := 'before_run'; @@ -51,7 +56,7 @@ create or replace package ut_event_manager authid current_user as gc_finalize constant t_event_name := 'finalize'; - procedure trigger_event( a_event_name t_event_name, a_event_object ut_event_item ); + procedure trigger_event( a_event_name t_event_name, a_event_object ut_event_item := null ); procedure initialize; diff --git a/source/core/types/ut_reporter_base.tpb b/source/core/types/ut_reporter_base.tpb index 006cbd4f3..741d024e0 100644 --- a/source/core/types/ut_reporter_base.tpb +++ b/source/core/types/ut_reporter_base.tpb @@ -211,6 +211,7 @@ create or replace type body ut_reporter_base is then self.after_calling_after_all(treat(a_event_item as ut_executable)); when ut_event_manager.gc_finalize then self.on_finalize(treat(a_event_item as ut_run)); + else null; end case; end; diff --git a/source/core/types/ut_run_info.tpb b/source/core/types/ut_run_info.tpb new file mode 100644 index 000000000..f5a117f95 --- /dev/null +++ b/source/core/types/ut_run_info.tpb @@ -0,0 +1,48 @@ +create or replace type body ut_run_info as + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions andTEST_GET_REPORTERS_LIST + limitations under the License. + */ + constructor function ut_run_info(self in out nocopy ut_run_info) return self as result is + l_ut_owner varchar2(250) := ut_utils.ut_owner; + begin + self.self_type := $$plsql_unit; + execute immediate + 'select '||l_ut_owner||'.ut.version() from dual' + into self.ut_version; + + dbms_utility.db_version( self.db_version, self.db_compatibility ); + db_os_type := dbms_utility.port_string(); + + execute immediate + 'select '||l_ut_owner||'.ut_key_value_pair(x.product, x.version) from product_component_version x' + bulk collect into self.db_component_version; + + execute immediate + 'select '||l_ut_owner||'.ut_key_value_pair(x.parameter, x.value) + from nls_session_parameters x' + bulk collect into self.nls_session_params; + + execute immediate + 'select '||l_ut_owner||'.ut_key_value_pair(x.parameter, x.value) from nls_instance_parameters x' + bulk collect into self.nls_instance_params; + + execute immediate + 'select '||l_ut_owner||'.ut_key_value_pair(x.parameter, x.value) from nls_database_parameters x' + bulk collect into self.nls_db_params; + return; + end; +end; +/ diff --git a/source/core/types/ut_run_info.tps b/source/core/types/ut_run_info.tps new file mode 100644 index 000000000..6781e8a99 --- /dev/null +++ b/source/core/types/ut_run_info.tps @@ -0,0 +1,28 @@ +create or replace type ut_run_info under ut_event_item ( + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + ut_version varchar2(4000), + db_version varchar2(4000), + db_compatibility varchar2(4000), + db_os_type varchar2(4000), + db_component_version ut_key_value_pairs, + nls_session_params ut_key_value_pairs, + nls_instance_params ut_key_value_pairs, + nls_db_params ut_key_value_pairs, + constructor function ut_run_info(self in out nocopy ut_run_info) return self as result +); +/ diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index fdc60ec11..02ff04735 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -49,6 +49,7 @@ grant execute on &&ut3_owner..ut_have_count to public; grant execute on &&ut3_owner..ut_match to public; grant execute on &&ut3_owner..ut to public; grant execute on &&ut3_owner..ut_runner to public; +grant execute on &&ut3_owner..ut_debug_reporter to public; grant execute on &&ut3_owner..ut_teamcity_reporter to public; grant execute on &&ut3_owner..ut_xunit_reporter to public; grant execute on &&ut3_owner..ut_junit_reporter to public; @@ -124,6 +125,7 @@ create public synonym have_count for &&ut3_owner..have_count; create public synonym match for &&ut3_owner..ut_match; create public synonym ut for &&ut3_owner..ut; create public synonym ut_runner for &&ut3_owner..ut_runner; +create public synonym ut_debug_reporter for &&ut3_owner..ut_debug_reporter; create public synonym ut_teamcity_reporter for &&ut3_owner..ut_teamcity_reporter; create public synonym ut_xunit_reporter for &&ut3_owner..ut_xunit_reporter; create public synonym ut_junit_reporter for &&ut3_owner..ut_junit_reporter; diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql index 9ad3c6549..15e388f32 100644 --- a/source/create_user_grants.sql +++ b/source/create_user_grants.sql @@ -69,6 +69,7 @@ grant execute on &&ut3_owner..ut_have_count to &ut3_user; grant execute on &&ut3_owner..ut_match to &ut3_user; grant execute on &&ut3_owner..ut to &ut3_user; grant execute on &&ut3_owner..ut_runner to &ut3_user; +grant execute on &&ut3_owner..ut_debug_reporter to &ut3_user; grant execute on &&ut3_owner..ut_teamcity_reporter to &ut3_user; grant execute on &&ut3_owner..ut_xunit_reporter to &ut3_user; grant execute on &&ut3_owner..ut_junit_reporter to &ut3_user; diff --git a/source/create_user_synonyms.sql b/source/create_user_synonyms.sql index 746354b9e..775cb64ec 100644 --- a/source/create_user_synonyms.sql +++ b/source/create_user_synonyms.sql @@ -71,6 +71,7 @@ create or replace synonym &ut3_user..have_count for &&ut3_owner..have_count; create or replace synonym &ut3_user..match for &&ut3_owner..match; create or replace synonym &ut3_user..ut for &&ut3_owner..ut; create or replace synonym &ut3_user..ut_runner for &&ut3_owner..ut_runner; +create or replace synonym &ut3_user..ut_debug_reporter for &&ut3_owner..ut_debug_reporter; create or replace synonym &ut3_user..ut_teamcity_reporter for &&ut3_owner..ut_teamcity_reporter; create or replace synonym &ut3_user..ut_xunit_reporter for &&ut3_owner..ut_xunit_reporter; create or replace synonym &ut3_user..ut_junit_reporter for &&ut3_owner..ut_junit_reporter; diff --git a/source/install.sql b/source/install.sql index e5cc60c23..36060fc50 100644 --- a/source/install.sql +++ b/source/install.sql @@ -57,11 +57,14 @@ alter session set current_schema = &&ut3_owner; --event manager objects @@install_component.sql 'core/events/ut_event_item.tps' +@@install_component.sql 'core/events/ut_event_item.tpb' @@install_component.sql 'core/events/ut_event_listener.tps' @@install_component.sql 'core/events/ut_event_manager.pks' @@install_component.sql 'core/events/ut_event_manager.pkb' --core types +@@install_component.sql 'core/types/ut_run_info.tps' +@@install_component.sql 'core/types/ut_run_info.tpb' @@install_component.sql 'core/types/ut_expectation_result.tps' @@install_component.sql 'core/types/ut_expectation_results.tps' @@install_component.sql 'core/types/ut_results_counter.tps' @@ -81,6 +84,7 @@ alter session set current_schema = &&ut3_owner; @@install_component.sql 'core/types/ut_reporter_base.tps' @@install_component.sql 'core/types/ut_reporters.tps' + --output buffer base api @@install_component.sql 'core/output_buffers/ut_output_data_row.tps' @@install_component.sql 'core/output_buffers/ut_output_data_rows.tps' @@ -273,6 +277,8 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'api/ut.pkb' --additional reporters +@@install_component.sql 'reporters/ut_debug_reporter.tps' +@@install_component.sql 'reporters/ut_debug_reporter.tpb' @@install_component.sql 'reporters/ut_teamcity_reporter.tps' @@install_component.sql 'reporters/ut_teamcity_reporter_helper.pks' @@install_component.sql 'reporters/ut_teamcity_reporter_helper.pkb' diff --git a/source/reporters/ut_debug_reporter.tpb b/source/reporters/ut_debug_reporter.tpb new file mode 100644 index 000000000..15013e777 --- /dev/null +++ b/source/reporters/ut_debug_reporter.tpb @@ -0,0 +1,54 @@ +create or replace type body ut_debug_reporter is + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + constructor function ut_debug_reporter(self in out nocopy ut_debug_reporter) return self as result is + begin + self.init($$plsql_unit); + return; + end; + + overriding member function get_supported_events return ut_varchar2_list is + begin + return ut_varchar2_list(ut_event_manager.gc_all); + end; + + overriding member procedure on_event( self in out nocopy ut_debug_reporter, a_event_name varchar2, a_event_item ut_event_item) is + begin + if a_event_name = ut_event_manager.gc_initialize then + self.on_initialize(null); + end if; + if a_event_item is not null then + self.print_clob( + to_clob( '' || a_event_name || '' || chr(10) ) + || a_event_item.to_clob() + || to_clob(''), + ut_event_manager.gc_debug + ); + else + self.print_clob( + '' || a_event_name || '' || chr(10) || '', + ut_event_manager.gc_debug + ); + end if; + if a_event_name = ut_event_manager.gc_finalize then + self.on_finalize(null); + end if; + end; + +end; +/ \ No newline at end of file diff --git a/source/reporters/ut_debug_reporter.tps b/source/reporters/ut_debug_reporter.tps new file mode 100644 index 000000000..6a8251a6f --- /dev/null +++ b/source/reporters/ut_debug_reporter.tps @@ -0,0 +1,31 @@ +create or replace type ut_debug_reporter under ut_output_reporter_base( + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + constructor function ut_debug_reporter(self in out nocopy ut_debug_reporter) return self as result, + /** + * Returns the list of events that are supported by particular implementation of the reporter + */ + overriding member function get_supported_events return ut_varchar2_list, + + /** + * Delegates execution of event into individual reporting procedures + */ + overriding member procedure on_event( self in out nocopy ut_debug_reporter, a_event_name varchar2, a_event_item ut_event_item) + +) +/ \ No newline at end of file diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index e6ea76a3a..a6abb5d6d 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -181,6 +181,8 @@ drop package ut_utils; drop type ut_documentation_reporter force; +drop type ut_debug_reporter force; + drop type ut_teamcity_reporter force; drop type ut_xunit_reporter force; @@ -247,6 +249,8 @@ drop type ut_output_data_row force; drop type ut_results_counter force; +drop type ut_run_info force; + drop type ut_expectation_results force; drop type ut_expectation_result force; diff --git a/test/api/test_ut_runner.pkb b/test/api/test_ut_runner.pkb index 1cbf5d188..79c78d911 100644 --- a/test/api/test_ut_runner.pkb +++ b/test/api/test_ut_runner.pkb @@ -296,6 +296,7 @@ end;'; --Arrange open l_expected for select 'UT3.UT_COVERAGE_COBERTURA_REPORTER' reporter_object_name, 'Y' is_output_reporter from dual union all + select 'UT3.UT_DEBUG_REPORTER', 'Y' from dual union all select 'UT3.UT_COVERAGE_HTML_REPORTER', 'Y' from dual union all select 'UT3.UT_COVERAGE_SONAR_REPORTER', 'Y' from dual union all select 'UT3.UT_COVERALLS_REPORTER', 'Y' from dual union all @@ -305,7 +306,8 @@ end;'; select 'UT3.UT_SONAR_TEST_REPORTER', 'Y' from dual union all select 'UT3.UT_TEAMCITY_REPORTER', 'Y' from dual union all select 'UT3.UT_TFS_JUNIT_REPORTER', 'Y' from dual union all - select 'UT3.UT_XUNIT_REPORTER', 'Y' from dual; + select 'UT3.UT_XUNIT_REPORTER', 'Y' from dual + order by 1; --Act open l_actual for select * from table(ut3.ut_runner.GET_REPORTERS_LIST()) order by 1; --Assert From e8d26f8a2a31a61e8d6ed9753e8d30fdd8e5b9f4 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 8 Mar 2019 07:11:52 +0000 Subject: [PATCH 0271/1096] Adding sonar ojdbc --- .travis/run_sonar_scanner.sh | 7 +++++++ sonar-project.properties | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/.travis/run_sonar_scanner.sh b/.travis/run_sonar_scanner.sh index bd6810291..e36b654aa 100755 --- a/.travis/run_sonar_scanner.sh +++ b/.travis/run_sonar_scanner.sh @@ -12,6 +12,9 @@ PR_KEY_PROPERTY="sonar.pullrequest.key" PR_SONAR_BASE_PROPERTY="sonar.pullrequest.base" PR_SONAR_TOKEN_PROPERTY="sonar.pullrequest.github.token.secured" +DB_URL_SONAR_PROPERTY="sonar.plsql.jdbc.url" +DB_DRIVER_PATH="sonar.plsql.jdbc.driver.path" + #Add property to file function add_sonar_property { echo "$1=$2" >> sonar-project.properties @@ -55,5 +58,9 @@ fi #Address issue : Could not find ref 'develop' in refs/heads or refs/remotes/origin git fetch --no-tags https://github.com/utPLSQL/utPLSQL.git +refs/heads/develop:refs/remotes/origin/develop +add_sonar_property "${DB_URL_SONAR_PROPERTY}" "jdbc:oracle:thin:@${CONNECTION_STR}" +add_sonar_property "${DB_DRIVER_PATH}" "${OJDBC_HOME}/ojdbc8.jar" + + #Execute Sonar scanner sonar-scanner \ No newline at end of file diff --git a/sonar-project.properties b/sonar-project.properties index cad03d30d..6381699e0 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -26,5 +26,12 @@ sonar.pullrequest.provider=github sonar.pullrequest.github.endpoint=https://api.github.com/ sonar.pullrequest.github.repository=utPLSQL/utPLSQL +sonar.plsql.jdbc.driver.class=oracle.jdbc.OracleDriver +sonar.plsql.jdbc.user=UT3 +sonar.plsql.jdbc.password=ut3 +sonar.plsql.defaultSchema=UT3 + + + # Encoding of the source code. Default is default system encoding #sonar.sourceEncoding=UTF-8 From 65a3de5cc3480d54f9e486a4f212ea728d41ccef Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 8 Mar 2019 07:27:30 +0000 Subject: [PATCH 0272/1096] Added echo and removing task for debug --- .travis.yml | 2 -- .travis/run_sonar_scanner.sh | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e850ecad6..cbf5bcb36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -92,8 +92,6 @@ before_script: - if [[ ! $TRAVIS_TAG ]]; then bash .travis/run_examples.sh; fi script: - - if [[ ! $TRAVIS_TAG ]]; then bash test/install_and_run_tests.sh; fi - - if [[ ! $TRAVIS_TAG ]]; then bash .travis/validate_report_files.sh; fi - if [[ ! $TRAVIS_TAG ]] && [[ ("${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" && "${TRAVIS_PULL_REQUEST}" == false) || ("${TRAVIS_PULL_REQUEST_SLUG}" = "${UTPLSQL_REPO}") ]]; then bash .travis/run_sonar_scanner.sh; fi - if [[ ! $TRAVIS_TAG ]]; then bash .travis/coveralls_uploader.sh; fi diff --git a/.travis/run_sonar_scanner.sh b/.travis/run_sonar_scanner.sh index e36b654aa..f5ea43750 100755 --- a/.travis/run_sonar_scanner.sh +++ b/.travis/run_sonar_scanner.sh @@ -58,6 +58,7 @@ fi #Address issue : Could not find ref 'develop' in refs/heads or refs/remotes/origin git fetch --no-tags https://github.com/utPLSQL/utPLSQL.git +refs/heads/develop:refs/remotes/origin/develop +echo "Adding OJDBC Driver Path ${OJDBC_HOME}/ojdbc8.jar" add_sonar_property "${DB_URL_SONAR_PROPERTY}" "jdbc:oracle:thin:@${CONNECTION_STR}" add_sonar_property "${DB_DRIVER_PATH}" "${OJDBC_HOME}/ojdbc8.jar" From f3fc57731dd0f2081da47169ff005d01af451b29 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 8 Mar 2019 07:34:25 +0000 Subject: [PATCH 0273/1096] Update path to jdbc --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index cbf5bcb36..c87d76dbe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,6 +38,7 @@ env: - CACHE_DIR=$HOME/.cache # Database Env - SQLCLI="$HOME/sqlcl/bin/sql" + - OJDBC_HOME="$HOME/sqlcl/lib" - ORACLE_PWD="oracle" - UT3_DOCKER_REPO="utplsqlv3/oracledb" - DOCKHER_HUB_REPO="${DOCKER_BASE_TAG:-$UT3_DOCKER_REPO}" From 4dcfbef32c102497d630d62a6a504b3e662df1bd Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 8 Mar 2019 09:02:29 +0000 Subject: [PATCH 0274/1096] Adding missing lines --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index c87d76dbe..ce865e05a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -93,6 +93,8 @@ before_script: - if [[ ! $TRAVIS_TAG ]]; then bash .travis/run_examples.sh; fi script: + - if [[ ! $TRAVIS_TAG ]]; then bash test/install_and_run_tests.sh; fi + - if [[ ! $TRAVIS_TAG ]]; then bash .travis/validate_report_files.sh; fi - if [[ ! $TRAVIS_TAG ]] && [[ ("${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" && "${TRAVIS_PULL_REQUEST}" == false) || ("${TRAVIS_PULL_REQUEST_SLUG}" = "${UTPLSQL_REPO}") ]]; then bash .travis/run_sonar_scanner.sh; fi - if [[ ! $TRAVIS_TAG ]]; then bash .travis/coveralls_uploader.sh; fi From 7a77a7f260d89f02f0f5f6dffdc1cf536d0fdb9c Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 8 Mar 2019 10:07:31 +0000 Subject: [PATCH 0275/1096] small improvments --- .../data_values/ut_compound_data_helper.pkb | 4 ++-- source/expectations/matchers/ut_equal.tpb | 1 - .../core/expectations/test_expectations_cursor.pkb | 14 ++++++++++++++ .../core/expectations/test_expectations_cursor.pks | 3 +++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index a139bf991..984f8edb2 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -401,7 +401,7 @@ create or replace package body ut_compound_data_helper is select exp_item_data, exp_data_id, item_no rn, rownum col_no, pk_value, s.column_value col, s.column_value.getRootElement() col_name, - s.column_value.getclobval() col_val + nvl(s.column_value.getclobval(),empty_clob()) col_val from ( select exp_data_id, extract( ucd.exp_item_data, :column_path ) exp_item_data, item_no, @@ -416,7 +416,7 @@ create or replace package body ut_compound_data_helper is select act_item_data, act_data_id, item_no rn, rownum col_no, pk_value, s.column_value col, s.column_value.getRootElement() col_name, - s.column_value.getclobval() col_val + nvl(s.column_value.getclobval(),empty_clob()) col_val from ( select act_data_id, extract( ucd.act_item_data, :column_path ) act_item_data, item_no, diff --git a/source/expectations/matchers/ut_equal.tpb b/source/expectations/matchers/ut_equal.tpb index 4fc06c850..a666caaa3 100644 --- a/source/expectations/matchers/ut_equal.tpb +++ b/source/expectations/matchers/ut_equal.tpb @@ -237,7 +237,6 @@ create or replace type body ut_equal as l_result varchar2(32767); begin if self.expected.data_type = a_actual.data_type and self.expected.is_diffable then - --TODO : Refactor if self.expected is of (ut_data_value_refcursor) then l_result := 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index 599745de7..f8673b0ce 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -2465,5 +2465,19 @@ Diff:% ut.expect(l_actual_message).to_be_like(l_expected_message); end; + procedure fixes_827_null_on_lob_compare is + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + --Arrange + open l_actual for select rownum as rn, case when rownum = 2 then null else 'Row'||rownum end as rowdesc + from dual a connect by level < 3; + open l_expected for select rownum as rn, 'Row'||rownum as rowdesc from dual a connect by level < 3; + + ut3.ut.expect(l_actual).to_equal(l_expected); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + end; / diff --git a/test/core/expectations/test_expectations_cursor.pks b/test/core/expectations/test_expectations_cursor.pks index ca4b9e85b..0997a5297 100644 --- a/test/core/expectations/test_expectations_cursor.pks +++ b/test/core/expectations/test_expectations_cursor.pks @@ -391,5 +391,8 @@ create or replace package test_expectations_cursor is --%test(Cursor to contain duplicates fail) procedure to_contain_duplicates_fail; + --%test( Fixes error 827 when lob compare fails on null) + procedure fixes_827_null_on_lob_compare; + end; / From 4f22ebc08fd47055697fda2f5b2294db2dc610d9 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Fri, 8 Mar 2019 10:09:28 +0000 Subject: [PATCH 0276/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 905f96b87..d06344f64 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.4.2595-develop'; + gc_version constant varchar2(50) := 'v3.1.4.2619-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From cfada15b38d758610fb16ce20740c0ac1cc650af Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 8 Mar 2019 10:23:32 +0000 Subject: [PATCH 0277/1096] Remove tests as its not replicating issue --- .../core/expectations/test_expectations_cursor.pkb | 14 -------------- .../core/expectations/test_expectations_cursor.pks | 5 +---- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index f8673b0ce..599745de7 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -2465,19 +2465,5 @@ Diff:% ut.expect(l_actual_message).to_be_like(l_expected_message); end; - procedure fixes_827_null_on_lob_compare is - l_actual sys_refcursor; - l_expected sys_refcursor; - begin - --Arrange - open l_actual for select rownum as rn, case when rownum = 2 then null else 'Row'||rownum end as rowdesc - from dual a connect by level < 3; - open l_expected for select rownum as rn, 'Row'||rownum as rowdesc from dual a connect by level < 3; - - ut3.ut.expect(l_actual).to_equal(l_expected); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - end; / diff --git a/test/core/expectations/test_expectations_cursor.pks b/test/core/expectations/test_expectations_cursor.pks index 0997a5297..c0195393e 100644 --- a/test/core/expectations/test_expectations_cursor.pks +++ b/test/core/expectations/test_expectations_cursor.pks @@ -390,9 +390,6 @@ create or replace package test_expectations_cursor is --%test(Cursor to contain duplicates fail) procedure to_contain_duplicates_fail; - - --%test( Fixes error 827 when lob compare fails on null) - procedure fixes_827_null_on_lob_compare; - + end; / From 2ba071559eca6d2462d1a7df9d6e8e90a81113f2 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 8 Mar 2019 14:34:06 +0000 Subject: [PATCH 0278/1096] Small improvements to debug log. --- source/api/ut_runner.pkb | 2 +- source/core/events/ut_event_manager.pkb | 10 +++++--- source/reporters/ut_debug_reporter.tpb | 33 +++++++++++++++++++------ source/reporters/ut_debug_reporter.tps | 3 ++- 4 files changed, 35 insertions(+), 13 deletions(-) diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index aa6280a99..e9f3f3a93 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -110,7 +110,7 @@ create or replace package body ut_runner is if a_paths is null or a_paths is empty or a_paths.count = 1 and a_paths(1) is null then l_paths := ut_varchar2_list(sys_context('userenv', 'current_schema')); else - for i in 1..a_paths.COUNT loop + for i in 1..a_paths.count loop l_paths := l_paths multiset union ut_utils.string_to_table(a_string => a_paths(i),a_delimiter => ','); end loop; end if; diff --git a/source/core/events/ut_event_manager.pkb b/source/core/events/ut_event_manager.pkb index 2c014f4b1..0dfc6c925 100644 --- a/source/core/events/ut_event_manager.pkb +++ b/source/core/events/ut_event_manager.pkb @@ -58,10 +58,14 @@ create or replace package body ut_event_manager as end; procedure trigger_event( a_event_name t_event_name, a_event_object ut_event_item := null ) is - procedure trigger_listener_event( a_listener_numbers t_listener_numbers, a_event_name t_event_name, a_event_object ut_event_item ) is - l_listener_number t_listener_number; + + procedure trigger_listener_event( + a_listener_numbers t_listener_numbers, + a_event_name t_event_name, + a_event_object ut_event_item + ) is + l_listener_number t_listener_number := a_listener_numbers.first; begin - l_listener_number := a_listener_numbers.first; while l_listener_number is not null loop g_listeners(l_listener_number).on_event(a_event_name, a_event_object); l_listener_number := a_listener_numbers.next(l_listener_number); diff --git a/source/reporters/ut_debug_reporter.tpb b/source/reporters/ut_debug_reporter.tpb index 15013e777..7479059d5 100644 --- a/source/reporters/ut_debug_reporter.tpb +++ b/source/reporters/ut_debug_reporter.tpb @@ -19,6 +19,8 @@ create or replace type body ut_debug_reporter is constructor function ut_debug_reporter(self in out nocopy ut_debug_reporter) return self as result is begin self.init($$plsql_unit); + self.start_time := current_timestamp(); + self.event_time := current_timestamp(); return; end; @@ -28,26 +30,41 @@ create or replace type body ut_debug_reporter is end; overriding member procedure on_event( self in out nocopy ut_debug_reporter, a_event_name varchar2, a_event_item ut_event_item) is - begin + c_time constant timestamp := current_timestamp(); + c_time_from_start constant interval day(0) to second(6) := (c_time - self.start_time); + c_time_from_prev constant interval day(0) to second(6) := (c_time - self.event_time); + l_debug varchar2(32767); + l_stack varchar2(32767) := dbms_utility.format_call_stack(); + begin + l_stack := regexp_replace( + substr( l_stack, instr( l_stack, chr(10), 1, 6 ) +1 ), + '[0-9abcdefx]+ +([0-9]+) +(package |type )?(body )?(.*)','at "\4", line \1'); + if a_event_name = ut_event_manager.gc_initialize then self.on_initialize(null); + self.print_text(''); end if; + l_debug := + to_clob( '' || chr(10) + || ' ' || ut_utils.to_string(c_time) || '' || chr(10) + || ' ' || c_time_from_start || '' || chr(10) + || ' ' || c_time_from_prev || '' || chr(10) + || ' ' || a_event_name || '' || chr(10) + || ' ' || l_stack || '' || chr(10) + ); if a_event_item is not null then self.print_clob( - to_clob( '' || a_event_name || '' || chr(10) ) - || a_event_item.to_clob() - || to_clob(''), + to_clob( l_debug ) || a_event_item.to_clob() || to_clob(''), ut_event_manager.gc_debug ); else - self.print_clob( - '' || a_event_name || '' || chr(10) || '', - ut_event_manager.gc_debug - ); + self.print_clob( l_debug || '', ut_event_manager.gc_debug ); end if; if a_event_name = ut_event_manager.gc_finalize then + self.print_text(''); self.on_finalize(null); end if; + self.event_time := current_timestamp(); end; end; diff --git a/source/reporters/ut_debug_reporter.tps b/source/reporters/ut_debug_reporter.tps index 6a8251a6f..d8de00fd3 100644 --- a/source/reporters/ut_debug_reporter.tps +++ b/source/reporters/ut_debug_reporter.tps @@ -15,7 +15,8 @@ create or replace type ut_debug_reporter under ut_output_reporter_base( See the License for the specific language governing permissions and limitations under the License. */ - + start_time timestamp, + event_time timestamp, constructor function ut_debug_reporter(self in out nocopy ut_debug_reporter) return self as result, /** * Returns the list of events that are supported by particular implementation of the reporter From c5833190b8c0b1530bbba6181fd6c00cfe7601c8 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Tue, 12 Mar 2019 09:40:18 +0000 Subject: [PATCH 0279/1096] Adding extra tests for collection with join_by and unordered --- .../expectations/test_expectation_anydata.pkb | 118 ++++++++++++++++++ .../expectations/test_expectation_anydata.pks | 20 ++- 2 files changed, 137 insertions(+), 1 deletion(-) diff --git a/test/core/expectations/test_expectation_anydata.pkb b/test/core/expectations/test_expectation_anydata.pkb index 51d60b44e..cc18f7dfc 100644 --- a/test/core/expectations/test_expectation_anydata.pkb +++ b/test/core/expectations/test_expectation_anydata.pkb @@ -825,6 +825,124 @@ Rows: [ 60 differences, showing first 20 ] --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; + + procedure collection_join_by is + l_actual test_dummy_object_list; + l_expected test_dummy_object_list; + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + select test_dummy_object( rownum, 'Something '||rownum, rownum) + bulk collect into l_actual + from dual connect by level <=2; + select test_dummy_object( rownum, 'Something '||rownum, rownum) + bulk collect into l_expected + from dual connect by level <=2 + order by rownum desc; + --Act + ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).join_by('TEST_DUMMY_OBJECT/ID'); + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure collection_join_by_fail is + l_actual test_dummy_object_list; + l_expected test_dummy_object_list; + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + select test_dummy_object( rownum, 'Something '||rownum, rownum) + bulk collect into l_actual + from dual connect by level <=2; + select test_dummy_object( rownum * 2, 'Something '||rownum, rownum) + bulk collect into l_expected + from dual connect by level <=2 + order by rownum desc; + --Act + ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).join_by('TEST_DUMMY_OBJECT/ID'); + l_expected_message := q'[%Actual: ut3_tester.test_dummy_object_list [ count = 2 ] was expected to equal: ut3_tester.test_dummy_object_list [ count = 2 ] +%Diff: +%Rows: [ 3 differences ] +%PK 2 - Actual: Something 2 +%PK 2 - Actual: 2 +%PK 2 - Expected: Something 1 +%PK 2 - Expected: 1 +%PK 1 - Extra: 1Something 11 +%PK 4 - Missing: 4Something 22]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure collection_unordered is + l_actual test_dummy_object_list; + l_expected test_dummy_object_list; + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + select test_dummy_object( rownum, 'Something '||rownum, rownum) + bulk collect into l_actual + from dual connect by level <=3; + select test_dummy_object( rownum, 'Something '||rownum, rownum) + bulk collect into l_expected + from dual connect by level <=3 + order by rownum desc; + --Act + ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).unordered; + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure collection_unordered_fail is + l_actual test_dummy_object_list; + l_expected test_dummy_object_list; + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + select test_dummy_object( rownum, 'Something '||rownum, rownum) + bulk collect into l_actual + from dual connect by level <=2; + select test_dummy_object( rownum * 2, 'Something '||rownum, rownum) + bulk collect into l_expected + from dual connect by level <=2 + order by rownum desc; + + l_expected_message := q'[%Actual: ut3_tester.test_dummy_object_list [ count = 2 ] was expected to equal: ut3_tester.test_dummy_object_list [ count = 2 ] +%Diff: +%Rows: [ 4 differences ] +%Extra: 1Something 11 +%Extra: 2Something 22 +%Missing: 4Something 22 +%Missing: 2Something 11]'; + + ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).unordered; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure object_join_by is + begin + --Arrange + g_test_expected := anydata.convertObject( test_dummy_object(1, 'A', '0') ); + g_test_actual := anydata.convertObject( test_dummy_object(1, 'A', '0') ); + + --Act + ut3.ut.expect(g_test_actual).to_equal(g_test_expected).join_by('TEST_DUMMY_OBJECT/ID'); + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + + procedure object_unordered is + begin + g_test_expected := anydata.convertObject( test_dummy_object(1, 'A', '0') ); + g_test_actual := anydata.convertObject( test_dummy_object(1, 'A', '0') ); + + --Act + ut3.ut.expect(g_test_actual).to_equal(g_test_expected).unordered; + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; end; / \ No newline at end of file diff --git a/test/core/expectations/test_expectation_anydata.pks b/test/core/expectations/test_expectation_anydata.pks index 99c44346c..6cc183a6b 100644 --- a/test/core/expectations/test_expectation_anydata.pks +++ b/test/core/expectations/test_expectation_anydata.pks @@ -172,7 +172,25 @@ create or replace package test_expectation_anydata is procedure varr_empty_equal_varr_empty; --%test(Compare empty VARRAY to VARRAY with data) - procedure varr_empty_equal_varr_notempty; + procedure varr_empty_equal_varr_notempty; + + --%test( Anydata collection using joinby ) + procedure collection_join_by; + + --%test( Anydata collection using joinby fail) + procedure collection_join_by_fail; + + --%test( Anydata collection unordered ) + procedure collection_unordered; + + --%test( Anydata collection unordered fail ) + procedure collection_unordered_fail; + + --%test( Anydata object using joinby ) + procedure object_join_by; + + --%test( Anydata object unordered ) + procedure object_unordered; end; / From 3aa872b9f558cd023d1ecade8edfe6383ceb9c95 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Tue, 12 Mar 2019 10:24:10 +0000 Subject: [PATCH 0280/1096] Updated docs/userguide/advanced_data_comparison.md Removed TODO tag as any rework will introduce a more artificial logic ( adding new attributes , functions etc.) --- docs/userguide/advanced_data_comparison.md | 18 +++++++++--------- source/expectations/matchers/ut_have_count.tpb | 1 - 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 83d1af5ed..c06095914 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -27,7 +27,7 @@ Advanced data-comparison options are available for the [`equal`](expectations.md - `exclude(a_items varchar2)` - item or comma separated list of items to exclude - `include(a_items ut_varchar2_list)` - table of items to include - `exclude(a_items ut_varchar2_list)` - table of items to exclude - - `unordered` - ignore order of data sets when comparing data. Default when comparing data-sets with `to_inclide` / `to_contain` + - `unordered` - ignore order of data sets when comparing data. Default when comparing data-sets with `to_contain` - `join_by(a_columns varchar2)` - column or comma separated list of columns to join two cursors by - `join_by(a_columns ut_varchar2_list)` - table of columns to join two cursors by - `unordered_columns` / `uc` - ignore the ordering of columns / attributes in compared data-sets. Column/attribute names will be used to identify data to be compared and the position will be ignored. @@ -130,7 +130,7 @@ This option can be useful in scenarios where you need to narrow-down the scope o ## Unordered -Unordered option allows for quick comparison of two cursors without need of ordering them in any way. +Unordered option allows for quick comparison of two compound data types without need of ordering them in any way. Result of such comparison will be limited to only information about row existing or not existing in given set without actual information about exact differences. @@ -169,9 +169,9 @@ Above test will result in two differences of one row extra and one row missing. ## Join By option -The `join_by` syntax enables comparison of unordered cursors by joining cursor data using specified columns. +The `join_by` syntax enables comparison of unordered compound data types by joining data using specified columns. -You can join two cursors by defining join column(s) that will be used to uniquely identify and compare rows. +You can join two compound data types by defining join column(s) that will be used to uniquely identify and compare data rows. With this option, framework is able to identify which rows are missing, which are extra and which are different without need to have both cursors uniformly ordered. When the specified join column(s) are not unique, join will partition set over rows with the same key and join on row number as well as given join key. The extra or missing rows will be presented to user as well as all non-matching rows. @@ -237,7 +237,7 @@ Above test will indicate that in actual data-set ``` -### Joining cursors using multiple columns +### Joining using multiple columns You can specify multiple columns in `join_by` @@ -257,10 +257,10 @@ begin ut.expect( l_actual ).to_equal( l_expected ).join_by('USERNAME, USER_ID'); end; ``` - -### Joining cursors using attributes of object in column list -`join_by` allows for joining cursor data by attributes of object from column list of the compared cursors. +### Joining using attributes of object in column list + +`join_by` allows for joining data by attributes of object from column list of the compared compound data types. To reference attribute as PK, use slash symbol `/` to separate nested elements. @@ -302,7 +302,7 @@ create or replace package body test_join_by is end; / -``` +``` **Note** > `join_by` does not support joining on individual elements of nested table. You can still use data of the nested table as a PK value. diff --git a/source/expectations/matchers/ut_have_count.tpb b/source/expectations/matchers/ut_have_count.tpb index 6b4b29fe2..135a948d5 100644 --- a/source/expectations/matchers/ut_have_count.tpb +++ b/source/expectations/matchers/ut_have_count.tpb @@ -26,7 +26,6 @@ create or replace type body ut_have_count as overriding member function run_matcher(self in out nocopy ut_have_count, a_actual ut_data_value) return boolean is l_result boolean; begin - --TODO : Refactor if a_actual is of(ut_data_value_refcursor) and ( treat (a_actual as ut_data_value_refcursor).compound_type != 'object') then l_result := ( self.expected = treat(a_actual as ut_data_value_refcursor).elements_count ); else From e430481cbefc5cd13151a86c0d9149d51d0056d8 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 14 Mar 2019 11:31:53 +0000 Subject: [PATCH 0281/1096] Moved `to_clob` for debugging into reporter. Added ability to report on input parameters by using `ut_key_anyvalues` Added debugging of calls to expectations. Added debug calls in `coverage`. --- source/core/coverage/ut_coverage.pkb | 78 ++++++++-------- source/core/events/ut_event_item.tpb | 26 ------ source/core/events/ut_event_item.tps | 3 +- source/core/types/ut_expectation_result.tpb | 1 + source/core/types/ut_expectation_result.tps | 2 +- source/core/ut_expectation_processor.pkb | 4 +- .../data_values/ut_key_anyvalues.tpb | 90 +++++++++++++++++++ .../data_values/ut_key_anyvalues.tps | 34 +++++++ source/install.sql | 3 +- source/reporters/ut_debug_reporter.tpb | 34 ++++--- source/reporters/ut_debug_reporter.tps | 4 +- 11 files changed, 195 insertions(+), 84 deletions(-) delete mode 100644 source/core/events/ut_event_item.tpb create mode 100644 source/expectations/data_values/ut_key_anyvalues.tpb create mode 100644 source/expectations/data_values/ut_key_anyvalues.tps diff --git a/source/core/coverage/ut_coverage.pkb b/source/core/coverage/ut_coverage.pkb index 6acca42bd..93b6204d1 100644 --- a/source/core/coverage/ut_coverage.pkb +++ b/source/core/coverage/ut_coverage.pkb @@ -131,8 +131,8 @@ create or replace package body ut_coverage is if not ut_coverage_helper.is_tmp_table_populated() or is_develop_mode() then ut_coverage_helper.cleanup_tmp_table(); - - l_cov_sources_crsr := get_cov_sources_cursor(a_coverage_options,a_sql); + ut_event_manager.trigger_event(ut_event_manager.gc_debug, ut_key_anyvalues().put('a_sql',a_sql) ); + l_cov_sources_crsr := get_cov_sources_cursor(a_coverage_options, a_sql); loop fetch l_cov_sources_crsr bulk collect into l_cov_sources_data limit 10000; @@ -209,48 +209,50 @@ create or replace package body ut_coverage is l_line_no binary_integer; begin --prepare global temp table with sources + ut_event_manager.trigger_event('about to populate coverage temp table'); populate_tmp_table(a_coverage_options, get_cov_sources_sql(a_coverage_options)); + ut_event_manager.trigger_event('coverage temp table populated'); -- Get raw data for both reporters, order is important as tmp table will skip headers and dont populate -- tmp table for block again. l_result_profiler_enrich:= ut_coverage_profiler.get_coverage_data( a_coverage_options, get_coverage_id(gc_proftab_coverage) ); - - -- If block coverage available we will use it. - $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then - l_result_block := ut_coverage_block.get_coverage_data( a_coverage_options, get_coverage_id(gc_block_coverage) ); - - -- Enrich profiler results with some of the block results - l_object := l_result_profiler_enrich.objects.first; - while (l_object is not null) - loop - - l_line_no := l_result_profiler_enrich.objects(l_object).lines.first; - - -- to avoid no data found check if we got object in profiler - if l_result_block.objects.exists(l_object) then - while (l_line_no is not null) - loop - -- To avoid no data check for object line - if l_result_block.objects(l_object).lines.exists(l_line_no) then - -- enrich line level stats - l_result_profiler_enrich.objects(l_object).lines(l_line_no).partcove := l_result_block.objects(l_object).lines(l_line_no).partcove; - l_result_profiler_enrich.objects(l_object).lines(l_line_no).covered_blocks := l_result_block.objects(l_object).lines(l_line_no).covered_blocks; - l_result_profiler_enrich.objects(l_object).lines(l_line_no).no_blocks := l_result_block.objects(l_object).lines(l_line_no).no_blocks; - -- enrich object level stats - l_result_profiler_enrich.objects(l_object).partcovered_lines := nvl(l_result_profiler_enrich.objects(l_object).partcovered_lines,0) + l_result_block.objects(l_object).lines(l_line_no).partcove; + ut_event_manager.trigger_event('profiler coverage data retrieved'); + + -- If block coverage available we will use it. + $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then + l_result_block := ut_coverage_block.get_coverage_data( a_coverage_options, get_coverage_id(gc_block_coverage) ); + ut_event_manager.trigger_event('block coverage data retrieved'); + + -- Enrich profiler results with some of the block results + l_object := l_result_profiler_enrich.objects.first; + while (l_object is not null) loop + + l_line_no := l_result_profiler_enrich.objects(l_object).lines.first; + + -- to avoid no data found check if we got object in profiler + if l_result_block.objects.exists(l_object) then + while (l_line_no is not null) loop + -- To avoid no data check for object line + if l_result_block.objects(l_object).lines.exists(l_line_no) then + -- enrich line level stats + l_result_profiler_enrich.objects(l_object).lines(l_line_no).partcove := l_result_block.objects(l_object).lines(l_line_no).partcove; + l_result_profiler_enrich.objects(l_object).lines(l_line_no).covered_blocks := l_result_block.objects(l_object).lines(l_line_no).covered_blocks; + l_result_profiler_enrich.objects(l_object).lines(l_line_no).no_blocks := l_result_block.objects(l_object).lines(l_line_no).no_blocks; + -- enrich object level stats + l_result_profiler_enrich.objects(l_object).partcovered_lines := nvl(l_result_profiler_enrich.objects(l_object).partcovered_lines,0) + l_result_block.objects(l_object).lines(l_line_no).partcove; + end if; + --At the end go to next line + l_line_no := l_result_profiler_enrich.objects(l_object).lines.next(l_line_no); + end loop; + --total level stats enrich + l_result_profiler_enrich.partcovered_lines := nvl(l_result_profiler_enrich.partcovered_lines,0) + l_result_profiler_enrich.objects(l_object).partcovered_lines; + -- At the end go to next object end if; - --At the end go to next line - l_line_no := l_result_profiler_enrich.objects(l_object).lines.next(l_line_no); - end loop; - --total level stats enrich - l_result_profiler_enrich.partcovered_lines := nvl(l_result_profiler_enrich.partcovered_lines,0) + l_result_profiler_enrich.objects(l_object).partcovered_lines; - -- At the end go to next object - end if; - - l_object := l_result_profiler_enrich.objects.next(l_object); - - end loop; - $end + + l_object := l_result_profiler_enrich.objects.next(l_object); + end loop; + ut_event_manager.trigger_event('coverage data combined'); + $end return l_result_profiler_enrich; end get_coverage_data; diff --git a/source/core/events/ut_event_item.tpb b/source/core/events/ut_event_item.tpb deleted file mode 100644 index efbab5041..000000000 --- a/source/core/events/ut_event_item.tpb +++ /dev/null @@ -1,26 +0,0 @@ -create or replace type body ut_event_item is - /* - utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project - - Licensed under the Apache License, Version 2.0 (the "License"): - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - - member function to_clob return clob is - l_clob clob; - begin - select xmlserialize( content deletexml(xmltype(self),'/*/ITEMS') as clob indent size = 2 ) into l_clob from dual; - return l_clob; - end; -end; -/ diff --git a/source/core/events/ut_event_item.tps b/source/core/events/ut_event_item.tps index 4f7eec758..d1f52cba6 100644 --- a/source/core/events/ut_event_item.tps +++ b/source/core/events/ut_event_item.tps @@ -20,7 +20,6 @@ create or replace type ut_event_item authid current_user as object ( * Object type is a pre-declaration to be referenced by ut_event_listener_base * The true abstract type is ut_suite_item */ - self_type varchar2(250 byte), - member function to_clob return clob + self_type varchar2(250 byte) ) not final not instantiable / diff --git a/source/core/types/ut_expectation_result.tpb b/source/core/types/ut_expectation_result.tpb index 6714d48b6..6b1bbd4ef 100644 --- a/source/core/types/ut_expectation_result.tpb +++ b/source/core/types/ut_expectation_result.tpb @@ -21,6 +21,7 @@ create or replace type body ut_expectation_result is a_description varchar2, a_message clob, a_include_caller_info boolean := true ) return self as result is begin + self.self_type := $$plsql_unit; self.status := a_status; self.description := a_description; self.message := a_message; diff --git a/source/core/types/ut_expectation_result.tps b/source/core/types/ut_expectation_result.tps index af819504d..f5d7fd23e 100644 --- a/source/core/types/ut_expectation_result.tps +++ b/source/core/types/ut_expectation_result.tps @@ -1,4 +1,4 @@ -create or replace type ut_expectation_result authid current_user as object( +create or replace type ut_expectation_result under ut_event_item( /* utPLSQL - Version 3 Copyright 2016 - 2018 utPLSQL Project diff --git a/source/core/ut_expectation_processor.pkb b/source/core/ut_expectation_processor.pkb index 170846125..0fe154df6 100644 --- a/source/core/ut_expectation_processor.pkb +++ b/source/core/ut_expectation_processor.pkb @@ -73,13 +73,13 @@ create or replace package body ut_expectation_processor as l_expectations_results(l_expectations_results.last) := g_expectations_called(i); end if; end loop; - ut_utils.debug_log('ut_expectation_processor.get_failed_expectations: l_expectations_results.count='||g_expectations_called.count); + ut_utils.debug_log('ut_expectation_processor.get_failed_expectations: l_expectations_results.count='||l_expectations_results.count); return l_expectations_results; end get_failed_expectations; procedure add_expectation_result(a_expectation_result ut_expectation_result) is begin - ut_utils.debug_log('ut_expectation_processor.add_expectation_result'); + ut_event_manager.trigger_event(ut_event_manager.gc_debug, a_expectation_result); g_expectations_called.extend; g_expectations_called(g_expectations_called.last) := a_expectation_result; end; diff --git a/source/expectations/data_values/ut_key_anyvalues.tpb b/source/expectations/data_values/ut_key_anyvalues.tpb new file mode 100644 index 000000000..1e9cde9da --- /dev/null +++ b/source/expectations/data_values/ut_key_anyvalues.tpb @@ -0,0 +1,90 @@ +create or replace type body ut_key_anyvalues as + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + constructor function ut_key_anyvalues(self in out nocopy ut_key_anyvalues) return self as result is + begin + self.self_type := $$plsql_unit; + self.pairs := ut_key_anyval_pairs(); + return; + end; + member function put(a_item ut_key_anyval_pair) return ut_key_anyvalues is + l_result ut_key_anyvalues := self; + begin + l_result.pairs.extend(); + l_result.pairs(l_result.pairs.last) := a_item; + return l_result; + end; + member function put(a_key varchar2, a_value anydata) return ut_key_anyvalues is + begin + return put(ut_key_anyval_pair(a_key, ut_data_value_anydata.get_instance(a_value))); + end; + + member function put(a_key varchar2, a_value blob) return ut_key_anyvalues is + begin + return put(ut_key_anyval_pair(a_key, ut_data_value_blob(a_value))); + end; + + member function put(a_key varchar2, a_value boolean) return ut_key_anyvalues is + begin + return put(ut_key_anyval_pair(a_key, ut_data_value_boolean(a_value))); + end; + + member function put(a_key varchar2, a_value clob) return ut_key_anyvalues is + begin + return put(ut_key_anyval_pair(a_key, ut_data_value_clob(a_value))); + end; + + member function put(a_key varchar2, a_value date) return ut_key_anyvalues is + begin + return put(ut_key_anyval_pair(a_key, ut_data_value_date(a_value))); + end; + + member function put(a_key varchar2, a_value number) return ut_key_anyvalues is + begin + return put(ut_key_anyval_pair(a_key, ut_data_value_number(a_value))); + end; + member function put(a_key varchar2, a_value timestamp_unconstrained) return ut_key_anyvalues is + begin + return put(ut_key_anyval_pair(a_key, ut_data_value_timestamp(a_value))); + end; + + member function put(a_key varchar2, a_value timestamp_ltz_unconstrained) return ut_key_anyvalues is + begin + return put(ut_key_anyval_pair(a_key, ut_data_value_timestamp_ltz(a_value))); + end; + + member function put(a_key varchar2, a_value timestamp_tz_unconstrained) return ut_key_anyvalues is + begin + return put(ut_key_anyval_pair(a_key, ut_data_value_timestamp_tz(a_value))); + end; + + member function put(a_key varchar2, a_value varchar2) return ut_key_anyvalues is + begin + return put(ut_key_anyval_pair(a_key, ut_data_value_varchar2(a_value))); + end; + + member function put(a_key varchar2, a_value yminterval_unconstrained) return ut_key_anyvalues is + begin + return put(ut_key_anyval_pair(a_key, ut_data_value_yminterval(a_value))); + end; + + member function put(a_key varchar2, a_value dsinterval_unconstrained) return ut_key_anyvalues is + begin + return put(ut_key_anyval_pair(a_key, ut_data_value_dsinterval(a_value))); + end; +end; +/ diff --git a/source/expectations/data_values/ut_key_anyvalues.tps b/source/expectations/data_values/ut_key_anyvalues.tps new file mode 100644 index 000000000..c871d1466 --- /dev/null +++ b/source/expectations/data_values/ut_key_anyvalues.tps @@ -0,0 +1,34 @@ +create or replace type ut_key_anyvalues under ut_event_item ( + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + pairs ut_key_anyval_pairs, + constructor function ut_key_anyvalues(self in out nocopy ut_key_anyvalues) return self as result, + member function put(a_item ut_key_anyval_pair) return ut_key_anyvalues, + member function put(a_key varchar2, a_value anydata) return ut_key_anyvalues, + member function put(a_key varchar2, a_value blob) return ut_key_anyvalues, + member function put(a_key varchar2, a_value boolean) return ut_key_anyvalues, + member function put(a_key varchar2, a_value clob) return ut_key_anyvalues, + member function put(a_key varchar2, a_value date) return ut_key_anyvalues, + member function put(a_key varchar2, a_value number) return ut_key_anyvalues, + member function put(a_key varchar2, a_value timestamp_unconstrained) return ut_key_anyvalues, + member function put(a_key varchar2, a_value timestamp_ltz_unconstrained) return ut_key_anyvalues, + member function put(a_key varchar2, a_value timestamp_tz_unconstrained) return ut_key_anyvalues, + member function put(a_key varchar2, a_value varchar2) return ut_key_anyvalues, + member function put(a_key varchar2, a_value yminterval_unconstrained) return ut_key_anyvalues, + member function put(a_key varchar2, a_value dsinterval_unconstrained) return ut_key_anyvalues +) +/ diff --git a/source/install.sql b/source/install.sql index 36060fc50..9e39e6f16 100644 --- a/source/install.sql +++ b/source/install.sql @@ -57,7 +57,6 @@ alter session set current_schema = &&ut3_owner; --event manager objects @@install_component.sql 'core/events/ut_event_item.tps' -@@install_component.sql 'core/events/ut_event_item.tpb' @@install_component.sql 'core/events/ut_event_listener.tps' @@install_component.sql 'core/events/ut_event_manager.pks' @@install_component.sql 'core/events/ut_event_manager.pkb' @@ -203,6 +202,8 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/data_values/ut_data_value_xmltype.tps' @@install_component.sql 'expectations/data_values/ut_key_anyval_pair.tps' @@install_component.sql 'expectations/data_values/ut_key_anyval_pairs.tps' +@@install_component.sql 'expectations/data_values/ut_key_anyvalues.tps' +@@install_component.sql 'expectations/data_values/ut_key_anyvalues.tpb' @@install_component.sql 'expectations/data_values/ut_compound_data_helper.pks' @@install_component.sql 'expectations/data_values/ut_curr_usr_compound_helper.pks' @@install_component.sql 'expectations/matchers/ut_matcher.tps' diff --git a/source/reporters/ut_debug_reporter.tpb b/source/reporters/ut_debug_reporter.tpb index 7479059d5..186290296 100644 --- a/source/reporters/ut_debug_reporter.tpb +++ b/source/reporters/ut_debug_reporter.tpb @@ -33,7 +33,6 @@ create or replace type body ut_debug_reporter is c_time constant timestamp := current_timestamp(); c_time_from_start constant interval day(0) to second(6) := (c_time - self.start_time); c_time_from_prev constant interval day(0) to second(6) := (c_time - self.event_time); - l_debug varchar2(32767); l_stack varchar2(32767) := dbms_utility.format_call_stack(); begin l_stack := regexp_replace( @@ -42,30 +41,39 @@ create or replace type body ut_debug_reporter is if a_event_name = ut_event_manager.gc_initialize then self.on_initialize(null); - self.print_text(''); + self.print_text('', ut_event_manager.gc_debug); end if; - l_debug := - to_clob( '' || chr(10) - || ' ' || ut_utils.to_string(c_time) || '' || chr(10) + self.print_text('', ut_event_manager.gc_debug); + self.print_text( + ' ' || ut_utils.to_string(c_time) || '' || chr(10) || ' ' || c_time_from_start || '' || chr(10) || ' ' || c_time_from_prev || '' || chr(10) - || ' ' || a_event_name || '' || chr(10) - || ' ' || l_stack || '' || chr(10) - ); + || ' ' || a_event_name || '', + ut_event_manager.gc_debug + ); + self.print_text( ' ' || l_stack || '', ut_event_manager.gc_debug); if a_event_item is not null then - self.print_clob( - to_clob( l_debug ) || a_event_item.to_clob() || to_clob(''), + self.print_text_lines( + ut_utils.convert_collection( + ut_utils.clob_to_table( event_item_to_clob(a_event_item), ut_utils.gc_max_storage_varchar2_len ) + ), ut_event_manager.gc_debug ); - else - self.print_clob( l_debug || '', ut_event_manager.gc_debug ); end if; + self.print_text('', ut_event_manager.gc_debug); if a_event_name = ut_event_manager.gc_finalize then - self.print_text(''); + self.print_text('', ut_event_manager.gc_debug); self.on_finalize(null); end if; self.event_time := current_timestamp(); end; + member function event_item_to_clob(a_event_item ut_event_item) return clob is + l_clob clob; + begin + select xmlserialize( content deletexml(xmltype(a_event_item),'/*/ITEMS|/*/ALL_EXPECTATIONS|/*/FAILED_EXPECTATIONS') as clob indent size = 2 ) into l_clob from dual; + return l_clob; + end; + end; / \ No newline at end of file diff --git a/source/reporters/ut_debug_reporter.tps b/source/reporters/ut_debug_reporter.tps index d8de00fd3..91e90e28c 100644 --- a/source/reporters/ut_debug_reporter.tps +++ b/source/reporters/ut_debug_reporter.tps @@ -26,7 +26,9 @@ create or replace type ut_debug_reporter under ut_output_reporter_base( /** * Delegates execution of event into individual reporting procedures */ - overriding member procedure on_event( self in out nocopy ut_debug_reporter, a_event_name varchar2, a_event_item ut_event_item) + overriding member procedure on_event( self in out nocopy ut_debug_reporter, a_event_name varchar2, a_event_item ut_event_item), + + member function event_item_to_clob(a_event_item ut_event_item) return clob ) / \ No newline at end of file From 499d6ae44579a686c2a321c80bbe8bbfb56b0422 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 14 Mar 2019 11:50:20 +0000 Subject: [PATCH 0282/1096] Fixing install order. --- source/install.sql | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/source/install.sql b/source/install.sql index 9e39e6f16..19f4c393d 100644 --- a/source/install.sql +++ b/source/install.sql @@ -83,6 +83,12 @@ alter session set current_schema = &&ut3_owner; @@install_component.sql 'core/types/ut_reporter_base.tps' @@install_component.sql 'core/types/ut_reporters.tps' +@@install_component.sql 'expectations/data_values/ut_data_value.tps' +@@install_component.sql 'expectations/data_values/ut_key_anyval_pair.tps' +@@install_component.sql 'expectations/data_values/ut_key_anyval_pairs.tps' +@@install_component.sql 'expectations/data_values/ut_key_anyvalues.tps' +@@install_component.sql 'expectations/data_values/ut_key_anyvalues.tpb' + --output buffer base api @@install_component.sql 'core/output_buffers/ut_output_data_row.tps' @@ -182,7 +188,6 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema --expectations and matchers @@install_component.sql 'expectations/data_values/ut_compound_data_tmp.sql' @@install_component.sql 'expectations/data_values/ut_compound_data_diff_tmp.sql' -@@install_component.sql 'expectations/data_values/ut_data_value.tps' @@install_component.sql 'expectations/data_values/ut_compound_data_value.tps' @@install_component.sql 'expectations/data_values/ut_data_value_anydata.tps' @@install_component.sql 'expectations/data_values/ut_data_value_collection.tps' @@ -200,10 +205,6 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/data_values/ut_data_value_varchar2.tps' @@install_component.sql 'expectations/data_values/ut_data_value_yminterval.tps' @@install_component.sql 'expectations/data_values/ut_data_value_xmltype.tps' -@@install_component.sql 'expectations/data_values/ut_key_anyval_pair.tps' -@@install_component.sql 'expectations/data_values/ut_key_anyval_pairs.tps' -@@install_component.sql 'expectations/data_values/ut_key_anyvalues.tps' -@@install_component.sql 'expectations/data_values/ut_key_anyvalues.tpb' @@install_component.sql 'expectations/data_values/ut_compound_data_helper.pks' @@install_component.sql 'expectations/data_values/ut_curr_usr_compound_helper.pks' @@install_component.sql 'expectations/matchers/ut_matcher.tps' From 6373a6af4b601c70873e0fe22eec3bd5b8dc0a98 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 14 Mar 2019 12:07:22 +0000 Subject: [PATCH 0283/1096] Fixing install order. --- source/install.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/install.sql b/source/install.sql index 19f4c393d..3f2bf8b96 100644 --- a/source/install.sql +++ b/source/install.sql @@ -87,7 +87,6 @@ alter session set current_schema = &&ut3_owner; @@install_component.sql 'expectations/data_values/ut_key_anyval_pair.tps' @@install_component.sql 'expectations/data_values/ut_key_anyval_pairs.tps' @@install_component.sql 'expectations/data_values/ut_key_anyvalues.tps' -@@install_component.sql 'expectations/data_values/ut_key_anyvalues.tpb' --output buffer base api @@ -263,6 +262,7 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/matchers/ut_match.tpb' @@install_component.sql 'expectations/ut_expectation.tpb' @@install_component.sql 'expectations/ut_expectation_compound.tpb' +@@install_component.sql 'expectations/data_values/ut_key_anyvalues.tpb' --core reporter @@install_component.sql 'reporters/ut_documentation_reporter.tps' From e13147115413eace8035bc2f945e7f4ec55b948d Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 14 Mar 2019 13:35:51 +0000 Subject: [PATCH 0284/1096] Savepoints are working properly on distributed transactions. Resolves: #839 --- source/core/types/ut_suite_item.tpb | 4 +- test/api/test_ut_run.pkb | 81 ++++++++++++++++++++++++++--- test/api/test_ut_run.pks | 7 +++ 3 files changed, 84 insertions(+), 8 deletions(-) diff --git a/source/core/types/ut_suite_item.tpb b/source/core/types/ut_suite_item.tpb index ef71975e5..bbaed46c5 100644 --- a/source/core/types/ut_suite_item.tpb +++ b/source/core/types/ut_suite_item.tpb @@ -54,7 +54,7 @@ create or replace type body ut_suite_item as begin if get_rollback_type() = ut_utils.gc_rollback_auto then l_savepoint := ut_utils.gen_savepoint_name(); - execute immediate 'savepoint ' || l_savepoint; + dbms_transaction.savepoint(l_savepoint); end if; return l_savepoint; end; @@ -65,7 +65,7 @@ create or replace type body ut_suite_item as pragma exception_init(ex_savepoint_not_exists, -1086); begin if get_rollback_type() = ut_utils.gc_rollback_auto and a_savepoint is not null then - execute immediate 'rollback to ' || a_savepoint; + dbms_transaction.rollback_savepoint( a_savepoint ); end if; exception when ex_savepoint_not_exists then diff --git a/test/api/test_ut_run.pkb b/test/api/test_ut_run.pkb index 74e9a42d4..cf5350eab 100644 --- a/test/api/test_ut_run.pkb +++ b/test/api/test_ut_run.pkb @@ -697,19 +697,33 @@ create or replace package body test_ut_run is execute immediate q'[drop package empty_suite]'; end; - procedure create_test_suite is + procedure create_db_link is l_service_name varchar2(100); pragma autonomous_transaction; begin select global_name into l_service_name from global_name; execute immediate - 'create public database link db_loopback connect to ut3_tester identified by ut3 - using ''(DESCRIPTION= - (ADDRESS=(PROTOCOL=TCP) - (HOST='||sys_context('userenv','SERVER_HOST')||') + 'create public database link db_loopback connect to ut3_tester identified by ut3 + using ''(DESCRIPTION= + (ADDRESS=(PROTOCOL=TCP) + (HOST='||sys_context('userenv','SERVER_HOST')||') (PORT=1521) ) (CONNECT_DATA=(SERVICE_NAME='||l_service_name||')))'''; + end; + + procedure drop_db_link is + begin + execute immediate 'drop public database link db_loopback'; + exception + when others then + null; + end; + + procedure create_test_suite is + pragma autonomous_transaction; + begin + create_db_link; execute immediate q'[ create or replace package stateful_package as function get_state return varchar2; @@ -796,7 +810,7 @@ Failures:% begin execute immediate 'drop package stateful_package'; execute immediate 'drop package test_stateful'; - begin execute immediate 'drop public database link db_loopback'; exception when others then null; end; + drop_db_link; end; procedure run_in_invalid_state is @@ -942,5 +956,60 @@ Failures:% begin execute immediate 'drop package bad_annotations'; end; + + procedure savepoints_on_db_links is + l_results clob; + begin + ut3.ut.run('test_distributed_savepoint'); + l_results := core.get_dbms_output_as_clob(); + ut.expect(l_results).to_be_like('%1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%'); + end; + + procedure create_suite_with_link is + pragma autonomous_transaction; + begin + create_db_link; + execute immediate 'create table tst(id number(18,0))'; + execute immediate q'[ + create or replace package test_distributed_savepoint is + --%suite + --%suitepath(alltests) + + --%beforeall + procedure setup; + + --%test + procedure test; + end;]'; + + execute immediate q'[ + create or replace package body test_distributed_savepoint is + + g_expected constant integer := 1; + + procedure setup is + begin + insert into tst@db_loopback values(g_expected); + end; + + procedure test is + l_actual integer := 0; + begin + select id into l_actual from tst@db_loopback; + + ut.expect(l_actual).to_equal(g_expected); + end; + + end;]'; + end; + + procedure drop_suite_with_link is + pragma autonomous_transaction; + begin + execute immediate 'drop table tst'; + execute immediate 'drop package test_distributed_savepoint'; + drop_db_link; + end; + end; / diff --git a/test/api/test_ut_run.pks b/test/api/test_ut_run.pks index f193eeb00..55d19e866 100644 --- a/test/api/test_ut_run.pks +++ b/test/api/test_ut_run.pks @@ -56,6 +56,13 @@ create or replace package test_ut_run is --%aftertest(drop_failing_beforeall_suite) procedure run_proc_fail_child_suites; + --%test(Savepoints are working properly on distributed transactions - Issue #839) + --%beforetest(create_suite_with_link) + --%aftertest(drop_suite_with_link) + procedure savepoints_on_db_links; + procedure create_suite_with_link; + procedure drop_suite_with_link; + --%endcontext --%context(run_proc_transaction_control) From 752fccb7e4136f2bbfbc31b99d8ca5d854b78a58 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 14 Mar 2019 16:13:21 +0000 Subject: [PATCH 0285/1096] Checking if Travis build issues are caused by the test or the code change. --- test/api/test_ut_run.pkb | 27 ++++++++++++++------------- test/api/test_ut_run.pks | 1 + 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/test/api/test_ut_run.pkb b/test/api/test_ut_run.pkb index cf5350eab..e9aa8a0bd 100644 --- a/test/api/test_ut_run.pkb +++ b/test/api/test_ut_run.pkb @@ -933,24 +933,25 @@ Failures:% procedure create_bad_annot is pragma autonomous_transaction; - begin - execute immediate q'[ - create or replace package bad_annotations as - --%suite + begin + execute immediate q'[ + create or replace package bad_annotations as + --%suite - --%context + --%context - --%test(invalidspecs) - procedure test1; + --%test(invalidspecs) + procedure test1; - end;]'; + end;]'; - execute immediate q'[ - create or replace package body bad_annotations as - procedure test1 is begin ut.expect(1).to_equal(1); end; - end;]'; + execute immediate q'[ + create or replace package body bad_annotations as + procedure test1 is begin ut.expect(1).to_equal(1); end; + end;]'; + + end; - end; procedure drop_bad_annot is pragma autonomous_transaction; begin diff --git a/test/api/test_ut_run.pks b/test/api/test_ut_run.pks index 55d19e866..05c378040 100644 --- a/test/api/test_ut_run.pks +++ b/test/api/test_ut_run.pks @@ -56,6 +56,7 @@ create or replace package test_ut_run is --%aftertest(drop_failing_beforeall_suite) procedure run_proc_fail_child_suites; + --%disabled(Checking if disabling the test will help hanging Travis build) --%test(Savepoints are working properly on distributed transactions - Issue #839) --%beforetest(create_suite_with_link) --%aftertest(drop_suite_with_link) From 7a4827800e839d1e9f7aef910c1b5f1cb0060c10 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Thu, 14 Mar 2019 16:25:27 +0000 Subject: [PATCH 0286/1096] Initial checkin --- source/core/ut_expectation_processor.pkb | 7 +- source/core/ut_expectation_processor.pks | 2 + source/core/ut_utils.pkb | 13 +++ source/core/ut_utils.pks | 12 ++- .../data_values/ut_data_value_refcursor.tpb | 6 ++ .../expectations/test_expectations_cursor.pkb | 94 +++++++++++++++++++ .../expectations/test_expectations_cursor.pks | 9 ++ 7 files changed, 141 insertions(+), 2 deletions(-) diff --git a/source/core/ut_expectation_processor.pkb b/source/core/ut_expectation_processor.pkb index 170846125..f0b0a72a7 100644 --- a/source/core/ut_expectation_processor.pkb +++ b/source/core/ut_expectation_processor.pkb @@ -88,7 +88,12 @@ create or replace package body ut_expectation_processor as begin add_expectation_result(ut_expectation_result(ut_utils.gc_failure, null, a_message)); end; - + + procedure report_failure_no_caller(a_message in varchar2) is + begin + add_expectation_result(ut_expectation_result(ut_utils.gc_failure, null, a_message,false)); + end; + function get_session_parameters return tt_nls_params is l_session_params tt_nls_params; begin diff --git a/source/core/ut_expectation_processor.pks b/source/core/ut_expectation_processor.pks index f58de2441..017b6aaba 100644 --- a/source/core/ut_expectation_processor.pks +++ b/source/core/ut_expectation_processor.pks @@ -35,6 +35,8 @@ create or replace package ut_expectation_processor authid current_user as procedure add_expectation_result(a_expectation_result ut_expectation_result); procedure report_failure(a_message in varchar2); + + procedure report_failure_no_caller(a_message in varchar2); procedure set_xml_nls_params; diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 79d2df10f..11602ae1f 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -719,5 +719,18 @@ create or replace package body ut_utils is return l_results; end; + function remove_error_from_stack(a_error_stack varchar2, a_ora_code number) return varchar2 is + l_caller_stack_line varchar2(4000); + l_ora_search_pattern varchar2(500) := '^ORA'||a_ora_code||': (.*)$'; + begin + l_caller_stack_line := regexp_replace(srcstr => a_error_stack + ,pattern => l_ora_search_pattern + ,replacestr => null + ,position => 1 + ,occurrence => 1 + ,modifier => 'm'); + return l_caller_stack_line; + end; + end ut_utils; / diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index e4f0641d2..0c779fd09 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -105,6 +105,10 @@ create or replace package ut_utils authid definer is gc_dml_for_all constant pls_integer := -20215; pragma exception_init (ex_dml_for_all, -20215); + ex_xml_processing exception; + gc_xml_processing constant pls_integer := -19202; + pragma exception_init (ex_xml_processing, -19202); + gc_max_storage_varchar2_len constant integer := 4000; gc_max_output_string_length constant integer := 4000; gc_max_input_string_length constant integer := gc_max_output_string_length - 2; --we need to remove 2 chars for quotes around string @@ -353,6 +357,12 @@ create or replace package ut_utils authid definer is * Returns list of sub-type reporters for given list of super-type reporters */ function get_child_reporters(a_for_reporters ut_reporters_info := null) return ut_reporters_info; - + + /** + * Remove given ORA error from stack + */ + function remove_error_from_stack(a_error_stack varchar2, a_ora_code number) return varchar2; + + end ut_utils; / diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 53c881693..24febc46c 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -96,6 +96,12 @@ create or replace type body ut_data_value_refcursor as exception when cursor_not_open then raise_application_error(-20155, 'Cursor is not open'); + when ut_utils.ex_xml_processing then + if l_cursor%isopen then + close l_cursor; + end if; + ut_expectation_processor.report_failure_no_caller('Failed to process ref_cursor with error'||chr(10)|| + ut_utils.remove_error_from_stack(sqlerrm,-19202)); when others then if l_cursor%isopen then close l_cursor; diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index 599745de7..e212bf076 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -2465,5 +2465,99 @@ Diff:% ut.expect(l_actual_message).to_be_like(l_expected_message); end; + procedure xml_error_actual is + c_price CONSTANT NUMBER(20,4):= 1357; + c_user CONSTANT varchar2(30):= 'TEST_USER'; + v_actual sys_refcursor; + v_expected sys_refcursor; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + open v_actual for + select cast(null as number(10)) as usd_price_amt, c_user as update_id + from dual where dummy = 1; + open v_expected for + select c_price as usd_price_amt, c_user as update_id from dual; + + ut3.ut.expect(v_actual).to_equal(v_expected); + --Assert + l_expected_message := q'[%Failed to process ref_cursor with error +%ORA-01722: invalid number +%Actual: refcursor [ count = ] was expected to equal: refcursor [ count = 1 ] +%Diff: +%Columns: +%Column [data-type: NUMBER] is missing. Expected column position: 1. +%Column [data-type: VARCHAR2] is missing. Expected column position: 2. +%Rows: [ 1 differences ] +%Row No. 1 - Missing: 1357TEST_USER]'; + + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure xml_error_expected is + c_price CONSTANT NUMBER(20,4):= 1357; + c_user CONSTANT varchar2(30):= 'TEST_USER'; + v_actual sys_refcursor; + v_expected sys_refcursor; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + open v_expected for + select cast(null as number(10)) as usd_price_amt, c_user as update_id + from dual where dummy = 1; + open v_actual for + select c_price as usd_price_amt, c_user as update_id from dual; + + ut3.ut.expect(v_actual).to_equal(v_expected); + --Assert + l_expected_message := q'[%Failed to process ref_cursor with error +%ORA-01722: invalid number +%Actual: refcursor [ count = 1 ] was expected to equal: refcursor [ count = ] +%Diff: +%Columns: +%Column [data-type: NUMBER] is missing. Expected column position: 1. +%Column [data-type: VARCHAR2] is missing. Expected column position: 2. +%Rows: [ 1 differences ] +%Row No. 1 - Extra: 1357TEST_USER]'; + + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure xml_error_both is + c_price CONSTANT NUMBER(20,4):= 1357; + c_user CONSTANT varchar2(30):= 'TEST_USER'; + v_actual sys_refcursor; + v_expected sys_refcursor; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + open v_actual for + select cast(null as number(10)) as usd_price_amt, c_user as update_id + from dual where dummy = 1; + open v_expected for + select cast(null as number(10)) as usd_price_amt, c_user as update_id + from dual where dummy = 1; + + ut3.ut.expect(v_actual).to_equal(v_expected); + --Assert + l_expected_message := q'[%Failed to process ref_cursor with error +%ORA-01722: invalid number +%Actual: refcursor [ count = 1 ] was expected to equal: refcursor [ count = ] +%Diff: +%Columns: +%Column [data-type: NUMBER] is missing. Expected column position: 1. +%Column [data-type: VARCHAR2] is missing. Expected column position: 2. +%Rows: [ 1 differences ] +%Row No. 1 - Extra: 1357TEST_USER]'; + + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + end; / diff --git a/test/core/expectations/test_expectations_cursor.pks b/test/core/expectations/test_expectations_cursor.pks index c0195393e..26605addd 100644 --- a/test/core/expectations/test_expectations_cursor.pks +++ b/test/core/expectations/test_expectations_cursor.pks @@ -390,6 +390,15 @@ create or replace package test_expectations_cursor is --%test(Cursor to contain duplicates fail) procedure to_contain_duplicates_fail; + + --%test(Fail to process a cursor for actual) + procedure xml_error_actual; + + --%test(Fail to process a cursor for expected) + procedure xml_error_expected; + + --%test(Fail to process a cursor for both) + procedure xml_error_both; end; / From 8a90ef842745626f648075595eeb456ceec70d73 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 14 Mar 2019 16:30:18 +0000 Subject: [PATCH 0287/1096] Changed solution for savepoints on distributed transactions. Solution with DBMS_SESSION was causing instability on 18c (hanging builds). --- source/core/types/ut_suite_item.tpb | 4 ++-- source/core/ut_utils.pkb | 2 +- test/api/test_ut_run.pks | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/source/core/types/ut_suite_item.tpb b/source/core/types/ut_suite_item.tpb index bbaed46c5..ef71975e5 100644 --- a/source/core/types/ut_suite_item.tpb +++ b/source/core/types/ut_suite_item.tpb @@ -54,7 +54,7 @@ create or replace type body ut_suite_item as begin if get_rollback_type() = ut_utils.gc_rollback_auto then l_savepoint := ut_utils.gen_savepoint_name(); - dbms_transaction.savepoint(l_savepoint); + execute immediate 'savepoint ' || l_savepoint; end if; return l_savepoint; end; @@ -65,7 +65,7 @@ create or replace type body ut_suite_item as pragma exception_init(ex_savepoint_not_exists, -1086); begin if get_rollback_type() = ut_utils.gc_rollback_auto and a_savepoint is not null then - dbms_transaction.rollback_savepoint( a_savepoint ); + execute immediate 'rollback to ' || a_savepoint; end if; exception when ex_savepoint_not_exists then diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 79d2df10f..031fc9dd9 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -52,7 +52,7 @@ create or replace package body ut_utils is function gen_savepoint_name return varchar2 is begin - return '"'|| utl_raw.cast_to_varchar2(utl_encode.base64_encode(sys_guid()))||'"'; + return 's'||to_char(current_timestamp,'yyyymmddhh24missff6'); end; procedure debug_log(a_message varchar2) is diff --git a/test/api/test_ut_run.pks b/test/api/test_ut_run.pks index 05c378040..55d19e866 100644 --- a/test/api/test_ut_run.pks +++ b/test/api/test_ut_run.pks @@ -56,7 +56,6 @@ create or replace package test_ut_run is --%aftertest(drop_failing_beforeall_suite) procedure run_proc_fail_child_suites; - --%disabled(Checking if disabling the test will help hanging Travis build) --%test(Savepoints are working properly on distributed transactions - Issue #839) --%beforetest(create_suite_with_link) --%aftertest(drop_suite_with_link) From 3e4e1a8475fb93495356c37375da0eac962de586 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Thu, 14 Mar 2019 21:18:18 +0000 Subject: [PATCH 0288/1096] Fixing a conversion of date when extracting XML DATE,TS, TS_TZ,TS_LTS using XMLTABLE. --- .../data_values/ut_compound_data_helper.pkb | 17 ++++++++------ .../data_values/ut_data_value_refcursor.tpb | 22 ++++++++++++++++--- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 984f8edb2..ba91f13e3 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -206,6 +206,14 @@ create or replace package body ut_compound_data_helper is begin if a_data_info.is_sql_diffable = 0 then l_col_syntax := l_ut_owner ||'.ut_compound_data_helper.get_hash('||l_alias||a_data_info.transformed_name||'.getClobVal()) as '||a_data_info.transformed_name ; + elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type = 'DATE' then + l_col_syntax := 'to_date('||l_alias||a_data_info.transformed_name||','''||ut_utils.gc_date_format||''') as '|| a_data_info.transformed_name; + elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('TIMESTAMP') then + l_col_syntax := 'to_timestamp('||l_alias||a_data_info.transformed_name||','''||ut_utils.gc_timestamp_format||''') as '|| a_data_info.transformed_name; + elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('TIMESTAMP WITH TIME ZONE') then + l_col_syntax := 'to_timestamp_tz('||l_alias||a_data_info.transformed_name||','''||ut_utils.gc_timestamp_tz_format||''') as '|| a_data_info.transformed_name; + elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('TIMESTAMP WITH LOCAL TIME ZONE') then + l_col_syntax := ' cast( to_timestamp_tz('||l_alias||a_data_info.transformed_name||','''||ut_utils.gc_timestamp_tz_format||''') AS TIMESTAMP WITH LOCAL TIME ZONE) as '|| a_data_info.transformed_name; else l_col_syntax := l_alias||a_data_info.transformed_name||' as '|| a_data_info.transformed_name; end if; @@ -217,12 +225,8 @@ create or replace package body ut_compound_data_helper is begin if a_data_info.is_sql_diffable = 0 then l_col_type := 'XMLTYPE'; - elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type = 'DATE' then - l_col_type := 'TIMESTAMP'; - elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('TIMESTAMP','TIMESTAMP WITH TIME ZONE') then - l_col_type := a_data_info.column_type; - --TODO : Oracle bug : https://community.oracle.com/thread/1957521 - elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type = 'TIMESTAMP WITH LOCAL TIME ZONE' then + elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('DATE','TIMESTAMP','TIMESTAMP WITH TIME ZONE', + 'TIMESTAMP WITH LOCAL TIME ZONE') then l_col_type := 'VARCHAR2(50)'; elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('INTERVAL DAY TO SECOND','INTERVAL YEAR TO MONTH') then l_col_type := a_data_info.column_type; @@ -370,7 +374,6 @@ create or replace package body ut_compound_data_helper is end if; l_compare_sql := replace(l_compare_sql,'{:where_condition:}',l_where_stmt); - return l_compare_sql; end; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 53c881693..922a08193 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -304,9 +304,25 @@ create or replace type body ut_data_value_refcursor as l_diif_rowcount integer :=0; begin l_diff_id := ut_compound_data_helper.get_hash(a_self.data_id||a_other.data_id); - open l_cursor for a_diff_cursor_text using a_self.data_id, a_other.data_id; - --fetch and save rows for display of diff - fetch l_cursor bulk collect into l_diff_tab limit ut_utils.gc_diff_max_rows; + + --Set NLS settings to handle extract of date from xml + ut_expectation_processor.set_xml_nls_params(); + + begin + open l_cursor for a_diff_cursor_text using a_self.data_id, a_other.data_id; + --fetch and save rows for display of diff + fetch l_cursor bulk collect into l_diff_tab limit ut_utils.gc_diff_max_rows; + + --Reset parameters back + ut_expectation_processor.reset_nls_params(); + exception when others then + ut_expectation_processor.reset_nls_params(); + if l_cursor%isopen then + close l_cursor; + end if; + raise; + end; + ut_compound_data_helper.insert_diffs_result( l_diff_tab, l_diff_id ); --fetch rows for count only loop From 60fbb95813503ba23920db0b0060d89e5d8bf879 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 14 Mar 2019 22:34:34 +0000 Subject: [PATCH 0289/1096] Trying to resolve travis frozen tests issues. --- source/core/ut_utils.pkb | 2 +- .../min_grant_user/test_min_grant_user.pkb | 47 ------------------- .../min_grant_user/test_min_grant_user.pks | 6 --- test/helpers/ut3user#.test_cursor_grants.pkb | 23 +++++++++ test/helpers/ut3user#.test_cursor_grants.pks | 9 ++++ test/install_tests.sql | 2 + 6 files changed, 35 insertions(+), 54 deletions(-) create mode 100644 test/helpers/ut3user#.test_cursor_grants.pkb create mode 100644 test/helpers/ut3user#.test_cursor_grants.pks diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 031fc9dd9..29075f5cb 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -52,7 +52,7 @@ create or replace package body ut_utils is function gen_savepoint_name return varchar2 is begin - return 's'||to_char(current_timestamp,'yyyymmddhh24missff6'); + return '"'||'s'||to_char(current_timestamp,'yyyymmddhh24missff6')||'"'; end; procedure debug_log(a_message varchar2) is diff --git a/test/core/min_grant_user/test_min_grant_user.pkb b/test/core/min_grant_user/test_min_grant_user.pkb index 906906fe1..13893357c 100644 --- a/test/core/min_grant_user/test_min_grant_user.pkb +++ b/test/core/min_grant_user/test_min_grant_user.pkb @@ -1,52 +1,5 @@ create or replace package body test_min_grant_user is - procedure create_ut3$user#_tests is - pragma autonomous_transaction; - begin - execute immediate q'[ - create or replace package ut3$user#.test_cursor_grants is - --%suite() - - procedure run; - - --%test(execute join by test) - procedure test_join_by_cursor; - end; - ]'; - execute immediate q'[ - create or replace package body ut3$user#.test_cursor_grants is - procedure run is - begin - ut3.ut.run('test_cursor_grants'); - end; - procedure test_join_by_cursor is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; - begin - --Arrange - open l_actual for select owner, object_name,object_type from all_objects where owner = user - order by 1,2,3 asc; - open l_expected for select owner, object_name,object_type from all_objects where owner = user - order by 1,2,3 desc; - - --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OWNER'); - - end; - - - end; - ]'; - end; - - procedure drop_ut3$user#_tests is - pragma autonomous_transaction; - begin - execute immediate q'[drop package ut3$user#.test_cursor_grants]'; - end; - - - procedure test_join_by_cursor is l_results clob; begin diff --git a/test/core/min_grant_user/test_min_grant_user.pks b/test/core/min_grant_user/test_min_grant_user.pks index 02f3ac8da..48c550f4c 100644 --- a/test/core/min_grant_user/test_min_grant_user.pks +++ b/test/core/min_grant_user/test_min_grant_user.pks @@ -3,12 +3,6 @@ create or replace package test_min_grant_user is --%suite(minimum grant user tests) --%suitepath(utplsql.core) - --%beforeall - procedure create_ut3$user#_tests; - - --%afterall - procedure drop_ut3$user#_tests; - --%test(execute join by test) procedure test_join_by_cursor; diff --git a/test/helpers/ut3user#.test_cursor_grants.pkb b/test/helpers/ut3user#.test_cursor_grants.pkb new file mode 100644 index 000000000..481f23c84 --- /dev/null +++ b/test/helpers/ut3user#.test_cursor_grants.pkb @@ -0,0 +1,23 @@ +create or replace package body ut3$user#.test_cursor_grants is + + procedure run is + begin + ut3.ut.run('test_cursor_grants'); + end; + + procedure test_join_by_cursor is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + begin + --Arrange + open l_actual for select owner, object_name,object_type from all_objects where owner = user + order by 1,2,3 asc; + open l_expected for select owner, object_name,object_type from all_objects where owner = user + order by 1,2,3 desc; + + --Act + ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OWNER'); + + end; +end; +/ \ No newline at end of file diff --git a/test/helpers/ut3user#.test_cursor_grants.pks b/test/helpers/ut3user#.test_cursor_grants.pks new file mode 100644 index 000000000..012b973c8 --- /dev/null +++ b/test/helpers/ut3user#.test_cursor_grants.pks @@ -0,0 +1,9 @@ +create or replace package ut3$user#.test_cursor_grants is + --%suite() + + procedure run; + + --%test(execute join by test) + procedure test_join_by_cursor; +end; +/ diff --git a/test/install_tests.sql b/test/install_tests.sql index 96d2702f8..ae2a4f1a0 100644 --- a/test/install_tests.sql +++ b/test/install_tests.sql @@ -15,6 +15,8 @@ alter session set plsql_optimize_level=0; @@helpers/test_dummy_object_list.tps @@helpers/test_event_object.tps @@helpers/test_event_list.tps +@@helpers/ut3user#.test_cursor_grants.pks +@@helpers/ut3user#.test_cursor_grants.pkb --Install tests @@core.pks From 898bec2bdc573a5431dee3916a7e904e1c5c6afa Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 15 Mar 2019 01:33:44 +0000 Subject: [PATCH 0290/1096] Fixed support for different DATE NLS settings. --- docs/userguide/expectations.md | 4 ++-- source/core/ut_expectation_processor.pkb | 4 ++-- source/expectations/data_values/ut_compound_data_helper.pkb | 2 +- source/expectations/data_values/ut_data_value_refcursor.tpb | 6 ------ test/core/expectations/test_expectations_cursor.pkb | 6 +++--- 5 files changed, 8 insertions(+), 14 deletions(-) diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index ec2934615..a94d325ae 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1004,7 +1004,7 @@ Due to the way Oracle handles DATE data type when converting from cursor data to The NLS_DATE_FORMAT setting from the moment the cursor was opened determines the formatting of dates used for cursor data comparison. By default, Oracle NLS_DATE_FORMAT is timeless, so data of DATE datatype, will be compared ignoring the time component. -You should use procedures `ut.set_nls`, `ut.reset_nls` around cursors that you want to compare in your tests. +You should surround cursors and expectations with procedures `ut.set_nls`, `ut.reset_nls`. This way, the DATE data in cursors will be properly formatted for comparison using date-time format. The example below makes use of `ut.set_nls`, `ut.reset_nls`, so that the date in `l_expected` and `l_actual` is compared using date-time formatting. @@ -1048,9 +1048,9 @@ create or replace package body test_get_events is open l_expected_bad_date for select gc_description as description, gc_event_date + gc_second as event_date from dual; --Act l_actual := get_events(); - ut.reset_nls(); -- Change the NLS settings after cursors were opened --Assert ut.expect( l_actual ).not_to_equal( l_expected_bad_date ); + ut.reset_nls(); -- Change the NLS settings after cursors were opened end; procedure bad_test is diff --git a/source/core/ut_expectation_processor.pkb b/source/core/ut_expectation_processor.pkb index 170846125..8d6205111 100644 --- a/source/core/ut_expectation_processor.pkb +++ b/source/core/ut_expectation_processor.pkb @@ -96,7 +96,8 @@ create or replace package body ut_expectation_processor as bulk collect into l_session_params from nls_session_parameters nsp where parameter - in ( 'NLS_DATE_FORMAT', 'NLS_TIMESTAMP_FORMAT', 'NLS_TIMESTAMP_TZ_FORMAT'); + in ( 'NLS_DATE_FORMAT', 'NLS_TIMESTAMP_FORMAT', 'NLS_TIMESTAMP_TZ_FORMAT') + order by 1; return l_session_params; end; @@ -113,7 +114,6 @@ create or replace package body ut_expectation_processor as when insuf_privs then NULL; end; - execute immediate 'alter session set nls_date_format = '''||ut_utils.gc_date_format||''''; execute immediate 'alter session set nls_timestamp_format = '''||ut_utils.gc_timestamp_format||''''; execute immediate 'alter session set nls_timestamp_tz_format = '''||ut_utils.gc_timestamp_tz_format||''''; end; diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index ba91f13e3..dab3d4af1 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -207,7 +207,7 @@ create or replace package body ut_compound_data_helper is if a_data_info.is_sql_diffable = 0 then l_col_syntax := l_ut_owner ||'.ut_compound_data_helper.get_hash('||l_alias||a_data_info.transformed_name||'.getClobVal()) as '||a_data_info.transformed_name ; elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type = 'DATE' then - l_col_syntax := 'to_date('||l_alias||a_data_info.transformed_name||','''||ut_utils.gc_date_format||''') as '|| a_data_info.transformed_name; + l_col_syntax := 'to_date('||l_alias||a_data_info.transformed_name||') as '|| a_data_info.transformed_name; elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('TIMESTAMP') then l_col_syntax := 'to_timestamp('||l_alias||a_data_info.transformed_name||','''||ut_utils.gc_timestamp_format||''') as '|| a_data_info.transformed_name; elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('TIMESTAMP WITH TIME ZONE') then diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 922a08193..584ca6426 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -305,18 +305,12 @@ create or replace type body ut_data_value_refcursor as begin l_diff_id := ut_compound_data_helper.get_hash(a_self.data_id||a_other.data_id); - --Set NLS settings to handle extract of date from xml - ut_expectation_processor.set_xml_nls_params(); - begin open l_cursor for a_diff_cursor_text using a_self.data_id, a_other.data_id; --fetch and save rows for display of diff fetch l_cursor bulk collect into l_diff_tab limit ut_utils.gc_diff_max_rows; - --Reset parameters back - ut_expectation_processor.reset_nls_params(); exception when others then - ut_expectation_processor.reset_nls_params(); if l_cursor%isopen then close l_cursor; end if; diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index 599745de7..f0d9ae36e 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -62,7 +62,7 @@ create or replace package body test_expectations_cursor is l_actual sys_refcursor; begin -- Arrange - ut.set_nls; + ut3.ut.set_nls; open l_expected for select 1 as my_num, 'This is my test string' as my_string, @@ -75,11 +75,11 @@ create or replace package body test_expectations_cursor is to_clob('This is an even longer test clob') as my_clob, to_date('1984-09-05', 'YYYY-MM-DD') as my_date from dual; - ut.reset_nls; --Act ut3.ut.expect( l_actual ).to_equal( l_expected ); --Assert ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut3.ut.reset_nls; end; procedure success_on_empty @@ -404,11 +404,11 @@ create or replace package body test_expectations_cursor is ut3.ut.set_nls; open l_actual for select l_date as some_date from dual; open l_expected for select l_date-l_second some_date from dual; - ut3.ut.reset_nls; --Act ut3.ut.expect( l_actual ).to_equal( l_expected ); --Assert ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); + ut3.ut.reset_nls; end; procedure uses_default_nls_for_date From 0089bee7e42860ab6f6fb5831ea9e8f7677431ba Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 15 Mar 2019 01:36:05 +0000 Subject: [PATCH 0291/1096] Reverting back to use `sys_guid` as current_timestamp is static when running tests as a query `select * from table(ut.run())` --- source/core/types/ut_suite_item.tpb | 4 ++-- source/core/ut_utils.pkb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/core/types/ut_suite_item.tpb b/source/core/types/ut_suite_item.tpb index ef71975e5..bbaed46c5 100644 --- a/source/core/types/ut_suite_item.tpb +++ b/source/core/types/ut_suite_item.tpb @@ -54,7 +54,7 @@ create or replace type body ut_suite_item as begin if get_rollback_type() = ut_utils.gc_rollback_auto then l_savepoint := ut_utils.gen_savepoint_name(); - execute immediate 'savepoint ' || l_savepoint; + dbms_transaction.savepoint(l_savepoint); end if; return l_savepoint; end; @@ -65,7 +65,7 @@ create or replace type body ut_suite_item as pragma exception_init(ex_savepoint_not_exists, -1086); begin if get_rollback_type() = ut_utils.gc_rollback_auto and a_savepoint is not null then - execute immediate 'rollback to ' || a_savepoint; + dbms_transaction.rollback_savepoint( a_savepoint ); end if; exception when ex_savepoint_not_exists then diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 29075f5cb..79d2df10f 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -52,7 +52,7 @@ create or replace package body ut_utils is function gen_savepoint_name return varchar2 is begin - return '"'||'s'||to_char(current_timestamp,'yyyymmddhh24missff6')||'"'; + return '"'|| utl_raw.cast_to_varchar2(utl_encode.base64_encode(sys_guid()))||'"'; end; procedure debug_log(a_message varchar2) is From 4e8b372ae13804800d4d4bbf0dbc5797241730d9 Mon Sep 17 00:00:00 2001 From: Samuel Nitsche Date: Fri, 15 Mar 2019 09:11:18 +0100 Subject: [PATCH 0292/1096] Fix typo in docs Thanks Sabine for pointing out :) --- docs/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index b92a78688..96e65c449 100644 --- a/docs/index.md +++ b/docs/index.md @@ -11,7 +11,7 @@ The framework follows industry standards and best patterns of modern Unit Testin - [Advanced data comparison](userguide/advanced_data_comparison.md) - [Running unit tests](userguide/running-unit-tests.md) - [Querying for test suites](userguide/querying_suites.md) - - [Testing best pracitces](userguide/best-practices.md) + - [Testing best practices](userguide/best-practices.md) - [Upgrade utPLSQL](userguide/upgrade.md) - Reporting - [Using reporters](userguide/reporters.md) From a9c6cad66efb5b5a88f18b4d2a39ae508d8499e0 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 15 Mar 2019 10:51:07 +0000 Subject: [PATCH 0293/1096] Switched to use sequence for savepoint names. Removed calls to `dbms_transaction` as they were causing library pin locks on our tests. --- source/core/types/ut_suite_item.tpb | 4 ++-- source/core/ut_savepoint_seq.sql | 15 +++++++++++++++ source/core/ut_utils.pkb | 2 +- source/install.sql | 1 + source/uninstall_objects.sql | 2 ++ test/api/test_ut_run.pkb | 4 ++-- 6 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 source/core/ut_savepoint_seq.sql diff --git a/source/core/types/ut_suite_item.tpb b/source/core/types/ut_suite_item.tpb index bbaed46c5..ef71975e5 100644 --- a/source/core/types/ut_suite_item.tpb +++ b/source/core/types/ut_suite_item.tpb @@ -54,7 +54,7 @@ create or replace type body ut_suite_item as begin if get_rollback_type() = ut_utils.gc_rollback_auto then l_savepoint := ut_utils.gen_savepoint_name(); - dbms_transaction.savepoint(l_savepoint); + execute immediate 'savepoint ' || l_savepoint; end if; return l_savepoint; end; @@ -65,7 +65,7 @@ create or replace type body ut_suite_item as pragma exception_init(ex_savepoint_not_exists, -1086); begin if get_rollback_type() = ut_utils.gc_rollback_auto and a_savepoint is not null then - dbms_transaction.rollback_savepoint( a_savepoint ); + execute immediate 'rollback to ' || a_savepoint; end if; exception when ex_savepoint_not_exists then diff --git a/source/core/ut_savepoint_seq.sql b/source/core/ut_savepoint_seq.sql new file mode 100644 index 000000000..6ccfc182a --- /dev/null +++ b/source/core/ut_savepoint_seq.sql @@ -0,0 +1,15 @@ +create sequence ut_savepoint_seq + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + start with 1 cache 20; \ No newline at end of file diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 79d2df10f..3d4836ce0 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -52,7 +52,7 @@ create or replace package body ut_utils is function gen_savepoint_name return varchar2 is begin - return '"'|| utl_raw.cast_to_varchar2(utl_encode.base64_encode(sys_guid()))||'"'; + return 's'||trim(to_char(ut_savepoint_seq.nextval,'0000000000000000000000000000')); end; procedure debug_log(a_message varchar2) is diff --git a/source/install.sql b/source/install.sql index e5cc60c23..4d24b1d34 100644 --- a/source/install.sql +++ b/source/install.sql @@ -50,6 +50,7 @@ alter session set current_schema = &&ut3_owner; @@install_component.sql 'core/types/ut_reporters_info.tps' @@install_component.sql 'core/ut_utils.pks' @@install_component.sql 'core/ut_metadata.pks' +@@install_component.sql 'core/ut_savepoint_seq.sql' @@install_component.sql 'core/ut_utils.pkb' @@install_component.sql 'core/ut_metadata.pkb' @@install_component.sql 'reporters/ut_ansiconsole_helper.pks' diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index e6ea76a3a..6048a832f 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -179,6 +179,8 @@ drop package ut_ansiconsole_helper; drop package ut_utils; +drop sequence ut_savepoint_seq; + drop type ut_documentation_reporter force; drop type ut_teamcity_reporter force; diff --git a/test/api/test_ut_run.pkb b/test/api/test_ut_run.pkb index e9aa8a0bd..9e9fce0f7 100644 --- a/test/api/test_ut_run.pkb +++ b/test/api/test_ut_run.pkb @@ -808,9 +808,9 @@ Failures:% procedure drop_test_suite is pragma autonomous_transaction; begin + drop_db_link; execute immediate 'drop package stateful_package'; execute immediate 'drop package test_stateful'; - drop_db_link; end; procedure run_in_invalid_state is @@ -1007,9 +1007,9 @@ Failures:% procedure drop_suite_with_link is pragma autonomous_transaction; begin + drop_db_link; execute immediate 'drop table tst'; execute immediate 'drop package test_distributed_savepoint'; - drop_db_link; end; end; From 669c63a4028dbb06d53b328d1e8086239ff10e90 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Fri, 15 Mar 2019 11:26:15 +0000 Subject: [PATCH 0294/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index d06344f64..b86172822 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.4.2619-develop'; + gc_version constant varchar2(50) := 'v3.1.4.2653-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From cafcd8a4e86a24ae9e093697845c29f649e8f718 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Fri, 15 Mar 2019 12:23:50 +0000 Subject: [PATCH 0295/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index b86172822..d8d2ccf82 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.4.2653-develop'; + gc_version constant varchar2(50) := 'v3.1.4.2656-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 05adfa2fa10fc8d31867049b16c49ba887c7f68b Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 15 Mar 2019 13:06:13 +0000 Subject: [PATCH 0296/1096] Moving expectations for compound into single type and removing expectation_cursors to allow anydata to inherit --- source/api/ut.pkb | 8 +- source/api/ut.pks | 4 +- .../create_synonyms_and_grants_for_public.sql | 2 - source/create_user_grants.sql | 1 - source/create_user_synonyms.sql | 1 - source/expectations/matchers/ut_contain.tpb | 7 + source/expectations/matchers/ut_contain.tps | 3 +- source/expectations/ut_expectation.tpb | 10 ++ source/expectations/ut_expectation.tps | 4 +- .../expectations/ut_expectation_compound.tpb | 65 +++++++++ .../expectations/ut_expectation_compound.tps | 14 +- .../expectations/ut_expectation_refcursor.tpb | 125 ------------------ .../expectations/ut_expectation_refcursor.tps | 41 ------ source/install.sql | 2 - source/uninstall_objects.sql | 2 - .../expectations/test_expectation_anydata.pkb | 30 ++++- .../expectations/test_expectation_anydata.pks | 6 + 17 files changed, 139 insertions(+), 186 deletions(-) delete mode 100644 source/expectations/ut_expectation_refcursor.tpb delete mode 100644 source/expectations/ut_expectation_refcursor.tps diff --git a/source/api/ut.pkb b/source/api/ut.pkb index fd7a06988..eb4a06bc3 100644 --- a/source/api/ut.pkb +++ b/source/api/ut.pkb @@ -28,9 +28,9 @@ create or replace package body ut is return ut_runner.version(); end; - function expect(a_actual in anydata, a_message varchar2 := null) return ut_expectation_refcursor is + function expect(a_actual in anydata, a_message varchar2 := null) return ut_expectation_compound is begin - return ut_expectation_refcursor(ut_data_value_anydata(a_actual), a_message); + return ut_expectation_compound(ut_data_value_anydata(a_actual), a_message); end; function expect(a_actual in blob, a_message varchar2 := null) return ut_expectation is @@ -78,9 +78,9 @@ create or replace package body ut is return ut_expectation(ut_data_value_varchar2(a_actual), a_message); end; - function expect(a_actual in sys_refcursor, a_message varchar2 := null) return ut_expectation_refcursor is + function expect(a_actual in sys_refcursor, a_message varchar2 := null) return ut_expectation_compound is begin - return ut_expectation_refcursor(ut_data_value_refcursor(a_actual), a_message); + return ut_expectation_compound(ut_data_value_refcursor(a_actual), a_message); end; function expect(a_actual in yminterval_unconstrained, a_message varchar2 := null) return ut_expectation is diff --git a/source/api/ut.pks b/source/api/ut.pks index 3ca3c08ff..25c9e6493 100644 --- a/source/api/ut.pks +++ b/source/api/ut.pks @@ -19,7 +19,7 @@ create or replace package ut authid current_user as function version return varchar2; - function expect(a_actual in anydata, a_message varchar2 := null) return ut_expectation_refcursor; + function expect(a_actual in anydata, a_message varchar2 := null) return ut_expectation_compound; function expect(a_actual in blob, a_message varchar2 := null) return ut_expectation; @@ -31,7 +31,7 @@ create or replace package ut authid current_user as function expect(a_actual in number, a_message varchar2 := null) return ut_expectation; - function expect(a_actual in sys_refcursor, a_message varchar2 := null) return ut_expectation_refcursor; + function expect(a_actual in sys_refcursor, a_message varchar2 := null) return ut_expectation_compound; function expect(a_actual in timestamp_unconstrained, a_message varchar2 := null) return ut_expectation; diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index e1ee84d0b..632925cec 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -33,7 +33,6 @@ alter session set current_schema = &&ut3_owner; grant execute on &&ut3_owner..ut_expectation to public; grant execute on &&ut3_owner..ut_expectation_compound to public; -grant execute on &&ut3_owner..ut_expectation_refcursor to public; grant execute on &&ut3_owner..ut_be_between to public; grant execute on &&ut3_owner..ut_be_empty to public; grant execute on &&ut3_owner..ut_be_false to public; @@ -111,7 +110,6 @@ prompt Creating synonyms for UTPLSQL objects in &&ut3_owner schema to PUBLIC create public synonym ut_expectation for &&ut3_owner..ut_expectation; create public synonym ut_expectation_compound for &&ut3_owner..ut_expectation_compound; -create public synonym ut_expectation_refcursor for &&ut3_owner..ut_expectation_refcursor; create public synonym be_between for &&ut3_owner..be_between; create public synonym be_empty for &&ut3_owner..be_empty; diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql index 7785c09fb..e62f6ccc2 100644 --- a/source/create_user_grants.sql +++ b/source/create_user_grants.sql @@ -53,7 +53,6 @@ alter session set current_schema = &&ut3_owner; grant execute on &&ut3_owner..ut_expectation to &ut3_user; grant execute on &&ut3_owner..ut_expectation_compound to &ut3_user; -grant execute on &&ut3_owner..ut_expectation_refcursor to &ut3_user; grant execute on &&ut3_owner..ut_be_between to &ut3_user; grant execute on &&ut3_owner..ut_be_empty to &ut3_user; diff --git a/source/create_user_synonyms.sql b/source/create_user_synonyms.sql index 70663024a..6ea06a0fd 100644 --- a/source/create_user_synonyms.sql +++ b/source/create_user_synonyms.sql @@ -55,7 +55,6 @@ prompt Creating synonyms for UTPLSQL objects in &&ut3_owner schema to user &&ut3 create or replace synonym &ut3_user..ut_expectation for &&ut3_owner..ut_expectation; create or replace synonym &ut3_user..ut_expectation_compound for &&ut3_owner..ut_expectation_compound; -create or replace synonym &ut3_user..ut_expectation_refcursor for &&ut3_owner..ut_expectation_refcursor; create or replace synonym &ut3_user..be_between for &&ut3_owner..be_between; create or replace synonym &ut3_user..be_empty for &&ut3_owner..be_empty; diff --git a/source/expectations/matchers/ut_contain.tpb b/source/expectations/matchers/ut_contain.tpb index 5c823ccc4..bb6e78d50 100644 --- a/source/expectations/matchers/ut_contain.tpb +++ b/source/expectations/matchers/ut_contain.tpb @@ -23,6 +23,13 @@ create or replace type body ut_contain as return; end; + constructor function ut_contain(self in out nocopy ut_contain, a_expected anydata) return self as result is + begin + self.init(ut_data_value_anydata(a_expected), null, $$plsql_unit); + self.options.unordered(); + return; + end; + overriding member function run_matcher(self in out nocopy ut_contain, a_actual ut_data_value) return boolean is l_result boolean; begin diff --git a/source/expectations/matchers/ut_contain.tps b/source/expectations/matchers/ut_contain.tps index f0b1c0ddb..c050943a3 100644 --- a/source/expectations/matchers/ut_contain.tps +++ b/source/expectations/matchers/ut_contain.tps @@ -24,9 +24,10 @@ create or replace type ut_contain under ut_equal( */ constructor function ut_contain(self in out nocopy ut_contain, a_expected sys_refcursor) return self as result, + constructor function ut_contain(self in out nocopy ut_contain, a_expected anydata) return self as result, overriding member function run_matcher(self in out nocopy ut_contain, a_actual ut_data_value) return boolean, overriding member function run_matcher_negated(self in out nocopy ut_contain, a_actual ut_data_value) return boolean, overriding member function failure_message(a_actual ut_data_value) return varchar2, overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2 ) -/ + diff --git a/source/expectations/ut_expectation.tpb b/source/expectations/ut_expectation.tpb index 97ce1d195..54de82b47 100644 --- a/source/expectations/ut_expectation.tpb +++ b/source/expectations/ut_expectation.tpb @@ -691,5 +691,15 @@ create or replace type body ut_expectation as self.not_to( ut_contain(a_expected).negated() ); end; + member procedure to_contain(self in ut_expectation, a_expected anydata) is + begin + self.to_( ut_contain(a_expected) ); + end; + + member procedure not_to_contain(self in ut_expectation, a_expected anydata) is + begin + self.not_to( ut_contain(a_expected).negated() ); + end; + end; / diff --git a/source/expectations/ut_expectation.tps b/source/expectations/ut_expectation.tps index 5f3dfaabf..eae74202e 100644 --- a/source/expectations/ut_expectation.tps +++ b/source/expectations/ut_expectation.tps @@ -161,7 +161,9 @@ create or replace type ut_expectation authid current_user as object( member procedure not_to_be_less_than(self in ut_expectation, a_expected yminterval_unconstrained), member procedure to_contain(self in ut_expectation, a_expected sys_refcursor), - member procedure not_to_contain(self in ut_expectation, a_expected sys_refcursor) + member procedure not_to_contain(self in ut_expectation, a_expected sys_refcursor), + member procedure to_contain(self in ut_expectation, a_expected anydata), + member procedure not_to_contain(self in ut_expectation, a_expected anydata) ) not final diff --git a/source/expectations/ut_expectation_compound.tpb b/source/expectations/ut_expectation_compound.tpb index 538a0becb..603513e78 100644 --- a/source/expectations/ut_expectation_compound.tpb +++ b/source/expectations/ut_expectation_compound.tpb @@ -58,6 +58,48 @@ create or replace type body ut_expectation_compound as return l_result; end; + member function to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_compound is + l_result ut_expectation_compound := self; + begin + l_result.matcher := ut_equal(a_expected, a_nulls_are_equal); + return l_result; + end; + + member function not_to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_compound is + l_result ut_expectation_compound := self; + begin + l_result.matcher := ut_equal(a_expected, a_nulls_are_equal).negated(); + return l_result; + end; + + member function to_contain(a_expected sys_refcursor) return ut_expectation_compound is + l_result ut_expectation_compound := self; + begin + l_result.matcher := ut_contain(a_expected); + return l_result; + end; + + member function not_to_contain(a_expected sys_refcursor) return ut_expectation_compound is + l_result ut_expectation_compound := self; + begin + l_result.matcher := ut_contain(a_expected).negated(); + return l_result; + end; + + member function to_contain(a_expected anydata) return ut_expectation_compound is + l_result ut_expectation_compound := self; + begin + l_result.matcher := ut_contain(a_expected); + return l_result; + end; + + member function not_to_contain(a_expected anydata) return ut_expectation_compound is + l_result ut_expectation_compound := self; + begin + l_result.matcher := ut_contain(a_expected).negated(); + return l_result; + end; + member function include(a_items varchar2) return ut_expectation_compound is begin return include( ut_varchar2_list( a_items ) ); @@ -137,5 +179,28 @@ create or replace type body ut_expectation_compound as self.to_( treat(matcher as ut_equal).join_by(a_columns) ); end; + member function unordered_columns return ut_expectation_compound is + l_result ut_expectation_compound; + begin + l_result := self; + l_result.matcher := treat(l_result.matcher as ut_equal).unordered_columns; + return l_result; + end; + + member procedure unordered_columns(self in ut_expectation_compound) is + begin + self.to_( treat(matcher as ut_equal).unordered_columns ); + end; + + member function uc return ut_expectation_compound is + begin + return unordered_columns; + end; + + member procedure uc(self in ut_expectation_compound) is + begin + unordered_columns; + end; + end; / diff --git a/source/expectations/ut_expectation_compound.tps b/source/expectations/ut_expectation_compound.tps index 7978bb78f..a0f935c5c 100644 --- a/source/expectations/ut_expectation_compound.tps +++ b/source/expectations/ut_expectation_compound.tps @@ -26,6 +26,12 @@ create or replace type ut_expectation_compound force under ut_expectation( member function to_equal(a_expected anydata, a_nulls_are_equal boolean := null) return ut_expectation_compound, member function not_to_equal(a_expected anydata, a_nulls_are_equal boolean := null) return ut_expectation_compound, + member function to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_compound, + member function not_to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_compound, + member function to_contain(a_expected sys_refcursor) return ut_expectation_compound, + member function not_to_contain(a_expected sys_refcursor) return ut_expectation_compound, + member function to_contain(a_expected anydata) return ut_expectation_compound, + member function not_to_contain(a_expected anydata) return ut_expectation_compound, member function include(a_items varchar2) return ut_expectation_compound, member function include(a_items ut_varchar2_list) return ut_expectation_compound, @@ -40,7 +46,11 @@ create or replace type ut_expectation_compound force under ut_expectation( member function join_by(a_columns varchar2) return ut_expectation_compound, member function join_by(a_columns ut_varchar2_list) return ut_expectation_compound, member procedure join_by(self in ut_expectation_compound, a_columns varchar2), - member procedure join_by(self in ut_expectation_compound, a_columns ut_varchar2_list) + member procedure join_by(self in ut_expectation_compound, a_columns ut_varchar2_list), + + member function unordered_columns return ut_expectation_compound, + member procedure unordered_columns(self in ut_expectation_compound), + member function uc return ut_expectation_compound, + member procedure uc(self in ut_expectation_compound) ) -not final / diff --git a/source/expectations/ut_expectation_refcursor.tpb b/source/expectations/ut_expectation_refcursor.tpb deleted file mode 100644 index 90b1c0765..000000000 --- a/source/expectations/ut_expectation_refcursor.tpb +++ /dev/null @@ -1,125 +0,0 @@ -create or replace type body ut_expectation_refcursor as - /* - utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project - - Licensed under the Apache License, Version 2.0 (the "License"): - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - - constructor function ut_expectation_refcursor(self in out nocopy ut_expectation_refcursor, a_actual_data ut_data_value, a_description varchar2) return self as result is - begin - self.actual_data := a_actual_data; - self.description := a_description; - return; - end; - - member function to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_refcursor is - l_result ut_expectation_refcursor := self; - begin - l_result.matcher := ut_equal(a_expected, a_nulls_are_equal); - return l_result; - end; - - member function not_to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_refcursor is - l_result ut_expectation_refcursor := self; - begin - l_result.matcher := ut_equal(a_expected, a_nulls_are_equal).negated(); - return l_result; - end; - - member function to_contain(a_expected sys_refcursor) return ut_expectation_refcursor is - l_result ut_expectation_refcursor := self; - begin - l_result.matcher := ut_contain(a_expected); - return l_result; - end; - - member function not_to_contain(a_expected sys_refcursor) return ut_expectation_refcursor is - l_result ut_expectation_refcursor := self; - begin - l_result.matcher := ut_contain(a_expected).negated(); - return l_result; - end; - - overriding member function include(a_items varchar2) return ut_expectation_refcursor is - begin - return include( ut_varchar2_list( a_items ) ); - end; - - overriding member function include(a_items ut_varchar2_list) return ut_expectation_refcursor is - l_result ut_expectation_refcursor; - begin - l_result := self; - l_result.matcher := treat(l_result.matcher as ut_equal).include(a_items); - return l_result; - end; - - overriding member function exclude(a_items varchar2) return ut_expectation_refcursor is - begin - return exclude( ut_varchar2_list( a_items ) ); - end; - - overriding member function exclude(a_items ut_varchar2_list) return ut_expectation_refcursor is - l_result ut_expectation_refcursor; - begin - l_result := self; - l_result.matcher := treat(l_result.matcher as ut_equal).exclude(a_items); - return l_result; - end; - - overriding member function unordered return ut_expectation_refcursor is - l_result ut_expectation_refcursor; - begin - l_result := self; - l_result.matcher := treat(l_result.matcher as ut_equal).unordered; - return l_result; - end; - - overriding member function join_by(a_columns varchar2) return ut_expectation_refcursor is - begin - return join_by( ut_varchar2_list( a_columns ) ); - end; - - overriding member function join_by(a_columns ut_varchar2_list) return ut_expectation_refcursor is - l_result ut_expectation_refcursor; - begin - l_result := self; - l_result.matcher := treat(l_result.matcher as ut_equal).join_by(a_columns); - return l_result; - end; - - member function unordered_columns return ut_expectation_refcursor is - l_result ut_expectation_refcursor; - begin - l_result := self; - l_result.matcher := treat(l_result.matcher as ut_equal).unordered_columns; - return l_result; - end; - - member procedure unordered_columns(self in ut_expectation_refcursor) is - begin - self.to_( treat(matcher as ut_equal).unordered_columns ); - end; - - member function uc return ut_expectation_refcursor is - begin - return unordered_columns; - end; - - member procedure uc(self in ut_expectation_refcursor) is - begin - unordered_columns; - end; - -end; -/ diff --git a/source/expectations/ut_expectation_refcursor.tps b/source/expectations/ut_expectation_refcursor.tps deleted file mode 100644 index f4197d282..000000000 --- a/source/expectations/ut_expectation_refcursor.tps +++ /dev/null @@ -1,41 +0,0 @@ -create or replace type ut_expectation_refcursor under ut_expectation_compound( - /* - utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project - - Licensed under the Apache License, Version 2.0 (the "License"): - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - - constructor function ut_expectation_refcursor( - self in out nocopy ut_expectation_refcursor, a_actual_data ut_data_value, a_description varchar2 - ) return self as result, - - member function to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_refcursor, - member function not_to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_refcursor, - member function to_contain(a_expected sys_refcursor) return ut_expectation_refcursor, - member function not_to_contain(a_expected sys_refcursor) return ut_expectation_refcursor, - - overriding member function include(a_items varchar2) return ut_expectation_refcursor, - overriding member function include(a_items ut_varchar2_list) return ut_expectation_refcursor, - overriding member function exclude(a_items varchar2) return ut_expectation_refcursor, - overriding member function exclude(a_items ut_varchar2_list) return ut_expectation_refcursor, - overriding member function unordered return ut_expectation_refcursor, - overriding member function join_by(a_columns varchar2) return ut_expectation_refcursor, - overriding member function join_by(a_columns ut_varchar2_list) return ut_expectation_refcursor, - member function unordered_columns return ut_expectation_refcursor, - member procedure unordered_columns(self in ut_expectation_refcursor), - member function uc return ut_expectation_refcursor, - member procedure uc(self in ut_expectation_refcursor) -) -final -/ diff --git a/source/install.sql b/source/install.sql index ca3fe69e1..b65f6e317 100644 --- a/source/install.sql +++ b/source/install.sql @@ -224,7 +224,6 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/data_values/ut_cursor_column.tpb' @@install_component.sql 'expectations/data_values/ut_cursor_details.tpb' @@install_component.sql 'expectations/ut_expectation_compound.tps' -@@install_component.sql 'expectations/ut_expectation_refcursor.tps' @@install_component.sql 'expectations/matchers/ut_matcher_options_items.tpb' @@install_component.sql 'expectations/matchers/ut_matcher_options.tpb' @@ -264,7 +263,6 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/matchers/ut_match.tpb' @@install_component.sql 'expectations/ut_expectation.tpb' @@install_component.sql 'expectations/ut_expectation_compound.tpb' -@@install_component.sql 'expectations/ut_expectation_refcursor.tpb' --core reporter @@install_component.sql 'reporters/ut_documentation_reporter.tps' diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index 2c52558ca..c2447615c 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -75,8 +75,6 @@ drop package ut; drop table ut_dbms_output_cache; -drop type ut_expectation_refcursor force; - drop type ut_expectation_compound force; drop type ut_expectation force; diff --git a/test/core/expectations/test_expectation_anydata.pkb b/test/core/expectations/test_expectation_anydata.pkb index cc18f7dfc..0b3a93261 100644 --- a/test/core/expectations/test_expectation_anydata.pkb +++ b/test/core/expectations/test_expectation_anydata.pkb @@ -878,8 +878,6 @@ Rows: [ 60 differences, showing first 20 ] procedure collection_unordered is l_actual test_dummy_object_list; l_expected test_dummy_object_list; - l_actual_message varchar2(32767); - l_expected_message varchar2(32767); begin --Arrange select test_dummy_object( rownum, 'Something '||rownum, rownum) @@ -943,6 +941,34 @@ Rows: [ 60 differences, showing first 20 ] ut3.ut.expect(g_test_actual).to_equal(g_test_expected).unordered; ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; + + procedure collection_to_contain is + l_actual test_dummy_object_list; + l_expected test_dummy_object_list; + begin + --Arrange + select test_dummy_object( rownum, 'Something '||rownum, rownum) + bulk collect into l_actual + from dual connect by level <=4; + select test_dummy_object( rownum, 'Something '||rownum, rownum) + bulk collect into l_expected + from dual connect by level <=2 + order by rownum desc; + --Act + ut3.ut.expect(anydata.convertCollection(l_actual)).to_contain(anydata.convertCollection(l_expected)); + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + procedure object_to_contain is + begin + --Arrange + g_test_expected := anydata.convertObject( test_dummy_object(1, 'A', '0') ); + g_test_actual := anydata.convertObject( test_dummy_object(1, 'A', '0') ); + + --Act + ut3.ut.expect(g_test_actual).to_contain(g_test_expected); + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + end; + end; / \ No newline at end of file diff --git a/test/core/expectations/test_expectation_anydata.pks b/test/core/expectations/test_expectation_anydata.pks index 6cc183a6b..b9fbda93b 100644 --- a/test/core/expectations/test_expectation_anydata.pks +++ b/test/core/expectations/test_expectation_anydata.pks @@ -192,5 +192,11 @@ create or replace package test_expectation_anydata is --%test( Anydata object unordered ) procedure object_unordered; + --%test( Success when anydata collection contains data from another anydata collection) + procedure collection_to_contain; + + --%test( Success when anydata object contains data from another anydata) + procedure object_to_contain; + end; / From 10a6bf7050574025481ea616f9ce6559ef48217f Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 15 Mar 2019 13:24:32 +0000 Subject: [PATCH 0297/1096] Update docs --- docs/userguide/advanced_data_comparison.md | 8 ++++---- docs/userguide/expectations.md | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index c06095914..e1858a6fb 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -6,7 +6,7 @@ utPLSQL expectations incorporates advanced data comparison options when comparin - object type - nested table and varray -Advanced data-comparison options are available for the [`equal`](expectations.md#equal) and [`include / contain`](expectations.md#include--contain) matcher. +Advanced data-comparison options are available for the [`equal`](expectations.md#equal) and [`contain`](expectations.md#include--contain) matcher. ## Syntax @@ -164,7 +164,7 @@ Above test will result in two differences of one row extra and one row missing. **Note** -> `include / contain` matcher is not considering order of compared data-sets. Using `unordered` makes no difference (it's default) +> `contain` matcher is not considering order of compared data-sets. Using `unordered` makes no difference (it's default) ## Join By option @@ -375,10 +375,10 @@ end; ## Unordered columns / uc option -If you need to perform data comparison of cursors without strictly deending on column order in the returned result-set, use the `unordered_columns` option. +If you need to perform data comparison of compound data types without strictly depending on column order in the returned result-set, use the `unordered_columns` option. Shortcut name `uc` is also available for that option. -Expectations that compare cursor data with `unordered_Columns` option, will not fail when columns are ordered differently. +Expectations that compare compound data type data with `unordered_columns` option, will not fail when columns are ordered differently. This option can be useful whn we have no control over the ordering of the column or the column order is not of importance from testing perspective. diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index a94d325ae..31bc9aef1 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -435,9 +435,9 @@ To change the behavior of `NULL = NULL` comparison pass the `a_nulls_are_equal = ## contain -This matcher supports only cursor comparison. It check if the give set contain all values from given subset. +This matcher supports only compound data comparison. It check if the give set contain all values from given subset. -When comparing data using `contain` matcher, the data-types of columns for compared cursors must be exactly the same. +When comparing data using `contain` matcher, the data-types of columns for compared compound types must be exactly the same. The matcher supports all advanced comparison options as `equal` like: `include` , `exclude`, `join_by` etc.. @@ -716,7 +716,7 @@ utPLSQL is capable of comparing compound data-types including: - Compound data can contain elements of any data-type. This includes blob, clob, object type, nested table, varray or even a nested-cursor within a cursor. - Attributes in nested table and array types are compared as **ordered lists of elements**. If order of attributes in nested table and array differ, expectation will fail. -- Columns in cursors are compared as **ordered list of elements** by default. Use `unordered_columns` option when order of columns in cursor is not relevant +- Columns in compound data are compared as **ordered list of elements** by default. Use `unordered_columns` option when order of columns in cursor is not relevant - Comparison of compound data is data-type aware. So a column `ID NUMBER` in a cursor is not the same as `ID VARCHAR2(100)`, even if they both hold the same numeric values. - Comparison of cursor columns containing `DATE` will only compare date part **and ignore time** by default. See [Comparing cursor data containing DATE fields](#comparing-cursor-data-containing-date-fields) to check how to enable date-time comparison in cursors. - Comparison of cursor returning `TIMESTAMP` **columns** against cursor returning `TIMESTAMP` **bind variables** requires variables to be casted to proper precision. This is an Oracle SQL - PLSQL compatibility issue and usage of CAST is the only known workaround for now. See [Comparing cursor data containing TIMESTAMP bind variables](#comparing-cursor-data-containing-timestamp-bind-variables) for examples. From 06fb132291e813a016b7439eb42c3569eb40e07f Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 15 Mar 2019 13:44:43 +0000 Subject: [PATCH 0298/1096] Added version number header to all doc pages Added update of version number in doc pages --- .travis/update_project_version.sh | 3 +++ docs/about/authors.md | 1 + docs/about/license.md | 2 ++ docs/about/project-details.md | 2 ++ docs/about/support.md | 2 ++ docs/index.md | 2 ++ docs/userguide/advanced_data_comparison.md | 2 ++ docs/userguide/annotations.md | 2 ++ docs/userguide/best-practices.md | 2 ++ docs/userguide/coverage.md | 2 ++ docs/userguide/exception-reporting.md | 2 ++ docs/userguide/expectations.md | 2 ++ docs/userguide/getting-started.md | 2 ++ docs/userguide/install.md | 2 ++ docs/userguide/querying_suites.md | 2 ++ docs/userguide/reporters.md | 2 ++ docs/userguide/running-unit-tests.md | 2 ++ docs/userguide/upgrade.md | 2 ++ 18 files changed, 36 insertions(+) diff --git a/.travis/update_project_version.sh b/.travis/update_project_version.sh index cce45cbfe..3f162fb78 100755 --- a/.travis/update_project_version.sh +++ b/.travis/update_project_version.sh @@ -6,6 +6,9 @@ echo Update version in project source files find ${UTPLSQL_SOURCES_DIR} -type f -name '*' -exec sed -i -r "s/${UTPLSQL_VERSION_PATTERN}/${UTPLSQL_BUILD_VERSION}/" {} \; echo Source files updated with version tag: ${UTPLSQL_BUILD_VERSION} +echo Update version in documentation files +find docs -type f -name '*.md' -exec sed -i -r "s/(badge\/version-).*(-blue\.svg)/\1${UTPLSQL_BUILD_VERSION/-/--}\2/" {} \; + echo Update of sonar-project.properties sonar.projectVersion sed -i -r "s/(sonar\.projectVersion=).*?/\1${UTPLSQL_VERSION}/" sonar-project.properties diff --git a/docs/about/authors.md b/docs/about/authors.md index 55f85642d..ede607457 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,3 +1,4 @@ +![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index aef69c41e..66212bb2e 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,3 +1,5 @@ +![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) + # Version Information **utPLSQL version 3** is licensed under diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 3ef58c76c..1b38f3d5f 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,3 +1,5 @@ +![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) + # utPLSQL Project Details [![chat](http://img.shields.io/badge/GitHub_Project-Active-blue.svg)](https://github.com/utPLSQL/utPLSQL) diff --git a/docs/about/support.md b/docs/about/support.md index 579795528..2ee94a403 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,3 +1,5 @@ +![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) + # How to get support - Feel free to post questions, bugs or issues in the [issues area of GitHub](https://github.com/utPLSQL/utPLSQL/issues) diff --git a/docs/index.md b/docs/index.md index 96e65c449..dbea7b8a5 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,3 +1,5 @@ +![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) + # Introduction to utPLSQL utPLSQL is a Unit Testing framework for Oracle PL/SQL. diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 3eb45fe50..b557cac90 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,3 +1,5 @@ +![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) + # Advanced data comparison utPLSQL expectations incorporates advanced data comparison options when comparing compound data-types: diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index d9c731b34..332d59b9b 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,3 +1,5 @@ +![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) + # Annotations Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package. diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index bdfcf99a7..b216d1fcd 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,3 +1,5 @@ +![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) + # Best Practices The following are best practices we at utPLSQL have learned about PL/SQL and Unit Testing. diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 1d4ca93c5..09c3184e5 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,3 +1,5 @@ +![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) + # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. Code coverage is gathered for the following source types: diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 852a3f426..3670d9ae3 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,3 +1,5 @@ +![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) + # Exception handling and reporting The utPLSQL is responsible for handling exceptions wherever they occur in the test run. utPLSQL is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index b02605605..a3d91a875 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,3 +1,5 @@ +![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) + # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. utPLSQL uses a combination of expectation and matcher to perform the check on the data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index c5f69ad20..a8c2225fd 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,3 +1,5 @@ +![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) + # Getting started with TDD and utPLSQL utPLSQL is designed in a way that allows you to follow diff --git a/docs/userguide/install.md b/docs/userguide/install.md index c960f93f6..f22d2b6ca 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,3 +1,5 @@ +![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) + # Downloading latest version of utPLSQL To download latest version of utPLSQL from github on both Unix/Linux as well as Windows machines use the below smippets. diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 1b1c64185..de3e0e870 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,3 +1,5 @@ +![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) + # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 6d3e8a326..f1e7e9d82 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,3 +1,5 @@ +![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) + utPLSQL provides the following reporting formats. # Documentation reporter diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 39b2d0a7a..174998112 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,3 +1,5 @@ +![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) + # Running tests utPLSQL framework provides two main entry points to run unit tests from within the database: diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 3da76e1f8..1eaae311d 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,3 +1,5 @@ +![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) + # Upgrading from version 2 utPLSQL v3 is a total rewrite of the framework. From 1dbbb85b26929d12f6506a781656cdac511766de Mon Sep 17 00:00:00 2001 From: Travis CI Date: Fri, 15 Mar 2019 14:33:45 +0000 Subject: [PATCH 0299/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index c3752eb3f..99e450de2 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.4.2656-develop'; + gc_version constant varchar2(50) := 'v3.1.4.2666-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 66ff76062f99aa07d4c5196e96667b9b724e0a83 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 15 Mar 2019 17:21:57 +0000 Subject: [PATCH 0300/1096] Resolved merge conflicts. --- source/expectations/data_values/ut_key_anyvalues.tpb | 2 +- source/install.sql | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/expectations/data_values/ut_key_anyvalues.tpb b/source/expectations/data_values/ut_key_anyvalues.tpb index 1e9cde9da..07413f77b 100644 --- a/source/expectations/data_values/ut_key_anyvalues.tpb +++ b/source/expectations/data_values/ut_key_anyvalues.tpb @@ -30,7 +30,7 @@ create or replace type body ut_key_anyvalues as end; member function put(a_key varchar2, a_value anydata) return ut_key_anyvalues is begin - return put(ut_key_anyval_pair(a_key, ut_data_value_anydata.get_instance(a_value))); + return put(ut_key_anyval_pair(a_key, ut_data_value_anydata(a_value))); end; member function put(a_key varchar2, a_value blob) return ut_key_anyvalues is diff --git a/source/install.sql b/source/install.sql index efb26d79c..e34aa57af 100644 --- a/source/install.sql +++ b/source/install.sql @@ -84,6 +84,8 @@ alter session set current_schema = &&ut3_owner; @@install_component.sql 'core/types/ut_reporter_base.tps' @@install_component.sql 'core/types/ut_reporters.tps' +@@install_component.sql 'expectations/matchers/ut_matcher_options_items.tps' +@@install_component.sql 'expectations/matchers/ut_matcher_options.tps' @@install_component.sql 'expectations/data_values/ut_data_value.tps' @@install_component.sql 'expectations/data_values/ut_key_anyval_pair.tps' @@install_component.sql 'expectations/data_values/ut_key_anyval_pairs.tps' @@ -192,8 +194,6 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/data_values/ut_cursor_column.tps' @@install_component.sql 'expectations/data_values/ut_cursor_column_tab.tps' @@install_component.sql 'expectations/data_values/ut_cursor_details.tps' -@@install_component.sql 'expectations/matchers/ut_matcher_options_items.tps' -@@install_component.sql 'expectations/matchers/ut_matcher_options.tps' @@install_component.sql 'expectations/data_values/ut_data_value_anydata.tps' @@install_component.sql 'expectations/data_values/ut_data_value_blob.tps' @@install_component.sql 'expectations/data_values/ut_data_value_boolean.tps' From bfd3d66c014413926b74cfa70c92640eb312b365 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 15 Mar 2019 19:05:39 +0000 Subject: [PATCH 0301/1096] Changed output_buffer initial timeout to 60 seconds. --- source/core/output_buffers/ut_output_table_buffer.tpb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/output_buffers/ut_output_table_buffer.tpb b/source/core/output_buffers/ut_output_table_buffer.tpb index 667ddbf16..5fc71570c 100644 --- a/source/core/output_buffers/ut_output_table_buffer.tpb +++ b/source/core/output_buffers/ut_output_table_buffer.tpb @@ -83,7 +83,7 @@ create or replace type body ut_output_table_buffer is l_finished_flags ut_integer_list; l_already_waited_for number(10,2) := 0; l_finished boolean := false; - lc_init_wait_sec constant naturaln := coalesce(a_initial_timeout, 15 ); -- 15 seconds + lc_init_wait_sec constant naturaln := coalesce(a_initial_timeout, 60 ); -- 1 minute lc_max_wait_sec constant naturaln := coalesce(a_timeout_sec, 60 * 60 * 4); -- 4 hours l_wait_for integer := lc_init_wait_sec; lc_short_sleep_time constant number(1,1) := 0.1; --sleep for 100 ms between checks From 04a337e6831c4c3577497bf2e84725955d4f37e3 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 15 Mar 2019 19:08:43 +0000 Subject: [PATCH 0302/1096] Added basic tests for debug reporter --- .gitignore | 1 + test/core/reporters/test_debug_reporter.pkb | 45 +++++++++++++++++++++ test/core/reporters/test_debug_reporter.pks | 16 ++++++++ test/install_tests.sql | 2 + 4 files changed, 64 insertions(+) create mode 100644 test/core/reporters/test_debug_reporter.pkb create mode 100644 test/core/reporters/test_debug_reporter.pks diff --git a/.gitignore b/.gitignore index a6f721188..059e3d5b4 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ coverage.xml tfs_test_results.xml junit_test_results.xml test_results.xml +*debug*.xml diff --git a/test/core/reporters/test_debug_reporter.pkb b/test/core/reporters/test_debug_reporter.pkb new file mode 100644 index 000000000..d82685ac4 --- /dev/null +++ b/test/core/reporters/test_debug_reporter.pkb @@ -0,0 +1,45 @@ +create or replace package body test_debug_reporter as + + g_actual clob; + + procedure run_reporter is + l_results ut3.ut_varchar2_list; + begin + select * + bulk collect into l_results + from table( + ut3.ut.run( + 'test_reporters', + ut3.ut_debug_reporter() + ) + ); + g_actual := ut3.ut_utils.table_to_clob(l_results); + end; + + procedure includes_event_info is + l_expected varchar2(32767); + begin + l_expected := '\s+' || + '(\s+' || + '[0-9\-]+T[0-9:\.]+<\/TIMESTAMP>\s+' || + '[0-9 \+:\.]+<\/TIME_FROM_START>\s+' || + '[0-9 \+:\.]+<\/TIME_FROM_PREVIOUS>\s+' || + '\w+<\/EVENT_NAME>\s+' || + '(\s|\S)+?<\/CALL_STACK>(\s|\S)+?' || + '<\/DEBUG>\s+)+' || + '<\/DEBUG_LOG>'; + ut.expect( g_actual ).to_match( l_expected, 'm' ); + end; + + procedure includes_run_info is + l_expected varchar2(32767); + begin + l_expected := '(\s|\S)+?(\s|\S)+?<\/UT_RUN_INFO>\s+<\/DEBUG>'; + ut.expect( g_actual ).to_match( l_expected, 'm' ); + end; + + +end; +/ + + diff --git a/test/core/reporters/test_debug_reporter.pks b/test/core/reporters/test_debug_reporter.pks new file mode 100644 index 000000000..d4ba20a62 --- /dev/null +++ b/test/core/reporters/test_debug_reporter.pks @@ -0,0 +1,16 @@ +create or replace package test_debug_reporter as + + --%suite(ut_debug_reporter) + --%suitepath(utplsql.core.reporters) + + --%beforeall + procedure run_reporter; + + --%test(Includes event info for every event) + procedure includes_event_info; + + --%test(Includes run info) + procedure includes_run_info; + +end; +/ diff --git a/test/install_tests.sql b/test/install_tests.sql index 5a2f7d664..9ce06280d 100644 --- a/test/install_tests.sql +++ b/test/install_tests.sql @@ -49,6 +49,7 @@ set define off @@core/reporters/test_coverage/test_cov_cobertura_reporter.pks @@core/reporters/test_junit_reporter.pks @@core/reporters/test_realtime_reporter.pks +@@core/reporters/test_debug_reporter.pks set define on @@install_below_12_2.sql 'core/reporters/test_coverage/test_html_proftab_reporter.pks' set define off @@ -100,6 +101,7 @@ set define off @@core/reporters/test_coverage/test_cov_cobertura_reporter.pkb @@core/reporters/test_junit_reporter.pkb @@core/reporters/test_realtime_reporter.pkb +@@core/reporters/test_debug_reporter.pkb set define on @@install_below_12_2.sql 'core/reporters/test_coverage/test_html_proftab_reporter.pkb' set define off From 07001255d64791423070c1163634ced08c424266 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 15 Mar 2019 19:29:29 +0000 Subject: [PATCH 0303/1096] Added information about `ut_debug_reporter` to documentation. --- docs/userguide/reporters.md | 43 +++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index f1e7e9d82..cdba72993 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -120,3 +120,46 @@ Details: # Coverage reporters utPLSQL comes with a set of build-in coverage reporters. Have a look into the [coverage documentation](coverage.md) to learn more about them. + + +# Debug reporter + +The `ut_debug_reporter` provides a highly verbose output containing thorough details about framework and test execution. + +Use this reporter only when you need to investigate framework issues or raise a bug report to utPLSQL team. + +Usage of this reporter might have impact on performance of test-suite execution. + +Amongst others, reporter provides the following information: +- framework version +- database version +- database OS +- database, instance and session NLS settings +- timing of each event +- time between events logged +- time from start of the run +- stack trace +- information about input parameters for the run including + - run paths + - source file mappings + - test file mappings + - coverage schemas + - coverage exclusions and inclusions + - client character set +- information about every step of the run including + - every suite and context + - every before/after procedure + - every test + - every expectation and it's result + +Some of the information in debug log might be redundant. + +**Note:** +>Some of the information in debug log may be sensitive. In particular: +> - expectation results and messages (logged even for successful runs) +> - test structure +> - db object names +> - etc. + + + \ No newline at end of file From 05b5e89d63088b672223d063d7a5096435702f5f Mon Sep 17 00:00:00 2001 From: Travis CI Date: Fri, 15 Mar 2019 19:40:00 +0000 Subject: [PATCH 0304/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 99e450de2..6444fca17 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.4.2666-develop'; + gc_version constant varchar2(50) := 'v3.1.4.2671-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From d2b6c2a30ab63956ad95726a561c94f79477a3ee Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sat, 16 Mar 2019 00:22:35 +0000 Subject: [PATCH 0305/1096] Modify a code to fail when inserting a suitepath over 1k long. This will iterate over all objects and report back. --- source/core/ut_suite_cache.sql | 4 +++ source/core/ut_suite_manager.pkb | 33 +++++++++++++++++++------ source/core/ut_utils.pkb | 12 +++++---- source/core/ut_utils.pks | 10 +++++--- test/core/test_suite_manager.pkb | 42 ++++++++++++++++++++++++++++++++ test/core/test_suite_manager.pks | 9 +++++++ 6 files changed, 95 insertions(+), 15 deletions(-) diff --git a/source/core/ut_suite_cache.sql b/source/core/ut_suite_cache.sql index adbdf1734..b28c79d14 100644 --- a/source/core/ut_suite_cache.sql +++ b/source/core/ut_suite_cache.sql @@ -73,6 +73,8 @@ create table ut_suite_cache ( where rownum < 0 / +alter table ut_suite_cache modify (path varchar2( 1000 )) +/ alter table ut_suite_cache modify (object_owner not null, path not null, self_type not null, object_name not null, name not null, parse_time not null) / alter table ut_suite_cache add constraint ut_suite_cache_pk primary key (id) @@ -86,6 +88,8 @@ alter table ut_suite_cache add constraint ut_suite_cache_schema_fk foreign key ( references ut_suite_cache_package(object_owner, object_name) on delete cascade / + + drop type ut_tests / diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index d5338a4c9..c29c44586 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -16,6 +16,7 @@ create or replace package body ut_suite_manager is limitations under the License. */ + gc_suitpath_error_message constant varchar2(100) := 'Suitepath exceeds 1000 CHAR on: '; type t_path_item is record ( object_name varchar2(250), @@ -477,23 +478,41 @@ create or replace package body ut_suite_manager is ) is l_annotated_objects ut_annotated_objects; l_suite_items ut_suite_items; + + l_bad_suitepath_obj ut_varchar2_list := ut_varchar2_list(); + ex_value_too_large exception; + pragma exception_init (ex_value_too_large,-12899); begin loop fetch a_annotated_objects bulk collect into l_annotated_objects limit 10; for i in 1 .. l_annotated_objects.count loop ut_suite_builder.create_suite_item_list( l_annotated_objects( i ), l_suite_items ); - ut_suite_cache_manager.save_object_cache( - a_owner_name, - l_annotated_objects( i ).object_name, - l_annotated_objects( i ).parse_time, - l_suite_items - ); + begin + ut_suite_cache_manager.save_object_cache( + a_owner_name, + l_annotated_objects( i ).object_name, + l_annotated_objects( i ).parse_time, + l_suite_items + ); + exception + when ex_value_too_large then + ut_utils.append_to_list(l_bad_suitepath_obj,a_owner_name||'.'||l_annotated_objects( i ).object_name); + end; end loop; exit when a_annotated_objects%notfound; end loop; close a_annotated_objects; - + + --Check for any invalid suitepath objects + if l_bad_suitepath_obj.count > 0 then + raise ut_utils.ex_value_too_large; + end if; + + exception + when ut_utils.ex_value_too_large then + raise_application_error(ut_utils.gc_value_too_large, + ut_utils.to_string(gc_suitpath_error_message||ut_utils.table_to_clob(l_bad_suitepath_obj,','))); end; procedure refresh_cache( diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 3d4836ce0..0a3c49127 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -77,16 +77,18 @@ create or replace package body ut_utils is $end end; - function to_string(a_value varchar2, a_qoute_char varchar2 := '''') return varchar2 is - l_len integer := coalesce(length(a_value),0); - l_result varchar2(32767); + function to_string(a_value varchar2, a_qoute_char varchar2 := '''', a_max_output_len in number := gc_max_output_string_length) return varchar2 is + l_len integer := coalesce(length(a_value),0); + l_result varchar2(32767); + l_max_input_string_length integer := a_max_output_len - 2;--we need to remove 2 chars for quotes around string + l_overflow_substr_len integer := l_max_input_string_length - length(gc_more_data_string); begin if l_len = 0 then l_result := gc_null_string; - elsif l_len <= gc_max_input_string_length then + elsif l_len <= l_max_input_string_length then l_result := surround_with(a_value, a_qoute_char); else - l_result := surround_with(substr(a_value,1,gc_overflow_substr_len),a_qoute_char) || gc_more_data_string; + l_result := surround_with(substr(a_value,1,l_overflow_substr_len),a_qoute_char) || gc_more_data_string; end if ; return l_result; end; diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index dc60cac28..add7fc496 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -102,8 +102,12 @@ create or replace package ut_utils authid definer is pragma exception_init (ex_failure_for_all, -24381); ex_dml_for_all exception; - gc_dml_for_all constant pls_integer := -20215; - pragma exception_init (ex_dml_for_all, -20215); + gc_dml_for_all constant pls_integer := -20216; + pragma exception_init (ex_dml_for_all, -20216); + + ex_value_too_large exception; + gc_value_too_large constant pls_integer := -20217; + pragma exception_init (ex_value_too_large, -20217); gc_max_storage_varchar2_len constant integer := 4000; gc_max_output_string_length constant integer := 4000; @@ -151,7 +155,7 @@ create or replace package ut_utils authid definer is procedure debug_log(a_message clob); - function to_string(a_value varchar2, a_qoute_char varchar2 := '''') return varchar2; + function to_string(a_value varchar2, a_qoute_char varchar2 := '''', a_max_output_len in number := gc_max_output_string_length) return varchar2; function to_string(a_value clob, a_qoute_char varchar2 := '''') return varchar2; diff --git a/test/core/test_suite_manager.pkb b/test/core/test_suite_manager.pkb index 59ed002d3..b9aec58e5 100644 --- a/test/core/test_suite_manager.pkb +++ b/test/core/test_suite_manager.pkb @@ -3,6 +3,35 @@ create or replace package body test_suite_manager is ex_obj_doesnt_exist exception; pragma exception_init(ex_obj_doesnt_exist, -04043); + procedure create_dummy_long_test_package is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package ut3.dummy_long_test_package as + + --%suitepath(verylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtext) + --%suite(dummy_test_suite) + + --%test(dummy_test) + procedure some_dummy_test_procedure; + end;]'; + + execute immediate q'[create or replace package ut3.dummy_long_test_package1 as + + --%suitepath(verylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtext) + --%suite(dummy_test_suite1) + + --%test(dummy_test) + procedure some_dummy_test_procedure; + end;]'; + end; + + procedure drop_dummy_long_test_package is + pragma autonomous_transaction; + begin + execute immediate q'[drop package ut3.dummy_long_test_package]'; + execute immediate q'[drop package ut3.dummy_long_test_package1]'; + end; + procedure compile_dummy_packages is pragma autonomous_transaction; begin @@ -1451,5 +1480,18 @@ end;]'; execute immediate q'[drop package ut3.some_test_package]'; end; + procedure add_new_long_test_package is + l_actual ut3.ut_object_names; + l_expected_message varchar2(500); + begin + l_expected_message := q'[ORA-20217: 'Suitepath exceeds 1000 CHAR on: UT3.DUMMY_LONG_TEST_PACKAGE,UT3.DUMMY_LONG_TEST_PACKAGE1']'; + l_actual := ut3.ut_suite_manager.get_schema_ut_packages(ut3.ut_varchar2_rows('UT3')); + ut.fail('Expected exception for suitpaths over 1k for two packages'); + exception + when others then + ut.expect(SQLERRM).to_equal(l_expected_message); + ut.expect(SQLCODE).to_equal(ut3.ut_utils.gc_value_too_large); + end; + end test_suite_manager; / diff --git a/test/core/test_suite_manager.pks b/test/core/test_suite_manager.pks index d200fcd2f..aad29fad0 100644 --- a/test/core/test_suite_manager.pks +++ b/test/core/test_suite_manager.pks @@ -3,6 +3,10 @@ create or replace package test_suite_manager is --%suite(suite_manager) --%suitepath(utplsql.core) + procedure create_dummy_long_test_package; + + procedure drop_dummy_long_test_package; + --%beforeall procedure compile_dummy_packages; --%afterall @@ -162,5 +166,10 @@ create or replace package test_suite_manager is --%endcontext + --%test(Adds suitepath to cache over 1k characters long) + --%beforetest(create_dummy_long_test_package) + --%aftertest(drop_dummy_long_test_package) + procedure add_new_long_test_package; + end test_suite_manager; / From 64a4581fd72f471e3211a0393af0e93c830e2bef Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sat, 16 Mar 2019 09:22:47 +0000 Subject: [PATCH 0306/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 6444fca17..fb7e26f08 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.4.2671-develop'; + gc_version constant varchar2(50) := 'v3.1.4.2678-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 204a4cdb9b6bc0f65a11fd28513683fe2f24afaa Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 16 Mar 2019 12:01:04 +0000 Subject: [PATCH 0307/1096] Modified `ut_suite_item.path` to varchar2(1000) Moved exception handling. Removed alter on `ut_suite_cache` table. Unified `ut_utils.to_string` for clob/blob and varchar2 types. --- source/core/types/ut_suite_item.tps | 2 +- source/core/ut_suite_cache.sql | 4 -- source/core/ut_suite_manager.pkb | 30 +++++++-------- source/core/ut_utils.pkb | 60 ++++++++++++++++++----------- source/core/ut_utils.pks | 25 ++++++++---- test/core/test_suite_manager.pkb | 4 +- 6 files changed, 73 insertions(+), 52 deletions(-) diff --git a/source/core/types/ut_suite_item.tps b/source/core/types/ut_suite_item.tps index b287d77d8..6b3b9c686 100644 --- a/source/core/types/ut_suite_item.tps +++ b/source/core/types/ut_suite_item.tps @@ -36,7 +36,7 @@ create or replace type ut_suite_item force under ut_event_item ( /** * Full path of the invocation of the item (including the items name itself) */ - path varchar2(4000 byte), + path varchar2(1000 byte), /** * The type of the rollback behavior */ diff --git a/source/core/ut_suite_cache.sql b/source/core/ut_suite_cache.sql index b28c79d14..adbdf1734 100644 --- a/source/core/ut_suite_cache.sql +++ b/source/core/ut_suite_cache.sql @@ -73,8 +73,6 @@ create table ut_suite_cache ( where rownum < 0 / -alter table ut_suite_cache modify (path varchar2( 1000 )) -/ alter table ut_suite_cache modify (object_owner not null, path not null, self_type not null, object_name not null, name not null, parse_time not null) / alter table ut_suite_cache add constraint ut_suite_cache_pk primary key (id) @@ -88,8 +86,6 @@ alter table ut_suite_cache add constraint ut_suite_cache_schema_fk foreign key ( references ut_suite_cache_package(object_owner, object_name) on delete cascade / - - drop type ut_tests / diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index c29c44586..e2098caf9 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -480,25 +480,25 @@ create or replace package body ut_suite_manager is l_suite_items ut_suite_items; l_bad_suitepath_obj ut_varchar2_list := ut_varchar2_list(); - ex_value_too_large exception; - pragma exception_init (ex_value_too_large,-12899); + ex_string_too_small exception; + pragma exception_init (ex_string_too_small,-06502); begin loop fetch a_annotated_objects bulk collect into l_annotated_objects limit 10; for i in 1 .. l_annotated_objects.count loop - ut_suite_builder.create_suite_item_list( l_annotated_objects( i ), l_suite_items ); begin - ut_suite_cache_manager.save_object_cache( - a_owner_name, - l_annotated_objects( i ).object_name, - l_annotated_objects( i ).parse_time, - l_suite_items - ); + ut_suite_builder.create_suite_item_list( l_annotated_objects( i ), l_suite_items ); exception - when ex_value_too_large then + when ex_string_too_small then ut_utils.append_to_list(l_bad_suitepath_obj,a_owner_name||'.'||l_annotated_objects( i ).object_name); end; + ut_suite_cache_manager.save_object_cache( + a_owner_name, + l_annotated_objects( i ).object_name, + l_annotated_objects( i ).parse_time, + l_suite_items + ); end loop; exit when a_annotated_objects%notfound; end loop; @@ -506,13 +506,11 @@ create or replace package body ut_suite_manager is --Check for any invalid suitepath objects if l_bad_suitepath_obj.count > 0 then - raise ut_utils.ex_value_too_large; + raise_application_error( + ut_utils.gc_value_too_large, + ut_utils.to_string(gc_suitpath_error_message||ut_utils.table_to_clob(l_bad_suitepath_obj,',')) + ); end if; - - exception - when ut_utils.ex_value_too_large then - raise_application_error(ut_utils.gc_value_too_large, - ut_utils.to_string(gc_suitpath_error_message||ut_utils.table_to_clob(l_bad_suitepath_obj,','))); end; procedure refresh_cache( diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 0a3c49127..b29e7fa60 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -77,50 +77,66 @@ create or replace package body ut_utils is $end end; - function to_string(a_value varchar2, a_qoute_char varchar2 := '''', a_max_output_len in number := gc_max_output_string_length) return varchar2 is - l_len integer := coalesce(length(a_value),0); + function to_string( + a_value varchar2, + a_quote_char varchar2 := '''', + a_max_output_len in number := gc_max_output_string_length + ) return varchar2 is l_result varchar2(32767); - l_max_input_string_length integer := a_max_output_len - 2;--we need to remove 2 chars for quotes around string - l_overflow_substr_len integer := l_max_input_string_length - length(gc_more_data_string); + c_length constant integer := coalesce( length( a_value ), 0 ); + c_max_input_string_length constant integer := a_max_output_len - coalesce( length( a_quote_char ) * 2, 0 ); + c_overflow_substr_len constant integer := c_max_input_string_length - gc_more_data_string_len; begin - if l_len = 0 then + if c_length = 0 then l_result := gc_null_string; - elsif l_len <= l_max_input_string_length then - l_result := surround_with(a_value, a_qoute_char); + elsif c_length <= c_max_input_string_length then + l_result := surround_with(a_value, a_quote_char); else - l_result := surround_with(substr(a_value,1,l_overflow_substr_len),a_qoute_char) || gc_more_data_string; + l_result := surround_with(substr(a_value, 1, c_overflow_substr_len ), a_quote_char) || gc_more_data_string; end if ; return l_result; end; - function to_string(a_value clob, a_qoute_char varchar2 := '''') return varchar2 is - l_len integer := coalesce(dbms_lob.getlength(a_value), 0); - l_result varchar2(32767); + function to_string( + a_value clob, + a_quote_char varchar2 := '''', + a_max_output_len in number := gc_max_output_string_length + ) return varchar2 is + l_result varchar2(32767); + c_length constant integer := coalesce(dbms_lob.getlength(a_value), 0); + c_max_input_string_length constant integer := a_max_output_len - coalesce( length( a_quote_char ) * 2, 0 ); + c_overflow_substr_len constant integer := c_max_input_string_length - gc_more_data_string_len; begin if a_value is null then l_result := gc_null_string; - elsif l_len = 0 then + elsif c_length = 0 then l_result := gc_empty_string; - elsif l_len <= gc_max_input_string_length then - l_result := surround_with(a_value,a_qoute_char); + elsif c_length <= c_max_input_string_length then + l_result := surround_with(a_value,a_quote_char); else - l_result := surround_with(dbms_lob.substr(a_value, gc_overflow_substr_len),a_qoute_char) || gc_more_data_string; + l_result := surround_with(dbms_lob.substr(a_value, c_overflow_substr_len), a_quote_char) || gc_more_data_string; end if; return l_result; end; - function to_string(a_value blob, a_qoute_char varchar2 := '''') return varchar2 is - l_len integer := coalesce(dbms_lob.getlength(a_value), 0); - l_result varchar2(32767); + function to_string( + a_value blob, + a_quote_char varchar2 := '''', + a_max_output_len in number := gc_max_output_string_length + ) return varchar2 is + l_result varchar2(32767); + c_length constant integer := coalesce(dbms_lob.getlength(a_value), 0); + c_max_input_string_length constant integer := a_max_output_len - coalesce( length( a_quote_char ) * 2, 0 ); + c_overflow_substr_len constant integer := c_max_input_string_length - gc_more_data_string_len; begin if a_value is null then l_result := gc_null_string; - elsif l_len = 0 then + elsif c_length = 0 then l_result := gc_empty_string; - elsif l_len <= gc_max_input_string_length then - l_result := surround_with(rawtohex(a_value),a_qoute_char); + elsif c_length <= c_max_input_string_length then + l_result := surround_with(rawtohex(a_value),a_quote_char); else - l_result := to_string( rawtohex(dbms_lob.substr(a_value, gc_overflow_substr_len)) ); + l_result := to_string( rawtohex(dbms_lob.substr(a_value, c_overflow_substr_len)) ); end if ; return l_result; end; diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 82afcf78c..fdf92765b 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -111,9 +111,8 @@ create or replace package ut_utils authid definer is gc_max_storage_varchar2_len constant integer := 4000; gc_max_output_string_length constant integer := 4000; - gc_max_input_string_length constant integer := gc_max_output_string_length - 2; --we need to remove 2 chars for quotes around string gc_more_data_string constant varchar2(5) := '[...]'; - gc_overflow_substr_len constant integer := gc_max_input_string_length - length(gc_more_data_string); + gc_more_data_string_len constant integer := length( gc_more_data_string ); gc_number_format constant varchar2(100) := 'TM9'; gc_date_format constant varchar2(100) := 'yyyy-mm-dd"T"hh24:mi:ss'; gc_timestamp_format constant varchar2(100) := 'yyyy-mm-dd"T"hh24:mi:ssxff'; @@ -155,11 +154,23 @@ create or replace package ut_utils authid definer is procedure debug_log(a_message clob); - function to_string(a_value varchar2, a_qoute_char varchar2 := '''', a_max_output_len in number := gc_max_output_string_length) return varchar2; - - function to_string(a_value clob, a_qoute_char varchar2 := '''') return varchar2; - - function to_string(a_value blob, a_qoute_char varchar2 := '''') return varchar2; + function to_string( + a_value varchar2, + a_quote_char varchar2 := '''', + a_max_output_len in number := gc_max_output_string_length + ) return varchar2; + + function to_string( + a_value clob, + a_quote_char varchar2 := '''', + a_max_output_len in number := gc_max_output_string_length + ) return varchar2; + + function to_string( + a_value blob, + a_quote_char varchar2 := '''', + a_max_output_len in number := gc_max_output_string_length + ) return varchar2; function to_string(a_value boolean) return varchar2; diff --git a/test/core/test_suite_manager.pkb b/test/core/test_suite_manager.pkb index b9aec58e5..bd6c97779 100644 --- a/test/core/test_suite_manager.pkb +++ b/test/core/test_suite_manager.pkb @@ -1484,12 +1484,12 @@ end;]'; l_actual ut3.ut_object_names; l_expected_message varchar2(500); begin - l_expected_message := q'[ORA-20217: 'Suitepath exceeds 1000 CHAR on: UT3.DUMMY_LONG_TEST_PACKAGE,UT3.DUMMY_LONG_TEST_PACKAGE1']'; + l_expected_message := q'[ORA-20217: 'Suitepath exceeds 1000 CHAR on: UT3.DUMMY_LONG_TEST_PACKAGE,UT3.DUMMY_LONG_TEST_PACKAGE1'%]'; l_actual := ut3.ut_suite_manager.get_schema_ut_packages(ut3.ut_varchar2_rows('UT3')); ut.fail('Expected exception for suitpaths over 1k for two packages'); exception when others then - ut.expect(SQLERRM).to_equal(l_expected_message); + ut.expect(dbms_utility.format_error_stack()).to_be_like(l_expected_message); ut.expect(SQLCODE).to_equal(ut3.ut_utils.gc_value_too_large); end; From ad3ce1074ac0eb35516e581f4a44f3335fb69bfe Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sat, 16 Mar 2019 11:45:17 +0000 Subject: [PATCH 0308/1096] Adding handling of xml error --- .../data_values/ut_data_value_refcursor.tpb | 8 +-- .../expectations/test_expectations_cursor.pkb | 53 +++++++------------ 2 files changed, 24 insertions(+), 37 deletions(-) diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index a470b4f61..26a820fb7 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -100,8 +100,8 @@ create or replace type body ut_data_value_refcursor as if l_cursor%isopen then close l_cursor; end if; - ut_expectation_processor.report_failure_no_caller('Failed to process ref_cursor with error'||chr(10)|| - ut_utils.remove_error_from_stack(sqlerrm,-19202)); + ut_expectation_processor.report_failure_no_caller('SQL exception thrown when fetching data from cursor: '|| + ut_utils.remove_error_from_stack(sqlerrm,-19202)||chr(10)||'Check the query and data for errors.'); when others then if l_cursor%isopen then close l_cursor; @@ -117,7 +117,9 @@ create or replace type body ut_data_value_refcursor as dbms_lob.createtemporary(l_result, true); ut_utils.append_to_clob(l_result, 'Data-types:'||chr(10)); - ut_utils.append_to_clob( l_result, self.cursor_details.get_xml_children().getclobval() ); + if self.cursor_details.cursor_columns_info.count > 0 then + ut_utils.append_to_clob( l_result, self.cursor_details.get_xml_children().getclobval() ); + end if; ut_utils.append_to_clob(l_result,chr(10)||(self as ut_compound_data_value).to_string()); l_result_string := ut_utils.to_string(l_result,null); dbms_lob.freetemporary(l_result); diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index e904d8419..ed7dd5479 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -972,18 +972,21 @@ Rows: [ 4 differences ] procedure reports_on_exception_in_cursor as l_actual sys_refcursor; - l_error_code integer := -19202; --Error occurred in XML processing + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); begin --Act open l_actual for select 1/0 as error_column from dual connect by level < 10; - begin ut3.ut.expect(l_actual).to_be_empty(); --Assert - ut.fail('Expected '||l_error_code||' but nothing was raised'); - exception - when others then - ut.expect(sqlcode).to_equal(l_error_code); - end; + --Assert + l_expected_message := q'[%SQL exception thrown when fetching data from cursor:% +%ORA-01476: divisor is equal to zero% +%Check the query and data for errors.]'; + + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); end; procedure exception_when_closed_cursor @@ -2481,15 +2484,9 @@ Diff:% ut3.ut.expect(v_actual).to_equal(v_expected); --Assert - l_expected_message := q'[%Failed to process ref_cursor with error -%ORA-01722: invalid number -%Actual: refcursor [ count = ] was expected to equal: refcursor [ count = 1 ] -%Diff: -%Columns: -%Column [data-type: NUMBER] is missing. Expected column position: 1. -%Column [data-type: VARCHAR2] is missing. Expected column position: 2. -%Rows: [ 1 differences ] -%Row No. 1 - Missing: 1357TEST_USER]'; + l_expected_message := q'[%SQL exception thrown when fetching data from cursor:% +%ORA-01722: invalid number% +%Check the query and data for errors.]'; l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; --Assert @@ -2512,15 +2509,9 @@ Diff:% ut3.ut.expect(v_actual).to_equal(v_expected); --Assert - l_expected_message := q'[%Failed to process ref_cursor with error -%ORA-01722: invalid number -%Actual: refcursor [ count = 1 ] was expected to equal: refcursor [ count = ] -%Diff: -%Columns: -%Column [data-type: NUMBER] is missing. Expected column position: 1. -%Column [data-type: VARCHAR2] is missing. Expected column position: 2. -%Rows: [ 1 differences ] -%Row No. 1 - Extra: 1357TEST_USER]'; + l_expected_message := q'[%SQL exception thrown when fetching data from cursor:% +%ORA-01722: invalid number% +%Check the query and data for errors.]'; l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; --Assert @@ -2544,15 +2535,9 @@ Diff:% ut3.ut.expect(v_actual).to_equal(v_expected); --Assert - l_expected_message := q'[%Failed to process ref_cursor with error -%ORA-01722: invalid number -%Actual: refcursor [ count = 1 ] was expected to equal: refcursor [ count = ] -%Diff: -%Columns: -%Column [data-type: NUMBER] is missing. Expected column position: 1. -%Column [data-type: VARCHAR2] is missing. Expected column position: 2. -%Rows: [ 1 differences ] -%Row No. 1 - Extra: 1357TEST_USER]'; + l_expected_message := q'[%SQL exception thrown when fetching data from cursor:% +%ORA-01722: invalid number% +%Check the query and data for errors.]'; l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; --Assert From 40573c1a63a9a53c5d54f041aba6aa8e137bae56 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sat, 16 Mar 2019 13:18:31 +0000 Subject: [PATCH 0309/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index fdf92765b..ca0b600ec 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.4.2678-develop'; + gc_version constant varchar2(50) := 'v3.1.4.2683-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 371d246e0977ad48981bb1f80e31361fbfdb5ae1 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 18 Mar 2019 10:26:43 +0000 Subject: [PATCH 0310/1096] Fixed example in documentation for context. --- docs/userguide/annotations.md | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 332d59b9b..1c7ca5f87 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1111,7 +1111,7 @@ create or replace package test_rooms_management is procedure fails_on_room_name_invalid; --%test(Fails when content name is null) - --%throws(gc_null_value_exception) + --%throws(test_rooms_management.gc_null_value_exception) procedure fails_on_content_null; --%test(Adds a content to existing room) @@ -1148,7 +1148,7 @@ create or replace package body test_rooms_management is begin open l_rooms_not_named_b for select * from rooms where name not like 'B%'; - remove_rooms_by_name('B%'); + rooms_management.remove_rooms_by_name('B%'); open l_remaining_rooms for select * from rooms; ut.expect( l_remaining_rooms ).to_equal(l_rooms_not_named_b); @@ -1156,23 +1156,27 @@ create or replace package body test_rooms_management is procedure room_with_content is begin - remove_rooms_by_name('Living Room'); + rooms_management.remove_rooms_by_name('Living Room'); end; procedure null_room_name is begin - remove_rooms_by_name(NULL); + --Act + rooms_management.remove_rooms_by_name(NULL); + --Assert done by --%throws annotation end; procedure fails_on_room_name_invalid is begin - add_rooms_content('bad room name','Chair'); + --Act + rooms_management.add_rooms_content('bad room name','Chair'); + --Assert done by --%throws annotation end; procedure fails_on_content_null is begin --Act - add_rooms_content('Dining Room',null); + rooms_management.add_rooms_content('Dining Room',null); --Assert done by --%throws annotation end; @@ -1184,7 +1188,7 @@ create or replace package body test_rooms_management is l_expected := 'Table'; --Act - add_rooms_content( 'Dining Room', l_expected ); + rooms_management.add_rooms_content( 'Dining Room', l_expected ); --Assert select name into l_actual from room_contents where contents_key = (select max(contents_key) from room_contents); @@ -1198,7 +1202,7 @@ end; When te tests are executed ```sql -exec ut.run('test_package'); +exec ut.run('test_rooms_management'); ``` The following report is displayed ``` From d5dfbbe21e5d49fc893fd30f98b7de407d089365 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 18 Mar 2019 10:45:12 +0000 Subject: [PATCH 0311/1096] Added `ut.version` and `ut_run_info()` onto documentation. Added grant and synonym for `ut_run_info`. Resolves #822 --- docs/userguide/install.md | 20 +++++++++++++++++-- .../create_synonyms_and_grants_for_public.sql | 2 ++ source/create_user_grants.sql | 1 + source/create_user_synonyms.sql | 1 + 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/docs/userguide/install.md b/docs/userguide/install.md index f22d2b6ca..9b886ebc7 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -2,7 +2,7 @@ # Downloading latest version of utPLSQL -To download latest version of utPLSQL from github on both Unix/Linux as well as Windows machines use the below smippets. +To download latest version of utPLSQL from github on both Unix/Linux as well as Windows machines use the below snippets. ## Unix/Linux @@ -51,6 +51,20 @@ foreach ($i in $urlList) { } ``` +# Checking environment and utPLSQL version + +To check the framework version execute the following query: +```sql +select substr(ut.version(),1,60) as ut_version from dual; +``` + +Additionally you may retrieve more information about your environment by executing the following query: +```sql +select + xmlserialize( content xmltype(ut_run_info()) as clob indent size = 2 ) + from dual; +``` + # Supported database versions The utPLSQL may be installed on any supported version of Oracle Database [see](http://www.oracle.com/us/support/library/lifetime-support-technology-069183.pdf#page=6) @@ -187,9 +201,11 @@ If you have extended any utPLSQL types such as a custom reporter, these will nee The uninstall script does not drop the schema. -In order for the uninstall to be successful, you need to use the uninstall script that was provided with the exact utPLSQL version installed on your database. +**In order for the uninstall to be successful, you need to use the uninstall script that was provided with the exact utPLSQL version installed on your database.** i.e. the uninstall script provided with version 3.0.1 will probably not work if you want to remove version 3.0.0 from your database. +Alternatively you can drop the user that owns utPLSQL and re-create it using headless install. + # Version upgrade Currently, the only way to upgrade version of utPLSQL v3.0.0 and above is to remove the previous version and install the new version. diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index 82bbfe418..dcc940737 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -106,6 +106,7 @@ grant select, insert, delete, update on &&ut3_owner..dbmspcc_runs to public; grant select, insert, delete, update on &&ut3_owner..dbmspcc_units to public; grant execute on &&ut3_owner..ut_matcher_options to public; grant execute on &&ut3_owner..ut_matcher_options_items to public; +grant execute on &&ut3_owner..ut_run_info to public; prompt Creating synonyms for UTPLSQL objects in &&ut3_owner schema to PUBLIC @@ -165,3 +166,4 @@ create public synonym ut_realtime_reporter for &&ut3_owner..ut_realtime_reporter create public synonym dbmspcc_blocks for &&ut3_owner..dbmspcc_blocks; create public synonym dbmspcc_runs for &&ut3_owner..dbmspcc_runs; create public synonym dbmspcc_units for &&ut3_owner..dbmspcc_units; +create public synonym ut_run_info for &&ut3_owner..ut_run_info; diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql index 176ae57ff..032d75f6a 100644 --- a/source/create_user_grants.sql +++ b/source/create_user_grants.sql @@ -125,4 +125,5 @@ grant select, insert, delete, update on &&ut3_owner..dbmspcc_runs to &ut3_user; grant select, insert, delete, update on &&ut3_owner..dbmspcc_units to &ut3_user; grant execute on &&ut3_owner..ut_matcher_options to &ut3_user; grant execute on &&ut3_owner..ut_matcher_options_items to &ut3_user; +grant execute on &&ut3_owner..ut_run_info to &ut3_user; diff --git a/source/create_user_synonyms.sql b/source/create_user_synonyms.sql index 907b6dee0..b08cb7b0e 100644 --- a/source/create_user_synonyms.sql +++ b/source/create_user_synonyms.sql @@ -108,3 +108,4 @@ create or replace synonym &ut3_user..ut_realtime_reporter for &&ut3_owner..ut_re create or replace synonym &ut3_user..dbmspcc_blocks for &&ut3_owner..dbmspcc_blocks; create or replace synonym &ut3_user..dbmspcc_runs for &&ut3_owner..dbmspcc_runs; create or replace synonym &ut3_user..dbmspcc_units for &&ut3_owner..dbmspcc_units; +create or replace synonym &ut3_user..ut_run_info for &&ut3_owner..ut_run_info; From 68463e1153e2d965536fc58405d8ab500ef7e32f Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 18 Mar 2019 11:40:02 +0000 Subject: [PATCH 0312/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index ca0b600ec..b99d1826d 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.4.2683-develop'; + gc_version constant varchar2(50) := 'v3.1.4.2690-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 791d73db0932d5d66b386e5f7f1f4a973677569d Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 18 Mar 2019 12:08:40 +0000 Subject: [PATCH 0313/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index b99d1826d..bd7d74441 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.4.2690-develop'; + gc_version constant varchar2(50) := 'v3.1.4.2691-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 697e4434d798b07481125ccaf38cb2c88797b943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 19 Mar 2019 21:51:22 +0000 Subject: [PATCH 0314/1096] Touch `sonar-project.properties` --- sonar-project.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index 6381699e0..0dee98542 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -21,7 +21,6 @@ sonar.language=plsql sonar.exclusions=create_synonyms_and_grants_for_public.sql, create_user_grants.sql, create_user_synonyms.sql, create_utplsql_owner.sql, define_ut3_owner_param.sql, install.sql, install_above_12_1.sql, install_component.sql, install_headless.sql, uninstall.sql, uninstall_all.sql, uninstall_coverage_tables.sql - sonar.pullrequest.provider=github sonar.pullrequest.github.endpoint=https://api.github.com/ sonar.pullrequest.github.repository=utPLSQL/utPLSQL From 2d3500aa271a0c626944b9ff20100bf852fefa95 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 19 Mar 2019 22:11:17 +0000 Subject: [PATCH 0315/1096] Updated project version after build [skip ci] --- VERSION | 2 +- sonar-project.properties | 2 +- source/core/ut_utils.pks | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index a85121415..6eef43b75 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.4-develop +v3.1.4 diff --git a/sonar-project.properties b/sonar-project.properties index 0dee98542..561dca071 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,7 @@ sonar.projectKey=utPLSQL # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=utPLSQL -sonar.projectVersion=v3.1.4-develop +sonar.projectVersion=v3.1.4 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # Since SonarQube 4.2, this property is optional if sonar.modules is set. diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index bd7d74441..2f6ed7122 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.4.2691-develop'; + gc_version constant varchar2(50) := 'v3.1.4.2692'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From fbc58faefaebd64b7c3e13173e3a40cabc5dee8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 19 Mar 2019 22:35:09 +0000 Subject: [PATCH 0316/1096] Update VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 6eef43b75..ed530b3a7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.4 +v3.1.5 From dc2661a9b084faafb89ff0de29ea70d8027cd81e Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 19 Mar 2019 22:45:56 +0000 Subject: [PATCH 0317/1096] Updated project version after build [skip ci] --- VERSION | 2 +- sonar-project.properties | 2 +- source/core/ut_utils.pks | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index ed530b3a7..bfd6faf39 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.5 +v3.1.5-develop diff --git a/sonar-project.properties b/sonar-project.properties index 561dca071..0f73c8539 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,7 @@ sonar.projectKey=utPLSQL # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=utPLSQL -sonar.projectVersion=v3.1.4 +sonar.projectVersion=v3.1.5-develop # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # Since SonarQube 4.2, this property is optional if sonar.modules is set. diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 2f6ed7122..dfd84aa2d 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.4.2692'; + gc_version constant varchar2(50) := 'v3.1.5.2699-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 3be610a78ae443128063d7514d467cd2fbf4860f Mon Sep 17 00:00:00 2001 From: LUKASZ104 Date: Wed, 20 Mar 2019 10:41:14 +0000 Subject: [PATCH 0318/1096] Adding tests for matchers. Adding grants for public and create synonyms --- .../create_synonyms_and_grants_for_public.sql | 3 + source/create_user_grants.sql | 2 +- source/create_user_synonyms.sql | 1 + .../min_grant_user/test_min_grant_user.pkb | 75 ++++++++--- .../min_grant_user/test_min_grant_user.pks | 32 +++-- test/helpers/test_dummy_object.tps | 5 +- test/helpers/test_dummy_object_list.tps | 2 + test/helpers/ut3user#.test_cursor_grants.pkb | 119 ++++++++++++++---- test/helpers/ut3user#.test_cursor_grants.pks | 35 ++++-- 9 files changed, 215 insertions(+), 59 deletions(-) diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index dcc940737..ce6f237a5 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -107,6 +107,8 @@ grant select, insert, delete, update on &&ut3_owner..dbmspcc_units to public; grant execute on &&ut3_owner..ut_matcher_options to public; grant execute on &&ut3_owner..ut_matcher_options_items to public; grant execute on &&ut3_owner..ut_run_info to public; +grant execute on &&ut3_owner..ut_cursor_column_tab to public; + prompt Creating synonyms for UTPLSQL objects in &&ut3_owner schema to PUBLIC @@ -167,3 +169,4 @@ create public synonym dbmspcc_blocks for &&ut3_owner..dbmspcc_blocks; create public synonym dbmspcc_runs for &&ut3_owner..dbmspcc_runs; create public synonym dbmspcc_units for &&ut3_owner..dbmspcc_units; create public synonym ut_run_info for &&ut3_owner..ut_run_info; +create public synonym ut_cursor_column_tab for &&ut3_owner..ut_cursor_column_tab; diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql index 032d75f6a..abcc1150d 100644 --- a/source/create_user_grants.sql +++ b/source/create_user_grants.sql @@ -126,4 +126,4 @@ grant select, insert, delete, update on &&ut3_owner..dbmspcc_units to &ut3_user; grant execute on &&ut3_owner..ut_matcher_options to &ut3_user; grant execute on &&ut3_owner..ut_matcher_options_items to &ut3_user; grant execute on &&ut3_owner..ut_run_info to &ut3_user; - +grant execute on &&ut3_owner..ut_cursor_column_tab to &ut3_user; diff --git a/source/create_user_synonyms.sql b/source/create_user_synonyms.sql index b08cb7b0e..621771a76 100644 --- a/source/create_user_synonyms.sql +++ b/source/create_user_synonyms.sql @@ -109,3 +109,4 @@ create or replace synonym &ut3_user..dbmspcc_blocks for &&ut3_owner..dbmspcc_blo create or replace synonym &ut3_user..dbmspcc_runs for &&ut3_owner..dbmspcc_runs; create or replace synonym &ut3_user..dbmspcc_units for &&ut3_owner..dbmspcc_units; create or replace synonym &ut3_user..ut_run_info for &&ut3_owner..ut_run_info; +create or replace synonym &ut3_user..ut_cursor_column_tab for &&ut3_owner..ut_cursor_column_tab; \ No newline at end of file diff --git a/test/core/min_grant_user/test_min_grant_user.pkb b/test/core/min_grant_user/test_min_grant_user.pkb index aafa88fd0..f35bb4f74 100644 --- a/test/core/min_grant_user/test_min_grant_user.pkb +++ b/test/core/min_grant_user/test_min_grant_user.pkb @@ -1,15 +1,60 @@ -create or replace package body test_min_grant_user is - - procedure test_join_by_cursor is - l_results clob; - begin - execute immediate 'begin ut3$user#.test_cursor_grants.run(); end;'; - l_results := core.get_dbms_output_as_clob(); - --Assert - ut.expect( l_results ).to_be_like( '%execute join by test [% sec]' || - '%1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%' ); - - end; - -end; -/ +create or replace package body test_min_grant_user is + + procedure test_join_by_cursor is + l_results clob; + begin + execute immediate 'begin ut3$user#.test_cursor_grants.run_test_join_by_cursor(); end;'; + l_results := core.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%execute join by test [% sec]' || + '%1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%' ); + + end; + + procedure test_equal_cursor is + l_results clob; + begin + execute immediate 'begin ut3$user#.test_cursor_grants.run_test_equal_cursor(); end;'; + l_results := core.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%execute equal test [% sec]' || + '%1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%' ); + + end; + + procedure test_not_empty_cursor is + l_results clob; + begin + execute immediate 'begin ut3$user#.test_cursor_grants.run_test_not_empty_cursor(); end;'; + l_results := core.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%execute not_empty test [% sec]' || + '%1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%' ); + + end; + + + procedure test_have_count_cursor is + l_results clob; + begin + execute immediate 'begin ut3$user#.test_cursor_grants.run_test_have_count_cursor(); end;'; + l_results := core.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%execute have_count test [% sec]' || + '%1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%' ); + + end; + + procedure test_empty_cursor is + l_results clob; + begin + execute immediate 'begin ut3$user#.test_cursor_grants.run_test_empty_cursor(); end;'; + l_results := core.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%execute empty test [% sec]' || + '%1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%' ); + + end; + +end; +/ diff --git a/test/core/min_grant_user/test_min_grant_user.pks b/test/core/min_grant_user/test_min_grant_user.pks index 48c550f4c..82a2b014b 100644 --- a/test/core/min_grant_user/test_min_grant_user.pks +++ b/test/core/min_grant_user/test_min_grant_user.pks @@ -1,10 +1,22 @@ -create or replace package test_min_grant_user is - - --%suite(minimum grant user tests) - --%suitepath(utplsql.core) - - --%test(execute join by test) - procedure test_join_by_cursor; - -end; -/ +create or replace package test_min_grant_user is + + --%suite(minimum grant user tests) + --%suitepath(utplsql.core) + + --%test(execute join by test) + procedure test_join_by_cursor; + + --%test(execute equal test) + procedure test_equal_cursor; + + --%test(execute not_empty test) + procedure test_not_empty_cursor; + + --%test(execute have_count test) + procedure test_have_count_cursor; + + --%test(execute empty test) + procedure test_empty_cursor; + +end; +/ diff --git a/test/helpers/test_dummy_object.tps b/test/helpers/test_dummy_object.tps index 4305f73ce..79eed3e6e 100644 --- a/test/helpers/test_dummy_object.tps +++ b/test/helpers/test_dummy_object.tps @@ -13,4 +13,7 @@ create or replace type test_dummy_object as object ( "name" varchar2(30), "Value" varchar2(30) ) -/ \ No newline at end of file +/ + + +grant execute on test_dummy_object to ut3$user#; \ No newline at end of file diff --git a/test/helpers/test_dummy_object_list.tps b/test/helpers/test_dummy_object_list.tps index 67bba558e..e1dde66ed 100644 --- a/test/helpers/test_dummy_object_list.tps +++ b/test/helpers/test_dummy_object_list.tps @@ -1,2 +1,4 @@ create or replace type test_dummy_object_list as table of test_dummy_object / + +grant execute on test_dummy_object_list to ut3$user#; \ No newline at end of file diff --git a/test/helpers/ut3user#.test_cursor_grants.pkb b/test/helpers/ut3user#.test_cursor_grants.pkb index 481f23c84..2ed1ff919 100644 --- a/test/helpers/ut3user#.test_cursor_grants.pkb +++ b/test/helpers/ut3user#.test_cursor_grants.pkb @@ -1,23 +1,96 @@ -create or replace package body ut3$user#.test_cursor_grants is - - procedure run is - begin - ut3.ut.run('test_cursor_grants'); - end; - - procedure test_join_by_cursor is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; - begin - --Arrange - open l_actual for select owner, object_name,object_type from all_objects where owner = user - order by 1,2,3 asc; - open l_expected for select owner, object_name,object_type from all_objects where owner = user - order by 1,2,3 desc; - - --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OWNER'); - - end; -end; -/ \ No newline at end of file +create or replace package body ut3$user#.test_cursor_grants is + + procedure run_test_join_by_cursor is + begin + ut3.ut.run('test_cursor_grants.test_join_by_cursor'); + end; + + procedure run_test_equal_cursor is + begin + ut3.ut.run('test_cursor_grants.test_equal_cursor'); + end; + + procedure run_test_not_empty_cursor is + begin + ut3.ut.run('test_cursor_grants.test_not_empty_cursor'); + end; + + procedure run_test_have_count_cursor is + begin + ut3.ut.run('test_cursor_grants.test_have_count_cursor'); + end; + + procedure run_test_empty_cursor is + begin + ut3.ut.run('test_cursor_grants.test_empty_cursor'); + end; + + procedure test_join_by_cursor is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + begin + --Arrange + open l_actual for select owner, object_name,object_type from all_objects where owner = user + order by 1,2,3 asc; + open l_expected for select owner, object_name,object_type from all_objects where owner = user + order by 1,2,3 desc; + + --Act + ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OBJECT_NAME,OBJECT_TYPE'); + + end; + + procedure test_equal_cursor is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + l_list ut3_tester.test_dummy_object_list; + begin + --Arrange + open l_actual for select value(x) as item from table(l_list) x; + open l_expected for select value(x) as item from table(l_list) x; + + --Act + ut3.ut.expect(l_actual).to_equal(l_expected); + + end; + + procedure test_not_empty_cursor is + l_details_cur SYS_REFCURSOR; + l_expected ut3_tester.test_dummy_object_list; + begin + select ut3_tester.test_dummy_object( rn, 'Something '||rn, rn1) + bulk collect into l_expected + from (select rownum * case when mod(rownum,2) = 0 then -1 else 1 end rn, + rownum * case when mod(rownum,4) = 0 then -1 else 1 end rn1 + from dual connect by level <=10); + + --Arrange + open l_details_cur for + select value(x) as item from table(l_expected) x; + + --Act + ut3.ut.expect(l_details_cur).not_to_be_empty(); + end; + + procedure test_have_count_cursor is + l_expected SYS_REFCURSOR; + begin + --Arrange + open l_expected for + select value(x) as item from table(ut3_tester.test_dummy_object_list()) x; + + --Act + ut3.ut.expect(l_expected).to_have_count(0); + end; + + procedure test_empty_cursor is + l_expected SYS_REFCURSOR; + begin + open l_expected for + select value(x) as item from table(ut3_tester.test_dummy_object_list()) x; + --Act + ut3.ut.expect(l_expected).to_be_empty(); + end; + +end; +/ diff --git a/test/helpers/ut3user#.test_cursor_grants.pks b/test/helpers/ut3user#.test_cursor_grants.pks index 012b973c8..2ebb3d04a 100644 --- a/test/helpers/ut3user#.test_cursor_grants.pks +++ b/test/helpers/ut3user#.test_cursor_grants.pks @@ -1,9 +1,26 @@ -create or replace package ut3$user#.test_cursor_grants is - --%suite() - - procedure run; - - --%test(execute join by test) - procedure test_join_by_cursor; -end; -/ +create or replace package ut3$user#.test_cursor_grants is + --%suite() + + procedure run_test_join_by_cursor; + procedure run_test_equal_cursor; + procedure run_test_not_empty_cursor; + procedure run_test_have_count_cursor; + procedure run_test_empty_cursor; + + --%test(execute join by test) + procedure test_join_by_cursor; + + --%test(execute equal test) + procedure test_equal_cursor; + + --%test(execute not empty test) + procedure test_not_empty_cursor; + + --%test(execute have_count test) + procedure test_have_count_cursor; + + --%test(execute empty test) + procedure test_empty_cursor; + +end; +/ From 816b5dd1ff7bbd325c377fce62a37e529559b55c Mon Sep 17 00:00:00 2001 From: LUKASZ104 Date: Wed, 20 Mar 2019 12:08:26 +0000 Subject: [PATCH 0319/1096] Adding tests for matchers. Adding grants for public and create synonyms --- source/create_synonyms_and_grants_for_public.sql | 3 ++- source/create_user_grants.sql | 1 + source/create_user_synonyms.sql | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index ce6f237a5..2535c25fc 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -108,7 +108,7 @@ grant execute on &&ut3_owner..ut_matcher_options to public; grant execute on &&ut3_owner..ut_matcher_options_items to public; grant execute on &&ut3_owner..ut_run_info to public; grant execute on &&ut3_owner..ut_cursor_column_tab to public; - +grant execute on &&ut3_owner..ut_cursor_details to public; prompt Creating synonyms for UTPLSQL objects in &&ut3_owner schema to PUBLIC @@ -170,3 +170,4 @@ create public synonym dbmspcc_runs for &&ut3_owner..dbmspcc_runs; create public synonym dbmspcc_units for &&ut3_owner..dbmspcc_units; create public synonym ut_run_info for &&ut3_owner..ut_run_info; create public synonym ut_cursor_column_tab for &&ut3_owner..ut_cursor_column_tab; +create public synonym ut_cursor_details for &&ut3_owner..ut_cursor_details; diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql index abcc1150d..c0dbebcaf 100644 --- a/source/create_user_grants.sql +++ b/source/create_user_grants.sql @@ -127,3 +127,4 @@ grant execute on &&ut3_owner..ut_matcher_options to &ut3_user; grant execute on &&ut3_owner..ut_matcher_options_items to &ut3_user; grant execute on &&ut3_owner..ut_run_info to &ut3_user; grant execute on &&ut3_owner..ut_cursor_column_tab to &ut3_user; +grant execute on &&ut3_owner..ut_cursor_details to &ut3_user; diff --git a/source/create_user_synonyms.sql b/source/create_user_synonyms.sql index 621771a76..89d1736f8 100644 --- a/source/create_user_synonyms.sql +++ b/source/create_user_synonyms.sql @@ -109,4 +109,5 @@ create or replace synonym &ut3_user..dbmspcc_blocks for &&ut3_owner..dbmspcc_blo create or replace synonym &ut3_user..dbmspcc_runs for &&ut3_owner..dbmspcc_runs; create or replace synonym &ut3_user..dbmspcc_units for &&ut3_owner..dbmspcc_units; create or replace synonym &ut3_user..ut_run_info for &&ut3_owner..ut_run_info; -create or replace synonym &ut3_user..ut_cursor_column_tab for &&ut3_owner..ut_cursor_column_tab; \ No newline at end of file +create or replace synonym &ut3_user..ut_cursor_column_tab for &&ut3_owner..ut_cursor_column_tab; +create or replace synonym &ut3_user..ut_cursor_details for &&ut3_owner..ut_cursor_details; \ No newline at end of file From fd9dcd514cef1e2247b975bfbc32097729f5b737 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Wed, 20 Mar 2019 21:04:04 +0000 Subject: [PATCH 0320/1096] Updated project version after build [skip ci] --- source/core/ut_utils.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index dfd84aa2d..04085a270 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.5.2699-develop'; + gc_version constant varchar2(50) := 'v3.1.5.2704-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From a8d13ab3fb385cd6fe32067da4efaba6d6464f0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Wed, 20 Mar 2019 21:07:50 +0000 Subject: [PATCH 0321/1096] Touch sonar-project.properties --- sonar-project.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/sonar-project.properties b/sonar-project.properties index 0f73c8539..328716448 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -19,6 +19,7 @@ sonar.projectDescription=PL/SQL Unit Testing Framework sonar.plsql.file.suffixes=sql,tab,pkb,tpb sonar.language=plsql + sonar.exclusions=create_synonyms_and_grants_for_public.sql, create_user_grants.sql, create_user_synonyms.sql, create_utplsql_owner.sql, define_ut3_owner_param.sql, install.sql, install_above_12_1.sql, install_component.sql, install_headless.sql, uninstall.sql, uninstall_all.sql, uninstall_coverage_tables.sql sonar.pullrequest.provider=github From 3e6d5aea7e4dbda4eef7b72a3eb5cfc62dd41aab Mon Sep 17 00:00:00 2001 From: Travis CI Date: Wed, 20 Mar 2019 21:43:47 +0000 Subject: [PATCH 0322/1096] Updated project version after build [skip ci] --- VERSION | 2 +- sonar-project.properties | 2 +- source/core/ut_utils.pks | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index bfd6faf39..ed530b3a7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.5-develop +v3.1.5 diff --git a/sonar-project.properties b/sonar-project.properties index 328716448..84e767093 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,7 @@ sonar.projectKey=utPLSQL # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=utPLSQL -sonar.projectVersion=v3.1.5-develop +sonar.projectVersion=v3.1.5 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # Since SonarQube 4.2, this property is optional if sonar.modules is set. diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 04085a270..a783a332e 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.5.2704-develop'; + gc_version constant varchar2(50) := 'v3.1.5.2706'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 81a9caf2a7a348140026cc30690a195a10a93c2d Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 20 Mar 2019 21:55:03 +0000 Subject: [PATCH 0323/1096] Fixing update of version number in documentation. Updates were not published. --- .travis/push_release_version.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis/push_release_version.sh b/.travis/push_release_version.sh index 43ca773d8..082359af4 100755 --- a/.travis/push_release_version.sh +++ b/.travis/push_release_version.sh @@ -9,6 +9,7 @@ if [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [ "$TRAVIS_PULL_REQUEST" == git add sonar-project.properties git add VERSION git add source/* + git add docs/* git commit -m 'Updated project version after build [skip ci]' echo "Pushing to origin" git push --quiet origin HEAD:${CURRENT_BRANCH} From fef7ed78ac3cba6cb265cad9d9dd1956a1502562 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Wed, 20 Mar 2019 22:06:46 +0000 Subject: [PATCH 0324/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index cb3463d25..74f294701 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 66212bb2e..193e46c03 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 1b38f3d5f..4126baeb5 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 2ee94a403..e774552c8 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index dbea7b8a5..00c62767d 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 959be9d52..7bf15f123 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 1c7ca5f87..3bc2b7456 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index b216d1fcd..c2ed2cd8d 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 09c3184e5..a4de33f7e 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 3670d9ae3..522a858db 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 5d10492b8..e64bbe2f8 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index a8c2225fd..15a0ee039 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 9b886ebc7..547a51a1e 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index de3e0e870..9441386df 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index cdba72993..4d340dd78 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 174998112..8985cad7a 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 1eaae311d..7c0740c32 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.4.2223--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index a783a332e..8d2ceef9b 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.5.2706'; + gc_version constant varchar2(50) := 'v3.1.5.2707'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 812d56aed1a6e08cb2ff9d9af7e0bc278ea3a8e5 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Wed, 20 Mar 2019 22:47:48 +0000 Subject: [PATCH 0325/1096] Updated project version after build [skip ci] --- VERSION | 2 +- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- sonar-project.properties | 2 +- source/core/ut_utils.pks | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/VERSION b/VERSION index ed530b3a7..bfd6faf39 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.5 +v3.1.5-develop diff --git a/docs/about/authors.md b/docs/about/authors.md index 74f294701..a259e4560 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 193e46c03..aad837831 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 4126baeb5..6d84e8d5e 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index e774552c8..da9ce1b21 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 00c62767d..2f7143ab6 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 7bf15f123..2f5e42483 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 3bc2b7456..fde535eba 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index c2ed2cd8d..d1f55b68c 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index a4de33f7e..a5b3e21b1 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 522a858db..f0637a874 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index e64bbe2f8..8677cee2b 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 15a0ee039..a9c5726ac 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 547a51a1e..76a60d3d8 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 9441386df..94a96153d 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 4d340dd78..f739b5bcf 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 8985cad7a..8d3f48150 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 7c0740c32..2fa65e1ae 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2707-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) # Upgrading from version 2 diff --git a/sonar-project.properties b/sonar-project.properties index 84e767093..328716448 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,7 @@ sonar.projectKey=utPLSQL # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=utPLSQL -sonar.projectVersion=v3.1.5 +sonar.projectVersion=v3.1.5-develop # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # Since SonarQube 4.2, this property is optional if sonar.modules is set. diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 8d2ceef9b..4f8301a12 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.5.2707'; + gc_version constant varchar2(50) := 'v3.1.5.2711-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From f192ca8aa4622580ae477bb6cb4285863f01b9e2 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Thu, 21 Mar 2019 17:30:35 +0000 Subject: [PATCH 0326/1096] fixing displaying a data type comparison to avoid displaying full structure. removing synonyms to internal objects as get_xml_children function is no longer executed in sql scope --- source/create_synonyms_and_grants_for_public.sql | 4 ---- source/create_user_grants.sql | 2 -- source/create_user_synonyms.sql | 2 -- source/expectations/data_values/ut_cursor_column.tpb | 2 +- source/expectations/data_values/ut_cursor_details.tpb | 6 ++---- 5 files changed, 3 insertions(+), 13 deletions(-) diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index 2535c25fc..dcc940737 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -107,8 +107,6 @@ grant select, insert, delete, update on &&ut3_owner..dbmspcc_units to public; grant execute on &&ut3_owner..ut_matcher_options to public; grant execute on &&ut3_owner..ut_matcher_options_items to public; grant execute on &&ut3_owner..ut_run_info to public; -grant execute on &&ut3_owner..ut_cursor_column_tab to public; -grant execute on &&ut3_owner..ut_cursor_details to public; prompt Creating synonyms for UTPLSQL objects in &&ut3_owner schema to PUBLIC @@ -169,5 +167,3 @@ create public synonym dbmspcc_blocks for &&ut3_owner..dbmspcc_blocks; create public synonym dbmspcc_runs for &&ut3_owner..dbmspcc_runs; create public synonym dbmspcc_units for &&ut3_owner..dbmspcc_units; create public synonym ut_run_info for &&ut3_owner..ut_run_info; -create public synonym ut_cursor_column_tab for &&ut3_owner..ut_cursor_column_tab; -create public synonym ut_cursor_details for &&ut3_owner..ut_cursor_details; diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql index c0dbebcaf..feab90933 100644 --- a/source/create_user_grants.sql +++ b/source/create_user_grants.sql @@ -126,5 +126,3 @@ grant select, insert, delete, update on &&ut3_owner..dbmspcc_units to &ut3_user; grant execute on &&ut3_owner..ut_matcher_options to &ut3_user; grant execute on &&ut3_owner..ut_matcher_options_items to &ut3_user; grant execute on &&ut3_owner..ut_run_info to &ut3_user; -grant execute on &&ut3_owner..ut_cursor_column_tab to &ut3_user; -grant execute on &&ut3_owner..ut_cursor_details to &ut3_user; diff --git a/source/create_user_synonyms.sql b/source/create_user_synonyms.sql index 89d1736f8..b08cb7b0e 100644 --- a/source/create_user_synonyms.sql +++ b/source/create_user_synonyms.sql @@ -109,5 +109,3 @@ create or replace synonym &ut3_user..dbmspcc_blocks for &&ut3_owner..dbmspcc_blo create or replace synonym &ut3_user..dbmspcc_runs for &&ut3_owner..dbmspcc_runs; create or replace synonym &ut3_user..dbmspcc_units for &&ut3_owner..dbmspcc_units; create or replace synonym &ut3_user..ut_run_info for &&ut3_owner..ut_run_info; -create or replace synonym &ut3_user..ut_cursor_column_tab for &&ut3_owner..ut_cursor_column_tab; -create or replace synonym &ut3_user..ut_cursor_details for &&ut3_owner..ut_cursor_details; \ No newline at end of file diff --git a/source/expectations/data_values/ut_cursor_column.tpb b/source/expectations/data_values/ut_cursor_column.tpb index ab83ff339..5f6f18c56 100644 --- a/source/expectations/data_values/ut_cursor_column.tpb +++ b/source/expectations/data_values/ut_cursor_column.tpb @@ -12,7 +12,7 @@ create or replace type body ut_cursor_column as self.column_position := a_col_position; --Position of the column in cursor/ type self.column_len := a_col_max_len; --length of column self.column_name := TRIM( BOTH '''' FROM a_col_name); --name of the column - self.column_type_name := a_col_type_name; --type name e.g. test_dummy_object or varchar2 + self.column_type_name := coalesce(a_col_type_name,a_col_type); --type name e.g. test_dummy_object or varchar2 self.access_path := case when a_access_path is null then self.column_name else diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb index f6162aac2..c1d229e6a 100644 --- a/source/expectations/data_values/ut_cursor_details.tpb +++ b/source/expectations/data_values/ut_cursor_details.tpb @@ -195,12 +195,10 @@ create or replace type body ut_cursor_details as member function get_xml_children(a_parent_name varchar2 := null) return xmltype is l_result xmltype; begin - select xmlagg(xmlelement(evalname t.column_name,t.column_type, - self.get_xml_children(t.column_name))) + select xmlagg(xmlelement(evalname t.column_name,t.column_type_name)) into l_result from table(self.cursor_columns_info) t - where (a_parent_name is not null and parent_name = a_parent_name and hierarchy_level > 1 and column_name is not null) - or (a_parent_name is null and parent_name is null and hierarchy_level = 1 and column_name is not null) + where (a_parent_name is null and parent_name is null and hierarchy_level = 1 and column_name is not null) having count(*) > 0; return l_result; From 3573ae931e3fad8b7770150065b8d2229f7ec263 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 22 Mar 2019 09:01:13 +0000 Subject: [PATCH 0327/1096] Update display of comparing cursor on different data-types to not displaying a full structure. Added tests to check that display message. --- .../data_values/ut_compound_data_helper.pkb | 9 ++- .../expectations/test_expectations_cursor.pkb | 60 +++++++++++++++++++ .../expectations/test_expectations_cursor.pks | 7 ++- 3 files changed, 72 insertions(+), 4 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index dab3d4af1..5175699cd 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -79,13 +79,16 @@ create or replace package body ut_compound_data_helper is execute immediate q'[with expected_cols as ( select access_path exp_column_name,column_position exp_col_pos, - replace(column_type,'VARCHAR2','CHAR') exp_col_type_compare, column_type exp_col_type + replace(column_type_name,'VARCHAR2','CHAR') exp_col_type_compare, column_type_name exp_col_type from table(:a_expected) + where parent_name is null and hierarchy_level = 1 and column_name is not null ), actual_cols as ( select access_path act_column_name,column_position act_col_pos, - replace(column_type,'VARCHAR2','CHAR') act_col_type_compare, column_type act_col_type - from table(:a_actual)), + replace(column_type_name,'VARCHAR2','CHAR') act_col_type_compare, column_type_name act_col_type + from table(:a_actual) + where parent_name is null and hierarchy_level = 1 and column_name is not null + ), joined_cols as ( select e.*,a.*]' || case when a_order_enforced then ', diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index f0d9ae36e..1b155353d 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -2465,5 +2465,65 @@ Diff:% ut.expect(l_actual_message).to_be_like(l_expected_message); end; + procedure udt_messg_format_eq is + l_actual sys_refcursor; + l_expected sys_refcursor; + l_expected_tab ut3.ut_key_value_pairs := ut3.ut_key_value_pairs(); + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + select ut3.ut_key_value_pair(rownum,'Something '||rownum) + bulk collect into l_expected_tab + from dual connect by level <=2; + + --Arrange + open l_actual for select object_name, owner from all_objects where rownum < 3; + open l_expected for select value(x) as udt from table(l_expected_tab) x; + + --Act + ut3.ut.expect(l_actual).to_contain(l_expected); + --Assert + l_expected_message := q'[%Actual: refcursor [ count = 2 ] was expected to contain: refcursor [ count = 2 ] +%Diff: +%Columns: +%Column [data-type: UT_KEY_VALUE_PAIR] is missing. Expected column position: 1. +%Column [position: 1, data-type: VARCHAR2] is not expected in results. +%Column [position: 2, data-type: VARCHAR2] is not expected in results. +%Rows: [ 2 differences ] +%Missing: 1Something 1 +%Missing: 2Something 2%]'; + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure udt_messg_format_empt is + l_actual sys_refcursor; + l_actual_tab ut3.ut_key_value_pairs := ut3.ut_key_value_pairs(); + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + select ut3.ut_key_value_pair(rownum,'Something '||rownum) + bulk collect into l_actual_tab + from dual connect by level <=2; + + --Arrange + open l_actual for select value(x) as udt from table(l_actual_tab) x; + + --Act + ut3.ut.expect(l_actual).to_be_empty(); + --Assert + l_expected_message := q'[%Actual: (refcursor [ count = 2 ]) +%Data-types: +%UT_KEY_VALUE_PAIR +%Data: +%1Something 12Something 2 +%was expected to be empty%]'; + + l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + end; / diff --git a/test/core/expectations/test_expectations_cursor.pks b/test/core/expectations/test_expectations_cursor.pks index c0195393e..e8f492674 100644 --- a/test/core/expectations/test_expectations_cursor.pks +++ b/test/core/expectations/test_expectations_cursor.pks @@ -390,6 +390,11 @@ create or replace package test_expectations_cursor is --%test(Cursor to contain duplicates fail) procedure to_contain_duplicates_fail; - + + --%test(Display a message with a uer defined type with only type name not structure on equal) + procedure udt_messg_format_eq; + + --%test(Display a message with a uer defined type with only type name not structure on empty) + procedure udt_messg_format_empt; end; / From 844f0bf934b9cf33f53d55837f0a4bee18e1493e Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 22 Mar 2019 18:42:23 +0000 Subject: [PATCH 0328/1096] Fixing issue when cursor was opened with privs of the user instead of framework when accessing internal function. --- .../data_values/ut_compound_data_helper.pkb | 12 ++++++++++++ .../data_values/ut_compound_data_helper.pks | 4 +++- .../data_values/ut_data_value_refcursor.tpb | 3 ++- .../min_grant_user/test_min_grant_user.pkb | 11 +++++++++++ .../min_grant_user/test_min_grant_user.pks | 3 +++ test/helpers/ut3user#.test_cursor_grants.pkb | 18 ++++++++++++++++++ test/helpers/ut3user#.test_cursor_grants.pks | 6 +++++- 7 files changed, 54 insertions(+), 3 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index dab3d4af1..8b7702982 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -586,6 +586,18 @@ create or replace package body ut_compound_data_helper is end; end; + function get_compare_cursor(a_diff_cursor_text in clob,a_self_id raw, a_other_id raw) return sys_refcursor is + l_diff_cursor sys_refcursor; + begin + open l_diff_cursor for a_diff_cursor_text using a_self_id, a_other_id; + return l_diff_cursor; + exception when others then + if l_diff_cursor%isopen then + close l_diff_cursor; + end if; + raise; + end; + begin g_anytype_name_map(dbms_types.typecode_date) := 'DATE'; g_anytype_name_map(dbms_types.typecode_number) := 'NUMBER'; diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 679c13692..bf3182500 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -89,6 +89,8 @@ create or replace package ut_compound_data_helper authid definer is function is_sql_compare_allowed(a_type_name varchar2) return boolean; function get_column_type_desc(a_type_code in integer, a_dbms_sql_desc in boolean) return varchar2; - + + function get_compare_cursor(a_diff_cursor_text in clob,a_self_id raw, a_other_id raw) return sys_refcursor; + end; / diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 584ca6426..83bd1502f 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -306,7 +306,8 @@ create or replace type body ut_data_value_refcursor as l_diff_id := ut_compound_data_helper.get_hash(a_self.data_id||a_other.data_id); begin - open l_cursor for a_diff_cursor_text using a_self.data_id, a_other.data_id; + l_cursor := ut_compound_data_helper.get_compare_cursor(a_diff_cursor_text, + a_self.data_id, a_other.data_id); --fetch and save rows for display of diff fetch l_cursor bulk collect into l_diff_tab limit ut_utils.gc_diff_max_rows; diff --git a/test/core/min_grant_user/test_min_grant_user.pkb b/test/core/min_grant_user/test_min_grant_user.pkb index f35bb4f74..233cca67f 100644 --- a/test/core/min_grant_user/test_min_grant_user.pkb +++ b/test/core/min_grant_user/test_min_grant_user.pkb @@ -55,6 +55,17 @@ create or replace package body test_min_grant_user is '%1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%' ); end; + + procedure test_equal_non_diff_sql is + l_results clob; + begin + execute immediate 'begin ut3$user#.test_cursor_grants.run_test_equal_non_diff_sql(); end;'; + l_results := core.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%execute test with non diff datatype [% sec]' || + '%1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%' ); + + end; end; / diff --git a/test/core/min_grant_user/test_min_grant_user.pks b/test/core/min_grant_user/test_min_grant_user.pks index 82a2b014b..daf34b35d 100644 --- a/test/core/min_grant_user/test_min_grant_user.pks +++ b/test/core/min_grant_user/test_min_grant_user.pks @@ -18,5 +18,8 @@ create or replace package test_min_grant_user is --%test(execute empty test) procedure test_empty_cursor; + --%test(execute test with non diff datatype) + procedure test_equal_non_diff_sql; + end; / diff --git a/test/helpers/ut3user#.test_cursor_grants.pkb b/test/helpers/ut3user#.test_cursor_grants.pkb index 2ed1ff919..112d9559e 100644 --- a/test/helpers/ut3user#.test_cursor_grants.pkb +++ b/test/helpers/ut3user#.test_cursor_grants.pkb @@ -24,6 +24,11 @@ create or replace package body ut3$user#.test_cursor_grants is begin ut3.ut.run('test_cursor_grants.test_empty_cursor'); end; + + procedure run_test_equal_non_diff_sql is + begin + ut3.ut.run('test_cursor_grants.test_equal_non_diff_sql'); + end; procedure test_join_by_cursor is l_actual SYS_REFCURSOR; @@ -92,5 +97,18 @@ create or replace package body ut3$user#.test_cursor_grants is ut3.ut.expect(l_expected).to_be_empty(); end; + procedure test_equal_non_diff_sql is + l_actual SYS_REFCURSOR; + l_expected SYS_REFCURSOR; + begin + open l_actual for + select to_clob('test1') as item from dual; + + open l_expected for + select to_clob('test1') as item from dual; + + ut3.ut.expect(l_actual).to_equal(l_expected); + end; + end; / diff --git a/test/helpers/ut3user#.test_cursor_grants.pks b/test/helpers/ut3user#.test_cursor_grants.pks index 2ebb3d04a..cf829c09f 100644 --- a/test/helpers/ut3user#.test_cursor_grants.pks +++ b/test/helpers/ut3user#.test_cursor_grants.pks @@ -6,7 +6,8 @@ create or replace package ut3$user#.test_cursor_grants is procedure run_test_not_empty_cursor; procedure run_test_have_count_cursor; procedure run_test_empty_cursor; - + procedure run_test_equal_non_diff_sql; + --%test(execute join by test) procedure test_join_by_cursor; @@ -22,5 +23,8 @@ create or replace package ut3$user#.test_cursor_grants is --%test(execute empty test) procedure test_empty_cursor; + --%test(execute test with non diff datatype) + procedure test_equal_non_diff_sql; + end; / From 363c39eb1ccab5f18dbf751ef7304dce8c5901c3 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 22 Mar 2019 23:15:13 +0000 Subject: [PATCH 0329/1096] Removing exception unnecessary --- source/expectations/data_values/ut_compound_data_helper.pkb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 8b7702982..d5d7b8927 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -591,11 +591,6 @@ create or replace package body ut_compound_data_helper is begin open l_diff_cursor for a_diff_cursor_text using a_self_id, a_other_id; return l_diff_cursor; - exception when others then - if l_diff_cursor%isopen then - close l_diff_cursor; - end if; - raise; end; begin From e6dea2d36efb75bad1f0a94023721d4d9971c129 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Fri, 22 Mar 2019 23:19:34 +0000 Subject: [PATCH 0330/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index a259e4560..a632fc3ed 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index aad837831..be562568b 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 6d84e8d5e..c20047994 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index da9ce1b21..06ad43251 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 2f7143ab6..0966ee020 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 2f5e42483..7e00e8fb7 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index fde535eba..a183d84fe 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index d1f55b68c..46520f701 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index a5b3e21b1..26c507a70 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index f0637a874..6091fac39 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 8677cee2b..aae989fec 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index a9c5726ac..a609fee8c 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 76a60d3d8..1115f89cf 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 94a96153d..7f92def68 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index f739b5bcf..9c1434e7a 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 8d3f48150..be1e04100 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 2fa65e1ae..29988a9ca 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 4f8301a12..0c729818c 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.5.2711-develop'; + gc_version constant varchar2(50) := 'v3.1.5.2718-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 5a56435224250ee60416ee0b196cb63cc8316ea0 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sat, 23 Mar 2019 09:42:10 +0000 Subject: [PATCH 0331/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index a632fc3ed..958edffb7 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index be562568b..0d4ef9a1b 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index c20047994..825f34e80 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 06ad43251..11c73b5bc 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 0966ee020..8958a9124 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 7e00e8fb7..6e6b24424 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index a183d84fe..6b18d47bf 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 46520f701..edbef3375 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 26c507a70..554be9e79 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 6091fac39..f89442db3 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index aae989fec..1cea724b5 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index a609fee8c..f1b745028 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 1115f89cf..74e41c267 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 7f92def68..2cd946947 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 9c1434e7a..b3d86c3af 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index be1e04100..6351abdff 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 29988a9ca..a6f6cf162 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 0c729818c..69ce66a10 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.5.2718-develop'; + gc_version constant varchar2(50) := 'v3.1.5.2724-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From a97a710a13b3d105d6f67f9680c1f921c345a26e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Sat, 23 Mar 2019 10:18:58 +0000 Subject: [PATCH 0332/1096] Update VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index bfd6faf39..1bf2d5a2b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.5-develop +v3.1.6-develop From 133ecaef7e57cfb0ed448118822aa05d6a88258a Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 22 Mar 2019 18:48:24 +0000 Subject: [PATCH 0333/1096] Adding new API user. --- .travis/install.sh | 30 +- development/cleanup.sh | 3 +- development/install.sh | 2 +- development/template.env.sh | 3 +- test/install_ut3_tester_helper.sql | 42 +++ test/install_ut3_user_tests.sql | 39 +++ test/{ => ut3_tester_helper}/core.pkb | 33 +++ test/{ => ut3_tester_helper}/core.pks | 11 + test/ut3_user/expectations/test_matchers.pkb | 271 +++++++++++++++++++ test/ut3_user/expectations/test_matchers.pks | 27 ++ 10 files changed, 446 insertions(+), 15 deletions(-) create mode 100644 test/install_ut3_tester_helper.sql create mode 100644 test/install_ut3_user_tests.sql rename test/{ => ut3_tester_helper}/core.pkb (70%) rename test/{ => ut3_tester_helper}/core.pks (52%) create mode 100644 test/ut3_user/expectations/test_matchers.pkb create mode 100644 test/ut3_user/expectations/test_matchers.pks diff --git a/.travis/install.sh b/.travis/install.sh index e37cfa35f..3cd476981 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -60,27 +60,33 @@ grant select any dictionary to $UT3_OWNER; grant create any procedure, drop any procedure, execute any procedure to $UT3_OWNER; SQL -#Create user that will own the tests +#Create user that will own the tests that are relevant to internal framework time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL set feedback off @create_utplsql_owner.sql $UT3_TESTER $UT3_TESTER_PASSWORD $UT3_TABLESPACE - ---needed for testing distributed transactions -grant create public database link to $UT3_TESTER; -grant drop public database link to $UT3_TESTER; -set feedback on ---Needed for testing coverage outside of main UT3 schema. -grant create any procedure, drop any procedure, execute any procedure, create any type, drop any type, execute any type, under any type, select any table, update any table, insert any table, delete any table, create any table, drop any table, alter any table, select any dictionary to $UT3_TESTER; -revoke execute on dbms_crypto from $UT3_TESTER; -grant create job to $UT3_TESTER; exit SQL -#Create additional UT3$USER# to test for special characters +#Create additional UT3$USER# to test for special characters and front end API testing time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL set feedback off @create_utplsql_owner.sql $UT3_USER $UT3_USER_PASSWORD $UT3_TABLESPACE ---Grant UT3 framework to UT3$USER# +--Grant UT3 framework to min user @create_user_grants.sql $UT3_OWNER $UT3_USER exit SQL + +#Create additional UT3_TESTER_HELPER that will provide a functions to allow min grant test user setup test +time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL +set feedback off +@create_utplsql_owner.sql $UT3_TESTER_HELPER $UT3_TESTER_HELPER_PASSWORD $UT3_TABLESPACE +--needed for testing distributed transactions +grant create public database link to $UT3_TESTER_HELPER; +grant drop public database link to $UT3_TESTER_HELPER; +set feedback on +--Needed for testing coverage outside of main UT3 schema. +grant create any procedure, drop any procedure, execute any procedure, create any type, drop any type, execute any type, under any type, select any table, update any table, insert any table, delete any table, create any table, drop any table, alter any table, select any dictionary to $UT3_TESTER_HELPER; +revoke execute on dbms_crypto from $UT3_TESTER_HELPER; +grant create job to $UT3_TESTER_HELPER; +exit +SQL diff --git a/development/cleanup.sh b/development/cleanup.sh index 3b6e22e53..086db6786 100755 --- a/development/cleanup.sh +++ b/development/cleanup.sh @@ -3,7 +3,7 @@ #goto git root directory git rev-parse && cd "$(git rev-parse --show-cdup)" -. development/env.sh +#. development/env.sh "${SQLCLI}" sys/${ORACLE_PWD}@//${CONNECTION_STR} AS SYSDBA <<-SQL set echo on @@ -21,6 +21,7 @@ end; drop user ${UT3_OWNER} cascade; drop user ${UT3_RELEASE_VERSION_SCHEMA} cascade; drop user ${UT3_TESTER} cascade; +drop user ${UT3_TESTER_HELPER} cascade; drop user ${UT3_USER} cascade; begin diff --git a/development/install.sh b/development/install.sh index 4104e2672..86d7e4da2 100755 --- a/development/install.sh +++ b/development/install.sh @@ -3,7 +3,7 @@ #goto git root directory git rev-parse && cd "$(git rev-parse --show-cdup)" -. development/env.sh +#. development/env.sh header="******************************************************************************************" if ! development/cleanup.sh; then diff --git a/development/template.env.sh b/development/template.env.sh index 94004c89d..b19f63ec7 100755 --- a/development/template.env.sh +++ b/development/template.env.sh @@ -16,4 +16,5 @@ export UT3_TESTER_PASSWORD=ut3 export UT3_TABLESPACE=users export UT3_USER="UT3\$USER#" export UT3_USER_PASSWORD=ut3 - +export UT3_TESTER_HELPER=ut3_tester_helper +export UT3_TESTER_HELPER_PASSWORD=ut3 diff --git a/test/install_ut3_tester_helper.sql b/test/install_ut3_tester_helper.sql new file mode 100644 index 000000000..0eabb98c9 --- /dev/null +++ b/test/install_ut3_tester_helper.sql @@ -0,0 +1,42 @@ +set define off +whenever sqlerror exit failure rollback +whenever oserror exit failure rollback + +alter session set plsql_optimize_level=0; +--Install ut3_tester_helper +@@ut3_tester_helper/core.pks + +@@ut3_tester_helper/core.pkb + + +grant execute on ut3_tester_helper.core to UT3$USER#; + +set linesize 200 +set define on +set verify off +column text format a100 +column error_count noprint new_value error_count + +prompt Validating installation + +set heading on +select type, name, sequence, line, position, text, count(1) over() error_count + from all_errors + where owner = USER + and name not like 'BIN$%' --not recycled + and name != 'UT_WITH_INVALID_BODY' + -- errors only. ignore warnings + and attribute = 'ERROR' + order by name, type, sequence +/ + +begin + if to_number('&&error_count') > 0 then + raise_application_error(-20000, 'Not all sources were successfully installed.'); + else + dbms_output.put_line('Installation completed successfully'); + end if; +end; +/ + +exit; diff --git a/test/install_ut3_user_tests.sql b/test/install_ut3_user_tests.sql new file mode 100644 index 000000000..4890d002a --- /dev/null +++ b/test/install_ut3_user_tests.sql @@ -0,0 +1,39 @@ +set define off +whenever sqlerror exit failure rollback +whenever oserror exit failure rollback + +alter session set plsql_optimize_level=0; + +prompt Install user tests +@@ut3_user/expectations/test_matchers.pks +@@ut3_user/expectations/test_matchers.pkb + +set linesize 200 +set define on +set verify off +column text format a100 +column error_count noprint new_value error_count + +prompt Validating installation + +set heading on +select type, name, sequence, line, position, text, count(1) over() error_count + from all_errors + where owner = USER + and name not like 'BIN$%' --not recycled + and name != 'UT_WITH_INVALID_BODY' + -- errors only. ignore warnings + and attribute = 'ERROR' + order by name, type, sequence +/ + +begin + if to_number('&&error_count') > 0 then + raise_application_error(-20000, 'Not all sources were successfully installed.'); + else + dbms_output.put_line('Installation completed successfully'); + end if; +end; +/ + +exit; diff --git a/test/core.pkb b/test/ut3_tester_helper/core.pkb similarity index 70% rename from test/core.pkb rename to test/ut3_tester_helper/core.pkb index 60baa0190..9b70f3826 100644 --- a/test/core.pkb +++ b/test/ut3_tester_helper/core.pkb @@ -88,5 +88,38 @@ create or replace package body core is return l_glob_val; end; + function get_failed_expectations return ut3.ut_varchar2_list is + l_expectations_result ut3.ut_expectation_results := ut3.ut_expectation_processor.get_failed_expectations(); + l_result ut3.ut_varchar2_list; + begin + for i in 1..l_expectations_result.count loop + l_result := l_result multiset union l_expectations_result(i).get_result_lines(); + end loop; + return l_result; + end; + + function failed_expectations_data return anydata is + begin + return anydata.convertCollection(ut3.ut_expectation_processor.get_failed_expectations()); + end; + + function get_failed_expectations_n return number is + l_num_failed number; + l_results ut3.ut_expectation_results := ut3.ut_expectation_processor.get_failed_expectations(); + begin + l_num_failed := l_results.count; + return l_num_failed; + end; + + procedure clear_expectations is + begin + ut3.ut_expectation_processor.clear_expectations(); + end; + + function table_to_clob(a_results in ut3.ut_varchar2_list) return clob is + begin + return ut3.ut_utils.table_to_clob(a_results); + end; + end; / diff --git a/test/core.pks b/test/ut3_tester_helper/core.pks similarity index 52% rename from test/core.pks rename to test/ut3_tester_helper/core.pks index d23ab6be0..a722a9871 100644 --- a/test/core.pks +++ b/test/ut3_tester_helper/core.pks @@ -1,5 +1,8 @@ create or replace package core is + gc_success number := ut3.ut_utils.gc_success; + gc_failure number := ut3.ut_utils.gc_failure; + --%suite --%suitepath(utplsql) @@ -16,6 +19,14 @@ create or replace package core is function get_value(a_variable varchar2) return integer; function get_dbms_output_as_clob return clob; + + function get_failed_expectations return ut3.ut_varchar2_list; + + function get_failed_expectations_n return number; + + procedure clear_expectations; + + function table_to_clob(a_results in ut3.ut_varchar2_list) return clob; end; / diff --git a/test/ut3_user/expectations/test_matchers.pkb b/test/ut3_user/expectations/test_matchers.pkb new file mode 100644 index 000000000..114e34267 --- /dev/null +++ b/test/ut3_user/expectations/test_matchers.pkb @@ -0,0 +1,271 @@ +create or replace package body test_matchers is + + procedure cleanup_expectations is + begin + ut3_tester_helper.core.clear_expectations( ); + end; + + procedure exec_matcher(a_type varchar2, a_actual_value varchar2, a_expected_value varchar2, a_matcher varchar2, a_result integer, a_prefix varchar2 := null) is + l_statement varchar2(32767); + begin + l_statement := ' + declare + l_actual '||a_type||' := '||a_actual_value||'; + l_expected '||a_type||' := '||a_expected_value||'; + begin + ut3.ut.expect( l_actual ).'||a_prefix||'to_'||a_matcher||'( l_expected ); + end;'; + execute immediate l_statement; + if a_result = ut3_tester_helper.core.gc_success then + ut.expect(ut3_tester_helper.core.get_failed_expectations_n()).to_equal(0); + else + ut.expect(ut3_tester_helper.core.get_failed_expectations_n()).to_be_greater_than(0); + end if; + cleanup_expectations(); + end exec_matcher; + + procedure exec_be_between(a_type varchar2, a_actual_value varchar2, a_expected1_value varchar2, a_expected2_value varchar2,a_result integer) is + l_statement varchar2(32767); + begin + l_statement := ' + declare + l_actual_value '||a_type||' := '||a_actual_value||'; + l_lower '||a_type||' := '||a_expected1_value||'; + l_higher '||a_type||' := '||a_expected2_value||'; + begin + ut3.ut.expect(l_actual_value).to_be_between(l_lower, l_higher); + end;'; + execute immediate l_statement; + if a_result = ut3_tester_helper.core.gc_success then + ut.expect(ut3_tester_helper.core.get_failed_expectations_n()).to_equal(0); + else + ut.expect(ut3_tester_helper.core.get_failed_expectations_n()).to_be_greater_than(0); + end if; + cleanup_expectations(); + end exec_be_between; + + procedure exec_be_between2(a_type varchar2, a_actual_value varchar2, a_expected1_value varchar2, a_expected2_value varchar2,a_result integer, a_not_prefix varchar2 default null) is + l_statement varchar2(32767); + begin + l_statement := ' + declare + l_actual_value '||a_type||' := '||a_actual_value||'; + l_value1 '||a_type||' := '||a_expected1_value||'; + l_value2 '||a_type||' := '||a_expected2_value||'; + begin + ut3.ut.expect(l_actual_value).'||a_not_prefix||'to_be_between(l_value1, l_value2); + end;'; + execute immediate l_statement; + if a_result = ut3_tester_helper.core.gc_success then + ut.expect(ut3_tester_helper.core.get_failed_expectations_n()).to_equal(0); + else + ut.expect(ut3_tester_helper.core.get_failed_expectations_n()).to_be_greater_than(0); + end if; + cleanup_expectations(); + end exec_be_between2; + + procedure exec_be_like(a_type varchar2, a_value varchar2, a_pattern varchar2, a_escape varchar2, a_result integer, a_prefix varchar2 default null) is + begin + execute immediate + 'declare + l_actual ' || a_type || ' := '||a_value||'; + l_pattern varchar2(32767) := :pattern; + l_escape_char varchar2(32767) := :a_escape; + l_result integer; + begin + ut3.ut.expect( l_actual ).' || a_prefix ||q'[to_be_like(l_pattern, l_escape_char); + end;]' + using a_pattern, a_escape; + if a_result = ut3_tester_helper.core.gc_success then + ut.expect(ut3_tester_helper.core.get_failed_expectations_n()).to_equal(0); + else + ut.expect(ut3_tester_helper.core.get_failed_expectations_n()).to_be_greater_than(0); + end if; + cleanup_expectations(); + end; + + procedure exec_match(a_type varchar2, a_actual_value varchar2, a_pattern varchar2, a_modifiers varchar2, a_result integer, a_not_prefix varchar2 default null) is + l_statement varchar2(32767); + begin + l_statement := + 'declare + l_actual '||a_type||' := '||a_actual_value||'; + l_pattern varchar2(32767) := :a_pattern; + l_modifiers varchar2(32767) := :a_modifiers; + l_result integer; + begin + ut3.ut.expect( l_actual ).'||a_not_prefix||'to_match(l_pattern, l_modifiers); + end;'; + execute immediate l_statement using a_pattern, a_modifiers; + if a_result = ut3_tester_helper.core.gc_success then + ut.expect(ut3_tester_helper.core.get_failed_expectations_n()).to_equal(0); + else + ut.expect(ut3_tester_helper.core.get_failed_expectations_n()).to_be_greater_than(0); + end if; + cleanup_expectations(); + end; + + procedure test_be_between2 is + begin + + --failure when value out of range + exec_be_between2('date', 'sysdate', 'sysdate-2', 'sysdate-1', ut3_tester_helper.core.gc_failure, ''); + exec_be_between2('number', '2.0', '1.99', '1.999', ut3_tester_helper.core.gc_failure, ''); + exec_be_between2('varchar2(1)', '''c''', '''a''', '''b''', ut3_tester_helper.core.gc_failure, ''); + exec_be_between2('timestamp', 'systimestamp+1', 'systimestamp-1', 'systimestamp', ut3_tester_helper.core.gc_failure, ''); + exec_be_between2('timestamp with local time zone', 'systimestamp+1', 'systimestamp-1', 'systimestamp', ut3_tester_helper.core.gc_failure, ''); + exec_be_between2('timestamp with time zone', 'systimestamp+1', 'systimestamp-1', 'systimestamp', ut3_tester_helper.core.gc_failure, ''); + exec_be_between2('interval year to month', '''2-2''', '''2-0''', '''2-1''', ut3_tester_helper.core.gc_failure, ''); + exec_be_between2('interval day to second', '''2 01:00:00''', '''2 00:59:58''', '''2 00:59:59''', ut3_tester_helper.core.gc_failure, ''); + + --success when value in range + exec_be_between2('date', 'sysdate', 'sysdate-1', 'sysdate+1', ut3_tester_helper.core.gc_success, ''); + exec_be_between2('number', '2.0', '1.99', '2.01', ut3_tester_helper.core.gc_success, ''); + exec_be_between2('varchar2(1)', '''b''', '''a''', '''c''', ut3_tester_helper.core.gc_success, ''); + exec_be_between2('timestamp', 'systimestamp', 'systimestamp-1', 'systimestamp+1', ut3_tester_helper.core.gc_success, ''); + exec_be_between2('timestamp with local time zone', 'systimestamp', 'systimestamp-1', 'systimestamp+1', ut3_tester_helper.core.gc_success, ''); + exec_be_between2('timestamp with time zone', 'systimestamp', 'systimestamp-1', 'systimestamp+1', ut3_tester_helper.core.gc_success, ''); + exec_be_between2('interval year to month', '''2-1''', '''2-0''', '''2-2''', ut3_tester_helper.core.gc_success, ''); + exec_be_between2('interval day to second', '''2 01:00:00''', '''2 00:59:58''', '''2 01:00:01''', ut3_tester_helper.core.gc_success, ''); + + --success when value not in range + exec_be_between2('date', 'sysdate', 'sysdate-2', 'sysdate-1', ut3_tester_helper.core.gc_success, 'not_'); + exec_be_between2('number', '2.0', '1.99', '1.999', ut3_tester_helper.core.gc_success, 'not_'); + exec_be_between2('varchar2(1)', '''c''', '''a''', '''b''', ut3_tester_helper.core.gc_success, 'not_'); + exec_be_between2('timestamp', 'systimestamp+1', 'systimestamp-1', 'systimestamp', ut3_tester_helper.core.gc_success, 'not_'); + exec_be_between2('timestamp with local time zone', 'systimestamp+1', 'systimestamp-1', 'systimestamp', ut3_tester_helper.core.gc_success, 'not_'); + exec_be_between2('timestamp with time zone', 'systimestamp+1', 'systimestamp-1', 'systimestamp', ut3_tester_helper.core.gc_success, 'not_'); + exec_be_between2('interval year to month', '''2-2''', '''2-0''', '''2-1''', ut3_tester_helper.core.gc_success, 'not_'); + exec_be_between2('interval day to second', '''2 01:00:00''', '''2 00:59:58''', '''2 00:59:59''', ut3_tester_helper.core.gc_success, 'not_'); + + --failure when value not out of range + exec_be_between2('date', 'sysdate', 'sysdate-1', 'sysdate+1', ut3_tester_helper.core.gc_failure, 'not_'); + exec_be_between2('number', '2.0', '1.99', '2.01', ut3_tester_helper.core.gc_failure, 'not_'); + exec_be_between2('varchar2(1)', '''b''', '''a''', '''c''', ut3_tester_helper.core.gc_failure, 'not_'); + exec_be_between2('timestamp', 'systimestamp', 'systimestamp-1', 'systimestamp+1', ut3_tester_helper.core.gc_failure, 'not_'); + exec_be_between2('timestamp with local time zone', 'systimestamp', 'systimestamp-1', 'systimestamp+1', ut3_tester_helper.core.gc_failure, 'not_'); + exec_be_between2('timestamp with time zone', 'systimestamp', 'systimestamp-1', 'systimestamp+1', ut3_tester_helper.core.gc_failure, 'not_'); + exec_be_between2('interval year to month', '''2-1''', '''2-0''', '''2-2''', ut3_tester_helper.core.gc_failure, 'not_'); + exec_be_between2('interval day to second', '''2 01:00:00''', '''2 00:59:58''', '''2 01:00:01''', ut3_tester_helper.core.gc_failure, 'not_'); + + --failure when value is null + exec_be_between2('date', 'null', 'sysdate-1', 'sysdate+1', ut3_tester_helper.core.gc_failure, ''); + exec_be_between2('number', 'null', '1.99', '2.01', ut3_tester_helper.core.gc_failure, ''); + exec_be_between2('varchar2(1)', 'null', '''a''', '''c''', ut3_tester_helper.core.gc_failure, ''); + exec_be_between2('timestamp', 'null', 'systimestamp-1', 'systimestamp+1', ut3_tester_helper.core.gc_failure, ''); + exec_be_between2('timestamp with local time zone', 'null', 'systimestamp-1', 'systimestamp+1', ut3_tester_helper.core.gc_failure, ''); + exec_be_between2('timestamp with time zone', 'null', 'systimestamp-1', 'systimestamp+1', ut3_tester_helper.core.gc_failure, ''); + exec_be_between2('interval year to month', 'null', '''2-0''', '''2-2''', ut3_tester_helper.core.gc_failure, ''); + exec_be_between2('interval day to second', 'null', '''2 00:59:58''', '''2 01:00:01''', ut3_tester_helper.core.gc_failure, ''); + + exec_be_between2('date', 'null', 'sysdate-2', 'sysdate-1', ut3_tester_helper.core.gc_failure, 'not_'); + exec_be_between2('number', 'null', '1.99', '1.999', ut3_tester_helper.core.gc_failure, 'not_'); + exec_be_between2('varchar2(1)', 'null', '''a''', '''b''', ut3_tester_helper.core.gc_failure, 'not_'); + exec_be_between2('timestamp', 'null', 'systimestamp-1', 'systimestamp', ut3_tester_helper.core.gc_failure, 'not_'); + exec_be_between2('timestamp with local time zone', 'null', 'systimestamp-1', 'systimestamp', ut3_tester_helper.core.gc_failure, 'not_'); + exec_be_between2('timestamp with time zone', 'null', 'systimestamp-1', 'systimestamp', ut3_tester_helper.core.gc_failure, 'not_'); + exec_be_between2('interval year to month', 'null', '''2-0''', '''2-1''', ut3_tester_helper.core.gc_failure, 'not_'); + exec_be_between2('interval day to second', 'null', '''2 00:59:58''', '''2 00:59:59''', ut3_tester_helper.core.gc_failure, 'not_'); + + --failure when lower bound is null + exec_be_between2('date', 'sysdate', 'null', 'sysdate+1', ut3_tester_helper.core.gc_failure, ''); + exec_be_between2('number', '2.0', 'null', '2.01', ut3_tester_helper.core.gc_failure, ''); + exec_be_between2('varchar2(1)', '''b''', 'null', '''c''', ut3_tester_helper.core.gc_failure, ''); + exec_be_between2('timestamp', 'systimestamp', 'null', 'systimestamp+1', ut3_tester_helper.core.gc_failure, ''); + exec_be_between2('timestamp with local time zone', 'systimestamp', 'null', 'systimestamp+1', ut3_tester_helper.core.gc_failure, ''); + exec_be_between2('timestamp with time zone', 'systimestamp', 'null', 'systimestamp+1', ut3_tester_helper.core.gc_failure, ''); + exec_be_between2('interval year to month', '''2-1''', 'null', '''2-2''', ut3_tester_helper.core.gc_failure, ''); + exec_be_between2('interval day to second', '''2 01:00:00''', 'null', '''2 01:00:01''', ut3_tester_helper.core.gc_failure, ''); + + exec_be_between2('date', 'sysdate', 'null', 'sysdate-1', ut3_tester_helper.core.gc_failure, 'not_'); + exec_be_between2('number', '2.0', 'null', '1.999', ut3_tester_helper.core.gc_failure, 'not_'); + exec_be_between2('varchar2(1)', '''b''', 'null', '''b''', ut3_tester_helper.core.gc_failure, 'not_'); + exec_be_between2('timestamp', 'systimestamp+1', 'null', 'systimestamp', ut3_tester_helper.core.gc_failure, 'not_'); + exec_be_between2('timestamp with local time zone', 'systimestamp+1', 'null', 'systimestamp', ut3_tester_helper.core.gc_failure, 'not_'); + exec_be_between2('timestamp with time zone', 'systimestamp+1', 'null', 'systimestamp', ut3_tester_helper.core.gc_failure, 'not_'); + exec_be_between2('interval year to month', '''2-2''', 'null', '''2-1''', ut3_tester_helper.core.gc_failure, 'not_'); + exec_be_between2('interval day to second', '''2 01:00:00''', 'null', '''2 00:59:59''', ut3_tester_helper.core.gc_failure, 'not_'); + --Fails for unsupported data-type + exec_be_between2('clob', '''b''', '''a''', '''c''', ut3_tester_helper.core.gc_failure, ''); + end; + + procedure test_match is + begin + exec_match('varchar2(100)', '''Stephen''', '^Ste(v|ph)en$', '', ut3_tester_helper.core.gc_success); + exec_match('varchar2(100)', '''sTEPHEN''', '^Ste(v|ph)en$', 'i', ut3_tester_helper.core.gc_success); + exec_match('clob', 'to_clob(rpad('', '',32767)||''Stephen'')', 'Ste(v|ph)en$', '', ut3_tester_helper.core.gc_success); + exec_match('clob', 'to_clob(rpad('', '',32767)||''sTEPHEN'')', 'Ste(v|ph)en$', 'i', ut3_tester_helper.core.gc_success); + + exec_match('varchar2(100)', '''Stephen''', '^Steven$', '', ut3_tester_helper.core.gc_failure); + exec_match('varchar2(100)', '''sTEPHEN''', '^Steven$', 'i', ut3_tester_helper.core.gc_failure); + exec_match('clob', 'to_clob(rpad('', '',32767)||''Stephen'')', '^Stephen', '', ut3_tester_helper.core.gc_failure); + exec_match('clob', 'to_clob(rpad('', '',32767)||''sTEPHEN'')', '^Stephen', 'i', ut3_tester_helper.core.gc_failure); + + exec_match('varchar2(100)', '''Stephen''', '^Ste(v|ph)en$', '', ut3_tester_helper.core.gc_failure, 'not_'); + exec_match('varchar2(100)', '''sTEPHEN''', '^Ste(v|ph)en$', 'i', ut3_tester_helper.core.gc_failure, 'not_'); + exec_match('clob', 'to_clob(rpad('', '',32767)||''Stephen'')', 'Ste(v|ph)en$', '', ut3_tester_helper.core.gc_failure, 'not_'); + exec_match('clob', 'to_clob(rpad('', '',32767)||''sTEPHEN'')', 'Ste(v|ph)en$', 'i', ut3_tester_helper.core.gc_failure, 'not_'); + + exec_match('varchar2(100)', '''Stephen''', '^Steven$', '', ut3_tester_helper.core.gc_success, 'not_'); + exec_match('varchar2(100)', '''sTEPHEN''', '^Steven$', 'i', ut3_tester_helper.core.gc_success, 'not_'); + exec_match('clob', 'to_clob(rpad('', '',32767)||''Stephen'')', '^Stephen', '', ut3_tester_helper.core.gc_success, 'not_'); + exec_match('clob', 'to_clob(rpad('', '',32767)||''sTEPHEN'')', '^Stephen', 'i', ut3_tester_helper.core.gc_success, 'not_'); + --Fails for unsupported data-type + exec_match('number', '12345', '^123.*', 'i', ut3_tester_helper.core.gc_failure); + end; + + procedure test_be_like is + begin + exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste__en%', '', ut3_tester_helper.core.gc_success); + exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste__en\_K%', '\', ut3_tester_helper.core.gc_success); + exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Ste__en%', '', ut3_tester_helper.core.gc_success); + exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Ste__en\_K%', '\', ut3_tester_helper.core.gc_success); + + exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste_en%', '', ut3_tester_helper.core.gc_failure); + exec_be_like('varchar2(100)', '''Stephen_King''', 'Stephe\__%', '\', ut3_tester_helper.core.gc_failure); + exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Ste_en%', '', ut3_tester_helper.core.gc_failure); + exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Stephe\__%', '\', ut3_tester_helper.core.gc_failure); + + exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste__en%', '', ut3_tester_helper.core.gc_failure, 'not_'); + exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste__en\_K%', '\', ut3_tester_helper.core.gc_failure, 'not_'); + exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Ste__en%', '', ut3_tester_helper.core.gc_failure, 'not_'); + exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Ste__en\_K%', '\', ut3_tester_helper.core.gc_failure, 'not_'); + + exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste_en%', '', ut3_tester_helper.core.gc_success, 'not_'); + exec_be_like('varchar2(100)', '''Stephen_King''', 'Stephe\__%', '\', ut3_tester_helper.core.gc_success, 'not_'); + exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Ste_en%', '', ut3_tester_helper.core.gc_success, 'not_'); + exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Stephe\__%', '\', ut3_tester_helper.core.gc_success, 'not_'); + + --Fails for unsupported data-type + exec_be_like('number', '12345', '123%', '', ut3_tester_helper.core.gc_failure); + end; + + procedure test_timestamp_between is + l_value timestamp := to_timestamp('1997-01-31 09:26:50.13','YYYY-MM-DD HH24.MI.SS.FF'); + l_value_lower timestamp := to_timestamp('1997-01-31 09:26:50.11','YYYY-MM-DD HH24.MI.SS.FF'); + l_value_upper timestamp := to_timestamp('1997-01-31 09:26:50.14','YYYY-MM-DD HH24.MI.SS.FF'); + begin + ut3.ut.expect(l_value).to_be_between(l_value_lower, l_value_upper); + ut3.ut.expect(l_value).not_to_be_between(l_value_upper, l_value_lower); + end; + + procedure test_timestamp_ltz_between is + l_value timestamp with local time zone := to_timestamp_tz('1997-01-31 09:26:50.12 +02:00','YYYY-MM-DD HH24.MI.SS.FF TZR'); + l_value_lower timestamp with local time zone := to_timestamp_tz('1997-01-31 09:26:50.12 +03:00','YYYY-MM-DD HH24.MI.SS.FF TZR'); + l_value_upper timestamp with local time zone := to_timestamp_tz('1997-01-31 09:26:50.12 +01:00','YYYY-MM-DD HH24.MI.SS.FF TZR'); + begin + ut3.ut.expect(l_value).to_be_between(l_value_lower, l_value_upper); + ut3.ut.expect(l_value).not_to_be_between(l_value_upper, l_value_lower); + end; + + procedure test_timestamp_tz_between is + l_value timestamp with time zone := to_timestamp_tz('1997-01-31 09:26:50.12 +02:00','YYYY-MM-DD HH24.MI.SS.FF TZR'); + l_value_lower timestamp with time zone := to_timestamp_tz('1997-01-31 09:26:50.12 +03:00','YYYY-MM-DD HH24.MI.SS.FF TZR'); + l_value_upper timestamp with time zone := to_timestamp_tz('1997-01-31 09:26:50.12 +01:00','YYYY-MM-DD HH24.MI.SS.FF TZR'); + begin + ut3.ut.expect(l_value).to_be_between(l_value_lower, l_value_upper); + ut3.ut.expect(l_value).not_to_be_between(l_value_upper, l_value_lower); + end; + +end test_matchers; +/ diff --git a/test/ut3_user/expectations/test_matchers.pks b/test/ut3_user/expectations/test_matchers.pks new file mode 100644 index 000000000..b8fc699ee --- /dev/null +++ b/test/ut3_user/expectations/test_matchers.pks @@ -0,0 +1,27 @@ +create or replace package test_matchers is + + --%suite(matchers) + --%suitepath(utplsql.core.expectations) + + --%aftereach + procedure cleanup_expectations; + + --%test + procedure test_be_between2; + --%test + procedure test_match; + + --%test + procedure test_be_like; + + --%test + procedure test_timestamp_between; + + --%test + procedure test_timestamp_ltz_between; + + --%test + procedure test_timestamp_tz_between; + +end test_matchers; +/ From 45ee7189235da8e5b155e851af2b476f1d7dd0b7 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sat, 23 Mar 2019 10:30:29 +0000 Subject: [PATCH 0334/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- sonar-project.properties | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 958edffb7..ea1b14532 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 0d4ef9a1b..bfc8787fc 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 825f34e80..0141a5603 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 11c73b5bc..d5483477a 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 8958a9124..e891e068f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 6e6b24424..b145d8811 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 6b18d47bf..af0b0a9b6 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index edbef3375..728e085aa 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 554be9e79..91106af7c 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index f89442db3..9facf6c54 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 1cea724b5..6e9355165 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index f1b745028..50e26324b 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 74e41c267..894f64502 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 2cd946947..84dcf5bed 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index b3d86c3af..4a7f42883 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 6351abdff..92884dfb5 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index a6f6cf162..6119fb7dd 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.5.2724--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) # Upgrading from version 2 diff --git a/sonar-project.properties b/sonar-project.properties index 328716448..4aeacef11 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,7 @@ sonar.projectKey=utPLSQL # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=utPLSQL -sonar.projectVersion=v3.1.5-develop +sonar.projectVersion=v3.1.6-develop # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # Since SonarQube 4.2, this property is optional if sonar.modules is set. diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 69ce66a10..98b574592 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.5.2724-develop'; + gc_version constant varchar2(50) := 'v3.1.6.2725-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 4a9a77d9bb9ee25eb6045ed28193568ba1f1e3d1 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 24 Mar 2019 11:07:35 +0000 Subject: [PATCH 0335/1096] Updated `releasing.md` --- development/releasing.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/development/releasing.md b/development/releasing.md index 7c8d779ef..71e37d6fb 100644 --- a/development/releasing.md +++ b/development/releasing.md @@ -10,7 +10,9 @@ To create a release: - merge the release branch to master and wait for master build to complete successfully - create a release from the master branch using [github releases page](https://github.com/utPLSQL/utPLSQL/releases) and populate release description using information found on the issues and pull requests since previous release. To find issues closed after certain date use [advanced filters](https://help.github.com/articles/searching-issues-and-pull-requests/#search-by-open-or-closed-state). - Example: [`is:issue closed:>2018-07-22`](https://github.com/utPLSQL/utPLSQL/issues?utf8=%E2%9C%93&q=is%3Aissue+closed%3A%3E2018-07-22+) + Example: [`is:issue closed:>2018-07-22`](https://github.com/utPLSQL/utPLSQL/issues?utf8=%E2%9C%93&q=is%3Aissue+closed%3A%3E2018-07-22+) + - After release was successfully built, merge master branch back into develop branch + - After develop branch was built, update version number in `VERSION` file to represent next planned release version. The following will happen: - build executed on branch `release/vX.Y.Z-[something]` updates files `sonar-project.properties`, `VERSION` with project version derived from the release branch name From 8e10d80123282e318d3b8546fc6e1aea99398570 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sun, 24 Mar 2019 11:18:32 +0000 Subject: [PATCH 0336/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index ea1b14532..7a8ca5c68 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index bfc8787fc..1230b970b 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 0141a5603..3ac2cb29d 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index d5483477a..af030f457 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index e891e068f..9cf0ebdc0 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index b145d8811..f7dcb3a73 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index af0b0a9b6..ca3a091b3 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 728e085aa..bc3dbf502 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 91106af7c..c65b3cb27 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 9facf6c54..02261a0ca 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 6e9355165..a686045bc 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 50e26324b..d08e14f70 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 894f64502..5c4800540 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 84dcf5bed..97904427c 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 4a7f42883..557931bc8 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 92884dfb5..ef7766c99 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 6119fb7dd..3e069cb9c 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2725--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 98b574592..7e3d45aa9 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.6.2725-develop'; + gc_version constant varchar2(50) := 'v3.1.6.2726-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From bc99d11da40057ea3de0c58069840e309034749f Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 24 Mar 2019 11:25:43 +0000 Subject: [PATCH 0337/1096] Updated `releasing.md` --- development/releasing.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/development/releasing.md b/development/releasing.md index 71e37d6fb..3d2eed97d 100644 --- a/development/releasing.md +++ b/development/releasing.md @@ -12,7 +12,8 @@ To create a release: To find issues closed after certain date use [advanced filters](https://help.github.com/articles/searching-issues-and-pull-requests/#search-by-open-or-closed-state). Example: [`is:issue closed:>2018-07-22`](https://github.com/utPLSQL/utPLSQL/issues?utf8=%E2%9C%93&q=is%3Aissue+closed%3A%3E2018-07-22+) - After release was successfully built, merge master branch back into develop branch - - After develop branch was built, update version number in `VERSION` file to represent next planned release version. + - After develop branch was built, update version number in `VERSION` file to represent next planned release version. + - Clone `utplsql.githug.io` project and add a new announcement about next version being released in `_posts`. Use previous announcements as a template. Make sure to set date, time and post title properly. The following will happen: - build executed on branch `release/vX.Y.Z-[something]` updates files `sonar-project.properties`, `VERSION` with project version derived from the release branch name From c5b9d33a903a5d010cc3e7a2ff1468c89298d4f5 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sun, 24 Mar 2019 11:46:30 +0000 Subject: [PATCH 0338/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 7a8ca5c68..c7e47af14 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 1230b970b..3c63c6178 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 3ac2cb29d..4e72a7176 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index af030f457..5deeab762 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 9cf0ebdc0..0ed40c660 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index f7dcb3a73..0d1d34157 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index ca3a091b3..0b1c2b75e 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index bc3dbf502..fc64798f4 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index c65b3cb27..94d920114 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 02261a0ca..4493a89fa 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index a686045bc..853690426 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index d08e14f70..f80a8ef70 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 5c4800540..5e432e894 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 97904427c..d24d2ba1d 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 557931bc8..44f754cf6 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index ef7766c99..8e8876485 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 3e069cb9c..43a4c3a4a 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2726--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 7e3d45aa9..0b757f0b2 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.6.2726-develop'; + gc_version constant varchar2(50) := 'v3.1.6.2727-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From b9df5b5b1e60d4894e7980ef316099e3061125c8 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sun, 24 Mar 2019 12:38:35 +0000 Subject: [PATCH 0339/1096] Update release version --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 1bf2d5a2b..d80dc339d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.6-develop +v3.1.6 From 03cd30d03dd57a01b9ee7de75479ed66031e8b89 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 24 Mar 2019 12:39:56 +0000 Subject: [PATCH 0340/1096] Updated `install.md` --- docs/userguide/install.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 5e432e894..856147eb6 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -9,7 +9,7 @@ To download latest version of utPLSQL from github on both Unix/Linux as well as ```bash #!/bin/bash # Get the url to latest release "zip" file -UTPLSQL_DOWNLOAD_URL=$(curl --silent https://api.github.com/repos/utPLSQL/utPLSQL/releases/latest | awk '/browser_download_url/ { print $2 }' | grep ".zip" | sed 's/"//g') +UTPLSQL_DOWNLOAD_URL=$(curl --silent https://api.github.com/repos/utPLSQL/utPLSQL/releases/latest | awk '/browser_download_url/ { print $2 }' | grep ".zip\"" | sed 's/"//g') # Download the latest release "zip" file curl -Lk "${UTPLSQL_DOWNLOAD_URL}" -o utPLSQL.zip # Extract downloaded "zip" file @@ -19,7 +19,7 @@ unzip -q utPLSQL.zip You may download with a one-liner if that is more convenient. ```bash #!/bin/bash -curl -LOk $(curl --silent https://api.github.com/repos/utPLSQL/utPLSQL/releases/latest | awk '/browser_download_url/ { print $2 }' | grep ".zip" | sed 's/"//g') +curl -LOk $(curl --silent https://api.github.com/repos/utPLSQL/utPLSQL/releases/latest | awk '/browser_download_url/ { print $2 }' | grep ".zip\"" | sed 's/"//g') ``` ## Windows From 405bb7ce5c3459fe46d8d485222fafcb65bc1089 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sun, 24 Mar 2019 12:48:42 +0000 Subject: [PATCH 0341/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index c7e47af14..16e036afa 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2728--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 3c63c6178..5666e0a7e 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2728--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 4e72a7176..1bd2a7b6d 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2728--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 5deeab762..4428c63c4 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2728--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 0ed40c660..c93add857 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2728--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 0d1d34157..ac7734471 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2728--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 0b1c2b75e..862c84ac6 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2728--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index fc64798f4..32eb5d424 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2728--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 94d920114..1ddf12826 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2728--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 4493a89fa..3f207a7fd 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2728--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 853690426..a56bbac2b 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2728--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index f80a8ef70..e9c989dd9 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2728--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 5e432e894..6c2cfba87 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2728--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index d24d2ba1d..0f3bc2842 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2728--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 44f754cf6..902dd718b 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2728--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 8e8876485..9b4a64558 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2728--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 43a4c3a4a..3edd05d88 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2728--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 0b757f0b2..6ea493401 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.6.2727-develop'; + gc_version constant varchar2(50) := 'v3.1.6.2728-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From f75d796544d6f0958385327677e8caaeb76f76f3 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sun, 24 Mar 2019 13:06:23 +0000 Subject: [PATCH 0342/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- sonar-project.properties | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index c7e47af14..b3abfac6c 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 3c63c6178..b55ca2d4d 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 4e72a7176..51c135cfc 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 5deeab762..4a7720d37 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 0ed40c660..772c7d463 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 0d1d34157..63f0461f6 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 0b1c2b75e..4e888ee95 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index fc64798f4..b47b90c91 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 94d920114..4f2a30688 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 4493a89fa..2a220efad 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 853690426..25de3c652 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index f80a8ef70..6f59dc759 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 5e432e894..0a47fcfd1 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index d24d2ba1d..50aa661f5 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 44f754cf6..104795ded 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 8e8876485..3703fa4d8 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 43a4c3a4a..b803a671a 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2727--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) # Upgrading from version 2 diff --git a/sonar-project.properties b/sonar-project.properties index 4aeacef11..c137871ee 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,7 @@ sonar.projectKey=utPLSQL # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=utPLSQL -sonar.projectVersion=v3.1.6-develop +sonar.projectVersion=v3.1.6 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # Since SonarQube 4.2, this property is optional if sonar.modules is set. diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 0b757f0b2..a9ecf9ac6 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.6.2727-develop'; + gc_version constant varchar2(50) := 'v3.1.6.2729'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 9db8f4b513fe1e9f5cc82c1fcb3763585d9d6bef Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sat, 23 Mar 2019 20:24:01 +0000 Subject: [PATCH 0343/1096] Separating tests. --- test/api/test_ut_run.pkb | 1016 ----------- test/api/test_ut_run.pks | 148 -- .../test_annot_throws_exception.pkb | 375 ----- .../test_annot_throws_exception.pks | 76 - .../annotations/test_annotation_manager.pkb | 306 ---- .../annotations/test_annotation_manager.pks | 55 - .../annotations/test_annotation_parser.pkb | 461 ----- .../annotations/test_annotation_parser.pks | 42 - test/core/expectations.pkb | 67 - test/core/expectations.pks | 29 - .../binary/test_be_greater_or_equal.pkb | 263 --- .../binary/test_be_greater_or_equal.pks | 97 -- .../binary/test_be_greater_than.pkb | 263 --- .../binary/test_be_greater_than.pks | 97 -- .../binary/test_be_less_or_equal.pkb | 263 --- .../binary/test_be_less_or_equal.pks | 97 -- test/core/expectations/binary/test_equal.pkb | 264 --- test/core/expectations/binary/test_equal.pks | 38 - .../binary/test_expect_to_be_less_than.pkb | 263 --- .../binary/test_expect_to_be_less_than.pks | 97 -- .../expectations/test_expectation_anydata.pkb | 974 ----------- .../expectations/test_expectation_anydata.pks | 202 --- .../test_expectation_processor.pkb | 71 - .../test_expectation_processor.pks | 17 - test/core/expectations/test_matchers.pkb | 270 --- test/core/expectations/test_matchers.pks | 27 - .../unary/test_expect_not_to_be_null.pkb | 265 --- .../unary/test_expect_not_to_be_null.pks | 97 -- .../unary/test_expect_to_be_empty.pkb | 271 --- .../unary/test_expect_to_be_empty.pks | 93 - .../unary/test_expect_to_be_not_null.pkb | 264 --- .../unary/test_expect_to_be_not_null.pks | 97 -- .../unary/test_expect_to_be_null.pkb | 260 --- .../unary/test_expect_to_be_null.pks | 97 -- .../unary/test_expect_to_be_true_false.pkb | 139 -- .../unary/test_expect_to_be_true_false.pks | 58 - .../unary/test_expect_to_have_count.pkb | 210 --- .../unary/test_expect_to_have_count.pks | 61 - .../min_grant_user/test_min_grant_user.pkb | 71 - .../min_grant_user/test_min_grant_user.pks | 25 - test/core/reporters.pkb | 150 -- test/core/reporters.pks | 18 - test/core/reporters/test_coverage.pkb | 262 --- test/core/reporters/test_coverage.pks | 40 - .../test_cov_cobertura_reporter.pkb | 45 - .../test_cov_cobertura_reporter.pks | 10 - .../test_coverage_sonar_reporter.pkb | 39 - .../test_coverage_sonar_reporter.pks | 13 - .../test_coverage/test_coveralls_reporter.pkb | 85 - .../test_coverage/test_coveralls_reporter.pks | 13 - .../test_html_extended_reporter.pkb | 29 - .../test_html_extended_reporter.pks | 10 - .../test_html_proftab_reporter.pkb | 29 - .../test_html_proftab_reporter.pks | 10 - test/core/reporters/test_debug_reporter.pkb | 45 - test/core/reporters/test_debug_reporter.pks | 16 - .../reporters/test_documentation_reporter.pkb | 1 - .../reporters/test_documentation_reporter.pks | 10 - .../core/reporters/test_extended_coverage.pkb | 188 --- .../core/reporters/test_extended_coverage.pks | 22 - test/core/reporters/test_junit_reporter.pkb | 353 ---- test/core/reporters/test_junit_reporter.pks | 51 - .../core/reporters/test_realtime_reporter.pkb | 401 ----- .../core/reporters/test_realtime_reporter.pks | 55 - .../reporters/test_sonar_test_reporter.pkb | 36 - .../reporters/test_sonar_test_reporter.pks | 13 - .../core/reporters/test_teamcity_reporter.pkb | 131 -- .../core/reporters/test_teamcity_reporter.pks | 22 - .../reporters/test_tfs_junit_reporter.pkb | 207 --- .../reporters/test_tfs_junit_reporter.pks | 39 - test/core/test_file_mapper.pkb | 45 - test/core/test_file_mapper.pks | 13 - test/core/test_output_buffer.pkb | 95 -- test/core/test_output_buffer.pks | 19 - test/core/test_suite_builder.pkb | 1118 ------------ test/core/test_suite_builder.pks | 176 -- test/core/test_suite_manager.pkb | 1497 ----------------- test/core/test_suite_manager.pks | 175 -- test/core/test_ut_executable.pkb | 109 -- test/core/test_ut_executable.pks | 33 - test/core/test_ut_suite.pkb | 159 -- test/core/test_ut_suite.pks | 40 - test/core/test_ut_test.pkb | 697 -------- test/core/test_ut_test.pks | 94 -- test/core/test_ut_utils.pkb | 436 ----- test/core/test_ut_utils.pks | 132 -- test/helpers/other_dummy_object.tps | 16 - test/helpers/test_dummy_object_list.tps | 4 - test/helpers/test_event_list.tps | 2 - test/helpers/test_event_object.tps | 15 - test/helpers/test_tab_varchar2.tps | 12 - test/helpers/test_tab_varray.tps | 13 - test/helpers/ut3user#.test_cursor_grants.pkb | 114 -- test/helpers/ut3user#.test_cursor_grants.pks | 30 - test/helpers/ut_example_tests.pkb | 24 - test/helpers/ut_example_tests.pks | 8 - test/helpers/ut_test_table.sql | 11 - test/helpers/ut_with_invalid_body.pkb | 4 - test/helpers/ut_with_invalid_body.pks | 4 - test/helpers/ut_without_body.pks | 4 - test/install_and_run_tests.sh | 8 +- test/install_ut3_tester_helper.sql | 15 +- test/install_ut3_tester_tests.sql | 41 + test/install_ut3_user_tests.sql | 11 + .../test_before_after_annotations.pkb | 2 +- .../test_before_after_annotations.pks | 0 .../core}/core.pkb | 0 .../core}/core.pks | 2 +- test/ut3_tester_helper/main_helper.pkb | 90 + test/ut3_tester_helper/main_helper.pks | 27 + test/ut3_tester_helper/run_helper.pkb | 91 + test/ut3_tester_helper/run_helper.pks | 9 + .../test_dummy_object.tps | 0 test/{ => ut3_user}/api/test_ut_runner.pkb | 134 +- test/{ => ut3_user}/api/test_ut_runner.pks | 0 .../expectations/test_expectations_cursor.pkb | 348 ++-- .../expectations/test_expectations_cursor.pks | 7 +- test/ut3_user/expectations/test_matchers.pkb | 230 +-- 118 files changed, 651 insertions(+), 15692 deletions(-) delete mode 100644 test/api/test_ut_run.pkb delete mode 100644 test/api/test_ut_run.pks delete mode 100644 test/core/annotations/test_annot_throws_exception.pkb delete mode 100644 test/core/annotations/test_annot_throws_exception.pks delete mode 100644 test/core/annotations/test_annotation_manager.pkb delete mode 100644 test/core/annotations/test_annotation_manager.pks delete mode 100644 test/core/annotations/test_annotation_parser.pkb delete mode 100644 test/core/annotations/test_annotation_parser.pks delete mode 100644 test/core/expectations.pkb delete mode 100644 test/core/expectations.pks delete mode 100644 test/core/expectations/binary/test_be_greater_or_equal.pkb delete mode 100644 test/core/expectations/binary/test_be_greater_or_equal.pks delete mode 100644 test/core/expectations/binary/test_be_greater_than.pkb delete mode 100644 test/core/expectations/binary/test_be_greater_than.pks delete mode 100644 test/core/expectations/binary/test_be_less_or_equal.pkb delete mode 100644 test/core/expectations/binary/test_be_less_or_equal.pks delete mode 100644 test/core/expectations/binary/test_equal.pkb delete mode 100644 test/core/expectations/binary/test_equal.pks delete mode 100644 test/core/expectations/binary/test_expect_to_be_less_than.pkb delete mode 100644 test/core/expectations/binary/test_expect_to_be_less_than.pks delete mode 100644 test/core/expectations/test_expectation_anydata.pkb delete mode 100644 test/core/expectations/test_expectation_anydata.pks delete mode 100644 test/core/expectations/test_expectation_processor.pkb delete mode 100644 test/core/expectations/test_expectation_processor.pks delete mode 100644 test/core/expectations/test_matchers.pkb delete mode 100644 test/core/expectations/test_matchers.pks delete mode 100644 test/core/expectations/unary/test_expect_not_to_be_null.pkb delete mode 100644 test/core/expectations/unary/test_expect_not_to_be_null.pks delete mode 100644 test/core/expectations/unary/test_expect_to_be_empty.pkb delete mode 100644 test/core/expectations/unary/test_expect_to_be_empty.pks delete mode 100644 test/core/expectations/unary/test_expect_to_be_not_null.pkb delete mode 100644 test/core/expectations/unary/test_expect_to_be_not_null.pks delete mode 100644 test/core/expectations/unary/test_expect_to_be_null.pkb delete mode 100644 test/core/expectations/unary/test_expect_to_be_null.pks delete mode 100644 test/core/expectations/unary/test_expect_to_be_true_false.pkb delete mode 100644 test/core/expectations/unary/test_expect_to_be_true_false.pks delete mode 100644 test/core/expectations/unary/test_expect_to_have_count.pkb delete mode 100644 test/core/expectations/unary/test_expect_to_have_count.pks delete mode 100644 test/core/min_grant_user/test_min_grant_user.pkb delete mode 100644 test/core/min_grant_user/test_min_grant_user.pks delete mode 100644 test/core/reporters.pkb delete mode 100644 test/core/reporters.pks delete mode 100644 test/core/reporters/test_coverage.pkb delete mode 100644 test/core/reporters/test_coverage.pks delete mode 100644 test/core/reporters/test_coverage/test_cov_cobertura_reporter.pkb delete mode 100644 test/core/reporters/test_coverage/test_cov_cobertura_reporter.pks delete mode 100644 test/core/reporters/test_coverage/test_coverage_sonar_reporter.pkb delete mode 100644 test/core/reporters/test_coverage/test_coverage_sonar_reporter.pks delete mode 100644 test/core/reporters/test_coverage/test_coveralls_reporter.pkb delete mode 100644 test/core/reporters/test_coverage/test_coveralls_reporter.pks delete mode 100644 test/core/reporters/test_coverage/test_html_extended_reporter.pkb delete mode 100644 test/core/reporters/test_coverage/test_html_extended_reporter.pks delete mode 100644 test/core/reporters/test_coverage/test_html_proftab_reporter.pkb delete mode 100644 test/core/reporters/test_coverage/test_html_proftab_reporter.pks delete mode 100644 test/core/reporters/test_debug_reporter.pkb delete mode 100644 test/core/reporters/test_debug_reporter.pks delete mode 100644 test/core/reporters/test_documentation_reporter.pkb delete mode 100644 test/core/reporters/test_documentation_reporter.pks delete mode 100644 test/core/reporters/test_extended_coverage.pkb delete mode 100644 test/core/reporters/test_extended_coverage.pks delete mode 100644 test/core/reporters/test_junit_reporter.pkb delete mode 100644 test/core/reporters/test_junit_reporter.pks delete mode 100644 test/core/reporters/test_realtime_reporter.pkb delete mode 100644 test/core/reporters/test_realtime_reporter.pks delete mode 100644 test/core/reporters/test_sonar_test_reporter.pkb delete mode 100644 test/core/reporters/test_sonar_test_reporter.pks delete mode 100644 test/core/reporters/test_teamcity_reporter.pkb delete mode 100644 test/core/reporters/test_teamcity_reporter.pks delete mode 100644 test/core/reporters/test_tfs_junit_reporter.pkb delete mode 100644 test/core/reporters/test_tfs_junit_reporter.pks delete mode 100644 test/core/test_file_mapper.pkb delete mode 100644 test/core/test_file_mapper.pks delete mode 100644 test/core/test_output_buffer.pkb delete mode 100644 test/core/test_output_buffer.pks delete mode 100644 test/core/test_suite_builder.pkb delete mode 100644 test/core/test_suite_builder.pks delete mode 100644 test/core/test_suite_manager.pkb delete mode 100644 test/core/test_suite_manager.pks delete mode 100644 test/core/test_ut_executable.pkb delete mode 100644 test/core/test_ut_executable.pks delete mode 100644 test/core/test_ut_suite.pkb delete mode 100644 test/core/test_ut_suite.pks delete mode 100644 test/core/test_ut_test.pkb delete mode 100644 test/core/test_ut_test.pks delete mode 100644 test/core/test_ut_utils.pkb delete mode 100644 test/core/test_ut_utils.pks delete mode 100644 test/helpers/other_dummy_object.tps delete mode 100644 test/helpers/test_dummy_object_list.tps delete mode 100644 test/helpers/test_event_list.tps delete mode 100644 test/helpers/test_event_object.tps delete mode 100644 test/helpers/test_tab_varchar2.tps delete mode 100644 test/helpers/test_tab_varray.tps delete mode 100644 test/helpers/ut3user#.test_cursor_grants.pkb delete mode 100644 test/helpers/ut3user#.test_cursor_grants.pks delete mode 100644 test/helpers/ut_example_tests.pkb delete mode 100644 test/helpers/ut_example_tests.pks delete mode 100644 test/helpers/ut_test_table.sql delete mode 100644 test/helpers/ut_with_invalid_body.pkb delete mode 100644 test/helpers/ut_with_invalid_body.pks delete mode 100644 test/helpers/ut_without_body.pks create mode 100644 test/install_ut3_tester_tests.sql rename test/{ => ut3_tester}/core/annotations/test_before_after_annotations.pkb (99%) rename test/{ => ut3_tester}/core/annotations/test_before_after_annotations.pks (100%) rename test/{ut3_tester_helper => ut3_tester/core}/core.pkb (100%) rename test/{ut3_tester_helper => ut3_tester/core}/core.pks (94%) create mode 100644 test/ut3_tester_helper/main_helper.pkb create mode 100644 test/ut3_tester_helper/main_helper.pks create mode 100644 test/ut3_tester_helper/run_helper.pkb create mode 100644 test/ut3_tester_helper/run_helper.pks rename test/{helpers => ut3_tester_helper}/test_dummy_object.tps (100%) rename test/{ => ut3_user}/api/test_ut_runner.pkb (75%) rename test/{ => ut3_user}/api/test_ut_runner.pks (100%) rename test/{core => ut3_user}/expectations/test_expectations_cursor.pkb (84%) rename test/{core => ut3_user}/expectations/test_expectations_cursor.pks (98%) diff --git a/test/api/test_ut_run.pkb b/test/api/test_ut_run.pkb deleted file mode 100644 index 9e9fce0f7..000000000 --- a/test/api/test_ut_run.pkb +++ /dev/null @@ -1,1016 +0,0 @@ -create or replace package body test_ut_run is - - --%test(ut.version() returns version of the framework) - procedure ut_version is - begin - ut.expect(ut3.ut.version()).to_match('^v\d+\.\d+\.\d+\.\d+(-\w+)?$'); - end; - - --%test(ut.fail() marks test as failed) - procedure ut_fail is - begin - --Act - ut3.ut.fail('Testing failure message'); - --Assert - ut.expect( - xmltype(anydata.convertCollection(ut3.ut_expectation_processor.get_failed_expectations())).getClobVal() - ).to_be_like('%2%Testing failure message%'); - --Cleanup - ut3.ut_expectation_processor.clear_expectations(); - end; - - procedure create_ut3$user#_tests is - pragma autonomous_transaction; - begin - execute immediate q'[create or replace package ut3$user#.test_package_1 is - --%suite - --%suitepath(tests) - - --%test(Test1 from test package 1) - procedure test1; - - --%test(Test2 from test package 1) - procedure test2; - - procedure run(a_reporter ut3.ut_reporter_base := null); - procedure run(a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base); - procedure run(a_path varchar2, a_reporter ut3.ut_reporter_base := null); - procedure run(a_path varchar2, a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base); - procedure run(a_paths ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base := null); - procedure run(a_paths ut3.ut_varchar2_list, a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base); - function run(a_reporter ut3.ut_reporter_base := null) return ut3.ut_varchar2_list; - function run(a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base) return ut3.ut_varchar2_list; - function run(a_path varchar2, a_reporter ut3.ut_reporter_base := null) return ut3.ut_varchar2_list; - function run(a_path varchar2, a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base) return ut3.ut_varchar2_list; - function run(a_paths ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base := null) return ut3.ut_varchar2_list; - function run(a_paths ut3.ut_varchar2_list, a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base) return ut3.ut_varchar2_list; - - end test_package_1; - ]'; - execute immediate q'[create or replace package body ut3$user#.test_package_1 is - procedure test1 is - begin - dbms_output.put_line('test_package_1.test1 executed'); - end; - procedure test2 is - begin - dbms_output.put_line('test_package_1.test2 executed'); - end; - - procedure run(a_reporter ut3.ut_reporter_base := null) is - begin - ut3.ut.run(a_reporter); - end; - procedure run(a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base) is - begin - ut3.ut.run( - a_reporter, a_source_files => ut3.ut_varchar2_list(), - a_test_files => a_test_files - ); - end; - procedure run(a_path varchar2, a_reporter ut3.ut_reporter_base := null) is - begin - ut3.ut.run(a_path, a_reporter); - end; - procedure run(a_path varchar2, a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base) is - begin - ut3.ut.run( - a_path, - a_reporter, a_source_files => ut3.ut_varchar2_list(), - a_test_files => a_test_files - ); - end; - procedure run(a_paths ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base := null) is - begin - ut3.ut.run(a_paths, a_reporter); - end; - procedure run(a_paths ut3.ut_varchar2_list, a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base) is - begin - ut3.ut.run( - a_paths, - a_reporter, a_source_files => ut3.ut_varchar2_list(), - a_test_files => a_test_files - ); - end; - - function run(a_reporter ut3.ut_reporter_base := null) return ut3.ut_varchar2_list is - l_results ut3.ut_varchar2_list; - begin - select * bulk collect into l_results from table (ut3.ut.run(a_reporter)); - return l_results; - end; - function run(a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base) return ut3.ut_varchar2_list is - l_results ut3.ut_varchar2_list; - begin - select * bulk collect into l_results from table ( - ut3.ut.run( - a_reporter, a_source_files => ut3.ut_varchar2_list(), - a_test_files => a_test_files - )); - return l_results; - end; - function run(a_path varchar2, a_reporter ut3.ut_reporter_base := null) return ut3.ut_varchar2_list is - l_results ut3.ut_varchar2_list; - begin - select * bulk collect into l_results from table (ut3.ut.run(a_path, a_reporter)); - return l_results; - end; - function run(a_path varchar2, a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base) return ut3.ut_varchar2_list is - l_results ut3.ut_varchar2_list; - begin - select * bulk collect into l_results from table ( - ut3.ut.run( - a_path, - a_reporter, a_source_files => ut3.ut_varchar2_list(), - a_test_files => a_test_files - )); - return l_results; - end; - function run(a_paths ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base := null) return ut3.ut_varchar2_list is - l_results ut3.ut_varchar2_list; - begin - select * bulk collect into l_results from table (ut3.ut.run(a_paths, a_reporter)); - return l_results; - end; - function run(a_paths ut3.ut_varchar2_list, a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base) return ut3.ut_varchar2_list is - l_results ut3.ut_varchar2_list; - begin - select * bulk collect into l_results from table ( - ut3.ut.run( - a_paths, - a_reporter, a_source_files => ut3.ut_varchar2_list(), - a_test_files => a_test_files - )); - return l_results; - end; - end test_package_1; - ]'; - - execute immediate q'[create or replace package ut3$user#.test_package_2 is - --%suite - --%suitepath(tests.test_package_1) - - --%test - procedure test1; - - --%test - procedure test2; - - end test_package_2; - ]'; - execute immediate q'[create or replace package body ut3$user#.test_package_2 is - procedure test1 is - begin - dbms_output.put_line('test_package_2.test1 executed'); - end; - procedure test2 is - begin - dbms_output.put_line('test_package_2.test2 executed'); - end; - end test_package_2; - ]'; - - execute immediate q'[create or replace package ut3$user#.test_package_3 is - --%suite - --%suitepath(tests2) - - --%test - procedure test1; - - --%test - procedure test2; - - end test_package_3; - ]'; - execute immediate q'[create or replace package body ut3$user#.test_package_3 is - procedure test1 is - begin - dbms_output.put_line('test_package_3.test1 executed'); - end; - procedure test2 is - begin - dbms_output.put_line('test_package_3.test2 executed'); - end; - end test_package_3; - ]'; - end; - - procedure drop_ut3$user#_tests is - pragma autonomous_transaction; - begin - execute immediate q'[drop package ut3$user#.test_package_1]'; - execute immediate q'[drop package ut3$user#.test_package_2]'; - execute immediate q'[drop package ut3$user#.test_package_3]'; - end; - - procedure run_proc_no_params is - l_results clob; - begin - execute immediate 'begin ut3$user#.test_package_1.run(); end;'; - l_results := core.get_dbms_output_as_clob(); - --Assert - ut.expect( l_results ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); - end; - - procedure run_proc_specific_reporter is - l_results clob; - begin - --Act - execute immediate 'begin ut3$user#.test_package_1.run(:a_reporter); end;' - using in ut3.ut_documentation_reporter(); - l_results := core.get_dbms_output_as_clob(); - --Assert - ut.expect( l_results ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); - end; - - procedure run_proc_cov_file_list is - l_results clob; - begin - --Act - execute immediate 'begin ut3$user#.test_package_1.run(a_test_files=>:a_test_files, a_reporter=>:a_reporter); end;' - using - in ut3.ut_varchar2_list('tests/ut3$user#.test_package_1.pkb','tests/ut3$user#.test_package_2.pkb','tests/ut3$user#.test_package_3.pkb'), - in ut3.ut_sonar_test_reporter(); - l_results := core.get_dbms_output_as_clob(); - --Assert - ut.expect( l_results ).to_be_like( '%tests/ut3$user#.test_package_2.pkb%tests/ut3$user#.test_package_1.pkb%tests/ut3$user#.test_package_3.pkb%' ); - end; - - procedure run_proc_pkg_name is - l_results clob; - begin - execute immediate 'begin ut3$user#.test_package_1.run(:a_path); end;' - using in 'test_package_1'; - l_results := core.get_dbms_output_as_clob(); - --Assert - ut.expect( l_results ).to_be_like( '%test_package_1%' ); - ut.expect( l_results ).not_to_be_like( '%test_package_2%' ); - ut.expect( l_results ).not_to_be_like( '%test_package_3%' ); - end; - - procedure run_proc_pkg_name_file_list is - l_results clob; - begin - execute immediate 'begin ut3$user#.test_package_1.run(:a_path, :a_test_files, :a_reporter); end;' - using - in 'test_package_3', - in ut3.ut_varchar2_list('tests/ut3$user#.test_package_1.pkb','tests/ut3$user#.test_package_2.pkb','tests/ut3$user#.test_package_3.pkb'), - in ut3.ut_sonar_test_reporter(); - l_results := core.get_dbms_output_as_clob(); - --Assert - ut.expect( l_results ).to_be_like( '%tests/ut3$user#.test_package_3.pkb%' ); - ut.expect( l_results ).not_to_be_like( '%tests/ut3$user#.test_package_1.pkb%' ); - ut.expect( l_results ).not_to_be_like( '%tests/ut3$user#.test_package_2.pkb%' ); - end; - - procedure run_proc_path_list is - l_results clob; - begin - execute immediate 'begin ut3$user#.test_package_1.run(:a_paths); end;' - using in ut3.ut_varchar2_list(':tests.test_package_1',':tests'); - l_results := core.get_dbms_output_as_clob(); - --Assert - ut.expect( l_results ).to_be_like( '%test_package_1%' ); - ut.expect( l_results ).to_be_like( '%test_package_2%' ); - ut.expect( l_results ).not_to_be_like( '%test_package_3%' ); - end; - - procedure run_proc_path_list_file_list is - l_results clob; - begin - execute immediate 'begin ut3$user#.test_package_1.run(:a_paths, :a_test_files, :a_reporter); end;' - using - in ut3.ut_varchar2_list(':tests.test_package_1',':tests'), - in ut3.ut_varchar2_list('tests/ut3$user#.test_package_1.pkb','tests/ut3$user#.test_package_2.pkb','tests/ut3$user#.test_package_3.pkb'), - in ut3.ut_sonar_test_reporter(); - l_results := core.get_dbms_output_as_clob(); - --Assert - ut.expect( l_results ).to_be_like( '%tests/ut3$user#.test_package_1.pkb%' ); - ut.expect( l_results ).to_be_like( '%tests/ut3$user#.test_package_2.pkb%' ); - ut.expect( l_results ).not_to_be_like( '%tests/ut3$user#.test_package_3.pkb%' ); - end; - - procedure run_proc_null_reporter is - l_results clob; - begin - --Act - execute immediate 'begin ut3$user#.test_package_1.run(:a_reporter); end;' - using in cast(null as ut3.ut_reporter_base); - l_results := core.get_dbms_output_as_clob(); - --Assert - ut.expect( l_results ).to_be_like( '%tests%test_package_1%test_package_2%tests2%test_package_3%' ); - end; - - procedure run_proc_null_path is - l_results clob; - begin - --Act - execute immediate 'begin ut3$user#.test_package_1.run(:a_path); end;' - using in cast(null as varchar2); - l_results := core.get_dbms_output_as_clob(); - --Assert - ut.expect( l_results ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); - end; - - procedure run_proc_null_path_list is - l_results clob; - l_paths ut3.ut_varchar2_list; - begin - --Act - execute immediate 'begin ut3$user#.test_package_1.run(:a_paths); end;' - using in l_paths; - l_results := core.get_dbms_output_as_clob(); - --Assert - ut.expect( l_results ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); - end; - - procedure run_proc_empty_path_list is - l_results clob; - begin - --Act - execute immediate 'begin ut3$user#.test_package_1.run(:a_paths); end;' - using in ut3.ut_varchar2_list(); - l_results := core.get_dbms_output_as_clob(); - --Assert - ut.expect( l_results ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); - end; - - procedure create_suite_with_commit is - pragma autonomous_transaction; - begin - execute immediate 'create or replace package test_commit_warning is - --%suite - --%suitepath(ut.run.transaction) - - --%test - procedure does_commit; - end;'; - execute immediate 'create or replace package body test_commit_warning is - procedure does_commit is - begin - ut3.ut.expect(1).to_equal(1); - commit; - end; - end;'; - end; - - procedure drop_suite_with_commit is - pragma autonomous_transaction; - begin - execute immediate 'drop package test_commit_warning'; - end; - - procedure run_proc_warn_on_commit is - l_results clob; - begin - ut3.ut.run('test_commit_warning'); - l_results := core.get_dbms_output_as_clob(); - ut.expect(l_results).to_be_like( - '%Unable to perform automatic rollback after test%'|| - 'An implicit or explicit commit/rollback occurred in procedures:%' || - 'does_commit%' || - 'Use the "--%rollback(manual)" annotation or remove commit/rollback/ddl statements that are causing the issue.%' - ); - end; - - procedure create_failing_beforeall_suite is - pragma autonomous_transaction; - begin - execute immediate 'create or replace package parent_suite is - --%suite - --%suitepath(ut.run.failing_setup) - - --%beforeall - procedure failing_setup; - end;'; - execute immediate 'create or replace package body parent_suite is - procedure failing_setup is - begin - raise no_data_found; - end; - end;'; - execute immediate 'create or replace package child_suite is - --%suite - --%suitepath(ut.run.failing_setup.parent_suite.some_sub_suite) - - --%test - procedure does_stuff; - end;'; - execute immediate 'create or replace package body child_suite is - procedure does_stuff is - begin - ut3.ut.expect(1).to_equal(1); - end; - end;'; - end; - - procedure drop_failing_beforeall_suite is - pragma autonomous_transaction; - begin - execute immediate 'drop package parent_suite'; - execute immediate 'drop package child_suite'; - end; - - procedure run_proc_fail_child_suites is - l_results clob; - begin - ut3.ut.run('child_suite'); - l_results := core.get_dbms_output_as_clob(); - ut.expect(l_results).to_be_like( - '%1) does_stuff%' || - 'ORA-01403: no data found%' || - 'ORA-06512: at "UT3_TESTER.PARENT_SUITE%' - ); - end; - - procedure transaction_setup is - pragma autonomous_transaction; - begin - execute immediate 'create table transaction_test_table(message varchar2(100))'; - execute immediate 'create or replace package test_transaction is - --%suite - - --%test - procedure insert_row; - - --%test - procedure insert_and_raise; - end; - '; - execute immediate 'create or replace package body test_transaction is - procedure insert_row is - begin - insert into transaction_test_table values (''2 - inside the test_transaction.insert_row test''); - end; - procedure insert_and_raise is - begin - insert into transaction_test_table values (''2 - inside the test_transaction.insert_row test''); - raise no_data_found; - end; - end; - '; - - end; - - procedure transaction_cleanup is - pragma autonomous_transaction; - begin - begin - execute immediate 'drop table transaction_test_table'; - exception - when others then null; - end; - begin - execute immediate 'drop package test_transaction'; - exception - when others then null; - end; - end; - - procedure run_proc_keep_test_data is - l_expected sys_refcursor; - l_actual sys_refcursor; - l_results clob; - begin - --Arrange - execute immediate ' - insert into transaction_test_table values (''1 - inside the test_ut_run.run_proc_keep_test_changes test'')'; - - --Act - ut3.ut.run('test_transaction.insert_row', a_force_manual_rollback => true); - l_results := core.get_dbms_output_as_clob(); - - --Assert - open l_expected for - select '1 - inside the test_ut_run.run_proc_keep_test_changes test' as message from dual - union all - select '2 - inside the test_transaction.insert_row test' from dual - order by 1; - - open l_actual for 'select * from transaction_test_table order by 1'; - - ut.expect( l_actual ).to_equal(l_expected); - end; - - procedure run_proc_keep_test_data_raise is - l_expected sys_refcursor; - l_actual sys_refcursor; - l_results clob; - begin - --Arrange - execute immediate ' - insert into transaction_test_table values (''1 - inside the test_ut_run.run_proc_keep_test_changes test'')'; - - --Act - ut3.ut.run('test_transaction.insert_and_raise', a_force_manual_rollback => true); - l_results := core.get_dbms_output_as_clob(); - - --Assert - open l_expected for - select '1 - inside the test_ut_run.run_proc_keep_test_changes test' as message from dual - union all - select '2 - inside the test_transaction.insert_row test' from dual - order by 1; - - open l_actual for 'select * from transaction_test_table order by 1'; - - ut.expect( l_actual ).to_equal(l_expected); - end; - - procedure run_proc_discard_test_data is - l_expected sys_refcursor; - l_actual sys_refcursor; - l_results clob; - begin - --Arrange - execute immediate ' - insert into transaction_test_table values (''1 - inside the test_ut_run.run_proc_keep_test_changes test'')'; - - --Act - ut3.ut.run('test_transaction.insert_row'); - l_results := core.get_dbms_output_as_clob(); - - --Assert - open l_expected for - select '1 - inside the test_ut_run.run_proc_keep_test_changes test' as message from dual; - - open l_actual for 'select * from transaction_test_table order by 1'; - - ut.expect( l_actual ).to_equal(l_expected); - end; - - procedure run_func_no_params is - l_results ut3.ut_varchar2_list; - begin - execute immediate 'begin :l_results := ut3$user#.test_package_1.run(); end;' using out l_results; - --Assert - ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); - end; - - procedure run_func_specific_reporter is - l_results ut3.ut_varchar2_list; - begin - --Act - execute immediate 'begin :l_results := ut3$user#.test_package_1.run(:a_reporter); end;' - using out l_results, in ut3.ut_documentation_reporter(); - --Assert - ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); - end; - - procedure run_func_cov_file_list is - l_results ut3.ut_varchar2_list; - begin - --Act - execute immediate 'begin :l_results := ut3$user#.test_package_1.run(a_test_files=>:a_test_files, a_reporter=>:a_reporter); end;' - using out l_results, - in ut3.ut_varchar2_list('tests/ut3$user#.test_package_1.pkb','tests/ut3$user#.test_package_2.pkb','tests/ut3$user#.test_package_3.pkb'), - in ut3.ut_sonar_test_reporter(); - --Assert - ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( '%tests/ut3$user#.test_package_2.pkb%tests/ut3$user#.test_package_1.pkb%tests/ut3$user#.test_package_3.pkb%' ); - end; - - procedure run_func_pkg_name is - l_results ut3.ut_varchar2_list; - begin - execute immediate 'begin :l_results := ut3$user#.test_package_1.run(:a_path); end;' - using out l_results, in 'test_package_1'; - --Assert - ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( '%test_package_1%' ); - ut.expect( ut3.ut_utils.table_to_clob(l_results) ).not_to_be_like( '%test_package_2%' ); - ut.expect( ut3.ut_utils.table_to_clob(l_results) ).not_to_be_like( '%test_package_3%' ); - end; - - procedure run_func_pkg_name_file_list is - l_results ut3.ut_varchar2_list; - begin - execute immediate 'begin :l_results := ut3$user#.test_package_1.run(:a_path, :a_test_files, :a_reporter); end;' - using out l_results, - in 'test_package_3', - in ut3.ut_varchar2_list('tests/ut3$user#.test_package_1.pkb','tests/ut3$user#.test_package_2.pkb','tests/ut3$user#.test_package_3.pkb'), - in ut3.ut_sonar_test_reporter(); - --Assert - ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( '%tests/ut3$user#.test_package_3.pkb%' ); - ut.expect( ut3.ut_utils.table_to_clob(l_results) ).not_to_be_like( '%tests/ut3$user#.test_package_1.pkb%' ); - ut.expect( ut3.ut_utils.table_to_clob(l_results) ).not_to_be_like( '%tests/ut3$user#.test_package_2.pkb%' ); - end; - - procedure run_func_path_list is - l_results ut3.ut_varchar2_list; - begin - execute immediate 'begin :l_results := ut3$user#.test_package_1.run(:a_paths); end;' - using out l_results, in ut3.ut_varchar2_list(':tests.test_package_1',':tests'); - --Assert - ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( '%test_package_1%' ); - ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( '%test_package_2%' ); - ut.expect( ut3.ut_utils.table_to_clob(l_results) ).not_to_be_like( '%test_package_3%' ); - end; - - procedure run_func_path_list_file_list is - l_results ut3.ut_varchar2_list; - begin - execute immediate 'begin :l_results := ut3$user#.test_package_1.run(:a_paths, :a_test_files, :a_reporter); end;' - using out l_results, - in ut3.ut_varchar2_list(':tests.test_package_1',':tests'), - in ut3.ut_varchar2_list('tests/ut3$user#.test_package_1.pkb','tests/ut3$user#.test_package_2.pkb','tests/ut3$user#.test_package_3.pkb'), - in ut3.ut_sonar_test_reporter(); - --Assert - ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( '%tests/ut3$user#.test_package_1.pkb%' ); - ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( '%tests/ut3$user#.test_package_2.pkb%' ); - ut.expect( ut3.ut_utils.table_to_clob(l_results) ).not_to_be_like( '%tests/ut3$user#.test_package_3.pkb%' ); - end; - - procedure run_func_null_reporter is - l_results ut3.ut_varchar2_list; - begin - --Act - execute immediate 'begin :l_results := ut3$user#.test_package_1.run(:a_reporter); end;' - using out l_results, in cast(null as ut3.ut_reporter_base); - --Assert - ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( '%tests%test_package_1%test_package_2%tests2%test_package_3%' ); - end; - - procedure run_func_null_path is - l_results ut3.ut_varchar2_list; - begin - --Act - execute immediate 'begin :l_results := ut3$user#.test_package_1.run(:a_path); end;' - using out l_results, in cast(null as varchar2); - --Assert - ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); - end; - - procedure run_func_null_path_list is - l_results ut3.ut_varchar2_list; - l_paths ut3.ut_varchar2_list; - begin - --Act - execute immediate 'begin :l_results := ut3$user#.test_package_1.run(:a_paths); end;' - using out l_results, in l_paths; - --Assert - ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); - end; - - procedure run_func_empty_path_list is - l_results ut3.ut_varchar2_list; - begin - --Act - execute immediate 'begin :l_results := ut3$user#.test_package_1.run(:a_paths); end;' - using out l_results, in ut3.ut_varchar2_list(); - --Assert - ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); - end; - - procedure run_func_cov_file_lst_null_rep is - l_results ut3.ut_varchar2_list; - begin - --Act - execute immediate 'begin :l_results := ut3$user#.test_package_1.run(a_test_files=>:a_test_files, a_reporter=>:a_reporter); end;' - using out l_results, - in ut3.ut_varchar2_list('tests/ut3$user#.test_package_1.pkb','tests/ut3$user#.test_package_2.pkb','tests/ut3$user#.test_package_3.pkb'), - in cast(null as ut3.ut_reporter_base); - --Assert - ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); - end; - - procedure run_func_empty_suite is - l_results ut3.ut_varchar2_list; - l_expected varchar2(32767); - pragma autonomous_transaction; - begin - --Arrange - execute immediate q'[create or replace package empty_suite as - -- %suite - - procedure not_a_test; - end;]'; - execute immediate q'[create or replace package body empty_suite as - procedure not_a_test is begin null; end; - end;]'; - l_expected := '%empty_suite%0 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%'; - --Act - select * bulk collect into l_results from table(ut3.ut.run('empty_suite')); - - --Assert - ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( l_expected ); - - --Cleanup - execute immediate q'[drop package empty_suite]'; - end; - - procedure create_db_link is - l_service_name varchar2(100); - pragma autonomous_transaction; - begin - select global_name into l_service_name from global_name; - execute immediate - 'create public database link db_loopback connect to ut3_tester identified by ut3 - using ''(DESCRIPTION= - (ADDRESS=(PROTOCOL=TCP) - (HOST='||sys_context('userenv','SERVER_HOST')||') - (PORT=1521) - ) - (CONNECT_DATA=(SERVICE_NAME='||l_service_name||')))'''; - end; - - procedure drop_db_link is - begin - execute immediate 'drop public database link db_loopback'; - exception - when others then - null; - end; - - procedure create_test_suite is - pragma autonomous_transaction; - begin - create_db_link; - execute immediate q'[ - create or replace package stateful_package as - function get_state return varchar2; - end; - ]'; - execute immediate q'[ - create or replace package body stateful_package as - g_state varchar2(1) := 'A'; - function get_state return varchar2 is begin return g_state; end; - end; - ]'; - execute immediate q'[ - create or replace package test_stateful as - --%suite - --%suitepath(test_state) - - --%test - --%beforetest(acquire_state_via_db_link,rebuild_stateful_package) - procedure failing_stateful_test; - - procedure rebuild_stateful_package; - procedure acquire_state_via_db_link; - - end; - ]'; - execute immediate q'{ - create or replace package body test_stateful as - - procedure failing_stateful_test is - begin - ut3.ut.expect(stateful_package.get_state@db_loopback).to_equal('abc'); - end; - - procedure rebuild_stateful_package is - pragma autonomous_transaction; - begin - execute immediate q'[ - create or replace package body stateful_package as - g_state varchar2(3) := 'abc'; - function get_state return varchar2 is begin return g_state; end; - end; - ]'; - end; - - procedure acquire_state_via_db_link is - begin - dbms_output.put_line('stateful_package.get_state@db_loopback='||stateful_package.get_state@db_loopback); - end; - end; - }'; - - end; - - procedure raise_in_invalid_state is - l_results ut3.ut_varchar2_list; - l_expected varchar2(32767); - begin - --Arrange - l_expected := 'test_state - test_stateful - failing_stateful_test [% sec] (FAILED - 1)% -Failures:% - 1) failing_stateful_test - ORA-04068: existing state of packages (DB_LOOPBACK%) has been discarded - ORA-04061: existing state of package body "UT3_TESTER.STATEFUL_PACKAGE" has been invalidated - ORA-04065: not executed, altered or dropped package body "UT3_TESTER.STATEFUL_PACKAGE"% - ORA-06512: at line 6% -1 tests, 0 failed, 1 errored, 0 disabled, 0 warning(s)%'; - - --Act - select * bulk collect into l_results from table(ut3.ut.run('test_stateful')); - - --Assert - ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( l_expected ); - ut.fail('Expected exception but nothing was raised'); - exception - when others then - ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( l_expected ); - ut.expect(sqlcode).to_equal(-4068); - end; - - procedure drop_test_suite is - pragma autonomous_transaction; - begin - drop_db_link; - execute immediate 'drop package stateful_package'; - execute immediate 'drop package test_stateful'; - end; - - procedure run_in_invalid_state is - l_results ut3.ut_varchar2_list; - l_actual clob; - l_expected varchar2(32767); - begin - select * bulk collect into l_results from table(ut3.ut.run('failing_invalid_spec')); - - l_actual := ut3.ut_utils.table_to_clob(l_results); - ut.expect(l_actual).to_be_like('%Call params for % are not valid: package does not exist or is invalid: %FAILING_INVALID_SPEC%'); - - end; - - procedure compile_invalid_package is - ex_compilation_error exception; - pragma exception_init(ex_compilation_error,-24344); - pragma autonomous_transaction; - begin - begin - execute immediate q'[ - create or replace package failing_invalid_spec as - --%suite - gv_glob_val non_existing_table.id%type := 0; - - --%test - procedure test1; - end;]'; - exception when ex_compilation_error then null; - end; - begin - execute immediate q'[ - create or replace package body failing_invalid_spec as - procedure test1 is begin ut.expect(1).to_equal(1); end; - end;]'; - exception when ex_compilation_error then null; - end; - end; - procedure drop_invalid_package is - pragma autonomous_transaction; - begin - execute immediate 'drop package failing_invalid_spec'; - end; - - procedure run_and_revalidate_specs is - l_results ut3.ut_varchar2_list; - l_actual clob; - l_is_invalid number; - begin - execute immediate q'[select count(1) from all_objects o where o.owner = :object_owner and o.object_type = 'PACKAGE' - and o.status = 'INVALID' and o.object_name= :object_name]' into l_is_invalid - using user,'INVALID_PCKAG_THAT_REVALIDATES'; - - select * bulk collect into l_results from table(ut3.ut.run('invalid_pckag_that_revalidates')); - - l_actual := ut3.ut_utils.table_to_clob(l_results); - ut.expect(1).to_equal(l_is_invalid); - ut.expect(l_actual).to_be_like('%invalid_pckag_that_revalidates%invalidspecs [% sec]% -%Finished in % seconds% -%1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%'); - - end; - - procedure generate_invalid_spec is - ex_compilation_error exception; - pragma exception_init(ex_compilation_error,-24344); - pragma autonomous_transaction; - begin - - execute immediate q'[ - create or replace package parent_specs as - c_test constant varchar2(1) := 'Y'; - end;]'; - - execute immediate q'[ - create or replace package invalid_pckag_that_revalidates as - --%suite - g_var varchar2(1) := parent_specs.c_test; - - --%test(invalidspecs) - procedure test1; - end;]'; - - execute immediate q'[ - create or replace package body invalid_pckag_that_revalidates as - procedure test1 is begin ut.expect('Y').to_equal(g_var); end; - end;]'; - - -- That should invalidate test package and we can then revers - execute immediate q'[ - create or replace package parent_specs as - c_test_error constant varchar2(1) := 'Y'; - end;]'; - - execute immediate q'[ - create or replace package parent_specs as - c_test constant varchar2(1) := 'Y'; - end;]'; - - end; - procedure drop_invalid_spec is - pragma autonomous_transaction; - begin - execute immediate 'drop package invalid_pckag_that_revalidates'; - execute immediate 'drop package parent_specs'; - end; - - procedure run_and_report_warnings is - l_results ut3.ut_varchar2_list; - l_actual clob; - begin - - select * bulk collect into l_results from table(ut3.ut.run('bad_annotations')); - l_actual := ut3.ut_utils.table_to_clob(l_results); - - ut.expect(l_actual).to_be_like('%Invalid annotation "--%context". Cannot find following "--%endcontext". Annotation ignored.% -%1 tests, 0 failed, 0 errored, 0 disabled, 1 warning(s)%'); - - end; - - procedure create_bad_annot is - pragma autonomous_transaction; - begin - execute immediate q'[ - create or replace package bad_annotations as - --%suite - - --%context - - --%test(invalidspecs) - procedure test1; - - end;]'; - - execute immediate q'[ - create or replace package body bad_annotations as - procedure test1 is begin ut.expect(1).to_equal(1); end; - end;]'; - - end; - - procedure drop_bad_annot is - pragma autonomous_transaction; - begin - execute immediate 'drop package bad_annotations'; - end; - - procedure savepoints_on_db_links is - l_results clob; - begin - ut3.ut.run('test_distributed_savepoint'); - l_results := core.get_dbms_output_as_clob(); - ut.expect(l_results).to_be_like('%1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%'); - end; - - procedure create_suite_with_link is - pragma autonomous_transaction; - begin - create_db_link; - execute immediate 'create table tst(id number(18,0))'; - execute immediate q'[ - create or replace package test_distributed_savepoint is - --%suite - --%suitepath(alltests) - - --%beforeall - procedure setup; - - --%test - procedure test; - end;]'; - - execute immediate q'[ - create or replace package body test_distributed_savepoint is - - g_expected constant integer := 1; - - procedure setup is - begin - insert into tst@db_loopback values(g_expected); - end; - - procedure test is - l_actual integer := 0; - begin - select id into l_actual from tst@db_loopback; - - ut.expect(l_actual).to_equal(g_expected); - end; - - end;]'; - end; - - procedure drop_suite_with_link is - pragma autonomous_transaction; - begin - drop_db_link; - execute immediate 'drop table tst'; - execute immediate 'drop package test_distributed_savepoint'; - end; - -end; -/ diff --git a/test/api/test_ut_run.pks b/test/api/test_ut_run.pks deleted file mode 100644 index 55d19e866..000000000 --- a/test/api/test_ut_run.pks +++ /dev/null @@ -1,148 +0,0 @@ -create or replace package test_ut_run is - --%suite(ut.run) - --%suitepath(utplsql.api) - - - --%test(ut.version() returns version of the framework) - procedure ut_version; - - --%test(ut.fail() marks test as failed) - procedure ut_fail; - - procedure create_ut3$user#_tests; - procedure drop_ut3$user#_tests; - - --%context(ut_run_procedure) - --%displayname(ut.run() procedure options) - --%beforeall(create_ut3$user#_tests) - --%afterall(drop_ut3$user#_tests) - - --%test(Runs all tests in current schema with default reporter when no parameters given) - procedure run_proc_no_params; - --%test(Runs all tests in current schema with specified reporter) - procedure run_proc_specific_reporter; - --%test(Runs all tests in current schema with coverage file list) - procedure run_proc_cov_file_list; - - --%test(Runs given package only with package name given as path) - procedure run_proc_pkg_name; - --%test(Runs all from given package with package name given as path and coverage file list) - procedure run_proc_pkg_name_file_list; - --%test(Runs tests from given paths only with paths list) - procedure run_proc_path_list; - --%test(Runs tests from given paths only with paths list and coverage file list) - procedure run_proc_path_list_file_list; - --%test(Runs all tests in current schema using default reporter when null reporter given) - procedure run_proc_null_reporter; - --%test(Runs all tests in current schema with null path provided) - procedure run_proc_null_path; - --%test(Runs all tests in current schema with null path list given) - procedure run_proc_null_path_list; - --%test(Runs all tests in current schema with empty path list given) - procedure run_proc_empty_path_list; - - procedure create_suite_with_commit; - procedure drop_suite_with_commit; - --%test(Reports a warning if transaction was invalidated by test with automatic rollback) - --%beforetest(create_suite_with_commit) - --%aftertest(drop_suite_with_commit) - procedure run_proc_warn_on_commit; - - - procedure create_failing_beforeall_suite; - procedure drop_failing_beforeall_suite; - --%test(Marks child suite as failed when parent's suite beforeall fails) - --%beforetest(create_failing_beforeall_suite) - --%aftertest(drop_failing_beforeall_suite) - procedure run_proc_fail_child_suites; - - --%test(Savepoints are working properly on distributed transactions - Issue #839) - --%beforetest(create_suite_with_link) - --%aftertest(drop_suite_with_link) - procedure savepoints_on_db_links; - procedure create_suite_with_link; - procedure drop_suite_with_link; - - --%endcontext - - --%context(run_proc_transaction_control) - - --%beforeall - procedure transaction_setup; - --%afterall - procedure transaction_cleanup; - --%test(Leaves transaction open and uncommitted with a_force_manual_rollback) - procedure run_proc_keep_test_data; - --%test(Leaves transaction open and uncommitted with a_force_manual_rollback with exceptions) - procedure run_proc_keep_test_data_raise; - --%test(Does not impact current transaction when ran without a_force_manual_rollback) - procedure run_proc_discard_test_data; - - --%endcontext - - - --%context(ut_run_function) - --%displayname(ut.run() function options) - --%beforeall(create_ut3$user#_tests) - --%afterall(drop_ut3$user#_tests) - - --%test(Runs all tests in current schema with default reporter when no parameters given) - procedure run_func_no_params; - --%test(Runs all tests in current schema with specified reporter) - procedure run_func_specific_reporter; - --%test(Runs all tests in current schema with coverage file list) - procedure run_func_cov_file_list; - - --%test(Runs given package only with package name given as path) - procedure run_func_pkg_name; - --%test(Runs all from given package with package name given as path and coverage file list) - procedure run_func_pkg_name_file_list; - --%test(Runs tests from given paths with paths list) - procedure run_func_path_list; - --%test(Runs tests from given paths with paths list and coverage file list) - procedure run_func_path_list_file_list; - --%test(Runs all tests in current schema using default reporter when null reporter given) - procedure run_func_null_reporter; - --%test(Runs all tests in current schema with null path provided) - procedure run_func_null_path; - --%test(Runs all tests in current schema with null path list given) - procedure run_func_null_path_list; - --%test(Runs all tests in current schema with empty path list given) - procedure run_func_empty_path_list; - --%test(Runs all tests in current schema with coverage file list and default reporter) - procedure run_func_cov_file_lst_null_rep; - --%test(Executes successfully an empty suite) - procedure run_func_empty_suite; - - --disabled(Makes session wait for lock on 18.1 due to library cache pin wait) - --%test(ut.run - raises after completing all tests if a test fails with ORA-04068 or ORA-04061) - --%beforetest(create_test_suite) - --%aftertest(drop_test_suite) - procedure raise_in_invalid_state; - procedure create_test_suite; - procedure drop_test_suite; - - --%test(ut.run - Does not execute suite when specified package is not valid) - --%beforetest(compile_invalid_package) - --%aftertest(drop_invalid_package) - procedure run_in_invalid_state; - procedure compile_invalid_package; - procedure drop_invalid_package; - - --%test(Invalidate package specs via rebuild but still execute package) - --%beforetest(generate_invalid_spec) - --%aftertest(drop_invalid_spec) - procedure run_and_revalidate_specs; - procedure generate_invalid_spec; - procedure drop_invalid_spec; - - --%test(Provides warnings on invalid annotations) - --%beforetest(create_bad_annot) - --%aftertest(drop_bad_annot) - procedure run_and_report_warnings; - procedure create_bad_annot; - procedure drop_bad_annot; - --%endcontext - -end; -/ diff --git a/test/core/annotations/test_annot_throws_exception.pkb b/test/core/annotations/test_annot_throws_exception.pkb deleted file mode 100644 index 1ad4f19a5..000000000 --- a/test/core/annotations/test_annot_throws_exception.pkb +++ /dev/null @@ -1,375 +0,0 @@ -create or replace package body test_annot_throws_exception -is - g_tests_results clob; - - procedure recollect_tests_results is - pragma autonomous_transaction; - - l_package_spec varchar2(32737); - l_package_body varchar2(32737); - l_exception_spec varchar2(32737); - l_test_results ut3.ut_varchar2_list; - begin - l_exception_spec := q'[ - create or replace package exc_pkg is - c_e_single_exc constant number := -20200; - c_e_dummy constant varchar2(10) := 'dummy'; - c_e_varch_exc constant varchar2(10) := '-20201'; - c_e_list_1 number := -20202; - c_e_list_2 constant number := -20203; - c_e_diff_exc constant number := -20204; - c_e_mix_list constant number := -20205; - c_e_mix_missin constant number := -20206; - - e_some_exception exception; - pragma exception_init(e_some_exception, -20207); - - end;]'; - - l_package_spec := ' - create package annotated_package_with_throws is - --%suite(Dummy package to test annotation throws) - - --%test(Throws same annotated exception) - --%throws(-20145) - procedure raised_same_exception; - - --%test(Throws one of the listed exceptions) - --%throws(-20145,-20146, -20189 ,-20563) - procedure raised_one_listed_exception; - - --%test(Leading zero is ignored in exception list) - --%throws(-01476) - procedure leading_0_exception_no; - - --%test(Throws diff exception) - --%throws(-20144) - procedure raised_diff_exception; - - --%test(Throws empty) - --%throws() - procedure empty_throws; - - --%test(Ignores annotation and fails when exception was thrown) - --%throws(hello,784#,0-=234,,u1234) - procedure bad_paramters_with_except; - - --%test(Ignores annotation and succeeds when no exception thrown) - --%throws(hello,784#,0-=234,,u1234) - procedure bad_paramters_without_except; - - --%test(Detects a valid exception number within many invalid ones) - --%throws(7894562, operaqk, -=1, -1, pow74d, posdfk3) - procedure one_valid_exception_number; - - --%test(Gives failure when a exception is expected and nothing is thrown) - --%throws(-20459, -20136, -20145) - procedure nothing_thrown; - - --%test(Single exception defined as a constant number in package) - --%throws(exc_pkg.c_e_single_exc) - procedure single_exc_const_pkg; - - --%test(Gives success when one of annotated exception using constant is thrown) - --%throws(exc_pkg.c_e_list_1,exc_pkg.c_e_list_2) - procedure list_of_exc_constant; - - --%test(Gives failure when the raised exception is different that the annotated one using variable) - --%throws(exc_pkg.c_e_diff_exc) - procedure fail_not_match_exc; - - --%test(Success when one of exception from mixed list of number and constant is thrown) - --%throws(exc_pkg.c_e_mix_list,-20105) - procedure mixed_exc_list; - - --%test(Success when match exception even if other variable on list dont exists) - --%throws(exc_pkg.c_e_mix_missin,utter_rubbish) - procedure mixed_list_notexi; - - --%test(Success resolve and match named exception defined in pragma exception init) - --%throws(exc_pkg.e_some_exception) - procedure named_exc_pragma; - - --%test(Success resolve and match oracle named exception) - --%throws(NO_DATA_FOUND) - procedure named_exc_ora; - - --%test(Success resolve and match oracle named exception dup val index) - --%throws(DUP_VAL_ON_INDEX) - procedure named_exc_ora_dup_ind; - - --%test(Success map no data 100 to -1403) - --%throws(-1403) - procedure nodata_exc_ora; - - --%test(Success for exception defined as varchar) - --%throws(exc_pkg.c_e_varch_exc) - procedure defined_varchar_exc; - - --%test(Non existing constant exception) - --%throws(dummy.c_dummy); - procedure non_existing_const; - - --%test(Bad exception constant) - --%throws(exc_pkg.c_e_dummy); - procedure bad_exc_const; - - end; - '; - - l_package_body := ' - create package body annotated_package_with_throws is - procedure raised_same_exception is - begin - raise_application_error(-20145, ''Test error''); - end; - - procedure raised_one_listed_exception is - begin - raise_application_error(-20189, ''Test error''); - end; - - procedure leading_0_exception_no is - x integer; - begin - x := 1 / 0; - end; - - procedure raised_diff_exception is - begin - raise_application_error(-20143, ''Test error''); - end; - - procedure empty_throws is - begin - raise_application_error(-20143, ''Test error''); - end; - - procedure bad_paramters_with_except is - begin - raise_application_error(-20143, ''Test error''); - end; - - procedure bad_paramters_without_except is - begin - null; - end; - - procedure one_valid_exception_number is - begin - raise dup_val_on_index; - end; - - procedure nothing_thrown is - begin - null; - end; - - procedure single_exc_const_pkg is - begin - raise_application_error(exc_pkg.c_e_single_exc,''Test''); - end; - - procedure list_of_exc_constant is - begin - raise_application_error(exc_pkg.c_e_list_1,''Test''); - end; - - procedure fail_not_match_exc is - begin - raise NO_DATA_FOUND; - end; - - procedure mixed_exc_list is - begin - raise_application_error(exc_pkg.c_e_mix_list,''Test''); - end; - - procedure mixed_list_notexi is - begin - raise_application_error(exc_pkg.c_e_mix_missin,''Test''); - end; - - procedure named_exc_pragma is - begin - raise exc_pkg.e_some_exception; - end; - - procedure named_exc_ora is - begin - raise NO_DATA_FOUND; - end; - - procedure named_exc_ora_dup_ind is - begin - raise DUP_VAL_ON_INDEX; - end; - - procedure nodata_exc_ora is - begin - raise NO_DATA_FOUND; - end; - - procedure defined_varchar_exc is - begin - raise_application_error(exc_pkg.c_e_varch_exc,''Test''); - end; - - procedure non_existing_const is - begin - raise_application_error(-20143, ''Test error''); - end; - - procedure bad_exc_const is - begin - raise_application_error(-20143, ''Test error''); - end; - - end; - '; - - execute immediate l_exception_spec; - execute immediate l_package_spec; - execute immediate l_package_body; - - - select * bulk collect into l_test_results from table(ut3.ut.run(('annotated_package_with_throws'))); - - g_tests_results := ut3.ut_utils.table_to_clob(l_test_results); - end; - - procedure throws_same_annotated_except is - begin - ut.expect(g_tests_results).to_match('^\s*Throws same annotated exception \[[,\.0-9]+ sec\]\s*$','m'); - ut.expect(g_tests_results).not_to_match('raised_same_exception'); - end; - - procedure throws_one_of_annotated_excpt is - begin - ut.expect(g_tests_results).to_match('^\s*Throws one of the listed exceptions \[[,\.0-9]+ sec\]\s*$','m'); - ut.expect(g_tests_results).not_to_match('raised_one_listed_exception'); - end; - - procedure throws_with_leading_zero is - begin - ut.expect(g_tests_results).to_match('^\s*Leading zero is ignored in exception list \[[,\.0-9]+ sec\]\s*$','m'); - ut.expect(g_tests_results).not_to_match('leading_0_exception_no'); - end; - - procedure throws_diff_annotated_except is - begin - ut.expect(g_tests_results).to_match('^\s*Throws diff exception \[[,\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); - ut.expect(g_tests_results).to_match('raised_diff_exception\s+Actual: -20143 was expected to equal: -20144\s+ORA-20143: Test error\s+ORA-06512: at "UT3_TESTER.ANNOTATED_PACKAGE_WITH_THROWS"'); - end; - - procedure throws_empty is - begin - ut.expect(g_tests_results).to_match('^\s*Throws empty \[[,\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); - ut.expect(g_tests_results).to_match('empty_throws\s*ORA-20143: Test error\s*ORA-06512: at "UT3_TESTER.ANNOTATED_PACKAGE_WITH_THROWS"'); - end; - - procedure bad_paramters_with_except is - begin - ut.expect(g_tests_results).to_match('^\s*Ignores annotation and fails when exception was thrown \[[,\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); - ut.expect(g_tests_results).to_match('bad_paramters_with_except\s*ORA-20143: Test error\s*ORA-06512: at "UT3_TESTER.ANNOTATED_PACKAGE_WITH_THROWS"'); - end; - - procedure bad_paramters_without_except is - begin - ut.expect(g_tests_results).to_match('^\s*Ignores annotation and succeeds when no exception thrown \[[,\.0-9]+ sec\]\s*$','m'); - ut.expect(g_tests_results).not_to_match('bad_paramters_without_except'); - end; - - procedure one_valid_exception_number is - begin - ut.expect(g_tests_results).to_match('^\s*Detects a valid exception number within many invalid ones \[[\.0-9]+ sec\]\s*$','m'); - ut.expect(g_tests_results).not_to_match('one_valid_exception_number'); - end; - - procedure nothing_thrown is - begin - ut.expect(g_tests_results).to_match('^\s*Gives failure when a exception is expected and nothing is thrown \[[,\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); - ut.expect(g_tests_results).to_match('nothing_thrown\s*Expected one of exceptions \(-20459, -20136, -20145\) but nothing was raised.'); - end; - - procedure single_exc_const_pkg is - begin - ut.expect(g_tests_results).to_match('^\s*Single exception defined as a constant number in package \[[,\.0-9]+ sec\]\s*$','m'); - ut.expect(g_tests_results).not_to_match('single_exc_const_pkg'); - end; - - procedure list_of_exc_constant is - begin - ut.expect(g_tests_results).to_match('^\s*Gives success when one of annotated exception using constant is thrown \[[,\.0-9]+ sec\]\s*$','m'); - ut.expect(g_tests_results).not_to_match('list_of_exc_constant'); - end; - - procedure fail_not_match_exc is - begin - ut.expect(g_tests_results).to_match('^\s*Gives failure when the raised exception is different that the annotated one using variable \[[,\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); - ut.expect(g_tests_results).to_match('fail_not_match_exc\s+Actual: -1403 was expected to equal: -20204\s+ORA-01403: no data found\s+ORA-06512: at "UT3_TESTER.ANNOTATED_PACKAGE_WITH_THROWS"'); - end; - - procedure mixed_exc_list is - begin - ut.expect(g_tests_results).to_match('^\s*Success when one of exception from mixed list of number and constant is thrown \[[,\.0-9]+ sec\]\s*$','m'); - ut.expect(g_tests_results).not_to_match('mixed_exc_list'); - end; - - procedure mixed_list_notexi is - begin - ut.expect(g_tests_results).to_match('^\s*Success when match exception even if other variable on list dont exists \[[,\.0-9]+ sec\]\s*$','m'); - ut.expect(g_tests_results).not_to_match('mixed_list_notexi'); - end; - - procedure named_exc_pragma is - begin - ut.expect(g_tests_results).to_match('^\s*Success resolve and match named exception defined in pragma exception init \[[,\.0-9]+ sec\]\s*$','m'); - ut.expect(g_tests_results).not_to_match('mixed_list_notexi'); - end; - - procedure named_exc_ora is - begin - ut.expect(g_tests_results).to_match('^\s*Success resolve and match oracle named exception \[[,\.0-9]+ sec\]\s*$','m'); - ut.expect(g_tests_results).not_to_match('named_exc_ora'); - end; - - procedure named_exc_ora_dup_ind is - begin - ut.expect(g_tests_results).to_match('^\s*Success resolve and match oracle named exception dup val index \[[,\.0-9]+ sec\]\s*$','m'); - ut.expect(g_tests_results).not_to_match('named_exc_ora_dup_ind'); - end; - - procedure nodata_exc_ora is - begin - ut.expect(g_tests_results).to_match('^\s*Success map no data 100 to -1403 \[[,\.0-9]+ sec\]\s*$','m'); - ut.expect(g_tests_results).not_to_match('nodata_exc_ora'); - end; - - procedure defined_varchar_exc is - begin - ut.expect(g_tests_results).to_match('^\s*Success for exception defined as varchar \[[,\.0-9]+ sec\]\s*$','m'); - ut.expect(g_tests_results).not_to_match('defined_varchar_exc'); - end; - - procedure non_existing_const is - begin - ut.expect(g_tests_results).to_match('^\s*Non existing constant exception \[[,\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); - ut.expect(g_tests_results).to_match('non_existing_const\s*ORA-20143: Test error\s*ORA-06512: at "UT3_TESTER.ANNOTATED_PACKAGE_WITH_THROWS"'); - end; - - procedure bad_exc_const is - begin - ut.expect(g_tests_results).to_match('^\s*Bad exception constant \[[,\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); - ut.expect(g_tests_results).to_match('bad_exc_const\s*ORA-20143: Test error\s*ORA-06512: at "UT3_TESTER.ANNOTATED_PACKAGE_WITH_THROWS"'); - end; - - procedure drop_test_package is - pragma autonomous_transaction; - begin - execute immediate 'drop package annotated_package_with_throws'; - execute immediate 'drop package exc_pkg'; - end; - -end; -/ diff --git a/test/core/annotations/test_annot_throws_exception.pks b/test/core/annotations/test_annot_throws_exception.pks deleted file mode 100644 index 54e814b55..000000000 --- a/test/core/annotations/test_annot_throws_exception.pks +++ /dev/null @@ -1,76 +0,0 @@ -create or replace package test_annot_throws_exception -is - --%suite(annotations - throws) - --%suitepath(utplsql.core.annotations) - - --%beforeall - procedure recollect_tests_results; - - --%test(Gives success when annotated number exception is thrown) - procedure throws_same_annotated_except; - - --%test(Gives success when one of the annotated number exceptions is thrown) - procedure throws_one_of_annotated_excpt; - - --%test(Gives success when annotated number exceptions has leading zero) - procedure throws_with_leading_zero; - - --%test(Gives failure when the raised exception is different that the annotated one) - procedure throws_diff_annotated_except; - - --%test(Ignores when the annotation throws is empty) - procedure throws_empty; - - --%test(Ignores when only bad parameters are passed, the test raise a exception and it shows errored test) - procedure bad_paramters_with_except; - - --%test(Ignores when only bad parameters are passed, the test does not raise a exception and it shows successful test) - procedure bad_paramters_without_except; - - --%test(Detects a valid exception number within many invalid ones) - procedure one_valid_exception_number; - - --%test(Gives failure when a exception is expected and nothing is thrown) - procedure nothing_thrown; - - --%test(Single exception defined as a constant number in package) - procedure single_exc_const_pkg; - - --%test(Gives success when one of annotated exception using constant is thrown) - procedure list_of_exc_constant; - - --%test(Gives failure when the raised exception is different that the annotated one using variable) - procedure fail_not_match_exc; - - --%test(Success when one of exception from mixed list of number and constant is thrown) - procedure mixed_exc_list; - - --%test(Success when match exception even if other variable on list dont exists) - procedure mixed_list_notexi; - - --%test(Success resolve and match named exception defined in pragma exception init) - procedure named_exc_pragma; - - --%test(Success resolve and match oracle named exception no data) - procedure named_exc_ora; - - --%test(Success resolve and match oracle named exception dup val index) - procedure named_exc_ora_dup_ind; - - --%test(Success map no data 100 to -1403) - procedure nodata_exc_ora; - - --%test(Success for exception defined as varchar) - procedure defined_varchar_exc; - - --%test(Non existing constant exception) - procedure non_existing_const; - - --%test(Bad exception constant) - procedure bad_exc_const; - - --%afterall - procedure drop_test_package; - -end; -/ diff --git a/test/core/annotations/test_annotation_manager.pkb b/test/core/annotations/test_annotation_manager.pkb deleted file mode 100644 index 804980a39..000000000 --- a/test/core/annotations/test_annotation_manager.pkb +++ /dev/null @@ -1,306 +0,0 @@ -create or replace package body test_annotation_manager is - - procedure create_dummy_package is - pragma autonomous_transaction; - begin - execute immediate q'[create or replace package dummy_package as - procedure some_dummy_procedure; - end;]'; - end; - - procedure drop_dummy_package is - pragma autonomous_transaction; - begin - execute immediate q'[drop package dummy_package]'; - end; - - procedure recompile_dummy_package is - pragma autonomous_transaction; - begin - execute immediate q'[alter package dummy_package compile]'; - end; - - procedure create_dummy_test_package is - pragma autonomous_transaction; - begin - execute immediate q'[create or replace package dummy_test_package as - --%suite(dummy_test_suite) - --%rollback(manual) - - --%test(dummy_test) - --%beforetest(some_procedure) - procedure some_dummy_test_procedure; - end;]'; - execute immediate q'[grant execute on dummy_test_package to public]'; - end; - - procedure modify_dummy_test_package is - pragma autonomous_transaction; - begin - execute immediate q'[create or replace package dummy_test_package as - --%suite(dummy_test_suite) - - --%test(dummy_test) - procedure some_dummy_test_procedure; - end;]'; - end; - - procedure drop_dummy_test_package is - pragma autonomous_transaction; - begin - execute immediate q'[drop package dummy_test_package]'; - end; - - procedure recompile_dummy_test_package is - pragma autonomous_transaction; - begin - execute immediate q'[alter package dummy_test_package compile]'; - end; - - procedure create_parse_proc_as_ut3$user# is - pragma autonomous_transaction; - begin - execute immediate q'[ - create or replace procedure ut3$user#.parse_annotations is - begin - ut3.ut_annotation_manager.rebuild_annotation_cache('UT3_TESTER','PACKAGE'); - end;]'; - end; - - procedure parse_dummy_test_as_ut3$user# is - pragma autonomous_transaction; - begin - execute immediate 'begin ut3$user#.parse_annotations; end;'; - end; - - procedure drop_parse_proc_as_ut3$user# is - pragma autonomous_transaction; - begin - execute immediate 'drop procedure ut3$user#.parse_annotations'; - end; - - procedure cleanup_annotation_cache is - pragma autonomous_transaction; - begin - delete from ut3.ut_annotation_cache_info - where object_owner = user and object_type = 'PACKAGE' and object_name in ('DUMMY_PACKAGE','DUMMY_TEST_PACKAGE'); - commit; - end; - - - procedure add_new_package is - l_actual_cache_id integer; - l_actual integer; - l_start_date date; - begin - --Act - l_start_date := sysdate; - ut3.ut_annotation_manager.rebuild_annotation_cache(user,'PACKAGE'); - --Assert - select max(cache_id) - into l_actual_cache_id - from ut3.ut_annotation_cache_info - where object_owner = user and object_type = 'PACKAGE' and object_name = 'DUMMY_PACKAGE' - and parse_time >= l_start_date; - - ut.expect(l_actual_cache_id).to_be_not_null; - - select count(1) - into l_actual - from ut3.ut_annotation_cache - where cache_id = l_actual_cache_id; - - ut.expect(l_actual).to_equal(0); - - end; - - procedure update_modified_package is - l_actual_cache_id integer; - l_actual integer; - l_start_date date; - begin - --Arrange - l_start_date := sysdate; - ut3.ut_annotation_manager.rebuild_annotation_cache(user,'PACKAGE'); - recompile_dummy_package(); - l_start_date := sysdate; - $if dbms_db_version.version >= 18 $then - dbms_session.sleep(1); - $else - dbms_lock.sleep(1); - $end - --Act - ut3.ut_annotation_manager.rebuild_annotation_cache(user,'PACKAGE'); - --Assert - select max(cache_id) - into l_actual_cache_id - from ut3.ut_annotation_cache_info - where object_owner = user and object_type = 'PACKAGE' and object_name = 'DUMMY_PACKAGE' - and parse_time >= l_start_date; - - ut.expect(l_actual_cache_id).to_be_not_null; - - select count(1) - into l_actual - from ut3.ut_annotation_cache - where cache_id = l_actual_cache_id; - - ut.expect(l_actual).to_equal(0); - end; - - - procedure add_new_test_package is - l_actual_cache_id integer; - l_actual sys_refcursor; - l_expected sys_refcursor; - l_start_date date; - begin - --Arrange - l_start_date := sysdate; - --Act - ut3.ut_annotation_manager.rebuild_annotation_cache(user,'PACKAGE'); - --Assert - select max(cache_id) - into l_actual_cache_id - from ut3.ut_annotation_cache_info - where object_owner = user and object_type = 'PACKAGE' and object_name = 'DUMMY_TEST_PACKAGE' - and parse_time >= l_start_date; - - ut.expect(l_actual_cache_id).to_be_not_null; - - open l_actual for - select annotation_position, annotation_name, annotation_text, subobject_name - from ut3.ut_annotation_cache where cache_id = l_actual_cache_id - order by annotation_position; - - open l_expected for - select 2 as annotation_position, 'suite' as annotation_name, - 'dummy_test_suite' as annotation_text, '' as subobject_name - from dual union all - select 3, 'rollback' , 'manual', '' as subobject_name - from dual union all - select 5, 'test' , 'dummy_test', 'some_dummy_test_procedure' as subobject_name - from dual union all - select 6, 'beforetest' , 'some_procedure', 'some_dummy_test_procedure' as subobject_name - from dual; - - ut.expect(l_actual).to_equal(l_expected); - end; - - - procedure update_modified_test_package is - l_actual_cache_id integer; - l_actual sys_refcursor; - l_expected sys_refcursor; - l_start_date date; - begin - --Arrange - ut3.ut_annotation_manager.rebuild_annotation_cache(user,'PACKAGE'); - l_start_date := sysdate; - modify_dummy_test_package(); - --Act - ut3.ut_annotation_manager.rebuild_annotation_cache(user,'PACKAGE'); - --Assert - select max(cache_id) - into l_actual_cache_id - from ut3.ut_annotation_cache_info - where object_owner = user and object_type = 'PACKAGE' and object_name = 'DUMMY_TEST_PACKAGE' - and parse_time >= l_start_date; - - ut.expect(l_actual_cache_id).to_be_not_null; - - open l_actual for - select annotation_position, annotation_name, annotation_text, subobject_name - from ut3.ut_annotation_cache where cache_id = l_actual_cache_id - order by annotation_position; - - open l_expected for - select 2 as annotation_position, 'suite' as annotation_name, - 'dummy_test_suite' as annotation_text, to_char(null) as subobject_name - from dual union all - select 4, 'test' , 'dummy_test', 'some_dummy_test_procedure' as subobject_name - from dual; - - ut.expect(l_actual).to_equal(l_expected); - end; - - - procedure keep_dropped_data_in_cache is - l_actual_cache_id integer; - l_actual sys_refcursor; - l_expected sys_refcursor; - l_start_date date; - begin - parse_dummy_test_as_ut3$user#(); - l_start_date := sysdate; - drop_dummy_test_package(); - --Act - parse_dummy_test_as_ut3$user#(); - --Assert - select max(cache_id) - into l_actual_cache_id - from ut3.ut_annotation_cache_info - where object_owner = user and object_type = 'PACKAGE' and object_name = 'DUMMY_TEST_PACKAGE' - and parse_time >= l_start_date; - - ut.expect(l_actual_cache_id).not_to_be_null(); - - open l_actual for - select annotation_position, annotation_name, annotation_text, subobject_name - from ut3.ut_annotation_cache where cache_id = l_actual_cache_id - order by annotation_position; - - open l_expected for - select 2 as annotation_position, 'suite' as annotation_name, - 'dummy_test_suite' as annotation_text, '' as subobject_name - from dual union all - select 3, 'rollback' , 'manual', '' as subobject_name - from dual union all - select 5, 'test' , 'dummy_test', 'some_dummy_test_procedure' as subobject_name - from dual union all - select 6, 'beforetest' , 'some_procedure', 'some_dummy_test_procedure' as subobject_name - from dual; - - ut.expect(l_actual).to_equal(l_expected); - end; - - procedure no_data_for_dropped_object is - l_actual sys_refcursor; - begin - --Arrange - ut3.ut_annotation_manager.rebuild_annotation_cache(user,'PACKAGE'); - drop_dummy_test_package(); - --Act - open l_actual for - select * from table(ut3.ut_annotation_manager.get_annotated_objects(user,'PACKAGE')) - where object_name = 'DUMMY_TEST_PACKAGE'; - --Assert - ut.expect(l_actual).to_be_empty(); - end; - - procedure cleanup_dropped_data_in_cache is - l_cache_count integer; - l_actual sys_refcursor; - l_expected sys_refcursor; - l_start_date date; - begin - --Arrange - ut3.ut_annotation_manager.rebuild_annotation_cache(user,'PACKAGE'); - l_start_date := sysdate; - drop_dummy_test_package(); - --Act - ut3.ut_annotation_manager.rebuild_annotation_cache(user,'PACKAGE'); - --Assert - select count(1) - into l_cache_count - from ut3.ut_annotation_cache_info - where object_owner = user - and object_type = 'PACKAGE' - and object_name = 'DUMMY_TEST_PACKAGE'; - - ut.expect(l_cache_count).to_equal(0); - - end; - -end test_annotation_manager; -/ diff --git a/test/core/annotations/test_annotation_manager.pks b/test/core/annotations/test_annotation_manager.pks deleted file mode 100644 index 0726c8256..000000000 --- a/test/core/annotations/test_annotation_manager.pks +++ /dev/null @@ -1,55 +0,0 @@ -create or replace package test_annotation_manager is - - --%suite(ut_annotation_manager) - --%suitepath(utplsql.core.annotations) - - --%aftereach - procedure cleanup_annotation_cache; - - procedure create_dummy_package; - - procedure drop_dummy_package; - - procedure create_dummy_test_package; - - procedure create_parse_proc_as_ut3$user#; - - procedure drop_parse_proc_as_ut3$user#; - - procedure drop_dummy_test_package; - - --%test(Adds new package to annotation cache info) - --%beforetest(create_dummy_package) - --%aftertest(drop_dummy_package) - procedure add_new_package; - - --%test(Updates annotation cache info for modified package) - --%beforetest(create_dummy_package) - --%aftertest(drop_dummy_package) - procedure update_modified_package; - - --%test(Adds annotations to cache for unit test package) - --%beforetest(create_dummy_test_package) - --%aftertest(drop_dummy_test_package) - procedure add_new_test_package; - - --%test(Updates annotations in cache for modified test package) - --%beforetest(create_dummy_test_package) - --%aftertest(drop_dummy_test_package) - procedure update_modified_test_package; - - --%test(Keeps annotations in cache when object was removed but user can't see whole schema) - --%beforetest(create_dummy_test_package,create_parse_proc_as_ut3$user#) - --%aftertest(drop_parse_proc_as_ut3$user#) - procedure keep_dropped_data_in_cache; - - --%test(Does not return data for dropped object) - --%beforetest(create_dummy_test_package) - procedure no_data_for_dropped_object; - - --%test(Remove object from cache when object dropped and user can see whole schema) - --%beforetest(create_dummy_test_package) - procedure cleanup_dropped_data_in_cache; - -end test_annotation_manager; -/ diff --git a/test/core/annotations/test_annotation_parser.pkb b/test/core/annotations/test_annotation_parser.pkb deleted file mode 100644 index 5345e3a50..000000000 --- a/test/core/annotations/test_annotation_parser.pkb +++ /dev/null @@ -1,461 +0,0 @@ -create or replace package body test_annotation_parser is - - procedure test_proc_comments is - l_source clob; - l_actual ut3.ut_annotations; - l_expected ut3.ut_annotations; - - begin - l_source := 'PACKAGE test_tt AS - -- %suite - -- %displayname(Name of suite) - -- %suitepath(all.globaltests) - - -- %ann1(Name of suite) - -- wrong line - -- %ann2(some_value) - procedure foo; - END;'; - - --Act - l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); - - --Assert - - l_expected := ut3.ut_annotations( - ut3.ut_annotation(2,'suite',null, null), - ut3.ut_annotation(3,'displayname','Name of suite',null), - ut3.ut_annotation(4,'suitepath','all.globaltests',null), - ut3.ut_annotation(6,'ann1','Name of suite',null), - ut3.ut_annotation(8,'ann2','some_value','foo') - ); - - ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); - end; - - procedure include_floating_annotations is - l_source clob; - l_actual ut3.ut_annotations; - l_expected ut3.ut_annotations; - begin - l_source := 'PACKAGE test_tt AS - -- %suite - -- %displayname(Name of suite) - -- %suitepath(all.globaltests) - - -- %ann1(Name of suite) - -- %ann2(all.globaltests) - - --%test - procedure foo; - - -- %ann3(Name of suite) - -- %ann4(all.globaltests) - - --%test - procedure bar; - END;'; - - --Act - l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); - - --Assert - l_expected := ut3.ut_annotations( - ut3.ut_annotation( 2, 'suite', null, null ), - ut3.ut_annotation( 3, 'displayname', 'Name of suite', null ), - ut3.ut_annotation( 4, 'suitepath', 'all.globaltests', null ), - ut3.ut_annotation( 6, 'ann1', 'Name of suite', null ), - ut3.ut_annotation( 7, 'ann2', 'all.globaltests', null ), - ut3.ut_annotation( 9, 'test', null, 'foo'), - ut3.ut_annotation( 12, 'ann3', 'Name of suite', null ), - ut3.ut_annotation( 13, 'ann4', 'all.globaltests', null ), - ut3.ut_annotation( 15, 'test', null, 'bar') - ); - - ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); - - end; - - procedure parse_complex_with_functions is - l_source clob; - l_actual ut3.ut_annotations; - l_expected ut3.ut_annotations; - - begin - l_source := 'PACKAGE test_tt AS - -- %suite - -- %displayname(Name of suite) - -- %suitepath(all.globaltests) - - --%test - procedure foo; - - - --%beforeeach - procedure foo2; - - --test comment - -- wrong comment - - - /* - describtion of the procedure - */ - --%beforeeach(key=testval) - PROCEDURE foo3(a_value number default null); - - --%all - function foo4(a_val number default null - , a_par varchar2 default := ''asdf''); - END;'; - - --Act - l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); - - --Assert - l_expected := ut3.ut_annotations( - ut3.ut_annotation( 2, 'suite', null, null ), - ut3.ut_annotation( 3, 'displayname', 'Name of suite', null ), - ut3.ut_annotation( 4, 'suitepath', 'all.globaltests', null ), - ut3.ut_annotation( 6, 'test', null, 'foo' ), - ut3.ut_annotation( 10, 'beforeeach', null,'foo2' ), - ut3.ut_annotation( 20, 'beforeeach', 'key=testval','foo3' ), - ut3.ut_annotation( 23, 'all', null,'foo4' ) - ); - - ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); - - end; - - procedure no_procedure_annotation is - l_source clob; - l_actual ut3.ut_annotations; - l_expected ut3.ut_annotations; - - begin - l_source := 'PACKAGE test_tt AS - -- %suite - -- %displayname(Name of suite) - -- %suitepath(all.globaltests) - - procedure foo; - END;'; - - --Act - l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); - - --Assert - l_expected := ut3.ut_annotations( - ut3.ut_annotation( 2, 'suite', null, null ), - ut3.ut_annotation( 3, 'displayname', 'Name of suite', null ), - ut3.ut_annotation( 4, 'suitepath', 'all.globaltests', null ) - ); - - ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); - - end; - - procedure parse_accessible_by is - l_source clob; - l_actual ut3.ut_annotations; - l_expected ut3.ut_annotations; - - begin - l_source := 'PACKAGE test_tt accessible by (foo) AS - -- %suite - -- %displayname(Name of suite) - -- %suitepath(all.globaltests) - - procedure foo; - END;'; - - --Act - l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); - - --Assert - l_expected := ut3.ut_annotations( - ut3.ut_annotation( 2, 'suite', null, null ), - ut3.ut_annotation( 3, 'displayname', 'Name of suite', null ), - ut3.ut_annotation( 4, 'suitepath', 'all.globaltests', null ) - ); - - ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); - - end; - - procedure complex_package_declaration is - l_source clob; - l_actual ut3.ut_annotations; - l_expected ut3.ut_annotations; - - begin - l_source := 'PACKAGE test_tt - ACCESSIBLE BY (calling_proc) - authid current_user - AS - -- %suite - -- %displayname(Name of suite) - -- %suitepath(all.globaltests) - - procedure foo; - END;'; - - --Act - l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); - - --Assert - l_expected := ut3.ut_annotations( - ut3.ut_annotation( 5, 'suite', null, null ), - ut3.ut_annotation( 6, 'displayname', 'Name of suite', null ), - ut3.ut_annotation( 7, 'suitepath', 'all.globaltests', null ) - ); - - ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); - - end; - - procedure complex_text is - l_source clob; - l_actual ut3.ut_annotations; - l_expected ut3.ut_annotations; - - begin - l_source := 'PACKAGE test_tt AS - -- %suite - --%displayname(name = Name of suite) - -- %suitepath(key=all.globaltests,key2=foo,"--%some text") - - procedure foo; - END;'; - - --Act - l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); - - --Assert - l_expected := ut3.ut_annotations( - ut3.ut_annotation( 2, 'suite', null, null ), - ut3.ut_annotation( 3, 'displayname', 'name = Name of suite', null ), - ut3.ut_annotation( 4, 'suitepath', 'key=all.globaltests,key2=foo,"--%some text"', null ) - ); - - ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); - - end; - - procedure ignore_annotations_in_comments is - l_source clob; - l_actual ut3.ut_annotations; - l_expected ut3.ut_annotations; - - begin - l_source := 'PACKAGE test_tt AS - /* - Some comment - -- inlined - -- %ignored - */ - -- %suite - --%displayname(Name of suite) - -- %suitepath(all.globaltests) - - procedure foo; - END;'; - - --Act - l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); - - --Assert - l_expected := ut3.ut_annotations( - ut3.ut_annotation( 7, 'suite', null, null ), - ut3.ut_annotation( 8, 'displayname', 'Name of suite', null ), - ut3.ut_annotation( 9, 'suitepath', 'all.globaltests', null ) - ); - - ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); - - end; - - procedure ignore_wrapped_package is - l_source dbms_preprocessor.source_lines_t; - l_actual ut3.ut_annotations; - begin - --Arrange - l_source(1) := 'create or replace PACKAGE tst_wrapped_pck wrapped -a000000 -369 -abcd -abcd -abcd -abcd -abcd -abcd -abcd -abcd -abcd -abcd -abcd -abcd -abcd -abcd -abcd -9 -34 6d -bg9Jaf2KguofrwaqloE8yvbggKcwg5m49TOf9b9cFj7R9JaW8lYWWi70llr/K6V0iwlp5+eb -v58yvbLAXLi9gYHwoIvAgccti+Cmpg0DKLY= --- %some_annotation_like_text -'; - --Act - l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); - --Assert - ut.expect(anydata.convertCollection(l_actual)).to_be_empty(); - end; - - procedure brackets_in_desc is - - l_source clob; - l_actual ut3.ut_annotations; - l_expected ut3.ut_annotations; - begin - l_source := 'PACKAGE test_tt AS - -- %suite(Name of suite (including some brackets) and some more text) -END;'; - - --Act - l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); - - --Assert - l_expected := ut3.ut_annotations( - ut3.ut_annotation( 2, 'suite', 'Name of suite (including some brackets) and some more text', null ) - ); - - ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); - end; - - procedure test_space_before_annot_params is - l_source clob; - l_actual ut3.ut_annotations; - l_expected ut3.ut_annotations; - - begin - l_source := 'PACKAGE test_tt AS - /* - Some comment - -- inlined - */ - -- %suite - -- %suitepath (all.globaltests) - - procedure foo; -END;'; - - --Act - l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); - - --Assert - l_expected := ut3.ut_annotations( - ut3.ut_annotation( 6, 'suite', null, null ), - ut3.ut_annotation( 7, 'suitepath', 'all.globaltests', null ) - ); - - ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); - end; - - procedure test_windows_newline - as - l_source clob; - l_actual ut3.ut_annotations; - l_expected ut3.ut_annotations; - begin - l_source := 'PACKAGE test_tt AS - -- %suite - -- %displayname(Name of suite)' || chr(13) || chr(10) - || ' -- %suitepath(all.globaltests) - END;'; - - --Act - l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); - - --Assert - l_expected := ut3.ut_annotations( - ut3.ut_annotation( 2, 'suite', null, null ), - ut3.ut_annotation( 3, 'displayname', 'Name of suite', null ), - ut3.ut_annotation( 4, 'suitepath', 'all.globaltests', null ) - ); - - ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); - end; - - procedure test_annot_very_long_name - as - l_source clob; - l_actual ut3.ut_annotations; - l_expected ut3.ut_annotations; - begin - l_source := 'PACKAGE very_long_procedure_name_valid_for_oracle_12_so_utPLSQL_should_allow_it_definitely_well_still_not_reached_128_but_wait_we_did_it AS - -- %suite - -- %displayname(Name of suite) - -- %suitepath(all.globaltests) - - --%test - procedure very_long_procedure_name_valid_for_oracle_12_so_utPLSQL_should_allow_it_definitely_well_still_not_reached_128_but_wait_we_dit_it; - END;'; - - --Act - l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); - - --Assert - l_expected := ut3.ut_annotations( - ut3.ut_annotation( 2, 'suite', null, null ), - ut3.ut_annotation( 3, 'displayname', 'Name of suite', null ), - ut3.ut_annotation( 4, 'suitepath', 'all.globaltests', null ), - ut3.ut_annotation( 6, 'test', null, 'very_long_procedure_name_valid_for_oracle_12_so_utPLSQL_should_allow_it_definitely_well_still_not_reached_128_but_wait_we_dit_it' ) - ); - - ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); - end; - - procedure test_upper_annot is - l_source clob; - l_actual ut3.ut_annotations; - l_expected ut3.ut_annotations; - begin - l_source := 'PACKAGE test_tt AS - -- %SUITE - -- %DISPLAYNAME(Name of suite) - -- %SUITEPATH(all.globaltests) - - -- %ANN1(Name of suite) - -- %ANN2(all.globaltests) - - --%TEST - procedure foo; - - -- %ANN3(Name of suite) - -- %ANN4(all.globaltests) - - --%TEST - procedure bar; - END;'; - - --Act - l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); - - --Assert - l_expected := ut3.ut_annotations( - ut3.ut_annotation( 2, 'suite', null, null ), - ut3.ut_annotation( 3, 'displayname', 'Name of suite', null ), - ut3.ut_annotation( 4, 'suitepath', 'all.globaltests', null ), - ut3.ut_annotation( 6, 'ann1', 'Name of suite', null ), - ut3.ut_annotation( 7, 'ann2', 'all.globaltests', null ), - ut3.ut_annotation( 9, 'test', null, 'foo'), - ut3.ut_annotation( 12, 'ann3', 'Name of suite', null ), - ut3.ut_annotation( 13, 'ann4', 'all.globaltests', null ), - ut3.ut_annotation( 15, 'test', null, 'bar') - ); - - ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); - - end; - -end test_annotation_parser; -/ diff --git a/test/core/annotations/test_annotation_parser.pks b/test/core/annotations/test_annotation_parser.pks deleted file mode 100644 index 19b98ae63..000000000 --- a/test/core/annotations/test_annotation_parser.pks +++ /dev/null @@ -1,42 +0,0 @@ -create or replace package test_annotation_parser is - - --%suite(ut_annotation_parser) - --%suitepath(utplsql.core.annotations) - - --%test(Treats procedure level annotations as package level, if mixed with comments) - procedure test_proc_comments; - --%test(Includes floating annotations between procedures and package) - procedure include_floating_annotations; - --%test(Parses complex annotations on procedures and functions) - procedure parse_complex_with_functions; - --%test(Parses package annotations without any procedure annotations) - procedure no_procedure_annotation; - --%test(Parses package level annotations with Accessible by) - procedure parse_accessible_by; - --%test(Parses package level annotations with multiline declaration) - procedure complex_package_declaration; - --%test(Parses complex text in annotation) - procedure complex_text; - --%test(Ignores content of multi-line comments) - procedure ignore_annotations_in_comments; - - --%test(Ignores wrapped package and does not raise exception) - procedure ignore_wrapped_package; - - --%test(Parses package level annotations with annotation params containing brackets) - procedure brackets_in_desc; - - --%test(Parses annotation text even with spaces before brackets) - procedure test_space_before_annot_params; - - -- %test(Parses source-code with Windows-style newline) - procedure test_windows_newline; - - -- %test(Parses annotations with very long object names) - procedure test_annot_very_long_name; - - -- %test(Parses upper case annotations) - procedure test_upper_annot; - -end test_annotation_parser; -/ diff --git a/test/core/expectations.pkb b/test/core/expectations.pkb deleted file mode 100644 index cc2bae436..000000000 --- a/test/core/expectations.pkb +++ /dev/null @@ -1,67 +0,0 @@ -create or replace package body expectations is - - function unary_expectation_block( - a_matcher_name varchar2, - a_data_type varchar2, - a_data_value varchar2 - ) return varchar2 is - l_execute varchar2(32000); - begin - l_execute := ' - declare - l_expected '||a_data_type||' := '||a_data_value||'; - begin - --act - execute the expectation - ut3.ut.expect(l_expected).'||a_matcher_name||'(); - end;'; - return l_execute; - end; - - function unary_expectation_object_block( - a_matcher_name varchar2, - a_object_name varchar2, - a_object_value varchar2, - a_object_type varchar2 - ) return varchar2 is - begin - return ' - declare - l_object '||a_object_name||' := '||a_object_value||'; - begin - ut3.ut.expect(anydata.convert'||a_object_type||'(l_object)).'||a_matcher_name||'(); - end;'; - end; - - function binary_expectation_block( - a_matcher_name varchar2, - a_actual_data_type varchar2, - a_actual_data varchar2, - a_expected_data_type varchar2, - a_expected_data varchar2 - ) return varchar2 - is - l_execute varchar2(32000); - begin - l_execute := ' - declare - l_actual '||a_actual_data_type||' := '||a_actual_data||'; - l_expected '||a_expected_data_type||' := '||a_expected_data||'; - begin - --act - execute the expectation - ut3.ut.expect( l_actual ).'||a_matcher_name||'(l_expected); - end;'; - return l_execute; - end; - - function failed_expectations_data return anydata is - begin - return anydata.convertCollection(ut3.ut_expectation_processor.get_failed_expectations()); - end; - - procedure cleanup_expectations is - begin - ut3.ut_expectation_processor.clear_expectations(); - end; - -end expectations; -/ diff --git a/test/core/expectations.pks b/test/core/expectations.pks deleted file mode 100644 index 9abc29400..000000000 --- a/test/core/expectations.pks +++ /dev/null @@ -1,29 +0,0 @@ -create or replace package expectations is - - function unary_expectation_block( - a_matcher_name varchar2, - a_data_type varchar2, - a_data_value varchar2 - ) return varchar2; - - function unary_expectation_object_block( - a_matcher_name varchar2, - a_object_name varchar2, - a_object_value varchar2, - a_object_type varchar2 - ) return varchar2; - - function binary_expectation_block( - a_matcher_name varchar2, - a_actual_data_type varchar2, - a_actual_data varchar2, - a_expected_data_type varchar2, - a_expected_data varchar2 - ) return varchar2; - - function failed_expectations_data return anydata; - - procedure cleanup_expectations; - -end expectations; -/ diff --git a/test/core/expectations/binary/test_be_greater_or_equal.pkb b/test/core/expectations/binary/test_be_greater_or_equal.pkb deleted file mode 100644 index f41878643..000000000 --- a/test/core/expectations/binary/test_be_greater_or_equal.pkb +++ /dev/null @@ -1,263 +0,0 @@ -create or replace package body test_be_greater_or_equal is - - procedure cleanup_expectations is - begin - expectations.cleanup_expectations( ); - end; - - function to_greater_equal_block( - a_data_type varchar2, - a_actual varchar2, - a_expected varchar2 - ) return varchar2 is - begin - return expectations.binary_expectation_block( - 'to_be_greater_or_equal', a_data_type, a_actual, a_data_type, a_expected - ); - end; - - function not_to_greater_equal_block( - a_data_type varchar2, - a_actual varchar2, - a_expected varchar2 - ) return varchar2 is - begin - return expectations.binary_expectation_block( - 'not_to_be_greater_or_equal', a_data_type, a_actual, a_data_type, a_expected - ); - end; - - procedure actual_date_greater is - begin - --Act - execute immediate to_greater_equal_block('date', 'sysdate', 'sysdate-1'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure actual_number_greater is - begin - --Act - execute immediate to_greater_equal_block('number', '2.0', '1.99'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure actual_interval_ym_greater is - begin - --Act - execute immediate to_greater_equal_block('interval year to month', '''2-1''', '''2-0'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure actual_interval_ds_greater is - begin - --Act - execute immediate to_greater_equal_block('interval day to second', '''2 01:00:00''', '''2 00:59:59'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure actual_timestamp_greater is - begin - --Act - execute immediate to_greater_equal_block('timestamp', 'to_timestamp(''1997 13'',''YYYY FF'')', 'to_timestamp(''1997 12'',''YYYY FF'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure actual_timestamp_tz_greater is - begin - --Act - execute immediate to_greater_equal_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure actual_timestamp_ltz_greater is - begin - --Act - execute immediate to_greater_equal_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure actual_date_equal is - begin - --Act - execute immediate to_greater_equal_block('date', 'sysdate', 'sysdate'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure actual_number_equal is - begin - --Act - execute immediate to_greater_equal_block('number', '2.0', '2.00'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure actual_interval_ym_equal is - begin - --Act - execute immediate to_greater_equal_block('interval year to month', '''2-1''', '''2-1'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure actual_interval_ds_equal is - begin - --Act - execute immediate to_greater_equal_block('interval day to second', '''2 01:00:00''', '''2 01:00:00'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure actual_timestamp_equal is - begin - --Act - execute immediate to_greater_equal_block('timestamp', 'to_timestamp(''1997 13'',''YYYY FF'')', 'to_timestamp(''1997 13'',''YYYY FF'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure actual_timestamp_tz_equal is - begin - --Act - execute immediate to_greater_equal_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure actual_timestamp_ltz_equal is - begin - --Act - execute immediate to_greater_equal_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure actual_date_less is - begin - --Act - execute immediate to_greater_equal_block('date', 'sysdate-1', 'sysdate'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_number_less is - begin - --Act - execute immediate to_greater_equal_block('number', '1.0', '1.01'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_interval_ym_less is - begin - --Act - execute immediate to_greater_equal_block('interval year to month', '''2-1''', '''2-2'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_interval_ds_less is - begin - --Act - execute immediate to_greater_equal_block('interval day to second', '''2 00:59:58''', '''2 00:59:59'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_timestamp_less is - begin - --Act - execute immediate to_greater_equal_block('timestamp', 'to_timestamp(''1997 12'',''YYYY FF'')', 'to_timestamp(''1997 13'',''YYYY FF'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_timestamp_tz_less is - begin - --Act - execute immediate to_greater_equal_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +03:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_timestamp_ltz_less is - begin - --Act - execute immediate to_greater_equal_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +03:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure not_actual_date_greater is - begin - --Act - execute immediate not_to_greater_equal_block('date', 'sysdate', 'sysdate-1'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure not_actual_number_greater is - begin - --Act - execute immediate not_to_greater_equal_block('number', '2.0', '1.99'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure not_actual_interval_ym_greater is - begin - --Act - execute immediate not_to_greater_equal_block('interval year to month', '''2-1''', '''2-0'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure not_actual_interval_ds_greater is - begin - --Act - execute immediate not_to_greater_equal_block('interval day to second', '''2 01:00:00''', '''2 00:59:59'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure not_actual_timestamp_greater is - begin - --Act - execute immediate not_to_greater_equal_block('timestamp', 'to_timestamp(''1997 13'',''YYYY FF'')', 'to_timestamp(''1997 12'',''YYYY FF'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure not_actual_timestamp_tz_gretr is - begin - --Act - execute immediate not_to_greater_equal_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure not_actual_timestamp_ltz_gretr is - begin - --Act - execute immediate not_to_greater_equal_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_clob is - begin - --Act - ut3.ut.expect(to_clob('3')).to_( ut3.be_greater_or_equal(3) ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - -end; -/ diff --git a/test/core/expectations/binary/test_be_greater_or_equal.pks b/test/core/expectations/binary/test_be_greater_or_equal.pks deleted file mode 100644 index 077dff59c..000000000 --- a/test/core/expectations/binary/test_be_greater_or_equal.pks +++ /dev/null @@ -1,97 +0,0 @@ -create or replace package test_be_greater_or_equal is - - --%suite((not)to_be_greater_or_equal) - --%suitepath(utplsql.core.expectations.binary) - - --%aftereach - procedure cleanup_expectations; - - --%test(Gives success when actual date is greater than expected) - procedure actual_date_greater; - - --%test(Gives success when actual number is greater than expected) - procedure actual_number_greater; - - --%test(Gives success when actual interval year to month is greater than expected) - procedure actual_interval_ym_greater; - - --%test(Gives success when actual interval day to second is greater than expected) - procedure actual_interval_ds_greater; - - --%test(Gives success when actual timestamp is greater than expected) - procedure actual_timestamp_greater; - - --%test(Gives success when actual timestamp with time zone is greater than expected) - procedure actual_timestamp_tz_greater; - - --%test(Gives success when actual timestamp with local time zone is greater than expected) - procedure actual_timestamp_ltz_greater; - - --%test(Gives success when actual date is equal expected) - procedure actual_date_equal; - - --%test(Gives success when actual number is equal expected) - procedure actual_number_equal; - - --%test(Gives success when actual interval year to month is equal expected) - procedure actual_interval_ym_equal; - - --%test(Gives success when actual interval day to second is equal expected) - procedure actual_interval_ds_equal; - - --%test(Gives success when actual timestamp is equal expected) - procedure actual_timestamp_equal; - - --%test(Gives success when actual timestamp with time zone is equal expected) - procedure actual_timestamp_tz_equal; - - --%test(Gives success when actual timestamp with local time zone is equal expected) - procedure actual_timestamp_ltz_equal; - - --%test(Gives failure when actual date is less than expected) - procedure actual_date_less; - - --%test(Gives failure when actual number is less than expected) - procedure actual_number_less; - - --%test(Gives failure when actual interval year to month is less than expected) - procedure actual_interval_ym_less; - - --%test(Gives failure when actual interval day to second is less than expected) - procedure actual_interval_ds_less; - - --%test(Gives failure when actual timestamp is less than expected) - procedure actual_timestamp_less; - - --%test(Gives failure when actual timestamp with time zone is less than expected) - procedure actual_timestamp_tz_less; - - --%test(Gives failure when actual timestamp with local time zone is less than expected) - procedure actual_timestamp_ltz_less; - - --%test(Negated - Gives failure when actual date is greater than expected) - procedure not_actual_date_greater; - - --%test(Negated - Gives failure when actual number is greater than expected) - procedure not_actual_number_greater; - - --%test(Negated - Gives failure when actual interval year to month is greater than expected) - procedure not_actual_interval_ym_greater; - - --%test(Negated - Gives failure when actual interval day to second is greater than expected) - procedure not_actual_interval_ds_greater; - - --%test(Negated - Gives failure when actual timestamp is greater than expected) - procedure not_actual_timestamp_greater; - - --%test(Negated - Gives failure when actual timestamp with time zone is greater than expected) - procedure not_actual_timestamp_tz_gretr; - - --%test(Negated - Gives failure when actual timestamp with local time zone is greater than expected) - procedure not_actual_timestamp_ltz_gretr; - - --%test(Gives failure when running against CLOB) - procedure actual_clob; - -end; -/ diff --git a/test/core/expectations/binary/test_be_greater_than.pkb b/test/core/expectations/binary/test_be_greater_than.pkb deleted file mode 100644 index 5863b11b1..000000000 --- a/test/core/expectations/binary/test_be_greater_than.pkb +++ /dev/null @@ -1,263 +0,0 @@ -create or replace package body test_be_greater_than is - - procedure cleanup_expectations is - begin - expectations.cleanup_expectations( ); - end; - - function to_greater_than_block( - a_data_type varchar2, - a_actual varchar2, - a_expected varchar2 - ) return varchar2 is - begin - return expectations.binary_expectation_block( - 'to_be_greater_than', a_data_type, a_actual, a_data_type, a_expected - ); - end; - - function not_to_greater_than_block( - a_data_type varchar2, - a_actual varchar2, - a_expected varchar2 - ) return varchar2 is - begin - return expectations.binary_expectation_block( - 'not_to_be_greater_than', a_data_type, a_actual, a_data_type, a_expected - ); - end; - - procedure actual_date_greater is - begin - --Act - execute immediate to_greater_than_block('date', 'sysdate', 'sysdate-1'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure actual_number_greater is - begin - --Act - execute immediate to_greater_than_block('number', '2.0', '1.99'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure actual_interval_ym_greater is - begin - --Act - execute immediate to_greater_than_block('interval year to month', '''2-1''', '''2-0'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure actual_interval_ds_greater is - begin - --Act - execute immediate to_greater_than_block('interval day to second', '''2 01:00:00''', '''2 00:59:59'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure actual_timestamp_greater is - begin - --Act - execute immediate to_greater_than_block('timestamp', 'to_timestamp(''1997 13'',''YYYY FF'')', 'to_timestamp(''1997 12'',''YYYY FF'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure actual_timestamp_tz_greater is - begin - --Act - execute immediate to_greater_than_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure actual_timestamp_ltz_greater is - begin - --Act - execute immediate to_greater_than_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure actual_date_equal is - begin - --Act - execute immediate to_greater_than_block('date', 'sysdate', 'sysdate'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_number_equal is - begin - --Act - execute immediate to_greater_than_block('number', '2.0', '2.00'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_interval_ym_equal is - begin - --Act - execute immediate to_greater_than_block('interval year to month', '''2-1''', '''2-1'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_interval_ds_equal is - begin - --Act - execute immediate to_greater_than_block('interval day to second', '''2 01:00:00''', '''2 01:00:00'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_timestamp_equal is - begin - --Act - execute immediate to_greater_than_block('timestamp', 'to_timestamp(''1997 13'',''YYYY FF'')', 'to_timestamp(''1997 13'',''YYYY FF'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_timestamp_tz_equal is - begin - --Act - execute immediate to_greater_than_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_timestamp_ltz_equal is - begin - --Act - execute immediate to_greater_than_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_date_less is - begin - --Act - execute immediate to_greater_than_block('date', 'sysdate-1', 'sysdate'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_number_less is - begin - --Act - execute immediate to_greater_than_block('number', '1.0', '1.01'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_interval_ym_less is - begin - --Act - execute immediate to_greater_than_block('interval year to month', '''2-1''', '''2-2'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_interval_ds_less is - begin - --Act - execute immediate to_greater_than_block('interval day to second', '''2 00:59:58''', '''2 00:59:59'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_timestamp_less is - begin - --Act - execute immediate to_greater_than_block('timestamp', 'to_timestamp(''1997 12'',''YYYY FF'')', 'to_timestamp(''1997 13'',''YYYY FF'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_timestamp_tz_less is - begin - --Act - execute immediate to_greater_than_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +03:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_timestamp_ltz_less is - begin - --Act - execute immediate to_greater_than_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +03:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure not_actual_date_greater is - begin - --Act - execute immediate not_to_greater_than_block('date', 'sysdate', 'sysdate-1'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure not_actual_number_greater is - begin - --Act - execute immediate not_to_greater_than_block('number', '2.0', '1.99'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure not_actual_interval_ym_greater is - begin - --Act - execute immediate not_to_greater_than_block('interval year to month', '''2-1''', '''2-0'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure not_actual_interval_ds_greater is - begin - --Act - execute immediate not_to_greater_than_block('interval day to second', '''2 01:00:00''', '''2 00:59:59'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure not_actual_timestamp_greater is - begin - --Act - execute immediate not_to_greater_than_block('timestamp', 'to_timestamp(''1997 13'',''YYYY FF'')', 'to_timestamp(''1997 12'',''YYYY FF'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure not_actual_timestamp_tz_gretr is - begin - --Act - execute immediate not_to_greater_than_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure not_actual_timestamp_ltz_gretr is - begin - --Act - execute immediate not_to_greater_than_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_clob is - begin - --Act - ut3.ut.expect(to_clob('3')).to_( ut3.be_greater_than(2) ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - -end; -/ diff --git a/test/core/expectations/binary/test_be_greater_than.pks b/test/core/expectations/binary/test_be_greater_than.pks deleted file mode 100644 index 6a1dfcc3e..000000000 --- a/test/core/expectations/binary/test_be_greater_than.pks +++ /dev/null @@ -1,97 +0,0 @@ -create or replace package test_be_greater_than is - - --%suite((not)to_be_greater_than) - --%suitepath(utplsql.core.expectations.binary) - - --%aftereach - procedure cleanup_expectations; - - --%test(Gives success when actual date is greater than expected) - procedure actual_date_greater; - - --%test(Gives success when actual number is greater than expected) - procedure actual_number_greater; - - --%test(Gives success when actual interval year to month is greater than expected) - procedure actual_interval_ym_greater; - - --%test(Gives success when actual interval day to second is greater than expected) - procedure actual_interval_ds_greater; - - --%test(Gives success when actual timestamp is greater than expected) - procedure actual_timestamp_greater; - - --%test(Gives success when actual timestamp with time zone is greater than expected) - procedure actual_timestamp_tz_greater; - - --%test(Gives success when actual timestamp with local time zone is greater than expected) - procedure actual_timestamp_ltz_greater; - - --%test(Gives failure when actual date is equal expected) - procedure actual_date_equal; - - --%test(Gives failure when actual number is equal expected) - procedure actual_number_equal; - - --%test(Gives failure when actual interval year to month is equal expected) - procedure actual_interval_ym_equal; - - --%test(Gives failure when actual interval day to second is equal expected) - procedure actual_interval_ds_equal; - - --%test(Gives failure when actual timestamp is equal expected) - procedure actual_timestamp_equal; - - --%test(Gives failure when actual timestamp with time zone is equal expected) - procedure actual_timestamp_tz_equal; - - --%test(Gives failure when actual timestamp with local time zone is equal expected) - procedure actual_timestamp_ltz_equal; - - --%test(Gives failure when actual date is less than expected) - procedure actual_date_less; - - --%test(Gives failure when actual number is less than expected) - procedure actual_number_less; - - --%test(Gives failure when actual interval year to month is less than expected) - procedure actual_interval_ym_less; - - --%test(Gives failure when actual interval day to second is less than expected) - procedure actual_interval_ds_less; - - --%test(Gives failure when actual timestamp is less than expected) - procedure actual_timestamp_less; - - --%test(Gives failure when actual timestamp with time zone is less than expected) - procedure actual_timestamp_tz_less; - - --%test(Gives failure when actual timestamp with local time zone is less than expected) - procedure actual_timestamp_ltz_less; - - --%test(Negated - Gives failure when actual date is greater than expected) - procedure not_actual_date_greater; - - --%test(Negated - Gives failure when actual number is greater than expected) - procedure not_actual_number_greater; - - --%test(Negated - Gives failure when actual interval year to month is greater than expected) - procedure not_actual_interval_ym_greater; - - --%test(Negated - Gives failure when actual interval day to second is greater than expected) - procedure not_actual_interval_ds_greater; - - --%test(Negated - Gives failure when actual timestamp is greater than expected) - procedure not_actual_timestamp_greater; - - --%test(Negated - Gives failure when actual timestamp with time zone is greater than expected) - procedure not_actual_timestamp_tz_gretr; - - --%test(Negated - Gives failure when actual timestamp with local time zone is greater than expected) - procedure not_actual_timestamp_ltz_gretr; - - --%test(Gives failure when running against CLOB) - procedure actual_clob; - -end; -/ diff --git a/test/core/expectations/binary/test_be_less_or_equal.pkb b/test/core/expectations/binary/test_be_less_or_equal.pkb deleted file mode 100644 index c72e0039b..000000000 --- a/test/core/expectations/binary/test_be_less_or_equal.pkb +++ /dev/null @@ -1,263 +0,0 @@ -create or replace package body test_be_less_or_equal is - - procedure cleanup_expectations is - begin - expectations.cleanup_expectations( ); - end; - - function to_less_or_equal_block( - a_data_type varchar2, - a_actual varchar2, - a_expected varchar2 - ) return varchar2 is - begin - return expectations.binary_expectation_block( - 'to_be_less_or_equal', a_data_type, a_actual, a_data_type, a_expected - ); - end; - - function not_to_less_or_equal_block( - a_data_type varchar2, - a_actual varchar2, - a_expected varchar2 - ) return varchar2 is - begin - return expectations.binary_expectation_block( - 'not_to_be_less_or_equal', a_data_type, a_actual, a_data_type, a_expected - ); - end; - - procedure actual_date_greater is - begin - --Act - execute immediate to_less_or_equal_block('date', 'sysdate', 'sysdate-1'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty(); - end; - - procedure actual_number_greater is - begin - --Act - execute immediate to_less_or_equal_block('number', '2.0', '1.99'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty(); - end; - - procedure actual_interval_ym_greater is - begin - --Act - execute immediate to_less_or_equal_block('interval year to month', '''2-1''', '''2-0'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty(); - end; - - procedure actual_interval_ds_greater is - begin - --Act - execute immediate to_less_or_equal_block('interval day to second', '''2 01:00:00''', '''2 00:59:59'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty(); - end; - - procedure actual_timestamp_greater is - begin - --Act - execute immediate to_less_or_equal_block('timestamp', 'to_timestamp(''1997 13'',''YYYY FF'')', 'to_timestamp(''1997 12'',''YYYY FF'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty(); - end; - - procedure actual_timestamp_tz_greater is - begin - --Act - execute immediate to_less_or_equal_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty(); - end; - - procedure actual_timestamp_ltz_greater is - begin - --Act - execute immediate to_less_or_equal_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty(); - end; - - procedure actual_date_equal is - begin - --Act - execute immediate to_less_or_equal_block('date', 'sysdate', 'sysdate'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty(); - end; - - procedure actual_number_equal is - begin - --Act - execute immediate to_less_or_equal_block('number', '2.0', '2.00'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty(); - end; - - procedure actual_interval_ym_equal is - begin - --Act - execute immediate to_less_or_equal_block('interval year to month', '''2-1''', '''2-1'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty(); - end; - - procedure actual_interval_ds_equal is - begin - --Act - execute immediate to_less_or_equal_block('interval day to second', '''2 01:00:00''', '''2 01:00:00'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty(); - end; - - procedure actual_timestamp_equal is - begin - --Act - execute immediate to_less_or_equal_block('timestamp', 'to_timestamp(''1997 13'',''YYYY FF'')', 'to_timestamp(''1997 13'',''YYYY FF'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty(); - end; - - procedure actual_timestamp_tz_equal is - begin - --Act - execute immediate to_less_or_equal_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty(); - end; - - procedure actual_timestamp_ltz_equal is - begin - --Act - execute immediate to_less_or_equal_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty(); - end; - - procedure actual_date_less is - begin - --Act - execute immediate to_less_or_equal_block('date', 'sysdate-1', 'sysdate'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty(); - end; - - procedure actual_number_less is - begin - --Act - execute immediate to_less_or_equal_block('number', '1.0', '1.01'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty(); - end; - - procedure actual_interval_ym_less is - begin - --Act - execute immediate to_less_or_equal_block('interval year to month', '''2-1''', '''2-2'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty(); - end; - - procedure actual_interval_ds_less is - begin - --Act - execute immediate to_less_or_equal_block('interval day to second', '''2 00:59:58''', '''2 00:59:59'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty(); - end; - - procedure actual_timestamp_less is - begin - --Act - execute immediate to_less_or_equal_block('timestamp', 'to_timestamp(''1997 12'',''YYYY FF'')', 'to_timestamp(''1997 13'',''YYYY FF'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty(); - end; - - procedure actual_timestamp_tz_less is - begin - --Act - execute immediate to_less_or_equal_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +03:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty(); - end; - - procedure actual_timestamp_ltz_less is - begin - --Act - execute immediate to_less_or_equal_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +03:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty(); - end; - - procedure not_actual_date_greater is - begin - --Act - execute immediate not_to_less_or_equal_block('date', 'sysdate', 'sysdate-1'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty(); - end; - - procedure not_actual_number_greater is - begin - --Act - execute immediate not_to_less_or_equal_block('number', '2.0', '1.99'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty(); - end; - - procedure not_actual_interval_ym_greater is - begin - --Act - execute immediate not_to_less_or_equal_block('interval year to month', '''2-1''', '''2-0'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty(); - end; - - procedure not_actual_interval_ds_greater is - begin - --Act - execute immediate not_to_less_or_equal_block('interval day to second', '''2 01:00:00''', '''2 00:59:59'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty(); - end; - - procedure not_actual_timestamp_greater is - begin - --Act - execute immediate not_to_less_or_equal_block('timestamp', 'to_timestamp(''1997 13'',''YYYY FF'')', 'to_timestamp(''1997 12'',''YYYY FF'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty(); - end; - - procedure not_actual_timestamp_tz_gretr is - begin - --Act - execute immediate not_to_less_or_equal_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty(); - end; - - procedure not_actual_timestamp_ltz_gretr is - begin - --Act - execute immediate not_to_less_or_equal_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty(); - end; - - procedure actual_clob is - begin - --Act - ut3.ut.expect(to_clob('3')).to_( ut3.be_less_or_equal(3) ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - -end; -/ diff --git a/test/core/expectations/binary/test_be_less_or_equal.pks b/test/core/expectations/binary/test_be_less_or_equal.pks deleted file mode 100644 index a6ab01664..000000000 --- a/test/core/expectations/binary/test_be_less_or_equal.pks +++ /dev/null @@ -1,97 +0,0 @@ -create or replace package test_be_less_or_equal is - - --%suite((not)to_be_less_or_equal) - --%suitepath(utplsql.core.expectations.binary) - - --%aftereach - procedure cleanup_expectations; - - --%test(Gives failure when actual date is greater than expected) - procedure actual_date_greater; - - --%test(Gives failure when actual number is greater than expected) - procedure actual_number_greater; - - --%test(Gives failure when actual interval year to month is greater than expected) - procedure actual_interval_ym_greater; - - --%test(Gives failure when actual interval day to second is greater than expected) - procedure actual_interval_ds_greater; - - --%test(Gives failure when actual timestamp is greater than expected) - procedure actual_timestamp_greater; - - --%test(Gives failure when actual timestamp with time zone is greater than expected) - procedure actual_timestamp_tz_greater; - - --%test(Gives failure when actual timestamp with local time zone is greater than expected) - procedure actual_timestamp_ltz_greater; - - --%test(Gives success when actual date is equal expected) - procedure actual_date_equal; - - --%test(Gives success when actual number is equal expected) - procedure actual_number_equal; - - --%test(Gives success when actual interval year to month is equal expected) - procedure actual_interval_ym_equal; - - --%test(Gives success when actual interval day to second is equal expected) - procedure actual_interval_ds_equal; - - --%test(Gives success when actual timestamp is equal expected) - procedure actual_timestamp_equal; - - --%test(Gives success when actual timestamp with time zone is equal expected) - procedure actual_timestamp_tz_equal; - - --%test(Gives success when actual timestamp with local time zone is equal expected) - procedure actual_timestamp_ltz_equal; - - --%test(Gives success when actual date is less than expected) - procedure actual_date_less; - - --%test(Gives success when actual number is less than expected) - procedure actual_number_less; - - --%test(Gives success when actual interval year to month is less than expected) - procedure actual_interval_ym_less; - - --%test(Gives success when actual interval day to second is less than expected) - procedure actual_interval_ds_less; - - --%test(Gives success when actual timestamp is less than expected) - procedure actual_timestamp_less; - - --%test(Gives success when actual timestamp with time zone is less than expected) - procedure actual_timestamp_tz_less; - - --%test(Gives success when actual timestamp with local time zone is less than expected) - procedure actual_timestamp_ltz_less; - - --%test(Negated - Gives success when actual date is greater than expected) - procedure not_actual_date_greater; - - --%test(Negated - Gives success when actual number is greater than expected) - procedure not_actual_number_greater; - - --%test(Negated - Gives success when actual interval year to month is greater than expected) - procedure not_actual_interval_ym_greater; - - --%test(Negated - Gives success when actual interval day to second is greater than expected) - procedure not_actual_interval_ds_greater; - - --%test(Negated - Gives success when actual timestamp is greater than expected) - procedure not_actual_timestamp_greater; - - --%test(Negated - Gives success when actual timestamp with time zone is greater than expected) - procedure not_actual_timestamp_tz_gretr; - - --%test(Negated - Gives success when actual timestamp with local time zone is greater than expected) - procedure not_actual_timestamp_ltz_gretr; - - --%test(Gives failure when running against CLOB) - procedure actual_clob; - -end; -/ diff --git a/test/core/expectations/binary/test_equal.pkb b/test/core/expectations/binary/test_equal.pkb deleted file mode 100644 index dd7dd7a82..000000000 --- a/test/core/expectations/binary/test_equal.pkb +++ /dev/null @@ -1,264 +0,0 @@ -create or replace package body test_equal is - - procedure reset_nulls_equal is - begin - ut3.ut_expectation_processor.nulls_Are_equal(ut3.ut_expectation_processor.gc_default_nulls_are_equal); - end; - - procedure cleanup_expectations is - begin - expectations.cleanup_expectations( ); - end; - - function to_equal_block( - a_matcher_name varchar2, - a_actual_type varchar2, - a_expected_type varchar2, - a_actual varchar2, - a_expected varchar2, - a_nulls_equal boolean := null - ) return varchar2 is - l_nulls_equal varchar2(10); - begin - l_nulls_equal := case when a_nulls_equal then 'true' when not a_nulls_equal then 'false' else 'null' end; - return ' - declare - l_actual '||a_actual_type||' := '||a_actual||'; - l_expected '||a_expected_type||' := '||a_expected||'; - begin - ut3.ut.expect( l_actual ).'||a_matcher_name||'(l_expected, a_nulls_are_equal=>'||l_nulls_equal||'); - end;'; - end; - - procedure test_to_equal_success( - a_actual_type varchar2, - a_expected_type varchar2, - a_actual varchar2, - a_expected varchar2, - a_nulls_equal boolean := null - ) is - begin - execute immediate - to_equal_block( 'to_equal', a_actual_type, a_expected_type, a_actual, a_expected, a_nulls_equal ); - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty(); - cleanup_expectations; - end; - - procedure test_to_equal_success( - a_actual_type varchar2, - a_actual varchar2, - a_expected varchar2, - a_nulls_equal boolean := null - ) is - begin - test_to_equal_success(a_actual_type, a_actual_type, a_actual, a_expected, a_nulls_equal); - end; - - - procedure test_to_equal_fail( - a_actual_type varchar2, - a_expected_type varchar2, - a_actual varchar2, - a_expected varchar2, - a_nulls_equal boolean := null - ) is - begin - execute immediate - to_equal_block( 'to_equal', a_actual_type, a_expected_type, a_actual, a_expected, a_nulls_equal ); - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty(); - cleanup_expectations; - end; - - procedure test_not_to_equal_fail( - a_actual_type varchar2, - a_expected_type varchar2, - a_actual varchar2, - a_expected varchar2, - a_nulls_equal boolean := null - ) is - begin - execute immediate - to_equal_block( 'not_to_equal', a_actual_type, a_expected_type, a_actual, a_expected, a_nulls_equal ); - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty(); - cleanup_expectations; - end; - - procedure test_to_equal_fail( - a_actual_type varchar2, - a_actual varchar2, - a_expected varchar2, - a_nulls_equal boolean := null - ) is - begin - test_to_equal_fail(a_actual_type, a_actual_type, a_actual, a_expected, a_nulls_equal); - end; - - procedure equal_fail_on_type_diff is - begin - test_to_equal_fail('boolean', 'integer', 'true', '1'); - test_to_equal_fail('integer', 'boolean', '1', 'true'); - test_to_equal_fail('blob', 'clob', 'to_blob(''ABC'')', '''ABC'''); - test_to_equal_fail('clob', 'blob', '''ABC''', 'to_blob(''ABC'')'); - test_to_equal_fail('clob', 'anydata', '''ABC''', 'null'); - test_to_equal_fail('anydata', 'sys_refcursor', 'null', 'null'); - test_to_equal_fail('sys_refcursor', 'anydata', 'null', 'null'); - test_to_equal_fail('clob', 'varchar2(4000)', '''Abc''', '''Abc'''); - test_to_equal_fail('date', 'timestamp', 'sysdate', 'sysdate'); - test_to_equal_fail('date', 'timestamp with local time zone', 'sysdate', 'sysdate'); - test_to_equal_fail('timestamp', 'date', 'sysdate', 'sysdate'); - test_to_equal_fail('timestamp with local time zone', 'timestamp', 'sysdate', 'sysdate'); - test_to_equal_fail('timestamp with local time zone', 'timestamp with time zone', 'sysdate', 'sysdate'); - test_to_equal_fail('number', 'varchar2(4000)', '1', '''1'''); - test_to_equal_fail('varchar2(4000)', 'number', '''1''', '1'); - test_to_equal_fail('varchar2(4000)', 'boolean', '''true''', 'true'); - test_to_equal_fail('interval day to second', 'interval year to month', '''2 01:00:00''', '''1-1'''); - test_to_equal_fail('interval year to month', 'interval day to second', '''1-1''', '''2 01:00:00'''); - end; - - procedure not_equal_fail_on_type_diff is - begin - test_not_to_equal_fail('boolean', 'integer', 'true', '1'); - test_not_to_equal_fail('integer', 'boolean', '1', 'true'); - test_not_to_equal_fail('blob', 'clob', 'to_blob(''ABC'')', '''ABC'''); - test_not_to_equal_fail('clob', 'blob', '''ABC''', 'to_blob(''ABC'')'); - test_not_to_equal_fail('clob', 'anydata', '''ABC''', 'null'); - test_not_to_equal_fail('anydata', 'sys_refcursor', 'null', 'null'); - test_not_to_equal_fail('sys_refcursor', 'anydata', 'null', 'null'); - test_not_to_equal_fail('clob', 'varchar2(4000)', '''Abc''', '''Abc'''); - test_not_to_equal_fail('date', 'timestamp', 'sysdate', 'sysdate'); - test_not_to_equal_fail('date', 'timestamp with local time zone', 'sysdate', 'sysdate'); - test_not_to_equal_fail('timestamp', 'date', 'sysdate', 'sysdate'); - test_not_to_equal_fail('timestamp with local time zone', 'timestamp', 'sysdate', 'sysdate'); - test_not_to_equal_fail('timestamp with local time zone', 'timestamp with time zone', 'sysdate', 'sysdate'); - test_not_to_equal_fail('number', 'varchar2(4000)', '1', '''1'''); - test_not_to_equal_fail('varchar2(4000)', 'number', '''1''', '1'); - test_not_to_equal_fail('varchar2(4000)', 'boolean', '''true''', 'true'); - test_not_to_equal_fail('interval day to second', 'interval year to month', '''2 01:00:00''', '''1-1'''); - test_not_to_equal_fail('interval year to month', 'interval day to second', '''1-1''', '''2 01:00:00'''); - end; - - procedure failure_on_data_diff is - begin - test_to_equal_fail('blob', 'to_blob(''abc'')', 'to_blob(''abd'')'); - test_to_equal_fail('boolean', 'false', 'true'); - test_to_equal_fail('boolean', 'true', 'false'); - test_to_equal_fail('clob', '''Abc''', '''abc'''); - test_to_equal_fail('date', 'sysdate', 'sysdate-1'); - test_to_equal_fail('number', '0.1', '0.3'); - test_to_equal_fail('timestamp', 'systimestamp', 'systimestamp'); - test_to_equal_fail('timestamp with local time zone', 'systimestamp', 'systimestamp'); - test_to_equal_fail('timestamp with time zone', 'systimestamp', 'systimestamp'); - test_to_equal_fail('varchar2(4000)', '''Abc''', '''abc'''); - test_to_equal_fail('interval day to second', '''2 01:00:00''', '''2 01:00:01'''); - test_to_equal_fail('interval year to month', '''1-1''', '''1-2'''); - end; - - procedure failure_on_actual_null is - begin - test_to_equal_fail('blob', 'NULL', 'to_blob(''abc'')'); - test_to_equal_fail('boolean', 'NULL', 'true'); - test_to_equal_fail('clob', 'NULL', '''abc'''); - test_to_equal_fail('date', 'NULL', 'sysdate'); - test_to_equal_fail('number', 'NULL', '1'); - test_to_equal_fail('timestamp', 'NULL', 'systimestamp'); - test_to_equal_fail('timestamp with local time zone', 'NULL', 'systimestamp'); - test_to_equal_fail('timestamp with time zone', 'NULL', 'systimestamp'); - test_to_equal_fail('varchar2(4000)', 'NULL', '''abc'''); - test_to_equal_fail('interval day to second', 'NULL', '''2 01:00:00'''); - test_to_equal_fail('interval year to month', 'NULL', '''1-1'''); - end; - - procedure failure_on_expected_null is - begin - test_to_equal_fail('blob', 'to_blob(''abc'')', 'NULL'); - test_to_equal_fail('boolean', 'true', 'NULL'); - test_to_equal_fail('clob', '''abc''', 'NULL'); - test_to_equal_fail('date', 'sysdate', 'NULL'); - test_to_equal_fail('number', '1234', 'NULL'); - test_to_equal_fail('timestamp', 'systimestamp', 'NULL'); - test_to_equal_fail('timestamp with local time zone', 'systimestamp', 'NULL'); - test_to_equal_fail('timestamp with time zone', 'systimestamp', 'NULL'); - test_to_equal_fail('varchar2(4000)', '''abc''', 'NULL'); - test_to_equal_fail('interval day to second', '''2 01:00:00''', 'NULL'); - test_to_equal_fail('interval year to month', '''1-1''', 'NULL'); - end; - - procedure failure_on_both_null_with_parm is - begin - test_to_equal_fail('blob', 'NULL', 'NULL', false); - test_to_equal_fail('boolean', 'NULL', 'NULL', false); - test_to_equal_fail('clob', 'NULL', 'NULL', false); - test_to_equal_fail('date', 'NULL', 'NULL', false); - test_to_equal_fail('number', 'NULL', 'NULL', false); - test_to_equal_fail('timestamp', 'NULL', 'NULL', false); - test_to_equal_fail('timestamp with local time zone', 'NULL', 'NULL', false); - test_to_equal_fail('timestamp with time zone', 'NULL', 'NULL', false); - test_to_equal_fail('varchar2(4000)', 'NULL', 'NULL', false); - test_to_equal_fail('interval day to second', 'NULL', 'NULL', false); - test_to_equal_fail('interval year to month', 'NULL', 'NULL', false); - end; - - procedure failure_on_both_null_with_conf is - begin - ut3.ut_expectation_processor.nulls_Are_equal(false); - test_to_equal_fail('blob', 'NULL', 'NULL'); - test_to_equal_fail('boolean', 'NULL', 'NULL'); - test_to_equal_fail('clob', 'NULL', 'NULL'); - test_to_equal_fail('date', 'NULL', 'NULL'); - test_to_equal_fail('number', 'NULL', 'NULL'); - test_to_equal_fail('timestamp', 'NULL', 'NULL'); - test_to_equal_fail('timestamp with local time zone', 'NULL', 'NULL'); - test_to_equal_fail('timestamp with time zone', 'NULL', 'NULL'); - test_to_equal_fail('varchar2(4000)', 'NULL', 'NULL'); - test_to_equal_fail('interval day to second', 'NULL', 'NULL'); - test_to_equal_fail('interval year to month', 'NULL', 'NULL'); - end; - - procedure success_on_equal_data is - begin - test_to_equal_success('blob', 'to_blob(''Abc'')', 'to_blob(''abc'')'); - test_to_equal_success('boolean', 'true', 'true'); - test_to_equal_success('clob', '''Abc''', '''Abc'''); - test_to_equal_success('date', 'sysdate', 'sysdate'); - test_to_equal_success('number', '12345', '12345'); - test_to_equal_success('timestamp(9)', 'to_Timestamp(''2016 123456789'',''yyyy ff'')', 'to_Timestamp(''2016 123456789'',''yyyy ff'')'); - test_to_equal_success('timestamp(9) with local time zone', 'to_Timestamp(''2016 123456789'',''yyyy ff'')', 'to_Timestamp(''2016 123456789'',''yyyy ff'')'); - test_to_equal_success('timestamp(9) with time zone', 'to_Timestamp(''2016 123456789'',''yyyy ff'')', 'to_Timestamp(''2016 123456789'',''yyyy ff'')'); - test_to_equal_success('varchar2(4000)', '''Abc''', '''Abc'''); - test_to_equal_success('interval day to second', '''2 01:00:00''', '''2 01:00:00'''); - test_to_equal_success('interval year to month', '''1-1''', '''1-1'''); - end; - - procedure success_on_both_null is - begin - test_to_equal_success('blob', 'NULL', 'NULL'); - test_to_equal_success('boolean', 'NULL', 'NULL'); - test_to_equal_success('clob', 'NULL', 'NULL'); - test_to_equal_success('date', 'NULL', 'NULL'); - test_to_equal_success('number', 'NULL', 'NULL'); - test_to_equal_success('timestamp', 'NULL', 'NULL'); - test_to_equal_success('timestamp with local time zone', 'NULL', 'NULL'); - test_to_equal_success('timestamp with time zone', 'NULL', 'NULL'); - test_to_equal_success('varchar2(4000)', 'NULL', 'NULL'); - test_to_equal_success('interval day to second', 'NULL', 'NULL'); - test_to_equal_success('interval year to month', 'NULL', 'NULL'); - end; - - procedure success_on_both_null_with_parm is - begin - ut3.ut_expectation_processor.nulls_Are_equal(false); - test_to_equal_success('blob', 'NULL', 'NULL', true); - test_to_equal_success('boolean', 'NULL', 'NULL', true); - test_to_equal_success('clob', 'NULL', 'NULL', true); - test_to_equal_success('date', 'NULL', 'NULL', true); - test_to_equal_success('number', 'NULL', 'NULL', true); - test_to_equal_success('timestamp', 'NULL', 'NULL', true); - test_to_equal_success('timestamp with local time zone', 'NULL', 'NULL', true); - test_to_equal_success('timestamp with time zone', 'NULL', 'NULL', true); - test_to_equal_success('varchar2(4000)', 'NULL', 'NULL', true); - test_to_equal_success('interval day to second', 'NULL', 'NULL', true); - test_to_equal_success('interval year to month', 'NULL', 'NULL', true); - end; - -end; -/ diff --git a/test/core/expectations/binary/test_equal.pks b/test/core/expectations/binary/test_equal.pks deleted file mode 100644 index c0280c288..000000000 --- a/test/core/expectations/binary/test_equal.pks +++ /dev/null @@ -1,38 +0,0 @@ -create or replace package test_equal is - - --%suite((not)to_be_equal) - --%suitepath(utplsql.core.expectations.binary) - - procedure reset_nulls_equal; - - --%aftereach - procedure cleanup_expectations; - - --%test(Gives failure for different data types) - procedure equal_fail_on_type_diff; - --%test(Negated - gives failure for different data types) - procedure not_equal_fail_on_type_diff; - --%test(Gives failure for different data values) - procedure failure_on_data_diff; - --%test(Gives failure when actual is null) - procedure failure_on_actual_null; - --%test(Gives failure when expected is null) - procedure failure_on_expected_null; - --%test(Gives failure when both values are null and argument nulls_are_equal is false) - procedure failure_on_both_null_with_parm; - - --%test(Gives failure when both values are null and configuration nulls_are_equal is false) - --%aftertest(reset_nulls_equal) - procedure failure_on_both_null_with_conf; - - --%test(Gives success for equal values) - procedure success_on_equal_data; - --%test(Gives success when both values are null) - procedure success_on_both_null; - - --%test(Gives success when both values are null and argument nulls_are_equal is true) - --%aftertest(reset_nulls_equal) - procedure success_on_both_null_with_parm; - -end; -/ diff --git a/test/core/expectations/binary/test_expect_to_be_less_than.pkb b/test/core/expectations/binary/test_expect_to_be_less_than.pkb deleted file mode 100644 index 8f1278db4..000000000 --- a/test/core/expectations/binary/test_expect_to_be_less_than.pkb +++ /dev/null @@ -1,263 +0,0 @@ -create or replace package body test_expect_to_be_less_than is - - procedure cleanup_expectations is - begin - expectations.cleanup_expectations( ); - end; - - function to_be_less_than_block( - a_data_type varchar2, - a_actual varchar2, - a_expected varchar2 - ) return varchar2 is - begin - return expectations.binary_expectation_block( - 'to_be_less_than', a_data_type, a_actual, a_data_type, a_expected - ); - end; - - function not_to_be_less_than_block( - a_data_type varchar2, - a_actual varchar2, - a_expected varchar2 - ) return varchar2 is - begin - return expectations.binary_expectation_block( - 'not_to_be_less_than', a_data_type, a_actual, a_data_type, a_expected - ); - end; - - procedure actual_date_greater is - begin - --Act - execute immediate to_be_less_than_block('date', 'sysdate', 'sysdate-1'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_number_greater is - begin - --Act - execute immediate to_be_less_than_block('number', '2.0', '1.99'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_interval_ym_greater is - begin - --Act - execute immediate to_be_less_than_block('interval year to month', '''2-1''', '''2-0'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_interval_ds_greater is - begin - --Act - execute immediate to_be_less_than_block('interval day to second', '''2 01:00:00''', '''2 00:59:59'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_timestamp_greater is - begin - --Act - execute immediate to_be_less_than_block('timestamp', 'to_timestamp(''1997 13'',''YYYY FF'')', 'to_timestamp(''1997 12'',''YYYY FF'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_timestamp_tz_greater is - begin - --Act - execute immediate to_be_less_than_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_timestamp_ltz_greater is - begin - --Act - execute immediate to_be_less_than_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_date_equal is - begin - --Act - execute immediate to_be_less_than_block('date', 'sysdate', 'sysdate'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_number_equal is - begin - --Act - execute immediate to_be_less_than_block('number', '2.0', '2.00'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_interval_ym_equal is - begin - --Act - execute immediate to_be_less_than_block('interval year to month', '''2-1''', '''2-1'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_interval_ds_equal is - begin - --Act - execute immediate to_be_less_than_block('interval day to second', '''2 01:00:00''', '''2 01:00:00'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_timestamp_equal is - begin - --Act - execute immediate to_be_less_than_block('timestamp', 'to_timestamp(''1997 13'',''YYYY FF'')', 'to_timestamp(''1997 13'',''YYYY FF'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_timestamp_tz_equal is - begin - --Act - execute immediate to_be_less_than_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_timestamp_ltz_equal is - begin - --Act - execute immediate to_be_less_than_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure actual_date_less is - begin - --Act - execute immediate to_be_less_than_block('date', 'sysdate-1', 'sysdate'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure actual_number_less is - begin - --Act - execute immediate to_be_less_than_block('number', '1.0', '1.01'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure actual_interval_ym_less is - begin - --Act - execute immediate to_be_less_than_block('interval year to month', '''2-1''', '''2-2'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure actual_interval_ds_less is - begin - --Act - execute immediate to_be_less_than_block('interval day to second', '''2 00:59:58''', '''2 00:59:59'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure actual_timestamp_less is - begin - --Act - execute immediate to_be_less_than_block('timestamp', 'to_timestamp(''1997 12'',''YYYY FF'')', 'to_timestamp(''1997 13'',''YYYY FF'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure actual_timestamp_tz_less is - begin - --Act - execute immediate to_be_less_than_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +03:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure actual_timestamp_ltz_less is - begin - --Act - execute immediate to_be_less_than_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +03:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure not_actual_date_greater is - begin - --Act - execute immediate not_to_be_less_than_block('date', 'sysdate', 'sysdate-1'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure not_actual_number_greater is - begin - --Act - execute immediate not_to_be_less_than_block('number', '2.0', '1.99'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure not_actual_interval_ym_greater is - begin - --Act - execute immediate not_to_be_less_than_block('interval year to month', '''2-1''', '''2-0'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure not_actual_interval_ds_greater is - begin - --Act - execute immediate not_to_be_less_than_block('interval day to second', '''2 01:00:00''', '''2 00:59:59'''); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure not_actual_timestamp_greater is - begin - --Act - execute immediate not_to_be_less_than_block('timestamp', 'to_timestamp(''1997 13'',''YYYY FF'')', 'to_timestamp(''1997 12'',''YYYY FF'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure not_actual_timestamp_tz_gretr is - begin - --Act - execute immediate not_to_be_less_than_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure not_actual_timestamp_ltz_gretr is - begin - --Act - execute immediate not_to_be_less_than_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure actual_clob is - begin - --Act - ut3.ut.expect(to_clob('3')).to_( ut3.be_less_than(4) ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - -end; -/ diff --git a/test/core/expectations/binary/test_expect_to_be_less_than.pks b/test/core/expectations/binary/test_expect_to_be_less_than.pks deleted file mode 100644 index 67e6b8776..000000000 --- a/test/core/expectations/binary/test_expect_to_be_less_than.pks +++ /dev/null @@ -1,97 +0,0 @@ -create or replace package test_expect_to_be_less_than is - - --%suite((not)to_be_less_than) - --%suitepath(utplsql.core.expectations.binary) - - --%aftereach - procedure cleanup_expectations; - - --%test(Gives failure when actual date is greater than expected) - procedure actual_date_greater; - - --%test(Gives failure when actual number is greater than expected) - procedure actual_number_greater; - - --%test(Gives failure when actual interval year to month is greater than expected) - procedure actual_interval_ym_greater; - - --%test(Gives failure when actual interval day to second is greater than expected) - procedure actual_interval_ds_greater; - - --%test(Gives failure when actual timestamp is greater than expected) - procedure actual_timestamp_greater; - - --%test(Gives failure when actual timestamp with time zone is greater than expected) - procedure actual_timestamp_tz_greater; - - --%test(Gives failure when actual timestamp with local time zone is greater than expected) - procedure actual_timestamp_ltz_greater; - - --%test(Gives failure when actual date is equal expected) - procedure actual_date_equal; - - --%test(Gives failure when actual number is equal expected) - procedure actual_number_equal; - - --%test(Gives failure when actual interval year to month is equal expected) - procedure actual_interval_ym_equal; - - --%test(Gives failure when actual interval day to second is equal expected) - procedure actual_interval_ds_equal; - - --%test(Gives failure when actual timestamp is equal expected) - procedure actual_timestamp_equal; - - --%test(Gives failure when actual timestamp with time zone is equal expected) - procedure actual_timestamp_tz_equal; - - --%test(Gives failure when actual timestamp with local time zone is equal expected) - procedure actual_timestamp_ltz_equal; - - --%test(Gives success when actual date is less than expected) - procedure actual_date_less; - - --%test(Gives success when actual number is less than expected) - procedure actual_number_less; - - --%test(Gives success when actual interval year to month is less than expected) - procedure actual_interval_ym_less; - - --%test(Gives success when actual interval day to second is less than expected) - procedure actual_interval_ds_less; - - --%test(Gives success when actual timestamp is less than expected) - procedure actual_timestamp_less; - - --%test(Gives success when actual timestamp with time zone is less than expected) - procedure actual_timestamp_tz_less; - - --%test(Gives success when actual timestamp with local time zone is less than expected) - procedure actual_timestamp_ltz_less; - - --%test(Negated - Gives success when actual date is greater than expected) - procedure not_actual_date_greater; - - --%test(Negated - Gives success when actual number is greater than expected) - procedure not_actual_number_greater; - - --%test(Negated - Gives success when actual interval year to month is greater than expected) - procedure not_actual_interval_ym_greater; - - --%test(Negated - Gives success when actual interval day to second is greater than expected) - procedure not_actual_interval_ds_greater; - - --%test(Negated - Gives success when actual timestamp is greater than expected) - procedure not_actual_timestamp_greater; - - --%test(Negated - Gives success when actual timestamp with time zone is greater than expected) - procedure not_actual_timestamp_tz_gretr; - - --%test(Negated - Gives success when actual timestamp with local time zone is greater than expected) - procedure not_actual_timestamp_ltz_gretr; - - --%test(Gives failure when running against CLOB) - procedure actual_clob; - -end; -/ diff --git a/test/core/expectations/test_expectation_anydata.pkb b/test/core/expectations/test_expectation_anydata.pkb deleted file mode 100644 index 0b3a93261..000000000 --- a/test/core/expectations/test_expectation_anydata.pkb +++ /dev/null @@ -1,974 +0,0 @@ -create or replace package body test_expectation_anydata is - - g_test_expected anydata; - g_test_actual anydata; - - procedure cleanup_expectations is - begin - expectations.cleanup_expectations( ); - end; - - procedure cleanup is - begin - g_test_expected := null; - g_test_actual := null; - cleanup_expectations(); - end; - - procedure fail_on_different_type_null is - l_actual_message varchar2(32767); - l_expected_message varchar2(32767); - begin - --Arrange - g_test_expected := anydata.convertObject( cast(null as test_dummy_object) ); - g_test_actual := anydata.convertObject( cast(null as other_dummy_object) ); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); - --Assert - l_expected_message := q'[%Actual (ut3_tester.other_dummy_object) cannot be compared to Expected (ut3_tester.test_dummy_object) using matcher 'equal'.]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); - end; - - procedure fail_on_different_type is - l_actual_message varchar2(32767); - l_expected_message varchar2(32767); - begin - --Arrange - g_test_expected := anydata.convertObject( test_dummy_object(1, 'A', '0') ); - g_test_actual := anydata.convertObject( other_dummy_object(1, 'A', '0') ); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); - --Assert - l_expected_message := q'[%Actual (ut3_tester.other_dummy_object) cannot be compared to Expected (ut3_tester.test_dummy_object) using matcher 'equal'.]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); - end; - - procedure fail_on_different_object_data is - begin - --Arrange - g_test_expected := anydata.convertObject( test_dummy_object(1, 'A', '0') ); - g_test_actual := anydata.convertObject( test_dummy_object(1, null, '0') ); - --Act - ut3.ut.expect( g_test_actual ).not_to_equal( g_test_expected ); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure fail_on_one_object_null is - l_actual_message varchar2(32767); - l_expected_message varchar2(32767); - begin - --Arrange - g_test_expected := anydata.convertObject( test_dummy_object(1, 'A', '0') ); - g_test_actual := anydata.convertObject( cast(null as test_dummy_object) ); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); - --Assert - l_expected_message := q'[%Actual: ut3_tester.test_dummy_object was expected to equal: ut3_tester.test_dummy_object -%Diff: -%Rows: [ 1 differences ] -%Row No. 1 - Missing: 1A0]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); - - end; - - procedure fail_on_collection_vs_object is - l_actual_message varchar2(32767); - l_expected_message varchar2(32767); - begin - --Arrange - g_test_expected := anydata.convertObject( test_dummy_object(1, 'A', '0') ); - g_test_actual := anydata.convertCollection( test_dummy_object_list(test_dummy_object(1, 'A', '0')) ); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); - --Assert - l_expected_message := q'[%Actual (ut3_tester.test_dummy_object_list) cannot be compared to Expected (ut3_tester.test_dummy_object) using matcher 'equal'.]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); - end; - - procedure fail_on_null_vs_empty_coll is - l_null_list test_dummy_object_list; - l_actual_message varchar2(32767); - l_expected_message varchar2(32767); - begin - --Arrange - g_test_expected := anydata.convertCollection( test_dummy_object_list() ); - g_test_actual := anydata.convertCollection( l_null_list ); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); - --Assert - l_expected_message := q'[%Actual: ut3_tester.test_dummy_object_list [ count = ] was expected to equal: ut3_tester.test_dummy_object_list [ count = 0 ] -%Diff: -%Rows: [ all different ] -%All rows are different as the columns position is not matching.]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); - - end; - - procedure fail_on_one_collection_null is - l_null_list test_dummy_object_list; - l_actual_message varchar2(32767); - l_expected_message varchar2(32767); - begin - --Arrange - g_test_expected := anydata.convertCollection( test_dummy_object_list(test_dummy_object(1, 'A', '0')) ); - g_test_actual := anydata.convertCollection( l_null_list ); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); - --Assert - l_expected_message := q'[%Actual: ut3_tester.test_dummy_object_list [ count = ] was expected to equal: ut3_tester.test_dummy_object_list [ count = 1 ] -%Diff: -%Rows: [ 1 differences ] -%Row No. 1 - Missing: 1A0]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); - end; - - procedure fail_on_one_collection_empty is - l_actual_message varchar2(32767); - l_expected_message varchar2(32767); - begin - --Arrange - g_test_expected := anydata.convertCollection( test_dummy_object_list(test_dummy_object(1, 'A', '0')) ); - g_test_actual := anydata.convertCollection( test_dummy_object_list() ); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); - --Assert - l_expected_message := q'[%Actual: ut3_tester.test_dummy_object_list [ count = 0 ] was expected to equal: ut3_tester.test_dummy_object_list [ count = 1 ] -%Diff: -%Rows: [ 1 differences ] -%Row No. 1 - Missing: 1A0]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); - - end; - - procedure fail_on_different_coll_data is - l_actual_message varchar2(32767); - l_expected_message varchar2(32767); - l_obj test_dummy_object := test_dummy_object(1, 'A', '0'); - begin - --Arrange - g_test_expected := anydata.convertCollection( test_dummy_object_list(l_obj) ); - g_test_actual := anydata.convertCollection( test_dummy_object_list(l_obj, l_obj) ); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); - --Assert - l_expected_message := q'[%Actual: ut3_tester.test_dummy_object_list [ count = 2 ] was expected to equal: ut3_tester.test_dummy_object_list [ count = 1 ] -%Diff: -%Rows: [ 1 differences ] -%Row No. 2 - Extra: 1A0]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); - end; - - --%test(Gives success when both anydata are NULL) - procedure success_on_both_anydata_null is - --Arrange - l_null_anydata anydata; - begin - --Act - ut3.ut.expect( l_null_anydata ).to_equal( l_null_anydata ); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure success_on_both_object_null is - --Arrange - l_null_object test_dummy_object; - l_anydata anydata := anydata.convertObject(l_null_object); - begin - --Act - ut3.ut.expect( l_anydata ).to_equal( l_anydata ); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure success_on_both_coll_null is - --Arrange - l_null_collection test_dummy_object_list; - l_anydata anydata := anydata.convertCollection(l_null_collection); - begin - --Act - ut3.ut.expect( l_anydata ).to_equal( l_anydata ); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure success_on_same_coll_data is - begin - --Arrange - g_test_expected := anydata.convertCollection( test_dummy_object_list(test_dummy_object(1, 'A', '0')) ); - g_test_actual := anydata.convertCollection( test_dummy_object_list(test_dummy_object(1, 'A', '0')) ); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure fail_on_coll_different_order is - l_actual_message varchar2(32767); - l_expected_message varchar2(32767); - l_first_obj test_dummy_object := test_dummy_object(1, 'A', '0'); - l_second_obj test_dummy_object := test_dummy_object(2, 'b', '1'); - begin - --Arrange - g_test_expected := anydata.convertCollection( test_dummy_object_list(l_first_obj, l_second_obj) ); - g_test_actual := anydata.convertCollection( test_dummy_object_list(l_second_obj, l_first_obj) ); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - procedure success_on_same_object_data is - begin - --Arrange - g_test_expected := anydata.convertObject( test_dummy_object(1, 'A', '0') ); - g_test_actual := anydata.convertObject( test_dummy_object(1, 'A', '0') ); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure exclude_attributes_as_list is - l_list ut3.ut_varchar2_list; - begin - --Arrange - l_list := ut3.ut_varchar2_list('TEST_DUMMY_OBJECT/Value','/TEST_DUMMY_OBJECT/ID'); - g_test_expected := anydata.convertObject( test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); - g_test_actual := anydata.convertObject( test_dummy_object(id=>3, "name"=>'A',"Value"=>'1') ); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected, a_exclude=> l_list ); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure exclude_attributes_as_csv is - l_list varchar2(100); - begin - --Arrange - l_list := 'TEST_DUMMY_OBJECT/Value,TEST_DUMMY_OBJECT/ID'; - g_test_expected := anydata.convertObject( test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); - g_test_actual := anydata.convertObject( test_dummy_object(id=>2, "name"=>'A',"Value"=>'1') ); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected, a_exclude=> l_list ); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure exclude_attributes_xpath is - l_xpath varchar2(100); - begin - --Arrange - l_xpath := '//TEST_DUMMY_OBJECT/Value|//TEST_DUMMY_OBJECT/ID'; - g_test_expected := anydata.convertObject( test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); - g_test_actual := anydata.convertObject( test_dummy_object(id=>2, "name"=>'A',"Value"=>'1') ); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected, a_exclude=> l_xpath ); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure exclude_ignores_invalid_attrib is - l_exclude varchar2(100); - begin - --Arrange - l_exclude := 'BadAttributeName'; - g_test_expected := anydata.convertObject( test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); - g_test_actual := anydata.convertObject( test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected, a_exclude=> l_exclude ); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure include_attributes_as_list is - l_list ut3.ut_varchar2_list; - begin - --Arrange - l_list := ut3.ut_varchar2_list('TEST_DUMMY_OBJECT/Value','TEST_DUMMY_OBJECT/ID'); - g_test_expected := anydata.convertObject( test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); - g_test_actual := anydata.convertObject( test_dummy_object(id=>1, "name"=>'b',"Value"=>'0') ); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ).include( l_list ); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure include_attributes_as_csv is - l_xpath varchar2(100); - begin - --Arrange - l_xpath := 'TEST_DUMMY_OBJECT/key,TEST_DUMMY_OBJECT/ID'; - g_test_expected := anydata.convertObject( test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); - g_test_actual := anydata.convertObject( test_dummy_object(id=>1, "name"=>'A',"Value"=>'1') ); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ).include( l_xpath ); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure include_attributes_xpath is - l_xpath varchar2(100); - begin - --Arrange - l_xpath := '//TEST_DUMMY_OBJECT/key|//TEST_DUMMY_OBJECT/ID'; - g_test_expected := anydata.convertObject( test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); - g_test_actual := anydata.convertObject( test_dummy_object(id=>1, "name"=>'A',"Value"=>'1') ); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ).include( l_xpath ); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure include_ignores_invalid_attrib is - l_include varchar2(100); - begin - --Arrange - l_include := ' BadAttributeName, TEST_DUMMY_OBJECT/ID '; - g_test_expected := anydata.convertObject( test_dummy_object(id=>1, "name"=>'B',"Value"=>'0') ); - g_test_actual := anydata.convertObject( test_dummy_object(id=>1, "name"=>'A',"Value"=>'1') ); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ).include( l_include ); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure include_exclude_attributes_csv is - l_exclude varchar2(100); - l_include varchar2(100); - begin - --Arrange - l_include := 'TEST_DUMMY_OBJECT/key,TEST_DUMMY_OBJECT/ID,TEST_DUMMY_OBJECT/Value'; - l_exclude := '//TEST_DUMMY_OBJECT/key|//TEST_DUMMY_OBJECT/Value'; - g_test_expected := anydata.convertObject( test_dummy_object(id=>1, "name"=>'B',"Value"=>'0') ); - g_test_actual := anydata.convertObject( test_dummy_object(id=>1, "name"=>'A',"Value"=>'1') ); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ).exclude( l_exclude ).include( l_include ); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure include_exclude_attrib_list is - l_exclude ut3.ut_varchar2_list; - l_include ut3.ut_varchar2_list; - l_expected varchar2(32767); - l_actual varchar2(32767); - begin - --Arrange - l_include := ut3.ut_varchar2_list('TEST_DUMMY_OBJECT/key','TEST_DUMMY_OBJECT/ID','TEST_DUMMY_OBJECT/Value'); - l_exclude := ut3.ut_varchar2_list('TEST_DUMMY_OBJECT/key','TEST_DUMMY_OBJECT/Value'); - g_test_expected := anydata.convertObject( test_dummy_object(id=>1, "name"=>'B',"Value"=>'0') ); - g_test_actual := anydata.convertObject( test_dummy_object(id=>1, "name"=>'A',"Value"=>'1') ); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ).exclude( l_exclude ).include( l_include ); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure reports_diff_attribute is - l_expected varchar2(32767); - l_actual varchar2(32767); - begin - --Arrange - g_test_expected := anydata.convertObject( test_dummy_object(1, 'A', '0') ); - g_test_actual := anydata.convertObject( test_dummy_object(1, NULL, '0') ); - l_expected := q'[Actual: ut3_tester.test_dummy_object was expected to equal: ut3_tester.test_dummy_object -Diff: -Rows: [ 1 differences ] - Row No. 1 - Actual: - Row No. 1 - Expected: A]'; - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); - --Assert - l_actual := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - ut.expect(l_actual).to_be_like(l_expected); - end; - - - procedure reports_diff_structure is - l_obj test_dummy_object := test_dummy_object(1, 'A', '0'); - l_expected varchar2(32767); - l_actual varchar2(32767); - begin - --Arrange - g_test_expected := anydata.convertCollection( test_dummy_object_list(l_obj) ); - g_test_actual := anydata.convertCollection( test_dummy_object_list(l_obj, l_obj) ); - l_expected := q'[Actual: ut3_tester.test_dummy_object_list [ count = 2 ] was expected to equal: ut3_tester.test_dummy_object_list [ count = 1 ] -Diff: -Rows: [ 1 differences ] - Row No. 2 - Extra: 1A0]'; - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); - --Assert - l_actual := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - ut.expect(l_actual).to_be_like(l_expected); - end; - - function get_anydata return anydata is - begin - return anydata.convertObject( test_dummy_object(1, 'B', '0') ); - end; - - procedure deprec_to_equal_excl_varch is - begin - --Act - ut3.ut.expect(get_anydata()).to_equal(get_anydata(), a_exclude => 'A_COLUMN,Some_Col'); - --Assert - ut.expect(cardinality(ut3.ut_expectation_processor.get_warnings())).to_equal(1); - ut.expect(ut3.ut_expectation_processor.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); - end; - - procedure deprec_to_equal_excl_list is - begin - --Act - ut3.ut.expect(get_anydata()).to_equal(get_anydata(), a_exclude => ut3.ut_varchar2_list('A_COLUMN','Some_Col')); - --Assert - ut.expect(cardinality(ut3.ut_expectation_processor.get_warnings())).to_equal(1); - ut.expect(ut3.ut_expectation_processor.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); - end; - - procedure deprec_not_to_equal_excl_varch is - begin - --Act - ut3.ut.expect(get_anydata()).not_to_equal(get_anydata(), a_exclude => 'A_COLUMN,Some_Col'); - --Assert - ut.expect(cardinality(ut3.ut_expectation_processor.get_warnings())).to_equal(1); - ut.expect(ut3.ut_expectation_processor.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); - end; - - procedure deprec_not_to_equal_excl_list is - begin - --Act - ut3.ut.expect(get_anydata()).not_to_equal(get_anydata(), a_exclude => ut3.ut_varchar2_list('A_COLUMN','Some_Col')); - --Assert - ut.expect(cardinality(ut3.ut_expectation_processor.get_warnings())).to_equal(1); - ut.expect(ut3.ut_expectation_processor.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); - end; - - procedure deprec_equal_excl_varch is - begin - --Act - ut3.ut.expect(get_anydata()).to_(ut3.equal(get_anydata(), a_exclude => 'A_COLUMN,Some_Col')); - --Assert - ut.expect(cardinality(ut3.ut_expectation_processor.get_warnings())).to_equal(1); - ut.expect(ut3.ut_expectation_processor.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); - end; - - procedure deprec_equal_excl_list is - begin - --Act - ut3.ut.expect(get_anydata()).to_(ut3.equal(get_anydata(), a_exclude => ut3.ut_varchar2_list('A_COLUMN','Some_Col'))); - --Assert - ut.expect(cardinality(ut3.ut_expectation_processor.get_warnings())).to_equal(1); - ut.expect(ut3.ut_expectation_processor.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); - end; - - procedure data_diff_on_atr_data_mismatch is - l_actual test_dummy_object_list; - l_expected test_dummy_object_list; - l_actual_message varchar2(32767); - l_expected_message varchar2(32767); - begin - --Arrange - select test_dummy_object( rownum, 'Something '||rownum, rownum) - bulk collect into l_actual - from dual connect by level <=2; - select test_dummy_object( rownum, 'Something '||rownum, rownum) - bulk collect into l_expected - from dual connect by level <=2 - order by rownum desc; - --Act - ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); - - l_expected_message := q'[Actual: ut3_tester.test_dummy_object_list [ count = 2 ] was expected to equal: ut3_tester.test_dummy_object_list [ count = 2 ] -Diff: -Rows: [ 2 differences ] - Row No. 1 - Actual: 1Something 11 - Row No. 1 - Expected: 2Something 22 - Row No. 2 - Actual: 2Something 22 - Row No. 2 - Expected: 1Something 11]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); - end; - - procedure data_diff_on_20_rows_only is - l_actual test_dummy_object_list; - l_expected test_dummy_object_list; - l_actual_message varchar2(32767); - l_expected_message varchar2(32767); - begin - --Arrange - select test_dummy_object( rn, 'Something '||rn, rn1) - bulk collect into l_actual - from (select rownum * case when mod(rownum,2) = 0 then -1 else 1 end rn, - rownum * case when mod(rownum,4) = 0 then -1 else 1 end rn1 - from dual connect by level <=100); - select test_dummy_object( rownum, 'Something '||rownum, rownum) - bulk collect into l_expected - from dual connect by level <=110; - --Act - ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); - - l_expected_message := q'[Actual: ut3_tester.test_dummy_object_list [ count = 100 ] was expected to equal: ut3_tester.test_dummy_object_list [ count = 110 ] -Diff: -Rows: [ 60 differences, showing first 20 ] - Row No. 2 - Actual: -2Something -2 - Row No. 2 - Expected: 2Something 2 - Row No. 4 - Actual: -4Something -4-4 - Row No. 4 - Expected: 4Something 44 - % - Row No. 38 - Actual: -38Something -38 - Row No. 38 - Expected: 38Something 38 - Row No. 40 - Actual: -40Something -40-40 - Row No. 40 - Expected: 40Something 4040]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); - end; - - procedure collection_include_list is - l_actual test_dummy_object_list; - l_expected test_dummy_object_list; - l_list ut3.ut_varchar2_list; - begin - l_list := ut3.ut_varchar2_list('TEST_DUMMY_OBJECT/Value','TEST_DUMMY_OBJECT/ID'); - --Arrange - select test_dummy_object( rownum, 'SomethingsDifferent '||rownum, rownum) - bulk collect into l_actual - from dual connect by level <=2; - select test_dummy_object( rownum, 'Something '||rownum, rownum) - bulk collect into l_expected - from dual connect by level <=2; - --Act - ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).include( l_list ); - - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure collection_exclude_list is - l_actual test_dummy_object_list; - l_expected test_dummy_object_list; - l_list ut3.ut_varchar2_list; - begin - l_list := ut3.ut_varchar2_list('TEST_DUMMY_OBJECT/Value','TEST_DUMMY_OBJECT/ID'); - --Arrange - select test_dummy_object( rownum*2, 'Something '||rownum, rownum*2) - bulk collect into l_actual - from dual connect by level <=2; - select test_dummy_object( rownum, 'Something '||rownum, rownum) - bulk collect into l_expected - from dual connect by level <=2; - --Act - ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).exclude( l_list ); - - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure collection_include_list_fail is - l_actual test_dummy_object_list; - l_expected test_dummy_object_list; - l_list ut3.ut_varchar2_list; - l_actual_message varchar2(32767); - l_expected_message varchar2(32767); - begin - l_list := ut3.ut_varchar2_list('TEST_DUMMY_OBJECT/name'); - --Arrange - select test_dummy_object( rownum, 'SomethingsDifferent '||rownum, rownum) - bulk collect into l_actual - from dual connect by level <=2; - select test_dummy_object( rownum, 'Something '||rownum, rownum) - bulk collect into l_expected - from dual connect by level <=2; - --Act - ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).include( l_list ); - - l_expected_message := q'[%Actual: ut3_tester.test_dummy_object_list [ count = 2 ] was expected to equal: ut3_tester.test_dummy_object_list [ count = 2 ] -%Diff: -%Rows: [ 2 differences ] -%All rows are different as the columns are not matching.]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); - end; - - procedure array_same_data is - begin - --Arrange - g_test_expected := anydata.convertCollection( t_tab_varchar('A') ); - g_test_actual := anydata.convertCollection( t_tab_varchar('A') ); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure array_diff_data is - l_actual_message varchar2(32767); - l_expected_message varchar2(32767); - begin - --Arrange - g_test_expected := anydata.convertCollection( t_tab_varchar('A') ); - g_test_actual := anydata.convertCollection( t_tab_varchar('B') ); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); - l_expected_message := q'[%Actual: ut3_tester.t_tab_varchar [ count = 1 ] was expected to equal: ut3_tester.t_tab_varchar [ count = 1 ] -%Diff: -%Rows: [ 1 differences ] -%Row No. 1 - Actual: B -%Row No. 1 - Expected: A]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); - end; - - procedure array_is_null is - l_is_null t_tab_varchar ; - begin - ut3.ut.expect( anydata.convertCollection( l_is_null ) ).to_be_null; - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure array_null_equal_array_null is - l_is_null t_tab_varchar ; - l_is_null_bis t_tab_varchar ; - begin - ut3.ut.expect( anydata.convertCollection( l_is_null ) ).to_equal(anydata.convertCollection( l_is_null_bis )); - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure array_null_equal_array_notnull is - l_actual_message varchar2(32767); - l_expected_message varchar2(32767); - l_is_null t_tab_varchar ; - begin - --Arrange - g_test_expected := anydata.convertCollection( l_is_null ); - g_test_actual := anydata.convertCollection( t_tab_varchar('A') ); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); - l_expected_message := q'[%Actual: ut3_tester.t_tab_varchar [ count = 1 ] was expected to equal: ut3_tester.t_tab_varchar [ count = ] -%Diff: -%Rows: [ 1 differences ] -%Row No. 1 - Extra: A]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); - end; - - procedure empty_array_have_zero_elem is - begin - ut3.ut.expect( anydata.convertCollection(t_tab_varchar())).to_have_count(0); - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure array_empty_equal_array_empty is - begin - --Arrange - g_test_expected := anydata.convertCollection(t_tab_varchar()); - g_test_actual := anydata.convertCollection(t_tab_varchar()); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure arr_empty_equal_arr_notempty is - l_actual_message varchar2(32767); - l_expected_message varchar2(32767); - l_is_null t_tab_varchar ; - begin - --Arrange - g_test_expected := anydata.convertCollection( t_tab_varchar() ); - g_test_actual := anydata.convertCollection( t_tab_varchar('A') ); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); - l_expected_message := q'[%Actual: ut3_tester.t_tab_varchar [ count = 1 ] was expected to equal: ut3_tester.t_tab_varchar [ count = 0 ] -%Diff: -%Rows: [ 1 differences ] -%Row No. 1 - Extra: A]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); - end; - - procedure collection_is_null is - l_null_list test_dummy_object_list; - begin - --Arrange - g_test_actual := anydata.convertCollection( l_null_list ); - --Act - ut3.ut.expect( g_test_actual ).to_be_null; - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure collection_is_empty is - begin - --Arrange - g_test_actual := anydata.convertCollection( test_dummy_object_list() ); - --Act - ut3.ut.expect( g_test_actual ).to_have_count(0); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - - end; - - procedure varray_same_data is - begin - --Arrange - g_test_expected := anydata.convertCollection( t_varray(1) ); - g_test_actual := anydata.convertCollection( t_varray(1) ); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure varray_diff_data is - l_actual_message varchar2(32767); - l_expected_message varchar2(32767); - begin - --Arrange - g_test_expected := anydata.convertCollection( t_varray(1) ); - g_test_actual := anydata.convertCollection( t_varray(2) ); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); - l_expected_message := q'[%Actual: ut3_tester.t_varray [ count = 1 ] was expected to equal: ut3_tester.t_varray [ count = 1 ] -%Diff: -%Rows: [ 1 differences ] -%Row No. 1 - Actual: 2 -%Row No. 1 - Expected: 1]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); - end; - - procedure varray_is_null is - l_is_null t_varray ; - begin - ut3.ut.expect( anydata.convertCollection( l_is_null ) ).to_be_null; - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure varray_null_equal_varray_null is - l_is_null t_varray ; - l_is_null_bis t_varray ; - begin - ut3.ut.expect( anydata.convertCollection( l_is_null ) ).to_equal(anydata.convertCollection( l_is_null_bis )); - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure varr_null_equal_varr_notnull is - l_actual_message varchar2(32767); - l_expected_message varchar2(32767); - l_is_null t_varray ; - begin - --Arrange - g_test_expected := anydata.convertCollection( l_is_null ); - g_test_actual := anydata.convertCollection( t_varray(1) ); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); - l_expected_message := q'[%Actual: ut3_tester.t_varray [ count = 1 ] was expected to equal: ut3_tester.t_varray [ count = ] -%Diff: -%Rows: [ 1 differences ] -%Row No. 1 - Extra: 1]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); - end; - - procedure empty_varray_have_zero_elem is - begin - ut3.ut.expect( anydata.convertCollection(t_varray())).to_have_count(0); - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure varr_empty_equal_varr_empty is - begin - --Arrange - g_test_expected := anydata.convertCollection(t_varray()); - g_test_actual := anydata.convertCollection(t_varray()); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure varr_empty_equal_varr_notempty is - l_actual_message varchar2(32767); - l_expected_message varchar2(32767); - l_is_null t_varray ; - begin - --Arrange - g_test_expected := anydata.convertCollection( t_varray() ); - g_test_actual := anydata.convertCollection( t_varray(1) ); - --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); - l_expected_message := q'[%Actual: ut3_tester.t_varray [ count = 1 ] was expected to equal: ut3_tester.t_varray [ count = 0 ] -%Diff: -%Rows: [ 1 differences ] -%Row No. 1 - Extra: 1]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); - end; - - procedure collection_join_by is - l_actual test_dummy_object_list; - l_expected test_dummy_object_list; - l_actual_message varchar2(32767); - l_expected_message varchar2(32767); - begin - --Arrange - select test_dummy_object( rownum, 'Something '||rownum, rownum) - bulk collect into l_actual - from dual connect by level <=2; - select test_dummy_object( rownum, 'Something '||rownum, rownum) - bulk collect into l_expected - from dual connect by level <=2 - order by rownum desc; - --Act - ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).join_by('TEST_DUMMY_OBJECT/ID'); - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure collection_join_by_fail is - l_actual test_dummy_object_list; - l_expected test_dummy_object_list; - l_actual_message varchar2(32767); - l_expected_message varchar2(32767); - begin - --Arrange - select test_dummy_object( rownum, 'Something '||rownum, rownum) - bulk collect into l_actual - from dual connect by level <=2; - select test_dummy_object( rownum * 2, 'Something '||rownum, rownum) - bulk collect into l_expected - from dual connect by level <=2 - order by rownum desc; - --Act - ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).join_by('TEST_DUMMY_OBJECT/ID'); - l_expected_message := q'[%Actual: ut3_tester.test_dummy_object_list [ count = 2 ] was expected to equal: ut3_tester.test_dummy_object_list [ count = 2 ] -%Diff: -%Rows: [ 3 differences ] -%PK 2 - Actual: Something 2 -%PK 2 - Actual: 2 -%PK 2 - Expected: Something 1 -%PK 2 - Expected: 1 -%PK 1 - Extra: 1Something 11 -%PK 4 - Missing: 4Something 22]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); - end; - - procedure collection_unordered is - l_actual test_dummy_object_list; - l_expected test_dummy_object_list; - begin - --Arrange - select test_dummy_object( rownum, 'Something '||rownum, rownum) - bulk collect into l_actual - from dual connect by level <=3; - select test_dummy_object( rownum, 'Something '||rownum, rownum) - bulk collect into l_expected - from dual connect by level <=3 - order by rownum desc; - --Act - ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).unordered; - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure collection_unordered_fail is - l_actual test_dummy_object_list; - l_expected test_dummy_object_list; - l_actual_message varchar2(32767); - l_expected_message varchar2(32767); - begin - --Arrange - select test_dummy_object( rownum, 'Something '||rownum, rownum) - bulk collect into l_actual - from dual connect by level <=2; - select test_dummy_object( rownum * 2, 'Something '||rownum, rownum) - bulk collect into l_expected - from dual connect by level <=2 - order by rownum desc; - - l_expected_message := q'[%Actual: ut3_tester.test_dummy_object_list [ count = 2 ] was expected to equal: ut3_tester.test_dummy_object_list [ count = 2 ] -%Diff: -%Rows: [ 4 differences ] -%Extra: 1Something 11 -%Extra: 2Something 22 -%Missing: 4Something 22 -%Missing: 2Something 11]'; - - ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).unordered; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); - end; - - procedure object_join_by is - begin - --Arrange - g_test_expected := anydata.convertObject( test_dummy_object(1, 'A', '0') ); - g_test_actual := anydata.convertObject( test_dummy_object(1, 'A', '0') ); - - --Act - ut3.ut.expect(g_test_actual).to_equal(g_test_expected).join_by('TEST_DUMMY_OBJECT/ID'); - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure object_unordered is - begin - g_test_expected := anydata.convertObject( test_dummy_object(1, 'A', '0') ); - g_test_actual := anydata.convertObject( test_dummy_object(1, 'A', '0') ); - - --Act - ut3.ut.expect(g_test_actual).to_equal(g_test_expected).unordered; - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure collection_to_contain is - l_actual test_dummy_object_list; - l_expected test_dummy_object_list; - begin - --Arrange - select test_dummy_object( rownum, 'Something '||rownum, rownum) - bulk collect into l_actual - from dual connect by level <=4; - select test_dummy_object( rownum, 'Something '||rownum, rownum) - bulk collect into l_expected - from dual connect by level <=2 - order by rownum desc; - --Act - ut3.ut.expect(anydata.convertCollection(l_actual)).to_contain(anydata.convertCollection(l_expected)); - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure object_to_contain is - begin - --Arrange - g_test_expected := anydata.convertObject( test_dummy_object(1, 'A', '0') ); - g_test_actual := anydata.convertObject( test_dummy_object(1, 'A', '0') ); - - --Act - ut3.ut.expect(g_test_actual).to_contain(g_test_expected); - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - -end; -/ \ No newline at end of file diff --git a/test/core/expectations/test_expectation_anydata.pks b/test/core/expectations/test_expectation_anydata.pks deleted file mode 100644 index b9fbda93b..000000000 --- a/test/core/expectations/test_expectation_anydata.pks +++ /dev/null @@ -1,202 +0,0 @@ -create or replace package test_expectation_anydata is - - --%suite(equal on anydata) - --%suitepath(utplsql.core.expectations) - - --%aftereach - procedure cleanup; - - --%test(Gives failure when comparing NULL objects of different type) - procedure fail_on_different_type_null; - - --%test(Gives failure when comparing objects of different type) - procedure fail_on_different_type; - - --%test(Gives failure when objects holds different data) - procedure fail_on_different_object_data; - - --%test(Gives failure when one of objects is NULL) - procedure fail_on_one_object_null; - - --%test(Gives failure when comparing object to collection) - procedure fail_on_collection_vs_object; - - --%test(Gives failure when comparing empty collection to NULL collection) - procedure fail_on_null_vs_empty_coll; - - --%test(Gives failure when one of collections is NULL) - procedure fail_on_one_collection_null; - - --%test(Gives failure when one of collections is empty) - procedure fail_on_one_collection_empty; - - --%test(Gives failure when collections holds different data) - procedure fail_on_different_coll_data; - - --%test(Gives success when both anydata are NULL) - procedure success_on_both_anydata_null; - - --%test(Gives success when both objects are null) - procedure success_on_both_object_null; - - --%test(Gives success when both collections are null) - procedure success_on_both_coll_null; - - --%test(Gives success when both collections are of same type contain identical data) - procedure success_on_same_coll_data; - - --%test(Gives failure when both collections contain the same data in different order) - procedure fail_on_coll_different_order; - - --%test(Gives success when both objects are of same type and hold the same data) - procedure success_on_same_object_data; - - --%test(List of attributes to exclude is case sensitive) - procedure exclude_attributes_as_list; - - --%test(Comma separated list of attributes to exclude is case sensitive) - procedure exclude_attributes_as_csv; - - --%test(Exclude attributes by XPath is case sensitive) - procedure exclude_attributes_xpath; - - --%test(Excludes existing attributes when some of attributes on exclude are not valid column names) - procedure exclude_ignores_invalid_attrib; - - --%test(List of attributes to include is case sensitive) - procedure include_attributes_as_list; - - --%test(Comma separated list of attributes to include is case sensitive) - procedure include_attributes_as_csv; - - --%test(Include attributes by XPath is case sensitive) - procedure include_attributes_xpath; - - --%test(Includes existing attributes when some of attributes on exclude are not valid column names) - procedure include_ignores_invalid_attrib; - - --%test(Includes only attributes that are not excluded) - procedure include_exclude_attributes_csv; - - --%test(Includes only attributes that are not on exclude list) - procedure include_exclude_attrib_list; - - --%test(Reports diff on incorrect attributes of an object type) - procedure reports_diff_attribute; - - --%test(Reports diff on incorrect rows and attributes of a collection type) - procedure reports_diff_structure; - - --%test(Adds a warning when using depreciated syntax to_equal( a_expected anydata, a_exclude varchar2 )) - procedure deprec_to_equal_excl_varch; - - --%test(Adds a warning when using depreciated syntax to_equal( a_expected anydata, a_exclude ut_varchar2_list )) - procedure deprec_to_equal_excl_list; - - --%test(Adds a warning when using depreciated syntax not_to_equal( a_expected anydata, a_exclude varchar2 )) - procedure deprec_not_to_equal_excl_varch; - - --%test(Adds a warning when using depreciated syntax not_to_equal( a_expected anydata, a_exclude ut_varchar2_list )) - procedure deprec_not_to_equal_excl_list; - - --%test(Adds a warning when using depreciated syntax to_( equal( a_expected anydata, a_exclude varchar2 ) )) - procedure deprec_equal_excl_varch; - - --%test(Adds a warning when using depreciated syntax to_( equal( a_expected anydata, a_exclude ut_varchar2_list )) ) - procedure deprec_equal_excl_list; - - --%test(Reports only mismatched attributes on row data mismatch) - procedure data_diff_on_atr_data_mismatch; - - --%test(Reports only first 20 rows of diff and gives a full diff count) - procedure data_diff_on_20_rows_only; - - --%test(Validate include list on collections of objects) - procedure collection_include_list; - - --%test(Validate exclude list on collections of objects) - procedure collection_exclude_list; - - --%test(Validate include list on collections of objects fail) - procedure collection_include_list_fail; - - --%test(Two ARRAYS with same data) - procedure array_same_data; - - --%test(Two ARRAYS with different data) - procedure array_diff_data; - - --%test(ARRAY is atomically null) - procedure array_is_null; - - --%test(Compare two null ARRAYs) - procedure array_null_equal_array_null; - - --%test(Compare null ARRAY to ARRAY with data) - procedure array_null_equal_array_notnull; - - --%test(Empty ARRAY have count of 0) - procedure empty_array_have_zero_elem; - - --%test(Compare two empty ARRAYs) - procedure array_empty_equal_array_empty; - - --%test(Compare empty ARRAY to ARRAY with data) - procedure arr_empty_equal_arr_notempty; - - --%test(Collection is atomically NULL) - procedure collection_is_null; - - --%test(Collection is empty) - procedure collection_is_empty; - - --%test(Two VARRAYS with same data) - procedure varray_same_data; - - --%test(Two VARRAYS with different data) - procedure varray_diff_data; - - --%test(VARRAY is atomically null) - procedure varray_is_null; - - --%test(Compare two null VARRAYs) - procedure varray_null_equal_varray_null; - - --%test(Compare null VARRAY to VARRAY with data) - procedure varr_null_equal_varr_notnull; - - --%test(Empty VARRAY have count of 0) - procedure empty_varray_have_zero_elem; - - --%test(Compare two empty VARRAYs) - procedure varr_empty_equal_varr_empty; - - --%test(Compare empty VARRAY to VARRAY with data) - procedure varr_empty_equal_varr_notempty; - - --%test( Anydata collection using joinby ) - procedure collection_join_by; - - --%test( Anydata collection using joinby fail) - procedure collection_join_by_fail; - - --%test( Anydata collection unordered ) - procedure collection_unordered; - - --%test( Anydata collection unordered fail ) - procedure collection_unordered_fail; - - --%test( Anydata object using joinby ) - procedure object_join_by; - - --%test( Anydata object unordered ) - procedure object_unordered; - - --%test( Success when anydata collection contains data from another anydata collection) - procedure collection_to_contain; - - --%test( Success when anydata object contains data from another anydata) - procedure object_to_contain; - -end; -/ diff --git a/test/core/expectations/test_expectation_processor.pkb b/test/core/expectations/test_expectation_processor.pkb deleted file mode 100644 index 17ffbec3c..000000000 --- a/test/core/expectations/test_expectation_processor.pkb +++ /dev/null @@ -1,71 +0,0 @@ -create or replace package body test_expectation_processor is - - procedure who_called_expectation is - l_stack_trace varchar2(4000); - l_source_line varchar2(4000); - begin - l_stack_trace := q'[----- PL/SQL Call Stack ----- - object line object - handle number name -34f88e4420 124 package body SCH_TEST.UT_EXPECTATION_PROCESSOR -353dfeb2f8 26 SCH_TEST.UT_EXPECTATION_RESULT -cba249ce0 112 SCH_TEST.UT_EXPECTATION -3539881cf0 21 SCH_TEST.UT_EXPECTATION_NUMBER -351a608008 28 package body SCH_TEST.TPKG_PRIOR_YEAR_GENERATION -351a6862b8 6 anonymous block -351fe31010 1825 package body SYS.DBMS_SQL -20befbe4d8 129 SCH_TEST.UT_EXECUTABLE -20befbe4d8 65 SCH_TEST.UT_EXECUTABLE -34f8ab7cd8 80 SCH_TEST.UT_TEST -34f8ab98f0 48 SCH_TEST.UT_SUITE_ITEM -34f8ab9b10 74 SCH_TEST.UT_SUITE -34f8ab98f0 48 SCH_TEST.UT_SUITE_ITEM -cba24bfd0 75 SCH_TEST.UT_LOGICAL_SUITE -353dfecf30 59 SCH_TEST.UT_RUN -34f8ab98f0 48 SCH_TEST.UT_SUITE_ITEM -357f5421e8 77 package body SCH_TEST.UT_RUNNER -357f5421e8 111 package body SCH_TEST.UT_RUNNER -20be951ab0 292 package body SCH_TEST.UT -20be951ab0 320 package body SCH_TEST.UT -]'; - ut.expect( - ut3.ut_expectation_processor.who_called_expectation(l_stack_trace) - ).to_be_like('at "SCH_TEST.TPKG_PRIOR_YEAR_GENERATION", line 28 %'); - end; - - - procedure who_called_expectation_0x is - l_stack_trace varchar2(4000); - l_source_line varchar2(4000); - begin - l_stack_trace := q'[----- PL/SQL Call Stack ----- - object line object - handle number name -34f88e4420 124 package body SCH_TEST.UT_EXPECTATION_PROCESSOR -353dfeb2f8 26 SCH_TEST.UT_EXPECTATION_RESULT -cba249ce0 112 SCH_TEST.UT_EXPECTATION -3539881cf0 21 SCH_TEST.UT_EXPECTATION_NUMBER -351a608008 28 package body SCH_TEST.TPKG_PRIOR_YEAR_GENERATION -351a6862b8 6 anonymous block -351fe31010 1825 package body SYS.DBMS_SQL -20befbe4d8 129 SCH_TEST.UT_EXECUTABLE -20befbe4d8 65 SCH_TEST.UT_EXECUTABLE -34f8ab7cd8 80 SCH_TEST.UT_TEST -34f8ab98f0 48 SCH_TEST.UT_SUITE_ITEM -34f8ab9b10 74 SCH_TEST.UT_SUITE -34f8ab98f0 48 SCH_TEST.UT_SUITE_ITEM -cba24bfd0 75 SCH_TEST.UT_LOGICAL_SUITE -353dfecf30 59 SCH_TEST.UT_RUN -34f8ab98f0 48 SCH_TEST.UT_SUITE_ITEM -357f5421e8 77 package body SCH_TEST.UT_RUNNER -357f5421e8 111 package body SCH_TEST.UT_RUNNER -20be951ab0 292 package body SCH_TEST.UT -20be951ab0 320 package body SCH_TEST.UT -]'; - ut.expect( - ut3.ut_expectation_processor.who_called_expectation(l_stack_trace) - ).to_be_like('at "SCH_TEST.TPKG_PRIOR_YEAR_GENERATION", line 28 %'); - end; - -end; -/ diff --git a/test/core/expectations/test_expectation_processor.pks b/test/core/expectations/test_expectation_processor.pks deleted file mode 100644 index ecde48153..000000000 --- a/test/core/expectations/test_expectation_processor.pks +++ /dev/null @@ -1,17 +0,0 @@ -create or replace package test_expectation_processor is - - --%suite(expectation_processor) - --%suitepath(utplsql.core.expectations) - - --%context(who_called_expectation) - - --%test(parses stack trace and returns object and line that called expectation) - procedure who_called_expectation; - - --%test(parses stack trace containing 0x and returns object and line that called expectation) - procedure who_called_expectation_0x; - - --%endcontext - -end; -/ diff --git a/test/core/expectations/test_matchers.pkb b/test/core/expectations/test_matchers.pkb deleted file mode 100644 index 1a15986b9..000000000 --- a/test/core/expectations/test_matchers.pkb +++ /dev/null @@ -1,270 +0,0 @@ -create or replace package body test_matchers is - - procedure cleanup_expectations is - begin - expectations.cleanup_expectations( ); - end; - - procedure exec_matcher(a_type varchar2, a_actual_value varchar2, a_expected_value varchar2, a_matcher varchar2, a_result integer, a_prefix varchar2 := null) is - l_statement varchar2(32767); - begin - l_statement := ' - declare - l_actual '||a_type||' := '||a_actual_value||'; - l_expected '||a_type||' := '||a_expected_value||'; - begin - ut3.ut.expect( l_actual ).'||a_prefix||'to_'||a_matcher||'( l_expected ); - end;'; - execute immediate l_statement; - if a_result = ut3.ut_utils.gc_success then - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - else - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end if; - cleanup_expectations(); - end exec_matcher; - - procedure exec_be_between(a_type varchar2, a_actual_value varchar2, a_expected1_value varchar2, a_expected2_value varchar2,a_result integer) is - l_statement varchar2(32767); - begin - l_statement := ' - declare - l_actual_value '||a_type||' := '||a_actual_value||'; - l_lower '||a_type||' := '||a_expected1_value||'; - l_higher '||a_type||' := '||a_expected2_value||'; - begin - ut3.ut.expect(l_actual_value).to_be_between(l_lower, l_higher); - end;'; - execute immediate l_statement; - if a_result = ut3.ut_utils.gc_success then - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - else - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end if; - cleanup_expectations(); - end exec_be_between; - - procedure exec_be_between2(a_type varchar2, a_actual_value varchar2, a_expected1_value varchar2, a_expected2_value varchar2,a_result integer, a_not_prefix varchar2 default null) is - l_statement varchar2(32767); - begin - l_statement := ' - declare - l_actual_value '||a_type||' := '||a_actual_value||'; - l_value1 '||a_type||' := '||a_expected1_value||'; - l_value2 '||a_type||' := '||a_expected2_value||'; - begin - ut3.ut.expect(l_actual_value).'||a_not_prefix||'to_be_between(l_value1, l_value2); - end;'; - execute immediate l_statement; - if a_result = ut3.ut_utils.gc_success then - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - else - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end if; - cleanup_expectations(); - end exec_be_between2; - - procedure exec_be_like(a_type varchar2, a_value varchar2, a_pattern varchar2, a_escape varchar2, a_result integer, a_prefix varchar2 default null) is - begin - execute immediate - 'declare - l_actual ' || a_type || ' := '||a_value||'; - l_pattern varchar2(32767) := :pattern; - l_escape_char varchar2(32767) := :a_escape; - l_result integer; - begin - ut3.ut.expect( l_actual ).' || a_prefix ||q'[to_be_like(l_pattern, l_escape_char); - end;]' - using a_pattern, a_escape; - if a_result = ut3.ut_utils.gc_success then - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - else - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end if; - cleanup_expectations(); - end; - procedure exec_match(a_type varchar2, a_actual_value varchar2, a_pattern varchar2, a_modifiers varchar2, a_result integer, a_not_prefix varchar2 default null) is - l_statement varchar2(32767); - begin - l_statement := - 'declare - l_actual '||a_type||' := '||a_actual_value||'; - l_pattern varchar2(32767) := :a_pattern; - l_modifiers varchar2(32767) := :a_modifiers; - l_result integer; - begin - ut3.ut.expect( l_actual ).'||a_not_prefix||'to_match(l_pattern, l_modifiers); - end;'; - execute immediate l_statement using a_pattern, a_modifiers; - if a_result = ut3.ut_utils.gc_success then - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - else - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end if; - cleanup_expectations(); - end; - - procedure test_be_between2 is - begin - - --failure when value out of range - exec_be_between2('date', 'sysdate', 'sysdate-2', 'sysdate-1', ut3.ut_utils.gc_failure, ''); - exec_be_between2('number', '2.0', '1.99', '1.999', ut3.ut_utils.gc_failure, ''); - exec_be_between2('varchar2(1)', '''c''', '''a''', '''b''', ut3.ut_utils.gc_failure, ''); - exec_be_between2('timestamp', 'systimestamp+1', 'systimestamp-1', 'systimestamp', ut3.ut_utils.gc_failure, ''); - exec_be_between2('timestamp with local time zone', 'systimestamp+1', 'systimestamp-1', 'systimestamp', ut3.ut_utils.gc_failure, ''); - exec_be_between2('timestamp with time zone', 'systimestamp+1', 'systimestamp-1', 'systimestamp', ut3.ut_utils.gc_failure, ''); - exec_be_between2('interval year to month', '''2-2''', '''2-0''', '''2-1''', ut3.ut_utils.gc_failure, ''); - exec_be_between2('interval day to second', '''2 01:00:00''', '''2 00:59:58''', '''2 00:59:59''', ut3.ut_utils.gc_failure, ''); - - --success when value in range - exec_be_between2('date', 'sysdate', 'sysdate-1', 'sysdate+1', ut3.ut_utils.gc_success, ''); - exec_be_between2('number', '2.0', '1.99', '2.01', ut3.ut_utils.gc_success, ''); - exec_be_between2('varchar2(1)', '''b''', '''a''', '''c''', ut3.ut_utils.gc_success, ''); - exec_be_between2('timestamp', 'systimestamp', 'systimestamp-1', 'systimestamp+1', ut3.ut_utils.gc_success, ''); - exec_be_between2('timestamp with local time zone', 'systimestamp', 'systimestamp-1', 'systimestamp+1', ut3.ut_utils.gc_success, ''); - exec_be_between2('timestamp with time zone', 'systimestamp', 'systimestamp-1', 'systimestamp+1', ut3.ut_utils.gc_success, ''); - exec_be_between2('interval year to month', '''2-1''', '''2-0''', '''2-2''', ut3.ut_utils.gc_success, ''); - exec_be_between2('interval day to second', '''2 01:00:00''', '''2 00:59:58''', '''2 01:00:01''', ut3.ut_utils.gc_success, ''); - - --success when value not in range - exec_be_between2('date', 'sysdate', 'sysdate-2', 'sysdate-1', ut3.ut_utils.gc_success, 'not_'); - exec_be_between2('number', '2.0', '1.99', '1.999', ut3.ut_utils.gc_success, 'not_'); - exec_be_between2('varchar2(1)', '''c''', '''a''', '''b''', ut3.ut_utils.gc_success, 'not_'); - exec_be_between2('timestamp', 'systimestamp+1', 'systimestamp-1', 'systimestamp', ut3.ut_utils.gc_success, 'not_'); - exec_be_between2('timestamp with local time zone', 'systimestamp+1', 'systimestamp-1', 'systimestamp', ut3.ut_utils.gc_success, 'not_'); - exec_be_between2('timestamp with time zone', 'systimestamp+1', 'systimestamp-1', 'systimestamp', ut3.ut_utils.gc_success, 'not_'); - exec_be_between2('interval year to month', '''2-2''', '''2-0''', '''2-1''', ut3.ut_utils.gc_success, 'not_'); - exec_be_between2('interval day to second', '''2 01:00:00''', '''2 00:59:58''', '''2 00:59:59''', ut3.ut_utils.gc_success, 'not_'); - - --failure when value not out of range - exec_be_between2('date', 'sysdate', 'sysdate-1', 'sysdate+1', ut3.ut_utils.gc_failure, 'not_'); - exec_be_between2('number', '2.0', '1.99', '2.01', ut3.ut_utils.gc_failure, 'not_'); - exec_be_between2('varchar2(1)', '''b''', '''a''', '''c''', ut3.ut_utils.gc_failure, 'not_'); - exec_be_between2('timestamp', 'systimestamp', 'systimestamp-1', 'systimestamp+1', ut3.ut_utils.gc_failure, 'not_'); - exec_be_between2('timestamp with local time zone', 'systimestamp', 'systimestamp-1', 'systimestamp+1', ut3.ut_utils.gc_failure, 'not_'); - exec_be_between2('timestamp with time zone', 'systimestamp', 'systimestamp-1', 'systimestamp+1', ut3.ut_utils.gc_failure, 'not_'); - exec_be_between2('interval year to month', '''2-1''', '''2-0''', '''2-2''', ut3.ut_utils.gc_failure, 'not_'); - exec_be_between2('interval day to second', '''2 01:00:00''', '''2 00:59:58''', '''2 01:00:01''', ut3.ut_utils.gc_failure, 'not_'); - - --failure when value is null - exec_be_between2('date', 'null', 'sysdate-1', 'sysdate+1', ut3.ut_utils.gc_failure, ''); - exec_be_between2('number', 'null', '1.99', '2.01', ut3.ut_utils.gc_failure, ''); - exec_be_between2('varchar2(1)', 'null', '''a''', '''c''', ut3.ut_utils.gc_failure, ''); - exec_be_between2('timestamp', 'null', 'systimestamp-1', 'systimestamp+1', ut3.ut_utils.gc_failure, ''); - exec_be_between2('timestamp with local time zone', 'null', 'systimestamp-1', 'systimestamp+1', ut3.ut_utils.gc_failure, ''); - exec_be_between2('timestamp with time zone', 'null', 'systimestamp-1', 'systimestamp+1', ut3.ut_utils.gc_failure, ''); - exec_be_between2('interval year to month', 'null', '''2-0''', '''2-2''', ut3.ut_utils.gc_failure, ''); - exec_be_between2('interval day to second', 'null', '''2 00:59:58''', '''2 01:00:01''', ut3.ut_utils.gc_failure, ''); - - exec_be_between2('date', 'null', 'sysdate-2', 'sysdate-1', ut3.ut_utils.gc_failure, 'not_'); - exec_be_between2('number', 'null', '1.99', '1.999', ut3.ut_utils.gc_failure, 'not_'); - exec_be_between2('varchar2(1)', 'null', '''a''', '''b''', ut3.ut_utils.gc_failure, 'not_'); - exec_be_between2('timestamp', 'null', 'systimestamp-1', 'systimestamp', ut3.ut_utils.gc_failure, 'not_'); - exec_be_between2('timestamp with local time zone', 'null', 'systimestamp-1', 'systimestamp', ut3.ut_utils.gc_failure, 'not_'); - exec_be_between2('timestamp with time zone', 'null', 'systimestamp-1', 'systimestamp', ut3.ut_utils.gc_failure, 'not_'); - exec_be_between2('interval year to month', 'null', '''2-0''', '''2-1''', ut3.ut_utils.gc_failure, 'not_'); - exec_be_between2('interval day to second', 'null', '''2 00:59:58''', '''2 00:59:59''', ut3.ut_utils.gc_failure, 'not_'); - - --failure when lower bound is null - exec_be_between2('date', 'sysdate', 'null', 'sysdate+1', ut3.ut_utils.gc_failure, ''); - exec_be_between2('number', '2.0', 'null', '2.01', ut3.ut_utils.gc_failure, ''); - exec_be_between2('varchar2(1)', '''b''', 'null', '''c''', ut3.ut_utils.gc_failure, ''); - exec_be_between2('timestamp', 'systimestamp', 'null', 'systimestamp+1', ut3.ut_utils.gc_failure, ''); - exec_be_between2('timestamp with local time zone', 'systimestamp', 'null', 'systimestamp+1', ut3.ut_utils.gc_failure, ''); - exec_be_between2('timestamp with time zone', 'systimestamp', 'null', 'systimestamp+1', ut3.ut_utils.gc_failure, ''); - exec_be_between2('interval year to month', '''2-1''', 'null', '''2-2''', ut3.ut_utils.gc_failure, ''); - exec_be_between2('interval day to second', '''2 01:00:00''', 'null', '''2 01:00:01''', ut3.ut_utils.gc_failure, ''); - - exec_be_between2('date', 'sysdate', 'null', 'sysdate-1', ut3.ut_utils.gc_failure, 'not_'); - exec_be_between2('number', '2.0', 'null', '1.999', ut3.ut_utils.gc_failure, 'not_'); - exec_be_between2('varchar2(1)', '''b''', 'null', '''b''', ut3.ut_utils.gc_failure, 'not_'); - exec_be_between2('timestamp', 'systimestamp+1', 'null', 'systimestamp', ut3.ut_utils.gc_failure, 'not_'); - exec_be_between2('timestamp with local time zone', 'systimestamp+1', 'null', 'systimestamp', ut3.ut_utils.gc_failure, 'not_'); - exec_be_between2('timestamp with time zone', 'systimestamp+1', 'null', 'systimestamp', ut3.ut_utils.gc_failure, 'not_'); - exec_be_between2('interval year to month', '''2-2''', 'null', '''2-1''', ut3.ut_utils.gc_failure, 'not_'); - exec_be_between2('interval day to second', '''2 01:00:00''', 'null', '''2 00:59:59''', ut3.ut_utils.gc_failure, 'not_'); - --Fails for unsupported data-type - exec_be_between2('clob', '''b''', '''a''', '''c''', ut3.ut_utils.gc_failure, ''); - end; - - procedure test_match is - begin - exec_match('varchar2(100)', '''Stephen''', '^Ste(v|ph)en$', '', ut3.ut_utils.gc_success); - exec_match('varchar2(100)', '''sTEPHEN''', '^Ste(v|ph)en$', 'i', ut3.ut_utils.gc_success); - exec_match('clob', 'to_clob(rpad('', '',32767)||''Stephen'')', 'Ste(v|ph)en$', '', ut3.ut_utils.gc_success); - exec_match('clob', 'to_clob(rpad('', '',32767)||''sTEPHEN'')', 'Ste(v|ph)en$', 'i', ut3.ut_utils.gc_success); - - exec_match('varchar2(100)', '''Stephen''', '^Steven$', '', ut3.ut_utils.gc_failure); - exec_match('varchar2(100)', '''sTEPHEN''', '^Steven$', 'i', ut3.ut_utils.gc_failure); - exec_match('clob', 'to_clob(rpad('', '',32767)||''Stephen'')', '^Stephen', '', ut3.ut_utils.gc_failure); - exec_match('clob', 'to_clob(rpad('', '',32767)||''sTEPHEN'')', '^Stephen', 'i', ut3.ut_utils.gc_failure); - - exec_match('varchar2(100)', '''Stephen''', '^Ste(v|ph)en$', '', ut3.ut_utils.gc_failure, 'not_'); - exec_match('varchar2(100)', '''sTEPHEN''', '^Ste(v|ph)en$', 'i', ut3.ut_utils.gc_failure, 'not_'); - exec_match('clob', 'to_clob(rpad('', '',32767)||''Stephen'')', 'Ste(v|ph)en$', '', ut3.ut_utils.gc_failure, 'not_'); - exec_match('clob', 'to_clob(rpad('', '',32767)||''sTEPHEN'')', 'Ste(v|ph)en$', 'i', ut3.ut_utils.gc_failure, 'not_'); - - exec_match('varchar2(100)', '''Stephen''', '^Steven$', '', ut3.ut_utils.gc_success, 'not_'); - exec_match('varchar2(100)', '''sTEPHEN''', '^Steven$', 'i', ut3.ut_utils.gc_success, 'not_'); - exec_match('clob', 'to_clob(rpad('', '',32767)||''Stephen'')', '^Stephen', '', ut3.ut_utils.gc_success, 'not_'); - exec_match('clob', 'to_clob(rpad('', '',32767)||''sTEPHEN'')', '^Stephen', 'i', ut3.ut_utils.gc_success, 'not_'); - --Fails for unsupported data-type - exec_match('number', '12345', '^123.*', 'i', ut3.ut_utils.gc_failure); - end; - - procedure test_be_like is - begin - exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste__en%', '', ut3.ut_utils.gc_success); - exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste__en\_K%', '\', ut3.ut_utils.gc_success); - exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Ste__en%', '', ut3.ut_utils.gc_success); - exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Ste__en\_K%', '\', ut3.ut_utils.gc_success); - - exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste_en%', '', ut3.ut_utils.gc_failure); - exec_be_like('varchar2(100)', '''Stephen_King''', 'Stephe\__%', '\', ut3.ut_utils.gc_failure); - exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Ste_en%', '', ut3.ut_utils.gc_failure); - exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Stephe\__%', '\', ut3.ut_utils.gc_failure); - - exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste__en%', '', ut3.ut_utils.gc_failure, 'not_'); - exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste__en\_K%', '\', ut3.ut_utils.gc_failure, 'not_'); - exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Ste__en%', '', ut3.ut_utils.gc_failure, 'not_'); - exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Ste__en\_K%', '\', ut3.ut_utils.gc_failure, 'not_'); - - exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste_en%', '', ut3.ut_utils.gc_success, 'not_'); - exec_be_like('varchar2(100)', '''Stephen_King''', 'Stephe\__%', '\', ut3.ut_utils.gc_success, 'not_'); - exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Ste_en%', '', ut3.ut_utils.gc_success, 'not_'); - exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Stephe\__%', '\', ut3.ut_utils.gc_success, 'not_'); - - --Fails for unsupported data-type - exec_be_like('number', '12345', '123%', '', ut3.ut_utils.gc_failure); - end; - - procedure test_timestamp_between is - l_value timestamp := to_timestamp('1997-01-31 09:26:50.13','YYYY-MM-DD HH24.MI.SS.FF'); - l_value_lower timestamp := to_timestamp('1997-01-31 09:26:50.11','YYYY-MM-DD HH24.MI.SS.FF'); - l_value_upper timestamp := to_timestamp('1997-01-31 09:26:50.14','YYYY-MM-DD HH24.MI.SS.FF'); - begin - ut3.ut.expect(l_value).to_be_between(l_value_lower, l_value_upper); - ut3.ut.expect(l_value).not_to_be_between(l_value_upper, l_value_lower); - end; - - procedure test_timestamp_ltz_between is - l_value timestamp with local time zone := to_timestamp_tz('1997-01-31 09:26:50.12 +02:00','YYYY-MM-DD HH24.MI.SS.FF TZR'); - l_value_lower timestamp with local time zone := to_timestamp_tz('1997-01-31 09:26:50.12 +03:00','YYYY-MM-DD HH24.MI.SS.FF TZR'); - l_value_upper timestamp with local time zone := to_timestamp_tz('1997-01-31 09:26:50.12 +01:00','YYYY-MM-DD HH24.MI.SS.FF TZR'); - begin - ut3.ut.expect(l_value).to_be_between(l_value_lower, l_value_upper); - ut3.ut.expect(l_value).not_to_be_between(l_value_upper, l_value_lower); - end; - - procedure test_timestamp_tz_between is - l_value timestamp with time zone := to_timestamp_tz('1997-01-31 09:26:50.12 +02:00','YYYY-MM-DD HH24.MI.SS.FF TZR'); - l_value_lower timestamp with time zone := to_timestamp_tz('1997-01-31 09:26:50.12 +03:00','YYYY-MM-DD HH24.MI.SS.FF TZR'); - l_value_upper timestamp with time zone := to_timestamp_tz('1997-01-31 09:26:50.12 +01:00','YYYY-MM-DD HH24.MI.SS.FF TZR'); - begin - ut3.ut.expect(l_value).to_be_between(l_value_lower, l_value_upper); - ut3.ut.expect(l_value).not_to_be_between(l_value_upper, l_value_lower); - end; - -end test_matchers; -/ diff --git a/test/core/expectations/test_matchers.pks b/test/core/expectations/test_matchers.pks deleted file mode 100644 index 0fa0953d4..000000000 --- a/test/core/expectations/test_matchers.pks +++ /dev/null @@ -1,27 +0,0 @@ -create or replace package test_matchers is - - --%suite(matchers) - --%suitepath(utplsql.core.expectations) - - --%aftereach - procedure cleanup_expectations; - - --%test - procedure test_be_between2; - --%test - procedure test_match; - - --%test - procedure test_be_like; - - --%test - procedure test_timestamp_between; - - --%test - procedure test_timestamp_ltz_between; - - --%test - procedure test_timestamp_tz_between; - -end test_matchers; -/ diff --git a/test/core/expectations/unary/test_expect_not_to_be_null.pkb b/test/core/expectations/unary/test_expect_not_to_be_null.pkb deleted file mode 100644 index 45ce4f697..000000000 --- a/test/core/expectations/unary/test_expect_not_to_be_null.pkb +++ /dev/null @@ -1,265 +0,0 @@ -create or replace package body test_expect_not_to_be_null -is - gc_object_name constant varchar2(30) := 't_not_to_be_null_test'; - gc_nested_table_name constant varchar2(30) := 'tt_not_to_be_null_test'; - gc_varray_name constant varchar2(30) := 'tv_not_to_be_null_test'; - - procedure cleanup_expectations is - begin - expectations.cleanup_expectations( ); - end; - - procedure create_types is - pragma autonomous_transaction; - begin - execute immediate 'create type ' || gc_object_name || ' is object (dummy number)'; - execute immediate 'create type ' || gc_nested_table_name || ' is table of number'; - execute immediate 'create type ' || gc_varray_name || ' is varray(1) of number'; - end; - - procedure drop_types is - pragma autonomous_transaction; - begin - execute immediate 'drop type ' || gc_object_name; - execute immediate 'drop type ' || gc_nested_table_name; - execute immediate 'drop type ' || gc_varray_name; - end; - - procedure blob_not_null is - begin - --Act - execute immediate expectations.unary_expectation_block( 'not_to_be_null', 'blob', 'to_blob(''abc'')' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure blob_0_length is - begin - --Act - execute immediate expectations.unary_expectation_block( 'not_to_be_null', 'blob', 'empty_blob()' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure boolean_not_null is - begin - --Act - execute immediate expectations.unary_expectation_block( 'not_to_be_null', 'boolean', 'true' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure clob_not_null is - begin - --Act - execute immediate expectations.unary_expectation_block( 'not_to_be_null', 'clob', 'to_clob(''abc'')' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - - procedure clob_0_length is - begin - --Act - execute immediate expectations.unary_expectation_block( 'not_to_be_null', 'clob', 'empty_clob()' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure date_not_null is - begin - --Act - execute immediate expectations.unary_expectation_block( 'not_to_be_null', 'date', 'sysdate' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure number_not_null is - begin - --Act - execute immediate expectations.unary_expectation_block( 'not_to_be_null', 'number', '1234' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure timestamp_not_null is - begin - --Act - execute immediate expectations.unary_expectation_block( 'not_to_be_null', 'timestamp', 'systimestamp' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure timestamp_with_ltz_not_null is - begin - --Act - execute immediate expectations.unary_expectation_block( - 'not_to_be_null', 'timestamp with local time zone', 'systimestamp' - ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure timestamp_with_tz_not_null is - begin - --Act - execute immediate expectations.unary_expectation_block( 'not_to_be_null', 'timestamp with time zone', - 'systimestamp' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure varchar2_not_null is - begin - --Act - execute immediate expectations.unary_expectation_block( 'not_to_be_null', 'varchar2(4000)', '''abc''' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure initialized_object is - begin - --Act - execute immediate expectations.unary_expectation_object_block( - 'not_to_be_null', gc_object_name, gc_object_name || '(1)', 'object' - ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure initialized_nested_table is - begin - --Act - execute immediate expectations.unary_expectation_object_block( - 'not_to_be_null', gc_nested_table_name, gc_nested_table_name || '()', 'collection' - ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure initialized_varray is - begin - --Act - execute immediate expectations.unary_expectation_object_block( - 'not_to_be_null', gc_varray_name, gc_varray_name || '()', 'collection' - ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure null_blob is - begin - --Act - execute immediate expectations.unary_expectation_block( 'not_to_be_null', 'blob', 'null' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure null_boolean is - begin - --Act - execute immediate expectations.unary_expectation_block( 'not_to_be_null', 'boolean', 'null' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure null_clob is - begin - --Act - execute immediate expectations.unary_expectation_block( 'not_to_be_null', 'clob', 'null' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure null_date is - begin - --Act - execute immediate expectations.unary_expectation_block( 'not_to_be_null', 'date', 'null' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure null_number is - begin - --Act - execute immediate expectations.unary_expectation_block( 'not_to_be_null', 'number', 'null' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure null_timestamp is - begin - --Act - execute immediate expectations.unary_expectation_block( 'not_to_be_null', 'timestamp', 'null' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure null_timestamp_with_ltz is - begin - --Act - execute immediate expectations.unary_expectation_block( - 'not_to_be_null', 'timestamp with local time zone', 'null' - ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure null_timestamp_with_tz is - begin - --Act - execute immediate expectations.unary_expectation_block( - 'not_to_be_null', 'timestamp with time zone', 'null' - ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure null_varchar2 is - begin - --Act - execute immediate expectations.unary_expectation_block( 'not_to_be_null', 'varchar2(4000)', 'null' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure null_anydata is - begin - --Act - execute immediate expectations.unary_expectation_block( 'not_to_be_null', 'anydata', 'null' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure uninit_object_in_anydata is - begin - --Act - execute immediate expectations.unary_expectation_object_block( - 'not_to_be_null', gc_object_name, 'null', 'object' - ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure uninit_nested_table_in_anydata is - begin - --Act - execute immediate expectations.unary_expectation_object_block( - 'not_to_be_null', gc_nested_table_name, 'null', 'collection' - ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure uninit_varray_in_anydata is - begin - --Act - execute immediate expectations.unary_expectation_object_block( - 'not_to_be_null', gc_varray_name, 'null', 'collection' - ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - -end test_expect_not_to_be_null; -/ diff --git a/test/core/expectations/unary/test_expect_not_to_be_null.pks b/test/core/expectations/unary/test_expect_not_to_be_null.pks deleted file mode 100644 index fa2d6193f..000000000 --- a/test/core/expectations/unary/test_expect_not_to_be_null.pks +++ /dev/null @@ -1,97 +0,0 @@ -create or replace package test_expect_not_to_be_null -is - --%suite(not_to_be_null) - --%suitepath(utplsql.core.expectations.unary) - - --%aftereach - procedure cleanup_expectations; - - --%beforeall - procedure create_types; - - --%afterall - procedure drop_types; - - --%test(Gives success for not null blob) - procedure blob_not_null; - - --%test(Gives success for blob with length 0) - procedure blob_0_length; - - --%test(Gives success for not null boolean) - procedure boolean_not_null; - - --%test(Gives success for not null clob) - procedure clob_not_null; - - --%test(Gives success for clob with length 0) - procedure clob_0_length; - - --%test(Gives success for not null date) - procedure date_not_null; - - --%test(Gives success for not null number) - procedure number_not_null; - - --%test(Gives success for not null timestamp) - procedure timestamp_not_null; - - --%test(Gives success for not null timestamp with local time zone) - procedure timestamp_with_ltz_not_null; - - --%test(Gives success for not null timestamp with time zone) - procedure timestamp_with_tz_not_null; - - --%test(Gives success for not null varchar2) - procedure varchar2_not_null; - - --%test(Gives success for initialized object within anydata) - procedure initialized_object; - - --%test(Gives success for initialized nested table within anydata) - procedure initialized_nested_table; - - --%test(Gives success for initialized varray within anydata) - procedure initialized_varray; - - --%test(Gives failure with null blob) - procedure null_blob; - - --%test(Gives failure with null boolean) - procedure null_boolean; - - --%test(Gives failure with null clob) - procedure null_clob; - - --%test(Gives failure with null date) - procedure null_date; - - --%test(Gives failure with null number) - procedure null_number; - - --%test(Gives failure null timestamp) - procedure null_timestamp; - - --%test(Gives failure with null timestamp with local time zone) - procedure null_timestamp_with_ltz; - - --%test(Gives failure with null timestamp with time zone) - procedure null_timestamp_with_tz; - - --%test(Gives failure with null varchar2) - procedure null_varchar2; - - --%test(Gives failure with null anydata) - procedure null_anydata; - - --%test(Gives failure with uninitialized object within anydata) - procedure uninit_object_in_anydata; - - --%test(Gives failure with uninitialized nested table within anydata) - procedure uninit_nested_table_in_anydata; - - --%test(Gives failure with uninitialized varray within anydata) - procedure uninit_varray_in_anydata; - -end test_expect_not_to_be_null; -/ diff --git a/test/core/expectations/unary/test_expect_to_be_empty.pkb b/test/core/expectations/unary/test_expect_to_be_empty.pkb deleted file mode 100644 index 0db499906..000000000 --- a/test/core/expectations/unary/test_expect_to_be_empty.pkb +++ /dev/null @@ -1,271 +0,0 @@ -create or replace package body test_expect_to_be_empty is - - procedure cleanup_expectations is - begin - expectations.cleanup_expectations( ); - end; - - procedure success_be_empty_cursor is - l_cursor sys_refcursor; - begin - --Arrange - open l_cursor for select * from dual where 1 = 2; - --Act - ut3.ut.expect(l_cursor).to_be_empty; - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure fail_be_empty_cursor is - l_cursor sys_refcursor; - begin - --Arrange - open l_cursor for select * from dual; - --Act - ut3.ut.expect(l_cursor).to_be_empty; - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - procedure fail_be_empty_cursor_report is - l_cursor sys_refcursor; - l_actual_message varchar2(32767); - l_expected_message varchar2(32767); - begin - --Arrange - open l_cursor for select * from dual; - --Act - ut3.ut.expect(l_cursor).to_be_empty; - - l_expected_message := q'[Actual: (refcursor [ count = 1 ])% - X% -was expected to be empty%%]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); - end; - - procedure success_not_be_empty_cursor is - l_cursor sys_refcursor; - begin - --Arrange - open l_cursor for select * from dual; - --Act - ut3.ut.expect(l_cursor).not_to_be_empty; - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure fail_not_be_empty_cursor is - l_cursor sys_refcursor; - begin - --Arrange - open l_cursor for select * from dual where 1 = 2; - --Act - ut3.ut.expect(l_cursor).not_to_be_empty; - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - procedure success_be_empty_collection is - l_actual anydata; - begin - --Arrange - l_actual := anydata.convertcollection(ora_mining_varchar2_nt()); - -- Act - ut3.ut.expect(l_actual).to_be_empty(); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure fail_be_empty_collection is - l_actual anydata; - begin - --Arrange - l_actual := anydata.convertcollection(ora_mining_varchar2_nt('a')); - -- Act - ut3.ut.expect(l_actual).to_be_empty(); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - procedure success_not_be_empty_coll is - l_actual anydata; - begin - --Arrange - l_actual := anydata.convertcollection(ora_mining_varchar2_nt('a')); - -- Act - ut3.ut.expect(l_actual).not_to_be_empty(); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure fail_not_be_empty_collection is - l_actual anydata; - begin - --Arrange - l_actual := anydata.convertcollection(ora_mining_varchar2_nt()); - -- Act - ut3.ut.expect(l_actual).not_to_be_empty(); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - procedure fail_be_empty_null_collection is - l_actual anydata; - l_data ora_mining_varchar2_nt; - begin - --Arrange - l_actual := anydata.convertcollection(l_data); - -- Act - ut3.ut.expect(l_actual).to_be_empty(); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - procedure fail_not_be_empty_null_coll is - l_actual anydata; - l_data ora_mining_varchar2_nt; - begin - --Arrange - l_actual := anydata.convertcollection(l_data); - -- Act - ut3.ut.expect(l_actual).not_to_be_empty(); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - procedure fail_be_empty_object is - l_actual anydata; - begin - --Arrange - l_actual := anydata.convertObject(ut3.ut_data_value_number(1)); - -- Act - ut3.ut.expect(l_actual).to_be_empty(); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - procedure fail_be_empty_null_object is - l_actual anydata; - l_data ut3.ut_data_value_number; - begin - --Arrange - l_actual := anydata.convertObject(l_data); - -- Act - ut3.ut.expect(l_actual).to_be_empty(); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - procedure fail_be_empty_number is - begin - -- Act - ut3.ut.expect( 1 ).to_( ut3.be_empty() ); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - /** - * https://docs.oracle.com/en/database/oracle/oracle-database/18/adobj/declaring-initializing-objects-in-plsql.html#GUID-23135172-82E2-4C3E-800D-E584B43B578E - * User-defined types, just like collections, are atomically null, until you initialize the object by calling the constructor for its object type. That is, the object itself is null, not just its attributes. - */ - procedure fail_not_be_empty_object is - l_actual anydata; - begin - --Arrange - l_actual := anydata.convertObject(ut3.ut_data_value_number(1)); - -- Act - ut3.ut.expect(l_actual).not_to_be_empty(); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - procedure fail_not_be_empty_null_object is - l_actual anydata; - l_data ut3.ut_data_value_number; - begin - --Arrange - l_actual := anydata.convertObject(l_data); - -- Act - ut3.ut.expect(l_actual).not_to_be_empty(); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - procedure fail_not_be_empty_number is - begin - -- Act - ut3.ut.expect( 1 ).not_to( ut3.be_empty() ); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - procedure success_be_empty_clob is - begin - -- Act - ut3.ut.expect( empty_clob() ).to_( ut3.be_empty() ); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure fail_be_empty_clob is - begin - -- Act - ut3.ut.expect( to_clob(' ') ).to_( ut3.be_empty() ); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - procedure success_be_empty_blob is - begin - -- Act - ut3.ut.expect( empty_blob() ).to_( ut3.be_empty() ); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure fail_be_empty_blob is - begin - -- Act - ut3.ut.expect( to_blob('AA') ).to_( ut3.be_empty() ); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - - procedure fail_not_be_empty_clob is - begin - -- Act - ut3.ut.expect( empty_clob() ).not_to( ut3.be_empty() ); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - procedure success_not_be_empty_clob is - begin - -- Act - ut3.ut.expect( to_clob(' ') ).not_to( ut3.be_empty() ); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure fail_not_be_empty_blob is - begin - -- Act - ut3.ut.expect( empty_blob() ).not_to( ut3.be_empty() ); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - procedure success_not_be_empty_blob is - begin - -- Act - ut3.ut.expect( to_blob('AA') ).not_to( ut3.be_empty() ); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - -end; -/ \ No newline at end of file diff --git a/test/core/expectations/unary/test_expect_to_be_empty.pks b/test/core/expectations/unary/test_expect_to_be_empty.pks deleted file mode 100644 index 92a7e0bef..000000000 --- a/test/core/expectations/unary/test_expect_to_be_empty.pks +++ /dev/null @@ -1,93 +0,0 @@ -create or replace package test_expect_to_be_empty is - - --%suite - --%suitepath(utplsql.core.expectations.unary) - - --%aftereach - procedure cleanup_expectations; - - --%context(to_be_empty) - - --%test(Gives success for an empty cursor) - procedure success_be_empty_cursor; - - --%test(Gives failure for a non empty cursor) - procedure fail_be_empty_cursor; - - --%test(Reports the content of cursor when cursor is not empty) - procedure fail_be_empty_cursor_report; - - --%test(Gives success for an empty collection) - procedure success_be_empty_collection; - - --%test(Gives failure for a non empty collection) - procedure fail_be_empty_collection; - - --%test(Gives failure for a NULL collection) - procedure fail_be_empty_null_collection; - - --%test(Gives failure for an object) - procedure fail_be_empty_object; - - --%test(Gives failure for a null object) - procedure fail_be_empty_null_object; - - --%test(Gives failure for number) - procedure fail_be_empty_number; - - --%test(Gives success for an empty CLOB) - procedure success_be_empty_clob; - - --%test(Gives failure for a non empty CLOB) - procedure fail_be_empty_clob; - - --%test(Gives success for an empty BLOB) - procedure success_be_empty_blob; - - --%test(Gives failure for a non empty BLOB) - procedure fail_be_empty_blob; - - --%endcontext - - --%context(not_to_be_empty) - - --%test(Gives failure for an empty cursor) - procedure fail_not_be_empty_cursor; - - --%test(Gives success for a non empty cursor) - procedure success_not_be_empty_cursor; - - --%test(Gives success for a non empty collection) - procedure success_not_be_empty_coll; - - --%test(Gives failure for an empty collection) - procedure fail_not_be_empty_collection; - - --%test(Gives failure for an empty collection) - procedure fail_not_be_empty_null_coll; - - --%test(Gives failure for an empty object) - procedure fail_not_be_empty_object; - - --%test(Gives failure for a null object) - procedure fail_not_be_empty_null_object; - - --%test(Gives failure for number) - procedure fail_not_be_empty_number; - - --%test(Gives failure for an empty CLOB) - procedure fail_not_be_empty_clob; - - --%test(Gives success for a non empty CLOB) - procedure success_not_be_empty_clob; - - --%test(Gives failure for an empty BLOB) - procedure fail_not_be_empty_blob; - - --%test(Gives success for a non empty BLOB) - procedure success_not_be_empty_blob; - - --%endcontext - -end; -/ diff --git a/test/core/expectations/unary/test_expect_to_be_not_null.pkb b/test/core/expectations/unary/test_expect_to_be_not_null.pkb deleted file mode 100644 index be6b3f2f8..000000000 --- a/test/core/expectations/unary/test_expect_to_be_not_null.pkb +++ /dev/null @@ -1,264 +0,0 @@ -create or replace package body test_expect_to_be_not_null -is - gc_object_name constant varchar2(30) := 't_to_be_not_null_test'; - gc_nested_table_name constant varchar2(30) := 'tt_to_be_not_null_test'; - gc_varray_name constant varchar2(30) := 'tv_to_be_not_null_test'; - - procedure cleanup_expectations is - begin - expectations.cleanup_expectations(); - end; - - procedure create_types is - pragma autonomous_transaction; - begin - execute immediate 'create type '||gc_object_name||' is object (dummy number)'; - execute immediate 'create type '||gc_nested_table_name||' is table of number'; - execute immediate 'create type '||gc_varray_name||' is varray(1) of number'; - end; - - procedure drop_types is - pragma autonomous_transaction; - begin - execute immediate 'drop type '||gc_object_name; - execute immediate 'drop type '||gc_nested_table_name; - execute immediate 'drop type '||gc_varray_name; - end; - - procedure blob_not_null is - begin - --Act - execute immediate expectations.unary_expectation_block('to_be_not_null', 'blob', 'to_blob(''abc'')'); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure empty_blob is - begin - --Act - execute immediate expectations.unary_expectation_block('to_be_not_null', 'blob', 'empty_blob()'); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure boolean_not_null is - begin - --Act - execute immediate expectations.unary_expectation_block('to_be_not_null', 'boolean', 'true'); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure clob_not_null is - begin - --Act - execute immediate expectations.unary_expectation_block('to_be_not_null', 'clob', 'to_clob(''abc'')'); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure empty_clob is - begin - --Act - execute immediate expectations.unary_expectation_block('to_be_not_null', 'clob', 'empty_clob()'); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure date_not_null is - begin - --Act - execute immediate expectations.unary_expectation_block('to_be_not_null', 'date', 'sysdate'); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure number_not_null is - begin - --Act - execute immediate expectations.unary_expectation_block('to_be_not_null', 'number', '1234'); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure timestamp_not_null is - begin - --Act - execute immediate expectations.unary_expectation_block('to_be_not_null', 'timestamp', 'systimestamp'); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure timestamp_with_ltz_not_null is - begin - --Act - execute immediate expectations.unary_expectation_block('to_be_not_null', 'timestamp with local time zone', 'systimestamp'); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure timestamp_with_tz_not_null is - begin - --Act - execute immediate expectations.unary_expectation_block('to_be_not_null', 'timestamp with time zone', 'systimestamp'); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure varchar2_not_null is - begin - --Act - execute immediate expectations.unary_expectation_block('to_be_not_null', 'varchar2(4000)', '''abc'''); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure initialized_object is - begin - --Act - execute immediate expectations.unary_expectation_object_block( - 'to_be_not_null', gc_object_name, gc_object_name||'(1)', 'object' - ); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure initialized_nested_table is - begin - --Act - execute immediate expectations.unary_expectation_object_block( - 'to_be_not_null', gc_nested_table_name, gc_nested_table_name||'()', 'collection' - ); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure initialized_varray is - begin - --Act - execute immediate expectations.unary_expectation_object_block( - 'to_be_not_null', gc_varray_name, gc_varray_name||'()', 'collection' - ); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure null_blob is - begin - --Act - execute immediate expectations.unary_expectation_block('to_be_not_null', 'blob', 'null'); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - procedure null_boolean is - begin - --Act - execute immediate expectations.unary_expectation_block('to_be_not_null', 'boolean', 'null'); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - - procedure null_clob is - begin - --Act - execute immediate expectations.unary_expectation_block('to_be_not_null', 'clob', 'null'); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - - procedure null_date is - begin - --Act - execute immediate expectations.unary_expectation_block('to_be_not_null', 'date', 'null'); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - - procedure null_number is - begin - --Act - execute immediate expectations.unary_expectation_block('to_be_not_null', 'number', 'null'); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - - procedure null_timestamp is - begin - --Act - execute immediate expectations.unary_expectation_block('to_be_not_null', 'timestamp', 'null'); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - - procedure null_timestamp_with_ltz is - begin - --Act - execute immediate expectations.unary_expectation_block('to_be_not_null', 'timestamp with local time zone', 'null'); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - - procedure null_timestamp_with_tz is - begin - --Act - execute immediate expectations.unary_expectation_block('to_be_not_null', 'timestamp with time zone', 'null'); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - - procedure null_varchar2 is - begin - --Act - execute immediate expectations.unary_expectation_block('to_be_not_null', 'varchar2(4000)', 'null'); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - procedure null_anydata is - begin - --Act - execute immediate expectations.unary_expectation_block('to_be_not_null', 'anydata', 'null'); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - procedure uninit_object_in_anydata is - begin - --Act - execute immediate expectations.unary_expectation_object_block( - 'to_be_not_null', gc_object_name, 'null', 'object' - ); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - procedure uninit_nested_table_in_anydata is - begin - --Act - execute immediate expectations.unary_expectation_object_block( - 'to_be_not_null', gc_nested_table_name, 'null', 'collection' - ); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - procedure uninit_varray_in_anydata is - begin - --Act - execute immediate expectations.unary_expectation_object_block( - 'to_be_not_null', gc_varray_name, 'null', 'collection' - ); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - -end test_expect_to_be_not_null; -/ diff --git a/test/core/expectations/unary/test_expect_to_be_not_null.pks b/test/core/expectations/unary/test_expect_to_be_not_null.pks deleted file mode 100644 index 351482fee..000000000 --- a/test/core/expectations/unary/test_expect_to_be_not_null.pks +++ /dev/null @@ -1,97 +0,0 @@ -create or replace package test_expect_to_be_not_null -is - --%suite(to_be_not_null) - --%suitepath(utplsql.core.expectations.unary) - - --%aftereach - procedure cleanup_expectations; - - --%beforeall - procedure create_types; - - --%afterall - procedure drop_types; - - --%test(Gives success for not null blob) - procedure blob_not_null; - - --%test(Gives success for empty blob) - procedure empty_blob; - - --%test(Gives success for not null boolean) - procedure boolean_not_null; - - --%test(Gives success for not null clob) - procedure clob_not_null; - - --%test(Gives success for empty clob) - procedure empty_clob; - - --%test(Gives success for not null date) - procedure date_not_null; - - --%test(Gives success for not null number) - procedure number_not_null; - - --%test(Gives success for not null timestamp) - procedure timestamp_not_null; - - --%test(Gives success for not null timestamp with local time zone) - procedure timestamp_with_ltz_not_null; - - --%test(Gives success for not null timestamp with time zone) - procedure timestamp_with_tz_not_null; - - --%test(Gives success for not null varchar2) - procedure varchar2_not_null; - - --%test(Gives success for initialized object within anydata) - procedure initialized_object; - - --%test(Gives success for initialized nested table within anydata) - procedure initialized_nested_table; - - --%test(Gives success for initialized varray within anydata) - procedure initialized_varray; - - --%test(Gives failure with null blob) - procedure null_blob; - - --%test(Gives failure with null boolean) - procedure null_boolean; - - --%test(Gives failure with null clob) - procedure null_clob; - - --%test(Gives failure with null date) - procedure null_date; - - --%test(Gives failure with null number) - procedure null_number; - - --%test(Gives failure null timestamp) - procedure null_timestamp; - - --%test(Gives failure with null timestamp with local time zone) - procedure null_timestamp_with_ltz; - - --%test(Gives failure with null timestamp with time zone) - procedure null_timestamp_with_tz; - - --%test(Gives failure with null varchar2) - procedure null_varchar2; - - --%test(Gives failure with null anydata) - procedure null_anydata; - - --%test(Gives failure with uninitialized object within anydata) - procedure uninit_object_in_anydata; - - --%test(Gives failure with uninitialized nested table within anydata) - procedure uninit_nested_table_in_anydata; - - --%test(Gives failure with uninitialized varray within anydata) - procedure uninit_varray_in_anydata; - -end test_expect_to_be_not_null; -/ diff --git a/test/core/expectations/unary/test_expect_to_be_null.pkb b/test/core/expectations/unary/test_expect_to_be_null.pkb deleted file mode 100644 index 4179bfbe6..000000000 --- a/test/core/expectations/unary/test_expect_to_be_null.pkb +++ /dev/null @@ -1,260 +0,0 @@ -create or replace package body test_expect_to_be_null -is - gc_object_name constant varchar2(30) := 't_to_be_null_test'; - gc_nested_table_name constant varchar2(30) := 'tt_to_be_null_test'; - gc_varray_name constant varchar2(30) := 'tv_to_be_null_test'; - - procedure cleanup_expectations is - begin - expectations.cleanup_expectations( ); - end; - - procedure create_types is - pragma autonomous_transaction; - begin - execute immediate 'create type ' || gc_object_name || ' is object (dummy number)'; - execute immediate 'create type ' || gc_nested_table_name || ' is table of number'; - execute immediate 'create type ' || gc_varray_name || ' is varray(1) of number'; - end; - - procedure drop_types is - pragma autonomous_transaction; - begin - execute immediate 'drop type ' || gc_object_name; - execute immediate 'drop type ' || gc_nested_table_name; - execute immediate 'drop type ' || gc_varray_name; - end; - - procedure null_blob is - begin - --Act - execute immediate expectations.unary_expectation_block( 'to_be_null', 'blob', 'null' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure null_boolean is - begin - --Act - execute immediate expectations.unary_expectation_block( 'to_be_null', 'boolean', 'null' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure null_clob is - begin - --Act - execute immediate expectations.unary_expectation_block( 'to_be_null', 'clob', 'null' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure null_date is - begin - --Act - execute immediate expectations.unary_expectation_block( 'to_be_null', 'date', 'null' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure null_number is - begin - --Act - execute immediate expectations.unary_expectation_block( 'to_be_null', 'number', 'null' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure null_timestamp is - begin - --Act - execute immediate expectations.unary_expectation_block( 'to_be_null', 'timestamp', 'null' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure null_timestamp_with_ltz is - begin - --Act - execute immediate expectations.unary_expectation_block( 'to_be_null', 'timestamp with local time zone', 'null' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure null_timestamp_with_tz is - begin - --Act - execute immediate expectations.unary_expectation_block( 'to_be_null', 'timestamp with time zone', 'null' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure null_varchar2 is - begin - --Act - execute immediate expectations.unary_expectation_block( 'to_be_null', 'varchar2(4000)', 'null' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure null_anydata is - begin - --Act - execute immediate expectations.unary_expectation_block( 'to_be_null', 'anydata', 'null' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure uninit_object_in_anydata is - begin - --Act - execute immediate expectations.unary_expectation_object_block( - 'to_be_null', gc_object_name, 'null', 'object' - ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure uninit_nested_table_in_anydata is - begin - --Act - execute immediate expectations.unary_expectation_object_block( - 'to_be_null', gc_nested_table_name, 'null', 'collection' - ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure uninit_varray_in_anydata is - begin - --Act - execute immediate expectations.unary_expectation_object_block( 'to_be_null', gc_varray_name, - 'null', 'collection' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure blob_not_null is - begin - --Act - execute immediate expectations.unary_expectation_block( 'to_be_null', 'blob', 'to_blob(''abc'')' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure empty_blob is - begin - --Act - execute immediate expectations.unary_expectation_block( 'to_be_null', 'blob', 'empty_blob()' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure boolean_not_null is - begin - --Act - execute immediate expectations.unary_expectation_block( 'to_be_null', 'boolean', 'true' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure clob_not_null is - begin - --Act - execute immediate expectations.unary_expectation_block( 'to_be_null', 'clob', 'to_clob(''abc'')' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure empty_clob is - begin - --Act - execute immediate expectations.unary_expectation_block( 'to_be_null', 'clob', 'empty_clob()' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure date_not_null is - begin - --Act - execute immediate expectations.unary_expectation_block( 'to_be_null', 'date', 'sysdate' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure number_not_null is - begin - --Act - execute immediate expectations.unary_expectation_block( 'to_be_null', 'number', '1234' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure timestamp_not_null is - begin - --Act - execute immediate expectations.unary_expectation_block( 'to_be_null', 'timestamp', 'systimestamp' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure timestamp_with_ltz_not_null is - begin - --Act - execute immediate expectations.unary_expectation_block( - 'to_be_null', 'timestamp with local time zone', 'systimestamp' - ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure timestamp_with_tz_not_null is - begin - --Act - execute immediate expectations.unary_expectation_block( - 'to_be_null', 'timestamp with time zone', 'systimestamp' - ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure varchar2_not_null is - begin - --Act - execute immediate expectations.unary_expectation_block( 'to_be_null', 'varchar2(4000)', '''abc''' ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure initialized_object is - begin - --Act - execute immediate expectations.unary_expectation_object_block( - 'to_be_null', gc_object_name, gc_object_name || '(1)', 'object' - ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure initialized_nested_table is - begin - --Act - execute immediate expectations.unary_expectation_object_block( - 'to_be_null', gc_nested_table_name, gc_nested_table_name || '()', 'collection' - ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure initialized_varray is - begin - --Act - execute immediate expectations.unary_expectation_object_block( - 'to_be_null', gc_varray_name, gc_varray_name || '()', 'collection' - ); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - -end test_expect_to_be_null; -/ diff --git a/test/core/expectations/unary/test_expect_to_be_null.pks b/test/core/expectations/unary/test_expect_to_be_null.pks deleted file mode 100644 index 8b34e1279..000000000 --- a/test/core/expectations/unary/test_expect_to_be_null.pks +++ /dev/null @@ -1,97 +0,0 @@ -create or replace package test_expect_to_be_null -is - --%suite(to_be_null) - --%suitepath(utplsql.core.expectations.unary) - - --%aftereach - procedure cleanup_expectations; - - --%beforeall - procedure create_types; - - --%afterall - procedure drop_types; - - --%test(Gives success with null blob) - procedure null_blob; - - --%test(Gives success with null boolean) - procedure null_boolean; - - --%test(Gives success with null clob) - procedure null_clob; - - --%test(Gives success with null date) - procedure null_date; - - --%test(Gives success with null number) - procedure null_number; - - --%test(Gives success null timestamp) - procedure null_timestamp; - - --%test(Gives success with null timestamp with local time zone) - procedure null_timestamp_with_ltz; - - --%test(Gives success with null timestamp with time zone) - procedure null_timestamp_with_tz; - - --%test(Gives success with null varchar2) - procedure null_varchar2; - - --%test(Gives success with null anydata) - procedure null_anydata; - - --%test(Gives success with uninitialized object within anydata) - procedure uninit_object_in_anydata; - - --%test(Gives success with uninitialized nested table within anydata) - procedure uninit_nested_table_in_anydata; - - --%test(Gives success with uninitialized varray within anydata) - procedure uninit_varray_in_anydata; - - --%test(Gives failure for not null blob) - procedure blob_not_null; - - --%test(Gives failure with empty blob) - procedure empty_blob; - - --%test(Gives failure for not null boolean) - procedure boolean_not_null; - - --%test(Gives failure for not null clob) - procedure clob_not_null; - - --%test(Gives failure with empty clob) - procedure empty_clob; - - --%test(Gives failure for not null date) - procedure date_not_null; - - --%test(Gives failure for not null number) - procedure number_not_null; - - --%test(Gives failure for not null timestamp) - procedure timestamp_not_null; - - --%test(Gives failure for not null timestamp with local time zone) - procedure timestamp_with_ltz_not_null; - - --%test(Gives failure for not null timestamp with time zone) - procedure timestamp_with_tz_not_null; - - --%test(Gives failure for not null varchar2) - procedure varchar2_not_null; - - --%test(Gives failure for initialized object within anydata) - procedure initialized_object; - - --%test(Gives failure for initialized nested table within anydata) - procedure initialized_nested_table; - - --%test(Gives failure for initialized varray within anydata) - procedure initialized_varray; - -end test_expect_to_be_null; -/ diff --git a/test/core/expectations/unary/test_expect_to_be_true_false.pkb b/test/core/expectations/unary/test_expect_to_be_true_false.pkb deleted file mode 100644 index 32ef58a7d..000000000 --- a/test/core/expectations/unary/test_expect_to_be_true_false.pkb +++ /dev/null @@ -1,139 +0,0 @@ -create or replace package body test_expect_to_be_true_false -is - - procedure cleanup_expectations is - begin - expectations.cleanup_expectations( ); - end; - - procedure to_be_true_null_boolean is - begin - --Act - ut3.ut.expect( 1=null ).to_be_true(); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure to_be_true_success is - begin - --Act - ut3.ut.expect( 1=1 ).to_be_true(); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure to_be_true_failure is - begin - --Act - ut3.ut.expect( 1=2 ).to_be_true(); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure to_be_true_bad_type is - begin - --Act - ut3.ut.expect( 1 ).to_be_true(); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure not_to_be_true_null_boolean is - begin - --Act - ut3.ut.expect( 1=null ).not_to_be_true(); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure not_to_be_true_success is - begin - --Act - ut3.ut.expect( 1=2 ).not_to_be_true(); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure not_to_be_true_failure is - begin - --Act - ut3.ut.expect( 1=1 ).not_to_be_true(); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - - procedure not_to_be_true_bad_type is - begin - --Act - ut3.ut.expect( 1 ).not_to_be_true(); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure to_be_false_null_boolean is - begin - --Act - ut3.ut.expect( 1=null ).to_be_false(); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure to_be_false_success is - begin - --Act - ut3.ut.expect( 1=2 ).to_be_false(); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure to_be_false_failure is - begin - --Act - ut3.ut.expect( 1=1 ).to_be_false(); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure to_be_false_bad_type is - begin - --Act - ut3.ut.expect( 1 ).to_be_false(); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure not_to_be_false_null_boolean is - begin - --Act - ut3.ut.expect( 1=null ).not_to_be_false(); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure not_to_be_false_success is - begin - --Act - ut3.ut.expect( 1=1 ).not_to_be_false(); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); - end; - - procedure not_to_be_false_failure is - begin - --Act - ut3.ut.expect( 1=2 ).not_to_be_false(); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - - procedure not_to_be_false_bad_type is - begin - --Act - ut3.ut.expect( 1 ).not_to_be_false(); - --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); - end; - -end; -/ diff --git a/test/core/expectations/unary/test_expect_to_be_true_false.pks b/test/core/expectations/unary/test_expect_to_be_true_false.pks deleted file mode 100644 index abdbf44b6..000000000 --- a/test/core/expectations/unary/test_expect_to_be_true_false.pks +++ /dev/null @@ -1,58 +0,0 @@ -create or replace package test_expect_to_be_true_false -is - --%suite(to_be_true/false) - --%suitepath(utplsql.core.expectations.unary) - - --%aftereach - procedure cleanup_expectations; - - --%test(to_be_true - Gives failure with null boolean) - procedure to_be_true_null_boolean; - - --%test(to_be_true - Gives success with true expression) - procedure to_be_true_success; - - --%test(to_be_true - Gives failure with false expression) - procedure to_be_true_failure; - - --%test(to_be_true - Gives failure with non-boolean data type) - procedure to_be_true_bad_type; - - --%test(not_to_be_true - Gives failure with null boolean) - procedure not_to_be_true_null_boolean; - - --%test(not_to_be_true - Gives failure with true expression) - procedure not_to_be_true_success; - - --%test(not_to_be_true - Gives success with false expression) - procedure not_to_be_true_failure; - - --%test(not_to_be_true - Gives failure with non-boolean data type) - procedure not_to_be_true_bad_type; - - --%test(to_be_false - Gives failure with null boolean) - procedure to_be_false_null_boolean; - - --%test(to_be_false - Gives failure with true expression) - procedure to_be_false_success; - - --%test(to_be_false - Gives success with false expression) - procedure to_be_false_failure; - - --%test(to_be_false - Gives failure with non-boolean data type) - procedure to_be_false_bad_type; - - --%test(not_to_be_false - Gives failure with null boolean) - procedure not_to_be_false_null_boolean; - - --%test(not_to_be_false - Gives success with true expression) - procedure not_to_be_false_success; - - --%test(not_to_be_false - Gives failure with false expression) - procedure not_to_be_false_failure; - - --%test(not_to_be_false - Gives failure with non-boolean data type) - procedure not_to_be_false_bad_type; - -end; -/ diff --git a/test/core/expectations/unary/test_expect_to_have_count.pkb b/test/core/expectations/unary/test_expect_to_have_count.pkb deleted file mode 100644 index a95a6778a..000000000 --- a/test/core/expectations/unary/test_expect_to_have_count.pkb +++ /dev/null @@ -1,210 +0,0 @@ -create or replace package body test_expect_to_have_count is - - procedure cleanup_expectations is - begin - expectations.cleanup_expectations( ); - end; - - procedure success_have_count_cursor is - l_cursor sys_refcursor; - begin - --Arrange - open l_cursor for select * from dual connect by level <= 11; - --Act - ut3.ut.expect(l_cursor).to_have_count(11); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure fail_have_count_cursor is - l_cursor sys_refcursor; - begin - --Arrange - open l_cursor for select * from dual where 0=1; - --Act - ut3.ut.expect(l_cursor).to_have_count(1); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - procedure fail_have_count_cursor_report is - l_cursor sys_refcursor; - l_actual_message varchar2(32767); - l_expected_message varchar2(32767); - begin - --Arrange - open l_cursor for select * from dual; - --Act - ut3.ut.expect(l_cursor).to_have_count(2); - - l_expected_message := q'[Actual: (refcursor [ count = 1 ]) was expected to have [ count = 2 ]%]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); - end; - - procedure success_not_have_count_cursor is - l_cursor sys_refcursor; - begin - --Arrange - open l_cursor for select * from dual; - --Act - ut3.ut.expect(l_cursor).not_to_have_count(2); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure fail_not_have_count_cursor is - l_cursor sys_refcursor; - begin - --Arrange - open l_cursor for select * from dual where 1 = 2; - --Act - ut3.ut.expect(l_cursor).not_to_have_count(0); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - procedure success_have_count_collection is - l_actual anydata; - begin - --Arrange - l_actual := anydata.convertcollection(ora_mining_varchar2_nt()); - -- Act - ut3.ut.expect(l_actual).to_have_count(0); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure fail_have_count_collection is - l_actual anydata; - begin - --Arrange - l_actual := anydata.convertcollection(ora_mining_varchar2_nt('a')); - -- Act - ut3.ut.expect(l_actual).to_have_count(0); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - procedure success_not_have_count_coll is - l_actual anydata; - begin - --Arrange - l_actual := anydata.convertcollection(ora_mining_varchar2_nt('a')); - -- Act - ut3.ut.expect(l_actual).not_to_have_count(2); - --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); - end; - - procedure fail_not_have_count_coll is - l_actual anydata; - begin - --Arrange - l_actual := anydata.convertcollection(ora_mining_varchar2_nt()); - -- Act - ut3.ut.expect(l_actual).not_to_have_count(0); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - procedure fail_have_count_null_coll is - l_actual anydata; - l_data ora_mining_varchar2_nt; - begin - --Arrange - l_actual := anydata.convertcollection(l_data); - -- Act - ut3.ut.expect(l_actual).to_have_count(0); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - procedure fail_not_have_count_null_coll is - l_actual anydata; - l_data ora_mining_varchar2_nt; - begin - --Arrange - l_actual := anydata.convertcollection(l_data); - -- Act - ut3.ut.expect(l_actual).not_to_have_count(0); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - procedure fail_have_count_object is - l_actual anydata; - begin - --Arrange - l_actual := anydata.convertObject(ut3.ut_data_value_number(1)); - -- Act - ut3.ut.expect(l_actual).to_have_count(0); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - procedure fail_have_count_null_object is - l_actual anydata; - l_data ut3.ut_data_value_number; - begin - --Arrange - l_actual := anydata.convertObject(l_data); - -- Act - ut3.ut.expect(l_actual).to_have_count(0); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - procedure fail_have_count_number is - l_expected_message varchar2(32767); - l_actual_message varchar2(32767); - begin - -- Act - ut3.ut.expect( 1 ).to_( ut3.have_count(0) ); - --Assert - l_expected_message := q'[%The matcher 'have count' cannot be used with data type (number).%]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); - end; - - procedure fail_not_have_count_object is - l_actual anydata; - l_expected_message varchar2(32767); - l_actual_message varchar2(32767); - begin - --Arrange - l_actual := anydata.convertObject(ut3.ut_data_value_number(1)); - -- Act - ut3.ut.expect(l_actual).not_to_have_count(0); - --Assert - l_expected_message := q'[%The matcher 'have count' cannot be used with data type (ut3.ut_data_value_number).%]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); - end; - - procedure fail_not_have_count_null_obj is - l_actual anydata; - l_data ut3.ut_data_value_number; - begin - --Arrange - l_actual := anydata.convertObject(l_data); - -- Act - ut3.ut.expect(l_actual).not_to_have_count(0); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - - procedure fail_not_have_count_number is - begin - -- Act - ut3.ut.expect( 1 ).not_to( ut3.have_count(0) ); - --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); - end; - -end; -/ \ No newline at end of file diff --git a/test/core/expectations/unary/test_expect_to_have_count.pks b/test/core/expectations/unary/test_expect_to_have_count.pks deleted file mode 100644 index 636f98ba4..000000000 --- a/test/core/expectations/unary/test_expect_to_have_count.pks +++ /dev/null @@ -1,61 +0,0 @@ -create or replace package test_expect_to_have_count is - - --%suite((not)to_have_count) - --%suitepath(utplsql.core.expectations.unary) - - --%aftereach - procedure cleanup_expectations; - - --%test(Gives success for an empty cursor) - procedure success_have_count_cursor; - - --%test(Gives failure for a non empty cursor) - procedure fail_have_count_cursor; - - --%test(Reports the content of cursor when cursor is not empty) - procedure fail_have_count_cursor_report; - - --%test(Negated - Gives success for a non empty cursor) - procedure success_not_have_count_cursor; - - --%test(Negated - Gives failure for an empty cursor) - procedure fail_not_have_count_cursor; - - --%test(Gives success for an empty collection) - procedure success_have_count_collection; - - --%test(Gives failure for a non empty collection) - procedure fail_have_count_collection; - - --%test(Negated - Gives success for a non empty collection) - procedure success_not_have_count_coll; - - --%test(Negated - Gives failure for an empty collection) - procedure fail_not_have_count_coll; - - --%test(Gives failure for a NULL collection) - procedure fail_have_count_null_coll; - - --%test(Negated - Gives failure for an empty collection) - procedure fail_not_have_count_null_coll; - - --%test(Gives failure for an object) - procedure fail_have_count_object; - - --%test(Gives failure for a null object) - procedure fail_have_count_null_object; - - --%test(Gives failure for number) - procedure fail_have_count_number; - - --%test(Negated - Gives failure for an object) - procedure fail_not_have_count_object; - - --%test(Negated - Gives failure for a null object) - procedure fail_not_have_count_null_obj; - - --%test(Negated - Gives failure for number) - procedure fail_not_have_count_number; - -end; -/ diff --git a/test/core/min_grant_user/test_min_grant_user.pkb b/test/core/min_grant_user/test_min_grant_user.pkb deleted file mode 100644 index 233cca67f..000000000 --- a/test/core/min_grant_user/test_min_grant_user.pkb +++ /dev/null @@ -1,71 +0,0 @@ -create or replace package body test_min_grant_user is - - procedure test_join_by_cursor is - l_results clob; - begin - execute immediate 'begin ut3$user#.test_cursor_grants.run_test_join_by_cursor(); end;'; - l_results := core.get_dbms_output_as_clob(); - --Assert - ut.expect( l_results ).to_be_like( '%execute join by test [% sec]' || - '%1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%' ); - - end; - - procedure test_equal_cursor is - l_results clob; - begin - execute immediate 'begin ut3$user#.test_cursor_grants.run_test_equal_cursor(); end;'; - l_results := core.get_dbms_output_as_clob(); - --Assert - ut.expect( l_results ).to_be_like( '%execute equal test [% sec]' || - '%1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%' ); - - end; - - procedure test_not_empty_cursor is - l_results clob; - begin - execute immediate 'begin ut3$user#.test_cursor_grants.run_test_not_empty_cursor(); end;'; - l_results := core.get_dbms_output_as_clob(); - --Assert - ut.expect( l_results ).to_be_like( '%execute not_empty test [% sec]' || - '%1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%' ); - - end; - - - procedure test_have_count_cursor is - l_results clob; - begin - execute immediate 'begin ut3$user#.test_cursor_grants.run_test_have_count_cursor(); end;'; - l_results := core.get_dbms_output_as_clob(); - --Assert - ut.expect( l_results ).to_be_like( '%execute have_count test [% sec]' || - '%1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%' ); - - end; - - procedure test_empty_cursor is - l_results clob; - begin - execute immediate 'begin ut3$user#.test_cursor_grants.run_test_empty_cursor(); end;'; - l_results := core.get_dbms_output_as_clob(); - --Assert - ut.expect( l_results ).to_be_like( '%execute empty test [% sec]' || - '%1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%' ); - - end; - - procedure test_equal_non_diff_sql is - l_results clob; - begin - execute immediate 'begin ut3$user#.test_cursor_grants.run_test_equal_non_diff_sql(); end;'; - l_results := core.get_dbms_output_as_clob(); - --Assert - ut.expect( l_results ).to_be_like( '%execute test with non diff datatype [% sec]' || - '%1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%' ); - - end; - -end; -/ diff --git a/test/core/min_grant_user/test_min_grant_user.pks b/test/core/min_grant_user/test_min_grant_user.pks deleted file mode 100644 index daf34b35d..000000000 --- a/test/core/min_grant_user/test_min_grant_user.pks +++ /dev/null @@ -1,25 +0,0 @@ -create or replace package test_min_grant_user is - - --%suite(minimum grant user tests) - --%suitepath(utplsql.core) - - --%test(execute join by test) - procedure test_join_by_cursor; - - --%test(execute equal test) - procedure test_equal_cursor; - - --%test(execute not_empty test) - procedure test_not_empty_cursor; - - --%test(execute have_count test) - procedure test_have_count_cursor; - - --%test(execute empty test) - procedure test_empty_cursor; - - --%test(execute test with non diff datatype) - procedure test_equal_non_diff_sql; - -end; -/ diff --git a/test/core/reporters.pkb b/test/core/reporters.pkb deleted file mode 100644 index abd9e6007..000000000 --- a/test/core/reporters.pkb +++ /dev/null @@ -1,150 +0,0 @@ -create or replace package body reporters is - - procedure create_test_helper_package is - pragma autonomous_transaction; - begin - execute immediate q'[create or replace package test_reporters -as - --%suite(A suite for testing different outcomes from reporters) - --%suitepath(org.utplsql.tests.helpers) - - --%beforeall - procedure beforeall; - - --%beforeeach - procedure beforeeach; - - --%context(some_context) - --%displayname(A description of some context) - - --%test - --%beforetest(beforetest) - --%aftertest(aftertest) - procedure passing_test; - - --%endcontext - - procedure beforetest; - - procedure aftertest; - - --%test(a test with failing assertion) - procedure failing_test; - - --%test(a test raising unhandled exception) - procedure erroring_test; - - --%test(a disabled test) - --%disabled - procedure disabled_test; - - --%aftereach - procedure aftereach; - - --%afterall - procedure afterall; - -end;]'; - - execute immediate q'[create or replace package body test_reporters -as - - procedure beforetest is - begin - dbms_output.put_line(''); - end; - - procedure aftertest - is - begin - dbms_output.put_line(''); - end; - - procedure beforeeach is - begin - dbms_output.put_line(''); - end; - - procedure aftereach is - begin - dbms_output.put_line(''); - end; - - procedure passing_test - is - begin - dbms_output.put_line(''); - ut3.ut.expect(1,'Test 1 Should Pass').to_equal(1); - end; - - procedure failing_test - is - begin - dbms_output.put_line(''); - ut3.ut.expect('number [1] ','Fails as values are different').to_equal('number [2] '); - end; - - procedure erroring_test - is - l_variable integer; - begin - dbms_output.put_line(''); - l_variable := 'a string'; - ut3.ut.expect(l_variable).to_equal(1); - end; - - procedure disabled_test - is - begin - dbms_output.put_line(''); - ut3.ut.expect(1,'this should not execute').to_equal(1); - end; - - procedure beforeall is - begin - dbms_output.put_line(''); - end; - - procedure afterall is - begin - dbms_output.put_line(''); - end; - -end;]'; - - end; - - procedure reporters_setup is - begin - create_test_helper_package; - end; - - procedure drop_test_helper_package is - begin - execute immediate 'drop package test_reporters'; - end; - - procedure reporters_cleanup is - pragma autonomous_transaction; - begin - drop_test_helper_package; - end; - - procedure check_xml_encoding_included( - a_reporter ut3.ut_output_reporter_base, - a_client_character_set varchar2 - ) is - l_results ut3.ut_varchar2_list; - l_actual clob; - begin - --Act - select * - bulk collect into l_results - from table(ut3.ut.run('test_reporters', a_reporter, a_client_character_set => a_client_character_set)); - l_actual := ut3.ut_utils.table_to_clob(l_results); - --Assert - ut.expect(l_actual).to_be_like('%'); - end; - -end reporters; -/ diff --git a/test/core/reporters.pks b/test/core/reporters.pks deleted file mode 100644 index 229e4e9b1..000000000 --- a/test/core/reporters.pks +++ /dev/null @@ -1,18 +0,0 @@ -create or replace package reporters is - - --%suite - --%suitepath(utplsql.core) - - --%beforeall - procedure reporters_setup; - - --%afterall - procedure reporters_cleanup; - - procedure check_xml_encoding_included( - a_reporter ut3.ut_output_reporter_base, - a_client_character_set varchar2 - ); - -end reporters; -/ diff --git a/test/core/reporters/test_coverage.pkb b/test/core/reporters/test_coverage.pkb deleted file mode 100644 index 2c67dc8c9..000000000 --- a/test/core/reporters/test_coverage.pkb +++ /dev/null @@ -1,262 +0,0 @@ -create or replace package body test_coverage is - - function get_mock_run_id return integer is - v_result integer; - begin - select nvl(min(runid),0) - 1 into v_result - from ut3.plsql_profiler_runs; - return v_result; - end; - - procedure create_dummy_coverage_package is - pragma autonomous_transaction; - begin - execute immediate q'[create or replace package UT3.DUMMY_COVERAGE is - procedure do_stuff; - end;]'; - execute immediate q'[create or replace package body UT3.DUMMY_COVERAGE is - procedure do_stuff is - begin - if 1 = 2 then - dbms_output.put_line('should not get here'); - else - dbms_output.put_line('should get here'); - end if; - end; - end;]'; - end; - - procedure create_dummy_coverage_test is - pragma autonomous_transaction; - begin - execute immediate q'[create or replace package UT3.TEST_DUMMY_COVERAGE is - --%suite(dummy coverage test) - --%suitepath(coverage_testing) - - --%test - procedure test_do_stuff; - end;]'; - execute immediate q'[create or replace package body UT3.TEST_DUMMY_COVERAGE is - procedure test_do_stuff is - begin - dummy_coverage.do_stuff; - end; - end;]'; - end; - - procedure create_dummy_coverage_test_1 is - pragma autonomous_transaction; - begin - execute immediate q'[create or replace package UT3.DUMMY_COVERAGE_1 is - procedure do_stuff; - end;]'; - execute immediate q'[create or replace package body UT3.DUMMY_COVERAGE_1 is - procedure do_stuff is - begin - if 1 = 2 then - dbms_output.put_line('should not get here'); - else - dbms_output.put_line('should get here'); - end if; - end; - end;]'; - execute immediate q'[create or replace package UT3.TEST_DUMMY_COVERAGE_1 is - --%suite(dummy coverage test 1) - --%suitepath(coverage_testing) - - --%test - procedure test_do_stuff; - end;]'; - execute immediate q'[create or replace package body UT3.TEST_DUMMY_COVERAGE_1 is - procedure test_do_stuff is - begin - dummy_coverage_1.do_stuff; - end; - end;]'; - end; - - procedure drop_dummy_coverage_test_1 is - pragma autonomous_transaction; - begin - execute immediate q'[drop package UT3.DUMMY_COVERAGE_1]'; - execute immediate q'[drop package UT3.TEST_DUMMY_COVERAGE_1]'; - end; - - - procedure mock_coverage_data(a_run_id integer) is - c_unit_id constant integer := 1; - begin - insert into ut3.plsql_profiler_runs ( runid, run_owner, run_date, run_comment) - values(a_run_id, user, sysdate, 'unit testing utPLSQL'); - - insert into ut3.plsql_profiler_units ( runid, unit_number, unit_type, unit_owner, unit_name) - values(a_run_id, c_unit_id, 'PACKAGE BODY', 'UT3', 'DUMMY_COVERAGE'); - - insert into ut3.plsql_profiler_data ( runid, unit_number, line#, total_occur, total_time) - select a_run_id, c_unit_id, 4, 1, 1 from dual union all - select a_run_id, c_unit_id, 5, 0, 0 from dual union all - select a_run_id, c_unit_id, 7, 1, 1 from dual; - end; - - procedure create_dummy_coverage_pkg is - pragma autonomous_transaction; - begin - create_dummy_coverage_package(); - create_dummy_coverage_test(); - end; - - procedure setup_dummy_coverage is - pragma autonomous_transaction; - begin - g_run_id := get_mock_run_id(); - ut3.ut_coverage.mock_coverage_id(g_run_id, ut3.ut_coverage.gc_proftab_coverage); - mock_coverage_data(g_run_id); - commit; - end; - - procedure drop_dummy_coverage_pkg is - pragma autonomous_transaction; - begin - begin execute immediate q'[drop package ut3.test_dummy_coverage]'; exception when others then null; end; - begin execute immediate q'[drop package ut3.dummy_coverage]'; exception when others then null; end; - end; - - procedure cleanup_dummy_coverage is - pragma autonomous_transaction; - begin - delete from ut3.plsql_profiler_data where runid = g_run_id; - delete from ut3.plsql_profiler_units where runid = g_run_id; - delete from ut3.plsql_profiler_runs where runid = g_run_id; - commit; - end; - - procedure coverage_for_object is - l_expected clob; - l_actual clob; - l_results ut3.ut_varchar2_list; - begin - --Arrange - l_expected := '%%'; - --Act - select * - bulk collect into l_results - from table( - ut3.ut.run( - a_path => 'ut3.test_dummy_coverage', - a_reporter=> ut3.ut_coverage_sonar_reporter( ), - a_include_objects => ut3.ut_varchar2_list( 'ut3.dummy_coverage' ) - ) - ); - --Assert - l_actual := ut3.ut_utils.table_to_clob(l_results); - ut.expect(l_actual).to_be_like(l_expected); - end; - - procedure coverage_for_object_no_owner is - l_expected clob; - l_actual clob; - l_results ut3.ut_varchar2_list; - begin - --Arrange - l_expected := '%%'; - --Act - select * - bulk collect into l_results - from table( - ut3.ut.run( - a_path => 'ut3.test_dummy_coverage', - a_reporter=> ut3.ut_coverage_sonar_reporter( ), - a_include_objects => ut3.ut_varchar2_list( 'dummy_coverage' ) - ) - ); - --Assert - l_actual := ut3.ut_utils.table_to_clob(l_results); - ut.expect(l_actual).to_be_like(l_expected); - end; - - procedure coverage_for_schema is - l_expected clob; - l_actual clob; - l_results ut3.ut_varchar2_list; - begin - --Arrange - l_expected := ''; - l_expected := '%'||l_expected||'%'||l_expected||'%'; - --Act - select * - bulk collect into l_results - from table( - ut3.ut.run( - a_path => 'ut3.test_dummy_coverage', - a_reporter=> ut3.ut_coverage_sonar_reporter( ), - a_coverage_schemes => ut3.ut_varchar2_list( 'ut3' ) - ) - ); - --Assert - l_actual := ut3.ut_utils.table_to_clob(l_results); - ut.expect(l_actual).to_be_like(l_expected); - end; - - procedure coverage_for_file is - l_expected clob; - l_actual clob; - l_results ut3.ut_varchar2_list; - l_file_path varchar2(100); - begin - --Arrange - l_file_path := lower('test/ut3.dummy_coverage.pkb'); - l_expected := '%%'; - --Act - select * - bulk collect into l_results - from table( - ut3.ut.run( - a_path => 'ut3.test_dummy_coverage', - a_reporter=> ut3.ut_coverage_sonar_reporter( ), - a_source_files => ut3.ut_varchar2_list( l_file_path ), - a_test_files => ut3.ut_varchar2_list( ) - ) - ); - --Assert - l_actual := ut3.ut_utils.table_to_clob(l_results); - ut.expect(l_actual).to_be_like(l_expected); - end; - - procedure coverage_tmp_data_refresh is - l_actual clob; - l_results ut3.ut_varchar2_list; - begin - --Arrange - select * - bulk collect into l_results - from table( - ut3.ut.run( - a_path => 'ut3:coverage_testing', - a_reporter=> ut3.ut_coverage_sonar_reporter( ), - a_include_objects => ut3.ut_varchar2_list( 'ut3.dummy_coverage' ) - ) - ); - cleanup_dummy_coverage(); - drop_dummy_coverage_pkg(); - create_dummy_coverage_test_1; - - --Act - select * - bulk collect into l_results - from table( - ut3.ut.run( - a_path => 'ut3:coverage_testing', - a_reporter=> ut3.ut_coverage_sonar_reporter( ), - a_include_objects => ut3.ut_varchar2_list( 'ut3.dummy_coverage' ) - ) - ); - - --Assert - l_actual := ut3.ut_utils.table_to_clob(l_results); - ut.expect(l_actual).to_equal(to_clob(' - -')); - end; - -end; -/ diff --git a/test/core/reporters/test_coverage.pks b/test/core/reporters/test_coverage.pks deleted file mode 100644 index 51eb175ec..000000000 --- a/test/core/reporters/test_coverage.pks +++ /dev/null @@ -1,40 +0,0 @@ -create or replace package test_coverage is - - --%suite - --%suitepath(utplsql.core.reporters) - - g_run_id integer; - - --%beforeall - procedure create_dummy_coverage_pkg; - --%beforeall - procedure setup_dummy_coverage; - - - --%afterall - procedure drop_dummy_coverage_pkg; - --%afterall - procedure cleanup_dummy_coverage; - - - --%test(Coverage is gathered for specified object - default coverage type) - procedure coverage_for_object; - - --%test(Coverage is gathered for specified schema - default coverage type) - procedure coverage_for_object_no_owner; - - --%test(Coverage is gathered for specified schema) - procedure coverage_for_schema; - - --%test(Coverage is gathered for specified file - default coverage type) - procedure coverage_for_file; - - --%test(Coverage data is not cached between runs - issue #562 ) - --%aftertest(create_dummy_coverage_pkg) - --%aftertest(setup_dummy_coverage) - --%aftertest(drop_dummy_coverage_test_1) - procedure coverage_tmp_data_refresh; - - procedure drop_dummy_coverage_test_1; -end; -/ diff --git a/test/core/reporters/test_coverage/test_cov_cobertura_reporter.pkb b/test/core/reporters/test_coverage/test_cov_cobertura_reporter.pkb deleted file mode 100644 index cabf64e90..000000000 --- a/test/core/reporters/test_coverage/test_cov_cobertura_reporter.pkb +++ /dev/null @@ -1,45 +0,0 @@ -create or replace package body test_cov_cobertura_reporter is - - procedure report_on_file is - l_results ut3.ut_varchar2_list; - l_expected clob; - l_actual clob; - begin - --Arrange - l_expected := - q'[ - - - -test/ut3.dummy_coverage.pkb - - - - - - - - - - - - -]'; - --Act - select * - bulk collect into l_results - from table( - ut3.ut.run( - a_path => 'ut3.test_dummy_coverage', - a_reporter=> ut3.ut_coverage_cobertura_reporter( ), - a_source_files => ut3.ut_varchar2_list( 'test/ut3.dummy_coverage.pkb' ), - a_test_files => ut3.ut_varchar2_list( ) - ) - ); - l_actual := ut3.ut_utils.table_to_clob(l_results); - --Assert - ut.expect(l_actual).to_be_like(l_expected); - end; - -end; -/ diff --git a/test/core/reporters/test_coverage/test_cov_cobertura_reporter.pks b/test/core/reporters/test_coverage/test_cov_cobertura_reporter.pks deleted file mode 100644 index ac347fb9d..000000000 --- a/test/core/reporters/test_coverage/test_cov_cobertura_reporter.pks +++ /dev/null @@ -1,10 +0,0 @@ -create or replace package test_cov_cobertura_reporter is - - --%suite(ut_cov_cobertura_reporter) - --%suitepath(utplsql.core.reporters.test_coverage) - - --%test(reports on a project file mapped to database object) - procedure report_on_file; - -end test_cov_cobertura_reporter; -/ diff --git a/test/core/reporters/test_coverage/test_coverage_sonar_reporter.pkb b/test/core/reporters/test_coverage/test_coverage_sonar_reporter.pkb deleted file mode 100644 index 81b2c12f8..000000000 --- a/test/core/reporters/test_coverage/test_coverage_sonar_reporter.pkb +++ /dev/null @@ -1,39 +0,0 @@ -create or replace package body test_coverage_sonar_reporter is - - procedure report_on_file is - l_results ut3.ut_varchar2_list; - l_expected clob; - l_actual clob; - begin - --Arrange - l_expected := ' - - - - - - -'; - --Act - select * - bulk collect into l_results - from table( - ut3.ut.run( - a_path => 'ut3.test_dummy_coverage', - a_reporter=> ut3.ut_coverage_sonar_reporter( ), - a_source_files => ut3.ut_varchar2_list( 'test/ut3.dummy_coverage.pkb' ), - a_test_files => ut3.ut_varchar2_list( ) - ) - ); - l_actual := ut3.ut_utils.table_to_clob(l_results); - --Assert - ut.expect(l_actual).to_equal(l_expected); - end; - - procedure check_encoding_included is - begin - reporters.check_xml_encoding_included(ut3.ut_coverage_sonar_reporter(), 'UTF-8'); - end; - -end; -/ diff --git a/test/core/reporters/test_coverage/test_coverage_sonar_reporter.pks b/test/core/reporters/test_coverage/test_coverage_sonar_reporter.pks deleted file mode 100644 index 31cb358dd..000000000 --- a/test/core/reporters/test_coverage/test_coverage_sonar_reporter.pks +++ /dev/null @@ -1,13 +0,0 @@ -create or replace package test_coverage_sonar_reporter is - - --%suite(ut_coverge_sonar_reporter) - --%suitepath(utplsql.core.reporters.test_coverage) - - --%test(reports on a project file mapped to database object) - procedure report_on_file; - - --%test(Includes XML header with encoding when encoding provided) - procedure check_encoding_included; - -end; -/ diff --git a/test/core/reporters/test_coverage/test_coveralls_reporter.pkb b/test/core/reporters/test_coverage/test_coveralls_reporter.pkb deleted file mode 100644 index 774e796a0..000000000 --- a/test/core/reporters/test_coverage/test_coveralls_reporter.pkb +++ /dev/null @@ -1,85 +0,0 @@ -create or replace package body test_coveralls_reporter is - - procedure report_on_file is - l_results ut3.ut_varchar2_list; - l_expected clob; - l_actual clob; - begin - --Arrange - l_expected := q'[{"source_files":[ -{ "name": "test/ut3.dummy_coverage.pkb", -"coverage": [ -null, -null, -null, -1, -0, -null, -1 -] -} -]} - ]'; - --Act - select * - bulk collect into l_results - from table( - ut3.ut.run( - a_path => 'ut3.test_dummy_coverage', - a_reporter=> ut3.ut_coveralls_reporter( ), - a_source_files => ut3.ut_varchar2_list( 'test/ut3.dummy_coverage.pkb' ), - a_test_files => ut3.ut_varchar2_list( ) - ) - ); - l_actual := ut3.ut_utils.table_to_clob(l_results); - --Assert - ut.expect(l_actual).to_equal(l_expected); - end; - - procedure report_zero_coverage is - l_results ut3.ut_varchar2_list; - l_expected clob; - l_actual clob; - pragma autonomous_transaction; - begin - --Arrange - l_expected := q'[{"source_files":[ -{ "name": "ut3.dummy_coverage", -"coverage": [ -0, -0, -0, -0, -0, -0, -0, -0, -0, -0 -] -} -]} - ]'; - - test_coverage.cleanup_dummy_coverage; - - --Act - select * - bulk collect into l_results - from table( - ut3.ut.run( - 'ut3.test_dummy_coverage', - ut3.ut_coveralls_reporter(), - a_include_objects => ut3.ut_varchar2_list('UT3.DUMMY_COVERAGE') - ) - ); - l_actual := ut3.ut_utils.table_to_clob(l_results); - --Assert - ut.expect(l_actual).to_equal(l_expected); - - test_coverage.setup_dummy_coverage; - - end; - -end; -/ diff --git a/test/core/reporters/test_coverage/test_coveralls_reporter.pks b/test/core/reporters/test_coverage/test_coveralls_reporter.pks deleted file mode 100644 index bf2b861f7..000000000 --- a/test/core/reporters/test_coverage/test_coveralls_reporter.pks +++ /dev/null @@ -1,13 +0,0 @@ -create or replace package test_coveralls_reporter is - - --%suite(ut_coveralls_reporter) - --%suitepath(utplsql.core.reporters.test_coverage) - - --%test(reports on a project file mapped to database object) - procedure report_on_file; - - --%test(reports zero coverage on each line of non-executed database object) - procedure report_zero_coverage; - -end; -/ diff --git a/test/core/reporters/test_coverage/test_html_extended_reporter.pkb b/test/core/reporters/test_coverage/test_html_extended_reporter.pkb deleted file mode 100644 index 19e1fe807..000000000 --- a/test/core/reporters/test_coverage/test_html_extended_reporter.pkb +++ /dev/null @@ -1,29 +0,0 @@ -create or replace package body test_html_extended_reporter is - - procedure report_on_file is - l_results ut3.ut_varchar2_list; - l_expected varchar2(32767); - l_actual clob; - l_charset varchar2(100) := 'ISO-8859-1'; - begin - --Arrange - l_expected := '%%

UT3.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG

%4 relevant lines. 3 lines covered (including 1 lines partially covered ) and 1 lines missed%'; - - select * - bulk collect into l_results - from table( - ut3.ut.run( - a_path => 'ut3.test_dummy_coverage', - a_reporter=> ut3.ut_coverage_html_reporter(), - a_source_files => ut3.ut_varchar2_list( 'test/ut3.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long.pkb' ), - a_test_files => ut3.ut_varchar2_list( ), - a_client_character_set => l_charset - ) - ); - l_actual := ut3.ut_utils.table_to_clob(l_results); - --Assert - ut.expect(l_actual).to_be_like(l_expected); - end; - -end test_html_extended_reporter; -/ diff --git a/test/core/reporters/test_coverage/test_html_extended_reporter.pks b/test/core/reporters/test_coverage/test_html_extended_reporter.pks deleted file mode 100644 index cefa71d66..000000000 --- a/test/core/reporters/test_coverage/test_html_extended_reporter.pks +++ /dev/null @@ -1,10 +0,0 @@ -create or replace package test_html_extended_reporter is - - --%suite(ut_html_extended_reporter) - --%suitepath(utplsql.core.reporters.test_extended_coverage) - - --%test(reports on a project file mapped to database object in extended profiler coverage) - procedure report_on_file; - -end test_html_extended_reporter; -/ diff --git a/test/core/reporters/test_coverage/test_html_proftab_reporter.pkb b/test/core/reporters/test_coverage/test_html_proftab_reporter.pkb deleted file mode 100644 index c10af2869..000000000 --- a/test/core/reporters/test_coverage/test_html_proftab_reporter.pkb +++ /dev/null @@ -1,29 +0,0 @@ -create or replace package body test_html_proftab_reporter is - - procedure report_on_file is - l_results ut3.ut_varchar2_list; - l_expected varchar2(32767); - l_actual clob; - l_charset varchar2(100) := 'ISO-8859-1'; - begin - --Arrange - l_expected := '%%

UT3.DUMMY_COVERAGE

%3 relevant lines. 2 lines covered and 1 lines missed%'; - --Act - select * - bulk collect into l_results - from table( - ut3.ut.run( - a_path => 'ut3.test_dummy_coverage', - a_reporter=> ut3.ut_coverage_html_reporter(), - a_source_files => ut3.ut_varchar2_list( 'test/ut3.dummy_coverage.pkb' ), - a_test_files => ut3.ut_varchar2_list( ), - a_client_character_set => l_charset - ) - ); - l_actual := ut3.ut_utils.table_to_clob(l_results); - --Assert - ut.expect(l_actual).to_be_like(l_expected); - end; - -end test_html_proftab_reporter; -/ diff --git a/test/core/reporters/test_coverage/test_html_proftab_reporter.pks b/test/core/reporters/test_coverage/test_html_proftab_reporter.pks deleted file mode 100644 index d091510c6..000000000 --- a/test/core/reporters/test_coverage/test_html_proftab_reporter.pks +++ /dev/null @@ -1,10 +0,0 @@ -create or replace package test_html_proftab_reporter is - - --%suite(ut_html_proftab_reporter) - --%suitepath(utplsql.core.reporters.test_coverage) - - --%test(reports on a project file mapped to database object in profiler coverage) - procedure report_on_file; - -end test_html_proftab_reporter; -/ diff --git a/test/core/reporters/test_debug_reporter.pkb b/test/core/reporters/test_debug_reporter.pkb deleted file mode 100644 index d82685ac4..000000000 --- a/test/core/reporters/test_debug_reporter.pkb +++ /dev/null @@ -1,45 +0,0 @@ -create or replace package body test_debug_reporter as - - g_actual clob; - - procedure run_reporter is - l_results ut3.ut_varchar2_list; - begin - select * - bulk collect into l_results - from table( - ut3.ut.run( - 'test_reporters', - ut3.ut_debug_reporter() - ) - ); - g_actual := ut3.ut_utils.table_to_clob(l_results); - end; - - procedure includes_event_info is - l_expected varchar2(32767); - begin - l_expected := '\s+' || - '(\s+' || - '[0-9\-]+T[0-9:\.]+<\/TIMESTAMP>\s+' || - '[0-9 \+:\.]+<\/TIME_FROM_START>\s+' || - '[0-9 \+:\.]+<\/TIME_FROM_PREVIOUS>\s+' || - '\w+<\/EVENT_NAME>\s+' || - '(\s|\S)+?<\/CALL_STACK>(\s|\S)+?' || - '<\/DEBUG>\s+)+' || - '<\/DEBUG_LOG>'; - ut.expect( g_actual ).to_match( l_expected, 'm' ); - end; - - procedure includes_run_info is - l_expected varchar2(32767); - begin - l_expected := '(\s|\S)+?(\s|\S)+?<\/UT_RUN_INFO>\s+<\/DEBUG>'; - ut.expect( g_actual ).to_match( l_expected, 'm' ); - end; - - -end; -/ - - diff --git a/test/core/reporters/test_debug_reporter.pks b/test/core/reporters/test_debug_reporter.pks deleted file mode 100644 index d4ba20a62..000000000 --- a/test/core/reporters/test_debug_reporter.pks +++ /dev/null @@ -1,16 +0,0 @@ -create or replace package test_debug_reporter as - - --%suite(ut_debug_reporter) - --%suitepath(utplsql.core.reporters) - - --%beforeall - procedure run_reporter; - - --%test(Includes event info for every event) - procedure includes_event_info; - - --%test(Includes run info) - procedure includes_run_info; - -end; -/ diff --git a/test/core/reporters/test_documentation_reporter.pkb b/test/core/reporters/test_documentation_reporter.pkb deleted file mode 100644 index 7045aa7ca..000000000 --- a/test/core/reporters/test_documentation_reporter.pkb +++ /dev/null @@ -1 +0,0 @@ -create or replace package body test_documentation_reporter as procedure report_produces_expected_out is l_results ut3.ut_varchar2_list; l_actual clob; l_expected varchar2(32767):=q'[%org utplsql tests helpers A suite for testing different outcomes from reporters A description of some context passing_test [% sec] a test with failing assertion [% sec] (FAILED - 1) a test raising unhandled exception [% sec] (FAILED - 2) a disabled test [0 sec] (DISABLED) % Failures: % 1) failing_test "Fails as values are different" Actual: 'number [1] ' (varchar2) was expected to equal: 'number [2] ' (varchar2)% at "UT3_TESTER.TEST_REPORTERS%", line 36 ut3.ut.expect('number [1] ','Fails as values are different').to_equal('number [2] '); % % 2) erroring_test ORA-06502: PL/SQL: numeric or value error: character to number conversion error ORA-06512: at "UT3_TESTER.TEST_REPORTERS", line 44% ORA-06512: at line 6 Finished in % seconds 4 tests, 1 failed, 1 errored, 1 disabled, 0 warning(s)%]'; begin select * bulk collect into l_results from table( ut3.ut.run( 'test_reporters', ut3.ut_documentation_reporter() ) ); l_actual := ut3.ut_utils.table_to_clob(l_results); ut.expect(l_actual).to_be_like(l_expected); end; procedure check_encoding_included is begin reporters.check_xml_encoding_included(ut3.ut_sonar_test_reporter(), 'UTF-8'); end; end; / \ No newline at end of file diff --git a/test/core/reporters/test_documentation_reporter.pks b/test/core/reporters/test_documentation_reporter.pks deleted file mode 100644 index 09835abdc..000000000 --- a/test/core/reporters/test_documentation_reporter.pks +++ /dev/null @@ -1,10 +0,0 @@ -create or replace package test_documentation_reporter as - - --%suite(ut_documentation_reporter) - --%suitepath(utplsql.core.reporters) - - --%test(Report produces expected output) - procedure report_produces_expected_out; - -end; -/ diff --git a/test/core/reporters/test_extended_coverage.pkb b/test/core/reporters/test_extended_coverage.pkb deleted file mode 100644 index a3719e503..000000000 --- a/test/core/reporters/test_extended_coverage.pkb +++ /dev/null @@ -1,188 +0,0 @@ -create or replace package body test_extended_coverage is - - g_run_id ut3.ut_coverage.tt_coverage_id_arr; - - function get_mock_block_run_id return integer is - v_result integer; - begin - select nvl(min(run_id),0) - 1 into v_result - from dbmspcc_runs; - return v_result; - end; - - function get_mock_proftab_run_id return integer is - v_result integer; - begin - select nvl(min(runid),0) - 1 into v_result - from ut3.plsql_profiler_runs; - return v_result; - end; - - procedure create_dummy_coverage_package is - pragma autonomous_transaction; - begin - execute immediate q'[create or replace package UT3.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG is - procedure do_stuff(i_input in number); - end;]'; - execute immediate q'[create or replace package body UT3.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG is - procedure do_stuff(i_input in number) is - begin - if i_input = 2 then - dbms_output.put_line('should not get here'); - else - dbms_output.put_line('should get here'); - end if; - end; - end;]'; - end; - - procedure create_dummy_coverage_test is - pragma autonomous_transaction; - begin - execute immediate q'[create or replace package UT3.TEST_DUMMY_COVERAGE is - --%suite(dummy coverage test) - --%suitepath(coverage_testing) - - --%test - procedure test_do_stuff; - end;]'; - execute immediate q'[create or replace package body UT3.TEST_DUMMY_COVERAGE is - procedure test_do_stuff is - begin - dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long.do_stuff(1); - ut.expect(1).to_equal(1); - end; - end;]'; - end; - - procedure mock_block_coverage_data(a_run_id integer) is - c_unit_id constant integer := 1; - begin - insert into dbmspcc_runs ( run_id, run_owner, run_timestamp, run_comment) - values(a_run_id, user, sysdate, 'unit testing utPLSQL'); - - insert into dbmspcc_units ( run_id, object_id, type, owner, name,last_ddl_time) - values(a_run_id, c_unit_id, 'PACKAGE BODY', 'UT3', 'DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG',sysdate); - - insert into dbmspcc_blocks ( run_id, object_id, line,block,col,covered,not_feasible) - select a_run_id, c_unit_id,4,1,1,1,0 from dual union all - select a_run_id, c_unit_id,4,2,2,0,0 from dual union all - select a_run_id, c_unit_id,5,3,0,1,0 from dual union all - select a_run_id, c_unit_id,7,4,1,1,0 from dual; - end; - - procedure mock_profiler_coverage_data(a_run_id integer) is - c_unit_id constant integer := 1; - begin - insert into ut3.plsql_profiler_runs ( runid, run_owner, run_date, run_comment) - values(a_run_id, user, sysdate, 'unit testing utPLSQL'); - - insert into ut3.plsql_profiler_units ( runid, unit_number, unit_type, unit_owner, unit_name) - values(a_run_id, c_unit_id, 'PACKAGE BODY', 'UT3', 'DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG'); - - insert into ut3.plsql_profiler_data ( runid, unit_number, line#, total_occur, total_time) - select a_run_id, c_unit_id, 4, 1, 1 from dual union all - select a_run_id, c_unit_id, 5, 0, 0 from dual union all - select a_run_id, c_unit_id, 6, 1, 0 from dual union all - select a_run_id, c_unit_id, 7, 1, 1 from dual; - end; - - procedure setup_dummy_coverage is - pragma autonomous_transaction; - begin - create_dummy_coverage_package(); - create_dummy_coverage_test(); - g_run_id(ut3.ut_coverage.gc_block_coverage) := get_mock_block_run_id(); - g_run_id(ut3.ut_coverage.gc_proftab_coverage) := get_mock_proftab_run_id(); - ut3.ut_coverage.mock_coverage_id(g_run_id); - mock_block_coverage_data(g_run_id(ut3.ut_coverage.gc_block_coverage)); - mock_profiler_coverage_data(g_run_id(ut3.ut_coverage.gc_proftab_coverage)); - commit; - end; - - procedure cleanup_dummy_coverage is - pragma autonomous_transaction; - begin - begin execute immediate q'[drop package ut3.test_dummy_coverage]'; exception when others then null; end; - begin execute immediate q'[drop package ut3.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long]'; exception when others then null; end; - delete from dbmspcc_blocks where run_id = g_run_id(ut3.ut_coverage.gc_block_coverage); - delete from dbmspcc_units where run_id = g_run_id(ut3.ut_coverage.gc_block_coverage); - delete from dbmspcc_runs where run_id = g_run_id(ut3.ut_coverage.gc_block_coverage); - delete from ut3.plsql_profiler_data where runid = g_run_id(ut3.ut_coverage.gc_proftab_coverage); - delete from ut3.plsql_profiler_units where runid = g_run_id(ut3.ut_coverage.gc_proftab_coverage); - delete from ut3.plsql_profiler_runs where runid = g_run_id(ut3.ut_coverage.gc_proftab_coverage); - commit; - end; - - procedure coverage_for_object is - l_expected clob; - l_actual clob; - l_results ut3.ut_varchar2_list; - begin - --Arrange - l_expected := '%%%'; - --Act - select * - bulk collect into l_results - from table( - ut3.ut.run( - a_path => 'ut3.test_dummy_coverage', - a_reporter=> ut3.ut_coverage_sonar_reporter( ), - a_include_objects => ut3.ut_varchar2_list( 'ut3.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long' ) - ) - ); - --Assert - l_actual := ut3.ut_utils.table_to_clob(l_results); - ut.expect(l_actual).to_be_like(l_expected); - end; - - procedure coverage_for_schema is - l_expected clob; - l_actual clob; - l_results ut3.ut_varchar2_list; - begin - --Arrange - l_expected := '%%%'; - --Act - select * - bulk collect into l_results - from table( - ut3.ut.run( - a_path => 'ut3.test_dummy_coverage', - a_reporter=> ut3.ut_coverage_sonar_reporter( ), - a_coverage_schemes => ut3.ut_varchar2_list( 'ut3' ) - ) - ); - --Assert - l_actual := ut3.ut_utils.table_to_clob(l_results); - ut.expect(l_actual).to_be_like(l_expected); - ut.expect(l_actual).to_be_like('%%%'); - end; - - procedure coverage_for_file is - l_expected clob; - l_actual clob; - l_results ut3.ut_varchar2_list; - l_file_path varchar2(250); - begin - --Arrange - l_file_path := lower('test/ut3.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long.pkb'); - l_expected := '%%%'; - --Act - select * - bulk collect into l_results - from table( - ut3.ut.run( - a_path => 'ut3.test_dummy_coverage', - a_reporter=> ut3.ut_coverage_sonar_reporter( ), - a_source_files => ut3.ut_varchar2_list( l_file_path ), - a_test_files => ut3.ut_varchar2_list( ) - ) - ); - --Assert - l_actual := ut3.ut_utils.table_to_clob(l_results); - ut.expect(l_actual).to_be_like(l_expected); - end; - -end; -/ diff --git a/test/core/reporters/test_extended_coverage.pks b/test/core/reporters/test_extended_coverage.pks deleted file mode 100644 index 6d85a4a30..000000000 --- a/test/core/reporters/test_extended_coverage.pks +++ /dev/null @@ -1,22 +0,0 @@ -create or replace package test_extended_coverage is - - --%suite - --%suitepath(utplsql.core.reporters) - - --%beforeall - procedure setup_dummy_coverage; - - --%afterall - procedure cleanup_dummy_coverage; - - --%test(Coverage is gathered for specified object - extended coverage type) - procedure coverage_for_object; - - --%test(Coverage is gathered for specified schema - extended coverage type) - procedure coverage_for_schema; - - --%test(Coverage is gathered for specified file - extended coverage type) - procedure coverage_for_file; - -end; -/ diff --git a/test/core/reporters/test_junit_reporter.pkb b/test/core/reporters/test_junit_reporter.pkb deleted file mode 100644 index e0a7ea00d..000000000 --- a/test/core/reporters/test_junit_reporter.pkb +++ /dev/null @@ -1,353 +0,0 @@ -create or replace package body test_junit_reporter as - - procedure create_a_test_package is - pragma autonomous_transaction; - begin - execute immediate q'[create or replace package check_junit_reporting is - --%suite(A suite with ) - - --%test(A test with ) - procedure test_do_stuff; - - end;]'; - execute immediate q'[create or replace package body check_junit_reporting is - procedure test_do_stuff is - begin - ut3.ut.expect(1).to_equal(1); - ut3.ut.expect(1).to_equal(2); - end; - - end;]'; - - execute immediate q'[create or replace package check_junit_rep_suitepath is - --%suitepath(core) - --%suite(check_junit_rep_suitepath) - --%displayname(Check junit Get path for suitepath) - - --%test(check_junit_rep_suitepath) - --%displayname(Check junit Get path for suitepath) - procedure check_junit_rep_suitepath; - end;]'; - execute immediate q'[create or replace package body check_junit_rep_suitepath is - procedure check_junit_rep_suitepath is - begin - ut3.ut.expect(1).to_equal(1); - end; - end;]'; - - - execute immediate q'[create or replace package tst_package_junit_nodesc as - --%suite(Suite name) - - --%test - procedure test1; - - --%test(Test name) - procedure test2; - end;]'; - - execute immediate q'[create or replace package body tst_package_junit_nodesc as - procedure test1 is begin ut.expect(1).to_equal(1); end; - procedure test2 is begin ut.expect(1).to_equal(1); end; - end;]'; - - execute immediate q'[create or replace package tst_package_junit_nosuite as - --%suite - - --%test(Test name) - procedure test1; - end;]'; - - execute immediate q'[create or replace package body tst_package_junit_nosuite as - procedure test1 is begin ut.expect(1).to_equal(1); end; - end;]'; - - execute immediate q'[create or replace package Tst_Fix_Case_Sensitive as - --%suite - - --%test(bugfix) - procedure bUgFiX; - end;]'; - - execute immediate q'[create or replace package body Tst_Fix_Case_Sensitive as - procedure bUgFiX is begin ut.expect(1).to_equal(1); end; - end;]'; - - execute immediate q'[create or replace package check_fail_escape is - --%suitepath(core) - --%suite(checkfailedescape) - --%displayname(Check JUNIT XML failure is escaped) - - --%test(Fail Miserably) - procedure fail_miserably; - - end;]'; - - execute immediate q'[create or replace package body check_fail_escape is - procedure fail_miserably is - begin - ut3.ut.expect('test').to_equal(''); - end; - end;]'; - - end; - - procedure escapes_special_chars is - l_results ut3.ut_varchar2_list; - l_actual clob; - begin - --Act - select * - bulk collect into l_results - from table(ut3.ut.run('check_junit_reporting',ut3.ut_junit_reporter())); - l_actual := ut3.ut_utils.table_to_clob(l_results); - --Assert - ut.expect(l_actual).not_to_be_like('%%'); - ut.expect(l_actual).to_be_like('%<tag>%'); - end; - - procedure reports_only_failed_or_errored is - l_results ut3.ut_varchar2_list; - l_actual clob; - begin - --Act - select * - bulk collect into l_results - from table(ut3.ut.run('check_junit_reporting',ut3.ut_junit_reporter())); - l_actual := ut3.ut_utils.table_to_clob(l_results); - --Assert - ut.expect(l_actual).not_to_be_like('%Actual: 1 (number) was expected to equal: 1 (number)%'); - ut.expect(l_actual).to_be_like('%Actual: 1 (number) was expected to equal: 2 (number)%'); - end; - - procedure reports_xunit_only_fail_or_err is - l_results ut3.ut_varchar2_list; - l_actual clob; - begin - --Act - select * - bulk collect into l_results - from table(ut3.ut.run('check_junit_reporting',ut3.ut_xunit_reporter())); - l_actual := ut3.ut_utils.table_to_clob(l_results); - --Assert - ut.expect(l_actual).not_to_be_like('%Actual: 1 (number) was expected to equal: 1 (number)%'); - ut.expect(l_actual).to_be_like('%Actual: 1 (number) was expected to equal: 2 (number)%'); - end; - - procedure reports_failed_line is - l_results ut3.ut_varchar2_list; - l_actual clob; - begin - --Act - select * - bulk collect into l_results - from table(ut3.ut.run('check_junit_reporting',ut3.ut_junit_reporter())); - l_actual := ut3.ut_utils.table_to_clob(l_results); - --Assert - ut.expect(l_actual).to_be_like('%at "%.CHECK_JUNIT_REPORTING%", line %'); - end; - - procedure check_classname_suite is - l_results ut3.ut_varchar2_list; - l_actual clob; - begin - --Act - select * - bulk collect into l_results - from table(ut3.ut.run('check_junit_reporting',ut3.ut_junit_reporter())); - l_actual := ut3.ut_utils.table_to_clob(l_results); - --Assert - ut.expect(l_actual).to_be_like('%testcase classname="check_junit_reporting" assertions="%" name="%"%'); - end; - - procedure check_nls_number_formatting is - l_results ut3.ut_varchar2_list; - l_actual clob; - l_nls_numeric_characters varchar2(30); - begin - --Arrange - select replace(nsp.value,'''','''''') into l_nls_numeric_characters - from nls_session_parameters nsp - where parameter = 'NLS_NUMERIC_CHARACTERS'; - execute immediate q'[alter session set NLS_NUMERIC_CHARACTERS=', ']'; - --Act - select * - bulk collect into l_results - from table(ut3.ut.run('check_junit_reporting', ut3.ut_junit_reporter())); - l_actual := ut3.ut_utils.table_to_clob(l_results); - --Assert - ut.expect(l_actual).to_match('time="[0-9]*\.[0-9]{3,6}"'); - --Cleanup - execute immediate 'alter session set NLS_NUMERIC_CHARACTERS='''||l_nls_numeric_characters||''''; - end; - - procedure check_classname_suitepath is - l_results ut3.ut_varchar2_list; - l_actual clob; - begin - --Act - select * - bulk collect into l_results - from table(ut3.ut.run('check_junit_rep_suitepath',ut3.ut_junit_reporter())); - l_actual := ut3.ut_utils.table_to_clob(l_results); - --Assert - ut.expect(l_actual).to_be_like('%testcase classname="core.check_junit_rep_suitepath" assertions="%" name="%"%'); - end; - - procedure report_test_without_desc is - l_results ut3.ut_varchar2_list; - l_actual clob; - l_expected varchar2(32767):= q'[ - - - - - - - - - - - - - -]'; - begin - select * - bulk collect into l_results - from table(ut3.ut.run('tst_package_junit_nodesc',ut3.ut_junit_reporter())); - l_actual := ut3.ut_utils.table_to_clob(l_results); - ut.expect(l_actual).to_be_like(l_expected); - end; - - procedure report_suite_without_desc is - l_results ut3.ut_varchar2_list; - l_actual clob; - l_expected varchar2(32767):= q'[ - - - - - - - - - -]'; - begin - select * - bulk collect into l_results - from table(ut3.ut.run('tst_package_junit_nosuite',ut3.ut_junit_reporter())); - l_actual := ut3.ut_utils.table_to_clob(l_results); - ut.expect(l_actual).to_be_like(l_expected); - end; - - procedure reporort_produces_expected_out is - l_results ut3.ut_varchar2_list; - l_actual clob; - l_expected varchar2(32767):=q'[ - - - - - - - - -% - - - - - - - -%Fails as values are different% - -% - - - - -%ORA-06502:% - -% - - - - - - - - -% - - - - - - - -]'; - - begin - select * - bulk collect into l_results - from table(ut3.ut.run('test_reporters',ut3.ut_junit_reporter())); - l_actual := ut3.ut_utils.table_to_clob(l_results); - ut.expect(l_actual).to_be_like(l_expected); - end; - - procedure check_failure_escaped is - l_results ut3.ut_varchar2_list; - l_actual clob; - begin - --Act - select * - bulk collect into l_results - from table(ut3.ut.run('check_fail_escape',ut3.ut_junit_reporter())); - l_actual := ut3.ut_utils.table_to_clob(l_results); - --Assert - ut.expect(l_actual).to_be_like('%Actual: 'test' (varchar2) was expected to equal: '<![CDATA[some stuff]]>' (varchar2)%'); - end; - - procedure check_classname_is_populated is - l_results ut3.ut_varchar2_list; - l_actual clob; - l_expected varchar2(32767):= q'[ - - - - - - - - - -]'; - begin - select * - bulk collect into l_results - from table(ut3.ut.run('Tst_Fix_Case_Sensitive',ut3.ut_junit_reporter())); - l_actual := ut3.ut_utils.table_to_clob(l_results); - ut.expect(l_actual).to_be_like(l_expected); - end; - - procedure check_encoding_included is - begin - reporters.check_xml_encoding_included(ut3.ut_junit_reporter(), 'UTF-8'); - end; - - procedure remove_test_package is - pragma autonomous_transaction; - begin - execute immediate 'drop package check_junit_reporting'; - execute immediate 'drop package check_junit_rep_suitepath'; - execute immediate 'drop package tst_package_junit_nodesc'; - execute immediate 'drop package tst_package_junit_nosuite'; - execute immediate 'drop package check_fail_escape'; - execute immediate 'drop package Tst_Fix_Case_Sensitive'; - end; - -end; -/ diff --git a/test/core/reporters/test_junit_reporter.pks b/test/core/reporters/test_junit_reporter.pks deleted file mode 100644 index b39c5ff03..000000000 --- a/test/core/reporters/test_junit_reporter.pks +++ /dev/null @@ -1,51 +0,0 @@ -create or replace package test_junit_reporter as - - --%suite(ut_junit_reporter) - --%suitepath(utplsql.core.reporters) - - --%beforeall - procedure create_a_test_package; - - --%test(Escapes special characters from test and suite description) - procedure escapes_special_chars; - - --%test(Reports only failed expectations and exceptions) - procedure reports_only_failed_or_errored; - - --%test(Xunit Backward Compatibility - Reports only failed expectations and exceptions) - procedure reports_xunit_only_fail_or_err; - - --%test(Reports failed line of test) - procedure reports_failed_line; - - --%test(Check that classname is returned correct suite) - procedure check_classname_suite; - - --%test(Check that classname is returned correct suitepath) - procedure check_classname_suitepath; - - --%test(Reports duration according to XML specification for numbers) - procedure check_nls_number_formatting; - - --%test(Report on test without description) - procedure report_test_without_desc; - - --%test(Report on suite without description) - procedure report_suite_without_desc; - - --%test(Report produces expected output) - procedure reporort_produces_expected_out; - - --%test( Check classname is populated when procedure is mixed cased - bug #659) - procedure check_classname_is_populated; - - --%test( Validate that fail with special char are escaped ) - procedure check_failure_escaped; - - --%test(Includes XML header with encoding when encoding provided) - procedure check_encoding_included; - - --%afterall - procedure remove_test_package; -end; -/ diff --git a/test/core/reporters/test_realtime_reporter.pkb b/test/core/reporters/test_realtime_reporter.pkb deleted file mode 100644 index c4ceb9d5d..000000000 --- a/test/core/reporters/test_realtime_reporter.pkb +++ /dev/null @@ -1,401 +0,0 @@ -create or replace package body test_realtime_reporter as - - g_events test_event_list := test_event_list(); - - procedure create_test_suites_and_run is - pragma autonomous_transaction; - begin - execute immediate q'[create or replace package check_realtime_reporting1 is - --%suite(suite ) - --%suitepath(realtime_reporting) - - --%context(test context) - - --%test(test 1 - OK) - procedure test_1_ok; - - --%test(test 2 - NOK) - procedure test_2_nok; - - --%endcontext - end;]'; - execute immediate q'[create or replace package body check_realtime_reporting1 is - procedure test_1_ok is - begin - ut3.ut.expect(1).to_equal(1); - end; - - procedure test_2_nok is - begin - ut3.ut.expect(1).to_equal(2); - end; - end;]'; - - execute immediate q'[create or replace package check_realtime_reporting2 is - --%suite - --%suitepath(realtime_reporting) - - --%test - procedure test_3_ok; - - --%test - procedure test_4_nok; - - --%test - --%disabled - procedure test_5; - end;]'; - execute immediate q'[create or replace package body check_realtime_reporting2 is - procedure test_3_ok is - begin - ut3.ut.expect(2).to_equal(2); - end; - - procedure test_4_nok is - begin - ut3.ut.expect(2).to_equal(3); - ut3.ut.expect(2).to_equal(4); - end; - - procedure test_5 is - begin - null; - end; - end;]'; - - execute immediate q'[create or replace package check_realtime_reporting3 is - --%suite - --%suitepath(realtime_reporting) - - --%test - procedure test_6_with_runtime_error; - - --%test - procedure test_7_with_serveroutput; - - --%afterall - procedure print_and_raise; - end;]'; - execute immediate q'[create or replace package body check_realtime_reporting3 is - procedure test_6_with_runtime_error is - l_actual integer; - begin - execute immediate 'select 6 from non_existing_table' into l_actual; - ut3.ut.expect(6).to_equal(l_actual); - end; - - procedure test_7_with_serveroutput is - begin - dbms_output.put_line('before test 7'); - ut3.ut.expect(7).to_equal(7); - dbms_output.put_line('after test 7'); - end; - - procedure print_and_raise is - begin - dbms_output.put_line('Now, a no_data_found exception is raised'); - dbms_output.put_line('dbms_output and error stack is reported for this suite.'); - dbms_output.put_line('A runtime error in afterall is counted as a warning.'); - raise no_data_found; - end; - end;]'; - - <> - declare - l_reporter ut3.ut_realtime_reporter := ut3.ut_realtime_reporter(); - begin - -- produce - ut3.ut_runner.run( - a_paths => ut3.ut_varchar2_list(':realtime_reporting'), - a_reporters => ut3.ut_reporters(l_reporter) - ); - -- consume - select test_event_object(item_type, xmltype(text)) - bulk collect into g_events - from table(ut3.ut_output_table_buffer(l_reporter.output_buffer.output_id).get_lines()) - where trim(text) is not null and item_type is not null; - end run_report_and_cache_result; - end create_test_suites_and_run; - - procedure xml_report_structure is - l_actual sys_refcursor; - l_expected sys_refcursor; - begin - open l_actual for - select t.event_doc.extract('/event/@type').getstringval() as event_type, - t.event_doc.extract('/event/suite/@id|/event/test/@id').getstringval() as item_id - from table(g_events) t; - open l_expected for - select 'pre-run' as event_type, null as item_id from dual union all - select 'pre-suite' as event_type, 'realtime_reporting' as item_id from dual union all - select 'pre-suite' as event_type, 'realtime_reporting.check_realtime_reporting3' as item_id from dual union all - select 'pre-test' as event_type, 'realtime_reporting.check_realtime_reporting3.test_6_with_runtime_error' as item_id from dual union all - select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting3.test_6_with_runtime_error' as item_id from dual union all - select 'pre-test' as event_type, 'realtime_reporting.check_realtime_reporting3.test_7_with_serveroutput' as item_id from dual union all - select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting3.test_7_with_serveroutput' as item_id from dual union all - select 'post-suite' as event_type, 'realtime_reporting.check_realtime_reporting3' as item_id from dual union all - select 'pre-suite' as event_type, 'realtime_reporting.check_realtime_reporting2' as item_id from dual union all - select 'pre-test' as event_type, 'realtime_reporting.check_realtime_reporting2.test_3_ok' as item_id from dual union all - select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting2.test_3_ok' as item_id from dual union all - select 'pre-test' as event_type, 'realtime_reporting.check_realtime_reporting2.test_4_nok' as item_id from dual union all - select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting2.test_4_nok' as item_id from dual union all - select 'pre-test' as event_type, 'realtime_reporting.check_realtime_reporting2.test_5' as item_id from dual union all - select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting2.test_5' as item_id from dual union all - select 'post-suite' as event_type, 'realtime_reporting.check_realtime_reporting2' as item_id from dual union all - select 'pre-suite' as event_type, 'realtime_reporting.check_realtime_reporting1' as item_id from dual union all - select 'pre-suite' as event_type, 'realtime_reporting.check_realtime_reporting1.test context' as item_id from dual union all - select 'pre-test' as event_type, 'realtime_reporting.check_realtime_reporting1.test context.test_1_ok' as item_id from dual union all - select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting1.test context.test_1_ok' as item_id from dual union all - select 'pre-test' as event_type, 'realtime_reporting.check_realtime_reporting1.test context.test_2_nok' as item_id from dual union all - select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting1.test context.test_2_nok' as item_id from dual union all - select 'post-suite' as event_type, 'realtime_reporting.check_realtime_reporting1.test context' as item_id from dual union all - select 'post-suite' as event_type, 'realtime_reporting.check_realtime_reporting1' as item_id from dual union all - select 'post-suite' as event_type, 'realtime_reporting' as item_id from dual union all - select 'post-run' as event_type, null as item_id from dual; - ut.expect(l_actual).to_equal(l_expected); - end xml_report_structure; - - procedure pre_run_composite_nodes is - l_actual sys_refcursor; - l_expected sys_refcursor; - begin - open l_actual for - select x.node_path - from table(g_events) t, - xmltable( - q'[ - for $i in //(event|items|suite|test) - return {$i/string-join(ancestor-or-self::*/name(.), '/')} - ]' - passing t.event_doc - columns node_path varchar2(128) path '.' - ) x - where event_type = 'pre-run'; - open l_expected for - select 'event' as node_path from dual union all - select 'event/items' as node_path from dual union all - select 'event/items/suite' as node_path from dual union all - select 'event/items/suite/items' as node_path from dual union all - select 'event/items/suite/items/suite' as node_path from dual union all - select 'event/items/suite/items/suite/items' as node_path from dual union all - select 'event/items/suite/items/suite/items/test' as node_path from dual union all - select 'event/items/suite/items/suite/items/test' as node_path from dual union all - select 'event/items/suite/items/suite' as node_path from dual union all - select 'event/items/suite/items/suite/items' as node_path from dual union all - select 'event/items/suite/items/suite/items/test' as node_path from dual union all - select 'event/items/suite/items/suite/items/test' as node_path from dual union all - select 'event/items/suite/items/suite/items/test' as node_path from dual union all - select 'event/items/suite/items/suite' as node_path from dual union all - select 'event/items/suite/items/suite/items' as node_path from dual union all - select 'event/items/suite/items/suite/items/suite' as node_path from dual union all - select 'event/items/suite/items/suite/items/suite/items' as node_path from dual union all - select 'event/items/suite/items/suite/items/suite/items/test' as node_path from dual union all - select 'event/items/suite/items/suite/items/suite/items/test' as node_path from dual; - ut.expect(l_actual).to_equal(l_expected); - end pre_run_composite_nodes; - - procedure total_number_of_tests is - l_actual integer; - l_expected integer := 7; - begin - select t.event_doc.extract('/event/totalNumberOfTests/text()').getnumberval() - into l_actual - from table(g_events) t - where t.event_type = 'pre-run'; - ut.expect(l_actual).to_equal(l_expected); - end total_number_of_tests; - - procedure execution_time_of_run is - l_actual number; - begin - select t.event_doc.extract('/event/run/executionTime/text()').getnumberval() - into l_actual - from table(g_events) t - where t.event_type = 'post-run'; - ut.expect(l_actual).to_be_not_null; - end execution_time_of_run; - - procedure escaped_characters is - l_actual varchar2(32767); - l_expected varchar2(20) := 'suite <A>'; - begin - select t.event_doc.extract( - '//suite[@id="realtime_reporting.check_realtime_reporting1"]/description/text()' - ).getstringval() - into l_actual - from table(g_events) t - where t.event_type = 'pre-run'; - ut.expect(l_actual).to_equal(l_expected); - end escaped_characters; - - procedure pre_test_nodes is - l_actual sys_refcursor; - l_expected sys_refcursor; - begin - open l_actual for - select t.event_doc.extract('//test/testNumber/text()') - .getnumberval() as test_number, - t.event_doc.extract('//test/totalNumberOfTests/text()') - .getnumberval() as total_number_of_tests - from table(g_events) t - where t.event_type = 'pre-test' - and t.event_doc.extract('//test/@id').getstringval() is not null; - open l_expected for - select level as test_number, - 7 as total_number_of_tests - from dual - connect by level <= 7; - ut.expect(l_actual).to_equal(l_expected).unordered; - end pre_test_nodes; - - procedure post_test_nodes is - l_actual sys_refcursor; - l_expected sys_refcursor; - begin - open l_actual for - select t.event_doc.extract('//test/testNumber/text()') - .getnumberval() as test_number, - t.event_doc.extract('//test/totalNumberOfTests/text()') - .getnumberval() as total_number_of_tests - from table(g_events) t - where t.event_type = 'post-test' - and t.event_doc.extract('//test/@id').getstringval() is not null - and t.event_doc.extract('//test/startTime/text()').getstringval() is not null - and t.event_doc.extract('//test/endTime/text()').getstringval() is not null - and t.event_doc.extract('//test/executionTime/text()').getnumberval() is not null - and t.event_doc.extract('//test/counter/disabled/text()').getnumberval() is not null - and t.event_doc.extract('//test/counter/success/text()').getnumberval() is not null - and t.event_doc.extract('//test/counter/failure/text()').getnumberval() is not null - and t.event_doc.extract('//test/counter/error/text()').getnumberval() is not null - and t.event_doc.extract('//test/counter/warning/text()').getnumberval() is not null; - open l_expected for - select level as test_number, - 7 as total_number_of_tests - from dual - connect by level <= 7; - ut.expect(l_actual).to_equal(l_expected).unordered; - end post_test_nodes; - - procedure single_failed_message is - l_actual varchar2(32767); - l_expected varchar2(80) := ''; - begin - select t.event_doc.extract( - '/event/test/failedExpectations/expectation[1]/message/text()' - ).getstringval() - into l_actual - from table(g_events) t - where t.event_doc.extract('/event[@type="post-test"]/test/@id').getstringval() - = 'realtime_reporting.check_realtime_reporting1.test context.test_2_nok'; - ut.expect(l_actual).to_equal(l_expected); - end single_failed_message; - - procedure multiple_failed_messages is - l_actual integer; - l_expected integer := 2; - begin - select count(*) - into l_actual - from table(g_events) t, - xmltable( - '/event/test/failedExpectations/expectation' - passing t.event_doc - columns message clob path 'message', - caller clob path 'caller' - ) x - where t.event_doc.extract('/event[@type="post-test"]/test/@id').getstringval() - = 'realtime_reporting.check_realtime_reporting2.test_4_nok' - and x.message is not null - and x.caller is not null; - ut.expect(l_actual).to_equal(l_expected); - end multiple_failed_messages; - - procedure serveroutput_of_test is - l_actual clob; - l_expected_list ut3.ut_varchar2_list; - l_expected clob; - begin - select t.event_doc.extract('//event/test/serverOutput/text()').getstringval() - into l_actual - from table(g_events) t - where t.event_doc.extract('/event[@type="post-test"]/test/@id').getstringval() - = 'realtime_reporting.check_realtime_reporting3.test_7_with_serveroutput'; - ut3.ut_utils.append_to_list(l_expected_list, ''); - l_expected := ut3.ut_utils.table_to_clob(l_expected_list); - ut.expect(l_actual).to_equal(l_expected); - end serveroutput_of_test; - - procedure serveroutput_of_testsuite is - l_actual clob; - l_expected_list ut3.ut_varchar2_list; - l_expected clob; - begin - select t.event_doc.extract('//event/suite/serverOutput/text()').getstringval() - into l_actual - from table(g_events) t - where t.event_doc.extract('/event[@type="post-suite"]/suite/@id').getstringval() - = 'realtime_reporting.check_realtime_reporting3'; - ut3.ut_utils.append_to_list(l_expected_list, ''); - l_expected := ut3.ut_utils.table_to_clob(l_expected_list); - ut.expect(l_actual).to_equal(l_expected); - end serveroutput_of_testsuite; - - procedure error_stack_of_test is - l_actual clob; - l_expected_list ut3.ut_varchar2_list; - l_expected clob; - begin - select t.event_doc.extract('//event/test/errorStack/text()').getstringval() - into l_actual - from table(g_events) t - where t.event_doc.extract('/event[@type="post-test"]/test/@id').getstringval() - = 'realtime_reporting.check_realtime_reporting3.test_6_with_runtime_error'; - ut3.ut_utils.append_to_list(l_expected_list, ''); - l_expected := ut3.ut_utils.table_to_clob(l_expected_list); - ut.expect(l_actual).to_be_like(l_expected); - end error_stack_of_test; - - procedure error_stack_of_testsuite is - l_actual clob; - l_expected_list ut3.ut_varchar2_list; - l_expected clob; - begin - select t.event_doc.extract('//event/suite/errorStack/text()').getstringval() - into l_actual - from table(g_events) t - where t.event_doc.extract('/event[@type="post-suite"]/suite/@id').getstringval() - = 'realtime_reporting.check_realtime_reporting3'; - ut3.ut_utils.append_to_list(l_expected_list, ''); - l_expected := ut3.ut_utils.table_to_clob(l_expected_list); - ut.expect(l_actual).to_be_like(l_expected); - end error_stack_of_testsuite; - - procedure get_description is - l_reporter ut3.ut_realtime_reporter; - l_actual varchar2(4000); - l_expected varchar2(80) := '%SQL Developer%'; - begin - l_reporter := ut3.ut_realtime_reporter(); - l_actual := l_reporter.get_description(); - ut.expect(l_actual).to_be_like(l_expected); - end get_description; - - procedure remove_test_suites is - pragma autonomous_transaction; - begin - execute immediate 'drop package check_realtime_reporting1'; - execute immediate 'drop package check_realtime_reporting2'; - execute immediate 'drop package check_realtime_reporting3'; - end remove_test_suites; - -end test_realtime_reporter; -/ diff --git a/test/core/reporters/test_realtime_reporter.pks b/test/core/reporters/test_realtime_reporter.pks deleted file mode 100644 index b59313895..000000000 --- a/test/core/reporters/test_realtime_reporter.pks +++ /dev/null @@ -1,55 +0,0 @@ -create or replace package test_realtime_reporter as - - --%suite(ut_realtime_reporter) - --%suitepath(utplsql.core.reporters) - - --%beforeall - procedure create_test_suites_and_run; - - --%test(Provide a report structure with pre-run information and event based messages per suite and per test) - procedure xml_report_structure; - - --%test(Provide the total number of tests as part of the pre-run information structure) - procedure total_number_of_tests; - - --%test(Provide composite structure for items, an item is either a suite or a test, suites may have nested items) - procedure pre_run_composite_nodes; - - --%test(Provide the execution time as part of the post-run information structure) - procedure execution_time_of_run; - - --%test(Escape special characters in data such as the test suite description) - procedure escaped_characters; - - --%test(Provide a node before starting a test with testNumber and totalNumberOfTests) - procedure pre_test_nodes; - - --%test(Provide a node after completion of a test with test results) - procedure post_test_nodes; - - --%test(Provide expectation message for a failed test) - procedure single_failed_message; - - --%test(Provide expectation messages for each failed assertion of a failed test) - procedure multiple_failed_messages; - - --%test(Provide dbms_output produced in a test) - procedure serveroutput_of_test; - - --%test(Provide dbms_output produced in a testsuite) - procedure serveroutput_of_testsuite; - - --%test(Provide the error stack of a test) - procedure error_stack_of_test; - - --%test(Provide the error stack of a testsuite) - procedure error_stack_of_testsuite; - - --%test(Provide a description of the reporter explaining the use for SQL Developer) - procedure get_description; - - --%afterall - procedure remove_test_suites; - -end test_realtime_reporter; -/ diff --git a/test/core/reporters/test_sonar_test_reporter.pkb b/test/core/reporters/test_sonar_test_reporter.pkb deleted file mode 100644 index 9cf38ea91..000000000 --- a/test/core/reporters/test_sonar_test_reporter.pkb +++ /dev/null @@ -1,36 +0,0 @@ -create or replace package body test_sonar_test_reporter as - - procedure report_produces_expected_out is - l_results ut3.ut_varchar2_list; - l_actual clob; - l_expected varchar2(32767):=q'[ - - -% -%%% -%%% -%% - -]'; - - begin - select * - bulk collect into l_results - from table( - ut3.ut.run( - 'test_reporters', - ut3.ut_sonar_test_reporter(), - a_test_file_mappings => ut3.ut_file_mapper.build_file_mappings( user, ut3.ut_varchar2_list('tests/helpers/test_reporters.pkb')) - ) - ); - l_actual := ut3.ut_utils.table_to_clob(l_results); - ut.expect(l_actual).to_be_like(l_expected); - end; - - procedure check_encoding_included is - begin - reporters.check_xml_encoding_included(ut3.ut_sonar_test_reporter(), 'UTF-8'); - end; - -end; -/ diff --git a/test/core/reporters/test_sonar_test_reporter.pks b/test/core/reporters/test_sonar_test_reporter.pks deleted file mode 100644 index ab4776c38..000000000 --- a/test/core/reporters/test_sonar_test_reporter.pks +++ /dev/null @@ -1,13 +0,0 @@ -create or replace package test_sonar_test_reporter as - - --%suite(ut_sonar_test_reporter) - --%suitepath(utplsql.core.reporters) - - --%test(Report produces expected output) - procedure report_produces_expected_out; - - --%test(Includes XML header with encoding when encoding provided) - procedure check_encoding_included; - -end; -/ diff --git a/test/core/reporters/test_teamcity_reporter.pkb b/test/core/reporters/test_teamcity_reporter.pkb deleted file mode 100644 index 77b850b15..000000000 --- a/test/core/reporters/test_teamcity_reporter.pkb +++ /dev/null @@ -1,131 +0,0 @@ -create or replace package body test_teamcity_reporter as - - procedure create_a_test_package is - pragma autonomous_transaction; - begin - execute immediate q'[create or replace package check_escape_special_chars is - --%suite(A suite with 'quote') - - --%test(A test with 'quote') - procedure test_do_stuff; - - end;]'; - execute immediate q'[create or replace package body check_escape_special_chars is - procedure test_do_stuff is - begin - ut3.ut.expect(' [ ' || chr(13) || chr(10) || ' ] ' ).to_be_null; - end; - - end;]'; - - execute immediate q'[create or replace package check_trims_long_output is - --%suite - - --%test - procedure long_output; - end;]'; - execute immediate q'[create or replace package body check_trims_long_output is - procedure long_output is - begin - ut3.ut.expect(rpad('aVarchar',4000,'a')).to_be_null; - end; - end;]'; - - end; - - - procedure report_produces_expected_out is - l_output_data ut3.ut_varchar2_list; - l_output clob; - l_expected varchar2(32767); - begin - l_expected := q'{%##teamcity[testSuiteStarted timestamp='%' name='org'] -%##teamcity[testSuiteStarted timestamp='%' name='org.utplsql'] -%##teamcity[testSuiteStarted timestamp='%' name='org.utplsql.tests'] -%##teamcity[testSuiteStarted timestamp='%' name='org.utplsql.tests.helpers'] -%##teamcity[testSuiteStarted timestamp='%' name='A suite for testing different outcomes from reporters'] -%##teamcity[testSuiteStarted timestamp='%' name='A description of some context'] -%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3_tester.test_reporters.passing_test'] - - - - - -%##teamcity[testFinished timestamp='%' duration='%' name='ut3_tester.test_reporters.passing_test'] -%##teamcity[testSuiteFinished timestamp='%' name='A description of some context'] -%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3_tester.test_reporters.failing_test'] - - - -%##teamcity[testFailed timestamp='%' details='Actual: |'number |[1|] |' (varchar2) was expected to equal: |'number |[2|] |' (varchar2) ' message='Fails as values are different' name='ut3_tester.test_reporters.failing_test'] -%##teamcity[testFinished timestamp='%' duration='%' name='ut3_tester.test_reporters.failing_test'] -%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3_tester.test_reporters.erroring_test'] - - - -%##teamcity[testStdErr timestamp='%' name='ut3_tester.test_reporters.erroring_test' out='Test exception:|nORA-06512: at "UT3_TESTER.TEST_REPORTERS", line %|nORA-06512: at %|n|n'] -%##teamcity[testFailed timestamp='%' details='Test exception:|nORA-06512: at "UT3_TESTER.TEST_REPORTERS", line %|nORA-06512: at %|n|n' message='Error occured' name='ut3_tester.test_reporters.erroring_test'] -%##teamcity[testFinished timestamp='%' duration='%' name='ut3_tester.test_reporters.erroring_test'] -%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3_tester.test_reporters.disabled_test'] -%##teamcity[testIgnored timestamp='%' name='ut3_tester.test_reporters.disabled_test'] -%##teamcity[testSuiteFinished timestamp='%' name='A suite for testing different outcomes from reporters'] -%##teamcity[testSuiteFinished timestamp='%' name='org.utplsql.tests.helpers'] -%##teamcity[testSuiteFinished timestamp='%' name='org.utplsql.tests'] -%##teamcity[testSuiteFinished timestamp='%' name='org.utplsql'] -%##teamcity[testSuiteFinished timestamp='%' name='org']}'; - --act - select * - bulk collect into l_output_data - from table(ut3.ut.run('test_reporters',ut3.ut_teamcity_reporter())); - - --assert - ut.expect(ut3.ut_utils.table_to_clob(l_output_data)).to_be_like(l_expected); - end; - - procedure escape_special_chars is - l_output_data ut3.ut_varchar2_list; - l_output clob; - l_expected varchar2(32767); - begin - l_expected := q'{%##teamcity[testSuiteStarted timestamp='%' name='A suite with |'quote|''] -%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3_tester.check_escape_special_chars.test_do_stuff'] -%##teamcity[testFailed timestamp='%' details='Actual: (varchar2)|n |' |[ |r|n |] |'|nwas expected to be null' name='ut3_tester.check_escape_special_chars.test_do_stuff'] -%##teamcity[testFinished timestamp='%' duration='%' name='ut3_tester.check_escape_special_chars.test_do_stuff'] -%##teamcity[testSuiteFinished timestamp='%' name='A suite with |'quote|'']}'; - --act - select * - bulk collect into l_output_data - from table(ut3.ut.run('check_escape_special_chars',ut3.ut_teamcity_reporter())); - - --assert - ut.expect(ut3.ut_utils.table_to_clob(l_output_data)).to_be_like(l_expected); - end; - - procedure trims_long_output is - l_output_data ut3.ut_varchar2_list; - l_output clob; - l_expected varchar2(32767); - begin - l_expected := q'{%##teamcity[testSuiteStarted timestamp='%' name='check_trims_long_output'] -%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3_tester.check_trims_long_output.long_output'] -%##teamcity[testFailed timestamp='%' details='Actual: (varchar2)|n |'aVarcharaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|[...|]' name='ut3_tester.check_trims_long_output.long_output'] -%##teamcity[testFinished timestamp='%' duration='%' name='ut3_tester.check_trims_long_output.long_output'] -%##teamcity[testSuiteFinished timestamp='%' name='check_trims_long_output']}'; - --act - select * - bulk collect into l_output_data - from table(ut3.ut.run('check_trims_long_output',ut3.ut_teamcity_reporter())); - - --assert - ut.expect(ut3.ut_utils.table_to_clob(l_output_data)).to_be_like(l_expected); - end; - - procedure remove_test_package is - pragma autonomous_transaction; - begin - execute immediate 'drop package check_escape_special_chars'; - execute immediate 'drop package check_trims_long_output'; - end; - -end; -/ diff --git a/test/core/reporters/test_teamcity_reporter.pks b/test/core/reporters/test_teamcity_reporter.pks deleted file mode 100644 index ef474b225..000000000 --- a/test/core/reporters/test_teamcity_reporter.pks +++ /dev/null @@ -1,22 +0,0 @@ -create or replace package test_teamcity_reporter as - - --%suite(ut_teamcity_reporter) - --%suitepath(utplsql.core.reporters) - - --%beforeall - procedure create_a_test_package; - - --%test(Report produces expected output) - procedure report_produces_expected_out; - - --%test(Escapes special characters) - procedure escape_special_chars; - - --%test(Trims output so it fits into 4000 chars) - procedure trims_long_output; - - --%afterall - procedure remove_test_package; - -end; -/ diff --git a/test/core/reporters/test_tfs_junit_reporter.pkb b/test/core/reporters/test_tfs_junit_reporter.pkb deleted file mode 100644 index 122c665e3..000000000 --- a/test/core/reporters/test_tfs_junit_reporter.pkb +++ /dev/null @@ -1,207 +0,0 @@ -create or replace package body test_tfs_junit_reporter as - - procedure crate_a_test_package is - pragma autonomous_transaction; - begin - execute immediate q'[create or replace package check_junit_reporting is - --%suite(A suite with ) - - --%test(A test with ) - procedure test_do_stuff; - - end;]'; - execute immediate q'[create or replace package body check_junit_reporting is - procedure test_do_stuff is - begin - ut3.ut.expect(1).to_equal(1); - ut3.ut.expect(1).to_equal(2); - end; - - end;]'; - - execute immediate q'[create or replace package check_junit_rep_suitepath is - --%suitepath(core) - --%suite(check_junit_rep_suitepath) - --%displayname(Check JUNIT Get path for suitepath) - - --%test(check_junit_rep_suitepath) - --%displayname(Check JUNIT Get path for suitepath) - procedure check_junit_rep_suitepath; - end;]'; - execute immediate q'[create or replace package body check_junit_rep_suitepath is - procedure check_junit_rep_suitepath is - begin - ut3.ut.expect(1).to_equal(1); - end; - end;]'; - - execute immediate q'[create or replace package check_junit_flat_suitepath is - --%suitepath(core.check_junit_rep_suitepath) - --%suite(flatsuitepath) - - --%beforeall - procedure donuffin; - end;]'; - execute immediate q'[create or replace package body check_junit_flat_suitepath is - procedure donuffin is - begin - null; - end; - end;]'; - - - execute immediate q'[create or replace package check_fail_escape is - --%suitepath(core) - --%suite(checkfailedescape) - --%displayname(Check JUNIT XML failure is escaped) - - --%test(Fail Miserably) - procedure fail_miserably; - - end;]'; - - execute immediate q'[create or replace package body check_fail_escape is - procedure fail_miserably is - begin - ut3.ut.expect('test').to_equal(''); - end; - end;]'; - - end; - - - procedure escapes_special_chars is - l_results ut3.ut_varchar2_list; - l_actual clob; - begin - --Act - select * - bulk collect into l_results - from table(ut3.ut.run('check_junit_reporting',ut3.ut_tfs_junit_reporter())); - l_actual := ut3.ut_utils.table_to_clob(l_results); - --Assert - ut.expect(l_actual).not_to_be_like('%%'); - ut.expect(l_actual).to_be_like('%<tag>%'); - end; - - procedure reports_only_failed_or_errored is - l_results ut3.ut_varchar2_list; - l_actual clob; - begin - --Act - select * - bulk collect into l_results - from table(ut3.ut.run('check_junit_reporting',ut3.ut_tfs_junit_reporter())); - l_actual := ut3.ut_utils.table_to_clob(l_results); - --Assert - ut.expect(l_actual).not_to_be_like('%Actual: 1 (number) was expected to equal: 1 (number)%'); - ut.expect(l_actual).to_be_like('%Actual: 1 (number) was expected to equal: 2 (number)%'); - end; - - procedure reports_failed_line is - l_results ut3.ut_varchar2_list; - l_actual clob; - begin - --Act - select * - bulk collect into l_results - from table(ut3.ut.run('check_junit_reporting',ut3.ut_tfs_junit_reporter())); - l_actual := ut3.ut_utils.table_to_clob(l_results); - --Assert - ut.expect(l_actual).to_be_like('%at "%.CHECK_JUNIT_REPORTING%", line %'); - end; - - procedure check_classname_suite is - l_results ut3.ut_varchar2_list; - l_actual clob; - begin - --Act - select * - bulk collect into l_results - from table(ut3.ut.run('check_junit_reporting',ut3.ut_tfs_junit_reporter())); - l_actual := ut3.ut_utils.table_to_clob(l_results); - --Assert - ut.expect(l_actual).to_be_like('%testcase classname="check_junit_reporting"%'); - end; - - procedure check_flatten_nested_suites is - l_results ut3.ut_varchar2_list; - l_actual clob; - begin - --Act - select * - bulk collect into l_results - from table(ut3.ut.run('check_junit_flat_suitepath',ut3.ut_tfs_junit_reporter())); - l_actual := ut3.ut_utils.table_to_clob(l_results); - --Assert - ut.expect(l_actual).to_be_like(' - - - - - -%'); - end; - - procedure check_nls_number_formatting is - l_results ut3.ut_varchar2_list; - l_actual clob; - l_nls_numeric_characters varchar2(30); - begin - --Arrange - select replace(nsp.value,'''','''''') into l_nls_numeric_characters - from nls_session_parameters nsp - where parameter = 'NLS_NUMERIC_CHARACTERS'; - execute immediate q'[alter session set NLS_NUMERIC_CHARACTERS=', ']'; - --Act - select * - bulk collect into l_results - from table(ut3.ut.run('check_junit_reporting', ut3.ut_tfs_junit_reporter())); - l_actual := ut3.ut_utils.table_to_clob(l_results); - --Assert - ut.expect(l_actual).to_match('time="[0-9]*\.[0-9]{3,6}"'); - --Cleanup - execute immediate 'alter session set NLS_NUMERIC_CHARACTERS='''||l_nls_numeric_characters||''''; - end; - - procedure check_failure_escaped is - l_results ut3.ut_varchar2_list; - l_actual clob; - begin - --Act - select * - bulk collect into l_results - from table(ut3.ut.run('check_fail_escape',ut3.ut_tfs_junit_reporter())); - l_actual := ut3.ut_utils.table_to_clob(l_results); - --Assert - ut.expect(l_actual).to_be_like('%Actual: 'test' (varchar2) was expected to equal: '<![CDATA[some stuff]]>' (varchar2)%'); - end; - - procedure check_classname_suitepath is - l_results ut3.ut_varchar2_list; - l_actual clob; - begin - --Act - select * - bulk collect into l_results - from table(ut3.ut.run('check_junit_rep_suitepath',ut3.ut_tfs_junit_reporter())); - l_actual := ut3.ut_utils.table_to_clob(l_results); - --Assert - ut.expect(l_actual).to_be_like('%testcase classname="core.check_junit_rep_suitepath"%'); - end; - procedure remove_test_package is - pragma autonomous_transaction; - begin - execute immediate 'drop package check_junit_reporting'; - execute immediate 'drop package check_junit_rep_suitepath'; - execute immediate 'drop package check_junit_flat_suitepath'; - execute immediate 'drop package check_fail_escape'; - end; - - procedure check_encoding_included is - begin - reporters.check_xml_encoding_included(ut3.ut_tfs_junit_reporter(), 'UTF-8'); - end; - -end; -/ diff --git a/test/core/reporters/test_tfs_junit_reporter.pks b/test/core/reporters/test_tfs_junit_reporter.pks deleted file mode 100644 index cc589be1b..000000000 --- a/test/core/reporters/test_tfs_junit_reporter.pks +++ /dev/null @@ -1,39 +0,0 @@ -create or replace package test_tfs_junit_reporter as - - --%suite(ut_tfs_junit_reporter) - --%suitepath(utplsql.core.reporters) - - --%beforeall - procedure crate_a_test_package; - - --%test(Escapes special characters from test and suite description) - procedure escapes_special_chars; - - --%test(Reports only failed expectations and exceptions) - procedure reports_only_failed_or_errored; - - --%test(Reports failed line of test) - procedure reports_failed_line; - - --%test(Check that classname is returned correct suite) - procedure check_classname_suite; - - --%test(Check that classname is returned correct suitepath) - procedure check_classname_suitepath; - - --%test(Check that nested suites are being flatten) - procedure check_flatten_nested_suites; - - --%test(Reports duration according to XML specification for numbers) - procedure check_nls_number_formatting; - - --%test( Validate that failures with special char are escaped ) - procedure check_failure_escaped; - - --%test(Includes XML header with encoding when encoding provided) - procedure check_encoding_included; - - --%afterall - procedure remove_test_package; -end; -/ diff --git a/test/core/test_file_mapper.pkb b/test/core/test_file_mapper.pkb deleted file mode 100644 index 34b38f108..000000000 --- a/test/core/test_file_mapper.pkb +++ /dev/null @@ -1,45 +0,0 @@ -create or replace package body test_file_mapper is - - procedure default_mappings is - l_actual ut3.ut_file_mappings; - l_expected ut3.ut_file_mappings; - begin - --Arrange - l_expected := ut3.ut_file_mappings( - ut3.ut_file_mapping('C:\tests\helpers\core.pkb',USER,'CORE','PACKAGE BODY'), - ut3.ut_file_mapping('tests/helpers/test_file_mapper.pkb',USER,'TEST_FILE_MAPPER','PACKAGE BODY') - ); - --Act - l_actual := ut3.ut_file_mapper.build_file_mappings( - ut3.ut_varchar2_list( - 'C:\tests\helpers\core.pkb', - 'tests/helpers/test_file_mapper.pkb' - ) - ); - --Assert - ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); - end; - - procedure specific_owner is - l_actual ut3.ut_file_mappings; - l_expected ut3.ut_file_mappings; - begin - --Arrange - l_expected := ut3.ut_file_mappings( - ut3.ut_file_mapping('C:\source\core\types\ut_file_mapping.tpb','UT3','UT_FILE_MAPPING','TYPE BODY'), - ut3.ut_file_mapping('source/core/ut_file_mapper.pkb','UT3','UT_FILE_MAPPER','PACKAGE BODY') - ); - --Act - l_actual := ut3.ut_file_mapper.build_file_mappings( - 'UT3', - ut3.ut_varchar2_list( - 'C:\source\core\types\ut_file_mapping.tpb', - 'source/core/ut_file_mapper.pkb' - ) - ); - --Assert - ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); - end; - -end; -/ diff --git a/test/core/test_file_mapper.pks b/test/core/test_file_mapper.pks deleted file mode 100644 index f64343637..000000000 --- a/test/core/test_file_mapper.pks +++ /dev/null @@ -1,13 +0,0 @@ -create or replace package test_file_mapper is - - --%suite(file_mapper) - --%suitepath(utplsql.core) - - --%test(Maps file paths into database objects using default mappings) - procedure default_mappings; - - --%test(Used specified object owner to perform mapping when files have no owner indication) - procedure specific_owner; - -end; -/ diff --git a/test/core/test_output_buffer.pkb b/test/core/test_output_buffer.pkb deleted file mode 100644 index 848824ea8..000000000 --- a/test/core/test_output_buffer.pkb +++ /dev/null @@ -1,95 +0,0 @@ -create or replace package body test_output_buffer is - - procedure test_receive is - l_actual_text clob; - l_actual_item_type varchar2(1000); - l_remaining integer; - l_expected_text clob; - l_expected_item_type varchar2(1000); - l_buffer ut3.ut_output_buffer_base; - begin - --Arrange - l_buffer := ut3.ut_output_table_buffer(); - l_expected_text := to_clob(lpad('a text', 31000, ',a text')) - || chr(10) || to_clob(lpad('a text', 31000, ',a text')) - || chr(13) || to_clob(lpad('a text', 31000, ',a text')) - || chr(13) || chr(10) || to_clob(lpad('a text', 31000, ',a text')) || to_clob(lpad('a text', 31000, ',a text')); - l_expected_item_type := lpad('some item type',1000,'-'); - --Act - l_buffer.send_clob(l_expected_text, l_expected_item_type); - l_buffer.close(); - - select text, item_type - into l_actual_text, l_actual_item_type - from table(l_buffer.get_lines(0,0)); - - --Assert - ut.expect(l_actual_text).to_equal(l_expected_text); - ut.expect(l_actual_item_type).to_equal(l_expected_item_type); - - select count(1) into l_remaining from ut3.ut_output_buffer_tmp where output_id = l_buffer.output_id; - - ut.expect(l_remaining).to_equal(0); - end; - - procedure test_doesnt_send_on_null_text is - l_cur sys_refcursor; - l_result integer; - l_buffer ut3.ut_output_buffer_base := ut3.ut_output_table_buffer(); - begin - delete from ut3.ut_output_buffer_tmp; - --Act - l_buffer.send_line(null); - - open l_cur for select * from ut3.ut_output_buffer_tmp; - ut.expect(l_cur).to_be_empty; - end; - - procedure test_send_line is - l_result varchar2(4000); - c_expected constant varchar2(4000) := lpad('a text',4000,',a text'); - l_buffer ut3.ut_output_buffer_base := ut3.ut_output_table_buffer(); - begin - l_buffer.send_line(c_expected); - - select text into l_result from ut3.ut_output_buffer_tmp where output_id = l_buffer.output_id; - - ut.expect(l_result).to_equal(c_expected); - end; - - procedure test_waiting_for_data is - l_result clob; - l_remaining integer; - l_expected clob; - l_buffer ut3.ut_output_buffer_base := ut3.ut_output_table_buffer(); - l_start timestamp; - l_duration interval day to second; - begin - --Arrange - l_expected := 'a text'; - l_buffer.send_line(l_expected); - l_start := localtimestamp; - --Act - begin - select text into l_result from table(l_buffer.get_lines(1,1)); - ut.fail('Expected a timeout exception but nothing was raised'); - exception - when others then - l_duration := localtimestamp - l_start; - --Assert - --Fetches data from output - ut.expect(l_result).to_equal(l_expected); - --Throws a timeout exception - ut.expect(dbms_utility.format_error_stack()).to_match('ORA'||ut3.ut_utils.gc_out_buffer_timeout); - --Waited for one second - ut.expect(l_duration).to_be_greater_than(interval '0.99' second); - end; - - select count(1) into l_remaining from ut3.ut_output_buffer_tmp where output_id = l_buffer.output_id; - --Data got removed from output buffer - ut.expect(l_remaining).to_equal(0); - - end; - -end test_output_buffer; -/ diff --git a/test/core/test_output_buffer.pks b/test/core/test_output_buffer.pks deleted file mode 100644 index 417b1ce09..000000000 --- a/test/core/test_output_buffer.pks +++ /dev/null @@ -1,19 +0,0 @@ -create or replace package test_output_buffer is - - --%suite(output_buffer) - --%suitepath(utplsql.core) - - --%test(Receives a line from buffer table and deletes) - procedure test_receive; - - --%test(Does not send line if null text given) - procedure test_doesnt_send_on_null_text; - - --%test(Sends a line into buffer table) - procedure test_send_line; - - --%test(Waits For The Data To Appear For Specified Time) - procedure test_waiting_for_data; - -end test_output_buffer; -/ diff --git a/test/core/test_suite_builder.pkb b/test/core/test_suite_builder.pkb deleted file mode 100644 index bd76e88d8..000000000 --- a/test/core/test_suite_builder.pkb +++ /dev/null @@ -1,1118 +0,0 @@ -create or replace package body test_suite_builder is - - function invoke_builder_for_annotations( - a_annotations ut3.ut_annotations, - a_package_name varchar2 := 'TEST_SUITE_BUILDER_PACKAGE' - ) return clob is - l_suites ut3.ut_suite_items; - l_suite ut3.ut_logical_suite; - l_cursor sys_refcursor; - l_xml xmltype; - begin - open l_cursor for select value(x) from table( - ut3.ut_annotated_objects( - ut3.ut_annotated_object('UT3_TESTER', a_package_name, 'PACKAGE', systimestamp, a_annotations) - ) ) x; - - l_suites := ut3.ut_suite_manager.build_suites_from_annotations( - a_owner_name => 'UT3_TESTER', - a_annotated_objects => l_cursor, - a_path => null, - a_object_name => a_package_name, - a_skip_all_objects => true - ); - l_suite := treat( l_suites(l_suites.first) as ut3.ut_logical_suite); - - select deletexml( - xmltype(l_suite), - '//RESULTS_COUNT|//START_TIME|//END_TIME|//RESULT|//ASSOCIATED_EVENT_NAME' || - '|//TRANSACTION_INVALIDATORS|//ERROR_BACKTRACE|//ERROR_STACK|//SERVEROUTPUT' - ) - into l_xml - from dual; - - return l_xml.getClobVal(); - end; - - procedure no_suite_description is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite',null, null) - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_match( - 'UT3_TESTERsome_packagesome_package()?\s*some_package' - ); - end; - - procedure suite_description_from_suite is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Some description', null), - ut3.ut_annotation(2, 'suite','Another description', null) - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%some_packageSome description%' - ); - end; - - procedure suitepath_from_non_empty_path is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite',null, null), - ut3.ut_annotation(2, 'suitepath','org.utplsql.some', null), - ut3.ut_annotation(3, 'suitepath','dummy.utplsql.some', null) - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%org.utplsql.some%' - ); - end; - - procedure suite_descr_from_displayname is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Some description', null), - ut3.ut_annotation(2, 'suite','Another description', null), - ut3.ut_annotation(3, 'displayname','New description', null), - ut3.ut_annotation(4, 'displayname','Newest description', null) - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%some_packageNew description%' - ); - end; - - procedure rollback_type_valid is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite',null, null), - ut3.ut_annotation(2, 'rollback','manual', null), - ut3.ut_annotation(3, 'rollback','bad', null) - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%'||ut3.ut_utils.gc_rollback_manual||'%' - ); - end; - - procedure rollback_type_duplicated is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite',null, null), - ut3.ut_annotation(2, 'rollback','manual', null), - ut3.ut_annotation(3, 'rollback','bad', null) - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%%"--%rollback"%%UT3_TESTER.SOME_PACKAGE%3%%' - ); - end; - - procedure suite_annot_duplicated is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','Cool', null), - ut3.ut_annotation(8, 'suite','bad', null) - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%Cool%%"--%suite"%UT3_TESTER.SOME_PACKAGE%line 8%%' - ); - end; - - procedure test_annotation is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','Cool', null), - ut3.ut_annotation(8, 'test','Some test', 'test_procedure') - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%' || - '%test_procedureSome testsome_package.test_procedure' || - '%%' - ); - end; - - procedure test_annot_duplicated is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','Cool', null), - ut3.ut_annotation(8, 'test','Some test', 'test_procedure'), - ut3.ut_annotation(9, 'test','Dup', 'test_procedure') - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%Cool%%"--%test"%UT3_TESTER.SOME_PACKAGE.TEST_PROCEDURE%line 9%%' - ); - end; - - procedure beforeall_annot_duplicated is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','Cool', null), - ut3.ut_annotation(8, 'beforeall', null, 'test_procedure'), - ut3.ut_annotation(9, 'beforeall', null, 'test_procedure') - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%Cool%%"--%beforeall"%UT3_TESTER.SOME_PACKAGE.TEST_PROCEDURE%line 9%%' - ); - end; - - procedure beforeeach_annot_duplicated is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','Cool', null), - ut3.ut_annotation(8, 'beforeeach', null, 'test_procedure'), - ut3.ut_annotation(9, 'beforeeach', null, 'test_procedure') - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%Cool%%"--%beforeeach"%UT3_TESTER.SOME_PACKAGE.TEST_PROCEDURE%line 9%%' - ); - end; - - procedure afterall_annot_duplicated is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','Cool', null), - ut3.ut_annotation(8, 'afterall', null, 'test_procedure'), - ut3.ut_annotation(9, 'afterall', null, 'test_procedure') - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%Cool%%"--%afterall"%UT3_TESTER.SOME_PACKAGE.TEST_PROCEDURE%line 9%%' - ); - end; - - procedure aftereach_annot_duplicated is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','Cool', null), - ut3.ut_annotation(8, 'aftereach', null, 'test_procedure'), - ut3.ut_annotation(9, 'aftereach', null, 'test_procedure') - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%Cool%%"--%aftereach"%UT3_TESTER.SOME_PACKAGE.TEST_PROCEDURE%line 9%%' - ); - end; - - procedure suitepath_annot_duplicated is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','Cool', null), - ut3.ut_annotation(3, 'suitepath','dummy.utplsql.some', null), - ut3.ut_annotation(4, 'suitepath','org.utplsql.some', null) - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%%"--%suitepath"%line 4%%' - ); - end; - - procedure displayname_annot_duplicated is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','Cool', null), - ut3.ut_annotation(4, 'displayname','New description', null), - ut3.ut_annotation(5, 'displayname','Newest description', null) - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%%"--%displayname"%line 5%%' - ); - end; - - procedure suitepath_annot_empty is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(3, 'suitepath',null, null) - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%%"--%suitepath" annotation requires a non-empty parameter value.%%' - ); - end; - - procedure suitepath_annot_invalid_path is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(2, 'suitepath','path with spaces', null) - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%%Invalid path value in annotation "--%suitepath(path with spaces)"%%' - ); - end; - - procedure displayname_annot_empty is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(3, 'displayname',null, null) - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%%"--%displayname" annotation requires a non-empty parameter value.%%' - ); - end; - - procedure rollback_type_empty is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(3, 'rollback',null, null) - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%%"--%rollback" annotation requires one of values as parameter:%%' - ); - end; - - procedure rollback_type_invalid is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(2, 'rollback','bad', null) - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%%"--%rollback" annotation requires one of values as parameter: "auto" or "manual". Annotation ignored.%%' - ); - end; - - procedure multiple_before_after is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(2, 'beforeall',null, 'first_before_all'), - ut3.ut_annotation(3, 'beforeall',null, 'another_before_all'), - ut3.ut_annotation(4, 'beforeeach',null, 'first_before_each'), - ut3.ut_annotation(5, 'beforeeach',null, 'another_before_each'), - ut3.ut_annotation(6, 'aftereach',null, 'first_after_each'), - ut3.ut_annotation(7, 'aftereach',null, 'another_after_each'), - ut3.ut_annotation(8, 'afterall',null, 'first_after_all'), - ut3.ut_annotation(9, 'afterall',null, 'another_after_all'), - ut3.ut_annotation(14, 'test','A test', 'some_test'), - ut3.ut_annotation(15, 'beforetest','before_test_proc', 'some_test'), - ut3.ut_annotation(16, 'beforetest','before_test_proc2', 'some_test'), - ut3.ut_annotation(18, 'aftertest','after_test_proc', 'some_test'), - ut3.ut_annotation(20, 'aftertest','after_test_proc2', 'some_test') - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%%some_package%some_test' || - '%' || - '%some_packagefirst_before_each' || - '%some_packageanother_before_each' || - '%' || - '%' || - '%some_packagebefore_test_proc' || - '%some_packagebefore_test_proc2' || - '%' || - '%' || - '%some_packageafter_test_proc' || - '%some_packageafter_test_proc2' || - '%' || - '%' || - '%some_packagefirst_after_each' || - '%some_packageanother_after_each' || - '%' || - '%' || - '%' || - '%some_packagefirst_before_all' || - '%some_packageanother_before_all' || - '%' || - '%' || - '%some_packagefirst_after_all' || - '%some_packageanother_after_all' || - '%%' - ); - end; - - procedure multiple_standalone_bef_aft is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(2, 'beforeall', 'some_package.first_before_all',null), - ut3.ut_annotation(3, 'beforeall', 'different_package.another_before_all',null), - ut3.ut_annotation(4, 'beforeeach', 'first_before_each',null), - ut3.ut_annotation(5, 'beforeeach', 'different_owner.different_package.another_before_each',null), - ut3.ut_annotation(6, 'aftereach', 'first_after_each',null), - ut3.ut_annotation(7, 'aftereach', 'another_after_each,different_owner.different_package.one_more_after_each',null), - ut3.ut_annotation(8, 'afterall', 'first_after_all',null), - ut3.ut_annotation(9, 'afterall', 'another_after_all',null), - ut3.ut_annotation(14, 'test','A test', 'some_test'), - ut3.ut_annotation(15, 'beforetest','before_test_proc', 'some_test'), - ut3.ut_annotation(16, 'beforetest','before_test_proc2', 'some_test'), - ut3.ut_annotation(18, 'aftertest','after_test_proc', 'some_test'), - ut3.ut_annotation(20, 'aftertest','after_test_proc2', 'some_test') - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%%some_package%some_test' || - '%' || - '%some_packagefirst_before_each' || - '%different_ownerdifferent_packageanother_before_each' || - '%' || - '%' || - '%some_packagebefore_test_proc' || - '%some_packagebefore_test_proc2' || - '%' || - '%' || - '%some_packageafter_test_proc' || - '%some_packageafter_test_proc2' || - '%' || - '%' || - '%some_packagefirst_after_each' || - '%some_packageanother_after_each' || - '%different_ownerdifferent_packageone_more_after_each' || - '%' || - '%' || - '%' || - '%some_packagefirst_before_all' || - '%different_packageanother_before_all' || - '%' || - '%' || - '%some_packagefirst_after_all' || - '%some_packageanother_after_all' || - '%%' - ); - end; - - procedure before_after_on_single_proc is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(2, 'beforeall',null, 'do_stuff'), - ut3.ut_annotation(3, 'beforeeach',null, 'do_stuff'), - ut3.ut_annotation(4, 'aftereach',null, 'do_stuff'), - ut3.ut_annotation(5, 'afterall',null, 'do_stuff'), - ut3.ut_annotation(6, 'test','A test', 'some_test') - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%%some_package%some_test' || - '%' || - '%some_packagedo_stuff' || - '%' || - '%' || - '%some_packagedo_stuff' || - '%' || - '%' || - '%' || - '%some_packagedo_stuff' || - '%' || - '%' || - '%some_packagedo_stuff' || - '%%' - ); - end; - - procedure multiple_mixed_bef_aft is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(2, 'beforeall', null,'first_before_all'), - ut3.ut_annotation(3, 'beforeall', 'different_package.another_before_all',null), - ut3.ut_annotation(4, 'beforeeach', 'first_before_each',null), - ut3.ut_annotation(5, 'beforeeach', 'different_owner.different_package.another_before_each',null), - ut3.ut_annotation(6, 'aftereach', null, 'first_after_each'), - ut3.ut_annotation(7, 'aftereach', 'another_after_each,different_owner.different_package.one_more_after_each',null), - ut3.ut_annotation(8, 'afterall', 'first_after_all',null), - ut3.ut_annotation(9, 'afterall', 'another_after_all',null), - ut3.ut_annotation(14, 'test','A test', 'some_test'), - ut3.ut_annotation(15, 'beforetest','before_test_proc', 'some_test'), - ut3.ut_annotation(16, 'beforetest','before_test_proc2', 'some_test'), - ut3.ut_annotation(18, 'aftertest','after_test_proc', 'some_test'), - ut3.ut_annotation(20, 'aftertest','after_test_proc2', 'some_test'), - ut3.ut_annotation(21, 'beforeall', null,'last_before_all'), - ut3.ut_annotation(22, 'aftereach', null, 'last_after_each'), - ut3.ut_annotation(23, 'afterall', null, 'last_after_all') - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%%some_package%some_test' || - '%' || - '%some_packagefirst_before_each' || - '%different_ownerdifferent_packageanother_before_each' || - '%' || - '%' || - '%some_packagebefore_test_proc' || - '%some_packagebefore_test_proc2' || - '%' || - '%' || - '%some_packageafter_test_proc' || - '%some_packageafter_test_proc2' || - '%' || - '%' || - '%some_packagefirst_after_each' || - '%some_packageanother_after_each' || - '%different_ownerdifferent_packageone_more_after_each' || - '%some_packagelast_after_each' || - '%' || - '%' || - '%' || - '%some_packagefirst_before_all' || - '%different_packageanother_before_all' || - '%some_packagelast_before_all' || - '%' || - '%' || - '%some_packagefirst_after_all' || - '%some_packageanother_after_all' || - '%some_packagelast_after_all' || - '%%' - ); - end; - - - procedure before_after_mixed_with_test is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(2, 'beforeall',null, 'do_stuff'), - ut3.ut_annotation(3, 'beforeeach',null, 'do_stuff'), - ut3.ut_annotation(4, 'aftereach',null, 'do_stuff'), - ut3.ut_annotation(5, 'afterall',null, 'do_stuff'), - ut3.ut_annotation(6, 'test','A test', 'do_stuff') - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like('%%Annotation "--\%beforeall"%line 2%%', '\'); - ut.expect(l_actual).to_be_like('%%Annotation "--\%beforeeach"%line 3%%', '\'); - ut.expect(l_actual).to_be_like('%%Annotation "--\%aftereach"%line 4%%', '\'); - ut.expect(l_actual).to_be_like('%%Annotation "--\%afterall" cannot be used with "--\%test". Annotation ignored.' - ||'%at "UT3_TESTER.SOME_PACKAGE.DO_STUFF", line 5%%', '\'); - ut.expect(l_actual).not_to_be_like('%%'); - ut.expect(l_actual).not_to_be_like('%%'); - ut.expect(l_actual).not_to_be_like('%%'); - ut.expect(l_actual).not_to_be_like('%%'); - end; - - procedure suite_from_context is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(2, 'beforeall',null, 'suite_level_beforeall'), - ut3.ut_annotation(3, 'test','In suite', 'suite_level_test'), - ut3.ut_annotation(4, 'context','a_context', null), - ut3.ut_annotation(5, 'displayname','A context', null), - ut3.ut_annotation(6, 'beforeall',null, 'context_setup'), - ut3.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), - ut3.ut_annotation(8, 'endcontext',null, null) - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%' || - '%' || - '%' || - '' || - '%a_contextA contextsome_package.a_context' || - '%' || - '' || - '%test_in_a_contextIn contextsome_package.a_context.test_in_a_context' || - '%' || - '' || - '' || - '%some_packagecontext_setup' || - '%' || - '' || - '' || - '' || - '%suite_level_testIn suitesome_package.suite_level_test' || - '%' || - '' || - '' || - '%some_packagesuite_level_beforeall' || - '%' || - '' || - '' - ); - end; - - procedure before_after_in_context is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite', 'Cool', null), - ut3.ut_annotation(2, 'test', 'In suite', 'suite_level_test'), - ut3.ut_annotation(3, 'context', 'a_context', null), - ut3.ut_annotation(4, 'beforeall', 'context_beforeall', null), - ut3.ut_annotation(5, 'beforeeach', null, 'context_beforeeach'), - ut3.ut_annotation(6, 'test', 'In context', 'test_in_a_context'), - ut3.ut_annotation(7, 'aftereach', 'context_aftereach' ,null), - ut3.ut_annotation(8, 'afterall', null, 'context_afterall'), - ut3.ut_annotation(9, 'endcontext', null, null) - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '' || - '%' || - '%' || - '%a_context' || - '%' || - '%' || - '%test_in_a_context' || - '%%context_beforeeach%' || - '%%test_in_a_context%' || - '%%context_aftereach%' || - '%' || - '%' || - '%%context_beforeall%' || - '%%context_afterall%' || - '%' || - '%' || - '%suite_level_test' || - '%%suite_level_test%' || - '%' || - '%' || - '%' - ); - ut.expect(l_actual).not_to_be_like('%%%%%%'); - ut.expect(l_actual).not_to_be_like('%%%%%%'); - ut.expect(l_actual).not_to_be_like('%%%%%%'); - ut.expect(l_actual).not_to_be_like('%%%%%%'); - end; - - procedure before_after_out_of_context is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(2, 'beforeall',null, 'suite_level_beforeall'), - ut3.ut_annotation(3, 'beforeeach',null, 'suite_level_beforeeach'), - ut3.ut_annotation(4, 'test','In suite', 'suite_level_test'), - ut3.ut_annotation(5, 'context','a_context', null), - ut3.ut_annotation(6, 'test', 'In context', 'test_in_a_context'), - ut3.ut_annotation(7, 'endcontext',null, null), - ut3.ut_annotation(8, 'aftereach',null, 'suite_level_aftereach'), - ut3.ut_annotation(9, 'afterall',null, 'suite_level_afterall') - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '' || - '%' || - '%' || - '%a_context' || - '%' || - '%' || - '%test_in_a_context' || - '%%suite_level_beforeeach%' || - '%%test_in_a_context%' || - '%%suite_level_aftereach%' || - '%' || - '%' || - '%' || - '%' || - '%suite_level_test' || - '%%suite_level_beforeeach%' || - '%%suite_level_test%' || - '%%suite_level_aftereach%' || - '%' || - '%' || - '%%suite_level_beforeall%' || - '%%suite_level_afterall%' || - '%' - ); - ut.expect(l_actual).not_to_be_like('%%%%%%'); - ut.expect(l_actual).not_to_be_like('%%%%%%'); - end; - - procedure context_without_endcontext is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(2, 'beforeall',null, 'suite_level_beforeall'), - ut3.ut_annotation(3, 'test','In suite', 'suite_level_test'), - ut3.ut_annotation(4, 'context','A context', null), - ut3.ut_annotation(5, 'beforeall',null, 'context_setup'), - ut3.ut_annotation(7, 'test', 'In context', 'test_in_a_context') - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%Invalid annotation "--\%context". Cannot find following "--\%endcontext". Annotation ignored.%at "UT3_TESTER.SOME_PACKAGE", line 4%' - ,'\' - ); - ut.expect(l_actual).to_be_like( - '' || - '%' || - '' || - '%suite_level_testIn suitesome_package.suite_level_test' || - '%' || - '' || - '%test_in_a_contextIn contextsome_package.test_in_a_context' || - '%' || - '' || - '' || - '%some_packagesuite_level_beforeall' || - '%some_packagecontext_setup' || - '%' || - '' || - '' - ); - end; - - procedure endcontext_without_context is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(2, 'beforeall',null, 'suite_level_beforeall'), - ut3.ut_annotation(3, 'test','In suite', 'suite_level_test'), - ut3.ut_annotation(4, 'context','a_context', null), - ut3.ut_annotation(5, 'displayname','A context', null), - ut3.ut_annotation(6, 'beforeall',null, 'context_setup'), - ut3.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), - ut3.ut_annotation(8, 'endcontext',null, null), - ut3.ut_annotation(9, 'endcontext',null, null) - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%Invalid annotation "--\%endcontext". Cannot find preceding "--\%context". Annotation ignored.%at "UT3_TESTER.SOME_PACKAGE", line 9%' - ,'\' - ); - ut.expect(l_actual).to_be_like( - '' || - '%' || - '' || - '%a_contextA contextsome_package.a_context' || - '%' || - '' || - '%test_in_a_contextIn contextsome_package.a_context.test_in_a_context' || - '%' || - '' || - '' || - '%some_packagecontext_setup' || - '%' || - '' || - '' || - '' || - '%suite_level_testIn suitesome_package.suite_level_test' || - '%' || - '' || - '' || - '%some_packagesuite_level_beforeall' || - '%' || - '' || - '' - ); - end; - - --%test(Gives warning when two contexts have the same name) - procedure duplicate_context_name is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(2, 'beforeall',null, 'suite_level_beforeall'), - ut3.ut_annotation(3, 'test','In suite', 'suite_level_test'), - ut3.ut_annotation(4, 'context','a_context', null), - ut3.ut_annotation(5, 'displayname','A context', null), - ut3.ut_annotation(6, 'beforeall',null, 'context_setup'), - ut3.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), - ut3.ut_annotation(8, 'endcontext',null, null), - ut3.ut_annotation(9, 'context','a_context', null), - ut3.ut_annotation(10, 'displayname','A context', null), - ut3.ut_annotation(11, 'beforeall',null, 'setup_in_duplicated_context'), - ut3.ut_annotation(12, 'test', 'In duplicated context', 'test_in_duplicated_context'), - ut3.ut_annotation(13, 'endcontext',null, null) - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%Context name must be unique in a suite. Context and all of it's content ignored.%at "UT3_TESTER.SOME_PACKAGE", line 9%' - ,'\' - ); - ut.expect(l_actual).to_be_like( - '' || - '%' || - '' || - '%a_contextA contextsome_package.a_context' || - '%' || - '' || - '%test_in_a_contextIn contextsome_package.a_context.test_in_a_context' || - '%' || - '' || - '' || - '%some_packagecontext_setup' || - '%' || - '' || - '' || - '' || - '%suite_level_testIn suitesome_package.suite_level_test' || - '%' || - '' || - '' || - '%some_packagesuite_level_beforeall' || - '%' || - '' || - '' - ); - end; - - procedure throws_value_empty is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(3, 'test','A test with empty throws annotation', 'A_TEST_PROCEDURE'), - ut3.ut_annotation(3, 'throws',null, 'A_TEST_PROCEDURE') - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%%"--%throws" annotation requires a parameter. Annotation ignored.%%' - ); - end; - - procedure throws_value_invalid is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(3, 'test','A test with invalid throws annotation', 'A_TEST_PROCEDURE'), - ut3.ut_annotation(3, 'throws',' -20145 , bad_variable_name ', 'A_TEST_PROCEDURE') - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%%Invalid parameter value "bad_variable_name" for "--%throws" annotation. Parameter ignored.%%' - ); - end; - - - procedure before_aftertest_multi is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(14, 'test','A test', 'some_test'), - ut3.ut_annotation(15, 'beforetest','before_test_proc', 'some_test'), - ut3.ut_annotation(16, 'beforetest','before_test_proc2', 'some_test'), - ut3.ut_annotation(18, 'aftertest','after_test_proc', 'some_test'), - ut3.ut_annotation(20, 'aftertest','after_test_proc2', 'some_test') - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%%some_package%some_test' || - '%' || - '%some_packagebefore_test_proc' || - '%some_packagebefore_test_proc2' || - '%' || - '%' || - '%some_packageafter_test_proc' || - '%some_packageafter_test_proc2' || - '%' || - '%%' - ); - end; - - procedure before_aftertest_twice is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(14, 'test','A test', 'some_test'), - ut3.ut_annotation(15, 'beforetest','before_test_proc, before_test_proc2', 'some_test'), - ut3.ut_annotation(16, 'beforetest','before_test_proc3', 'some_test'), - ut3.ut_annotation(18, 'aftertest','after_test_proc,after_test_proc2', 'some_test'), - ut3.ut_annotation(20, 'aftertest','after_test_proc3', 'some_test') - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%%some_package%some_test' || - '%' || - '%some_packagebefore_test_proc' || - '%some_packagebefore_test_proc2' || - '%some_packagebefore_test_proc3' || - '%' || - '%' || - '%some_packageafter_test_proc' || - '%some_packageafter_test_proc2' || - '%some_packageafter_test_proc3' || - '%' || - '%%' - ); - end; - - procedure before_aftertest_pkg_proc is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(14, 'test','A test', 'some_test'), - ut3.ut_annotation(15, 'beforetest','external_package.before_test_proc', 'some_test'), - ut3.ut_annotation(18, 'aftertest','external_package.after_test_proc', 'some_test') - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%%some_package%some_test' || - '%' || - '%external_packagebefore_test_proc' || - '%' || - '%' || - '%external_packageafter_test_proc' || - '%' || - '%%' - ); - end; - - procedure before_aftertest_mixed_syntax is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(14, 'test','A test', 'some_test'), - ut3.ut_annotation(15, 'beforetest','external_package.before_test_proc, before_test_proc2', 'some_test'), - ut3.ut_annotation(18, 'aftertest','external_package.after_test_proc, after_test_proc2', 'some_test') - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%%some_package%some_test' || - '%' || - '%external_packagebefore_test_proc' || - '%some_packagebefore_test_proc2' || - '%' || - '%' || - '%external_packageafter_test_proc' || - '%some_packageafter_test_proc2' || - '%' || - '%%' - ); - end; - - procedure test_annotation_ordering is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(4, 'test','B test', 'b_test'), - ut3.ut_annotation(10, 'test','Z test', 'z_test'), - ut3.ut_annotation(14, 'test','A test', 'a_test') - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%%some_package%b_test' || - '%%'|| - '%%some_package%z_test' || - '%%'|| - '%%some_package%a_test' || - '%%' - ); - end; - - procedure test_bad_procedure_annotation is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(2, 'bad_procedure_annotation',null, 'some_procedure'), - ut3.ut_annotation(6, 'test','A test', 'do_stuff') - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like('%Unsupported annotation "--\%bad_procedure_annotation". Annotation ignored.% line 2%', '\'); - end; - - procedure test_bad_package_annotation is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(17, 'bad_package_annotation',null, null), - ut3.ut_annotation(24, 'test','A test', 'do_stuff') - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like('%Unsupported annotation "--\%bad_package_annotation". Annotation ignored.% line 17%', '\'); - end; - -end test_suite_builder; -/ diff --git a/test/core/test_suite_builder.pks b/test/core/test_suite_builder.pks deleted file mode 100644 index 21ca58206..000000000 --- a/test/core/test_suite_builder.pks +++ /dev/null @@ -1,176 +0,0 @@ -create or replace package test_suite_builder is - --%suite(suite_builder) - --%suitepath(utplsql.core) - - --%context(suite) - --%displayname(--%suite annotation) - - --%test(Sets suite name from package name and leaves description empty) - procedure no_suite_description; - - --%test(Sets suite description using first --%suite annotation) - procedure suite_description_from_suite; - - --%test(Gives warning if more than one --%suite annotation used) - procedure suite_annot_duplicated; - - --%endcontext - - --%context(displayname) - --%displayname(--%displayname annotation) - - --%test(Overrides suite description using first --%displayname annotation) - procedure suite_descr_from_displayname; - - --%test(Gives warning if more than one --%displayname annotation used) - procedure displayname_annot_duplicated; - - --%test(Gives warning if --%displayname annotation has no value) - procedure displayname_annot_empty; - - --%endcontext - - --%context(test) - --%displayname(--%test annotation) - - --%test(Creates a test item for procedure annotated with --%test annotation) - procedure test_annotation; - - --%test(Gives warning if more than one --%test annotation used) - procedure test_annot_duplicated; - - --%test(Is added to suite according to annotation order in package spec) - procedure test_annotation_ordering; - - --%endcontext - - --%context(suitepath) - --%displayname(--%suitepath annotation) - - --%test(Sets suite path using first --%suitepath annotation) - procedure suitepath_from_non_empty_path; - - --%test(Gives warning if more than one --%suitepath annotation used) - procedure suitepath_annot_duplicated; - - --%test(Gives warning if --%suitepath annotation has no value) - procedure suitepath_annot_empty; - - --%test(Gives warning if --%suitepath annotation has invalid value) - procedure suitepath_annot_invalid_path; - - --%endcontext - - --%context(rollback) - --%displayname(--%rollback annotation) - - --%test(Sets rollback type using first --%rollback annotation) - procedure rollback_type_valid; - - --%test(Gives warning if more than one --%rollback annotation used) - procedure rollback_type_duplicated; - - --%test(Gives warning if --%rollback annotation has no value) - procedure rollback_type_empty; - - --%test(Gives warning if --%rollback annotation has invalid value) - procedure rollback_type_invalid; - - --%endcontext - - --%context(before_after_all_each) - --%displayname(--%before/after all/each annotations) - - --%test(Supports multiple before/after all/each procedure level definitions) - procedure multiple_before_after; - - --%test(Supports multiple before/after all/each standalone level definitions) - procedure multiple_standalone_bef_aft; - - --%test(Supports mixing before/after all/each annotations on single procedure) - procedure before_after_on_single_proc; - - --%test(Supports mixed before/after all/each as standalone and procedure level definitions) - procedure multiple_mixed_bef_aft; - - --%test(Gives warning if more than one --%beforeall annotation used on procedure) - procedure beforeall_annot_duplicated; - - --%test(Gives warning if more than one --%beforeeach annotation used on procedure) - procedure beforeeach_annot_duplicated; - - --%test(Gives warning if more than one --%afterall annotation used on procedure) - procedure afterall_annot_duplicated; - - --%test(Gives warning if more than one --%aftereach annotation used on procedure) - procedure aftereach_annot_duplicated; - - --%test(Gives warning on before/after all/each annotations mixed with test) - procedure before_after_mixed_with_test; - - --%endcontext - - --%context(context) - --%displayname(--%context annotation) - - --%test(Creates nested suite for content between context/endcontext annotations) - procedure suite_from_context; - - --%test(Associates before/after all/each to tests in context only) - procedure before_after_in_context; - - --%test(Propagates beforeeach/aftereach to context) - procedure before_after_out_of_context; - - --%test(Does not create context and gives warning when endcontext is missing) - procedure context_without_endcontext; - - --%test(Gives warning if --%endcontext is missing a preceding --%context) - procedure endcontext_without_context; - - --%test(Gives warning when two contexts have the same name and ignores duplicated context) - procedure duplicate_context_name; - - --%endcontext - - --%context(throws) - --%displayname(--%throws annotation) - - --%test(Gives warning if --%throws annotation has no value) - procedure throws_value_empty; - - --%test(Gives warning if --%throws annotation has invalid value) - procedure throws_value_invalid; - - --%endcontext - - --%context(beforetest_aftertest) - --%displayname(--%beforetest/aftertest annotation) - - --%test(Supports multiple occurrences of beforetest/aftertest for a test) - procedure before_aftertest_multi; - - --%test(Supports same procedure defined twice) - procedure before_aftertest_twice; - - --%test(Supports beforetest from external package) - procedure before_aftertest_pkg_proc; - - --%test(Supports mix of procedure and package.procedure) - procedure before_aftertest_mixed_syntax; - - --%endcontext - - --%context(unknown_annotation) - --%displayname(--%bad_annotation) - - --%test(Gives warning when unknown procedure level annotation passed) - procedure test_bad_procedure_annotation; - - --%test(Gives warning when unknown package level annotation passed) - procedure test_bad_package_annotation; - - --%endcontext - -end test_suite_builder; -/ diff --git a/test/core/test_suite_manager.pkb b/test/core/test_suite_manager.pkb deleted file mode 100644 index bd6c97779..000000000 --- a/test/core/test_suite_manager.pkb +++ /dev/null @@ -1,1497 +0,0 @@ -create or replace package body test_suite_manager is - - ex_obj_doesnt_exist exception; - pragma exception_init(ex_obj_doesnt_exist, -04043); - - procedure create_dummy_long_test_package is - pragma autonomous_transaction; - begin - execute immediate q'[create or replace package ut3.dummy_long_test_package as - - --%suitepath(verylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtext) - --%suite(dummy_test_suite) - - --%test(dummy_test) - procedure some_dummy_test_procedure; - end;]'; - - execute immediate q'[create or replace package ut3.dummy_long_test_package1 as - - --%suitepath(verylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtext) - --%suite(dummy_test_suite1) - - --%test(dummy_test) - procedure some_dummy_test_procedure; - end;]'; - end; - - procedure drop_dummy_long_test_package is - pragma autonomous_transaction; - begin - execute immediate q'[drop package ut3.dummy_long_test_package]'; - execute immediate q'[drop package ut3.dummy_long_test_package1]'; - end; - - procedure compile_dummy_packages is - pragma autonomous_transaction; - begin - execute immediate q'[create or replace package test_package_1 is - - --%suite - --%displayname(test_package_1) - --%suitepath(tests) - --%rollback(manual) - - gv_glob_val number; - - --%beforeeach - procedure global_setup; - - --%aftereach - procedure global_teardown; - - --%test - --%displayname(Test1 from test package 1) - procedure test1; - - --%test(Test2 from test package 1) - --%beforetest(test2_setup) - --%aftertest(test2_teardown) - procedure test2; - - procedure test2_setup; - - procedure test2_teardown; - -end test_package_1;]'; - - execute immediate q'[create or replace package body test_package_1 is - gv_var_1 number; - gv_var_1_temp number; - - procedure global_setup is - begin - gv_var_1 := 1; - gv_glob_val := 1; - end; - - procedure global_teardown is - begin - gv_var_1 := 0; - gv_glob_val := 0; - end; - - procedure test1 is - begin - ut.expect(gv_var_1, 'Some expectation').to_equal(1); - end; - - procedure test2 is - begin - ut.expect(gv_var_1, 'Some expectation').to_equal(2); - end; - - procedure test2_setup is - begin - gv_var_1_temp := gv_var_1; - gv_var_1 := 2; - end; - - procedure test2_teardown is - begin - gv_var_1 := gv_var_1_temp; - gv_var_1_temp := null; - end; - -end test_package_1;]'; - - execute immediate q'[create or replace package test_package_2 is - --%suite - --%suitepath(tests.test_package_1) - - gv_glob_val varchar2(1); - - --%beforeeach - procedure global_setup; - - --%aftereach - procedure global_teardown; - - --%test - procedure test1; - - --%test - --%beforetest(test2_setup) - --%aftertest(test2_teardown) - procedure test2; - - procedure test2_setup; - - procedure test2_teardown; - - --%beforeall - procedure context_setup; - - --%test(Test in a context) - procedure context_test; - - --%afterall - procedure context_teardown; - -end test_package_2;]'; - - execute immediate q'[create or replace package body test_package_2 is - gv_var_1 varchar2(1); - gv_var_1_temp varchar2(1); - - procedure global_setup is - begin - gv_var_1 := 'a'; - gv_glob_val := 'z'; - end; - - procedure global_teardown is - begin - gv_var_1 := 'n'; - gv_glob_val := 'n'; - end; - - procedure test1 is - begin - ut.expect(gv_var_1).to_equal('a'); - end; - - procedure test2 is - begin - ut.expect(gv_var_1).to_equal('b'); - end; - - procedure test2_setup is - begin - gv_var_1_temp := gv_var_1; - gv_var_1 := 'b'; - end; - - procedure test2_teardown is - begin - gv_var_1 := gv_var_1_temp; - gv_var_1_temp := null; - end; - - procedure context_setup is - begin - gv_var_1_temp := gv_var_1 || 'a'; - end; - - procedure context_test is - begin - ut.expect(gv_var_1_temp, 'Some expectation').to_equal('na'); - end; - - procedure context_teardown is - begin - gv_var_1_temp := null; - end; - -end test_package_2;]'; - - execute immediate q'[create or replace package test_package_3 is - --%suite - --%suitepath(tests2) - --%rollback(auto) - - gv_glob_val number; - - --%beforeeach - procedure global_setup; - - --%aftereach - procedure global_teardown; - - --%test - --%rollback(auto) - procedure test1; - - --%test - --%beforetest(test2_setup) - --%aftertest(test2_teardown) - procedure test2; - - procedure test2_setup; - - procedure test2_teardown; - - --%test - --%disabled - procedure disabled_test; - -end test_package_3;]'; - - execute immediate q'[create or replace package body test_package_3 is - gv_var_1 number; - gv_var_1_temp number; - - procedure global_setup is - begin - gv_var_1 := 1; - gv_glob_val := 1; - end; - - procedure global_teardown is - begin - gv_var_1 := 0; - gv_glob_val := 0; - end; - - procedure test1 is - begin - ut.expect(gv_var_1).to_equal(1); - end; - - procedure test2 is - begin - ut.expect(gv_var_1).to_equal(2); - end; - - procedure test2_setup is - begin - gv_var_1_temp := gv_var_1; - gv_var_1 := 2; - end; - - procedure test2_teardown is - begin - gv_var_1 := gv_var_1_temp; - gv_var_1_temp := null; - end; - - procedure disabled_test is - begin - null; - end; - -end test_package_3;]'; - - execute immediate q'[create or replace package test_package_with_ctx is - - --%suite(test_package_with_ctx) - - gv_glob_val number; - - --%context(some_context) - --%displayname(Some context description) - - --%test - --%displayname(Test1 from test package 1) - procedure test1; - - --%endcontext - -end test_package_with_ctx;]'; - - execute immediate q'[create or replace package body test_package_with_ctx is - - procedure test1 is - begin - null; - end; - -end test_package_with_ctx;]'; - end; - - - procedure drop_dummy_packages is - pragma autonomous_transaction; - begin - execute immediate 'drop package test_package_1'; - execute immediate 'drop package test_package_2'; - execute immediate 'drop package test_package_3'; - execute immediate 'drop package test_package_with_ctx'; - end; - - procedure test_schema_run is - c_path constant varchar2(100) := USER; - l_objects_to_run ut3.ut_suite_items := ut3.ut_suite_items(); - l_all_objects_to_run ut3.ut_suite_items; - - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test2_suite ut3.ut_logical_suite; - begin - --Act - l_all_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); - - for i in 1..l_all_objects_to_run.count loop - if l_all_objects_to_run(i).name in ('tests', 'tests2') then - l_objects_to_run.extend; - l_objects_to_run(l_objects_to_run.last) := l_all_objects_to_run(i); - end if; - end loop; - - --Assert - ut.expect(l_objects_to_run.count).to_equal(2); - - for i in 1 .. 2 loop - l_test0_suite := treat(l_objects_to_run(i) as ut3.ut_logical_suite); - ut.expect(l_test0_suite.name in ('tests', 'tests2')).to_be_true; - - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); - - case l_test0_suite.name - when 'tests' then - ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.items.count).to_equal(3); - ut.expect(l_test1_suite.rollback_type).to_equal(ut3.ut_utils.gc_rollback_manual); - l_test2_suite := treat(l_test1_suite.items(1) as ut3.ut_logical_suite); - - ut.expect(l_test2_suite.name).to_equal('test_package_2'); - ut.expect(l_test2_suite.items.count).to_equal(3); - ut.expect(l_test2_suite.rollback_type).to_equal(ut3.ut_utils.gc_rollback_manual); - when 'tests2' then - ut.expect(l_test1_suite.name).to_equal('test_package_3'); - ut.expect(l_test1_suite.items.count).to_equal(3); - end case; - - end loop; - - end; - - procedure test_top2_by_name is - c_path varchar2(100) := USER||'.test_package_2'; - l_objects_to_run ut3.ut_suite_items; - - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test2_suite ut3.ut_logical_suite; - begin - --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.items.count).to_equal(1); - ut.expect(l_test1_suite.rollback_type).to_equal(ut3.ut_utils.gc_rollback_manual); - l_test2_suite := treat(l_test1_suite.items(1) as ut3.ut_logical_suite); - - ut.expect(l_test2_suite.name).to_equal('test_package_2'); - ut.expect(l_test2_suite.rollback_type).to_equal(ut3.ut_utils.gc_rollback_manual); - ut.expect(l_test2_suite.items.count).to_equal(3); - end; - - procedure test_top2_bt_name_cur_user is - c_path varchar2(100) := 'test_package_2'; - l_objects_to_run ut3.ut_suite_items; - - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test2_suite ut3.ut_logical_suite; - begin - --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.items.count).to_equal(1); - ut.expect(l_test1_suite.rollback_type).to_equal(ut3.ut_utils.gc_rollback_manual); - l_test2_suite := treat(l_test1_suite.items(1) as ut3.ut_logical_suite); - - ut.expect(l_test2_suite.name).to_equal('test_package_2'); - ut.expect(l_test2_suite.rollback_type).to_equal(ut3.ut_utils.gc_rollback_manual); - ut.expect(l_test2_suite.items.count).to_equal(3); - end; - - procedure test_by_path_to_subsuite is - c_path varchar2(100) := USER||':tests.test_package_1.test_package_2'; - l_objects_to_run ut3.ut_suite_items; - - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test2_suite ut3.ut_logical_suite; - begin - --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.items.count).to_equal(1); - l_test2_suite := treat(l_test1_suite.items(1) as ut3.ut_logical_suite); - - ut.expect(l_test2_suite.name).to_equal('test_package_2'); - ut.expect(l_test2_suite.items.count).to_equal(3); - end; - - procedure test_by_path_to_subsuite_cu is - c_path varchar2(100) := ':tests.test_package_1.test_package_2'; - l_objects_to_run ut3.ut_suite_items; - - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test2_suite ut3.ut_logical_suite; - begin - --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.items.count).to_equal(1); - l_test2_suite := treat(l_test1_suite.items(1) as ut3.ut_logical_suite); - - ut.expect(l_test2_suite.name).to_equal('test_package_2'); - ut.expect(l_test2_suite.items.count).to_equal(3); - end; - - procedure test_subsute_proc_by_path is - c_path varchar2(100) := USER||':tests.test_package_1.test_package_2.test2'; - l_objects_to_run ut3.ut_suite_items; - - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test2_suite ut3.ut_logical_suite; - l_test_proc ut3.ut_test; - begin - --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.rollback_type).to_equal(ut3.ut_utils.gc_rollback_manual); - ut.expect(l_test1_suite.items.count).to_equal(1); - l_test2_suite := treat(l_test1_suite.items(1) as ut3.ut_logical_suite); - - ut.expect(l_test2_suite.name).to_equal('test_package_2'); - ut.expect(l_test2_suite.rollback_type).to_equal(ut3.ut_utils.gc_rollback_manual); - ut.expect(l_test2_suite.items.count).to_equal(1); - - l_test_proc := treat(l_test2_suite.items(1) as ut3.ut_test); - ut.expect(l_test_proc.name).to_equal('test2'); - ut.expect(l_test_proc.rollback_type).to_equal(ut3.ut_utils.gc_rollback_manual); - ut.expect(l_test_proc.before_test_list.count).to_be_greater_than(0); - ut.expect(l_test_proc.after_test_list.count).to_be_greater_than(0); - - end; - - procedure test_subsute_proc_by_path_cu is - c_path varchar2(100) := ':tests.test_package_1.test_package_2.test2'; - l_objects_to_run ut3.ut_suite_items; - - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test2_suite ut3.ut_logical_suite; - l_test_proc ut3.ut_test; - begin - --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.items.count).to_equal(1); - l_test2_suite := treat(l_test1_suite.items(1) as ut3.ut_logical_suite); - - ut.expect(l_test2_suite.name).to_equal('test_package_2'); - ut.expect(l_test2_suite.items.count).to_equal(1); - - l_test_proc := treat(l_test2_suite.items(1) as ut3.ut_test); - ut.expect(l_test_proc.name).to_equal('test2'); - ut.expect(l_test_proc.before_test_list.count).to_be_greater_than(0); - ut.expect(l_test_proc.after_test_list.count).to_be_greater_than(0); - end; - - procedure test_top_pack_by_name is - c_path varchar2(100) := USER||'.test_package_1'; - l_objects_to_run ut3.ut_suite_items; - - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_suite; - begin - --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.items.count).to_equal(2); - - ut.expect(l_test1_suite.items(1).name).to_equal('test1'); - ut.expect(l_test1_suite.items(1).description).to_equal('Test1 from test package 1'); - ut.expect(treat(l_test1_suite.items(1) as ut3.ut_test).before_test_list.count).to_equal(0); - ut.expect(treat(l_test1_suite.items(1) as ut3.ut_test).after_test_list.count).to_equal(0); - ut.expect(treat(l_test1_suite.items(1) as ut3.ut_test).before_each_list.count).to_be_greater_than(0); - ut.expect(treat(l_test1_suite.items(1) as ut3.ut_test).disabled_flag).to_equal(0); - - ut.expect(l_test1_suite.items(2).name).to_equal('test2'); - ut.expect(l_test1_suite.items(2).description).to_equal('Test2 from test package 1'); - ut.expect(treat(l_test1_suite.items(2) as ut3.ut_test).before_test_list.count).to_be_greater_than(0); - ut.expect(treat(l_test1_suite.items(2) as ut3.ut_test).after_test_list.count).to_be_greater_than(0); - ut.expect(treat(l_test1_suite.items(2) as ut3.ut_test).before_each_list.count).to_be_greater_than(0); - ut.expect(treat(l_test1_suite.items(2) as ut3.ut_test).disabled_flag).to_equal(0); - - end; - - procedure test_top_pack_by_name_cu is - c_path varchar2(100) := 'test_package_1'; - l_objects_to_run ut3.ut_suite_items; - - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_suite; - l_test2_suite ut3.ut_suite; - begin - --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.items.count).to_equal(2); - - ut.expect(l_test1_suite.items(1).name).to_equal('test1'); - ut.expect(l_test1_suite.items(1).description).to_equal('Test1 from test package 1'); - ut.expect(treat(l_test1_suite.items(1) as ut3.ut_test).before_test_list.count).to_equal(0); - ut.expect(treat(l_test1_suite.items(1) as ut3.ut_test).after_test_list.count).to_equal(0); - ut.expect(treat(l_test1_suite.items(1) as ut3.ut_test).before_each_list.count).to_be_greater_than(0); - ut.expect(treat(l_test1_suite.items(1) as ut3.ut_test).disabled_flag).to_equal(0); - - ut.expect(l_test1_suite.items(2).name).to_equal('test2'); - ut.expect(l_test1_suite.items(2).description).to_equal('Test2 from test package 1'); - ut.expect(treat(l_test1_suite.items(2) as ut3.ut_test).before_test_list.count).to_be_greater_than(0); - ut.expect(treat(l_test1_suite.items(2) as ut3.ut_test).after_test_list.count).to_be_greater_than(0); - ut.expect(treat(l_test1_suite.items(2) as ut3.ut_test).before_each_list.count).to_be_greater_than(0); - ut.expect(treat(l_test1_suite.items(2) as ut3.ut_test).disabled_flag).to_equal(0); - - end; - - procedure test_top_pack_by_path is - c_path varchar2(100) := USER||':tests'; - l_objects_to_run ut3.ut_suite_items; - - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test2_suite ut3.ut_logical_suite; - begin - --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.items.count).to_equal(3); - l_test2_suite := treat(l_test1_suite.items(1) as ut3.ut_logical_suite); - - ut.expect(l_test2_suite.name).to_equal('test_package_2'); - ut.expect(l_test2_suite.items.count).to_equal(3); - end; - - procedure test_top_pack_by_path_cu is - c_path varchar2(100) := ':tests'; - l_objects_to_run ut3.ut_suite_items; - - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test2_suite ut3.ut_logical_suite; - begin - --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.items.count).to_equal(3); - l_test2_suite := treat(l_test1_suite.items(1) as ut3.ut_logical_suite); - - ut.expect(l_test2_suite.name).to_equal('test_package_2'); - ut.expect(l_test2_suite.items.count).to_equal(3); - end; - - procedure test_top_pck_proc_by_path is - c_path varchar2(100) := USER||':tests.test_package_1.test2'; - l_objects_to_run ut3.ut_suite_items; - - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test2_suite ut3.ut_logical_suite; - l_test_proc ut3.ut_test; - begin - --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.items.count).to_equal(1); - l_test_proc := treat(l_test1_suite.items(1) as ut3.ut_test); - - ut.expect(l_test_proc.name).to_equal('test2'); - ut.expect(l_test_proc.description).to_equal('Test2 from test package 1'); - ut.expect(l_test_proc.before_test_list.count).to_be_greater_than(0); - ut.expect(l_test_proc.after_test_list.count).to_be_greater_than(0); - end; - - procedure test_top_pck_proc_by_path_cu is - c_path varchar2(100) := ':tests.test_package_1.test2'; - l_objects_to_run ut3.ut_suite_items; - - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test2_suite ut3.ut_logical_suite; - l_test_proc ut3.ut_test; - begin - --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.items.count).to_equal(1); - l_test_proc := treat(l_test1_suite.items(1) as ut3.ut_test); - - ut.expect(l_test_proc.name).to_equal('test2'); - ut.expect(l_test_proc.description).to_equal('Test2 from test package 1'); - ut.expect(l_test_proc.before_test_list.count).to_be_greater_than(0); - ut.expect(l_test_proc.after_test_list.count).to_be_greater_than(0); - end; - - procedure test_top_pkc_proc_by_name is - c_path varchar2(100) := USER||'.test_package_1.test2'; - l_objects_to_run ut3.ut_suite_items; - - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test_proc ut3.ut_test; - begin - --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.items.count).to_equal(1); - - l_test_proc := treat(l_test1_suite.items(1) as ut3.ut_test); - ut.expect(l_test_proc.name).to_equal('test2'); - ut.expect(l_test_proc.before_test_list.count).to_be_greater_than(0); - ut.expect(l_test_proc.after_test_list.count).to_be_greater_than(0); - end; - - procedure test_top_pkc_proc_by_name_cu is - c_path varchar2(100) := 'test_package_1.test2'; - l_objects_to_run ut3.ut_suite_items; - - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test_proc ut3.ut_test; - begin - --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.items.count).to_equal(1); - - l_test_proc := treat(l_test1_suite.items(1) as ut3.ut_test); - ut.expect(l_test_proc.name).to_equal('test2'); - ut.expect(l_test_proc.before_test_list.count).to_be_greater_than(0); - ut.expect(l_test_proc.after_test_list.count).to_be_greater_than(0); - end; - - procedure test_top_pkc_nosub_by_name is - c_path varchar2(100) := USER||'.test_package_3'; - l_objects_to_run ut3.ut_suite_items; - - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test1 ut3.ut_test; - l_test3 ut3.ut_test; - begin - --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests2'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_3'); - ut.expect(l_test1_suite.items.count).to_equal(3); - - l_test1 := treat(l_test1_suite.items(1) as ut3.ut_test); - ut.expect(l_test1.name).to_equal('test1'); - ut.expect(l_test1.DISABLED_FLAG).to_equal(0); - - l_test3 := treat(l_test1_suite.items(3) as ut3.ut_test); - ut.expect(l_test3.name).to_equal('disabled_test'); - ut.expect(l_test3.DISABLED_FLAG).to_equal(1); - end; - - procedure test_top_pkc_nosub_by_name_cu is - c_path varchar2(100) := 'test_package_3'; - l_objects_to_run ut3.ut_suite_items; - - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test1 ut3.ut_test; - l_test3 ut3.ut_test; - begin - --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests2'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_3'); - ut.expect(l_test1_suite.items.count).to_equal(3); - - l_test1 := treat(l_test1_suite.items(1) as ut3.ut_test); - ut.expect(l_test1.name).to_equal('test1'); - ut.expect(l_test1.DISABLED_FLAG).to_equal(0); - - l_test3 := treat(l_test1_suite.items(3) as ut3.ut_test); - ut.expect(l_test3.name).to_equal('disabled_test'); - ut.expect(l_test3.DISABLED_FLAG).to_equal(1); - end; - - procedure test_top_subpck_by_path is - c_path varchar2(100) := USER||':tests2.test_package_3'; - l_objects_to_run ut3.ut_suite_items; - - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test1 ut3.ut_test; - l_test3 ut3.ut_test; - begin - --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests2'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_3'); - ut.expect(l_test1_suite.items.count).to_equal(3); - - l_test1 := treat(l_test1_suite.items(1) as ut3.ut_test); - ut.expect(l_test1.name).to_equal('test1'); - ut.expect(l_test1.DISABLED_FLAG).to_equal(0); - - l_test3 := treat(l_test1_suite.items(3) as ut3.ut_test); - ut.expect(l_test3.name).to_equal('disabled_test'); - ut.expect(l_test3.DISABLED_FLAG).to_equal(1); - end; - - procedure test_top_subpck_by_path_cu is - c_path varchar2(100) := ':tests2.test_package_3'; - l_objects_to_run ut3.ut_suite_items; - - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test1 ut3.ut_test; - l_test3 ut3.ut_test; - begin - --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests2'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_3'); - ut.expect(l_test1_suite.items.count).to_equal(3); - - l_test1 := treat(l_test1_suite.items(1) as ut3.ut_test); - ut.expect(l_test1.name).to_equal('test1'); - ut.expect(l_test1.DISABLED_FLAG).to_equal(0); - - l_test3 := treat(l_test1_suite.items(3) as ut3.ut_test); - ut.expect(l_test3.name).to_equal('disabled_test'); - ut.expect(l_test3.DISABLED_FLAG).to_equal(1); - end; - - procedure test_search_invalid_pck is - l_objects_to_run ut3.ut_suite_items; - begin - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('failing_invalid_spec')); - - ut3.ut.expect(l_objects_to_run.count).to_be_greater_than(0); - ut3.ut.expect(l_objects_to_run(l_objects_to_run.first).object_name).to_equal('failing_invalid_spec'); - end; - - procedure compile_invalid_package is - ex_compilation_error exception; - pragma exception_init(ex_compilation_error,-24344); - pragma autonomous_transaction; - begin - begin - execute immediate q'[create or replace package failing_invalid_spec as - --%suite - gv_glob_val non_existing_table.id%type := 0; - - --%beforeall - procedure before_all; - --%test - procedure test1; - --%test - procedure test2; -end;]'; - exception when ex_compilation_error then null; - end; - begin - execute immediate q'[create or replace package body failing_invalid_spec as - procedure before_all is begin gv_glob_val := 1; end; - procedure test1 is begin ut.expect(1).to_equal(1); end; - procedure test2 is begin ut.expect(1).to_equal(1); end; -end;]'; - exception when ex_compilation_error then null; - end; - end; - procedure drop_invalid_package is - pragma autonomous_transaction; - begin - execute immediate 'drop package failing_invalid_spec'; - end; - - procedure test_search_nonexisting_pck is - l_objects_to_run ut3.ut_suite_items; - begin - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('ut3.failing_non_existing')); - ut.fail('Non existing package did not raise exception'); - exception - when others then - ut.expect(sqlerrm).to_be_like('%failing_non_existing%'); - end; - - procedure test_search_nonexist_sch_pck is - l_objects_to_run ut3.ut_suite_items; - begin - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('failing_non_existing')); - ut.fail('Non existing package without schema did not raise exception'); - exception - when others then - ut.expect(sqlerrm).to_be_like('%ORA-44001: invalid schema%'); - end; - - procedure test_desc_with_comma is - l_objects_to_run ut3.ut_suite_items; - l_suite ut3.ut_suite; - l_test ut3.ut_test; - begin - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('tst_package_to_be_dropped')); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - - l_suite := treat(l_objects_to_run(1) as ut3.ut_suite); - - ut.expect(l_suite.name).to_equal('tst_package_to_be_dropped'); - ut.expect(l_suite.description).to_equal('A suite description, though with comma, is assigned by suite_manager'); - ut.expect(l_suite.items.count).to_equal(2); - - l_test := treat(l_suite.items(1) as ut3.ut_test); - - ut.expect(l_test.name).to_equal('test1'); - ut.expect(l_test.description).to_equal('A test description, though with comma, is assigned by suite_manager'); - --- l_test := treat(l_suite.items(2) as ut3.ut_test); --- --- ut.expect(l_test.name).to_equal('test2'); --- ut.expect(l_test.description).to_equal('A test description, though with comma, is assigned by suite_manager'); - - end; - procedure setup_desc_with_comma is - pragma autonomous_transaction; - begin - execute immediate 'create or replace package tst_package_to_be_dropped as - --%suite(A suite description, though with comma, is assigned by suite_manager) - - --%test(A test description, though with comma, is assigned by suite_manager) - procedure test1; - - --%test - --%displayname(A test description, though with comma, is assigned by suite_manager) - procedure test2; -end;'; - - execute immediate 'create or replace package body tst_package_to_be_dropped as - procedure test1 is begin ut.expect(1).to_equal(1); end; - procedure test2 is begin ut.expect(1).to_equal(1); end; -end;'; - end; - procedure clean_desc_with_comma is - pragma autonomous_transaction; - begin - begin - execute immediate 'drop package tst_package_to_be_dropped'; - exception - when ex_obj_doesnt_exist then - null; - end; - end; - - procedure test_inv_cache_on_drop is - l_test_report ut3.ut_varchar2_list; - begin - - select * bulk collect into l_test_report from table(ut3.ut.run(USER||'.tst_package_to_be_dropped')); - - -- drop package - clean_inv_cache_on_drop; - - begin - select * bulk collect into l_test_report from table(ut3.ut.run(user || '.tst_package_to_be_dropped')); - ut.fail('Cache not invalidated on package drop'); - exception - when others then - ut.expect(sqlerrm).to_be_like('%tst_package_to_be_dropped%does not exist%'); - end; - - end; - procedure setup_inv_cache_on_drop is - pragma autonomous_transaction; - begin - execute immediate 'create or replace package tst_package_to_be_dropped as - --%suite - - --%test - procedure test1; -end;'; - - execute immediate 'create or replace package body tst_package_to_be_dropped as - procedure test1 is begin ut.expect(1).to_equal(1); end; - procedure test2 is begin ut.expect(1).to_equal(1); end; -end;'; - end; - - procedure clean_inv_cache_on_drop is - pragma autonomous_transaction; - begin - execute immediate 'drop package tst_package_to_be_dropped'; - exception - when ex_obj_doesnt_exist then - null; - end; - - procedure test_inv_pck_bodies is - l_test_report ut3.ut_varchar2_list; - begin - - select * bulk collect into l_test_report from table(ut3.ut.run(USER||'.test_dependencies')); - - ut.expect(l_test_report(l_test_report.count-1)).to_be_like('1 test_, 0 failed, 0 errored, 0 disabled, 0 warning(s)'); - --execute immediate 'select * from table(ut3.ut.run(''UT3.test_dependencies'', ut3.utplsql_test_reporter()))' into l_result; - --- ut.expect(l_result).to_equal(ut3.ut_utils.gc_success); - end; - procedure setup_inv_pck_bodies is - pragma autonomous_transaction; - begin - execute immediate 'create table test_dependency_table (id integer)'; - execute immediate 'create or replace package test_dependencies as - -- %suite - - -- %test - procedure dependant; -end;'; - execute immediate 'create or replace package body test_dependencies as - gc_dependant_variable test_dependency_table.id%type; - procedure dependant is begin null; end; -end;'; - - execute immediate 'alter table test_dependency_table modify id number'; - - end; - procedure clean_inv_pck_bodies is - pragma autonomous_transaction; - begin - execute immediate 'drop table test_dependency_table'; - execute immediate 'drop package test_dependencies'; - end; - - procedure test_pck_with_dollar is - l_objects_to_run ut3.ut_suite_items; - l_suite ut3.ut_suite; - begin - --act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('tst_package_with$dollar')); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - - l_suite := treat(l_objects_to_run(1) as ut3.ut_suite); - ut.expect(l_suite.name).to_equal('tst_package_with$dollar'); - end; - procedure setup_pck_with_dollar is - pragma autonomous_transaction; - begin - execute immediate 'create or replace package tst_package_with$dollar as - --%suite - - --%test - procedure test1; -end;'; - - execute immediate 'create or replace package body tst_package_with$dollar as - procedure test1 is begin ut.expect(1).to_equal(1); end; - procedure test2 is begin ut.expect(1).to_equal(1); end; -end;'; - end; - procedure clean_pck_with_dollar is - pragma autonomous_transaction; - begin - execute immediate 'drop package tst_package_with$dollar'; - end; - - - procedure test_pck_with_hash is - l_objects_to_run ut3.ut_suite_items; - l_suite ut3.ut_suite; - begin - --act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('tst_package_with#hash')); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - - l_suite := treat(l_objects_to_run(1) as ut3.ut_suite); - ut.expect(l_suite.name).to_equal('tst_package_with#hash'); - end; - procedure setup_pck_with_hash is - pragma autonomous_transaction; - begin - execute immediate 'create or replace package tst_package_with#hash as - --%suite - - --%test - procedure test1; -end;'; - - execute immediate 'create or replace package body tst_package_with#hash as - procedure test1 is begin ut.expect(1).to_equal(1); end; - procedure test2 is begin ut.expect(1).to_equal(1); end; -end;'; - end; - procedure clean_pck_with_hash is - pragma autonomous_transaction; - begin - execute immediate 'drop package tst_package_with#hash'; - end; - - - procedure test_test_with_dollar is - l_objects_to_run ut3.ut_suite_items; - l_suite ut3.ut_suite; - l_test ut3.ut_test; - begin - --act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('tst_package_with_dollar_test.test$1')); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - - l_suite := treat(l_objects_to_run(1) as ut3.ut_suite); - - ut.expect(l_suite.name).to_equal('tst_package_with_dollar_test'); - ut.expect(l_suite.items.count).to_equal(1); - - l_test := treat(l_suite.items(1) as ut3.ut_test); - - ut.expect(l_test.name).to_equal('test$1'); - - end; - procedure setup_test_with_dollar is - pragma autonomous_transaction; - begin - execute immediate 'create or replace package tst_package_with_dollar_test as - --%suite - - --%test - procedure test$1; -end;'; - - execute immediate 'create or replace package body tst_package_with_dollar_test as - procedure test$1 is begin ut.expect(1).to_equal(1); end; -end;'; - end; - procedure clean_test_with_dollar is - pragma autonomous_transaction; - begin - execute immediate 'drop package tst_package_with_dollar_test'; - end; - - procedure test_test_with_hash is - l_objects_to_run ut3.ut_suite_items; - l_suite ut3.ut_suite; - l_test ut3.ut_test; - begin - --act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('tst_package_with_hash_test.test#1')); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - - l_suite := treat(l_objects_to_run(1) as ut3.ut_suite); - - ut.expect(l_suite.name).to_equal('tst_package_with_hash_test'); - ut.expect(l_suite.items.count).to_equal(1); - - l_test := treat(l_suite.items(1) as ut3.ut_test); - - ut.expect(l_test.name).to_equal('test#1'); - - end; - procedure setup_test_with_hash is - pragma autonomous_transaction; - begin - execute immediate 'create or replace package tst_package_with_hash_test as - --%suite - - --%test - procedure test#1; -end;'; - - execute immediate 'create or replace package body tst_package_with_hash_test as - procedure test#1 is begin ut.expect(1).to_equal(1); end; -end;'; - end; - procedure clean_test_with_hash is - pragma autonomous_transaction; - begin - execute immediate 'drop package tst_package_with_hash_test'; - end; - - procedure test_empty_suite_path is - l_objects_to_run ut3.ut_suite_items; - l_suite ut3.ut_suite; - begin - - --act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('tst_empty_suite_path')); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - - l_suite := treat(l_objects_to_run(1) as ut3.ut_suite); - - ut.expect(l_suite.name).to_equal('tst_empty_suite_path'); - end; - - procedure setup_empty_suite_path is - pragma autonomous_transaction; - begin - execute immediate 'create or replace package tst_empty_suite_path as - --%suite - --%suitepath - - --%test - procedure test1; -end;'; - execute immediate 'create or replace package body tst_empty_suite_path as - procedure test1 is begin ut.expect(1).to_equal(1); end; -end;'; - end; - - procedure clean_empty_suite_path is - pragma autonomous_transaction; - begin - execute immediate 'drop package tst_empty_suite_path'; - end; - - procedure test_pck_with_same_path is - l_objects_to_run ut3.ut_suite_items; - l_suite1 ut3.ut_logical_suite; - l_suite2 ut3.ut_logical_suite; - l_suite3 ut3.ut_suite; - begin - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(':test1.test2$.test_package_same_1')); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - - l_suite1 := treat(l_objects_to_run(1) as ut3.ut_logical_suite); - ut.expect(l_suite1.name).to_equal('test1'); - ut.expect(l_suite1.items.count).to_equal(1); - - l_suite2 := treat(l_suite1.items(1) as ut3.ut_logical_suite); - ut.expect(l_suite2.name).to_equal('test2$'); - ut.expect(l_suite2.items.count).to_equal(1); - - l_suite3 := treat(l_suite2.items(1) as ut3.ut_suite); - ut.expect(l_suite3.name).to_equal('test_package_same_1'); - end; - - procedure setup_pck_with_same_path is - pragma autonomous_transaction; - begin - execute immediate 'create or replace package test_package_same_1 as - --%suite - --%suitepath(test1.test2$) - - --%test - procedure test1; -end;'; - execute immediate 'create or replace package body test_package_same_1 as - procedure test1 is begin null; end; -end;'; - execute immediate 'create or replace package test_package_same_1_a as - --%suite - --%suitepath(test1.test2$) - - --%test - procedure test1; -end;'; - execute immediate 'create or replace package body test_package_same_1_a as - procedure test1 is begin null; end; -end;'; - end; - - procedure clean_pck_with_same_path is - pragma autonomous_transaction; - begin - execute immediate 'drop package test_package_same_1'; - execute immediate 'drop package test_package_same_1_a'; - end; - - procedure setup_disabled_pck is - pragma autonomous_transaction; - begin - execute immediate q'[create or replace package test_disabled_floating as - --%suite - - --%test - procedure test1; - - --%disabled - - --%test - procedure test2; - -end;]'; - end; - - procedure clean_disabled_pck is - pragma autonomous_transaction; - begin - execute immediate 'drop package test_disabled_floating'; - end; - - procedure disable_suite_floating_annot is - l_objects_to_run ut3.ut_suite_items; - l_suite ut3.ut_suite; - begin - --Arrange - setup_disabled_pck; - --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('test_disabled_floating')); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_suite := treat(l_objects_to_run(1) as ut3.ut_suite); - ut.expect(l_suite.name).to_equal('test_disabled_floating'); - ut.expect(l_suite.get_disabled_flag()).to_be_true(); - - clean_disabled_pck; - end; - - procedure pck_proc_in_ctx_by_name is - c_path varchar2(100) := USER||'.test_package_with_ctx.test1'; - l_objects_to_run ut3.ut_suite_items; - - l_test_suite ut3.ut_logical_suite; - l_ctx_suite ut3.ut_logical_suite; - l_test_proc ut3.ut_test; - begin - --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - - l_test_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); - ut.expect(l_test_suite.name).to_equal('test_package_with_ctx'); - ut.expect(l_test_suite.items.count).to_equal(1); - - l_ctx_suite := treat(l_test_suite.items(1) as ut3.ut_logical_suite); - ut.expect(l_ctx_suite.name).to_equal('some_context'); - ut.expect(l_ctx_suite.description).to_equal('Some context description'); - ut.expect(l_ctx_suite.items.count).to_equal(1); - - l_test_proc := treat(l_ctx_suite.items(1) as ut3.ut_test); - ut.expect(l_test_proc.name).to_equal('test1'); - end; - - procedure pck_proc_in_ctx_by_path is - c_path varchar2(100) := USER||':test_package_with_ctx.some_context.test1'; - l_objects_to_run ut3.ut_suite_items; - - l_test_suite ut3.ut_logical_suite; - l_ctx_suite ut3.ut_logical_suite; - l_test_proc ut3.ut_test; - begin - --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - - l_test_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); - ut.expect(l_test_suite.name).to_equal('test_package_with_ctx'); - ut.expect(l_test_suite.items.count).to_equal(1); - - l_ctx_suite := treat(l_test_suite.items(1) as ut3.ut_logical_suite); - ut.expect(l_ctx_suite.name).to_equal('some_context'); - ut.expect(l_ctx_suite.description).to_equal('Some context description'); - ut.expect(l_ctx_suite.items.count).to_equal(1); - - l_test_proc := treat(l_ctx_suite.items(1) as ut3.ut_test); - ut.expect(l_test_proc.name).to_equal('test1'); - end; - - procedure test_get_schema_ut_packages is - l_expected ut3.ut_object_names; - l_actual ut3.ut_object_names; - begin - l_expected := ut3.ut_object_names( - ut3.ut_object_name('UT3','SOME_TEST_PACKAGE') - ); - l_actual := ut3.ut_suite_manager.get_schema_ut_packages(ut3.ut_varchar2_rows('UT3')); - - ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); - end; - procedure create_ut3_suite is - pragma autonomous_transaction; - begin - execute immediate q'[ - create or replace package ut3.some_test_package - as - --%suite - - --%test - procedure some_test; - - end;]'; - end; - - procedure drop_ut3_suite is - pragma autonomous_transaction; - begin - execute immediate q'[drop package ut3.some_test_package]'; - end; - - procedure add_new_long_test_package is - l_actual ut3.ut_object_names; - l_expected_message varchar2(500); - begin - l_expected_message := q'[ORA-20217: 'Suitepath exceeds 1000 CHAR on: UT3.DUMMY_LONG_TEST_PACKAGE,UT3.DUMMY_LONG_TEST_PACKAGE1'%]'; - l_actual := ut3.ut_suite_manager.get_schema_ut_packages(ut3.ut_varchar2_rows('UT3')); - ut.fail('Expected exception for suitpaths over 1k for two packages'); - exception - when others then - ut.expect(dbms_utility.format_error_stack()).to_be_like(l_expected_message); - ut.expect(SQLCODE).to_equal(ut3.ut_utils.gc_value_too_large); - end; - -end test_suite_manager; -/ diff --git a/test/core/test_suite_manager.pks b/test/core/test_suite_manager.pks deleted file mode 100644 index aad29fad0..000000000 --- a/test/core/test_suite_manager.pks +++ /dev/null @@ -1,175 +0,0 @@ -create or replace package test_suite_manager is - - --%suite(suite_manager) - --%suitepath(utplsql.core) - - procedure create_dummy_long_test_package; - - procedure drop_dummy_long_test_package; - - --%beforeall - procedure compile_dummy_packages; - --%afterall - procedure drop_dummy_packages; - - --%test(Prepare Runner For The Schema) - procedure test_schema_run; - - --%test(Prepare runner for the top 2 package by package user.package_name) - procedure test_top2_by_name; - - --%test(Prepare runner for the top2 package by name cur user) - procedure test_top2_bt_name_cur_user; - - --%test(Prepare runner for the subsuite by path) - procedure test_by_path_to_subsuite; - - --%test(Prepare runner for the subsuite by path for current user) - procedure test_by_path_to_subsuite_cu; - - --%test(Prepare runner for the subsuite proc only by path) - procedure test_subsute_proc_by_path; - - --%test(Prepare runner for the subsuite proc only by path for current user) - procedure test_subsute_proc_by_path_cu; - - --%test(Prepare runner for the top package by package name) - procedure test_top_pack_by_name; - - --%test(Prepare runner for the top package by package name for current user) - procedure test_top_pack_by_name_cu; - - --%test(Prepare runner for the top package by path) - procedure test_top_pack_by_path; - - --%test(Prepare runner for the top package by path for current user) - procedure test_top_pack_by_path_cu; - - --%test(Prepare runner for the top package procedure by path) - procedure test_top_pck_proc_by_path; - - --%test(Prepare runner for the top package procedure by path for current user) - procedure test_top_pck_proc_by_path_cu; - - --%test(Prepare runner for the top package procedure without sub-suites by package name) - procedure test_top_pkc_proc_by_name; - - --%test(Prepare runner for the top package procedure without sub-suites by package name for current user) - procedure test_top_pkc_proc_by_name_cu; - - --%test(Prepare runner for the top package without sub-suites by package name) - procedure test_top_pkc_nosub_by_name; - - --%test(Prepare runner for the top package without sub-suites by package name for current user) - procedure test_top_pkc_nosub_by_name_cu; - - --%test(Prepare runner for the suites package by path) - procedure test_top_subpck_by_path; - - --%test(Prepare runner for the suites package by path for current user) - procedure test_top_subpck_by_path_cu; - - --%test(Prepare runner for invalid package - it will add to suite but fail on exec ) - --%beforetest(compile_invalid_package) - --%aftertest(drop_invalid_package) - procedure test_search_invalid_pck; - procedure compile_invalid_package; - procedure drop_invalid_package; - - --%test(Prepare runner for nonexisting package with schema) - procedure test_search_nonexisting_pck; - - --%test(Prepare runner for nonexisting package without schema) - procedure test_search_nonexist_sch_pck; - - --%test(Test description with comma) - --%beforetest(setup_desc_with_comma) - --%aftertest(clean_desc_with_comma) - procedure test_desc_with_comma; - procedure setup_desc_with_comma; - procedure clean_desc_with_comma; - - --%test(Invalidate cache on package drop) - --%beforetest(setup_inv_cache_on_drop) - --%aftertest(clean_inv_cache_on_drop) - procedure test_inv_cache_on_drop; - procedure setup_inv_cache_on_drop; - procedure clean_inv_cache_on_drop; - - --%test(Includes Invalid Package Bodies In The Run) - --%beforetest(setup_inv_pck_bodies) - --%aftertest(clean_inv_pck_bodies) - procedure test_inv_pck_bodies; - procedure setup_inv_pck_bodies; - procedure clean_inv_pck_bodies; - - --%test(Package With Dollar Sign) - --%beforetest(setup_pck_with_dollar) - --%aftertest(clean_pck_with_dollar) - procedure test_pck_with_dollar; - procedure setup_pck_with_dollar; - procedure clean_pck_with_dollar; - - --%test(Package With Hash Sign) - --%beforetest(setup_pck_with_hash) - --%aftertest(clean_pck_with_hash) - procedure test_pck_with_hash; - procedure setup_pck_with_hash; - procedure clean_pck_with_hash; - - --%test(Package with test with dollar sign) - --%beforetest(setup_test_with_dollar) - --%aftertest(clean_test_with_dollar) - procedure test_test_with_dollar; - procedure setup_test_with_dollar; - procedure clean_test_with_dollar; - - --%test(Package with test with hash sign) - --%beforetest(setup_test_with_hash) - --%aftertest(clean_test_with_hash) - procedure test_test_with_hash; - procedure setup_test_with_hash; - procedure clean_test_with_hash; - - - --%test(Setup suite with empty suitepath) - --%beforetest(setup_empty_suite_path) - --%aftertest(clean_empty_suite_path) - procedure test_empty_suite_path; - procedure setup_empty_suite_path; - procedure clean_empty_suite_path; - - --%test(only the defined in suitepath suite/test is executed if multiple similarly named test suites exist in the context differed only by comment) - --%beforetest(setup_pck_with_same_path) - --%aftertest(clean_pck_with_same_path) - procedure test_pck_with_same_path; - procedure setup_pck_with_same_path; - procedure clean_pck_with_same_path; - - --%test(Whole suite gets disabled with floating annotation) - procedure disable_suite_floating_annot; - - --%test(Prepare runner for a package procedure inside context) - procedure pck_proc_in_ctx_by_name; - - --%test(Prepare runner for a package procedure inside context by path) - procedure pck_proc_in_ctx_by_path; - - --%context(get_schema_ut_packages) - - --%test(returns list of all unit test packages in given schema) - --%beforetest(create_ut3_suite) - --%aftertest(drop_ut3_suite) - procedure test_get_schema_ut_packages; - procedure create_ut3_suite; - procedure drop_ut3_suite; - - --%endcontext - - --%test(Adds suitepath to cache over 1k characters long) - --%beforetest(create_dummy_long_test_package) - --%aftertest(drop_dummy_long_test_package) - procedure add_new_long_test_package; - -end test_suite_manager; -/ diff --git a/test/core/test_ut_executable.pkb b/test/core/test_ut_executable.pkb deleted file mode 100644 index 1d2e74ff3..000000000 --- a/test/core/test_ut_executable.pkb +++ /dev/null @@ -1,109 +0,0 @@ -create or replace package body test_ut_executable is - - g_dbms_output_text varchar2(30) := 'Some output from procedure'; - - procedure exec_schema_package_proc is - l_executable ut3.ut_executable; - l_test ut3.ut_test; - l_result boolean; - begin - --Arrange - l_test := ut3.ut_test(a_object_name => 'test_ut_executable',a_name => 'test_ut_executable', a_line_no=> 1); - l_executable := ut3.ut_executable_test( null, 'test_ut_executable', 'passing_proc', ut3.ut_utils.gc_test_execute ); - --Act - l_result := l_executable.do_execute(l_test); - --Assert - ut.expect(l_result).to_be_true; - ut.expect(l_executable.serveroutput).to_be_null; - ut.expect(l_executable.get_error_stack_trace()).to_be_null; - end; - - procedure exec_package_proc_output is - l_executable ut3.ut_executable; - l_test ut3.ut_test; - l_result boolean; - begin - --Arrange - l_test := ut3.ut_test(a_object_name => 'test_ut_executable',a_name => 'test_ut_executable', a_line_no=> 1); - l_executable := ut3.ut_executable_test( user, 'test_ut_executable', 'output_proc', ut3.ut_utils.gc_test_execute ); - --Act - l_result := l_executable.do_execute(l_test); - --Assert - ut.expect(l_result).to_be_true; - ut.expect(l_executable.serveroutput).to_equal(to_clob(g_dbms_output_text||chr(10))); - ut.expect(l_executable.get_error_stack_trace()).to_be_null; - end; - - procedure exec_failing_proc is - l_executable ut3.ut_executable; - l_test ut3.ut_test; - l_result boolean; - begin - --Arrange - l_test := ut3.ut_test(a_object_name => 'test_ut_executable',a_name => 'test_ut_executable', a_line_no=> 1); - l_executable := ut3.ut_executable_test( user, 'test_ut_executable', 'throwing_proc', ut3.ut_utils.gc_test_execute ); - --Act - l_result := l_executable.do_execute(l_test); - --Assert - ut.expect(l_result).to_be_false; - ut.expect(l_executable.serveroutput).to_be_null; - ut.expect(l_executable.get_error_stack_trace()).to_be_like('ORA-06501: PL/SQL: program error%'); - end; - - procedure modify_stateful_package is - l_job_name varchar2(30) := 'recreate_stateful_package'; - l_cnt integer := 1; - pragma autonomous_transaction; - begin - dbms_scheduler.create_job( - job_name => l_job_name, - job_type => 'PLSQL_BLOCK', - job_action => q'/ - begin - execute immediate q'[ - create or replace package stateful_package as - g_state varchar2(3) := 'abc'; - end;]'; - end;/', - start_date => localtimestamp, - enabled => TRUE, - auto_drop => TRUE, - comments => 'one-time job' - ); - $if dbms_db_version.version >= 18 $then - dbms_session.sleep(0.4); - $else - dbms_lock.sleep(0.4); - $end - while l_cnt > 0 loop - select count(1) into l_cnt - from dba_scheduler_running_jobs srj - where srj.job_name = l_job_name; - end loop; - end; - - procedure form_name is - begin - ut.expect(ut3.ut_executable_test( user, ' package ', 'proc', null ).form_name()).to_equal(user||'.package.proc'); - ut.expect(ut3.ut_executable_test( null, 'package', ' proc ', null ).form_name()).to_equal('package.proc'); - ut.expect(ut3.ut_executable_test( null, 'proc', null, null ).form_name()).to_equal('proc'); - ut.expect(ut3.ut_executable_test( ' '||user||' ', 'proc', null, null ).form_name()).to_equal(user||'.proc'); - end; - - procedure passing_proc is - begin - null; - end; - - procedure output_proc is - begin - dbms_output.put_line(g_dbms_output_text); - end; - - procedure throwing_proc is - begin - raise program_error; - end; - -end; -/ diff --git a/test/core/test_ut_executable.pks b/test/core/test_ut_executable.pks deleted file mode 100644 index 4c11e5142..000000000 --- a/test/core/test_ut_executable.pks +++ /dev/null @@ -1,33 +0,0 @@ -create or replace package test_ut_executable is - - --%suite(ut_executable) - --%suitepath(utplsql.core) - - --%context(do_execute) - - --%test(Executes procedure in current schema when user was not provided) - procedure exec_schema_package_proc; - - --%test(Executes procedure and saves dbms_output) - procedure exec_package_proc_output; - - --%test(Executes a procedure raising exception, saves dbms_output and exception stack trace) - procedure exec_failing_proc; - - --%endcontext - - --%context(form_name) - - --%test(Builds a name for the executable test) - procedure form_name; - - --%endcontext - - procedure passing_proc; - - procedure output_proc; - - procedure throwing_proc; - -end; -/ diff --git a/test/core/test_ut_suite.pkb b/test/core/test_ut_suite.pkb deleted file mode 100644 index 04d75277a..000000000 --- a/test/core/test_ut_suite.pkb +++ /dev/null @@ -1,159 +0,0 @@ -create or replace package body test_ut_suite is - - procedure cleanup_package_state is - begin - ut_example_tests.g_number := null; - end; - - procedure disabled_suite is - l_suite ut3.ut_suite; - begin - --Arrange - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); - l_suite.path := 'ut_example_tests'; - l_suite.disabled_flag := ut3.ut_utils.boolean_to_int(true); - l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'set_g_number_0', ut3.ut_utils.gc_before_all)); - l_suite.after_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'add_1_to_g_number', ut3.ut_utils.gc_before_all)); - l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); - l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); - --Act - l_suite.do_execute(); - --Assert - ut.expect(ut_example_tests.g_number).to_be_null; - ut.expect(l_suite.result).to_equal(ut3.ut_utils.gc_disabled); - ut.expect(l_suite.results_count.disabled_count).to_equal(2); - ut.expect(l_suite.results_count.warnings_count).to_equal(0); - ut.expect(l_suite.results_count.success_count).to_equal(0); - ut.expect(l_suite.results_count.failure_count).to_equal(0); - ut.expect(l_suite.results_count.errored_count).to_equal(0); - end; - - procedure beforeall_errors is - l_suite ut3.ut_suite; - begin - --Arrange - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); - l_suite.path := 'ut_example_tests'; - l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'failing_procedure', ut3.ut_utils.gc_before_all)); - l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'set_g_number_0', a_line_no=> 1); - --Act - l_suite.do_execute(); - --Assert - ut.expect(ut_example_tests.g_number).to_be_null; - ut.expect(l_suite.result).to_equal(ut3.ut_utils.gc_error); - ut.expect(l_suite.results_count.disabled_count).to_equal(0); - ut.expect(l_suite.results_count.warnings_count).to_equal(0); - ut.expect(l_suite.results_count.success_count).to_equal(0); - ut.expect(l_suite.results_count.failure_count).to_equal(0); - ut.expect(l_suite.results_count.errored_count).to_equal(1); - end; - - procedure aftereall_errors is - l_suite ut3.ut_suite; - begin - --Arrange - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); - l_suite.path := 'ut_example_tests'; - l_suite.after_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'failing_procedure', ut3.ut_utils.gc_after_all)); - - l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'set_g_number_0', a_line_no=> 1); - l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); - --Act - l_suite.do_execute(); - --Assert - ut.expect(ut_example_tests.g_number).to_equal(1); - ut.expect(l_suite.result).to_equal(ut3.ut_utils.gc_success); - ut.expect(l_suite.results_count.disabled_count).to_equal(0); - ut.expect(l_suite.results_count.warnings_count).to_equal(1); - ut.expect(l_suite.results_count.success_count).to_equal(2); - ut.expect(l_suite.results_count.failure_count).to_equal(0); - ut.expect(l_suite.results_count.errored_count).to_equal(0); - end; - - procedure package_without_body is - l_suite ut3.ut_suite; - begin - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_WITHOUT_BODY', a_line_no=> 1); - l_suite.path := 'UT_WITHOUT_BODY'; - l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_name => 'ut_without_body',a_name => 'test1', a_line_no=> 1); - --Act - l_suite.do_execute(); - --Assert - ut.expect(l_suite.result).to_equal(ut3.ut_utils.gc_error); - end; - - procedure package_with_invalid_body is - l_suite ut3.ut_suite; - begin - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_WITH_INVALID_BODY', a_line_no=> 1); - l_suite.path := 'UT_WITH_INVALID_BODY'; - l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_name => 'ut_with_invalid_body',a_name => 'test1', a_line_no=> 1); - --Act - l_suite.do_execute(); - --Assert - ut.expect(l_suite.result).to_equal(ut3.ut_utils.gc_error); - end; - - procedure test_rollback_type(a_procedure_name varchar2, a_rollback_type integer, a_expectation ut3_latest_release.ut_matcher) is - l_suite ut3.ut_suite; - begin - --Arrange - execute immediate 'delete from ut$test_table'; - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_TRANSACTION_CONTROL', a_line_no=> 1); - l_suite.path := 'ut_transaction_control'; - l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_TRANSACTION_CONTROL', 'setup', ut3.ut_utils.gc_before_all)); - l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => USER, a_object_name => 'ut_transaction_control',a_name => a_procedure_name, a_line_no=> 1); - l_suite.set_rollback_type(a_rollback_type); - - --Act - l_suite.do_execute(); - - --Assert - ut.expect(core.get_value(q'[ut_transaction_control.count_rows('t')]')).to_( a_expectation ); - ut.expect(core.get_value(q'[ut_transaction_control.count_rows('s')]')).to_( a_expectation ); - end; - - procedure rollback_auto is - begin - test_rollback_type('test', ut3.ut_utils.gc_rollback_auto, equal(0) ); - end; - - procedure rollback_auto_on_failure is - begin - test_rollback_type('test_failure', ut3.ut_utils.gc_rollback_auto, equal(0) ); - end; - - procedure rollback_manual is - begin - test_rollback_type('test', ut3.ut_utils.gc_rollback_manual, be_greater_than(0) ); - end; - - procedure rollback_manual_on_failure is - begin - test_rollback_type('test_failure', ut3.ut_utils.gc_rollback_manual, be_greater_than(0) ); - end; - - procedure trim_transaction_invalidators is - l_suite ut3.ut_suite; - begin - --arrange - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); - for i in 1 .. 100 loop - l_suite.add_transaction_invalidator('schema_name.package_name.procedure_name'||i); - end loop; - --Act - l_suite.rollback_to_savepoint('dummy_savepoint'); - --Assert - ut.expect(l_suite.warnings.count).to_equal(1); - end; - -end; -/ \ No newline at end of file diff --git a/test/core/test_ut_suite.pks b/test/core/test_ut_suite.pks deleted file mode 100644 index cc4de8528..000000000 --- a/test/core/test_ut_suite.pks +++ /dev/null @@ -1,40 +0,0 @@ -create or replace package test_ut_suite is - - --%suite(ut_suite) - --%suitepath(utplsql.core) - - --%beforeeach - procedure cleanup_package_state; - - --%test(Disabled flag skips tests execution in suite) - procedure disabled_suite; - - --%test(Marks each test as errored if beforeall raises exception) - procedure beforeall_errors; - - --%test(Reports warnings for each test if afterall raises exception) - procedure aftereall_errors; - - --%test(Fails all tests in package when package has no body) - procedure package_without_body; - - --%test(Fails all tests in package when package body is invalid) - procedure package_with_invalid_body; - - --%test(Performs automatic rollback after a suite) - procedure rollback_auto; - - --%test(Performs automatic rollback after a suite even if test fails) - procedure rollback_auto_on_failure; - - --%test(rollback(manual) - disables automatic rollback after a suite) - procedure rollback_manual; - - --%test(rollback(manual) - disables automatic rollback after a suite even if test fails) - procedure rollback_manual_on_failure; - - --%test(Transaction invalidators list is trimmed in warnings when too long) - procedure trim_transaction_invalidators; - -end; -/ diff --git a/test/core/test_ut_test.pkb b/test/core/test_ut_test.pkb deleted file mode 100644 index b521d6841..000000000 --- a/test/core/test_ut_test.pkb +++ /dev/null @@ -1,697 +0,0 @@ -create or replace package body test_ut_test is - - procedure cleanup_package_state is - begin - ut_example_tests.g_number := null; - end; - - procedure disabled_test is - l_suite ut3.ut_suite; - l_test ut3.ut_test; - begin - --Arrange - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); - l_suite.path := 'ut_example_tests'; - l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'set_g_number_0', ut3.ut_utils.gc_before_all)); - - l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); - l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 2); - l_suite.items(l_suite.items.last).disabled_flag := ut3.ut_utils.boolean_to_int(true); - --Act - l_suite.do_execute(); - --Assert - ut.expect(ut_example_tests.g_number).to_equal(1); - ut.expect(l_suite.result).to_equal(ut3.ut_utils.gc_success); - ut.expect(l_suite.results_count.disabled_count).to_equal(1); - ut.expect(l_suite.results_count.warnings_count).to_equal(0); - ut.expect(l_suite.results_count.success_count).to_equal(1); - ut.expect(l_suite.results_count.failure_count).to_equal(0); - ut.expect(l_suite.results_count.errored_count).to_equal(0); - end; - - procedure aftertest_errors is - l_suite ut3.ut_suite; - l_test ut3.ut_test; - begin - --Arrange - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); - l_suite.path := 'ut_example_tests'; - l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'set_g_number_0', ut3.ut_utils.gc_before_all)); - - l_test := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); - l_test.before_test_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'add_1_to_g_number', ut3.ut_utils.gc_before_test)); - l_test.after_test_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'failing_procedure', ut3.ut_utils.gc_after_test)); - l_suite.items.extend; - l_suite.items(l_suite.items.last) := l_test; - l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); - --Act - l_suite.do_execute(); - --Assert - ut.expect(ut_example_tests.g_number).to_equal(3); - ut.expect(l_suite.result).to_equal(ut3.ut_utils.gc_error); - ut.expect(l_suite.results_count.disabled_count).to_equal(0); - ut.expect(l_suite.results_count.warnings_count).to_equal(0); - ut.expect(l_suite.results_count.success_count).to_equal(1); - ut.expect(l_suite.results_count.failure_count).to_equal(0); - ut.expect(l_suite.results_count.errored_count).to_equal(1); - end; - - procedure aftereach_errors is - l_suite ut3.ut_suite; - l_test ut3.ut_test; - begin - --Arrange - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); - l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'set_g_number_0', ut3.ut_utils.gc_before_all)); - l_test := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); - l_test.before_each_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'add_1_to_g_number', ut3.ut_utils.gc_before_each)); - l_test.after_each_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'failing_procedure', ut3.ut_utils.gc_after_each)); - l_suite.items.extend; - l_suite.items(l_suite.items.last) := l_test; - l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); - --Act - l_suite.do_execute(); - --Assert - ut.expect(ut_example_tests.g_number).to_equal(3); - ut.expect(l_suite.result).to_equal(ut3.ut_utils.gc_error); - ut.expect(l_suite.results_count.disabled_count).to_equal(0); - ut.expect(l_suite.results_count.warnings_count).to_equal(0); - ut.expect(l_suite.results_count.success_count).to_equal(1); - ut.expect(l_suite.results_count.failure_count).to_equal(0); - ut.expect(l_suite.results_count.errored_count).to_equal(1); - end; - - procedure beforetest_errors is - l_suite ut3.ut_suite; - l_test ut3.ut_test; - begin - --Arrange - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); - l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'set_g_number_0', ut3.ut_utils.gc_before_all)); - l_test := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); - l_test.before_test_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'failing_procedure', ut3.ut_utils.gc_before_test)); - l_test.after_test_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'add_1_to_g_number', ut3.ut_utils.gc_after_test)); - l_suite.items.extend; - l_suite.items(l_suite.items.last) := l_test; - l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); - --Act - l_suite.do_execute(); - --Assert - ut.expect(ut_example_tests.g_number).to_equal(2); - ut.expect(l_suite.result).to_equal(ut3.ut_utils.gc_error); - ut.expect(l_suite.results_count.disabled_count).to_equal(0); - ut.expect(l_suite.results_count.warnings_count).to_equal(0); - ut.expect(l_suite.results_count.success_count).to_equal(1); - ut.expect(l_suite.results_count.failure_count).to_equal(0); - ut.expect(l_suite.results_count.errored_count).to_equal(1); - end; - - procedure beforeeach_errors is - l_suite ut3.ut_suite; - l_test ut3.ut_test; - begin - --Arrange - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); - l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'set_g_number_0', ut3.ut_utils.gc_before_all)); - l_test := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); - l_test.before_each_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'failing_procedure', ut3.ut_utils.gc_before_each)); - l_test.after_each_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'add_1_to_g_number', ut3.ut_utils.gc_after_each)); - l_suite.items.extend; - l_suite.items(l_suite.items.last) := l_test; - l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); - --Act - l_suite.do_execute(); - --Assert - ut.expect(ut_example_tests.g_number).to_equal(2); - ut.expect(l_suite.result).to_equal(ut3.ut_utils.gc_error); - ut.expect(l_suite.results_count.disabled_count).to_equal(0); - ut.expect(l_suite.results_count.warnings_count).to_equal(0); - ut.expect(l_suite.results_count.success_count).to_equal(1); - ut.expect(l_suite.results_count.failure_count).to_equal(0); - ut.expect(l_suite.results_count.errored_count).to_equal(1); - end; - - procedure after_each_executed is - --Arrange - l_test ut3.ut_test := ut3.ut_test( - a_object_name => 'ut_example_tests', - a_name => 'set_g_number_0', - a_line_no => null - ); - begin - l_test.after_each_list := ut3.ut_executables(ut3.ut_executable(user, 'ut_example_tests', 'add_1_to_g_number', ut3.ut_utils.gc_after_each)); - --Act - l_test.do_execute(); - --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_success); - ut.expect(ut_example_tests.g_number).to_equal(1); - end; - - procedure after_each_proc_name_invalid is - --Arrange - l_test ut3.ut_test := ut3.ut_test( - a_object_name => 'ut_example_tests', - a_name => 'set_g_number_0', - a_line_no => null - ); - begin - l_test.after_each_list := ut3.ut_executables( - ut3.ut_executable(user, 'ut_example_tests', 'invalid setup name', ut3.ut_utils.gc_after_each) - ); - --Act - l_test.do_execute(); - --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); - ut.expect(ut_example_tests.g_number).to_equal(0); - end; - - procedure after_each_procedure_name_null is - --Arrange - l_test ut3.ut_test := ut3.ut_test( - a_object_name => 'ut_example_tests', - a_name => 'set_g_number_0', - a_line_no => null - ); - begin - l_test.after_each_list := ut3.ut_executables( - ut3.ut_executable(user, 'ut_example_tests', null, ut3.ut_utils.gc_after_each) - ); - --Act - l_test.do_execute(); - --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); - ut.expect(ut_example_tests.g_number).to_equal(0); - end; - - procedure create_app_info_package is - pragma autonomous_transaction; - begin - execute immediate q'[create or replace package ut_output_tests - as - --%suite - - gv_before_all_client_info varchar2(200); - gv_before_each_client_info varchar2(200); - gv_before_test_client_info varchar2(200); - gv_after_test_client_info varchar2(200); - gv_after_each_client_info varchar2(200); - gv_after_all_client_info varchar2(200); - - --%test - --%beforetest(before_test) - --%aftertest(after_test) - procedure the_test; - - --%beforeall - procedure beforeall; - - --%beforeeach - procedure beforeeach; - - procedure before_test; - procedure after_test; - - --%aftereach - procedure aftereach; - - --%afterall - procedure afterall; - - end;]'; - execute immediate q'[create or replace package body ut_output_tests - as - - procedure the_test - as - l_module_name varchar2(4000); - l_action_name varchar2(4000); - l_client_info varchar2(4000); - begin - --Generate empty output - dbms_output.put_line(''); - ut.expect(1,'Test 1 Should Pass').to_equal(1); - dbms_application_info.read_module(module_name => l_module_name, action_name => l_action_name); - dbms_application_info.read_client_info(l_client_info); - ut.expect(l_module_name).to_equal('utPLSQL'); - ut.expect(l_action_name).to_be_like('ut_output_tests'); - ut.expect(l_client_info).to_be_like('the_test'); - end; - - procedure beforeall is - begin - dbms_application_info.read_client_info(gv_before_all_client_info); - end; - - procedure beforeeach is - begin - dbms_application_info.read_client_info(gv_before_each_client_info); - end; - - procedure before_test is - begin - dbms_application_info.read_client_info(gv_before_test_client_info); - end; - procedure after_test is - begin - dbms_application_info.read_client_info(gv_after_test_client_info); - end; - - procedure aftereach is - begin - dbms_application_info.read_client_info(gv_after_each_client_info); - end; - - procedure afterall is - begin - dbms_application_info.read_client_info(gv_after_all_client_info); - end; - - end;]'; - end; - - procedure drop_app_info_package is - pragma autonomous_transaction; - begin - execute immediate q'[drop package ut_output_tests]'; - end; - - procedure application_info_on_execution is - l_output_data ut3.ut_varchar2_list; - l_output clob; - function get_test_value(a_variable_name varchar2) return varchar2 is - l_result varchar2(4000); - begin - execute immediate 'begin :i := ut_output_tests.'||a_variable_name||'; end;' using out l_result; - return l_result; - end; - begin - --act - select * bulk collect into l_output_data - from table(ut3.ut.run('ut_output_tests')); - l_output := ut3.ut_utils.table_to_clob(l_output_data); - --assert - - ut.expect(get_test_value('gv_before_all_client_info')).to_equal('beforeall'); - ut.expect(get_test_value('gv_before_each_client_info')).to_equal('beforeeach'); - ut.expect(get_test_value('gv_before_test_client_info')).to_equal('before_test'); - ut.expect(get_test_value('gv_after_test_client_info')).to_equal('after_test'); - ut.expect(get_test_value('gv_after_each_client_info')).to_equal('aftereach'); - ut.expect(get_test_value('gv_after_all_client_info')).to_equal('afterall'); - ut.expect(l_output).to_be_like('%0 failed, 0 errored, 0 disabled, 0 warning(s)%'); - end; - - procedure before_each_executed is - --Arrange - l_test ut3.ut_test := ut3.ut_test( - a_object_name => 'ut_example_tests', - a_name => 'add_1_to_g_number', - a_line_no => null - ); - begin - l_test.before_each_list := ut3.ut_executables(ut3.ut_executable(user, 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_each)); - --Act - l_test.do_execute(); - --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_success); - ut.expect(ut_example_tests.g_number).to_equal(1); - end; - - - procedure before_each_proc_name_invalid is - --Arrange - l_test ut3.ut_test := ut3.ut_test( - a_object_name => 'ut_example_tests', - a_name => 'set_g_number_0', - a_line_no => null - ); - begin - l_test.before_each_list := ut3.ut_executables( - ut3.ut_executable(user, 'ut_example_tests', 'invalid setup name', ut3.ut_utils.gc_before_each) - ); - --Act - l_test.do_execute(); - --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); - ut.expect(ut_example_tests.g_number).to_be_null; - end; - - procedure before_each_proc_name_null is - --Arrange - l_test ut3.ut_test := ut3.ut_test( - a_object_name => 'ut_example_tests', - a_name => 'set_g_number_0', - a_line_no => null - ); - begin - l_test.before_each_list := ut3.ut_executables( - ut3.ut_executable(user, 'ut_example_tests', null, ut3.ut_utils.gc_before_each) - ); - --Act - l_test.do_execute(); - --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); - ut.expect(ut_example_tests.g_number).to_be_null; - end; - - procedure ignore_savepoint_exception is - pragma autonomous_transaction; - --Arrange - l_test ut3.ut_test := ut3.ut_test( - a_object_name => 'ut_example_tests', - a_name => 'ut_commit_test', - a_line_no => null - ); - begin - l_test.rollback_type := ut3.ut_utils.gc_rollback_auto; - --Act - l_test.do_execute(); - --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_success); - end; - - procedure owner_name_invalid is - --Arrange - l_test ut3.ut_test := ut3.ut_test( - a_object_owner => 'invalid owner name', - a_object_name => 'ut_example_tests', - a_name => 'set_g_number_0', - a_line_no => null - ); - begin - --Act - l_test.do_execute(); - --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); - end; - - procedure owner_name_null is - --Arrange - l_test ut3.ut_test := ut3.ut_test( - a_object_owner => null, - a_object_name => 'ut_example_tests', - a_name => 'set_g_number_0', - a_line_no => null - ); - begin - --Act - l_test.do_execute(); - --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_success); - ut.expect(ut_example_tests.g_number).to_equal(0); - end; - - - procedure create_invalid_package is - pragma autonomous_transaction; - begin - execute immediate 'create or replace package invalid_package is - v_variable non_existing_type; - procedure ut_exampletest; - end;'; - exception when others then - null; - end; - - procedure drop_invalid_package is - pragma autonomous_transaction; - begin - execute immediate 'drop package invalid_package'; - exception when others then - null; - end; - - procedure package_in_invalid_state is - --Arrange - l_test ut3.ut_test := ut3.ut_test( - a_object_name => 'invalid_package', - a_name => 'ut_exampletest', - a_line_no => null - ); - begin - --Act - l_test.do_execute(); - --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); - end; - - procedure package_name_invalid is - --Arrange - l_test ut3.ut_test := ut3.ut_test( - a_object_name => 'invalid package name', - a_name => 'set_g_number_0', - a_line_no => null - ); - begin - --Act - l_test.do_execute(); - --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); - end; - - procedure package_name_null is - --Arrange - l_test ut3.ut_test := ut3.ut_test( - a_object_name => null, - a_name => 'set_g_number_0', - a_line_no => null - ); - begin - --Act - l_test.do_execute(); - --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); - end; - - procedure procedure_name_invalid is - --Arrange - l_test ut3.ut_test := ut3.ut_test( - a_object_name => 'ut_example_tests', - a_name => 'invalid procedure name', - a_line_no => null - ); - begin - --Act - l_test.do_execute(); - --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); - end; - - procedure procedure_name_null is - --Arrange - l_test ut3.ut_test := ut3.ut_test( - a_object_name => 'ut_example_tests', - a_name => null, - a_line_no => null - ); - begin - --Act - l_test.do_execute(); - --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); - end; - - procedure before_test_executed is - --Arrange - l_test ut3.ut_test := ut3.ut_test( - a_object_name => 'ut_example_tests', - a_name => 'add_1_to_g_number', - a_line_no => null - ); - begin - l_test.before_test_list := ut3.ut_executables(ut3.ut_executable(user, 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_test)); - --Act - l_test.do_execute(); - --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_success); - ut.expect(ut_example_tests.g_number).to_equal(1); - end; - - procedure before_test_proc_name_invalid is - --Arrange - l_test ut3.ut_test := ut3.ut_test( - a_object_name => 'ut_example_tests', - a_name => 'set_g_number_0', - a_line_no => null - ); - begin - l_test.before_test_list := ut3.ut_executables( - ut3.ut_executable(user, 'ut_example_tests', 'invalid setup name', ut3.ut_utils.gc_before_test) - ); - --Act - l_test.do_execute(); - --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); - ut.expect(ut_example_tests.g_number).to_be_null; - end; - - procedure before_test_proc_name_null is - --Arrange - l_test ut3.ut_test := ut3.ut_test( - a_object_name => 'ut_example_tests', - a_name => 'set_g_number_0', - a_line_no => null - ); - begin - l_test.before_test_list := ut3.ut_executables( - ut3.ut_executable(user, 'ut_example_tests', null, ut3.ut_utils.gc_before_test) - ); - --Act - l_test.do_execute(); - --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); - ut.expect(ut_example_tests.g_number).to_be_null; - end; - - procedure after_test_executed is - --Arrange - l_test ut3.ut_test := ut3.ut_test( - a_object_name => 'ut_example_tests', - a_name => 'set_g_number_0', - a_line_no => null - ); - begin - l_test.after_test_list := ut3.ut_executables(ut3.ut_executable(user, 'ut_example_tests', 'add_1_to_g_number', ut3.ut_utils.gc_after_test)); - --Act - l_test.do_execute(); - --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_success); - ut.expect(ut_example_tests.g_number).to_equal(1); - end; - - procedure after_test_proce_name_invalid is - --Arrange - l_test ut3.ut_test := ut3.ut_test( - a_object_name => 'ut_example_tests', - a_name => 'set_g_number_0', - a_line_no => null - ); - begin - l_test.after_test_list := ut3.ut_executables( - ut3.ut_executable(user, 'ut_example_tests', 'invalid procedure name', ut3.ut_utils.gc_after_test) - ); - --Act - l_test.do_execute(); - --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); - ut.expect(ut_example_tests.g_number).to_equal(0); - end; - - procedure after_test_proc_name_null is - --Arrange - l_test ut3.ut_test := ut3.ut_test( - a_object_name => 'ut_example_tests', - a_name => 'set_g_number_0', - a_line_no => null - ); - begin - l_test.after_test_list := ut3.ut_executables( - ut3.ut_executable(user, 'ut_example_tests', null, ut3.ut_utils.gc_after_test) - ); - --Act - l_test.do_execute(); - --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); - ut.expect(ut_example_tests.g_number).to_equal(0); - end; - - procedure create_output_package is - pragma autonomous_transaction; - begin - execute immediate q'[create or replace package ut_output_tests - as - --%suite - - --%beforeeach - procedure beforeeach; - - --%aftereach - procedure aftereach; - - --%test - --%beforetest(beforetest) - --%aftertest(aftertest) - procedure ut_passing_test; - - procedure beforetest; - - procedure aftertest; - - --%beforeall - procedure beforeall; - --%afterall - procedure afterall; - - end;]'; - execute immediate q'[create or replace package body ut_output_tests - as - - procedure beforetest is - begin - dbms_output.put_line(''); - end; - - procedure aftertest is - begin - dbms_output.put_line(''); - end; - - procedure beforeeach is - begin - dbms_output.put_line(''); - end; - - procedure aftereach is - begin - dbms_output.put_line(''); - end; - - procedure ut_passing_test is - begin - dbms_output.put_line(''); - ut.expect(1,'Test 1 Should Pass').to_equal(1); - end; - - procedure beforeall is - begin - dbms_output.put_line(''); - end; - - procedure afterall is - begin - dbms_output.put_line(''); - end; - - end;]'; - exception when others then - null; - end; - - procedure drop_output_package is - pragma autonomous_transaction; - begin - execute immediate 'drop package ut_output_tests'; - exception when others then - null; - end; - - procedure test_output_gathering is - l_output_data ut3.ut_varchar2_list; - l_output clob; - begin - select * bulk collect into l_output_data - from table(ut3.ut.run('ut_output_tests')); - l_output := ut3.ut_utils.table_to_clob(l_output_data); - ut.expect(l_output).to_be_like( - '%%%%%%%%1 tests, 0 failed, 0 errored%' - ); - end; - - -end; -/ diff --git a/test/core/test_ut_test.pks b/test/core/test_ut_test.pks deleted file mode 100644 index ee888ecd3..000000000 --- a/test/core/test_ut_test.pks +++ /dev/null @@ -1,94 +0,0 @@ -create or replace package test_ut_test is - - --%suite(ut_test) - --%suitepath(utplsql.core) - - --%beforeeach - procedure cleanup_package_state; - - --%test(Disabled flag for a test skips the tests execution in suite) - procedure disabled_test; - - --%test(Marks test as errored if aftertest raises exception) - procedure aftertest_errors; - - --%test(Marks each test as errored if aftereach raises exception) - procedure aftereach_errors; - - --%test(Marks test as errored if beforetest raises exception) - procedure beforetest_errors; - - --%test(Marks each test as errored if beforeeach raises exception) - procedure beforeeach_errors; - - - --%context(executables in test) - - --%test(Executes aftereach procedure) - procedure after_each_executed; - - --%test(Fails test when aftereach procedure name invalid) - procedure after_each_proc_name_invalid; - --%test(Tails test when aftereach procedure name null) - procedure after_each_procedure_name_null; - - procedure create_app_info_package; - procedure drop_app_info_package; - --%beforetest(create_app_info_package) - --%aftertest(drop_app_info_package) - --%test(Sets application_info on execution of individual items) - procedure application_info_on_execution; - - --%test(Executes beforeeach procedure) - procedure before_each_executed; - --%test(Fails test when beforeeach procedure name invalid) - procedure before_each_proc_name_invalid; - --%test(Fails test when beforeeach procedure name null) - procedure before_each_proc_name_null; - --%test(Does not raise exception when rollback to savepoint fails) - procedure ignore_savepoint_exception; - --%test(Fails when owner name invalid) - procedure owner_name_invalid; - --%test(Runs test as current schema when owner name null) - procedure owner_name_null; - - procedure create_invalid_package; - procedure drop_invalid_package; - --%beforetest(create_app_info_package) - --%aftertest(drop_app_info_package) - --%test(Fails the test that references package with compilation errors) - procedure package_in_invalid_state; - --%test(Fails the test when package name is invalid) - procedure package_name_invalid; - --%test(Fails the test when package name is null) - procedure package_name_null; - --%test(Fails the test when procedure name invalid) - procedure procedure_name_invalid; - --%test(Fails the test when procedure name null) - procedure procedure_name_null; - - - --%test(Executes befroretest procedure) - procedure before_test_executed; - --%test(Fails test when befroretest procedure name invalid) - procedure before_test_proc_name_invalid; - --%test(Fails test when befroretest procedure name is null) - procedure before_test_proc_name_null; - --%test(Executes aftertest procedure) - procedure after_test_executed; - --%test(Fails test when aftertest procedure name invalid) - procedure after_test_proce_name_invalid; - --%test(Fails test when aftertest procedure name is null) - procedure after_test_proc_name_null; - - procedure create_output_package; - procedure drop_output_package; - --%beforetest(create_output_package) - --%aftertest(drop_output_package) - --%test(Test output gathering) - procedure test_output_gathering; - - --%endcontext - -end; -/ diff --git a/test/core/test_ut_utils.pkb b/test/core/test_ut_utils.pkb deleted file mode 100644 index 326f5a49b..000000000 --- a/test/core/test_ut_utils.pkb +++ /dev/null @@ -1,436 +0,0 @@ -create or replace package body test_ut_utils is - - gv_nls_value nls_session_parameters.value%type; - - gc_delimiter varchar2(1) := get_numeric_delimiter(); - - function get_numeric_delimiter return varchar2 is - l_result varchar2(1); - begin - select substr(value, 1, 1) into l_result from nls_session_parameters t where t.parameter = 'NLS_NUMERIC_CHARACTERS'; - return l_result; - end; - - function clob_to_blob(p_clob clob) return blob is - l_blob blob; - l_dest_offset integer := 1; - l_source_offset integer := 1; - l_lang_context integer := dbms_lob.default_lang_ctx; - l_warning integer := dbms_lob.warn_inconvertible_char; - begin - dbms_lob.createtemporary(l_blob, true); - dbms_lob.converttoblob( - dest_lob =>l_blob, - src_clob =>p_clob, - amount =>DBMS_LOB.LOBMAXSIZE, - dest_offset =>l_dest_offset, - src_offset =>l_source_offset, - blob_csid =>DBMS_LOB.DEFAULT_CSID, - lang_context=>l_lang_context, - warning =>l_warning - ); - return l_blob; - end; - - - procedure common_clob_to_table_exec(p_clob varchar2, p_delimiter varchar2, p_expected_list ut3.ut_varchar2_list, p_limit number) is - begin - execute immediate 'declare - l_clob clob := '''||p_clob||'''; - l_delimiter varchar2(1) := '''||p_delimiter||'''; - l_expected ut3.ut_varchar2_list := :p_expected_list; - l_result ut3.ut_varchar2_list; - l_limit integer := '||p_limit||q'[; - l_result_str varchar2(32767); - l_errors integer := 0; - function compare_element(a_element_id integer, a_expected ut3.ut_varchar2_list, a_actual ut3.ut_varchar2_list) return integer is - begin - if a_expected.exists(a_element_id) and a_actual.exists(a_element_id) then - if a_expected(a_element_id) = a_actual(a_element_id) or a_expected(a_element_id) is null and a_actual(a_element_id) is null then - return 0; - else - dbms_output.put('a_expected('||a_element_id||')='||a_expected(a_element_id)||' | a_actual('||a_element_id||')='||a_actual(a_element_id)); - end if; - end if; - if not a_expected.exists(a_element_id) then - dbms_output.put('a_expected('||a_element_id||') does not exist '); - end if; - if not a_actual.exists(a_element_id) then - dbms_output.put('a_actual('||a_element_id||') does not exist '); - end if; - dbms_output.put_line(null); - return 1; - end; -begin ---Act - select column_value bulk collect into l_result from table( ut3.ut_utils.clob_to_table(l_clob, l_limit, l_delimiter) ); - for i in 1 .. l_result.count loop - l_result_str := l_result_str||''''||l_result(i)||''''||l_delimiter; - end loop; - l_result_str := rtrim(l_result_str,l_delimiter); ---Assert - for i in 1 .. greatest(l_expected.count, l_result.count) loop - l_errors := l_errors + compare_element(i, l_expected, l_result); - end loop; - ut.expect(l_errors).to_equal(0); -end;]' using p_expected_list; - end; - - procedure test_clob_to_table is - begin - common_clob_to_table_exec('a,b,c,d', ',', ut3.ut_varchar2_list('a','b','c','d'), 1000); - common_clob_to_table_exec( '', ',', ut3.ut_varchar2_list(), 1000); - common_clob_to_table_exec( '1,b,c,d', '', ut3.ut_varchar2_list('1,b,','c,d'), 4); - common_clob_to_table_exec( 'abcdefg,hijk,axa,a', ',', ut3.ut_varchar2_list('abc','def','g','hij','k','axa','a'), 3); - common_clob_to_table_exec( ',a,,c,d,', ',', ut3.ut_varchar2_list('','a','','c','d',''), 1000); - end; - - procedure test_test_result_to_char is - begin - ut.expect(ut3.ut_utils.test_result_to_char(-1),'test unknown').to_equal('Unknown(-1)'); - ut.expect(ut3.ut_utils.test_result_to_char(null),'test unknown').to_equal('Unknown(NULL)'); - ut.expect(ut3.ut_utils.test_result_to_char(ut3.ut_utils.gc_success),'test unknown').to_equal(ut3.ut_utils.gc_success_char); - end; - - procedure to_string_emptyblob is - begin - ut.expect(ut3.ut_data_value_blob(empty_blob()).to_string()).to_equal('EMPTY'); - end; - - procedure to_string_emptyclob is - begin - ut.expect(ut3.ut_data_value_clob(empty_clob()).to_string()).to_equal('EMPTY'); - end; - - procedure to_string_nullblob is - begin - ut.expect(ut3.ut_data_value_blob(null).to_string()).to_equal('NULL'); - end; - - procedure to_string_nullclob is - begin - ut.expect(ut3.ut_data_value_clob(null).to_string()).to_equal('NULL'); - end; - - procedure to_string_nulldate is - begin - ut.expect(ut3.ut_data_value_date(null).to_string()).to_equal('NULL'); - end; - - procedure to_string_nullnumber is - begin - ut.expect(ut3.ut_data_value_number(null).to_string()).to_equal('NULL'); - end; - - procedure to_string_nulltimestamp is - begin - ut.expect(ut3.ut_data_value_timestamp(null).to_string()).to_equal('NULL'); - end; - - procedure to_string_nulltimestamp_ltz is - begin - ut.expect(ut3.ut_data_value_timestamp_ltz(null).to_string()).to_equal('NULL'); - end; - - procedure to_string_nulltimestamp_tz is - begin - ut.expect(ut3.ut_data_value_timestamp_tz(null).to_string()).to_equal('NULL'); - end; - - procedure to_string_nullvarchar2 is - begin - ut.expect(ut3.ut_data_value_varchar2(null).to_string()).to_equal('NULL'); - end; - - procedure to_string_blob is - l_text varchar2(32767) := 'A test char'; - l_value blob := utl_raw.cast_to_raw(l_text); - l_expected varchar2(32767) := ''''||rawtohex(l_value)||''''; - begin - ut.expect(ut3.ut_data_value_blob(l_value).to_string()).to_equal(l_expected); - end; - - procedure to_string_clob is - l_value clob := 'A test char'; - l_expected varchar2(32767) := ''''||l_value||''''; - begin - ut.expect(ut3.ut_data_value_clob(l_value).to_string()).to_equal(l_expected); - end; - - procedure to_string_date is - l_value date := to_date('2016-12-31 23:59:59', 'yyyy-mm-dd hh24:mi:ss'); - l_expected varchar2(100) := '2016-12-31T23:59:59'; - begin - ut.expect(ut3.ut_data_value_date(l_value).to_string()).to_equal(l_expected); - end; - - procedure to_string_timestamp is - l_value timestamp(9) := to_timestamp('2016-12-31 23:59:59.123456789', 'yyyy-mm-dd hh24:mi:ss.ff'); - l_expected varchar2(100) := '2016-12-31T23:59:59'||gc_delimiter||'123456789'; - begin - ut.expect(ut3.ut_data_value_timestamp(l_value).to_string()).to_equal(l_expected); - end; - - procedure to_string_timestamp_ltz is - l_value timestamp(9) with local time zone := to_timestamp('2016-12-31 23:59:59.123456789', 'yyyy-mm-dd hh24:mi:ss.ff'); - l_expected varchar2(100) := '2016-12-31T23:59:59'||gc_delimiter||'123456789'; - begin - ut.expect(ut3.ut_data_value_timestamp_ltz(l_value).to_string()).to_equal(l_expected); - end; - - procedure to_string_timestamp_tz is - l_value timestamp(9) with time zone := to_timestamp_tz('2016-12-31 23:59:59.123456789 -8:00', 'yyyy-mm-dd hh24:mi:ss.ff tzh:tzm'); - l_expected varchar2(100) := '2016-12-31T23:59:59'||gc_delimiter||'123456789 -08:00'; - begin - ut.expect(ut3.ut_data_value_timestamp_tz(l_value).to_string()).to_equal(l_expected); - end; - - procedure to_string_varchar2 is - l_value varchar2(20) := 'A test char'; - l_expected varchar2(100) := ''''||l_value||''''; - begin - ut.expect(ut3.ut_data_value_varchar2(l_value).to_string()).to_equal(l_expected); - end; - - procedure to_string_verybigblob is - l_text clob := lpad('A test char',32767,'1')||lpad('1',32767,'1'); - l_value blob; - begin - l_value := clob_to_blob(l_text); - ut.expect(length(ut3.ut_data_value_blob(l_value).to_string())).to_equal(ut3.ut_utils.gc_max_output_string_length); - ut.expect(ut3.ut_data_value_blob(l_value).to_string()).to_be_like('%'||ut3.ut_utils.gc_more_data_string); - end; - - procedure to_string_verybigclob is - l_value clob := lpad('A test char',32767,'1')||lpad('1',32767,'1'); - begin - ut.expect(length(ut3.ut_data_value_clob(l_value).to_string())).to_equal(ut3.ut_utils.gc_max_output_string_length); - ut.expect(ut3.ut_data_value_clob(l_value).to_string()).to_be_like('%'||ut3.ut_utils.gc_more_data_string); - end; - - procedure to_string_verybignumber is - l_value number := 1234567890123456789012345678901234567890; - l_expected varchar2(100) := '1234567890123456789012345678901234567890'; - begin - ut.expect(ut3.ut_data_value_number(l_value).to_string()).to_equal(l_expected); - end; - - procedure to_string_verybigvarchar2 is - l_value varchar2(32767) := lpad('A test char',32767,'1'); - l_result varchar2(32767); - begin - ut.expect(length(ut3.ut_data_value_varchar2(l_value).to_string())).to_equal(ut3.ut_utils.gc_max_output_string_length); - ut.expect(ut3.ut_data_value_varchar2(l_value).to_string()).to_be_like('%'||ut3.ut_utils.gc_more_data_string); - end; - - procedure to_string_verysmallnumber is - l_value number := 0.123456789012345678901234567890123456789; - l_expected varchar2(100) := gc_delimiter||'123456789012345678901234567890123456789'; - begin - ut.expect(ut3.ut_data_value_number(l_value).to_string()).to_equal(l_expected); - end; - - procedure test_table_to_clob is - procedure exec_table_to_clob(a_list ut3.ut_varchar2_list, a_delimiter varchar2, a_expected clob) is - l_result clob; - begin - l_result := ut3.ut_utils.table_to_clob(a_list, a_delimiter); - - ut.expect(l_result).to_equal(a_expected, a_nulls_are_equal => true); - end; - begin - exec_table_to_clob(null, ',', ''); - exec_table_to_clob(ut3.ut_varchar2_list(), ',', ''); - exec_table_to_clob(ut3.ut_varchar2_list('a', 'b', 'c', 'd'), ',', 'a,b,c,d'); - exec_table_to_clob(ut3.ut_varchar2_list('1,b,', 'c,d'), ',', '1,b,,c,d'); - exec_table_to_clob(ut3.ut_varchar2_list('', 'a', '', 'c', 'd', ''), ',', ',a,,c,d,'); - end; - - procedure test_append_with_multibyte is - l_lines sys.dbms_preprocessor.source_lines_t; - l_result clob; - begin - l_lines := sys.dbms_preprocessor.get_post_processed_source( - object_type => 'PACKAGE', - schema_name => user, - object_name => 'TST_CHARS' - ); - - for i in 1..l_lines.count loop - l_result := null; - ut3.ut_utils.append_to_clob(l_result, l_lines(i)); - - --Assert - ut.expect(dbms_lob.getlength(l_result),'Error for index '||i).to_equal(dbms_lob.getlength(l_lines(i))); - end loop; - end; - - procedure setup_append_with_multibyte is - pragma autonomous_transaction; - begin - select value into gv_nls_value from nls_session_parameters where parameter = 'NLS_DATE_LANGUAGE'; - execute immediate 'alter session set nls_date_language=ENGLISH'; - execute immediate 'create or replace package tst_chars as --- 2) Status of the process = 😡PE😡 with no linked data -end;'; - execute immediate 'alter session set nls_date_language=RUSSIAN'; - - end; - procedure clean_append_with_multibyte is - pragma autonomous_transaction; - begin - execute immediate 'alter session set nls_date_language='||gv_nls_value; - execute immediate 'drop package tst_chars'; - end; - - procedure test_clob_to_table_multibyte is - l_varchar2_byte_limit integer := 32767; - l_workaround_byte_limit integer := 8191; - l_singlebyte_string_max_size varchar2(32767 char) := rpad('x',l_varchar2_byte_limit,'x'); - l_twobyte_character char(1 char) := '�?'; - l_clob_multibyte clob := l_twobyte_character||l_singlebyte_string_max_size; --here we have 32769(2+32767) bytes and 32768 chars - l_expected ut3.ut_varchar2_list := ut3.ut_varchar2_list(); - l_result ut3.ut_varchar2_list; - begin - l_expected.extend(1); - l_expected(1) := l_twobyte_character||substr(l_singlebyte_string_max_size,1,l_workaround_byte_limit-1); - --Act - l_result := ut3.ut_utils.clob_to_table(l_clob_multibyte); - --Assert - ut.expect(l_result(1)).to_equal(l_expected(1)); - end; - - procedure test_to_version_split is - l_version ut3.ut_utils.t_version; - begin - l_version := ut3.ut_utils.to_version('v034.0.0456.0333'); - ut.expect(l_version.major).to_equal(34); - ut.expect(l_version.minor).to_equal(0); - ut.expect(l_version.bugfix).to_equal(456); - ut.expect(l_version.build).to_equal(333); - end; - - procedure test_trim_list_elements - is - l_list_to_be_equal ut3.ut_varchar2_list := ut3.ut_varchar2_list('hello', 'world', 'okay'); - l_list ut3.ut_varchar2_list := ut3.ut_varchar2_list(' hello ', chr(9)||'world ', 'okay'); - begin - --Act - l_list := ut3.ut_utils.trim_list_elements(l_list); - --Assert - ut.expect(anydata.convertcollection(l_list)).to_equal(anydata.convertcollection(l_list_to_be_equal)); - end; - - procedure trim_list_elemts_null_collect - is - l_list_to_be_null ut3.ut_varchar2_list; - begin - --Act - l_list_to_be_null := ut3.ut_utils.trim_list_elements(l_list_to_be_null); - --Assert - ut.expect(anydata.convertcollection(l_list_to_be_null)).to_be_null; - end; - - procedure trim_list_elemts_empty_collect - is - l_list_to_be_empty ut3.ut_varchar2_list := ut3.ut_varchar2_list(); - begin - --Act - l_list_to_be_empty := ut3.ut_utils.trim_list_elements(l_list_to_be_empty); - --Assert - ut.expect(anydata.convertcollection(l_list_to_be_empty)).to_be_empty; - end; - - procedure test_filter_list - is - l_list_to_be_equal ut3.ut_varchar2_list := ut3.ut_varchar2_list('-12458', '8956', '789'); - l_list ut3.ut_varchar2_list := ut3.ut_varchar2_list('-12458', '8956', 'okay', null,'458963', '789'); - begin - --Act - l_list := ut3.ut_utils.filter_list(l_list, '^-?[[:digit:]]{1,5}$'); - --Assert - ut.expect(anydata.convertcollection(l_list)).to_equal(anydata.convertcollection(l_list_to_be_equal)); - end; - - procedure filter_list_null_collection - is - l_list_to_be_null ut3.ut_varchar2_list; - begin - --Act - l_list_to_be_null := ut3.ut_utils.filter_list(l_list_to_be_null, '^-?[[:digit:]]{1,5}$'); - --Assert - ut.expect(anydata.convertcollection(l_list_to_be_null)).to_be_null; - end; - - procedure filter_list_empty_collection - is - l_list_to_be_empty ut3.ut_varchar2_list := ut3.ut_varchar2_list(); - begin - --Act - l_list_to_be_empty := ut3.ut_utils.filter_list(l_list_to_be_empty, '^-?[[:digit:]]{1,5}$'); - --Assert - ut.expect(anydata.convertcollection(l_list_to_be_empty)).to_be_empty; - end; - - procedure replace_multiline_comments - is - l_source clob; - l_actual clob; - l_expected clob; - begin - --Arrange - l_source := q'[ -create or replace package dummy as - - -- single line comment with disabled /* multi-line comment */ - gv_text0 varchar2(200) := q'{/* multi-line comment - in escaped q'multi-line - string*/}'; - gv_text1 varchar2(200) := '/* multi-line comment in a string*/'; - gv_text2 varchar2(200) := '/* multi-line comment - in a multi-line - string*/'; - -- ignored start of multi-line comment with multi-byte text � /* - -- ignored end of multi-line comment with multi-byte text � */ - /* multi-line comment - with - multi-byte characters ��� - in it */ - gv_text3 varchar2(200) := 'some text'; /* multiline comment*/ --followed by single-line comment - /* multi-line comment in one line*/ - gv_text4 varchar2(200) := q'{/* multi-line comment - in escaped q'multi-line - string*/}'; -end; -]'; - l_expected := q'[ -create or replace package dummy as - - -- single line comment with disabled /* multi-line comment */ - gv_text0 varchar2(200) := q'{/* multi-line comment - in escaped q'multi-line - string*/}'; - gv_text1 varchar2(200) := '/* multi-line comment in a string*/'; - gv_text2 varchar2(200) := '/* multi-line comment - in a multi-line - string*/'; - -- ignored start of multi-line comment with multi-byte text � /* - -- ignored end of multi-line comment with multi-byte text � */ - ]'||q'[ - - - - gv_text3 varchar2(200) := 'some text'; --followed by single-line comment - ]'||q'[ - gv_text4 varchar2(200) := q'{/* multi-line comment - in escaped q'multi-line - string*/}'; -end; -]'; - --Act - l_actual := ut3.ut_utils.replace_multiline_comments(l_source); - --Assert - ut.expect(l_actual).to_equal(l_expected); - end; -end test_ut_utils; -/ diff --git a/test/core/test_ut_utils.pks b/test/core/test_ut_utils.pks deleted file mode 100644 index 8452f84c3..000000000 --- a/test/core/test_ut_utils.pks +++ /dev/null @@ -1,132 +0,0 @@ -create or replace package test_ut_utils is - - --%suite(ut_utils) - --%suitepath(utplsql.core) - - function get_numeric_delimiter return varchar2; - - --%test(clob_to_table - Converts a clob into ut_varchar2_list using specified delimiter) - procedure test_clob_to_table; - - --%test(test_result_to_char - Converts numeric test result to character representation) - procedure test_test_result_to_char; - - - --%context(to_string) - - --%test(Returns 'EMPTY' string for NULL BLOB) - procedure to_string_emptyblob; - - --%test(Returns 'EMPTY' string for NULL CLOB) - procedure to_string_emptyclob; - - --%test(Returns 'NULL' string for NULL BLOB) - procedure to_string_nullblob; - - --%test(Returns 'NULL' string for NULL CLOB) - procedure to_string_nullclob; - - --%test(Returns 'NULL' string for NULL date) - procedure to_string_nulldate; - - --%test(Returns 'NULL' string for NULL number) - procedure to_string_nullnumber; - - --%test(Returns 'NULL' string for NULL timestamp) - procedure to_string_nulltimestamp; - - --%test(Returns 'NULL' string for NULL timestamp with local timezone) - procedure to_string_nulltimestamp_ltz; - - --%test(Returns 'NULL' string for NULL timestamp with timezone) - procedure to_string_nulltimestamp_tz; - - --%test(Returns 'NULL' string for NULL varchar) - procedure to_string_nullvarchar2; - - --%test(Returns string representation of BLOB) - procedure to_string_blob; - - --%test(Returns string representation of CLOB) - procedure to_string_clob; - - --%test(Returns string representation of date) - procedure to_string_date; - - --%test(Returns string representation of timestamp) - procedure to_string_timestamp; - - --%test(Returns string representation of timestamp with local timezone) - procedure to_string_timestamp_ltz; - - --%test(Returns string representation of timestamp with timezone) - procedure to_string_timestamp_tz; - - --%test(Returns varchar value) - procedure to_string_varchar2; - - --%test(Returns BLOB trimmed to 4000 chars with trailing [...]) - procedure to_string_verybigblob; - ---%test(Returns CLOB trimmed to 4000 chars with trailing [...]) - procedure to_string_verybigclob; - - --%test(Returns string representation of large number) - procedure to_string_verybignumber; - - --%test(Returns varchar2 trimmed to 4000 chars with trailing [...]) - procedure to_string_verybigvarchar2; - - --%test(Returns string representation of small number) - procedure to_string_verysmallnumber; - - --%endcontext - - --%test(table_to_clob - converts ut_varchar2_list into a CLOB value) - procedure test_table_to_clob; - - --%test(append_to_clob - adds multibyte varchar to CLOB) - --%beforetest(setup_append_with_multibyte) - --%aftertest(clean_append_with_multibyte) - procedure test_append_with_multibyte; - procedure setup_append_with_multibyte; - procedure clean_append_with_multibyte; - - --%test(clob_to_table - converts multibyte CLOB to ut_varchar2_list) - --%disabled(We cannot run this test successfully on 12.1 until we change NLSCHARACTERSET from US7ASCII to AL32UTF8) - procedure test_clob_to_table_multibyte; - - --%test(to_version - splits version string into individual version components) - procedure test_to_version_split; - - --%context(trim_list_elements) - - --%test(Trims the elements of a collection) - procedure test_trim_list_elements; - - --%test(Trim list elements with null collection) - procedure trim_list_elemts_null_collect; - - --%test(Trim list elements with empty collection) - procedure trim_list_elemts_empty_collect; - - --%endcontext - - --%context(filter_list) - - --%test(Filters the collection's elements) - procedure test_filter_list; - - --%test(Filter list elements with null collection) - procedure filter_list_null_collection; - - --%test(Filter list elements with empty collection) - procedure filter_list_empty_collection; - - --%endcontext - - --%test(replace_multiline_comments - replaces multi-line comments with empty lines) - procedure replace_multiline_comments; - -end test_ut_utils; -/ diff --git a/test/helpers/other_dummy_object.tps b/test/helpers/other_dummy_object.tps deleted file mode 100644 index c1019c415..000000000 --- a/test/helpers/other_dummy_object.tps +++ /dev/null @@ -1,16 +0,0 @@ -declare - l_exists integer; -begin - select count(1) into l_exists from user_types where type_name = 'OTHER_DUMMY_OBJECT'; - if l_exists > 0 then - execute immediate 'drop type other_dummy_object force'; - end if; -end; -/ - -create or replace type other_dummy_object as object ( - id number, - "name" varchar2(30), - "Value" varchar2(30) -) -/ \ No newline at end of file diff --git a/test/helpers/test_dummy_object_list.tps b/test/helpers/test_dummy_object_list.tps deleted file mode 100644 index e1dde66ed..000000000 --- a/test/helpers/test_dummy_object_list.tps +++ /dev/null @@ -1,4 +0,0 @@ -create or replace type test_dummy_object_list as table of test_dummy_object -/ - -grant execute on test_dummy_object_list to ut3$user#; \ No newline at end of file diff --git a/test/helpers/test_event_list.tps b/test/helpers/test_event_list.tps deleted file mode 100644 index 8abf71b13..000000000 --- a/test/helpers/test_event_list.tps +++ /dev/null @@ -1,2 +0,0 @@ -create or replace type test_event_list as table of test_event_object; -/ diff --git a/test/helpers/test_event_object.tps b/test/helpers/test_event_object.tps deleted file mode 100644 index da458d2c2..000000000 --- a/test/helpers/test_event_object.tps +++ /dev/null @@ -1,15 +0,0 @@ -declare - l_exists integer; -begin - select count(1) into l_exists from user_types where type_name = 'TEST_EVENT_OBJECT'; - if l_exists > 0 then - execute immediate 'drop type test_event_object force'; - end if; -end; -/ - -create or replace type test_event_object as object ( - event_type varchar2(1000), - event_doc xmltype -) -/ \ No newline at end of file diff --git a/test/helpers/test_tab_varchar2.tps b/test/helpers/test_tab_varchar2.tps deleted file mode 100644 index 17086292a..000000000 --- a/test/helpers/test_tab_varchar2.tps +++ /dev/null @@ -1,12 +0,0 @@ -declare - l_exists integer; -begin - select count(1) into l_exists from user_types where type_name = 'T_TAB_VARCHAR'; - if l_exists > 0 then - execute immediate 'drop type t_tab_varchar force'; - end if; -end; -/ - -create or replace type t_tab_varchar is table of varchar2(1) -/ \ No newline at end of file diff --git a/test/helpers/test_tab_varray.tps b/test/helpers/test_tab_varray.tps deleted file mode 100644 index 3c684afca..000000000 --- a/test/helpers/test_tab_varray.tps +++ /dev/null @@ -1,13 +0,0 @@ -declare - l_exists integer; -begin - select count(1) into l_exists from user_types where type_name = 'T_VARRAY'; - if l_exists > 0 then - execute immediate 'drop type t_varray force'; - end if; -end; -/ - - -create or replace type t_varray is varray(1) of number -/ \ No newline at end of file diff --git a/test/helpers/ut3user#.test_cursor_grants.pkb b/test/helpers/ut3user#.test_cursor_grants.pkb deleted file mode 100644 index 112d9559e..000000000 --- a/test/helpers/ut3user#.test_cursor_grants.pkb +++ /dev/null @@ -1,114 +0,0 @@ -create or replace package body ut3$user#.test_cursor_grants is - - procedure run_test_join_by_cursor is - begin - ut3.ut.run('test_cursor_grants.test_join_by_cursor'); - end; - - procedure run_test_equal_cursor is - begin - ut3.ut.run('test_cursor_grants.test_equal_cursor'); - end; - - procedure run_test_not_empty_cursor is - begin - ut3.ut.run('test_cursor_grants.test_not_empty_cursor'); - end; - - procedure run_test_have_count_cursor is - begin - ut3.ut.run('test_cursor_grants.test_have_count_cursor'); - end; - - procedure run_test_empty_cursor is - begin - ut3.ut.run('test_cursor_grants.test_empty_cursor'); - end; - - procedure run_test_equal_non_diff_sql is - begin - ut3.ut.run('test_cursor_grants.test_equal_non_diff_sql'); - end; - - procedure test_join_by_cursor is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; - begin - --Arrange - open l_actual for select owner, object_name,object_type from all_objects where owner = user - order by 1,2,3 asc; - open l_expected for select owner, object_name,object_type from all_objects where owner = user - order by 1,2,3 desc; - - --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OBJECT_NAME,OBJECT_TYPE'); - - end; - - procedure test_equal_cursor is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; - l_list ut3_tester.test_dummy_object_list; - begin - --Arrange - open l_actual for select value(x) as item from table(l_list) x; - open l_expected for select value(x) as item from table(l_list) x; - - --Act - ut3.ut.expect(l_actual).to_equal(l_expected); - - end; - - procedure test_not_empty_cursor is - l_details_cur SYS_REFCURSOR; - l_expected ut3_tester.test_dummy_object_list; - begin - select ut3_tester.test_dummy_object( rn, 'Something '||rn, rn1) - bulk collect into l_expected - from (select rownum * case when mod(rownum,2) = 0 then -1 else 1 end rn, - rownum * case when mod(rownum,4) = 0 then -1 else 1 end rn1 - from dual connect by level <=10); - - --Arrange - open l_details_cur for - select value(x) as item from table(l_expected) x; - - --Act - ut3.ut.expect(l_details_cur).not_to_be_empty(); - end; - - procedure test_have_count_cursor is - l_expected SYS_REFCURSOR; - begin - --Arrange - open l_expected for - select value(x) as item from table(ut3_tester.test_dummy_object_list()) x; - - --Act - ut3.ut.expect(l_expected).to_have_count(0); - end; - - procedure test_empty_cursor is - l_expected SYS_REFCURSOR; - begin - open l_expected for - select value(x) as item from table(ut3_tester.test_dummy_object_list()) x; - --Act - ut3.ut.expect(l_expected).to_be_empty(); - end; - - procedure test_equal_non_diff_sql is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; - begin - open l_actual for - select to_clob('test1') as item from dual; - - open l_expected for - select to_clob('test1') as item from dual; - - ut3.ut.expect(l_actual).to_equal(l_expected); - end; - -end; -/ diff --git a/test/helpers/ut3user#.test_cursor_grants.pks b/test/helpers/ut3user#.test_cursor_grants.pks deleted file mode 100644 index cf829c09f..000000000 --- a/test/helpers/ut3user#.test_cursor_grants.pks +++ /dev/null @@ -1,30 +0,0 @@ -create or replace package ut3$user#.test_cursor_grants is - --%suite() - - procedure run_test_join_by_cursor; - procedure run_test_equal_cursor; - procedure run_test_not_empty_cursor; - procedure run_test_have_count_cursor; - procedure run_test_empty_cursor; - procedure run_test_equal_non_diff_sql; - - --%test(execute join by test) - procedure test_join_by_cursor; - - --%test(execute equal test) - procedure test_equal_cursor; - - --%test(execute not empty test) - procedure test_not_empty_cursor; - - --%test(execute have_count test) - procedure test_have_count_cursor; - - --%test(execute empty test) - procedure test_empty_cursor; - - --%test(execute test with non diff datatype) - procedure test_equal_non_diff_sql; - -end; -/ diff --git a/test/helpers/ut_example_tests.pkb b/test/helpers/ut_example_tests.pkb deleted file mode 100644 index d8afd592a..000000000 --- a/test/helpers/ut_example_tests.pkb +++ /dev/null @@ -1,24 +0,0 @@ -create or replace package body ut_example_tests -as - - procedure set_g_number_0 as - begin - g_number := 0; - end; - - procedure add_1_to_g_number as - begin - g_number := g_number + 1; - end; - - procedure failing_procedure as - begin - g_number := 1 / 0; - end; - - procedure ut_commit_test is - begin - commit; - end; -end; -/ diff --git a/test/helpers/ut_example_tests.pks b/test/helpers/ut_example_tests.pks deleted file mode 100644 index 428d55743..000000000 --- a/test/helpers/ut_example_tests.pks +++ /dev/null @@ -1,8 +0,0 @@ -create or replace package ut_example_tests as - g_number number; - procedure set_g_number_0; - procedure add_1_to_g_number; - procedure failing_procedure; - procedure ut_commit_test; -end; -/ diff --git a/test/helpers/ut_test_table.sql b/test/helpers/ut_test_table.sql deleted file mode 100644 index bccd07bc4..000000000 --- a/test/helpers/ut_test_table.sql +++ /dev/null @@ -1,11 +0,0 @@ -declare - l_exists integer; -begin - select count(1) into l_exists from user_tables where table_name = 'UT$TEST_TABLE'; - if l_exists > 0 then - execute immediate 'drop table ut$test_table'; - end if; -end; -/ - -create table ut$test_table (val varchar2(1)); diff --git a/test/helpers/ut_with_invalid_body.pkb b/test/helpers/ut_with_invalid_body.pkb deleted file mode 100644 index e265bf8de..000000000 --- a/test/helpers/ut_with_invalid_body.pkb +++ /dev/null @@ -1,4 +0,0 @@ -create or replace package body ut_with_invalid_body as - procedure test1; -end; -/ \ No newline at end of file diff --git a/test/helpers/ut_with_invalid_body.pks b/test/helpers/ut_with_invalid_body.pks deleted file mode 100644 index 702affb59..000000000 --- a/test/helpers/ut_with_invalid_body.pks +++ /dev/null @@ -1,4 +0,0 @@ -create or replace package ut_with_invalid_body as - procedure test1; -end; -/ \ No newline at end of file diff --git a/test/helpers/ut_without_body.pks b/test/helpers/ut_without_body.pks deleted file mode 100644 index 45a3c50d4..000000000 --- a/test/helpers/ut_without_body.pks +++ /dev/null @@ -1,4 +0,0 @@ -create or replace package ut_without_body as - procedure test1; -end; -/ \ No newline at end of file diff --git a/test/install_and_run_tests.sh b/test/install_and_run_tests.sh index 385cb46a4..421732be1 100755 --- a/test/install_and_run_tests.sh +++ b/test/install_and_run_tests.sh @@ -6,13 +6,17 @@ git rev-parse && cd "$(git rev-parse --show-cdup)" cd test -time "$SQLCLI" ${UT3_TESTER}/${UT3_TESTER_PASSWORD}@//${CONNECTION_STR} @install_tests.sql +time "$SQLCLI" ${UT3_TESTER_HELPER}/${UT3_TESTER_HELPER_PASSWORD}@//${CONNECTION_STR} @install_ut3_tester_helper.sql -cd .. +time "$SQLCLI" ${UT3_USER}/${UT3_USER_PASSWORD}@//${CONNECTION_STR} @install_ut3_user_tests.sql + +time "$SQLCLI" ${UT3_TESTER}/${UT3_TESTER_PASSWORD}@//${CONNECTION_STR} @install_ut3_tester_tests.sql +cd .. time utPLSQL-cli/bin/utplsql run ${UT3_TESTER}/${UT3_TESTER_PASSWORD}@${CONNECTION_STR} \ -source_path=source -owner=ut3 \ +-p='ut3_tester,ut3$user#' \ -test_path=test -c \ -f=ut_coverage_sonar_reporter -o=coverage.xml \ -f=ut_coverage_html_reporter -o=coverage.html \ diff --git a/test/install_ut3_tester_helper.sql b/test/install_ut3_tester_helper.sql index 0eabb98c9..14586c469 100644 --- a/test/install_ut3_tester_helper.sql +++ b/test/install_ut3_tester_helper.sql @@ -4,12 +4,13 @@ whenever oserror exit failure rollback alter session set plsql_optimize_level=0; --Install ut3_tester_helper -@@ut3_tester_helper/core.pks +@@ut3_tester_helper/test_dummy_object.tps -@@ut3_tester_helper/core.pkb +@@ut3_tester_helper/main_helper.pks +@@ut3_tester_helper/run_helper.pks - -grant execute on ut3_tester_helper.core to UT3$USER#; +@@ut3_tester_helper/main_helper.pkb +@@ut3_tester_helper/run_helper.pkb set linesize 200 set define on @@ -36,6 +37,12 @@ begin else dbms_output.put_line('Installation completed successfully'); end if; + + for i in ( select object_name from user_objects t where t.object_type in ('PACKAGE','TYPE')) + loop + execute immediate 'grant execute on '||i.object_name||' to PUBLIC'; + end loop; + end; / diff --git a/test/install_ut3_tester_tests.sql b/test/install_ut3_tester_tests.sql new file mode 100644 index 000000000..85b0ae201 --- /dev/null +++ b/test/install_ut3_tester_tests.sql @@ -0,0 +1,41 @@ +set define off +whenever sqlerror exit failure rollback +whenever oserror exit failure rollback + +alter session set plsql_optimize_level=0; + + +--Install tests +@@ut3_tester/core/annotations/test_before_after_annotations.pks + +@@ut3_tester/core/annotations/test_before_after_annotations.pkb + +set linesize 200 +set define on +set verify off +column text format a100 +column error_count noprint new_value error_count + +prompt Validating installation + +set heading on +select type, name, sequence, line, position, text, count(1) over() error_count + from all_errors + where owner = USER + and name not like 'BIN$%' --not recycled + and name != 'UT_WITH_INVALID_BODY' + -- errors only. ignore warnings + and attribute = 'ERROR' + order by name, type, sequence +/ + +begin + if to_number('&&error_count') > 0 then + raise_application_error(-20000, 'Not all sources were successfully installed.'); + else + dbms_output.put_line('Installation completed successfully'); + end if; +end; +/ + +exit; diff --git a/test/install_ut3_user_tests.sql b/test/install_ut3_user_tests.sql index 4890d002a..666a410a4 100644 --- a/test/install_ut3_user_tests.sql +++ b/test/install_ut3_user_tests.sql @@ -6,7 +6,12 @@ alter session set plsql_optimize_level=0; prompt Install user tests @@ut3_user/expectations/test_matchers.pks +@@ut3_user/expectations/test_expectations_cursor.pks +@@ut3_user/api/test_ut_runner.pks + @@ut3_user/expectations/test_matchers.pkb +@@ut3_user/expectations/test_expectations_cursor.pkb +@@ut3_user/api/test_ut_runner.pkb set linesize 200 set define on @@ -33,6 +38,12 @@ begin else dbms_output.put_line('Installation completed successfully'); end if; + + for i in ( select object_name from user_objects t where t.object_type = 'PACKAGE') + loop + execute immediate 'grant execute on '||i.object_name||' to UT3_TESTER'; + end loop; + end; / diff --git a/test/core/annotations/test_before_after_annotations.pkb b/test/ut3_tester/core/annotations/test_before_after_annotations.pkb similarity index 99% rename from test/core/annotations/test_before_after_annotations.pkb rename to test/ut3_tester/core/annotations/test_before_after_annotations.pkb index 0aa9f5c39..804508c61 100644 --- a/test/core/annotations/test_before_after_annotations.pkb +++ b/test/ut3_tester/core/annotations/test_before_after_annotations.pkb @@ -205,7 +205,7 @@ create or replace package body test_before_after_annotations is execute immediate 'drop package dummy_before_after_test'; execute immediate 'drop package shared_test_package'; - g_tests_results := ut3.ut_utils.table_to_clob(l_test_results); + g_tests_results := ut3_tester_helper.main_helper.table_to_clob(l_test_results); end; procedure beforetest_local_procedure is diff --git a/test/core/annotations/test_before_after_annotations.pks b/test/ut3_tester/core/annotations/test_before_after_annotations.pks similarity index 100% rename from test/core/annotations/test_before_after_annotations.pks rename to test/ut3_tester/core/annotations/test_before_after_annotations.pks diff --git a/test/ut3_tester_helper/core.pkb b/test/ut3_tester/core/core.pkb similarity index 100% rename from test/ut3_tester_helper/core.pkb rename to test/ut3_tester/core/core.pkb diff --git a/test/ut3_tester_helper/core.pks b/test/ut3_tester/core/core.pks similarity index 94% rename from test/ut3_tester_helper/core.pks rename to test/ut3_tester/core/core.pks index a722a9871..c011d8916 100644 --- a/test/ut3_tester_helper/core.pks +++ b/test/ut3_tester/core/core.pks @@ -1,4 +1,4 @@ -create or replace package core is +create or replace package main_helper is gc_success number := ut3.ut_utils.gc_success; gc_failure number := ut3.ut_utils.gc_failure; diff --git a/test/ut3_tester_helper/main_helper.pkb b/test/ut3_tester_helper/main_helper.pkb new file mode 100644 index 000000000..9ceedd68a --- /dev/null +++ b/test/ut3_tester_helper/main_helper.pkb @@ -0,0 +1,90 @@ +create or replace package body main_helper is + + function get_dbms_output_as_clob return clob is + l_status number; + l_line varchar2(32767); + l_result clob; + begin + + dbms_output.get_line(line => l_line, status => l_status); + if l_status != 1 then + dbms_lob.createtemporary(l_result, true, dur => dbms_lob.session); + end if; + while l_status != 1 loop + if l_line is not null then + ut3.ut_utils.append_to_clob(l_result, l_line||chr(10)); + end if; + dbms_output.get_line(line => l_line, status => l_status); + end loop; + return l_result; + end; + + procedure execute_autonomous(a_sql varchar2) is + pragma autonomous_transaction; + begin + if a_sql is not null then + execute immediate a_sql; + end if; + commit; + end; + + function run_test(a_path varchar2) return clob is + l_lines ut3.ut_varchar2_list; + begin + select * bulk collect into l_lines from table(ut3.ut.run(a_path)); + return ut3.ut_utils.table_to_clob(l_lines); + end; + + function get_value(a_variable varchar2) return integer is + l_glob_val integer; + begin + execute immediate 'begin :l_glob_val := '||a_variable||'; end;' using out l_glob_val; + return l_glob_val; + end; + + function get_failed_expectations return ut3.ut_varchar2_list is + l_expectations_result ut3.ut_expectation_results := ut3.ut_expectation_processor.get_failed_expectations(); + l_result ut3.ut_varchar2_list := ut3.ut_varchar2_list(); + begin + for i in 1..l_expectations_result.count loop + l_result := l_result multiset union l_expectations_result(i).get_result_lines(); + end loop; + return l_result; + end; + + function get_failed_expectations(a_pos in number) return varchar2 is + l_result varchar2(32767) := ut3.ut_expectation_processor.get_failed_expectations()(a_pos).message; + begin + return l_result; + end; + + function failed_expectations_data return anydata is + begin + return anydata.convertCollection(ut3.ut_expectation_processor.get_failed_expectations()); + end; + + function get_failed_expectations_n return number is + l_num_failed number; + l_results ut3.ut_expectation_results := ut3.ut_expectation_processor.get_failed_expectations(); + begin + l_num_failed := l_results.count; + return l_num_failed; + end; + + procedure clear_expectations is + begin + ut3.ut_expectation_processor.clear_expectations(); + end; + + function table_to_clob(a_results in ut3.ut_varchar2_list) return clob is + begin + return ut3.ut_utils.table_to_clob(a_results); + end; + + function get_warnings return ut3.ut_varchar2_rows is + begin + return ut3.ut_expectation_processor.get_warnings(); + end; + +end; +/ diff --git a/test/ut3_tester_helper/main_helper.pks b/test/ut3_tester_helper/main_helper.pks new file mode 100644 index 000000000..6c7f34bc0 --- /dev/null +++ b/test/ut3_tester_helper/main_helper.pks @@ -0,0 +1,27 @@ +create or replace package main_helper is + + gc_success number := ut3.ut_utils.gc_success; + gc_failure number := ut3.ut_utils.gc_failure; + + procedure execute_autonomous(a_sql varchar2); + + function run_test(a_path varchar2) return clob; + + function get_value(a_variable varchar2) return integer; + + function get_dbms_output_as_clob return clob; + + function get_failed_expectations return ut3.ut_varchar2_list; + + function get_failed_expectations(a_pos in number) return varchar2; + + function get_failed_expectations_n return number; + + procedure clear_expectations; + + function table_to_clob(a_results in ut3.ut_varchar2_list) return clob; + + function get_warnings return ut3.ut_varchar2_rows; + +end; +/ diff --git a/test/ut3_tester_helper/run_helper.pkb b/test/ut3_tester_helper/run_helper.pkb new file mode 100644 index 000000000..0ab574e9d --- /dev/null +++ b/test/ut3_tester_helper/run_helper.pkb @@ -0,0 +1,91 @@ +create or replace package body run_helper is + + procedure setup_cache_objects is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package ut3$user#.dummy_test_package as + --%suite(dummy_test_suite) + --%rollback(manual) + + --%test(dummy_test) + --%beforetest(some_procedure) + procedure some_dummy_test_procedure; + end;]'; + execute immediate q'[create or replace procedure ut3$user#.dummy_test_procedure as + --%some_annotation(some_text) + --%rollback(manual) + begin + null; + end;]'; + execute immediate q'[create or replace procedure ut3_tester_helper.dummy_test_procedure as + --%some_annotation(some_text) + --%rollback(manual) + begin + null; + end;]'; + + execute immediate q'[grant execute on ut3_tester_helper.dummy_test_procedure to public]'; + end; + + + procedure setup_cache is + pragma autonomous_transaction; + begin + setup_cache_objects(); + ut3.ut_annotation_manager.rebuild_annotation_cache('UT3$USER#','PACKAGE'); + ut3.ut_annotation_manager.rebuild_annotation_cache('UT3$USER#','PROCEDURE'); + ut3.ut_annotation_manager.rebuild_annotation_cache('UT3_TESTER_HELPER','PROCEDURE'); + end; + + procedure cleanup_cache is + pragma autonomous_transaction; + begin + delete from ut3.ut_annotation_cache_info + where object_type = 'PROCEDURE' and object_owner in ('UT3$USER#','UT3_TESTER_HELPER') + or object_type = 'PACKAGE' and object_owner = user and object_name = 'DUMMY_TEST_PACKAGE'; + execute immediate q'[drop package ut3$user#.dummy_test_package]'; + execute immediate q'[drop procedure ut3$user#.dummy_test_procedure]'; + execute immediate q'[drop procedure ut3_tester_helper.dummy_test_procedure]'; + end; + + procedure db_link_setup is + l_service_name varchar2(100); + begin + select global_name into l_service_name from global_name; + execute immediate + 'create public database link db_loopback connect to ut3$user# identified by ut3 + using ''(DESCRIPTION= + (ADDRESS=(PROTOCOL=TCP) + (HOST='||sys_context('userenv','SERVER_HOST')||') + (PORT=1521) + ) + (CONNECT_DATA=(SERVICE_NAME='||l_service_name||')))'''; + execute immediate q'[ + create or replace package ut3$user#.test_db_link is + --%suite + + --%test + procedure runs_with_db_link; + end;]'; + + execute immediate q'[ + create or replace package body ut3$user#.test_db_link is + procedure runs_with_db_link is + a_value integer; + begin + select 1 into a_value + from dual@db_loopback; + ut3.ut.expect(a_value).to_be_null(); + end; + end;]'; + + end; + + procedure db_link_cleanup is + begin + begin execute immediate 'drop public database link db_loopback'; exception when others then null; end; + begin execute immediate 'drop package ut3$user#.test_db_link'; exception when others then null; end; + end; + +end; +/ diff --git a/test/ut3_tester_helper/run_helper.pks b/test/ut3_tester_helper/run_helper.pks new file mode 100644 index 000000000..fefd3b546 --- /dev/null +++ b/test/ut3_tester_helper/run_helper.pks @@ -0,0 +1,9 @@ +create or replace package run_helper is + + procedure setup_cache_objects; + procedure setup_cache; + procedure cleanup_cache; + procedure db_link_setup; + procedure db_link_cleanup; +end; +/ diff --git a/test/helpers/test_dummy_object.tps b/test/ut3_tester_helper/test_dummy_object.tps similarity index 100% rename from test/helpers/test_dummy_object.tps rename to test/ut3_tester_helper/test_dummy_object.tps diff --git a/test/api/test_ut_runner.pkb b/test/ut3_user/api/test_ut_runner.pkb similarity index 75% rename from test/api/test_ut_runner.pkb rename to test/ut3_user/api/test_ut_runner.pkb index 79c78d911..4d59c78e2 100644 --- a/test/api/test_ut_runner.pkb +++ b/test/ut3_user/api/test_ut_runner.pkb @@ -1,48 +1,18 @@ create or replace package body test_ut_runner is procedure setup_cache_objects is - pragma autonomous_transaction; begin - execute immediate q'[create or replace package dummy_test_package as - --%suite(dummy_test_suite) - --%rollback(manual) - - --%test(dummy_test) - --%beforetest(some_procedure) - procedure some_dummy_test_procedure; - end;]'; - execute immediate q'[create or replace procedure dummy_test_procedure as - --%some_annotation(some_text) - --%rollback(manual) - begin - null; - end;]'; - execute immediate q'[create or replace procedure ut3.dummy_test_procedure as - --%some_annotation(some_text) - --%rollback(manual) - begin - null; - end;]'; + ut3_tester_helper.run_helper.setup_cache_objects(); end; procedure setup_cache is - pragma autonomous_transaction; begin - setup_cache_objects(); - ut3.ut_annotation_manager.rebuild_annotation_cache(user,'PACKAGE'); - ut3.ut_annotation_manager.rebuild_annotation_cache(user,'PROCEDURE'); - ut3.ut_annotation_manager.rebuild_annotation_cache('UT3','PROCEDURE'); + ut3_tester_helper.run_helper.setup_cache(); end; procedure cleanup_cache is - pragma autonomous_transaction; begin - delete from ut3.ut_annotation_cache_info - where object_type = 'PROCEDURE' and object_owner in ('UT3',user) - or object_type = 'PACKAGE' and object_owner = user and object_name = 'DUMMY_TEST_PACKAGE'; - execute immediate q'[drop package dummy_test_package]'; - execute immediate q'[drop procedure dummy_test_procedure]'; - execute immediate q'[drop procedure ut3.dummy_test_procedure]'; + ut3_tester_helper.run_helper.cleanup_cache(); end; procedure create_test_spec @@ -171,7 +141,7 @@ end;'; bulk collect into l_results from table(ut3.ut.run('test_cache')); --Assert - l_actual := ut3.ut_utils.table_to_clob(l_results); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); l_expected := '%ut3.ut.expect(1).to_be_null;%'; ut.expect(l_actual).to_be_like(l_expected); drop_test_package(); @@ -217,29 +187,29 @@ end;'; procedure test_purge_cache_schema_type is l_actual sys_refcursor; begin - + open l_actual for select * from ut3.ut_annotation_cache_info - where object_owner = user and object_type = 'PROCEDURE'; + where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PROCEDURE'; ut.expect(l_actual).not_to_be_empty(); --Act - ut3.ut_runner.purge_cache(user,'PROCEDURE'); + ut3.ut_runner.purge_cache(sys_context('USERENV', 'CURRENT_USER'),'PROCEDURE'); --Assert open l_actual for select * from ut3.ut_annotation_cache_info - where object_owner = user and object_type = 'PROCEDURE'; + where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PROCEDURE'; --Cache purged for object owner/type ut.expect(l_actual).to_be_empty(); open l_actual for select * from ut3.ut_annotation_cache_info - where object_owner = user and object_type = 'PACKAGE'; + where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PACKAGE'; --Cache not purged for other types ut.expect(l_actual).not_to_be_empty(); open l_actual for select * from ut3.ut_annotation_cache_info - where object_owner = 'UT3' and object_type = 'PROCEDURE'; + where object_owner = 'UT3_TESTER_HELPER' and object_type = 'PROCEDURE'; --Cache not purged for other owners ut.expect(l_actual).not_to_be_empty(); @@ -249,19 +219,19 @@ end;'; l_actual integer; begin --Act - ut3.ut_annotation_manager.rebuild_annotation_cache(user,'PACKAGE'); + ut3.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); --Assert select count(1) into l_actual from ut3.ut_annotation_cache_info i join ut3.ut_annotation_cache c on c.cache_id = i.cache_id - where object_owner = user and object_type = 'PACKAGE' and object_name = 'DUMMY_TEST_PACKAGE'; - --Rebuild cache for user/packages + where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PACKAGE' and object_name = 'DUMMY_TEST_PACKAGE'; + --Rebuild cache for sys_context('USERENV', 'CURRENT_USER')/packages ut.expect(l_actual).to_equal(4); select count(1) into l_actual from ut3.ut_annotation_cache_info i join ut3.ut_annotation_cache c on c.cache_id = i.cache_id - where object_owner = 'UT3' and object_type = 'PROCEDURE'; + where object_owner = 'UT3_TESTER_HELPER' and object_type = 'PROCEDURE'; --Did not rebuild cache for ut3/procedures ut.expect(l_actual).to_equal(0); @@ -274,12 +244,12 @@ end;'; --Arrange open l_expected for select - 'UT3_TESTER' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'DUMMY_TEST_PACKAGE' item_name, + 'UT3$USER#' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'DUMMY_TEST_PACKAGE' item_name, 'dummy_test_suite' item_description, 'UT_SUITE' item_type, 2 item_line_no, 'dummy_test_package' path, 0 disabled_flag from dual union all select - 'UT3_TESTER' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'SOME_DUMMY_TEST_PROCEDURE' item_name, + 'UT3$USER#' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'SOME_DUMMY_TEST_PROCEDURE' item_name, 'dummy_test' item_description, 'UT_TEST' item_type, 5 item_line_no, 'dummy_test_package.some_dummy_test_procedure' path, 0 disabled_flag from dual; @@ -316,42 +286,14 @@ end;'; procedure db_link_cleanup is begin - begin execute immediate 'drop public database link db_loopback'; exception when others then null; end; - begin execute immediate 'drop package test_db_link'; exception when others then null; end; + ut3_tester_helper.run_helper.db_link_cleanup(); end; procedure db_link_setup is l_service_name varchar2(100); - begin - select global_name into l_service_name from global_name; - execute immediate - 'create public database link db_loopback connect to ut3_tester identified by ut3 - using ''(DESCRIPTION= - (ADDRESS=(PROTOCOL=TCP) - (HOST='||sys_context('userenv','SERVER_HOST')||') - (PORT=1521) - ) - (CONNECT_DATA=(SERVICE_NAME='||l_service_name||')))'''; - execute immediate q'[ - create or replace package test_db_link is - --%suite - - --%test - procedure runs_with_db_link; - end;]'; - - execute immediate q'[ - create or replace package body test_db_link is - procedure runs_with_db_link is - a_value integer; - begin - select 1 into a_value - from dual@db_loopback; - ut3.ut.expect(a_value).to_be_null(); - end; - end;]'; - - end; + begin + ut3_tester_helper.run_helper.db_link_setup(); + end; procedure raises_20213_on_fail_link is l_reporter ut3.ut_documentation_reporter := ut3.ut_documentation_reporter(); @@ -448,7 +390,7 @@ end;'; bulk collect into l_results from table(ut3.ut.run(ut3.ut_varchar2_list('test_csl_names1','test_csl_names2'))); - l_actual := ut3.ut_utils.table_to_clob(l_results); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); ut.expect(l_actual).to_be_like('%Finished in % seconds %4 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%'); end; @@ -461,7 +403,7 @@ end;'; bulk collect into l_results from table(ut3.ut.run('test_csl_names1')); - l_actual := ut3.ut_utils.table_to_clob(l_results); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); ut.expect(l_actual).to_be_like('%Finished in % seconds %2 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%'); end; @@ -474,7 +416,7 @@ end;'; bulk collect into l_results from table(ut3.ut.run('test_csl_names1,test_csl_names2')); - l_actual := ut3.ut_utils.table_to_clob(l_results); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); ut.expect(l_actual).to_be_like('%Finished in % seconds %4 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%'); end; @@ -487,7 +429,7 @@ end;'; bulk collect into l_results from table(ut3.ut.run('test_csl_names1.one_is_one,test_csl_names2.one_is_one')); - l_actual := ut3.ut_utils.table_to_clob(l_results); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); ut.expect(l_actual).to_be_like('%Finished in % seconds %2 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%'); end; @@ -500,7 +442,7 @@ end;'; bulk collect into l_results from table(ut3.ut.run('test_csl_names1.one_is_one, test_csl_names2.one_is_one')); - l_actual := ut3.ut_utils.table_to_clob(l_results); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); ut.expect(l_actual).to_be_like('%Finished in % seconds %2 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%'); end; @@ -520,7 +462,7 @@ end;'; ) ); - l_actual := ut3.ut_utils.table_to_clob(l_results); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); ut.expect(l_actual).to_be_like('%Finished in % seconds %2 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%'); end; @@ -533,7 +475,7 @@ end;'; bulk collect into l_results from table(ut3.ut.run(ut3.ut_varchar2_list('test_csl_names1.one_is_one,test_csl_names2.one_is_one'))); - l_actual := ut3.ut_utils.table_to_clob(l_results); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); ut.expect(l_actual).to_be_like('%Finished in % seconds %2 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%'); end; @@ -542,19 +484,19 @@ end;'; begin ut.expect( ut3.ut_runner.is_test( - a_owner => 'UT3_TESTER', + a_owner => 'UT3$USER#', a_package_name => 'DUMMY_TEST_PACKAGE', a_procedure_name => 'SOME_DUMMY_TEST_PROCEDURE' ) ).to_be_true(); - ut.expect( ut3.ut_runner.is_test( 'ut3_tester','dummy_test_package','some_dummy_test_procedure' ) ).to_be_true(); + ut.expect( ut3.ut_runner.is_test( 'ut3$user#','dummy_test_package','some_dummy_test_procedure' ) ).to_be_true(); end; procedure is_test_false is begin - ut.expect( ut3.ut_runner.is_test( 'UT3_TESTER','DUMMY_TEST_PACKAGE', 'BAD' ) ).to_be_false(); - ut.expect( ut3.ut_runner.is_test( 'UT3_TESTER','DUMMY_TEST_PACKAGE', null ) ).to_be_false(); - ut.expect( ut3.ut_runner.is_test( 'UT3_TESTER',null,'some_dummy_test_procedure' ) ).to_be_false(); + ut.expect( ut3.ut_runner.is_test( 'UT3$USER#','DUMMY_TEST_PACKAGE', 'BAD' ) ).to_be_false(); + ut.expect( ut3.ut_runner.is_test( 'UT3$USER#','DUMMY_TEST_PACKAGE', null ) ).to_be_false(); + ut.expect( ut3.ut_runner.is_test( 'UT3$USER#',null,'some_dummy_test_procedure' ) ).to_be_false(); ut.expect( ut3.ut_runner.is_test( null,'DUMMY_TEST_PACKAGE','some_dummy_test_procedure' ) ).to_be_false(); end; @@ -562,26 +504,26 @@ end;'; begin ut.expect( ut3.ut_runner.is_suite( - a_owner => 'UT3_TESTER', + a_owner => 'UT3$USER#', a_package_name => 'DUMMY_TEST_PACKAGE' ) ).to_be_true(); - ut.expect( ut3.ut_runner.is_suite( 'ut3_tester','dummy_test_package' ) ).to_be_true(); + ut.expect( ut3.ut_runner.is_suite( 'ut3$user#','dummy_test_package' ) ).to_be_true(); end; procedure is_suite_false is begin - ut.expect( ut3.ut_runner.is_suite( 'UT3_TESTER','BAD' ) ).to_be_false(); - ut.expect( ut3.ut_runner.is_suite( 'UT3_TESTER', null ) ).to_be_false(); + ut.expect( ut3.ut_runner.is_suite( 'UT3$USER#','BAD' ) ).to_be_false(); + ut.expect( ut3.ut_runner.is_suite( 'UT3$USER#', null ) ).to_be_false(); ut.expect( ut3.ut_runner.is_suite( null,'DUMMY_TEST_PACKAGE' ) ).to_be_false(); end; procedure has_suites_true is begin - ut.expect( ut3.ut_runner.has_suites( a_owner => 'UT3_TESTER' ) ).to_be_true(); + ut.expect( ut3.ut_runner.has_suites( a_owner => 'UT3$USER#' ) ).to_be_true(); - ut.expect( ut3.ut_runner.has_suites( 'ut3_tester' ) ).to_be_true(); + ut.expect( ut3.ut_runner.has_suites( 'ut3$user#' ) ).to_be_true(); end; procedure has_suites_false is diff --git a/test/api/test_ut_runner.pks b/test/ut3_user/api/test_ut_runner.pks similarity index 100% rename from test/api/test_ut_runner.pks rename to test/ut3_user/api/test_ut_runner.pks diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb similarity index 84% rename from test/core/expectations/test_expectations_cursor.pkb rename to test/ut3_user/expectations/test_expectations_cursor.pkb index f0d9ae36e..aa3decb11 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -13,7 +13,7 @@ create or replace package body test_expectations_cursor is procedure cleanup_expectations is begin - expectations.cleanup_expectations( ); + ut3_tester_helper.main_helper.clear_expectations( ); end; procedure setup_temp_table_test @@ -50,7 +50,7 @@ create or replace package body test_expectations_cursor is --Act - execute the expectation on cursor opened on GTT ut3.ut.expect( l_actual ).to_equal( l_expected ); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); --Cleanup rollback; end; @@ -78,7 +78,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_equal( l_expected ); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); ut3.ut.reset_nls; end; @@ -93,7 +93,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_equal( l_expected ); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure success_on_both_null @@ -104,7 +104,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_equal( l_expected ); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure success_to_be_null @@ -114,7 +114,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_be_null(); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure success_not_to_be_not_null @@ -124,7 +124,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).not_to_be_not_null(); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure success_not_to_be_null @@ -136,7 +136,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_be_not_null(); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure success_to_be_not_null @@ -148,7 +148,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_be_not_null(); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure success_is_empty @@ -160,7 +160,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_be_empty(); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure success_is_not_empty @@ -172,7 +172,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).not_to_be_empty(); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure failure_is_null @@ -184,7 +184,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_be_null(); --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); end; procedure failure_is_not_null @@ -194,7 +194,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).not_to_be_null(); --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); end; procedure failure_is_empty @@ -206,7 +206,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_be_empty(); --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); end; procedure failure_is_not_empty @@ -218,7 +218,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).not_to_be_empty(); --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); end; procedure fail_null_vs_empty @@ -231,7 +231,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).not_to_equal( l_expected ); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure fail_on_difference @@ -245,7 +245,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_equal( l_expected ); --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); end; procedure fail_on_expected_missing @@ -259,7 +259,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_equal( l_expected ); --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); end; procedure fail_on_actual_missing @@ -273,7 +273,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_equal( l_expected ); --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); end; procedure fail_on_different_column_name @@ -287,7 +287,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_equal( l_expected ); --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); end; @@ -302,7 +302,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_equal( l_expected ); --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); end; procedure pass_on_different_column_order @@ -316,7 +316,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_equal( l_expected ).unordered_columns; --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure pass_on_diff_column_ord_uc @@ -330,7 +330,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_equal( l_expected ).uc; --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure fail_on_multi_diff_col_order @@ -351,7 +351,7 @@ create or replace package body test_expectations_cursor is %Rows: [ 1 differences ] %Row No. 1 - Actual: 4030 %Row No. 1 - Expected: 34]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; @@ -374,7 +374,7 @@ create or replace package body test_expectations_cursor is %Rows: [ 1 differences ] %Row No. 1 - Actual: 4030 %Row No. 1 - Expected: 34]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; @@ -390,7 +390,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_equal( l_expected ); --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); end; procedure include_time_in_date_with_nls @@ -407,7 +407,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_equal( l_expected ); --Assert - ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); ut3.ut.reset_nls; end; @@ -422,7 +422,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect(l_actual).to_equal(l_expected); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure exclude_columns_as_list @@ -436,7 +436,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect(l_actual).to_equal(l_expected, a_exclude=>ut3.ut_varchar2_list('A_COLUMN','Some_Col')); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure exclude_columns_as_csv @@ -450,7 +450,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect(l_actual).to_equal(l_expected, a_exclude=>'A_COLUMN,Some_Col'); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure exclude_columns_as_mixed_list is @@ -463,7 +463,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect(l_actual).to_equal(l_expected, a_exclude=>ut3.ut_varchar2_list('A_COLUMN','/ROW/Some_Col')); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure exclude_columns_as_mix_csv_lst is @@ -476,7 +476,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect(l_actual).to_equal(l_expected, a_exclude=>'A_COLUMN,/ROW/Some_Col'); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure exclude_columns_xpath_invalid @@ -501,7 +501,7 @@ create or replace package body test_expectations_cursor is %Row No. 2 - Expected: c %Row No. 3 - Actual: d %Row No. 3 - Expected: c]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; @@ -517,7 +517,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect(l_actual).to_equal(l_expected, a_exclude=>'/ROW/A_COLUMN|/ROW/Some_Col'); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure exclude_ignores_invalid_column @@ -531,7 +531,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect(l_actual).to_equal(l_expected, a_exclude=>ut3.ut_varchar2_list('A_COLUMN','non_existing_column')); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure include_columns_as_list @@ -545,7 +545,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect(l_actual).to_equal(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure include_columns_as_csv @@ -559,7 +559,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect(l_actual).to_equal(l_expected).include('RN,//A_Column, SOME_COL'); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure include_columns_xpath @@ -573,7 +573,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect(l_actual).to_equal(l_expected).include('/ROW/RN|//A_Column|//SOME_COL'); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure include_ignores_invalid_column @@ -587,7 +587,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect(l_actual).to_equal(l_expected).include(ut3.ut_varchar2_list(' RN ',' non_existing_column ')); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure include_exclude_col_csv_xpath @@ -601,7 +601,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect(l_actual).to_equal(l_expected).exclude('Some_Col').include('/ROW/RN|//Some_Col'); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure include_exclude_columns_list @@ -615,7 +615,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect(l_actual).to_equal(l_expected).exclude(ut3.ut_varchar2_list('A_COLUMN')).include(ut3.ut_varchar2_list('RN','A_Column','A_COLUMN')); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure data_diff_on_rows_mismatch @@ -637,7 +637,7 @@ Rows: [ 2 differences ] Row No. 2 - Actual: 6 Row No. 2 - Expected: 2 Row No. 3 - Missing: 3]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; @@ -659,7 +659,7 @@ Columns: Column [position: 2, data-type: NUMBER] is not expected in results. Rows: [ 1 differences ] All rows are different as the columns are not matching.]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; @@ -682,7 +682,7 @@ Columns: Column data-type is invalid. Expected: NUMBER, actual: VARCHAR2. Rows: [ all different ] All rows are different as the columns position is not matching.]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; @@ -704,7 +704,7 @@ Diff: Columns:% Column [data-type: NUMBER] is missing. Expected column position: 2.% Column [position: 2, data-type: NUMBER] is not expected in results.%]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; @@ -729,7 +729,7 @@ Columns: Column is misplaced. Expected position: 4, actual position: 3. Rows: [ all different ] All rows are different as the columns position is not matching.]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; @@ -746,7 +746,7 @@ Rows: [ all different ] --Act ut3.ut.expect(l_actual).to_equal(l_expected).unordered_columns; - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; --%test(Reports only mismatched columns on column data mismatch) @@ -769,7 +769,7 @@ Rows: [ 2 differences ] Row No. 1 - Expected: 1 Row No. 2 - Actual: -2 Row No. 2 - Expected: 2]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; @@ -806,7 +806,7 @@ Rows: [ 60 differences, showing first 20 ] Row No. 38 - Expected: 38 Row No. 40 - Actual: -40 Row No. 40 - Expected: 40]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; @@ -843,7 +843,7 @@ Rows: [ 4 differences ] Row No. 3 - Actual: JESSICAJONES42345 Row No. 3 - Expected: 3TONYSTARK100000 Row No. 4 - Extra: MLUKESKYWALKER21000]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; @@ -879,7 +879,7 @@ Rows: [ 4 differences ] Row No. 3 - Actual: JESSICAJONES42345 Row No. 3 - Expected: 3TONYSTARK100000 Row No. 4 - Extra: MLUKESKYWALKER21000]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; @@ -937,7 +937,7 @@ Rows: [ 4 differences ] --Act ut3.ut.expect(l_expected).to_equal(l_actual); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure closes_cursor_after_use @@ -1014,7 +1014,7 @@ Rows: [ 4 differences ] ut3.ut.expect(l_actual).to_equal(l_expected); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; function get_cursor return sys_refcursor is @@ -1029,8 +1029,8 @@ Rows: [ 4 differences ] --Act ut3.ut.expect(get_cursor()).to_equal(get_cursor(), a_exclude => 'A_COLUMN,Some_Col'); --Assert - ut.expect(cardinality(ut3.ut_expectation_processor.get_warnings())).to_equal(1); - ut.expect(ut3.ut_expectation_processor.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); + ut.expect(cardinality(ut3_tester_helper.main_helper.get_warnings())).to_equal(1); + ut.expect(ut3_tester_helper.main_helper.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); end; procedure deprec_to_equal_excl_list is @@ -1038,8 +1038,8 @@ Rows: [ 4 differences ] --Act ut3.ut.expect(get_cursor()).to_equal(get_cursor(), a_exclude => ut3.ut_varchar2_list('A_COLUMN','Some_Col')); --Assert - ut.expect(cardinality(ut3.ut_expectation_processor.get_warnings())).to_equal(1); - ut.expect(ut3.ut_expectation_processor.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); + ut.expect(cardinality(ut3_tester_helper.main_helper.get_warnings())).to_equal(1); + ut.expect(ut3_tester_helper.main_helper.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); end; procedure deprec_not_to_equal_excl_varch is @@ -1047,8 +1047,8 @@ Rows: [ 4 differences ] --Act ut3.ut.expect(get_cursor()).not_to_equal(get_cursor(), a_exclude => 'A_COLUMN,Some_Col'); --Assert - ut.expect(cardinality(ut3.ut_expectation_processor.get_warnings())).to_equal(1); - ut.expect(ut3.ut_expectation_processor.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); + ut.expect(cardinality(ut3_tester_helper.main_helper.get_warnings())).to_equal(1); + ut.expect(ut3_tester_helper.main_helper.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); end; procedure deprec_not_to_equal_excl_list is @@ -1056,8 +1056,8 @@ Rows: [ 4 differences ] --Act ut3.ut.expect(get_cursor()).not_to_equal(get_cursor(), a_exclude => ut3.ut_varchar2_list('A_COLUMN','Some_Col')); --Assert - ut.expect(cardinality(ut3.ut_expectation_processor.get_warnings())).to_equal(1); - ut.expect(ut3.ut_expectation_processor.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); + ut.expect(cardinality(ut3_tester_helper.main_helper.get_warnings())).to_equal(1); + ut.expect(ut3_tester_helper.main_helper.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); end; procedure deprec_equal_excl_varch is @@ -1065,8 +1065,8 @@ Rows: [ 4 differences ] --Act ut3.ut.expect(get_cursor()).to_(ut3.equal(get_cursor(), a_exclude => 'A_COLUMN,Some_Col')); --Assert - ut.expect(cardinality(ut3.ut_expectation_processor.get_warnings())).to_equal(1); - ut.expect(ut3.ut_expectation_processor.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); + ut.expect(cardinality(ut3_tester_helper.main_helper.get_warnings())).to_equal(1); + ut.expect(ut3_tester_helper.main_helper.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); end; procedure deprec_equal_excl_list is @@ -1074,8 +1074,8 @@ Rows: [ 4 differences ] --Act ut3.ut.expect(get_cursor()).to_(ut3.equal(get_cursor(), a_exclude => ut3.ut_varchar2_list('A_COLUMN','Some_Col'))); --Assert - ut.expect(cardinality(ut3.ut_expectation_processor.get_warnings())).to_equal(1); - ut.expect(ut3.ut_expectation_processor.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); + ut.expect(cardinality(ut3_tester_helper.main_helper.get_warnings())).to_equal(1); + ut.expect(ut3_tester_helper.main_helper.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); end; procedure col_diff_on_col_name_implicit is @@ -1099,7 +1099,7 @@ Rows: [ 4 differences ] %Column <2> [position: 2, data-type: CHAR] is not expected in results. %Rows: [ all different ] %All rows are different as the columns position is not matching.]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; @@ -1116,7 +1116,7 @@ Rows: [ 4 differences ] --Act ut3.ut.expect(l_actual).to_equal(l_expected); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure cursor_unorderd_compr_success is @@ -1129,7 +1129,7 @@ Rows: [ 4 differences ] --Act ut3.ut.expect(l_actual).to_equal(l_expected).unordered; --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure cursor_unord_compr_success_uc is @@ -1142,7 +1142,7 @@ Rows: [ 4 differences ] --Act ut3.ut.expect(l_actual).to_equal(l_expected).unordered().uc(); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure cursor_unordered_compare_fail is @@ -1168,7 +1168,7 @@ Rows: [ 4 differences ] %Rows: [ 2 differences ]% %Extra: test-666% %Missing: test-667%]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; @@ -1184,7 +1184,7 @@ Rows: [ 4 differences ] --Act ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OBJECT_ID').uc(); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure cursor_joinby_compare is @@ -1198,7 +1198,7 @@ Rows: [ 4 differences ] --Act ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OBJECT_ID'); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure cursor_joinby_col_not_ord @@ -1221,7 +1221,7 @@ Rows: [ 4 differences ] %PK 1 - Expected: 3 %PK 1 - Actual: 40 %PK 1 - Expected: 4]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; @@ -1237,7 +1237,7 @@ Rows: [ 4 differences ] --Act ut3.ut.expect(l_actual).to_equal(l_expected).join_by(ut3.ut_varchar2_list('OBJECT_ID,OBJECT_NAME')); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure cursor_joinby_compare_nokey is @@ -1258,7 +1258,7 @@ Diff:% %Unable to join sets:% %Join key OWNER does not exists in expected% %Join key OWNER does not exists in actual%]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; @@ -1283,7 +1283,7 @@ Diff:% %Join key USER_ID does not exists in expected% %Join key OWNER does not exists in actual% %Join key USER_ID does not exists in actual%]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; @@ -1306,7 +1306,7 @@ Diff:% %Unable to join sets:% %Join key SOME_COL does not exists in expected% %Join key SOME_COL does not exists in actual%]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; @@ -1329,7 +1329,7 @@ Diff:% %Unable to join sets:% %Join key RN does not exists in expected% %Join key RN does not exists in actual%]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; @@ -1351,7 +1351,7 @@ Diff:% Diff:% %Unable to join sets:% %Join key RNI does not exists in expected%]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; @@ -1373,7 +1373,7 @@ Diff:% Diff:% %Unable to join sets:% %Join key RNI does not exists in actual%]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; @@ -1388,7 +1388,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OBJECT_ID'); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure cursor_unorder_compare_1000 is @@ -1401,7 +1401,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_equal(l_expected).unordered; --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure cursor_joinby_compare_fail is @@ -1425,7 +1425,7 @@ Diff:% %Rows: [ 1 differences ]% %PK TEST - Actual:%-610% %PK TEST - Expected:%-600%]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; @@ -1451,7 +1451,7 @@ Diff:% %Rows: [ 2 differences ]% %PK TEST-610 - Extra: TEST-610% %PK TEST-600 - Missing: TEST-600%]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; @@ -1477,7 +1477,7 @@ Diff:% %Rows: [ 1 differences ]% %PK TESTY - Actual:%-610% %PK TESTY - Expected:%-600%]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; @@ -1493,7 +1493,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_equal(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')).unordered; --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure joinby_incl_cols_as_list @@ -1507,7 +1507,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_equal(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')).join_by('RN'); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure joinby_excl_cols_as_list @@ -1521,7 +1521,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_equal(l_expected).exclude(ut3.ut_varchar2_list('//Some_Col','A_COLUMN')).join_by('RN'); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure unord_excl_cols_as_list @@ -1535,7 +1535,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_equal(l_expected).exclude(ut3.ut_varchar2_list('A_COLUMN|//Some_Col')).unordered; --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure excl_dif_cols_as_list @@ -1549,7 +1549,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_equal(l_expected).exclude(ut3.ut_varchar2_list('A_COLUMN')); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure inlc_dif_cols_as_list @@ -1563,7 +1563,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_equal(l_expected).include(ut3.ut_varchar2_list('RN')); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure inlc_exc_dif_cols_as_list @@ -1577,7 +1577,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_equal(l_expected).include(ut3.ut_varchar2_list('RN')).exclude(ut3.ut_varchar2_list('A_COLUMN')); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure compare_obj_typ_col_un is @@ -1585,16 +1585,16 @@ Diff:% l_expected sys_refcursor; begin --Arrange - open l_actual for select test_dummy_object( rownum, 'Something '||rownum, rownum) as colval + open l_actual for select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) as colval from dual connect by level <=2 order by rownum asc; - open l_expected for select test_dummy_object( rownum, 'Something '||rownum, rownum) as colval + open l_expected for select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) as colval from dual connect by level <=2 order by rownum desc; --Act ut3.ut.expect(l_actual).to_equal(l_expected).unordered; --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure compare_obj_typ_col_jb is @@ -1602,16 +1602,16 @@ Diff:% l_expected sys_refcursor; begin --Arrange - open l_actual for select test_dummy_object( rownum, 'Something '||rownum, rownum) as colval + open l_actual for select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) as colval from dual connect by level <=2 order by rownum asc; - open l_expected for select test_dummy_object( rownum, 'Something '||rownum, rownum) as colval + open l_expected for select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) as colval from dual connect by level <=2 order by rownum desc; --Act ut3.ut.expect(l_actual).to_equal(l_expected).join_by('COLVAL/ID'); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure comp_obj_typ_col_un_fail is @@ -1621,10 +1621,10 @@ Diff:% l_actual_message varchar2(32767); begin --Arrange - open l_actual for select test_dummy_object( rownum, 'Something '||rownum, rownum) as colval + open l_actual for select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) as colval from dual connect by level <=2 order by rownum asc; - open l_expected for select test_dummy_object( rownum, 'Somethings '||rownum, rownum) as colval + open l_expected for select ut3_tester_helper.test_dummy_object( rownum, 'Somethings '||rownum, rownum) as colval from dual connect by level <=3 order by rownum desc; --Act @@ -1637,7 +1637,7 @@ Rows: [ 5 differences% %Missing: 3Somethings 33% %Missing: 2Somethings 22% %Missing: 1Somethings 11%]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; @@ -1647,16 +1647,16 @@ Rows: [ 5 differences% l_expected sys_refcursor; begin --Arrange - open l_actual for select test_dummy_object( rownum, 'Something '||rownum, rownum) as colval + open l_actual for select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) as colval from dual connect by level <=2 order by rownum asc; - open l_expected for select test_dummy_object( rownum, 'Somethings '||rownum, rownum) as colval + open l_expected for select ut3_tester_helper.test_dummy_object( rownum, 'Somethings '||rownum, rownum) as colval from dual connect by level <=2 order by rownum desc; --Act ut3.ut.expect(l_actual).to_equal(l_expected).join_by('COLVAL/ID'); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_not_null(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); end; procedure comp_obj_typ_col_jb_multi is @@ -1664,16 +1664,16 @@ Rows: [ 5 differences% l_expected sys_refcursor; begin --Arrange - open l_actual for select rownum as rn,test_dummy_object( rownum, 'Something '||rownum, rownum) as colval + open l_actual for select rownum as rn,ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) as colval from dual connect by level <=2 order by rownum asc; - open l_expected for select rownum as rn,test_dummy_object( rownum, 'Something '||rownum, rownum) as colval + open l_expected for select rownum as rn,ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) as colval from dual connect by level <=2 order by rownum desc; --Act ut3.ut.expect(l_actual).to_equal(l_expected).join_by(ut3.ut_varchar2_list('RN,COLVAL/ID')); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure comp_obj_typ_col_jb_nokey is @@ -1683,10 +1683,10 @@ Rows: [ 5 differences% l_actual_message varchar2(32767); begin --Arrange - open l_actual for select test_dummy_object( rownum, 'Something '||rownum, rownum) as colval + open l_actual for select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) as colval from dual connect by level <=2 order by rownum asc; - open l_expected for select test_dummy_object( rownum, 'Something '||rownum, rownum) as colval + open l_expected for select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) as colval from dual connect by level <=2 order by rownum desc; --Act @@ -1697,7 +1697,7 @@ Diff:% %Unable to join sets:% %Join key COLVAL/IDS does not exists in expected% %Join key COLVAL/IDS does not exists in actual%]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; @@ -1729,7 +1729,7 @@ Diff:% ut3.ut.expect(l_actual).to_equal(l_expected).join_by('KEY'); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure compare_nest_tab_col_jb_fail is @@ -1764,7 +1764,7 @@ Diff:% %PK % - Expected: %% %PK % - Actual: %% %PK % - Expected: %%]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; @@ -1796,7 +1796,7 @@ Diff:% ut3.ut.expect(l_actual).to_equal(l_expected).join_by(ut3.ut_varchar2_list('KEY,VALUE')); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure compare_nest_tab_cols_jb_fail is @@ -1831,7 +1831,7 @@ Diff:% %PK %% - Extra% %PK %% - Missing% %PK %% - Missing%]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; @@ -1870,7 +1870,7 @@ Diff:% %PK %%%%%%%%%%%%%Extra%%% %PK %%%%%%%%%%%%%Missing%%% %PK %%%%%%%%%%%%%Missing%%%]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); @@ -1902,7 +1902,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_equal(l_expected); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; @@ -1940,7 +1940,7 @@ Diff:% %Extra: 21Apples 12Apples 2 %Missing: 11Peaches 12Peaches 2 %Missing: 21Peaches 12Peaches 2%]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); @@ -1974,7 +1974,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_equal(l_expected).join_by('NESTED_TABLE'); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; @@ -2006,7 +2006,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_equal(l_expected).join_by('NESTED_TABLE/OBJECT_OWNER'); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; @@ -2038,7 +2038,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_equal(l_expected).join_by('NESTED_TABLE/ANNOTATIONS'); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; @@ -2081,10 +2081,10 @@ Diff:% %Rows: [ 1 differences ] %PK TEST - Actual: TESTTESTTEST%1testtesttest2testtesttest% %PK TEST - Expected: TESTTESTTEST%11testtesttest2testtesttest%]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); - --ut.expect(expectations.failed_expectations_data()).not_to_be_empty(); + --ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); end; procedure compare_rec_coll_as_join is @@ -2122,7 +2122,7 @@ Diff:% %Join key NESTED_TABLE/ANNOTATIONS/TEXT does not exists in expected% %Join key NESTED_TABLE/ANNOTATIONS/TEXT does not exists in actual% %Please make sure that your join clause is not refferring to collection element%]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); @@ -2154,7 +2154,7 @@ Diff:% %Diff: %Rows: [ 1 differences ] %Missing: Table%]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); @@ -2171,9 +2171,9 @@ Diff:% and rownum < 20; --Act - ut3.ut.expect(l_actual).to_( ut3.contain(l_expected) ); + ut3.ut.expect(l_actual).to_contain(l_expected); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure cursor_to_contain_uc is @@ -2187,9 +2187,9 @@ Diff:% and rownum < 20; --Act - ut3.ut.expect(l_actual).to_( ut3.contain(l_expected).uc() ); + ut3.ut.expect(l_actual).to_contain(l_expected).uc(); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure cursor_to_contain_unordered is @@ -2204,9 +2204,9 @@ Diff:% select owner, object_name,object_type from all_objects where owner = user and rownum < 20; --Act - ut3.ut.expect(l_actual).to_( ut3.contain(l_expected).unordered() ); + ut3.ut.expect(l_actual).to_contain(l_expected).unordered(); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure cursor_to_contain_fail is @@ -2232,7 +2232,7 @@ Diff:% %Missing: %%%% %Missing: %%%% %Missing: %%%%]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; @@ -2248,7 +2248,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_contain(l_expected).join_by('USERNAME'); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure cursor_contain_joinby_fail is @@ -2275,7 +2275,7 @@ Diff:% %Rows: [ 1 differences ] %PK TEST - Actual: -600 %PK TEST - Expected: -601%]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); @@ -2292,7 +2292,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_contain(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure to_cont_join_incl_cols_as_lst @@ -2306,7 +2306,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_contain(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')).join_by('RN'); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure contain_join_excl_cols_as_lst @@ -2320,7 +2320,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_contain(l_expected).exclude(ut3.ut_varchar2_list('//Some_Col','A_COLUMN')).join_by('RN'); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure contain_excl_cols_as_list @@ -2334,7 +2334,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_contain(l_expected).exclude(ut3.ut_varchar2_list('A_COLUMN|//Some_Col')); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure cursor_not_to_contain @@ -2351,7 +2351,7 @@ Diff:% --Act ut3.ut.expect(l_actual).not_to_contain(l_expected); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure cursor_not_to_contain_fail is @@ -2379,7 +2379,7 @@ Diff:% %CHARNUMBER% %Data:% %TEST-600%]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; @@ -2395,7 +2395,7 @@ Diff:% --Act ut3.ut.expect(l_actual).not_to_contain(l_expected).join_by('USER_ID'); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure not_cont_join_incl_cols_as_lst is @@ -2408,7 +2408,7 @@ Diff:% --Act ut3.ut.expect(l_actual).not_to_contain(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')).join_by('RN'); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure not_cont_join_excl_cols_as_lst is @@ -2421,7 +2421,7 @@ Diff:% --Act ut3.ut.expect(l_actual).not_to_contain(l_expected).exclude(ut3.ut_varchar2_list('//Some_Col','A_COLUMN')).join_by('RN'); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure to_contain_duplicates is @@ -2437,7 +2437,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_contain(l_expected); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); end; procedure to_contain_duplicates_fail is @@ -2460,10 +2460,70 @@ Diff:% %Missing: % %Missing: % %Missing: %]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; + procedure udt_messg_format_eq is + l_actual sys_refcursor; + l_expected sys_refcursor; + l_expected_tab ut3.ut_key_value_pairs := ut3.ut_key_value_pairs(); + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + select ut3.ut_key_value_pair(rownum,'Something '||rownum) + bulk collect into l_expected_tab + from dual connect by level <=2; + + --Arrange + open l_actual for select object_name, owner from all_objects where rownum < 3; + open l_expected for select value(x) as udt from table(l_expected_tab) x; + + --Act + ut3.ut.expect(l_actual).to_contain(l_expected); + --Assert + l_expected_message := q'[%Actual: refcursor [ count = 2 ] was expected to contain: refcursor [ count = 2 ] +%Diff: +%Columns: +%Column [data-type: UT_KEY_VALUE_PAIR] is missing. Expected column position: 1. +%Column [position: 1, data-type: VARCHAR2] is not expected in results. +%Column [position: 2, data-type: VARCHAR2] is not expected in results. +%Rows: [ 2 differences ] +%Missing: 1Something 1 +%Missing: 2Something 2%]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure udt_messg_format_empt is + l_actual sys_refcursor; + l_actual_tab ut3.ut_key_value_pairs := ut3.ut_key_value_pairs(); + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + select ut3.ut_key_value_pair(rownum,'Something '||rownum) + bulk collect into l_actual_tab + from dual connect by level <=2; + + --Arrange + open l_actual for select value(x) as udt from table(l_actual_tab) x; + + --Act + ut3.ut.expect(l_actual).to_be_empty(); + --Assert + l_expected_message := q'[%Actual: (refcursor [ count = 2 ]) +%Data-types: +%UT_KEY_VALUE_PAIR +%Data: +%1Something 12Something 2 +%was expected to be empty%]'; + + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + end; / diff --git a/test/core/expectations/test_expectations_cursor.pks b/test/ut3_user/expectations/test_expectations_cursor.pks similarity index 98% rename from test/core/expectations/test_expectations_cursor.pks rename to test/ut3_user/expectations/test_expectations_cursor.pks index c0195393e..e8f492674 100644 --- a/test/core/expectations/test_expectations_cursor.pks +++ b/test/ut3_user/expectations/test_expectations_cursor.pks @@ -390,6 +390,11 @@ create or replace package test_expectations_cursor is --%test(Cursor to contain duplicates fail) procedure to_contain_duplicates_fail; - + + --%test(Display a message with a uer defined type with only type name not structure on equal) + procedure udt_messg_format_eq; + + --%test(Display a message with a uer defined type with only type name not structure on empty) + procedure udt_messg_format_empt; end; / diff --git a/test/ut3_user/expectations/test_matchers.pkb b/test/ut3_user/expectations/test_matchers.pkb index 114e34267..c84a623eb 100644 --- a/test/ut3_user/expectations/test_matchers.pkb +++ b/test/ut3_user/expectations/test_matchers.pkb @@ -2,7 +2,7 @@ create or replace package body test_matchers is procedure cleanup_expectations is begin - ut3_tester_helper.core.clear_expectations( ); + ut3_tester_helper.main_helper.clear_expectations( ); end; procedure exec_matcher(a_type varchar2, a_actual_value varchar2, a_expected_value varchar2, a_matcher varchar2, a_result integer, a_prefix varchar2 := null) is @@ -16,10 +16,10 @@ create or replace package body test_matchers is ut3.ut.expect( l_actual ).'||a_prefix||'to_'||a_matcher||'( l_expected ); end;'; execute immediate l_statement; - if a_result = ut3_tester_helper.core.gc_success then - ut.expect(ut3_tester_helper.core.get_failed_expectations_n()).to_equal(0); + if a_result = ut3_tester_helper.main_helper.gc_success then + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n()).to_equal(0); else - ut.expect(ut3_tester_helper.core.get_failed_expectations_n()).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n()).to_be_greater_than(0); end if; cleanup_expectations(); end exec_matcher; @@ -36,10 +36,10 @@ create or replace package body test_matchers is ut3.ut.expect(l_actual_value).to_be_between(l_lower, l_higher); end;'; execute immediate l_statement; - if a_result = ut3_tester_helper.core.gc_success then - ut.expect(ut3_tester_helper.core.get_failed_expectations_n()).to_equal(0); + if a_result = ut3_tester_helper.main_helper.gc_success then + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n()).to_equal(0); else - ut.expect(ut3_tester_helper.core.get_failed_expectations_n()).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n()).to_be_greater_than(0); end if; cleanup_expectations(); end exec_be_between; @@ -56,10 +56,10 @@ create or replace package body test_matchers is ut3.ut.expect(l_actual_value).'||a_not_prefix||'to_be_between(l_value1, l_value2); end;'; execute immediate l_statement; - if a_result = ut3_tester_helper.core.gc_success then - ut.expect(ut3_tester_helper.core.get_failed_expectations_n()).to_equal(0); + if a_result = ut3_tester_helper.main_helper.gc_success then + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n()).to_equal(0); else - ut.expect(ut3_tester_helper.core.get_failed_expectations_n()).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n()).to_be_greater_than(0); end if; cleanup_expectations(); end exec_be_between2; @@ -76,10 +76,10 @@ create or replace package body test_matchers is ut3.ut.expect( l_actual ).' || a_prefix ||q'[to_be_like(l_pattern, l_escape_char); end;]' using a_pattern, a_escape; - if a_result = ut3_tester_helper.core.gc_success then - ut.expect(ut3_tester_helper.core.get_failed_expectations_n()).to_equal(0); + if a_result = ut3_tester_helper.main_helper.gc_success then + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n()).to_equal(0); else - ut.expect(ut3_tester_helper.core.get_failed_expectations_n()).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n()).to_be_greater_than(0); end if; cleanup_expectations(); end; @@ -97,10 +97,10 @@ create or replace package body test_matchers is ut3.ut.expect( l_actual ).'||a_not_prefix||'to_match(l_pattern, l_modifiers); end;'; execute immediate l_statement using a_pattern, a_modifiers; - if a_result = ut3_tester_helper.core.gc_success then - ut.expect(ut3_tester_helper.core.get_failed_expectations_n()).to_equal(0); + if a_result = ut3_tester_helper.main_helper.gc_success then + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n()).to_equal(0); else - ut.expect(ut3_tester_helper.core.get_failed_expectations_n()).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n()).to_be_greater_than(0); end if; cleanup_expectations(); end; @@ -109,135 +109,135 @@ create or replace package body test_matchers is begin --failure when value out of range - exec_be_between2('date', 'sysdate', 'sysdate-2', 'sysdate-1', ut3_tester_helper.core.gc_failure, ''); - exec_be_between2('number', '2.0', '1.99', '1.999', ut3_tester_helper.core.gc_failure, ''); - exec_be_between2('varchar2(1)', '''c''', '''a''', '''b''', ut3_tester_helper.core.gc_failure, ''); - exec_be_between2('timestamp', 'systimestamp+1', 'systimestamp-1', 'systimestamp', ut3_tester_helper.core.gc_failure, ''); - exec_be_between2('timestamp with local time zone', 'systimestamp+1', 'systimestamp-1', 'systimestamp', ut3_tester_helper.core.gc_failure, ''); - exec_be_between2('timestamp with time zone', 'systimestamp+1', 'systimestamp-1', 'systimestamp', ut3_tester_helper.core.gc_failure, ''); - exec_be_between2('interval year to month', '''2-2''', '''2-0''', '''2-1''', ut3_tester_helper.core.gc_failure, ''); - exec_be_between2('interval day to second', '''2 01:00:00''', '''2 00:59:58''', '''2 00:59:59''', ut3_tester_helper.core.gc_failure, ''); + exec_be_between2('date', 'sysdate', 'sysdate-2', 'sysdate-1', ut3_tester_helper.main_helper.gc_failure, ''); + exec_be_between2('number', '2.0', '1.99', '1.999', ut3_tester_helper.main_helper.gc_failure, ''); + exec_be_between2('varchar2(1)', '''c''', '''a''', '''b''', ut3_tester_helper.main_helper.gc_failure, ''); + exec_be_between2('timestamp', 'systimestamp+1', 'systimestamp-1', 'systimestamp', ut3_tester_helper.main_helper.gc_failure, ''); + exec_be_between2('timestamp with local time zone', 'systimestamp+1', 'systimestamp-1', 'systimestamp', ut3_tester_helper.main_helper.gc_failure, ''); + exec_be_between2('timestamp with time zone', 'systimestamp+1', 'systimestamp-1', 'systimestamp', ut3_tester_helper.main_helper.gc_failure, ''); + exec_be_between2('interval year to month', '''2-2''', '''2-0''', '''2-1''', ut3_tester_helper.main_helper.gc_failure, ''); + exec_be_between2('interval day to second', '''2 01:00:00''', '''2 00:59:58''', '''2 00:59:59''', ut3_tester_helper.main_helper.gc_failure, ''); --success when value in range - exec_be_between2('date', 'sysdate', 'sysdate-1', 'sysdate+1', ut3_tester_helper.core.gc_success, ''); - exec_be_between2('number', '2.0', '1.99', '2.01', ut3_tester_helper.core.gc_success, ''); - exec_be_between2('varchar2(1)', '''b''', '''a''', '''c''', ut3_tester_helper.core.gc_success, ''); - exec_be_between2('timestamp', 'systimestamp', 'systimestamp-1', 'systimestamp+1', ut3_tester_helper.core.gc_success, ''); - exec_be_between2('timestamp with local time zone', 'systimestamp', 'systimestamp-1', 'systimestamp+1', ut3_tester_helper.core.gc_success, ''); - exec_be_between2('timestamp with time zone', 'systimestamp', 'systimestamp-1', 'systimestamp+1', ut3_tester_helper.core.gc_success, ''); - exec_be_between2('interval year to month', '''2-1''', '''2-0''', '''2-2''', ut3_tester_helper.core.gc_success, ''); - exec_be_between2('interval day to second', '''2 01:00:00''', '''2 00:59:58''', '''2 01:00:01''', ut3_tester_helper.core.gc_success, ''); + exec_be_between2('date', 'sysdate', 'sysdate-1', 'sysdate+1', ut3_tester_helper.main_helper.gc_success, ''); + exec_be_between2('number', '2.0', '1.99', '2.01', ut3_tester_helper.main_helper.gc_success, ''); + exec_be_between2('varchar2(1)', '''b''', '''a''', '''c''', ut3_tester_helper.main_helper.gc_success, ''); + exec_be_between2('timestamp', 'systimestamp', 'systimestamp-1', 'systimestamp+1', ut3_tester_helper.main_helper.gc_success, ''); + exec_be_between2('timestamp with local time zone', 'systimestamp', 'systimestamp-1', 'systimestamp+1', ut3_tester_helper.main_helper.gc_success, ''); + exec_be_between2('timestamp with time zone', 'systimestamp', 'systimestamp-1', 'systimestamp+1', ut3_tester_helper.main_helper.gc_success, ''); + exec_be_between2('interval year to month', '''2-1''', '''2-0''', '''2-2''', ut3_tester_helper.main_helper.gc_success, ''); + exec_be_between2('interval day to second', '''2 01:00:00''', '''2 00:59:58''', '''2 01:00:01''', ut3_tester_helper.main_helper.gc_success, ''); --success when value not in range - exec_be_between2('date', 'sysdate', 'sysdate-2', 'sysdate-1', ut3_tester_helper.core.gc_success, 'not_'); - exec_be_between2('number', '2.0', '1.99', '1.999', ut3_tester_helper.core.gc_success, 'not_'); - exec_be_between2('varchar2(1)', '''c''', '''a''', '''b''', ut3_tester_helper.core.gc_success, 'not_'); - exec_be_between2('timestamp', 'systimestamp+1', 'systimestamp-1', 'systimestamp', ut3_tester_helper.core.gc_success, 'not_'); - exec_be_between2('timestamp with local time zone', 'systimestamp+1', 'systimestamp-1', 'systimestamp', ut3_tester_helper.core.gc_success, 'not_'); - exec_be_between2('timestamp with time zone', 'systimestamp+1', 'systimestamp-1', 'systimestamp', ut3_tester_helper.core.gc_success, 'not_'); - exec_be_between2('interval year to month', '''2-2''', '''2-0''', '''2-1''', ut3_tester_helper.core.gc_success, 'not_'); - exec_be_between2('interval day to second', '''2 01:00:00''', '''2 00:59:58''', '''2 00:59:59''', ut3_tester_helper.core.gc_success, 'not_'); + exec_be_between2('date', 'sysdate', 'sysdate-2', 'sysdate-1', ut3_tester_helper.main_helper.gc_success, 'not_'); + exec_be_between2('number', '2.0', '1.99', '1.999', ut3_tester_helper.main_helper.gc_success, 'not_'); + exec_be_between2('varchar2(1)', '''c''', '''a''', '''b''', ut3_tester_helper.main_helper.gc_success, 'not_'); + exec_be_between2('timestamp', 'systimestamp+1', 'systimestamp-1', 'systimestamp', ut3_tester_helper.main_helper.gc_success, 'not_'); + exec_be_between2('timestamp with local time zone', 'systimestamp+1', 'systimestamp-1', 'systimestamp', ut3_tester_helper.main_helper.gc_success, 'not_'); + exec_be_between2('timestamp with time zone', 'systimestamp+1', 'systimestamp-1', 'systimestamp', ut3_tester_helper.main_helper.gc_success, 'not_'); + exec_be_between2('interval year to month', '''2-2''', '''2-0''', '''2-1''', ut3_tester_helper.main_helper.gc_success, 'not_'); + exec_be_between2('interval day to second', '''2 01:00:00''', '''2 00:59:58''', '''2 00:59:59''', ut3_tester_helper.main_helper.gc_success, 'not_'); --failure when value not out of range - exec_be_between2('date', 'sysdate', 'sysdate-1', 'sysdate+1', ut3_tester_helper.core.gc_failure, 'not_'); - exec_be_between2('number', '2.0', '1.99', '2.01', ut3_tester_helper.core.gc_failure, 'not_'); - exec_be_between2('varchar2(1)', '''b''', '''a''', '''c''', ut3_tester_helper.core.gc_failure, 'not_'); - exec_be_between2('timestamp', 'systimestamp', 'systimestamp-1', 'systimestamp+1', ut3_tester_helper.core.gc_failure, 'not_'); - exec_be_between2('timestamp with local time zone', 'systimestamp', 'systimestamp-1', 'systimestamp+1', ut3_tester_helper.core.gc_failure, 'not_'); - exec_be_between2('timestamp with time zone', 'systimestamp', 'systimestamp-1', 'systimestamp+1', ut3_tester_helper.core.gc_failure, 'not_'); - exec_be_between2('interval year to month', '''2-1''', '''2-0''', '''2-2''', ut3_tester_helper.core.gc_failure, 'not_'); - exec_be_between2('interval day to second', '''2 01:00:00''', '''2 00:59:58''', '''2 01:00:01''', ut3_tester_helper.core.gc_failure, 'not_'); + exec_be_between2('date', 'sysdate', 'sysdate-1', 'sysdate+1', ut3_tester_helper.main_helper.gc_failure, 'not_'); + exec_be_between2('number', '2.0', '1.99', '2.01', ut3_tester_helper.main_helper.gc_failure, 'not_'); + exec_be_between2('varchar2(1)', '''b''', '''a''', '''c''', ut3_tester_helper.main_helper.gc_failure, 'not_'); + exec_be_between2('timestamp', 'systimestamp', 'systimestamp-1', 'systimestamp+1', ut3_tester_helper.main_helper.gc_failure, 'not_'); + exec_be_between2('timestamp with local time zone', 'systimestamp', 'systimestamp-1', 'systimestamp+1', ut3_tester_helper.main_helper.gc_failure, 'not_'); + exec_be_between2('timestamp with time zone', 'systimestamp', 'systimestamp-1', 'systimestamp+1', ut3_tester_helper.main_helper.gc_failure, 'not_'); + exec_be_between2('interval year to month', '''2-1''', '''2-0''', '''2-2''', ut3_tester_helper.main_helper.gc_failure, 'not_'); + exec_be_between2('interval day to second', '''2 01:00:00''', '''2 00:59:58''', '''2 01:00:01''', ut3_tester_helper.main_helper.gc_failure, 'not_'); --failure when value is null - exec_be_between2('date', 'null', 'sysdate-1', 'sysdate+1', ut3_tester_helper.core.gc_failure, ''); - exec_be_between2('number', 'null', '1.99', '2.01', ut3_tester_helper.core.gc_failure, ''); - exec_be_between2('varchar2(1)', 'null', '''a''', '''c''', ut3_tester_helper.core.gc_failure, ''); - exec_be_between2('timestamp', 'null', 'systimestamp-1', 'systimestamp+1', ut3_tester_helper.core.gc_failure, ''); - exec_be_between2('timestamp with local time zone', 'null', 'systimestamp-1', 'systimestamp+1', ut3_tester_helper.core.gc_failure, ''); - exec_be_between2('timestamp with time zone', 'null', 'systimestamp-1', 'systimestamp+1', ut3_tester_helper.core.gc_failure, ''); - exec_be_between2('interval year to month', 'null', '''2-0''', '''2-2''', ut3_tester_helper.core.gc_failure, ''); - exec_be_between2('interval day to second', 'null', '''2 00:59:58''', '''2 01:00:01''', ut3_tester_helper.core.gc_failure, ''); + exec_be_between2('date', 'null', 'sysdate-1', 'sysdate+1', ut3_tester_helper.main_helper.gc_failure, ''); + exec_be_between2('number', 'null', '1.99', '2.01', ut3_tester_helper.main_helper.gc_failure, ''); + exec_be_between2('varchar2(1)', 'null', '''a''', '''c''', ut3_tester_helper.main_helper.gc_failure, ''); + exec_be_between2('timestamp', 'null', 'systimestamp-1', 'systimestamp+1', ut3_tester_helper.main_helper.gc_failure, ''); + exec_be_between2('timestamp with local time zone', 'null', 'systimestamp-1', 'systimestamp+1', ut3_tester_helper.main_helper.gc_failure, ''); + exec_be_between2('timestamp with time zone', 'null', 'systimestamp-1', 'systimestamp+1', ut3_tester_helper.main_helper.gc_failure, ''); + exec_be_between2('interval year to month', 'null', '''2-0''', '''2-2''', ut3_tester_helper.main_helper.gc_failure, ''); + exec_be_between2('interval day to second', 'null', '''2 00:59:58''', '''2 01:00:01''', ut3_tester_helper.main_helper.gc_failure, ''); - exec_be_between2('date', 'null', 'sysdate-2', 'sysdate-1', ut3_tester_helper.core.gc_failure, 'not_'); - exec_be_between2('number', 'null', '1.99', '1.999', ut3_tester_helper.core.gc_failure, 'not_'); - exec_be_between2('varchar2(1)', 'null', '''a''', '''b''', ut3_tester_helper.core.gc_failure, 'not_'); - exec_be_between2('timestamp', 'null', 'systimestamp-1', 'systimestamp', ut3_tester_helper.core.gc_failure, 'not_'); - exec_be_between2('timestamp with local time zone', 'null', 'systimestamp-1', 'systimestamp', ut3_tester_helper.core.gc_failure, 'not_'); - exec_be_between2('timestamp with time zone', 'null', 'systimestamp-1', 'systimestamp', ut3_tester_helper.core.gc_failure, 'not_'); - exec_be_between2('interval year to month', 'null', '''2-0''', '''2-1''', ut3_tester_helper.core.gc_failure, 'not_'); - exec_be_between2('interval day to second', 'null', '''2 00:59:58''', '''2 00:59:59''', ut3_tester_helper.core.gc_failure, 'not_'); + exec_be_between2('date', 'null', 'sysdate-2', 'sysdate-1', ut3_tester_helper.main_helper.gc_failure, 'not_'); + exec_be_between2('number', 'null', '1.99', '1.999', ut3_tester_helper.main_helper.gc_failure, 'not_'); + exec_be_between2('varchar2(1)', 'null', '''a''', '''b''', ut3_tester_helper.main_helper.gc_failure, 'not_'); + exec_be_between2('timestamp', 'null', 'systimestamp-1', 'systimestamp', ut3_tester_helper.main_helper.gc_failure, 'not_'); + exec_be_between2('timestamp with local time zone', 'null', 'systimestamp-1', 'systimestamp', ut3_tester_helper.main_helper.gc_failure, 'not_'); + exec_be_between2('timestamp with time zone', 'null', 'systimestamp-1', 'systimestamp', ut3_tester_helper.main_helper.gc_failure, 'not_'); + exec_be_between2('interval year to month', 'null', '''2-0''', '''2-1''', ut3_tester_helper.main_helper.gc_failure, 'not_'); + exec_be_between2('interval day to second', 'null', '''2 00:59:58''', '''2 00:59:59''', ut3_tester_helper.main_helper.gc_failure, 'not_'); --failure when lower bound is null - exec_be_between2('date', 'sysdate', 'null', 'sysdate+1', ut3_tester_helper.core.gc_failure, ''); - exec_be_between2('number', '2.0', 'null', '2.01', ut3_tester_helper.core.gc_failure, ''); - exec_be_between2('varchar2(1)', '''b''', 'null', '''c''', ut3_tester_helper.core.gc_failure, ''); - exec_be_between2('timestamp', 'systimestamp', 'null', 'systimestamp+1', ut3_tester_helper.core.gc_failure, ''); - exec_be_between2('timestamp with local time zone', 'systimestamp', 'null', 'systimestamp+1', ut3_tester_helper.core.gc_failure, ''); - exec_be_between2('timestamp with time zone', 'systimestamp', 'null', 'systimestamp+1', ut3_tester_helper.core.gc_failure, ''); - exec_be_between2('interval year to month', '''2-1''', 'null', '''2-2''', ut3_tester_helper.core.gc_failure, ''); - exec_be_between2('interval day to second', '''2 01:00:00''', 'null', '''2 01:00:01''', ut3_tester_helper.core.gc_failure, ''); + exec_be_between2('date', 'sysdate', 'null', 'sysdate+1', ut3_tester_helper.main_helper.gc_failure, ''); + exec_be_between2('number', '2.0', 'null', '2.01', ut3_tester_helper.main_helper.gc_failure, ''); + exec_be_between2('varchar2(1)', '''b''', 'null', '''c''', ut3_tester_helper.main_helper.gc_failure, ''); + exec_be_between2('timestamp', 'systimestamp', 'null', 'systimestamp+1', ut3_tester_helper.main_helper.gc_failure, ''); + exec_be_between2('timestamp with local time zone', 'systimestamp', 'null', 'systimestamp+1', ut3_tester_helper.main_helper.gc_failure, ''); + exec_be_between2('timestamp with time zone', 'systimestamp', 'null', 'systimestamp+1', ut3_tester_helper.main_helper.gc_failure, ''); + exec_be_between2('interval year to month', '''2-1''', 'null', '''2-2''', ut3_tester_helper.main_helper.gc_failure, ''); + exec_be_between2('interval day to second', '''2 01:00:00''', 'null', '''2 01:00:01''', ut3_tester_helper.main_helper.gc_failure, ''); - exec_be_between2('date', 'sysdate', 'null', 'sysdate-1', ut3_tester_helper.core.gc_failure, 'not_'); - exec_be_between2('number', '2.0', 'null', '1.999', ut3_tester_helper.core.gc_failure, 'not_'); - exec_be_between2('varchar2(1)', '''b''', 'null', '''b''', ut3_tester_helper.core.gc_failure, 'not_'); - exec_be_between2('timestamp', 'systimestamp+1', 'null', 'systimestamp', ut3_tester_helper.core.gc_failure, 'not_'); - exec_be_between2('timestamp with local time zone', 'systimestamp+1', 'null', 'systimestamp', ut3_tester_helper.core.gc_failure, 'not_'); - exec_be_between2('timestamp with time zone', 'systimestamp+1', 'null', 'systimestamp', ut3_tester_helper.core.gc_failure, 'not_'); - exec_be_between2('interval year to month', '''2-2''', 'null', '''2-1''', ut3_tester_helper.core.gc_failure, 'not_'); - exec_be_between2('interval day to second', '''2 01:00:00''', 'null', '''2 00:59:59''', ut3_tester_helper.core.gc_failure, 'not_'); + exec_be_between2('date', 'sysdate', 'null', 'sysdate-1', ut3_tester_helper.main_helper.gc_failure, 'not_'); + exec_be_between2('number', '2.0', 'null', '1.999', ut3_tester_helper.main_helper.gc_failure, 'not_'); + exec_be_between2('varchar2(1)', '''b''', 'null', '''b''', ut3_tester_helper.main_helper.gc_failure, 'not_'); + exec_be_between2('timestamp', 'systimestamp+1', 'null', 'systimestamp', ut3_tester_helper.main_helper.gc_failure, 'not_'); + exec_be_between2('timestamp with local time zone', 'systimestamp+1', 'null', 'systimestamp', ut3_tester_helper.main_helper.gc_failure, 'not_'); + exec_be_between2('timestamp with time zone', 'systimestamp+1', 'null', 'systimestamp', ut3_tester_helper.main_helper.gc_failure, 'not_'); + exec_be_between2('interval year to month', '''2-2''', 'null', '''2-1''', ut3_tester_helper.main_helper.gc_failure, 'not_'); + exec_be_between2('interval day to second', '''2 01:00:00''', 'null', '''2 00:59:59''', ut3_tester_helper.main_helper.gc_failure, 'not_'); --Fails for unsupported data-type - exec_be_between2('clob', '''b''', '''a''', '''c''', ut3_tester_helper.core.gc_failure, ''); + exec_be_between2('clob', '''b''', '''a''', '''c''', ut3_tester_helper.main_helper.gc_failure, ''); end; procedure test_match is begin - exec_match('varchar2(100)', '''Stephen''', '^Ste(v|ph)en$', '', ut3_tester_helper.core.gc_success); - exec_match('varchar2(100)', '''sTEPHEN''', '^Ste(v|ph)en$', 'i', ut3_tester_helper.core.gc_success); - exec_match('clob', 'to_clob(rpad('', '',32767)||''Stephen'')', 'Ste(v|ph)en$', '', ut3_tester_helper.core.gc_success); - exec_match('clob', 'to_clob(rpad('', '',32767)||''sTEPHEN'')', 'Ste(v|ph)en$', 'i', ut3_tester_helper.core.gc_success); + exec_match('varchar2(100)', '''Stephen''', '^Ste(v|ph)en$', '', ut3_tester_helper.main_helper.gc_success); + exec_match('varchar2(100)', '''sTEPHEN''', '^Ste(v|ph)en$', 'i', ut3_tester_helper.main_helper.gc_success); + exec_match('clob', 'to_clob(rpad('', '',32767)||''Stephen'')', 'Ste(v|ph)en$', '', ut3_tester_helper.main_helper.gc_success); + exec_match('clob', 'to_clob(rpad('', '',32767)||''sTEPHEN'')', 'Ste(v|ph)en$', 'i', ut3_tester_helper.main_helper.gc_success); - exec_match('varchar2(100)', '''Stephen''', '^Steven$', '', ut3_tester_helper.core.gc_failure); - exec_match('varchar2(100)', '''sTEPHEN''', '^Steven$', 'i', ut3_tester_helper.core.gc_failure); - exec_match('clob', 'to_clob(rpad('', '',32767)||''Stephen'')', '^Stephen', '', ut3_tester_helper.core.gc_failure); - exec_match('clob', 'to_clob(rpad('', '',32767)||''sTEPHEN'')', '^Stephen', 'i', ut3_tester_helper.core.gc_failure); + exec_match('varchar2(100)', '''Stephen''', '^Steven$', '', ut3_tester_helper.main_helper.gc_failure); + exec_match('varchar2(100)', '''sTEPHEN''', '^Steven$', 'i', ut3_tester_helper.main_helper.gc_failure); + exec_match('clob', 'to_clob(rpad('', '',32767)||''Stephen'')', '^Stephen', '', ut3_tester_helper.main_helper.gc_failure); + exec_match('clob', 'to_clob(rpad('', '',32767)||''sTEPHEN'')', '^Stephen', 'i', ut3_tester_helper.main_helper.gc_failure); - exec_match('varchar2(100)', '''Stephen''', '^Ste(v|ph)en$', '', ut3_tester_helper.core.gc_failure, 'not_'); - exec_match('varchar2(100)', '''sTEPHEN''', '^Ste(v|ph)en$', 'i', ut3_tester_helper.core.gc_failure, 'not_'); - exec_match('clob', 'to_clob(rpad('', '',32767)||''Stephen'')', 'Ste(v|ph)en$', '', ut3_tester_helper.core.gc_failure, 'not_'); - exec_match('clob', 'to_clob(rpad('', '',32767)||''sTEPHEN'')', 'Ste(v|ph)en$', 'i', ut3_tester_helper.core.gc_failure, 'not_'); + exec_match('varchar2(100)', '''Stephen''', '^Ste(v|ph)en$', '', ut3_tester_helper.main_helper.gc_failure, 'not_'); + exec_match('varchar2(100)', '''sTEPHEN''', '^Ste(v|ph)en$', 'i', ut3_tester_helper.main_helper.gc_failure, 'not_'); + exec_match('clob', 'to_clob(rpad('', '',32767)||''Stephen'')', 'Ste(v|ph)en$', '', ut3_tester_helper.main_helper.gc_failure, 'not_'); + exec_match('clob', 'to_clob(rpad('', '',32767)||''sTEPHEN'')', 'Ste(v|ph)en$', 'i', ut3_tester_helper.main_helper.gc_failure, 'not_'); - exec_match('varchar2(100)', '''Stephen''', '^Steven$', '', ut3_tester_helper.core.gc_success, 'not_'); - exec_match('varchar2(100)', '''sTEPHEN''', '^Steven$', 'i', ut3_tester_helper.core.gc_success, 'not_'); - exec_match('clob', 'to_clob(rpad('', '',32767)||''Stephen'')', '^Stephen', '', ut3_tester_helper.core.gc_success, 'not_'); - exec_match('clob', 'to_clob(rpad('', '',32767)||''sTEPHEN'')', '^Stephen', 'i', ut3_tester_helper.core.gc_success, 'not_'); + exec_match('varchar2(100)', '''Stephen''', '^Steven$', '', ut3_tester_helper.main_helper.gc_success, 'not_'); + exec_match('varchar2(100)', '''sTEPHEN''', '^Steven$', 'i', ut3_tester_helper.main_helper.gc_success, 'not_'); + exec_match('clob', 'to_clob(rpad('', '',32767)||''Stephen'')', '^Stephen', '', ut3_tester_helper.main_helper.gc_success, 'not_'); + exec_match('clob', 'to_clob(rpad('', '',32767)||''sTEPHEN'')', '^Stephen', 'i', ut3_tester_helper.main_helper.gc_success, 'not_'); --Fails for unsupported data-type - exec_match('number', '12345', '^123.*', 'i', ut3_tester_helper.core.gc_failure); + exec_match('number', '12345', '^123.*', 'i', ut3_tester_helper.main_helper.gc_failure); end; procedure test_be_like is begin - exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste__en%', '', ut3_tester_helper.core.gc_success); - exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste__en\_K%', '\', ut3_tester_helper.core.gc_success); - exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Ste__en%', '', ut3_tester_helper.core.gc_success); - exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Ste__en\_K%', '\', ut3_tester_helper.core.gc_success); + exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste__en%', '', ut3_tester_helper.main_helper.gc_success); + exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste__en\_K%', '\', ut3_tester_helper.main_helper.gc_success); + exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Ste__en%', '', ut3_tester_helper.main_helper.gc_success); + exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Ste__en\_K%', '\', ut3_tester_helper.main_helper.gc_success); - exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste_en%', '', ut3_tester_helper.core.gc_failure); - exec_be_like('varchar2(100)', '''Stephen_King''', 'Stephe\__%', '\', ut3_tester_helper.core.gc_failure); - exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Ste_en%', '', ut3_tester_helper.core.gc_failure); - exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Stephe\__%', '\', ut3_tester_helper.core.gc_failure); + exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste_en%', '', ut3_tester_helper.main_helper.gc_failure); + exec_be_like('varchar2(100)', '''Stephen_King''', 'Stephe\__%', '\', ut3_tester_helper.main_helper.gc_failure); + exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Ste_en%', '', ut3_tester_helper.main_helper.gc_failure); + exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Stephe\__%', '\', ut3_tester_helper.main_helper.gc_failure); - exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste__en%', '', ut3_tester_helper.core.gc_failure, 'not_'); - exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste__en\_K%', '\', ut3_tester_helper.core.gc_failure, 'not_'); - exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Ste__en%', '', ut3_tester_helper.core.gc_failure, 'not_'); - exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Ste__en\_K%', '\', ut3_tester_helper.core.gc_failure, 'not_'); + exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste__en%', '', ut3_tester_helper.main_helper.gc_failure, 'not_'); + exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste__en\_K%', '\', ut3_tester_helper.main_helper.gc_failure, 'not_'); + exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Ste__en%', '', ut3_tester_helper.main_helper.gc_failure, 'not_'); + exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Ste__en\_K%', '\', ut3_tester_helper.main_helper.gc_failure, 'not_'); - exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste_en%', '', ut3_tester_helper.core.gc_success, 'not_'); - exec_be_like('varchar2(100)', '''Stephen_King''', 'Stephe\__%', '\', ut3_tester_helper.core.gc_success, 'not_'); - exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Ste_en%', '', ut3_tester_helper.core.gc_success, 'not_'); - exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Stephe\__%', '\', ut3_tester_helper.core.gc_success, 'not_'); + exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste_en%', '', ut3_tester_helper.main_helper.gc_success, 'not_'); + exec_be_like('varchar2(100)', '''Stephen_King''', 'Stephe\__%', '\', ut3_tester_helper.main_helper.gc_success, 'not_'); + exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Ste_en%', '', ut3_tester_helper.main_helper.gc_success, 'not_'); + exec_be_like('clob', 'to_clob(rpad(''a'',32767,''a'')||''Stephen_King'')', 'a%Stephe\__%', '\', ut3_tester_helper.main_helper.gc_success, 'not_'); --Fails for unsupported data-type - exec_be_like('number', '12345', '123%', '', ut3_tester_helper.core.gc_failure); + exec_be_like('number', '12345', '123%', '', ut3_tester_helper.main_helper.gc_failure); end; procedure test_timestamp_between is From c56943e8cbe11303cbcc35d2119e2008fe3fedec Mon Sep 17 00:00:00 2001 From: Lukasz Date: Sun, 24 Mar 2019 16:47:14 +0000 Subject: [PATCH 0344/1096] Update properties --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index ce865e05a..f23501e05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,8 @@ env: - UT3_USER_PASSWORD=ut3 - UT3_TESTER=ut3_tester - UT3_TESTER_PASSWORD=ut3 + - UT3_TESTER_HELPER=ut3_tester_helper + - UT3_TESTER_HELPER_PASSWORD=ut3 - UT3_TABLESPACE=users # Environment for building a release - CURRENT_BRANCH=${TRAVIS_BRANCH} From 5afba1000b1a2ccdb0f6a3b7621dab107eabb556 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sun, 24 Mar 2019 18:02:00 +0000 Subject: [PATCH 0345/1096] Change user that executes tests as helper that is super user. --- .travis/install.sh | 1 - test/install_and_run_tests.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index 3cd476981..a6ab0cc16 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -86,7 +86,6 @@ grant drop public database link to $UT3_TESTER_HELPER; set feedback on --Needed for testing coverage outside of main UT3 schema. grant create any procedure, drop any procedure, execute any procedure, create any type, drop any type, execute any type, under any type, select any table, update any table, insert any table, delete any table, create any table, drop any table, alter any table, select any dictionary to $UT3_TESTER_HELPER; -revoke execute on dbms_crypto from $UT3_TESTER_HELPER; grant create job to $UT3_TESTER_HELPER; exit SQL diff --git a/test/install_and_run_tests.sh b/test/install_and_run_tests.sh index 421732be1..953d75bc7 100755 --- a/test/install_and_run_tests.sh +++ b/test/install_and_run_tests.sh @@ -14,7 +14,7 @@ time "$SQLCLI" ${UT3_TESTER}/${UT3_TESTER_PASSWORD}@//${CONNECTION_STR} @install cd .. -time utPLSQL-cli/bin/utplsql run ${UT3_TESTER}/${UT3_TESTER_PASSWORD}@${CONNECTION_STR} \ +time utPLSQL-cli/bin/utplsql run ${UT3_TESTER_HELPER}/${UT3_TESTER_HELPER_PASSWORD}@${CONNECTION_STR} \ -source_path=source -owner=ut3 \ -p='ut3_tester,ut3$user#' \ -test_path=test -c \ From 423bf333aa4fd5867d002aafdc734341faebd5ce Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 24 Mar 2019 18:16:47 +0000 Subject: [PATCH 0346/1096] Updated version to `3.1.7` --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index d80dc339d..e5e2ba276 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.6 +v3.1.7 From fab90fd51ed32bc6040ae42efe07964bc7986664 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sun, 24 Mar 2019 18:50:06 +0000 Subject: [PATCH 0347/1096] Updated project version after build [skip ci] --- VERSION | 2 +- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- sonar-project.properties | 2 +- source/core/ut_utils.pks | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/VERSION b/VERSION index e5e2ba276..5ae33779b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.7 +v3.1.7-develop diff --git a/docs/about/authors.md b/docs/about/authors.md index b3abfac6c..a2893d370 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index b55ca2d4d..5d89726af 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 51c135cfc..bddb264dd 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 4a7720d37..e9b56bee3 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 772c7d463..305afe3d4 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 63f0461f6..64a242840 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 4e888ee95..de5d76f16 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index b47b90c91..8b68d667b 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 4f2a30688..e154a77b1 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 2a220efad..af60ac266 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 25de3c652..3b6e7ce45 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 6f59dc759..2621221e5 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 0a47fcfd1..e0916fa6f 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 50aa661f5..2b25f2ae5 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 104795ded..b7d114bcf 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 3703fa4d8..4abe304b5 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index b803a671a..70dd4c551 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.6.2729-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) # Upgrading from version 2 diff --git a/sonar-project.properties b/sonar-project.properties index c137871ee..d6744053e 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,7 @@ sonar.projectKey=utPLSQL # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=utPLSQL -sonar.projectVersion=v3.1.6 +sonar.projectVersion=v3.1.7-develop # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # Since SonarQube 4.2, this property is optional if sonar.modules is set. diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index a9ecf9ac6..da8f0c2dd 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.6.2729'; + gc_version constant varchar2(50) := 'v3.1.7.2737-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 7cd92e77e4807e1ae33776a2b70ab05211df8d09 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sun, 24 Mar 2019 23:05:11 +0000 Subject: [PATCH 0348/1096] Adding next set of tests migrated. expectations/binary/test_equal expectations/binary/test_expect_to_be_less_than expectations/test_expectation_anydata expectations/test_expectation_processor --- test/grant_ut3_owner_to_ut3_tester.sql | 35 + test/install_and_run_tests.sh | 2 + test/install_ut3_tester_helper.sql | 6 + test/install_ut3_tester_tests.sql | 4 + test/install_ut3_user_tests.sql | 6 + test/ut3_tester/core.pkb | 11 + test/ut3_tester/core.pks | 10 + .../test_before_after_annotations.pks | 2 +- test/ut3_tester/core/core.pkb | 125 --- test/ut3_tester/core/core.pks | 32 - .../test_expectation_processor.pkb | 71 ++ .../test_expectation_processor.pks | 17 + .../ut3_tester_helper/expectations_helper.pkb | 57 + .../ut3_tester_helper/expectations_helper.pks | 25 + test/ut3_tester_helper/main_helper.pkb | 10 + test/ut3_tester_helper/main_helper.pks | 6 +- test/ut3_tester_helper/other_dummy_object.tps | 16 + test/ut3_tester_helper/test_dummy_object.tps | 3 - .../test_dummy_object_list.tps | 2 + test/ut3_tester_helper/test_tab_varchar2.tps | 12 + test/ut3_tester_helper/test_tab_varray.tps | 13 + test/ut3_user/api/test_ut_runner.pks | 2 +- .../expectations/binary/test_equal.pkb | 264 +++++ .../expectations/binary/test_equal.pks | 38 + .../binary/test_expect_to_be_less_than.pkb | 263 +++++ .../binary/test_expect_to_be_less_than.pks | 97 ++ .../expectations/test_expectation_anydata.pkb | 974 ++++++++++++++++++ .../expectations/test_expectation_anydata.pks | 202 ++++ .../expectations/test_expectations_cursor.pks | 2 +- test/ut3_user/expectations/test_matchers.pks | 2 +- 30 files changed, 2144 insertions(+), 165 deletions(-) create mode 100644 test/grant_ut3_owner_to_ut3_tester.sql create mode 100644 test/ut3_tester/core.pkb create mode 100644 test/ut3_tester/core.pks delete mode 100644 test/ut3_tester/core/core.pkb delete mode 100644 test/ut3_tester/core/core.pks create mode 100644 test/ut3_tester/core/expectations/test_expectation_processor.pkb create mode 100644 test/ut3_tester/core/expectations/test_expectation_processor.pks create mode 100644 test/ut3_tester_helper/expectations_helper.pkb create mode 100644 test/ut3_tester_helper/expectations_helper.pks create mode 100644 test/ut3_tester_helper/other_dummy_object.tps create mode 100644 test/ut3_tester_helper/test_dummy_object_list.tps create mode 100644 test/ut3_tester_helper/test_tab_varchar2.tps create mode 100644 test/ut3_tester_helper/test_tab_varray.tps create mode 100644 test/ut3_user/expectations/binary/test_equal.pkb create mode 100644 test/ut3_user/expectations/binary/test_equal.pks create mode 100644 test/ut3_user/expectations/binary/test_expect_to_be_less_than.pkb create mode 100644 test/ut3_user/expectations/binary/test_expect_to_be_less_than.pks create mode 100644 test/ut3_user/expectations/test_expectation_anydata.pkb create mode 100644 test/ut3_user/expectations/test_expectation_anydata.pks diff --git a/test/grant_ut3_owner_to_ut3_tester.sql b/test/grant_ut3_owner_to_ut3_tester.sql new file mode 100644 index 000000000..d06a24ace --- /dev/null +++ b/test/grant_ut3_owner_to_ut3_tester.sql @@ -0,0 +1,35 @@ +set define off +whenever sqlerror exit failure rollback +whenever oserror exit failure rollback + +alter session set plsql_optimize_level=0; + +set linesize 200 +set define on +set verify off + +prompt Empowering UT3_TESTER to UT3_OWNER objects + +begin + for i in ( select object_name from all_objects t + where t.object_type in ('PACKAGE','TYPE') + and owner = 'UT3' + and generated = 'N' + and lower(object_name) not like 'sys%') + loop + execute immediate 'grant execute on ut3.'||i.object_name||' to UT3_TESTER'; + end loop; +end; +/ + +prompt Empowering UT3_TESTER to UT3_OWNER tables + +begin + for i in ( select table_name from all_tables t where owner = 'UT3' and nested = 'NO' and IOT_TYPE is NULL) + loop + execute immediate 'grant select on UT3.'||i.table_name||' to UT3_TESTER'; + end loop; +end; +/ + +exit; diff --git a/test/install_and_run_tests.sh b/test/install_and_run_tests.sh index 953d75bc7..9f5752b5e 100755 --- a/test/install_and_run_tests.sh +++ b/test/install_and_run_tests.sh @@ -6,6 +6,8 @@ git rev-parse && cd "$(git rev-parse --show-cdup)" cd test +time "$SQLCLI" sys/${ORACLE_PWD}@//${CONNECTION_STR} AS SYSDBA @grant_ut3_owner_to_ut3_tester.sql + time "$SQLCLI" ${UT3_TESTER_HELPER}/${UT3_TESTER_HELPER_PASSWORD}@//${CONNECTION_STR} @install_ut3_tester_helper.sql time "$SQLCLI" ${UT3_USER}/${UT3_USER_PASSWORD}@//${CONNECTION_STR} @install_ut3_user_tests.sql diff --git a/test/install_ut3_tester_helper.sql b/test/install_ut3_tester_helper.sql index 14586c469..acfb55aff 100644 --- a/test/install_ut3_tester_helper.sql +++ b/test/install_ut3_tester_helper.sql @@ -5,12 +5,18 @@ whenever oserror exit failure rollback alter session set plsql_optimize_level=0; --Install ut3_tester_helper @@ut3_tester_helper/test_dummy_object.tps +@@ut3_tester_helper/other_dummy_object.tps +@@ut3_tester_helper/test_dummy_object_list.tps +@@ut3_tester_helper/test_tab_varchar2.tps +@@ut3_tester_helper/test_tab_varray.tps @@ut3_tester_helper/main_helper.pks @@ut3_tester_helper/run_helper.pks +@@ut3_tester_helper/expectations_helper.pks @@ut3_tester_helper/main_helper.pkb @@ut3_tester_helper/run_helper.pkb +@@ut3_tester_helper/expectations_helper.pkb set linesize 200 set define on diff --git a/test/install_ut3_tester_tests.sql b/test/install_ut3_tester_tests.sql index 85b0ae201..146a3a211 100644 --- a/test/install_ut3_tester_tests.sql +++ b/test/install_ut3_tester_tests.sql @@ -6,9 +6,13 @@ alter session set plsql_optimize_level=0; --Install tests +@@ut3_tester/core.pks @@ut3_tester/core/annotations/test_before_after_annotations.pks +@@ut3_tester/core/expectations/test_expectation_processor.pks +@@ut3_tester/core.pkb @@ut3_tester/core/annotations/test_before_after_annotations.pkb +@@ut3_tester/core/expectations/test_expectation_processor.pkb set linesize 200 set define on diff --git a/test/install_ut3_user_tests.sql b/test/install_ut3_user_tests.sql index 666a410a4..b38375c34 100644 --- a/test/install_ut3_user_tests.sql +++ b/test/install_ut3_user_tests.sql @@ -5,11 +5,17 @@ whenever oserror exit failure rollback alter session set plsql_optimize_level=0; prompt Install user tests +@@ut3_user/expectations/binary/test_equal.pks +@@ut3_user/expectations/binary/test_expect_to_be_less_than.pks @@ut3_user/expectations/test_matchers.pks +@@ut3_user/expectations/test_expectation_anydata.pks @@ut3_user/expectations/test_expectations_cursor.pks @@ut3_user/api/test_ut_runner.pks +@@ut3_user/expectations/binary/test_equal.pkb +@@ut3_user/expectations/binary/test_expect_to_be_less_than.pkb @@ut3_user/expectations/test_matchers.pkb +@@ut3_user/expectations/test_expectation_anydata.pkb @@ut3_user/expectations/test_expectations_cursor.pkb @@ut3_user/api/test_ut_runner.pkb diff --git a/test/ut3_tester/core.pkb b/test/ut3_tester/core.pkb new file mode 100644 index 000000000..a1da097a9 --- /dev/null +++ b/test/ut3_tester/core.pkb @@ -0,0 +1,11 @@ +create or replace package body core is + + procedure global_setup is + begin + ut3.ut_coverage.set_develop_mode(true); + --improve performance of test execution by disabling all compiler optimizations + ut3_tester_helper.main_helper.execute_autonomous('ALTER SESSION SET PLSQL_OPTIMIZE_LEVEL=0'); + end; + +end; +/ diff --git a/test/ut3_tester/core.pks b/test/ut3_tester/core.pks new file mode 100644 index 000000000..0edf2ae54 --- /dev/null +++ b/test/ut3_tester/core.pks @@ -0,0 +1,10 @@ +create or replace package core is + + --%suite + --%suitepath(utplsql) + + --%beforeall + procedure global_setup; + +end; +/ diff --git a/test/ut3_tester/core/annotations/test_before_after_annotations.pks b/test/ut3_tester/core/annotations/test_before_after_annotations.pks index a4ce52727..1a0a2ebaf 100644 --- a/test/ut3_tester/core/annotations/test_before_after_annotations.pks +++ b/test/ut3_tester/core/annotations/test_before_after_annotations.pks @@ -1,7 +1,7 @@ create or replace package test_before_after_annotations is --%suite(annotations - beforetest and aftertest) - --%suitepath(utplsql.core.annotations) + --%suitepath(utplsql.framework_tester.core.annotations) subtype t_procedure_name is varchar2(250) not null; type t_procedures is table of t_procedure_name; diff --git a/test/ut3_tester/core/core.pkb b/test/ut3_tester/core/core.pkb deleted file mode 100644 index 9b70f3826..000000000 --- a/test/ut3_tester/core/core.pkb +++ /dev/null @@ -1,125 +0,0 @@ -create or replace package body core is - - function get_dbms_output_as_clob return clob is - l_status number; - l_line varchar2(32767); - l_result clob; - begin - - dbms_output.get_line(line => l_line, status => l_status); - if l_status != 1 then - dbms_lob.createtemporary(l_result, true, dur => dbms_lob.session); - end if; - while l_status != 1 loop - if l_line is not null then - ut3.ut_utils.append_to_clob(l_result, l_line||chr(10)); - end if; - dbms_output.get_line(line => l_line, status => l_status); - end loop; - return l_result; - end; - - procedure global_setup is - begin - ut3.ut_coverage.set_develop_mode(true); - --improve performance of test execution by disabling all compiler optimizations - execute_autonomous('ALTER SESSION SET PLSQL_OPTIMIZE_LEVEL=0'); - - execute_autonomous( - q'[create or replace package ut_transaction_control as - function count_rows(a_val varchar2) return number; - procedure setup; - procedure test; - procedure test_failure; - end;]' - ); - execute_autonomous( - q'[create or replace package body ut_transaction_control - as - - function count_rows(a_val varchar2) return number is - l_cnt number; - begin - select count(*) into l_cnt from ut$test_table t where t.val = a_val; - return l_cnt; - end; - procedure setup is begin - insert into ut$test_table values ('s'); - end; - procedure test is - begin - insert into ut$test_table values ('t'); - end; - procedure test_failure is - begin - insert into ut$test_table values ('t'); - --raise no_data_found; - raise_application_error(-20001,'Error'); - end; - end;]' - ); - end; - - procedure global_cleanup is - begin - execute_autonomous('drop package ut_transaction_control'); - end; - - procedure execute_autonomous(a_sql varchar2) is - pragma autonomous_transaction; - begin - if a_sql is not null then - execute immediate a_sql; - end if; - commit; - end; - - function run_test(a_path varchar2) return clob is - l_lines ut3.ut_varchar2_list; - begin - select * bulk collect into l_lines from table(ut3.ut.run(a_path)); - return ut3.ut_utils.table_to_clob(l_lines); - end; - - function get_value(a_variable varchar2) return integer is - l_glob_val integer; - begin - execute immediate 'begin :l_glob_val := '||a_variable||'; end;' using out l_glob_val; - return l_glob_val; - end; - - function get_failed_expectations return ut3.ut_varchar2_list is - l_expectations_result ut3.ut_expectation_results := ut3.ut_expectation_processor.get_failed_expectations(); - l_result ut3.ut_varchar2_list; - begin - for i in 1..l_expectations_result.count loop - l_result := l_result multiset union l_expectations_result(i).get_result_lines(); - end loop; - return l_result; - end; - - function failed_expectations_data return anydata is - begin - return anydata.convertCollection(ut3.ut_expectation_processor.get_failed_expectations()); - end; - - function get_failed_expectations_n return number is - l_num_failed number; - l_results ut3.ut_expectation_results := ut3.ut_expectation_processor.get_failed_expectations(); - begin - l_num_failed := l_results.count; - return l_num_failed; - end; - - procedure clear_expectations is - begin - ut3.ut_expectation_processor.clear_expectations(); - end; - - function table_to_clob(a_results in ut3.ut_varchar2_list) return clob is - begin - return ut3.ut_utils.table_to_clob(a_results); - end; - -end; -/ diff --git a/test/ut3_tester/core/core.pks b/test/ut3_tester/core/core.pks deleted file mode 100644 index c011d8916..000000000 --- a/test/ut3_tester/core/core.pks +++ /dev/null @@ -1,32 +0,0 @@ -create or replace package main_helper is - - gc_success number := ut3.ut_utils.gc_success; - gc_failure number := ut3.ut_utils.gc_failure; - - --%suite - --%suitepath(utplsql) - - --%beforeall - procedure global_setup; - - --%afterall - procedure global_cleanup; - - procedure execute_autonomous(a_sql varchar2); - - function run_test(a_path varchar2) return clob; - - function get_value(a_variable varchar2) return integer; - - function get_dbms_output_as_clob return clob; - - function get_failed_expectations return ut3.ut_varchar2_list; - - function get_failed_expectations_n return number; - - procedure clear_expectations; - - function table_to_clob(a_results in ut3.ut_varchar2_list) return clob; - -end; -/ diff --git a/test/ut3_tester/core/expectations/test_expectation_processor.pkb b/test/ut3_tester/core/expectations/test_expectation_processor.pkb new file mode 100644 index 000000000..17ffbec3c --- /dev/null +++ b/test/ut3_tester/core/expectations/test_expectation_processor.pkb @@ -0,0 +1,71 @@ +create or replace package body test_expectation_processor is + + procedure who_called_expectation is + l_stack_trace varchar2(4000); + l_source_line varchar2(4000); + begin + l_stack_trace := q'[----- PL/SQL Call Stack ----- + object line object + handle number name +34f88e4420 124 package body SCH_TEST.UT_EXPECTATION_PROCESSOR +353dfeb2f8 26 SCH_TEST.UT_EXPECTATION_RESULT +cba249ce0 112 SCH_TEST.UT_EXPECTATION +3539881cf0 21 SCH_TEST.UT_EXPECTATION_NUMBER +351a608008 28 package body SCH_TEST.TPKG_PRIOR_YEAR_GENERATION +351a6862b8 6 anonymous block +351fe31010 1825 package body SYS.DBMS_SQL +20befbe4d8 129 SCH_TEST.UT_EXECUTABLE +20befbe4d8 65 SCH_TEST.UT_EXECUTABLE +34f8ab7cd8 80 SCH_TEST.UT_TEST +34f8ab98f0 48 SCH_TEST.UT_SUITE_ITEM +34f8ab9b10 74 SCH_TEST.UT_SUITE +34f8ab98f0 48 SCH_TEST.UT_SUITE_ITEM +cba24bfd0 75 SCH_TEST.UT_LOGICAL_SUITE +353dfecf30 59 SCH_TEST.UT_RUN +34f8ab98f0 48 SCH_TEST.UT_SUITE_ITEM +357f5421e8 77 package body SCH_TEST.UT_RUNNER +357f5421e8 111 package body SCH_TEST.UT_RUNNER +20be951ab0 292 package body SCH_TEST.UT +20be951ab0 320 package body SCH_TEST.UT +]'; + ut.expect( + ut3.ut_expectation_processor.who_called_expectation(l_stack_trace) + ).to_be_like('at "SCH_TEST.TPKG_PRIOR_YEAR_GENERATION", line 28 %'); + end; + + + procedure who_called_expectation_0x is + l_stack_trace varchar2(4000); + l_source_line varchar2(4000); + begin + l_stack_trace := q'[----- PL/SQL Call Stack ----- + object line object + handle number name +34f88e4420 124 package body SCH_TEST.UT_EXPECTATION_PROCESSOR +353dfeb2f8 26 SCH_TEST.UT_EXPECTATION_RESULT +cba249ce0 112 SCH_TEST.UT_EXPECTATION +3539881cf0 21 SCH_TEST.UT_EXPECTATION_NUMBER +351a608008 28 package body SCH_TEST.TPKG_PRIOR_YEAR_GENERATION +351a6862b8 6 anonymous block +351fe31010 1825 package body SYS.DBMS_SQL +20befbe4d8 129 SCH_TEST.UT_EXECUTABLE +20befbe4d8 65 SCH_TEST.UT_EXECUTABLE +34f8ab7cd8 80 SCH_TEST.UT_TEST +34f8ab98f0 48 SCH_TEST.UT_SUITE_ITEM +34f8ab9b10 74 SCH_TEST.UT_SUITE +34f8ab98f0 48 SCH_TEST.UT_SUITE_ITEM +cba24bfd0 75 SCH_TEST.UT_LOGICAL_SUITE +353dfecf30 59 SCH_TEST.UT_RUN +34f8ab98f0 48 SCH_TEST.UT_SUITE_ITEM +357f5421e8 77 package body SCH_TEST.UT_RUNNER +357f5421e8 111 package body SCH_TEST.UT_RUNNER +20be951ab0 292 package body SCH_TEST.UT +20be951ab0 320 package body SCH_TEST.UT +]'; + ut.expect( + ut3.ut_expectation_processor.who_called_expectation(l_stack_trace) + ).to_be_like('at "SCH_TEST.TPKG_PRIOR_YEAR_GENERATION", line 28 %'); + end; + +end; +/ diff --git a/test/ut3_tester/core/expectations/test_expectation_processor.pks b/test/ut3_tester/core/expectations/test_expectation_processor.pks new file mode 100644 index 000000000..c6f80f20d --- /dev/null +++ b/test/ut3_tester/core/expectations/test_expectation_processor.pks @@ -0,0 +1,17 @@ +create or replace package test_expectation_processor is + + --%suite(expectation_processor) + --%suitepath(utplsql.framework_tester.core.expectations) + + --%context(who_called_expectation) + + --%test(parses stack trace and returns object and line that called expectation) + procedure who_called_expectation; + + --%test(parses stack trace containing 0x and returns object and line that called expectation) + procedure who_called_expectation_0x; + + --%endcontext + +end; +/ diff --git a/test/ut3_tester_helper/expectations_helper.pkb b/test/ut3_tester_helper/expectations_helper.pkb new file mode 100644 index 000000000..cc86f18a6 --- /dev/null +++ b/test/ut3_tester_helper/expectations_helper.pkb @@ -0,0 +1,57 @@ +create or replace package body expectations_helper is + + function unary_expectation_block( + a_matcher_name varchar2, + a_data_type varchar2, + a_data_value varchar2 + ) return varchar2 is + l_execute varchar2(32000); + begin + l_execute := ' + declare + l_expected '||a_data_type||' := '||a_data_value||'; + begin + --act - execute the expectation + ut3.ut.expect(l_expected).'||a_matcher_name||'(); + end;'; + return l_execute; + end; + + function unary_expectation_object_block( + a_matcher_name varchar2, + a_object_name varchar2, + a_object_value varchar2, + a_object_type varchar2 + ) return varchar2 is + begin + return ' + declare + l_object '||a_object_name||' := '||a_object_value||'; + begin + ut3.ut.expect(anydata.convert'||a_object_type||'(l_object)).'||a_matcher_name||'(); + end;'; + end; + + function binary_expectation_block( + a_matcher_name varchar2, + a_actual_data_type varchar2, + a_actual_data varchar2, + a_expected_data_type varchar2, + a_expected_data varchar2 + ) return varchar2 + is + l_execute varchar2(32000); + begin + l_execute := ' + declare + l_actual '||a_actual_data_type||' := '||a_actual_data||'; + l_expected '||a_expected_data_type||' := '||a_expected_data||'; + begin + --act - execute the expectation + ut3.ut.expect( l_actual ).'||a_matcher_name||'(l_expected); + end;'; + return l_execute; + end; + +end; +/ diff --git a/test/ut3_tester_helper/expectations_helper.pks b/test/ut3_tester_helper/expectations_helper.pks new file mode 100644 index 000000000..9c1d54333 --- /dev/null +++ b/test/ut3_tester_helper/expectations_helper.pks @@ -0,0 +1,25 @@ +create or replace package expectations_helper is + + function unary_expectation_block( + a_matcher_name varchar2, + a_data_type varchar2, + a_data_value varchar2 + ) return varchar2; + + function unary_expectation_object_block( + a_matcher_name varchar2, + a_object_name varchar2, + a_object_value varchar2, + a_object_type varchar2 + ) return varchar2; + + function binary_expectation_block( + a_matcher_name varchar2, + a_actual_data_type varchar2, + a_actual_data varchar2, + a_expected_data_type varchar2, + a_expected_data varchar2 + ) return varchar2; + +end; +/ diff --git a/test/ut3_tester_helper/main_helper.pkb b/test/ut3_tester_helper/main_helper.pkb index 9ceedd68a..4c93720cd 100644 --- a/test/ut3_tester_helper/main_helper.pkb +++ b/test/ut3_tester_helper/main_helper.pkb @@ -86,5 +86,15 @@ create or replace package body main_helper is return ut3.ut_expectation_processor.get_warnings(); end; + procedure reset_nulls_equal is + begin + ut3.ut_expectation_processor.nulls_Are_equal(ut3.ut_expectation_processor.gc_default_nulls_are_equal); + end; + + procedure nulls_are_equal(a_nulls_equal boolean := true) is + begin + ut3.ut_expectation_processor.nulls_Are_equal(a_nulls_equal); + end; + end; / diff --git a/test/ut3_tester_helper/main_helper.pks b/test/ut3_tester_helper/main_helper.pks index 6c7f34bc0..be755fea6 100644 --- a/test/ut3_tester_helper/main_helper.pks +++ b/test/ut3_tester_helper/main_helper.pks @@ -22,6 +22,10 @@ create or replace package main_helper is function table_to_clob(a_results in ut3.ut_varchar2_list) return clob; function get_warnings return ut3.ut_varchar2_rows; - + + procedure reset_nulls_equal; + + procedure nulls_are_equal(a_nulls_equal boolean := true); + end; / diff --git a/test/ut3_tester_helper/other_dummy_object.tps b/test/ut3_tester_helper/other_dummy_object.tps new file mode 100644 index 000000000..7453d5dcf --- /dev/null +++ b/test/ut3_tester_helper/other_dummy_object.tps @@ -0,0 +1,16 @@ +declare + l_exists integer; +begin + select count(1) into l_exists from user_types where type_name = 'OTHER_DUMMY_OBJECT'; + if l_exists > 0 then + execute immediate 'drop type other_dummy_object force'; + end if; +end; +/ + +create or replace type other_dummy_object as object ( + id number, + "name" varchar2(30), + "Value" varchar2(30) +) +/ diff --git a/test/ut3_tester_helper/test_dummy_object.tps b/test/ut3_tester_helper/test_dummy_object.tps index 79eed3e6e..7f095fc0a 100644 --- a/test/ut3_tester_helper/test_dummy_object.tps +++ b/test/ut3_tester_helper/test_dummy_object.tps @@ -14,6 +14,3 @@ create or replace type test_dummy_object as object ( "Value" varchar2(30) ) / - - -grant execute on test_dummy_object to ut3$user#; \ No newline at end of file diff --git a/test/ut3_tester_helper/test_dummy_object_list.tps b/test/ut3_tester_helper/test_dummy_object_list.tps new file mode 100644 index 000000000..67bba558e --- /dev/null +++ b/test/ut3_tester_helper/test_dummy_object_list.tps @@ -0,0 +1,2 @@ +create or replace type test_dummy_object_list as table of test_dummy_object +/ diff --git a/test/ut3_tester_helper/test_tab_varchar2.tps b/test/ut3_tester_helper/test_tab_varchar2.tps new file mode 100644 index 000000000..17086292a --- /dev/null +++ b/test/ut3_tester_helper/test_tab_varchar2.tps @@ -0,0 +1,12 @@ +declare + l_exists integer; +begin + select count(1) into l_exists from user_types where type_name = 'T_TAB_VARCHAR'; + if l_exists > 0 then + execute immediate 'drop type t_tab_varchar force'; + end if; +end; +/ + +create or replace type t_tab_varchar is table of varchar2(1) +/ \ No newline at end of file diff --git a/test/ut3_tester_helper/test_tab_varray.tps b/test/ut3_tester_helper/test_tab_varray.tps new file mode 100644 index 000000000..3c684afca --- /dev/null +++ b/test/ut3_tester_helper/test_tab_varray.tps @@ -0,0 +1,13 @@ +declare + l_exists integer; +begin + select count(1) into l_exists from user_types where type_name = 'T_VARRAY'; + if l_exists > 0 then + execute immediate 'drop type t_varray force'; + end if; +end; +/ + + +create or replace type t_varray is varray(1) of number +/ \ No newline at end of file diff --git a/test/ut3_user/api/test_ut_runner.pks b/test/ut3_user/api/test_ut_runner.pks index d67ee45fc..70eed747f 100644 --- a/test/ut3_user/api/test_ut_runner.pks +++ b/test/ut3_user/api/test_ut_runner.pks @@ -1,7 +1,7 @@ create or replace package test_ut_runner is --%suite(ut_runner) - --%suitepath(utplsql.api) + --%suitepath(utplsql.test_user.api) --%rollback(manual) --%test(transaction stays open after the run if it was opened before the run) diff --git a/test/ut3_user/expectations/binary/test_equal.pkb b/test/ut3_user/expectations/binary/test_equal.pkb new file mode 100644 index 000000000..8b369d0e7 --- /dev/null +++ b/test/ut3_user/expectations/binary/test_equal.pkb @@ -0,0 +1,264 @@ +create or replace package body test_equal is + + procedure reset_nulls_equal is + begin + ut3_tester_helper.main_helper.reset_nulls_equal; + end; + + procedure cleanup_expectations is + begin + ut3_tester_helper.main_helper.clear_expectations( ); + end; + + function to_equal_block( + a_matcher_name varchar2, + a_actual_type varchar2, + a_expected_type varchar2, + a_actual varchar2, + a_expected varchar2, + a_nulls_equal boolean := null + ) return varchar2 is + l_nulls_equal varchar2(10); + begin + l_nulls_equal := case when a_nulls_equal then 'true' when not a_nulls_equal then 'false' else 'null' end; + return ' + declare + l_actual '||a_actual_type||' := '||a_actual||'; + l_expected '||a_expected_type||' := '||a_expected||'; + begin + ut3.ut.expect( l_actual ).'||a_matcher_name||'(l_expected, a_nulls_are_equal=>'||l_nulls_equal||'); + end;'; + end; + + procedure test_to_equal_success( + a_actual_type varchar2, + a_expected_type varchar2, + a_actual varchar2, + a_expected varchar2, + a_nulls_equal boolean := null + ) is + begin + execute immediate + to_equal_block( 'to_equal', a_actual_type, a_expected_type, a_actual, a_expected, a_nulls_equal ); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + cleanup_expectations; + end; + + procedure test_to_equal_success( + a_actual_type varchar2, + a_actual varchar2, + a_expected varchar2, + a_nulls_equal boolean := null + ) is + begin + test_to_equal_success(a_actual_type, a_actual_type, a_actual, a_expected, a_nulls_equal); + end; + + + procedure test_to_equal_fail( + a_actual_type varchar2, + a_expected_type varchar2, + a_actual varchar2, + a_expected varchar2, + a_nulls_equal boolean := null + ) is + begin + execute immediate + to_equal_block( 'to_equal', a_actual_type, a_expected_type, a_actual, a_expected, a_nulls_equal ); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + cleanup_expectations; + end; + + procedure test_not_to_equal_fail( + a_actual_type varchar2, + a_expected_type varchar2, + a_actual varchar2, + a_expected varchar2, + a_nulls_equal boolean := null + ) is + begin + execute immediate + to_equal_block( 'not_to_equal', a_actual_type, a_expected_type, a_actual, a_expected, a_nulls_equal ); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + cleanup_expectations; + end; + + procedure test_to_equal_fail( + a_actual_type varchar2, + a_actual varchar2, + a_expected varchar2, + a_nulls_equal boolean := null + ) is + begin + test_to_equal_fail(a_actual_type, a_actual_type, a_actual, a_expected, a_nulls_equal); + end; + + procedure equal_fail_on_type_diff is + begin + test_to_equal_fail('boolean', 'integer', 'true', '1'); + test_to_equal_fail('integer', 'boolean', '1', 'true'); + test_to_equal_fail('blob', 'clob', 'to_blob(''ABC'')', '''ABC'''); + test_to_equal_fail('clob', 'blob', '''ABC''', 'to_blob(''ABC'')'); + test_to_equal_fail('clob', 'anydata', '''ABC''', 'null'); + test_to_equal_fail('anydata', 'sys_refcursor', 'null', 'null'); + test_to_equal_fail('sys_refcursor', 'anydata', 'null', 'null'); + test_to_equal_fail('clob', 'varchar2(4000)', '''Abc''', '''Abc'''); + test_to_equal_fail('date', 'timestamp', 'sysdate', 'sysdate'); + test_to_equal_fail('date', 'timestamp with local time zone', 'sysdate', 'sysdate'); + test_to_equal_fail('timestamp', 'date', 'sysdate', 'sysdate'); + test_to_equal_fail('timestamp with local time zone', 'timestamp', 'sysdate', 'sysdate'); + test_to_equal_fail('timestamp with local time zone', 'timestamp with time zone', 'sysdate', 'sysdate'); + test_to_equal_fail('number', 'varchar2(4000)', '1', '''1'''); + test_to_equal_fail('varchar2(4000)', 'number', '''1''', '1'); + test_to_equal_fail('varchar2(4000)', 'boolean', '''true''', 'true'); + test_to_equal_fail('interval day to second', 'interval year to month', '''2 01:00:00''', '''1-1'''); + test_to_equal_fail('interval year to month', 'interval day to second', '''1-1''', '''2 01:00:00'''); + end; + + procedure not_equal_fail_on_type_diff is + begin + test_not_to_equal_fail('boolean', 'integer', 'true', '1'); + test_not_to_equal_fail('integer', 'boolean', '1', 'true'); + test_not_to_equal_fail('blob', 'clob', 'to_blob(''ABC'')', '''ABC'''); + test_not_to_equal_fail('clob', 'blob', '''ABC''', 'to_blob(''ABC'')'); + test_not_to_equal_fail('clob', 'anydata', '''ABC''', 'null'); + test_not_to_equal_fail('anydata', 'sys_refcursor', 'null', 'null'); + test_not_to_equal_fail('sys_refcursor', 'anydata', 'null', 'null'); + test_not_to_equal_fail('clob', 'varchar2(4000)', '''Abc''', '''Abc'''); + test_not_to_equal_fail('date', 'timestamp', 'sysdate', 'sysdate'); + test_not_to_equal_fail('date', 'timestamp with local time zone', 'sysdate', 'sysdate'); + test_not_to_equal_fail('timestamp', 'date', 'sysdate', 'sysdate'); + test_not_to_equal_fail('timestamp with local time zone', 'timestamp', 'sysdate', 'sysdate'); + test_not_to_equal_fail('timestamp with local time zone', 'timestamp with time zone', 'sysdate', 'sysdate'); + test_not_to_equal_fail('number', 'varchar2(4000)', '1', '''1'''); + test_not_to_equal_fail('varchar2(4000)', 'number', '''1''', '1'); + test_not_to_equal_fail('varchar2(4000)', 'boolean', '''true''', 'true'); + test_not_to_equal_fail('interval day to second', 'interval year to month', '''2 01:00:00''', '''1-1'''); + test_not_to_equal_fail('interval year to month', 'interval day to second', '''1-1''', '''2 01:00:00'''); + end; + + procedure failure_on_data_diff is + begin + test_to_equal_fail('blob', 'to_blob(''abc'')', 'to_blob(''abd'')'); + test_to_equal_fail('boolean', 'false', 'true'); + test_to_equal_fail('boolean', 'true', 'false'); + test_to_equal_fail('clob', '''Abc''', '''abc'''); + test_to_equal_fail('date', 'sysdate', 'sysdate-1'); + test_to_equal_fail('number', '0.1', '0.3'); + test_to_equal_fail('timestamp', 'systimestamp', 'systimestamp'); + test_to_equal_fail('timestamp with local time zone', 'systimestamp', 'systimestamp'); + test_to_equal_fail('timestamp with time zone', 'systimestamp', 'systimestamp'); + test_to_equal_fail('varchar2(4000)', '''Abc''', '''abc'''); + test_to_equal_fail('interval day to second', '''2 01:00:00''', '''2 01:00:01'''); + test_to_equal_fail('interval year to month', '''1-1''', '''1-2'''); + end; + + procedure failure_on_actual_null is + begin + test_to_equal_fail('blob', 'NULL', 'to_blob(''abc'')'); + test_to_equal_fail('boolean', 'NULL', 'true'); + test_to_equal_fail('clob', 'NULL', '''abc'''); + test_to_equal_fail('date', 'NULL', 'sysdate'); + test_to_equal_fail('number', 'NULL', '1'); + test_to_equal_fail('timestamp', 'NULL', 'systimestamp'); + test_to_equal_fail('timestamp with local time zone', 'NULL', 'systimestamp'); + test_to_equal_fail('timestamp with time zone', 'NULL', 'systimestamp'); + test_to_equal_fail('varchar2(4000)', 'NULL', '''abc'''); + test_to_equal_fail('interval day to second', 'NULL', '''2 01:00:00'''); + test_to_equal_fail('interval year to month', 'NULL', '''1-1'''); + end; + + procedure failure_on_expected_null is + begin + test_to_equal_fail('blob', 'to_blob(''abc'')', 'NULL'); + test_to_equal_fail('boolean', 'true', 'NULL'); + test_to_equal_fail('clob', '''abc''', 'NULL'); + test_to_equal_fail('date', 'sysdate', 'NULL'); + test_to_equal_fail('number', '1234', 'NULL'); + test_to_equal_fail('timestamp', 'systimestamp', 'NULL'); + test_to_equal_fail('timestamp with local time zone', 'systimestamp', 'NULL'); + test_to_equal_fail('timestamp with time zone', 'systimestamp', 'NULL'); + test_to_equal_fail('varchar2(4000)', '''abc''', 'NULL'); + test_to_equal_fail('interval day to second', '''2 01:00:00''', 'NULL'); + test_to_equal_fail('interval year to month', '''1-1''', 'NULL'); + end; + + procedure failure_on_both_null_with_parm is + begin + test_to_equal_fail('blob', 'NULL', 'NULL', false); + test_to_equal_fail('boolean', 'NULL', 'NULL', false); + test_to_equal_fail('clob', 'NULL', 'NULL', false); + test_to_equal_fail('date', 'NULL', 'NULL', false); + test_to_equal_fail('number', 'NULL', 'NULL', false); + test_to_equal_fail('timestamp', 'NULL', 'NULL', false); + test_to_equal_fail('timestamp with local time zone', 'NULL', 'NULL', false); + test_to_equal_fail('timestamp with time zone', 'NULL', 'NULL', false); + test_to_equal_fail('varchar2(4000)', 'NULL', 'NULL', false); + test_to_equal_fail('interval day to second', 'NULL', 'NULL', false); + test_to_equal_fail('interval year to month', 'NULL', 'NULL', false); + end; + + procedure failure_on_both_null_with_conf is + begin + ut3_tester_helper.main_helper.nulls_are_equal(false); + test_to_equal_fail('blob', 'NULL', 'NULL'); + test_to_equal_fail('boolean', 'NULL', 'NULL'); + test_to_equal_fail('clob', 'NULL', 'NULL'); + test_to_equal_fail('date', 'NULL', 'NULL'); + test_to_equal_fail('number', 'NULL', 'NULL'); + test_to_equal_fail('timestamp', 'NULL', 'NULL'); + test_to_equal_fail('timestamp with local time zone', 'NULL', 'NULL'); + test_to_equal_fail('timestamp with time zone', 'NULL', 'NULL'); + test_to_equal_fail('varchar2(4000)', 'NULL', 'NULL'); + test_to_equal_fail('interval day to second', 'NULL', 'NULL'); + test_to_equal_fail('interval year to month', 'NULL', 'NULL'); + end; + + procedure success_on_equal_data is + begin + test_to_equal_success('blob', 'to_blob(''Abc'')', 'to_blob(''abc'')'); + test_to_equal_success('boolean', 'true', 'true'); + test_to_equal_success('clob', '''Abc''', '''Abc'''); + test_to_equal_success('date', 'sysdate', 'sysdate'); + test_to_equal_success('number', '12345', '12345'); + test_to_equal_success('timestamp(9)', 'to_Timestamp(''2016 123456789'',''yyyy ff'')', 'to_Timestamp(''2016 123456789'',''yyyy ff'')'); + test_to_equal_success('timestamp(9) with local time zone', 'to_Timestamp(''2016 123456789'',''yyyy ff'')', 'to_Timestamp(''2016 123456789'',''yyyy ff'')'); + test_to_equal_success('timestamp(9) with time zone', 'to_Timestamp(''2016 123456789'',''yyyy ff'')', 'to_Timestamp(''2016 123456789'',''yyyy ff'')'); + test_to_equal_success('varchar2(4000)', '''Abc''', '''Abc'''); + test_to_equal_success('interval day to second', '''2 01:00:00''', '''2 01:00:00'''); + test_to_equal_success('interval year to month', '''1-1''', '''1-1'''); + end; + + procedure success_on_both_null is + begin + test_to_equal_success('blob', 'NULL', 'NULL'); + test_to_equal_success('boolean', 'NULL', 'NULL'); + test_to_equal_success('clob', 'NULL', 'NULL'); + test_to_equal_success('date', 'NULL', 'NULL'); + test_to_equal_success('number', 'NULL', 'NULL'); + test_to_equal_success('timestamp', 'NULL', 'NULL'); + test_to_equal_success('timestamp with local time zone', 'NULL', 'NULL'); + test_to_equal_success('timestamp with time zone', 'NULL', 'NULL'); + test_to_equal_success('varchar2(4000)', 'NULL', 'NULL'); + test_to_equal_success('interval day to second', 'NULL', 'NULL'); + test_to_equal_success('interval year to month', 'NULL', 'NULL'); + end; + + procedure success_on_both_null_with_parm is + begin + ut3_tester_helper.main_helper.nulls_are_equal(false); + test_to_equal_success('blob', 'NULL', 'NULL', true); + test_to_equal_success('boolean', 'NULL', 'NULL', true); + test_to_equal_success('clob', 'NULL', 'NULL', true); + test_to_equal_success('date', 'NULL', 'NULL', true); + test_to_equal_success('number', 'NULL', 'NULL', true); + test_to_equal_success('timestamp', 'NULL', 'NULL', true); + test_to_equal_success('timestamp with local time zone', 'NULL', 'NULL', true); + test_to_equal_success('timestamp with time zone', 'NULL', 'NULL', true); + test_to_equal_success('varchar2(4000)', 'NULL', 'NULL', true); + test_to_equal_success('interval day to second', 'NULL', 'NULL', true); + test_to_equal_success('interval year to month', 'NULL', 'NULL', true); + end; + +end; +/ diff --git a/test/ut3_user/expectations/binary/test_equal.pks b/test/ut3_user/expectations/binary/test_equal.pks new file mode 100644 index 000000000..923d43a31 --- /dev/null +++ b/test/ut3_user/expectations/binary/test_equal.pks @@ -0,0 +1,38 @@ +create or replace package test_equal is + + --%suite((not)to_be_equal) + --%suitepath(utplsql.test_user.expectations.binary) + + procedure reset_nulls_equal; + + --%aftereach + procedure cleanup_expectations; + + --%test(Gives failure for different data types) + procedure equal_fail_on_type_diff; + --%test(Negated - gives failure for different data types) + procedure not_equal_fail_on_type_diff; + --%test(Gives failure for different data values) + procedure failure_on_data_diff; + --%test(Gives failure when actual is null) + procedure failure_on_actual_null; + --%test(Gives failure when expected is null) + procedure failure_on_expected_null; + --%test(Gives failure when both values are null and argument nulls_are_equal is false) + procedure failure_on_both_null_with_parm; + + --%test(Gives failure when both values are null and configuration nulls_are_equal is false) + --%aftertest(reset_nulls_equal) + procedure failure_on_both_null_with_conf; + + --%test(Gives success for equal values) + procedure success_on_equal_data; + --%test(Gives success when both values are null) + procedure success_on_both_null; + + --%test(Gives success when both values are null and argument nulls_are_equal is true) + --%aftertest(reset_nulls_equal) + procedure success_on_both_null_with_parm; + +end; +/ diff --git a/test/ut3_user/expectations/binary/test_expect_to_be_less_than.pkb b/test/ut3_user/expectations/binary/test_expect_to_be_less_than.pkb new file mode 100644 index 000000000..4212e4822 --- /dev/null +++ b/test/ut3_user/expectations/binary/test_expect_to_be_less_than.pkb @@ -0,0 +1,263 @@ +create or replace package body test_expect_to_be_less_than is + + procedure cleanup_expectations is + begin + ut3_tester_helper.main_helper.clear_expectations( ); + end; + + function to_be_less_than_block( + a_data_type varchar2, + a_actual varchar2, + a_expected varchar2 + ) return varchar2 is + begin + return ut3_tester_helper.expectations_helper.binary_expectation_block( + 'to_be_less_than', a_data_type, a_actual, a_data_type, a_expected + ); + end; + + function not_to_be_less_than_block( + a_data_type varchar2, + a_actual varchar2, + a_expected varchar2 + ) return varchar2 is + begin + return ut3_tester_helper.expectations_helper.binary_expectation_block( + 'not_to_be_less_than', a_data_type, a_actual, a_data_type, a_expected + ); + end; + + procedure actual_date_greater is + begin + --Act + execute immediate to_be_less_than_block('date', 'sysdate', 'sysdate-1'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + end; + + procedure actual_number_greater is + begin + --Act + execute immediate to_be_less_than_block('number', '2.0', '1.99'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + end; + + procedure actual_interval_ym_greater is + begin + --Act + execute immediate to_be_less_than_block('interval year to month', '''2-1''', '''2-0'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + end; + + procedure actual_interval_ds_greater is + begin + --Act + execute immediate to_be_less_than_block('interval day to second', '''2 01:00:00''', '''2 00:59:59'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + end; + + procedure actual_timestamp_greater is + begin + --Act + execute immediate to_be_less_than_block('timestamp', 'to_timestamp(''1997 13'',''YYYY FF'')', 'to_timestamp(''1997 12'',''YYYY FF'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + end; + + procedure actual_timestamp_tz_greater is + begin + --Act + execute immediate to_be_less_than_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + end; + + procedure actual_timestamp_ltz_greater is + begin + --Act + execute immediate to_be_less_than_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + end; + + procedure actual_date_equal is + begin + --Act + execute immediate to_be_less_than_block('date', 'sysdate', 'sysdate'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + end; + + procedure actual_number_equal is + begin + --Act + execute immediate to_be_less_than_block('number', '2.0', '2.00'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + end; + + procedure actual_interval_ym_equal is + begin + --Act + execute immediate to_be_less_than_block('interval year to month', '''2-1''', '''2-1'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + end; + + procedure actual_interval_ds_equal is + begin + --Act + execute immediate to_be_less_than_block('interval day to second', '''2 01:00:00''', '''2 01:00:00'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + end; + + procedure actual_timestamp_equal is + begin + --Act + execute immediate to_be_less_than_block('timestamp', 'to_timestamp(''1997 13'',''YYYY FF'')', 'to_timestamp(''1997 13'',''YYYY FF'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + end; + + procedure actual_timestamp_tz_equal is + begin + --Act + execute immediate to_be_less_than_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + end; + + procedure actual_timestamp_ltz_equal is + begin + --Act + execute immediate to_be_less_than_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + end; + + procedure actual_date_less is + begin + --Act + execute immediate to_be_less_than_block('date', 'sysdate-1', 'sysdate'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure actual_number_less is + begin + --Act + execute immediate to_be_less_than_block('number', '1.0', '1.01'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure actual_interval_ym_less is + begin + --Act + execute immediate to_be_less_than_block('interval year to month', '''2-1''', '''2-2'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure actual_interval_ds_less is + begin + --Act + execute immediate to_be_less_than_block('interval day to second', '''2 00:59:58''', '''2 00:59:59'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure actual_timestamp_less is + begin + --Act + execute immediate to_be_less_than_block('timestamp', 'to_timestamp(''1997 12'',''YYYY FF'')', 'to_timestamp(''1997 13'',''YYYY FF'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure actual_timestamp_tz_less is + begin + --Act + execute immediate to_be_less_than_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +03:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure actual_timestamp_ltz_less is + begin + --Act + execute immediate to_be_less_than_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +03:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure not_actual_date_greater is + begin + --Act + execute immediate not_to_be_less_than_block('date', 'sysdate', 'sysdate-1'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure not_actual_number_greater is + begin + --Act + execute immediate not_to_be_less_than_block('number', '2.0', '1.99'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure not_actual_interval_ym_greater is + begin + --Act + execute immediate not_to_be_less_than_block('interval year to month', '''2-1''', '''2-0'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure not_actual_interval_ds_greater is + begin + --Act + execute immediate not_to_be_less_than_block('interval day to second', '''2 01:00:00''', '''2 00:59:59'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure not_actual_timestamp_greater is + begin + --Act + execute immediate not_to_be_less_than_block('timestamp', 'to_timestamp(''1997 13'',''YYYY FF'')', 'to_timestamp(''1997 12'',''YYYY FF'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure not_actual_timestamp_tz_gretr is + begin + --Act + execute immediate not_to_be_less_than_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure not_actual_timestamp_ltz_gretr is + begin + --Act + execute immediate not_to_be_less_than_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure actual_clob is + begin + --Act + ut3.ut.expect(to_clob('3')).to_( ut3.be_less_than(4) ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + end; + +end; +/ diff --git a/test/ut3_user/expectations/binary/test_expect_to_be_less_than.pks b/test/ut3_user/expectations/binary/test_expect_to_be_less_than.pks new file mode 100644 index 000000000..c03f0d28e --- /dev/null +++ b/test/ut3_user/expectations/binary/test_expect_to_be_less_than.pks @@ -0,0 +1,97 @@ +create or replace package test_expect_to_be_less_than is + + --%suite((not)to_be_less_than) + --%suitepath(utplsql.test_user.expectations.binary) + + --%aftereach + procedure cleanup_expectations; + + --%test(Gives failure when actual date is greater than expected) + procedure actual_date_greater; + + --%test(Gives failure when actual number is greater than expected) + procedure actual_number_greater; + + --%test(Gives failure when actual interval year to month is greater than expected) + procedure actual_interval_ym_greater; + + --%test(Gives failure when actual interval day to second is greater than expected) + procedure actual_interval_ds_greater; + + --%test(Gives failure when actual timestamp is greater than expected) + procedure actual_timestamp_greater; + + --%test(Gives failure when actual timestamp with time zone is greater than expected) + procedure actual_timestamp_tz_greater; + + --%test(Gives failure when actual timestamp with local time zone is greater than expected) + procedure actual_timestamp_ltz_greater; + + --%test(Gives failure when actual date is equal expected) + procedure actual_date_equal; + + --%test(Gives failure when actual number is equal expected) + procedure actual_number_equal; + + --%test(Gives failure when actual interval year to month is equal expected) + procedure actual_interval_ym_equal; + + --%test(Gives failure when actual interval day to second is equal expected) + procedure actual_interval_ds_equal; + + --%test(Gives failure when actual timestamp is equal expected) + procedure actual_timestamp_equal; + + --%test(Gives failure when actual timestamp with time zone is equal expected) + procedure actual_timestamp_tz_equal; + + --%test(Gives failure when actual timestamp with local time zone is equal expected) + procedure actual_timestamp_ltz_equal; + + --%test(Gives success when actual date is less than expected) + procedure actual_date_less; + + --%test(Gives success when actual number is less than expected) + procedure actual_number_less; + + --%test(Gives success when actual interval year to month is less than expected) + procedure actual_interval_ym_less; + + --%test(Gives success when actual interval day to second is less than expected) + procedure actual_interval_ds_less; + + --%test(Gives success when actual timestamp is less than expected) + procedure actual_timestamp_less; + + --%test(Gives success when actual timestamp with time zone is less than expected) + procedure actual_timestamp_tz_less; + + --%test(Gives success when actual timestamp with local time zone is less than expected) + procedure actual_timestamp_ltz_less; + + --%test(Negated - Gives success when actual date is greater than expected) + procedure not_actual_date_greater; + + --%test(Negated - Gives success when actual number is greater than expected) + procedure not_actual_number_greater; + + --%test(Negated - Gives success when actual interval year to month is greater than expected) + procedure not_actual_interval_ym_greater; + + --%test(Negated - Gives success when actual interval day to second is greater than expected) + procedure not_actual_interval_ds_greater; + + --%test(Negated - Gives success when actual timestamp is greater than expected) + procedure not_actual_timestamp_greater; + + --%test(Negated - Gives success when actual timestamp with time zone is greater than expected) + procedure not_actual_timestamp_tz_gretr; + + --%test(Negated - Gives success when actual timestamp with local time zone is greater than expected) + procedure not_actual_timestamp_ltz_gretr; + + --%test(Gives failure when running against CLOB) + procedure actual_clob; + +end; +/ diff --git a/test/ut3_user/expectations/test_expectation_anydata.pkb b/test/ut3_user/expectations/test_expectation_anydata.pkb new file mode 100644 index 000000000..21445cb3b --- /dev/null +++ b/test/ut3_user/expectations/test_expectation_anydata.pkb @@ -0,0 +1,974 @@ +create or replace package body test_expectation_anydata is + + g_test_expected anydata; + g_test_actual anydata; + + procedure cleanup_expectations is + begin + ut3_tester_helper.main_helper.clear_expectations( ); + end; + + procedure cleanup is + begin + g_test_expected := null; + g_test_actual := null; + cleanup_expectations(); + end; + + procedure fail_on_different_type_null is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + g_test_expected := anydata.convertObject( cast(null as ut3_tester_helper.test_dummy_object) ); + g_test_actual := anydata.convertObject( cast(null as ut3_tester_helper.other_dummy_object) ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + --Assert + l_expected_message := q'[%Actual (ut3_tester_helper.other_dummy_object) cannot be compared to Expected (ut3_tester_helper.test_dummy_object) using matcher 'equal'.]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure fail_on_different_type is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(1, 'A', '0') ); + g_test_actual := anydata.convertObject( ut3_tester_helper.other_dummy_object(1, 'A', '0') ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + --Assert + l_expected_message := q'[%Actual (ut3_tester_helper.other_dummy_object) cannot be compared to Expected (ut3_tester_helper.test_dummy_object) using matcher 'equal'.]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure fail_on_different_object_data is + begin + --Arrange + g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(1, 'A', '0') ); + g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(1, null, '0') ); + --Act + ut3.ut.expect( g_test_actual ).not_to_equal( g_test_expected ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure fail_on_one_object_null is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(1, 'A', '0') ); + g_test_actual := anydata.convertObject( cast(null as ut3_tester_helper.test_dummy_object) ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + --Assert + l_expected_message := q'[%Actual: ut3_tester_helper.test_dummy_object was expected to equal: ut3_tester_helper.test_dummy_object +%Diff: +%Rows: [ 1 differences ] +%Row No. 1 - Missing: 1A0]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + + end; + + procedure fail_on_collection_vs_object is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(1, 'A', '0') ); + g_test_actual := anydata.convertCollection( ut3_tester_helper.test_dummy_object_list(ut3_tester_helper.test_dummy_object(1, 'A', '0')) ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + --Assert + l_expected_message := q'[%Actual (ut3_tester_helper.test_dummy_object_list) cannot be compared to Expected (ut3_tester_helper.test_dummy_object) using matcher 'equal'.]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure fail_on_null_vs_empty_coll is + l_null_list ut3_tester_helper.test_dummy_object_list; + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + g_test_expected := anydata.convertCollection( ut3_tester_helper.test_dummy_object_list() ); + g_test_actual := anydata.convertCollection( l_null_list ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + --Assert + l_expected_message := q'[%Actual: ut3_tester_helper.test_dummy_object_list [ count = ] was expected to equal: ut3_tester_helper.test_dummy_object_list [ count = 0 ] +%Diff: +%Rows: [ all different ] +%All rows are different as the columns position is not matching.]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + + end; + + procedure fail_on_one_collection_null is + l_null_list ut3_tester_helper.test_dummy_object_list; + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + g_test_expected := anydata.convertCollection( ut3_tester_helper.test_dummy_object_list(ut3_tester_helper.test_dummy_object(1, 'A', '0')) ); + g_test_actual := anydata.convertCollection( l_null_list ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + --Assert + l_expected_message := q'[%Actual: ut3_tester_helper.test_dummy_object_list [ count = ] was expected to equal: ut3_tester_helper.test_dummy_object_list [ count = 1 ] +%Diff: +%Rows: [ 1 differences ] +%Row No. 1 - Missing: 1A0]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure fail_on_one_collection_empty is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + g_test_expected := anydata.convertCollection( ut3_tester_helper.test_dummy_object_list(ut3_tester_helper.test_dummy_object(1, 'A', '0')) ); + g_test_actual := anydata.convertCollection( ut3_tester_helper.test_dummy_object_list() ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + --Assert + l_expected_message := q'[%Actual: ut3_tester_helper.test_dummy_object_list [ count = 0 ] was expected to equal: ut3_tester_helper.test_dummy_object_list [ count = 1 ] +%Diff: +%Rows: [ 1 differences ] +%Row No. 1 - Missing: 1A0]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + + end; + + procedure fail_on_different_coll_data is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + l_obj ut3_tester_helper.test_dummy_object := ut3_tester_helper.test_dummy_object(1, 'A', '0'); + begin + --Arrange + g_test_expected := anydata.convertCollection( ut3_tester_helper.test_dummy_object_list(l_obj) ); + g_test_actual := anydata.convertCollection( ut3_tester_helper.test_dummy_object_list(l_obj, l_obj) ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + --Assert + l_expected_message := q'[%Actual: ut3_tester_helper.test_dummy_object_list [ count = 2 ] was expected to equal: ut3_tester_helper.test_dummy_object_list [ count = 1 ] +%Diff: +%Rows: [ 1 differences ] +%Row No. 2 - Extra: 1A0]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + --%test(Gives success when both anydata are NULL) + procedure success_on_both_anydata_null is + --Arrange + l_null_anydata anydata; + begin + --Act + ut3.ut.expect( l_null_anydata ).to_equal( l_null_anydata ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure success_on_both_object_null is + --Arrange + l_null_object ut3_tester_helper.test_dummy_object; + l_anydata anydata := anydata.convertObject(l_null_object); + begin + --Act + ut3.ut.expect( l_anydata ).to_equal( l_anydata ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure success_on_both_coll_null is + --Arrange + l_null_collection ut3_tester_helper.test_dummy_object_list; + l_anydata anydata := anydata.convertCollection(l_null_collection); + begin + --Act + ut3.ut.expect( l_anydata ).to_equal( l_anydata ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure success_on_same_coll_data is + begin + --Arrange + g_test_expected := anydata.convertCollection( ut3_tester_helper.test_dummy_object_list(ut3_tester_helper.test_dummy_object(1, 'A', '0')) ); + g_test_actual := anydata.convertCollection( ut3_tester_helper.test_dummy_object_list(ut3_tester_helper.test_dummy_object(1, 'A', '0')) ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure fail_on_coll_different_order is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + l_first_obj ut3_tester_helper.test_dummy_object := ut3_tester_helper.test_dummy_object(1, 'A', '0'); + l_second_obj ut3_tester_helper.test_dummy_object := ut3_tester_helper.test_dummy_object(2, 'b', '1'); + begin + --Arrange + g_test_expected := anydata.convertCollection( ut3_tester_helper.test_dummy_object_list(l_first_obj, l_second_obj) ); + g_test_actual := anydata.convertCollection( ut3_tester_helper.test_dummy_object_list(l_second_obj, l_first_obj) ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + end; + + procedure success_on_same_object_data is + begin + --Arrange + g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(1, 'A', '0') ); + g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(1, 'A', '0') ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure exclude_attributes_as_list is + l_list ut3.ut_varchar2_list; + begin + --Arrange + l_list := ut3.ut_varchar2_list('TEST_DUMMY_OBJECT/Value','/TEST_DUMMY_OBJECT/ID'); + g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); + g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>3, "name"=>'A',"Value"=>'1') ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected, a_exclude=> l_list ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure exclude_attributes_as_csv is + l_list varchar2(100); + begin + --Arrange + l_list := 'TEST_DUMMY_OBJECT/Value,TEST_DUMMY_OBJECT/ID'; + g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); + g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>2, "name"=>'A',"Value"=>'1') ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected, a_exclude=> l_list ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure exclude_attributes_xpath is + l_xpath varchar2(100); + begin + --Arrange + l_xpath := '//TEST_DUMMY_OBJECT/Value|//TEST_DUMMY_OBJECT/ID'; + g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); + g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>2, "name"=>'A',"Value"=>'1') ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected, a_exclude=> l_xpath ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure exclude_ignores_invalid_attrib is + l_exclude varchar2(100); + begin + --Arrange + l_exclude := 'BadAttributeName'; + g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); + g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected, a_exclude=> l_exclude ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure include_attributes_as_list is + l_list ut3.ut_varchar2_list; + begin + --Arrange + l_list := ut3.ut_varchar2_list('TEST_DUMMY_OBJECT/Value','TEST_DUMMY_OBJECT/ID'); + g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); + g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'b',"Value"=>'0') ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ).include( l_list ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure include_attributes_as_csv is + l_xpath varchar2(100); + begin + --Arrange + l_xpath := 'TEST_DUMMY_OBJECT/key,TEST_DUMMY_OBJECT/ID'; + g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); + g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'1') ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ).include( l_xpath ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure include_attributes_xpath is + l_xpath varchar2(100); + begin + --Arrange + l_xpath := '//TEST_DUMMY_OBJECT/key|//TEST_DUMMY_OBJECT/ID'; + g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); + g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'1') ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ).include( l_xpath ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure include_ignores_invalid_attrib is + l_include varchar2(100); + begin + --Arrange + l_include := ' BadAttributeName, TEST_DUMMY_OBJECT/ID '; + g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'B',"Value"=>'0') ); + g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'1') ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ).include( l_include ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure include_exclude_attributes_csv is + l_exclude varchar2(100); + l_include varchar2(100); + begin + --Arrange + l_include := 'TEST_DUMMY_OBJECT/key,TEST_DUMMY_OBJECT/ID,TEST_DUMMY_OBJECT/Value'; + l_exclude := '//TEST_DUMMY_OBJECT/key|//TEST_DUMMY_OBJECT/Value'; + g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'B',"Value"=>'0') ); + g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'1') ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ).exclude( l_exclude ).include( l_include ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure include_exclude_attrib_list is + l_exclude ut3.ut_varchar2_list; + l_include ut3.ut_varchar2_list; + l_expected varchar2(32767); + l_actual varchar2(32767); + begin + --Arrange + l_include := ut3.ut_varchar2_list('TEST_DUMMY_OBJECT/key','TEST_DUMMY_OBJECT/ID','TEST_DUMMY_OBJECT/Value'); + l_exclude := ut3.ut_varchar2_list('TEST_DUMMY_OBJECT/key','TEST_DUMMY_OBJECT/Value'); + g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'B',"Value"=>'0') ); + g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'1') ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ).exclude( l_exclude ).include( l_include ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure reports_diff_attribute is + l_expected varchar2(32767); + l_actual varchar2(32767); + begin + --Arrange + g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(1, 'A', '0') ); + g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(1, NULL, '0') ); + l_expected := q'[Actual: ut3_tester_helper.test_dummy_object was expected to equal: ut3_tester_helper.test_dummy_object +Diff: +Rows: [ 1 differences ] + Row No. 1 - Actual: + Row No. 1 - Expected: A]'; + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + --Assert + l_actual := ut3_tester_helper.main_helper.get_failed_expectations(1); + ut.expect(l_actual).to_be_like(l_expected); + end; + + + procedure reports_diff_structure is + l_obj ut3_tester_helper.test_dummy_object := ut3_tester_helper.test_dummy_object(1, 'A', '0'); + l_expected varchar2(32767); + l_actual varchar2(32767); + begin + --Arrange + g_test_expected := anydata.convertCollection( ut3_tester_helper.test_dummy_object_list(l_obj) ); + g_test_actual := anydata.convertCollection( ut3_tester_helper.test_dummy_object_list(l_obj, l_obj) ); + l_expected := q'[Actual: ut3_tester_helper.test_dummy_object_list [ count = 2 ] was expected to equal: ut3_tester_helper.test_dummy_object_list [ count = 1 ] +Diff: +Rows: [ 1 differences ] + Row No. 2 - Extra: 1A0]'; + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + --Assert + l_actual := ut3_tester_helper.main_helper.get_failed_expectations(1); + ut.expect(l_actual).to_be_like(l_expected); + end; + + function get_anydata return anydata is + begin + return anydata.convertObject( ut3_tester_helper.test_dummy_object(1, 'B', '0') ); + end; + + procedure deprec_to_equal_excl_varch is + begin + --Act + ut3.ut.expect(get_anydata()).to_equal(get_anydata(), a_exclude => 'A_COLUMN,Some_Col'); + --Assert + ut.expect(cardinality(ut3_tester_helper.main_helper.get_warnings())).to_equal(1); + ut.expect(ut3_tester_helper.main_helper.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); + end; + + procedure deprec_to_equal_excl_list is + begin + --Act + ut3.ut.expect(get_anydata()).to_equal(get_anydata(), a_exclude => ut3.ut_varchar2_list('A_COLUMN','Some_Col')); + --Assert + ut.expect(cardinality(ut3_tester_helper.main_helper.get_warnings())).to_equal(1); + ut.expect(ut3_tester_helper.main_helper.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); + end; + + procedure deprec_not_to_equal_excl_varch is + begin + --Act + ut3.ut.expect(get_anydata()).not_to_equal(get_anydata(), a_exclude => 'A_COLUMN,Some_Col'); + --Assert + ut.expect(cardinality(ut3_tester_helper.main_helper.get_warnings())).to_equal(1); + ut.expect(ut3_tester_helper.main_helper.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); + end; + + procedure deprec_not_to_equal_excl_list is + begin + --Act + ut3.ut.expect(get_anydata()).not_to_equal(get_anydata(), a_exclude => ut3.ut_varchar2_list('A_COLUMN','Some_Col')); + --Assert + ut.expect(cardinality(ut3_tester_helper.main_helper.get_warnings())).to_equal(1); + ut.expect(ut3_tester_helper.main_helper.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); + end; + + procedure deprec_equal_excl_varch is + begin + --Act + ut3.ut.expect(get_anydata()).to_(ut3.equal(get_anydata(), a_exclude => 'A_COLUMN,Some_Col')); + --Assert + ut.expect(cardinality(ut3_tester_helper.main_helper.get_warnings())).to_equal(1); + ut.expect(ut3_tester_helper.main_helper.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); + end; + + procedure deprec_equal_excl_list is + begin + --Act + ut3.ut.expect(get_anydata()).to_(ut3.equal(get_anydata(), a_exclude => ut3.ut_varchar2_list('A_COLUMN','Some_Col'))); + --Assert + ut.expect(cardinality(ut3_tester_helper.main_helper.get_warnings())).to_equal(1); + ut.expect(ut3_tester_helper.main_helper.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); + end; + + procedure data_diff_on_atr_data_mismatch is + l_actual ut3_tester_helper.test_dummy_object_list; + l_expected ut3_tester_helper.test_dummy_object_list; + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) + bulk collect into l_actual + from dual connect by level <=2; + select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) + bulk collect into l_expected + from dual connect by level <=2 + order by rownum desc; + --Act + ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); + + l_expected_message := q'[Actual: ut3_tester_helper.test_dummy_object_list [ count = 2 ] was expected to equal: ut3_tester_helper.test_dummy_object_list [ count = 2 ] +Diff: +Rows: [ 2 differences ] + Row No. 1 - Actual: 1Something 11 + Row No. 1 - Expected: 2Something 22 + Row No. 2 - Actual: 2Something 22 + Row No. 2 - Expected: 1Something 11]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure data_diff_on_20_rows_only is + l_actual ut3_tester_helper.test_dummy_object_list; + l_expected ut3_tester_helper.test_dummy_object_list; + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + select ut3_tester_helper.test_dummy_object( rn, 'Something '||rn, rn1) + bulk collect into l_actual + from (select rownum * case when mod(rownum,2) = 0 then -1 else 1 end rn, + rownum * case when mod(rownum,4) = 0 then -1 else 1 end rn1 + from dual connect by level <=100); + select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) + bulk collect into l_expected + from dual connect by level <=110; + --Act + ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); + + l_expected_message := q'[Actual: ut3_tester_helper.test_dummy_object_list [ count = 100 ] was expected to equal: ut3_tester_helper.test_dummy_object_list [ count = 110 ] +Diff: +Rows: [ 60 differences, showing first 20 ] + Row No. 2 - Actual: -2Something -2 + Row No. 2 - Expected: 2Something 2 + Row No. 4 - Actual: -4Something -4-4 + Row No. 4 - Expected: 4Something 44 + % + Row No. 38 - Actual: -38Something -38 + Row No. 38 - Expected: 38Something 38 + Row No. 40 - Actual: -40Something -40-40 + Row No. 40 - Expected: 40Something 4040]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure collection_include_list is + l_actual ut3_tester_helper.test_dummy_object_list; + l_expected ut3_tester_helper.test_dummy_object_list; + l_list ut3.ut_varchar2_list; + begin + l_list := ut3.ut_varchar2_list('TEST_DUMMY_OBJECT/Value','TEST_DUMMY_OBJECT/ID'); + --Arrange + select ut3_tester_helper.test_dummy_object( rownum, 'SomethingsDifferent '||rownum, rownum) + bulk collect into l_actual + from dual connect by level <=2; + select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) + bulk collect into l_expected + from dual connect by level <=2; + --Act + ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).include( l_list ); + + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure collection_exclude_list is + l_actual ut3_tester_helper.test_dummy_object_list; + l_expected ut3_tester_helper.test_dummy_object_list; + l_list ut3.ut_varchar2_list; + begin + l_list := ut3.ut_varchar2_list('TEST_DUMMY_OBJECT/Value','TEST_DUMMY_OBJECT/ID'); + --Arrange + select ut3_tester_helper.test_dummy_object( rownum*2, 'Something '||rownum, rownum*2) + bulk collect into l_actual + from dual connect by level <=2; + select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) + bulk collect into l_expected + from dual connect by level <=2; + --Act + ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).exclude( l_list ); + + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure collection_include_list_fail is + l_actual ut3_tester_helper.test_dummy_object_list; + l_expected ut3_tester_helper.test_dummy_object_list; + l_list ut3.ut_varchar2_list; + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + l_list := ut3.ut_varchar2_list('TEST_DUMMY_OBJECT/name'); + --Arrange + select ut3_tester_helper.test_dummy_object( rownum, 'SomethingsDifferent '||rownum, rownum) + bulk collect into l_actual + from dual connect by level <=2; + select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) + bulk collect into l_expected + from dual connect by level <=2; + --Act + ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).include( l_list ); + + l_expected_message := q'[%Actual: ut3_tester_helper.test_dummy_object_list [ count = 2 ] was expected to equal: ut3_tester_helper.test_dummy_object_list [ count = 2 ] +%Diff: +%Rows: [ 2 differences ] +%All rows are different as the columns are not matching.]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure array_same_data is + begin + --Arrange + g_test_expected := anydata.convertCollection( ut3_tester_helper.t_tab_varchar('A') ); + g_test_actual := anydata.convertCollection( ut3_tester_helper.t_tab_varchar('A') ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure array_diff_data is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + g_test_expected := anydata.convertCollection( ut3_tester_helper.t_tab_varchar('A') ); + g_test_actual := anydata.convertCollection( ut3_tester_helper.t_tab_varchar('B') ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + l_expected_message := q'[%Actual: ut3_tester_helper.t_tab_varchar [ count = 1 ] was expected to equal: ut3_tester_helper.t_tab_varchar [ count = 1 ] +%Diff: +%Rows: [ 1 differences ] +%Row No. 1 - Actual: B +%Row No. 1 - Expected: A]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure array_is_null is + l_is_null ut3_tester_helper.t_tab_varchar ; + begin + ut3.ut.expect( anydata.convertCollection( l_is_null ) ).to_be_null; + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure array_null_equal_array_null is + l_is_null ut3_tester_helper.t_tab_varchar ; + l_is_null_bis ut3_tester_helper.t_tab_varchar ; + begin + ut3.ut.expect( anydata.convertCollection( l_is_null ) ).to_equal(anydata.convertCollection( l_is_null_bis )); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure array_null_equal_array_notnull is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + l_is_null ut3_tester_helper.t_tab_varchar ; + begin + --Arrange + g_test_expected := anydata.convertCollection( l_is_null ); + g_test_actual := anydata.convertCollection( ut3_tester_helper.t_tab_varchar('A') ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + l_expected_message := q'[%Actual: ut3_tester_helper.t_tab_varchar [ count = 1 ] was expected to equal: ut3_tester_helper.t_tab_varchar [ count = ] +%Diff: +%Rows: [ 1 differences ] +%Row No. 1 - Extra: A]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure empty_array_have_zero_elem is + begin + ut3.ut.expect( anydata.convertCollection(ut3_tester_helper.t_tab_varchar())).to_have_count(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure array_empty_equal_array_empty is + begin + --Arrange + g_test_expected := anydata.convertCollection(ut3_tester_helper.t_tab_varchar()); + g_test_actual := anydata.convertCollection(ut3_tester_helper.t_tab_varchar()); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure arr_empty_equal_arr_notempty is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + l_is_null ut3_tester_helper.t_tab_varchar ; + begin + --Arrange + g_test_expected := anydata.convertCollection( ut3_tester_helper.t_tab_varchar() ); + g_test_actual := anydata.convertCollection( ut3_tester_helper.t_tab_varchar('A') ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + l_expected_message := q'[%Actual: ut3_tester_helper.t_tab_varchar [ count = 1 ] was expected to equal: ut3_tester_helper.t_tab_varchar [ count = 0 ] +%Diff: +%Rows: [ 1 differences ] +%Row No. 1 - Extra: A]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure collection_is_null is + l_null_list ut3_tester_helper.test_dummy_object_list; + begin + --Arrange + g_test_actual := anydata.convertCollection( l_null_list ); + --Act + ut3.ut.expect( g_test_actual ).to_be_null; + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure collection_is_empty is + begin + --Arrange + g_test_actual := anydata.convertCollection( ut3_tester_helper.test_dummy_object_list() ); + --Act + ut3.ut.expect( g_test_actual ).to_have_count(0); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + + end; + + procedure varray_same_data is + begin + --Arrange + g_test_expected := anydata.convertCollection( ut3_tester_helper.t_varray(1) ); + g_test_actual := anydata.convertCollection( ut3_tester_helper.t_varray(1) ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure varray_diff_data is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + g_test_expected := anydata.convertCollection( ut3_tester_helper.t_varray(1) ); + g_test_actual := anydata.convertCollection( ut3_tester_helper.t_varray(2) ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + l_expected_message := q'[%Actual: ut3_tester_helper.t_varray [ count = 1 ] was expected to equal: ut3_tester_helper.t_varray [ count = 1 ] +%Diff: +%Rows: [ 1 differences ] +%Row No. 1 - Actual: 2 +%Row No. 1 - Expected: 1]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure varray_is_null is + l_is_null ut3_tester_helper.t_varray ; + begin + ut3.ut.expect( anydata.convertCollection( l_is_null ) ).to_be_null; + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure varray_null_equal_varray_null is + l_is_null ut3_tester_helper.t_varray ; + l_is_null_bis ut3_tester_helper.t_varray ; + begin + ut3.ut.expect( anydata.convertCollection( l_is_null ) ).to_equal(anydata.convertCollection( l_is_null_bis )); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure varr_null_equal_varr_notnull is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + l_is_null ut3_tester_helper.t_varray ; + begin + --Arrange + g_test_expected := anydata.convertCollection( l_is_null ); + g_test_actual := anydata.convertCollection( ut3_tester_helper.t_varray(1) ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + l_expected_message := q'[%Actual: ut3_tester_helper.t_varray [ count = 1 ] was expected to equal: ut3_tester_helper.t_varray [ count = ] +%Diff: +%Rows: [ 1 differences ] +%Row No. 1 - Extra: 1]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure empty_varray_have_zero_elem is + begin + ut3.ut.expect( anydata.convertCollection(ut3_tester_helper.t_varray())).to_have_count(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure varr_empty_equal_varr_empty is + begin + --Arrange + g_test_expected := anydata.convertCollection(ut3_tester_helper.t_varray()); + g_test_actual := anydata.convertCollection(ut3_tester_helper.t_varray()); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure varr_empty_equal_varr_notempty is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + l_is_null ut3_tester_helper.t_varray ; + begin + --Arrange + g_test_expected := anydata.convertCollection( ut3_tester_helper.t_varray() ); + g_test_actual := anydata.convertCollection( ut3_tester_helper.t_varray(1) ); + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + l_expected_message := q'[%Actual: ut3_tester_helper.t_varray [ count = 1 ] was expected to equal: ut3_tester_helper.t_varray [ count = 0 ] +%Diff: +%Rows: [ 1 differences ] +%Row No. 1 - Extra: 1]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure collection_join_by is + l_actual ut3_tester_helper.test_dummy_object_list; + l_expected ut3_tester_helper.test_dummy_object_list; + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) + bulk collect into l_actual + from dual connect by level <=2; + select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) + bulk collect into l_expected + from dual connect by level <=2 + order by rownum desc; + --Act + ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).join_by('TEST_DUMMY_OBJECT/ID'); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure collection_join_by_fail is + l_actual ut3_tester_helper.test_dummy_object_list; + l_expected ut3_tester_helper.test_dummy_object_list; + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) + bulk collect into l_actual + from dual connect by level <=2; + select ut3_tester_helper.test_dummy_object( rownum * 2, 'Something '||rownum, rownum) + bulk collect into l_expected + from dual connect by level <=2 + order by rownum desc; + --Act + ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).join_by('TEST_DUMMY_OBJECT/ID'); + l_expected_message := q'[%Actual: ut3_tester_helper.test_dummy_object_list [ count = 2 ] was expected to equal: ut3_tester_helper.test_dummy_object_list [ count = 2 ] +%Diff: +%Rows: [ 3 differences ] +%PK 2 - Actual: Something 2 +%PK 2 - Actual: 2 +%PK 2 - Expected: Something 1 +%PK 2 - Expected: 1 +%PK 1 - Extra: 1Something 11 +%PK 4 - Missing: 4Something 22]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure collection_unordered is + l_actual ut3_tester_helper.test_dummy_object_list; + l_expected ut3_tester_helper.test_dummy_object_list; + begin + --Arrange + select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) + bulk collect into l_actual + from dual connect by level <=3; + select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) + bulk collect into l_expected + from dual connect by level <=3 + order by rownum desc; + --Act + ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).unordered; + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure collection_unordered_fail is + l_actual ut3_tester_helper.test_dummy_object_list; + l_expected ut3_tester_helper.test_dummy_object_list; + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) + bulk collect into l_actual + from dual connect by level <=2; + select ut3_tester_helper.test_dummy_object( rownum * 2, 'Something '||rownum, rownum) + bulk collect into l_expected + from dual connect by level <=2 + order by rownum desc; + + l_expected_message := q'[%Actual: ut3_tester_helper.test_dummy_object_list [ count = 2 ] was expected to equal: ut3_tester_helper.test_dummy_object_list [ count = 2 ] +%Diff: +%Rows: [ 4 differences ] +%Extra: 1Something 11 +%Extra: 2Something 22 +%Missing: 4Something 22 +%Missing: 2Something 11]'; + + ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).unordered; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure object_join_by is + begin + --Arrange + g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(1, 'A', '0') ); + g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(1, 'A', '0') ); + + --Act + ut3.ut.expect(g_test_actual).to_equal(g_test_expected).join_by('TEST_DUMMY_OBJECT/ID'); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure object_unordered is + begin + g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(1, 'A', '0') ); + g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(1, 'A', '0') ); + + --Act + ut3.ut.expect(g_test_actual).to_equal(g_test_expected).unordered; + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure collection_to_contain is + l_actual ut3_tester_helper.test_dummy_object_list; + l_expected ut3_tester_helper.test_dummy_object_list; + begin + --Arrange + select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) + bulk collect into l_actual + from dual connect by level <=4; + select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) + bulk collect into l_expected + from dual connect by level <=2 + order by rownum desc; + --Act + ut3.ut.expect(anydata.convertCollection(l_actual)).to_contain(anydata.convertCollection(l_expected)); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + + procedure object_to_contain is + begin + --Arrange + g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(1, 'A', '0') ); + g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(1, 'A', '0') ); + + --Act + ut3.ut.expect(g_test_actual).to_contain(g_test_expected); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + end; + +end; +/ \ No newline at end of file diff --git a/test/ut3_user/expectations/test_expectation_anydata.pks b/test/ut3_user/expectations/test_expectation_anydata.pks new file mode 100644 index 000000000..dd414a5c2 --- /dev/null +++ b/test/ut3_user/expectations/test_expectation_anydata.pks @@ -0,0 +1,202 @@ +create or replace package test_expectation_anydata is + + --%suite(equal on anydata) + --%suitepath(utplsql.test_user.expectations) + + --%aftereach + procedure cleanup; + + --%test(Gives failure when comparing NULL objects of different type) + procedure fail_on_different_type_null; + + --%test(Gives failure when comparing objects of different type) + procedure fail_on_different_type; + + --%test(Gives failure when objects holds different data) + procedure fail_on_different_object_data; + + --%test(Gives failure when one of objects is NULL) + procedure fail_on_one_object_null; + + --%test(Gives failure when comparing object to collection) + procedure fail_on_collection_vs_object; + + --%test(Gives failure when comparing empty collection to NULL collection) + procedure fail_on_null_vs_empty_coll; + + --%test(Gives failure when one of collections is NULL) + procedure fail_on_one_collection_null; + + --%test(Gives failure when one of collections is empty) + procedure fail_on_one_collection_empty; + + --%test(Gives failure when collections holds different data) + procedure fail_on_different_coll_data; + + --%test(Gives success when both anydata are NULL) + procedure success_on_both_anydata_null; + + --%test(Gives success when both objects are null) + procedure success_on_both_object_null; + + --%test(Gives success when both collections are null) + procedure success_on_both_coll_null; + + --%test(Gives success when both collections are of same type contain identical data) + procedure success_on_same_coll_data; + + --%test(Gives failure when both collections contain the same data in different order) + procedure fail_on_coll_different_order; + + --%test(Gives success when both objects are of same type and hold the same data) + procedure success_on_same_object_data; + + --%test(List of attributes to exclude is case sensitive) + procedure exclude_attributes_as_list; + + --%test(Comma separated list of attributes to exclude is case sensitive) + procedure exclude_attributes_as_csv; + + --%test(Exclude attributes by XPath is case sensitive) + procedure exclude_attributes_xpath; + + --%test(Excludes existing attributes when some of attributes on exclude are not valid column names) + procedure exclude_ignores_invalid_attrib; + + --%test(List of attributes to include is case sensitive) + procedure include_attributes_as_list; + + --%test(Comma separated list of attributes to include is case sensitive) + procedure include_attributes_as_csv; + + --%test(Include attributes by XPath is case sensitive) + procedure include_attributes_xpath; + + --%test(Includes existing attributes when some of attributes on exclude are not valid column names) + procedure include_ignores_invalid_attrib; + + --%test(Includes only attributes that are not excluded) + procedure include_exclude_attributes_csv; + + --%test(Includes only attributes that are not on exclude list) + procedure include_exclude_attrib_list; + + --%test(Reports diff on incorrect attributes of an object type) + procedure reports_diff_attribute; + + --%test(Reports diff on incorrect rows and attributes of a collection type) + procedure reports_diff_structure; + + --%test(Adds a warning when using depreciated syntax to_equal( a_expected anydata, a_exclude varchar2 )) + procedure deprec_to_equal_excl_varch; + + --%test(Adds a warning when using depreciated syntax to_equal( a_expected anydata, a_exclude ut_varchar2_list )) + procedure deprec_to_equal_excl_list; + + --%test(Adds a warning when using depreciated syntax not_to_equal( a_expected anydata, a_exclude varchar2 )) + procedure deprec_not_to_equal_excl_varch; + + --%test(Adds a warning when using depreciated syntax not_to_equal( a_expected anydata, a_exclude ut_varchar2_list )) + procedure deprec_not_to_equal_excl_list; + + --%test(Adds a warning when using depreciated syntax to_( equal( a_expected anydata, a_exclude varchar2 ) )) + procedure deprec_equal_excl_varch; + + --%test(Adds a warning when using depreciated syntax to_( equal( a_expected anydata, a_exclude ut_varchar2_list )) ) + procedure deprec_equal_excl_list; + + --%test(Reports only mismatched attributes on row data mismatch) + procedure data_diff_on_atr_data_mismatch; + + --%test(Reports only first 20 rows of diff and gives a full diff count) + procedure data_diff_on_20_rows_only; + + --%test(Validate include list on collections of objects) + procedure collection_include_list; + + --%test(Validate exclude list on collections of objects) + procedure collection_exclude_list; + + --%test(Validate include list on collections of objects fail) + procedure collection_include_list_fail; + + --%test(Two ARRAYS with same data) + procedure array_same_data; + + --%test(Two ARRAYS with different data) + procedure array_diff_data; + + --%test(ARRAY is atomically null) + procedure array_is_null; + + --%test(Compare two null ARRAYs) + procedure array_null_equal_array_null; + + --%test(Compare null ARRAY to ARRAY with data) + procedure array_null_equal_array_notnull; + + --%test(Empty ARRAY have count of 0) + procedure empty_array_have_zero_elem; + + --%test(Compare two empty ARRAYs) + procedure array_empty_equal_array_empty; + + --%test(Compare empty ARRAY to ARRAY with data) + procedure arr_empty_equal_arr_notempty; + + --%test(Collection is atomically NULL) + procedure collection_is_null; + + --%test(Collection is empty) + procedure collection_is_empty; + + --%test(Two VARRAYS with same data) + procedure varray_same_data; + + --%test(Two VARRAYS with different data) + procedure varray_diff_data; + + --%test(VARRAY is atomically null) + procedure varray_is_null; + + --%test(Compare two null VARRAYs) + procedure varray_null_equal_varray_null; + + --%test(Compare null VARRAY to VARRAY with data) + procedure varr_null_equal_varr_notnull; + + --%test(Empty VARRAY have count of 0) + procedure empty_varray_have_zero_elem; + + --%test(Compare two empty VARRAYs) + procedure varr_empty_equal_varr_empty; + + --%test(Compare empty VARRAY to VARRAY with data) + procedure varr_empty_equal_varr_notempty; + + --%test( Anydata collection using joinby ) + procedure collection_join_by; + + --%test( Anydata collection using joinby fail) + procedure collection_join_by_fail; + + --%test( Anydata collection unordered ) + procedure collection_unordered; + + --%test( Anydata collection unordered fail ) + procedure collection_unordered_fail; + + --%test( Anydata object using joinby ) + procedure object_join_by; + + --%test( Anydata object unordered ) + procedure object_unordered; + + --%test( Success when anydata collection contains data from another anydata collection) + procedure collection_to_contain; + + --%test( Success when anydata object contains data from another anydata) + procedure object_to_contain; + +end; +/ diff --git a/test/ut3_user/expectations/test_expectations_cursor.pks b/test/ut3_user/expectations/test_expectations_cursor.pks index e8f492674..ae37b37d3 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pks +++ b/test/ut3_user/expectations/test_expectations_cursor.pks @@ -1,7 +1,7 @@ create or replace package test_expectations_cursor is --%suite(cursor expectations) - --%suitepath(utplsql.core.expectations) + --%suitepath(utplsql.test_user.expectations) --%aftereach procedure cleanup_expectations; diff --git a/test/ut3_user/expectations/test_matchers.pks b/test/ut3_user/expectations/test_matchers.pks index b8fc699ee..e3e22e0cd 100644 --- a/test/ut3_user/expectations/test_matchers.pks +++ b/test/ut3_user/expectations/test_matchers.pks @@ -1,7 +1,7 @@ create or replace package test_matchers is --%suite(matchers) - --%suitepath(utplsql.core.expectations) + --%suitepath(utplsql.test_user.expectations) --%aftereach procedure cleanup_expectations; From e2561bc70599bc0fffa20480ba1aab5248b9eb7a Mon Sep 17 00:00:00 2001 From: lwasylow Date: Mon, 25 Mar 2019 07:32:46 +0000 Subject: [PATCH 0349/1096] Adding next set of tests migrated. expectations/binary/test_be_less_or_equal changing name of function to more meaningful. --- test/install_ut3_user_tests.sql | 2 + test/ut3_tester_helper/main_helper.pkb | 2 +- test/ut3_tester_helper/main_helper.pks | 2 +- .../binary/test_be_less_or_equal.pkb | 263 ++++++++++++++++++ .../binary/test_be_less_or_equal.pks | 97 +++++++ .../expectations/binary/test_equal.pkb | 6 +- .../binary/test_expect_to_be_less_than.pkb | 58 ++-- .../expectations/test_expectation_anydata.pkb | 74 ++--- .../expectations/test_expectations_cursor.pkb | 158 +++++------ test/ut3_user/expectations/test_matchers.pkb | 20 +- 10 files changed, 522 insertions(+), 160 deletions(-) create mode 100644 test/ut3_user/expectations/binary/test_be_less_or_equal.pkb create mode 100644 test/ut3_user/expectations/binary/test_be_less_or_equal.pks diff --git a/test/install_ut3_user_tests.sql b/test/install_ut3_user_tests.sql index b38375c34..aad875984 100644 --- a/test/install_ut3_user_tests.sql +++ b/test/install_ut3_user_tests.sql @@ -7,6 +7,7 @@ alter session set plsql_optimize_level=0; prompt Install user tests @@ut3_user/expectations/binary/test_equal.pks @@ut3_user/expectations/binary/test_expect_to_be_less_than.pks +@@ut3_user/expectations/binary/test_be_less_or_equal.pks @@ut3_user/expectations/test_matchers.pks @@ut3_user/expectations/test_expectation_anydata.pks @@ut3_user/expectations/test_expectations_cursor.pks @@ -14,6 +15,7 @@ prompt Install user tests @@ut3_user/expectations/binary/test_equal.pkb @@ut3_user/expectations/binary/test_expect_to_be_less_than.pkb +@@ut3_user/expectations/binary/test_be_less_or_equal.pkb @@ut3_user/expectations/test_matchers.pkb @@ut3_user/expectations/test_expectation_anydata.pkb @@ut3_user/expectations/test_expectations_cursor.pkb diff --git a/test/ut3_tester_helper/main_helper.pkb b/test/ut3_tester_helper/main_helper.pkb index 4c93720cd..1085e5c47 100644 --- a/test/ut3_tester_helper/main_helper.pkb +++ b/test/ut3_tester_helper/main_helper.pkb @@ -63,7 +63,7 @@ create or replace package body main_helper is return anydata.convertCollection(ut3.ut_expectation_processor.get_failed_expectations()); end; - function get_failed_expectations_n return number is + function get_failed_expectations_num return number is l_num_failed number; l_results ut3.ut_expectation_results := ut3.ut_expectation_processor.get_failed_expectations(); begin diff --git a/test/ut3_tester_helper/main_helper.pks b/test/ut3_tester_helper/main_helper.pks index be755fea6..8f904501f 100644 --- a/test/ut3_tester_helper/main_helper.pks +++ b/test/ut3_tester_helper/main_helper.pks @@ -15,7 +15,7 @@ create or replace package main_helper is function get_failed_expectations(a_pos in number) return varchar2; - function get_failed_expectations_n return number; + function get_failed_expectations_num return number; procedure clear_expectations; diff --git a/test/ut3_user/expectations/binary/test_be_less_or_equal.pkb b/test/ut3_user/expectations/binary/test_be_less_or_equal.pkb new file mode 100644 index 000000000..81634f7f5 --- /dev/null +++ b/test/ut3_user/expectations/binary/test_be_less_or_equal.pkb @@ -0,0 +1,263 @@ +create or replace package body test_be_less_or_equal is + + procedure cleanup_expectations is + begin + ut3_tester_helper.main_helper.clear_expectations( ); + end; + + function to_less_or_equal_block( + a_data_type varchar2, + a_actual varchar2, + a_expected varchar2 + ) return varchar2 is + begin + return ut3_tester_helper.expectations_helper.binary_expectation_block( + 'to_be_less_or_equal', a_data_type, a_actual, a_data_type, a_expected + ); + end; + + function not_to_less_or_equal_block( + a_data_type varchar2, + a_actual varchar2, + a_expected varchar2 + ) return varchar2 is + begin + return ut3_tester_helper.expectations_helper.binary_expectation_block( + 'not_to_be_less_or_equal', a_data_type, a_actual, a_data_type, a_expected + ); + end; + + procedure actual_date_greater is + begin + --Act + execute immediate to_less_or_equal_block('date', 'sysdate', 'sysdate-1'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure actual_number_greater is + begin + --Act + execute immediate to_less_or_equal_block('number', '2.0', '1.99'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure actual_interval_ym_greater is + begin + --Act + execute immediate to_less_or_equal_block('interval year to month', '''2-1''', '''2-0'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure actual_interval_ds_greater is + begin + --Act + execute immediate to_less_or_equal_block('interval day to second', '''2 01:00:00''', '''2 00:59:59'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure actual_timestamp_greater is + begin + --Act + execute immediate to_less_or_equal_block('timestamp', 'to_timestamp(''1997 13'',''YYYY FF'')', 'to_timestamp(''1997 12'',''YYYY FF'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure actual_timestamp_tz_greater is + begin + --Act + execute immediate to_less_or_equal_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure actual_timestamp_ltz_greater is + begin + --Act + execute immediate to_less_or_equal_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure actual_date_equal is + begin + --Act + execute immediate to_less_or_equal_block('date', 'sysdate', 'sysdate'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_number_equal is + begin + --Act + execute immediate to_less_or_equal_block('number', '2.0', '2.00'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_interval_ym_equal is + begin + --Act + execute immediate to_less_or_equal_block('interval year to month', '''2-1''', '''2-1'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_interval_ds_equal is + begin + --Act + execute immediate to_less_or_equal_block('interval day to second', '''2 01:00:00''', '''2 01:00:00'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_timestamp_equal is + begin + --Act + execute immediate to_less_or_equal_block('timestamp', 'to_timestamp(''1997 13'',''YYYY FF'')', 'to_timestamp(''1997 13'',''YYYY FF'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_timestamp_tz_equal is + begin + --Act + execute immediate to_less_or_equal_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_timestamp_ltz_equal is + begin + --Act + execute immediate to_less_or_equal_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_date_less is + begin + --Act + execute immediate to_less_or_equal_block('date', 'sysdate-1', 'sysdate'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_number_less is + begin + --Act + execute immediate to_less_or_equal_block('number', '1.0', '1.01'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_interval_ym_less is + begin + --Act + execute immediate to_less_or_equal_block('interval year to month', '''2-1''', '''2-2'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_interval_ds_less is + begin + --Act + execute immediate to_less_or_equal_block('interval day to second', '''2 00:59:58''', '''2 00:59:59'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_timestamp_less is + begin + --Act + execute immediate to_less_or_equal_block('timestamp', 'to_timestamp(''1997 12'',''YYYY FF'')', 'to_timestamp(''1997 13'',''YYYY FF'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_timestamp_tz_less is + begin + --Act + execute immediate to_less_or_equal_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +03:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_timestamp_ltz_less is + begin + --Act + execute immediate to_less_or_equal_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +03:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure not_actual_date_greater is + begin + --Act + execute immediate not_to_less_or_equal_block('date', 'sysdate', 'sysdate-1'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure not_actual_number_greater is + begin + --Act + execute immediate not_to_less_or_equal_block('number', '2.0', '1.99'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure not_actual_interval_ym_greater is + begin + --Act + execute immediate not_to_less_or_equal_block('interval year to month', '''2-1''', '''2-0'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure not_actual_interval_ds_greater is + begin + --Act + execute immediate not_to_less_or_equal_block('interval day to second', '''2 01:00:00''', '''2 00:59:59'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure not_actual_timestamp_greater is + begin + --Act + execute immediate not_to_less_or_equal_block('timestamp', 'to_timestamp(''1997 13'',''YYYY FF'')', 'to_timestamp(''1997 12'',''YYYY FF'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure not_actual_timestamp_tz_gretr is + begin + --Act + execute immediate not_to_less_or_equal_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure not_actual_timestamp_ltz_gretr is + begin + --Act + execute immediate not_to_less_or_equal_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_clob is + begin + --Act + ut3.ut.expect(to_clob('3')).to_( ut3.be_less_or_equal(3) ); + --Assert + ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); + end; + +end; +/ diff --git a/test/ut3_user/expectations/binary/test_be_less_or_equal.pks b/test/ut3_user/expectations/binary/test_be_less_or_equal.pks new file mode 100644 index 000000000..a6ab01664 --- /dev/null +++ b/test/ut3_user/expectations/binary/test_be_less_or_equal.pks @@ -0,0 +1,97 @@ +create or replace package test_be_less_or_equal is + + --%suite((not)to_be_less_or_equal) + --%suitepath(utplsql.core.expectations.binary) + + --%aftereach + procedure cleanup_expectations; + + --%test(Gives failure when actual date is greater than expected) + procedure actual_date_greater; + + --%test(Gives failure when actual number is greater than expected) + procedure actual_number_greater; + + --%test(Gives failure when actual interval year to month is greater than expected) + procedure actual_interval_ym_greater; + + --%test(Gives failure when actual interval day to second is greater than expected) + procedure actual_interval_ds_greater; + + --%test(Gives failure when actual timestamp is greater than expected) + procedure actual_timestamp_greater; + + --%test(Gives failure when actual timestamp with time zone is greater than expected) + procedure actual_timestamp_tz_greater; + + --%test(Gives failure when actual timestamp with local time zone is greater than expected) + procedure actual_timestamp_ltz_greater; + + --%test(Gives success when actual date is equal expected) + procedure actual_date_equal; + + --%test(Gives success when actual number is equal expected) + procedure actual_number_equal; + + --%test(Gives success when actual interval year to month is equal expected) + procedure actual_interval_ym_equal; + + --%test(Gives success when actual interval day to second is equal expected) + procedure actual_interval_ds_equal; + + --%test(Gives success when actual timestamp is equal expected) + procedure actual_timestamp_equal; + + --%test(Gives success when actual timestamp with time zone is equal expected) + procedure actual_timestamp_tz_equal; + + --%test(Gives success when actual timestamp with local time zone is equal expected) + procedure actual_timestamp_ltz_equal; + + --%test(Gives success when actual date is less than expected) + procedure actual_date_less; + + --%test(Gives success when actual number is less than expected) + procedure actual_number_less; + + --%test(Gives success when actual interval year to month is less than expected) + procedure actual_interval_ym_less; + + --%test(Gives success when actual interval day to second is less than expected) + procedure actual_interval_ds_less; + + --%test(Gives success when actual timestamp is less than expected) + procedure actual_timestamp_less; + + --%test(Gives success when actual timestamp with time zone is less than expected) + procedure actual_timestamp_tz_less; + + --%test(Gives success when actual timestamp with local time zone is less than expected) + procedure actual_timestamp_ltz_less; + + --%test(Negated - Gives success when actual date is greater than expected) + procedure not_actual_date_greater; + + --%test(Negated - Gives success when actual number is greater than expected) + procedure not_actual_number_greater; + + --%test(Negated - Gives success when actual interval year to month is greater than expected) + procedure not_actual_interval_ym_greater; + + --%test(Negated - Gives success when actual interval day to second is greater than expected) + procedure not_actual_interval_ds_greater; + + --%test(Negated - Gives success when actual timestamp is greater than expected) + procedure not_actual_timestamp_greater; + + --%test(Negated - Gives success when actual timestamp with time zone is greater than expected) + procedure not_actual_timestamp_tz_gretr; + + --%test(Negated - Gives success when actual timestamp with local time zone is greater than expected) + procedure not_actual_timestamp_ltz_gretr; + + --%test(Gives failure when running against CLOB) + procedure actual_clob; + +end; +/ diff --git a/test/ut3_user/expectations/binary/test_equal.pkb b/test/ut3_user/expectations/binary/test_equal.pkb index 8b369d0e7..95fd594c7 100644 --- a/test/ut3_user/expectations/binary/test_equal.pkb +++ b/test/ut3_user/expectations/binary/test_equal.pkb @@ -40,7 +40,7 @@ create or replace package body test_equal is begin execute immediate to_equal_block( 'to_equal', a_actual_type, a_expected_type, a_actual, a_expected, a_nulls_equal ); - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); cleanup_expectations; end; @@ -65,7 +65,7 @@ create or replace package body test_equal is begin execute immediate to_equal_block( 'to_equal', a_actual_type, a_expected_type, a_actual, a_expected, a_nulls_equal ); - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); cleanup_expectations; end; @@ -79,7 +79,7 @@ create or replace package body test_equal is begin execute immediate to_equal_block( 'not_to_equal', a_actual_type, a_expected_type, a_actual, a_expected, a_nulls_equal ); - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); cleanup_expectations; end; diff --git a/test/ut3_user/expectations/binary/test_expect_to_be_less_than.pkb b/test/ut3_user/expectations/binary/test_expect_to_be_less_than.pkb index 4212e4822..d7bf5533b 100644 --- a/test/ut3_user/expectations/binary/test_expect_to_be_less_than.pkb +++ b/test/ut3_user/expectations/binary/test_expect_to_be_less_than.pkb @@ -32,7 +32,7 @@ create or replace package body test_expect_to_be_less_than is --Act execute immediate to_be_less_than_block('date', 'sysdate', 'sysdate-1'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; procedure actual_number_greater is @@ -40,7 +40,7 @@ create or replace package body test_expect_to_be_less_than is --Act execute immediate to_be_less_than_block('number', '2.0', '1.99'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; procedure actual_interval_ym_greater is @@ -48,7 +48,7 @@ create or replace package body test_expect_to_be_less_than is --Act execute immediate to_be_less_than_block('interval year to month', '''2-1''', '''2-0'''); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; procedure actual_interval_ds_greater is @@ -56,7 +56,7 @@ create or replace package body test_expect_to_be_less_than is --Act execute immediate to_be_less_than_block('interval day to second', '''2 01:00:00''', '''2 00:59:59'''); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; procedure actual_timestamp_greater is @@ -64,7 +64,7 @@ create or replace package body test_expect_to_be_less_than is --Act execute immediate to_be_less_than_block('timestamp', 'to_timestamp(''1997 13'',''YYYY FF'')', 'to_timestamp(''1997 12'',''YYYY FF'')'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; procedure actual_timestamp_tz_greater is @@ -72,7 +72,7 @@ create or replace package body test_expect_to_be_less_than is --Act execute immediate to_be_less_than_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; procedure actual_timestamp_ltz_greater is @@ -80,7 +80,7 @@ create or replace package body test_expect_to_be_less_than is --Act execute immediate to_be_less_than_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; procedure actual_date_equal is @@ -88,7 +88,7 @@ create or replace package body test_expect_to_be_less_than is --Act execute immediate to_be_less_than_block('date', 'sysdate', 'sysdate'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; procedure actual_number_equal is @@ -96,7 +96,7 @@ create or replace package body test_expect_to_be_less_than is --Act execute immediate to_be_less_than_block('number', '2.0', '2.00'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; procedure actual_interval_ym_equal is @@ -104,7 +104,7 @@ create or replace package body test_expect_to_be_less_than is --Act execute immediate to_be_less_than_block('interval year to month', '''2-1''', '''2-1'''); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; procedure actual_interval_ds_equal is @@ -112,7 +112,7 @@ create or replace package body test_expect_to_be_less_than is --Act execute immediate to_be_less_than_block('interval day to second', '''2 01:00:00''', '''2 01:00:00'''); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; procedure actual_timestamp_equal is @@ -120,7 +120,7 @@ create or replace package body test_expect_to_be_less_than is --Act execute immediate to_be_less_than_block('timestamp', 'to_timestamp(''1997 13'',''YYYY FF'')', 'to_timestamp(''1997 13'',''YYYY FF'')'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; procedure actual_timestamp_tz_equal is @@ -128,7 +128,7 @@ create or replace package body test_expect_to_be_less_than is --Act execute immediate to_be_less_than_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; procedure actual_timestamp_ltz_equal is @@ -136,7 +136,7 @@ create or replace package body test_expect_to_be_less_than is --Act execute immediate to_be_less_than_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; procedure actual_date_less is @@ -144,7 +144,7 @@ create or replace package body test_expect_to_be_less_than is --Act execute immediate to_be_less_than_block('date', 'sysdate-1', 'sysdate'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure actual_number_less is @@ -152,7 +152,7 @@ create or replace package body test_expect_to_be_less_than is --Act execute immediate to_be_less_than_block('number', '1.0', '1.01'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure actual_interval_ym_less is @@ -160,7 +160,7 @@ create or replace package body test_expect_to_be_less_than is --Act execute immediate to_be_less_than_block('interval year to month', '''2-1''', '''2-2'''); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure actual_interval_ds_less is @@ -168,7 +168,7 @@ create or replace package body test_expect_to_be_less_than is --Act execute immediate to_be_less_than_block('interval day to second', '''2 00:59:58''', '''2 00:59:59'''); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure actual_timestamp_less is @@ -176,7 +176,7 @@ create or replace package body test_expect_to_be_less_than is --Act execute immediate to_be_less_than_block('timestamp', 'to_timestamp(''1997 12'',''YYYY FF'')', 'to_timestamp(''1997 13'',''YYYY FF'')'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure actual_timestamp_tz_less is @@ -184,7 +184,7 @@ create or replace package body test_expect_to_be_less_than is --Act execute immediate to_be_less_than_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +03:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure actual_timestamp_ltz_less is @@ -192,7 +192,7 @@ create or replace package body test_expect_to_be_less_than is --Act execute immediate to_be_less_than_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +03:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure not_actual_date_greater is @@ -200,7 +200,7 @@ create or replace package body test_expect_to_be_less_than is --Act execute immediate not_to_be_less_than_block('date', 'sysdate', 'sysdate-1'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure not_actual_number_greater is @@ -208,7 +208,7 @@ create or replace package body test_expect_to_be_less_than is --Act execute immediate not_to_be_less_than_block('number', '2.0', '1.99'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure not_actual_interval_ym_greater is @@ -216,7 +216,7 @@ create or replace package body test_expect_to_be_less_than is --Act execute immediate not_to_be_less_than_block('interval year to month', '''2-1''', '''2-0'''); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure not_actual_interval_ds_greater is @@ -224,7 +224,7 @@ create or replace package body test_expect_to_be_less_than is --Act execute immediate not_to_be_less_than_block('interval day to second', '''2 01:00:00''', '''2 00:59:59'''); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure not_actual_timestamp_greater is @@ -232,7 +232,7 @@ create or replace package body test_expect_to_be_less_than is --Act execute immediate not_to_be_less_than_block('timestamp', 'to_timestamp(''1997 13'',''YYYY FF'')', 'to_timestamp(''1997 12'',''YYYY FF'')'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure not_actual_timestamp_tz_gretr is @@ -240,7 +240,7 @@ create or replace package body test_expect_to_be_less_than is --Act execute immediate not_to_be_less_than_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure not_actual_timestamp_ltz_gretr is @@ -248,7 +248,7 @@ create or replace package body test_expect_to_be_less_than is --Act execute immediate not_to_be_less_than_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure actual_clob is @@ -256,7 +256,7 @@ create or replace package body test_expect_to_be_less_than is --Act ut3.ut.expect(to_clob('3')).to_( ut3.be_less_than(4) ); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; end; diff --git a/test/ut3_user/expectations/test_expectation_anydata.pkb b/test/ut3_user/expectations/test_expectation_anydata.pkb index 21445cb3b..edab706c0 100644 --- a/test/ut3_user/expectations/test_expectation_anydata.pkb +++ b/test/ut3_user/expectations/test_expectation_anydata.pkb @@ -55,7 +55,7 @@ create or replace package body test_expectation_anydata is --Act ut3.ut.expect( g_test_actual ).not_to_equal( g_test_expected ); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure fail_on_one_object_null is @@ -183,7 +183,7 @@ create or replace package body test_expectation_anydata is --Act ut3.ut.expect( l_null_anydata ).to_equal( l_null_anydata ); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure success_on_both_object_null is @@ -194,7 +194,7 @@ create or replace package body test_expectation_anydata is --Act ut3.ut.expect( l_anydata ).to_equal( l_anydata ); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure success_on_both_coll_null is @@ -205,7 +205,7 @@ create or replace package body test_expectation_anydata is --Act ut3.ut.expect( l_anydata ).to_equal( l_anydata ); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure success_on_same_coll_data is @@ -216,7 +216,7 @@ create or replace package body test_expectation_anydata is --Act ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure fail_on_coll_different_order is @@ -231,7 +231,7 @@ create or replace package body test_expectation_anydata is --Act ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; procedure success_on_same_object_data is @@ -242,7 +242,7 @@ create or replace package body test_expectation_anydata is --Act ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure exclude_attributes_as_list is @@ -255,7 +255,7 @@ create or replace package body test_expectation_anydata is --Act ut3.ut.expect( g_test_actual ).to_equal( g_test_expected, a_exclude=> l_list ); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure exclude_attributes_as_csv is @@ -268,7 +268,7 @@ create or replace package body test_expectation_anydata is --Act ut3.ut.expect( g_test_actual ).to_equal( g_test_expected, a_exclude=> l_list ); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure exclude_attributes_xpath is @@ -281,7 +281,7 @@ create or replace package body test_expectation_anydata is --Act ut3.ut.expect( g_test_actual ).to_equal( g_test_expected, a_exclude=> l_xpath ); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure exclude_ignores_invalid_attrib is @@ -294,7 +294,7 @@ create or replace package body test_expectation_anydata is --Act ut3.ut.expect( g_test_actual ).to_equal( g_test_expected, a_exclude=> l_exclude ); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure include_attributes_as_list is @@ -307,7 +307,7 @@ create or replace package body test_expectation_anydata is --Act ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ).include( l_list ); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure include_attributes_as_csv is @@ -320,7 +320,7 @@ create or replace package body test_expectation_anydata is --Act ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ).include( l_xpath ); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure include_attributes_xpath is @@ -333,7 +333,7 @@ create or replace package body test_expectation_anydata is --Act ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ).include( l_xpath ); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure include_ignores_invalid_attrib is @@ -346,7 +346,7 @@ create or replace package body test_expectation_anydata is --Act ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ).include( l_include ); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure include_exclude_attributes_csv is @@ -361,7 +361,7 @@ create or replace package body test_expectation_anydata is --Act ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ).exclude( l_exclude ).include( l_include ); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure include_exclude_attrib_list is @@ -378,7 +378,7 @@ create or replace package body test_expectation_anydata is --Act ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ).exclude( l_exclude ).include( l_include ); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure reports_diff_attribute is @@ -559,7 +559,7 @@ Rows: [ 60 differences, showing first 20 ] --Act ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).include( l_list ); - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure collection_exclude_list is @@ -578,7 +578,7 @@ Rows: [ 60 differences, showing first 20 ] --Act ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).exclude( l_list ); - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure collection_include_list_fail is @@ -615,7 +615,7 @@ Rows: [ 60 differences, showing first 20 ] g_test_actual := anydata.convertCollection( ut3_tester_helper.t_tab_varchar('A') ); --Act ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure array_diff_data is @@ -641,7 +641,7 @@ Rows: [ 60 differences, showing first 20 ] l_is_null ut3_tester_helper.t_tab_varchar ; begin ut3.ut.expect( anydata.convertCollection( l_is_null ) ).to_be_null; - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure array_null_equal_array_null is @@ -649,7 +649,7 @@ Rows: [ 60 differences, showing first 20 ] l_is_null_bis ut3_tester_helper.t_tab_varchar ; begin ut3.ut.expect( anydata.convertCollection( l_is_null ) ).to_equal(anydata.convertCollection( l_is_null_bis )); - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure array_null_equal_array_notnull is @@ -674,7 +674,7 @@ Rows: [ 60 differences, showing first 20 ] procedure empty_array_have_zero_elem is begin ut3.ut.expect( anydata.convertCollection(ut3_tester_helper.t_tab_varchar())).to_have_count(0); - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure array_empty_equal_array_empty is @@ -684,7 +684,7 @@ Rows: [ 60 differences, showing first 20 ] g_test_actual := anydata.convertCollection(ut3_tester_helper.t_tab_varchar()); --Act ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure arr_empty_equal_arr_notempty is @@ -714,7 +714,7 @@ Rows: [ 60 differences, showing first 20 ] --Act ut3.ut.expect( g_test_actual ).to_be_null; --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure collection_is_empty is @@ -724,7 +724,7 @@ Rows: [ 60 differences, showing first 20 ] --Act ut3.ut.expect( g_test_actual ).to_have_count(0); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -735,7 +735,7 @@ Rows: [ 60 differences, showing first 20 ] g_test_actual := anydata.convertCollection( ut3_tester_helper.t_varray(1) ); --Act ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure varray_diff_data is @@ -761,7 +761,7 @@ Rows: [ 60 differences, showing first 20 ] l_is_null ut3_tester_helper.t_varray ; begin ut3.ut.expect( anydata.convertCollection( l_is_null ) ).to_be_null; - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure varray_null_equal_varray_null is @@ -769,7 +769,7 @@ Rows: [ 60 differences, showing first 20 ] l_is_null_bis ut3_tester_helper.t_varray ; begin ut3.ut.expect( anydata.convertCollection( l_is_null ) ).to_equal(anydata.convertCollection( l_is_null_bis )); - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure varr_null_equal_varr_notnull is @@ -794,7 +794,7 @@ Rows: [ 60 differences, showing first 20 ] procedure empty_varray_have_zero_elem is begin ut3.ut.expect( anydata.convertCollection(ut3_tester_helper.t_varray())).to_have_count(0); - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure varr_empty_equal_varr_empty is @@ -804,7 +804,7 @@ Rows: [ 60 differences, showing first 20 ] g_test_actual := anydata.convertCollection(ut3_tester_helper.t_varray()); --Act ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure varr_empty_equal_varr_notempty is @@ -842,7 +842,7 @@ Rows: [ 60 differences, showing first 20 ] order by rownum desc; --Act ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).join_by('TEST_DUMMY_OBJECT/ID'); - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure collection_join_by_fail is @@ -889,7 +889,7 @@ Rows: [ 60 differences, showing first 20 ] order by rownum desc; --Act ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).unordered; - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure collection_unordered_fail is @@ -929,7 +929,7 @@ Rows: [ 60 differences, showing first 20 ] --Act ut3.ut.expect(g_test_actual).to_equal(g_test_expected).join_by('TEST_DUMMY_OBJECT/ID'); - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure object_unordered is @@ -939,7 +939,7 @@ Rows: [ 60 differences, showing first 20 ] --Act ut3.ut.expect(g_test_actual).to_equal(g_test_expected).unordered; - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure collection_to_contain is @@ -956,7 +956,7 @@ Rows: [ 60 differences, showing first 20 ] order by rownum desc; --Act ut3.ut.expect(anydata.convertCollection(l_actual)).to_contain(anydata.convertCollection(l_expected)); - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure object_to_contain is @@ -967,7 +967,7 @@ Rows: [ 60 differences, showing first 20 ] --Act ut3.ut.expect(g_test_actual).to_contain(g_test_expected); - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; end; diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index 5bae87df6..a83fb0ae9 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -50,7 +50,7 @@ create or replace package body test_expectations_cursor is --Act - execute the expectation on cursor opened on GTT ut3.ut.expect( l_actual ).to_equal( l_expected ); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); --Cleanup rollback; end; @@ -78,7 +78,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_equal( l_expected ); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); ut3.ut.reset_nls; end; @@ -93,7 +93,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_equal( l_expected ); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure success_on_both_null @@ -104,7 +104,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_equal( l_expected ); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure success_to_be_null @@ -114,7 +114,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_be_null(); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure success_not_to_be_not_null @@ -124,7 +124,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).not_to_be_not_null(); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure success_not_to_be_null @@ -136,7 +136,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_be_not_null(); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure success_to_be_not_null @@ -148,7 +148,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_be_not_null(); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure success_is_empty @@ -160,7 +160,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_be_empty(); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure success_is_not_empty @@ -172,7 +172,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).not_to_be_empty(); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure failure_is_null @@ -184,7 +184,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_be_null(); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; procedure failure_is_not_null @@ -194,7 +194,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).not_to_be_null(); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; procedure failure_is_empty @@ -206,7 +206,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_be_empty(); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; procedure failure_is_not_empty @@ -218,7 +218,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).not_to_be_empty(); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; procedure fail_null_vs_empty @@ -231,7 +231,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).not_to_equal( l_expected ); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure fail_on_difference @@ -245,7 +245,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_equal( l_expected ); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; procedure fail_on_expected_missing @@ -259,7 +259,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_equal( l_expected ); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; procedure fail_on_actual_missing @@ -273,7 +273,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_equal( l_expected ); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; procedure fail_on_different_column_name @@ -287,7 +287,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_equal( l_expected ); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -302,7 +302,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_equal( l_expected ); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; procedure pass_on_different_column_order @@ -316,7 +316,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_equal( l_expected ).unordered_columns; --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure pass_on_diff_column_ord_uc @@ -330,7 +330,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_equal( l_expected ).uc; --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure fail_on_multi_diff_col_order @@ -390,7 +390,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_equal( l_expected ); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; procedure include_time_in_date_with_nls @@ -407,7 +407,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_equal( l_expected ); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); ut3.ut.reset_nls; end; @@ -422,7 +422,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect(l_actual).to_equal(l_expected); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure exclude_columns_as_list @@ -436,7 +436,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect(l_actual).to_equal(l_expected, a_exclude=>ut3.ut_varchar2_list('A_COLUMN','Some_Col')); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure exclude_columns_as_csv @@ -450,7 +450,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect(l_actual).to_equal(l_expected, a_exclude=>'A_COLUMN,Some_Col'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure exclude_columns_as_mixed_list is @@ -463,7 +463,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect(l_actual).to_equal(l_expected, a_exclude=>ut3.ut_varchar2_list('A_COLUMN','/ROW/Some_Col')); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure exclude_columns_as_mix_csv_lst is @@ -476,7 +476,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect(l_actual).to_equal(l_expected, a_exclude=>'A_COLUMN,/ROW/Some_Col'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure exclude_columns_xpath_invalid @@ -517,7 +517,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect(l_actual).to_equal(l_expected, a_exclude=>'/ROW/A_COLUMN|/ROW/Some_Col'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure exclude_ignores_invalid_column @@ -531,7 +531,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect(l_actual).to_equal(l_expected, a_exclude=>ut3.ut_varchar2_list('A_COLUMN','non_existing_column')); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure include_columns_as_list @@ -545,7 +545,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect(l_actual).to_equal(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure include_columns_as_csv @@ -559,7 +559,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect(l_actual).to_equal(l_expected).include('RN,//A_Column, SOME_COL'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure include_columns_xpath @@ -573,7 +573,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect(l_actual).to_equal(l_expected).include('/ROW/RN|//A_Column|//SOME_COL'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure include_ignores_invalid_column @@ -587,7 +587,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect(l_actual).to_equal(l_expected).include(ut3.ut_varchar2_list(' RN ',' non_existing_column ')); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure include_exclude_col_csv_xpath @@ -601,7 +601,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect(l_actual).to_equal(l_expected).exclude('Some_Col').include('/ROW/RN|//Some_Col'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure include_exclude_columns_list @@ -615,7 +615,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect(l_actual).to_equal(l_expected).exclude(ut3.ut_varchar2_list('A_COLUMN')).include(ut3.ut_varchar2_list('RN','A_Column','A_COLUMN')); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure data_diff_on_rows_mismatch @@ -746,7 +746,7 @@ Rows: [ all different ] --Act ut3.ut.expect(l_actual).to_equal(l_expected).unordered_columns; - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; --%test(Reports only mismatched columns on column data mismatch) @@ -937,7 +937,7 @@ Rows: [ 4 differences ] --Act ut3.ut.expect(l_expected).to_equal(l_actual); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure closes_cursor_after_use @@ -1014,7 +1014,7 @@ Rows: [ 4 differences ] ut3.ut.expect(l_actual).to_equal(l_expected); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; function get_cursor return sys_refcursor is @@ -1116,7 +1116,7 @@ Rows: [ 4 differences ] --Act ut3.ut.expect(l_actual).to_equal(l_expected); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure cursor_unorderd_compr_success is @@ -1129,7 +1129,7 @@ Rows: [ 4 differences ] --Act ut3.ut.expect(l_actual).to_equal(l_expected).unordered; --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure cursor_unord_compr_success_uc is @@ -1142,7 +1142,7 @@ Rows: [ 4 differences ] --Act ut3.ut.expect(l_actual).to_equal(l_expected).unordered().uc(); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure cursor_unordered_compare_fail is @@ -1184,7 +1184,7 @@ Rows: [ 4 differences ] --Act ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OBJECT_ID').uc(); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure cursor_joinby_compare is @@ -1198,7 +1198,7 @@ Rows: [ 4 differences ] --Act ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OBJECT_ID'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure cursor_joinby_col_not_ord @@ -1237,7 +1237,7 @@ Rows: [ 4 differences ] --Act ut3.ut.expect(l_actual).to_equal(l_expected).join_by(ut3.ut_varchar2_list('OBJECT_ID,OBJECT_NAME')); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure cursor_joinby_compare_nokey is @@ -1388,7 +1388,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OBJECT_ID'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure cursor_unorder_compare_1000 is @@ -1401,7 +1401,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_equal(l_expected).unordered; --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure cursor_joinby_compare_fail is @@ -1493,7 +1493,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_equal(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')).unordered; --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure joinby_incl_cols_as_list @@ -1507,7 +1507,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_equal(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')).join_by('RN'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure joinby_excl_cols_as_list @@ -1521,7 +1521,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_equal(l_expected).exclude(ut3.ut_varchar2_list('//Some_Col','A_COLUMN')).join_by('RN'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure unord_excl_cols_as_list @@ -1535,7 +1535,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_equal(l_expected).exclude(ut3.ut_varchar2_list('A_COLUMN|//Some_Col')).unordered; --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure excl_dif_cols_as_list @@ -1549,7 +1549,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_equal(l_expected).exclude(ut3.ut_varchar2_list('A_COLUMN')); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure inlc_dif_cols_as_list @@ -1563,7 +1563,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_equal(l_expected).include(ut3.ut_varchar2_list('RN')); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure inlc_exc_dif_cols_as_list @@ -1577,7 +1577,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_equal(l_expected).include(ut3.ut_varchar2_list('RN')).exclude(ut3.ut_varchar2_list('A_COLUMN')); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure compare_obj_typ_col_un is @@ -1594,7 +1594,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_equal(l_expected).unordered; --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure compare_obj_typ_col_jb is @@ -1611,7 +1611,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_equal(l_expected).join_by('COLVAL/ID'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure comp_obj_typ_col_un_fail is @@ -1656,7 +1656,7 @@ Rows: [ 5 differences% --Act ut3.ut.expect(l_actual).to_equal(l_expected).join_by('COLVAL/ID'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; procedure comp_obj_typ_col_jb_multi is @@ -1673,7 +1673,7 @@ Rows: [ 5 differences% --Act ut3.ut.expect(l_actual).to_equal(l_expected).join_by(ut3.ut_varchar2_list('RN,COLVAL/ID')); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure comp_obj_typ_col_jb_nokey is @@ -1729,7 +1729,7 @@ Diff:% ut3.ut.expect(l_actual).to_equal(l_expected).join_by('KEY'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure compare_nest_tab_col_jb_fail is @@ -1796,7 +1796,7 @@ Diff:% ut3.ut.expect(l_actual).to_equal(l_expected).join_by(ut3.ut_varchar2_list('KEY,VALUE')); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure compare_nest_tab_cols_jb_fail is @@ -1902,7 +1902,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_equal(l_expected); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -1974,7 +1974,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_equal(l_expected).join_by('NESTED_TABLE'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -2006,7 +2006,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_equal(l_expected).join_by('NESTED_TABLE/OBJECT_OWNER'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -2038,7 +2038,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_equal(l_expected).join_by('NESTED_TABLE/ANNOTATIONS'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -2084,7 +2084,7 @@ Diff:% l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); - --ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_be_greater_than(0); + --ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; procedure compare_rec_coll_as_join is @@ -2173,7 +2173,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_contain(l_expected); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure cursor_to_contain_uc is @@ -2189,7 +2189,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_contain(l_expected).uc(); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure cursor_to_contain_unordered is @@ -2206,7 +2206,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_contain(l_expected).unordered(); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure cursor_to_contain_fail is @@ -2246,7 +2246,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_contain(l_expected).join_by('USERNAME'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure cursor_contain_joinby_fail is @@ -2290,7 +2290,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_contain(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure to_cont_join_incl_cols_as_lst @@ -2304,7 +2304,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_contain(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')).join_by('RN'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure contain_join_excl_cols_as_lst @@ -2318,7 +2318,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_contain(l_expected).exclude(ut3.ut_varchar2_list('//Some_Col','A_COLUMN')).join_by('RN'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure contain_excl_cols_as_list @@ -2332,7 +2332,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_contain(l_expected).exclude(ut3.ut_varchar2_list('A_COLUMN|//Some_Col')); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure cursor_not_to_contain @@ -2349,7 +2349,7 @@ Diff:% --Act ut3.ut.expect(l_actual).not_to_contain(l_expected); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure cursor_not_to_contain_fail is @@ -2393,7 +2393,7 @@ Diff:% --Act ut3.ut.expect(l_actual).not_to_contain(l_expected).join_by('USER_ID'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure not_cont_join_incl_cols_as_lst is @@ -2406,7 +2406,7 @@ Diff:% --Act ut3.ut.expect(l_actual).not_to_contain(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')).join_by('RN'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure not_cont_join_excl_cols_as_lst is @@ -2419,7 +2419,7 @@ Diff:% --Act ut3.ut.expect(l_actual).not_to_contain(l_expected).exclude(ut3.ut_varchar2_list('//Some_Col','A_COLUMN')).join_by('RN'); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure to_contain_duplicates is @@ -2435,7 +2435,7 @@ Diff:% --Act ut3.ut.expect(l_actual).to_contain(l_expected); --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure to_contain_duplicates_fail is diff --git a/test/ut3_user/expectations/test_matchers.pkb b/test/ut3_user/expectations/test_matchers.pkb index c84a623eb..88e25e8b1 100644 --- a/test/ut3_user/expectations/test_matchers.pkb +++ b/test/ut3_user/expectations/test_matchers.pkb @@ -17,9 +17,9 @@ create or replace package body test_matchers is end;'; execute immediate l_statement; if a_result = ut3_tester_helper.main_helper.gc_success then - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n()).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num()).to_equal(0); else - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n()).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num()).to_be_greater_than(0); end if; cleanup_expectations(); end exec_matcher; @@ -37,9 +37,9 @@ create or replace package body test_matchers is end;'; execute immediate l_statement; if a_result = ut3_tester_helper.main_helper.gc_success then - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n()).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num()).to_equal(0); else - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n()).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num()).to_be_greater_than(0); end if; cleanup_expectations(); end exec_be_between; @@ -57,9 +57,9 @@ create or replace package body test_matchers is end;'; execute immediate l_statement; if a_result = ut3_tester_helper.main_helper.gc_success then - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n()).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num()).to_equal(0); else - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n()).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num()).to_be_greater_than(0); end if; cleanup_expectations(); end exec_be_between2; @@ -77,9 +77,9 @@ create or replace package body test_matchers is end;]' using a_pattern, a_escape; if a_result = ut3_tester_helper.main_helper.gc_success then - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n()).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num()).to_equal(0); else - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n()).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num()).to_be_greater_than(0); end if; cleanup_expectations(); end; @@ -98,9 +98,9 @@ create or replace package body test_matchers is end;'; execute immediate l_statement using a_pattern, a_modifiers; if a_result = ut3_tester_helper.main_helper.gc_success then - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n()).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num()).to_equal(0); else - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_n()).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num()).to_be_greater_than(0); end if; cleanup_expectations(); end; From 887e46ab25e2f690a27539fc571ef35cee0a494b Mon Sep 17 00:00:00 2001 From: lwasylow Date: Mon, 25 Mar 2019 07:50:58 +0000 Subject: [PATCH 0350/1096] Fixing test package --- test/ut3_user/expectations/binary/test_be_less_or_equal.pkb | 2 +- test/ut3_user/expectations/binary/test_be_less_or_equal.pks | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/ut3_user/expectations/binary/test_be_less_or_equal.pkb b/test/ut3_user/expectations/binary/test_be_less_or_equal.pkb index 81634f7f5..bf7632cc4 100644 --- a/test/ut3_user/expectations/binary/test_be_less_or_equal.pkb +++ b/test/ut3_user/expectations/binary/test_be_less_or_equal.pkb @@ -256,7 +256,7 @@ create or replace package body test_be_less_or_equal is --Act ut3.ut.expect(to_clob('3')).to_( ut3.be_less_or_equal(3) ); --Assert - ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; end; diff --git a/test/ut3_user/expectations/binary/test_be_less_or_equal.pks b/test/ut3_user/expectations/binary/test_be_less_or_equal.pks index a6ab01664..d6baf037e 100644 --- a/test/ut3_user/expectations/binary/test_be_less_or_equal.pks +++ b/test/ut3_user/expectations/binary/test_be_less_or_equal.pks @@ -1,7 +1,7 @@ create or replace package test_be_less_or_equal is --%suite((not)to_be_less_or_equal) - --%suitepath(utplsql.core.expectations.binary) + --%suitepath(utplsql.test_user.expectations.binary) --%aftereach procedure cleanup_expectations; From 28dbd1e0bcffc560109195394feb22f4f29650f0 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Mon, 25 Mar 2019 11:55:38 +0000 Subject: [PATCH 0351/1096] Added set of tests: expectations/binary/test_be_greater_or_equal expectations/binary/test_be_greater_than expectations/unary/test_expect_not_to_be_null Passing username implicit into ut_test_runner. --- test/install_ut3_user_tests.sql | 6 + test/ut3_user/api/test_ut_runner.pkb | 2 +- .../binary/test_be_greater_or_equal.pkb | 263 +++++++++++++++++ .../binary/test_be_greater_or_equal.pks | 97 +++++++ .../binary/test_be_greater_than.pkb | 263 +++++++++++++++++ .../binary/test_be_greater_than.pks | 97 +++++++ .../unary/test_expect_not_to_be_null.pkb | 265 ++++++++++++++++++ .../unary/test_expect_not_to_be_null.pks | 97 +++++++ 8 files changed, 1089 insertions(+), 1 deletion(-) create mode 100644 test/ut3_user/expectations/binary/test_be_greater_or_equal.pkb create mode 100644 test/ut3_user/expectations/binary/test_be_greater_or_equal.pks create mode 100644 test/ut3_user/expectations/binary/test_be_greater_than.pkb create mode 100644 test/ut3_user/expectations/binary/test_be_greater_than.pks create mode 100644 test/ut3_user/expectations/unary/test_expect_not_to_be_null.pkb create mode 100644 test/ut3_user/expectations/unary/test_expect_not_to_be_null.pks diff --git a/test/install_ut3_user_tests.sql b/test/install_ut3_user_tests.sql index aad875984..09bc29c24 100644 --- a/test/install_ut3_user_tests.sql +++ b/test/install_ut3_user_tests.sql @@ -5,17 +5,23 @@ whenever oserror exit failure rollback alter session set plsql_optimize_level=0; prompt Install user tests +@@ut3_user/expectations/unary/test_expect_not_to_be_null.pks @@ut3_user/expectations/binary/test_equal.pks @@ut3_user/expectations/binary/test_expect_to_be_less_than.pks @@ut3_user/expectations/binary/test_be_less_or_equal.pks +@@ut3_user/expectations/binary/test_be_greater_or_equal.pks +@@ut3_user/expectations/binary/test_be_greater_than.pks @@ut3_user/expectations/test_matchers.pks @@ut3_user/expectations/test_expectation_anydata.pks @@ut3_user/expectations/test_expectations_cursor.pks @@ut3_user/api/test_ut_runner.pks +@@ut3_user/expectations/unary/test_expect_not_to_be_null.pkb @@ut3_user/expectations/binary/test_equal.pkb @@ut3_user/expectations/binary/test_expect_to_be_less_than.pkb @@ut3_user/expectations/binary/test_be_less_or_equal.pkb +@@ut3_user/expectations/binary/test_be_greater_or_equal.pkb +@@ut3_user/expectations/binary/test_be_greater_than.pkb @@ut3_user/expectations/test_matchers.pkb @@ut3_user/expectations/test_expectation_anydata.pkb @@ut3_user/expectations/test_expectations_cursor.pkb diff --git a/test/ut3_user/api/test_ut_runner.pkb b/test/ut3_user/api/test_ut_runner.pkb index 4d59c78e2..0c47248bd 100644 --- a/test/ut3_user/api/test_ut_runner.pkb +++ b/test/ut3_user/api/test_ut_runner.pkb @@ -254,7 +254,7 @@ end;'; 'dummy_test_package.some_dummy_test_procedure' path, 0 disabled_flag from dual; --Act - open l_actual for select * from table(ut3.ut_runner.get_suites_info(NULL,'DUMMY_TEST_PACKAGE')); + open l_actual for select * from table(ut3.ut_runner.get_suites_info('UT3$USER#','DUMMY_TEST_PACKAGE')); --Assert ut.expect(l_actual).to_equal(l_expected); end; diff --git a/test/ut3_user/expectations/binary/test_be_greater_or_equal.pkb b/test/ut3_user/expectations/binary/test_be_greater_or_equal.pkb new file mode 100644 index 000000000..5d99d07b6 --- /dev/null +++ b/test/ut3_user/expectations/binary/test_be_greater_or_equal.pkb @@ -0,0 +1,263 @@ +create or replace package body test_be_greater_or_equal is + + procedure cleanup_expectations is + begin + ut3_tester_helper.main_helper.clear_expectations( ); + end; + + function to_greater_equal_block( + a_data_type varchar2, + a_actual varchar2, + a_expected varchar2 + ) return varchar2 is + begin + return ut3_tester_helper.expectations_helper.binary_expectation_block( + 'to_be_greater_or_equal', a_data_type, a_actual, a_data_type, a_expected + ); + end; + + function not_to_greater_equal_block( + a_data_type varchar2, + a_actual varchar2, + a_expected varchar2 + ) return varchar2 is + begin + return ut3_tester_helper.expectations_helper.binary_expectation_block( + 'not_to_be_greater_or_equal', a_data_type, a_actual, a_data_type, a_expected + ); + end; + + procedure actual_date_greater is + begin + --Act + execute immediate to_greater_equal_block('date', 'sysdate', 'sysdate-1'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_number_greater is + begin + --Act + execute immediate to_greater_equal_block('number', '2.0', '1.99'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_interval_ym_greater is + begin + --Act + execute immediate to_greater_equal_block('interval year to month', '''2-1''', '''2-0'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_interval_ds_greater is + begin + --Act + execute immediate to_greater_equal_block('interval day to second', '''2 01:00:00''', '''2 00:59:59'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_timestamp_greater is + begin + --Act + execute immediate to_greater_equal_block('timestamp', 'to_timestamp(''1997 13'',''YYYY FF'')', 'to_timestamp(''1997 12'',''YYYY FF'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_timestamp_tz_greater is + begin + --Act + execute immediate to_greater_equal_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_timestamp_ltz_greater is + begin + --Act + execute immediate to_greater_equal_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_date_equal is + begin + --Act + execute immediate to_greater_equal_block('date', 'sysdate', 'sysdate'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_number_equal is + begin + --Act + execute immediate to_greater_equal_block('number', '2.0', '2.00'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_interval_ym_equal is + begin + --Act + execute immediate to_greater_equal_block('interval year to month', '''2-1''', '''2-1'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_interval_ds_equal is + begin + --Act + execute immediate to_greater_equal_block('interval day to second', '''2 01:00:00''', '''2 01:00:00'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_timestamp_equal is + begin + --Act + execute immediate to_greater_equal_block('timestamp', 'to_timestamp(''1997 13'',''YYYY FF'')', 'to_timestamp(''1997 13'',''YYYY FF'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_timestamp_tz_equal is + begin + --Act + execute immediate to_greater_equal_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_timestamp_ltz_equal is + begin + --Act + execute immediate to_greater_equal_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_date_less is + begin + --Act + execute immediate to_greater_equal_block('date', 'sysdate-1', 'sysdate'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure actual_number_less is + begin + --Act + execute immediate to_greater_equal_block('number', '1.0', '1.01'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure actual_interval_ym_less is + begin + --Act + execute immediate to_greater_equal_block('interval year to month', '''2-1''', '''2-2'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure actual_interval_ds_less is + begin + --Act + execute immediate to_greater_equal_block('interval day to second', '''2 00:59:58''', '''2 00:59:59'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure actual_timestamp_less is + begin + --Act + execute immediate to_greater_equal_block('timestamp', 'to_timestamp(''1997 12'',''YYYY FF'')', 'to_timestamp(''1997 13'',''YYYY FF'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure actual_timestamp_tz_less is + begin + --Act + execute immediate to_greater_equal_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +03:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure actual_timestamp_ltz_less is + begin + --Act + execute immediate to_greater_equal_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +03:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure not_actual_date_greater is + begin + --Act + execute immediate not_to_greater_equal_block('date', 'sysdate', 'sysdate-1'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure not_actual_number_greater is + begin + --Act + execute immediate not_to_greater_equal_block('number', '2.0', '1.99'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure not_actual_interval_ym_greater is + begin + --Act + execute immediate not_to_greater_equal_block('interval year to month', '''2-1''', '''2-0'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure not_actual_interval_ds_greater is + begin + --Act + execute immediate not_to_greater_equal_block('interval day to second', '''2 01:00:00''', '''2 00:59:59'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure not_actual_timestamp_greater is + begin + --Act + execute immediate not_to_greater_equal_block('timestamp', 'to_timestamp(''1997 13'',''YYYY FF'')', 'to_timestamp(''1997 12'',''YYYY FF'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure not_actual_timestamp_tz_gretr is + begin + --Act + execute immediate not_to_greater_equal_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure not_actual_timestamp_ltz_gretr is + begin + --Act + execute immediate not_to_greater_equal_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure actual_clob is + begin + --Act + ut3.ut.expect(to_clob('3')).to_( ut3.be_greater_or_equal(3) ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + +end; +/ diff --git a/test/ut3_user/expectations/binary/test_be_greater_or_equal.pks b/test/ut3_user/expectations/binary/test_be_greater_or_equal.pks new file mode 100644 index 000000000..3f51e8e3f --- /dev/null +++ b/test/ut3_user/expectations/binary/test_be_greater_or_equal.pks @@ -0,0 +1,97 @@ +create or replace package test_be_greater_or_equal is + + --%suite((not)to_be_greater_or_equal) + --%suitepath(utplsql.test_user.expectations.binary) + + --%aftereach + procedure cleanup_expectations; + + --%test(Gives success when actual date is greater than expected) + procedure actual_date_greater; + + --%test(Gives success when actual number is greater than expected) + procedure actual_number_greater; + + --%test(Gives success when actual interval year to month is greater than expected) + procedure actual_interval_ym_greater; + + --%test(Gives success when actual interval day to second is greater than expected) + procedure actual_interval_ds_greater; + + --%test(Gives success when actual timestamp is greater than expected) + procedure actual_timestamp_greater; + + --%test(Gives success when actual timestamp with time zone is greater than expected) + procedure actual_timestamp_tz_greater; + + --%test(Gives success when actual timestamp with local time zone is greater than expected) + procedure actual_timestamp_ltz_greater; + + --%test(Gives success when actual date is equal expected) + procedure actual_date_equal; + + --%test(Gives success when actual number is equal expected) + procedure actual_number_equal; + + --%test(Gives success when actual interval year to month is equal expected) + procedure actual_interval_ym_equal; + + --%test(Gives success when actual interval day to second is equal expected) + procedure actual_interval_ds_equal; + + --%test(Gives success when actual timestamp is equal expected) + procedure actual_timestamp_equal; + + --%test(Gives success when actual timestamp with time zone is equal expected) + procedure actual_timestamp_tz_equal; + + --%test(Gives success when actual timestamp with local time zone is equal expected) + procedure actual_timestamp_ltz_equal; + + --%test(Gives failure when actual date is less than expected) + procedure actual_date_less; + + --%test(Gives failure when actual number is less than expected) + procedure actual_number_less; + + --%test(Gives failure when actual interval year to month is less than expected) + procedure actual_interval_ym_less; + + --%test(Gives failure when actual interval day to second is less than expected) + procedure actual_interval_ds_less; + + --%test(Gives failure when actual timestamp is less than expected) + procedure actual_timestamp_less; + + --%test(Gives failure when actual timestamp with time zone is less than expected) + procedure actual_timestamp_tz_less; + + --%test(Gives failure when actual timestamp with local time zone is less than expected) + procedure actual_timestamp_ltz_less; + + --%test(Negated - Gives failure when actual date is greater than expected) + procedure not_actual_date_greater; + + --%test(Negated - Gives failure when actual number is greater than expected) + procedure not_actual_number_greater; + + --%test(Negated - Gives failure when actual interval year to month is greater than expected) + procedure not_actual_interval_ym_greater; + + --%test(Negated - Gives failure when actual interval day to second is greater than expected) + procedure not_actual_interval_ds_greater; + + --%test(Negated - Gives failure when actual timestamp is greater than expected) + procedure not_actual_timestamp_greater; + + --%test(Negated - Gives failure when actual timestamp with time zone is greater than expected) + procedure not_actual_timestamp_tz_gretr; + + --%test(Negated - Gives failure when actual timestamp with local time zone is greater than expected) + procedure not_actual_timestamp_ltz_gretr; + + --%test(Gives failure when running against CLOB) + procedure actual_clob; + +end; +/ diff --git a/test/ut3_user/expectations/binary/test_be_greater_than.pkb b/test/ut3_user/expectations/binary/test_be_greater_than.pkb new file mode 100644 index 000000000..37e15f633 --- /dev/null +++ b/test/ut3_user/expectations/binary/test_be_greater_than.pkb @@ -0,0 +1,263 @@ +create or replace package body test_be_greater_than is + + procedure cleanup_expectations is + begin + ut3_tester_helper.main_helper.clear_expectations( ); + end; + + function to_greater_than_block( + a_data_type varchar2, + a_actual varchar2, + a_expected varchar2 + ) return varchar2 is + begin + return ut3_tester_helper.expectations_helper.binary_expectation_block( + 'to_be_greater_than', a_data_type, a_actual, a_data_type, a_expected + ); + end; + + function not_to_greater_than_block( + a_data_type varchar2, + a_actual varchar2, + a_expected varchar2 + ) return varchar2 is + begin + return ut3_tester_helper.expectations_helper.binary_expectation_block( + 'not_to_be_greater_than', a_data_type, a_actual, a_data_type, a_expected + ); + end; + + procedure actual_date_greater is + begin + --Act + execute immediate to_greater_than_block('date', 'sysdate', 'sysdate-1'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_number_greater is + begin + --Act + execute immediate to_greater_than_block('number', '2.0', '1.99'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_interval_ym_greater is + begin + --Act + execute immediate to_greater_than_block('interval year to month', '''2-1''', '''2-0'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_interval_ds_greater is + begin + --Act + execute immediate to_greater_than_block('interval day to second', '''2 01:00:00''', '''2 00:59:59'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_timestamp_greater is + begin + --Act + execute immediate to_greater_than_block('timestamp', 'to_timestamp(''1997 13'',''YYYY FF'')', 'to_timestamp(''1997 12'',''YYYY FF'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_timestamp_tz_greater is + begin + --Act + execute immediate to_greater_than_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_timestamp_ltz_greater is + begin + --Act + execute immediate to_greater_than_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure actual_date_equal is + begin + --Act + execute immediate to_greater_than_block('date', 'sysdate', 'sysdate'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure actual_number_equal is + begin + --Act + execute immediate to_greater_than_block('number', '2.0', '2.00'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure actual_interval_ym_equal is + begin + --Act + execute immediate to_greater_than_block('interval year to month', '''2-1''', '''2-1'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure actual_interval_ds_equal is + begin + --Act + execute immediate to_greater_than_block('interval day to second', '''2 01:00:00''', '''2 01:00:00'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure actual_timestamp_equal is + begin + --Act + execute immediate to_greater_than_block('timestamp', 'to_timestamp(''1997 13'',''YYYY FF'')', 'to_timestamp(''1997 13'',''YYYY FF'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure actual_timestamp_tz_equal is + begin + --Act + execute immediate to_greater_than_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure actual_timestamp_ltz_equal is + begin + --Act + execute immediate to_greater_than_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure actual_date_less is + begin + --Act + execute immediate to_greater_than_block('date', 'sysdate-1', 'sysdate'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure actual_number_less is + begin + --Act + execute immediate to_greater_than_block('number', '1.0', '1.01'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure actual_interval_ym_less is + begin + --Act + execute immediate to_greater_than_block('interval year to month', '''2-1''', '''2-2'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure actual_interval_ds_less is + begin + --Act + execute immediate to_greater_than_block('interval day to second', '''2 00:59:58''', '''2 00:59:59'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure actual_timestamp_less is + begin + --Act + execute immediate to_greater_than_block('timestamp', 'to_timestamp(''1997 12'',''YYYY FF'')', 'to_timestamp(''1997 13'',''YYYY FF'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure actual_timestamp_tz_less is + begin + --Act + execute immediate to_greater_than_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +03:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure actual_timestamp_ltz_less is + begin + --Act + execute immediate to_greater_than_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +03:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure not_actual_date_greater is + begin + --Act + execute immediate not_to_greater_than_block('date', 'sysdate', 'sysdate-1'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure not_actual_number_greater is + begin + --Act + execute immediate not_to_greater_than_block('number', '2.0', '1.99'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure not_actual_interval_ym_greater is + begin + --Act + execute immediate not_to_greater_than_block('interval year to month', '''2-1''', '''2-0'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure not_actual_interval_ds_greater is + begin + --Act + execute immediate not_to_greater_than_block('interval day to second', '''2 01:00:00''', '''2 00:59:59'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure not_actual_timestamp_greater is + begin + --Act + execute immediate not_to_greater_than_block('timestamp', 'to_timestamp(''1997 13'',''YYYY FF'')', 'to_timestamp(''1997 12'',''YYYY FF'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure not_actual_timestamp_tz_gretr is + begin + --Act + execute immediate not_to_greater_than_block('timestamp with time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure not_actual_timestamp_ltz_gretr is + begin + --Act + execute immediate not_to_greater_than_block('timestamp with local time zone', 'to_timestamp_tz(''1997 12 +01:00'',''YYYY FF TZR'')', 'to_timestamp_tz(''1997 12 +02:00'',''YYYY FF TZR'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure actual_clob is + begin + --Act + ut3.ut.expect(to_clob('3')).to_( ut3.be_greater_than(2) ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + +end; +/ diff --git a/test/ut3_user/expectations/binary/test_be_greater_than.pks b/test/ut3_user/expectations/binary/test_be_greater_than.pks new file mode 100644 index 000000000..fb158dddb --- /dev/null +++ b/test/ut3_user/expectations/binary/test_be_greater_than.pks @@ -0,0 +1,97 @@ +create or replace package test_be_greater_than is + + --%suite((not)to_be_greater_than) + --%suitepath(utplsql.test_user.expectations.binary) + + --%aftereach + procedure cleanup_expectations; + + --%test(Gives success when actual date is greater than expected) + procedure actual_date_greater; + + --%test(Gives success when actual number is greater than expected) + procedure actual_number_greater; + + --%test(Gives success when actual interval year to month is greater than expected) + procedure actual_interval_ym_greater; + + --%test(Gives success when actual interval day to second is greater than expected) + procedure actual_interval_ds_greater; + + --%test(Gives success when actual timestamp is greater than expected) + procedure actual_timestamp_greater; + + --%test(Gives success when actual timestamp with time zone is greater than expected) + procedure actual_timestamp_tz_greater; + + --%test(Gives success when actual timestamp with local time zone is greater than expected) + procedure actual_timestamp_ltz_greater; + + --%test(Gives failure when actual date is equal expected) + procedure actual_date_equal; + + --%test(Gives failure when actual number is equal expected) + procedure actual_number_equal; + + --%test(Gives failure when actual interval year to month is equal expected) + procedure actual_interval_ym_equal; + + --%test(Gives failure when actual interval day to second is equal expected) + procedure actual_interval_ds_equal; + + --%test(Gives failure when actual timestamp is equal expected) + procedure actual_timestamp_equal; + + --%test(Gives failure when actual timestamp with time zone is equal expected) + procedure actual_timestamp_tz_equal; + + --%test(Gives failure when actual timestamp with local time zone is equal expected) + procedure actual_timestamp_ltz_equal; + + --%test(Gives failure when actual date is less than expected) + procedure actual_date_less; + + --%test(Gives failure when actual number is less than expected) + procedure actual_number_less; + + --%test(Gives failure when actual interval year to month is less than expected) + procedure actual_interval_ym_less; + + --%test(Gives failure when actual interval day to second is less than expected) + procedure actual_interval_ds_less; + + --%test(Gives failure when actual timestamp is less than expected) + procedure actual_timestamp_less; + + --%test(Gives failure when actual timestamp with time zone is less than expected) + procedure actual_timestamp_tz_less; + + --%test(Gives failure when actual timestamp with local time zone is less than expected) + procedure actual_timestamp_ltz_less; + + --%test(Negated - Gives failure when actual date is greater than expected) + procedure not_actual_date_greater; + + --%test(Negated - Gives failure when actual number is greater than expected) + procedure not_actual_number_greater; + + --%test(Negated - Gives failure when actual interval year to month is greater than expected) + procedure not_actual_interval_ym_greater; + + --%test(Negated - Gives failure when actual interval day to second is greater than expected) + procedure not_actual_interval_ds_greater; + + --%test(Negated - Gives failure when actual timestamp is greater than expected) + procedure not_actual_timestamp_greater; + + --%test(Negated - Gives failure when actual timestamp with time zone is greater than expected) + procedure not_actual_timestamp_tz_gretr; + + --%test(Negated - Gives failure when actual timestamp with local time zone is greater than expected) + procedure not_actual_timestamp_ltz_gretr; + + --%test(Gives failure when running against CLOB) + procedure actual_clob; + +end; +/ diff --git a/test/ut3_user/expectations/unary/test_expect_not_to_be_null.pkb b/test/ut3_user/expectations/unary/test_expect_not_to_be_null.pkb new file mode 100644 index 000000000..448addb8c --- /dev/null +++ b/test/ut3_user/expectations/unary/test_expect_not_to_be_null.pkb @@ -0,0 +1,265 @@ +create or replace package body test_expect_not_to_be_null +is + gc_object_name constant varchar2(30) := 't_not_to_be_null_test'; + gc_nested_table_name constant varchar2(30) := 'tt_not_to_be_null_test'; + gc_varray_name constant varchar2(30) := 'tv_not_to_be_null_test'; + + procedure cleanup_expectations is + begin + ut3_tester_helper.main_helper.clear_expectations( ); + end; + + procedure create_types is + pragma autonomous_transaction; + begin + execute immediate 'create type ' || gc_object_name || ' is object (dummy number)'; + execute immediate 'create type ' || gc_nested_table_name || ' is table of number'; + execute immediate 'create type ' || gc_varray_name || ' is varray(1) of number'; + end; + + procedure drop_types is + pragma autonomous_transaction; + begin + execute immediate 'drop type ' || gc_object_name; + execute immediate 'drop type ' || gc_nested_table_name; + execute immediate 'drop type ' || gc_varray_name; + end; + + procedure blob_not_null is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'not_to_be_null', 'blob', 'to_blob(''abc'')' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure blob_0_length is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'not_to_be_null', 'blob', 'empty_blob()' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure boolean_not_null is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'not_to_be_null', 'boolean', 'true' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure clob_not_null is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'not_to_be_null', 'clob', 'to_clob(''abc'')' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + + procedure clob_0_length is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'not_to_be_null', 'clob', 'empty_clob()' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure date_not_null is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'not_to_be_null', 'date', 'sysdate' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure number_not_null is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'not_to_be_null', 'number', '1234' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure timestamp_not_null is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'not_to_be_null', 'timestamp', 'systimestamp' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure timestamp_with_ltz_not_null is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( + 'not_to_be_null', 'timestamp with local time zone', 'systimestamp' + ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure timestamp_with_tz_not_null is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'not_to_be_null', 'timestamp with time zone', + 'systimestamp' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure varchar2_not_null is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'not_to_be_null', 'varchar2(4000)', '''abc''' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure initialized_object is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_object_block( + 'not_to_be_null', gc_object_name, gc_object_name || '(1)', 'object' + ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure initialized_nested_table is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_object_block( + 'not_to_be_null', gc_nested_table_name, gc_nested_table_name || '()', 'collection' + ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure initialized_varray is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_object_block( + 'not_to_be_null', gc_varray_name, gc_varray_name || '()', 'collection' + ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure null_blob is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'not_to_be_null', 'blob', 'null' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure null_boolean is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'not_to_be_null', 'boolean', 'null' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure null_clob is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'not_to_be_null', 'clob', 'null' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure null_date is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'not_to_be_null', 'date', 'null' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure null_number is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'not_to_be_null', 'number', 'null' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure null_timestamp is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'not_to_be_null', 'timestamp', 'null' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure null_timestamp_with_ltz is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( + 'not_to_be_null', 'timestamp with local time zone', 'null' + ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure null_timestamp_with_tz is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( + 'not_to_be_null', 'timestamp with time zone', 'null' + ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure null_varchar2 is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'not_to_be_null', 'varchar2(4000)', 'null' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure null_anydata is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'not_to_be_null', 'anydata', 'null' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure uninit_object_in_anydata is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_object_block( + 'not_to_be_null', gc_object_name, 'null', 'object' + ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure uninit_nested_table_in_anydata is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_object_block( + 'not_to_be_null', gc_nested_table_name, 'null', 'collection' + ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure uninit_varray_in_anydata is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_object_block( + 'not_to_be_null', gc_varray_name, 'null', 'collection' + ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + +end test_expect_not_to_be_null; +/ diff --git a/test/ut3_user/expectations/unary/test_expect_not_to_be_null.pks b/test/ut3_user/expectations/unary/test_expect_not_to_be_null.pks new file mode 100644 index 000000000..11648d5d2 --- /dev/null +++ b/test/ut3_user/expectations/unary/test_expect_not_to_be_null.pks @@ -0,0 +1,97 @@ +create or replace package test_expect_not_to_be_null +is + --%suite(not_to_be_null) + --%suitepath(utplsql.test_user.expectations.unary) + + --%aftereach + procedure cleanup_expectations; + + --%beforeall + procedure create_types; + + --%afterall + procedure drop_types; + + --%test(Gives success for not null blob) + procedure blob_not_null; + + --%test(Gives success for blob with length 0) + procedure blob_0_length; + + --%test(Gives success for not null boolean) + procedure boolean_not_null; + + --%test(Gives success for not null clob) + procedure clob_not_null; + + --%test(Gives success for clob with length 0) + procedure clob_0_length; + + --%test(Gives success for not null date) + procedure date_not_null; + + --%test(Gives success for not null number) + procedure number_not_null; + + --%test(Gives success for not null timestamp) + procedure timestamp_not_null; + + --%test(Gives success for not null timestamp with local time zone) + procedure timestamp_with_ltz_not_null; + + --%test(Gives success for not null timestamp with time zone) + procedure timestamp_with_tz_not_null; + + --%test(Gives success for not null varchar2) + procedure varchar2_not_null; + + --%test(Gives success for initialized object within anydata) + procedure initialized_object; + + --%test(Gives success for initialized nested table within anydata) + procedure initialized_nested_table; + + --%test(Gives success for initialized varray within anydata) + procedure initialized_varray; + + --%test(Gives failure with null blob) + procedure null_blob; + + --%test(Gives failure with null boolean) + procedure null_boolean; + + --%test(Gives failure with null clob) + procedure null_clob; + + --%test(Gives failure with null date) + procedure null_date; + + --%test(Gives failure with null number) + procedure null_number; + + --%test(Gives failure null timestamp) + procedure null_timestamp; + + --%test(Gives failure with null timestamp with local time zone) + procedure null_timestamp_with_ltz; + + --%test(Gives failure with null timestamp with time zone) + procedure null_timestamp_with_tz; + + --%test(Gives failure with null varchar2) + procedure null_varchar2; + + --%test(Gives failure with null anydata) + procedure null_anydata; + + --%test(Gives failure with uninitialized object within anydata) + procedure uninit_object_in_anydata; + + --%test(Gives failure with uninitialized nested table within anydata) + procedure uninit_nested_table_in_anydata; + + --%test(Gives failure with uninitialized varray within anydata) + procedure uninit_varray_in_anydata; + +end test_expect_not_to_be_null; +/ From d7eb1250798317f1d4fe06315eca7d5cddb183b4 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Mon, 25 Mar 2019 12:50:26 +0000 Subject: [PATCH 0352/1096] Adding set of tests : expectations/unary/test_expect_to_be_empty expectations/unary/test_expect_to_be_null expectations/unary/test_expect_to_be_true_false expectations/unary/test_expect_to_have_count Adding dummy type for testing. --- test/install_ut3_tester_helper.sql | 1 + test/install_ut3_user_tests.sql | 8 + test/ut3_tester_helper/test_dummy_number.tps | 14 + .../unary/test_expect_to_be_empty.pkb | 270 ++++++++++++++++++ .../unary/test_expect_to_be_empty.pks | 93 ++++++ .../unary/test_expect_to_be_null.pkb | 260 +++++++++++++++++ .../unary/test_expect_to_be_null.pks | 97 +++++++ .../unary/test_expect_to_be_true_false.pkb | 139 +++++++++ .../unary/test_expect_to_be_true_false.pks | 58 ++++ .../unary/test_expect_to_have_count.pkb | 210 ++++++++++++++ .../unary/test_expect_to_have_count.pks | 61 ++++ 11 files changed, 1211 insertions(+) create mode 100644 test/ut3_tester_helper/test_dummy_number.tps create mode 100644 test/ut3_user/expectations/unary/test_expect_to_be_empty.pkb create mode 100644 test/ut3_user/expectations/unary/test_expect_to_be_empty.pks create mode 100644 test/ut3_user/expectations/unary/test_expect_to_be_null.pkb create mode 100644 test/ut3_user/expectations/unary/test_expect_to_be_null.pks create mode 100644 test/ut3_user/expectations/unary/test_expect_to_be_true_false.pkb create mode 100644 test/ut3_user/expectations/unary/test_expect_to_be_true_false.pks create mode 100644 test/ut3_user/expectations/unary/test_expect_to_have_count.pkb create mode 100644 test/ut3_user/expectations/unary/test_expect_to_have_count.pks diff --git a/test/install_ut3_tester_helper.sql b/test/install_ut3_tester_helper.sql index acfb55aff..f221adad6 100644 --- a/test/install_ut3_tester_helper.sql +++ b/test/install_ut3_tester_helper.sql @@ -9,6 +9,7 @@ alter session set plsql_optimize_level=0; @@ut3_tester_helper/test_dummy_object_list.tps @@ut3_tester_helper/test_tab_varchar2.tps @@ut3_tester_helper/test_tab_varray.tps +@@ut3_tester_helper/test_dummy_number.tps @@ut3_tester_helper/main_helper.pks @@ut3_tester_helper/run_helper.pks diff --git a/test/install_ut3_user_tests.sql b/test/install_ut3_user_tests.sql index 09bc29c24..d30814439 100644 --- a/test/install_ut3_user_tests.sql +++ b/test/install_ut3_user_tests.sql @@ -6,6 +6,10 @@ alter session set plsql_optimize_level=0; prompt Install user tests @@ut3_user/expectations/unary/test_expect_not_to_be_null.pks +@@ut3_user/expectations/unary/test_expect_to_be_null.pks +@@ut3_user/expectations/unary/test_expect_to_be_empty.pks +@@ut3_user/expectations/unary/test_expect_to_have_count.pks +@@ut3_user/expectations/unary/test_expect_to_be_true_false.pks @@ut3_user/expectations/binary/test_equal.pks @@ut3_user/expectations/binary/test_expect_to_be_less_than.pks @@ut3_user/expectations/binary/test_be_less_or_equal.pks @@ -17,6 +21,10 @@ prompt Install user tests @@ut3_user/api/test_ut_runner.pks @@ut3_user/expectations/unary/test_expect_not_to_be_null.pkb +@@ut3_user/expectations/unary/test_expect_to_be_null.pkb +@@ut3_user/expectations/unary/test_expect_to_be_empty.pkb +@@ut3_user/expectations/unary/test_expect_to_have_count.pkb +@@ut3_user/expectations/unary/test_expect_to_be_true_false.pkb @@ut3_user/expectations/binary/test_equal.pkb @@ut3_user/expectations/binary/test_expect_to_be_less_than.pkb @@ut3_user/expectations/binary/test_be_less_or_equal.pkb diff --git a/test/ut3_tester_helper/test_dummy_number.tps b/test/ut3_tester_helper/test_dummy_number.tps new file mode 100644 index 000000000..b6283c93b --- /dev/null +++ b/test/ut3_tester_helper/test_dummy_number.tps @@ -0,0 +1,14 @@ +declare + l_exists integer; +begin + select count(1) into l_exists from user_types where type_name = 'TEST_DUMMY_NUMBER'; + if l_exists > 0 then + execute immediate 'drop type test_dummy_number force'; + end if; +end; +/ + +create or replace type test_dummy_number as object ( + id number +) +/ diff --git a/test/ut3_user/expectations/unary/test_expect_to_be_empty.pkb b/test/ut3_user/expectations/unary/test_expect_to_be_empty.pkb new file mode 100644 index 000000000..3694850fe --- /dev/null +++ b/test/ut3_user/expectations/unary/test_expect_to_be_empty.pkb @@ -0,0 +1,270 @@ +create or replace package body test_expect_to_be_empty is + + procedure cleanup_expectations is + begin + ut3_tester_helper.main_helper.clear_expectations( ); + end; + procedure success_be_empty_cursor is + l_cursor sys_refcursor; + begin + --Arrange + open l_cursor for select * from dual where 1 = 2; + --Act + ut3.ut.expect(l_cursor).to_be_empty; + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure fail_be_empty_cursor is + l_cursor sys_refcursor; + begin + --Arrange + open l_cursor for select * from dual; + --Act + ut3.ut.expect(l_cursor).to_be_empty; + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure fail_be_empty_cursor_report is + l_cursor sys_refcursor; + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + open l_cursor for select * from dual; + --Act + ut3.ut.expect(l_cursor).to_be_empty; + + l_expected_message := q'[Actual: (refcursor [ count = 1 ])% + X% +was expected to be empty%%]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure success_not_be_empty_cursor is + l_cursor sys_refcursor; + begin + --Arrange + open l_cursor for select * from dual; + --Act + ut3.ut.expect(l_cursor).not_to_be_empty; + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure fail_not_be_empty_cursor is + l_cursor sys_refcursor; + begin + --Arrange + open l_cursor for select * from dual where 1 = 2; + --Act + ut3.ut.expect(l_cursor).not_to_be_empty; + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure success_be_empty_collection is + l_actual anydata; + begin + --Arrange + l_actual := anydata.convertcollection(ora_mining_varchar2_nt()); + -- Act + ut3.ut.expect(l_actual).to_be_empty(); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure fail_be_empty_collection is + l_actual anydata; + begin + --Arrange + l_actual := anydata.convertcollection(ora_mining_varchar2_nt('a')); + -- Act + ut3.ut.expect(l_actual).to_be_empty(); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure success_not_be_empty_coll is + l_actual anydata; + begin + --Arrange + l_actual := anydata.convertcollection(ora_mining_varchar2_nt('a')); + -- Act + ut3.ut.expect(l_actual).not_to_be_empty(); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure fail_not_be_empty_collection is + l_actual anydata; + begin + --Arrange + l_actual := anydata.convertcollection(ora_mining_varchar2_nt()); + -- Act + ut3.ut.expect(l_actual).not_to_be_empty(); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure fail_be_empty_null_collection is + l_actual anydata; + l_data ora_mining_varchar2_nt; + begin + --Arrange + l_actual := anydata.convertcollection(l_data); + -- Act + ut3.ut.expect(l_actual).to_be_empty(); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure fail_not_be_empty_null_coll is + l_actual anydata; + l_data ora_mining_varchar2_nt; + begin + --Arrange + l_actual := anydata.convertcollection(l_data); + -- Act + ut3.ut.expect(l_actual).not_to_be_empty(); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure fail_be_empty_object is + l_actual anydata; + begin + --Arrange + l_actual := anydata.convertObject(ut3_tester_helper.test_dummy_number(1)); + -- Act + ut3.ut.expect(l_actual).to_be_empty(); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure fail_be_empty_null_object is + l_actual anydata; + l_data ut3_tester_helper.test_dummy_number; + begin + --Arrange + l_actual := anydata.convertObject(l_data); + -- Act + ut3.ut.expect(l_actual).to_be_empty(); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure fail_be_empty_number is + begin + -- Act + ut3.ut.expect( 1 ).to_( ut3.be_empty() ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + /** + * https://docs.oracle.com/en/database/oracle/oracle-database/18/adobj/declaring-initializing-objects-in-plsql.html#GUID-23135172-82E2-4C3E-800D-E584B43B578E + * User-defined types, just like collections, are atomically null, until you initialize the object by calling the constructor for its object type. That is, the object itself is null, not just its attributes. + */ + procedure fail_not_be_empty_object is + l_actual anydata; + begin + --Arrange + l_actual := anydata.convertObject(ut3_tester_helper.test_dummy_number(1)); + -- Act + ut3.ut.expect(l_actual).not_to_be_empty(); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure fail_not_be_empty_null_object is + l_actual anydata; + l_data ut3_tester_helper.test_dummy_number; + begin + --Arrange + l_actual := anydata.convertObject(l_data); + -- Act + ut3.ut.expect(l_actual).not_to_be_empty(); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure fail_not_be_empty_number is + begin + -- Act + ut3.ut.expect( 1 ).not_to( ut3.be_empty() ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure success_be_empty_clob is + begin + -- Act + ut3.ut.expect( empty_clob() ).to_( ut3.be_empty() ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure fail_be_empty_clob is + begin + -- Act + ut3.ut.expect( to_clob(' ') ).to_( ut3.be_empty() ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure success_be_empty_blob is + begin + -- Act + ut3.ut.expect( empty_blob() ).to_( ut3.be_empty() ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure fail_be_empty_blob is + begin + -- Act + ut3.ut.expect( to_blob('AA') ).to_( ut3.be_empty() ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + + procedure fail_not_be_empty_clob is + begin + -- Act + ut3.ut.expect( empty_clob() ).not_to( ut3.be_empty() ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure success_not_be_empty_clob is + begin + -- Act + ut3.ut.expect( to_clob(' ') ).not_to( ut3.be_empty() ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure fail_not_be_empty_blob is + begin + -- Act + ut3.ut.expect( empty_blob() ).not_to( ut3.be_empty() ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure success_not_be_empty_blob is + begin + -- Act + ut3.ut.expect( to_blob('AA') ).not_to( ut3.be_empty() ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + +end; +/ \ No newline at end of file diff --git a/test/ut3_user/expectations/unary/test_expect_to_be_empty.pks b/test/ut3_user/expectations/unary/test_expect_to_be_empty.pks new file mode 100644 index 000000000..a76787ac5 --- /dev/null +++ b/test/ut3_user/expectations/unary/test_expect_to_be_empty.pks @@ -0,0 +1,93 @@ +create or replace package test_expect_to_be_empty is + + --%suite + --%suitepath(utplsql.test_user.expectations.unary) + + --%aftereach + procedure cleanup_expectations; + + --%context(to_be_empty) + + --%test(Gives success for an empty cursor) + procedure success_be_empty_cursor; + + --%test(Gives failure for a non empty cursor) + procedure fail_be_empty_cursor; + + --%test(Reports the content of cursor when cursor is not empty) + procedure fail_be_empty_cursor_report; + + --%test(Gives success for an empty collection) + procedure success_be_empty_collection; + + --%test(Gives failure for a non empty collection) + procedure fail_be_empty_collection; + + --%test(Gives failure for a NULL collection) + procedure fail_be_empty_null_collection; + + --%test(Gives failure for an object) + procedure fail_be_empty_object; + + --%test(Gives failure for a null object) + procedure fail_be_empty_null_object; + + --%test(Gives failure for number) + procedure fail_be_empty_number; + + --%test(Gives success for an empty CLOB) + procedure success_be_empty_clob; + + --%test(Gives failure for a non empty CLOB) + procedure fail_be_empty_clob; + + --%test(Gives success for an empty BLOB) + procedure success_be_empty_blob; + + --%test(Gives failure for a non empty BLOB) + procedure fail_be_empty_blob; + + --%endcontext + + --%context(not_to_be_empty) + + --%test(Gives failure for an empty cursor) + procedure fail_not_be_empty_cursor; + + --%test(Gives success for a non empty cursor) + procedure success_not_be_empty_cursor; + + --%test(Gives success for a non empty collection) + procedure success_not_be_empty_coll; + + --%test(Gives failure for an empty collection) + procedure fail_not_be_empty_collection; + + --%test(Gives failure for an empty collection) + procedure fail_not_be_empty_null_coll; + + --%test(Gives failure for an empty object) + procedure fail_not_be_empty_object; + + --%test(Gives failure for a null object) + procedure fail_not_be_empty_null_object; + + --%test(Gives failure for number) + procedure fail_not_be_empty_number; + + --%test(Gives failure for an empty CLOB) + procedure fail_not_be_empty_clob; + + --%test(Gives success for a non empty CLOB) + procedure success_not_be_empty_clob; + + --%test(Gives failure for an empty BLOB) + procedure fail_not_be_empty_blob; + + --%test(Gives success for a non empty BLOB) + procedure success_not_be_empty_blob; + + --%endcontext + +end; +/ diff --git a/test/ut3_user/expectations/unary/test_expect_to_be_null.pkb b/test/ut3_user/expectations/unary/test_expect_to_be_null.pkb new file mode 100644 index 000000000..c0899c08d --- /dev/null +++ b/test/ut3_user/expectations/unary/test_expect_to_be_null.pkb @@ -0,0 +1,260 @@ +create or replace package body test_expect_to_be_null +is + gc_object_name constant varchar2(30) := 't_to_be_null_test'; + gc_nested_table_name constant varchar2(30) := 'tt_to_be_null_test'; + gc_varray_name constant varchar2(30) := 'tv_to_be_null_test'; + + procedure cleanup_expectations is + begin + ut3_tester_helper.main_helper.clear_expectations( ); + end; + + procedure create_types is + pragma autonomous_transaction; + begin + execute immediate 'create type ' || gc_object_name || ' is object (dummy number)'; + execute immediate 'create type ' || gc_nested_table_name || ' is table of number'; + execute immediate 'create type ' || gc_varray_name || ' is varray(1) of number'; + end; + + procedure drop_types is + pragma autonomous_transaction; + begin + execute immediate 'drop type ' || gc_object_name; + execute immediate 'drop type ' || gc_nested_table_name; + execute immediate 'drop type ' || gc_varray_name; + end; + + procedure null_blob is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'to_be_null', 'blob', 'null' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure null_boolean is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'to_be_null', 'boolean', 'null' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure null_clob is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'to_be_null', 'clob', 'null' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure null_date is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'to_be_null', 'date', 'null' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure null_number is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'to_be_null', 'number', 'null' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure null_timestamp is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'to_be_null', 'timestamp', 'null' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure null_timestamp_with_ltz is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'to_be_null', 'timestamp with local time zone', 'null' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure null_timestamp_with_tz is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'to_be_null', 'timestamp with time zone', 'null' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure null_varchar2 is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'to_be_null', 'varchar2(4000)', 'null' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure null_anydata is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'to_be_null', 'anydata', 'null' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure uninit_object_in_anydata is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_object_block( + 'to_be_null', gc_object_name, 'null', 'object' + ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure uninit_nested_table_in_anydata is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_object_block( + 'to_be_null', gc_nested_table_name, 'null', 'collection' + ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure uninit_varray_in_anydata is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_object_block( 'to_be_null', gc_varray_name, + 'null', 'collection' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure blob_not_null is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'to_be_null', 'blob', 'to_blob(''abc'')' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure empty_blob is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'to_be_null', 'blob', 'empty_blob()' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure boolean_not_null is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'to_be_null', 'boolean', 'true' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure clob_not_null is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'to_be_null', 'clob', 'to_clob(''abc'')' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure empty_clob is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'to_be_null', 'clob', 'empty_clob()' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure date_not_null is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'to_be_null', 'date', 'sysdate' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure number_not_null is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'to_be_null', 'number', '1234' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure timestamp_not_null is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'to_be_null', 'timestamp', 'systimestamp' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure timestamp_with_ltz_not_null is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( + 'to_be_null', 'timestamp with local time zone', 'systimestamp' + ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure timestamp_with_tz_not_null is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( + 'to_be_null', 'timestamp with time zone', 'systimestamp' + ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure varchar2_not_null is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block( 'to_be_null', 'varchar2(4000)', '''abc''' ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure initialized_object is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_object_block( + 'to_be_null', gc_object_name, gc_object_name || '(1)', 'object' + ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure initialized_nested_table is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_object_block( + 'to_be_null', gc_nested_table_name, gc_nested_table_name || '()', 'collection' + ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure initialized_varray is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_object_block( + 'to_be_null', gc_varray_name, gc_varray_name || '()', 'collection' + ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + +end test_expect_to_be_null; +/ diff --git a/test/ut3_user/expectations/unary/test_expect_to_be_null.pks b/test/ut3_user/expectations/unary/test_expect_to_be_null.pks new file mode 100644 index 000000000..f1758316e --- /dev/null +++ b/test/ut3_user/expectations/unary/test_expect_to_be_null.pks @@ -0,0 +1,97 @@ +create or replace package test_expect_to_be_null +is + --%suite(to_be_null) + --%suitepath(utplsql.test_user.expectations.unary) + + --%aftereach + procedure cleanup_expectations; + + --%beforeall + procedure create_types; + + --%afterall + procedure drop_types; + + --%test(Gives success with null blob) + procedure null_blob; + + --%test(Gives success with null boolean) + procedure null_boolean; + + --%test(Gives success with null clob) + procedure null_clob; + + --%test(Gives success with null date) + procedure null_date; + + --%test(Gives success with null number) + procedure null_number; + + --%test(Gives success null timestamp) + procedure null_timestamp; + + --%test(Gives success with null timestamp with local time zone) + procedure null_timestamp_with_ltz; + + --%test(Gives success with null timestamp with time zone) + procedure null_timestamp_with_tz; + + --%test(Gives success with null varchar2) + procedure null_varchar2; + + --%test(Gives success with null anydata) + procedure null_anydata; + + --%test(Gives success with uninitialized object within anydata) + procedure uninit_object_in_anydata; + + --%test(Gives success with uninitialized nested table within anydata) + procedure uninit_nested_table_in_anydata; + + --%test(Gives success with uninitialized varray within anydata) + procedure uninit_varray_in_anydata; + + --%test(Gives failure for not null blob) + procedure blob_not_null; + + --%test(Gives failure with empty blob) + procedure empty_blob; + + --%test(Gives failure for not null boolean) + procedure boolean_not_null; + + --%test(Gives failure for not null clob) + procedure clob_not_null; + + --%test(Gives failure with empty clob) + procedure empty_clob; + + --%test(Gives failure for not null date) + procedure date_not_null; + + --%test(Gives failure for not null number) + procedure number_not_null; + + --%test(Gives failure for not null timestamp) + procedure timestamp_not_null; + + --%test(Gives failure for not null timestamp with local time zone) + procedure timestamp_with_ltz_not_null; + + --%test(Gives failure for not null timestamp with time zone) + procedure timestamp_with_tz_not_null; + + --%test(Gives failure for not null varchar2) + procedure varchar2_not_null; + + --%test(Gives failure for initialized object within anydata) + procedure initialized_object; + + --%test(Gives failure for initialized nested table within anydata) + procedure initialized_nested_table; + + --%test(Gives failure for initialized varray within anydata) + procedure initialized_varray; + +end test_expect_to_be_null; +/ diff --git a/test/ut3_user/expectations/unary/test_expect_to_be_true_false.pkb b/test/ut3_user/expectations/unary/test_expect_to_be_true_false.pkb new file mode 100644 index 000000000..6a621c6b3 --- /dev/null +++ b/test/ut3_user/expectations/unary/test_expect_to_be_true_false.pkb @@ -0,0 +1,139 @@ +create or replace package body test_expect_to_be_true_false +is + + procedure cleanup_expectations is + begin + ut3_tester_helper.main_helper.clear_expectations( ); + end; + + procedure to_be_true_null_boolean is + begin + --Act + ut3.ut.expect( 1=null ).to_be_true(); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure to_be_true_success is + begin + --Act + ut3.ut.expect( 1=1 ).to_be_true(); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure to_be_true_failure is + begin + --Act + ut3.ut.expect( 1=2 ).to_be_true(); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure to_be_true_bad_type is + begin + --Act + ut3.ut.expect( 1 ).to_be_true(); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure not_to_be_true_null_boolean is + begin + --Act + ut3.ut.expect( 1=null ).not_to_be_true(); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure not_to_be_true_success is + begin + --Act + ut3.ut.expect( 1=2 ).not_to_be_true(); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure not_to_be_true_failure is + begin + --Act + ut3.ut.expect( 1=1 ).not_to_be_true(); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + + procedure not_to_be_true_bad_type is + begin + --Act + ut3.ut.expect( 1 ).not_to_be_true(); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure to_be_false_null_boolean is + begin + --Act + ut3.ut.expect( 1=null ).to_be_false(); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure to_be_false_success is + begin + --Act + ut3.ut.expect( 1=2 ).to_be_false(); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure to_be_false_failure is + begin + --Act + ut3.ut.expect( 1=1 ).to_be_false(); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure to_be_false_bad_type is + begin + --Act + ut3.ut.expect( 1 ).to_be_false(); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure not_to_be_false_null_boolean is + begin + --Act + ut3.ut.expect( 1=null ).not_to_be_false(); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure not_to_be_false_success is + begin + --Act + ut3.ut.expect( 1=1 ).not_to_be_false(); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure not_to_be_false_failure is + begin + --Act + ut3.ut.expect( 1=2 ).not_to_be_false(); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure not_to_be_false_bad_type is + begin + --Act + ut3.ut.expect( 1 ).not_to_be_false(); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + +end; +/ diff --git a/test/ut3_user/expectations/unary/test_expect_to_be_true_false.pks b/test/ut3_user/expectations/unary/test_expect_to_be_true_false.pks new file mode 100644 index 000000000..28bbae6f7 --- /dev/null +++ b/test/ut3_user/expectations/unary/test_expect_to_be_true_false.pks @@ -0,0 +1,58 @@ +create or replace package test_expect_to_be_true_false +is + --%suite(to_be_true/false) + --%suitepath(utplsql.test_user.expectations.unary) + + --%aftereach + procedure cleanup_expectations; + + --%test(to_be_true - Gives failure with null boolean) + procedure to_be_true_null_boolean; + + --%test(to_be_true - Gives success with true expression) + procedure to_be_true_success; + + --%test(to_be_true - Gives failure with false expression) + procedure to_be_true_failure; + + --%test(to_be_true - Gives failure with non-boolean data type) + procedure to_be_true_bad_type; + + --%test(not_to_be_true - Gives failure with null boolean) + procedure not_to_be_true_null_boolean; + + --%test(not_to_be_true - Gives failure with true expression) + procedure not_to_be_true_success; + + --%test(not_to_be_true - Gives success with false expression) + procedure not_to_be_true_failure; + + --%test(not_to_be_true - Gives failure with non-boolean data type) + procedure not_to_be_true_bad_type; + + --%test(to_be_false - Gives failure with null boolean) + procedure to_be_false_null_boolean; + + --%test(to_be_false - Gives failure with true expression) + procedure to_be_false_success; + + --%test(to_be_false - Gives success with false expression) + procedure to_be_false_failure; + + --%test(to_be_false - Gives failure with non-boolean data type) + procedure to_be_false_bad_type; + + --%test(not_to_be_false - Gives failure with null boolean) + procedure not_to_be_false_null_boolean; + + --%test(not_to_be_false - Gives success with true expression) + procedure not_to_be_false_success; + + --%test(not_to_be_false - Gives failure with false expression) + procedure not_to_be_false_failure; + + --%test(not_to_be_false - Gives failure with non-boolean data type) + procedure not_to_be_false_bad_type; + +end; +/ diff --git a/test/ut3_user/expectations/unary/test_expect_to_have_count.pkb b/test/ut3_user/expectations/unary/test_expect_to_have_count.pkb new file mode 100644 index 000000000..327ced120 --- /dev/null +++ b/test/ut3_user/expectations/unary/test_expect_to_have_count.pkb @@ -0,0 +1,210 @@ +create or replace package body test_expect_to_have_count is + + procedure cleanup_expectations is + begin + ut3_tester_helper.main_helper.clear_expectations( ); + end; + + procedure success_have_count_cursor is + l_cursor sys_refcursor; + begin + --Arrange + open l_cursor for select * from dual connect by level <= 11; + --Act + ut3.ut.expect(l_cursor).to_have_count(11); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure fail_have_count_cursor is + l_cursor sys_refcursor; + begin + --Arrange + open l_cursor for select * from dual where 0=1; + --Act + ut3.ut.expect(l_cursor).to_have_count(1); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure fail_have_count_cursor_report is + l_cursor sys_refcursor; + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + open l_cursor for select * from dual; + --Act + ut3.ut.expect(l_cursor).to_have_count(2); + + l_expected_message := q'[Actual: (refcursor [ count = 1 ]) was expected to have [ count = 2 ]%]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure success_not_have_count_cursor is + l_cursor sys_refcursor; + begin + --Arrange + open l_cursor for select * from dual; + --Act + ut3.ut.expect(l_cursor).not_to_have_count(2); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure fail_not_have_count_cursor is + l_cursor sys_refcursor; + begin + --Arrange + open l_cursor for select * from dual where 1 = 2; + --Act + ut3.ut.expect(l_cursor).not_to_have_count(0); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure success_have_count_collection is + l_actual anydata; + begin + --Arrange + l_actual := anydata.convertcollection(ora_mining_varchar2_nt()); + -- Act + ut3.ut.expect(l_actual).to_have_count(0); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure fail_have_count_collection is + l_actual anydata; + begin + --Arrange + l_actual := anydata.convertcollection(ora_mining_varchar2_nt('a')); + -- Act + ut3.ut.expect(l_actual).to_have_count(0); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure success_not_have_count_coll is + l_actual anydata; + begin + --Arrange + l_actual := anydata.convertcollection(ora_mining_varchar2_nt('a')); + -- Act + ut3.ut.expect(l_actual).not_to_have_count(2); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure fail_not_have_count_coll is + l_actual anydata; + begin + --Arrange + l_actual := anydata.convertcollection(ora_mining_varchar2_nt()); + -- Act + ut3.ut.expect(l_actual).not_to_have_count(0); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure fail_have_count_null_coll is + l_actual anydata; + l_data ora_mining_varchar2_nt; + begin + --Arrange + l_actual := anydata.convertcollection(l_data); + -- Act + ut3.ut.expect(l_actual).to_have_count(0); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure fail_not_have_count_null_coll is + l_actual anydata; + l_data ora_mining_varchar2_nt; + begin + --Arrange + l_actual := anydata.convertcollection(l_data); + -- Act + ut3.ut.expect(l_actual).not_to_have_count(0); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure fail_have_count_object is + l_actual anydata; + begin + --Arrange + l_actual := anydata.convertObject(ut3_tester_helper.test_dummy_number(1)); + -- Act + ut3.ut.expect(l_actual).to_have_count(0); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure fail_have_count_null_object is + l_actual anydata; + l_data ut3_tester_helper.test_dummy_number; + begin + --Arrange + l_actual := anydata.convertObject(l_data); + -- Act + ut3.ut.expect(l_actual).to_have_count(0); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure fail_have_count_number is + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + -- Act + ut3.ut.expect( 1 ).to_( ut3.have_count(0) ); + --Assert + l_expected_message := q'[%The matcher 'have count' cannot be used with data type (number).%]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure fail_not_have_count_object is + l_actual anydata; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + --Arrange + l_actual := anydata.convertObject(ut3_tester_helper.test_dummy_number(1)); + -- Act + ut3.ut.expect(l_actual).not_to_have_count(0); + --Assert + l_expected_message := q'[%The matcher 'have count' cannot be used with data type (ut3_tester_helper.test_dummy_number).%]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure fail_not_have_count_null_obj is + l_actual anydata; + l_data ut3_tester_helper.test_dummy_number; + begin + --Arrange + l_actual := anydata.convertObject(l_data); + -- Act + ut3.ut.expect(l_actual).not_to_have_count(0); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure fail_not_have_count_number is + begin + -- Act + ut3.ut.expect( 1 ).not_to( ut3.have_count(0) ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + +end; +/ \ No newline at end of file diff --git a/test/ut3_user/expectations/unary/test_expect_to_have_count.pks b/test/ut3_user/expectations/unary/test_expect_to_have_count.pks new file mode 100644 index 000000000..b944d8800 --- /dev/null +++ b/test/ut3_user/expectations/unary/test_expect_to_have_count.pks @@ -0,0 +1,61 @@ +create or replace package test_expect_to_have_count is + + --%suite((not)to_have_count) + --%suitepath(utplsql.test_user.expectations.unary) + + --%aftereach + procedure cleanup_expectations; + + --%test(Gives success for an empty cursor) + procedure success_have_count_cursor; + + --%test(Gives failure for a non empty cursor) + procedure fail_have_count_cursor; + + --%test(Reports the content of cursor when cursor is not empty) + procedure fail_have_count_cursor_report; + + --%test(Negated - Gives success for a non empty cursor) + procedure success_not_have_count_cursor; + + --%test(Negated - Gives failure for an empty cursor) + procedure fail_not_have_count_cursor; + + --%test(Gives success for an empty collection) + procedure success_have_count_collection; + + --%test(Gives failure for a non empty collection) + procedure fail_have_count_collection; + + --%test(Negated - Gives success for a non empty collection) + procedure success_not_have_count_coll; + + --%test(Negated - Gives failure for an empty collection) + procedure fail_not_have_count_coll; + + --%test(Gives failure for a NULL collection) + procedure fail_have_count_null_coll; + + --%test(Negated - Gives failure for an empty collection) + procedure fail_not_have_count_null_coll; + + --%test(Gives failure for an object) + procedure fail_have_count_object; + + --%test(Gives failure for a null object) + procedure fail_have_count_null_object; + + --%test(Gives failure for number) + procedure fail_have_count_number; + + --%test(Negated - Gives failure for an object) + procedure fail_not_have_count_object; + + --%test(Negated - Gives failure for a null object) + procedure fail_not_have_count_null_obj; + + --%test(Negated - Gives failure for number) + procedure fail_not_have_count_number; + +end; +/ From 99e1099682dbdedfbac37a62598404aeda2f89ef Mon Sep 17 00:00:00 2001 From: lwasylow Date: Mon, 25 Mar 2019 17:08:45 +0000 Subject: [PATCH 0353/1096] Adding schema prefix to failing tests from 12.1 --- .../core/annotations/test_before_after_annotations.pkb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ut3_tester/core/annotations/test_before_after_annotations.pkb b/test/ut3_tester/core/annotations/test_before_after_annotations.pkb index 804508c61..9ee917d84 100644 --- a/test/ut3_tester/core/annotations/test_before_after_annotations.pkb +++ b/test/ut3_tester/core/annotations/test_before_after_annotations.pkb @@ -200,7 +200,7 @@ create or replace package body test_before_after_annotations is execute immediate l_test_package_body; --Execute the tests and collect the results - select * bulk collect into l_test_results from table(ut3.ut.run(('dummy_before_after_test'))); + select * bulk collect into l_test_results from table(ut3.ut.run(('ut3_tester.dummy_before_after_test'))); execute immediate 'drop package dummy_before_after_test'; execute immediate 'drop package shared_test_package'; From 04cd36c46a9841ef60d7af6e3134e7cd68c2f481 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Mon, 25 Mar 2019 17:19:40 +0000 Subject: [PATCH 0354/1096] Fixing development scripts --- development/cleanup.sh | 2 +- development/install.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/development/cleanup.sh b/development/cleanup.sh index 086db6786..fb0415ed1 100755 --- a/development/cleanup.sh +++ b/development/cleanup.sh @@ -3,7 +3,7 @@ #goto git root directory git rev-parse && cd "$(git rev-parse --show-cdup)" -#. development/env.sh +. development/env.sh "${SQLCLI}" sys/${ORACLE_PWD}@//${CONNECTION_STR} AS SYSDBA <<-SQL set echo on diff --git a/development/install.sh b/development/install.sh index 86d7e4da2..4104e2672 100755 --- a/development/install.sh +++ b/development/install.sh @@ -3,7 +3,7 @@ #goto git root directory git rev-parse && cd "$(git rev-parse --show-cdup)" -#. development/env.sh +. development/env.sh header="******************************************************************************************" if ! development/cleanup.sh; then From 3e98723bc0065127b4dfd9263536f4f3daaff534 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 25 Mar 2019 22:34:34 +0000 Subject: [PATCH 0355/1096] Fixed bug for deployments with uninstall included. Added new user to `template.env.sh` --- .travis/install.sh | 1 + development/template.env.sh | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.travis/install.sh b/.travis/install.sh index a6ab0cc16..3284d5aa6 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -47,6 +47,7 @@ SQL alter session set plsql_optimize_level=0; @install.sql $UT3_OWNER + @@@create_synonyms_and_grants_for_public.sql $UT3_OWNER SQL fi diff --git a/development/template.env.sh b/development/template.env.sh index b19f63ec7..285b60577 100755 --- a/development/template.env.sh +++ b/development/template.env.sh @@ -13,6 +13,8 @@ export UT3_OWNER_PASSWORD=ut3 export UT3_RELEASE_VERSION_SCHEMA=ut3_latest_release export UT3_TESTER=ut3_tester export UT3_TESTER_PASSWORD=ut3 +export UT3_TESTER_HELPER=ut3_tester_helper +export UT3_TESTER_HELPER_PASSWORD=ut3 export UT3_TABLESPACE=users export UT3_USER="UT3\$USER#" export UT3_USER_PASSWORD=ut3 From 76b0d562cdc39f15b006f5f06e37f5517e57af64 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 26 Mar 2019 01:09:41 +0000 Subject: [PATCH 0356/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index a2893d370..ce0e56c57 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 5d89726af..36a8ef952 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index bddb264dd..617a4db1d 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index e9b56bee3..35d465fc1 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 305afe3d4..2ccaae623 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 64a242840..0bf324e36 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index de5d76f16..91da18b31 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 8b68d667b..f574b8e81 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index e154a77b1..8424a8d14 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index af60ac266..8da42b6b8 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 3b6e7ce45..492804991 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 2621221e5..3314ed467 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 4091584b4..2d6d7cb6c 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 2b25f2ae5..92cfd1e85 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index b7d114bcf..dd3aff030 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 4abe304b5..349bb0a05 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 70dd4c551..de9c3a64e 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2737--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index da8f0c2dd..c51d18d48 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.7.2737-develop'; + gc_version constant varchar2(50) := 'v3.1.7.2748-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 0bf1d9e33372c40163dd0998bba7ab6211b66c11 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Tue, 26 Mar 2019 07:25:30 +0000 Subject: [PATCH 0357/1096] FIX : removal of non existing types from uninstall script --- source/uninstall_objects.sql | 4 ---- 1 file changed, 4 deletions(-) diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index 62d14cb58..4c7a86156 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -137,10 +137,6 @@ drop type ut_data_value_boolean force; drop type ut_data_value_blob force; -drop type ut_data_value_object force; - -drop type ut_data_value_collection force; - drop type ut_data_value_anydata force; drop type ut_data_value_xmltype force; From e914d960d03c1042af7fd1743f91bb0e03008ba4 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Tue, 26 Mar 2019 07:36:35 +0000 Subject: [PATCH 0358/1096] INSTALL:Is it too many monkeys ?:) --- .travis/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/install.sh b/.travis/install.sh index 3284d5aa6..a6a8a60b0 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -47,7 +47,7 @@ SQL alter session set plsql_optimize_level=0; @install.sql $UT3_OWNER - @@@create_synonyms_and_grants_for_public.sql $UT3_OWNER + @create_synonyms_and_grants_for_public.sql $UT3_OWNER SQL fi From 23da3d7e1e08a89915947dff20cc55ca0ad05bf1 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 19 Mar 2019 19:56:20 +0000 Subject: [PATCH 0359/1096] Added support for random order of test execution. Resolves #422 --- development/cleanup.sh | 5 +- source/api/ut.pkb | 122 +++++++++++++----- source/api/ut.pks | 48 +++++-- source/api/ut_runner.pkb | 27 ++-- source/api/ut_runner.pks | 4 +- .../annotations/ut_annotation_manager.pkb | 33 +++++ .../annotations/ut_annotation_manager.pks | 3 + source/core/types/ut_run.tpb | 23 ++-- source/core/types/ut_run.tps | 18 +-- source/core/ut_suite_manager.pkb | 58 ++++++--- source/core/ut_suite_manager.pks | 8 +- .../reporters/ut_documentation_reporter.tpb | 3 + test/api/test_ut_run.pkb | 51 ++++++++ test/api/test_ut_run.pks | 16 +++ 14 files changed, 322 insertions(+), 97 deletions(-) diff --git a/development/cleanup.sh b/development/cleanup.sh index 3b6e22e53..989be30b9 100755 --- a/development/cleanup.sh +++ b/development/cleanup.sh @@ -7,6 +7,7 @@ git rev-parse && cd "$(git rev-parse --show-cdup)" "${SQLCLI}" sys/${ORACLE_PWD}@//${CONNECTION_STR} AS SYSDBA <<-SQL set echo on +set serveroutput on begin for x in ( select * from dba_objects @@ -25,12 +26,12 @@ drop user ${UT3_USER} cascade; begin for i in ( - select decode(owner,'PUBLIC','drop public synonym "','drop synonym "'||owner||'"."')|| synonym_name ||'"' drop_orphaned_synonym from dba_synonyms a + select decode(owner,'PUBLIC','drop public synonym "','drop synonym "'||owner||'"."')|| synonym_name ||'"' drop_orphaned_synonym, owner||'.'||synonym_name syn from dba_synonyms a where not exists (select 1 from dba_objects b where (a.table_name=b.object_name and a.table_owner=b.owner or b.owner='SYS' and a.table_owner=b.object_name) ) and a.table_owner not in ('SYS','SYSTEM') ) loop - dbms_output.put_line(i.drop_orphaned_synonym); execute immediate i.drop_orphaned_synonym; + dbms_output.put_line('synonym '||i.syn||' dropped'); end loop; end; / diff --git a/source/api/ut.pkb b/source/api/ut.pkb index eb4a06bc3..5e13dcc62 100644 --- a/source/api/ut.pkb +++ b/source/api/ut.pkb @@ -113,12 +113,14 @@ create or replace package body ut is a_paths ut_varchar2_list, a_reporter in out nocopy ut_reporter_base, a_color_console integer, - a_coverage_schemes ut_varchar2_list := null, + a_coverage_schemes ut_varchar2_list, a_source_file_mappings ut_file_mappings, a_test_file_mappings ut_file_mappings, a_include_objects ut_varchar2_list, a_exclude_objects ut_varchar2_list, - a_client_character_set varchar2 := null + a_client_character_set varchar2, + a_random_test_order integer, + a_random_test_order_seed positive ) is pragma autonomous_transaction; begin @@ -133,7 +135,10 @@ create or replace package body ut is a_include_objects, a_exclude_objects, gc_fail_on_errors, - a_client_character_set + a_client_character_set, + false, + ut_utils.int_to_boolean(a_random_test_order), + a_random_test_order_seed ); rollback; end; @@ -142,12 +147,14 @@ create or replace package body ut is a_paths ut_varchar2_list, a_reporter in out nocopy ut_reporter_base, a_color_console integer, - a_coverage_schemes ut_varchar2_list := null, + a_coverage_schemes ut_varchar2_list, a_source_files ut_varchar2_list, a_test_files ut_varchar2_list, a_include_objects ut_varchar2_list, a_exclude_objects ut_varchar2_list, - a_client_character_set varchar2 := null + a_client_character_set varchar2, + a_random_test_order integer, + a_random_test_order_seed positive ) is pragma autonomous_transaction; begin @@ -162,7 +169,10 @@ create or replace package body ut is a_include_objects, a_exclude_objects, gc_fail_on_errors, - a_client_character_set + a_client_character_set, + false, + ut_utils.int_to_boolean(a_random_test_order), + a_random_test_order_seed ); rollback; end; @@ -200,7 +210,9 @@ create or replace package body ut is a_test_file_mappings ut_file_mappings := null, a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, - a_client_character_set varchar2 := null + a_client_character_set varchar2 := null, + a_random_test_order integer := 0, + a_random_test_order_seed positive := null ) return ut_varchar2_rows pipelined is l_reporter ut_reporter_base := a_reporter; l_results sys_refcursor; @@ -214,7 +226,9 @@ create or replace package body ut is a_test_file_mappings, a_include_objects, a_exclude_objects, - a_client_character_set + a_client_character_set, + a_random_test_order, + a_random_test_order_seed ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); @@ -233,7 +247,9 @@ create or replace package body ut is a_test_files ut_varchar2_list, a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, - a_client_character_set varchar2 := null + a_client_character_set varchar2 := null, + a_random_test_order integer := 0, + a_random_test_order_seed positive := null ) return ut_varchar2_rows pipelined is l_reporter ut_reporter_base := a_reporter; l_results sys_refcursor; @@ -247,7 +263,9 @@ create or replace package body ut is a_test_files, a_include_objects, a_exclude_objects, - a_client_character_set + a_client_character_set, + a_random_test_order, + a_random_test_order_seed ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); @@ -267,7 +285,9 @@ create or replace package body ut is a_test_file_mappings ut_file_mappings := null, a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, - a_client_character_set varchar2 := null + a_client_character_set varchar2 := null, + a_random_test_order integer := 0, + a_random_test_order_seed positive := null ) return ut_varchar2_rows pipelined is l_reporter ut_reporter_base := a_reporter; l_results sys_refcursor; @@ -281,7 +301,9 @@ create or replace package body ut is a_test_file_mappings, a_include_objects, a_exclude_objects, - a_client_character_set + a_client_character_set, + a_random_test_order, + a_random_test_order_seed ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); @@ -301,7 +323,9 @@ create or replace package body ut is a_test_files ut_varchar2_list, a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, - a_client_character_set varchar2 := null + a_client_character_set varchar2 := null, + a_random_test_order integer := 0, + a_random_test_order_seed positive := null ) return ut_varchar2_rows pipelined is l_reporter ut_reporter_base := a_reporter; l_results sys_refcursor; @@ -315,7 +339,9 @@ create or replace package body ut is a_test_files, a_include_objects, a_exclude_objects, - a_client_character_set + a_client_character_set, + a_random_test_order, + a_random_test_order_seed ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); @@ -335,7 +361,9 @@ create or replace package body ut is a_test_file_mappings ut_file_mappings := null, a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, - a_client_character_set varchar2 := null + a_client_character_set varchar2 := null, + a_random_test_order integer := 0, + a_random_test_order_seed positive := null ) return ut_varchar2_rows pipelined is l_reporter ut_reporter_base := a_reporter; l_results sys_refcursor; @@ -349,7 +377,9 @@ create or replace package body ut is a_test_file_mappings, a_include_objects, a_exclude_objects, - a_client_character_set + a_client_character_set, + a_random_test_order, + a_random_test_order_seed ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); @@ -369,7 +399,9 @@ create or replace package body ut is a_test_files ut_varchar2_list, a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, - a_client_character_set varchar2 := null + a_client_character_set varchar2 := null, + a_random_test_order integer := 0, + a_random_test_order_seed positive := null ) return ut_varchar2_rows pipelined is l_reporter ut_reporter_base := a_reporter; l_results sys_refcursor; @@ -383,7 +415,9 @@ create or replace package body ut is a_test_files, a_include_objects, a_exclude_objects, - a_client_character_set + a_client_character_set, + a_random_test_order, + a_random_test_order_seed ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); @@ -404,7 +438,9 @@ create or replace package body ut is a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null, - a_force_manual_rollback boolean := false + a_force_manual_rollback boolean := false, + a_random_test_order boolean := false, + a_random_test_order_seed positive := null ) is l_reporter ut_reporter_base := a_reporter; begin @@ -421,7 +457,9 @@ create or replace package body ut is a_exclude_objects, gc_fail_on_errors, a_client_character_set, - a_force_manual_rollback + a_force_manual_rollback, + a_random_test_order, + a_random_test_order_seed ); else run_autonomous( @@ -433,7 +471,9 @@ create or replace package body ut is a_test_file_mappings, a_include_objects, a_exclude_objects, - a_client_character_set + a_client_character_set, + ut_utils.boolean_to_int(a_random_test_order), + a_random_test_order_seed ); end if; if l_reporter is of (ut_output_reporter_base) then @@ -452,7 +492,9 @@ create or replace package body ut is a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null, - a_force_manual_rollback boolean := false + a_force_manual_rollback boolean := false, + a_random_test_order boolean := false, + a_random_test_order_seed positive := null ) is l_reporter ut_reporter_base := a_reporter; begin @@ -466,7 +508,9 @@ create or replace package body ut is a_include_objects, a_exclude_objects, a_client_character_set, - a_force_manual_rollback + a_force_manual_rollback, + a_random_test_order, + a_random_test_order_seed ); end; @@ -479,7 +523,9 @@ create or replace package body ut is a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null, - a_force_manual_rollback boolean := false + a_force_manual_rollback boolean := false, + a_random_test_order boolean := false, + a_random_test_order_seed positive := null ) is begin ut.run( @@ -492,7 +538,9 @@ create or replace package body ut is a_include_objects, a_exclude_objects, a_client_character_set, - a_force_manual_rollback + a_force_manual_rollback, + a_random_test_order, + a_random_test_order_seed ); end; @@ -505,7 +553,9 @@ create or replace package body ut is a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null, - a_force_manual_rollback boolean := false + a_force_manual_rollback boolean := false, + a_random_test_order boolean := false, + a_random_test_order_seed positive := null ) is begin ut.run( @@ -518,7 +568,9 @@ create or replace package body ut is a_include_objects, a_exclude_objects, a_client_character_set, - a_force_manual_rollback + a_force_manual_rollback, + a_random_test_order, + a_random_test_order_seed ); end; @@ -532,7 +584,9 @@ create or replace package body ut is a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null, - a_force_manual_rollback boolean := false + a_force_manual_rollback boolean := false, + a_random_test_order boolean := false, + a_random_test_order_seed positive := null ) is begin ut.run( @@ -545,7 +599,9 @@ create or replace package body ut is a_include_objects, a_exclude_objects, a_client_character_set, - a_force_manual_rollback + a_force_manual_rollback, + a_random_test_order, + a_random_test_order_seed ); end; @@ -559,7 +615,9 @@ create or replace package body ut is a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null, - a_force_manual_rollback boolean := false + a_force_manual_rollback boolean := false, + a_random_test_order boolean := false, + a_random_test_order_seed positive := null ) is begin ut.run( @@ -572,7 +630,9 @@ create or replace package body ut is a_include_objects, a_exclude_objects, a_client_character_set, - a_force_manual_rollback + a_force_manual_rollback, + a_random_test_order, + a_random_test_order_seed ); end; diff --git a/source/api/ut.pks b/source/api/ut.pks index 25c9e6493..7d3b191b3 100644 --- a/source/api/ut.pks +++ b/source/api/ut.pks @@ -55,7 +55,9 @@ create or replace package ut authid current_user as a_test_file_mappings ut_file_mappings := null, a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, - a_client_character_set varchar2 := null + a_client_character_set varchar2 := null, + a_random_test_order integer := 0, + a_random_test_order_seed positive := null ) return ut_varchar2_rows pipelined; function run( @@ -66,7 +68,9 @@ create or replace package ut authid current_user as a_test_files ut_varchar2_list, a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, - a_client_character_set varchar2 := null + a_client_character_set varchar2 := null, + a_random_test_order integer := 0, + a_random_test_order_seed positive := null ) return ut_varchar2_rows pipelined; function run( @@ -78,7 +82,9 @@ create or replace package ut authid current_user as a_test_file_mappings ut_file_mappings := null, a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, - a_client_character_set varchar2 := null + a_client_character_set varchar2 := null, + a_random_test_order integer := 0, + a_random_test_order_seed positive := null ) return ut_varchar2_rows pipelined; function run( @@ -90,7 +96,9 @@ create or replace package ut authid current_user as a_test_files ut_varchar2_list, a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, - a_client_character_set varchar2 := null + a_client_character_set varchar2 := null, + a_random_test_order integer := 0, + a_random_test_order_seed positive := null ) return ut_varchar2_rows pipelined; function run( @@ -102,7 +110,9 @@ create or replace package ut authid current_user as a_test_file_mappings ut_file_mappings := null, a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, - a_client_character_set varchar2 := null + a_client_character_set varchar2 := null, + a_random_test_order integer := 0, + a_random_test_order_seed positive := null ) return ut_varchar2_rows pipelined; function run( @@ -114,7 +124,9 @@ create or replace package ut authid current_user as a_test_files ut_varchar2_list, a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, - a_client_character_set varchar2 := null + a_client_character_set varchar2 := null, + a_random_test_order integer := 0, + a_random_test_order_seed positive := null ) return ut_varchar2_rows pipelined; procedure run( @@ -126,7 +138,9 @@ create or replace package ut authid current_user as a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null, - a_force_manual_rollback boolean := false + a_force_manual_rollback boolean := false, + a_random_test_order boolean := false, + a_random_test_order_seed positive := null ); procedure run( @@ -138,7 +152,9 @@ create or replace package ut authid current_user as a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null, - a_force_manual_rollback boolean := false + a_force_manual_rollback boolean := false, + a_random_test_order boolean := false, + a_random_test_order_seed positive := null ); procedure run( @@ -151,7 +167,9 @@ create or replace package ut authid current_user as a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null, - a_force_manual_rollback boolean := false + a_force_manual_rollback boolean := false, + a_random_test_order boolean := false, + a_random_test_order_seed positive := null ); procedure run( @@ -164,7 +182,9 @@ create or replace package ut authid current_user as a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null, - a_force_manual_rollback boolean := false + a_force_manual_rollback boolean := false, + a_random_test_order boolean := false, + a_random_test_order_seed positive := null ); procedure run( @@ -177,7 +197,9 @@ create or replace package ut authid current_user as a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null, - a_force_manual_rollback boolean := false + a_force_manual_rollback boolean := false, + a_random_test_order boolean := false, + a_random_test_order_seed positive := null ); procedure run( @@ -190,7 +212,9 @@ create or replace package ut authid current_user as a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null, - a_force_manual_rollback boolean := false + a_force_manual_rollback boolean := false, + a_random_test_order boolean := false, + a_random_test_order_seed positive := null ); /** diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index 10485c346..28ec1a610 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -88,13 +88,16 @@ create or replace package body ut_runner is a_exclude_objects ut_varchar2_list := null, a_fail_on_errors boolean := false, a_client_character_set varchar2 := null, - a_force_manual_rollback boolean := false + a_force_manual_rollback boolean := false, + a_random_test_order boolean := false, + a_random_test_order_seed positive := null ) is - l_run ut_run; - l_coverage_schema_names ut_varchar2_rows; - l_exclude_object_names ut_object_names := ut_object_names(); - l_include_object_names ut_object_names; - l_paths ut_varchar2_list := ut_varchar2_list(); + l_run ut_run; + l_coverage_schema_names ut_varchar2_rows; + l_exclude_object_names ut_object_names := ut_object_names(); + l_include_object_names ut_object_names; + l_paths ut_varchar2_list := ut_varchar2_list(); + l_random_test_order_seed positive; begin ut_event_manager.initialize(); if a_reporters is not empty then @@ -107,7 +110,12 @@ create or replace package body ut_runner is ut_event_manager.trigger_event(ut_event_manager.gc_initialize); ut_event_manager.trigger_event(ut_event_manager.gc_debug, ut_run_info()); - + if a_random_test_order_seed is not null then + l_random_test_order_seed := a_random_test_order_seed; + elsif a_random_test_order then + dbms_random.seed( to_char(systimestamp,'yyyyddmmhh24missffff') ); + l_random_test_order_seed := trunc(dbms_random.value(1, 1000000000)); + end if; if a_paths is null or a_paths is empty or a_paths.count = 1 and a_paths(1) is null then l_paths := ut_varchar2_list(sys_context('userenv', 'current_schema')); else @@ -144,10 +152,11 @@ create or replace package body ut_runner is l_include_object_names, set(a_source_file_mappings), set(a_test_file_mappings), - a_client_character_set + a_client_character_set, + l_random_test_order_seed ); - ut_suite_manager.configure_execution_by_path(l_paths, l_run.items); + ut_suite_manager.configure_execution_by_path(l_paths, l_run.items, l_random_test_order_seed); if a_force_manual_rollback then l_run.set_rollback_type( a_rollback_type => ut_utils.gc_rollback_manual, a_force => true ); end if; diff --git a/source/api/ut_runner.pks b/source/api/ut_runner.pks index e111933b5..ab2e1f6bb 100644 --- a/source/api/ut_runner.pks +++ b/source/api/ut_runner.pks @@ -68,7 +68,9 @@ create or replace package ut_runner authid current_user is a_exclude_objects ut_varchar2_list := null, a_fail_on_errors boolean := false, a_client_character_set varchar2 := null, - a_force_manual_rollback boolean := false + a_force_manual_rollback boolean := false, + a_random_test_order boolean := false, + a_random_test_order_seed positive := null ); /** diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index 6dbe1d3ec..87ad51475 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -249,5 +249,38 @@ create or replace package body ut_annotation_manager as ut_annotation_cache_manager.purge_cache(a_object_owner, a_object_type); end; + function hash_suite_path(a_path varchar2, a_random_seed positiven) return varchar2 is + l_start_pos pls_integer := 1; + l_end_pos pls_integer := 1; + l_result varchar2(4000); + l_item varchar2(4000); + l_at_end boolean := false; + begin + if a_random_seed is null then + l_result := a_path; + end if; + if a_path is not null then + loop + l_end_pos := instr(a_path,'.',l_start_pos); + if l_end_pos = 0 then + l_end_pos := length(a_path)+1; + l_at_end := true; + end if; + l_item := substr(a_path,l_start_pos,l_end_pos-l_start_pos); + if l_item is not null then + l_result := + l_result || + dbms_crypto.hash( + to_char( dbms_utility.get_hash_value( l_item, 1, a_random_seed ) ), + dbms_crypto.hash_sh1 + ); + end if; + exit when l_at_end; + l_result := l_result || chr(0); + l_start_pos := l_end_pos + 1; + end loop; + end if; + return l_result; + end; end ut_annotation_manager; / diff --git a/source/core/annotations/ut_annotation_manager.pks b/source/core/annotations/ut_annotation_manager.pks index 829142bd5..25de25d58 100644 --- a/source/core/annotations/ut_annotation_manager.pks +++ b/source/core/annotations/ut_annotation_manager.pks @@ -51,5 +51,8 @@ create or replace package ut_annotation_manager authid current_user as */ procedure purge_cache(a_object_owner varchar2, a_object_type varchar2); + + function hash_suite_path(a_path varchar2, a_random_seed positiven) return varchar2; + end ut_annotation_manager; / diff --git a/source/core/types/ut_run.tpb b/source/core/types/ut_run.tpb index 21a5ef36e..d5ace34a7 100644 --- a/source/core/types/ut_run.tpb +++ b/source/core/types/ut_run.tpb @@ -18,23 +18,22 @@ create or replace type body ut_run as constructor function ut_run( self in out nocopy ut_run, - a_items ut_suite_items, - a_run_paths ut_varchar2_list := null, - a_schema_names ut_varchar2_rows := null, - a_exclude_objects ut_object_names := null, - a_include_objects ut_object_names := null, - a_project_file_mappings ut_file_mappings := null, - a_test_file_mappings ut_file_mappings := null, - a_client_character_set varchar2 := null + a_items ut_suite_items, + a_run_paths ut_varchar2_list := null, + a_schema_names ut_varchar2_rows := null, + a_exclude_objects ut_object_names := null, + a_include_objects ut_object_names := null, + a_project_file_mappings ut_file_mappings := null, + a_test_file_mappings ut_file_mappings := null, + a_client_character_set varchar2 := null, + a_random_test_order_seed positive := null ) return self as result is - l_coverage_schema_names ut_varchar2_rows; - l_coverage_options ut_coverage_options; - l_exclude_objects ut_object_names; - begin + begin self.run_paths := a_run_paths; self.self_type := $$plsql_unit; self.items := a_items; self.client_character_set := lower(a_client_character_set); + self.random_test_order_seed := a_random_test_order_seed; self.results_count := ut_results_counter(); self.test_file_mappings := coalesce(a_test_file_mappings, ut_file_mappings()); self.coverage_options := ut_coverage_options( diff --git a/source/core/types/ut_run.tps b/source/core/types/ut_run.tps index e4309e126..5d5e65367 100644 --- a/source/core/types/ut_run.tps +++ b/source/core/types/ut_run.tps @@ -24,16 +24,18 @@ create or replace type ut_run under ut_suite_item ( coverage_options ut_coverage_options, test_file_mappings ut_file_mappings, client_character_set varchar2(100), + random_test_order_seed number(38,0), constructor function ut_run( self in out nocopy ut_run, - a_items ut_suite_items, - a_run_paths ut_varchar2_list := null, - a_schema_names ut_varchar2_rows := null, - a_exclude_objects ut_object_names := null, - a_include_objects ut_object_names := null, - a_project_file_mappings ut_file_mappings := null, - a_test_file_mappings ut_file_mappings := null, - a_client_character_set varchar2 := null + a_items ut_suite_items, + a_run_paths ut_varchar2_list := null, + a_schema_names ut_varchar2_rows := null, + a_exclude_objects ut_object_names := null, + a_include_objects ut_object_names := null, + a_project_file_mappings ut_file_mappings := null, + a_test_file_mappings ut_file_mappings := null, + a_client_character_set varchar2 := null, + a_random_test_order_seed positive := null ) return self as result, overriding member procedure mark_as_skipped(self in out nocopy ut_run), overriding member function do_execute(self in out nocopy ut_run) return boolean, diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index e2098caf9..51d3fa1e4 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -355,11 +355,12 @@ create or replace package body ut_suite_manager is end; function get_cached_suite_data( - a_object_owner varchar2, - a_path varchar2 := null, - a_object_name varchar2 := null, - a_procedure_name varchar2 := null, - a_skip_all_objects boolean := false + a_object_owner varchar2, + a_path varchar2 := null, + a_object_name varchar2 := null, + a_procedure_name varchar2 := null, + a_skip_all_objects boolean := false, + a_random_seed positive ) return t_cached_suites_cursor is l_path varchar2( 4000 ); l_result sys_refcursor; @@ -452,16 +453,25 @@ create or replace package body ut_suite_manager is ) select c.* from items c - order by c.object_owner, - replace(case - when c.self_type in ( 'UT_TEST' ) - then substr(c.path, 1, instr(c.path, '.', -1) ) - else c.path - end, '.', chr(0)) desc nulls last, + order by c.object_owner,]'|| + case + when a_random_seed is null then q'[ + replace( + case + when c.self_type in ( 'UT_TEST' ) + then substr(c.path, 1, instr(c.path, '.', -1) ) + else c.path + end, '.', chr(0) + ) desc nulls last, c.object_name desc, - c.line_no]' - using l_path, l_path, upper(a_object_name), upper(a_procedure_name); - + c.line_no, + :a_random_seed]' + else + l_ut_owner||'.ut_annotation_manager.hash_suite_path( + c.path, :a_random_seed + ) desc nulls last' + end + using l_path, l_path, upper(a_object_name), upper(a_procedure_name), a_random_seed; return l_result; end; @@ -547,7 +557,8 @@ create or replace package body ut_suite_manager is a_path varchar2 := null, a_object_name varchar2 := null, a_procedure_name varchar2 := null, - a_suites in out nocopy ut_suite_items + a_suites in out nocopy ut_suite_items, + a_random_seed positive ) is begin refresh_cache(a_owner_name); @@ -559,7 +570,8 @@ create or replace package body ut_suite_manager is a_path, a_object_name, a_procedure_name, - can_skip_all_objects_scan(a_owner_name) + can_skip_all_objects_scan(a_owner_name), + a_random_seed ) ); @@ -588,7 +600,8 @@ create or replace package body ut_suite_manager is a_path, a_object_name, a_procedure_name, - a_skip_all_objects + a_skip_all_objects, + null ) ); return l_suites; @@ -639,14 +652,18 @@ create or replace package body ut_suite_manager is return resolve_schema_names(l_paths); end; - function configure_execution_by_path(a_paths in ut_varchar2_list) return ut_suite_items is + function configure_execution_by_path(a_paths ut_varchar2_list, a_random_seed positive := null) return ut_suite_items is l_suites ut_suite_items := ut_suite_items(); begin configure_execution_by_path(a_paths, l_suites ); return l_suites; end; - procedure configure_execution_by_path(a_paths in ut_varchar2_list, a_suites out nocopy ut_suite_items) is + procedure configure_execution_by_path( + a_paths in ut_varchar2_list, + a_suites out nocopy ut_suite_items, + a_random_seed in positive := null + ) is l_paths ut_varchar2_list := a_paths; l_path_items t_path_items; l_path_item t_path_item; @@ -671,7 +688,8 @@ create or replace package body ut_suite_manager is l_path_item.suite_path, l_path_item.object_name, l_path_item.procedure_name, - a_suites + a_suites, + a_random_seed ); if a_suites.count = l_suites_count then if l_path_item.suite_path is not null then diff --git a/source/core/ut_suite_manager.pks b/source/core/ut_suite_manager.pks index 5fd82f9be..debfd4ac1 100644 --- a/source/core/ut_suite_manager.pks +++ b/source/core/ut_suite_manager.pks @@ -37,7 +37,7 @@ create or replace package ut_suite_manager authid current_user is * @return array containing root suites-ready to be executed * */ - function configure_execution_by_path(a_paths in ut_varchar2_list) return ut_suite_items; + function configure_execution_by_path(a_paths ut_varchar2_list, a_random_seed positive := null) return ut_suite_items; /** * Builds a hierarchical suites based on given suite-paths @@ -46,7 +46,11 @@ create or replace package ut_suite_manager authid current_user is * @param a_suites returned array containing root suites-ready to be executed * */ - procedure configure_execution_by_path(a_paths in ut_varchar2_list, a_suites out nocopy ut_suite_items); + procedure configure_execution_by_path( + a_paths in ut_varchar2_list, + a_suites out nocopy ut_suite_items, + a_random_seed in positive := null + ); /** * Cleanup paths by removing leading/trailing whitespace and making paths lowercase diff --git a/source/reporters/ut_documentation_reporter.tpb b/source/reporters/ut_documentation_reporter.tpb index df6c25ab0..7cf9a02cc 100644 --- a/source/reporters/ut_documentation_reporter.tpb +++ b/source/reporters/ut_documentation_reporter.tpb @@ -209,6 +209,9 @@ create or replace type body ut_documentation_reporter is else self.print_green_text(l_summary_text); end if; + if a_run.random_test_order_seed is not null then + self.print_text('Tests were executed with random order seed '''||a_run.random_test_order_seed||'''.'); + end if; self.print_text(' '); (self as ut_reporter_base).after_calling_run(a_run); end; diff --git a/test/api/test_ut_run.pkb b/test/api/test_ut_run.pkb index 9e9fce0f7..48c45e712 100644 --- a/test/api/test_ut_run.pkb +++ b/test/api/test_ut_run.pkb @@ -1012,5 +1012,56 @@ Failures:% execute immediate 'drop package test_distributed_savepoint'; end; + procedure remove_time_from_results(a_results in out nocopy ut3.ut_varchar2_list) is + begin + for i in 1 .. a_results.count loop + a_results(i) := regexp_replace(a_results(i),'\[[0-9]*\.[0-9]+ sec\]',''); + a_results(i) := regexp_replace(a_results(i),'Finished in [0-9]*\.[0-9]+ seconds',''); + end loop; + end; + procedure run_with_random_order is + l_random_results ut3.ut_varchar2_list; + l_results ut3.ut_varchar2_list; + begin + select * bulk collect into l_random_results + from table ( ut3.ut.run( 'ut3$user#.test_package_1', a_random_test_order_seed => 3 ) ); + select * bulk collect into l_results + from table ( ut3.ut.run( 'ut3$user#.test_package_1' ) ); + + remove_time_from_results(l_results); + remove_time_from_results(l_random_results); + l_random_results.delete(l_random_results.count-1); + + ut.expect(anydata.convertCollection(l_random_results)).to_equal(anydata.convertCollection(l_results)).unordered(); + ut.expect(anydata.convertCollection(l_random_results)).not_to_equal(anydata.convertCollection(l_results)); + end; + + procedure run_and_report_random_ord_seed is + l_actual ut3.ut_varchar2_list; + begin + select * bulk collect into l_actual + from table ( ut3.ut.run( 'ut3$user#.test_package_1', a_random_test_order_seed => 123456789 ) ); + + ut.expect( ut3.ut_utils.table_to_clob(l_actual) ).to_be_like( q'[%Tests were executed with random order seed '123456789'.%]' ); + end; + + procedure run_with_random_order_seed is + l_expected ut3.ut_varchar2_list; + l_actual ut3.ut_varchar2_list; + begin + + select * bulk collect into l_expected + from table ( ut3.ut.run( 'ut3$user#.test_package_1', a_random_test_order_seed => 3 ) ); + select * bulk collect into l_actual + from table ( ut3.ut.run( 'ut3$user#.test_package_1', a_random_test_order_seed => 3 ) ); + + remove_time_from_results(l_actual); + remove_time_from_results(l_expected); + l_actual.delete(l_actual.count); + l_expected.delete(l_expected.count); + + ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).unordered(); + end; + end; / diff --git a/test/api/test_ut_run.pks b/test/api/test_ut_run.pks index 55d19e866..a2fae4b1f 100644 --- a/test/api/test_ut_run.pks +++ b/test/api/test_ut_run.pks @@ -144,5 +144,21 @@ create or replace package test_ut_run is procedure drop_bad_annot; --%endcontext + --%context(random_order) + --%displayname(Random test execution order) + --%beforeall(create_ut3$user#_tests) + --%afterall(drop_ut3$user#_tests) + + --%test(Runs tests in random order) + procedure run_with_random_order; + + --%test(Reports test random_test_order_seed) + procedure run_and_report_random_ord_seed; + + --%test(Runs tests in the same random order with provided seed) + procedure run_with_random_order_seed; + + --%endcontext + end; / From 174dcbc9a90ffa56a827dba5d61882ca7fb38330 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Tue, 26 Mar 2019 23:46:14 +0000 Subject: [PATCH 0360/1096] Adding set of tests: api/test_ut_run --- test/install_ut3_user_tests.sql | 2 + test/ut3_tester_helper/main_helper.pks | 2 +- test/ut3_tester_helper/run_helper.pkb | 309 ++++++++++++++++++++++++- test/ut3_tester_helper/run_helper.pks | 26 +++ 4 files changed, 327 insertions(+), 12 deletions(-) diff --git a/test/install_ut3_user_tests.sql b/test/install_ut3_user_tests.sql index d30814439..583c844be 100644 --- a/test/install_ut3_user_tests.sql +++ b/test/install_ut3_user_tests.sql @@ -19,6 +19,7 @@ prompt Install user tests @@ut3_user/expectations/test_expectation_anydata.pks @@ut3_user/expectations/test_expectations_cursor.pks @@ut3_user/api/test_ut_runner.pks +@@ut3_user/api/test_ut_run.pks @@ut3_user/expectations/unary/test_expect_not_to_be_null.pkb @@ut3_user/expectations/unary/test_expect_to_be_null.pkb @@ -34,6 +35,7 @@ prompt Install user tests @@ut3_user/expectations/test_expectation_anydata.pkb @@ut3_user/expectations/test_expectations_cursor.pkb @@ut3_user/api/test_ut_runner.pkb +@@ut3_user/api/test_ut_run.pkb set linesize 200 set define on diff --git a/test/ut3_tester_helper/main_helper.pks b/test/ut3_tester_helper/main_helper.pks index 8f904501f..dab973dfc 100644 --- a/test/ut3_tester_helper/main_helper.pks +++ b/test/ut3_tester_helper/main_helper.pks @@ -26,6 +26,6 @@ create or replace package main_helper is procedure reset_nulls_equal; procedure nulls_are_equal(a_nulls_equal boolean := true); - + end; / diff --git a/test/ut3_tester_helper/run_helper.pkb b/test/ut3_tester_helper/run_helper.pkb index 0ab574e9d..8b9353f38 100644 --- a/test/ut3_tester_helper/run_helper.pkb +++ b/test/ut3_tester_helper/run_helper.pkb @@ -48,18 +48,33 @@ create or replace package body run_helper is execute immediate q'[drop procedure ut3_tester_helper.dummy_test_procedure]'; end; - procedure db_link_setup is + procedure create_db_link is l_service_name varchar2(100); - begin - select global_name into l_service_name from global_name; - execute immediate - 'create public database link db_loopback connect to ut3$user# identified by ut3 + pragma autonomous_transaction; + begin + select global_name into l_service_name from global_name; + execute immediate + 'create public database link db_loopback connect to ut3_tester_helper identified by ut3 using ''(DESCRIPTION= (ADDRESS=(PROTOCOL=TCP) (HOST='||sys_context('userenv','SERVER_HOST')||') - (PORT=1521) - ) - (CONNECT_DATA=(SERVICE_NAME='||l_service_name||')))'''; + (PORT=1521) + ) + (CONNECT_DATA=(SERVICE_NAME='||l_service_name||')))'''; + end; + + procedure drop_db_link is + begin + execute immediate 'drop public database link db_loopback'; + exception + when others then + null; + end; + + procedure db_link_setup is + l_service_name varchar2(100); + begin + create_db_link; execute immediate q'[ create or replace package ut3$user#.test_db_link is --%suite @@ -79,13 +94,285 @@ create or replace package body run_helper is end; end;]'; - end; + end; procedure db_link_cleanup is begin - begin execute immediate 'drop public database link db_loopback'; exception when others then null; end; + drop_db_link; begin execute immediate 'drop package ut3$user#.test_db_link'; exception when others then null; end; end; - + + procedure create_suite_with_link is + pragma autonomous_transaction; + begin + create_db_link; + execute immediate 'create table tst(id number(18,0))'; + execute immediate q'[ + create or replace package test_distributed_savepoint is + --%suite + --%suitepath(alltests) + + --%beforeall + procedure setup; + + --%test + procedure test; + end;]'; + + execute immediate q'[ + create or replace package body test_distributed_savepoint is + + g_expected constant integer := 1; + + procedure setup is + begin + insert into tst@db_loopback values(g_expected); + end; + + procedure test is + l_actual integer := 0; + begin + select id into l_actual from tst@db_loopback; + + ut.expect(l_actual).to_equal(g_expected); + end; + + end;]'; + execute immediate 'grant execute on test_distributed_savepoint to public'; + end; + + procedure drop_suite_with_link is + pragma autonomous_transaction; + begin + drop_db_link; + execute immediate 'drop table tst'; + execute immediate 'drop package test_distributed_savepoint'; + end; + + procedure create_ut3$user#_tests is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package test_package_1 is + --%suite + --%suitepath(tests) + --%rollback(manual) + + --%test(Test1 from test package 1) + procedure test1; + + --%test(Test2 from test package 1) + procedure test2; + + end test_package_1; + ]'; + execute immediate q'[create or replace package body test_package_1 is + procedure test1 is + begin + dbms_output.put_line('test_package_1.test1 executed'); + raise_application_error(-20111,'test'); + end; + procedure test2 is + begin + dbms_output.put_line('test_package_1.test2 executed'); + end; + end test_package_1; + ]'; + + execute immediate q'[create or replace package test_package_2 is + --%suite + --%suitepath(tests.test_package_1) + + --%test + procedure test1; + + --%test + procedure test2; + + end test_package_2; + ]'; + execute immediate q'[create or replace package body test_package_2 is + procedure test1 is + begin + dbms_output.put_line('test_package_2.test1 executed'); + end; + procedure test2 is + begin + dbms_output.put_line('test_package_2.test2 executed'); + end; + end test_package_2; + ]'; + + execute immediate q'[create or replace package test_package_3 is + --%suite + --%suitepath(tests2) + + --%test + procedure test1; + + --%test + procedure test2; + + end test_package_3; + ]'; + execute immediate q'[create or replace package body test_package_3 is + procedure test1 is + begin + dbms_output.put_line('test_package_3.test1 executed'); + end; + procedure test2 is + begin + dbms_output.put_line('test_package_3.test2 executed'); + end; + end test_package_3; + ]'; + execute immediate q'[grant execute on test_package_1 to public]'; + execute immediate q'[grant execute on test_package_2 to public]'; + execute immediate q'[grant execute on test_package_3 to public]'; + end; + + procedure drop_ut3$user#_tests is + pragma autonomous_transaction; + begin + execute immediate q'[drop package test_package_1]'; + execute immediate q'[drop package test_package_2]'; + execute immediate q'[drop package test_package_3]'; + end; + + procedure create_test_suite is + pragma autonomous_transaction; + begin + ut3_tester_helper.run_helper.create_db_link; + execute immediate q'[ + create or replace package stateful_package as + function get_state return varchar2; + end; + ]'; + execute immediate q'[ + create or replace package body stateful_package as + g_state varchar2(1) := 'A'; + function get_state return varchar2 is begin return g_state; end; + end; + ]'; + execute immediate q'[ + create or replace package test_stateful as + --%suite + --%suitepath(test_state) + + --%test + --%beforetest(acquire_state_via_db_link,rebuild_stateful_package) + procedure failing_stateful_test; + + procedure rebuild_stateful_package; + procedure acquire_state_via_db_link; + + end; + ]'; + execute immediate q'{ + create or replace package body test_stateful as + + procedure failing_stateful_test is + begin + ut3.ut.expect(stateful_package.get_state@db_loopback).to_equal('abc'); + end; + + procedure rebuild_stateful_package is + pragma autonomous_transaction; + begin + execute immediate q'[ + create or replace package body stateful_package as + g_state varchar2(3) := 'abc'; + function get_state return varchar2 is begin return g_state; end; + end; + ]'; + end; + + procedure acquire_state_via_db_link is + begin + dbms_output.put_line('stateful_package.get_state@db_loopback='||stateful_package.get_state@db_loopback); + end; + end; + }'; + execute immediate 'grant execute on test_stateful to public'; + end; + + procedure drop_test_suite is + pragma autonomous_transaction; + begin + drop_db_link; + execute immediate 'drop package stateful_package'; + execute immediate 'drop package test_stateful'; + end; + + procedure run(a_reporter ut3.ut_reporter_base := null) is + begin + ut3.ut.run(a_reporter); + end; + + procedure run(a_path varchar2, a_reporter ut3.ut_reporter_base := null) is + begin + ut3.ut.run(a_path, a_reporter); + end; + + procedure run(a_paths ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base := null) is + begin + ut3.ut.run(a_paths, a_reporter); + end; + + procedure run(a_paths ut3.ut_varchar2_list, a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base) is + begin + ut3.ut.run( + a_paths, + a_reporter, + a_source_files => ut3.ut_varchar2_list(), + a_test_files => a_test_files + ); + end; + + function run(a_reporter ut3.ut_reporter_base := null) return ut3.ut_varchar2_list is + l_results ut3.ut_varchar2_list; + begin + select * bulk collect into l_results from table (ut3.ut.run(a_reporter)); + return l_results; + end; + + function run(a_paths ut3.ut_varchar2_list, a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base) return ut3.ut_varchar2_list is + l_results ut3.ut_varchar2_list; + begin + select * bulk collect into l_results from table ( + ut3.ut.run( + a_paths, + a_reporter, a_source_files => ut3.ut_varchar2_list(), + a_test_files => a_test_files + )); + return l_results; + end; + + function run(a_path varchar2, a_reporter ut3.ut_reporter_base := null) + return ut3.ut_varchar2_list is + l_results ut3.ut_varchar2_list; + begin + select * bulk collect into l_results from table (ut3.ut.run(a_path, a_reporter)); + return l_results; + end; + + function run(a_paths ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base := null) + return ut3.ut_varchar2_list is + l_results ut3.ut_varchar2_list; + begin + select * bulk collect into l_results from table (ut3.ut.run(a_paths, a_reporter)); + return l_results; + end; + + function run(a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base) + return ut3.ut_varchar2_list is + l_results ut3.ut_varchar2_list; + begin + select * bulk collect into l_results from table ( + ut3.ut.run( + a_reporter, a_source_files => ut3.ut_varchar2_list(), + a_test_files => a_test_files + )); + return l_results; + end; end; / diff --git a/test/ut3_tester_helper/run_helper.pks b/test/ut3_tester_helper/run_helper.pks index fefd3b546..5611663c2 100644 --- a/test/ut3_tester_helper/run_helper.pks +++ b/test/ut3_tester_helper/run_helper.pks @@ -3,7 +3,33 @@ create or replace package run_helper is procedure setup_cache_objects; procedure setup_cache; procedure cleanup_cache; + procedure create_db_link; + procedure drop_db_link; procedure db_link_setup; procedure db_link_cleanup; + + procedure create_suite_with_link; + procedure drop_suite_with_link; + + procedure create_ut3$user#_tests; + procedure drop_ut3$user#_tests; + + procedure create_test_suite; + procedure drop_test_suite; + + procedure run(a_reporter ut3.ut_reporter_base := null); + procedure run(a_path varchar2, a_reporter ut3.ut_reporter_base := null); + procedure run(a_paths ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base := null); + procedure run(a_paths ut3.ut_varchar2_list, a_test_files ut3.ut_varchar2_list, + a_reporter ut3.ut_reporter_base); + function run(a_reporter ut3.ut_reporter_base := null) return ut3.ut_varchar2_list; + function run(a_paths ut3.ut_varchar2_list, a_test_files ut3.ut_varchar2_list, + a_reporter ut3.ut_reporter_base) return ut3.ut_varchar2_list; + function run(a_path varchar2, a_reporter ut3.ut_reporter_base := null) + return ut3.ut_varchar2_list; + function run(a_paths ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base := null) + return ut3.ut_varchar2_list; + function run(a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base) + return ut3.ut_varchar2_list; end; / From 0c05daf8f947cb0ab414ddb62a71e5438cb8b5c8 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Tue, 26 Mar 2019 23:55:09 +0000 Subject: [PATCH 0361/1096] Adding set of tests: api/test_ut_run --- test/ut3_user/api/test_ut_run.pkb | 735 ++++++++++++++++++++++++++++++ test/ut3_user/api/test_ut_run.pks | 152 ++++++ 2 files changed, 887 insertions(+) create mode 100644 test/ut3_user/api/test_ut_run.pkb create mode 100644 test/ut3_user/api/test_ut_run.pks diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb new file mode 100644 index 000000000..7b308884f --- /dev/null +++ b/test/ut3_user/api/test_ut_run.pkb @@ -0,0 +1,735 @@ +create or replace package body test_ut_run is + + procedure clear_expectations is + begin + ut3_tester_helper.main_helper.clear_expectations(); + end; + + procedure create_ut3$user#_tests is + begin + ut3_tester_helper.run_helper.create_ut3$user#_tests(); + end; + + procedure drop_ut3$user#_tests is + begin + ut3_tester_helper.run_helper.drop_ut3$user#_tests(); + end; + + procedure ut_version is + begin + ut.expect(ut3.ut.version()).to_match('^v\d+\.\d+\.\d+\.\d+(-\w+)?$'); + end; + + procedure ut_fail is + begin + --Act + ut3.ut.fail('Testing failure message'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations(1)) + .to_be_like('%Testing failure message%'); + end; + + procedure run_proc_no_params is + l_results clob; + begin + ut3_tester_helper.run_helper.run(); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); + end; + + procedure run_proc_specific_reporter is + l_results clob; + begin + --Act + ut3.ut.run('ut3_tester_helper',a_reporter => ut3.ut_documentation_reporter() ); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); + end; + + procedure run_proc_cov_file_list is + l_results clob; + begin + --Act + ut3.ut.run( + 'ut3_tester_helper', + a_reporter => ut3.ut_sonar_test_reporter(), + a_source_files => ut3.ut_varchar2_list(), + a_test_files => ut3.ut_varchar2_list('tests/ut3_tester_helper.test_package_1.pkb', + 'tests/ut3_tester_helper.test_package_2.pkb', + 'tests/ut3_tester_helper.test_package_3.pkb') + ); + + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%tests/ut3_tester_helper.test_package_2.pkb'|| + '%tests/ut3_tester_helper.test_package_1.pkb'|| + '%tests/ut3_tester_helper.test_package_3.pkb%' ); + end; + + procedure run_proc_pkg_name is + l_results clob; + begin + ut3.ut.run('ut3_tester_helper.test_package_1'); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%test_package_1%' ); + ut.expect( l_results ).not_to_be_like( '%test_package_2%' ); + ut.expect( l_results ).not_to_be_like( '%test_package_3%' ); + end; + + procedure run_proc_pkg_name_file_list is + l_results clob; + begin + ut3.ut.run( + 'ut3_tester_helper.test_package_3', + ut3.ut_sonar_test_reporter(), a_source_files => ut3.ut_varchar2_list(), + a_test_files => ut3.ut_varchar2_list('tests/ut3_tester_helper.test_package_1.pkb', + 'tests/ut3_tester_helper.test_package_2.pkb', + 'tests/ut3_tester_helper.test_package_3.pkb') + ); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%tests/ut3_tester_helper.test_package_3.pkb%' ); + ut.expect( l_results ).not_to_be_like( '%tests/ut3_tester_helper.test_package_1.pkb%' ); + ut.expect( l_results ).not_to_be_like( '%tests/ut3_tester_helper.test_package_2.pkb%' ); + end; + + procedure run_proc_path_list is + l_results clob; + begin + ut3.ut.run(ut3.ut_varchar2_list(':tests.test_package_1',':tests')); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%test_package_1%' ); + ut.expect( l_results ).to_be_like( '%test_package_2%' ); + ut.expect( l_results ).not_to_be_like( '%test_package_3%' ); + end; + + procedure run_proc_path_list_file_list is + l_results clob; + begin + ut3_tester_helper.run_helper.run( + a_paths => ut3.ut_varchar2_list(':tests.test_package_1',':tests'), + a_reporter => ut3.ut_sonar_test_reporter(), + a_test_files => ut3.ut_varchar2_list('tests/ut3_tester_helper.test_package_1.pkb', + 'tests/ut3_tester_helper.test_package_2.pkb', + 'tests/ut3_tester_helper.test_package_3.pkb') + ); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%tests/ut3_tester_helper.test_package_1.pkb%' ); + ut.expect( l_results ).to_be_like( '%tests/ut3_tester_helper.test_package_2.pkb%' ); + ut.expect( l_results ).not_to_be_like( '%tests/ut3_tester_helper.test_package_3.pkb%' ); + end; + + procedure run_proc_null_reporter is + l_results clob; + begin + --Act + ut3.ut.run('ut3_tester_helper', cast(null as ut3.ut_reporter_base)); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%tests%test_package_1%test_package_2%tests2%test_package_3%' ); + end; + + procedure run_proc_null_path is + l_results clob; + begin + --Act + ut3_tester_helper.run_helper.run(cast(null as varchar2)); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); + end; + + procedure run_proc_null_path_list is + l_results clob; + l_paths ut3.ut_varchar2_list; + begin + --Act + ut3_tester_helper.run_helper.run(l_paths); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); + end; + + procedure run_proc_empty_path_list is + l_results clob; + begin + --Act + ut3_tester_helper.run_helper.run(ut3.ut_varchar2_list()); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); + end; + + procedure create_suite_with_commit is + pragma autonomous_transaction; + begin + execute immediate 'create or replace package test_commit_warning is + --%suite + --%suitepath(ut.run.transaction) + + --%test + procedure does_commit; + end;'; + execute immediate 'create or replace package body test_commit_warning is + procedure does_commit is + begin + ut3.ut.expect(1).to_equal(1); + commit; + end; + end;'; + end; + + procedure drop_suite_with_commit is + pragma autonomous_transaction; + begin + execute immediate 'drop package test_commit_warning'; + end; + + procedure run_proc_warn_on_commit is + l_results clob; + begin + ut3.ut.run('test_commit_warning'); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + ut.expect(l_results).to_be_like( + '%Unable to perform automatic rollback after test%'|| + 'An implicit or explicit commit/rollback occurred in procedures:%' || + 'does_commit%' || + 'Use the "--%rollback(manual)" annotation or remove commit/rollback/ddl statements that are causing the issue.%' + ); + end; + + procedure create_failing_beforeall_suite is + pragma autonomous_transaction; + begin + execute immediate 'create or replace package parent_suite is + --%suite + --%suitepath(ut.run.failing_setup) + + --%beforeall + procedure failing_setup; + end;'; + execute immediate 'create or replace package body parent_suite is + procedure failing_setup is + begin + raise no_data_found; + end; + end;'; + execute immediate 'create or replace package child_suite is + --%suite + --%suitepath(ut.run.failing_setup.parent_suite.some_sub_suite) + + --%test + procedure does_stuff; + end;'; + execute immediate 'create or replace package body child_suite is + procedure does_stuff is + begin + ut3.ut.expect(1).to_equal(1); + end; + end;'; + end; + + procedure drop_failing_beforeall_suite is + pragma autonomous_transaction; + begin + execute immediate 'drop package parent_suite'; + execute immediate 'drop package child_suite'; + end; + + procedure run_proc_fail_child_suites is + l_results clob; + begin + ut3.ut.run('child_suite'); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + ut.expect(l_results).to_be_like( + '%1) does_stuff%' || + 'ORA-01403: no data found%' || + 'ORA-06512: at "UT3$USER#.PARENT_SUITE%' + ); + end; + + procedure transaction_setup is + pragma autonomous_transaction; + begin + execute immediate 'create table transaction_test_table(message varchar2(100))'; + execute immediate 'create or replace package test_transaction is + --%suite + + --%test + procedure insert_row; + + --%test + procedure insert_and_raise; + end; + '; + execute immediate 'create or replace package body test_transaction is + procedure insert_row is + begin + insert into transaction_test_table values (''2 - inside the test_transaction.insert_row test''); + end; + procedure insert_and_raise is + begin + insert into transaction_test_table values (''2 - inside the test_transaction.insert_row test''); + raise no_data_found; + end; + end; + '; + + end; + + procedure transaction_cleanup is + pragma autonomous_transaction; + begin + begin + execute immediate 'drop table transaction_test_table'; + exception + when others then null; + end; + begin + execute immediate 'drop package test_transaction'; + exception + when others then null; + end; + end; + + procedure run_proc_keep_test_data is + l_expected sys_refcursor; + l_actual sys_refcursor; + l_results clob; + begin + --Arrange + execute immediate ' + insert into transaction_test_table values (''1 - inside the test_ut_run.run_proc_keep_test_changes test'')'; + + --Act + ut3.ut.run('test_transaction.insert_row', a_force_manual_rollback => true); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + + --Assert + open l_expected for + select '1 - inside the test_ut_run.run_proc_keep_test_changes test' as message from dual + union all + select '2 - inside the test_transaction.insert_row test' from dual + order by 1; + + open l_actual for 'select * from transaction_test_table order by 1'; + + ut.expect( l_actual ).to_equal(l_expected); + end; + + procedure run_proc_keep_test_data_raise is + l_expected sys_refcursor; + l_actual sys_refcursor; + l_results clob; + begin + --Arrange + execute immediate ' + insert into transaction_test_table values (''1 - inside the test_ut_run.run_proc_keep_test_changes test'')'; + + --Act + ut3.ut.run('test_transaction.insert_and_raise', a_force_manual_rollback => true); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + + --Assert + open l_expected for + select '1 - inside the test_ut_run.run_proc_keep_test_changes test' as message from dual + union all + select '2 - inside the test_transaction.insert_row test' from dual + order by 1; + + open l_actual for 'select * from transaction_test_table order by 1'; + + ut.expect( l_actual ).to_equal(l_expected); + end; + + procedure run_proc_discard_test_data is + l_expected sys_refcursor; + l_actual sys_refcursor; + l_results clob; + begin + --Arrange + execute immediate ' + insert into transaction_test_table values (''1 - inside the test_ut_run.run_proc_keep_test_changes test'')'; + + --Act + ut3.ut.run('test_transaction.insert_row'); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + + --Assert + open l_expected for + select '1 - inside the test_ut_run.run_proc_keep_test_changes test' as message from dual; + + open l_actual for 'select * from transaction_test_table order by 1'; + + ut.expect( l_actual ).to_equal(l_expected); + end; + + procedure run_func_no_params is + l_results ut3.ut_varchar2_list; + begin + l_results := ut3_tester_helper.run_helper.run(); + --Assert + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); + end; + + procedure run_func_specific_reporter is + l_results ut3.ut_varchar2_list; + begin + --Act + l_results := ut3_tester_helper.run_helper.run(ut3.ut_documentation_reporter()); + --Assert + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); + end; + + procedure run_func_cov_file_list is + l_results ut3.ut_varchar2_list; + begin + --Act + select * bulk collect into l_results from table ( + ut3.ut.run('ut3_tester_helper', + ut3.ut_sonar_test_reporter(), + a_source_files => ut3.ut_varchar2_list(), + a_test_files => ut3.ut_varchar2_list('tests/ut3_tester_helper.test_package_1.pkb', + 'tests/ut3_tester_helper.test_package_2.pkb', + 'tests/ut3_tester_helper.test_package_3.pkb') + )); + --Assert + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%tests/ut3_tester_helper.test_package_2.pkb%tests/ut3_tester_helper.test_package_1.pkb%tests/ut3_tester_helper.test_package_3.pkb%' ); + end; + + procedure run_func_pkg_name is + l_results ut3.ut_varchar2_list; + begin + select * bulk collect into l_results from table (ut3.ut.run('test_package_1')); + --Assert + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_3%' ); + end; + + procedure run_func_pkg_name_file_list is + l_results ut3.ut_varchar2_list; + begin + select * bulk collect into l_results from table ( + ut3.ut.run('ut3_tester_helper.test_package_3', + ut3.ut_sonar_test_reporter(), + a_source_files => ut3.ut_varchar2_list(), + a_test_files => ut3.ut_varchar2_list('tests/ut3_tester_helper.test_package_1.pkb', + 'tests/ut3_tester_helper.test_package_2.pkb', + 'tests/ut3_tester_helper.test_package_3.pkb') + )); + --Assert + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%tests/ut3_tester_helper.test_package_3.pkb%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%tests/ut3_tester_helper.test_package_1.pkb%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%tests/ut3_tester_helper.test_package_2.pkb%' ); + end; + + procedure run_func_path_list is + l_results ut3.ut_varchar2_list; + begin + select * bulk collect into l_results from table (ut3.ut.run(ut3.ut_varchar2_list(':tests.test_package_1',':tests'))); + --Assert + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_2%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_3%' ); + end; + + procedure run_func_path_list_file_list is + l_results ut3.ut_varchar2_list; + begin + l_results := ut3_tester_helper.run_helper.run( + a_paths => ut3.ut_varchar2_list(':tests.test_package_1',':tests'), + a_reporter => ut3.ut_sonar_test_reporter(), + a_test_files => ut3.ut_varchar2_list('tests/ut3_tester_helper.test_package_1.pkb', + 'tests/ut3_tester_helper.test_package_2.pkb', + 'tests/ut3_tester_helper.test_package_3.pkb') + ); + --Assert + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%tests/ut3_tester_helper.test_package_1.pkb%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%tests/ut3_tester_helper.test_package_2.pkb%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%tests/ut3_tester_helper.test_package_3.pkb%' ); + end; + + procedure run_func_null_reporter is + l_results ut3.ut_varchar2_list; + begin + --Act + select * bulk collect into l_results from table (ut3.ut.run('ut3_tester_helper',cast(null as ut3.ut_reporter_base))); + --Assert + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%tests%test_package_1%test_package_2%tests2%test_package_3%' ); + end; + + procedure run_func_null_path is + l_results ut3.ut_varchar2_list; + begin + --Act + l_results := ut3_tester_helper.run_helper.run(cast(null as varchar2)); + --Assert + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); + end; + + procedure run_func_null_path_list is + l_results ut3.ut_varchar2_list; + l_paths ut3.ut_varchar2_list; + begin + --Act + l_results := ut3_tester_helper.run_helper.run(l_paths); + --Assert + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); + end; + + procedure run_func_empty_path_list is + l_results ut3.ut_varchar2_list; + begin + --Act + l_results := ut3_tester_helper.run_helper.run(ut3.ut_varchar2_list()); + --Assert + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); + end; + + procedure run_func_cov_file_lst_null_rep is + l_results ut3.ut_varchar2_list; + begin + --Act + l_results := ut3_tester_helper.run_helper.run( + a_test_files => ut3.ut_varchar2_list('tests/ut3_tester_helper.test_package_1.pkb', + 'tests/ut3_tester_helper.test_package_2.pkb', + 'tests/ut3_tester_helper.test_package_3.pkb'), + a_reporter => cast(null as ut3.ut_reporter_base)); + --Assert + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); + end; + + procedure run_func_empty_suite is + l_results ut3.ut_varchar2_list; + l_expected varchar2(32767); + pragma autonomous_transaction; + begin + --Arrange + execute immediate q'[create or replace package empty_suite as + -- %suite + + procedure not_a_test; + end;]'; + execute immediate q'[create or replace package body empty_suite as + procedure not_a_test is begin null; end; + end;]'; + l_expected := '%empty_suite%0 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%'; + --Act + select * bulk collect into l_results from table(ut3.ut.run('empty_suite')); + + --Assert + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( l_expected ); + + --Cleanup + execute immediate q'[drop package empty_suite]'; + end; + + procedure raise_in_invalid_state is + l_results ut3.ut_varchar2_list; + l_expected varchar2(32767); + begin + --Arrange + l_expected := 'test_state + test_stateful + failing_stateful_test [% sec] (FAILED - 1)% +Failures:% + 1) failing_stateful_test + ORA-04068: existing state of packages (DB_LOOPBACK%) has been discarded + ORA-04061: existing state of package body "%.STATEFUL_PACKAGE" has been invalidated + ORA-04065: not executed, altered or dropped package body "%.STATEFUL_PACKAGE"% + ORA-06512: at line 6% +1 tests, 0 failed, 1 errored, 0 disabled, 0 warning(s)%'; + + --Act + select * bulk collect into l_results from table(ut3.ut.run('ut3_tester_helper.test_stateful')); + + --Assert + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( l_expected ); + ut.fail('Expected exception but nothing was raised'); + exception + when others then + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( l_expected ); + ut.expect(sqlcode).to_equal(-4068); + end; + + procedure create_test_suite is + begin + ut3_tester_helper.run_helper.create_test_suite; + end; + + procedure drop_test_suite is + begin + ut3_tester_helper.run_helper.drop_test_suite; + end; + + procedure run_in_invalid_state is + l_results ut3.ut_varchar2_list; + l_actual clob; + l_expected varchar2(32767); + begin + select * bulk collect into l_results from table(ut3.ut.run('failing_invalid_spec')); + + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + ut.expect(l_actual).to_be_like('%Call params for % are not valid: package does not exist or is invalid: %FAILING_INVALID_SPEC%'); + + end; + + procedure compile_invalid_package is + ex_compilation_error exception; + pragma exception_init(ex_compilation_error,-24344); + pragma autonomous_transaction; + begin + begin + execute immediate q'[ + create or replace package failing_invalid_spec as + --%suite + gv_glob_val non_existing_table.id%type := 0; + + --%test + procedure test1; + end;]'; + exception when ex_compilation_error then null; + end; + begin + execute immediate q'[ + create or replace package body failing_invalid_spec as + procedure test1 is begin ut.expect(1).to_equal(1); end; + end;]'; + exception when ex_compilation_error then null; + end; + end; + procedure drop_invalid_package is + pragma autonomous_transaction; + begin + execute immediate 'drop package failing_invalid_spec'; + end; + + procedure run_and_revalidate_specs is + l_results ut3.ut_varchar2_list; + l_actual clob; + l_is_invalid number; + begin + execute immediate q'[select count(1) from all_objects o where o.owner = :object_owner and o.object_type = 'PACKAGE' + and o.status = 'INVALID' and o.object_name= :object_name]' into l_is_invalid + using 'UT3$USER#','INVALID_PCKAG_THAT_REVALIDATES'; + + select * bulk collect into l_results from table(ut3.ut.run('invalid_pckag_that_revalidates')); + + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + ut.expect(1).to_equal(l_is_invalid); + ut.expect(l_actual).to_be_like('%invalid_pckag_that_revalidates%invalidspecs [% sec]% +%Finished in % seconds% +%1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%'); + + end; + + procedure generate_invalid_spec is + ex_compilation_error exception; + pragma exception_init(ex_compilation_error,-24344); + pragma autonomous_transaction; + begin + + execute immediate q'[ + create or replace package parent_specs as + c_test constant varchar2(1) := 'Y'; + end;]'; + + execute immediate q'[ + create or replace package invalid_pckag_that_revalidates as + --%suite + g_var varchar2(1) := parent_specs.c_test; + + --%test(invalidspecs) + procedure test1; + end;]'; + + execute immediate q'[ + create or replace package body invalid_pckag_that_revalidates as + procedure test1 is begin ut.expect('Y').to_equal(g_var); end; + end;]'; + + -- That should invalidate test package and we can then revers + execute immediate q'[ + create or replace package parent_specs as + c_test_error constant varchar2(1) := 'Y'; + end;]'; + + execute immediate q'[ + create or replace package parent_specs as + c_test constant varchar2(1) := 'Y'; + end;]'; + + end; + procedure drop_invalid_spec is + pragma autonomous_transaction; + begin + execute immediate 'drop package invalid_pckag_that_revalidates'; + execute immediate 'drop package parent_specs'; + end; + + procedure run_and_report_warnings is + l_results ut3.ut_varchar2_list; + l_actual clob; + begin + + select * bulk collect into l_results from table(ut3.ut.run('bad_annotations')); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + + ut.expect(l_actual).to_be_like('%Invalid annotation "--%context". Cannot find following "--%endcontext". Annotation ignored.% +%1 tests, 0 failed, 0 errored, 0 disabled, 1 warning(s)%'); + + end; + + procedure create_bad_annot is + pragma autonomous_transaction; + begin + execute immediate q'[ + create or replace package bad_annotations as + --%suite + + --%context + + --%test(invalidspecs) + procedure test1; + + end;]'; + + execute immediate q'[ + create or replace package body bad_annotations as + procedure test1 is begin ut.expect(1).to_equal(1); end; + end;]'; + + end; + + procedure drop_bad_annot is + pragma autonomous_transaction; + begin + execute immediate 'drop package bad_annotations'; + end; + + procedure create_suite_with_link is + begin + ut3_tester_helper.run_helper.create_suite_with_link; + end; + + procedure drop_suite_with_link is + begin + ut3_tester_helper.run_helper.drop_suite_with_link; + end; + + procedure savepoints_on_db_links is + l_results clob; + begin + ut3.ut.run('ut3_tester_helper.test_distributed_savepoint'); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + ut.expect(l_results).to_be_like('%1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%'); + end; + +end; +/ diff --git a/test/ut3_user/api/test_ut_run.pks b/test/ut3_user/api/test_ut_run.pks new file mode 100644 index 000000000..48fbf351b --- /dev/null +++ b/test/ut3_user/api/test_ut_run.pks @@ -0,0 +1,152 @@ +create or replace package test_ut_run is + --%suite(ut.run) + --%suitepath(utplsql.test_user.api) + + procedure clear_expectations; + + procedure create_ut3$user#_tests; + procedure drop_ut3$user#_tests; + + --%test(ut.version() returns version of the framework) + procedure ut_version; + + --%test(ut.fail() marks test as failed) + --%aftertest(clear_expectations) + procedure ut_fail; + + --%context(ut_run_procedure) + --%displayname(ut.run() procedure options) + --%beforeall(create_ut3$user#_tests) + --%afterall(drop_ut3$user#_tests) + + --%test(Runs all tests in current schema with default reporter when no parameters given) + procedure run_proc_no_params; + --%test(Runs all tests in current schema with specified reporter) + procedure run_proc_specific_reporter; + --%test(Runs all tests in current schema with coverage file list) + procedure run_proc_cov_file_list; + + --%test(Runs given package only with package name given as path) + procedure run_proc_pkg_name; + --%test(Runs all from given package with package name given as path and coverage file list) + procedure run_proc_pkg_name_file_list; + --%test(Runs tests from given paths only with paths list) + procedure run_proc_path_list; + --%test(Runs tests from given paths only with paths list and coverage file list) + procedure run_proc_path_list_file_list; + --%test(Runs all tests in current schema using default reporter when null reporter given) + procedure run_proc_null_reporter; + --%test(Runs all tests in current schema with null path provided) + procedure run_proc_null_path; + --%test(Runs all tests in current schema with null path list given) + procedure run_proc_null_path_list; + --%test(Runs all tests in current schema with empty path list given) + procedure run_proc_empty_path_list; + + procedure create_suite_with_commit; + procedure drop_suite_with_commit; + --%test(Reports a warning if transaction was invalidated by test with automatic rollback) + --%beforetest(create_suite_with_commit) + --%aftertest(drop_suite_with_commit) + procedure run_proc_warn_on_commit; + + + procedure create_failing_beforeall_suite; + procedure drop_failing_beforeall_suite; + --%test(Marks child suite as failed when parent's suite beforeall fails) + --%beforetest(create_failing_beforeall_suite) + --%aftertest(drop_failing_beforeall_suite) + procedure run_proc_fail_child_suites; + + procedure create_suite_with_link; + procedure drop_suite_with_link; + + --%test(Savepoints are working properly on distributed transactions - Issue #839) + --%beforetest(create_suite_with_link) + --%aftertest(drop_suite_with_link) + procedure savepoints_on_db_links; + + --%endcontext + + --%context(run_proc_transaction_control) + + --%beforeall + procedure transaction_setup; + --%afterall + procedure transaction_cleanup; + --%test(Leaves transaction open and uncommitted with a_force_manual_rollback) + procedure run_proc_keep_test_data; + --%test(Leaves transaction open and uncommitted with a_force_manual_rollback with exceptions) + procedure run_proc_keep_test_data_raise; + --%test(Does not impact current transaction when ran without a_force_manual_rollback) + procedure run_proc_discard_test_data; + + --%endcontext + + + --%context(ut_run_function) + --%displayname(ut.run() function options) + --%beforeall(create_ut3$user#_tests) + --%afterall(drop_ut3$user#_tests) + + --%test(Runs all tests in current schema with default reporter when no parameters given) + procedure run_func_no_params; + --%test(Runs all tests in current schema with specified reporter) + procedure run_func_specific_reporter; + --%test(Runs all tests in current schema with coverage file list) + procedure run_func_cov_file_list; + + --%test(Runs given package only with package name given as path) + procedure run_func_pkg_name; + --%test(Runs all from given package with package name given as path and coverage file list) + procedure run_func_pkg_name_file_list; + --%test(Runs tests from given paths with paths list) + procedure run_func_path_list; + --%test(Runs tests from given paths with paths list and coverage file list) + procedure run_func_path_list_file_list; + --%test(Runs all tests in current schema using default reporter when null reporter given) + procedure run_func_null_reporter; + --%test(Runs all tests in current schema with null path provided) + procedure run_func_null_path; + --%test(Runs all tests in current schema with null path list given) + procedure run_func_null_path_list; + --%test(Runs all tests in current schema with empty path list given) + procedure run_func_empty_path_list; + --%test(Runs all tests in current schema with coverage file list and default reporter) + procedure run_func_cov_file_lst_null_rep; + --%test(Executes successfully an empty suite) + procedure run_func_empty_suite; + + --disabled(Makes session wait for lock on 18.1 due to library cache pin wait) + --%test(ut.run - raises after completing all tests if a test fails with ORA-04068 or ORA-04061) + --%beforetest(create_test_suite) + --%aftertest(drop_test_suite) + procedure raise_in_invalid_state; + procedure create_test_suite; + procedure drop_test_suite; + + --%test(ut.run - Does not execute suite when specified package is not valid) + --%beforetest(compile_invalid_package) + --%aftertest(drop_invalid_package) + procedure run_in_invalid_state; + procedure compile_invalid_package; + procedure drop_invalid_package; + + --%test(Invalidate package specs via rebuild but still execute package) + --%beforetest(generate_invalid_spec) + --%aftertest(drop_invalid_spec) + procedure run_and_revalidate_specs; + procedure generate_invalid_spec; + procedure drop_invalid_spec; + + --%test(Provides warnings on invalid annotations) + --%beforetest(create_bad_annot) + --%aftertest(drop_bad_annot) + procedure run_and_report_warnings; + procedure create_bad_annot; + procedure drop_bad_annot; + --%endcontext + +end; +/ + From 10e2f86ec256db18d75e1b2dd99d5bf9ef4e5461 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 27 Mar 2019 00:27:29 +0000 Subject: [PATCH 0362/1096] Fixing one bad test. Workaround for current issue with `unordered()` comparison of blank lines. --- test/api/test_ut_run.pkb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/test/api/test_ut_run.pkb b/test/api/test_ut_run.pkb index 48c45e712..fb18f18b8 100644 --- a/test/api/test_ut_run.pkb +++ b/test/api/test_ut_run.pkb @@ -1019,18 +1019,23 @@ Failures:% a_results(i) := regexp_replace(a_results(i),'Finished in [0-9]*\.[0-9]+ seconds',''); end loop; end; + procedure run_with_random_order is l_random_results ut3.ut_varchar2_list; l_results ut3.ut_varchar2_list; begin select * bulk collect into l_random_results - from table ( ut3.ut.run( 'ut3$user#.test_package_1', a_random_test_order_seed => 3 ) ); + from table ( ut3.ut.run( 'ut3$user#.test_package_1', a_random_test_order_seed => 3 ) ) + where trim(column_value) is not null and column_value not like 'Finished in %' + and column_value not like '%Tests were executed with random order %'; + select * bulk collect into l_results - from table ( ut3.ut.run( 'ut3$user#.test_package_1' ) ); + from table ( ut3.ut.run( 'ut3$user#.test_package_1' ) ) + --TODO this condition should be removed once issues with unordered compare and 'blank text rows' are resolved. + where trim(column_value) is not null and column_value not like 'Finished in %'; remove_time_from_results(l_results); remove_time_from_results(l_random_results); - l_random_results.delete(l_random_results.count-1); ut.expect(anydata.convertCollection(l_random_results)).to_equal(anydata.convertCollection(l_results)).unordered(); ut.expect(anydata.convertCollection(l_random_results)).not_to_equal(anydata.convertCollection(l_results)); @@ -1060,7 +1065,7 @@ Failures:% l_actual.delete(l_actual.count); l_expected.delete(l_expected.count); - ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).unordered(); + ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); end; end; From 4b9133e38b6b00faf602588bbc74522f0ddadd2b Mon Sep 17 00:00:00 2001 From: lwasylow Date: Wed, 27 Mar 2019 08:26:51 +0000 Subject: [PATCH 0363/1096] Fixing issue with null vs null being returned as false. Fixing change in Oracle 12.2+ where XML is stored as binary XML and not preserving insignificant white space. This require store data as clob. --- .../data_values/ut_compound_data_helper.pkb | 6 ++--- .../data_values/ut_compound_data_tmp.sql | 2 +- .../data_values/ut_data_value_refcursor.tpb | 2 +- .../expectations/test_expectation_anydata.pkb | 24 +++++++++++++++++++ .../expectations/test_expectation_anydata.pks | 5 ++++ 5 files changed, 34 insertions(+), 5 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index abb07ee80..4492afeaa 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -34,7 +34,7 @@ create or replace package body ut_compound_data_helper is ,position + x.item_no item_no {:columns:} from {:ut3_owner:}.ut_compound_data_tmp x, - xmltable('/ROWSET/ROW' passing x.item_data columns + xmltable('/ROWSET/ROW' passing xmltype(x.item_data) columns item_data xmltype path '*' ,position for ordinality {:xml_to_columns:} ) ucd @@ -52,7 +52,7 @@ create or replace package body ut_compound_data_helper is ,position + x.item_no item_no {:columns:} from {:ut3_owner:}.ut_compound_data_tmp x, - xmltable('/ROWSET/ROW' passing x.item_data columns + xmltable('/ROWSET/ROW' passing xmltype(x.item_data) columns item_data xmltype path '*' ,position for ordinality {:xml_to_columns:} ) ucd @@ -174,7 +174,7 @@ create or replace package body ut_compound_data_helper is function generate_equal_sql(a_col_name in varchar2) return varchar2 is begin - return ' a.'||a_col_name||q'[ = ]'||' e.'||a_col_name; + return ' decode(a.'||a_col_name||','||' e.'||a_col_name||',1,0) = 1 '; end; function generate_partition_stmt( diff --git a/source/expectations/data_values/ut_compound_data_tmp.sql b/source/expectations/data_values/ut_compound_data_tmp.sql index 0fb5f9544..d433ccb13 100644 --- a/source/expectations/data_values/ut_compound_data_tmp.sql +++ b/source/expectations/data_values/ut_compound_data_tmp.sql @@ -14,7 +14,7 @@ create global temporary table ut_compound_data_tmp( */ data_id raw(32), item_no integer, - item_data xmltype, + item_data clob, item_hash raw(128), pk_hash raw(128), duplicate_no integer, diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 83bd1502f..131612161 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -55,7 +55,7 @@ create or replace type body ut_data_value_refcursor as execute immediate 'insert into ' || l_ut_owner || '.ut_compound_data_tmp(data_id, item_no, item_data) ' || 'values (:self_guid, :self_row_count, :l_xml)' - using in self.data_id, l_set_id, l_xml; + using in self.data_id, l_set_id, l_xml.getclobval(); l_set_id := l_set_id + c_bulk_rows; end loop; ut_expectation_processor.reset_nls_params(); diff --git a/test/core/expectations/test_expectation_anydata.pkb b/test/core/expectations/test_expectation_anydata.pkb index 0b3a93261..1896e48d2 100644 --- a/test/core/expectations/test_expectation_anydata.pkb +++ b/test/core/expectations/test_expectation_anydata.pkb @@ -970,5 +970,29 @@ Rows: [ 60 differences, showing first 20 ] ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; + procedure arr_empty_eq_arr_empty_unord is + begin + --Arrange + g_test_expected := anydata.convertCollection(t_tab_varchar(null)); + g_test_actual := anydata.convertCollection(t_tab_varchar(null)); + + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ).unordered(); + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + + end; + + procedure arr_empty_nqua_arr_e_unord is + begin + --Arrange + g_test_expected := anydata.convertCollection(t_tab_varchar('t')); + g_test_actual := anydata.convertCollection(t_tab_varchar(' ')); + + --Act + ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ).unordered(); + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + + end; + end; / \ No newline at end of file diff --git a/test/core/expectations/test_expectation_anydata.pks b/test/core/expectations/test_expectation_anydata.pks index b9fbda93b..bd0ac95db 100644 --- a/test/core/expectations/test_expectation_anydata.pks +++ b/test/core/expectations/test_expectation_anydata.pks @@ -198,5 +198,10 @@ create or replace package test_expectation_anydata is --%test( Success when anydata object contains data from another anydata) procedure object_to_contain; + --%test ( Empty Array equal empty array ) + procedure arr_empty_eq_arr_empty_unord; + + --%test ( Empty Array not equal array with space ) + procedure arr_empty_nqua_arr_e_unord; end; / From 0a606868abb15413b75d572b503782d5deaf1ddc Mon Sep 17 00:00:00 2001 From: lwasylow Date: Wed, 27 Mar 2019 17:04:24 +0000 Subject: [PATCH 0364/1096] Revert test --- source/expectations/data_values/ut_compound_data_helper.pkb | 4 ++-- source/expectations/data_values/ut_compound_data_tmp.sql | 2 +- source/expectations/data_values/ut_data_value_refcursor.tpb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 4492afeaa..5ac8a4546 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -34,7 +34,7 @@ create or replace package body ut_compound_data_helper is ,position + x.item_no item_no {:columns:} from {:ut3_owner:}.ut_compound_data_tmp x, - xmltable('/ROWSET/ROW' passing xmltype(x.item_data) columns + xmltable('/ROWSET/ROW' passing x.item_data columns item_data xmltype path '*' ,position for ordinality {:xml_to_columns:} ) ucd @@ -52,7 +52,7 @@ create or replace package body ut_compound_data_helper is ,position + x.item_no item_no {:columns:} from {:ut3_owner:}.ut_compound_data_tmp x, - xmltable('/ROWSET/ROW' passing xmltype(x.item_data) columns + xmltable('/ROWSET/ROW' passing x.item_data columns item_data xmltype path '*' ,position for ordinality {:xml_to_columns:} ) ucd diff --git a/source/expectations/data_values/ut_compound_data_tmp.sql b/source/expectations/data_values/ut_compound_data_tmp.sql index d433ccb13..0fb5f9544 100644 --- a/source/expectations/data_values/ut_compound_data_tmp.sql +++ b/source/expectations/data_values/ut_compound_data_tmp.sql @@ -14,7 +14,7 @@ create global temporary table ut_compound_data_tmp( */ data_id raw(32), item_no integer, - item_data clob, + item_data xmltype, item_hash raw(128), pk_hash raw(128), duplicate_no integer, diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 131612161..83bd1502f 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -55,7 +55,7 @@ create or replace type body ut_data_value_refcursor as execute immediate 'insert into ' || l_ut_owner || '.ut_compound_data_tmp(data_id, item_no, item_data) ' || 'values (:self_guid, :self_row_count, :l_xml)' - using in self.data_id, l_set_id, l_xml.getclobval(); + using in self.data_id, l_set_id, l_xml; l_set_id := l_set_id + c_bulk_rows; end loop; ut_expectation_processor.reset_nls_params(); From b7a66da67196d0504526bb94d8cf2dc2fb422c0f Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 28 Mar 2019 00:09:26 +0000 Subject: [PATCH 0365/1096] Fixed bad test. Added `dbms_output.enable` in `core` test package --- test/core.pkb | 1 + test/core/expectations/test_expectation_anydata.pkb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test/core.pkb b/test/core.pkb index 60baa0190..b2405da9f 100644 --- a/test/core.pkb +++ b/test/core.pkb @@ -21,6 +21,7 @@ create or replace package body core is procedure global_setup is begin + dbms_output.enable(null); ut3.ut_coverage.set_develop_mode(true); --improve performance of test execution by disabling all compiler optimizations execute_autonomous('ALTER SESSION SET PLSQL_OPTIMIZE_LEVEL=0'); diff --git a/test/core/expectations/test_expectation_anydata.pkb b/test/core/expectations/test_expectation_anydata.pkb index 1896e48d2..9aa968b09 100644 --- a/test/core/expectations/test_expectation_anydata.pkb +++ b/test/core/expectations/test_expectation_anydata.pkb @@ -989,7 +989,7 @@ Rows: [ 60 differences, showing first 20 ] g_test_actual := anydata.convertCollection(t_tab_varchar(' ')); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ).unordered(); + ut3.ut.expect( g_test_actual ).not_to_equal( g_test_expected ).unordered(); ut.expect(expectations.failed_expectations_data()).to_be_empty(); end; From 80783c3c7cb73e90fbff0ddffd36fbf494938f25 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Thu, 28 Mar 2019 12:24:13 +0000 Subject: [PATCH 0366/1096] Adding set of tests: api/test_ut_run --- test/ut3_user/api/test_ut_run.pkb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index 7b308884f..28b538f20 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -99,7 +99,7 @@ create or replace package body test_ut_run is procedure run_proc_path_list is l_results clob; begin - ut3.ut.run(ut3.ut_varchar2_list(':tests.test_package_1',':tests')); + ut3_tester_helper.run_helper.run(ut3.ut_varchar2_list(':tests.test_package_1',':tests')); l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); --Assert ut.expect( l_results ).to_be_like( '%test_package_1%' ); @@ -405,7 +405,7 @@ create or replace package body test_ut_run is procedure run_func_pkg_name is l_results ut3.ut_varchar2_list; begin - select * bulk collect into l_results from table (ut3.ut.run('test_package_1')); + select * bulk collect into l_results from table (ut3.ut.run('ut3_tester_helper.test_package_1')); --Assert ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%' ); ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2%' ); @@ -432,7 +432,7 @@ create or replace package body test_ut_run is procedure run_func_path_list is l_results ut3.ut_varchar2_list; begin - select * bulk collect into l_results from table (ut3.ut.run(ut3.ut_varchar2_list(':tests.test_package_1',':tests'))); + l_results := ut3_tester_helper.run_helper.run(ut3.ut_varchar2_list(':tests.test_package_1',':tests')); --Assert ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%' ); ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_2%' ); From c4b08afaf378ee7b8cfdbe3f1e9272b658b19c22 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Thu, 28 Mar 2019 12:28:16 +0000 Subject: [PATCH 0367/1096] Adding set of tests: core/annotations/test_annotation_parser core/annotations/test_annot_throws_exception core/annotations/test_annotation_manager --- test/install_ut3_tester_tests.sql | 8 + .../test_annot_throws_exception.pkb | 375 ++++++++++++++ .../test_annot_throws_exception.pks | 76 +++ .../annotations/test_annotation_manager.pkb | 296 +++++++++++ .../annotations/test_annotation_manager.pks | 55 +++ .../annotations/test_annotation_parser.pkb | 461 ++++++++++++++++++ .../annotations/test_annotation_parser.pks | 42 ++ test/ut3_tester_helper/main_helper.pkb | 30 ++ test/ut3_tester_helper/main_helper.pks | 8 + 9 files changed, 1351 insertions(+) create mode 100644 test/ut3_tester/core/annotations/test_annot_throws_exception.pkb create mode 100644 test/ut3_tester/core/annotations/test_annot_throws_exception.pks create mode 100644 test/ut3_tester/core/annotations/test_annotation_manager.pkb create mode 100644 test/ut3_tester/core/annotations/test_annotation_manager.pks create mode 100644 test/ut3_tester/core/annotations/test_annotation_parser.pkb create mode 100644 test/ut3_tester/core/annotations/test_annotation_parser.pks diff --git a/test/install_ut3_tester_tests.sql b/test/install_ut3_tester_tests.sql index 146a3a211..099064fe5 100644 --- a/test/install_ut3_tester_tests.sql +++ b/test/install_ut3_tester_tests.sql @@ -8,11 +8,19 @@ alter session set plsql_optimize_level=0; --Install tests @@ut3_tester/core.pks @@ut3_tester/core/annotations/test_before_after_annotations.pks +@@ut3_tester/core/annotations/test_annotation_parser.pks +@@ut3_tester/core/annotations/test_annot_throws_exception.pks +@@ut3_tester/core/annotations/test_annotation_manager.pks @@ut3_tester/core/expectations/test_expectation_processor.pks + @@ut3_tester/core.pkb @@ut3_tester/core/annotations/test_before_after_annotations.pkb +@@ut3_tester/core/annotations/test_annotation_parser.pkb @@ut3_tester/core/expectations/test_expectation_processor.pkb +@@ut3_tester/core/annotations/test_annotation_manager.pkb +@@ut3_tester/core/annotations/test_annot_throws_exception.pkb + set linesize 200 set define on diff --git a/test/ut3_tester/core/annotations/test_annot_throws_exception.pkb b/test/ut3_tester/core/annotations/test_annot_throws_exception.pkb new file mode 100644 index 000000000..1ad4f19a5 --- /dev/null +++ b/test/ut3_tester/core/annotations/test_annot_throws_exception.pkb @@ -0,0 +1,375 @@ +create or replace package body test_annot_throws_exception +is + g_tests_results clob; + + procedure recollect_tests_results is + pragma autonomous_transaction; + + l_package_spec varchar2(32737); + l_package_body varchar2(32737); + l_exception_spec varchar2(32737); + l_test_results ut3.ut_varchar2_list; + begin + l_exception_spec := q'[ + create or replace package exc_pkg is + c_e_single_exc constant number := -20200; + c_e_dummy constant varchar2(10) := 'dummy'; + c_e_varch_exc constant varchar2(10) := '-20201'; + c_e_list_1 number := -20202; + c_e_list_2 constant number := -20203; + c_e_diff_exc constant number := -20204; + c_e_mix_list constant number := -20205; + c_e_mix_missin constant number := -20206; + + e_some_exception exception; + pragma exception_init(e_some_exception, -20207); + + end;]'; + + l_package_spec := ' + create package annotated_package_with_throws is + --%suite(Dummy package to test annotation throws) + + --%test(Throws same annotated exception) + --%throws(-20145) + procedure raised_same_exception; + + --%test(Throws one of the listed exceptions) + --%throws(-20145,-20146, -20189 ,-20563) + procedure raised_one_listed_exception; + + --%test(Leading zero is ignored in exception list) + --%throws(-01476) + procedure leading_0_exception_no; + + --%test(Throws diff exception) + --%throws(-20144) + procedure raised_diff_exception; + + --%test(Throws empty) + --%throws() + procedure empty_throws; + + --%test(Ignores annotation and fails when exception was thrown) + --%throws(hello,784#,0-=234,,u1234) + procedure bad_paramters_with_except; + + --%test(Ignores annotation and succeeds when no exception thrown) + --%throws(hello,784#,0-=234,,u1234) + procedure bad_paramters_without_except; + + --%test(Detects a valid exception number within many invalid ones) + --%throws(7894562, operaqk, -=1, -1, pow74d, posdfk3) + procedure one_valid_exception_number; + + --%test(Gives failure when a exception is expected and nothing is thrown) + --%throws(-20459, -20136, -20145) + procedure nothing_thrown; + + --%test(Single exception defined as a constant number in package) + --%throws(exc_pkg.c_e_single_exc) + procedure single_exc_const_pkg; + + --%test(Gives success when one of annotated exception using constant is thrown) + --%throws(exc_pkg.c_e_list_1,exc_pkg.c_e_list_2) + procedure list_of_exc_constant; + + --%test(Gives failure when the raised exception is different that the annotated one using variable) + --%throws(exc_pkg.c_e_diff_exc) + procedure fail_not_match_exc; + + --%test(Success when one of exception from mixed list of number and constant is thrown) + --%throws(exc_pkg.c_e_mix_list,-20105) + procedure mixed_exc_list; + + --%test(Success when match exception even if other variable on list dont exists) + --%throws(exc_pkg.c_e_mix_missin,utter_rubbish) + procedure mixed_list_notexi; + + --%test(Success resolve and match named exception defined in pragma exception init) + --%throws(exc_pkg.e_some_exception) + procedure named_exc_pragma; + + --%test(Success resolve and match oracle named exception) + --%throws(NO_DATA_FOUND) + procedure named_exc_ora; + + --%test(Success resolve and match oracle named exception dup val index) + --%throws(DUP_VAL_ON_INDEX) + procedure named_exc_ora_dup_ind; + + --%test(Success map no data 100 to -1403) + --%throws(-1403) + procedure nodata_exc_ora; + + --%test(Success for exception defined as varchar) + --%throws(exc_pkg.c_e_varch_exc) + procedure defined_varchar_exc; + + --%test(Non existing constant exception) + --%throws(dummy.c_dummy); + procedure non_existing_const; + + --%test(Bad exception constant) + --%throws(exc_pkg.c_e_dummy); + procedure bad_exc_const; + + end; + '; + + l_package_body := ' + create package body annotated_package_with_throws is + procedure raised_same_exception is + begin + raise_application_error(-20145, ''Test error''); + end; + + procedure raised_one_listed_exception is + begin + raise_application_error(-20189, ''Test error''); + end; + + procedure leading_0_exception_no is + x integer; + begin + x := 1 / 0; + end; + + procedure raised_diff_exception is + begin + raise_application_error(-20143, ''Test error''); + end; + + procedure empty_throws is + begin + raise_application_error(-20143, ''Test error''); + end; + + procedure bad_paramters_with_except is + begin + raise_application_error(-20143, ''Test error''); + end; + + procedure bad_paramters_without_except is + begin + null; + end; + + procedure one_valid_exception_number is + begin + raise dup_val_on_index; + end; + + procedure nothing_thrown is + begin + null; + end; + + procedure single_exc_const_pkg is + begin + raise_application_error(exc_pkg.c_e_single_exc,''Test''); + end; + + procedure list_of_exc_constant is + begin + raise_application_error(exc_pkg.c_e_list_1,''Test''); + end; + + procedure fail_not_match_exc is + begin + raise NO_DATA_FOUND; + end; + + procedure mixed_exc_list is + begin + raise_application_error(exc_pkg.c_e_mix_list,''Test''); + end; + + procedure mixed_list_notexi is + begin + raise_application_error(exc_pkg.c_e_mix_missin,''Test''); + end; + + procedure named_exc_pragma is + begin + raise exc_pkg.e_some_exception; + end; + + procedure named_exc_ora is + begin + raise NO_DATA_FOUND; + end; + + procedure named_exc_ora_dup_ind is + begin + raise DUP_VAL_ON_INDEX; + end; + + procedure nodata_exc_ora is + begin + raise NO_DATA_FOUND; + end; + + procedure defined_varchar_exc is + begin + raise_application_error(exc_pkg.c_e_varch_exc,''Test''); + end; + + procedure non_existing_const is + begin + raise_application_error(-20143, ''Test error''); + end; + + procedure bad_exc_const is + begin + raise_application_error(-20143, ''Test error''); + end; + + end; + '; + + execute immediate l_exception_spec; + execute immediate l_package_spec; + execute immediate l_package_body; + + + select * bulk collect into l_test_results from table(ut3.ut.run(('annotated_package_with_throws'))); + + g_tests_results := ut3.ut_utils.table_to_clob(l_test_results); + end; + + procedure throws_same_annotated_except is + begin + ut.expect(g_tests_results).to_match('^\s*Throws same annotated exception \[[,\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).not_to_match('raised_same_exception'); + end; + + procedure throws_one_of_annotated_excpt is + begin + ut.expect(g_tests_results).to_match('^\s*Throws one of the listed exceptions \[[,\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).not_to_match('raised_one_listed_exception'); + end; + + procedure throws_with_leading_zero is + begin + ut.expect(g_tests_results).to_match('^\s*Leading zero is ignored in exception list \[[,\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).not_to_match('leading_0_exception_no'); + end; + + procedure throws_diff_annotated_except is + begin + ut.expect(g_tests_results).to_match('^\s*Throws diff exception \[[,\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); + ut.expect(g_tests_results).to_match('raised_diff_exception\s+Actual: -20143 was expected to equal: -20144\s+ORA-20143: Test error\s+ORA-06512: at "UT3_TESTER.ANNOTATED_PACKAGE_WITH_THROWS"'); + end; + + procedure throws_empty is + begin + ut.expect(g_tests_results).to_match('^\s*Throws empty \[[,\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); + ut.expect(g_tests_results).to_match('empty_throws\s*ORA-20143: Test error\s*ORA-06512: at "UT3_TESTER.ANNOTATED_PACKAGE_WITH_THROWS"'); + end; + + procedure bad_paramters_with_except is + begin + ut.expect(g_tests_results).to_match('^\s*Ignores annotation and fails when exception was thrown \[[,\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); + ut.expect(g_tests_results).to_match('bad_paramters_with_except\s*ORA-20143: Test error\s*ORA-06512: at "UT3_TESTER.ANNOTATED_PACKAGE_WITH_THROWS"'); + end; + + procedure bad_paramters_without_except is + begin + ut.expect(g_tests_results).to_match('^\s*Ignores annotation and succeeds when no exception thrown \[[,\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).not_to_match('bad_paramters_without_except'); + end; + + procedure one_valid_exception_number is + begin + ut.expect(g_tests_results).to_match('^\s*Detects a valid exception number within many invalid ones \[[\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).not_to_match('one_valid_exception_number'); + end; + + procedure nothing_thrown is + begin + ut.expect(g_tests_results).to_match('^\s*Gives failure when a exception is expected and nothing is thrown \[[,\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); + ut.expect(g_tests_results).to_match('nothing_thrown\s*Expected one of exceptions \(-20459, -20136, -20145\) but nothing was raised.'); + end; + + procedure single_exc_const_pkg is + begin + ut.expect(g_tests_results).to_match('^\s*Single exception defined as a constant number in package \[[,\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).not_to_match('single_exc_const_pkg'); + end; + + procedure list_of_exc_constant is + begin + ut.expect(g_tests_results).to_match('^\s*Gives success when one of annotated exception using constant is thrown \[[,\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).not_to_match('list_of_exc_constant'); + end; + + procedure fail_not_match_exc is + begin + ut.expect(g_tests_results).to_match('^\s*Gives failure when the raised exception is different that the annotated one using variable \[[,\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); + ut.expect(g_tests_results).to_match('fail_not_match_exc\s+Actual: -1403 was expected to equal: -20204\s+ORA-01403: no data found\s+ORA-06512: at "UT3_TESTER.ANNOTATED_PACKAGE_WITH_THROWS"'); + end; + + procedure mixed_exc_list is + begin + ut.expect(g_tests_results).to_match('^\s*Success when one of exception from mixed list of number and constant is thrown \[[,\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).not_to_match('mixed_exc_list'); + end; + + procedure mixed_list_notexi is + begin + ut.expect(g_tests_results).to_match('^\s*Success when match exception even if other variable on list dont exists \[[,\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).not_to_match('mixed_list_notexi'); + end; + + procedure named_exc_pragma is + begin + ut.expect(g_tests_results).to_match('^\s*Success resolve and match named exception defined in pragma exception init \[[,\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).not_to_match('mixed_list_notexi'); + end; + + procedure named_exc_ora is + begin + ut.expect(g_tests_results).to_match('^\s*Success resolve and match oracle named exception \[[,\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).not_to_match('named_exc_ora'); + end; + + procedure named_exc_ora_dup_ind is + begin + ut.expect(g_tests_results).to_match('^\s*Success resolve and match oracle named exception dup val index \[[,\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).not_to_match('named_exc_ora_dup_ind'); + end; + + procedure nodata_exc_ora is + begin + ut.expect(g_tests_results).to_match('^\s*Success map no data 100 to -1403 \[[,\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).not_to_match('nodata_exc_ora'); + end; + + procedure defined_varchar_exc is + begin + ut.expect(g_tests_results).to_match('^\s*Success for exception defined as varchar \[[,\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).not_to_match('defined_varchar_exc'); + end; + + procedure non_existing_const is + begin + ut.expect(g_tests_results).to_match('^\s*Non existing constant exception \[[,\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); + ut.expect(g_tests_results).to_match('non_existing_const\s*ORA-20143: Test error\s*ORA-06512: at "UT3_TESTER.ANNOTATED_PACKAGE_WITH_THROWS"'); + end; + + procedure bad_exc_const is + begin + ut.expect(g_tests_results).to_match('^\s*Bad exception constant \[[,\.0-9]+ sec\] \(FAILED - [0-9]+\)\s*$','m'); + ut.expect(g_tests_results).to_match('bad_exc_const\s*ORA-20143: Test error\s*ORA-06512: at "UT3_TESTER.ANNOTATED_PACKAGE_WITH_THROWS"'); + end; + + procedure drop_test_package is + pragma autonomous_transaction; + begin + execute immediate 'drop package annotated_package_with_throws'; + execute immediate 'drop package exc_pkg'; + end; + +end; +/ diff --git a/test/ut3_tester/core/annotations/test_annot_throws_exception.pks b/test/ut3_tester/core/annotations/test_annot_throws_exception.pks new file mode 100644 index 000000000..6c2df63b1 --- /dev/null +++ b/test/ut3_tester/core/annotations/test_annot_throws_exception.pks @@ -0,0 +1,76 @@ +create or replace package test_annot_throws_exception +is + --%suite(annotations - throws) + --%suitepath(utplsql.framework_tester.core.annotations) + + --%beforeall + procedure recollect_tests_results; + + --%test(Gives success when annotated number exception is thrown) + procedure throws_same_annotated_except; + + --%test(Gives success when one of the annotated number exceptions is thrown) + procedure throws_one_of_annotated_excpt; + + --%test(Gives success when annotated number exceptions has leading zero) + procedure throws_with_leading_zero; + + --%test(Gives failure when the raised exception is different that the annotated one) + procedure throws_diff_annotated_except; + + --%test(Ignores when the annotation throws is empty) + procedure throws_empty; + + --%test(Ignores when only bad parameters are passed, the test raise a exception and it shows errored test) + procedure bad_paramters_with_except; + + --%test(Ignores when only bad parameters are passed, the test does not raise a exception and it shows successful test) + procedure bad_paramters_without_except; + + --%test(Detects a valid exception number within many invalid ones) + procedure one_valid_exception_number; + + --%test(Gives failure when a exception is expected and nothing is thrown) + procedure nothing_thrown; + + --%test(Single exception defined as a constant number in package) + procedure single_exc_const_pkg; + + --%test(Gives success when one of annotated exception using constant is thrown) + procedure list_of_exc_constant; + + --%test(Gives failure when the raised exception is different that the annotated one using variable) + procedure fail_not_match_exc; + + --%test(Success when one of exception from mixed list of number and constant is thrown) + procedure mixed_exc_list; + + --%test(Success when match exception even if other variable on list dont exists) + procedure mixed_list_notexi; + + --%test(Success resolve and match named exception defined in pragma exception init) + procedure named_exc_pragma; + + --%test(Success resolve and match oracle named exception no data) + procedure named_exc_ora; + + --%test(Success resolve and match oracle named exception dup val index) + procedure named_exc_ora_dup_ind; + + --%test(Success map no data 100 to -1403) + procedure nodata_exc_ora; + + --%test(Success for exception defined as varchar) + procedure defined_varchar_exc; + + --%test(Non existing constant exception) + procedure non_existing_const; + + --%test(Bad exception constant) + procedure bad_exc_const; + + --%afterall + procedure drop_test_package; + +end; +/ diff --git a/test/ut3_tester/core/annotations/test_annotation_manager.pkb b/test/ut3_tester/core/annotations/test_annotation_manager.pkb new file mode 100644 index 000000000..46f0959e8 --- /dev/null +++ b/test/ut3_tester/core/annotations/test_annotation_manager.pkb @@ -0,0 +1,296 @@ +create or replace package body test_annotation_manager is + + procedure create_dummy_package is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package dummy_package as + procedure some_dummy_procedure; + end;]'; + end; + + procedure drop_dummy_package is + pragma autonomous_transaction; + begin + execute immediate q'[drop package dummy_package]'; + end; + + procedure recompile_dummy_package is + pragma autonomous_transaction; + begin + execute immediate q'[alter package dummy_package compile]'; + end; + + procedure create_dummy_test_package is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package dummy_test_package as + --%suite(dummy_test_suite) + --%rollback(manual) + + --%test(dummy_test) + --%beforetest(some_procedure) + procedure some_dummy_test_procedure; + end;]'; + execute immediate q'[grant execute on dummy_test_package to public]'; + end; + + procedure modify_dummy_test_package is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package dummy_test_package as + --%suite(dummy_test_suite) + + --%test(dummy_test) + procedure some_dummy_test_procedure; + end;]'; + end; + + procedure drop_dummy_test_package is + pragma autonomous_transaction; + begin + execute immediate q'[drop package dummy_test_package]'; + end; + + procedure recompile_dummy_test_package is + pragma autonomous_transaction; + begin + execute immediate q'[alter package dummy_test_package compile]'; + end; + + procedure create_parse_proc_as_ut3$user# is + begin + ut3_tester_helper.main_helper.create_parse_proc_as_ut3$user#(); + end; + + procedure parse_dummy_test_as_ut3$user# is + begin + ut3_tester_helper.main_helper.parse_dummy_test_as_ut3$user#(); + end; + + procedure drop_parse_proc_as_ut3$user# is + begin + ut3_tester_helper.main_helper.drop_parse_proc_as_ut3$user#(); + end; + + procedure cleanup_annotation_cache is + begin + ut3_tester_helper.main_helper.cleanup_annotation_cache(); + end; + + + procedure add_new_package is + l_actual_cache_id integer; + l_actual integer; + l_start_date date; + begin + --Act + l_start_date := sysdate; + ut3.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); + --Assert + select max(cache_id) + into l_actual_cache_id + from ut3.ut_annotation_cache_info + where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PACKAGE' and object_name = 'DUMMY_PACKAGE' + and parse_time >= l_start_date; + + ut.expect(l_actual_cache_id).to_be_not_null; + + select count(1) + into l_actual + from ut3.ut_annotation_cache + where cache_id = l_actual_cache_id; + + ut.expect(l_actual).to_equal(0); + + end; + + procedure update_modified_package is + l_actual_cache_id integer; + l_actual integer; + l_start_date date; + begin + --Arrange + l_start_date := sysdate; + ut3.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); + recompile_dummy_package(); + l_start_date := sysdate; + $if dbms_db_version.version >= 18 $then + dbms_session.sleep(1); + $else + dbms_lock.sleep(1); + $end + --Act + ut3.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); + --Assert + select max(cache_id) + into l_actual_cache_id + from ut3.ut_annotation_cache_info + where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PACKAGE' and object_name = 'DUMMY_PACKAGE' + and parse_time >= l_start_date; + + ut.expect(l_actual_cache_id).to_be_not_null; + + select count(1) + into l_actual + from ut3.ut_annotation_cache + where cache_id = l_actual_cache_id; + + ut.expect(l_actual).to_equal(0); + end; + + + procedure add_new_test_package is + l_actual_cache_id integer; + l_actual sys_refcursor; + l_expected sys_refcursor; + l_start_date date; + begin + --Arrange + l_start_date := sysdate; + --Act + ut3.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); + --Assert + select max(cache_id) + into l_actual_cache_id + from ut3.ut_annotation_cache_info + where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PACKAGE' and object_name = 'DUMMY_TEST_PACKAGE' + and parse_time >= l_start_date; + + ut.expect(l_actual_cache_id).to_be_not_null; + + open l_actual for + select annotation_position, annotation_name, annotation_text, subobject_name + from ut3.ut_annotation_cache where cache_id = l_actual_cache_id + order by annotation_position; + + open l_expected for + select 2 as annotation_position, 'suite' as annotation_name, + 'dummy_test_suite' as annotation_text, '' as subobject_name + from dual union all + select 3, 'rollback' , 'manual', '' as subobject_name + from dual union all + select 5, 'test' , 'dummy_test', 'some_dummy_test_procedure' as subobject_name + from dual union all + select 6, 'beforetest' , 'some_procedure', 'some_dummy_test_procedure' as subobject_name + from dual; + + ut.expect(l_actual).to_equal(l_expected); + end; + + + procedure update_modified_test_package is + l_actual_cache_id integer; + l_actual sys_refcursor; + l_expected sys_refcursor; + l_start_date date; + begin + --Arrange + ut3.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); + l_start_date := sysdate; + modify_dummy_test_package(); + --Act + ut3.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); + --Assert + select max(cache_id) + into l_actual_cache_id + from ut3.ut_annotation_cache_info + where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PACKAGE' and object_name = 'DUMMY_TEST_PACKAGE' + and parse_time >= l_start_date; + + ut.expect(l_actual_cache_id).to_be_not_null; + + open l_actual for + select annotation_position, annotation_name, annotation_text, subobject_name + from ut3.ut_annotation_cache where cache_id = l_actual_cache_id + order by annotation_position; + + open l_expected for + select 2 as annotation_position, 'suite' as annotation_name, + 'dummy_test_suite' as annotation_text, to_char(null) as subobject_name + from dual union all + select 4, 'test' , 'dummy_test', 'some_dummy_test_procedure' as subobject_name + from dual; + + ut.expect(l_actual).to_equal(l_expected); + end; + + + procedure keep_dropped_data_in_cache is + l_actual_cache_id integer; + l_actual sys_refcursor; + l_expected sys_refcursor; + l_start_date date; + begin + parse_dummy_test_as_ut3$user#(); + l_start_date := sysdate; + drop_dummy_test_package(); + --Act + parse_dummy_test_as_ut3$user#(); + --Assert + select max(cache_id) + into l_actual_cache_id + from ut3.ut_annotation_cache_info + where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PACKAGE' and object_name = 'DUMMY_TEST_PACKAGE' + and parse_time >= l_start_date; + + ut.expect(l_actual_cache_id).not_to_be_null(); + + open l_actual for + select annotation_position, annotation_name, annotation_text, subobject_name + from ut3.ut_annotation_cache where cache_id = l_actual_cache_id + order by annotation_position; + + open l_expected for + select 2 as annotation_position, 'suite' as annotation_name, + 'dummy_test_suite' as annotation_text, '' as subobject_name + from dual union all + select 3, 'rollback' , 'manual', '' as subobject_name + from dual union all + select 5, 'test' , 'dummy_test', 'some_dummy_test_procedure' as subobject_name + from dual union all + select 6, 'beforetest' , 'some_procedure', 'some_dummy_test_procedure' as subobject_name + from dual; + + ut.expect(l_actual).to_equal(l_expected); + end; + + procedure no_data_for_dropped_object is + l_actual sys_refcursor; + begin + --Arrange + ut3.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); + drop_dummy_test_package(); + --Act + open l_actual for + select * from table(ut3.ut_annotation_manager.get_annotated_objects(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE')) + where object_name = 'DUMMY_TEST_PACKAGE'; + --Assert + ut.expect(l_actual).to_be_empty(); + end; + + procedure cleanup_dropped_data_in_cache is + l_cache_count integer; + l_actual sys_refcursor; + l_expected sys_refcursor; + l_start_date date; + begin + --Arrange + ut3.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); + l_start_date := sysdate; + drop_dummy_test_package(); + --Act + ut3.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); + --Assert + select count(1) + into l_cache_count + from ut3.ut_annotation_cache_info + where object_owner = sys_context('USERENV', 'CURRENT_USER') + and object_type = 'PACKAGE' + and object_name = 'DUMMY_TEST_PACKAGE'; + + ut.expect(l_cache_count).to_equal(0); + + end; + +end test_annotation_manager; +/ diff --git a/test/ut3_tester/core/annotations/test_annotation_manager.pks b/test/ut3_tester/core/annotations/test_annotation_manager.pks new file mode 100644 index 000000000..b40965c74 --- /dev/null +++ b/test/ut3_tester/core/annotations/test_annotation_manager.pks @@ -0,0 +1,55 @@ +create or replace package test_annotation_manager is + + --%suite(ut_annotation_manager) + --%suitepath(utplsql.framework_tester.core.annotations) + + --%aftereach + procedure cleanup_annotation_cache; + + procedure create_dummy_package; + + procedure drop_dummy_package; + + procedure create_dummy_test_package; + + procedure create_parse_proc_as_ut3$user#; + + procedure drop_parse_proc_as_ut3$user#; + + procedure drop_dummy_test_package; + + --%test(Adds new package to annotation cache info) + --%beforetest(create_dummy_package) + --%aftertest(drop_dummy_package) + procedure add_new_package; + + --%test(Updates annotation cache info for modified package) + --%beforetest(create_dummy_package) + --%aftertest(drop_dummy_package) + procedure update_modified_package; + + --%test(Adds annotations to cache for unit test package) + --%beforetest(create_dummy_test_package) + --%aftertest(drop_dummy_test_package) + procedure add_new_test_package; + + --%test(Updates annotations in cache for modified test package) + --%beforetest(create_dummy_test_package) + --%aftertest(drop_dummy_test_package) + procedure update_modified_test_package; + + --%test(Keeps annotations in cache when object was removed but user can't see whole schema) + --%beforetest(create_dummy_test_package,create_parse_proc_as_ut3$user#) + --%aftertest(drop_parse_proc_as_ut3$user#) + procedure keep_dropped_data_in_cache; + + --%test(Does not return data for dropped object) + --%beforetest(create_dummy_test_package) + procedure no_data_for_dropped_object; + + --%test(Remove object from cache when object dropped and user can see whole schema) + --%beforetest(create_dummy_test_package) + procedure cleanup_dropped_data_in_cache; + +end test_annotation_manager; +/ diff --git a/test/ut3_tester/core/annotations/test_annotation_parser.pkb b/test/ut3_tester/core/annotations/test_annotation_parser.pkb new file mode 100644 index 000000000..5345e3a50 --- /dev/null +++ b/test/ut3_tester/core/annotations/test_annotation_parser.pkb @@ -0,0 +1,461 @@ +create or replace package body test_annotation_parser is + + procedure test_proc_comments is + l_source clob; + l_actual ut3.ut_annotations; + l_expected ut3.ut_annotations; + + begin + l_source := 'PACKAGE test_tt AS + -- %suite + -- %displayname(Name of suite) + -- %suitepath(all.globaltests) + + -- %ann1(Name of suite) + -- wrong line + -- %ann2(some_value) + procedure foo; + END;'; + + --Act + l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); + + --Assert + + l_expected := ut3.ut_annotations( + ut3.ut_annotation(2,'suite',null, null), + ut3.ut_annotation(3,'displayname','Name of suite',null), + ut3.ut_annotation(4,'suitepath','all.globaltests',null), + ut3.ut_annotation(6,'ann1','Name of suite',null), + ut3.ut_annotation(8,'ann2','some_value','foo') + ); + + ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); + end; + + procedure include_floating_annotations is + l_source clob; + l_actual ut3.ut_annotations; + l_expected ut3.ut_annotations; + begin + l_source := 'PACKAGE test_tt AS + -- %suite + -- %displayname(Name of suite) + -- %suitepath(all.globaltests) + + -- %ann1(Name of suite) + -- %ann2(all.globaltests) + + --%test + procedure foo; + + -- %ann3(Name of suite) + -- %ann4(all.globaltests) + + --%test + procedure bar; + END;'; + + --Act + l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); + + --Assert + l_expected := ut3.ut_annotations( + ut3.ut_annotation( 2, 'suite', null, null ), + ut3.ut_annotation( 3, 'displayname', 'Name of suite', null ), + ut3.ut_annotation( 4, 'suitepath', 'all.globaltests', null ), + ut3.ut_annotation( 6, 'ann1', 'Name of suite', null ), + ut3.ut_annotation( 7, 'ann2', 'all.globaltests', null ), + ut3.ut_annotation( 9, 'test', null, 'foo'), + ut3.ut_annotation( 12, 'ann3', 'Name of suite', null ), + ut3.ut_annotation( 13, 'ann4', 'all.globaltests', null ), + ut3.ut_annotation( 15, 'test', null, 'bar') + ); + + ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); + + end; + + procedure parse_complex_with_functions is + l_source clob; + l_actual ut3.ut_annotations; + l_expected ut3.ut_annotations; + + begin + l_source := 'PACKAGE test_tt AS + -- %suite + -- %displayname(Name of suite) + -- %suitepath(all.globaltests) + + --%test + procedure foo; + + + --%beforeeach + procedure foo2; + + --test comment + -- wrong comment + + + /* + describtion of the procedure + */ + --%beforeeach(key=testval) + PROCEDURE foo3(a_value number default null); + + --%all + function foo4(a_val number default null + , a_par varchar2 default := ''asdf''); + END;'; + + --Act + l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); + + --Assert + l_expected := ut3.ut_annotations( + ut3.ut_annotation( 2, 'suite', null, null ), + ut3.ut_annotation( 3, 'displayname', 'Name of suite', null ), + ut3.ut_annotation( 4, 'suitepath', 'all.globaltests', null ), + ut3.ut_annotation( 6, 'test', null, 'foo' ), + ut3.ut_annotation( 10, 'beforeeach', null,'foo2' ), + ut3.ut_annotation( 20, 'beforeeach', 'key=testval','foo3' ), + ut3.ut_annotation( 23, 'all', null,'foo4' ) + ); + + ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); + + end; + + procedure no_procedure_annotation is + l_source clob; + l_actual ut3.ut_annotations; + l_expected ut3.ut_annotations; + + begin + l_source := 'PACKAGE test_tt AS + -- %suite + -- %displayname(Name of suite) + -- %suitepath(all.globaltests) + + procedure foo; + END;'; + + --Act + l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); + + --Assert + l_expected := ut3.ut_annotations( + ut3.ut_annotation( 2, 'suite', null, null ), + ut3.ut_annotation( 3, 'displayname', 'Name of suite', null ), + ut3.ut_annotation( 4, 'suitepath', 'all.globaltests', null ) + ); + + ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); + + end; + + procedure parse_accessible_by is + l_source clob; + l_actual ut3.ut_annotations; + l_expected ut3.ut_annotations; + + begin + l_source := 'PACKAGE test_tt accessible by (foo) AS + -- %suite + -- %displayname(Name of suite) + -- %suitepath(all.globaltests) + + procedure foo; + END;'; + + --Act + l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); + + --Assert + l_expected := ut3.ut_annotations( + ut3.ut_annotation( 2, 'suite', null, null ), + ut3.ut_annotation( 3, 'displayname', 'Name of suite', null ), + ut3.ut_annotation( 4, 'suitepath', 'all.globaltests', null ) + ); + + ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); + + end; + + procedure complex_package_declaration is + l_source clob; + l_actual ut3.ut_annotations; + l_expected ut3.ut_annotations; + + begin + l_source := 'PACKAGE test_tt + ACCESSIBLE BY (calling_proc) + authid current_user + AS + -- %suite + -- %displayname(Name of suite) + -- %suitepath(all.globaltests) + + procedure foo; + END;'; + + --Act + l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); + + --Assert + l_expected := ut3.ut_annotations( + ut3.ut_annotation( 5, 'suite', null, null ), + ut3.ut_annotation( 6, 'displayname', 'Name of suite', null ), + ut3.ut_annotation( 7, 'suitepath', 'all.globaltests', null ) + ); + + ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); + + end; + + procedure complex_text is + l_source clob; + l_actual ut3.ut_annotations; + l_expected ut3.ut_annotations; + + begin + l_source := 'PACKAGE test_tt AS + -- %suite + --%displayname(name = Name of suite) + -- %suitepath(key=all.globaltests,key2=foo,"--%some text") + + procedure foo; + END;'; + + --Act + l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); + + --Assert + l_expected := ut3.ut_annotations( + ut3.ut_annotation( 2, 'suite', null, null ), + ut3.ut_annotation( 3, 'displayname', 'name = Name of suite', null ), + ut3.ut_annotation( 4, 'suitepath', 'key=all.globaltests,key2=foo,"--%some text"', null ) + ); + + ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); + + end; + + procedure ignore_annotations_in_comments is + l_source clob; + l_actual ut3.ut_annotations; + l_expected ut3.ut_annotations; + + begin + l_source := 'PACKAGE test_tt AS + /* + Some comment + -- inlined + -- %ignored + */ + -- %suite + --%displayname(Name of suite) + -- %suitepath(all.globaltests) + + procedure foo; + END;'; + + --Act + l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); + + --Assert + l_expected := ut3.ut_annotations( + ut3.ut_annotation( 7, 'suite', null, null ), + ut3.ut_annotation( 8, 'displayname', 'Name of suite', null ), + ut3.ut_annotation( 9, 'suitepath', 'all.globaltests', null ) + ); + + ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); + + end; + + procedure ignore_wrapped_package is + l_source dbms_preprocessor.source_lines_t; + l_actual ut3.ut_annotations; + begin + --Arrange + l_source(1) := 'create or replace PACKAGE tst_wrapped_pck wrapped +a000000 +369 +abcd +abcd +abcd +abcd +abcd +abcd +abcd +abcd +abcd +abcd +abcd +abcd +abcd +abcd +abcd +9 +34 6d +bg9Jaf2KguofrwaqloE8yvbggKcwg5m49TOf9b9cFj7R9JaW8lYWWi70llr/K6V0iwlp5+eb +v58yvbLAXLi9gYHwoIvAgccti+Cmpg0DKLY= +-- %some_annotation_like_text +'; + --Act + l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); + --Assert + ut.expect(anydata.convertCollection(l_actual)).to_be_empty(); + end; + + procedure brackets_in_desc is + + l_source clob; + l_actual ut3.ut_annotations; + l_expected ut3.ut_annotations; + begin + l_source := 'PACKAGE test_tt AS + -- %suite(Name of suite (including some brackets) and some more text) +END;'; + + --Act + l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); + + --Assert + l_expected := ut3.ut_annotations( + ut3.ut_annotation( 2, 'suite', 'Name of suite (including some brackets) and some more text', null ) + ); + + ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); + end; + + procedure test_space_before_annot_params is + l_source clob; + l_actual ut3.ut_annotations; + l_expected ut3.ut_annotations; + + begin + l_source := 'PACKAGE test_tt AS + /* + Some comment + -- inlined + */ + -- %suite + -- %suitepath (all.globaltests) + + procedure foo; +END;'; + + --Act + l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); + + --Assert + l_expected := ut3.ut_annotations( + ut3.ut_annotation( 6, 'suite', null, null ), + ut3.ut_annotation( 7, 'suitepath', 'all.globaltests', null ) + ); + + ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); + end; + + procedure test_windows_newline + as + l_source clob; + l_actual ut3.ut_annotations; + l_expected ut3.ut_annotations; + begin + l_source := 'PACKAGE test_tt AS + -- %suite + -- %displayname(Name of suite)' || chr(13) || chr(10) + || ' -- %suitepath(all.globaltests) + END;'; + + --Act + l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); + + --Assert + l_expected := ut3.ut_annotations( + ut3.ut_annotation( 2, 'suite', null, null ), + ut3.ut_annotation( 3, 'displayname', 'Name of suite', null ), + ut3.ut_annotation( 4, 'suitepath', 'all.globaltests', null ) + ); + + ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); + end; + + procedure test_annot_very_long_name + as + l_source clob; + l_actual ut3.ut_annotations; + l_expected ut3.ut_annotations; + begin + l_source := 'PACKAGE very_long_procedure_name_valid_for_oracle_12_so_utPLSQL_should_allow_it_definitely_well_still_not_reached_128_but_wait_we_did_it AS + -- %suite + -- %displayname(Name of suite) + -- %suitepath(all.globaltests) + + --%test + procedure very_long_procedure_name_valid_for_oracle_12_so_utPLSQL_should_allow_it_definitely_well_still_not_reached_128_but_wait_we_dit_it; + END;'; + + --Act + l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); + + --Assert + l_expected := ut3.ut_annotations( + ut3.ut_annotation( 2, 'suite', null, null ), + ut3.ut_annotation( 3, 'displayname', 'Name of suite', null ), + ut3.ut_annotation( 4, 'suitepath', 'all.globaltests', null ), + ut3.ut_annotation( 6, 'test', null, 'very_long_procedure_name_valid_for_oracle_12_so_utPLSQL_should_allow_it_definitely_well_still_not_reached_128_but_wait_we_dit_it' ) + ); + + ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); + end; + + procedure test_upper_annot is + l_source clob; + l_actual ut3.ut_annotations; + l_expected ut3.ut_annotations; + begin + l_source := 'PACKAGE test_tt AS + -- %SUITE + -- %DISPLAYNAME(Name of suite) + -- %SUITEPATH(all.globaltests) + + -- %ANN1(Name of suite) + -- %ANN2(all.globaltests) + + --%TEST + procedure foo; + + -- %ANN3(Name of suite) + -- %ANN4(all.globaltests) + + --%TEST + procedure bar; + END;'; + + --Act + l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); + + --Assert + l_expected := ut3.ut_annotations( + ut3.ut_annotation( 2, 'suite', null, null ), + ut3.ut_annotation( 3, 'displayname', 'Name of suite', null ), + ut3.ut_annotation( 4, 'suitepath', 'all.globaltests', null ), + ut3.ut_annotation( 6, 'ann1', 'Name of suite', null ), + ut3.ut_annotation( 7, 'ann2', 'all.globaltests', null ), + ut3.ut_annotation( 9, 'test', null, 'foo'), + ut3.ut_annotation( 12, 'ann3', 'Name of suite', null ), + ut3.ut_annotation( 13, 'ann4', 'all.globaltests', null ), + ut3.ut_annotation( 15, 'test', null, 'bar') + ); + + ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); + + end; + +end test_annotation_parser; +/ diff --git a/test/ut3_tester/core/annotations/test_annotation_parser.pks b/test/ut3_tester/core/annotations/test_annotation_parser.pks new file mode 100644 index 000000000..bfd06c7b9 --- /dev/null +++ b/test/ut3_tester/core/annotations/test_annotation_parser.pks @@ -0,0 +1,42 @@ +create or replace package test_annotation_parser is + + --%suite(ut_annotation_parser) + --%suitepath(utplsql.framework_tester.core.annotations) + + --%test(Treats procedure level annotations as package level, if mixed with comments) + procedure test_proc_comments; + --%test(Includes floating annotations between procedures and package) + procedure include_floating_annotations; + --%test(Parses complex annotations on procedures and functions) + procedure parse_complex_with_functions; + --%test(Parses package annotations without any procedure annotations) + procedure no_procedure_annotation; + --%test(Parses package level annotations with Accessible by) + procedure parse_accessible_by; + --%test(Parses package level annotations with multiline declaration) + procedure complex_package_declaration; + --%test(Parses complex text in annotation) + procedure complex_text; + --%test(Ignores content of multi-line comments) + procedure ignore_annotations_in_comments; + + --%test(Ignores wrapped package and does not raise exception) + procedure ignore_wrapped_package; + + --%test(Parses package level annotations with annotation params containing brackets) + procedure brackets_in_desc; + + --%test(Parses annotation text even with spaces before brackets) + procedure test_space_before_annot_params; + + -- %test(Parses source-code with Windows-style newline) + procedure test_windows_newline; + + -- %test(Parses annotations with very long object names) + procedure test_annot_very_long_name; + + -- %test(Parses upper case annotations) + procedure test_upper_annot; + +end test_annotation_parser; +/ diff --git a/test/ut3_tester_helper/main_helper.pkb b/test/ut3_tester_helper/main_helper.pkb index 1085e5c47..148b526a6 100644 --- a/test/ut3_tester_helper/main_helper.pkb +++ b/test/ut3_tester_helper/main_helper.pkb @@ -95,6 +95,36 @@ create or replace package body main_helper is begin ut3.ut_expectation_processor.nulls_Are_equal(a_nulls_equal); end; + + procedure cleanup_annotation_cache is + pragma autonomous_transaction; + begin + delete from ut3.ut_annotation_cache_info + where object_owner = user and object_type = 'PACKAGE' and object_name in ('DUMMY_PACKAGE','DUMMY_TEST_PACKAGE'); + commit; + end; + + procedure create_parse_proc_as_ut3$user# is + pragma autonomous_transaction; + begin + execute immediate q'[ + create or replace procedure ut3$user#.parse_annotations is + begin + ut3.ut_annotation_manager.rebuild_annotation_cache('UT3_TESTER','PACKAGE'); + end;]'; + end; + + procedure drop_parse_proc_as_ut3$user# is + pragma autonomous_transaction; + begin + execute immediate 'drop procedure ut3$user#.parse_annotations'; + end; + + procedure parse_dummy_test_as_ut3$user# is + pragma autonomous_transaction; + begin + execute immediate 'begin ut3$user#.parse_annotations; end;'; + end; end; / diff --git a/test/ut3_tester_helper/main_helper.pks b/test/ut3_tester_helper/main_helper.pks index dab973dfc..2082105d5 100644 --- a/test/ut3_tester_helper/main_helper.pks +++ b/test/ut3_tester_helper/main_helper.pks @@ -26,6 +26,14 @@ create or replace package main_helper is procedure reset_nulls_equal; procedure nulls_are_equal(a_nulls_equal boolean := true); + + procedure cleanup_annotation_cache; + + procedure create_parse_proc_as_ut3$user#; + + procedure drop_parse_proc_as_ut3$user#; + + procedure parse_dummy_test_as_ut3$user#; end; / From 0618616259c28333fe7cbe0411af63c2b92580d5 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Thu, 28 Mar 2019 20:27:30 +0000 Subject: [PATCH 0368/1096] Adding set of tests: core/test_ut_test core/test_ut_utils --- test/install_ut3_tester_helper.sql | 2 + test/install_ut3_tester_tests.sql | 4 + test/ut3_tester/core/test_ut_test.pkb | 717 ++++++++++++++++++++ test/ut3_tester/core/test_ut_test.pks | 97 +++ test/ut3_tester/core/test_ut_utils.pkb | 436 ++++++++++++ test/ut3_tester/core/test_ut_utils.pks | 132 ++++ test/ut3_tester_helper/run_helper.pkb | 2 +- test/ut3_tester_helper/run_helper.pks | 2 +- test/ut3_tester_helper/ut_example_tests.pkb | 25 + test/ut3_tester_helper/ut_example_tests.pks | 8 + 10 files changed, 1423 insertions(+), 2 deletions(-) create mode 100644 test/ut3_tester/core/test_ut_test.pkb create mode 100644 test/ut3_tester/core/test_ut_test.pks create mode 100644 test/ut3_tester/core/test_ut_utils.pkb create mode 100644 test/ut3_tester/core/test_ut_utils.pks create mode 100644 test/ut3_tester_helper/ut_example_tests.pkb create mode 100644 test/ut3_tester_helper/ut_example_tests.pks diff --git a/test/install_ut3_tester_helper.sql b/test/install_ut3_tester_helper.sql index f221adad6..016756675 100644 --- a/test/install_ut3_tester_helper.sql +++ b/test/install_ut3_tester_helper.sql @@ -14,10 +14,12 @@ alter session set plsql_optimize_level=0; @@ut3_tester_helper/main_helper.pks @@ut3_tester_helper/run_helper.pks @@ut3_tester_helper/expectations_helper.pks +@@ut3_tester_helper/ut_example_tests.pks @@ut3_tester_helper/main_helper.pkb @@ut3_tester_helper/run_helper.pkb @@ut3_tester_helper/expectations_helper.pkb +@@ut3_tester_helper/ut_example_tests.pkb set linesize 200 set define on diff --git a/test/install_ut3_tester_tests.sql b/test/install_ut3_tester_tests.sql index 099064fe5..069eca42a 100644 --- a/test/install_ut3_tester_tests.sql +++ b/test/install_ut3_tester_tests.sql @@ -12,6 +12,8 @@ alter session set plsql_optimize_level=0; @@ut3_tester/core/annotations/test_annot_throws_exception.pks @@ut3_tester/core/annotations/test_annotation_manager.pks @@ut3_tester/core/expectations/test_expectation_processor.pks +@@ut3_tester/core/test_ut_utils.pks +@@ut3_tester/core/test_ut_test.pks @@ut3_tester/core.pkb @@ -20,6 +22,8 @@ alter session set plsql_optimize_level=0; @@ut3_tester/core/expectations/test_expectation_processor.pkb @@ut3_tester/core/annotations/test_annotation_manager.pkb @@ut3_tester/core/annotations/test_annot_throws_exception.pkb +@@ut3_tester/core/test_ut_utils.pkb +@@ut3_tester/core/test_ut_test.pkb set linesize 200 diff --git a/test/ut3_tester/core/test_ut_test.pkb b/test/ut3_tester/core/test_ut_test.pkb new file mode 100644 index 000000000..183f9f9c9 --- /dev/null +++ b/test/ut3_tester/core/test_ut_test.pkb @@ -0,0 +1,717 @@ +create or replace package body test_ut_test is + + procedure cleanup_package_state is + begin + ut3_tester_helper.ut_example_tests.g_number := null; + end; + + procedure disabled_test is + l_suite ut3.ut_suite; + l_test ut3.ut_test; + begin + --Arrange + l_suite := ut3.ut_suite(a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_line_no=> 1); + l_suite.path := 'ut3_tester_helper.ut_example_tests'; + l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_all)); + + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 2); + l_suite.items(l_suite.items.last).disabled_flag := ut3.ut_utils.boolean_to_int(true); + --Act + l_suite.do_execute(); + --Assert + ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_equal(1); + ut.expect(l_suite.result).to_equal(ut3.ut_utils.gc_success); + ut.expect(l_suite.results_count.disabled_count).to_equal(1); + ut.expect(l_suite.results_count.warnings_count).to_equal(0); + ut.expect(l_suite.results_count.success_count).to_equal(1); + ut.expect(l_suite.results_count.failure_count).to_equal(0); + ut.expect(l_suite.results_count.errored_count).to_equal(0); + end; + + procedure aftertest_errors is + l_suite ut3.ut_suite; + l_test ut3.ut_test; + begin + --Arrange + l_suite := ut3.ut_suite(a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_line_no=> 1); + l_suite.path := 'ut3_tester_helper.ut_example_tests'; + l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_all)); + + l_test := ut3.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); + l_test.before_test_list := ut3.ut_executables(ut3.ut_executable(USER, 'ut_example_tests', 'add_1_to_g_number', ut3.ut_utils.gc_before_test)); + l_test.after_test_list := ut3.ut_executables(ut3.ut_executable(USER, 'ut_example_tests', 'failing_procedure', ut3.ut_utils.gc_after_test)); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := l_test; + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); + --Act + l_suite.do_execute(); + --Assert + ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_equal(3); + ut.expect(l_suite.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(l_suite.results_count.disabled_count).to_equal(0); + ut.expect(l_suite.results_count.warnings_count).to_equal(0); + ut.expect(l_suite.results_count.success_count).to_equal(1); + ut.expect(l_suite.results_count.failure_count).to_equal(0); + ut.expect(l_suite.results_count.errored_count).to_equal(1); + end; + + procedure aftereach_errors is + l_suite ut3.ut_suite; + l_test ut3.ut_test; + begin + --Arrange + l_suite := ut3.ut_suite(a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_line_no=> 1); + l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_all)); + l_test := ut3.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); + l_test.before_each_list := ut3.ut_executables(ut3.ut_executable(USER, 'ut_example_tests', 'add_1_to_g_number', ut3.ut_utils.gc_before_each)); + l_test.after_each_list := ut3.ut_executables(ut3.ut_executable(USER, 'ut_example_tests', 'failing_procedure', ut3.ut_utils.gc_after_each)); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := l_test; + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); + --Act + l_suite.do_execute(); + --Assert + ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_equal(3); + ut.expect(l_suite.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(l_suite.results_count.disabled_count).to_equal(0); + ut.expect(l_suite.results_count.warnings_count).to_equal(0); + ut.expect(l_suite.results_count.success_count).to_equal(1); + ut.expect(l_suite.results_count.failure_count).to_equal(0); + ut.expect(l_suite.results_count.errored_count).to_equal(1); + end; + + procedure beforetest_errors is + l_suite ut3.ut_suite; + l_test ut3.ut_test; + begin + --Arrange + l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'ut_example_tests', a_line_no=> 1); + l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_all)); + l_test := ut3.ut_test(a_object_owner =>'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); + l_test.before_test_list := ut3.ut_executables(ut3.ut_executable(USER, 'ut_example_tests', 'failing_procedure', ut3.ut_utils.gc_before_test)); + l_test.after_test_list := ut3.ut_executables(ut3.ut_executable(USER, 'ut_example_tests', 'add_1_to_g_number', ut3.ut_utils.gc_after_test)); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := l_test; + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner =>'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); + --Act + l_suite.do_execute(); + --Assert + ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_equal(2); + ut.expect(l_suite.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(l_suite.results_count.disabled_count).to_equal(0); + ut.expect(l_suite.results_count.warnings_count).to_equal(0); + ut.expect(l_suite.results_count.success_count).to_equal(1); + ut.expect(l_suite.results_count.failure_count).to_equal(0); + ut.expect(l_suite.results_count.errored_count).to_equal(1); + end; + + procedure beforeeach_errors is + l_suite ut3.ut_suite; + l_test ut3.ut_test; + begin + --Arrange + l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'ut_example_tests', a_line_no=> 1); + l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_all)); + l_test := ut3.ut_test(a_object_owner => USER,a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); + l_test.before_each_list := ut3.ut_executables(ut3.ut_executable(USER, 'ut_example_tests', 'failing_procedure', ut3.ut_utils.gc_before_each)); + l_test.after_each_list := ut3.ut_executables(ut3.ut_executable(USER, 'ut_example_tests', 'add_1_to_g_number', ut3.ut_utils.gc_after_each)); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := l_test; + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => USER,a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); + --Act + l_suite.do_execute(); + --Assert + ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_equal(2); + ut.expect(l_suite.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(l_suite.results_count.disabled_count).to_equal(0); + ut.expect(l_suite.results_count.warnings_count).to_equal(0); + ut.expect(l_suite.results_count.success_count).to_equal(1); + ut.expect(l_suite.results_count.failure_count).to_equal(0); + ut.expect(l_suite.results_count.errored_count).to_equal(1); + end; + + procedure after_each_executed is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_owner => 'ut3_tester_helper', + a_object_name => 'ut_example_tests', + a_name => 'set_g_number_0', + a_line_no => null + ); + begin + l_test.after_each_list := ut3.ut_executables( + ut3.ut_executable( + user, + 'UT_EXAMPLE_TESTS', + 'add_1_to_g_number', + ut3.ut_utils.gc_after_each + ) + ); + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_success); + ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_equal(1); + end; + + procedure after_each_proc_name_invalid is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_owner => 'ut3_tester_helper', + a_object_name => 'ut_example_tests', + a_name => 'set_g_number_0', + a_line_no => null + ); + begin + l_test.after_each_list := ut3.ut_executables( + ut3.ut_executable(user, 'ut_example_tests', 'invalid setup name', ut3.ut_utils.gc_after_each) + ); + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_equal(0); + end; + + procedure after_each_procedure_name_null is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_owner => 'ut3_tester_helper', + a_object_name => 'ut_example_tests', + a_name => 'set_g_number_0', + a_line_no => null + ); + begin + l_test.after_each_list := ut3.ut_executables( + ut3.ut_executable(user, 'ut_example_tests', null, ut3.ut_utils.gc_after_each) + ); + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_equal(0); + end; + + procedure create_app_info_package is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package ut_output_tests + as + --%suite + + gv_before_all_client_info varchar2(200); + gv_before_each_client_info varchar2(200); + gv_before_test_client_info varchar2(200); + gv_after_test_client_info varchar2(200); + gv_after_each_client_info varchar2(200); + gv_after_all_client_info varchar2(200); + + --%test + --%beforetest(before_test) + --%aftertest(after_test) + procedure the_test; + + --%beforeall + procedure beforeall; + + --%beforeeach + procedure beforeeach; + + procedure before_test; + procedure after_test; + + --%aftereach + procedure aftereach; + + --%afterall + procedure afterall; + + end;]'; + execute immediate q'[create or replace package body ut_output_tests + as + + procedure the_test + as + l_module_name varchar2(4000); + l_action_name varchar2(4000); + l_client_info varchar2(4000); + begin + --Generate empty output + dbms_output.put_line(''); + ut.expect(1,'Test 1 Should Pass').to_equal(1); + dbms_application_info.read_module(module_name => l_module_name, action_name => l_action_name); + dbms_application_info.read_client_info(l_client_info); + ut.expect(l_module_name).to_equal('utPLSQL'); + ut.expect(l_action_name).to_be_like('ut_output_tests'); + ut.expect(l_client_info).to_be_like('the_test'); + end; + + procedure beforeall is + begin + dbms_application_info.read_client_info(gv_before_all_client_info); + end; + + procedure beforeeach is + begin + dbms_application_info.read_client_info(gv_before_each_client_info); + end; + + procedure before_test is + begin + dbms_application_info.read_client_info(gv_before_test_client_info); + end; + procedure after_test is + begin + dbms_application_info.read_client_info(gv_after_test_client_info); + end; + + procedure aftereach is + begin + dbms_application_info.read_client_info(gv_after_each_client_info); + end; + + procedure afterall is + begin + dbms_application_info.read_client_info(gv_after_all_client_info); + end; + + end;]'; + end; + + procedure drop_app_info_package is + pragma autonomous_transaction; + begin + execute immediate q'[drop package ut_output_tests]'; + end; + + procedure application_info_on_execution is + l_output_data ut3.ut_varchar2_list; + l_output clob; + function get_test_value(a_variable_name varchar2) return varchar2 is + l_result varchar2(4000); + begin + execute immediate 'begin :i := ut_output_tests.'||a_variable_name||'; end;' using out l_result; + return l_result; + end; + begin + --act + select * bulk collect into l_output_data + from table(ut3.ut.run('ut_output_tests')); + l_output := ut3.ut_utils.table_to_clob(l_output_data); + --assert + + ut.expect(get_test_value('gv_before_all_client_info')).to_equal('beforeall'); + ut.expect(get_test_value('gv_before_each_client_info')).to_equal('beforeeach'); + ut.expect(get_test_value('gv_before_test_client_info')).to_equal('before_test'); + ut.expect(get_test_value('gv_after_test_client_info')).to_equal('after_test'); + ut.expect(get_test_value('gv_after_each_client_info')).to_equal('aftereach'); + ut.expect(get_test_value('gv_after_all_client_info')).to_equal('afterall'); + ut.expect(l_output).to_be_like('%0 failed, 0 errored, 0 disabled, 0 warning(s)%'); + end; + + procedure before_each_executed is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_owner => 'ut3_tester_helper', + a_object_name => 'ut_example_tests', + a_name => 'add_1_to_g_number', + a_line_no => null + ); + begin + l_test.before_each_list := ut3.ut_executables(ut3.ut_executable(user, 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_each)); + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_success); + ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_equal(1); + end; + + + procedure before_each_proc_name_invalid is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_owner => 'ut3_tester_helper', + a_object_name => 'ut_example_tests', + a_name => 'set_g_number_0', + a_line_no => null + ); + begin + l_test.before_each_list := ut3.ut_executables( + ut3.ut_executable(user, 'ut_example_tests', 'invalid setup name', ut3.ut_utils.gc_before_each) + ); + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_be_null; + end; + + procedure before_each_proc_name_null is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_owner => 'ut3_tester_helper', + a_object_name => 'ut_example_tests', + a_name => 'set_g_number_0', + a_line_no => null + ); + begin + l_test.before_each_list := ut3.ut_executables( + ut3.ut_executable(user, 'ut_example_tests', null, ut3.ut_utils.gc_before_each) + ); + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_be_null; + end; + + procedure ignore_savepoint_exception is + pragma autonomous_transaction; + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_owner => 'ut3_tester_helper', + a_object_name => 'ut_example_tests', + a_name => 'ut_commit_test', + a_line_no => null + ); + begin + l_test.rollback_type := ut3.ut_utils.gc_rollback_auto; + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_success); + end; + + procedure owner_name_invalid is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_owner => 'invalid owner name', + a_object_name => 'ut_example_tests', + a_name => 'set_g_number_0', + a_line_no => null + ); + begin + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + end; + + procedure owner_name_null is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_name => 'ut_example_tests', + a_name => 'set_g_number_0', + a_line_no => null + ); + begin + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_success); + ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_equal(0); + end; + + procedure create_invalid_package is + pragma autonomous_transaction; + begin + execute immediate 'create or replace package invalid_package is + v_variable non_existing_type; + procedure ut_exampletest; + end;'; + exception when others then + null; + end; + + procedure drop_invalid_package is + pragma autonomous_transaction; + begin + execute immediate 'drop package invalid_package'; + exception when others then + null; + end; + + procedure package_in_invalid_state is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_name => 'invalid_package', + a_name => 'ut_exampletest', + a_line_no => null + ); + begin + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + end; + + procedure package_name_invalid is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_name => 'invalid package name', + a_name => 'set_g_number_0', + a_line_no => null + ); + begin + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + end; + + procedure package_name_null is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_name => null, + a_name => 'set_g_number_0', + a_line_no => null + ); + begin + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + end; + + procedure procedure_name_invalid is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_owner => 'ut3_tester_helper', + a_object_name => 'ut_example_tests', + a_name => 'invalid procedure name', + a_line_no => null + ); + begin + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + end; + + procedure procedure_name_null is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_owner => 'ut3_tester_helper', + a_object_name => 'ut_example_tests', + a_name => null, + a_line_no => null + ); + begin + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + end; + + procedure before_test_executed is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_owner => 'ut3_tester_helper', + a_object_name => 'ut_example_tests', + a_name => 'add_1_to_g_number', + a_line_no => null + ); + begin + l_test.before_test_list := ut3.ut_executables(ut3.ut_executable(user, 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_test)); + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_success); + ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_equal(1); + end; + + procedure before_test_proc_name_invalid is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_owner => 'ut3_tester_helper', + a_object_name => 'ut_example_tests', + a_name => 'set_g_number_0', + a_line_no => null + ); + begin + l_test.before_test_list := ut3.ut_executables( + ut3.ut_executable(user, 'ut_example_tests', 'invalid setup name', ut3.ut_utils.gc_before_test) + ); + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_be_null; + end; + + procedure before_test_proc_name_null is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_owner => 'ut3_tester_helper', + a_object_name => 'ut_example_tests', + a_name => 'set_g_number_0', + a_line_no => null + ); + begin + l_test.before_test_list := ut3.ut_executables( + ut3.ut_executable(user, 'ut_example_tests', null, ut3.ut_utils.gc_before_test) + ); + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_be_null; + end; + + procedure after_test_executed is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_owner => 'ut3_tester_helper', + a_object_name => 'ut_example_tests', + a_name => 'set_g_number_0', + a_line_no => null + ); + begin + l_test.after_test_list := ut3.ut_executables(ut3.ut_executable(user, 'ut_example_tests', 'add_1_to_g_number', ut3.ut_utils.gc_after_test)); + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_success); + ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_equal(1); + end; + + procedure after_test_proce_name_invalid is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_owner => 'ut3_tester_helper', + a_object_name => 'ut_example_tests', + a_name => 'set_g_number_0', + a_line_no => null + ); + begin + l_test.after_test_list := ut3.ut_executables( + ut3.ut_executable(user, 'ut_example_tests', 'invalid procedure name', ut3.ut_utils.gc_after_test) + ); + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_equal(0); + end; + + procedure after_test_proc_name_null is + --Arrange + l_test ut3.ut_test := ut3.ut_test( + a_object_owner => 'ut3_tester_helper', + a_object_name => 'ut_example_tests', + a_name => 'set_g_number_0', + a_line_no => null + ); + begin + l_test.after_test_list := ut3.ut_executables( + ut3.ut_executable(user, 'ut_example_tests', null, ut3.ut_utils.gc_after_test) + ); + --Act + l_test.do_execute(); + --Assert + ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_equal(0); + end; + + procedure create_output_package is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package ut_output_tests + as + --%suite + + --%beforeeach + procedure beforeeach; + + --%aftereach + procedure aftereach; + + --%test + --%beforetest(beforetest) + --%aftertest(aftertest) + procedure ut_passing_test; + + procedure beforetest; + + procedure aftertest; + + --%beforeall + procedure beforeall; + --%afterall + procedure afterall; + + end;]'; + execute immediate q'[create or replace package body ut_output_tests + as + + procedure beforetest is + begin + dbms_output.put_line(''); + end; + + procedure aftertest is + begin + dbms_output.put_line(''); + end; + + procedure beforeeach is + begin + dbms_output.put_line(''); + end; + + procedure aftereach is + begin + dbms_output.put_line(''); + end; + + procedure ut_passing_test is + begin + dbms_output.put_line(''); + ut.expect(1,'Test 1 Should Pass').to_equal(1); + end; + + procedure beforeall is + begin + dbms_output.put_line(''); + end; + + procedure afterall is + begin + dbms_output.put_line(''); + end; + + end;]'; + exception when others then + null; + end; + + procedure drop_output_package is + pragma autonomous_transaction; + begin + execute immediate 'drop package ut_output_tests'; + exception when others then + null; + end; + + procedure test_output_gathering is + l_output_data ut3.ut_varchar2_list; + l_output clob; + begin + select * bulk collect into l_output_data + from table(ut3.ut.run('ut_output_tests')); + l_output := ut3.ut_utils.table_to_clob(l_output_data); + ut.expect(l_output).to_be_like( + '%%%%%%%%1 tests, 0 failed, 0 errored%' + ); + end; + + +end; +/ diff --git a/test/ut3_tester/core/test_ut_test.pks b/test/ut3_tester/core/test_ut_test.pks new file mode 100644 index 000000000..3f10d5a6f --- /dev/null +++ b/test/ut3_tester/core/test_ut_test.pks @@ -0,0 +1,97 @@ +create or replace package test_ut_test is + + --%suite(ut_test) + --%suitepath(utplsql.framework_tester.core) + + --%beforeeach + procedure cleanup_package_state; + + --%test(Disabled flag for a test skips the tests execution in suite) + procedure disabled_test; + + --%test(Marks test as errored if aftertest raises exception) + procedure aftertest_errors; + + --%test(Marks each test as errored if aftereach raises exception) + procedure aftereach_errors; + + --%test(Marks test as errored if beforetest raises exception) + procedure beforetest_errors; + + --%test(Marks each test as errored if beforeeach raises exception) + procedure beforeeach_errors; + + + --%context(executables in test) + + --%test(Executes aftereach procedure) + procedure after_each_executed; + + --%test(Fails test when aftereach procedure name invalid) + procedure after_each_proc_name_invalid; + --%test(Tails test when aftereach procedure name null) + procedure after_each_procedure_name_null; + + procedure create_app_info_package; + procedure drop_app_info_package; + --%beforetest(create_app_info_package) + --%aftertest(drop_app_info_package) + --%test(Sets application_info on execution of individual items) + procedure application_info_on_execution; + + --%test(Executes beforeeach procedure) + procedure before_each_executed; + --%test(Fails test when beforeeach procedure name invalid) + procedure before_each_proc_name_invalid; + --%test(Fails test when beforeeach procedure name null) + procedure before_each_proc_name_null; + --%test(Does not raise exception when rollback to savepoint fails) + procedure ignore_savepoint_exception; + --%test(Fails when owner name invalid) + procedure owner_name_invalid; + + --TODO: FIX that + --%test(Runs test as current schema when owner name null) + --%disabled + procedure owner_name_null; + + procedure create_invalid_package; + procedure drop_invalid_package; + --%beforetest(create_app_info_package) + --%aftertest(drop_app_info_package) + --%test(Fails the test that references package with compilation errors) + procedure package_in_invalid_state; + --%test(Fails the test when package name is invalid) + procedure package_name_invalid; + --%test(Fails the test when package name is null) + procedure package_name_null; + --%test(Fails the test when procedure name invalid) + procedure procedure_name_invalid; + --%test(Fails the test when procedure name null) + procedure procedure_name_null; + + + --%test(Executes befroretest procedure) + procedure before_test_executed; + --%test(Fails test when befroretest procedure name invalid) + procedure before_test_proc_name_invalid; + --%test(Fails test when befroretest procedure name is null) + procedure before_test_proc_name_null; + --%test(Executes aftertest procedure) + procedure after_test_executed; + --%test(Fails test when aftertest procedure name invalid) + procedure after_test_proce_name_invalid; + --%test(Fails test when aftertest procedure name is null) + procedure after_test_proc_name_null; + + procedure create_output_package; + procedure drop_output_package; + --%beforetest(create_output_package) + --%aftertest(drop_output_package) + --%test(Test output gathering) + procedure test_output_gathering; + + --%endcontext + +end; +/ diff --git a/test/ut3_tester/core/test_ut_utils.pkb b/test/ut3_tester/core/test_ut_utils.pkb new file mode 100644 index 000000000..31e1520d2 --- /dev/null +++ b/test/ut3_tester/core/test_ut_utils.pkb @@ -0,0 +1,436 @@ +create or replace package body test_ut_utils is + + gv_nls_value nls_session_parameters.value%type; + + gc_delimiter varchar2(1) := get_numeric_delimiter(); + + function get_numeric_delimiter return varchar2 is + l_result varchar2(1); + begin + select substr(value, 1, 1) into l_result from nls_session_parameters t where t.parameter = 'NLS_NUMERIC_CHARACTERS'; + return l_result; + end; + + function clob_to_blob(p_clob clob) return blob is + l_blob blob; + l_dest_offset integer := 1; + l_source_offset integer := 1; + l_lang_context integer := dbms_lob.default_lang_ctx; + l_warning integer := dbms_lob.warn_inconvertible_char; + begin + dbms_lob.createtemporary(l_blob, true); + dbms_lob.converttoblob( + dest_lob =>l_blob, + src_clob =>p_clob, + amount =>DBMS_LOB.LOBMAXSIZE, + dest_offset =>l_dest_offset, + src_offset =>l_source_offset, + blob_csid =>DBMS_LOB.DEFAULT_CSID, + lang_context=>l_lang_context, + warning =>l_warning + ); + return l_blob; + end; + + + procedure common_clob_to_table_exec(p_clob varchar2, p_delimiter varchar2, p_expected_list ut3.ut_varchar2_list, p_limit number) is + begin + execute immediate 'declare + l_clob clob := '''||p_clob||'''; + l_delimiter varchar2(1) := '''||p_delimiter||'''; + l_expected ut3.ut_varchar2_list := :p_expected_list; + l_result ut3.ut_varchar2_list; + l_limit integer := '||p_limit||q'[; + l_result_str varchar2(32767); + l_errors integer := 0; + function compare_element(a_element_id integer, a_expected ut3.ut_varchar2_list, a_actual ut3.ut_varchar2_list) return integer is + begin + if a_expected.exists(a_element_id) and a_actual.exists(a_element_id) then + if a_expected(a_element_id) = a_actual(a_element_id) or a_expected(a_element_id) is null and a_actual(a_element_id) is null then + return 0; + else + dbms_output.put('a_expected('||a_element_id||')='||a_expected(a_element_id)||' | a_actual('||a_element_id||')='||a_actual(a_element_id)); + end if; + end if; + if not a_expected.exists(a_element_id) then + dbms_output.put('a_expected('||a_element_id||') does not exist '); + end if; + if not a_actual.exists(a_element_id) then + dbms_output.put('a_actual('||a_element_id||') does not exist '); + end if; + dbms_output.put_line(null); + return 1; + end; +begin +--Act + select column_value bulk collect into l_result from table( ut3.ut_utils.clob_to_table(l_clob, l_limit, l_delimiter) ); + for i in 1 .. l_result.count loop + l_result_str := l_result_str||''''||l_result(i)||''''||l_delimiter; + end loop; + l_result_str := rtrim(l_result_str,l_delimiter); +--Assert + for i in 1 .. greatest(l_expected.count, l_result.count) loop + l_errors := l_errors + compare_element(i, l_expected, l_result); + end loop; + ut.expect(l_errors).to_equal(0); +end;]' using p_expected_list; + end; + + procedure test_clob_to_table is + begin + common_clob_to_table_exec('a,b,c,d', ',', ut3.ut_varchar2_list('a','b','c','d'), 1000); + common_clob_to_table_exec( '', ',', ut3.ut_varchar2_list(), 1000); + common_clob_to_table_exec( '1,b,c,d', '', ut3.ut_varchar2_list('1,b,','c,d'), 4); + common_clob_to_table_exec( 'abcdefg,hijk,axa,a', ',', ut3.ut_varchar2_list('abc','def','g','hij','k','axa','a'), 3); + common_clob_to_table_exec( ',a,,c,d,', ',', ut3.ut_varchar2_list('','a','','c','d',''), 1000); + end; + + procedure test_test_result_to_char is + begin + ut.expect(ut3.ut_utils.test_result_to_char(-1),'test unknown').to_equal('Unknown(-1)'); + ut.expect(ut3.ut_utils.test_result_to_char(null),'test unknown').to_equal('Unknown(NULL)'); + ut.expect(ut3.ut_utils.test_result_to_char(ut3.ut_utils.gc_success),'test unknown').to_equal(ut3.ut_utils.gc_success_char); + end; + + procedure to_string_emptyblob is + begin + ut.expect(ut3.ut_data_value_blob(empty_blob()).to_string()).to_equal('EMPTY'); + end; + + procedure to_string_emptyclob is + begin + ut.expect(ut3.ut_data_value_clob(empty_clob()).to_string()).to_equal('EMPTY'); + end; + + procedure to_string_nullblob is + begin + ut.expect(ut3.ut_data_value_blob(null).to_string()).to_equal('NULL'); + end; + + procedure to_string_nullclob is + begin + ut.expect(ut3.ut_data_value_clob(null).to_string()).to_equal('NULL'); + end; + + procedure to_string_nulldate is + begin + ut.expect(ut3.ut_data_value_date(null).to_string()).to_equal('NULL'); + end; + + procedure to_string_nullnumber is + begin + ut.expect(ut3.ut_data_value_number(null).to_string()).to_equal('NULL'); + end; + + procedure to_string_nulltimestamp is + begin + ut.expect(ut3.ut_data_value_timestamp(null).to_string()).to_equal('NULL'); + end; + + procedure to_string_nulltimestamp_ltz is + begin + ut.expect(ut3.ut_data_value_timestamp_ltz(null).to_string()).to_equal('NULL'); + end; + + procedure to_string_nulltimestamp_tz is + begin + ut.expect(ut3.ut_data_value_timestamp_tz(null).to_string()).to_equal('NULL'); + end; + + procedure to_string_nullvarchar2 is + begin + ut.expect(ut3.ut_data_value_varchar2(null).to_string()).to_equal('NULL'); + end; + + procedure to_string_blob is + l_text varchar2(32767) := 'A test char'; + l_value blob := utl_raw.cast_to_raw(l_text); + l_expected varchar2(32767) := ''''||rawtohex(l_value)||''''; + begin + ut.expect(ut3.ut_data_value_blob(l_value).to_string()).to_equal(l_expected); + end; + + procedure to_string_clob is + l_value clob := 'A test char'; + l_expected varchar2(32767) := ''''||l_value||''''; + begin + ut.expect(ut3.ut_data_value_clob(l_value).to_string()).to_equal(l_expected); + end; + + procedure to_string_date is + l_value date := to_date('2016-12-31 23:59:59', 'yyyy-mm-dd hh24:mi:ss'); + l_expected varchar2(100) := '2016-12-31T23:59:59'; + begin + ut.expect(ut3.ut_data_value_date(l_value).to_string()).to_equal(l_expected); + end; + + procedure to_string_timestamp is + l_value timestamp(9) := to_timestamp('2016-12-31 23:59:59.123456789', 'yyyy-mm-dd hh24:mi:ss.ff'); + l_expected varchar2(100) := '2016-12-31T23:59:59'||gc_delimiter||'123456789'; + begin + ut.expect(ut3.ut_data_value_timestamp(l_value).to_string()).to_equal(l_expected); + end; + + procedure to_string_timestamp_ltz is + l_value timestamp(9) with local time zone := to_timestamp('2016-12-31 23:59:59.123456789', 'yyyy-mm-dd hh24:mi:ss.ff'); + l_expected varchar2(100) := '2016-12-31T23:59:59'||gc_delimiter||'123456789'; + begin + ut.expect(ut3.ut_data_value_timestamp_ltz(l_value).to_string()).to_equal(l_expected); + end; + + procedure to_string_timestamp_tz is + l_value timestamp(9) with time zone := to_timestamp_tz('2016-12-31 23:59:59.123456789 -8:00', 'yyyy-mm-dd hh24:mi:ss.ff tzh:tzm'); + l_expected varchar2(100) := '2016-12-31T23:59:59'||gc_delimiter||'123456789 -08:00'; + begin + ut.expect(ut3.ut_data_value_timestamp_tz(l_value).to_string()).to_equal(l_expected); + end; + + procedure to_string_varchar2 is + l_value varchar2(20) := 'A test char'; + l_expected varchar2(100) := ''''||l_value||''''; + begin + ut.expect(ut3.ut_data_value_varchar2(l_value).to_string()).to_equal(l_expected); + end; + + procedure to_string_verybigblob is + l_text clob := lpad('A test char',32767,'1')||lpad('1',32767,'1'); + l_value blob; + begin + l_value := clob_to_blob(l_text); + ut.expect(length(ut3.ut_data_value_blob(l_value).to_string())).to_equal(ut3.ut_utils.gc_max_output_string_length); + ut.expect(ut3.ut_data_value_blob(l_value).to_string()).to_be_like('%'||ut3.ut_utils.gc_more_data_string); + end; + + procedure to_string_verybigclob is + l_value clob := lpad('A test char',32767,'1')||lpad('1',32767,'1'); + begin + ut.expect(length(ut3.ut_data_value_clob(l_value).to_string())).to_equal(ut3.ut_utils.gc_max_output_string_length); + ut.expect(ut3.ut_data_value_clob(l_value).to_string()).to_be_like('%'||ut3.ut_utils.gc_more_data_string); + end; + + procedure to_string_verybignumber is + l_value number := 1234567890123456789012345678901234567890; + l_expected varchar2(100) := '1234567890123456789012345678901234567890'; + begin + ut.expect(ut3.ut_data_value_number(l_value).to_string()).to_equal(l_expected); + end; + + procedure to_string_verybigvarchar2 is + l_value varchar2(32767) := lpad('A test char',32767,'1'); + l_result varchar2(32767); + begin + ut.expect(length(ut3.ut_data_value_varchar2(l_value).to_string())).to_equal(ut3.ut_utils.gc_max_output_string_length); + ut.expect(ut3.ut_data_value_varchar2(l_value).to_string()).to_be_like('%'||ut3.ut_utils.gc_more_data_string); + end; + + procedure to_string_verysmallnumber is + l_value number := 0.123456789012345678901234567890123456789; + l_expected varchar2(100) := gc_delimiter||'123456789012345678901234567890123456789'; + begin + ut.expect(ut3.ut_data_value_number(l_value).to_string()).to_equal(l_expected); + end; + + procedure test_table_to_clob is + procedure exec_table_to_clob(a_list ut3.ut_varchar2_list, a_delimiter varchar2, a_expected clob) is + l_result clob; + begin + l_result := ut3.ut_utils.table_to_clob(a_list, a_delimiter); + + ut.expect(l_result).to_equal(a_expected, a_nulls_are_equal => true); + end; + begin + exec_table_to_clob(null, ',', ''); + exec_table_to_clob(ut3.ut_varchar2_list(), ',', ''); + exec_table_to_clob(ut3.ut_varchar2_list('a', 'b', 'c', 'd'), ',', 'a,b,c,d'); + exec_table_to_clob(ut3.ut_varchar2_list('1,b,', 'c,d'), ',', '1,b,,c,d'); + exec_table_to_clob(ut3.ut_varchar2_list('', 'a', '', 'c', 'd', ''), ',', ',a,,c,d,'); + end; + + procedure test_append_with_multibyte is + l_lines sys.dbms_preprocessor.source_lines_t; + l_result clob; + begin + l_lines := sys.dbms_preprocessor.get_post_processed_source( + object_type => 'PACKAGE', + schema_name => sys_context('USERENV', 'CURRENT_USER'), + object_name => 'TST_CHARS' + ); + + for i in 1..l_lines.count loop + l_result := null; + ut3.ut_utils.append_to_clob(l_result, l_lines(i)); + + --Assert + ut.expect(dbms_lob.getlength(l_result),'Error for index '||i).to_equal(dbms_lob.getlength(l_lines(i))); + end loop; + end; + + procedure setup_append_with_multibyte is + pragma autonomous_transaction; + begin + select value into gv_nls_value from nls_session_parameters where parameter = 'NLS_DATE_LANGUAGE'; + execute immediate 'alter session set nls_date_language=ENGLISH'; + execute immediate 'create or replace package tst_chars as +-- 2) Status of the process = 😡PE😡 with no linked data +end;'; + execute immediate 'alter session set nls_date_language=RUSSIAN'; + + end; + procedure clean_append_with_multibyte is + pragma autonomous_transaction; + begin + execute immediate 'alter session set nls_date_language='||gv_nls_value; + execute immediate 'drop package tst_chars'; + end; + + procedure test_clob_to_table_multibyte is + l_varchar2_byte_limit integer := 32767; + l_workaround_byte_limit integer := 8191; + l_singlebyte_string_max_size varchar2(32767 char) := rpad('x',l_varchar2_byte_limit,'x'); + l_twobyte_character char(1 char) := '�?'; + l_clob_multibyte clob := l_twobyte_character||l_singlebyte_string_max_size; --here we have 32769(2+32767) bytes and 32768 chars + l_expected ut3.ut_varchar2_list := ut3.ut_varchar2_list(); + l_result ut3.ut_varchar2_list; + begin + l_expected.extend(1); + l_expected(1) := l_twobyte_character||substr(l_singlebyte_string_max_size,1,l_workaround_byte_limit-1); + --Act + l_result := ut3.ut_utils.clob_to_table(l_clob_multibyte); + --Assert + ut.expect(l_result(1)).to_equal(l_expected(1)); + end; + + procedure test_to_version_split is + l_version ut3.ut_utils.t_version; + begin + l_version := ut3.ut_utils.to_version('v034.0.0456.0333'); + ut.expect(l_version.major).to_equal(34); + ut.expect(l_version.minor).to_equal(0); + ut.expect(l_version.bugfix).to_equal(456); + ut.expect(l_version.build).to_equal(333); + end; + + procedure test_trim_list_elements + is + l_list_to_be_equal ut3.ut_varchar2_list := ut3.ut_varchar2_list('hello', 'world', 'okay'); + l_list ut3.ut_varchar2_list := ut3.ut_varchar2_list(' hello ', chr(9)||'world ', 'okay'); + begin + --Act + l_list := ut3.ut_utils.trim_list_elements(l_list); + --Assert + ut.expect(anydata.convertcollection(l_list)).to_equal(anydata.convertcollection(l_list_to_be_equal)); + end; + + procedure trim_list_elemts_null_collect + is + l_list_to_be_null ut3.ut_varchar2_list; + begin + --Act + l_list_to_be_null := ut3.ut_utils.trim_list_elements(l_list_to_be_null); + --Assert + ut.expect(anydata.convertcollection(l_list_to_be_null)).to_be_null; + end; + + procedure trim_list_elemts_empty_collect + is + l_list_to_be_empty ut3.ut_varchar2_list := ut3.ut_varchar2_list(); + begin + --Act + l_list_to_be_empty := ut3.ut_utils.trim_list_elements(l_list_to_be_empty); + --Assert + ut.expect(anydata.convertcollection(l_list_to_be_empty)).to_be_empty; + end; + + procedure test_filter_list + is + l_list_to_be_equal ut3.ut_varchar2_list := ut3.ut_varchar2_list('-12458', '8956', '789'); + l_list ut3.ut_varchar2_list := ut3.ut_varchar2_list('-12458', '8956', 'okay', null,'458963', '789'); + begin + --Act + l_list := ut3.ut_utils.filter_list(l_list, '^-?[[:digit:]]{1,5}$'); + --Assert + ut.expect(anydata.convertcollection(l_list)).to_equal(anydata.convertcollection(l_list_to_be_equal)); + end; + + procedure filter_list_null_collection + is + l_list_to_be_null ut3.ut_varchar2_list; + begin + --Act + l_list_to_be_null := ut3.ut_utils.filter_list(l_list_to_be_null, '^-?[[:digit:]]{1,5}$'); + --Assert + ut.expect(anydata.convertcollection(l_list_to_be_null)).to_be_null; + end; + + procedure filter_list_empty_collection + is + l_list_to_be_empty ut3.ut_varchar2_list := ut3.ut_varchar2_list(); + begin + --Act + l_list_to_be_empty := ut3.ut_utils.filter_list(l_list_to_be_empty, '^-?[[:digit:]]{1,5}$'); + --Assert + ut.expect(anydata.convertcollection(l_list_to_be_empty)).to_be_empty; + end; + + procedure replace_multiline_comments + is + l_source clob; + l_actual clob; + l_expected clob; + begin + --Arrange + l_source := q'[ +create or replace package dummy as + + -- single line comment with disabled /* multi-line comment */ + gv_text0 varchar2(200) := q'{/* multi-line comment + in escaped q'multi-line + string*/}'; + gv_text1 varchar2(200) := '/* multi-line comment in a string*/'; + gv_text2 varchar2(200) := '/* multi-line comment + in a multi-line + string*/'; + -- ignored start of multi-line comment with multi-byte text � /* + -- ignored end of multi-line comment with multi-byte text � */ + /* multi-line comment + with + multi-byte characters ��� + in it */ + gv_text3 varchar2(200) := 'some text'; /* multiline comment*/ --followed by single-line comment + /* multi-line comment in one line*/ + gv_text4 varchar2(200) := q'{/* multi-line comment + in escaped q'multi-line + string*/}'; +end; +]'; + l_expected := q'[ +create or replace package dummy as + + -- single line comment with disabled /* multi-line comment */ + gv_text0 varchar2(200) := q'{/* multi-line comment + in escaped q'multi-line + string*/}'; + gv_text1 varchar2(200) := '/* multi-line comment in a string*/'; + gv_text2 varchar2(200) := '/* multi-line comment + in a multi-line + string*/'; + -- ignored start of multi-line comment with multi-byte text � /* + -- ignored end of multi-line comment with multi-byte text � */ + ]'||q'[ + + + + gv_text3 varchar2(200) := 'some text'; --followed by single-line comment + ]'||q'[ + gv_text4 varchar2(200) := q'{/* multi-line comment + in escaped q'multi-line + string*/}'; +end; +]'; + --Act + l_actual := ut3.ut_utils.replace_multiline_comments(l_source); + --Assert + ut.expect(l_actual).to_equal(l_expected); + end; +end test_ut_utils; +/ diff --git a/test/ut3_tester/core/test_ut_utils.pks b/test/ut3_tester/core/test_ut_utils.pks new file mode 100644 index 000000000..ecc2596c5 --- /dev/null +++ b/test/ut3_tester/core/test_ut_utils.pks @@ -0,0 +1,132 @@ +create or replace package test_ut_utils is + + --%suite(ut_utils) + --%suitepath(utplsql.framework_tester.core) + + function get_numeric_delimiter return varchar2; + + --%test(clob_to_table - Converts a clob into ut_varchar2_list using specified delimiter) + procedure test_clob_to_table; + + --%test(test_result_to_char - Converts numeric test result to character representation) + procedure test_test_result_to_char; + + + --%context(to_string) + + --%test(Returns 'EMPTY' string for NULL BLOB) + procedure to_string_emptyblob; + + --%test(Returns 'EMPTY' string for NULL CLOB) + procedure to_string_emptyclob; + + --%test(Returns 'NULL' string for NULL BLOB) + procedure to_string_nullblob; + + --%test(Returns 'NULL' string for NULL CLOB) + procedure to_string_nullclob; + + --%test(Returns 'NULL' string for NULL date) + procedure to_string_nulldate; + + --%test(Returns 'NULL' string for NULL number) + procedure to_string_nullnumber; + + --%test(Returns 'NULL' string for NULL timestamp) + procedure to_string_nulltimestamp; + + --%test(Returns 'NULL' string for NULL timestamp with local timezone) + procedure to_string_nulltimestamp_ltz; + + --%test(Returns 'NULL' string for NULL timestamp with timezone) + procedure to_string_nulltimestamp_tz; + + --%test(Returns 'NULL' string for NULL varchar) + procedure to_string_nullvarchar2; + + --%test(Returns string representation of BLOB) + procedure to_string_blob; + + --%test(Returns string representation of CLOB) + procedure to_string_clob; + + --%test(Returns string representation of date) + procedure to_string_date; + + --%test(Returns string representation of timestamp) + procedure to_string_timestamp; + + --%test(Returns string representation of timestamp with local timezone) + procedure to_string_timestamp_ltz; + + --%test(Returns string representation of timestamp with timezone) + procedure to_string_timestamp_tz; + + --%test(Returns varchar value) + procedure to_string_varchar2; + + --%test(Returns BLOB trimmed to 4000 chars with trailing [...]) + procedure to_string_verybigblob; + +--%test(Returns CLOB trimmed to 4000 chars with trailing [...]) + procedure to_string_verybigclob; + + --%test(Returns string representation of large number) + procedure to_string_verybignumber; + + --%test(Returns varchar2 trimmed to 4000 chars with trailing [...]) + procedure to_string_verybigvarchar2; + + --%test(Returns string representation of small number) + procedure to_string_verysmallnumber; + + --%endcontext + + --%test(table_to_clob - converts ut_varchar2_list into a CLOB value) + procedure test_table_to_clob; + + --%test(append_to_clob - adds multibyte varchar to CLOB) + --%beforetest(setup_append_with_multibyte) + --%aftertest(clean_append_with_multibyte) + procedure test_append_with_multibyte; + procedure setup_append_with_multibyte; + procedure clean_append_with_multibyte; + + --%test(clob_to_table - converts multibyte CLOB to ut_varchar2_list) + --%disabled(We cannot run this test successfully on 12.1 until we change NLSCHARACTERSET from US7ASCII to AL32UTF8) + procedure test_clob_to_table_multibyte; + + --%test(to_version - splits version string into individual version components) + procedure test_to_version_split; + + --%context(trim_list_elements) + + --%test(Trims the elements of a collection) + procedure test_trim_list_elements; + + --%test(Trim list elements with null collection) + procedure trim_list_elemts_null_collect; + + --%test(Trim list elements with empty collection) + procedure trim_list_elemts_empty_collect; + + --%endcontext + + --%context(filter_list) + + --%test(Filters the collection's elements) + procedure test_filter_list; + + --%test(Filter list elements with null collection) + procedure filter_list_null_collection; + + --%test(Filter list elements with empty collection) + procedure filter_list_empty_collection; + + --%endcontext + + --%test(replace_multiline_comments - replaces multi-line comments with empty lines) + procedure replace_multiline_comments; + +end test_ut_utils; +/ diff --git a/test/ut3_tester_helper/run_helper.pkb b/test/ut3_tester_helper/run_helper.pkb index 8b9353f38..b6eaba702 100644 --- a/test/ut3_tester_helper/run_helper.pkb +++ b/test/ut3_tester_helper/run_helper.pkb @@ -302,7 +302,7 @@ create or replace package body run_helper is execute immediate 'drop package stateful_package'; execute immediate 'drop package test_stateful'; end; - + procedure run(a_reporter ut3.ut_reporter_base := null) is begin ut3.ut.run(a_reporter); diff --git a/test/ut3_tester_helper/run_helper.pks b/test/ut3_tester_helper/run_helper.pks index 5611663c2..28d20d4dc 100644 --- a/test/ut3_tester_helper/run_helper.pks +++ b/test/ut3_tester_helper/run_helper.pks @@ -16,7 +16,7 @@ create or replace package run_helper is procedure create_test_suite; procedure drop_test_suite; - + procedure run(a_reporter ut3.ut_reporter_base := null); procedure run(a_path varchar2, a_reporter ut3.ut_reporter_base := null); procedure run(a_paths ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base := null); diff --git a/test/ut3_tester_helper/ut_example_tests.pkb b/test/ut3_tester_helper/ut_example_tests.pkb new file mode 100644 index 000000000..d4954fff3 --- /dev/null +++ b/test/ut3_tester_helper/ut_example_tests.pkb @@ -0,0 +1,25 @@ +create or replace package body ut_example_tests +as + + procedure set_g_number_0 as + begin + g_number := 0; + end; + + procedure add_1_to_g_number as + begin + g_number := g_number + 1; + end; + + procedure failing_procedure as + begin + g_number := 1 / 0; + end; + + procedure ut_commit_test is + begin + commit; + end; + +end; +/ diff --git a/test/ut3_tester_helper/ut_example_tests.pks b/test/ut3_tester_helper/ut_example_tests.pks new file mode 100644 index 000000000..a7077a8a8 --- /dev/null +++ b/test/ut3_tester_helper/ut_example_tests.pks @@ -0,0 +1,8 @@ +create or replace package ut_example_tests is + g_number number; + procedure set_g_number_0; + procedure add_1_to_g_number; + procedure failing_procedure; + procedure ut_commit_test; +end; +/ From 29295b7021fab6cf220460705e41bc9f20a2ebeb Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 29 Mar 2019 08:34:00 +0000 Subject: [PATCH 0369/1096] Adding set of tests: core/test_ut_executable core/test_ut_suite --- test/install_ut3_tester_helper.sql | 1 + test/install_ut3_tester_tests.sql | 4 + test/ut3_tester/core/test_ut_executable.pkb | 109 +++++++++++++ test/ut3_tester/core/test_ut_executable.pks | 33 ++++ test/ut3_tester/core/test_ut_suite.pkb | 164 ++++++++++++++++++++ test/ut3_tester/core/test_ut_suite.pks | 51 ++++++ test/ut3_tester_helper/run_helper.pkb | 78 ++++++++++ test/ut3_tester_helper/run_helper.pks | 8 + test/ut3_tester_helper/ut_test_table.sql | 12 ++ 9 files changed, 460 insertions(+) create mode 100644 test/ut3_tester/core/test_ut_executable.pkb create mode 100644 test/ut3_tester/core/test_ut_executable.pks create mode 100644 test/ut3_tester/core/test_ut_suite.pkb create mode 100644 test/ut3_tester/core/test_ut_suite.pks create mode 100644 test/ut3_tester_helper/ut_test_table.sql diff --git a/test/install_ut3_tester_helper.sql b/test/install_ut3_tester_helper.sql index 016756675..1645cd4c7 100644 --- a/test/install_ut3_tester_helper.sql +++ b/test/install_ut3_tester_helper.sql @@ -10,6 +10,7 @@ alter session set plsql_optimize_level=0; @@ut3_tester_helper/test_tab_varchar2.tps @@ut3_tester_helper/test_tab_varray.tps @@ut3_tester_helper/test_dummy_number.tps +@@ut3_tester_helper/ut_test_table.sql @@ut3_tester_helper/main_helper.pks @@ut3_tester_helper/run_helper.pks diff --git a/test/install_ut3_tester_tests.sql b/test/install_ut3_tester_tests.sql index 069eca42a..700e7c8ac 100644 --- a/test/install_ut3_tester_tests.sql +++ b/test/install_ut3_tester_tests.sql @@ -14,6 +14,8 @@ alter session set plsql_optimize_level=0; @@ut3_tester/core/expectations/test_expectation_processor.pks @@ut3_tester/core/test_ut_utils.pks @@ut3_tester/core/test_ut_test.pks +@@ut3_tester/core/test_ut_suite.pks +@@ut3_tester/core/test_ut_executable.pks @@ut3_tester/core.pkb @@ -24,6 +26,8 @@ alter session set plsql_optimize_level=0; @@ut3_tester/core/annotations/test_annot_throws_exception.pkb @@ut3_tester/core/test_ut_utils.pkb @@ut3_tester/core/test_ut_test.pkb +@@ut3_tester/core/test_ut_suite.pkb +@@ut3_tester/core/test_ut_executable.pkb set linesize 200 diff --git a/test/ut3_tester/core/test_ut_executable.pkb b/test/ut3_tester/core/test_ut_executable.pkb new file mode 100644 index 000000000..1d2e74ff3 --- /dev/null +++ b/test/ut3_tester/core/test_ut_executable.pkb @@ -0,0 +1,109 @@ +create or replace package body test_ut_executable is + + g_dbms_output_text varchar2(30) := 'Some output from procedure'; + + procedure exec_schema_package_proc is + l_executable ut3.ut_executable; + l_test ut3.ut_test; + l_result boolean; + begin + --Arrange + l_test := ut3.ut_test(a_object_name => 'test_ut_executable',a_name => 'test_ut_executable', a_line_no=> 1); + l_executable := ut3.ut_executable_test( null, 'test_ut_executable', 'passing_proc', ut3.ut_utils.gc_test_execute ); + --Act + l_result := l_executable.do_execute(l_test); + --Assert + ut.expect(l_result).to_be_true; + ut.expect(l_executable.serveroutput).to_be_null; + ut.expect(l_executable.get_error_stack_trace()).to_be_null; + end; + + procedure exec_package_proc_output is + l_executable ut3.ut_executable; + l_test ut3.ut_test; + l_result boolean; + begin + --Arrange + l_test := ut3.ut_test(a_object_name => 'test_ut_executable',a_name => 'test_ut_executable', a_line_no=> 1); + l_executable := ut3.ut_executable_test( user, 'test_ut_executable', 'output_proc', ut3.ut_utils.gc_test_execute ); + --Act + l_result := l_executable.do_execute(l_test); + --Assert + ut.expect(l_result).to_be_true; + ut.expect(l_executable.serveroutput).to_equal(to_clob(g_dbms_output_text||chr(10))); + ut.expect(l_executable.get_error_stack_trace()).to_be_null; + end; + + procedure exec_failing_proc is + l_executable ut3.ut_executable; + l_test ut3.ut_test; + l_result boolean; + begin + --Arrange + l_test := ut3.ut_test(a_object_name => 'test_ut_executable',a_name => 'test_ut_executable', a_line_no=> 1); + l_executable := ut3.ut_executable_test( user, 'test_ut_executable', 'throwing_proc', ut3.ut_utils.gc_test_execute ); + --Act + l_result := l_executable.do_execute(l_test); + --Assert + ut.expect(l_result).to_be_false; + ut.expect(l_executable.serveroutput).to_be_null; + ut.expect(l_executable.get_error_stack_trace()).to_be_like('ORA-06501: PL/SQL: program error%'); + end; + + procedure modify_stateful_package is + l_job_name varchar2(30) := 'recreate_stateful_package'; + l_cnt integer := 1; + pragma autonomous_transaction; + begin + dbms_scheduler.create_job( + job_name => l_job_name, + job_type => 'PLSQL_BLOCK', + job_action => q'/ + begin + execute immediate q'[ + create or replace package stateful_package as + g_state varchar2(3) := 'abc'; + end;]'; + end;/', + start_date => localtimestamp, + enabled => TRUE, + auto_drop => TRUE, + comments => 'one-time job' + ); + $if dbms_db_version.version >= 18 $then + dbms_session.sleep(0.4); + $else + dbms_lock.sleep(0.4); + $end + while l_cnt > 0 loop + select count(1) into l_cnt + from dba_scheduler_running_jobs srj + where srj.job_name = l_job_name; + end loop; + end; + + procedure form_name is + begin + ut.expect(ut3.ut_executable_test( user, ' package ', 'proc', null ).form_name()).to_equal(user||'.package.proc'); + ut.expect(ut3.ut_executable_test( null, 'package', ' proc ', null ).form_name()).to_equal('package.proc'); + ut.expect(ut3.ut_executable_test( null, 'proc', null, null ).form_name()).to_equal('proc'); + ut.expect(ut3.ut_executable_test( ' '||user||' ', 'proc', null, null ).form_name()).to_equal(user||'.proc'); + end; + + procedure passing_proc is + begin + null; + end; + + procedure output_proc is + begin + dbms_output.put_line(g_dbms_output_text); + end; + + procedure throwing_proc is + begin + raise program_error; + end; + +end; +/ diff --git a/test/ut3_tester/core/test_ut_executable.pks b/test/ut3_tester/core/test_ut_executable.pks new file mode 100644 index 000000000..acb91d1be --- /dev/null +++ b/test/ut3_tester/core/test_ut_executable.pks @@ -0,0 +1,33 @@ +create or replace package test_ut_executable is + + --%suite(ut_executable) + --%suitepath(utplsql.framework_tester.core) + + --%context(do_execute) + + --%test(Executes procedure in current schema when user was not provided) + procedure exec_schema_package_proc; + + --%test(Executes procedure and saves dbms_output) + procedure exec_package_proc_output; + + --%test(Executes a procedure raising exception, saves dbms_output and exception stack trace) + procedure exec_failing_proc; + + --%endcontext + + --%context(form_name) + + --%test(Builds a name for the executable test) + procedure form_name; + + --%endcontext + + procedure passing_proc; + + procedure output_proc; + + procedure throwing_proc; + +end; +/ diff --git a/test/ut3_tester/core/test_ut_suite.pkb b/test/ut3_tester/core/test_ut_suite.pkb new file mode 100644 index 000000000..3ea323a6d --- /dev/null +++ b/test/ut3_tester/core/test_ut_suite.pkb @@ -0,0 +1,164 @@ +create or replace package body test_ut_suite is + + procedure cleanup_package_state is + begin + ut3_tester_helper.ut_example_tests.g_number := null; + end; + + procedure create_trans_control is + begin + ut3_tester_helper.run_helper.create_trans_control; + end; + + procedure drop_trans_control is + begin + ut3_tester_helper.run_helper.drop_trans_control; + end; + + procedure disabled_suite is + l_suite ut3.ut_suite; + begin + --Arrange + l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); + l_suite.path := 'ut3_tester_helper.ut_example_tests'; + l_suite.disabled_flag := ut3.ut_utils.boolean_to_int(true); + l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'set_g_number_0', ut3.ut_utils.gc_before_all)); + l_suite.after_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'add_1_to_g_number', ut3.ut_utils.gc_before_all)); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => 'ut3_tester_helper', a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => 'ut3_tester_helper', a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); + --Act + l_suite.do_execute(); + --Assert + ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_be_null; + ut.expect(l_suite.result).to_equal(ut3.ut_utils.gc_disabled); + ut.expect(l_suite.results_count.disabled_count).to_equal(2); + ut.expect(l_suite.results_count.warnings_count).to_equal(0); + ut.expect(l_suite.results_count.success_count).to_equal(0); + ut.expect(l_suite.results_count.failure_count).to_equal(0); + ut.expect(l_suite.results_count.errored_count).to_equal(0); + end; + + procedure beforeall_errors is + l_suite ut3.ut_suite; + begin + --Arrange + l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); + l_suite.path := 'ut3_tester_helper.ut_example_tests'; + l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'failing_procedure', ut3.ut_utils.gc_before_all)); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'set_g_number_0', a_line_no=> 1); + --Act + l_suite.do_execute(); + --Assert + ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_be_null; + ut.expect(l_suite.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(l_suite.results_count.disabled_count).to_equal(0); + ut.expect(l_suite.results_count.warnings_count).to_equal(0); + ut.expect(l_suite.results_count.success_count).to_equal(0); + ut.expect(l_suite.results_count.failure_count).to_equal(0); + ut.expect(l_suite.results_count.errored_count).to_equal(1); + end; + + procedure aftereall_errors is + l_suite ut3.ut_suite; + begin + --Arrange + l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); + l_suite.path := 'ut3_tester_helper.ut_example_tests'; + l_suite.after_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'failing_procedure', ut3.ut_utils.gc_after_all)); + + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => 'ut3_tester_helper', a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'set_g_number_0', a_line_no=> 1); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => 'ut3_tester_helper', a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); + --Act + l_suite.do_execute(); + --Assert + ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_equal(1); + ut.expect(l_suite.result).to_equal(ut3.ut_utils.gc_success); + ut.expect(l_suite.results_count.disabled_count).to_equal(0); + ut.expect(l_suite.results_count.warnings_count).to_equal(1); + ut.expect(l_suite.results_count.success_count).to_equal(2); + ut.expect(l_suite.results_count.failure_count).to_equal(0); + ut.expect(l_suite.results_count.errored_count).to_equal(0); + end; + + procedure package_without_body is + l_suite ut3.ut_suite; + begin + l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_WITHOUT_BODY', a_line_no=> 1); + l_suite.path := 'UT_WITHOUT_BODY'; + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_name => 'ut_without_body',a_name => 'test1', a_line_no=> 1); + --Act + l_suite.do_execute(); + --Assert + ut.expect(l_suite.result).to_equal(ut3.ut_utils.gc_error); + end; + + procedure package_with_invalid_body is + l_suite ut3.ut_suite; + begin + l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_WITH_INVALID_BODY', a_line_no=> 1); + l_suite.path := 'UT_WITH_INVALID_BODY'; + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_name => 'ut_with_invalid_body',a_name => 'test1', a_line_no=> 1); + --Act + l_suite.do_execute(); + --Assert + ut.expect(l_suite.result).to_equal(ut3.ut_utils.gc_error); + end; + + procedure rollback_auto is + l_suite ut3.ut_suite; + begin + --Arrange + execute immediate 'delete from ut3_tester_helper.ut$test_table'; + l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_TRANSACTION_CONTROL', a_line_no=> 1); + l_suite.path := 'ut3_tester_helper.ut_transaction_control'; + l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_TRANSACTION_CONTROL', 'setup', ut3.ut_utils.gc_before_all)); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => USER, a_object_name => 'ut_transaction_control',a_name => 'test', a_line_no=> 1); + l_suite.set_rollback_type(ut3.ut_utils.gc_rollback_auto); + + --Act + l_suite.do_execute(); + + --Assert + ut.expect(ut3_tester_helper.main_helper.get_value(q'[ut3_tester_helper.ut_transaction_control.count_rows('t')]')).to_equal(0); + ut.expect(ut3_tester_helper.main_helper.get_value(q'[ut3_tester_helper.ut_transaction_control.count_rows('s')]')).to_equal(0); + end; + + procedure rollback_auto_on_failure is + begin + ut3_tester_helper.run_helper.test_rollback_type('test_failure', ut3.ut_utils.gc_rollback_auto, equal(0) ); + end; + + procedure rollback_manual is + begin + ut3_tester_helper.run_helper.test_rollback_type('test', ut3.ut_utils.gc_rollback_manual, be_greater_than(0) ); + end; + + procedure rollback_manual_on_failure is + begin + ut3_tester_helper.run_helper.test_rollback_type('test_failure', ut3.ut_utils.gc_rollback_manual, be_greater_than(0) ); + end; + + procedure trim_transaction_invalidators is + l_suite ut3.ut_suite; + begin + --arrange + l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); + for i in 1 .. 100 loop + l_suite.add_transaction_invalidator('schema_name.package_name.procedure_name'||i); + end loop; + --Act + l_suite.rollback_to_savepoint('dummy_savepoint'); + --Assert + ut.expect(l_suite.warnings.count).to_equal(1); + end; + +end; +/ \ No newline at end of file diff --git a/test/ut3_tester/core/test_ut_suite.pks b/test/ut3_tester/core/test_ut_suite.pks new file mode 100644 index 000000000..fd351d87f --- /dev/null +++ b/test/ut3_tester/core/test_ut_suite.pks @@ -0,0 +1,51 @@ +create or replace package test_ut_suite is + + --%suite(ut_suite) + --%suitepath(utplsql.core.framework_tester) + + --%beforeeach + procedure cleanup_package_state; + + --%test(Disabled flag skips tests execution in suite) + procedure disabled_suite; + + --%test(Marks each test as errored if beforeall raises exception) + procedure beforeall_errors; + + --%test(Reports warnings for each test if afterall raises exception) + procedure aftereall_errors; + + --%beforetest(ut3_tester_helper.run_helper.package_no_body) + --%aftertest(ut3_tester_helper.run_helper.drop_package_no_body) + --%test(Fails all tests in package when package has no body) + procedure package_without_body; + + --%test(Fails all tests in package when package body is invalid) + procedure package_with_invalid_body; + + --%context( rollback_test ) + + --%beforeall + procedure create_trans_control; + --%afterall + procedure drop_trans_control; + + --%test(Performs automatic rollback after a suite) + procedure rollback_auto; + + --%test(Performs automatic rollback after a suite even if test fails) + procedure rollback_auto_on_failure; + + --%test(rollback(manual) - disables automatic rollback after a suite) + procedure rollback_manual; + + --%test(rollback(manual) - disables automatic rollback after a suite even if test fails) + procedure rollback_manual_on_failure; + + --%endcontext + + --%test(Transaction invalidators list is trimmed in warnings when too long) + procedure trim_transaction_invalidators; + +end; +/ diff --git a/test/ut3_tester_helper/run_helper.pkb b/test/ut3_tester_helper/run_helper.pkb index b6eaba702..c8983e961 100644 --- a/test/ut3_tester_helper/run_helper.pkb +++ b/test/ut3_tester_helper/run_helper.pkb @@ -27,6 +27,49 @@ create or replace package body run_helper is execute immediate q'[grant execute on ut3_tester_helper.dummy_test_procedure to public]'; end; + procedure create_trans_control is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package ut_transaction_control as + function count_rows(a_val varchar2) return number; + procedure setup; + procedure test; + procedure test_failure; + end;]'; + + execute immediate + q'[create or replace package body ut_transaction_control + as + + function count_rows(a_val varchar2) return number is + l_cnt number; + begin + select count(*) into l_cnt from ut$test_table t where t.val = a_val; + return l_cnt; + end; + procedure setup is begin + insert into ut$test_table values ('s'); + end; + procedure test is + begin + insert into ut$test_table values ('t'); + end; + procedure test_failure is + begin + insert into ut$test_table values ('t'); + --raise no_data_found; + raise_application_error(-20001,'Error'); + end; + end;]'; + + execute immediate 'grant execute on ut_transaction_control to public'; + end; + + procedure drop_trans_control is + pragma autonomous_transaction; + begin + execute immediate 'drop package ut_transaction_control'; + end; procedure setup_cache is pragma autonomous_transaction; @@ -303,6 +346,20 @@ create or replace package body run_helper is execute immediate 'drop package test_stateful'; end; + procedure package_no_body is + pragma autonomous_transaction; + begin + execute immediate 'create or replace package ut_without_body as + procedure test1; + end;'; + end; + + procedure drop_package_no_body is + pragma autonomous_transaction; + begin + execute immediate 'drop package ut_without_body'; + end; + procedure run(a_reporter ut3.ut_reporter_base := null) is begin ut3.ut.run(a_reporter); @@ -374,5 +431,26 @@ create or replace package body run_helper is )); return l_results; end; + + procedure test_rollback_type(a_procedure_name varchar2, a_rollback_type integer, a_expectation ut3_latest_release.ut_matcher) is + l_suite ut3.ut_suite; + begin + --Arrange + execute immediate 'delete from ut$test_table'; + l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_TRANSACTION_CONTROL', a_line_no=> 1); + l_suite.path := 'ut_transaction_control'; + l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_TRANSACTION_CONTROL', 'setup', ut3.ut_utils.gc_before_all)); + l_suite.items.extend; + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => USER, a_object_name => 'ut_transaction_control',a_name => a_procedure_name, a_line_no=> 1); + l_suite.set_rollback_type(a_rollback_type); + + --Act + l_suite.do_execute(); + + --Assert + ut.expect(main_helper.get_value(q'[ut_transaction_control.count_rows('t')]')).to_( a_expectation ); + ut.expect(main_helper.get_value(q'[ut_transaction_control.count_rows('s')]')).to_( a_expectation ); + end; + end; / diff --git a/test/ut3_tester_helper/run_helper.pks b/test/ut3_tester_helper/run_helper.pks index 28d20d4dc..92767bc20 100644 --- a/test/ut3_tester_helper/run_helper.pks +++ b/test/ut3_tester_helper/run_helper.pks @@ -16,6 +16,11 @@ create or replace package run_helper is procedure create_test_suite; procedure drop_test_suite; + procedure package_no_body; + procedure drop_package_no_body; + + procedure create_trans_control; + procedure drop_trans_control; procedure run(a_reporter ut3.ut_reporter_base := null); procedure run(a_path varchar2, a_reporter ut3.ut_reporter_base := null); @@ -31,5 +36,8 @@ create or replace package run_helper is return ut3.ut_varchar2_list; function run(a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base) return ut3.ut_varchar2_list; + + procedure test_rollback_type(a_procedure_name varchar2, a_rollback_type integer, a_expectation ut3_latest_release.ut_matcher); + end; / diff --git a/test/ut3_tester_helper/ut_test_table.sql b/test/ut3_tester_helper/ut_test_table.sql new file mode 100644 index 000000000..c4832a10f --- /dev/null +++ b/test/ut3_tester_helper/ut_test_table.sql @@ -0,0 +1,12 @@ +declare + l_exists integer; +begin + select count(1) into l_exists from user_tables where table_name = 'UT$TEST_TABLE'; + if l_exists > 0 then + execute immediate 'drop table ut$test_table'; + end if; +end; +/ + +create table ut$test_table (val varchar2(1)); +grant select,insert,update,delete on ut$test_table to public; From 30b0cfef62d494d8970a83e6bd422d7d3c5feb00 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 29 Mar 2019 21:44:45 +0000 Subject: [PATCH 0370/1096] Adding set of tests: core/test_file_mapper core/test_output_buffer core/test_suite_manager core/test_ut_executable --- test/install_ut3_tester_tests.sql | 6 + test/ut3_tester/core/test_file_mapper.pkb | 45 + test/ut3_tester/core/test_file_mapper.pks | 13 + test/ut3_tester/core/test_output_buffer.pkb | 96 ++ test/ut3_tester/core/test_output_buffer.pks | 19 + test/ut3_tester/core/test_suite_manager.pkb | 1470 +++++++++++++++++++ test/ut3_tester/core/test_suite_manager.pks | 175 +++ test/ut3_tester/core/test_ut_executable.pkb | 15 +- test/ut3_tester/core/test_ut_executable.pks | 2 + test/ut3_tester_helper/main_helper.pkb | 8 + test/ut3_tester_helper/main_helper.pks | 2 + test/ut3_tester_helper/run_helper.pkb | 71 + test/ut3_tester_helper/run_helper.pks | 11 + 13 files changed, 1925 insertions(+), 8 deletions(-) create mode 100644 test/ut3_tester/core/test_file_mapper.pkb create mode 100644 test/ut3_tester/core/test_file_mapper.pks create mode 100644 test/ut3_tester/core/test_output_buffer.pkb create mode 100644 test/ut3_tester/core/test_output_buffer.pks create mode 100644 test/ut3_tester/core/test_suite_manager.pkb create mode 100644 test/ut3_tester/core/test_suite_manager.pks diff --git a/test/install_ut3_tester_tests.sql b/test/install_ut3_tester_tests.sql index 700e7c8ac..511201f16 100644 --- a/test/install_ut3_tester_tests.sql +++ b/test/install_ut3_tester_tests.sql @@ -16,6 +16,9 @@ alter session set plsql_optimize_level=0; @@ut3_tester/core/test_ut_test.pks @@ut3_tester/core/test_ut_suite.pks @@ut3_tester/core/test_ut_executable.pks +@@ut3_tester/core/test_suite_manager.pks +@@ut3_tester/core/test_file_mapper.pks +@@ut3_tester/core/test_output_buffer.pks @@ut3_tester/core.pkb @@ -28,6 +31,9 @@ alter session set plsql_optimize_level=0; @@ut3_tester/core/test_ut_test.pkb @@ut3_tester/core/test_ut_suite.pkb @@ut3_tester/core/test_ut_executable.pkb +@@ut3_tester/core/test_suite_manager.pkb +@@ut3_tester/core/test_file_mapper.pkb +@@ut3_tester/core/test_output_buffer.pkb set linesize 200 diff --git a/test/ut3_tester/core/test_file_mapper.pkb b/test/ut3_tester/core/test_file_mapper.pkb new file mode 100644 index 000000000..3813c9450 --- /dev/null +++ b/test/ut3_tester/core/test_file_mapper.pkb @@ -0,0 +1,45 @@ +create or replace package body test_file_mapper is + + procedure default_mappings is + l_actual ut3.ut_file_mappings; + l_expected ut3.ut_file_mappings; + begin + --Arrange + l_expected := ut3.ut_file_mappings( + ut3.ut_file_mapping('C:\tests\helpers\core.pkb',sys_context('USERENV', 'CURRENT_USER'),'CORE','PACKAGE BODY'), + ut3.ut_file_mapping('tests/helpers/test_file_mapper.pkb',sys_context('USERENV', 'CURRENT_USER'),'TEST_FILE_MAPPER','PACKAGE BODY') + ); + --Act + l_actual := ut3.ut_file_mapper.build_file_mappings( + ut3.ut_varchar2_list( + 'C:\tests\helpers\core.pkb', + 'tests/helpers/test_file_mapper.pkb' + ) + ); + --Assert + ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); + end; + + procedure specific_owner is + l_actual ut3.ut_file_mappings; + l_expected ut3.ut_file_mappings; + begin + --Arrange + l_expected := ut3.ut_file_mappings( + ut3.ut_file_mapping('C:\source\core\types\ut_file_mapping.tpb','UT3','UT_FILE_MAPPING','TYPE BODY'), + ut3.ut_file_mapping('source/core/ut_file_mapper.pkb','UT3','UT_FILE_MAPPER','PACKAGE BODY') + ); + --Act + l_actual := ut3.ut_file_mapper.build_file_mappings( + 'UT3', + ut3.ut_varchar2_list( + 'C:\source\core\types\ut_file_mapping.tpb', + 'source/core/ut_file_mapper.pkb' + ) + ); + --Assert + ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); + end; + +end; +/ diff --git a/test/ut3_tester/core/test_file_mapper.pks b/test/ut3_tester/core/test_file_mapper.pks new file mode 100644 index 000000000..4f9c41bd0 --- /dev/null +++ b/test/ut3_tester/core/test_file_mapper.pks @@ -0,0 +1,13 @@ +create or replace package test_file_mapper is + + --%suite(file_mapper) + --%suitepath(utplsql.framework_tester.core) + + --%test(Maps file paths into database objects using default mappings) + procedure default_mappings; + + --%test(Used specified object owner to perform mapping when files have no owner indication) + procedure specific_owner; + +end; +/ diff --git a/test/ut3_tester/core/test_output_buffer.pkb b/test/ut3_tester/core/test_output_buffer.pkb new file mode 100644 index 000000000..3b469ddb8 --- /dev/null +++ b/test/ut3_tester/core/test_output_buffer.pkb @@ -0,0 +1,96 @@ +create or replace package body test_output_buffer is + + procedure test_receive is + l_actual_text clob; + l_actual_item_type varchar2(1000); + l_remaining integer; + l_expected_text clob; + l_expected_item_type varchar2(1000); + l_buffer ut3.ut_output_buffer_base; + begin + --Arrange + l_buffer := ut3.ut_output_table_buffer(); + l_expected_text := to_clob(lpad('a text', 31000, ',a text')) + || chr(10) || to_clob(lpad('a text', 31000, ',a text')) + || chr(13) || to_clob(lpad('a text', 31000, ',a text')) + || chr(13) || chr(10) || to_clob(lpad('a text', 31000, ',a text')) || to_clob(lpad('a text', 31000, ',a text')); + l_expected_item_type := lpad('some item type',1000,'-'); + --Act + l_buffer.send_clob(l_expected_text, l_expected_item_type); + l_buffer.close(); + + select text, item_type + into l_actual_text, l_actual_item_type + from table(l_buffer.get_lines(0,0)); + + --Assert + ut.expect(l_actual_text).to_equal(l_expected_text); + ut.expect(l_actual_item_type).to_equal(l_expected_item_type); + + select count(1) into l_remaining from table(ut3_tester_helper.run_helper.ut_output_buffer_tmp) + where output_id = l_buffer.output_id; + + ut.expect(l_remaining).to_equal(0); + end; + + procedure test_doesnt_send_on_null_text is + l_cur sys_refcursor; + l_result integer; + l_buffer ut3.ut_output_buffer_base := ut3.ut_output_table_buffer(); + begin + ut3_tester_helper.run_helper.delete_buffer(); + --Act + l_buffer.send_line(null); + + open l_cur for select * from table(ut3_tester_helper.run_helper.ut_output_buffer_tmp); + ut.expect(l_cur).to_be_empty; + end; + + procedure test_send_line is + l_result varchar2(4000); + c_expected constant varchar2(4000) := lpad('a text',4000,',a text'); + l_buffer ut3.ut_output_buffer_base := ut3.ut_output_table_buffer(); + begin + l_buffer.send_line(c_expected); + + select text into l_result from table(ut3_tester_helper.run_helper.ut_output_buffer_tmp) where output_id = l_buffer.output_id; + + ut.expect(l_result).to_equal(c_expected); + end; + + procedure test_waiting_for_data is + l_result clob; + l_remaining integer; + l_expected clob; + l_buffer ut3.ut_output_buffer_base := ut3.ut_output_table_buffer(); + l_start timestamp; + l_duration interval day to second; + begin + --Arrange + l_expected := 'a text'; + l_buffer.send_line(l_expected); + l_start := localtimestamp; + --Act + begin + select text into l_result from table(l_buffer.get_lines(1,1)); + ut.fail('Expected a timeout exception but nothing was raised'); + exception + when others then + l_duration := localtimestamp - l_start; + --Assert + --Fetches data from output + ut.expect(l_result).to_equal(l_expected); + --Throws a timeout exception + ut.expect(dbms_utility.format_error_stack()).to_match('ORA'||ut3.ut_utils.gc_out_buffer_timeout); + --Waited for one second + ut.expect(l_duration).to_be_greater_than(interval '0.99' second); + end; + + select count(1) into l_remaining from table(ut3_tester_helper.run_helper.ut_output_buffer_tmp) where output_id = l_buffer.output_id; + --Data got removed from output buffer + ut.expect(l_remaining).to_equal(0); + + end; + +end test_output_buffer; +/ diff --git a/test/ut3_tester/core/test_output_buffer.pks b/test/ut3_tester/core/test_output_buffer.pks new file mode 100644 index 000000000..cf069427d --- /dev/null +++ b/test/ut3_tester/core/test_output_buffer.pks @@ -0,0 +1,19 @@ +create or replace package test_output_buffer is + + --%suite(output_buffer) + --%suitepath(utplsql.framework_tester.core) + + --%test(Receives a line from buffer table and deletes) + procedure test_receive; + + --%test(Does not send line if null text given) + procedure test_doesnt_send_on_null_text; + + --%test(Sends a line into buffer table) + procedure test_send_line; + + --%test(Waits For The Data To Appear For Specified Time) + procedure test_waiting_for_data; + +end test_output_buffer; +/ diff --git a/test/ut3_tester/core/test_suite_manager.pkb b/test/ut3_tester/core/test_suite_manager.pkb new file mode 100644 index 000000000..6f4237f9c --- /dev/null +++ b/test/ut3_tester/core/test_suite_manager.pkb @@ -0,0 +1,1470 @@ +create or replace package body test_suite_manager is + + ex_obj_doesnt_exist exception; + pragma exception_init(ex_obj_doesnt_exist, -04043); + + procedure create_dummy_long_test_package is + begin + ut3_tester_helper.run_helper.create_dummy_long_test_package(); + end; + + procedure drop_dummy_long_test_package is + begin + ut3_tester_helper.run_helper.drop_dummy_long_test_package(); + end; + + procedure compile_dummy_packages is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package test_package_1 is + + --%suite + --%displayname(test_package_1) + --%suitepath(tests) + --%rollback(manual) + + gv_glob_val number; + + --%beforeeach + procedure global_setup; + + --%aftereach + procedure global_teardown; + + --%test + --%displayname(Test1 from test package 1) + procedure test1; + + --%test(Test2 from test package 1) + --%beforetest(test2_setup) + --%aftertest(test2_teardown) + procedure test2; + + procedure test2_setup; + + procedure test2_teardown; + +end test_package_1;]'; + + execute immediate q'[create or replace package body test_package_1 is + gv_var_1 number; + gv_var_1_temp number; + + procedure global_setup is + begin + gv_var_1 := 1; + gv_glob_val := 1; + end; + + procedure global_teardown is + begin + gv_var_1 := 0; + gv_glob_val := 0; + end; + + procedure test1 is + begin + ut.expect(gv_var_1, 'Some expectation').to_equal(1); + end; + + procedure test2 is + begin + ut.expect(gv_var_1, 'Some expectation').to_equal(2); + end; + + procedure test2_setup is + begin + gv_var_1_temp := gv_var_1; + gv_var_1 := 2; + end; + + procedure test2_teardown is + begin + gv_var_1 := gv_var_1_temp; + gv_var_1_temp := null; + end; + +end test_package_1;]'; + + execute immediate q'[create or replace package test_package_2 is + --%suite + --%suitepath(tests.test_package_1) + + gv_glob_val varchar2(1); + + --%beforeeach + procedure global_setup; + + --%aftereach + procedure global_teardown; + + --%test + procedure test1; + + --%test + --%beforetest(test2_setup) + --%aftertest(test2_teardown) + procedure test2; + + procedure test2_setup; + + procedure test2_teardown; + + --%beforeall + procedure context_setup; + + --%test(Test in a context) + procedure context_test; + + --%afterall + procedure context_teardown; + +end test_package_2;]'; + + execute immediate q'[create or replace package body test_package_2 is + gv_var_1 varchar2(1); + gv_var_1_temp varchar2(1); + + procedure global_setup is + begin + gv_var_1 := 'a'; + gv_glob_val := 'z'; + end; + + procedure global_teardown is + begin + gv_var_1 := 'n'; + gv_glob_val := 'n'; + end; + + procedure test1 is + begin + ut.expect(gv_var_1).to_equal('a'); + end; + + procedure test2 is + begin + ut.expect(gv_var_1).to_equal('b'); + end; + + procedure test2_setup is + begin + gv_var_1_temp := gv_var_1; + gv_var_1 := 'b'; + end; + + procedure test2_teardown is + begin + gv_var_1 := gv_var_1_temp; + gv_var_1_temp := null; + end; + + procedure context_setup is + begin + gv_var_1_temp := gv_var_1 || 'a'; + end; + + procedure context_test is + begin + ut.expect(gv_var_1_temp, 'Some expectation').to_equal('na'); + end; + + procedure context_teardown is + begin + gv_var_1_temp := null; + end; + +end test_package_2;]'; + + execute immediate q'[create or replace package test_package_3 is + --%suite + --%suitepath(tests2) + --%rollback(auto) + + gv_glob_val number; + + --%beforeeach + procedure global_setup; + + --%aftereach + procedure global_teardown; + + --%test + --%rollback(auto) + procedure test1; + + --%test + --%beforetest(test2_setup) + --%aftertest(test2_teardown) + procedure test2; + + procedure test2_setup; + + procedure test2_teardown; + + --%test + --%disabled + procedure disabled_test; + +end test_package_3;]'; + + execute immediate q'[create or replace package body test_package_3 is + gv_var_1 number; + gv_var_1_temp number; + + procedure global_setup is + begin + gv_var_1 := 1; + gv_glob_val := 1; + end; + + procedure global_teardown is + begin + gv_var_1 := 0; + gv_glob_val := 0; + end; + + procedure test1 is + begin + ut.expect(gv_var_1).to_equal(1); + end; + + procedure test2 is + begin + ut.expect(gv_var_1).to_equal(2); + end; + + procedure test2_setup is + begin + gv_var_1_temp := gv_var_1; + gv_var_1 := 2; + end; + + procedure test2_teardown is + begin + gv_var_1 := gv_var_1_temp; + gv_var_1_temp := null; + end; + + procedure disabled_test is + begin + null; + end; + +end test_package_3;]'; + + execute immediate q'[create or replace package test_package_with_ctx is + + --%suite(test_package_with_ctx) + + gv_glob_val number; + + --%context(some_context) + --%displayname(Some context description) + + --%test + --%displayname(Test1 from test package 1) + procedure test1; + + --%endcontext + +end test_package_with_ctx;]'; + + execute immediate q'[create or replace package body test_package_with_ctx is + + procedure test1 is + begin + null; + end; + +end test_package_with_ctx;]'; + end; + + + procedure drop_dummy_packages is + pragma autonomous_transaction; + begin + execute immediate 'drop package test_package_1'; + execute immediate 'drop package test_package_2'; + execute immediate 'drop package test_package_3'; + execute immediate 'drop package test_package_with_ctx'; + end; + + procedure test_schema_run is + c_path constant varchar2(100) := sys_context('USERENV', 'CURRENT_USER'); + l_objects_to_run ut3.ut_suite_items := ut3.ut_suite_items(); + l_all_objects_to_run ut3.ut_suite_items; + + l_test0_suite ut3.ut_logical_suite; + l_test1_suite ut3.ut_logical_suite; + l_test2_suite ut3.ut_logical_suite; + begin + --Act + l_all_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + + for i in 1..l_all_objects_to_run.count loop + if l_all_objects_to_run(i).name in ('tests', 'tests2') then + l_objects_to_run.extend; + l_objects_to_run(l_objects_to_run.last) := l_all_objects_to_run(i); + end if; + end loop; + + --Assert + ut.expect(l_objects_to_run.count).to_equal(2); + + for i in 1 .. 2 loop + l_test0_suite := treat(l_objects_to_run(i) as ut3.ut_logical_suite); + ut.expect(l_test0_suite.name in ('tests', 'tests2')).to_be_true; + + l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + + case l_test0_suite.name + when 'tests' then + ut.expect(l_test1_suite.name).to_equal('test_package_1'); + ut.expect(l_test1_suite.items.count).to_equal(3); + ut.expect(l_test1_suite.rollback_type).to_equal(ut3.ut_utils.gc_rollback_manual); + l_test2_suite := treat(l_test1_suite.items(1) as ut3.ut_logical_suite); + + ut.expect(l_test2_suite.name).to_equal('test_package_2'); + ut.expect(l_test2_suite.items.count).to_equal(3); + ut.expect(l_test2_suite.rollback_type).to_equal(ut3.ut_utils.gc_rollback_manual); + when 'tests2' then + ut.expect(l_test1_suite.name).to_equal('test_package_3'); + ut.expect(l_test1_suite.items.count).to_equal(3); + end case; + + end loop; + + end; + + procedure test_top2_by_name is + c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||'.test_package_2'; + l_objects_to_run ut3.ut_suite_items; + + l_test0_suite ut3.ut_logical_suite; + l_test1_suite ut3.ut_logical_suite; + l_test2_suite ut3.ut_logical_suite; + begin + --Act + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + + ut.expect(l_test0_suite.name).to_equal('tests'); + ut.expect(l_test0_suite.items.count).to_equal(1); + l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + + ut.expect(l_test1_suite.name).to_equal('test_package_1'); + ut.expect(l_test1_suite.items.count).to_equal(1); + ut.expect(l_test1_suite.rollback_type).to_equal(ut3.ut_utils.gc_rollback_manual); + l_test2_suite := treat(l_test1_suite.items(1) as ut3.ut_logical_suite); + + ut.expect(l_test2_suite.name).to_equal('test_package_2'); + ut.expect(l_test2_suite.rollback_type).to_equal(ut3.ut_utils.gc_rollback_manual); + ut.expect(l_test2_suite.items.count).to_equal(3); + end; + + procedure test_top2_bt_name_cur_user is + c_path varchar2(100) := 'test_package_2'; + l_objects_to_run ut3.ut_suite_items; + + l_test0_suite ut3.ut_logical_suite; + l_test1_suite ut3.ut_logical_suite; + l_test2_suite ut3.ut_logical_suite; + begin + --Act + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + + ut.expect(l_test0_suite.name).to_equal('tests'); + ut.expect(l_test0_suite.items.count).to_equal(1); + l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + + ut.expect(l_test1_suite.name).to_equal('test_package_1'); + ut.expect(l_test1_suite.items.count).to_equal(1); + ut.expect(l_test1_suite.rollback_type).to_equal(ut3.ut_utils.gc_rollback_manual); + l_test2_suite := treat(l_test1_suite.items(1) as ut3.ut_logical_suite); + + ut.expect(l_test2_suite.name).to_equal('test_package_2'); + ut.expect(l_test2_suite.rollback_type).to_equal(ut3.ut_utils.gc_rollback_manual); + ut.expect(l_test2_suite.items.count).to_equal(3); + end; + + procedure test_by_path_to_subsuite is + c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||':tests.test_package_1.test_package_2'; + l_objects_to_run ut3.ut_suite_items; + + l_test0_suite ut3.ut_logical_suite; + l_test1_suite ut3.ut_logical_suite; + l_test2_suite ut3.ut_logical_suite; + begin + --Act + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + + ut.expect(l_test0_suite.name).to_equal('tests'); + ut.expect(l_test0_suite.items.count).to_equal(1); + l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + + ut.expect(l_test1_suite.name).to_equal('test_package_1'); + ut.expect(l_test1_suite.items.count).to_equal(1); + l_test2_suite := treat(l_test1_suite.items(1) as ut3.ut_logical_suite); + + ut.expect(l_test2_suite.name).to_equal('test_package_2'); + ut.expect(l_test2_suite.items.count).to_equal(3); + end; + + procedure test_by_path_to_subsuite_cu is + c_path varchar2(100) := ':tests.test_package_1.test_package_2'; + l_objects_to_run ut3.ut_suite_items; + + l_test0_suite ut3.ut_logical_suite; + l_test1_suite ut3.ut_logical_suite; + l_test2_suite ut3.ut_logical_suite; + begin + --Act + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + + ut.expect(l_test0_suite.name).to_equal('tests'); + ut.expect(l_test0_suite.items.count).to_equal(1); + l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + + ut.expect(l_test1_suite.name).to_equal('test_package_1'); + ut.expect(l_test1_suite.items.count).to_equal(1); + l_test2_suite := treat(l_test1_suite.items(1) as ut3.ut_logical_suite); + + ut.expect(l_test2_suite.name).to_equal('test_package_2'); + ut.expect(l_test2_suite.items.count).to_equal(3); + end; + + procedure test_subsute_proc_by_path is + c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||':tests.test_package_1.test_package_2.test2'; + l_objects_to_run ut3.ut_suite_items; + + l_test0_suite ut3.ut_logical_suite; + l_test1_suite ut3.ut_logical_suite; + l_test2_suite ut3.ut_logical_suite; + l_test_proc ut3.ut_test; + begin + --Act + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + + ut.expect(l_test0_suite.name).to_equal('tests'); + ut.expect(l_test0_suite.items.count).to_equal(1); + l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + + ut.expect(l_test1_suite.name).to_equal('test_package_1'); + ut.expect(l_test1_suite.rollback_type).to_equal(ut3.ut_utils.gc_rollback_manual); + ut.expect(l_test1_suite.items.count).to_equal(1); + l_test2_suite := treat(l_test1_suite.items(1) as ut3.ut_logical_suite); + + ut.expect(l_test2_suite.name).to_equal('test_package_2'); + ut.expect(l_test2_suite.rollback_type).to_equal(ut3.ut_utils.gc_rollback_manual); + ut.expect(l_test2_suite.items.count).to_equal(1); + + l_test_proc := treat(l_test2_suite.items(1) as ut3.ut_test); + ut.expect(l_test_proc.name).to_equal('test2'); + ut.expect(l_test_proc.rollback_type).to_equal(ut3.ut_utils.gc_rollback_manual); + ut.expect(l_test_proc.before_test_list.count).to_be_greater_than(0); + ut.expect(l_test_proc.after_test_list.count).to_be_greater_than(0); + + end; + + procedure test_subsute_proc_by_path_cu is + c_path varchar2(100) := ':tests.test_package_1.test_package_2.test2'; + l_objects_to_run ut3.ut_suite_items; + + l_test0_suite ut3.ut_logical_suite; + l_test1_suite ut3.ut_logical_suite; + l_test2_suite ut3.ut_logical_suite; + l_test_proc ut3.ut_test; + begin + --Act + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + + ut.expect(l_test0_suite.name).to_equal('tests'); + ut.expect(l_test0_suite.items.count).to_equal(1); + l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + + ut.expect(l_test1_suite.name).to_equal('test_package_1'); + ut.expect(l_test1_suite.items.count).to_equal(1); + l_test2_suite := treat(l_test1_suite.items(1) as ut3.ut_logical_suite); + + ut.expect(l_test2_suite.name).to_equal('test_package_2'); + ut.expect(l_test2_suite.items.count).to_equal(1); + + l_test_proc := treat(l_test2_suite.items(1) as ut3.ut_test); + ut.expect(l_test_proc.name).to_equal('test2'); + ut.expect(l_test_proc.before_test_list.count).to_be_greater_than(0); + ut.expect(l_test_proc.after_test_list.count).to_be_greater_than(0); + end; + + procedure test_top_pack_by_name is + c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||'.test_package_1'; + l_objects_to_run ut3.ut_suite_items; + + l_test0_suite ut3.ut_logical_suite; + l_test1_suite ut3.ut_suite; + begin + --Act + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + + ut.expect(l_test0_suite.name).to_equal('tests'); + ut.expect(l_test0_suite.items.count).to_equal(1); + l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_suite); + + ut.expect(l_test1_suite.name).to_equal('test_package_1'); + ut.expect(l_test1_suite.items.count).to_equal(2); + + ut.expect(l_test1_suite.items(1).name).to_equal('test1'); + ut.expect(l_test1_suite.items(1).description).to_equal('Test1 from test package 1'); + ut.expect(treat(l_test1_suite.items(1) as ut3.ut_test).before_test_list.count).to_equal(0); + ut.expect(treat(l_test1_suite.items(1) as ut3.ut_test).after_test_list.count).to_equal(0); + ut.expect(treat(l_test1_suite.items(1) as ut3.ut_test).before_each_list.count).to_be_greater_than(0); + ut.expect(treat(l_test1_suite.items(1) as ut3.ut_test).disabled_flag).to_equal(0); + + ut.expect(l_test1_suite.items(2).name).to_equal('test2'); + ut.expect(l_test1_suite.items(2).description).to_equal('Test2 from test package 1'); + ut.expect(treat(l_test1_suite.items(2) as ut3.ut_test).before_test_list.count).to_be_greater_than(0); + ut.expect(treat(l_test1_suite.items(2) as ut3.ut_test).after_test_list.count).to_be_greater_than(0); + ut.expect(treat(l_test1_suite.items(2) as ut3.ut_test).before_each_list.count).to_be_greater_than(0); + ut.expect(treat(l_test1_suite.items(2) as ut3.ut_test).disabled_flag).to_equal(0); + + end; + + procedure test_top_pack_by_name_cu is + c_path varchar2(100) := 'test_package_1'; + l_objects_to_run ut3.ut_suite_items; + + l_test0_suite ut3.ut_logical_suite; + l_test1_suite ut3.ut_suite; + l_test2_suite ut3.ut_suite; + begin + --Act + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + + ut.expect(l_test0_suite.name).to_equal('tests'); + ut.expect(l_test0_suite.items.count).to_equal(1); + l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_suite); + + ut.expect(l_test1_suite.name).to_equal('test_package_1'); + ut.expect(l_test1_suite.items.count).to_equal(2); + + ut.expect(l_test1_suite.items(1).name).to_equal('test1'); + ut.expect(l_test1_suite.items(1).description).to_equal('Test1 from test package 1'); + ut.expect(treat(l_test1_suite.items(1) as ut3.ut_test).before_test_list.count).to_equal(0); + ut.expect(treat(l_test1_suite.items(1) as ut3.ut_test).after_test_list.count).to_equal(0); + ut.expect(treat(l_test1_suite.items(1) as ut3.ut_test).before_each_list.count).to_be_greater_than(0); + ut.expect(treat(l_test1_suite.items(1) as ut3.ut_test).disabled_flag).to_equal(0); + + ut.expect(l_test1_suite.items(2).name).to_equal('test2'); + ut.expect(l_test1_suite.items(2).description).to_equal('Test2 from test package 1'); + ut.expect(treat(l_test1_suite.items(2) as ut3.ut_test).before_test_list.count).to_be_greater_than(0); + ut.expect(treat(l_test1_suite.items(2) as ut3.ut_test).after_test_list.count).to_be_greater_than(0); + ut.expect(treat(l_test1_suite.items(2) as ut3.ut_test).before_each_list.count).to_be_greater_than(0); + ut.expect(treat(l_test1_suite.items(2) as ut3.ut_test).disabled_flag).to_equal(0); + + end; + + procedure test_top_pack_by_path is + c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||':tests'; + l_objects_to_run ut3.ut_suite_items; + + l_test0_suite ut3.ut_logical_suite; + l_test1_suite ut3.ut_logical_suite; + l_test2_suite ut3.ut_logical_suite; + begin + --Act + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + + ut.expect(l_test0_suite.name).to_equal('tests'); + ut.expect(l_test0_suite.items.count).to_equal(1); + l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + + ut.expect(l_test1_suite.name).to_equal('test_package_1'); + ut.expect(l_test1_suite.items.count).to_equal(3); + l_test2_suite := treat(l_test1_suite.items(1) as ut3.ut_logical_suite); + + ut.expect(l_test2_suite.name).to_equal('test_package_2'); + ut.expect(l_test2_suite.items.count).to_equal(3); + end; + + procedure test_top_pack_by_path_cu is + c_path varchar2(100) := ':tests'; + l_objects_to_run ut3.ut_suite_items; + + l_test0_suite ut3.ut_logical_suite; + l_test1_suite ut3.ut_logical_suite; + l_test2_suite ut3.ut_logical_suite; + begin + --Act + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + + ut.expect(l_test0_suite.name).to_equal('tests'); + ut.expect(l_test0_suite.items.count).to_equal(1); + l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + + ut.expect(l_test1_suite.name).to_equal('test_package_1'); + ut.expect(l_test1_suite.items.count).to_equal(3); + l_test2_suite := treat(l_test1_suite.items(1) as ut3.ut_logical_suite); + + ut.expect(l_test2_suite.name).to_equal('test_package_2'); + ut.expect(l_test2_suite.items.count).to_equal(3); + end; + + procedure test_top_pck_proc_by_path is + c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||':tests.test_package_1.test2'; + l_objects_to_run ut3.ut_suite_items; + + l_test0_suite ut3.ut_logical_suite; + l_test1_suite ut3.ut_logical_suite; + l_test2_suite ut3.ut_logical_suite; + l_test_proc ut3.ut_test; + begin + --Act + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + + ut.expect(l_test0_suite.name).to_equal('tests'); + ut.expect(l_test0_suite.items.count).to_equal(1); + l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + + ut.expect(l_test1_suite.name).to_equal('test_package_1'); + ut.expect(l_test1_suite.items.count).to_equal(1); + l_test_proc := treat(l_test1_suite.items(1) as ut3.ut_test); + + ut.expect(l_test_proc.name).to_equal('test2'); + ut.expect(l_test_proc.description).to_equal('Test2 from test package 1'); + ut.expect(l_test_proc.before_test_list.count).to_be_greater_than(0); + ut.expect(l_test_proc.after_test_list.count).to_be_greater_than(0); + end; + + procedure test_top_pck_proc_by_path_cu is + c_path varchar2(100) := ':tests.test_package_1.test2'; + l_objects_to_run ut3.ut_suite_items; + + l_test0_suite ut3.ut_logical_suite; + l_test1_suite ut3.ut_logical_suite; + l_test2_suite ut3.ut_logical_suite; + l_test_proc ut3.ut_test; + begin + --Act + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + + ut.expect(l_test0_suite.name).to_equal('tests'); + ut.expect(l_test0_suite.items.count).to_equal(1); + l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + + ut.expect(l_test1_suite.name).to_equal('test_package_1'); + ut.expect(l_test1_suite.items.count).to_equal(1); + l_test_proc := treat(l_test1_suite.items(1) as ut3.ut_test); + + ut.expect(l_test_proc.name).to_equal('test2'); + ut.expect(l_test_proc.description).to_equal('Test2 from test package 1'); + ut.expect(l_test_proc.before_test_list.count).to_be_greater_than(0); + ut.expect(l_test_proc.after_test_list.count).to_be_greater_than(0); + end; + + procedure test_top_pkc_proc_by_name is + c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||'.test_package_1.test2'; + l_objects_to_run ut3.ut_suite_items; + + l_test0_suite ut3.ut_logical_suite; + l_test1_suite ut3.ut_logical_suite; + l_test_proc ut3.ut_test; + begin + --Act + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + + ut.expect(l_test0_suite.name).to_equal('tests'); + ut.expect(l_test0_suite.items.count).to_equal(1); + l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + + ut.expect(l_test1_suite.name).to_equal('test_package_1'); + ut.expect(l_test1_suite.items.count).to_equal(1); + + l_test_proc := treat(l_test1_suite.items(1) as ut3.ut_test); + ut.expect(l_test_proc.name).to_equal('test2'); + ut.expect(l_test_proc.before_test_list.count).to_be_greater_than(0); + ut.expect(l_test_proc.after_test_list.count).to_be_greater_than(0); + end; + + procedure test_top_pkc_proc_by_name_cu is + c_path varchar2(100) := 'test_package_1.test2'; + l_objects_to_run ut3.ut_suite_items; + + l_test0_suite ut3.ut_logical_suite; + l_test1_suite ut3.ut_logical_suite; + l_test_proc ut3.ut_test; + begin + --Act + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + + ut.expect(l_test0_suite.name).to_equal('tests'); + ut.expect(l_test0_suite.items.count).to_equal(1); + l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + + ut.expect(l_test1_suite.name).to_equal('test_package_1'); + ut.expect(l_test1_suite.items.count).to_equal(1); + + l_test_proc := treat(l_test1_suite.items(1) as ut3.ut_test); + ut.expect(l_test_proc.name).to_equal('test2'); + ut.expect(l_test_proc.before_test_list.count).to_be_greater_than(0); + ut.expect(l_test_proc.after_test_list.count).to_be_greater_than(0); + end; + + procedure test_top_pkc_nosub_by_name is + c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||'.test_package_3'; + l_objects_to_run ut3.ut_suite_items; + + l_test0_suite ut3.ut_logical_suite; + l_test1_suite ut3.ut_logical_suite; + l_test1 ut3.ut_test; + l_test3 ut3.ut_test; + begin + --Act + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + + ut.expect(l_test0_suite.name).to_equal('tests2'); + ut.expect(l_test0_suite.items.count).to_equal(1); + l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + + ut.expect(l_test1_suite.name).to_equal('test_package_3'); + ut.expect(l_test1_suite.items.count).to_equal(3); + + l_test1 := treat(l_test1_suite.items(1) as ut3.ut_test); + ut.expect(l_test1.name).to_equal('test1'); + ut.expect(l_test1.DISABLED_FLAG).to_equal(0); + + l_test3 := treat(l_test1_suite.items(3) as ut3.ut_test); + ut.expect(l_test3.name).to_equal('disabled_test'); + ut.expect(l_test3.DISABLED_FLAG).to_equal(1); + end; + + procedure test_top_pkc_nosub_by_name_cu is + c_path varchar2(100) := 'test_package_3'; + l_objects_to_run ut3.ut_suite_items; + + l_test0_suite ut3.ut_logical_suite; + l_test1_suite ut3.ut_logical_suite; + l_test1 ut3.ut_test; + l_test3 ut3.ut_test; + begin + --Act + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + + ut.expect(l_test0_suite.name).to_equal('tests2'); + ut.expect(l_test0_suite.items.count).to_equal(1); + l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + + ut.expect(l_test1_suite.name).to_equal('test_package_3'); + ut.expect(l_test1_suite.items.count).to_equal(3); + + l_test1 := treat(l_test1_suite.items(1) as ut3.ut_test); + ut.expect(l_test1.name).to_equal('test1'); + ut.expect(l_test1.DISABLED_FLAG).to_equal(0); + + l_test3 := treat(l_test1_suite.items(3) as ut3.ut_test); + ut.expect(l_test3.name).to_equal('disabled_test'); + ut.expect(l_test3.DISABLED_FLAG).to_equal(1); + end; + + procedure test_top_subpck_by_path is + c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||':tests2.test_package_3'; + l_objects_to_run ut3.ut_suite_items; + + l_test0_suite ut3.ut_logical_suite; + l_test1_suite ut3.ut_logical_suite; + l_test1 ut3.ut_test; + l_test3 ut3.ut_test; + begin + --Act + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + + ut.expect(l_test0_suite.name).to_equal('tests2'); + ut.expect(l_test0_suite.items.count).to_equal(1); + l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + + ut.expect(l_test1_suite.name).to_equal('test_package_3'); + ut.expect(l_test1_suite.items.count).to_equal(3); + + l_test1 := treat(l_test1_suite.items(1) as ut3.ut_test); + ut.expect(l_test1.name).to_equal('test1'); + ut.expect(l_test1.DISABLED_FLAG).to_equal(0); + + l_test3 := treat(l_test1_suite.items(3) as ut3.ut_test); + ut.expect(l_test3.name).to_equal('disabled_test'); + ut.expect(l_test3.DISABLED_FLAG).to_equal(1); + end; + + procedure test_top_subpck_by_path_cu is + c_path varchar2(100) := ':tests2.test_package_3'; + l_objects_to_run ut3.ut_suite_items; + + l_test0_suite ut3.ut_logical_suite; + l_test1_suite ut3.ut_logical_suite; + l_test1 ut3.ut_test; + l_test3 ut3.ut_test; + begin + --Act + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + + ut.expect(l_test0_suite.name).to_equal('tests2'); + ut.expect(l_test0_suite.items.count).to_equal(1); + l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + + ut.expect(l_test1_suite.name).to_equal('test_package_3'); + ut.expect(l_test1_suite.items.count).to_equal(3); + + l_test1 := treat(l_test1_suite.items(1) as ut3.ut_test); + ut.expect(l_test1.name).to_equal('test1'); + ut.expect(l_test1.DISABLED_FLAG).to_equal(0); + + l_test3 := treat(l_test1_suite.items(3) as ut3.ut_test); + ut.expect(l_test3.name).to_equal('disabled_test'); + ut.expect(l_test3.DISABLED_FLAG).to_equal(1); + end; + + procedure test_search_invalid_pck is + l_objects_to_run ut3.ut_suite_items; + begin + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('failing_invalid_spec')); + + ut3.ut.expect(l_objects_to_run.count).to_be_greater_than(0); + ut3.ut.expect(l_objects_to_run(l_objects_to_run.first).object_name).to_equal('failing_invalid_spec'); + end; + + procedure compile_invalid_package is + ex_compilation_error exception; + pragma exception_init(ex_compilation_error,-24344); + pragma autonomous_transaction; + begin + begin + execute immediate q'[create or replace package failing_invalid_spec as + --%suite + gv_glob_val non_existing_table.id%type := 0; + + --%beforeall + procedure before_all; + --%test + procedure test1; + --%test + procedure test2; +end;]'; + exception when ex_compilation_error then null; + end; + begin + execute immediate q'[create or replace package body failing_invalid_spec as + procedure before_all is begin gv_glob_val := 1; end; + procedure test1 is begin ut.expect(1).to_equal(1); end; + procedure test2 is begin ut.expect(1).to_equal(1); end; +end;]'; + exception when ex_compilation_error then null; + end; + end; + procedure drop_invalid_package is + pragma autonomous_transaction; + begin + execute immediate 'drop package failing_invalid_spec'; + end; + + procedure test_search_nonexisting_pck is + l_objects_to_run ut3.ut_suite_items; + begin + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('ut3.failing_non_existing')); + ut.fail('Non existing package did not raise exception'); + exception + when others then + ut.expect(sqlerrm).to_be_like('%failing_non_existing%'); + end; + + procedure test_search_nonexist_sch_pck is + l_objects_to_run ut3.ut_suite_items; + begin + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('failing_non_existing')); + ut.fail('Non existing package without schema did not raise exception'); + exception + when others then + ut.expect(sqlerrm).to_be_like('%ORA-44001: invalid schema%'); + end; + + procedure test_desc_with_comma is + l_objects_to_run ut3.ut_suite_items; + l_suite ut3.ut_suite; + l_test ut3.ut_test; + begin + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('tst_package_to_be_dropped')); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + + l_suite := treat(l_objects_to_run(1) as ut3.ut_suite); + + ut.expect(l_suite.name).to_equal('tst_package_to_be_dropped'); + ut.expect(l_suite.description).to_equal('A suite description, though with comma, is assigned by suite_manager'); + ut.expect(l_suite.items.count).to_equal(2); + + l_test := treat(l_suite.items(1) as ut3.ut_test); + + ut.expect(l_test.name).to_equal('test1'); + ut.expect(l_test.description).to_equal('A test description, though with comma, is assigned by suite_manager'); + +-- l_test := treat(l_suite.items(2) as ut3.ut_test); +-- +-- ut.expect(l_test.name).to_equal('test2'); +-- ut.expect(l_test.description).to_equal('A test description, though with comma, is assigned by suite_manager'); + + end; + procedure setup_desc_with_comma is + pragma autonomous_transaction; + begin + execute immediate 'create or replace package tst_package_to_be_dropped as + --%suite(A suite description, though with comma, is assigned by suite_manager) + + --%test(A test description, though with comma, is assigned by suite_manager) + procedure test1; + + --%test + --%displayname(A test description, though with comma, is assigned by suite_manager) + procedure test2; +end;'; + + execute immediate 'create or replace package body tst_package_to_be_dropped as + procedure test1 is begin ut.expect(1).to_equal(1); end; + procedure test2 is begin ut.expect(1).to_equal(1); end; +end;'; + end; + procedure clean_desc_with_comma is + pragma autonomous_transaction; + begin + begin + execute immediate 'drop package tst_package_to_be_dropped'; + exception + when ex_obj_doesnt_exist then + null; + end; + end; + + procedure test_inv_cache_on_drop is + l_test_report ut3.ut_varchar2_list; + begin + + select * bulk collect into l_test_report from table(ut3.ut.run(sys_context('USERENV', 'CURRENT_USER')||'.tst_package_to_be_dropped')); + + -- drop package + clean_inv_cache_on_drop; + + begin + select * bulk collect into l_test_report from table(ut3.ut.run(sys_context('USERENV', 'CURRENT_USER') || '.tst_package_to_be_dropped')); + ut.fail('Cache not invalidated on package drop'); + exception + when others then + ut.expect(sqlerrm).to_be_like('%tst_package_to_be_dropped%does not exist%'); + end; + + end; + procedure setup_inv_cache_on_drop is + pragma autonomous_transaction; + begin + execute immediate 'create or replace package tst_package_to_be_dropped as + --%suite + + --%test + procedure test1; +end;'; + + execute immediate 'create or replace package body tst_package_to_be_dropped as + procedure test1 is begin ut.expect(1).to_equal(1); end; + procedure test2 is begin ut.expect(1).to_equal(1); end; +end;'; + end; + + procedure clean_inv_cache_on_drop is + pragma autonomous_transaction; + begin + execute immediate 'drop package tst_package_to_be_dropped'; + exception + when ex_obj_doesnt_exist then + null; + end; + + procedure test_inv_pck_bodies is + l_test_report ut3.ut_varchar2_list; + begin + + select * bulk collect into l_test_report from table(ut3.ut.run(sys_context('USERENV', 'CURRENT_USER')||'.test_dependencies')); + + ut.expect(l_test_report(l_test_report.count-1)).to_be_like('1 test_, 0 failed, 0 errored, 0 disabled, 0 warning(s)'); + --execute immediate 'select * from table(ut3.ut.run(''UT3.test_dependencies'', ut3.utplsql_test_reporter()))' into l_result; + +-- ut.expect(l_result).to_equal(ut3.ut_utils.gc_success); + end; + procedure setup_inv_pck_bodies is + pragma autonomous_transaction; + begin + execute immediate 'create table test_dependency_table (id integer)'; + execute immediate 'create or replace package test_dependencies as + -- %suite + + -- %test + procedure dependant; +end;'; + execute immediate 'create or replace package body test_dependencies as + gc_dependant_variable test_dependency_table.id%type; + procedure dependant is begin null; end; +end;'; + + execute immediate 'alter table test_dependency_table modify id number'; + + end; + procedure clean_inv_pck_bodies is + pragma autonomous_transaction; + begin + execute immediate 'drop table test_dependency_table'; + execute immediate 'drop package test_dependencies'; + end; + + procedure test_pck_with_dollar is + l_objects_to_run ut3.ut_suite_items; + l_suite ut3.ut_suite; + begin + --act + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('tst_package_with$dollar')); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + + l_suite := treat(l_objects_to_run(1) as ut3.ut_suite); + ut.expect(l_suite.name).to_equal('tst_package_with$dollar'); + end; + procedure setup_pck_with_dollar is + pragma autonomous_transaction; + begin + execute immediate 'create or replace package tst_package_with$dollar as + --%suite + + --%test + procedure test1; +end;'; + + execute immediate 'create or replace package body tst_package_with$dollar as + procedure test1 is begin ut.expect(1).to_equal(1); end; + procedure test2 is begin ut.expect(1).to_equal(1); end; +end;'; + end; + procedure clean_pck_with_dollar is + pragma autonomous_transaction; + begin + execute immediate 'drop package tst_package_with$dollar'; + end; + + + procedure test_pck_with_hash is + l_objects_to_run ut3.ut_suite_items; + l_suite ut3.ut_suite; + begin + --act + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('tst_package_with#hash')); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + + l_suite := treat(l_objects_to_run(1) as ut3.ut_suite); + ut.expect(l_suite.name).to_equal('tst_package_with#hash'); + end; + procedure setup_pck_with_hash is + pragma autonomous_transaction; + begin + execute immediate 'create or replace package tst_package_with#hash as + --%suite + + --%test + procedure test1; +end;'; + + execute immediate 'create or replace package body tst_package_with#hash as + procedure test1 is begin ut.expect(1).to_equal(1); end; + procedure test2 is begin ut.expect(1).to_equal(1); end; +end;'; + end; + procedure clean_pck_with_hash is + pragma autonomous_transaction; + begin + execute immediate 'drop package tst_package_with#hash'; + end; + + + procedure test_test_with_dollar is + l_objects_to_run ut3.ut_suite_items; + l_suite ut3.ut_suite; + l_test ut3.ut_test; + begin + --act + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('tst_package_with_dollar_test.test$1')); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + + l_suite := treat(l_objects_to_run(1) as ut3.ut_suite); + + ut.expect(l_suite.name).to_equal('tst_package_with_dollar_test'); + ut.expect(l_suite.items.count).to_equal(1); + + l_test := treat(l_suite.items(1) as ut3.ut_test); + + ut.expect(l_test.name).to_equal('test$1'); + + end; + procedure setup_test_with_dollar is + pragma autonomous_transaction; + begin + execute immediate 'create or replace package tst_package_with_dollar_test as + --%suite + + --%test + procedure test$1; +end;'; + + execute immediate 'create or replace package body tst_package_with_dollar_test as + procedure test$1 is begin ut.expect(1).to_equal(1); end; +end;'; + end; + procedure clean_test_with_dollar is + pragma autonomous_transaction; + begin + execute immediate 'drop package tst_package_with_dollar_test'; + end; + + procedure test_test_with_hash is + l_objects_to_run ut3.ut_suite_items; + l_suite ut3.ut_suite; + l_test ut3.ut_test; + begin + --act + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('tst_package_with_hash_test.test#1')); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + + l_suite := treat(l_objects_to_run(1) as ut3.ut_suite); + + ut.expect(l_suite.name).to_equal('tst_package_with_hash_test'); + ut.expect(l_suite.items.count).to_equal(1); + + l_test := treat(l_suite.items(1) as ut3.ut_test); + + ut.expect(l_test.name).to_equal('test#1'); + + end; + procedure setup_test_with_hash is + pragma autonomous_transaction; + begin + execute immediate 'create or replace package tst_package_with_hash_test as + --%suite + + --%test + procedure test#1; +end;'; + + execute immediate 'create or replace package body tst_package_with_hash_test as + procedure test#1 is begin ut.expect(1).to_equal(1); end; +end;'; + end; + procedure clean_test_with_hash is + pragma autonomous_transaction; + begin + execute immediate 'drop package tst_package_with_hash_test'; + end; + + procedure test_empty_suite_path is + l_objects_to_run ut3.ut_suite_items; + l_suite ut3.ut_suite; + begin + + --act + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('tst_empty_suite_path')); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + + l_suite := treat(l_objects_to_run(1) as ut3.ut_suite); + + ut.expect(l_suite.name).to_equal('tst_empty_suite_path'); + end; + + procedure setup_empty_suite_path is + pragma autonomous_transaction; + begin + execute immediate 'create or replace package tst_empty_suite_path as + --%suite + --%suitepath + + --%test + procedure test1; +end;'; + execute immediate 'create or replace package body tst_empty_suite_path as + procedure test1 is begin ut.expect(1).to_equal(1); end; +end;'; + end; + + procedure clean_empty_suite_path is + pragma autonomous_transaction; + begin + execute immediate 'drop package tst_empty_suite_path'; + end; + + procedure test_pck_with_same_path is + l_objects_to_run ut3.ut_suite_items; + l_suite1 ut3.ut_logical_suite; + l_suite2 ut3.ut_logical_suite; + l_suite3 ut3.ut_suite; + begin + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(':test1.test2$.test_package_same_1')); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + + l_suite1 := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + ut.expect(l_suite1.name).to_equal('test1'); + ut.expect(l_suite1.items.count).to_equal(1); + + l_suite2 := treat(l_suite1.items(1) as ut3.ut_logical_suite); + ut.expect(l_suite2.name).to_equal('test2$'); + ut.expect(l_suite2.items.count).to_equal(1); + + l_suite3 := treat(l_suite2.items(1) as ut3.ut_suite); + ut.expect(l_suite3.name).to_equal('test_package_same_1'); + end; + + procedure setup_pck_with_same_path is + pragma autonomous_transaction; + begin + execute immediate 'create or replace package test_package_same_1 as + --%suite + --%suitepath(test1.test2$) + + --%test + procedure test1; +end;'; + execute immediate 'create or replace package body test_package_same_1 as + procedure test1 is begin null; end; +end;'; + execute immediate 'create or replace package test_package_same_1_a as + --%suite + --%suitepath(test1.test2$) + + --%test + procedure test1; +end;'; + execute immediate 'create or replace package body test_package_same_1_a as + procedure test1 is begin null; end; +end;'; + end; + + procedure clean_pck_with_same_path is + pragma autonomous_transaction; + begin + execute immediate 'drop package test_package_same_1'; + execute immediate 'drop package test_package_same_1_a'; + end; + + procedure setup_disabled_pck is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package test_disabled_floating as + --%suite + + --%test + procedure test1; + + --%disabled + + --%test + procedure test2; + +end;]'; + end; + + procedure clean_disabled_pck is + pragma autonomous_transaction; + begin + execute immediate 'drop package test_disabled_floating'; + end; + + procedure disable_suite_floating_annot is + l_objects_to_run ut3.ut_suite_items; + l_suite ut3.ut_suite; + begin + --Arrange + setup_disabled_pck; + --Act + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('test_disabled_floating')); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_suite := treat(l_objects_to_run(1) as ut3.ut_suite); + ut.expect(l_suite.name).to_equal('test_disabled_floating'); + ut.expect(l_suite.get_disabled_flag()).to_be_true(); + + clean_disabled_pck; + end; + + procedure pck_proc_in_ctx_by_name is + c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||'.test_package_with_ctx.test1'; + l_objects_to_run ut3.ut_suite_items; + + l_test_suite ut3.ut_logical_suite; + l_ctx_suite ut3.ut_logical_suite; + l_test_proc ut3.ut_test; + begin + --Act + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + + l_test_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + ut.expect(l_test_suite.name).to_equal('test_package_with_ctx'); + ut.expect(l_test_suite.items.count).to_equal(1); + + l_ctx_suite := treat(l_test_suite.items(1) as ut3.ut_logical_suite); + ut.expect(l_ctx_suite.name).to_equal('some_context'); + ut.expect(l_ctx_suite.description).to_equal('Some context description'); + ut.expect(l_ctx_suite.items.count).to_equal(1); + + l_test_proc := treat(l_ctx_suite.items(1) as ut3.ut_test); + ut.expect(l_test_proc.name).to_equal('test1'); + end; + + procedure pck_proc_in_ctx_by_path is + c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||':test_package_with_ctx.some_context.test1'; + l_objects_to_run ut3.ut_suite_items; + + l_test_suite ut3.ut_logical_suite; + l_ctx_suite ut3.ut_logical_suite; + l_test_proc ut3.ut_test; + begin + --Act + l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + + l_test_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + ut.expect(l_test_suite.name).to_equal('test_package_with_ctx'); + ut.expect(l_test_suite.items.count).to_equal(1); + + l_ctx_suite := treat(l_test_suite.items(1) as ut3.ut_logical_suite); + ut.expect(l_ctx_suite.name).to_equal('some_context'); + ut.expect(l_ctx_suite.description).to_equal('Some context description'); + ut.expect(l_ctx_suite.items.count).to_equal(1); + + l_test_proc := treat(l_ctx_suite.items(1) as ut3.ut_test); + ut.expect(l_test_proc.name).to_equal('test1'); + end; + + procedure test_get_schema_ut_packages is + l_expected ut3.ut_object_names; + l_actual ut3.ut_object_names; + begin + l_expected := ut3.ut_object_names( + ut3.ut_object_name('UT3','SOME_TEST_PACKAGE') + ); + l_actual := ut3_tester_helper.run_helper.get_object_name('UT3'); + + ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); + end; + + procedure create_ut3_suite is + begin + ut3_tester_helper.run_helper.create_ut3_suite(); + end; + + procedure drop_ut3_suite is + pragma autonomous_transaction; + begin + ut3_tester_helper.run_helper.drop_ut3_suite(); + end; + + procedure add_new_long_test_package is + l_actual ut3.ut_object_names; + l_expected_message varchar2(500); + begin + l_expected_message := q'[ORA-20217: 'Suitepath exceeds 1000 CHAR on: UT3.DUMMY_LONG_TEST_PACKAGE,UT3.DUMMY_LONG_TEST_PACKAGE1'%]'; + l_actual := ut3_tester_helper.run_helper.get_object_name('UT3'); + ut.fail('Expected exception for suitpaths over 1k for two packages'); + exception + when others then + ut.expect(dbms_utility.format_error_stack()).to_be_like(l_expected_message); + ut.expect(SQLCODE).to_equal(ut3.ut_utils.gc_value_too_large); + end; + +end test_suite_manager; +/ diff --git a/test/ut3_tester/core/test_suite_manager.pks b/test/ut3_tester/core/test_suite_manager.pks new file mode 100644 index 000000000..43f288224 --- /dev/null +++ b/test/ut3_tester/core/test_suite_manager.pks @@ -0,0 +1,175 @@ +create or replace package test_suite_manager is + + --%suite(suite_manager) + --%suitepath(utplsql.framework_tester.core) + + procedure create_dummy_long_test_package; + + procedure drop_dummy_long_test_package; + + --%beforeall + procedure compile_dummy_packages; + --%afterall + procedure drop_dummy_packages; + + --%test(Prepare Runner For The Schema) + procedure test_schema_run; + + --%test(Prepare runner for the top 2 package by package user.package_name) + procedure test_top2_by_name; + + --%test(Prepare runner for the top2 package by name cur user) + procedure test_top2_bt_name_cur_user; + + --%test(Prepare runner for the subsuite by path) + procedure test_by_path_to_subsuite; + + --%test(Prepare runner for the subsuite by path for current user) + procedure test_by_path_to_subsuite_cu; + + --%test(Prepare runner for the subsuite proc only by path) + procedure test_subsute_proc_by_path; + + --%test(Prepare runner for the subsuite proc only by path for current user) + procedure test_subsute_proc_by_path_cu; + + --%test(Prepare runner for the top package by package name) + procedure test_top_pack_by_name; + + --%test(Prepare runner for the top package by package name for current user) + procedure test_top_pack_by_name_cu; + + --%test(Prepare runner for the top package by path) + procedure test_top_pack_by_path; + + --%test(Prepare runner for the top package by path for current user) + procedure test_top_pack_by_path_cu; + + --%test(Prepare runner for the top package procedure by path) + procedure test_top_pck_proc_by_path; + + --%test(Prepare runner for the top package procedure by path for current user) + procedure test_top_pck_proc_by_path_cu; + + --%test(Prepare runner for the top package procedure without sub-suites by package name) + procedure test_top_pkc_proc_by_name; + + --%test(Prepare runner for the top package procedure without sub-suites by package name for current user) + procedure test_top_pkc_proc_by_name_cu; + + --%test(Prepare runner for the top package without sub-suites by package name) + procedure test_top_pkc_nosub_by_name; + + --%test(Prepare runner for the top package without sub-suites by package name for current user) + procedure test_top_pkc_nosub_by_name_cu; + + --%test(Prepare runner for the suites package by path) + procedure test_top_subpck_by_path; + + --%test(Prepare runner for the suites package by path for current user) + procedure test_top_subpck_by_path_cu; + + --%test(Prepare runner for invalid package - it will add to suite but fail on exec ) + --%beforetest(compile_invalid_package) + --%aftertest(drop_invalid_package) + procedure test_search_invalid_pck; + procedure compile_invalid_package; + procedure drop_invalid_package; + + --%test(Prepare runner for nonexisting package with schema) + procedure test_search_nonexisting_pck; + + --%test(Prepare runner for nonexisting package without schema) + procedure test_search_nonexist_sch_pck; + + --%test(Test description with comma) + --%beforetest(setup_desc_with_comma) + --%aftertest(clean_desc_with_comma) + procedure test_desc_with_comma; + procedure setup_desc_with_comma; + procedure clean_desc_with_comma; + + --%test(Invalidate cache on package drop) + --%beforetest(setup_inv_cache_on_drop) + --%aftertest(clean_inv_cache_on_drop) + procedure test_inv_cache_on_drop; + procedure setup_inv_cache_on_drop; + procedure clean_inv_cache_on_drop; + + --%test(Includes Invalid Package Bodies In The Run) + --%beforetest(setup_inv_pck_bodies) + --%aftertest(clean_inv_pck_bodies) + procedure test_inv_pck_bodies; + procedure setup_inv_pck_bodies; + procedure clean_inv_pck_bodies; + + --%test(Package With Dollar Sign) + --%beforetest(setup_pck_with_dollar) + --%aftertest(clean_pck_with_dollar) + procedure test_pck_with_dollar; + procedure setup_pck_with_dollar; + procedure clean_pck_with_dollar; + + --%test(Package With Hash Sign) + --%beforetest(setup_pck_with_hash) + --%aftertest(clean_pck_with_hash) + procedure test_pck_with_hash; + procedure setup_pck_with_hash; + procedure clean_pck_with_hash; + + --%test(Package with test with dollar sign) + --%beforetest(setup_test_with_dollar) + --%aftertest(clean_test_with_dollar) + procedure test_test_with_dollar; + procedure setup_test_with_dollar; + procedure clean_test_with_dollar; + + --%test(Package with test with hash sign) + --%beforetest(setup_test_with_hash) + --%aftertest(clean_test_with_hash) + procedure test_test_with_hash; + procedure setup_test_with_hash; + procedure clean_test_with_hash; + + + --%test(Setup suite with empty suitepath) + --%beforetest(setup_empty_suite_path) + --%aftertest(clean_empty_suite_path) + procedure test_empty_suite_path; + procedure setup_empty_suite_path; + procedure clean_empty_suite_path; + + --%test(only the defined in suitepath suite/test is executed if multiple similarly named test suites exist in the context differed only by comment) + --%beforetest(setup_pck_with_same_path) + --%aftertest(clean_pck_with_same_path) + procedure test_pck_with_same_path; + procedure setup_pck_with_same_path; + procedure clean_pck_with_same_path; + + --%test(Whole suite gets disabled with floating annotation) + procedure disable_suite_floating_annot; + + --%test(Prepare runner for a package procedure inside context) + procedure pck_proc_in_ctx_by_name; + + --%test(Prepare runner for a package procedure inside context by path) + procedure pck_proc_in_ctx_by_path; + + --%context(get_schema_ut_packages) + + --%test(returns list of all unit test packages in given schema) + --%beforetest(create_ut3_suite) + --%aftertest(drop_ut3_suite) + procedure test_get_schema_ut_packages; + procedure create_ut3_suite; + procedure drop_ut3_suite; + + --%endcontext + + --%test(Adds suitepath to cache over 1k characters long) + --%beforetest(create_dummy_long_test_package) + --%aftertest(drop_dummy_long_test_package) + procedure add_new_long_test_package; + +end test_suite_manager; +/ diff --git a/test/ut3_tester/core/test_ut_executable.pkb b/test/ut3_tester/core/test_ut_executable.pkb index 1d2e74ff3..92420de47 100644 --- a/test/ut3_tester/core/test_ut_executable.pkb +++ b/test/ut3_tester/core/test_ut_executable.pkb @@ -24,8 +24,9 @@ create or replace package body test_ut_executable is l_result boolean; begin --Arrange - l_test := ut3.ut_test(a_object_name => 'test_ut_executable',a_name => 'test_ut_executable', a_line_no=> 1); - l_executable := ut3.ut_executable_test( user, 'test_ut_executable', 'output_proc', ut3.ut_utils.gc_test_execute ); + l_test := ut3.ut_test(a_object_owner => 'ut3_tester', a_object_name => 'test_ut_executable',a_name => 'test_ut_executable', a_line_no=> 1); + l_executable := ut3.ut_executable_test( a_owner => 'ut3_tester', a_package => 'test_ut_executable', + a_procedure_name => 'output_proc', a_executable_type => ut3.ut_utils.gc_test_execute ); --Act l_result := l_executable.do_execute(l_test); --Assert @@ -40,8 +41,8 @@ create or replace package body test_ut_executable is l_result boolean; begin --Arrange - l_test := ut3.ut_test(a_object_name => 'test_ut_executable',a_name => 'test_ut_executable', a_line_no=> 1); - l_executable := ut3.ut_executable_test( user, 'test_ut_executable', 'throwing_proc', ut3.ut_utils.gc_test_execute ); + l_test := ut3.ut_test(a_object_owner => 'ut3_tester', a_object_name => 'test_ut_executable',a_name => 'test_ut_executable', a_line_no=> 1); + l_executable := ut3.ut_executable_test( 'ut3_tester', 'test_ut_executable', 'throwing_proc', ut3.ut_utils.gc_test_execute ); --Act l_result := l_executable.do_execute(l_test); --Assert @@ -76,9 +77,7 @@ create or replace package body test_ut_executable is dbms_lock.sleep(0.4); $end while l_cnt > 0 loop - select count(1) into l_cnt - from dba_scheduler_running_jobs srj - where srj.job_name = l_job_name; + l_cnt:=ut3_tester_helper.main_helper.get_job_count(l_job_name); end loop; end; @@ -97,7 +96,7 @@ create or replace package body test_ut_executable is procedure output_proc is begin - dbms_output.put_line(g_dbms_output_text); + dbms_output.put_line('Some output from procedure'); end; procedure throwing_proc is diff --git a/test/ut3_tester/core/test_ut_executable.pks b/test/ut3_tester/core/test_ut_executable.pks index acb91d1be..453998693 100644 --- a/test/ut3_tester/core/test_ut_executable.pks +++ b/test/ut3_tester/core/test_ut_executable.pks @@ -8,7 +8,9 @@ create or replace package test_ut_executable is --%test(Executes procedure in current schema when user was not provided) procedure exec_schema_package_proc; + /* TODO: Fix Me */ --%test(Executes procedure and saves dbms_output) + --%disabled procedure exec_package_proc_output; --%test(Executes a procedure raising exception, saves dbms_output and exception stack trace) diff --git a/test/ut3_tester_helper/main_helper.pkb b/test/ut3_tester_helper/main_helper.pkb index 148b526a6..d9ffc06bd 100644 --- a/test/ut3_tester_helper/main_helper.pkb +++ b/test/ut3_tester_helper/main_helper.pkb @@ -126,5 +126,13 @@ create or replace package body main_helper is execute immediate 'begin ut3$user#.parse_annotations; end;'; end; + function get_job_count(a_job_name varchar2) return number is + l_cnt number; + begin + select count(1) into l_cnt + from dba_scheduler_running_jobs srj + where srj.job_name = a_job_name; + end; + end; / diff --git a/test/ut3_tester_helper/main_helper.pks b/test/ut3_tester_helper/main_helper.pks index 2082105d5..296670707 100644 --- a/test/ut3_tester_helper/main_helper.pks +++ b/test/ut3_tester_helper/main_helper.pks @@ -34,6 +34,8 @@ create or replace package main_helper is procedure drop_parse_proc_as_ut3$user#; procedure parse_dummy_test_as_ut3$user#; + + function get_job_count(a_job_name varchar2) return number; end; / diff --git a/test/ut3_tester_helper/run_helper.pkb b/test/ut3_tester_helper/run_helper.pkb index c8983e961..bfc0e1c47 100644 --- a/test/ut3_tester_helper/run_helper.pkb +++ b/test/ut3_tester_helper/run_helper.pkb @@ -452,5 +452,76 @@ create or replace package body run_helper is ut.expect(main_helper.get_value(q'[ut_transaction_control.count_rows('s')]')).to_( a_expectation ); end; + procedure create_dummy_long_test_package is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package ut3.dummy_long_test_package as + + --%suitepath(verylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtext) + --%suite(dummy_test_suite) + + --%test(dummy_test) + procedure some_dummy_test_procedure; + end;]'; + + execute immediate q'[create or replace package ut3.dummy_long_test_package1 as + + --%suitepath(verylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtext) + --%suite(dummy_test_suite1) + + --%test(dummy_test) + procedure some_dummy_test_procedure; + end;]'; + end; + + procedure drop_dummy_long_test_package is + pragma autonomous_transaction; + begin + execute immediate q'[drop package ut3.dummy_long_test_package]'; + execute immediate q'[drop package ut3.dummy_long_test_package1]'; + end; + + procedure create_ut3_suite is + pragma autonomous_transaction; + begin + execute immediate q'[ + create or replace package ut3.some_test_package + as + --%suite + + --%test + procedure some_test; + + end;]'; + end; + + procedure drop_ut3_suite is + pragma autonomous_transaction; + begin + execute immediate q'[drop package ut3.some_test_package]'; + end; + + function get_object_name(a_owner in varchar2) return ut3.ut_object_names is + begin + return ut3.ut_suite_manager.get_schema_ut_packages(ut3.ut_varchar2_rows(a_owner)); + end; + + function ut_output_buffer_tmp return t_out_buff_tab pipelined is + l_buffer_tab t_out_buff_tab; + cursor get_buffer is + select * from ut3.ut_output_buffer_tmp; + begin + open get_buffer; + fetch get_buffer bulk collect into l_buffer_tab; + for idx in 1..l_buffer_tab.count loop + pipe row(l_buffer_tab(idx)); + end loop; + end; + + procedure delete_buffer is + begin + delete from ut3.ut_output_buffer_tmp; + end; + end; / diff --git a/test/ut3_tester_helper/run_helper.pks b/test/ut3_tester_helper/run_helper.pks index 92767bc20..03d55ec29 100644 --- a/test/ut3_tester_helper/run_helper.pks +++ b/test/ut3_tester_helper/run_helper.pks @@ -1,5 +1,7 @@ create or replace package run_helper is + type t_out_buff_tab is table of ut3.ut_output_buffer_tmp%rowtype; + procedure setup_cache_objects; procedure setup_cache; procedure cleanup_cache; @@ -39,5 +41,14 @@ create or replace package run_helper is procedure test_rollback_type(a_procedure_name varchar2, a_rollback_type integer, a_expectation ut3_latest_release.ut_matcher); + procedure create_dummy_long_test_package; + procedure drop_dummy_long_test_package; + procedure create_ut3_suite; + procedure drop_ut3_suite; + function get_object_name(a_owner in varchar2) return ut3.ut_object_names; + + function ut_output_buffer_tmp return t_out_buff_tab pipelined; + procedure delete_buffer; + end; / From 3cc34ea38b8cb08a5a2a0afb9670b22ec5703290 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 29 Mar 2019 21:49:14 +0000 Subject: [PATCH 0371/1096] Adding tests core/test_suite_builder --- test/install_ut3_tester_tests.sql | 2 + test/ut3_tester/core/test_suite_builder.pkb | 1118 +++++++++++++++++++ test/ut3_tester/core/test_suite_builder.pks | 176 +++ 3 files changed, 1296 insertions(+) create mode 100644 test/ut3_tester/core/test_suite_builder.pkb create mode 100644 test/ut3_tester/core/test_suite_builder.pks diff --git a/test/install_ut3_tester_tests.sql b/test/install_ut3_tester_tests.sql index 511201f16..845e34782 100644 --- a/test/install_ut3_tester_tests.sql +++ b/test/install_ut3_tester_tests.sql @@ -19,6 +19,7 @@ alter session set plsql_optimize_level=0; @@ut3_tester/core/test_suite_manager.pks @@ut3_tester/core/test_file_mapper.pks @@ut3_tester/core/test_output_buffer.pks +@@ut3_tester/core/test_suite_builder.pks @@ut3_tester/core.pkb @@ -34,6 +35,7 @@ alter session set plsql_optimize_level=0; @@ut3_tester/core/test_suite_manager.pkb @@ut3_tester/core/test_file_mapper.pkb @@ut3_tester/core/test_output_buffer.pkb +@@ut3_tester/core/test_suite_builder.pkb set linesize 200 diff --git a/test/ut3_tester/core/test_suite_builder.pkb b/test/ut3_tester/core/test_suite_builder.pkb new file mode 100644 index 000000000..bd76e88d8 --- /dev/null +++ b/test/ut3_tester/core/test_suite_builder.pkb @@ -0,0 +1,1118 @@ +create or replace package body test_suite_builder is + + function invoke_builder_for_annotations( + a_annotations ut3.ut_annotations, + a_package_name varchar2 := 'TEST_SUITE_BUILDER_PACKAGE' + ) return clob is + l_suites ut3.ut_suite_items; + l_suite ut3.ut_logical_suite; + l_cursor sys_refcursor; + l_xml xmltype; + begin + open l_cursor for select value(x) from table( + ut3.ut_annotated_objects( + ut3.ut_annotated_object('UT3_TESTER', a_package_name, 'PACKAGE', systimestamp, a_annotations) + ) ) x; + + l_suites := ut3.ut_suite_manager.build_suites_from_annotations( + a_owner_name => 'UT3_TESTER', + a_annotated_objects => l_cursor, + a_path => null, + a_object_name => a_package_name, + a_skip_all_objects => true + ); + l_suite := treat( l_suites(l_suites.first) as ut3.ut_logical_suite); + + select deletexml( + xmltype(l_suite), + '//RESULTS_COUNT|//START_TIME|//END_TIME|//RESULT|//ASSOCIATED_EVENT_NAME' || + '|//TRANSACTION_INVALIDATORS|//ERROR_BACKTRACE|//ERROR_STACK|//SERVEROUTPUT' + ) + into l_xml + from dual; + + return l_xml.getClobVal(); + end; + + procedure no_suite_description is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite',null, null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_match( + 'UT3_TESTERsome_packagesome_package()?\s*some_package' + ); + end; + + procedure suite_description_from_suite is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Some description', null), + ut3.ut_annotation(2, 'suite','Another description', null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%some_packageSome description%' + ); + end; + + procedure suitepath_from_non_empty_path is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite',null, null), + ut3.ut_annotation(2, 'suitepath','org.utplsql.some', null), + ut3.ut_annotation(3, 'suitepath','dummy.utplsql.some', null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%org.utplsql.some%' + ); + end; + + procedure suite_descr_from_displayname is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Some description', null), + ut3.ut_annotation(2, 'suite','Another description', null), + ut3.ut_annotation(3, 'displayname','New description', null), + ut3.ut_annotation(4, 'displayname','Newest description', null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%some_packageNew description%' + ); + end; + + procedure rollback_type_valid is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite',null, null), + ut3.ut_annotation(2, 'rollback','manual', null), + ut3.ut_annotation(3, 'rollback','bad', null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%'||ut3.ut_utils.gc_rollback_manual||'%' + ); + end; + + procedure rollback_type_duplicated is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite',null, null), + ut3.ut_annotation(2, 'rollback','manual', null), + ut3.ut_annotation(3, 'rollback','bad', null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%%"--%rollback"%%UT3_TESTER.SOME_PACKAGE%3%%' + ); + end; + + procedure suite_annot_duplicated is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(2, 'suite','Cool', null), + ut3.ut_annotation(8, 'suite','bad', null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%Cool%%"--%suite"%UT3_TESTER.SOME_PACKAGE%line 8%%' + ); + end; + + procedure test_annotation is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(2, 'suite','Cool', null), + ut3.ut_annotation(8, 'test','Some test', 'test_procedure') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%' || + '%test_procedureSome testsome_package.test_procedure' || + '%%' + ); + end; + + procedure test_annot_duplicated is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(2, 'suite','Cool', null), + ut3.ut_annotation(8, 'test','Some test', 'test_procedure'), + ut3.ut_annotation(9, 'test','Dup', 'test_procedure') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%Cool%%"--%test"%UT3_TESTER.SOME_PACKAGE.TEST_PROCEDURE%line 9%%' + ); + end; + + procedure beforeall_annot_duplicated is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(2, 'suite','Cool', null), + ut3.ut_annotation(8, 'beforeall', null, 'test_procedure'), + ut3.ut_annotation(9, 'beforeall', null, 'test_procedure') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%Cool%%"--%beforeall"%UT3_TESTER.SOME_PACKAGE.TEST_PROCEDURE%line 9%%' + ); + end; + + procedure beforeeach_annot_duplicated is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(2, 'suite','Cool', null), + ut3.ut_annotation(8, 'beforeeach', null, 'test_procedure'), + ut3.ut_annotation(9, 'beforeeach', null, 'test_procedure') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%Cool%%"--%beforeeach"%UT3_TESTER.SOME_PACKAGE.TEST_PROCEDURE%line 9%%' + ); + end; + + procedure afterall_annot_duplicated is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(2, 'suite','Cool', null), + ut3.ut_annotation(8, 'afterall', null, 'test_procedure'), + ut3.ut_annotation(9, 'afterall', null, 'test_procedure') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%Cool%%"--%afterall"%UT3_TESTER.SOME_PACKAGE.TEST_PROCEDURE%line 9%%' + ); + end; + + procedure aftereach_annot_duplicated is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(2, 'suite','Cool', null), + ut3.ut_annotation(8, 'aftereach', null, 'test_procedure'), + ut3.ut_annotation(9, 'aftereach', null, 'test_procedure') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%Cool%%"--%aftereach"%UT3_TESTER.SOME_PACKAGE.TEST_PROCEDURE%line 9%%' + ); + end; + + procedure suitepath_annot_duplicated is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(2, 'suite','Cool', null), + ut3.ut_annotation(3, 'suitepath','dummy.utplsql.some', null), + ut3.ut_annotation(4, 'suitepath','org.utplsql.some', null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%%"--%suitepath"%line 4%%' + ); + end; + + procedure displayname_annot_duplicated is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(2, 'suite','Cool', null), + ut3.ut_annotation(4, 'displayname','New description', null), + ut3.ut_annotation(5, 'displayname','Newest description', null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%%"--%displayname"%line 5%%' + ); + end; + + procedure suitepath_annot_empty is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(3, 'suitepath',null, null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%%"--%suitepath" annotation requires a non-empty parameter value.%%' + ); + end; + + procedure suitepath_annot_invalid_path is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(2, 'suitepath','path with spaces', null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%%Invalid path value in annotation "--%suitepath(path with spaces)"%%' + ); + end; + + procedure displayname_annot_empty is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(3, 'displayname',null, null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%%"--%displayname" annotation requires a non-empty parameter value.%%' + ); + end; + + procedure rollback_type_empty is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(3, 'rollback',null, null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%%"--%rollback" annotation requires one of values as parameter:%%' + ); + end; + + procedure rollback_type_invalid is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(2, 'rollback','bad', null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%%"--%rollback" annotation requires one of values as parameter: "auto" or "manual". Annotation ignored.%%' + ); + end; + + procedure multiple_before_after is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(2, 'beforeall',null, 'first_before_all'), + ut3.ut_annotation(3, 'beforeall',null, 'another_before_all'), + ut3.ut_annotation(4, 'beforeeach',null, 'first_before_each'), + ut3.ut_annotation(5, 'beforeeach',null, 'another_before_each'), + ut3.ut_annotation(6, 'aftereach',null, 'first_after_each'), + ut3.ut_annotation(7, 'aftereach',null, 'another_after_each'), + ut3.ut_annotation(8, 'afterall',null, 'first_after_all'), + ut3.ut_annotation(9, 'afterall',null, 'another_after_all'), + ut3.ut_annotation(14, 'test','A test', 'some_test'), + ut3.ut_annotation(15, 'beforetest','before_test_proc', 'some_test'), + ut3.ut_annotation(16, 'beforetest','before_test_proc2', 'some_test'), + ut3.ut_annotation(18, 'aftertest','after_test_proc', 'some_test'), + ut3.ut_annotation(20, 'aftertest','after_test_proc2', 'some_test') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%%some_package%some_test' || + '%' || + '%some_packagefirst_before_each' || + '%some_packageanother_before_each' || + '%' || + '%' || + '%some_packagebefore_test_proc' || + '%some_packagebefore_test_proc2' || + '%' || + '%' || + '%some_packageafter_test_proc' || + '%some_packageafter_test_proc2' || + '%' || + '%' || + '%some_packagefirst_after_each' || + '%some_packageanother_after_each' || + '%' || + '%' || + '%' || + '%some_packagefirst_before_all' || + '%some_packageanother_before_all' || + '%' || + '%' || + '%some_packagefirst_after_all' || + '%some_packageanother_after_all' || + '%%' + ); + end; + + procedure multiple_standalone_bef_aft is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(2, 'beforeall', 'some_package.first_before_all',null), + ut3.ut_annotation(3, 'beforeall', 'different_package.another_before_all',null), + ut3.ut_annotation(4, 'beforeeach', 'first_before_each',null), + ut3.ut_annotation(5, 'beforeeach', 'different_owner.different_package.another_before_each',null), + ut3.ut_annotation(6, 'aftereach', 'first_after_each',null), + ut3.ut_annotation(7, 'aftereach', 'another_after_each,different_owner.different_package.one_more_after_each',null), + ut3.ut_annotation(8, 'afterall', 'first_after_all',null), + ut3.ut_annotation(9, 'afterall', 'another_after_all',null), + ut3.ut_annotation(14, 'test','A test', 'some_test'), + ut3.ut_annotation(15, 'beforetest','before_test_proc', 'some_test'), + ut3.ut_annotation(16, 'beforetest','before_test_proc2', 'some_test'), + ut3.ut_annotation(18, 'aftertest','after_test_proc', 'some_test'), + ut3.ut_annotation(20, 'aftertest','after_test_proc2', 'some_test') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%%some_package%some_test' || + '%' || + '%some_packagefirst_before_each' || + '%different_ownerdifferent_packageanother_before_each' || + '%' || + '%' || + '%some_packagebefore_test_proc' || + '%some_packagebefore_test_proc2' || + '%' || + '%' || + '%some_packageafter_test_proc' || + '%some_packageafter_test_proc2' || + '%' || + '%' || + '%some_packagefirst_after_each' || + '%some_packageanother_after_each' || + '%different_ownerdifferent_packageone_more_after_each' || + '%' || + '%' || + '%' || + '%some_packagefirst_before_all' || + '%different_packageanother_before_all' || + '%' || + '%' || + '%some_packagefirst_after_all' || + '%some_packageanother_after_all' || + '%%' + ); + end; + + procedure before_after_on_single_proc is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(2, 'beforeall',null, 'do_stuff'), + ut3.ut_annotation(3, 'beforeeach',null, 'do_stuff'), + ut3.ut_annotation(4, 'aftereach',null, 'do_stuff'), + ut3.ut_annotation(5, 'afterall',null, 'do_stuff'), + ut3.ut_annotation(6, 'test','A test', 'some_test') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%%some_package%some_test' || + '%' || + '%some_packagedo_stuff' || + '%' || + '%' || + '%some_packagedo_stuff' || + '%' || + '%' || + '%' || + '%some_packagedo_stuff' || + '%' || + '%' || + '%some_packagedo_stuff' || + '%%' + ); + end; + + procedure multiple_mixed_bef_aft is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(2, 'beforeall', null,'first_before_all'), + ut3.ut_annotation(3, 'beforeall', 'different_package.another_before_all',null), + ut3.ut_annotation(4, 'beforeeach', 'first_before_each',null), + ut3.ut_annotation(5, 'beforeeach', 'different_owner.different_package.another_before_each',null), + ut3.ut_annotation(6, 'aftereach', null, 'first_after_each'), + ut3.ut_annotation(7, 'aftereach', 'another_after_each,different_owner.different_package.one_more_after_each',null), + ut3.ut_annotation(8, 'afterall', 'first_after_all',null), + ut3.ut_annotation(9, 'afterall', 'another_after_all',null), + ut3.ut_annotation(14, 'test','A test', 'some_test'), + ut3.ut_annotation(15, 'beforetest','before_test_proc', 'some_test'), + ut3.ut_annotation(16, 'beforetest','before_test_proc2', 'some_test'), + ut3.ut_annotation(18, 'aftertest','after_test_proc', 'some_test'), + ut3.ut_annotation(20, 'aftertest','after_test_proc2', 'some_test'), + ut3.ut_annotation(21, 'beforeall', null,'last_before_all'), + ut3.ut_annotation(22, 'aftereach', null, 'last_after_each'), + ut3.ut_annotation(23, 'afterall', null, 'last_after_all') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%%some_package%some_test' || + '%' || + '%some_packagefirst_before_each' || + '%different_ownerdifferent_packageanother_before_each' || + '%' || + '%' || + '%some_packagebefore_test_proc' || + '%some_packagebefore_test_proc2' || + '%' || + '%' || + '%some_packageafter_test_proc' || + '%some_packageafter_test_proc2' || + '%' || + '%' || + '%some_packagefirst_after_each' || + '%some_packageanother_after_each' || + '%different_ownerdifferent_packageone_more_after_each' || + '%some_packagelast_after_each' || + '%' || + '%' || + '%' || + '%some_packagefirst_before_all' || + '%different_packageanother_before_all' || + '%some_packagelast_before_all' || + '%' || + '%' || + '%some_packagefirst_after_all' || + '%some_packageanother_after_all' || + '%some_packagelast_after_all' || + '%%' + ); + end; + + + procedure before_after_mixed_with_test is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(2, 'beforeall',null, 'do_stuff'), + ut3.ut_annotation(3, 'beforeeach',null, 'do_stuff'), + ut3.ut_annotation(4, 'aftereach',null, 'do_stuff'), + ut3.ut_annotation(5, 'afterall',null, 'do_stuff'), + ut3.ut_annotation(6, 'test','A test', 'do_stuff') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like('%%Annotation "--\%beforeall"%line 2%%', '\'); + ut.expect(l_actual).to_be_like('%%Annotation "--\%beforeeach"%line 3%%', '\'); + ut.expect(l_actual).to_be_like('%%Annotation "--\%aftereach"%line 4%%', '\'); + ut.expect(l_actual).to_be_like('%%Annotation "--\%afterall" cannot be used with "--\%test". Annotation ignored.' + ||'%at "UT3_TESTER.SOME_PACKAGE.DO_STUFF", line 5%%', '\'); + ut.expect(l_actual).not_to_be_like('%%'); + ut.expect(l_actual).not_to_be_like('%%'); + ut.expect(l_actual).not_to_be_like('%%'); + ut.expect(l_actual).not_to_be_like('%%'); + end; + + procedure suite_from_context is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(2, 'beforeall',null, 'suite_level_beforeall'), + ut3.ut_annotation(3, 'test','In suite', 'suite_level_test'), + ut3.ut_annotation(4, 'context','a_context', null), + ut3.ut_annotation(5, 'displayname','A context', null), + ut3.ut_annotation(6, 'beforeall',null, 'context_setup'), + ut3.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), + ut3.ut_annotation(8, 'endcontext',null, null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%' || + '%' || + '%' || + '' || + '%a_contextA contextsome_package.a_context' || + '%' || + '' || + '%test_in_a_contextIn contextsome_package.a_context.test_in_a_context' || + '%' || + '' || + '' || + '%some_packagecontext_setup' || + '%' || + '' || + '' || + '' || + '%suite_level_testIn suitesome_package.suite_level_test' || + '%' || + '' || + '' || + '%some_packagesuite_level_beforeall' || + '%' || + '' || + '' + ); + end; + + procedure before_after_in_context is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite', 'Cool', null), + ut3.ut_annotation(2, 'test', 'In suite', 'suite_level_test'), + ut3.ut_annotation(3, 'context', 'a_context', null), + ut3.ut_annotation(4, 'beforeall', 'context_beforeall', null), + ut3.ut_annotation(5, 'beforeeach', null, 'context_beforeeach'), + ut3.ut_annotation(6, 'test', 'In context', 'test_in_a_context'), + ut3.ut_annotation(7, 'aftereach', 'context_aftereach' ,null), + ut3.ut_annotation(8, 'afterall', null, 'context_afterall'), + ut3.ut_annotation(9, 'endcontext', null, null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '' || + '%' || + '%' || + '%a_context' || + '%' || + '%' || + '%test_in_a_context' || + '%%context_beforeeach%' || + '%%test_in_a_context%' || + '%%context_aftereach%' || + '%' || + '%' || + '%%context_beforeall%' || + '%%context_afterall%' || + '%' || + '%' || + '%suite_level_test' || + '%%suite_level_test%' || + '%' || + '%' || + '%' + ); + ut.expect(l_actual).not_to_be_like('%%%%%%'); + ut.expect(l_actual).not_to_be_like('%%%%%%'); + ut.expect(l_actual).not_to_be_like('%%%%%%'); + ut.expect(l_actual).not_to_be_like('%%%%%%'); + end; + + procedure before_after_out_of_context is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(2, 'beforeall',null, 'suite_level_beforeall'), + ut3.ut_annotation(3, 'beforeeach',null, 'suite_level_beforeeach'), + ut3.ut_annotation(4, 'test','In suite', 'suite_level_test'), + ut3.ut_annotation(5, 'context','a_context', null), + ut3.ut_annotation(6, 'test', 'In context', 'test_in_a_context'), + ut3.ut_annotation(7, 'endcontext',null, null), + ut3.ut_annotation(8, 'aftereach',null, 'suite_level_aftereach'), + ut3.ut_annotation(9, 'afterall',null, 'suite_level_afterall') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '' || + '%' || + '%' || + '%a_context' || + '%' || + '%' || + '%test_in_a_context' || + '%%suite_level_beforeeach%' || + '%%test_in_a_context%' || + '%%suite_level_aftereach%' || + '%' || + '%' || + '%' || + '%' || + '%suite_level_test' || + '%%suite_level_beforeeach%' || + '%%suite_level_test%' || + '%%suite_level_aftereach%' || + '%' || + '%' || + '%%suite_level_beforeall%' || + '%%suite_level_afterall%' || + '%' + ); + ut.expect(l_actual).not_to_be_like('%%%%%%'); + ut.expect(l_actual).not_to_be_like('%%%%%%'); + end; + + procedure context_without_endcontext is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(2, 'beforeall',null, 'suite_level_beforeall'), + ut3.ut_annotation(3, 'test','In suite', 'suite_level_test'), + ut3.ut_annotation(4, 'context','A context', null), + ut3.ut_annotation(5, 'beforeall',null, 'context_setup'), + ut3.ut_annotation(7, 'test', 'In context', 'test_in_a_context') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%Invalid annotation "--\%context". Cannot find following "--\%endcontext". Annotation ignored.%at "UT3_TESTER.SOME_PACKAGE", line 4%' + ,'\' + ); + ut.expect(l_actual).to_be_like( + '' || + '%' || + '' || + '%suite_level_testIn suitesome_package.suite_level_test' || + '%' || + '' || + '%test_in_a_contextIn contextsome_package.test_in_a_context' || + '%' || + '' || + '' || + '%some_packagesuite_level_beforeall' || + '%some_packagecontext_setup' || + '%' || + '' || + '' + ); + end; + + procedure endcontext_without_context is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(2, 'beforeall',null, 'suite_level_beforeall'), + ut3.ut_annotation(3, 'test','In suite', 'suite_level_test'), + ut3.ut_annotation(4, 'context','a_context', null), + ut3.ut_annotation(5, 'displayname','A context', null), + ut3.ut_annotation(6, 'beforeall',null, 'context_setup'), + ut3.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), + ut3.ut_annotation(8, 'endcontext',null, null), + ut3.ut_annotation(9, 'endcontext',null, null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%Invalid annotation "--\%endcontext". Cannot find preceding "--\%context". Annotation ignored.%at "UT3_TESTER.SOME_PACKAGE", line 9%' + ,'\' + ); + ut.expect(l_actual).to_be_like( + '' || + '%' || + '' || + '%a_contextA contextsome_package.a_context' || + '%' || + '' || + '%test_in_a_contextIn contextsome_package.a_context.test_in_a_context' || + '%' || + '' || + '' || + '%some_packagecontext_setup' || + '%' || + '' || + '' || + '' || + '%suite_level_testIn suitesome_package.suite_level_test' || + '%' || + '' || + '' || + '%some_packagesuite_level_beforeall' || + '%' || + '' || + '' + ); + end; + + --%test(Gives warning when two contexts have the same name) + procedure duplicate_context_name is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(2, 'beforeall',null, 'suite_level_beforeall'), + ut3.ut_annotation(3, 'test','In suite', 'suite_level_test'), + ut3.ut_annotation(4, 'context','a_context', null), + ut3.ut_annotation(5, 'displayname','A context', null), + ut3.ut_annotation(6, 'beforeall',null, 'context_setup'), + ut3.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), + ut3.ut_annotation(8, 'endcontext',null, null), + ut3.ut_annotation(9, 'context','a_context', null), + ut3.ut_annotation(10, 'displayname','A context', null), + ut3.ut_annotation(11, 'beforeall',null, 'setup_in_duplicated_context'), + ut3.ut_annotation(12, 'test', 'In duplicated context', 'test_in_duplicated_context'), + ut3.ut_annotation(13, 'endcontext',null, null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%Context name must be unique in a suite. Context and all of it's content ignored.%at "UT3_TESTER.SOME_PACKAGE", line 9%' + ,'\' + ); + ut.expect(l_actual).to_be_like( + '' || + '%' || + '' || + '%a_contextA contextsome_package.a_context' || + '%' || + '' || + '%test_in_a_contextIn contextsome_package.a_context.test_in_a_context' || + '%' || + '' || + '' || + '%some_packagecontext_setup' || + '%' || + '' || + '' || + '' || + '%suite_level_testIn suitesome_package.suite_level_test' || + '%' || + '' || + '' || + '%some_packagesuite_level_beforeall' || + '%' || + '' || + '' + ); + end; + + procedure throws_value_empty is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(3, 'test','A test with empty throws annotation', 'A_TEST_PROCEDURE'), + ut3.ut_annotation(3, 'throws',null, 'A_TEST_PROCEDURE') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%%"--%throws" annotation requires a parameter. Annotation ignored.%%' + ); + end; + + procedure throws_value_invalid is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(3, 'test','A test with invalid throws annotation', 'A_TEST_PROCEDURE'), + ut3.ut_annotation(3, 'throws',' -20145 , bad_variable_name ', 'A_TEST_PROCEDURE') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%%Invalid parameter value "bad_variable_name" for "--%throws" annotation. Parameter ignored.%%' + ); + end; + + + procedure before_aftertest_multi is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(14, 'test','A test', 'some_test'), + ut3.ut_annotation(15, 'beforetest','before_test_proc', 'some_test'), + ut3.ut_annotation(16, 'beforetest','before_test_proc2', 'some_test'), + ut3.ut_annotation(18, 'aftertest','after_test_proc', 'some_test'), + ut3.ut_annotation(20, 'aftertest','after_test_proc2', 'some_test') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%%some_package%some_test' || + '%' || + '%some_packagebefore_test_proc' || + '%some_packagebefore_test_proc2' || + '%' || + '%' || + '%some_packageafter_test_proc' || + '%some_packageafter_test_proc2' || + '%' || + '%%' + ); + end; + + procedure before_aftertest_twice is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(14, 'test','A test', 'some_test'), + ut3.ut_annotation(15, 'beforetest','before_test_proc, before_test_proc2', 'some_test'), + ut3.ut_annotation(16, 'beforetest','before_test_proc3', 'some_test'), + ut3.ut_annotation(18, 'aftertest','after_test_proc,after_test_proc2', 'some_test'), + ut3.ut_annotation(20, 'aftertest','after_test_proc3', 'some_test') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%%some_package%some_test' || + '%' || + '%some_packagebefore_test_proc' || + '%some_packagebefore_test_proc2' || + '%some_packagebefore_test_proc3' || + '%' || + '%' || + '%some_packageafter_test_proc' || + '%some_packageafter_test_proc2' || + '%some_packageafter_test_proc3' || + '%' || + '%%' + ); + end; + + procedure before_aftertest_pkg_proc is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(14, 'test','A test', 'some_test'), + ut3.ut_annotation(15, 'beforetest','external_package.before_test_proc', 'some_test'), + ut3.ut_annotation(18, 'aftertest','external_package.after_test_proc', 'some_test') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%%some_package%some_test' || + '%' || + '%external_packagebefore_test_proc' || + '%' || + '%' || + '%external_packageafter_test_proc' || + '%' || + '%%' + ); + end; + + procedure before_aftertest_mixed_syntax is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(14, 'test','A test', 'some_test'), + ut3.ut_annotation(15, 'beforetest','external_package.before_test_proc, before_test_proc2', 'some_test'), + ut3.ut_annotation(18, 'aftertest','external_package.after_test_proc, after_test_proc2', 'some_test') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%%some_package%some_test' || + '%' || + '%external_packagebefore_test_proc' || + '%some_packagebefore_test_proc2' || + '%' || + '%' || + '%external_packageafter_test_proc' || + '%some_packageafter_test_proc2' || + '%' || + '%%' + ); + end; + + procedure test_annotation_ordering is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(4, 'test','B test', 'b_test'), + ut3.ut_annotation(10, 'test','Z test', 'z_test'), + ut3.ut_annotation(14, 'test','A test', 'a_test') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%%some_package%b_test' || + '%%'|| + '%%some_package%z_test' || + '%%'|| + '%%some_package%a_test' || + '%%' + ); + end; + + procedure test_bad_procedure_annotation is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(2, 'bad_procedure_annotation',null, 'some_procedure'), + ut3.ut_annotation(6, 'test','A test', 'do_stuff') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like('%Unsupported annotation "--\%bad_procedure_annotation". Annotation ignored.% line 2%', '\'); + end; + + procedure test_bad_package_annotation is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(17, 'bad_package_annotation',null, null), + ut3.ut_annotation(24, 'test','A test', 'do_stuff') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like('%Unsupported annotation "--\%bad_package_annotation". Annotation ignored.% line 17%', '\'); + end; + +end test_suite_builder; +/ diff --git a/test/ut3_tester/core/test_suite_builder.pks b/test/ut3_tester/core/test_suite_builder.pks new file mode 100644 index 000000000..bae124e3e --- /dev/null +++ b/test/ut3_tester/core/test_suite_builder.pks @@ -0,0 +1,176 @@ +create or replace package test_suite_builder is + --%suite(suite_builder) + --%suitepath(utplsql.framework_tester.core) + + --%context(suite) + --%displayname(--%suite annotation) + + --%test(Sets suite name from package name and leaves description empty) + procedure no_suite_description; + + --%test(Sets suite description using first --%suite annotation) + procedure suite_description_from_suite; + + --%test(Gives warning if more than one --%suite annotation used) + procedure suite_annot_duplicated; + + --%endcontext + + --%context(displayname) + --%displayname(--%displayname annotation) + + --%test(Overrides suite description using first --%displayname annotation) + procedure suite_descr_from_displayname; + + --%test(Gives warning if more than one --%displayname annotation used) + procedure displayname_annot_duplicated; + + --%test(Gives warning if --%displayname annotation has no value) + procedure displayname_annot_empty; + + --%endcontext + + --%context(test) + --%displayname(--%test annotation) + + --%test(Creates a test item for procedure annotated with --%test annotation) + procedure test_annotation; + + --%test(Gives warning if more than one --%test annotation used) + procedure test_annot_duplicated; + + --%test(Is added to suite according to annotation order in package spec) + procedure test_annotation_ordering; + + --%endcontext + + --%context(suitepath) + --%displayname(--%suitepath annotation) + + --%test(Sets suite path using first --%suitepath annotation) + procedure suitepath_from_non_empty_path; + + --%test(Gives warning if more than one --%suitepath annotation used) + procedure suitepath_annot_duplicated; + + --%test(Gives warning if --%suitepath annotation has no value) + procedure suitepath_annot_empty; + + --%test(Gives warning if --%suitepath annotation has invalid value) + procedure suitepath_annot_invalid_path; + + --%endcontext + + --%context(rollback) + --%displayname(--%rollback annotation) + + --%test(Sets rollback type using first --%rollback annotation) + procedure rollback_type_valid; + + --%test(Gives warning if more than one --%rollback annotation used) + procedure rollback_type_duplicated; + + --%test(Gives warning if --%rollback annotation has no value) + procedure rollback_type_empty; + + --%test(Gives warning if --%rollback annotation has invalid value) + procedure rollback_type_invalid; + + --%endcontext + + --%context(before_after_all_each) + --%displayname(--%before/after all/each annotations) + + --%test(Supports multiple before/after all/each procedure level definitions) + procedure multiple_before_after; + + --%test(Supports multiple before/after all/each standalone level definitions) + procedure multiple_standalone_bef_aft; + + --%test(Supports mixing before/after all/each annotations on single procedure) + procedure before_after_on_single_proc; + + --%test(Supports mixed before/after all/each as standalone and procedure level definitions) + procedure multiple_mixed_bef_aft; + + --%test(Gives warning if more than one --%beforeall annotation used on procedure) + procedure beforeall_annot_duplicated; + + --%test(Gives warning if more than one --%beforeeach annotation used on procedure) + procedure beforeeach_annot_duplicated; + + --%test(Gives warning if more than one --%afterall annotation used on procedure) + procedure afterall_annot_duplicated; + + --%test(Gives warning if more than one --%aftereach annotation used on procedure) + procedure aftereach_annot_duplicated; + + --%test(Gives warning on before/after all/each annotations mixed with test) + procedure before_after_mixed_with_test; + + --%endcontext + + --%context(context) + --%displayname(--%context annotation) + + --%test(Creates nested suite for content between context/endcontext annotations) + procedure suite_from_context; + + --%test(Associates before/after all/each to tests in context only) + procedure before_after_in_context; + + --%test(Propagates beforeeach/aftereach to context) + procedure before_after_out_of_context; + + --%test(Does not create context and gives warning when endcontext is missing) + procedure context_without_endcontext; + + --%test(Gives warning if --%endcontext is missing a preceding --%context) + procedure endcontext_without_context; + + --%test(Gives warning when two contexts have the same name and ignores duplicated context) + procedure duplicate_context_name; + + --%endcontext + + --%context(throws) + --%displayname(--%throws annotation) + + --%test(Gives warning if --%throws annotation has no value) + procedure throws_value_empty; + + --%test(Gives warning if --%throws annotation has invalid value) + procedure throws_value_invalid; + + --%endcontext + + --%context(beforetest_aftertest) + --%displayname(--%beforetest/aftertest annotation) + + --%test(Supports multiple occurrences of beforetest/aftertest for a test) + procedure before_aftertest_multi; + + --%test(Supports same procedure defined twice) + procedure before_aftertest_twice; + + --%test(Supports beforetest from external package) + procedure before_aftertest_pkg_proc; + + --%test(Supports mix of procedure and package.procedure) + procedure before_aftertest_mixed_syntax; + + --%endcontext + + --%context(unknown_annotation) + --%displayname(--%bad_annotation) + + --%test(Gives warning when unknown procedure level annotation passed) + procedure test_bad_procedure_annotation; + + --%test(Gives warning when unknown package level annotation passed) + procedure test_bad_package_annotation; + + --%endcontext + +end test_suite_builder; +/ From a6a848d77fe6af8c32f692c6187d5e775ea5f151 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sat, 30 Mar 2019 07:48:46 +0000 Subject: [PATCH 0372/1096] Adding tests: reporters reporters/test_junit_reporter reporters/test_sonar_test_reporter reporters/test_teamcity_reporter reporters/test_tfs_junit_reporter --- test/install_ut3_tester_tests.sql | 1 + test/install_ut3_user_tests.sql | 13 + test/ut3_tester/core/test_ut_executable.pks | 2 - test/ut3_user/reporters.pkb | 150 ++++++++ test/ut3_user/reporters.pks | 18 + .../reporters/test_junit_reporter.pkb | 353 ++++++++++++++++++ .../reporters/test_junit_reporter.pks | 51 +++ .../reporters/test_sonar_test_reporter.pkb | 36 ++ .../reporters/test_sonar_test_reporter.pks | 13 + .../reporters/test_teamcity_reporter.pkb | 131 +++++++ .../reporters/test_teamcity_reporter.pks | 22 ++ .../reporters/test_tfs_junit_reporter.pkb | 207 ++++++++++ .../reporters/test_tfs_junit_reporter.pks | 39 ++ 13 files changed, 1034 insertions(+), 2 deletions(-) create mode 100644 test/ut3_user/reporters.pkb create mode 100644 test/ut3_user/reporters.pks create mode 100644 test/ut3_user/reporters/test_junit_reporter.pkb create mode 100644 test/ut3_user/reporters/test_junit_reporter.pks create mode 100644 test/ut3_user/reporters/test_sonar_test_reporter.pkb create mode 100644 test/ut3_user/reporters/test_sonar_test_reporter.pks create mode 100644 test/ut3_user/reporters/test_teamcity_reporter.pkb create mode 100644 test/ut3_user/reporters/test_teamcity_reporter.pks create mode 100644 test/ut3_user/reporters/test_tfs_junit_reporter.pkb create mode 100644 test/ut3_user/reporters/test_tfs_junit_reporter.pks diff --git a/test/install_ut3_tester_tests.sql b/test/install_ut3_tester_tests.sql index 845e34782..1d4155c3d 100644 --- a/test/install_ut3_tester_tests.sql +++ b/test/install_ut3_tester_tests.sql @@ -38,6 +38,7 @@ alter session set plsql_optimize_level=0; @@ut3_tester/core/test_suite_builder.pkb + set linesize 200 set define on set verify off diff --git a/test/install_ut3_user_tests.sql b/test/install_ut3_user_tests.sql index 583c844be..3db7beee7 100644 --- a/test/install_ut3_user_tests.sql +++ b/test/install_ut3_user_tests.sql @@ -20,6 +20,13 @@ prompt Install user tests @@ut3_user/expectations/test_expectations_cursor.pks @@ut3_user/api/test_ut_runner.pks @@ut3_user/api/test_ut_run.pks +@@ut3_user/reporters.pks +@@ut3_user/reporters/test_tfs_junit_reporter.pks +@@ut3_user/reporters/test_teamcity_reporter.pks +@@ut3_user/reporters/test_sonar_test_reporter.pks +@@ut3_user/reporters/test_junit_reporter.pks + + @@ut3_user/expectations/unary/test_expect_not_to_be_null.pkb @@ut3_user/expectations/unary/test_expect_to_be_null.pkb @@ -36,6 +43,12 @@ prompt Install user tests @@ut3_user/expectations/test_expectations_cursor.pkb @@ut3_user/api/test_ut_runner.pkb @@ut3_user/api/test_ut_run.pkb +@@ut3_user/reporters.pkb +@@ut3_user/reporters/test_tfs_junit_reporter.pkb +@@ut3_user/reporters/test_teamcity_reporter.pkb +@@ut3_user/reporters/test_sonar_test_reporter.pkb +@@ut3_user/reporters/test_junit_reporter.pkb + set linesize 200 set define on diff --git a/test/ut3_tester/core/test_ut_executable.pks b/test/ut3_tester/core/test_ut_executable.pks index 453998693..acb91d1be 100644 --- a/test/ut3_tester/core/test_ut_executable.pks +++ b/test/ut3_tester/core/test_ut_executable.pks @@ -8,9 +8,7 @@ create or replace package test_ut_executable is --%test(Executes procedure in current schema when user was not provided) procedure exec_schema_package_proc; - /* TODO: Fix Me */ --%test(Executes procedure and saves dbms_output) - --%disabled procedure exec_package_proc_output; --%test(Executes a procedure raising exception, saves dbms_output and exception stack trace) diff --git a/test/ut3_user/reporters.pkb b/test/ut3_user/reporters.pkb new file mode 100644 index 000000000..364566569 --- /dev/null +++ b/test/ut3_user/reporters.pkb @@ -0,0 +1,150 @@ +create or replace package body reporters is + + procedure create_test_helper_package is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package test_reporters +as + --%suite(A suite for testing different outcomes from reporters) + --%suitepath(org.utplsql.tests.helpers) + + --%beforeall + procedure beforeall; + + --%beforeeach + procedure beforeeach; + + --%context(some_context) + --%displayname(A description of some context) + + --%test + --%beforetest(beforetest) + --%aftertest(aftertest) + procedure passing_test; + + --%endcontext + + procedure beforetest; + + procedure aftertest; + + --%test(a test with failing assertion) + procedure failing_test; + + --%test(a test raising unhandled exception) + procedure erroring_test; + + --%test(a disabled test) + --%disabled + procedure disabled_test; + + --%aftereach + procedure aftereach; + + --%afterall + procedure afterall; + +end;]'; + + execute immediate q'[create or replace package body test_reporters +as + + procedure beforetest is + begin + dbms_output.put_line(''); + end; + + procedure aftertest + is + begin + dbms_output.put_line(''); + end; + + procedure beforeeach is + begin + dbms_output.put_line(''); + end; + + procedure aftereach is + begin + dbms_output.put_line(''); + end; + + procedure passing_test + is + begin + dbms_output.put_line(''); + ut3.ut.expect(1,'Test 1 Should Pass').to_equal(1); + end; + + procedure failing_test + is + begin + dbms_output.put_line(''); + ut3.ut.expect('number [1] ','Fails as values are different').to_equal('number [2] '); + end; + + procedure erroring_test + is + l_variable integer; + begin + dbms_output.put_line(''); + l_variable := 'a string'; + ut3.ut.expect(l_variable).to_equal(1); + end; + + procedure disabled_test + is + begin + dbms_output.put_line(''); + ut3.ut.expect(1,'this should not execute').to_equal(1); + end; + + procedure beforeall is + begin + dbms_output.put_line(''); + end; + + procedure afterall is + begin + dbms_output.put_line(''); + end; + +end;]'; + + end; + + procedure reporters_setup is + begin + create_test_helper_package; + end; + + procedure drop_test_helper_package is + begin + execute immediate 'drop package test_reporters'; + end; + + procedure reporters_cleanup is + pragma autonomous_transaction; + begin + drop_test_helper_package; + end; + + procedure check_xml_encoding_included( + a_reporter ut3.ut_output_reporter_base, + a_client_character_set varchar2 + ) is + l_results ut3.ut_varchar2_list; + l_actual clob; + begin + --Act + select * + bulk collect into l_results + from table(ut3.ut.run('test_reporters', a_reporter, a_client_character_set => a_client_character_set)); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + --Assert + ut.expect(l_actual).to_be_like('%'); + end; + +end reporters; +/ diff --git a/test/ut3_user/reporters.pks b/test/ut3_user/reporters.pks new file mode 100644 index 000000000..cb601cf3b --- /dev/null +++ b/test/ut3_user/reporters.pks @@ -0,0 +1,18 @@ +create or replace package reporters is + + --%suite + --%suitepath(utplsql.test_user) + + --%beforeall + procedure reporters_setup; + + --%afterall + procedure reporters_cleanup; + + procedure check_xml_encoding_included( + a_reporter ut3.ut_output_reporter_base, + a_client_character_set varchar2 + ); + +end reporters; +/ diff --git a/test/ut3_user/reporters/test_junit_reporter.pkb b/test/ut3_user/reporters/test_junit_reporter.pkb new file mode 100644 index 000000000..b86bb698c --- /dev/null +++ b/test/ut3_user/reporters/test_junit_reporter.pkb @@ -0,0 +1,353 @@ +create or replace package body test_junit_reporter as + + procedure create_a_test_package is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package check_junit_reporting is + --%suite(A suite with ) + + --%test(A test with ) + procedure test_do_stuff; + + end;]'; + execute immediate q'[create or replace package body check_junit_reporting is + procedure test_do_stuff is + begin + ut3.ut.expect(1).to_equal(1); + ut3.ut.expect(1).to_equal(2); + end; + + end;]'; + + execute immediate q'[create or replace package check_junit_rep_suitepath is + --%suitepath(core) + --%suite(check_junit_rep_suitepath) + --%displayname(Check junit Get path for suitepath) + + --%test(check_junit_rep_suitepath) + --%displayname(Check junit Get path for suitepath) + procedure check_junit_rep_suitepath; + end;]'; + execute immediate q'[create or replace package body check_junit_rep_suitepath is + procedure check_junit_rep_suitepath is + begin + ut3.ut.expect(1).to_equal(1); + end; + end;]'; + + + execute immediate q'[create or replace package tst_package_junit_nodesc as + --%suite(Suite name) + + --%test + procedure test1; + + --%test(Test name) + procedure test2; + end;]'; + + execute immediate q'[create or replace package body tst_package_junit_nodesc as + procedure test1 is begin ut.expect(1).to_equal(1); end; + procedure test2 is begin ut.expect(1).to_equal(1); end; + end;]'; + + execute immediate q'[create or replace package tst_package_junit_nosuite as + --%suite + + --%test(Test name) + procedure test1; + end;]'; + + execute immediate q'[create or replace package body tst_package_junit_nosuite as + procedure test1 is begin ut.expect(1).to_equal(1); end; + end;]'; + + execute immediate q'[create or replace package Tst_Fix_Case_Sensitive as + --%suite + + --%test(bugfix) + procedure bUgFiX; + end;]'; + + execute immediate q'[create or replace package body Tst_Fix_Case_Sensitive as + procedure bUgFiX is begin ut.expect(1).to_equal(1); end; + end;]'; + + execute immediate q'[create or replace package check_fail_escape is + --%suitepath(core) + --%suite(checkfailedescape) + --%displayname(Check JUNIT XML failure is escaped) + + --%test(Fail Miserably) + procedure fail_miserably; + + end;]'; + + execute immediate q'[create or replace package body check_fail_escape is + procedure fail_miserably is + begin + ut3.ut.expect('test').to_equal(''); + end; + end;]'; + + end; + + procedure escapes_special_chars is + l_results ut3.ut_varchar2_list; + l_actual clob; + begin + --Act + select * + bulk collect into l_results + from table(ut3.ut.run('check_junit_reporting',ut3.ut_junit_reporter())); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + --Assert + ut.expect(l_actual).not_to_be_like('%%'); + ut.expect(l_actual).to_be_like('%<tag>%'); + end; + + procedure reports_only_failed_or_errored is + l_results ut3.ut_varchar2_list; + l_actual clob; + begin + --Act + select * + bulk collect into l_results + from table(ut3.ut.run('check_junit_reporting',ut3.ut_junit_reporter())); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + --Assert + ut.expect(l_actual).not_to_be_like('%Actual: 1 (number) was expected to equal: 1 (number)%'); + ut.expect(l_actual).to_be_like('%Actual: 1 (number) was expected to equal: 2 (number)%'); + end; + + procedure reports_xunit_only_fail_or_err is + l_results ut3.ut_varchar2_list; + l_actual clob; + begin + --Act + select * + bulk collect into l_results + from table(ut3.ut.run('check_junit_reporting',ut3.ut_xunit_reporter())); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + --Assert + ut.expect(l_actual).not_to_be_like('%Actual: 1 (number) was expected to equal: 1 (number)%'); + ut.expect(l_actual).to_be_like('%Actual: 1 (number) was expected to equal: 2 (number)%'); + end; + + procedure reports_failed_line is + l_results ut3.ut_varchar2_list; + l_actual clob; + begin + --Act + select * + bulk collect into l_results + from table(ut3.ut.run('check_junit_reporting',ut3.ut_junit_reporter())); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + --Assert + ut.expect(l_actual).to_be_like('%at "%.CHECK_JUNIT_REPORTING%", line %'); + end; + + procedure check_classname_suite is + l_results ut3.ut_varchar2_list; + l_actual clob; + begin + --Act + select * + bulk collect into l_results + from table(ut3.ut.run('check_junit_reporting',ut3.ut_junit_reporter())); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + --Assert + ut.expect(l_actual).to_be_like('%testcase classname="check_junit_reporting" assertions="%" name="%"%'); + end; + + procedure check_nls_number_formatting is + l_results ut3.ut_varchar2_list; + l_actual clob; + l_nls_numeric_characters varchar2(30); + begin + --Arrange + select replace(nsp.value,'''','''''') into l_nls_numeric_characters + from nls_session_parameters nsp + where parameter = 'NLS_NUMERIC_CHARACTERS'; + execute immediate q'[alter session set NLS_NUMERIC_CHARACTERS=', ']'; + --Act + select * + bulk collect into l_results + from table(ut3.ut.run('check_junit_reporting', ut3.ut_junit_reporter())); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + --Assert + ut.expect(l_actual).to_match('time="[0-9]*\.[0-9]{3,6}"'); + --Cleanup + execute immediate 'alter session set NLS_NUMERIC_CHARACTERS='''||l_nls_numeric_characters||''''; + end; + + procedure check_classname_suitepath is + l_results ut3.ut_varchar2_list; + l_actual clob; + begin + --Act + select * + bulk collect into l_results + from table(ut3.ut.run('check_junit_rep_suitepath',ut3.ut_junit_reporter())); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + --Assert + ut.expect(l_actual).to_be_like('%testcase classname="core.check_junit_rep_suitepath" assertions="%" name="%"%'); + end; + + procedure report_test_without_desc is + l_results ut3.ut_varchar2_list; + l_actual clob; + l_expected varchar2(32767):= q'[ + + + + + + + + + + + + + +]'; + begin + select * + bulk collect into l_results + from table(ut3.ut.run('tst_package_junit_nodesc',ut3.ut_junit_reporter())); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + ut.expect(l_actual).to_be_like(l_expected); + end; + + procedure report_suite_without_desc is + l_results ut3.ut_varchar2_list; + l_actual clob; + l_expected varchar2(32767):= q'[ + + + + + + + + + +]'; + begin + select * + bulk collect into l_results + from table(ut3.ut.run('tst_package_junit_nosuite',ut3.ut_junit_reporter())); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + ut.expect(l_actual).to_be_like(l_expected); + end; + + procedure reporort_produces_expected_out is + l_results ut3.ut_varchar2_list; + l_actual clob; + l_expected varchar2(32767):=q'[ + + + + + + + + +% + + + + + + + +%Fails as values are different% + +% + + + + +%ORA-06502:% + +% + + + + + + + + +% + + + + + + + +]'; + + begin + select * + bulk collect into l_results + from table(ut3.ut.run('test_reporters',ut3.ut_junit_reporter())); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + ut.expect(l_actual).to_be_like(l_expected); + end; + + procedure check_failure_escaped is + l_results ut3.ut_varchar2_list; + l_actual clob; + begin + --Act + select * + bulk collect into l_results + from table(ut3.ut.run('check_fail_escape',ut3.ut_junit_reporter())); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + --Assert + ut.expect(l_actual).to_be_like('%Actual: 'test' (varchar2) was expected to equal: '<![CDATA[some stuff]]>' (varchar2)%'); + end; + + procedure check_classname_is_populated is + l_results ut3.ut_varchar2_list; + l_actual clob; + l_expected varchar2(32767):= q'[ + + + + + + + + + +]'; + begin + select * + bulk collect into l_results + from table(ut3.ut.run('Tst_Fix_Case_Sensitive',ut3.ut_junit_reporter())); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + ut.expect(l_actual).to_be_like(l_expected); + end; + + procedure check_encoding_included is + begin + reporters.check_xml_encoding_included(ut3.ut_junit_reporter(), 'UTF-8'); + end; + + procedure remove_test_package is + pragma autonomous_transaction; + begin + execute immediate 'drop package check_junit_reporting'; + execute immediate 'drop package check_junit_rep_suitepath'; + execute immediate 'drop package tst_package_junit_nodesc'; + execute immediate 'drop package tst_package_junit_nosuite'; + execute immediate 'drop package check_fail_escape'; + execute immediate 'drop package Tst_Fix_Case_Sensitive'; + end; + +end; +/ diff --git a/test/ut3_user/reporters/test_junit_reporter.pks b/test/ut3_user/reporters/test_junit_reporter.pks new file mode 100644 index 000000000..8af2ba430 --- /dev/null +++ b/test/ut3_user/reporters/test_junit_reporter.pks @@ -0,0 +1,51 @@ +create or replace package test_junit_reporter as + + --%suite(ut_junit_reporter) + --%suitepath(utplsql.test_user.reporters) + + --%beforeall + procedure create_a_test_package; + + --%test(Escapes special characters from test and suite description) + procedure escapes_special_chars; + + --%test(Reports only failed expectations and exceptions) + procedure reports_only_failed_or_errored; + + --%test(Xunit Backward Compatibility - Reports only failed expectations and exceptions) + procedure reports_xunit_only_fail_or_err; + + --%test(Reports failed line of test) + procedure reports_failed_line; + + --%test(Check that classname is returned correct suite) + procedure check_classname_suite; + + --%test(Check that classname is returned correct suitepath) + procedure check_classname_suitepath; + + --%test(Reports duration according to XML specification for numbers) + procedure check_nls_number_formatting; + + --%test(Report on test without description) + procedure report_test_without_desc; + + --%test(Report on suite without description) + procedure report_suite_without_desc; + + --%test(Report produces expected output) + procedure reporort_produces_expected_out; + + --%test( Check classname is populated when procedure is mixed cased - bug #659) + procedure check_classname_is_populated; + + --%test( Validate that fail with special char are escaped ) + procedure check_failure_escaped; + + --%test(Includes XML header with encoding when encoding provided) + procedure check_encoding_included; + + --%afterall + procedure remove_test_package; +end; +/ diff --git a/test/ut3_user/reporters/test_sonar_test_reporter.pkb b/test/ut3_user/reporters/test_sonar_test_reporter.pkb new file mode 100644 index 000000000..76cec84c8 --- /dev/null +++ b/test/ut3_user/reporters/test_sonar_test_reporter.pkb @@ -0,0 +1,36 @@ +create or replace package body test_sonar_test_reporter as + + procedure report_produces_expected_out is + l_results ut3.ut_varchar2_list; + l_actual clob; + l_expected varchar2(32767):=q'[ + + +% +%%% +%%% +%% + +]'; + + begin + select * + bulk collect into l_results + from table( + ut3.ut.run( + 'test_reporters', + ut3.ut_sonar_test_reporter(), + a_test_file_mappings => ut3.ut_file_mapper.build_file_mappings( sys_context('USERENV', 'CURRENT_USER'), ut3.ut_varchar2_list('tests/helpers/test_reporters.pkb')) + ) + ); + l_actual :=ut3_tester_helper.main_helper.table_to_clob(l_results); + ut.expect(l_actual).to_be_like(l_expected); + end; + + procedure check_encoding_included is + begin + reporters.check_xml_encoding_included(ut3.ut_sonar_test_reporter(), 'UTF-8'); + end; + +end; +/ diff --git a/test/ut3_user/reporters/test_sonar_test_reporter.pks b/test/ut3_user/reporters/test_sonar_test_reporter.pks new file mode 100644 index 000000000..0c2fdf70a --- /dev/null +++ b/test/ut3_user/reporters/test_sonar_test_reporter.pks @@ -0,0 +1,13 @@ +create or replace package test_sonar_test_reporter as + + --%suite(ut_sonar_test_reporter) + --%suitepath(utplsql.test_user.reporters) + + --%test(Report produces expected output) + procedure report_produces_expected_out; + + --%test(Includes XML header with encoding when encoding provided) + procedure check_encoding_included; + +end; +/ diff --git a/test/ut3_user/reporters/test_teamcity_reporter.pkb b/test/ut3_user/reporters/test_teamcity_reporter.pkb new file mode 100644 index 000000000..fc2ab169e --- /dev/null +++ b/test/ut3_user/reporters/test_teamcity_reporter.pkb @@ -0,0 +1,131 @@ +create or replace package body test_teamcity_reporter as + + procedure create_a_test_package is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package check_escape_special_chars is + --%suite(A suite with 'quote') + + --%test(A test with 'quote') + procedure test_do_stuff; + + end;]'; + execute immediate q'[create or replace package body check_escape_special_chars is + procedure test_do_stuff is + begin + ut3.ut.expect(' [ ' || chr(13) || chr(10) || ' ] ' ).to_be_null; + end; + + end;]'; + + execute immediate q'[create or replace package check_trims_long_output is + --%suite + + --%test + procedure long_output; + end;]'; + execute immediate q'[create or replace package body check_trims_long_output is + procedure long_output is + begin + ut3.ut.expect(rpad('aVarchar',4000,'a')).to_be_null; + end; + end;]'; + + end; + + + procedure report_produces_expected_out is + l_output_data ut3.ut_varchar2_list; + l_output clob; + l_expected varchar2(32767); + begin + l_expected := q'{%##teamcity[testSuiteStarted timestamp='%' name='org'] +%##teamcity[testSuiteStarted timestamp='%' name='org.utplsql'] +%##teamcity[testSuiteStarted timestamp='%' name='org.utplsql.tests'] +%##teamcity[testSuiteStarted timestamp='%' name='org.utplsql.tests.helpers'] +%##teamcity[testSuiteStarted timestamp='%' name='A suite for testing different outcomes from reporters'] +%##teamcity[testSuiteStarted timestamp='%' name='A description of some context'] +%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3$user#.test_reporters.passing_test'] + + + + + +%##teamcity[testFinished timestamp='%' duration='%' name='ut3$user#.test_reporters.passing_test'] +%##teamcity[testSuiteFinished timestamp='%' name='A description of some context'] +%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3$user#.test_reporters.failing_test'] + + + +%##teamcity[testFailed timestamp='%' details='Actual: |'number |[1|] |' (varchar2) was expected to equal: |'number |[2|] |' (varchar2) ' message='Fails as values are different' name='ut3$user#.test_reporters.failing_test'] +%##teamcity[testFinished timestamp='%' duration='%' name='ut3$user#.test_reporters.failing_test'] +%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3$user#.test_reporters.erroring_test'] + + + +%##teamcity[testStdErr timestamp='%' name='ut3$user#.test_reporters.erroring_test' out='Test exception:|nORA-06512: at "UT3$USER#.TEST_REPORTERS", line %|nORA-06512: at %|n|n'] +%##teamcity[testFailed timestamp='%' details='Test exception:|nORA-06512: at "UT3$USER#.TEST_REPORTERS", line %|nORA-06512: at %|n|n' message='Error occured' name='ut3$user#.test_reporters.erroring_test'] +%##teamcity[testFinished timestamp='%' duration='%' name='ut3$user#.test_reporters.erroring_test'] +%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3$user#.test_reporters.disabled_test'] +%##teamcity[testIgnored timestamp='%' name='ut3$user#.test_reporters.disabled_test'] +%##teamcity[testSuiteFinished timestamp='%' name='A suite for testing different outcomes from reporters'] +%##teamcity[testSuiteFinished timestamp='%' name='org.utplsql.tests.helpers'] +%##teamcity[testSuiteFinished timestamp='%' name='org.utplsql.tests'] +%##teamcity[testSuiteFinished timestamp='%' name='org.utplsql'] +%##teamcity[testSuiteFinished timestamp='%' name='org']}'; + --act + select * + bulk collect into l_output_data + from table(ut3.ut.run('test_reporters',ut3.ut_teamcity_reporter())); + + --assert + ut.expect(ut3_tester_helper.main_helper.table_to_clob(l_output_data)).to_be_like(l_expected); + end; + + procedure escape_special_chars is + l_output_data ut3.ut_varchar2_list; + l_output clob; + l_expected varchar2(32767); + begin + l_expected := q'{%##teamcity[testSuiteStarted timestamp='%' name='A suite with |'quote|''] +%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3$user#.check_escape_special_chars.test_do_stuff'] +%##teamcity[testFailed timestamp='%' details='Actual: (varchar2)|n |' |[ |r|n |] |'|nwas expected to be null' name='ut3$user#.check_escape_special_chars.test_do_stuff'] +%##teamcity[testFinished timestamp='%' duration='%' name='ut3$user#.check_escape_special_chars.test_do_stuff'] +%##teamcity[testSuiteFinished timestamp='%' name='A suite with |'quote|'']}'; + --act + select * + bulk collect into l_output_data + from table(ut3.ut.run('check_escape_special_chars',ut3.ut_teamcity_reporter())); + + --assert + ut.expect(ut3_tester_helper.main_helper.table_to_clob(l_output_data)).to_be_like(l_expected); + end; + + procedure trims_long_output is + l_output_data ut3.ut_varchar2_list; + l_output clob; + l_expected varchar2(32767); + begin + l_expected := q'{%##teamcity[testSuiteStarted timestamp='%' name='check_trims_long_output'] +%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3$user#.check_trims_long_output.long_output'] +%##teamcity[testFailed timestamp='%' details='Actual: (varchar2)|n |'aVarcharaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|[...|]' name='ut3$user#.check_trims_long_output.long_output'] +%##teamcity[testFinished timestamp='%' duration='%' name='ut3$user#.check_trims_long_output.long_output'] +%##teamcity[testSuiteFinished timestamp='%' name='check_trims_long_output']}'; + --act + select * + bulk collect into l_output_data + from table(ut3.ut.run('check_trims_long_output',ut3.ut_teamcity_reporter())); + + --assert + ut.expect(ut3_tester_helper.main_helper.table_to_clob(l_output_data)).to_be_like(l_expected); + end; + + procedure remove_test_package is + pragma autonomous_transaction; + begin + execute immediate 'drop package check_escape_special_chars'; + execute immediate 'drop package check_trims_long_output'; + end; + +end; +/ diff --git a/test/ut3_user/reporters/test_teamcity_reporter.pks b/test/ut3_user/reporters/test_teamcity_reporter.pks new file mode 100644 index 000000000..f849751f1 --- /dev/null +++ b/test/ut3_user/reporters/test_teamcity_reporter.pks @@ -0,0 +1,22 @@ +create or replace package test_teamcity_reporter as + + --%suite(ut_teamcity_reporter) + --%suitepath(utplsql.test_user.reporters) + + --%beforeall + procedure create_a_test_package; + + --%test(Report produces expected output) + procedure report_produces_expected_out; + + --%test(Escapes special characters) + procedure escape_special_chars; + + --%test(Trims output so it fits into 4000 chars) + procedure trims_long_output; + + --%afterall + procedure remove_test_package; + +end; +/ diff --git a/test/ut3_user/reporters/test_tfs_junit_reporter.pkb b/test/ut3_user/reporters/test_tfs_junit_reporter.pkb new file mode 100644 index 000000000..623dda51e --- /dev/null +++ b/test/ut3_user/reporters/test_tfs_junit_reporter.pkb @@ -0,0 +1,207 @@ +create or replace package body test_tfs_junit_reporter as + + procedure crate_a_test_package is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package check_junit_reporting is + --%suite(A suite with ) + + --%test(A test with ) + procedure test_do_stuff; + + end;]'; + execute immediate q'[create or replace package body check_junit_reporting is + procedure test_do_stuff is + begin + ut3.ut.expect(1).to_equal(1); + ut3.ut.expect(1).to_equal(2); + end; + + end;]'; + + execute immediate q'[create or replace package check_junit_rep_suitepath is + --%suitepath(core) + --%suite(check_junit_rep_suitepath) + --%displayname(Check JUNIT Get path for suitepath) + + --%test(check_junit_rep_suitepath) + --%displayname(Check JUNIT Get path for suitepath) + procedure check_junit_rep_suitepath; + end;]'; + execute immediate q'[create or replace package body check_junit_rep_suitepath is + procedure check_junit_rep_suitepath is + begin + ut3.ut.expect(1).to_equal(1); + end; + end;]'; + + execute immediate q'[create or replace package check_junit_flat_suitepath is + --%suitepath(core.check_junit_rep_suitepath) + --%suite(flatsuitepath) + + --%beforeall + procedure donuffin; + end;]'; + execute immediate q'[create or replace package body check_junit_flat_suitepath is + procedure donuffin is + begin + null; + end; + end;]'; + + + execute immediate q'[create or replace package check_fail_escape is + --%suitepath(core) + --%suite(checkfailedescape) + --%displayname(Check JUNIT XML failure is escaped) + + --%test(Fail Miserably) + procedure fail_miserably; + + end;]'; + + execute immediate q'[create or replace package body check_fail_escape is + procedure fail_miserably is + begin + ut3.ut.expect('test').to_equal(''); + end; + end;]'; + + end; + + + procedure escapes_special_chars is + l_results ut3.ut_varchar2_list; + l_actual clob; + begin + --Act + select * + bulk collect into l_results + from table(ut3.ut.run('check_junit_reporting',ut3.ut_tfs_junit_reporter())); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + --Assert + ut.expect(l_actual).not_to_be_like('%%'); + ut.expect(l_actual).to_be_like('%<tag>%'); + end; + + procedure reports_only_failed_or_errored is + l_results ut3.ut_varchar2_list; + l_actual clob; + begin + --Act + select * + bulk collect into l_results + from table(ut3.ut.run('check_junit_reporting',ut3.ut_tfs_junit_reporter())); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + --Assert + ut.expect(l_actual).not_to_be_like('%Actual: 1 (number) was expected to equal: 1 (number)%'); + ut.expect(l_actual).to_be_like('%Actual: 1 (number) was expected to equal: 2 (number)%'); + end; + + procedure reports_failed_line is + l_results ut3.ut_varchar2_list; + l_actual clob; + begin + --Act + select * + bulk collect into l_results + from table(ut3.ut.run('check_junit_reporting',ut3.ut_tfs_junit_reporter())); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + --Assert + ut.expect(l_actual).to_be_like('%at "%.CHECK_JUNIT_REPORTING%", line %'); + end; + + procedure check_classname_suite is + l_results ut3.ut_varchar2_list; + l_actual clob; + begin + --Act + select * + bulk collect into l_results + from table(ut3.ut.run('check_junit_reporting',ut3.ut_tfs_junit_reporter())); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + --Assert + ut.expect(l_actual).to_be_like('%testcase classname="check_junit_reporting"%'); + end; + + procedure check_flatten_nested_suites is + l_results ut3.ut_varchar2_list; + l_actual clob; + begin + --Act + select * + bulk collect into l_results + from table(ut3.ut.run('check_junit_flat_suitepath',ut3.ut_tfs_junit_reporter())); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + --Assert + ut.expect(l_actual).to_be_like(' + + + + + +%'); + end; + + procedure check_nls_number_formatting is + l_results ut3.ut_varchar2_list; + l_actual clob; + l_nls_numeric_characters varchar2(30); + begin + --Arrange + select replace(nsp.value,'''','''''') into l_nls_numeric_characters + from nls_session_parameters nsp + where parameter = 'NLS_NUMERIC_CHARACTERS'; + execute immediate q'[alter session set NLS_NUMERIC_CHARACTERS=', ']'; + --Act + select * + bulk collect into l_results + from table(ut3.ut.run('check_junit_reporting', ut3.ut_tfs_junit_reporter())); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + --Assert + ut.expect(l_actual).to_match('time="[0-9]*\.[0-9]{3,6}"'); + --Cleanup + execute immediate 'alter session set NLS_NUMERIC_CHARACTERS='''||l_nls_numeric_characters||''''; + end; + + procedure check_failure_escaped is + l_results ut3.ut_varchar2_list; + l_actual clob; + begin + --Act + select * + bulk collect into l_results + from table(ut3.ut.run('check_fail_escape',ut3.ut_tfs_junit_reporter())); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + --Assert + ut.expect(l_actual).to_be_like('%Actual: 'test' (varchar2) was expected to equal: '<![CDATA[some stuff]]>' (varchar2)%'); + end; + + procedure check_classname_suitepath is + l_results ut3.ut_varchar2_list; + l_actual clob; + begin + --Act + select * + bulk collect into l_results + from table(ut3.ut.run('check_junit_rep_suitepath',ut3.ut_tfs_junit_reporter())); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + --Assert + ut.expect(l_actual).to_be_like('%testcase classname="core.check_junit_rep_suitepath"%'); + end; + procedure remove_test_package is + pragma autonomous_transaction; + begin + execute immediate 'drop package check_junit_reporting'; + execute immediate 'drop package check_junit_rep_suitepath'; + execute immediate 'drop package check_junit_flat_suitepath'; + execute immediate 'drop package check_fail_escape'; + end; + + procedure check_encoding_included is + begin + reporters.check_xml_encoding_included(ut3.ut_tfs_junit_reporter(), 'UTF-8'); + end; + +end; +/ diff --git a/test/ut3_user/reporters/test_tfs_junit_reporter.pks b/test/ut3_user/reporters/test_tfs_junit_reporter.pks new file mode 100644 index 000000000..af6227283 --- /dev/null +++ b/test/ut3_user/reporters/test_tfs_junit_reporter.pks @@ -0,0 +1,39 @@ +create or replace package test_tfs_junit_reporter as + + --%suite(ut_tfs_junit_reporter) + --%suitepath(utplsql.test_user.reporters) + + --%beforeall + procedure crate_a_test_package; + + --%test(Escapes special characters from test and suite description) + procedure escapes_special_chars; + + --%test(Reports only failed expectations and exceptions) + procedure reports_only_failed_or_errored; + + --%test(Reports failed line of test) + procedure reports_failed_line; + + --%test(Check that classname is returned correct suite) + procedure check_classname_suite; + + --%test(Check that classname is returned correct suitepath) + procedure check_classname_suitepath; + + --%test(Check that nested suites are being flatten) + procedure check_flatten_nested_suites; + + --%test(Reports duration according to XML specification for numbers) + procedure check_nls_number_formatting; + + --%test( Validate that failures with special char are escaped ) + procedure check_failure_escaped; + + --%test(Includes XML header with encoding when encoding provided) + procedure check_encoding_included; + + --%afterall + procedure remove_test_package; +end; +/ From 7bae9ff5f67d86ccd358e16086d08fc0f20f5463 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 30 Mar 2019 20:58:55 +0000 Subject: [PATCH 0373/1096] Fixed storage for clob in output bugger table - make it inline. Changed how delete from output buffer table is handled - use ROWID. Increased fetch size from 100 to 3000 rows for output buffer. --- .../output_buffers/ut_output_buffer_tmp.sql | 7 ++++--- .../output_buffers/ut_output_table_buffer.tpb | 19 ++++++++++--------- source/install.sql | 1 - 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/source/core/output_buffers/ut_output_buffer_tmp.sql b/source/core/output_buffers/ut_output_buffer_tmp.sql index e7cb49817..e452e769f 100644 --- a/source/core/output_buffers/ut_output_buffer_tmp.sql +++ b/source/core/output_buffers/ut_output_buffer_tmp.sql @@ -32,14 +32,15 @@ begin is_finished = 0 and (text is not null or item_type is not null ) or is_finished = 1 and text is null and item_type is null ), constraint ut_output_buffer_fk1 foreign key (output_id) references ut_output_buffer_info_tmp$(output_id) -) organization index overflow nologging initrans 100 '; +) nologging initrans 100 +'; begin execute immediate - v_table_sql || 'lob(text) store as securefile ut_output_text(retention none)'; + v_table_sql || 'lob(text) store as securefile ut_output_text(retention none enable storage in row)'; exception when e_non_assm then execute immediate - v_table_sql || 'lob(text) store as basicfile ut_output_text(pctversion 0)'; + v_table_sql || 'lob(text) store as basicfile ut_output_text(pctversion 0 enable storage in row)'; end; end; diff --git a/source/core/output_buffers/ut_output_table_buffer.tpb b/source/core/output_buffers/ut_output_table_buffer.tpb index 5fc71570c..e6c154267 100644 --- a/source/core/output_buffers/ut_output_table_buffer.tpb +++ b/source/core/output_buffers/ut_output_table_buffer.tpb @@ -78,8 +78,9 @@ create or replace type body ut_output_table_buffer is end; overriding member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined is + type t_rowid_tab is table of urowid; + l_message_rowids t_rowid_tab; l_buffer_data ut_output_data_rows; - l_message_ids ut_integer_list; l_finished_flags ut_integer_list; l_already_waited_for number(10,2) := 0; l_finished boolean := false; @@ -90,14 +91,14 @@ create or replace type body ut_output_table_buffer is lc_long_sleep_time constant number(1) := 1; --sleep for 1 s when waiting long lc_long_wait_time constant number(1) := 1; --waiting more than 1 sec l_sleep_time number(2,1) := lc_short_sleep_time; - lc_bulk_limit constant integer := 100; + lc_bulk_limit constant integer := 3000; - procedure remove_read_data(a_message_ids ut_integer_list) is + procedure remove_read_data(a_message_rowids t_rowid_tab) is pragma autonomous_transaction; begin - delete from ut_output_buffer_tmp a - where a.output_id = self.output_id - and a.message_id in (select column_value from table(a_message_ids)); + forall i in 1 .. a_message_rowids.count + delete from ut_output_buffer_tmp a + where rowid = a_message_rowids(i); commit; end; @@ -112,13 +113,13 @@ create or replace type body ut_output_table_buffer is begin while not l_finished loop with ordered_buffer as ( - select a.message_id, ut_output_data_row(a.text, a.item_type), is_finished + select a.rowid, ut_output_data_row(a.text, a.item_type), is_finished from ut_output_buffer_tmp a where a.output_id = self.output_id order by a.message_id ) select b.* - bulk collect into l_message_ids, l_buffer_data, l_finished_flags + bulk collect into l_message_rowids, l_buffer_data, l_finished_flags from ordered_buffer b where rownum <= lc_bulk_limit; @@ -147,7 +148,7 @@ create or replace type body ut_output_table_buffer is exit; end if; end loop; - remove_read_data(l_message_ids); + remove_read_data(l_message_rowids); end if; if l_finished or l_already_waited_for >= l_wait_for then remove_buffer_info(); diff --git a/source/install.sql b/source/install.sql index e34aa57af..c80eb67e6 100644 --- a/source/install.sql +++ b/source/install.sql @@ -194,7 +194,6 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/data_values/ut_cursor_column.tps' @@install_component.sql 'expectations/data_values/ut_cursor_column_tab.tps' @@install_component.sql 'expectations/data_values/ut_cursor_details.tps' -@@install_component.sql 'expectations/data_values/ut_data_value_anydata.tps' @@install_component.sql 'expectations/data_values/ut_data_value_blob.tps' @@install_component.sql 'expectations/data_values/ut_data_value_boolean.tps' @@install_component.sql 'expectations/data_values/ut_data_value_clob.tps' From 9d6bfe8a61a70597d278a002c01946d24cf88d18 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 31 Mar 2019 13:24:41 +0100 Subject: [PATCH 0374/1096] Improved performance for reading data from output buffer. Decreased read limit back to 1000 as it should not have significant performance impact anymore. --- .../core/output_buffers/ut_message_id_seq.sql | 1 - .../output_buffers/ut_output_buffer_base.tps | 8 ++--- .../output_buffers/ut_output_table_buffer.tpb | 32 +++++++++++-------- .../output_buffers/ut_output_table_buffer.tps | 9 +++--- source/install.sql | 1 - source/uninstall_objects.sql | 2 -- 6 files changed, 28 insertions(+), 25 deletions(-) delete mode 100644 source/core/output_buffers/ut_message_id_seq.sql diff --git a/source/core/output_buffers/ut_message_id_seq.sql b/source/core/output_buffers/ut_message_id_seq.sql deleted file mode 100644 index 3f0cd25c4..000000000 --- a/source/core/output_buffers/ut_message_id_seq.sql +++ /dev/null @@ -1 +0,0 @@ -create sequence ut_message_id_seq nocycle cache 100; diff --git a/source/core/output_buffers/ut_output_buffer_base.tps b/source/core/output_buffers/ut_output_buffer_base.tps index 42c4a0d72..59226a7fb 100644 --- a/source/core/output_buffers/ut_output_buffer_base.tps +++ b/source/core/output_buffers/ut_output_buffer_base.tps @@ -18,10 +18,10 @@ create or replace type ut_output_buffer_base authid definer as object( output_id raw(32), member procedure init(self in out nocopy ut_output_buffer_base), - not instantiable member procedure close(self in ut_output_buffer_base), - not instantiable member procedure send_line(self in ut_output_buffer_base, a_text varchar2, a_item_type varchar2 := null), - not instantiable member procedure send_lines(self in ut_output_buffer_base, a_text_list ut_varchar2_rows, a_item_type varchar2 := null), - not instantiable member procedure send_clob(self in ut_output_buffer_base, a_text clob, a_item_type varchar2 := null), + not instantiable member procedure close(self in out nocopy ut_output_buffer_base), + not instantiable member procedure send_line(self in out nocopy ut_output_buffer_base, a_text varchar2, a_item_type varchar2 := null), + not instantiable member procedure send_lines(self in out nocopy ut_output_buffer_base, a_text_list ut_varchar2_rows, a_item_type varchar2 := null), + not instantiable member procedure send_clob(self in out nocopy ut_output_buffer_base, a_text clob, a_item_type varchar2 := null), not instantiable member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined, not instantiable member function get_lines_cursor(a_initial_timeout natural := null, a_timeout_sec natural := null) return sys_refcursor, not instantiable member procedure lines_to_dbms_output(self in ut_output_buffer_base, a_initial_timeout natural := null, a_timeout_sec natural := null) diff --git a/source/core/output_buffers/ut_output_table_buffer.tpb b/source/core/output_buffers/ut_output_table_buffer.tpb index e6c154267..41a3aa82f 100644 --- a/source/core/output_buffers/ut_output_table_buffer.tpb +++ b/source/core/output_buffers/ut_output_table_buffer.tpb @@ -20,6 +20,7 @@ create or replace type body ut_output_table_buffer is begin self.output_id := coalesce(a_output_id, sys_guid()); self.start_date := sysdate; + self.last_message_id := 0; self.init(); self.cleanup_buffer(); return; @@ -38,41 +39,44 @@ create or replace type body ut_output_table_buffer is commit; end; - overriding member procedure close(self in ut_output_table_buffer) is + overriding member procedure close(self in out nocopy ut_output_table_buffer) is pragma autonomous_transaction; begin + self.last_message_id := self.last_message_id + 1; insert into ut_output_buffer_tmp(output_id, message_id, is_finished) - values (self.output_id, ut_message_id_seq.nextval, 1); + values (self.output_id, self.last_message_id, 1); commit; end; - overriding member procedure send_line(self in ut_output_table_buffer, a_text varchar2, a_item_type varchar2 := null) is + overriding member procedure send_line(self in out nocopy ut_output_table_buffer, a_text varchar2, a_item_type varchar2 := null) is pragma autonomous_transaction; begin if a_text is not null or a_item_type is not null then + self.last_message_id := self.last_message_id + 1; insert into ut_output_buffer_tmp(output_id, message_id, text, item_type) - values (self.output_id, ut_message_id_seq.nextval, a_text, a_item_type); + values (self.output_id, self.last_message_id, a_text, a_item_type); end if; commit; end; - overriding member procedure send_lines(self in ut_output_table_buffer, a_text_list ut_varchar2_rows, a_item_type varchar2 := null) is + overriding member procedure send_lines(self in out nocopy ut_output_table_buffer, a_text_list ut_varchar2_rows, a_item_type varchar2 := null) is pragma autonomous_transaction; begin insert into ut_output_buffer_tmp(output_id, message_id, text, item_type) - select self.output_id, ut_message_id_seq.nextval, t.column_value, a_item_type + select self.output_id, self.last_message_id + rownum, t.column_value, a_item_type from table(a_text_list) t where t.column_value is not null or a_item_type is not null; - + self.last_message_id := self.last_message_id + a_text_list.count; commit; end; - overriding member procedure send_clob(self in ut_output_table_buffer, a_text clob, a_item_type varchar2 := null) is + overriding member procedure send_clob(self in out nocopy ut_output_table_buffer, a_text clob, a_item_type varchar2 := null) is pragma autonomous_transaction; begin if a_text is not null and a_text != empty_clob() or a_item_type is not null then + self.last_message_id := self.last_message_id + 1; insert into ut_output_buffer_tmp(output_id, message_id, text, item_type) - values (self.output_id, ut_message_id_seq.nextval, a_text, a_item_type); + values (self.output_id, self.last_message_id, a_text, a_item_type); end if; commit; end; @@ -91,7 +95,8 @@ create or replace type body ut_output_table_buffer is lc_long_sleep_time constant number(1) := 1; --sleep for 1 s when waiting long lc_long_wait_time constant number(1) := 1; --waiting more than 1 sec l_sleep_time number(2,1) := lc_short_sleep_time; - lc_bulk_limit constant integer := 3000; + lc_bulk_limit constant integer := 1000; + l_max_message_id integer := lc_bulk_limit; procedure remove_read_data(a_message_rowids t_rowid_tab) is pragma autonomous_transaction; @@ -113,15 +118,15 @@ create or replace type body ut_output_table_buffer is begin while not l_finished loop with ordered_buffer as ( - select a.rowid, ut_output_data_row(a.text, a.item_type), is_finished + select /*+ index(a) */ a.rowid, ut_output_data_row(a.text, a.item_type), is_finished from ut_output_buffer_tmp a where a.output_id = self.output_id + and a.message_id <= l_max_message_id order by a.message_id ) select b.* bulk collect into l_message_rowids, l_buffer_data, l_finished_flags - from ordered_buffer b - where rownum <= lc_bulk_limit; + from ordered_buffer b; --nothing fetched from output, wait and try again if l_buffer_data.count = 0 then @@ -159,6 +164,7 @@ create or replace type body ut_output_table_buffer is ); end if; end if; + l_max_message_id := l_max_message_id + lc_bulk_limit; end loop; return; end; diff --git a/source/core/output_buffers/ut_output_table_buffer.tps b/source/core/output_buffers/ut_output_table_buffer.tps index 1c9acbd1d..9cf64927c 100644 --- a/source/core/output_buffers/ut_output_table_buffer.tps +++ b/source/core/output_buffers/ut_output_table_buffer.tps @@ -17,12 +17,13 @@ create or replace type ut_output_table_buffer under ut_output_buffer_base ( */ start_date date, + last_message_id number(38,0), constructor function ut_output_table_buffer(self in out nocopy ut_output_table_buffer, a_output_id raw := null) return self as result, overriding member procedure init(self in out nocopy ut_output_table_buffer), - overriding member procedure send_line(self in ut_output_table_buffer, a_text varchar2, a_item_type varchar2 := null), - overriding member procedure send_lines(self in ut_output_table_buffer, a_text_list ut_varchar2_rows, a_item_type varchar2 := null), - overriding member procedure send_clob(self in ut_output_table_buffer, a_text clob, a_item_type varchar2 := null), - overriding member procedure close(self in ut_output_table_buffer), + overriding member procedure send_line(self in out nocopy ut_output_table_buffer, a_text varchar2, a_item_type varchar2 := null), + overriding member procedure send_lines(self in out nocopy ut_output_table_buffer, a_text_list ut_varchar2_rows, a_item_type varchar2 := null), + overriding member procedure send_clob(self in out nocopy ut_output_table_buffer, a_text clob, a_item_type varchar2 := null), + overriding member procedure close(self in out nocopy ut_output_table_buffer), overriding member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined, overriding member function get_lines_cursor(a_initial_timeout natural := null, a_timeout_sec natural := null) return sys_refcursor, overriding member procedure lines_to_dbms_output(self in ut_output_table_buffer, a_initial_timeout natural := null, a_timeout_sec natural := null), diff --git a/source/install.sql b/source/install.sql index c80eb67e6..08a5b59d7 100644 --- a/source/install.sql +++ b/source/install.sql @@ -99,7 +99,6 @@ alter session set current_schema = &&ut3_owner; --output buffer table @@install_component.sql 'core/output_buffers/ut_output_buffer_info_tmp.sql' @@install_component.sql 'core/output_buffers/ut_output_buffer_tmp.sql' -@@install_component.sql 'core/output_buffers/ut_message_id_seq.sql' --output buffer table api @@install_component.sql 'core/output_buffers/ut_output_table_buffer.tps' @@install_component.sql 'core/output_buffers/ut_output_table_buffer.tpb' diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index 62d14cb58..ed84aa0a0 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -257,8 +257,6 @@ drop view ut_output_buffer_info_tmp; drop table ut_output_buffer_info_tmp$; -drop sequence ut_message_id_seq; - drop type ut_output_data_rows force; drop type ut_output_data_row force; From 4d00c33bbd0cab1ed68159fec24cec342dfa932b Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 31 Mar 2019 14:31:54 +0100 Subject: [PATCH 0375/1096] Increased read limit to 5000. Fixed bug with increasing `max_message_id` even when nothing was read. --- source/core/output_buffers/ut_output_table_buffer.tpb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/core/output_buffers/ut_output_table_buffer.tpb b/source/core/output_buffers/ut_output_table_buffer.tpb index 41a3aa82f..5a9bdcce7 100644 --- a/source/core/output_buffers/ut_output_table_buffer.tpb +++ b/source/core/output_buffers/ut_output_table_buffer.tpb @@ -95,7 +95,7 @@ create or replace type body ut_output_table_buffer is lc_long_sleep_time constant number(1) := 1; --sleep for 1 s when waiting long lc_long_wait_time constant number(1) := 1; --waiting more than 1 sec l_sleep_time number(2,1) := lc_short_sleep_time; - lc_bulk_limit constant integer := 1000; + lc_bulk_limit constant integer := 5000; l_max_message_id integer := lc_bulk_limit; procedure remove_read_data(a_message_rowids t_rowid_tab) is @@ -154,6 +154,7 @@ create or replace type body ut_output_table_buffer is end if; end loop; remove_read_data(l_message_rowids); + l_max_message_id := l_max_message_id + lc_bulk_limit; end if; if l_finished or l_already_waited_for >= l_wait_for then remove_buffer_info(); @@ -164,7 +165,6 @@ create or replace type body ut_output_table_buffer is ); end if; end if; - l_max_message_id := l_max_message_id + lc_bulk_limit; end loop; return; end; From 858372c7001e1b2e7106302350d9a35a1cd34993 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sun, 31 Mar 2019 16:33:08 +0100 Subject: [PATCH 0376/1096] Adding set of tests: reporters/test_coverage reporters/test_debug_reporter reporters/test_documentation_reporter reporters/test_extended_coverage reporters/test_realtime_reporter Fixing some helper methods. --- test/grant_ut3_owner_to_ut3_tester.sql | 2 +- test/install_ut3_tester_helper.sql | 4 + test/install_ut3_user_tests.sql | 24 +- test/ut3_tester_helper/coverage_helper.pkb | 215 ++++++++++ test/ut3_tester_helper/coverage_helper.pks | 27 ++ test/ut3_tester_helper/main_helper.pkb | 20 + test/ut3_tester_helper/main_helper.pks | 10 +- test/ut3_tester_helper/run_helper.pkb | 2 +- test/ut3_tester_helper/run_helper.pks | 5 +- test/ut3_tester_helper/test_event_list.tps | 2 + test/ut3_tester_helper/test_event_object.tps | 15 + test/ut3_user/reporters/test_coverage.pkb | 51 +++ test/ut3_user/reporters/test_coverage.pks | 20 + .../reporters/test_debug_reporter.pkb | 45 ++ .../reporters/test_debug_reporter.pks | 16 + .../reporters/test_documentation_reporter.pkb | 1 + .../reporters/test_documentation_reporter.pks | 10 + .../reporters/test_extended_coverage.pkb | 106 +++++ .../reporters/test_extended_coverage.pks | 22 + .../reporters/test_realtime_reporter.pkb | 401 ++++++++++++++++++ .../reporters/test_realtime_reporter.pks | 55 +++ 21 files changed, 1048 insertions(+), 5 deletions(-) create mode 100644 test/ut3_tester_helper/coverage_helper.pkb create mode 100644 test/ut3_tester_helper/coverage_helper.pks create mode 100644 test/ut3_tester_helper/test_event_list.tps create mode 100644 test/ut3_tester_helper/test_event_object.tps create mode 100644 test/ut3_user/reporters/test_coverage.pkb create mode 100644 test/ut3_user/reporters/test_coverage.pks create mode 100644 test/ut3_user/reporters/test_debug_reporter.pkb create mode 100644 test/ut3_user/reporters/test_debug_reporter.pks create mode 100644 test/ut3_user/reporters/test_documentation_reporter.pkb create mode 100644 test/ut3_user/reporters/test_documentation_reporter.pks create mode 100644 test/ut3_user/reporters/test_extended_coverage.pkb create mode 100644 test/ut3_user/reporters/test_extended_coverage.pks create mode 100644 test/ut3_user/reporters/test_realtime_reporter.pkb create mode 100644 test/ut3_user/reporters/test_realtime_reporter.pks diff --git a/test/grant_ut3_owner_to_ut3_tester.sql b/test/grant_ut3_owner_to_ut3_tester.sql index d06a24ace..19424be1a 100644 --- a/test/grant_ut3_owner_to_ut3_tester.sql +++ b/test/grant_ut3_owner_to_ut3_tester.sql @@ -17,7 +17,7 @@ begin and generated = 'N' and lower(object_name) not like 'sys%') loop - execute immediate 'grant execute on ut3.'||i.object_name||' to UT3_TESTER'; + execute immediate 'grant execute on ut3."'||i.object_name||'" to UT3_TESTER'; end loop; end; / diff --git a/test/install_ut3_tester_helper.sql b/test/install_ut3_tester_helper.sql index 1645cd4c7..c6244fd39 100644 --- a/test/install_ut3_tester_helper.sql +++ b/test/install_ut3_tester_helper.sql @@ -11,14 +11,18 @@ alter session set plsql_optimize_level=0; @@ut3_tester_helper/test_tab_varray.tps @@ut3_tester_helper/test_dummy_number.tps @@ut3_tester_helper/ut_test_table.sql +@@ut3_tester_helper/test_event_object.tps +@@ut3_tester_helper/test_event_list.tps @@ut3_tester_helper/main_helper.pks @@ut3_tester_helper/run_helper.pks +@@ut3_tester_helper/coverage_helper.pks @@ut3_tester_helper/expectations_helper.pks @@ut3_tester_helper/ut_example_tests.pks @@ut3_tester_helper/main_helper.pkb @@ut3_tester_helper/run_helper.pkb +@@ut3_tester_helper/coverage_helper.pkb @@ut3_tester_helper/expectations_helper.pkb @@ut3_tester_helper/ut_example_tests.pkb diff --git a/test/install_ut3_user_tests.sql b/test/install_ut3_user_tests.sql index 3db7beee7..5da99d802 100644 --- a/test/install_ut3_user_tests.sql +++ b/test/install_ut3_user_tests.sql @@ -25,8 +25,18 @@ prompt Install user tests @@ut3_user/reporters/test_teamcity_reporter.pks @@ut3_user/reporters/test_sonar_test_reporter.pks @@ut3_user/reporters/test_junit_reporter.pks +@@ut3_user/reporters/test_documentation_reporter.pks +@@ut3_user/reporters/test_debug_reporter.pks +@@ut3_user/reporters/test_realtime_reporter.pks +@@ut3_user/reporters/test_coverage.pks +set define on +@@install_above_12_1.sql 'ut3_user/reporters/test_extended_coverage.pks' +set define off - +--set define on +--@@install_below_12_2.sql 'ut3_user/reporters/test_proftag_coverage.pks' +--@@install_below_12_2.sql 'ut3_user/reporters/test_coverage/test_html_proftab_reporter.pks' +--set define off @@ut3_user/expectations/unary/test_expect_not_to_be_null.pkb @@ut3_user/expectations/unary/test_expect_to_be_null.pkb @@ -48,6 +58,18 @@ prompt Install user tests @@ut3_user/reporters/test_teamcity_reporter.pkb @@ut3_user/reporters/test_sonar_test_reporter.pkb @@ut3_user/reporters/test_junit_reporter.pkb +@@ut3_user/reporters/test_documentation_reporter.pkb +@@ut3_user/reporters/test_debug_reporter.pkb +@@ut3_user/reporters/test_realtime_reporter.pkb +@@ut3_user/reporters/test_coverage.pkb +set define on +@@install_above_12_1.sql 'ut3_user/reporters/test_extended_coverage.pkb' +set define off + +--set define on +--@@install_below_12_2.sql 'ut3_user/reporters/test_coverage.pkb' +--@@install_below_12_2.sql 'ut3_user/reporters/test_coverage/test_html_proftab_reporter.pkb' +--set define off set linesize 200 diff --git a/test/ut3_tester_helper/coverage_helper.pkb b/test/ut3_tester_helper/coverage_helper.pkb new file mode 100644 index 000000000..06f42bbf3 --- /dev/null +++ b/test/ut3_tester_helper/coverage_helper.pkb @@ -0,0 +1,215 @@ +create or replace package body coverage_helper is + + function get_mock_run_id return integer is + v_result integer; + begin + select nvl(min(runid),0) - 1 into v_result + from ut3.plsql_profiler_runs; + return v_result; + end; + + function get_mock_block_run_id return integer is + v_result integer; + begin + select nvl(min(run_id),0) - 1 into v_result + from dbmspcc_runs; + return v_result; + end; + + procedure mock_coverage_data(a_run_id integer,a_user in varchar2) is + c_unit_id constant integer := 1; + begin + insert into ut3.plsql_profiler_runs ( runid, run_owner, run_date, run_comment) + values(a_run_id, a_user, sysdate, 'unit testing utPLSQL'); + + insert into ut3.plsql_profiler_units ( runid, unit_number, unit_type, unit_owner, unit_name) + values(a_run_id, c_unit_id, 'PACKAGE BODY', 'UT3', 'DUMMY_COVERAGE'); + + insert into ut3.plsql_profiler_data ( runid, unit_number, line#, total_occur, total_time) + select a_run_id, c_unit_id, 4, 1, 1 from dual union all + select a_run_id, c_unit_id, 5, 0, 0 from dual union all + select a_run_id, c_unit_id, 7, 1, 1 from dual; + end; + + procedure cleanup_dummy_coverage(a_run_id in integer) is + pragma autonomous_transaction; + begin + delete from ut3.plsql_profiler_data where runid = a_run_id; + delete from ut3.plsql_profiler_units where runid = a_run_id; + delete from ut3.plsql_profiler_runs where runid = a_run_id; + commit; + end; + + procedure create_dummy_coverage_package is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package UT3.DUMMY_COVERAGE is + procedure do_stuff; + + procedure grant_myself; + end;]'; + execute immediate q'[create or replace package body UT3.DUMMY_COVERAGE is + procedure do_stuff is + begin + if 1 = 2 then + dbms_output.put_line('should not get here'); + else + dbms_output.put_line('should get here'); + end if; + end; + + procedure grant_myself is + begin + execute immediate 'grant debug,execute on UT3.DUMMY_COVERAGE to ut3$user#'; + end; + end;]'; + + end; + + procedure create_dummy_coverage_test is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package UT3.TEST_DUMMY_COVERAGE is + --%suite(dummy coverage test) + --%suitepath(coverage_testing) + + --%test + procedure test_do_stuff; + + procedure grant_myself; + end;]'; + execute immediate q'[create or replace package body UT3.TEST_DUMMY_COVERAGE is + procedure test_do_stuff is + begin + dummy_coverage.do_stuff; + end; + + procedure grant_myself is + begin + execute immediate 'grant debug,execute on UT3.TEST_DUMMY_COVERAGE to ut3$user#'; + end; + end;]'; + + end; + + procedure grant_exec_on_cov is + pragma autonomous_transaction; + begin + execute immediate 'begin UT3.DUMMY_COVERAGE.grant_myself(); end;'; + execute immediate 'begin UT3.TEST_DUMMY_COVERAGE.grant_myself(); end;'; + end; + + procedure drop_dummy_coverage_pkg is + pragma autonomous_transaction; + begin + begin execute immediate q'[drop package ut3.test_dummy_coverage]'; exception when others then null; end; + begin execute immediate q'[drop package ut3.dummy_coverage]'; exception when others then null; end; + end; + + + --12.2 Setup + procedure create_dummy_12_2_cov_pck is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package UT3.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG is + procedure do_stuff(i_input in number); + + procedure grant_myself; + end;]'; + execute immediate q'[create or replace package body UT3.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG is + procedure do_stuff(i_input in number) is + begin + if i_input = 2 then + dbms_output.put_line('should not get here'); + else + dbms_output.put_line('should get here'); + end if; + end; + + procedure grant_myself is + begin + execute immediate 'grant debug,execute on UT3.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG to ut3$user#'; + end; + + end;]'; + end; + + procedure create_dummy_12_2_cov_test is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package UT3.TEST_BLOCK_DUMMY_COVERAGE is + --%suite(dummy coverage test) + --%suitepath(coverage_testing) + + --%test + procedure test_do_stuff; + + procedure grant_myself; + + end;]'; + execute immediate q'[create or replace package body UT3.TEST_BLOCK_DUMMY_COVERAGE is + procedure test_do_stuff is + begin + dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long.do_stuff(1); + ut.expect(1).to_equal(1); + end; + + procedure grant_myself is + begin + execute immediate 'grant debug,execute on UT3.TEST_BLOCK_DUMMY_COVERAGE to ut3$user#'; + end; + end;]'; + end; + + procedure mock_block_coverage_data(a_run_id integer,a_user in varchar2) is + c_unit_id constant integer := 1; + begin + insert into dbmspcc_runs ( run_id, run_owner, run_timestamp, run_comment) + values(a_run_id, a_user, sysdate, 'unit testing utPLSQL'); + + insert into dbmspcc_units ( run_id, object_id, type, owner, name,last_ddl_time) + values(a_run_id, c_unit_id, 'PACKAGE BODY', 'UT3', 'DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG',sysdate); + + insert into dbmspcc_blocks ( run_id, object_id, line,block,col,covered,not_feasible) + select a_run_id, c_unit_id,4,1,1,1,0 from dual union all + select a_run_id, c_unit_id,4,2,2,0,0 from dual union all + select a_run_id, c_unit_id,5,3,0,1,0 from dual union all + select a_run_id, c_unit_id,7,4,1,1,0 from dual; + end; + + procedure mock_profiler_coverage_data(a_run_id integer,a_user in varchar2) is + c_unit_id constant integer := 1; + begin + insert into ut3.plsql_profiler_runs ( runid, run_owner, run_date, run_comment) + values(a_run_id, a_user, sysdate, 'unit testing utPLSQL'); + + insert into ut3.plsql_profiler_units ( runid, unit_number, unit_type, unit_owner, unit_name) + values(a_run_id, c_unit_id, 'PACKAGE BODY', 'UT3', 'DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG'); + + insert into ut3.plsql_profiler_data ( runid, unit_number, line#, total_occur, total_time) + select a_run_id, c_unit_id, 4, 1, 1 from dual union all + select a_run_id, c_unit_id, 5, 0, 0 from dual union all + select a_run_id, c_unit_id, 6, 1, 0 from dual union all + select a_run_id, c_unit_id, 7, 1, 1 from dual; + end; + + procedure cleanup_dummy_coverage(a_block_id in integer, a_prof_id in integer) is + pragma autonomous_transaction; + begin + begin execute immediate q'[drop package ut3.test_block_dummy_coverage]'; exception when others then null; end; + begin execute immediate q'[drop package ut3.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long]'; exception when others then null; end; + delete from dbmspcc_blocks where run_id = a_block_id; + delete from dbmspcc_units where run_id = a_block_id; + delete from dbmspcc_runs where run_id = a_block_id; + cleanup_dummy_coverage(a_prof_id); + commit; + end; + + procedure grant_exec_on_12_2_cov is + pragma autonomous_transaction; + begin + execute immediate 'begin UT3.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG.grant_myself(); end;'; + execute immediate 'begin UT3.TEST_BLOCK_DUMMY_COVERAGE.grant_myself(); end;'; + end; +end; +/ diff --git a/test/ut3_tester_helper/coverage_helper.pks b/test/ut3_tester_helper/coverage_helper.pks new file mode 100644 index 000000000..427a965c0 --- /dev/null +++ b/test/ut3_tester_helper/coverage_helper.pks @@ -0,0 +1,27 @@ +create or replace package coverage_helper is + + g_run_id integer; + + type prof_runs_tab is table of ut3.plsql_profiler_runs%rowtype; + + function get_mock_run_id return integer; + function get_mock_block_run_id return integer; + procedure cleanup_dummy_coverage(a_run_id in integer); + procedure mock_coverage_data(a_run_id integer,a_user in varchar2); + + --Profiler coveage + procedure create_dummy_coverage_package; + procedure create_dummy_coverage_test; + procedure grant_exec_on_cov; + procedure mock_profiler_coverage_data(a_run_id integer,a_user in varchar2); + procedure drop_dummy_coverage_pkg; + + --Block coverage + procedure create_dummy_12_2_cov_pck; + procedure create_dummy_12_2_cov_test; + procedure mock_block_coverage_data(a_run_id integer,a_user in varchar2); + procedure cleanup_dummy_coverage(a_block_id in integer, a_prof_id in integer); + procedure grant_exec_on_12_2_cov; + +end; +/ diff --git a/test/ut3_tester_helper/main_helper.pkb b/test/ut3_tester_helper/main_helper.pkb index d9ffc06bd..ffccc3185 100644 --- a/test/ut3_tester_helper/main_helper.pkb +++ b/test/ut3_tester_helper/main_helper.pkb @@ -134,5 +134,25 @@ create or replace package body main_helper is where srj.job_name = a_job_name; end; + procedure append_to_list(a_list in out nocopy ut3.ut_varchar2_list, a_item varchar2) is + begin + ut3.ut_utils.append_to_list(a_list,a_item); + end; + + procedure append_to_list(a_list in out nocopy ut3.ut_varchar2_rows, a_item varchar2) is + begin + ut3.ut_utils.append_to_list(a_list,a_item); + end; + + procedure append_to_list(a_list in out nocopy ut3.ut_varchar2_rows, a_item clob) is + begin + ut3.ut_utils.append_to_list(a_list,a_item); + end; + + procedure append_to_list(a_list in out nocopy ut3.ut_varchar2_rows, a_items ut3.ut_varchar2_rows) is + begin + ut3.ut_utils.append_to_list(a_list,a_items); + end; + end; / diff --git a/test/ut3_tester_helper/main_helper.pks b/test/ut3_tester_helper/main_helper.pks index 296670707..7d349151c 100644 --- a/test/ut3_tester_helper/main_helper.pks +++ b/test/ut3_tester_helper/main_helper.pks @@ -36,6 +36,14 @@ create or replace package main_helper is procedure parse_dummy_test_as_ut3$user#; function get_job_count(a_job_name varchar2) return number; - + + procedure append_to_list(a_list in out nocopy ut3.ut_varchar2_list, a_item varchar2); + + procedure append_to_list(a_list in out nocopy ut3.ut_varchar2_rows, a_item varchar2); + + procedure append_to_list(a_list in out nocopy ut3.ut_varchar2_rows, a_item clob); + + procedure append_to_list(a_list in out nocopy ut3.ut_varchar2_rows, a_items ut3.ut_varchar2_rows); + end; / diff --git a/test/ut3_tester_helper/run_helper.pkb b/test/ut3_tester_helper/run_helper.pkb index bfc0e1c47..0fad905fd 100644 --- a/test/ut3_tester_helper/run_helper.pkb +++ b/test/ut3_tester_helper/run_helper.pkb @@ -522,6 +522,6 @@ create or replace package body run_helper is begin delete from ut3.ut_output_buffer_tmp; end; - + end; / diff --git a/test/ut3_tester_helper/run_helper.pks b/test/ut3_tester_helper/run_helper.pks index 03d55ec29..7d285d7af 100644 --- a/test/ut3_tester_helper/run_helper.pks +++ b/test/ut3_tester_helper/run_helper.pks @@ -1,6 +1,9 @@ create or replace package run_helper is + g_run_id integer; + type t_out_buff_tab is table of ut3.ut_output_buffer_tmp%rowtype; + type prof_runs_tab is table of ut3.plsql_profiler_runs%rowtype; procedure setup_cache_objects; procedure setup_cache; @@ -49,6 +52,6 @@ create or replace package run_helper is function ut_output_buffer_tmp return t_out_buff_tab pipelined; procedure delete_buffer; - + end; / diff --git a/test/ut3_tester_helper/test_event_list.tps b/test/ut3_tester_helper/test_event_list.tps new file mode 100644 index 000000000..8abf71b13 --- /dev/null +++ b/test/ut3_tester_helper/test_event_list.tps @@ -0,0 +1,2 @@ +create or replace type test_event_list as table of test_event_object; +/ diff --git a/test/ut3_tester_helper/test_event_object.tps b/test/ut3_tester_helper/test_event_object.tps new file mode 100644 index 000000000..da458d2c2 --- /dev/null +++ b/test/ut3_tester_helper/test_event_object.tps @@ -0,0 +1,15 @@ +declare + l_exists integer; +begin + select count(1) into l_exists from user_types where type_name = 'TEST_EVENT_OBJECT'; + if l_exists > 0 then + execute immediate 'drop type test_event_object force'; + end if; +end; +/ + +create or replace type test_event_object as object ( + event_type varchar2(1000), + event_doc xmltype +) +/ \ No newline at end of file diff --git a/test/ut3_user/reporters/test_coverage.pkb b/test/ut3_user/reporters/test_coverage.pkb new file mode 100644 index 000000000..c3617bc55 --- /dev/null +++ b/test/ut3_user/reporters/test_coverage.pkb @@ -0,0 +1,51 @@ +create or replace package body test_coverage is + + function get_mock_run_id return integer is + v_result integer; + begin + return ut3_tester_helper.coverage_helper.get_mock_run_id(); + end; + + procedure create_dummy_coverage_package is + begin + ut3_tester_helper.coverage_helper.create_dummy_coverage_package(); + end; + + procedure create_dummy_coverage_test is + begin + ut3_tester_helper.coverage_helper.create_dummy_coverage_test(); + end; + + procedure mock_coverage_data(a_run_id integer) is + begin + ut3_tester_helper.coverage_helper.mock_coverage_data(a_run_id,user); + end; + + procedure create_dummy_coverage_pkg is + begin + create_dummy_coverage_package(); + create_dummy_coverage_test(); + ut3_tester_helper.coverage_helper.grant_exec_on_cov(); + end; + + procedure setup_dummy_coverage is + pragma autonomous_transaction; + begin + g_run_id := get_mock_run_id(); + ut3.ut_coverage.mock_coverage_id(g_run_id, ut3.ut_coverage.gc_proftab_coverage); + mock_coverage_data(g_run_id); + commit; + end; + + procedure drop_dummy_coverage_pkg is + begin + ut3_tester_helper.coverage_helper.drop_dummy_coverage_pkg(); + end; + + procedure cleanup_dummy_coverage is + begin + ut3_tester_helper.coverage_helper.cleanup_dummy_coverage(g_run_id); + end; + +end; +/ diff --git a/test/ut3_user/reporters/test_coverage.pks b/test/ut3_user/reporters/test_coverage.pks new file mode 100644 index 000000000..d56597d11 --- /dev/null +++ b/test/ut3_user/reporters/test_coverage.pks @@ -0,0 +1,20 @@ +create or replace package test_coverage is + + --%suite + --%suitepath(utplsql.test_user.reporters) + + g_run_id integer; + + --%beforeall + procedure create_dummy_coverage_pkg; + --%beforeall + procedure setup_dummy_coverage; + + + --%afterall + procedure drop_dummy_coverage_pkg; + --%afterall + procedure cleanup_dummy_coverage; + +end; +/ diff --git a/test/ut3_user/reporters/test_debug_reporter.pkb b/test/ut3_user/reporters/test_debug_reporter.pkb new file mode 100644 index 000000000..f108ec577 --- /dev/null +++ b/test/ut3_user/reporters/test_debug_reporter.pkb @@ -0,0 +1,45 @@ +create or replace package body test_debug_reporter as + + g_actual clob; + + procedure run_reporter is + l_results ut3.ut_varchar2_list; + begin + select * + bulk collect into l_results + from table( + ut3.ut.run( + 'test_reporters', + ut3.ut_debug_reporter() + ) + ); + g_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + end; + + procedure includes_event_info is + l_expected varchar2(32767); + begin + l_expected := '\s+' || + '(\s+' || + '[0-9\-]+T[0-9:\.]+<\/TIMESTAMP>\s+' || + '[0-9 \+:\.]+<\/TIME_FROM_START>\s+' || + '[0-9 \+:\.]+<\/TIME_FROM_PREVIOUS>\s+' || + '\w+<\/EVENT_NAME>\s+' || + '(\s|\S)+?<\/CALL_STACK>(\s|\S)+?' || + '<\/DEBUG>\s+)+' || + '<\/DEBUG_LOG>'; + ut.expect( g_actual ).to_match( l_expected, 'm' ); + end; + + procedure includes_run_info is + l_expected varchar2(32767); + begin + l_expected := '(\s|\S)+?(\s|\S)+?<\/UT_RUN_INFO>\s+<\/DEBUG>'; + ut.expect( g_actual ).to_match( l_expected, 'm' ); + end; + + +end; +/ + + diff --git a/test/ut3_user/reporters/test_debug_reporter.pks b/test/ut3_user/reporters/test_debug_reporter.pks new file mode 100644 index 000000000..4d7f7962f --- /dev/null +++ b/test/ut3_user/reporters/test_debug_reporter.pks @@ -0,0 +1,16 @@ +create or replace package test_debug_reporter as + + --%suite(ut_debug_reporter) + --%suitepath(utplsql.test_user.reporters) + + --%beforeall + procedure run_reporter; + + --%test(Includes event info for every event) + procedure includes_event_info; + + --%test(Includes run info) + procedure includes_run_info; + +end; +/ diff --git a/test/ut3_user/reporters/test_documentation_reporter.pkb b/test/ut3_user/reporters/test_documentation_reporter.pkb new file mode 100644 index 000000000..394594fa4 --- /dev/null +++ b/test/ut3_user/reporters/test_documentation_reporter.pkb @@ -0,0 +1 @@ +create or replace package body test_documentation_reporter as procedure report_produces_expected_out is l_results ut3.ut_varchar2_list; l_actual clob; l_expected varchar2(32767):=q'[%org utplsql tests helpers A suite for testing different outcomes from reporters A description of some context passing_test [% sec] a test with failing assertion [% sec] (FAILED - 1) a test raising unhandled exception [% sec] (FAILED - 2) a disabled test [0 sec] (DISABLED) % Failures: % 1) failing_test "Fails as values are different" Actual: 'number [1] ' (varchar2) was expected to equal: 'number [2] ' (varchar2)% at "UT3$USER#.TEST_REPORTERS%", line 36 ut3.ut.expect('number [1] ','Fails as values are different').to_equal('number [2] '); % % 2) erroring_test ORA-06502: PL/SQL: numeric or value error: character to number conversion error ORA-06512: at "UT3$USER#.TEST_REPORTERS", line 44% ORA-06512: at line 6 Finished in % seconds 4 tests, 1 failed, 1 errored, 1 disabled, 0 warning(s)%]'; begin select * bulk collect into l_results from table( ut3.ut.run( 'test_reporters', ut3.ut_documentation_reporter() ) ); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); ut.expect(l_actual).to_be_like(l_expected); end; procedure check_encoding_included is begin reporters.check_xml_encoding_included(ut3.ut_sonar_test_reporter(), 'UTF-8'); end; end; / \ No newline at end of file diff --git a/test/ut3_user/reporters/test_documentation_reporter.pks b/test/ut3_user/reporters/test_documentation_reporter.pks new file mode 100644 index 000000000..ec6894c61 --- /dev/null +++ b/test/ut3_user/reporters/test_documentation_reporter.pks @@ -0,0 +1,10 @@ +create or replace package test_documentation_reporter as + + --%suite(ut_documentation_reporter) + --%suitepath(utplsql.test_user.reporters) + + --%test(Report produces expected output) + procedure report_produces_expected_out; + +end; +/ diff --git a/test/ut3_user/reporters/test_extended_coverage.pkb b/test/ut3_user/reporters/test_extended_coverage.pkb new file mode 100644 index 000000000..bb8bd27a6 --- /dev/null +++ b/test/ut3_user/reporters/test_extended_coverage.pkb @@ -0,0 +1,106 @@ +create or replace package body test_extended_coverage is + + g_run_id ut3.ut_coverage.tt_coverage_id_arr; + + function get_mock_block_run_id return integer is + begin + return ut3_tester_helper.coverage_helper.get_mock_block_run_id(); + end; + + function get_mock_proftab_run_id return integer is + begin + return ut3_tester_helper.coverage_helper.get_mock_run_id(); + end; + + procedure setup_dummy_coverage is + pragma autonomous_transaction; + begin + ut3_tester_helper.coverage_helper.create_dummy_12_2_cov_pck(); + ut3_tester_helper.coverage_helper.create_dummy_12_2_cov_test(); + ut3_tester_helper.coverage_helper.grant_exec_on_12_2_cov(); + g_run_id(ut3.ut_coverage.gc_block_coverage) := get_mock_block_run_id(); + g_run_id(ut3.ut_coverage.gc_proftab_coverage) := get_mock_proftab_run_id(); + ut3.ut_coverage.mock_coverage_id(g_run_id); + ut3_tester_helper.coverage_helper.mock_block_coverage_data(g_run_id(ut3.ut_coverage.gc_block_coverage),user); + ut3_tester_helper.coverage_helper.mock_profiler_coverage_data(g_run_id(ut3.ut_coverage.gc_proftab_coverage),user); + commit; + end; + + procedure cleanup_dummy_coverage is + begin + ut3_tester_helper.coverage_helper.cleanup_dummy_coverage(g_run_id(ut3.ut_coverage.gc_block_coverage) + ,g_run_id(ut3.ut_coverage.gc_proftab_coverage)); + end; + + procedure coverage_for_object is + l_expected clob; + l_actual clob; + l_results ut3.ut_varchar2_list; + begin + --Arrange + l_expected := '%%%'; + --Act + select * + bulk collect into l_results + from table( + ut3.ut.run( + a_path => 'ut3.test_block_dummy_coverage', + a_reporter=> ut3.ut_coverage_sonar_reporter( ), + a_include_objects => ut3.ut_varchar2_list( 'ut3.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long' ) + ) + ); + --Assert + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + ut.expect(l_actual).to_be_like(l_expected); + end; + + procedure coverage_for_schema is + l_expected clob; + l_actual clob; + l_results ut3.ut_varchar2_list; + begin + --Arrange + l_expected := '%%%'; + --Act + select * + bulk collect into l_results + from table( + ut3.ut.run( + a_path => 'ut3.test_block_dummy_coverage', + a_reporter=> ut3.ut_coverage_sonar_reporter( ), + a_coverage_schemes => ut3.ut_varchar2_list( 'ut3' ) + ) + ); + --Assert + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + ut.expect(l_actual).to_be_like(l_expected); + ut.expect(l_actual).to_be_like('%%%'); + end; + + procedure coverage_for_file is + l_expected clob; + l_actual clob; + l_results ut3.ut_varchar2_list; + l_file_path varchar2(250); + begin + --Arrange + l_file_path := lower('test/ut3.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long.pkb'); + l_expected := '%%%'; + --Act + select * + bulk collect into l_results + from table( + ut3.ut.run( + a_path => 'ut3.test_block_dummy_coverage', + a_reporter=> ut3.ut_coverage_sonar_reporter( ), + a_source_files => ut3.ut_varchar2_list( l_file_path ), + a_test_files => ut3.ut_varchar2_list( ) + ) + ); + --Assert + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + ut.expect(l_actual).to_be_like(l_expected); + end; + +end; +/ diff --git a/test/ut3_user/reporters/test_extended_coverage.pks b/test/ut3_user/reporters/test_extended_coverage.pks new file mode 100644 index 000000000..fe4a2ecc5 --- /dev/null +++ b/test/ut3_user/reporters/test_extended_coverage.pks @@ -0,0 +1,22 @@ +create or replace package test_extended_coverage is + + --%suite + --%suitepath(utplsql.test_user.reporters.test_coverage) + + --%beforeall + procedure setup_dummy_coverage; + + --%afterall + procedure cleanup_dummy_coverage; + + --%test(Coverage is gathered for specified object - extended coverage type) + procedure coverage_for_object; + + --%test(Coverage is gathered for specified schema - extended coverage type) + procedure coverage_for_schema; + + --%test(Coverage is gathered for specified file - extended coverage type) + procedure coverage_for_file; + +end; +/ diff --git a/test/ut3_user/reporters/test_realtime_reporter.pkb b/test/ut3_user/reporters/test_realtime_reporter.pkb new file mode 100644 index 000000000..6850ed687 --- /dev/null +++ b/test/ut3_user/reporters/test_realtime_reporter.pkb @@ -0,0 +1,401 @@ +create or replace package body test_realtime_reporter as + + g_events ut3_tester_helper.test_event_list := ut3_tester_helper.test_event_list(); + + procedure create_test_suites_and_run is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package check_realtime_reporting1 is + --%suite(suite ) + --%suitepath(realtime_reporting) + + --%context(test context) + + --%test(test 1 - OK) + procedure test_1_ok; + + --%test(test 2 - NOK) + procedure test_2_nok; + + --%endcontext + end;]'; + execute immediate q'[create or replace package body check_realtime_reporting1 is + procedure test_1_ok is + begin + ut3.ut.expect(1).to_equal(1); + end; + + procedure test_2_nok is + begin + ut3.ut.expect(1).to_equal(2); + end; + end;]'; + + execute immediate q'[create or replace package check_realtime_reporting2 is + --%suite + --%suitepath(realtime_reporting) + + --%test + procedure test_3_ok; + + --%test + procedure test_4_nok; + + --%test + --%disabled + procedure test_5; + end;]'; + execute immediate q'[create or replace package body check_realtime_reporting2 is + procedure test_3_ok is + begin + ut3.ut.expect(2).to_equal(2); + end; + + procedure test_4_nok is + begin + ut3.ut.expect(2).to_equal(3); + ut3.ut.expect(2).to_equal(4); + end; + + procedure test_5 is + begin + null; + end; + end;]'; + + execute immediate q'[create or replace package check_realtime_reporting3 is + --%suite + --%suitepath(realtime_reporting) + + --%test + procedure test_6_with_runtime_error; + + --%test + procedure test_7_with_serveroutput; + + --%afterall + procedure print_and_raise; + end;]'; + execute immediate q'[create or replace package body check_realtime_reporting3 is + procedure test_6_with_runtime_error is + l_actual integer; + begin + execute immediate 'select 6 from non_existing_table' into l_actual; + ut3.ut.expect(6).to_equal(l_actual); + end; + + procedure test_7_with_serveroutput is + begin + dbms_output.put_line('before test 7'); + ut3.ut.expect(7).to_equal(7); + dbms_output.put_line('after test 7'); + end; + + procedure print_and_raise is + begin + dbms_output.put_line('Now, a no_data_found exception is raised'); + dbms_output.put_line('dbms_output and error stack is reported for this suite.'); + dbms_output.put_line('A runtime error in afterall is counted as a warning.'); + raise no_data_found; + end; + end;]'; + + <> + declare + l_reporter ut3.ut_realtime_reporter := ut3.ut_realtime_reporter(); + begin + -- produce + ut3.ut_runner.run( + a_paths => ut3.ut_varchar2_list(':realtime_reporting'), + a_reporters => ut3.ut_reporters(l_reporter) + ); + -- consume + select ut3_tester_helper.test_event_object(item_type, xmltype(text)) + bulk collect into g_events + from table(ut3.ut_output_table_buffer(l_reporter.output_buffer.output_id).get_lines()) + where trim(text) is not null and item_type is not null; + end run_report_and_cache_result; + end create_test_suites_and_run; + + procedure xml_report_structure is + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + open l_actual for + select t.event_doc.extract('/event/@type').getstringval() as event_type, + t.event_doc.extract('/event/suite/@id|/event/test/@id').getstringval() as item_id + from table(g_events) t; + open l_expected for + select 'pre-run' as event_type, null as item_id from dual union all + select 'pre-suite' as event_type, 'realtime_reporting' as item_id from dual union all + select 'pre-suite' as event_type, 'realtime_reporting.check_realtime_reporting3' as item_id from dual union all + select 'pre-test' as event_type, 'realtime_reporting.check_realtime_reporting3.test_6_with_runtime_error' as item_id from dual union all + select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting3.test_6_with_runtime_error' as item_id from dual union all + select 'pre-test' as event_type, 'realtime_reporting.check_realtime_reporting3.test_7_with_serveroutput' as item_id from dual union all + select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting3.test_7_with_serveroutput' as item_id from dual union all + select 'post-suite' as event_type, 'realtime_reporting.check_realtime_reporting3' as item_id from dual union all + select 'pre-suite' as event_type, 'realtime_reporting.check_realtime_reporting2' as item_id from dual union all + select 'pre-test' as event_type, 'realtime_reporting.check_realtime_reporting2.test_3_ok' as item_id from dual union all + select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting2.test_3_ok' as item_id from dual union all + select 'pre-test' as event_type, 'realtime_reporting.check_realtime_reporting2.test_4_nok' as item_id from dual union all + select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting2.test_4_nok' as item_id from dual union all + select 'pre-test' as event_type, 'realtime_reporting.check_realtime_reporting2.test_5' as item_id from dual union all + select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting2.test_5' as item_id from dual union all + select 'post-suite' as event_type, 'realtime_reporting.check_realtime_reporting2' as item_id from dual union all + select 'pre-suite' as event_type, 'realtime_reporting.check_realtime_reporting1' as item_id from dual union all + select 'pre-suite' as event_type, 'realtime_reporting.check_realtime_reporting1.test context' as item_id from dual union all + select 'pre-test' as event_type, 'realtime_reporting.check_realtime_reporting1.test context.test_1_ok' as item_id from dual union all + select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting1.test context.test_1_ok' as item_id from dual union all + select 'pre-test' as event_type, 'realtime_reporting.check_realtime_reporting1.test context.test_2_nok' as item_id from dual union all + select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting1.test context.test_2_nok' as item_id from dual union all + select 'post-suite' as event_type, 'realtime_reporting.check_realtime_reporting1.test context' as item_id from dual union all + select 'post-suite' as event_type, 'realtime_reporting.check_realtime_reporting1' as item_id from dual union all + select 'post-suite' as event_type, 'realtime_reporting' as item_id from dual union all + select 'post-run' as event_type, null as item_id from dual; + ut.expect(l_actual).to_equal(l_expected); + end xml_report_structure; + + procedure pre_run_composite_nodes is + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + open l_actual for + select x.node_path + from table(g_events) t, + xmltable( + q'[ + for $i in //(event|items|suite|test) + return {$i/string-join(ancestor-or-self::*/name(.), '/')} + ]' + passing t.event_doc + columns node_path varchar2(128) path '.' + ) x + where event_type = 'pre-run'; + open l_expected for + select 'event' as node_path from dual union all + select 'event/items' as node_path from dual union all + select 'event/items/suite' as node_path from dual union all + select 'event/items/suite/items' as node_path from dual union all + select 'event/items/suite/items/suite' as node_path from dual union all + select 'event/items/suite/items/suite/items' as node_path from dual union all + select 'event/items/suite/items/suite/items/test' as node_path from dual union all + select 'event/items/suite/items/suite/items/test' as node_path from dual union all + select 'event/items/suite/items/suite' as node_path from dual union all + select 'event/items/suite/items/suite/items' as node_path from dual union all + select 'event/items/suite/items/suite/items/test' as node_path from dual union all + select 'event/items/suite/items/suite/items/test' as node_path from dual union all + select 'event/items/suite/items/suite/items/test' as node_path from dual union all + select 'event/items/suite/items/suite' as node_path from dual union all + select 'event/items/suite/items/suite/items' as node_path from dual union all + select 'event/items/suite/items/suite/items/suite' as node_path from dual union all + select 'event/items/suite/items/suite/items/suite/items' as node_path from dual union all + select 'event/items/suite/items/suite/items/suite/items/test' as node_path from dual union all + select 'event/items/suite/items/suite/items/suite/items/test' as node_path from dual; + ut.expect(l_actual).to_equal(l_expected); + end pre_run_composite_nodes; + + procedure total_number_of_tests is + l_actual integer; + l_expected integer := 7; + begin + select t.event_doc.extract('/event/totalNumberOfTests/text()').getnumberval() + into l_actual + from table(g_events) t + where t.event_type = 'pre-run'; + ut.expect(l_actual).to_equal(l_expected); + end total_number_of_tests; + + procedure execution_time_of_run is + l_actual number; + begin + select t.event_doc.extract('/event/run/executionTime/text()').getnumberval() + into l_actual + from table(g_events) t + where t.event_type = 'post-run'; + ut.expect(l_actual).to_be_not_null; + end execution_time_of_run; + + procedure escaped_characters is + l_actual varchar2(32767); + l_expected varchar2(20) := 'suite <A>'; + begin + select t.event_doc.extract( + '//suite[@id="realtime_reporting.check_realtime_reporting1"]/description/text()' + ).getstringval() + into l_actual + from table(g_events) t + where t.event_type = 'pre-run'; + ut.expect(l_actual).to_equal(l_expected); + end escaped_characters; + + procedure pre_test_nodes is + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + open l_actual for + select t.event_doc.extract('//test/testNumber/text()') + .getnumberval() as test_number, + t.event_doc.extract('//test/totalNumberOfTests/text()') + .getnumberval() as total_number_of_tests + from table(g_events) t + where t.event_type = 'pre-test' + and t.event_doc.extract('//test/@id').getstringval() is not null; + open l_expected for + select level as test_number, + 7 as total_number_of_tests + from dual + connect by level <= 7; + ut.expect(l_actual).to_equal(l_expected).unordered; + end pre_test_nodes; + + procedure post_test_nodes is + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + open l_actual for + select t.event_doc.extract('//test/testNumber/text()') + .getnumberval() as test_number, + t.event_doc.extract('//test/totalNumberOfTests/text()') + .getnumberval() as total_number_of_tests + from table(g_events) t + where t.event_type = 'post-test' + and t.event_doc.extract('//test/@id').getstringval() is not null + and t.event_doc.extract('//test/startTime/text()').getstringval() is not null + and t.event_doc.extract('//test/endTime/text()').getstringval() is not null + and t.event_doc.extract('//test/executionTime/text()').getnumberval() is not null + and t.event_doc.extract('//test/counter/disabled/text()').getnumberval() is not null + and t.event_doc.extract('//test/counter/success/text()').getnumberval() is not null + and t.event_doc.extract('//test/counter/failure/text()').getnumberval() is not null + and t.event_doc.extract('//test/counter/error/text()').getnumberval() is not null + and t.event_doc.extract('//test/counter/warning/text()').getnumberval() is not null; + open l_expected for + select level as test_number, + 7 as total_number_of_tests + from dual + connect by level <= 7; + ut.expect(l_actual).to_equal(l_expected).unordered; + end post_test_nodes; + + procedure single_failed_message is + l_actual varchar2(32767); + l_expected varchar2(80) := ''; + begin + select t.event_doc.extract( + '/event/test/failedExpectations/expectation[1]/message/text()' + ).getstringval() + into l_actual + from table(g_events) t + where t.event_doc.extract('/event[@type="post-test"]/test/@id').getstringval() + = 'realtime_reporting.check_realtime_reporting1.test context.test_2_nok'; + ut.expect(l_actual).to_equal(l_expected); + end single_failed_message; + + procedure multiple_failed_messages is + l_actual integer; + l_expected integer := 2; + begin + select count(*) + into l_actual + from table(g_events) t, + xmltable( + '/event/test/failedExpectations/expectation' + passing t.event_doc + columns message clob path 'message', + caller clob path 'caller' + ) x + where t.event_doc.extract('/event[@type="post-test"]/test/@id').getstringval() + = 'realtime_reporting.check_realtime_reporting2.test_4_nok' + and x.message is not null + and x.caller is not null; + ut.expect(l_actual).to_equal(l_expected); + end multiple_failed_messages; + + procedure serveroutput_of_test is + l_actual clob; + l_expected_list ut3.ut_varchar2_list; + l_expected clob; + begin + select t.event_doc.extract('//event/test/serverOutput/text()').getstringval() + into l_actual + from table(g_events) t + where t.event_doc.extract('/event[@type="post-test"]/test/@id').getstringval() + = 'realtime_reporting.check_realtime_reporting3.test_7_with_serveroutput'; + ut3_tester_helper.main_helper.append_to_list(l_expected_list, ''); + l_expected := ut3_tester_helper.main_helper.table_to_clob(l_expected_list); + ut.expect(l_actual).to_equal(l_expected); + end serveroutput_of_test; + + procedure serveroutput_of_testsuite is + l_actual clob; + l_expected_list ut3.ut_varchar2_list; + l_expected clob; + begin + select t.event_doc.extract('//event/suite/serverOutput/text()').getstringval() + into l_actual + from table(g_events) t + where t.event_doc.extract('/event[@type="post-suite"]/suite/@id').getstringval() + = 'realtime_reporting.check_realtime_reporting3'; + ut3_tester_helper.main_helper.append_to_list(l_expected_list, ''); + l_expected := ut3_tester_helper.main_helper.table_to_clob(l_expected_list); + ut.expect(l_actual).to_equal(l_expected); + end serveroutput_of_testsuite; + + procedure error_stack_of_test is + l_actual clob; + l_expected_list ut3.ut_varchar2_list; + l_expected clob; + begin + select t.event_doc.extract('//event/test/errorStack/text()').getstringval() + into l_actual + from table(g_events) t + where t.event_doc.extract('/event[@type="post-test"]/test/@id').getstringval() + = 'realtime_reporting.check_realtime_reporting3.test_6_with_runtime_error'; + ut3_tester_helper.main_helper.append_to_list(l_expected_list, ''); + l_expected := ut3_tester_helper.main_helper.table_to_clob(l_expected_list); + ut.expect(l_actual).to_be_like(l_expected); + end error_stack_of_test; + + procedure error_stack_of_testsuite is + l_actual clob; + l_expected_list ut3.ut_varchar2_list; + l_expected clob; + begin + select t.event_doc.extract('//event/suite/errorStack/text()').getstringval() + into l_actual + from table(g_events) t + where t.event_doc.extract('/event[@type="post-suite"]/suite/@id').getstringval() + = 'realtime_reporting.check_realtime_reporting3'; + ut3_tester_helper.main_helper.append_to_list(l_expected_list, ''); + l_expected := ut3_tester_helper.main_helper.table_to_clob(l_expected_list); + ut.expect(l_actual).to_be_like(l_expected); + end error_stack_of_testsuite; + + procedure get_description is + l_reporter ut3.ut_realtime_reporter; + l_actual varchar2(4000); + l_expected varchar2(80) := '%SQL Developer%'; + begin + l_reporter := ut3.ut_realtime_reporter(); + l_actual := l_reporter.get_description(); + ut.expect(l_actual).to_be_like(l_expected); + end get_description; + + procedure remove_test_suites is + pragma autonomous_transaction; + begin + execute immediate 'drop package check_realtime_reporting1'; + execute immediate 'drop package check_realtime_reporting2'; + execute immediate 'drop package check_realtime_reporting3'; + end remove_test_suites; + +end test_realtime_reporter; +/ diff --git a/test/ut3_user/reporters/test_realtime_reporter.pks b/test/ut3_user/reporters/test_realtime_reporter.pks new file mode 100644 index 000000000..04cd288e1 --- /dev/null +++ b/test/ut3_user/reporters/test_realtime_reporter.pks @@ -0,0 +1,55 @@ +create or replace package test_realtime_reporter as + + --%suite(ut_realtime_reporter) + --%suitepath(utplsql.test_user.reporters) + + --%beforeall + procedure create_test_suites_and_run; + + --%test(Provide a report structure with pre-run information and event based messages per suite and per test) + procedure xml_report_structure; + + --%test(Provide the total number of tests as part of the pre-run information structure) + procedure total_number_of_tests; + + --%test(Provide composite structure for items, an item is either a suite or a test, suites may have nested items) + procedure pre_run_composite_nodes; + + --%test(Provide the execution time as part of the post-run information structure) + procedure execution_time_of_run; + + --%test(Escape special characters in data such as the test suite description) + procedure escaped_characters; + + --%test(Provide a node before starting a test with testNumber and totalNumberOfTests) + procedure pre_test_nodes; + + --%test(Provide a node after completion of a test with test results) + procedure post_test_nodes; + + --%test(Provide expectation message for a failed test) + procedure single_failed_message; + + --%test(Provide expectation messages for each failed assertion of a failed test) + procedure multiple_failed_messages; + + --%test(Provide dbms_output produced in a test) + procedure serveroutput_of_test; + + --%test(Provide dbms_output produced in a testsuite) + procedure serveroutput_of_testsuite; + + --%test(Provide the error stack of a test) + procedure error_stack_of_test; + + --%test(Provide the error stack of a testsuite) + procedure error_stack_of_testsuite; + + --%test(Provide a description of the reporter explaining the use for SQL Developer) + procedure get_description; + + --%afterall + procedure remove_test_suites; + +end test_realtime_reporter; +/ From e1119c659ca09440414d96ca935c4a2a5f96ca12 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 31 Mar 2019 17:34:50 +0100 Subject: [PATCH 0377/1096] Split output buffers into two. Now we have separate buffer for CLOB data and VARCHAR2 text data. --- .../output_buffers/ut_output_buffer_tmp.sql | 24 +- .../ut_output_clob_buffer_tmp.sql | 89 ++++++++ .../ut_output_clob_table_buffer.tpb | 214 ++++++++++++++++++ .../ut_output_clob_table_buffer.tps | 32 +++ .../output_buffers/ut_output_table_buffer.tpb | 76 ++++--- .../create_synonyms_and_grants_for_public.sql | 2 + source/create_user_grants.sql | 1 + source/create_user_synonyms.sql | 1 + source/install.sql | 3 + source/reporters/ut_debug_reporter.tpb | 2 +- source/reporters/ut_realtime_reporter.tpb | 2 +- source/uninstall_objects.sql | 6 + .../core/reporters/test_realtime_reporter.pkb | 2 +- test/core/test_output_buffer.pkb | 2 +- 14 files changed, 412 insertions(+), 44 deletions(-) create mode 100644 source/core/output_buffers/ut_output_clob_buffer_tmp.sql create mode 100644 source/core/output_buffers/ut_output_clob_table_buffer.tpb create mode 100644 source/core/output_buffers/ut_output_clob_table_buffer.tps diff --git a/source/core/output_buffers/ut_output_buffer_tmp.sql b/source/core/output_buffers/ut_output_buffer_tmp.sql index e452e769f..d596a4908 100644 --- a/source/core/output_buffers/ut_output_buffer_tmp.sql +++ b/source/core/output_buffers/ut_output_buffer_tmp.sql @@ -24,7 +24,7 @@ begin */ output_id raw(32) not null, message_id number(38,0) not null, - text clob, + text varchar2(4000), item_type varchar2(1000), is_finished number(1,0) default 0 not null, constraint ut_output_buffer_tmp_pk primary key(output_id, message_id), @@ -32,17 +32,19 @@ begin is_finished = 0 and (text is not null or item_type is not null ) or is_finished = 1 and text is null and item_type is null ), constraint ut_output_buffer_fk1 foreign key (output_id) references ut_output_buffer_info_tmp$(output_id) -) nologging initrans 100 +) organization index nologging initrans 100 + overflow nologging initrans 100 '; - begin - execute immediate - v_table_sql || 'lob(text) store as securefile ut_output_text(retention none enable storage in row)'; - exception - when e_non_assm then - execute immediate - v_table_sql || 'lob(text) store as basicfile ut_output_text(pctversion 0 enable storage in row)'; - - end; + execute immediate v_table_sql; +-- begin +-- execute immediate +-- v_table_sql || 'lob(text) store as securefile ut_output_text(retention none enable storage in row)'; +-- exception +-- when e_non_assm then +-- execute immediate +-- v_table_sql || 'lob(text) store as basicfile ut_output_text(pctversion 0 enable storage in row)'; +-- +-- end; end; / diff --git a/source/core/output_buffers/ut_output_clob_buffer_tmp.sql b/source/core/output_buffers/ut_output_clob_buffer_tmp.sql new file mode 100644 index 000000000..57be1c6f4 --- /dev/null +++ b/source/core/output_buffers/ut_output_clob_buffer_tmp.sql @@ -0,0 +1,89 @@ +declare + v_table_sql varchar2(32767); + e_non_assm exception; + pragma exception_init(e_non_assm, -43853); +begin + v_table_sql := 'create table ut_output_clob_buffer_tmp$( + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + /* + * This table is not a global temporary table as it needs to allow cross-session data exchange + * It is used however as a temporary table with multiple writers. + * This is why it has very high initrans and has nologging + */ + output_id raw(32) not null, + message_id number(38,0) not null, + text clob, + item_type varchar2(1000), + is_finished number(1,0) default 0 not null, + constraint ut_output_clob_buffer_tmp_pk primary key(output_id, message_id), + constraint ut_output_clob_buffer_tmp_ck check( + is_finished = 0 and (text is not null or item_type is not null ) + or is_finished = 1 and text is null and item_type is null ), + constraint ut_output_clob_buffer_tmp_fk1 foreign key (output_id) references ut_output_buffer_info_tmp$(output_id) +) nologging initrans 100 +'; + begin + execute immediate + v_table_sql || 'lob(text) store as securefile ut_output_text(retention none enable storage in row)'; + exception + when e_non_assm then + execute immediate + v_table_sql || 'lob(text) store as basicfile ut_output_text(pctversion 0 enable storage in row)'; + + end; +end; +/ + +-- This is needed to be EBR ready as editioning view can only be created by edition enabled user +declare + ex_nonedition_user exception; + ex_view_doesnt_exist exception; + pragma exception_init(ex_nonedition_user,-42314); + pragma exception_init(ex_view_doesnt_exist,-942); + v_view_source varchar2(32767); +begin + begin + execute immediate 'drop view ut_output_clob_buffer_tmp'; + exception + when ex_view_doesnt_exist then + null; + end; + v_view_source := ' ut_output_clob_buffer_tmp as +/* +utPLSQL - Version 3 +Copyright 2016 - 2018 utPLSQL Project +Licensed under the Apache License, Version 2.0 (the "License"): +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ +select output_id + ,message_id + ,text + ,item_type + ,is_finished + from ut_output_clob_buffer_tmp$'; + + execute immediate 'create or replace editioning view '||v_view_source; +exception + when ex_nonedition_user then + execute immediate 'create or replace view '||v_view_source; +end; +/ diff --git a/source/core/output_buffers/ut_output_clob_table_buffer.tpb b/source/core/output_buffers/ut_output_clob_table_buffer.tpb new file mode 100644 index 000000000..7b97c70ca --- /dev/null +++ b/source/core/output_buffers/ut_output_clob_table_buffer.tpb @@ -0,0 +1,214 @@ +create or replace type body ut_output_clob_table_buffer is + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + constructor function ut_output_clob_table_buffer(self in out nocopy ut_output_clob_table_buffer, a_output_id raw := null) return self as result is + begin + self.output_id := coalesce(a_output_id, sys_guid()); + self.start_date := sysdate; + self.last_message_id := 0; + self.init(); + self.cleanup_buffer(); + return; + end; + + overriding member procedure init(self in out nocopy ut_output_clob_table_buffer) is + pragma autonomous_transaction; + l_exists int; + begin + select count(*) into l_exists from ut_output_buffer_info_tmp where output_id = self.output_id; + if ( l_exists > 0 ) then + update ut_output_buffer_info_tmp set start_date = self.start_date where output_id = self.output_id; + else + insert into ut_output_buffer_info_tmp(output_id, start_date) values (self.output_id, self.start_date); + end if; + commit; + end; + + overriding member procedure close(self in out nocopy ut_output_clob_table_buffer) is + pragma autonomous_transaction; + begin + self.last_message_id := self.last_message_id + 1; + insert into ut_output_clob_buffer_tmp(output_id, message_id, is_finished) + values (self.output_id, self.last_message_id, 1); + commit; + end; + + overriding member procedure send_line(self in out nocopy ut_output_clob_table_buffer, a_text varchar2, a_item_type varchar2 := null) is + pragma autonomous_transaction; + begin + if a_text is not null or a_item_type is not null then + self.last_message_id := self.last_message_id + 1; + insert into ut_output_clob_buffer_tmp(output_id, message_id, text, item_type) + values (self.output_id, self.last_message_id, a_text, a_item_type); + end if; + commit; + end; + + overriding member procedure send_lines(self in out nocopy ut_output_clob_table_buffer, a_text_list ut_varchar2_rows, a_item_type varchar2 := null) is + pragma autonomous_transaction; + begin + insert into ut_output_clob_buffer_tmp(output_id, message_id, text, item_type) + select self.output_id, self.last_message_id + rownum, t.column_value, a_item_type + from table(a_text_list) t + where t.column_value is not null or a_item_type is not null; + self.last_message_id := self.last_message_id + a_text_list.count; + commit; + end; + + overriding member procedure send_clob(self in out nocopy ut_output_clob_table_buffer, a_text clob, a_item_type varchar2 := null) is + pragma autonomous_transaction; + begin + if a_text is not null and a_text != empty_clob() or a_item_type is not null then + self.last_message_id := self.last_message_id + 1; + insert into ut_output_clob_buffer_tmp(output_id, message_id, text, item_type) + values (self.output_id, self.last_message_id, a_text, a_item_type); + end if; + commit; + end; + + overriding member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined is + type t_rowid_tab is table of urowid; + l_message_rowids t_rowid_tab; + l_buffer_data ut_output_data_rows; + l_finished_flags ut_integer_list; + l_already_waited_for number(10,2) := 0; + l_finished boolean := false; + lc_init_wait_sec constant naturaln := coalesce(a_initial_timeout, 60 ); -- 1 minute + lc_max_wait_sec constant naturaln := coalesce(a_timeout_sec, 60 * 60 * 4); -- 4 hours + l_wait_for integer := lc_init_wait_sec; + lc_short_sleep_time constant number(1,1) := 0.1; --sleep for 100 ms between checks + lc_long_sleep_time constant number(1) := 1; --sleep for 1 s when waiting long + lc_long_wait_time constant number(1) := 1; --waiting more than 1 sec + l_sleep_time number(2,1) := lc_short_sleep_time; + lc_bulk_limit constant integer := 5000; + l_max_message_id integer := lc_bulk_limit; + + procedure remove_read_data(a_message_rowids t_rowid_tab) is + pragma autonomous_transaction; + begin + forall i in 1 .. a_message_rowids.count + delete from ut_output_clob_buffer_tmp a + where rowid = a_message_rowids(i); + commit; + end; + + procedure remove_buffer_info is + pragma autonomous_transaction; + begin + delete from ut_output_buffer_info_tmp a + where a.output_id = self.output_id; + commit; + end; + + begin + while not l_finished loop + with ordered_buffer as ( + select /*+ index(a) */ a.rowid, ut_output_data_row(a.text, a.item_type), is_finished + from ut_output_clob_buffer_tmp a + where a.output_id = self.output_id + and a.message_id <= l_max_message_id + order by a.message_id + ) + select b.* + bulk collect into l_message_rowids, l_buffer_data, l_finished_flags + from ordered_buffer b; + + --nothing fetched from output, wait and try again + if l_buffer_data.count = 0 then + $if dbms_db_version.version >= 18 $then + dbms_session.sleep(l_sleep_time); + $else + dbms_lock.sleep(l_sleep_time); + $end + l_already_waited_for := l_already_waited_for + l_sleep_time; + if l_already_waited_for > lc_long_wait_time then + l_sleep_time := lc_long_sleep_time; + end if; + else + --reset wait time + -- we wait lc_max_wait_sec for new message + l_wait_for := lc_max_wait_sec; + l_already_waited_for := 0; + l_sleep_time := lc_short_sleep_time; + for i in 1 .. l_buffer_data.count loop + if l_buffer_data(i).text is not null then + pipe row(l_buffer_data(i)); + elsif l_finished_flags(i) = 1 then + l_finished := true; + exit; + end if; + end loop; + remove_read_data(l_message_rowids); + l_max_message_id := l_max_message_id + lc_bulk_limit; + end if; + if l_finished or l_already_waited_for >= l_wait_for then + remove_buffer_info(); + if l_already_waited_for > 0 and l_already_waited_for >= l_wait_for then + raise_application_error( + ut_utils.gc_out_buffer_timeout, + 'Timeout occurred while waiting for output data. Waited for: '||l_already_waited_for||' seconds.' + ); + end if; + end if; + end loop; + return; + end; + + overriding member function get_lines_cursor(a_initial_timeout natural := null, a_timeout_sec natural := null) return sys_refcursor is + l_lines sys_refcursor; + begin + open l_lines for + select text, item_type + from table(self.get_lines(a_initial_timeout, a_timeout_sec)); + return l_lines; + end; + + overriding member procedure lines_to_dbms_output(self in ut_output_clob_table_buffer, a_initial_timeout natural := null, a_timeout_sec natural := null) is + l_data sys_refcursor; + l_clob clob; + l_item_type varchar2(32767); + l_lines ut_varchar2_list; + begin + l_data := self.get_lines_cursor(a_initial_timeout, a_timeout_sec); + loop + fetch l_data into l_clob, l_item_type; + exit when l_data%notfound; + l_lines := ut_utils.clob_to_table(l_clob); + for i in 1 .. l_lines.count loop + dbms_output.put_line(l_lines(i)); + end loop; + end loop; + close l_data; + end; + + member procedure cleanup_buffer(self in ut_output_clob_table_buffer, a_retention_time_sec natural := null) is + gc_buffer_retention_sec constant naturaln := coalesce(a_retention_time_sec, 60 * 60 * 24); -- 24 hours + l_retention_days number := gc_buffer_retention_sec / (60 * 60 * 24); + l_max_retention_date date := sysdate - l_retention_days; + pragma autonomous_transaction; + begin + delete from ut_output_clob_buffer_tmp t + where t.output_id + in (select i.output_id from ut_output_buffer_info_tmp i where i.start_date <= l_max_retention_date); + + delete from ut_output_buffer_info_tmp i where i.start_date <= l_max_retention_date; + commit; + end; + +end; +/ diff --git a/source/core/output_buffers/ut_output_clob_table_buffer.tps b/source/core/output_buffers/ut_output_clob_table_buffer.tps new file mode 100644 index 000000000..83e342106 --- /dev/null +++ b/source/core/output_buffers/ut_output_clob_table_buffer.tps @@ -0,0 +1,32 @@ +create or replace type ut_output_clob_table_buffer under ut_output_buffer_base ( + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + start_date date, + last_message_id number(38,0), + constructor function ut_output_clob_table_buffer(self in out nocopy ut_output_clob_table_buffer, a_output_id raw := null) return self as result, + overriding member procedure init(self in out nocopy ut_output_clob_table_buffer), + overriding member procedure send_line(self in out nocopy ut_output_clob_table_buffer, a_text varchar2, a_item_type varchar2 := null), + overriding member procedure send_lines(self in out nocopy ut_output_clob_table_buffer, a_text_list ut_varchar2_rows, a_item_type varchar2 := null), + overriding member procedure send_clob(self in out nocopy ut_output_clob_table_buffer, a_text clob, a_item_type varchar2 := null), + overriding member procedure close(self in out nocopy ut_output_clob_table_buffer), + overriding member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined, + overriding member function get_lines_cursor(a_initial_timeout natural := null, a_timeout_sec natural := null) return sys_refcursor, + overriding member procedure lines_to_dbms_output(self in ut_output_clob_table_buffer, a_initial_timeout natural := null, a_timeout_sec natural := null), + member procedure cleanup_buffer(self in ut_output_clob_table_buffer, a_retention_time_sec natural := null) +) not final +/ diff --git a/source/core/output_buffers/ut_output_table_buffer.tpb b/source/core/output_buffers/ut_output_table_buffer.tpb index 5a9bdcce7..2b29e8ee5 100644 --- a/source/core/output_buffers/ut_output_table_buffer.tpb +++ b/source/core/output_buffers/ut_output_table_buffer.tpb @@ -52,11 +52,20 @@ create or replace type body ut_output_table_buffer is pragma autonomous_transaction; begin if a_text is not null or a_item_type is not null then - self.last_message_id := self.last_message_id + 1; - insert into ut_output_buffer_tmp(output_id, message_id, text, item_type) - values (self.output_id, self.last_message_id, a_text, a_item_type); + if length(a_text) > ut_utils.gc_max_storage_varchar2_len then + self.send_lines( + ut_utils.convert_collection( + ut_utils.clob_to_table(a_text, ut_utils.gc_max_storage_varchar2_len) + ), + a_item_type + ); + else + self.last_message_id := self.last_message_id + 1; + insert into ut_output_buffer_tmp(output_id, message_id, text, item_type) + values (self.output_id, self.last_message_id, a_text, a_item_type); + end if; + commit; end if; - commit; end; overriding member procedure send_lines(self in out nocopy ut_output_table_buffer, a_text_list ut_varchar2_rows, a_item_type varchar2 := null) is @@ -74,17 +83,25 @@ create or replace type body ut_output_table_buffer is pragma autonomous_transaction; begin if a_text is not null and a_text != empty_clob() or a_item_type is not null then - self.last_message_id := self.last_message_id + 1; - insert into ut_output_buffer_tmp(output_id, message_id, text, item_type) - values (self.output_id, self.last_message_id, a_text, a_item_type); + if length(a_text) > ut_utils.gc_max_storage_varchar2_len then + self.send_lines( + ut_utils.convert_collection( + ut_utils.clob_to_table(a_text, ut_utils.gc_max_storage_varchar2_len) + ), + a_item_type + ); + else + self.last_message_id := self.last_message_id + 1; + insert into ut_output_buffer_tmp(output_id, message_id, text, item_type) + values (self.output_id, self.last_message_id, a_text, a_item_type); + end if; + commit; end if; - commit; end; overriding member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined is - type t_rowid_tab is table of urowid; - l_message_rowids t_rowid_tab; - l_buffer_data ut_output_data_rows; + l_buffer_data ut_varchar2_rows; + l_item_types ut_varchar2_rows; l_finished_flags ut_integer_list; l_already_waited_for number(10,2) := 0; l_finished boolean := false; @@ -98,13 +115,25 @@ create or replace type body ut_output_table_buffer is lc_bulk_limit constant integer := 5000; l_max_message_id integer := lc_bulk_limit; - procedure remove_read_data(a_message_rowids t_rowid_tab) is + procedure get_data_from_buffer( + a_max_message_id integer, + a_buffer_data out nocopy ut_varchar2_rows, + a_item_types out nocopy ut_varchar2_rows, + a_finished_flags out nocopy ut_integer_list + ) is pragma autonomous_transaction; begin - forall i in 1 .. a_message_rowids.count - delete from ut_output_buffer_tmp a - where rowid = a_message_rowids(i); + delete from ( + select * + from ut_output_buffer_tmp o + where o.output_id = self.output_id + and o.message_id <= a_max_message_id + order by o.message_id + ) d + returning d.text, d.item_type, d.is_finished + bulk collect into a_buffer_data, a_item_types, a_finished_flags; commit; + end; procedure remove_buffer_info is @@ -117,17 +146,7 @@ create or replace type body ut_output_table_buffer is begin while not l_finished loop - with ordered_buffer as ( - select /*+ index(a) */ a.rowid, ut_output_data_row(a.text, a.item_type), is_finished - from ut_output_buffer_tmp a - where a.output_id = self.output_id - and a.message_id <= l_max_message_id - order by a.message_id - ) - select b.* - bulk collect into l_message_rowids, l_buffer_data, l_finished_flags - from ordered_buffer b; - + get_data_from_buffer( l_max_message_id, l_buffer_data, l_item_types, l_finished_flags); --nothing fetched from output, wait and try again if l_buffer_data.count = 0 then $if dbms_db_version.version >= 18 $then @@ -146,14 +165,13 @@ create or replace type body ut_output_table_buffer is l_already_waited_for := 0; l_sleep_time := lc_short_sleep_time; for i in 1 .. l_buffer_data.count loop - if l_buffer_data(i).text is not null then - pipe row(l_buffer_data(i)); + if l_buffer_data(i) is not null then + pipe row(ut_output_data_row(l_buffer_data(i),l_item_types(i))); elsif l_finished_flags(i) = 1 then l_finished := true; exit; end if; end loop; - remove_read_data(l_message_rowids); l_max_message_id := l_max_message_id + lc_bulk_limit; end if; if l_finished or l_already_waited_for >= l_wait_for then diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index dcc940737..609d78ccf 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -74,6 +74,7 @@ grant execute on &&ut3_owner..ut_coverage_options to public; grant execute on &&ut3_owner..ut_coverage_helper to public; grant execute on &&ut3_owner..ut_output_buffer_base to public; grant execute on &&ut3_owner..ut_output_table_buffer to public; +grant execute on &&ut3_owner..ut_output_clob_table_buffer to public; grant execute on &&ut3_owner..ut_file_mappings to public; grant execute on &&ut3_owner..ut_file_mapping to public; grant execute on &&ut3_owner..ut_file_mapper to public; @@ -154,6 +155,7 @@ create public synonym ut_coverage_options for &&ut3_owner..ut_coverage_options; create public synonym ut_coverage_helper for &&ut3_owner..ut_coverage_helper; create public synonym ut_output_buffer_base for &&ut3_owner..ut_output_buffer_base; create public synonym ut_output_table_buffer for &&ut3_owner..ut_output_table_buffer; +create public synonym ut_output_clob_table_buffer for &&ut3_owner..ut_output_clob_table_buffer; create public synonym ut_file_mappings for &&ut3_owner..ut_file_mappings; create public synonym ut_file_mapping for &&ut3_owner..ut_file_mapping; create public synonym ut_file_mapper for &&ut3_owner..ut_file_mapper; diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql index feab90933..7aa5deb39 100644 --- a/source/create_user_grants.sql +++ b/source/create_user_grants.sql @@ -95,6 +95,7 @@ grant execute on &&ut3_owner..ut_output_buffer_base to &ut3_user; grant execute on &&ut3_owner..ut_output_data_row to &ut3_user; grant execute on &&ut3_owner..ut_output_data_rows to &ut3_user; grant execute on &&ut3_owner..ut_output_table_buffer to &ut3_user; +grant execute on &&ut3_owner..ut_output_clob_table_buffer to &ut3_user; grant execute on &&ut3_owner..ut_file_mappings to &ut3_user; grant execute on &&ut3_owner..ut_file_mapping to &ut3_user; grant execute on &&ut3_owner..ut_file_mapper to &ut3_user; diff --git a/source/create_user_synonyms.sql b/source/create_user_synonyms.sql index b08cb7b0e..cb2f7ab67 100644 --- a/source/create_user_synonyms.sql +++ b/source/create_user_synonyms.sql @@ -97,6 +97,7 @@ create or replace synonym &ut3_user..ut_coverage_options for &&ut3_owner..ut_cov create or replace synonym &ut3_user..ut_coverage_helper for &&ut3_owner..ut_coverage_helper; create or replace synonym &ut3_user..ut_output_buffer_base for &&ut3_owner..ut_output_buffer_base; create or replace synonym &ut3_user..ut_output_table_buffer for &&ut3_owner..ut_output_table_buffer; +create or replace synonym &ut3_user..ut_output_clob_table_buffer for &&ut3_owner..ut_output_clob_table_buffer; create or replace synonym &ut3_user..ut_file_mappings for &&ut3_owner..ut_file_mappings; create or replace synonym &ut3_user..ut_file_mapping for &&ut3_owner..ut_file_mapping; create or replace synonym &ut3_user..ut_file_mapper for &&ut3_owner..ut_file_mapper; diff --git a/source/install.sql b/source/install.sql index 08a5b59d7..728f4349f 100644 --- a/source/install.sql +++ b/source/install.sql @@ -99,9 +99,12 @@ alter session set current_schema = &&ut3_owner; --output buffer table @@install_component.sql 'core/output_buffers/ut_output_buffer_info_tmp.sql' @@install_component.sql 'core/output_buffers/ut_output_buffer_tmp.sql' +@@install_component.sql 'core/output_buffers/ut_output_clob_buffer_tmp.sql' --output buffer table api @@install_component.sql 'core/output_buffers/ut_output_table_buffer.tps' @@install_component.sql 'core/output_buffers/ut_output_table_buffer.tpb' +@@install_component.sql 'core/output_buffers/ut_output_clob_table_buffer.tps' +@@install_component.sql 'core/output_buffers/ut_output_clob_table_buffer.tpb' @@install_component.sql 'core/types/ut_output_reporter_base.tps' diff --git a/source/reporters/ut_debug_reporter.tpb b/source/reporters/ut_debug_reporter.tpb index 186290296..f22e8748b 100644 --- a/source/reporters/ut_debug_reporter.tpb +++ b/source/reporters/ut_debug_reporter.tpb @@ -18,7 +18,7 @@ create or replace type body ut_debug_reporter is constructor function ut_debug_reporter(self in out nocopy ut_debug_reporter) return self as result is begin - self.init($$plsql_unit); + self.init($$plsql_unit,ut_output_clob_table_buffer()); self.start_time := current_timestamp(); self.event_time := current_timestamp(); return; diff --git a/source/reporters/ut_realtime_reporter.tpb b/source/reporters/ut_realtime_reporter.tpb index e712c8f85..7c674cc7d 100644 --- a/source/reporters/ut_realtime_reporter.tpb +++ b/source/reporters/ut_realtime_reporter.tpb @@ -20,7 +20,7 @@ create or replace type body ut_realtime_reporter is self in out nocopy ut_realtime_reporter ) return self as result is begin - self.init($$plsql_unit); + self.init($$plsql_unit,ut_output_clob_table_buffer()); total_number_of_tests := 0; current_test_number := 0; current_indent := 0; diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index ed84aa0a0..3599549a3 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -247,12 +247,18 @@ drop type ut_suite_item force; drop type ut_output_table_buffer force; +drop type ut_output_clob_table_buffer force; + drop type ut_output_buffer_base force; drop view ut_output_buffer_tmp; drop table ut_output_buffer_tmp$ purge; +drop view ut_output_clob_buffer_tmp; + +drop table ut_output_clob_buffer_tmp$ purge; + drop view ut_output_buffer_info_tmp; drop table ut_output_buffer_info_tmp$; diff --git a/test/core/reporters/test_realtime_reporter.pkb b/test/core/reporters/test_realtime_reporter.pkb index c4ceb9d5d..2267e9c41 100644 --- a/test/core/reporters/test_realtime_reporter.pkb +++ b/test/core/reporters/test_realtime_reporter.pkb @@ -112,7 +112,7 @@ create or replace package body test_realtime_reporter as -- consume select test_event_object(item_type, xmltype(text)) bulk collect into g_events - from table(ut3.ut_output_table_buffer(l_reporter.output_buffer.output_id).get_lines()) + from table(l_reporter.get_lines()) where trim(text) is not null and item_type is not null; end run_report_and_cache_result; end create_test_suites_and_run; diff --git a/test/core/test_output_buffer.pkb b/test/core/test_output_buffer.pkb index 848824ea8..79e88f8d8 100644 --- a/test/core/test_output_buffer.pkb +++ b/test/core/test_output_buffer.pkb @@ -9,7 +9,7 @@ create or replace package body test_output_buffer is l_buffer ut3.ut_output_buffer_base; begin --Arrange - l_buffer := ut3.ut_output_table_buffer(); + l_buffer := ut3.ut_output_clob_table_buffer(); l_expected_text := to_clob(lpad('a text', 31000, ',a text')) || chr(10) || to_clob(lpad('a text', 31000, ',a text')) || chr(13) || to_clob(lpad('a text', 31000, ',a text')) From 620fd6186050f0a676117636aeb8a8c2ea423a3a Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sun, 31 Mar 2019 17:42:06 +0100 Subject: [PATCH 0378/1096] Adding extra tests: reporters/test_coverage/test_cov_cobertura_reporter reporters/test_coverage/test_coverage_sonar_reporter reporters/test_coverage/test_coveralls_reporter reporters/test_coverage/test_html_extended_reporter --- test/install_ut3_user_tests.sql | 9 ++ .../test_cov_cobertura_reporter.pkb | 45 ++++++++++ .../test_cov_cobertura_reporter.pks | 10 +++ .../test_coverage_sonar_reporter.pkb | 39 ++++++++ .../test_coverage_sonar_reporter.pks | 13 +++ .../test_coverage/test_coveralls_reporter.pkb | 90 +++++++++++++++++++ .../test_coverage/test_coveralls_reporter.pks | 13 +++ .../test_html_extended_reporter.pkb | 29 ++++++ .../test_html_extended_reporter.pks | 10 +++ 9 files changed, 258 insertions(+) create mode 100644 test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb create mode 100644 test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pks create mode 100644 test/ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pkb create mode 100644 test/ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pks create mode 100644 test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb create mode 100644 test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pks create mode 100644 test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pkb create mode 100644 test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pks diff --git a/test/install_ut3_user_tests.sql b/test/install_ut3_user_tests.sql index 5da99d802..688937a09 100644 --- a/test/install_ut3_user_tests.sql +++ b/test/install_ut3_user_tests.sql @@ -31,7 +31,12 @@ prompt Install user tests @@ut3_user/reporters/test_coverage.pks set define on @@install_above_12_1.sql 'ut3_user/reporters/test_extended_coverage.pks' +@@install_above_12_1.sql 'ut3_user/reporters/test_coverage/test_html_extended_reporter.pks' set define off +@@ut3_user/reporters/test_coverage/test_coveralls_reporter.pks +@@ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pks +@@ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pks + --set define on --@@install_below_12_2.sql 'ut3_user/reporters/test_proftag_coverage.pks' @@ -64,7 +69,11 @@ set define off @@ut3_user/reporters/test_coverage.pkb set define on @@install_above_12_1.sql 'ut3_user/reporters/test_extended_coverage.pkb' +@@install_above_12_1.sql 'ut3_user/reporters/test_coverage/test_html_extended_reporter.pkb' set define off +@@ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb +@@ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb +@@ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pkb --set define on --@@install_below_12_2.sql 'ut3_user/reporters/test_coverage.pkb' diff --git a/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb new file mode 100644 index 000000000..ecfb66340 --- /dev/null +++ b/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb @@ -0,0 +1,45 @@ +create or replace package body test_cov_cobertura_reporter is + + procedure report_on_file is + l_results ut3.ut_varchar2_list; + l_expected clob; + l_actual clob; + begin + --Arrange + l_expected := + q'[ + + + +test/ut3.dummy_coverage.pkb + + + + + + + + + + + + +]'; + --Act + select * + bulk collect into l_results + from table( + ut3.ut.run( + a_path => 'ut3.test_dummy_coverage', + a_reporter=> ut3.ut_coverage_cobertura_reporter( ), + a_source_files => ut3.ut_varchar2_list( 'test/ut3.dummy_coverage.pkb' ), + a_test_files => ut3.ut_varchar2_list( ) + ) + ); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + --Assert + ut.expect(l_actual).to_be_like(l_expected); + end; + +end; +/ diff --git a/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pks b/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pks new file mode 100644 index 000000000..365815964 --- /dev/null +++ b/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pks @@ -0,0 +1,10 @@ +create or replace package test_cov_cobertura_reporter is + + --%suite(ut_cov_cobertura_reporter) + --%suitepath(utplsql.test_user.reporters.test_coverage) + + --%test(reports on a project file mapped to database object) + procedure report_on_file; + +end test_cov_cobertura_reporter; +/ diff --git a/test/ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pkb new file mode 100644 index 000000000..5cd53a093 --- /dev/null +++ b/test/ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pkb @@ -0,0 +1,39 @@ +create or replace package body test_coverage_sonar_reporter is + + procedure report_on_file is + l_results ut3.ut_varchar2_list; + l_expected clob; + l_actual clob; + begin + --Arrange + l_expected := ' + + + + + + +'; + --Act + select * + bulk collect into l_results + from table( + ut3.ut.run( + a_path => 'ut3.test_dummy_coverage', + a_reporter=> ut3.ut_coverage_sonar_reporter( ), + a_source_files => ut3.ut_varchar2_list( 'test/ut3.dummy_coverage.pkb' ), + a_test_files => ut3.ut_varchar2_list( ) + ) + ); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + --Assert + ut.expect(l_actual).to_equal(l_expected); + end; + + procedure check_encoding_included is + begin + reporters.check_xml_encoding_included(ut3.ut_coverage_sonar_reporter(), 'UTF-8'); + end; + +end; +/ diff --git a/test/ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pks b/test/ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pks new file mode 100644 index 000000000..7a98355cf --- /dev/null +++ b/test/ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pks @@ -0,0 +1,13 @@ +create or replace package test_coverage_sonar_reporter is + + --%suite(ut_coverge_sonar_reporter) + --%suitepath(utplsql.test_user.reporters.test_coverage) + + --%test(reports on a project file mapped to database object) + procedure report_on_file; + + --%test(Includes XML header with encoding when encoding provided) + procedure check_encoding_included; + +end; +/ diff --git a/test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb new file mode 100644 index 000000000..0be0e8ce3 --- /dev/null +++ b/test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb @@ -0,0 +1,90 @@ +create or replace package body test_coveralls_reporter is + + procedure report_on_file is + l_results ut3.ut_varchar2_list; + l_expected clob; + l_actual clob; + begin + --Arrange + l_expected := q'[{"source_files":[ +{ "name": "test/ut3.dummy_coverage.pkb", +"coverage": [ +null, +null, +null, +1, +0, +null, +1 +] +} +]} + ]'; + --Act + select * + bulk collect into l_results + from table( + ut3.ut.run( + a_path => 'ut3.test_dummy_coverage', + a_reporter=> ut3.ut_coveralls_reporter( ), + a_source_files => ut3.ut_varchar2_list( 'test/ut3.dummy_coverage.pkb' ), + a_test_files => ut3.ut_varchar2_list( ) + ) + ); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + --Assert + ut.expect(l_actual).to_equal(l_expected); + end; + + procedure report_zero_coverage is + l_results ut3.ut_varchar2_list; + l_expected clob; + l_actual clob; + pragma autonomous_transaction; + begin + --Arrange + l_expected := q'[{"source_files":[ +{ "name": "ut3.dummy_coverage", +"coverage": [ +0, +0, +0, +0, +0, +0, +0, +0, +0, +0, +0, +0, +0, +0, +0 +] +} +]} + ]'; + + test_coverage.cleanup_dummy_coverage; + + --Act + select * + bulk collect into l_results + from table( + ut3.ut.run( + 'ut3.test_dummy_coverage', + ut3.ut_coveralls_reporter(), + a_include_objects => ut3.ut_varchar2_list('UT3.DUMMY_COVERAGE') + ) + ); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + --Assert + ut.expect(l_actual).to_equal(l_expected); + + test_coverage.setup_dummy_coverage; + + end; + +end; +/ diff --git a/test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pks b/test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pks new file mode 100644 index 000000000..d958b8f12 --- /dev/null +++ b/test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pks @@ -0,0 +1,13 @@ +create or replace package test_coveralls_reporter is + + --%suite(ut_coveralls_reporter) + --%suitepath(utplsql.test_user.reporters.test_coverage) + + --%test(reports on a project file mapped to database object) + procedure report_on_file; + + --%test(reports zero coverage on each line of non-executed database object) + procedure report_zero_coverage; + +end; +/ diff --git a/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pkb new file mode 100644 index 000000000..36a6be015 --- /dev/null +++ b/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pkb @@ -0,0 +1,29 @@ +create or replace package body test_html_extended_reporter is + + procedure report_on_file is + l_results ut3.ut_varchar2_list; + l_expected varchar2(32767); + l_actual clob; + l_charset varchar2(100) := 'ISO-8859-1'; + begin + --Arrange + l_expected := '%%

UT3.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG

%4 relevant lines. 3 lines covered (including 1 lines partially covered ) and 1 lines missed%'; + + select * + bulk collect into l_results + from table( + ut3.ut.run( + a_path => 'ut3.test_dummy_coverage', + a_reporter=> ut3.ut_coverage_html_reporter(), + a_source_files => ut3.ut_varchar2_list( 'test/ut3.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long.pkb' ), + a_test_files => ut3.ut_varchar2_list( ), + a_client_character_set => l_charset + ) + ); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + --Assert + ut.expect(l_actual).to_be_like(l_expected); + end; + +end test_html_extended_reporter; +/ diff --git a/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pks b/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pks new file mode 100644 index 000000000..3158b3777 --- /dev/null +++ b/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pks @@ -0,0 +1,10 @@ +create or replace package test_html_extended_reporter is + + --%suite(ut_html_extended_reporter) + --%suitepath(utplsql.test_user.reporters.test_coverage.test_extended_coverage) + + --%test(reports on a project file mapped to database object in extended profiler coverage) + procedure report_on_file; + +end test_html_extended_reporter; +/ From 951780804780760ebb5a02172e026277f7b103ad Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 31 Mar 2019 23:50:03 +0100 Subject: [PATCH 0379/1096] Updated documentation for random order of test execution --- docs/userguide/running-unit-tests.md | 111 ++++++++++++++++++++++----- 1 file changed, 90 insertions(+), 21 deletions(-) diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 4abe304b5..a6c4163d0 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -47,6 +47,7 @@ The examples below illustrate different ways and options to invoke `ut.run` proc ```sql alter session set current_schema=hr; +set serveroutput on begin ut.run(); end; @@ -55,6 +56,7 @@ Executes all tests in current schema (_HR_). ```sql +set serveroutput on begin ut.run('HR'); end; @@ -63,6 +65,7 @@ Executes all tests in specified schema (_HR_). ```sql +set serveroutput on begin ut.run('hr:com.my_org.my_project'); end; @@ -73,6 +76,7 @@ Check the [annotations documentation](annotations.md) to find out about suitepat ```sql +set serveroutput on begin ut.run('hr.test_apply_bonus'); end; @@ -81,6 +85,7 @@ Executes all tests from package _hr.test_apply_bonus_. ```sql +set serveroutput on begin ut.run('hr.test_apply_bonus.bonus_cannot_be_negative'); end; @@ -89,6 +94,7 @@ Executes single test procedure _hr.test_apply_bonus.bonus_cannot_be_negative_. ```sql +set serveroutput on begin ut.run(ut_varchar2_list('hr.test_apply_bonus','cust')); end; @@ -96,6 +102,7 @@ end; Executes all tests from package _hr.test_apply_bonus_ and all tests from schema _cust_. ```sql +set serveroutput on begin ut.run(ut_varchar2_list('hr.test_apply_bonus,cust)'); end; @@ -104,6 +111,7 @@ end; Executes all tests from package _hr.test_apply_bonus_ and all tests from schema _cust_. ```sql +set serveroutput on begin ut.run('hr.test_apply_bonus,cust'); end; @@ -124,6 +132,7 @@ The `ut.run` procedures and functions accept `a_reporter` attribute that defines You can execute any set of tests with any of the predefined reporters. ```sql +set serveroutput on begin ut.run('hr.test_apply_bonus', ut_junit_reporter()); end; @@ -133,26 +142,6 @@ Executes all tests from package _HR.TEST_APPLY_BONUS_ and provide outputs to DBM For details on build-in reporters look at [reporters documentation](reporters.md). -## Keeping uncommited data after test-run - -utPLSQL by default runs tests in autonomous transaction and performs automatic rollback to assure that tests do not impact one-another and do not have impact on the current session in your IDE. - -If you would like to keep your uncommited data persisted after running tests, you can do so by using `a_force_manual_rollback` flag. -Setting this flag to true has following side-effects: - -- test execution is done in current transaction - if while running tests commit or rollback is issued your current session data will get commited too. -- automatic rollback is forced to be disabled in test-run even if it was explicitly enabled by using annotation `--%rollback(manual) - -Example invocation: -```sql -begin - ut.run('hr.test_apply_bonus', a_force_manual_rollback => true); -end; -``` - - -This option is not anvailable when running tests using `ut.run` as a table function. - ## ut.run functions The `ut.run` functions provide exactly the same functionality as the `ut.run` procedures. @@ -160,6 +149,10 @@ You may use the same sets of parameters with both functions and procedures. The only difference is the output of the results. Functions provide output as a pipelined stream and therefore need to be executed as select statements. +**Note:** +>When running tests with `ut.run` functions, whole test run is executed as autonomous transaction. +At the end of the run, the transaction is automatically rolled-back and all uncommitted changes are reverted. + Example. ```sql select * from table(ut.run('hr.test_apply_bonus', ut_junit_reporter())); @@ -180,7 +173,83 @@ The concept is pretty simple. - as a separate thread, start `ut_runner.run` and pass reporters with previously defined output_ids. - for each reporter start a separate thread and read outputs from the `ut_output_buffer.get_lines` table function by providing the output_id defined in the main thread. -# Reports characterset encoding +# Order of test execution + +## Default order + +When unit tests are executed without random order, they are ordered by: +- schema name +- suite path or test package name if `--%suitepath` was not specified for that package +- `--%test` line number in package + +## Random order + +You can force a test run to execute tests in random order by providing one of options to `ut.run`: +- `a_random_test_order` - true/false for procedures and 1/0 for functions +- `a_random_test_order_seed` - positive number in range of 1 .. 1 000 000 000 + +When tests are executed with random order, randomization is applied to single level of suitepath hierarchy tree. +This is needed to maintain visibility and accessibility of common setup/cleanup `beforeall`/`afterall` in tests. + +Example: +```sql +set serveroutput on +begin + ut.run('hr.test_apply_bonus', a_random_test_order => true); +end; +``` + +```sql +select * from table(ut.run('hr.test_apply_bonus', a_random_test_order => 1)); +``` + +When running with random order, the default report (`ut_documentation_reporter`) will include information about the random test run seed. +Example output: +``` +... +Finished in .12982 seconds +35 tests, 0 failed, 0 errored, 1 disabled, 0 warning(s) +Tests were executed with random order seed '302980531'. +``` + +If you want to re-run tests using previously generated seed, you may do so by running them with parameter `a_random_test_order_seed` +Example: +```sql +set serveroutput on +begin + ut.run('hr.test_apply_bonus', a_random_test_order_seed => 302980531); +end; +``` + +```sql +select * from table(ut.run('hr.test_apply_bonus', a_random_test_order_seed => 302980531)); +``` + +**Note** +>Random order seed must be a positive number within range of 1 .. 1 000 000 000. + +# Keeping uncommitted data after test-run + +utPLSQL by default runs tests in autonomous transaction and performs automatic rollback to assure that tests do not impact one-another and do not have impact on the current session in your IDE. + +If you would like to keep your uncommitted data persisted after running tests, you can do so by using `a_force_manual_rollback` flag. +Setting this flag to true has following side-effects: + +- test execution is done in current transaction - if while running tests commit or rollback is issued your current session data will get commited too. +- automatic rollback is forced to be disabled in test-run even if it was explicitly enabled by using annotation `--%rollback(manual) + +Example invocation: +```sql +set serveroutput on +begin + ut.run('hr.test_apply_bonus', a_force_manual_rollback => true); +end; +``` + +**Note:** +>This option is not available when running tests using `ut.run` as a table function. + +# Reports character-set encoding To get properly encoded reports, when running utPLSQL with HTML/XML reports on data containing national characters you need to provide your client character set when calling `ut.run` functions and procedures. From c508e7937d8c56c25ed3723d29b78fc3bfdf61d0 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Mon, 1 Apr 2019 07:43:07 +0100 Subject: [PATCH 0380/1096] Adding tests: reporters/test_coverage reporters/test_coverage/test_html_proftab_reporter reporters/test_proftab_coverage --- test/install_ut3_user_tests.sql | 18 +-- test/ut3_tester/core.pkb | 1 + test/ut3_tester_helper/coverage_helper.pkb | 60 ++++++++ test/ut3_tester_helper/coverage_helper.pks | 5 +- test/ut3_user/reporters/test_coverage.pkb | 19 +-- .../test_html_proftab_reporter.pkb | 29 ++++ .../test_html_proftab_reporter.pks | 10 ++ .../reporters/test_proftab_coverage.pkb | 143 ++++++++++++++++++ .../reporters/test_proftab_coverage.pks | 27 ++++ 9 files changed, 284 insertions(+), 28 deletions(-) create mode 100644 test/ut3_user/reporters/test_coverage/test_html_proftab_reporter.pkb create mode 100644 test/ut3_user/reporters/test_coverage/test_html_proftab_reporter.pks create mode 100644 test/ut3_user/reporters/test_proftab_coverage.pkb create mode 100644 test/ut3_user/reporters/test_proftab_coverage.pks diff --git a/test/install_ut3_user_tests.sql b/test/install_ut3_user_tests.sql index 688937a09..3f499a494 100644 --- a/test/install_ut3_user_tests.sql +++ b/test/install_ut3_user_tests.sql @@ -36,13 +36,12 @@ set define off @@ut3_user/reporters/test_coverage/test_coveralls_reporter.pks @@ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pks @@ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pks +set define on +@@install_below_12_2.sql 'ut3_user/reporters/test_proftab_coverage.pks' +@@install_below_12_2.sql 'ut3_user/reporters/test_coverage/test_html_proftab_reporter.pks' +set define off ---set define on ---@@install_below_12_2.sql 'ut3_user/reporters/test_proftag_coverage.pks' ---@@install_below_12_2.sql 'ut3_user/reporters/test_coverage/test_html_proftab_reporter.pks' ---set define off - @@ut3_user/expectations/unary/test_expect_not_to_be_null.pkb @@ut3_user/expectations/unary/test_expect_to_be_null.pkb @@ut3_user/expectations/unary/test_expect_to_be_empty.pkb @@ -74,11 +73,10 @@ set define off @@ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb @@ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb @@ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pkb - ---set define on ---@@install_below_12_2.sql 'ut3_user/reporters/test_coverage.pkb' ---@@install_below_12_2.sql 'ut3_user/reporters/test_coverage/test_html_proftab_reporter.pkb' ---set define off +set define on +@@install_below_12_2.sql 'ut3_user/reporters/test_proftab_coverage.pkb' +@@install_below_12_2.sql 'ut3_user/reporters/test_coverage/test_html_proftab_reporter.pkb' +set define off set linesize 200 diff --git a/test/ut3_tester/core.pkb b/test/ut3_tester/core.pkb index a1da097a9..8843c129f 100644 --- a/test/ut3_tester/core.pkb +++ b/test/ut3_tester/core.pkb @@ -5,6 +5,7 @@ create or replace package body core is ut3.ut_coverage.set_develop_mode(true); --improve performance of test execution by disabling all compiler optimizations ut3_tester_helper.main_helper.execute_autonomous('ALTER SESSION SET PLSQL_OPTIMIZE_LEVEL=0'); + dbms_output.enable(null); end; end; diff --git a/test/ut3_tester_helper/coverage_helper.pkb b/test/ut3_tester_helper/coverage_helper.pkb index 06f42bbf3..feac8000d 100644 --- a/test/ut3_tester_helper/coverage_helper.pkb +++ b/test/ut3_tester_helper/coverage_helper.pkb @@ -106,6 +106,66 @@ create or replace package body coverage_helper is begin execute immediate q'[drop package ut3.dummy_coverage]'; exception when others then null; end; end; + + procedure create_dummy_coverage_test_1 is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package UT3.DUMMY_COVERAGE_1 is + procedure do_stuff; + procedure grant_myself; + end;]'; + execute immediate q'[create or replace package body UT3.DUMMY_COVERAGE_1 is + procedure do_stuff is + begin + if 1 = 2 then + dbms_output.put_line('should not get here'); + else + dbms_output.put_line('should get here'); + end if; + end; + + procedure grant_myself is + begin + execute immediate 'grant debug,execute on UT3.DUMMY_COVERAGE_1 to ut3$user#'; + end; + + end;]'; + execute immediate q'[create or replace package UT3.TEST_DUMMY_COVERAGE_1 is + --%suite(dummy coverage test 1) + --%suitepath(coverage_testing) + + --%test + procedure test_do_stuff; + + procedure grant_myself; + end;]'; + execute immediate q'[create or replace package body UT3.TEST_DUMMY_COVERAGE_1 is + procedure test_do_stuff is + begin + dummy_coverage_1.do_stuff; + end; + + procedure grant_myself is + begin + execute immediate 'grant debug,execute on UT3.TEST_DUMMY_COVERAGE_1 to ut3$user#'; + end; + + end;]'; + end; + + procedure drop_dummy_coverage_test_1 is + pragma autonomous_transaction; + begin + execute immediate q'[drop package UT3.DUMMY_COVERAGE_1]'; + execute immediate q'[drop package UT3.TEST_DUMMY_COVERAGE_1]'; + end; + + procedure grant_exec_on_cov_1 is + pragma autonomous_transaction; + begin + execute immediate 'begin UT3.DUMMY_COVERAGE_1.grant_myself(); end;'; + execute immediate 'begin UT3.TEST_DUMMY_COVERAGE_1.grant_myself(); end;'; + end; --12.2 Setup procedure create_dummy_12_2_cov_pck is diff --git a/test/ut3_tester_helper/coverage_helper.pks b/test/ut3_tester_helper/coverage_helper.pks index 427a965c0..73ff7b448 100644 --- a/test/ut3_tester_helper/coverage_helper.pks +++ b/test/ut3_tester_helper/coverage_helper.pks @@ -15,7 +15,10 @@ create or replace package coverage_helper is procedure grant_exec_on_cov; procedure mock_profiler_coverage_data(a_run_id integer,a_user in varchar2); procedure drop_dummy_coverage_pkg; - + procedure create_dummy_coverage_test_1; + procedure drop_dummy_coverage_test_1; + procedure grant_exec_on_cov_1; + --Block coverage procedure create_dummy_12_2_cov_pck; procedure create_dummy_12_2_cov_test; diff --git a/test/ut3_user/reporters/test_coverage.pkb b/test/ut3_user/reporters/test_coverage.pkb index c3617bc55..6b094f2ae 100644 --- a/test/ut3_user/reporters/test_coverage.pkb +++ b/test/ut3_user/reporters/test_coverage.pkb @@ -6,25 +6,10 @@ create or replace package body test_coverage is return ut3_tester_helper.coverage_helper.get_mock_run_id(); end; - procedure create_dummy_coverage_package is + procedure create_dummy_coverage_pkg is begin ut3_tester_helper.coverage_helper.create_dummy_coverage_package(); - end; - - procedure create_dummy_coverage_test is - begin ut3_tester_helper.coverage_helper.create_dummy_coverage_test(); - end; - - procedure mock_coverage_data(a_run_id integer) is - begin - ut3_tester_helper.coverage_helper.mock_coverage_data(a_run_id,user); - end; - - procedure create_dummy_coverage_pkg is - begin - create_dummy_coverage_package(); - create_dummy_coverage_test(); ut3_tester_helper.coverage_helper.grant_exec_on_cov(); end; @@ -33,7 +18,7 @@ create or replace package body test_coverage is begin g_run_id := get_mock_run_id(); ut3.ut_coverage.mock_coverage_id(g_run_id, ut3.ut_coverage.gc_proftab_coverage); - mock_coverage_data(g_run_id); + ut3_tester_helper.coverage_helper.mock_coverage_data(g_run_id,user); commit; end; diff --git a/test/ut3_user/reporters/test_coverage/test_html_proftab_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_html_proftab_reporter.pkb new file mode 100644 index 000000000..8daf36513 --- /dev/null +++ b/test/ut3_user/reporters/test_coverage/test_html_proftab_reporter.pkb @@ -0,0 +1,29 @@ +create or replace package body test_html_proftab_reporter is + + procedure report_on_file is + l_results ut3.ut_varchar2_list; + l_expected varchar2(32767); + l_actual clob; + l_charset varchar2(100) := 'ISO-8859-1'; + begin + --Arrange + l_expected := '%%

UT3.DUMMY_COVERAGE

%3 relevant lines. 2 lines covered and 1 lines missed%'; + --Act + select * + bulk collect into l_results + from table( + ut3.ut.run( + a_path => 'ut3.test_dummy_coverage', + a_reporter=> ut3.ut_coverage_html_reporter(), + a_source_files => ut3.ut_varchar2_list( 'test/ut3.dummy_coverage.pkb' ), + a_test_files => ut3.ut_varchar2_list( ), + a_client_character_set => l_charset + ) + ); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + --Assert + ut.expect(l_actual).to_be_like(l_expected); + end; + +end test_html_proftab_reporter; +/ diff --git a/test/ut3_user/reporters/test_coverage/test_html_proftab_reporter.pks b/test/ut3_user/reporters/test_coverage/test_html_proftab_reporter.pks new file mode 100644 index 000000000..02973fbe0 --- /dev/null +++ b/test/ut3_user/reporters/test_coverage/test_html_proftab_reporter.pks @@ -0,0 +1,10 @@ +create or replace package test_html_proftab_reporter is + + --%suite(ut_html_proftab_reporter) + --%suitepath(utplsql.test_user.reporters.test_coverage.test_proftab_coverage) + + --%test(reports on a project file mapped to database object in profiler coverage) + procedure report_on_file; + +end test_html_proftab_reporter; +/ diff --git a/test/ut3_user/reporters/test_proftab_coverage.pkb b/test/ut3_user/reporters/test_proftab_coverage.pkb new file mode 100644 index 000000000..c5ad8c112 --- /dev/null +++ b/test/ut3_user/reporters/test_proftab_coverage.pkb @@ -0,0 +1,143 @@ +create or replace package body test_proftab_coverage is + + procedure create_dummy_coverage_test_1 is + begin + ut3_tester_helper.coverage_helper.create_dummy_coverage_test_1(); + ut3_tester_helper.coverage_helper.grant_exec_on_cov_1(); + end; + + procedure drop_dummy_coverage_test_1 is + begin + ut3_tester_helper.coverage_helper.drop_dummy_coverage_test_1(); + end; + + procedure coverage_for_object is + l_expected clob; + l_actual clob; + l_results ut3.ut_varchar2_list; + begin + --Arrange + l_expected := '%%'; + --Act + select * + bulk collect into l_results + from table( + ut3.ut.run( + a_path => 'ut3.test_dummy_coverage', + a_reporter=> ut3.ut_coverage_sonar_reporter( ), + a_include_objects => ut3.ut_varchar2_list( 'ut3.dummy_coverage' ) + ) + ); + --Assert + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + ut.expect(l_actual).to_be_like(l_expected); + end; + + procedure coverage_for_object_no_owner is + l_expected clob; + l_actual clob; + l_results ut3.ut_varchar2_list; + begin + --Arrange + l_expected := '%%'; + --Act + select * + bulk collect into l_results + from table( + ut3.ut.run( + a_path => 'ut3.test_dummy_coverage', + a_reporter=> ut3.ut_coverage_sonar_reporter( ), + a_include_objects => ut3.ut_varchar2_list( 'dummy_coverage' ) + ) + ); + --Assert + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + ut.expect(l_actual).to_be_like(l_expected); + end; + + procedure coverage_for_schema is + l_expected clob; + l_actual clob; + l_results ut3.ut_varchar2_list; + begin + --Arrange + l_expected := ''; + l_expected := '%'||l_expected||'%'||l_expected||'%'; + --Act + select * + bulk collect into l_results + from table( + ut3.ut.run( + a_path => 'ut3.test_dummy_coverage', + a_reporter=> ut3.ut_coverage_sonar_reporter( ), + a_coverage_schemes => ut3.ut_varchar2_list( 'ut3' ) + ) + ); + --Assert + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + ut.expect(l_actual).to_be_like(l_expected); + end; + + procedure coverage_for_file is + l_expected clob; + l_actual clob; + l_results ut3.ut_varchar2_list; + l_file_path varchar2(100); + begin + --Arrange + l_file_path := lower('test/ut3.dummy_coverage.pkb'); + l_expected := '%%'; + --Act + select * + bulk collect into l_results + from table( + ut3.ut.run( + a_path => 'ut3.test_dummy_coverage', + a_reporter=> ut3.ut_coverage_sonar_reporter( ), + a_source_files => ut3.ut_varchar2_list( l_file_path ), + a_test_files => ut3.ut_varchar2_list( ) + ) + ); + --Assert + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + ut.expect(l_actual).to_be_like(l_expected); + end; + + procedure coverage_tmp_data_refresh is + l_actual clob; + l_results ut3.ut_varchar2_list; + begin + --Arrange + select * + bulk collect into l_results + from table( + ut3.ut.run( + a_path => 'ut3:coverage_testing', + a_reporter=> ut3.ut_coverage_sonar_reporter( ), + a_include_objects => ut3.ut_varchar2_list( 'ut3.dummy_coverage' ) + ) + ); + ut3_tester_helper.coverage_helper.cleanup_dummy_coverage(test_coverage.g_run_id); + ut3_tester_helper.coverage_helper.drop_dummy_coverage_pkg(); + create_dummy_coverage_test_1; + + --Act + select * + bulk collect into l_results + from table( + ut3.ut.run( + a_path => 'ut3:coverage_testing', + a_reporter=> ut3.ut_coverage_sonar_reporter( ), + a_include_objects => ut3.ut_varchar2_list( 'ut3.dummy_coverage' ) + ) + ); + + --Assert + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + ut.expect(l_actual).to_equal(to_clob(' + +')); + end; + +end; +/ diff --git a/test/ut3_user/reporters/test_proftab_coverage.pks b/test/ut3_user/reporters/test_proftab_coverage.pks new file mode 100644 index 000000000..1bb5c10cd --- /dev/null +++ b/test/ut3_user/reporters/test_proftab_coverage.pks @@ -0,0 +1,27 @@ +create or replace package test_proftab_coverage is + + --%suite + --%suitepath(utplsql.test_user.reporters.test_coverage) + + --%test(Coverage is gathered for specified object - default coverage type) + procedure coverage_for_object; + + --%test(Coverage is gathered for specified schema - default coverage type) + procedure coverage_for_object_no_owner; + + --%test(Coverage is gathered for specified schema) + procedure coverage_for_schema; + + --%test(Coverage is gathered for specified file - default coverage type) + procedure coverage_for_file; + + --%test(Coverage data is not cached between runs - issue #562 ) + --%aftertest(ut3$user#.test_coverage.create_dummy_coverage_pkg) + --%aftertest(ut3$user#.test_coverage.setup_dummy_coverage) + --%aftertest(drop_dummy_coverage_test_1) + procedure coverage_tmp_data_refresh; + + procedure drop_dummy_coverage_test_1; + +end; +/ From 25be0fd94ea82e808545f903e33dce1429f2d3f6 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 1 Apr 2019 08:29:10 +0000 Subject: [PATCH 0381/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index ce0e56c57..03f149495 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 36a8ef952..e1fe1c15a 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 617a4db1d..8ac4f4486 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 35d465fc1..1e9f3680f 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 2ccaae623..5d7d5f7b2 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 0bf324e36..9a3392eff 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 91da18b31..803234e70 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index f574b8e81..f6324861d 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 8424a8d14..c0f5feeea 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 8da42b6b8..e7ea43f26 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 492804991..a459454f2 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 3314ed467..95c362c4d 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 2d6d7cb6c..bbe6603ab 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 92cfd1e85..4ea2e541e 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index dd3aff030..d14ccc24d 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index a6482023d..d7b82ee17 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index de9c3a64e..cc5b920ec 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2748--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index c51d18d48..aecebc93f 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.7.2748-develop'; + gc_version constant varchar2(50) := 'v3.1.7.2795-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 858a675c1e867563a9a0b135fd621bab554fb965 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Mon, 1 Apr 2019 12:41:34 +0100 Subject: [PATCH 0382/1096] Fixing broken test. Adding test: reporters/test_coverage/test_html_extended_reporter reporters/test_extended_coverage --- .travis/install.sh | 2 +- test/ut3_tester/core/test_ut_test.pkb | 10 ++++++++++ test/ut3_tester/core/test_ut_test.pks | 8 ++++++-- test/ut3_tester_helper/ut_example_tests.pkb | 13 ++++++++++++- test/ut3_tester_helper/ut_example_tests.pks | 4 ++++ .../test_coverage/test_html_extended_reporter.pkb | 2 +- .../test_coverage/test_html_extended_reporter.pks | 2 +- test/ut3_user/reporters/test_extended_coverage.pks | 2 +- 8 files changed, 36 insertions(+), 7 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index a6a8a60b0..d8c2a87fc 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -86,7 +86,7 @@ grant create public database link to $UT3_TESTER_HELPER; grant drop public database link to $UT3_TESTER_HELPER; set feedback on --Needed for testing coverage outside of main UT3 schema. -grant create any procedure, drop any procedure, execute any procedure, create any type, drop any type, execute any type, under any type, select any table, update any table, insert any table, delete any table, create any table, drop any table, alter any table, select any dictionary to $UT3_TESTER_HELPER; +grant create any procedure, drop any procedure, execute any procedure, create any type, drop any type, execute any type, under any type, select any table, update any table, insert any table, delete any table, create any table, drop any table, alter any table, select any dictionary, create any synonym, drop any synonym to $UT3_TESTER_HELPER; grant create job to $UT3_TESTER_HELPER; exit SQL diff --git a/test/ut3_tester/core/test_ut_test.pkb b/test/ut3_tester/core/test_ut_test.pkb index 183f9f9c9..2a85a323f 100644 --- a/test/ut3_tester/core/test_ut_test.pkb +++ b/test/ut3_tester/core/test_ut_test.pkb @@ -404,6 +404,16 @@ create or replace package body test_ut_test is ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); end; + procedure create_synonym is + begin + ut3_tester_helper.ut_example_tests.create_synonym; + end; + + procedure drop_synonym is + begin + ut3_tester_helper.ut_example_tests.drop_synonym; + end; + procedure owner_name_null is --Arrange l_test ut3.ut_test := ut3.ut_test( diff --git a/test/ut3_tester/core/test_ut_test.pks b/test/ut3_tester/core/test_ut_test.pks index 3f10d5a6f..a2b0fd4f5 100644 --- a/test/ut3_tester/core/test_ut_test.pks +++ b/test/ut3_tester/core/test_ut_test.pks @@ -50,9 +50,13 @@ create or replace package test_ut_test is --%test(Fails when owner name invalid) procedure owner_name_invalid; - --TODO: FIX that + + procedure create_synonym; + procedure drop_synonym; + --%test(Runs test as current schema when owner name null) - --%disabled + --%beforetest(create_synonym) + --%aftertest(drop_synonym) procedure owner_name_null; procedure create_invalid_package; diff --git a/test/ut3_tester_helper/ut_example_tests.pkb b/test/ut3_tester_helper/ut_example_tests.pkb index d4954fff3..7e795d184 100644 --- a/test/ut3_tester_helper/ut_example_tests.pkb +++ b/test/ut3_tester_helper/ut_example_tests.pkb @@ -1,6 +1,17 @@ create or replace package body ut_example_tests as - + procedure create_synonym is + pragma autonomous_transaction; + begin + execute immediate 'create or replace synonym ut3_tester.ut_example_tests for ut3_tester_helper.ut_example_tests'; + end; + + procedure drop_synonym is + pragma autonomous_transaction; + begin + execute immediate 'drop synonym ut3_tester.ut_example_tests'; + end; + procedure set_g_number_0 as begin g_number := 0; diff --git a/test/ut3_tester_helper/ut_example_tests.pks b/test/ut3_tester_helper/ut_example_tests.pks index a7077a8a8..a62c02332 100644 --- a/test/ut3_tester_helper/ut_example_tests.pks +++ b/test/ut3_tester_helper/ut_example_tests.pks @@ -1,5 +1,9 @@ create or replace package ut_example_tests is g_number number; + + procedure create_synonym; + procedure drop_synonym; + procedure set_g_number_0; procedure add_1_to_g_number; procedure failing_procedure; diff --git a/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pkb index 36a6be015..02b275020 100644 --- a/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pkb +++ b/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pkb @@ -13,7 +13,7 @@ create or replace package body test_html_extended_reporter is bulk collect into l_results from table( ut3.ut.run( - a_path => 'ut3.test_dummy_coverage', + a_path => 'ut3.test_block_dummy_coverage', a_reporter=> ut3.ut_coverage_html_reporter(), a_source_files => ut3.ut_varchar2_list( 'test/ut3.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long.pkb' ), a_test_files => ut3.ut_varchar2_list( ), diff --git a/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pks b/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pks index 3158b3777..dbe31b83d 100644 --- a/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pks +++ b/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pks @@ -1,7 +1,7 @@ create or replace package test_html_extended_reporter is --%suite(ut_html_extended_reporter) - --%suitepath(utplsql.test_user.reporters.test_coverage.test_extended_coverage) + --%suitepath(utplsql.test_user.reporters.test_extended_coverage) --%test(reports on a project file mapped to database object in extended profiler coverage) procedure report_on_file; diff --git a/test/ut3_user/reporters/test_extended_coverage.pks b/test/ut3_user/reporters/test_extended_coverage.pks index fe4a2ecc5..aaef20877 100644 --- a/test/ut3_user/reporters/test_extended_coverage.pks +++ b/test/ut3_user/reporters/test_extended_coverage.pks @@ -1,7 +1,7 @@ create or replace package test_extended_coverage is --%suite - --%suitepath(utplsql.test_user.reporters.test_coverage) + --%suitepath(utplsql.test_user.reporters) --%beforeall procedure setup_dummy_coverage; From 1642f478e2be5abcfd065df1e37874f3b085bf3c Mon Sep 17 00:00:00 2001 From: lwasylow Date: Mon, 1 Apr 2019 17:11:59 +0100 Subject: [PATCH 0383/1096] Adding test: unary/test_expect_to_be_not_null --- test/install_ut3_user_tests.sql | 2 + .../unary/test_expect_to_be_not_null.pkb | 264 ++++++++++++++++++ .../unary/test_expect_to_be_not_null.pks | 97 +++++++ 3 files changed, 363 insertions(+) create mode 100644 test/ut3_user/expectations/unary/test_expect_to_be_not_null.pkb create mode 100644 test/ut3_user/expectations/unary/test_expect_to_be_not_null.pks diff --git a/test/install_ut3_user_tests.sql b/test/install_ut3_user_tests.sql index 3f499a494..015c1573e 100644 --- a/test/install_ut3_user_tests.sql +++ b/test/install_ut3_user_tests.sql @@ -10,6 +10,7 @@ prompt Install user tests @@ut3_user/expectations/unary/test_expect_to_be_empty.pks @@ut3_user/expectations/unary/test_expect_to_have_count.pks @@ut3_user/expectations/unary/test_expect_to_be_true_false.pks +@@ut3_user/expectations/unary/test_expect_to_be_not_null.pks @@ut3_user/expectations/binary/test_equal.pks @@ut3_user/expectations/binary/test_expect_to_be_less_than.pks @@ut3_user/expectations/binary/test_be_less_or_equal.pks @@ -47,6 +48,7 @@ set define off @@ut3_user/expectations/unary/test_expect_to_be_empty.pkb @@ut3_user/expectations/unary/test_expect_to_have_count.pkb @@ut3_user/expectations/unary/test_expect_to_be_true_false.pkb +@@ut3_user/expectations/unary/test_expect_to_be_not_null.pkb @@ut3_user/expectations/binary/test_equal.pkb @@ut3_user/expectations/binary/test_expect_to_be_less_than.pkb @@ut3_user/expectations/binary/test_be_less_or_equal.pkb diff --git a/test/ut3_user/expectations/unary/test_expect_to_be_not_null.pkb b/test/ut3_user/expectations/unary/test_expect_to_be_not_null.pkb new file mode 100644 index 000000000..0e747eb85 --- /dev/null +++ b/test/ut3_user/expectations/unary/test_expect_to_be_not_null.pkb @@ -0,0 +1,264 @@ +create or replace package body test_expect_to_be_not_null +is + gc_object_name constant varchar2(30) := 't_to_be_not_null_test'; + gc_nested_table_name constant varchar2(30) := 'tt_to_be_not_null_test'; + gc_varray_name constant varchar2(30) := 'tv_to_be_not_null_test'; + + procedure cleanup_expectations is + begin + ut3_tester_helper.main_helper.clear_expectations( ); + end; + + procedure create_types is + pragma autonomous_transaction; + begin + execute immediate 'create type '||gc_object_name||' is object (dummy number)'; + execute immediate 'create type '||gc_nested_table_name||' is table of number'; + execute immediate 'create type '||gc_varray_name||' is varray(1) of number'; + end; + + procedure drop_types is + pragma autonomous_transaction; + begin + execute immediate 'drop type '||gc_object_name; + execute immediate 'drop type '||gc_nested_table_name; + execute immediate 'drop type '||gc_varray_name; + end; + + procedure blob_not_null is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block('to_be_not_null', 'blob', 'to_blob(''abc'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure empty_blob is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block('to_be_not_null', 'blob', 'empty_blob()'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure boolean_not_null is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block('to_be_not_null', 'boolean', 'true'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure clob_not_null is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block('to_be_not_null', 'clob', 'to_clob(''abc'')'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure empty_clob is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block('to_be_not_null', 'clob', 'empty_clob()'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure date_not_null is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block('to_be_not_null', 'date', 'sysdate'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure number_not_null is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block('to_be_not_null', 'number', '1234'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure timestamp_not_null is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block('to_be_not_null', 'timestamp', 'systimestamp'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure timestamp_with_ltz_not_null is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block('to_be_not_null', 'timestamp with local time zone', 'systimestamp'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure timestamp_with_tz_not_null is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block('to_be_not_null', 'timestamp with time zone', 'systimestamp'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure varchar2_not_null is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block('to_be_not_null', 'varchar2(4000)', '''abc'''); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure initialized_object is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_object_block( + 'to_be_not_null', gc_object_name, gc_object_name||'(1)', 'object' + ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure initialized_nested_table is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_object_block( + 'to_be_not_null', gc_nested_table_name, gc_nested_table_name||'()', 'collection' + ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure initialized_varray is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_object_block( + 'to_be_not_null', gc_varray_name, gc_varray_name||'()', 'collection' + ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure null_blob is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block('to_be_not_null', 'blob', 'null'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure null_boolean is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block('to_be_not_null', 'boolean', 'null'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + + procedure null_clob is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block('to_be_not_null', 'clob', 'null'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + + procedure null_date is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block('to_be_not_null', 'date', 'null'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + + procedure null_number is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block('to_be_not_null', 'number', 'null'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + + procedure null_timestamp is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block('to_be_not_null', 'timestamp', 'null'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + + procedure null_timestamp_with_ltz is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block('to_be_not_null', 'timestamp with local time zone', 'null'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + + procedure null_timestamp_with_tz is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block('to_be_not_null', 'timestamp with time zone', 'null'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + + procedure null_varchar2 is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block('to_be_not_null', 'varchar2(4000)', 'null'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure null_anydata is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_block('to_be_not_null', 'anydata', 'null'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure uninit_object_in_anydata is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_object_block( + 'to_be_not_null', gc_object_name, 'null', 'object' + ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure uninit_nested_table_in_anydata is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_object_block( + 'to_be_not_null', gc_nested_table_name, 'null', 'collection' + ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure uninit_varray_in_anydata is + begin + --Act + execute immediate ut3_tester_helper.expectations_helper.unary_expectation_object_block( + 'to_be_not_null', gc_varray_name, 'null', 'collection' + ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + +end test_expect_to_be_not_null; +/ diff --git a/test/ut3_user/expectations/unary/test_expect_to_be_not_null.pks b/test/ut3_user/expectations/unary/test_expect_to_be_not_null.pks new file mode 100644 index 000000000..7cb7cc265 --- /dev/null +++ b/test/ut3_user/expectations/unary/test_expect_to_be_not_null.pks @@ -0,0 +1,97 @@ +create or replace package test_expect_to_be_not_null +is + --%suite(to_be_not_null) + --%suitepath(utplsql.test_user.expectations.unary) + + --%aftereach + procedure cleanup_expectations; + + --%beforeall + procedure create_types; + + --%afterall + procedure drop_types; + + --%test(Gives success for not null blob) + procedure blob_not_null; + + --%test(Gives success for empty blob) + procedure empty_blob; + + --%test(Gives success for not null boolean) + procedure boolean_not_null; + + --%test(Gives success for not null clob) + procedure clob_not_null; + + --%test(Gives success for empty clob) + procedure empty_clob; + + --%test(Gives success for not null date) + procedure date_not_null; + + --%test(Gives success for not null number) + procedure number_not_null; + + --%test(Gives success for not null timestamp) + procedure timestamp_not_null; + + --%test(Gives success for not null timestamp with local time zone) + procedure timestamp_with_ltz_not_null; + + --%test(Gives success for not null timestamp with time zone) + procedure timestamp_with_tz_not_null; + + --%test(Gives success for not null varchar2) + procedure varchar2_not_null; + + --%test(Gives success for initialized object within anydata) + procedure initialized_object; + + --%test(Gives success for initialized nested table within anydata) + procedure initialized_nested_table; + + --%test(Gives success for initialized varray within anydata) + procedure initialized_varray; + + --%test(Gives failure with null blob) + procedure null_blob; + + --%test(Gives failure with null boolean) + procedure null_boolean; + + --%test(Gives failure with null clob) + procedure null_clob; + + --%test(Gives failure with null date) + procedure null_date; + + --%test(Gives failure with null number) + procedure null_number; + + --%test(Gives failure null timestamp) + procedure null_timestamp; + + --%test(Gives failure with null timestamp with local time zone) + procedure null_timestamp_with_ltz; + + --%test(Gives failure with null timestamp with time zone) + procedure null_timestamp_with_tz; + + --%test(Gives failure with null varchar2) + procedure null_varchar2; + + --%test(Gives failure with null anydata) + procedure null_anydata; + + --%test(Gives failure with uninitialized object within anydata) + procedure uninit_object_in_anydata; + + --%test(Gives failure with uninitialized nested table within anydata) + procedure uninit_nested_table_in_anydata; + + --%test(Gives failure with uninitialized varray within anydata) + procedure uninit_varray_in_anydata; + +end test_expect_to_be_not_null; +/ From 30d27fedef6428c1a7d17752f2f82a3e54ef46b4 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Mon, 1 Apr 2019 19:23:27 +0100 Subject: [PATCH 0384/1096] Adding global setup --- test/install_and_run_tests.sh | 3 ++- test/install_ut3_user_tests.sql | 3 ++- test/ut3_tester/core.pkb | 2 +- test/ut3_tester_helper/main_helper.pkb | 4 ++++ test/ut3_tester_helper/main_helper.pks | 2 ++ test/ut3_user/test_user.pkb | 12 ++++++++++++ test/ut3_user/test_user.pks | 10 ++++++++++ 7 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 test/ut3_user/test_user.pkb create mode 100644 test/ut3_user/test_user.pks diff --git a/test/install_and_run_tests.sh b/test/install_and_run_tests.sh index 9f5752b5e..4359934ab 100755 --- a/test/install_and_run_tests.sh +++ b/test/install_and_run_tests.sh @@ -27,4 +27,5 @@ time utPLSQL-cli/bin/utplsql run ${UT3_TESTER_HELPER}/${UT3_TESTER_HELPER_PASSWO -f=ut_junit_reporter -o=junit_test_results.xml \ -f=ut_tfs_junit_reporter -o=tfs_test_results.xml \ -f=ut_documentation_reporter -o=test_results.log -s \ --scc +-scc \ +-q diff --git a/test/install_ut3_user_tests.sql b/test/install_ut3_user_tests.sql index 015c1573e..547fc2762 100644 --- a/test/install_ut3_user_tests.sql +++ b/test/install_ut3_user_tests.sql @@ -5,6 +5,7 @@ whenever oserror exit failure rollback alter session set plsql_optimize_level=0; prompt Install user tests +@@ut3_user/test_user.pks @@ut3_user/expectations/unary/test_expect_not_to_be_null.pks @@ut3_user/expectations/unary/test_expect_to_be_null.pks @@ut3_user/expectations/unary/test_expect_to_be_empty.pks @@ -42,7 +43,7 @@ set define on @@install_below_12_2.sql 'ut3_user/reporters/test_coverage/test_html_proftab_reporter.pks' set define off - +@@ut3_user/test_user.pkb @@ut3_user/expectations/unary/test_expect_not_to_be_null.pkb @@ut3_user/expectations/unary/test_expect_to_be_null.pkb @@ut3_user/expectations/unary/test_expect_to_be_empty.pkb diff --git a/test/ut3_tester/core.pkb b/test/ut3_tester/core.pkb index 8843c129f..64ebc0093 100644 --- a/test/ut3_tester/core.pkb +++ b/test/ut3_tester/core.pkb @@ -5,7 +5,7 @@ create or replace package body core is ut3.ut_coverage.set_develop_mode(true); --improve performance of test execution by disabling all compiler optimizations ut3_tester_helper.main_helper.execute_autonomous('ALTER SESSION SET PLSQL_OPTIMIZE_LEVEL=0'); - dbms_output.enable(null); + --dbms_output.enable(null); end; end; diff --git a/test/ut3_tester_helper/main_helper.pkb b/test/ut3_tester_helper/main_helper.pkb index ffccc3185..64dc24e8d 100644 --- a/test/ut3_tester_helper/main_helper.pkb +++ b/test/ut3_tester_helper/main_helper.pkb @@ -154,5 +154,9 @@ create or replace package body main_helper is ut3.ut_utils.append_to_list(a_list,a_items); end; + procedure output_null is + begin + dbms_output.enable(null); + end; end; / diff --git a/test/ut3_tester_helper/main_helper.pks b/test/ut3_tester_helper/main_helper.pks index 7d349151c..e3b9f11bf 100644 --- a/test/ut3_tester_helper/main_helper.pks +++ b/test/ut3_tester_helper/main_helper.pks @@ -45,5 +45,7 @@ create or replace package main_helper is procedure append_to_list(a_list in out nocopy ut3.ut_varchar2_rows, a_items ut3.ut_varchar2_rows); + procedure output_null; + end; / diff --git a/test/ut3_user/test_user.pkb b/test/ut3_user/test_user.pkb new file mode 100644 index 000000000..36ed8e898 --- /dev/null +++ b/test/ut3_user/test_user.pkb @@ -0,0 +1,12 @@ +create or replace package body test_user is + + procedure global_setup is + begin + ut3.ut_coverage.set_develop_mode(true); + --improve performance of test execution by disabling all compiler optimizations + ut3_tester_helper.main_helper.execute_autonomous('ALTER SESSION SET PLSQL_OPTIMIZE_LEVEL=0'); + --dbms_output.enable(null); + end; + +end; +/ diff --git a/test/ut3_user/test_user.pks b/test/ut3_user/test_user.pks new file mode 100644 index 000000000..ea0435efd --- /dev/null +++ b/test/ut3_user/test_user.pks @@ -0,0 +1,10 @@ +create or replace package test_user is + + --%suite + --%suitepath(utplsql) + + --%beforeall + procedure global_setup; + +end; +/ From 4643b14a80bf1788bb5e990484efe50901980e7d Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Tue, 2 Apr 2019 11:46:50 +0200 Subject: [PATCH 0385/1096] document how to avoid Oracle Bug 14402514 (see #891) --- docs/userguide/expectations.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index a459454f2..5b8a3b08f 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -272,7 +272,9 @@ begin end; ``` -Parameters `a_mask` and `a_escape_char` represent valid parameters of the [Oracle LIKE condition](https://docs.oracle.com/database/121/SQLRF/conditions007.htm#SQLRF52142) +Parameters `a_mask` and `a_escape_char` represent valid parameters of the [Oracle LIKE condition](https://docs.oracle.com/database/121/SQLRF/conditions007.htm#SQLRF52142). + +If you use Oracle Database version 11.2.0.4, you may run into Oracle Bug 14402514: WRONG RESULTS WITH LIKE ON CLOB USING ESCAPE CHARACTER. In this case we recommend to use `match` instead of `be_like`. ## be_not_null From 675ba70f05ebd9ff367f85d6a27bf9459a628130 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Tue, 2 Apr 2019 11:49:33 +0200 Subject: [PATCH 0386/1096] Fixes #891 - use to_match instead of to_be_like to avoid Oracle bug 14402514 on some 11.2.0.4 instances --- test/core/test_suite_builder.pkb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/core/test_suite_builder.pkb b/test/core/test_suite_builder.pkb index bd76e88d8..e6d21d969 100644 --- a/test/core/test_suite_builder.pkb +++ b/test/core/test_suite_builder.pkb @@ -608,11 +608,11 @@ create or replace package body test_suite_builder is --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); --Assert - ut.expect(l_actual).to_be_like('%%Annotation "--\%beforeall"%line 2%%', '\'); - ut.expect(l_actual).to_be_like('%%Annotation "--\%beforeeach"%line 3%%', '\'); - ut.expect(l_actual).to_be_like('%%Annotation "--\%aftereach"%line 4%%', '\'); - ut.expect(l_actual).to_be_like('%%Annotation "--\%afterall" cannot be used with "--\%test". Annotation ignored.' - ||'%at "UT3_TESTER.SOME_PACKAGE.DO_STUFF", line 5%%', '\'); + ut.expect(l_actual).to_match('(.*)()(.*)(Annotation "--%beforeall")(.*)(line 2)(.*)()(.*)', 'n'); + ut.expect(l_actual).to_match('(.*)()(.*)(Annotation "--%beforeeach")(.*)(line 3)(.*)()(.*)', 'n'); + ut.expect(l_actual).to_match('(.*)()(.*)(Annotation "--%aftereach")(.*)(line 4)(.*)()(.*)', 'n'); + ut.expect(l_actual).to_match('(.*)()(.*)(Annotation "--%afterall" cannot be used with "--%test". Annotation ignored.)' + ||'(.*)(at "UT3_TESTER.SOME_PACKAGE.DO_STUFF", line 5)(.*)()(.*)', 'n'); ut.expect(l_actual).not_to_be_like('%%'); ut.expect(l_actual).not_to_be_like('%%'); ut.expect(l_actual).not_to_be_like('%%'); @@ -1095,7 +1095,7 @@ create or replace package body test_suite_builder is --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); --Assert - ut.expect(l_actual).to_be_like('%Unsupported annotation "--\%bad_procedure_annotation". Annotation ignored.% line 2%', '\'); + ut.expect(l_actual).to_match('(.*)(Unsupported annotation "--%bad_procedure_annotation"\. Annotation ignored\.)(.*)( line 2)(.*)', 'n'); end; procedure test_bad_package_annotation is @@ -1111,7 +1111,7 @@ create or replace package body test_suite_builder is --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); --Assert - ut.expect(l_actual).to_be_like('%Unsupported annotation "--\%bad_package_annotation". Annotation ignored.% line 17%', '\'); + ut.expect(l_actual).to_match('(.*)(Unsupported annotation "--%bad_package_annotation"\. Annotation ignored\.)(.*)( line 17)(.*)', 'n'); end; end test_suite_builder; From 2381ee8723d5b21bae2d173475ed5fedb85873ea Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 2 Apr 2019 12:14:27 +0000 Subject: [PATCH 0387/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 03f149495..9613c0ccb 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index e1fe1c15a..38898c478 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 8ac4f4486..c1f13d055 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 1e9f3680f..f9241b331 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 5d7d5f7b2..7f545ebde 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 9a3392eff..736d81696 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 803234e70..bd0e2383b 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index f6324861d..298ca67b6 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index c0f5feeea..bd72c4451 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index e7ea43f26..da2f06335 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 5b8a3b08f..81f7c86af 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 95c362c4d..83764eab3 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index bbe6603ab..799807d0a 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 4ea2e541e..b6e5d6024 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index d14ccc24d..d0bf7606b 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index d7b82ee17..d12f81294 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index cc5b920ec..4cff7f4b5 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2795--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index aecebc93f..35cdbd07c 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.7.2795-develop'; + gc_version constant varchar2(50) := 'v3.1.7.2803-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 5d3b18c35238eb38a8c468bc7d209076254276a2 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Tue, 2 Apr 2019 17:25:42 +0100 Subject: [PATCH 0388/1096] Update cleanup script after branching from random order branch --- development/cleanup.sh | 4 ++-- development/template.env.sh | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/development/cleanup.sh b/development/cleanup.sh index fb0415ed1..313e382ca 100755 --- a/development/cleanup.sh +++ b/development/cleanup.sh @@ -26,12 +26,12 @@ drop user ${UT3_USER} cascade; begin for i in ( - select decode(owner,'PUBLIC','drop public synonym "','drop synonym "'||owner||'"."')|| synonym_name ||'"' drop_orphaned_synonym from dba_synonyms a + select decode(owner,'PUBLIC','drop public synonym "','drop synonym "'||owner||'"."')|| synonym_name ||'"' drop_orphaned_synonym, owner||'.'||synonym_name syn from dba_synonyms a where not exists (select 1 from dba_objects b where (a.table_name=b.object_name and a.table_owner=b.owner or b.owner='SYS' and a.table_owner=b.object_name) ) and a.table_owner not in ('SYS','SYSTEM') ) loop - dbms_output.put_line(i.drop_orphaned_synonym); execute immediate i.drop_orphaned_synonym; + dbms_output.put_line('synonym '||i.syn||' dropped'); end loop; end; / diff --git a/development/template.env.sh b/development/template.env.sh index 285b60577..54497cc30 100755 --- a/development/template.env.sh +++ b/development/template.env.sh @@ -18,5 +18,3 @@ export UT3_TESTER_HELPER_PASSWORD=ut3 export UT3_TABLESPACE=users export UT3_USER="UT3\$USER#" export UT3_USER_PASSWORD=ut3 -export UT3_TESTER_HELPER=ut3_tester_helper -export UT3_TESTER_HELPER_PASSWORD=ut3 From b56d27adfcd2ecae307665727a35c3ee9ef41171 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 3 Apr 2019 09:45:47 +0100 Subject: [PATCH 0389/1096] Fixed invalid suitepath in `core` package. Updated cli version to 3.1.6 Added top package `utplsql` with dbms_output.enable for both test users. Renamed suitepath to match username (ut3_tester) --- .travis.yml | 2 +- development/template.env.sh | 2 +- test/common_helper/utplsql.pkb | 11 +++++++++++ test/common_helper/utplsql.pks | 9 +++++++++ test/install_and_run_tests.sh | 3 +-- test/install_ut3_tester_tests.sql | 2 ++ test/install_ut3_user_tests.sql | 3 +++ test/ut3_tester/core.pkb | 6 +----- test/ut3_tester/core.pks | 2 +- .../core/annotations/test_annot_throws_exception.pks | 2 +- .../core/annotations/test_annotation_manager.pks | 2 +- .../core/annotations/test_annotation_parser.pks | 2 +- .../annotations/test_before_after_annotations.pks | 2 +- .../core/expectations/test_expectation_processor.pks | 2 +- test/ut3_tester/core/test_file_mapper.pks | 2 +- test/ut3_tester/core/test_output_buffer.pks | 2 +- test/ut3_tester/core/test_suite_builder.pks | 2 +- test/ut3_tester/core/test_suite_manager.pks | 2 +- test/ut3_tester/core/test_ut_executable.pks | 2 +- test/ut3_tester/core/test_ut_suite.pks | 2 +- test/ut3_tester/core/test_ut_test.pks | 2 +- test/ut3_tester/core/test_ut_utils.pks | 2 +- test/ut3_tester_helper/main_helper.pkb | 4 ---- test/ut3_tester_helper/main_helper.pks | 2 -- test/ut3_user/api/test_ut_runner.pkb | 11 +++++++---- test/ut3_user/test_user.pkb | 1 - 26 files changed, 50 insertions(+), 34 deletions(-) create mode 100644 test/common_helper/utplsql.pkb create mode 100644 test/common_helper/utplsql.pks diff --git a/.travis.yml b/.travis.yml index f23501e05..af8a07cee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,7 +47,7 @@ env: #utPLSQL released version directory - UTPLSQL_DIR="utPLSQL_latest_release" - SELFTESTING_BRANCH=${TRAVIS_BRANCH} - - UTPLSQL_CLI_VERSION="3.1.0" + - UTPLSQL_CLI_VERSION="3.1.6" # Maven - MAVEN_HOME=/usr/local/maven - MAVEN_CFG=$HOME/.m2 diff --git a/development/template.env.sh b/development/template.env.sh index 54497cc30..ab4f4efa2 100755 --- a/development/template.env.sh +++ b/development/template.env.sh @@ -4,7 +4,7 @@ export SQLCLI=sql # For sqlcl client #export SQLCLI=sqlplus # For sqlplus client export CONNECTION_STR=127.0.0.1:1521/xe # Adjust the connect string export ORACLE_PWD=oracle # Adjust your local SYS password -export UTPLSQL_CLI_VERSION="3.1.0" +export UTPLSQL_CLI_VERSION="3.1.6" export SELFTESTING_BRANCH=develop export UTPLSQL_DIR="utPLSQL_latest_release" diff --git a/test/common_helper/utplsql.pkb b/test/common_helper/utplsql.pkb new file mode 100644 index 000000000..c752caa41 --- /dev/null +++ b/test/common_helper/utplsql.pkb @@ -0,0 +1,11 @@ +create or replace package body utplsql is + + procedure global_setup is + begin + --we need to have dbms_output enable for our tests + --TODO - move this to utPLSQL-cli once cli has support for it. + dbms_output.enable(null); + end; + +end; +/ diff --git a/test/common_helper/utplsql.pks b/test/common_helper/utplsql.pks new file mode 100644 index 000000000..51adbb117 --- /dev/null +++ b/test/common_helper/utplsql.pks @@ -0,0 +1,9 @@ +create or replace package utplsql is + + --%suite + + --%beforeall + procedure global_setup; + +end; +/ diff --git a/test/install_and_run_tests.sh b/test/install_and_run_tests.sh index 983b20b96..be7857346 100755 --- a/test/install_and_run_tests.sh +++ b/test/install_and_run_tests.sh @@ -26,5 +26,4 @@ time utPLSQL-cli/bin/utplsql run ${UT3_TESTER_HELPER}/${UT3_TESTER_HELPER_PASSWO -f=ut_sonar_test_reporter -o=test_results.xml \ -f=ut_junit_reporter -o=junit_test_results.xml \ -f=ut_tfs_junit_reporter -o=tfs_test_results.xml \ --f=ut_documentation_reporter -o=test_results.log -s \ --scc +-f=ut_documentation_reporter -o=test_results.log -s diff --git a/test/install_ut3_tester_tests.sql b/test/install_ut3_tester_tests.sql index 1d4155c3d..6b3a5356c 100644 --- a/test/install_ut3_tester_tests.sql +++ b/test/install_ut3_tester_tests.sql @@ -4,6 +4,8 @@ whenever oserror exit failure rollback alter session set plsql_optimize_level=0; +@@common_helper/utplsql.pks +@@common_helper/utplsql.pkb --Install tests @@ut3_tester/core.pks diff --git a/test/install_ut3_user_tests.sql b/test/install_ut3_user_tests.sql index 547fc2762..67014f815 100644 --- a/test/install_ut3_user_tests.sql +++ b/test/install_ut3_user_tests.sql @@ -4,6 +4,9 @@ whenever oserror exit failure rollback alter session set plsql_optimize_level=0; +@@common_helper/utplsql.pks +@@common_helper/utplsql.pkb + prompt Install user tests @@ut3_user/test_user.pks @@ut3_user/expectations/unary/test_expect_not_to_be_null.pks diff --git a/test/ut3_tester/core.pkb b/test/ut3_tester/core.pkb index 8038bf236..505388a8f 100644 --- a/test/ut3_tester/core.pkb +++ b/test/ut3_tester/core.pkb @@ -1,14 +1,10 @@ create or replace package body core is - procedure global_setup is + procedure global_setup is begin ut3.ut_coverage.set_develop_mode(true); --improve performance of test execution by disabling all compiler optimizations ut3_tester_helper.main_helper.execute_autonomous('ALTER SESSION SET PLSQL_OPTIMIZE_LEVEL=0'); - dbms_output.enable(null); - - --trn on helper output - ut3_tester_helper.main_helper.output_null; end; end; diff --git a/test/ut3_tester/core.pks b/test/ut3_tester/core.pks index 0edf2ae54..4565c47f3 100644 --- a/test/ut3_tester/core.pks +++ b/test/ut3_tester/core.pks @@ -1,7 +1,7 @@ create or replace package core is --%suite - --%suitepath(utplsql) + --%suitepath(utplsql.ut3_tester) --%beforeall procedure global_setup; diff --git a/test/ut3_tester/core/annotations/test_annot_throws_exception.pks b/test/ut3_tester/core/annotations/test_annot_throws_exception.pks index 6c2df63b1..ce2e6ba7a 100644 --- a/test/ut3_tester/core/annotations/test_annot_throws_exception.pks +++ b/test/ut3_tester/core/annotations/test_annot_throws_exception.pks @@ -1,7 +1,7 @@ create or replace package test_annot_throws_exception is --%suite(annotations - throws) - --%suitepath(utplsql.framework_tester.core.annotations) + --%suitepath(utplsql.ut3_tester.core.annotations) --%beforeall procedure recollect_tests_results; diff --git a/test/ut3_tester/core/annotations/test_annotation_manager.pks b/test/ut3_tester/core/annotations/test_annotation_manager.pks index b40965c74..b2f351a6f 100644 --- a/test/ut3_tester/core/annotations/test_annotation_manager.pks +++ b/test/ut3_tester/core/annotations/test_annotation_manager.pks @@ -1,7 +1,7 @@ create or replace package test_annotation_manager is --%suite(ut_annotation_manager) - --%suitepath(utplsql.framework_tester.core.annotations) + --%suitepath(utplsql.ut3_tester.core.annotations) --%aftereach procedure cleanup_annotation_cache; diff --git a/test/ut3_tester/core/annotations/test_annotation_parser.pks b/test/ut3_tester/core/annotations/test_annotation_parser.pks index bfd06c7b9..a4fe3ed70 100644 --- a/test/ut3_tester/core/annotations/test_annotation_parser.pks +++ b/test/ut3_tester/core/annotations/test_annotation_parser.pks @@ -1,7 +1,7 @@ create or replace package test_annotation_parser is --%suite(ut_annotation_parser) - --%suitepath(utplsql.framework_tester.core.annotations) + --%suitepath(utplsql.ut3_tester.core.annotations) --%test(Treats procedure level annotations as package level, if mixed with comments) procedure test_proc_comments; diff --git a/test/ut3_tester/core/annotations/test_before_after_annotations.pks b/test/ut3_tester/core/annotations/test_before_after_annotations.pks index 1a0a2ebaf..062efff48 100644 --- a/test/ut3_tester/core/annotations/test_before_after_annotations.pks +++ b/test/ut3_tester/core/annotations/test_before_after_annotations.pks @@ -1,7 +1,7 @@ create or replace package test_before_after_annotations is --%suite(annotations - beforetest and aftertest) - --%suitepath(utplsql.framework_tester.core.annotations) + --%suitepath(utplsql.ut3_tester.core.annotations) subtype t_procedure_name is varchar2(250) not null; type t_procedures is table of t_procedure_name; diff --git a/test/ut3_tester/core/expectations/test_expectation_processor.pks b/test/ut3_tester/core/expectations/test_expectation_processor.pks index c6f80f20d..5b63c8938 100644 --- a/test/ut3_tester/core/expectations/test_expectation_processor.pks +++ b/test/ut3_tester/core/expectations/test_expectation_processor.pks @@ -1,7 +1,7 @@ create or replace package test_expectation_processor is --%suite(expectation_processor) - --%suitepath(utplsql.framework_tester.core.expectations) + --%suitepath(utplsql.ut3_tester.core.expectations) --%context(who_called_expectation) diff --git a/test/ut3_tester/core/test_file_mapper.pks b/test/ut3_tester/core/test_file_mapper.pks index 4f9c41bd0..b2443766c 100644 --- a/test/ut3_tester/core/test_file_mapper.pks +++ b/test/ut3_tester/core/test_file_mapper.pks @@ -1,7 +1,7 @@ create or replace package test_file_mapper is --%suite(file_mapper) - --%suitepath(utplsql.framework_tester.core) + --%suitepath(utplsql.ut3_tester.core) --%test(Maps file paths into database objects using default mappings) procedure default_mappings; diff --git a/test/ut3_tester/core/test_output_buffer.pks b/test/ut3_tester/core/test_output_buffer.pks index cf069427d..9a4cfa68a 100644 --- a/test/ut3_tester/core/test_output_buffer.pks +++ b/test/ut3_tester/core/test_output_buffer.pks @@ -1,7 +1,7 @@ create or replace package test_output_buffer is --%suite(output_buffer) - --%suitepath(utplsql.framework_tester.core) + --%suitepath(utplsql.ut3_tester.core) --%test(Receives a line from buffer table and deletes) procedure test_receive; diff --git a/test/ut3_tester/core/test_suite_builder.pks b/test/ut3_tester/core/test_suite_builder.pks index bae124e3e..5715cfd85 100644 --- a/test/ut3_tester/core/test_suite_builder.pks +++ b/test/ut3_tester/core/test_suite_builder.pks @@ -1,6 +1,6 @@ create or replace package test_suite_builder is --%suite(suite_builder) - --%suitepath(utplsql.framework_tester.core) + --%suitepath(utplsql.ut3_tester.core) --%context(suite) --%displayname(--%suite annotation) diff --git a/test/ut3_tester/core/test_suite_manager.pks b/test/ut3_tester/core/test_suite_manager.pks index 43f288224..ed318b890 100644 --- a/test/ut3_tester/core/test_suite_manager.pks +++ b/test/ut3_tester/core/test_suite_manager.pks @@ -1,7 +1,7 @@ create or replace package test_suite_manager is --%suite(suite_manager) - --%suitepath(utplsql.framework_tester.core) + --%suitepath(utplsql.ut3_tester.core) procedure create_dummy_long_test_package; diff --git a/test/ut3_tester/core/test_ut_executable.pks b/test/ut3_tester/core/test_ut_executable.pks index acb91d1be..882f0f209 100644 --- a/test/ut3_tester/core/test_ut_executable.pks +++ b/test/ut3_tester/core/test_ut_executable.pks @@ -1,7 +1,7 @@ create or replace package test_ut_executable is --%suite(ut_executable) - --%suitepath(utplsql.framework_tester.core) + --%suitepath(utplsql.ut3_tester.core) --%context(do_execute) diff --git a/test/ut3_tester/core/test_ut_suite.pks b/test/ut3_tester/core/test_ut_suite.pks index fd351d87f..385d00fc7 100644 --- a/test/ut3_tester/core/test_ut_suite.pks +++ b/test/ut3_tester/core/test_ut_suite.pks @@ -1,7 +1,7 @@ create or replace package test_ut_suite is --%suite(ut_suite) - --%suitepath(utplsql.core.framework_tester) + --%suitepath(utplsql.ut3_tester.core) --%beforeeach procedure cleanup_package_state; diff --git a/test/ut3_tester/core/test_ut_test.pks b/test/ut3_tester/core/test_ut_test.pks index a2b0fd4f5..18ea6613f 100644 --- a/test/ut3_tester/core/test_ut_test.pks +++ b/test/ut3_tester/core/test_ut_test.pks @@ -1,7 +1,7 @@ create or replace package test_ut_test is --%suite(ut_test) - --%suitepath(utplsql.framework_tester.core) + --%suitepath(utplsql.ut3_tester.core) --%beforeeach procedure cleanup_package_state; diff --git a/test/ut3_tester/core/test_ut_utils.pks b/test/ut3_tester/core/test_ut_utils.pks index ecc2596c5..d8fca3b60 100644 --- a/test/ut3_tester/core/test_ut_utils.pks +++ b/test/ut3_tester/core/test_ut_utils.pks @@ -1,7 +1,7 @@ create or replace package test_ut_utils is --%suite(ut_utils) - --%suitepath(utplsql.framework_tester.core) + --%suitepath(utplsql.ut3_tester.core) function get_numeric_delimiter return varchar2; diff --git a/test/ut3_tester_helper/main_helper.pkb b/test/ut3_tester_helper/main_helper.pkb index 64dc24e8d..ffccc3185 100644 --- a/test/ut3_tester_helper/main_helper.pkb +++ b/test/ut3_tester_helper/main_helper.pkb @@ -154,9 +154,5 @@ create or replace package body main_helper is ut3.ut_utils.append_to_list(a_list,a_items); end; - procedure output_null is - begin - dbms_output.enable(null); - end; end; / diff --git a/test/ut3_tester_helper/main_helper.pks b/test/ut3_tester_helper/main_helper.pks index e3b9f11bf..7d349151c 100644 --- a/test/ut3_tester_helper/main_helper.pks +++ b/test/ut3_tester_helper/main_helper.pks @@ -45,7 +45,5 @@ create or replace package main_helper is procedure append_to_list(a_list in out nocopy ut3.ut_varchar2_rows, a_items ut3.ut_varchar2_rows); - procedure output_null; - end; / diff --git a/test/ut3_user/api/test_ut_runner.pkb b/test/ut3_user/api/test_ut_runner.pkb index 0c47248bd..298c15c2a 100644 --- a/test/ut3_user/api/test_ut_runner.pkb +++ b/test/ut3_user/api/test_ut_runner.pkb @@ -69,6 +69,7 @@ end;'; procedure close_newly_opened_transaction is l_output_data dbms_output.chararr; l_num_lines integer := 100000; + pragma autonomous_transaction; begin --Arrange create_test_spec(); @@ -285,12 +286,13 @@ end;'; end; procedure db_link_cleanup is - begin - ut3_tester_helper.run_helper.db_link_cleanup(); - end; + pragma autonomous_transaction; + begin + ut3_tester_helper.run_helper.db_link_cleanup(); + end; procedure db_link_setup is - l_service_name varchar2(100); + pragma autonomous_transaction; begin ut3_tester_helper.run_helper.db_link_setup(); end; @@ -298,6 +300,7 @@ end;'; procedure raises_20213_on_fail_link is l_reporter ut3.ut_documentation_reporter := ut3.ut_documentation_reporter(); l_lines ut3.ut_varchar2_list; + pragma autonomous_transaction; begin --Arrange --Act diff --git a/test/ut3_user/test_user.pkb b/test/ut3_user/test_user.pkb index 07db53ede..ca84a1c69 100644 --- a/test/ut3_user/test_user.pkb +++ b/test/ut3_user/test_user.pkb @@ -5,7 +5,6 @@ create or replace package body test_user is ut3.ut_coverage.set_develop_mode(true); --improve performance of test execution by disabling all compiler optimizations ut3_tester_helper.main_helper.execute_autonomous('ALTER SESSION SET PLSQL_OPTIMIZE_LEVEL=0'); - --dbms_output.enable(null); end; end; From 67be0f46753d141dc74c2447bec34775bf24795f Mon Sep 17 00:00:00 2001 From: Travis CI Date: Wed, 3 Apr 2019 09:39:39 +0000 Subject: [PATCH 0390/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 9613c0ccb..40700d995 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 38898c478..534a12ddf 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index c1f13d055..9d003f57b 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index f9241b331..e3787fa89 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 7f545ebde..8cee8860a 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 736d81696..c2e24a6d5 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index bd0e2383b..15e5394c7 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 298ca67b6..b5a5a4dcd 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index bd72c4451..7793b7b73 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index da2f06335..5ff9eca9c 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 81f7c86af..d6508f9d0 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 83764eab3..79fc7caf8 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 799807d0a..7a982043c 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index b6e5d6024..f55cbce7d 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index d0bf7606b..b46a97080 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index d12f81294..951fdfa82 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 4cff7f4b5..7aff312bf 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2803--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 35cdbd07c..1e5588f7d 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.7.2803-develop'; + gc_version constant varchar2(50) := 'v3.1.7.2808-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 90eb8c9109e471a6cf4ade7da30b511d2472537d Mon Sep 17 00:00:00 2001 From: lwasylow Date: Thu, 4 Apr 2019 08:37:06 +0100 Subject: [PATCH 0391/1096] Cursor error handling --- source/core/ut_utils.pkb | 8 ++++ source/core/ut_utils.pks | 5 +++ .../data_values/ut_data_value_refcursor.tpb | 3 +- .../expectations/test_expectations_cursor.pkb | 43 +++---------------- .../expectations/test_expectations_cursor.pks | 5 +-- 5 files changed, 22 insertions(+), 42 deletions(-) diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 830369349..dce71a1cb 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -750,5 +750,13 @@ create or replace package body ut_utils is return l_caller_stack_line; end; + function create_err_cursor_msg(a_error_stack varchar2) return varchar2 is + begin + return 'SQL exception thrown when fetching data from cursor: '|| + remove_error_from_stack(sqlerrm,-19202)||chr(10)|| + ut_expectation_processor.who_called_expectation(a_error_stack)||chr(10)|| + 'Check the query and data for errors.'; + end; + end ut_utils; / diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 45b49e965..f47fdcca1 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -113,6 +113,10 @@ create or replace package ut_utils authid definer is gc_xml_processing constant pls_integer := -19202; pragma exception_init (ex_xml_processing, -19202); + ex_failed_open_cur exception; + gc_failed_open_cur constant pls_integer := -20218; + pragma exception_init (ex_failed_open_cur, -20218); + gc_max_storage_varchar2_len constant integer := 4000; gc_max_output_string_length constant integer := 4000; gc_more_data_string constant varchar2(5) := '[...]'; @@ -378,6 +382,7 @@ create or replace package ut_utils authid definer is */ function remove_error_from_stack(a_error_stack varchar2, a_ora_code number) return varchar2; + function create_err_cursor_msg(a_error_stack varchar2) return varchar2; end ut_utils; / diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 26a820fb7..5c40e49d5 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -100,8 +100,7 @@ create or replace type body ut_data_value_refcursor as if l_cursor%isopen then close l_cursor; end if; - ut_expectation_processor.report_failure_no_caller('SQL exception thrown when fetching data from cursor: '|| - ut_utils.remove_error_from_stack(sqlerrm,-19202)||chr(10)||'Check the query and data for errors.'); + raise_application_error(ut_utils.gc_failed_open_cur,ut_utils.create_err_cursor_msg(dbms_utility.format_call_stack())); when others then if l_cursor%isopen then close l_cursor; diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index ed7dd5479..bd3fbe78e 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -2484,9 +2484,9 @@ Diff:% ut3.ut.expect(v_actual).to_equal(v_expected); --Assert - l_expected_message := q'[%SQL exception thrown when fetching data from cursor:% + l_expected_message := q'[%ORA-20218: SQL exception thrown when fetching data from cursor: %ORA-01722: invalid number% -%Check the query and data for errors.]'; +at%ut.expect(v_actual).to_equal(v_expected)%]'; l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; --Assert @@ -2494,50 +2494,21 @@ Diff:% end; procedure xml_error_expected is - c_price CONSTANT NUMBER(20,4):= 1357; - c_user CONSTANT varchar2(30):= 'TEST_USER'; v_actual sys_refcursor; v_expected sys_refcursor; l_expected_message varchar2(32767); l_actual_message varchar2(32767); begin open v_expected for - select cast(null as number(10)) as usd_price_amt, c_user as update_id - from dual where dummy = 1; - open v_actual for - select c_price as usd_price_amt, c_user as update_id from dual; - - ut3.ut.expect(v_actual).to_equal(v_expected); - --Assert - l_expected_message := q'[%SQL exception thrown when fetching data from cursor:% -%ORA-01722: invalid number% -%Check the query and data for errors.]'; - - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); - end; - - procedure xml_error_both is - c_price CONSTANT NUMBER(20,4):= 1357; - c_user CONSTANT varchar2(30):= 'TEST_USER'; - v_actual sys_refcursor; - v_expected sys_refcursor; - l_expected_message varchar2(32767); - l_actual_message varchar2(32767); - begin + select 1/0 as test from dual; open v_actual for - select cast(null as number(10)) as usd_price_amt, c_user as update_id - from dual where dummy = 1; - open v_expected for - select cast(null as number(10)) as usd_price_amt, c_user as update_id - from dual where dummy = 1; + select 1 as test from dual; ut3.ut.expect(v_actual).to_equal(v_expected); --Assert - l_expected_message := q'[%SQL exception thrown when fetching data from cursor:% -%ORA-01722: invalid number% -%Check the query and data for errors.]'; + l_expected_message := q'[%ORA-20218: SQL exception thrown when fetching data from cursor: +%ORA-01476: divisor is equal to zero% +%at % ut.expect(v_actual).to_equal(v_expected)%]'; l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; --Assert diff --git a/test/core/expectations/test_expectations_cursor.pks b/test/core/expectations/test_expectations_cursor.pks index 26605addd..b6f1345a8 100644 --- a/test/core/expectations/test_expectations_cursor.pks +++ b/test/core/expectations/test_expectations_cursor.pks @@ -396,9 +396,6 @@ create or replace package test_expectations_cursor is --%test(Fail to process a cursor for expected) procedure xml_error_expected; - - --%test(Fail to process a cursor for both) - procedure xml_error_both; - + end; / From b56b8efd81a2ee731822cec13f0ad882f5f8b550 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Thu, 4 Apr 2019 13:37:19 +0100 Subject: [PATCH 0392/1096] Update tests for handling usr friendly error --- source/core/ut_utils.pkb | 8 +--- source/core/ut_utils.pks | 4 +- .../data_values/ut_compound_data_helper.pkb | 8 ++++ .../data_values/ut_compound_data_helper.pks | 2 + .../data_values/ut_data_value_refcursor.tpb | 3 +- .../expectations/test_expectations_cursor.pkb | 43 +++++++------------ 6 files changed, 29 insertions(+), 39 deletions(-) diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index dce71a1cb..25ef3fb3f 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -750,13 +750,7 @@ create or replace package body ut_utils is return l_caller_stack_line; end; - function create_err_cursor_msg(a_error_stack varchar2) return varchar2 is - begin - return 'SQL exception thrown when fetching data from cursor: '|| - remove_error_from_stack(sqlerrm,-19202)||chr(10)|| - ut_expectation_processor.who_called_expectation(a_error_stack)||chr(10)|| - 'Check the query and data for errors.'; - end; + end ut_utils; / diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 8fb232a1b..a7a5718ed 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -381,8 +381,6 @@ create or replace package ut_utils authid definer is * Remove given ORA error from stack */ function remove_error_from_stack(a_error_stack varchar2, a_ora_code number) return varchar2; - - function create_err_cursor_msg(a_error_stack varchar2) return varchar2; - + end ut_utils; / diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 5ac8a4546..859213722 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -595,6 +595,14 @@ create or replace package body ut_compound_data_helper is open l_diff_cursor for a_diff_cursor_text using a_self_id, a_other_id; return l_diff_cursor; end; + + function create_err_cursor_msg(a_error_stack varchar2) return varchar2 is + begin + return 'SQL exception thrown when fetching data from cursor: '|| + ut_utils.remove_error_from_stack(sqlerrm,-19202)||chr(10)|| + ut_expectation_processor.who_called_expectation(a_error_stack)|| + 'Check the query and data for errors.'; + end; begin g_anytype_name_map(dbms_types.typecode_date) := 'DATE'; diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index bf3182500..62d5c8a27 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -92,5 +92,7 @@ create or replace package ut_compound_data_helper authid definer is function get_compare_cursor(a_diff_cursor_text in clob,a_self_id raw, a_other_id raw) return sys_refcursor; + function create_err_cursor_msg(a_error_stack varchar2) return varchar2; + end; / diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 7f157b5ad..23dca3dcf 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -100,7 +100,8 @@ create or replace type body ut_data_value_refcursor as if l_cursor%isopen then close l_cursor; end if; - raise_application_error(ut_utils.gc_failed_open_cur,ut_utils.create_err_cursor_msg(dbms_utility.format_call_stack())); + raise_application_error(ut_utils.gc_failed_open_cur, + ut_compound_data_helper.create_err_cursor_msg(dbms_utility.format_call_stack())); when others then if l_cursor%isopen then close l_cursor; diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index 29d9b7819..0cf37e63a 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -972,21 +972,16 @@ Rows: [ 4 differences ] procedure reports_on_exception_in_cursor as l_actual sys_refcursor; - l_expected_message varchar2(32767); - l_actual_message varchar2(32767); begin --Act open l_actual for select 1/0 as error_column from dual connect by level < 10; ut3.ut.expect(l_actual).to_be_empty(); - --Assert - --Assert - l_expected_message := q'[%SQL exception thrown when fetching data from cursor:% -%ORA-01476: divisor is equal to zero% -%Check the query and data for errors.]'; - l_actual_message := ut3.ut_expectation_processor.get_failed_expectations()(1).message; - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); + ut.fail('Expected exception on cursor fetch'); + exception + when others then + ut.expect(sqlerrm).to_be_like('%ORA-20218: SQL exception thrown when fetching data from cursor:% +%ORA-01476: divisor is equal to zero%Check the query and data for errors%'); end; procedure exception_when_closed_cursor @@ -2531,8 +2526,6 @@ Diff:% c_user CONSTANT varchar2(30):= 'TEST_USER'; v_actual sys_refcursor; v_expected sys_refcursor; - l_expected_message varchar2(32767); - l_actual_message varchar2(32767); begin open v_actual for select cast(null as number(10)) as usd_price_amt, c_user as update_id @@ -2541,21 +2534,17 @@ Diff:% select c_price as usd_price_amt, c_user as update_id from dual; ut3.ut.expect(v_actual).to_equal(v_expected); - --Assert - l_expected_message := q'[%ORA-20218: SQL exception thrown when fetching data from cursor: -%ORA-01722: invalid number% -at%ut.expect(v_actual).to_equal(v_expected)%]'; - l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); + ut.fail('Expected exception on cursor fetch'); + exception + when others then + ut.expect(sqlerrm).to_be_like('%ORA-20218: SQL exception thrown when fetching data from cursor:% +%ORA-01722: invalid number%%Check the query and data for errors%'); end; procedure xml_error_expected is v_actual sys_refcursor; v_expected sys_refcursor; - l_expected_message varchar2(32767); - l_actual_message varchar2(32767); begin open v_expected for select 1/0 as test from dual; @@ -2563,14 +2552,12 @@ at%ut.expect(v_actual).to_equal(v_expected)%]'; select 1 as test from dual; ut3.ut.expect(v_actual).to_equal(v_expected); - --Assert - l_expected_message := q'[%ORA-20218: SQL exception thrown when fetching data from cursor: -%ORA-01476: divisor is equal to zero% -%at % ut.expect(v_actual).to_equal(v_expected)%]'; - l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); + ut.fail('Expected exception on cursor fetch'); + exception + when others then + ut.expect(sqlerrm).to_be_like('%ORA-20218: SQL exception thrown when fetching data from cursor:% +%ORA-01476: divisor is equal to zero%Check the query and data for errors%'); end; end; From 8c64d78153e01920942c9e565b499e85f9b46b43 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 5 Apr 2019 09:13:40 +0100 Subject: [PATCH 0393/1096] Applying fixes as per PR review. Removal of unused procedure from expactation_processor Switch to use constant in error message creation Update tests to match full message. --- source/core/ut_expectation_processor.pkb | 5 --- source/core/ut_expectation_processor.pks | 2 - .../data_values/ut_compound_data_helper.pkb | 2 +- .../expectations/test_expectations_cursor.pkb | 42 ++++++++++++------- 4 files changed, 28 insertions(+), 23 deletions(-) diff --git a/source/core/ut_expectation_processor.pkb b/source/core/ut_expectation_processor.pkb index 22dc9000f..e961ca908 100644 --- a/source/core/ut_expectation_processor.pkb +++ b/source/core/ut_expectation_processor.pkb @@ -89,11 +89,6 @@ create or replace package body ut_expectation_processor as add_expectation_result(ut_expectation_result(ut_utils.gc_failure, null, a_message)); end; - procedure report_failure_no_caller(a_message in varchar2) is - begin - add_expectation_result(ut_expectation_result(ut_utils.gc_failure, null, a_message,false)); - end; - function get_session_parameters return tt_nls_params is l_session_params tt_nls_params; begin diff --git a/source/core/ut_expectation_processor.pks b/source/core/ut_expectation_processor.pks index 017b6aaba..ab3b70f76 100644 --- a/source/core/ut_expectation_processor.pks +++ b/source/core/ut_expectation_processor.pks @@ -36,8 +36,6 @@ create or replace package ut_expectation_processor authid current_user as procedure report_failure(a_message in varchar2); - procedure report_failure_no_caller(a_message in varchar2); - procedure set_xml_nls_params; procedure reset_nls_params; diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 859213722..d69cb0c3d 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -599,7 +599,7 @@ create or replace package body ut_compound_data_helper is function create_err_cursor_msg(a_error_stack varchar2) return varchar2 is begin return 'SQL exception thrown when fetching data from cursor: '|| - ut_utils.remove_error_from_stack(sqlerrm,-19202)||chr(10)|| + ut_utils.remove_error_from_stack(sqlerrm,ut_utils.gc_xml_processing)||chr(10)|| ut_expectation_processor.who_called_expectation(a_error_stack)|| 'Check the query and data for errors.'; end; diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index 0cf37e63a..099a694cf 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -2522,42 +2522,54 @@ Diff:% end; procedure xml_error_actual is - c_price CONSTANT NUMBER(20,4):= 1357; + c_price CONSTANT NUMBER(20,4):= 1357; c_user CONSTANT varchar2(30):= 'TEST_USER'; - v_actual sys_refcursor; - v_expected sys_refcursor; + l_actual sys_refcursor; + l_expected sys_refcursor; + l_exp_message varchar2(32000); begin - open v_actual for + l_exp_message :='ORA-20218: SQL exception thrown when fetching data from cursor: +ORA-01722: invalid number +at "UT3$USER#.TEST_EXPECTATIONS_CURSOR.XML_ERROR_ACTUAL", line 2542 ut3.ut.expect(l_actual).to_equal(l_expected); +Check the query and data for errors.'; + + open l_actual for select cast(null as number(10)) as usd_price_amt, c_user as update_id from dual where dummy = 1; - open v_expected for + open l_expected for select c_price as usd_price_amt, c_user as update_id from dual; - ut3.ut.expect(v_actual).to_equal(v_expected); + ut3.ut.expect(l_actual).to_equal(l_expected); + --Line that error relates to in expected messag ut.fail('Expected exception on cursor fetch'); exception when others then - ut.expect(sqlerrm).to_be_like('%ORA-20218: SQL exception thrown when fetching data from cursor:% -%ORA-01722: invalid number%%Check the query and data for errors%'); + ut.expect(sqlerrm).to_equal(l_exp_message); end; procedure xml_error_expected is - v_actual sys_refcursor; - v_expected sys_refcursor; + l_actual sys_refcursor; + l_expected sys_refcursor; + l_exp_message varchar2(32000); begin - open v_expected for + + l_exp_message :='ORA-20218: SQL exception thrown when fetching data from cursor: +ORA-01476: divisor is equal to zero +at "UT3$USER#.TEST_EXPECTATIONS_CURSOR.XML_ERROR_EXPECTED", line 2567 ut3.ut.expect(l_actual).to_equal(l_expected); +Check the query and data for errors.'; + + open l_expected for select 1/0 as test from dual; - open v_actual for + open l_actual for select 1 as test from dual; - ut3.ut.expect(v_actual).to_equal(v_expected); + ut3.ut.expect(l_actual).to_equal(l_expected); ut.fail('Expected exception on cursor fetch'); exception when others then - ut.expect(sqlerrm).to_be_like('%ORA-20218: SQL exception thrown when fetching data from cursor:% -%ORA-01476: divisor is equal to zero%Check the query and data for errors%'); + ut.expect(sqlerrm).to_equal(l_exp_message); end; end; From 05efc5e1e71648830791c2c3d4e5e07e256e9b38 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 5 Apr 2019 09:32:48 +0100 Subject: [PATCH 0394/1096] Cleanup whitespaces --- source/expectations/data_values/ut_compound_data_helper.pkb | 6 +++--- test/ut3_user/expectations/test_expectations_cursor.pkb | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index d69cb0c3d..6a9489274 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -598,9 +598,9 @@ create or replace package body ut_compound_data_helper is function create_err_cursor_msg(a_error_stack varchar2) return varchar2 is begin - return 'SQL exception thrown when fetching data from cursor: '|| - ut_utils.remove_error_from_stack(sqlerrm,ut_utils.gc_xml_processing)||chr(10)|| - ut_expectation_processor.who_called_expectation(a_error_stack)|| + return 'SQL exception thrown when fetching data from cursor:'|| + trim(ut_utils.remove_error_from_stack(sqlerrm,ut_utils.gc_xml_processing))||chr(10)|| + trim(ut_expectation_processor.who_called_expectation(a_error_stack))|| 'Check the query and data for errors.'; end; diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index 099a694cf..757c3dd26 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -2528,9 +2528,9 @@ Diff:% l_expected sys_refcursor; l_exp_message varchar2(32000); begin - l_exp_message :='ORA-20218: SQL exception thrown when fetching data from cursor: + l_exp_message :='ORA-20218: SQL exception thrown when fetching data from cursor: ORA-01722: invalid number -at "UT3$USER#.TEST_EXPECTATIONS_CURSOR.XML_ERROR_ACTUAL", line 2542 ut3.ut.expect(l_actual).to_equal(l_expected); +at "UT3$USER#.TEST_EXPECTATIONS_CURSOR.XML_ERROR_ACTUAL", line 2542 ut3.ut.expect(l_actual).to_equal(l_expected); Check the query and data for errors.'; open l_actual for @@ -2554,7 +2554,7 @@ Check the query and data for errors.'; l_exp_message varchar2(32000); begin - l_exp_message :='ORA-20218: SQL exception thrown when fetching data from cursor: + l_exp_message :='ORA-20218: SQL exception thrown when fetching data from cursor: ORA-01476: divisor is equal to zero at "UT3$USER#.TEST_EXPECTATIONS_CURSOR.XML_ERROR_EXPECTED", line 2567 ut3.ut.expect(l_actual).to_equal(l_expected); Check the query and data for errors.'; From 3f97b9e94cba7ee0351d860a50734f126ca7ea81 Mon Sep 17 00:00:00 2001 From: Edgars Cupits Date: Sat, 6 Apr 2019 14:17:55 +0300 Subject: [PATCH 0395/1096] fixing ORA-00907 when comparing ref cursors with BINARY_DOUBLE/BINRAY_FLOAT columns fixing ORA-00907: missing right parenthesis when comparing ref cursors with BINARY_DOUBLE/BINARY_FLOAT columns, because these column types do not support type length --- source/expectations/data_values/ut_compound_data_helper.pkb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 5ac8a4546..d8367e8c4 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -231,7 +231,8 @@ create or replace package body ut_compound_data_helper is elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('DATE','TIMESTAMP','TIMESTAMP WITH TIME ZONE', 'TIMESTAMP WITH LOCAL TIME ZONE') then l_col_type := 'VARCHAR2(50)'; - elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('INTERVAL DAY TO SECOND','INTERVAL YEAR TO MONTH') then + elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('INTERVAL DAY TO SECOND', + 'INTERVAL YEAR TO MONTH', 'BINARY_FLOAT', 'BINARY_DOUBLE') then l_col_type := a_data_info.column_type; else l_col_type := a_data_info.column_type From 5ab8cb9ecf01cd2760dd815e6dc079980100a195 Mon Sep 17 00:00:00 2001 From: Edgars Cupits Date: Sat, 6 Apr 2019 18:33:28 +0300 Subject: [PATCH 0396/1096] fix/ORA-00907: adding simple testcase --- .../expectations/test_expectations_cursor.pkb | 22 +++++++++++++++++++ .../expectations/test_expectations_cursor.pks | 3 +++ 2 files changed, 25 insertions(+) diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index a83fb0ae9..5f2d58f5b 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -82,6 +82,28 @@ create or replace package body test_expectations_cursor is ut3.ut.reset_nls; end; + procedure success_on_same_data_with_float + as + l_expected sys_refcursor; + l_actual sys_refcursor; + begin + -- Arrange + ut3.ut.set_nls; + open l_expected for + select cast(3.14 as binary_double) as pi_double, + cast(3.14 as binary_float) as pi_float + from dual; + open l_actual for + select cast(3.14 as binary_double) as pi_double, + cast(3.14 as binary_float) as pi_float + from dual; + --Act + ut3.ut.expect( l_actual ).to_equal( l_expected ); + --Assert + ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut3.ut.reset_nls; + end; + procedure success_on_empty as l_expected sys_refcursor; diff --git a/test/ut3_user/expectations/test_expectations_cursor.pks b/test/ut3_user/expectations/test_expectations_cursor.pks index ae37b37d3..d9773affc 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pks +++ b/test/ut3_user/expectations/test_expectations_cursor.pks @@ -17,6 +17,9 @@ create or replace package test_expectations_cursor is --%test(Gives success for identical data) procedure success_on_same_data; + --%test(Gives success for identical data with floats) + procedure success_on_same_data_with_float; + --%test(Gives success when both cursors are empty) procedure success_on_empty; From be2196450007dace14829c13e9252079cc9c0f53 Mon Sep 17 00:00:00 2001 From: Edgars Cupits Date: Sat, 6 Apr 2019 18:42:40 +0300 Subject: [PATCH 0397/1096] fix/ORA-00907: shortening test case name --- test/ut3_user/expectations/test_expectations_cursor.pkb | 2 +- test/ut3_user/expectations/test_expectations_cursor.pks | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index 5f2d58f5b..0f6ad0ecc 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -82,7 +82,7 @@ create or replace package body test_expectations_cursor is ut3.ut.reset_nls; end; - procedure success_on_same_data_with_float + procedure success_on_same_data_float as l_expected sys_refcursor; l_actual sys_refcursor; diff --git a/test/ut3_user/expectations/test_expectations_cursor.pks b/test/ut3_user/expectations/test_expectations_cursor.pks index d9773affc..d0b9a6e54 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pks +++ b/test/ut3_user/expectations/test_expectations_cursor.pks @@ -18,7 +18,7 @@ create or replace package test_expectations_cursor is procedure success_on_same_data; --%test(Gives success for identical data with floats) - procedure success_on_same_data_with_float; + procedure success_on_same_data_float; --%test(Gives success when both cursors are empty) procedure success_on_empty; From 65380635e2c655f3a1acc7b6e325fb6155cd579a Mon Sep 17 00:00:00 2001 From: Edgars Cupits Date: Sat, 6 Apr 2019 18:56:40 +0300 Subject: [PATCH 0398/1096] fix/ORA-00907: wrong schema name in test case check --- test/ut3_user/expectations/test_expectations_cursor.pkb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index 0f6ad0ecc..f8bb92878 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -100,7 +100,7 @@ create or replace package body test_expectations_cursor is --Act ut3.ut.expect( l_actual ).to_equal( l_expected ); --Assert - ut.expect(expectations.failed_expectations_data()).to_be_empty(); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); ut3.ut.reset_nls; end; From 977c579c9ab114c04fca5a053ddeaca580d2a996 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sun, 7 Apr 2019 07:54:42 +0000 Subject: [PATCH 0399/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 40700d995..2b057b93d 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 534a12ddf..46051611c 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 9d003f57b..14ba3dfc2 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index e3787fa89..f82becc51 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 8cee8860a..8413ad1a6 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index c2e24a6d5..4b0dee565 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 15e5394c7..5abbade94 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index b5a5a4dcd..bd8afc899 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 7793b7b73..284fc4d2a 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 5ff9eca9c..5a20b1c05 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index d6508f9d0..4f94f540d 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 79fc7caf8..ff43f1c40 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 7a982043c..2f97efe65 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index f55cbce7d..6ff606fc5 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index b46a97080..2687cff90 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 951fdfa82..14b901860 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 7aff312bf..db5dacaa5 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2808--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 1e5588f7d..4bf155ce7 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.7.2808-develop'; + gc_version constant varchar2(50) := 'v3.1.7.2825-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 45d6e7a8c84be6f0fe1bab3ac86420a11cb8c6cc Mon Sep 17 00:00:00 2001 From: lwasylow Date: Mon, 8 Apr 2019 15:19:35 +0100 Subject: [PATCH 0400/1096] Call stack differs based on version --- test/ut3_user/expectations/test_expectations_cursor.pkb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index 757c3dd26..98e0ad5c7 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -2530,7 +2530,7 @@ Diff:% begin l_exp_message :='ORA-20218: SQL exception thrown when fetching data from cursor: ORA-01722: invalid number -at "UT3$USER#.TEST_EXPECTATIONS_CURSOR.XML_ERROR_ACTUAL", line 2542 ut3.ut.expect(l_actual).to_equal(l_expected); +at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line 2542 ut3.ut.expect(l_actual).to_equal(l_expected); Check the query and data for errors.'; open l_actual for @@ -2539,7 +2539,7 @@ Check the query and data for errors.'; open l_expected for select c_price as usd_price_amt, c_user as update_id from dual; - ut3.ut.expect(l_actual).to_equal(l_expected); + ut3.ut.expect(l_actual).to_be_like(l_expected); --Line that error relates to in expected messag ut.fail('Expected exception on cursor fetch'); @@ -2556,7 +2556,7 @@ Check the query and data for errors.'; l_exp_message :='ORA-20218: SQL exception thrown when fetching data from cursor: ORA-01476: divisor is equal to zero -at "UT3$USER#.TEST_EXPECTATIONS_CURSOR.XML_ERROR_EXPECTED", line 2567 ut3.ut.expect(l_actual).to_equal(l_expected); +at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line 2567 ut3.ut.expect(l_actual).to_equal(l_expected); Check the query and data for errors.'; open l_expected for @@ -2564,7 +2564,7 @@ Check the query and data for errors.'; open l_actual for select 1 as test from dual; - ut3.ut.expect(l_actual).to_equal(l_expected); + ut3.ut.expect(l_actual).to_be_like(l_expected); ut.fail('Expected exception on cursor fetch'); exception From 0025dd9327c060a63e733c6d719ec88f5b48f4af Mon Sep 17 00:00:00 2001 From: lwasylow Date: Mon, 8 Apr 2019 15:31:22 +0100 Subject: [PATCH 0401/1096] Fix typo --- test/ut3_user/expectations/test_expectations_cursor.pkb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index 901beafc6..d5bf100f5 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -2561,13 +2561,13 @@ Check the query and data for errors.'; open l_expected for select c_price as usd_price_amt, c_user as update_id from dual; - ut3.ut.expect(l_actual).to_be_like(l_expected); + ut3.ut.expect(l_actual).to_equal(l_expected); --Line that error relates to in expected messag ut.fail('Expected exception on cursor fetch'); exception when others then - ut.expect(sqlerrm).to_equal(l_exp_message); + ut.expect(sqlerrm).to_be_like(l_exp_message); end; procedure xml_error_expected is @@ -2586,12 +2586,12 @@ Check the query and data for errors.'; open l_actual for select 1 as test from dual; - ut3.ut.expect(l_actual).to_be_like(l_expected); + ut3.ut.expect(l_actual).to_equal(l_expected); ut.fail('Expected exception on cursor fetch'); exception when others then - ut.expect(sqlerrm).to_equal(l_exp_message); + ut.expect(sqlerrm).to_be_like(l_exp_message); end; end; From 3428fa8b1f9c1811e8038569d103e4284cbcef6e Mon Sep 17 00:00:00 2001 From: lwasylow Date: Mon, 8 Apr 2019 15:41:47 +0100 Subject: [PATCH 0402/1096] Update error lines --- test/ut3_user/expectations/test_expectations_cursor.pkb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index d5bf100f5..5d59c75d9 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -2552,7 +2552,7 @@ Diff:% begin l_exp_message :='ORA-20218: SQL exception thrown when fetching data from cursor: ORA-01722: invalid number -at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line 2542 ut3.ut.expect(l_actual).to_equal(l_expected); +at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line 2564 ut3.ut.expect(l_actual).to_equal(l_expected); Check the query and data for errors.'; open l_actual for @@ -2578,7 +2578,7 @@ Check the query and data for errors.'; l_exp_message :='ORA-20218: SQL exception thrown when fetching data from cursor: ORA-01476: divisor is equal to zero -at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line 2567 ut3.ut.expect(l_actual).to_equal(l_expected); +at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line 2589 ut3.ut.expect(l_actual).to_equal(l_expected); Check the query and data for errors.'; open l_expected for From 80a46d0a903b453c64afae73f51de7ecc26f3a3e Mon Sep 17 00:00:00 2001 From: lwasylow Date: Mon, 8 Apr 2019 16:01:14 +0100 Subject: [PATCH 0403/1096] Adding ROWID to list of types that do not provide a length. --- .../data_values/ut_compound_data_helper.pkb | 15 +++++++++++++-- .../data_values/ut_compound_data_helper.pks | 5 +++++ .../expectations/test_expectations_cursor.pkb | 12 ++++++++++++ .../expectations/test_expectations_cursor.pks | 3 +++ 4 files changed, 33 insertions(+), 2 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index f68ee2a6f..a9ded7932 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -231,8 +231,7 @@ create or replace package body ut_compound_data_helper is elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('DATE','TIMESTAMP','TIMESTAMP WITH TIME ZONE', 'TIMESTAMP WITH LOCAL TIME ZONE') then l_col_type := 'VARCHAR2(50)'; - elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('INTERVAL DAY TO SECOND', - 'INTERVAL YEAR TO MONTH', 'BINARY_FLOAT', 'BINARY_DOUBLE') then + elsif a_data_info.is_sql_diffable = 1 and type_no_length(a_data_info.column_type) then l_col_type := a_data_info.column_type; else l_col_type := a_data_info.column_type @@ -570,6 +569,8 @@ create or replace package body ut_compound_data_helper is --clob/blob/xmltype/object/nestedcursor/nestedtable if a_type_name IN (g_type_name_map(dbms_sql.blob_type), g_type_name_map(dbms_sql.clob_type), + g_type_name_map(dbms_sql.long_type), + g_type_name_map(dbms_sql.long_raw_type), g_type_name_map(dbms_sql.bfile_type), g_anytype_name_map(dbms_types.typecode_namedcollection)) then @@ -605,6 +606,16 @@ create or replace package body ut_compound_data_helper is 'Check the query and data for errors.'; end; + function type_no_length ( a_type_name varchar2) return boolean is + begin + return case + when a_type_name in ('INTERVAL DAY TO SECOND','INTERVAL YEAR TO MONTH', 'BINARY_FLOAT', 'BINARY_DOUBLE','ROWID') then + true + else + false + end; + end; + begin g_anytype_name_map(dbms_types.typecode_date) := 'DATE'; g_anytype_name_map(dbms_types.typecode_number) := 'NUMBER'; diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 62d5c8a27..1c00d2263 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -94,5 +94,10 @@ create or replace package ut_compound_data_helper authid definer is function create_err_cursor_msg(a_error_stack varchar2) return varchar2; + /* + * Function to return true or false if the type dont have an length + */ + function type_no_length ( a_type_name varchar2) return boolean; + end; / diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index 5d59c75d9..4713d14e0 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -2594,5 +2594,17 @@ Check the query and data for errors.'; ut.expect(sqlerrm).to_be_like(l_exp_message); end; + procedure rowid_refcursor is + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + open l_expected for + select rowid as test from dual; + open l_actual for + select rowid as test from dual; + + ut3.ut.expect(l_actual).to_equal(l_expected); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; end; / diff --git a/test/ut3_user/expectations/test_expectations_cursor.pks b/test/ut3_user/expectations/test_expectations_cursor.pks index b41ff005e..a2a74aeb2 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pks +++ b/test/ut3_user/expectations/test_expectations_cursor.pks @@ -405,6 +405,9 @@ create or replace package test_expectations_cursor is --%test(Fail to process a cursor for expected) procedure xml_error_expected; + + --%test(Check that cursor correctly handles ROWID dataype) + procedure rowid_refcursor; end; / From 296102aedcdfbe05c5d31051f5dcd2d74332da65 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Mon, 8 Apr 2019 16:19:49 +0100 Subject: [PATCH 0404/1096] cleaning up tests --- test/ut3_user/expectations/test_expectations_cursor.pkb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index 4713d14e0..09ad973bd 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -2544,22 +2544,19 @@ Diff:% end; procedure xml_error_actual is - c_price CONSTANT NUMBER(20,4):= 1357; - c_user CONSTANT varchar2(30):= 'TEST_USER'; l_actual sys_refcursor; l_expected sys_refcursor; l_exp_message varchar2(32000); begin l_exp_message :='ORA-20218: SQL exception thrown when fetching data from cursor: ORA-01722: invalid number -at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line 2564 ut3.ut.expect(l_actual).to_equal(l_expected); +at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line 2561 ut3.ut.expect(l_actual).to_equal(l_expected); Check the query and data for errors.'; open l_actual for - select cast(null as number(10)) as usd_price_amt, c_user as update_id - from dual where dummy = 1; + select cast(null as number(10)) as usd_price_amt from dual where dummy = 1; open l_expected for - select c_price as usd_price_amt, c_user as update_id from dual; + select 1357 as usd_price_amt from dual; ut3.ut.expect(l_actual).to_equal(l_expected); --Line that error relates to in expected messag From b399115f248252baad62c63c47a92072c176d2fd Mon Sep 17 00:00:00 2001 From: lwasylow Date: Mon, 8 Apr 2019 16:28:38 +0100 Subject: [PATCH 0405/1096] Update tests --- test/ut3_user/expectations/test_expectations_cursor.pkb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index 09ad973bd..016c0c3db 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -2549,14 +2549,14 @@ Diff:% l_exp_message varchar2(32000); begin l_exp_message :='ORA-20218: SQL exception thrown when fetching data from cursor: -ORA-01722: invalid number +ORA-01476: divisor is equal to zero at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line 2561 ut3.ut.expect(l_actual).to_equal(l_expected); Check the query and data for errors.'; open l_actual for - select cast(null as number(10)) as usd_price_amt from dual where dummy = 1; + select 1 as test from dual; open l_expected for - select 1357 as usd_price_amt from dual; + select 1/0 as test from dual; ut3.ut.expect(l_actual).to_equal(l_expected); --Line that error relates to in expected messag @@ -2575,7 +2575,7 @@ Check the query and data for errors.'; l_exp_message :='ORA-20218: SQL exception thrown when fetching data from cursor: ORA-01476: divisor is equal to zero -at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line 2589 ut3.ut.expect(l_actual).to_equal(l_expected); +at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line 2586 ut3.ut.expect(l_actual).to_equal(l_expected); Check the query and data for errors.'; open l_expected for From b051324c64fb0d4944265f005ae986bca57fbd31 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Mon, 8 Apr 2019 17:34:26 +0100 Subject: [PATCH 0406/1096] testing wildcard, there is some unexpected white space that is not appearing on local tests or other similar for expected. --- test/ut3_user/expectations/test_expectations_cursor.pkb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index 016c0c3db..21ea9a697 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -2550,7 +2550,7 @@ Diff:% begin l_exp_message :='ORA-20218: SQL exception thrown when fetching data from cursor: ORA-01476: divisor is equal to zero -at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line 2561 ut3.ut.expect(l_actual).to_equal(l_expected); +at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line 2561 ut3.ut.expect(l_actual).to_equal(l_expected);% Check the query and data for errors.'; open l_actual for @@ -2575,7 +2575,7 @@ Check the query and data for errors.'; l_exp_message :='ORA-20218: SQL exception thrown when fetching data from cursor: ORA-01476: divisor is equal to zero -at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line 2586 ut3.ut.expect(l_actual).to_equal(l_expected); +at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line 2586 ut3.ut.expect(l_actual).to_equal(l_expected);% Check the query and data for errors.'; open l_expected for From 10e651f247ec4279a4c64ddb102b74e579f6a0fd Mon Sep 17 00:00:00 2001 From: lwasylow Date: Tue, 9 Apr 2019 08:57:51 +0100 Subject: [PATCH 0407/1096] Fix : No length datatypes mapping. This is to address issue when Oracle dont expect a length value against data type but cursor description return a max_len not being null. --- .../data_values/ut_compound_data_helper.pkb | 15 +++++++++-- .../expectations/test_expectations_cursor.pkb | 25 +++++++++++++++---- .../expectations/test_expectations_cursor.pks | 4 +-- 3 files changed, 35 insertions(+), 9 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index a9ded7932..3c1a743cb 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -18,8 +18,10 @@ create or replace package body ut_compound_data_helper is g_diff_count integer; type t_type_name_map is table of varchar2(128) index by binary_integer; + type t_types_no_length is table of varchar2(128) index by varchar2(128); g_type_name_map t_type_name_map; g_anytype_name_map t_type_name_map; + g_type_no_length_map t_types_no_length; g_compare_sql_template varchar2(4000) := q'[ @@ -609,7 +611,7 @@ create or replace package body ut_compound_data_helper is function type_no_length ( a_type_name varchar2) return boolean is begin return case - when a_type_name in ('INTERVAL DAY TO SECOND','INTERVAL YEAR TO MONTH', 'BINARY_FLOAT', 'BINARY_DOUBLE','ROWID') then + when g_type_no_length_map.exists(a_type_name) then true else false @@ -661,6 +663,15 @@ begin g_type_name_map( dbms_sql.urowid_type ) := 'UROWID'; g_type_name_map( dbms_sql.user_defined_type ) := 'USER_DEFINED_TYPE'; g_type_name_map( dbms_sql.ref_type ) := 'REF_TYPE'; - + + + /** + * List of types that have no length but can produce a max_len from desc_cursor function. + */ + g_type_no_length_map('ROWID') := 'ROWID'; + g_type_no_length_map('INTERVAL DAY TO SECOND') := 'INTERVAL DAY TO SECOND'; + g_type_no_length_map('INTERVAL YEAR TO MONTH') := 'INTERVAL YEAR TO MONTH'; + g_type_no_length_map('BINARY_DOUBLE') := 'BINARY_DOUBLE'; + g_type_no_length_map('BINARY_FLOAT') := 'BINARY_FLOAT'; end; / diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index 21ea9a697..9b41a259c 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -2591,17 +2591,32 @@ Check the query and data for errors.'; ut.expect(sqlerrm).to_be_like(l_exp_message); end; - procedure rowid_refcursor is + procedure no_length_datatypes is l_actual sys_refcursor; l_expected sys_refcursor; begin + ut3.ut.set_nls; open l_expected for - select rowid as test from dual; + select cast(3.14 as binary_double) as pi_double, + cast(3.14 as binary_float) as pi_float, + rowid as row_rowid, + numtodsinterval(1.12345678912, 'day') row_ds_interval, + numtoyminterval(1.1, 'year') row_ym_interval + from dual; + open l_actual for - select rowid as test from dual; - - ut3.ut.expect(l_actual).to_equal(l_expected); + select cast(3.14 as binary_double) as pi_double, + cast(3.14 as binary_float) as pi_float, + rowid as row_rowid, + numtodsinterval(1.12345678912, 'day') row_ds_interval, + numtoyminterval(1.1, 'year') row_ym_interval + from dual; + --Act + ut3.ut.expect( l_actual ).to_equal( l_expected ); + --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + ut3.ut.reset_nls; + end; end; / diff --git a/test/ut3_user/expectations/test_expectations_cursor.pks b/test/ut3_user/expectations/test_expectations_cursor.pks index a2a74aeb2..b662ba61b 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pks +++ b/test/ut3_user/expectations/test_expectations_cursor.pks @@ -406,8 +406,8 @@ create or replace package test_expectations_cursor is --%test(Fail to process a cursor for expected) procedure xml_error_expected; - --%test(Check that cursor correctly handles ROWID dataype) - procedure rowid_refcursor; + --%test(Check that cursor correctly handles no length dataypes) + procedure no_length_datatypes; end; / From a4a33fb0e9e22fd624747d10627ee5a8a2242505 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Wed, 10 Apr 2019 09:13:38 +0100 Subject: [PATCH 0408/1096] Update test --- source/expectations/data_values/ut_compound_data_helper.pkb | 4 ++-- test/ut3_user/expectations/test_expectations_cursor.pkb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 3c1a743cb..dd55036bb 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -603,8 +603,8 @@ create or replace package body ut_compound_data_helper is function create_err_cursor_msg(a_error_stack varchar2) return varchar2 is begin return 'SQL exception thrown when fetching data from cursor:'|| - trim(ut_utils.remove_error_from_stack(sqlerrm,ut_utils.gc_xml_processing))||chr(10)|| - trim(ut_expectation_processor.who_called_expectation(a_error_stack))|| + ut_utils.remove_error_from_stack(sqlerrm,ut_utils.gc_xml_processing)||chr(10)|| + ut_expectation_processor.who_called_expectation(a_error_stack)|| 'Check the query and data for errors.'; end; diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index 9b41a259c..8e7bb24c3 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -2550,7 +2550,7 @@ Diff:% begin l_exp_message :='ORA-20218: SQL exception thrown when fetching data from cursor: ORA-01476: divisor is equal to zero -at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line 2561 ut3.ut.expect(l_actual).to_equal(l_expected);% +at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line 2561 ut3.ut.expect(l_actual).to_equal(l_expected); Check the query and data for errors.'; open l_actual for @@ -2575,7 +2575,7 @@ Check the query and data for errors.'; l_exp_message :='ORA-20218: SQL exception thrown when fetching data from cursor: ORA-01476: divisor is equal to zero -at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line 2586 ut3.ut.expect(l_actual).to_equal(l_expected);% +at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line 2586 ut3.ut.expect(l_actual).to_equal(l_expected); Check the query and data for errors.'; open l_expected for From f5331aca8cacc1745a4c7b308c053bd75c373474 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 12 Apr 2019 08:16:27 +0100 Subject: [PATCH 0409/1096] Mysterious whitespace appears from time to time. TODO --- test/ut3_user/expectations/test_expectations_cursor.pkb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index 8e7bb24c3..9b41a259c 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -2550,7 +2550,7 @@ Diff:% begin l_exp_message :='ORA-20218: SQL exception thrown when fetching data from cursor: ORA-01476: divisor is equal to zero -at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line 2561 ut3.ut.expect(l_actual).to_equal(l_expected); +at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line 2561 ut3.ut.expect(l_actual).to_equal(l_expected);% Check the query and data for errors.'; open l_actual for @@ -2575,7 +2575,7 @@ Check the query and data for errors.'; l_exp_message :='ORA-20218: SQL exception thrown when fetching data from cursor: ORA-01476: divisor is equal to zero -at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line 2586 ut3.ut.expect(l_actual).to_equal(l_expected); +at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line 2586 ut3.ut.expect(l_actual).to_equal(l_expected);% Check the query and data for errors.'; open l_expected for From 0e2eaa50625594794281706b96186badc500f691 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Fri, 12 Apr 2019 14:00:13 +0000 Subject: [PATCH 0410/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 2b057b93d..b58f18e59 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 46051611c..0c021ca52 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 14ba3dfc2..7e9b0b993 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index f82becc51..5e5d494e8 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 8413ad1a6..c1eadea30 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 4b0dee565..b4965fcdf 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 5abbade94..2ffaf169b 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index bd8afc899..9d4887a53 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 284fc4d2a..05eb7080b 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 5a20b1c05..647a2703c 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 4f94f540d..9132aa28f 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index ff43f1c40..801199bc4 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 2f97efe65..d8c3aaed8 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 6ff606fc5..799602e44 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 2687cff90..fb4832b4b 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 14b901860..386ff08f1 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index db5dacaa5..769d0ebbb 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2825--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index abe3b2d90..ebb9780ad 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.7.2825-develop'; + gc_version constant varchar2(50) := 'v3.1.7.2844-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 3bdd5406fdb34fea81f9be89a9c1cf5e9006b31c Mon Sep 17 00:00:00 2001 From: Lukasz Date: Sun, 14 Apr 2019 13:08:04 +0100 Subject: [PATCH 0411/1096] Fixing issue with a special column names non XML compliant (#903) * Fixing issue with a special column names that do not adhere to XML rules. * removing unused global constant. * Modification after PR comments. Inline call to function. Remove constants to be private. Expose only one function rest to be private --- source/core/ut_utils.pkb | 50 +++++++++++++++- source/core/ut_utils.pks | 9 ++- .../data_values/ut_compound_data_helper.pkb | 4 +- .../data_values/ut_cursor_column.tpb | 23 +++++--- .../data_values/ut_cursor_column.tps | 7 ++- .../expectations/test_expectations_cursor.pkb | 59 +++++++++++++++++++ .../expectations/test_expectations_cursor.pks | 9 +++ 7 files changed, 144 insertions(+), 17 deletions(-) diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 25ef3fb3f..c77a233ae 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -16,6 +16,13 @@ create or replace package body ut_utils is limitations under the License. */ + /** + * Constants regex used to validate XML name + */ + gc_invalid_first_xml_char constant varchar2(50) := '[^_a-zA-Z]'; + gc_invalid_xml_char constant varchar2(50) := '[^_a-zA-Z0-9\.-]'; + gc_full_valid_xml_name constant varchar2(50) := '^([_a-zA-Z])([_a-zA-Z0-9\.-])*$'; + function surround_with(a_value varchar2, a_quote_char varchar2) return varchar2 is begin return case when a_quote_char is not null then a_quote_char||a_value||a_quote_char else a_value end; @@ -749,8 +756,47 @@ create or replace package body ut_utils is ,modifier => 'm'); return l_caller_stack_line; end; - - + + /** + * Change string into unicode to match xmlgen format _00_ + * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 + * secion 8.2.1.1 + */ + function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is + begin + return '_x00'||rawtohex(utl_raw.cast_to_raw(a_character))||'_'; + end; + + /** + * Build valid XML column name as element names can contain letters, digits, hyphens, underscores, and periods + */ + function build_valid_xml_name(a_preprocessed_name varchar2) return varchar2 is + l_post_processed varchar2(4000); + begin + for i in (select regexp_substr( a_preprocessed_name ,'(.{1})', 1, level, null, 1 ) AS string_char,level level_no + from dual connect by level <= regexp_count(a_preprocessed_name, '(.{1})')) + loop + if i.level_no = 1 and regexp_like(i.string_char,gc_invalid_first_xml_char) then + l_post_processed := l_post_processed || char_to_xmlgen_unicode(i.string_char); + elsif regexp_like(i.string_char,gc_invalid_xml_char) then + l_post_processed := l_post_processed || char_to_xmlgen_unicode(i.string_char); + else + l_post_processed := l_post_processed || i.string_char; + end if; + end loop; + return l_post_processed; + end; + + function get_valid_xml_name(a_name varchar2) return varchar2 is + l_valid_name varchar2(4000); + begin + if regexp_like(a_name,gc_full_valid_xml_name) then + l_valid_name := a_name; + else + l_valid_name := build_valid_xml_name(a_name); + end if; + return l_valid_name; + end; end ut_utils; / diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index ebb9780ad..63c5fbe18 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -22,7 +22,7 @@ create or replace package ut_utils authid definer is */ gc_version constant varchar2(50) := 'v3.1.7.2844-develop'; - + subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; gc_before_each constant t_executable_type := 'beforeeach'; @@ -381,6 +381,11 @@ create or replace package ut_utils authid definer is * Remove given ORA error from stack */ function remove_error_from_stack(a_error_stack varchar2, a_ora_code number) return varchar2; - + + /** + * Check if xml name is valid if not build a valid name + */ + function get_valid_xml_name(a_name varchar2) return varchar2; + end ut_utils; / diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index dd55036bb..322b9b215 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -80,13 +80,13 @@ create or replace package body ut_compound_data_helper is begin execute immediate q'[with expected_cols as ( - select access_path exp_column_name,column_position exp_col_pos, + select display_path exp_column_name,column_position exp_col_pos, replace(column_type_name,'VARCHAR2','CHAR') exp_col_type_compare, column_type_name exp_col_type from table(:a_expected) where parent_name is null and hierarchy_level = 1 and column_name is not null ), actual_cols as ( - select access_path act_column_name,column_position act_col_pos, + select display_path act_column_name,column_position act_col_pos, replace(column_type_name,'VARCHAR2','CHAR') act_col_type_compare, column_type_name act_col_type from table(:a_actual) where parent_name is null and hierarchy_level = 1 and column_name is not null diff --git a/source/expectations/data_values/ut_cursor_column.tpb b/source/expectations/data_values/ut_cursor_column.tpb index 5f6f18c56..8f26f58aa 100644 --- a/source/expectations/data_values/ut_cursor_column.tpb +++ b/source/expectations/data_values/ut_cursor_column.tpb @@ -13,17 +13,24 @@ create or replace type body ut_cursor_column as self.column_len := a_col_max_len; --length of column self.column_name := TRIM( BOTH '''' FROM a_col_name); --name of the column self.column_type_name := coalesce(a_col_type_name,a_col_type); --type name e.g. test_dummy_object or varchar2 - self.access_path := case when a_access_path is null then + self.xml_valid_name := ut_utils.get_valid_xml_name(self.column_name); + self.display_path := case when a_access_path is null then self.column_name else a_access_path||'/'||self.column_name - end; --Access path used for incldue exclude eg/ TEST_DUMMY_OBJECT/VARCHAR2 - self.xml_valid_name := '"'||self.column_name||'"'; --User friendly column name - self.transformed_name := case when self.parent_name is null then - self.xml_valid_name - else - '"'||ut_compound_data_helper.get_fixed_size_hash(self.parent_name||self.column_name)||'"' - end; --when is nestd we need to hash name to make sure we dont exceed 30 char + end; --Access path used for incldue exclude eg/ TEST_DUMMY_OBJECT/VARCHAR2 + self.access_path := case when a_access_path is null then + self.xml_valid_name + else + a_access_path||'/'||self.xml_valid_name + end; --Access path used for incldue exclude eg/ TEST_DUMMY_OBJECT/VARCHAR2 + self.transformed_name := case when length(self.xml_valid_name) > 30 then + '"'||ut_compound_data_helper.get_fixed_size_hash(self.parent_name||self.xml_valid_name)||'"' + when self.parent_name is null then + '"'||self.xml_valid_name||'"' + else + '"'||ut_compound_data_helper.get_fixed_size_hash(self.parent_name||self.xml_valid_name)||'"' + end; --when is nestd we need to hash name to make sure we dont exceed 30 char self.column_type := a_col_type; --column type e.g. user_defined , varchar2 self.column_schema := a_col_schema_name; -- schema name self.is_sql_diffable := case diff --git a/source/expectations/data_values/ut_cursor_column.tps b/source/expectations/data_values/ut_cursor_column.tps index 4b436051a..f55973e16 100644 --- a/source/expectations/data_values/ut_cursor_column.tps +++ b/source/expectations/data_values/ut_cursor_column.tps @@ -17,12 +17,13 @@ create or replace type ut_cursor_column force authid current_user as object ( */ parent_name varchar2(4000), access_path varchar2(4000), + display_path varchar2(4000), has_nested_col number(1,0), - transformed_name varchar2(32), + transformed_name varchar2(2000), hierarchy_level number, column_position number, - xml_valid_name varchar2(128), - column_name varchar2(128), + xml_valid_name varchar2(2000), + column_name varchar2(2000), column_type varchar2(128), column_type_name varchar2(128), column_schema varchar2(128), diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index 9b41a259c..4a490349b 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -2618,5 +2618,64 @@ Check the query and data for errors.'; ut3.ut.reset_nls; end; + + procedure colon_part_of_columnname is + type t_key_val_rec is record( + key varchar2(100), + value varchar2(100)); + + l_act t_key_val_rec; + l_exp t_key_val_rec; + l_act_cur sys_refcursor; + l_exp_cur sys_refcursor; + begin + l_act.key := 'NAME'; + l_act.value := 'TEST'; + l_exp.key := 'NAME'; + l_exp.value := 'TEST'; + + OPEN l_act_cur FOR SELECT l_act.key, l_act.value + FROM dual; + + OPEN l_exp_cur FOR SELECT l_exp.key, l_exp.value + FROM dual; + + ut3.ut.expect(l_act_cur).to_equal(l_exp_cur); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + + end; + + procedure specialchar_part_of_colname is + l_act_cur sys_refcursor; + l_exp_cur sys_refcursor; + begin + + OPEN l_act_cur FOR SELECT 1 as "$Test", 2 as "&Test" + FROM dual; + + OPEN l_exp_cur FOR SELECT 1 as "$Test", 2 as "&Test" + FROM dual; + + ut3.ut.expect(l_act_cur).to_equal(l_exp_cur); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + + end; + + procedure nonxmlchar_part_of_colname is + l_act_cur sys_refcursor; + l_exp_cur sys_refcursor; + begin + + OPEN l_act_cur FOR SELECT 1 as "", 2 as "_Test", 3 as ".Test>" + FROM dual; + + OPEN l_exp_cur FOR SELECT 1 as "", 2 as "_Test", 3 as ".Test>" + FROM dual; + + ut3.ut.expect(l_act_cur).to_equal(l_exp_cur); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + + end; + end; / diff --git a/test/ut3_user/expectations/test_expectations_cursor.pks b/test/ut3_user/expectations/test_expectations_cursor.pks index b662ba61b..dd088cff8 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pks +++ b/test/ut3_user/expectations/test_expectations_cursor.pks @@ -408,6 +408,15 @@ create or replace package test_expectations_cursor is --%test(Check that cursor correctly handles no length dataypes) procedure no_length_datatypes; + + --%test(Check that colon is converted properly fix #902) + procedure colon_part_of_columnname; + + --%test(Check that column name accept special characters fix #902) + procedure specialchar_part_of_colname; + + --%test(Check that column name accept non xml characters fix #902) + procedure nonxmlchar_part_of_colname; end; / From 421888e07336277f9b91c855adaefb20ebab0fb3 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sun, 14 Apr 2019 12:18:36 +0000 Subject: [PATCH 0412/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index b58f18e59..ec79d645c 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 0c021ca52..3f6cffed3 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 7e9b0b993..497d20418 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 5e5d494e8..f1f3615b3 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index c1eadea30..d448537b9 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index b4965fcdf..556d97129 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 2ffaf169b..922ab5227 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 9d4887a53..cc41a86a5 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 05eb7080b..8de2fdb27 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 647a2703c..be73ccf6d 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 9132aa28f..2e030665b 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 801199bc4..babf5a51b 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index d8c3aaed8..060974505 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 799602e44..488db9204 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index fb4832b4b..494f9ef6a 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 386ff08f1..4cdc4fb7c 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 769d0ebbb..fa03c5a19 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2844--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index c77a233ae..dcf24f2e4 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -760,7 +760,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion 8.2.1.1 + * secion v3.1.7.2851-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 63c5fbe18..bfb3bc219 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.7.2844-develop'; + gc_version constant varchar2(50) := 'v3.1.7.2851-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 96b8480190931defc7752d42e7155055ec893e2e Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 15 Mar 2019 20:04:15 +0000 Subject: [PATCH 0413/1096] Adding trigger solution for annotation parsing. --- docs/userguide/install.md | 2 + source/check_sys_grants.sql | 6 +- .../annotations/ut_annotation_cache_info.sql | 2 +- .../ut_annotation_cache_manager.pkb | 73 ++++++++++---- .../ut_annotation_cache_manager.pks | 4 +- .../ut_annotation_cache_schema.sql | 21 ++++ .../annotations/ut_annotation_manager.pkb | 99 +++++++++++++++---- .../annotations/ut_annotation_manager.pks | 5 + .../ut_trigger_annotation_parsing.trg | 15 +++ source/core/annotations/ut_trigger_check.pkb | 40 ++++++++ source/core/annotations/ut_trigger_check.pks | 28 ++++++ source/create_utplsql_owner.sql | 2 +- source/install.sql | 4 + source/uninstall_objects.sql | 6 ++ 14 files changed, 264 insertions(+), 43 deletions(-) create mode 100644 source/core/annotations/ut_annotation_cache_schema.sql create mode 100644 source/core/annotations/ut_trigger_annotation_parsing.trg create mode 100644 source/core/annotations/ut_trigger_check.pkb create mode 100644 source/core/annotations/ut_trigger_check.pks diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 060974505..f3acc6292 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -121,6 +121,8 @@ The uninstall process will **not** drop profiler tables, as they can potentially It is up to DBA to maintain the storage of the profiler tables. +Additionally the user performing the installation must have a `ADMINISTER DATABASE TRIGGER` privilege. This is required for installation of trigger that is responsible for parsing annotations at at compile-time of a package. + # Manual installation procedure ### Creating schema for utPLSQL diff --git a/source/check_sys_grants.sql b/source/check_sys_grants.sql index e16869e54..ae861ed33 100644 --- a/source/check_sys_grants.sql +++ b/source/check_sys_grants.sql @@ -1,7 +1,7 @@ declare c_expected_grants constant dbmsoutput_linesarray := dbmsoutput_linesarray( - 'CREATE TYPE','CREATE VIEW','CREATE SYNONYM','CREATE SEQUENCE','CREATE PROCEDURE','CREATE TABLE' + 'CREATE TYPE','CREATE VIEW','CREATE SYNONYM','CREATE SEQUENCE','CREATE PROCEDURE','CREATE TABLE', 'ADMINISTER DATABASE TRIGGER' ); l_expected_grants dbmsoutput_linesarray := c_expected_grants; @@ -9,7 +9,9 @@ declare begin if user != SYS_CONTEXT('userenv','current_schema') then for i in 1 .. l_expected_grants.count loop - l_expected_grants(i) := replace(l_expected_grants(i),' ',' ANY '); + if l_expected_grants(i) != 'ADMINISTER DATABASE TRIGGER' then + l_expected_grants(i) := replace(l_expected_grants(i),' ',' ANY '); + end if; end loop; end if; select listagg(' - '||privilege,CHR(10)) within group(order by privilege) diff --git a/source/core/annotations/ut_annotation_cache_info.sql b/source/core/annotations/ut_annotation_cache_info.sql index fa7eabeec..811f105a5 100644 --- a/source/core/annotations/ut_annotation_cache_info.sql +++ b/source/core/annotations/ut_annotation_cache_info.sql @@ -18,6 +18,6 @@ create table ut_annotation_cache_info ( object_type varchar2(250) not null, parse_time timestamp not null, constraint ut_annotation_cache_info_pk primary key(cache_id), - constraint ut_annotation_cache_info_uk unique (object_owner, object_name, object_type) + constraint ut_annotation_cache_info_uk unique (object_owner, object_type, object_name) ) organization index; diff --git a/source/core/annotations/ut_annotation_cache_manager.pkb b/source/core/annotations/ut_annotation_cache_manager.pkb index 5c40be5b7..bf6d5e112 100644 --- a/source/core/annotations/ut_annotation_cache_manager.pkb +++ b/source/core/annotations/ut_annotation_cache_manager.pkb @@ -18,22 +18,40 @@ create or replace package body ut_annotation_cache_manager as procedure update_cache(a_object ut_annotated_object) is l_cache_id integer; + l_new_objects_count integer := 0; pragma autonomous_transaction; begin - update ut_annotation_cache_info i - set i.parse_time = systimestamp - where (i.object_owner, i.object_name, i.object_type) - in ((a_object.object_owner, a_object.object_name, a_object.object_type)) - returning cache_id into l_cache_id; - if sql%rowcount = 0 then - insert into ut_annotation_cache_info - (cache_id, object_owner, object_name, object_type, parse_time) - values (ut_annotation_cache_seq.nextval, a_object.object_owner, a_object.object_name, a_object.object_type, systimestamp) + -- if not in trigger, or object has annotations + if ora_sysevent is null or a_object.annotations is not null and a_object.annotations.count > 0 then + + update ut_annotation_cache_info i + set i.parse_time = systimestamp + where (i.object_owner, i.object_name, i.object_type) + in ((a_object.object_owner, a_object.object_name, a_object.object_type)) returning cache_id into l_cache_id; + + if sql%rowcount = 0 then + + insert into ut_annotation_cache_info + (cache_id, object_owner, object_name, object_type, parse_time) + values (ut_annotation_cache_seq.nextval, a_object.object_owner, a_object.object_name, a_object.object_type, systimestamp) + returning cache_id into l_cache_id; + l_new_objects_count := 1; + end if; + end if; - delete from ut_annotation_cache c - where cache_id = l_cache_id; + update ut_annotation_cache_schema s + set s.object_count = s.object_count + l_new_objects_count, s.max_parse_time = systimestamp + where s.object_type = a_object.object_type and s.object_owner = a_object.object_owner; + + if sql%rowcount = 0 then + insert into ut_annotation_cache_schema s + (object_owner, object_type, object_count, max_parse_time) + values (a_object.object_owner, a_object.object_type, l_new_objects_count, systimestamp); + end if; + + delete from ut_annotation_cache c where cache_id = l_cache_id; if a_object.annotations is not null and a_object.annotations.count > 0 then insert into ut_annotation_cache @@ -73,17 +91,32 @@ create or replace package body ut_annotation_cache_manager as commit; end; + function get_cache_schema_info(a_object_owner varchar2, a_object_type varchar2) return t_cache_schema_info is + l_result t_cache_schema_info; + begin + begin + select * + into l_result + from ut_annotation_cache_schema s + where s.object_type = a_object_type and s.object_owner = a_object_owner; + exception + when no_data_found then + null; + end; + return l_result; + end; + procedure remove_from_cache(a_objects ut_annotation_objs_cache_info) is pragma autonomous_transaction; begin delete from ut_annotation_cache_info i - where exists ( - select 1 from table (a_objects) o - where o.object_name = i.object_name - and o.object_type = i.object_type - and o.object_owner = i.object_owner - ); + where exists ( + select 1 from table (a_objects) o + where o.object_name = i.object_name + and o.object_type = i.object_type + and o.object_owner = i.object_owner + ); commit; end; @@ -139,6 +172,12 @@ create or replace package body ut_annotation_cache_manager as delete from ut_annotation_cache_info i where ' || l_filter using a_object_owner, a_object_type; + + execute immediate ' + delete from ut_annotation_cache_schema s + where ' || l_filter + using a_object_owner, a_object_type; + commit; end; diff --git a/source/core/annotations/ut_annotation_cache_manager.pks b/source/core/annotations/ut_annotation_cache_manager.pks index 1279c8cc3..ab794ceb1 100644 --- a/source/core/annotations/ut_annotation_cache_manager.pks +++ b/source/core/annotations/ut_annotation_cache_manager.pks @@ -15,7 +15,7 @@ create or replace package ut_annotation_cache_manager authid definer as See the License for the specific language governing permissions and limitations under the License. */ - + subtype t_cache_schema_info is ut_annotation_cache_schema%rowtype; /** * Populates cache with information about object and it's annotations * Cache information for individual object is modified by this code @@ -34,6 +34,8 @@ create or replace package ut_annotation_cache_manager authid definer as */ function get_annotations_for_objects(a_cached_objects ut_annotation_objs_cache_info, a_parse_time timestamp) return sys_refcursor; + function get_cache_schema_info(a_object_owner varchar2, a_object_type varchar2) return t_cache_schema_info; + /** * Removes cached information about annotations for objects on the list and updates parse_time in cache info table. * diff --git a/source/core/annotations/ut_annotation_cache_schema.sql b/source/core/annotations/ut_annotation_cache_schema.sql new file mode 100644 index 000000000..77b45fe3e --- /dev/null +++ b/source/core/annotations/ut_annotation_cache_schema.sql @@ -0,0 +1,21 @@ +create table ut_annotation_cache_schema ( + /* + utPLSQL - Version 3 + Copyright 2016 - 2017 utPLSQL Project + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + object_owner varchar2(250) not null, + object_type varchar2(250) not null, + object_count integer not null, + max_parse_time date not null, + constraint ut_annotation_cache_schema_pk primary key(object_owner, object_type) +) organization index; + diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index 87ad51475..f5daaa95a 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -58,26 +58,39 @@ create or replace package body ut_annotation_manager as l_cursor_text varchar2(32767); l_result ut_annotation_objs_cache_info; begin - l_cursor_text := - q'[select ]'||l_ut_owner||q'[.ut_annotation_obj_cache_info( - object_owner => o.owner, - object_name => o.object_name, - object_type => o.object_type, - needs_refresh => case when o.last_ddl_time < cast(i.parse_time as date) then 'N' else 'Y' end - ) - from ]'||l_objects_view||q'[ o - left join ]'||l_ut_owner||q'[.ut_annotation_cache_info i - on o.owner = i.object_owner - and o.object_name = i.object_name - and o.object_type = i.object_type - where o.owner = ']'||a_object_owner||q'[' - and o.object_type = ']'||a_object_type||q'[' - and ]' - || case - when a_parse_date is null - then ':a_parse_date is null' - else 'o.last_ddl_time >= cast(:a_parse_date as date)' - end; + if ut_trigger_check.is_alive() then + l_cursor_text := + q'[select ]'||l_ut_owner||q'[.ut_annotation_obj_cache_info( + object_owner => i.object_owner, + object_name => i.object_name, + object_type => i.object_type, + needs_refresh => 'N' + ) + from ]'||l_ut_owner||q'[.ut_annotation_cache_info i + where i.object_owner = :a_object_owner + and i.object_type = :a_object_type]'; + else + l_cursor_text := + q'[select ]'||l_ut_owner||q'[.ut_annotation_obj_cache_info( + object_owner => o.owner, + object_name => o.object_name, + object_type => o.object_type, + needs_refresh => case when o.last_ddl_time < cast(i.parse_time as date) then 'N' else 'Y' end + ) + from ]'||l_objects_view||q'[ o + left join ]'||l_ut_owner||q'[.ut_annotation_cache_info i + on o.owner = i.object_owner + and o.object_name = i.object_name + and o.object_type = i.object_type + where o.owner = ']'||a_object_owner||q'[' + and o.object_type = ']'||a_object_type||q'[' + and ]' + || case + when a_parse_date is null + then ':a_parse_date is null' + else 'o.last_ddl_time >= cast(:a_parse_date as date)' + end; + end if; open l_rows for l_cursor_text using a_parse_date; fetch l_rows bulk collect into l_result limit 1000000; close l_rows; @@ -222,11 +235,55 @@ create or replace package body ut_annotation_manager as ); end; + procedure trigger_obj_annotation_rebuild is + l_sql_text ora_name_list_t; + l_parts binary_integer; + l_object_to_parse ut_annotation_obj_cache_info; + + function get_source_from_sql_text(a_object_name varchar2, a_sql_text ora_name_list_t, a_parts binary_integer) return sys_refcursor is + l_sql_clob clob; + l_sql_lines ut_varchar2_rows := ut_varchar2_rows(); + l_result sys_refcursor; + l_sql_text ora_name_list_t := a_sql_text; + begin + if a_parts > 0 then + l_sql_text(1) := regexp_replace(l_sql_text(1),'^\s*create(\s+or\s+replace)?\s+', modifier => 'i'); + for i in 1..a_parts loop + ut_utils.append_to_clob(l_sql_clob, l_sql_text(i)); + end loop; + l_sql_lines := ut_utils.convert_collection( ut_utils.clob_to_table(l_sql_clob) ); + end if; + open l_result for + select a_object_name as name, column_value||chr(10) as text from table(l_sql_lines); + return l_result; + end; + begin + ut_trigger_check.is_alive(); + + if ora_dict_obj_type = 'PACKAGE' then + + l_object_to_parse := ut_annotation_obj_cache_info(ora_dict_obj_owner, ora_dict_obj_name, ora_dict_obj_type, 'Y'); + + if ora_sysevent = 'CREATE' then + l_parts := ORA_SQL_TXT(l_sql_text); + build_annot_cache_for_sources( + ora_dict_obj_owner, ora_dict_obj_type, + get_source_from_sql_text(ora_dict_obj_name, l_sql_text, l_parts) + ); + elsif ora_sysevent = 'ALTER' then + null; + --update parse_time + elsif ora_sysevent = 'DROP' then + ut_annotation_cache_manager.remove_from_cache(ut_annotation_objs_cache_info(l_object_to_parse)); + end if; + end if; + end; + function get_annotated_objects(a_object_owner varchar2, a_object_type varchar2, a_parse_date timestamp := null) return ut_annotated_objects pipelined is l_info_rows ut_annotation_objs_cache_info; l_cursor sys_refcursor; l_results ut_annotated_objects; - c_object_fetch_limit constant integer := 10; + c_object_fetch_limit constant integer := 10; begin l_info_rows := get_annotation_objs_info(a_object_owner, a_object_type, a_parse_date); diff --git a/source/core/annotations/ut_annotation_manager.pks b/source/core/annotations/ut_annotation_manager.pks index 25de25d58..729d2d4ee 100644 --- a/source/core/annotations/ut_annotation_manager.pks +++ b/source/core/annotations/ut_annotation_manager.pks @@ -43,6 +43,11 @@ create or replace package ut_annotation_manager authid current_user as */ procedure rebuild_annotation_cache(a_object_owner varchar2, a_object_type varchar2); + /** + * Rebuilds annotation cache for a specified object. + */ + procedure trigger_obj_annotation_rebuild; + /** * Removes cached information about annotations for objects of specified type and specified owner * diff --git a/source/core/annotations/ut_trigger_annotation_parsing.trg b/source/core/annotations/ut_trigger_annotation_parsing.trg new file mode 100644 index 000000000..f01820437 --- /dev/null +++ b/source/core/annotations/ut_trigger_annotation_parsing.trg @@ -0,0 +1,15 @@ +create or replace trigger ut_trigger_annotation_parsing + after create or alter or drop +on database +begin + if ora_dict_obj_type = 'PACKAGE' + or (ora_dict_obj_owner = UPPER('&&UT3_OWNER') + and ora_dict_obj_name = 'UT3_TRIGGER_ALIVE' + and ora_dict_obj_type = 'SYNONYM') + then + execute immediate 'begin ut_annotation_manager.trigger_obj_annotation_rebuild; end;'; + end if; +exception + when others then null; +end; +/ diff --git a/source/core/annotations/ut_trigger_check.pkb b/source/core/annotations/ut_trigger_check.pkb new file mode 100644 index 000000000..542a8b63c --- /dev/null +++ b/source/core/annotations/ut_trigger_check.pkb @@ -0,0 +1,40 @@ +create or replace package body ut_trigger_check is + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + g_is_trigger_live boolean := false; + + function is_alive return boolean is + pragma autonomous_transaction; + l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_is_trigger_live boolean; + begin + execute immediate 'create or replace synonym '||l_ut_owner||'.ut3_trigger_alive for no_object'; + l_is_trigger_live := g_is_trigger_live; + g_is_trigger_live := false; + return l_is_trigger_live; + end; + + procedure is_alive is + begin + if ora_dict_obj_owner = 'UT3' and ora_dict_obj_name = 'UT3_TRIGGER_TEST' and ora_dict_obj_type = 'SYNONYM' then + g_is_trigger_live := true; + end if; + end; + +end; +/ diff --git a/source/core/annotations/ut_trigger_check.pks b/source/core/annotations/ut_trigger_check.pks new file mode 100644 index 000000000..b82692082 --- /dev/null +++ b/source/core/annotations/ut_trigger_check.pks @@ -0,0 +1,28 @@ +create or replace package ut_trigger_check authid definer is + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + /** + * checks if the trigger &&UT3_OWNER._PARSE is enabled and operational. + */ + + function is_alive return boolean; + + procedure is_alive; + +end; +/ diff --git a/source/create_utplsql_owner.sql b/source/create_utplsql_owner.sql index a74ee6c44..2df63f27f 100644 --- a/source/create_utplsql_owner.sql +++ b/source/create_utplsql_owner.sql @@ -29,7 +29,7 @@ prompt Creating utPLSQL user &&ut3_user create user &ut3_user identified by "&ut3_password" default tablespace &ut3_tablespace quota unlimited on &ut3_tablespace; -grant create session, create sequence, create procedure, create type, create table, create view, create synonym to &ut3_user; +grant create session, create sequence, create procedure, create type, create table, create view, create synonym, administer database trigger to &ut3_user; begin $if dbms_db_version.version < 18 $then diff --git a/source/install.sql b/source/install.sql index 728f4349f..ffd8f189b 100644 --- a/source/install.sql +++ b/source/install.sql @@ -109,6 +109,8 @@ alter session set current_schema = &&ut3_owner; @@install_component.sql 'core/types/ut_output_reporter_base.tps' --annotations +@@install_component.sql 'core/annotations/ut_trigger_check.pks' +@@install_component.sql 'core/annotations/ut_trigger_check.pkb' @@install_component.sql 'core/annotations/ut_annotation.tps' @@install_component.sql 'core/annotations/ut_annotations.tps' @@install_component.sql 'core/annotations/ut_annotated_object.tps' @@ -116,6 +118,7 @@ alter session set current_schema = &&ut3_owner; @@install_component.sql 'core/annotations/ut_annotation_obj_cache_info.tps' @@install_component.sql 'core/annotations/ut_annotation_objs_cache_info.tps' @@install_component.sql 'core/annotations/ut_annotation_cache_seq.sql' +@@install_component.sql 'core/annotations/ut_annotation_cache_schema.sql' @@install_component.sql 'core/annotations/ut_annotation_cache_info.sql' @@install_component.sql 'core/annotations/ut_annotation_cache.sql' @@install_component.sql 'core/annotations/ut_annotation_cache_manager.pks' @@ -124,6 +127,7 @@ alter session set current_schema = &&ut3_owner; @@install_component.sql 'core/annotations/ut_annotation_parser.pkb' @@install_component.sql 'core/annotations/ut_annotation_manager.pks' @@install_component.sql 'core/annotations/ut_annotation_manager.pkb' +@@install_component.sql 'core/annotations/ut_trigger_annotation_parsing.trg' --suite builder @@install_component.sql 'core/ut_suite_cache_schema.sql' diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index e2295f34d..e8f7b596f 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -157,6 +157,8 @@ drop table ut_compound_data_tmp; drop table ut_compound_data_diff_tmp; +drop trigger ut_trigger_annotation_parsing; + drop package ut_annotation_manager; drop package ut_annotation_parser; @@ -167,6 +169,8 @@ drop table ut_annotation_cache cascade constraints; drop table ut_annotation_cache_info cascade constraints; +drop table ut_annotation_cache_schema cascade constraints; + drop sequence ut_annotation_cache_seq; drop type ut_annotation_objs_cache_info force; @@ -181,6 +185,8 @@ drop type ut_annotations force; drop type ut_annotation force; +drop package ut_trigger_check; + drop package ut_file_mapper; drop package ut_metadata; From 7a56fe7c7fc06f828f9c5d1ae228c651855fd31a Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 29 Mar 2019 02:01:19 +0000 Subject: [PATCH 0414/1096] Fixed some issues with trigger Some tests need to be fixed to disable trigger before testing Some tests need to be added to prove trigger is working --- .../annotations/ut_annotation_manager.pkb | 14 ++++++-- .../core/annotations/ut_annotation_parser.pkb | 3 +- .../ut_trigger_annotation_parsing.trg | 8 ++++- source/core/annotations/ut_trigger_check.pkb | 13 ++++--- source/core/ut_suite_manager.pkb | 36 +++++++++---------- source/core/ut_utils.pkb | 2 +- source/install.sql | 3 +- .../annotations/test_annotation_manager.pks | 3 ++ .../annotations/test_annotation_parser.pks | 1 + test/ut3_user/api/test_ut_runner.pkb | 4 +-- test/ut3_user/api/test_ut_runner.pks | 1 + 11 files changed, 55 insertions(+), 33 deletions(-) diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index f5daaa95a..2b35128a4 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -58,6 +58,10 @@ create or replace package body ut_annotation_manager as l_cursor_text varchar2(32767); l_result ut_annotation_objs_cache_info; begin + ut_event_manager.trigger_event( + 'get_annotation_objs_info - start ( ut_trigger_check.is_alive = ' + || case when ut_trigger_check.is_alive() then 'Y' else 'N' end || ' )' + ); if ut_trigger_check.is_alive() then l_cursor_text := q'[select ]'||l_ut_owner||q'[.ut_annotation_obj_cache_info( @@ -69,6 +73,7 @@ create or replace package body ut_annotation_manager as from ]'||l_ut_owner||q'[.ut_annotation_cache_info i where i.object_owner = :a_object_owner and i.object_type = :a_object_type]'; + open l_rows for l_cursor_text using a_object_owner, a_object_type; else l_cursor_text := q'[select ]'||l_ut_owner||q'[.ut_annotation_obj_cache_info( @@ -90,10 +95,11 @@ create or replace package body ut_annotation_manager as then ':a_parse_date is null' else 'o.last_ddl_time >= cast(:a_parse_date as date)' end; + open l_rows for l_cursor_text using a_parse_date; end if; - open l_rows for l_cursor_text using a_parse_date; fetch l_rows bulk collect into l_result limit 1000000; close l_rows; + ut_event_manager.trigger_event('get_annotation_objs_info - end (count='||l_result.count||')'); return l_result; end; @@ -203,6 +209,7 @@ create or replace package body ut_annotation_manager as select value(x)bulk collect into l_objects_to_parse from table(a_info_rows) x where x.needs_refresh = 'Y'; + ut_event_manager.trigger_event('rebuild_annotation_cache - start (l_objects_to_parse.count = '||l_objects_to_parse.count||')'); ut_annotation_cache_manager.cleanup_cache(l_objects_to_parse); if sys_context('userenv','current_schema') = a_object_owner @@ -221,6 +228,7 @@ create or replace package body ut_annotation_manager as get_sources_to_annotate(a_object_owner, a_object_type, l_objects_to_parse) ); end if; + ut_event_manager.trigger_event('rebuild_annotation_cache - end'); end; ------------------------------------------------------------ @@ -260,7 +268,7 @@ create or replace package body ut_annotation_manager as begin ut_trigger_check.is_alive(); - if ora_dict_obj_type = 'PACKAGE' then + if ora_dict_obj_type in ('PACKAGE','PROCEDURE','FUNCTION','TYPE') then l_object_to_parse := ut_annotation_obj_cache_info(ora_dict_obj_owner, ora_dict_obj_name, ora_dict_obj_type, 'Y'); @@ -285,6 +293,7 @@ create or replace package body ut_annotation_manager as l_results ut_annotated_objects; c_object_fetch_limit constant integer := 10; begin + ut_event_manager.trigger_event('get_annotated_objects - start'); l_info_rows := get_annotation_objs_info(a_object_owner, a_object_type, a_parse_date); rebuild_annotation_cache(a_object_owner, a_object_type, l_info_rows); @@ -299,6 +308,7 @@ create or replace package body ut_annotation_manager as exit when l_cursor%notfound; end loop; close l_cursor; + ut_event_manager.trigger_event('get_annotated_objects - end'); end; procedure purge_cache(a_object_owner varchar2, a_object_type varchar2) is diff --git a/source/core/annotations/ut_annotation_parser.pkb b/source/core/annotations/ut_annotation_parser.pkb index 8d3cee3ad..49882845d 100644 --- a/source/core/annotations/ut_annotation_parser.pkb +++ b/source/core/annotations/ut_annotation_parser.pkb @@ -234,8 +234,9 @@ create or replace package body ut_annotation_parser as if a_source_lines.count > 0 then --convert to post-processed source clob begin + l_processed_lines := a_source_lines; --get post-processed source - l_processed_lines := sys.dbms_preprocessor.get_post_processed_source(a_source_lines); +-- l_processed_lines := sys.dbms_preprocessor.get_post_processed_source(a_source_lines); --convert to clob for i in 1..l_processed_lines.count loop ut_utils.append_to_clob(l_source, replace(l_processed_lines(i), chr(13)||chr(10), chr(10))); diff --git a/source/core/annotations/ut_trigger_annotation_parsing.trg b/source/core/annotations/ut_trigger_annotation_parsing.trg index f01820437..46703d69a 100644 --- a/source/core/annotations/ut_trigger_annotation_parsing.trg +++ b/source/core/annotations/ut_trigger_annotation_parsing.trg @@ -2,7 +2,13 @@ create or replace trigger ut_trigger_annotation_parsing after create or alter or drop on database begin - if ora_dict_obj_type = 'PACKAGE' + if ( ora_dict_obj_type in ('PACKAGE','PROCEDURE','FUNCTION','TYPE') + and ora_dict_obj_owner + not in ( + 'ANONYMOUS','APPQOSSYS','AUDSYS','DBSFWUSER','DBSNMP','DIP','GGSYS','GSMADMIN_INTERNAL', + 'GSMCATUSER','GSMUSER','ORACLE_OCM','OUTLN','REMOTE_SCHEDULER_AGENT','SYS','SYS$UMF', + 'SYSBACKUP','SYSDG','SYSKM','SYSRAC','SYSTEM','WMSYS','XDB','XS$NULL') + ) or (ora_dict_obj_owner = UPPER('&&UT3_OWNER') and ora_dict_obj_name = 'UT3_TRIGGER_ALIVE' and ora_dict_obj_type = 'SYNONYM') diff --git a/source/core/annotations/ut_trigger_check.pkb b/source/core/annotations/ut_trigger_check.pkb index 542a8b63c..7849cd5de 100644 --- a/source/core/annotations/ut_trigger_check.pkb +++ b/source/core/annotations/ut_trigger_check.pkb @@ -17,21 +17,20 @@ create or replace package body ut_trigger_check is */ g_is_trigger_live boolean := false; + gc_check_object_name varchar2(128) := 'UT3_TRIGGER_ALIVE'; function is_alive return boolean is pragma autonomous_transaction; - l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_is_trigger_live boolean; begin - execute immediate 'create or replace synonym '||l_ut_owner||'.ut3_trigger_alive for no_object'; - l_is_trigger_live := g_is_trigger_live; - g_is_trigger_live := false; - return l_is_trigger_live; + if not g_is_trigger_live then + execute immediate 'create or replace synonym '||ut_utils.ut_owner||'.'||gc_check_object_name||' for no_object'; + end if; + return g_is_trigger_live; end; procedure is_alive is begin - if ora_dict_obj_owner = 'UT3' and ora_dict_obj_name = 'UT3_TRIGGER_TEST' and ora_dict_obj_type = 'SYNONYM' then + if ora_dict_obj_owner = ut_utils.ut_owner and ora_dict_obj_name = gc_check_object_name and ora_dict_obj_type = 'SYNONYM' then g_is_trigger_live := true; end if; end; diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 51d3fa1e4..8f711991c 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -341,11 +341,10 @@ create or replace package body ut_suite_manager is from ]'||l_ut_owner||q'[.ut_suite_cache_package i where not exists ( - select 1 from ]'||l_objects_view||q'[ o - where o.owner = i.object_owner + select 1 from ]'||l_ut_owner||q'[.ut_annotation_cache_info o + where o.object_owner = i.object_owner and o.object_name = i.object_name and o.object_type = 'PACKAGE' - and o.owner = ']'||a_object_owner||q'[' ) and i.object_owner = ']'||a_object_owner||q'[']'; open l_rows for l_cursor_text; @@ -479,7 +478,7 @@ create or replace package body ut_suite_manager is a_owner_name varchar2 ) return boolean is begin - return sys_context( 'userenv', 'current_schema' ) = a_owner_name or ut_metadata.user_has_execute_any_proc(); + return sys_context( 'userenv', 'current_schema' ) = a_owner_name or ut_metadata.user_has_execute_any_proc() or ut_trigger_check.is_alive(); end; procedure build_and_cache_suites( @@ -493,6 +492,7 @@ create or replace package body ut_suite_manager is ex_string_too_small exception; pragma exception_init (ex_string_too_small,-06502); begin + ut_event_manager.trigger_event('build_and_cache_suites - start'); loop fetch a_annotated_objects bulk collect into l_annotated_objects limit 10; @@ -521,28 +521,25 @@ create or replace package body ut_suite_manager is ut_utils.to_string(gc_suitpath_error_message||ut_utils.table_to_clob(l_bad_suitepath_obj,',')) ); end if; + ut_event_manager.trigger_event('build_and_cache_suites - end'); end; procedure refresh_cache( - a_owner_name varchar2, - a_annotations_cursor sys_refcursor := null + a_owner_name varchar2 ) is l_annotations_cursor sys_refcursor; l_suite_cache_time timestamp; begin + ut_event_manager.trigger_event('refresh_cache - start'); l_suite_cache_time := ut_suite_cache_manager.get_schema_parse_time(a_owner_name); - if a_annotations_cursor is not null then - l_annotations_cursor := a_annotations_cursor; - else - open l_annotations_cursor for - q'[select value(x) - from table( - ]' || ut_utils.ut_owner || q'[.ut_annotation_manager.get_annotated_objects( - :a_owner_name, 'PACKAGE', :a_suite_cache_parse_time - ) - )x ]' - using a_owner_name, l_suite_cache_time; - end if; + open l_annotations_cursor for + q'[select value(x) + from table( + ]' || ut_utils.ut_owner || q'[.ut_annotation_manager.get_annotated_objects( + :a_owner_name, 'PACKAGE', :a_suite_cache_parse_time + ) + )x ]' + using a_owner_name, l_suite_cache_time; build_and_cache_suites(a_owner_name, l_annotations_cursor); @@ -550,6 +547,7 @@ create or replace package body ut_suite_manager is ut_suite_cache_manager.remove_from_cache( a_owner_name, get_missing_objects(a_owner_name) ); end if; + ut_event_manager.trigger_event('refresh_cache - end'); end; procedure add_suites_for_path( @@ -672,6 +670,7 @@ create or replace package body ut_suite_manager is l_index varchar2(4000 char); l_schema_paths t_schema_paths; begin + ut_event_manager.trigger_event('configure_execution_by_path - start'); a_suites := ut_suite_items(); --resolve schema names from paths and group paths by schema name resolve_schema_names(l_paths); @@ -711,6 +710,7 @@ create or replace package body ut_suite_manager is a_suites(i).set_rollback_type( a_suites(i).get_rollback_type() ); end loop; + ut_event_manager.trigger_event('configure_execution_by_path - start'); end configure_execution_by_path; function get_suites_info( diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index dcf24f2e4..b66c99c48 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -552,7 +552,7 @@ create or replace package body ut_utils is function scale_cardinality(a_cardinality natural) return natural is begin - return nvl(trunc(power(10,(floor(log(10,a_cardinality))+1))/3),0); + return case when a_cardinality > 0 then trunc(power(10,(floor(log(10,a_cardinality))+1))/3) else 1 end; end; function build_depreciation_warning(a_old_syntax varchar2, a_new_syntax varchar2) return varchar2 is diff --git a/source/install.sql b/source/install.sql index ffd8f189b..a7dd53aaa 100644 --- a/source/install.sql +++ b/source/install.sql @@ -127,7 +127,6 @@ alter session set current_schema = &&ut3_owner; @@install_component.sql 'core/annotations/ut_annotation_parser.pkb' @@install_component.sql 'core/annotations/ut_annotation_manager.pks' @@install_component.sql 'core/annotations/ut_annotation_manager.pkb' -@@install_component.sql 'core/annotations/ut_trigger_annotation_parsing.trg' --suite builder @@install_component.sql 'core/ut_suite_cache_schema.sql' @@ -336,6 +335,8 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'api/match.syn' @@install_component.sql 'api/contain.syn' +@@install_component.sql 'core/annotations/ut_trigger_annotation_parsing.trg' + set linesize 200 set define on column text format a100 diff --git a/test/ut3_tester/core/annotations/test_annotation_manager.pks b/test/ut3_tester/core/annotations/test_annotation_manager.pks index b2f351a6f..e71a92904 100644 --- a/test/ut3_tester/core/annotations/test_annotation_manager.pks +++ b/test/ut3_tester/core/annotations/test_annotation_manager.pks @@ -21,11 +21,13 @@ create or replace package test_annotation_manager is --%test(Adds new package to annotation cache info) --%beforetest(create_dummy_package) --%aftertest(drop_dummy_package) + --%disabled(TODO - make it run with triger disabled) procedure add_new_package; --%test(Updates annotation cache info for modified package) --%beforetest(create_dummy_package) --%aftertest(drop_dummy_package) + --%disabled(TODO - make it run with triger disabled) procedure update_modified_package; --%test(Adds annotations to cache for unit test package) @@ -41,6 +43,7 @@ create or replace package test_annotation_manager is --%test(Keeps annotations in cache when object was removed but user can't see whole schema) --%beforetest(create_dummy_test_package,create_parse_proc_as_ut3$user#) --%aftertest(drop_parse_proc_as_ut3$user#) + --%disabled(no longer true with trigger enabled) procedure keep_dropped_data_in_cache; --%test(Does not return data for dropped object) diff --git a/test/ut3_tester/core/annotations/test_annotation_parser.pks b/test/ut3_tester/core/annotations/test_annotation_parser.pks index a4fe3ed70..7e649caf9 100644 --- a/test/ut3_tester/core/annotations/test_annotation_parser.pks +++ b/test/ut3_tester/core/annotations/test_annotation_parser.pks @@ -21,6 +21,7 @@ create or replace package test_annotation_parser is procedure ignore_annotations_in_comments; --%test(Ignores wrapped package and does not raise exception) + --%disabled(TODO - causes issues on 18c with install when trigger enabled) procedure ignore_wrapped_package; --%test(Parses package level annotations with annotation params containing brackets) diff --git a/test/ut3_user/api/test_ut_runner.pkb b/test/ut3_user/api/test_ut_runner.pkb index 298c15c2a..966611dae 100644 --- a/test/ut3_user/api/test_ut_runner.pkb +++ b/test/ut3_user/api/test_ut_runner.pkb @@ -188,7 +188,7 @@ end;'; procedure test_purge_cache_schema_type is l_actual sys_refcursor; begin - + open l_actual for select * from ut3.ut_annotation_cache_info where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PROCEDURE'; @@ -220,7 +220,7 @@ end;'; l_actual integer; begin --Act - ut3.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); + ut3.ut_runner.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); --Assert select count(1) into l_actual from ut3.ut_annotation_cache_info i diff --git a/test/ut3_user/api/test_ut_runner.pks b/test/ut3_user/api/test_ut_runner.pks index 70eed747f..87a932f4f 100644 --- a/test/ut3_user/api/test_ut_runner.pks +++ b/test/ut3_user/api/test_ut_runner.pks @@ -45,6 +45,7 @@ create or replace package test_ut_runner is --%test(Rebuilds cache for a given schema and object type) --%beforetest(setup_cache_objects) --%aftertest(cleanup_cache) + --%DISABLED(TODO -disable trigger for this test to pass) procedure test_rebuild_cache_schema_type; --%test(get_suites_info returns a cursor containing records for a newly created test) From 71b50f798916a4c5cb1847d5510e0f9df2e1cb7d Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 29 Mar 2019 18:17:22 +0000 Subject: [PATCH 0415/1096] Fixed uninstall script and constant. Disabled `-scc` flag in tests --- source/core/annotations/ut_trigger_check.pkb | 4 ++-- source/uninstall_objects.sql | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/source/core/annotations/ut_trigger_check.pkb b/source/core/annotations/ut_trigger_check.pkb index 7849cd5de..508e50e0f 100644 --- a/source/core/annotations/ut_trigger_check.pkb +++ b/source/core/annotations/ut_trigger_check.pkb @@ -16,8 +16,8 @@ create or replace package body ut_trigger_check is limitations under the License. */ - g_is_trigger_live boolean := false; - gc_check_object_name varchar2(128) := 'UT3_TRIGGER_ALIVE'; + g_is_trigger_live boolean := false; + gc_check_object_name constant varchar2(128) := 'UT3_TRIGGER_ALIVE'; function is_alive return boolean is pragma autonomous_transaction; diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index e8f7b596f..45c17fbab 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -1,4 +1,9 @@ set echo on + +drop trigger ut_trigger_annotation_parsing; + +drop synonym ut3_trigger_alive; + drop synonym be_between; drop synonym have_count; From db8ef50f2fe784bc74dd6cbadcae459a6c998811 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 17 Apr 2019 23:55:53 +0100 Subject: [PATCH 0416/1096] Removed commented code. --- source/core/output_buffers/ut_output_buffer_tmp.sql | 9 --------- 1 file changed, 9 deletions(-) diff --git a/source/core/output_buffers/ut_output_buffer_tmp.sql b/source/core/output_buffers/ut_output_buffer_tmp.sql index d596a4908..e78a71c15 100644 --- a/source/core/output_buffers/ut_output_buffer_tmp.sql +++ b/source/core/output_buffers/ut_output_buffer_tmp.sql @@ -36,15 +36,6 @@ begin overflow nologging initrans 100 '; execute immediate v_table_sql; --- begin --- execute immediate --- v_table_sql || 'lob(text) store as securefile ut_output_text(retention none enable storage in row)'; --- exception --- when e_non_assm then --- execute immediate --- v_table_sql || 'lob(text) store as basicfile ut_output_text(pctversion 0 enable storage in row)'; --- --- end; end; / From 30586106dfc06bee8f6ce6e34ef3a9419e78f488 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sun, 14 Apr 2019 12:22:49 +0100 Subject: [PATCH 0417/1096] Added tags for tests and tags for suite. --- source/api/ut.pkb | 88 ++++++++++++++------- source/api/ut.pks | 36 ++++++--- source/api/ut_runner.pkb | 16 +++- source/api/ut_runner.pks | 3 +- source/core/types/ut_run.tpb | 4 +- source/core/types/ut_run.tps | 4 +- source/core/types/ut_suite.tpb | 4 +- source/core/types/ut_suite.tps | 7 +- source/core/types/ut_test.tpb | 3 +- source/core/types/ut_test.tps | 8 +- source/core/ut_suite_builder.pkb | 66 +++++++++++++++- source/core/ut_suite_cache.sql | 5 +- source/core/ut_suite_cache_manager.pkb | 12 ++- source/core/ut_suite_manager.pkb | 88 +++++++++++++++------ source/core/ut_suite_manager.pks | 3 +- source/core/ut_utils.pkb | 14 ++++ source/core/ut_utils.pks | 4 +- test/ut3_tester/core/test_suite_builder.pkb | 7 ++ 18 files changed, 286 insertions(+), 86 deletions(-) diff --git a/source/api/ut.pkb b/source/api/ut.pkb index 5e13dcc62..96cf51102 100644 --- a/source/api/ut.pkb +++ b/source/api/ut.pkb @@ -120,7 +120,8 @@ create or replace package body ut is a_exclude_objects ut_varchar2_list, a_client_character_set varchar2, a_random_test_order integer, - a_random_test_order_seed positive + a_random_test_order_seed positive, + a_tags ut_varchar2_rows := null ) is pragma autonomous_transaction; begin @@ -138,7 +139,8 @@ create or replace package body ut is a_client_character_set, false, ut_utils.int_to_boolean(a_random_test_order), - a_random_test_order_seed + a_random_test_order_seed, + a_tags ); rollback; end; @@ -154,7 +156,8 @@ create or replace package body ut is a_exclude_objects ut_varchar2_list, a_client_character_set varchar2, a_random_test_order integer, - a_random_test_order_seed positive + a_random_test_order_seed positive, + a_tags ut_varchar2_rows := null ) is pragma autonomous_transaction; begin @@ -172,7 +175,8 @@ create or replace package body ut is a_client_character_set, false, ut_utils.int_to_boolean(a_random_test_order), - a_random_test_order_seed + a_random_test_order_seed, + a_tags ); rollback; end; @@ -212,7 +216,8 @@ create or replace package body ut is a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null, a_random_test_order integer := 0, - a_random_test_order_seed positive := null + a_random_test_order_seed positive := null, + a_tags varchar2 := null ) return ut_varchar2_rows pipelined is l_reporter ut_reporter_base := a_reporter; l_results sys_refcursor; @@ -228,7 +233,8 @@ create or replace package body ut is a_exclude_objects, a_client_character_set, a_random_test_order, - a_random_test_order_seed + a_random_test_order_seed, + ut_varchar2_rows(a_tags) ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); @@ -249,7 +255,8 @@ create or replace package body ut is a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null, a_random_test_order integer := 0, - a_random_test_order_seed positive := null + a_random_test_order_seed positive := null, + a_tags varchar2 := null ) return ut_varchar2_rows pipelined is l_reporter ut_reporter_base := a_reporter; l_results sys_refcursor; @@ -265,7 +272,8 @@ create or replace package body ut is a_exclude_objects, a_client_character_set, a_random_test_order, - a_random_test_order_seed + a_random_test_order_seed, + ut_varchar2_rows(a_tags) ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); @@ -287,7 +295,8 @@ create or replace package body ut is a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null, a_random_test_order integer := 0, - a_random_test_order_seed positive := null + a_random_test_order_seed positive := null, + a_tags varchar2 := null ) return ut_varchar2_rows pipelined is l_reporter ut_reporter_base := a_reporter; l_results sys_refcursor; @@ -303,7 +312,8 @@ create or replace package body ut is a_exclude_objects, a_client_character_set, a_random_test_order, - a_random_test_order_seed + a_random_test_order_seed, + ut_varchar2_rows(a_tags) ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); @@ -325,7 +335,8 @@ create or replace package body ut is a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null, a_random_test_order integer := 0, - a_random_test_order_seed positive := null + a_random_test_order_seed positive := null, + a_tags varchar2 := null ) return ut_varchar2_rows pipelined is l_reporter ut_reporter_base := a_reporter; l_results sys_refcursor; @@ -341,7 +352,8 @@ create or replace package body ut is a_exclude_objects, a_client_character_set, a_random_test_order, - a_random_test_order_seed + a_random_test_order_seed, + ut_varchar2_rows(a_tags) ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); @@ -363,7 +375,8 @@ create or replace package body ut is a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null, a_random_test_order integer := 0, - a_random_test_order_seed positive := null + a_random_test_order_seed positive := null, + a_tags varchar2 := null ) return ut_varchar2_rows pipelined is l_reporter ut_reporter_base := a_reporter; l_results sys_refcursor; @@ -379,7 +392,8 @@ create or replace package body ut is a_exclude_objects, a_client_character_set, a_random_test_order, - a_random_test_order_seed + a_random_test_order_seed, + ut_varchar2_rows(a_tags) ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); @@ -401,7 +415,8 @@ create or replace package body ut is a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null, a_random_test_order integer := 0, - a_random_test_order_seed positive := null + a_random_test_order_seed positive := null, + a_tags varchar2 := null ) return ut_varchar2_rows pipelined is l_reporter ut_reporter_base := a_reporter; l_results sys_refcursor; @@ -417,7 +432,8 @@ create or replace package body ut is a_exclude_objects, a_client_character_set, a_random_test_order, - a_random_test_order_seed + a_random_test_order_seed, + ut_varchar2_rows(a_tags) ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); @@ -440,7 +456,8 @@ create or replace package body ut is a_client_character_set varchar2 := null, a_force_manual_rollback boolean := false, a_random_test_order boolean := false, - a_random_test_order_seed positive := null + a_random_test_order_seed positive := null, + a_tags ut_varchar2_rows := null ) is l_reporter ut_reporter_base := a_reporter; begin @@ -459,7 +476,8 @@ create or replace package body ut is a_client_character_set, a_force_manual_rollback, a_random_test_order, - a_random_test_order_seed + a_random_test_order_seed, + a_tags ); else run_autonomous( @@ -473,7 +491,8 @@ create or replace package body ut is a_exclude_objects, a_client_character_set, ut_utils.boolean_to_int(a_random_test_order), - a_random_test_order_seed + a_random_test_order_seed, + a_tags ); end if; if l_reporter is of (ut_output_reporter_base) then @@ -494,7 +513,8 @@ create or replace package body ut is a_client_character_set varchar2 := null, a_force_manual_rollback boolean := false, a_random_test_order boolean := false, - a_random_test_order_seed positive := null + a_random_test_order_seed positive := null, + a_tags ut_varchar2_rows := null ) is l_reporter ut_reporter_base := a_reporter; begin @@ -510,7 +530,8 @@ create or replace package body ut is a_client_character_set, a_force_manual_rollback, a_random_test_order, - a_random_test_order_seed + a_random_test_order_seed, + a_tags ); end; @@ -525,7 +546,8 @@ create or replace package body ut is a_client_character_set varchar2 := null, a_force_manual_rollback boolean := false, a_random_test_order boolean := false, - a_random_test_order_seed positive := null + a_random_test_order_seed positive := null, + a_tags varchar2 := null ) is begin ut.run( @@ -540,7 +562,8 @@ create or replace package body ut is a_client_character_set, a_force_manual_rollback, a_random_test_order, - a_random_test_order_seed + a_random_test_order_seed, + ut_varchar2_rows(a_tags) ); end; @@ -555,7 +578,8 @@ create or replace package body ut is a_client_character_set varchar2 := null, a_force_manual_rollback boolean := false, a_random_test_order boolean := false, - a_random_test_order_seed positive := null + a_random_test_order_seed positive := null, + a_tags varchar2 := null ) is begin ut.run( @@ -570,7 +594,8 @@ create or replace package body ut is a_client_character_set, a_force_manual_rollback, a_random_test_order, - a_random_test_order_seed + a_random_test_order_seed, + ut_varchar2_rows(a_tags) ); end; @@ -586,7 +611,8 @@ create or replace package body ut is a_client_character_set varchar2 := null, a_force_manual_rollback boolean := false, a_random_test_order boolean := false, - a_random_test_order_seed positive := null + a_random_test_order_seed positive := null, + a_tags varchar2 := null ) is begin ut.run( @@ -601,7 +627,8 @@ create or replace package body ut is a_client_character_set, a_force_manual_rollback, a_random_test_order, - a_random_test_order_seed + a_random_test_order_seed, + ut_varchar2_rows(a_tags) ); end; @@ -617,7 +644,8 @@ create or replace package body ut is a_client_character_set varchar2 := null, a_force_manual_rollback boolean := false, a_random_test_order boolean := false, - a_random_test_order_seed positive := null + a_random_test_order_seed positive := null, + a_tags varchar2 := null ) is begin ut.run( @@ -632,10 +660,12 @@ create or replace package body ut is a_client_character_set, a_force_manual_rollback, a_random_test_order, - a_random_test_order_seed + a_random_test_order_seed, + ut_varchar2_rows(a_tags) ); end; + procedure set_nls is begin if g_nls_date_format is null then diff --git a/source/api/ut.pks b/source/api/ut.pks index 7d3b191b3..e6065d85b 100644 --- a/source/api/ut.pks +++ b/source/api/ut.pks @@ -57,7 +57,8 @@ create or replace package ut authid current_user as a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null, a_random_test_order integer := 0, - a_random_test_order_seed positive := null + a_random_test_order_seed positive := null, + a_tags varchar2 := null ) return ut_varchar2_rows pipelined; function run( @@ -70,7 +71,8 @@ create or replace package ut authid current_user as a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null, a_random_test_order integer := 0, - a_random_test_order_seed positive := null + a_random_test_order_seed positive := null, + a_tags varchar2 := null ) return ut_varchar2_rows pipelined; function run( @@ -84,7 +86,8 @@ create or replace package ut authid current_user as a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null, a_random_test_order integer := 0, - a_random_test_order_seed positive := null + a_random_test_order_seed positive := null, + a_tags varchar2 := null ) return ut_varchar2_rows pipelined; function run( @@ -98,7 +101,8 @@ create or replace package ut authid current_user as a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null, a_random_test_order integer := 0, - a_random_test_order_seed positive := null + a_random_test_order_seed positive := null, + a_tags varchar2 := null ) return ut_varchar2_rows pipelined; function run( @@ -112,7 +116,8 @@ create or replace package ut authid current_user as a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null, a_random_test_order integer := 0, - a_random_test_order_seed positive := null + a_random_test_order_seed positive := null, + a_tags varchar2 := null ) return ut_varchar2_rows pipelined; function run( @@ -126,7 +131,8 @@ create or replace package ut authid current_user as a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null, a_random_test_order integer := 0, - a_random_test_order_seed positive := null + a_random_test_order_seed positive := null, + a_tags varchar2 := null ) return ut_varchar2_rows pipelined; procedure run( @@ -140,7 +146,8 @@ create or replace package ut authid current_user as a_client_character_set varchar2 := null, a_force_manual_rollback boolean := false, a_random_test_order boolean := false, - a_random_test_order_seed positive := null + a_random_test_order_seed positive := null, + a_tags varchar2 := null ); procedure run( @@ -154,7 +161,8 @@ create or replace package ut authid current_user as a_client_character_set varchar2 := null, a_force_manual_rollback boolean := false, a_random_test_order boolean := false, - a_random_test_order_seed positive := null + a_random_test_order_seed positive := null, + a_tags varchar2 := null ); procedure run( @@ -169,7 +177,8 @@ create or replace package ut authid current_user as a_client_character_set varchar2 := null, a_force_manual_rollback boolean := false, a_random_test_order boolean := false, - a_random_test_order_seed positive := null + a_random_test_order_seed positive := null, + a_tags ut_varchar2_rows := null ); procedure run( @@ -184,7 +193,8 @@ create or replace package ut authid current_user as a_client_character_set varchar2 := null, a_force_manual_rollback boolean := false, a_random_test_order boolean := false, - a_random_test_order_seed positive := null + a_random_test_order_seed positive := null, + a_tags ut_varchar2_rows := null ); procedure run( @@ -199,7 +209,8 @@ create or replace package ut authid current_user as a_client_character_set varchar2 := null, a_force_manual_rollback boolean := false, a_random_test_order boolean := false, - a_random_test_order_seed positive := null + a_random_test_order_seed positive := null, + a_tags varchar2 := null ); procedure run( @@ -214,7 +225,8 @@ create or replace package ut authid current_user as a_client_character_set varchar2 := null, a_force_manual_rollback boolean := false, a_random_test_order boolean := false, - a_random_test_order_seed positive := null + a_random_test_order_seed positive := null, + a_tags varchar2 := null ); /** diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index 28ec1a610..3d262abe3 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -90,7 +90,8 @@ create or replace package body ut_runner is a_client_character_set varchar2 := null, a_force_manual_rollback boolean := false, a_random_test_order boolean := false, - a_random_test_order_seed positive := null + a_random_test_order_seed positive := null, + a_tags ut_varchar2_rows := null ) is l_run ut_run; l_coverage_schema_names ut_varchar2_rows; @@ -98,6 +99,7 @@ create or replace package body ut_runner is l_include_object_names ut_object_names; l_paths ut_varchar2_list := ut_varchar2_list(); l_random_test_order_seed positive; + l_tags ut_varchar2_rows := ut_varchar2_rows(); begin ut_event_manager.initialize(); if a_reporters is not empty then @@ -124,12 +126,17 @@ create or replace package body ut_runner is end loop; end if; + if (a_tags is not null) or not(a_tags is empty) then + for i in 1..a_tags.count loop + l_tags := l_tags multiset union ut_utils.convert_collection(ut_utils.string_to_table(a_string => a_tags(i),a_delimiter => ',')); + end loop; + end if; + begin ut_expectation_processor.reset_invalidation_exception(); ut_utils.save_dbms_output_to_cache(); ut_console_reporter_base.set_color_enabled(a_color_console); - if a_coverage_schemes is not empty then l_coverage_schema_names := ut_utils.convert_collection(a_coverage_schemes); else @@ -153,10 +160,11 @@ create or replace package body ut_runner is set(a_source_file_mappings), set(a_test_file_mappings), a_client_character_set, - l_random_test_order_seed + l_random_test_order_seed, + l_tags ); - ut_suite_manager.configure_execution_by_path(l_paths, l_run.items, l_random_test_order_seed); + ut_suite_manager.configure_execution_by_path(l_paths, l_run.items, l_random_test_order_seed, l_tags); if a_force_manual_rollback then l_run.set_rollback_type( a_rollback_type => ut_utils.gc_rollback_manual, a_force => true ); end if; diff --git a/source/api/ut_runner.pks b/source/api/ut_runner.pks index ab2e1f6bb..895de3bb7 100644 --- a/source/api/ut_runner.pks +++ b/source/api/ut_runner.pks @@ -70,7 +70,8 @@ create or replace package ut_runner authid current_user is a_client_character_set varchar2 := null, a_force_manual_rollback boolean := false, a_random_test_order boolean := false, - a_random_test_order_seed positive := null + a_random_test_order_seed positive := null, + a_tags ut_varchar2_rows := null ); /** diff --git a/source/core/types/ut_run.tpb b/source/core/types/ut_run.tpb index d5ace34a7..c8f2778ff 100644 --- a/source/core/types/ut_run.tpb +++ b/source/core/types/ut_run.tpb @@ -26,10 +26,12 @@ create or replace type body ut_run as a_project_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null, a_client_character_set varchar2 := null, - a_random_test_order_seed positive := null + a_random_test_order_seed positive := null, + a_run_tags ut_varchar2_rows := null ) return self as result is begin self.run_paths := a_run_paths; + self.run_tags := a_run_tags; self.self_type := $$plsql_unit; self.items := a_items; self.client_character_set := lower(a_client_character_set); diff --git a/source/core/types/ut_run.tps b/source/core/types/ut_run.tps index 5d5e65367..b5a1d18ac 100644 --- a/source/core/types/ut_run.tps +++ b/source/core/types/ut_run.tps @@ -21,6 +21,7 @@ create or replace type ut_run under ut_suite_item ( project_name varchar2(4000), items ut_suite_items, run_paths ut_varchar2_list, + run_tags ut_varchar2_rows, coverage_options ut_coverage_options, test_file_mappings ut_file_mappings, client_character_set varchar2(100), @@ -35,7 +36,8 @@ create or replace type ut_run under ut_suite_item ( a_project_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null, a_client_character_set varchar2 := null, - a_random_test_order_seed positive := null + a_random_test_order_seed positive := null, + a_run_tags ut_varchar2_rows := null ) return self as result, overriding member procedure mark_as_skipped(self in out nocopy ut_run), overriding member function do_execute(self in out nocopy ut_run) return boolean, diff --git a/source/core/types/ut_suite.tpb b/source/core/types/ut_suite.tpb index 14a457623..bf683d8aa 100644 --- a/source/core/types/ut_suite.tpb +++ b/source/core/types/ut_suite.tpb @@ -17,7 +17,8 @@ create or replace type body ut_suite as */ constructor function ut_suite ( - self in out nocopy ut_suite, a_object_owner varchar2, a_object_name varchar2, a_line_no integer + self in out nocopy ut_suite, a_object_owner varchar2, a_object_name varchar2, a_line_no integer, + a_suite_tags ut_varchar2_rows := null ) return self as result is begin self.self_type := $$plsql_unit; @@ -25,6 +26,7 @@ create or replace type body ut_suite as self.items := ut_suite_items(); before_all_list := ut_executables(); after_all_list := ut_executables(); + self.suite_tags := a_suite_tags; return; end; diff --git a/source/core/types/ut_suite.tps b/source/core/types/ut_suite.tps index 7057e4911..0da911b4f 100644 --- a/source/core/types/ut_suite.tps +++ b/source/core/types/ut_suite.tps @@ -26,8 +26,13 @@ create or replace type ut_suite under ut_logical_suite ( * Procedure exists within the package of the suite */ after_all_list ut_executables, + /** + * Hold list of tags assign to suite + */ + suite_tags ut_varchar2_rows, constructor function ut_suite ( - self in out nocopy ut_suite, a_object_owner varchar2, a_object_name varchar2, a_line_no integer + self in out nocopy ut_suite, a_object_owner varchar2, a_object_name varchar2, a_line_no integer, + a_suite_tags ut_varchar2_rows := null ) return self as result, overriding member function do_execute(self in out nocopy ut_suite) return boolean, overriding member function get_error_stack_traces(self ut_suite) return ut_varchar2_list, diff --git a/source/core/types/ut_test.tpb b/source/core/types/ut_test.tpb index 14620b24b..f09a51162 100644 --- a/source/core/types/ut_test.tpb +++ b/source/core/types/ut_test.tpb @@ -18,7 +18,7 @@ create or replace type body ut_test as constructor function ut_test( self in out nocopy ut_test, a_object_owner varchar2 := null, a_object_name varchar2, a_name varchar2, - a_line_no integer, a_expected_error_codes ut_integer_list := null + a_line_no integer, a_expected_error_codes ut_integer_list := null, a_test_tags ut_varchar2_rows := null ) return self as result is begin self.self_type := $$plsql_unit; @@ -31,6 +31,7 @@ create or replace type body ut_test as self.all_expectations := ut_expectation_results(); self.failed_expectations := ut_expectation_results(); self.expected_error_codes := a_expected_error_codes; + self.test_tags := a_test_tags; return; end; diff --git a/source/core/types/ut_test.tps b/source/core/types/ut_test.tps index 752ef3ef7..caabdf1b1 100644 --- a/source/core/types/ut_test.tps +++ b/source/core/types/ut_test.tps @@ -1,4 +1,4 @@ -create or replace type ut_test under ut_suite_item ( +create or replace type ut_test force under ut_suite_item ( /* utPLSQL - Version 3 Copyright 2016 - 2018 utPLSQL Project @@ -55,9 +55,13 @@ create or replace type ut_test under ut_suite_item ( *Holds the expected error codes list when the user use the annotation throws */ expected_error_codes ut_integer_list, + /** + * Hold list of tags assign to test + */ + test_tags ut_varchar2_rows, constructor function ut_test( self in out nocopy ut_test, a_object_owner varchar2 := null, a_object_name varchar2, a_name varchar2, - a_line_no integer, a_expected_error_codes ut_integer_list := null + a_line_no integer, a_expected_error_codes ut_integer_list := null, a_test_tags ut_varchar2_rows := null ) return self as result, overriding member procedure mark_as_skipped(self in out nocopy ut_test), overriding member function do_execute(self in out nocopy ut_test) return boolean, diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index b9e5b1b22..2a6a810e3 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -23,6 +23,7 @@ create or replace package body ut_suite_builder is gc_suite constant t_annotation_name := 'suite'; gc_suitepath constant t_annotation_name := 'suitepath'; + gc_tag constant t_annotation_name := 'tag'; gc_test constant t_annotation_name := ut_utils.gc_test_execute; gc_disabled constant t_annotation_name := 'disabled'; gc_displayname constant t_annotation_name := 'displayname'; @@ -43,6 +44,7 @@ create or replace package body ut_suite_builder is := tt_annotations( gc_suite, gc_suitepath, + gc_tag, gc_test, gc_disabled, gc_displayname, @@ -305,6 +307,33 @@ create or replace package body ut_suite_builder is end loop; end; + procedure add_tags_to_test( + a_suite in out nocopy ut_suite, + a_list in out nocopy ut_varchar2_rows, + a_procedure_name t_object_name, + a_tags_ann_text tt_annotation_texts + ) is + l_annotation_pos binary_integer; + begin + a_list := ut_varchar2_rows(); + l_annotation_pos := a_tags_ann_text.first; + while l_annotation_pos is not null loop + if a_tags_ann_text(l_annotation_pos) is null then + a_suite.put_warning( + '"--%tag" annotation requires a tag value populated. Annotation ignored.' + || chr( 10 ) || 'at "' || get_qualified_object_name(a_suite, a_procedure_name) || '", line ' || l_annotation_pos + ); + else + a_list := + a_list multiset union + ut_utils.convert_collection(ut_utils.trim_list_elements(ut_utils.string_to_table(a_tags_ann_text(l_annotation_pos), ',', 'Y'))); + end if; + l_annotation_pos := a_tags_ann_text.next(l_annotation_pos); + end loop; + + end; + + procedure set_seq_no( a_list in out nocopy ut_executables ) is @@ -483,13 +512,19 @@ create or replace package body ut_suite_builder is ); set_seq_no(l_test.after_test_list); end if; + + if l_proc_annotations.exists( gc_tag) then + add_tags_to_test(a_suite, l_test.test_tags, a_procedure_name, l_proc_annotations( gc_tag)); + end if; + if l_proc_annotations.exists( gc_throws) then add_to_throws_numbers_list(a_suite, l_test.expected_error_codes, a_procedure_name, l_proc_annotations( gc_throws)); end if; l_test.disabled_flag := ut_utils.boolean_to_int( l_proc_annotations.exists( gc_disabled)); - + a_suite_items.extend; a_suite_items( a_suite_items.last ) := l_test; + end; procedure propagate_before_after_each( @@ -583,6 +618,29 @@ create or replace package body ut_suite_builder is a_suite.path := lower(coalesce(a_suite.path, a_suite.object_name)); end; + procedure add_tags_to_suite( + a_suite in out nocopy ut_suite, + a_tags_ann_text tt_annotation_texts + ) is + l_annotation_pos binary_integer; + l_tags ut_varchar2_rows := ut_varchar2_rows(); + begin + l_annotation_pos := a_tags_ann_text.first; + while l_annotation_pos is not null loop + if a_tags_ann_text(l_annotation_pos) is null then + a_suite.put_warning( + '"--%tag" annotation requires a tag value populated. Annotation ignored, line ' || l_annotation_pos + ); + else + l_tags := + l_tags multiset union + ut_utils.convert_collection(ut_utils.trim_list_elements(ut_utils.string_to_table(a_tags_ann_text(l_annotation_pos), ',', 'Y'))); + end if; + l_annotation_pos := a_tags_ann_text.next(l_annotation_pos); + end loop; + a_suite.suite_tags := l_tags; + end; + procedure add_suite_tests( a_suite in out nocopy ut_suite, a_annotations t_annotations_info, @@ -594,6 +652,7 @@ create or replace package body ut_suite_builder is l_after_all_list tt_executables; l_rollback_type ut_utils.t_rollback_type; l_annotation_text t_annotation_text; + l_suite_tags ut_varchar2_rows; begin if a_annotations.by_name.exists(gc_displayname) then l_annotation_text := trim(a_annotations.by_name(gc_displayname)(a_annotations.by_name(gc_displayname).first)); @@ -631,7 +690,10 @@ create or replace package body ut_suite_builder is if a_annotations.by_name.exists(gc_aftereach) then l_after_each_list := add_executables( a_suite.object_owner, a_suite.object_name, a_annotations.by_name(gc_aftereach), gc_aftereach ); end if; - + + if a_annotations.by_name.exists(gc_tag) then + add_tags_to_suite(a_suite, a_annotations.by_name(gc_tag)); + end if; a_suite.disabled_flag := ut_utils.boolean_to_int(a_annotations.by_name.exists(gc_disabled)); --process procedure annotations for suite diff --git a/source/core/ut_suite_cache.sql b/source/core/ut_suite_cache.sql index adbdf1734..e41af9607 100644 --- a/source/core/ut_suite_cache.sql +++ b/source/core/ut_suite_cache.sql @@ -36,6 +36,7 @@ create table ut_suite_cache ( after_each_list, after_test_list, expected_error_codes, + tags, item ) nested table warnings store as ut_suite_cache_warnings @@ -45,7 +46,8 @@ create table ut_suite_cache ( nested table after_each_list store as ut_suite_cache_after_each nested table before_test_list store as ut_suite_cache_before_test nested table after_test_list store as ut_suite_cache_after_test - nested table expected_error_codes store as ut_suite_cache_trhows + nested table expected_error_codes store as ut_suite_cache_throws + nested table tags store as ut_suite_cache_tags return as locator as select cast(null as number(22)) id, @@ -67,6 +69,7 @@ create table ut_suite_cache ( t.after_each_list, t.after_test_list, t.expected_error_codes, + t.test_tags, t.item from table(ut_suite_contexts(ut_suite_context(user,'package_name','ctx_name',1))) c cross join table(ut_tests(ut_test(user,'package_name','test_name',1))) t diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index ce7f018e0..55a6816e0 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -90,7 +90,8 @@ create or replace package body ut_suite_cache_manager is before_all_list, after_all_list, before_each_list, after_each_list, before_test_list, after_test_list, - expected_error_codes, item + expected_error_codes, tags, + item ) with suites as ( select treat(value(x) as ut_suite) i @@ -103,7 +104,8 @@ create or replace package body ut_suite_cache_manager is s.i.before_all_list as before_all_list, s.i.after_all_list as after_all_list, null before_each_list, null after_each_list, null before_test_list, null after_test_list, - null expected_error_codes, null item + null expected_error_codes, s.i.suite_tags tags, + null item from suites s; insert into ut_suite_cache t @@ -114,7 +116,8 @@ create or replace package body ut_suite_cache_manager is before_all_list, after_all_list, before_each_list, after_each_list, before_test_list, after_test_list, - expected_error_codes, item + expected_error_codes, tags, + item ) with tests as ( select treat(value(x) as ut_test) t @@ -127,7 +130,8 @@ create or replace package body ut_suite_cache_manager is null before_all_list, null after_all_list, s.t.before_each_list as before_each_list, s.t.after_each_list as after_each_list, s.t.before_test_list as before_test_list, s.t.after_test_list as after_test_list, - s.t.expected_error_codes as expected_error_codes, s.t.item as item + s.t.expected_error_codes as expected_error_codes, s.t.test_tags as test_tags, + s.t.item as item from tests s; end if; diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 51d3fa1e4..ad433b8da 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -57,7 +57,7 @@ create or replace package body ut_suite_manager is end loop; return l_paths_temp; end; - + function resolve_schema_names(a_paths in out nocopy ut_varchar2_list) return ut_varchar2_rows is l_schema varchar2(4000); l_object varchar2(4000); @@ -100,6 +100,7 @@ create or replace package body ut_suite_manager is l_schema_names.extend; l_schema_names(l_schema_names.last) := l_schema; end loop; + return l_schema_names; end; @@ -192,7 +193,7 @@ create or replace package body ut_suite_manager is results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), items => a_items_at_level(a_prev_level), before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( - a_rows( a_idx ).after_all_list) + a_rows( a_idx ).after_all_list), suite_tags => a_rows(a_idx).tags --TODO : Should be share or separate ) else ut_suite( @@ -205,7 +206,7 @@ create or replace package body ut_suite_manager is results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), items => ut_suite_items(), before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( - a_rows( a_idx ).after_all_list) + a_rows( a_idx ).after_all_list), suite_tags => a_rows(a_idx).tags --TODO : Should be share or separate ) end; when 'UT_SUITE_CONTEXT' then @@ -221,7 +222,7 @@ create or replace package body ut_suite_manager is results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), items => a_items_at_level(a_prev_level), before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( - a_rows( a_idx ).after_all_list) + a_rows( a_idx ).after_all_list), suite_tags => a_rows(a_idx).tags --TODO : Should be share or separate ) else ut_suite_context( @@ -234,7 +235,7 @@ create or replace package body ut_suite_manager is results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), items => ut_suite_items(), before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( - a_rows( a_idx ).after_all_list) + a_rows( a_idx ).after_all_list), suite_tags => a_rows(a_idx).tags --TODO : Should be share or separate ) end; when 'UT_LOGICAL_SUITE' then @@ -276,7 +277,8 @@ create or replace package body ut_suite_manager is item => a_rows(a_idx).item, after_test_list => sort_by_seq_no(a_rows(a_idx).after_test_list), after_each_list => sort_by_seq_no(a_rows(a_idx).after_each_list), all_expectations => ut_expectation_results(), failed_expectations => ut_expectation_results(), - parent_error_stack_trace => null, expected_error_codes => a_rows(a_idx).expected_error_codes + parent_error_stack_trace => null, expected_error_codes => a_rows(a_idx).expected_error_codes, + test_tags => a_rows(a_idx).tags ); end case; l_result.results_count.warnings_count := l_result.warnings.count; @@ -360,13 +362,17 @@ create or replace package body ut_suite_manager is a_object_name varchar2 := null, a_procedure_name varchar2 := null, a_skip_all_objects boolean := false, - a_random_seed positive + a_random_seed positive, + a_tags ut_varchar2_rows := null ) return t_cached_suites_cursor is l_path varchar2( 4000 ); l_result sys_refcursor; l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_sql varchar2(32767); + l_tags ut_varchar2_rows := coalesce(a_tags,ut_varchar2_rows()); + l_suite_item_name varchar2(20); begin - if a_path is null and a_object_name is not null then + if a_path is null and a_object_name is not null then execute immediate 'select min(path) from '||l_ut_owner||q'[.ut_suite_cache where object_owner = :a_object_owner @@ -376,12 +382,15 @@ create or replace package body ut_suite_manager is else l_path := lower( a_path ); end if; - - open l_result for + + l_suite_item_name := case when l_tags.count > 0 then 'suite_items_tags' else 'suite_items' end; + + /* Rewrite that as tags should be put on whats left not on full suite item cache */ + l_sql := q'[with suite_items as ( - select /*+ cardinality(c 100) */ c.* - from ]'||l_ut_owner||q'[.ut_suite_cache c + select /*+ cardinality(c 100) */ c.* + from ]'||l_ut_owner||q'[.ut_suite_cache c where 1 = 1 ]'||case when not a_skip_all_objects then q'[ and exists ( select 1 @@ -405,12 +414,30 @@ create or replace package body ut_suite_manager is else 'and :a_procedure_name is null' end ||q'[ ) ) - ), - suitepaths as ( + ),]' + ||case when l_tags.count > 0 then + q'[ filter_tags as ( + select s.* from suite_items s + where exists + ( select 1 + from table(s.tags) ct,table(:l_tags) tag + where ct.column_value = tag.column_value) + ), + suite_items_tags as ( + select c.* from suite_items c + where exists (select 1 from filter_tags t where + t.path||'.' like c.path || '.%' /*all children and self*/ + or c.path||'.' like t.path || '.%' --all parents + ) + ),]' + else + q'[dummy as (select 1 from table(:l_tags) where 1 = 2 ),]' + end|| + q'[ suitepaths as ( select distinct substr(path,1,instr(path,'.',-1)-1) as suitepath, path, object_owner - from suite_items + from ]'||l_suite_item_name||q'[ where self_type = 'UT_SUITE' ), gen as ( @@ -430,6 +457,7 @@ create or replace package body ut_suite_manager is upper( substr(p.path, instr( p.path, '.', -1 ) + 1 ) ) as object_name, cast(null as ]'||l_ut_owner||q'[.ut_executables) as x, cast(null as ]'||l_ut_owner||q'[.ut_integer_list) as y, + cast(null as ]'||l_ut_owner||q'[.ut_varchar2_rows) as q, cast(null as ]'||l_ut_owner||q'[.ut_executable_test) as z from suitepath_part p where p.path @@ -443,11 +471,12 @@ create or replace package body ut_suite_manager is s.x as before_all_list, s.x as after_all_list, s.x as before_each_list, s.x as before_test_list, s.x as after_each_list, s.x as after_test_list, - s.y as expected_error_codes, s.z as item + s.y as expected_error_codes, s.q as test_tags, + s.z as item from logical_suite_data s ), items as ( - select * from suite_items + select * from ]'||l_suite_item_name||q'[ union all select * from logical_suites ) @@ -470,8 +499,8 @@ create or replace package body ut_suite_manager is l_ut_owner||'.ut_annotation_manager.hash_suite_path( c.path, :a_random_seed ) desc nulls last' - end - using l_path, l_path, upper(a_object_name), upper(a_procedure_name), a_random_seed; + end; + open l_result for l_sql using l_path, l_path, upper(a_object_name), upper(a_procedure_name), l_tags, a_random_seed; return l_result; end; @@ -558,7 +587,8 @@ create or replace package body ut_suite_manager is a_object_name varchar2 := null, a_procedure_name varchar2 := null, a_suites in out nocopy ut_suite_items, - a_random_seed positive + a_random_seed positive, + a_tags ut_varchar2_rows := null ) is begin refresh_cache(a_owner_name); @@ -571,7 +601,8 @@ create or replace package body ut_suite_manager is a_object_name, a_procedure_name, can_skip_all_objects_scan(a_owner_name), - a_random_seed + a_random_seed, + a_tags ) ); @@ -601,6 +632,7 @@ create or replace package body ut_suite_manager is a_object_name, a_procedure_name, a_skip_all_objects, + null, null ) ); @@ -662,7 +694,8 @@ create or replace package body ut_suite_manager is procedure configure_execution_by_path( a_paths in ut_varchar2_list, a_suites out nocopy ut_suite_items, - a_random_seed in positive := null + a_random_seed in positive := null, + a_tags ut_varchar2_rows := null ) is l_paths ut_varchar2_list := a_paths; l_path_items t_path_items; @@ -677,7 +710,11 @@ create or replace package body ut_suite_manager is resolve_schema_names(l_paths); l_schema_paths := group_paths_by_schema(l_paths); - + + -- TODO : use a_tags to filter out path. Should we do it before ? we dont know suites, if we do it after + -- we running into danger of filtering out to null value and raising wrong message. I reckon we should resolve that + -- before loop and l_th_items is set or after filter it out. + l_schema := l_schema_paths.first; while l_schema is not null loop l_path_items := l_schema_paths(l_schema); @@ -689,7 +726,8 @@ create or replace package body ut_suite_manager is l_path_item.object_name, l_path_item.procedure_name, a_suites, - a_random_seed + a_random_seed, + a_tags ); if a_suites.count = l_suites_count then if l_path_item.suite_path is not null then @@ -698,6 +736,8 @@ create or replace package body ut_suite_manager is raise_application_error(ut_utils.gc_suite_package_not_found,'Suite test '||l_schema||'.'||l_path_item.object_name|| '.'||l_path_item.procedure_name||' does not exist'); elsif l_path_item.object_name is not null then raise_application_error(ut_utils.gc_suite_package_not_found,'Suite package '||l_schema||'.'||l_path_item.object_name|| ' does not exist'); + elsif a_tags.count > 0 then + raise_application_error(ut_utils.gc_suite_package_not_found,'No suite packages found for tags: '||ut_utils.to_string(ut_utils.table_to_clob(a_tags,','),a_max_output_len => 450)); end if; end if; l_index := a_suites.first; diff --git a/source/core/ut_suite_manager.pks b/source/core/ut_suite_manager.pks index debfd4ac1..9b214a6c2 100644 --- a/source/core/ut_suite_manager.pks +++ b/source/core/ut_suite_manager.pks @@ -49,7 +49,8 @@ create or replace package ut_suite_manager authid current_user is procedure configure_execution_by_path( a_paths in ut_varchar2_list, a_suites out nocopy ut_suite_items, - a_random_seed in positive := null + a_random_seed in positive := null, + a_tags ut_varchar2_rows := null ); /** diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 25ef3fb3f..be8da247e 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -278,6 +278,20 @@ create or replace package body ut_utils is return l_result; end; + function table_to_clob(a_text_table ut_varchar2_rows, a_delimiter varchar2:= chr(10)) return clob is + l_result clob; + l_table_rows integer := coalesce(cardinality(a_text_table),0); + begin + for i in 1 .. l_table_rows loop + if i < l_table_rows then + append_to_clob(l_result, a_text_table(i)||a_delimiter); + else + append_to_clob(l_result, a_text_table(i)); + end if; + end loop; + return l_result; + end; + function table_to_clob(a_integer_table ut_integer_list, a_delimiter varchar2:= chr(10)) return clob is l_result clob; l_table_rows integer := coalesce(cardinality(a_integer_table),0); diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index ebb9780ad..6832e0ceb 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -234,7 +234,9 @@ create or replace package ut_utils authid definer is function clob_to_table(a_clob clob, a_max_amount integer := 8191, a_delimiter varchar2:= chr(10)) return ut_varchar2_list; function table_to_clob(a_text_table ut_varchar2_list, a_delimiter varchar2:= chr(10)) return clob; - + + function table_to_clob(a_text_table ut_varchar2_rows, a_delimiter varchar2:= chr(10)) return clob; + function table_to_clob(a_integer_table ut_integer_list, a_delimiter varchar2:= chr(10)) return clob; /** diff --git a/test/ut3_tester/core/test_suite_builder.pkb b/test/ut3_tester/core/test_suite_builder.pkb index e6d21d969..7ef85a53a 100644 --- a/test/ut3_tester/core/test_suite_builder.pkb +++ b/test/ut3_tester/core/test_suite_builder.pkb @@ -652,6 +652,7 @@ create or replace package body test_suite_builder is '%some_packagecontext_setup' || '%' || '' || + '' || '' || '' || '%suite_level_testIn suitesome_package.suite_level_test' || @@ -661,6 +662,7 @@ create or replace package body test_suite_builder is '%some_packagesuite_level_beforeall' || '%' || '' || + '' || '' ); end; @@ -796,6 +798,7 @@ create or replace package body test_suite_builder is '%some_packagecontext_setup' || '%' || '' || + ''|| '' ); end; @@ -837,6 +840,7 @@ create or replace package body test_suite_builder is '%some_packagecontext_setup' || '%' || '' || + '' || '' || '' || '%suite_level_testIn suitesome_package.suite_level_test' || @@ -846,6 +850,7 @@ create or replace package body test_suite_builder is '%some_packagesuite_level_beforeall' || '%' || '' || + '' || '' ); end; @@ -892,6 +897,7 @@ create or replace package body test_suite_builder is '%some_packagecontext_setup' || '%' || '' || + '' || '' || '' || '%suite_level_testIn suitesome_package.suite_level_test' || @@ -901,6 +907,7 @@ create or replace package body test_suite_builder is '%some_packagesuite_level_beforeall' || '%' || '' || + '' || '' ); end; From 3495490a1567ed8013c95ff550d27204a3dac5e4 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 19 Apr 2019 21:04:55 +0100 Subject: [PATCH 0418/1096] Switch to use VARCHAR2 instead of UT_VARCHAR2_ROWS() Signed-off-by: lwasylow --- source/api/ut.pkb | 28 ++++++------- source/api/ut.pks | 4 +- source/api/ut_runner.pkb | 13 ++---- source/api/ut_runner.pks | 2 +- source/core/types/ut_run.tpb | 2 +- source/core/types/ut_run.tps | 4 +- source/core/types/ut_suite.tpb | 4 +- source/core/types/ut_suite.tps | 4 +- source/core/types/ut_test.tpb | 4 +- source/core/types/ut_test.tps | 4 +- source/core/ut_suite_builder.pkb | 15 +++---- source/core/ut_suite_cache.sql | 3 +- source/core/ut_suite_cache_manager.pkb | 17 +++++++- source/core/ut_suite_cache_tag.sql | 7 ++++ source/core/ut_suite_manager.pkb | 40 +++++++++---------- source/core/ut_suite_manager.pks | 2 +- .../create_synonyms_and_grants_for_public.sql | 1 + source/create_user_grants.sql | 1 + source/install.sql | 1 + source/uninstall_objects.sql | 2 + test/ut3_tester/core/test_suite_builder.pkb | 4 +- 21 files changed, 87 insertions(+), 75 deletions(-) create mode 100644 source/core/ut_suite_cache_tag.sql diff --git a/source/api/ut.pkb b/source/api/ut.pkb index 96cf51102..1a95f0725 100644 --- a/source/api/ut.pkb +++ b/source/api/ut.pkb @@ -121,7 +121,7 @@ create or replace package body ut is a_client_character_set varchar2, a_random_test_order integer, a_random_test_order_seed positive, - a_tags ut_varchar2_rows := null + a_tags varchar2 := null ) is pragma autonomous_transaction; begin @@ -157,7 +157,7 @@ create or replace package body ut is a_client_character_set varchar2, a_random_test_order integer, a_random_test_order_seed positive, - a_tags ut_varchar2_rows := null + a_tags varchar2 := null ) is pragma autonomous_transaction; begin @@ -234,7 +234,7 @@ create or replace package body ut is a_client_character_set, a_random_test_order, a_random_test_order_seed, - ut_varchar2_rows(a_tags) + a_tags ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); @@ -273,7 +273,7 @@ create or replace package body ut is a_client_character_set, a_random_test_order, a_random_test_order_seed, - ut_varchar2_rows(a_tags) + a_tags ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); @@ -313,7 +313,7 @@ create or replace package body ut is a_client_character_set, a_random_test_order, a_random_test_order_seed, - ut_varchar2_rows(a_tags) + a_tags ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); @@ -353,7 +353,7 @@ create or replace package body ut is a_client_character_set, a_random_test_order, a_random_test_order_seed, - ut_varchar2_rows(a_tags) + a_tags ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); @@ -393,7 +393,7 @@ create or replace package body ut is a_client_character_set, a_random_test_order, a_random_test_order_seed, - ut_varchar2_rows(a_tags) + a_tags ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); @@ -433,7 +433,7 @@ create or replace package body ut is a_client_character_set, a_random_test_order, a_random_test_order_seed, - ut_varchar2_rows(a_tags) + a_tags ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); @@ -457,7 +457,7 @@ create or replace package body ut is a_force_manual_rollback boolean := false, a_random_test_order boolean := false, a_random_test_order_seed positive := null, - a_tags ut_varchar2_rows := null + a_tags varchar2 := null ) is l_reporter ut_reporter_base := a_reporter; begin @@ -514,7 +514,7 @@ create or replace package body ut is a_force_manual_rollback boolean := false, a_random_test_order boolean := false, a_random_test_order_seed positive := null, - a_tags ut_varchar2_rows := null + a_tags varchar2 := null ) is l_reporter ut_reporter_base := a_reporter; begin @@ -563,7 +563,7 @@ create or replace package body ut is a_force_manual_rollback, a_random_test_order, a_random_test_order_seed, - ut_varchar2_rows(a_tags) + a_tags ); end; @@ -595,7 +595,7 @@ create or replace package body ut is a_force_manual_rollback, a_random_test_order, a_random_test_order_seed, - ut_varchar2_rows(a_tags) + a_tags ); end; @@ -628,7 +628,7 @@ create or replace package body ut is a_force_manual_rollback, a_random_test_order, a_random_test_order_seed, - ut_varchar2_rows(a_tags) + a_tags ); end; @@ -661,7 +661,7 @@ create or replace package body ut is a_force_manual_rollback, a_random_test_order, a_random_test_order_seed, - ut_varchar2_rows(a_tags) + a_tags ); end; diff --git a/source/api/ut.pks b/source/api/ut.pks index e6065d85b..17b4a845e 100644 --- a/source/api/ut.pks +++ b/source/api/ut.pks @@ -178,7 +178,7 @@ create or replace package ut authid current_user as a_force_manual_rollback boolean := false, a_random_test_order boolean := false, a_random_test_order_seed positive := null, - a_tags ut_varchar2_rows := null + a_tags varchar2 := null ); procedure run( @@ -194,7 +194,7 @@ create or replace package ut authid current_user as a_force_manual_rollback boolean := false, a_random_test_order boolean := false, a_random_test_order_seed positive := null, - a_tags ut_varchar2_rows := null + a_tags varchar2 := null ); procedure run( diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index 3d262abe3..30cdf2691 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -91,7 +91,7 @@ create or replace package body ut_runner is a_force_manual_rollback boolean := false, a_random_test_order boolean := false, a_random_test_order_seed positive := null, - a_tags ut_varchar2_rows := null + a_tags varchar2 := null ) is l_run ut_run; l_coverage_schema_names ut_varchar2_rows; @@ -99,7 +99,6 @@ create or replace package body ut_runner is l_include_object_names ut_object_names; l_paths ut_varchar2_list := ut_varchar2_list(); l_random_test_order_seed positive; - l_tags ut_varchar2_rows := ut_varchar2_rows(); begin ut_event_manager.initialize(); if a_reporters is not empty then @@ -126,12 +125,6 @@ create or replace package body ut_runner is end loop; end if; - if (a_tags is not null) or not(a_tags is empty) then - for i in 1..a_tags.count loop - l_tags := l_tags multiset union ut_utils.convert_collection(ut_utils.string_to_table(a_string => a_tags(i),a_delimiter => ',')); - end loop; - end if; - begin ut_expectation_processor.reset_invalidation_exception(); ut_utils.save_dbms_output_to_cache(); @@ -161,10 +154,10 @@ create or replace package body ut_runner is set(a_test_file_mappings), a_client_character_set, l_random_test_order_seed, - l_tags + a_tags ); - ut_suite_manager.configure_execution_by_path(l_paths, l_run.items, l_random_test_order_seed, l_tags); + ut_suite_manager.configure_execution_by_path(l_paths, l_run.items, l_random_test_order_seed, a_tags); if a_force_manual_rollback then l_run.set_rollback_type( a_rollback_type => ut_utils.gc_rollback_manual, a_force => true ); end if; diff --git a/source/api/ut_runner.pks b/source/api/ut_runner.pks index 895de3bb7..0434790f5 100644 --- a/source/api/ut_runner.pks +++ b/source/api/ut_runner.pks @@ -71,7 +71,7 @@ create or replace package ut_runner authid current_user is a_force_manual_rollback boolean := false, a_random_test_order boolean := false, a_random_test_order_seed positive := null, - a_tags ut_varchar2_rows := null + a_tags varchar2 := null ); /** diff --git a/source/core/types/ut_run.tpb b/source/core/types/ut_run.tpb index c8f2778ff..d26c6fcb4 100644 --- a/source/core/types/ut_run.tpb +++ b/source/core/types/ut_run.tpb @@ -27,7 +27,7 @@ create or replace type body ut_run as a_test_file_mappings ut_file_mappings := null, a_client_character_set varchar2 := null, a_random_test_order_seed positive := null, - a_run_tags ut_varchar2_rows := null + a_run_tags varchar2 := null ) return self as result is begin self.run_paths := a_run_paths; diff --git a/source/core/types/ut_run.tps b/source/core/types/ut_run.tps index b5a1d18ac..7ea5cc605 100644 --- a/source/core/types/ut_run.tps +++ b/source/core/types/ut_run.tps @@ -21,7 +21,7 @@ create or replace type ut_run under ut_suite_item ( project_name varchar2(4000), items ut_suite_items, run_paths ut_varchar2_list, - run_tags ut_varchar2_rows, + run_tags varchar2(4000), coverage_options ut_coverage_options, test_file_mappings ut_file_mappings, client_character_set varchar2(100), @@ -37,7 +37,7 @@ create or replace type ut_run under ut_suite_item ( a_test_file_mappings ut_file_mappings := null, a_client_character_set varchar2 := null, a_random_test_order_seed positive := null, - a_run_tags ut_varchar2_rows := null + a_run_tags varchar2 := null ) return self as result, overriding member procedure mark_as_skipped(self in out nocopy ut_run), overriding member function do_execute(self in out nocopy ut_run) return boolean, diff --git a/source/core/types/ut_suite.tpb b/source/core/types/ut_suite.tpb index bf683d8aa..bd35d18ca 100644 --- a/source/core/types/ut_suite.tpb +++ b/source/core/types/ut_suite.tpb @@ -18,7 +18,7 @@ create or replace type body ut_suite as constructor function ut_suite ( self in out nocopy ut_suite, a_object_owner varchar2, a_object_name varchar2, a_line_no integer, - a_suite_tags ut_varchar2_rows := null + a_tags varchar2 := null ) return self as result is begin self.self_type := $$plsql_unit; @@ -26,7 +26,7 @@ create or replace type body ut_suite as self.items := ut_suite_items(); before_all_list := ut_executables(); after_all_list := ut_executables(); - self.suite_tags := a_suite_tags; + self.tags := a_tags; return; end; diff --git a/source/core/types/ut_suite.tps b/source/core/types/ut_suite.tps index 0da911b4f..0bcddd59b 100644 --- a/source/core/types/ut_suite.tps +++ b/source/core/types/ut_suite.tps @@ -29,10 +29,10 @@ create or replace type ut_suite under ut_logical_suite ( /** * Hold list of tags assign to suite */ - suite_tags ut_varchar2_rows, + tags varchar2(4000), constructor function ut_suite ( self in out nocopy ut_suite, a_object_owner varchar2, a_object_name varchar2, a_line_no integer, - a_suite_tags ut_varchar2_rows := null + a_tags varchar2 := null ) return self as result, overriding member function do_execute(self in out nocopy ut_suite) return boolean, overriding member function get_error_stack_traces(self ut_suite) return ut_varchar2_list, diff --git a/source/core/types/ut_test.tpb b/source/core/types/ut_test.tpb index f09a51162..c1d847bf5 100644 --- a/source/core/types/ut_test.tpb +++ b/source/core/types/ut_test.tpb @@ -18,7 +18,7 @@ create or replace type body ut_test as constructor function ut_test( self in out nocopy ut_test, a_object_owner varchar2 := null, a_object_name varchar2, a_name varchar2, - a_line_no integer, a_expected_error_codes ut_integer_list := null, a_test_tags ut_varchar2_rows := null + a_line_no integer, a_expected_error_codes ut_integer_list := null, a_tags varchar2 := null ) return self as result is begin self.self_type := $$plsql_unit; @@ -31,7 +31,7 @@ create or replace type body ut_test as self.all_expectations := ut_expectation_results(); self.failed_expectations := ut_expectation_results(); self.expected_error_codes := a_expected_error_codes; - self.test_tags := a_test_tags; + self.tags := a_tags; return; end; diff --git a/source/core/types/ut_test.tps b/source/core/types/ut_test.tps index caabdf1b1..23116119c 100644 --- a/source/core/types/ut_test.tps +++ b/source/core/types/ut_test.tps @@ -58,10 +58,10 @@ create or replace type ut_test force under ut_suite_item ( /** * Hold list of tags assign to test */ - test_tags ut_varchar2_rows, + tags varchar2(4000), constructor function ut_test( self in out nocopy ut_test, a_object_owner varchar2 := null, a_object_name varchar2, a_name varchar2, - a_line_no integer, a_expected_error_codes ut_integer_list := null, a_test_tags ut_varchar2_rows := null + a_line_no integer, a_expected_error_codes ut_integer_list := null, a_tags varchar2 := null ) return self as result, overriding member procedure mark_as_skipped(self in out nocopy ut_test), overriding member function do_execute(self in out nocopy ut_test) return boolean, diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index 2a6a810e3..e11c91a2b 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -309,13 +309,12 @@ create or replace package body ut_suite_builder is procedure add_tags_to_test( a_suite in out nocopy ut_suite, - a_list in out nocopy ut_varchar2_rows, + a_list in out nocopy varchar2, a_procedure_name t_object_name, a_tags_ann_text tt_annotation_texts ) is l_annotation_pos binary_integer; begin - a_list := ut_varchar2_rows(); l_annotation_pos := a_tags_ann_text.first; while l_annotation_pos is not null loop if a_tags_ann_text(l_annotation_pos) is null then @@ -325,8 +324,7 @@ create or replace package body ut_suite_builder is ); else a_list := - a_list multiset union - ut_utils.convert_collection(ut_utils.trim_list_elements(ut_utils.string_to_table(a_tags_ann_text(l_annotation_pos), ',', 'Y'))); + a_list || a_tags_ann_text(l_annotation_pos); end if; l_annotation_pos := a_tags_ann_text.next(l_annotation_pos); end loop; @@ -514,7 +512,7 @@ create or replace package body ut_suite_builder is end if; if l_proc_annotations.exists( gc_tag) then - add_tags_to_test(a_suite, l_test.test_tags, a_procedure_name, l_proc_annotations( gc_tag)); + add_tags_to_test(a_suite, l_test.tags, a_procedure_name, l_proc_annotations( gc_tag)); end if; if l_proc_annotations.exists( gc_throws) then @@ -623,7 +621,7 @@ create or replace package body ut_suite_builder is a_tags_ann_text tt_annotation_texts ) is l_annotation_pos binary_integer; - l_tags ut_varchar2_rows := ut_varchar2_rows(); + l_tags varchar2(4000); begin l_annotation_pos := a_tags_ann_text.first; while l_annotation_pos is not null loop @@ -633,12 +631,11 @@ create or replace package body ut_suite_builder is ); else l_tags := - l_tags multiset union - ut_utils.convert_collection(ut_utils.trim_list_elements(ut_utils.string_to_table(a_tags_ann_text(l_annotation_pos), ',', 'Y'))); + l_tags || a_tags_ann_text(l_annotation_pos); end if; l_annotation_pos := a_tags_ann_text.next(l_annotation_pos); end loop; - a_suite.suite_tags := l_tags; + a_suite.tags := l_tags; end; procedure add_suite_tests( diff --git a/source/core/ut_suite_cache.sql b/source/core/ut_suite_cache.sql index e41af9607..3a38ceeb7 100644 --- a/source/core/ut_suite_cache.sql +++ b/source/core/ut_suite_cache.sql @@ -47,7 +47,6 @@ create table ut_suite_cache ( nested table before_test_list store as ut_suite_cache_before_test nested table after_test_list store as ut_suite_cache_after_test nested table expected_error_codes store as ut_suite_cache_throws - nested table tags store as ut_suite_cache_tags return as locator as select cast(null as number(22)) id, @@ -69,7 +68,7 @@ create table ut_suite_cache ( t.after_each_list, t.after_test_list, t.expected_error_codes, - t.test_tags, + t.tags, t.item from table(ut_suite_contexts(ut_suite_context(user,'package_name','ctx_name',1))) c cross join table(ut_tests(ut_test(user,'package_name','test_name',1))) t diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index 55a6816e0..526a03338 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -104,7 +104,7 @@ create or replace package body ut_suite_cache_manager is s.i.before_all_list as before_all_list, s.i.after_all_list as after_all_list, null before_each_list, null after_each_list, null before_test_list, null after_test_list, - null expected_error_codes, s.i.suite_tags tags, + null expected_error_codes, s.i.tags tags, null item from suites s; @@ -130,9 +130,22 @@ create or replace package body ut_suite_cache_manager is null before_all_list, null after_all_list, s.t.before_each_list as before_each_list, s.t.after_each_list as after_each_list, s.t.before_test_list as before_test_list, s.t.after_test_list as after_test_list, - s.t.expected_error_codes as expected_error_codes, s.t.test_tags as test_tags, + s.t.expected_error_codes as expected_error_codes, s.t.tags as test_tags, s.t.item as item from tests s; + + --TODO : Optimize to use only inserted + merge into ut_suite_cache_tag tgt + using ( select /*+cardinality (tt 100) */ t.id,tt.column_value tag + from ut_suite_cache t, + table(ut_utils.convert_collection((ut_utils.string_to_table(t.tags,',')))) tt + where tt.column_value is not null ) src + on ( tgt.suiteid = src.id and tgt.tagname = src.tag) + when not matched then + insert + (suiteid, tagname ) + values + (src.id, src.tag); end if; end if; diff --git a/source/core/ut_suite_cache_tag.sql b/source/core/ut_suite_cache_tag.sql new file mode 100644 index 000000000..17d287dd8 --- /dev/null +++ b/source/core/ut_suite_cache_tag.sql @@ -0,0 +1,7 @@ +create table ut_suite_cache_tag ( + suiteid number(22) not null, + tagname varchar2(100) not null, + constraint ut_suite_to_tag_pk primary key (suiteid,tagname), + constraint ut_suite_id_fk foreign key ( suiteid ) references ut_suite_cache(id) on delete cascade +) +organization index; \ No newline at end of file diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index ad433b8da..54bf8fa04 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -193,7 +193,7 @@ create or replace package body ut_suite_manager is results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), items => a_items_at_level(a_prev_level), before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( - a_rows( a_idx ).after_all_list), suite_tags => a_rows(a_idx).tags --TODO : Should be share or separate + a_rows( a_idx ).after_all_list), tags => a_rows(a_idx).tags --TODO : Should be share or separate ) else ut_suite( @@ -206,7 +206,7 @@ create or replace package body ut_suite_manager is results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), items => ut_suite_items(), before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( - a_rows( a_idx ).after_all_list), suite_tags => a_rows(a_idx).tags --TODO : Should be share or separate + a_rows( a_idx ).after_all_list), tags => a_rows(a_idx).tags --TODO : Should be share or separate ) end; when 'UT_SUITE_CONTEXT' then @@ -222,7 +222,7 @@ create or replace package body ut_suite_manager is results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), items => a_items_at_level(a_prev_level), before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( - a_rows( a_idx ).after_all_list), suite_tags => a_rows(a_idx).tags --TODO : Should be share or separate + a_rows( a_idx ).after_all_list), tags => a_rows(a_idx).tags --TODO : Should be share or separate ) else ut_suite_context( @@ -235,7 +235,7 @@ create or replace package body ut_suite_manager is results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), items => ut_suite_items(), before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( - a_rows( a_idx ).after_all_list), suite_tags => a_rows(a_idx).tags --TODO : Should be share or separate + a_rows( a_idx ).after_all_list), tags => a_rows(a_idx).tags --TODO : Should be share or separate ) end; when 'UT_LOGICAL_SUITE' then @@ -278,7 +278,7 @@ create or replace package body ut_suite_manager is after_test_list => sort_by_seq_no(a_rows(a_idx).after_test_list), after_each_list => sort_by_seq_no(a_rows(a_idx).after_each_list), all_expectations => ut_expectation_results(), failed_expectations => ut_expectation_results(), parent_error_stack_trace => null, expected_error_codes => a_rows(a_idx).expected_error_codes, - test_tags => a_rows(a_idx).tags + tags => a_rows(a_idx).tags ); end case; l_result.results_count.warnings_count := l_result.warnings.count; @@ -363,14 +363,14 @@ create or replace package body ut_suite_manager is a_procedure_name varchar2 := null, a_skip_all_objects boolean := false, a_random_seed positive, - a_tags ut_varchar2_rows := null + a_tags varchar2 := null ) return t_cached_suites_cursor is l_path varchar2( 4000 ); l_result sys_refcursor; l_ut_owner varchar2(250) := ut_utils.ut_owner; l_sql varchar2(32767); - l_tags ut_varchar2_rows := coalesce(a_tags,ut_varchar2_rows()); l_suite_item_name varchar2(20); + l_tag_list varchar2(4000) :=a_tags; begin if a_path is null and a_object_name is not null then execute immediate 'select min(path) @@ -382,8 +382,7 @@ create or replace package body ut_suite_manager is else l_path := lower( a_path ); end if; - - l_suite_item_name := case when l_tags.count > 0 then 'suite_items_tags' else 'suite_items' end; + l_suite_item_name := case when l_tag_list is not null then 'suite_items_tags' else 'suite_items' end; /* Rewrite that as tags should be put on whats left not on full suite item cache */ l_sql := @@ -415,13 +414,13 @@ create or replace package body ut_suite_manager is ) ) ),]' - ||case when l_tags.count > 0 then + ||case when l_tag_list is not null then q'[ filter_tags as ( select s.* from suite_items s where exists ( select 1 - from table(s.tags) ct,table(:l_tags) tag - where ct.column_value = tag.column_value) + from ]'||l_ut_owner||q'[.ut_suite_cache_tag ct + where ct.suiteid = s.id and instr(:a_tag_list,ct.tagname) > 0 ) ), suite_items_tags as ( select c.* from suite_items c @@ -431,7 +430,7 @@ create or replace package body ut_suite_manager is ) ),]' else - q'[dummy as (select 1 from table(:l_tags) where 1 = 2 ),]' + q'[dummy as (select 'x' from dual where :a_tag_list is null ),]' end|| q'[ suitepaths as ( select distinct substr(path,1,instr(path,'.',-1)-1) as suitepath, @@ -457,7 +456,6 @@ create or replace package body ut_suite_manager is upper( substr(p.path, instr( p.path, '.', -1 ) + 1 ) ) as object_name, cast(null as ]'||l_ut_owner||q'[.ut_executables) as x, cast(null as ]'||l_ut_owner||q'[.ut_integer_list) as y, - cast(null as ]'||l_ut_owner||q'[.ut_varchar2_rows) as q, cast(null as ]'||l_ut_owner||q'[.ut_executable_test) as z from suitepath_part p where p.path @@ -471,7 +469,7 @@ create or replace package body ut_suite_manager is s.x as before_all_list, s.x as after_all_list, s.x as before_each_list, s.x as before_test_list, s.x as after_each_list, s.x as after_test_list, - s.y as expected_error_codes, s.q as test_tags, + s.y as expected_error_codes, null as test_tags, s.z as item from logical_suite_data s ), @@ -499,8 +497,8 @@ create or replace package body ut_suite_manager is l_ut_owner||'.ut_annotation_manager.hash_suite_path( c.path, :a_random_seed ) desc nulls last' - end; - open l_result for l_sql using l_path, l_path, upper(a_object_name), upper(a_procedure_name), l_tags, a_random_seed; + end; + open l_result for l_sql using l_path, l_path, upper(a_object_name), upper(a_procedure_name), l_tag_list, a_random_seed; return l_result; end; @@ -588,7 +586,7 @@ create or replace package body ut_suite_manager is a_procedure_name varchar2 := null, a_suites in out nocopy ut_suite_items, a_random_seed positive, - a_tags ut_varchar2_rows := null + a_tags varchar2 := null ) is begin refresh_cache(a_owner_name); @@ -695,7 +693,7 @@ create or replace package body ut_suite_manager is a_paths in ut_varchar2_list, a_suites out nocopy ut_suite_items, a_random_seed in positive := null, - a_tags ut_varchar2_rows := null + a_tags varchar2 := null ) is l_paths ut_varchar2_list := a_paths; l_path_items t_path_items; @@ -736,8 +734,8 @@ create or replace package body ut_suite_manager is raise_application_error(ut_utils.gc_suite_package_not_found,'Suite test '||l_schema||'.'||l_path_item.object_name|| '.'||l_path_item.procedure_name||' does not exist'); elsif l_path_item.object_name is not null then raise_application_error(ut_utils.gc_suite_package_not_found,'Suite package '||l_schema||'.'||l_path_item.object_name|| ' does not exist'); - elsif a_tags.count > 0 then - raise_application_error(ut_utils.gc_suite_package_not_found,'No suite packages found for tags: '||ut_utils.to_string(ut_utils.table_to_clob(a_tags,','),a_max_output_len => 450)); + elsif a_tags is not null then + raise_application_error(ut_utils.gc_suite_package_not_found,'No suite packages found for tags: '||ut_utils.to_string(a_tags,a_max_output_len => 450)); end if; end if; l_index := a_suites.first; diff --git a/source/core/ut_suite_manager.pks b/source/core/ut_suite_manager.pks index 9b214a6c2..5b7c705c6 100644 --- a/source/core/ut_suite_manager.pks +++ b/source/core/ut_suite_manager.pks @@ -50,7 +50,7 @@ create or replace package ut_suite_manager authid current_user is a_paths in ut_varchar2_list, a_suites out nocopy ut_suite_items, a_random_seed in positive := null, - a_tags ut_varchar2_rows := null + a_tags varchar2 := null ); /** diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index 609d78ccf..6cc40afdc 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -93,6 +93,7 @@ grant select on &&ut3_owner..ut_annotation_cache to public; grant execute on &&ut3_owner..ut_executables to public; grant execute on &&ut3_owner..ut_executable_test to public; grant select on &&ut3_owner..ut_suite_cache to public; +grant select on &&ut3_owner..ut_suite_cache_tag to public; grant select on &&ut3_owner..ut_suite_cache_package to public; grant select on &&ut3_owner..ut_suite_cache_schema to public; grant execute on &&ut3_owner..ut_annotation_cache_manager to public; diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql index 7aa5deb39..ace73b951 100644 --- a/source/create_user_grants.sql +++ b/source/create_user_grants.sql @@ -114,6 +114,7 @@ grant select on &&ut3_owner..ut_annotation_cache to &ut3_user; grant execute on &&ut3_owner..ut_executables to &ut3_user; grant execute on &&ut3_owner..ut_executable_test to &ut3_user; grant select on &&ut3_owner..ut_suite_cache to &ut3_user; +grant select on &&ut3_owner..ut_suite_cache_tag to &ut3_user; grant select on &&ut3_owner..ut_suite_cache_package to public; grant select on &&ut3_owner..ut_suite_cache_schema to &ut3_user; grant execute on &&ut3_owner..ut_annotation_cache_manager to &ut3_user; diff --git a/source/install.sql b/source/install.sql index 728f4349f..86669c11d 100644 --- a/source/install.sql +++ b/source/install.sql @@ -130,6 +130,7 @@ alter session set current_schema = &&ut3_owner; @@install_component.sql 'core/ut_suite_cache_package.sql' @@install_component.sql 'core/ut_suite_cache_seq.sql' @@install_component.sql 'core/ut_suite_cache.sql' +@@install_component.sql 'core/ut_suite_cache_tag.sql' @@install_component.sql 'core/ut_suite_cache_manager.pks' @@install_component.sql 'core/ut_suite_cache_manager.pkb' @@install_component.sql 'core/ut_suite_builder.pks' diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index e2295f34d..e68b50664 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -63,6 +63,8 @@ drop package ut_suite_manager; drop package ut_suite_builder; +drop table ut_suite_cache_tag; + drop table ut_suite_cache; drop sequence ut_suite_cache_seq; diff --git a/test/ut3_tester/core/test_suite_builder.pkb b/test/ut3_tester/core/test_suite_builder.pkb index 7ef85a53a..71d3d32a0 100644 --- a/test/ut3_tester/core/test_suite_builder.pkb +++ b/test/ut3_tester/core/test_suite_builder.pkb @@ -897,7 +897,7 @@ create or replace package body test_suite_builder is '%some_packagecontext_setup' || '%' || '' || - '' || + '' || '' || '' || '%suite_level_testIn suitesome_package.suite_level_test' || @@ -907,7 +907,7 @@ create or replace package body test_suite_builder is '%some_packagesuite_level_beforeall' || '%' || '' || - '' || + '' || '' ); end; From d2f9796446234f6b40fd417217ade24e5bf6a22e Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 19 Apr 2019 21:04:55 +0100 Subject: [PATCH 0419/1096] Switch to use VARCHAR2 instead of UT_VARCHAR2_ROWS() Signed-off-by: lwasylow --- source/api/ut.pkb | 28 ++++++------- source/api/ut.pks | 4 +- source/api/ut_runner.pkb | 13 ++---- source/api/ut_runner.pks | 2 +- source/core/types/ut_run.tpb | 2 +- source/core/types/ut_run.tps | 4 +- source/core/types/ut_suite.tpb | 4 +- source/core/types/ut_suite.tps | 4 +- source/core/types/ut_test.tpb | 4 +- source/core/types/ut_test.tps | 4 +- source/core/ut_suite_builder.pkb | 15 +++---- source/core/ut_suite_cache.sql | 3 +- source/core/ut_suite_cache_manager.pkb | 17 +++++++- source/core/ut_suite_cache_tag.sql | 7 ++++ source/core/ut_suite_manager.pkb | 40 +++++++++---------- source/core/ut_suite_manager.pks | 2 +- .../create_synonyms_and_grants_for_public.sql | 1 + source/create_user_grants.sql | 1 + source/install.sql | 1 + source/uninstall_objects.sql | 2 + test/ut3_tester/core/test_suite_builder.pkb | 14 +++---- 21 files changed, 92 insertions(+), 80 deletions(-) create mode 100644 source/core/ut_suite_cache_tag.sql diff --git a/source/api/ut.pkb b/source/api/ut.pkb index 96cf51102..1a95f0725 100644 --- a/source/api/ut.pkb +++ b/source/api/ut.pkb @@ -121,7 +121,7 @@ create or replace package body ut is a_client_character_set varchar2, a_random_test_order integer, a_random_test_order_seed positive, - a_tags ut_varchar2_rows := null + a_tags varchar2 := null ) is pragma autonomous_transaction; begin @@ -157,7 +157,7 @@ create or replace package body ut is a_client_character_set varchar2, a_random_test_order integer, a_random_test_order_seed positive, - a_tags ut_varchar2_rows := null + a_tags varchar2 := null ) is pragma autonomous_transaction; begin @@ -234,7 +234,7 @@ create or replace package body ut is a_client_character_set, a_random_test_order, a_random_test_order_seed, - ut_varchar2_rows(a_tags) + a_tags ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); @@ -273,7 +273,7 @@ create or replace package body ut is a_client_character_set, a_random_test_order, a_random_test_order_seed, - ut_varchar2_rows(a_tags) + a_tags ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); @@ -313,7 +313,7 @@ create or replace package body ut is a_client_character_set, a_random_test_order, a_random_test_order_seed, - ut_varchar2_rows(a_tags) + a_tags ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); @@ -353,7 +353,7 @@ create or replace package body ut is a_client_character_set, a_random_test_order, a_random_test_order_seed, - ut_varchar2_rows(a_tags) + a_tags ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); @@ -393,7 +393,7 @@ create or replace package body ut is a_client_character_set, a_random_test_order, a_random_test_order_seed, - ut_varchar2_rows(a_tags) + a_tags ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); @@ -433,7 +433,7 @@ create or replace package body ut is a_client_character_set, a_random_test_order, a_random_test_order_seed, - ut_varchar2_rows(a_tags) + a_tags ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); @@ -457,7 +457,7 @@ create or replace package body ut is a_force_manual_rollback boolean := false, a_random_test_order boolean := false, a_random_test_order_seed positive := null, - a_tags ut_varchar2_rows := null + a_tags varchar2 := null ) is l_reporter ut_reporter_base := a_reporter; begin @@ -514,7 +514,7 @@ create or replace package body ut is a_force_manual_rollback boolean := false, a_random_test_order boolean := false, a_random_test_order_seed positive := null, - a_tags ut_varchar2_rows := null + a_tags varchar2 := null ) is l_reporter ut_reporter_base := a_reporter; begin @@ -563,7 +563,7 @@ create or replace package body ut is a_force_manual_rollback, a_random_test_order, a_random_test_order_seed, - ut_varchar2_rows(a_tags) + a_tags ); end; @@ -595,7 +595,7 @@ create or replace package body ut is a_force_manual_rollback, a_random_test_order, a_random_test_order_seed, - ut_varchar2_rows(a_tags) + a_tags ); end; @@ -628,7 +628,7 @@ create or replace package body ut is a_force_manual_rollback, a_random_test_order, a_random_test_order_seed, - ut_varchar2_rows(a_tags) + a_tags ); end; @@ -661,7 +661,7 @@ create or replace package body ut is a_force_manual_rollback, a_random_test_order, a_random_test_order_seed, - ut_varchar2_rows(a_tags) + a_tags ); end; diff --git a/source/api/ut.pks b/source/api/ut.pks index e6065d85b..17b4a845e 100644 --- a/source/api/ut.pks +++ b/source/api/ut.pks @@ -178,7 +178,7 @@ create or replace package ut authid current_user as a_force_manual_rollback boolean := false, a_random_test_order boolean := false, a_random_test_order_seed positive := null, - a_tags ut_varchar2_rows := null + a_tags varchar2 := null ); procedure run( @@ -194,7 +194,7 @@ create or replace package ut authid current_user as a_force_manual_rollback boolean := false, a_random_test_order boolean := false, a_random_test_order_seed positive := null, - a_tags ut_varchar2_rows := null + a_tags varchar2 := null ); procedure run( diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index 3d262abe3..30cdf2691 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -91,7 +91,7 @@ create or replace package body ut_runner is a_force_manual_rollback boolean := false, a_random_test_order boolean := false, a_random_test_order_seed positive := null, - a_tags ut_varchar2_rows := null + a_tags varchar2 := null ) is l_run ut_run; l_coverage_schema_names ut_varchar2_rows; @@ -99,7 +99,6 @@ create or replace package body ut_runner is l_include_object_names ut_object_names; l_paths ut_varchar2_list := ut_varchar2_list(); l_random_test_order_seed positive; - l_tags ut_varchar2_rows := ut_varchar2_rows(); begin ut_event_manager.initialize(); if a_reporters is not empty then @@ -126,12 +125,6 @@ create or replace package body ut_runner is end loop; end if; - if (a_tags is not null) or not(a_tags is empty) then - for i in 1..a_tags.count loop - l_tags := l_tags multiset union ut_utils.convert_collection(ut_utils.string_to_table(a_string => a_tags(i),a_delimiter => ',')); - end loop; - end if; - begin ut_expectation_processor.reset_invalidation_exception(); ut_utils.save_dbms_output_to_cache(); @@ -161,10 +154,10 @@ create or replace package body ut_runner is set(a_test_file_mappings), a_client_character_set, l_random_test_order_seed, - l_tags + a_tags ); - ut_suite_manager.configure_execution_by_path(l_paths, l_run.items, l_random_test_order_seed, l_tags); + ut_suite_manager.configure_execution_by_path(l_paths, l_run.items, l_random_test_order_seed, a_tags); if a_force_manual_rollback then l_run.set_rollback_type( a_rollback_type => ut_utils.gc_rollback_manual, a_force => true ); end if; diff --git a/source/api/ut_runner.pks b/source/api/ut_runner.pks index 895de3bb7..0434790f5 100644 --- a/source/api/ut_runner.pks +++ b/source/api/ut_runner.pks @@ -71,7 +71,7 @@ create or replace package ut_runner authid current_user is a_force_manual_rollback boolean := false, a_random_test_order boolean := false, a_random_test_order_seed positive := null, - a_tags ut_varchar2_rows := null + a_tags varchar2 := null ); /** diff --git a/source/core/types/ut_run.tpb b/source/core/types/ut_run.tpb index c8f2778ff..d26c6fcb4 100644 --- a/source/core/types/ut_run.tpb +++ b/source/core/types/ut_run.tpb @@ -27,7 +27,7 @@ create or replace type body ut_run as a_test_file_mappings ut_file_mappings := null, a_client_character_set varchar2 := null, a_random_test_order_seed positive := null, - a_run_tags ut_varchar2_rows := null + a_run_tags varchar2 := null ) return self as result is begin self.run_paths := a_run_paths; diff --git a/source/core/types/ut_run.tps b/source/core/types/ut_run.tps index b5a1d18ac..7ea5cc605 100644 --- a/source/core/types/ut_run.tps +++ b/source/core/types/ut_run.tps @@ -21,7 +21,7 @@ create or replace type ut_run under ut_suite_item ( project_name varchar2(4000), items ut_suite_items, run_paths ut_varchar2_list, - run_tags ut_varchar2_rows, + run_tags varchar2(4000), coverage_options ut_coverage_options, test_file_mappings ut_file_mappings, client_character_set varchar2(100), @@ -37,7 +37,7 @@ create or replace type ut_run under ut_suite_item ( a_test_file_mappings ut_file_mappings := null, a_client_character_set varchar2 := null, a_random_test_order_seed positive := null, - a_run_tags ut_varchar2_rows := null + a_run_tags varchar2 := null ) return self as result, overriding member procedure mark_as_skipped(self in out nocopy ut_run), overriding member function do_execute(self in out nocopy ut_run) return boolean, diff --git a/source/core/types/ut_suite.tpb b/source/core/types/ut_suite.tpb index bf683d8aa..bd35d18ca 100644 --- a/source/core/types/ut_suite.tpb +++ b/source/core/types/ut_suite.tpb @@ -18,7 +18,7 @@ create or replace type body ut_suite as constructor function ut_suite ( self in out nocopy ut_suite, a_object_owner varchar2, a_object_name varchar2, a_line_no integer, - a_suite_tags ut_varchar2_rows := null + a_tags varchar2 := null ) return self as result is begin self.self_type := $$plsql_unit; @@ -26,7 +26,7 @@ create or replace type body ut_suite as self.items := ut_suite_items(); before_all_list := ut_executables(); after_all_list := ut_executables(); - self.suite_tags := a_suite_tags; + self.tags := a_tags; return; end; diff --git a/source/core/types/ut_suite.tps b/source/core/types/ut_suite.tps index 0da911b4f..0bcddd59b 100644 --- a/source/core/types/ut_suite.tps +++ b/source/core/types/ut_suite.tps @@ -29,10 +29,10 @@ create or replace type ut_suite under ut_logical_suite ( /** * Hold list of tags assign to suite */ - suite_tags ut_varchar2_rows, + tags varchar2(4000), constructor function ut_suite ( self in out nocopy ut_suite, a_object_owner varchar2, a_object_name varchar2, a_line_no integer, - a_suite_tags ut_varchar2_rows := null + a_tags varchar2 := null ) return self as result, overriding member function do_execute(self in out nocopy ut_suite) return boolean, overriding member function get_error_stack_traces(self ut_suite) return ut_varchar2_list, diff --git a/source/core/types/ut_test.tpb b/source/core/types/ut_test.tpb index f09a51162..c1d847bf5 100644 --- a/source/core/types/ut_test.tpb +++ b/source/core/types/ut_test.tpb @@ -18,7 +18,7 @@ create or replace type body ut_test as constructor function ut_test( self in out nocopy ut_test, a_object_owner varchar2 := null, a_object_name varchar2, a_name varchar2, - a_line_no integer, a_expected_error_codes ut_integer_list := null, a_test_tags ut_varchar2_rows := null + a_line_no integer, a_expected_error_codes ut_integer_list := null, a_tags varchar2 := null ) return self as result is begin self.self_type := $$plsql_unit; @@ -31,7 +31,7 @@ create or replace type body ut_test as self.all_expectations := ut_expectation_results(); self.failed_expectations := ut_expectation_results(); self.expected_error_codes := a_expected_error_codes; - self.test_tags := a_test_tags; + self.tags := a_tags; return; end; diff --git a/source/core/types/ut_test.tps b/source/core/types/ut_test.tps index caabdf1b1..23116119c 100644 --- a/source/core/types/ut_test.tps +++ b/source/core/types/ut_test.tps @@ -58,10 +58,10 @@ create or replace type ut_test force under ut_suite_item ( /** * Hold list of tags assign to test */ - test_tags ut_varchar2_rows, + tags varchar2(4000), constructor function ut_test( self in out nocopy ut_test, a_object_owner varchar2 := null, a_object_name varchar2, a_name varchar2, - a_line_no integer, a_expected_error_codes ut_integer_list := null, a_test_tags ut_varchar2_rows := null + a_line_no integer, a_expected_error_codes ut_integer_list := null, a_tags varchar2 := null ) return self as result, overriding member procedure mark_as_skipped(self in out nocopy ut_test), overriding member function do_execute(self in out nocopy ut_test) return boolean, diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index 2a6a810e3..e11c91a2b 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -309,13 +309,12 @@ create or replace package body ut_suite_builder is procedure add_tags_to_test( a_suite in out nocopy ut_suite, - a_list in out nocopy ut_varchar2_rows, + a_list in out nocopy varchar2, a_procedure_name t_object_name, a_tags_ann_text tt_annotation_texts ) is l_annotation_pos binary_integer; begin - a_list := ut_varchar2_rows(); l_annotation_pos := a_tags_ann_text.first; while l_annotation_pos is not null loop if a_tags_ann_text(l_annotation_pos) is null then @@ -325,8 +324,7 @@ create or replace package body ut_suite_builder is ); else a_list := - a_list multiset union - ut_utils.convert_collection(ut_utils.trim_list_elements(ut_utils.string_to_table(a_tags_ann_text(l_annotation_pos), ',', 'Y'))); + a_list || a_tags_ann_text(l_annotation_pos); end if; l_annotation_pos := a_tags_ann_text.next(l_annotation_pos); end loop; @@ -514,7 +512,7 @@ create or replace package body ut_suite_builder is end if; if l_proc_annotations.exists( gc_tag) then - add_tags_to_test(a_suite, l_test.test_tags, a_procedure_name, l_proc_annotations( gc_tag)); + add_tags_to_test(a_suite, l_test.tags, a_procedure_name, l_proc_annotations( gc_tag)); end if; if l_proc_annotations.exists( gc_throws) then @@ -623,7 +621,7 @@ create or replace package body ut_suite_builder is a_tags_ann_text tt_annotation_texts ) is l_annotation_pos binary_integer; - l_tags ut_varchar2_rows := ut_varchar2_rows(); + l_tags varchar2(4000); begin l_annotation_pos := a_tags_ann_text.first; while l_annotation_pos is not null loop @@ -633,12 +631,11 @@ create or replace package body ut_suite_builder is ); else l_tags := - l_tags multiset union - ut_utils.convert_collection(ut_utils.trim_list_elements(ut_utils.string_to_table(a_tags_ann_text(l_annotation_pos), ',', 'Y'))); + l_tags || a_tags_ann_text(l_annotation_pos); end if; l_annotation_pos := a_tags_ann_text.next(l_annotation_pos); end loop; - a_suite.suite_tags := l_tags; + a_suite.tags := l_tags; end; procedure add_suite_tests( diff --git a/source/core/ut_suite_cache.sql b/source/core/ut_suite_cache.sql index e41af9607..3a38ceeb7 100644 --- a/source/core/ut_suite_cache.sql +++ b/source/core/ut_suite_cache.sql @@ -47,7 +47,6 @@ create table ut_suite_cache ( nested table before_test_list store as ut_suite_cache_before_test nested table after_test_list store as ut_suite_cache_after_test nested table expected_error_codes store as ut_suite_cache_throws - nested table tags store as ut_suite_cache_tags return as locator as select cast(null as number(22)) id, @@ -69,7 +68,7 @@ create table ut_suite_cache ( t.after_each_list, t.after_test_list, t.expected_error_codes, - t.test_tags, + t.tags, t.item from table(ut_suite_contexts(ut_suite_context(user,'package_name','ctx_name',1))) c cross join table(ut_tests(ut_test(user,'package_name','test_name',1))) t diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index 55a6816e0..526a03338 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -104,7 +104,7 @@ create or replace package body ut_suite_cache_manager is s.i.before_all_list as before_all_list, s.i.after_all_list as after_all_list, null before_each_list, null after_each_list, null before_test_list, null after_test_list, - null expected_error_codes, s.i.suite_tags tags, + null expected_error_codes, s.i.tags tags, null item from suites s; @@ -130,9 +130,22 @@ create or replace package body ut_suite_cache_manager is null before_all_list, null after_all_list, s.t.before_each_list as before_each_list, s.t.after_each_list as after_each_list, s.t.before_test_list as before_test_list, s.t.after_test_list as after_test_list, - s.t.expected_error_codes as expected_error_codes, s.t.test_tags as test_tags, + s.t.expected_error_codes as expected_error_codes, s.t.tags as test_tags, s.t.item as item from tests s; + + --TODO : Optimize to use only inserted + merge into ut_suite_cache_tag tgt + using ( select /*+cardinality (tt 100) */ t.id,tt.column_value tag + from ut_suite_cache t, + table(ut_utils.convert_collection((ut_utils.string_to_table(t.tags,',')))) tt + where tt.column_value is not null ) src + on ( tgt.suiteid = src.id and tgt.tagname = src.tag) + when not matched then + insert + (suiteid, tagname ) + values + (src.id, src.tag); end if; end if; diff --git a/source/core/ut_suite_cache_tag.sql b/source/core/ut_suite_cache_tag.sql new file mode 100644 index 000000000..17d287dd8 --- /dev/null +++ b/source/core/ut_suite_cache_tag.sql @@ -0,0 +1,7 @@ +create table ut_suite_cache_tag ( + suiteid number(22) not null, + tagname varchar2(100) not null, + constraint ut_suite_to_tag_pk primary key (suiteid,tagname), + constraint ut_suite_id_fk foreign key ( suiteid ) references ut_suite_cache(id) on delete cascade +) +organization index; \ No newline at end of file diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index ad433b8da..54bf8fa04 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -193,7 +193,7 @@ create or replace package body ut_suite_manager is results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), items => a_items_at_level(a_prev_level), before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( - a_rows( a_idx ).after_all_list), suite_tags => a_rows(a_idx).tags --TODO : Should be share or separate + a_rows( a_idx ).after_all_list), tags => a_rows(a_idx).tags --TODO : Should be share or separate ) else ut_suite( @@ -206,7 +206,7 @@ create or replace package body ut_suite_manager is results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), items => ut_suite_items(), before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( - a_rows( a_idx ).after_all_list), suite_tags => a_rows(a_idx).tags --TODO : Should be share or separate + a_rows( a_idx ).after_all_list), tags => a_rows(a_idx).tags --TODO : Should be share or separate ) end; when 'UT_SUITE_CONTEXT' then @@ -222,7 +222,7 @@ create or replace package body ut_suite_manager is results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), items => a_items_at_level(a_prev_level), before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( - a_rows( a_idx ).after_all_list), suite_tags => a_rows(a_idx).tags --TODO : Should be share or separate + a_rows( a_idx ).after_all_list), tags => a_rows(a_idx).tags --TODO : Should be share or separate ) else ut_suite_context( @@ -235,7 +235,7 @@ create or replace package body ut_suite_manager is results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), items => ut_suite_items(), before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( - a_rows( a_idx ).after_all_list), suite_tags => a_rows(a_idx).tags --TODO : Should be share or separate + a_rows( a_idx ).after_all_list), tags => a_rows(a_idx).tags --TODO : Should be share or separate ) end; when 'UT_LOGICAL_SUITE' then @@ -278,7 +278,7 @@ create or replace package body ut_suite_manager is after_test_list => sort_by_seq_no(a_rows(a_idx).after_test_list), after_each_list => sort_by_seq_no(a_rows(a_idx).after_each_list), all_expectations => ut_expectation_results(), failed_expectations => ut_expectation_results(), parent_error_stack_trace => null, expected_error_codes => a_rows(a_idx).expected_error_codes, - test_tags => a_rows(a_idx).tags + tags => a_rows(a_idx).tags ); end case; l_result.results_count.warnings_count := l_result.warnings.count; @@ -363,14 +363,14 @@ create or replace package body ut_suite_manager is a_procedure_name varchar2 := null, a_skip_all_objects boolean := false, a_random_seed positive, - a_tags ut_varchar2_rows := null + a_tags varchar2 := null ) return t_cached_suites_cursor is l_path varchar2( 4000 ); l_result sys_refcursor; l_ut_owner varchar2(250) := ut_utils.ut_owner; l_sql varchar2(32767); - l_tags ut_varchar2_rows := coalesce(a_tags,ut_varchar2_rows()); l_suite_item_name varchar2(20); + l_tag_list varchar2(4000) :=a_tags; begin if a_path is null and a_object_name is not null then execute immediate 'select min(path) @@ -382,8 +382,7 @@ create or replace package body ut_suite_manager is else l_path := lower( a_path ); end if; - - l_suite_item_name := case when l_tags.count > 0 then 'suite_items_tags' else 'suite_items' end; + l_suite_item_name := case when l_tag_list is not null then 'suite_items_tags' else 'suite_items' end; /* Rewrite that as tags should be put on whats left not on full suite item cache */ l_sql := @@ -415,13 +414,13 @@ create or replace package body ut_suite_manager is ) ) ),]' - ||case when l_tags.count > 0 then + ||case when l_tag_list is not null then q'[ filter_tags as ( select s.* from suite_items s where exists ( select 1 - from table(s.tags) ct,table(:l_tags) tag - where ct.column_value = tag.column_value) + from ]'||l_ut_owner||q'[.ut_suite_cache_tag ct + where ct.suiteid = s.id and instr(:a_tag_list,ct.tagname) > 0 ) ), suite_items_tags as ( select c.* from suite_items c @@ -431,7 +430,7 @@ create or replace package body ut_suite_manager is ) ),]' else - q'[dummy as (select 1 from table(:l_tags) where 1 = 2 ),]' + q'[dummy as (select 'x' from dual where :a_tag_list is null ),]' end|| q'[ suitepaths as ( select distinct substr(path,1,instr(path,'.',-1)-1) as suitepath, @@ -457,7 +456,6 @@ create or replace package body ut_suite_manager is upper( substr(p.path, instr( p.path, '.', -1 ) + 1 ) ) as object_name, cast(null as ]'||l_ut_owner||q'[.ut_executables) as x, cast(null as ]'||l_ut_owner||q'[.ut_integer_list) as y, - cast(null as ]'||l_ut_owner||q'[.ut_varchar2_rows) as q, cast(null as ]'||l_ut_owner||q'[.ut_executable_test) as z from suitepath_part p where p.path @@ -471,7 +469,7 @@ create or replace package body ut_suite_manager is s.x as before_all_list, s.x as after_all_list, s.x as before_each_list, s.x as before_test_list, s.x as after_each_list, s.x as after_test_list, - s.y as expected_error_codes, s.q as test_tags, + s.y as expected_error_codes, null as test_tags, s.z as item from logical_suite_data s ), @@ -499,8 +497,8 @@ create or replace package body ut_suite_manager is l_ut_owner||'.ut_annotation_manager.hash_suite_path( c.path, :a_random_seed ) desc nulls last' - end; - open l_result for l_sql using l_path, l_path, upper(a_object_name), upper(a_procedure_name), l_tags, a_random_seed; + end; + open l_result for l_sql using l_path, l_path, upper(a_object_name), upper(a_procedure_name), l_tag_list, a_random_seed; return l_result; end; @@ -588,7 +586,7 @@ create or replace package body ut_suite_manager is a_procedure_name varchar2 := null, a_suites in out nocopy ut_suite_items, a_random_seed positive, - a_tags ut_varchar2_rows := null + a_tags varchar2 := null ) is begin refresh_cache(a_owner_name); @@ -695,7 +693,7 @@ create or replace package body ut_suite_manager is a_paths in ut_varchar2_list, a_suites out nocopy ut_suite_items, a_random_seed in positive := null, - a_tags ut_varchar2_rows := null + a_tags varchar2 := null ) is l_paths ut_varchar2_list := a_paths; l_path_items t_path_items; @@ -736,8 +734,8 @@ create or replace package body ut_suite_manager is raise_application_error(ut_utils.gc_suite_package_not_found,'Suite test '||l_schema||'.'||l_path_item.object_name|| '.'||l_path_item.procedure_name||' does not exist'); elsif l_path_item.object_name is not null then raise_application_error(ut_utils.gc_suite_package_not_found,'Suite package '||l_schema||'.'||l_path_item.object_name|| ' does not exist'); - elsif a_tags.count > 0 then - raise_application_error(ut_utils.gc_suite_package_not_found,'No suite packages found for tags: '||ut_utils.to_string(ut_utils.table_to_clob(a_tags,','),a_max_output_len => 450)); + elsif a_tags is not null then + raise_application_error(ut_utils.gc_suite_package_not_found,'No suite packages found for tags: '||ut_utils.to_string(a_tags,a_max_output_len => 450)); end if; end if; l_index := a_suites.first; diff --git a/source/core/ut_suite_manager.pks b/source/core/ut_suite_manager.pks index 9b214a6c2..5b7c705c6 100644 --- a/source/core/ut_suite_manager.pks +++ b/source/core/ut_suite_manager.pks @@ -50,7 +50,7 @@ create or replace package ut_suite_manager authid current_user is a_paths in ut_varchar2_list, a_suites out nocopy ut_suite_items, a_random_seed in positive := null, - a_tags ut_varchar2_rows := null + a_tags varchar2 := null ); /** diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index 609d78ccf..6cc40afdc 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -93,6 +93,7 @@ grant select on &&ut3_owner..ut_annotation_cache to public; grant execute on &&ut3_owner..ut_executables to public; grant execute on &&ut3_owner..ut_executable_test to public; grant select on &&ut3_owner..ut_suite_cache to public; +grant select on &&ut3_owner..ut_suite_cache_tag to public; grant select on &&ut3_owner..ut_suite_cache_package to public; grant select on &&ut3_owner..ut_suite_cache_schema to public; grant execute on &&ut3_owner..ut_annotation_cache_manager to public; diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql index 7aa5deb39..ace73b951 100644 --- a/source/create_user_grants.sql +++ b/source/create_user_grants.sql @@ -114,6 +114,7 @@ grant select on &&ut3_owner..ut_annotation_cache to &ut3_user; grant execute on &&ut3_owner..ut_executables to &ut3_user; grant execute on &&ut3_owner..ut_executable_test to &ut3_user; grant select on &&ut3_owner..ut_suite_cache to &ut3_user; +grant select on &&ut3_owner..ut_suite_cache_tag to &ut3_user; grant select on &&ut3_owner..ut_suite_cache_package to public; grant select on &&ut3_owner..ut_suite_cache_schema to &ut3_user; grant execute on &&ut3_owner..ut_annotation_cache_manager to &ut3_user; diff --git a/source/install.sql b/source/install.sql index 728f4349f..86669c11d 100644 --- a/source/install.sql +++ b/source/install.sql @@ -130,6 +130,7 @@ alter session set current_schema = &&ut3_owner; @@install_component.sql 'core/ut_suite_cache_package.sql' @@install_component.sql 'core/ut_suite_cache_seq.sql' @@install_component.sql 'core/ut_suite_cache.sql' +@@install_component.sql 'core/ut_suite_cache_tag.sql' @@install_component.sql 'core/ut_suite_cache_manager.pks' @@install_component.sql 'core/ut_suite_cache_manager.pkb' @@install_component.sql 'core/ut_suite_builder.pks' diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index e2295f34d..e68b50664 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -63,6 +63,8 @@ drop package ut_suite_manager; drop package ut_suite_builder; +drop table ut_suite_cache_tag; + drop table ut_suite_cache; drop sequence ut_suite_cache_seq; diff --git a/test/ut3_tester/core/test_suite_builder.pkb b/test/ut3_tester/core/test_suite_builder.pkb index 7ef85a53a..17fbca74a 100644 --- a/test/ut3_tester/core/test_suite_builder.pkb +++ b/test/ut3_tester/core/test_suite_builder.pkb @@ -652,7 +652,7 @@ create or replace package body test_suite_builder is '%some_packagecontext_setup' || '%' || '' || - '' || + '' || '' || '' || '%suite_level_testIn suitesome_package.suite_level_test' || @@ -662,7 +662,7 @@ create or replace package body test_suite_builder is '%some_packagesuite_level_beforeall' || '%' || '' || - '' || + '' || '' ); end; @@ -798,7 +798,7 @@ create or replace package body test_suite_builder is '%some_packagecontext_setup' || '%' || '' || - ''|| + ''|| '' ); end; @@ -840,7 +840,7 @@ create or replace package body test_suite_builder is '%some_packagecontext_setup' || '%' || '' || - '' || + '' || '' || '' || '%suite_level_testIn suitesome_package.suite_level_test' || @@ -850,7 +850,7 @@ create or replace package body test_suite_builder is '%some_packagesuite_level_beforeall' || '%' || '' || - '' || + '' || '' ); end; @@ -897,7 +897,7 @@ create or replace package body test_suite_builder is '%some_packagecontext_setup' || '%' || '' || - '' || + '' || '' || '' || '%suite_level_testIn suitesome_package.suite_level_test' || @@ -907,7 +907,7 @@ create or replace package body test_suite_builder is '%some_packagesuite_level_beforeall' || '%' || '' || - '' || + '' || '' ); end; From 1fbf433369ac074e6f18d250828d36c93755e27f Mon Sep 17 00:00:00 2001 From: Lukasz Date: Fri, 19 Apr 2019 23:00:02 +0100 Subject: [PATCH 0420/1096] Fix/oracle bug with xmlspaces (#895) * Address issue with whitespace in XML. Cursor describe is ignoring whitespace so max len of column with value ' t ' is showing as 1. XMLTABLE when extracting values from tag with whitespaces its ignoring them. It works properly if there is any character there e.g ' t '. * Update tests --- .../data_values/ut_compound_data_helper.pkb | 2 + .../data_values/ut_data_value_refcursor.tpb | 14 ++- .../expectations/test_expectations_cursor.pkb | 85 +++++++++++++++++++ .../expectations/test_expectations_cursor.pks | 25 ++++++ 4 files changed, 122 insertions(+), 4 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 322b9b215..6e8453f45 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -235,6 +235,8 @@ create or replace package body ut_compound_data_helper is l_col_type := 'VARCHAR2(50)'; elsif a_data_info.is_sql_diffable = 1 and type_no_length(a_data_info.column_type) then l_col_type := a_data_info.column_type; + elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('VARCHAR2','CHAR') then + l_col_type := 'VARCHAR2('||greatest(a_data_info.column_len,4000)||')'; else l_col_type := a_data_info.column_type ||case when a_data_info.column_len is not null diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 23dca3dcf..ee929d097 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -49,15 +49,22 @@ create or replace type body ut_data_value_refcursor as dbms_xmlgen.setNullHandling(l_ctx, dbms_xmlgen.empty_tag); dbms_xmlgen.setMaxRows(l_ctx, c_bulk_rows); loop - l_xml := dbms_xmlgen.getxmltype(l_ctx); + l_xml := dbms_xmlgen.getxmltype(l_ctx); exit when dbms_xmlgen.getNumRowsProcessed(l_ctx) = 0; + --Bug in oracle 12.2+ where XML binary storage trimming insignificant whitespaces. + $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then + l_xml := xmltype( replace(l_xml.getClobVal(),' Date: Fri, 19 Apr 2019 22:59:18 +0000 Subject: [PATCH 0421/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index ec79d645c..5f66fa774 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 3f6cffed3..5d31926b9 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 497d20418..94576cced 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index f1f3615b3..6493c0977 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index d448537b9..af338a8c6 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 556d97129..5d15c45d0 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 922ab5227..c659f7237 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index cc41a86a5..ff6e3e9e1 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 8de2fdb27..546c24556 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index be73ccf6d..c3e04fd73 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 2e030665b..fa6190a5c 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index babf5a51b..70b19945e 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 060974505..327dd5a13 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 488db9204..df973f5ea 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 494f9ef6a..d0c2bbd63 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 4cdc4fb7c..9b765300a 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index fa03c5a19..d4c36b78f 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2851--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index dcf24f2e4..da3778eab 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -760,7 +760,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.7.2851-develop + * secion v3.1.7.2859-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index bfb3bc219..6ea107499 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.7.2851-develop'; + gc_version constant varchar2(50) := 'v3.1.7.2859-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 1a941a8698714e484079a40dbdd1e5375eae148a Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sat, 20 Apr 2019 18:36:43 +0100 Subject: [PATCH 0422/1096] Adding Tests to tags #suitebuilder --- source/core/ut_suite_builder.pkb | 20 +- source/core/ut_utils.pkb | 1 - test/ut3_tester/core/test_suite_builder.pkb | 300 ++++++++++++++++++++ test/ut3_tester/core/test_suite_builder.pks | 47 +++ 4 files changed, 361 insertions(+), 7 deletions(-) diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index e11c91a2b..ccb91c203 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -314,6 +314,7 @@ create or replace package body ut_suite_builder is a_tags_ann_text tt_annotation_texts ) is l_annotation_pos binary_integer; + l_tag_list ut_varchar2_list := ut_varchar2_list(); begin l_annotation_pos := a_tags_ann_text.first; while l_annotation_pos is not null loop @@ -323,9 +324,13 @@ create or replace package body ut_suite_builder is || chr( 10 ) || 'at "' || get_qualified_object_name(a_suite, a_procedure_name) || '", line ' || l_annotation_pos ); else - a_list := - a_list || a_tags_ann_text(l_annotation_pos); + l_tag_list := l_tag_list multiset union distinct ut_utils.trim_list_elements( + ut_utils.string_to_table(a_tags_ann_text(l_annotation_pos),',') + ); end if; + a_list := ut_utils.table_to_clob( + ut_utils.filter_list(l_tag_list,'^(\w|\S)+$'), + ','); l_annotation_pos := a_tags_ann_text.next(l_annotation_pos); end loop; @@ -621,7 +626,7 @@ create or replace package body ut_suite_builder is a_tags_ann_text tt_annotation_texts ) is l_annotation_pos binary_integer; - l_tags varchar2(4000); + l_tag_list ut_varchar2_list := ut_varchar2_list(); begin l_annotation_pos := a_tags_ann_text.first; while l_annotation_pos is not null loop @@ -630,12 +635,15 @@ create or replace package body ut_suite_builder is '"--%tag" annotation requires a tag value populated. Annotation ignored, line ' || l_annotation_pos ); else - l_tags := - l_tags || a_tags_ann_text(l_annotation_pos); + l_tag_list := l_tag_list multiset union distinct ut_utils.trim_list_elements( + ut_utils.string_to_table(a_tags_ann_text(l_annotation_pos),',') + ); end if; l_annotation_pos := a_tags_ann_text.next(l_annotation_pos); end loop; - a_suite.tags := l_tags; + a_suite.tags := ut_utils.table_to_clob( + ut_utils.filter_list(l_tag_list,'^(\w|\S)+$'), + ','); end; procedure add_suite_tests( diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index be8da247e..64aa57af9 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -610,7 +610,6 @@ create or replace package body ut_utils is if a_list is not null then l_filtered_list := ut_varchar2_list(); l_index := a_list.first; - while (l_index is not null) loop if regexp_like(a_list(l_index), a_regexp_filter) then l_filtered_list.extend; diff --git a/test/ut3_tester/core/test_suite_builder.pkb b/test/ut3_tester/core/test_suite_builder.pkb index 17fbca74a..6d9289d3c 100644 --- a/test/ut3_tester/core/test_suite_builder.pkb +++ b/test/ut3_tester/core/test_suite_builder.pkb @@ -1121,5 +1121,305 @@ create or replace package body test_suite_builder is ut.expect(l_actual).to_match('(.*)(Unsupported annotation "--%bad_package_annotation"\. Annotation ignored\.)(.*)( line 17)(.*)', 'n'); end; + procedure test_tag_annotation is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(2, 'suite','testsuite', null), + ut3.ut_annotation(8, 'test','Some test', 'test_procedure'), + ut3.ut_annotation(9, 'tag','testtag', 'test_procedure') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%' || + '%test_procedureSome testsome_package.test_procedure' || + '%testtag%'|| + '%%' + ); + + end; + + procedure suite_tag_annotation is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(2, 'suite','testsuite', null), + ut3.ut_annotation(3, 'tag','suitetag', null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%' || + '%some_packagetestsuitesome_package' || + '%suitetag%'|| + '%%' + ); + + end; + + procedure test_tags_annotation is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(2, 'suite','testsuite', null), + ut3.ut_annotation(8, 'test','Some test', 'test_procedure'), + ut3.ut_annotation(9, 'tag','testtag,testtag2,testtag3', 'test_procedure') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%' || + '%test_procedureSome testsome_package.test_procedure' || + '%testtag,testtag2,testtag3%'|| + '%%' + ); + + end; + + procedure suite_tags_annotation is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(2, 'suite','testsuite', null), + ut3.ut_annotation(3, 'tag','suitetag,suitetag1,suitetag2', null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%' || + '%some_packagetestsuitesome_package' || + '%suitetag,suitetag1,suitetag2%'|| + '%%' + ); + + end; + + procedure test_2line_tags_annotation is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(2, 'suite','testsuite', null), + ut3.ut_annotation(8, 'test','Some test', 'test_procedure'), + ut3.ut_annotation(9, 'tag','testtag', 'test_procedure'), + ut3.ut_annotation(10, 'tag','testtag2', 'test_procedure') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%' || + '%test_procedureSome testsome_package.test_procedure' || + '%testtag,testtag2%'|| + '%%' + ); + + end; + + procedure suite_2line_tags_annotation is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(2, 'suite','testsuite', null), + ut3.ut_annotation(3, 'tag','suitetag', null), + ut3.ut_annotation(4, 'tag','suitetag1', null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%' || + '%some_packagetestsuitesome_package' || + '%suitetag,suitetag1%'|| + '%%' + ); + + end; + + procedure test_empty_tag is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(2, 'suite','testsuite', null), + ut3.ut_annotation(8, 'test','Some test', 'test_procedure'), + ut3.ut_annotation(9, 'tag',null, 'test_procedure') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%%"--%tag" annotation requires a tag value populated. Annotation ignored.%%'|| + '%%' + ); + + end; + + procedure suite_empty_tag is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(2, 'suite','testsuite', null), + ut3.ut_annotation(3, 'tag',null, null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%"--%tag" annotation requires a tag value populated. Annotation ignored, line 3%'|| + '%%' + ); + + end; + + procedure test_duplicate_tag is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(2, 'suite','testsuite', null), + ut3.ut_annotation(8, 'test','Some test', 'test_procedure'), + ut3.ut_annotation(9, 'tag','testtag,testtag1,testtag', 'test_procedure'), + ut3.ut_annotation(10, 'tag',' testtag,testtag1,testtag2', 'test_procedure') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%' || + '%test_procedureSome testsome_package.test_procedure' || + '%testtag,testtag1,testtag2%'|| + '%%' + ); + + end; + + procedure suite_duplicate_tag is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(2, 'suite','testsuite', null), + ut3.ut_annotation(3, 'tag','suitetag,suitetag1,suitetag', null), + ut3.ut_annotation(4, 'tag',' suitetag1,suitetag2', null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%' || + '%some_packagetestsuitesome_package' || + '%suitetag,suitetag1,suitetag2%'|| + '%%' + ); + + end; + + procedure test_empty_tag_between is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(2, 'suite','testsuite', null), + ut3.ut_annotation(8, 'test','Some test', 'test_procedure'), + ut3.ut_annotation(9, 'tag','testtag,, ,testtag1', 'test_procedure') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%' || + '%test_procedureSome testsome_package.test_procedure' || + '%testtag,testtag1%'|| + '%%' + ); + + end; + + procedure suite_empty_tag_between is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(2, 'suite','testsuite', null), + ut3.ut_annotation(3, 'tag','suitetag,, ,suitetag1', null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%' || + '%some_packagetestsuitesome_package' || + '%suitetag,suitetag1%'|| + '%%' + ); + + end; + + procedure test_special_char_tag is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(2, 'suite','testsuite', null), + ut3.ut_annotation(8, 'test','Some test', 'test_procedure'), + ut3.ut_annotation(9, 'tag','#?$%^&*!|\/@][', 'test_procedure') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%' || + '%test_procedureSome testsome_package.test_procedure' || + '%#?$%^&*!|\/@][%'|| + '%%' + ); + + end; + + procedure suite_special_char_tag is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(2, 'suite','testsuite', null), + ut3.ut_annotation(3, 'tag','#?$%^&*!|\/@][', null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%' || + '%some_packagetestsuitesome_package' || + '%#?$%^&*!|\/@][%'|| + '%%' + ); + + end; + end test_suite_builder; / diff --git a/test/ut3_tester/core/test_suite_builder.pks b/test/ut3_tester/core/test_suite_builder.pks index 5715cfd85..721db153f 100644 --- a/test/ut3_tester/core/test_suite_builder.pks +++ b/test/ut3_tester/core/test_suite_builder.pks @@ -172,5 +172,52 @@ create or replace package test_suite_builder is --%endcontext + --%context(tags_annotation) + --%displayname(--%tag_annotation) + + --%test(Build suite test with tag) + procedure test_tag_annotation; + + --%test(Build suite with tag) + procedure suite_tag_annotation; + + --%test(Build suite test with three tags) + procedure test_tags_annotation; + + --%test(Build suite with three tags) + procedure suite_tags_annotation; + + --%test(Build suite test with two line tag annotation) + procedure test_2line_tags_annotation; + + --%test(Build suite with two line tag annotation) + procedure suite_2line_tags_annotation; + + --%test(Build suite test with empty line tag annotation) + procedure test_empty_tag; + + --%test(Build suite with empty line tag annotation) + procedure suite_empty_tag; + + --%test(Build suite test with duplicate tag annotation) + procedure test_duplicate_tag; + + --%test(Build suite with duplicate tag annotation) + procedure suite_duplicate_tag; + + --%test(Build suite test with empty between tag annotation) + procedure test_empty_tag_between; + + --%test(Build suite with empty between tag annotation) + procedure suite_empty_tag_between; + + --%test(Build suite test with special char tag annotation) + procedure test_special_char_tag; + + --%test(Build suite with special char tag annotation) + procedure suite_special_char_tag; + + --%endcontext + end test_suite_builder; / From 3a8ba8f4fae4df30b2c97166675460bc2aa07335 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sun, 21 Apr 2019 07:47:27 +0100 Subject: [PATCH 0423/1096] Change annotation to --%tags --- source/core/ut_suite_builder.pkb | 2 +- test/ut3_tester/core/test_suite_builder.pkb | 36 ++++++++++----------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index ccb91c203..ab4920e9c 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -23,7 +23,7 @@ create or replace package body ut_suite_builder is gc_suite constant t_annotation_name := 'suite'; gc_suitepath constant t_annotation_name := 'suitepath'; - gc_tag constant t_annotation_name := 'tag'; + gc_tag constant t_annotation_name := 'tags'; gc_test constant t_annotation_name := ut_utils.gc_test_execute; gc_disabled constant t_annotation_name := 'disabled'; gc_displayname constant t_annotation_name := 'displayname'; diff --git a/test/ut3_tester/core/test_suite_builder.pkb b/test/ut3_tester/core/test_suite_builder.pkb index 6d9289d3c..8f8308f4f 100644 --- a/test/ut3_tester/core/test_suite_builder.pkb +++ b/test/ut3_tester/core/test_suite_builder.pkb @@ -1129,7 +1129,7 @@ create or replace package body test_suite_builder is l_annotations := ut3.ut_annotations( ut3.ut_annotation(2, 'suite','testsuite', null), ut3.ut_annotation(8, 'test','Some test', 'test_procedure'), - ut3.ut_annotation(9, 'tag','testtag', 'test_procedure') + ut3.ut_annotation(9, 'tags','testtag', 'test_procedure') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1150,7 +1150,7 @@ create or replace package body test_suite_builder is --Arrange l_annotations := ut3.ut_annotations( ut3.ut_annotation(2, 'suite','testsuite', null), - ut3.ut_annotation(3, 'tag','suitetag', null) + ut3.ut_annotation(3, 'tags','suitetag', null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1172,7 +1172,7 @@ create or replace package body test_suite_builder is l_annotations := ut3.ut_annotations( ut3.ut_annotation(2, 'suite','testsuite', null), ut3.ut_annotation(8, 'test','Some test', 'test_procedure'), - ut3.ut_annotation(9, 'tag','testtag,testtag2,testtag3', 'test_procedure') + ut3.ut_annotation(9, 'tags','testtag,testtag2,testtag3', 'test_procedure') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1193,7 +1193,7 @@ create or replace package body test_suite_builder is --Arrange l_annotations := ut3.ut_annotations( ut3.ut_annotation(2, 'suite','testsuite', null), - ut3.ut_annotation(3, 'tag','suitetag,suitetag1,suitetag2', null) + ut3.ut_annotation(3, 'tags','suitetag,suitetag1,suitetag2', null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1215,8 +1215,8 @@ create or replace package body test_suite_builder is l_annotations := ut3.ut_annotations( ut3.ut_annotation(2, 'suite','testsuite', null), ut3.ut_annotation(8, 'test','Some test', 'test_procedure'), - ut3.ut_annotation(9, 'tag','testtag', 'test_procedure'), - ut3.ut_annotation(10, 'tag','testtag2', 'test_procedure') + ut3.ut_annotation(9, 'tags','testtag', 'test_procedure'), + ut3.ut_annotation(10, 'tags','testtag2', 'test_procedure') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1237,8 +1237,8 @@ create or replace package body test_suite_builder is --Arrange l_annotations := ut3.ut_annotations( ut3.ut_annotation(2, 'suite','testsuite', null), - ut3.ut_annotation(3, 'tag','suitetag', null), - ut3.ut_annotation(4, 'tag','suitetag1', null) + ut3.ut_annotation(3, 'tags','suitetag', null), + ut3.ut_annotation(4, 'tags','suitetag1', null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1259,7 +1259,7 @@ create or replace package body test_suite_builder is l_annotations := ut3.ut_annotations( ut3.ut_annotation(2, 'suite','testsuite', null), ut3.ut_annotation(8, 'test','Some test', 'test_procedure'), - ut3.ut_annotation(9, 'tag',null, 'test_procedure') + ut3.ut_annotation(9, 'tags',null, 'test_procedure') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1278,7 +1278,7 @@ create or replace package body test_suite_builder is --Arrange l_annotations := ut3.ut_annotations( ut3.ut_annotation(2, 'suite','testsuite', null), - ut3.ut_annotation(3, 'tag',null, null) + ut3.ut_annotation(3, 'tags',null, null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1298,8 +1298,8 @@ create or replace package body test_suite_builder is l_annotations := ut3.ut_annotations( ut3.ut_annotation(2, 'suite','testsuite', null), ut3.ut_annotation(8, 'test','Some test', 'test_procedure'), - ut3.ut_annotation(9, 'tag','testtag,testtag1,testtag', 'test_procedure'), - ut3.ut_annotation(10, 'tag',' testtag,testtag1,testtag2', 'test_procedure') + ut3.ut_annotation(9, 'tags','testtag,testtag1,testtag', 'test_procedure'), + ut3.ut_annotation(10, 'tags',' testtag,testtag1,testtag2', 'test_procedure') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1320,8 +1320,8 @@ create or replace package body test_suite_builder is --Arrange l_annotations := ut3.ut_annotations( ut3.ut_annotation(2, 'suite','testsuite', null), - ut3.ut_annotation(3, 'tag','suitetag,suitetag1,suitetag', null), - ut3.ut_annotation(4, 'tag',' suitetag1,suitetag2', null) + ut3.ut_annotation(3, 'tags','suitetag,suitetag1,suitetag', null), + ut3.ut_annotation(4, 'tags',' suitetag1,suitetag2', null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1343,7 +1343,7 @@ create or replace package body test_suite_builder is l_annotations := ut3.ut_annotations( ut3.ut_annotation(2, 'suite','testsuite', null), ut3.ut_annotation(8, 'test','Some test', 'test_procedure'), - ut3.ut_annotation(9, 'tag','testtag,, ,testtag1', 'test_procedure') + ut3.ut_annotation(9, 'tags','testtag,, ,testtag1', 'test_procedure') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1364,7 +1364,7 @@ create or replace package body test_suite_builder is --Arrange l_annotations := ut3.ut_annotations( ut3.ut_annotation(2, 'suite','testsuite', null), - ut3.ut_annotation(3, 'tag','suitetag,, ,suitetag1', null) + ut3.ut_annotation(3, 'tags','suitetag,, ,suitetag1', null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1386,7 +1386,7 @@ create or replace package body test_suite_builder is l_annotations := ut3.ut_annotations( ut3.ut_annotation(2, 'suite','testsuite', null), ut3.ut_annotation(8, 'test','Some test', 'test_procedure'), - ut3.ut_annotation(9, 'tag','#?$%^&*!|\/@][', 'test_procedure') + ut3.ut_annotation(9, 'tags','#?$%^&*!|\/@][', 'test_procedure') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1407,7 +1407,7 @@ create or replace package body test_suite_builder is --Arrange l_annotations := ut3.ut_annotations( ut3.ut_annotation(2, 'suite','testsuite', null), - ut3.ut_annotation(3, 'tag','#?$%^&*!|\/@][', null) + ut3.ut_annotation(3, 'tags','#?$%^&*!|\/@][', null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); From 8ebb8b859bbce58eead838e3a6a501bbda2bb996 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sun, 21 Apr 2019 12:34:42 +0100 Subject: [PATCH 0424/1096] Fixing empty tags to use xmlgen --- test/ut3_tester/core/test_suite_builder.pkb | 37 ++++++++++++++++----- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/test/ut3_tester/core/test_suite_builder.pkb b/test/ut3_tester/core/test_suite_builder.pkb index 8f8308f4f..d6f1a8b66 100644 --- a/test/ut3_tester/core/test_suite_builder.pkb +++ b/test/ut3_tester/core/test_suite_builder.pkb @@ -7,6 +7,8 @@ create or replace package body test_suite_builder is l_suites ut3.ut_suite_items; l_suite ut3.ut_logical_suite; l_cursor sys_refcursor; + l_type_cursor sys_refcursor; + l_ctx dbms_xmlgen.ctxhandle; l_xml xmltype; begin open l_cursor for select value(x) from table( @@ -22,9 +24,14 @@ create or replace package body test_suite_builder is a_skip_all_objects => true ); l_suite := treat( l_suites(l_suites.first) as ut3.ut_logical_suite); - + + open l_type_cursor for select l_suite as "UT_LOGICAL_SUITE" from dual; + l_ctx := dbms_xmlgen.newcontext(l_type_cursor); + dbms_xmlgen.setNullHandling(l_ctx, dbms_xmlgen.empty_tag); + l_xml := dbms_xmlgen.getxmltype(l_ctx); + select deletexml( - xmltype(l_suite), + l_xml, '//RESULTS_COUNT|//START_TIME|//END_TIME|//RESULT|//ASSOCIATED_EVENT_NAME' || '|//TRANSACTION_INVALIDATORS|//ERROR_BACKTRACE|//ERROR_STACK|//SERVEROUTPUT' ) @@ -638,7 +645,8 @@ create or replace package body test_suite_builder is l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); --Assert ut.expect(l_actual).to_be_like( - '%' || + ''|| + '' || '%' || '%' || '' || @@ -663,7 +671,8 @@ create or replace package body test_suite_builder is '%' || '' || '' || - '' + ''|| + '' ); end; @@ -687,6 +696,7 @@ create or replace package body test_suite_builder is l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); --Assert ut.expect(l_actual).to_be_like( + ''|| '' || '%' || '%' || @@ -707,7 +717,8 @@ create or replace package body test_suite_builder is '%%suite_level_test%' || '%' || '%' || - '%' + '%'|| + '' ); ut.expect(l_actual).not_to_be_like('%%%%%%'); ut.expect(l_actual).not_to_be_like('%%%%%%'); @@ -735,6 +746,7 @@ create or replace package body test_suite_builder is l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); --Assert ut.expect(l_actual).to_be_like( + ''|| '' || '%' || '%' || @@ -757,7 +769,8 @@ create or replace package body test_suite_builder is '%' || '%%suite_level_beforeall%' || '%%suite_level_afterall%' || - '%' + '%'|| + '' ); ut.expect(l_actual).not_to_be_like('%%%%%%'); ut.expect(l_actual).not_to_be_like('%%%%%%'); @@ -784,6 +797,7 @@ create or replace package body test_suite_builder is ,'\' ); ut.expect(l_actual).to_be_like( + ''|| '' || '%' || '' || @@ -799,7 +813,8 @@ create or replace package body test_suite_builder is '%' || '' || ''|| - '' + ''|| + '' ); end; @@ -827,6 +842,7 @@ create or replace package body test_suite_builder is ,'\' ); ut.expect(l_actual).to_be_like( + ''|| '' || '%' || '' || @@ -851,7 +867,8 @@ create or replace package body test_suite_builder is '%' || '' || '' || - '' + ''|| + '' ); end; @@ -884,6 +901,7 @@ create or replace package body test_suite_builder is ,'\' ); ut.expect(l_actual).to_be_like( + ''|| '' || '%' || '' || @@ -908,7 +926,8 @@ create or replace package body test_suite_builder is '%' || '' || '' || - '' + ''|| + '' ); end; From a42e2440c303792e8619e89e1320228d8efa2a60 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Tue, 23 Apr 2019 19:27:16 +0100 Subject: [PATCH 0425/1096] Adding tests for ut.run Change query to use regexp as instr was giving false positives. --- source/core/ut_suite_manager.pkb | 6 +- test/ut3_tester_helper/run_helper.pkb | 47 +++++++++++ test/ut3_tester_helper/run_helper.pks | 9 +++ test/ut3_user/api/test_ut_run.pkb | 109 ++++++++++++++++++++++++++ test/ut3_user/api/test_ut_run.pks | 34 ++++++++ 5 files changed, 203 insertions(+), 2 deletions(-) diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 54bf8fa04..f85128434 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -370,7 +370,7 @@ create or replace package body ut_suite_manager is l_ut_owner varchar2(250) := ut_utils.ut_owner; l_sql varchar2(32767); l_suite_item_name varchar2(20); - l_tag_list varchar2(4000) :=a_tags; + l_tag_list varchar2(4000) := a_tags; begin if a_path is null and a_object_name is not null then execute immediate 'select min(path) @@ -384,6 +384,8 @@ create or replace package body ut_suite_manager is end if; l_suite_item_name := case when l_tag_list is not null then 'suite_items_tags' else 'suite_items' end; + + /* Rewrite that as tags should be put on whats left not on full suite item cache */ l_sql := q'[with @@ -420,7 +422,7 @@ create or replace package body ut_suite_manager is where exists ( select 1 from ]'||l_ut_owner||q'[.ut_suite_cache_tag ct - where ct.suiteid = s.id and instr(:a_tag_list,ct.tagname) > 0 ) + where ct.suiteid = s.id and regexp_like(:a_tag_list,'(^|,){1}'||ct.tagname||'(,|$){1}') ) ), suite_items_tags as ( select c.* from suite_items c diff --git a/test/ut3_tester_helper/run_helper.pkb b/test/ut3_tester_helper/run_helper.pkb index 0fad905fd..38252f069 100644 --- a/test/ut3_tester_helper/run_helper.pkb +++ b/test/ut3_tester_helper/run_helper.pkb @@ -197,13 +197,16 @@ create or replace package body run_helper is begin execute immediate q'[create or replace package test_package_1 is --%suite + --%tags(suite1,helper) --%suitepath(tests) --%rollback(manual) --%test(Test1 from test package 1) + --%tags(test1,suite1test1,subtest1) procedure test1; --%test(Test2 from test package 1) + --%tags(test1,suite1test1) procedure test2; end test_package_1; @@ -223,12 +226,15 @@ create or replace package body run_helper is execute immediate q'[create or replace package test_package_2 is --%suite + --%tags(suite2,helper) --%suitepath(tests.test_package_1) --%test + --%tags(test2,test1suite2,subtest2) procedure test1; --%test + --%tags(test2suite1) procedure test2; end test_package_2; @@ -247,12 +253,15 @@ create or replace package body run_helper is execute immediate q'[create or replace package test_package_3 is --%suite + --%tags(suite3,helper) --%suitepath(tests2) --%test + --%tags(test1suite3) procedure test1; --%test + --%tags(test2suite3) procedure test2; end test_package_3; @@ -431,6 +440,44 @@ create or replace package body run_helper is )); return l_results; end; + + procedure run(a_reporter ut3.ut_reporter_base := null,a_tags varchar2) is + begin + ut3.ut.run(a_reporter,a_tags => a_tags); + end; + + procedure run(a_path varchar2, a_reporter ut3.ut_reporter_base := null,a_tags varchar2) is + begin + ut3.ut.run(a_path, a_reporter,a_tags => a_tags); + end; + + procedure run(a_paths ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base := null, a_tags varchar2) is + begin + ut3.ut.run(a_paths, a_reporter,a_tags => a_tags); + end; + + function run(a_reporter ut3.ut_reporter_base := null,a_tags varchar2) return ut3.ut_varchar2_list is + l_results ut3.ut_varchar2_list; + begin + select * bulk collect into l_results from table (ut3.ut.run(a_reporter, a_tags => a_tags)); + return l_results; + end; + + function run(a_path varchar2, a_reporter ut3.ut_reporter_base := null, a_tags varchar2) + return ut3.ut_varchar2_list is + l_results ut3.ut_varchar2_list; + begin + select * bulk collect into l_results from table (ut3.ut.run(a_path, a_reporter,a_tags => a_tags)); + return l_results; + end; + + function run(a_paths ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base := null, a_tags varchar2) + return ut3.ut_varchar2_list is + l_results ut3.ut_varchar2_list; + begin + select * bulk collect into l_results from table (ut3.ut.run(a_paths, a_reporter, a_tags => a_tags)); + return l_results; + end; procedure test_rollback_type(a_procedure_name varchar2, a_rollback_type integer, a_expectation ut3_latest_release.ut_matcher) is l_suite ut3.ut_suite; diff --git a/test/ut3_tester_helper/run_helper.pks b/test/ut3_tester_helper/run_helper.pks index 7d285d7af..45c64741c 100644 --- a/test/ut3_tester_helper/run_helper.pks +++ b/test/ut3_tester_helper/run_helper.pks @@ -41,6 +41,15 @@ create or replace package run_helper is return ut3.ut_varchar2_list; function run(a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base) return ut3.ut_varchar2_list; + + procedure run(a_reporter ut3.ut_reporter_base := null,a_tags varchar2); + procedure run(a_path varchar2, a_reporter ut3.ut_reporter_base := null,a_tags varchar2); + procedure run(a_paths ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base := null, a_tags varchar2); + function run(a_reporter ut3.ut_reporter_base := null,a_tags varchar2) return ut3.ut_varchar2_list; + function run(a_path varchar2, a_reporter ut3.ut_reporter_base := null, a_tags varchar2) + return ut3.ut_varchar2_list; + function run(a_paths ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base := null, a_tags varchar2) + return ut3.ut_varchar2_list; procedure test_rollback_type(a_procedure_name varchar2, a_rollback_type integer, a_expectation ut3_latest_release.ut_matcher); diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index 43a2238ae..0844b819d 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -787,5 +787,114 @@ Failures:% ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); end; + procedure test_run_by_one_tag is + l_results clob; + begin + ut3_tester_helper.run_helper.run(a_tags => 'suite1test1'); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%test_package_1%' ); + ut.expect( l_results ).not_to_be_like( '%test_package_2%' ); + ut.expect( l_results ).not_to_be_like( '%test_package_3%' ); + end; + + procedure suite_run_by_one_tag is + l_results clob; + begin + ut3_tester_helper.run_helper.run(a_tags => 'suite2'); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).not_to_be_like( '%test_package_1.%executed%' ); + ut.expect( l_results ).to_be_like( '%test_package_1%' ); + ut.expect( l_results ).to_be_like( '%test_package_2%' ); + ut.expect( l_results ).to_be_like( '%test_package_2.%executed%' ); + ut.expect( l_results ).not_to_be_like( '%test_package_3.%executed%' ); + end; + + procedure two_test_run_by_one_tag is + l_results clob; + begin + ut3_tester_helper.run_helper.run(a_tags => 'test2'); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).not_to_be_like( '%test_package_1.%executed%' ); + ut.expect( l_results ).to_be_like( '%test_package_1%' ); + ut.expect( l_results ).to_be_like( '%test_package_2%' ); + ut.expect( l_results ).to_be_like( '%test_package_2.%executed%' ); + ut.expect( l_results ).not_to_be_like( '%test_package_3.%executed%' ); + end; + + procedure all_suites_run_by_one_tag is + l_results clob; + begin + ut3_tester_helper.run_helper.run(a_tags => 'helper'); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%test_package_1%' ); + ut.expect( l_results ).to_be_like( '%test_package_2%' ); + ut.expect( l_results ).to_be_like( '%test_package_3%' ); + end; + + procedure two_test_run_by_two_tags is + l_results clob; + begin + ut3_tester_helper.run_helper.run(a_tags => 'subtest1,subtest2'); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%test_package_1%' ); + ut.expect( l_results ).to_be_like( '%test_package_2%' ); + ut.expect( l_results ).not_to_be_like( '%test_package_1.test2%' ); + ut.expect( l_results ).not_to_be_like( '%test_package_2.test2%' ); + ut.expect( l_results ).not_to_be_like( '%test_package_3%' ); + ut.expect( l_results ).not_to_be_like( '%test_package_3%' ); + end; + + procedure suite_with_children_tag is + l_results clob; + begin + ut3_tester_helper.run_helper.run(a_tags => 'suite1'); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%test_package_1%' ); + ut.expect( l_results ).to_be_like( '%test_package_2%' ); + ut.expect( l_results ).not_to_be_like( '%test_package_3%' ); + end; + + procedure test_nonexists_tag is + l_results clob; + l_exp_message varchar2(4000); + begin + l_exp_message :=q'[ORA-20204: No suite packages found for tags: 'nonexisting']'; + ut3_tester_helper.run_helper.run(a_tags => 'nonexisting'); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + ut.fail('Expecte test to fail'); + --Assert + exception + when others then + ut.expect( sqlerrm ).to_be_like( l_exp_message ); + end; + + procedure test_duplicate_tag is + l_results clob; + begin + ut3_tester_helper.run_helper.run(a_tags => 'suite1test1,suite1test1'); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%test_package_1%' ); + ut.expect( l_results ).not_to_be_like( '%test_package_2%' ); + ut.expect( l_results ).not_to_be_like( '%test_package_3%' ); + end; + + procedure suite_duplicate_tag is + l_results clob; + begin + ut3_tester_helper.run_helper.run(a_tags => 'suite1,suite1'); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%test_package_1%' ); + ut.expect( l_results ).to_be_like( '%test_package_2%' ); + ut.expect( l_results ).not_to_be_like( '%test_package_3%' ); + end; + end; / diff --git a/test/ut3_user/api/test_ut_run.pks b/test/ut3_user/api/test_ut_run.pks index 82b7eee95..c79686dc6 100644 --- a/test/ut3_user/api/test_ut_run.pks +++ b/test/ut3_user/api/test_ut_run.pks @@ -163,6 +163,40 @@ create or replace package test_ut_run is --%endcontext + --%context(run with tags) + --%displayname(Call ut.run with #tags) + --%beforeall(create_ut3$user#_tests) + --%afterall(drop_ut3$user#_tests) + + --%test(Execute test by tag) + procedure test_run_by_one_tag; + + --%test( Execute suite by one tag) + procedure suite_run_by_one_tag; + + --%test(Execute two tests by one tag) + procedure two_test_run_by_one_tag; + + --%test(Execute all suites tests with tag) + procedure all_suites_run_by_one_tag; + + --%test(Execute tests by passing two tags) + procedure two_test_run_by_two_tags; + + --%test(Execute suite and all of its children) + procedure suite_with_children_tag; + + --%test(Execute test for non existing tag) + procedure test_nonexists_tag; + + --%test(Execute test for duplicate list tags) + procedure test_duplicate_tag; + + --%test(Execute suite test for duplicate list tags) + procedure suite_duplicate_tag; + + --%endcontext + end; / From 5ee864177ae7784860aa4b51e69dc74000ad5b3a Mon Sep 17 00:00:00 2001 From: lwasylow Date: Wed, 24 Apr 2019 19:40:00 +0100 Subject: [PATCH 0426/1096] Added tests for ut.run procedure --- source/core/ut_suite_manager.pkb | 41 +++++++++++++++----- test/ut3_tester_helper/run_helper.pkb | 2 +- test/ut3_user/api/test_ut_run.pkb | 56 +++++++++++++++++++++++++++ test/ut3_user/api/test_ut_run.pks | 14 ++++++- 4 files changed, 102 insertions(+), 11 deletions(-) diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index f85128434..a770d3d6d 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -17,6 +17,7 @@ create or replace package body ut_suite_manager is */ gc_suitpath_error_message constant varchar2(100) := 'Suitepath exceeds 1000 CHAR on: '; + gc_tag_errmsg constant number := 450; type t_path_item is record ( object_name varchar2(250), @@ -691,6 +692,34 @@ create or replace package body ut_suite_manager is return l_suites; end; + function build_no_test_error_msg( + a_schema_name in varchar2, + a_suite_path in varchar2, + a_procedure_name in varchar2, + a_object_name in varchar2, + a_tags in varchar2 + ) return varchar2 is + l_error_msg varchar2(500); + begin + if a_suite_path is not null then + l_error_msg := 'No suite packages found for path '||a_schema_name||':'||a_suite_path; + elsif a_procedure_name is not null then + l_error_msg := 'Suite test '||a_schema_name||'.'||a_object_name|| '.'||a_procedure_name||' does not exist'; + elsif a_object_name is not null then + l_error_msg := 'Suite package '||a_schema_name||'.'||a_object_name|| ' does not exist'; + end if; + + if l_error_msg is null and a_tags is not null then + l_error_msg := 'No tests found for tags: '||ut_utils.to_string(a_tags,a_max_output_len => gc_tag_errmsg); + elsif l_error_msg is not null and a_tags is not null then + l_error_msg := l_error_msg||'with tags: '||ut_utils.to_string(a_tags,a_max_output_len => gc_tag_errmsg); + end if; + + l_error_msg := l_error_msg ||'.'; + + return l_error_msg; + end; + procedure configure_execution_by_path( a_paths in ut_varchar2_list, a_suites out nocopy ut_suite_items, @@ -730,15 +759,9 @@ create or replace package body ut_suite_manager is a_tags ); if a_suites.count = l_suites_count then - if l_path_item.suite_path is not null then - raise_application_error(ut_utils.gc_suite_package_not_found,'No suite packages found for path '||l_schema||':'||l_path_item.suite_path|| '.'); - elsif l_path_item.procedure_name is not null then - raise_application_error(ut_utils.gc_suite_package_not_found,'Suite test '||l_schema||'.'||l_path_item.object_name|| '.'||l_path_item.procedure_name||' does not exist'); - elsif l_path_item.object_name is not null then - raise_application_error(ut_utils.gc_suite_package_not_found,'Suite package '||l_schema||'.'||l_path_item.object_name|| ' does not exist'); - elsif a_tags is not null then - raise_application_error(ut_utils.gc_suite_package_not_found,'No suite packages found for tags: '||ut_utils.to_string(a_tags,a_max_output_len => 450)); - end if; + raise_application_error(ut_utils.gc_suite_package_not_found,build_no_test_error_msg( + l_schema,l_path_item.suite_path,l_path_item.procedure_name, + l_path_item.object_name,a_tags)); end if; l_index := a_suites.first; l_suites_count := a_suites.count; diff --git a/test/ut3_tester_helper/run_helper.pkb b/test/ut3_tester_helper/run_helper.pkb index 38252f069..3e31b6ae6 100644 --- a/test/ut3_tester_helper/run_helper.pkb +++ b/test/ut3_tester_helper/run_helper.pkb @@ -206,7 +206,7 @@ create or replace package body run_helper is procedure test1; --%test(Test2 from test package 1) - --%tags(test1,suite1test1) + --%tags(test1,suite1test2) procedure test2; end test_package_1; diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index 0844b819d..5afc36ad4 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -895,6 +895,62 @@ Failures:% ut.expect( l_results ).to_be_like( '%test_package_2%' ); ut.expect( l_results ).not_to_be_like( '%test_package_3%' ); end; + + procedure run_proc_pkg_name_no_tag is + l_results clob; + l_exp_message varchar2(4000); + begin + l_exp_message :=q'[ORA-20204: Suite package ut3_tester_helper.test_package_1 does not existwith tags: 'nonexists'.]'; + ut3.ut.run('ut3_tester_helper.test_package_1',a_tags => 'nonexists'); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + ut.fail('Expecte test to fail'); + exception + when others then + ut.expect( sqlerrm ).to_be_like( l_exp_message ); + end; + + procedure run_proc_pkg_name_tag is + l_results clob; + begin + ut3.ut.run('ut3_tester_helper.test_package_1',a_tags => 'suite1test1'); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%test_package_1%' ); + ut.expect( l_results ).to_be_like( '%test_package_1.test1%executed%' ); + ut.expect( l_results ).not_to_be_like( '%test_package_1.test2%' ); + ut.expect( l_results ).not_to_be_like( '%test_package_2%' ); + ut.expect( l_results ).not_to_be_like( '%test_package_3%' ); + end; + + procedure run_pkg_name_file_list_tag is + l_results clob; + begin + ut3.ut.run('ut3_tester_helper.test_package_1',a_tags => 'suite1test1'); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%test_package_1%' ); + ut.expect( l_results ).to_be_like( '%test_package_1.test1%executed%' ); + ut.expect( l_results ).not_to_be_like( '%test_package_1.test2%' ); + ut.expect( l_results ).not_to_be_like( '%test_package_2%' ); + ut.expect( l_results ).not_to_be_like( '%test_package_3%' ); + end; + + procedure run_proc_path_list_tag is + l_results clob; + begin + ut3.ut.run( + 'ut3_tester_helper.test_package_1', + ut3.ut_sonar_test_reporter(), a_source_files => ut3.ut_varchar2_list(),a_tags => 'suite1', + a_test_files => ut3.ut_varchar2_list('tests/ut3_tester_helper.test_package_1.pkb', + 'tests/ut3_tester_helper.test_package_2.pkb', + 'tests/ut3_tester_helper.test_package_3.pkb') + ); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%tests/ut3_tester_helper.test_package_1.pkb%' ); + ut.expect( l_results ).not_to_be_like( '%tests/ut3_tester_helper.test_package_2.pkb%' ); + ut.expect( l_results ).not_to_be_like( '%tests/ut3_tester_helper.test_package_3.pkb%' ); + end; end; / diff --git a/test/ut3_user/api/test_ut_run.pks b/test/ut3_user/api/test_ut_run.pks index c79686dc6..872a2a05b 100644 --- a/test/ut3_user/api/test_ut_run.pks +++ b/test/ut3_user/api/test_ut_run.pks @@ -168,7 +168,7 @@ create or replace package test_ut_run is --%beforeall(create_ut3$user#_tests) --%afterall(drop_ut3$user#_tests) - --%test(Execute test by tag) + --%test(Execute test by tag ut_run) procedure test_run_by_one_tag; --%test( Execute suite by one tag) @@ -194,6 +194,18 @@ create or replace package test_ut_run is --%test(Execute suite test for duplicate list tags) procedure suite_duplicate_tag; + + --%test(Run a package by name with non existing tag) + procedure run_proc_pkg_name_no_tag; + + --%test(Runs given package only with package name given as path and filter by tag) + procedure run_proc_pkg_name_tag; + + --%test(Runs all from given package with package name given as path and coverage file list with tag) + procedure run_pkg_name_file_list_tag; + + --%test(Runs tests from given paths with paths list and tag) + procedure run_proc_path_list_tag; --%endcontext From 176519c69090cadc2721950a95106bc079bd5868 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Wed, 24 Apr 2019 19:51:28 +0100 Subject: [PATCH 0427/1096] Added extra tests for ut run function --- test/ut3_tester_helper/run_helper.pkb | 4 ++-- test/ut3_user/api/test_ut_run.pkb | 33 +++++++++++++++++++++++++++ test/ut3_user/api/test_ut_run.pks | 9 ++++++++ 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/test/ut3_tester_helper/run_helper.pkb b/test/ut3_tester_helper/run_helper.pkb index 3e31b6ae6..45403ca8a 100644 --- a/test/ut3_tester_helper/run_helper.pkb +++ b/test/ut3_tester_helper/run_helper.pkb @@ -230,11 +230,11 @@ create or replace package body run_helper is --%suitepath(tests.test_package_1) --%test - --%tags(test2,test1suite2,subtest2) + --%tags(test2,suite2test1,subtest2) procedure test1; --%test - --%tags(test2suite1) + --%tags(suite2test2) procedure test2; end test_package_2; diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index 5afc36ad4..4dc5e41c6 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -951,6 +951,39 @@ Failures:% ut.expect( l_results ).not_to_be_like( '%tests/ut3_tester_helper.test_package_2.pkb%' ); ut.expect( l_results ).not_to_be_like( '%tests/ut3_tester_helper.test_package_3.pkb%' ); end; + + procedure tag_run_func_no_params is + l_results ut3.ut_varchar2_list; + begin + l_results := ut3_tester_helper.run_helper.run(a_tags => 'helper'); + --Assert + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); + end; + + procedure tag_run_func_pkg_name is + l_results ut3.ut_varchar2_list; + begin + select * bulk collect into l_results from table (ut3.ut.run('ut3_tester_helper.test_package_1', a_tags => 'suite1test1')); + --Assert + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1.test1%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_1.test2%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_3%' ); + end; + + procedure tag_run_func_path_list is + l_results ut3.ut_varchar2_list; + begin + l_results := ut3_tester_helper.run_helper.run(ut3.ut_varchar2_list(':tests.test_package_1',':tests'),a_tags => 'suite1test1,suite2test1'); + --Assert + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_2%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1.test1%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_1.test2%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_2.test1%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2.test2%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_3%' ); + end; end; / diff --git a/test/ut3_user/api/test_ut_run.pks b/test/ut3_user/api/test_ut_run.pks index 872a2a05b..feb825ffa 100644 --- a/test/ut3_user/api/test_ut_run.pks +++ b/test/ut3_user/api/test_ut_run.pks @@ -207,6 +207,15 @@ create or replace package test_ut_run is --%test(Runs tests from given paths with paths list and tag) procedure run_proc_path_list_tag; + --%test(Runs all tests in current schema with default reporter when only tag is given) + procedure tag_run_func_no_params; + + --%test(Runs given package only with package name given as path and filter by tag) + procedure tag_run_func_pkg_name; + + --%test(Runs tests from given paths with paths list and a tag) + procedure tag_run_func_path_list; + --%endcontext end; From b1f4a625eba580952acf746e4794bde8dca38c1f Mon Sep 17 00:00:00 2001 From: lwasylow Date: Wed, 24 Apr 2019 19:57:34 +0100 Subject: [PATCH 0428/1096] Fixing error message function --- source/core/ut_suite_manager.pkb | 6 +++--- test/ut3_user/api/test_ut_run.pkb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index a770d3d6d..20c017091 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -704,15 +704,15 @@ create or replace package body ut_suite_manager is if a_suite_path is not null then l_error_msg := 'No suite packages found for path '||a_schema_name||':'||a_suite_path; elsif a_procedure_name is not null then - l_error_msg := 'Suite test '||a_schema_name||'.'||a_object_name|| '.'||a_procedure_name||' does not exist'; + l_error_msg := 'Suite test '||a_schema_name||'.'||a_object_name|| '.'||a_procedure_name||' does not exists'; elsif a_object_name is not null then - l_error_msg := 'Suite package '||a_schema_name||'.'||a_object_name|| ' does not exist'; + l_error_msg := 'Suite package '||a_schema_name||'.'||a_object_name|| ' does not exists'; end if; if l_error_msg is null and a_tags is not null then l_error_msg := 'No tests found for tags: '||ut_utils.to_string(a_tags,a_max_output_len => gc_tag_errmsg); elsif l_error_msg is not null and a_tags is not null then - l_error_msg := l_error_msg||'with tags: '||ut_utils.to_string(a_tags,a_max_output_len => gc_tag_errmsg); + l_error_msg := l_error_msg||' with tags: '||ut_utils.to_string(a_tags,a_max_output_len => gc_tag_errmsg); end if; l_error_msg := l_error_msg ||'.'; diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index 4dc5e41c6..0b0598ad5 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -864,7 +864,7 @@ Failures:% l_results clob; l_exp_message varchar2(4000); begin - l_exp_message :=q'[ORA-20204: No suite packages found for tags: 'nonexisting']'; + l_exp_message :=q'[ORA-20204: No tests found for tags: 'nonexisting'.]'; ut3_tester_helper.run_helper.run(a_tags => 'nonexisting'); l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); ut.fail('Expecte test to fail'); @@ -900,7 +900,7 @@ Failures:% l_results clob; l_exp_message varchar2(4000); begin - l_exp_message :=q'[ORA-20204: Suite package ut3_tester_helper.test_package_1 does not existwith tags: 'nonexists'.]'; + l_exp_message :=q'[ORA-20204: Suite package ut3_tester_helper.test_package_1 does not exists with tags: 'nonexists'.]'; ut3.ut.run('ut3_tester_helper.test_package_1',a_tags => 'nonexists'); l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); ut.fail('Expecte test to fail'); From dbbf197914e371bacbc812a1837554cf2a01c75a Mon Sep 17 00:00:00 2001 From: lwasylow Date: Wed, 24 Apr 2019 20:32:21 +0100 Subject: [PATCH 0429/1096] Update docs --- docs/userguide/annotations.md | 77 +++++++++++++++++++++++++++++++++-- 1 file changed, 73 insertions(+), 4 deletions(-) diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 2ffaf169b..ae99ea363 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -38,6 +38,7 @@ We strongly recommend putting package level annotations at the very top of packa | `--%disabled` | Package/procedure | Used to disable a suite or a test. Disabled suites/tests do not get executed, they are however marked and reported as disabled in a test run. | | `--%context()` | Package | Denotes start of a named context (sub-suite) in a suite package | | `--%endcontext` | Package | Denotes end of a nested context (sub-suite) in a suite package | +| `--%tags` | Package/procedure | Used to label a test or a suite for purpose of identification | ### Suite @@ -823,7 +824,7 @@ See [beforeall](#Beforeall) for more examples. Indicates specific setup procedure(s) to be executed for a test. The procedure(s) can be located either: - within current package (package name is optional) - within another package - + The annotation need to be placed alongside `--%test` annotation. The `--%beforetest` procedures are executed after invoking all `--%beforeeach` for a test. @@ -911,7 +912,7 @@ Finished in .015185 seconds Indicates specific cleanup procedure(s) to be executed for a test. The procedure(s) can be located either: - within current package (package name is optional) - within another package - + The annotation need to be placed alongside `--%test` annotation. If a test is marked as disabled the `--%aftertest` procedures are not invoked for that test. @@ -1221,6 +1222,74 @@ Finished in .035261 seconds ``` + +### Tags + +Tag is a label attached to the test or a suite path. It is used for identification and execution a group of tests / suites that share same tag. + +It allows us to group a tests / suites using a various categorization and place a test / suite in multiple buckets. Same tests can be group with other tests based on the functionality , frequency, type of output etc. + +e.q. + +```sql +--%tags(batch,daily,csv) +``` + +or + +```sql +--%tags(api,online,json) +``` + + + +Tags are defined as a coma separated list. When executing a tests filtering by tag utPLSQL will find all tests associated with a given tag and execute it. It will apply `OR` logic when resolving a tags so any tests / suites that got matching at least one tag will get executed. + +When a suite gets tagged all of its children will automatically inherit a tag and get executed along the parent. + +```sql +create or replace PACKAGE ut_sample_test IS + + --%suite(Sample Test Suite) + --%tag(suite1) + + --%test(Compare Ref Cursors) + --%tag(test1,sample) + PROCEDURE ut_refcursors1; + +END ut_sample_test; +/ + +create or replace PACKAGE BODY ut_sample_test IS + + PROCEDURE ut_refcursors1 IS + v_actual SYS_REFCURSOR; + v_expected SYS_REFCURSOR; + BEGIN + open v_expected for select 1 as test from dual; + open v_actual for select 2 as test from dual; + + ut.expect(v_actual).to_equal(v_expected); + END; + +END ut_sample_test; +/ +``` + +Execution of the test is done by using a new parameter `a_tags` + +```sql +select * from table(ut.run(a_path => 'ut_sample_test',a_tags => 'suite1')); +select * from table(ut.run(a_tags => 'suite1')); + +begin + ut.run(a_path => 'ut_sample_test',a_tags => 'suite1'); +end; +/ +``` + + + ### Suitepath It is very likely that the application for which you are going to introduce tests consists of many different packages, procedures and functions. @@ -1346,9 +1415,9 @@ If `--%throws` annotation is specified with arguments and exception raised is no The framework will raise a warning, when `--%throws` annotation has invalid arguments or when no arguments were provided. Annotation `--%throws(7894562, operaqk, -=1, -20496, pow74d, posdfk3)` will be interpreted as `--%throws(-20496)`. - + Please note that `NO_DATA_FOUND` exception is a special case in Oracle. To capture it use `NO_DATA_FOUND` named exception or `-1403` exception No. - +​ Example: ```sql create or replace package exc_pkg is From f7144991a19057e0924ac86f86c49ff028f42bff Mon Sep 17 00:00:00 2001 From: lwasylow Date: Wed, 24 Apr 2019 20:38:43 +0100 Subject: [PATCH 0430/1096] Update docs and tests --- docs/userguide/annotations.md | 21 +++++++++++++++++++-- test/ut3_user/api/test_ut_run.pkb | 11 +++++++++++ test/ut3_user/api/test_ut_run.pks | 5 ++++- 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index ae99ea363..946ad12ea 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1245,7 +1245,9 @@ or Tags are defined as a coma separated list. When executing a tests filtering by tag utPLSQL will find all tests associated with a given tag and execute it. It will apply `OR` logic when resolving a tags so any tests / suites that got matching at least one tag will get executed. -When a suite gets tagged all of its children will automatically inherit a tag and get executed along the parent. +When a suite gets tagged all of its children will automatically inherit a tag and get executed along the parent. Parent suit tests are not executed. but a suitepath hierarchy is kept. + +Sample tag package. ```sql create or replace PACKAGE ut_sample_test IS @@ -1257,6 +1259,10 @@ create or replace PACKAGE ut_sample_test IS --%tag(test1,sample) PROCEDURE ut_refcursors1; + --%test(Compare Ref Cursors #2) + --%tag(test2,sample) + PROCEDURE ut_refcursors2; + END ut_sample_test; / @@ -1271,7 +1277,17 @@ create or replace PACKAGE BODY ut_sample_test IS ut.expect(v_actual).to_equal(v_expected); END; + + PROCEDURE ut_refcursors2 IS + v_actual SYS_REFCURSOR; + v_expected SYS_REFCURSOR; + BEGIN + open v_expected for select 1 as test from dual; + open v_actual for select 2 as test from dual; + ut.expect(v_actual).to_equal(v_expected); + END; + END ut_sample_test; / ``` @@ -1280,7 +1296,8 @@ Execution of the test is done by using a new parameter `a_tags` ```sql select * from table(ut.run(a_path => 'ut_sample_test',a_tags => 'suite1')); -select * from table(ut.run(a_tags => 'suite1')); +select * from table(ut.run(a_tags => 'test1,test2')); +select * from table(ut.run(a_tags => 'sample')); begin ut.run(a_path => 'ut_sample_test',a_tags => 'suite1'); diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index 0b0598ad5..60c9a7dc8 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -860,6 +860,17 @@ Failures:% ut.expect( l_results ).not_to_be_like( '%test_package_3%' ); end; + procedure suite_with_tag_parent is + l_results clob; + begin + ut3_tester_helper.run_helper.run(a_tags => 'suite2'); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%test_package_1%' ); + ut.expect( l_results ).to_be_like( '%test_package_2%' ); + ut.expect( l_results ).not_to_be_like( '%test_package_3%' ); + end; + procedure test_nonexists_tag is l_results clob; l_exp_message varchar2(4000); diff --git a/test/ut3_user/api/test_ut_run.pks b/test/ut3_user/api/test_ut_run.pks index feb825ffa..fcb62e207 100644 --- a/test/ut3_user/api/test_ut_run.pks +++ b/test/ut3_user/api/test_ut_run.pks @@ -186,6 +186,9 @@ create or replace package test_ut_run is --%test(Execute suite and all of its children) procedure suite_with_children_tag; + --%test(Execute suite and parents) + procedure suite_with_tag_parent; + --%test(Execute test for non existing tag) procedure test_nonexists_tag; @@ -215,7 +218,7 @@ create or replace package test_ut_run is --%test(Runs tests from given paths with paths list and a tag) procedure tag_run_func_path_list; - + --%endcontext end; From e5754040bb47bcc26ba4aa754cfb83994ebfc273 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Thu, 25 Apr 2019 05:43:45 +0100 Subject: [PATCH 0431/1096] Fixes to PR comments --- source/core/ut_suite_builder.pkb | 7 ++++--- source/core/ut_suite_manager.pkb | 24 ++++++++---------------- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index ab4920e9c..dcbfedf27 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -320,7 +320,7 @@ create or replace package body ut_suite_builder is while l_annotation_pos is not null loop if a_tags_ann_text(l_annotation_pos) is null then a_suite.put_warning( - '"--%tag" annotation requires a tag value populated. Annotation ignored.' + '"--%tags" annotation requires a tag value populated. Annotation ignored.' || chr( 10 ) || 'at "' || get_qualified_object_name(a_suite, a_procedure_name) || '", line ' || l_annotation_pos ); else @@ -328,6 +328,7 @@ create or replace package body ut_suite_builder is ut_utils.string_to_table(a_tags_ann_text(l_annotation_pos),',') ); end if; + --remove empty strings from table list e.g. tag1,,tag2 a_list := ut_utils.table_to_clob( ut_utils.filter_list(l_tag_list,'^(\w|\S)+$'), ','); @@ -632,7 +633,7 @@ create or replace package body ut_suite_builder is while l_annotation_pos is not null loop if a_tags_ann_text(l_annotation_pos) is null then a_suite.put_warning( - '"--%tag" annotation requires a tag value populated. Annotation ignored, line ' || l_annotation_pos + '"--%tags" annotation requires a tag value populated. Annotation ignored, line ' || l_annotation_pos ); else l_tag_list := l_tag_list multiset union distinct ut_utils.trim_list_elements( @@ -641,6 +642,7 @@ create or replace package body ut_suite_builder is end if; l_annotation_pos := a_tags_ann_text.next(l_annotation_pos); end loop; + --remove empty strings from table list e.g. tag1,,tag2 a_suite.tags := ut_utils.table_to_clob( ut_utils.filter_list(l_tag_list,'^(\w|\S)+$'), ','); @@ -657,7 +659,6 @@ create or replace package body ut_suite_builder is l_after_all_list tt_executables; l_rollback_type ut_utils.t_rollback_type; l_annotation_text t_annotation_text; - l_suite_tags ut_varchar2_rows; begin if a_annotations.by_name.exists(gc_displayname) then l_annotation_text := trim(a_annotations.by_name(gc_displayname)(a_annotations.by_name(gc_displayname).first)); diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 20c017091..3d34f34e9 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -194,7 +194,7 @@ create or replace package body ut_suite_manager is results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), items => a_items_at_level(a_prev_level), before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( - a_rows( a_idx ).after_all_list), tags => a_rows(a_idx).tags --TODO : Should be share or separate + a_rows( a_idx ).after_all_list), tags => a_rows(a_idx).tags ) else ut_suite( @@ -207,7 +207,7 @@ create or replace package body ut_suite_manager is results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), items => ut_suite_items(), before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( - a_rows( a_idx ).after_all_list), tags => a_rows(a_idx).tags --TODO : Should be share or separate + a_rows( a_idx ).after_all_list), tags => a_rows(a_idx).tags ) end; when 'UT_SUITE_CONTEXT' then @@ -223,7 +223,7 @@ create or replace package body ut_suite_manager is results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), items => a_items_at_level(a_prev_level), before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( - a_rows( a_idx ).after_all_list), tags => a_rows(a_idx).tags --TODO : Should be share or separate + a_rows( a_idx ).after_all_list), tags => a_rows(a_idx).tags ) else ut_suite_context( @@ -236,7 +236,7 @@ create or replace package body ut_suite_manager is results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), items => ut_suite_items(), before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( - a_rows( a_idx ).after_all_list), tags => a_rows(a_idx).tags --TODO : Should be share or separate + a_rows( a_idx ).after_all_list), tags => a_rows(a_idx).tags ) end; when 'UT_LOGICAL_SUITE' then @@ -371,7 +371,6 @@ create or replace package body ut_suite_manager is l_ut_owner varchar2(250) := ut_utils.ut_owner; l_sql varchar2(32767); l_suite_item_name varchar2(20); - l_tag_list varchar2(4000) := a_tags; begin if a_path is null and a_object_name is not null then execute immediate 'select min(path) @@ -383,11 +382,8 @@ create or replace package body ut_suite_manager is else l_path := lower( a_path ); end if; - l_suite_item_name := case when l_tag_list is not null then 'suite_items_tags' else 'suite_items' end; + l_suite_item_name := case when a_tags is not null then 'suite_items_tags' else 'suite_items' end; - - - /* Rewrite that as tags should be put on whats left not on full suite item cache */ l_sql := q'[with suite_items as ( @@ -417,7 +413,7 @@ create or replace package body ut_suite_manager is ) ) ),]' - ||case when l_tag_list is not null then + ||case when a_tags is not null then q'[ filter_tags as ( select s.* from suite_items s where exists @@ -501,7 +497,7 @@ create or replace package body ut_suite_manager is c.path, :a_random_seed ) desc nulls last' end; - open l_result for l_sql using l_path, l_path, upper(a_object_name), upper(a_procedure_name), l_tag_list, a_random_seed; + open l_result for l_sql using l_path, l_path, upper(a_object_name), upper(a_procedure_name), a_tags, a_random_seed; return l_result; end; @@ -739,11 +735,7 @@ create or replace package body ut_suite_manager is resolve_schema_names(l_paths); l_schema_paths := group_paths_by_schema(l_paths); - - -- TODO : use a_tags to filter out path. Should we do it before ? we dont know suites, if we do it after - -- we running into danger of filtering out to null value and raising wrong message. I reckon we should resolve that - -- before loop and l_th_items is set or after filter it out. - + l_schema := l_schema_paths.first; while l_schema is not null loop l_path_items := l_schema_paths(l_schema); From 632b64dec324faa63b2e260c3973bf6ffda25021 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Thu, 25 Apr 2019 05:57:35 +0100 Subject: [PATCH 0432/1096] Fixes to PR comments --- test/ut3_tester/core/test_suite_builder.pkb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/ut3_tester/core/test_suite_builder.pkb b/test/ut3_tester/core/test_suite_builder.pkb index d6f1a8b66..49b54fa61 100644 --- a/test/ut3_tester/core/test_suite_builder.pkb +++ b/test/ut3_tester/core/test_suite_builder.pkb @@ -1284,7 +1284,7 @@ create or replace package body test_suite_builder is l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); --Assert ut.expect(l_actual).to_be_like( - '%%"--%tag" annotation requires a tag value populated. Annotation ignored.%%'|| + '%%"--%tags" annotation requires a tag value populated. Annotation ignored.%%'|| '%%' ); @@ -1303,7 +1303,7 @@ create or replace package body test_suite_builder is l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); --Assert ut.expect(l_actual).to_be_like( - '%"--%tag" annotation requires a tag value populated. Annotation ignored, line 3%'|| + '%"--%tags" annotation requires a tag value populated. Annotation ignored, line 3%'|| '%%' ); From 66257d18701461048b8665c08f25e091e0ff2601 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Thu, 25 Apr 2019 06:41:48 +0100 Subject: [PATCH 0433/1096] Updates to PR --- source/core/types/ut_suite.tps | 4 ---- source/core/types/ut_suite_item.tps | 4 ++++ source/core/types/ut_test.tps | 4 ---- source/core/ut_suite_manager.pkb | 4 ++-- test/ut3_tester/core/test_suite_builder.pkb | 7 ------- 5 files changed, 6 insertions(+), 17 deletions(-) diff --git a/source/core/types/ut_suite.tps b/source/core/types/ut_suite.tps index 0bcddd59b..a9647dcf3 100644 --- a/source/core/types/ut_suite.tps +++ b/source/core/types/ut_suite.tps @@ -26,10 +26,6 @@ create or replace type ut_suite under ut_logical_suite ( * Procedure exists within the package of the suite */ after_all_list ut_executables, - /** - * Hold list of tags assign to suite - */ - tags varchar2(4000), constructor function ut_suite ( self in out nocopy ut_suite, a_object_owner varchar2, a_object_name varchar2, a_line_no integer, a_tags varchar2 := null diff --git a/source/core/types/ut_suite_item.tps b/source/core/types/ut_suite_item.tps index 6b3b9c686..f0ea25187 100644 --- a/source/core/types/ut_suite_item.tps +++ b/source/core/types/ut_suite_item.tps @@ -60,6 +60,10 @@ create or replace type ut_suite_item force under ut_event_item ( warnings ut_varchar2_rows, results_count ut_results_counter, transaction_invalidators ut_varchar2_list, + /** + * Hold list of tags assign to test + */ + tags varchar2(4000), member procedure init(self in out nocopy ut_suite_item, a_object_owner varchar2, a_object_name varchar2, a_name varchar2, a_line_no integer), member function get_disabled_flag return boolean, not instantiable member procedure mark_as_skipped(self in out nocopy ut_suite_item), diff --git a/source/core/types/ut_test.tps b/source/core/types/ut_test.tps index 23116119c..04d8f321d 100644 --- a/source/core/types/ut_test.tps +++ b/source/core/types/ut_test.tps @@ -55,10 +55,6 @@ create or replace type ut_test force under ut_suite_item ( *Holds the expected error codes list when the user use the annotation throws */ expected_error_codes ut_integer_list, - /** - * Hold list of tags assign to test - */ - tags varchar2(4000), constructor function ut_test( self in out nocopy ut_test, a_object_owner varchar2 := null, a_object_name varchar2, a_name varchar2, a_line_no integer, a_expected_error_codes ut_integer_list := null, a_tags varchar2 := null diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 3d34f34e9..454e4c253 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -250,7 +250,7 @@ create or replace package body ut_suite_manager is line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), - items => a_items_at_level(a_prev_level) + items => a_items_at_level(a_prev_level), tags => null ) else ut_logical_suite( @@ -261,7 +261,7 @@ create or replace package body ut_suite_manager is line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), - items => ut_suite_items() + items => ut_suite_items(), tags => null ) end; when 'UT_TEST' then diff --git a/test/ut3_tester/core/test_suite_builder.pkb b/test/ut3_tester/core/test_suite_builder.pkb index 49b54fa61..5a9f74992 100644 --- a/test/ut3_tester/core/test_suite_builder.pkb +++ b/test/ut3_tester/core/test_suite_builder.pkb @@ -660,7 +660,6 @@ create or replace package body test_suite_builder is '%some_packagecontext_setup' || '%' || '' || - '' || '' || '' || '%suite_level_testIn suitesome_package.suite_level_test' || @@ -670,7 +669,6 @@ create or replace package body test_suite_builder is '%some_packagesuite_level_beforeall' || '%' || '' || - '' || ''|| '' ); @@ -812,7 +810,6 @@ create or replace package body test_suite_builder is '%some_packagecontext_setup' || '%' || '' || - ''|| ''|| '' ); @@ -856,7 +853,6 @@ create or replace package body test_suite_builder is '%some_packagecontext_setup' || '%' || '' || - '' || '' || '' || '%suite_level_testIn suitesome_package.suite_level_test' || @@ -866,7 +862,6 @@ create or replace package body test_suite_builder is '%some_packagesuite_level_beforeall' || '%' || '' || - '' || ''|| '' ); @@ -915,7 +910,6 @@ create or replace package body test_suite_builder is '%some_packagecontext_setup' || '%' || '' || - '' || '' || '' || '%suite_level_testIn suitesome_package.suite_level_test' || @@ -925,7 +919,6 @@ create or replace package body test_suite_builder is '%some_packagesuite_level_beforeall' || '%' || '' || - '' || ''|| '' ); From b1d99f35c79306e294fea98878018d2ad35ba1ba Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 25 Apr 2019 21:59:06 +0100 Subject: [PATCH 0434/1096] Separated the install for trigger. --- .travis/install.sh | 10 ++++-- source/install.sql | 2 -- source/install_ddl_trigger.sql | 21 ++++++++++++ source/install_headless_with_trigger.sql | 43 ++++++++++++++++++++++++ source/uninstall_objects.sql | 4 +++ 5 files changed, 75 insertions(+), 5 deletions(-) create mode 100644 source/install_ddl_trigger.sql create mode 100644 source/install_headless_with_trigger.sql diff --git a/.travis/install.sh b/.travis/install.sh index d8c2a87fc..7f7dc2198 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -25,14 +25,18 @@ if [[ "${TRAVIS_JOB_NUMBER}" =~ \.2$ ]]; then set verify off @uninstall_all.sql $UT3_OWNER + whenever sqlerror exit failure rollback declare v_leftover_objects_count integer; begin select sum(cnt) into v_leftover_objects_count - from (select count(1) cnt from dba_objects where owner = '$UT3_OWNER' - union all - select count(1) cnt from dba_synonyms where table_owner = '$UT3_OWNER' + from ( + select count(1) cnt from dba_objects where owner = '$UT3_OWNER' + where object_name not like 'PLSQL_PROFILER%' and object_name not like 'DBMSPCC_%' + union all + select count(1) cnt from dba_synonyms where table_owner = '$UT3_OWNER' + where table_name not like 'PLSQL_PROFILER%' and table_name not like 'DBMSPCC_%' ); if v_leftover_objects_count > 0 then raise_application_error(-20000, 'Not all objects were successfully uninstalled - leftover objects count='||v_leftover_objects_count); diff --git a/source/install.sql b/source/install.sql index a7dd53aaa..3163e1c26 100644 --- a/source/install.sql +++ b/source/install.sql @@ -335,8 +335,6 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'api/match.syn' @@install_component.sql 'api/contain.syn' -@@install_component.sql 'core/annotations/ut_trigger_annotation_parsing.trg' - set linesize 200 set define on column text format a100 diff --git a/source/install_ddl_trigger.sql b/source/install_ddl_trigger.sql new file mode 100644 index 000000000..39b975716 --- /dev/null +++ b/source/install_ddl_trigger.sql @@ -0,0 +1,21 @@ +/* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +@@define_ut3_owner_param.sql + +@@install_component.sql 'core/annotations/ut_trigger_annotation_parsing.trg' + diff --git a/source/install_headless_with_trigger.sql b/source/install_headless_with_trigger.sql new file mode 100644 index 000000000..511dd6514 --- /dev/null +++ b/source/install_headless_with_trigger.sql @@ -0,0 +1,43 @@ +/* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ +set echo off +set verify off +column 1 new_value 1 noprint +column 2 new_value 2 noprint +column 3 new_value 3 noprint +select null as "1", null as "2" , null as "3" from dual where 1=0; +column sep new_value sep noprint +select '--------------------------------------------------------------' as sep from dual; + +spool params.sql.tmp + +column ut3_owner new_value ut3_owner noprint +column ut3_password new_value ut3_password noprint +column ut3_tablespace new_value ut3_tablespace noprint + +select coalesce('&&1','UT3') ut3_owner, + coalesce('&&2','XNtxj8eEgA6X6b6f') ut3_password, + coalesce('&&3','users') ut3_tablespace from dual; + + +@@create_utplsql_owner.sql &&ut3_owner &&ut3_password &&ut3_tablespace +@@install.sql &&ut3_owner +@@create_synonyms_and_grants_for_public.sql &&ut3_owner + +@@install_ddl_trigger.sql + +exit diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index 45c17fbab..b109efd89 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -68,6 +68,8 @@ drop package ut_suite_manager; drop package ut_suite_builder; +drop package ut_suite_cache_manager; + drop table ut_suite_cache; drop sequence ut_suite_cache_seq; @@ -298,6 +300,8 @@ drop type ut_key_value_pairs force; drop type ut_key_value_pair force; +drop type ut_key_anyvalues force; + drop type ut_object_names force; drop type ut_object_name force; From ddf3a7f608038ef177f76bbf8ee2d4492660e41f Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 26 Apr 2019 06:42:37 +0100 Subject: [PATCH 0435/1096] Phase 2 : switch to varchar_rows() --- source/api/ut_runner.pkb | 12 +++++-- source/api/ut_suite_item_info.tps | 3 +- source/core/types/ut_run.tpb | 2 +- source/core/types/ut_run.tps | 4 +-- source/core/types/ut_suite.tpb | 4 +-- source/core/types/ut_suite.tps | 2 +- source/core/types/ut_suite_item.tps | 2 +- source/core/types/ut_test.tpb | 4 +-- source/core/types/ut_test.tps | 2 +- source/core/ut_suite_builder.pkb | 12 +++---- source/core/ut_suite_cache.sql | 1 + source/core/ut_suite_cache_manager.pkb | 13 ------- source/core/ut_suite_cache_tag.sql | 7 ---- source/core/ut_suite_manager.pkb | 35 ++++++++++--------- source/core/ut_suite_manager.pks | 2 +- .../create_synonyms_and_grants_for_public.sql | 1 - source/create_user_grants.sql | 1 - source/install.sql | 1 - source/uninstall_objects.sql | 2 -- test/ut3_tester/core/test_suite_builder.pkb | 24 ++++++------- 20 files changed, 57 insertions(+), 77 deletions(-) delete mode 100644 source/core/ut_suite_cache_tag.sql diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index 30cdf2691..5a9cc856a 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -99,6 +99,7 @@ create or replace package body ut_runner is l_include_object_names ut_object_names; l_paths ut_varchar2_list := ut_varchar2_list(); l_random_test_order_seed positive; + l_tags ut_varchar2_rows := ut_varchar2_rows(); begin ut_event_manager.initialize(); if a_reporters is not empty then @@ -139,7 +140,12 @@ create or replace package body ut_runner is if a_exclude_objects is not empty then l_exclude_object_names := to_ut_object_list(a_exclude_objects, l_coverage_schema_names); end if; - + + if a_tags is not null then + l_tags := l_tags multiset union distinct ut_utils.convert_collection( + ut_utils.filter_list(ut_utils.string_to_table(a_tags,','),'^(\w|\S)+$') + ); + end if; l_exclude_object_names := l_exclude_object_names multiset union all ut_suite_manager.get_schema_ut_packages(l_coverage_schema_names); l_include_object_names := to_ut_object_list(a_include_objects, l_coverage_schema_names); @@ -154,10 +160,10 @@ create or replace package body ut_runner is set(a_test_file_mappings), a_client_character_set, l_random_test_order_seed, - a_tags + l_tags ); - ut_suite_manager.configure_execution_by_path(l_paths, l_run.items, l_random_test_order_seed, a_tags); + ut_suite_manager.configure_execution_by_path(l_paths, l_run.items, l_random_test_order_seed, l_tags); if a_force_manual_rollback then l_run.set_rollback_type( a_rollback_type => ut_utils.gc_rollback_manual, a_force => true ); end if; diff --git a/source/api/ut_suite_item_info.tps b/source/api/ut_suite_item_info.tps index bf6fd6ecf..b0c77acb6 100644 --- a/source/api/ut_suite_item_info.tps +++ b/source/api/ut_suite_item_info.tps @@ -22,6 +22,7 @@ create or replace type ut_suite_item_info as object ( item_type varchar2( 250 ), -- the type of item (UT_SUITE/UT_SUITE_CONTEXT/UT_TEST) item_line_no integer, -- line_number where annotation identifying the item exists path varchar2( 4000 ),-- suitepath of the item - disabled_flag integer -- 0 (zero) if item is not disabled, 1 if item is disabled by --%disabled annotation + disabled_flag integer, -- 0 (zero) if item is not disabled, 1 if item is disabled by --%disabled annotation + tags varchar2(4000) ) / diff --git a/source/core/types/ut_run.tpb b/source/core/types/ut_run.tpb index d26c6fcb4..c8f2778ff 100644 --- a/source/core/types/ut_run.tpb +++ b/source/core/types/ut_run.tpb @@ -27,7 +27,7 @@ create or replace type body ut_run as a_test_file_mappings ut_file_mappings := null, a_client_character_set varchar2 := null, a_random_test_order_seed positive := null, - a_run_tags varchar2 := null + a_run_tags ut_varchar2_rows := null ) return self as result is begin self.run_paths := a_run_paths; diff --git a/source/core/types/ut_run.tps b/source/core/types/ut_run.tps index 7ea5cc605..b5a1d18ac 100644 --- a/source/core/types/ut_run.tps +++ b/source/core/types/ut_run.tps @@ -21,7 +21,7 @@ create or replace type ut_run under ut_suite_item ( project_name varchar2(4000), items ut_suite_items, run_paths ut_varchar2_list, - run_tags varchar2(4000), + run_tags ut_varchar2_rows, coverage_options ut_coverage_options, test_file_mappings ut_file_mappings, client_character_set varchar2(100), @@ -37,7 +37,7 @@ create or replace type ut_run under ut_suite_item ( a_test_file_mappings ut_file_mappings := null, a_client_character_set varchar2 := null, a_random_test_order_seed positive := null, - a_run_tags varchar2 := null + a_run_tags ut_varchar2_rows := null ) return self as result, overriding member procedure mark_as_skipped(self in out nocopy ut_run), overriding member function do_execute(self in out nocopy ut_run) return boolean, diff --git a/source/core/types/ut_suite.tpb b/source/core/types/ut_suite.tpb index bd35d18ca..1211d5d5c 100644 --- a/source/core/types/ut_suite.tpb +++ b/source/core/types/ut_suite.tpb @@ -18,7 +18,7 @@ create or replace type body ut_suite as constructor function ut_suite ( self in out nocopy ut_suite, a_object_owner varchar2, a_object_name varchar2, a_line_no integer, - a_tags varchar2 := null + a_tags ut_varchar2_rows := null ) return self as result is begin self.self_type := $$plsql_unit; @@ -26,7 +26,7 @@ create or replace type body ut_suite as self.items := ut_suite_items(); before_all_list := ut_executables(); after_all_list := ut_executables(); - self.tags := a_tags; + self.tags := coalesce(a_tags,ut_varchar2_rows()); return; end; diff --git a/source/core/types/ut_suite.tps b/source/core/types/ut_suite.tps index a9647dcf3..dd44a817e 100644 --- a/source/core/types/ut_suite.tps +++ b/source/core/types/ut_suite.tps @@ -28,7 +28,7 @@ create or replace type ut_suite under ut_logical_suite ( after_all_list ut_executables, constructor function ut_suite ( self in out nocopy ut_suite, a_object_owner varchar2, a_object_name varchar2, a_line_no integer, - a_tags varchar2 := null + a_tags ut_varchar2_rows := null ) return self as result, overriding member function do_execute(self in out nocopy ut_suite) return boolean, overriding member function get_error_stack_traces(self ut_suite) return ut_varchar2_list, diff --git a/source/core/types/ut_suite_item.tps b/source/core/types/ut_suite_item.tps index f0ea25187..a5eb10986 100644 --- a/source/core/types/ut_suite_item.tps +++ b/source/core/types/ut_suite_item.tps @@ -63,7 +63,7 @@ create or replace type ut_suite_item force under ut_event_item ( /** * Hold list of tags assign to test */ - tags varchar2(4000), + tags ut_varchar2_rows, member procedure init(self in out nocopy ut_suite_item, a_object_owner varchar2, a_object_name varchar2, a_name varchar2, a_line_no integer), member function get_disabled_flag return boolean, not instantiable member procedure mark_as_skipped(self in out nocopy ut_suite_item), diff --git a/source/core/types/ut_test.tpb b/source/core/types/ut_test.tpb index c1d847bf5..b3b41b4c2 100644 --- a/source/core/types/ut_test.tpb +++ b/source/core/types/ut_test.tpb @@ -18,7 +18,7 @@ create or replace type body ut_test as constructor function ut_test( self in out nocopy ut_test, a_object_owner varchar2 := null, a_object_name varchar2, a_name varchar2, - a_line_no integer, a_expected_error_codes ut_integer_list := null, a_tags varchar2 := null + a_line_no integer, a_expected_error_codes ut_integer_list := null, a_tags ut_varchar2_rows := null ) return self as result is begin self.self_type := $$plsql_unit; @@ -31,7 +31,7 @@ create or replace type body ut_test as self.all_expectations := ut_expectation_results(); self.failed_expectations := ut_expectation_results(); self.expected_error_codes := a_expected_error_codes; - self.tags := a_tags; + self.tags := coalesce(a_tags,ut_varchar2_rows()); return; end; diff --git a/source/core/types/ut_test.tps b/source/core/types/ut_test.tps index 04d8f321d..ef30ab763 100644 --- a/source/core/types/ut_test.tps +++ b/source/core/types/ut_test.tps @@ -57,7 +57,7 @@ create or replace type ut_test force under ut_suite_item ( expected_error_codes ut_integer_list, constructor function ut_test( self in out nocopy ut_test, a_object_owner varchar2 := null, a_object_name varchar2, a_name varchar2, - a_line_no integer, a_expected_error_codes ut_integer_list := null, a_tags varchar2 := null + a_line_no integer, a_expected_error_codes ut_integer_list := null, a_tags ut_varchar2_rows := null ) return self as result, overriding member procedure mark_as_skipped(self in out nocopy ut_test), overriding member function do_execute(self in out nocopy ut_test) return boolean, diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index dcbfedf27..245a49b76 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -309,7 +309,7 @@ create or replace package body ut_suite_builder is procedure add_tags_to_test( a_suite in out nocopy ut_suite, - a_list in out nocopy varchar2, + a_list in out nocopy ut_varchar2_rows, a_procedure_name t_object_name, a_tags_ann_text tt_annotation_texts ) is @@ -328,10 +328,8 @@ create or replace package body ut_suite_builder is ut_utils.string_to_table(a_tags_ann_text(l_annotation_pos),',') ); end if; - --remove empty strings from table list e.g. tag1,,tag2 - a_list := ut_utils.table_to_clob( - ut_utils.filter_list(l_tag_list,'^(\w|\S)+$'), - ','); + --remove empty strings from table list e.g. tag1,,tag2 and conver to rows + a_list := ut_utils.convert_collection( ut_utils.filter_list(l_tag_list,'^(\w|\S)+$') ); l_annotation_pos := a_tags_ann_text.next(l_annotation_pos); end loop; @@ -643,9 +641,7 @@ create or replace package body ut_suite_builder is l_annotation_pos := a_tags_ann_text.next(l_annotation_pos); end loop; --remove empty strings from table list e.g. tag1,,tag2 - a_suite.tags := ut_utils.table_to_clob( - ut_utils.filter_list(l_tag_list,'^(\w|\S)+$'), - ','); + a_suite.tags := ut_utils.convert_collection(ut_utils.filter_list(l_tag_list,'^(\w|\S)+$')); end; procedure add_suite_tests( diff --git a/source/core/ut_suite_cache.sql b/source/core/ut_suite_cache.sql index 3a38ceeb7..8687858a3 100644 --- a/source/core/ut_suite_cache.sql +++ b/source/core/ut_suite_cache.sql @@ -47,6 +47,7 @@ create table ut_suite_cache ( nested table before_test_list store as ut_suite_cache_before_test nested table after_test_list store as ut_suite_cache_after_test nested table expected_error_codes store as ut_suite_cache_throws + nested table tags store as ut_suite_cache_tags return as locator as select cast(null as number(22)) id, diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index 526a03338..b805919fc 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -134,19 +134,6 @@ create or replace package body ut_suite_cache_manager is s.t.item as item from tests s; - --TODO : Optimize to use only inserted - merge into ut_suite_cache_tag tgt - using ( select /*+cardinality (tt 100) */ t.id,tt.column_value tag - from ut_suite_cache t, - table(ut_utils.convert_collection((ut_utils.string_to_table(t.tags,',')))) tt - where tt.column_value is not null ) src - on ( tgt.suiteid = src.id and tgt.tagname = src.tag) - when not matched then - insert - (suiteid, tagname ) - values - (src.id, src.tag); - end if; end if; commit; diff --git a/source/core/ut_suite_cache_tag.sql b/source/core/ut_suite_cache_tag.sql deleted file mode 100644 index 17d287dd8..000000000 --- a/source/core/ut_suite_cache_tag.sql +++ /dev/null @@ -1,7 +0,0 @@ -create table ut_suite_cache_tag ( - suiteid number(22) not null, - tagname varchar2(100) not null, - constraint ut_suite_to_tag_pk primary key (suiteid,tagname), - constraint ut_suite_id_fk foreign key ( suiteid ) references ut_suite_cache(id) on delete cascade -) -organization index; \ No newline at end of file diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 454e4c253..768c0af6f 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -299,7 +299,6 @@ create or replace package body ut_suite_manager is begin loop fetch a_suite_data_cursor bulk collect into l_rows limit c_bulk_limit; - l_idx := l_rows.first; while l_idx is not null loop l_level := length(l_rows(l_idx).path) - length( replace(l_rows(l_idx).path, '.') ) + 1; @@ -364,13 +363,14 @@ create or replace package body ut_suite_manager is a_procedure_name varchar2 := null, a_skip_all_objects boolean := false, a_random_seed positive, - a_tags varchar2 := null + a_tags ut_varchar2_rows := null ) return t_cached_suites_cursor is l_path varchar2( 4000 ); l_result sys_refcursor; l_ut_owner varchar2(250) := ut_utils.ut_owner; l_sql varchar2(32767); l_suite_item_name varchar2(20); + l_tags ut_varchar2_rows := coalesce(a_tags,ut_varchar2_rows()); begin if a_path is null and a_object_name is not null then execute immediate 'select min(path) @@ -382,7 +382,7 @@ create or replace package body ut_suite_manager is else l_path := lower( a_path ); end if; - l_suite_item_name := case when a_tags is not null then 'suite_items_tags' else 'suite_items' end; + l_suite_item_name := case when l_tags.count > 0 then 'suite_items_tags' else 'suite_items' end; l_sql := q'[with @@ -413,14 +413,13 @@ create or replace package body ut_suite_manager is ) ) ),]' - ||case when a_tags is not null then - q'[ filter_tags as ( - select s.* from suite_items s - where exists - ( select 1 - from ]'||l_ut_owner||q'[.ut_suite_cache_tag ct - where ct.suiteid = s.id and regexp_like(:a_tag_list,'(^|,){1}'||ct.tagname||'(,|$){1}') ) - ), + ||case when l_tags.count > 0 then + q'[ + filter_tags as ( + select c.* + from suite_items c + where c.tags multiset intersect :a_tag_list is not empty + ), suite_items_tags as ( select c.* from suite_items c where exists (select 1 from filter_tags t where @@ -497,7 +496,7 @@ create or replace package body ut_suite_manager is c.path, :a_random_seed ) desc nulls last' end; - open l_result for l_sql using l_path, l_path, upper(a_object_name), upper(a_procedure_name), a_tags, a_random_seed; + open l_result for l_sql using l_path, l_path, upper(a_object_name), upper(a_procedure_name), l_tags, a_random_seed; return l_result; end; @@ -585,7 +584,7 @@ create or replace package body ut_suite_manager is a_procedure_name varchar2 := null, a_suites in out nocopy ut_suite_items, a_random_seed positive, - a_tags varchar2 := null + a_tags ut_varchar2_rows := null ) is begin refresh_cache(a_owner_name); @@ -693,9 +692,10 @@ create or replace package body ut_suite_manager is a_suite_path in varchar2, a_procedure_name in varchar2, a_object_name in varchar2, - a_tags in varchar2 + a_tags in ut_varchar2_rows ) return varchar2 is l_error_msg varchar2(500); + l_tags clob:= ut_utils.table_to_clob(coalesce(a_tags,ut_varchar2_rows()),','); begin if a_suite_path is not null then l_error_msg := 'No suite packages found for path '||a_schema_name||':'||a_suite_path; @@ -706,9 +706,9 @@ create or replace package body ut_suite_manager is end if; if l_error_msg is null and a_tags is not null then - l_error_msg := 'No tests found for tags: '||ut_utils.to_string(a_tags,a_max_output_len => gc_tag_errmsg); + l_error_msg := 'No tests found for tags: '||ut_utils.to_string(l_tags,a_max_output_len => gc_tag_errmsg); elsif l_error_msg is not null and a_tags is not null then - l_error_msg := l_error_msg||' with tags: '||ut_utils.to_string(a_tags,a_max_output_len => gc_tag_errmsg); + l_error_msg := l_error_msg||' with tags: '||ut_utils.to_string(l_tags,a_max_output_len => gc_tag_errmsg); end if; l_error_msg := l_error_msg ||'.'; @@ -720,7 +720,7 @@ create or replace package body ut_suite_manager is a_paths in ut_varchar2_list, a_suites out nocopy ut_suite_items, a_random_seed in positive := null, - a_tags varchar2 := null + a_tags ut_varchar2_rows := null ) is l_paths ut_varchar2_list := a_paths; l_path_items t_path_items; @@ -768,6 +768,7 @@ create or replace package body ut_suite_manager is end configure_execution_by_path; + --TODO : add tags function get_suites_info( a_owner_name varchar2, a_package_name varchar2 := null diff --git a/source/core/ut_suite_manager.pks b/source/core/ut_suite_manager.pks index 5b7c705c6..c27de2eb1 100644 --- a/source/core/ut_suite_manager.pks +++ b/source/core/ut_suite_manager.pks @@ -50,7 +50,7 @@ create or replace package ut_suite_manager authid current_user is a_paths in ut_varchar2_list, a_suites out nocopy ut_suite_items, a_random_seed in positive := null, - a_tags varchar2 := null + a_tags ut_varchar2_rows := null ); /** diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index 6cc40afdc..609d78ccf 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -93,7 +93,6 @@ grant select on &&ut3_owner..ut_annotation_cache to public; grant execute on &&ut3_owner..ut_executables to public; grant execute on &&ut3_owner..ut_executable_test to public; grant select on &&ut3_owner..ut_suite_cache to public; -grant select on &&ut3_owner..ut_suite_cache_tag to public; grant select on &&ut3_owner..ut_suite_cache_package to public; grant select on &&ut3_owner..ut_suite_cache_schema to public; grant execute on &&ut3_owner..ut_annotation_cache_manager to public; diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql index ace73b951..7aa5deb39 100644 --- a/source/create_user_grants.sql +++ b/source/create_user_grants.sql @@ -114,7 +114,6 @@ grant select on &&ut3_owner..ut_annotation_cache to &ut3_user; grant execute on &&ut3_owner..ut_executables to &ut3_user; grant execute on &&ut3_owner..ut_executable_test to &ut3_user; grant select on &&ut3_owner..ut_suite_cache to &ut3_user; -grant select on &&ut3_owner..ut_suite_cache_tag to &ut3_user; grant select on &&ut3_owner..ut_suite_cache_package to public; grant select on &&ut3_owner..ut_suite_cache_schema to &ut3_user; grant execute on &&ut3_owner..ut_annotation_cache_manager to &ut3_user; diff --git a/source/install.sql b/source/install.sql index 86669c11d..728f4349f 100644 --- a/source/install.sql +++ b/source/install.sql @@ -130,7 +130,6 @@ alter session set current_schema = &&ut3_owner; @@install_component.sql 'core/ut_suite_cache_package.sql' @@install_component.sql 'core/ut_suite_cache_seq.sql' @@install_component.sql 'core/ut_suite_cache.sql' -@@install_component.sql 'core/ut_suite_cache_tag.sql' @@install_component.sql 'core/ut_suite_cache_manager.pks' @@install_component.sql 'core/ut_suite_cache_manager.pkb' @@install_component.sql 'core/ut_suite_builder.pks' diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index e68b50664..e2295f34d 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -63,8 +63,6 @@ drop package ut_suite_manager; drop package ut_suite_builder; -drop table ut_suite_cache_tag; - drop table ut_suite_cache; drop sequence ut_suite_cache_seq; diff --git a/test/ut3_tester/core/test_suite_builder.pkb b/test/ut3_tester/core/test_suite_builder.pkb index 5a9f74992..3bebb500e 100644 --- a/test/ut3_tester/core/test_suite_builder.pkb +++ b/test/ut3_tester/core/test_suite_builder.pkb @@ -1149,7 +1149,7 @@ create or replace package body test_suite_builder is ut.expect(l_actual).to_be_like( '%' || '%test_procedureSome testsome_package.test_procedure' || - '%testtag%'|| + '%testtag%'|| '%%' ); @@ -1170,7 +1170,7 @@ create or replace package body test_suite_builder is ut.expect(l_actual).to_be_like( '%' || '%some_packagetestsuitesome_package' || - '%suitetag%'|| + '%suitetag%'|| '%%' ); @@ -1192,7 +1192,7 @@ create or replace package body test_suite_builder is ut.expect(l_actual).to_be_like( '%' || '%test_procedureSome testsome_package.test_procedure' || - '%testtag,testtag2,testtag3%'|| + '%testtagtesttag2testtag3%'|| '%%' ); @@ -1213,7 +1213,7 @@ create or replace package body test_suite_builder is ut.expect(l_actual).to_be_like( '%' || '%some_packagetestsuitesome_package' || - '%suitetag,suitetag1,suitetag2%'|| + '%suitetagsuitetag1suitetag2%'|| '%%' ); @@ -1236,7 +1236,7 @@ create or replace package body test_suite_builder is ut.expect(l_actual).to_be_like( '%' || '%test_procedureSome testsome_package.test_procedure' || - '%testtag,testtag2%'|| + '%testtagtesttag2%'|| '%%' ); @@ -1258,7 +1258,7 @@ create or replace package body test_suite_builder is ut.expect(l_actual).to_be_like( '%' || '%some_packagetestsuitesome_package' || - '%suitetag,suitetag1%'|| + '%suitetagsuitetag1%'|| '%%' ); @@ -1319,7 +1319,7 @@ create or replace package body test_suite_builder is ut.expect(l_actual).to_be_like( '%' || '%test_procedureSome testsome_package.test_procedure' || - '%testtag,testtag1,testtag2%'|| + '%testtagtesttag1testtag2%'|| '%%' ); @@ -1341,7 +1341,7 @@ create or replace package body test_suite_builder is ut.expect(l_actual).to_be_like( '%' || '%some_packagetestsuitesome_package' || - '%suitetag,suitetag1,suitetag2%'|| + '%suitetagsuitetag1suitetag2%'|| '%%' ); @@ -1363,7 +1363,7 @@ create or replace package body test_suite_builder is ut.expect(l_actual).to_be_like( '%' || '%test_procedureSome testsome_package.test_procedure' || - '%testtag,testtag1%'|| + '%testtagtesttag1%'|| '%%' ); @@ -1384,7 +1384,7 @@ create or replace package body test_suite_builder is ut.expect(l_actual).to_be_like( '%' || '%some_packagetestsuitesome_package' || - '%suitetag,suitetag1%'|| + '%suitetagsuitetag1%'|| '%%' ); @@ -1406,7 +1406,7 @@ create or replace package body test_suite_builder is ut.expect(l_actual).to_be_like( '%' || '%test_procedureSome testsome_package.test_procedure' || - '%#?$%^&*!|\/@][%'|| + '%#?$%^&*!|\/@][%'|| '%%' ); @@ -1427,7 +1427,7 @@ create or replace package body test_suite_builder is ut.expect(l_actual).to_be_like( '%' || '%some_packagetestsuitesome_package' || - '%#?$%^&*!|\/@][%'|| + '%#?$%^&*!|\/@][%'|| '%%' ); From e64f498fb7ec4b86f706f19729928bda9146e155 Mon Sep 17 00:00:00 2001 From: Lukasz Date: Sat, 27 Apr 2019 21:36:41 +0100 Subject: [PATCH 0436/1096] Number precision from dbms_sql not correct (#908) * Fixing issue with number from dual and precision being incorrectly read. * Updated tests --- .../data_values/ut_compound_data_helper.pkb | 4 +++ .../data_values/ut_cursor_column.tpb | 11 +++++-- .../data_values/ut_cursor_column.tps | 8 +++-- .../data_values/ut_cursor_details.tpb | 12 ++++++-- .../expectations/test_expectations_cursor.pkb | 29 ++++++++++++++++++- .../expectations/test_expectations_cursor.pks | 3 ++ 6 files changed, 58 insertions(+), 9 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 6e8453f45..bd259b47d 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -237,6 +237,10 @@ create or replace package body ut_compound_data_helper is l_col_type := a_data_info.column_type; elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('VARCHAR2','CHAR') then l_col_type := 'VARCHAR2('||greatest(a_data_info.column_len,4000)||')'; + elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('NUMBER') then + --We cannot use a precision and scale as dbms_sql.describe_columns3 return precision 0 for dual table + -- there is also no need for that as we not process data but only read and compare as they are stored + l_col_type := a_data_info.column_type; else l_col_type := a_data_info.column_type ||case when a_data_info.column_len is not null diff --git a/source/expectations/data_values/ut_cursor_column.tpb b/source/expectations/data_values/ut_cursor_column.tpb index 8f26f58aa..3c6931a5d 100644 --- a/source/expectations/data_values/ut_cursor_column.tpb +++ b/source/expectations/data_values/ut_cursor_column.tpb @@ -4,13 +4,16 @@ create or replace type body ut_cursor_column as self in out nocopy ut_cursor_column, a_col_name varchar2, a_col_schema_name varchar2, a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, - a_col_position integer, a_col_type varchar2, a_collection integer,a_access_path in varchar2 + a_col_position integer, a_col_type varchar2, a_collection integer,a_access_path in varchar2, a_col_precision in integer, + a_col_scale integer ) is begin self.parent_name := a_parent_name; --Name of the parent if its nested self.hierarchy_level := a_hierarchy_level; --Hierarchy level self.column_position := a_col_position; --Position of the column in cursor/ type self.column_len := a_col_max_len; --length of column + self.column_precision := a_col_precision; + self.column_scale := a_col_scale; self.column_name := TRIM( BOTH '''' FROM a_col_name); --name of the column self.column_type_name := coalesce(a_col_type_name,a_col_type); --type name e.g. test_dummy_object or varchar2 self.xml_valid_name := ut_utils.get_valid_xml_name(self.column_name); @@ -49,10 +52,12 @@ create or replace type body ut_cursor_column as constructor function ut_cursor_column( self in out nocopy ut_cursor_column, a_col_name varchar2, a_col_schema_name varchar2, a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, - a_col_position integer, a_col_type in varchar2, a_collection integer,a_access_path in varchar2 + a_col_position integer, a_col_type in varchar2, a_collection integer,a_access_path in varchar2, a_col_precision in integer, + a_col_scale integer ) return self as result is begin - init(a_col_name, a_col_schema_name, a_col_type_name, a_col_max_len, a_parent_name,a_hierarchy_level, a_col_position, a_col_type, a_collection,a_access_path); + init(a_col_name, a_col_schema_name, a_col_type_name, a_col_max_len, a_parent_name,a_hierarchy_level, a_col_position, + a_col_type, a_collection,a_access_path,a_col_precision,a_col_scale); return; end; diff --git a/source/expectations/data_values/ut_cursor_column.tps b/source/expectations/data_values/ut_cursor_column.tps index f55973e16..db9cbd3ae 100644 --- a/source/expectations/data_values/ut_cursor_column.tps +++ b/source/expectations/data_values/ut_cursor_column.tps @@ -28,18 +28,22 @@ create or replace type ut_cursor_column force authid current_user as object ( column_type_name varchar2(128), column_schema varchar2(128), column_len integer, + column_precision integer, + column_scale integer, is_sql_diffable number(1, 0), is_collection number(1, 0), member procedure init(self in out nocopy ut_cursor_column, a_col_name varchar2, a_col_schema_name varchar2, a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, - a_col_position integer, a_col_type in varchar2, a_collection integer,a_access_path in varchar2), + a_col_position integer, a_col_type in varchar2, a_collection integer,a_access_path in varchar2, a_col_precision in integer, + a_col_scale integer), constructor function ut_cursor_column( self in out nocopy ut_cursor_column, a_col_name varchar2, a_col_schema_name varchar2, a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, - a_col_position integer, a_col_type in varchar2, a_collection integer, a_access_path in varchar2) + a_col_position integer, a_col_type in varchar2, a_collection integer, a_access_path in varchar2, a_col_precision in integer, + a_col_scale integer) return self as result, constructor function ut_cursor_column( self in out nocopy ut_cursor_column) return self as result diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb index c1d229e6a..9f1f08d67 100644 --- a/source/expectations/data_values/ut_cursor_details.tpb +++ b/source/expectations/data_values/ut_cursor_details.tpb @@ -39,7 +39,9 @@ create or replace type body ut_cursor_details as l_idx, ut_compound_data_helper.get_column_type_desc(l_elements_info.type_code,false), ut_utils.boolean_to_int(l_is_collection), - a_access_path + a_access_path, + l_elements_info.precision, + l_elements_info.scale ); if l_element_info.attr_elt_type is not null then desc_compound_data( @@ -63,7 +65,9 @@ create or replace type body ut_cursor_details as l_idx, ut_compound_data_helper.get_column_type_desc(l_element_info.type_code,false), ut_utils.boolean_to_int(l_is_collection), - a_access_path + a_access_path, + l_elements_info.precision, + l_elements_info.scale ); if l_element_info.attr_elt_type is not null then desc_compound_data( @@ -114,7 +118,9 @@ create or replace type body ut_cursor_details as pos, ut_compound_data_helper.get_column_type_desc(l_columns_desc(pos).col_type,true), ut_utils.boolean_to_int(l_is_collection), - null + null, + l_columns_desc(pos).col_precision, + l_columns_desc(pos).col_scale ); if l_columns_desc(pos).col_type = dbms_sql.user_defined_type or l_is_collection then diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index 959014a45..e1000457d 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -2761,6 +2761,33 @@ Check the query and data for errors.'; ut3.ut.expect( l_actual ).to_equal( l_expected ); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; - + + procedure number_from_dual is + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + open l_expected for select + 12345 as n1, + cast(7456123.89 as number(7,-2)) as n2, + cast(7456123.89 as number(9,1)) as n3, + cast(7456123.89 as number(9,2)) as n4, + cast(7456123.89 as number(9)) as n5, + cast(7456123.89 as number(*,1)) as n6, + 7456123.89 as n7 + from dual; + + open l_actual for select + 12345 as n1, + 7456100 as n2, + 7456123.9 as n3, + 7456123.89 as n4, + 7456124 as n5, + 7456123.9 as n6, + 7456123.89 as n7 + from dual; + ut3.ut.expect(l_actual).to_equal(l_expected); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + end; / diff --git a/test/ut3_user/expectations/test_expectations_cursor.pks b/test/ut3_user/expectations/test_expectations_cursor.pks index d511ae7f7..15a0d98ea 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pks +++ b/test/ut3_user/expectations/test_expectations_cursor.pks @@ -443,5 +443,8 @@ create or replace package test_expectations_cursor is --%disabled procedure nulltowhitespace; + --%test(Check precision of number from dual #907) + procedure number_from_dual; + end; / From 91112bce1d776111966b963340c439b19a62ba13 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sat, 27 Apr 2019 21:01:19 +0000 Subject: [PATCH 0437/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 5f66fa774..491892256 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 5d31926b9..bbd1e1cf3 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 94576cced..d9439e5be 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 6493c0977..c8d388d30 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index af338a8c6..9c915d543 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 5d15c45d0..b55249394 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index c659f7237..f1a58d7af 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index ff6e3e9e1..e3ae65485 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 546c24556..ee78589c8 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index c3e04fd73..c1aca8c6a 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index fa6190a5c..24d617f5d 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 70b19945e..d3bfe9d19 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 327dd5a13..571f14d98 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index df973f5ea..56b4d1001 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index d0c2bbd63..b48a170e4 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 9b765300a..f6ef99991 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index d4c36b78f..5f5339002 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2859--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index da3778eab..392ff96dc 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -760,7 +760,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.7.2859-develop + * secion v3.1.7.2886-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 6ea107499..7738a9196 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.7.2859-develop'; + gc_version constant varchar2(50) := 'v3.1.7.2886-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From e036629bfed253d31b1279b5a2bc907e9e099dbf Mon Sep 17 00:00:00 2001 From: Pazus Date: Sun, 28 Apr 2019 11:31:44 +0300 Subject: [PATCH 0438/1096] add tests on 19c DB version --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index af8a07cee..7e9d94ccf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,6 +56,7 @@ env: - ORACLE_VERSION="${DOCKER_TAG_12C:-12c-r1-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs" - ORACLE_VERSION="${DOCKER_TAG_12C2:-12c-r2-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs" - ORACLE_VERSION="${DOCKER_TAG_18:-18c-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs" + - ORACLE_VERSION="${DOCKER_TAG_19:-19c-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs" cache: pip: true From 6d8b09901308e74bdbea8d23f85d4a6592cc7792 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 26 Apr 2019 07:15:23 +0100 Subject: [PATCH 0439/1096] Phase 2 : switch to varchar_rows() --- docs/userguide/annotations.md | 29 +++++---- docs/userguide/querying_suites.md | 9 +-- source/api/ut_suite_item_info.tpb | 38 ++++++++++++ source/api/ut_suite_item_info.tps | 5 +- source/core/ut_suite_manager.pkb | 17 +++--- source/core/ut_suite_manager.pks | 2 +- source/install.sql | 1 + test/ut3_tester_helper/run_helper.pkb | 88 +++++++++++++++++++++++++++ test/ut3_tester_helper/run_helper.pks | 3 + test/ut3_user/api/test_ut_runner.pkb | 88 ++++++++++++++++++++++++++- test/ut3_user/api/test_ut_runner.pks | 25 +++++++- 11 files changed, 275 insertions(+), 30 deletions(-) create mode 100644 source/api/ut_suite_item_info.tpb diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 60a4ed845..84e5f90fc 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1243,7 +1243,7 @@ or -Tags are defined as a coma separated list. When executing a tests filtering by tag utPLSQL will find all tests associated with a given tag and execute it. It will apply `OR` logic when resolving a tags so any tests / suites that got matching at least one tag will get executed. +Tags are defined as a coma separated list. When executing a test run with tag filter applied, framework will find all tests associated with given tags and execute them. Framework applies `OR` logic when resolving a tags so any tests / suites that match at least one tag will be included in the test run. When a suite gets tagged all of its children will automatically inherit a tag and get executed along the parent. Parent suit tests are not executed. but a suitepath hierarchy is kept. @@ -1259,9 +1259,9 @@ create or replace PACKAGE ut_sample_test IS --%tag(test1,sample) PROCEDURE ut_refcursors1; - --%test(Compare Ref Cursors #2) + --%test(Run equality test) --%tag(test2,sample) - PROCEDURE ut_refcursors2; + PROCEDURE ut_test; END ut_sample_test; / @@ -1278,21 +1278,16 @@ create or replace PACKAGE BODY ut_sample_test IS ut.expect(v_actual).to_equal(v_expected); END; - PROCEDURE ut_refcursors2 IS - v_actual SYS_REFCURSOR; - v_expected SYS_REFCURSOR; + PROCEDURE ut_test IS BEGIN - open v_expected for select 1 as test from dual; - open v_actual for select 2 as test from dual; - - ut.expect(v_actual).to_equal(v_expected); + ut.expect(1).to_equal(0); END; END ut_sample_test; / ``` -Execution of the test is done by using a new parameter `a_tags` +Execution of the test is done by using a parameter `a_tags` ```sql select * from table(ut.run(a_path => 'ut_sample_test',a_tags => 'suite1')); @@ -1303,10 +1298,22 @@ begin ut.run(a_path => 'ut_sample_test',a_tags => 'suite1'); end; / + +exec ut.run('ut_sample_test', a_tags => 'sample'); ``` +Tags should adhere to following rules: + +- tags are case sensitive +- tags cannot be an empty string +- tags cannot contain spaces e.g. to create a multi-word `tag` please use underscores,dashes, dots etc. e.g. `test_of_batch` +- tags with empty spaces will be ignored during execution +- tags can contain special characters + + + ### Suitepath It is very likely that the application for which you are going to introduce tests consists of many different packages, procedures and functions. diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index df973f5ea..e4d4d482c 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -22,21 +22,22 @@ Querying the data from function provides the follwing details: - `item_line_no` - line_number where annotation identifying the item exists - `path` - suitepath of the item - `disabled_flag` - (0/1) indicator if item is disabled by --%disabled annotation - +- `tags` - tags associated with suites + To get list of all test suites in current schema ```sql select * from table(ut_runner.get_suites_info()) where item_type = 'UT_SUITE'; -``` +``` To get list of all tests for test suite `TEST_STUFF` in current user schema ```sql select * from table(ut_runner.get_suites_info(USER, 'TEST_STUFF')) where item_type = 'UT_TEST'; -``` +``` To get a full information about suite `TEST_STUFF` including suite description, all contexts and tests in a suite ```sql select * from table(ut_runner.get_suites_info(USER, 'TEST_STUFF')) where item_type = 'UT_TEST'; -``` +``` ## Checking if schema contains tests diff --git a/source/api/ut_suite_item_info.tpb b/source/api/ut_suite_item_info.tpb new file mode 100644 index 000000000..06ae8341b --- /dev/null +++ b/source/api/ut_suite_item_info.tpb @@ -0,0 +1,38 @@ +create or replace type body ut_suite_item_info is + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + constructor function ut_suite_item_info(a_object_owner varchar2, a_object_name varchar2, a_item_name varchar2, + a_item_description varchar2, a_item_type varchar2, a_item_line_no integer, a_path varchar2, a_disabled_flag integer, + a_tags ut_varchar2_rows) return self as result is + begin + self.object_owner := a_object_owner; + self.object_name := a_object_name; + self.item_name := a_item_name; + self.item_description := a_item_description; + self.item_type := a_item_type; + self.item_line_no := a_item_line_no; + self.path := a_path; + self.disabled_flag := a_disabled_flag; + self.tags := case + when a_tags is null then null + when a_tags.count = 0 then null + else ut_utils.to_string(ut_utils.table_to_clob(a_tags,',') ,a_quote_char => null) + end; + return; + end; +end; +/ diff --git a/source/api/ut_suite_item_info.tps b/source/api/ut_suite_item_info.tps index b0c77acb6..d7f7f97dc 100644 --- a/source/api/ut_suite_item_info.tps +++ b/source/api/ut_suite_item_info.tps @@ -23,6 +23,9 @@ create or replace type ut_suite_item_info as object ( item_line_no integer, -- line_number where annotation identifying the item exists path varchar2( 4000 ),-- suitepath of the item disabled_flag integer, -- 0 (zero) if item is not disabled, 1 if item is disabled by --%disabled annotation - tags varchar2(4000) + tags varchar2(4000), + constructor function ut_suite_item_info(a_object_owner varchar2, a_object_name varchar2, a_item_name varchar2, + a_item_description varchar2, a_item_type varchar2, a_item_line_no integer, a_path varchar2, a_disabled_flag integer, + a_tags ut_varchar2_rows) return self as result ) / diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 768c0af6f..3e41ab58b 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -692,7 +692,7 @@ create or replace package body ut_suite_manager is a_suite_path in varchar2, a_procedure_name in varchar2, a_object_name in varchar2, - a_tags in ut_varchar2_rows + a_tags in ut_varchar2_rows := ut_varchar2_rows() ) return varchar2 is l_error_msg varchar2(500); l_tags clob:= ut_utils.table_to_clob(coalesce(a_tags,ut_varchar2_rows()),','); @@ -705,9 +705,9 @@ create or replace package body ut_suite_manager is l_error_msg := 'Suite package '||a_schema_name||'.'||a_object_name|| ' does not exists'; end if; - if l_error_msg is null and a_tags is not null then + if l_error_msg is null and a_tags.count > 0 then l_error_msg := 'No tests found for tags: '||ut_utils.to_string(l_tags,a_max_output_len => gc_tag_errmsg); - elsif l_error_msg is not null and a_tags is not null then + elsif l_error_msg is not null and a_tags.count > 0 then l_error_msg := l_error_msg||' with tags: '||ut_utils.to_string(l_tags,a_max_output_len => gc_tag_errmsg); end if; @@ -720,7 +720,7 @@ create or replace package body ut_suite_manager is a_paths in ut_varchar2_list, a_suites out nocopy ut_suite_items, a_random_seed in positive := null, - a_tags ut_varchar2_rows := null + a_tags ut_varchar2_rows := ut_varchar2_rows() ) is l_paths ut_varchar2_list := a_paths; l_path_items t_path_items; @@ -768,7 +768,6 @@ create or replace package body ut_suite_manager is end configure_execution_by_path; - --TODO : add tags function get_suites_info( a_owner_name varchar2, a_package_name varchar2 := null @@ -779,7 +778,7 @@ create or replace package body ut_suite_manager is refresh_cache(a_owner_name); - open l_result for + open l_result for q'[with suite_items as ( select /*+ cardinality(c 100) */ c.* @@ -831,17 +830,17 @@ create or replace package body ut_suite_manager is items as ( select object_owner, object_name, name as item_name, description as item_description, self_type as item_type, line_no as item_line_no, - path, disabled_flag + path, disabled_flag,tags from suite_items union all select object_owner, object_name, object_name as item_name, null as item_description, item_type, null as item_line_no, - s.path, 0 as disabled_flag + s.path, 0 as disabled_flag, ]'||l_ut_owner||q'[.ut_varchar2_rows() as tags from logical_suites s ) select ]'||l_ut_owner||q'[.ut_suite_item_info( object_owner, object_name, item_name, item_description, - item_type, item_line_no, path, disabled_flag + item_type, item_line_no, path, disabled_flag, tags ) from items c]' using upper(a_package_name); diff --git a/source/core/ut_suite_manager.pks b/source/core/ut_suite_manager.pks index c27de2eb1..bf8819693 100644 --- a/source/core/ut_suite_manager.pks +++ b/source/core/ut_suite_manager.pks @@ -50,7 +50,7 @@ create or replace package ut_suite_manager authid current_user is a_paths in ut_varchar2_list, a_suites out nocopy ut_suite_items, a_random_seed in positive := null, - a_tags ut_varchar2_rows := null + a_tags ut_varchar2_rows := ut_varchar2_rows() ); /** diff --git a/source/install.sql b/source/install.sql index 728f4349f..465beaa48 100644 --- a/source/install.sql +++ b/source/install.sql @@ -279,6 +279,7 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema --plugin interface API for running utPLSQL @@install_component.sql 'api/ut_suite_item_info.tps' +@@install_component.sql 'api/ut_suite_item_info.tpb' @@install_component.sql 'api/ut_suite_items_info.tps' @@install_component.sql 'api/ut_runner.pks' @@install_component.sql 'api/ut_runner.pkb' diff --git a/test/ut3_tester_helper/run_helper.pkb b/test/ut3_tester_helper/run_helper.pkb index 45403ca8a..2f4c9a86e 100644 --- a/test/ut3_tester_helper/run_helper.pkb +++ b/test/ut3_tester_helper/run_helper.pkb @@ -27,6 +27,94 @@ create or replace package body run_helper is execute immediate q'[grant execute on ut3_tester_helper.dummy_test_procedure to public]'; end; + procedure setup_cache_objectstag is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package ut3$user#.dummy_test_package as + --%suite(dummy_test_suite) + --%tags(dummy) + --%rollback(manual) + + --%test(dummy_test) + --%tags(testtag) + --%beforetest(some_procedure) + procedure some_dummy_test_procedure; + end;]'; + execute immediate q'[create or replace procedure ut3$user#.dummy_test_procedure as + --%some_annotation(some_text) + --%rollback(manual) + begin + null; + end;]'; + execute immediate q'[create or replace procedure ut3_tester_helper.dummy_test_procedure as + --%some_annotation(some_text) + --%rollback(manual) + begin + null; + end;]'; + + execute immediate q'[grant execute on ut3_tester_helper.dummy_test_procedure to public]'; + end; + + procedure setup_cache_twotags is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package ut3$user#.dummy_test_package as + --%suite(dummy_test_suite) + --%tags(suitetag1,suitetag2) + --%rollback(manual) + + --%test(dummy_test) + --%tags(testtag1,testtag2) + --%beforetest(some_procedure) + procedure some_dummy_test_procedure; + end;]'; + execute immediate q'[create or replace procedure ut3$user#.dummy_test_procedure as + --%some_annotation(some_text) + --%rollback(manual) + begin + null; + end;]'; + execute immediate q'[create or replace procedure ut3_tester_helper.dummy_test_procedure as + --%some_annotation(some_text) + --%rollback(manual) + begin + null; + end;]'; + + execute immediate q'[grant execute on ut3_tester_helper.dummy_test_procedure to public]'; + end; + + procedure setup_cache_longtags is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package ut3$user#.dummy_test_package as + --%suite(dummy_test_suite) + --%tags(bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb) + --%tags(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) + --%rollback(manual) + + --%test(dummy_test) + --%tags(testtag1,testtag2) + --%beforetest(some_procedure) + procedure some_dummy_test_procedure; + end;]'; + execute immediate q'[create or replace procedure ut3$user#.dummy_test_procedure as + --%some_annotation(some_text) + --%rollback(manual) + begin + null; + end;]'; + execute immediate q'[create or replace procedure ut3_tester_helper.dummy_test_procedure as + --%some_annotation(some_text) + --%rollback(manual) + begin + null; + end;]'; + + execute immediate q'[grant execute on ut3_tester_helper.dummy_test_procedure to public]'; + end; + procedure create_trans_control is pragma autonomous_transaction; begin diff --git a/test/ut3_tester_helper/run_helper.pks b/test/ut3_tester_helper/run_helper.pks index 45c64741c..e79549f3e 100644 --- a/test/ut3_tester_helper/run_helper.pks +++ b/test/ut3_tester_helper/run_helper.pks @@ -6,6 +6,9 @@ create or replace package run_helper is type prof_runs_tab is table of ut3.plsql_profiler_runs%rowtype; procedure setup_cache_objects; + procedure setup_cache_objectstag; + procedure setup_cache_twotags; + procedure setup_cache_longtags; procedure setup_cache; procedure cleanup_cache; procedure create_db_link; diff --git a/test/ut3_user/api/test_ut_runner.pkb b/test/ut3_user/api/test_ut_runner.pkb index 298c15c2a..d58f4832d 100644 --- a/test/ut3_user/api/test_ut_runner.pkb +++ b/test/ut3_user/api/test_ut_runner.pkb @@ -5,6 +5,21 @@ create or replace package body test_ut_runner is ut3_tester_helper.run_helper.setup_cache_objects(); end; + procedure setup_cache_objectstag is + begin + ut3_tester_helper.run_helper.setup_cache_objectstag(); + end; + + procedure setup_cache_twotags is + begin + ut3_tester_helper.run_helper.setup_cache_twotags(); + end; + + procedure setup_cache_longtags is + begin + ut3_tester_helper.run_helper.setup_cache_longtags(); + end; + procedure setup_cache is begin ut3_tester_helper.run_helper.setup_cache(); @@ -238,7 +253,7 @@ end;'; ut.expect(l_actual).to_equal(0); end; - procedure test_get_suites_info is + procedure test_get_suites_info_notag is l_expected sys_refcursor; l_actual sys_refcursor; begin @@ -247,12 +262,79 @@ end;'; select 'UT3$USER#' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'DUMMY_TEST_PACKAGE' item_name, 'dummy_test_suite' item_description, 'UT_SUITE' item_type, 2 item_line_no, - 'dummy_test_package' path, 0 disabled_flag + 'dummy_test_package' path, 0 disabled_flag,null tags from dual union all select 'UT3$USER#' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'SOME_DUMMY_TEST_PROCEDURE' item_name, 'dummy_test' item_description, 'UT_TEST' item_type, 5 item_line_no, - 'dummy_test_package.some_dummy_test_procedure' path, 0 disabled_flag + 'dummy_test_package.some_dummy_test_procedure' path, 0 disabled_flag,null tags + from dual; + --Act + open l_actual for select * from table(ut3.ut_runner.get_suites_info('UT3$USER#','DUMMY_TEST_PACKAGE')); + --Assert + ut.expect(l_actual).to_equal(l_expected); + end; + + --TODO : Apostro????? + procedure test_get_suites_info_tag is + l_expected sys_refcursor; + l_actual sys_refcursor; + begin + --Arrange + open l_expected for + select + 'UT3$USER#' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'DUMMY_TEST_PACKAGE' item_name, + 'dummy_test_suite' item_description, 'UT_SUITE' item_type, 2 item_line_no, + 'dummy_test_package' path, 0 disabled_flag,'dummy' tags + from dual union all + select + 'UT3$USER#' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'SOME_DUMMY_TEST_PROCEDURE' item_name, + 'dummy_test' item_description, 'UT_TEST' item_type, 6 item_line_no, + 'dummy_test_package.some_dummy_test_procedure' path, 0 disabled_flag,'testtag' tags + from dual; + --Act + open l_actual for select * from table(ut3.ut_runner.get_suites_info('UT3$USER#','DUMMY_TEST_PACKAGE')); + --Assert + ut.expect(l_actual).to_equal(l_expected); + end; + + procedure test_get_suites_info_twotag is + l_expected sys_refcursor; + l_actual sys_refcursor; + begin + --Arrange + open l_expected for + select + 'UT3$USER#' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'DUMMY_TEST_PACKAGE' item_name, + 'dummy_test_suite' item_description, 'UT_SUITE' item_type, 2 item_line_no, + 'dummy_test_package' path, 0 disabled_flag,'suitetag1,suitetag2' tags + from dual union all + select + 'UT3$USER#' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'SOME_DUMMY_TEST_PROCEDURE' item_name, + 'dummy_test' item_description, 'UT_TEST' item_type, 6 item_line_no, + 'dummy_test_package.some_dummy_test_procedure' path, 0 disabled_flag,'testtag1,testtag2' tags + from dual; + --Act + open l_actual for select * from table(ut3.ut_runner.get_suites_info('UT3$USER#','DUMMY_TEST_PACKAGE')); + --Assert + ut.expect(l_actual).to_equal(l_expected); + end; + + procedure test_get_suites_info_longtag is + l_expected sys_refcursor; + l_actual sys_refcursor; + begin + --Arrange + open l_expected for + select + 'UT3$USER#' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'DUMMY_TEST_PACKAGE' item_name, + 'dummy_test_suite' item_description, 'UT_SUITE' item_type, 2 item_line_no, + 'dummy_test_package' path, 0 disabled_flag,'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa[...]' tags + from dual union all + select + 'UT3$USER#' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'SOME_DUMMY_TEST_PROCEDURE' item_name, + 'dummy_test' item_description, 'UT_TEST' item_type, 7 item_line_no, + 'dummy_test_package.some_dummy_test_procedure' path, 0 disabled_flag,'testtag1,testtag2' tags from dual; --Act open l_actual for select * from table(ut3.ut_runner.get_suites_info('UT3$USER#','DUMMY_TEST_PACKAGE')); diff --git a/test/ut3_user/api/test_ut_runner.pks b/test/ut3_user/api/test_ut_runner.pks index 70eed747f..2ddeff401 100644 --- a/test/ut3_user/api/test_ut_runner.pks +++ b/test/ut3_user/api/test_ut_runner.pks @@ -41,6 +41,9 @@ create or replace package test_ut_runner is procedure test_purge_cache_schema_type; procedure setup_cache_objects; + procedure setup_cache_objectstag; + procedure setup_cache_twotags; + procedure setup_cache_longtags; --%test(Rebuilds cache for a given schema and object type) --%beforetest(setup_cache_objects) @@ -50,7 +53,27 @@ create or replace package test_ut_runner is --%test(get_suites_info returns a cursor containing records for a newly created test) --%beforetest(setup_cache_objects) --%aftertest(cleanup_cache) - procedure test_get_suites_info; + procedure test_get_suites_info_notag; + + --%test(get_suites_info returns a cursor containing records for a newly created test with tag) + --%beforetest(setup_cache_objectstag) + --%aftertest(cleanup_cache) + procedure test_get_suites_info_tag; + + --%test(get_suites_info returns a cursor containing records for a newly created test with two tags) + --%beforetest(setup_cache_twotags) + --%aftertest(cleanup_cache) + procedure test_get_suites_info_twotag; + + /*** + * This test at the moment is not possible to correctly run due to limit of to_string when + * displaying a diff message returnign max 4k char. + */ + --%test(get_suites_info returns a cursor containing records for a newly created test with long tag) + --%beforetest(setup_cache_longtags) + --%aftertest(cleanup_cache) + --%disabled + procedure test_get_suites_info_longtag; --%test(get_reporters_list returns a cursor containing all built-in reporters and information about output-reporter) --%beforetest(setup_cache_objects) From 957ea8bdf8ae2f9dff452c9a9532494f7e779a32 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sun, 28 Apr 2019 10:46:03 +0100 Subject: [PATCH 0440/1096] Remove a 4k tests --- test/ut3_tester_helper/run_helper.pkb | 30 --------------------------- test/ut3_tester_helper/run_helper.pks | 1 - test/ut3_user/api/test_ut_runner.pkb | 27 ------------------------ test/ut3_user/api/test_ut_runner.pks | 11 ---------- 4 files changed, 69 deletions(-) diff --git a/test/ut3_tester_helper/run_helper.pkb b/test/ut3_tester_helper/run_helper.pkb index 2f4c9a86e..9bc2b7f79 100644 --- a/test/ut3_tester_helper/run_helper.pkb +++ b/test/ut3_tester_helper/run_helper.pkb @@ -85,36 +85,6 @@ create or replace package body run_helper is execute immediate q'[grant execute on ut3_tester_helper.dummy_test_procedure to public]'; end; - procedure setup_cache_longtags is - pragma autonomous_transaction; - begin - execute immediate q'[create or replace package ut3$user#.dummy_test_package as - --%suite(dummy_test_suite) - --%tags(bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb) - --%tags(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) - --%rollback(manual) - - --%test(dummy_test) - --%tags(testtag1,testtag2) - --%beforetest(some_procedure) - procedure some_dummy_test_procedure; - end;]'; - execute immediate q'[create or replace procedure ut3$user#.dummy_test_procedure as - --%some_annotation(some_text) - --%rollback(manual) - begin - null; - end;]'; - execute immediate q'[create or replace procedure ut3_tester_helper.dummy_test_procedure as - --%some_annotation(some_text) - --%rollback(manual) - begin - null; - end;]'; - - execute immediate q'[grant execute on ut3_tester_helper.dummy_test_procedure to public]'; - end; - procedure create_trans_control is pragma autonomous_transaction; begin diff --git a/test/ut3_tester_helper/run_helper.pks b/test/ut3_tester_helper/run_helper.pks index e79549f3e..e06401eae 100644 --- a/test/ut3_tester_helper/run_helper.pks +++ b/test/ut3_tester_helper/run_helper.pks @@ -8,7 +8,6 @@ create or replace package run_helper is procedure setup_cache_objects; procedure setup_cache_objectstag; procedure setup_cache_twotags; - procedure setup_cache_longtags; procedure setup_cache; procedure cleanup_cache; procedure create_db_link; diff --git a/test/ut3_user/api/test_ut_runner.pkb b/test/ut3_user/api/test_ut_runner.pkb index d58f4832d..e282963cb 100644 --- a/test/ut3_user/api/test_ut_runner.pkb +++ b/test/ut3_user/api/test_ut_runner.pkb @@ -15,11 +15,6 @@ create or replace package body test_ut_runner is ut3_tester_helper.run_helper.setup_cache_twotags(); end; - procedure setup_cache_longtags is - begin - ut3_tester_helper.run_helper.setup_cache_longtags(); - end; - procedure setup_cache is begin ut3_tester_helper.run_helper.setup_cache(); @@ -320,28 +315,6 @@ end;'; ut.expect(l_actual).to_equal(l_expected); end; - procedure test_get_suites_info_longtag is - l_expected sys_refcursor; - l_actual sys_refcursor; - begin - --Arrange - open l_expected for - select - 'UT3$USER#' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'DUMMY_TEST_PACKAGE' item_name, - 'dummy_test_suite' item_description, 'UT_SUITE' item_type, 2 item_line_no, - 'dummy_test_package' path, 0 disabled_flag,'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa[...]' tags - from dual union all - select - 'UT3$USER#' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'SOME_DUMMY_TEST_PROCEDURE' item_name, - 'dummy_test' item_description, 'UT_TEST' item_type, 7 item_line_no, - 'dummy_test_package.some_dummy_test_procedure' path, 0 disabled_flag,'testtag1,testtag2' tags - from dual; - --Act - open l_actual for select * from table(ut3.ut_runner.get_suites_info('UT3$USER#','DUMMY_TEST_PACKAGE')); - --Assert - ut.expect(l_actual).to_equal(l_expected); - end; - procedure test_get_reporters_list is l_expected sys_refcursor; l_actual sys_refcursor; diff --git a/test/ut3_user/api/test_ut_runner.pks b/test/ut3_user/api/test_ut_runner.pks index 2ddeff401..967009c61 100644 --- a/test/ut3_user/api/test_ut_runner.pks +++ b/test/ut3_user/api/test_ut_runner.pks @@ -43,7 +43,6 @@ create or replace package test_ut_runner is procedure setup_cache_objects; procedure setup_cache_objectstag; procedure setup_cache_twotags; - procedure setup_cache_longtags; --%test(Rebuilds cache for a given schema and object type) --%beforetest(setup_cache_objects) @@ -65,16 +64,6 @@ create or replace package test_ut_runner is --%aftertest(cleanup_cache) procedure test_get_suites_info_twotag; - /*** - * This test at the moment is not possible to correctly run due to limit of to_string when - * displaying a diff message returnign max 4k char. - */ - --%test(get_suites_info returns a cursor containing records for a newly created test with long tag) - --%beforetest(setup_cache_longtags) - --%aftertest(cleanup_cache) - --%disabled - procedure test_get_suites_info_longtag; - --%test(get_reporters_list returns a cursor containing all built-in reporters and information about output-reporter) --%beforetest(setup_cache_objects) --%aftertest(cleanup_cache) From 2a9155146da957678e3f247ef96d4d44bd5de07f Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sun, 28 Apr 2019 10:48:15 +0100 Subject: [PATCH 0441/1096] Added constant --- source/core/ut_suite_builder.pkb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index 245a49b76..f732bb004 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -16,6 +16,11 @@ create or replace package body ut_suite_builder is limitations under the License. */ + /** + * Regexp to validate tag + */ + gc_word_no_space constant varchar2(50) := '^(\w|\S)+$'; + subtype t_annotation_text is varchar2(4000); subtype t_annotation_name is varchar2(4000); subtype t_object_name is varchar2(500); @@ -329,7 +334,7 @@ create or replace package body ut_suite_builder is ); end if; --remove empty strings from table list e.g. tag1,,tag2 and conver to rows - a_list := ut_utils.convert_collection( ut_utils.filter_list(l_tag_list,'^(\w|\S)+$') ); + a_list := ut_utils.convert_collection( ut_utils.filter_list(l_tag_list,gc_word_no_space) ); l_annotation_pos := a_tags_ann_text.next(l_annotation_pos); end loop; @@ -641,7 +646,7 @@ create or replace package body ut_suite_builder is l_annotation_pos := a_tags_ann_text.next(l_annotation_pos); end loop; --remove empty strings from table list e.g. tag1,,tag2 - a_suite.tags := ut_utils.convert_collection(ut_utils.filter_list(l_tag_list,'^(\w|\S)+$')); + a_suite.tags := ut_utils.convert_collection(ut_utils.filter_list(l_tag_list,gc_word_no_space)); end; procedure add_suite_tests( From 8a7bf6fe620deb7c70ad3c8d473c67024a33b9ff Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sun, 28 Apr 2019 12:47:24 +0000 Subject: [PATCH 0442/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 491892256..36547c793 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index bbd1e1cf3..4ecd8f126 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index d9439e5be..581f85c0f 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index c8d388d30..fbca85f14 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 9c915d543..b98ab6109 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index b55249394..96a97c67b 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index f1a58d7af..25b99e8d4 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index e3ae65485..521cbbe75 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index ee78589c8..4baa52100 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index c1aca8c6a..7709caaf0 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 24d617f5d..750f8aa59 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index d3bfe9d19..ff1b5cbfe 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 571f14d98..a8631cf61 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 56b4d1001..a163dca35 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index b48a170e4..81a1d2346 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index f6ef99991..82c324284 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 5f5339002..13db959fc 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2886--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 392ff96dc..88409bd9e 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -760,7 +760,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.7.2886-develop + * secion v3.1.7.2897-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 7738a9196..730ec140a 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.7.2886-develop'; + gc_version constant varchar2(50) := 'v3.1.7.2897-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From b2fcd953815f0a3da4a5c8c71ee6fc0c8d1eb424 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 28 Apr 2019 14:55:18 +0100 Subject: [PATCH 0443/1096] Added-back rigger installation to CI/CD process. --- .travis/install.sh | 4 +++- .travis/install_utplsql_release.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index 7f7dc2198..04cf72c16 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -10,7 +10,7 @@ set verify off --alter session set plsql_warnings = 'ENABLE:ALL', 'DISABLE:(5004,5018,6000,6001,6003,6009,6010,7206)'; alter session set plsql_optimize_level=0; -@install_headless.sql $UT3_OWNER $UT3_OWNER_PASSWORD +@install_headless_with_trigger.sql $UT3_OWNER $UT3_OWNER_PASSWORD SQL #Run this step only on second child job (12.1 - at it's fastest) @@ -92,5 +92,7 @@ set feedback on --Needed for testing coverage outside of main UT3 schema. grant create any procedure, drop any procedure, execute any procedure, create any type, drop any type, execute any type, under any type, select any table, update any table, insert any table, delete any table, create any table, drop any table, alter any table, select any dictionary, create any synonym, drop any synonym to $UT3_TESTER_HELPER; grant create job to $UT3_TESTER_HELPER; +--Needed to allow for enable/disable of annotation triggers +grant administer database trigger to $UT3_TESTER_HELPER; exit SQL diff --git a/.travis/install_utplsql_release.sh b/.travis/install_utplsql_release.sh index 889e098da..339c23c6e 100755 --- a/.travis/install_utplsql_release.sh +++ b/.travis/install_utplsql_release.sh @@ -38,7 +38,7 @@ SQL "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA < Date: Sun, 28 Apr 2019 15:31:57 +0100 Subject: [PATCH 0444/1096] Moved test to new package structure and improved test details. --- .../expectations/test_expectations_cursor.pkb | 41 ++++++++++++++++++- .../expectations/test_expectations_cursor.pks | 15 ++++++- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index e1000457d..9b0668287 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -2788,6 +2788,45 @@ Check the query and data for errors.'; ut3.ut.expect(l_actual).to_equal(l_expected); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; - + + procedure compare_number_pckg_type + as + l_expected sys_refcursor; + l_actual sys_refcursor; + l_expected_data t_num_tab; + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + + l_expected_data(1).col1 := 2135; + l_expected_data(1).col4 := 2016; + l_expected_data(1).col5 := -1; + + open l_expected for + select * + from table (l_expected_data); + + open l_actual for + select + 1 as col1 + ,2 as col2 + ,3 as col3 + ,2016 as col4 + ,-1 as col5 + from dual; + + ut3.ut.expect(l_actual).to_equal(a_expected => l_expected); + + l_expected_message := q'[%Actual: refcursor [ count = 1 ] was expected to equal: refcursor [ count = 1 ] +%Diff: +%Rows: [ 1 differences ] +%Row No. 1 - Actual: 123 +%Row No. 1 - Expected: 2135%]'; + + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + end; / diff --git a/test/ut3_user/expectations/test_expectations_cursor.pks b/test/ut3_user/expectations/test_expectations_cursor.pks index 15a0d98ea..222717c07 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pks +++ b/test/ut3_user/expectations/test_expectations_cursor.pks @@ -445,6 +445,19 @@ create or replace package test_expectations_cursor is --%test(Check precision of number from dual #907) procedure number_from_dual; - + + --%test( Comparing number types with different precisions works with package-type nested tables ) + procedure compare_number_pckg_type; + + type t_num_rec is record ( + col1 number(15,0), + col2 number(1,0), + col3 number(4,0), + col4 number(4,0), + col5 number(38,0)); + + + type t_num_tab is table of t_num_rec index by binary_integer; + end; / From 63bc825160c7fc609a515beaa0caf4d71eb41104 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 28 Apr 2019 15:43:28 +0100 Subject: [PATCH 0445/1096] Fixed test to run only on 12 and above. --- test/ut3_user/expectations/test_expectations_cursor.pkb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index 9b0668287..a6e87a892 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -2802,6 +2802,8 @@ Check the query and data for errors.'; l_expected_data(1).col4 := 2016; l_expected_data(1).col5 := -1; + --Select on package level nested table types supported only since Oracle 12 + $if dbms_db_version.version >= 12 $then open l_expected for select * from table (l_expected_data); @@ -2826,6 +2828,7 @@ Check the query and data for errors.'; l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); ut.expect(l_actual_message).to_be_like(l_expected_message); + $end end; end; From aaf73c7b1d7a1c733f31de7209a062ed4633b6e3 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sun, 28 Apr 2019 15:19:02 +0000 Subject: [PATCH 0446/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 36547c793..be39b208a 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 4ecd8f126..451fe512f 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 581f85c0f..38df1fcd1 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index fbca85f14..441b1d8ab 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index b98ab6109..9875ef64e 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 96a97c67b..df0c392f1 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 25b99e8d4..9ec377237 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 521cbbe75..dcf74b8e6 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 4baa52100..aa1bbbb77 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 7709caaf0..bf9ae74ce 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 750f8aa59..51ea26ca7 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index ff1b5cbfe..3da8dee25 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index a8631cf61..416ee5116 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index a163dca35..39dfabceb 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 81a1d2346..bda4a3583 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 82c324284..df11ae6de 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 13db959fc..962e57f96 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2897--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 88409bd9e..9cd49c4a0 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -760,7 +760,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.7.2897-develop + * secion v3.1.7.2904-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 730ec140a..94b9f3f68 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.7.2897-develop'; + gc_version constant varchar2(50) := 'v3.1.7.2904-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 00fe13e141730e437cf00bc1bd01beb3c744c1da Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 28 Apr 2019 21:27:46 +0100 Subject: [PATCH 0447/1096] Removed garbage after PR merge. --- test/core/expectations/compound_data/test_expectations_cursor.pkb | 0 test/core/expectations/compound_data/test_expectations_cursor.pks | 0 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 test/core/expectations/compound_data/test_expectations_cursor.pkb delete mode 100644 test/core/expectations/compound_data/test_expectations_cursor.pks diff --git a/test/core/expectations/compound_data/test_expectations_cursor.pkb b/test/core/expectations/compound_data/test_expectations_cursor.pkb deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/core/expectations/compound_data/test_expectations_cursor.pks b/test/core/expectations/compound_data/test_expectations_cursor.pks deleted file mode 100644 index e69de29bb..000000000 From d00a0f783a005e5e7bb3d8dec638e5fac35c54ee Mon Sep 17 00:00:00 2001 From: lwasylow Date: Mon, 29 Apr 2019 07:25:31 +0100 Subject: [PATCH 0448/1096] Updates to PR. Switch to common add tags to suite item --- docs/userguide/annotations.md | 28 +++++------ source/api/ut_runner.pkb | 2 +- source/core/ut_suite_builder.pkb | 51 ++++----------------- source/core/ut_suite_manager.pkb | 41 ++++------------- source/core/ut_utils.pks | 5 ++ test/ut3_tester/core/test_suite_builder.pkb | 2 +- test/ut3_user/api/test_ut_run.pkb | 22 ++------- test/ut3_user/api/test_ut_run.pks | 3 -- test/ut3_user/api/test_ut_runner.pkb | 1 - 9 files changed, 42 insertions(+), 113 deletions(-) diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 296616f28..51bfa7abf 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1250,40 +1250,40 @@ When a suite gets tagged all of its children will automatically inherit a tag an Sample tag package. ```sql -create or replace PACKAGE ut_sample_test IS +create or replace package ut_sample_test IS --%suite(Sample Test Suite) --%tag(suite1) --%test(Compare Ref Cursors) --%tag(test1,sample) - PROCEDURE ut_refcursors1; + procedure ut_refcursors1; --%test(Run equality test) --%tag(test2,sample) - PROCEDURE ut_test; + procedure ut_test; -END ut_sample_test; +end ut_sample_test; / -create or replace PACKAGE BODY ut_sample_test IS +create or replace package body ut_sample_test is - PROCEDURE ut_refcursors1 IS - v_actual SYS_REFCURSOR; - v_expected SYS_REFCURSOR; - BEGIN + procedure ut_refcursors1 is + v_actual sys_refcursor; + v_expected sys_refcursor; + begin open v_expected for select 1 as test from dual; open v_actual for select 2 as test from dual; ut.expect(v_actual).to_equal(v_expected); - END; + end; - PROCEDURE ut_test IS - BEGIN + procedure ut_test is + begin ut.expect(1).to_equal(0); - END; + end; -END ut_sample_test; +end ut_sample_test; / ``` diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index 5a9cc856a..d57b86edd 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -143,7 +143,7 @@ create or replace package body ut_runner is if a_tags is not null then l_tags := l_tags multiset union distinct ut_utils.convert_collection( - ut_utils.filter_list(ut_utils.string_to_table(a_tags,','),'^(\w|\S)+$') + ut_utils.trim_list_elements(ut_utils.filter_list(ut_utils.string_to_table(a_tags,','),ut_utils.gc_word_no_space)) ); end if; l_exclude_object_names := l_exclude_object_names multiset union all ut_suite_manager.get_schema_ut_packages(l_coverage_schema_names); diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index f732bb004..eab4d48b1 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -15,11 +15,6 @@ create or replace package body ut_suite_builder is See the License for the specific language governing permissions and limitations under the License. */ - - /** - * Regexp to validate tag - */ - gc_word_no_space constant varchar2(50) := '^(\w|\S)+$'; subtype t_annotation_text is varchar2(4000); subtype t_annotation_name is varchar2(4000); @@ -311,13 +306,13 @@ create or replace package body ut_suite_builder is l_annotation_pos := a_throws_ann_text.next(l_annotation_pos); end loop; end; - - procedure add_tags_to_test( + + procedure add_tags_to_suite_item( a_suite in out nocopy ut_suite, + a_tags_ann_text tt_annotation_texts, a_list in out nocopy ut_varchar2_rows, - a_procedure_name t_object_name, - a_tags_ann_text tt_annotation_texts - ) is + a_procedure_name t_object_name := null + ) is l_annotation_pos binary_integer; l_tag_list ut_varchar2_list := ut_varchar2_list(); begin @@ -333,14 +328,12 @@ create or replace package body ut_suite_builder is ut_utils.string_to_table(a_tags_ann_text(l_annotation_pos),',') ); end if; - --remove empty strings from table list e.g. tag1,,tag2 and conver to rows - a_list := ut_utils.convert_collection( ut_utils.filter_list(l_tag_list,gc_word_no_space) ); l_annotation_pos := a_tags_ann_text.next(l_annotation_pos); end loop; - + --remove empty strings from table list e.g. tag1,,tag2 and conver to rows + a_list := ut_utils.convert_collection( ut_utils.filter_list(l_tag_list,ut_utils.gc_word_no_space) ); end; - - + procedure set_seq_no( a_list in out nocopy ut_executables ) is @@ -521,7 +514,7 @@ create or replace package body ut_suite_builder is end if; if l_proc_annotations.exists( gc_tag) then - add_tags_to_test(a_suite, l_test.tags, a_procedure_name, l_proc_annotations( gc_tag)); + add_tags_to_suite_item(a_suite, l_proc_annotations( gc_tag), l_test.tags, a_procedure_name); end if; if l_proc_annotations.exists( gc_throws) then @@ -625,30 +618,6 @@ create or replace package body ut_suite_builder is a_suite.path := lower(coalesce(a_suite.path, a_suite.object_name)); end; - procedure add_tags_to_suite( - a_suite in out nocopy ut_suite, - a_tags_ann_text tt_annotation_texts - ) is - l_annotation_pos binary_integer; - l_tag_list ut_varchar2_list := ut_varchar2_list(); - begin - l_annotation_pos := a_tags_ann_text.first; - while l_annotation_pos is not null loop - if a_tags_ann_text(l_annotation_pos) is null then - a_suite.put_warning( - '"--%tags" annotation requires a tag value populated. Annotation ignored, line ' || l_annotation_pos - ); - else - l_tag_list := l_tag_list multiset union distinct ut_utils.trim_list_elements( - ut_utils.string_to_table(a_tags_ann_text(l_annotation_pos),',') - ); - end if; - l_annotation_pos := a_tags_ann_text.next(l_annotation_pos); - end loop; - --remove empty strings from table list e.g. tag1,,tag2 - a_suite.tags := ut_utils.convert_collection(ut_utils.filter_list(l_tag_list,gc_word_no_space)); - end; - procedure add_suite_tests( a_suite in out nocopy ut_suite, a_annotations t_annotations_info, @@ -699,7 +668,7 @@ create or replace package body ut_suite_builder is end if; if a_annotations.by_name.exists(gc_tag) then - add_tags_to_suite(a_suite, a_annotations.by_name(gc_tag)); + add_tags_to_suite_item(a_suite, a_annotations.by_name(gc_tag),a_suite.tags); end if; a_suite.disabled_flag := ut_utils.boolean_to_int(a_annotations.by_name.exists(gc_disabled)); diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 3e41ab58b..edbce7d5b 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -17,7 +17,7 @@ create or replace package body ut_suite_manager is */ gc_suitpath_error_message constant varchar2(100) := 'Suitepath exceeds 1000 CHAR on: '; - gc_tag_errmsg constant number := 450; + gc_tag_errmsg constant integer := 450; type t_path_item is record ( object_name varchar2(250), @@ -687,35 +687,6 @@ create or replace package body ut_suite_manager is return l_suites; end; - function build_no_test_error_msg( - a_schema_name in varchar2, - a_suite_path in varchar2, - a_procedure_name in varchar2, - a_object_name in varchar2, - a_tags in ut_varchar2_rows := ut_varchar2_rows() - ) return varchar2 is - l_error_msg varchar2(500); - l_tags clob:= ut_utils.table_to_clob(coalesce(a_tags,ut_varchar2_rows()),','); - begin - if a_suite_path is not null then - l_error_msg := 'No suite packages found for path '||a_schema_name||':'||a_suite_path; - elsif a_procedure_name is not null then - l_error_msg := 'Suite test '||a_schema_name||'.'||a_object_name|| '.'||a_procedure_name||' does not exists'; - elsif a_object_name is not null then - l_error_msg := 'Suite package '||a_schema_name||'.'||a_object_name|| ' does not exists'; - end if; - - if l_error_msg is null and a_tags.count > 0 then - l_error_msg := 'No tests found for tags: '||ut_utils.to_string(l_tags,a_max_output_len => gc_tag_errmsg); - elsif l_error_msg is not null and a_tags.count > 0 then - l_error_msg := l_error_msg||' with tags: '||ut_utils.to_string(l_tags,a_max_output_len => gc_tag_errmsg); - end if; - - l_error_msg := l_error_msg ||'.'; - - return l_error_msg; - end; - procedure configure_execution_by_path( a_paths in ut_varchar2_list, a_suites out nocopy ut_suite_items, @@ -751,9 +722,13 @@ create or replace package body ut_suite_manager is a_tags ); if a_suites.count = l_suites_count then - raise_application_error(ut_utils.gc_suite_package_not_found,build_no_test_error_msg( - l_schema,l_path_item.suite_path,l_path_item.procedure_name, - l_path_item.object_name,a_tags)); + if l_path_item.suite_path is not null then + raise_application_error(ut_utils.gc_suite_package_not_found,'No suite packages found for path '||l_schema||':'||l_path_item.suite_path|| '.'); + elsif l_path_item.procedure_name is not null then + raise_application_error(ut_utils.gc_suite_package_not_found,'Suite test '||l_schema||'.'||l_path_item.object_name|| '.'||l_path_item.procedure_name||' does not exist'); + elsif l_path_item.object_name is not null then + raise_application_error(ut_utils.gc_suite_package_not_found,'Suite package '||l_schema||'.'||l_path_item.object_name|| ' does not exist'); + end if; end if; l_index := a_suites.first; l_suites_count := a_suites.count; diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index dfef91489..69a8824d4 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -131,6 +131,11 @@ create or replace package ut_utils authid definer is gc_bc_fetch_limit constant integer := 1000; gc_diff_max_rows constant integer := 20; + /** + * Regexp to validate tag + */ + gc_word_no_space constant varchar2(50) := '^(\w|\S)+$'; + type t_version is record( major natural, minor natural, diff --git a/test/ut3_tester/core/test_suite_builder.pkb b/test/ut3_tester/core/test_suite_builder.pkb index 3bebb500e..523d31a3d 100644 --- a/test/ut3_tester/core/test_suite_builder.pkb +++ b/test/ut3_tester/core/test_suite_builder.pkb @@ -1296,7 +1296,7 @@ create or replace package body test_suite_builder is l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); --Assert ut.expect(l_actual).to_be_like( - '%"--%tags" annotation requires a tag value populated. Annotation ignored, line 3%'|| + '%"--%tags" annotation requires a tag value populated. Annotation ignored.%%'|| '%%' ); diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index 60c9a7dc8..857492f58 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -875,14 +875,11 @@ Failures:% l_results clob; l_exp_message varchar2(4000); begin - l_exp_message :=q'[ORA-20204: No tests found for tags: 'nonexisting'.]'; ut3_tester_helper.run_helper.run(a_tags => 'nonexisting'); l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); - ut.fail('Expecte test to fail'); - --Assert - exception - when others then - ut.expect( sqlerrm ).to_be_like( l_exp_message ); + ut.expect( l_results ).not_to_be_like( '%test_package_1%' ); + ut.expect( l_results ).not_to_be_like( '%test_package_2%' ); + ut.expect( l_results ).not_to_be_like( '%test_package_3%' ); end; procedure test_duplicate_tag is @@ -906,19 +903,6 @@ Failures:% ut.expect( l_results ).to_be_like( '%test_package_2%' ); ut.expect( l_results ).not_to_be_like( '%test_package_3%' ); end; - - procedure run_proc_pkg_name_no_tag is - l_results clob; - l_exp_message varchar2(4000); - begin - l_exp_message :=q'[ORA-20204: Suite package ut3_tester_helper.test_package_1 does not exists with tags: 'nonexists'.]'; - ut3.ut.run('ut3_tester_helper.test_package_1',a_tags => 'nonexists'); - l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); - ut.fail('Expecte test to fail'); - exception - when others then - ut.expect( sqlerrm ).to_be_like( l_exp_message ); - end; procedure run_proc_pkg_name_tag is l_results clob; diff --git a/test/ut3_user/api/test_ut_run.pks b/test/ut3_user/api/test_ut_run.pks index fcb62e207..4616763d0 100644 --- a/test/ut3_user/api/test_ut_run.pks +++ b/test/ut3_user/api/test_ut_run.pks @@ -198,9 +198,6 @@ create or replace package test_ut_run is --%test(Execute suite test for duplicate list tags) procedure suite_duplicate_tag; - --%test(Run a package by name with non existing tag) - procedure run_proc_pkg_name_no_tag; - --%test(Runs given package only with package name given as path and filter by tag) procedure run_proc_pkg_name_tag; diff --git a/test/ut3_user/api/test_ut_runner.pkb b/test/ut3_user/api/test_ut_runner.pkb index e282963cb..3ff0a4850 100644 --- a/test/ut3_user/api/test_ut_runner.pkb +++ b/test/ut3_user/api/test_ut_runner.pkb @@ -270,7 +270,6 @@ end;'; ut.expect(l_actual).to_equal(l_expected); end; - --TODO : Apostro????? procedure test_get_suites_info_tag is l_expected sys_refcursor; l_actual sys_refcursor; From 31643107b21f13da0896ec60f4ce7337772485ad Mon Sep 17 00:00:00 2001 From: lwasylow Date: Mon, 29 Apr 2019 13:34:08 +0100 Subject: [PATCH 0449/1096] Move query to template to simplify view --- source/core/ut_suite_manager.pkb | 252 ++++++++++++++++++------------- 1 file changed, 146 insertions(+), 106 deletions(-) diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index edbce7d5b..554085277 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -19,6 +19,70 @@ create or replace package body ut_suite_manager is gc_suitpath_error_message constant varchar2(100) := 'Suitepath exceeds 1000 CHAR on: '; gc_tag_errmsg constant integer := 450; + gc_get_cache_suite_sql constant varchar2(32767) := + q'[with + suite_items as ( + select /*+ cardinality(c 100) */ c.* + from {:owner:}.ut_suite_cache c + where 1 = 1 {:object_list:} + and c.object_owner = '{:object_owner:}' + and ( {:path:} + and {:object_name:} + and {:procedure_name:} + ) + ) + ), + {:tags:}, + suitepaths as ( + select distinct substr(path,1,instr(path,'.',-1)-1) as suitepath, + path, + object_owner + from {:suite_item_name:} + where self_type = 'UT_SUITE' + ), + gen as ( + select rownum as pos + from xmltable('1 to 20') + ), + suitepath_part AS ( + select distinct + substr(b.suitepath, 1, instr(b.suitepath || '.', '.', 1, g.pos) -1) as path, + object_owner + from suitepaths b + join gen g + on g.pos <= regexp_count(b.suitepath, '\w+') + ), + logical_suite_data as ( + select 'UT_LOGICAL_SUITE' as self_type, p.path, p.object_owner, + upper( substr(p.path, instr( p.path, '.', -1 ) + 1 ) ) as object_name, + cast(null as {:owner:}.ut_executables) as x, + cast(null as {:owner:}.ut_integer_list) as y, + cast(null as {:owner:}.ut_executable_test) as z + from suitepath_part p + where p.path + not in (select s.path from suitepaths s) + ), + logical_suites as ( + select to_number(null) as id, s.self_type, s.path, s.object_owner, s.object_name, + s.object_name as name, null as line_no, null as parse_time, + null as description, null as rollback_type, 0 as disabled_flag, + {:owner:}.ut_varchar2_rows() as warnings, + s.x as before_all_list, s.x as after_all_list, + s.x as before_each_list, s.x as before_test_list, + s.x as after_each_list, s.x as after_test_list, + s.y as expected_error_codes, null as test_tags, + s.z as item + from logical_suite_data s + ), + items as ( + select * from {:suite_item_name:} + union all + select * from logical_suites + ) + select c.* + from items c + order by c.object_owner,{:random_seed:}]'; + type t_path_item is record ( object_name varchar2(250), procedure_name varchar2(250), @@ -330,7 +394,7 @@ create or replace package body ut_suite_manager is end loop; close a_suite_data_cursor; end reconstruct_from_cache; - + function get_missing_objects(a_object_owner varchar2) return ut_varchar2_rows is l_rows sys_refcursor; l_ut_owner varchar2(250) := ut_utils.ut_owner; @@ -356,66 +420,46 @@ create or replace package body ut_suite_manager is return l_result; end; - function get_cached_suite_data( - a_object_owner varchar2, - a_path varchar2 := null, - a_object_name varchar2 := null, - a_procedure_name varchar2 := null, - a_skip_all_objects boolean := false, - a_random_seed positive, - a_tags ut_varchar2_rows := null - ) return t_cached_suites_cursor is - l_path varchar2( 4000 ); - l_result sys_refcursor; - l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_sql varchar2(32767); - l_suite_item_name varchar2(20); - l_tags ut_varchar2_rows := coalesce(a_tags,ut_varchar2_rows()); + function get_object_names_sql(a_skip_all_objects boolean ) return varchar2 is begin - if a_path is null and a_object_name is not null then - execute immediate 'select min(path) - from '||l_ut_owner||q'[.ut_suite_cache - where object_owner = :a_object_owner - and object_name = :a_object_name - and name = nvl(:a_procedure_name, name)]' - into l_path using upper(a_object_owner), upper(a_object_name), upper(a_procedure_name); - else - l_path := lower( a_path ); - end if; - l_suite_item_name := case when l_tags.count > 0 then 'suite_items_tags' else 'suite_items' end; - - l_sql := - q'[with - suite_items as ( - select /*+ cardinality(c 100) */ c.* - from ]'||l_ut_owner||q'[.ut_suite_cache c - where 1 = 1 ]'||case when not a_skip_all_objects then q'[ + return case when not a_skip_all_objects then q'[ and exists ( select 1 from all_objects a where a.object_name = c.object_name - and a.owner = ']'||upper(a_object_owner)||q'[' + and a.owner = '{:object_owner:}' and a.owner = c.object_owner and a.object_type = 'PACKAGE' - )]' end ||q'[ - and c.object_owner = ']'||upper(a_object_owner)||q'[' - and ( ]' || case when l_path is not null then q'[ + )]' else null end; + end; + + function get_path_sql(a_path in varchar2) return varchar2 is + begin + return case when a_path is not null then q'[ :l_path||'.' like c.path || '.%' /*all children and self*/ or ( c.path||'.' like :l_path || '.%' --all parents ]' - else ' :l_path is null and ( :l_path is null ' end - || case when a_object_name is not null - then 'and c.object_name = :a_object_name ' - else 'and :a_object_name is null' end ||' - '|| case when a_procedure_name is not null - then 'and c.name = :a_procedure_name' - else 'and :a_procedure_name is null' end ||q'[ - ) - ) - ),]' - ||case when l_tags.count > 0 then - q'[ - filter_tags as ( + else ' :l_path is null and ( :l_path is null ' end; + end; + + function get_object_name_sql(a_object_name in varchar2) return varchar2 is + begin + return case when a_object_name is not null + then ' c.object_name = :a_object_name ' + else ' :a_object_name is null' end; + end; + + function get_procedure_name_sql(a_procedure_name in varchar2) return varchar2 is + begin + return case when a_procedure_name is not null + then ' c.name = :a_procedure_name' + else ' :a_procedure_name is null' end; + end; + + function get_tags_sql(a_tags_count in integer) return varchar2 is + begin + return case when a_tags_count > 0 then + q'[filter_tags as ( select c.* from suite_items c where c.tags multiset intersect :a_tag_list is not empty @@ -426,60 +470,15 @@ create or replace package body ut_suite_manager is t.path||'.' like c.path || '.%' /*all children and self*/ or c.path||'.' like t.path || '.%' --all parents ) - ),]' + )]' else - q'[dummy as (select 'x' from dual where :a_tag_list is null ),]' - end|| - q'[ suitepaths as ( - select distinct substr(path,1,instr(path,'.',-1)-1) as suitepath, - path, - object_owner - from ]'||l_suite_item_name||q'[ - where self_type = 'UT_SUITE' - ), - gen as ( - select rownum as pos - from xmltable('1 to 20') - ), - suitepath_part AS ( - select distinct - substr(b.suitepath, 1, instr(b.suitepath || '.', '.', 1, g.pos) -1) as path, - object_owner - from suitepaths b - join gen g - on g.pos <= regexp_count(b.suitepath, '\w+') - ), - logical_suite_data as ( - select 'UT_LOGICAL_SUITE' as self_type, p.path, p.object_owner, - upper( substr(p.path, instr( p.path, '.', -1 ) + 1 ) ) as object_name, - cast(null as ]'||l_ut_owner||q'[.ut_executables) as x, - cast(null as ]'||l_ut_owner||q'[.ut_integer_list) as y, - cast(null as ]'||l_ut_owner||q'[.ut_executable_test) as z - from suitepath_part p - where p.path - not in (select s.path from suitepaths s) - ), - logical_suites as ( - select to_number(null) as id, s.self_type, s.path, s.object_owner, s.object_name, - s.object_name as name, null as line_no, null as parse_time, - null as description, null as rollback_type, 0 as disabled_flag, - ]'||l_ut_owner||q'[.ut_varchar2_rows() as warnings, - s.x as before_all_list, s.x as after_all_list, - s.x as before_each_list, s.x as before_test_list, - s.x as after_each_list, s.x as after_test_list, - s.y as expected_error_codes, null as test_tags, - s.z as item - from logical_suite_data s - ), - items as ( - select * from ]'||l_suite_item_name||q'[ - union all - select * from logical_suites - ) - select c.* - from items c - order by c.object_owner,]'|| - case + q'[dummy as (select 'x' from dual where :a_tag_list is null )]' + end; + end; + + function get_random_seed_sql(a_random_seed positive) return varchar2 is + begin + return case when a_random_seed is null then q'[ replace( case @@ -492,10 +491,51 @@ create or replace package body ut_suite_manager is c.line_no, :a_random_seed]' else - l_ut_owner||'.ut_annotation_manager.hash_suite_path( + ' {:owner:}.ut_annotation_manager.hash_suite_path( c.path, :a_random_seed ) desc nulls last' - end; + end; + end; + + function get_cached_suite_data( + a_object_owner varchar2, + a_path varchar2 := null, + a_object_name varchar2 := null, + a_procedure_name varchar2 := null, + a_skip_all_objects boolean := false, + a_random_seed positive, + a_tags ut_varchar2_rows := null + ) return t_cached_suites_cursor is + l_path varchar2( 4000 ); + l_result sys_refcursor; + l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_sql varchar2(32767); + l_suite_item_name varchar2(20); + l_tags ut_varchar2_rows := coalesce(a_tags,ut_varchar2_rows()); + begin + if a_path is null and a_object_name is not null then + execute immediate 'select min(path) + from '||l_ut_owner||q'[.ut_suite_cache + where object_owner = :a_object_owner + and object_name = :a_object_name + and name = nvl(:a_procedure_name, name)]' + into l_path using upper(a_object_owner), upper(a_object_name), upper(a_procedure_name); + else + l_path := lower( a_path ); + end if; + l_suite_item_name := case when l_tags.count > 0 then 'suite_items_tags' else 'suite_items' end; + + l_sql := gc_get_cache_suite_sql; + l_sql := replace(l_sql,'{:suite_item_name:}',l_suite_item_name); + l_sql := replace(l_sql,'{:object_list:}',get_object_names_sql(a_skip_all_objects)); + l_sql := replace(l_sql,'{:object_owner:}',upper(a_object_owner)); + l_sql := replace(l_sql,'{:path:}',get_path_sql(l_path)); + l_sql := replace(l_sql,'{:object_name:}',get_object_name_sql(a_object_name)); + l_sql := replace(l_sql,'{:procedure_name:}',get_procedure_name_sql(a_procedure_name)); + l_sql := replace(l_sql,'{:tags:}',get_tags_sql(l_tags.count)); + l_sql := replace(l_sql,'{:random_seed:}',get_random_seed_sql(a_random_seed)); + l_sql := replace(l_sql,'{:owner:}',l_ut_owner); + open l_result for l_sql using l_path, l_path, upper(a_object_name), upper(a_procedure_name), l_tags, a_random_seed; return l_result; end; From 541809e1e8bc777d53f8f6da5ec326c2c9c28150 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 30 Apr 2019 07:28:08 +0000 Subject: [PATCH 0450/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index be39b208a..238d6e107 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 451fe512f..d7f008926 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 38df1fcd1..e8c5429a1 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 441b1d8ab..2a2b7500f 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 9875ef64e..e1e26d917 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index df0c392f1..5e2344ff6 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 9ec377237..80ca1e4ce 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index dcf74b8e6..a8e636e68 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index aa1bbbb77..f0aaa734e 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index bf9ae74ce..653328d7a 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 51ea26ca7..dd8cfdc5f 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 3da8dee25..abfa1162e 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 416ee5116..566d1486a 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 39dfabceb..d84815235 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index bda4a3583..f969cb360 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index df11ae6de..87fd799d8 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 962e57f96..80d837720 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2904--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 9cd49c4a0..6cf4299ec 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -760,7 +760,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.7.2904-develop + * secion v3.1.7.2905-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 94b9f3f68..a132fb9fc 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.7.2904-develop'; + gc_version constant varchar2(50) := 'v3.1.7.2905-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 8ceb774121d5e69eab9b31c4b6dd7a22f45aed2d Mon Sep 17 00:00:00 2001 From: lwasylow Date: Wed, 8 May 2019 13:43:12 +0100 Subject: [PATCH 0451/1096] Fix to issue when column was removed from the middle of cursor using a exclude or include. this left a gap in orders and cause an columns mismatch on position for remainder of columns. --- .../data_values/ut_cursor_details.tpb | 18 ++++++++++++++++++ .../expectations/test_expectations_cursor.pkb | 11 +++++++++++ .../expectations/test_expectations_cursor.pks | 3 +++ 3 files changed, 32 insertions(+) diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb index 9f1f08d67..d7141cbcb 100644 --- a/source/expectations/data_values/ut_cursor_details.tpb +++ b/source/expectations/data_values/ut_cursor_details.tpb @@ -160,6 +160,8 @@ create or replace type body ut_cursor_details as member procedure filter_columns(self in out nocopy ut_cursor_details, a_match_options ut_matcher_options) is l_result ut_cursor_details := self; + l_column_tab ut_cursor_column_tab := ut_cursor_column_tab(); + l_column ut_cursor_column; c_xpath_extract_reg constant varchar2(50) := '^((/ROW/)|^(//)|^(/\*/))?(.*)'; begin if l_result.cursor_columns_info is not null then @@ -194,6 +196,22 @@ create or replace type body ut_cursor_details as select 1 from excluded_columns f where regexp_like( '/'||x.access_path, '^/?'||f.col_names||'($|/.*)' ) ); end if; + + --Rewrite column order after columns been excluded + for i in ( + select parent_name, access_path, display_path, has_nested_col, + transformed_name, hierarchy_level, + row_number() over (partition by parent_name,transformed_name order by column_position) as new_position, xml_valid_name, + column_name, column_type, column_type_name, column_schema, + column_len, column_precision ,column_scale ,is_sql_diffable, is_collection,value(x) col_info + from table(l_result.cursor_columns_info) x) loop + l_column := i.col_info; + l_column.column_position := i.new_position; + l_column_tab.extend; + l_column_tab(l_column_tab.last) := l_column; + end loop; + + l_result.cursor_columns_info := l_column_tab; self := l_result; end if; end; diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index a6e87a892..87db24dff 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -2831,5 +2831,16 @@ Check the query and data for errors.'; $end end; + procedure uc_columns_exclude is + v_actual SYS_REFCURSOR; + v_expected SYS_REFCURSOR; + begin + open v_expected for + select to_Char(null) id, 'ok' name from dual; + open v_actual for + select 'ok' name, to_number(null) id from dual; + + ut3.ut.expect(v_actual).to_equal(v_expected).exclude('ID'); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; / diff --git a/test/ut3_user/expectations/test_expectations_cursor.pks b/test/ut3_user/expectations/test_expectations_cursor.pks index 222717c07..483968301 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pks +++ b/test/ut3_user/expectations/test_expectations_cursor.pks @@ -459,5 +459,8 @@ create or replace package test_expectations_cursor is type t_num_tab is table of t_num_rec index by binary_integer; + --%test( Mixed column order exclusion ) + procedure uc_columns_exclude; + end; / From f248f8807c0775fa5e8fcd076809d333927adfd3 Mon Sep 17 00:00:00 2001 From: LUKASZ104 Date: Wed, 8 May 2019 13:54:50 +0100 Subject: [PATCH 0452/1096] Fix typo --- test/ut3_user/expectations/test_expectations_cursor.pkb | 1 + 1 file changed, 1 insertion(+) diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index 87db24dff..daa3389bc 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -2842,5 +2842,6 @@ Check the query and data for errors.'; ut3.ut.expect(v_actual).to_equal(v_expected).exclude('ID'); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; end; / From 367958dbd703598e2cb5d8ff370e23b9e4d7c223 Mon Sep 17 00:00:00 2001 From: LUKASZ104 Date: Wed, 8 May 2019 15:06:50 +0100 Subject: [PATCH 0453/1096] Make sure that order of the columns is kept when rewriting an order and nothing was removed. --- source/expectations/data_values/ut_cursor_details.tpb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb index d7141cbcb..a5a7e7699 100644 --- a/source/expectations/data_values/ut_cursor_details.tpb +++ b/source/expectations/data_values/ut_cursor_details.tpb @@ -204,7 +204,9 @@ create or replace type body ut_cursor_details as row_number() over (partition by parent_name,transformed_name order by column_position) as new_position, xml_valid_name, column_name, column_type, column_type_name, column_schema, column_len, column_precision ,column_scale ,is_sql_diffable, is_collection,value(x) col_info - from table(l_result.cursor_columns_info) x) loop + from table(l_result.cursor_columns_info) x + order by x.column_position asc + ) loop l_column := i.col_info; l_column.column_position := i.new_position; l_column_tab.extend; From 525da0238d616a80c5043825bfa1a1e233742ee3 Mon Sep 17 00:00:00 2001 From: LUKASZ104 Date: Wed, 8 May 2019 15:08:04 +0100 Subject: [PATCH 0454/1096] Partition should not be across column name but a full table set. --- source/expectations/data_values/ut_cursor_details.tpb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb index a5a7e7699..021a374f9 100644 --- a/source/expectations/data_values/ut_cursor_details.tpb +++ b/source/expectations/data_values/ut_cursor_details.tpb @@ -201,7 +201,7 @@ create or replace type body ut_cursor_details as for i in ( select parent_name, access_path, display_path, has_nested_col, transformed_name, hierarchy_level, - row_number() over (partition by parent_name,transformed_name order by column_position) as new_position, xml_valid_name, + row_number() over (order by column_position) as new_position, xml_valid_name, column_name, column_type, column_type_name, column_schema, column_len, column_precision ,column_scale ,is_sql_diffable, is_collection,value(x) col_info from table(l_result.cursor_columns_info) x From e08821164a4b235bd3ab4da2723f45b6cd3d2c93 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Wed, 8 May 2019 17:07:50 +0100 Subject: [PATCH 0455/1096] Removal of row_number as its excessive we dont partition by any --- source/expectations/data_values/ut_cursor_details.tpb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb index 021a374f9..e6e24eea2 100644 --- a/source/expectations/data_values/ut_cursor_details.tpb +++ b/source/expectations/data_values/ut_cursor_details.tpb @@ -201,7 +201,7 @@ create or replace type body ut_cursor_details as for i in ( select parent_name, access_path, display_path, has_nested_col, transformed_name, hierarchy_level, - row_number() over (order by column_position) as new_position, xml_valid_name, + rownum as new_position, xml_valid_name, column_name, column_type, column_type_name, column_schema, column_len, column_precision ,column_scale ,is_sql_diffable, is_collection,value(x) col_info from table(l_result.cursor_columns_info) x From f76670f6f5aee9672f4e44de65849bb04df0a3c5 Mon Sep 17 00:00:00 2001 From: Pazus Date: Fri, 10 May 2019 10:11:17 +0300 Subject: [PATCH 0456/1096] fix message_id increment --- test/ut3_tester/core/test_output_buffer.pkb | 18 ++++++++++++++++++ test/ut3_tester/core/test_output_buffer.pks | 3 +++ 2 files changed, 21 insertions(+) diff --git a/test/ut3_tester/core/test_output_buffer.pkb b/test/ut3_tester/core/test_output_buffer.pkb index d8157a687..f3a5a337f 100644 --- a/test/ut3_tester/core/test_output_buffer.pkb +++ b/test/ut3_tester/core/test_output_buffer.pkb @@ -46,6 +46,24 @@ create or replace package body test_output_buffer is ut.expect(l_cur).to_be_empty; end; + + procedure test_doesnt_send_multiline_on_null_text is + l_cur sys_refcursor; + l_result integer; + l_buffer ut3.ut_output_buffer_base := ut3.ut_output_table_buffer(); + l_message_id varchar2(255); + l_text varchar2(4000); + begin + ut3_tester_helper.run_helper.delete_buffer(); + --Act + l_buffer.send_lines(ut_varchar2_rows(null)); + l_buffer.send_lines(ut_varchar2_rows('test')); + + select message_id, text into l_message_id, l_text from table(ut3_tester_helper.run_helper.ut_output_buffer_tmp); + ut.expect(l_message_id).to_equal('1'); + ut.expect(l_text).to_equal('test'); + end; + procedure test_send_line is l_result varchar2(4000); c_expected constant varchar2(4000) := lpad('a text',4000,',a text'); diff --git a/test/ut3_tester/core/test_output_buffer.pks b/test/ut3_tester/core/test_output_buffer.pks index 9a4cfa68a..420f09244 100644 --- a/test/ut3_tester/core/test_output_buffer.pks +++ b/test/ut3_tester/core/test_output_buffer.pks @@ -9,6 +9,9 @@ create or replace package test_output_buffer is --%test(Does not send line if null text given) procedure test_doesnt_send_on_null_text; + --%test(Does not send line if null text given for multiline case) + procedure test_doesnt_send_multiline_on_null_text; + --%test(Sends a line into buffer table) procedure test_send_line; From 40c64d6a575e74f25e25771f74727ea17cd9ed10 Mon Sep 17 00:00:00 2001 From: Pazus Date: Fri, 10 May 2019 10:12:47 +0300 Subject: [PATCH 0457/1096] the fix --- source/core/output_buffers/ut_output_clob_table_buffer.tpb | 2 +- source/core/output_buffers/ut_output_table_buffer.tpb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/core/output_buffers/ut_output_clob_table_buffer.tpb b/source/core/output_buffers/ut_output_clob_table_buffer.tpb index 7b97c70ca..56873a418 100644 --- a/source/core/output_buffers/ut_output_clob_table_buffer.tpb +++ b/source/core/output_buffers/ut_output_clob_table_buffer.tpb @@ -66,7 +66,7 @@ create or replace type body ut_output_clob_table_buffer is select self.output_id, self.last_message_id + rownum, t.column_value, a_item_type from table(a_text_list) t where t.column_value is not null or a_item_type is not null; - self.last_message_id := self.last_message_id + a_text_list.count; + self.last_message_id := self.last_message_id + SQL%rowcount; commit; end; diff --git a/source/core/output_buffers/ut_output_table_buffer.tpb b/source/core/output_buffers/ut_output_table_buffer.tpb index 2b29e8ee5..afcbcbc95 100644 --- a/source/core/output_buffers/ut_output_table_buffer.tpb +++ b/source/core/output_buffers/ut_output_table_buffer.tpb @@ -75,7 +75,7 @@ create or replace type body ut_output_table_buffer is select self.output_id, self.last_message_id + rownum, t.column_value, a_item_type from table(a_text_list) t where t.column_value is not null or a_item_type is not null; - self.last_message_id := self.last_message_id + a_text_list.count; + self.last_message_id := self.last_message_id + SQL%rowcount; commit; end; From 8030a09375efe5b2c7cf48a41c29a1fe2ae18309 Mon Sep 17 00:00:00 2001 From: Pazus Date: Fri, 10 May 2019 10:21:34 +0300 Subject: [PATCH 0458/1096] shorten test name --- test/ut3_tester/core/test_output_buffer.pkb | 2 +- test/ut3_tester/core/test_output_buffer.pks | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/ut3_tester/core/test_output_buffer.pkb b/test/ut3_tester/core/test_output_buffer.pkb index f3a5a337f..93062f4a6 100644 --- a/test/ut3_tester/core/test_output_buffer.pkb +++ b/test/ut3_tester/core/test_output_buffer.pkb @@ -47,7 +47,7 @@ create or replace package body test_output_buffer is end; - procedure test_doesnt_send_multiline_on_null_text is + procedure test_doesnt_send_on_null_elem is l_cur sys_refcursor; l_result integer; l_buffer ut3.ut_output_buffer_base := ut3.ut_output_table_buffer(); diff --git a/test/ut3_tester/core/test_output_buffer.pks b/test/ut3_tester/core/test_output_buffer.pks index 420f09244..8f4d5873d 100644 --- a/test/ut3_tester/core/test_output_buffer.pks +++ b/test/ut3_tester/core/test_output_buffer.pks @@ -10,7 +10,7 @@ create or replace package test_output_buffer is procedure test_doesnt_send_on_null_text; --%test(Does not send line if null text given for multiline case) - procedure test_doesnt_send_multiline_on_null_text; + procedure test_doesnt_send_on_null_elem; --%test(Sends a line into buffer table) procedure test_send_line; From 1b1d86ce2dfd10197c4c535d2eae033ce37d43f3 Mon Sep 17 00:00:00 2001 From: Pazus Date: Fri, 10 May 2019 10:37:15 +0300 Subject: [PATCH 0459/1096] fix type --- test/ut3_tester/core/test_output_buffer.pkb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/ut3_tester/core/test_output_buffer.pkb b/test/ut3_tester/core/test_output_buffer.pkb index 93062f4a6..40af7e0b0 100644 --- a/test/ut3_tester/core/test_output_buffer.pkb +++ b/test/ut3_tester/core/test_output_buffer.pkb @@ -56,8 +56,8 @@ create or replace package body test_output_buffer is begin ut3_tester_helper.run_helper.delete_buffer(); --Act - l_buffer.send_lines(ut_varchar2_rows(null)); - l_buffer.send_lines(ut_varchar2_rows('test')); + l_buffer.send_lines(ut3.ut_varchar2_rows(null)); + l_buffer.send_lines(ut3.ut_varchar2_rows('test')); select message_id, text into l_message_id, l_text from table(ut3_tester_helper.run_helper.ut_output_buffer_tmp); ut.expect(l_message_id).to_equal('1'); From 584cfcd56d6a4688062e85266e3f60d3aa9a974a Mon Sep 17 00:00:00 2001 From: Travis CI Date: Fri, 10 May 2019 17:21:58 +0000 Subject: [PATCH 0460/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 238d6e107..e2c920dd0 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index d7f008926..63fcdca1b 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index e8c5429a1..0c9f563fc 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 2a2b7500f..a512d04c0 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index e1e26d917..78a321f0c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 5e2344ff6..4981963b3 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 80ca1e4ce..5854b022a 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index a8e636e68..ae5cd1b06 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index f0aaa734e..60ed590ce 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 653328d7a..e0c7cf473 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index dd8cfdc5f..72484f17c 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index abfa1162e..c36c43c61 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 566d1486a..7727b1427 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index d84815235..f6c12192a 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index f969cb360..1bd76e5bd 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 87fd799d8..a8cddf707 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 80d837720..590ba3cbd 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 6cf4299ec..7efbd6b06 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -760,7 +760,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.7.2905-develop + * secion v3.1.7.2927-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index a132fb9fc..a2bb728e4 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.7.2905-develop'; + gc_version constant varchar2(50) := 'v3.1.7.2927-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From f0c2bd8ae71837788dfc3db7c7e3a72bf3ffbb75 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Fri, 10 May 2019 22:26:22 +0000 Subject: [PATCH 0461/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index e2c920dd0..93793346e 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 63fcdca1b..7873d9c19 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 0c9f563fc..152508020 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index a512d04c0..1bbdfcf53 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 78a321f0c..00f088dcc 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 4981963b3..a3b3bae67 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 5854b022a..e8f7801e1 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index ae5cd1b06..b04650d53 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 60ed590ce..a10568ddc 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index e0c7cf473..c9f755a61 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 72484f17c..6f8e6ffd6 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index c36c43c61..5254c919b 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 7727b1427..8f4fb6507 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index f6c12192a..e7c84bca1 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 1bd76e5bd..f8757bf5d 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index a8cddf707..470f0af62 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 590ba3cbd..f8d456225 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2927--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 7efbd6b06..d9d4663e4 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -760,7 +760,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.7.2927-develop + * secion v3.1.7.2928-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index a2bb728e4..0add1089a 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.7.2927-develop'; + gc_version constant varchar2(50) := 'v3.1.7.2928-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 4d7bc3d0a212a8b8520611d29fb6590d37081f5d Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 11 May 2019 00:28:42 +0100 Subject: [PATCH 0462/1096] Fixed issue with missing newlines in cobertura coverage for non-executed packages. Resolves #917 --- .../ut_coverage_cobertura_reporter.tpb | 320 +++++++++--------- test/install_and_run_tests.sh | 15 +- .../test_cov_cobertura_reporter.pkb | 56 +++ .../test_cov_cobertura_reporter.pks | 3 + 4 files changed, 227 insertions(+), 167 deletions(-) diff --git a/source/reporters/ut_coverage_cobertura_reporter.tpb b/source/reporters/ut_coverage_cobertura_reporter.tpb index 18221e3d9..56fd4b524 100644 --- a/source/reporters/ut_coverage_cobertura_reporter.tpb +++ b/source/reporters/ut_coverage_cobertura_reporter.tpb @@ -1,160 +1,160 @@ -create or replace type body ut_coverage_cobertura_reporter is - /* - utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project - - Licensed under the Apache License, Version 2.0 (the "License"): - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - - constructor function ut_coverage_cobertura_reporter( - self in out nocopy ut_coverage_cobertura_reporter - ) return self as result is - begin - self.init($$plsql_unit); - return; - end; - - - overriding member procedure after_calling_run(self in out nocopy ut_coverage_cobertura_reporter, a_run in ut_run) as - l_report_lines ut_varchar2_list; - l_coverage_data ut_coverage.t_coverage; - - function get_lines_xml(a_unit_coverage ut_coverage.t_unit_coverage) return clob is - l_file_part varchar2(32767); - l_result clob; - l_line_no binary_integer; - l_pct integer; - begin - dbms_lob.createtemporary(l_result, true); - l_line_no := a_unit_coverage.lines.first; - if l_line_no is null then - for i in 1 .. a_unit_coverage.total_lines loop - ut_utils.append_to_clob(l_result, ''); - end loop; - else - while l_line_no is not null loop - if a_unit_coverage.lines(l_line_no).executions = 0 then - l_file_part := ''||chr(10); - else - l_file_part := ''||chr(10); - end if; - ut_utils.append_to_clob(l_result, l_file_part); - l_line_no := a_unit_coverage.lines.next(l_line_no); - end loop; - end if; - return l_result; - end; - - function get_coverage_xml( - a_coverage_data ut_coverage.t_coverage, - a_run ut_run - ) return ut_varchar2_rows is - l_file_part varchar2(32767); - l_result ut_varchar2_rows := ut_varchar2_rows(); - l_unit ut_coverage.t_full_name; - l_obj_name ut_coverage.t_object_name; - c_coverage_def constant varchar2(200) := ''; - c_file_footer constant varchar2(30) := ''; - c_coverage_footer constant varchar2(30) := ''; - c_sources_footer constant varchar2(30) := ''; - c_packages_footer constant varchar2(30) := ''; - c_package_footer constant varchar2(30) := ''; - c_class_footer constant varchar2(30) := ''; - c_lines_footer constant varchar2(30) := ''; - l_epoch varchar2(50) := (sysdate - to_date('01-01-1970 00:00:00', 'dd-mm-yyyy hh24:mi:ss')) * 24 * 60 * 60; - begin - - ut_utils.append_to_list( l_result, ut_utils.get_xml_header(a_run.client_character_set) ); - ut_utils.append_to_list( l_result, c_coverage_def ); - - --write header - ut_utils.append_to_list( - l_result, - '' - ); - - - --Write sources - l_unit := a_coverage_data.objects.first; - ut_utils.append_to_list( l_result, '' ); - - while l_unit is not null loop - ut_utils.append_to_list(l_result, ''||dbms_xmlgen.convert(l_unit)||''); - l_unit := a_coverage_data.objects.next(l_unit); - end loop; - ut_utils.append_to_list(l_result, c_sources_footer); - - --write packages - l_unit := a_coverage_data.objects.first; - ut_utils.append_to_list(l_result, ''); - - while l_unit is not null loop - l_obj_name := a_coverage_data.objects(l_unit).name; - ut_utils.append_to_list( - l_result, - '' - ); - - ut_utils.append_to_list( - l_result, - '' - ); - - ut_utils.append_to_list(l_result, ''); - - ut_utils.append_to_list( l_result, get_lines_xml(a_coverage_data.objects(l_unit)) ); - - ut_utils.append_to_list(l_result, c_lines_footer); - ut_utils.append_to_list(l_result, c_class_footer); - ut_utils.append_to_list(l_result, c_package_footer); - - l_unit := a_coverage_data.objects.next(l_unit); - end loop; - - ut_utils.append_to_list(l_result, c_packages_footer); - ut_utils.append_to_list(l_result, c_coverage_footer); - return l_result; - end; - begin - ut_coverage.coverage_stop(); - - l_coverage_data := ut_coverage.get_coverage_data(a_run.coverage_options); - - self.print_text_lines( get_coverage_xml( l_coverage_data, a_run ) ); - - (self as ut_reporter_base).after_calling_run(a_run); - end; - - overriding member function get_description return varchar2 as - begin - return 'Generates a Cobertura coverage report providing information on code coverage with line numbers.' || chr(10) || - 'Designed for Jenkins and TFS to report coverage. ' || chr(10) || - 'Cobertura Document Type Definition can be found: http://cobertura.sourceforge.net/xml/coverage-04.dtd.'|| chr(10) || - 'Sample file: https://github.com/leobalter/testing-examples/blob/master/solutions/3/report/cobertura-coverage.xml.'; - end; - -end; -/ +create or replace type body ut_coverage_cobertura_reporter is + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + constructor function ut_coverage_cobertura_reporter( + self in out nocopy ut_coverage_cobertura_reporter + ) return self as result is + begin + self.init($$plsql_unit); + return; + end; + + + overriding member procedure after_calling_run(self in out nocopy ut_coverage_cobertura_reporter, a_run in ut_run) as + l_report_lines ut_varchar2_list; + l_coverage_data ut_coverage.t_coverage; + + function get_lines_xml(a_unit_coverage ut_coverage.t_unit_coverage) return clob is + l_file_part varchar2(32767); + l_result clob; + l_line_no binary_integer; + l_pct integer; + begin + dbms_lob.createtemporary(l_result, true); + l_line_no := a_unit_coverage.lines.first; + if l_line_no is null then + for i in 1 .. a_unit_coverage.total_lines loop + ut_utils.append_to_clob(l_result, ''||chr(10)); + end loop; + else + while l_line_no is not null loop + if a_unit_coverage.lines(l_line_no).executions = 0 then + l_file_part := ''||chr(10); + else + l_file_part := ''||chr(10); + end if; + ut_utils.append_to_clob(l_result, l_file_part); + l_line_no := a_unit_coverage.lines.next(l_line_no); + end loop; + end if; + return l_result; + end; + + function get_coverage_xml( + a_coverage_data ut_coverage.t_coverage, + a_run ut_run + ) return ut_varchar2_rows is + l_file_part varchar2(32767); + l_result ut_varchar2_rows := ut_varchar2_rows(); + l_unit ut_coverage.t_full_name; + l_obj_name ut_coverage.t_object_name; + c_coverage_def constant varchar2(200) := ''; + c_file_footer constant varchar2(30) := ''; + c_coverage_footer constant varchar2(30) := ''; + c_sources_footer constant varchar2(30) := ''; + c_packages_footer constant varchar2(30) := ''; + c_package_footer constant varchar2(30) := ''; + c_class_footer constant varchar2(30) := ''; + c_lines_footer constant varchar2(30) := ''; + l_epoch varchar2(50) := (sysdate - to_date('01-01-1970 00:00:00', 'dd-mm-yyyy hh24:mi:ss')) * 24 * 60 * 60; + begin + + ut_utils.append_to_list( l_result, ut_utils.get_xml_header(a_run.client_character_set) ); + ut_utils.append_to_list( l_result, c_coverage_def ); + + --write header + ut_utils.append_to_list( + l_result, + '' + ); + + + --Write sources + l_unit := a_coverage_data.objects.first; + ut_utils.append_to_list( l_result, '' ); + + while l_unit is not null loop + ut_utils.append_to_list(l_result, ''||dbms_xmlgen.convert(l_unit)||''); + l_unit := a_coverage_data.objects.next(l_unit); + end loop; + ut_utils.append_to_list(l_result, c_sources_footer); + + --write packages + l_unit := a_coverage_data.objects.first; + ut_utils.append_to_list(l_result, ''); + + while l_unit is not null loop + l_obj_name := a_coverage_data.objects(l_unit).name; + ut_utils.append_to_list( + l_result, + '' + ); + + ut_utils.append_to_list( + l_result, + '' + ); + + ut_utils.append_to_list(l_result, ''); + + ut_utils.append_to_list( l_result, get_lines_xml(a_coverage_data.objects(l_unit)) ); + + ut_utils.append_to_list(l_result, c_lines_footer); + ut_utils.append_to_list(l_result, c_class_footer); + ut_utils.append_to_list(l_result, c_package_footer); + + l_unit := a_coverage_data.objects.next(l_unit); + end loop; + + ut_utils.append_to_list(l_result, c_packages_footer); + ut_utils.append_to_list(l_result, c_coverage_footer); + return l_result; + end; + begin + ut_coverage.coverage_stop(); + + l_coverage_data := ut_coverage.get_coverage_data(a_run.coverage_options); + + self.print_text_lines( get_coverage_xml( l_coverage_data, a_run ) ); + + (self as ut_reporter_base).after_calling_run(a_run); + end; + + overriding member function get_description return varchar2 as + begin + return 'Generates a Cobertura coverage report providing information on code coverage with line numbers.' || chr(10) || + 'Designed for Jenkins and TFS to report coverage. ' || chr(10) || + 'Cobertura Document Type Definition can be found: http://cobertura.sourceforge.net/xml/coverage-04.dtd.'|| chr(10) || + 'Sample file: https://github.com/leobalter/testing-examples/blob/master/solutions/3/report/cobertura-coverage.xml.'; + end; + +end; +/ diff --git a/test/install_and_run_tests.sh b/test/install_and_run_tests.sh index be7857346..01bd378fb 100755 --- a/test/install_and_run_tests.sh +++ b/test/install_and_run_tests.sh @@ -20,10 +20,11 @@ time utPLSQL-cli/bin/utplsql run ${UT3_TESTER_HELPER}/${UT3_TESTER_HELPER_PASSWO -source_path=source -owner=ut3 \ -p='ut3_tester,ut3$user#' \ -test_path=test -c \ --f=ut_coverage_sonar_reporter -o=coverage.xml \ --f=ut_coverage_html_reporter -o=coverage.html \ --f=ut_coveralls_reporter -o=coverage.json \ --f=ut_sonar_test_reporter -o=test_results.xml \ --f=ut_junit_reporter -o=junit_test_results.xml \ --f=ut_tfs_junit_reporter -o=tfs_test_results.xml \ --f=ut_documentation_reporter -o=test_results.log -s +-f=ut_coverage_sonar_reporter -o=coverage.xml \ +-f=ut_coverage_cobertura_reporter -o=cobertura.xml \ +-f=ut_coverage_html_reporter -o=coverage.html \ +-f=ut_coveralls_reporter -o=coverage.json \ +-f=ut_sonar_test_reporter -o=test_results.xml \ +-f=ut_junit_reporter -o=junit_test_results.xml \ +-f=ut_tfs_junit_reporter -o=tfs_test_results.xml \ +-f=ut_documentation_reporter -o=test_results.log -s diff --git a/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb index ecfb66340..b3c0439b4 100644 --- a/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb +++ b/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb @@ -41,5 +41,61 @@ create or replace package body test_cov_cobertura_reporter is ut.expect(l_actual).to_be_like(l_expected); end; + procedure report_zero_coverage is + l_results ut3.ut_varchar2_list; + l_expected clob; + l_actual clob; + begin + --Arrange + l_expected := + q'[ + + + +ut3.dummy_coverage + + + + + + + + + + + + + + + + + + + + + + + + +]'; + + test_coverage.cleanup_dummy_coverage; + --Act + select * + bulk collect into l_results + from table( + ut3.ut.run( + a_path => 'ut3.test_dummy_coverage', + a_reporter=> ut3.ut_coverage_cobertura_reporter( ), + a_include_objects => ut3.ut_varchar2_list('UT3.DUMMY_COVERAGE') + ) + ); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + --Assert + ut.expect(l_actual).to_be_like(l_expected); + --Cleanup + test_coverage.setup_dummy_coverage; + end; + end; / diff --git a/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pks b/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pks index 365815964..0016641d5 100644 --- a/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pks +++ b/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pks @@ -6,5 +6,8 @@ create or replace package test_cov_cobertura_reporter is --%test(reports on a project file mapped to database object) procedure report_on_file; + --%test(reports zero coverage on each line of non-executed database object - Issue #917) + procedure report_zero_coverage; + end test_cov_cobertura_reporter; / From 467078f121f2410638fc71ec7b81eed26bf38dd7 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sat, 11 May 2019 12:55:48 +0000 Subject: [PATCH 0463/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 93793346e..2ce241de6 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 7873d9c19..8f0c2e69e 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 152508020..4de716069 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 1bbdfcf53..24c747b78 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 00f088dcc..72818c3bd 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index a3b3bae67..f2f296755 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index e8f7801e1..e152d015d 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index b04650d53..8899444b8 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index a10568ddc..a28177d34 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index c9f755a61..c5b6d493d 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 6f8e6ffd6..51dbb4e69 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 5254c919b..9803d3ff4 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 8f4fb6507..88d26641a 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index e7c84bca1..674907b78 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index f8757bf5d..31b8ab6c7 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 470f0af62..3645c3efc 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index f8d456225..ed0b8195b 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2928--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index d9d4663e4..92ee0895d 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -760,7 +760,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.7.2928-develop + * secion v3.1.7.2935-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 0add1089a..25487d9c3 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.7.2928-develop'; + gc_version constant varchar2(50) := 'v3.1.7.2935-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From ae982a69e536adb4a522a718eb3f05dee6e419ca Mon Sep 17 00:00:00 2001 From: lwasylow Date: Sat, 11 May 2019 09:32:17 +0100 Subject: [PATCH 0464/1096] Initial checkin --- source/core/ut_utils.pkb | 15 +++++ source/core/ut_utils.pks | 5 ++ .../data_values/ut_compound_data_helper.pkb | 17 ++++- .../data_values/ut_cursor_details.tpb | 63 +++++++++++++++++-- .../data_values/ut_cursor_details.tps | 13 ++-- .../data_values/ut_data_value_anydata.tpb | 2 + .../data_values/ut_data_value_refcursor.tpb | 16 +++-- .../expectations/test_expectation_anydata.pkb | 39 ++++++------ 8 files changed, 136 insertions(+), 34 deletions(-) diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 7efbd6b06..12739d01b 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -798,5 +798,20 @@ create or replace package body ut_utils is return l_valid_name; end; + function add_prefix(a_list ut_varchar2_list, a_prefix varchar2, a_connector varchar2 := '/') return ut_varchar2_list is + l_result ut_varchar2_list := ut_varchar2_list(); + l_idx binary_integer; + begin + if a_prefix is not null then + l_idx := a_list.first; + while l_idx is not null loop + l_result.extend; + l_result(l_idx) := a_prefix||a_connector||trim(leading a_connector from a_list(l_idx)); + l_idx := a_list.next(l_idx); + end loop; + end if; + return l_result; + end; + end ut_utils; / diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index a2bb728e4..8a751a0d8 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -387,5 +387,10 @@ create or replace package ut_utils authid definer is */ function get_valid_xml_name(a_name varchar2) return varchar2; + /** + * Add prefix word to elements of list + */ + function add_prefix(a_list ut_varchar2_list, a_prefix varchar2, a_connector varchar2 := '/') return ut_varchar2_list; + end ut_utils; / diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index bd259b47d..fa736ecfb 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -335,7 +335,8 @@ create or replace package body ut_compound_data_helper is l_not_equal_stmt clob; l_where_stmt clob; l_ut_owner varchar2(250) := ut_utils.ut_owner; - + l_join_by_list ut_varchar2_list; + function get_join_type(a_inclusion_compare in boolean,a_negated in boolean) return varchar2 is begin return @@ -356,12 +357,22 @@ create or replace package body ut_compound_data_helper is end; begin + /** + * We already estabilished cursor equality so now we add anydata root if we compare anydata + * to join by. + */ + l_join_by_list := + case + when a_other is of (ut_data_value_anydata) then ut_utils.add_prefix(a_join_by_list, a_other.cursor_details.get_root) + else a_join_by_list + end; + dbms_lob.createtemporary(l_compare_sql, true); --Initiate a SQL template with placeholders ut_utils.append_to_clob(l_compare_sql, g_compare_sql_template); --Generate a pieceso of dynamic SQL that will substitute placeholders gen_sql_pieces_out_of_cursor( - a_other.cursor_details.cursor_columns_info, a_join_by_list, a_unordered, + a_other.cursor_details.cursor_columns_info, l_join_by_list, a_unordered, l_xmltable_stmt, l_select_stmt, l_partition_stmt, l_join_on_stmt, l_not_equal_stmt ); @@ -374,7 +385,7 @@ create or replace package body ut_compound_data_helper is l_compare_sql := replace(l_compare_sql,'{:join_type:}',get_join_type(a_inclusion_type,a_is_negated)); l_compare_sql := replace(l_compare_sql,'{:join_condition:}',l_join_on_stmt); - if l_not_equal_stmt is not null and ((a_join_by_list.count > 0 and not a_is_negated) or (not a_unordered)) then + if l_not_equal_stmt is not null and ((l_join_by_list.count > 0 and not a_is_negated) or (not a_unordered)) then ut_utils.append_to_clob(l_where_stmt,' ( '||l_not_equal_stmt||' ) or '); end if; --If its inclusion we expect a actual set to fully match and have no extra elements over expected diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb index e6e24eea2..d2bd56e14 100644 --- a/source/expectations/data_values/ut_cursor_details.tpb +++ b/source/expectations/data_values/ut_cursor_details.tpb @@ -146,13 +146,25 @@ create or replace type body ut_cursor_details as member function get_missing_join_by_columns( a_expected_columns ut_varchar2_list ) return ut_varchar2_list is l_result ut_varchar2_list; + l_prefix varchar2(125); begin + if self.is_anydata = 1 then + l_prefix := get_root; + end if; + --regexp_replace(c.access_path,'^\/?([^\/]+\/){1}') select fl.column_value bulk collect into l_result from table(a_expected_columns) fl where not exists ( select 1 from table(self.cursor_columns_info) c - where regexp_like(c.access_path, '^'||fl.column_value||'($|/.*)') + where regexp_like(c.access_path,'^/?'|| + case + when self.is_anydata = 1 then + l_prefix||'/'||trim (leading '/' from fl.column_value) + else + fl.column_value + end||'($|/.*)' + ) ) order by fl.column_value; return l_result; @@ -162,9 +174,14 @@ create or replace type body ut_cursor_details as l_result ut_cursor_details := self; l_column_tab ut_cursor_column_tab := ut_cursor_column_tab(); l_column ut_cursor_column; + l_prefix varchar2(125); c_xpath_extract_reg constant varchar2(50) := '^((/ROW/)|^(//)|^(/\*/))?(.*)'; begin if l_result.cursor_columns_info is not null then + + if self.is_anydata = 1 then + l_prefix := get_root; + end if; --limit columns to those on the include items minus exclude items if a_match_options.include.items.count > 0 then @@ -181,8 +198,16 @@ create or replace type body ut_cursor_details as bulk collect into l_result.cursor_columns_info from table(self.cursor_columns_info) x where exists( - select 1 from included_columns f where regexp_like( x.access_path, '^/?'||f.col_names||'($|/.*)' ) - ); + select 1 from included_columns f where regexp_like(x.access_path,'^/?'|| + case + when self.is_anydata = 1 then + l_prefix||'/'||trim(leading '/' from f.col_names) + else + f.col_names + end||'($|/.*)' + ) + ) + or x.hierarchy_level = case when self.is_anydata = 1 then 1 else 0 end ; end if; elsif a_match_options.exclude.items.count > 0 then with excluded_columns as ( @@ -193,7 +218,13 @@ create or replace type body ut_cursor_details as bulk collect into l_result.cursor_columns_info from table(self.cursor_columns_info) x where not exists( - select 1 from excluded_columns f where regexp_like( '/'||x.access_path, '^/?'||f.col_names||'($|/.*)' ) + select 1 from excluded_columns f where regexp_like(x.access_path,'^/?'|| + case + when self.is_anydata = 1 then + l_prefix||'/'||trim(leading '/' from f.col_names) + else + f.col_names + end||'($|/.*)' ) ); end if; @@ -226,8 +257,30 @@ create or replace type body ut_cursor_details as from table(self.cursor_columns_info) t where (a_parent_name is null and parent_name is null and hierarchy_level = 1 and column_name is not null) having count(*) > 0; - return l_result; end; + + member procedure has_anydata(self in out nocopy ut_cursor_details, a_is_anydata in boolean :=false) is + begin + self.is_anydata := case when nvl(a_is_anydata,false) then 1 else 0 end; + end; + + member function has_anydata return boolean is + begin + return ut_utils.int_to_boolean(nvl(self.is_anydata,0)); + end; + + member function get_root return varchar2 is + l_root varchar2(250); + begin + if self.cursor_columns_info.count > 0 then + select x.access_path into l_root from table(self.cursor_columns_info) x + where x.hierarchy_level = 1; + else + l_root := null; + end if; + return l_root; + end; + end; / diff --git a/source/expectations/data_values/ut_cursor_details.tps b/source/expectations/data_values/ut_cursor_details.tps index c2aa98066..ce5aefbe7 100644 --- a/source/expectations/data_values/ut_cursor_details.tps +++ b/source/expectations/data_values/ut_cursor_details.tps @@ -16,7 +16,9 @@ create or replace type ut_cursor_details force authid current_user as object ( limitations under the License. */ cursor_columns_info ut_cursor_column_tab, - + + /*if type is anydata we need to skip level 1 on joinby / inlude / exclude as its artificial cursor*/ + is_anydata number(1,0), constructor function ut_cursor_details(self in out nocopy ut_cursor_details) return self as result, constructor function ut_cursor_details( self in out nocopy ut_cursor_details,a_cursor_number in number @@ -29,9 +31,12 @@ create or replace type ut_cursor_details force authid current_user as object ( a_level in integer, a_access_path in varchar2 ), - member function contains_collection return boolean, - member function get_missing_join_by_columns( a_expected_columns ut_varchar2_list ) return ut_varchar2_list, + member function contains_collection return boolean, + member function get_missing_join_by_columns( a_expected_columns ut_varchar2_list ) return ut_varchar2_list, member procedure filter_columns(self in out nocopy ut_cursor_details, a_match_options ut_matcher_options), - member function get_xml_children(a_parent_name varchar2 := null) return xmltype + member function get_xml_children(a_parent_name varchar2 := null) return xmltype, + member procedure has_anydata(self in out nocopy ut_cursor_details, a_is_anydata in boolean := false), + member function has_anydata return boolean, + member function get_root return varchar2 ) / diff --git a/source/expectations/data_values/ut_data_value_anydata.tpb b/source/expectations/data_values/ut_data_value_anydata.tpb index 19917633a..fa59ad67c 100644 --- a/source/expectations/data_values/ut_data_value_anydata.tpb +++ b/source/expectations/data_values/ut_data_value_anydata.tpb @@ -84,6 +84,7 @@ create or replace type body ut_data_value_anydata as self.extract_cursor(l_refcursor); l_cursor_number := dbms_sql.to_cursor_number(l_refcursor); self.cursor_details := ut_cursor_details(l_cursor_number); + self.cursor_details.has_anydata(true); dbms_sql.close_cursor(l_cursor_number); elsif not l_refcursor%isopen then raise cursor_not_open; @@ -139,5 +140,6 @@ create or replace type body ut_data_value_anydata as raise value_error; end if; end; + end; / diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index ee929d097..2aac626e3 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -95,6 +95,7 @@ create or replace type body ut_data_value_refcursor as extract_cursor(l_cursor); l_cursor_number := dbms_sql.to_cursor_number(l_cursor); self.cursor_details := ut_cursor_details(l_cursor_number); + self.cursor_details.has_anydata(false); dbms_sql.close_cursor(l_cursor_number); elsif not l_cursor%isopen then raise cursor_not_open; @@ -250,8 +251,14 @@ create or replace type body ut_data_value_refcursor as if l_diff_row_count > 0 then l_row_diffs := ut_compound_data_helper.get_rows_diff_by_sql( l_self_cols, l_other_cols, l_self.data_id, l_other.data_id, - l_diff_id, a_match_options.join_by.items, a_match_options.unordered, - a_match_options.ordered_columns(), self.extract_path + l_diff_id, + case + when + l_self.cursor_details.is_anydata = 1 then ut_utils.add_prefix(a_match_options.join_by.items, l_self.cursor_details.get_root) + else + a_match_options.join_by.items + end, + a_match_options.unordered,a_match_options.ordered_columns(), self.extract_path ); l_message := chr(10) ||'Rows: [ ' || l_diff_row_count ||' differences' @@ -359,17 +366,18 @@ create or replace type body ut_data_value_refcursor as l_other := treat(a_other as ut_data_value_refcursor); l_other.cursor_details.filter_columns( a_match_options ); l_self.cursor_details.filter_columns( a_match_options ); - + if a_match_options.join_by.items.count > 0 then l_result := l_self.cursor_details.get_missing_join_by_columns( a_match_options.join_by.items ).count + l_other.cursor_details.get_missing_join_by_columns( a_match_options.join_by.items ).count; end if; - + if l_result = 0 then if not l_self.is_null() and not l_other.is_null() and not l_self.cursor_details.equals( l_other.cursor_details, a_match_options ) then l_result := 1; end if; + l_diff_cursor_text := ut_compound_data_helper.gen_compare_sql( l_other, a_match_options.join_by.items, diff --git a/test/ut3_user/expectations/test_expectation_anydata.pkb b/test/ut3_user/expectations/test_expectation_anydata.pkb index dec64d30d..4838aabff 100644 --- a/test/ut3_user/expectations/test_expectation_anydata.pkb +++ b/test/ut3_user/expectations/test_expectation_anydata.pkb @@ -249,7 +249,7 @@ create or replace package body test_expectation_anydata is l_list ut3.ut_varchar2_list; begin --Arrange - l_list := ut3.ut_varchar2_list('TEST_DUMMY_OBJECT/Value','/TEST_DUMMY_OBJECT/ID'); + l_list := ut3.ut_varchar2_list('Value','/ID'); g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>3, "name"=>'A',"Value"=>'1') ); --Act @@ -262,7 +262,7 @@ create or replace package body test_expectation_anydata is l_list varchar2(100); begin --Arrange - l_list := 'TEST_DUMMY_OBJECT/Value,TEST_DUMMY_OBJECT/ID'; + l_list := 'Value,ID'; g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>2, "name"=>'A',"Value"=>'1') ); --Act @@ -275,7 +275,7 @@ create or replace package body test_expectation_anydata is l_xpath varchar2(100); begin --Arrange - l_xpath := '//TEST_DUMMY_OBJECT/Value|//TEST_DUMMY_OBJECT/ID'; + l_xpath := '//Value|//ID'; g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>2, "name"=>'A',"Value"=>'1') ); --Act @@ -301,7 +301,7 @@ create or replace package body test_expectation_anydata is l_list ut3.ut_varchar2_list; begin --Arrange - l_list := ut3.ut_varchar2_list('TEST_DUMMY_OBJECT/Value','TEST_DUMMY_OBJECT/ID'); + l_list := ut3.ut_varchar2_list('Value','ID'); g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'b',"Value"=>'0') ); --Act @@ -314,7 +314,7 @@ create or replace package body test_expectation_anydata is l_xpath varchar2(100); begin --Arrange - l_xpath := 'TEST_DUMMY_OBJECT/key,TEST_DUMMY_OBJECT/ID'; + l_xpath := 'key,ID'; g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'1') ); --Act @@ -327,7 +327,7 @@ create or replace package body test_expectation_anydata is l_xpath varchar2(100); begin --Arrange - l_xpath := '//TEST_DUMMY_OBJECT/key|//TEST_DUMMY_OBJECT/ID'; + l_xpath := '//key|//ID'; g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'1') ); --Act @@ -340,7 +340,7 @@ create or replace package body test_expectation_anydata is l_include varchar2(100); begin --Arrange - l_include := ' BadAttributeName, TEST_DUMMY_OBJECT/ID '; + l_include := ' BadAttributeName, ID '; g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'B',"Value"=>'0') ); g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'1') ); --Act @@ -354,8 +354,8 @@ create or replace package body test_expectation_anydata is l_include varchar2(100); begin --Arrange - l_include := 'TEST_DUMMY_OBJECT/key,TEST_DUMMY_OBJECT/ID,TEST_DUMMY_OBJECT/Value'; - l_exclude := '//TEST_DUMMY_OBJECT/key|//TEST_DUMMY_OBJECT/Value'; + l_include := 'key,ID,Value'; + l_exclude := '//key|//Value'; g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'B',"Value"=>'0') ); g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'1') ); --Act @@ -371,8 +371,8 @@ create or replace package body test_expectation_anydata is l_actual varchar2(32767); begin --Arrange - l_include := ut3.ut_varchar2_list('TEST_DUMMY_OBJECT/key','TEST_DUMMY_OBJECT/ID','TEST_DUMMY_OBJECT/Value'); - l_exclude := ut3.ut_varchar2_list('TEST_DUMMY_OBJECT/key','TEST_DUMMY_OBJECT/Value'); + l_include := ut3.ut_varchar2_list('key','ID','Value'); + l_exclude := ut3.ut_varchar2_list('key','Value'); g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'B',"Value"=>'0') ); g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'1') ); --Act @@ -548,7 +548,7 @@ Rows: [ 60 differences, showing first 20 ] l_expected ut3_tester_helper.test_dummy_object_list; l_list ut3.ut_varchar2_list; begin - l_list := ut3.ut_varchar2_list('TEST_DUMMY_OBJECT/Value','TEST_DUMMY_OBJECT/ID'); + l_list := ut3.ut_varchar2_list('Value','ID'); --Arrange select ut3_tester_helper.test_dummy_object( rownum, 'SomethingsDifferent '||rownum, rownum) bulk collect into l_actual @@ -567,7 +567,7 @@ Rows: [ 60 differences, showing first 20 ] l_expected ut3_tester_helper.test_dummy_object_list; l_list ut3.ut_varchar2_list; begin - l_list := ut3.ut_varchar2_list('TEST_DUMMY_OBJECT/Value','TEST_DUMMY_OBJECT/ID'); + l_list := ut3.ut_varchar2_list('Value','ID'); --Arrange select ut3_tester_helper.test_dummy_object( rownum*2, 'Something '||rownum, rownum*2) bulk collect into l_actual @@ -588,7 +588,7 @@ Rows: [ 60 differences, showing first 20 ] l_actual_message varchar2(32767); l_expected_message varchar2(32767); begin - l_list := ut3.ut_varchar2_list('TEST_DUMMY_OBJECT/name'); + l_list := ut3.ut_varchar2_list('name'); --Arrange select ut3_tester_helper.test_dummy_object( rownum, 'SomethingsDifferent '||rownum, rownum) bulk collect into l_actual @@ -602,7 +602,10 @@ Rows: [ 60 differences, showing first 20 ] l_expected_message := q'[%Actual: ut3_tester_helper.test_dummy_object_list [ count = 2 ] was expected to equal: ut3_tester_helper.test_dummy_object_list [ count = 2 ] %Diff: %Rows: [ 2 differences ] -%All rows are different as the columns are not matching.]'; +%Row No. 1 - Actual: SomethingsDifferent 1 +%Row No. 1 - Expected: Something 1 +%Row No. 2 - Actual: SomethingsDifferent 2 +%Row No. 2 - Expected: Something 2]'; l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); @@ -841,7 +844,7 @@ Rows: [ 60 differences, showing first 20 ] from dual connect by level <=2 order by rownum desc; --Act - ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).join_by('TEST_DUMMY_OBJECT/ID'); + ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).join_by('ID'); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -860,7 +863,7 @@ Rows: [ 60 differences, showing first 20 ] from dual connect by level <=2 order by rownum desc; --Act - ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).join_by('TEST_DUMMY_OBJECT/ID'); + ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).join_by('ID'); l_expected_message := q'[%Actual: ut3_tester_helper.test_dummy_object_list [ count = 2 ] was expected to equal: ut3_tester_helper.test_dummy_object_list [ count = 2 ] %Diff: %Rows: [ 3 differences ] @@ -928,7 +931,7 @@ Rows: [ 60 differences, showing first 20 ] g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(1, 'A', '0') ); --Act - ut3.ut.expect(g_test_actual).to_equal(g_test_expected).join_by('TEST_DUMMY_OBJECT/ID'); + ut3.ut.expect(g_test_actual).to_equal(g_test_expected).join_by('ID'); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; From 0af108dc022272ac67f57deebff7a42dba766082 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Thu, 23 May 2019 08:58:31 +0100 Subject: [PATCH 0465/1096] Failure details in sonar test reporter are now CDATA --- source/reporters/ut_sonar_test_reporter.tpb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/source/reporters/ut_sonar_test_reporter.tpb b/source/reporters/ut_sonar_test_reporter.tpb index 1da349d83..01ad0538c 100644 --- a/source/reporters/ut_sonar_test_reporter.tpb +++ b/source/reporters/ut_sonar_test_reporter.tpb @@ -57,12 +57,11 @@ create or replace type body ut_sonar_test_reporter is ut_utils.append_to_list( l_results, ''); elsif a_test.result > ut_utils.gc_success then ut_utils.append_to_list( l_results, ''); + ut_utils.append_to_list( l_results, ''); ut_utils.append_to_list( l_results, ''); end if; ut_utils.append_to_list( l_results, ''); From 02b89bd74524ecebb5705b590b8cdd6496a4ea1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Thu, 23 May 2019 12:59:01 +0100 Subject: [PATCH 0466/1096] Update ut_junit_reporter.tpb --- source/reporters/ut_junit_reporter.tpb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/source/reporters/ut_junit_reporter.tpb b/source/reporters/ut_junit_reporter.tpb index bc88aa8af..604bc420a 100644 --- a/source/reporters/ut_junit_reporter.tpb +++ b/source/reporters/ut_junit_reporter.tpb @@ -57,15 +57,11 @@ create or replace type body ut_junit_reporter is ut_utils.append_to_list( l_results, ''); elsif a_test.result > ut_utils.gc_success then ut_utils.append_to_list( l_results, ''); + ut_utils.append_to_list( l_results, c_cddata_tag_start); for i in 1 .. a_test.failed_expectations.count loop - - l_lines := a_test.failed_expectations(i).get_result_lines(); - - for j in 1 .. l_lines.count loop - ut_utils.append_to_list( l_results, dbms_xmlgen.convert(l_lines(j)) ); - end loop; - ut_utils.append_to_list( l_results, dbms_xmlgen.convert(a_test.failed_expectations(i).caller_info) ); + ut_utils.append_to_list( l_results, ut_utils.table_to_clob(a_test.failed_expectations(i).get_result_lines())); end loop; + ut_utils.append_to_list( l_results, c_cddata_tag_end); ut_utils.append_to_list( l_results, ''); end if; -- TODO - decide if we need/want to use the tag too From bee9c22818d48766139f562f7065698fd911bcf4 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 24 May 2019 00:55:27 +0100 Subject: [PATCH 0467/1096] Added handling of CDATA in failure messages for XML reporters. --- source/reporters/ut_junit_reporter.tpb | 40 ++++++++++-------- source/reporters/ut_sonar_test_reporter.tpb | 22 ++++++---- source/reporters/ut_tfs_junit_reporter.tpb | 22 ++++++---- test/ut3_user/reporters.pkb | 40 +++++++++++++++++- test/ut3_user/reporters.pks | 4 ++ .../reporters/test_documentation_reporter.pkb | 2 +- .../reporters/test_junit_reporter.pkb | 39 +---------------- .../reporters/test_junit_reporter.pks | 3 -- .../reporters/test_sonar_test_reporter.pkb | 5 +++ .../reporters/test_sonar_test_reporter.pks | 3 ++ .../reporters/test_tfs_junit_reporter.pkb | 42 +------------------ .../reporters/test_tfs_junit_reporter.pks | 3 -- 12 files changed, 105 insertions(+), 120 deletions(-) diff --git a/source/reporters/ut_junit_reporter.tpb b/source/reporters/ut_junit_reporter.tpb index 604bc420a..8b619ccc7 100644 --- a/source/reporters/ut_junit_reporter.tpb +++ b/source/reporters/ut_junit_reporter.tpb @@ -23,8 +23,9 @@ create or replace type body ut_junit_reporter is end; overriding member procedure after_calling_run(self in out nocopy ut_junit_reporter, a_run in ut_run) is - c_cddata_tag_start constant varchar2(30) := ''; + c_cdata_start_tag constant varchar2(30) := ''; + c_cdata_end_tag_wrap constant varchar2(30) := ']]'||c_cdata_end_tag||c_cdata_start_tag||'>'; l_suite_id integer := 0; l_tests_count integer := a_run.results_count.disabled_count + a_run.results_count.success_count + a_run.results_count.failure_count + a_run.results_count.errored_count; @@ -37,7 +38,7 @@ create or replace type body ut_junit_reporter is procedure print_test_elements(a_test ut_test) is l_results ut_varchar2_rows := ut_varchar2_rows(); l_lines ut_varchar2_list; - l_output clob; + l_output clob; begin ut_utils.append_to_list( l_results, @@ -51,26 +52,31 @@ create or replace type body ut_junit_reporter is end if; if a_test.result = ut_utils.gc_error then ut_utils.append_to_list( l_results, ''); - ut_utils.append_to_list( l_results, c_cddata_tag_start); + ut_utils.append_to_list( l_results, c_cdata_start_tag); ut_utils.append_to_list( l_results, ut_utils.convert_collection(a_test.get_error_stack_traces()) ); - ut_utils.append_to_list( l_results, c_cddata_tag_end); + ut_utils.append_to_list( l_results, c_cdata_end_tag); ut_utils.append_to_list( l_results, ''); elsif a_test.result > ut_utils.gc_success then ut_utils.append_to_list( l_results, ''); - ut_utils.append_to_list( l_results, c_cddata_tag_start); + ut_utils.append_to_list( l_results, c_cdata_start_tag); for i in 1 .. a_test.failed_expectations.count loop - ut_utils.append_to_list( l_results, ut_utils.table_to_clob(a_test.failed_expectations(i).get_result_lines())); + l_lines := a_test.failed_expectations(i).get_result_lines(); + for j in 1 .. l_lines.count loop + --Encapsulate nested CDATA in results + ut_utils.append_to_list( l_results, replace( l_lines(j), c_cdata_end_tag, c_cdata_end_tag_wrap ) ); + end loop; + ut_utils.append_to_list( l_results, replace( a_test.failed_expectations(i).caller_info, c_cdata_end_tag, c_cdata_end_tag_wrap ) ); end loop; - ut_utils.append_to_list( l_results, c_cddata_tag_end); + ut_utils.append_to_list( l_results, c_cdata_end_tag); ut_utils.append_to_list( l_results, ''); end if; -- TODO - decide if we need/want to use the tag too l_output := a_test.get_serveroutputs(); if l_output is not null then ut_utils.append_to_list( l_results, ''); - ut_utils.append_to_list( l_results, c_cddata_tag_start); - ut_utils.append_to_list( l_results, l_output); - ut_utils.append_to_list( l_results, c_cddata_tag_end ); + ut_utils.append_to_list( l_results, c_cdata_start_tag); + ut_utils.append_to_list( l_results, replace( l_output, c_cdata_end_tag, c_cdata_end_tag_wrap ) ); + ut_utils.append_to_list( l_results, c_cdata_end_tag ); ut_utils.append_to_list( l_results, '' ); else ut_utils.append_to_list( l_results, ''); @@ -115,9 +121,9 @@ create or replace type body ut_junit_reporter is l_data := l_suite.get_serveroutputs(); if l_data is not null and l_data != empty_clob() then ut_utils.append_to_list( l_results, ''); - ut_utils.append_to_list( l_results, c_cddata_tag_start); - ut_utils.append_to_list( l_results, l_data); - ut_utils.append_to_list( l_results, c_cddata_tag_end); + ut_utils.append_to_list( l_results, c_cdata_start_tag); + ut_utils.append_to_list( l_results, replace( l_data, c_cdata_end_tag, c_cdata_end_tag_wrap ) ); + ut_utils.append_to_list( l_results, c_cdata_end_tag); ut_utils.append_to_list( l_results, ''); else ut_utils.append_to_list( l_results, ''); @@ -126,9 +132,9 @@ create or replace type body ut_junit_reporter is l_errors := l_suite.get_error_stack_traces(); if l_errors is not empty then ut_utils.append_to_list( l_results, ''); - ut_utils.append_to_list( l_results, c_cddata_tag_start); - ut_utils.append_to_list( l_results, ut_utils.table_to_clob(l_errors)); - ut_utils.append_to_list( l_results, c_cddata_tag_end); + ut_utils.append_to_list( l_results, c_cdata_start_tag); + ut_utils.append_to_list( l_results, replace( ut_utils.table_to_clob(l_errors), c_cdata_end_tag, c_cdata_end_tag_wrap ) ); + ut_utils.append_to_list( l_results, c_cdata_end_tag); ut_utils.append_to_list( l_results, ''); else ut_utils.append_to_list( l_results, ''); diff --git a/source/reporters/ut_sonar_test_reporter.tpb b/source/reporters/ut_sonar_test_reporter.tpb index 01ad0538c..de4699058 100644 --- a/source/reporters/ut_sonar_test_reporter.tpb +++ b/source/reporters/ut_sonar_test_reporter.tpb @@ -43,25 +43,33 @@ create or replace type body ut_sonar_test_reporter is end; procedure print_test_results(a_test ut_test) is - l_results ut_varchar2_rows := ut_varchar2_rows(); - l_lines ut_varchar2_list; + c_cdata_start_tag constant varchar2(30) := ''; + c_cdata_end_tag_wrap constant varchar2(30) := ']]'||c_cdata_end_tag||c_cdata_start_tag||'>'; + l_results ut_varchar2_rows := ut_varchar2_rows(); + l_lines ut_varchar2_list; begin ut_utils.append_to_list( l_results, ''); if a_test.result = ut_utils.gc_disabled then ut_utils.append_to_list( l_results, ''); elsif a_test.result = ut_utils.gc_error then ut_utils.append_to_list( l_results, ''); - ut_utils.append_to_list( l_results, ''); + ut_utils.append_to_list( l_results, c_cdata_end_tag); ut_utils.append_to_list( l_results, ''); elsif a_test.result > ut_utils.gc_success then ut_utils.append_to_list( l_results, ''); - ut_utils.append_to_list( l_results, ''); + ut_utils.append_to_list( l_results, c_cdata_end_tag); ut_utils.append_to_list( l_results, ''); end if; ut_utils.append_to_list( l_results, ''); diff --git a/source/reporters/ut_tfs_junit_reporter.tpb b/source/reporters/ut_tfs_junit_reporter.tpb index 5f3770b23..814cb7230 100644 --- a/source/reporters/ut_tfs_junit_reporter.tpb +++ b/source/reporters/ut_tfs_junit_reporter.tpb @@ -28,6 +28,9 @@ create or replace type body ut_tfs_junit_reporter is end; member procedure junit_version_one(self in out nocopy ut_tfs_junit_reporter,a_run in ut_run) is + c_cdata_start_tag constant varchar2(30) := ''; + c_cdata_end_tag_wrap constant varchar2(30) := ']]'||c_cdata_end_tag||c_cdata_start_tag||'>'; l_suite_id integer := 0; l_tests_count integer := a_run.results_count.disabled_count + a_run.results_count.success_count + a_run.results_count.failure_count + a_run.results_count.errored_count; @@ -69,20 +72,23 @@ create or replace type body ut_tfs_junit_reporter is if a_test.result = ut_utils.gc_error then ut_utils.append_to_list( l_results, ''); - ut_utils.append_to_list( l_results, ''); + ut_utils.append_to_list( l_results, c_cdata_end_tag); ut_utils.append_to_list( l_results, ''); -- Do not count error as failure elsif a_test.result = ut_utils.gc_failure then ut_utils.append_to_list( l_results, ''); + ut_utils.append_to_list( l_results, c_cdata_start_tag); for i in 1 .. a_test.failed_expectations.count loop l_lines := a_test.failed_expectations(i).get_result_lines(); for j in 1 .. l_lines.count loop - ut_utils.append_to_list( l_results, dbms_xmlgen.convert(l_lines(j))); + --Encapsulate nested CDATA in results + ut_utils.append_to_list( l_results, replace( l_lines(j), c_cdata_end_tag, c_cdata_end_tag_wrap ) ); end loop; - ut_utils.append_to_list( l_results, dbms_xmlgen.convert(a_test.failed_expectations(i).caller_info)); + ut_utils.append_to_list( l_results, replace( a_test.failed_expectations(i).caller_info, c_cdata_end_tag, c_cdata_end_tag_wrap ) ); end loop; + ut_utils.append_to_list( l_results, c_cdata_end_tag); ut_utils.append_to_list( l_results, ''); end if; @@ -120,9 +126,9 @@ create or replace type body ut_tfs_junit_reporter is l_outputs := l_suite.get_serveroutputs(); if l_outputs is not null and l_outputs != empty_clob() then ut_utils.append_to_list( l_results, ''); - ut_utils.append_to_list( l_results, ''); + ut_utils.append_to_list( l_results, c_cdata_end_tag); ut_utils.append_to_list( l_results, ''); else ut_utils.append_to_list( l_results, ''); @@ -131,9 +137,9 @@ create or replace type body ut_tfs_junit_reporter is l_errors := l_suite.get_error_stack_traces(); if l_errors is not empty then ut_utils.append_to_list( l_results, ''); - ut_utils.append_to_list( l_results, ''); + ut_utils.append_to_list( l_results, c_cdata_end_tag); ut_utils.append_to_list( l_results, ''); else ut_utils.append_to_list( l_results, ''); diff --git a/test/ut3_user/reporters.pkb b/test/ut3_user/reporters.pkb index 364566569..213d7eaa6 100644 --- a/test/ut3_user/reporters.pkb +++ b/test/ut3_user/reporters.pkb @@ -110,8 +110,24 @@ as dbms_output.put_line(''); end; -end;]'; - +end;]'; + + execute immediate q'[create or replace package check_fail_escape is + --%suitepath(core) + --%suite(Check JUNIT XML failure is escaped) + + --%test(Fail Miserably) + procedure fail_miserably; + + end;]'; + + execute immediate q'[create or replace package body check_fail_escape is + procedure fail_miserably is + begin + ut3.ut.expect('test').to_equal(''); + end; + end;]'; + end; procedure reporters_setup is @@ -122,6 +138,7 @@ end;]'; procedure drop_test_helper_package is begin execute immediate 'drop package test_reporters'; + execute immediate 'drop package check_fail_escape'; end; procedure reporters_cleanup is @@ -146,5 +163,24 @@ end;]'; ut.expect(l_actual).to_be_like('%'); end; + procedure check_xml_failure_escaped( + a_reporter ut3.ut_output_reporter_base + ) is + l_results ut3.ut_varchar2_list; + l_actual clob; + begin + --Act + select * + bulk collect into l_results + from table( ut3.ut.run( 'check_fail_escape', a_reporter ) ); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + --Assert + ut.expect(l_actual).to_be_like('%' (varchar2)%]' + ||q'[at "UT3$USER#.CHECK_FAIL_ESCAPE.FAIL_MISERABLY", line % ut3.ut.expect('test').to_equal('');]' + ||'%]]>%' + ); + end; + end reporters; / diff --git a/test/ut3_user/reporters.pks b/test/ut3_user/reporters.pks index cb601cf3b..54800fa4a 100644 --- a/test/ut3_user/reporters.pks +++ b/test/ut3_user/reporters.pks @@ -14,5 +14,9 @@ create or replace package reporters is a_client_character_set varchar2 ); + procedure check_xml_failure_escaped( + a_reporter ut3.ut_output_reporter_base + ); + end reporters; / diff --git a/test/ut3_user/reporters/test_documentation_reporter.pkb b/test/ut3_user/reporters/test_documentation_reporter.pkb index 394594fa4..a1f895947 100644 --- a/test/ut3_user/reporters/test_documentation_reporter.pkb +++ b/test/ut3_user/reporters/test_documentation_reporter.pkb @@ -1 +1 @@ -create or replace package body test_documentation_reporter as procedure report_produces_expected_out is l_results ut3.ut_varchar2_list; l_actual clob; l_expected varchar2(32767):=q'[%org utplsql tests helpers A suite for testing different outcomes from reporters A description of some context passing_test [% sec] a test with failing assertion [% sec] (FAILED - 1) a test raising unhandled exception [% sec] (FAILED - 2) a disabled test [0 sec] (DISABLED) % Failures: % 1) failing_test "Fails as values are different" Actual: 'number [1] ' (varchar2) was expected to equal: 'number [2] ' (varchar2)% at "UT3$USER#.TEST_REPORTERS%", line 36 ut3.ut.expect('number [1] ','Fails as values are different').to_equal('number [2] '); % % 2) erroring_test ORA-06502: PL/SQL: numeric or value error: character to number conversion error ORA-06512: at "UT3$USER#.TEST_REPORTERS", line 44% ORA-06512: at line 6 Finished in % seconds 4 tests, 1 failed, 1 errored, 1 disabled, 0 warning(s)%]'; begin select * bulk collect into l_results from table( ut3.ut.run( 'test_reporters', ut3.ut_documentation_reporter() ) ); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); ut.expect(l_actual).to_be_like(l_expected); end; procedure check_encoding_included is begin reporters.check_xml_encoding_included(ut3.ut_sonar_test_reporter(), 'UTF-8'); end; end; / \ No newline at end of file +create or replace package body test_documentation_reporter as procedure report_produces_expected_out is l_results ut3.ut_varchar2_list; l_actual clob; l_expected varchar2(32767):=q'[%org utplsql tests helpers A suite for testing different outcomes from reporters A description of some context passing_test [% sec] a test with failing assertion [% sec] (FAILED - 1) a test raising unhandled exception [% sec] (FAILED - 2) a disabled test [0 sec] (DISABLED) % Failures: % 1) failing_test "Fails as values are different" Actual: 'number [1] ' (varchar2) was expected to equal: 'number [2] ' (varchar2)% at "UT3$USER#.TEST_REPORTERS%", line 36 ut3.ut.expect('number [1] ','Fails as values are different').to_equal('number [2] '); % % 2) erroring_test ORA-06502: PL/SQL: numeric or value error: character to number conversion error ORA-06512: at "UT3$USER#.TEST_REPORTERS", line 44% ORA-06512: at line 6 Finished in % seconds 4 tests, 1 failed, 1 errored, 1 disabled, 0 warning(s)%]'; begin select * bulk collect into l_results from table( ut3.ut.run( 'test_reporters', ut3.ut_documentation_reporter() ) ); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); ut.expect(l_actual).to_be_like(l_expected); end; end; / \ No newline at end of file diff --git a/test/ut3_user/reporters/test_junit_reporter.pkb b/test/ut3_user/reporters/test_junit_reporter.pkb index b86bb698c..e1b790156 100644 --- a/test/ut3_user/reporters/test_junit_reporter.pkb +++ b/test/ut3_user/reporters/test_junit_reporter.pkb @@ -72,23 +72,6 @@ create or replace package body test_junit_reporter as execute immediate q'[create or replace package body Tst_Fix_Case_Sensitive as procedure bUgFiX is begin ut.expect(1).to_equal(1); end; end;]'; - - execute immediate q'[create or replace package check_fail_escape is - --%suitepath(core) - --%suite(checkfailedescape) - --%displayname(Check JUNIT XML failure is escaped) - - --%test(Fail Miserably) - procedure fail_miserably; - - end;]'; - - execute immediate q'[create or replace package body check_fail_escape is - procedure fail_miserably is - begin - ut3.ut.expect('test').to_equal(''); - end; - end;]'; end; @@ -134,19 +117,6 @@ create or replace package body test_junit_reporter as ut.expect(l_actual).to_be_like('%Actual: 1 (number) was expected to equal: 2 (number)%'); end; - procedure reports_failed_line is - l_results ut3.ut_varchar2_list; - l_actual clob; - begin - --Act - select * - bulk collect into l_results - from table(ut3.ut.run('check_junit_reporting',ut3.ut_junit_reporter())); - l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); - --Assert - ut.expect(l_actual).to_be_like('%at "%.CHECK_JUNIT_REPORTING%", line %'); - end; - procedure check_classname_suite is l_results ut3.ut_varchar2_list; l_actual clob; @@ -302,13 +272,7 @@ create or replace package body test_junit_reporter as l_results ut3.ut_varchar2_list; l_actual clob; begin - --Act - select * - bulk collect into l_results - from table(ut3.ut.run('check_fail_escape',ut3.ut_junit_reporter())); - l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); - --Assert - ut.expect(l_actual).to_be_like('%Actual: 'test' (varchar2) was expected to equal: '<![CDATA[some stuff]]>' (varchar2)%'); + reporters.check_xml_failure_escaped(ut3.ut_junit_reporter()); end; procedure check_classname_is_populated is @@ -345,7 +309,6 @@ create or replace package body test_junit_reporter as execute immediate 'drop package check_junit_rep_suitepath'; execute immediate 'drop package tst_package_junit_nodesc'; execute immediate 'drop package tst_package_junit_nosuite'; - execute immediate 'drop package check_fail_escape'; execute immediate 'drop package Tst_Fix_Case_Sensitive'; end; diff --git a/test/ut3_user/reporters/test_junit_reporter.pks b/test/ut3_user/reporters/test_junit_reporter.pks index 8af2ba430..71443c180 100644 --- a/test/ut3_user/reporters/test_junit_reporter.pks +++ b/test/ut3_user/reporters/test_junit_reporter.pks @@ -15,9 +15,6 @@ create or replace package test_junit_reporter as --%test(Xunit Backward Compatibility - Reports only failed expectations and exceptions) procedure reports_xunit_only_fail_or_err; - --%test(Reports failed line of test) - procedure reports_failed_line; - --%test(Check that classname is returned correct suite) procedure check_classname_suite; diff --git a/test/ut3_user/reporters/test_sonar_test_reporter.pkb b/test/ut3_user/reporters/test_sonar_test_reporter.pkb index 76cec84c8..357eff0a2 100644 --- a/test/ut3_user/reporters/test_sonar_test_reporter.pkb +++ b/test/ut3_user/reporters/test_sonar_test_reporter.pkb @@ -32,5 +32,10 @@ create or replace package body test_sonar_test_reporter as reporters.check_xml_encoding_included(ut3.ut_sonar_test_reporter(), 'UTF-8'); end; + procedure check_failure_escaped is + begin + reporters.check_xml_failure_escaped(ut3.ut_sonar_test_reporter()); + end; + end; / diff --git a/test/ut3_user/reporters/test_sonar_test_reporter.pks b/test/ut3_user/reporters/test_sonar_test_reporter.pks index 0c2fdf70a..ade449dba 100644 --- a/test/ut3_user/reporters/test_sonar_test_reporter.pks +++ b/test/ut3_user/reporters/test_sonar_test_reporter.pks @@ -9,5 +9,8 @@ create or replace package test_sonar_test_reporter as --%test(Includes XML header with encoding when encoding provided) procedure check_encoding_included; + --%test( Validate that fail with special char are escaped ) + procedure check_failure_escaped; + end; / diff --git a/test/ut3_user/reporters/test_tfs_junit_reporter.pkb b/test/ut3_user/reporters/test_tfs_junit_reporter.pkb index 623dda51e..196a2ec08 100644 --- a/test/ut3_user/reporters/test_tfs_junit_reporter.pkb +++ b/test/ut3_user/reporters/test_tfs_junit_reporter.pkb @@ -48,25 +48,7 @@ create or replace package body test_tfs_junit_reporter as null; end; end;]'; - - execute immediate q'[create or replace package check_fail_escape is - --%suitepath(core) - --%suite(checkfailedescape) - --%displayname(Check JUNIT XML failure is escaped) - - --%test(Fail Miserably) - procedure fail_miserably; - - end;]'; - - execute immediate q'[create or replace package body check_fail_escape is - procedure fail_miserably is - begin - ut3.ut.expect('test').to_equal(''); - end; - end;]'; - end; @@ -98,19 +80,6 @@ create or replace package body test_tfs_junit_reporter as ut.expect(l_actual).to_be_like('%Actual: 1 (number) was expected to equal: 2 (number)%'); end; - procedure reports_failed_line is - l_results ut3.ut_varchar2_list; - l_actual clob; - begin - --Act - select * - bulk collect into l_results - from table(ut3.ut.run('check_junit_reporting',ut3.ut_tfs_junit_reporter())); - l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); - --Assert - ut.expect(l_actual).to_be_like('%at "%.CHECK_JUNIT_REPORTING%", line %'); - end; - procedure check_classname_suite is l_results ut3.ut_varchar2_list; l_actual clob; @@ -165,16 +134,8 @@ create or replace package body test_tfs_junit_reporter as end; procedure check_failure_escaped is - l_results ut3.ut_varchar2_list; - l_actual clob; begin - --Act - select * - bulk collect into l_results - from table(ut3.ut.run('check_fail_escape',ut3.ut_tfs_junit_reporter())); - l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); - --Assert - ut.expect(l_actual).to_be_like('%Actual: 'test' (varchar2) was expected to equal: '<![CDATA[some stuff]]>' (varchar2)%'); + reporters.check_xml_failure_escaped(ut3.ut_tfs_junit_reporter()); end; procedure check_classname_suitepath is @@ -195,7 +156,6 @@ create or replace package body test_tfs_junit_reporter as execute immediate 'drop package check_junit_reporting'; execute immediate 'drop package check_junit_rep_suitepath'; execute immediate 'drop package check_junit_flat_suitepath'; - execute immediate 'drop package check_fail_escape'; end; procedure check_encoding_included is diff --git a/test/ut3_user/reporters/test_tfs_junit_reporter.pks b/test/ut3_user/reporters/test_tfs_junit_reporter.pks index af6227283..07acb4d21 100644 --- a/test/ut3_user/reporters/test_tfs_junit_reporter.pks +++ b/test/ut3_user/reporters/test_tfs_junit_reporter.pks @@ -12,9 +12,6 @@ create or replace package test_tfs_junit_reporter as --%test(Reports only failed expectations and exceptions) procedure reports_only_failed_or_errored; - --%test(Reports failed line of test) - procedure reports_failed_line; - --%test(Check that classname is returned correct suite) procedure check_classname_suite; From 7106a0e880782e35b85a3cdd7e32bcc91db6205a Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 24 May 2019 08:50:23 +0100 Subject: [PATCH 0468/1096] Fixing PR comments. --- docs/userguide/advanced_data_comparison.md | 38 +++++++++++++++++++ .../data_values/ut_cursor_details.tpb | 14 +++---- 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index f2f296755..646f77ebf 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -126,6 +126,44 @@ end; ``` +Example of `include / exclude` for anydata.convertCollection + +```plsql +create or replace package ut_anydata_inc_exc IS + + --%suite(Anydata) + + --%test(Anydata include and exclude) + procedure ut_anydata_test; + +end ut_anydata_inc_exc; +/ + +create or replace package body ut_anydata_inc_exc IS + + procedure ut_refcursors1 IS + l_actual ut3_tester_helper.test_dummy_object_list; + l_expected ut3_tester_helper.test_dummy_object_list; + begin + --Arrange + select ut3_tester_helper.test_dummy_object( rownum, 'Something Name'||rownum, rownum) + bulk collect into l_actual + from dual connect by level <=2; + select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) + bulk collect into l_expected + from dual connect by level <=2 + order by rownum desc; + --Act + ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).include('ID'); +ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).exclude('name'); + end; + +end ut_sample_test; +/ +``` + + + Only the columns 'RN', "A_Column" will be compared. Column 'SOME_COL' is excluded. This option can be useful in scenarios where you need to narrow-down the scope of test so that the test is only focused on very specific data. diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb index d2bd56e14..99e1d4edc 100644 --- a/source/expectations/data_values/ut_cursor_details.tpb +++ b/source/expectations/data_values/ut_cursor_details.tpb @@ -146,10 +146,10 @@ create or replace type body ut_cursor_details as member function get_missing_join_by_columns( a_expected_columns ut_varchar2_list ) return ut_varchar2_list is l_result ut_varchar2_list; - l_prefix varchar2(125); + l_root varchar2(125); begin if self.is_anydata = 1 then - l_prefix := get_root; + l_root := get_root; end if; --regexp_replace(c.access_path,'^\/?([^\/]+\/){1}') select fl.column_value @@ -160,7 +160,7 @@ create or replace type body ut_cursor_details as where regexp_like(c.access_path,'^/?'|| case when self.is_anydata = 1 then - l_prefix||'/'||trim (leading '/' from fl.column_value) + l_root||'/'||trim (leading '/' from fl.column_value) else fl.column_value end||'($|/.*)' @@ -174,13 +174,13 @@ create or replace type body ut_cursor_details as l_result ut_cursor_details := self; l_column_tab ut_cursor_column_tab := ut_cursor_column_tab(); l_column ut_cursor_column; - l_prefix varchar2(125); + l_root varchar2(125); c_xpath_extract_reg constant varchar2(50) := '^((/ROW/)|^(//)|^(/\*/))?(.*)'; begin if l_result.cursor_columns_info is not null then if self.is_anydata = 1 then - l_prefix := get_root; + l_root := get_root; end if; --limit columns to those on the include items minus exclude items @@ -201,7 +201,7 @@ create or replace type body ut_cursor_details as select 1 from included_columns f where regexp_like(x.access_path,'^/?'|| case when self.is_anydata = 1 then - l_prefix||'/'||trim(leading '/' from f.col_names) + l_root||'/'||trim(leading '/' from f.col_names) else f.col_names end||'($|/.*)' @@ -221,7 +221,7 @@ create or replace type body ut_cursor_details as select 1 from excluded_columns f where regexp_like(x.access_path,'^/?'|| case when self.is_anydata = 1 then - l_prefix||'/'||trim(leading '/' from f.col_names) + l_root||'/'||trim(leading '/' from f.col_names) else f.col_names end||'($|/.*)' ) From f66445b7f693668f04568e30773093193763d970 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Fri, 24 May 2019 13:04:30 +0100 Subject: [PATCH 0469/1096] Update docs with sample --- docs/userguide/advanced_data_comparison.md | 50 ++++++++++++++++++---- 1 file changed, 42 insertions(+), 8 deletions(-) diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 646f77ebf..6179806e5 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -133,36 +133,70 @@ create or replace package ut_anydata_inc_exc IS --%suite(Anydata) - --%test(Anydata include and exclude) - procedure ut_anydata_test; + --%test(Anydata include) + procedure ut_anydata_test_inc; + + --%test(Anydata exclude) + procedure ut_anydata_test_exc; end ut_anydata_inc_exc; / create or replace package body ut_anydata_inc_exc IS - procedure ut_refcursors1 IS + procedure ut_anydata_test_inc IS + l_actual ut3_tester_helper.test_dummy_object_list; + l_expected ut3_tester_helper.test_dummy_object_list; + begin + --Arrange + select ut3_tester_helper.test_dummy_object( rownum, 'Something Name'||rownum, rownum) + bulk collect into l_actual + from dual connect by level <=2 + order by rownum asc; + select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) + bulk collect into l_expected + from dual connect by level <=2 + order by rownum asc; + --Act + ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).include('ID,Value'); + end; + + procedure ut_anydata_test_exc IS l_actual ut3_tester_helper.test_dummy_object_list; l_expected ut3_tester_helper.test_dummy_object_list; begin --Arrange select ut3_tester_helper.test_dummy_object( rownum, 'Something Name'||rownum, rownum) bulk collect into l_actual - from dual connect by level <=2; + from dual connect by level <=2 + order by rownum asc; select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) bulk collect into l_expected from dual connect by level <=2 - order by rownum desc; + order by rownum asc; --Act - ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).include('ID'); -ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).exclude('name'); + ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).exclude('name'); end; -end ut_sample_test; +end ut_anydata_inc_exc; / + ``` +will result in : + +```sql +Anydata + Anydata include [.07 sec] + Anydata exclude [.058 sec] + +Finished in .131218 seconds +2 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s) +``` + + +Example of exclude Only the columns 'RN', "A_Column" will be compared. Column 'SOME_COL' is excluded. From fbc53254cc239f56742ee627cdf7ea004ee72f05 Mon Sep 17 00:00:00 2001 From: LUKASZ104 Date: Fri, 24 May 2019 14:43:58 +0100 Subject: [PATCH 0470/1096] TAG: Phase2 Adding a new attribute filterpath that is used for filtering cursor in anydata / refcursor. This value will be different from cursor in anydata as we skip root element. --- source/core/ut_utils.pkb | 1644 +++++++++-------- source/core/ut_utils.pks | 796 ++++---- .../data_values/ut_cursor_column.tpb | 139 +- .../data_values/ut_cursor_column.tps | 103 +- .../data_values/ut_cursor_details.tpb | 543 +++--- .../data_values/ut_cursor_details.tps | 83 +- .../data_values/ut_data_value_anydata.tpb | 288 ++- .../data_values/ut_data_value_refcursor.tpb | 797 ++++---- 8 files changed, 2188 insertions(+), 2205 deletions(-) diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 2e35229e6..5b80e1f59 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -1,817 +1,827 @@ -create or replace package body ut_utils is - /* - utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project - - Licensed under the Apache License, Version 2.0 (the "License"): - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - - /** - * Constants regex used to validate XML name - */ - gc_invalid_first_xml_char constant varchar2(50) := '[^_a-zA-Z]'; - gc_invalid_xml_char constant varchar2(50) := '[^_a-zA-Z0-9\.-]'; - gc_full_valid_xml_name constant varchar2(50) := '^([_a-zA-Z])([_a-zA-Z0-9\.-])*$'; - - function surround_with(a_value varchar2, a_quote_char varchar2) return varchar2 is - begin - return case when a_quote_char is not null then a_quote_char||a_value||a_quote_char else a_value end; - end; - - function test_result_to_char(a_test_result integer) return varchar2 as - l_result varchar2(20); - begin - if a_test_result = gc_success then - l_result := gc_success_char; - elsif a_test_result = gc_failure then - l_result := gc_failure_char; - elsif a_test_result = gc_error then - l_result := gc_error_char; - elsif a_test_result = gc_disabled then - l_result := gc_disabled_char; - else - l_result := 'Unknown(' || coalesce(to_char(a_test_result),'NULL') || ')'; - end if ; - return l_result; - end test_result_to_char; - - - function to_test_result(a_test boolean) return integer is - l_result integer; - begin - if a_test then - l_result := gc_success; - else - l_result := gc_failure; - end if; - return l_result; - end; - - function gen_savepoint_name return varchar2 is - begin - return 's'||trim(to_char(ut_savepoint_seq.nextval,'0000000000000000000000000000')); - end; - - procedure debug_log(a_message varchar2) is - begin - $if $$ut_trace $then - dbms_output.put_line(a_message); - $else - null; - $end - end; - - procedure debug_log(a_message clob) is - l_varchars ut_varchar2_list; - begin - $if $$ut_trace $then - l_varchars := clob_to_table(a_message); - for i in 1..l_varchars.count loop - dbms_output.put_line(l_varchars(i)); - end loop; - $else - null; - $end - end; - - function to_string( - a_value varchar2, - a_quote_char varchar2 := '''', - a_max_output_len in number := gc_max_output_string_length - ) return varchar2 is - l_result varchar2(32767); - c_length constant integer := coalesce( length( a_value ), 0 ); - c_max_input_string_length constant integer := a_max_output_len - coalesce( length( a_quote_char ) * 2, 0 ); - c_overflow_substr_len constant integer := c_max_input_string_length - gc_more_data_string_len; - begin - if c_length = 0 then - l_result := gc_null_string; - elsif c_length <= c_max_input_string_length then - l_result := surround_with(a_value, a_quote_char); - else - l_result := surround_with(substr(a_value, 1, c_overflow_substr_len ), a_quote_char) || gc_more_data_string; - end if ; - return l_result; - end; - - function to_string( - a_value clob, - a_quote_char varchar2 := '''', - a_max_output_len in number := gc_max_output_string_length - ) return varchar2 is - l_result varchar2(32767); - c_length constant integer := coalesce(dbms_lob.getlength(a_value), 0); - c_max_input_string_length constant integer := a_max_output_len - coalesce( length( a_quote_char ) * 2, 0 ); - c_overflow_substr_len constant integer := c_max_input_string_length - gc_more_data_string_len; - begin - if a_value is null then - l_result := gc_null_string; - elsif c_length = 0 then - l_result := gc_empty_string; - elsif c_length <= c_max_input_string_length then - l_result := surround_with(a_value,a_quote_char); - else - l_result := surround_with(dbms_lob.substr(a_value, c_overflow_substr_len), a_quote_char) || gc_more_data_string; - end if; - return l_result; - end; - - function to_string( - a_value blob, - a_quote_char varchar2 := '''', - a_max_output_len in number := gc_max_output_string_length - ) return varchar2 is - l_result varchar2(32767); - c_length constant integer := coalesce(dbms_lob.getlength(a_value), 0); - c_max_input_string_length constant integer := a_max_output_len - coalesce( length( a_quote_char ) * 2, 0 ); - c_overflow_substr_len constant integer := c_max_input_string_length - gc_more_data_string_len; - begin - if a_value is null then - l_result := gc_null_string; - elsif c_length = 0 then - l_result := gc_empty_string; - elsif c_length <= c_max_input_string_length then - l_result := surround_with(rawtohex(a_value),a_quote_char); - else - l_result := to_string( rawtohex(dbms_lob.substr(a_value, c_overflow_substr_len)) ); - end if ; - return l_result; - end; - - function to_string(a_value boolean) return varchar2 is - begin - return case a_value when true then 'TRUE' when false then 'FALSE' else gc_null_string end; - end; - - function to_string(a_value number) return varchar2 is - begin - return coalesce(to_char(a_value,gc_number_format), gc_null_string); - end; - - function to_string(a_value date) return varchar2 is - begin - return coalesce(to_char(a_value,gc_date_format), gc_null_string); - end; - - function to_string(a_value timestamp_unconstrained) return varchar2 is - begin - return coalesce(to_char(a_value,gc_timestamp_format), gc_null_string); - end; - - function to_string(a_value timestamp_tz_unconstrained) return varchar2 is - begin - return coalesce(to_char(a_value,gc_timestamp_tz_format), gc_null_string); - end; - - function to_string(a_value timestamp_ltz_unconstrained) return varchar2 is - begin - return coalesce(to_char(a_value,gc_timestamp_format), gc_null_string); - end; - - function to_string(a_value yminterval_unconstrained) return varchar2 IS - begin - return coalesce(to_char(a_value), gc_null_string); - end; - - function to_string(a_value dsinterval_unconstrained) return varchar2 IS - begin - return coalesce(to_char(a_value), gc_null_string); - end; - - - function boolean_to_int(a_value boolean) return integer is - begin - return case a_value when true then 1 when false then 0 end; - end; - - function int_to_boolean(a_value integer) return boolean is - begin - return case a_value when 1 then true when 0 then false end; - end; - - function string_to_table(a_string varchar2, a_delimiter varchar2:= chr(10), a_skip_leading_delimiter varchar2 := 'N') return ut_varchar2_list is - l_offset integer := 1; - l_delimiter_position integer; - l_skip_leading_delimiter boolean := coalesce(a_skip_leading_delimiter = 'Y',false); - l_result ut_varchar2_list := ut_varchar2_list(); - begin - if a_string is null then - return l_result; - end if; - if a_delimiter is null then - return ut_varchar2_list(a_string); - end if; - - loop - l_delimiter_position := instr(a_string, a_delimiter, l_offset); - if not (l_delimiter_position = 1 and l_skip_leading_delimiter) then - l_result.extend; - if l_delimiter_position > 0 then - l_result(l_result.last) := substr(a_string, l_offset, l_delimiter_position - l_offset); - else - l_result(l_result.last) := substr(a_string, l_offset); - end if; - end if; - exit when l_delimiter_position = 0; - l_offset := l_delimiter_position + 1; - end loop; - return l_result; - end; - - function clob_to_table(a_clob clob, a_max_amount integer := 8191, a_delimiter varchar2:= chr(10)) return ut_varchar2_list is - l_offset integer := 1; - l_length integer := dbms_lob.getlength(a_clob); - l_amount integer; - l_buffer varchar2(32767); - l_last_line varchar2(32767); - l_string_results ut_varchar2_list; - l_results ut_varchar2_list := ut_varchar2_list(); - l_has_last_line boolean; - l_skip_leading_delimiter varchar2(1) := 'N'; - begin - while l_offset <= l_length loop - l_amount := a_max_amount - coalesce( length(l_last_line), 0 ); - dbms_lob.read(a_clob, l_amount, l_offset, l_buffer); - l_offset := l_offset + l_amount; - - l_string_results := string_to_table( l_last_line || l_buffer, a_delimiter, l_skip_leading_delimiter ); - for i in 1 .. l_string_results.count loop - --if a split of lines was not done or not at the last line - if l_string_results.count = 1 or i < l_string_results.count then - l_results.extend; - l_results(l_results.last) := l_string_results(i); - end if; - end loop; - - --check if we need to append the last line to the next element - if l_string_results.count = 1 then - l_has_last_line := false; - l_last_line := null; - elsif l_string_results.count > 1 then - l_has_last_line := true; - l_last_line := l_string_results(l_string_results.count); - end if; - - l_skip_leading_delimiter := 'Y'; - end loop; - if l_has_last_line then - l_results.extend; - l_results(l_results.last) := l_last_line; - end if; - return l_results; - end; - - function table_to_clob(a_text_table ut_varchar2_list, a_delimiter varchar2:= chr(10)) return clob is - l_result clob; - l_table_rows integer := coalesce(cardinality(a_text_table),0); - begin - for i in 1 .. l_table_rows loop - if i < l_table_rows then - append_to_clob(l_result, a_text_table(i)||a_delimiter); - else - append_to_clob(l_result, a_text_table(i)); - end if; - end loop; - return l_result; - end; - - function table_to_clob(a_integer_table ut_integer_list, a_delimiter varchar2:= chr(10)) return clob is - l_result clob; - l_table_rows integer := coalesce(cardinality(a_integer_table),0); - begin - for i in 1 .. l_table_rows loop - if i < l_table_rows then - append_to_clob(l_result, a_integer_table(i)||a_delimiter); - else - append_to_clob(l_result, a_integer_table(i)); - end if; - end loop; - return l_result; - end; - - function time_diff(a_start_time timestamp with time zone, a_end_time timestamp with time zone) return number is - begin - return - extract(day from(a_end_time - a_start_time)) * 24 * 60 * 60 + - extract(hour from(a_end_time - a_start_time)) * 60 * 60 + - extract(minute from(a_end_time - a_start_time)) * 60 + - extract(second from(a_end_time - a_start_time)); - end; - - function indent_lines(a_text varchar2, a_indent_size integer := 4, a_include_first_line boolean := false) return varchar2 is - begin - if a_include_first_line then - return rtrim(lpad( ' ', a_indent_size ) || replace( a_text, chr(10), chr(10) || lpad( ' ', a_indent_size ) )); - else - return rtrim(replace( a_text, chr(10), chr(10) || lpad( ' ', a_indent_size ) )); - end if; - end; - - function get_utplsql_objects_list return ut_object_names is - l_result ut_object_names; - begin - select distinct ut_object_name(sys_context('userenv','current_user'), o.object_name) - bulk collect into l_result - from user_objects o - where o.object_name = 'UT' or object_name like 'UT\_%' escape '\' - and o.object_type <> 'SYNONYM'; - return l_result; - end; - - procedure append_to_list(a_list in out nocopy ut_varchar2_list, a_item varchar2) is - begin - if a_item is not null then - if a_list is null then - a_list := ut_varchar2_list(); - end if; - a_list.extend; - a_list(a_list.last) := a_item; - end if; - end append_to_list; - - procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_items ut_varchar2_rows) is - begin - if a_items is not null then - if a_list is null then - a_list := ut_varchar2_rows(); - end if; - for i in 1 .. a_items.count loop - a_list.extend; - a_list(a_list.last) := a_items(i); - end loop; - end if; - end; - - procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_item clob) is - begin - append_to_list( - a_list, - convert_collection( - clob_to_table( a_item, ut_utils.gc_max_storage_varchar2_len ) - ) - ); - end; - - procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_item varchar2) is - begin - if a_item is not null then - if a_list is null then - a_list := ut_varchar2_rows(); - end if; - if length(a_item) > gc_max_storage_varchar2_len then - append_to_list( - a_list, - ut_utils.convert_collection( - ut_utils.clob_to_table( a_item, gc_max_storage_varchar2_len ) - ) - ); - else - a_list.extend; - a_list(a_list.last) := a_item; - end if; - end if; - end append_to_list; - - procedure append_to_clob(a_src_clob in out nocopy clob, a_clob_table t_clob_tab, a_delimiter varchar2:= chr(10)) is - begin - if a_clob_table is not null and cardinality(a_clob_table) > 0 then - if a_src_clob is null then - dbms_lob.createtemporary(a_src_clob, true); - end if; - for i in 1 .. a_clob_table.count loop - dbms_lob.append(a_src_clob,a_clob_table(i)); - if i < a_clob_table.count then - append_to_clob(a_src_clob,a_delimiter); - end if; - end loop; - end if; - end; - - procedure append_to_clob(a_src_clob in out nocopy clob, a_new_data clob) is - begin - if a_new_data is not null and dbms_lob.getlength(a_new_data) > 0 then - if a_src_clob is null then - dbms_lob.createtemporary(a_src_clob, true); - end if; - dbms_lob.append(a_src_clob, a_new_data); - end if; - end; - - procedure append_to_clob(a_src_clob in out nocopy clob, a_new_data varchar2) is - begin - if a_new_data is not null then - if a_src_clob is null then - dbms_lob.createtemporary(a_src_clob, true); - end if; - dbms_lob.writeappend(a_src_clob, dbms_lob.getlength(a_new_data), a_new_data); - end if; - end; - - function convert_collection(a_collection ut_varchar2_list) return ut_varchar2_rows is - l_result ut_varchar2_rows; - begin - if a_collection is not null then - l_result := ut_varchar2_rows(); - for i in 1 .. a_collection.count loop - l_result.extend(); - l_result(i) := substr(a_collection(i),1,gc_max_storage_varchar2_len); - end loop; - end if; - return l_result; - end; - - procedure set_action(a_text in varchar2) is - begin - dbms_application_info.set_module('utPLSQL', a_text); - end; - - procedure set_client_info(a_text in varchar2) is - begin - dbms_application_info.set_client_info(a_text); - end; - - function to_xpath(a_list varchar2, a_ancestors varchar2 := '/*/') return varchar2 is - l_xpath varchar2(32767) := a_list; - begin - l_xpath := to_xpath( clob_to_table(a_clob=>a_list, a_delimiter=>','), a_ancestors); - return l_xpath; - end; - - function to_xpath(a_list ut_varchar2_list, a_ancestors varchar2 := '/*/') return varchar2 is - l_xpath varchar2(32767); - l_item varchar2(32767); - l_iter integer; - begin - if a_list is not null then - l_iter := a_list.first; - while l_iter is not null loop - l_item := trim(a_list(l_iter)); - if l_item is not null then - if l_item like '%,%' then - l_xpath := l_xpath || to_xpath( l_item, a_ancestors ) || '|'; - elsif l_item like '/%' then - l_xpath := l_xpath || l_item || '|'; - else - l_xpath := l_xpath || a_ancestors || l_item || '|'; - end if; - end if; - l_iter := a_list.next(l_iter); - end loop; - l_xpath := rtrim(l_xpath,',|'); - end if; - return l_xpath; - end; - - procedure cleanup_temp_tables is - begin - execute immediate 'delete from ut_compound_data_tmp'; - execute immediate 'delete from ut_compound_data_diff_tmp'; - end; - - function to_version(a_version_no varchar2) return t_version is - l_result t_version; - c_version_part_regex constant varchar2(20) := '[0-9]+'; - begin - - if regexp_like(a_version_no,'v?([0-9]+(\.|$)){1,4}') then - l_result.major := regexp_substr(a_version_no, c_version_part_regex, 1, 1); - l_result.minor := regexp_substr(a_version_no, c_version_part_regex, 1, 2); - l_result.bugfix := regexp_substr(a_version_no, c_version_part_regex, 1, 3); - l_result.build := regexp_substr(a_version_no, c_version_part_regex, 1, 4); - else - raise_application_error(gc_invalid_version_no, 'Version string "'||a_version_no||'" is not a valid version'); - end if; - return l_result; - end; - - procedure save_dbms_output_to_cache is - l_status number; - l_line varchar2(32767); - l_offset integer := 0; - l_lines ut_varchar2_rows := ut_varchar2_rows(); - c_lines_limit constant integer := 100; - pragma autonomous_transaction; - - procedure flush_lines(a_lines ut_varchar2_rows, a_offset integer) is - begin - insert into ut_dbms_output_cache (seq_no,text) - select rownum+a_offset, column_value - from table(a_lines); - end; - begin - loop - dbms_output.get_line(line => l_line, status => l_status); - exit when l_status = 1; - l_lines := l_lines multiset union all ut_utils.convert_collection(ut_utils.clob_to_table(l_line||chr(7),4000)); - if l_lines.count > c_lines_limit then - flush_lines(l_lines, l_offset); - l_offset := l_offset + l_lines.count; - l_lines.delete; - end if; - end loop; - flush_lines(l_lines, l_offset); - commit; - end; - - procedure read_cache_to_dbms_output is - l_lines_data sys_refcursor; - l_lines ut_varchar2_rows; - c_lines_limit constant integer := 100; - pragma autonomous_transaction; - begin - open l_lines_data for select text from ut_dbms_output_cache order by seq_no; - loop - fetch l_lines_data bulk collect into l_lines limit c_lines_limit; - for i in 1 .. l_lines.count loop - if substr(l_lines(i),-1) = chr(7) then - dbms_output.put_line(rtrim(l_lines(i),chr(7))); - else - dbms_output.put(l_lines(i)); - end if; - end loop; - exit when l_lines_data%notfound; - end loop; - delete from ut_dbms_output_cache; - commit; - end; - - function ut_owner return varchar2 is - begin - return sys_context('userenv','current_schema'); - end; - - function scale_cardinality(a_cardinality natural) return natural is - begin - return nvl(trunc(power(10,(floor(log(10,a_cardinality))+1))/3),0); - end; - - function build_depreciation_warning(a_old_syntax varchar2, a_new_syntax varchar2) return varchar2 is - begin - return 'The syntax: "'||a_old_syntax||'" is deprecated.' ||chr(10)|| - 'Please use the new syntax: "'||a_new_syntax||'".' ||chr(10)|| - 'The deprecated syntax will not be supported in future releases.'; - end; - - function to_xml_number_format(a_value number) return varchar2 is - begin - return to_char(a_value, gc_number_format, 'NLS_NUMERIC_CHARACTERS=''. '''); - end; - - function get_xml_header(a_encoding varchar2) return varchar2 is - begin - return - ''; - end; - - function trim_list_elements(a_list ut_varchar2_list, a_regexp_to_trim varchar2 default '[:space:]') return ut_varchar2_list is - l_trimmed_list ut_varchar2_list; - l_index integer; - begin - if a_list is not null then - l_trimmed_list := ut_varchar2_list(); - l_index := a_list.first; - - while (l_index is not null) loop - l_trimmed_list.extend; - l_trimmed_list(l_trimmed_list.count) := regexp_replace(a_list(l_index), '(^['||a_regexp_to_trim||']*)|(['||a_regexp_to_trim||']*$)'); - l_index := a_list.next(l_index); - end loop; - end if; - - return l_trimmed_list; - end; - - function filter_list(a_list in ut_varchar2_list, a_regexp_filter in varchar2) return ut_varchar2_list is - l_filtered_list ut_varchar2_list; - l_index integer; - begin - if a_list is not null then - l_filtered_list := ut_varchar2_list(); - l_index := a_list.first; - - while (l_index is not null) loop - if regexp_like(a_list(l_index), a_regexp_filter) then - l_filtered_list.extend; - l_filtered_list(l_filtered_list.count) := a_list(l_index); - end if; - l_index := a_list.next(l_index); - end loop; - end if; - - return l_filtered_list; - end; - - function xmlgen_escaped_string(a_string in varchar2) return varchar2 is - l_result varchar2(4000) := a_string; - l_sql varchar2(32767) := q'!select q'[!'||a_string||q'!]' as "!'||a_string||'" from dual'; - begin - if a_string is not null then - select extract(dbms_xmlgen.getxmltype(l_sql),'/*/*/*').getRootElement() - into l_result - from dual; - end if; - return l_result; - end; - - function replace_multiline_comments(a_source clob) return clob is - l_result clob; - l_ml_comment_start binary_integer := 1; - l_comment_start binary_integer := 1; - l_text_start binary_integer := 1; - l_escaped_text_start binary_integer := 1; - l_escaped_text_end_char varchar2(1 char); - l_end binary_integer := 1; - l_ml_comment clob; - l_newlines_count binary_integer; - l_offset binary_integer := 1; - l_length binary_integer := coalesce(dbms_lob.getlength(a_source), 0); - begin - l_ml_comment_start := instr(a_source,'/*'); - l_comment_start := instr(a_source,'--'); - l_text_start := instr(a_source,''''); - l_escaped_text_start := instr(a_source,q'[q']'); - while l_offset > 0 and l_ml_comment_start > 0 loop - - if l_ml_comment_start > 0 and (l_ml_comment_start < l_comment_start or l_comment_start = 0) - and (l_ml_comment_start < l_text_start or l_text_start = 0)and (l_ml_comment_start < l_escaped_text_start or l_escaped_text_start = 0) - then - l_end := instr(a_source,'*/',l_ml_comment_start+2); - append_to_clob(l_result, dbms_lob.substr(a_source, l_ml_comment_start-l_offset, l_offset)); - if l_end > 0 then - l_ml_comment := substr(a_source, l_ml_comment_start, l_end-l_ml_comment_start); - l_newlines_count := length( l_ml_comment ) - length( translate( l_ml_comment, 'a'||chr(10), 'a') ); - if l_newlines_count > 0 then - append_to_clob(l_result, lpad( chr(10), l_newlines_count, chr(10) ) ); - end if; - l_end := l_end + 2; - end if; - else - - if l_comment_start > 0 and (l_comment_start < l_ml_comment_start or l_ml_comment_start = 0) - and (l_comment_start < l_text_start or l_text_start = 0) and (l_comment_start < l_escaped_text_start or l_escaped_text_start = 0) - then - l_end := instr(a_source,chr(10),l_comment_start+2); - if l_end > 0 then - l_end := l_end + 1; - end if; - elsif l_text_start > 0 and (l_text_start < l_ml_comment_start or l_ml_comment_start = 0) - and (l_text_start < l_comment_start or l_comment_start = 0) and (l_text_start < l_escaped_text_start or l_escaped_text_start = 0) - then - l_end := instr(a_source,q'[']',l_text_start+1); - - --skip double quotes while searching for end of quoted text - while l_end > 0 and l_end = instr(a_source,q'['']',l_text_start+1) loop - l_end := instr(a_source,q'[']',l_end+1); - end loop; - if l_end > 0 then - l_end := l_end + 1; - end if; - - elsif l_escaped_text_start > 0 and (l_escaped_text_start < l_ml_comment_start or l_ml_comment_start = 0) - and (l_escaped_text_start < l_comment_start or l_comment_start = 0) and (l_escaped_text_start < l_text_start or l_text_start = 0) - then - --translate char "[" from the start of quoted text "q'[someting]'" into "]" - l_escaped_text_end_char := translate( substr(a_source, l_escaped_text_start + 2, 1), '[{(<', ']})>'); - l_end := instr(a_source,l_escaped_text_end_char||'''',l_escaped_text_start + 3 ); - if l_end > 0 then - l_end := l_end + 2; - end if; - end if; - - if l_end = 0 then - append_to_clob(l_result, substr(a_source, l_offset, l_length-l_offset)); - else - append_to_clob(l_result, substr(a_source, l_offset, l_end-l_offset)); - end if; - end if; - l_offset := l_end; - if l_offset >= l_ml_comment_start then - l_ml_comment_start := instr(a_source,'/*',l_offset); - end if; - if l_offset >= l_comment_start then - l_comment_start := instr(a_source,'--',l_offset); - end if; - if l_offset >= l_text_start then - l_text_start := instr(a_source,'''',l_offset); - end if; - if l_offset >= l_escaped_text_start then - l_escaped_text_start := instr(a_source,q'[q']',l_offset); - end if; - end loop; - append_to_clob(l_result, substr(a_source, l_end)); - return l_result; - end; - - function get_child_reporters(a_for_reporters ut_reporters_info := null) return ut_reporters_info is - l_for_reporters ut_reporters_info := a_for_reporters; - l_results ut_reporters_info; - begin - if l_for_reporters is null then - l_for_reporters := ut_reporters_info(ut_reporter_info('UT_REPORTER_BASE','N','N','N')); - end if; - - select /*+ cardinality(f 10) */ - ut_reporter_info( - object_name => t.type_name, - is_output_reporter => - case - when f.is_output_reporter = 'Y' or t.type_name = 'UT_OUTPUT_REPORTER_BASE' - then 'Y' else 'N' - end, - is_instantiable => case when t.instantiable = 'YES' then 'Y' else 'N' end, - is_final => case when t.final = 'YES' then 'Y' else 'N' end - ) - bulk collect into l_results - from user_types t - join (select * from table(l_for_reporters) where is_final = 'N' ) f - on f.object_name = supertype_name; - - return l_results; - end; - - function remove_error_from_stack(a_error_stack varchar2, a_ora_code number) return varchar2 is - l_caller_stack_line varchar2(4000); - l_ora_search_pattern varchar2(500) := '^ORA'||a_ora_code||': (.*)$'; - begin - l_caller_stack_line := regexp_replace(srcstr => a_error_stack - ,pattern => l_ora_search_pattern - ,replacestr => null - ,position => 1 - ,occurrence => 1 - ,modifier => 'm'); - return l_caller_stack_line; - end; - - /** - * Change string into unicode to match xmlgen format _00_ - * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.7.2935-develop - */ - function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is - begin - return '_x00'||rawtohex(utl_raw.cast_to_raw(a_character))||'_'; - end; - - /** - * Build valid XML column name as element names can contain letters, digits, hyphens, underscores, and periods - */ - function build_valid_xml_name(a_preprocessed_name varchar2) return varchar2 is - l_post_processed varchar2(4000); - begin - for i in (select regexp_substr( a_preprocessed_name ,'(.{1})', 1, level, null, 1 ) AS string_char,level level_no - from dual connect by level <= regexp_count(a_preprocessed_name, '(.{1})')) - loop - if i.level_no = 1 and regexp_like(i.string_char,gc_invalid_first_xml_char) then - l_post_processed := l_post_processed || char_to_xmlgen_unicode(i.string_char); - elsif regexp_like(i.string_char,gc_invalid_xml_char) then - l_post_processed := l_post_processed || char_to_xmlgen_unicode(i.string_char); - else - l_post_processed := l_post_processed || i.string_char; - end if; - end loop; - return l_post_processed; - end; - - function get_valid_xml_name(a_name varchar2) return varchar2 is - l_valid_name varchar2(4000); - begin - if regexp_like(a_name,gc_full_valid_xml_name) then - l_valid_name := a_name; - else - l_valid_name := build_valid_xml_name(a_name); - end if; - return l_valid_name; - end; - - function add_prefix(a_list ut_varchar2_list, a_prefix varchar2, a_connector varchar2 := '/') return ut_varchar2_list is - l_result ut_varchar2_list := ut_varchar2_list(); - l_idx binary_integer; - begin - if a_prefix is not null then - l_idx := a_list.first; - while l_idx is not null loop - l_result.extend; - l_result(l_idx) := a_prefix||a_connector||trim(leading a_connector from a_list(l_idx)); - l_idx := a_list.next(l_idx); - end loop; - end if; - return l_result; - end; - -end ut_utils; -/ +create or replace package body ut_utils is + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + /** + * Constants regex used to validate XML name + */ + gc_invalid_first_xml_char constant varchar2(50) := '[^_a-zA-Z]'; + gc_invalid_xml_char constant varchar2(50) := '[^_a-zA-Z0-9\.-]'; + gc_full_valid_xml_name constant varchar2(50) := '^([_a-zA-Z])([_a-zA-Z0-9\.-])*$'; + + function surround_with(a_value varchar2, a_quote_char varchar2) return varchar2 is + begin + return case when a_quote_char is not null then a_quote_char||a_value||a_quote_char else a_value end; + end; + + function test_result_to_char(a_test_result integer) return varchar2 as + l_result varchar2(20); + begin + if a_test_result = gc_success then + l_result := gc_success_char; + elsif a_test_result = gc_failure then + l_result := gc_failure_char; + elsif a_test_result = gc_error then + l_result := gc_error_char; + elsif a_test_result = gc_disabled then + l_result := gc_disabled_char; + else + l_result := 'Unknown(' || coalesce(to_char(a_test_result),'NULL') || ')'; + end if ; + return l_result; + end test_result_to_char; + + + function to_test_result(a_test boolean) return integer is + l_result integer; + begin + if a_test then + l_result := gc_success; + else + l_result := gc_failure; + end if; + return l_result; + end; + + function gen_savepoint_name return varchar2 is + begin + return 's'||trim(to_char(ut_savepoint_seq.nextval,'0000000000000000000000000000')); + end; + + procedure debug_log(a_message varchar2) is + begin + $if $$ut_trace $then + dbms_output.put_line(a_message); + $else + null; + $end + end; + + procedure debug_log(a_message clob) is + l_varchars ut_varchar2_list; + begin + $if $$ut_trace $then + l_varchars := clob_to_table(a_message); + for i in 1..l_varchars.count loop + dbms_output.put_line(l_varchars(i)); + end loop; + $else + null; + $end + end; + + function to_string( + a_value varchar2, + a_quote_char varchar2 := '''', + a_max_output_len in number := gc_max_output_string_length + ) return varchar2 is + l_result varchar2(32767); + c_length constant integer := coalesce( length( a_value ), 0 ); + c_max_input_string_length constant integer := a_max_output_len - coalesce( length( a_quote_char ) * 2, 0 ); + c_overflow_substr_len constant integer := c_max_input_string_length - gc_more_data_string_len; + begin + if c_length = 0 then + l_result := gc_null_string; + elsif c_length <= c_max_input_string_length then + l_result := surround_with(a_value, a_quote_char); + else + l_result := surround_with(substr(a_value, 1, c_overflow_substr_len ), a_quote_char) || gc_more_data_string; + end if ; + return l_result; + end; + + function to_string( + a_value clob, + a_quote_char varchar2 := '''', + a_max_output_len in number := gc_max_output_string_length + ) return varchar2 is + l_result varchar2(32767); + c_length constant integer := coalesce(dbms_lob.getlength(a_value), 0); + c_max_input_string_length constant integer := a_max_output_len - coalesce( length( a_quote_char ) * 2, 0 ); + c_overflow_substr_len constant integer := c_max_input_string_length - gc_more_data_string_len; + begin + if a_value is null then + l_result := gc_null_string; + elsif c_length = 0 then + l_result := gc_empty_string; + elsif c_length <= c_max_input_string_length then + l_result := surround_with(a_value,a_quote_char); + else + l_result := surround_with(dbms_lob.substr(a_value, c_overflow_substr_len), a_quote_char) || gc_more_data_string; + end if; + return l_result; + end; + + function to_string( + a_value blob, + a_quote_char varchar2 := '''', + a_max_output_len in number := gc_max_output_string_length + ) return varchar2 is + l_result varchar2(32767); + c_length constant integer := coalesce(dbms_lob.getlength(a_value), 0); + c_max_input_string_length constant integer := a_max_output_len - coalesce( length( a_quote_char ) * 2, 0 ); + c_overflow_substr_len constant integer := c_max_input_string_length - gc_more_data_string_len; + begin + if a_value is null then + l_result := gc_null_string; + elsif c_length = 0 then + l_result := gc_empty_string; + elsif c_length <= c_max_input_string_length then + l_result := surround_with(rawtohex(a_value),a_quote_char); + else + l_result := to_string( rawtohex(dbms_lob.substr(a_value, c_overflow_substr_len)) ); + end if ; + return l_result; + end; + + function to_string(a_value boolean) return varchar2 is + begin + return case a_value when true then 'TRUE' when false then 'FALSE' else gc_null_string end; + end; + + function to_string(a_value number) return varchar2 is + begin + return coalesce(to_char(a_value,gc_number_format), gc_null_string); + end; + + function to_string(a_value date) return varchar2 is + begin + return coalesce(to_char(a_value,gc_date_format), gc_null_string); + end; + + function to_string(a_value timestamp_unconstrained) return varchar2 is + begin + return coalesce(to_char(a_value,gc_timestamp_format), gc_null_string); + end; + + function to_string(a_value timestamp_tz_unconstrained) return varchar2 is + begin + return coalesce(to_char(a_value,gc_timestamp_tz_format), gc_null_string); + end; + + function to_string(a_value timestamp_ltz_unconstrained) return varchar2 is + begin + return coalesce(to_char(a_value,gc_timestamp_format), gc_null_string); + end; + + function to_string(a_value yminterval_unconstrained) return varchar2 IS + begin + return coalesce(to_char(a_value), gc_null_string); + end; + + function to_string(a_value dsinterval_unconstrained) return varchar2 IS + begin + return coalesce(to_char(a_value), gc_null_string); + end; + + + function boolean_to_int(a_value boolean) return integer is + begin + return case a_value when true then 1 when false then 0 end; + end; + + function int_to_boolean(a_value integer) return boolean is + begin + return case a_value when 1 then true when 0 then false end; + end; + + function string_to_table(a_string varchar2, a_delimiter varchar2:= chr(10), a_skip_leading_delimiter varchar2 := 'N') return ut_varchar2_list is + l_offset integer := 1; + l_delimiter_position integer; + l_skip_leading_delimiter boolean := coalesce(a_skip_leading_delimiter = 'Y',false); + l_result ut_varchar2_list := ut_varchar2_list(); + begin + if a_string is null then + return l_result; + end if; + if a_delimiter is null then + return ut_varchar2_list(a_string); + end if; + + loop + l_delimiter_position := instr(a_string, a_delimiter, l_offset); + if not (l_delimiter_position = 1 and l_skip_leading_delimiter) then + l_result.extend; + if l_delimiter_position > 0 then + l_result(l_result.last) := substr(a_string, l_offset, l_delimiter_position - l_offset); + else + l_result(l_result.last) := substr(a_string, l_offset); + end if; + end if; + exit when l_delimiter_position = 0; + l_offset := l_delimiter_position + 1; + end loop; + return l_result; + end; + + function clob_to_table(a_clob clob, a_max_amount integer := 8191, a_delimiter varchar2:= chr(10)) return ut_varchar2_list is + l_offset integer := 1; + l_length integer := dbms_lob.getlength(a_clob); + l_amount integer; + l_buffer varchar2(32767); + l_last_line varchar2(32767); + l_string_results ut_varchar2_list; + l_results ut_varchar2_list := ut_varchar2_list(); + l_has_last_line boolean; + l_skip_leading_delimiter varchar2(1) := 'N'; + begin + while l_offset <= l_length loop + l_amount := a_max_amount - coalesce( length(l_last_line), 0 ); + dbms_lob.read(a_clob, l_amount, l_offset, l_buffer); + l_offset := l_offset + l_amount; + + l_string_results := string_to_table( l_last_line || l_buffer, a_delimiter, l_skip_leading_delimiter ); + for i in 1 .. l_string_results.count loop + --if a split of lines was not done or not at the last line + if l_string_results.count = 1 or i < l_string_results.count then + l_results.extend; + l_results(l_results.last) := l_string_results(i); + end if; + end loop; + + --check if we need to append the last line to the next element + if l_string_results.count = 1 then + l_has_last_line := false; + l_last_line := null; + elsif l_string_results.count > 1 then + l_has_last_line := true; + l_last_line := l_string_results(l_string_results.count); + end if; + + l_skip_leading_delimiter := 'Y'; + end loop; + if l_has_last_line then + l_results.extend; + l_results(l_results.last) := l_last_line; + end if; + return l_results; + end; + + function table_to_clob(a_text_table ut_varchar2_list, a_delimiter varchar2:= chr(10)) return clob is + l_result clob; + l_table_rows integer := coalesce(cardinality(a_text_table),0); + begin + for i in 1 .. l_table_rows loop + if i < l_table_rows then + append_to_clob(l_result, a_text_table(i)||a_delimiter); + else + append_to_clob(l_result, a_text_table(i)); + end if; + end loop; + return l_result; + end; + + function table_to_clob(a_integer_table ut_integer_list, a_delimiter varchar2:= chr(10)) return clob is + l_result clob; + l_table_rows integer := coalesce(cardinality(a_integer_table),0); + begin + for i in 1 .. l_table_rows loop + if i < l_table_rows then + append_to_clob(l_result, a_integer_table(i)||a_delimiter); + else + append_to_clob(l_result, a_integer_table(i)); + end if; + end loop; + return l_result; + end; + + function time_diff(a_start_time timestamp with time zone, a_end_time timestamp with time zone) return number is + begin + return + extract(day from(a_end_time - a_start_time)) * 24 * 60 * 60 + + extract(hour from(a_end_time - a_start_time)) * 60 * 60 + + extract(minute from(a_end_time - a_start_time)) * 60 + + extract(second from(a_end_time - a_start_time)); + end; + + function indent_lines(a_text varchar2, a_indent_size integer := 4, a_include_first_line boolean := false) return varchar2 is + begin + if a_include_first_line then + return rtrim(lpad( ' ', a_indent_size ) || replace( a_text, chr(10), chr(10) || lpad( ' ', a_indent_size ) )); + else + return rtrim(replace( a_text, chr(10), chr(10) || lpad( ' ', a_indent_size ) )); + end if; + end; + + function get_utplsql_objects_list return ut_object_names is + l_result ut_object_names; + begin + select distinct ut_object_name(sys_context('userenv','current_user'), o.object_name) + bulk collect into l_result + from user_objects o + where o.object_name = 'UT' or object_name like 'UT\_%' escape '\' + and o.object_type <> 'SYNONYM'; + return l_result; + end; + + procedure append_to_list(a_list in out nocopy ut_varchar2_list, a_item varchar2) is + begin + if a_item is not null then + if a_list is null then + a_list := ut_varchar2_list(); + end if; + a_list.extend; + a_list(a_list.last) := a_item; + end if; + end append_to_list; + + procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_items ut_varchar2_rows) is + begin + if a_items is not null then + if a_list is null then + a_list := ut_varchar2_rows(); + end if; + for i in 1 .. a_items.count loop + a_list.extend; + a_list(a_list.last) := a_items(i); + end loop; + end if; + end; + + procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_item clob) is + begin + append_to_list( + a_list, + convert_collection( + clob_to_table( a_item, ut_utils.gc_max_storage_varchar2_len ) + ) + ); + end; + + procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_item varchar2) is + begin + if a_item is not null then + if a_list is null then + a_list := ut_varchar2_rows(); + end if; + if length(a_item) > gc_max_storage_varchar2_len then + append_to_list( + a_list, + ut_utils.convert_collection( + ut_utils.clob_to_table( a_item, gc_max_storage_varchar2_len ) + ) + ); + else + a_list.extend; + a_list(a_list.last) := a_item; + end if; + end if; + end append_to_list; + + procedure append_to_clob(a_src_clob in out nocopy clob, a_clob_table t_clob_tab, a_delimiter varchar2:= chr(10)) is + begin + if a_clob_table is not null and cardinality(a_clob_table) > 0 then + if a_src_clob is null then + dbms_lob.createtemporary(a_src_clob, true); + end if; + for i in 1 .. a_clob_table.count loop + dbms_lob.append(a_src_clob,a_clob_table(i)); + if i < a_clob_table.count then + append_to_clob(a_src_clob,a_delimiter); + end if; + end loop; + end if; + end; + + procedure append_to_clob(a_src_clob in out nocopy clob, a_new_data clob) is + begin + if a_new_data is not null and dbms_lob.getlength(a_new_data) > 0 then + if a_src_clob is null then + dbms_lob.createtemporary(a_src_clob, true); + end if; + dbms_lob.append(a_src_clob, a_new_data); + end if; + end; + + procedure append_to_clob(a_src_clob in out nocopy clob, a_new_data varchar2) is + begin + if a_new_data is not null then + if a_src_clob is null then + dbms_lob.createtemporary(a_src_clob, true); + end if; + dbms_lob.writeappend(a_src_clob, dbms_lob.getlength(a_new_data), a_new_data); + end if; + end; + + function convert_collection(a_collection ut_varchar2_list) return ut_varchar2_rows is + l_result ut_varchar2_rows; + begin + if a_collection is not null then + l_result := ut_varchar2_rows(); + for i in 1 .. a_collection.count loop + l_result.extend(); + l_result(i) := substr(a_collection(i),1,gc_max_storage_varchar2_len); + end loop; + end if; + return l_result; + end; + + procedure set_action(a_text in varchar2) is + begin + dbms_application_info.set_module('utPLSQL', a_text); + end; + + procedure set_client_info(a_text in varchar2) is + begin + dbms_application_info.set_client_info(a_text); + end; + + function to_xpath(a_list varchar2, a_ancestors varchar2 := '/*/') return varchar2 is + l_xpath varchar2(32767) := a_list; + begin + l_xpath := to_xpath( clob_to_table(a_clob=>a_list, a_delimiter=>','), a_ancestors); + return l_xpath; + end; + + function to_xpath(a_list ut_varchar2_list, a_ancestors varchar2 := '/*/') return varchar2 is + l_xpath varchar2(32767); + l_item varchar2(32767); + l_iter integer; + begin + if a_list is not null then + l_iter := a_list.first; + while l_iter is not null loop + l_item := trim(a_list(l_iter)); + if l_item is not null then + if l_item like '%,%' then + l_xpath := l_xpath || to_xpath( l_item, a_ancestors ) || '|'; + elsif l_item like '/%' then + l_xpath := l_xpath || l_item || '|'; + else + l_xpath := l_xpath || a_ancestors || l_item || '|'; + end if; + end if; + l_iter := a_list.next(l_iter); + end loop; + l_xpath := rtrim(l_xpath,',|'); + end if; + return l_xpath; + end; + + procedure cleanup_temp_tables is + begin + execute immediate 'delete from ut_compound_data_tmp'; + execute immediate 'delete from ut_compound_data_diff_tmp'; + end; + + function to_version(a_version_no varchar2) return t_version is + l_result t_version; + c_version_part_regex constant varchar2(20) := '[0-9]+'; + begin + + if regexp_like(a_version_no,'v?([0-9]+(\.|$)){1,4}') then + l_result.major := regexp_substr(a_version_no, c_version_part_regex, 1, 1); + l_result.minor := regexp_substr(a_version_no, c_version_part_regex, 1, 2); + l_result.bugfix := regexp_substr(a_version_no, c_version_part_regex, 1, 3); + l_result.build := regexp_substr(a_version_no, c_version_part_regex, 1, 4); + else + raise_application_error(gc_invalid_version_no, 'Version string "'||a_version_no||'" is not a valid version'); + end if; + return l_result; + end; + + procedure save_dbms_output_to_cache is + l_status number; + l_line varchar2(32767); + l_offset integer := 0; + l_lines ut_varchar2_rows := ut_varchar2_rows(); + c_lines_limit constant integer := 100; + pragma autonomous_transaction; + + procedure flush_lines(a_lines ut_varchar2_rows, a_offset integer) is + begin + insert into ut_dbms_output_cache (seq_no,text) + select rownum+a_offset, column_value + from table(a_lines); + end; + begin + loop + dbms_output.get_line(line => l_line, status => l_status); + exit when l_status = 1; + l_lines := l_lines multiset union all ut_utils.convert_collection(ut_utils.clob_to_table(l_line||chr(7),4000)); + if l_lines.count > c_lines_limit then + flush_lines(l_lines, l_offset); + l_offset := l_offset + l_lines.count; + l_lines.delete; + end if; + end loop; + flush_lines(l_lines, l_offset); + commit; + end; + + procedure read_cache_to_dbms_output is + l_lines_data sys_refcursor; + l_lines ut_varchar2_rows; + c_lines_limit constant integer := 100; + pragma autonomous_transaction; + begin + open l_lines_data for select text from ut_dbms_output_cache order by seq_no; + loop + fetch l_lines_data bulk collect into l_lines limit c_lines_limit; + for i in 1 .. l_lines.count loop + if substr(l_lines(i),-1) = chr(7) then + dbms_output.put_line(rtrim(l_lines(i),chr(7))); + else + dbms_output.put(l_lines(i)); + end if; + end loop; + exit when l_lines_data%notfound; + end loop; + delete from ut_dbms_output_cache; + commit; + end; + + function ut_owner return varchar2 is + begin + return sys_context('userenv','current_schema'); + end; + + function scale_cardinality(a_cardinality natural) return natural is + begin + return nvl(trunc(power(10,(floor(log(10,a_cardinality))+1))/3),0); + end; + + function build_depreciation_warning(a_old_syntax varchar2, a_new_syntax varchar2) return varchar2 is + begin + return 'The syntax: "'||a_old_syntax||'" is deprecated.' ||chr(10)|| + 'Please use the new syntax: "'||a_new_syntax||'".' ||chr(10)|| + 'The deprecated syntax will not be supported in future releases.'; + end; + + function to_xml_number_format(a_value number) return varchar2 is + begin + return to_char(a_value, gc_number_format, 'NLS_NUMERIC_CHARACTERS=''. '''); + end; + + function get_xml_header(a_encoding varchar2) return varchar2 is + begin + return + ''; + end; + + function trim_list_elements(a_list ut_varchar2_list, a_regexp_to_trim varchar2 default '[:space:]') return ut_varchar2_list is + l_trimmed_list ut_varchar2_list; + l_index integer; + begin + if a_list is not null then + l_trimmed_list := ut_varchar2_list(); + l_index := a_list.first; + + while (l_index is not null) loop + l_trimmed_list.extend; + l_trimmed_list(l_trimmed_list.count) := regexp_replace(a_list(l_index), '(^['||a_regexp_to_trim||']*)|(['||a_regexp_to_trim||']*$)'); + l_index := a_list.next(l_index); + end loop; + end if; + + return l_trimmed_list; + end; + + function filter_list(a_list in ut_varchar2_list, a_regexp_filter in varchar2) return ut_varchar2_list is + l_filtered_list ut_varchar2_list; + l_index integer; + begin + if a_list is not null then + l_filtered_list := ut_varchar2_list(); + l_index := a_list.first; + + while (l_index is not null) loop + if regexp_like(a_list(l_index), a_regexp_filter) then + l_filtered_list.extend; + l_filtered_list(l_filtered_list.count) := a_list(l_index); + end if; + l_index := a_list.next(l_index); + end loop; + end if; + + return l_filtered_list; + end; + + function xmlgen_escaped_string(a_string in varchar2) return varchar2 is + l_result varchar2(4000) := a_string; + l_sql varchar2(32767) := q'!select q'[!'||a_string||q'!]' as "!'||a_string||'" from dual'; + begin + if a_string is not null then + select extract(dbms_xmlgen.getxmltype(l_sql),'/*/*/*').getRootElement() + into l_result + from dual; + end if; + return l_result; + end; + + function replace_multiline_comments(a_source clob) return clob is + l_result clob; + l_ml_comment_start binary_integer := 1; + l_comment_start binary_integer := 1; + l_text_start binary_integer := 1; + l_escaped_text_start binary_integer := 1; + l_escaped_text_end_char varchar2(1 char); + l_end binary_integer := 1; + l_ml_comment clob; + l_newlines_count binary_integer; + l_offset binary_integer := 1; + l_length binary_integer := coalesce(dbms_lob.getlength(a_source), 0); + begin + l_ml_comment_start := instr(a_source,'/*'); + l_comment_start := instr(a_source,'--'); + l_text_start := instr(a_source,''''); + l_escaped_text_start := instr(a_source,q'[q']'); + while l_offset > 0 and l_ml_comment_start > 0 loop + + if l_ml_comment_start > 0 and (l_ml_comment_start < l_comment_start or l_comment_start = 0) + and (l_ml_comment_start < l_text_start or l_text_start = 0)and (l_ml_comment_start < l_escaped_text_start or l_escaped_text_start = 0) + then + l_end := instr(a_source,'*/',l_ml_comment_start+2); + append_to_clob(l_result, dbms_lob.substr(a_source, l_ml_comment_start-l_offset, l_offset)); + if l_end > 0 then + l_ml_comment := substr(a_source, l_ml_comment_start, l_end-l_ml_comment_start); + l_newlines_count := length( l_ml_comment ) - length( translate( l_ml_comment, 'a'||chr(10), 'a') ); + if l_newlines_count > 0 then + append_to_clob(l_result, lpad( chr(10), l_newlines_count, chr(10) ) ); + end if; + l_end := l_end + 2; + end if; + else + + if l_comment_start > 0 and (l_comment_start < l_ml_comment_start or l_ml_comment_start = 0) + and (l_comment_start < l_text_start or l_text_start = 0) and (l_comment_start < l_escaped_text_start or l_escaped_text_start = 0) + then + l_end := instr(a_source,chr(10),l_comment_start+2); + if l_end > 0 then + l_end := l_end + 1; + end if; + elsif l_text_start > 0 and (l_text_start < l_ml_comment_start or l_ml_comment_start = 0) + and (l_text_start < l_comment_start or l_comment_start = 0) and (l_text_start < l_escaped_text_start or l_escaped_text_start = 0) + then + l_end := instr(a_source,q'[']',l_text_start+1); + + --skip double quotes while searching for end of quoted text + while l_end > 0 and l_end = instr(a_source,q'['']',l_text_start+1) loop + l_end := instr(a_source,q'[']',l_end+1); + end loop; + if l_end > 0 then + l_end := l_end + 1; + end if; + + elsif l_escaped_text_start > 0 and (l_escaped_text_start < l_ml_comment_start or l_ml_comment_start = 0) + and (l_escaped_text_start < l_comment_start or l_comment_start = 0) and (l_escaped_text_start < l_text_start or l_text_start = 0) + then + --translate char "[" from the start of quoted text "q'[someting]'" into "]" + l_escaped_text_end_char := translate( substr(a_source, l_escaped_text_start + 2, 1), '[{(<', ']})>'); + l_end := instr(a_source,l_escaped_text_end_char||'''',l_escaped_text_start + 3 ); + if l_end > 0 then + l_end := l_end + 2; + end if; + end if; + + if l_end = 0 then + append_to_clob(l_result, substr(a_source, l_offset, l_length-l_offset)); + else + append_to_clob(l_result, substr(a_source, l_offset, l_end-l_offset)); + end if; + end if; + l_offset := l_end; + if l_offset >= l_ml_comment_start then + l_ml_comment_start := instr(a_source,'/*',l_offset); + end if; + if l_offset >= l_comment_start then + l_comment_start := instr(a_source,'--',l_offset); + end if; + if l_offset >= l_text_start then + l_text_start := instr(a_source,'''',l_offset); + end if; + if l_offset >= l_escaped_text_start then + l_escaped_text_start := instr(a_source,q'[q']',l_offset); + end if; + end loop; + append_to_clob(l_result, substr(a_source, l_end)); + return l_result; + end; + + function get_child_reporters(a_for_reporters ut_reporters_info := null) return ut_reporters_info is + l_for_reporters ut_reporters_info := a_for_reporters; + l_results ut_reporters_info; + begin + if l_for_reporters is null then + l_for_reporters := ut_reporters_info(ut_reporter_info('UT_REPORTER_BASE','N','N','N')); + end if; + + select /*+ cardinality(f 10) */ + ut_reporter_info( + object_name => t.type_name, + is_output_reporter => + case + when f.is_output_reporter = 'Y' or t.type_name = 'UT_OUTPUT_REPORTER_BASE' + then 'Y' else 'N' + end, + is_instantiable => case when t.instantiable = 'YES' then 'Y' else 'N' end, + is_final => case when t.final = 'YES' then 'Y' else 'N' end + ) + bulk collect into l_results + from user_types t + join (select * from table(l_for_reporters) where is_final = 'N' ) f + on f.object_name = supertype_name; + + return l_results; + end; + + function remove_error_from_stack(a_error_stack varchar2, a_ora_code number) return varchar2 is + l_caller_stack_line varchar2(4000); + l_ora_search_pattern varchar2(500) := '^ORA'||a_ora_code||': (.*)$'; + begin + l_caller_stack_line := regexp_replace(srcstr => a_error_stack + ,pattern => l_ora_search_pattern + ,replacestr => null + ,position => 1 + ,occurrence => 1 + ,modifier => 'm'); + return l_caller_stack_line; + end; + + /** + * Change string into unicode to match xmlgen format _00_ + * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 + * secion v3.1.7.2935-develop + */ + function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is + begin + return '_x00'||rawtohex(utl_raw.cast_to_raw(a_character))||'_'; + end; + + /** + * Build valid XML column name as element names can contain letters, digits, hyphens, underscores, and periods + */ + function build_valid_xml_name(a_preprocessed_name varchar2) return varchar2 is + l_post_processed varchar2(4000); + begin + for i in (select regexp_substr( a_preprocessed_name ,'(.{1})', 1, level, null, 1 ) AS string_char,level level_no + from dual connect by level <= regexp_count(a_preprocessed_name, '(.{1})')) + loop + if i.level_no = 1 and regexp_like(i.string_char,gc_invalid_first_xml_char) then + l_post_processed := l_post_processed || char_to_xmlgen_unicode(i.string_char); + elsif regexp_like(i.string_char,gc_invalid_xml_char) then + l_post_processed := l_post_processed || char_to_xmlgen_unicode(i.string_char); + else + l_post_processed := l_post_processed || i.string_char; + end if; + end loop; + return l_post_processed; + end; + + function get_valid_xml_name(a_name varchar2) return varchar2 is + l_valid_name varchar2(4000); + begin + if regexp_like(a_name,gc_full_valid_xml_name) then + l_valid_name := a_name; + else + l_valid_name := build_valid_xml_name(a_name); + end if; + return l_valid_name; + end; + + function add_prefix(a_list ut_varchar2_list, a_prefix varchar2, a_connector varchar2 := '/') return ut_varchar2_list is + l_result ut_varchar2_list := ut_varchar2_list(); + l_idx binary_integer; + begin + if a_prefix is not null then + l_idx := a_list.first; + while l_idx is not null loop + l_result.extend; + l_result(l_idx) := add_prefix(a_list(l_idx), a_prefix, a_connector); + l_idx := a_list.next(l_idx); + end loop; + end if; + return l_result; + end; + + function add_prefix(a_item varchar2, a_prefix varchar2, a_connector varchar2 := '/') return varchar2 is + begin + return a_prefix||a_connector||trim(leading a_connector from a_item); + end; + + function strip_prefix(a_item varchar2, a_prefix varchar2, a_connector varchar2 := '/') return varchar2 is + begin + return regexp_replace(a_item,a_prefix||a_connector); + end; + +end ut_utils; +/ diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 3739819fb..03e553ef2 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -1,396 +1,400 @@ -create or replace package ut_utils authid definer is - /* - utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project - - Licensed under the Apache License, Version 2.0 (the "License"): - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - - /** - * Common utilities and constants used throughout utPLSQL framework - * - */ - - gc_version constant varchar2(50) := 'v3.1.7.2935-develop'; - - subtype t_executable_type is varchar2(30); - gc_before_all constant t_executable_type := 'beforeall'; - gc_before_each constant t_executable_type := 'beforeeach'; - gc_before_test constant t_executable_type := 'beforetest'; - gc_test_execute constant t_executable_type := 'test'; - gc_after_test constant t_executable_type := 'aftertest'; - gc_after_each constant t_executable_type := 'aftereach'; - gc_after_all constant t_executable_type := 'afterall'; - - /* Constants: Test Results */ - subtype t_test_result is binary_integer range 0 .. 3; - gc_disabled constant t_test_result := 0; -- test/suite was disabled - gc_success constant t_test_result := 1; -- test passed - gc_failure constant t_test_result := 2; -- one or more expectations failed - gc_error constant t_test_result := 3; -- exception was raised - - gc_disabled_char constant varchar2(8) := 'Disabled'; -- test/suite was disabled - gc_success_char constant varchar2(7) := 'Success'; -- test passed - gc_failure_char constant varchar2(7) := 'Failure'; -- one or more expectations failed - gc_error_char constant varchar2(5) := 'Error'; -- exception was raised - - /* - Constants: Rollback type for ut_test_object - */ - subtype t_rollback_type is binary_integer range 0 .. 1; - gc_rollback_auto constant t_rollback_type := 0; -- rollback after each test and suite - gc_rollback_manual constant t_rollback_type := 1; -- leave transaction control manual - gc_rollback_default constant t_rollback_type := gc_rollback_auto; - - ex_unsupported_rollback_type exception; - gc_unsupported_rollback_type constant pls_integer := -20200; - pragma exception_init(ex_unsupported_rollback_type, -20200); - - ex_path_list_is_empty exception; - gc_path_list_is_empty constant pls_integer := -20201; - pragma exception_init(ex_path_list_is_empty, -20201); - - ex_invalid_path_format exception; - gc_invalid_path_format constant pls_integer := -20202; - pragma exception_init(ex_invalid_path_format, -20202); - - ex_suite_package_not_found exception; - gc_suite_package_not_found constant pls_integer := -20204; - pragma exception_init(ex_suite_package_not_found, -20204); - - -- Reporting event time not supported - ex_invalid_rep_event_time exception; - gc_invalid_rep_event_time constant pls_integer := -20210; - pragma exception_init(ex_invalid_rep_event_time, -20210); - - -- Reporting event name not supported - ex_invalid_rep_event_name exception; - gc_invalid_rep_event_name constant pls_integer := -20211; - pragma exception_init(ex_invalid_rep_event_name, -20211); - - -- Any of tests failed - ex_some_tests_failed exception; - gc_some_tests_failed constant pls_integer := -20213; - pragma exception_init(ex_some_tests_failed, -20213); - - -- Version number provided is not in valid format - ex_invalid_version_no exception; - gc_invalid_version_no constant pls_integer := -20214; - pragma exception_init(ex_invalid_version_no, -20214); - - -- Version number provided is not in valid format - ex_out_buffer_timeout exception; - gc_out_buffer_timeout constant pls_integer := -20215; - pragma exception_init(ex_out_buffer_timeout, -20215); - - ex_invalid_package exception; - gc_invalid_package constant pls_integer := -6550; - pragma exception_init(ex_invalid_package, -6550); - - ex_failure_for_all exception; - gc_failure_for_all constant pls_integer := -24381; - pragma exception_init (ex_failure_for_all, -24381); - - ex_dml_for_all exception; - gc_dml_for_all constant pls_integer := -20216; - pragma exception_init (ex_dml_for_all, -20216); - - ex_value_too_large exception; - gc_value_too_large constant pls_integer := -20217; - pragma exception_init (ex_value_too_large, -20217); - - ex_xml_processing exception; - gc_xml_processing constant pls_integer := -19202; - pragma exception_init (ex_xml_processing, -19202); - - ex_failed_open_cur exception; - gc_failed_open_cur constant pls_integer := -20218; - pragma exception_init (ex_failed_open_cur, -20218); - - gc_max_storage_varchar2_len constant integer := 4000; - gc_max_output_string_length constant integer := 4000; - gc_more_data_string constant varchar2(5) := '[...]'; - gc_more_data_string_len constant integer := length( gc_more_data_string ); - gc_number_format constant varchar2(100) := 'TM9'; - gc_date_format constant varchar2(100) := 'yyyy-mm-dd"T"hh24:mi:ss'; - gc_timestamp_format constant varchar2(100) := 'yyyy-mm-dd"T"hh24:mi:ssxff'; - gc_timestamp_tz_format constant varchar2(100) := 'yyyy-mm-dd"T"hh24:mi:ssxff tzh:tzm'; - gc_null_string constant varchar2(4) := 'NULL'; - gc_empty_string constant varchar2(5) := 'EMPTY'; - - gc_bc_fetch_limit constant integer := 1000; - gc_diff_max_rows constant integer := 20; - - type t_version is record( - major natural, - minor natural, - bugfix natural, - build natural - ); - - type t_clob_tab is table of clob; - - /** - * Converts test results into strings - * - * @param a_test_result numeric representation of test result - * - * @return a string representation of a test_result. - */ - function test_result_to_char(a_test_result integer) return varchar2; - - function to_test_result(a_test boolean) return integer; - - /** - * Generates a unique name for a savepoint - * Uses sys_guid, as timestamp gives only miliseconds on Windows and is not unique - * Issue: #506 for details on the implementation approach - */ - function gen_savepoint_name return varchar2; - - procedure debug_log(a_message varchar2); - - procedure debug_log(a_message clob); - - function to_string( - a_value varchar2, - a_quote_char varchar2 := '''', - a_max_output_len in number := gc_max_output_string_length - ) return varchar2; - - function to_string( - a_value clob, - a_quote_char varchar2 := '''', - a_max_output_len in number := gc_max_output_string_length - ) return varchar2; - - function to_string( - a_value blob, - a_quote_char varchar2 := '''', - a_max_output_len in number := gc_max_output_string_length - ) return varchar2; - - function to_string(a_value boolean) return varchar2; - - function to_string(a_value number) return varchar2; - - function to_string(a_value date) return varchar2; - - function to_string(a_value timestamp_unconstrained) return varchar2; - - function to_string(a_value timestamp_tz_unconstrained) return varchar2; - - function to_string(a_value timestamp_ltz_unconstrained) return varchar2; - - function to_string(a_value yminterval_unconstrained) return varchar2; - - function to_string(a_value dsinterval_unconstrained) return varchar2; - - function boolean_to_int(a_value boolean) return integer; - - function int_to_boolean(a_value integer) return boolean; - - /** - * - * Splits a given string into table of string by delimiter. - * The delimiter gets removed. - * If null passed as any of the parameters, empty table is returned. - * If no occurence of a_delimiter found in a_text then text is returned as a single row of the table. - * If no text between delimiters found then an empty row is returned, example: - * string_to_table( 'a,,b', ',' ) gives table ut_varchar2_list( 'a', null, 'b' ); - * - * @param a_string the text to be split. - * @param a_delimiter the delimiter character or string - * @param a_skip_leading_delimiter determines if the leading delimiter should be ignored, used by clob_to_table - * - * @return table of varchar2 values - */ - function string_to_table(a_string varchar2, a_delimiter varchar2:= chr(10), a_skip_leading_delimiter varchar2 := 'N') return ut_varchar2_list; - - /** - * Splits a given string into table of string by delimiter. - * Default value of a_max_amount is 8191 because of code can contains multibyte character. - * The delimiter gets removed. - * If null passed as any of the parameters, empty table is returned. - * If split text is longer than a_max_amount it gets split into pieces of a_max_amount. - * If no text between delimiters found then an empty row is returned, example: - * string_to_table( 'a,,b', ',' ) gives table ut_varchar2_list( 'a', null, 'b' ); - * - * @param a_clob the text to be split. - * @param a_delimiter the delimiter character or string (default chr(10) ) - * @param a_max_amount the maximum length of returned string (default 8191) - * @return table of varchar2 values - */ - function clob_to_table(a_clob clob, a_max_amount integer := 8191, a_delimiter varchar2:= chr(10)) return ut_varchar2_list; - - function table_to_clob(a_text_table ut_varchar2_list, a_delimiter varchar2:= chr(10)) return clob; - - function table_to_clob(a_integer_table ut_integer_list, a_delimiter varchar2:= chr(10)) return clob; - - /** - * Returns time difference in seconds (with miliseconds) between given timestamps - */ - function time_diff(a_start_time timestamp with time zone, a_end_time timestamp with time zone) return number; - - /** - * Returns a text indented with spaces except the first line. - */ - function indent_lines(a_text varchar2, a_indent_size integer := 4, a_include_first_line boolean := false) return varchar2; - - - /** - * Returns a list of object that are part of utPLSQL framework - */ - function get_utplsql_objects_list return ut_object_names; - - /** - * Append a item to the end of ut_varchar2_list - */ - procedure append_to_list(a_list in out nocopy ut_varchar2_list, a_item varchar2); - - /** - * Append a item to the end of ut_varchar2_rows - */ - procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_item varchar2); - - /** - * Append a item to the end of ut_varchar2_rows - */ - procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_item clob); - - /** - * Append a list of items to the end of ut_varchar2_rows - */ - procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_items ut_varchar2_rows); - - procedure append_to_clob(a_src_clob in out nocopy clob, a_clob_table t_clob_tab, a_delimiter varchar2 := chr(10)); - - procedure append_to_clob(a_src_clob in out nocopy clob, a_new_data clob); - - procedure append_to_clob(a_src_clob in out nocopy clob, a_new_data varchar2); - - function convert_collection(a_collection ut_varchar2_list) return ut_varchar2_rows; - - /** - * Set session's action and module using dbms_application_info - */ - procedure set_action(a_text in varchar2); - - /** - * Set session's client info using dbms_application_info - */ - procedure set_client_info(a_text in varchar2); - - function to_xpath(a_list varchar2, a_ancestors varchar2 := '/*/') return varchar2; - - function to_xpath(a_list ut_varchar2_list, a_ancestors varchar2 := '/*/') return varchar2; - - procedure cleanup_temp_tables; - - /** - * Converts version string into version record - * - * @param a_version_no string representation of version in format vX.X.X.X where X is a positive integer - * @return t_version record with up to four positive numbers containing version - * @throws 20214 if passed version string is not matching version pattern - */ - function to_version(a_version_no varchar2) return t_version; - - - /** - * Saves data from dbms_output buffer into a global temporary table (cache) - * used to store dbms_output buffer captured before the run - * - */ - procedure save_dbms_output_to_cache; - - /** - * Reads data from global temporary table (cache) abd puts it back into dbms_output - * used to recover dbms_output buffer data after a run is complete - * - */ - procedure read_cache_to_dbms_output; - - - /** - * Function is used to reference to utPLSQL owned objects in dynamic sql statements executed from packages with invoker rights - * - * @return the name of the utPSQL schema owner - */ - function ut_owner return varchar2; - - - /** - * Used in dynamic sql select statements to maintain balance between - * number of hard-parses and optimiser accurancy for cardinality of collections - * - * - * @return 3, for inputs of: 1-9; 33 for input of 10 - 99; 333 for (100 - 999) - */ - function scale_cardinality(a_cardinality natural) return natural; - - function build_depreciation_warning(a_old_syntax varchar2, a_new_syntax varchar2) return varchar2; - - /** - * Returns number as string. The value is represented as decimal according to XML standard: - * https://www.w3.org/TR/xmlschema-2/#decimal - */ - function to_xml_number_format(a_value number) return varchar2; - - - /** - * Returns xml header. If a_encoding is not null, header will include encoding attribute with provided value - */ - function get_xml_header(a_encoding varchar2) return varchar2; - - - /** - * Takes a collection of type ut_varchar2_list and it trims the characters passed as arguments for every element - */ - function trim_list_elements(a_list IN ut_varchar2_list, a_regexp_to_trim in varchar2 default '[:space:]') return ut_varchar2_list; - - /** - * Takes a collection of type ut_varchar2_list and it only returns the elements which meets the regular expression - */ - function filter_list(a_list IN ut_varchar2_list, a_regexp_filter in varchar2) return ut_varchar2_list; - - -- Generates XMLGEN escaped string - function xmlgen_escaped_string(a_string in varchar2) return varchar2; - - /** - * Replaces multi-line comments in given source-code with empty lines - */ - function replace_multiline_comments(a_source clob) return clob; - - /** - * Returns list of sub-type reporters for given list of super-type reporters - */ - function get_child_reporters(a_for_reporters ut_reporters_info := null) return ut_reporters_info; - - /** - * Remove given ORA error from stack - */ - function remove_error_from_stack(a_error_stack varchar2, a_ora_code number) return varchar2; - - /** - * Check if xml name is valid if not build a valid name - */ - function get_valid_xml_name(a_name varchar2) return varchar2; - - /** - * Add prefix word to elements of list - */ - function add_prefix(a_list ut_varchar2_list, a_prefix varchar2, a_connector varchar2 := '/') return ut_varchar2_list; - -end ut_utils; -/ +create or replace package ut_utils authid definer is + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + /** + * Common utilities and constants used throughout utPLSQL framework + * + */ + + gc_version constant varchar2(50) := 'v3.1.7.2935-develop'; + + subtype t_executable_type is varchar2(30); + gc_before_all constant t_executable_type := 'beforeall'; + gc_before_each constant t_executable_type := 'beforeeach'; + gc_before_test constant t_executable_type := 'beforetest'; + gc_test_execute constant t_executable_type := 'test'; + gc_after_test constant t_executable_type := 'aftertest'; + gc_after_each constant t_executable_type := 'aftereach'; + gc_after_all constant t_executable_type := 'afterall'; + + /* Constants: Test Results */ + subtype t_test_result is binary_integer range 0 .. 3; + gc_disabled constant t_test_result := 0; -- test/suite was disabled + gc_success constant t_test_result := 1; -- test passed + gc_failure constant t_test_result := 2; -- one or more expectations failed + gc_error constant t_test_result := 3; -- exception was raised + + gc_disabled_char constant varchar2(8) := 'Disabled'; -- test/suite was disabled + gc_success_char constant varchar2(7) := 'Success'; -- test passed + gc_failure_char constant varchar2(7) := 'Failure'; -- one or more expectations failed + gc_error_char constant varchar2(5) := 'Error'; -- exception was raised + + /* + Constants: Rollback type for ut_test_object + */ + subtype t_rollback_type is binary_integer range 0 .. 1; + gc_rollback_auto constant t_rollback_type := 0; -- rollback after each test and suite + gc_rollback_manual constant t_rollback_type := 1; -- leave transaction control manual + gc_rollback_default constant t_rollback_type := gc_rollback_auto; + + ex_unsupported_rollback_type exception; + gc_unsupported_rollback_type constant pls_integer := -20200; + pragma exception_init(ex_unsupported_rollback_type, -20200); + + ex_path_list_is_empty exception; + gc_path_list_is_empty constant pls_integer := -20201; + pragma exception_init(ex_path_list_is_empty, -20201); + + ex_invalid_path_format exception; + gc_invalid_path_format constant pls_integer := -20202; + pragma exception_init(ex_invalid_path_format, -20202); + + ex_suite_package_not_found exception; + gc_suite_package_not_found constant pls_integer := -20204; + pragma exception_init(ex_suite_package_not_found, -20204); + + -- Reporting event time not supported + ex_invalid_rep_event_time exception; + gc_invalid_rep_event_time constant pls_integer := -20210; + pragma exception_init(ex_invalid_rep_event_time, -20210); + + -- Reporting event name not supported + ex_invalid_rep_event_name exception; + gc_invalid_rep_event_name constant pls_integer := -20211; + pragma exception_init(ex_invalid_rep_event_name, -20211); + + -- Any of tests failed + ex_some_tests_failed exception; + gc_some_tests_failed constant pls_integer := -20213; + pragma exception_init(ex_some_tests_failed, -20213); + + -- Version number provided is not in valid format + ex_invalid_version_no exception; + gc_invalid_version_no constant pls_integer := -20214; + pragma exception_init(ex_invalid_version_no, -20214); + + -- Version number provided is not in valid format + ex_out_buffer_timeout exception; + gc_out_buffer_timeout constant pls_integer := -20215; + pragma exception_init(ex_out_buffer_timeout, -20215); + + ex_invalid_package exception; + gc_invalid_package constant pls_integer := -6550; + pragma exception_init(ex_invalid_package, -6550); + + ex_failure_for_all exception; + gc_failure_for_all constant pls_integer := -24381; + pragma exception_init (ex_failure_for_all, -24381); + + ex_dml_for_all exception; + gc_dml_for_all constant pls_integer := -20216; + pragma exception_init (ex_dml_for_all, -20216); + + ex_value_too_large exception; + gc_value_too_large constant pls_integer := -20217; + pragma exception_init (ex_value_too_large, -20217); + + ex_xml_processing exception; + gc_xml_processing constant pls_integer := -19202; + pragma exception_init (ex_xml_processing, -19202); + + ex_failed_open_cur exception; + gc_failed_open_cur constant pls_integer := -20218; + pragma exception_init (ex_failed_open_cur, -20218); + + gc_max_storage_varchar2_len constant integer := 4000; + gc_max_output_string_length constant integer := 4000; + gc_more_data_string constant varchar2(5) := '[...]'; + gc_more_data_string_len constant integer := length( gc_more_data_string ); + gc_number_format constant varchar2(100) := 'TM9'; + gc_date_format constant varchar2(100) := 'yyyy-mm-dd"T"hh24:mi:ss'; + gc_timestamp_format constant varchar2(100) := 'yyyy-mm-dd"T"hh24:mi:ssxff'; + gc_timestamp_tz_format constant varchar2(100) := 'yyyy-mm-dd"T"hh24:mi:ssxff tzh:tzm'; + gc_null_string constant varchar2(4) := 'NULL'; + gc_empty_string constant varchar2(5) := 'EMPTY'; + + gc_bc_fetch_limit constant integer := 1000; + gc_diff_max_rows constant integer := 20; + + type t_version is record( + major natural, + minor natural, + bugfix natural, + build natural + ); + + type t_clob_tab is table of clob; + + /** + * Converts test results into strings + * + * @param a_test_result numeric representation of test result + * + * @return a string representation of a test_result. + */ + function test_result_to_char(a_test_result integer) return varchar2; + + function to_test_result(a_test boolean) return integer; + + /** + * Generates a unique name for a savepoint + * Uses sys_guid, as timestamp gives only miliseconds on Windows and is not unique + * Issue: #506 for details on the implementation approach + */ + function gen_savepoint_name return varchar2; + + procedure debug_log(a_message varchar2); + + procedure debug_log(a_message clob); + + function to_string( + a_value varchar2, + a_quote_char varchar2 := '''', + a_max_output_len in number := gc_max_output_string_length + ) return varchar2; + + function to_string( + a_value clob, + a_quote_char varchar2 := '''', + a_max_output_len in number := gc_max_output_string_length + ) return varchar2; + + function to_string( + a_value blob, + a_quote_char varchar2 := '''', + a_max_output_len in number := gc_max_output_string_length + ) return varchar2; + + function to_string(a_value boolean) return varchar2; + + function to_string(a_value number) return varchar2; + + function to_string(a_value date) return varchar2; + + function to_string(a_value timestamp_unconstrained) return varchar2; + + function to_string(a_value timestamp_tz_unconstrained) return varchar2; + + function to_string(a_value timestamp_ltz_unconstrained) return varchar2; + + function to_string(a_value yminterval_unconstrained) return varchar2; + + function to_string(a_value dsinterval_unconstrained) return varchar2; + + function boolean_to_int(a_value boolean) return integer; + + function int_to_boolean(a_value integer) return boolean; + + /** + * + * Splits a given string into table of string by delimiter. + * The delimiter gets removed. + * If null passed as any of the parameters, empty table is returned. + * If no occurence of a_delimiter found in a_text then text is returned as a single row of the table. + * If no text between delimiters found then an empty row is returned, example: + * string_to_table( 'a,,b', ',' ) gives table ut_varchar2_list( 'a', null, 'b' ); + * + * @param a_string the text to be split. + * @param a_delimiter the delimiter character or string + * @param a_skip_leading_delimiter determines if the leading delimiter should be ignored, used by clob_to_table + * + * @return table of varchar2 values + */ + function string_to_table(a_string varchar2, a_delimiter varchar2:= chr(10), a_skip_leading_delimiter varchar2 := 'N') return ut_varchar2_list; + + /** + * Splits a given string into table of string by delimiter. + * Default value of a_max_amount is 8191 because of code can contains multibyte character. + * The delimiter gets removed. + * If null passed as any of the parameters, empty table is returned. + * If split text is longer than a_max_amount it gets split into pieces of a_max_amount. + * If no text between delimiters found then an empty row is returned, example: + * string_to_table( 'a,,b', ',' ) gives table ut_varchar2_list( 'a', null, 'b' ); + * + * @param a_clob the text to be split. + * @param a_delimiter the delimiter character or string (default chr(10) ) + * @param a_max_amount the maximum length of returned string (default 8191) + * @return table of varchar2 values + */ + function clob_to_table(a_clob clob, a_max_amount integer := 8191, a_delimiter varchar2:= chr(10)) return ut_varchar2_list; + + function table_to_clob(a_text_table ut_varchar2_list, a_delimiter varchar2:= chr(10)) return clob; + + function table_to_clob(a_integer_table ut_integer_list, a_delimiter varchar2:= chr(10)) return clob; + + /** + * Returns time difference in seconds (with miliseconds) between given timestamps + */ + function time_diff(a_start_time timestamp with time zone, a_end_time timestamp with time zone) return number; + + /** + * Returns a text indented with spaces except the first line. + */ + function indent_lines(a_text varchar2, a_indent_size integer := 4, a_include_first_line boolean := false) return varchar2; + + + /** + * Returns a list of object that are part of utPLSQL framework + */ + function get_utplsql_objects_list return ut_object_names; + + /** + * Append a item to the end of ut_varchar2_list + */ + procedure append_to_list(a_list in out nocopy ut_varchar2_list, a_item varchar2); + + /** + * Append a item to the end of ut_varchar2_rows + */ + procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_item varchar2); + + /** + * Append a item to the end of ut_varchar2_rows + */ + procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_item clob); + + /** + * Append a list of items to the end of ut_varchar2_rows + */ + procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_items ut_varchar2_rows); + + procedure append_to_clob(a_src_clob in out nocopy clob, a_clob_table t_clob_tab, a_delimiter varchar2 := chr(10)); + + procedure append_to_clob(a_src_clob in out nocopy clob, a_new_data clob); + + procedure append_to_clob(a_src_clob in out nocopy clob, a_new_data varchar2); + + function convert_collection(a_collection ut_varchar2_list) return ut_varchar2_rows; + + /** + * Set session's action and module using dbms_application_info + */ + procedure set_action(a_text in varchar2); + + /** + * Set session's client info using dbms_application_info + */ + procedure set_client_info(a_text in varchar2); + + function to_xpath(a_list varchar2, a_ancestors varchar2 := '/*/') return varchar2; + + function to_xpath(a_list ut_varchar2_list, a_ancestors varchar2 := '/*/') return varchar2; + + procedure cleanup_temp_tables; + + /** + * Converts version string into version record + * + * @param a_version_no string representation of version in format vX.X.X.X where X is a positive integer + * @return t_version record with up to four positive numbers containing version + * @throws 20214 if passed version string is not matching version pattern + */ + function to_version(a_version_no varchar2) return t_version; + + + /** + * Saves data from dbms_output buffer into a global temporary table (cache) + * used to store dbms_output buffer captured before the run + * + */ + procedure save_dbms_output_to_cache; + + /** + * Reads data from global temporary table (cache) abd puts it back into dbms_output + * used to recover dbms_output buffer data after a run is complete + * + */ + procedure read_cache_to_dbms_output; + + + /** + * Function is used to reference to utPLSQL owned objects in dynamic sql statements executed from packages with invoker rights + * + * @return the name of the utPSQL schema owner + */ + function ut_owner return varchar2; + + + /** + * Used in dynamic sql select statements to maintain balance between + * number of hard-parses and optimiser accurancy for cardinality of collections + * + * + * @return 3, for inputs of: 1-9; 33 for input of 10 - 99; 333 for (100 - 999) + */ + function scale_cardinality(a_cardinality natural) return natural; + + function build_depreciation_warning(a_old_syntax varchar2, a_new_syntax varchar2) return varchar2; + + /** + * Returns number as string. The value is represented as decimal according to XML standard: + * https://www.w3.org/TR/xmlschema-2/#decimal + */ + function to_xml_number_format(a_value number) return varchar2; + + + /** + * Returns xml header. If a_encoding is not null, header will include encoding attribute with provided value + */ + function get_xml_header(a_encoding varchar2) return varchar2; + + + /** + * Takes a collection of type ut_varchar2_list and it trims the characters passed as arguments for every element + */ + function trim_list_elements(a_list IN ut_varchar2_list, a_regexp_to_trim in varchar2 default '[:space:]') return ut_varchar2_list; + + /** + * Takes a collection of type ut_varchar2_list and it only returns the elements which meets the regular expression + */ + function filter_list(a_list IN ut_varchar2_list, a_regexp_filter in varchar2) return ut_varchar2_list; + + -- Generates XMLGEN escaped string + function xmlgen_escaped_string(a_string in varchar2) return varchar2; + + /** + * Replaces multi-line comments in given source-code with empty lines + */ + function replace_multiline_comments(a_source clob) return clob; + + /** + * Returns list of sub-type reporters for given list of super-type reporters + */ + function get_child_reporters(a_for_reporters ut_reporters_info := null) return ut_reporters_info; + + /** + * Remove given ORA error from stack + */ + function remove_error_from_stack(a_error_stack varchar2, a_ora_code number) return varchar2; + + /** + * Check if xml name is valid if not build a valid name + */ + function get_valid_xml_name(a_name varchar2) return varchar2; + + /** + * Add prefix word to elements of list + */ + function add_prefix(a_list ut_varchar2_list, a_prefix varchar2, a_connector varchar2 := '/') return ut_varchar2_list; + + function add_prefix(a_item varchar2, a_prefix varchar2, a_connector varchar2 := '/') return varchar2; + + function strip_prefix(a_item varchar2, a_prefix varchar2, a_connector varchar2 := '/') return varchar2; + +end ut_utils; +/ diff --git a/source/expectations/data_values/ut_cursor_column.tpb b/source/expectations/data_values/ut_cursor_column.tpb index 3c6931a5d..cb395e54a 100644 --- a/source/expectations/data_values/ut_cursor_column.tpb +++ b/source/expectations/data_values/ut_cursor_column.tpb @@ -1,69 +1,70 @@ -create or replace type body ut_cursor_column as - - member procedure init( - self in out nocopy ut_cursor_column, - a_col_name varchar2, a_col_schema_name varchar2, - a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, - a_col_position integer, a_col_type varchar2, a_collection integer,a_access_path in varchar2, a_col_precision in integer, - a_col_scale integer - ) is - begin - self.parent_name := a_parent_name; --Name of the parent if its nested - self.hierarchy_level := a_hierarchy_level; --Hierarchy level - self.column_position := a_col_position; --Position of the column in cursor/ type - self.column_len := a_col_max_len; --length of column - self.column_precision := a_col_precision; - self.column_scale := a_col_scale; - self.column_name := TRIM( BOTH '''' FROM a_col_name); --name of the column - self.column_type_name := coalesce(a_col_type_name,a_col_type); --type name e.g. test_dummy_object or varchar2 - self.xml_valid_name := ut_utils.get_valid_xml_name(self.column_name); - self.display_path := case when a_access_path is null then - self.column_name - else - a_access_path||'/'||self.column_name - end; --Access path used for incldue exclude eg/ TEST_DUMMY_OBJECT/VARCHAR2 - self.access_path := case when a_access_path is null then - self.xml_valid_name - else - a_access_path||'/'||self.xml_valid_name - end; --Access path used for incldue exclude eg/ TEST_DUMMY_OBJECT/VARCHAR2 - self.transformed_name := case when length(self.xml_valid_name) > 30 then - '"'||ut_compound_data_helper.get_fixed_size_hash(self.parent_name||self.xml_valid_name)||'"' - when self.parent_name is null then - '"'||self.xml_valid_name||'"' - else - '"'||ut_compound_data_helper.get_fixed_size_hash(self.parent_name||self.xml_valid_name)||'"' - end; --when is nestd we need to hash name to make sure we dont exceed 30 char - self.column_type := a_col_type; --column type e.g. user_defined , varchar2 - self.column_schema := a_col_schema_name; -- schema name - self.is_sql_diffable := case - when lower(self.column_type) = 'user_defined_type' then - 0 - -- Due to bug in 11g/12.1 collection fails on varchar 4000+ - when (lower(self.column_type) in ('varchar2','char')) and (self.column_len > 4000) then - 0 - else - ut_utils.boolean_to_int(ut_compound_data_helper.is_sql_compare_allowed(self.column_type)) - end; --can we directly compare or do we need to hash value - self.is_collection := a_collection; - self.has_nested_col := case when lower(self.column_type) = 'user_defined_type' and self.is_collection = 0 then 1 else 0 end; - end; - - constructor function ut_cursor_column( self in out nocopy ut_cursor_column, - a_col_name varchar2, a_col_schema_name varchar2, - a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, - a_col_position integer, a_col_type in varchar2, a_collection integer,a_access_path in varchar2, a_col_precision in integer, - a_col_scale integer - ) return self as result is - begin - init(a_col_name, a_col_schema_name, a_col_type_name, a_col_max_len, a_parent_name,a_hierarchy_level, a_col_position, - a_col_type, a_collection,a_access_path,a_col_precision,a_col_scale); - return; - end; - - constructor function ut_cursor_column( self in out nocopy ut_cursor_column) return self as result is - begin - return; - end; -end; -/ +create or replace type body ut_cursor_column as + + member procedure init( + self in out nocopy ut_cursor_column, + a_col_name varchar2, a_col_schema_name varchar2, + a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, + a_col_position integer, a_col_type varchar2, a_collection integer,a_access_path in varchar2, a_col_precision in integer, + a_col_scale integer + ) is + begin + self.parent_name := a_parent_name; --Name of the parent if its nested + self.hierarchy_level := a_hierarchy_level; --Hierarchy level + self.column_position := a_col_position; --Position of the column in cursor/ type + self.column_len := a_col_max_len; --length of column + self.column_precision := a_col_precision; + self.column_scale := a_col_scale; + self.column_name := TRIM( BOTH '''' FROM a_col_name); --name of the column + self.column_type_name := coalesce(a_col_type_name,a_col_type); --type name e.g. test_dummy_object or varchar2 + self.xml_valid_name := ut_utils.get_valid_xml_name(self.column_name); + self.display_path := case when a_access_path is null then + self.column_name + else + a_access_path||'/'||self.column_name + end; --Access path used for incldue exclude eg/ TEST_DUMMY_OBJECT/VARCHAR2 + self.access_path := case when a_access_path is null then + self.xml_valid_name + else + a_access_path||'/'||self.xml_valid_name + end; --Access path used for XMLTABLE query + self.filter_path := self.access_path; --Filter path will differ from access path in anydata type + self.transformed_name := case when length(self.xml_valid_name) > 30 then + '"'||ut_compound_data_helper.get_fixed_size_hash(self.parent_name||self.xml_valid_name)||'"' + when self.parent_name is null then + '"'||self.xml_valid_name||'"' + else + '"'||ut_compound_data_helper.get_fixed_size_hash(self.parent_name||self.xml_valid_name)||'"' + end; --when is nestd we need to hash name to make sure we dont exceed 30 char + self.column_type := a_col_type; --column type e.g. user_defined , varchar2 + self.column_schema := a_col_schema_name; -- schema name + self.is_sql_diffable := case + when lower(self.column_type) = 'user_defined_type' then + 0 + -- Due to bug in 11g/12.1 collection fails on varchar 4000+ + when (lower(self.column_type) in ('varchar2','char')) and (self.column_len > 4000) then + 0 + else + ut_utils.boolean_to_int(ut_compound_data_helper.is_sql_compare_allowed(self.column_type)) + end; --can we directly compare or do we need to hash value + self.is_collection := a_collection; + self.has_nested_col := case when lower(self.column_type) = 'user_defined_type' and self.is_collection = 0 then 1 else 0 end; + end; + + constructor function ut_cursor_column( self in out nocopy ut_cursor_column, + a_col_name varchar2, a_col_schema_name varchar2, + a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, + a_col_position integer, a_col_type in varchar2, a_collection integer,a_access_path in varchar2, a_col_precision in integer, + a_col_scale integer + ) return self as result is + begin + init(a_col_name, a_col_schema_name, a_col_type_name, a_col_max_len, a_parent_name,a_hierarchy_level, a_col_position, + a_col_type, a_collection,a_access_path,a_col_precision,a_col_scale); + return; + end; + + constructor function ut_cursor_column( self in out nocopy ut_cursor_column) return self as result is + begin + return; + end; +end; +/ diff --git a/source/expectations/data_values/ut_cursor_column.tps b/source/expectations/data_values/ut_cursor_column.tps index db9cbd3ae..da3c004f2 100644 --- a/source/expectations/data_values/ut_cursor_column.tps +++ b/source/expectations/data_values/ut_cursor_column.tps @@ -1,51 +1,52 @@ -create or replace type ut_cursor_column force authid current_user as object ( - /* - utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project - - Licensed under the Apache License, Version 2.0 (the "License"): - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - parent_name varchar2(4000), - access_path varchar2(4000), - display_path varchar2(4000), - has_nested_col number(1,0), - transformed_name varchar2(2000), - hierarchy_level number, - column_position number, - xml_valid_name varchar2(2000), - column_name varchar2(2000), - column_type varchar2(128), - column_type_name varchar2(128), - column_schema varchar2(128), - column_len integer, - column_precision integer, - column_scale integer, - is_sql_diffable number(1, 0), - is_collection number(1, 0), - - member procedure init(self in out nocopy ut_cursor_column, - a_col_name varchar2, a_col_schema_name varchar2, - a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, - a_col_position integer, a_col_type in varchar2, a_collection integer,a_access_path in varchar2, a_col_precision in integer, - a_col_scale integer), - - constructor function ut_cursor_column( self in out nocopy ut_cursor_column, - a_col_name varchar2, a_col_schema_name varchar2, - a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, - a_col_position integer, a_col_type in varchar2, a_collection integer, a_access_path in varchar2, a_col_precision in integer, - a_col_scale integer) - return self as result, - - constructor function ut_cursor_column( self in out nocopy ut_cursor_column) return self as result -) -/ +create or replace type ut_cursor_column authid current_user as object ( + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + parent_name varchar2(4000), + access_path varchar2(4000), + filter_path varchar2(4000), + display_path varchar2(4000), + has_nested_col number(1,0), + transformed_name varchar2(2000), + hierarchy_level number, + column_position number, + xml_valid_name varchar2(2000), + column_name varchar2(2000), + column_type varchar2(128), + column_type_name varchar2(128), + column_schema varchar2(128), + column_len integer, + column_precision integer, + column_scale integer, + is_sql_diffable number(1, 0), + is_collection number(1, 0), + + member procedure init(self in out nocopy ut_cursor_column, + a_col_name varchar2, a_col_schema_name varchar2, + a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, + a_col_position integer, a_col_type in varchar2, a_collection integer,a_access_path in varchar2, a_col_precision in integer, + a_col_scale integer), + + constructor function ut_cursor_column( self in out nocopy ut_cursor_column, + a_col_name varchar2, a_col_schema_name varchar2, + a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, + a_col_position integer, a_col_type in varchar2, a_collection integer, a_access_path in varchar2, a_col_precision in integer, + a_col_scale integer) + return self as result, + + constructor function ut_cursor_column( self in out nocopy ut_cursor_column) return self as result +) +/ diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb index 99e1d4edc..2a70a51dd 100644 --- a/source/expectations/data_values/ut_cursor_details.tpb +++ b/source/expectations/data_values/ut_cursor_details.tpb @@ -1,286 +1,257 @@ -create or replace type body ut_cursor_details as - - member function equals( a_other ut_cursor_details, a_match_options ut_matcher_options ) return boolean is - l_diffs integer; - begin - select count(1) into l_diffs - from table(self.cursor_columns_info) a - full outer join table(a_other.cursor_columns_info) e - on decode(a.parent_name,e.parent_name,1,0)= 1 - and a.column_name = e.column_name - and replace(a.column_type,'VARCHAR2','CHAR') = replace(e.column_type,'VARCHAR2','CHAR') - and ( a.column_position = e.column_position or a_match_options.columns_are_unordered_flag = 1 ) - where a.column_name is null or e.column_name is null; - return l_diffs = 0; - end; - - member procedure desc_compound_data( - self in out nocopy ut_cursor_details, a_compound_data anytype, - a_parent_name in varchar2, a_level in integer, a_access_path in varchar2 - ) is - l_idx pls_integer := 1; - l_elements_info ut_metadata.t_anytype_members_rec; - l_element_info ut_metadata.t_anytype_elem_info_rec; - l_is_collection boolean; - begin - l_elements_info := ut_metadata.get_anytype_members_info( a_compound_data ); - l_is_collection := ut_metadata.is_collection(l_elements_info.type_code); - if l_elements_info.elements_count is null then - l_element_info := ut_metadata.get_attr_elem_info( a_compound_data ); - self.cursor_columns_info.extend; - self.cursor_columns_info(cursor_columns_info.last) := - ut_cursor_column( - l_elements_info.type_name, - l_elements_info.schema_name, - null, - l_elements_info.length, - a_parent_name, - a_level, - l_idx, - ut_compound_data_helper.get_column_type_desc(l_elements_info.type_code,false), - ut_utils.boolean_to_int(l_is_collection), - a_access_path, - l_elements_info.precision, - l_elements_info.scale - ); - if l_element_info.attr_elt_type is not null then - desc_compound_data( - l_element_info.attr_elt_type, l_elements_info.type_name, - a_level + 1, a_access_path || '/' || l_elements_info.type_name - ); - end if; - else - while l_idx <= l_elements_info.elements_count loop - l_element_info := ut_metadata.get_attr_elem_info( a_compound_data, l_idx ); - - self.cursor_columns_info.extend; - self.cursor_columns_info(cursor_columns_info.last) := - ut_cursor_column( - l_element_info.attribute_name, - l_elements_info.schema_name, - null, - l_element_info.length, - a_parent_name, - a_level, - l_idx, - ut_compound_data_helper.get_column_type_desc(l_element_info.type_code,false), - ut_utils.boolean_to_int(l_is_collection), - a_access_path, - l_elements_info.precision, - l_elements_info.scale - ); - if l_element_info.attr_elt_type is not null then - desc_compound_data( - l_element_info.attr_elt_type, l_element_info.attribute_name, - a_level + 1, a_access_path || '/' || l_element_info.attribute_name - ); - end if; - l_idx := l_idx + 1; - end loop; - end if; - end; - - constructor function ut_cursor_details(self in out nocopy ut_cursor_details) return self as result is - begin - self.cursor_columns_info := ut_cursor_column_tab(); - return; - end; - - constructor function ut_cursor_details( - self in out nocopy ut_cursor_details, - a_cursor_number in number - ) return self as result is - l_columns_count pls_integer; - l_columns_desc dbms_sql.desc_tab3; - l_is_collection boolean; - l_hierarchy_level integer := 1; - begin - self.cursor_columns_info := ut_cursor_column_tab(); - dbms_sql.describe_columns3(a_cursor_number, l_columns_count, l_columns_desc); - - /** - * Due to a bug with object being part of cursor in ANYDATA scenario - * oracle fails to revert number to cursor. We ar using dbms_sql.close cursor to close it - * to avoid leaving open cursors behind. - * a_cursor := dbms_sql.to_refcursor(l_cursor_number); - **/ - for pos in 1 .. l_columns_count loop - l_is_collection := ut_metadata.is_collection( l_columns_desc(pos).col_schema_name, l_columns_desc(pos).col_type_name ); - self.cursor_columns_info.extend; - self.cursor_columns_info(self.cursor_columns_info.last) := - ut_cursor_column( - l_columns_desc(pos).col_name, - l_columns_desc(pos).col_schema_name, - l_columns_desc(pos).col_type_name, - l_columns_desc(pos).col_max_len, - null, - l_hierarchy_level, - pos, - ut_compound_data_helper.get_column_type_desc(l_columns_desc(pos).col_type,true), - ut_utils.boolean_to_int(l_is_collection), - null, - l_columns_desc(pos).col_precision, - l_columns_desc(pos).col_scale - ); - - if l_columns_desc(pos).col_type = dbms_sql.user_defined_type or l_is_collection then - desc_compound_data( - ut_metadata.get_user_defined_type( l_columns_desc(pos).col_schema_name, l_columns_desc(pos).col_type_name ), - l_columns_desc(pos).col_name, - l_hierarchy_level + 1, - l_columns_desc(pos).col_name - ); - end if; - end loop; - return; - end; - - member function contains_collection return boolean is - l_collection_elements number; - begin - select count(1) into l_collection_elements - from table(cursor_columns_info) c - where c.is_collection = 1 and rownum = 1; - return l_collection_elements > 0; - end; - - member function get_missing_join_by_columns( a_expected_columns ut_varchar2_list ) return ut_varchar2_list is - l_result ut_varchar2_list; - l_root varchar2(125); - begin - if self.is_anydata = 1 then - l_root := get_root; - end if; - --regexp_replace(c.access_path,'^\/?([^\/]+\/){1}') - select fl.column_value - bulk collect into l_result - from table(a_expected_columns) fl - where not exists ( - select 1 from table(self.cursor_columns_info) c - where regexp_like(c.access_path,'^/?'|| - case - when self.is_anydata = 1 then - l_root||'/'||trim (leading '/' from fl.column_value) - else - fl.column_value - end||'($|/.*)' - ) - ) - order by fl.column_value; - return l_result; - end; - - member procedure filter_columns(self in out nocopy ut_cursor_details, a_match_options ut_matcher_options) is - l_result ut_cursor_details := self; - l_column_tab ut_cursor_column_tab := ut_cursor_column_tab(); - l_column ut_cursor_column; - l_root varchar2(125); - c_xpath_extract_reg constant varchar2(50) := '^((/ROW/)|^(//)|^(/\*/))?(.*)'; - begin - if l_result.cursor_columns_info is not null then - - if self.is_anydata = 1 then - l_root := get_root; - end if; - - --limit columns to those on the include items minus exclude items - if a_match_options.include.items.count > 0 then - -- if include - exclude = 0 then keep all columns - if a_match_options.include.items != a_match_options.exclude.items then - with included_columns as ( - select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names - from table(a_match_options.include.items) - minus - select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names - from table(a_match_options.exclude.items) - ) - select value(x) - bulk collect into l_result.cursor_columns_info - from table(self.cursor_columns_info) x - where exists( - select 1 from included_columns f where regexp_like(x.access_path,'^/?'|| - case - when self.is_anydata = 1 then - l_root||'/'||trim(leading '/' from f.col_names) - else - f.col_names - end||'($|/.*)' - ) - ) - or x.hierarchy_level = case when self.is_anydata = 1 then 1 else 0 end ; - end if; - elsif a_match_options.exclude.items.count > 0 then - with excluded_columns as ( - select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names - from table(a_match_options.exclude.items) - ) - select value(x) - bulk collect into l_result.cursor_columns_info - from table(self.cursor_columns_info) x - where not exists( - select 1 from excluded_columns f where regexp_like(x.access_path,'^/?'|| - case - when self.is_anydata = 1 then - l_root||'/'||trim(leading '/' from f.col_names) - else - f.col_names - end||'($|/.*)' ) - ); - end if; - - --Rewrite column order after columns been excluded - for i in ( - select parent_name, access_path, display_path, has_nested_col, - transformed_name, hierarchy_level, - rownum as new_position, xml_valid_name, - column_name, column_type, column_type_name, column_schema, - column_len, column_precision ,column_scale ,is_sql_diffable, is_collection,value(x) col_info - from table(l_result.cursor_columns_info) x - order by x.column_position asc - ) loop - l_column := i.col_info; - l_column.column_position := i.new_position; - l_column_tab.extend; - l_column_tab(l_column_tab.last) := l_column; - end loop; - - l_result.cursor_columns_info := l_column_tab; - self := l_result; - end if; - end; - - member function get_xml_children(a_parent_name varchar2 := null) return xmltype is - l_result xmltype; - begin - select xmlagg(xmlelement(evalname t.column_name,t.column_type_name)) - into l_result - from table(self.cursor_columns_info) t - where (a_parent_name is null and parent_name is null and hierarchy_level = 1 and column_name is not null) - having count(*) > 0; - return l_result; - end; - - member procedure has_anydata(self in out nocopy ut_cursor_details, a_is_anydata in boolean :=false) is - begin - self.is_anydata := case when nvl(a_is_anydata,false) then 1 else 0 end; - end; - - member function has_anydata return boolean is - begin - return ut_utils.int_to_boolean(nvl(self.is_anydata,0)); - end; - - member function get_root return varchar2 is - l_root varchar2(250); - begin - if self.cursor_columns_info.count > 0 then - select x.access_path into l_root from table(self.cursor_columns_info) x - where x.hierarchy_level = 1; - else - l_root := null; - end if; - return l_root; - end; - -end; -/ +create or replace type body ut_cursor_details as + + member function equals( a_other ut_cursor_details, a_match_options ut_matcher_options ) return boolean is + l_diffs integer; + begin + select count(1) into l_diffs + from table(self.cursor_columns_info) a + full outer join table(a_other.cursor_columns_info) e + on decode(a.parent_name,e.parent_name,1,0)= 1 + and a.column_name = e.column_name + and replace(a.column_type,'VARCHAR2','CHAR') = replace(e.column_type,'VARCHAR2','CHAR') + and ( a.column_position = e.column_position or a_match_options.columns_are_unordered_flag = 1 ) + where a.column_name is null or e.column_name is null; + return l_diffs = 0; + end; + + member procedure desc_compound_data( + self in out nocopy ut_cursor_details, a_compound_data anytype, + a_parent_name in varchar2, a_level in integer, a_access_path in varchar2 + ) is + l_idx pls_integer := 1; + l_elements_info ut_metadata.t_anytype_members_rec; + l_element_info ut_metadata.t_anytype_elem_info_rec; + l_is_collection boolean; + begin + l_elements_info := ut_metadata.get_anytype_members_info( a_compound_data ); + l_is_collection := ut_metadata.is_collection(l_elements_info.type_code); + if l_elements_info.elements_count is null then + l_element_info := ut_metadata.get_attr_elem_info( a_compound_data ); + self.cursor_columns_info.extend; + self.cursor_columns_info(cursor_columns_info.last) := + ut_cursor_column( + l_elements_info.type_name, + l_elements_info.schema_name, + null, + l_elements_info.length, + a_parent_name, + a_level, + l_idx, + ut_compound_data_helper.get_column_type_desc(l_elements_info.type_code,false), + ut_utils.boolean_to_int(l_is_collection), + a_access_path, + l_elements_info.precision, + l_elements_info.scale + ); + if l_element_info.attr_elt_type is not null then + desc_compound_data( + l_element_info.attr_elt_type, l_elements_info.type_name, + a_level + 1, a_access_path || '/' || l_elements_info.type_name + ); + end if; + else + while l_idx <= l_elements_info.elements_count loop + l_element_info := ut_metadata.get_attr_elem_info( a_compound_data, l_idx ); + + self.cursor_columns_info.extend; + self.cursor_columns_info(cursor_columns_info.last) := + ut_cursor_column( + l_element_info.attribute_name, + l_elements_info.schema_name, + null, + l_element_info.length, + a_parent_name, + a_level, + l_idx, + ut_compound_data_helper.get_column_type_desc(l_element_info.type_code,false), + ut_utils.boolean_to_int(l_is_collection), + a_access_path, + l_elements_info.precision, + l_elements_info.scale + ); + if l_element_info.attr_elt_type is not null then + desc_compound_data( + l_element_info.attr_elt_type, l_element_info.attribute_name, + a_level + 1, a_access_path || '/' || l_element_info.attribute_name + ); + end if; + l_idx := l_idx + 1; + end loop; + end if; + end; + + constructor function ut_cursor_details(self in out nocopy ut_cursor_details) return self as result is + begin + self.cursor_columns_info := ut_cursor_column_tab(); + return; + end; + + constructor function ut_cursor_details( + self in out nocopy ut_cursor_details, + a_cursor_number in number + ) return self as result is + l_columns_count pls_integer; + l_columns_desc dbms_sql.desc_tab3; + l_is_collection boolean; + l_hierarchy_level integer := 1; + begin + self.cursor_columns_info := ut_cursor_column_tab(); + self.is_anydata := 0; + dbms_sql.describe_columns3(a_cursor_number, l_columns_count, l_columns_desc); + + /** + * Due to a bug with object being part of cursor in ANYDATA scenario + * oracle fails to revert number to cursor. We ar using dbms_sql.close cursor to close it + * to avoid leaving open cursors behind. + * a_cursor := dbms_sql.to_refcursor(l_cursor_number); + **/ + for pos in 1 .. l_columns_count loop + l_is_collection := ut_metadata.is_collection( l_columns_desc(pos).col_schema_name, l_columns_desc(pos).col_type_name ); + self.cursor_columns_info.extend; + self.cursor_columns_info(self.cursor_columns_info.last) := + ut_cursor_column( + l_columns_desc(pos).col_name, + l_columns_desc(pos).col_schema_name, + l_columns_desc(pos).col_type_name, + l_columns_desc(pos).col_max_len, + null, + l_hierarchy_level, + pos, + ut_compound_data_helper.get_column_type_desc(l_columns_desc(pos).col_type,true), + ut_utils.boolean_to_int(l_is_collection), + null, + l_columns_desc(pos).col_precision, + l_columns_desc(pos).col_scale + ); + + if l_columns_desc(pos).col_type = dbms_sql.user_defined_type or l_is_collection then + desc_compound_data( + ut_metadata.get_user_defined_type( l_columns_desc(pos).col_schema_name, l_columns_desc(pos).col_type_name ), + l_columns_desc(pos).col_name, + l_hierarchy_level + 1, + l_columns_desc(pos).col_name + ); + end if; + end loop; + return; + end; + + member function contains_collection return boolean is + l_collection_elements number; + begin + select count(1) into l_collection_elements + from table(cursor_columns_info) c + where c.is_collection = 1 and rownum = 1; + return l_collection_elements > 0; + end; + + member function get_missing_join_by_columns( a_expected_columns ut_varchar2_list ) return ut_varchar2_list is + l_result ut_varchar2_list; + begin + --regexp_replace(c.access_path,'^\/?([^\/]+\/){1}') + select fl.column_value + bulk collect into l_result + from table(a_expected_columns) fl + where not exists ( + select 1 from table(self.cursor_columns_info) c + where regexp_like(c.filter_path,'^/?'||fl.column_value||'($|/.*)' ) + ) + order by fl.column_value; + return l_result; + end; + + member procedure filter_columns(self in out nocopy ut_cursor_details, a_match_options ut_matcher_options) is + l_result ut_cursor_details := self; + l_column_tab ut_cursor_column_tab := ut_cursor_column_tab(); + l_column ut_cursor_column; + c_xpath_extract_reg constant varchar2(50) := '^((/ROW/)|^(//)|^(/\*/))?(.*)'; + begin + if l_result.cursor_columns_info is not null then + + --limit columns to those on the include items minus exclude items + if a_match_options.include.items.count > 0 then + -- if include - exclude = 0 then keep all columns + if a_match_options.include.items != a_match_options.exclude.items then + with included_columns as ( + select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names + from table(a_match_options.include.items) + minus + select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names + from table(a_match_options.exclude.items) + ) + select value(x) + bulk collect into l_result.cursor_columns_info + from table(self.cursor_columns_info) x + where exists( + select 1 from included_columns f where regexp_like(x.filter_path,'^/?'||f.col_names||'($|/.*)' ) + ) + or x.hierarchy_level = case when self.is_anydata = 1 then 1 else 0 end ; + end if; + elsif a_match_options.exclude.items.count > 0 then + with excluded_columns as ( + select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names + from table(a_match_options.exclude.items) + ) + select value(x) + bulk collect into l_result.cursor_columns_info + from table(self.cursor_columns_info) x + where not exists( + select 1 from excluded_columns f where regexp_like(x.filter_path,'^/?'||f.col_names||'($|/.*)' ) + ); + end if; + + --Rewrite column order after columns been excluded + for i in ( + select parent_name, access_path, display_path, has_nested_col, + transformed_name, hierarchy_level, + rownum as new_position, xml_valid_name, + column_name, column_type, column_type_name, column_schema, + column_len, column_precision ,column_scale ,is_sql_diffable, is_collection,value(x) col_info + from table(l_result.cursor_columns_info) x + order by x.column_position asc + ) loop + l_column := i.col_info; + l_column.column_position := i.new_position; + l_column_tab.extend; + l_column_tab(l_column_tab.last) := l_column; + end loop; + + l_result.cursor_columns_info := l_column_tab; + self := l_result; + end if; + end; + + member function get_xml_children(a_parent_name varchar2 := null) return xmltype is + l_result xmltype; + begin + select xmlagg(xmlelement(evalname t.column_name,t.column_type_name)) + into l_result + from table(self.cursor_columns_info) t + where (a_parent_name is null and parent_name is null and hierarchy_level = 1 and column_name is not null) + having count(*) > 0; + return l_result; + end; + + member function get_root return varchar2 is + l_root varchar2(250); + begin + if self.cursor_columns_info.count > 0 then + select x.access_path into l_root from table(self.cursor_columns_info) x + where x.hierarchy_level = 1; + else + l_root := null; + end if; + return l_root; + end; + + member procedure strip_root_from_anydata(self in out nocopy ut_cursor_details) is + l_root varchar2(250) := get_root(); + begin + self.is_anydata := 1; + for i in 1..cursor_columns_info.count loop + self.cursor_columns_info(i).filter_path := ut_utils.strip_prefix(self.cursor_columns_info(i).access_path,l_root); + end loop; + end; + +end; +/ diff --git a/source/expectations/data_values/ut_cursor_details.tps b/source/expectations/data_values/ut_cursor_details.tps index ce5aefbe7..e6c80a3b5 100644 --- a/source/expectations/data_values/ut_cursor_details.tps +++ b/source/expectations/data_values/ut_cursor_details.tps @@ -1,42 +1,41 @@ -create or replace type ut_cursor_details force authid current_user as object ( - /* - utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project - - Licensed under the Apache License, Version 2.0 (the "License"): - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - cursor_columns_info ut_cursor_column_tab, - - /*if type is anydata we need to skip level 1 on joinby / inlude / exclude as its artificial cursor*/ - is_anydata number(1,0), - constructor function ut_cursor_details(self in out nocopy ut_cursor_details) return self as result, - constructor function ut_cursor_details( - self in out nocopy ut_cursor_details,a_cursor_number in number - ) return self as result, - member function equals(a_other ut_cursor_details, a_match_options ut_matcher_options) return boolean, - member procedure desc_compound_data( - self in out nocopy ut_cursor_details, - a_compound_data anytype, - a_parent_name in varchar2, - a_level in integer, - a_access_path in varchar2 - ), - member function contains_collection return boolean, - member function get_missing_join_by_columns( a_expected_columns ut_varchar2_list ) return ut_varchar2_list, - member procedure filter_columns(self in out nocopy ut_cursor_details, a_match_options ut_matcher_options), - member function get_xml_children(a_parent_name varchar2 := null) return xmltype, - member procedure has_anydata(self in out nocopy ut_cursor_details, a_is_anydata in boolean := false), - member function has_anydata return boolean, - member function get_root return varchar2 -) -/ +create or replace type ut_cursor_details authid current_user as object ( + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + cursor_columns_info ut_cursor_column_tab, + + /*if type is anydata we need to skip level 1 on joinby / inlude / exclude as its artificial cursor*/ + is_anydata number(1,0), + constructor function ut_cursor_details(self in out nocopy ut_cursor_details) return self as result, + constructor function ut_cursor_details( + self in out nocopy ut_cursor_details,a_cursor_number in number + ) return self as result, + member function equals(a_other ut_cursor_details, a_match_options ut_matcher_options) return boolean, + member procedure desc_compound_data( + self in out nocopy ut_cursor_details, + a_compound_data anytype, + a_parent_name in varchar2, + a_level in integer, + a_access_path in varchar2 + ), + member function contains_collection return boolean, + member function get_missing_join_by_columns( a_expected_columns ut_varchar2_list ) return ut_varchar2_list, + member procedure filter_columns(self in out nocopy ut_cursor_details, a_match_options ut_matcher_options), + member function get_xml_children(a_parent_name varchar2 := null) return xmltype, + member function get_root return varchar2, + member procedure strip_root_from_anydata(self in out nocopy ut_cursor_details) +) +/ diff --git a/source/expectations/data_values/ut_data_value_anydata.tpb b/source/expectations/data_values/ut_data_value_anydata.tpb index fa59ad67c..808e52197 100644 --- a/source/expectations/data_values/ut_data_value_anydata.tpb +++ b/source/expectations/data_values/ut_data_value_anydata.tpb @@ -1,145 +1,143 @@ -create or replace type body ut_data_value_anydata as - /* - utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project - - Licensed under the Apache License, Version 2.0 (the "License"): - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - - overriding member function get_object_info return varchar2 is - begin - return self.data_type || case when self.compound_type = 'collection' then ' [ count = '||self.elements_count||' ]' else null end; - end; - - member function get_extract_path(a_data_value anydata) return varchar2 is - l_path varchar2(10); - begin - if self.compound_type = 'object' then - l_path := '/*/*'; - else - case when ut_metadata.has_collection_members(a_data_value) then - l_path := '/*/*'; - else - l_path := '/*'; - end case; - end if; - return l_path; - end; - - member function get_cursor_sql_from_anydata(a_data_value anydata) return varchar2 is - l_cursor_sql varchar2(32767); - begin - l_cursor_sql := ' - declare - l_data '||self.data_type||'; - l_value anydata := :a_value; - l_status integer; - l_tmp_refcursor sys_refcursor; - begin - l_status := l_value.get'||self.compound_type||'(l_data); '|| - case when self.compound_type = 'collection' then - q'[ open :l_tmp_refcursor for select value(x) as "]'|| - ut_metadata.get_object_name(ut_metadata.get_collection_element(a_data_value))|| - q'[" from table(l_data) x;]' - else - q'[ open :l_tmp_refcursor for select l_data as "]'||ut_metadata.get_object_name(self.data_type)|| - q'[" from dual;]' - end || - 'end;'; - return l_cursor_sql; - end; - - member procedure init(self in out nocopy ut_data_value_anydata, a_value anydata) is - l_refcursor sys_refcursor; - l_ctx number; - l_ut_owner varchar2(250) := ut_utils.ut_owner; - cursor_not_open exception; - l_cursor_number number; - l_anydata_sql varchar2(32767); - begin - self.data_type := ut_metadata.get_anydata_typename(a_value); - self.compound_type := get_instance(a_value); - self.is_data_null := ut_metadata.is_anytype_null(a_value,self.compound_type); - self.data_id := sys_guid(); - self.self_type := $$plsql_unit; - self.cursor_details := ut_cursor_details(); - - ut_compound_data_helper.cleanup_diff; - - if not self.is_null() then - self.extract_path := get_extract_path(a_value); - l_anydata_sql := get_cursor_sql_from_anydata(a_value); - execute immediate l_anydata_sql using in a_value, in out l_refcursor; - if l_refcursor%isopen then - self.extract_cursor(l_refcursor); - l_cursor_number := dbms_sql.to_cursor_number(l_refcursor); - self.cursor_details := ut_cursor_details(l_cursor_number); - self.cursor_details.has_anydata(true); - dbms_sql.close_cursor(l_cursor_number); - elsif not l_refcursor%isopen then - raise cursor_not_open; - end if; - end if; - exception - when cursor_not_open then - raise_application_error(-20155, 'Cursor is not open'); - when others then - if l_refcursor%isopen then - close l_refcursor; - end if; - raise; - end; - - member function get_instance(a_data_value anydata) return varchar2 is - l_result varchar2(30); - begin - l_result := ut_metadata.get_anydata_compound_type(a_data_value); - if l_result not in ('object','collection') then - raise_application_error(-20000, 'Data type '||a_data_value.gettypename||' in ANYDATA is not supported by utPLSQL'); - end if; - return l_result; - end; - - constructor function ut_data_value_anydata(self in out nocopy ut_data_value_anydata, a_value anydata) return self as result - is - begin - init(a_value); - return; - end; - - overriding member function compare_implementation( - a_other ut_data_value, - a_match_options ut_matcher_options, - a_inclusion_compare boolean := false, - a_is_negated boolean := false - ) return integer is - l_result integer := 0; - begin - if not a_other is of (ut_data_value_anydata) then - raise value_error; - end if; - l_result := l_result + (self as ut_data_value_refcursor).compare_implementation(a_other,a_match_options,a_inclusion_compare,a_is_negated); - return l_result; - end; - - overriding member function is_empty return boolean is - begin - if self.compound_type = 'collection' then - return self.elements_count = 0; - else - raise value_error; - end if; - end; - -end; -/ +create or replace type body ut_data_value_anydata as + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + overriding member function get_object_info return varchar2 is + begin + return self.data_type || case when self.compound_type = 'collection' then ' [ count = '||self.elements_count||' ]' else null end; + end; + + member function get_extract_path(a_data_value anydata) return varchar2 is + l_path varchar2(10); + begin + if self.compound_type = 'object' then + l_path := '/*/*'; + else + case when ut_metadata.has_collection_members(a_data_value) then + l_path := '/*/*'; + else + l_path := '/*'; + end case; + end if; + return l_path; + end; + + member function get_cursor_sql_from_anydata(a_data_value anydata) return varchar2 is + l_cursor_sql varchar2(32767); + begin + l_cursor_sql := ' + declare + l_data '||self.data_type||'; + l_value anydata := :a_value; + l_status integer; + l_tmp_refcursor sys_refcursor; + begin + l_status := l_value.get'||self.compound_type||'(l_data); '|| + case when self.compound_type = 'collection' then + q'[ open :l_tmp_refcursor for select value(x) as "]'|| + ut_metadata.get_object_name(ut_metadata.get_collection_element(a_data_value))|| + q'[" from table(l_data) x;]' + else + q'[ open :l_tmp_refcursor for select l_data as "]'||ut_metadata.get_object_name(self.data_type)|| + q'[" from dual;]' + end || + 'end;'; + return l_cursor_sql; + end; + + member procedure init(self in out nocopy ut_data_value_anydata, a_value anydata) is + l_refcursor sys_refcursor; + cursor_not_open exception; + l_cursor_number number; + l_anydata_sql varchar2(32767); + begin + self.data_type := ut_metadata.get_anydata_typename(a_value); + self.compound_type := get_instance(a_value); + self.is_data_null := ut_metadata.is_anytype_null(a_value,self.compound_type); + self.data_id := sys_guid(); + self.self_type := $$plsql_unit; + self.cursor_details := ut_cursor_details(); + + ut_compound_data_helper.cleanup_diff; + + if not self.is_null() then + self.extract_path := get_extract_path(a_value); + l_anydata_sql := get_cursor_sql_from_anydata(a_value); + execute immediate l_anydata_sql using in a_value, in out l_refcursor; + if l_refcursor%isopen then + self.extract_cursor(l_refcursor); + l_cursor_number := dbms_sql.to_cursor_number(l_refcursor); + self.cursor_details := ut_cursor_details(l_cursor_number); + self.cursor_details.strip_root_from_anydata; + dbms_sql.close_cursor(l_cursor_number); + elsif not l_refcursor%isopen then + raise cursor_not_open; + end if; + end if; + exception + when cursor_not_open then + raise_application_error(-20155, 'Cursor is not open'); + when others then + if l_refcursor%isopen then + close l_refcursor; + end if; + raise; + end; + + member function get_instance(a_data_value anydata) return varchar2 is + l_result varchar2(30); + begin + l_result := ut_metadata.get_anydata_compound_type(a_data_value); + if l_result not in ('object','collection') then + raise_application_error(-20000, 'Data type '||a_data_value.gettypename||' in ANYDATA is not supported by utPLSQL'); + end if; + return l_result; + end; + + constructor function ut_data_value_anydata(self in out nocopy ut_data_value_anydata, a_value anydata) return self as result + is + begin + init(a_value); + return; + end; + + overriding member function compare_implementation( + a_other ut_data_value, + a_match_options ut_matcher_options, + a_inclusion_compare boolean := false, + a_is_negated boolean := false + ) return integer is + l_result integer := 0; + begin + if not a_other is of (ut_data_value_anydata) then + raise value_error; + end if; + l_result := l_result + (self as ut_data_value_refcursor).compare_implementation(a_other,a_match_options,a_inclusion_compare,a_is_negated); + return l_result; + end; + + overriding member function is_empty return boolean is + begin + if self.compound_type = 'collection' then + return self.elements_count = 0; + else + raise value_error; + end if; + end; + +end; +/ diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 2aac626e3..b93158cf1 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -1,399 +1,398 @@ -create or replace type body ut_data_value_refcursor as - /* - utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project - - Licensed under the Apache License, Version 2.0 (the "License"): - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - - constructor function ut_data_value_refcursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) - return self as result is - begin - init(a_value); - return; - end; - - member procedure extract_cursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) - is - c_bulk_rows constant integer := 10000; - l_cursor sys_refcursor := a_value; - l_ctx number; - l_xml xmltype; - l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_set_id integer := 0; - l_elements_count number := 0; - begin - -- We use DBMS_XMLGEN in order to: - -- 1) be able to process data in bulks (set of rows) - -- 2) be able to influence the ROWSET/ROW tags - -- 3) be able to influence the way NULL values are handled (empty TAG) - -- 4) be able to influence the way TIMESTAMP is formatted. - -- Due to Oracle feature/bug, it is not possible to change the DATE formatting of cursor data - -- AFTER the cursor was opened. - -- The only solution for this is to change NLS settings before opening the cursor. - -- - -- This would work fine if we could use DBMS_XMLGEN.restartQuery. - -- The restartQuery fails however if PLSQL variables of TIMESTAMP/INTERVAL or CLOB/BLOB are used. - ut_expectation_processor.set_xml_nls_params(); - l_ctx := dbms_xmlgen.newContext(l_cursor); - dbms_xmlgen.setNullHandling(l_ctx, dbms_xmlgen.empty_tag); - dbms_xmlgen.setMaxRows(l_ctx, c_bulk_rows); - loop - l_xml := dbms_xmlgen.getxmltype(l_ctx); - exit when dbms_xmlgen.getNumRowsProcessed(l_ctx) = 0; - --Bug in oracle 12.2+ where XML binary storage trimming insignificant whitespaces. - $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then - l_xml := xmltype( replace(l_xml.getClobVal(),' 0 then - ut_utils.append_to_clob( l_result, self.cursor_details.get_xml_children().getclobval() ); - end if; - ut_utils.append_to_clob(l_result,chr(10)||(self as ut_compound_data_value).to_string()); - l_result_string := ut_utils.to_string(l_result,null); - dbms_lob.freetemporary(l_result); - end if; - return l_result_string; - end; - - overriding member function diff( a_other ut_data_value, a_match_options ut_matcher_options ) return varchar2 is - l_result clob; - l_results ut_utils.t_clob_tab := ut_utils.t_clob_tab(); - l_result_string varchar2(32767); - l_other ut_data_value_refcursor; - l_self ut_data_value_refcursor := self; - l_column_diffs ut_compound_data_helper.tt_column_diffs; - - l_other_cols ut_cursor_column_tab; - l_self_cols ut_cursor_column_tab; - - l_act_missing_pk ut_varchar2_list := ut_varchar2_list(); - l_exp_missing_pk ut_varchar2_list := ut_varchar2_list(); - - c_max_rows integer := ut_utils.gc_diff_max_rows; - l_diff_id ut_compound_data_helper.t_hash; - l_diff_row_count integer; - l_row_diffs ut_compound_data_helper.tt_row_diffs; - l_message varchar2(32767); - - function get_col_diff_text(a_col ut_compound_data_helper.t_column_diffs) return varchar2 is - begin - return - case a_col.diff_type - when '-' then - ' Column <'||a_col.expected_name||'> [data-type: '||a_col.expected_type||'] is missing. Expected column position: '||a_col.expected_pos||'.' - when '+' then - ' Column <'||a_col.actual_name||'> [position: '||a_col.actual_pos||', data-type: '||a_col.actual_type||'] is not expected in results.' - when 't' then - ' Column <'||a_col.actual_name||'> data-type is invalid. Expected: '||a_col.expected_type||',' ||' actual: '||a_col.actual_type||'.' - when 'p' then - ' Column <'||a_col.actual_name||'> is misplaced. Expected position: '||a_col.expected_pos||',' ||' actual position: '||a_col.actual_pos||'.' - end; - end; - - function remove_incomparable_cols( - a_cursor_details ut_cursor_column_tab, a_column_diffs ut_compound_data_helper.tt_column_diffs - ) return ut_cursor_column_tab is - l_missing_cols ut_varchar2_list := ut_varchar2_list(); - l_result ut_cursor_column_tab; - begin - for i in 1 .. a_column_diffs.count loop - if a_column_diffs(i).diff_type in ('-','+') then - l_missing_cols.extend; - l_missing_cols(l_missing_cols.last) := coalesce(a_column_diffs(i).expected_name, a_column_diffs(i).actual_name); - end if; - end loop; - select value(i) bulk collect into l_result - from table(a_cursor_details) i - where i.access_path not in ( - select c.column_value - from table(l_missing_cols) c - ); - return l_result; - end; - - function get_diff_message (a_row_diff ut_compound_data_helper.t_row_diffs, a_is_unordered boolean) return varchar2 is - begin - if a_is_unordered then - if a_row_diff.pk_value is not null then - return ' PK '||a_row_diff.pk_value||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; - else - return rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; - end if; - else - return ' Row No. '||a_row_diff.rn||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; - end if; - end; - - begin - if not a_other is of (ut_data_value_refcursor) then - raise value_error; - end if; - l_other := treat(a_other as ut_data_value_refcursor); - l_other.cursor_details.filter_columns(a_match_options); - l_self.cursor_details.filter_columns(a_match_options); - - l_other_cols := l_other.cursor_details.cursor_columns_info; - l_self_cols := l_self.cursor_details.cursor_columns_info; - - dbms_lob.createtemporary(l_result,true); - --diff columns - if not l_self.is_null and not l_other.is_null then - l_column_diffs := ut_compound_data_helper.get_columns_diff( - l_self.cursor_details.cursor_columns_info, - l_other.cursor_details.cursor_columns_info, - a_match_options.ordered_columns() - ); - - if l_column_diffs.count > 0 then - ut_utils.append_to_clob(l_result,chr(10) || 'Columns:' || chr(10)); - l_other_cols := remove_incomparable_cols( l_other_cols, l_column_diffs ); - l_self_cols := remove_incomparable_cols( l_self_cols, l_column_diffs ); - for i in 1 .. l_column_diffs.count loop - l_results.extend; - l_results(l_results.last) := get_col_diff_text(l_column_diffs(i)); - end loop; - ut_utils.append_to_clob(l_result, l_results); - end if; - end if; - - --check for missing pk - if a_match_options.join_by.items.count > 0 then - l_act_missing_pk := l_other.cursor_details.get_missing_join_by_columns( a_match_options.join_by.items ); - l_exp_missing_pk := l_self.cursor_details.get_missing_join_by_columns( a_match_options.join_by.items ); - end if; - - --diff rows and row elements if the pk is not missing - if l_act_missing_pk.count + l_exp_missing_pk.count = 0 then - l_diff_id := ut_compound_data_helper.get_hash( l_self.data_id || l_other.data_id ); - - -- First tell how many rows are different - l_diff_row_count := ut_compound_data_helper.get_rows_diff_count; - if l_diff_row_count > 0 then - l_row_diffs := ut_compound_data_helper.get_rows_diff_by_sql( - l_self_cols, l_other_cols, l_self.data_id, l_other.data_id, - l_diff_id, - case - when - l_self.cursor_details.is_anydata = 1 then ut_utils.add_prefix(a_match_options.join_by.items, l_self.cursor_details.get_root) - else - a_match_options.join_by.items - end, - a_match_options.unordered,a_match_options.ordered_columns(), self.extract_path - ); - l_message := chr(10) - ||'Rows: [ ' || l_diff_row_count ||' differences' - || case when l_diff_row_count > c_max_rows and l_row_diffs.count > 0 then ', showing first '||c_max_rows end - ||' ]'||chr(10)|| case when l_row_diffs.count = 0 then ' All rows are different as the columns are not matching.' else null end; - ut_utils.append_to_clob( l_result, l_message ); - l_results := ut_utils.t_clob_tab(); - for i in 1 .. l_row_diffs.count loop - l_results.extend; - l_results(l_results.last) := get_diff_message(l_row_diffs(i),a_match_options.unordered); - end loop; - ut_utils.append_to_clob(l_result,l_results); - else - l_message:= chr(10)||'Rows: [ all different ]'||chr(10)||' All rows are different as the columns position is not matching.'; - ut_utils.append_to_clob( l_result, l_message ); - end if; - else - ut_utils.append_to_clob(l_result,chr(10) || 'Unable to join sets:' || chr(10)); - - for i in 1 .. l_exp_missing_pk.count loop - ut_utils.append_to_clob(l_result, ' Join key '||l_exp_missing_pk(i)||' does not exists in expected'||chr(10)); - end loop; - - for i in 1 .. l_act_missing_pk.count loop - ut_utils.append_to_clob(l_result, ' Join key '||l_act_missing_pk(i)||' does not exists in actual'||chr(10)); - end loop; - - if l_self.cursor_details.contains_collection() or l_other.cursor_details.contains_collection() then - ut_utils.append_to_clob(l_result,' Please make sure that your join clause is not refferring to collection element'|| chr(10)); - end if; - - end if; - - l_result_string := ut_utils.to_string(l_result,null); - dbms_lob.freetemporary(l_result); - return l_result_string; - end; - - overriding member function compare_implementation(a_other ut_data_value) return integer is - begin - return compare_implementation( a_other, null ); - end; - - member function compare_implementation( - a_other ut_data_value, - a_match_options ut_matcher_options, - a_inclusion_compare boolean := false, - a_is_negated boolean := false - ) return integer is - l_result integer := 0; - l_self ut_data_value_refcursor := self; - l_other ut_data_value_refcursor; - l_diff_cursor_text clob; - - function compare_data( - a_self ut_data_value_refcursor, - a_other ut_data_value_refcursor, - a_diff_cursor_text clob - ) return integer is - l_diff_id ut_compound_data_helper.t_hash; - l_result integer; - --We will start with number od differences being displayed. - l_cursor sys_refcursor; - l_diff_tab ut_compound_data_helper.t_diff_tab; - l_diif_rowcount integer :=0; - begin - l_diff_id := ut_compound_data_helper.get_hash(a_self.data_id||a_other.data_id); - - begin - l_cursor := ut_compound_data_helper.get_compare_cursor(a_diff_cursor_text, - a_self.data_id, a_other.data_id); - --fetch and save rows for display of diff - fetch l_cursor bulk collect into l_diff_tab limit ut_utils.gc_diff_max_rows; - exception when others then - if l_cursor%isopen then - close l_cursor; - end if; - raise; - end; - - ut_compound_data_helper.insert_diffs_result( l_diff_tab, l_diff_id ); - --fetch rows for count only - loop - exit when l_diff_tab.count = 0; - l_diif_rowcount := l_diif_rowcount + l_diff_tab.count; - fetch l_cursor bulk collect into l_diff_tab limit ut_utils.gc_bc_fetch_limit; - end loop; - - ut_compound_data_helper.set_rows_diff(l_diif_rowcount); - - --result is OK only if both are same - if l_diif_rowcount = 0 and a_self.is_null = a_other.is_null then - l_result := 0; - else - l_result := 1; - end if; - close l_cursor; - return l_result; - end; - begin - if not a_other is of (ut_data_value_refcursor) then - raise value_error; - end if; - - l_other := treat(a_other as ut_data_value_refcursor); - l_other.cursor_details.filter_columns( a_match_options ); - l_self.cursor_details.filter_columns( a_match_options ); - - if a_match_options.join_by.items.count > 0 then - l_result := - l_self.cursor_details.get_missing_join_by_columns( a_match_options.join_by.items ).count - + l_other.cursor_details.get_missing_join_by_columns( a_match_options.join_by.items ).count; - end if; - - if l_result = 0 then - if not l_self.is_null() and not l_other.is_null() and not l_self.cursor_details.equals( l_other.cursor_details, a_match_options ) then - l_result := 1; - end if; - - l_diff_cursor_text := ut_compound_data_helper.gen_compare_sql( - l_other, - a_match_options.join_by.items, - a_match_options.unordered(), - a_inclusion_compare, - a_is_negated - ); - l_result := l_result + compare_data( l_self, l_other, l_diff_cursor_text ); - end if; - return l_result; - end; - - overriding member function is_empty return boolean is - begin - return self.elements_count = 0; - end; - -end; -/ +create or replace type body ut_data_value_refcursor as + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + constructor function ut_data_value_refcursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) + return self as result is + begin + init(a_value); + return; + end; + + member procedure extract_cursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) + is + c_bulk_rows constant integer := 10000; + l_cursor sys_refcursor := a_value; + l_ctx number; + l_xml xmltype; + l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_set_id integer := 0; + l_elements_count number := 0; + begin + -- We use DBMS_XMLGEN in order to: + -- 1) be able to process data in bulks (set of rows) + -- 2) be able to influence the ROWSET/ROW tags + -- 3) be able to influence the way NULL values are handled (empty TAG) + -- 4) be able to influence the way TIMESTAMP is formatted. + -- Due to Oracle feature/bug, it is not possible to change the DATE formatting of cursor data + -- AFTER the cursor was opened. + -- The only solution for this is to change NLS settings before opening the cursor. + -- + -- This would work fine if we could use DBMS_XMLGEN.restartQuery. + -- The restartQuery fails however if PLSQL variables of TIMESTAMP/INTERVAL or CLOB/BLOB are used. + ut_expectation_processor.set_xml_nls_params(); + l_ctx := dbms_xmlgen.newContext(l_cursor); + dbms_xmlgen.setNullHandling(l_ctx, dbms_xmlgen.empty_tag); + dbms_xmlgen.setMaxRows(l_ctx, c_bulk_rows); + loop + l_xml := dbms_xmlgen.getxmltype(l_ctx); + exit when dbms_xmlgen.getNumRowsProcessed(l_ctx) = 0; + --Bug in oracle 12.2+ where XML binary storage trimming insignificant whitespaces. + $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then + l_xml := xmltype( replace(l_xml.getClobVal(),' 0 then + ut_utils.append_to_clob( l_result, self.cursor_details.get_xml_children().getclobval() ); + end if; + ut_utils.append_to_clob(l_result,chr(10)||(self as ut_compound_data_value).to_string()); + l_result_string := ut_utils.to_string(l_result,null); + dbms_lob.freetemporary(l_result); + end if; + return l_result_string; + end; + + overriding member function diff( a_other ut_data_value, a_match_options ut_matcher_options ) return varchar2 is + l_result clob; + l_results ut_utils.t_clob_tab := ut_utils.t_clob_tab(); + l_result_string varchar2(32767); + l_other ut_data_value_refcursor; + l_self ut_data_value_refcursor := self; + l_column_diffs ut_compound_data_helper.tt_column_diffs; + + l_other_cols ut_cursor_column_tab; + l_self_cols ut_cursor_column_tab; + + l_act_missing_pk ut_varchar2_list := ut_varchar2_list(); + l_exp_missing_pk ut_varchar2_list := ut_varchar2_list(); + + c_max_rows integer := ut_utils.gc_diff_max_rows; + l_diff_id ut_compound_data_helper.t_hash; + l_diff_row_count integer; + l_row_diffs ut_compound_data_helper.tt_row_diffs; + l_message varchar2(32767); + + function get_col_diff_text(a_col ut_compound_data_helper.t_column_diffs) return varchar2 is + begin + return + case a_col.diff_type + when '-' then + ' Column <'||a_col.expected_name||'> [data-type: '||a_col.expected_type||'] is missing. Expected column position: '||a_col.expected_pos||'.' + when '+' then + ' Column <'||a_col.actual_name||'> [position: '||a_col.actual_pos||', data-type: '||a_col.actual_type||'] is not expected in results.' + when 't' then + ' Column <'||a_col.actual_name||'> data-type is invalid. Expected: '||a_col.expected_type||',' ||' actual: '||a_col.actual_type||'.' + when 'p' then + ' Column <'||a_col.actual_name||'> is misplaced. Expected position: '||a_col.expected_pos||',' ||' actual position: '||a_col.actual_pos||'.' + end; + end; + + function remove_incomparable_cols( + a_cursor_details ut_cursor_column_tab, a_column_diffs ut_compound_data_helper.tt_column_diffs + ) return ut_cursor_column_tab is + l_missing_cols ut_varchar2_list := ut_varchar2_list(); + l_result ut_cursor_column_tab; + begin + for i in 1 .. a_column_diffs.count loop + if a_column_diffs(i).diff_type in ('-','+') then + l_missing_cols.extend; + l_missing_cols(l_missing_cols.last) := coalesce(a_column_diffs(i).expected_name, a_column_diffs(i).actual_name); + end if; + end loop; + select value(i) bulk collect into l_result + from table(a_cursor_details) i + where i.access_path not in ( + select c.column_value + from table(l_missing_cols) c + ); + return l_result; + end; + + function get_diff_message (a_row_diff ut_compound_data_helper.t_row_diffs, a_is_unordered boolean) return varchar2 is + begin + if a_is_unordered then + if a_row_diff.pk_value is not null then + return ' PK '||a_row_diff.pk_value||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; + else + return rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; + end if; + else + return ' Row No. '||a_row_diff.rn||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; + end if; + end; + + begin + if not a_other is of (ut_data_value_refcursor) then + raise value_error; + end if; + l_other := treat(a_other as ut_data_value_refcursor); + l_other.cursor_details.filter_columns(a_match_options); + l_self.cursor_details.filter_columns(a_match_options); + + l_other_cols := l_other.cursor_details.cursor_columns_info; + l_self_cols := l_self.cursor_details.cursor_columns_info; + + dbms_lob.createtemporary(l_result,true); + --diff columns + if not l_self.is_null and not l_other.is_null then + l_column_diffs := ut_compound_data_helper.get_columns_diff( + l_self.cursor_details.cursor_columns_info, + l_other.cursor_details.cursor_columns_info, + a_match_options.ordered_columns() + ); + + if l_column_diffs.count > 0 then + ut_utils.append_to_clob(l_result,chr(10) || 'Columns:' || chr(10)); + l_other_cols := remove_incomparable_cols( l_other_cols, l_column_diffs ); + l_self_cols := remove_incomparable_cols( l_self_cols, l_column_diffs ); + for i in 1 .. l_column_diffs.count loop + l_results.extend; + l_results(l_results.last) := get_col_diff_text(l_column_diffs(i)); + end loop; + ut_utils.append_to_clob(l_result, l_results); + end if; + end if; + + --check for missing pk + if a_match_options.join_by.items.count > 0 then + l_act_missing_pk := l_other.cursor_details.get_missing_join_by_columns( a_match_options.join_by.items ); + l_exp_missing_pk := l_self.cursor_details.get_missing_join_by_columns( a_match_options.join_by.items ); + end if; + + --diff rows and row elements if the pk is not missing + if l_act_missing_pk.count + l_exp_missing_pk.count = 0 then + l_diff_id := ut_compound_data_helper.get_hash( l_self.data_id || l_other.data_id ); + + -- First tell how many rows are different + l_diff_row_count := ut_compound_data_helper.get_rows_diff_count; + if l_diff_row_count > 0 then + l_row_diffs := ut_compound_data_helper.get_rows_diff_by_sql( + l_self_cols, l_other_cols, l_self.data_id, l_other.data_id, + l_diff_id, + case + when + l_self.cursor_details.is_anydata = 1 then ut_utils.add_prefix(a_match_options.join_by.items, l_self.cursor_details.get_root) + else + a_match_options.join_by.items + end, + a_match_options.unordered,a_match_options.ordered_columns(), self.extract_path + ); + l_message := chr(10) + ||'Rows: [ ' || l_diff_row_count ||' differences' + || case when l_diff_row_count > c_max_rows and l_row_diffs.count > 0 then ', showing first '||c_max_rows end + ||' ]'||chr(10)|| case when l_row_diffs.count = 0 then ' All rows are different as the columns are not matching.' else null end; + ut_utils.append_to_clob( l_result, l_message ); + l_results := ut_utils.t_clob_tab(); + for i in 1 .. l_row_diffs.count loop + l_results.extend; + l_results(l_results.last) := get_diff_message(l_row_diffs(i),a_match_options.unordered); + end loop; + ut_utils.append_to_clob(l_result,l_results); + else + l_message:= chr(10)||'Rows: [ all different ]'||chr(10)||' All rows are different as the columns position is not matching.'; + ut_utils.append_to_clob( l_result, l_message ); + end if; + else + ut_utils.append_to_clob(l_result,chr(10) || 'Unable to join sets:' || chr(10)); + + for i in 1 .. l_exp_missing_pk.count loop + ut_utils.append_to_clob(l_result, ' Join key '||l_exp_missing_pk(i)||' does not exists in expected'||chr(10)); + end loop; + + for i in 1 .. l_act_missing_pk.count loop + ut_utils.append_to_clob(l_result, ' Join key '||l_act_missing_pk(i)||' does not exists in actual'||chr(10)); + end loop; + + if l_self.cursor_details.contains_collection() or l_other.cursor_details.contains_collection() then + ut_utils.append_to_clob(l_result,' Please make sure that your join clause is not refferring to collection element'|| chr(10)); + end if; + + end if; + + l_result_string := ut_utils.to_string(l_result,null); + dbms_lob.freetemporary(l_result); + return l_result_string; + end; + + overriding member function compare_implementation(a_other ut_data_value) return integer is + begin + return compare_implementation( a_other, null ); + end; + + member function compare_implementation( + a_other ut_data_value, + a_match_options ut_matcher_options, + a_inclusion_compare boolean := false, + a_is_negated boolean := false + ) return integer is + l_result integer := 0; + l_self ut_data_value_refcursor := self; + l_other ut_data_value_refcursor; + l_diff_cursor_text clob; + + function compare_data( + a_self ut_data_value_refcursor, + a_other ut_data_value_refcursor, + a_diff_cursor_text clob + ) return integer is + l_diff_id ut_compound_data_helper.t_hash; + l_result integer; + --We will start with number od differences being displayed. + l_cursor sys_refcursor; + l_diff_tab ut_compound_data_helper.t_diff_tab; + l_diif_rowcount integer :=0; + begin + l_diff_id := ut_compound_data_helper.get_hash(a_self.data_id||a_other.data_id); + + begin + l_cursor := ut_compound_data_helper.get_compare_cursor(a_diff_cursor_text, + a_self.data_id, a_other.data_id); + --fetch and save rows for display of diff + fetch l_cursor bulk collect into l_diff_tab limit ut_utils.gc_diff_max_rows; + exception when others then + if l_cursor%isopen then + close l_cursor; + end if; + raise; + end; + + ut_compound_data_helper.insert_diffs_result( l_diff_tab, l_diff_id ); + --fetch rows for count only + loop + exit when l_diff_tab.count = 0; + l_diif_rowcount := l_diif_rowcount + l_diff_tab.count; + fetch l_cursor bulk collect into l_diff_tab limit ut_utils.gc_bc_fetch_limit; + end loop; + + ut_compound_data_helper.set_rows_diff(l_diif_rowcount); + + --result is OK only if both are same + if l_diif_rowcount = 0 and a_self.is_null = a_other.is_null then + l_result := 0; + else + l_result := 1; + end if; + close l_cursor; + return l_result; + end; + begin + if not a_other is of (ut_data_value_refcursor) then + raise value_error; + end if; + + l_other := treat(a_other as ut_data_value_refcursor); + l_other.cursor_details.filter_columns( a_match_options ); + l_self.cursor_details.filter_columns( a_match_options ); + + if a_match_options.join_by.items.count > 0 then + l_result := + l_self.cursor_details.get_missing_join_by_columns( a_match_options.join_by.items ).count + + l_other.cursor_details.get_missing_join_by_columns( a_match_options.join_by.items ).count; + end if; + + if l_result = 0 then + if not l_self.is_null() and not l_other.is_null() and not l_self.cursor_details.equals( l_other.cursor_details, a_match_options ) then + l_result := 1; + end if; + + l_diff_cursor_text := ut_compound_data_helper.gen_compare_sql( + l_other, + a_match_options.join_by.items, + a_match_options.unordered(), + a_inclusion_compare, + a_is_negated + ); + l_result := l_result + compare_data( l_self, l_other, l_diff_cursor_text ); + end if; + return l_result; + end; + + overriding member function is_empty return boolean is + begin + return self.elements_count = 0; + end; + +end; +/ From 7d27d3a4ffba48d1b0ab3f8fd3022b7c8268e0a6 Mon Sep 17 00:00:00 2001 From: LUKASZ104 Date: Fri, 24 May 2019 14:43:58 +0100 Subject: [PATCH 0471/1096] TAG: Phase2 Adding a new attribute filterpath that is used for filtering cursor in anydata / refcursor. This value will be different from cursor in anydata as we skip root element. --- source/core/ut_utils.pkb | 1644 +++++++++-------- source/core/ut_utils.pks | 796 ++++---- .../data_values/ut_compound_data_helper.pkb | 1388 +++++++------- .../data_values/ut_cursor_column.tpb | 139 +- .../data_values/ut_cursor_column.tps | 103 +- .../data_values/ut_cursor_details.tpb | 543 +++--- .../data_values/ut_cursor_details.tps | 83 +- .../data_values/ut_data_value_anydata.tpb | 288 ++- .../data_values/ut_data_value_refcursor.tpb | 797 ++++---- 9 files changed, 2882 insertions(+), 2899 deletions(-) diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 2e35229e6..5b80e1f59 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -1,817 +1,827 @@ -create or replace package body ut_utils is - /* - utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project - - Licensed under the Apache License, Version 2.0 (the "License"): - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - - /** - * Constants regex used to validate XML name - */ - gc_invalid_first_xml_char constant varchar2(50) := '[^_a-zA-Z]'; - gc_invalid_xml_char constant varchar2(50) := '[^_a-zA-Z0-9\.-]'; - gc_full_valid_xml_name constant varchar2(50) := '^([_a-zA-Z])([_a-zA-Z0-9\.-])*$'; - - function surround_with(a_value varchar2, a_quote_char varchar2) return varchar2 is - begin - return case when a_quote_char is not null then a_quote_char||a_value||a_quote_char else a_value end; - end; - - function test_result_to_char(a_test_result integer) return varchar2 as - l_result varchar2(20); - begin - if a_test_result = gc_success then - l_result := gc_success_char; - elsif a_test_result = gc_failure then - l_result := gc_failure_char; - elsif a_test_result = gc_error then - l_result := gc_error_char; - elsif a_test_result = gc_disabled then - l_result := gc_disabled_char; - else - l_result := 'Unknown(' || coalesce(to_char(a_test_result),'NULL') || ')'; - end if ; - return l_result; - end test_result_to_char; - - - function to_test_result(a_test boolean) return integer is - l_result integer; - begin - if a_test then - l_result := gc_success; - else - l_result := gc_failure; - end if; - return l_result; - end; - - function gen_savepoint_name return varchar2 is - begin - return 's'||trim(to_char(ut_savepoint_seq.nextval,'0000000000000000000000000000')); - end; - - procedure debug_log(a_message varchar2) is - begin - $if $$ut_trace $then - dbms_output.put_line(a_message); - $else - null; - $end - end; - - procedure debug_log(a_message clob) is - l_varchars ut_varchar2_list; - begin - $if $$ut_trace $then - l_varchars := clob_to_table(a_message); - for i in 1..l_varchars.count loop - dbms_output.put_line(l_varchars(i)); - end loop; - $else - null; - $end - end; - - function to_string( - a_value varchar2, - a_quote_char varchar2 := '''', - a_max_output_len in number := gc_max_output_string_length - ) return varchar2 is - l_result varchar2(32767); - c_length constant integer := coalesce( length( a_value ), 0 ); - c_max_input_string_length constant integer := a_max_output_len - coalesce( length( a_quote_char ) * 2, 0 ); - c_overflow_substr_len constant integer := c_max_input_string_length - gc_more_data_string_len; - begin - if c_length = 0 then - l_result := gc_null_string; - elsif c_length <= c_max_input_string_length then - l_result := surround_with(a_value, a_quote_char); - else - l_result := surround_with(substr(a_value, 1, c_overflow_substr_len ), a_quote_char) || gc_more_data_string; - end if ; - return l_result; - end; - - function to_string( - a_value clob, - a_quote_char varchar2 := '''', - a_max_output_len in number := gc_max_output_string_length - ) return varchar2 is - l_result varchar2(32767); - c_length constant integer := coalesce(dbms_lob.getlength(a_value), 0); - c_max_input_string_length constant integer := a_max_output_len - coalesce( length( a_quote_char ) * 2, 0 ); - c_overflow_substr_len constant integer := c_max_input_string_length - gc_more_data_string_len; - begin - if a_value is null then - l_result := gc_null_string; - elsif c_length = 0 then - l_result := gc_empty_string; - elsif c_length <= c_max_input_string_length then - l_result := surround_with(a_value,a_quote_char); - else - l_result := surround_with(dbms_lob.substr(a_value, c_overflow_substr_len), a_quote_char) || gc_more_data_string; - end if; - return l_result; - end; - - function to_string( - a_value blob, - a_quote_char varchar2 := '''', - a_max_output_len in number := gc_max_output_string_length - ) return varchar2 is - l_result varchar2(32767); - c_length constant integer := coalesce(dbms_lob.getlength(a_value), 0); - c_max_input_string_length constant integer := a_max_output_len - coalesce( length( a_quote_char ) * 2, 0 ); - c_overflow_substr_len constant integer := c_max_input_string_length - gc_more_data_string_len; - begin - if a_value is null then - l_result := gc_null_string; - elsif c_length = 0 then - l_result := gc_empty_string; - elsif c_length <= c_max_input_string_length then - l_result := surround_with(rawtohex(a_value),a_quote_char); - else - l_result := to_string( rawtohex(dbms_lob.substr(a_value, c_overflow_substr_len)) ); - end if ; - return l_result; - end; - - function to_string(a_value boolean) return varchar2 is - begin - return case a_value when true then 'TRUE' when false then 'FALSE' else gc_null_string end; - end; - - function to_string(a_value number) return varchar2 is - begin - return coalesce(to_char(a_value,gc_number_format), gc_null_string); - end; - - function to_string(a_value date) return varchar2 is - begin - return coalesce(to_char(a_value,gc_date_format), gc_null_string); - end; - - function to_string(a_value timestamp_unconstrained) return varchar2 is - begin - return coalesce(to_char(a_value,gc_timestamp_format), gc_null_string); - end; - - function to_string(a_value timestamp_tz_unconstrained) return varchar2 is - begin - return coalesce(to_char(a_value,gc_timestamp_tz_format), gc_null_string); - end; - - function to_string(a_value timestamp_ltz_unconstrained) return varchar2 is - begin - return coalesce(to_char(a_value,gc_timestamp_format), gc_null_string); - end; - - function to_string(a_value yminterval_unconstrained) return varchar2 IS - begin - return coalesce(to_char(a_value), gc_null_string); - end; - - function to_string(a_value dsinterval_unconstrained) return varchar2 IS - begin - return coalesce(to_char(a_value), gc_null_string); - end; - - - function boolean_to_int(a_value boolean) return integer is - begin - return case a_value when true then 1 when false then 0 end; - end; - - function int_to_boolean(a_value integer) return boolean is - begin - return case a_value when 1 then true when 0 then false end; - end; - - function string_to_table(a_string varchar2, a_delimiter varchar2:= chr(10), a_skip_leading_delimiter varchar2 := 'N') return ut_varchar2_list is - l_offset integer := 1; - l_delimiter_position integer; - l_skip_leading_delimiter boolean := coalesce(a_skip_leading_delimiter = 'Y',false); - l_result ut_varchar2_list := ut_varchar2_list(); - begin - if a_string is null then - return l_result; - end if; - if a_delimiter is null then - return ut_varchar2_list(a_string); - end if; - - loop - l_delimiter_position := instr(a_string, a_delimiter, l_offset); - if not (l_delimiter_position = 1 and l_skip_leading_delimiter) then - l_result.extend; - if l_delimiter_position > 0 then - l_result(l_result.last) := substr(a_string, l_offset, l_delimiter_position - l_offset); - else - l_result(l_result.last) := substr(a_string, l_offset); - end if; - end if; - exit when l_delimiter_position = 0; - l_offset := l_delimiter_position + 1; - end loop; - return l_result; - end; - - function clob_to_table(a_clob clob, a_max_amount integer := 8191, a_delimiter varchar2:= chr(10)) return ut_varchar2_list is - l_offset integer := 1; - l_length integer := dbms_lob.getlength(a_clob); - l_amount integer; - l_buffer varchar2(32767); - l_last_line varchar2(32767); - l_string_results ut_varchar2_list; - l_results ut_varchar2_list := ut_varchar2_list(); - l_has_last_line boolean; - l_skip_leading_delimiter varchar2(1) := 'N'; - begin - while l_offset <= l_length loop - l_amount := a_max_amount - coalesce( length(l_last_line), 0 ); - dbms_lob.read(a_clob, l_amount, l_offset, l_buffer); - l_offset := l_offset + l_amount; - - l_string_results := string_to_table( l_last_line || l_buffer, a_delimiter, l_skip_leading_delimiter ); - for i in 1 .. l_string_results.count loop - --if a split of lines was not done or not at the last line - if l_string_results.count = 1 or i < l_string_results.count then - l_results.extend; - l_results(l_results.last) := l_string_results(i); - end if; - end loop; - - --check if we need to append the last line to the next element - if l_string_results.count = 1 then - l_has_last_line := false; - l_last_line := null; - elsif l_string_results.count > 1 then - l_has_last_line := true; - l_last_line := l_string_results(l_string_results.count); - end if; - - l_skip_leading_delimiter := 'Y'; - end loop; - if l_has_last_line then - l_results.extend; - l_results(l_results.last) := l_last_line; - end if; - return l_results; - end; - - function table_to_clob(a_text_table ut_varchar2_list, a_delimiter varchar2:= chr(10)) return clob is - l_result clob; - l_table_rows integer := coalesce(cardinality(a_text_table),0); - begin - for i in 1 .. l_table_rows loop - if i < l_table_rows then - append_to_clob(l_result, a_text_table(i)||a_delimiter); - else - append_to_clob(l_result, a_text_table(i)); - end if; - end loop; - return l_result; - end; - - function table_to_clob(a_integer_table ut_integer_list, a_delimiter varchar2:= chr(10)) return clob is - l_result clob; - l_table_rows integer := coalesce(cardinality(a_integer_table),0); - begin - for i in 1 .. l_table_rows loop - if i < l_table_rows then - append_to_clob(l_result, a_integer_table(i)||a_delimiter); - else - append_to_clob(l_result, a_integer_table(i)); - end if; - end loop; - return l_result; - end; - - function time_diff(a_start_time timestamp with time zone, a_end_time timestamp with time zone) return number is - begin - return - extract(day from(a_end_time - a_start_time)) * 24 * 60 * 60 + - extract(hour from(a_end_time - a_start_time)) * 60 * 60 + - extract(minute from(a_end_time - a_start_time)) * 60 + - extract(second from(a_end_time - a_start_time)); - end; - - function indent_lines(a_text varchar2, a_indent_size integer := 4, a_include_first_line boolean := false) return varchar2 is - begin - if a_include_first_line then - return rtrim(lpad( ' ', a_indent_size ) || replace( a_text, chr(10), chr(10) || lpad( ' ', a_indent_size ) )); - else - return rtrim(replace( a_text, chr(10), chr(10) || lpad( ' ', a_indent_size ) )); - end if; - end; - - function get_utplsql_objects_list return ut_object_names is - l_result ut_object_names; - begin - select distinct ut_object_name(sys_context('userenv','current_user'), o.object_name) - bulk collect into l_result - from user_objects o - where o.object_name = 'UT' or object_name like 'UT\_%' escape '\' - and o.object_type <> 'SYNONYM'; - return l_result; - end; - - procedure append_to_list(a_list in out nocopy ut_varchar2_list, a_item varchar2) is - begin - if a_item is not null then - if a_list is null then - a_list := ut_varchar2_list(); - end if; - a_list.extend; - a_list(a_list.last) := a_item; - end if; - end append_to_list; - - procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_items ut_varchar2_rows) is - begin - if a_items is not null then - if a_list is null then - a_list := ut_varchar2_rows(); - end if; - for i in 1 .. a_items.count loop - a_list.extend; - a_list(a_list.last) := a_items(i); - end loop; - end if; - end; - - procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_item clob) is - begin - append_to_list( - a_list, - convert_collection( - clob_to_table( a_item, ut_utils.gc_max_storage_varchar2_len ) - ) - ); - end; - - procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_item varchar2) is - begin - if a_item is not null then - if a_list is null then - a_list := ut_varchar2_rows(); - end if; - if length(a_item) > gc_max_storage_varchar2_len then - append_to_list( - a_list, - ut_utils.convert_collection( - ut_utils.clob_to_table( a_item, gc_max_storage_varchar2_len ) - ) - ); - else - a_list.extend; - a_list(a_list.last) := a_item; - end if; - end if; - end append_to_list; - - procedure append_to_clob(a_src_clob in out nocopy clob, a_clob_table t_clob_tab, a_delimiter varchar2:= chr(10)) is - begin - if a_clob_table is not null and cardinality(a_clob_table) > 0 then - if a_src_clob is null then - dbms_lob.createtemporary(a_src_clob, true); - end if; - for i in 1 .. a_clob_table.count loop - dbms_lob.append(a_src_clob,a_clob_table(i)); - if i < a_clob_table.count then - append_to_clob(a_src_clob,a_delimiter); - end if; - end loop; - end if; - end; - - procedure append_to_clob(a_src_clob in out nocopy clob, a_new_data clob) is - begin - if a_new_data is not null and dbms_lob.getlength(a_new_data) > 0 then - if a_src_clob is null then - dbms_lob.createtemporary(a_src_clob, true); - end if; - dbms_lob.append(a_src_clob, a_new_data); - end if; - end; - - procedure append_to_clob(a_src_clob in out nocopy clob, a_new_data varchar2) is - begin - if a_new_data is not null then - if a_src_clob is null then - dbms_lob.createtemporary(a_src_clob, true); - end if; - dbms_lob.writeappend(a_src_clob, dbms_lob.getlength(a_new_data), a_new_data); - end if; - end; - - function convert_collection(a_collection ut_varchar2_list) return ut_varchar2_rows is - l_result ut_varchar2_rows; - begin - if a_collection is not null then - l_result := ut_varchar2_rows(); - for i in 1 .. a_collection.count loop - l_result.extend(); - l_result(i) := substr(a_collection(i),1,gc_max_storage_varchar2_len); - end loop; - end if; - return l_result; - end; - - procedure set_action(a_text in varchar2) is - begin - dbms_application_info.set_module('utPLSQL', a_text); - end; - - procedure set_client_info(a_text in varchar2) is - begin - dbms_application_info.set_client_info(a_text); - end; - - function to_xpath(a_list varchar2, a_ancestors varchar2 := '/*/') return varchar2 is - l_xpath varchar2(32767) := a_list; - begin - l_xpath := to_xpath( clob_to_table(a_clob=>a_list, a_delimiter=>','), a_ancestors); - return l_xpath; - end; - - function to_xpath(a_list ut_varchar2_list, a_ancestors varchar2 := '/*/') return varchar2 is - l_xpath varchar2(32767); - l_item varchar2(32767); - l_iter integer; - begin - if a_list is not null then - l_iter := a_list.first; - while l_iter is not null loop - l_item := trim(a_list(l_iter)); - if l_item is not null then - if l_item like '%,%' then - l_xpath := l_xpath || to_xpath( l_item, a_ancestors ) || '|'; - elsif l_item like '/%' then - l_xpath := l_xpath || l_item || '|'; - else - l_xpath := l_xpath || a_ancestors || l_item || '|'; - end if; - end if; - l_iter := a_list.next(l_iter); - end loop; - l_xpath := rtrim(l_xpath,',|'); - end if; - return l_xpath; - end; - - procedure cleanup_temp_tables is - begin - execute immediate 'delete from ut_compound_data_tmp'; - execute immediate 'delete from ut_compound_data_diff_tmp'; - end; - - function to_version(a_version_no varchar2) return t_version is - l_result t_version; - c_version_part_regex constant varchar2(20) := '[0-9]+'; - begin - - if regexp_like(a_version_no,'v?([0-9]+(\.|$)){1,4}') then - l_result.major := regexp_substr(a_version_no, c_version_part_regex, 1, 1); - l_result.minor := regexp_substr(a_version_no, c_version_part_regex, 1, 2); - l_result.bugfix := regexp_substr(a_version_no, c_version_part_regex, 1, 3); - l_result.build := regexp_substr(a_version_no, c_version_part_regex, 1, 4); - else - raise_application_error(gc_invalid_version_no, 'Version string "'||a_version_no||'" is not a valid version'); - end if; - return l_result; - end; - - procedure save_dbms_output_to_cache is - l_status number; - l_line varchar2(32767); - l_offset integer := 0; - l_lines ut_varchar2_rows := ut_varchar2_rows(); - c_lines_limit constant integer := 100; - pragma autonomous_transaction; - - procedure flush_lines(a_lines ut_varchar2_rows, a_offset integer) is - begin - insert into ut_dbms_output_cache (seq_no,text) - select rownum+a_offset, column_value - from table(a_lines); - end; - begin - loop - dbms_output.get_line(line => l_line, status => l_status); - exit when l_status = 1; - l_lines := l_lines multiset union all ut_utils.convert_collection(ut_utils.clob_to_table(l_line||chr(7),4000)); - if l_lines.count > c_lines_limit then - flush_lines(l_lines, l_offset); - l_offset := l_offset + l_lines.count; - l_lines.delete; - end if; - end loop; - flush_lines(l_lines, l_offset); - commit; - end; - - procedure read_cache_to_dbms_output is - l_lines_data sys_refcursor; - l_lines ut_varchar2_rows; - c_lines_limit constant integer := 100; - pragma autonomous_transaction; - begin - open l_lines_data for select text from ut_dbms_output_cache order by seq_no; - loop - fetch l_lines_data bulk collect into l_lines limit c_lines_limit; - for i in 1 .. l_lines.count loop - if substr(l_lines(i),-1) = chr(7) then - dbms_output.put_line(rtrim(l_lines(i),chr(7))); - else - dbms_output.put(l_lines(i)); - end if; - end loop; - exit when l_lines_data%notfound; - end loop; - delete from ut_dbms_output_cache; - commit; - end; - - function ut_owner return varchar2 is - begin - return sys_context('userenv','current_schema'); - end; - - function scale_cardinality(a_cardinality natural) return natural is - begin - return nvl(trunc(power(10,(floor(log(10,a_cardinality))+1))/3),0); - end; - - function build_depreciation_warning(a_old_syntax varchar2, a_new_syntax varchar2) return varchar2 is - begin - return 'The syntax: "'||a_old_syntax||'" is deprecated.' ||chr(10)|| - 'Please use the new syntax: "'||a_new_syntax||'".' ||chr(10)|| - 'The deprecated syntax will not be supported in future releases.'; - end; - - function to_xml_number_format(a_value number) return varchar2 is - begin - return to_char(a_value, gc_number_format, 'NLS_NUMERIC_CHARACTERS=''. '''); - end; - - function get_xml_header(a_encoding varchar2) return varchar2 is - begin - return - ''; - end; - - function trim_list_elements(a_list ut_varchar2_list, a_regexp_to_trim varchar2 default '[:space:]') return ut_varchar2_list is - l_trimmed_list ut_varchar2_list; - l_index integer; - begin - if a_list is not null then - l_trimmed_list := ut_varchar2_list(); - l_index := a_list.first; - - while (l_index is not null) loop - l_trimmed_list.extend; - l_trimmed_list(l_trimmed_list.count) := regexp_replace(a_list(l_index), '(^['||a_regexp_to_trim||']*)|(['||a_regexp_to_trim||']*$)'); - l_index := a_list.next(l_index); - end loop; - end if; - - return l_trimmed_list; - end; - - function filter_list(a_list in ut_varchar2_list, a_regexp_filter in varchar2) return ut_varchar2_list is - l_filtered_list ut_varchar2_list; - l_index integer; - begin - if a_list is not null then - l_filtered_list := ut_varchar2_list(); - l_index := a_list.first; - - while (l_index is not null) loop - if regexp_like(a_list(l_index), a_regexp_filter) then - l_filtered_list.extend; - l_filtered_list(l_filtered_list.count) := a_list(l_index); - end if; - l_index := a_list.next(l_index); - end loop; - end if; - - return l_filtered_list; - end; - - function xmlgen_escaped_string(a_string in varchar2) return varchar2 is - l_result varchar2(4000) := a_string; - l_sql varchar2(32767) := q'!select q'[!'||a_string||q'!]' as "!'||a_string||'" from dual'; - begin - if a_string is not null then - select extract(dbms_xmlgen.getxmltype(l_sql),'/*/*/*').getRootElement() - into l_result - from dual; - end if; - return l_result; - end; - - function replace_multiline_comments(a_source clob) return clob is - l_result clob; - l_ml_comment_start binary_integer := 1; - l_comment_start binary_integer := 1; - l_text_start binary_integer := 1; - l_escaped_text_start binary_integer := 1; - l_escaped_text_end_char varchar2(1 char); - l_end binary_integer := 1; - l_ml_comment clob; - l_newlines_count binary_integer; - l_offset binary_integer := 1; - l_length binary_integer := coalesce(dbms_lob.getlength(a_source), 0); - begin - l_ml_comment_start := instr(a_source,'/*'); - l_comment_start := instr(a_source,'--'); - l_text_start := instr(a_source,''''); - l_escaped_text_start := instr(a_source,q'[q']'); - while l_offset > 0 and l_ml_comment_start > 0 loop - - if l_ml_comment_start > 0 and (l_ml_comment_start < l_comment_start or l_comment_start = 0) - and (l_ml_comment_start < l_text_start or l_text_start = 0)and (l_ml_comment_start < l_escaped_text_start or l_escaped_text_start = 0) - then - l_end := instr(a_source,'*/',l_ml_comment_start+2); - append_to_clob(l_result, dbms_lob.substr(a_source, l_ml_comment_start-l_offset, l_offset)); - if l_end > 0 then - l_ml_comment := substr(a_source, l_ml_comment_start, l_end-l_ml_comment_start); - l_newlines_count := length( l_ml_comment ) - length( translate( l_ml_comment, 'a'||chr(10), 'a') ); - if l_newlines_count > 0 then - append_to_clob(l_result, lpad( chr(10), l_newlines_count, chr(10) ) ); - end if; - l_end := l_end + 2; - end if; - else - - if l_comment_start > 0 and (l_comment_start < l_ml_comment_start or l_ml_comment_start = 0) - and (l_comment_start < l_text_start or l_text_start = 0) and (l_comment_start < l_escaped_text_start or l_escaped_text_start = 0) - then - l_end := instr(a_source,chr(10),l_comment_start+2); - if l_end > 0 then - l_end := l_end + 1; - end if; - elsif l_text_start > 0 and (l_text_start < l_ml_comment_start or l_ml_comment_start = 0) - and (l_text_start < l_comment_start or l_comment_start = 0) and (l_text_start < l_escaped_text_start or l_escaped_text_start = 0) - then - l_end := instr(a_source,q'[']',l_text_start+1); - - --skip double quotes while searching for end of quoted text - while l_end > 0 and l_end = instr(a_source,q'['']',l_text_start+1) loop - l_end := instr(a_source,q'[']',l_end+1); - end loop; - if l_end > 0 then - l_end := l_end + 1; - end if; - - elsif l_escaped_text_start > 0 and (l_escaped_text_start < l_ml_comment_start or l_ml_comment_start = 0) - and (l_escaped_text_start < l_comment_start or l_comment_start = 0) and (l_escaped_text_start < l_text_start or l_text_start = 0) - then - --translate char "[" from the start of quoted text "q'[someting]'" into "]" - l_escaped_text_end_char := translate( substr(a_source, l_escaped_text_start + 2, 1), '[{(<', ']})>'); - l_end := instr(a_source,l_escaped_text_end_char||'''',l_escaped_text_start + 3 ); - if l_end > 0 then - l_end := l_end + 2; - end if; - end if; - - if l_end = 0 then - append_to_clob(l_result, substr(a_source, l_offset, l_length-l_offset)); - else - append_to_clob(l_result, substr(a_source, l_offset, l_end-l_offset)); - end if; - end if; - l_offset := l_end; - if l_offset >= l_ml_comment_start then - l_ml_comment_start := instr(a_source,'/*',l_offset); - end if; - if l_offset >= l_comment_start then - l_comment_start := instr(a_source,'--',l_offset); - end if; - if l_offset >= l_text_start then - l_text_start := instr(a_source,'''',l_offset); - end if; - if l_offset >= l_escaped_text_start then - l_escaped_text_start := instr(a_source,q'[q']',l_offset); - end if; - end loop; - append_to_clob(l_result, substr(a_source, l_end)); - return l_result; - end; - - function get_child_reporters(a_for_reporters ut_reporters_info := null) return ut_reporters_info is - l_for_reporters ut_reporters_info := a_for_reporters; - l_results ut_reporters_info; - begin - if l_for_reporters is null then - l_for_reporters := ut_reporters_info(ut_reporter_info('UT_REPORTER_BASE','N','N','N')); - end if; - - select /*+ cardinality(f 10) */ - ut_reporter_info( - object_name => t.type_name, - is_output_reporter => - case - when f.is_output_reporter = 'Y' or t.type_name = 'UT_OUTPUT_REPORTER_BASE' - then 'Y' else 'N' - end, - is_instantiable => case when t.instantiable = 'YES' then 'Y' else 'N' end, - is_final => case when t.final = 'YES' then 'Y' else 'N' end - ) - bulk collect into l_results - from user_types t - join (select * from table(l_for_reporters) where is_final = 'N' ) f - on f.object_name = supertype_name; - - return l_results; - end; - - function remove_error_from_stack(a_error_stack varchar2, a_ora_code number) return varchar2 is - l_caller_stack_line varchar2(4000); - l_ora_search_pattern varchar2(500) := '^ORA'||a_ora_code||': (.*)$'; - begin - l_caller_stack_line := regexp_replace(srcstr => a_error_stack - ,pattern => l_ora_search_pattern - ,replacestr => null - ,position => 1 - ,occurrence => 1 - ,modifier => 'm'); - return l_caller_stack_line; - end; - - /** - * Change string into unicode to match xmlgen format _00_ - * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.7.2935-develop - */ - function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is - begin - return '_x00'||rawtohex(utl_raw.cast_to_raw(a_character))||'_'; - end; - - /** - * Build valid XML column name as element names can contain letters, digits, hyphens, underscores, and periods - */ - function build_valid_xml_name(a_preprocessed_name varchar2) return varchar2 is - l_post_processed varchar2(4000); - begin - for i in (select regexp_substr( a_preprocessed_name ,'(.{1})', 1, level, null, 1 ) AS string_char,level level_no - from dual connect by level <= regexp_count(a_preprocessed_name, '(.{1})')) - loop - if i.level_no = 1 and regexp_like(i.string_char,gc_invalid_first_xml_char) then - l_post_processed := l_post_processed || char_to_xmlgen_unicode(i.string_char); - elsif regexp_like(i.string_char,gc_invalid_xml_char) then - l_post_processed := l_post_processed || char_to_xmlgen_unicode(i.string_char); - else - l_post_processed := l_post_processed || i.string_char; - end if; - end loop; - return l_post_processed; - end; - - function get_valid_xml_name(a_name varchar2) return varchar2 is - l_valid_name varchar2(4000); - begin - if regexp_like(a_name,gc_full_valid_xml_name) then - l_valid_name := a_name; - else - l_valid_name := build_valid_xml_name(a_name); - end if; - return l_valid_name; - end; - - function add_prefix(a_list ut_varchar2_list, a_prefix varchar2, a_connector varchar2 := '/') return ut_varchar2_list is - l_result ut_varchar2_list := ut_varchar2_list(); - l_idx binary_integer; - begin - if a_prefix is not null then - l_idx := a_list.first; - while l_idx is not null loop - l_result.extend; - l_result(l_idx) := a_prefix||a_connector||trim(leading a_connector from a_list(l_idx)); - l_idx := a_list.next(l_idx); - end loop; - end if; - return l_result; - end; - -end ut_utils; -/ +create or replace package body ut_utils is + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + /** + * Constants regex used to validate XML name + */ + gc_invalid_first_xml_char constant varchar2(50) := '[^_a-zA-Z]'; + gc_invalid_xml_char constant varchar2(50) := '[^_a-zA-Z0-9\.-]'; + gc_full_valid_xml_name constant varchar2(50) := '^([_a-zA-Z])([_a-zA-Z0-9\.-])*$'; + + function surround_with(a_value varchar2, a_quote_char varchar2) return varchar2 is + begin + return case when a_quote_char is not null then a_quote_char||a_value||a_quote_char else a_value end; + end; + + function test_result_to_char(a_test_result integer) return varchar2 as + l_result varchar2(20); + begin + if a_test_result = gc_success then + l_result := gc_success_char; + elsif a_test_result = gc_failure then + l_result := gc_failure_char; + elsif a_test_result = gc_error then + l_result := gc_error_char; + elsif a_test_result = gc_disabled then + l_result := gc_disabled_char; + else + l_result := 'Unknown(' || coalesce(to_char(a_test_result),'NULL') || ')'; + end if ; + return l_result; + end test_result_to_char; + + + function to_test_result(a_test boolean) return integer is + l_result integer; + begin + if a_test then + l_result := gc_success; + else + l_result := gc_failure; + end if; + return l_result; + end; + + function gen_savepoint_name return varchar2 is + begin + return 's'||trim(to_char(ut_savepoint_seq.nextval,'0000000000000000000000000000')); + end; + + procedure debug_log(a_message varchar2) is + begin + $if $$ut_trace $then + dbms_output.put_line(a_message); + $else + null; + $end + end; + + procedure debug_log(a_message clob) is + l_varchars ut_varchar2_list; + begin + $if $$ut_trace $then + l_varchars := clob_to_table(a_message); + for i in 1..l_varchars.count loop + dbms_output.put_line(l_varchars(i)); + end loop; + $else + null; + $end + end; + + function to_string( + a_value varchar2, + a_quote_char varchar2 := '''', + a_max_output_len in number := gc_max_output_string_length + ) return varchar2 is + l_result varchar2(32767); + c_length constant integer := coalesce( length( a_value ), 0 ); + c_max_input_string_length constant integer := a_max_output_len - coalesce( length( a_quote_char ) * 2, 0 ); + c_overflow_substr_len constant integer := c_max_input_string_length - gc_more_data_string_len; + begin + if c_length = 0 then + l_result := gc_null_string; + elsif c_length <= c_max_input_string_length then + l_result := surround_with(a_value, a_quote_char); + else + l_result := surround_with(substr(a_value, 1, c_overflow_substr_len ), a_quote_char) || gc_more_data_string; + end if ; + return l_result; + end; + + function to_string( + a_value clob, + a_quote_char varchar2 := '''', + a_max_output_len in number := gc_max_output_string_length + ) return varchar2 is + l_result varchar2(32767); + c_length constant integer := coalesce(dbms_lob.getlength(a_value), 0); + c_max_input_string_length constant integer := a_max_output_len - coalesce( length( a_quote_char ) * 2, 0 ); + c_overflow_substr_len constant integer := c_max_input_string_length - gc_more_data_string_len; + begin + if a_value is null then + l_result := gc_null_string; + elsif c_length = 0 then + l_result := gc_empty_string; + elsif c_length <= c_max_input_string_length then + l_result := surround_with(a_value,a_quote_char); + else + l_result := surround_with(dbms_lob.substr(a_value, c_overflow_substr_len), a_quote_char) || gc_more_data_string; + end if; + return l_result; + end; + + function to_string( + a_value blob, + a_quote_char varchar2 := '''', + a_max_output_len in number := gc_max_output_string_length + ) return varchar2 is + l_result varchar2(32767); + c_length constant integer := coalesce(dbms_lob.getlength(a_value), 0); + c_max_input_string_length constant integer := a_max_output_len - coalesce( length( a_quote_char ) * 2, 0 ); + c_overflow_substr_len constant integer := c_max_input_string_length - gc_more_data_string_len; + begin + if a_value is null then + l_result := gc_null_string; + elsif c_length = 0 then + l_result := gc_empty_string; + elsif c_length <= c_max_input_string_length then + l_result := surround_with(rawtohex(a_value),a_quote_char); + else + l_result := to_string( rawtohex(dbms_lob.substr(a_value, c_overflow_substr_len)) ); + end if ; + return l_result; + end; + + function to_string(a_value boolean) return varchar2 is + begin + return case a_value when true then 'TRUE' when false then 'FALSE' else gc_null_string end; + end; + + function to_string(a_value number) return varchar2 is + begin + return coalesce(to_char(a_value,gc_number_format), gc_null_string); + end; + + function to_string(a_value date) return varchar2 is + begin + return coalesce(to_char(a_value,gc_date_format), gc_null_string); + end; + + function to_string(a_value timestamp_unconstrained) return varchar2 is + begin + return coalesce(to_char(a_value,gc_timestamp_format), gc_null_string); + end; + + function to_string(a_value timestamp_tz_unconstrained) return varchar2 is + begin + return coalesce(to_char(a_value,gc_timestamp_tz_format), gc_null_string); + end; + + function to_string(a_value timestamp_ltz_unconstrained) return varchar2 is + begin + return coalesce(to_char(a_value,gc_timestamp_format), gc_null_string); + end; + + function to_string(a_value yminterval_unconstrained) return varchar2 IS + begin + return coalesce(to_char(a_value), gc_null_string); + end; + + function to_string(a_value dsinterval_unconstrained) return varchar2 IS + begin + return coalesce(to_char(a_value), gc_null_string); + end; + + + function boolean_to_int(a_value boolean) return integer is + begin + return case a_value when true then 1 when false then 0 end; + end; + + function int_to_boolean(a_value integer) return boolean is + begin + return case a_value when 1 then true when 0 then false end; + end; + + function string_to_table(a_string varchar2, a_delimiter varchar2:= chr(10), a_skip_leading_delimiter varchar2 := 'N') return ut_varchar2_list is + l_offset integer := 1; + l_delimiter_position integer; + l_skip_leading_delimiter boolean := coalesce(a_skip_leading_delimiter = 'Y',false); + l_result ut_varchar2_list := ut_varchar2_list(); + begin + if a_string is null then + return l_result; + end if; + if a_delimiter is null then + return ut_varchar2_list(a_string); + end if; + + loop + l_delimiter_position := instr(a_string, a_delimiter, l_offset); + if not (l_delimiter_position = 1 and l_skip_leading_delimiter) then + l_result.extend; + if l_delimiter_position > 0 then + l_result(l_result.last) := substr(a_string, l_offset, l_delimiter_position - l_offset); + else + l_result(l_result.last) := substr(a_string, l_offset); + end if; + end if; + exit when l_delimiter_position = 0; + l_offset := l_delimiter_position + 1; + end loop; + return l_result; + end; + + function clob_to_table(a_clob clob, a_max_amount integer := 8191, a_delimiter varchar2:= chr(10)) return ut_varchar2_list is + l_offset integer := 1; + l_length integer := dbms_lob.getlength(a_clob); + l_amount integer; + l_buffer varchar2(32767); + l_last_line varchar2(32767); + l_string_results ut_varchar2_list; + l_results ut_varchar2_list := ut_varchar2_list(); + l_has_last_line boolean; + l_skip_leading_delimiter varchar2(1) := 'N'; + begin + while l_offset <= l_length loop + l_amount := a_max_amount - coalesce( length(l_last_line), 0 ); + dbms_lob.read(a_clob, l_amount, l_offset, l_buffer); + l_offset := l_offset + l_amount; + + l_string_results := string_to_table( l_last_line || l_buffer, a_delimiter, l_skip_leading_delimiter ); + for i in 1 .. l_string_results.count loop + --if a split of lines was not done or not at the last line + if l_string_results.count = 1 or i < l_string_results.count then + l_results.extend; + l_results(l_results.last) := l_string_results(i); + end if; + end loop; + + --check if we need to append the last line to the next element + if l_string_results.count = 1 then + l_has_last_line := false; + l_last_line := null; + elsif l_string_results.count > 1 then + l_has_last_line := true; + l_last_line := l_string_results(l_string_results.count); + end if; + + l_skip_leading_delimiter := 'Y'; + end loop; + if l_has_last_line then + l_results.extend; + l_results(l_results.last) := l_last_line; + end if; + return l_results; + end; + + function table_to_clob(a_text_table ut_varchar2_list, a_delimiter varchar2:= chr(10)) return clob is + l_result clob; + l_table_rows integer := coalesce(cardinality(a_text_table),0); + begin + for i in 1 .. l_table_rows loop + if i < l_table_rows then + append_to_clob(l_result, a_text_table(i)||a_delimiter); + else + append_to_clob(l_result, a_text_table(i)); + end if; + end loop; + return l_result; + end; + + function table_to_clob(a_integer_table ut_integer_list, a_delimiter varchar2:= chr(10)) return clob is + l_result clob; + l_table_rows integer := coalesce(cardinality(a_integer_table),0); + begin + for i in 1 .. l_table_rows loop + if i < l_table_rows then + append_to_clob(l_result, a_integer_table(i)||a_delimiter); + else + append_to_clob(l_result, a_integer_table(i)); + end if; + end loop; + return l_result; + end; + + function time_diff(a_start_time timestamp with time zone, a_end_time timestamp with time zone) return number is + begin + return + extract(day from(a_end_time - a_start_time)) * 24 * 60 * 60 + + extract(hour from(a_end_time - a_start_time)) * 60 * 60 + + extract(minute from(a_end_time - a_start_time)) * 60 + + extract(second from(a_end_time - a_start_time)); + end; + + function indent_lines(a_text varchar2, a_indent_size integer := 4, a_include_first_line boolean := false) return varchar2 is + begin + if a_include_first_line then + return rtrim(lpad( ' ', a_indent_size ) || replace( a_text, chr(10), chr(10) || lpad( ' ', a_indent_size ) )); + else + return rtrim(replace( a_text, chr(10), chr(10) || lpad( ' ', a_indent_size ) )); + end if; + end; + + function get_utplsql_objects_list return ut_object_names is + l_result ut_object_names; + begin + select distinct ut_object_name(sys_context('userenv','current_user'), o.object_name) + bulk collect into l_result + from user_objects o + where o.object_name = 'UT' or object_name like 'UT\_%' escape '\' + and o.object_type <> 'SYNONYM'; + return l_result; + end; + + procedure append_to_list(a_list in out nocopy ut_varchar2_list, a_item varchar2) is + begin + if a_item is not null then + if a_list is null then + a_list := ut_varchar2_list(); + end if; + a_list.extend; + a_list(a_list.last) := a_item; + end if; + end append_to_list; + + procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_items ut_varchar2_rows) is + begin + if a_items is not null then + if a_list is null then + a_list := ut_varchar2_rows(); + end if; + for i in 1 .. a_items.count loop + a_list.extend; + a_list(a_list.last) := a_items(i); + end loop; + end if; + end; + + procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_item clob) is + begin + append_to_list( + a_list, + convert_collection( + clob_to_table( a_item, ut_utils.gc_max_storage_varchar2_len ) + ) + ); + end; + + procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_item varchar2) is + begin + if a_item is not null then + if a_list is null then + a_list := ut_varchar2_rows(); + end if; + if length(a_item) > gc_max_storage_varchar2_len then + append_to_list( + a_list, + ut_utils.convert_collection( + ut_utils.clob_to_table( a_item, gc_max_storage_varchar2_len ) + ) + ); + else + a_list.extend; + a_list(a_list.last) := a_item; + end if; + end if; + end append_to_list; + + procedure append_to_clob(a_src_clob in out nocopy clob, a_clob_table t_clob_tab, a_delimiter varchar2:= chr(10)) is + begin + if a_clob_table is not null and cardinality(a_clob_table) > 0 then + if a_src_clob is null then + dbms_lob.createtemporary(a_src_clob, true); + end if; + for i in 1 .. a_clob_table.count loop + dbms_lob.append(a_src_clob,a_clob_table(i)); + if i < a_clob_table.count then + append_to_clob(a_src_clob,a_delimiter); + end if; + end loop; + end if; + end; + + procedure append_to_clob(a_src_clob in out nocopy clob, a_new_data clob) is + begin + if a_new_data is not null and dbms_lob.getlength(a_new_data) > 0 then + if a_src_clob is null then + dbms_lob.createtemporary(a_src_clob, true); + end if; + dbms_lob.append(a_src_clob, a_new_data); + end if; + end; + + procedure append_to_clob(a_src_clob in out nocopy clob, a_new_data varchar2) is + begin + if a_new_data is not null then + if a_src_clob is null then + dbms_lob.createtemporary(a_src_clob, true); + end if; + dbms_lob.writeappend(a_src_clob, dbms_lob.getlength(a_new_data), a_new_data); + end if; + end; + + function convert_collection(a_collection ut_varchar2_list) return ut_varchar2_rows is + l_result ut_varchar2_rows; + begin + if a_collection is not null then + l_result := ut_varchar2_rows(); + for i in 1 .. a_collection.count loop + l_result.extend(); + l_result(i) := substr(a_collection(i),1,gc_max_storage_varchar2_len); + end loop; + end if; + return l_result; + end; + + procedure set_action(a_text in varchar2) is + begin + dbms_application_info.set_module('utPLSQL', a_text); + end; + + procedure set_client_info(a_text in varchar2) is + begin + dbms_application_info.set_client_info(a_text); + end; + + function to_xpath(a_list varchar2, a_ancestors varchar2 := '/*/') return varchar2 is + l_xpath varchar2(32767) := a_list; + begin + l_xpath := to_xpath( clob_to_table(a_clob=>a_list, a_delimiter=>','), a_ancestors); + return l_xpath; + end; + + function to_xpath(a_list ut_varchar2_list, a_ancestors varchar2 := '/*/') return varchar2 is + l_xpath varchar2(32767); + l_item varchar2(32767); + l_iter integer; + begin + if a_list is not null then + l_iter := a_list.first; + while l_iter is not null loop + l_item := trim(a_list(l_iter)); + if l_item is not null then + if l_item like '%,%' then + l_xpath := l_xpath || to_xpath( l_item, a_ancestors ) || '|'; + elsif l_item like '/%' then + l_xpath := l_xpath || l_item || '|'; + else + l_xpath := l_xpath || a_ancestors || l_item || '|'; + end if; + end if; + l_iter := a_list.next(l_iter); + end loop; + l_xpath := rtrim(l_xpath,',|'); + end if; + return l_xpath; + end; + + procedure cleanup_temp_tables is + begin + execute immediate 'delete from ut_compound_data_tmp'; + execute immediate 'delete from ut_compound_data_diff_tmp'; + end; + + function to_version(a_version_no varchar2) return t_version is + l_result t_version; + c_version_part_regex constant varchar2(20) := '[0-9]+'; + begin + + if regexp_like(a_version_no,'v?([0-9]+(\.|$)){1,4}') then + l_result.major := regexp_substr(a_version_no, c_version_part_regex, 1, 1); + l_result.minor := regexp_substr(a_version_no, c_version_part_regex, 1, 2); + l_result.bugfix := regexp_substr(a_version_no, c_version_part_regex, 1, 3); + l_result.build := regexp_substr(a_version_no, c_version_part_regex, 1, 4); + else + raise_application_error(gc_invalid_version_no, 'Version string "'||a_version_no||'" is not a valid version'); + end if; + return l_result; + end; + + procedure save_dbms_output_to_cache is + l_status number; + l_line varchar2(32767); + l_offset integer := 0; + l_lines ut_varchar2_rows := ut_varchar2_rows(); + c_lines_limit constant integer := 100; + pragma autonomous_transaction; + + procedure flush_lines(a_lines ut_varchar2_rows, a_offset integer) is + begin + insert into ut_dbms_output_cache (seq_no,text) + select rownum+a_offset, column_value + from table(a_lines); + end; + begin + loop + dbms_output.get_line(line => l_line, status => l_status); + exit when l_status = 1; + l_lines := l_lines multiset union all ut_utils.convert_collection(ut_utils.clob_to_table(l_line||chr(7),4000)); + if l_lines.count > c_lines_limit then + flush_lines(l_lines, l_offset); + l_offset := l_offset + l_lines.count; + l_lines.delete; + end if; + end loop; + flush_lines(l_lines, l_offset); + commit; + end; + + procedure read_cache_to_dbms_output is + l_lines_data sys_refcursor; + l_lines ut_varchar2_rows; + c_lines_limit constant integer := 100; + pragma autonomous_transaction; + begin + open l_lines_data for select text from ut_dbms_output_cache order by seq_no; + loop + fetch l_lines_data bulk collect into l_lines limit c_lines_limit; + for i in 1 .. l_lines.count loop + if substr(l_lines(i),-1) = chr(7) then + dbms_output.put_line(rtrim(l_lines(i),chr(7))); + else + dbms_output.put(l_lines(i)); + end if; + end loop; + exit when l_lines_data%notfound; + end loop; + delete from ut_dbms_output_cache; + commit; + end; + + function ut_owner return varchar2 is + begin + return sys_context('userenv','current_schema'); + end; + + function scale_cardinality(a_cardinality natural) return natural is + begin + return nvl(trunc(power(10,(floor(log(10,a_cardinality))+1))/3),0); + end; + + function build_depreciation_warning(a_old_syntax varchar2, a_new_syntax varchar2) return varchar2 is + begin + return 'The syntax: "'||a_old_syntax||'" is deprecated.' ||chr(10)|| + 'Please use the new syntax: "'||a_new_syntax||'".' ||chr(10)|| + 'The deprecated syntax will not be supported in future releases.'; + end; + + function to_xml_number_format(a_value number) return varchar2 is + begin + return to_char(a_value, gc_number_format, 'NLS_NUMERIC_CHARACTERS=''. '''); + end; + + function get_xml_header(a_encoding varchar2) return varchar2 is + begin + return + ''; + end; + + function trim_list_elements(a_list ut_varchar2_list, a_regexp_to_trim varchar2 default '[:space:]') return ut_varchar2_list is + l_trimmed_list ut_varchar2_list; + l_index integer; + begin + if a_list is not null then + l_trimmed_list := ut_varchar2_list(); + l_index := a_list.first; + + while (l_index is not null) loop + l_trimmed_list.extend; + l_trimmed_list(l_trimmed_list.count) := regexp_replace(a_list(l_index), '(^['||a_regexp_to_trim||']*)|(['||a_regexp_to_trim||']*$)'); + l_index := a_list.next(l_index); + end loop; + end if; + + return l_trimmed_list; + end; + + function filter_list(a_list in ut_varchar2_list, a_regexp_filter in varchar2) return ut_varchar2_list is + l_filtered_list ut_varchar2_list; + l_index integer; + begin + if a_list is not null then + l_filtered_list := ut_varchar2_list(); + l_index := a_list.first; + + while (l_index is not null) loop + if regexp_like(a_list(l_index), a_regexp_filter) then + l_filtered_list.extend; + l_filtered_list(l_filtered_list.count) := a_list(l_index); + end if; + l_index := a_list.next(l_index); + end loop; + end if; + + return l_filtered_list; + end; + + function xmlgen_escaped_string(a_string in varchar2) return varchar2 is + l_result varchar2(4000) := a_string; + l_sql varchar2(32767) := q'!select q'[!'||a_string||q'!]' as "!'||a_string||'" from dual'; + begin + if a_string is not null then + select extract(dbms_xmlgen.getxmltype(l_sql),'/*/*/*').getRootElement() + into l_result + from dual; + end if; + return l_result; + end; + + function replace_multiline_comments(a_source clob) return clob is + l_result clob; + l_ml_comment_start binary_integer := 1; + l_comment_start binary_integer := 1; + l_text_start binary_integer := 1; + l_escaped_text_start binary_integer := 1; + l_escaped_text_end_char varchar2(1 char); + l_end binary_integer := 1; + l_ml_comment clob; + l_newlines_count binary_integer; + l_offset binary_integer := 1; + l_length binary_integer := coalesce(dbms_lob.getlength(a_source), 0); + begin + l_ml_comment_start := instr(a_source,'/*'); + l_comment_start := instr(a_source,'--'); + l_text_start := instr(a_source,''''); + l_escaped_text_start := instr(a_source,q'[q']'); + while l_offset > 0 and l_ml_comment_start > 0 loop + + if l_ml_comment_start > 0 and (l_ml_comment_start < l_comment_start or l_comment_start = 0) + and (l_ml_comment_start < l_text_start or l_text_start = 0)and (l_ml_comment_start < l_escaped_text_start or l_escaped_text_start = 0) + then + l_end := instr(a_source,'*/',l_ml_comment_start+2); + append_to_clob(l_result, dbms_lob.substr(a_source, l_ml_comment_start-l_offset, l_offset)); + if l_end > 0 then + l_ml_comment := substr(a_source, l_ml_comment_start, l_end-l_ml_comment_start); + l_newlines_count := length( l_ml_comment ) - length( translate( l_ml_comment, 'a'||chr(10), 'a') ); + if l_newlines_count > 0 then + append_to_clob(l_result, lpad( chr(10), l_newlines_count, chr(10) ) ); + end if; + l_end := l_end + 2; + end if; + else + + if l_comment_start > 0 and (l_comment_start < l_ml_comment_start or l_ml_comment_start = 0) + and (l_comment_start < l_text_start or l_text_start = 0) and (l_comment_start < l_escaped_text_start or l_escaped_text_start = 0) + then + l_end := instr(a_source,chr(10),l_comment_start+2); + if l_end > 0 then + l_end := l_end + 1; + end if; + elsif l_text_start > 0 and (l_text_start < l_ml_comment_start or l_ml_comment_start = 0) + and (l_text_start < l_comment_start or l_comment_start = 0) and (l_text_start < l_escaped_text_start or l_escaped_text_start = 0) + then + l_end := instr(a_source,q'[']',l_text_start+1); + + --skip double quotes while searching for end of quoted text + while l_end > 0 and l_end = instr(a_source,q'['']',l_text_start+1) loop + l_end := instr(a_source,q'[']',l_end+1); + end loop; + if l_end > 0 then + l_end := l_end + 1; + end if; + + elsif l_escaped_text_start > 0 and (l_escaped_text_start < l_ml_comment_start or l_ml_comment_start = 0) + and (l_escaped_text_start < l_comment_start or l_comment_start = 0) and (l_escaped_text_start < l_text_start or l_text_start = 0) + then + --translate char "[" from the start of quoted text "q'[someting]'" into "]" + l_escaped_text_end_char := translate( substr(a_source, l_escaped_text_start + 2, 1), '[{(<', ']})>'); + l_end := instr(a_source,l_escaped_text_end_char||'''',l_escaped_text_start + 3 ); + if l_end > 0 then + l_end := l_end + 2; + end if; + end if; + + if l_end = 0 then + append_to_clob(l_result, substr(a_source, l_offset, l_length-l_offset)); + else + append_to_clob(l_result, substr(a_source, l_offset, l_end-l_offset)); + end if; + end if; + l_offset := l_end; + if l_offset >= l_ml_comment_start then + l_ml_comment_start := instr(a_source,'/*',l_offset); + end if; + if l_offset >= l_comment_start then + l_comment_start := instr(a_source,'--',l_offset); + end if; + if l_offset >= l_text_start then + l_text_start := instr(a_source,'''',l_offset); + end if; + if l_offset >= l_escaped_text_start then + l_escaped_text_start := instr(a_source,q'[q']',l_offset); + end if; + end loop; + append_to_clob(l_result, substr(a_source, l_end)); + return l_result; + end; + + function get_child_reporters(a_for_reporters ut_reporters_info := null) return ut_reporters_info is + l_for_reporters ut_reporters_info := a_for_reporters; + l_results ut_reporters_info; + begin + if l_for_reporters is null then + l_for_reporters := ut_reporters_info(ut_reporter_info('UT_REPORTER_BASE','N','N','N')); + end if; + + select /*+ cardinality(f 10) */ + ut_reporter_info( + object_name => t.type_name, + is_output_reporter => + case + when f.is_output_reporter = 'Y' or t.type_name = 'UT_OUTPUT_REPORTER_BASE' + then 'Y' else 'N' + end, + is_instantiable => case when t.instantiable = 'YES' then 'Y' else 'N' end, + is_final => case when t.final = 'YES' then 'Y' else 'N' end + ) + bulk collect into l_results + from user_types t + join (select * from table(l_for_reporters) where is_final = 'N' ) f + on f.object_name = supertype_name; + + return l_results; + end; + + function remove_error_from_stack(a_error_stack varchar2, a_ora_code number) return varchar2 is + l_caller_stack_line varchar2(4000); + l_ora_search_pattern varchar2(500) := '^ORA'||a_ora_code||': (.*)$'; + begin + l_caller_stack_line := regexp_replace(srcstr => a_error_stack + ,pattern => l_ora_search_pattern + ,replacestr => null + ,position => 1 + ,occurrence => 1 + ,modifier => 'm'); + return l_caller_stack_line; + end; + + /** + * Change string into unicode to match xmlgen format _00_ + * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 + * secion v3.1.7.2935-develop + */ + function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is + begin + return '_x00'||rawtohex(utl_raw.cast_to_raw(a_character))||'_'; + end; + + /** + * Build valid XML column name as element names can contain letters, digits, hyphens, underscores, and periods + */ + function build_valid_xml_name(a_preprocessed_name varchar2) return varchar2 is + l_post_processed varchar2(4000); + begin + for i in (select regexp_substr( a_preprocessed_name ,'(.{1})', 1, level, null, 1 ) AS string_char,level level_no + from dual connect by level <= regexp_count(a_preprocessed_name, '(.{1})')) + loop + if i.level_no = 1 and regexp_like(i.string_char,gc_invalid_first_xml_char) then + l_post_processed := l_post_processed || char_to_xmlgen_unicode(i.string_char); + elsif regexp_like(i.string_char,gc_invalid_xml_char) then + l_post_processed := l_post_processed || char_to_xmlgen_unicode(i.string_char); + else + l_post_processed := l_post_processed || i.string_char; + end if; + end loop; + return l_post_processed; + end; + + function get_valid_xml_name(a_name varchar2) return varchar2 is + l_valid_name varchar2(4000); + begin + if regexp_like(a_name,gc_full_valid_xml_name) then + l_valid_name := a_name; + else + l_valid_name := build_valid_xml_name(a_name); + end if; + return l_valid_name; + end; + + function add_prefix(a_list ut_varchar2_list, a_prefix varchar2, a_connector varchar2 := '/') return ut_varchar2_list is + l_result ut_varchar2_list := ut_varchar2_list(); + l_idx binary_integer; + begin + if a_prefix is not null then + l_idx := a_list.first; + while l_idx is not null loop + l_result.extend; + l_result(l_idx) := add_prefix(a_list(l_idx), a_prefix, a_connector); + l_idx := a_list.next(l_idx); + end loop; + end if; + return l_result; + end; + + function add_prefix(a_item varchar2, a_prefix varchar2, a_connector varchar2 := '/') return varchar2 is + begin + return a_prefix||a_connector||trim(leading a_connector from a_item); + end; + + function strip_prefix(a_item varchar2, a_prefix varchar2, a_connector varchar2 := '/') return varchar2 is + begin + return regexp_replace(a_item,a_prefix||a_connector); + end; + +end ut_utils; +/ diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 3739819fb..03e553ef2 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -1,396 +1,400 @@ -create or replace package ut_utils authid definer is - /* - utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project - - Licensed under the Apache License, Version 2.0 (the "License"): - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - - /** - * Common utilities and constants used throughout utPLSQL framework - * - */ - - gc_version constant varchar2(50) := 'v3.1.7.2935-develop'; - - subtype t_executable_type is varchar2(30); - gc_before_all constant t_executable_type := 'beforeall'; - gc_before_each constant t_executable_type := 'beforeeach'; - gc_before_test constant t_executable_type := 'beforetest'; - gc_test_execute constant t_executable_type := 'test'; - gc_after_test constant t_executable_type := 'aftertest'; - gc_after_each constant t_executable_type := 'aftereach'; - gc_after_all constant t_executable_type := 'afterall'; - - /* Constants: Test Results */ - subtype t_test_result is binary_integer range 0 .. 3; - gc_disabled constant t_test_result := 0; -- test/suite was disabled - gc_success constant t_test_result := 1; -- test passed - gc_failure constant t_test_result := 2; -- one or more expectations failed - gc_error constant t_test_result := 3; -- exception was raised - - gc_disabled_char constant varchar2(8) := 'Disabled'; -- test/suite was disabled - gc_success_char constant varchar2(7) := 'Success'; -- test passed - gc_failure_char constant varchar2(7) := 'Failure'; -- one or more expectations failed - gc_error_char constant varchar2(5) := 'Error'; -- exception was raised - - /* - Constants: Rollback type for ut_test_object - */ - subtype t_rollback_type is binary_integer range 0 .. 1; - gc_rollback_auto constant t_rollback_type := 0; -- rollback after each test and suite - gc_rollback_manual constant t_rollback_type := 1; -- leave transaction control manual - gc_rollback_default constant t_rollback_type := gc_rollback_auto; - - ex_unsupported_rollback_type exception; - gc_unsupported_rollback_type constant pls_integer := -20200; - pragma exception_init(ex_unsupported_rollback_type, -20200); - - ex_path_list_is_empty exception; - gc_path_list_is_empty constant pls_integer := -20201; - pragma exception_init(ex_path_list_is_empty, -20201); - - ex_invalid_path_format exception; - gc_invalid_path_format constant pls_integer := -20202; - pragma exception_init(ex_invalid_path_format, -20202); - - ex_suite_package_not_found exception; - gc_suite_package_not_found constant pls_integer := -20204; - pragma exception_init(ex_suite_package_not_found, -20204); - - -- Reporting event time not supported - ex_invalid_rep_event_time exception; - gc_invalid_rep_event_time constant pls_integer := -20210; - pragma exception_init(ex_invalid_rep_event_time, -20210); - - -- Reporting event name not supported - ex_invalid_rep_event_name exception; - gc_invalid_rep_event_name constant pls_integer := -20211; - pragma exception_init(ex_invalid_rep_event_name, -20211); - - -- Any of tests failed - ex_some_tests_failed exception; - gc_some_tests_failed constant pls_integer := -20213; - pragma exception_init(ex_some_tests_failed, -20213); - - -- Version number provided is not in valid format - ex_invalid_version_no exception; - gc_invalid_version_no constant pls_integer := -20214; - pragma exception_init(ex_invalid_version_no, -20214); - - -- Version number provided is not in valid format - ex_out_buffer_timeout exception; - gc_out_buffer_timeout constant pls_integer := -20215; - pragma exception_init(ex_out_buffer_timeout, -20215); - - ex_invalid_package exception; - gc_invalid_package constant pls_integer := -6550; - pragma exception_init(ex_invalid_package, -6550); - - ex_failure_for_all exception; - gc_failure_for_all constant pls_integer := -24381; - pragma exception_init (ex_failure_for_all, -24381); - - ex_dml_for_all exception; - gc_dml_for_all constant pls_integer := -20216; - pragma exception_init (ex_dml_for_all, -20216); - - ex_value_too_large exception; - gc_value_too_large constant pls_integer := -20217; - pragma exception_init (ex_value_too_large, -20217); - - ex_xml_processing exception; - gc_xml_processing constant pls_integer := -19202; - pragma exception_init (ex_xml_processing, -19202); - - ex_failed_open_cur exception; - gc_failed_open_cur constant pls_integer := -20218; - pragma exception_init (ex_failed_open_cur, -20218); - - gc_max_storage_varchar2_len constant integer := 4000; - gc_max_output_string_length constant integer := 4000; - gc_more_data_string constant varchar2(5) := '[...]'; - gc_more_data_string_len constant integer := length( gc_more_data_string ); - gc_number_format constant varchar2(100) := 'TM9'; - gc_date_format constant varchar2(100) := 'yyyy-mm-dd"T"hh24:mi:ss'; - gc_timestamp_format constant varchar2(100) := 'yyyy-mm-dd"T"hh24:mi:ssxff'; - gc_timestamp_tz_format constant varchar2(100) := 'yyyy-mm-dd"T"hh24:mi:ssxff tzh:tzm'; - gc_null_string constant varchar2(4) := 'NULL'; - gc_empty_string constant varchar2(5) := 'EMPTY'; - - gc_bc_fetch_limit constant integer := 1000; - gc_diff_max_rows constant integer := 20; - - type t_version is record( - major natural, - minor natural, - bugfix natural, - build natural - ); - - type t_clob_tab is table of clob; - - /** - * Converts test results into strings - * - * @param a_test_result numeric representation of test result - * - * @return a string representation of a test_result. - */ - function test_result_to_char(a_test_result integer) return varchar2; - - function to_test_result(a_test boolean) return integer; - - /** - * Generates a unique name for a savepoint - * Uses sys_guid, as timestamp gives only miliseconds on Windows and is not unique - * Issue: #506 for details on the implementation approach - */ - function gen_savepoint_name return varchar2; - - procedure debug_log(a_message varchar2); - - procedure debug_log(a_message clob); - - function to_string( - a_value varchar2, - a_quote_char varchar2 := '''', - a_max_output_len in number := gc_max_output_string_length - ) return varchar2; - - function to_string( - a_value clob, - a_quote_char varchar2 := '''', - a_max_output_len in number := gc_max_output_string_length - ) return varchar2; - - function to_string( - a_value blob, - a_quote_char varchar2 := '''', - a_max_output_len in number := gc_max_output_string_length - ) return varchar2; - - function to_string(a_value boolean) return varchar2; - - function to_string(a_value number) return varchar2; - - function to_string(a_value date) return varchar2; - - function to_string(a_value timestamp_unconstrained) return varchar2; - - function to_string(a_value timestamp_tz_unconstrained) return varchar2; - - function to_string(a_value timestamp_ltz_unconstrained) return varchar2; - - function to_string(a_value yminterval_unconstrained) return varchar2; - - function to_string(a_value dsinterval_unconstrained) return varchar2; - - function boolean_to_int(a_value boolean) return integer; - - function int_to_boolean(a_value integer) return boolean; - - /** - * - * Splits a given string into table of string by delimiter. - * The delimiter gets removed. - * If null passed as any of the parameters, empty table is returned. - * If no occurence of a_delimiter found in a_text then text is returned as a single row of the table. - * If no text between delimiters found then an empty row is returned, example: - * string_to_table( 'a,,b', ',' ) gives table ut_varchar2_list( 'a', null, 'b' ); - * - * @param a_string the text to be split. - * @param a_delimiter the delimiter character or string - * @param a_skip_leading_delimiter determines if the leading delimiter should be ignored, used by clob_to_table - * - * @return table of varchar2 values - */ - function string_to_table(a_string varchar2, a_delimiter varchar2:= chr(10), a_skip_leading_delimiter varchar2 := 'N') return ut_varchar2_list; - - /** - * Splits a given string into table of string by delimiter. - * Default value of a_max_amount is 8191 because of code can contains multibyte character. - * The delimiter gets removed. - * If null passed as any of the parameters, empty table is returned. - * If split text is longer than a_max_amount it gets split into pieces of a_max_amount. - * If no text between delimiters found then an empty row is returned, example: - * string_to_table( 'a,,b', ',' ) gives table ut_varchar2_list( 'a', null, 'b' ); - * - * @param a_clob the text to be split. - * @param a_delimiter the delimiter character or string (default chr(10) ) - * @param a_max_amount the maximum length of returned string (default 8191) - * @return table of varchar2 values - */ - function clob_to_table(a_clob clob, a_max_amount integer := 8191, a_delimiter varchar2:= chr(10)) return ut_varchar2_list; - - function table_to_clob(a_text_table ut_varchar2_list, a_delimiter varchar2:= chr(10)) return clob; - - function table_to_clob(a_integer_table ut_integer_list, a_delimiter varchar2:= chr(10)) return clob; - - /** - * Returns time difference in seconds (with miliseconds) between given timestamps - */ - function time_diff(a_start_time timestamp with time zone, a_end_time timestamp with time zone) return number; - - /** - * Returns a text indented with spaces except the first line. - */ - function indent_lines(a_text varchar2, a_indent_size integer := 4, a_include_first_line boolean := false) return varchar2; - - - /** - * Returns a list of object that are part of utPLSQL framework - */ - function get_utplsql_objects_list return ut_object_names; - - /** - * Append a item to the end of ut_varchar2_list - */ - procedure append_to_list(a_list in out nocopy ut_varchar2_list, a_item varchar2); - - /** - * Append a item to the end of ut_varchar2_rows - */ - procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_item varchar2); - - /** - * Append a item to the end of ut_varchar2_rows - */ - procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_item clob); - - /** - * Append a list of items to the end of ut_varchar2_rows - */ - procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_items ut_varchar2_rows); - - procedure append_to_clob(a_src_clob in out nocopy clob, a_clob_table t_clob_tab, a_delimiter varchar2 := chr(10)); - - procedure append_to_clob(a_src_clob in out nocopy clob, a_new_data clob); - - procedure append_to_clob(a_src_clob in out nocopy clob, a_new_data varchar2); - - function convert_collection(a_collection ut_varchar2_list) return ut_varchar2_rows; - - /** - * Set session's action and module using dbms_application_info - */ - procedure set_action(a_text in varchar2); - - /** - * Set session's client info using dbms_application_info - */ - procedure set_client_info(a_text in varchar2); - - function to_xpath(a_list varchar2, a_ancestors varchar2 := '/*/') return varchar2; - - function to_xpath(a_list ut_varchar2_list, a_ancestors varchar2 := '/*/') return varchar2; - - procedure cleanup_temp_tables; - - /** - * Converts version string into version record - * - * @param a_version_no string representation of version in format vX.X.X.X where X is a positive integer - * @return t_version record with up to four positive numbers containing version - * @throws 20214 if passed version string is not matching version pattern - */ - function to_version(a_version_no varchar2) return t_version; - - - /** - * Saves data from dbms_output buffer into a global temporary table (cache) - * used to store dbms_output buffer captured before the run - * - */ - procedure save_dbms_output_to_cache; - - /** - * Reads data from global temporary table (cache) abd puts it back into dbms_output - * used to recover dbms_output buffer data after a run is complete - * - */ - procedure read_cache_to_dbms_output; - - - /** - * Function is used to reference to utPLSQL owned objects in dynamic sql statements executed from packages with invoker rights - * - * @return the name of the utPSQL schema owner - */ - function ut_owner return varchar2; - - - /** - * Used in dynamic sql select statements to maintain balance between - * number of hard-parses and optimiser accurancy for cardinality of collections - * - * - * @return 3, for inputs of: 1-9; 33 for input of 10 - 99; 333 for (100 - 999) - */ - function scale_cardinality(a_cardinality natural) return natural; - - function build_depreciation_warning(a_old_syntax varchar2, a_new_syntax varchar2) return varchar2; - - /** - * Returns number as string. The value is represented as decimal according to XML standard: - * https://www.w3.org/TR/xmlschema-2/#decimal - */ - function to_xml_number_format(a_value number) return varchar2; - - - /** - * Returns xml header. If a_encoding is not null, header will include encoding attribute with provided value - */ - function get_xml_header(a_encoding varchar2) return varchar2; - - - /** - * Takes a collection of type ut_varchar2_list and it trims the characters passed as arguments for every element - */ - function trim_list_elements(a_list IN ut_varchar2_list, a_regexp_to_trim in varchar2 default '[:space:]') return ut_varchar2_list; - - /** - * Takes a collection of type ut_varchar2_list and it only returns the elements which meets the regular expression - */ - function filter_list(a_list IN ut_varchar2_list, a_regexp_filter in varchar2) return ut_varchar2_list; - - -- Generates XMLGEN escaped string - function xmlgen_escaped_string(a_string in varchar2) return varchar2; - - /** - * Replaces multi-line comments in given source-code with empty lines - */ - function replace_multiline_comments(a_source clob) return clob; - - /** - * Returns list of sub-type reporters for given list of super-type reporters - */ - function get_child_reporters(a_for_reporters ut_reporters_info := null) return ut_reporters_info; - - /** - * Remove given ORA error from stack - */ - function remove_error_from_stack(a_error_stack varchar2, a_ora_code number) return varchar2; - - /** - * Check if xml name is valid if not build a valid name - */ - function get_valid_xml_name(a_name varchar2) return varchar2; - - /** - * Add prefix word to elements of list - */ - function add_prefix(a_list ut_varchar2_list, a_prefix varchar2, a_connector varchar2 := '/') return ut_varchar2_list; - -end ut_utils; -/ +create or replace package ut_utils authid definer is + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + /** + * Common utilities and constants used throughout utPLSQL framework + * + */ + + gc_version constant varchar2(50) := 'v3.1.7.2935-develop'; + + subtype t_executable_type is varchar2(30); + gc_before_all constant t_executable_type := 'beforeall'; + gc_before_each constant t_executable_type := 'beforeeach'; + gc_before_test constant t_executable_type := 'beforetest'; + gc_test_execute constant t_executable_type := 'test'; + gc_after_test constant t_executable_type := 'aftertest'; + gc_after_each constant t_executable_type := 'aftereach'; + gc_after_all constant t_executable_type := 'afterall'; + + /* Constants: Test Results */ + subtype t_test_result is binary_integer range 0 .. 3; + gc_disabled constant t_test_result := 0; -- test/suite was disabled + gc_success constant t_test_result := 1; -- test passed + gc_failure constant t_test_result := 2; -- one or more expectations failed + gc_error constant t_test_result := 3; -- exception was raised + + gc_disabled_char constant varchar2(8) := 'Disabled'; -- test/suite was disabled + gc_success_char constant varchar2(7) := 'Success'; -- test passed + gc_failure_char constant varchar2(7) := 'Failure'; -- one or more expectations failed + gc_error_char constant varchar2(5) := 'Error'; -- exception was raised + + /* + Constants: Rollback type for ut_test_object + */ + subtype t_rollback_type is binary_integer range 0 .. 1; + gc_rollback_auto constant t_rollback_type := 0; -- rollback after each test and suite + gc_rollback_manual constant t_rollback_type := 1; -- leave transaction control manual + gc_rollback_default constant t_rollback_type := gc_rollback_auto; + + ex_unsupported_rollback_type exception; + gc_unsupported_rollback_type constant pls_integer := -20200; + pragma exception_init(ex_unsupported_rollback_type, -20200); + + ex_path_list_is_empty exception; + gc_path_list_is_empty constant pls_integer := -20201; + pragma exception_init(ex_path_list_is_empty, -20201); + + ex_invalid_path_format exception; + gc_invalid_path_format constant pls_integer := -20202; + pragma exception_init(ex_invalid_path_format, -20202); + + ex_suite_package_not_found exception; + gc_suite_package_not_found constant pls_integer := -20204; + pragma exception_init(ex_suite_package_not_found, -20204); + + -- Reporting event time not supported + ex_invalid_rep_event_time exception; + gc_invalid_rep_event_time constant pls_integer := -20210; + pragma exception_init(ex_invalid_rep_event_time, -20210); + + -- Reporting event name not supported + ex_invalid_rep_event_name exception; + gc_invalid_rep_event_name constant pls_integer := -20211; + pragma exception_init(ex_invalid_rep_event_name, -20211); + + -- Any of tests failed + ex_some_tests_failed exception; + gc_some_tests_failed constant pls_integer := -20213; + pragma exception_init(ex_some_tests_failed, -20213); + + -- Version number provided is not in valid format + ex_invalid_version_no exception; + gc_invalid_version_no constant pls_integer := -20214; + pragma exception_init(ex_invalid_version_no, -20214); + + -- Version number provided is not in valid format + ex_out_buffer_timeout exception; + gc_out_buffer_timeout constant pls_integer := -20215; + pragma exception_init(ex_out_buffer_timeout, -20215); + + ex_invalid_package exception; + gc_invalid_package constant pls_integer := -6550; + pragma exception_init(ex_invalid_package, -6550); + + ex_failure_for_all exception; + gc_failure_for_all constant pls_integer := -24381; + pragma exception_init (ex_failure_for_all, -24381); + + ex_dml_for_all exception; + gc_dml_for_all constant pls_integer := -20216; + pragma exception_init (ex_dml_for_all, -20216); + + ex_value_too_large exception; + gc_value_too_large constant pls_integer := -20217; + pragma exception_init (ex_value_too_large, -20217); + + ex_xml_processing exception; + gc_xml_processing constant pls_integer := -19202; + pragma exception_init (ex_xml_processing, -19202); + + ex_failed_open_cur exception; + gc_failed_open_cur constant pls_integer := -20218; + pragma exception_init (ex_failed_open_cur, -20218); + + gc_max_storage_varchar2_len constant integer := 4000; + gc_max_output_string_length constant integer := 4000; + gc_more_data_string constant varchar2(5) := '[...]'; + gc_more_data_string_len constant integer := length( gc_more_data_string ); + gc_number_format constant varchar2(100) := 'TM9'; + gc_date_format constant varchar2(100) := 'yyyy-mm-dd"T"hh24:mi:ss'; + gc_timestamp_format constant varchar2(100) := 'yyyy-mm-dd"T"hh24:mi:ssxff'; + gc_timestamp_tz_format constant varchar2(100) := 'yyyy-mm-dd"T"hh24:mi:ssxff tzh:tzm'; + gc_null_string constant varchar2(4) := 'NULL'; + gc_empty_string constant varchar2(5) := 'EMPTY'; + + gc_bc_fetch_limit constant integer := 1000; + gc_diff_max_rows constant integer := 20; + + type t_version is record( + major natural, + minor natural, + bugfix natural, + build natural + ); + + type t_clob_tab is table of clob; + + /** + * Converts test results into strings + * + * @param a_test_result numeric representation of test result + * + * @return a string representation of a test_result. + */ + function test_result_to_char(a_test_result integer) return varchar2; + + function to_test_result(a_test boolean) return integer; + + /** + * Generates a unique name for a savepoint + * Uses sys_guid, as timestamp gives only miliseconds on Windows and is not unique + * Issue: #506 for details on the implementation approach + */ + function gen_savepoint_name return varchar2; + + procedure debug_log(a_message varchar2); + + procedure debug_log(a_message clob); + + function to_string( + a_value varchar2, + a_quote_char varchar2 := '''', + a_max_output_len in number := gc_max_output_string_length + ) return varchar2; + + function to_string( + a_value clob, + a_quote_char varchar2 := '''', + a_max_output_len in number := gc_max_output_string_length + ) return varchar2; + + function to_string( + a_value blob, + a_quote_char varchar2 := '''', + a_max_output_len in number := gc_max_output_string_length + ) return varchar2; + + function to_string(a_value boolean) return varchar2; + + function to_string(a_value number) return varchar2; + + function to_string(a_value date) return varchar2; + + function to_string(a_value timestamp_unconstrained) return varchar2; + + function to_string(a_value timestamp_tz_unconstrained) return varchar2; + + function to_string(a_value timestamp_ltz_unconstrained) return varchar2; + + function to_string(a_value yminterval_unconstrained) return varchar2; + + function to_string(a_value dsinterval_unconstrained) return varchar2; + + function boolean_to_int(a_value boolean) return integer; + + function int_to_boolean(a_value integer) return boolean; + + /** + * + * Splits a given string into table of string by delimiter. + * The delimiter gets removed. + * If null passed as any of the parameters, empty table is returned. + * If no occurence of a_delimiter found in a_text then text is returned as a single row of the table. + * If no text between delimiters found then an empty row is returned, example: + * string_to_table( 'a,,b', ',' ) gives table ut_varchar2_list( 'a', null, 'b' ); + * + * @param a_string the text to be split. + * @param a_delimiter the delimiter character or string + * @param a_skip_leading_delimiter determines if the leading delimiter should be ignored, used by clob_to_table + * + * @return table of varchar2 values + */ + function string_to_table(a_string varchar2, a_delimiter varchar2:= chr(10), a_skip_leading_delimiter varchar2 := 'N') return ut_varchar2_list; + + /** + * Splits a given string into table of string by delimiter. + * Default value of a_max_amount is 8191 because of code can contains multibyte character. + * The delimiter gets removed. + * If null passed as any of the parameters, empty table is returned. + * If split text is longer than a_max_amount it gets split into pieces of a_max_amount. + * If no text between delimiters found then an empty row is returned, example: + * string_to_table( 'a,,b', ',' ) gives table ut_varchar2_list( 'a', null, 'b' ); + * + * @param a_clob the text to be split. + * @param a_delimiter the delimiter character or string (default chr(10) ) + * @param a_max_amount the maximum length of returned string (default 8191) + * @return table of varchar2 values + */ + function clob_to_table(a_clob clob, a_max_amount integer := 8191, a_delimiter varchar2:= chr(10)) return ut_varchar2_list; + + function table_to_clob(a_text_table ut_varchar2_list, a_delimiter varchar2:= chr(10)) return clob; + + function table_to_clob(a_integer_table ut_integer_list, a_delimiter varchar2:= chr(10)) return clob; + + /** + * Returns time difference in seconds (with miliseconds) between given timestamps + */ + function time_diff(a_start_time timestamp with time zone, a_end_time timestamp with time zone) return number; + + /** + * Returns a text indented with spaces except the first line. + */ + function indent_lines(a_text varchar2, a_indent_size integer := 4, a_include_first_line boolean := false) return varchar2; + + + /** + * Returns a list of object that are part of utPLSQL framework + */ + function get_utplsql_objects_list return ut_object_names; + + /** + * Append a item to the end of ut_varchar2_list + */ + procedure append_to_list(a_list in out nocopy ut_varchar2_list, a_item varchar2); + + /** + * Append a item to the end of ut_varchar2_rows + */ + procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_item varchar2); + + /** + * Append a item to the end of ut_varchar2_rows + */ + procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_item clob); + + /** + * Append a list of items to the end of ut_varchar2_rows + */ + procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_items ut_varchar2_rows); + + procedure append_to_clob(a_src_clob in out nocopy clob, a_clob_table t_clob_tab, a_delimiter varchar2 := chr(10)); + + procedure append_to_clob(a_src_clob in out nocopy clob, a_new_data clob); + + procedure append_to_clob(a_src_clob in out nocopy clob, a_new_data varchar2); + + function convert_collection(a_collection ut_varchar2_list) return ut_varchar2_rows; + + /** + * Set session's action and module using dbms_application_info + */ + procedure set_action(a_text in varchar2); + + /** + * Set session's client info using dbms_application_info + */ + procedure set_client_info(a_text in varchar2); + + function to_xpath(a_list varchar2, a_ancestors varchar2 := '/*/') return varchar2; + + function to_xpath(a_list ut_varchar2_list, a_ancestors varchar2 := '/*/') return varchar2; + + procedure cleanup_temp_tables; + + /** + * Converts version string into version record + * + * @param a_version_no string representation of version in format vX.X.X.X where X is a positive integer + * @return t_version record with up to four positive numbers containing version + * @throws 20214 if passed version string is not matching version pattern + */ + function to_version(a_version_no varchar2) return t_version; + + + /** + * Saves data from dbms_output buffer into a global temporary table (cache) + * used to store dbms_output buffer captured before the run + * + */ + procedure save_dbms_output_to_cache; + + /** + * Reads data from global temporary table (cache) abd puts it back into dbms_output + * used to recover dbms_output buffer data after a run is complete + * + */ + procedure read_cache_to_dbms_output; + + + /** + * Function is used to reference to utPLSQL owned objects in dynamic sql statements executed from packages with invoker rights + * + * @return the name of the utPSQL schema owner + */ + function ut_owner return varchar2; + + + /** + * Used in dynamic sql select statements to maintain balance between + * number of hard-parses and optimiser accurancy for cardinality of collections + * + * + * @return 3, for inputs of: 1-9; 33 for input of 10 - 99; 333 for (100 - 999) + */ + function scale_cardinality(a_cardinality natural) return natural; + + function build_depreciation_warning(a_old_syntax varchar2, a_new_syntax varchar2) return varchar2; + + /** + * Returns number as string. The value is represented as decimal according to XML standard: + * https://www.w3.org/TR/xmlschema-2/#decimal + */ + function to_xml_number_format(a_value number) return varchar2; + + + /** + * Returns xml header. If a_encoding is not null, header will include encoding attribute with provided value + */ + function get_xml_header(a_encoding varchar2) return varchar2; + + + /** + * Takes a collection of type ut_varchar2_list and it trims the characters passed as arguments for every element + */ + function trim_list_elements(a_list IN ut_varchar2_list, a_regexp_to_trim in varchar2 default '[:space:]') return ut_varchar2_list; + + /** + * Takes a collection of type ut_varchar2_list and it only returns the elements which meets the regular expression + */ + function filter_list(a_list IN ut_varchar2_list, a_regexp_filter in varchar2) return ut_varchar2_list; + + -- Generates XMLGEN escaped string + function xmlgen_escaped_string(a_string in varchar2) return varchar2; + + /** + * Replaces multi-line comments in given source-code with empty lines + */ + function replace_multiline_comments(a_source clob) return clob; + + /** + * Returns list of sub-type reporters for given list of super-type reporters + */ + function get_child_reporters(a_for_reporters ut_reporters_info := null) return ut_reporters_info; + + /** + * Remove given ORA error from stack + */ + function remove_error_from_stack(a_error_stack varchar2, a_ora_code number) return varchar2; + + /** + * Check if xml name is valid if not build a valid name + */ + function get_valid_xml_name(a_name varchar2) return varchar2; + + /** + * Add prefix word to elements of list + */ + function add_prefix(a_list ut_varchar2_list, a_prefix varchar2, a_connector varchar2 := '/') return ut_varchar2_list; + + function add_prefix(a_item varchar2, a_prefix varchar2, a_connector varchar2 := '/') return varchar2; + + function strip_prefix(a_item varchar2, a_prefix varchar2, a_connector varchar2 := '/') return varchar2; + +end ut_utils; +/ diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index fa736ecfb..759e3ad70 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -1,694 +1,694 @@ -create or replace package body ut_compound_data_helper is - /* - utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project - - Licensed under the Apache License, Version 2.0 (the "License"): - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - - g_diff_count integer; - type t_type_name_map is table of varchar2(128) index by binary_integer; - type t_types_no_length is table of varchar2(128) index by varchar2(128); - g_type_name_map t_type_name_map; - g_anytype_name_map t_type_name_map; - g_type_no_length_map t_types_no_length; - - g_compare_sql_template varchar2(4000) := - q'[ - with exp as ( - select - ucd.*, - {:duplicate_number:} dup_no - from ( - select - ucd.item_data - ,x.data_id data_id - ,position + x.item_no item_no - {:columns:} - from {:ut3_owner:}.ut_compound_data_tmp x, - xmltable('/ROWSET/ROW' passing x.item_data columns - item_data xmltype path '*' - ,position for ordinality - {:xml_to_columns:} ) ucd - where data_id = :exp_guid - ) ucd - ) - , act as ( - select - ucd.*, - {:duplicate_number:} dup_no - from ( - select - ucd.item_data - ,x.data_id data_id - ,position + x.item_no item_no - {:columns:} - from {:ut3_owner:}.ut_compound_data_tmp x, - xmltable('/ROWSET/ROW' passing x.item_data columns - item_data xmltype path '*' - ,position for ordinality - {:xml_to_columns:} ) ucd - where data_id = :act_guid - ) ucd - ) - select - a.item_data as act_item_data, - a.data_id act_data_id, - e.item_data as exp_item_data, - e.data_id exp_data_id, - {:item_no:} as item_no, - nvl(e.dup_no,a.dup_no) dup_no - from act a {:join_type:} exp e on ( {:join_condition:} ) - where {:where_condition:}]'; - - function get_columns_diff( - a_expected ut_cursor_column_tab, - a_actual ut_cursor_column_tab, - a_order_enforced boolean := false - ) return tt_column_diffs is - l_results tt_column_diffs; - begin - execute immediate q'[with - expected_cols as ( - select display_path exp_column_name,column_position exp_col_pos, - replace(column_type_name,'VARCHAR2','CHAR') exp_col_type_compare, column_type_name exp_col_type - from table(:a_expected) - where parent_name is null and hierarchy_level = 1 and column_name is not null - ), - actual_cols as ( - select display_path act_column_name,column_position act_col_pos, - replace(column_type_name,'VARCHAR2','CHAR') act_col_type_compare, column_type_name act_col_type - from table(:a_actual) - where parent_name is null and hierarchy_level = 1 and column_name is not null - ), - joined_cols as ( - select e.*,a.*]' - || case when a_order_enforced then ', - row_number() over(partition by case when a.act_col_pos + e.exp_col_pos is not null then 1 end order by a.act_col_pos) a_pos_nn, - row_number() over(partition by case when a.act_col_pos + e.exp_col_pos is not null then 1 end order by e.exp_col_pos) e_pos_nn' - else - null - end ||q'[ - from expected_cols e - full outer join actual_cols a - on e.exp_column_name = a.act_column_name - ) - select case - when exp_col_pos is null and act_col_pos is not null then '+' - when exp_col_pos is not null and act_col_pos is null then '-' - when exp_col_type_compare != act_col_type_compare then 't' - else 'p' - end as diff_type, - exp_column_name, exp_col_type, exp_col_pos, - act_column_name, act_col_type, act_col_pos - from joined_cols - --column is unexpected (extra) or missing - where act_col_pos is null or exp_col_pos is null - --column type is not matching (except CHAR/VARCHAR2) - or act_col_type_compare != exp_col_type_compare]' - || case when a_order_enforced then q'[ - --column position is not matching (both when excluded extra/missing columns as well as when they are included) - or (a_pos_nn != e_pos_nn and exp_col_pos != act_col_pos)]' - else - null - end ||q'[ - order by exp_col_pos, act_col_pos]' - bulk collect into l_results using a_expected, a_actual; - return l_results; - end; - - function generate_not_equal_stmt( - a_data_info ut_cursor_column, a_pk_table ut_varchar2_list - ) return varchar2 - is - l_pk_tab ut_varchar2_list := coalesce(a_pk_table,ut_varchar2_list()); - l_index integer; - l_sql_stmt varchar2(32767); - l_exists boolean := false; - begin - l_index := l_pk_tab.first; - if l_pk_tab.count > 0 then - loop - if a_data_info.access_path = l_pk_tab(l_index) then - l_exists := true; - end if; - exit when l_index = l_pk_tab.count or (a_data_info.access_path = l_pk_tab(l_index)); - l_index := a_pk_table.next(l_index); - end loop; - end if; - if not(l_exists) then - l_sql_stmt := ' (decode(a.'||a_data_info.transformed_name||','||' e.'||a_data_info.transformed_name||',1,0) = 0)'; - end if; - return l_sql_stmt; - end; - - function generate_join_by_stmt( - a_data_info ut_cursor_column, a_pk_table ut_varchar2_list - ) return varchar2 - is - l_pk_tab ut_varchar2_list := coalesce(a_pk_table,ut_varchar2_list()); - l_index integer; - l_sql_stmt varchar2(32767); - begin - if l_pk_tab.count <> 0 then - l_index:= l_pk_tab.first; - loop - if l_pk_tab(l_index) in (a_data_info.access_path, a_data_info.parent_name) then - --When then table is nested and join is on whole table - l_sql_stmt := l_sql_stmt ||' a.'||a_data_info.transformed_name||q'[ = ]'||' e.'||a_data_info.transformed_name; - end if; - exit when (a_data_info.access_path = l_pk_tab(l_index)) or l_index = l_pk_tab.count; - l_index := l_pk_tab.next(l_index); - end loop; - end if; - return l_sql_stmt; - end; - - function generate_equal_sql(a_col_name in varchar2) return varchar2 is - begin - return ' decode(a.'||a_col_name||','||' e.'||a_col_name||',1,0) = 1 '; - end; - - function generate_partition_stmt( - a_data_info ut_cursor_column, a_pk_table in ut_varchar2_list, a_alias varchar2 := 'ucd.' - ) return varchar2 - is - l_index integer; - l_sql_stmt varchar2(32767); - begin - if a_pk_table is not empty then - l_index:= a_pk_table.first; - loop - if a_pk_table(l_index) in (a_data_info.access_path, a_data_info.parent_name) then - --When then table is nested and join is on whole table - l_sql_stmt := l_sql_stmt ||a_alias||a_data_info.transformed_name; - end if; - exit when (a_data_info.access_path = a_pk_table(l_index)) or l_index = a_pk_table.count; - l_index := a_pk_table.next(l_index); - end loop; - else - l_sql_stmt := a_alias||a_data_info.transformed_name; - end if; - return l_sql_stmt; - end; - - function generate_select_stmt(a_data_info ut_cursor_column, a_alias varchar2 := 'ucd.') - return varchar2 - is - l_alias varchar2(10) := a_alias; - l_col_syntax varchar2(4000); - l_ut_owner varchar2(250) := ut_utils.ut_owner; - begin - if a_data_info.is_sql_diffable = 0 then - l_col_syntax := l_ut_owner ||'.ut_compound_data_helper.get_hash('||l_alias||a_data_info.transformed_name||'.getClobVal()) as '||a_data_info.transformed_name ; - elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type = 'DATE' then - l_col_syntax := 'to_date('||l_alias||a_data_info.transformed_name||') as '|| a_data_info.transformed_name; - elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('TIMESTAMP') then - l_col_syntax := 'to_timestamp('||l_alias||a_data_info.transformed_name||','''||ut_utils.gc_timestamp_format||''') as '|| a_data_info.transformed_name; - elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('TIMESTAMP WITH TIME ZONE') then - l_col_syntax := 'to_timestamp_tz('||l_alias||a_data_info.transformed_name||','''||ut_utils.gc_timestamp_tz_format||''') as '|| a_data_info.transformed_name; - elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('TIMESTAMP WITH LOCAL TIME ZONE') then - l_col_syntax := ' cast( to_timestamp_tz('||l_alias||a_data_info.transformed_name||','''||ut_utils.gc_timestamp_tz_format||''') AS TIMESTAMP WITH LOCAL TIME ZONE) as '|| a_data_info.transformed_name; - else - l_col_syntax := l_alias||a_data_info.transformed_name||' as '|| a_data_info.transformed_name; - end if; - return l_col_syntax; - end; - - function generate_xmltab_stmt(a_data_info ut_cursor_column) return varchar2 is - l_col_type varchar2(4000); - begin - if a_data_info.is_sql_diffable = 0 then - l_col_type := 'XMLTYPE'; - elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('DATE','TIMESTAMP','TIMESTAMP WITH TIME ZONE', - 'TIMESTAMP WITH LOCAL TIME ZONE') then - l_col_type := 'VARCHAR2(50)'; - elsif a_data_info.is_sql_diffable = 1 and type_no_length(a_data_info.column_type) then - l_col_type := a_data_info.column_type; - elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('VARCHAR2','CHAR') then - l_col_type := 'VARCHAR2('||greatest(a_data_info.column_len,4000)||')'; - elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('NUMBER') then - --We cannot use a precision and scale as dbms_sql.describe_columns3 return precision 0 for dual table - -- there is also no need for that as we not process data but only read and compare as they are stored - l_col_type := a_data_info.column_type; - else - l_col_type := a_data_info.column_type - ||case when a_data_info.column_len is not null - then '('||a_data_info.column_len||')' - else null - end; - end if; - return a_data_info.transformed_name||' '||l_col_type||q'[ PATH ']'||a_data_info.access_path||q'[']'; - end; - - procedure gen_sql_pieces_out_of_cursor( - a_data_info ut_cursor_column_tab, - a_pk_table ut_varchar2_list, - a_unordered boolean, - a_xml_stmt out nocopy clob, - a_select_stmt out nocopy clob, - a_partition_stmt out nocopy clob, - a_join_by_stmt out nocopy clob, - a_not_equal_stmt out nocopy clob - ) is - l_partition_tmp clob; - l_xmltab_list ut_varchar2_list := ut_varchar2_list(); - l_select_list ut_varchar2_list := ut_varchar2_list(); - l_partition_list ut_varchar2_list := ut_varchar2_list(); - l_equal_list ut_varchar2_list := ut_varchar2_list(); - l_join_by_list ut_varchar2_list := ut_varchar2_list(); - l_not_equal_list ut_varchar2_list := ut_varchar2_list(); - - procedure add_element_to_list(a_list in out ut_varchar2_list, a_list_element in varchar2) - is - begin - if a_list_element is not null then - a_list.extend; - a_list(a_list.last) := a_list_element; - end if; - end; - - begin - if a_data_info is not empty then - for i in 1..a_data_info.count loop - if a_data_info(i).has_nested_col = 0 then - --Get XMLTABLE column list - add_element_to_list(l_xmltab_list,generate_xmltab_stmt(a_data_info(i))); - --Get Select statment list of columns - add_element_to_list(l_select_list, generate_select_stmt(a_data_info(i))); - --Get columns by which we partition - add_element_to_list(l_partition_list,generate_partition_stmt(a_data_info(i), a_pk_table)); - --Get equal statement - add_element_to_list(l_equal_list,generate_equal_sql(a_data_info(i).transformed_name)); - --Generate join by stmt - add_element_to_list(l_join_by_list,generate_join_by_stmt(a_data_info(i), a_pk_table)); - --Generate not equal stmt - add_element_to_list(l_not_equal_list,generate_not_equal_stmt(a_data_info(i), a_pk_table)); - end if; - end loop; - - a_xml_stmt := nullif(','||ut_utils.table_to_clob(l_xmltab_list, ' , '),','); - a_select_stmt := nullif(','||ut_utils.table_to_clob(l_select_list, ' , '),','); - l_partition_tmp := ut_utils.table_to_clob(l_partition_list, ' , '); - ut_utils.append_to_clob(a_partition_stmt,' row_number() over (partition by '||l_partition_tmp||' order by '||l_partition_tmp||' ) '); - - if a_pk_table.count > 0 then - -- If key defined do the join or these and where on diffrences - a_join_by_stmt := ut_utils.table_to_clob(l_join_by_list, ' and '); - elsif a_unordered then - -- If no key defined do the join on all columns - a_join_by_stmt := ' e.dup_no = a.dup_no and '||ut_utils.table_to_clob(l_equal_list, ' and '); - else - -- Else join on rownumber - a_join_by_stmt := 'a.item_no = e.item_no '; - end if; - a_not_equal_stmt := ut_utils.table_to_clob(l_not_equal_list, ' or '); - else - --Partition by piece when no data - ut_utils.append_to_clob(a_partition_stmt,' 1 '); - a_join_by_stmt := 'a.item_no = e.item_no '; - end if; - end; - - function gen_compare_sql( - a_other ut_data_value_refcursor, - a_join_by_list ut_varchar2_list, - a_unordered boolean, - a_inclusion_type boolean, - a_is_negated boolean - ) return clob is - l_compare_sql clob; - l_xmltable_stmt clob; - l_select_stmt clob; - l_partition_stmt clob; - l_join_on_stmt clob; - l_not_equal_stmt clob; - l_where_stmt clob; - l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_join_by_list ut_varchar2_list; - - function get_join_type(a_inclusion_compare in boolean,a_negated in boolean) return varchar2 is - begin - return - case - when a_inclusion_compare and not(a_negated) then ' right outer join ' - when a_inclusion_compare and a_negated then ' inner join ' - else ' full outer join ' - end; - end; - - function get_item_no(a_unordered boolean) return varchar2 is - begin - return - case - when a_unordered then 'row_number() over ( order by nvl(e.item_no,a.item_no))' - else 'nvl(e.item_no,a.item_no) ' - end; - end; - - begin - /** - * We already estabilished cursor equality so now we add anydata root if we compare anydata - * to join by. - */ - l_join_by_list := - case - when a_other is of (ut_data_value_anydata) then ut_utils.add_prefix(a_join_by_list, a_other.cursor_details.get_root) - else a_join_by_list - end; - - dbms_lob.createtemporary(l_compare_sql, true); - --Initiate a SQL template with placeholders - ut_utils.append_to_clob(l_compare_sql, g_compare_sql_template); - --Generate a pieceso of dynamic SQL that will substitute placeholders - gen_sql_pieces_out_of_cursor( - a_other.cursor_details.cursor_columns_info, l_join_by_list, a_unordered, - l_xmltable_stmt, l_select_stmt, l_partition_stmt, l_join_on_stmt, - l_not_equal_stmt - ); - - l_compare_sql := replace(l_compare_sql,'{:duplicate_number:}',l_partition_stmt); - l_compare_sql := replace(l_compare_sql,'{:columns:}',l_select_stmt); - l_compare_sql := replace(l_compare_sql,'{:ut3_owner:}',l_ut_owner); - l_compare_sql := replace(l_compare_sql,'{:xml_to_columns:}',l_xmltable_stmt); - l_compare_sql := replace(l_compare_sql,'{:item_no:}',get_item_no(a_unordered)); - l_compare_sql := replace(l_compare_sql,'{:join_type:}',get_join_type(a_inclusion_type,a_is_negated)); - l_compare_sql := replace(l_compare_sql,'{:join_condition:}',l_join_on_stmt); - - if l_not_equal_stmt is not null and ((l_join_by_list.count > 0 and not a_is_negated) or (not a_unordered)) then - ut_utils.append_to_clob(l_where_stmt,' ( '||l_not_equal_stmt||' ) or '); - end if; - --If its inclusion we expect a actual set to fully match and have no extra elements over expected - if a_inclusion_type then - ut_utils.append_to_clob(l_where_stmt,case when a_is_negated then ' 1 = 1 ' else ' ( a.data_id is null ) ' end); - else - ut_utils.append_to_clob(l_where_stmt,' (a.data_id is null or e.data_id is null) '); - end if; - - l_compare_sql := replace(l_compare_sql,'{:where_condition:}',l_where_stmt); - return l_compare_sql; - end; - - function get_column_extract_path(a_cursor_info ut_cursor_column_tab) return ut_varchar2_list is - l_column_list ut_varchar2_list := ut_varchar2_list(); - begin - for i in 1..a_cursor_info.count loop - l_column_list.extend; - l_column_list(l_column_list.last) := a_cursor_info(i).access_path; - end loop; - return l_column_list; - end; - - function get_rows_diff_by_sql( - a_act_cursor_info ut_cursor_column_tab, a_exp_cursor_info ut_cursor_column_tab, - a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, - a_join_by_list ut_varchar2_list, a_unordered boolean, a_enforce_column_order boolean := false, - a_extract_path varchar2 - ) return tt_row_diffs is - l_act_extract_xpath varchar2(32767):= ut_utils.to_xpath(get_column_extract_path(a_act_cursor_info)); - l_exp_extract_xpath varchar2(32767):= ut_utils.to_xpath(get_column_extract_path(a_exp_cursor_info)); - l_join_xpath varchar2(32767) := ut_utils.to_xpath(a_join_by_list); - l_results tt_row_diffs; - l_sql varchar2(32767); - begin - l_sql := q'[ - with exp as ( - select - exp_item_data, exp_data_id, item_no rn, rownum col_no, pk_value, - s.column_value col, s.column_value.getRootElement() col_name, - nvl(s.column_value.getclobval(),empty_clob()) col_val - from ( - select - exp_data_id, extract( ucd.exp_item_data, :column_path ) exp_item_data, item_no, - replace( extract( ucd.exp_item_data, :join_by ).getclobval(), chr(10) ) pk_value - from ut_compound_data_diff_tmp ucd - where diff_id = :diff_id - and ucd.exp_data_id = :self_guid - ) i, - table( xmlsequence( extract(i.exp_item_data,:extract_path) ) ) s - ), - act as ( - select - act_item_data, act_data_id, item_no rn, rownum col_no, pk_value, - s.column_value col, s.column_value.getRootElement() col_name, - nvl(s.column_value.getclobval(),empty_clob()) col_val - from ( - select - act_data_id, extract( ucd.act_item_data, :column_path ) act_item_data, item_no, - replace( extract( ucd.act_item_data, :join_by ).getclobval(), chr(10) ) pk_value - from ut_compound_data_diff_tmp ucd - where diff_id = :diff_id - and ucd.act_data_id = :other_guid - ) i, - table( xmlsequence( extract(i.act_item_data,:extract_path) ) ) s - ) - select rn, diff_type, diffed_row, pk_value pk_value - from ( - select rn, diff_type, diffed_row, pk_value, - case when diff_type = 'Actual:' then 1 else 2 end rnk, - 1 final_order, - col_name - from ( ]' - || case when a_unordered then q'[ - select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, pk_value, col_name - from ( - select nvl(exp.rn, act.rn) rn, - nvl(exp.pk_value, act.pk_value) pk_value, - exp.col exp_item, - act.col act_item, - nvl(exp.col_name,act.col_name) col_name - from exp - join act - on exp.rn = act.rn and exp.col_name = act.col_name - where dbms_lob.compare(exp.col_val, act.col_val) != 0 - ) - unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:') ) ]' - else q'[ - select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, null pk_value, col_name - from ( - select nvl(exp.rn, act.rn) rn, - xmlagg(exp.col order by exp.col_no) exp_item, - xmlagg(act.col order by act.col_no) act_item, - max(nvl(exp.col_name,act.col_name)) col_name - from exp exp - join act act - on exp.rn = act.rn and exp.col_name = act.col_name - where dbms_lob.compare(exp.col_val, act.col_val) != 0 - group by (exp.rn, act.rn) - ) - unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:') ) ]' - end ||q'[ - ) - union all - select - item_no as rn, - case when exp_data_id is null then 'Extra:' else 'Missing:' end as diff_type, - xmlserialize( - content ( - extract( (case when exp_data_id is null then act_item_data else exp_item_data end),'/*/*') - ) no indent - ) diffed_row, - nvl2( - :join_by, - replace( - extract( case when exp_data_id is null then act_item_data else exp_item_data end, :join_by ).getclobval(), - chr(10) - ), - null - ) pk_value, - case when exp_data_id is null then 1 else 2 end rnk, - 2 final_order, - null col_name - from ut_compound_data_diff_tmp i - where diff_id = :diff_id - and act_data_id is null or exp_data_id is null - ) - order by final_order,]' - ||case when a_enforce_column_order or (not(a_enforce_column_order) and not(a_unordered)) then - q'[ - case when final_order = 1 then rn else rnk end, - case when final_order = 1 then rnk else rn end - ]' - when a_unordered then - q'[ - case when final_order = 1 then col_name else to_char(rnk) end, - case when final_order = 1 then to_char(rn) else col_name end, - case when final_order = 1 then to_char(rnk) else col_name end - ]' - else - null - end; - execute immediate l_sql - bulk collect into l_results - using l_exp_extract_xpath, l_join_xpath, a_diff_id, a_expected_dataset_guid,a_extract_path, - l_act_extract_xpath, l_join_xpath, a_diff_id, a_actual_dataset_guid,a_extract_path, - l_join_xpath, l_join_xpath, a_diff_id; - return l_results; - end; - - function get_hash(a_data raw, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash is - begin - return dbms_crypto.hash(a_data, a_hash_type); - end; - - function get_hash(a_data clob, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash is - begin - return dbms_crypto.hash(a_data, a_hash_type); - end; - - function get_fixed_size_hash(a_string varchar2, a_base integer :=0,a_size integer := 9999999) return number is - begin - return dbms_utility.get_hash_value(a_string,a_base,a_size); - end; - - procedure insert_diffs_result(a_diff_tab t_diff_tab, a_diff_id raw) is - begin - forall idx in 1..a_diff_tab.count save exceptions - insert into ut_compound_data_diff_tmp - ( diff_id, act_item_data, act_data_id, exp_item_data, exp_data_id, item_no, duplicate_no ) - values - (a_diff_id, - xmlelement( name "ROW", a_diff_tab(idx).act_item_data), a_diff_tab(idx).act_data_id, - xmlelement( name "ROW", a_diff_tab(idx).exp_item_data), a_diff_tab(idx).exp_data_id, - a_diff_tab(idx).item_no, a_diff_tab(idx).dup_no); - exception - when ut_utils.ex_failure_for_all then - raise_application_error(ut_utils.gc_dml_for_all,'Failure to insert a diff tmp data.'); - end; - - procedure set_rows_diff(a_rows_diff integer) is - begin - g_diff_count := a_rows_diff; - end; - - procedure cleanup_diff is - begin - g_diff_count := 0; - end; - - function get_rows_diff_count return integer is - begin - return g_diff_count; - end; - - function is_sql_compare_allowed(a_type_name varchar2) - return boolean is - l_assert boolean; - begin - --clob/blob/xmltype/object/nestedcursor/nestedtable - if a_type_name IN (g_type_name_map(dbms_sql.blob_type), - g_type_name_map(dbms_sql.clob_type), - g_type_name_map(dbms_sql.long_type), - g_type_name_map(dbms_sql.long_raw_type), - g_type_name_map(dbms_sql.bfile_type), - g_anytype_name_map(dbms_types.typecode_namedcollection)) - then - l_assert := false; - else - l_assert := true; - end if; - return l_assert; - end; - - function get_column_type_desc(a_type_code in integer, a_dbms_sql_desc in boolean) - return varchar2 is - begin - return - case - when a_dbms_sql_desc then g_type_name_map(a_type_code) - else g_anytype_name_map(a_type_code) - end; - end; - - function get_compare_cursor(a_diff_cursor_text in clob,a_self_id raw, a_other_id raw) return sys_refcursor is - l_diff_cursor sys_refcursor; - begin - open l_diff_cursor for a_diff_cursor_text using a_self_id, a_other_id; - return l_diff_cursor; - end; - - function create_err_cursor_msg(a_error_stack varchar2) return varchar2 is - begin - return 'SQL exception thrown when fetching data from cursor:'|| - ut_utils.remove_error_from_stack(sqlerrm,ut_utils.gc_xml_processing)||chr(10)|| - ut_expectation_processor.who_called_expectation(a_error_stack)|| - 'Check the query and data for errors.'; - end; - - function type_no_length ( a_type_name varchar2) return boolean is - begin - return case - when g_type_no_length_map.exists(a_type_name) then - true - else - false - end; - end; - -begin - g_anytype_name_map(dbms_types.typecode_date) := 'DATE'; - g_anytype_name_map(dbms_types.typecode_number) := 'NUMBER'; - g_anytype_name_map(3 /*INTEGER in object type*/) := 'NUMBER'; - g_anytype_name_map(dbms_types.typecode_raw) := 'RAW'; - g_anytype_name_map(dbms_types.typecode_char) := 'CHAR'; - g_anytype_name_map(dbms_types.typecode_varchar2) := 'VARCHAR2'; - g_anytype_name_map(dbms_types.typecode_varchar) := 'VARCHAR'; - g_anytype_name_map(dbms_types.typecode_blob) := 'BLOB'; - g_anytype_name_map(dbms_types.typecode_bfile) := 'BFILE'; - g_anytype_name_map(dbms_types.typecode_clob) := 'CLOB'; - g_anytype_name_map(dbms_types.typecode_timestamp) := 'TIMESTAMP'; - g_anytype_name_map(dbms_types.typecode_timestamp_tz) := 'TIMESTAMP WITH TIME ZONE'; - g_anytype_name_map(dbms_types.typecode_timestamp_ltz) := 'TIMESTAMP WITH LOCAL TIME ZONE'; - g_anytype_name_map(dbms_types.typecode_interval_ym) := 'INTERVAL YEAR TO MONTH'; - g_anytype_name_map(dbms_types.typecode_interval_ds) := 'INTERVAL DAY TO SECOND'; - g_anytype_name_map(dbms_types.typecode_bfloat) := 'BINARY_FLOAT'; - g_anytype_name_map(dbms_types.typecode_bdouble) := 'BINARY_DOUBLE'; - g_anytype_name_map(dbms_types.typecode_urowid) := 'UROWID'; - g_anytype_name_map(dbms_types.typecode_varray) := 'VARRRAY'; - g_anytype_name_map(dbms_types.typecode_table) := 'TABLE'; - g_anytype_name_map(dbms_types.typecode_namedcollection) := 'NAMEDCOLLECTION'; - g_anytype_name_map(dbms_types.typecode_object) := 'OBJECT'; - - g_type_name_map( dbms_sql.binary_bouble_type ) := 'BINARY_DOUBLE'; - g_type_name_map( dbms_sql.bfile_type ) := 'BFILE'; - g_type_name_map( dbms_sql.binary_float_type ) := 'BINARY_FLOAT'; - g_type_name_map( dbms_sql.blob_type ) := 'BLOB'; - g_type_name_map( dbms_sql.long_raw_type ) := 'LONG RAW'; - g_type_name_map( dbms_sql.char_type ) := 'CHAR'; - g_type_name_map( dbms_sql.clob_type ) := 'CLOB'; - g_type_name_map( dbms_sql.long_type ) := 'LONG'; - g_type_name_map( dbms_sql.date_type ) := 'DATE'; - g_type_name_map( dbms_sql.interval_day_to_second_type ) := 'INTERVAL DAY TO SECOND'; - g_type_name_map( dbms_sql.interval_year_to_month_type ) := 'INTERVAL YEAR TO MONTH'; - g_type_name_map( dbms_sql.raw_type ) := 'RAW'; - g_type_name_map( dbms_sql.timestamp_type ) := 'TIMESTAMP'; - g_type_name_map( dbms_sql.timestamp_with_tz_type ) := 'TIMESTAMP WITH TIME ZONE'; - g_type_name_map( dbms_sql.timestamp_with_local_tz_type ) := 'TIMESTAMP WITH LOCAL TIME ZONE'; - g_type_name_map( dbms_sql.varchar2_type ) := 'VARCHAR2'; - g_type_name_map( dbms_sql.number_type ) := 'NUMBER'; - g_type_name_map( dbms_sql.rowid_type ) := 'ROWID'; - g_type_name_map( dbms_sql.urowid_type ) := 'UROWID'; - g_type_name_map( dbms_sql.user_defined_type ) := 'USER_DEFINED_TYPE'; - g_type_name_map( dbms_sql.ref_type ) := 'REF_TYPE'; - - - /** - * List of types that have no length but can produce a max_len from desc_cursor function. - */ - g_type_no_length_map('ROWID') := 'ROWID'; - g_type_no_length_map('INTERVAL DAY TO SECOND') := 'INTERVAL DAY TO SECOND'; - g_type_no_length_map('INTERVAL YEAR TO MONTH') := 'INTERVAL YEAR TO MONTH'; - g_type_no_length_map('BINARY_DOUBLE') := 'BINARY_DOUBLE'; - g_type_no_length_map('BINARY_FLOAT') := 'BINARY_FLOAT'; -end; -/ +create or replace package body ut_compound_data_helper is + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + g_diff_count integer; + type t_type_name_map is table of varchar2(128) index by binary_integer; + type t_types_no_length is table of varchar2(128) index by varchar2(128); + g_type_name_map t_type_name_map; + g_anytype_name_map t_type_name_map; + g_type_no_length_map t_types_no_length; + + g_compare_sql_template varchar2(4000) := + q'[ + with exp as ( + select + ucd.*, + {:duplicate_number:} dup_no + from ( + select + ucd.item_data + ,x.data_id data_id + ,position + x.item_no item_no + {:columns:} + from {:ut3_owner:}.ut_compound_data_tmp x, + xmltable('/ROWSET/ROW' passing x.item_data columns + item_data xmltype path '*' + ,position for ordinality + {:xml_to_columns:} ) ucd + where data_id = :exp_guid + ) ucd + ) + , act as ( + select + ucd.*, + {:duplicate_number:} dup_no + from ( + select + ucd.item_data + ,x.data_id data_id + ,position + x.item_no item_no + {:columns:} + from {:ut3_owner:}.ut_compound_data_tmp x, + xmltable('/ROWSET/ROW' passing x.item_data columns + item_data xmltype path '*' + ,position for ordinality + {:xml_to_columns:} ) ucd + where data_id = :act_guid + ) ucd + ) + select + a.item_data as act_item_data, + a.data_id act_data_id, + e.item_data as exp_item_data, + e.data_id exp_data_id, + {:item_no:} as item_no, + nvl(e.dup_no,a.dup_no) dup_no + from act a {:join_type:} exp e on ( {:join_condition:} ) + where {:where_condition:}]'; + + function get_columns_diff( + a_expected ut_cursor_column_tab, + a_actual ut_cursor_column_tab, + a_order_enforced boolean := false + ) return tt_column_diffs is + l_results tt_column_diffs; + begin + execute immediate q'[with + expected_cols as ( + select display_path exp_column_name,column_position exp_col_pos, + replace(column_type_name,'VARCHAR2','CHAR') exp_col_type_compare, column_type_name exp_col_type + from table(:a_expected) + where parent_name is null and hierarchy_level = 1 and column_name is not null + ), + actual_cols as ( + select display_path act_column_name,column_position act_col_pos, + replace(column_type_name,'VARCHAR2','CHAR') act_col_type_compare, column_type_name act_col_type + from table(:a_actual) + where parent_name is null and hierarchy_level = 1 and column_name is not null + ), + joined_cols as ( + select e.*,a.*]' + || case when a_order_enforced then ', + row_number() over(partition by case when a.act_col_pos + e.exp_col_pos is not null then 1 end order by a.act_col_pos) a_pos_nn, + row_number() over(partition by case when a.act_col_pos + e.exp_col_pos is not null then 1 end order by e.exp_col_pos) e_pos_nn' + else + null + end ||q'[ + from expected_cols e + full outer join actual_cols a + on e.exp_column_name = a.act_column_name + ) + select case + when exp_col_pos is null and act_col_pos is not null then '+' + when exp_col_pos is not null and act_col_pos is null then '-' + when exp_col_type_compare != act_col_type_compare then 't' + else 'p' + end as diff_type, + exp_column_name, exp_col_type, exp_col_pos, + act_column_name, act_col_type, act_col_pos + from joined_cols + --column is unexpected (extra) or missing + where act_col_pos is null or exp_col_pos is null + --column type is not matching (except CHAR/VARCHAR2) + or act_col_type_compare != exp_col_type_compare]' + || case when a_order_enforced then q'[ + --column position is not matching (both when excluded extra/missing columns as well as when they are included) + or (a_pos_nn != e_pos_nn and exp_col_pos != act_col_pos)]' + else + null + end ||q'[ + order by exp_col_pos, act_col_pos]' + bulk collect into l_results using a_expected, a_actual; + return l_results; + end; + + function generate_not_equal_stmt( + a_data_info ut_cursor_column, a_pk_table ut_varchar2_list + ) return varchar2 + is + l_pk_tab ut_varchar2_list := coalesce(a_pk_table,ut_varchar2_list()); + l_index integer; + l_sql_stmt varchar2(32767); + l_exists boolean := false; + begin + l_index := l_pk_tab.first; + if l_pk_tab.count > 0 then + loop + if a_data_info.access_path = l_pk_tab(l_index) then + l_exists := true; + end if; + exit when l_index = l_pk_tab.count or (a_data_info.access_path = l_pk_tab(l_index)); + l_index := a_pk_table.next(l_index); + end loop; + end if; + if not(l_exists) then + l_sql_stmt := ' (decode(a.'||a_data_info.transformed_name||','||' e.'||a_data_info.transformed_name||',1,0) = 0)'; + end if; + return l_sql_stmt; + end; + + function generate_join_by_stmt( + a_data_info ut_cursor_column, a_pk_table ut_varchar2_list + ) return varchar2 + is + l_pk_tab ut_varchar2_list := coalesce(a_pk_table,ut_varchar2_list()); + l_index integer; + l_sql_stmt varchar2(32767); + begin + if l_pk_tab.count <> 0 then + l_index:= l_pk_tab.first; + loop + if l_pk_tab(l_index) in (a_data_info.access_path, a_data_info.parent_name) then + --When then table is nested and join is on whole table + l_sql_stmt := l_sql_stmt ||' a.'||a_data_info.transformed_name||q'[ = ]'||' e.'||a_data_info.transformed_name; + end if; + exit when (a_data_info.access_path = l_pk_tab(l_index)) or l_index = l_pk_tab.count; + l_index := l_pk_tab.next(l_index); + end loop; + end if; + return l_sql_stmt; + end; + + function generate_equal_sql(a_col_name in varchar2) return varchar2 is + begin + return ' decode(a.'||a_col_name||','||' e.'||a_col_name||',1,0) = 1 '; + end; + + function generate_partition_stmt( + a_data_info ut_cursor_column, a_pk_table in ut_varchar2_list, a_alias varchar2 := 'ucd.' + ) return varchar2 + is + l_index integer; + l_sql_stmt varchar2(32767); + begin + if a_pk_table is not empty then + l_index:= a_pk_table.first; + loop + if a_pk_table(l_index) in (a_data_info.access_path, a_data_info.parent_name) then + --When then table is nested and join is on whole table + l_sql_stmt := l_sql_stmt ||a_alias||a_data_info.transformed_name; + end if; + exit when (a_data_info.access_path = a_pk_table(l_index)) or l_index = a_pk_table.count; + l_index := a_pk_table.next(l_index); + end loop; + else + l_sql_stmt := a_alias||a_data_info.transformed_name; + end if; + return l_sql_stmt; + end; + + function generate_select_stmt(a_data_info ut_cursor_column, a_alias varchar2 := 'ucd.') + return varchar2 + is + l_alias varchar2(10) := a_alias; + l_col_syntax varchar2(4000); + l_ut_owner varchar2(250) := ut_utils.ut_owner; + begin + if a_data_info.is_sql_diffable = 0 then + l_col_syntax := l_ut_owner ||'.ut_compound_data_helper.get_hash('||l_alias||a_data_info.transformed_name||'.getClobVal()) as '||a_data_info.transformed_name ; + elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type = 'DATE' then + l_col_syntax := 'to_date('||l_alias||a_data_info.transformed_name||') as '|| a_data_info.transformed_name; + elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('TIMESTAMP') then + l_col_syntax := 'to_timestamp('||l_alias||a_data_info.transformed_name||','''||ut_utils.gc_timestamp_format||''') as '|| a_data_info.transformed_name; + elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('TIMESTAMP WITH TIME ZONE') then + l_col_syntax := 'to_timestamp_tz('||l_alias||a_data_info.transformed_name||','''||ut_utils.gc_timestamp_tz_format||''') as '|| a_data_info.transformed_name; + elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('TIMESTAMP WITH LOCAL TIME ZONE') then + l_col_syntax := ' cast( to_timestamp_tz('||l_alias||a_data_info.transformed_name||','''||ut_utils.gc_timestamp_tz_format||''') AS TIMESTAMP WITH LOCAL TIME ZONE) as '|| a_data_info.transformed_name; + else + l_col_syntax := l_alias||a_data_info.transformed_name||' as '|| a_data_info.transformed_name; + end if; + return l_col_syntax; + end; + + function generate_xmltab_stmt(a_data_info ut_cursor_column) return varchar2 is + l_col_type varchar2(4000); + begin + if a_data_info.is_sql_diffable = 0 then + l_col_type := 'XMLTYPE'; + elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('DATE','TIMESTAMP','TIMESTAMP WITH TIME ZONE', + 'TIMESTAMP WITH LOCAL TIME ZONE') then + l_col_type := 'VARCHAR2(50)'; + elsif a_data_info.is_sql_diffable = 1 and type_no_length(a_data_info.column_type) then + l_col_type := a_data_info.column_type; + elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('VARCHAR2','CHAR') then + l_col_type := 'VARCHAR2('||greatest(a_data_info.column_len,4000)||')'; + elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('NUMBER') then + --We cannot use a precision and scale as dbms_sql.describe_columns3 return precision 0 for dual table + -- there is also no need for that as we not process data but only read and compare as they are stored + l_col_type := a_data_info.column_type; + else + l_col_type := a_data_info.column_type + ||case when a_data_info.column_len is not null + then '('||a_data_info.column_len||')' + else null + end; + end if; + return a_data_info.transformed_name||' '||l_col_type||q'[ PATH ']'||a_data_info.access_path||q'[']'; + end; + + procedure gen_sql_pieces_out_of_cursor( + a_data_info ut_cursor_column_tab, + a_pk_table ut_varchar2_list, + a_unordered boolean, + a_xml_stmt out nocopy clob, + a_select_stmt out nocopy clob, + a_partition_stmt out nocopy clob, + a_join_by_stmt out nocopy clob, + a_not_equal_stmt out nocopy clob + ) is + l_partition_tmp clob; + l_xmltab_list ut_varchar2_list := ut_varchar2_list(); + l_select_list ut_varchar2_list := ut_varchar2_list(); + l_partition_list ut_varchar2_list := ut_varchar2_list(); + l_equal_list ut_varchar2_list := ut_varchar2_list(); + l_join_by_list ut_varchar2_list := ut_varchar2_list(); + l_not_equal_list ut_varchar2_list := ut_varchar2_list(); + + procedure add_element_to_list(a_list in out ut_varchar2_list, a_list_element in varchar2) + is + begin + if a_list_element is not null then + a_list.extend; + a_list(a_list.last) := a_list_element; + end if; + end; + + begin + if a_data_info is not empty then + for i in 1..a_data_info.count loop + if a_data_info(i).has_nested_col = 0 then + --Get XMLTABLE column list + add_element_to_list(l_xmltab_list,generate_xmltab_stmt(a_data_info(i))); + --Get Select statment list of columns + add_element_to_list(l_select_list, generate_select_stmt(a_data_info(i))); + --Get columns by which we partition + add_element_to_list(l_partition_list,generate_partition_stmt(a_data_info(i), a_pk_table)); + --Get equal statement + add_element_to_list(l_equal_list,generate_equal_sql(a_data_info(i).transformed_name)); + --Generate join by stmt + add_element_to_list(l_join_by_list,generate_join_by_stmt(a_data_info(i), a_pk_table)); + --Generate not equal stmt + add_element_to_list(l_not_equal_list,generate_not_equal_stmt(a_data_info(i), a_pk_table)); + end if; + end loop; + + a_xml_stmt := nullif(','||ut_utils.table_to_clob(l_xmltab_list, ' , '),','); + a_select_stmt := nullif(','||ut_utils.table_to_clob(l_select_list, ' , '),','); + l_partition_tmp := ut_utils.table_to_clob(l_partition_list, ' , '); + ut_utils.append_to_clob(a_partition_stmt,' row_number() over (partition by '||l_partition_tmp||' order by '||l_partition_tmp||' ) '); + + if a_pk_table.count > 0 then + -- If key defined do the join or these and where on diffrences + a_join_by_stmt := ut_utils.table_to_clob(l_join_by_list, ' and '); + elsif a_unordered then + -- If no key defined do the join on all columns + a_join_by_stmt := ' e.dup_no = a.dup_no and '||ut_utils.table_to_clob(l_equal_list, ' and '); + else + -- Else join on rownumber + a_join_by_stmt := 'a.item_no = e.item_no '; + end if; + a_not_equal_stmt := ut_utils.table_to_clob(l_not_equal_list, ' or '); + else + --Partition by piece when no data + ut_utils.append_to_clob(a_partition_stmt,' 1 '); + a_join_by_stmt := 'a.item_no = e.item_no '; + end if; + end; + + function gen_compare_sql( + a_other ut_data_value_refcursor, + a_join_by_list ut_varchar2_list, + a_unordered boolean, + a_inclusion_type boolean, + a_is_negated boolean + ) return clob is + l_compare_sql clob; + l_xmltable_stmt clob; + l_select_stmt clob; + l_partition_stmt clob; + l_join_on_stmt clob; + l_not_equal_stmt clob; + l_where_stmt clob; + l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_join_by_list ut_varchar2_list; + + function get_join_type(a_inclusion_compare in boolean,a_negated in boolean) return varchar2 is + begin + return + case + when a_inclusion_compare and not(a_negated) then ' right outer join ' + when a_inclusion_compare and a_negated then ' inner join ' + else ' full outer join ' + end; + end; + + function get_item_no(a_unordered boolean) return varchar2 is + begin + return + case + when a_unordered then 'row_number() over ( order by nvl(e.item_no,a.item_no))' + else 'nvl(e.item_no,a.item_no) ' + end; + end; + + begin + /** + * We already estabilished cursor equality so now we add anydata root if we compare anydata + * to join by. + */ + l_join_by_list := + case + when a_other is of (ut_data_value_anydata) then ut_utils.add_prefix(a_join_by_list, a_other.cursor_details.get_root) + else a_join_by_list + end; + + dbms_lob.createtemporary(l_compare_sql, true); + --Initiate a SQL template with placeholders + ut_utils.append_to_clob(l_compare_sql, g_compare_sql_template); + --Generate a pieceso of dynamic SQL that will substitute placeholders + gen_sql_pieces_out_of_cursor( + a_other.cursor_details.cursor_columns_info, l_join_by_list, a_unordered, + l_xmltable_stmt, l_select_stmt, l_partition_stmt, l_join_on_stmt, + l_not_equal_stmt + ); + + l_compare_sql := replace(l_compare_sql,'{:duplicate_number:}',l_partition_stmt); + l_compare_sql := replace(l_compare_sql,'{:columns:}',l_select_stmt); + l_compare_sql := replace(l_compare_sql,'{:ut3_owner:}',l_ut_owner); + l_compare_sql := replace(l_compare_sql,'{:xml_to_columns:}',l_xmltable_stmt); + l_compare_sql := replace(l_compare_sql,'{:item_no:}',get_item_no(a_unordered)); + l_compare_sql := replace(l_compare_sql,'{:join_type:}',get_join_type(a_inclusion_type,a_is_negated)); + l_compare_sql := replace(l_compare_sql,'{:join_condition:}',l_join_on_stmt); + + if l_not_equal_stmt is not null and ((l_join_by_list.count > 0 and not a_is_negated) or (not a_unordered)) then + ut_utils.append_to_clob(l_where_stmt,' ( '||l_not_equal_stmt||' ) or '); + end if; + --If its inclusion we expect a actual set to fully match and have no extra elements over expected + if a_inclusion_type then + ut_utils.append_to_clob(l_where_stmt,case when a_is_negated then ' 1 = 1 ' else ' ( a.data_id is null ) ' end); + else + ut_utils.append_to_clob(l_where_stmt,' (a.data_id is null or e.data_id is null) '); + end if; + + l_compare_sql := replace(l_compare_sql,'{:where_condition:}',l_where_stmt); + return l_compare_sql; + end; + + function get_column_extract_path(a_cursor_info ut_cursor_column_tab) return ut_varchar2_list is + l_column_list ut_varchar2_list := ut_varchar2_list(); + begin + for i in 1..a_cursor_info.count loop + l_column_list.extend; + l_column_list(l_column_list.last) := a_cursor_info(i).access_path; + end loop; + return l_column_list; + end; + + function get_rows_diff_by_sql( + a_act_cursor_info ut_cursor_column_tab, a_exp_cursor_info ut_cursor_column_tab, + a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, + a_join_by_list ut_varchar2_list, a_unordered boolean, a_enforce_column_order boolean := false, + a_extract_path varchar2 + ) return tt_row_diffs is + l_act_extract_xpath varchar2(32767):= ut_utils.to_xpath(get_column_extract_path(a_act_cursor_info)); + l_exp_extract_xpath varchar2(32767):= ut_utils.to_xpath(get_column_extract_path(a_exp_cursor_info)); + l_join_xpath varchar2(32767) := ut_utils.to_xpath(a_join_by_list); + l_results tt_row_diffs; + l_sql varchar2(32767); + begin + l_sql := q'[ + with exp as ( + select + exp_item_data, exp_data_id, item_no rn, rownum col_no, pk_value, + s.column_value col, s.column_value.getRootElement() col_name, + nvl(s.column_value.getclobval(),empty_clob()) col_val + from ( + select + exp_data_id, extract( ucd.exp_item_data, :column_path ) exp_item_data, item_no, + replace( extract( ucd.exp_item_data, :join_by ).getclobval(), chr(10) ) pk_value + from ut_compound_data_diff_tmp ucd + where diff_id = :diff_id + and ucd.exp_data_id = :self_guid + ) i, + table( xmlsequence( extract(i.exp_item_data,:extract_path) ) ) s + ), + act as ( + select + act_item_data, act_data_id, item_no rn, rownum col_no, pk_value, + s.column_value col, s.column_value.getRootElement() col_name, + nvl(s.column_value.getclobval(),empty_clob()) col_val + from ( + select + act_data_id, extract( ucd.act_item_data, :column_path ) act_item_data, item_no, + replace( extract( ucd.act_item_data, :join_by ).getclobval(), chr(10) ) pk_value + from ut_compound_data_diff_tmp ucd + where diff_id = :diff_id + and ucd.act_data_id = :other_guid + ) i, + table( xmlsequence( extract(i.act_item_data,:extract_path) ) ) s + ) + select rn, diff_type, diffed_row, pk_value pk_value + from ( + select rn, diff_type, diffed_row, pk_value, + case when diff_type = 'Actual:' then 1 else 2 end rnk, + 1 final_order, + col_name + from ( ]' + || case when a_unordered then q'[ + select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, pk_value, col_name + from ( + select nvl(exp.rn, act.rn) rn, + nvl(exp.pk_value, act.pk_value) pk_value, + exp.col exp_item, + act.col act_item, + nvl(exp.col_name,act.col_name) col_name + from exp + join act + on exp.rn = act.rn and exp.col_name = act.col_name + where dbms_lob.compare(exp.col_val, act.col_val) != 0 + ) + unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:') ) ]' + else q'[ + select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, null pk_value, col_name + from ( + select nvl(exp.rn, act.rn) rn, + xmlagg(exp.col order by exp.col_no) exp_item, + xmlagg(act.col order by act.col_no) act_item, + max(nvl(exp.col_name,act.col_name)) col_name + from exp exp + join act act + on exp.rn = act.rn and exp.col_name = act.col_name + where dbms_lob.compare(exp.col_val, act.col_val) != 0 + group by (exp.rn, act.rn) + ) + unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:') ) ]' + end ||q'[ + ) + union all + select + item_no as rn, + case when exp_data_id is null then 'Extra:' else 'Missing:' end as diff_type, + xmlserialize( + content ( + extract( (case when exp_data_id is null then act_item_data else exp_item_data end),'/*/*') + ) no indent + ) diffed_row, + nvl2( + :join_by, + replace( + extract( case when exp_data_id is null then act_item_data else exp_item_data end, :join_by ).getclobval(), + chr(10) + ), + null + ) pk_value, + case when exp_data_id is null then 1 else 2 end rnk, + 2 final_order, + null col_name + from ut_compound_data_diff_tmp i + where diff_id = :diff_id + and act_data_id is null or exp_data_id is null + ) + order by final_order,]' + ||case when a_enforce_column_order or (not(a_enforce_column_order) and not(a_unordered)) then + q'[ + case when final_order = 1 then rn else rnk end, + case when final_order = 1 then rnk else rn end + ]' + when a_unordered then + q'[ + case when final_order = 1 then col_name else to_char(rnk) end, + case when final_order = 1 then to_char(rn) else col_name end, + case when final_order = 1 then to_char(rnk) else col_name end + ]' + else + null + end; + execute immediate l_sql + bulk collect into l_results + using l_exp_extract_xpath, l_join_xpath, a_diff_id, a_expected_dataset_guid,a_extract_path, + l_act_extract_xpath, l_join_xpath, a_diff_id, a_actual_dataset_guid,a_extract_path, + l_join_xpath, l_join_xpath, a_diff_id; + return l_results; + end; + + function get_hash(a_data raw, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash is + begin + return dbms_crypto.hash(a_data, a_hash_type); + end; + + function get_hash(a_data clob, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash is + begin + return dbms_crypto.hash(a_data, a_hash_type); + end; + + function get_fixed_size_hash(a_string varchar2, a_base integer :=0,a_size integer := 9999999) return number is + begin + return dbms_utility.get_hash_value(a_string,a_base,a_size); + end; + + procedure insert_diffs_result(a_diff_tab t_diff_tab, a_diff_id raw) is + begin + forall idx in 1..a_diff_tab.count save exceptions + insert into ut_compound_data_diff_tmp + ( diff_id, act_item_data, act_data_id, exp_item_data, exp_data_id, item_no, duplicate_no ) + values + (a_diff_id, + xmlelement( name "ROW", a_diff_tab(idx).act_item_data), a_diff_tab(idx).act_data_id, + xmlelement( name "ROW", a_diff_tab(idx).exp_item_data), a_diff_tab(idx).exp_data_id, + a_diff_tab(idx).item_no, a_diff_tab(idx).dup_no); + exception + when ut_utils.ex_failure_for_all then + raise_application_error(ut_utils.gc_dml_for_all,'Failure to insert a diff tmp data.'); + end; + + procedure set_rows_diff(a_rows_diff integer) is + begin + g_diff_count := a_rows_diff; + end; + + procedure cleanup_diff is + begin + g_diff_count := 0; + end; + + function get_rows_diff_count return integer is + begin + return g_diff_count; + end; + + function is_sql_compare_allowed(a_type_name varchar2) + return boolean is + l_assert boolean; + begin + --clob/blob/xmltype/object/nestedcursor/nestedtable + if a_type_name IN (g_type_name_map(dbms_sql.blob_type), + g_type_name_map(dbms_sql.clob_type), + g_type_name_map(dbms_sql.long_type), + g_type_name_map(dbms_sql.long_raw_type), + g_type_name_map(dbms_sql.bfile_type), + g_anytype_name_map(dbms_types.typecode_namedcollection)) + then + l_assert := false; + else + l_assert := true; + end if; + return l_assert; + end; + + function get_column_type_desc(a_type_code in integer, a_dbms_sql_desc in boolean) + return varchar2 is + begin + return + case + when a_dbms_sql_desc then g_type_name_map(a_type_code) + else g_anytype_name_map(a_type_code) + end; + end; + + function get_compare_cursor(a_diff_cursor_text in clob,a_self_id raw, a_other_id raw) return sys_refcursor is + l_diff_cursor sys_refcursor; + begin + open l_diff_cursor for a_diff_cursor_text using a_self_id, a_other_id; + return l_diff_cursor; + end; + + function create_err_cursor_msg(a_error_stack varchar2) return varchar2 is + begin + return 'SQL exception thrown when fetching data from cursor:'|| + ut_utils.remove_error_from_stack(sqlerrm,ut_utils.gc_xml_processing)||chr(10)|| + ut_expectation_processor.who_called_expectation(a_error_stack)|| + 'Check the query and data for errors.'; + end; + + function type_no_length ( a_type_name varchar2) return boolean is + begin + return case + when g_type_no_length_map.exists(a_type_name) then + true + else + false + end; + end; + +begin + g_anytype_name_map(dbms_types.typecode_date) := 'DATE'; + g_anytype_name_map(dbms_types.typecode_number) := 'NUMBER'; + g_anytype_name_map(3 /*INTEGER in object type*/) := 'NUMBER'; + g_anytype_name_map(dbms_types.typecode_raw) := 'RAW'; + g_anytype_name_map(dbms_types.typecode_char) := 'CHAR'; + g_anytype_name_map(dbms_types.typecode_varchar2) := 'VARCHAR2'; + g_anytype_name_map(dbms_types.typecode_varchar) := 'VARCHAR'; + g_anytype_name_map(dbms_types.typecode_blob) := 'BLOB'; + g_anytype_name_map(dbms_types.typecode_bfile) := 'BFILE'; + g_anytype_name_map(dbms_types.typecode_clob) := 'CLOB'; + g_anytype_name_map(dbms_types.typecode_timestamp) := 'TIMESTAMP'; + g_anytype_name_map(dbms_types.typecode_timestamp_tz) := 'TIMESTAMP WITH TIME ZONE'; + g_anytype_name_map(dbms_types.typecode_timestamp_ltz) := 'TIMESTAMP WITH LOCAL TIME ZONE'; + g_anytype_name_map(dbms_types.typecode_interval_ym) := 'INTERVAL YEAR TO MONTH'; + g_anytype_name_map(dbms_types.typecode_interval_ds) := 'INTERVAL DAY TO SECOND'; + g_anytype_name_map(dbms_types.typecode_bfloat) := 'BINARY_FLOAT'; + g_anytype_name_map(dbms_types.typecode_bdouble) := 'BINARY_DOUBLE'; + g_anytype_name_map(dbms_types.typecode_urowid) := 'UROWID'; + g_anytype_name_map(dbms_types.typecode_varray) := 'VARRRAY'; + g_anytype_name_map(dbms_types.typecode_table) := 'TABLE'; + g_anytype_name_map(dbms_types.typecode_namedcollection) := 'NAMEDCOLLECTION'; + g_anytype_name_map(dbms_types.typecode_object) := 'OBJECT'; + + g_type_name_map( dbms_sql.binary_bouble_type ) := 'BINARY_DOUBLE'; + g_type_name_map( dbms_sql.bfile_type ) := 'BFILE'; + g_type_name_map( dbms_sql.binary_float_type ) := 'BINARY_FLOAT'; + g_type_name_map( dbms_sql.blob_type ) := 'BLOB'; + g_type_name_map( dbms_sql.long_raw_type ) := 'LONG RAW'; + g_type_name_map( dbms_sql.char_type ) := 'CHAR'; + g_type_name_map( dbms_sql.clob_type ) := 'CLOB'; + g_type_name_map( dbms_sql.long_type ) := 'LONG'; + g_type_name_map( dbms_sql.date_type ) := 'DATE'; + g_type_name_map( dbms_sql.interval_day_to_second_type ) := 'INTERVAL DAY TO SECOND'; + g_type_name_map( dbms_sql.interval_year_to_month_type ) := 'INTERVAL YEAR TO MONTH'; + g_type_name_map( dbms_sql.raw_type ) := 'RAW'; + g_type_name_map( dbms_sql.timestamp_type ) := 'TIMESTAMP'; + g_type_name_map( dbms_sql.timestamp_with_tz_type ) := 'TIMESTAMP WITH TIME ZONE'; + g_type_name_map( dbms_sql.timestamp_with_local_tz_type ) := 'TIMESTAMP WITH LOCAL TIME ZONE'; + g_type_name_map( dbms_sql.varchar2_type ) := 'VARCHAR2'; + g_type_name_map( dbms_sql.number_type ) := 'NUMBER'; + g_type_name_map( dbms_sql.rowid_type ) := 'ROWID'; + g_type_name_map( dbms_sql.urowid_type ) := 'UROWID'; + g_type_name_map( dbms_sql.user_defined_type ) := 'USER_DEFINED_TYPE'; + g_type_name_map( dbms_sql.ref_type ) := 'REF_TYPE'; + + + /** + * List of types that have no length but can produce a max_len from desc_cursor function. + */ + g_type_no_length_map('ROWID') := 'ROWID'; + g_type_no_length_map('INTERVAL DAY TO SECOND') := 'INTERVAL DAY TO SECOND'; + g_type_no_length_map('INTERVAL YEAR TO MONTH') := 'INTERVAL YEAR TO MONTH'; + g_type_no_length_map('BINARY_DOUBLE') := 'BINARY_DOUBLE'; + g_type_no_length_map('BINARY_FLOAT') := 'BINARY_FLOAT'; +end; +/ diff --git a/source/expectations/data_values/ut_cursor_column.tpb b/source/expectations/data_values/ut_cursor_column.tpb index 3c6931a5d..835a7ee04 100644 --- a/source/expectations/data_values/ut_cursor_column.tpb +++ b/source/expectations/data_values/ut_cursor_column.tpb @@ -1,69 +1,70 @@ -create or replace type body ut_cursor_column as - - member procedure init( - self in out nocopy ut_cursor_column, - a_col_name varchar2, a_col_schema_name varchar2, - a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, - a_col_position integer, a_col_type varchar2, a_collection integer,a_access_path in varchar2, a_col_precision in integer, - a_col_scale integer - ) is - begin - self.parent_name := a_parent_name; --Name of the parent if its nested - self.hierarchy_level := a_hierarchy_level; --Hierarchy level - self.column_position := a_col_position; --Position of the column in cursor/ type - self.column_len := a_col_max_len; --length of column - self.column_precision := a_col_precision; - self.column_scale := a_col_scale; - self.column_name := TRIM( BOTH '''' FROM a_col_name); --name of the column - self.column_type_name := coalesce(a_col_type_name,a_col_type); --type name e.g. test_dummy_object or varchar2 - self.xml_valid_name := ut_utils.get_valid_xml_name(self.column_name); - self.display_path := case when a_access_path is null then - self.column_name - else - a_access_path||'/'||self.column_name - end; --Access path used for incldue exclude eg/ TEST_DUMMY_OBJECT/VARCHAR2 - self.access_path := case when a_access_path is null then - self.xml_valid_name - else - a_access_path||'/'||self.xml_valid_name - end; --Access path used for incldue exclude eg/ TEST_DUMMY_OBJECT/VARCHAR2 - self.transformed_name := case when length(self.xml_valid_name) > 30 then - '"'||ut_compound_data_helper.get_fixed_size_hash(self.parent_name||self.xml_valid_name)||'"' - when self.parent_name is null then - '"'||self.xml_valid_name||'"' - else - '"'||ut_compound_data_helper.get_fixed_size_hash(self.parent_name||self.xml_valid_name)||'"' - end; --when is nestd we need to hash name to make sure we dont exceed 30 char - self.column_type := a_col_type; --column type e.g. user_defined , varchar2 - self.column_schema := a_col_schema_name; -- schema name - self.is_sql_diffable := case - when lower(self.column_type) = 'user_defined_type' then - 0 - -- Due to bug in 11g/12.1 collection fails on varchar 4000+ - when (lower(self.column_type) in ('varchar2','char')) and (self.column_len > 4000) then - 0 - else - ut_utils.boolean_to_int(ut_compound_data_helper.is_sql_compare_allowed(self.column_type)) - end; --can we directly compare or do we need to hash value - self.is_collection := a_collection; - self.has_nested_col := case when lower(self.column_type) = 'user_defined_type' and self.is_collection = 0 then 1 else 0 end; - end; - - constructor function ut_cursor_column( self in out nocopy ut_cursor_column, - a_col_name varchar2, a_col_schema_name varchar2, - a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, - a_col_position integer, a_col_type in varchar2, a_collection integer,a_access_path in varchar2, a_col_precision in integer, - a_col_scale integer - ) return self as result is - begin - init(a_col_name, a_col_schema_name, a_col_type_name, a_col_max_len, a_parent_name,a_hierarchy_level, a_col_position, - a_col_type, a_collection,a_access_path,a_col_precision,a_col_scale); - return; - end; - - constructor function ut_cursor_column( self in out nocopy ut_cursor_column) return self as result is - begin - return; - end; -end; -/ +create or replace type body ut_cursor_column as + + member procedure init( + self in out nocopy ut_cursor_column, + a_col_name varchar2, a_col_schema_name varchar2, + a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, + a_col_position integer, a_col_type varchar2, a_collection integer,a_access_path in varchar2, a_col_precision in integer, + a_col_scale integer + ) is + begin + self.parent_name := a_parent_name; --Name of the parent if its nested + self.hierarchy_level := a_hierarchy_level; --Hierarchy level + self.column_position := a_col_position; --Position of the column in cursor/ type + self.column_len := a_col_max_len; --length of column + self.column_precision := a_col_precision; + self.column_scale := a_col_scale; + self.column_name := TRIM( BOTH '''' FROM a_col_name); --name of the column + self.column_type_name := coalesce(a_col_type_name,a_col_type); --type name e.g. test_dummy_object or varchar2 + self.xml_valid_name := ut_utils.get_valid_xml_name(self.column_name); + self.display_path := case when a_access_path is null then + self.column_name + else + a_access_path||'/'||self.column_name + end; --Access path used for incldue exclude eg/ TEST_DUMMY_OBJECT/VARCHAR2 + self.access_path := case when a_access_path is null then + self.xml_valid_name + else + a_access_path||'/'||self.xml_valid_name + end; --Access path used for XMLTABLE query + self.filter_path := '/'||self.access_path; --Filter path will differ from access path in anydata type + self.transformed_name := case when length(self.xml_valid_name) > 30 then + '"'||ut_compound_data_helper.get_fixed_size_hash(self.parent_name||self.xml_valid_name)||'"' + when self.parent_name is null then + '"'||self.xml_valid_name||'"' + else + '"'||ut_compound_data_helper.get_fixed_size_hash(self.parent_name||self.xml_valid_name)||'"' + end; --when is nestd we need to hash name to make sure we dont exceed 30 char + self.column_type := a_col_type; --column type e.g. user_defined , varchar2 + self.column_schema := a_col_schema_name; -- schema name + self.is_sql_diffable := case + when lower(self.column_type) = 'user_defined_type' then + 0 + -- Due to bug in 11g/12.1 collection fails on varchar 4000+ + when (lower(self.column_type) in ('varchar2','char')) and (self.column_len > 4000) then + 0 + else + ut_utils.boolean_to_int(ut_compound_data_helper.is_sql_compare_allowed(self.column_type)) + end; --can we directly compare or do we need to hash value + self.is_collection := a_collection; + self.has_nested_col := case when lower(self.column_type) = 'user_defined_type' and self.is_collection = 0 then 1 else 0 end; + end; + + constructor function ut_cursor_column( self in out nocopy ut_cursor_column, + a_col_name varchar2, a_col_schema_name varchar2, + a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, + a_col_position integer, a_col_type in varchar2, a_collection integer,a_access_path in varchar2, a_col_precision in integer, + a_col_scale integer + ) return self as result is + begin + init(a_col_name, a_col_schema_name, a_col_type_name, a_col_max_len, a_parent_name,a_hierarchy_level, a_col_position, + a_col_type, a_collection,a_access_path,a_col_precision,a_col_scale); + return; + end; + + constructor function ut_cursor_column( self in out nocopy ut_cursor_column) return self as result is + begin + return; + end; +end; +/ diff --git a/source/expectations/data_values/ut_cursor_column.tps b/source/expectations/data_values/ut_cursor_column.tps index db9cbd3ae..da3c004f2 100644 --- a/source/expectations/data_values/ut_cursor_column.tps +++ b/source/expectations/data_values/ut_cursor_column.tps @@ -1,51 +1,52 @@ -create or replace type ut_cursor_column force authid current_user as object ( - /* - utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project - - Licensed under the Apache License, Version 2.0 (the "License"): - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - parent_name varchar2(4000), - access_path varchar2(4000), - display_path varchar2(4000), - has_nested_col number(1,0), - transformed_name varchar2(2000), - hierarchy_level number, - column_position number, - xml_valid_name varchar2(2000), - column_name varchar2(2000), - column_type varchar2(128), - column_type_name varchar2(128), - column_schema varchar2(128), - column_len integer, - column_precision integer, - column_scale integer, - is_sql_diffable number(1, 0), - is_collection number(1, 0), - - member procedure init(self in out nocopy ut_cursor_column, - a_col_name varchar2, a_col_schema_name varchar2, - a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, - a_col_position integer, a_col_type in varchar2, a_collection integer,a_access_path in varchar2, a_col_precision in integer, - a_col_scale integer), - - constructor function ut_cursor_column( self in out nocopy ut_cursor_column, - a_col_name varchar2, a_col_schema_name varchar2, - a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, - a_col_position integer, a_col_type in varchar2, a_collection integer, a_access_path in varchar2, a_col_precision in integer, - a_col_scale integer) - return self as result, - - constructor function ut_cursor_column( self in out nocopy ut_cursor_column) return self as result -) -/ +create or replace type ut_cursor_column authid current_user as object ( + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + parent_name varchar2(4000), + access_path varchar2(4000), + filter_path varchar2(4000), + display_path varchar2(4000), + has_nested_col number(1,0), + transformed_name varchar2(2000), + hierarchy_level number, + column_position number, + xml_valid_name varchar2(2000), + column_name varchar2(2000), + column_type varchar2(128), + column_type_name varchar2(128), + column_schema varchar2(128), + column_len integer, + column_precision integer, + column_scale integer, + is_sql_diffable number(1, 0), + is_collection number(1, 0), + + member procedure init(self in out nocopy ut_cursor_column, + a_col_name varchar2, a_col_schema_name varchar2, + a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, + a_col_position integer, a_col_type in varchar2, a_collection integer,a_access_path in varchar2, a_col_precision in integer, + a_col_scale integer), + + constructor function ut_cursor_column( self in out nocopy ut_cursor_column, + a_col_name varchar2, a_col_schema_name varchar2, + a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, + a_col_position integer, a_col_type in varchar2, a_collection integer, a_access_path in varchar2, a_col_precision in integer, + a_col_scale integer) + return self as result, + + constructor function ut_cursor_column( self in out nocopy ut_cursor_column) return self as result +) +/ diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb index 99e1d4edc..2a70a51dd 100644 --- a/source/expectations/data_values/ut_cursor_details.tpb +++ b/source/expectations/data_values/ut_cursor_details.tpb @@ -1,286 +1,257 @@ -create or replace type body ut_cursor_details as - - member function equals( a_other ut_cursor_details, a_match_options ut_matcher_options ) return boolean is - l_diffs integer; - begin - select count(1) into l_diffs - from table(self.cursor_columns_info) a - full outer join table(a_other.cursor_columns_info) e - on decode(a.parent_name,e.parent_name,1,0)= 1 - and a.column_name = e.column_name - and replace(a.column_type,'VARCHAR2','CHAR') = replace(e.column_type,'VARCHAR2','CHAR') - and ( a.column_position = e.column_position or a_match_options.columns_are_unordered_flag = 1 ) - where a.column_name is null or e.column_name is null; - return l_diffs = 0; - end; - - member procedure desc_compound_data( - self in out nocopy ut_cursor_details, a_compound_data anytype, - a_parent_name in varchar2, a_level in integer, a_access_path in varchar2 - ) is - l_idx pls_integer := 1; - l_elements_info ut_metadata.t_anytype_members_rec; - l_element_info ut_metadata.t_anytype_elem_info_rec; - l_is_collection boolean; - begin - l_elements_info := ut_metadata.get_anytype_members_info( a_compound_data ); - l_is_collection := ut_metadata.is_collection(l_elements_info.type_code); - if l_elements_info.elements_count is null then - l_element_info := ut_metadata.get_attr_elem_info( a_compound_data ); - self.cursor_columns_info.extend; - self.cursor_columns_info(cursor_columns_info.last) := - ut_cursor_column( - l_elements_info.type_name, - l_elements_info.schema_name, - null, - l_elements_info.length, - a_parent_name, - a_level, - l_idx, - ut_compound_data_helper.get_column_type_desc(l_elements_info.type_code,false), - ut_utils.boolean_to_int(l_is_collection), - a_access_path, - l_elements_info.precision, - l_elements_info.scale - ); - if l_element_info.attr_elt_type is not null then - desc_compound_data( - l_element_info.attr_elt_type, l_elements_info.type_name, - a_level + 1, a_access_path || '/' || l_elements_info.type_name - ); - end if; - else - while l_idx <= l_elements_info.elements_count loop - l_element_info := ut_metadata.get_attr_elem_info( a_compound_data, l_idx ); - - self.cursor_columns_info.extend; - self.cursor_columns_info(cursor_columns_info.last) := - ut_cursor_column( - l_element_info.attribute_name, - l_elements_info.schema_name, - null, - l_element_info.length, - a_parent_name, - a_level, - l_idx, - ut_compound_data_helper.get_column_type_desc(l_element_info.type_code,false), - ut_utils.boolean_to_int(l_is_collection), - a_access_path, - l_elements_info.precision, - l_elements_info.scale - ); - if l_element_info.attr_elt_type is not null then - desc_compound_data( - l_element_info.attr_elt_type, l_element_info.attribute_name, - a_level + 1, a_access_path || '/' || l_element_info.attribute_name - ); - end if; - l_idx := l_idx + 1; - end loop; - end if; - end; - - constructor function ut_cursor_details(self in out nocopy ut_cursor_details) return self as result is - begin - self.cursor_columns_info := ut_cursor_column_tab(); - return; - end; - - constructor function ut_cursor_details( - self in out nocopy ut_cursor_details, - a_cursor_number in number - ) return self as result is - l_columns_count pls_integer; - l_columns_desc dbms_sql.desc_tab3; - l_is_collection boolean; - l_hierarchy_level integer := 1; - begin - self.cursor_columns_info := ut_cursor_column_tab(); - dbms_sql.describe_columns3(a_cursor_number, l_columns_count, l_columns_desc); - - /** - * Due to a bug with object being part of cursor in ANYDATA scenario - * oracle fails to revert number to cursor. We ar using dbms_sql.close cursor to close it - * to avoid leaving open cursors behind. - * a_cursor := dbms_sql.to_refcursor(l_cursor_number); - **/ - for pos in 1 .. l_columns_count loop - l_is_collection := ut_metadata.is_collection( l_columns_desc(pos).col_schema_name, l_columns_desc(pos).col_type_name ); - self.cursor_columns_info.extend; - self.cursor_columns_info(self.cursor_columns_info.last) := - ut_cursor_column( - l_columns_desc(pos).col_name, - l_columns_desc(pos).col_schema_name, - l_columns_desc(pos).col_type_name, - l_columns_desc(pos).col_max_len, - null, - l_hierarchy_level, - pos, - ut_compound_data_helper.get_column_type_desc(l_columns_desc(pos).col_type,true), - ut_utils.boolean_to_int(l_is_collection), - null, - l_columns_desc(pos).col_precision, - l_columns_desc(pos).col_scale - ); - - if l_columns_desc(pos).col_type = dbms_sql.user_defined_type or l_is_collection then - desc_compound_data( - ut_metadata.get_user_defined_type( l_columns_desc(pos).col_schema_name, l_columns_desc(pos).col_type_name ), - l_columns_desc(pos).col_name, - l_hierarchy_level + 1, - l_columns_desc(pos).col_name - ); - end if; - end loop; - return; - end; - - member function contains_collection return boolean is - l_collection_elements number; - begin - select count(1) into l_collection_elements - from table(cursor_columns_info) c - where c.is_collection = 1 and rownum = 1; - return l_collection_elements > 0; - end; - - member function get_missing_join_by_columns( a_expected_columns ut_varchar2_list ) return ut_varchar2_list is - l_result ut_varchar2_list; - l_root varchar2(125); - begin - if self.is_anydata = 1 then - l_root := get_root; - end if; - --regexp_replace(c.access_path,'^\/?([^\/]+\/){1}') - select fl.column_value - bulk collect into l_result - from table(a_expected_columns) fl - where not exists ( - select 1 from table(self.cursor_columns_info) c - where regexp_like(c.access_path,'^/?'|| - case - when self.is_anydata = 1 then - l_root||'/'||trim (leading '/' from fl.column_value) - else - fl.column_value - end||'($|/.*)' - ) - ) - order by fl.column_value; - return l_result; - end; - - member procedure filter_columns(self in out nocopy ut_cursor_details, a_match_options ut_matcher_options) is - l_result ut_cursor_details := self; - l_column_tab ut_cursor_column_tab := ut_cursor_column_tab(); - l_column ut_cursor_column; - l_root varchar2(125); - c_xpath_extract_reg constant varchar2(50) := '^((/ROW/)|^(//)|^(/\*/))?(.*)'; - begin - if l_result.cursor_columns_info is not null then - - if self.is_anydata = 1 then - l_root := get_root; - end if; - - --limit columns to those on the include items minus exclude items - if a_match_options.include.items.count > 0 then - -- if include - exclude = 0 then keep all columns - if a_match_options.include.items != a_match_options.exclude.items then - with included_columns as ( - select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names - from table(a_match_options.include.items) - minus - select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names - from table(a_match_options.exclude.items) - ) - select value(x) - bulk collect into l_result.cursor_columns_info - from table(self.cursor_columns_info) x - where exists( - select 1 from included_columns f where regexp_like(x.access_path,'^/?'|| - case - when self.is_anydata = 1 then - l_root||'/'||trim(leading '/' from f.col_names) - else - f.col_names - end||'($|/.*)' - ) - ) - or x.hierarchy_level = case when self.is_anydata = 1 then 1 else 0 end ; - end if; - elsif a_match_options.exclude.items.count > 0 then - with excluded_columns as ( - select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names - from table(a_match_options.exclude.items) - ) - select value(x) - bulk collect into l_result.cursor_columns_info - from table(self.cursor_columns_info) x - where not exists( - select 1 from excluded_columns f where regexp_like(x.access_path,'^/?'|| - case - when self.is_anydata = 1 then - l_root||'/'||trim(leading '/' from f.col_names) - else - f.col_names - end||'($|/.*)' ) - ); - end if; - - --Rewrite column order after columns been excluded - for i in ( - select parent_name, access_path, display_path, has_nested_col, - transformed_name, hierarchy_level, - rownum as new_position, xml_valid_name, - column_name, column_type, column_type_name, column_schema, - column_len, column_precision ,column_scale ,is_sql_diffable, is_collection,value(x) col_info - from table(l_result.cursor_columns_info) x - order by x.column_position asc - ) loop - l_column := i.col_info; - l_column.column_position := i.new_position; - l_column_tab.extend; - l_column_tab(l_column_tab.last) := l_column; - end loop; - - l_result.cursor_columns_info := l_column_tab; - self := l_result; - end if; - end; - - member function get_xml_children(a_parent_name varchar2 := null) return xmltype is - l_result xmltype; - begin - select xmlagg(xmlelement(evalname t.column_name,t.column_type_name)) - into l_result - from table(self.cursor_columns_info) t - where (a_parent_name is null and parent_name is null and hierarchy_level = 1 and column_name is not null) - having count(*) > 0; - return l_result; - end; - - member procedure has_anydata(self in out nocopy ut_cursor_details, a_is_anydata in boolean :=false) is - begin - self.is_anydata := case when nvl(a_is_anydata,false) then 1 else 0 end; - end; - - member function has_anydata return boolean is - begin - return ut_utils.int_to_boolean(nvl(self.is_anydata,0)); - end; - - member function get_root return varchar2 is - l_root varchar2(250); - begin - if self.cursor_columns_info.count > 0 then - select x.access_path into l_root from table(self.cursor_columns_info) x - where x.hierarchy_level = 1; - else - l_root := null; - end if; - return l_root; - end; - -end; -/ +create or replace type body ut_cursor_details as + + member function equals( a_other ut_cursor_details, a_match_options ut_matcher_options ) return boolean is + l_diffs integer; + begin + select count(1) into l_diffs + from table(self.cursor_columns_info) a + full outer join table(a_other.cursor_columns_info) e + on decode(a.parent_name,e.parent_name,1,0)= 1 + and a.column_name = e.column_name + and replace(a.column_type,'VARCHAR2','CHAR') = replace(e.column_type,'VARCHAR2','CHAR') + and ( a.column_position = e.column_position or a_match_options.columns_are_unordered_flag = 1 ) + where a.column_name is null or e.column_name is null; + return l_diffs = 0; + end; + + member procedure desc_compound_data( + self in out nocopy ut_cursor_details, a_compound_data anytype, + a_parent_name in varchar2, a_level in integer, a_access_path in varchar2 + ) is + l_idx pls_integer := 1; + l_elements_info ut_metadata.t_anytype_members_rec; + l_element_info ut_metadata.t_anytype_elem_info_rec; + l_is_collection boolean; + begin + l_elements_info := ut_metadata.get_anytype_members_info( a_compound_data ); + l_is_collection := ut_metadata.is_collection(l_elements_info.type_code); + if l_elements_info.elements_count is null then + l_element_info := ut_metadata.get_attr_elem_info( a_compound_data ); + self.cursor_columns_info.extend; + self.cursor_columns_info(cursor_columns_info.last) := + ut_cursor_column( + l_elements_info.type_name, + l_elements_info.schema_name, + null, + l_elements_info.length, + a_parent_name, + a_level, + l_idx, + ut_compound_data_helper.get_column_type_desc(l_elements_info.type_code,false), + ut_utils.boolean_to_int(l_is_collection), + a_access_path, + l_elements_info.precision, + l_elements_info.scale + ); + if l_element_info.attr_elt_type is not null then + desc_compound_data( + l_element_info.attr_elt_type, l_elements_info.type_name, + a_level + 1, a_access_path || '/' || l_elements_info.type_name + ); + end if; + else + while l_idx <= l_elements_info.elements_count loop + l_element_info := ut_metadata.get_attr_elem_info( a_compound_data, l_idx ); + + self.cursor_columns_info.extend; + self.cursor_columns_info(cursor_columns_info.last) := + ut_cursor_column( + l_element_info.attribute_name, + l_elements_info.schema_name, + null, + l_element_info.length, + a_parent_name, + a_level, + l_idx, + ut_compound_data_helper.get_column_type_desc(l_element_info.type_code,false), + ut_utils.boolean_to_int(l_is_collection), + a_access_path, + l_elements_info.precision, + l_elements_info.scale + ); + if l_element_info.attr_elt_type is not null then + desc_compound_data( + l_element_info.attr_elt_type, l_element_info.attribute_name, + a_level + 1, a_access_path || '/' || l_element_info.attribute_name + ); + end if; + l_idx := l_idx + 1; + end loop; + end if; + end; + + constructor function ut_cursor_details(self in out nocopy ut_cursor_details) return self as result is + begin + self.cursor_columns_info := ut_cursor_column_tab(); + return; + end; + + constructor function ut_cursor_details( + self in out nocopy ut_cursor_details, + a_cursor_number in number + ) return self as result is + l_columns_count pls_integer; + l_columns_desc dbms_sql.desc_tab3; + l_is_collection boolean; + l_hierarchy_level integer := 1; + begin + self.cursor_columns_info := ut_cursor_column_tab(); + self.is_anydata := 0; + dbms_sql.describe_columns3(a_cursor_number, l_columns_count, l_columns_desc); + + /** + * Due to a bug with object being part of cursor in ANYDATA scenario + * oracle fails to revert number to cursor. We ar using dbms_sql.close cursor to close it + * to avoid leaving open cursors behind. + * a_cursor := dbms_sql.to_refcursor(l_cursor_number); + **/ + for pos in 1 .. l_columns_count loop + l_is_collection := ut_metadata.is_collection( l_columns_desc(pos).col_schema_name, l_columns_desc(pos).col_type_name ); + self.cursor_columns_info.extend; + self.cursor_columns_info(self.cursor_columns_info.last) := + ut_cursor_column( + l_columns_desc(pos).col_name, + l_columns_desc(pos).col_schema_name, + l_columns_desc(pos).col_type_name, + l_columns_desc(pos).col_max_len, + null, + l_hierarchy_level, + pos, + ut_compound_data_helper.get_column_type_desc(l_columns_desc(pos).col_type,true), + ut_utils.boolean_to_int(l_is_collection), + null, + l_columns_desc(pos).col_precision, + l_columns_desc(pos).col_scale + ); + + if l_columns_desc(pos).col_type = dbms_sql.user_defined_type or l_is_collection then + desc_compound_data( + ut_metadata.get_user_defined_type( l_columns_desc(pos).col_schema_name, l_columns_desc(pos).col_type_name ), + l_columns_desc(pos).col_name, + l_hierarchy_level + 1, + l_columns_desc(pos).col_name + ); + end if; + end loop; + return; + end; + + member function contains_collection return boolean is + l_collection_elements number; + begin + select count(1) into l_collection_elements + from table(cursor_columns_info) c + where c.is_collection = 1 and rownum = 1; + return l_collection_elements > 0; + end; + + member function get_missing_join_by_columns( a_expected_columns ut_varchar2_list ) return ut_varchar2_list is + l_result ut_varchar2_list; + begin + --regexp_replace(c.access_path,'^\/?([^\/]+\/){1}') + select fl.column_value + bulk collect into l_result + from table(a_expected_columns) fl + where not exists ( + select 1 from table(self.cursor_columns_info) c + where regexp_like(c.filter_path,'^/?'||fl.column_value||'($|/.*)' ) + ) + order by fl.column_value; + return l_result; + end; + + member procedure filter_columns(self in out nocopy ut_cursor_details, a_match_options ut_matcher_options) is + l_result ut_cursor_details := self; + l_column_tab ut_cursor_column_tab := ut_cursor_column_tab(); + l_column ut_cursor_column; + c_xpath_extract_reg constant varchar2(50) := '^((/ROW/)|^(//)|^(/\*/))?(.*)'; + begin + if l_result.cursor_columns_info is not null then + + --limit columns to those on the include items minus exclude items + if a_match_options.include.items.count > 0 then + -- if include - exclude = 0 then keep all columns + if a_match_options.include.items != a_match_options.exclude.items then + with included_columns as ( + select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names + from table(a_match_options.include.items) + minus + select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names + from table(a_match_options.exclude.items) + ) + select value(x) + bulk collect into l_result.cursor_columns_info + from table(self.cursor_columns_info) x + where exists( + select 1 from included_columns f where regexp_like(x.filter_path,'^/?'||f.col_names||'($|/.*)' ) + ) + or x.hierarchy_level = case when self.is_anydata = 1 then 1 else 0 end ; + end if; + elsif a_match_options.exclude.items.count > 0 then + with excluded_columns as ( + select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names + from table(a_match_options.exclude.items) + ) + select value(x) + bulk collect into l_result.cursor_columns_info + from table(self.cursor_columns_info) x + where not exists( + select 1 from excluded_columns f where regexp_like(x.filter_path,'^/?'||f.col_names||'($|/.*)' ) + ); + end if; + + --Rewrite column order after columns been excluded + for i in ( + select parent_name, access_path, display_path, has_nested_col, + transformed_name, hierarchy_level, + rownum as new_position, xml_valid_name, + column_name, column_type, column_type_name, column_schema, + column_len, column_precision ,column_scale ,is_sql_diffable, is_collection,value(x) col_info + from table(l_result.cursor_columns_info) x + order by x.column_position asc + ) loop + l_column := i.col_info; + l_column.column_position := i.new_position; + l_column_tab.extend; + l_column_tab(l_column_tab.last) := l_column; + end loop; + + l_result.cursor_columns_info := l_column_tab; + self := l_result; + end if; + end; + + member function get_xml_children(a_parent_name varchar2 := null) return xmltype is + l_result xmltype; + begin + select xmlagg(xmlelement(evalname t.column_name,t.column_type_name)) + into l_result + from table(self.cursor_columns_info) t + where (a_parent_name is null and parent_name is null and hierarchy_level = 1 and column_name is not null) + having count(*) > 0; + return l_result; + end; + + member function get_root return varchar2 is + l_root varchar2(250); + begin + if self.cursor_columns_info.count > 0 then + select x.access_path into l_root from table(self.cursor_columns_info) x + where x.hierarchy_level = 1; + else + l_root := null; + end if; + return l_root; + end; + + member procedure strip_root_from_anydata(self in out nocopy ut_cursor_details) is + l_root varchar2(250) := get_root(); + begin + self.is_anydata := 1; + for i in 1..cursor_columns_info.count loop + self.cursor_columns_info(i).filter_path := ut_utils.strip_prefix(self.cursor_columns_info(i).access_path,l_root); + end loop; + end; + +end; +/ diff --git a/source/expectations/data_values/ut_cursor_details.tps b/source/expectations/data_values/ut_cursor_details.tps index ce5aefbe7..e6c80a3b5 100644 --- a/source/expectations/data_values/ut_cursor_details.tps +++ b/source/expectations/data_values/ut_cursor_details.tps @@ -1,42 +1,41 @@ -create or replace type ut_cursor_details force authid current_user as object ( - /* - utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project - - Licensed under the Apache License, Version 2.0 (the "License"): - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - cursor_columns_info ut_cursor_column_tab, - - /*if type is anydata we need to skip level 1 on joinby / inlude / exclude as its artificial cursor*/ - is_anydata number(1,0), - constructor function ut_cursor_details(self in out nocopy ut_cursor_details) return self as result, - constructor function ut_cursor_details( - self in out nocopy ut_cursor_details,a_cursor_number in number - ) return self as result, - member function equals(a_other ut_cursor_details, a_match_options ut_matcher_options) return boolean, - member procedure desc_compound_data( - self in out nocopy ut_cursor_details, - a_compound_data anytype, - a_parent_name in varchar2, - a_level in integer, - a_access_path in varchar2 - ), - member function contains_collection return boolean, - member function get_missing_join_by_columns( a_expected_columns ut_varchar2_list ) return ut_varchar2_list, - member procedure filter_columns(self in out nocopy ut_cursor_details, a_match_options ut_matcher_options), - member function get_xml_children(a_parent_name varchar2 := null) return xmltype, - member procedure has_anydata(self in out nocopy ut_cursor_details, a_is_anydata in boolean := false), - member function has_anydata return boolean, - member function get_root return varchar2 -) -/ +create or replace type ut_cursor_details authid current_user as object ( + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + cursor_columns_info ut_cursor_column_tab, + + /*if type is anydata we need to skip level 1 on joinby / inlude / exclude as its artificial cursor*/ + is_anydata number(1,0), + constructor function ut_cursor_details(self in out nocopy ut_cursor_details) return self as result, + constructor function ut_cursor_details( + self in out nocopy ut_cursor_details,a_cursor_number in number + ) return self as result, + member function equals(a_other ut_cursor_details, a_match_options ut_matcher_options) return boolean, + member procedure desc_compound_data( + self in out nocopy ut_cursor_details, + a_compound_data anytype, + a_parent_name in varchar2, + a_level in integer, + a_access_path in varchar2 + ), + member function contains_collection return boolean, + member function get_missing_join_by_columns( a_expected_columns ut_varchar2_list ) return ut_varchar2_list, + member procedure filter_columns(self in out nocopy ut_cursor_details, a_match_options ut_matcher_options), + member function get_xml_children(a_parent_name varchar2 := null) return xmltype, + member function get_root return varchar2, + member procedure strip_root_from_anydata(self in out nocopy ut_cursor_details) +) +/ diff --git a/source/expectations/data_values/ut_data_value_anydata.tpb b/source/expectations/data_values/ut_data_value_anydata.tpb index fa59ad67c..808e52197 100644 --- a/source/expectations/data_values/ut_data_value_anydata.tpb +++ b/source/expectations/data_values/ut_data_value_anydata.tpb @@ -1,145 +1,143 @@ -create or replace type body ut_data_value_anydata as - /* - utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project - - Licensed under the Apache License, Version 2.0 (the "License"): - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - - overriding member function get_object_info return varchar2 is - begin - return self.data_type || case when self.compound_type = 'collection' then ' [ count = '||self.elements_count||' ]' else null end; - end; - - member function get_extract_path(a_data_value anydata) return varchar2 is - l_path varchar2(10); - begin - if self.compound_type = 'object' then - l_path := '/*/*'; - else - case when ut_metadata.has_collection_members(a_data_value) then - l_path := '/*/*'; - else - l_path := '/*'; - end case; - end if; - return l_path; - end; - - member function get_cursor_sql_from_anydata(a_data_value anydata) return varchar2 is - l_cursor_sql varchar2(32767); - begin - l_cursor_sql := ' - declare - l_data '||self.data_type||'; - l_value anydata := :a_value; - l_status integer; - l_tmp_refcursor sys_refcursor; - begin - l_status := l_value.get'||self.compound_type||'(l_data); '|| - case when self.compound_type = 'collection' then - q'[ open :l_tmp_refcursor for select value(x) as "]'|| - ut_metadata.get_object_name(ut_metadata.get_collection_element(a_data_value))|| - q'[" from table(l_data) x;]' - else - q'[ open :l_tmp_refcursor for select l_data as "]'||ut_metadata.get_object_name(self.data_type)|| - q'[" from dual;]' - end || - 'end;'; - return l_cursor_sql; - end; - - member procedure init(self in out nocopy ut_data_value_anydata, a_value anydata) is - l_refcursor sys_refcursor; - l_ctx number; - l_ut_owner varchar2(250) := ut_utils.ut_owner; - cursor_not_open exception; - l_cursor_number number; - l_anydata_sql varchar2(32767); - begin - self.data_type := ut_metadata.get_anydata_typename(a_value); - self.compound_type := get_instance(a_value); - self.is_data_null := ut_metadata.is_anytype_null(a_value,self.compound_type); - self.data_id := sys_guid(); - self.self_type := $$plsql_unit; - self.cursor_details := ut_cursor_details(); - - ut_compound_data_helper.cleanup_diff; - - if not self.is_null() then - self.extract_path := get_extract_path(a_value); - l_anydata_sql := get_cursor_sql_from_anydata(a_value); - execute immediate l_anydata_sql using in a_value, in out l_refcursor; - if l_refcursor%isopen then - self.extract_cursor(l_refcursor); - l_cursor_number := dbms_sql.to_cursor_number(l_refcursor); - self.cursor_details := ut_cursor_details(l_cursor_number); - self.cursor_details.has_anydata(true); - dbms_sql.close_cursor(l_cursor_number); - elsif not l_refcursor%isopen then - raise cursor_not_open; - end if; - end if; - exception - when cursor_not_open then - raise_application_error(-20155, 'Cursor is not open'); - when others then - if l_refcursor%isopen then - close l_refcursor; - end if; - raise; - end; - - member function get_instance(a_data_value anydata) return varchar2 is - l_result varchar2(30); - begin - l_result := ut_metadata.get_anydata_compound_type(a_data_value); - if l_result not in ('object','collection') then - raise_application_error(-20000, 'Data type '||a_data_value.gettypename||' in ANYDATA is not supported by utPLSQL'); - end if; - return l_result; - end; - - constructor function ut_data_value_anydata(self in out nocopy ut_data_value_anydata, a_value anydata) return self as result - is - begin - init(a_value); - return; - end; - - overriding member function compare_implementation( - a_other ut_data_value, - a_match_options ut_matcher_options, - a_inclusion_compare boolean := false, - a_is_negated boolean := false - ) return integer is - l_result integer := 0; - begin - if not a_other is of (ut_data_value_anydata) then - raise value_error; - end if; - l_result := l_result + (self as ut_data_value_refcursor).compare_implementation(a_other,a_match_options,a_inclusion_compare,a_is_negated); - return l_result; - end; - - overriding member function is_empty return boolean is - begin - if self.compound_type = 'collection' then - return self.elements_count = 0; - else - raise value_error; - end if; - end; - -end; -/ +create or replace type body ut_data_value_anydata as + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + overriding member function get_object_info return varchar2 is + begin + return self.data_type || case when self.compound_type = 'collection' then ' [ count = '||self.elements_count||' ]' else null end; + end; + + member function get_extract_path(a_data_value anydata) return varchar2 is + l_path varchar2(10); + begin + if self.compound_type = 'object' then + l_path := '/*/*'; + else + case when ut_metadata.has_collection_members(a_data_value) then + l_path := '/*/*'; + else + l_path := '/*'; + end case; + end if; + return l_path; + end; + + member function get_cursor_sql_from_anydata(a_data_value anydata) return varchar2 is + l_cursor_sql varchar2(32767); + begin + l_cursor_sql := ' + declare + l_data '||self.data_type||'; + l_value anydata := :a_value; + l_status integer; + l_tmp_refcursor sys_refcursor; + begin + l_status := l_value.get'||self.compound_type||'(l_data); '|| + case when self.compound_type = 'collection' then + q'[ open :l_tmp_refcursor for select value(x) as "]'|| + ut_metadata.get_object_name(ut_metadata.get_collection_element(a_data_value))|| + q'[" from table(l_data) x;]' + else + q'[ open :l_tmp_refcursor for select l_data as "]'||ut_metadata.get_object_name(self.data_type)|| + q'[" from dual;]' + end || + 'end;'; + return l_cursor_sql; + end; + + member procedure init(self in out nocopy ut_data_value_anydata, a_value anydata) is + l_refcursor sys_refcursor; + cursor_not_open exception; + l_cursor_number number; + l_anydata_sql varchar2(32767); + begin + self.data_type := ut_metadata.get_anydata_typename(a_value); + self.compound_type := get_instance(a_value); + self.is_data_null := ut_metadata.is_anytype_null(a_value,self.compound_type); + self.data_id := sys_guid(); + self.self_type := $$plsql_unit; + self.cursor_details := ut_cursor_details(); + + ut_compound_data_helper.cleanup_diff; + + if not self.is_null() then + self.extract_path := get_extract_path(a_value); + l_anydata_sql := get_cursor_sql_from_anydata(a_value); + execute immediate l_anydata_sql using in a_value, in out l_refcursor; + if l_refcursor%isopen then + self.extract_cursor(l_refcursor); + l_cursor_number := dbms_sql.to_cursor_number(l_refcursor); + self.cursor_details := ut_cursor_details(l_cursor_number); + self.cursor_details.strip_root_from_anydata; + dbms_sql.close_cursor(l_cursor_number); + elsif not l_refcursor%isopen then + raise cursor_not_open; + end if; + end if; + exception + when cursor_not_open then + raise_application_error(-20155, 'Cursor is not open'); + when others then + if l_refcursor%isopen then + close l_refcursor; + end if; + raise; + end; + + member function get_instance(a_data_value anydata) return varchar2 is + l_result varchar2(30); + begin + l_result := ut_metadata.get_anydata_compound_type(a_data_value); + if l_result not in ('object','collection') then + raise_application_error(-20000, 'Data type '||a_data_value.gettypename||' in ANYDATA is not supported by utPLSQL'); + end if; + return l_result; + end; + + constructor function ut_data_value_anydata(self in out nocopy ut_data_value_anydata, a_value anydata) return self as result + is + begin + init(a_value); + return; + end; + + overriding member function compare_implementation( + a_other ut_data_value, + a_match_options ut_matcher_options, + a_inclusion_compare boolean := false, + a_is_negated boolean := false + ) return integer is + l_result integer := 0; + begin + if not a_other is of (ut_data_value_anydata) then + raise value_error; + end if; + l_result := l_result + (self as ut_data_value_refcursor).compare_implementation(a_other,a_match_options,a_inclusion_compare,a_is_negated); + return l_result; + end; + + overriding member function is_empty return boolean is + begin + if self.compound_type = 'collection' then + return self.elements_count = 0; + else + raise value_error; + end if; + end; + +end; +/ diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 2aac626e3..b93158cf1 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -1,399 +1,398 @@ -create or replace type body ut_data_value_refcursor as - /* - utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project - - Licensed under the Apache License, Version 2.0 (the "License"): - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - - constructor function ut_data_value_refcursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) - return self as result is - begin - init(a_value); - return; - end; - - member procedure extract_cursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) - is - c_bulk_rows constant integer := 10000; - l_cursor sys_refcursor := a_value; - l_ctx number; - l_xml xmltype; - l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_set_id integer := 0; - l_elements_count number := 0; - begin - -- We use DBMS_XMLGEN in order to: - -- 1) be able to process data in bulks (set of rows) - -- 2) be able to influence the ROWSET/ROW tags - -- 3) be able to influence the way NULL values are handled (empty TAG) - -- 4) be able to influence the way TIMESTAMP is formatted. - -- Due to Oracle feature/bug, it is not possible to change the DATE formatting of cursor data - -- AFTER the cursor was opened. - -- The only solution for this is to change NLS settings before opening the cursor. - -- - -- This would work fine if we could use DBMS_XMLGEN.restartQuery. - -- The restartQuery fails however if PLSQL variables of TIMESTAMP/INTERVAL or CLOB/BLOB are used. - ut_expectation_processor.set_xml_nls_params(); - l_ctx := dbms_xmlgen.newContext(l_cursor); - dbms_xmlgen.setNullHandling(l_ctx, dbms_xmlgen.empty_tag); - dbms_xmlgen.setMaxRows(l_ctx, c_bulk_rows); - loop - l_xml := dbms_xmlgen.getxmltype(l_ctx); - exit when dbms_xmlgen.getNumRowsProcessed(l_ctx) = 0; - --Bug in oracle 12.2+ where XML binary storage trimming insignificant whitespaces. - $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then - l_xml := xmltype( replace(l_xml.getClobVal(),' 0 then - ut_utils.append_to_clob( l_result, self.cursor_details.get_xml_children().getclobval() ); - end if; - ut_utils.append_to_clob(l_result,chr(10)||(self as ut_compound_data_value).to_string()); - l_result_string := ut_utils.to_string(l_result,null); - dbms_lob.freetemporary(l_result); - end if; - return l_result_string; - end; - - overriding member function diff( a_other ut_data_value, a_match_options ut_matcher_options ) return varchar2 is - l_result clob; - l_results ut_utils.t_clob_tab := ut_utils.t_clob_tab(); - l_result_string varchar2(32767); - l_other ut_data_value_refcursor; - l_self ut_data_value_refcursor := self; - l_column_diffs ut_compound_data_helper.tt_column_diffs; - - l_other_cols ut_cursor_column_tab; - l_self_cols ut_cursor_column_tab; - - l_act_missing_pk ut_varchar2_list := ut_varchar2_list(); - l_exp_missing_pk ut_varchar2_list := ut_varchar2_list(); - - c_max_rows integer := ut_utils.gc_diff_max_rows; - l_diff_id ut_compound_data_helper.t_hash; - l_diff_row_count integer; - l_row_diffs ut_compound_data_helper.tt_row_diffs; - l_message varchar2(32767); - - function get_col_diff_text(a_col ut_compound_data_helper.t_column_diffs) return varchar2 is - begin - return - case a_col.diff_type - when '-' then - ' Column <'||a_col.expected_name||'> [data-type: '||a_col.expected_type||'] is missing. Expected column position: '||a_col.expected_pos||'.' - when '+' then - ' Column <'||a_col.actual_name||'> [position: '||a_col.actual_pos||', data-type: '||a_col.actual_type||'] is not expected in results.' - when 't' then - ' Column <'||a_col.actual_name||'> data-type is invalid. Expected: '||a_col.expected_type||',' ||' actual: '||a_col.actual_type||'.' - when 'p' then - ' Column <'||a_col.actual_name||'> is misplaced. Expected position: '||a_col.expected_pos||',' ||' actual position: '||a_col.actual_pos||'.' - end; - end; - - function remove_incomparable_cols( - a_cursor_details ut_cursor_column_tab, a_column_diffs ut_compound_data_helper.tt_column_diffs - ) return ut_cursor_column_tab is - l_missing_cols ut_varchar2_list := ut_varchar2_list(); - l_result ut_cursor_column_tab; - begin - for i in 1 .. a_column_diffs.count loop - if a_column_diffs(i).diff_type in ('-','+') then - l_missing_cols.extend; - l_missing_cols(l_missing_cols.last) := coalesce(a_column_diffs(i).expected_name, a_column_diffs(i).actual_name); - end if; - end loop; - select value(i) bulk collect into l_result - from table(a_cursor_details) i - where i.access_path not in ( - select c.column_value - from table(l_missing_cols) c - ); - return l_result; - end; - - function get_diff_message (a_row_diff ut_compound_data_helper.t_row_diffs, a_is_unordered boolean) return varchar2 is - begin - if a_is_unordered then - if a_row_diff.pk_value is not null then - return ' PK '||a_row_diff.pk_value||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; - else - return rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; - end if; - else - return ' Row No. '||a_row_diff.rn||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; - end if; - end; - - begin - if not a_other is of (ut_data_value_refcursor) then - raise value_error; - end if; - l_other := treat(a_other as ut_data_value_refcursor); - l_other.cursor_details.filter_columns(a_match_options); - l_self.cursor_details.filter_columns(a_match_options); - - l_other_cols := l_other.cursor_details.cursor_columns_info; - l_self_cols := l_self.cursor_details.cursor_columns_info; - - dbms_lob.createtemporary(l_result,true); - --diff columns - if not l_self.is_null and not l_other.is_null then - l_column_diffs := ut_compound_data_helper.get_columns_diff( - l_self.cursor_details.cursor_columns_info, - l_other.cursor_details.cursor_columns_info, - a_match_options.ordered_columns() - ); - - if l_column_diffs.count > 0 then - ut_utils.append_to_clob(l_result,chr(10) || 'Columns:' || chr(10)); - l_other_cols := remove_incomparable_cols( l_other_cols, l_column_diffs ); - l_self_cols := remove_incomparable_cols( l_self_cols, l_column_diffs ); - for i in 1 .. l_column_diffs.count loop - l_results.extend; - l_results(l_results.last) := get_col_diff_text(l_column_diffs(i)); - end loop; - ut_utils.append_to_clob(l_result, l_results); - end if; - end if; - - --check for missing pk - if a_match_options.join_by.items.count > 0 then - l_act_missing_pk := l_other.cursor_details.get_missing_join_by_columns( a_match_options.join_by.items ); - l_exp_missing_pk := l_self.cursor_details.get_missing_join_by_columns( a_match_options.join_by.items ); - end if; - - --diff rows and row elements if the pk is not missing - if l_act_missing_pk.count + l_exp_missing_pk.count = 0 then - l_diff_id := ut_compound_data_helper.get_hash( l_self.data_id || l_other.data_id ); - - -- First tell how many rows are different - l_diff_row_count := ut_compound_data_helper.get_rows_diff_count; - if l_diff_row_count > 0 then - l_row_diffs := ut_compound_data_helper.get_rows_diff_by_sql( - l_self_cols, l_other_cols, l_self.data_id, l_other.data_id, - l_diff_id, - case - when - l_self.cursor_details.is_anydata = 1 then ut_utils.add_prefix(a_match_options.join_by.items, l_self.cursor_details.get_root) - else - a_match_options.join_by.items - end, - a_match_options.unordered,a_match_options.ordered_columns(), self.extract_path - ); - l_message := chr(10) - ||'Rows: [ ' || l_diff_row_count ||' differences' - || case when l_diff_row_count > c_max_rows and l_row_diffs.count > 0 then ', showing first '||c_max_rows end - ||' ]'||chr(10)|| case when l_row_diffs.count = 0 then ' All rows are different as the columns are not matching.' else null end; - ut_utils.append_to_clob( l_result, l_message ); - l_results := ut_utils.t_clob_tab(); - for i in 1 .. l_row_diffs.count loop - l_results.extend; - l_results(l_results.last) := get_diff_message(l_row_diffs(i),a_match_options.unordered); - end loop; - ut_utils.append_to_clob(l_result,l_results); - else - l_message:= chr(10)||'Rows: [ all different ]'||chr(10)||' All rows are different as the columns position is not matching.'; - ut_utils.append_to_clob( l_result, l_message ); - end if; - else - ut_utils.append_to_clob(l_result,chr(10) || 'Unable to join sets:' || chr(10)); - - for i in 1 .. l_exp_missing_pk.count loop - ut_utils.append_to_clob(l_result, ' Join key '||l_exp_missing_pk(i)||' does not exists in expected'||chr(10)); - end loop; - - for i in 1 .. l_act_missing_pk.count loop - ut_utils.append_to_clob(l_result, ' Join key '||l_act_missing_pk(i)||' does not exists in actual'||chr(10)); - end loop; - - if l_self.cursor_details.contains_collection() or l_other.cursor_details.contains_collection() then - ut_utils.append_to_clob(l_result,' Please make sure that your join clause is not refferring to collection element'|| chr(10)); - end if; - - end if; - - l_result_string := ut_utils.to_string(l_result,null); - dbms_lob.freetemporary(l_result); - return l_result_string; - end; - - overriding member function compare_implementation(a_other ut_data_value) return integer is - begin - return compare_implementation( a_other, null ); - end; - - member function compare_implementation( - a_other ut_data_value, - a_match_options ut_matcher_options, - a_inclusion_compare boolean := false, - a_is_negated boolean := false - ) return integer is - l_result integer := 0; - l_self ut_data_value_refcursor := self; - l_other ut_data_value_refcursor; - l_diff_cursor_text clob; - - function compare_data( - a_self ut_data_value_refcursor, - a_other ut_data_value_refcursor, - a_diff_cursor_text clob - ) return integer is - l_diff_id ut_compound_data_helper.t_hash; - l_result integer; - --We will start with number od differences being displayed. - l_cursor sys_refcursor; - l_diff_tab ut_compound_data_helper.t_diff_tab; - l_diif_rowcount integer :=0; - begin - l_diff_id := ut_compound_data_helper.get_hash(a_self.data_id||a_other.data_id); - - begin - l_cursor := ut_compound_data_helper.get_compare_cursor(a_diff_cursor_text, - a_self.data_id, a_other.data_id); - --fetch and save rows for display of diff - fetch l_cursor bulk collect into l_diff_tab limit ut_utils.gc_diff_max_rows; - exception when others then - if l_cursor%isopen then - close l_cursor; - end if; - raise; - end; - - ut_compound_data_helper.insert_diffs_result( l_diff_tab, l_diff_id ); - --fetch rows for count only - loop - exit when l_diff_tab.count = 0; - l_diif_rowcount := l_diif_rowcount + l_diff_tab.count; - fetch l_cursor bulk collect into l_diff_tab limit ut_utils.gc_bc_fetch_limit; - end loop; - - ut_compound_data_helper.set_rows_diff(l_diif_rowcount); - - --result is OK only if both are same - if l_diif_rowcount = 0 and a_self.is_null = a_other.is_null then - l_result := 0; - else - l_result := 1; - end if; - close l_cursor; - return l_result; - end; - begin - if not a_other is of (ut_data_value_refcursor) then - raise value_error; - end if; - - l_other := treat(a_other as ut_data_value_refcursor); - l_other.cursor_details.filter_columns( a_match_options ); - l_self.cursor_details.filter_columns( a_match_options ); - - if a_match_options.join_by.items.count > 0 then - l_result := - l_self.cursor_details.get_missing_join_by_columns( a_match_options.join_by.items ).count - + l_other.cursor_details.get_missing_join_by_columns( a_match_options.join_by.items ).count; - end if; - - if l_result = 0 then - if not l_self.is_null() and not l_other.is_null() and not l_self.cursor_details.equals( l_other.cursor_details, a_match_options ) then - l_result := 1; - end if; - - l_diff_cursor_text := ut_compound_data_helper.gen_compare_sql( - l_other, - a_match_options.join_by.items, - a_match_options.unordered(), - a_inclusion_compare, - a_is_negated - ); - l_result := l_result + compare_data( l_self, l_other, l_diff_cursor_text ); - end if; - return l_result; - end; - - overriding member function is_empty return boolean is - begin - return self.elements_count = 0; - end; - -end; -/ +create or replace type body ut_data_value_refcursor as + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + constructor function ut_data_value_refcursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) + return self as result is + begin + init(a_value); + return; + end; + + member procedure extract_cursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) + is + c_bulk_rows constant integer := 10000; + l_cursor sys_refcursor := a_value; + l_ctx number; + l_xml xmltype; + l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_set_id integer := 0; + l_elements_count number := 0; + begin + -- We use DBMS_XMLGEN in order to: + -- 1) be able to process data in bulks (set of rows) + -- 2) be able to influence the ROWSET/ROW tags + -- 3) be able to influence the way NULL values are handled (empty TAG) + -- 4) be able to influence the way TIMESTAMP is formatted. + -- Due to Oracle feature/bug, it is not possible to change the DATE formatting of cursor data + -- AFTER the cursor was opened. + -- The only solution for this is to change NLS settings before opening the cursor. + -- + -- This would work fine if we could use DBMS_XMLGEN.restartQuery. + -- The restartQuery fails however if PLSQL variables of TIMESTAMP/INTERVAL or CLOB/BLOB are used. + ut_expectation_processor.set_xml_nls_params(); + l_ctx := dbms_xmlgen.newContext(l_cursor); + dbms_xmlgen.setNullHandling(l_ctx, dbms_xmlgen.empty_tag); + dbms_xmlgen.setMaxRows(l_ctx, c_bulk_rows); + loop + l_xml := dbms_xmlgen.getxmltype(l_ctx); + exit when dbms_xmlgen.getNumRowsProcessed(l_ctx) = 0; + --Bug in oracle 12.2+ where XML binary storage trimming insignificant whitespaces. + $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then + l_xml := xmltype( replace(l_xml.getClobVal(),' 0 then + ut_utils.append_to_clob( l_result, self.cursor_details.get_xml_children().getclobval() ); + end if; + ut_utils.append_to_clob(l_result,chr(10)||(self as ut_compound_data_value).to_string()); + l_result_string := ut_utils.to_string(l_result,null); + dbms_lob.freetemporary(l_result); + end if; + return l_result_string; + end; + + overriding member function diff( a_other ut_data_value, a_match_options ut_matcher_options ) return varchar2 is + l_result clob; + l_results ut_utils.t_clob_tab := ut_utils.t_clob_tab(); + l_result_string varchar2(32767); + l_other ut_data_value_refcursor; + l_self ut_data_value_refcursor := self; + l_column_diffs ut_compound_data_helper.tt_column_diffs; + + l_other_cols ut_cursor_column_tab; + l_self_cols ut_cursor_column_tab; + + l_act_missing_pk ut_varchar2_list := ut_varchar2_list(); + l_exp_missing_pk ut_varchar2_list := ut_varchar2_list(); + + c_max_rows integer := ut_utils.gc_diff_max_rows; + l_diff_id ut_compound_data_helper.t_hash; + l_diff_row_count integer; + l_row_diffs ut_compound_data_helper.tt_row_diffs; + l_message varchar2(32767); + + function get_col_diff_text(a_col ut_compound_data_helper.t_column_diffs) return varchar2 is + begin + return + case a_col.diff_type + when '-' then + ' Column <'||a_col.expected_name||'> [data-type: '||a_col.expected_type||'] is missing. Expected column position: '||a_col.expected_pos||'.' + when '+' then + ' Column <'||a_col.actual_name||'> [position: '||a_col.actual_pos||', data-type: '||a_col.actual_type||'] is not expected in results.' + when 't' then + ' Column <'||a_col.actual_name||'> data-type is invalid. Expected: '||a_col.expected_type||',' ||' actual: '||a_col.actual_type||'.' + when 'p' then + ' Column <'||a_col.actual_name||'> is misplaced. Expected position: '||a_col.expected_pos||',' ||' actual position: '||a_col.actual_pos||'.' + end; + end; + + function remove_incomparable_cols( + a_cursor_details ut_cursor_column_tab, a_column_diffs ut_compound_data_helper.tt_column_diffs + ) return ut_cursor_column_tab is + l_missing_cols ut_varchar2_list := ut_varchar2_list(); + l_result ut_cursor_column_tab; + begin + for i in 1 .. a_column_diffs.count loop + if a_column_diffs(i).diff_type in ('-','+') then + l_missing_cols.extend; + l_missing_cols(l_missing_cols.last) := coalesce(a_column_diffs(i).expected_name, a_column_diffs(i).actual_name); + end if; + end loop; + select value(i) bulk collect into l_result + from table(a_cursor_details) i + where i.access_path not in ( + select c.column_value + from table(l_missing_cols) c + ); + return l_result; + end; + + function get_diff_message (a_row_diff ut_compound_data_helper.t_row_diffs, a_is_unordered boolean) return varchar2 is + begin + if a_is_unordered then + if a_row_diff.pk_value is not null then + return ' PK '||a_row_diff.pk_value||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; + else + return rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; + end if; + else + return ' Row No. '||a_row_diff.rn||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; + end if; + end; + + begin + if not a_other is of (ut_data_value_refcursor) then + raise value_error; + end if; + l_other := treat(a_other as ut_data_value_refcursor); + l_other.cursor_details.filter_columns(a_match_options); + l_self.cursor_details.filter_columns(a_match_options); + + l_other_cols := l_other.cursor_details.cursor_columns_info; + l_self_cols := l_self.cursor_details.cursor_columns_info; + + dbms_lob.createtemporary(l_result,true); + --diff columns + if not l_self.is_null and not l_other.is_null then + l_column_diffs := ut_compound_data_helper.get_columns_diff( + l_self.cursor_details.cursor_columns_info, + l_other.cursor_details.cursor_columns_info, + a_match_options.ordered_columns() + ); + + if l_column_diffs.count > 0 then + ut_utils.append_to_clob(l_result,chr(10) || 'Columns:' || chr(10)); + l_other_cols := remove_incomparable_cols( l_other_cols, l_column_diffs ); + l_self_cols := remove_incomparable_cols( l_self_cols, l_column_diffs ); + for i in 1 .. l_column_diffs.count loop + l_results.extend; + l_results(l_results.last) := get_col_diff_text(l_column_diffs(i)); + end loop; + ut_utils.append_to_clob(l_result, l_results); + end if; + end if; + + --check for missing pk + if a_match_options.join_by.items.count > 0 then + l_act_missing_pk := l_other.cursor_details.get_missing_join_by_columns( a_match_options.join_by.items ); + l_exp_missing_pk := l_self.cursor_details.get_missing_join_by_columns( a_match_options.join_by.items ); + end if; + + --diff rows and row elements if the pk is not missing + if l_act_missing_pk.count + l_exp_missing_pk.count = 0 then + l_diff_id := ut_compound_data_helper.get_hash( l_self.data_id || l_other.data_id ); + + -- First tell how many rows are different + l_diff_row_count := ut_compound_data_helper.get_rows_diff_count; + if l_diff_row_count > 0 then + l_row_diffs := ut_compound_data_helper.get_rows_diff_by_sql( + l_self_cols, l_other_cols, l_self.data_id, l_other.data_id, + l_diff_id, + case + when + l_self.cursor_details.is_anydata = 1 then ut_utils.add_prefix(a_match_options.join_by.items, l_self.cursor_details.get_root) + else + a_match_options.join_by.items + end, + a_match_options.unordered,a_match_options.ordered_columns(), self.extract_path + ); + l_message := chr(10) + ||'Rows: [ ' || l_diff_row_count ||' differences' + || case when l_diff_row_count > c_max_rows and l_row_diffs.count > 0 then ', showing first '||c_max_rows end + ||' ]'||chr(10)|| case when l_row_diffs.count = 0 then ' All rows are different as the columns are not matching.' else null end; + ut_utils.append_to_clob( l_result, l_message ); + l_results := ut_utils.t_clob_tab(); + for i in 1 .. l_row_diffs.count loop + l_results.extend; + l_results(l_results.last) := get_diff_message(l_row_diffs(i),a_match_options.unordered); + end loop; + ut_utils.append_to_clob(l_result,l_results); + else + l_message:= chr(10)||'Rows: [ all different ]'||chr(10)||' All rows are different as the columns position is not matching.'; + ut_utils.append_to_clob( l_result, l_message ); + end if; + else + ut_utils.append_to_clob(l_result,chr(10) || 'Unable to join sets:' || chr(10)); + + for i in 1 .. l_exp_missing_pk.count loop + ut_utils.append_to_clob(l_result, ' Join key '||l_exp_missing_pk(i)||' does not exists in expected'||chr(10)); + end loop; + + for i in 1 .. l_act_missing_pk.count loop + ut_utils.append_to_clob(l_result, ' Join key '||l_act_missing_pk(i)||' does not exists in actual'||chr(10)); + end loop; + + if l_self.cursor_details.contains_collection() or l_other.cursor_details.contains_collection() then + ut_utils.append_to_clob(l_result,' Please make sure that your join clause is not refferring to collection element'|| chr(10)); + end if; + + end if; + + l_result_string := ut_utils.to_string(l_result,null); + dbms_lob.freetemporary(l_result); + return l_result_string; + end; + + overriding member function compare_implementation(a_other ut_data_value) return integer is + begin + return compare_implementation( a_other, null ); + end; + + member function compare_implementation( + a_other ut_data_value, + a_match_options ut_matcher_options, + a_inclusion_compare boolean := false, + a_is_negated boolean := false + ) return integer is + l_result integer := 0; + l_self ut_data_value_refcursor := self; + l_other ut_data_value_refcursor; + l_diff_cursor_text clob; + + function compare_data( + a_self ut_data_value_refcursor, + a_other ut_data_value_refcursor, + a_diff_cursor_text clob + ) return integer is + l_diff_id ut_compound_data_helper.t_hash; + l_result integer; + --We will start with number od differences being displayed. + l_cursor sys_refcursor; + l_diff_tab ut_compound_data_helper.t_diff_tab; + l_diif_rowcount integer :=0; + begin + l_diff_id := ut_compound_data_helper.get_hash(a_self.data_id||a_other.data_id); + + begin + l_cursor := ut_compound_data_helper.get_compare_cursor(a_diff_cursor_text, + a_self.data_id, a_other.data_id); + --fetch and save rows for display of diff + fetch l_cursor bulk collect into l_diff_tab limit ut_utils.gc_diff_max_rows; + exception when others then + if l_cursor%isopen then + close l_cursor; + end if; + raise; + end; + + ut_compound_data_helper.insert_diffs_result( l_diff_tab, l_diff_id ); + --fetch rows for count only + loop + exit when l_diff_tab.count = 0; + l_diif_rowcount := l_diif_rowcount + l_diff_tab.count; + fetch l_cursor bulk collect into l_diff_tab limit ut_utils.gc_bc_fetch_limit; + end loop; + + ut_compound_data_helper.set_rows_diff(l_diif_rowcount); + + --result is OK only if both are same + if l_diif_rowcount = 0 and a_self.is_null = a_other.is_null then + l_result := 0; + else + l_result := 1; + end if; + close l_cursor; + return l_result; + end; + begin + if not a_other is of (ut_data_value_refcursor) then + raise value_error; + end if; + + l_other := treat(a_other as ut_data_value_refcursor); + l_other.cursor_details.filter_columns( a_match_options ); + l_self.cursor_details.filter_columns( a_match_options ); + + if a_match_options.join_by.items.count > 0 then + l_result := + l_self.cursor_details.get_missing_join_by_columns( a_match_options.join_by.items ).count + + l_other.cursor_details.get_missing_join_by_columns( a_match_options.join_by.items ).count; + end if; + + if l_result = 0 then + if not l_self.is_null() and not l_other.is_null() and not l_self.cursor_details.equals( l_other.cursor_details, a_match_options ) then + l_result := 1; + end if; + + l_diff_cursor_text := ut_compound_data_helper.gen_compare_sql( + l_other, + a_match_options.join_by.items, + a_match_options.unordered(), + a_inclusion_compare, + a_is_negated + ); + l_result := l_result + compare_data( l_self, l_other, l_diff_cursor_text ); + end if; + return l_result; + end; + + overriding member function is_empty return boolean is + begin + return self.elements_count = 0; + end; + +end; +/ From d609ee8d678e018076e9b54370c24e043087591a Mon Sep 17 00:00:00 2001 From: LUKASZ104 Date: Fri, 24 May 2019 15:26:41 +0100 Subject: [PATCH 0472/1096] PHASE 2 --- source/expectations/data_values/ut_cursor_details.tpb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb index 2a70a51dd..0c617a226 100644 --- a/source/expectations/data_values/ut_cursor_details.tpb +++ b/source/expectations/data_values/ut_cursor_details.tpb @@ -249,7 +249,7 @@ create or replace type body ut_cursor_details as begin self.is_anydata := 1; for i in 1..cursor_columns_info.count loop - self.cursor_columns_info(i).filter_path := ut_utils.strip_prefix(self.cursor_columns_info(i).access_path,l_root); + self.cursor_columns_info(i).filter_path := '/'||ut_utils.strip_prefix(self.cursor_columns_info(i).access_path,l_root); end loop; end; From d2fd0f2f8dedad2f1ddc9a56d3b90c06a036223f Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 25 May 2019 19:44:26 +0100 Subject: [PATCH 0473/1096] Fixing unit test for Oracle 11.2 & 12.1 --- test/ut3_user/reporters.pkb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ut3_user/reporters.pkb b/test/ut3_user/reporters.pkb index 213d7eaa6..d6a104242 100644 --- a/test/ut3_user/reporters.pkb +++ b/test/ut3_user/reporters.pkb @@ -177,7 +177,7 @@ end;]'; --Assert ut.expect(l_actual).to_be_like('%' (varchar2)%]' - ||q'[at "UT3$USER#.CHECK_FAIL_ESCAPE.FAIL_MISERABLY", line % ut3.ut.expect('test').to_equal('');]' + ||q'[at "UT3$USER#.CHECK_FAIL_ESCAPE%", line % ut3.ut.expect('test').to_equal('');]' ||'%]]>%' ); end; From 21a812d0985c6793eb2669091f915e49e8fcf0eb Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 25 May 2019 20:29:43 +0100 Subject: [PATCH 0474/1096] Fixing code duplication --- source/core/types/ut_test.tpb | 21 +++++++++++++++++++++ source/core/types/ut_test.tps | 3 ++- source/reporters/ut_junit_reporter.tpb | 13 ++----------- source/reporters/ut_sonar_test_reporter.tpb | 14 ++------------ source/reporters/ut_tfs_junit_reporter.tpb | 18 ++++-------------- 5 files changed, 31 insertions(+), 38 deletions(-) diff --git a/source/core/types/ut_test.tpb b/source/core/types/ut_test.tpb index 14620b24b..698f179ff 100644 --- a/source/core/types/ut_test.tpb +++ b/source/core/types/ut_test.tpb @@ -162,5 +162,26 @@ create or replace type body ut_test as end loop; return l_outputs; end; + + member function get_failed_expectations_cdata return ut_varchar2_rows is + c_cdata_start_tag constant varchar2(30) := ''; + c_cdata_end_tag_wrap constant varchar2(30) := ']]'||c_cdata_end_tag||c_cdata_start_tag||'>'; + l_results ut_varchar2_rows; + l_lines ut_varchar2_list; + begin + ut_utils.append_to_list( l_results, c_cdata_start_tag); + for i in 1 .. self.failed_expectations.count loop + l_lines := self.failed_expectations(i).get_result_lines(); + for j in 1 .. l_lines.count loop + --Encapsulate nested CDATA in results + ut_utils.append_to_list( l_results, replace( l_lines(j), c_cdata_end_tag, c_cdata_end_tag_wrap ) ); + end loop; + ut_utils.append_to_list( l_results, replace( self.failed_expectations(i).caller_info, c_cdata_end_tag, c_cdata_end_tag_wrap ) ); + end loop; + ut_utils.append_to_list( l_results, c_cdata_end_tag); + return l_results; + end; + end; / diff --git a/source/core/types/ut_test.tps b/source/core/types/ut_test.tps index 752ef3ef7..dfe7a7e0f 100644 --- a/source/core/types/ut_test.tps +++ b/source/core/types/ut_test.tps @@ -64,6 +64,7 @@ create or replace type ut_test under ut_suite_item ( overriding member procedure calc_execution_result(self in out nocopy ut_test), overriding member procedure mark_as_errored(self in out nocopy ut_test, a_error_stack_trace varchar2), overriding member function get_error_stack_traces(self ut_test) return ut_varchar2_list, - overriding member function get_serveroutputs return clob + overriding member function get_serveroutputs return clob, + member function get_failed_expectations_cdata return ut_varchar2_rows ) / diff --git a/source/reporters/ut_junit_reporter.tpb b/source/reporters/ut_junit_reporter.tpb index 8b619ccc7..11996b433 100644 --- a/source/reporters/ut_junit_reporter.tpb +++ b/source/reporters/ut_junit_reporter.tpb @@ -53,21 +53,12 @@ create or replace type body ut_junit_reporter is if a_test.result = ut_utils.gc_error then ut_utils.append_to_list( l_results, ''); ut_utils.append_to_list( l_results, c_cdata_start_tag); - ut_utils.append_to_list( l_results, ut_utils.convert_collection(a_test.get_error_stack_traces()) ); + ut_utils.append_to_list( l_results, replace( ut_utils.table_to_clob(a_test.get_error_stack_traces()), c_cdata_end_tag, c_cdata_end_tag_wrap )); ut_utils.append_to_list( l_results, c_cdata_end_tag); ut_utils.append_to_list( l_results, ''); elsif a_test.result > ut_utils.gc_success then ut_utils.append_to_list( l_results, ''); - ut_utils.append_to_list( l_results, c_cdata_start_tag); - for i in 1 .. a_test.failed_expectations.count loop - l_lines := a_test.failed_expectations(i).get_result_lines(); - for j in 1 .. l_lines.count loop - --Encapsulate nested CDATA in results - ut_utils.append_to_list( l_results, replace( l_lines(j), c_cdata_end_tag, c_cdata_end_tag_wrap ) ); - end loop; - ut_utils.append_to_list( l_results, replace( a_test.failed_expectations(i).caller_info, c_cdata_end_tag, c_cdata_end_tag_wrap ) ); - end loop; - ut_utils.append_to_list( l_results, c_cdata_end_tag); + ut_utils.append_to_list( l_results, a_test.get_failed_expectations_cdata() ); ut_utils.append_to_list( l_results, ''); end if; -- TODO - decide if we need/want to use the tag too diff --git a/source/reporters/ut_sonar_test_reporter.tpb b/source/reporters/ut_sonar_test_reporter.tpb index de4699058..ce1a67089 100644 --- a/source/reporters/ut_sonar_test_reporter.tpb +++ b/source/reporters/ut_sonar_test_reporter.tpb @@ -47,7 +47,6 @@ create or replace type body ut_sonar_test_reporter is c_cdata_end_tag constant varchar2(10) := ']]>'; c_cdata_end_tag_wrap constant varchar2(30) := ']]'||c_cdata_end_tag||c_cdata_start_tag||'>'; l_results ut_varchar2_rows := ut_varchar2_rows(); - l_lines ut_varchar2_list; begin ut_utils.append_to_list( l_results, ''); if a_test.result = ut_utils.gc_disabled then @@ -55,21 +54,12 @@ create or replace type body ut_sonar_test_reporter is elsif a_test.result = ut_utils.gc_error then ut_utils.append_to_list( l_results, ''); ut_utils.append_to_list( l_results, c_cdata_start_tag); - ut_utils.append_to_list( l_results, ut_utils.table_to_clob(a_test.get_error_stack_traces())); + ut_utils.append_to_list( l_results, replace( ut_utils.table_to_clob(a_test.get_error_stack_traces()), c_cdata_end_tag, c_cdata_end_tag_wrap )); ut_utils.append_to_list( l_results, c_cdata_end_tag); ut_utils.append_to_list( l_results, ''); elsif a_test.result > ut_utils.gc_success then ut_utils.append_to_list( l_results, ''); - ut_utils.append_to_list( l_results, c_cdata_start_tag); - for i in 1 .. a_test.failed_expectations.count loop - l_lines := a_test.failed_expectations(i).get_result_lines(); - for j in 1 .. l_lines.count loop - --Encapsulate nested CDATA in results - ut_utils.append_to_list( l_results, replace( l_lines(j), c_cdata_end_tag, c_cdata_end_tag_wrap ) ); - end loop; - ut_utils.append_to_list( l_results, replace( a_test.failed_expectations(i).caller_info, c_cdata_end_tag, c_cdata_end_tag_wrap ) ); - end loop; - ut_utils.append_to_list( l_results, c_cdata_end_tag); + ut_utils.append_to_list( l_results, a_test.get_failed_expectations_cdata() ); ut_utils.append_to_list( l_results, ''); end if; ut_utils.append_to_list( l_results, ''); diff --git a/source/reporters/ut_tfs_junit_reporter.tpb b/source/reporters/ut_tfs_junit_reporter.tpb index 814cb7230..cb112e9b7 100644 --- a/source/reporters/ut_tfs_junit_reporter.tpb +++ b/source/reporters/ut_tfs_junit_reporter.tpb @@ -58,7 +58,6 @@ create or replace type body ut_tfs_junit_reporter is procedure print_test_results(a_test ut_test) is l_results ut_varchar2_rows := ut_varchar2_rows(); - l_lines ut_varchar2_list; begin self.print_text(''); @@ -73,22 +72,13 @@ create or replace type body ut_tfs_junit_reporter is if a_test.result = ut_utils.gc_error then ut_utils.append_to_list( l_results, ''); ut_utils.append_to_list( l_results, c_cdata_start_tag); - ut_utils.append_to_list( l_results, ut_utils.table_to_clob(a_test.get_error_stack_traces())); + ut_utils.append_to_list( l_results, replace( ut_utils.table_to_clob(a_test.get_error_stack_traces()), c_cdata_end_tag, c_cdata_end_tag_wrap )); ut_utils.append_to_list( l_results, c_cdata_end_tag); ut_utils.append_to_list( l_results, ''); -- Do not count error as failure elsif a_test.result = ut_utils.gc_failure then ut_utils.append_to_list( l_results, ''); - ut_utils.append_to_list( l_results, c_cdata_start_tag); - for i in 1 .. a_test.failed_expectations.count loop - l_lines := a_test.failed_expectations(i).get_result_lines(); - for j in 1 .. l_lines.count loop - --Encapsulate nested CDATA in results - ut_utils.append_to_list( l_results, replace( l_lines(j), c_cdata_end_tag, c_cdata_end_tag_wrap ) ); - end loop; - ut_utils.append_to_list( l_results, replace( a_test.failed_expectations(i).caller_info, c_cdata_end_tag, c_cdata_end_tag_wrap ) ); - end loop; - ut_utils.append_to_list( l_results, c_cdata_end_tag); + ut_utils.append_to_list( l_results, a_test.get_failed_expectations_cdata() ); ut_utils.append_to_list( l_results, ''); end if; @@ -127,7 +117,7 @@ create or replace type body ut_tfs_junit_reporter is if l_outputs is not null and l_outputs != empty_clob() then ut_utils.append_to_list( l_results, ''); ut_utils.append_to_list( l_results, c_cdata_start_tag); - ut_utils.append_to_list( l_results, l_outputs); + ut_utils.append_to_list( l_results, replace( l_outputs, c_cdata_end_tag, c_cdata_end_tag_wrap ) ); ut_utils.append_to_list( l_results, c_cdata_end_tag); ut_utils.append_to_list( l_results, ''); else @@ -138,7 +128,7 @@ create or replace type body ut_tfs_junit_reporter is if l_errors is not empty then ut_utils.append_to_list( l_results, ''); ut_utils.append_to_list( l_results, c_cdata_start_tag); - ut_utils.append_to_list( l_results, ut_utils.table_to_clob(l_errors)); + ut_utils.append_to_list( l_results, replace( ut_utils.table_to_clob(l_errors), c_cdata_end_tag, c_cdata_end_tag_wrap ) ); ut_utils.append_to_list( l_results, c_cdata_end_tag); ut_utils.append_to_list( l_results, ''); else From d6bbe04a9aa03e89dcde09edc41d71067982b32d Mon Sep 17 00:00:00 2001 From: Travis CI Date: Fri, 31 May 2019 13:59:32 +0000 Subject: [PATCH 0475/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 2ce241de6..08a2cf440 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 8f0c2e69e..1adf64172 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 4de716069..41f564de0 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 24c747b78..50bb2858e 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 72818c3bd..59450db40 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index f2f296755..3a7cf17a5 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index e152d015d..2d71d47f1 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 8899444b8..b6dba5e02 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index a28177d34..779dc19f8 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index c5b6d493d..327f1a5df 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 51dbb4e69..dde2d84e6 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 9803d3ff4..9456f26dc 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 88d26641a..c6fd2c91d 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 674907b78..f605fbf8f 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 31b8ab6c7..3ece3eef2 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 3645c3efc..990390e35 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index ed0b8195b..cd4ded0d1 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 92ee0895d..86d90d9a1 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -760,7 +760,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.7.2935-develop + * secion v3.1.7.2980-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 25487d9c3..7b830fa1a 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.7.2935-develop'; + gc_version constant varchar2(50) := 'v3.1.7.2980-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 93890745347233fa1b4b49a1705de25ed18e349e Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 1 Jun 2019 13:49:18 +0200 Subject: [PATCH 0476/1096] Fixes #921 - Assert input params in dynamic SQL Used dbms_assert.qualified_sql_name whenever possible. This is much less invasive than dbms_assert.enquote_name. Code converting case is left untouched. --- .../annotations/ut_annotation_manager.pkb | 12 ++- source/core/coverage/ut_coverage.pkb | 8 +- source/core/types/ut_suite_item.tpb | 4 +- source/core/ut_metadata.pkb | 8 +- source/core/ut_suite_manager.pkb | 83 ++++++++++++++----- 5 files changed, 85 insertions(+), 30 deletions(-) diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index 87ad51475..1e9df786d 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -57,7 +57,15 @@ create or replace package body ut_annotation_manager as l_objects_view varchar2(200) := ut_metadata.get_objects_view_name(); l_cursor_text varchar2(32767); l_result ut_annotation_objs_cache_info; + l_object_owner varchar2(250); + l_object_type varchar2(250); begin + if a_object_owner is not null then + l_object_owner := sys.dbms_assert.qualified_sql_name(a_object_owner); + end if; + if a_object_type is not null then + l_object_type := sys.dbms_assert.qualified_sql_name(a_object_type); + end if; l_cursor_text := q'[select ]'||l_ut_owner||q'[.ut_annotation_obj_cache_info( object_owner => o.owner, @@ -70,8 +78,8 @@ create or replace package body ut_annotation_manager as on o.owner = i.object_owner and o.object_name = i.object_name and o.object_type = i.object_type - where o.owner = ']'||a_object_owner||q'[' - and o.object_type = ']'||a_object_type||q'[' + where o.owner = ']'||l_object_owner||q'[' + and o.object_type = ']'||l_object_type||q'[' and ]' || case when a_parse_date is null diff --git a/source/core/coverage/ut_coverage.pkb b/source/core/coverage/ut_coverage.pkb index 93b6204d1..58fdbb5cc 100644 --- a/source/core/coverage/ut_coverage.pkb +++ b/source/core/coverage/ut_coverage.pkb @@ -107,12 +107,18 @@ create or replace package body ut_coverage is l_cursor sys_refcursor; l_skip_objects ut_object_names; l_sql varchar2(32767); + l_valid_pattern varchar2(250) := '^\s*select.+$'; begin if not is_develop_mode() then --skip all the utplsql framework objects and all the unit test packages that could potentially be reported by coverage. l_skip_objects := ut_utils.get_utplsql_objects_list() multiset union all coalesce(a_coverage_options.exclude_objects, ut_object_names()); end if; - l_sql := a_sql; + if regexp_like(a_sql, l_valid_pattern, 'mi') then + -- pseudo assert for PL/SQL Cop + l_sql := sys.dbms_assert.noop(a_sql); + else + raise_application_error(-20542, 'Possible SQL injection detected. a_sql parameter does not match valid pattern "' || l_valid_pattern || '".'); + end if; if a_coverage_options.file_mappings is not empty then open l_cursor for l_sql using a_coverage_options.file_mappings, l_skip_objects; elsif a_coverage_options.include_objects is not empty then diff --git a/source/core/types/ut_suite_item.tpb b/source/core/types/ut_suite_item.tpb index ef71975e5..2ec1b0513 100644 --- a/source/core/types/ut_suite_item.tpb +++ b/source/core/types/ut_suite_item.tpb @@ -63,9 +63,11 @@ create or replace type body ut_suite_item as ex_savepoint_not_exists exception; l_transaction_invalidators clob; pragma exception_init(ex_savepoint_not_exists, -1086); + l_savepoint varchar2(250); begin if get_rollback_type() = ut_utils.gc_rollback_auto and a_savepoint is not null then - execute immediate 'rollback to ' || a_savepoint; + l_savepoint := sys.dbms_assert.qualified_sql_name(a_savepoint); + execute immediate 'rollback to ' || l_savepoint; end if; exception when ex_savepoint_not_exists then diff --git a/source/core/ut_metadata.pkb b/source/core/ut_metadata.pkb index a254529f8..43a57afa9 100644 --- a/source/core/ut_metadata.pkb +++ b/source/core/ut_metadata.pkb @@ -306,15 +306,17 @@ create or replace package body ut_metadata as function is_anytype_null(a_value in anydata, a_compound_type in varchar2) return number is l_result integer := 0; l_anydata_sql varchar2(4000); + l_compound_type varchar2(250); begin - if a_value is not null then - l_anydata_sql := ' + if a_value is not null then + l_compound_type := sys.dbms_assert.qualified_sql_name(a_compound_type); + l_anydata_sql := ' declare l_data '||get_anydata_typename(a_value)||'; l_value anydata := :a_value; l_status integer; begin - l_status := l_value.get'||a_compound_type||'(l_data); + l_status := l_value.get'||l_compound_type||'(l_data); :l_data_is_null := case when l_data is null then 1 else 0 end; end;'; execute immediate l_anydata_sql using in a_value, out l_result; diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 51d3fa1e4..8d2d0b781 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -335,7 +335,9 @@ create or replace package body ut_suite_manager is l_objects_view varchar2(200) := ut_metadata.get_objects_view_name(); l_cursor_text varchar2(32767); l_result ut_varchar2_rows; + l_object_owner varchar2(250); begin + l_object_owner := sys.dbms_assert.qualified_sql_name(a_object_owner); l_cursor_text := q'[select i.object_name from ]'||l_ut_owner||q'[.ut_suite_cache_package i @@ -345,9 +347,9 @@ create or replace package body ut_suite_manager is where o.owner = i.object_owner and o.object_name = i.object_name and o.object_type = 'PACKAGE' - and o.owner = ']'||a_object_owner||q'[' + and o.owner = ']'||l_object_owner||q'[' ) - and i.object_owner = ']'||a_object_owner||q'[']'; + and i.object_owner = ']'||l_object_owner||q'[']'; open l_rows for l_cursor_text; fetch l_rows bulk collect into l_result limit 1000000; close l_rows; @@ -362,19 +364,33 @@ create or replace package body ut_suite_manager is a_skip_all_objects boolean := false, a_random_seed positive ) return t_cached_suites_cursor is - l_path varchar2( 4000 ); - l_result sys_refcursor; - l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_path varchar2(4000); + l_result sys_refcursor; + l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_object_owner varchar2(250); + l_object_name varchar2(250); + l_procedure_name varchar2(250); begin + if a_object_owner is not null then + l_object_owner := sys.dbms_assert.qualified_sql_name(a_object_owner); + end if; + if a_object_name is not null then + l_object_name := sys.dbms_assert.qualified_sql_name(a_object_name); + end if; + if a_procedure_name is not null then + l_procedure_name := sys.dbms_assert.qualified_sql_name(a_procedure_name); + end if; if a_path is null and a_object_name is not null then execute immediate 'select min(path) from '||l_ut_owner||q'[.ut_suite_cache where object_owner = :a_object_owner and object_name = :a_object_name and name = nvl(:a_procedure_name, name)]' - into l_path using upper(a_object_owner), upper(a_object_name), upper(a_procedure_name); + into l_path using upper(l_object_owner), upper(l_object_name), upper(l_procedure_name); else - l_path := lower( a_path ); + if a_path is not null then + l_path := lower(sys.dbms_assert.qualified_sql_name(a_path)); + end if; end if; open l_result for @@ -717,29 +733,37 @@ create or replace package body ut_suite_manager is a_owner_name varchar2, a_package_name varchar2 := null ) return sys_refcursor is - l_result sys_refcursor; - l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_result sys_refcursor; + l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_owner_name varchar2(250); + l_package_name varchar2(250); begin + if a_owner_name is not null then + l_owner_name := sys.dbms_assert.qualified_sql_name(a_owner_name); + end if; + if a_package_name is not null then + l_package_name := sys.dbms_assert.qualified_sql_name(a_package_name); + end if; - refresh_cache(a_owner_name); + refresh_cache(l_owner_name); open l_result for q'[with suite_items as ( select /*+ cardinality(c 100) */ c.* from ]'||l_ut_owner||q'[.ut_suite_cache c - where 1 = 1 ]'||case when can_skip_all_objects_scan(a_owner_name) then q'[ + where 1 = 1 ]'||case when can_skip_all_objects_scan(l_owner_name) then q'[ and exists ( select 1 from all_objects a where a.object_name = c.object_name - and a.owner = ']'||upper(a_owner_name)||q'[' + and a.owner = ']'||upper(l_owner_name)||q'[' and a.owner = c.object_owner and a.object_type = 'PACKAGE' )]' end ||q'[ - and c.object_owner = ']'||upper(a_owner_name) ||q'[' + and c.object_owner = ']'||upper(l_owner_name)||q'[' and ]' - || case when a_package_name is not null + || case when l_package_name is not null then 'c.object_name = :a_package_name' else ':a_package_name is null' end || q'[ @@ -787,7 +811,7 @@ create or replace package body ut_suite_manager is object_owner, object_name, item_name, item_description, item_type, item_line_no, path, disabled_flag ) - from items c]' using upper(a_package_name); + from items c]' using upper(l_package_name); return l_result; end; @@ -798,17 +822,30 @@ create or replace package body ut_suite_manager is a_procedure_name varchar2 := null, a_item_type varchar2 := null ) return boolean is - l_result integer; - l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_result integer; + l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_owner_name varchar2(250); + l_package_name varchar2(250); + l_procedure_name varchar2(250); begin - refresh_cache(a_owner_name); + if a_owner_name is not null then + l_owner_name := sys.dbms_assert.qualified_sql_name(a_owner_name); + end if; + if a_package_name is not null then + l_package_name := sys.dbms_assert.qualified_sql_name(a_package_name); + end if; + if a_procedure_name is not null then + l_procedure_name := sys.dbms_assert.qualified_sql_name(a_procedure_name); + end if; + + refresh_cache(l_owner_name); execute immediate q'[ select count(1) from dual where exists ( select 1 from ]'||l_ut_owner||q'[.ut_suite_cache c - where 1 = 1 ]'||case when can_skip_all_objects_scan(a_owner_name) then q'[ + where 1 = 1 ]'||case when can_skip_all_objects_scan(l_owner_name) then q'[ and exists ( select 1 from all_objects a @@ -820,20 +857,20 @@ create or replace package body ut_suite_manager is and :a_owner_name is not null ]' end ||q'[ and c.object_owner = :a_owner_name and ]' - || case when a_package_name is not null + || case when l_package_name is not null then 'c.object_name = :a_package_name' else ':a_package_name is null' end || q'[ and ]' - || case when a_procedure_name is not null + || case when l_procedure_name is not null then 'c.name = :a_procedure_name' else ':a_procedure_name is null' end || q'[ )]' into l_result using - upper(a_owner_name), upper(a_owner_name), - upper(a_package_name), upper(a_procedure_name); + upper(l_owner_name), upper(l_owner_name), + upper(l_package_name), upper(l_procedure_name); return l_result > 0; end; From 16ef15f4ec2206be4a563f8f527f7a28de6b8971 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sat, 1 Jun 2019 13:13:27 +0000 Subject: [PATCH 0477/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 08a2cf440..2cb5db950 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 1adf64172..698a2bacd 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 41f564de0..165b0a069 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 50bb2858e..2db55ea19 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 59450db40..0740cac99 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 3a7cf17a5..dd61fe444 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 2d71d47f1..7e46bf011 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index b6dba5e02..65a61515d 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 779dc19f8..6c4cca2fa 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 327f1a5df..8250ff121 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index dde2d84e6..c33d011eb 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 9456f26dc..b6aad84e3 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index c6fd2c91d..18ba7b453 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index f605fbf8f..e3ba0b8f9 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 3ece3eef2..972020f07 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 990390e35..98461fc8e 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index cd4ded0d1..f25de0b5d 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2980--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 86d90d9a1..4593ba1a5 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -760,7 +760,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.7.2980-develop + * secion v3.1.7.2987-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 7b830fa1a..7d3faaea4 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.7.2980-develop'; + gc_version constant varchar2(50) := 'v3.1.7.2987-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 36e08014e2068fe6a2351bff3eba5bdd2a3f20c6 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 2 Jun 2019 22:15:16 +0100 Subject: [PATCH 0478/1096] Fixing sonar violation on duplicated code. --- source/core/types/ut_test.tpb | 21 ++---- source/core/types/ut_test.tps | 2 +- source/core/ut_utils.pkb | 26 +++++++ source/core/ut_utils.pks | 21 +++++- source/reporters/ut_junit_reporter.tpb | 30 +++----- source/reporters/ut_sonar_test_reporter.tpb | 9 +-- source/reporters/ut_tfs_junit_reporter.tpb | 77 +++++++++------------ test/ut3_user/api/test_ut_run.pkb | 4 +- 8 files changed, 97 insertions(+), 93 deletions(-) diff --git a/source/core/types/ut_test.tpb b/source/core/types/ut_test.tpb index 698f179ff..099704fd5 100644 --- a/source/core/types/ut_test.tpb +++ b/source/core/types/ut_test.tpb @@ -163,25 +163,14 @@ create or replace type body ut_test as return l_outputs; end; - member function get_failed_expectations_cdata return ut_varchar2_rows is - c_cdata_start_tag constant varchar2(30) := ''; - c_cdata_end_tag_wrap constant varchar2(30) := ']]'||c_cdata_end_tag||c_cdata_start_tag||'>'; - l_results ut_varchar2_rows; - l_lines ut_varchar2_list; + member function get_failed_expectation_lines return ut_varchar2_rows is + l_results ut_varchar2_rows; begin - ut_utils.append_to_list( l_results, c_cdata_start_tag); - for i in 1 .. self.failed_expectations.count loop - l_lines := self.failed_expectations(i).get_result_lines(); - for j in 1 .. l_lines.count loop - --Encapsulate nested CDATA in results - ut_utils.append_to_list( l_results, replace( l_lines(j), c_cdata_end_tag, c_cdata_end_tag_wrap ) ); - end loop; - ut_utils.append_to_list( l_results, replace( self.failed_expectations(i).caller_info, c_cdata_end_tag, c_cdata_end_tag_wrap ) ); + for i in 1 .. failed_expectations.count loop + ut_utils.append_to_list( l_results, ut_utils.convert_collection( failed_expectations(i).get_result_lines() ) ); + ut_utils.append_to_list( l_results, failed_expectations(i).caller_info ); end loop; - ut_utils.append_to_list( l_results, c_cdata_end_tag); return l_results; end; - end; / diff --git a/source/core/types/ut_test.tps b/source/core/types/ut_test.tps index dfe7a7e0f..7ca01313a 100644 --- a/source/core/types/ut_test.tps +++ b/source/core/types/ut_test.tps @@ -65,6 +65,6 @@ create or replace type ut_test under ut_suite_item ( overriding member procedure mark_as_errored(self in out nocopy ut_test, a_error_stack_trace varchar2), overriding member function get_error_stack_traces(self ut_test) return ut_varchar2_list, overriding member function get_serveroutputs return clob, - member function get_failed_expectations_cdata return ut_varchar2_rows + member function get_failed_expectation_lines return ut_varchar2_rows ) / diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 92ee0895d..52477d9b4 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -798,5 +798,31 @@ create or replace package body ut_utils is return l_valid_name; end; + function to_cdata(a_lines ut_varchar2_rows) return ut_varchar2_rows is + l_results ut_varchar2_rows; + begin + if a_lines is not empty then + ut_utils.append_to_list( l_results, gc_cdata_start_tag); + for i in 1 .. a_lines.count loop + ut_utils.append_to_list( l_results, replace( a_lines(i), gc_cdata_end_tag, gc_cdata_end_tag_wrap ) ); + end loop; + ut_utils.append_to_list( l_results, gc_cdata_end_tag); + else + l_results := a_lines; + end if; + return l_results; + end; + + function to_cdata(a_clob clob) return clob is + l_result clob; + begin + if a_clob is not null and a_clob != empty_clob() then + l_result := replace( a_clob, gc_cdata_end_tag, gc_cdata_end_tag_wrap ); + else + l_result := a_clob; + end if; + return l_result; + end; + end ut_utils; / diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 25487d9c3..85cfeeb16 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -44,6 +44,11 @@ create or replace package ut_utils authid definer is gc_failure_char constant varchar2(7) := 'Failure'; -- one or more expectations failed gc_error_char constant varchar2(5) := 'Error'; -- exception was raised + gc_cdata_start_tag constant varchar2(10) := ''; + gc_cdata_end_tag_wrap constant varchar2(30) := ']]'||gc_cdata_end_tag||gc_cdata_start_tag||'>'; + + /* Constants: Rollback type for ut_test_object */ @@ -386,6 +391,18 @@ create or replace package ut_utils authid definer is * Check if xml name is valid if not build a valid name */ function get_valid_xml_name(a_name varchar2) return varchar2; - -end ut_utils; + + /** + * Converts input list into a list surrounded by CDATA tags + * All CDATA end tags get escaped using recommended method from https://en.wikipedia.org/wiki/CDATA#Nesting + */ + function to_cdata(a_lines ut_varchar2_rows) return ut_varchar2_rows; + + /** + * Converts input CLOB into a CLOB surrounded by CDATA tags + * All CDATA end tags get escaped using recommended method from https://en.wikipedia.org/wiki/CDATA#Nesting + */ + function to_cdata(a_clob clob) return clob; + + end ut_utils; / diff --git a/source/reporters/ut_junit_reporter.tpb b/source/reporters/ut_junit_reporter.tpb index 11996b433..c08790080 100644 --- a/source/reporters/ut_junit_reporter.tpb +++ b/source/reporters/ut_junit_reporter.tpb @@ -23,9 +23,6 @@ create or replace type body ut_junit_reporter is end; overriding member procedure after_calling_run(self in out nocopy ut_junit_reporter, a_run in ut_run) is - c_cdata_start_tag constant varchar2(30) := ''; - c_cdata_end_tag_wrap constant varchar2(30) := ']]'||c_cdata_end_tag||c_cdata_start_tag||'>'; l_suite_id integer := 0; l_tests_count integer := a_run.results_count.disabled_count + a_run.results_count.success_count + a_run.results_count.failure_count + a_run.results_count.errored_count; @@ -37,7 +34,6 @@ create or replace type body ut_junit_reporter is procedure print_test_elements(a_test ut_test) is l_results ut_varchar2_rows := ut_varchar2_rows(); - l_lines ut_varchar2_list; l_output clob; begin ut_utils.append_to_list( @@ -52,22 +48,18 @@ create or replace type body ut_junit_reporter is end if; if a_test.result = ut_utils.gc_error then ut_utils.append_to_list( l_results, ''); - ut_utils.append_to_list( l_results, c_cdata_start_tag); - ut_utils.append_to_list( l_results, replace( ut_utils.table_to_clob(a_test.get_error_stack_traces()), c_cdata_end_tag, c_cdata_end_tag_wrap )); - ut_utils.append_to_list( l_results, c_cdata_end_tag); + ut_utils.append_to_list( l_results, ut_utils.to_cdata( ut_utils.convert_collection( a_test.get_error_stack_traces() ) ) ); ut_utils.append_to_list( l_results, ''); elsif a_test.result > ut_utils.gc_success then ut_utils.append_to_list( l_results, ''); - ut_utils.append_to_list( l_results, a_test.get_failed_expectations_cdata() ); + ut_utils.append_to_list( l_results, ut_utils.to_cdata( a_test.get_failed_expectation_lines() ) ); ut_utils.append_to_list( l_results, ''); end if; - -- TODO - decide if we need/want to use the tag too + l_output := a_test.get_serveroutputs(); if l_output is not null then ut_utils.append_to_list( l_results, ''); - ut_utils.append_to_list( l_results, c_cdata_start_tag); - ut_utils.append_to_list( l_results, replace( l_output, c_cdata_end_tag, c_cdata_end_tag_wrap ) ); - ut_utils.append_to_list( l_results, c_cdata_end_tag ); + ut_utils.append_to_list( l_results, ut_utils.to_cdata( a_test.get_serveroutputs() ) ); ut_utils.append_to_list( l_results, '' ); else ut_utils.append_to_list( l_results, ''); @@ -79,7 +71,7 @@ create or replace type body ut_junit_reporter is end; procedure print_suite_elements(a_suite ut_logical_suite, a_suite_id in out nocopy integer) is - l_tests_count integer := a_suite.results_count.disabled_count + a_suite.results_count.success_count + + l_count integer := a_suite.results_count.disabled_count + a_suite.results_count.success_count + a_suite.results_count.failure_count + a_suite.results_count.errored_count; l_suite ut_suite; l_tests ut_suite_items := ut_suite_items(); @@ -88,7 +80,7 @@ create or replace type body ut_junit_reporter is l_errors ut_varchar2_list; begin a_suite_id := a_suite_id + 1; - self.print_text(''); -- Becasue testsuites have to appear before test we capture test and leave it for later. @@ -110,11 +102,9 @@ create or replace type body ut_junit_reporter is l_suite := treat(a_suite as ut_suite); l_data := l_suite.get_serveroutputs(); - if l_data is not null and l_data != empty_clob() then + if l_data is not null then ut_utils.append_to_list( l_results, ''); - ut_utils.append_to_list( l_results, c_cdata_start_tag); - ut_utils.append_to_list( l_results, replace( l_data, c_cdata_end_tag, c_cdata_end_tag_wrap ) ); - ut_utils.append_to_list( l_results, c_cdata_end_tag); + ut_utils.append_to_list( l_results, ut_utils.to_cdata( l_data ) ); ut_utils.append_to_list( l_results, ''); else ut_utils.append_to_list( l_results, ''); @@ -123,9 +113,7 @@ create or replace type body ut_junit_reporter is l_errors := l_suite.get_error_stack_traces(); if l_errors is not empty then ut_utils.append_to_list( l_results, ''); - ut_utils.append_to_list( l_results, c_cdata_start_tag); - ut_utils.append_to_list( l_results, replace( ut_utils.table_to_clob(l_errors), c_cdata_end_tag, c_cdata_end_tag_wrap ) ); - ut_utils.append_to_list( l_results, c_cdata_end_tag); + ut_utils.append_to_list( l_results, ut_utils.to_cdata( ut_utils.convert_collection( l_errors ) ) ); ut_utils.append_to_list( l_results, ''); else ut_utils.append_to_list( l_results, ''); diff --git a/source/reporters/ut_sonar_test_reporter.tpb b/source/reporters/ut_sonar_test_reporter.tpb index ce1a67089..874a07957 100644 --- a/source/reporters/ut_sonar_test_reporter.tpb +++ b/source/reporters/ut_sonar_test_reporter.tpb @@ -43,9 +43,6 @@ create or replace type body ut_sonar_test_reporter is end; procedure print_test_results(a_test ut_test) is - c_cdata_start_tag constant varchar2(30) := ''; - c_cdata_end_tag_wrap constant varchar2(30) := ']]'||c_cdata_end_tag||c_cdata_start_tag||'>'; l_results ut_varchar2_rows := ut_varchar2_rows(); begin ut_utils.append_to_list( l_results, ''); @@ -53,13 +50,11 @@ create or replace type body ut_sonar_test_reporter is ut_utils.append_to_list( l_results, ''); elsif a_test.result = ut_utils.gc_error then ut_utils.append_to_list( l_results, ''); - ut_utils.append_to_list( l_results, c_cdata_start_tag); - ut_utils.append_to_list( l_results, replace( ut_utils.table_to_clob(a_test.get_error_stack_traces()), c_cdata_end_tag, c_cdata_end_tag_wrap )); - ut_utils.append_to_list( l_results, c_cdata_end_tag); + ut_utils.append_to_list( l_results, ut_utils.to_cdata( ut_utils.convert_collection( a_test.get_error_stack_traces() ) ) ); ut_utils.append_to_list( l_results, ''); elsif a_test.result > ut_utils.gc_success then ut_utils.append_to_list( l_results, ''); - ut_utils.append_to_list( l_results, a_test.get_failed_expectations_cdata() ); + ut_utils.append_to_list( l_results, ut_utils.to_cdata( a_test.get_failed_expectation_lines() ) ); ut_utils.append_to_list( l_results, ''); end if; ut_utils.append_to_list( l_results, ''); diff --git a/source/reporters/ut_tfs_junit_reporter.tpb b/source/reporters/ut_tfs_junit_reporter.tpb index cb112e9b7..5fba96886 100644 --- a/source/reporters/ut_tfs_junit_reporter.tpb +++ b/source/reporters/ut_tfs_junit_reporter.tpb @@ -28,13 +28,8 @@ create or replace type body ut_tfs_junit_reporter is end; member procedure junit_version_one(self in out nocopy ut_tfs_junit_reporter,a_run in ut_run) is - c_cdata_start_tag constant varchar2(30) := ''; - c_cdata_end_tag_wrap constant varchar2(30) := ']]'||c_cdata_end_tag||c_cdata_start_tag||'>'; l_suite_id integer := 0; - l_tests_count integer := a_run.results_count.disabled_count + a_run.results_count.success_count + - a_run.results_count.failure_count + a_run.results_count.errored_count; - + function get_common_suite_attributes(a_item ut_suite_item) return varchar2 is begin return ' errors="' ||a_item.results_count.errored_count || '"' || @@ -71,14 +66,12 @@ create or replace type body ut_tfs_junit_reporter is if a_test.result = ut_utils.gc_error then ut_utils.append_to_list( l_results, ''); - ut_utils.append_to_list( l_results, c_cdata_start_tag); - ut_utils.append_to_list( l_results, replace( ut_utils.table_to_clob(a_test.get_error_stack_traces()), c_cdata_end_tag, c_cdata_end_tag_wrap )); - ut_utils.append_to_list( l_results, c_cdata_end_tag); + ut_utils.append_to_list( l_results, ut_utils.to_cdata( ut_utils.convert_collection( a_test.get_error_stack_traces() ) ) ); ut_utils.append_to_list( l_results, ''); -- Do not count error as failure elsif a_test.result = ut_utils.gc_failure then ut_utils.append_to_list( l_results, ''); - ut_utils.append_to_list( l_results, a_test.get_failed_expectations_cdata() ); + ut_utils.append_to_list( l_results, ut_utils.to_cdata( a_test.get_failed_expectation_lines() ) ); ut_utils.append_to_list( l_results, ''); end if; @@ -102,43 +95,39 @@ create or replace type body ut_tfs_junit_reporter is end if; end loop; - if a_suite is of(ut_suite) then - a_suite_id := a_suite_id + 1; - self.print_text(''); - self.print_text(''); - for i in 1 .. a_suite.items.count loop - if a_suite.items(i) is of(ut_test) then - print_test_results(treat(a_suite.items(i) as ut_test)); - end if; - end loop; - l_suite := treat(a_suite as ut_suite); - l_outputs := l_suite.get_serveroutputs(); - if l_outputs is not null and l_outputs != empty_clob() then - ut_utils.append_to_list( l_results, ''); - ut_utils.append_to_list( l_results, c_cdata_start_tag); - ut_utils.append_to_list( l_results, replace( l_outputs, c_cdata_end_tag, c_cdata_end_tag_wrap ) ); - ut_utils.append_to_list( l_results, c_cdata_end_tag); - ut_utils.append_to_list( l_results, ''); - else - ut_utils.append_to_list( l_results, ''); - end if; + if a_suite is of(ut_suite) then + a_suite_id := a_suite_id + 1; + self.print_text(''); + self.print_text(''); + for i in 1 .. a_suite.items.count loop + if a_suite.items(i) is of(ut_test) then + print_test_results(treat(a_suite.items(i) as ut_test)); + end if; + end loop; + l_suite := treat(a_suite as ut_suite); + l_outputs := l_suite.get_serveroutputs(); + if l_outputs is not null and l_outputs != empty_clob() then + ut_utils.append_to_list( l_results, ''); + ut_utils.append_to_list( l_results, ut_utils.to_cdata( l_suite.get_serveroutputs() ) ); + ut_utils.append_to_list( l_results, ''); + else + ut_utils.append_to_list( l_results, ''); + end if; - l_errors := l_suite.get_error_stack_traces(); - if l_errors is not empty then - ut_utils.append_to_list( l_results, ''); - ut_utils.append_to_list( l_results, c_cdata_start_tag); - ut_utils.append_to_list( l_results, replace( ut_utils.table_to_clob(l_errors), c_cdata_end_tag, c_cdata_end_tag_wrap ) ); - ut_utils.append_to_list( l_results, c_cdata_end_tag); - ut_utils.append_to_list( l_results, ''); - else - ut_utils.append_to_list( l_results, ''); - end if; - ut_utils.append_to_list( l_results, ''); + l_errors := l_suite.get_error_stack_traces(); + if l_errors is not empty then + ut_utils.append_to_list( l_results, ''); + ut_utils.append_to_list( l_results, ut_utils.to_cdata( ut_utils.convert_collection( l_errors ) ) ); + ut_utils.append_to_list( l_results, ''); + else + ut_utils.append_to_list( l_results, ''); + end if; + ut_utils.append_to_list( l_results, ''); - self.print_text_lines(l_results); + self.print_text_lines(l_results); end if; - end; + end; begin l_suite_id := 0; diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index 43a2238ae..620c87977 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -734,8 +734,8 @@ Failures:% procedure remove_time_from_results(a_results in out nocopy ut3.ut_varchar2_list) is begin for i in 1 .. a_results.count loop - a_results(i) := regexp_replace(a_results(i),'\[[0-9]*\.[0-9]+ sec\]',''); - a_results(i) := regexp_replace(a_results(i),'Finished in [0-9]*\.[0-9]+ seconds',''); + a_results(i) := regexp_replace(a_results(i),'\[[0-9]*[\.,][0-9]+ sec\]',''); + a_results(i) := regexp_replace(a_results(i),'Finished in [0-9]*[\.,][0-9]+ seconds',''); end loop; end; From 6918be79241133881acb4f3fefb474541d633da0 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sun, 2 Jun 2019 22:07:12 +0000 Subject: [PATCH 0479/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 2cb5db950..d7dfefdcf 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 698a2bacd..aa7b83002 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 165b0a069..0cdf9cbee 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 2db55ea19..ec0e05d7b 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 0740cac99..2b660013e 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index dd61fe444..a0f32ce5e 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 7e46bf011..7d8081a4f 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 65a61515d..b6532232d 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 6c4cca2fa..18b481642 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 8250ff121..a2b0c143f 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index c33d011eb..ec32fe4a5 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index b6aad84e3..cd4760351 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 18ba7b453..37034e458 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index e3ba0b8f9..1d47e7bc3 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 972020f07..7bca3b507 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 98461fc8e..a4490ec97 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index f25de0b5d..5e3ec0f12 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2987--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index a1fa15022..b3f2f0ea6 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -760,7 +760,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.7.2987-develop + * secion v3.1.7.2992-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index e49c5dd65..a075e5458 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.7.2987-develop'; + gc_version constant varchar2(50) := 'v3.1.7.2992-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From be7fd082f07c5ff6c1cded7e2e1643e97bd1f0d4 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Tue, 4 Jun 2019 13:01:16 +0100 Subject: [PATCH 0480/1096] update tests to be less complicated --- docs/userguide/advanced_data_comparison.md | 69 ++++++++++++---------- 1 file changed, 38 insertions(+), 31 deletions(-) diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 39c35ebed..042bb847f 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -129,6 +129,14 @@ end; Example of `include / exclude` for anydata.convertCollection ```plsql +create or replace type person as object( + name varchar2(100), + age integer +) +/ +create or replace type people as table of person +/ + create or replace package ut_anydata_inc_exc IS --%suite(Anydata) @@ -138,46 +146,38 @@ create or replace package ut_anydata_inc_exc IS --%test(Anydata exclude) procedure ut_anydata_test_exc; - + + --%test(Fail on age) + procedure ut_fail_anydata_test; + end ut_anydata_inc_exc; / create or replace package body ut_anydata_inc_exc IS procedure ut_anydata_test_inc IS - l_actual ut3_tester_helper.test_dummy_object_list; - l_expected ut3_tester_helper.test_dummy_object_list; + l_actual people := people(person('Matt',45)); + l_expected people :=people(person('Matt',47)); begin - --Arrange - select ut3_tester_helper.test_dummy_object( rownum, 'Something Name'||rownum, rownum) - bulk collect into l_actual - from dual connect by level <=2 - order by rownum asc; - select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) - bulk collect into l_expected - from dual connect by level <=2 - order by rownum asc; - --Act - ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).include('ID,Value'); + ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).include('NAME'); end; - + procedure ut_anydata_test_exc IS - l_actual ut3_tester_helper.test_dummy_object_list; - l_expected ut3_tester_helper.test_dummy_object_list; + l_actual people := people(person('Matt',45)); + l_expected people :=people(person('Matt',47)); begin --Arrange - select ut3_tester_helper.test_dummy_object( rownum, 'Something Name'||rownum, rownum) - bulk collect into l_actual - from dual connect by level <=2 - order by rownum asc; - select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) - bulk collect into l_expected - from dual connect by level <=2 - order by rownum asc; - --Act - ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).exclude('name'); + ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).exclude('AGE'); end; + procedure ut_fail_anydata_test IS + l_actual people := people(person('Matt',45)); + l_expected people :=people(person('Matt',47)); + begin + --Arrange + ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).include('AGE'); + end; + end ut_anydata_inc_exc; / @@ -187,11 +187,18 @@ will result in : ```sql Anydata - Anydata include [.07 sec] - Anydata exclude [.058 sec] + Anydata include [.044 sec] + Anydata exclude [.035 sec] + Fail on age [.058 sec] (FAILED - 1) + +Failures: -Finished in .131218 seconds -2 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s) + 1) ut_fail_anydata_test + Actual: ut3.people [ count = 1 ] was expected to equal: ut3.people [ count = 1 ] + Diff: + Rows: [ 1 differences ] + Row No. 1 - Actual: 45 + Row No. 1 - Expected: 47 ``` From 0007298715a28fa5d2e0da3cd4460395b9ff5a39 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Wed, 5 Jun 2019 08:48:02 +0100 Subject: [PATCH 0481/1096] Fixing encoding issue --- source/core/ut_utils.pks | 2 +- .../data_values/ut_compound_data_helper.pkb | 1388 ++++++++--------- .../data_values/ut_cursor_column.tps | 104 +- .../data_values/ut_cursor_details.tpb | 513 +++--- .../data_values/ut_cursor_details.tps | 82 +- .../data_values/ut_data_value_anydata.tpb | 285 ++-- .../data_values/ut_data_value_refcursor.tpb | 795 +++++----- 7 files changed, 1583 insertions(+), 1586 deletions(-) diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 4969fbd70..792bccb52 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -413,5 +413,5 @@ create or replace package ut_utils authid definer is function strip_prefix(a_item varchar2, a_prefix varchar2, a_connector varchar2 := '/') return varchar2; -end ut_utils; + end ut_utils; / diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 759e3ad70..1d5686f03 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -1,694 +1,694 @@ -create or replace package body ut_compound_data_helper is - /* - utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project - - Licensed under the Apache License, Version 2.0 (the "License"): - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - - g_diff_count integer; - type t_type_name_map is table of varchar2(128) index by binary_integer; - type t_types_no_length is table of varchar2(128) index by varchar2(128); - g_type_name_map t_type_name_map; - g_anytype_name_map t_type_name_map; - g_type_no_length_map t_types_no_length; - - g_compare_sql_template varchar2(4000) := - q'[ - with exp as ( - select - ucd.*, - {:duplicate_number:} dup_no - from ( - select - ucd.item_data - ,x.data_id data_id - ,position + x.item_no item_no - {:columns:} - from {:ut3_owner:}.ut_compound_data_tmp x, - xmltable('/ROWSET/ROW' passing x.item_data columns - item_data xmltype path '*' - ,position for ordinality - {:xml_to_columns:} ) ucd - where data_id = :exp_guid - ) ucd - ) - , act as ( - select - ucd.*, - {:duplicate_number:} dup_no - from ( - select - ucd.item_data - ,x.data_id data_id - ,position + x.item_no item_no - {:columns:} - from {:ut3_owner:}.ut_compound_data_tmp x, - xmltable('/ROWSET/ROW' passing x.item_data columns - item_data xmltype path '*' - ,position for ordinality - {:xml_to_columns:} ) ucd - where data_id = :act_guid - ) ucd - ) - select - a.item_data as act_item_data, - a.data_id act_data_id, - e.item_data as exp_item_data, - e.data_id exp_data_id, - {:item_no:} as item_no, - nvl(e.dup_no,a.dup_no) dup_no - from act a {:join_type:} exp e on ( {:join_condition:} ) - where {:where_condition:}]'; - - function get_columns_diff( - a_expected ut_cursor_column_tab, - a_actual ut_cursor_column_tab, - a_order_enforced boolean := false - ) return tt_column_diffs is - l_results tt_column_diffs; - begin - execute immediate q'[with - expected_cols as ( - select display_path exp_column_name,column_position exp_col_pos, - replace(column_type_name,'VARCHAR2','CHAR') exp_col_type_compare, column_type_name exp_col_type - from table(:a_expected) - where parent_name is null and hierarchy_level = 1 and column_name is not null - ), - actual_cols as ( - select display_path act_column_name,column_position act_col_pos, - replace(column_type_name,'VARCHAR2','CHAR') act_col_type_compare, column_type_name act_col_type - from table(:a_actual) - where parent_name is null and hierarchy_level = 1 and column_name is not null - ), - joined_cols as ( - select e.*,a.*]' - || case when a_order_enforced then ', - row_number() over(partition by case when a.act_col_pos + e.exp_col_pos is not null then 1 end order by a.act_col_pos) a_pos_nn, - row_number() over(partition by case when a.act_col_pos + e.exp_col_pos is not null then 1 end order by e.exp_col_pos) e_pos_nn' - else - null - end ||q'[ - from expected_cols e - full outer join actual_cols a - on e.exp_column_name = a.act_column_name - ) - select case - when exp_col_pos is null and act_col_pos is not null then '+' - when exp_col_pos is not null and act_col_pos is null then '-' - when exp_col_type_compare != act_col_type_compare then 't' - else 'p' - end as diff_type, - exp_column_name, exp_col_type, exp_col_pos, - act_column_name, act_col_type, act_col_pos - from joined_cols - --column is unexpected (extra) or missing - where act_col_pos is null or exp_col_pos is null - --column type is not matching (except CHAR/VARCHAR2) - or act_col_type_compare != exp_col_type_compare]' - || case when a_order_enforced then q'[ - --column position is not matching (both when excluded extra/missing columns as well as when they are included) - or (a_pos_nn != e_pos_nn and exp_col_pos != act_col_pos)]' - else - null - end ||q'[ - order by exp_col_pos, act_col_pos]' - bulk collect into l_results using a_expected, a_actual; - return l_results; - end; - - function generate_not_equal_stmt( - a_data_info ut_cursor_column, a_pk_table ut_varchar2_list - ) return varchar2 - is - l_pk_tab ut_varchar2_list := coalesce(a_pk_table,ut_varchar2_list()); - l_index integer; - l_sql_stmt varchar2(32767); - l_exists boolean := false; - begin - l_index := l_pk_tab.first; - if l_pk_tab.count > 0 then - loop - if a_data_info.access_path = l_pk_tab(l_index) then - l_exists := true; - end if; - exit when l_index = l_pk_tab.count or (a_data_info.access_path = l_pk_tab(l_index)); - l_index := a_pk_table.next(l_index); - end loop; - end if; - if not(l_exists) then - l_sql_stmt := ' (decode(a.'||a_data_info.transformed_name||','||' e.'||a_data_info.transformed_name||',1,0) = 0)'; - end if; - return l_sql_stmt; - end; - - function generate_join_by_stmt( - a_data_info ut_cursor_column, a_pk_table ut_varchar2_list - ) return varchar2 - is - l_pk_tab ut_varchar2_list := coalesce(a_pk_table,ut_varchar2_list()); - l_index integer; - l_sql_stmt varchar2(32767); - begin - if l_pk_tab.count <> 0 then - l_index:= l_pk_tab.first; - loop - if l_pk_tab(l_index) in (a_data_info.access_path, a_data_info.parent_name) then - --When then table is nested and join is on whole table - l_sql_stmt := l_sql_stmt ||' a.'||a_data_info.transformed_name||q'[ = ]'||' e.'||a_data_info.transformed_name; - end if; - exit when (a_data_info.access_path = l_pk_tab(l_index)) or l_index = l_pk_tab.count; - l_index := l_pk_tab.next(l_index); - end loop; - end if; - return l_sql_stmt; - end; - - function generate_equal_sql(a_col_name in varchar2) return varchar2 is - begin - return ' decode(a.'||a_col_name||','||' e.'||a_col_name||',1,0) = 1 '; - end; - - function generate_partition_stmt( - a_data_info ut_cursor_column, a_pk_table in ut_varchar2_list, a_alias varchar2 := 'ucd.' - ) return varchar2 - is - l_index integer; - l_sql_stmt varchar2(32767); - begin - if a_pk_table is not empty then - l_index:= a_pk_table.first; - loop - if a_pk_table(l_index) in (a_data_info.access_path, a_data_info.parent_name) then - --When then table is nested and join is on whole table - l_sql_stmt := l_sql_stmt ||a_alias||a_data_info.transformed_name; - end if; - exit when (a_data_info.access_path = a_pk_table(l_index)) or l_index = a_pk_table.count; - l_index := a_pk_table.next(l_index); - end loop; - else - l_sql_stmt := a_alias||a_data_info.transformed_name; - end if; - return l_sql_stmt; - end; - - function generate_select_stmt(a_data_info ut_cursor_column, a_alias varchar2 := 'ucd.') - return varchar2 - is - l_alias varchar2(10) := a_alias; - l_col_syntax varchar2(4000); - l_ut_owner varchar2(250) := ut_utils.ut_owner; - begin - if a_data_info.is_sql_diffable = 0 then - l_col_syntax := l_ut_owner ||'.ut_compound_data_helper.get_hash('||l_alias||a_data_info.transformed_name||'.getClobVal()) as '||a_data_info.transformed_name ; - elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type = 'DATE' then - l_col_syntax := 'to_date('||l_alias||a_data_info.transformed_name||') as '|| a_data_info.transformed_name; - elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('TIMESTAMP') then - l_col_syntax := 'to_timestamp('||l_alias||a_data_info.transformed_name||','''||ut_utils.gc_timestamp_format||''') as '|| a_data_info.transformed_name; - elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('TIMESTAMP WITH TIME ZONE') then - l_col_syntax := 'to_timestamp_tz('||l_alias||a_data_info.transformed_name||','''||ut_utils.gc_timestamp_tz_format||''') as '|| a_data_info.transformed_name; - elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('TIMESTAMP WITH LOCAL TIME ZONE') then - l_col_syntax := ' cast( to_timestamp_tz('||l_alias||a_data_info.transformed_name||','''||ut_utils.gc_timestamp_tz_format||''') AS TIMESTAMP WITH LOCAL TIME ZONE) as '|| a_data_info.transformed_name; - else - l_col_syntax := l_alias||a_data_info.transformed_name||' as '|| a_data_info.transformed_name; - end if; - return l_col_syntax; - end; - - function generate_xmltab_stmt(a_data_info ut_cursor_column) return varchar2 is - l_col_type varchar2(4000); - begin - if a_data_info.is_sql_diffable = 0 then - l_col_type := 'XMLTYPE'; - elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('DATE','TIMESTAMP','TIMESTAMP WITH TIME ZONE', - 'TIMESTAMP WITH LOCAL TIME ZONE') then - l_col_type := 'VARCHAR2(50)'; - elsif a_data_info.is_sql_diffable = 1 and type_no_length(a_data_info.column_type) then - l_col_type := a_data_info.column_type; - elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('VARCHAR2','CHAR') then - l_col_type := 'VARCHAR2('||greatest(a_data_info.column_len,4000)||')'; - elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('NUMBER') then - --We cannot use a precision and scale as dbms_sql.describe_columns3 return precision 0 for dual table - -- there is also no need for that as we not process data but only read and compare as they are stored - l_col_type := a_data_info.column_type; - else - l_col_type := a_data_info.column_type - ||case when a_data_info.column_len is not null - then '('||a_data_info.column_len||')' - else null - end; - end if; - return a_data_info.transformed_name||' '||l_col_type||q'[ PATH ']'||a_data_info.access_path||q'[']'; - end; - - procedure gen_sql_pieces_out_of_cursor( - a_data_info ut_cursor_column_tab, - a_pk_table ut_varchar2_list, - a_unordered boolean, - a_xml_stmt out nocopy clob, - a_select_stmt out nocopy clob, - a_partition_stmt out nocopy clob, - a_join_by_stmt out nocopy clob, - a_not_equal_stmt out nocopy clob - ) is - l_partition_tmp clob; - l_xmltab_list ut_varchar2_list := ut_varchar2_list(); - l_select_list ut_varchar2_list := ut_varchar2_list(); - l_partition_list ut_varchar2_list := ut_varchar2_list(); - l_equal_list ut_varchar2_list := ut_varchar2_list(); - l_join_by_list ut_varchar2_list := ut_varchar2_list(); - l_not_equal_list ut_varchar2_list := ut_varchar2_list(); - - procedure add_element_to_list(a_list in out ut_varchar2_list, a_list_element in varchar2) - is - begin - if a_list_element is not null then - a_list.extend; - a_list(a_list.last) := a_list_element; - end if; - end; - - begin - if a_data_info is not empty then - for i in 1..a_data_info.count loop - if a_data_info(i).has_nested_col = 0 then - --Get XMLTABLE column list - add_element_to_list(l_xmltab_list,generate_xmltab_stmt(a_data_info(i))); - --Get Select statment list of columns - add_element_to_list(l_select_list, generate_select_stmt(a_data_info(i))); - --Get columns by which we partition - add_element_to_list(l_partition_list,generate_partition_stmt(a_data_info(i), a_pk_table)); - --Get equal statement - add_element_to_list(l_equal_list,generate_equal_sql(a_data_info(i).transformed_name)); - --Generate join by stmt - add_element_to_list(l_join_by_list,generate_join_by_stmt(a_data_info(i), a_pk_table)); - --Generate not equal stmt - add_element_to_list(l_not_equal_list,generate_not_equal_stmt(a_data_info(i), a_pk_table)); - end if; - end loop; - - a_xml_stmt := nullif(','||ut_utils.table_to_clob(l_xmltab_list, ' , '),','); - a_select_stmt := nullif(','||ut_utils.table_to_clob(l_select_list, ' , '),','); - l_partition_tmp := ut_utils.table_to_clob(l_partition_list, ' , '); - ut_utils.append_to_clob(a_partition_stmt,' row_number() over (partition by '||l_partition_tmp||' order by '||l_partition_tmp||' ) '); - - if a_pk_table.count > 0 then - -- If key defined do the join or these and where on diffrences - a_join_by_stmt := ut_utils.table_to_clob(l_join_by_list, ' and '); - elsif a_unordered then - -- If no key defined do the join on all columns - a_join_by_stmt := ' e.dup_no = a.dup_no and '||ut_utils.table_to_clob(l_equal_list, ' and '); - else - -- Else join on rownumber - a_join_by_stmt := 'a.item_no = e.item_no '; - end if; - a_not_equal_stmt := ut_utils.table_to_clob(l_not_equal_list, ' or '); - else - --Partition by piece when no data - ut_utils.append_to_clob(a_partition_stmt,' 1 '); - a_join_by_stmt := 'a.item_no = e.item_no '; - end if; - end; - - function gen_compare_sql( - a_other ut_data_value_refcursor, - a_join_by_list ut_varchar2_list, - a_unordered boolean, - a_inclusion_type boolean, - a_is_negated boolean - ) return clob is - l_compare_sql clob; - l_xmltable_stmt clob; - l_select_stmt clob; - l_partition_stmt clob; - l_join_on_stmt clob; - l_not_equal_stmt clob; - l_where_stmt clob; - l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_join_by_list ut_varchar2_list; - - function get_join_type(a_inclusion_compare in boolean,a_negated in boolean) return varchar2 is - begin - return - case - when a_inclusion_compare and not(a_negated) then ' right outer join ' - when a_inclusion_compare and a_negated then ' inner join ' - else ' full outer join ' - end; - end; - - function get_item_no(a_unordered boolean) return varchar2 is - begin - return - case - when a_unordered then 'row_number() over ( order by nvl(e.item_no,a.item_no))' - else 'nvl(e.item_no,a.item_no) ' - end; - end; - - begin - /** - * We already estabilished cursor equality so now we add anydata root if we compare anydata - * to join by. - */ - l_join_by_list := - case - when a_other is of (ut_data_value_anydata) then ut_utils.add_prefix(a_join_by_list, a_other.cursor_details.get_root) - else a_join_by_list - end; - - dbms_lob.createtemporary(l_compare_sql, true); - --Initiate a SQL template with placeholders - ut_utils.append_to_clob(l_compare_sql, g_compare_sql_template); - --Generate a pieceso of dynamic SQL that will substitute placeholders - gen_sql_pieces_out_of_cursor( - a_other.cursor_details.cursor_columns_info, l_join_by_list, a_unordered, - l_xmltable_stmt, l_select_stmt, l_partition_stmt, l_join_on_stmt, - l_not_equal_stmt - ); - - l_compare_sql := replace(l_compare_sql,'{:duplicate_number:}',l_partition_stmt); - l_compare_sql := replace(l_compare_sql,'{:columns:}',l_select_stmt); - l_compare_sql := replace(l_compare_sql,'{:ut3_owner:}',l_ut_owner); - l_compare_sql := replace(l_compare_sql,'{:xml_to_columns:}',l_xmltable_stmt); - l_compare_sql := replace(l_compare_sql,'{:item_no:}',get_item_no(a_unordered)); - l_compare_sql := replace(l_compare_sql,'{:join_type:}',get_join_type(a_inclusion_type,a_is_negated)); - l_compare_sql := replace(l_compare_sql,'{:join_condition:}',l_join_on_stmt); - - if l_not_equal_stmt is not null and ((l_join_by_list.count > 0 and not a_is_negated) or (not a_unordered)) then - ut_utils.append_to_clob(l_where_stmt,' ( '||l_not_equal_stmt||' ) or '); - end if; - --If its inclusion we expect a actual set to fully match and have no extra elements over expected - if a_inclusion_type then - ut_utils.append_to_clob(l_where_stmt,case when a_is_negated then ' 1 = 1 ' else ' ( a.data_id is null ) ' end); - else - ut_utils.append_to_clob(l_where_stmt,' (a.data_id is null or e.data_id is null) '); - end if; - - l_compare_sql := replace(l_compare_sql,'{:where_condition:}',l_where_stmt); - return l_compare_sql; - end; - - function get_column_extract_path(a_cursor_info ut_cursor_column_tab) return ut_varchar2_list is - l_column_list ut_varchar2_list := ut_varchar2_list(); - begin - for i in 1..a_cursor_info.count loop - l_column_list.extend; - l_column_list(l_column_list.last) := a_cursor_info(i).access_path; - end loop; - return l_column_list; - end; - - function get_rows_diff_by_sql( - a_act_cursor_info ut_cursor_column_tab, a_exp_cursor_info ut_cursor_column_tab, - a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, - a_join_by_list ut_varchar2_list, a_unordered boolean, a_enforce_column_order boolean := false, - a_extract_path varchar2 - ) return tt_row_diffs is - l_act_extract_xpath varchar2(32767):= ut_utils.to_xpath(get_column_extract_path(a_act_cursor_info)); - l_exp_extract_xpath varchar2(32767):= ut_utils.to_xpath(get_column_extract_path(a_exp_cursor_info)); - l_join_xpath varchar2(32767) := ut_utils.to_xpath(a_join_by_list); - l_results tt_row_diffs; - l_sql varchar2(32767); - begin - l_sql := q'[ - with exp as ( - select - exp_item_data, exp_data_id, item_no rn, rownum col_no, pk_value, - s.column_value col, s.column_value.getRootElement() col_name, - nvl(s.column_value.getclobval(),empty_clob()) col_val - from ( - select - exp_data_id, extract( ucd.exp_item_data, :column_path ) exp_item_data, item_no, - replace( extract( ucd.exp_item_data, :join_by ).getclobval(), chr(10) ) pk_value - from ut_compound_data_diff_tmp ucd - where diff_id = :diff_id - and ucd.exp_data_id = :self_guid - ) i, - table( xmlsequence( extract(i.exp_item_data,:extract_path) ) ) s - ), - act as ( - select - act_item_data, act_data_id, item_no rn, rownum col_no, pk_value, - s.column_value col, s.column_value.getRootElement() col_name, - nvl(s.column_value.getclobval(),empty_clob()) col_val - from ( - select - act_data_id, extract( ucd.act_item_data, :column_path ) act_item_data, item_no, - replace( extract( ucd.act_item_data, :join_by ).getclobval(), chr(10) ) pk_value - from ut_compound_data_diff_tmp ucd - where diff_id = :diff_id - and ucd.act_data_id = :other_guid - ) i, - table( xmlsequence( extract(i.act_item_data,:extract_path) ) ) s - ) - select rn, diff_type, diffed_row, pk_value pk_value - from ( - select rn, diff_type, diffed_row, pk_value, - case when diff_type = 'Actual:' then 1 else 2 end rnk, - 1 final_order, - col_name - from ( ]' - || case when a_unordered then q'[ - select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, pk_value, col_name - from ( - select nvl(exp.rn, act.rn) rn, - nvl(exp.pk_value, act.pk_value) pk_value, - exp.col exp_item, - act.col act_item, - nvl(exp.col_name,act.col_name) col_name - from exp - join act - on exp.rn = act.rn and exp.col_name = act.col_name - where dbms_lob.compare(exp.col_val, act.col_val) != 0 - ) - unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:') ) ]' - else q'[ - select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, null pk_value, col_name - from ( - select nvl(exp.rn, act.rn) rn, - xmlagg(exp.col order by exp.col_no) exp_item, - xmlagg(act.col order by act.col_no) act_item, - max(nvl(exp.col_name,act.col_name)) col_name - from exp exp - join act act - on exp.rn = act.rn and exp.col_name = act.col_name - where dbms_lob.compare(exp.col_val, act.col_val) != 0 - group by (exp.rn, act.rn) - ) - unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:') ) ]' - end ||q'[ - ) - union all - select - item_no as rn, - case when exp_data_id is null then 'Extra:' else 'Missing:' end as diff_type, - xmlserialize( - content ( - extract( (case when exp_data_id is null then act_item_data else exp_item_data end),'/*/*') - ) no indent - ) diffed_row, - nvl2( - :join_by, - replace( - extract( case when exp_data_id is null then act_item_data else exp_item_data end, :join_by ).getclobval(), - chr(10) - ), - null - ) pk_value, - case when exp_data_id is null then 1 else 2 end rnk, - 2 final_order, - null col_name - from ut_compound_data_diff_tmp i - where diff_id = :diff_id - and act_data_id is null or exp_data_id is null - ) - order by final_order,]' - ||case when a_enforce_column_order or (not(a_enforce_column_order) and not(a_unordered)) then - q'[ - case when final_order = 1 then rn else rnk end, - case when final_order = 1 then rnk else rn end - ]' - when a_unordered then - q'[ - case when final_order = 1 then col_name else to_char(rnk) end, - case when final_order = 1 then to_char(rn) else col_name end, - case when final_order = 1 then to_char(rnk) else col_name end - ]' - else - null - end; - execute immediate l_sql - bulk collect into l_results - using l_exp_extract_xpath, l_join_xpath, a_diff_id, a_expected_dataset_guid,a_extract_path, - l_act_extract_xpath, l_join_xpath, a_diff_id, a_actual_dataset_guid,a_extract_path, - l_join_xpath, l_join_xpath, a_diff_id; - return l_results; - end; - - function get_hash(a_data raw, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash is - begin - return dbms_crypto.hash(a_data, a_hash_type); - end; - - function get_hash(a_data clob, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash is - begin - return dbms_crypto.hash(a_data, a_hash_type); - end; - - function get_fixed_size_hash(a_string varchar2, a_base integer :=0,a_size integer := 9999999) return number is - begin - return dbms_utility.get_hash_value(a_string,a_base,a_size); - end; - - procedure insert_diffs_result(a_diff_tab t_diff_tab, a_diff_id raw) is - begin - forall idx in 1..a_diff_tab.count save exceptions - insert into ut_compound_data_diff_tmp - ( diff_id, act_item_data, act_data_id, exp_item_data, exp_data_id, item_no, duplicate_no ) - values - (a_diff_id, - xmlelement( name "ROW", a_diff_tab(idx).act_item_data), a_diff_tab(idx).act_data_id, - xmlelement( name "ROW", a_diff_tab(idx).exp_item_data), a_diff_tab(idx).exp_data_id, - a_diff_tab(idx).item_no, a_diff_tab(idx).dup_no); - exception - when ut_utils.ex_failure_for_all then - raise_application_error(ut_utils.gc_dml_for_all,'Failure to insert a diff tmp data.'); - end; - - procedure set_rows_diff(a_rows_diff integer) is - begin - g_diff_count := a_rows_diff; - end; - - procedure cleanup_diff is - begin - g_diff_count := 0; - end; - - function get_rows_diff_count return integer is - begin - return g_diff_count; - end; - - function is_sql_compare_allowed(a_type_name varchar2) - return boolean is - l_assert boolean; - begin - --clob/blob/xmltype/object/nestedcursor/nestedtable - if a_type_name IN (g_type_name_map(dbms_sql.blob_type), - g_type_name_map(dbms_sql.clob_type), - g_type_name_map(dbms_sql.long_type), - g_type_name_map(dbms_sql.long_raw_type), - g_type_name_map(dbms_sql.bfile_type), - g_anytype_name_map(dbms_types.typecode_namedcollection)) - then - l_assert := false; - else - l_assert := true; - end if; - return l_assert; - end; - - function get_column_type_desc(a_type_code in integer, a_dbms_sql_desc in boolean) - return varchar2 is - begin - return - case - when a_dbms_sql_desc then g_type_name_map(a_type_code) - else g_anytype_name_map(a_type_code) - end; - end; - - function get_compare_cursor(a_diff_cursor_text in clob,a_self_id raw, a_other_id raw) return sys_refcursor is - l_diff_cursor sys_refcursor; - begin - open l_diff_cursor for a_diff_cursor_text using a_self_id, a_other_id; - return l_diff_cursor; - end; - - function create_err_cursor_msg(a_error_stack varchar2) return varchar2 is - begin - return 'SQL exception thrown when fetching data from cursor:'|| - ut_utils.remove_error_from_stack(sqlerrm,ut_utils.gc_xml_processing)||chr(10)|| - ut_expectation_processor.who_called_expectation(a_error_stack)|| - 'Check the query and data for errors.'; - end; - - function type_no_length ( a_type_name varchar2) return boolean is - begin - return case - when g_type_no_length_map.exists(a_type_name) then - true - else - false - end; - end; - -begin - g_anytype_name_map(dbms_types.typecode_date) := 'DATE'; - g_anytype_name_map(dbms_types.typecode_number) := 'NUMBER'; - g_anytype_name_map(3 /*INTEGER in object type*/) := 'NUMBER'; - g_anytype_name_map(dbms_types.typecode_raw) := 'RAW'; - g_anytype_name_map(dbms_types.typecode_char) := 'CHAR'; - g_anytype_name_map(dbms_types.typecode_varchar2) := 'VARCHAR2'; - g_anytype_name_map(dbms_types.typecode_varchar) := 'VARCHAR'; - g_anytype_name_map(dbms_types.typecode_blob) := 'BLOB'; - g_anytype_name_map(dbms_types.typecode_bfile) := 'BFILE'; - g_anytype_name_map(dbms_types.typecode_clob) := 'CLOB'; - g_anytype_name_map(dbms_types.typecode_timestamp) := 'TIMESTAMP'; - g_anytype_name_map(dbms_types.typecode_timestamp_tz) := 'TIMESTAMP WITH TIME ZONE'; - g_anytype_name_map(dbms_types.typecode_timestamp_ltz) := 'TIMESTAMP WITH LOCAL TIME ZONE'; - g_anytype_name_map(dbms_types.typecode_interval_ym) := 'INTERVAL YEAR TO MONTH'; - g_anytype_name_map(dbms_types.typecode_interval_ds) := 'INTERVAL DAY TO SECOND'; - g_anytype_name_map(dbms_types.typecode_bfloat) := 'BINARY_FLOAT'; - g_anytype_name_map(dbms_types.typecode_bdouble) := 'BINARY_DOUBLE'; - g_anytype_name_map(dbms_types.typecode_urowid) := 'UROWID'; - g_anytype_name_map(dbms_types.typecode_varray) := 'VARRRAY'; - g_anytype_name_map(dbms_types.typecode_table) := 'TABLE'; - g_anytype_name_map(dbms_types.typecode_namedcollection) := 'NAMEDCOLLECTION'; - g_anytype_name_map(dbms_types.typecode_object) := 'OBJECT'; - - g_type_name_map( dbms_sql.binary_bouble_type ) := 'BINARY_DOUBLE'; - g_type_name_map( dbms_sql.bfile_type ) := 'BFILE'; - g_type_name_map( dbms_sql.binary_float_type ) := 'BINARY_FLOAT'; - g_type_name_map( dbms_sql.blob_type ) := 'BLOB'; - g_type_name_map( dbms_sql.long_raw_type ) := 'LONG RAW'; - g_type_name_map( dbms_sql.char_type ) := 'CHAR'; - g_type_name_map( dbms_sql.clob_type ) := 'CLOB'; - g_type_name_map( dbms_sql.long_type ) := 'LONG'; - g_type_name_map( dbms_sql.date_type ) := 'DATE'; - g_type_name_map( dbms_sql.interval_day_to_second_type ) := 'INTERVAL DAY TO SECOND'; - g_type_name_map( dbms_sql.interval_year_to_month_type ) := 'INTERVAL YEAR TO MONTH'; - g_type_name_map( dbms_sql.raw_type ) := 'RAW'; - g_type_name_map( dbms_sql.timestamp_type ) := 'TIMESTAMP'; - g_type_name_map( dbms_sql.timestamp_with_tz_type ) := 'TIMESTAMP WITH TIME ZONE'; - g_type_name_map( dbms_sql.timestamp_with_local_tz_type ) := 'TIMESTAMP WITH LOCAL TIME ZONE'; - g_type_name_map( dbms_sql.varchar2_type ) := 'VARCHAR2'; - g_type_name_map( dbms_sql.number_type ) := 'NUMBER'; - g_type_name_map( dbms_sql.rowid_type ) := 'ROWID'; - g_type_name_map( dbms_sql.urowid_type ) := 'UROWID'; - g_type_name_map( dbms_sql.user_defined_type ) := 'USER_DEFINED_TYPE'; - g_type_name_map( dbms_sql.ref_type ) := 'REF_TYPE'; - - - /** - * List of types that have no length but can produce a max_len from desc_cursor function. - */ - g_type_no_length_map('ROWID') := 'ROWID'; - g_type_no_length_map('INTERVAL DAY TO SECOND') := 'INTERVAL DAY TO SECOND'; - g_type_no_length_map('INTERVAL YEAR TO MONTH') := 'INTERVAL YEAR TO MONTH'; - g_type_no_length_map('BINARY_DOUBLE') := 'BINARY_DOUBLE'; - g_type_no_length_map('BINARY_FLOAT') := 'BINARY_FLOAT'; -end; -/ +create or replace package body ut_compound_data_helper is + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + g_diff_count integer; + type t_type_name_map is table of varchar2(128) index by binary_integer; + type t_types_no_length is table of varchar2(128) index by varchar2(128); + g_type_name_map t_type_name_map; + g_anytype_name_map t_type_name_map; + g_type_no_length_map t_types_no_length; + + g_compare_sql_template varchar2(4000) := + q'[ + with exp as ( + select + ucd.*, + {:duplicate_number:} dup_no + from ( + select + ucd.item_data + ,x.data_id data_id + ,position + x.item_no item_no + {:columns:} + from {:ut3_owner:}.ut_compound_data_tmp x, + xmltable('/ROWSET/ROW' passing x.item_data columns + item_data xmltype path '*' + ,position for ordinality + {:xml_to_columns:} ) ucd + where data_id = :exp_guid + ) ucd + ) + , act as ( + select + ucd.*, + {:duplicate_number:} dup_no + from ( + select + ucd.item_data + ,x.data_id data_id + ,position + x.item_no item_no + {:columns:} + from {:ut3_owner:}.ut_compound_data_tmp x, + xmltable('/ROWSET/ROW' passing x.item_data columns + item_data xmltype path '*' + ,position for ordinality + {:xml_to_columns:} ) ucd + where data_id = :act_guid + ) ucd + ) + select + a.item_data as act_item_data, + a.data_id act_data_id, + e.item_data as exp_item_data, + e.data_id exp_data_id, + {:item_no:} as item_no, + nvl(e.dup_no,a.dup_no) dup_no + from act a {:join_type:} exp e on ( {:join_condition:} ) + where {:where_condition:}]'; + + function get_columns_diff( + a_expected ut_cursor_column_tab, + a_actual ut_cursor_column_tab, + a_order_enforced boolean := false + ) return tt_column_diffs is + l_results tt_column_diffs; + begin + execute immediate q'[with + expected_cols as ( + select display_path exp_column_name,column_position exp_col_pos, + replace(column_type_name,'VARCHAR2','CHAR') exp_col_type_compare, column_type_name exp_col_type + from table(:a_expected) + where parent_name is null and hierarchy_level = 1 and column_name is not null + ), + actual_cols as ( + select display_path act_column_name,column_position act_col_pos, + replace(column_type_name,'VARCHAR2','CHAR') act_col_type_compare, column_type_name act_col_type + from table(:a_actual) + where parent_name is null and hierarchy_level = 1 and column_name is not null + ), + joined_cols as ( + select e.*,a.*]' + || case when a_order_enforced then ', + row_number() over(partition by case when a.act_col_pos + e.exp_col_pos is not null then 1 end order by a.act_col_pos) a_pos_nn, + row_number() over(partition by case when a.act_col_pos + e.exp_col_pos is not null then 1 end order by e.exp_col_pos) e_pos_nn' + else + null + end ||q'[ + from expected_cols e + full outer join actual_cols a + on e.exp_column_name = a.act_column_name + ) + select case + when exp_col_pos is null and act_col_pos is not null then '+' + when exp_col_pos is not null and act_col_pos is null then '-' + when exp_col_type_compare != act_col_type_compare then 't' + else 'p' + end as diff_type, + exp_column_name, exp_col_type, exp_col_pos, + act_column_name, act_col_type, act_col_pos + from joined_cols + --column is unexpected (extra) or missing + where act_col_pos is null or exp_col_pos is null + --column type is not matching (except CHAR/VARCHAR2) + or act_col_type_compare != exp_col_type_compare]' + || case when a_order_enforced then q'[ + --column position is not matching (both when excluded extra/missing columns as well as when they are included) + or (a_pos_nn != e_pos_nn and exp_col_pos != act_col_pos)]' + else + null + end ||q'[ + order by exp_col_pos, act_col_pos]' + bulk collect into l_results using a_expected, a_actual; + return l_results; + end; + + function generate_not_equal_stmt( + a_data_info ut_cursor_column, a_pk_table ut_varchar2_list + ) return varchar2 + is + l_pk_tab ut_varchar2_list := coalesce(a_pk_table,ut_varchar2_list()); + l_index integer; + l_sql_stmt varchar2(32767); + l_exists boolean := false; + begin + l_index := l_pk_tab.first; + if l_pk_tab.count > 0 then + loop + if a_data_info.access_path = l_pk_tab(l_index) then + l_exists := true; + end if; + exit when l_index = l_pk_tab.count or (a_data_info.access_path = l_pk_tab(l_index)); + l_index := a_pk_table.next(l_index); + end loop; + end if; + if not(l_exists) then + l_sql_stmt := ' (decode(a.'||a_data_info.transformed_name||','||' e.'||a_data_info.transformed_name||',1,0) = 0)'; + end if; + return l_sql_stmt; + end; + + function generate_join_by_stmt( + a_data_info ut_cursor_column, a_pk_table ut_varchar2_list + ) return varchar2 + is + l_pk_tab ut_varchar2_list := coalesce(a_pk_table,ut_varchar2_list()); + l_index integer; + l_sql_stmt varchar2(32767); + begin + if l_pk_tab.count <> 0 then + l_index:= l_pk_tab.first; + loop + if l_pk_tab(l_index) in (a_data_info.access_path, a_data_info.parent_name) then + --When then table is nested and join is on whole table + l_sql_stmt := l_sql_stmt ||' a.'||a_data_info.transformed_name||q'[ = ]'||' e.'||a_data_info.transformed_name; + end if; + exit when (a_data_info.access_path = l_pk_tab(l_index)) or l_index = l_pk_tab.count; + l_index := l_pk_tab.next(l_index); + end loop; + end if; + return l_sql_stmt; + end; + + function generate_equal_sql(a_col_name in varchar2) return varchar2 is + begin + return ' decode(a.'||a_col_name||','||' e.'||a_col_name||',1,0) = 1 '; + end; + + function generate_partition_stmt( + a_data_info ut_cursor_column, a_pk_table in ut_varchar2_list, a_alias varchar2 := 'ucd.' + ) return varchar2 + is + l_index integer; + l_sql_stmt varchar2(32767); + begin + if a_pk_table is not empty then + l_index:= a_pk_table.first; + loop + if a_pk_table(l_index) in (a_data_info.access_path, a_data_info.parent_name) then + --When then table is nested and join is on whole table + l_sql_stmt := l_sql_stmt ||a_alias||a_data_info.transformed_name; + end if; + exit when (a_data_info.access_path = a_pk_table(l_index)) or l_index = a_pk_table.count; + l_index := a_pk_table.next(l_index); + end loop; + else + l_sql_stmt := a_alias||a_data_info.transformed_name; + end if; + return l_sql_stmt; + end; + + function generate_select_stmt(a_data_info ut_cursor_column, a_alias varchar2 := 'ucd.') + return varchar2 + is + l_alias varchar2(10) := a_alias; + l_col_syntax varchar2(4000); + l_ut_owner varchar2(250) := ut_utils.ut_owner; + begin + if a_data_info.is_sql_diffable = 0 then + l_col_syntax := l_ut_owner ||'.ut_compound_data_helper.get_hash('||l_alias||a_data_info.transformed_name||'.getClobVal()) as '||a_data_info.transformed_name ; + elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type = 'DATE' then + l_col_syntax := 'to_date('||l_alias||a_data_info.transformed_name||') as '|| a_data_info.transformed_name; + elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('TIMESTAMP') then + l_col_syntax := 'to_timestamp('||l_alias||a_data_info.transformed_name||','''||ut_utils.gc_timestamp_format||''') as '|| a_data_info.transformed_name; + elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('TIMESTAMP WITH TIME ZONE') then + l_col_syntax := 'to_timestamp_tz('||l_alias||a_data_info.transformed_name||','''||ut_utils.gc_timestamp_tz_format||''') as '|| a_data_info.transformed_name; + elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('TIMESTAMP WITH LOCAL TIME ZONE') then + l_col_syntax := ' cast( to_timestamp_tz('||l_alias||a_data_info.transformed_name||','''||ut_utils.gc_timestamp_tz_format||''') AS TIMESTAMP WITH LOCAL TIME ZONE) as '|| a_data_info.transformed_name; + else + l_col_syntax := l_alias||a_data_info.transformed_name||' as '|| a_data_info.transformed_name; + end if; + return l_col_syntax; + end; + + function generate_xmltab_stmt(a_data_info ut_cursor_column) return varchar2 is + l_col_type varchar2(4000); + begin + if a_data_info.is_sql_diffable = 0 then + l_col_type := 'XMLTYPE'; + elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('DATE','TIMESTAMP','TIMESTAMP WITH TIME ZONE', + 'TIMESTAMP WITH LOCAL TIME ZONE') then + l_col_type := 'VARCHAR2(50)'; + elsif a_data_info.is_sql_diffable = 1 and type_no_length(a_data_info.column_type) then + l_col_type := a_data_info.column_type; + elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('VARCHAR2','CHAR') then + l_col_type := 'VARCHAR2('||greatest(a_data_info.column_len,4000)||')'; + elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('NUMBER') then + --We cannot use a precision and scale as dbms_sql.describe_columns3 return precision 0 for dual table + -- there is also no need for that as we not process data but only read and compare as they are stored + l_col_type := a_data_info.column_type; + else + l_col_type := a_data_info.column_type + ||case when a_data_info.column_len is not null + then '('||a_data_info.column_len||')' + else null + end; + end if; + return a_data_info.transformed_name||' '||l_col_type||q'[ PATH ']'||a_data_info.access_path||q'[']'; + end; + + procedure gen_sql_pieces_out_of_cursor( + a_data_info ut_cursor_column_tab, + a_pk_table ut_varchar2_list, + a_unordered boolean, + a_xml_stmt out nocopy clob, + a_select_stmt out nocopy clob, + a_partition_stmt out nocopy clob, + a_join_by_stmt out nocopy clob, + a_not_equal_stmt out nocopy clob + ) is + l_partition_tmp clob; + l_xmltab_list ut_varchar2_list := ut_varchar2_list(); + l_select_list ut_varchar2_list := ut_varchar2_list(); + l_partition_list ut_varchar2_list := ut_varchar2_list(); + l_equal_list ut_varchar2_list := ut_varchar2_list(); + l_join_by_list ut_varchar2_list := ut_varchar2_list(); + l_not_equal_list ut_varchar2_list := ut_varchar2_list(); + + procedure add_element_to_list(a_list in out ut_varchar2_list, a_list_element in varchar2) + is + begin + if a_list_element is not null then + a_list.extend; + a_list(a_list.last) := a_list_element; + end if; + end; + + begin + if a_data_info is not empty then + for i in 1..a_data_info.count loop + if a_data_info(i).has_nested_col = 0 then + --Get XMLTABLE column list + add_element_to_list(l_xmltab_list,generate_xmltab_stmt(a_data_info(i))); + --Get Select statment list of columns + add_element_to_list(l_select_list, generate_select_stmt(a_data_info(i))); + --Get columns by which we partition + add_element_to_list(l_partition_list,generate_partition_stmt(a_data_info(i), a_pk_table)); + --Get equal statement + add_element_to_list(l_equal_list,generate_equal_sql(a_data_info(i).transformed_name)); + --Generate join by stmt + add_element_to_list(l_join_by_list,generate_join_by_stmt(a_data_info(i), a_pk_table)); + --Generate not equal stmt + add_element_to_list(l_not_equal_list,generate_not_equal_stmt(a_data_info(i), a_pk_table)); + end if; + end loop; + + a_xml_stmt := nullif(','||ut_utils.table_to_clob(l_xmltab_list, ' , '),','); + a_select_stmt := nullif(','||ut_utils.table_to_clob(l_select_list, ' , '),','); + l_partition_tmp := ut_utils.table_to_clob(l_partition_list, ' , '); + ut_utils.append_to_clob(a_partition_stmt,' row_number() over (partition by '||l_partition_tmp||' order by '||l_partition_tmp||' ) '); + + if a_pk_table.count > 0 then + -- If key defined do the join or these and where on diffrences + a_join_by_stmt := ut_utils.table_to_clob(l_join_by_list, ' and '); + elsif a_unordered then + -- If no key defined do the join on all columns + a_join_by_stmt := ' e.dup_no = a.dup_no and '||ut_utils.table_to_clob(l_equal_list, ' and '); + else + -- Else join on rownumber + a_join_by_stmt := 'a.item_no = e.item_no '; + end if; + a_not_equal_stmt := ut_utils.table_to_clob(l_not_equal_list, ' or '); + else + --Partition by piece when no data + ut_utils.append_to_clob(a_partition_stmt,' 1 '); + a_join_by_stmt := 'a.item_no = e.item_no '; + end if; + end; + + function gen_compare_sql( + a_other ut_data_value_refcursor, + a_join_by_list ut_varchar2_list, + a_unordered boolean, + a_inclusion_type boolean, + a_is_negated boolean + ) return clob is + l_compare_sql clob; + l_xmltable_stmt clob; + l_select_stmt clob; + l_partition_stmt clob; + l_join_on_stmt clob; + l_not_equal_stmt clob; + l_where_stmt clob; + l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_join_by_list ut_varchar2_list; + + function get_join_type(a_inclusion_compare in boolean,a_negated in boolean) return varchar2 is + begin + return + case + when a_inclusion_compare and not(a_negated) then ' right outer join ' + when a_inclusion_compare and a_negated then ' inner join ' + else ' full outer join ' + end; + end; + + function get_item_no(a_unordered boolean) return varchar2 is + begin + return + case + when a_unordered then 'row_number() over ( order by nvl(e.item_no,a.item_no))' + else 'nvl(e.item_no,a.item_no) ' + end; + end; + + begin + /** + * We already estabilished cursor equality so now we add anydata root if we compare anydata + * to join by. + */ + l_join_by_list := + case + when a_other is of (ut_data_value_anydata) then ut_utils.add_prefix(a_join_by_list, a_other.cursor_details.get_root) + else a_join_by_list + end; + + dbms_lob.createtemporary(l_compare_sql, true); + --Initiate a SQL template with placeholders + ut_utils.append_to_clob(l_compare_sql, g_compare_sql_template); + --Generate a pieceso of dynamic SQL that will substitute placeholders + gen_sql_pieces_out_of_cursor( + a_other.cursor_details.cursor_columns_info, l_join_by_list, a_unordered, + l_xmltable_stmt, l_select_stmt, l_partition_stmt, l_join_on_stmt, + l_not_equal_stmt + ); + + l_compare_sql := replace(l_compare_sql,'{:duplicate_number:}',l_partition_stmt); + l_compare_sql := replace(l_compare_sql,'{:columns:}',l_select_stmt); + l_compare_sql := replace(l_compare_sql,'{:ut3_owner:}',l_ut_owner); + l_compare_sql := replace(l_compare_sql,'{:xml_to_columns:}',l_xmltable_stmt); + l_compare_sql := replace(l_compare_sql,'{:item_no:}',get_item_no(a_unordered)); + l_compare_sql := replace(l_compare_sql,'{:join_type:}',get_join_type(a_inclusion_type,a_is_negated)); + l_compare_sql := replace(l_compare_sql,'{:join_condition:}',l_join_on_stmt); + + if l_not_equal_stmt is not null and ((l_join_by_list.count > 0 and not a_is_negated) or (not a_unordered)) then + ut_utils.append_to_clob(l_where_stmt,' ( '||l_not_equal_stmt||' ) or '); + end if; + --If its inclusion we expect a actual set to fully match and have no extra elements over expected + if a_inclusion_type then + ut_utils.append_to_clob(l_where_stmt,case when a_is_negated then ' 1 = 1 ' else ' ( a.data_id is null ) ' end); + else + ut_utils.append_to_clob(l_where_stmt,' (a.data_id is null or e.data_id is null) '); + end if; + + l_compare_sql := replace(l_compare_sql,'{:where_condition:}',l_where_stmt); + return l_compare_sql; + end; + + function get_column_extract_path(a_cursor_info ut_cursor_column_tab) return ut_varchar2_list is + l_column_list ut_varchar2_list := ut_varchar2_list(); + begin + for i in 1..a_cursor_info.count loop + l_column_list.extend; + l_column_list(l_column_list.last) := a_cursor_info(i).access_path; + end loop; + return l_column_list; + end; + + function get_rows_diff_by_sql( + a_act_cursor_info ut_cursor_column_tab, a_exp_cursor_info ut_cursor_column_tab, + a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, + a_join_by_list ut_varchar2_list, a_unordered boolean, a_enforce_column_order boolean := false, + a_extract_path varchar2 + ) return tt_row_diffs is + l_act_extract_xpath varchar2(32767):= ut_utils.to_xpath(get_column_extract_path(a_act_cursor_info)); + l_exp_extract_xpath varchar2(32767):= ut_utils.to_xpath(get_column_extract_path(a_exp_cursor_info)); + l_join_xpath varchar2(32767) := ut_utils.to_xpath(a_join_by_list); + l_results tt_row_diffs; + l_sql varchar2(32767); + begin + l_sql := q'[ + with exp as ( + select + exp_item_data, exp_data_id, item_no rn, rownum col_no, pk_value, + s.column_value col, s.column_value.getRootElement() col_name, + nvl(s.column_value.getclobval(),empty_clob()) col_val + from ( + select + exp_data_id, extract( ucd.exp_item_data, :column_path ) exp_item_data, item_no, + replace( extract( ucd.exp_item_data, :join_by ).getclobval(), chr(10) ) pk_value + from ut_compound_data_diff_tmp ucd + where diff_id = :diff_id + and ucd.exp_data_id = :self_guid + ) i, + table( xmlsequence( extract(i.exp_item_data,:extract_path) ) ) s + ), + act as ( + select + act_item_data, act_data_id, item_no rn, rownum col_no, pk_value, + s.column_value col, s.column_value.getRootElement() col_name, + nvl(s.column_value.getclobval(),empty_clob()) col_val + from ( + select + act_data_id, extract( ucd.act_item_data, :column_path ) act_item_data, item_no, + replace( extract( ucd.act_item_data, :join_by ).getclobval(), chr(10) ) pk_value + from ut_compound_data_diff_tmp ucd + where diff_id = :diff_id + and ucd.act_data_id = :other_guid + ) i, + table( xmlsequence( extract(i.act_item_data,:extract_path) ) ) s + ) + select rn, diff_type, diffed_row, pk_value pk_value + from ( + select rn, diff_type, diffed_row, pk_value, + case when diff_type = 'Actual:' then 1 else 2 end rnk, + 1 final_order, + col_name + from ( ]' + || case when a_unordered then q'[ + select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, pk_value, col_name + from ( + select nvl(exp.rn, act.rn) rn, + nvl(exp.pk_value, act.pk_value) pk_value, + exp.col exp_item, + act.col act_item, + nvl(exp.col_name,act.col_name) col_name + from exp + join act + on exp.rn = act.rn and exp.col_name = act.col_name + where dbms_lob.compare(exp.col_val, act.col_val) != 0 + ) + unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:') ) ]' + else q'[ + select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, null pk_value, col_name + from ( + select nvl(exp.rn, act.rn) rn, + xmlagg(exp.col order by exp.col_no) exp_item, + xmlagg(act.col order by act.col_no) act_item, + max(nvl(exp.col_name,act.col_name)) col_name + from exp exp + join act act + on exp.rn = act.rn and exp.col_name = act.col_name + where dbms_lob.compare(exp.col_val, act.col_val) != 0 + group by (exp.rn, act.rn) + ) + unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:') ) ]' + end ||q'[ + ) + union all + select + item_no as rn, + case when exp_data_id is null then 'Extra:' else 'Missing:' end as diff_type, + xmlserialize( + content ( + extract( (case when exp_data_id is null then act_item_data else exp_item_data end),'/*/*') + ) no indent + ) diffed_row, + nvl2( + :join_by, + replace( + extract( case when exp_data_id is null then act_item_data else exp_item_data end, :join_by ).getclobval(), + chr(10) + ), + null + ) pk_value, + case when exp_data_id is null then 1 else 2 end rnk, + 2 final_order, + null col_name + from ut_compound_data_diff_tmp i + where diff_id = :diff_id + and act_data_id is null or exp_data_id is null + ) + order by final_order,]' + ||case when a_enforce_column_order or (not(a_enforce_column_order) and not(a_unordered)) then + q'[ + case when final_order = 1 then rn else rnk end, + case when final_order = 1 then rnk else rn end + ]' + when a_unordered then + q'[ + case when final_order = 1 then col_name else to_char(rnk) end, + case when final_order = 1 then to_char(rn) else col_name end, + case when final_order = 1 then to_char(rnk) else col_name end + ]' + else + null + end; + execute immediate l_sql + bulk collect into l_results + using l_exp_extract_xpath, l_join_xpath, a_diff_id, a_expected_dataset_guid,a_extract_path, + l_act_extract_xpath, l_join_xpath, a_diff_id, a_actual_dataset_guid,a_extract_path, + l_join_xpath, l_join_xpath, a_diff_id; + return l_results; + end; + + function get_hash(a_data raw, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash is + begin + return dbms_crypto.hash(a_data, a_hash_type); + end; + + function get_hash(a_data clob, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash is + begin + return dbms_crypto.hash(a_data, a_hash_type); + end; + + function get_fixed_size_hash(a_string varchar2, a_base integer :=0,a_size integer := 9999999) return number is + begin + return dbms_utility.get_hash_value(a_string,a_base,a_size); + end; + + procedure insert_diffs_result(a_diff_tab t_diff_tab, a_diff_id raw) is + begin + forall idx in 1..a_diff_tab.count save exceptions + insert into ut_compound_data_diff_tmp + ( diff_id, act_item_data, act_data_id, exp_item_data, exp_data_id, item_no, duplicate_no ) + values + (a_diff_id, + xmlelement( name "ROW", a_diff_tab(idx).act_item_data), a_diff_tab(idx).act_data_id, + xmlelement( name "ROW", a_diff_tab(idx).exp_item_data), a_diff_tab(idx).exp_data_id, + a_diff_tab(idx).item_no, a_diff_tab(idx).dup_no); + exception + when ut_utils.ex_failure_for_all then + raise_application_error(ut_utils.gc_dml_for_all,'Failure to insert a diff tmp data.'); + end; + + procedure set_rows_diff(a_rows_diff integer) is + begin + g_diff_count := a_rows_diff; + end; + + procedure cleanup_diff is + begin + g_diff_count := 0; + end; + + function get_rows_diff_count return integer is + begin + return g_diff_count; + end; + + function is_sql_compare_allowed(a_type_name varchar2) + return boolean is + l_assert boolean; + begin + --clob/blob/xmltype/object/nestedcursor/nestedtable + if a_type_name IN (g_type_name_map(dbms_sql.blob_type), + g_type_name_map(dbms_sql.clob_type), + g_type_name_map(dbms_sql.long_type), + g_type_name_map(dbms_sql.long_raw_type), + g_type_name_map(dbms_sql.bfile_type), + g_anytype_name_map(dbms_types.typecode_namedcollection)) + then + l_assert := false; + else + l_assert := true; + end if; + return l_assert; + end; + + function get_column_type_desc(a_type_code in integer, a_dbms_sql_desc in boolean) + return varchar2 is + begin + return + case + when a_dbms_sql_desc then g_type_name_map(a_type_code) + else g_anytype_name_map(a_type_code) + end; + end; + + function get_compare_cursor(a_diff_cursor_text in clob,a_self_id raw, a_other_id raw) return sys_refcursor is + l_diff_cursor sys_refcursor; + begin + open l_diff_cursor for a_diff_cursor_text using a_self_id, a_other_id; + return l_diff_cursor; + end; + + function create_err_cursor_msg(a_error_stack varchar2) return varchar2 is + begin + return 'SQL exception thrown when fetching data from cursor:'|| + ut_utils.remove_error_from_stack(sqlerrm,ut_utils.gc_xml_processing)||chr(10)|| + ut_expectation_processor.who_called_expectation(a_error_stack)|| + 'Check the query and data for errors.'; + end; + + function type_no_length ( a_type_name varchar2) return boolean is + begin + return case + when g_type_no_length_map.exists(a_type_name) then + true + else + false + end; + end; + +begin + g_anytype_name_map(dbms_types.typecode_date) := 'DATE'; + g_anytype_name_map(dbms_types.typecode_number) := 'NUMBER'; + g_anytype_name_map(3 /*INTEGER in object type*/) := 'NUMBER'; + g_anytype_name_map(dbms_types.typecode_raw) := 'RAW'; + g_anytype_name_map(dbms_types.typecode_char) := 'CHAR'; + g_anytype_name_map(dbms_types.typecode_varchar2) := 'VARCHAR2'; + g_anytype_name_map(dbms_types.typecode_varchar) := 'VARCHAR'; + g_anytype_name_map(dbms_types.typecode_blob) := 'BLOB'; + g_anytype_name_map(dbms_types.typecode_bfile) := 'BFILE'; + g_anytype_name_map(dbms_types.typecode_clob) := 'CLOB'; + g_anytype_name_map(dbms_types.typecode_timestamp) := 'TIMESTAMP'; + g_anytype_name_map(dbms_types.typecode_timestamp_tz) := 'TIMESTAMP WITH TIME ZONE'; + g_anytype_name_map(dbms_types.typecode_timestamp_ltz) := 'TIMESTAMP WITH LOCAL TIME ZONE'; + g_anytype_name_map(dbms_types.typecode_interval_ym) := 'INTERVAL YEAR TO MONTH'; + g_anytype_name_map(dbms_types.typecode_interval_ds) := 'INTERVAL DAY TO SECOND'; + g_anytype_name_map(dbms_types.typecode_bfloat) := 'BINARY_FLOAT'; + g_anytype_name_map(dbms_types.typecode_bdouble) := 'BINARY_DOUBLE'; + g_anytype_name_map(dbms_types.typecode_urowid) := 'UROWID'; + g_anytype_name_map(dbms_types.typecode_varray) := 'VARRRAY'; + g_anytype_name_map(dbms_types.typecode_table) := 'TABLE'; + g_anytype_name_map(dbms_types.typecode_namedcollection) := 'NAMEDCOLLECTION'; + g_anytype_name_map(dbms_types.typecode_object) := 'OBJECT'; + + g_type_name_map( dbms_sql.binary_bouble_type ) := 'BINARY_DOUBLE'; + g_type_name_map( dbms_sql.bfile_type ) := 'BFILE'; + g_type_name_map( dbms_sql.binary_float_type ) := 'BINARY_FLOAT'; + g_type_name_map( dbms_sql.blob_type ) := 'BLOB'; + g_type_name_map( dbms_sql.long_raw_type ) := 'LONG RAW'; + g_type_name_map( dbms_sql.char_type ) := 'CHAR'; + g_type_name_map( dbms_sql.clob_type ) := 'CLOB'; + g_type_name_map( dbms_sql.long_type ) := 'LONG'; + g_type_name_map( dbms_sql.date_type ) := 'DATE'; + g_type_name_map( dbms_sql.interval_day_to_second_type ) := 'INTERVAL DAY TO SECOND'; + g_type_name_map( dbms_sql.interval_year_to_month_type ) := 'INTERVAL YEAR TO MONTH'; + g_type_name_map( dbms_sql.raw_type ) := 'RAW'; + g_type_name_map( dbms_sql.timestamp_type ) := 'TIMESTAMP'; + g_type_name_map( dbms_sql.timestamp_with_tz_type ) := 'TIMESTAMP WITH TIME ZONE'; + g_type_name_map( dbms_sql.timestamp_with_local_tz_type ) := 'TIMESTAMP WITH LOCAL TIME ZONE'; + g_type_name_map( dbms_sql.varchar2_type ) := 'VARCHAR2'; + g_type_name_map( dbms_sql.number_type ) := 'NUMBER'; + g_type_name_map( dbms_sql.rowid_type ) := 'ROWID'; + g_type_name_map( dbms_sql.urowid_type ) := 'UROWID'; + g_type_name_map( dbms_sql.user_defined_type ) := 'USER_DEFINED_TYPE'; + g_type_name_map( dbms_sql.ref_type ) := 'REF_TYPE'; + + + /** + * List of types that have no length but can produce a max_len from desc_cursor function. + */ + g_type_no_length_map('ROWID') := 'ROWID'; + g_type_no_length_map('INTERVAL DAY TO SECOND') := 'INTERVAL DAY TO SECOND'; + g_type_no_length_map('INTERVAL YEAR TO MONTH') := 'INTERVAL YEAR TO MONTH'; + g_type_no_length_map('BINARY_DOUBLE') := 'BINARY_DOUBLE'; + g_type_no_length_map('BINARY_FLOAT') := 'BINARY_FLOAT'; +end; +/ diff --git a/source/expectations/data_values/ut_cursor_column.tps b/source/expectations/data_values/ut_cursor_column.tps index da3c004f2..93114c431 100644 --- a/source/expectations/data_values/ut_cursor_column.tps +++ b/source/expectations/data_values/ut_cursor_column.tps @@ -1,52 +1,52 @@ -create or replace type ut_cursor_column authid current_user as object ( - /* - utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project - - Licensed under the Apache License, Version 2.0 (the "License"): - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - parent_name varchar2(4000), - access_path varchar2(4000), - filter_path varchar2(4000), - display_path varchar2(4000), - has_nested_col number(1,0), - transformed_name varchar2(2000), - hierarchy_level number, - column_position number, - xml_valid_name varchar2(2000), - column_name varchar2(2000), - column_type varchar2(128), - column_type_name varchar2(128), - column_schema varchar2(128), - column_len integer, - column_precision integer, - column_scale integer, - is_sql_diffable number(1, 0), - is_collection number(1, 0), - - member procedure init(self in out nocopy ut_cursor_column, - a_col_name varchar2, a_col_schema_name varchar2, - a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, - a_col_position integer, a_col_type in varchar2, a_collection integer,a_access_path in varchar2, a_col_precision in integer, - a_col_scale integer), - - constructor function ut_cursor_column( self in out nocopy ut_cursor_column, - a_col_name varchar2, a_col_schema_name varchar2, - a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, - a_col_position integer, a_col_type in varchar2, a_collection integer, a_access_path in varchar2, a_col_precision in integer, - a_col_scale integer) - return self as result, - - constructor function ut_cursor_column( self in out nocopy ut_cursor_column) return self as result -) -/ +create or replace type ut_cursor_column authid current_user as object ( + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + parent_name varchar2(4000), + access_path varchar2(4000), + filter_path varchar2(4000), + display_path varchar2(4000), + has_nested_col number(1,0), + transformed_name varchar2(2000), + hierarchy_level number, + column_position number, + xml_valid_name varchar2(2000), + column_name varchar2(2000), + column_type varchar2(128), + column_type_name varchar2(128), + column_schema varchar2(128), + column_len integer, + column_precision integer, + column_scale integer, + is_sql_diffable number(1, 0), + is_collection number(1, 0), + + member procedure init(self in out nocopy ut_cursor_column, + a_col_name varchar2, a_col_schema_name varchar2, + a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, + a_col_position integer, a_col_type in varchar2, a_collection integer,a_access_path in varchar2, a_col_precision in integer, + a_col_scale integer), + + constructor function ut_cursor_column( self in out nocopy ut_cursor_column, + a_col_name varchar2, a_col_schema_name varchar2, + a_col_type_name varchar2, a_col_max_len integer, a_parent_name varchar2 := null, a_hierarchy_level integer := 1, + a_col_position integer, a_col_type in varchar2, a_collection integer, a_access_path in varchar2, a_col_precision in integer, + a_col_scale integer) + return self as result, + + constructor function ut_cursor_column( self in out nocopy ut_cursor_column) return self as result +) +/ diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb index 0c617a226..20313ed96 100644 --- a/source/expectations/data_values/ut_cursor_details.tpb +++ b/source/expectations/data_values/ut_cursor_details.tpb @@ -1,257 +1,256 @@ -create or replace type body ut_cursor_details as - - member function equals( a_other ut_cursor_details, a_match_options ut_matcher_options ) return boolean is - l_diffs integer; - begin - select count(1) into l_diffs - from table(self.cursor_columns_info) a - full outer join table(a_other.cursor_columns_info) e - on decode(a.parent_name,e.parent_name,1,0)= 1 - and a.column_name = e.column_name - and replace(a.column_type,'VARCHAR2','CHAR') = replace(e.column_type,'VARCHAR2','CHAR') - and ( a.column_position = e.column_position or a_match_options.columns_are_unordered_flag = 1 ) - where a.column_name is null or e.column_name is null; - return l_diffs = 0; - end; - - member procedure desc_compound_data( - self in out nocopy ut_cursor_details, a_compound_data anytype, - a_parent_name in varchar2, a_level in integer, a_access_path in varchar2 - ) is - l_idx pls_integer := 1; - l_elements_info ut_metadata.t_anytype_members_rec; - l_element_info ut_metadata.t_anytype_elem_info_rec; - l_is_collection boolean; - begin - l_elements_info := ut_metadata.get_anytype_members_info( a_compound_data ); - l_is_collection := ut_metadata.is_collection(l_elements_info.type_code); - if l_elements_info.elements_count is null then - l_element_info := ut_metadata.get_attr_elem_info( a_compound_data ); - self.cursor_columns_info.extend; - self.cursor_columns_info(cursor_columns_info.last) := - ut_cursor_column( - l_elements_info.type_name, - l_elements_info.schema_name, - null, - l_elements_info.length, - a_parent_name, - a_level, - l_idx, - ut_compound_data_helper.get_column_type_desc(l_elements_info.type_code,false), - ut_utils.boolean_to_int(l_is_collection), - a_access_path, - l_elements_info.precision, - l_elements_info.scale - ); - if l_element_info.attr_elt_type is not null then - desc_compound_data( - l_element_info.attr_elt_type, l_elements_info.type_name, - a_level + 1, a_access_path || '/' || l_elements_info.type_name - ); - end if; - else - while l_idx <= l_elements_info.elements_count loop - l_element_info := ut_metadata.get_attr_elem_info( a_compound_data, l_idx ); - - self.cursor_columns_info.extend; - self.cursor_columns_info(cursor_columns_info.last) := - ut_cursor_column( - l_element_info.attribute_name, - l_elements_info.schema_name, - null, - l_element_info.length, - a_parent_name, - a_level, - l_idx, - ut_compound_data_helper.get_column_type_desc(l_element_info.type_code,false), - ut_utils.boolean_to_int(l_is_collection), - a_access_path, - l_elements_info.precision, - l_elements_info.scale - ); - if l_element_info.attr_elt_type is not null then - desc_compound_data( - l_element_info.attr_elt_type, l_element_info.attribute_name, - a_level + 1, a_access_path || '/' || l_element_info.attribute_name - ); - end if; - l_idx := l_idx + 1; - end loop; - end if; - end; - - constructor function ut_cursor_details(self in out nocopy ut_cursor_details) return self as result is - begin - self.cursor_columns_info := ut_cursor_column_tab(); - return; - end; - - constructor function ut_cursor_details( - self in out nocopy ut_cursor_details, - a_cursor_number in number - ) return self as result is - l_columns_count pls_integer; - l_columns_desc dbms_sql.desc_tab3; - l_is_collection boolean; - l_hierarchy_level integer := 1; - begin - self.cursor_columns_info := ut_cursor_column_tab(); - self.is_anydata := 0; - dbms_sql.describe_columns3(a_cursor_number, l_columns_count, l_columns_desc); - - /** - * Due to a bug with object being part of cursor in ANYDATA scenario - * oracle fails to revert number to cursor. We ar using dbms_sql.close cursor to close it - * to avoid leaving open cursors behind. - * a_cursor := dbms_sql.to_refcursor(l_cursor_number); - **/ - for pos in 1 .. l_columns_count loop - l_is_collection := ut_metadata.is_collection( l_columns_desc(pos).col_schema_name, l_columns_desc(pos).col_type_name ); - self.cursor_columns_info.extend; - self.cursor_columns_info(self.cursor_columns_info.last) := - ut_cursor_column( - l_columns_desc(pos).col_name, - l_columns_desc(pos).col_schema_name, - l_columns_desc(pos).col_type_name, - l_columns_desc(pos).col_max_len, - null, - l_hierarchy_level, - pos, - ut_compound_data_helper.get_column_type_desc(l_columns_desc(pos).col_type,true), - ut_utils.boolean_to_int(l_is_collection), - null, - l_columns_desc(pos).col_precision, - l_columns_desc(pos).col_scale - ); - - if l_columns_desc(pos).col_type = dbms_sql.user_defined_type or l_is_collection then - desc_compound_data( - ut_metadata.get_user_defined_type( l_columns_desc(pos).col_schema_name, l_columns_desc(pos).col_type_name ), - l_columns_desc(pos).col_name, - l_hierarchy_level + 1, - l_columns_desc(pos).col_name - ); - end if; - end loop; - return; - end; - - member function contains_collection return boolean is - l_collection_elements number; - begin - select count(1) into l_collection_elements - from table(cursor_columns_info) c - where c.is_collection = 1 and rownum = 1; - return l_collection_elements > 0; - end; - - member function get_missing_join_by_columns( a_expected_columns ut_varchar2_list ) return ut_varchar2_list is - l_result ut_varchar2_list; - begin - --regexp_replace(c.access_path,'^\/?([^\/]+\/){1}') - select fl.column_value - bulk collect into l_result - from table(a_expected_columns) fl - where not exists ( - select 1 from table(self.cursor_columns_info) c - where regexp_like(c.filter_path,'^/?'||fl.column_value||'($|/.*)' ) - ) - order by fl.column_value; - return l_result; - end; - - member procedure filter_columns(self in out nocopy ut_cursor_details, a_match_options ut_matcher_options) is - l_result ut_cursor_details := self; - l_column_tab ut_cursor_column_tab := ut_cursor_column_tab(); - l_column ut_cursor_column; - c_xpath_extract_reg constant varchar2(50) := '^((/ROW/)|^(//)|^(/\*/))?(.*)'; - begin - if l_result.cursor_columns_info is not null then - - --limit columns to those on the include items minus exclude items - if a_match_options.include.items.count > 0 then - -- if include - exclude = 0 then keep all columns - if a_match_options.include.items != a_match_options.exclude.items then - with included_columns as ( - select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names - from table(a_match_options.include.items) - minus - select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names - from table(a_match_options.exclude.items) - ) - select value(x) - bulk collect into l_result.cursor_columns_info - from table(self.cursor_columns_info) x - where exists( - select 1 from included_columns f where regexp_like(x.filter_path,'^/?'||f.col_names||'($|/.*)' ) - ) - or x.hierarchy_level = case when self.is_anydata = 1 then 1 else 0 end ; - end if; - elsif a_match_options.exclude.items.count > 0 then - with excluded_columns as ( - select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names - from table(a_match_options.exclude.items) - ) - select value(x) - bulk collect into l_result.cursor_columns_info - from table(self.cursor_columns_info) x - where not exists( - select 1 from excluded_columns f where regexp_like(x.filter_path,'^/?'||f.col_names||'($|/.*)' ) - ); - end if; - - --Rewrite column order after columns been excluded - for i in ( - select parent_name, access_path, display_path, has_nested_col, - transformed_name, hierarchy_level, - rownum as new_position, xml_valid_name, - column_name, column_type, column_type_name, column_schema, - column_len, column_precision ,column_scale ,is_sql_diffable, is_collection,value(x) col_info - from table(l_result.cursor_columns_info) x - order by x.column_position asc - ) loop - l_column := i.col_info; - l_column.column_position := i.new_position; - l_column_tab.extend; - l_column_tab(l_column_tab.last) := l_column; - end loop; - - l_result.cursor_columns_info := l_column_tab; - self := l_result; - end if; - end; - - member function get_xml_children(a_parent_name varchar2 := null) return xmltype is - l_result xmltype; - begin - select xmlagg(xmlelement(evalname t.column_name,t.column_type_name)) - into l_result - from table(self.cursor_columns_info) t - where (a_parent_name is null and parent_name is null and hierarchy_level = 1 and column_name is not null) - having count(*) > 0; - return l_result; - end; - - member function get_root return varchar2 is - l_root varchar2(250); - begin - if self.cursor_columns_info.count > 0 then - select x.access_path into l_root from table(self.cursor_columns_info) x - where x.hierarchy_level = 1; - else - l_root := null; - end if; - return l_root; - end; - - member procedure strip_root_from_anydata(self in out nocopy ut_cursor_details) is - l_root varchar2(250) := get_root(); - begin - self.is_anydata := 1; - for i in 1..cursor_columns_info.count loop - self.cursor_columns_info(i).filter_path := '/'||ut_utils.strip_prefix(self.cursor_columns_info(i).access_path,l_root); - end loop; - end; - -end; -/ +create or replace type body ut_cursor_details as + + member function equals( a_other ut_cursor_details, a_match_options ut_matcher_options ) return boolean is + l_diffs integer; + begin + select count(1) into l_diffs + from table(self.cursor_columns_info) a + full outer join table(a_other.cursor_columns_info) e + on decode(a.parent_name,e.parent_name,1,0)= 1 + and a.column_name = e.column_name + and replace(a.column_type,'VARCHAR2','CHAR') = replace(e.column_type,'VARCHAR2','CHAR') + and ( a.column_position = e.column_position or a_match_options.columns_are_unordered_flag = 1 ) + where a.column_name is null or e.column_name is null; + return l_diffs = 0; + end; + + member procedure desc_compound_data( + self in out nocopy ut_cursor_details, a_compound_data anytype, + a_parent_name in varchar2, a_level in integer, a_access_path in varchar2 + ) is + l_idx pls_integer := 1; + l_elements_info ut_metadata.t_anytype_members_rec; + l_element_info ut_metadata.t_anytype_elem_info_rec; + l_is_collection boolean; + begin + l_elements_info := ut_metadata.get_anytype_members_info( a_compound_data ); + l_is_collection := ut_metadata.is_collection(l_elements_info.type_code); + if l_elements_info.elements_count is null then + l_element_info := ut_metadata.get_attr_elem_info( a_compound_data ); + self.cursor_columns_info.extend; + self.cursor_columns_info(cursor_columns_info.last) := + ut_cursor_column( + l_elements_info.type_name, + l_elements_info.schema_name, + null, + l_elements_info.length, + a_parent_name, + a_level, + l_idx, + ut_compound_data_helper.get_column_type_desc(l_elements_info.type_code,false), + ut_utils.boolean_to_int(l_is_collection), + a_access_path, + l_elements_info.precision, + l_elements_info.scale + ); + if l_element_info.attr_elt_type is not null then + desc_compound_data( + l_element_info.attr_elt_type, l_elements_info.type_name, + a_level + 1, a_access_path || '/' || l_elements_info.type_name + ); + end if; + else + while l_idx <= l_elements_info.elements_count loop + l_element_info := ut_metadata.get_attr_elem_info( a_compound_data, l_idx ); + + self.cursor_columns_info.extend; + self.cursor_columns_info(cursor_columns_info.last) := + ut_cursor_column( + l_element_info.attribute_name, + l_elements_info.schema_name, + null, + l_element_info.length, + a_parent_name, + a_level, + l_idx, + ut_compound_data_helper.get_column_type_desc(l_element_info.type_code,false), + ut_utils.boolean_to_int(l_is_collection), + a_access_path, + l_elements_info.precision, + l_elements_info.scale + ); + if l_element_info.attr_elt_type is not null then + desc_compound_data( + l_element_info.attr_elt_type, l_element_info.attribute_name, + a_level + 1, a_access_path || '/' || l_element_info.attribute_name + ); + end if; + l_idx := l_idx + 1; + end loop; + end if; + end; + + constructor function ut_cursor_details(self in out nocopy ut_cursor_details) return self as result is + begin + self.cursor_columns_info := ut_cursor_column_tab(); + return; + end; + + constructor function ut_cursor_details( + self in out nocopy ut_cursor_details, + a_cursor_number in number + ) return self as result is + l_columns_count pls_integer; + l_columns_desc dbms_sql.desc_tab3; + l_is_collection boolean; + l_hierarchy_level integer := 1; + begin + self.cursor_columns_info := ut_cursor_column_tab(); + self.is_anydata := 0; + dbms_sql.describe_columns3(a_cursor_number, l_columns_count, l_columns_desc); + + /** + * Due to a bug with object being part of cursor in ANYDATA scenario + * oracle fails to revert number to cursor. We ar using dbms_sql.close cursor to close it + * to avoid leaving open cursors behind. + * a_cursor := dbms_sql.to_refcursor(l_cursor_number); + **/ + for pos in 1 .. l_columns_count loop + l_is_collection := ut_metadata.is_collection( l_columns_desc(pos).col_schema_name, l_columns_desc(pos).col_type_name ); + self.cursor_columns_info.extend; + self.cursor_columns_info(self.cursor_columns_info.last) := + ut_cursor_column( + l_columns_desc(pos).col_name, + l_columns_desc(pos).col_schema_name, + l_columns_desc(pos).col_type_name, + l_columns_desc(pos).col_max_len, + null, + l_hierarchy_level, + pos, + ut_compound_data_helper.get_column_type_desc(l_columns_desc(pos).col_type,true), + ut_utils.boolean_to_int(l_is_collection), + null, + l_columns_desc(pos).col_precision, + l_columns_desc(pos).col_scale + ); + + if l_columns_desc(pos).col_type = dbms_sql.user_defined_type or l_is_collection then + desc_compound_data( + ut_metadata.get_user_defined_type( l_columns_desc(pos).col_schema_name, l_columns_desc(pos).col_type_name ), + l_columns_desc(pos).col_name, + l_hierarchy_level + 1, + l_columns_desc(pos).col_name + ); + end if; + end loop; + return; + end; + + member function contains_collection return boolean is + l_collection_elements number; + begin + select count(1) into l_collection_elements + from table(cursor_columns_info) c + where c.is_collection = 1 and rownum = 1; + return l_collection_elements > 0; + end; + + member function get_missing_join_by_columns( a_expected_columns ut_varchar2_list ) return ut_varchar2_list is + l_result ut_varchar2_list; + begin + --regexp_replace(c.access_path,'^\/?([^\/]+\/){1}') + select fl.column_value + bulk collect into l_result + from table(a_expected_columns) fl + where not exists ( + select 1 from table(self.cursor_columns_info) c + where regexp_like(c.filter_path,'^/?'||fl.column_value||'($|/.*)' ) + ) + order by fl.column_value; + return l_result; + end; + + member procedure filter_columns(self in out nocopy ut_cursor_details, a_match_options ut_matcher_options) is + l_result ut_cursor_details := self; + l_column_tab ut_cursor_column_tab := ut_cursor_column_tab(); + l_column ut_cursor_column; + c_xpath_extract_reg constant varchar2(50) := '^((/ROW/)|^(//)|^(/\*/))?(.*)'; + begin + if l_result.cursor_columns_info is not null then + + --limit columns to those on the include items minus exclude items + if a_match_options.include.items.count > 0 then + -- if include - exclude = 0 then keep all columns + if a_match_options.include.items != a_match_options.exclude.items then + with included_columns as ( + select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names + from table(a_match_options.include.items) + minus + select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names + from table(a_match_options.exclude.items) + ) + select value(x) + bulk collect into l_result.cursor_columns_info + from table(self.cursor_columns_info) x + where exists( + select 1 from included_columns f where regexp_like(x.filter_path,'^/?'||f.col_names||'($|/.*)' ) + ) + or x.hierarchy_level = case when self.is_anydata = 1 then 1 else 0 end ; + end if; + elsif a_match_options.exclude.items.count > 0 then + with excluded_columns as ( + select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names + from table(a_match_options.exclude.items) + ) + select value(x) + bulk collect into l_result.cursor_columns_info + from table(self.cursor_columns_info) x + where not exists( + select 1 from excluded_columns f where regexp_like(x.filter_path,'^/?'||f.col_names||'($|/.*)' ) + ); + end if; + + --Rewrite column order after columns been excluded + for i in ( + select parent_name, access_path, display_path, has_nested_col, + transformed_name, hierarchy_level, + rownum as new_position, xml_valid_name, + column_name, column_type, column_type_name, column_schema, + column_len, column_precision ,column_scale ,is_sql_diffable, is_collection,value(x) col_info + from table(l_result.cursor_columns_info) x + order by x.column_position asc + ) loop + l_column := i.col_info; + l_column.column_position := i.new_position; + l_column_tab.extend; + l_column_tab(l_column_tab.last) := l_column; + end loop; + + l_result.cursor_columns_info := l_column_tab; + self := l_result; + end if; + end; + + member function get_xml_children(a_parent_name varchar2 := null) return xmltype is + l_result xmltype; + begin + select xmlagg(xmlelement(evalname t.column_name,t.column_type_name)) + into l_result + from table(self.cursor_columns_info) t + where (a_parent_name is null and parent_name is null and hierarchy_level = 1 and column_name is not null) + having count(*) > 0; + return l_result; + end; + + member function get_root return varchar2 is + l_root varchar2(250); + begin + if self.cursor_columns_info.count > 0 then + select x.access_path into l_root from table(self.cursor_columns_info) x + where x.hierarchy_level = 1; + else + l_root := null; + end if; + return l_root; + end; + + member procedure strip_root_from_anydata(self in out nocopy ut_cursor_details) is + l_root varchar2(250) := get_root(); + begin + self.is_anydata := 1; + for i in 1..cursor_columns_info.count loop + self.cursor_columns_info(i).filter_path := '/'||ut_utils.strip_prefix(self.cursor_columns_info(i).access_path,l_root); + end loop; + end; +end; +/ diff --git a/source/expectations/data_values/ut_cursor_details.tps b/source/expectations/data_values/ut_cursor_details.tps index e6c80a3b5..43e70b123 100644 --- a/source/expectations/data_values/ut_cursor_details.tps +++ b/source/expectations/data_values/ut_cursor_details.tps @@ -1,41 +1,41 @@ -create or replace type ut_cursor_details authid current_user as object ( - /* - utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project - - Licensed under the Apache License, Version 2.0 (the "License"): - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - cursor_columns_info ut_cursor_column_tab, - - /*if type is anydata we need to skip level 1 on joinby / inlude / exclude as its artificial cursor*/ - is_anydata number(1,0), - constructor function ut_cursor_details(self in out nocopy ut_cursor_details) return self as result, - constructor function ut_cursor_details( - self in out nocopy ut_cursor_details,a_cursor_number in number - ) return self as result, - member function equals(a_other ut_cursor_details, a_match_options ut_matcher_options) return boolean, - member procedure desc_compound_data( - self in out nocopy ut_cursor_details, - a_compound_data anytype, - a_parent_name in varchar2, - a_level in integer, - a_access_path in varchar2 - ), - member function contains_collection return boolean, - member function get_missing_join_by_columns( a_expected_columns ut_varchar2_list ) return ut_varchar2_list, - member procedure filter_columns(self in out nocopy ut_cursor_details, a_match_options ut_matcher_options), - member function get_xml_children(a_parent_name varchar2 := null) return xmltype, - member function get_root return varchar2, - member procedure strip_root_from_anydata(self in out nocopy ut_cursor_details) -) -/ +create or replace type ut_cursor_details authid current_user as object ( + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + cursor_columns_info ut_cursor_column_tab, + + /*if type is anydata we need to skip level 1 on joinby / inlude / exclude as its artificial cursor*/ + is_anydata number(1,0), + constructor function ut_cursor_details(self in out nocopy ut_cursor_details) return self as result, + constructor function ut_cursor_details( + self in out nocopy ut_cursor_details,a_cursor_number in number + ) return self as result, + member function equals(a_other ut_cursor_details, a_match_options ut_matcher_options) return boolean, + member procedure desc_compound_data( + self in out nocopy ut_cursor_details, + a_compound_data anytype, + a_parent_name in varchar2, + a_level in integer, + a_access_path in varchar2 + ), + member function contains_collection return boolean, + member function get_missing_join_by_columns( a_expected_columns ut_varchar2_list ) return ut_varchar2_list, + member procedure filter_columns(self in out nocopy ut_cursor_details, a_match_options ut_matcher_options), + member function get_xml_children(a_parent_name varchar2 := null) return xmltype, + member function get_root return varchar2, + member procedure strip_root_from_anydata(self in out nocopy ut_cursor_details) +) +/ diff --git a/source/expectations/data_values/ut_data_value_anydata.tpb b/source/expectations/data_values/ut_data_value_anydata.tpb index 808e52197..fe9a6a1bc 100644 --- a/source/expectations/data_values/ut_data_value_anydata.tpb +++ b/source/expectations/data_values/ut_data_value_anydata.tpb @@ -1,143 +1,142 @@ -create or replace type body ut_data_value_anydata as - /* - utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project - - Licensed under the Apache License, Version 2.0 (the "License"): - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - - overriding member function get_object_info return varchar2 is - begin - return self.data_type || case when self.compound_type = 'collection' then ' [ count = '||self.elements_count||' ]' else null end; - end; - - member function get_extract_path(a_data_value anydata) return varchar2 is - l_path varchar2(10); - begin - if self.compound_type = 'object' then - l_path := '/*/*'; - else - case when ut_metadata.has_collection_members(a_data_value) then - l_path := '/*/*'; - else - l_path := '/*'; - end case; - end if; - return l_path; - end; - - member function get_cursor_sql_from_anydata(a_data_value anydata) return varchar2 is - l_cursor_sql varchar2(32767); - begin - l_cursor_sql := ' - declare - l_data '||self.data_type||'; - l_value anydata := :a_value; - l_status integer; - l_tmp_refcursor sys_refcursor; - begin - l_status := l_value.get'||self.compound_type||'(l_data); '|| - case when self.compound_type = 'collection' then - q'[ open :l_tmp_refcursor for select value(x) as "]'|| - ut_metadata.get_object_name(ut_metadata.get_collection_element(a_data_value))|| - q'[" from table(l_data) x;]' - else - q'[ open :l_tmp_refcursor for select l_data as "]'||ut_metadata.get_object_name(self.data_type)|| - q'[" from dual;]' - end || - 'end;'; - return l_cursor_sql; - end; - - member procedure init(self in out nocopy ut_data_value_anydata, a_value anydata) is - l_refcursor sys_refcursor; - cursor_not_open exception; - l_cursor_number number; - l_anydata_sql varchar2(32767); - begin - self.data_type := ut_metadata.get_anydata_typename(a_value); - self.compound_type := get_instance(a_value); - self.is_data_null := ut_metadata.is_anytype_null(a_value,self.compound_type); - self.data_id := sys_guid(); - self.self_type := $$plsql_unit; - self.cursor_details := ut_cursor_details(); - - ut_compound_data_helper.cleanup_diff; - - if not self.is_null() then - self.extract_path := get_extract_path(a_value); - l_anydata_sql := get_cursor_sql_from_anydata(a_value); - execute immediate l_anydata_sql using in a_value, in out l_refcursor; - if l_refcursor%isopen then - self.extract_cursor(l_refcursor); - l_cursor_number := dbms_sql.to_cursor_number(l_refcursor); - self.cursor_details := ut_cursor_details(l_cursor_number); - self.cursor_details.strip_root_from_anydata; - dbms_sql.close_cursor(l_cursor_number); - elsif not l_refcursor%isopen then - raise cursor_not_open; - end if; - end if; - exception - when cursor_not_open then - raise_application_error(-20155, 'Cursor is not open'); - when others then - if l_refcursor%isopen then - close l_refcursor; - end if; - raise; - end; - - member function get_instance(a_data_value anydata) return varchar2 is - l_result varchar2(30); - begin - l_result := ut_metadata.get_anydata_compound_type(a_data_value); - if l_result not in ('object','collection') then - raise_application_error(-20000, 'Data type '||a_data_value.gettypename||' in ANYDATA is not supported by utPLSQL'); - end if; - return l_result; - end; - - constructor function ut_data_value_anydata(self in out nocopy ut_data_value_anydata, a_value anydata) return self as result - is - begin - init(a_value); - return; - end; - - overriding member function compare_implementation( - a_other ut_data_value, - a_match_options ut_matcher_options, - a_inclusion_compare boolean := false, - a_is_negated boolean := false - ) return integer is - l_result integer := 0; - begin - if not a_other is of (ut_data_value_anydata) then - raise value_error; - end if; - l_result := l_result + (self as ut_data_value_refcursor).compare_implementation(a_other,a_match_options,a_inclusion_compare,a_is_negated); - return l_result; - end; - - overriding member function is_empty return boolean is - begin - if self.compound_type = 'collection' then - return self.elements_count = 0; - else - raise value_error; - end if; - end; - -end; -/ +create or replace type body ut_data_value_anydata as + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + overriding member function get_object_info return varchar2 is + begin + return self.data_type || case when self.compound_type = 'collection' then ' [ count = '||self.elements_count||' ]' else null end; + end; + + member function get_extract_path(a_data_value anydata) return varchar2 is + l_path varchar2(10); + begin + if self.compound_type = 'object' then + l_path := '/*/*'; + else + case when ut_metadata.has_collection_members(a_data_value) then + l_path := '/*/*'; + else + l_path := '/*'; + end case; + end if; + return l_path; + end; + + member function get_cursor_sql_from_anydata(a_data_value anydata) return varchar2 is + l_cursor_sql varchar2(32767); + begin + l_cursor_sql := ' + declare + l_data '||self.data_type||'; + l_value anydata := :a_value; + l_status integer; + l_tmp_refcursor sys_refcursor; + begin + l_status := l_value.get'||self.compound_type||'(l_data); '|| + case when self.compound_type = 'collection' then + q'[ open :l_tmp_refcursor for select value(x) as "]'|| + ut_metadata.get_object_name(ut_metadata.get_collection_element(a_data_value))|| + q'[" from table(l_data) x;]' + else + q'[ open :l_tmp_refcursor for select l_data as "]'||ut_metadata.get_object_name(self.data_type)|| + q'[" from dual;]' + end || + 'end;'; + return l_cursor_sql; + end; + + member procedure init(self in out nocopy ut_data_value_anydata, a_value anydata) is + l_refcursor sys_refcursor; + cursor_not_open exception; + l_cursor_number number; + l_anydata_sql varchar2(32767); + begin + self.data_type := ut_metadata.get_anydata_typename(a_value); + self.compound_type := get_instance(a_value); + self.is_data_null := ut_metadata.is_anytype_null(a_value,self.compound_type); + self.data_id := sys_guid(); + self.self_type := $$plsql_unit; + self.cursor_details := ut_cursor_details(); + + ut_compound_data_helper.cleanup_diff; + + if not self.is_null() then + self.extract_path := get_extract_path(a_value); + l_anydata_sql := get_cursor_sql_from_anydata(a_value); + execute immediate l_anydata_sql using in a_value, in out l_refcursor; + if l_refcursor%isopen then + self.extract_cursor(l_refcursor); + l_cursor_number := dbms_sql.to_cursor_number(l_refcursor); + self.cursor_details := ut_cursor_details(l_cursor_number); + self.cursor_details.strip_root_from_anydata; + dbms_sql.close_cursor(l_cursor_number); + elsif not l_refcursor%isopen then + raise cursor_not_open; + end if; + end if; + exception + when cursor_not_open then + raise_application_error(-20155, 'Cursor is not open'); + when others then + if l_refcursor%isopen then + close l_refcursor; + end if; + raise; + end; + + member function get_instance(a_data_value anydata) return varchar2 is + l_result varchar2(30); + begin + l_result := ut_metadata.get_anydata_compound_type(a_data_value); + if l_result not in ('object','collection') then + raise_application_error(-20000, 'Data type '||a_data_value.gettypename||' in ANYDATA is not supported by utPLSQL'); + end if; + return l_result; + end; + + constructor function ut_data_value_anydata(self in out nocopy ut_data_value_anydata, a_value anydata) return self as result + is + begin + init(a_value); + return; + end; + + overriding member function compare_implementation( + a_other ut_data_value, + a_match_options ut_matcher_options, + a_inclusion_compare boolean := false, + a_is_negated boolean := false + ) return integer is + l_result integer := 0; + begin + if not a_other is of (ut_data_value_anydata) then + raise value_error; + end if; + l_result := l_result + (self as ut_data_value_refcursor).compare_implementation(a_other,a_match_options,a_inclusion_compare,a_is_negated); + return l_result; + end; + + overriding member function is_empty return boolean is + begin + if self.compound_type = 'collection' then + return self.elements_count = 0; + else + raise value_error; + end if; + end; +end; +/ diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index b93158cf1..d73a3e011 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -1,398 +1,397 @@ -create or replace type body ut_data_value_refcursor as - /* - utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project - - Licensed under the Apache License, Version 2.0 (the "License"): - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - - constructor function ut_data_value_refcursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) - return self as result is - begin - init(a_value); - return; - end; - - member procedure extract_cursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) - is - c_bulk_rows constant integer := 10000; - l_cursor sys_refcursor := a_value; - l_ctx number; - l_xml xmltype; - l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_set_id integer := 0; - l_elements_count number := 0; - begin - -- We use DBMS_XMLGEN in order to: - -- 1) be able to process data in bulks (set of rows) - -- 2) be able to influence the ROWSET/ROW tags - -- 3) be able to influence the way NULL values are handled (empty TAG) - -- 4) be able to influence the way TIMESTAMP is formatted. - -- Due to Oracle feature/bug, it is not possible to change the DATE formatting of cursor data - -- AFTER the cursor was opened. - -- The only solution for this is to change NLS settings before opening the cursor. - -- - -- This would work fine if we could use DBMS_XMLGEN.restartQuery. - -- The restartQuery fails however if PLSQL variables of TIMESTAMP/INTERVAL or CLOB/BLOB are used. - ut_expectation_processor.set_xml_nls_params(); - l_ctx := dbms_xmlgen.newContext(l_cursor); - dbms_xmlgen.setNullHandling(l_ctx, dbms_xmlgen.empty_tag); - dbms_xmlgen.setMaxRows(l_ctx, c_bulk_rows); - loop - l_xml := dbms_xmlgen.getxmltype(l_ctx); - exit when dbms_xmlgen.getNumRowsProcessed(l_ctx) = 0; - --Bug in oracle 12.2+ where XML binary storage trimming insignificant whitespaces. - $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then - l_xml := xmltype( replace(l_xml.getClobVal(),' 0 then - ut_utils.append_to_clob( l_result, self.cursor_details.get_xml_children().getclobval() ); - end if; - ut_utils.append_to_clob(l_result,chr(10)||(self as ut_compound_data_value).to_string()); - l_result_string := ut_utils.to_string(l_result,null); - dbms_lob.freetemporary(l_result); - end if; - return l_result_string; - end; - - overriding member function diff( a_other ut_data_value, a_match_options ut_matcher_options ) return varchar2 is - l_result clob; - l_results ut_utils.t_clob_tab := ut_utils.t_clob_tab(); - l_result_string varchar2(32767); - l_other ut_data_value_refcursor; - l_self ut_data_value_refcursor := self; - l_column_diffs ut_compound_data_helper.tt_column_diffs; - - l_other_cols ut_cursor_column_tab; - l_self_cols ut_cursor_column_tab; - - l_act_missing_pk ut_varchar2_list := ut_varchar2_list(); - l_exp_missing_pk ut_varchar2_list := ut_varchar2_list(); - - c_max_rows integer := ut_utils.gc_diff_max_rows; - l_diff_id ut_compound_data_helper.t_hash; - l_diff_row_count integer; - l_row_diffs ut_compound_data_helper.tt_row_diffs; - l_message varchar2(32767); - - function get_col_diff_text(a_col ut_compound_data_helper.t_column_diffs) return varchar2 is - begin - return - case a_col.diff_type - when '-' then - ' Column <'||a_col.expected_name||'> [data-type: '||a_col.expected_type||'] is missing. Expected column position: '||a_col.expected_pos||'.' - when '+' then - ' Column <'||a_col.actual_name||'> [position: '||a_col.actual_pos||', data-type: '||a_col.actual_type||'] is not expected in results.' - when 't' then - ' Column <'||a_col.actual_name||'> data-type is invalid. Expected: '||a_col.expected_type||',' ||' actual: '||a_col.actual_type||'.' - when 'p' then - ' Column <'||a_col.actual_name||'> is misplaced. Expected position: '||a_col.expected_pos||',' ||' actual position: '||a_col.actual_pos||'.' - end; - end; - - function remove_incomparable_cols( - a_cursor_details ut_cursor_column_tab, a_column_diffs ut_compound_data_helper.tt_column_diffs - ) return ut_cursor_column_tab is - l_missing_cols ut_varchar2_list := ut_varchar2_list(); - l_result ut_cursor_column_tab; - begin - for i in 1 .. a_column_diffs.count loop - if a_column_diffs(i).diff_type in ('-','+') then - l_missing_cols.extend; - l_missing_cols(l_missing_cols.last) := coalesce(a_column_diffs(i).expected_name, a_column_diffs(i).actual_name); - end if; - end loop; - select value(i) bulk collect into l_result - from table(a_cursor_details) i - where i.access_path not in ( - select c.column_value - from table(l_missing_cols) c - ); - return l_result; - end; - - function get_diff_message (a_row_diff ut_compound_data_helper.t_row_diffs, a_is_unordered boolean) return varchar2 is - begin - if a_is_unordered then - if a_row_diff.pk_value is not null then - return ' PK '||a_row_diff.pk_value||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; - else - return rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; - end if; - else - return ' Row No. '||a_row_diff.rn||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; - end if; - end; - - begin - if not a_other is of (ut_data_value_refcursor) then - raise value_error; - end if; - l_other := treat(a_other as ut_data_value_refcursor); - l_other.cursor_details.filter_columns(a_match_options); - l_self.cursor_details.filter_columns(a_match_options); - - l_other_cols := l_other.cursor_details.cursor_columns_info; - l_self_cols := l_self.cursor_details.cursor_columns_info; - - dbms_lob.createtemporary(l_result,true); - --diff columns - if not l_self.is_null and not l_other.is_null then - l_column_diffs := ut_compound_data_helper.get_columns_diff( - l_self.cursor_details.cursor_columns_info, - l_other.cursor_details.cursor_columns_info, - a_match_options.ordered_columns() - ); - - if l_column_diffs.count > 0 then - ut_utils.append_to_clob(l_result,chr(10) || 'Columns:' || chr(10)); - l_other_cols := remove_incomparable_cols( l_other_cols, l_column_diffs ); - l_self_cols := remove_incomparable_cols( l_self_cols, l_column_diffs ); - for i in 1 .. l_column_diffs.count loop - l_results.extend; - l_results(l_results.last) := get_col_diff_text(l_column_diffs(i)); - end loop; - ut_utils.append_to_clob(l_result, l_results); - end if; - end if; - - --check for missing pk - if a_match_options.join_by.items.count > 0 then - l_act_missing_pk := l_other.cursor_details.get_missing_join_by_columns( a_match_options.join_by.items ); - l_exp_missing_pk := l_self.cursor_details.get_missing_join_by_columns( a_match_options.join_by.items ); - end if; - - --diff rows and row elements if the pk is not missing - if l_act_missing_pk.count + l_exp_missing_pk.count = 0 then - l_diff_id := ut_compound_data_helper.get_hash( l_self.data_id || l_other.data_id ); - - -- First tell how many rows are different - l_diff_row_count := ut_compound_data_helper.get_rows_diff_count; - if l_diff_row_count > 0 then - l_row_diffs := ut_compound_data_helper.get_rows_diff_by_sql( - l_self_cols, l_other_cols, l_self.data_id, l_other.data_id, - l_diff_id, - case - when - l_self.cursor_details.is_anydata = 1 then ut_utils.add_prefix(a_match_options.join_by.items, l_self.cursor_details.get_root) - else - a_match_options.join_by.items - end, - a_match_options.unordered,a_match_options.ordered_columns(), self.extract_path - ); - l_message := chr(10) - ||'Rows: [ ' || l_diff_row_count ||' differences' - || case when l_diff_row_count > c_max_rows and l_row_diffs.count > 0 then ', showing first '||c_max_rows end - ||' ]'||chr(10)|| case when l_row_diffs.count = 0 then ' All rows are different as the columns are not matching.' else null end; - ut_utils.append_to_clob( l_result, l_message ); - l_results := ut_utils.t_clob_tab(); - for i in 1 .. l_row_diffs.count loop - l_results.extend; - l_results(l_results.last) := get_diff_message(l_row_diffs(i),a_match_options.unordered); - end loop; - ut_utils.append_to_clob(l_result,l_results); - else - l_message:= chr(10)||'Rows: [ all different ]'||chr(10)||' All rows are different as the columns position is not matching.'; - ut_utils.append_to_clob( l_result, l_message ); - end if; - else - ut_utils.append_to_clob(l_result,chr(10) || 'Unable to join sets:' || chr(10)); - - for i in 1 .. l_exp_missing_pk.count loop - ut_utils.append_to_clob(l_result, ' Join key '||l_exp_missing_pk(i)||' does not exists in expected'||chr(10)); - end loop; - - for i in 1 .. l_act_missing_pk.count loop - ut_utils.append_to_clob(l_result, ' Join key '||l_act_missing_pk(i)||' does not exists in actual'||chr(10)); - end loop; - - if l_self.cursor_details.contains_collection() or l_other.cursor_details.contains_collection() then - ut_utils.append_to_clob(l_result,' Please make sure that your join clause is not refferring to collection element'|| chr(10)); - end if; - - end if; - - l_result_string := ut_utils.to_string(l_result,null); - dbms_lob.freetemporary(l_result); - return l_result_string; - end; - - overriding member function compare_implementation(a_other ut_data_value) return integer is - begin - return compare_implementation( a_other, null ); - end; - - member function compare_implementation( - a_other ut_data_value, - a_match_options ut_matcher_options, - a_inclusion_compare boolean := false, - a_is_negated boolean := false - ) return integer is - l_result integer := 0; - l_self ut_data_value_refcursor := self; - l_other ut_data_value_refcursor; - l_diff_cursor_text clob; - - function compare_data( - a_self ut_data_value_refcursor, - a_other ut_data_value_refcursor, - a_diff_cursor_text clob - ) return integer is - l_diff_id ut_compound_data_helper.t_hash; - l_result integer; - --We will start with number od differences being displayed. - l_cursor sys_refcursor; - l_diff_tab ut_compound_data_helper.t_diff_tab; - l_diif_rowcount integer :=0; - begin - l_diff_id := ut_compound_data_helper.get_hash(a_self.data_id||a_other.data_id); - - begin - l_cursor := ut_compound_data_helper.get_compare_cursor(a_diff_cursor_text, - a_self.data_id, a_other.data_id); - --fetch and save rows for display of diff - fetch l_cursor bulk collect into l_diff_tab limit ut_utils.gc_diff_max_rows; - exception when others then - if l_cursor%isopen then - close l_cursor; - end if; - raise; - end; - - ut_compound_data_helper.insert_diffs_result( l_diff_tab, l_diff_id ); - --fetch rows for count only - loop - exit when l_diff_tab.count = 0; - l_diif_rowcount := l_diif_rowcount + l_diff_tab.count; - fetch l_cursor bulk collect into l_diff_tab limit ut_utils.gc_bc_fetch_limit; - end loop; - - ut_compound_data_helper.set_rows_diff(l_diif_rowcount); - - --result is OK only if both are same - if l_diif_rowcount = 0 and a_self.is_null = a_other.is_null then - l_result := 0; - else - l_result := 1; - end if; - close l_cursor; - return l_result; - end; - begin - if not a_other is of (ut_data_value_refcursor) then - raise value_error; - end if; - - l_other := treat(a_other as ut_data_value_refcursor); - l_other.cursor_details.filter_columns( a_match_options ); - l_self.cursor_details.filter_columns( a_match_options ); - - if a_match_options.join_by.items.count > 0 then - l_result := - l_self.cursor_details.get_missing_join_by_columns( a_match_options.join_by.items ).count - + l_other.cursor_details.get_missing_join_by_columns( a_match_options.join_by.items ).count; - end if; - - if l_result = 0 then - if not l_self.is_null() and not l_other.is_null() and not l_self.cursor_details.equals( l_other.cursor_details, a_match_options ) then - l_result := 1; - end if; - - l_diff_cursor_text := ut_compound_data_helper.gen_compare_sql( - l_other, - a_match_options.join_by.items, - a_match_options.unordered(), - a_inclusion_compare, - a_is_negated - ); - l_result := l_result + compare_data( l_self, l_other, l_diff_cursor_text ); - end if; - return l_result; - end; - - overriding member function is_empty return boolean is - begin - return self.elements_count = 0; - end; - -end; -/ +create or replace type body ut_data_value_refcursor as + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + constructor function ut_data_value_refcursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) + return self as result is + begin + init(a_value); + return; + end; + + member procedure extract_cursor(self in out nocopy ut_data_value_refcursor, a_value sys_refcursor) + is + c_bulk_rows constant integer := 10000; + l_cursor sys_refcursor := a_value; + l_ctx number; + l_xml xmltype; + l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_set_id integer := 0; + l_elements_count number := 0; + begin + -- We use DBMS_XMLGEN in order to: + -- 1) be able to process data in bulks (set of rows) + -- 2) be able to influence the ROWSET/ROW tags + -- 3) be able to influence the way NULL values are handled (empty TAG) + -- 4) be able to influence the way TIMESTAMP is formatted. + -- Due to Oracle feature/bug, it is not possible to change the DATE formatting of cursor data + -- AFTER the cursor was opened. + -- The only solution for this is to change NLS settings before opening the cursor. + -- + -- This would work fine if we could use DBMS_XMLGEN.restartQuery. + -- The restartQuery fails however if PLSQL variables of TIMESTAMP/INTERVAL or CLOB/BLOB are used. + ut_expectation_processor.set_xml_nls_params(); + l_ctx := dbms_xmlgen.newContext(l_cursor); + dbms_xmlgen.setNullHandling(l_ctx, dbms_xmlgen.empty_tag); + dbms_xmlgen.setMaxRows(l_ctx, c_bulk_rows); + loop + l_xml := dbms_xmlgen.getxmltype(l_ctx); + exit when dbms_xmlgen.getNumRowsProcessed(l_ctx) = 0; + --Bug in oracle 12.2+ where XML binary storage trimming insignificant whitespaces. + $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then + l_xml := xmltype( replace(l_xml.getClobVal(),' 0 then + ut_utils.append_to_clob( l_result, self.cursor_details.get_xml_children().getclobval() ); + end if; + ut_utils.append_to_clob(l_result,chr(10)||(self as ut_compound_data_value).to_string()); + l_result_string := ut_utils.to_string(l_result,null); + dbms_lob.freetemporary(l_result); + end if; + return l_result_string; + end; + + overriding member function diff( a_other ut_data_value, a_match_options ut_matcher_options ) return varchar2 is + l_result clob; + l_results ut_utils.t_clob_tab := ut_utils.t_clob_tab(); + l_result_string varchar2(32767); + l_other ut_data_value_refcursor; + l_self ut_data_value_refcursor := self; + l_column_diffs ut_compound_data_helper.tt_column_diffs; + + l_other_cols ut_cursor_column_tab; + l_self_cols ut_cursor_column_tab; + + l_act_missing_pk ut_varchar2_list := ut_varchar2_list(); + l_exp_missing_pk ut_varchar2_list := ut_varchar2_list(); + + c_max_rows integer := ut_utils.gc_diff_max_rows; + l_diff_id ut_compound_data_helper.t_hash; + l_diff_row_count integer; + l_row_diffs ut_compound_data_helper.tt_row_diffs; + l_message varchar2(32767); + + function get_col_diff_text(a_col ut_compound_data_helper.t_column_diffs) return varchar2 is + begin + return + case a_col.diff_type + when '-' then + ' Column <'||a_col.expected_name||'> [data-type: '||a_col.expected_type||'] is missing. Expected column position: '||a_col.expected_pos||'.' + when '+' then + ' Column <'||a_col.actual_name||'> [position: '||a_col.actual_pos||', data-type: '||a_col.actual_type||'] is not expected in results.' + when 't' then + ' Column <'||a_col.actual_name||'> data-type is invalid. Expected: '||a_col.expected_type||',' ||' actual: '||a_col.actual_type||'.' + when 'p' then + ' Column <'||a_col.actual_name||'> is misplaced. Expected position: '||a_col.expected_pos||',' ||' actual position: '||a_col.actual_pos||'.' + end; + end; + + function remove_incomparable_cols( + a_cursor_details ut_cursor_column_tab, a_column_diffs ut_compound_data_helper.tt_column_diffs + ) return ut_cursor_column_tab is + l_missing_cols ut_varchar2_list := ut_varchar2_list(); + l_result ut_cursor_column_tab; + begin + for i in 1 .. a_column_diffs.count loop + if a_column_diffs(i).diff_type in ('-','+') then + l_missing_cols.extend; + l_missing_cols(l_missing_cols.last) := coalesce(a_column_diffs(i).expected_name, a_column_diffs(i).actual_name); + end if; + end loop; + select value(i) bulk collect into l_result + from table(a_cursor_details) i + where i.access_path not in ( + select c.column_value + from table(l_missing_cols) c + ); + return l_result; + end; + + function get_diff_message (a_row_diff ut_compound_data_helper.t_row_diffs, a_is_unordered boolean) return varchar2 is + begin + if a_is_unordered then + if a_row_diff.pk_value is not null then + return ' PK '||a_row_diff.pk_value||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; + else + return rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; + end if; + else + return ' Row No. '||a_row_diff.rn||' - '||rpad(a_row_diff.diff_type,10)||a_row_diff.diffed_row; + end if; + end; + + begin + if not a_other is of (ut_data_value_refcursor) then + raise value_error; + end if; + l_other := treat(a_other as ut_data_value_refcursor); + l_other.cursor_details.filter_columns(a_match_options); + l_self.cursor_details.filter_columns(a_match_options); + + l_other_cols := l_other.cursor_details.cursor_columns_info; + l_self_cols := l_self.cursor_details.cursor_columns_info; + + dbms_lob.createtemporary(l_result,true); + --diff columns + if not l_self.is_null and not l_other.is_null then + l_column_diffs := ut_compound_data_helper.get_columns_diff( + l_self.cursor_details.cursor_columns_info, + l_other.cursor_details.cursor_columns_info, + a_match_options.ordered_columns() + ); + + if l_column_diffs.count > 0 then + ut_utils.append_to_clob(l_result,chr(10) || 'Columns:' || chr(10)); + l_other_cols := remove_incomparable_cols( l_other_cols, l_column_diffs ); + l_self_cols := remove_incomparable_cols( l_self_cols, l_column_diffs ); + for i in 1 .. l_column_diffs.count loop + l_results.extend; + l_results(l_results.last) := get_col_diff_text(l_column_diffs(i)); + end loop; + ut_utils.append_to_clob(l_result, l_results); + end if; + end if; + + --check for missing pk + if a_match_options.join_by.items.count > 0 then + l_act_missing_pk := l_other.cursor_details.get_missing_join_by_columns( a_match_options.join_by.items ); + l_exp_missing_pk := l_self.cursor_details.get_missing_join_by_columns( a_match_options.join_by.items ); + end if; + + --diff rows and row elements if the pk is not missing + if l_act_missing_pk.count + l_exp_missing_pk.count = 0 then + l_diff_id := ut_compound_data_helper.get_hash( l_self.data_id || l_other.data_id ); + + -- First tell how many rows are different + l_diff_row_count := ut_compound_data_helper.get_rows_diff_count; + if l_diff_row_count > 0 then + l_row_diffs := ut_compound_data_helper.get_rows_diff_by_sql( + l_self_cols, l_other_cols, l_self.data_id, l_other.data_id, + l_diff_id, + case + when + l_self.cursor_details.is_anydata = 1 then ut_utils.add_prefix(a_match_options.join_by.items, l_self.cursor_details.get_root) + else + a_match_options.join_by.items + end, + a_match_options.unordered,a_match_options.ordered_columns(), self.extract_path + ); + l_message := chr(10) + ||'Rows: [ ' || l_diff_row_count ||' differences' + || case when l_diff_row_count > c_max_rows and l_row_diffs.count > 0 then ', showing first '||c_max_rows end + ||' ]'||chr(10)|| case when l_row_diffs.count = 0 then ' All rows are different as the columns are not matching.' else null end; + ut_utils.append_to_clob( l_result, l_message ); + l_results := ut_utils.t_clob_tab(); + for i in 1 .. l_row_diffs.count loop + l_results.extend; + l_results(l_results.last) := get_diff_message(l_row_diffs(i),a_match_options.unordered); + end loop; + ut_utils.append_to_clob(l_result,l_results); + else + l_message:= chr(10)||'Rows: [ all different ]'||chr(10)||' All rows are different as the columns position is not matching.'; + ut_utils.append_to_clob( l_result, l_message ); + end if; + else + ut_utils.append_to_clob(l_result,chr(10) || 'Unable to join sets:' || chr(10)); + + for i in 1 .. l_exp_missing_pk.count loop + ut_utils.append_to_clob(l_result, ' Join key '||l_exp_missing_pk(i)||' does not exists in expected'||chr(10)); + end loop; + + for i in 1 .. l_act_missing_pk.count loop + ut_utils.append_to_clob(l_result, ' Join key '||l_act_missing_pk(i)||' does not exists in actual'||chr(10)); + end loop; + + if l_self.cursor_details.contains_collection() or l_other.cursor_details.contains_collection() then + ut_utils.append_to_clob(l_result,' Please make sure that your join clause is not refferring to collection element'|| chr(10)); + end if; + + end if; + + l_result_string := ut_utils.to_string(l_result,null); + dbms_lob.freetemporary(l_result); + return l_result_string; + end; + + overriding member function compare_implementation(a_other ut_data_value) return integer is + begin + return compare_implementation( a_other, null ); + end; + + member function compare_implementation( + a_other ut_data_value, + a_match_options ut_matcher_options, + a_inclusion_compare boolean := false, + a_is_negated boolean := false + ) return integer is + l_result integer := 0; + l_self ut_data_value_refcursor := self; + l_other ut_data_value_refcursor; + l_diff_cursor_text clob; + + function compare_data( + a_self ut_data_value_refcursor, + a_other ut_data_value_refcursor, + a_diff_cursor_text clob + ) return integer is + l_diff_id ut_compound_data_helper.t_hash; + l_result integer; + --We will start with number od differences being displayed. + l_cursor sys_refcursor; + l_diff_tab ut_compound_data_helper.t_diff_tab; + l_diif_rowcount integer :=0; + begin + l_diff_id := ut_compound_data_helper.get_hash(a_self.data_id||a_other.data_id); + + begin + l_cursor := ut_compound_data_helper.get_compare_cursor(a_diff_cursor_text, + a_self.data_id, a_other.data_id); + --fetch and save rows for display of diff + fetch l_cursor bulk collect into l_diff_tab limit ut_utils.gc_diff_max_rows; + exception when others then + if l_cursor%isopen then + close l_cursor; + end if; + raise; + end; + + ut_compound_data_helper.insert_diffs_result( l_diff_tab, l_diff_id ); + --fetch rows for count only + loop + exit when l_diff_tab.count = 0; + l_diif_rowcount := l_diif_rowcount + l_diff_tab.count; + fetch l_cursor bulk collect into l_diff_tab limit ut_utils.gc_bc_fetch_limit; + end loop; + + ut_compound_data_helper.set_rows_diff(l_diif_rowcount); + + --result is OK only if both are same + if l_diif_rowcount = 0 and a_self.is_null = a_other.is_null then + l_result := 0; + else + l_result := 1; + end if; + close l_cursor; + return l_result; + end; + begin + if not a_other is of (ut_data_value_refcursor) then + raise value_error; + end if; + + l_other := treat(a_other as ut_data_value_refcursor); + l_other.cursor_details.filter_columns( a_match_options ); + l_self.cursor_details.filter_columns( a_match_options ); + + if a_match_options.join_by.items.count > 0 then + l_result := + l_self.cursor_details.get_missing_join_by_columns( a_match_options.join_by.items ).count + + l_other.cursor_details.get_missing_join_by_columns( a_match_options.join_by.items ).count; + end if; + + if l_result = 0 then + if not l_self.is_null() and not l_other.is_null() and not l_self.cursor_details.equals( l_other.cursor_details, a_match_options ) then + l_result := 1; + end if; + l_diff_cursor_text := ut_compound_data_helper.gen_compare_sql( + l_other, + a_match_options.join_by.items, + a_match_options.unordered(), + a_inclusion_compare, + a_is_negated + ); + l_result := l_result + compare_data( l_self, l_other, l_diff_cursor_text ); + end if; + return l_result; + end; + + overriding member function is_empty return boolean is + begin + return self.elements_count = 0; + end; + +end; +/ From 8c7a0089f9bfcb8568da2f965ee30c3da6d5ad8b Mon Sep 17 00:00:00 2001 From: Travis CI Date: Wed, 5 Jun 2019 10:12:38 +0000 Subject: [PATCH 0482/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index d7dfefdcf..c1c945097 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index aa7b83002..e51ea8f5d 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 0cdf9cbee..a4f8ab783 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index ec0e05d7b..9ce66ce5c 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 2b660013e..13403f131 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 042bb847f..dae921832 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 7d8081a4f..f6242dce0 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index b6532232d..2ba58df80 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 18b481642..54d48b06c 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index a2b0c143f..f42e2f655 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index ec32fe4a5..affa252aa 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index cd4760351..959902d28 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 37034e458..56eccc064 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 1d47e7bc3..a12ea5501 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 7bca3b507..c962dc67b 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index a4490ec97..d25a2d697 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 5e3ec0f12..db0489a4d 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2992--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index c50326bbe..8ee9a25e1 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -760,7 +760,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.7.2992-develop + * secion v3.1.7.2999-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 792bccb52..de32c11b0 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.7.2992-develop'; + gc_version constant varchar2(50) := 'v3.1.7.2999-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From effb4202f92c731deb11770861b9089146cf985d Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 6 Jun 2019 00:15:18 +0100 Subject: [PATCH 0483/1096] Renamed `gc_tag` to `gc_tags` Added debug logging of suite cache query. --- source/core/ut_suite_builder.pkb | 12 ++++++------ source/core/ut_suite_manager.pkb | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index eab4d48b1..295f2d699 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -23,7 +23,7 @@ create or replace package body ut_suite_builder is gc_suite constant t_annotation_name := 'suite'; gc_suitepath constant t_annotation_name := 'suitepath'; - gc_tag constant t_annotation_name := 'tags'; + gc_tags constant t_annotation_name := 'tags'; gc_test constant t_annotation_name := ut_utils.gc_test_execute; gc_disabled constant t_annotation_name := 'disabled'; gc_displayname constant t_annotation_name := 'displayname'; @@ -44,7 +44,7 @@ create or replace package body ut_suite_builder is := tt_annotations( gc_suite, gc_suitepath, - gc_tag, + gc_tags, gc_test, gc_disabled, gc_displayname, @@ -513,8 +513,8 @@ create or replace package body ut_suite_builder is set_seq_no(l_test.after_test_list); end if; - if l_proc_annotations.exists( gc_tag) then - add_tags_to_suite_item(a_suite, l_proc_annotations( gc_tag), l_test.tags, a_procedure_name); + if l_proc_annotations.exists( gc_tags) then + add_tags_to_suite_item(a_suite, l_proc_annotations( gc_tags), l_test.tags, a_procedure_name); end if; if l_proc_annotations.exists( gc_throws) then @@ -667,8 +667,8 @@ create or replace package body ut_suite_builder is l_after_each_list := add_executables( a_suite.object_owner, a_suite.object_name, a_annotations.by_name(gc_aftereach), gc_aftereach ); end if; - if a_annotations.by_name.exists(gc_tag) then - add_tags_to_suite_item(a_suite, a_annotations.by_name(gc_tag),a_suite.tags); + if a_annotations.by_name.exists(gc_tags) then + add_tags_to_suite_item(a_suite, a_annotations.by_name(gc_tags),a_suite.tags); end if; a_suite.disabled_flag := ut_utils.boolean_to_int(a_annotations.by_name.exists(gc_disabled)); diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 5dfadea19..3ec25019e 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -17,7 +17,6 @@ create or replace package body ut_suite_manager is */ gc_suitpath_error_message constant varchar2(100) := 'Suitepath exceeds 1000 CHAR on: '; - gc_tag_errmsg constant integer := 450; gc_get_cache_suite_sql constant varchar2(32767) := q'[with @@ -553,6 +552,8 @@ create or replace package body ut_suite_manager is l_sql := replace(l_sql,'{:random_seed:}',get_random_seed_sql(a_random_seed)); l_sql := replace(l_sql,'{:owner:}',l_ut_owner); + ut_event_manager.trigger_event(ut_event_manager.gc_debug, ut_key_anyvalues().put('l_sql',l_sql) ); + open l_result for l_sql using l_path, l_path, upper(a_object_name), upper(a_procedure_name), l_tags, a_random_seed; return l_result; end; From df67dee7bd56bd47ba568e2cfbd950f04e9cdf62 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Thu, 6 Jun 2019 00:52:27 +0000 Subject: [PATCH 0484/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index c1c945097..ae9d49bd2 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index e51ea8f5d..dcd197373 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index a4f8ab783..8ed1c349f 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 9ce66ce5c..983d4206a 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 13403f131..a6dd40837 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index dae921832..d99a62d04 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 4277ba9cb..416bb2824 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 2ba58df80..131e7ccab 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 54d48b06c..841c6b97f 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index f42e2f655..b4fac8f14 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index affa252aa..9162797c1 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 959902d28..1b0be19b3 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 56eccc064..aa8053e31 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index a412a7c17..0b0ce0759 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index c962dc67b..42f9dbc6c 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index d25a2d697..c42e2986a 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index db0489a4d..5cbfaa7da 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.2999--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 8e0af7b8d..1557a3981 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -773,7 +773,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.7.2999-develop + * secion v3.1.7.3006-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 28a80be01..41b0f84f7 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.7.2999-develop'; + gc_version constant varchar2(50) := 'v3.1.7.3006-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 4d38af1ce7b1c73570ec76dc0f75ef1feb65b323 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 6 Jun 2019 22:29:45 +0100 Subject: [PATCH 0485/1096] Fixed install of release until feature is merged back. --- .travis/install_utplsql_release.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis/install_utplsql_release.sh b/.travis/install_utplsql_release.sh index 339c23c6e..6dc56c3f3 100755 --- a/.travis/install_utplsql_release.sh +++ b/.travis/install_utplsql_release.sh @@ -36,9 +36,14 @@ end; / SQL +INSTALL_FILE="install_headless_with_trigger.sql" +if [[ ! -f "${INSTALL_FILE}" ]]; then + INSTALL_FILE="install_headless.sql" +fi + "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA < Date: Thu, 6 Jun 2019 22:52:14 +0100 Subject: [PATCH 0486/1096] Enabled-back dbms_preprocessor --- source/core/annotations/ut_annotation_parser.pkb | 3 +-- test/ut3_tester/core/annotations/test_annotation_parser.pks | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/source/core/annotations/ut_annotation_parser.pkb b/source/core/annotations/ut_annotation_parser.pkb index 49882845d..8d3cee3ad 100644 --- a/source/core/annotations/ut_annotation_parser.pkb +++ b/source/core/annotations/ut_annotation_parser.pkb @@ -234,9 +234,8 @@ create or replace package body ut_annotation_parser as if a_source_lines.count > 0 then --convert to post-processed source clob begin - l_processed_lines := a_source_lines; --get post-processed source --- l_processed_lines := sys.dbms_preprocessor.get_post_processed_source(a_source_lines); + l_processed_lines := sys.dbms_preprocessor.get_post_processed_source(a_source_lines); --convert to clob for i in 1..l_processed_lines.count loop ut_utils.append_to_clob(l_source, replace(l_processed_lines(i), chr(13)||chr(10), chr(10))); diff --git a/test/ut3_tester/core/annotations/test_annotation_parser.pks b/test/ut3_tester/core/annotations/test_annotation_parser.pks index 7e649caf9..a4fe3ed70 100644 --- a/test/ut3_tester/core/annotations/test_annotation_parser.pks +++ b/test/ut3_tester/core/annotations/test_annotation_parser.pks @@ -21,7 +21,6 @@ create or replace package test_annotation_parser is procedure ignore_annotations_in_comments; --%test(Ignores wrapped package and does not raise exception) - --%disabled(TODO - causes issues on 18c with install when trigger enabled) procedure ignore_wrapped_package; --%test(Parses package level annotations with annotation params containing brackets) From aa313e519aede4f815971072d39e8811c155f773 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 7 Jun 2019 02:04:20 +0100 Subject: [PATCH 0487/1096] Fixed bug in parsing annotations from DDL trigger. --- source/core/annotations/ut_annotation_manager.pkb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index 8da1b3823..3b9c81f71 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -170,7 +170,7 @@ create or replace package body ut_annotation_manager as a_sources_cursor sys_refcursor ) is l_annotations ut_annotations; - c_lines_fetch_limit constant integer := 1000; + c_lines_fetch_limit constant integer := 10000; l_lines dbms_preprocessor.source_lines_t; l_names dbms_preprocessor.source_lines_t; l_name varchar2(250); @@ -263,14 +263,14 @@ create or replace package body ut_annotation_manager as l_sql_text ora_name_list_t := a_sql_text; begin if a_parts > 0 then - l_sql_text(1) := regexp_replace(l_sql_text(1),'^\s*create(\s+or\s+replace)?\s+', modifier => 'i'); + l_sql_text(1) := regexp_replace(l_sql_text(1),'^\s*create(\s+or\s+replace)?(\s+(non)?editionable)?\s+', modifier => 'i'); for i in 1..a_parts loop ut_utils.append_to_clob(l_sql_clob, l_sql_text(i)); end loop; l_sql_lines := ut_utils.convert_collection( ut_utils.clob_to_table(l_sql_clob) ); end if; open l_result for - select a_object_name as name, column_value||chr(10) as text from table(l_sql_lines); + select a_object_name as name, column_value||chr(10) as text from table(l_sql_lines) where rownum <1; return l_result; end; begin From 242b2a3fbce7af7a6e5f7568d01d7bf3aa6cf0b3 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 8 Jun 2019 01:33:41 +0100 Subject: [PATCH 0488/1096] Fixed issues with parsing code through trigger. Added disabling trigger on annotation parser tests. --- .travis/install.sh | 3 +++ .../annotations/ut_annotation_manager.pkb | 8 +++--- .../core/annotations/ut_annotation_parser.pkb | 8 ++++-- .../core/annotations/ut_annotation_parser.pks | 2 +- .../ut_trigger_annotation_parsing.trg | 1 + source/core/annotations/ut_trigger_check.pkb | 3 ++- source/core/annotations/ut_trigger_check.pks | 7 ++++- .../annotations/test_annotation_manager.pkb | 19 ++++++++++++-- .../annotations/test_annotation_manager.pks | 26 +++++++++++-------- .../annotations/test_annotation_parser.pkb | 2 +- 10 files changed, 56 insertions(+), 23 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index 04cf72c16..e6456e476 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -69,6 +69,9 @@ SQL time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL set feedback off @create_utplsql_owner.sql $UT3_TESTER $UT3_TESTER_PASSWORD $UT3_TABLESPACE +--needed for disabling DDL trigger and testint parser without trigger enabled/present +grant alter any trigger to ut3_tester; +grant administer database trigger to $UT3_TESTER; exit SQL diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index 3b9c81f71..58f675a14 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -182,7 +182,7 @@ create or replace package body ut_annotation_manager as fetch a_sources_cursor bulk collect into l_names, l_lines limit c_lines_fetch_limit; for i in 1 .. l_names.count loop if l_names(i) != l_name then - l_annotations := ut_annotation_parser.parse_object_annotations(l_object_lines); + l_annotations := ut_annotation_parser.parse_object_annotations(l_object_lines, a_object_type); ut_annotation_cache_manager.update_cache( ut_annotated_object(a_object_owner, l_name, a_object_type, l_parse_time, l_annotations) ); @@ -196,7 +196,7 @@ create or replace package body ut_annotation_manager as end loop; if a_sources_cursor%rowcount > 0 then - l_annotations := ut_annotation_parser.parse_object_annotations(l_object_lines); + l_annotations := ut_annotation_parser.parse_object_annotations(l_object_lines, a_object_type); ut_annotation_cache_manager.update_cache( ut_annotated_object(a_object_owner, l_name, a_object_type, l_parse_time, l_annotations) ); @@ -263,14 +263,14 @@ create or replace package body ut_annotation_manager as l_sql_text ora_name_list_t := a_sql_text; begin if a_parts > 0 then - l_sql_text(1) := regexp_replace(l_sql_text(1),'^\s*create(\s+or\s+replace)?(\s+(non)?editionable)?\s+', modifier => 'i'); + l_sql_text(1) := regexp_replace(l_sql_text(1),'^\s*create(\s+or\s+replace){0,1}(\s+(editionable|noneditionable)){0,1}\s+{0,1}', modifier => 'i'); for i in 1..a_parts loop ut_utils.append_to_clob(l_sql_clob, l_sql_text(i)); end loop; l_sql_lines := ut_utils.convert_collection( ut_utils.clob_to_table(l_sql_clob) ); end if; open l_result for - select a_object_name as name, column_value||chr(10) as text from table(l_sql_lines) where rownum <1; + select a_object_name as name, column_value||chr(10) as text from table(l_sql_lines); return l_result; end; begin diff --git a/source/core/annotations/ut_annotation_parser.pkb b/source/core/annotations/ut_annotation_parser.pkb index 8d3cee3ad..66d07d5d3 100644 --- a/source/core/annotations/ut_annotation_parser.pkb +++ b/source/core/annotations/ut_annotation_parser.pkb @@ -223,7 +223,7 @@ create or replace package body ut_annotation_parser as return l_result; end parse_object_annotations; - function parse_object_annotations(a_source_lines dbms_preprocessor.source_lines_t) return ut_annotations is + function parse_object_annotations(a_source_lines dbms_preprocessor.source_lines_t, a_object_type varchar2) return ut_annotations is l_processed_lines dbms_preprocessor.source_lines_t; l_source clob; l_annotations ut_annotations := ut_annotations(); @@ -235,7 +235,11 @@ create or replace package body ut_annotation_parser as --convert to post-processed source clob begin --get post-processed source - l_processed_lines := sys.dbms_preprocessor.get_post_processed_source(a_source_lines); + if a_object_type = 'TYPE' then + l_processed_lines := a_source_lines; + else + l_processed_lines := sys.dbms_preprocessor.get_post_processed_source(a_source_lines); + end if; --convert to clob for i in 1..l_processed_lines.count loop ut_utils.append_to_clob(l_source, replace(l_processed_lines(i), chr(13)||chr(10), chr(10))); diff --git a/source/core/annotations/ut_annotation_parser.pks b/source/core/annotations/ut_annotation_parser.pks index a396e877e..87ff70a24 100644 --- a/source/core/annotations/ut_annotation_parser.pks +++ b/source/core/annotations/ut_annotation_parser.pks @@ -27,7 +27,7 @@ create or replace package ut_annotation_parser authid current_user as * @param a_source_lines ordered lines of source code to be parsed * @return array containing annotations */ - function parse_object_annotations(a_source_lines dbms_preprocessor.source_lines_t) return ut_annotations; + function parse_object_annotations(a_source_lines dbms_preprocessor.source_lines_t, a_object_type varchar2) return ut_annotations; /** diff --git a/source/core/annotations/ut_trigger_annotation_parsing.trg b/source/core/annotations/ut_trigger_annotation_parsing.trg index 46703d69a..3e25fd86a 100644 --- a/source/core/annotations/ut_trigger_annotation_parsing.trg +++ b/source/core/annotations/ut_trigger_annotation_parsing.trg @@ -8,6 +8,7 @@ begin 'ANONYMOUS','APPQOSSYS','AUDSYS','DBSFWUSER','DBSNMP','DIP','GGSYS','GSMADMIN_INTERNAL', 'GSMCATUSER','GSMUSER','ORACLE_OCM','OUTLN','REMOTE_SCHEDULER_AGENT','SYS','SYS$UMF', 'SYSBACKUP','SYSDG','SYSKM','SYSRAC','SYSTEM','WMSYS','XDB','XS$NULL') + and not (ora_dict_obj_type = 'TYPE' and ora_dict_obj_name like 'SYS\_PLSQL\_%' escape '\') ) or (ora_dict_obj_owner = UPPER('&&UT3_OWNER') and ora_dict_obj_name = 'UT3_TRIGGER_ALIVE' diff --git a/source/core/annotations/ut_trigger_check.pkb b/source/core/annotations/ut_trigger_check.pkb index 508e50e0f..64ce395c8 100644 --- a/source/core/annotations/ut_trigger_check.pkb +++ b/source/core/annotations/ut_trigger_check.pkb @@ -17,7 +17,6 @@ create or replace package body ut_trigger_check is */ g_is_trigger_live boolean := false; - gc_check_object_name constant varchar2(128) := 'UT3_TRIGGER_ALIVE'; function is_alive return boolean is pragma autonomous_transaction; @@ -32,6 +31,8 @@ create or replace package body ut_trigger_check is begin if ora_dict_obj_owner = ut_utils.ut_owner and ora_dict_obj_name = gc_check_object_name and ora_dict_obj_type = 'SYNONYM' then g_is_trigger_live := true; + else + g_is_trigger_live := false; end if; end; diff --git a/source/core/annotations/ut_trigger_check.pks b/source/core/annotations/ut_trigger_check.pks index b82692082..061582773 100644 --- a/source/core/annotations/ut_trigger_check.pks +++ b/source/core/annotations/ut_trigger_check.pks @@ -16,12 +16,17 @@ create or replace package ut_trigger_check authid definer is limitations under the License. */ + gc_check_object_name constant varchar2(128) := 'UT3_TRIGGER_ALIVE'; + /** * checks if the trigger &&UT3_OWNER._PARSE is enabled and operational. */ - function is_alive return boolean; + /** + * If called from a DDL trigger when creating object gc_check_object_name, sts alive flag to true + * Otherwise sets alive flag to false. + */ procedure is_alive; end; diff --git a/test/ut3_tester/core/annotations/test_annotation_manager.pkb b/test/ut3_tester/core/annotations/test_annotation_manager.pkb index 46f0959e8..d5d2d1749 100644 --- a/test/ut3_tester/core/annotations/test_annotation_manager.pkb +++ b/test/ut3_tester/core/annotations/test_annotation_manager.pkb @@ -1,5 +1,18 @@ create or replace package body test_annotation_manager is + procedure disable_ddl_trigger is + pragma autonomous_transaction; + begin + execute immediate 'alter trigger ut3.ut_trigger_annotation_parsing disable'; + execute immediate 'begin ut3.ut_trigger_check.is_alive(); end;'; + end; + + procedure enable_ddl_trigger is + pragma autonomous_transaction; + begin + execute immediate 'alter trigger ut3.ut_trigger_annotation_parsing enable'; + end; + procedure create_dummy_package is pragma autonomous_transaction; begin @@ -49,6 +62,9 @@ create or replace package body test_annotation_manager is pragma autonomous_transaction; begin execute immediate q'[drop package dummy_test_package]'; + exception + when others then + null; end; procedure recompile_dummy_test_package is @@ -241,8 +257,7 @@ create or replace package body test_annotation_manager is order by annotation_position; open l_expected for - select 2 as annotation_position, 'suite' as annotation_name, - 'dummy_test_suite' as annotation_text, '' as subobject_name + select 2 as annotation_position, 'suite' as annotation_name, 'dummy_test_suite' as annotation_text, '' as subobject_name from dual union all select 3, 'rollback' , 'manual', '' as subobject_name from dual union all diff --git a/test/ut3_tester/core/annotations/test_annotation_manager.pks b/test/ut3_tester/core/annotations/test_annotation_manager.pks index e71a92904..fbb513ec1 100644 --- a/test/ut3_tester/core/annotations/test_annotation_manager.pks +++ b/test/ut3_tester/core/annotations/test_annotation_manager.pks @@ -18,16 +18,21 @@ create or replace package test_annotation_manager is procedure drop_dummy_test_package; + --%context(Without DDL trigger) + + --%beforeall + procedure disable_ddl_trigger; + + --%afterall + procedure enable_ddl_trigger; + + --%beforeeach(create_dummy_package) + --%aftereach(drop_dummy_package) + --%test(Adds new package to annotation cache info) - --%beforetest(create_dummy_package) - --%aftertest(drop_dummy_package) - --%disabled(TODO - make it run with triger disabled) procedure add_new_package; --%test(Updates annotation cache info for modified package) - --%beforetest(create_dummy_package) - --%aftertest(drop_dummy_package) - --%disabled(TODO - make it run with triger disabled) procedure update_modified_package; --%test(Adds annotations to cache for unit test package) @@ -36,23 +41,22 @@ create or replace package test_annotation_manager is procedure add_new_test_package; --%test(Updates annotations in cache for modified test package) - --%beforetest(create_dummy_test_package) - --%aftertest(drop_dummy_test_package) procedure update_modified_test_package; --%test(Keeps annotations in cache when object was removed but user can't see whole schema) --%beforetest(create_dummy_test_package,create_parse_proc_as_ut3$user#) --%aftertest(drop_parse_proc_as_ut3$user#) - --%disabled(no longer true with trigger enabled) procedure keep_dropped_data_in_cache; --%test(Does not return data for dropped object) - --%beforetest(create_dummy_test_package) procedure no_data_for_dropped_object; --%test(Remove object from cache when object dropped and user can see whole schema) - --%beforetest(create_dummy_test_package) procedure cleanup_dropped_data_in_cache; + --%endcontext + + --TODO add tests with trigger + end test_annotation_manager; / diff --git a/test/ut3_tester/core/annotations/test_annotation_parser.pkb b/test/ut3_tester/core/annotations/test_annotation_parser.pkb index 5345e3a50..c4c90c046 100644 --- a/test/ut3_tester/core/annotations/test_annotation_parser.pkb +++ b/test/ut3_tester/core/annotations/test_annotation_parser.pkb @@ -305,7 +305,7 @@ v58yvbLAXLi9gYHwoIvAgccti+Cmpg0DKLY= -- %some_annotation_like_text '; --Act - l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); + l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source,'PACKAGE'); --Assert ut.expect(anydata.convertCollection(l_actual)).to_be_empty(); end; From a173b38ad23c5fd19aeb71c8781797381bb7d4d5 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 8 Jun 2019 01:51:08 +0100 Subject: [PATCH 0489/1096] Fixed re-install of trigger. --- .travis/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis/install.sh b/.travis/install.sh index e6456e476..bb117c67c 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -51,6 +51,7 @@ SQL alter session set plsql_optimize_level=0; @install.sql $UT3_OWNER + @install_ddl_trigger.sql $UT3_OWNER @create_synonyms_and_grants_for_public.sql $UT3_OWNER SQL From 94a1c23389a955fc193c7054bc57f97799363233 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 9 Jun 2019 17:46:05 +0100 Subject: [PATCH 0490/1096] Updated readme for installation with trigger. Added additional tests for annotation management with / without trigger. Fixed code for situations when trigger gets added on pre-existing tests. --- docs/userguide/install.md | 75 +++++- source/check_sys_grants.sql | 6 +- .../annotations/ut_annotation_manager.pkb | 94 ++++--- .../annotations/ut_annotation_manager.pks | 5 +- .../ut_trigger_annotation_parsing.trg | 10 +- source/core/annotations/ut_trigger_check.pkb | 2 +- source/core/annotations/ut_trigger_check.pks | 2 +- source/install.sql | 2 +- source/install_ddl_trigger.sql | 1 + .../annotations/test_annotation_manager.pkb | 239 ++++++++++++------ .../annotations/test_annotation_manager.pks | 82 ++++-- 11 files changed, 358 insertions(+), 160 deletions(-) diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 88b0b0e7f..e3469fa6a 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -72,16 +72,31 @@ The utPLSQL may be installed on any supported version of Oracle Database [see](h * 12c * 12c R2 * 18c +* 19c # Headless installation -To install the utPLSQL into a new database schema and grant it to public, execute the script `install_headless.sql` as SYSDBA. +utPLSQL can be installed with DDL trigger, to enable tracking of DDL changes to your unit test packages. +This is the recommended installation approach, when you want to compile and run unit test packages in a schema containing huge amount of database packages (for example Oracle EBS installation schema). +The reason for having DDL trigger is to enable in-time annotation parsing for utPLSQL. +Without DDL trigger, utPLSQL needs to investigate your schema objects last_ddl_timestamp each time tests are executed to check if any of DB packages were changed in given schema and if they need scanning for annotation changes. +This process can be time-consuming if DB schema is large. -The script accepts three optional parameters that define: +The headless scripts accept three optional parameters that define: - username to create as owner of utPLSQL (default `ut3`) - password for owner of utPLSQL (default `XNtxj8eEgA6X6b6f`) - tablespace to use for storage of profiler data (default `users`) +The scripts need to be executed by `SYSDBA`, in order to grant access to `DBMS_LOCK` and `DBMS_CRYPTO` system packages. + +*Note:* Grant on `DBMS_LOCK` is required only for installation on Oracle versions below 18c. For versions 18c and above, utPLSQL uses `DBMS_SESSION.SLEEP` so access to `DBMS_LOCK` package is no longer needed. + +*Note:* The user performing the installation must have the `ADMINISTER DATABASE TRIGGER` privilege. This is required for installation of trigger that is responsible for parsing annotations at at compile-time of a package. + +## Installation without DDL trigger + +To install the utPLSQL into a new database schema and grant it to public, execute the script `install_headless.sql` as SYSDBA. + Example invocation of the script from command line: ```bash cd source @@ -94,16 +109,37 @@ cd source sqlplus sys/sys_pass@db as sysdba @install_headless.sql utp3 my_verySecret_password utp3_tablespace ``` -The script needs to be executed by `SYSDBA`, in order to grant access to `DBMS_LOCK` and `DBMS_CRYPTO` system packages. +## Installation with DDL trigger + +To install the utPLSQL into a new database schema and grant it to public, execute the script `install_headless_with_trigger.sql` as SYSDBA. + +Example invocation of the script from command line: +```bash +cd source +sqlplus sys/sys_pass@db as sysdba @install_headless_with_trigger.sql +``` + +Invoking script with parameters: +```bash +cd source +sqlplus sys/sys_pass@db as sysdba @install_headless_with_trigger.sql utp3 my_verySecret_password utp3_tablespace +``` + +*Note:* -*Note:* Grant on `DBMS_LOCK` is required on Oracle versions below 18c +When installing utPLSQL into database with existing unit test packages, utPLSQL will not be able to already-existing unit test packages. +When utPSLQL was installed with DDL trigger, you have to do one of: +- Recompile existing Unit Test packages to make utPLSQL aware of their existence +- Invoke `exec ut_runner.rebuild_annotation_cache(a_schema_name=> ... );` for every schema containing unit tests in your database +Steps above are required to assure annotation cache is populated properly from existing objects. +Rebuilding annotation cache might be faster than code recompilation. # Recommended Schema It is highly recommended to install utPLSQL in it's own schema. You are free to choose any name for this schema. Installing uPLSQL into shared schema is really not recommended as you loose isolation of framework. -If the installation and utPLSQL owner user is one and the same, the user must have the following Oracle system permissions before you can proceed with the installation. +If the installing user and utPLSQL owner is one and the same, the user must have the following Oracle system permissions before you can proceed with the installation. - CREATE SESSION - CREATE PROCEDURE @@ -113,6 +149,7 @@ If the installation and utPLSQL owner user is one and the same, the user must ha - CREATE VIEW - CREATE SYNONYM - ALTER SESSION + - CREATE TRIGGER In addition the user must be granted the execute privilege on `DBMS_LOCK` and `DBMS_CRYPTO` packages. @@ -121,11 +158,9 @@ The uninstall process will **not** drop profiler tables, as they can potentially It is up to DBA to maintain the storage of the profiler tables. -Additionally the user performing the installation must have a `ADMINISTER DATABASE TRIGGER` privilege. This is required for installation of trigger that is responsible for parsing annotations at at compile-time of a package. - # Manual installation procedure -### Creating schema for utPLSQL +## Creating schema for utPLSQL To create the utPLSQL schema and grant all the required privileges execute script `create_utplsql_owner.sql` from the `source` directory with parameters: - `user name` - the name of the user that will own of utPLSQL object @@ -138,8 +173,8 @@ cd source sqlplus sys/sys_password@database as sysdba @create_utPLSQL_owner.sql ut3 ut3 users ``` -### Installing utPLSQL -To install the utPLSQL framework into your database run the `/source/install.sql` script and provide `schema_name` where utPLSQL is to be installed. +## Installing utPLSQL +To install the utPLSQL framework into your database, go to `source` directory, run the `install.sql` providing the `schema_name` for utPLSQL as parameter. Schema must be created prior to calling the `install` script. You may install utPLSQL from any account that has sufficient privileges to create objects in other users schema. @@ -149,7 +184,25 @@ cd source sqlplus admin/admins_password@database @install.sql ut3 ``` -### Allowing other users to access the utPLSQL framework +## Installing DDL trigger +To minimize startup time of utPLSQL framework (especially on a database with large schema) it is recommended to install utPLSQL DDL trigger to enable utPLSQL annotation to be updated at compile-time. + +It's recommended to install DDL trigger when connected as `SYSDBA` user. Trigger is created in utPLSQL schema. +If using the owner schema of utPLSQL to install trigger, the owner needs to have `ADMINISTER DATABASE TRIGGER` and `CREATE TRIGGER` system privileges. +If using different user to install trigger, the user needs to have `ADMINISTER DATABASE TRIGGER` and `CREATE ANY TRIGGER` system privileges. + +To install DDL trigger go to `source` directory, run the `install_ddl_trigger.sql` providing the `schema_name` for utPLSQL as parameter. + +Example invocation: +```bash +cd source +sqlplus admin/admins_password@database @install_ddl_trigger.sql ut3 +``` + +*Note:* Trigger can be installed ant any point in time. + + +## Allowing other users to access the utPLSQL framework In order to allow other users to access utPLSQL, synonyms must be created and privileges granted. You have two options: diff --git a/source/check_sys_grants.sql b/source/check_sys_grants.sql index ae861ed33..9b1fbbc0c 100644 --- a/source/check_sys_grants.sql +++ b/source/check_sys_grants.sql @@ -1,8 +1,6 @@ +DEFINE expected_grants = "&1" declare - c_expected_grants constant dbmsoutput_linesarray - := dbmsoutput_linesarray( - 'CREATE TYPE','CREATE VIEW','CREATE SYNONYM','CREATE SEQUENCE','CREATE PROCEDURE','CREATE TABLE', 'ADMINISTER DATABASE TRIGGER' - ); + c_expected_grants constant dbmsoutput_linesarray := dbmsoutput_linesarray( &expected_grants ); l_expected_grants dbmsoutput_linesarray := c_expected_grants; l_missing_grants varchar2(4000); diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index 58f675a14..41bbb000a 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -51,30 +51,34 @@ create or replace package body ut_annotation_manager as return l_result; end; - function get_annotation_objs_info(a_object_owner varchar2, a_object_type varchar2, a_parse_date timestamp := null) return ut_annotation_objs_cache_info is - l_rows sys_refcursor; - l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_objects_view varchar2(200) := ut_metadata.get_objects_view_name(); - l_cursor_text varchar2(32767); - l_result ut_annotation_objs_cache_info; - l_object_owner varchar2(250); - l_object_type varchar2(250); + function get_annotation_objs_info( + a_object_owner varchar2, + a_object_type varchar2, + a_parse_date timestamp := null, + a_full_scan boolean := true + ) return ut_annotation_objs_cache_info is + l_rows sys_refcursor; + l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_objects_view varchar2(200) := ut_metadata.get_objects_view_name(); + l_cursor_text varchar2(32767); + l_result ut_annotation_objs_cache_info; + l_object_owner varchar2(250); + l_object_type varchar2(250); begin ut_event_manager.trigger_event( - 'get_annotation_objs_info - start ( ut_trigger_check.is_alive = ' - || case when ut_trigger_check.is_alive() then 'Y' else 'N' end || ' )' + 'get_annotation_objs_info - start ( a_full_scan = ' || ut_utils.to_string(a_full_scan) || ' )' ); - if ut_trigger_check.is_alive() then + if not a_full_scan then l_cursor_text := q'[select ]'||l_ut_owner||q'[.ut_annotation_obj_cache_info( - object_owner => i.object_owner, - object_name => i.object_name, - object_type => i.object_type, + object_owner => i.object_owner, + object_name => i.object_name, + object_type => i.object_type, needs_refresh => 'N' ) from ]'||l_ut_owner||q'[.ut_annotation_cache_info i where i.object_owner = :a_object_owner - and i.object_type = :a_object_type]'; + and i.object_type = :a_object_type]'; open l_rows for l_cursor_text using a_object_owner, a_object_type; else if a_object_owner is not null then @@ -85,17 +89,17 @@ create or replace package body ut_annotation_manager as end if; l_cursor_text := q'[select ]'||l_ut_owner||q'[.ut_annotation_obj_cache_info( - object_owner => o.owner, - object_name => o.object_name, - object_type => o.object_type, + object_owner => o.owner, + object_name => o.object_name, + object_type => o.object_type, needs_refresh => case when o.last_ddl_time < cast(i.parse_time as date) then 'N' else 'Y' end ) from ]'||l_objects_view||q'[ o left join ]'||l_ut_owner||q'[.ut_annotation_cache_info i - on o.owner = i.object_owner + on o.owner = i.object_owner and o.object_name = i.object_name and o.object_type = i.object_type - where o.owner = ']'||l_object_owner||q'[' + where o.owner = ']'||l_object_owner||q'[' and o.object_type = ']'||l_object_type||q'[' and ]' || case @@ -105,7 +109,7 @@ create or replace package body ut_annotation_manager as end; open l_rows for l_cursor_text using a_parse_date; end if; - fetch l_rows bulk collect into l_result limit 1000000; + fetch l_rows bulk collect into l_result limit 10000000; close l_rows; ut_event_manager.trigger_event('get_annotation_objs_info - end (count='||l_result.count||')'); return l_result; @@ -207,14 +211,15 @@ create or replace package body ut_annotation_manager as end; - procedure rebuild_annotation_cache( + procedure refresh_annotation_cache( a_object_owner varchar2, a_object_type varchar2, a_info_rows ut_annotation_objs_cache_info ) is l_objects_to_parse ut_annotation_objs_cache_info; begin - select value(x)bulk collect into l_objects_to_parse + select value(x) + bulk collect into l_objects_to_parse from table(a_info_rows) x where x.needs_refresh = 'Y'; ut_event_manager.trigger_event('rebuild_annotation_cache - start (l_objects_to_parse.count = '||l_objects_to_parse.count||')'); @@ -243,12 +248,10 @@ create or replace package body ut_annotation_manager as --public definitions ------------------------------------------------------------ procedure rebuild_annotation_cache(a_object_owner varchar2, a_object_type varchar2) is + l_annotation_objs_info ut_annotation_objs_cache_info; begin - rebuild_annotation_cache( - a_object_owner, - a_object_type, - get_annotation_objs_info(a_object_owner, a_object_type, null) - ); + l_annotation_objs_info := get_annotation_objs_info(a_object_owner, a_object_type, null, true); + refresh_annotation_cache( a_object_owner, a_object_type, l_annotation_objs_info ); end; procedure trigger_obj_annotation_rebuild is @@ -273,9 +276,23 @@ create or replace package body ut_annotation_manager as select a_object_name as name, column_value||chr(10) as text from table(l_sql_lines); return l_result; end; - begin - ut_trigger_check.is_alive(); + function get_source_for_object(a_object_owner varchar2, a_object_name varchar2, a_object_type varchar2) return sys_refcursor is + l_result sys_refcursor; + l_sources_view varchar2(200) := ut_metadata.get_source_view_name(); + begin + open l_result for + q'[select :a_object_name, s.text + from ]'||l_sources_view||q'[ s + where s.type = :a_object_type + and s.owner = :a_object_owner + and s.name = :a_object_name + order by s.line]' + using a_object_name, a_object_type, a_object_owner, a_object_name; + return l_result; + end; + + begin if ora_dict_obj_type in ('PACKAGE','PROCEDURE','FUNCTION','TYPE') then l_object_to_parse := ut_annotation_obj_cache_info(ora_dict_obj_owner, ora_dict_obj_name, ora_dict_obj_type, 'Y'); @@ -287,8 +304,10 @@ create or replace package body ut_annotation_manager as get_source_from_sql_text(ora_dict_obj_name, l_sql_text, l_parts) ); elsif ora_sysevent = 'ALTER' then - null; - --update parse_time + build_annot_cache_for_sources( + ora_dict_obj_owner, ora_dict_obj_type, + get_source_for_object(ora_dict_obj_owner, ora_dict_obj_name, ora_dict_obj_type) + ); elsif ora_sysevent = 'DROP' then ut_annotation_cache_manager.remove_from_cache(ut_annotation_objs_cache_info(l_object_to_parse)); end if; @@ -296,18 +315,18 @@ create or replace package body ut_annotation_manager as end; function get_annotated_objects(a_object_owner varchar2, a_object_type varchar2, a_parse_date timestamp := null) return ut_annotated_objects pipelined is - l_info_rows ut_annotation_objs_cache_info; + l_annotation_objs_info ut_annotation_objs_cache_info; l_cursor sys_refcursor; l_results ut_annotated_objects; c_object_fetch_limit constant integer := 10; + l_full_scan_needed boolean := not ut_trigger_check.is_alive(); begin ut_event_manager.trigger_event('get_annotated_objects - start'); - - l_info_rows := get_annotation_objs_info(a_object_owner, a_object_type, a_parse_date); - rebuild_annotation_cache(a_object_owner, a_object_type, l_info_rows); + l_annotation_objs_info := get_annotation_objs_info(a_object_owner, a_object_type, a_parse_date, l_full_scan_needed); + refresh_annotation_cache(a_object_owner, a_object_type, l_annotation_objs_info); --pipe annotations from cache - l_cursor := ut_annotation_cache_manager.get_annotations_for_objects(l_info_rows, a_parse_date); + l_cursor := ut_annotation_cache_manager.get_annotations_for_objects(l_annotation_objs_info, a_parse_date); loop fetch l_cursor bulk collect into l_results limit c_object_fetch_limit; for i in 1 .. l_results.count loop @@ -357,5 +376,6 @@ create or replace package body ut_annotation_manager as end if; return l_result; end; + end ut_annotation_manager; / diff --git a/source/core/annotations/ut_annotation_manager.pks b/source/core/annotations/ut_annotation_manager.pks index 729d2d4ee..237d36724 100644 --- a/source/core/annotations/ut_annotation_manager.pks +++ b/source/core/annotations/ut_annotation_manager.pks @@ -56,7 +56,10 @@ create or replace package ut_annotation_manager authid current_user as */ procedure purge_cache(a_object_owner varchar2, a_object_type varchar2); - + + /* + * Returns a hash value of suitepath based on input path and random seed + */ function hash_suite_path(a_path varchar2, a_random_seed positiven) return varchar2; end ut_annotation_manager; diff --git a/source/core/annotations/ut_trigger_annotation_parsing.trg b/source/core/annotations/ut_trigger_annotation_parsing.trg index 3e25fd86a..32710e6c5 100644 --- a/source/core/annotations/ut_trigger_annotation_parsing.trg +++ b/source/core/annotations/ut_trigger_annotation_parsing.trg @@ -2,7 +2,12 @@ create or replace trigger ut_trigger_annotation_parsing after create or alter or drop on database begin - if ( ora_dict_obj_type in ('PACKAGE','PROCEDURE','FUNCTION','TYPE') + if (ora_dict_obj_owner = UPPER('&&UT3_OWNER') + and ora_dict_obj_name = 'UT3_TRIGGER_ALIVE' + and ora_dict_obj_type = 'SYNONYM') + then + execute immediate 'begin ut_trigger_check.is_alive(); end;'; + elsif ( ora_dict_obj_type in ('PACKAGE','PROCEDURE','FUNCTION','TYPE') and ora_dict_obj_owner not in ( 'ANONYMOUS','APPQOSSYS','AUDSYS','DBSFWUSER','DBSNMP','DIP','GGSYS','GSMADMIN_INTERNAL', @@ -10,9 +15,6 @@ begin 'SYSBACKUP','SYSDG','SYSKM','SYSRAC','SYSTEM','WMSYS','XDB','XS$NULL') and not (ora_dict_obj_type = 'TYPE' and ora_dict_obj_name like 'SYS\_PLSQL\_%' escape '\') ) - or (ora_dict_obj_owner = UPPER('&&UT3_OWNER') - and ora_dict_obj_name = 'UT3_TRIGGER_ALIVE' - and ora_dict_obj_type = 'SYNONYM') then execute immediate 'begin ut_annotation_manager.trigger_obj_annotation_rebuild; end;'; end if; diff --git a/source/core/annotations/ut_trigger_check.pkb b/source/core/annotations/ut_trigger_check.pkb index 64ce395c8..9b655a0a1 100644 --- a/source/core/annotations/ut_trigger_check.pkb +++ b/source/core/annotations/ut_trigger_check.pkb @@ -29,7 +29,7 @@ create or replace package body ut_trigger_check is procedure is_alive is begin - if ora_dict_obj_owner = ut_utils.ut_owner and ora_dict_obj_name = gc_check_object_name and ora_dict_obj_type = 'SYNONYM' then + if ora_dict_obj_owner is not null and ora_dict_obj_name is not null and ora_dict_obj_type is not null then g_is_trigger_live := true; else g_is_trigger_live := false; diff --git a/source/core/annotations/ut_trigger_check.pks b/source/core/annotations/ut_trigger_check.pks index 061582773..b378948cb 100644 --- a/source/core/annotations/ut_trigger_check.pks +++ b/source/core/annotations/ut_trigger_check.pks @@ -24,7 +24,7 @@ create or replace package ut_trigger_check authid definer is function is_alive return boolean; /** - * If called from a DDL trigger when creating object gc_check_object_name, sts alive flag to true + * If called from a DDL trigger when creating object gc_check_object_name, sets alive flag to true * Otherwise sets alive flag to false. */ procedure is_alive; diff --git a/source/install.sql b/source/install.sql index 3163e1c26..9ebeb37d5 100644 --- a/source/install.sql +++ b/source/install.sql @@ -31,7 +31,7 @@ prompt &&line_separator alter session set current_schema = &&ut3_owner; @@check_object_grants.sql -@@check_sys_grants.sql +@@check_sys_grants.sql "'CREATE TYPE','CREATE VIEW','CREATE SYNONYM','CREATE SEQUENCE','CREATE PROCEDURE','CREATE TABLE'" --set define off --dbms_output buffer cache table diff --git a/source/install_ddl_trigger.sql b/source/install_ddl_trigger.sql index 39b975716..3725ff332 100644 --- a/source/install_ddl_trigger.sql +++ b/source/install_ddl_trigger.sql @@ -17,5 +17,6 @@ @@define_ut3_owner_param.sql +@@check_sys_grants.sql "'ADMINISTER DATABASE TRIGGER','CREATE TRIGGER'" @@install_component.sql 'core/annotations/ut_trigger_annotation_parsing.trg' diff --git a/test/ut3_tester/core/annotations/test_annotation_manager.pkb b/test/ut3_tester/core/annotations/test_annotation_manager.pkb index d5d2d1749..4778117c5 100644 --- a/test/ut3_tester/core/annotations/test_annotation_manager.pkb +++ b/test/ut3_tester/core/annotations/test_annotation_manager.pkb @@ -25,6 +25,9 @@ create or replace package body test_annotation_manager is pragma autonomous_transaction; begin execute immediate q'[drop package dummy_package]'; + exception + when others then + null; end; procedure recompile_dummy_package is @@ -86,6 +89,9 @@ create or replace package body test_annotation_manager is procedure drop_parse_proc_as_ut3$user# is begin ut3_tester_helper.main_helper.drop_parse_proc_as_ut3$user#(); + exception + when others then + null; end; procedure cleanup_annotation_cache is @@ -93,11 +99,160 @@ create or replace package body test_annotation_manager is ut3_tester_helper.main_helper.cleanup_annotation_cache(); end; + procedure assert_dummy_package(a_start_date date) is + l_actual_cache_id integer; + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + select max(cache_id) + into l_actual_cache_id + from ut3.ut_annotation_cache_info + where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PACKAGE' and object_name = 'DUMMY_PACKAGE' + and parse_time >= a_start_date; + ut.expect(l_actual_cache_id).to_be_not_null; + + open l_actual for + select annotation_position, annotation_name, annotation_text, subobject_name + from ut3.ut_annotation_cache where cache_id = l_actual_cache_id + order by annotation_position; + + ut.expect(l_actual).to_be_empty(); + end; + + procedure assert_dummy_test_package(a_start_date date) is + l_actual_cache_id integer; + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + select max(cache_id) + into l_actual_cache_id + from ut3.ut_annotation_cache_info + where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PACKAGE' and object_name = 'DUMMY_TEST_PACKAGE' + and parse_time >= a_start_date; + ut.expect(l_actual_cache_id).to_be_not_null; + + open l_actual for + select annotation_position, annotation_name, annotation_text, subobject_name + from ut3.ut_annotation_cache where cache_id = l_actual_cache_id + order by annotation_position; + + open l_expected for + select 2 as annotation_position, 'suite' as annotation_name, + 'dummy_test_suite' as annotation_text, '' as subobject_name + from dual union all + select 3, 'rollback' , 'manual', '' as subobject_name + from dual union all + select 5, 'test' , 'dummy_test', 'some_dummy_test_procedure' as subobject_name + from dual union all + select 6, 'beforetest' , 'some_procedure', 'some_dummy_test_procedure' as subobject_name + from dual; + + ut.expect(l_actual).to_equal(l_expected); + end; + + + procedure trg_skip_existing_package is + l_actual_cache_id integer; + begin + --Arrange + disable_ddl_trigger(); + create_dummy_test_package(); + --Act + enable_ddl_trigger(); + --Assert + select max(cache_id) + into l_actual_cache_id + from ut3.ut_annotation_cache_info + where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PACKAGE' and object_name = 'DUMMY_TEST_PACKAGE'; + + ut.expect(l_actual_cache_id).to_be_null; + end; + + --%test(Adds existing package to cache when package recompiled) + procedure trg_add_existing_on_compile is + l_start_date date; + begin + --Arrange + disable_ddl_trigger(); + create_dummy_test_package(); + --Act + enable_ddl_trigger(); + l_start_date := sysdate; + recompile_dummy_test_package(); + --Assert + assert_dummy_test_package(l_start_date); + end; + + --%test(Adds existing package to cache when schema cache refreshed) + procedure trg_add_existing_on_refresh is + l_start_date date; + begin + --Arrange + disable_ddl_trigger(); + create_dummy_test_package(); + create_dummy_package(); + --Act + enable_ddl_trigger(); + l_start_date := sysdate; + ut3.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); + --Assert + assert_dummy_test_package(l_start_date); + assert_dummy_package(l_start_date); + end; + + procedure trg_not_add_new_package is + l_actual sys_refcursor; + begin + --Act + create_dummy_package(); + --Assert + open l_actual for + select * + from ut3.ut_annotation_cache_info + where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PACKAGE' and object_name = 'DUMMY_PACKAGE'; + + ut.expect(l_actual).to_be_empty(); + end; + + procedure trg_add_new_test_package is + l_actual sys_refcursor; + l_expected sys_refcursor; + l_start_date date; + begin + --Arrange + l_start_date := sysdate; + --Act + create_dummy_test_package(); + --Assert + assert_dummy_test_package(l_start_date); + end; + + --%test(Removes annotations from cache when object was removed and user can't see whole schema) + procedure trg_no_data_for_dropped_object is + l_actual sys_refcursor; + begin + drop_dummy_test_package(); + --Assert + open l_actual for + select * + from ut3.ut_annotation_cache_info + where object_owner = sys_context('USERENV', 'CURRENT_USER') + and object_type = 'PACKAGE' and object_name = 'DUMMY_TEST_PACKAGE'; + + ut.expect(l_actual).to_be_empty(); + + end; + + --%test(Updates annotation cache when package recompiled) + procedure trg_update_modified_package is + begin + null; + end; procedure add_new_package is l_actual_cache_id integer; - l_actual integer; - l_start_date date; + l_actual sys_refcursor; + l_start_date date; begin --Act l_start_date := sysdate; @@ -111,17 +266,16 @@ create or replace package body test_annotation_manager is ut.expect(l_actual_cache_id).to_be_not_null; - select count(1) - into l_actual - from ut3.ut_annotation_cache - where cache_id = l_actual_cache_id; + open l_actual for + select * + from ut3.ut_annotation_cache + where cache_id = l_actual_cache_id; - ut.expect(l_actual).to_equal(0); + ut.expect(l_actual).to_be_empty(); end; procedure update_modified_package is - l_actual_cache_id integer; l_actual integer; l_start_date date; begin @@ -135,28 +289,15 @@ create or replace package body test_annotation_manager is $else dbms_lock.sleep(1); $end + --Act ut3.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); --Assert - select max(cache_id) - into l_actual_cache_id - from ut3.ut_annotation_cache_info - where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PACKAGE' and object_name = 'DUMMY_PACKAGE' - and parse_time >= l_start_date; - - ut.expect(l_actual_cache_id).to_be_not_null; - - select count(1) - into l_actual - from ut3.ut_annotation_cache - where cache_id = l_actual_cache_id; - - ut.expect(l_actual).to_equal(0); + assert_dummy_package(l_start_date); end; procedure add_new_test_package is - l_actual_cache_id integer; l_actual sys_refcursor; l_expected sys_refcursor; l_start_date date; @@ -166,31 +307,7 @@ create or replace package body test_annotation_manager is --Act ut3.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); --Assert - select max(cache_id) - into l_actual_cache_id - from ut3.ut_annotation_cache_info - where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PACKAGE' and object_name = 'DUMMY_TEST_PACKAGE' - and parse_time >= l_start_date; - - ut.expect(l_actual_cache_id).to_be_not_null; - - open l_actual for - select annotation_position, annotation_name, annotation_text, subobject_name - from ut3.ut_annotation_cache where cache_id = l_actual_cache_id - order by annotation_position; - - open l_expected for - select 2 as annotation_position, 'suite' as annotation_name, - 'dummy_test_suite' as annotation_text, '' as subobject_name - from dual union all - select 3, 'rollback' , 'manual', '' as subobject_name - from dual union all - select 5, 'test' , 'dummy_test', 'some_dummy_test_procedure' as subobject_name - from dual union all - select 6, 'beforetest' , 'some_procedure', 'some_dummy_test_procedure' as subobject_name - from dual; - - ut.expect(l_actual).to_equal(l_expected); + assert_dummy_test_package(l_start_date); end; @@ -232,7 +349,6 @@ create or replace package body test_annotation_manager is procedure keep_dropped_data_in_cache is - l_actual_cache_id integer; l_actual sys_refcursor; l_expected sys_refcursor; l_start_date date; @@ -243,30 +359,7 @@ create or replace package body test_annotation_manager is --Act parse_dummy_test_as_ut3$user#(); --Assert - select max(cache_id) - into l_actual_cache_id - from ut3.ut_annotation_cache_info - where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PACKAGE' and object_name = 'DUMMY_TEST_PACKAGE' - and parse_time >= l_start_date; - - ut.expect(l_actual_cache_id).not_to_be_null(); - - open l_actual for - select annotation_position, annotation_name, annotation_text, subobject_name - from ut3.ut_annotation_cache where cache_id = l_actual_cache_id - order by annotation_position; - - open l_expected for - select 2 as annotation_position, 'suite' as annotation_name, 'dummy_test_suite' as annotation_text, '' as subobject_name - from dual union all - select 3, 'rollback' , 'manual', '' as subobject_name - from dual union all - select 5, 'test' , 'dummy_test', 'some_dummy_test_procedure' as subobject_name - from dual union all - select 6, 'beforetest' , 'some_procedure', 'some_dummy_test_procedure' as subobject_name - from dual; - - ut.expect(l_actual).to_equal(l_expected); + assert_dummy_test_package(l_start_date); end; procedure no_data_for_dropped_object is diff --git a/test/ut3_tester/core/annotations/test_annotation_manager.pks b/test/ut3_tester/core/annotations/test_annotation_manager.pks index fbb513ec1..fd5bc3410 100644 --- a/test/ut3_tester/core/annotations/test_annotation_manager.pks +++ b/test/ut3_tester/core/annotations/test_annotation_manager.pks @@ -6,6 +6,10 @@ create or replace package test_annotation_manager is --%aftereach procedure cleanup_annotation_cache; + procedure disable_ddl_trigger; + + procedure enable_ddl_trigger; + procedure create_dummy_package; procedure drop_dummy_package; @@ -18,45 +22,69 @@ create or replace package test_annotation_manager is procedure drop_dummy_test_package; - --%context(Without DDL trigger) + --%context(With DDL trigger enabled) - --%beforeall - procedure disable_ddl_trigger; + --%aftereach(drop_dummy_test_package,drop_dummy_package) - --%afterall - procedure enable_ddl_trigger; + --%test(Does not detect unit test packages created before enabling trigger) + procedure trg_skip_existing_package; + + --%test(Adds existing package to cache when package recompiled) + procedure trg_add_existing_on_compile; - --%beforeeach(create_dummy_package) - --%aftereach(drop_dummy_package) + --%test(Adds existing package to cache when schema cache refreshed) + procedure trg_add_existing_on_refresh; - --%test(Adds new package to annotation cache info) - procedure add_new_package; + --%test(Doesn't add package to annotation cache info when it is not unit test package) + procedure trg_not_add_new_package; - --%test(Updates annotation cache info for modified package) - procedure update_modified_package; + --%test(Populates annotation cache when package created) + procedure trg_add_new_test_package; - --%test(Adds annotations to cache for unit test package) - --%beforetest(create_dummy_test_package) - --%aftertest(drop_dummy_test_package) - procedure add_new_test_package; + --%test(Removes annotations from cache when object was removed and user can't see whole schema) + --%beforetest(create_dummy_test_package) + procedure trg_no_data_for_dropped_object; - --%test(Updates annotations in cache for modified test package) - procedure update_modified_test_package; + --%test(Updates annotation cache when package recompiled) + procedure trg_update_modified_package; - --%test(Keeps annotations in cache when object was removed but user can't see whole schema) - --%beforetest(create_dummy_test_package,create_parse_proc_as_ut3$user#) - --%aftertest(drop_parse_proc_as_ut3$user#) - procedure keep_dropped_data_in_cache; + --%endcontext - --%test(Does not return data for dropped object) - procedure no_data_for_dropped_object; + --%context(Without DDL trigger enabled) - --%test(Remove object from cache when object dropped and user can see whole schema) - procedure cleanup_dropped_data_in_cache; + --%beforeall(disable_ddl_trigger) - --%endcontext + --%afterall(enable_ddl_trigger) - --TODO add tests with trigger + --%beforeeach(create_dummy_package) + --%aftereach(drop_dummy_package) + + --%test(Adds new package to annotation cache info when it is not unit test package) + procedure add_new_package; + + --%test(Updates annotation cache info for modified package) + procedure update_modified_package; + + --%test(Adds annotations to cache for unit test package) + --%beforetest(create_dummy_test_package) + --%aftertest(drop_dummy_test_package) + procedure add_new_test_package; + + --%test(Updates annotations in cache for modified test package) + procedure update_modified_test_package; + + --%test(Keeps annotations in cache when object was removed but user can't see whole schema) + --%beforetest(create_dummy_test_package,create_parse_proc_as_ut3$user#) + --%aftertest(drop_parse_proc_as_ut3$user#) + procedure keep_dropped_data_in_cache; + + --%test(Does not return data for dropped object) + procedure no_data_for_dropped_object; + + --%test(Remove object from cache when object dropped and user can see whole schema) + procedure cleanup_dropped_data_in_cache; + + --%endcontext end test_annotation_manager; / From 8f6d6c20bf070dac879a65a41cf3f60397124eb4 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 10 Jun 2019 00:13:30 +0100 Subject: [PATCH 0491/1096] Addressed review comments. Refactored install scripts to avoid duplication. Added check for `oracle_maintained` schema when firing DDL trigger. --- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/install.md | 39 ++++++++++++------- source/check_sys_grants.sql | 2 +- .../ut_trigger_annotation_parsing.trg | 27 ++++++++----- source/core/annotations/ut_trigger_check.pkb | 1 + source/core/annotations/ut_trigger_check.pks | 6 +-- source/core/ut_suite_manager.pkb | 1 - source/install_headless.sql | 19 +-------- source/install_headless_with_trigger.sql | 19 +-------- source/set_install_params.sql | 34 ++++++++++++++++ 10 files changed, 83 insertions(+), 67 deletions(-) create mode 100644 source/set_install_params.sql diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index dae921832..79d9acf94 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -430,7 +430,7 @@ Unable to join sets: Please make sure that your join clause is not refferring to collection element ``` -***Note*** +**Note** >`join_by` option is slower to process as it needs to perform a cursor join. ## Defining item lists in option diff --git a/docs/userguide/install.md b/docs/userguide/install.md index e3469fa6a..173acc7d3 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -89,10 +89,23 @@ The headless scripts accept three optional parameters that define: The scripts need to be executed by `SYSDBA`, in order to grant access to `DBMS_LOCK` and `DBMS_CRYPTO` system packages. -*Note:* Grant on `DBMS_LOCK` is required only for installation on Oracle versions below 18c. For versions 18c and above, utPLSQL uses `DBMS_SESSION.SLEEP` so access to `DBMS_LOCK` package is no longer needed. - -*Note:* The user performing the installation must have the `ADMINISTER DATABASE TRIGGER` privilege. This is required for installation of trigger that is responsible for parsing annotations at at compile-time of a package. - +**Note:** +> Grant on `DBMS_LOCK` is required only for installation on Oracle versions below 18c. For versions 18c and above, utPLSQL uses `DBMS_SESSION.SLEEP` so access to `DBMS_LOCK` package is no longer needed. + +**Note:** +> The user performing the installation must have the `ADMINISTER DATABASE TRIGGER` privilege. This is required for installation of trigger that is responsible for parsing annotations at at compile-time of a package. + +**Note:** +> When installing with DDL trigger, utPLSQL will not be registering unit tests for any of oracle-maintained schemas. +For Oracle 11g following users are excluded: +> ANONYMOUS, APPQOSSYS, AUDSYS, DBSFWUSER, DBSNMP, DIP, GGSYS, GSMADMIN_INTERNAL, GSMCATUSER, GSMUSER, ORACLE_OCM, OUTLN, REMOTE_SCHEDULER_AGENT, SYS, SYS$UMF, SYSBACKUP, SYSDG, SYSKM, SYSRAC, SYSTEM, WMSYS, XDB, XS$NULL +> +> For Oracle 12c and above the users returned by below query are excluded by utPLSQL: +> +>```sql +> select username from all_users where oracle_maintained='Y'; +>``` + ## Installation without DDL trigger To install the utPLSQL into a new database schema and grant it to public, execute the script `install_headless.sql` as SYSDBA. @@ -125,15 +138,12 @@ cd source sqlplus sys/sys_pass@db as sysdba @install_headless_with_trigger.sql utp3 my_verySecret_password utp3_tablespace ``` -*Note:* - -When installing utPLSQL into database with existing unit test packages, utPLSQL will not be able to already-existing unit test packages. -When utPSLQL was installed with DDL trigger, you have to do one of: -- Recompile existing Unit Test packages to make utPLSQL aware of their existence -- Invoke `exec ut_runner.rebuild_annotation_cache(a_schema_name=> ... );` for every schema containing unit tests in your database - -Steps above are required to assure annotation cache is populated properly from existing objects. -Rebuilding annotation cache might be faster than code recompilation. +**Note:** +>When installing utPLSQL into database with existing unit test packages, utPLSQL will not be able to already-existing unit test packages. When utPSLQL was installed with DDL trigger, you have to do one of: +>- Recompile existing Unit Test packages to make utPLSQL aware of their existence +>- Invoke `exec ut_runner.rebuild_annotation_cache(a_schema_name=> ... );` for every schema containing unit tests in your database +> +> Steps above are required to assure annotation cache is populated properly from existing objects. Rebuilding annotation cache might be faster than code recompilation. # Recommended Schema It is highly recommended to install utPLSQL in it's own schema. You are free to choose any name for this schema. @@ -199,7 +209,8 @@ cd source sqlplus admin/admins_password@database @install_ddl_trigger.sql ut3 ``` -*Note:* Trigger can be installed ant any point in time. +**Note:** +>Trigger can be installed ant any point in time. ## Allowing other users to access the utPLSQL framework diff --git a/source/check_sys_grants.sql b/source/check_sys_grants.sql index 9b1fbbc0c..a31e9a9e1 100644 --- a/source/check_sys_grants.sql +++ b/source/check_sys_grants.sql @@ -1,4 +1,4 @@ -DEFINE expected_grants = "&1" +define expected_grants = "&1" declare c_expected_grants constant dbmsoutput_linesarray := dbmsoutput_linesarray( &expected_grants ); diff --git a/source/core/annotations/ut_trigger_annotation_parsing.trg b/source/core/annotations/ut_trigger_annotation_parsing.trg index 32710e6c5..1927befec 100644 --- a/source/core/annotations/ut_trigger_annotation_parsing.trg +++ b/source/core/annotations/ut_trigger_annotation_parsing.trg @@ -1,22 +1,29 @@ create or replace trigger ut_trigger_annotation_parsing after create or alter or drop on database +declare + l_restricted_users ora_name_list_t; begin if (ora_dict_obj_owner = UPPER('&&UT3_OWNER') and ora_dict_obj_name = 'UT3_TRIGGER_ALIVE' and ora_dict_obj_type = 'SYNONYM') then execute immediate 'begin ut_trigger_check.is_alive(); end;'; - elsif ( ora_dict_obj_type in ('PACKAGE','PROCEDURE','FUNCTION','TYPE') - and ora_dict_obj_owner - not in ( - 'ANONYMOUS','APPQOSSYS','AUDSYS','DBSFWUSER','DBSNMP','DIP','GGSYS','GSMADMIN_INTERNAL', - 'GSMCATUSER','GSMUSER','ORACLE_OCM','OUTLN','REMOTE_SCHEDULER_AGENT','SYS','SYS$UMF', - 'SYSBACKUP','SYSDG','SYSKM','SYSRAC','SYSTEM','WMSYS','XDB','XS$NULL') - and not (ora_dict_obj_type = 'TYPE' and ora_dict_obj_name like 'SYS\_PLSQL\_%' escape '\') - ) - then - execute immediate 'begin ut_annotation_manager.trigger_obj_annotation_rebuild; end;'; + elsif ora_dict_obj_type in ('PACKAGE','PROCEDURE','FUNCTION','TYPE') then + $if dbms_db_version.version < 12 $then + l_restricted_users := ora_name_list_t( + 'ANONYMOUS','APPQOSSYS','AUDSYS','DBSFWUSER','DBSNMP','DIP','GGSYS','GSMADMIN_INTERNAL', + 'GSMCATUSER','GSMUSER','ORACLE_OCM','OUTLN','REMOTE_SCHEDULER_AGENT','SYS','SYS$UMF', + 'SYSBACKUP','SYSDG','SYSKM','SYSRAC','SYSTEM','WMSYS','XDB','XS$NULL'); + $else + select /*+ result_cache */ username bulk collect into l_restricted_users + from all_users where oracle_maintained = 'Y'; + $end + if not (ora_dict_obj_type = 'TYPE' and ora_dict_obj_name like 'SYS\_PLSQL\_%' escape '\') + and not ora_dict_obj_owner member of l_restricted_users + then + execute immediate 'begin ut_annotation_manager.trigger_obj_annotation_rebuild; end;'; + end if; end if; exception when others then null; diff --git a/source/core/annotations/ut_trigger_check.pkb b/source/core/annotations/ut_trigger_check.pkb index 9b655a0a1..e2811b3c3 100644 --- a/source/core/annotations/ut_trigger_check.pkb +++ b/source/core/annotations/ut_trigger_check.pkb @@ -16,6 +16,7 @@ create or replace package body ut_trigger_check is limitations under the License. */ + gc_check_object_name constant varchar2(128) := 'UT3_TRIGGER_ALIVE'; g_is_trigger_live boolean := false; function is_alive return boolean is diff --git a/source/core/annotations/ut_trigger_check.pks b/source/core/annotations/ut_trigger_check.pks index b378948cb..237af3c68 100644 --- a/source/core/annotations/ut_trigger_check.pks +++ b/source/core/annotations/ut_trigger_check.pks @@ -16,16 +16,14 @@ create or replace package ut_trigger_check authid definer is limitations under the License. */ - gc_check_object_name constant varchar2(128) := 'UT3_TRIGGER_ALIVE'; - /** * checks if the trigger &&UT3_OWNER._PARSE is enabled and operational. */ function is_alive return boolean; /** - * If called from a DDL trigger when creating object gc_check_object_name, sets alive flag to true - * Otherwise sets alive flag to false. + * If called from a DDL trigger sets alive flag to true. + * If called outside of DDL trigger, sets alive flag to false. */ procedure is_alive; diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 298d07176..b59c92a94 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -332,7 +332,6 @@ create or replace package body ut_suite_manager is function get_missing_objects(a_object_owner varchar2) return ut_varchar2_rows is l_rows sys_refcursor; l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_objects_view varchar2(200) := ut_metadata.get_objects_view_name(); l_cursor_text varchar2(32767); l_result ut_varchar2_rows; l_object_owner varchar2(250); diff --git a/source/install_headless.sql b/source/install_headless.sql index 8acc080fa..5162b4c03 100644 --- a/source/install_headless.sql +++ b/source/install_headless.sql @@ -14,25 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ -set echo off -set verify off -column 1 new_value 1 noprint -column 2 new_value 2 noprint -column 3 new_value 3 noprint -select null as "1", null as "2" , null as "3" from dual where 1=0; -column sep new_value sep noprint -select '--------------------------------------------------------------' as sep from dual; - -spool params.sql.tmp - -column ut3_owner new_value ut3_owner noprint -column ut3_password new_value ut3_password noprint -column ut3_tablespace new_value ut3_tablespace noprint - -select coalesce('&&1','UT3') ut3_owner, - coalesce('&&2','XNtxj8eEgA6X6b6f') ut3_password, - coalesce('&&3','users') ut3_tablespace from dual; +@@set_install_params.sql @@create_utplsql_owner.sql &&ut3_owner &&ut3_password &&ut3_tablespace @@install.sql &&ut3_owner diff --git a/source/install_headless_with_trigger.sql b/source/install_headless_with_trigger.sql index 511dd6514..7140ee822 100644 --- a/source/install_headless_with_trigger.sql +++ b/source/install_headless_with_trigger.sql @@ -14,25 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ -set echo off -set verify off -column 1 new_value 1 noprint -column 2 new_value 2 noprint -column 3 new_value 3 noprint -select null as "1", null as "2" , null as "3" from dual where 1=0; -column sep new_value sep noprint -select '--------------------------------------------------------------' as sep from dual; - -spool params.sql.tmp - -column ut3_owner new_value ut3_owner noprint -column ut3_password new_value ut3_password noprint -column ut3_tablespace new_value ut3_tablespace noprint - -select coalesce('&&1','UT3') ut3_owner, - coalesce('&&2','XNtxj8eEgA6X6b6f') ut3_password, - coalesce('&&3','users') ut3_tablespace from dual; +@@set_install_params.sql @@create_utplsql_owner.sql &&ut3_owner &&ut3_password &&ut3_tablespace @@install.sql &&ut3_owner diff --git a/source/set_install_params.sql b/source/set_install_params.sql new file mode 100644 index 000000000..1c7da89e9 --- /dev/null +++ b/source/set_install_params.sql @@ -0,0 +1,34 @@ +/* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +set echo off +set verify off +column 1 new_value 1 noprint; +column 2 new_value 2 noprint; +column 3 new_value 3 noprint; +select null as "1", null as "2" , null as "3" from dual where 1=0; +column sep new_value sep noprint +select '--------------------------------------------------------------' as sep from dual; + +column ut3_owner new_value ut3_owner noprint +column ut3_password new_value ut3_password noprint +column ut3_tablespace new_value ut3_tablespace noprint + +select coalesce('&&1','UT3') ut3_owner, + coalesce('&&2','XNtxj8eEgA6X6b6f') ut3_password, + coalesce('&&3','users') ut3_tablespace + from dual; From 56803f7f32235a21168af2869079b1929b0375ac Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 10 Jun 2019 01:07:51 +0100 Subject: [PATCH 0492/1096] Fixed issue with style check. Reorganized code to avoid problems with conditional compilation on 12.2 for triggers. --- development/utplsql_style_check.sql | 4 ++-- .../annotations/ut_annotation_manager.pkb | 21 +++++++++++++++---- .../ut_trigger_annotation_parsing.trg | 19 +++-------------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/development/utplsql_style_check.sql b/development/utplsql_style_check.sql index 71c419806..00d562541 100644 --- a/development/utplsql_style_check.sql +++ b/development/utplsql_style_check.sql @@ -40,8 +40,8 @@ select i.name, i.type, i.object_name, i.object_type, i.usage, i.line, i.col, cou and i.usage_context_id = p.usage_id where i.type like 'VARIABLE' and i.usage = 'DECLARATION' and i.object_type not in ('TYPE') - and (i.name not like 'L#_%' escape '#' and p.type in ('PROCEDURE','FUNCTION','ITERATOR') - or i.name not like 'G#_%' escape '#' and p.type not in ('PROCEDURE','FUNCTION','ITERATOR')) + and (i.name not like 'L#_%' escape '#' and p.type in ('PROCEDURE','FUNCTION','ITERATOR','TRIGGER') + or i.name not like 'G#_%' escape '#' and p.type not in ('PROCEDURE','FUNCTION','ITERATOR','TRIGGER')) and p.type != 'RECORD' order by object_name, object_type, line, col ; diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index 41bbb000a..70abafef7 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -255,9 +255,10 @@ create or replace package body ut_annotation_manager as end; procedure trigger_obj_annotation_rebuild is - l_sql_text ora_name_list_t; - l_parts binary_integer; - l_object_to_parse ut_annotation_obj_cache_info; + l_sql_text ora_name_list_t; + l_parts binary_integer; + l_object_to_parse ut_annotation_obj_cache_info; + l_restricted_users ora_name_list_t; function get_source_from_sql_text(a_object_name varchar2, a_sql_text ora_name_list_t, a_parts binary_integer) return sys_refcursor is l_sql_clob clob; @@ -291,9 +292,21 @@ create or replace package body ut_annotation_manager as using a_object_name, a_object_type, a_object_owner, a_object_name; return l_result; end; - + begin if ora_dict_obj_type in ('PACKAGE','PROCEDURE','FUNCTION','TYPE') then + $if dbms_db_version.version < 12 $then + l_restricted_users := ora_name_list_t( + 'ANONYMOUS','APPQOSSYS','AUDSYS','DBSFWUSER','DBSNMP','DIP','GGSYS','GSMADMIN_INTERNAL', + 'GSMCATUSER','GSMUSER','ORACLE_OCM','OUTLN','REMOTE_SCHEDULER_AGENT','SYS','SYS$UMF', + 'SYSBACKUP','SYSDG','SYSKM','SYSRAC','SYSTEM','WMSYS','XDB','XS$NULL'); + $else + select username bulk collect into l_restricted_users + from all_users where oracle_maintained = 'Y'; + $end + if ora_dict_obj_owner member of l_restricted_users then + return; + end if; l_object_to_parse := ut_annotation_obj_cache_info(ora_dict_obj_owner, ora_dict_obj_name, ora_dict_obj_type, 'Y'); diff --git a/source/core/annotations/ut_trigger_annotation_parsing.trg b/source/core/annotations/ut_trigger_annotation_parsing.trg index 1927befec..437b7742d 100644 --- a/source/core/annotations/ut_trigger_annotation_parsing.trg +++ b/source/core/annotations/ut_trigger_annotation_parsing.trg @@ -1,29 +1,16 @@ create or replace trigger ut_trigger_annotation_parsing after create or alter or drop on database -declare - l_restricted_users ora_name_list_t; begin if (ora_dict_obj_owner = UPPER('&&UT3_OWNER') and ora_dict_obj_name = 'UT3_TRIGGER_ALIVE' and ora_dict_obj_type = 'SYNONYM') then execute immediate 'begin ut_trigger_check.is_alive(); end;'; - elsif ora_dict_obj_type in ('PACKAGE','PROCEDURE','FUNCTION','TYPE') then - $if dbms_db_version.version < 12 $then - l_restricted_users := ora_name_list_t( - 'ANONYMOUS','APPQOSSYS','AUDSYS','DBSFWUSER','DBSNMP','DIP','GGSYS','GSMADMIN_INTERNAL', - 'GSMCATUSER','GSMUSER','ORACLE_OCM','OUTLN','REMOTE_SCHEDULER_AGENT','SYS','SYS$UMF', - 'SYSBACKUP','SYSDG','SYSKM','SYSRAC','SYSTEM','WMSYS','XDB','XS$NULL'); - $else - select /*+ result_cache */ username bulk collect into l_restricted_users - from all_users where oracle_maintained = 'Y'; - $end - if not (ora_dict_obj_type = 'TYPE' and ora_dict_obj_name like 'SYS\_PLSQL\_%' escape '\') - and not ora_dict_obj_owner member of l_restricted_users - then + elsif ora_dict_obj_type in ('PACKAGE','PROCEDURE','FUNCTION','TYPE') + and not (ora_dict_obj_type = 'TYPE' and ora_dict_obj_name like 'SYS\_PLSQL\_%' escape '\') + then execute immediate 'begin ut_annotation_manager.trigger_obj_annotation_rebuild; end;'; - end if; end if; exception when others then null; From e1a4e58b67f898ffc07a6cead0420c8fe8d989c0 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 10 Jun 2019 08:02:40 +0000 Subject: [PATCH 0493/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index ae9d49bd2..a6c08b142 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index dcd197373..59018dafc 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 8ed1c349f..6c42cc288 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 983d4206a..b5860bd56 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index a6dd40837..dd5d1fa75 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 51d4f741f..db7bb7948 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 416bb2824..76653a6b2 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 131e7ccab..99d49b279 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 841c6b97f..9a3b61fe2 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index b4fac8f14..4afa41ae2 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 9162797c1..49cf4cd31 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 1b0be19b3..b40853f33 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index e297d1eff..f92ee996e 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 0b0ce0759..e43cfd548 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 42f9dbc6c..0da6be7d8 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index c42e2986a..3b20f5938 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 5cbfaa7da..f04f068d3 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3006--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 97b614e3b..b75b2c1d7 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -773,7 +773,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.7.3006-develop + * secion v3.1.7.3035-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 41b0f84f7..10bdab4c7 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.7.3006-develop'; + gc_version constant varchar2(50) := 'v3.1.7.3035-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 1af249a2db668375d8b703d652707e4cae67d98f Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 10 Jun 2019 23:41:24 +0100 Subject: [PATCH 0494/1096] Fixing sonar exclusions for analysis and coverage. --- sonar-project.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index d6744053e..c3acb5c43 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -10,6 +10,7 @@ sonar.projectVersion=v3.1.7-develop # the sonar-project.properties file. sonar.sources=./source sonar.coverageReportPaths=coverage.xml +sonar.coverage.exclusions=**/*.sql,**/*.pks sonar.tests=./test sonar.testExecutionReportPaths=./test_results.xml sonar.links.issue=https://github.com/utPLSQL/utPLSQL/issues @@ -20,7 +21,7 @@ sonar.plsql.file.suffixes=sql,tab,pkb,tpb sonar.language=plsql -sonar.exclusions=create_synonyms_and_grants_for_public.sql, create_user_grants.sql, create_user_synonyms.sql, create_utplsql_owner.sql, define_ut3_owner_param.sql, install.sql, install_above_12_1.sql, install_component.sql, install_headless.sql, uninstall.sql, uninstall_all.sql, uninstall_coverage_tables.sql +sonar.exclusions=**/*.sql sonar.pullrequest.provider=github sonar.pullrequest.github.endpoint=https://api.github.com/ From 75d2053967643102bbd8a688edaf19d6b1a929e9 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 10 Jun 2019 23:21:06 +0000 Subject: [PATCH 0495/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index a6c08b142..1d8f95c0a 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 59018dafc..90491dba1 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 6c42cc288..a9ec7a1ec 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index b5860bd56..f7347b2f1 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index dd5d1fa75..25a68c06b 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index db7bb7948..ef7ae347f 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 76653a6b2..78bcd2908 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 99d49b279..f63348c1a 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 9a3b61fe2..cdeea1903 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 4afa41ae2..f91abdb92 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 49cf4cd31..525e4a8df 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index b40853f33..9c67d6b30 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index f92ee996e..8dbea743f 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index e43cfd548..a128429b8 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 0da6be7d8..0b0d4b8c5 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 3b20f5938..b2c0c2857 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index f04f068d3..1a8de7596 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3035--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index b75b2c1d7..17a4b2b25 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -773,7 +773,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.7.3035-develop + * secion v3.1.7.3038-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 10bdab4c7..b9c7a42c7 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.7.3035-develop'; + gc_version constant varchar2(50) := 'v3.1.7.3038-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 5f07682601f3754f7251e935b85add5b41a4f719 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 12 Jun 2019 02:28:28 +0100 Subject: [PATCH 0496/1096] Fixed output_buffer purging error. Resolves #934 --- source/core/coverage/ut_coverage_helper.pkb | 2 +- .../core/coverage/ut_coverage_sources_tmp.sql | 47 +----------- .../output_buffers/ut_output_buffer_base.tpb | 76 +++++++++++++++++++ .../output_buffers/ut_output_buffer_base.tps | 15 ++-- .../ut_output_buffer_info_tmp.sql | 40 +--------- .../output_buffers/ut_output_buffer_tmp.sql | 56 +------------- .../ut_output_clob_buffer_tmp.sql | 46 +---------- .../ut_output_clob_table_buffer.tpb | 61 +-------------- .../ut_output_clob_table_buffer.tps | 8 +- .../output_buffers/ut_output_table_buffer.tpb | 61 +-------------- .../output_buffers/ut_output_table_buffer.tps | 8 +- source/install.sql | 9 ++- source/uninstall_objects.sql | 34 ++++----- test/ut3_tester/core/test_output_buffer.pkb | 38 +++++++++- test/ut3_tester/core/test_output_buffer.pks | 8 ++ 15 files changed, 165 insertions(+), 344 deletions(-) create mode 100644 source/core/output_buffers/ut_output_buffer_base.tpb diff --git a/source/core/coverage/ut_coverage_helper.pkb b/source/core/coverage/ut_coverage_helper.pkb index cfa3e413c..5f9744265 100644 --- a/source/core/coverage/ut_coverage_helper.pkb +++ b/source/core/coverage/ut_coverage_helper.pkb @@ -44,7 +44,7 @@ create or replace package body ut_coverage_helper is pragma autonomous_transaction; begin null; - execute immediate 'truncate table ut_coverage_sources_tmp$'; + execute immediate 'truncate table ut_coverage_sources_tmp'; commit; end; diff --git a/source/core/coverage/ut_coverage_sources_tmp.sql b/source/core/coverage/ut_coverage_sources_tmp.sql index bcc661a22..29b53d147 100644 --- a/source/core/coverage/ut_coverage_sources_tmp.sql +++ b/source/core/coverage/ut_coverage_sources_tmp.sql @@ -1,4 +1,4 @@ -create global temporary table ut_coverage_sources_tmp$( +create global temporary table ut_coverage_sources_tmp( /* utPLSQL - Version 3 Copyright 2016 - 2018 utPLSQL Project @@ -21,46 +21,5 @@ create global temporary table ut_coverage_sources_tmp$( constraint ut_coverage_sources_tmp_pk primary key (owner,name,line) ) on commit preserve rows; -create unique index ut_coverage_sources_tmp_uk on ut_coverage_sources_tmp$ (owner,name,to_be_skipped, line); - -declare - ex_nonedition_user exception; - ex_view_doesnt_exist exception; - pragma exception_init(ex_nonedition_user,-42314); - pragma exception_init(ex_view_doesnt_exist,-942); - v_view_source varchar2(32767); -begin - begin - execute immediate 'drop view ut_coverage_sources_tmp'; - exception - when ex_view_doesnt_exist then - null; - end; - v_view_source := ' ut_coverage_sources_tmp as -/* -utPLSQL - Version 3 -Copyright 2016 - 2018 utPLSQL Project -Licensed under the Apache License, Version 2.0 (the "License"): -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ -select full_name - ,owner - ,name - ,line - ,to_be_skipped - ,text - from ut_coverage_sources_tmp$'; - - execute immediate 'create or replace editioning view '||v_view_source; -exception - when ex_nonedition_user then - execute immediate 'create or replace view '||v_view_source; -end; -/ +--is this needed? +--create unique index ut_coverage_sources_tmp_uk on ut_coverage_sources_tmp$ (owner,name,to_be_skipped, line); diff --git a/source/core/output_buffers/ut_output_buffer_base.tpb b/source/core/output_buffers/ut_output_buffer_base.tpb new file mode 100644 index 000000000..12eb08791 --- /dev/null +++ b/source/core/output_buffers/ut_output_buffer_base.tpb @@ -0,0 +1,76 @@ +create or replace type body ut_output_buffer_base is + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + member procedure init(self in out nocopy ut_output_buffer_base, a_output_id raw := null, a_self_type varchar2 := null) is + pragma autonomous_transaction; + l_exists int; + begin + cleanup_buffer(); + self.self_type := coalesce(a_self_type,self.self_type); + self.output_id := coalesce(a_output_id, self.output_id, sys_guid()); + self.start_date := coalesce(self.start_date, sysdate); + self.last_message_id := 0; + select count(*) into l_exists from ut_output_buffer_info_tmp where output_id = self.output_id; + if ( l_exists > 0 ) then + update ut_output_buffer_info_tmp set start_date = self.start_date where output_id = self.output_id; + else + insert into ut_output_buffer_info_tmp(output_id, start_date) values (self.output_id, self.start_date); + end if; + commit; + self.is_closed := 0; + end; + + member function get_lines_cursor(a_initial_timeout natural := null, a_timeout_sec natural := null) return sys_refcursor is + l_lines sys_refcursor; + begin + open l_lines for + select text, item_type + from table(self.get_lines(a_initial_timeout, a_timeout_sec)); + return l_lines; + end; + + member procedure lines_to_dbms_output(self in ut_output_buffer_base, a_initial_timeout natural := null, a_timeout_sec natural := null) is + l_data sys_refcursor; + l_clob clob; + l_item_type varchar2(32767); + l_lines ut_varchar2_list; + begin + l_data := self.get_lines_cursor(a_initial_timeout, a_timeout_sec); + loop + fetch l_data into l_clob, l_item_type; + exit when l_data%notfound; + l_lines := ut_utils.clob_to_table(l_clob); + for i in 1 .. l_lines.count loop + dbms_output.put_line(l_lines(i)); + end loop; + end loop; + close l_data; + end; + + member procedure cleanup_buffer(self in ut_output_buffer_base, a_retention_time_sec natural := null) is + gc_buffer_retention_sec constant naturaln := coalesce(a_retention_time_sec, 60 * 60 * 24); -- 24 hours + l_retention_days number := gc_buffer_retention_sec / (60 * 60 * 24); + l_max_retention_date date := sysdate - l_retention_days; + pragma autonomous_transaction; + begin + delete from ut_output_buffer_info_tmp i where i.start_date <= l_max_retention_date; + commit; + end; + +end; +/ \ No newline at end of file diff --git a/source/core/output_buffers/ut_output_buffer_base.tps b/source/core/output_buffers/ut_output_buffer_base.tps index 59226a7fb..cffdc63bc 100644 --- a/source/core/output_buffers/ut_output_buffer_base.tps +++ b/source/core/output_buffers/ut_output_buffer_base.tps @@ -1,4 +1,4 @@ -create or replace type ut_output_buffer_base authid definer as object( +create or replace type ut_output_buffer_base force authid definer as object( /* utPLSQL - Version 3 Copyright 2016 - 2018 utPLSQL Project @@ -17,13 +17,18 @@ create or replace type ut_output_buffer_base authid definer as object( */ output_id raw(32), - member procedure init(self in out nocopy ut_output_buffer_base), + is_closed number(1,0), + start_date date, + last_message_id number(38,0), + self_type varchar2(250 byte), + member procedure init(self in out nocopy ut_output_buffer_base, a_output_id raw := null, a_self_type varchar2 := null), + member function get_lines_cursor(a_initial_timeout natural := null, a_timeout_sec natural := null) return sys_refcursor, + member procedure lines_to_dbms_output(self in ut_output_buffer_base, a_initial_timeout natural := null, a_timeout_sec natural := null), + member procedure cleanup_buffer(self in ut_output_buffer_base, a_retention_time_sec natural := null), not instantiable member procedure close(self in out nocopy ut_output_buffer_base), not instantiable member procedure send_line(self in out nocopy ut_output_buffer_base, a_text varchar2, a_item_type varchar2 := null), not instantiable member procedure send_lines(self in out nocopy ut_output_buffer_base, a_text_list ut_varchar2_rows, a_item_type varchar2 := null), not instantiable member procedure send_clob(self in out nocopy ut_output_buffer_base, a_text clob, a_item_type varchar2 := null), - not instantiable member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined, - not instantiable member function get_lines_cursor(a_initial_timeout natural := null, a_timeout_sec natural := null) return sys_refcursor, - not instantiable member procedure lines_to_dbms_output(self in ut_output_buffer_base, a_initial_timeout natural := null, a_timeout_sec natural := null) + not instantiable member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined ) not final not instantiable / diff --git a/source/core/output_buffers/ut_output_buffer_info_tmp.sql b/source/core/output_buffers/ut_output_buffer_info_tmp.sql index 5880022f5..c6e8995fb 100644 --- a/source/core/output_buffers/ut_output_buffer_info_tmp.sql +++ b/source/core/output_buffers/ut_output_buffer_info_tmp.sql @@ -1,4 +1,4 @@ -create table ut_output_buffer_info_tmp$( +create table ut_output_buffer_info_tmp( /* utPLSQL - Version 3 Copyright 2016 - 2018 utPLSQL Project @@ -23,41 +23,3 @@ create table ut_output_buffer_info_tmp$( ) organization index nologging initrans 10 ; --- This is needed to be EBR ready as editioning view can only be created by edition enabled user -declare - ex_nonedition_user exception; - ex_view_doesnt_exist exception; - pragma exception_init(ex_nonedition_user,-42314); - pragma exception_init(ex_view_doesnt_exist,-942); - v_view_source varchar2(32767); -begin - begin - execute immediate 'drop view ut_output_buffer_info_tmp'; - exception - when ex_view_doesnt_exist then - null; - end; - v_view_source := ' ut_output_buffer_info_tmp as -/* -utPLSQL - Version 3 -Copyright 2016 - 2018 utPLSQL Project -Licensed under the Apache License, Version 2.0 (the "License"): -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ -select output_id - ,start_date - from ut_output_buffer_info_tmp$'; - - execute immediate 'create or replace editioning view '||v_view_source; -exception - when ex_nonedition_user then - execute immediate 'create or replace view '||v_view_source; -end; -/ diff --git a/source/core/output_buffers/ut_output_buffer_tmp.sql b/source/core/output_buffers/ut_output_buffer_tmp.sql index e78a71c15..7ae024555 100644 --- a/source/core/output_buffers/ut_output_buffer_tmp.sql +++ b/source/core/output_buffers/ut_output_buffer_tmp.sql @@ -1,9 +1,4 @@ -declare - v_table_sql varchar2(32767); - e_non_assm exception; - pragma exception_init(e_non_assm, -43853); -begin - v_table_sql := 'create table ut_output_buffer_tmp$( +create table ut_output_buffer_tmp( /* utPLSQL - Version 3 Copyright 2016 - 2018 utPLSQL Project @@ -31,52 +26,7 @@ begin constraint ut_output_buffer_tmp_ck check( is_finished = 0 and (text is not null or item_type is not null ) or is_finished = 1 and text is null and item_type is null ), - constraint ut_output_buffer_fk1 foreign key (output_id) references ut_output_buffer_info_tmp$(output_id) + constraint ut_output_buffer_fk foreign key (output_id) references ut_output_buffer_info_tmp(output_id) on delete cascade ) organization index nologging initrans 100 - overflow nologging initrans 100 -'; - execute immediate v_table_sql; -end; -/ + overflow nologging initrans 100; --- This is needed to be EBR ready as editioning view can only be created by edition enabled user -declare - ex_nonedition_user exception; - ex_view_doesnt_exist exception; - pragma exception_init(ex_nonedition_user,-42314); - pragma exception_init(ex_view_doesnt_exist,-942); - v_view_source varchar2(32767); -begin - begin - execute immediate 'drop view ut_output_buffer_tmp'; - exception - when ex_view_doesnt_exist then - null; - end; - v_view_source := ' ut_output_buffer_tmp as -/* -utPLSQL - Version 3 -Copyright 2016 - 2018 utPLSQL Project -Licensed under the Apache License, Version 2.0 (the "License"): -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ -select output_id - ,message_id - ,text - ,item_type - ,is_finished - from ut_output_buffer_tmp$'; - - execute immediate 'create or replace editioning view '||v_view_source; -exception - when ex_nonedition_user then - execute immediate 'create or replace view '||v_view_source; -end; -/ diff --git a/source/core/output_buffers/ut_output_clob_buffer_tmp.sql b/source/core/output_buffers/ut_output_clob_buffer_tmp.sql index 57be1c6f4..0f56a837e 100644 --- a/source/core/output_buffers/ut_output_clob_buffer_tmp.sql +++ b/source/core/output_buffers/ut_output_clob_buffer_tmp.sql @@ -3,7 +3,7 @@ declare e_non_assm exception; pragma exception_init(e_non_assm, -43853); begin - v_table_sql := 'create table ut_output_clob_buffer_tmp$( + v_table_sql := 'create table ut_output_clob_buffer_tmp( /* utPLSQL - Version 3 Copyright 2016 - 2018 utPLSQL Project @@ -31,7 +31,7 @@ begin constraint ut_output_clob_buffer_tmp_ck check( is_finished = 0 and (text is not null or item_type is not null ) or is_finished = 1 and text is null and item_type is null ), - constraint ut_output_clob_buffer_tmp_fk1 foreign key (output_id) references ut_output_buffer_info_tmp$(output_id) + constraint ut_output_clob_buffer_tmp_fk foreign key (output_id) references ut_output_buffer_info_tmp(output_id) on delete cascade ) nologging initrans 100 '; begin @@ -45,45 +45,3 @@ begin end; end; / - --- This is needed to be EBR ready as editioning view can only be created by edition enabled user -declare - ex_nonedition_user exception; - ex_view_doesnt_exist exception; - pragma exception_init(ex_nonedition_user,-42314); - pragma exception_init(ex_view_doesnt_exist,-942); - v_view_source varchar2(32767); -begin - begin - execute immediate 'drop view ut_output_clob_buffer_tmp'; - exception - when ex_view_doesnt_exist then - null; - end; - v_view_source := ' ut_output_clob_buffer_tmp as -/* -utPLSQL - Version 3 -Copyright 2016 - 2018 utPLSQL Project -Licensed under the Apache License, Version 2.0 (the "License"): -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ -select output_id - ,message_id - ,text - ,item_type - ,is_finished - from ut_output_clob_buffer_tmp$'; - - execute immediate 'create or replace editioning view '||v_view_source; -exception - when ex_nonedition_user then - execute immediate 'create or replace view '||v_view_source; -end; -/ diff --git a/source/core/output_buffers/ut_output_clob_table_buffer.tpb b/source/core/output_buffers/ut_output_clob_table_buffer.tpb index 56873a418..a8d979946 100644 --- a/source/core/output_buffers/ut_output_clob_table_buffer.tpb +++ b/source/core/output_buffers/ut_output_clob_table_buffer.tpb @@ -18,27 +18,10 @@ create or replace type body ut_output_clob_table_buffer is constructor function ut_output_clob_table_buffer(self in out nocopy ut_output_clob_table_buffer, a_output_id raw := null) return self as result is begin - self.output_id := coalesce(a_output_id, sys_guid()); - self.start_date := sysdate; - self.last_message_id := 0; - self.init(); - self.cleanup_buffer(); + self.init(a_output_id, $$plsql_unit); return; end; - overriding member procedure init(self in out nocopy ut_output_clob_table_buffer) is - pragma autonomous_transaction; - l_exists int; - begin - select count(*) into l_exists from ut_output_buffer_info_tmp where output_id = self.output_id; - if ( l_exists > 0 ) then - update ut_output_buffer_info_tmp set start_date = self.start_date where output_id = self.output_id; - else - insert into ut_output_buffer_info_tmp(output_id, start_date) values (self.output_id, self.start_date); - end if; - commit; - end; - overriding member procedure close(self in out nocopy ut_output_clob_table_buffer) is pragma autonomous_transaction; begin @@ -46,6 +29,7 @@ create or replace type body ut_output_clob_table_buffer is insert into ut_output_clob_buffer_tmp(output_id, message_id, is_finished) values (self.output_id, self.last_message_id, 1); commit; + self.is_closed := 1; end; overriding member procedure send_line(self in out nocopy ut_output_clob_table_buffer, a_text varchar2, a_item_type varchar2 := null) is @@ -169,46 +153,5 @@ create or replace type body ut_output_clob_table_buffer is return; end; - overriding member function get_lines_cursor(a_initial_timeout natural := null, a_timeout_sec natural := null) return sys_refcursor is - l_lines sys_refcursor; - begin - open l_lines for - select text, item_type - from table(self.get_lines(a_initial_timeout, a_timeout_sec)); - return l_lines; - end; - - overriding member procedure lines_to_dbms_output(self in ut_output_clob_table_buffer, a_initial_timeout natural := null, a_timeout_sec natural := null) is - l_data sys_refcursor; - l_clob clob; - l_item_type varchar2(32767); - l_lines ut_varchar2_list; - begin - l_data := self.get_lines_cursor(a_initial_timeout, a_timeout_sec); - loop - fetch l_data into l_clob, l_item_type; - exit when l_data%notfound; - l_lines := ut_utils.clob_to_table(l_clob); - for i in 1 .. l_lines.count loop - dbms_output.put_line(l_lines(i)); - end loop; - end loop; - close l_data; - end; - - member procedure cleanup_buffer(self in ut_output_clob_table_buffer, a_retention_time_sec natural := null) is - gc_buffer_retention_sec constant naturaln := coalesce(a_retention_time_sec, 60 * 60 * 24); -- 24 hours - l_retention_days number := gc_buffer_retention_sec / (60 * 60 * 24); - l_max_retention_date date := sysdate - l_retention_days; - pragma autonomous_transaction; - begin - delete from ut_output_clob_buffer_tmp t - where t.output_id - in (select i.output_id from ut_output_buffer_info_tmp i where i.start_date <= l_max_retention_date); - - delete from ut_output_buffer_info_tmp i where i.start_date <= l_max_retention_date; - commit; - end; - end; / diff --git a/source/core/output_buffers/ut_output_clob_table_buffer.tps b/source/core/output_buffers/ut_output_clob_table_buffer.tps index 83e342106..ac9a502cd 100644 --- a/source/core/output_buffers/ut_output_clob_table_buffer.tps +++ b/source/core/output_buffers/ut_output_clob_table_buffer.tps @@ -16,17 +16,11 @@ create or replace type ut_output_clob_table_buffer under ut_output_buffer_base ( limitations under the License. */ - start_date date, - last_message_id number(38,0), constructor function ut_output_clob_table_buffer(self in out nocopy ut_output_clob_table_buffer, a_output_id raw := null) return self as result, - overriding member procedure init(self in out nocopy ut_output_clob_table_buffer), overriding member procedure send_line(self in out nocopy ut_output_clob_table_buffer, a_text varchar2, a_item_type varchar2 := null), overriding member procedure send_lines(self in out nocopy ut_output_clob_table_buffer, a_text_list ut_varchar2_rows, a_item_type varchar2 := null), overriding member procedure send_clob(self in out nocopy ut_output_clob_table_buffer, a_text clob, a_item_type varchar2 := null), overriding member procedure close(self in out nocopy ut_output_clob_table_buffer), - overriding member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined, - overriding member function get_lines_cursor(a_initial_timeout natural := null, a_timeout_sec natural := null) return sys_refcursor, - overriding member procedure lines_to_dbms_output(self in ut_output_clob_table_buffer, a_initial_timeout natural := null, a_timeout_sec natural := null), - member procedure cleanup_buffer(self in ut_output_clob_table_buffer, a_retention_time_sec natural := null) + overriding member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined ) not final / diff --git a/source/core/output_buffers/ut_output_table_buffer.tpb b/source/core/output_buffers/ut_output_table_buffer.tpb index afcbcbc95..44e91cc38 100644 --- a/source/core/output_buffers/ut_output_table_buffer.tpb +++ b/source/core/output_buffers/ut_output_table_buffer.tpb @@ -18,27 +18,10 @@ create or replace type body ut_output_table_buffer is constructor function ut_output_table_buffer(self in out nocopy ut_output_table_buffer, a_output_id raw := null) return self as result is begin - self.output_id := coalesce(a_output_id, sys_guid()); - self.start_date := sysdate; - self.last_message_id := 0; - self.init(); - self.cleanup_buffer(); + self.init(a_output_id, $$plsql_unit); return; end; - overriding member procedure init(self in out nocopy ut_output_table_buffer) is - pragma autonomous_transaction; - l_exists int; - begin - select count(*) into l_exists from ut_output_buffer_info_tmp where output_id = self.output_id; - if ( l_exists > 0 ) then - update ut_output_buffer_info_tmp set start_date = self.start_date where output_id = self.output_id; - else - insert into ut_output_buffer_info_tmp(output_id, start_date) values (self.output_id, self.start_date); - end if; - commit; - end; - overriding member procedure close(self in out nocopy ut_output_table_buffer) is pragma autonomous_transaction; begin @@ -46,6 +29,7 @@ create or replace type body ut_output_table_buffer is insert into ut_output_buffer_tmp(output_id, message_id, is_finished) values (self.output_id, self.last_message_id, 1); commit; + self.is_closed := 1; end; overriding member procedure send_line(self in out nocopy ut_output_table_buffer, a_text varchar2, a_item_type varchar2 := null) is @@ -187,46 +171,5 @@ create or replace type body ut_output_table_buffer is return; end; - overriding member function get_lines_cursor(a_initial_timeout natural := null, a_timeout_sec natural := null) return sys_refcursor is - l_lines sys_refcursor; - begin - open l_lines for - select text, item_type - from table(self.get_lines(a_initial_timeout, a_timeout_sec)); - return l_lines; - end; - - overriding member procedure lines_to_dbms_output(self in ut_output_table_buffer, a_initial_timeout natural := null, a_timeout_sec natural := null) is - l_data sys_refcursor; - l_clob clob; - l_item_type varchar2(32767); - l_lines ut_varchar2_list; - begin - l_data := self.get_lines_cursor(a_initial_timeout, a_timeout_sec); - loop - fetch l_data into l_clob, l_item_type; - exit when l_data%notfound; - l_lines := ut_utils.clob_to_table(l_clob); - for i in 1 .. l_lines.count loop - dbms_output.put_line(l_lines(i)); - end loop; - end loop; - close l_data; - end; - - member procedure cleanup_buffer(self in ut_output_table_buffer, a_retention_time_sec natural := null) is - gc_buffer_retention_sec constant naturaln := coalesce(a_retention_time_sec, 60 * 60 * 24); -- 24 hours - l_retention_days number := gc_buffer_retention_sec / (60 * 60 * 24); - l_max_retention_date date := sysdate - l_retention_days; - pragma autonomous_transaction; - begin - delete from ut_output_buffer_tmp t - where t.output_id - in (select i.output_id from ut_output_buffer_info_tmp i where i.start_date <= l_max_retention_date); - - delete from ut_output_buffer_info_tmp i where i.start_date <= l_max_retention_date; - commit; - end; - end; / diff --git a/source/core/output_buffers/ut_output_table_buffer.tps b/source/core/output_buffers/ut_output_table_buffer.tps index 9cf64927c..77a057b78 100644 --- a/source/core/output_buffers/ut_output_table_buffer.tps +++ b/source/core/output_buffers/ut_output_table_buffer.tps @@ -16,17 +16,11 @@ create or replace type ut_output_table_buffer under ut_output_buffer_base ( limitations under the License. */ - start_date date, - last_message_id number(38,0), constructor function ut_output_table_buffer(self in out nocopy ut_output_table_buffer, a_output_id raw := null) return self as result, - overriding member procedure init(self in out nocopy ut_output_table_buffer), overriding member procedure send_line(self in out nocopy ut_output_table_buffer, a_text varchar2, a_item_type varchar2 := null), overriding member procedure send_lines(self in out nocopy ut_output_table_buffer, a_text_list ut_varchar2_rows, a_item_type varchar2 := null), overriding member procedure send_clob(self in out nocopy ut_output_table_buffer, a_text clob, a_item_type varchar2 := null), overriding member procedure close(self in out nocopy ut_output_table_buffer), - overriding member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined, - overriding member function get_lines_cursor(a_initial_timeout natural := null, a_timeout_sec natural := null) return sys_refcursor, - overriding member procedure lines_to_dbms_output(self in ut_output_table_buffer, a_initial_timeout natural := null, a_timeout_sec natural := null), - member procedure cleanup_buffer(self in ut_output_table_buffer, a_retention_time_sec natural := null) + overriding member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined ) not final / diff --git a/source/install.sql b/source/install.sql index 145357052..e6ccf7d28 100644 --- a/source/install.sql +++ b/source/install.sql @@ -92,14 +92,15 @@ alter session set current_schema = &&ut3_owner; @@install_component.sql 'expectations/data_values/ut_key_anyvalues.tps' ---output buffer base api -@@install_component.sql 'core/output_buffers/ut_output_data_row.tps' -@@install_component.sql 'core/output_buffers/ut_output_data_rows.tps' -@@install_component.sql 'core/output_buffers/ut_output_buffer_base.tps' --output buffer table @@install_component.sql 'core/output_buffers/ut_output_buffer_info_tmp.sql' @@install_component.sql 'core/output_buffers/ut_output_buffer_tmp.sql' @@install_component.sql 'core/output_buffers/ut_output_clob_buffer_tmp.sql' +--output buffer base api +@@install_component.sql 'core/output_buffers/ut_output_data_row.tps' +@@install_component.sql 'core/output_buffers/ut_output_data_rows.tps' +@@install_component.sql 'core/output_buffers/ut_output_buffer_base.tps' +@@install_component.sql 'core/output_buffers/ut_output_buffer_base.tpb' --output buffer table api @@install_component.sql 'core/output_buffers/ut_output_table_buffer.tps' @@install_component.sql 'core/output_buffers/ut_output_table_buffer.tpb' diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index b109efd89..f34b964de 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -52,9 +52,7 @@ drop package ut_coverage; drop package ut_coverage_helper; -drop view ut_coverage_sources_tmp; - -drop table ut_coverage_sources_tmp$; +drop table ut_coverage_sources_tmp purge; drop package ut_teamcity_reporter_helper; @@ -70,17 +68,17 @@ drop package ut_suite_builder; drop package ut_suite_cache_manager; -drop table ut_suite_cache; +drop table ut_suite_cache purge; drop sequence ut_suite_cache_seq; -drop table ut_suite_cache_package; +drop table ut_suite_cache_package purge; -drop table ut_suite_cache_schema; +drop table ut_suite_cache_schema purge; drop package ut; -drop table ut_dbms_output_cache; +drop table ut_dbms_output_cache purge; drop type ut_expectation_compound force; @@ -160,9 +158,9 @@ drop type ut_cursor_column_tab force; drop type ut_cursor_column force; -drop table ut_compound_data_tmp; +drop table ut_compound_data_tmp purge; -drop table ut_compound_data_diff_tmp; +drop table ut_compound_data_diff_tmp purge; drop trigger ut_trigger_annotation_parsing; @@ -172,11 +170,11 @@ drop package ut_annotation_parser; drop package ut_annotation_cache_manager; -drop table ut_annotation_cache cascade constraints; +drop table ut_annotation_cache cascade constraints purge; -drop table ut_annotation_cache_info cascade constraints; +drop table ut_annotation_cache_info cascade constraints purge; -drop table ut_annotation_cache_schema cascade constraints; +drop table ut_annotation_cache_schema cascade constraints purge; drop sequence ut_annotation_cache_seq; @@ -260,17 +258,11 @@ drop type ut_output_clob_table_buffer force; drop type ut_output_buffer_base force; -drop view ut_output_buffer_tmp; - -drop table ut_output_buffer_tmp$ purge; - -drop view ut_output_clob_buffer_tmp; - -drop table ut_output_clob_buffer_tmp$ purge; +drop table ut_output_buffer_tmp purge; -drop view ut_output_buffer_info_tmp; +drop table ut_output_clob_buffer_tmp purge; -drop table ut_output_buffer_info_tmp$; +drop table ut_output_buffer_info_tmp purge; drop type ut_output_data_rows force; diff --git a/test/ut3_tester/core/test_output_buffer.pkb b/test/ut3_tester/core/test_output_buffer.pkb index 40af7e0b0..7aab6f389 100644 --- a/test/ut3_tester/core/test_output_buffer.pkb +++ b/test/ut3_tester/core/test_output_buffer.pkb @@ -109,6 +109,42 @@ create or replace package body test_output_buffer is ut.expect(l_remaining).to_equal(0); end; - + + procedure test_purge(a_buffer ut3.ut_output_buffer_base ) is + l_stale_buffer ut3.ut_output_buffer_base := a_buffer; + l_fresh_buffer ut3.ut_output_buffer_base; + l_buffer ut3.ut_output_buffer_base; + begin + --Arrange + l_stale_buffer.start_date := sysdate - 2; + --initialize with new start date + l_stale_buffer.init(); + l_stale_buffer.send_line('some text'); + l_stale_buffer.close(); + + l_fresh_buffer := ut3.ut_output_table_buffer(); + l_fresh_buffer.send_line('some text'); + l_fresh_buffer.close(); + + --Act - purge is performed on new buffer create + l_buffer := ut3.ut_output_table_buffer(); + + --Assert + -- Data in "fresh" buffer remains + ut.expect( l_fresh_buffer.get_lines_cursor(0,0), l_buffer.self_type ).to_have_count(1); + -- Data in "slate" buffer is purged and so the call to get_lines_cursor throws ORA-20218 + ut.expect( l_stale_buffer.get_lines_cursor(0,0), l_buffer.self_type ).to_be_empty(); + end; + + procedure test_purge_text_buffer is + begin + test_purge(ut3.ut_output_table_buffer()); + end; + + procedure test_purge_clob_buffer is + begin + test_purge(ut3.ut_output_clob_table_buffer()); + end; + end test_output_buffer; / diff --git a/test/ut3_tester/core/test_output_buffer.pks b/test/ut3_tester/core/test_output_buffer.pks index 8f4d5873d..24c2c01eb 100644 --- a/test/ut3_tester/core/test_output_buffer.pks +++ b/test/ut3_tester/core/test_output_buffer.pks @@ -18,5 +18,13 @@ create or replace package test_output_buffer is --%test(Waits For The Data To Appear For Specified Time) procedure test_waiting_for_data; + --%test(Purges text buffer data older than one day and leaves the rest) + --%throws(-20218) + procedure test_purge_text_buffer; + + --%test(Purges clob buffer data older than one day and leaves the rest) + --%throws(-20218) + procedure test_purge_clob_buffer; + end test_output_buffer; / From 910f29c9bce00238a6569d82a654bb6b8b67dcad Mon Sep 17 00:00:00 2001 From: Travis CI Date: Wed, 12 Jun 2019 09:25:09 +0000 Subject: [PATCH 0497/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 1d8f95c0a..170c4e62d 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 90491dba1..0c2309521 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index a9ec7a1ec..5d9308310 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index f7347b2f1..00f28566c 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 25a68c06b..3362da169 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index ef7ae347f..a922e9520 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 78bcd2908..b07e349e8 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index f63348c1a..189dcc704 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index cdeea1903..04d56d6a2 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index f91abdb92..5e658cbec 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 525e4a8df..26ecd67f2 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 9c67d6b30..b238c69f5 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 8dbea743f..ea5218db7 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index a128429b8..962dbfdd8 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 0b0d4b8c5..cd35cf12e 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index b2c0c2857..5a2a211e6 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 1a8de7596..a25f54d33 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3038--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 17a4b2b25..0dc2cc657 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -773,7 +773,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.7.3038-develop + * secion v3.1.7.3041-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index b9c7a42c7..e25c40dee 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.7.3038-develop'; + gc_version constant varchar2(50) := 'v3.1.7.3041-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From dc78df39eb1111261337372e235e2519d223bec6 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Wed, 12 Jun 2019 16:02:13 +0200 Subject: [PATCH 0498/1096] add test cases for warning texts in tests, suites --- test/ut3_user/reporters/test_realtime_reporter.pks | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/ut3_user/reporters/test_realtime_reporter.pks b/test/ut3_user/reporters/test_realtime_reporter.pks index 04cd288e1..e57ccab21 100644 --- a/test/ut3_user/reporters/test_realtime_reporter.pks +++ b/test/ut3_user/reporters/test_realtime_reporter.pks @@ -44,7 +44,13 @@ create or replace package test_realtime_reporter as --%test(Provide the error stack of a testsuite) procedure error_stack_of_testsuite; - + + --%test(Provide warnings of a test) + procedure warnings_of_test; + + --%test(Provide warnings of a testsuite) + procedure warnings_of_testsuite; + --%test(Provide a description of the reporter explaining the use for SQL Developer) procedure get_description; From 6dd53a96e3d4c0c093c29fe150415fc2272037a8 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Wed, 12 Jun 2019 16:05:34 +0200 Subject: [PATCH 0499/1096] implement new test cases and adapt existing ones Structure of test cases is affected since new PL/SQL package is created which is also used in the whole run. --- .../reporters/test_realtime_reporter.pkb | 69 +++++++++++++++++-- 1 file changed, 64 insertions(+), 5 deletions(-) diff --git a/test/ut3_user/reporters/test_realtime_reporter.pkb b/test/ut3_user/reporters/test_realtime_reporter.pkb index 8387fa4bd..659afce13 100644 --- a/test/ut3_user/reporters/test_realtime_reporter.pkb +++ b/test/ut3_user/reporters/test_realtime_reporter.pkb @@ -99,6 +99,23 @@ create or replace package body test_realtime_reporter as raise no_data_found; end; end;]'; + + execute immediate q'[create or replace package check_realtime_reporting4 is + --%suite + --%suitepath(realtime_reporting) + /* tag annotation without parameter will raise a warning */ + --%tags + + --%test + procedure test_8_with_warning; + end;]'; + execute immediate q'[create or replace package body check_realtime_reporting4 is + procedure test_8_with_warning is + begin + commit; -- this will raise a warning + ut3.ut.expect(8).to_equal(8); + end; + end;]'; <> declare @@ -128,6 +145,10 @@ create or replace package body test_realtime_reporter as open l_expected for select 'pre-run' as event_type, null as item_id from dual union all select 'pre-suite' as event_type, 'realtime_reporting' as item_id from dual union all + select 'pre-suite' as event_type, 'realtime_reporting.check_realtime_reporting4' as item_id from dual union all + select 'pre-test' as event_type, 'realtime_reporting.check_realtime_reporting4.test_8_with_warning' as item_id from dual union all + select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting4.test_8_with_warning' as item_id from dual union all + select 'post-suite' as event_type, 'realtime_reporting.check_realtime_reporting4' as item_id from dual union all select 'pre-suite' as event_type, 'realtime_reporting.check_realtime_reporting3' as item_id from dual union all select 'pre-test' as event_type, 'realtime_reporting.check_realtime_reporting3.test_6_with_runtime_error' as item_id from dual union all select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting3.test_6_with_runtime_error' as item_id from dual union all @@ -179,6 +200,9 @@ create or replace package body test_realtime_reporter as select 'event/items/suite/items/suite' as node_path from dual union all select 'event/items/suite/items/suite/items' as node_path from dual union all select 'event/items/suite/items/suite/items/test' as node_path from dual union all + select 'event/items/suite/items/suite' as node_path from dual union all + select 'event/items/suite/items/suite/items' as node_path from dual union all + select 'event/items/suite/items/suite/items/test' as node_path from dual union all select 'event/items/suite/items/suite/items/test' as node_path from dual union all select 'event/items/suite/items/suite' as node_path from dual union all select 'event/items/suite/items/suite/items' as node_path from dual union all @@ -196,7 +220,7 @@ create or replace package body test_realtime_reporter as procedure total_number_of_tests is l_actual integer; - l_expected integer := 7; + l_expected integer := 8; begin select t.event_doc.extract('/event/totalNumberOfTests/text()').getnumberval() into l_actual @@ -242,9 +266,9 @@ create or replace package body test_realtime_reporter as and t.event_doc.extract('//test/@id').getstringval() is not null; open l_expected for select level as test_number, - 7 as total_number_of_tests + 8 as total_number_of_tests from dual - connect by level <= 7; + connect by level <= 8; ut.expect(l_actual).to_equal(l_expected).unordered; end pre_test_nodes; @@ -270,9 +294,9 @@ create or replace package body test_realtime_reporter as and t.event_doc.extract('//test/counter/warning/text()').getnumberval() is not null; open l_expected for select level as test_number, - 7 as total_number_of_tests + 8 as total_number_of_tests from dual - connect by level <= 7; + connect by level <= 8; ut.expect(l_actual).to_equal(l_expected).unordered; end post_test_nodes; @@ -379,6 +403,41 @@ create or replace package body test_realtime_reporter as ut.expect(l_actual).to_be_like(l_expected); end error_stack_of_testsuite; + procedure warnings_of_test is + l_actual clob; + l_expected_list ut3.ut_varchar2_list; + l_expected clob; + begin + select t.event_doc.extract('//event/test/warnings/text()').getstringval() + into l_actual + from table(g_events) t + where t.event_doc.extract('/event[@type="post-test"]/test/@id').getstringval() + = 'realtime_reporting.check_realtime_reporting4.test_8_with_warning'; + ut3_tester_helper.main_helper.append_to_list(l_expected_list, ''); + l_expected := ut3_tester_helper.main_helper.table_to_clob(l_expected_list); + ut.expect(l_actual).to_be_like(l_expected); + end warnings_of_test; + + procedure warnings_of_testsuite is + l_actual clob; + l_expected_list ut3.ut_varchar2_list; + l_expected clob; + begin + select t.event_doc.extract('//event/suite/warnings/text()').getstringval() + into l_actual + from table(g_events) t + where t.event_doc.extract('/event[@type="post-suite"]/suite/@id').getstringval() + = 'realtime_reporting.check_realtime_reporting4'; + ut3_tester_helper.main_helper.append_to_list(l_expected_list, ''); + l_expected := ut3_tester_helper.main_helper.table_to_clob(l_expected_list); + ut.expect(l_actual).to_be_like(l_expected); + end warnings_of_testsuite; + procedure get_description is l_reporter ut3.ut_realtime_reporter; l_actual varchar2(4000); From 8aee0b0ab77c6582078ef11369c4ca54ae0d0c19 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Wed, 12 Jun 2019 16:06:04 +0200 Subject: [PATCH 0500/1096] emit warning texts on test and suite level --- source/reporters/ut_realtime_reporter.tpb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/reporters/ut_realtime_reporter.tpb b/source/reporters/ut_realtime_reporter.tpb index 7c674cc7d..493dbe513 100644 --- a/source/reporters/ut_realtime_reporter.tpb +++ b/source/reporters/ut_realtime_reporter.tpb @@ -141,6 +141,7 @@ create or replace type body ut_realtime_reporter is self.print_end_node('counter'); self.print_cdata_node('errorStack', ut_utils.table_to_clob(a_suite.get_error_stack_traces())); self.print_cdata_node('serverOutput', a_suite.get_serveroutputs()); + self.print_cdata_node('warnings', ut_utils.table_to_clob(a_suite.warnings)); self.print_end_node('suite'); self.print_end_node('event'); self.flush_print_buffer('post-suite'); @@ -196,6 +197,7 @@ create or replace type body ut_realtime_reporter is end loop expectations; self.print_end_node('failedExpectations'); end if; + self.print_cdata_node('warnings', ut_utils.table_to_clob(a_test.warnings)); self.print_end_node('test'); self.print_end_node('event'); self.flush_print_buffer('post-test'); From 0be72e48dccc1d5ff94afc88ba0fea9ec0253fe5 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Wed, 12 Jun 2019 16:24:07 +0200 Subject: [PATCH 0501/1096] complete cleanup after run --- test/ut3_user/reporters/test_realtime_reporter.pkb | 1 + 1 file changed, 1 insertion(+) diff --git a/test/ut3_user/reporters/test_realtime_reporter.pkb b/test/ut3_user/reporters/test_realtime_reporter.pkb index 659afce13..28724facf 100644 --- a/test/ut3_user/reporters/test_realtime_reporter.pkb +++ b/test/ut3_user/reporters/test_realtime_reporter.pkb @@ -454,6 +454,7 @@ create or replace package body test_realtime_reporter as execute immediate 'drop package check_realtime_reporting1'; execute immediate 'drop package check_realtime_reporting2'; execute immediate 'drop package check_realtime_reporting3'; + execute immediate 'drop package check_realtime_reporting4'; end remove_test_suites; end test_realtime_reporter; From c6c3af573e5ff01ea7c9804389a0732570703e48 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Thu, 13 Jun 2019 08:03:20 +0000 Subject: [PATCH 0502/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 170c4e62d..5bd515ed4 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 0c2309521..cb71fd4c9 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 5d9308310..aaf801028 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 00f28566c..fcb71d47b 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 3362da169..5995bd8a0 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index a922e9520..4a6ad6bce 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index b07e349e8..da59f8890 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 189dcc704..c45165428 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 04d56d6a2..f446e86d5 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 5e658cbec..a59828be9 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 26ecd67f2..fac7c7c80 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index b238c69f5..23b5925d3 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index ea5218db7..30e8b847f 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 962dbfdd8..8813cab2e 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index cd35cf12e..56375da73 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 5a2a211e6..eef920780 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index a25f54d33..f363ddc80 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 0dc2cc657..3b6a09ddf 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -773,7 +773,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.7.3041-develop + * secion v3.1.7.3051-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index e25c40dee..41090accc 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.7.3041-develop'; + gc_version constant varchar2(50) := 'v3.1.7.3051-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 85942e987da4222c6e51f80069cf8ed47aeb6e4b Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 15 Jun 2019 17:33:16 +0100 Subject: [PATCH 0503/1096] Removed dependency on `dbms_utility.name_resolve`. Fixed issue with utPLSQL failing to run when schema contains package named the same as schema owning it. It is now possible to have utPLSQL test package like this: ``` create or replace package some_schema.some_schema as --%suite --%test procedure sample_test; end; / create or replace package body some_schema.some_schema as procedure sample_test is begin ut.expect(1).to_equal(1); end; end; / ``` The tests from the package can be invoked by calling: `exec ut.run('some_schema.some_schema');` If only schema is provided, all test packages in schema are executed. `exec ut.run('some_schema');` Resolves #569 Resolves #885 --- source/core/types/ut_executable.tpb | 15 ++-- source/core/types/ut_executable.tps | 2 +- source/core/ut_metadata.pkb | 74 +++++-------------- source/core/ut_metadata.pks | 12 --- .../test_before_after_annotations.pkb | 3 +- test/ut3_user/api/test_ut_run.pkb | 38 +++++++++- test/ut3_user/api/test_ut_run.pks | 11 +++ 7 files changed, 76 insertions(+), 79 deletions(-) diff --git a/source/core/types/ut_executable.tpb b/source/core/types/ut_executable.tpb index b41e75388..2fc1e3a7e 100644 --- a/source/core/types/ut_executable.tpb +++ b/source/core/types/ut_executable.tpb @@ -29,9 +29,13 @@ create or replace type body ut_executable is return; end; - member function form_name return varchar2 is + member function form_name(a_skip_current_user_schema boolean := false) return varchar2 is + l_owner_name varchar2(250) := owner_name; begin - return ut_metadata.form_name(owner_name, object_name, procedure_name); + if a_skip_current_user_schema and sys_context('userenv', 'current_schema') = owner_name then + l_owner_name := null; + end if; + return ut_metadata.form_name(l_owner_name, object_name, procedure_name); end; member procedure do_execute(self in out nocopy ut_executable, a_item in out nocopy ut_suite_item) is @@ -71,10 +75,9 @@ create or replace type body ut_executable is begin if not ut_metadata.package_valid(self.owner_name, self.object_name) then - self.error_stack := l_message_part || 'package does not exist or is invalid: ' ||upper(self.owner_name||'.'||self.object_name); + self.error_stack := l_message_part || 'package '||upper(self.owner_name||'.'||self.object_name)||' does not exist or is invalid.'; elsif not ut_metadata.procedure_exists(self.owner_name, self.object_name, self.procedure_name) then - self.error_stack := l_message_part || 'procedure does not exist ' - || upper(self.owner_name || '.' || self.object_name || '.' ||self.procedure_name); + self.error_stack := l_message_part || 'procedure '||upper(self.owner_name || '.' || self.object_name || '.' ||self.procedure_name)||' does not exist.'; else l_result := false; end if; @@ -115,7 +118,7 @@ create or replace type body ut_executable is ' l_error_backtrace varchar2(32767);' || chr(10) || 'begin' || chr(10) || ' begin' || chr(10) || - ' ' || self.form_name() || ';' || chr(10) || + ' ' || self.form_name( a_skip_current_user_schema => true ) || ';' || chr(10) || ' exception' || chr(10) || ' when others then ' || chr(10) || ' l_error_stack := dbms_utility.format_error_stack;' || chr(10) || diff --git a/source/core/types/ut_executable.tps b/source/core/types/ut_executable.tps index 8186e4bae..9154881f2 100644 --- a/source/core/types/ut_executable.tps +++ b/source/core/types/ut_executable.tps @@ -30,7 +30,7 @@ create or replace type ut_executable under ut_event_item( */ seq_no integer, constructor function ut_executable( self in out nocopy ut_executable, a_owner varchar2, a_package varchar2, a_procedure_name varchar2, a_executable_type varchar2) return self as result, - member function form_name return varchar2, + member function form_name(a_skip_current_user_schema boolean := false) return varchar2, member procedure do_execute(self in out nocopy ut_executable, a_item in out nocopy ut_suite_item), /** * executes the defines executable diff --git a/source/core/ut_metadata.pkb b/source/core/ut_metadata.pkb index 43a57afa9..30262533a 100644 --- a/source/core/ut_metadata.pkb +++ b/source/core/ut_metadata.pkb @@ -21,31 +21,6 @@ create or replace package body ut_metadata as g_cached_object varchar2(500); ------------------------------ --public definitions - - procedure do_resolve(a_owner in out nocopy varchar2, a_object in out nocopy varchar2, a_procedure_name in out nocopy varchar2) is - l_name varchar2(200); - l_context integer := 1; --plsql - begin - l_name := form_name(a_owner, a_object, a_procedure_name); - do_resolve(l_name,l_context,a_owner,a_object, a_procedure_name); - end do_resolve; - - procedure do_resolve(a_fully_qualified_name in varchar2,a_context in integer,a_owner out nocopy varchar2, a_object out nocopy varchar2, - a_procedure_name out nocopy varchar2) is - l_dblink varchar2(200); - l_part1_type number; - l_object_number number; - begin - dbms_utility.name_resolve(name => a_fully_qualified_name - ,context => a_context - ,schema => a_owner - ,part1 => a_object - ,part2 => a_procedure_name - ,dblink => l_dblink - ,part1_type => l_part1_type - ,object_number => l_object_number); - end; - function form_name(a_owner_name varchar2, a_object varchar2, a_subprogram varchar2 default null) return varchar2 is l_name varchar2(200); begin @@ -61,25 +36,16 @@ create or replace package body ut_metadata as function package_valid(a_owner_name varchar2, a_package_name in varchar2) return boolean as l_cnt number; - l_schema varchar2(200); - l_package_name varchar2(200); - l_procedure_name varchar2(200); l_view_name varchar2(200) := get_objects_view_name; begin - l_schema := a_owner_name; - l_package_name := a_package_name; - - do_resolve(l_schema, l_package_name, l_procedure_name); - - execute immediate q'[select count(decode(status, 'VALID', 1, null)) / count(*) + execute immediate q'[select count(*) from ]'||l_view_name||q'[ - where owner = :l_schema - and object_name = :l_package_name - and object_type in ('PACKAGE')]' - into l_cnt using l_schema, l_package_name; - - -- expect both package and body to be valid + where owner = :a_owner_name + and object_name = :a_package_name + and object_type = 'PACKAGE' + and status = 'VALID']' + into l_cnt using upper(a_owner_name), upper(a_package_name); return l_cnt = 1; exception when others then @@ -89,22 +55,12 @@ create or replace package body ut_metadata as function procedure_exists(a_owner_name varchar2, a_package_name in varchar2, a_procedure_name in varchar2) return boolean as l_cnt number; - l_schema varchar2(200); - l_package_name varchar2(200); - l_procedure_name varchar2(200); l_view_name varchar2(200) := get_dba_view('dba_procedures'); begin - - l_schema := a_owner_name; - l_package_name := a_package_name; - l_procedure_name := a_procedure_name; - - do_resolve(l_schema, l_package_name, l_procedure_name); - execute immediate 'select count(*) from '||l_view_name - ||' where owner = :l_schema and object_name = :l_package_name and procedure_name = :l_procedure_name' - into l_cnt using l_schema, l_package_name, l_procedure_name; + ||' where owner = :l_schema and object_name = :l_package_name and procedure_name = :l_procedure_name and rownum = 1' + into l_cnt using a_owner_name, a_package_name, a_procedure_name; --expect one method only for the package with that name. return l_cnt = 1; @@ -327,12 +283,16 @@ create or replace package body ut_metadata as end; function get_object_name(a_full_object_name in varchar2) return varchar2 is - l_schema varchar2(250); - l_object varchar2(250); - l_procedure_name varchar2(250); + l_result varchar2(250); begin - ut_metadata.do_resolve(a_full_object_name,7,l_schema,l_object, l_procedure_name); - return l_object; + l_result := regexp_substr( + a_full_object_name, + '^([A-Za-z0-9$#_]+|".*?")\.([A-Za-z0-9$#_]+|".*?")', subexpression => 2 + ); + if not l_result like '"%"' then + l_result := upper(l_result); + end if; + return l_result; end; function get_anydata_compound_type(a_data_value anydata) return varchar2 is diff --git a/source/core/ut_metadata.pks b/source/core/ut_metadata.pks index 184943f2a..fdd984813 100644 --- a/source/core/ut_metadata.pks +++ b/source/core/ut_metadata.pks @@ -64,18 +64,6 @@ create or replace package ut_metadata authid current_user as function procedure_exists(a_owner_name varchar2, a_package_name in varchar2, a_procedure_name in varchar2) return boolean; - /** - * Resolves [owner.]object[.procedure] using dbms_utility.name_resolve and returns resolved parts - * - */ - procedure do_resolve(a_owner in out nocopy varchar2, a_object in out nocopy varchar2, a_procedure_name in out nocopy varchar2); - - /** - * Resolves single string [owner.]object[.procedure] using dbms_utility.name_resolve and returns parts [owner] [object] [procedure] - */ - procedure do_resolve(a_fully_qualified_name in varchar2,a_context in integer,a_owner out nocopy varchar2, - a_object out nocopy varchar2, a_procedure_name out nocopy varchar2); - /** * Return the text of the source line for a given object (body). It excludes package spec and type spec */ diff --git a/test/ut3_tester/core/annotations/test_before_after_annotations.pkb b/test/ut3_tester/core/annotations/test_before_after_annotations.pkb index 9ee917d84..e2f34e847 100644 --- a/test/ut3_tester/core/annotations/test_before_after_annotations.pkb +++ b/test/ut3_tester/core/annotations/test_before_after_annotations.pkb @@ -282,8 +282,7 @@ create or replace package body test_before_after_annotations is ); ut.expect(g_tests_results).to_match( '1\) beforetest_missing_procedure\s+' || - 'Call params for beforetest are not valid: procedure does not exist ' || - 'UT3_TESTER.DUMMY_BEFORE_AFTER_TEST.NON_EXISTENT_PROCEDURE' + 'Call params for beforetest are not valid: procedure UT3_TESTER\.DUMMY_BEFORE_AFTER_TEST\.NON_EXISTENT_PROCEDURE does not exist\.' ,'m' ); end; diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index e59571723..3fb2fbfec 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -1,5 +1,7 @@ create or replace package body test_ut_run is + g_owner varchar2(250) := sys_context('userenv', 'current_schema'); + procedure clear_expectations is begin ut3_tester_helper.main_helper.clear_expectations(); @@ -576,7 +578,7 @@ Failures:% select * bulk collect into l_results from table(ut3.ut.run('failing_invalid_spec')); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); - ut.expect(l_actual).to_be_like('%Call params for % are not valid: package does not exist or is invalid: %FAILING_INVALID_SPEC%'); + ut.expect(l_actual).to_be_like('%Call params for % are not valid: package %FAILING_INVALID_SPEC% does not exist or is invalid.%'); end; @@ -739,6 +741,40 @@ Failures:% end loop; end; + procedure run_schema_name_test is + l_results ut3.ut_varchar2_list; + l_expected clob; + begin + select * bulk collect into l_results + from table ( ut3.ut.run( g_owner||'.'||g_owner ) ); + l_expected := '%1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%'; + ut.expect(ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( l_expected ); + end; + + procedure create_schema_name_package is + pragma autonomous_transaction; + begin + execute immediate ' + create or replace package '||g_owner||'.'||g_owner||' as + --%suite + + --%test + procedure sample_test; + end;'; + + execute immediate ' + create or replace package body '||g_owner||'.'||g_owner||' as + procedure sample_test is begin ut.expect(1).to_equal(1); end; + end;'; + + end; + + procedure drop_schema_name_package is + pragma autonomous_transaction; + begin + execute immediate 'drop package '||g_owner||'.'||g_owner; + end; + procedure run_with_random_order is l_random_results ut3.ut_varchar2_list; l_results ut3.ut_varchar2_list; diff --git a/test/ut3_user/api/test_ut_run.pks b/test/ut3_user/api/test_ut_run.pks index 4616763d0..406c70b09 100644 --- a/test/ut3_user/api/test_ut_run.pks +++ b/test/ut3_user/api/test_ut_run.pks @@ -85,6 +85,7 @@ create or replace package test_ut_run is --%context(ut_run_function) + --%displayname(ut.run() function options) --%beforeall(create_ut3$user#_tests) --%afterall(drop_ut3$user#_tests) @@ -145,9 +146,18 @@ create or replace package test_ut_run is procedure run_and_report_warnings; procedure create_bad_annot; procedure drop_bad_annot; + + --%test(Can run test package that is named the same as schema name) + --%beforetest(create_schema_name_package) + --%aftertest(drop_schema_name_package) + procedure run_schema_name_test; + procedure create_schema_name_package; + procedure drop_schema_name_package; + --%endcontext --%context(random_order) + --%displayname(Random test execution order) --%beforeall(create_ut3$user#_tests) --%afterall(drop_ut3$user#_tests) @@ -164,6 +174,7 @@ create or replace package test_ut_run is --%endcontext --%context(run with tags) + --%displayname(Call ut.run with #tags) --%beforeall(create_ut3$user#_tests) --%afterall(drop_ut3$user#_tests) From e0d6768ea76f6134ce1bafeac6bce410b8d235b5 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 16 Jun 2019 13:26:22 +0100 Subject: [PATCH 0504/1096] Fixed issue with parsing by trigger when source contains leading comments. --- source/core/annotations/ut_annotation_manager.pkb | 3 ++- .../core/annotations/test_annotation_manager.pkb | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index 70abafef7..3a6c5c950 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -267,10 +267,11 @@ create or replace package body ut_annotation_manager as l_sql_text ora_name_list_t := a_sql_text; begin if a_parts > 0 then - l_sql_text(1) := regexp_replace(l_sql_text(1),'^\s*create(\s+or\s+replace){0,1}(\s+(editionable|noneditionable)){0,1}\s+{0,1}', modifier => 'i'); for i in 1..a_parts loop ut_utils.append_to_clob(l_sql_clob, l_sql_text(i)); end loop; + l_sql_clob := ut3.ut_utils.replace_multiline_comments(l_sql_clob); + l_sql_clob := regexp_replace(l_sql_clob, '^(.*?[^-]{2,}\s*create(\s+or\s+replace){0,1}(\s+(editionable|noneditionable))?\s+?)((package|type).*)', '\5', 1, 1, 'ni'); l_sql_lines := ut_utils.convert_collection( ut_utils.clob_to_table(l_sql_clob) ); end if; open l_result for diff --git a/test/ut3_tester/core/annotations/test_annotation_manager.pkb b/test/ut3_tester/core/annotations/test_annotation_manager.pkb index 4778117c5..e64adc861 100644 --- a/test/ut3_tester/core/annotations/test_annotation_manager.pkb +++ b/test/ut3_tester/core/annotations/test_annotation_manager.pkb @@ -39,10 +39,19 @@ create or replace package body test_annotation_manager is procedure create_dummy_test_package is pragma autonomous_transaction; begin - execute immediate q'[create or replace package dummy_test_package as + execute immediate q'[ + /* + * Some multiline comments before package spec + create or replace package dummy_test_package dummy comment to prove that we pick the right piece of code + */ + -- create or replace package dummy_test_package dummy comment to prove that we pick the right piece of code + --Some single-line comment before package spec + create or replace package dummy_test_package as --%suite(dummy_test_suite) --%rollback(manual) + --create or replace package dummy_test_package dummy comment to prove that we pick the right piece of code + --%test(dummy_test) --%beforetest(some_procedure) procedure some_dummy_test_procedure; @@ -142,9 +151,9 @@ create or replace package body test_annotation_manager is from dual union all select 3, 'rollback' , 'manual', '' as subobject_name from dual union all - select 5, 'test' , 'dummy_test', 'some_dummy_test_procedure' as subobject_name + select 7, 'test' , 'dummy_test', 'some_dummy_test_procedure' as subobject_name from dual union all - select 6, 'beforetest' , 'some_procedure', 'some_dummy_test_procedure' as subobject_name + select 8, 'beforetest' , 'some_procedure', 'some_dummy_test_procedure' as subobject_name from dual; ut.expect(l_actual).to_equal(l_expected); From 69c2393248625b1f90aed4bba073003c3d954d6b Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 16 Jun 2019 13:44:34 +0100 Subject: [PATCH 0505/1096] Fixed typo. --- source/core/annotations/ut_annotation_manager.pkb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index 3a6c5c950..b5d12187b 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -270,7 +270,7 @@ create or replace package body ut_annotation_manager as for i in 1..a_parts loop ut_utils.append_to_clob(l_sql_clob, l_sql_text(i)); end loop; - l_sql_clob := ut3.ut_utils.replace_multiline_comments(l_sql_clob); + l_sql_clob := ut_utils.replace_multiline_comments(l_sql_clob); l_sql_clob := regexp_replace(l_sql_clob, '^(.*?[^-]{2,}\s*create(\s+or\s+replace){0,1}(\s+(editionable|noneditionable))?\s+?)((package|type).*)', '\5', 1, 1, 'ni'); l_sql_lines := ut_utils.convert_collection( ut_utils.clob_to_table(l_sql_clob) ); end if; From a0e98ed19f15217b57e5eba575be15e86b812921 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 16 Jun 2019 19:39:35 +0100 Subject: [PATCH 0506/1096] Improved time needed for clob-to-table conversion. Timing before change (with dbms_lob.read): `clob_to_table - Took:+000000000 00:00:00.012957000` After change: `clob_to_table - Took:+000000000 00:00:00.001236000` Speed improved by order of magnitude. --- source/core/ut_utils.pkb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 3b6a09ddf..44fab2ad8 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -241,7 +241,9 @@ create or replace package body ut_utils is begin while l_offset <= l_length loop l_amount := a_max_amount - coalesce( length(l_last_line), 0 ); - dbms_lob.read(a_clob, l_amount, l_offset, l_buffer); +-- dbms_lob.read(a_clob, l_amount, l_offset, l_buffer); + l_buffer := substr(a_clob, l_offset, l_amount); + l_amount := length(l_buffer); l_offset := l_offset + l_amount; l_string_results := string_to_table( l_last_line || l_buffer, a_delimiter, l_skip_leading_delimiter ); From 8defe567d102c6d92ee56eb3be4263de8e984e61 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 16 Jun 2019 19:42:19 +0100 Subject: [PATCH 0507/1096] Resolved issues with regex for DDL trigger processing. --- source/core/annotations/ut_annotation_manager.pkb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index b5d12187b..8ab115856 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -264,14 +264,17 @@ create or replace package body ut_annotation_manager as l_sql_clob clob; l_sql_lines ut_varchar2_rows := ut_varchar2_rows(); l_result sys_refcursor; - l_sql_text ora_name_list_t := a_sql_text; begin if a_parts > 0 then for i in 1..a_parts loop - ut_utils.append_to_clob(l_sql_clob, l_sql_text(i)); + ut_utils.append_to_clob(l_sql_clob, a_sql_text(i)); end loop; l_sql_clob := ut_utils.replace_multiline_comments(l_sql_clob); - l_sql_clob := regexp_replace(l_sql_clob, '^(.*?[^-]{2,}\s*create(\s+or\s+replace){0,1}(\s+(editionable|noneditionable))?\s+?)((package|type).*)', '\5', 1, 1, 'ni'); + -- replace comment lines that contain "-- create or replace" + l_sql_clob := regexp_replace(l_sql_clob, '^.*[-]{2,}\s*create(\s+or\s+replace).*$', modiafier => 'mi'); + -- remove the "create [or replace] [[non]editionable] " so that we have only "type|package" for parsing + -- needed for dbms_preprocessor + l_sql_clob := regexp_replace(l_sql_clob, '^(.*?\s*create(\s+or\s+replace)?(\s+(editionable|noneditionable))?\s+?)((package|type).*)', '\5', 1, 1, 'ni'); l_sql_lines := ut_utils.convert_collection( ut_utils.clob_to_table(l_sql_clob) ); end if; open l_result for From 4014b1fc10dc009d0f02f4d93559dbf92577cae6 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 16 Jun 2019 19:52:07 +0100 Subject: [PATCH 0508/1096] Adressed review comment. --- source/core/ut_metadata.pkb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_metadata.pkb b/source/core/ut_metadata.pkb index 30262533a..0e8a8b79b 100644 --- a/source/core/ut_metadata.pkb +++ b/source/core/ut_metadata.pkb @@ -292,7 +292,7 @@ create or replace package body ut_metadata as if not l_result like '"%"' then l_result := upper(l_result); end if; - return l_result; + return sys.dbms_assert.qualified_sql_name(l_result); end; function get_anydata_compound_type(a_data_value anydata) return varchar2 is From 780cfc0c535afc5ad599509ffaaea7c7dc534066 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 16 Jun 2019 19:59:25 +0100 Subject: [PATCH 0509/1096] Fixed typo. --- source/core/annotations/ut_annotation_manager.pkb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index 8ab115856..013e271c1 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -271,7 +271,7 @@ create or replace package body ut_annotation_manager as end loop; l_sql_clob := ut_utils.replace_multiline_comments(l_sql_clob); -- replace comment lines that contain "-- create or replace" - l_sql_clob := regexp_replace(l_sql_clob, '^.*[-]{2,}\s*create(\s+or\s+replace).*$', modiafier => 'mi'); + l_sql_clob := regexp_replace(l_sql_clob, '^.*[-]{2,}\s*create(\s+or\s+replace).*$', modifier => 'mi'); -- remove the "create [or replace] [[non]editionable] " so that we have only "type|package" for parsing -- needed for dbms_preprocessor l_sql_clob := regexp_replace(l_sql_clob, '^(.*?\s*create(\s+or\s+replace)?(\s+(editionable|noneditionable))?\s+?)((package|type).*)', '\5', 1, 1, 'ni'); From 8fd5eb9bd3b2302f4cee1f68e6b4af9c9d665643 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 17 Jun 2019 00:29:30 +0000 Subject: [PATCH 0510/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 5bd515ed4..10e9010a7 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index cb71fd4c9..3e8ddd05e 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index aaf801028..e63ef745c 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index fcb71d47b..dadcf1d2e 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 5995bd8a0..78c83e60f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 4a6ad6bce..25d4904d8 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index da59f8890..3caa695a5 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index c45165428..7f1a75ef4 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index f446e86d5..30559a9a0 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index a59828be9..365a5af4e 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index fac7c7c80..3e2b661a9 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 23b5925d3..86c90f5d2 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 30e8b847f..e1be8e08b 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 8813cab2e..e389c686a 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 56375da73..a3ed48e07 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index eef920780..d9badd832 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index f363ddc80..bb423fef1 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3051--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 3b6a09ddf..881609888 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -773,7 +773,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.7.3051-develop + * secion v3.1.7.3073-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 41090accc..39bfafe56 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.7.3051-develop'; + gc_version constant varchar2(50) := 'v3.1.7.3073-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 1205ff47325f80c63c867adefa93a85e0722811d Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 17 Jun 2019 07:05:37 +0000 Subject: [PATCH 0511/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 10e9010a7..0d2b9fd52 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 3e8ddd05e..2d7028ca6 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index e63ef745c..dba1d530e 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index dadcf1d2e..e5fa75bb1 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 78c83e60f..974c195dc 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 25d4904d8..8851f8c58 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 3caa695a5..0336b3429 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 7f1a75ef4..59618289d 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 30559a9a0..a7ff66cb2 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 365a5af4e..765876c1f 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 3e2b661a9..4c3f50715 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 86c90f5d2..94b570355 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index e1be8e08b..fc6344875 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index e389c686a..b3a08cba8 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index a3ed48e07..05ca5765b 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index d9badd832..be8a324ac 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index bb423fef1..ee5e17acd 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3073--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 576b8ce7a..ad547de5f 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -775,7 +775,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.7.3073-develop + * secion v3.1.7.3076-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 39bfafe56..ec5790961 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.7.3073-develop'; + gc_version constant varchar2(50) := 'v3.1.7.3076-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From ba2e765fd989ef0b7b6a7b0847eb7a17d25605f8 Mon Sep 17 00:00:00 2001 From: Lukasz Date: Mon, 17 Jun 2019 18:36:31 +0100 Subject: [PATCH 0512/1096] Feature/json object (#928) * Initial checkin. General skelet of code * Adding json tree parsing. Enabling 12.2 * Update tests. Update sonar rules. * small fixes * PHASE 2: Moving diff into temp table and init data compare during compare implementation to avoid finding same differences twice Adding have count and negated have count matcher.l * Added more complex tests. Added test when extract a piece from two different jsons. Small fixes to code on same hierarchy parent arrays * Update mddocs Fix to json traverse array when object is element of array, the element name is content of object which can be different order but same semantic content. * Fixing sonar * Switch to use supertype * PHASE3 : Adding a functionality for install in pre 12.2 * PHASE3 : Adding a functionality for install in pre 12.2 * PHASE3 : Adding a functionality for install in pre 12.2 * PHASE3 : Adding a functionality for install in pre 12.2 * PHASE3 : Adding a functionality for install in pre 12.2 * PHASE3 : Adding a functionality for install in pre 12.2 * update tests * Update set define off * Code cleanup * fix slash * Creating a dummy specs and removing conditional compilation for code cleanup * PR fixes. * Reverting development script changes. * Refactored JSON code. Changed formatting of JSON-diff output. Changed date formats. * Fixed install on Oracle < 12.2 --- docs/userguide/advanced_data_comparison.md | 5 +- docs/userguide/expectations.md | 247 ++- source/api/ut.pkb | 5 + source/api/ut.pks | 2 + source/core/ut_suite_manager.pkb | 2 +- source/core/ut_utils.pkb | 1 + .../create_synonyms_and_grants_for_public.sql | 2 + source/create_user_grants.sql | 1 + source/create_user_synonyms.sql | 1 + .../data_values/ut_compound_data_helper.pkb | 113 ++ .../data_values/ut_compound_data_helper.pks | 39 +- .../data_values/ut_data_value_json.tpb | 166 ++ .../data_values/ut_data_value_json.tps | 32 + .../data_values/ut_json_data_diff_tmp.sql | 27 + .../expectations/data_values/ut_json_leaf.tpb | 32 + .../expectations/data_values/ut_json_leaf.tps | 42 + .../data_values/ut_json_leaf_tab.tps | 19 + .../data_values/ut_json_tree_details.tpb | 207 +++ .../data_values/ut_json_tree_details.tps | 54 + source/expectations/json_objects_specs.sql | 70 + source/expectations/matchers/ut_equal.tpb | 22 +- source/expectations/matchers/ut_equal.tps | 1 + .../expectations/matchers/ut_have_count.tpb | 10 +- source/expectations/ut_expectation.tpb | 10 +- source/expectations/ut_expectation.tps | 2 + source/expectations/ut_expectation_json.tpb | 61 + source/expectations/ut_expectation_json.tps | 29 + source/install.sql | 13 + source/uninstall_objects.sql | 21 + test/install_ut3_user_tests.sql | 6 + .../expectations/test_expectations_json.pkb | 1609 +++++++++++++++++ .../expectations/test_expectations_json.pks | 79 + 32 files changed, 2898 insertions(+), 32 deletions(-) create mode 100644 source/expectations/data_values/ut_data_value_json.tpb create mode 100644 source/expectations/data_values/ut_data_value_json.tps create mode 100644 source/expectations/data_values/ut_json_data_diff_tmp.sql create mode 100644 source/expectations/data_values/ut_json_leaf.tpb create mode 100644 source/expectations/data_values/ut_json_leaf.tps create mode 100644 source/expectations/data_values/ut_json_leaf_tab.tps create mode 100644 source/expectations/data_values/ut_json_tree_details.tpb create mode 100644 source/expectations/data_values/ut_json_tree_details.tps create mode 100644 source/expectations/json_objects_specs.sql create mode 100644 source/expectations/ut_expectation_json.tpb create mode 100644 source/expectations/ut_expectation_json.tps create mode 100644 test/ut3_user/expectations/test_expectations_json.pkb create mode 100644 test/ut3_user/expectations/test_expectations_json.pks diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 8851f8c58..fe5615315 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -7,10 +7,11 @@ utPLSQL expectations incorporates advanced data comparison options when comparin - refcursor - object type - nested table and varray +- json data-types Advanced data-comparison options are available for the [`equal`](expectations.md#equal) and [`contain`](expectations.md#include--contain) matcher. -## Syntax +Syntax ``` ut.expect( a_actual {data-type} ).to_( equal( a_expected {data-type})[.extendend_option()[.extendend_option()[...]]]); @@ -503,3 +504,5 @@ Finished in .046193 seconds 1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s) ``` + + diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 4c3f50715..fdd037420 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -319,7 +319,7 @@ end; ## have_count Unary matcher that validates if the provided dataset count is equal to expected value. -Can be used with `refcursor` or `table type` +Can be used with `refcursor` , `json`or `table type` Usage: ```sql @@ -1177,7 +1177,218 @@ Finished in .048181 seconds ``` + +# Comparing Json objects + +utPLSQL is capable of comparing json data-types on Oracle 12.2 and above. + +### Notes on comparison of json data + +- Json data can contain objects, scalar or arrays. +- During comparison of json objects the order doesn't matter. +- During comparison of json arrays the index of element is taken into account +- To compare json you have to make sure its type of `json_element_t` or its subtypes + + + +Some examples of using json data-types in matcher are : + +```sql +create or replace package test_expectations_json is + + --%suite(json expectations) + + --%test(Gives success for identical data) + procedure success_on_same_data; +end; +/ + +create or replace package body test_expectations_json is + + procedure success_on_same_data is + l_expected json_element_t; + l_actual json_element_t; + begin + -- Arrange + l_expected := json_element_t.parse(' +{ + "Actors":[ + { + "name":"Tom Cruise", + "age":56, + "Born At":"Syracuse, NY", + "Birthdate":"July 3, 1962", + "photo":"https://jsonformatter.org/img/tom-cruise.jpg", + "wife":null, + "weight":67.5, + "hasChildren":true, + "hasGreyHair":false, + "children":[ + "Suri", + "Isabella Jane", + "Connor" + ] + }, + { + "name":"Robert Downey Jr.", + "age":53, + "Born At":"New York City, NY", + "Birthdate":"April 4, 1965", + "photo":"https://jsonformatter.org/img/Robert-Downey-Jr.jpg", + "wife":"Susan Downey", + "weight":77.1, + "hasChildren":true, + "hasGreyHair":false, + "children":[ + "Indio Falconer", + "Avri Roel", + "Exton Elias" + ] + } + ] +}'); + + l_actual := json_element_t.parse(' +{ + "Actors":[ + { + "name":"Tom Cruise", + "age":56, + "Born At":"Syracuse, NY", + "Birthdate":"July 3, 1962", + "photo":"https://jsonformatter.org/img/tom-cruise.jpg", + "wife":null, + "weight":67.5, + "hasChildren":true, + "hasGreyHair":false, + "children":[ + "Suri", + "Isabella Jane", + "Connor" + ] + }, + { + "name":"Robert Downey Jr.", + "age":53, + "Born At":"New York City, NY", + "Birthdate":"April 4, 1965", + "photo":"https://jsonformatter.org/img/Robert-Downey-Jr.jpg", + "wife":"Susan Downey", + "weight":77.1, + "hasChildren":true, + "hasGreyHair":false, + "children":[ + "Indio Falconer", + "Avri Roel", + "Exton Elias" + ] + } + ] +}'); + + ut3.ut.expect( l_actual ).to_equal( l_actual ); + + end; +end; +/ +``` + +It is possible to use a PL/SQL to extract a piece of JSON and compare it as follow + +```sql +create or replace package test_expectations_json is + + --%suite(json expectations) + + --%test(Gives success for identical pieces of two different jsons) + procedure to_diff_json_extract_same; + +end; +/ + +create or replace package body test_expectations_json is + + procedure to_diff_json_extract_same as + l_expected json_object_t; + l_actual json_object_t; + l_array_actual json_array_t; + l_array_expected json_array_t; + begin + -- Arrange + l_expected := json_object_t.parse(' { + "Actors": [ + { + "name": "Tom Cruise", + "age": 56, + "Born At": "Syracuse, NY", + "Birthdate": "July 3, 1962", + "photo": "https://jsonformatter.org/img/tom-cruise.jpg", + "wife": null, + "weight": 67.5, + "hasChildren": true, + "hasGreyHair": false, + "children": [ + "Suri", + "Isabella Jane", + "Connor" + ] + }, + { + "name": "Robert Downey Jr.", + "age": 53, + "Born At": "New York City, NY", + "Birthdate": "April 4, 1965", + "photo": "https://jsonformatter.org/img/Robert-Downey-Jr.jpg", + "wife": "Susan Downey", + "weight": 77.1, + "hasChildren": true, + "hasGreyHair": false, + "children": [ + "Indio Falconer", + "Avri Roel", + "Exton Elias" + ] + } + ] + }' + ); + + l_actual := json_object_t.parse(' { + "Actors": + { + "name": "Krzystof Jarzyna", + "age": 53, + "Born At": "Szczecin", + "Birthdate": "April 4, 1965", + "photo": "niewidzialny", + "wife": "Susan Downey", + "children": [ + "Indio Falconer", + "Avri Roel", + "Exton Elias" + ] + } + }' + ); + + l_array_actual := json_array_t(json_query(l_actual.stringify,'$.Actors.children')); + l_array_expected := json_array_t(json_query(l_expected.stringify,'$.Actors[1].children')); + --Act + ut3.ut.expect(l_array_actual).to_equal(l_array_expected); + + end; +end; +/ +``` + + + + + + + # Negating a matcher + Expectations provide a very convenient way to perform a check on a negated matcher. Syntax to check for matcher evaluating to true: @@ -1211,21 +1422,21 @@ Since NULL is neither *true* nor *false*, both expectations will report failure. The matrix below illustrates the data types supported by different matchers. -| Matcher | blob | boolean | clob | date | number | timestamp | timestamp
with
timezone | timestamp
with
local
timezone | varchar2 | interval
year
to
month | interval
day
to
second | cursor | nested
table
/ varray | object | -| :---------------------- | :--: | :-----: | :--: | :--: | :----: | :-------: | :---------------------------: | :------------------------------------: | :------: | :-----------------------------: | :-----------------------------: | :----: | :-------------------------: | :----: | -| **be_not_null** | X | X | X | X | X | X | X | X | X | X | X | X | X | X | -| **be_null** | X | X | X | X | X | X | X | X | X | X | X | X | X | X | -| **be_false** | | X | | | | | | | | | | | | | -| **be_true** | | X | | | | | | | | | | | | | -| **be_greater_than** | | | | X | X | X | X | X | | X | X | | | | -| **be_greater_or_equal** | | | | X | X | X | X | X | | X | X | | | | -| **be_less_or_equal** | | | | X | X | X | X | X | | X | X | | | | -| **be_less_than** | | | | X | X | X | X | X | | X | X | | | | -| **be_between** | | | | X | X | X | X | X | X | X | X | | | | -| **equal** | X | X | X | X | X | X | X | X | X | X | X | X | X | X | -| **contain** | | | | | | | | | | | | X | X | X | -| **match** | | | X | | | | | | X | | | | | | -| **be_like** | | | X | | | | | | X | | | | | | -| **be_empty** | X | | X | | | | | | | | | X | X | | -| **have_count** | | | | | | | | | | | | X | X | | +| Matcher | blob | boolean | clob | date | number | timestamp | timestamp
with
timezone | timestamp
with
local
timezone | varchar2 | interval
year
to
month | interval
day
to
second | cursor | nested
table
/ varray | object | json | +| :---------------------: | :--: | :-----: | :--: | :--: | :----: | :-------: | :---------------------------: | :------------------------------------: | :------: | :-----------------------------: | :-----------------------------: | :----: | :-------------------------: | :----: | :--: | +| **be_not_null** | X | X | X | X | X | X | X | X | X | X | X | X | X | X | X | +| **be_null** | X | X | X | X | X | X | X | X | X | X | X | X | X | X | X | +| **be_false** | | X | | | | | | | | | | | | | | +| **be_true** | | X | | | | | | | | | | | | | | +| **be_greater_than** | | | | X | X | X | X | X | | X | X | | | | | +| **be_greater_or_equal** | | | | X | X | X | X | X | | X | X | | | | | +| **be_less_or_equal** | | | | X | X | X | X | X | | X | X | | | | | +| **be_less_than** | | | | X | X | X | X | X | | X | X | | | | | +| **be_between** | | | | X | X | X | X | X | X | X | X | | | | | +| **equal** | X | X | X | X | X | X | X | X | X | X | X | X | X | X | X | +| **contain** | | | | | | | | | | | | X | X | X | | +| **match** | | | X | | | | | | X | | | | | | | +| **be_like** | | | X | | | | | | X | | | | | | | +| **be_empty** | X | | X | | | | | | | | | X | X | | X | +| **have_count** | | | | | | | | | | | | X | X | | X | diff --git a/source/api/ut.pkb b/source/api/ut.pkb index 1a95f0725..27d33835e 100644 --- a/source/api/ut.pkb +++ b/source/api/ut.pkb @@ -93,6 +93,11 @@ create or replace package body ut is return ut_expectation(ut_data_value_dsinterval(a_actual), a_message); end; + function expect(a_actual in json_element_t , a_message varchar2 := null) return ut_expectation_json is + begin + return ut_expectation_json(ut_data_value_json(a_actual), a_message); + end; + procedure fail(a_message in varchar2) is begin ut_expectation_processor.report_failure(a_message); diff --git a/source/api/ut.pks b/source/api/ut.pks index 17b4a845e..5549a75c2 100644 --- a/source/api/ut.pks +++ b/source/api/ut.pks @@ -45,6 +45,8 @@ create or replace package ut authid current_user as function expect(a_actual in dsinterval_unconstrained, a_message varchar2 := null) return ut_expectation; + function expect(a_actual in json_element_t , a_message varchar2 := null) return ut_expectation_json; + procedure fail(a_message in varchar2); function run( diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 87121918c..21e070865 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -916,7 +916,7 @@ create or replace package body ut_suite_manager is where exists ( select 1 from ]'||l_ut_owner||q'[.ut_suite_cache c - where 1 = 1 ]'||case when can_skip_all_objects_scan(l_owner_name) then q'[ + where 1 = 1 ]'||case when not can_skip_all_objects_scan(l_owner_name) then q'[ and exists ( select 1 from all_objects a diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index ad547de5f..6b2adeb53 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -492,6 +492,7 @@ create or replace package body ut_utils is begin execute immediate 'delete from ut_compound_data_tmp'; execute immediate 'delete from ut_compound_data_diff_tmp'; + execute immediate 'delete from ut_json_data_diff_tmp'; end; function to_version(a_version_no varchar2) return t_version is diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index 609d78ccf..2cd553860 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -33,6 +33,7 @@ alter session set current_schema = &&ut3_owner; grant execute on &&ut3_owner..ut_expectation to public; grant execute on &&ut3_owner..ut_expectation_compound to public; +grant execute on &&ut3_owner..ut_expectation_json to public; grant execute on &&ut3_owner..ut_be_between to public; grant execute on &&ut3_owner..ut_be_empty to public; grant execute on &&ut3_owner..ut_be_false to public; @@ -113,6 +114,7 @@ prompt Creating synonyms for UTPLSQL objects in &&ut3_owner schema to PUBLIC create public synonym ut_expectation for &&ut3_owner..ut_expectation; create public synonym ut_expectation_compound for &&ut3_owner..ut_expectation_compound; +create public synonym ut_expectation_json for &&ut3_owner..ut_expectation_json; create public synonym be_between for &&ut3_owner..be_between; create public synonym be_empty for &&ut3_owner..be_empty; diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql index 7aa5deb39..fe1d3da29 100644 --- a/source/create_user_grants.sql +++ b/source/create_user_grants.sql @@ -53,6 +53,7 @@ alter session set current_schema = &&ut3_owner; grant execute on &&ut3_owner..ut_expectation to &ut3_user; grant execute on &&ut3_owner..ut_expectation_compound to &ut3_user; +grant execute on &&ut3_owner..ut_expectation_json to &ut3_user; grant execute on &&ut3_owner..ut_be_between to &ut3_user; grant execute on &&ut3_owner..ut_be_empty to &ut3_user; diff --git a/source/create_user_synonyms.sql b/source/create_user_synonyms.sql index cb2f7ab67..8fd687181 100644 --- a/source/create_user_synonyms.sql +++ b/source/create_user_synonyms.sql @@ -55,6 +55,7 @@ prompt Creating synonyms for UTPLSQL objects in &&ut3_owner schema to user &&ut3 create or replace synonym &ut3_user..ut_expectation for &&ut3_owner..ut_expectation; create or replace synonym &ut3_user..ut_expectation_compound for &&ut3_owner..ut_expectation_compound; +create or replace synonym &ut3_user..ut_expectation_json for &&ut3_owner..ut_expectation_json; create or replace synonym &ut3_user..be_between for &&ut3_owner..be_between; create or replace synonym &ut3_user..be_empty for &&ut3_owner..be_empty; diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 1d5686f03..2a2ce9d9e 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -635,6 +635,119 @@ create or replace package body ut_compound_data_helper is end; end; + function compare_json_data(a_act_json_data ut_json_leaf_tab,a_exp_json_data ut_json_leaf_tab) return tt_json_diff_tab is + l_result_diff tt_json_diff_tab := tt_json_diff_tab(); + begin + + with + differences as ( + select case + when (a.element_name is null or e.element_name is null) then gc_json_missing + when a.json_type != e.json_type then gc_json_type + when (decode(a.element_value,e.element_value,1,0) = 0) then gc_json_notequal + else gc_json_unknown + end as difference_type, + case + when (a.element_name is null or e.element_name is null) then 1 + when a.json_type != e.json_type then 2 + when (decode(a.element_value,e.element_value,1,0) = 0) then 3 + else 4 + end as order_by_type, + a.element_name as act_element_name, + a.element_value as act_element_value, + a.hierarchy_level as act_hierarchy_level, + a.index_position as act_index_position, + a.json_type as act_json_type, + a.access_path as act_access_path, + a.parent_name as act_par_name, + a.parent_path as act_parent_path, + e.element_name as exp_element_name, + e.element_value as exp_element_value, + e.hierarchy_level as exp_hierarchy_level, + e.index_position as exp_index_position, + e.json_type as exp_json_type, + e.access_path as exp_access_path, + e.parent_name as exp_par_name, + e.parent_path as exp_parent_path + from table(a_act_json_data) a + full outer join table(a_exp_json_data) e + on decode(a.parent_name,e.parent_name,1,0)= 1 + and decode(a.parent_path,e.parent_path,1,0)= 1 + and ( + case when a.parent_type = 'object' or e.parent_type = 'object' then + decode(a.element_name,e.element_name,1,0) + else 1 end = 1 + ) + and ( + case when a.parent_type = 'array' or e.parent_type = 'array' then + decode(a.index_position,e.index_position,1,0) + else 1 end = 1 + ) + and a.hierarchy_level = e.hierarchy_level + where (a.element_name is null or e.element_name is null) + or (a.json_type != e.json_type) + or (decode(a.element_value,e.element_value,1,0) = 0) + ) + select difference_type, + act_element_name, act_element_value, act_json_type, act_access_path, act_parent_path, + exp_element_name, exp_element_value, exp_json_type, exp_access_path, exp_parent_path + bulk collect into l_result_diff + from differences a + where not exists ( + select 1 from differences b + where (a.act_par_name = b.act_element_name and a.act_hierarchy_level - 1 = b.act_hierarchy_level) + or (a.exp_par_name = b.exp_element_name and a.exp_hierarchy_level - 1 = b.exp_hierarchy_level) + and a.difference_type = gc_json_missing and b.difference_type = gc_json_missing + ) + order by order_by_type, + nvl(act_hierarchy_level,exp_hierarchy_level), + nvl(act_index_position,exp_index_position) nulls first, + nvl(act_element_name,exp_element_name) ; + return l_result_diff; + end; + + function insert_json_diffs(a_diff_id raw, a_act_json_data ut_json_leaf_tab, a_exp_json_data ut_json_leaf_tab) return integer is + l_diffs tt_json_diff_tab := compare_json_data(a_act_json_data,a_exp_json_data); + begin + forall i in 1..l_diffs.count + insert into ut_json_data_diff_tmp ( + diff_id, difference_type, + act_element_name, act_element_value, act_json_type, act_access_path, act_parent_path, + exp_element_name, exp_element_value, exp_json_type, exp_access_path, exp_parent_path + ) + values ( + a_diff_id,l_diffs(i).difference_type, + l_diffs(i).act_element_name,l_diffs(i).act_element_value,l_diffs(i).act_json_type, l_diffs(i).act_access_path, l_diffs(i).act_parent_path, + l_diffs(i).exp_element_name,l_diffs(i).exp_element_value,l_diffs(i).exp_json_type,l_diffs(i).exp_access_path, l_diffs(i).exp_parent_path + ); + + return l_diffs.count; + end; + + function get_json_diffs_type(a_diffs_all tt_json_diff_tab) return tt_json_diff_type_tab is + l_diffs_summary tt_json_diff_type_tab := tt_json_diff_type_tab(); + begin + select d.difference_type,count(1) + bulk collect into l_diffs_summary + from table(a_diffs_all) d + group by d.difference_type; + + return l_diffs_summary; + end; + + function get_json_diffs_tmp(a_diff_id raw) return tt_json_diff_tab is + l_diffs tt_json_diff_tab; + begin + select difference_type, + act_element_name, act_element_value, act_json_type, act_access_path, act_parent_path, + exp_element_name, exp_element_value, exp_json_type, exp_access_path, exp_parent_path + bulk collect into l_diffs + from ut_json_data_diff_tmp + where diff_id = a_diff_id; + + return l_diffs; + end; + begin g_anytype_name_map(dbms_types.typecode_date) := 'DATE'; g_anytype_name_map(dbms_types.typecode_number) := 'NUMBER'; diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 1c00d2263..c6b6507fc 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -19,6 +19,11 @@ create or replace package ut_compound_data_helper authid definer is gc_compare_unordered constant varchar2(10):='unordered'; gc_compare_normal constant varchar2(10):='normal'; + gc_json_missing constant varchar2(30) := 'missing properties'; + gc_json_type constant varchar2(30) := 'incorrect types'; + gc_json_notequal constant varchar2(30) := 'unequal values'; + gc_json_unknown constant varchar2(30) := 'unknown'; + type t_column_diffs is record( diff_type varchar2(1), expected_name varchar2(250), @@ -50,7 +55,30 @@ create or replace package ut_compound_data_helper authid definer is ); type t_diff_tab is table of t_diff_rec; - + + type t_json_diff_rec is record ( + difference_type varchar2(50), + act_element_name varchar2(4000), + act_element_value varchar2(4000), + act_json_type varchar2(4000), + act_access_path varchar2(4000), + act_parent_path varchar2(4000), + exp_element_name varchar2(4000), + exp_element_value varchar2(4000), + exp_json_type varchar2(4000), + exp_access_path varchar2(4000), + exp_parent_path varchar2(4000) + ); + + type tt_json_diff_tab is table of t_json_diff_rec; + + type t_json_diff_type_rec is record ( + difference_type varchar2(50), + no_of_occurence integer + ); + + type tt_json_diff_type_tab is table of t_json_diff_type_rec; + function get_columns_diff( a_expected ut_cursor_column_tab, a_actual ut_cursor_column_tab,a_order_enforced boolean := false ) return tt_column_diffs; @@ -99,5 +127,14 @@ create or replace package ut_compound_data_helper authid definer is */ function type_no_length ( a_type_name varchar2) return boolean; + function compare_json_data(a_act_json_data ut_json_leaf_tab,a_exp_json_data ut_json_leaf_tab) return tt_json_diff_tab; + + function insert_json_diffs(a_diff_id raw, a_act_json_data ut_json_leaf_tab,a_exp_json_data ut_json_leaf_tab) return integer; + + function get_json_diffs_tmp(a_diff_id raw) return tt_json_diff_tab; + + + function get_json_diffs_type(a_diffs_all tt_json_diff_tab) return tt_json_diff_type_tab; + end; / diff --git a/source/expectations/data_values/ut_data_value_json.tpb b/source/expectations/data_values/ut_data_value_json.tpb new file mode 100644 index 000000000..ee761b141 --- /dev/null +++ b/source/expectations/data_values/ut_data_value_json.tpb @@ -0,0 +1,166 @@ +create or replace type body ut_data_value_json as + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + member procedure init (self in out nocopy ut_data_value_json, a_value json_element_t) is + begin + self.is_data_null := case when a_value is null then 1 else 0 end; + self.data_value := case when a_value is null then null else a_value.to_clob end; + self.self_type := $$plsql_unit; + self.data_type := 'json'; + self.json_tree := ut_json_tree_details(a_value); + self.data_id := sys_guid(); + end; + + constructor function ut_data_value_json(self in out nocopy ut_data_value_json, a_value json_element_t) return self as result is + begin + init(a_value); + return; + end; + + overriding member function is_null return boolean is + begin + return (ut_utils.int_to_boolean(self.is_data_null)); + end; + + overriding member function is_empty return boolean is + begin + return self.data_value = '{}'; + end; + + overriding member function to_string return varchar2 is + begin + return ut_utils.to_string(self.data_value); + end; + + overriding member function diff( a_other ut_data_value, a_match_options ut_matcher_options ) return varchar2 is + l_result clob; + l_results ut_utils.t_clob_tab := ut_utils.t_clob_tab(); + l_result_string varchar2(32767); + l_other ut_data_value_json; + l_self ut_data_value_json := self; + l_diff_id ut_compound_data_helper.t_hash; + c_max_rows integer := ut_utils.gc_diff_max_rows; + l_diffs ut_compound_data_helper.tt_json_diff_tab; + l_message varchar2(32767); + + function get_diff_by_type(a_diff ut_compound_data_helper.tt_json_diff_tab) return clob is + l_diff_summary ut_compound_data_helper.tt_json_diff_type_tab := ut_compound_data_helper.get_json_diffs_type(a_diff); + l_message_list ut_varchar2_list := ut_varchar2_list(); + begin + for i in 1..l_diff_summary.count loop + l_message_list.extend; + l_message_list(l_message_list.last) := l_diff_summary(i).no_of_occurence||' '||l_diff_summary(i).difference_type; + end loop; + return ut_utils.table_to_clob(l_message_list,', '); + end; + + function get_json_diff_text (a_json_diff ut_compound_data_helper.t_json_diff_rec) return clob is + begin + return + case + when a_json_diff.difference_type = ut_compound_data_helper.gc_json_missing + then + case + when a_json_diff.act_element_name is not null then q'[ Missing property: ]'||a_json_diff.act_element_name + when a_json_diff.exp_element_name is not null then q'[ Extra property: ]'||a_json_diff.exp_element_name + end || ' on path: '||nvl(a_json_diff.act_parent_path,a_json_diff.exp_parent_path) + else + case + when a_json_diff.difference_type = ut_compound_data_helper.gc_json_type + then q'[ Actual type: ']'||a_json_diff.act_json_type||q'[' was expected to be: ']'||a_json_diff.exp_json_type||q'[']' + when a_json_diff.difference_type = ut_compound_data_helper.gc_json_notequal + then q'[ Actual value: ]'||a_json_diff.act_element_value||q'[ was expected to be: ]'||a_json_diff.exp_element_value + end || ' on path: '||nvl(a_json_diff.act_access_path,a_json_diff.exp_access_path) + end; + end; + + begin + if not a_other is of (ut_data_value_json) then + raise value_error; + end if; + dbms_lob.createtemporary(l_result, true); + l_other := treat(a_other as ut_data_value_json); + l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); + + if not l_self.is_null and not l_other.is_null then + l_diffs := ut_compound_data_helper.get_json_diffs_tmp(l_diff_id); + + l_message := ' '||l_diffs.count|| ' differences found' || + case when l_diffs.count > c_max_rows then ', showing first '|| c_max_rows else null end||chr(10); + ut_utils.append_to_clob( l_result, l_message ); + l_message := get_diff_by_type(l_diffs)||chr(10); + ut_utils.append_to_clob( l_result, l_message ); + + for i in 1 .. least( c_max_rows, l_diffs.count ) loop + l_results.extend; + l_results(l_results.last) := get_json_diff_text(l_diffs(i)); + end loop; + ut_utils.append_to_clob(l_result, l_results); + + end if; + + + l_result_string := ut_utils.to_string(l_result,null); + dbms_lob.freetemporary(l_result); + return l_result_string; + end; + + overriding member function compare_implementation(a_other ut_data_value) return integer is + l_self ut_data_value_json := self; + l_other ut_data_value := a_other; + begin + return l_self.compare_implementation( l_other, null ); + end; + + member function compare_implementation(a_other in ut_data_value,a_match_options ut_matcher_options) return + integer is + l_result integer; + l_other ut_data_value_json; + l_diff_id ut_compound_data_helper.t_hash; + begin + if a_other is of (ut_data_value_json) then + l_other := treat(a_other as ut_data_value_json); + l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); + l_result := + case + when ut_compound_data_helper.insert_json_diffs( + l_diff_id, self.json_tree.json_tree_info, l_other.json_tree.json_tree_info + ) > 0 then 1 + else 0 + end; + end if; + return l_result; + end; + + member function get_elements_count return integer is + begin + return json_element_t.parse(self.data_value).get_size; + end; + + member function get_json_count_info return varchar2 is + begin + return self.data_type||' [ count = '||self.get_elements_count||' ]'; + end; + + overriding member function get_object_info return varchar2 is + begin + return self.data_type; + end; + +end; +/ diff --git a/source/expectations/data_values/ut_data_value_json.tps b/source/expectations/data_values/ut_data_value_json.tps new file mode 100644 index 000000000..50f721bf6 --- /dev/null +++ b/source/expectations/data_values/ut_data_value_json.tps @@ -0,0 +1,32 @@ +create or replace type ut_data_value_json under ut_compound_data_value( + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + data_value clob, + json_tree ut_json_tree_details, + member procedure init (self in out nocopy ut_data_value_json, a_value json_element_t), + constructor function ut_data_value_json(self in out nocopy ut_data_value_json, a_value json_element_t) return self as result, + overriding member function is_null return boolean, + overriding member function is_empty return boolean, + overriding member function to_string return varchar2, + overriding member function diff( a_other ut_data_value, a_match_options ut_matcher_options ) return varchar2, + overriding member function compare_implementation(a_other ut_data_value) return integer, + member function compare_implementation(a_other ut_data_value,a_match_options ut_matcher_options) return integer, + member function get_elements_count return integer, + member function get_json_count_info return varchar2, + overriding member function get_object_info return varchar2 +) +/ diff --git a/source/expectations/data_values/ut_json_data_diff_tmp.sql b/source/expectations/data_values/ut_json_data_diff_tmp.sql new file mode 100644 index 000000000..08de6ccf8 --- /dev/null +++ b/source/expectations/data_values/ut_json_data_diff_tmp.sql @@ -0,0 +1,27 @@ +create global temporary table ut_json_data_diff_tmp( + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + diff_id raw(128), + difference_type varchar2(250), + act_element_name varchar2(2000), + act_element_value varchar2(4000), + act_json_type varchar2(100), + act_access_path varchar2(4000), + act_parent_path varchar2(4000), + exp_element_name varchar2(2000), + exp_element_value varchar2(4000), + exp_json_type varchar2(2000), + exp_access_path varchar2(4000), + exp_parent_path varchar2(4000) +) on commit preserve rows; diff --git a/source/expectations/data_values/ut_json_leaf.tpb b/source/expectations/data_values/ut_json_leaf.tpb new file mode 100644 index 000000000..83f1009ef --- /dev/null +++ b/source/expectations/data_values/ut_json_leaf.tpb @@ -0,0 +1,32 @@ +create or replace type body ut_json_leaf as + + member procedure init( self in out nocopy ut_json_leaf, + a_element_name varchar2, a_element_value varchar2,a_parent_name varchar2, + a_access_path varchar2, a_hierarchy_level integer, a_index_position integer, a_json_type in varchar2, + a_parent_type varchar2, a_array_element integer:=0, a_parent_path varchar2) is + begin + self.element_name := a_element_name; + self.element_value := a_element_value; + self.parent_name := a_parent_name; + self.hierarchy_level := a_hierarchy_level; + self.access_path := a_access_path; + self.index_position := a_index_position; + self.json_type := a_json_type; + self.is_array_element := a_array_element; + self.parent_type := a_parent_type; + self.parent_path := a_parent_path; + end; + + constructor function ut_json_leaf( self in out nocopy ut_json_leaf, + a_element_name varchar2, a_element_value varchar2,a_parent_name varchar2, + a_access_path varchar2, a_hierarchy_level integer, a_index_position integer, a_json_type in varchar2, + a_parent_type varchar2, a_array_element integer:=0, a_parent_path varchar2) + return self as result is + begin + init(a_element_name,a_element_value,a_parent_name, a_access_path, a_hierarchy_level, a_index_position, + a_json_type,a_parent_type,a_array_element, a_parent_path); + return; + end; + +end; +/ diff --git a/source/expectations/data_values/ut_json_leaf.tps b/source/expectations/data_values/ut_json_leaf.tps new file mode 100644 index 000000000..b283367a4 --- /dev/null +++ b/source/expectations/data_values/ut_json_leaf.tps @@ -0,0 +1,42 @@ +create or replace type ut_json_leaf authid current_user as object ( + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + element_name varchar2(4000), + element_value varchar2(4000), + parent_name varchar2(4000), + access_path varchar2(4000), + tlength integer, + display_path varchar2(4000), + hierarchy_level integer, + index_position integer, + json_type varchar2(2000), + is_array_element integer, + parent_type varchar2(2000), + parent_path varchar2(4000), + + member procedure init(self in out nocopy ut_json_leaf, + a_element_name varchar2, a_element_value varchar2,a_parent_name varchar2, + a_access_path varchar2, a_hierarchy_level integer, a_index_position integer, a_json_type in varchar2, + a_parent_type varchar2, a_array_element integer:=0, a_parent_path varchar2), + + constructor function ut_json_leaf( self in out nocopy ut_json_leaf, + a_element_name varchar2, a_element_value varchar2,a_parent_name varchar2, + a_access_path varchar2, a_hierarchy_level integer, a_index_position integer, a_json_type in varchar2, + a_parent_type varchar2, a_array_element integer:=0, a_parent_path varchar2) + return self as result +) +/ diff --git a/source/expectations/data_values/ut_json_leaf_tab.tps b/source/expectations/data_values/ut_json_leaf_tab.tps new file mode 100644 index 000000000..50a247ad6 --- /dev/null +++ b/source/expectations/data_values/ut_json_leaf_tab.tps @@ -0,0 +1,19 @@ +create or replace type ut_json_leaf_tab as + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ +table of ut_json_leaf +/ \ No newline at end of file diff --git a/source/expectations/data_values/ut_json_tree_details.tpb b/source/expectations/data_values/ut_json_tree_details.tpb new file mode 100644 index 000000000..a333ea71c --- /dev/null +++ b/source/expectations/data_values/ut_json_tree_details.tpb @@ -0,0 +1,207 @@ +create or replace type body ut_json_tree_details as + + member function get_json_type(a_json_piece json_element_t) return varchar2 is + begin + return + case + when a_json_piece.is_object then 'object' + when a_json_piece.is_array then 'array' + when a_json_piece.is_string then 'string' + when a_json_piece.is_number then 'number' + when a_json_piece.is_boolean then 'boolean' + when a_json_piece.is_true then 'true' + when a_json_piece.is_false then 'false' + when a_json_piece.is_null then 'null' + when a_json_piece.is_date then 'date' + when a_json_piece.is_timestamp then 'timestamp' + when a_json_piece.is_scalar then 'scalar' + else null + end; + end; + + member function get_json_value(a_json_piece json_element_t, a_key varchar2) return varchar2 is + l_json_el json_element_t; + l_val varchar2(4000); + begin + l_json_el := treat(a_json_piece as json_object_t).get(a_key); + case + when l_json_el.is_string then l_val := ut_utils.to_string(l_json_el.to_string(),null); + when l_json_el.is_number then l_val := ut_utils.to_string(l_json_el.to_number()); + when l_json_el.is_boolean then l_val := ut_utils.to_string(l_json_el.to_boolean()); +-- when l_json_el.is_true then l_val := ut_utils.to_string(l_json_el.to_boolean()); +-- when l_json_el.is_false then l_val := ut_utils.to_string(l_json_el.to_boolean()); + when l_json_el.is_date then l_val := ut_utils.to_string(l_json_el.to_date()); + when l_json_el.is_timestamp then l_val := ut_utils.to_string(l_json_el.to_date()); + else null; + end case; + return l_val; + end; + + member function get_json_value(a_json_piece json_element_t, a_key integer) return varchar2 is + l_json_el json_element_t; + l_val varchar2(4000); + begin + l_json_el := treat(a_json_piece as json_array_t).get(a_key); + case + when l_json_el.is_string then l_val := ut_utils.to_string(l_json_el.to_string(),null); + when l_json_el.is_number then l_val := ut_utils.to_string(l_json_el.to_number()); + when l_json_el.is_boolean then l_val := ut_utils.to_string(l_json_el.to_boolean()); +-- when l_json_el.is_true then l_val := ut_utils.to_string(l_json_el.to_boolean()); +-- when l_json_el.is_false then l_val := ut_utils.to_string(l_json_el.to_boolean()); + when l_json_el.is_date then l_val := ut_utils.to_string(l_json_el.to_date()); + when l_json_el.is_timestamp then l_val := ut_utils.to_string(l_json_el.to_date()); + else null; + end case; + return l_val; + end; + + member procedure add_json_leaf( + self in out nocopy ut_json_tree_details, + a_element_name varchar2, + a_element_value varchar2, + a_parent_name varchar2, + a_access_path varchar2, + a_hierarchy_level integer, + a_index_position integer, + a_json_type varchar2, + a_parent_type varchar2, + a_array_element integer := 0, + a_parent_path varchar2 + ) is + begin + self.json_tree_info.extend; + self.json_tree_info(self.json_tree_info.last) := + ut_json_leaf( + a_element_name, a_element_value, a_parent_name, a_access_path, + a_hierarchy_level, a_index_position,a_json_type, a_parent_type, + a_array_element, a_parent_path + ); + end; + + member procedure traverse_object( + self in out nocopy ut_json_tree_details, + a_json_piece json_element_t, + a_parent_name varchar2 := null, + a_hierarchy_level integer := 1, + a_access_path varchar2 := '$' + ) as + l_keys json_key_list; + l_object json_object_t := treat(a_json_piece as json_object_t); + l_path varchar2(32767); + l_type varchar2(50); + l_name varchar2(4000); + begin + l_keys := coalesce(l_object.get_keys,json_key_list()); + + for i in 1 .. l_keys.count loop + l_type := get_json_type(l_object.get(l_keys(i))); + l_name := '"'||l_keys(i)||'"'; + l_path := a_access_path||'.'||l_name; + + add_json_leaf( + l_name, + get_json_value(l_object,l_keys(i)), + a_parent_name, + l_path, + a_hierarchy_level, + i, + l_type, + 'object', + 0, + a_access_path + ); + case l_type + when 'array' then + traverse_array ( + treat (l_object.get (l_keys(i)) as json_array_t), + l_name, + a_hierarchy_level + 1, + l_path + ); + when 'object' then + traverse_object( + treat (l_object.get (l_keys(i)) as json_object_t), + l_name, + a_hierarchy_level+1, + l_path + ); + else + null; + end case; + end loop; + end traverse_object; + + member procedure traverse_array( + self in out nocopy ut_json_tree_details, + a_json_piece json_element_t, + a_parent_name varchar2 := null, + a_hierarchy_level integer := 1, + a_access_path varchar2 := '$' + ) as + l_array json_array_t; + l_type varchar2(50); + l_name varchar2(4000); + l_path varchar2(32767); + begin + l_array := treat(a_json_piece as json_array_t); + + for i in 0 .. l_array.get_size - 1 loop + l_type := get_json_type(l_array.get(i)); + l_name := case when l_type = 'object' then l_type else l_array.get(i).stringify end; + l_path := a_access_path||'['||i||']'; + + add_json_leaf( + l_name, + get_json_value(a_json_piece,i), + a_parent_name, + l_path, + a_hierarchy_level, + i, + l_type, + 'array', + 1, + l_path + ); + case l_type + when 'array' then + traverse_array ( + treat (l_array.get (i) as json_array_t), + l_name, + a_hierarchy_level + 1, + l_path + ); + when 'object' then + traverse_object( + treat (l_array.get (i) as json_object_t), + l_name, + a_hierarchy_level + 1, + l_path + ); + else + null; + end case; + end loop; + end traverse_array; + + member procedure init(self in out nocopy ut_json_tree_details,a_json_doc in json_element_t, a_level_in integer := 0) is + begin + if a_json_doc.is_object then + traverse_object(treat (a_json_doc as json_object_t)); + elsif a_json_doc.is_array then + traverse_array(treat (a_json_doc as json_array_t)); + end if; + end; + + constructor function ut_json_tree_details( + self in out nocopy ut_json_tree_details, a_json_doc in json_element_t, a_level_in integer := 0 + ) return self as result is + begin + self.json_tree_info := ut_json_leaf_tab(); + if a_json_doc is not null then + init(a_json_doc,a_level_in); + end if; + return; + end; + +end; +/ diff --git a/source/expectations/data_values/ut_json_tree_details.tps b/source/expectations/data_values/ut_json_tree_details.tps new file mode 100644 index 000000000..8e04e8b83 --- /dev/null +++ b/source/expectations/data_values/ut_json_tree_details.tps @@ -0,0 +1,54 @@ +create or replace type ut_json_tree_details force as object ( + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + json_tree_info ut_json_leaf_tab, + member function get_json_type(a_json_piece json_element_t) return varchar2, + member function get_json_value(a_json_piece json_element_t,a_key varchar2) return varchar2, + member function get_json_value(a_json_piece json_element_t,a_key integer) return varchar2, + member procedure add_json_leaf( + self in out nocopy ut_json_tree_details, + a_element_name varchar2, + a_element_value varchar2, + a_parent_name varchar2, + a_access_path varchar2, + a_hierarchy_level integer, + a_index_position integer, + a_json_type in varchar2, + a_parent_type in varchar2, + a_array_element integer := 0, + a_parent_path varchar2 + ), + member procedure traverse_object( + self in out nocopy ut_json_tree_details, + a_json_piece json_element_t, + a_parent_name varchar2 := null, + a_hierarchy_level integer := 1, + a_access_path varchar2 := '$' + ), + member procedure traverse_array( + self in out nocopy ut_json_tree_details, + a_json_piece json_element_t, + a_parent_name varchar2 := null, + a_hierarchy_level integer := 1, + a_access_path varchar2 := '$' + ), + member procedure init(self in out nocopy ut_json_tree_details,a_json_doc in json_element_t, a_level_in integer := 0), + constructor function ut_json_tree_details( + self in out nocopy ut_json_tree_details, a_json_doc in json_element_t, a_level_in integer := 0 + ) return self as result +) +/ diff --git a/source/expectations/json_objects_specs.sql b/source/expectations/json_objects_specs.sql new file mode 100644 index 000000000..c0d42e8fb --- /dev/null +++ b/source/expectations/json_objects_specs.sql @@ -0,0 +1,70 @@ +BEGIN + + $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then + dbms_output.put_line('Object exists , dont install'); + $else + dbms_output.put_line('Installing json structures specs.'); + execute immediate q'[create or replace TYPE JSON_Element_T FORCE AUTHID CURRENT_USER AS OBJECT( + dummyobjt NUMBER, + STATIC FUNCTION parse(jsn VARCHAR2) RETURN JSON_Element_T, + STATIC FUNCTION parse(jsn CLOB) RETURN JSON_Element_T, + STATIC FUNCTION parse(jsn BLOB) RETURN JSON_Element_T, + MEMBER FUNCTION to_Clob RETURN CLOB, + MEMBER FUNCTION stringify RETURN VARCHAR2, + MEMBER FUNCTION is_Object RETURN BOOLEAN, + MEMBER FUNCTION is_Array RETURN BOOLEAN, + MEMBER FUNCTION is_Scalar RETURN BOOLEAN, + MEMBER FUNCTION is_String RETURN BOOLEAN, + MEMBER FUNCTION is_Number RETURN BOOLEAN, + MEMBER FUNCTION is_Boolean RETURN BOOLEAN, + MEMBER FUNCTION is_True RETURN BOOLEAN, + MEMBER FUNCTION is_False RETURN BOOLEAN, + MEMBER FUNCTION is_Null RETURN BOOLEAN, + MEMBER FUNCTION is_Date RETURN BOOLEAN, + MEMBER FUNCTION is_Timestamp RETURN BOOLEAN, + MEMBER FUNCTION to_string RETURN VARCHAR2, + MEMBER FUNCTION to_number RETURN NUMBER, + MEMBER FUNCTION to_boolean RETURN BOOLEAN, + MEMBER FUNCTION to_date RETURN VARCHAR2, + + MEMBER FUNCTION get_Size(self IN JSON_ELEMENT_T) RETURN NUMBER +) NOT FINAL NOT INSTANTIABLE;]'; + + execute immediate q'[create or replace TYPE JSON_KEY_LIST FORCE AS VARRAY(32767) OF VARCHAR2(4000);]'; + + execute immediate q'[create or replace TYPE JSON_Array_T FORCE AUTHID CURRENT_USER UNDER JSON_Element_T( + CONSTRUCTOR FUNCTION JSON_Array_T RETURN SELF AS RESULT, + MEMBER FUNCTION get(pos NUMBER) RETURN JSON_Element_T, + MEMBER FUNCTION get_String(pos NUMBER) RETURN VARCHAR2, + MEMBER FUNCTION get_Number(pos NUMBER) RETURN NUMBER, + MEMBER FUNCTION get_Boolean(pos NUMBER) RETURN BOOLEAN, + MEMBER FUNCTION get_Date(pos NUMBER) RETURN DATE, + MEMBER FUNCTION get_Timestamp(pos NUMBER) RETURN TIMESTAMP, + MEMBER FUNCTION get_Clob(pos NUMBER) RETURN CLOB, + MEMBER PROCEDURE get_Clob(pos NUMBER, c IN OUT NOCOPY CLOB), + MEMBER FUNCTION get_Blob(pos NUMBER) RETURN BLOB, + MEMBER PROCEDURE get_Blob(pos NUMBER, b IN OUT NOCOPY BLOB), + MEMBER FUNCTION get_Type(pos NUMBER) RETURN VARCHAR2 +) FINAL;]'; + + execute immediate q'[create or replace TYPE JSON_Object_T AUTHID CURRENT_USER UNDER JSON_Element_T( + CONSTRUCTOR FUNCTION JSON_Object_T RETURN SELF AS RESULT, + MEMBER FUNCTION get(key VARCHAR2) RETURN JSON_Element_T, + MEMBER FUNCTION get_Object(key VARCHAR2) RETURN JSON_OBJECT_T, + MEMBER FUNCTION get_Array(key VARCHAR2) RETURN JSON_ARRAY_T, + MEMBER FUNCTION get_String(key VARCHAR2) RETURN VARCHAR2, + MEMBER FUNCTION get_Number(key VARCHAR2) RETURN NUMBER, + MEMBER FUNCTION get_Boolean(key VARCHAR2) RETURN BOOLEAN, + MEMBER FUNCTION get_Date(key VARCHAR2) RETURN DATE, + MEMBER FUNCTION get_Timestamp(key VARCHAR2) RETURN TIMESTAMP, + MEMBER FUNCTION get_Clob(key VARCHAR2) RETURN CLOB, + MEMBER PROCEDURE get_Clob(key VARCHAR2, c IN OUT NOCOPY CLOB), + MEMBER FUNCTION get_Blob(key VARCHAR2) RETURN BLOB, + MEMBER PROCEDURE get_Blob(key VARCHAR2, b IN OUT NOCOPY BLOB), + MEMBER FUNCTION get_Type(key VARCHAR2) RETURN VARCHAR2, + MEMBER FUNCTION get_Keys RETURN JSON_KEY_LIST +) FINAL;]'; + $end + +END; +/ \ No newline at end of file diff --git a/source/expectations/matchers/ut_equal.tpb b/source/expectations/matchers/ut_equal.tpb index a666caaa3..9df566af7 100644 --- a/source/expectations/matchers/ut_equal.tpb +++ b/source/expectations/matchers/ut_equal.tpb @@ -152,6 +152,12 @@ create or replace type body ut_equal as return; end; + constructor function ut_equal(self in out nocopy ut_equal, a_expected json_element_t, a_nulls_are_equal boolean := null) return self as result is + begin + init(ut_data_value_json(a_expected), a_nulls_are_equal); + return; + end; + member function include(a_items varchar2) return ut_equal is l_result ut_equal := self; begin @@ -237,17 +243,17 @@ create or replace type body ut_equal as l_result varchar2(32767); begin if self.expected.data_type = a_actual.data_type and self.expected.is_diffable then - if self.expected is of (ut_data_value_refcursor) then l_result := 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() - || chr(10) || 'Diff:' || - treat(expected as ut_data_value_refcursor).diff( a_actual, options ); + || chr(10) || 'Diff:' || + case + when self.expected is of (ut_data_value_refcursor) then + treat(expected as ut_data_value_refcursor).diff( a_actual, options ) + when self.expected is of (ut_data_value_json) then + treat(expected as ut_data_value_json).diff( a_actual, options ) else - l_result := - 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() - || chr(10) || 'Diff:' || - expected.diff( a_actual, options ); - end if; + expected.diff( a_actual, options ) + end; else l_result := (self as ut_matcher).failure_message(a_actual) || ': '|| self.expected.to_string_report(); end if; diff --git a/source/expectations/matchers/ut_equal.tps b/source/expectations/matchers/ut_equal.tps index 68997fbcc..6158a6fd3 100644 --- a/source/expectations/matchers/ut_equal.tps +++ b/source/expectations/matchers/ut_equal.tps @@ -41,6 +41,7 @@ create or replace type ut_equal force under ut_comparison_matcher( constructor function ut_equal(self in out nocopy ut_equal, a_expected varchar2, a_nulls_are_equal boolean := null) return self as result, constructor function ut_equal(self in out nocopy ut_equal, a_expected yminterval_unconstrained, a_nulls_are_equal boolean := null) return self as result, constructor function ut_equal(self in out nocopy ut_equal, a_expected dsinterval_unconstrained, a_nulls_are_equal boolean := null) return self as result, + constructor function ut_equal(self in out nocopy ut_equal, a_expected json_element_t, a_nulls_are_equal boolean := null) return self as result, member function include(a_items varchar2) return ut_equal, member function include(a_items ut_varchar2_list) return ut_equal, member function exclude(a_items varchar2) return ut_equal, diff --git a/source/expectations/matchers/ut_have_count.tpb b/source/expectations/matchers/ut_have_count.tpb index 135a948d5..1cca8a228 100644 --- a/source/expectations/matchers/ut_have_count.tpb +++ b/source/expectations/matchers/ut_have_count.tpb @@ -28,6 +28,8 @@ create or replace type body ut_have_count as begin if a_actual is of(ut_data_value_refcursor) and ( treat (a_actual as ut_data_value_refcursor).compound_type != 'object') then l_result := ( self.expected = treat(a_actual as ut_data_value_refcursor).elements_count ); + elsif a_actual is of(ut_data_value_json) then + l_result := ( self.expected = treat(a_actual as ut_data_value_json).get_elements_count ); else l_result := (self as ut_matcher).run_matcher(a_actual); end if; @@ -36,12 +38,16 @@ create or replace type body ut_have_count as overriding member function failure_message(a_actual ut_data_value) return varchar2 is begin - return 'Actual: (' || a_actual.get_object_info()||') was expected to have [ count = '||ut_utils.to_string(self.expected)||' ]'; + return 'Actual: (' || case when a_actual is of (ut_data_value_json) then + treat(a_actual as ut_data_value_json).get_json_count_info() else a_actual.get_object_info() end|| + ') was expected to have [ count = '||ut_utils.to_string(self.expected)||' ]'; end; overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2 is begin - return 'Actual: ' || a_actual.get_object_info()||' was expected not to have [ count = '||ut_utils.to_string(self.expected)||' ]'; + return 'Actual: ' || case when a_actual is of (ut_data_value_json) then + treat(a_actual as ut_data_value_json).get_json_count_info() else a_actual.get_object_info() end|| + ' was expected not to have [ count = '||ut_utils.to_string(self.expected)||' ]'; end; end; diff --git a/source/expectations/ut_expectation.tpb b/source/expectations/ut_expectation.tpb index 54de82b47..a94dadbc7 100644 --- a/source/expectations/ut_expectation.tpb +++ b/source/expectations/ut_expectation.tpb @@ -186,6 +186,10 @@ create or replace type body ut_expectation as self.to_( ut_equal(a_expected, a_nulls_are_equal) ); end; + member procedure to_equal(self in ut_expectation, a_expected json_element_t, a_nulls_are_equal boolean := null) is + begin + self.to_( ut_equal(a_expected, a_nulls_are_equal) ); + end; member procedure not_to_equal(self in ut_expectation, a_expected anydata, a_nulls_are_equal boolean := null) is begin @@ -288,6 +292,10 @@ create or replace type body ut_expectation as self.not_to( ut_equal(a_expected, a_nulls_are_equal) ); end; + member procedure not_to_equal(self in ut_expectation, a_expected json_element_t, a_nulls_are_equal boolean := null) is + begin + self.not_to( ut_equal(a_expected, a_nulls_are_equal) ); + end; member procedure to_be_like(self in ut_expectation, a_mask in varchar2, a_escape_char in varchar2 := null) is begin @@ -700,6 +708,6 @@ create or replace type body ut_expectation as begin self.not_to( ut_contain(a_expected).negated() ); end; - + end; / diff --git a/source/expectations/ut_expectation.tps b/source/expectations/ut_expectation.tps index eae74202e..79d81f106 100644 --- a/source/expectations/ut_expectation.tps +++ b/source/expectations/ut_expectation.tps @@ -51,6 +51,7 @@ create or replace type ut_expectation authid current_user as object( member procedure to_equal(self in ut_expectation, a_expected varchar2, a_nulls_are_equal boolean := null), member procedure to_equal(self in ut_expectation, a_expected yminterval_unconstrained, a_nulls_are_equal boolean := null), member procedure to_equal(self in ut_expectation, a_expected dsinterval_unconstrained, a_nulls_are_equal boolean := null), + member procedure to_equal(self in ut_expectation, a_expected json_element_t, a_nulls_are_equal boolean := null), member procedure not_to_equal(self in ut_expectation, a_expected anydata, a_nulls_are_equal boolean := null), member procedure not_to_equal(self in ut_expectation, a_expected anydata, a_exclude varchar2, a_nulls_are_equal boolean := null), @@ -69,6 +70,7 @@ create or replace type ut_expectation authid current_user as object( member procedure not_to_equal(self in ut_expectation, a_expected varchar2, a_nulls_are_equal boolean := null), member procedure not_to_equal(self in ut_expectation, a_expected yminterval_unconstrained, a_nulls_are_equal boolean := null), member procedure not_to_equal(self in ut_expectation, a_expected dsinterval_unconstrained, a_nulls_are_equal boolean := null), + member procedure not_to_equal(self in ut_expectation, a_expected json_element_t, a_nulls_are_equal boolean := null), member procedure to_be_like(self in ut_expectation, a_mask in varchar2, a_escape_char in varchar2 := null), diff --git a/source/expectations/ut_expectation_json.tpb b/source/expectations/ut_expectation_json.tpb new file mode 100644 index 000000000..d015aa5f4 --- /dev/null +++ b/source/expectations/ut_expectation_json.tpb @@ -0,0 +1,61 @@ +create or replace type body ut_expectation_json as + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + constructor function ut_expectation_json(self in out nocopy ut_expectation_json, a_actual_data ut_data_value, a_description varchar2) return self as result is + begin + self.actual_data := a_actual_data; + self.description := a_description; + return; + end; + + member procedure to_be_empty(self in ut_expectation_json) is + begin + self.to_( ut_be_empty() ); + end; + + member procedure not_to_be_empty(self in ut_expectation_json) is + begin + self.not_to( ut_be_empty() ); + end; + + member function to_equal(a_expected json_element_t, a_nulls_are_equal boolean := null) return ut_expectation_json is + l_result ut_expectation_json := self; + begin + l_result.matcher := ut_equal(a_expected, a_nulls_are_equal); + return l_result; + end; + + member function not_to_equal(a_expected json_element_t, a_nulls_are_equal boolean := null) return ut_expectation_json is + l_result ut_expectation_json := self; + begin + l_result.matcher := ut_equal(a_expected, a_nulls_are_equal).negated(); + return l_result; + end; + + member procedure to_have_count(self in ut_expectation_json, a_expected integer) is + begin + self.to_( ut_have_count(a_expected) ); + end; + + member procedure not_to_have_count(self in ut_expectation_json, a_expected integer) is + begin + self.not_to( ut_have_count(a_expected) ); + end; + +end; +/ diff --git a/source/expectations/ut_expectation_json.tps b/source/expectations/ut_expectation_json.tps new file mode 100644 index 000000000..d032d7851 --- /dev/null +++ b/source/expectations/ut_expectation_json.tps @@ -0,0 +1,29 @@ +create or replace type ut_expectation_json under ut_expectation( + /* + utPLSQL - Version 3 + Copyright 2016 - 2018 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + matcher ut_matcher, + + constructor function ut_expectation_json(self in out nocopy ut_expectation_json, a_actual_data ut_data_value, a_description varchar2) return self as result, + + member procedure to_be_empty(self in ut_expectation_json), + member procedure not_to_be_empty(self in ut_expectation_json), + member function to_equal(a_expected json_element_t , a_nulls_are_equal boolean := null) return ut_expectation_json, + member function not_to_equal(a_expected json_element_t , a_nulls_are_equal boolean := null) return ut_expectation_json, + member procedure to_have_count(self in ut_expectation_json, a_expected integer), + member procedure not_to_have_count(self in ut_expectation_json, a_expected integer) +) +/ diff --git a/source/install.sql b/source/install.sql index e6ccf7d28..842172a5f 100644 --- a/source/install.sql +++ b/source/install.sql @@ -34,6 +34,7 @@ alter session set current_schema = &&ut3_owner; @@check_sys_grants.sql "'CREATE TYPE','CREATE VIEW','CREATE SYNONYM','CREATE SEQUENCE','CREATE PROCEDURE','CREATE TABLE'" --set define off + --dbms_output buffer cache table @@install_component.sql 'core/ut_dbms_output_cache.sql' @@ -84,6 +85,8 @@ alter session set current_schema = &&ut3_owner; @@install_component.sql 'core/types/ut_reporter_base.tps' @@install_component.sql 'core/types/ut_reporters.tps' + +@@install_component.sql 'expectations/json_objects_specs.sql' @@install_component.sql 'expectations/matchers/ut_matcher_options_items.tps' @@install_component.sql 'expectations/matchers/ut_matcher_options.tps' @@install_component.sql 'expectations/data_values/ut_data_value.tps' @@ -196,7 +199,11 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema --expectations and matchers @@install_component.sql 'expectations/data_values/ut_compound_data_tmp.sql' @@install_component.sql 'expectations/data_values/ut_compound_data_diff_tmp.sql' +@@install_component.sql 'expectations/data_values/ut_json_data_diff_tmp.sql' @@install_component.sql 'expectations/data_values/ut_compound_data_value.tps' +@@install_component.sql 'expectations/data_values/ut_json_leaf.tps' +@@install_component.sql 'expectations/data_values/ut_json_leaf_tab.tps' +@@install_component.sql 'expectations/data_values/ut_json_tree_details.tps' @@install_component.sql 'expectations/data_values/ut_cursor_column.tps' @@install_component.sql 'expectations/data_values/ut_cursor_column_tab.tps' @@install_component.sql 'expectations/data_values/ut_cursor_details.tps' @@ -215,6 +222,7 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/data_values/ut_data_value_yminterval.tps' @@install_component.sql 'expectations/data_values/ut_data_value_xmltype.tps' @@install_component.sql 'expectations/data_values/ut_compound_data_helper.pks' +@@install_component.sql 'expectations/data_values/ut_data_value_json.tps' @@install_component.sql 'expectations/matchers/ut_matcher.tps' @@install_component.sql 'expectations/matchers/ut_comparison_matcher.tps' @@install_component.sql 'expectations/matchers/ut_be_false.tps' @@ -233,9 +241,12 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/matchers/ut_be_empty.tps' @@install_component.sql 'expectations/matchers/ut_match.tps' @@install_component.sql 'expectations/ut_expectation.tps' +@@install_component.sql 'expectations/data_values/ut_json_leaf.tpb' +@@install_component.sql 'expectations/data_values/ut_json_tree_details.tpb' @@install_component.sql 'expectations/data_values/ut_cursor_column.tpb' @@install_component.sql 'expectations/data_values/ut_cursor_details.tpb' @@install_component.sql 'expectations/ut_expectation_compound.tps' +@@install_component.sql 'expectations/ut_expectation_json.tps' @@install_component.sql 'expectations/matchers/ut_matcher_options_items.tpb' @@install_component.sql 'expectations/matchers/ut_matcher_options.tpb' @@ -256,6 +267,7 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/data_values/ut_data_value_varchar2.tpb' @@install_component.sql 'expectations/data_values/ut_data_value_yminterval.tpb' @@install_component.sql 'expectations/data_values/ut_data_value_xmltype.tpb' +@@install_component.sql 'expectations/data_values/ut_data_value_json.tpb' @@install_component.sql 'expectations/matchers/ut_matcher.tpb' @@install_component.sql 'expectations/matchers/ut_comparison_matcher.tpb' @@install_component.sql 'expectations/matchers/ut_be_false.tpb' @@ -275,6 +287,7 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/matchers/ut_match.tpb' @@install_component.sql 'expectations/ut_expectation.tpb' @@install_component.sql 'expectations/ut_expectation_compound.tpb' +@@install_component.sql 'expectations/ut_expectation_json.tpb' @@install_component.sql 'expectations/data_values/ut_key_anyvalues.tpb' --core reporter diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index f34b964de..a7e6b947e 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -82,6 +82,8 @@ drop table ut_dbms_output_cache purge; drop type ut_expectation_compound force; +drop type ut_expectation_json force; + drop type ut_expectation force; drop package ut_expectation_processor; @@ -132,6 +134,8 @@ drop type ut_data_value_number force; drop type ut_data_value_refcursor force; +drop type ut_data_value_json force; + drop type ut_data_value_dsinterval force; drop type ut_data_value_date force; @@ -152,6 +156,12 @@ drop type ut_matcher_options force; drop type ut_matcher_options_items force; +drop type ut_json_tree_details force; + +drop type ut_json_leaf_tab force; + +drop type ut_json_leaf; + drop type ut_cursor_details force; drop type ut_cursor_column_tab force; @@ -162,6 +172,8 @@ drop table ut_compound_data_tmp purge; drop table ut_compound_data_diff_tmp purge; +drop table ut_json_data_diff_tmp; + drop trigger ut_trigger_annotation_parsing; drop package ut_annotation_manager; @@ -198,6 +210,15 @@ drop package ut_metadata; drop package ut_ansiconsole_helper; +begin + $if dbms_db_version.version = 12 and dbms_db_version.release = 1 or dbms_db_version.version < 12 $then + execute immediate 'drop type json_element_t force'; + $else + dbms_output.put_line('Nothing to drop'); + $end +end; +/ + drop package ut_utils; drop sequence ut_savepoint_seq; diff --git a/test/install_ut3_user_tests.sql b/test/install_ut3_user_tests.sql index 67014f815..b7361e4aa 100644 --- a/test/install_ut3_user_tests.sql +++ b/test/install_ut3_user_tests.sql @@ -23,6 +23,9 @@ prompt Install user tests @@ut3_user/expectations/test_matchers.pks @@ut3_user/expectations/test_expectation_anydata.pks @@ut3_user/expectations/test_expectations_cursor.pks +set define on +@@install_above_12_1.sql 'ut3_user/expectations/test_expectations_json.pks' +set define off @@ut3_user/api/test_ut_runner.pks @@ut3_user/api/test_ut_run.pks @@ut3_user/reporters.pks @@ -61,6 +64,9 @@ set define off @@ut3_user/expectations/test_matchers.pkb @@ut3_user/expectations/test_expectation_anydata.pkb @@ut3_user/expectations/test_expectations_cursor.pkb +set define on +@@install_above_12_1.sql 'ut3_user/expectations/test_expectations_json.pkb' +set define off @@ut3_user/api/test_ut_runner.pkb @@ut3_user/api/test_ut_run.pkb @@ut3_user/reporters.pkb diff --git a/test/ut3_user/expectations/test_expectations_json.pkb b/test/ut3_user/expectations/test_expectations_json.pkb new file mode 100644 index 000000000..6214d2237 --- /dev/null +++ b/test/ut3_user/expectations/test_expectations_json.pkb @@ -0,0 +1,1609 @@ +create or replace package body test_expectations_json is + + procedure cleanup_expectations is + begin + ut3_tester_helper.main_helper.clear_expectations( ); + end; + + procedure success_on_same_data + as + l_expected json_element_t; + l_actual json_element_t; + begin + -- Arrange + l_actual := json_element_t.parse(' { + "Actors": [ + { + "name": "Tom Cruise", + "age": 56, + "Born At": "Syracuse, NY", + "Birthdate": "July 3, 1962", + "photo": "https://jsonformatter.org/img/tom-cruise.jpg", + "wife": null, + "weight": 67.5, + "hasChildren": true, + "hasGreyHair": false, + "children": [ + "Suri", + "Isabella Jane", + "Connor" + ] + }, + { + "name": "Robert Downey Jr.", + "age": 53, + "Born At": "New York City, NY", + "Birthdate": "April 4, 1965", + "photo": "https://jsonformatter.org/img/Robert-Downey-Jr.jpg", + "wife": "Susan Downey", + "weight": 77.1, + "hasChildren": true, + "hasGreyHair": false, + "children": [ + "Indio Falconer", + "Avri Roel", + "Exton Elias" + ] + } + ] + }'); + + --Act + ut3.ut.expect( l_actual ).to_equal( l_actual ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure fail_on_diff_data + as + l_expected json_element_t; + l_actual json_element_t; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + -- Arrange + l_expected := json_element_t.parse('{"Aidan Gillen": {"array": ["Game of Thrones","The Wire"],"string": "some string","int": "2","otherint": 4, "aboolean": "true", "boolean": false,"object": {"foo": "bar"}},"Amy Ryan": ["In Treatment","The Wire"],"Annie Fitzgerald": ["True Blood","Big Love","The Sopranos","Oz"],"Anwan Glover": ["Treme","The Wire"],"Alexander Skarsg?rd": ["Generation Kill","True Blood"],"Alice Farmer": ["The Corner","Oz","The Wire"]}'); + l_actual := json_element_t.parse('{"Aidan Gillen": {"array": ["Game of Thron\"es","The Wire"],"string": "some string","int": 2,"aboolean": true, "boolean": true,"object": {"foo": "bar","object1": {"new prop1": "new prop value"},"object2": {"new prop1": "new prop value"},"object3": {"new prop1": "new prop value"},"object4": {"new prop1": "new prop value"}}},"Amy Ryan": {"one": "In Treatment","two": "The Wire"},"Annie Fitzgerald": ["Big Love","True Blood"],"Anwan Glover": ["Treme","The Wire"],"Alexander Skarsgard": ["Generation Kill","True Blood"], "Clarke Peters": null}'); + + --Act + ut3.ut.expect( l_actual ).to_equal( l_expected ); + --Assert + l_expected_message := q'[%Diff: 20 differences found +%3 incorrect types, 4 unequal values, 13 missing properties +%Missing property: "Alexander Skarsg?rd" on path: $ +%Extra property: "Alexander Skarsgard" on path: $ +%Missing property: "Alice Farmer" on path: $ +%Extra property: "Clarke Peters" on path: $ +%Extra property: "one" on path: $."Amy Ryan" +%Missing property: "The Sopranos" on path: $."Annie Fitzgerald"[2] +%Extra property: "two" on path: $."Amy Ryan" +%Missing property: "Oz" on path: $."Annie Fitzgerald"[3] +%Missing property: "otherint" on path: $."Aidan Gillen" +%Extra property: "object1" on path: $."Aidan Gillen"."object" +%Extra property: "object2" on path: $."Aidan Gillen"."object" +%Extra property: "object3" on path: $."Aidan Gillen"."object" +%Extra property: "object4" on path: $."Aidan Gillen"."object" +%Actual type: 'array' was expected to be: 'object' on path: $."Amy Ryan" +%Actual type: 'string' was expected to be: 'number' on path: $."Aidan Gillen"."int" +%Actual type: 'string' was expected to be: 'boolean' on path: $."Aidan Gillen"."aboolean" +%Actual value: "True Blood" was expected to be: "Big Love" on path: $."Annie Fitzgerald"[0] +%Actual value: "Big Love" was expected to be: "True Blood" on path: $."Annie Fitzgerald"[1] +%Actual value: FALSE was expected to be: TRUE on path: $."Aidan Gillen"."boolean" +%Actual value: "Game of Thrones" was expected to be: "Game of Thron\"es" on path: $."Aidan Gillen"."array"[0]%]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure null_json_variable + as + l_expected json_object_t ; + begin + -- Arrange + l_expected := cast (null as json_object_t ); + + --Act + ut3.ut.expect( l_expected ).to_be_null; + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure not_null_json_variable + as + l_expected json_object_t ; + begin + -- Arrange + l_expected := json_object_t(); + + --Act + ut3.ut.expect( l_expected ).not_to_be_null; + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure fail_null_json_var + as + l_expected json_object_t ; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + -- Arrange + l_expected := json_object_t('{ "t" : "1" }'); + + --Act + ut3.ut.expect( l_expected ).to_be_null; + --Assert + l_expected_message := q'[%Actual: (json) +%'{"t":"1"}' +%was expected to be null%]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure fail_not_null_json_var + as + l_expected json_object_t; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + -- Arrange + l_expected := cast (null as json_object_t ); + + --Act + ut3.ut.expect( l_expected ).not_to_be_null; + --Assert + l_expected_message := q'[%Actual: NULL (json) was expected not to be null%]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure empty_json + as + l_expected json_object_t; + begin + -- Arrange + l_expected := json_object_t(); + + --Act + ut3.ut.expect( l_expected ).to_be_empty; + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure not_empty_json + as + l_expected json_object_t; + begin + -- Arrange + l_expected := json_object_t.parse('{ "name" : "test" }'); + + --Act + ut3.ut.expect( l_expected ).not_to_be_empty; + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure fail_empty_json + as + l_expected json_object_t; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + -- Arrange + l_expected := json_object_t.parse('{ "name" : "test" }'); + + --Act + ut3.ut.expect( l_expected ).to_be_empty; + --Assert + l_expected_message := q'[%Actual: (json) +%'{"name":"test"}' +%was expected to be empty%]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure fail_not_empty_json + as + l_expected json_object_t; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + -- Arrange + l_expected := json_object_t(); + + --Act + ut3.ut.expect( l_expected ).not_to_be_empty; + --Assert + l_expected_message := q'[%Actual: (json) +%'{}' +%was expected not to be empty%]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure to_have_count as + l_actual json_element_t; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + -- Arrange + l_actual := json_element_t.parse('{"Aidan Gillen": {"array": ["Game of Thrones","The Wire"],"string": "some string","int": "2","otherint": 4, "aboolean": "true", "boolean": false,"object": {"foo": "bar"}},"Amy Ryan": ["In Treatment","The Wire"],"Annie Fitzgerald": ["True Blood","Big Love","The Sopranos","Oz"],"Anwan Glover": ["Treme","The Wire"],"Alexander Skarsg?rd": ["Generation Kill","True Blood"],"Alice Farmer": ["The Corner","Oz","The Wire"]}'); + + --Act + ut3.ut.expect( l_actual ).to_have_count( 6 ); + + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + + end; + + procedure fail_to_have_count + as + l_actual json_element_t; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + -- Arrange + l_actual := json_element_t.parse('{"Aidan Gillen": {"array": ["Game of Thrones","The Wire"],"string": "some string","int": "2","otherint": 4, "aboolean": "true", "boolean": false,"object": {"foo": "bar"}},"Amy Ryan": ["In Treatment","The Wire"],"Annie Fitzgerald": ["True Blood","Big Love","The Sopranos","Oz"],"Anwan Glover": ["Treme","The Wire"],"Alexander Skarsg?rd": ["Generation Kill","True Blood"],"Alice Farmer": ["The Corner","Oz","The Wire"]}'); + + --Act + ut3.ut.expect( l_actual ).to_have_count( 2 ); + --Assert + l_expected_message := q'[%Actual: (json [ count = 6 ]) was expected to have [ count = 2 ]%]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + + end; + + procedure not_to_have_count + as + l_actual json_element_t; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + -- Arrange + l_actual := json_element_t.parse('{"Aidan Gillen": {"array": ["Game of Thrones","The Wire"],"string": "some string","int": "2","otherint": 4, "aboolean": "true", "boolean": false,"object": {"foo": "bar"}},"Amy Ryan": ["In Treatment","The Wire"],"Annie Fitzgerald": ["True Blood","Big Love","The Sopranos","Oz"],"Anwan Glover": ["Treme","The Wire"],"Alexander Skarsg?rd": ["Generation Kill","True Blood"],"Alice Farmer": ["The Corner","Oz","The Wire"]}'); + + --Act + ut3.ut.expect( l_actual ).not_to_have_count( 7 ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure fail_not_to_have_count + as + l_actual json_element_t; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + -- Arrange + l_actual := json_element_t.parse('{"Aidan Gillen": {"array": ["Game of Thrones","The Wire"],"string": "some string","int": "2","otherint": 4, "aboolean": "true", "boolean": false,"object": {"foo": "bar"}},"Amy Ryan": ["In Treatment","The Wire"],"Annie Fitzgerald": ["True Blood","Big Love","The Sopranos","Oz"],"Anwan Glover": ["Treme","The Wire"],"Alexander Skarsg?rd": ["Generation Kill","True Blood"],"Alice Farmer": ["The Corner","Oz","The Wire"]}'); + + --Act + ut3.ut.expect( l_actual ).not_to_have_count( 6 ); + --Assert + l_expected_message := q'[%Actual: json [ count = 6 ] was expected not to have [ count = 6 ]%]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure to_have_count_array + as + l_actual json_element_t; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + -- Arrange + l_actual := json_element_t.parse('["Game of Thrones","The Wire"]'); + + --Act + ut3.ut.expect( l_actual ).to_have_count( 2 ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure to_diff_json_extract_same + as + l_expected json_object_t; + l_actual json_object_t; + BEGIN + -- Arrange + l_expected := json_object_t.parse(' { + "Actors": [ + { + "name": "Tom Cruise", + "age": 56, + "Born At": "Syracuse, NY", + "Birthdate": "July 3, 1962", + "photo": "https://jsonformatter.org/img/tom-cruise.jpg", + "wife": null, + "weight": 67.5, + "hasChildren": true, + "hasGreyHair": false, + "children": [ + "Suri", + "Isabella Jane", + "Connor" + ] + }, + { + "name": "Robert Downey Jr.", + "age": 53, + "Born At": "New York City, NY", + "Birthdate": "April 4, 1965", + "photo": "https://jsonformatter.org/img/Robert-Downey-Jr.jpg", + "wife": "Susan Downey", + "weight": 77.1, + "hasChildren": true, + "hasGreyHair": false, + "children": [ + "Indio Falconer", + "Avri Roel", + "Exton Elias" + ] + } + ] + }' + ); + l_actual := json_object_t.parse(' { + "Actors": + { + "name": "Krzystof Jarzyna", + "age": 53, + "Born At": "Szczecin", + "Birthdate": "April 4, 1965", + "photo": "niewidzialny", + "wife": "Susan Downey", + "children": [ + "Indio Falconer", + "Avri Roel", + "Exton Elias" + ] + } + }' + ); + + + --Act + ut3.ut.expect(json_array_t(json_query(l_actual.stringify,'$.Actors.children'))).to_equal(json_array_t(json_query(l_expected + .stringify,'$.Actors[1].children'))); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure to_diff_json_extract_diff + as + l_expected json_object_t; + l_actual json_object_t; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + -- Arrange + l_expected := json_object_t.parse(' { + "Actors": [ + { + "name": "Tom Cruise", + "age": 56, + "Born At": "Syracuse, NY", + "Birthdate": "July 3, 1962", + "photo": "https://jsonformatter.org/img/tom-cruise.jpg", + "wife": null, + "weight": 67.5, + "hasChildren": true, + "hasGreyHair": false, + "children": [ + "Suri", + "Isabella Jane", + "Connor" + ] + }, + { + "name": "Robert Downey Jr.", + "age": 53, + "Born At": "New York City, NY", + "Birthdate": "April 4, 1965", + "photo": "https://jsonformatter.org/img/Robert-Downey-Jr.jpg", + "wife": "Susan Downey", + "weight": 77.1, + "hasChildren": true, + "hasGreyHair": false, + "children": [ + "Noemi", + "Avri Roel", + "Exton Elias" + ] + } + ] + }' + ); + l_actual := json_object_t.parse(' { + "Actors": + { + "name": "Krzystof Jarzyna", + "age": 53, + "Born At": "Szczecin", + "Birthdate": "April 4, 1965", + "photo": "niewidzialny", + "wife": "Susan Downey", + "children": [ + "Indio Falconer", + "Avri Roel", + "Exton Elias" + ] + } + }' + ); + + + --Act + ut3.ut.expect(json_array_t(json_query(l_actual.stringify,'$.Actors.children'))).to_equal(json_array_t(json_query(l_expected + .stringify,'$.Actors[1].children'))); + --Assert + l_expected_message := q'[%Actual: json was expected to equal: json +%Diff: 1 differences found +%1 unequal values +%Actual value: "Noemi" was expected to be: "Indio Falconer" on path: $[0]%]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure long_json_test + as + l_actual json_element_t; + begin + l_actual := json_element_t.parse('[ + { + "_id": "5ce6dc0c3a11766d5a26f494", + "index": 0, + "guid": "a86b8b2d-216d-4061-bafa-f3820e41efbe", + "isActive": true, + "balance": "$1,754.93", + "picture": "http://placehold.it/32x32", + "age": 39, + "eyeColor": "green", + "name": "Pearlie Lott", + "gender": "female", + "company": "KOG", + "email": "pearlielott@kog.com", + "phone": "+1 (852) 567-2605", + "address": "357 Eldert Street, Benson, Montana, 5484", + "about": "Est officia consectetur reprehenderit fugiat culpa ea commodo aliqua deserunt enim eu. Exercitation adipisicing laboris nisi irure commodo dolor consectetur tempor minim sunt ullamco Lorem occaecat. Irure quis ut Lorem aliquip aute pariatur magna laboris duis veniam qui velit. Pariatur occaecat eu minim adipisicing est do. Occaecat do ipsum ut in enim quis voluptate et. Sit ea irure nulla culpa in eiusmod.\r\n", + "registered": "2018-08-24T12:46:31 -01:00", + "latitude": -22.323554, + "longitude": 139.071611, + "tags": [ + "id", + "do", + "amet", + "magna", + "est", + "veniam", + "voluptate" + ], + "friends": [ + { + "id": 0, + "name": "Tammi Lowe" + }, + { + "id": 1, + "name": "Simpson Miles" + }, + { + "id": 2, + "name": "Hogan Osborne" + } + ], + "greeting": "Hello, Pearlie Lott! You have 2 unread messages.", + "favoriteFruit": "banana" + }, + { + "_id": "5ce6dc0c2b56a6f3271fc272", + "index": 1, + "guid": "2a24b446-d11a-4a52-b6c8-86acba1dc65f", + "isActive": true, + "balance": "$1,176.58", + "picture": "http://placehold.it/32x32", + "age": 30, + "eyeColor": "brown", + "name": "Bertha Mack", + "gender": "female", + "company": "AQUAFIRE", + "email": "berthamack@aquafire.com", + "phone": "+1 (804) 504-2151", + "address": "636 Bouck Court, Cresaptown, Vermont, 5203", + "about": "Ipsum est exercitation excepteur reprehenderit ipsum. Do velit dolore minim ad. Quis amet dolor dolore exercitation sint Lorem. Exercitation nulla magna ut incididunt enim veniam voluptate Lorem velit adipisicing sunt deserunt sunt aute. Ullamco id anim Lorem dolore do labore excepteur et reprehenderit sit adipisicing sunt esse veniam. Anim laborum labore labore incididunt in labore exercitation ad occaecat amet ea quis veniam ut.\r\n", + "registered": "2017-12-29T06:00:27 -00:00", + "latitude": 75.542572, + "longitude": 147.312705, + "tags": [ + "veniam", + "sunt", + "commodo", + "ad", + "enim", + "officia", + "nisi" + ], + "friends": [ + { + "id": 0, + "name": "Riddle Williams" + }, + { + "id": 1, + "name": "Tracy Wagner" + }, + { + "id": 2, + "name": "Morrow Phillips" + } + ], + "greeting": "Hello, Bertha Mack! You have 8 unread messages.", + "favoriteFruit": "banana" + }, + { + "_id": "5ce6dc0c6d8631fbfdd2afc7", + "index": 2, + "guid": "66ca5411-4c88-4347-9972-e1016f628098", + "isActive": false, + "balance": "$2,732.22", + "picture": "http://placehold.it/32x32", + "age": 33, + "eyeColor": "blue", + "name": "Fox Morgan", + "gender": "male", + "company": "PERKLE", + "email": "foxmorgan@perkle.com", + "phone": "+1 (985) 401-3450", + "address": "801 Whitty Lane, Snyderville, Guam, 5253", + "about": "Ex officia eu Lorem velit ullamco qui cupidatat irure sunt ea ad deserunt. Officia est consequat aute labore occaecat aliquip. Velit commodo cillum incididunt cupidatat ad id veniam aute labore tempor qui culpa voluptate dolor. Occaecat in ea id labore exercitation non tempor occaecat laboris aute irure fugiat dolor mollit. Voluptate non proident officia deserunt ex et ullamco aute eiusmod cupidatat consequat elit id.\r\n", + "registered": "2015-04-02T06:40:53 -01:00", + "latitude": -27.612441, + "longitude": -134.005929, + "tags": [ + "occaecat", + "amet", + "eu", + "dolore", + "ad", + "fugiat", + "quis" + ], + "friends": [ + { + "id": 0, + "name": "Case Preston" + }, + { + "id": 1, + "name": "Pollard Dawson" + }, + { + "id": 2, + "name": "Frye Mann" + } + ], + "greeting": "Hello, Fox Morgan! You have 2 unread messages.", + "favoriteFruit": "apple" + }, + { + "_id": "5ce6dc0c0a7fea91e0a1fdf5", + "index": 3, + "guid": "f895a236-fc0d-4c08-b2f0-9d1638dc256d", + "isActive": true, + "balance": "$2,746.32", + "picture": "http://placehold.it/32x32", + "age": 34, + "eyeColor": "green", + "name": "Deleon Tucker", + "gender": "male", + "company": "ZANILLA", + "email": "deleontucker@zanilla.com", + "phone": "+1 (883) 415-2709", + "address": "540 Vandam Street, Chical, Wyoming, 5181", + "about": "Consectetur consectetur sint Lorem non id. Fugiat reprehenderit nulla dolore nisi culpa esse ea. Ad occaecat qui magna proident ex pariatur aliquip adipisicing do aute aute sunt. Aliqua aliqua et exercitation sunt ut adipisicing.\r\n", + "registered": "2017-10-08T09:05:49 -01:00", + "latitude": 34.893845, + "longitude": 110.699256, + "tags": [ + "culpa", + "sunt", + "sit", + "ut", + "eiusmod", + "laboris", + "ullamco" + ], + "friends": [ + { + "id": 0, + "name": "Bernadine Pennington" + }, + { + "id": 1, + "name": "Latoya Bradshaw" + }, + { + "id": 2, + "name": "Iva Caldwell" + } + ], + "greeting": "Hello, Deleon Tucker! You have 7 unread messages.", + "favoriteFruit": "banana" + }, + { + "_id": "5ce6dc0c18bc92716a12a8e4", + "index": 4, + "guid": "6ed45f42-1a2b-48b2-89ce-5fdb2505343b", + "isActive": true, + "balance": "$1,049.96", + "picture": "http://placehold.it/32x32", + "age": 30, + "eyeColor": "blue", + "name": "Schwartz Norman", + "gender": "male", + "company": "UPDAT", + "email": "schwartznorman@updat.com", + "phone": "+1 (826) 404-3309", + "address": "925 Harman Street, Cornucopia, Georgia, 5748", + "about": "Qui Lorem ullamco veniam irure aliquip amet exercitation. Velit nisi id laboris adipisicing in esse adipisicing commodo cillum do exercitation tempor. Consequat tempor dolor minim consequat minim ad do tempor excepteur.\r\n", + "registered": "2014-08-10T08:34:27 -01:00", + "latitude": 27.35547, + "longitude": -77.343791, + "tags": [ + "reprehenderit", + "nisi", + "duis", + "fugiat", + "id", + "non", + "laboris" + ], + "friends": [ + { + "id": 0, + "name": "Dora Combs" + }, + { + "id": 1, + "name": "Emerson Wade" + }, + { + "id": 2, + "name": "Alma Mccormick" + } + ], + "greeting": "Hello, Schwartz Norman! You have 1 unread messages.", + "favoriteFruit": "apple" + }, + { + "_id": "5ce6dc0cb7ae44eb76c3e5fd", + "index": 5, + "guid": "0516df27-73db-42a8-b2c3-d34bd976e031", + "isActive": false, + "balance": "$3,679.94", + "picture": "http://placehold.it/32x32", + "age": 32, + "eyeColor": "brown", + "name": "Christi Oneal", + "gender": "female", + "company": "SUREPLEX", + "email": "christioneal@sureplex.com", + "phone": "+1 (985) 408-3098", + "address": "640 Fayette Street, Dennard, Washington, 7962", + "about": "Dolore fugiat sit non dolore nostrud mollit enim id sint culpa do reprehenderit ad. Velit occaecat incididunt nostrud aliqua incididunt do cillum occaecat laboris quis duis. Non tempor culpa aliquip est est consectetur ullamco elit. Voluptate et sit do et. Amet sit irure eu ex enim nulla anim deserunt ut. Sit aute ea ut fugiat eu tempor Lorem.\r\n", + "registered": "2015-05-10T09:24:56 -01:00", + "latitude": 43.343805, + "longitude": 79.535043, + "tags": [ + "occaecat", + "laboris", + "nulla", + "nisi", + "dolore", + "cillum", + "dolore" + ], + "friends": [ + { + "id": 0, + "name": "Marquez Wiggins" + }, + { + "id": 1, + "name": "Mai Fischer" + }, + { + "id": 2, + "name": "Newman Davenport" + } + ], + "greeting": "Hello, Christi Oneal! You have 8 unread messages.", + "favoriteFruit": "strawberry" + } +]'); + + --Act + ut3.ut.expect( l_actual ).to_equal( l_actual ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure json_same_diffrent_ord + as + l_expected json_element_t; + l_actual json_element_t; + begin + -- Arrange + l_expected := json_element_t.parse('{ + "records": [ + {"field1": "outer", "field2": "thought"}, + {"field2": "thought", "field1": "outer"} + ] , + "special message": "hello, world!" +}'); + l_actual := json_element_t.parse('{ + "special message": "hello, world!" , + "records": [ + {"field2": "thought" ,"field1": "outer"}, + {"field1": "outer" , "field2": "thought"} + ] +}'); + + --Act + ut3.ut.expect( l_actual ).to_equal( l_expected ); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure long_json_test2 + as + l_actual json_element_t; + begin + l_actual := json_element_t.parse('[ + { + "_id":"5ce6dc0c3a11766d5a26f494", + "index":0, + "guid":"a86b8b2d-216d-4061-bafa-f3820e41efbe", + "isActive":true, + "balance":"$1,754.93", + "picture":"http://placehold.it/32x32", + "age":39, + "eyeColor":"green", + "name":"Pearlie Lott", + "gender":"female", + "company":"KOG", + "email":"pearlielott@kog.com", + "phone":"+1 (852) 567-2605", + "address":"357 Eldert Street, Benson, Montana, 5484", + "about":"Est officia consectetur reprehenderit fugiat culpa ea commodo aliqua deserunt enim eu. Exercitation adipisicing laboris nisi irure commodo dolor consectetur tempor minim sunt ullamco Lorem occaecat. Irure quis ut Lorem aliquip aute pariatur magna laboris duis veniam qui velit. Pariatur occaecat eu minim adipisicing est do. Occaecat do ipsum ut in enim quis voluptate et. Sit ea irure nulla culpa in eiusmod.\r\n", + "registered":"2018-08-24T12:46:31 -01:00", + "latitude":-22.323554, + "longitude":139.071611, + "tags":[ + "id", + "do", + "amet", + "magna", + "est", + "veniam", + "voluptate" + ], + "friends":[ + { + "id":0, + "name":"Tammi Lowe" + }, + { + "id":1, + "name":"Simpson Miles" + }, + { + "id":2, + "name":"Hogan Osborne" + } + ], + "greeting":"Hello, Pearlie Lott! You have 2 unread messages.", + "favoriteFruit":"banana" + }, + { + "_id":"5ce6dc0c2b56a6f3271fc272", + "index":1, + "guid":"2a24b446-d11a-4a52-b6c8-86acba1dc65f", + "isActive":true, + "balance":"$1,176.58", + "picture":"http://placehold.it/32x32", + "age":30, + "eyeColor":"brown", + "name":"Bertha Mack", + "gender":"female", + "company":"AQUAFIRE", + "email":"berthamack@aquafire.com", + "phone":"+1 (804) 504-2151", + "address":"636 Bouck Court, Cresaptown, Vermont, 5203", + "about":"Ipsum est exercitation excepteur reprehenderit ipsum. Do velit dolore minim ad. Quis amet dolor dolore exercitation sint Lorem. Exercitation nulla magna ut incididunt enim veniam voluptate Lorem velit adipisicing sunt deserunt sunt aute. Ullamco id anim Lorem dolore do labore excepteur et reprehenderit sit adipisicing sunt esse veniam. Anim laborum labore labore incididunt in labore exercitation ad occaecat amet ea quis veniam ut.\r\n", + "registered":"2017-12-29T06:00:27 -00:00", + "latitude":75.542572, + "longitude":147.312705, + "tags":[ + "veniam", + "sunt", + "commodo", + "ad", + "enim", + "officia", + "nisi" + ], + "friends":[ + { + "id":0, + "name":"Riddle Williams" + }, + { + "id":1, + "name":"Tracy Wagner" + }, + { + "id":2, + "name":"Morrow Phillips" + } + ], + "greeting":"Hello, Bertha Mack! You have 8 unread messages.", + "favoriteFruit":"banana" + }, + { + "_id":"5ce6dc0c6d8631fbfdd2afc7", + "index":2, + "guid":"66ca5411-4c88-4347-9972-e1016f628098", + "isActive":false, + "balance":"$2,732.22", + "picture":"http://placehold.it/32x32", + "age":33, + "eyeColor":"blue", + "name":"Fox Morgan", + "gender":"male", + "company":"PERKLE", + "email":"foxmorgan@perkle.com", + "phone":"+1 (985) 401-3450", + "address":"801 Whitty Lane, Snyderville, Guam, 5253", + "about":"Ex officia eu Lorem velit ullamco qui cupidatat irure sunt ea ad deserunt. Officia est consequat aute labore occaecat aliquip. Velit commodo cillum incididunt cupidatat ad id veniam aute labore tempor qui culpa voluptate dolor. Occaecat in ea id labore exercitation non tempor occaecat laboris aute irure fugiat dolor mollit. Voluptate non proident officia deserunt ex et ullamco aute eiusmod cupidatat consequat elit id.\r\n", + "registered":"2015-04-02T06:40:53 -01:00", + "latitude":-27.612441, + "longitude":-134.005929, + "tags":[ + "occaecat", + "amet", + "eu", + "dolore", + "ad", + "fugiat", + "quis" + ], + "friends":[ + { + "id":0, + "name":"Case Preston" + }, + { + "id":1, + "name":"Pollard Dawson" + }, + { + "id":2, + "name":"Frye Mann" + } + ], + "greeting":"Hello, Fox Morgan! You have 2 unread messages.", + "favoriteFruit":"apple" + }, + { + "_id":"5ce6dc0c0a7fea91e0a1fdf5", + "index":3, + "guid":"f895a236-fc0d-4c08-b2f0-9d1638dc256d", + "isActive":true, + "balance":"$2,746.32", + "picture":"http://placehold.it/32x32", + "age":34, + "eyeColor":"green", + "name":"Deleon Tucker", + "gender":"male", + "company":"ZANILLA", + "email":"deleontucker@zanilla.com", + "phone":"+1 (883) 415-2709", + "address":"540 Vandam Street, Chical, Wyoming, 5181", + "about":"Consectetur consectetur sint Lorem non id. Fugiat reprehenderit nulla dolore nisi culpa esse ea. Ad occaecat qui magna proident ex pariatur aliquip adipisicing do aute aute sunt. Aliqua aliqua et exercitation sunt ut adipisicing.\r\n", + "registered":"2017-10-08T09:05:49 -01:00", + "latitude":34.893845, + "longitude":110.699256, + "tags":[ + "culpa", + "sunt", + "sit", + "ut", + "eiusmod", + "laboris", + "ullamco" + ], + "friends":[ + { + "id":0, + "name":"Bernadine Pennington" + }, + { + "id":1, + "name":"Latoya Bradshaw" + }, + { + "id":2, + "name":"Iva Caldwell" + } + ], + "greeting":"Hello, Deleon Tucker! You have 7 unread messages.", + "favoriteFruit":"banana" + }, + { + "_id":"5ce6dc0c18bc92716a12a8e4", + "index":4, + "guid":"6ed45f42-1a2b-48b2-89ce-5fdb2505343b", + "isActive":true, + "balance":"$1,049.96", + "picture":"http://placehold.it/32x32", + "age":30, + "eyeColor":"blue", + "name":"Schwartz Norman", + "gender":"male", + "company":"UPDAT", + "email":"schwartznorman@updat.com", + "phone":"+1 (826) 404-3309", + "address":"925 Harman Street, Cornucopia, Georgia, 5748", + "about":"Qui Lorem ullamco veniam irure aliquip amet exercitation. Velit nisi id laboris adipisicing in esse adipisicing commodo cillum do exercitation tempor. Consequat tempor dolor minim consequat minim ad do tempor excepteur.\r\n", + "registered":"2014-08-10T08:34:27 -01:00", + "latitude":27.35547, + "longitude":-77.343791, + "tags":[ + "reprehenderit", + "nisi", + "duis", + "fugiat", + "id", + "non", + "laboris" + ], + "friends":[ + { + "id":0, + "name":"Dora Combs" + }, + { + "id":1, + "name":"Emerson Wade" + }, + { + "id":2, + "name":"Alma Mccormick" + } + ], + "greeting":"Hello, Schwartz Norman! You have 1 unread messages.", + "favoriteFruit":"apple" + }, + { + "_id":"5ce6dc0cb7ae44eb76c3e5fd", + "index":5, + "guid":"0516df27-73db-42a8-b2c3-d34bd976e031", + "isActive":false, + "balance":"$3,679.94", + "picture":"http://placehold.it/32x32", + "age":32, + "eyeColor":"brown", + "name":"Christi Oneal", + "gender":"female", + "company":"SUREPLEX", + "email":"christioneal@sureplex.com", + "phone":"+1 (985) 408-3098", + "address":"640 Fayette Street, Dennard, Washington, 7962", + "about":"Dolore fugiat sit non dolore nostrud mollit enim id sint culpa do reprehenderit ad. Velit occaecat incididunt nostrud aliqua incididunt do cillum occaecat laboris quis duis. Non tempor culpa aliquip est est consectetur ullamco elit. Voluptate et sit do et. Amet sit irure eu ex enim nulla anim deserunt ut. Sit aute ea ut fugiat eu tempor Lorem.\r\n", + "registered":"2015-05-10T09:24:56 -01:00", + "latitude":43.343805, + "longitude":79.535043, + "tags":[ + "occaecat", + "laboris", + "nulla", + "nisi", + "dolore", + "cillum", + "dolore" + ], + "friends":[ + { + "id":0, + "name":"Marquez Wiggins" + }, + { + "id":1, + "name":"Mai Fischer" + }, + { + "id":2, + "name":"Newman Davenport" + } + ], + "greeting":"Hello, Christi Oneal! You have 8 unread messages.", + "favoriteFruit":"strawberry" + } +]'); + + --Act + ut3.ut.expect( l_actual ).to_equal( l_actual ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure long_json_diff as + l_expected json_element_t; + l_actual json_element_t; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + -- Arrange + l_expected := json_element_t.parse('[ + { + "_id": "5ce6ec46cb9977b050f15d97", + "index": 0, + "guid": "1acb2b6b-15b5-4747-a62f-db477e18df61", + "isActive": false, + "balance": "$1,443.80", + "picture": "http://placehold.it/32x32", + "age": 33, + "eyeColor": "brown", + "name": "Carson Conley", + "gender": "male", + "company": "EYEWAX", + "email": "carsonconley@eyewax.com", + "phone": "+1 (873) 520-2117", + "address": "289 Wallabout Street, Cazadero, Nevada, 4802", + "about": "Lorem aliqua veniam eiusmod exercitation anim sunt esse qui tempor officia amet nulla labore enim. Fugiat eiusmod amet exercitation incididunt mollit pariatur amet et quis et ex amet adipisicing. Elit in commodo tempor adipisicing exercitation Lorem amet cillum sint sint aliquip. Officia enim do irure velit qui officia et reprehenderit qui enim.\r\n", + "registered": "2018-08-07T05:03:13 -01:00", + "latitude": -1.973252, + "longitude": 17.835529, + "tags": [ + "dolore", + "occaecat", + "proident", + "laborum", + "nostrud", + "non", + "occaecat" + ], + "friends": [ + { + "id": 0, + "name": "Riggs Cardenas" + }, + { + "id": 1, + "name": "Duncan Schultz" + }, + { + "id": 2, + "name": "Galloway Bond" + } + ], + "greeting": "Hello, Carson Conley! You have 5 unread messages.", + "favoriteFruit": "strawberry" + }, + { + "_id": "5ce6ec469ba57bef5c421021", + "index": 1, + "guid": "59be5b73-fffe-4a4f-acea-65c5abbdb53c", + "isActive": true, + "balance": "$3,895.35", + "picture": "http://placehold.it/32x32", + "age": 21, + "eyeColor": "brown", + "name": "Melton Carroll", + "gender": "male", + "company": "ISOSPHERE", + "email": "meltoncarroll@isosphere.com", + "phone": "+1 (804) 416-2235", + "address": "114 Windsor Place, Dubois, Oklahoma, 9648", + "about": "Pariatur ea voluptate aute dolor minim laborum cillum ad reprehenderit. Mollit sint voluptate duis et culpa amet irure laborum. Nulla veniam fugiat sint proident aliquip dolore laboris nisi et. Nisi in do aliqua voluptate cupidatat enim dolor minim minim qui tempor. Eu anim ea mollit sunt esse et est cillum cillum pariatur dolor. Ea anim duis sunt eiusmod sit cillum consectetur aliquip ad et elit culpa irure commodo.\r\n", + "registered": "2018-10-20T01:38:32 -01:00", + "latitude": 46.821539, + "longitude": 19.78817, + "tags": [ + "sunt", + "aliquip", + "commodo", + "occaecat", + "mollit", + "minim", + "sint" + ], + "friends": [ + { + "id": 0, + "name": "Tameka Reese" + }, + { + "id": 1, + "name": "Rosemarie Buckley" + }, + { + "id": 2, + "name": "Houston Moran" + } + ], + "greeting": "Hello, Melton Carroll! You have 10 unread messages.", + "favoriteFruit": "strawberry" + }, + { + "_id": "5ce6ec464e6f8751e75ed29f", + "index": 2, + "guid": "42e07b71-b769-4078-b226-f79048b75bd2", + "isActive": false, + "balance": "$3,366.81", + "picture": "http://placehold.it/32x32", + "age": 23, + "eyeColor": "blue", + "name": "Kathie Cameron", + "gender": "female", + "company": "EVENTIX", + "email": "kathiecameron@eventix.com", + "phone": "+1 (949) 416-3458", + "address": "171 Henderson Walk, Barstow, American Samoa, 3605", + "about": "Lorem est mollit consequat pariatur elit. Enim adipisicing ipsum sit labore exercitation fugiat qui eu enim. Quis irure Lorem exercitation laborum sunt quis Lorem pariatur officia veniam aute officia mollit quis.\r\n", + "registered": "2015-07-15T08:40:18 -01:00", + "latitude": -12.947501, + "longitude": 51.221756, + "tags": [ + "voluptate", + "officia", + "laborum", + "nulla", + "anim", + "mollit", + "adipisicing" + ], + "friends": [ + { + "id": 0, + "name": "Noelle Leonard" + }, + { + "id": 1, + "name": "Sally Barr" + }, + { + "id": 2, + "name": "Rosie Rutledge" + } + ], + "greeting": "Hello, Kathie Cameron! You have 10 unread messages.", + "favoriteFruit": "strawberry" + }, + { + "_id": "5ce6ec4632328a654d592cb6", + "index": 3, + "guid": "6b9124a9-fbde-4c60-8dac-e296f5daa3c4", + "isActive": true, + "balance": "$2,374.96", + "picture": "http://placehold.it/32x32", + "age": 32, + "eyeColor": "brown", + "name": "Ebony Carver", + "gender": "female", + "company": "EVENTEX", + "email": "ebonycarver@eventex.com", + "phone": "+1 (816) 535-3332", + "address": "452 Lott Street, Iberia, South Carolina, 1635", + "about": "Ea cupidatat occaecat in Lorem adipisicing quis sunt. Occaecat sit Lorem eiusmod et. Velit nostrud cupidatat do exercitation. Officia esse excepteur labore aliqua fugiat dolor duis. Ullamco qui ipsum eu do nostrud et laboris magna dolor cillum. Dolore eiusmod do occaecat dolore.\r\n", + "registered": "2017-04-12T09:20:02 -01:00", + "latitude": 65.70655, + "longitude": 150.667286, + "tags": [ + "do", + "laboris", + "exercitation", + "quis", + "laboris", + "amet", + "sint" + ], + "friends": [ + { + "id": 0, + "name": "Rowena Holloway" + }, + { + "id": 1, + "name": "Lee Chang" + }, + { + "id": 2, + "name": "Delaney Kennedy" + } + ], + "greeting": "Hello, Ebony Carver! You have 10 unread messages.", + "favoriteFruit": "apple" + }, + { + "_id": "5ce6ec46d9dbfbf9b184cee7", + "index": 4, + "guid": "9dece65b-6b48-4960-880b-7795ff63c81c", + "isActive": false, + "balance": "$2,927.54", + "picture": "http://placehold.it/32x32", + "age": 27, + "eyeColor": "green", + "name": "Mae Payne", + "gender": "female", + "company": "ZEPITOPE", + "email": "maepayne@zepitope.com", + "phone": "+1 (904) 531-2930", + "address": "575 Amity Street, Eden, Iowa, 4017", + "about": "Voluptate ex enim aliqua ea et proident ipsum est anim nostrud. Duis aliquip voluptate voluptate non aliquip. Elit commodo Lorem aliqua sit elit consectetur reprehenderit in aute minim. Dolor non incididunt do tempor aliquip esse non magna anim eiusmod ut id id.\r\n", + "registered": "2016-08-29T06:23:00 -01:00", + "latitude": -60.325313, + "longitude": 88.598722, + "tags": [ + "est", + "incididunt", + "officia", + "sunt", + "eu", + "ut", + "deserunt" + ], + "friends": [ + { + "id": 0, + "name": "Taylor Walton" + }, + { + "id": 1, + "name": "Celina Mcdonald" + }, + { + "id": 2, + "name": "Berry Rivers" + } + ], + "greeting": "Hello, Mae Payne! You have 4 unread messages.", + "favoriteFruit": "strawberry" + } +]'); + l_actual := json_element_t.parse('[ + { + "_id": "5ce6ec6660565269b16cf836", + "index": 0, + "guid": "c222eda5-d925-4163-89e3-4b0e50d5e297", + "isActive": false, + "balance": "$3,626.25", + "picture": "http://placehold.it/32x32", + "age": 28, + "eyeColor": "green", + "name": "Leigh Munoz", + "gender": "female", + "company": "OATFARM", + "email": "leighmunoz@oatfarm.com", + "phone": "+1 (969) 545-2708", + "address": "218 Mersereau Court, Homeworth, Connecticut, 4423", + "about": "Eiusmod exercitation incididunt ea incididunt anim voluptate. Duis laboris ut Lorem pariatur tempor voluptate occaecat laboris. Enim duis excepteur cillum ullamco pariatur sint. Dolor labore qui ullamco deserunt do consectetur labore velit occaecat officia incididunt Lorem dolore. Pariatur dolor voluptate ex adipisicing labore quis aliquip aliquip. Culpa tempor proident nisi occaecat aliqua mollit ullamco nisi cillum ipsum exercitation quis excepteur. Consequat officia ex ipsum id consequat deserunt sunt id nostrud magna.\r\n", + "registered": "2018-10-08T10:24:07 -01:00", + "latitude": -42.796797, + "longitude": -14.220273, + "tags": [ + "ex", + "elit", + "consectetur", + "ipsum", + "aute", + "ipsum", + "Lorem" + ], + "friends": [ + { + "id": 0, + "name": "Selena Dunn" + }, + { + "id": 1, + "name": "Wilda Haynes" + }, + { + "id": 2, + "name": "Calderon Long" + } + ], + "greeting": "Hello, Leigh Munoz! You have 6 unread messages.", + "favoriteFruit": "strawberry" + }, + { + "_id": "5ce6ec66383ddbf3c400e3ed", + "index": 1, + "guid": "2e778803-50d3-411f-b34d-47d0f19d03f7", + "isActive": false, + "balance": "$2,299.28", + "picture": "http://placehold.it/32x32", + "age": 23, + "eyeColor": "blue", + "name": "Velez Drake", + "gender": "male", + "company": "GENMY", + "email": "velezdrake@genmy.com", + "phone": "+1 (870) 564-2219", + "address": "526 Erskine Loop, Websterville, Nebraska, 1970", + "about": "Consectetur Lorem do ex est dolor. Consectetur do tempor amet elit. Amet dolore cupidatat Lorem sunt reprehenderit.\r\n", + "registered": "2017-11-24T04:42:37 -00:00", + "latitude": -45.78579, + "longitude": 142.062878, + "tags": [ + "do", + "esse", + "nisi", + "sunt", + "et", + "nisi", + "nostrud" + ], + "friends": [ + { + "id": 0, + "name": "Bessie Schmidt" + }, + { + "id": 1, + "name": "Harriett Lyons" + }, + { + "id": 2, + "name": "Jerry Gonzales" + } + ], + "greeting": "Hello, Velez Drake! You have 1 unread messages.", + "favoriteFruit": "apple" + }, + { + "_id": "5ce6ec660a8b5f95ed543305", + "index": 2, + "guid": "bb0eaa88-f7fd-4b72-8538-8c0b4595bcec", + "isActive": true, + "balance": "$3,085.28", + "picture": "http://placehold.it/32x32", + "age": 36, + "eyeColor": "green", + "name": "Gallegos Dominguez", + "gender": "male", + "company": "QOT", + "email": "gallegosdominguez@qot.com", + "phone": "+1 (947) 581-3675", + "address": "375 Temple Court, Beaulieu, Minnesota, 3880", + "about": "Qui consequat est aliquip esse minim Lorem qui quis. Enim consequat anim culpa consequat ex incididunt ad incididunt est id excepteur nulla culpa. Aliqua enim enim exercitation anim velit occaecat voluptate qui minim ut ullamco fugiat. Anim voluptate nulla minim labore dolore eu veniam. Exercitation sint eiusmod aute aliqua magna aliqua pariatur Lorem velit pariatur ex duis.\r\n", + "registered": "2019-03-11T12:36:55 -00:00", + "latitude": -1.619328, + "longitude": -160.580052, + "tags": [ + "ipsum", + "reprehenderit", + "id", + "aliqua", + "ad", + "do", + "sunt" + ], + "friends": [ + { + "id": 0, + "name": "Justice Bruce" + }, + { + "id": 1, + "name": "Alta Clements" + }, + { + "id": 2, + "name": "Amy Hobbs" + } + ], + "greeting": "Hello, Gallegos Dominguez! You have 10 unread messages.", + "favoriteFruit": "strawberry" + }, + { + "_id": "5ce6ec6600fb7aaee2d1243e", + "index": 3, + "guid": "4a4363b5-9d65-4b22-9b58-a5c8c1c5bd5d", + "isActive": false, + "balance": "$3,152.70", + "picture": "http://placehold.it/32x32", + "age": 37, + "eyeColor": "green", + "name": "Bobbie Baldwin", + "gender": "female", + "company": "IDEGO", + "email": "bobbiebaldwin@idego.com", + "phone": "+1 (937) 501-3123", + "address": "271 Coles Street, Deltaville, Massachusetts, 349", + "about": "Dolor labore quis Lorem eiusmod duis adipisicing ut. Aute aute aliquip exercitation eiusmod veniam ullamco irure sit est. Ut Lorem incididunt do sint laborum cillum Lorem commodo duis. Dolor nulla ad consectetur non cillum. Est excepteur esse mollit elit laborum ullamco exercitation sit esse. Reprehenderit occaecat ad ad reprehenderit adipisicing non Lorem ipsum fugiat culpa. Do quis non exercitation ea magna elit non.\r\n", + "registered": "2014-06-25T07:44:03 -01:00", + "latitude": -70.045195, + "longitude": 117.328462, + "tags": [ + "anim", + "excepteur", + "aliqua", + "mollit", + "non", + "in", + "adipisicing" + ], + "friends": [ + { + "id": 0, + "name": "Lora Little" + }, + { + "id": 1, + "name": "Stanton Pollard" + }, + { + "id": 2, + "name": "Bernice Knowles" + } + ], + "greeting": "Hello, Bobbie Baldwin! You have 5 unread messages.", + "favoriteFruit": "apple" + }, + { + "_id": "5ce6ec660585cbb589b34fc8", + "index": 4, + "guid": "18547241-6fd0-466d-9f79-21aeb0485294", + "isActive": false, + "balance": "$3,853.86", + "picture": "http://placehold.it/32x32", + "age": 32, + "eyeColor": "blue", + "name": "Erika Benton", + "gender": "female", + "company": "SURETECH", + "email": "erikabenton@suretech.com", + "phone": "+1 (833) 472-2277", + "address": "893 Jamison Lane, Grayhawk, Illinois, 1820", + "about": "Ullamco nisi quis esse fugiat eu proident nisi cupidatat reprehenderit nostrud nulla laborum duis. Duis quis ipsum ad voluptate enim. Et excepteur irure proident adipisicing enim eu veniam aliquip nostrud amet sit est. Non laborum reprehenderit qui ullamco occaecat elit sunt ea nostrud reprehenderit incididunt sunt.\r\n", + "registered": "2018-01-19T11:58:53 -00:00", + "latitude": -44.595301, + "longitude": 100.938225, + "tags": [ + "cupidatat", + "aliqua", + "nostrud", + "nostrud", + "ipsum", + "ipsum", + "commodo" + ], + "friends": [ + { + "id": 0, + "name": "Addie Benjamin" + }, + { + "id": 1, + "name": "Brock Nolan" + }, + { + "id": 2, + "name": "Betty Suarez" + } + ], + "greeting": "Hello, Erika Benton! You have 5 unread messages.", + "favoriteFruit": "apple" + }, + { + "_id": "5ce6ec66ff15753596332021", + "index": 5, + "guid": "f865dabb-4871-4f29-9c56-17361d254f39", + "isActive": true, + "balance": "$3,474.90", + "picture": "http://placehold.it/32x32", + "age": 32, + "eyeColor": "blue", + "name": "Rice Owens", + "gender": "male", + "company": "ACIUM", + "email": "riceowens@acium.com", + "phone": "+1 (975) 576-3718", + "address": "400 Halleck Street, Lafferty, District Of Columbia, 495", + "about": "Cupidatat laborum mollit non eu aute amet consectetur aliqua officia consectetur consequat. Tempor labore pariatur Lorem sint quis laborum est dolore et. Est ipsum incididunt eiusmod enim nostrud laboris duis est enim proident do laborum id culpa.\r\n", + "registered": "2018-05-06T02:43:06 -01:00", + "latitude": 2.843708, + "longitude": -3.301217, + "tags": [ + "laboris", + "velit", + "dolore", + "sunt", + "ad", + "aliqua", + "duis" + ], + "friends": [ + { + "id": 0, + "name": "Ramirez King" + }, + { + "id": 1, + "name": "Jeannie Boyer" + }, + { + "id": 2, + "name": "Deloris Jensen" + } + ], + "greeting": "Hello, Rice Owens! You have 9 unread messages.", + "favoriteFruit": "banana" + } +]'); + + --Act + ut3.ut.expect( l_actual ).to_equal( l_expected ); + --Assert + l_expected_message := q'[%Diff: 133 differences found, showing first 20 +%132 unequal values, 1 missing properties +%Extra property: object on path: $[5] +%Actual value: "5ce6ec46cb9977b050f15d97" was expected to be: "5ce6ec6660565269b16cf836" on path: $[0]."_id" +%Actual value: "5ce6ec469ba57bef5c421021" was expected to be: "5ce6ec66383ddbf3c400e3ed" on path: $[1]."_id" +%Actual value: "5ce6ec4632328a654d592cb6" was expected to be: "5ce6ec6600fb7aaee2d1243e" on path: $[3]."_id" +%Actual value: "5ce6ec464e6f8751e75ed29f" was expected to be: "5ce6ec660a8b5f95ed543305" on path: $[2]."_id" +%Actual value: "5ce6ec46d9dbfbf9b184cee7" was expected to be: "5ce6ec660585cbb589b34fc8" on path: $[4]."_id" +%Actual value: "59be5b73-fffe-4a4f-acea-65c5abbdb53c" was expected to be: "2e778803-50d3-411f-b34d-47d0f19d03f7" on path: $[1]."guid" +%Actual value: "9dece65b-6b48-4960-880b-7795ff63c81c" was expected to be: "18547241-6fd0-466d-9f79-21aeb0485294" on path: $[4]."guid" +%Actual value: "42e07b71-b769-4078-b226-f79048b75bd2" was expected to be: "bb0eaa88-f7fd-4b72-8538-8c0b4595bcec" on path: $[2]."guid" +%Actual value: "6b9124a9-fbde-4c60-8dac-e296f5daa3c4" was expected to be: "4a4363b5-9d65-4b22-9b58-a5c8c1c5bd5d" on path: $[3]."guid" +%Actual value: "1acb2b6b-15b5-4747-a62f-db477e18df61" was expected to be: "c222eda5-d925-4163-89e3-4b0e50d5e297" on path: $[0]."guid" +%Actual value: FALSE was expected to be: TRUE on path: $[2]."isActive" +%Actual value: TRUE was expected to be: FALSE on path: $[3]."isActive" +%Actual value: TRUE was expected to be: FALSE on path: $[1]."isActive" +%Actual value: "$3,895.35" was expected to be: "$2,299.28" on path: $[1]."balance" +%Actual value: "$1,443.80" was expected to be: "$3,626.25" on path: $[0]."balance" +%Actual value: "$3,366.81" was expected to be: "$3,085.28" on path: $[2]."balance" +%Actual value: "$2,927.54" was expected to be: "$3,853.86" on path: $[4]."balance" +%Actual value: "$2,374.96" was expected to be: "$3,152.70" on path: $[3]."balance" +%Actual value: 23 was expected to be: 36 on path: $[2]."age"%]'; + + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure check_json_objects is + l_expected json_object_t; + l_actual json_object_t; + begin + l_expected := json_object_t('{ "name" : "Bond", "proffesion" : "spy", "drink" : "martini"}'); + l_actual := json_object_t('{ "proffesion" : "spy","name" : "Bond", "drink" : "martini"}'); + ut3.ut.expect( l_actual ).to_equal( l_expected ); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure check_json_arrays is + l_expected json_array_t; + l_actual json_array_t; + begin + l_expected := json_array_t('[ {"name" : "Bond", "proffesion" : "spy", "drink" : "martini"} , {"name" : "Kloss", "proffesion" : "spy", "drink" : "beer"} ]'); + l_actual := json_array_t('[ {"name" : "Bond", "proffesion" : "spy", "drink" : "martini"} , {"name" : "Kloss", "proffesion" : "spy", "drink" : "beer"} ]'); + ut3.ut.expect( l_actual ).to_equal( l_expected ); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + +end; +/ diff --git a/test/ut3_user/expectations/test_expectations_json.pks b/test/ut3_user/expectations/test_expectations_json.pks new file mode 100644 index 000000000..64dff42e8 --- /dev/null +++ b/test/ut3_user/expectations/test_expectations_json.pks @@ -0,0 +1,79 @@ +create or replace package test_expectations_json is + + --%suite(json expectations) + --%suitepath(utplsql.test_user.expectations) + + --%aftereach + procedure cleanup_expectations; + + --%test(Gives success for identical data) + procedure success_on_same_data; + + --%test(Gives failure for different data) + procedure fail_on_diff_data; + + --%test( Json variable is null) + procedure null_json_variable; + + --%test( Json variable is not null) + procedure not_null_json_variable; + + --%test( Fail json variable is null) + procedure fail_null_json_var; + + --%test( Fail json variable is not null) + procedure fail_not_null_json_var; + + --%test(Json string is empty) + procedure empty_json; + + --%test(Json string is not empty) + procedure not_empty_json; + + --%test( Fail json string is empty) + procedure fail_empty_json; + + --%test( Fail json string is not empty) + procedure fail_not_empty_json; + + --%test( Json object to have count ) + procedure to_have_count; + + --%test( Fail Json object to have count) + procedure fail_to_have_count; + + --%test( Json object not to have count) + procedure not_to_have_count; + + --%test( Fail Json object not to have count) + procedure fail_not_to_have_count; + + --%test( Json object to have count on array) + procedure to_have_count_array; + + --%test( Two json use plsql function to extract same pieces and compare) + procedure to_diff_json_extract_same; + + --%test( Two json use plsql function to extract diff pieces and compare) + procedure to_diff_json_extract_diff; + + --%test( Long JSON test same ) + procedure long_json_test; + + --%test( JSON test same semantic content different order ) + procedure json_same_diffrent_ord; + + --%test( Long complex nested JSON test ) + procedure long_json_test2; + + --%test( Long complex json differences ) + procedure long_json_diff; + + --%test( Compare two objects json ) + procedure check_json_objects; + + --%test( Compare two json arrays ) + procedure check_json_arrays; + +end; +/ From b3245866cba7175f12f72f64a490a898944dfd0c Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 17 Jun 2019 17:49:27 +0000 Subject: [PATCH 0513/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 0d2b9fd52..894d67d81 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 2d7028ca6..ea8d75748 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index dba1d530e..95d5f4eea 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index e5fa75bb1..a13e60c1a 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 974c195dc..6011aa181 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index fe5615315..3757c4459 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 0336b3429..0aabddae8 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 59618289d..176baaa41 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index a7ff66cb2..ed684cfca 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 765876c1f..a673ea733 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index fdd037420..58142bd75 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 94b570355..8e06e1493 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index fc6344875..3d4598980 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index b3a08cba8..b073305bd 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 05ca5765b..3a2fc3ca1 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index be8a324ac..b697907c2 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index ee5e17acd..0d9a00398 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3076--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 6b2adeb53..1c571b0d6 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -776,7 +776,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.7.3076-develop + * secion v3.1.7.3083-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index ec5790961..a9af2d059 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.7.3076-develop'; + gc_version constant varchar2(50) := 'v3.1.7.3083-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 273fd942c127a57620087c98d623b81e4a18ce06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 18 Jun 2019 00:09:11 +0100 Subject: [PATCH 0514/1096] Update readme.md --- readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index 5fc53ed08..315124db6 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,4 @@ -![utPLSQL v3 | Powerful PL/SQL Unit Testing Framework](docs/images/utPLSQL-testing-framework-transparent_120.png) +![utPLSQL v3 | Testing Framework for PL/SQL](docs/images/utPLSQL-testing-framework-transparent_120.png) ---------- @@ -248,4 +248,4 @@ The utPLSQL project is community-driven and is not commercially motivated. Nonet -
utPLSQL has been supported by Redgate in the form of sponsored stickers and t-shirts. Thank you for helping us spreading the word!
\ No newline at end of file + From 27242af81568559463529e63eaa073a31cda231e Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 18 Jun 2019 00:20:16 +0100 Subject: [PATCH 0515/1096] Updated copyright year --- LICENSE | 2 +- source/api/ut.pkb | 2 +- source/api/ut.pks | 2 +- source/api/ut_runner.pkb | 2 +- source/api/ut_runner.pks | 2 +- source/api/ut_suite_item_info.tpb | 2 +- source/api/ut_suite_item_info.tps | 2 +- source/api/ut_suite_items_info.tps | 2 +- source/core/annotations/ut_annotated_object.tps | 2 +- source/core/annotations/ut_annotated_objects.tps | 2 +- source/core/annotations/ut_annotation.tps | 2 +- source/core/annotations/ut_annotation_cache.sql | 2 +- source/core/annotations/ut_annotation_cache_info.sql | 2 +- source/core/annotations/ut_annotation_cache_manager.pkb | 2 +- source/core/annotations/ut_annotation_cache_manager.pks | 2 +- source/core/annotations/ut_annotation_cache_schema.sql | 2 +- source/core/annotations/ut_annotation_cache_seq.sql | 2 +- source/core/annotations/ut_annotation_manager.pkb | 2 +- source/core/annotations/ut_annotation_manager.pks | 2 +- source/core/annotations/ut_annotation_obj_cache_info.tps | 2 +- source/core/annotations/ut_annotation_objs_cache_info.tps | 2 +- source/core/annotations/ut_annotation_parser.pkb | 2 +- source/core/annotations/ut_annotation_parser.pks | 2 +- source/core/annotations/ut_annotations.tps | 2 +- source/core/annotations/ut_trigger_check.pkb | 2 +- source/core/annotations/ut_trigger_check.pks | 2 +- source/core/coverage/ut_coverage.pkb | 2 +- source/core/coverage/ut_coverage.pks | 2 +- source/core/coverage/ut_coverage_block.pkb | 2 +- source/core/coverage/ut_coverage_block.pks | 2 +- source/core/coverage/ut_coverage_helper.pkb | 2 +- source/core/coverage/ut_coverage_helper.pks | 2 +- source/core/coverage/ut_coverage_helper_block.pkb | 2 +- source/core/coverage/ut_coverage_helper_block.pks | 2 +- source/core/coverage/ut_coverage_helper_profiler.pkb | 2 +- source/core/coverage/ut_coverage_helper_profiler.pks | 2 +- source/core/coverage/ut_coverage_profiler.pkb | 2 +- source/core/coverage/ut_coverage_profiler.pks | 2 +- source/core/coverage/ut_coverage_reporter_base.tpb | 2 +- source/core/coverage/ut_coverage_reporter_base.tps | 2 +- source/core/coverage/ut_coverage_sources_tmp.sql | 2 +- source/core/events/ut_event_item.tps | 2 +- source/core/events/ut_event_listener.tps | 2 +- source/core/events/ut_event_manager.pkb | 2 +- source/core/events/ut_event_manager.pks | 2 +- source/core/output_buffers/ut_output_buffer_base.tpb | 2 +- source/core/output_buffers/ut_output_buffer_base.tps | 2 +- source/core/output_buffers/ut_output_buffer_info_tmp.sql | 2 +- source/core/output_buffers/ut_output_buffer_tmp.sql | 2 +- source/core/output_buffers/ut_output_clob_buffer_tmp.sql | 2 +- source/core/output_buffers/ut_output_clob_table_buffer.tpb | 2 +- source/core/output_buffers/ut_output_clob_table_buffer.tps | 2 +- source/core/output_buffers/ut_output_data_row.tps | 2 +- source/core/output_buffers/ut_output_data_rows.tps | 2 +- source/core/output_buffers/ut_output_table_buffer.tpb | 2 +- source/core/output_buffers/ut_output_table_buffer.tps | 2 +- source/core/types/ut_console_reporter_base.tpb | 2 +- source/core/types/ut_console_reporter_base.tps | 2 +- source/core/types/ut_coverage_options.tps | 2 +- source/core/types/ut_executable.tpb | 2 +- source/core/types/ut_executable.tps | 2 +- source/core/types/ut_executable_test.tps | 2 +- source/core/types/ut_executables.tps | 2 +- source/core/types/ut_expectation_result.tpb | 2 +- source/core/types/ut_expectation_result.tps | 2 +- source/core/types/ut_expectation_results.tps | 2 +- source/core/types/ut_file_mapping.tpb | 2 +- source/core/types/ut_file_mapping.tps | 2 +- source/core/types/ut_file_mappings.tps | 2 +- source/core/types/ut_integer_list.tps | 2 +- source/core/types/ut_key_value_pair.tps | 2 +- source/core/types/ut_key_value_pairs.tps | 2 +- source/core/types/ut_logical_suite.tpb | 2 +- source/core/types/ut_logical_suite.tps | 2 +- source/core/types/ut_object_name.tpb | 2 +- source/core/types/ut_object_name.tps | 2 +- source/core/types/ut_object_names.tps | 2 +- source/core/types/ut_output_reporter_base.tpb | 2 +- source/core/types/ut_output_reporter_base.tps | 2 +- source/core/types/ut_reporter_base.tpb | 2 +- source/core/types/ut_reporter_base.tps | 2 +- source/core/types/ut_reporter_info.tps | 2 +- source/core/types/ut_reporters.tps | 2 +- source/core/types/ut_reporters_info.tps | 2 +- source/core/types/ut_results_counter.tpb | 2 +- source/core/types/ut_results_counter.tps | 2 +- source/core/types/ut_run.tpb | 2 +- source/core/types/ut_run.tps | 2 +- source/core/types/ut_run_info.tpb | 2 +- source/core/types/ut_run_info.tps | 2 +- source/core/types/ut_suite.tpb | 2 +- source/core/types/ut_suite.tps | 2 +- source/core/types/ut_suite_context.tpb | 2 +- source/core/types/ut_suite_context.tps | 2 +- source/core/types/ut_suite_item.tpb | 2 +- source/core/types/ut_suite_item.tps | 2 +- source/core/types/ut_suite_items.tps | 2 +- source/core/types/ut_test.tpb | 2 +- source/core/types/ut_test.tps | 2 +- source/core/types/ut_varchar2_list.tps | 2 +- source/core/types/ut_varchar2_rows.tps | 2 +- source/core/ut_dbms_output_cache.sql | 2 +- source/core/ut_expectation_processor.pkb | 2 +- source/core/ut_expectation_processor.pks | 2 +- source/core/ut_file_mapper.pkb | 2 +- source/core/ut_file_mapper.pks | 2 +- source/core/ut_metadata.pkb | 2 +- source/core/ut_metadata.pks | 2 +- source/core/ut_savepoint_seq.sql | 2 +- source/core/ut_suite_builder.pkb | 2 +- source/core/ut_suite_builder.pks | 2 +- source/core/ut_suite_cache.sql | 2 +- source/core/ut_suite_cache_manager.pkb | 2 +- source/core/ut_suite_cache_manager.pks | 2 +- source/core/ut_suite_cache_package.sql | 2 +- source/core/ut_suite_cache_schema.sql | 2 +- source/core/ut_suite_cache_seq.sql | 2 +- source/core/ut_suite_manager.pkb | 2 +- source/core/ut_suite_manager.pks | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- source/create_synonyms_and_grants_for_public.sql | 2 +- source/create_user_grants.sql | 2 +- source/create_user_synonyms.sql | 2 +- source/create_utplsql_owner.sql | 2 +- source/define_ut3_owner_param.sql | 2 +- source/expectations/data_values/ut_compound_data_diff_tmp.sql | 2 +- source/expectations/data_values/ut_compound_data_helper.pkb | 2 +- source/expectations/data_values/ut_compound_data_helper.pks | 2 +- source/expectations/data_values/ut_compound_data_tmp.sql | 2 +- source/expectations/data_values/ut_compound_data_value.tpb | 2 +- source/expectations/data_values/ut_compound_data_value.tps | 2 +- source/expectations/data_values/ut_cursor_column.tps | 2 +- source/expectations/data_values/ut_cursor_column_tab.tps | 2 +- source/expectations/data_values/ut_cursor_details.tps | 2 +- source/expectations/data_values/ut_data_value.tpb | 2 +- source/expectations/data_values/ut_data_value.tps | 2 +- source/expectations/data_values/ut_data_value_anydata.tpb | 2 +- source/expectations/data_values/ut_data_value_anydata.tps | 2 +- source/expectations/data_values/ut_data_value_blob.tpb | 2 +- source/expectations/data_values/ut_data_value_blob.tps | 2 +- source/expectations/data_values/ut_data_value_boolean.tpb | 2 +- source/expectations/data_values/ut_data_value_boolean.tps | 2 +- source/expectations/data_values/ut_data_value_clob.tpb | 2 +- source/expectations/data_values/ut_data_value_clob.tps | 2 +- source/expectations/data_values/ut_data_value_date.tpb | 2 +- source/expectations/data_values/ut_data_value_date.tps | 2 +- source/expectations/data_values/ut_data_value_dsinterval.tpb | 2 +- source/expectations/data_values/ut_data_value_dsinterval.tps | 2 +- source/expectations/data_values/ut_data_value_json.tpb | 2 +- source/expectations/data_values/ut_data_value_json.tps | 2 +- source/expectations/data_values/ut_data_value_number.tpb | 2 +- source/expectations/data_values/ut_data_value_number.tps | 2 +- source/expectations/data_values/ut_data_value_refcursor.tpb | 2 +- source/expectations/data_values/ut_data_value_refcursor.tps | 2 +- source/expectations/data_values/ut_data_value_timestamp.tpb | 2 +- source/expectations/data_values/ut_data_value_timestamp.tps | 2 +- source/expectations/data_values/ut_data_value_timestamp_ltz.tpb | 2 +- source/expectations/data_values/ut_data_value_timestamp_ltz.tps | 2 +- source/expectations/data_values/ut_data_value_timestamp_tz.tpb | 2 +- source/expectations/data_values/ut_data_value_timestamp_tz.tps | 2 +- source/expectations/data_values/ut_data_value_varchar2.tpb | 2 +- source/expectations/data_values/ut_data_value_varchar2.tps | 2 +- source/expectations/data_values/ut_data_value_xmltype.tpb | 2 +- source/expectations/data_values/ut_data_value_xmltype.tps | 2 +- source/expectations/data_values/ut_data_value_yminterval.tpb | 2 +- source/expectations/data_values/ut_data_value_yminterval.tps | 2 +- source/expectations/data_values/ut_json_data_diff_tmp.sql | 2 +- source/expectations/data_values/ut_json_leaf.tps | 2 +- source/expectations/data_values/ut_json_leaf_tab.tps | 2 +- source/expectations/data_values/ut_json_tree_details.tps | 2 +- source/expectations/data_values/ut_key_anyval_pair.tps | 2 +- source/expectations/data_values/ut_key_anyval_pairs.tps | 2 +- source/expectations/data_values/ut_key_anyvalues.tpb | 2 +- source/expectations/data_values/ut_key_anyvalues.tps | 2 +- source/expectations/matchers/ut_be_between.tpb | 2 +- source/expectations/matchers/ut_be_between.tps | 2 +- source/expectations/matchers/ut_be_empty.tpb | 2 +- source/expectations/matchers/ut_be_empty.tps | 2 +- source/expectations/matchers/ut_be_false.tpb | 2 +- source/expectations/matchers/ut_be_false.tps | 2 +- source/expectations/matchers/ut_be_greater_or_equal.tpb | 2 +- source/expectations/matchers/ut_be_greater_or_equal.tps | 2 +- source/expectations/matchers/ut_be_greater_than.tpb | 2 +- source/expectations/matchers/ut_be_greater_than.tps | 2 +- source/expectations/matchers/ut_be_less_or_equal.tpb | 2 +- source/expectations/matchers/ut_be_less_or_equal.tps | 2 +- source/expectations/matchers/ut_be_less_than.tpb | 2 +- source/expectations/matchers/ut_be_less_than.tps | 2 +- source/expectations/matchers/ut_be_like.tpb | 2 +- source/expectations/matchers/ut_be_like.tps | 2 +- source/expectations/matchers/ut_be_not_null.tpb | 2 +- source/expectations/matchers/ut_be_not_null.tps | 2 +- source/expectations/matchers/ut_be_null.tpb | 2 +- source/expectations/matchers/ut_be_null.tps | 2 +- source/expectations/matchers/ut_be_true.tpb | 2 +- source/expectations/matchers/ut_be_true.tps | 2 +- source/expectations/matchers/ut_comparison_matcher.tpb | 2 +- source/expectations/matchers/ut_comparison_matcher.tps | 2 +- source/expectations/matchers/ut_contain.tpb | 2 +- source/expectations/matchers/ut_contain.tps | 2 +- source/expectations/matchers/ut_equal.tpb | 2 +- source/expectations/matchers/ut_equal.tps | 2 +- source/expectations/matchers/ut_have_count.tpb | 2 +- source/expectations/matchers/ut_have_count.tps | 2 +- source/expectations/matchers/ut_match.tpb | 2 +- source/expectations/matchers/ut_match.tps | 2 +- source/expectations/matchers/ut_matcher.tpb | 2 +- source/expectations/matchers/ut_matcher.tps | 2 +- source/expectations/matchers/ut_matcher_options.tpb | 2 +- source/expectations/matchers/ut_matcher_options.tps | 2 +- source/expectations/matchers/ut_matcher_options_items.tpb | 2 +- source/expectations/matchers/ut_matcher_options_items.tps | 2 +- source/expectations/ut_expectation.tpb | 2 +- source/expectations/ut_expectation.tps | 2 +- source/expectations/ut_expectation_compound.tpb | 2 +- source/expectations/ut_expectation_compound.tps | 2 +- source/expectations/ut_expectation_json.tpb | 2 +- source/expectations/ut_expectation_json.tps | 2 +- source/install.sql | 2 +- source/install_component.sql | 2 +- source/install_ddl_trigger.sql | 2 +- source/install_headless.sql | 2 +- source/install_headless_with_trigger.sql | 2 +- source/reporters/ut_ansiconsole_helper.pkb | 2 +- source/reporters/ut_ansiconsole_helper.pks | 2 +- source/reporters/ut_coverage_cobertura_reporter.tpb | 2 +- source/reporters/ut_coverage_cobertura_reporter.tps | 2 +- source/reporters/ut_coverage_html_reporter.tpb | 2 +- source/reporters/ut_coverage_html_reporter.tps | 2 +- source/reporters/ut_coverage_report_html_helper.pkb | 2 +- source/reporters/ut_coverage_report_html_helper.pks | 2 +- source/reporters/ut_coverage_sonar_reporter.tpb | 2 +- source/reporters/ut_coverage_sonar_reporter.tps | 2 +- source/reporters/ut_coveralls_reporter.tpb | 2 +- source/reporters/ut_coveralls_reporter.tps | 2 +- source/reporters/ut_debug_reporter.tpb | 2 +- source/reporters/ut_debug_reporter.tps | 2 +- source/reporters/ut_documentation_reporter.tpb | 2 +- source/reporters/ut_documentation_reporter.tps | 2 +- source/reporters/ut_junit_reporter.tpb | 2 +- source/reporters/ut_junit_reporter.tps | 2 +- source/reporters/ut_realtime_reporter.tpb | 2 +- source/reporters/ut_realtime_reporter.tps | 2 +- source/reporters/ut_sonar_test_reporter.tpb | 2 +- source/reporters/ut_sonar_test_reporter.tps | 2 +- source/reporters/ut_teamcity_reporter.tpb | 2 +- source/reporters/ut_teamcity_reporter.tps | 2 +- source/reporters/ut_teamcity_reporter_helper.pkb | 2 +- source/reporters/ut_teamcity_reporter_helper.pks | 2 +- source/reporters/ut_tfs_junit_reporter.tpb | 2 +- source/reporters/ut_tfs_junit_reporter.tps | 2 +- source/reporters/ut_xunit_reporter.tpb | 2 +- source/reporters/ut_xunit_reporter.tps | 2 +- source/set_install_params.sql | 2 +- source/uninstall.sql | 2 +- source/uninstall_all.sql | 2 +- 257 files changed, 257 insertions(+), 257 deletions(-) diff --git a/LICENSE b/LICENSE index c024abb72..640d46628 100644 --- a/LICENSE +++ b/LICENSE @@ -187,7 +187,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2016 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/api/ut.pkb b/source/api/ut.pkb index 27d33835e..3b94a2bf7 100644 --- a/source/api/ut.pkb +++ b/source/api/ut.pkb @@ -2,7 +2,7 @@ create or replace package body ut is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/api/ut.pks b/source/api/ut.pks index 5549a75c2..ff75179b0 100644 --- a/source/api/ut.pks +++ b/source/api/ut.pks @@ -2,7 +2,7 @@ create or replace package ut authid current_user as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index d57b86edd..2b8a10c92 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -2,7 +2,7 @@ create or replace package body ut_runner is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/api/ut_runner.pks b/source/api/ut_runner.pks index 0434790f5..a6ba28556 100644 --- a/source/api/ut_runner.pks +++ b/source/api/ut_runner.pks @@ -2,7 +2,7 @@ create or replace package ut_runner authid current_user is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/api/ut_suite_item_info.tpb b/source/api/ut_suite_item_info.tpb index 06ae8341b..9b142acb0 100644 --- a/source/api/ut_suite_item_info.tpb +++ b/source/api/ut_suite_item_info.tpb @@ -1,7 +1,7 @@ create or replace type body ut_suite_item_info is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/api/ut_suite_item_info.tps b/source/api/ut_suite_item_info.tps index d7f7f97dc..d37e89b59 100644 --- a/source/api/ut_suite_item_info.tps +++ b/source/api/ut_suite_item_info.tps @@ -1,7 +1,7 @@ create or replace type ut_suite_item_info as object ( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/api/ut_suite_items_info.tps b/source/api/ut_suite_items_info.tps index d84ed9092..7c9ac33c3 100644 --- a/source/api/ut_suite_items_info.tps +++ b/source/api/ut_suite_items_info.tps @@ -1,7 +1,7 @@ create or replace type ut_suite_items_info as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/annotations/ut_annotated_object.tps b/source/core/annotations/ut_annotated_object.tps index 1bfefed69..06a0f4a36 100644 --- a/source/core/annotations/ut_annotated_object.tps +++ b/source/core/annotations/ut_annotated_object.tps @@ -1,7 +1,7 @@ create type ut_annotated_object as object( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/annotations/ut_annotated_objects.tps b/source/core/annotations/ut_annotated_objects.tps index b7c01fe7a..c7b142a32 100644 --- a/source/core/annotations/ut_annotated_objects.tps +++ b/source/core/annotations/ut_annotated_objects.tps @@ -1,7 +1,7 @@ create type ut_annotated_objects as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/annotations/ut_annotation.tps b/source/core/annotations/ut_annotation.tps index 35af758c7..982c0348c 100644 --- a/source/core/annotations/ut_annotation.tps +++ b/source/core/annotations/ut_annotation.tps @@ -1,7 +1,7 @@ create type ut_annotation as object( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/annotations/ut_annotation_cache.sql b/source/core/annotations/ut_annotation_cache.sql index f9c9295cb..8baa6e75c 100644 --- a/source/core/annotations/ut_annotation_cache.sql +++ b/source/core/annotations/ut_annotation_cache.sql @@ -1,7 +1,7 @@ create table ut_annotation_cache ( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/core/annotations/ut_annotation_cache_info.sql b/source/core/annotations/ut_annotation_cache_info.sql index 811f105a5..e8dc2bfdb 100644 --- a/source/core/annotations/ut_annotation_cache_info.sql +++ b/source/core/annotations/ut_annotation_cache_info.sql @@ -1,7 +1,7 @@ create table ut_annotation_cache_info ( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/core/annotations/ut_annotation_cache_manager.pkb b/source/core/annotations/ut_annotation_cache_manager.pkb index bf6d5e112..21151de8b 100644 --- a/source/core/annotations/ut_annotation_cache_manager.pkb +++ b/source/core/annotations/ut_annotation_cache_manager.pkb @@ -1,7 +1,7 @@ create or replace package body ut_annotation_cache_manager as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/annotations/ut_annotation_cache_manager.pks b/source/core/annotations/ut_annotation_cache_manager.pks index ab794ceb1..4366cd536 100644 --- a/source/core/annotations/ut_annotation_cache_manager.pks +++ b/source/core/annotations/ut_annotation_cache_manager.pks @@ -1,7 +1,7 @@ create or replace package ut_annotation_cache_manager authid definer as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/annotations/ut_annotation_cache_schema.sql b/source/core/annotations/ut_annotation_cache_schema.sql index 77b45fe3e..abab7385e 100644 --- a/source/core/annotations/ut_annotation_cache_schema.sql +++ b/source/core/annotations/ut_annotation_cache_schema.sql @@ -1,7 +1,7 @@ create table ut_annotation_cache_schema ( /* utPLSQL - Version 3 - Copyright 2016 - 2017 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/core/annotations/ut_annotation_cache_seq.sql b/source/core/annotations/ut_annotation_cache_seq.sql index 1cc97086e..0a898e98e 100644 --- a/source/core/annotations/ut_annotation_cache_seq.sql +++ b/source/core/annotations/ut_annotation_cache_seq.sql @@ -1,7 +1,7 @@ create sequence ut_annotation_cache_seq /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index 013e271c1..5b505d63e 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -1,7 +1,7 @@ create or replace package body ut_annotation_manager as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/annotations/ut_annotation_manager.pks b/source/core/annotations/ut_annotation_manager.pks index 237d36724..c2527fcd2 100644 --- a/source/core/annotations/ut_annotation_manager.pks +++ b/source/core/annotations/ut_annotation_manager.pks @@ -1,7 +1,7 @@ create or replace package ut_annotation_manager authid current_user as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/annotations/ut_annotation_obj_cache_info.tps b/source/core/annotations/ut_annotation_obj_cache_info.tps index 2be2ac184..fd0ec51e7 100644 --- a/source/core/annotations/ut_annotation_obj_cache_info.tps +++ b/source/core/annotations/ut_annotation_obj_cache_info.tps @@ -1,7 +1,7 @@ create type ut_annotation_obj_cache_info as object( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/annotations/ut_annotation_objs_cache_info.tps b/source/core/annotations/ut_annotation_objs_cache_info.tps index 9773a045e..bab33a9d3 100644 --- a/source/core/annotations/ut_annotation_objs_cache_info.tps +++ b/source/core/annotations/ut_annotation_objs_cache_info.tps @@ -1,7 +1,7 @@ create type ut_annotation_objs_cache_info as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/annotations/ut_annotation_parser.pkb b/source/core/annotations/ut_annotation_parser.pkb index 66d07d5d3..bbe58a667 100644 --- a/source/core/annotations/ut_annotation_parser.pkb +++ b/source/core/annotations/ut_annotation_parser.pkb @@ -1,7 +1,7 @@ create or replace package body ut_annotation_parser as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/annotations/ut_annotation_parser.pks b/source/core/annotations/ut_annotation_parser.pks index 87ff70a24..b0a61e576 100644 --- a/source/core/annotations/ut_annotation_parser.pks +++ b/source/core/annotations/ut_annotation_parser.pks @@ -1,7 +1,7 @@ create or replace package ut_annotation_parser authid current_user as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/annotations/ut_annotations.tps b/source/core/annotations/ut_annotations.tps index 4238f9512..85be05e72 100644 --- a/source/core/annotations/ut_annotations.tps +++ b/source/core/annotations/ut_annotations.tps @@ -1,7 +1,7 @@ create type ut_annotations /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/annotations/ut_trigger_check.pkb b/source/core/annotations/ut_trigger_check.pkb index e2811b3c3..e07acd3b2 100644 --- a/source/core/annotations/ut_trigger_check.pkb +++ b/source/core/annotations/ut_trigger_check.pkb @@ -1,7 +1,7 @@ create or replace package body ut_trigger_check is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/annotations/ut_trigger_check.pks b/source/core/annotations/ut_trigger_check.pks index 237af3c68..c4c27c596 100644 --- a/source/core/annotations/ut_trigger_check.pks +++ b/source/core/annotations/ut_trigger_check.pks @@ -1,7 +1,7 @@ create or replace package ut_trigger_check authid definer is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/coverage/ut_coverage.pkb b/source/core/coverage/ut_coverage.pkb index 58fdbb5cc..2fc5c4aec 100644 --- a/source/core/coverage/ut_coverage.pkb +++ b/source/core/coverage/ut_coverage.pkb @@ -1,7 +1,7 @@ create or replace package body ut_coverage is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/coverage/ut_coverage.pks b/source/core/coverage/ut_coverage.pks index b291f4b26..9254e6d37 100644 --- a/source/core/coverage/ut_coverage.pks +++ b/source/core/coverage/ut_coverage.pks @@ -1,7 +1,7 @@ create or replace package ut_coverage authid current_user is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/coverage/ut_coverage_block.pkb b/source/core/coverage/ut_coverage_block.pkb index 8e7688c91..c6d0f409d 100644 --- a/source/core/coverage/ut_coverage_block.pkb +++ b/source/core/coverage/ut_coverage_block.pkb @@ -1,7 +1,7 @@ create or replace package body ut_coverage_block is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/coverage/ut_coverage_block.pks b/source/core/coverage/ut_coverage_block.pks index fdce622a5..26c79317e 100644 --- a/source/core/coverage/ut_coverage_block.pks +++ b/source/core/coverage/ut_coverage_block.pks @@ -1,7 +1,7 @@ create or replace package ut_coverage_block authid current_user is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/coverage/ut_coverage_helper.pkb b/source/core/coverage/ut_coverage_helper.pkb index 5f9744265..1c83606d8 100644 --- a/source/core/coverage/ut_coverage_helper.pkb +++ b/source/core/coverage/ut_coverage_helper.pkb @@ -1,7 +1,7 @@ create or replace package body ut_coverage_helper is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/coverage/ut_coverage_helper.pks b/source/core/coverage/ut_coverage_helper.pks index 014e7b471..85a54a7ca 100644 --- a/source/core/coverage/ut_coverage_helper.pks +++ b/source/core/coverage/ut_coverage_helper.pks @@ -1,7 +1,7 @@ create or replace package ut_coverage_helper authid definer is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/coverage/ut_coverage_helper_block.pkb b/source/core/coverage/ut_coverage_helper_block.pkb index c5c30d12c..e8342a105 100644 --- a/source/core/coverage/ut_coverage_helper_block.pkb +++ b/source/core/coverage/ut_coverage_helper_block.pkb @@ -1,7 +1,7 @@ create or replace package body ut_coverage_helper_block is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/coverage/ut_coverage_helper_block.pks b/source/core/coverage/ut_coverage_helper_block.pks index 0b71b7067..0afa3ab15 100644 --- a/source/core/coverage/ut_coverage_helper_block.pks +++ b/source/core/coverage/ut_coverage_helper_block.pks @@ -1,7 +1,7 @@ create or replace package ut_coverage_helper_block authid current_user is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/coverage/ut_coverage_helper_profiler.pkb b/source/core/coverage/ut_coverage_helper_profiler.pkb index 340a28ca3..6b685ede0 100644 --- a/source/core/coverage/ut_coverage_helper_profiler.pkb +++ b/source/core/coverage/ut_coverage_helper_profiler.pkb @@ -1,7 +1,7 @@ create or replace package body ut_coverage_helper_profiler is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/coverage/ut_coverage_helper_profiler.pks b/source/core/coverage/ut_coverage_helper_profiler.pks index db91326eb..9345f4b88 100644 --- a/source/core/coverage/ut_coverage_helper_profiler.pks +++ b/source/core/coverage/ut_coverage_helper_profiler.pks @@ -1,7 +1,7 @@ create or replace package ut_coverage_helper_profiler authid definer is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/coverage/ut_coverage_profiler.pkb b/source/core/coverage/ut_coverage_profiler.pkb index e4c9ab0af..160e2dd41 100644 --- a/source/core/coverage/ut_coverage_profiler.pkb +++ b/source/core/coverage/ut_coverage_profiler.pkb @@ -1,7 +1,7 @@ create or replace package body ut_coverage_profiler is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/coverage/ut_coverage_profiler.pks b/source/core/coverage/ut_coverage_profiler.pks index 4e4b8d9c0..8e671f899 100644 --- a/source/core/coverage/ut_coverage_profiler.pks +++ b/source/core/coverage/ut_coverage_profiler.pks @@ -1,7 +1,7 @@ create or replace package ut_coverage_profiler authid current_user is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/coverage/ut_coverage_reporter_base.tpb b/source/core/coverage/ut_coverage_reporter_base.tpb index 9e339347f..5067f9221 100644 --- a/source/core/coverage/ut_coverage_reporter_base.tpb +++ b/source/core/coverage/ut_coverage_reporter_base.tpb @@ -1,7 +1,7 @@ create or replace type body ut_coverage_reporter_base is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/coverage/ut_coverage_reporter_base.tps b/source/core/coverage/ut_coverage_reporter_base.tps index 76206dd95..2b9d1c625 100644 --- a/source/core/coverage/ut_coverage_reporter_base.tps +++ b/source/core/coverage/ut_coverage_reporter_base.tps @@ -1,7 +1,7 @@ create or replace type ut_coverage_reporter_base under ut_output_reporter_base( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/coverage/ut_coverage_sources_tmp.sql b/source/core/coverage/ut_coverage_sources_tmp.sql index 29b53d147..f53283dcd 100644 --- a/source/core/coverage/ut_coverage_sources_tmp.sql +++ b/source/core/coverage/ut_coverage_sources_tmp.sql @@ -1,7 +1,7 @@ create global temporary table ut_coverage_sources_tmp( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/core/events/ut_event_item.tps b/source/core/events/ut_event_item.tps index d1f52cba6..efec940f5 100644 --- a/source/core/events/ut_event_item.tps +++ b/source/core/events/ut_event_item.tps @@ -1,7 +1,7 @@ create or replace type ut_event_item authid current_user as object ( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/events/ut_event_listener.tps b/source/core/events/ut_event_listener.tps index fd6ae0486..71ee16a0f 100644 --- a/source/core/events/ut_event_listener.tps +++ b/source/core/events/ut_event_listener.tps @@ -1,7 +1,7 @@ create or replace type ut_event_listener authid current_user as object ( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/events/ut_event_manager.pkb b/source/core/events/ut_event_manager.pkb index 0dfc6c925..039eb43a0 100644 --- a/source/core/events/ut_event_manager.pkb +++ b/source/core/events/ut_event_manager.pkb @@ -1,7 +1,7 @@ create or replace package body ut_event_manager as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/events/ut_event_manager.pks b/source/core/events/ut_event_manager.pks index 948a9550c..f67bd0f4d 100644 --- a/source/core/events/ut_event_manager.pks +++ b/source/core/events/ut_event_manager.pks @@ -1,7 +1,7 @@ create or replace package ut_event_manager authid current_user as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/output_buffers/ut_output_buffer_base.tpb b/source/core/output_buffers/ut_output_buffer_base.tpb index 12eb08791..018250e4b 100644 --- a/source/core/output_buffers/ut_output_buffer_base.tpb +++ b/source/core/output_buffers/ut_output_buffer_base.tpb @@ -1,7 +1,7 @@ create or replace type body ut_output_buffer_base is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/output_buffers/ut_output_buffer_base.tps b/source/core/output_buffers/ut_output_buffer_base.tps index cffdc63bc..745692f38 100644 --- a/source/core/output_buffers/ut_output_buffer_base.tps +++ b/source/core/output_buffers/ut_output_buffer_base.tps @@ -1,7 +1,7 @@ create or replace type ut_output_buffer_base force authid definer as object( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/output_buffers/ut_output_buffer_info_tmp.sql b/source/core/output_buffers/ut_output_buffer_info_tmp.sql index c6e8995fb..ec09619d2 100644 --- a/source/core/output_buffers/ut_output_buffer_info_tmp.sql +++ b/source/core/output_buffers/ut_output_buffer_info_tmp.sql @@ -1,7 +1,7 @@ create table ut_output_buffer_info_tmp( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/core/output_buffers/ut_output_buffer_tmp.sql b/source/core/output_buffers/ut_output_buffer_tmp.sql index 7ae024555..49fefa24d 100644 --- a/source/core/output_buffers/ut_output_buffer_tmp.sql +++ b/source/core/output_buffers/ut_output_buffer_tmp.sql @@ -1,7 +1,7 @@ create table ut_output_buffer_tmp( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/core/output_buffers/ut_output_clob_buffer_tmp.sql b/source/core/output_buffers/ut_output_clob_buffer_tmp.sql index 0f56a837e..48cfe6fde 100644 --- a/source/core/output_buffers/ut_output_clob_buffer_tmp.sql +++ b/source/core/output_buffers/ut_output_clob_buffer_tmp.sql @@ -6,7 +6,7 @@ begin v_table_sql := 'create table ut_output_clob_buffer_tmp( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/core/output_buffers/ut_output_clob_table_buffer.tpb b/source/core/output_buffers/ut_output_clob_table_buffer.tpb index a8d979946..8c2825151 100644 --- a/source/core/output_buffers/ut_output_clob_table_buffer.tpb +++ b/source/core/output_buffers/ut_output_clob_table_buffer.tpb @@ -1,7 +1,7 @@ create or replace type body ut_output_clob_table_buffer is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/output_buffers/ut_output_clob_table_buffer.tps b/source/core/output_buffers/ut_output_clob_table_buffer.tps index ac9a502cd..2eb3640b0 100644 --- a/source/core/output_buffers/ut_output_clob_table_buffer.tps +++ b/source/core/output_buffers/ut_output_clob_table_buffer.tps @@ -1,7 +1,7 @@ create or replace type ut_output_clob_table_buffer under ut_output_buffer_base ( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/output_buffers/ut_output_data_row.tps b/source/core/output_buffers/ut_output_data_row.tps index ddcb65710..b0f5efe91 100644 --- a/source/core/output_buffers/ut_output_data_row.tps +++ b/source/core/output_buffers/ut_output_data_row.tps @@ -1,7 +1,7 @@ create or replace type ut_output_data_row as object ( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/output_buffers/ut_output_data_rows.tps b/source/core/output_buffers/ut_output_data_rows.tps index 9575231ba..1918f0c81 100644 --- a/source/core/output_buffers/ut_output_data_rows.tps +++ b/source/core/output_buffers/ut_output_data_rows.tps @@ -1,7 +1,7 @@ create or replace type ut_output_data_rows as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/output_buffers/ut_output_table_buffer.tpb b/source/core/output_buffers/ut_output_table_buffer.tpb index 44e91cc38..e3f869b22 100644 --- a/source/core/output_buffers/ut_output_table_buffer.tpb +++ b/source/core/output_buffers/ut_output_table_buffer.tpb @@ -1,7 +1,7 @@ create or replace type body ut_output_table_buffer is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/output_buffers/ut_output_table_buffer.tps b/source/core/output_buffers/ut_output_table_buffer.tps index 77a057b78..3e395304a 100644 --- a/source/core/output_buffers/ut_output_table_buffer.tps +++ b/source/core/output_buffers/ut_output_table_buffer.tps @@ -1,7 +1,7 @@ create or replace type ut_output_table_buffer under ut_output_buffer_base ( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_console_reporter_base.tpb b/source/core/types/ut_console_reporter_base.tpb index 0245edde3..df256e832 100644 --- a/source/core/types/ut_console_reporter_base.tpb +++ b/source/core/types/ut_console_reporter_base.tpb @@ -1,7 +1,7 @@ create or replace type body ut_console_reporter_base is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_console_reporter_base.tps b/source/core/types/ut_console_reporter_base.tps index 3736e4d33..6c0a08502 100644 --- a/source/core/types/ut_console_reporter_base.tps +++ b/source/core/types/ut_console_reporter_base.tps @@ -1,7 +1,7 @@ create or replace type ut_console_reporter_base under ut_output_reporter_base( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_coverage_options.tps b/source/core/types/ut_coverage_options.tps index 737ea1abb..bcdbc0b32 100644 --- a/source/core/types/ut_coverage_options.tps +++ b/source/core/types/ut_coverage_options.tps @@ -1,7 +1,7 @@ create or replace type ut_coverage_options force as object ( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_executable.tpb b/source/core/types/ut_executable.tpb index 2fc1e3a7e..060f416aa 100644 --- a/source/core/types/ut_executable.tpb +++ b/source/core/types/ut_executable.tpb @@ -1,7 +1,7 @@ create or replace type body ut_executable is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_executable.tps b/source/core/types/ut_executable.tps index 9154881f2..786d926ad 100644 --- a/source/core/types/ut_executable.tps +++ b/source/core/types/ut_executable.tps @@ -1,7 +1,7 @@ create or replace type ut_executable under ut_event_item( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_executable_test.tps b/source/core/types/ut_executable_test.tps index b11676c0c..2772720de 100644 --- a/source/core/types/ut_executable_test.tps +++ b/source/core/types/ut_executable_test.tps @@ -1,7 +1,7 @@ create or replace type ut_executable_test authid current_user under ut_executable ( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_executables.tps b/source/core/types/ut_executables.tps index a06e6c067..f5732d5a1 100644 --- a/source/core/types/ut_executables.tps +++ b/source/core/types/ut_executables.tps @@ -1,7 +1,7 @@ create or replace type ut_executables as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_expectation_result.tpb b/source/core/types/ut_expectation_result.tpb index 6b1bbd4ef..097c900f4 100644 --- a/source/core/types/ut_expectation_result.tpb +++ b/source/core/types/ut_expectation_result.tpb @@ -1,7 +1,7 @@ create or replace type body ut_expectation_result is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_expectation_result.tps b/source/core/types/ut_expectation_result.tps index f5d7fd23e..815d90820 100644 --- a/source/core/types/ut_expectation_result.tps +++ b/source/core/types/ut_expectation_result.tps @@ -1,7 +1,7 @@ create or replace type ut_expectation_result under ut_event_item( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_expectation_results.tps b/source/core/types/ut_expectation_results.tps index 942f9b398..963c726f8 100644 --- a/source/core/types/ut_expectation_results.tps +++ b/source/core/types/ut_expectation_results.tps @@ -1,7 +1,7 @@ create or replace type ut_expectation_results as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_file_mapping.tpb b/source/core/types/ut_file_mapping.tpb index c5a82c09d..247aa5ac8 100644 --- a/source/core/types/ut_file_mapping.tpb +++ b/source/core/types/ut_file_mapping.tpb @@ -1,7 +1,7 @@ create or replace type body ut_file_mapping as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_file_mapping.tps b/source/core/types/ut_file_mapping.tps index e046808d4..c032e0b77 100644 --- a/source/core/types/ut_file_mapping.tps +++ b/source/core/types/ut_file_mapping.tps @@ -1,7 +1,7 @@ create or replace type ut_file_mapping as object( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_file_mappings.tps b/source/core/types/ut_file_mappings.tps index 6ff2604b3..a48c3e872 100644 --- a/source/core/types/ut_file_mappings.tps +++ b/source/core/types/ut_file_mappings.tps @@ -1,7 +1,7 @@ create or replace type ut_file_mappings as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_integer_list.tps b/source/core/types/ut_integer_list.tps index c1fc4de91..25f1679b2 100644 --- a/source/core/types/ut_integer_list.tps +++ b/source/core/types/ut_integer_list.tps @@ -1,7 +1,7 @@ create or replace type ut_integer_list as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_key_value_pair.tps b/source/core/types/ut_key_value_pair.tps index ae1b9aba7..873a354fd 100644 --- a/source/core/types/ut_key_value_pair.tps +++ b/source/core/types/ut_key_value_pair.tps @@ -1,7 +1,7 @@ create or replace type ut_key_value_pair force as object( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_key_value_pairs.tps b/source/core/types/ut_key_value_pairs.tps index c9bab9ec2..28fa87cf0 100644 --- a/source/core/types/ut_key_value_pairs.tps +++ b/source/core/types/ut_key_value_pairs.tps @@ -1,7 +1,7 @@ create or replace type ut_key_value_pairs as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_logical_suite.tpb b/source/core/types/ut_logical_suite.tpb index 4dca71b3e..74c7ff81c 100644 --- a/source/core/types/ut_logical_suite.tpb +++ b/source/core/types/ut_logical_suite.tpb @@ -1,7 +1,7 @@ create or replace type body ut_logical_suite as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_logical_suite.tps b/source/core/types/ut_logical_suite.tps index 270558faa..71cfdb23d 100644 --- a/source/core/types/ut_logical_suite.tps +++ b/source/core/types/ut_logical_suite.tps @@ -1,7 +1,7 @@ create or replace type ut_logical_suite under ut_suite_item ( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_object_name.tpb b/source/core/types/ut_object_name.tpb index 299b6e269..cf1ab2a78 100644 --- a/source/core/types/ut_object_name.tpb +++ b/source/core/types/ut_object_name.tpb @@ -1,7 +1,7 @@ create or replace type body ut_object_name as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_object_name.tps b/source/core/types/ut_object_name.tps index 12afa69dd..28e41958f 100644 --- a/source/core/types/ut_object_name.tps +++ b/source/core/types/ut_object_name.tps @@ -1,7 +1,7 @@ create or replace type ut_object_name as object ( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_object_names.tps b/source/core/types/ut_object_names.tps index f46580172..2f7e5ea16 100644 --- a/source/core/types/ut_object_names.tps +++ b/source/core/types/ut_object_names.tps @@ -1,7 +1,7 @@ create or replace type ut_object_names as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_output_reporter_base.tpb b/source/core/types/ut_output_reporter_base.tpb index 1f682070b..d20f454a8 100644 --- a/source/core/types/ut_output_reporter_base.tpb +++ b/source/core/types/ut_output_reporter_base.tpb @@ -1,7 +1,7 @@ create or replace type body ut_output_reporter_base is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_output_reporter_base.tps b/source/core/types/ut_output_reporter_base.tps index ba550fb0f..95ee9c1f8 100644 --- a/source/core/types/ut_output_reporter_base.tps +++ b/source/core/types/ut_output_reporter_base.tps @@ -1,7 +1,7 @@ create or replace type ut_output_reporter_base under ut_reporter_base( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_reporter_base.tpb b/source/core/types/ut_reporter_base.tpb index 741d024e0..94d518af4 100644 --- a/source/core/types/ut_reporter_base.tpb +++ b/source/core/types/ut_reporter_base.tpb @@ -1,7 +1,7 @@ create or replace type body ut_reporter_base is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_reporter_base.tps b/source/core/types/ut_reporter_base.tps index 4f8216294..36af70776 100644 --- a/source/core/types/ut_reporter_base.tps +++ b/source/core/types/ut_reporter_base.tps @@ -1,7 +1,7 @@ create or replace type ut_reporter_base under ut_event_listener ( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_reporter_info.tps b/source/core/types/ut_reporter_info.tps index 7426498d5..a4028974f 100644 --- a/source/core/types/ut_reporter_info.tps +++ b/source/core/types/ut_reporter_info.tps @@ -1,7 +1,7 @@ create or replace type ut_reporter_info as object ( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_reporters.tps b/source/core/types/ut_reporters.tps index 7df85c2f3..b16e74653 100644 --- a/source/core/types/ut_reporters.tps +++ b/source/core/types/ut_reporters.tps @@ -1,7 +1,7 @@ create or replace type ut_reporters as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_reporters_info.tps b/source/core/types/ut_reporters_info.tps index fa9484641..6e9a866ef 100644 --- a/source/core/types/ut_reporters_info.tps +++ b/source/core/types/ut_reporters_info.tps @@ -1,7 +1,7 @@ create or replace type ut_reporters_info as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_results_counter.tpb b/source/core/types/ut_results_counter.tpb index 2378bf640..0007acd9b 100644 --- a/source/core/types/ut_results_counter.tpb +++ b/source/core/types/ut_results_counter.tpb @@ -1,7 +1,7 @@ create or replace type body ut_results_counter as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_results_counter.tps b/source/core/types/ut_results_counter.tps index c3ed97d71..1b26b673a 100644 --- a/source/core/types/ut_results_counter.tps +++ b/source/core/types/ut_results_counter.tps @@ -1,7 +1,7 @@ create or replace type ut_results_counter as object( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_run.tpb b/source/core/types/ut_run.tpb index c8f2778ff..bff16dc69 100644 --- a/source/core/types/ut_run.tpb +++ b/source/core/types/ut_run.tpb @@ -1,7 +1,7 @@ create or replace type body ut_run as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_run.tps b/source/core/types/ut_run.tps index b5a1d18ac..2a4e11656 100644 --- a/source/core/types/ut_run.tps +++ b/source/core/types/ut_run.tps @@ -1,7 +1,7 @@ create or replace type ut_run under ut_suite_item ( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_run_info.tpb b/source/core/types/ut_run_info.tpb index f5a117f95..8e06d6137 100644 --- a/source/core/types/ut_run_info.tpb +++ b/source/core/types/ut_run_info.tpb @@ -1,7 +1,7 @@ create or replace type body ut_run_info as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_run_info.tps b/source/core/types/ut_run_info.tps index 6781e8a99..f59c22c05 100644 --- a/source/core/types/ut_run_info.tps +++ b/source/core/types/ut_run_info.tps @@ -1,7 +1,7 @@ create or replace type ut_run_info under ut_event_item ( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_suite.tpb b/source/core/types/ut_suite.tpb index 1211d5d5c..ccf004a4b 100644 --- a/source/core/types/ut_suite.tpb +++ b/source/core/types/ut_suite.tpb @@ -1,7 +1,7 @@ create or replace type body ut_suite as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_suite.tps b/source/core/types/ut_suite.tps index dd44a817e..ffe2d2d42 100644 --- a/source/core/types/ut_suite.tps +++ b/source/core/types/ut_suite.tps @@ -1,7 +1,7 @@ create or replace type ut_suite under ut_logical_suite ( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_suite_context.tpb b/source/core/types/ut_suite_context.tpb index c8255f374..3669d3d7e 100644 --- a/source/core/types/ut_suite_context.tpb +++ b/source/core/types/ut_suite_context.tpb @@ -1,7 +1,7 @@ create or replace type body ut_suite_context as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_suite_context.tps b/source/core/types/ut_suite_context.tps index ce4510c39..a328e7657 100644 --- a/source/core/types/ut_suite_context.tps +++ b/source/core/types/ut_suite_context.tps @@ -1,7 +1,7 @@ create or replace type ut_suite_context under ut_suite ( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_suite_item.tpb b/source/core/types/ut_suite_item.tpb index 2ec1b0513..6478d5c82 100644 --- a/source/core/types/ut_suite_item.tpb +++ b/source/core/types/ut_suite_item.tpb @@ -1,7 +1,7 @@ create or replace type body ut_suite_item as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_suite_item.tps b/source/core/types/ut_suite_item.tps index a5eb10986..53c59a2ea 100644 --- a/source/core/types/ut_suite_item.tps +++ b/source/core/types/ut_suite_item.tps @@ -1,7 +1,7 @@ create or replace type ut_suite_item force under ut_event_item ( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_suite_items.tps b/source/core/types/ut_suite_items.tps index ff5709ca8..e80bcc7b4 100644 --- a/source/core/types/ut_suite_items.tps +++ b/source/core/types/ut_suite_items.tps @@ -1,7 +1,7 @@ create or replace type ut_suite_items as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_test.tpb b/source/core/types/ut_test.tpb index bb71e1a5b..7b2c495de 100644 --- a/source/core/types/ut_test.tpb +++ b/source/core/types/ut_test.tpb @@ -1,7 +1,7 @@ create or replace type body ut_test as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_test.tps b/source/core/types/ut_test.tps index 6751ec522..fcf565671 100644 --- a/source/core/types/ut_test.tps +++ b/source/core/types/ut_test.tps @@ -1,7 +1,7 @@ create or replace type ut_test force under ut_suite_item ( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_varchar2_list.tps b/source/core/types/ut_varchar2_list.tps index f324a2842..dd15f0d8f 100644 --- a/source/core/types/ut_varchar2_list.tps +++ b/source/core/types/ut_varchar2_list.tps @@ -1,7 +1,7 @@ create or replace type ut_varchar2_list as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_varchar2_rows.tps b/source/core/types/ut_varchar2_rows.tps index ba8962378..d56eeee46 100644 --- a/source/core/types/ut_varchar2_rows.tps +++ b/source/core/types/ut_varchar2_rows.tps @@ -1,7 +1,7 @@ create or replace type ut_varchar2_rows as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/ut_dbms_output_cache.sql b/source/core/ut_dbms_output_cache.sql index 2102ab4ee..1fe4251c7 100644 --- a/source/core/ut_dbms_output_cache.sql +++ b/source/core/ut_dbms_output_cache.sql @@ -1,6 +1,6 @@ /* utPLSQL - Version 3 -Copyright 2016 - 2018 utPLSQL Project +Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/core/ut_expectation_processor.pkb b/source/core/ut_expectation_processor.pkb index e961ca908..96ab022e4 100644 --- a/source/core/ut_expectation_processor.pkb +++ b/source/core/ut_expectation_processor.pkb @@ -1,7 +1,7 @@ create or replace package body ut_expectation_processor as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/ut_expectation_processor.pks b/source/core/ut_expectation_processor.pks index ab3b70f76..cfcae8b42 100644 --- a/source/core/ut_expectation_processor.pks +++ b/source/core/ut_expectation_processor.pks @@ -1,7 +1,7 @@ create or replace package ut_expectation_processor authid current_user as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/ut_file_mapper.pkb b/source/core/ut_file_mapper.pkb index 35233b57b..adecb7dc8 100644 --- a/source/core/ut_file_mapper.pkb +++ b/source/core/ut_file_mapper.pkb @@ -1,7 +1,7 @@ create or replace package body ut_file_mapper is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/ut_file_mapper.pks b/source/core/ut_file_mapper.pks index 5402ef6e8..4ed670ee5 100644 --- a/source/core/ut_file_mapper.pks +++ b/source/core/ut_file_mapper.pks @@ -1,7 +1,7 @@ create or replace package ut_file_mapper authid current_user is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/ut_metadata.pkb b/source/core/ut_metadata.pkb index 0e8a8b79b..a33dfc1eb 100644 --- a/source/core/ut_metadata.pkb +++ b/source/core/ut_metadata.pkb @@ -1,7 +1,7 @@ create or replace package body ut_metadata as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/ut_metadata.pks b/source/core/ut_metadata.pks index fdd984813..bf62c4e52 100644 --- a/source/core/ut_metadata.pks +++ b/source/core/ut_metadata.pks @@ -1,7 +1,7 @@ create or replace package ut_metadata authid current_user as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/ut_savepoint_seq.sql b/source/core/ut_savepoint_seq.sql index 6ccfc182a..e1d80f452 100644 --- a/source/core/ut_savepoint_seq.sql +++ b/source/core/ut_savepoint_seq.sql @@ -1,7 +1,7 @@ create sequence ut_savepoint_seq /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index 295f2d699..d3de777db 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -1,7 +1,7 @@ create or replace package body ut_suite_builder is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/ut_suite_builder.pks b/source/core/ut_suite_builder.pks index 5e2624a30..e982fdbc1 100644 --- a/source/core/ut_suite_builder.pks +++ b/source/core/ut_suite_builder.pks @@ -1,7 +1,7 @@ create or replace package ut_suite_builder authid current_user is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/ut_suite_cache.sql b/source/core/ut_suite_cache.sql index 8687858a3..e4bf52439 100644 --- a/source/core/ut_suite_cache.sql +++ b/source/core/ut_suite_cache.sql @@ -6,7 +6,7 @@ create or replace type ut_tests as table of ut_test create table ut_suite_cache ( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index b805919fc..b8b548a4b 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -1,7 +1,7 @@ create or replace package body ut_suite_cache_manager is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/ut_suite_cache_manager.pks b/source/core/ut_suite_cache_manager.pks index 02c47988e..03816ee70 100644 --- a/source/core/ut_suite_cache_manager.pks +++ b/source/core/ut_suite_cache_manager.pks @@ -1,7 +1,7 @@ create or replace package ut_suite_cache_manager authid definer is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/ut_suite_cache_package.sql b/source/core/ut_suite_cache_package.sql index 46f49e915..06f786949 100644 --- a/source/core/ut_suite_cache_package.sql +++ b/source/core/ut_suite_cache_package.sql @@ -1,7 +1,7 @@ create table ut_suite_cache_package ( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/core/ut_suite_cache_schema.sql b/source/core/ut_suite_cache_schema.sql index ba257dafd..46c7b0ef3 100644 --- a/source/core/ut_suite_cache_schema.sql +++ b/source/core/ut_suite_cache_schema.sql @@ -1,7 +1,7 @@ create table ut_suite_cache_schema ( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/core/ut_suite_cache_seq.sql b/source/core/ut_suite_cache_seq.sql index 0c9c835b8..36de28809 100644 --- a/source/core/ut_suite_cache_seq.sql +++ b/source/core/ut_suite_cache_seq.sql @@ -1,7 +1,7 @@ create sequence ut_suite_cache_seq /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 21e070865..1ffd5ea49 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -1,7 +1,7 @@ create or replace package body ut_suite_manager is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/ut_suite_manager.pks b/source/core/ut_suite_manager.pks index bf8819693..fe492b049 100644 --- a/source/core/ut_suite_manager.pks +++ b/source/core/ut_suite_manager.pks @@ -1,7 +1,7 @@ create or replace package ut_suite_manager authid current_user is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 1c571b0d6..72cfc7388 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -1,7 +1,7 @@ create or replace package body ut_utils is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index a9af2d059..421bd85eb 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -1,7 +1,7 @@ create or replace package ut_utils authid definer is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index 2cd553860..30b79cffb 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -1,6 +1,6 @@ /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql index fe1d3da29..911c1074f 100644 --- a/source/create_user_grants.sql +++ b/source/create_user_grants.sql @@ -1,6 +1,6 @@ /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/create_user_synonyms.sql b/source/create_user_synonyms.sql index 8fd687181..b564dc6c4 100644 --- a/source/create_user_synonyms.sql +++ b/source/create_user_synonyms.sql @@ -1,6 +1,6 @@ /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/create_utplsql_owner.sql b/source/create_utplsql_owner.sql index 2df63f27f..9d163d802 100644 --- a/source/create_utplsql_owner.sql +++ b/source/create_utplsql_owner.sql @@ -1,6 +1,6 @@ /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/define_ut3_owner_param.sql b/source/define_ut3_owner_param.sql index a889ead05..1b183b581 100644 --- a/source/define_ut3_owner_param.sql +++ b/source/define_ut3_owner_param.sql @@ -1,6 +1,6 @@ /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_compound_data_diff_tmp.sql b/source/expectations/data_values/ut_compound_data_diff_tmp.sql index 242d6c2fc..19f2a6bb2 100644 --- a/source/expectations/data_values/ut_compound_data_diff_tmp.sql +++ b/source/expectations/data_values/ut_compound_data_diff_tmp.sql @@ -1,7 +1,7 @@ create global temporary table ut_compound_data_diff_tmp( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 2a2ce9d9e..755c5154d 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -1,7 +1,7 @@ create or replace package body ut_compound_data_helper is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index c6b6507fc..56745be76 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -1,7 +1,7 @@ create or replace package ut_compound_data_helper authid definer is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_compound_data_tmp.sql b/source/expectations/data_values/ut_compound_data_tmp.sql index 0fb5f9544..10a88269e 100644 --- a/source/expectations/data_values/ut_compound_data_tmp.sql +++ b/source/expectations/data_values/ut_compound_data_tmp.sql @@ -1,7 +1,7 @@ create global temporary table ut_compound_data_tmp( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index 4aecdb81f..3dbf9431a 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -1,7 +1,7 @@ create or replace type body ut_compound_data_value as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_compound_data_value.tps b/source/expectations/data_values/ut_compound_data_value.tps index 8e42765f5..a9b78f944 100644 --- a/source/expectations/data_values/ut_compound_data_value.tps +++ b/source/expectations/data_values/ut_compound_data_value.tps @@ -1,7 +1,7 @@ create or replace type ut_compound_data_value force under ut_data_value( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_cursor_column.tps b/source/expectations/data_values/ut_cursor_column.tps index 93114c431..c865ea64b 100644 --- a/source/expectations/data_values/ut_cursor_column.tps +++ b/source/expectations/data_values/ut_cursor_column.tps @@ -1,7 +1,7 @@ create or replace type ut_cursor_column authid current_user as object ( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_cursor_column_tab.tps b/source/expectations/data_values/ut_cursor_column_tab.tps index 1b7a1698f..b1b33f7fe 100644 --- a/source/expectations/data_values/ut_cursor_column_tab.tps +++ b/source/expectations/data_values/ut_cursor_column_tab.tps @@ -1,7 +1,7 @@ create or replace type ut_cursor_column_tab as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_cursor_details.tps b/source/expectations/data_values/ut_cursor_details.tps index 43e70b123..7092e834f 100644 --- a/source/expectations/data_values/ut_cursor_details.tps +++ b/source/expectations/data_values/ut_cursor_details.tps @@ -1,7 +1,7 @@ create or replace type ut_cursor_details authid current_user as object ( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value.tpb b/source/expectations/data_values/ut_data_value.tpb index 8c8e677fb..d8feb1a62 100644 --- a/source/expectations/data_values/ut_data_value.tpb +++ b/source/expectations/data_values/ut_data_value.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value.tps b/source/expectations/data_values/ut_data_value.tps index 425fbeb54..ca7e18308 100644 --- a/source/expectations/data_values/ut_data_value.tps +++ b/source/expectations/data_values/ut_data_value.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value force authid current_user as object ( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_anydata.tpb b/source/expectations/data_values/ut_data_value_anydata.tpb index fe9a6a1bc..0b5447758 100644 --- a/source/expectations/data_values/ut_data_value_anydata.tpb +++ b/source/expectations/data_values/ut_data_value_anydata.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value_anydata as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_anydata.tps b/source/expectations/data_values/ut_data_value_anydata.tps index c0ee6137b..5ed0406ca 100644 --- a/source/expectations/data_values/ut_data_value_anydata.tps +++ b/source/expectations/data_values/ut_data_value_anydata.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value_anydata under ut_data_value_refcursor( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_blob.tpb b/source/expectations/data_values/ut_data_value_blob.tpb index c597af023..11af6d2f7 100644 --- a/source/expectations/data_values/ut_data_value_blob.tpb +++ b/source/expectations/data_values/ut_data_value_blob.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value_blob as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_blob.tps b/source/expectations/data_values/ut_data_value_blob.tps index ed6aa2afe..f557ffbce 100644 --- a/source/expectations/data_values/ut_data_value_blob.tps +++ b/source/expectations/data_values/ut_data_value_blob.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value_blob under ut_data_value( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_boolean.tpb b/source/expectations/data_values/ut_data_value_boolean.tpb index bc8c1e2f9..0645d3269 100644 --- a/source/expectations/data_values/ut_data_value_boolean.tpb +++ b/source/expectations/data_values/ut_data_value_boolean.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value_boolean as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_boolean.tps b/source/expectations/data_values/ut_data_value_boolean.tps index 62b413e10..a254e05c0 100644 --- a/source/expectations/data_values/ut_data_value_boolean.tps +++ b/source/expectations/data_values/ut_data_value_boolean.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value_boolean under ut_data_value( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_clob.tpb b/source/expectations/data_values/ut_data_value_clob.tpb index 7b7c7ffd8..dacb390b6 100644 --- a/source/expectations/data_values/ut_data_value_clob.tpb +++ b/source/expectations/data_values/ut_data_value_clob.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value_clob as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_clob.tps b/source/expectations/data_values/ut_data_value_clob.tps index 4212efb3c..1ff5d5623 100644 --- a/source/expectations/data_values/ut_data_value_clob.tps +++ b/source/expectations/data_values/ut_data_value_clob.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value_clob under ut_data_value( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_date.tpb b/source/expectations/data_values/ut_data_value_date.tpb index 727f624d4..dd87156bc 100644 --- a/source/expectations/data_values/ut_data_value_date.tpb +++ b/source/expectations/data_values/ut_data_value_date.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value_date as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_date.tps b/source/expectations/data_values/ut_data_value_date.tps index e1c358789..4435a3512 100644 --- a/source/expectations/data_values/ut_data_value_date.tps +++ b/source/expectations/data_values/ut_data_value_date.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value_date under ut_data_value( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_dsinterval.tpb b/source/expectations/data_values/ut_data_value_dsinterval.tpb index 6b49a5d1c..ff9d5fe1e 100644 --- a/source/expectations/data_values/ut_data_value_dsinterval.tpb +++ b/source/expectations/data_values/ut_data_value_dsinterval.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value_dsinterval as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_dsinterval.tps b/source/expectations/data_values/ut_data_value_dsinterval.tps index 2d3ad48f0..114619bf2 100644 --- a/source/expectations/data_values/ut_data_value_dsinterval.tps +++ b/source/expectations/data_values/ut_data_value_dsinterval.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value_dsinterval under ut_data_value( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_json.tpb b/source/expectations/data_values/ut_data_value_json.tpb index ee761b141..e4b556ef9 100644 --- a/source/expectations/data_values/ut_data_value_json.tpb +++ b/source/expectations/data_values/ut_data_value_json.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value_json as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_json.tps b/source/expectations/data_values/ut_data_value_json.tps index 50f721bf6..bfaccb2e2 100644 --- a/source/expectations/data_values/ut_data_value_json.tps +++ b/source/expectations/data_values/ut_data_value_json.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value_json under ut_compound_data_value( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_number.tpb b/source/expectations/data_values/ut_data_value_number.tpb index cbd524f42..b8a28a124 100644 --- a/source/expectations/data_values/ut_data_value_number.tpb +++ b/source/expectations/data_values/ut_data_value_number.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value_number as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_number.tps b/source/expectations/data_values/ut_data_value_number.tps index 674dd89fe..872ab405e 100644 --- a/source/expectations/data_values/ut_data_value_number.tps +++ b/source/expectations/data_values/ut_data_value_number.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value_number under ut_data_value( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index d73a3e011..eda5b2cd9 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value_refcursor as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_refcursor.tps b/source/expectations/data_values/ut_data_value_refcursor.tps index 7556ec3de..4de253b8f 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tps +++ b/source/expectations/data_values/ut_data_value_refcursor.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value_refcursor under ut_compound_data_value( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_timestamp.tpb b/source/expectations/data_values/ut_data_value_timestamp.tpb index 7b9d15e41..adb18e360 100644 --- a/source/expectations/data_values/ut_data_value_timestamp.tpb +++ b/source/expectations/data_values/ut_data_value_timestamp.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value_timestamp as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_timestamp.tps b/source/expectations/data_values/ut_data_value_timestamp.tps index e32f855a6..ebd00762c 100644 --- a/source/expectations/data_values/ut_data_value_timestamp.tps +++ b/source/expectations/data_values/ut_data_value_timestamp.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value_timestamp under ut_data_value( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_timestamp_ltz.tpb b/source/expectations/data_values/ut_data_value_timestamp_ltz.tpb index 8abbfce12..0f41e16b1 100644 --- a/source/expectations/data_values/ut_data_value_timestamp_ltz.tpb +++ b/source/expectations/data_values/ut_data_value_timestamp_ltz.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value_timestamp_ltz as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_timestamp_ltz.tps b/source/expectations/data_values/ut_data_value_timestamp_ltz.tps index 869197c98..3608ebd37 100644 --- a/source/expectations/data_values/ut_data_value_timestamp_ltz.tps +++ b/source/expectations/data_values/ut_data_value_timestamp_ltz.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value_timestamp_ltz under ut_data_value( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_timestamp_tz.tpb b/source/expectations/data_values/ut_data_value_timestamp_tz.tpb index a61d60e33..710a313a7 100644 --- a/source/expectations/data_values/ut_data_value_timestamp_tz.tpb +++ b/source/expectations/data_values/ut_data_value_timestamp_tz.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value_timestamp_tz as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_timestamp_tz.tps b/source/expectations/data_values/ut_data_value_timestamp_tz.tps index 55aa3a803..ca0bfc5cb 100644 --- a/source/expectations/data_values/ut_data_value_timestamp_tz.tps +++ b/source/expectations/data_values/ut_data_value_timestamp_tz.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value_timestamp_tz under ut_data_value( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_varchar2.tpb b/source/expectations/data_values/ut_data_value_varchar2.tpb index 4f80ee161..da4276d51 100644 --- a/source/expectations/data_values/ut_data_value_varchar2.tpb +++ b/source/expectations/data_values/ut_data_value_varchar2.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value_varchar2 as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_varchar2.tps b/source/expectations/data_values/ut_data_value_varchar2.tps index ce5954a09..27bb720ce 100644 --- a/source/expectations/data_values/ut_data_value_varchar2.tps +++ b/source/expectations/data_values/ut_data_value_varchar2.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value_varchar2 under ut_data_value( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_xmltype.tpb b/source/expectations/data_values/ut_data_value_xmltype.tpb index ecefb664d..3b10aadce 100644 --- a/source/expectations/data_values/ut_data_value_xmltype.tpb +++ b/source/expectations/data_values/ut_data_value_xmltype.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value_xmltype as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_xmltype.tps b/source/expectations/data_values/ut_data_value_xmltype.tps index 42c54ae05..476097de3 100644 --- a/source/expectations/data_values/ut_data_value_xmltype.tps +++ b/source/expectations/data_values/ut_data_value_xmltype.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value_xmltype under ut_data_value( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_yminterval.tpb b/source/expectations/data_values/ut_data_value_yminterval.tpb index 38f3cf857..6d6a05b4a 100644 --- a/source/expectations/data_values/ut_data_value_yminterval.tpb +++ b/source/expectations/data_values/ut_data_value_yminterval.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value_yminterval as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_yminterval.tps b/source/expectations/data_values/ut_data_value_yminterval.tps index efc9e0e48..d20dfcad7 100644 --- a/source/expectations/data_values/ut_data_value_yminterval.tps +++ b/source/expectations/data_values/ut_data_value_yminterval.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value_yminterval under ut_data_value( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_json_data_diff_tmp.sql b/source/expectations/data_values/ut_json_data_diff_tmp.sql index 08de6ccf8..3d77dca8b 100644 --- a/source/expectations/data_values/ut_json_data_diff_tmp.sql +++ b/source/expectations/data_values/ut_json_data_diff_tmp.sql @@ -1,7 +1,7 @@ create global temporary table ut_json_data_diff_tmp( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/expectations/data_values/ut_json_leaf.tps b/source/expectations/data_values/ut_json_leaf.tps index b283367a4..c38c3b238 100644 --- a/source/expectations/data_values/ut_json_leaf.tps +++ b/source/expectations/data_values/ut_json_leaf.tps @@ -1,7 +1,7 @@ create or replace type ut_json_leaf authid current_user as object ( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_json_leaf_tab.tps b/source/expectations/data_values/ut_json_leaf_tab.tps index 50a247ad6..0c7a40b9f 100644 --- a/source/expectations/data_values/ut_json_leaf_tab.tps +++ b/source/expectations/data_values/ut_json_leaf_tab.tps @@ -1,7 +1,7 @@ create or replace type ut_json_leaf_tab as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_json_tree_details.tps b/source/expectations/data_values/ut_json_tree_details.tps index 8e04e8b83..0684ecafe 100644 --- a/source/expectations/data_values/ut_json_tree_details.tps +++ b/source/expectations/data_values/ut_json_tree_details.tps @@ -1,7 +1,7 @@ create or replace type ut_json_tree_details force as object ( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_key_anyval_pair.tps b/source/expectations/data_values/ut_key_anyval_pair.tps index e0701ef28..4903282e9 100644 --- a/source/expectations/data_values/ut_key_anyval_pair.tps +++ b/source/expectations/data_values/ut_key_anyval_pair.tps @@ -1,7 +1,7 @@ create or replace type ut_key_anyval_pair force as object( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_key_anyval_pairs.tps b/source/expectations/data_values/ut_key_anyval_pairs.tps index 40748c5a5..94bd5df54 100644 --- a/source/expectations/data_values/ut_key_anyval_pairs.tps +++ b/source/expectations/data_values/ut_key_anyval_pairs.tps @@ -1,7 +1,7 @@ create or replace type ut_key_anyval_pairs as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_key_anyvalues.tpb b/source/expectations/data_values/ut_key_anyvalues.tpb index 07413f77b..93bf1eb53 100644 --- a/source/expectations/data_values/ut_key_anyvalues.tpb +++ b/source/expectations/data_values/ut_key_anyvalues.tpb @@ -1,7 +1,7 @@ create or replace type body ut_key_anyvalues as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_key_anyvalues.tps b/source/expectations/data_values/ut_key_anyvalues.tps index c871d1466..6dd32a76d 100644 --- a/source/expectations/data_values/ut_key_anyvalues.tps +++ b/source/expectations/data_values/ut_key_anyvalues.tps @@ -1,7 +1,7 @@ create or replace type ut_key_anyvalues under ut_event_item ( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_between.tpb b/source/expectations/matchers/ut_be_between.tpb index f4bf24aab..7368ad5a7 100644 --- a/source/expectations/matchers/ut_be_between.tpb +++ b/source/expectations/matchers/ut_be_between.tpb @@ -1,7 +1,7 @@ create or replace type body ut_be_between is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_between.tps b/source/expectations/matchers/ut_be_between.tps index 79c4ec2fe..7e254719e 100644 --- a/source/expectations/matchers/ut_be_between.tps +++ b/source/expectations/matchers/ut_be_between.tps @@ -1,7 +1,7 @@ create or replace type ut_be_between under ut_matcher( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_empty.tpb b/source/expectations/matchers/ut_be_empty.tpb index 82ad95d5a..08523fb02 100644 --- a/source/expectations/matchers/ut_be_empty.tpb +++ b/source/expectations/matchers/ut_be_empty.tpb @@ -1,7 +1,7 @@ create or replace type body ut_be_empty as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_empty.tps b/source/expectations/matchers/ut_be_empty.tps index 0acb80e55..76af402fe 100644 --- a/source/expectations/matchers/ut_be_empty.tps +++ b/source/expectations/matchers/ut_be_empty.tps @@ -1,7 +1,7 @@ create or replace type ut_be_empty under ut_matcher( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_false.tpb b/source/expectations/matchers/ut_be_false.tpb index 6e2f3ba1f..671f43cbe 100644 --- a/source/expectations/matchers/ut_be_false.tpb +++ b/source/expectations/matchers/ut_be_false.tpb @@ -1,7 +1,7 @@ create or replace type body ut_be_false as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_false.tps b/source/expectations/matchers/ut_be_false.tps index 06bb290d4..3d4e8dda9 100644 --- a/source/expectations/matchers/ut_be_false.tps +++ b/source/expectations/matchers/ut_be_false.tps @@ -1,7 +1,7 @@ create or replace type ut_be_false under ut_matcher( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_greater_or_equal.tpb b/source/expectations/matchers/ut_be_greater_or_equal.tpb index 978d821e1..6877eb32c 100644 --- a/source/expectations/matchers/ut_be_greater_or_equal.tpb +++ b/source/expectations/matchers/ut_be_greater_or_equal.tpb @@ -1,7 +1,7 @@ create or replace type body ut_be_greater_or_equal AS /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_greater_or_equal.tps b/source/expectations/matchers/ut_be_greater_or_equal.tps index b97589bb0..facd33b3d 100644 --- a/source/expectations/matchers/ut_be_greater_or_equal.tps +++ b/source/expectations/matchers/ut_be_greater_or_equal.tps @@ -1,7 +1,7 @@ create or replace type ut_be_greater_or_equal under ut_comparison_matcher( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_greater_than.tpb b/source/expectations/matchers/ut_be_greater_than.tpb index b7b52af9a..da46347af 100644 --- a/source/expectations/matchers/ut_be_greater_than.tpb +++ b/source/expectations/matchers/ut_be_greater_than.tpb @@ -1,7 +1,7 @@ create or replace type body ut_be_greater_than AS /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_greater_than.tps b/source/expectations/matchers/ut_be_greater_than.tps index 9963a6277..fa19a9bd4 100644 --- a/source/expectations/matchers/ut_be_greater_than.tps +++ b/source/expectations/matchers/ut_be_greater_than.tps @@ -1,7 +1,7 @@ create or replace type ut_be_greater_than under ut_comparison_matcher( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_less_or_equal.tpb b/source/expectations/matchers/ut_be_less_or_equal.tpb index 6f6b7febd..98c4238eb 100644 --- a/source/expectations/matchers/ut_be_less_or_equal.tpb +++ b/source/expectations/matchers/ut_be_less_or_equal.tpb @@ -1,7 +1,7 @@ create or replace type body ut_be_less_or_equal AS /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_less_or_equal.tps b/source/expectations/matchers/ut_be_less_or_equal.tps index a9fe9492b..225c99b72 100644 --- a/source/expectations/matchers/ut_be_less_or_equal.tps +++ b/source/expectations/matchers/ut_be_less_or_equal.tps @@ -1,7 +1,7 @@ create or replace type ut_be_less_or_equal under ut_comparison_matcher( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_less_than.tpb b/source/expectations/matchers/ut_be_less_than.tpb index 7d3e06d62..e1c5c84b1 100644 --- a/source/expectations/matchers/ut_be_less_than.tpb +++ b/source/expectations/matchers/ut_be_less_than.tpb @@ -1,7 +1,7 @@ create or replace type body ut_be_less_than as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_less_than.tps b/source/expectations/matchers/ut_be_less_than.tps index f6ae1f0e4..8482f0327 100644 --- a/source/expectations/matchers/ut_be_less_than.tps +++ b/source/expectations/matchers/ut_be_less_than.tps @@ -1,7 +1,7 @@ create or replace type ut_be_less_than under ut_comparison_matcher( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_like.tpb b/source/expectations/matchers/ut_be_like.tpb index 315f43d6c..dbcd1c798 100644 --- a/source/expectations/matchers/ut_be_like.tpb +++ b/source/expectations/matchers/ut_be_like.tpb @@ -1,7 +1,7 @@ create or replace type body ut_be_like as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_like.tps b/source/expectations/matchers/ut_be_like.tps index 1e8430e32..0c1609a98 100644 --- a/source/expectations/matchers/ut_be_like.tps +++ b/source/expectations/matchers/ut_be_like.tps @@ -1,7 +1,7 @@ create or replace type ut_be_like under ut_matcher( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_not_null.tpb b/source/expectations/matchers/ut_be_not_null.tpb index 595a94b75..94ee0ce0a 100644 --- a/source/expectations/matchers/ut_be_not_null.tpb +++ b/source/expectations/matchers/ut_be_not_null.tpb @@ -1,7 +1,7 @@ create or replace type body ut_be_not_null as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_not_null.tps b/source/expectations/matchers/ut_be_not_null.tps index 42e899701..34cc2bfd0 100644 --- a/source/expectations/matchers/ut_be_not_null.tps +++ b/source/expectations/matchers/ut_be_not_null.tps @@ -1,7 +1,7 @@ create or replace type ut_be_not_null under ut_matcher( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_null.tpb b/source/expectations/matchers/ut_be_null.tpb index 82a4391d6..3194f092f 100644 --- a/source/expectations/matchers/ut_be_null.tpb +++ b/source/expectations/matchers/ut_be_null.tpb @@ -1,7 +1,7 @@ create or replace type body ut_be_null as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_null.tps b/source/expectations/matchers/ut_be_null.tps index ef30feea1..486e11f28 100644 --- a/source/expectations/matchers/ut_be_null.tps +++ b/source/expectations/matchers/ut_be_null.tps @@ -1,7 +1,7 @@ create or replace type ut_be_null under ut_matcher( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_true.tpb b/source/expectations/matchers/ut_be_true.tpb index 3c83002e0..565ab590b 100644 --- a/source/expectations/matchers/ut_be_true.tpb +++ b/source/expectations/matchers/ut_be_true.tpb @@ -1,7 +1,7 @@ create or replace type body ut_be_true as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_true.tps b/source/expectations/matchers/ut_be_true.tps index f73c7700b..b994913f5 100644 --- a/source/expectations/matchers/ut_be_true.tps +++ b/source/expectations/matchers/ut_be_true.tps @@ -1,7 +1,7 @@ create or replace type ut_be_true under ut_matcher( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_comparison_matcher.tpb b/source/expectations/matchers/ut_comparison_matcher.tpb index 6eec4c11a..50f8d6050 100644 --- a/source/expectations/matchers/ut_comparison_matcher.tpb +++ b/source/expectations/matchers/ut_comparison_matcher.tpb @@ -1,7 +1,7 @@ create or replace type body ut_comparison_matcher as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_comparison_matcher.tps b/source/expectations/matchers/ut_comparison_matcher.tps index d66ad8b56..76520a296 100644 --- a/source/expectations/matchers/ut_comparison_matcher.tps +++ b/source/expectations/matchers/ut_comparison_matcher.tps @@ -1,7 +1,7 @@ create or replace type ut_comparison_matcher under ut_matcher( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_contain.tpb b/source/expectations/matchers/ut_contain.tpb index bb6e78d50..cf6653f63 100644 --- a/source/expectations/matchers/ut_contain.tpb +++ b/source/expectations/matchers/ut_contain.tpb @@ -1,7 +1,7 @@ create or replace type body ut_contain as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_contain.tps b/source/expectations/matchers/ut_contain.tps index bb4e1b40a..518352573 100644 --- a/source/expectations/matchers/ut_contain.tps +++ b/source/expectations/matchers/ut_contain.tps @@ -1,7 +1,7 @@ create or replace type ut_contain under ut_equal( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_equal.tpb b/source/expectations/matchers/ut_equal.tpb index 9df566af7..2e774d396 100644 --- a/source/expectations/matchers/ut_equal.tpb +++ b/source/expectations/matchers/ut_equal.tpb @@ -1,7 +1,7 @@ create or replace type body ut_equal as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_equal.tps b/source/expectations/matchers/ut_equal.tps index 6158a6fd3..1f42324d7 100644 --- a/source/expectations/matchers/ut_equal.tps +++ b/source/expectations/matchers/ut_equal.tps @@ -1,7 +1,7 @@ create or replace type ut_equal force under ut_comparison_matcher( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_have_count.tpb b/source/expectations/matchers/ut_have_count.tpb index 1cca8a228..b0f4e06d4 100644 --- a/source/expectations/matchers/ut_have_count.tpb +++ b/source/expectations/matchers/ut_have_count.tpb @@ -1,7 +1,7 @@ create or replace type body ut_have_count as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_have_count.tps b/source/expectations/matchers/ut_have_count.tps index dc4511d72..fb0fc76fc 100644 --- a/source/expectations/matchers/ut_have_count.tps +++ b/source/expectations/matchers/ut_have_count.tps @@ -1,7 +1,7 @@ create or replace type ut_have_count under ut_matcher( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_match.tpb b/source/expectations/matchers/ut_match.tpb index f85af4aac..57fabbaec 100644 --- a/source/expectations/matchers/ut_match.tpb +++ b/source/expectations/matchers/ut_match.tpb @@ -1,7 +1,7 @@ create or replace type body ut_match as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_match.tps b/source/expectations/matchers/ut_match.tps index ca9fcd34c..8d6b0f73a 100644 --- a/source/expectations/matchers/ut_match.tps +++ b/source/expectations/matchers/ut_match.tps @@ -1,7 +1,7 @@ create or replace type ut_match under ut_matcher( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_matcher.tpb b/source/expectations/matchers/ut_matcher.tpb index 4f3b324b4..228f2caad 100644 --- a/source/expectations/matchers/ut_matcher.tpb +++ b/source/expectations/matchers/ut_matcher.tpb @@ -1,7 +1,7 @@ create or replace type body ut_matcher as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_matcher.tps b/source/expectations/matchers/ut_matcher.tps index f4c082af0..34e1742df 100644 --- a/source/expectations/matchers/ut_matcher.tps +++ b/source/expectations/matchers/ut_matcher.tps @@ -1,7 +1,7 @@ create or replace type ut_matcher authid current_user as object( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_matcher_options.tpb b/source/expectations/matchers/ut_matcher_options.tpb index 7741747d5..6fec3dee6 100644 --- a/source/expectations/matchers/ut_matcher_options.tpb +++ b/source/expectations/matchers/ut_matcher_options.tpb @@ -1,7 +1,7 @@ create or replace type body ut_matcher_options as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_matcher_options.tps b/source/expectations/matchers/ut_matcher_options.tps index cae062bf1..dbdf985f0 100644 --- a/source/expectations/matchers/ut_matcher_options.tps +++ b/source/expectations/matchers/ut_matcher_options.tps @@ -1,7 +1,7 @@ create or replace type ut_matcher_options authid current_user as object( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_matcher_options_items.tpb b/source/expectations/matchers/ut_matcher_options_items.tpb index 575537417..2c3f51d34 100644 --- a/source/expectations/matchers/ut_matcher_options_items.tpb +++ b/source/expectations/matchers/ut_matcher_options_items.tpb @@ -1,7 +1,7 @@ create or replace type body ut_matcher_options_items is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_matcher_options_items.tps b/source/expectations/matchers/ut_matcher_options_items.tps index 81ee17897..cc74650f3 100644 --- a/source/expectations/matchers/ut_matcher_options_items.tps +++ b/source/expectations/matchers/ut_matcher_options_items.tps @@ -1,7 +1,7 @@ create or replace type ut_matcher_options_items authid current_user as object( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/ut_expectation.tpb b/source/expectations/ut_expectation.tpb index a94dadbc7..b50efef6a 100644 --- a/source/expectations/ut_expectation.tpb +++ b/source/expectations/ut_expectation.tpb @@ -1,7 +1,7 @@ create or replace type body ut_expectation as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/ut_expectation.tps b/source/expectations/ut_expectation.tps index 79d81f106..5b3370c43 100644 --- a/source/expectations/ut_expectation.tps +++ b/source/expectations/ut_expectation.tps @@ -1,7 +1,7 @@ create or replace type ut_expectation authid current_user as object( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/ut_expectation_compound.tpb b/source/expectations/ut_expectation_compound.tpb index 603513e78..aaab7cb34 100644 --- a/source/expectations/ut_expectation_compound.tpb +++ b/source/expectations/ut_expectation_compound.tpb @@ -1,7 +1,7 @@ create or replace type body ut_expectation_compound as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/ut_expectation_compound.tps b/source/expectations/ut_expectation_compound.tps index a0f935c5c..bd17eb8b1 100644 --- a/source/expectations/ut_expectation_compound.tps +++ b/source/expectations/ut_expectation_compound.tps @@ -1,7 +1,7 @@ create or replace type ut_expectation_compound force under ut_expectation( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/ut_expectation_json.tpb b/source/expectations/ut_expectation_json.tpb index d015aa5f4..954daf4e7 100644 --- a/source/expectations/ut_expectation_json.tpb +++ b/source/expectations/ut_expectation_json.tpb @@ -1,7 +1,7 @@ create or replace type body ut_expectation_json as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/ut_expectation_json.tps b/source/expectations/ut_expectation_json.tps index d032d7851..9cc9aecb8 100644 --- a/source/expectations/ut_expectation_json.tps +++ b/source/expectations/ut_expectation_json.tps @@ -1,7 +1,7 @@ create or replace type ut_expectation_json under ut_expectation( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/install.sql b/source/install.sql index 842172a5f..c8eab658c 100644 --- a/source/install.sql +++ b/source/install.sql @@ -1,6 +1,6 @@ /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/install_component.sql b/source/install_component.sql index 16c4cd8a0..857c1771c 100644 --- a/source/install_component.sql +++ b/source/install_component.sql @@ -1,6 +1,6 @@ /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/install_ddl_trigger.sql b/source/install_ddl_trigger.sql index 3725ff332..1395cc50c 100644 --- a/source/install_ddl_trigger.sql +++ b/source/install_ddl_trigger.sql @@ -1,6 +1,6 @@ /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/install_headless.sql b/source/install_headless.sql index 5162b4c03..e8cf00705 100644 --- a/source/install_headless.sql +++ b/source/install_headless.sql @@ -1,6 +1,6 @@ /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/install_headless_with_trigger.sql b/source/install_headless_with_trigger.sql index 7140ee822..0e13d7a59 100644 --- a/source/install_headless_with_trigger.sql +++ b/source/install_headless_with_trigger.sql @@ -1,6 +1,6 @@ /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_ansiconsole_helper.pkb b/source/reporters/ut_ansiconsole_helper.pkb index 07d9ee9a7..b015e50be 100644 --- a/source/reporters/ut_ansiconsole_helper.pkb +++ b/source/reporters/ut_ansiconsole_helper.pkb @@ -1,7 +1,7 @@ create or replace package body ut_ansiconsole_helper as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_ansiconsole_helper.pks b/source/reporters/ut_ansiconsole_helper.pks index f34ff12bd..7c83ca73b 100644 --- a/source/reporters/ut_ansiconsole_helper.pks +++ b/source/reporters/ut_ansiconsole_helper.pks @@ -1,7 +1,7 @@ create or replace package ut_ansiconsole_helper as /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_coverage_cobertura_reporter.tpb b/source/reporters/ut_coverage_cobertura_reporter.tpb index 56fd4b524..eed8e8e73 100644 --- a/source/reporters/ut_coverage_cobertura_reporter.tpb +++ b/source/reporters/ut_coverage_cobertura_reporter.tpb @@ -1,7 +1,7 @@ create or replace type body ut_coverage_cobertura_reporter is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_coverage_cobertura_reporter.tps b/source/reporters/ut_coverage_cobertura_reporter.tps index 6bfd60892..ec5cef2cb 100644 --- a/source/reporters/ut_coverage_cobertura_reporter.tps +++ b/source/reporters/ut_coverage_cobertura_reporter.tps @@ -1,7 +1,7 @@ create or replace type ut_coverage_cobertura_reporter under ut_coverage_reporter_base( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_coverage_html_reporter.tpb b/source/reporters/ut_coverage_html_reporter.tpb index 77d4b46ff..9e51b5cc2 100644 --- a/source/reporters/ut_coverage_html_reporter.tpb +++ b/source/reporters/ut_coverage_html_reporter.tpb @@ -1,7 +1,7 @@ create or replace type body ut_coverage_html_reporter is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_coverage_html_reporter.tps b/source/reporters/ut_coverage_html_reporter.tps index 11984ac58..f6bdcc249 100644 --- a/source/reporters/ut_coverage_html_reporter.tps +++ b/source/reporters/ut_coverage_html_reporter.tps @@ -1,7 +1,7 @@ create or replace type ut_coverage_html_reporter under ut_coverage_reporter_base( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_coverage_report_html_helper.pkb b/source/reporters/ut_coverage_report_html_helper.pkb index 3ab0b1fb6..00a53c4c6 100644 --- a/source/reporters/ut_coverage_report_html_helper.pkb +++ b/source/reporters/ut_coverage_report_html_helper.pkb @@ -1,7 +1,7 @@ create or replace package body ut_coverage_report_html_helper is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_coverage_report_html_helper.pks b/source/reporters/ut_coverage_report_html_helper.pks index bc4d025f3..48dd76acf 100644 --- a/source/reporters/ut_coverage_report_html_helper.pks +++ b/source/reporters/ut_coverage_report_html_helper.pks @@ -1,7 +1,7 @@ create or replace package ut_coverage_report_html_helper authid current_user is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_coverage_sonar_reporter.tpb b/source/reporters/ut_coverage_sonar_reporter.tpb index fcc213665..bfe0d890b 100644 --- a/source/reporters/ut_coverage_sonar_reporter.tpb +++ b/source/reporters/ut_coverage_sonar_reporter.tpb @@ -1,7 +1,7 @@ create or replace type body ut_coverage_sonar_reporter is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_coverage_sonar_reporter.tps b/source/reporters/ut_coverage_sonar_reporter.tps index af52f1675..aa21cafe3 100644 --- a/source/reporters/ut_coverage_sonar_reporter.tps +++ b/source/reporters/ut_coverage_sonar_reporter.tps @@ -1,7 +1,7 @@ create or replace type ut_coverage_sonar_reporter under ut_coverage_reporter_base( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_coveralls_reporter.tpb b/source/reporters/ut_coveralls_reporter.tpb index 46c0947d0..1ca317c69 100644 --- a/source/reporters/ut_coveralls_reporter.tpb +++ b/source/reporters/ut_coveralls_reporter.tpb @@ -1,7 +1,7 @@ create or replace type body ut_coveralls_reporter is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_coveralls_reporter.tps b/source/reporters/ut_coveralls_reporter.tps index b5c1e1f28..53e86338e 100644 --- a/source/reporters/ut_coveralls_reporter.tps +++ b/source/reporters/ut_coveralls_reporter.tps @@ -1,7 +1,7 @@ create or replace type ut_coveralls_reporter under ut_coverage_reporter_base( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_debug_reporter.tpb b/source/reporters/ut_debug_reporter.tpb index f22e8748b..365f77755 100644 --- a/source/reporters/ut_debug_reporter.tpb +++ b/source/reporters/ut_debug_reporter.tpb @@ -1,7 +1,7 @@ create or replace type body ut_debug_reporter is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_debug_reporter.tps b/source/reporters/ut_debug_reporter.tps index 91e90e28c..5fbab61fb 100644 --- a/source/reporters/ut_debug_reporter.tps +++ b/source/reporters/ut_debug_reporter.tps @@ -1,7 +1,7 @@ create or replace type ut_debug_reporter under ut_output_reporter_base( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_documentation_reporter.tpb b/source/reporters/ut_documentation_reporter.tpb index 7cf9a02cc..7210e1cb6 100644 --- a/source/reporters/ut_documentation_reporter.tpb +++ b/source/reporters/ut_documentation_reporter.tpb @@ -1,7 +1,7 @@ create or replace type body ut_documentation_reporter is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_documentation_reporter.tps b/source/reporters/ut_documentation_reporter.tps index 275408a35..08097e7d4 100644 --- a/source/reporters/ut_documentation_reporter.tps +++ b/source/reporters/ut_documentation_reporter.tps @@ -1,7 +1,7 @@ create or replace type ut_documentation_reporter under ut_console_reporter_base( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_junit_reporter.tpb b/source/reporters/ut_junit_reporter.tpb index c08790080..aa6786f6f 100644 --- a/source/reporters/ut_junit_reporter.tpb +++ b/source/reporters/ut_junit_reporter.tpb @@ -1,7 +1,7 @@ create or replace type body ut_junit_reporter is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_junit_reporter.tps b/source/reporters/ut_junit_reporter.tps index 051358c59..ca6cf505b 100644 --- a/source/reporters/ut_junit_reporter.tps +++ b/source/reporters/ut_junit_reporter.tps @@ -1,7 +1,7 @@ create or replace type ut_junit_reporter force under ut_output_reporter_base( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_realtime_reporter.tpb b/source/reporters/ut_realtime_reporter.tpb index 493dbe513..7a3176ee6 100644 --- a/source/reporters/ut_realtime_reporter.tpb +++ b/source/reporters/ut_realtime_reporter.tpb @@ -1,7 +1,7 @@ create or replace type body ut_realtime_reporter is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_realtime_reporter.tps b/source/reporters/ut_realtime_reporter.tps index 096ebe8ee..99efed387 100644 --- a/source/reporters/ut_realtime_reporter.tps +++ b/source/reporters/ut_realtime_reporter.tps @@ -1,7 +1,7 @@ create or replace type ut_realtime_reporter force under ut_output_reporter_base( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_sonar_test_reporter.tpb b/source/reporters/ut_sonar_test_reporter.tpb index 874a07957..6d76b5d41 100644 --- a/source/reporters/ut_sonar_test_reporter.tpb +++ b/source/reporters/ut_sonar_test_reporter.tpb @@ -1,7 +1,7 @@ create or replace type body ut_sonar_test_reporter is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_sonar_test_reporter.tps b/source/reporters/ut_sonar_test_reporter.tps index 353edbf0d..8bdb067df 100644 --- a/source/reporters/ut_sonar_test_reporter.tps +++ b/source/reporters/ut_sonar_test_reporter.tps @@ -1,7 +1,7 @@ create or replace type ut_sonar_test_reporter under ut_output_reporter_base( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_teamcity_reporter.tpb b/source/reporters/ut_teamcity_reporter.tpb index d01e85153..ee0a53098 100644 --- a/source/reporters/ut_teamcity_reporter.tpb +++ b/source/reporters/ut_teamcity_reporter.tpb @@ -1,7 +1,7 @@ create or replace type body ut_teamcity_reporter is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_teamcity_reporter.tps b/source/reporters/ut_teamcity_reporter.tps index 7f61e2b6e..2738ec00e 100644 --- a/source/reporters/ut_teamcity_reporter.tps +++ b/source/reporters/ut_teamcity_reporter.tps @@ -1,7 +1,7 @@ create or replace type ut_teamcity_reporter under ut_output_reporter_base( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_teamcity_reporter_helper.pkb b/source/reporters/ut_teamcity_reporter_helper.pkb index f5167fbb8..2d165d7a3 100644 --- a/source/reporters/ut_teamcity_reporter_helper.pkb +++ b/source/reporters/ut_teamcity_reporter_helper.pkb @@ -1,7 +1,7 @@ create or replace package body ut_teamcity_reporter_helper is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_teamcity_reporter_helper.pks b/source/reporters/ut_teamcity_reporter_helper.pks index 6bab87367..7258999e1 100644 --- a/source/reporters/ut_teamcity_reporter_helper.pks +++ b/source/reporters/ut_teamcity_reporter_helper.pks @@ -1,7 +1,7 @@ create or replace package ut_teamcity_reporter_helper is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_tfs_junit_reporter.tpb b/source/reporters/ut_tfs_junit_reporter.tpb index 5fba96886..5262ac687 100644 --- a/source/reporters/ut_tfs_junit_reporter.tpb +++ b/source/reporters/ut_tfs_junit_reporter.tpb @@ -1,7 +1,7 @@ create or replace type body ut_tfs_junit_reporter is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_tfs_junit_reporter.tps b/source/reporters/ut_tfs_junit_reporter.tps index 9e7a90e0a..ecf422bd3 100644 --- a/source/reporters/ut_tfs_junit_reporter.tps +++ b/source/reporters/ut_tfs_junit_reporter.tps @@ -1,7 +1,7 @@ create or replace type ut_tfs_junit_reporter under ut_output_reporter_base( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_xunit_reporter.tpb b/source/reporters/ut_xunit_reporter.tpb index e2deb22ce..b06c20810 100644 --- a/source/reporters/ut_xunit_reporter.tpb +++ b/source/reporters/ut_xunit_reporter.tpb @@ -1,7 +1,7 @@ create or replace type body ut_xunit_reporter is /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_xunit_reporter.tps b/source/reporters/ut_xunit_reporter.tps index 81fa19e5b..b09205171 100644 --- a/source/reporters/ut_xunit_reporter.tps +++ b/source/reporters/ut_xunit_reporter.tps @@ -1,7 +1,7 @@ create or replace type ut_xunit_reporter under ut_junit_reporter( /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/set_install_params.sql b/source/set_install_params.sql index 1c7da89e9..4dc33c367 100644 --- a/source/set_install_params.sql +++ b/source/set_install_params.sql @@ -1,6 +1,6 @@ /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/uninstall.sql b/source/uninstall.sql index 7b927e91d..760bf89b7 100644 --- a/source/uninstall.sql +++ b/source/uninstall.sql @@ -1,6 +1,6 @@ /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/uninstall_all.sql b/source/uninstall_all.sql index 8d2bf0222..32180d762 100644 --- a/source/uninstall_all.sql +++ b/source/uninstall_all.sql @@ -1,6 +1,6 @@ /* utPLSQL - Version 3 - Copyright 2016 - 2018 utPLSQL Project + Copyright 2016 - 2019 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. From e66e134267f48741202d16b8d71f7d5ee058c6d9 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 17 Jun 2019 23:44:56 +0000 Subject: [PATCH 0516/1096] Updated project version after build [skip ci] --- VERSION | 2 +- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- sonar-project.properties | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/VERSION b/VERSION index 5ae33779b..e5e2ba276 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.7-develop +v3.1.7 diff --git a/docs/about/authors.md b/docs/about/authors.md index 894d67d81..92efc92e5 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index ea8d75748..a76ddcd6b 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 95d5f4eea..74f2c9804 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index a13e60c1a..180752b3b 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 6011aa181..9ba5d6892 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 3757c4459..5a6480087 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 0aabddae8..bf8137c70 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 176baaa41..1aa202e58 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index ed684cfca..c24bfae19 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index a673ea733..d772aed53 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 58142bd75..ccb88f21c 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 8e06e1493..42e4cea4b 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 3d4598980..bf4558ca9 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index b073305bd..868f69556 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 3a2fc3ca1..e583bcbda 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index b697907c2..79f7569b9 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 0d9a00398..2c93c439f 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3083--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) # Upgrading from version 2 diff --git a/sonar-project.properties b/sonar-project.properties index c3acb5c43..2b1270d6e 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,7 @@ sonar.projectKey=utPLSQL # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=utPLSQL -sonar.projectVersion=v3.1.7-develop +sonar.projectVersion=v3.1.7 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # Since SonarQube 4.2, this property is optional if sonar.modules is set. diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 72cfc7388..d56df250c 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -776,7 +776,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.7.3083-develop + * secion v3.1.7.3085 */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 421bd85eb..43dfdb1bb 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.7.3083-develop'; + gc_version constant varchar2(50) := 'v3.1.7.3085'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 46aa44300d42b71528d62efdb8059e40eeebe8e1 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 18 Jun 2019 23:19:12 +0100 Subject: [PATCH 0517/1096] Updated `releasing.md` --- development/releasing.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/development/releasing.md b/development/releasing.md index 3d2eed97d..3e9ac64fa 100644 --- a/development/releasing.md +++ b/development/releasing.md @@ -7,18 +7,20 @@ To create a release: - create release branch from development branch and make sure to name the release branch: `release/vX.Y.Z` - update, commit and push at least one file change in the release branch, to kickoff a Travis build - wait for th build to complete successfully - - merge the release branch to master and wait for master build to complete successfully - - create a release from the master branch using [github releases page](https://github.com/utPLSQL/utPLSQL/releases) and populate release description using information found on the issues and pull requests since previous release. + - merge the release branch to master and wait for master build to complete successfully (do not use Squash/rebase for merge operation) + - create a Github release from the master branch using [github releases page](https://github.com/utPLSQL/utPLSQL/releases) and populate release description using information found on the issues and pull requests since previous release. To find issues closed after certain date use [advanced filters](https://help.github.com/articles/searching-issues-and-pull-requests/#search-by-open-or-closed-state). Example: [`is:issue closed:>2018-07-22`](https://github.com/utPLSQL/utPLSQL/issues?utf8=%E2%9C%93&q=is%3Aissue+closed%3A%3E2018-07-22+) - - After release was successfully built, merge master branch back into develop branch + - After A build was completed on a TAG (github release) was successful, merge master branch back into develop branch. + - At this point, master branch and release tag should be at the same commit version and artifacts should be uploaded into Github release. - After develop branch was built, update version number in `VERSION` file to represent next planned release version. - Clone `utplsql.githug.io` project and add a new announcement about next version being released in `_posts`. Use previous announcements as a template. Make sure to set date, time and post title properly. The following will happen: - build executed on branch `release/vX.Y.Z-[something]` updates files `sonar-project.properties`, `VERSION` with project version derived from the release branch name - changes to those two files are committed and pushed back to release branch by Travis - - when a release is created, a new tag is added in on the repository and a tag build is executed + - builds on master branch are **not getting executed** + - when a Github release is created, a new tag is added in on the repository and a tag build is executed - the documentation for new release is published on `utplsql.github.io` and installation archives are added to the tag. Note: From e40966493a52979715697914f94dee1c9edf8e85 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 18 Jun 2019 23:38:41 +0100 Subject: [PATCH 0518/1096] Update `VERSION` to v3.1.8 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index e5e2ba276..25742a1c4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.7 +v3.1.8 From a594288958039cd04b9c61cfaee1388aaed18247 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 18 Jun 2019 22:58:40 +0000 Subject: [PATCH 0519/1096] Updated project version after build [skip ci] --- VERSION | 2 +- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- sonar-project.properties | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/VERSION b/VERSION index 25742a1c4..ff96ff1c9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.8 +v3.1.8-develop diff --git a/docs/about/authors.md b/docs/about/authors.md index 92efc92e5..8a9a7a79e 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index a76ddcd6b..3534e3d73 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 74f2c9804..650424781 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 180752b3b..10c506b05 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 9ba5d6892..455b2f73c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 5a6480087..6356c6e99 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index bf8137c70..e38944e0b 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 1aa202e58..7d706ba61 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index c24bfae19..9b0ecc019 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index d772aed53..a091017bd 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index ccb88f21c..d1c66e109 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 42e4cea4b..402381288 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index bf4558ca9..f525bd144 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 868f69556..7c4a530c2 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index e583bcbda..0a2c8aa70 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 79f7569b9..2ee977903 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 2c93c439f..4a0200fa6 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.7.3085-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) # Upgrading from version 2 diff --git a/sonar-project.properties b/sonar-project.properties index 2b1270d6e..c627c45e0 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,7 @@ sonar.projectKey=utPLSQL # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=utPLSQL -sonar.projectVersion=v3.1.7 +sonar.projectVersion=v3.1.8-develop # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # Since SonarQube 4.2, this property is optional if sonar.modules is set. diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index d56df250c..b1f8cfc45 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -776,7 +776,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.7.3085 + * secion v3.1.8.3097-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 43dfdb1bb..c6b2ac193 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.7.3085'; + gc_version constant varchar2(50) := 'v3.1.8.3097-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 2e0eee80fb2de84e236807720fa31ca910d6b286 Mon Sep 17 00:00:00 2001 From: lwasylow Date: Wed, 19 Jun 2019 08:52:28 +0100 Subject: [PATCH 0520/1096] Address issue for Oracle 11.2 where the local collection is used in SQL statement. Switch to query table directly. --- source/expectations/data_values/ut_compound_data_helper.pkb | 5 +++-- source/expectations/data_values/ut_compound_data_helper.pks | 2 +- source/expectations/data_values/ut_data_value_json.tpb | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 755c5154d..cbfc5ac58 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -724,12 +724,13 @@ create or replace package body ut_compound_data_helper is return l_diffs.count; end; - function get_json_diffs_type(a_diffs_all tt_json_diff_tab) return tt_json_diff_type_tab is + function get_json_diffs_type(a_diff_id raw) return tt_json_diff_type_tab is l_diffs_summary tt_json_diff_type_tab := tt_json_diff_type_tab(); begin select d.difference_type,count(1) bulk collect into l_diffs_summary - from table(a_diffs_all) d + from ut_json_data_diff_tmp d + where diff_id = a_diff_id group by d.difference_type; return l_diffs_summary; diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 56745be76..8d763c80c 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -134,7 +134,7 @@ create or replace package ut_compound_data_helper authid definer is function get_json_diffs_tmp(a_diff_id raw) return tt_json_diff_tab; - function get_json_diffs_type(a_diffs_all tt_json_diff_tab) return tt_json_diff_type_tab; + function get_json_diffs_type(a_diff_id raw) return tt_json_diff_type_tab; end; / diff --git a/source/expectations/data_values/ut_data_value_json.tpb b/source/expectations/data_values/ut_data_value_json.tpb index e4b556ef9..0f3f5287b 100644 --- a/source/expectations/data_values/ut_data_value_json.tpb +++ b/source/expectations/data_values/ut_data_value_json.tpb @@ -58,8 +58,8 @@ create or replace type body ut_data_value_json as l_diffs ut_compound_data_helper.tt_json_diff_tab; l_message varchar2(32767); - function get_diff_by_type(a_diff ut_compound_data_helper.tt_json_diff_tab) return clob is - l_diff_summary ut_compound_data_helper.tt_json_diff_type_tab := ut_compound_data_helper.get_json_diffs_type(a_diff); + function get_diff_by_type(a_diff_id raw) return clob is + l_diff_summary ut_compound_data_helper.tt_json_diff_type_tab := ut_compound_data_helper.get_json_diffs_type(a_diff_id); l_message_list ut_varchar2_list := ut_varchar2_list(); begin for i in 1..l_diff_summary.count loop @@ -103,7 +103,7 @@ create or replace type body ut_data_value_json as l_message := ' '||l_diffs.count|| ' differences found' || case when l_diffs.count > c_max_rows then ', showing first '|| c_max_rows else null end||chr(10); ut_utils.append_to_clob( l_result, l_message ); - l_message := get_diff_by_type(l_diffs)||chr(10); + l_message := get_diff_by_type(l_diff_id)||chr(10); ut_utils.append_to_clob( l_result, l_message ); for i in 1 .. least( c_max_rows, l_diffs.count ) loop From 8620240d8afa342ec21bd9940559f43792c45259 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 19 Jun 2019 21:49:43 +0100 Subject: [PATCH 0521/1096] Reorganized test-users privileges --- .travis/install.sh | 86 ++++++++++++++++---------- source/create_utplsql_owner.sql | 2 +- test/grant_ut3_owner_to_ut3_tester.sql | 35 ----------- test/install_and_run_tests.sh | 25 +------- test/install_tests.sh | 13 ++++ test/run_tests.sh | 18 ++++++ 6 files changed, 89 insertions(+), 90 deletions(-) delete mode 100644 test/grant_ut3_owner_to_ut3_tester.sql create mode 100755 test/install_tests.sh create mode 100755 test/run_tests.sh diff --git a/.travis/install.sh b/.travis/install.sh index bb117c67c..b9dcce954 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -5,6 +5,7 @@ set -ev #install core of utplsql time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL +whenever sqlerror exit failure rollback set feedback off set verify off @@ -57,46 +58,69 @@ SQL fi -#additional privileges to run scripted tests -time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL -set feedback on ---needed for Mystats script to work -grant select any dictionary to $UT3_OWNER; ---Needed for testing a coverage outside ut3_owner. -grant create any procedure, drop any procedure, execute any procedure to $UT3_OWNER; -SQL -#Create user that will own the tests that are relevant to internal framework time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL set feedback off -@create_utplsql_owner.sql $UT3_TESTER $UT3_TESTER_PASSWORD $UT3_TABLESPACE ---needed for disabling DDL trigger and testint parser without trigger enabled/present -grant alter any trigger to ut3_tester; +whenever sqlerror exit failure rollback + +-------------------------------------------------------------------------------- +PROMPT Creating $UT3_TESTER - Power-user for testing internal framework code + +create user $UT3_TESTER identified by "$UT3_TESTER_PASSWORD" default tablespace $UT3_TABLESPACE quota unlimited on $UT3_TABLESPACE; +grant create session, create procedure, create type, create table to $UT3_TESTER; + +PROMPT Additional grants for disabling DDL trigger and testing parser without trigger enabled/present + +grant alter any trigger to $UT3_TESTER; grant administer database trigger to $UT3_TESTER; -exit -SQL +grant execute on dbms_lock to $UT3_TESTER; -#Create additional UT3$USER# to test for special characters and front end API testing -time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL -set feedback off -@create_utplsql_owner.sql $UT3_USER $UT3_USER_PASSWORD $UT3_TABLESPACE ---Grant UT3 framework to min user -@create_user_grants.sql $UT3_OWNER $UT3_USER -exit -SQL +PROMPT Granting $UT3_OWNER code to $UT3_TESTER -#Create additional UT3_TESTER_HELPER that will provide a functions to allow min grant test user setup test -time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL -set feedback off -@create_utplsql_owner.sql $UT3_TESTER_HELPER $UT3_TESTER_HELPER_PASSWORD $UT3_TABLESPACE ---needed for testing distributed transactions +begin + for i in ( + select object_name from all_objects t + where t.object_type in ('PACKAGE','TYPE') + and owner = 'UT3' + and generated = 'N' + and object_name not like 'SYS%') + loop + execute immediate 'grant execute on ut3."'||i.object_name||'" to UT3_TESTER'; + end loop; +end; +/ + +PROMPT Granting $UT3_OWNER tables to $UT3_TESTER + +begin + for i in ( select table_name from all_tables t where owner = 'UT3' and nested = 'NO' and IOT_TYPE is NULL) + loop + execute immediate 'grant select on UT3.'||i.table_name||' to UT3_TESTER'; + end loop; +end; +/ + + +-------------------------------------------------------------------------------- +PROMPT Creating $UT3_USER - minimal privileges user for API testing + +create user $UT3_USER identified by "$UT3_USER_PASSWORD" default tablespace $UT3_TABLESPACE quota unlimited on $UT3_TABLESPACE; +grant create session, create procedure, create type, create table to $UT3_USER; + + +-------------------------------------------------------------------------------- +PROMPT Creating $UT3_TESTER_HELPER - provides functions to allow min grant test user setup tests. + +create user $UT3_TESTER_HELPER identified by "$UT3_TESTER_HELPER_PASSWORD" default tablespace $UT3_TABLESPACE quota unlimited on $UT3_TABLESPACE; +grant create session, create procedure, create type, create table to $UT3_TESTER_HELPER; + +PROMPT Grants for testing distributed transactions grant create public database link to $UT3_TESTER_HELPER; grant drop public database link to $UT3_TESTER_HELPER; -set feedback on ---Needed for testing coverage outside of main UT3 schema. + +PROMPT Grants for testing coverage outside of main UT3 schema. grant create any procedure, drop any procedure, execute any procedure, create any type, drop any type, execute any type, under any type, select any table, update any table, insert any table, delete any table, create any table, drop any table, alter any table, select any dictionary, create any synonym, drop any synonym to $UT3_TESTER_HELPER; grant create job to $UT3_TESTER_HELPER; ---Needed to allow for enable/disable of annotation triggers -grant administer database trigger to $UT3_TESTER_HELPER; + exit SQL diff --git a/source/create_utplsql_owner.sql b/source/create_utplsql_owner.sql index 9d163d802..ee161c99c 100644 --- a/source/create_utplsql_owner.sql +++ b/source/create_utplsql_owner.sql @@ -29,7 +29,7 @@ prompt Creating utPLSQL user &&ut3_user create user &ut3_user identified by "&ut3_password" default tablespace &ut3_tablespace quota unlimited on &ut3_tablespace; -grant create session, create sequence, create procedure, create type, create table, create view, create synonym, administer database trigger to &ut3_user; +grant create session, create sequence, create procedure, create type, create table, create view, create synonym to &ut3_user; begin $if dbms_db_version.version < 18 $then diff --git a/test/grant_ut3_owner_to_ut3_tester.sql b/test/grant_ut3_owner_to_ut3_tester.sql deleted file mode 100644 index 19424be1a..000000000 --- a/test/grant_ut3_owner_to_ut3_tester.sql +++ /dev/null @@ -1,35 +0,0 @@ -set define off -whenever sqlerror exit failure rollback -whenever oserror exit failure rollback - -alter session set plsql_optimize_level=0; - -set linesize 200 -set define on -set verify off - -prompt Empowering UT3_TESTER to UT3_OWNER objects - -begin - for i in ( select object_name from all_objects t - where t.object_type in ('PACKAGE','TYPE') - and owner = 'UT3' - and generated = 'N' - and lower(object_name) not like 'sys%') - loop - execute immediate 'grant execute on ut3."'||i.object_name||'" to UT3_TESTER'; - end loop; -end; -/ - -prompt Empowering UT3_TESTER to UT3_OWNER tables - -begin - for i in ( select table_name from all_tables t where owner = 'UT3' and nested = 'NO' and IOT_TYPE is NULL) - loop - execute immediate 'grant select on UT3.'||i.table_name||' to UT3_TESTER'; - end loop; -end; -/ - -exit; diff --git a/test/install_and_run_tests.sh b/test/install_and_run_tests.sh index 01bd378fb..04f51fb3c 100755 --- a/test/install_and_run_tests.sh +++ b/test/install_and_run_tests.sh @@ -3,28 +3,7 @@ set -ev #goto git root directory git rev-parse && cd "$(git rev-parse --show-cdup)" - cd test -time "$SQLCLI" sys/${ORACLE_PWD}@//${CONNECTION_STR} AS SYSDBA @grant_ut3_owner_to_ut3_tester.sql - -time "$SQLCLI" ${UT3_TESTER_HELPER}/${UT3_TESTER_HELPER_PASSWORD}@//${CONNECTION_STR} @install_ut3_tester_helper.sql - -time "$SQLCLI" ${UT3_USER}/${UT3_USER_PASSWORD}@//${CONNECTION_STR} @install_ut3_user_tests.sql - -time "$SQLCLI" ${UT3_TESTER}/${UT3_TESTER_PASSWORD}@//${CONNECTION_STR} @install_ut3_tester_tests.sql - -cd .. - -time utPLSQL-cli/bin/utplsql run ${UT3_TESTER_HELPER}/${UT3_TESTER_HELPER_PASSWORD}@${CONNECTION_STR} \ --source_path=source -owner=ut3 \ --p='ut3_tester,ut3$user#' \ --test_path=test -c \ --f=ut_coverage_sonar_reporter -o=coverage.xml \ --f=ut_coverage_cobertura_reporter -o=cobertura.xml \ --f=ut_coverage_html_reporter -o=coverage.html \ --f=ut_coveralls_reporter -o=coverage.json \ --f=ut_sonar_test_reporter -o=test_results.xml \ --f=ut_junit_reporter -o=junit_test_results.xml \ --f=ut_tfs_junit_reporter -o=tfs_test_results.xml \ --f=ut_documentation_reporter -o=test_results.log -s +time . ./${DIR}/install_tests.sh +time . ./${DIR}/run_tests.sh diff --git a/test/install_tests.sh b/test/install_tests.sh new file mode 100755 index 000000000..e07b4d2b3 --- /dev/null +++ b/test/install_tests.sh @@ -0,0 +1,13 @@ +#!/bin/bash +set -ev + +#goto git root directory +git rev-parse && cd "$(git rev-parse --show-cdup)" +cd test + +"$SQLCLI" ${UT3_TESTER_HELPER}/${UT3_TESTER_HELPER_PASSWORD}@//${CONNECTION_STR} @install_ut3_tester_helper.sql + +"$SQLCLI" ${UT3_USER}/${UT3_USER_PASSWORD}@//${CONNECTION_STR} @install_ut3_user_tests.sql + +"$SQLCLI" ${UT3_TESTER}/${UT3_TESTER_PASSWORD}@//${CONNECTION_STR} @install_ut3_tester_tests.sql + diff --git a/test/run_tests.sh b/test/run_tests.sh new file mode 100755 index 000000000..29086f5f7 --- /dev/null +++ b/test/run_tests.sh @@ -0,0 +1,18 @@ +#!/bin/bash +set -ev + +#goto git root directory +git rev-parse && cd "$(git rev-parse --show-cdup)" + +time utPLSQL-cli/bin/utplsql run ${UT3_TESTER_HELPER}/${UT3_TESTER_HELPER_PASSWORD}@${CONNECTION_STR} \ +-source_path=source -owner=ut3 \ +-p='ut3_tester,ut3$user#' \ +-test_path=test -c \ +-f=ut_coverage_sonar_reporter -o=coverage.xml \ +-f=ut_coverage_cobertura_reporter -o=cobertura.xml \ +-f=ut_coverage_html_reporter -o=coverage.html \ +-f=ut_coveralls_reporter -o=coverage.json \ +-f=ut_sonar_test_reporter -o=test_results.xml \ +-f=ut_junit_reporter -o=junit_test_results.xml \ +-f=ut_tfs_junit_reporter -o=tfs_test_results.xml \ +-f=ut_documentation_reporter -o=test_results.log -s From b21dbaac80ed9e2db8aaff12366612bac1ee0385 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 20 Jun 2019 00:16:51 +0100 Subject: [PATCH 0522/1096] Added back grant `administer database trigger to &&ut3_owner`; This is only needed for the duration of the install process. We also re-enable this privilege to allow for tests to disable/enable trigger. --- .travis/install.sh | 4 ++++ source/install_ddl_trigger.sql | 4 +++- source/install_headless_with_trigger.sql | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index b9dcce954..646458489 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -63,6 +63,10 @@ time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL set feedback off whenever sqlerror exit failure rollback +-------------------------------------------------------------------------------- +PROMPT Adding back create-trigger privilege to $UT3_OWNER for testing +grant administer database trigger to $UT3_OWNER; + -------------------------------------------------------------------------------- PROMPT Creating $UT3_TESTER - Power-user for testing internal framework code diff --git a/source/install_ddl_trigger.sql b/source/install_ddl_trigger.sql index 1395cc50c..843ee0c07 100644 --- a/source/install_ddl_trigger.sql +++ b/source/install_ddl_trigger.sql @@ -18,5 +18,7 @@ @@define_ut3_owner_param.sql @@check_sys_grants.sql "'ADMINISTER DATABASE TRIGGER','CREATE TRIGGER'" -@@install_component.sql 'core/annotations/ut_trigger_annotation_parsing.trg' +grant administer database trigger to &&ut3_owner; +@@install_component.sql 'core/annotations/ut_trigger_annotation_parsing.trg' +revoke administer database trigger from &&ut3_owner; diff --git a/source/install_headless_with_trigger.sql b/source/install_headless_with_trigger.sql index 0e13d7a59..16d81f3c6 100644 --- a/source/install_headless_with_trigger.sql +++ b/source/install_headless_with_trigger.sql @@ -21,6 +21,6 @@ @@install.sql &&ut3_owner @@create_synonyms_and_grants_for_public.sql &&ut3_owner -@@install_ddl_trigger.sql +@@install_ddl_trigger.sql &&ut3_owner exit From 629e086bdc268729a361aefb8e8a859c5e2ae8b3 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 20 Jun 2019 01:19:18 +0100 Subject: [PATCH 0523/1096] Removed need to grant `ut_annotation_manager` to users. --- source/api/ut_runner.pkb | 34 ++++++++++++++ source/api/ut_runner.pks | 5 ++ .../annotations/ut_annotation_manager.pkb | 47 +------------------ .../annotations/ut_annotation_manager.pks | 7 +-- source/core/ut_suite_manager.pkb | 13 ++--- .../create_synonyms_and_grants_for_public.sql | 44 ++++++++++++----- source/create_user_grants.sql | 39 ++++++++++----- .../annotations/test_annotation_manager.pkb | 10 ++-- test/ut3_tester_helper/main_helper.pkb | 2 +- 9 files changed, 112 insertions(+), 89 deletions(-) diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index 2b8a10c92..7a20a8cf4 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -264,5 +264,39 @@ create or replace package body ut_runner is end loop; end; + function hash_suite_path(a_path varchar2, a_random_seed positiven) return varchar2 is + l_start_pos pls_integer := 1; + l_end_pos pls_integer := 1; + l_result varchar2(4000); + l_item varchar2(4000); + l_at_end boolean := false; + begin + if a_random_seed is null then + l_result := a_path; + end if; + if a_path is not null then + loop + l_end_pos := instr(a_path,'.',l_start_pos); + if l_end_pos = 0 then + l_end_pos := length(a_path)+1; + l_at_end := true; + end if; + l_item := substr(a_path,l_start_pos,l_end_pos-l_start_pos); + if l_item is not null then + l_result := + l_result || + dbms_crypto.hash( + to_char( dbms_utility.get_hash_value( l_item, 1, a_random_seed ) ), + dbms_crypto.hash_sh1 + ); + end if; + exit when l_at_end; + l_result := l_result || chr(0); + l_start_pos := l_end_pos + 1; + end loop; + end if; + return l_result; + end; + end ut_runner; / diff --git a/source/api/ut_runner.pks b/source/api/ut_runner.pks index a6ba28556..38167ac57 100644 --- a/source/api/ut_runner.pks +++ b/source/api/ut_runner.pks @@ -140,5 +140,10 @@ create or replace package ut_runner authid current_user is */ function get_reporters_list return tt_reporters_info pipelined; + /* + * Returns a hash value of suitepath based on input path and random seed + */ + function hash_suite_path(a_path varchar2, a_random_seed positiven) return varchar2; + end ut_runner; / diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index 5b505d63e..009e2741d 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -331,11 +331,9 @@ create or replace package body ut_annotation_manager as end if; end; - function get_annotated_objects(a_object_owner varchar2, a_object_type varchar2, a_parse_date timestamp := null) return ut_annotated_objects pipelined is + function get_annotated_objects(a_object_owner varchar2, a_object_type varchar2, a_parse_date timestamp := null) return sys_refcursor is l_annotation_objs_info ut_annotation_objs_cache_info; l_cursor sys_refcursor; - l_results ut_annotated_objects; - c_object_fetch_limit constant integer := 10; l_full_scan_needed boolean := not ut_trigger_check.is_alive(); begin ut_event_manager.trigger_event('get_annotated_objects - start'); @@ -344,15 +342,8 @@ create or replace package body ut_annotation_manager as --pipe annotations from cache l_cursor := ut_annotation_cache_manager.get_annotations_for_objects(l_annotation_objs_info, a_parse_date); - loop - fetch l_cursor bulk collect into l_results limit c_object_fetch_limit; - for i in 1 .. l_results.count loop - pipe row (l_results(i)); - end loop; - exit when l_cursor%notfound; - end loop; - close l_cursor; ut_event_manager.trigger_event('get_annotated_objects - end'); + return l_cursor; end; procedure purge_cache(a_object_owner varchar2, a_object_type varchar2) is @@ -360,39 +351,5 @@ create or replace package body ut_annotation_manager as ut_annotation_cache_manager.purge_cache(a_object_owner, a_object_type); end; - function hash_suite_path(a_path varchar2, a_random_seed positiven) return varchar2 is - l_start_pos pls_integer := 1; - l_end_pos pls_integer := 1; - l_result varchar2(4000); - l_item varchar2(4000); - l_at_end boolean := false; - begin - if a_random_seed is null then - l_result := a_path; - end if; - if a_path is not null then - loop - l_end_pos := instr(a_path,'.',l_start_pos); - if l_end_pos = 0 then - l_end_pos := length(a_path)+1; - l_at_end := true; - end if; - l_item := substr(a_path,l_start_pos,l_end_pos-l_start_pos); - if l_item is not null then - l_result := - l_result || - dbms_crypto.hash( - to_char( dbms_utility.get_hash_value( l_item, 1, a_random_seed ) ), - dbms_crypto.hash_sh1 - ); - end if; - exit when l_at_end; - l_result := l_result || chr(0); - l_start_pos := l_end_pos + 1; - end loop; - end if; - return l_result; - end; - end ut_annotation_manager; / diff --git a/source/core/annotations/ut_annotation_manager.pks b/source/core/annotations/ut_annotation_manager.pks index c2527fcd2..1d6bd3d71 100644 --- a/source/core/annotations/ut_annotation_manager.pks +++ b/source/core/annotations/ut_annotation_manager.pks @@ -30,7 +30,7 @@ create or replace package ut_annotation_manager authid current_user as * @param a_parse_date date when object was last parsed * @return array containing annotated objects along with annotations for each object (nested) */ - function get_annotated_objects(a_object_owner varchar2, a_object_type varchar2, a_parse_date timestamp := null) return ut_annotated_objects pipelined; + function get_annotated_objects(a_object_owner varchar2, a_object_type varchar2, a_parse_date timestamp := null) return sys_refcursor; /** * Rebuilds annotation cache for a specified schema and object type. @@ -57,10 +57,5 @@ create or replace package ut_annotation_manager authid current_user as procedure purge_cache(a_object_owner varchar2, a_object_type varchar2); - /* - * Returns a hash value of suitepath based on input path and random seed - */ - function hash_suite_path(a_path varchar2, a_random_seed positiven) return varchar2; - end ut_annotation_manager; / diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 1ffd5ea49..65cefdc81 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -491,7 +491,7 @@ create or replace package body ut_suite_manager is c.line_no, :a_random_seed]' else - ' {:owner:}.ut_annotation_manager.hash_suite_path( + ' {:owner:}.ut_runner.hash_suite_path( c.path, :a_random_seed ) desc nulls last' end; @@ -614,14 +614,9 @@ create or replace package body ut_suite_manager is begin ut_event_manager.trigger_event('refresh_cache - start'); l_suite_cache_time := ut_suite_cache_manager.get_schema_parse_time(a_owner_name); - open l_annotations_cursor for - q'[select value(x) - from table( - ]' || ut_utils.ut_owner || q'[.ut_annotation_manager.get_annotated_objects( - :a_owner_name, 'PACKAGE', :a_suite_cache_parse_time - ) - )x ]' - using a_owner_name, l_suite_cache_time; + l_annotations_cursor := ut_annotation_manager.get_annotated_objects( + a_owner_name, 'PACKAGE', l_suite_cache_time + ); build_and_cache_suites(a_owner_name, l_annotations_cursor); diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index 30b79cffb..c19d86261 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -31,9 +31,12 @@ whenever oserror exit failure rollback alter session set current_schema = &&ut3_owner; +--expectations grant execute on &&ut3_owner..ut_expectation to public; grant execute on &&ut3_owner..ut_expectation_compound to public; grant execute on &&ut3_owner..ut_expectation_json to public; + +--matchers grant execute on &&ut3_owner..ut_be_between to public; grant execute on &&ut3_owner..ut_be_empty to public; grant execute on &&ut3_owner..ut_be_false to public; @@ -48,8 +51,22 @@ grant execute on &&ut3_owner..ut_be_true to public; grant execute on &&ut3_owner..ut_equal to public; grant execute on &&ut3_owner..ut_have_count to public; grant execute on &&ut3_owner..ut_match to public; + +--public API grant execute on &&ut3_owner..ut to public; grant execute on &&ut3_owner..ut_runner to public; +grant execute on &&ut3_owner..ut_file_mappings to public; +grant execute on &&ut3_owner..ut_file_mapping to public; +grant execute on &&ut3_owner..ut_file_mapper to public; +grant execute on &&ut3_owner..ut_key_value_pairs to public; +grant execute on &&ut3_owner..ut_key_value_pair to public; + +--generic types +grant execute on &&ut3_owner..ut_varchar2_list to public; +grant execute on &&ut3_owner..ut_varchar2_rows to public; +grant execute on &&ut3_owner..ut_integer_list to public; + +--reporters grant execute on &&ut3_owner..ut_debug_reporter to public; grant execute on &&ut3_owner..ut_teamcity_reporter to public; grant execute on &&ut3_owner..ut_xunit_reporter to public; @@ -60,37 +77,39 @@ grant execute on &&ut3_owner..ut_coverage_html_reporter to public; grant execute on &&ut3_owner..ut_coverage_sonar_reporter to public; grant execute on &&ut3_owner..ut_coveralls_reporter to public; grant execute on &&ut3_owner..ut_coverage_cobertura_reporter to public; +grant execute on &&ut3_owner..ut_realtime_reporter to public; +grant execute on &&ut3_owner..ut_sonar_test_reporter to public; + +--reporters base grant execute on &&ut3_owner..ut_reporters to public; -grant execute on &&ut3_owner..ut_varchar2_list to public; -grant execute on &&ut3_owner..ut_varchar2_rows to public; -grant execute on &&ut3_owner..ut_integer_list to public; grant execute on &&ut3_owner..ut_reporter_base to public; grant execute on &&ut3_owner..ut_output_reporter_base to public; -grant execute on &&ut3_owner..ut_output_data_row to public; -grant execute on &&ut3_owner..ut_output_data_rows to public; grant execute on &&ut3_owner..ut_coverage_reporter_base to public; grant execute on &&ut3_owner..ut_console_reporter_base to public; + +--coverage grant execute on &&ut3_owner..ut_coverage to public; grant execute on &&ut3_owner..ut_coverage_options to public; grant execute on &&ut3_owner..ut_coverage_helper to public; + +--outputs +grant execute on &&ut3_owner..ut_output_data_row to public; +grant execute on &&ut3_owner..ut_output_data_rows to public; grant execute on &&ut3_owner..ut_output_buffer_base to public; grant execute on &&ut3_owner..ut_output_table_buffer to public; grant execute on &&ut3_owner..ut_output_clob_table_buffer to public; -grant execute on &&ut3_owner..ut_file_mappings to public; -grant execute on &&ut3_owner..ut_file_mapping to public; -grant execute on &&ut3_owner..ut_file_mapper to public; -grant execute on &&ut3_owner..ut_key_value_pairs to public; -grant execute on &&ut3_owner..ut_key_value_pair to public; + +--user temp tables grant select, insert, update, delete on &&ut3_owner..ut_compound_data_tmp to public; grant select, insert, update, delete on &&ut3_owner..ut_compound_data_diff_tmp to public; -grant execute on &&ut3_owner..ut_sonar_test_reporter to public; + grant execute on &&ut3_owner..ut_annotations to public; grant execute on &&ut3_owner..ut_annotation to public; -grant execute on &&ut3_owner..ut_annotation_manager to public; grant execute on &&ut3_owner..ut_annotated_object to public; grant execute on &&ut3_owner..ut_annotated_objects to public; grant select on &&ut3_owner..ut_annotation_cache_info to public; grant select on &&ut3_owner..ut_annotation_cache to public; + grant execute on &&ut3_owner..ut_executables to public; grant execute on &&ut3_owner..ut_executable_test to public; grant select on &&ut3_owner..ut_suite_cache to public; @@ -102,7 +121,6 @@ grant execute on &&ut3_owner..ut_annotation_objs_cache_info to public; grant execute on &&ut3_owner..ut_annotation_obj_cache_info to public; grant execute on &&ut3_owner..ut_suite_items_info to public; grant execute on &&ut3_owner..ut_suite_item_info to public; -grant execute on &&ut3_owner..ut_realtime_reporter to public; grant select, insert, delete, update on &&ut3_owner..dbmspcc_blocks to public; grant select, insert, delete, update on &&ut3_owner..dbmspcc_runs to public; grant select, insert, delete, update on &&ut3_owner..dbmspcc_units to public; diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql index 911c1074f..9da5ebebb 100644 --- a/source/create_user_grants.sql +++ b/source/create_user_grants.sql @@ -51,10 +51,12 @@ whenever oserror exit failure rollback alter session set current_schema = &&ut3_owner; +--expectations grant execute on &&ut3_owner..ut_expectation to &ut3_user; grant execute on &&ut3_owner..ut_expectation_compound to &ut3_user; grant execute on &&ut3_owner..ut_expectation_json to &ut3_user; +--matchers grant execute on &&ut3_owner..ut_be_between to &ut3_user; grant execute on &&ut3_owner..ut_be_empty to &ut3_user; grant execute on &&ut3_owner..ut_be_false to &ut3_user; @@ -69,8 +71,22 @@ grant execute on &&ut3_owner..ut_be_true to &ut3_user; grant execute on &&ut3_owner..ut_equal to &ut3_user; grant execute on &&ut3_owner..ut_have_count to &ut3_user; grant execute on &&ut3_owner..ut_match to &ut3_user; + +--public API grant execute on &&ut3_owner..ut to &ut3_user; grant execute on &&ut3_owner..ut_runner to &ut3_user; +grant execute on &&ut3_owner..ut_file_mappings to &ut3_user; +grant execute on &&ut3_owner..ut_file_mapping to &ut3_user; +grant execute on &&ut3_owner..ut_file_mapper to &ut3_user; +grant execute on &&ut3_owner..ut_key_value_pairs to &ut3_user; +grant execute on &&ut3_owner..ut_key_value_pair to &ut3_user; + +--generic types +grant execute on &&ut3_owner..ut_varchar2_list to &ut3_user; +grant execute on &&ut3_owner..ut_varchar2_rows to &ut3_user; +grant execute on &&ut3_owner..ut_integer_list to &ut3_user; + +--reporters grant execute on &&ut3_owner..ut_debug_reporter to &ut3_user; grant execute on &&ut3_owner..ut_teamcity_reporter to &ut3_user; grant execute on &&ut3_owner..ut_xunit_reporter to &ut3_user; @@ -81,41 +97,42 @@ grant execute on &&ut3_owner..ut_coverage_html_reporter to &ut3_user; grant execute on &&ut3_owner..ut_coverage_sonar_reporter to &ut3_user; grant execute on &&ut3_owner..ut_coveralls_reporter to &ut3_user; grant execute on &&ut3_owner..ut_coverage_cobertura_reporter to &ut3_user; +grant execute on &&ut3_owner..ut_sonar_test_reporter to &ut3_user; + +--reporters base grant execute on &&ut3_owner..ut_reporters to &ut3_user; -grant execute on &&ut3_owner..ut_varchar2_list to &ut3_user; -grant execute on &&ut3_owner..ut_varchar2_rows to &ut3_user; -grant execute on &&ut3_owner..ut_integer_list to &ut3_user; grant execute on &&ut3_owner..ut_reporter_base to &ut3_user; grant execute on &&ut3_owner..ut_output_reporter_base to &ut3_user; grant execute on &&ut3_owner..ut_coverage_reporter_base to &ut3_user; grant execute on &&ut3_owner..ut_console_reporter_base to &ut3_user; + +--coverage grant execute on &&ut3_owner..ut_coverage to &ut3_user; grant execute on &&ut3_owner..ut_coverage_options to &ut3_user; grant execute on &&ut3_owner..ut_coverage_helper to &ut3_user; + +--outputs grant execute on &&ut3_owner..ut_output_buffer_base to &ut3_user; grant execute on &&ut3_owner..ut_output_data_row to &ut3_user; grant execute on &&ut3_owner..ut_output_data_rows to &ut3_user; grant execute on &&ut3_owner..ut_output_table_buffer to &ut3_user; grant execute on &&ut3_owner..ut_output_clob_table_buffer to &ut3_user; -grant execute on &&ut3_owner..ut_file_mappings to &ut3_user; -grant execute on &&ut3_owner..ut_file_mapping to &ut3_user; -grant execute on &&ut3_owner..ut_file_mapper to &ut3_user; -grant execute on &&ut3_owner..ut_key_value_pairs to &ut3_user; -grant execute on &&ut3_owner..ut_key_value_pair to &ut3_user; + +--user temp tables grant select, insert, update, delete on &&ut3_owner..ut_compound_data_tmp to &ut3_user; grant select, insert, update, delete on &&ut3_owner..ut_compound_data_diff_tmp to &ut3_user; -grant execute on &&ut3_owner..ut_sonar_test_reporter to &ut3_user; + grant execute on &&ut3_owner..ut_annotations to &ut3_user; grant execute on &&ut3_owner..ut_annotation to &ut3_user; -grant execute on &&ut3_owner..ut_annotation_manager to &ut3_user; grant execute on &&ut3_owner..ut_annotated_object to &ut3_user; grant execute on &&ut3_owner..ut_annotated_objects to &ut3_user; grant select on &&ut3_owner..ut_annotation_cache_info to &ut3_user; grant select on &&ut3_owner..ut_annotation_cache to &ut3_user; + grant execute on &&ut3_owner..ut_executables to &ut3_user; grant execute on &&ut3_owner..ut_executable_test to &ut3_user; grant select on &&ut3_owner..ut_suite_cache to &ut3_user; -grant select on &&ut3_owner..ut_suite_cache_package to public; +grant select on &&ut3_owner..ut_suite_cache_package to &ut3_user; grant select on &&ut3_owner..ut_suite_cache_schema to &ut3_user; grant execute on &&ut3_owner..ut_annotation_cache_manager to &ut3_user; grant execute on &&ut3_owner..ut_annotation_parser to &ut3_user; diff --git a/test/ut3_tester/core/annotations/test_annotation_manager.pkb b/test/ut3_tester/core/annotations/test_annotation_manager.pkb index e64adc861..944f6451d 100644 --- a/test/ut3_tester/core/annotations/test_annotation_manager.pkb +++ b/test/ut3_tester/core/annotations/test_annotation_manager.pkb @@ -372,15 +372,17 @@ create or replace package body test_annotation_manager is end; procedure no_data_for_dropped_object is - l_actual sys_refcursor; + l_result sys_refcursor; + l_data ut3.ut_annotated_objects; + l_actual sys_refcursor; begin --Arrange ut3.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); drop_dummy_test_package(); --Act - open l_actual for - select * from table(ut3.ut_annotation_manager.get_annotated_objects(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE')) - where object_name = 'DUMMY_TEST_PACKAGE'; + l_result := ut3.ut_annotation_manager.get_annotated_objects(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); + fetch l_result bulk collect into l_data; + open l_actual for select object_name from table(l_data) where object_name = 'DUMMY_TEST_PACKAGE'; --Assert ut.expect(l_actual).to_be_empty(); end; diff --git a/test/ut3_tester_helper/main_helper.pkb b/test/ut3_tester_helper/main_helper.pkb index ffccc3185..de28083f9 100644 --- a/test/ut3_tester_helper/main_helper.pkb +++ b/test/ut3_tester_helper/main_helper.pkb @@ -110,7 +110,7 @@ create or replace package body main_helper is execute immediate q'[ create or replace procedure ut3$user#.parse_annotations is begin - ut3.ut_annotation_manager.rebuild_annotation_cache('UT3_TESTER','PACKAGE'); + ut3.ut_runner.rebuild_annotation_cache('UT3_TESTER','PACKAGE'); end;]'; end; From e5ec54ca341e74cee227d9014cd311c9f37494cb Mon Sep 17 00:00:00 2001 From: Travis CI Date: Thu, 20 Jun 2019 07:20:15 +0000 Subject: [PATCH 0524/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 8a9a7a79e..2ed5f28bb 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 3534e3d73..7bd95f244 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 650424781..63a5c486a 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 10c506b05..93456021f 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 455b2f73c..a1d71cfb6 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 6356c6e99..9c97c5d67 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index e38944e0b..545a467d4 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 7d706ba61..2f1d7cccd 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 9b0ecc019..b448dfabe 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index a091017bd..486916500 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index d1c66e109..59bc248f3 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 402381288..e59e35de7 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index f525bd144..ba6289424 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 7c4a530c2..e5c61f8ca 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 0a2c8aa70..1deb62e9c 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 2ee977903..a9bfffab4 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 4a0200fa6..0c0692e86 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3097--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index b1f8cfc45..1fa128c64 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -776,7 +776,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.8.3097-develop + * secion v3.1.8.3106-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index c6b2ac193..9858bffac 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.8.3097-develop'; + gc_version constant varchar2(50) := 'v3.1.8.3106-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 11c0752d7523b1c79d95593ac4f01acf264e1bc9 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 21 Jun 2019 01:40:22 +0100 Subject: [PATCH 0525/1096] Addressed review comment. --- source/uninstall_objects.sql | 2 -- 1 file changed, 2 deletions(-) diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index a7e6b947e..9d2c0d61e 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -174,8 +174,6 @@ drop table ut_compound_data_diff_tmp purge; drop table ut_json_data_diff_tmp; -drop trigger ut_trigger_annotation_parsing; - drop package ut_annotation_manager; drop package ut_annotation_parser; From fed5007b63a500f8d146afdb0f0cc474fadd22cd Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 21 Jun 2019 19:34:59 +0100 Subject: [PATCH 0526/1096] Added test to confirm that long column names are suported in 3.1.7 Resolves: #952 Added safety check on drop of optional objects. Added safety harness to fail build if any of uninstall steps raises exceptions. --- .travis/install.sh | 1 + source/uninstall_objects.sql | 28 ++++++++++++++++--- .../expectations/test_expectations_cursor.pkb | 17 +++++++++++ .../expectations/test_expectations_cursor.pks | 3 ++ 4 files changed, 45 insertions(+), 4 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index bb117c67c..0533fdab3 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -23,6 +23,7 @@ if [[ "${TRAVIS_JOB_NUMBER}" =~ \.2$ ]]; then time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL set feedback off set verify off + whenever sqlerror exit failure rollback @uninstall_all.sql $UT3_OWNER whenever sqlerror exit failure rollback diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index a7e6b947e..88a5f8239 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -1,9 +1,29 @@ +set echo off +set serverout on +declare + procedure drop_if_exists(a_object_type varchar2, a_object_name varchar2) is + l_count integer; + begin + select count(1) + into l_count + from all_objects + where owner = sys_context('USERENV','CURRENT_SCHEMA') + and object_type = a_object_type + and object_name = a_object_name; + if l_count > 0 then + execute immediate 'drop '||a_object_type||' '||a_object_name; + dbms_output.put_line(initcap(a_object_type)||' '||a_object_name||' dropped.'); + else + dbms_output.put_line(initcap(a_object_type)||' '||a_object_name||' was not dropped, '||lower(a_object_type)||' does not exist.'); + end if; + end; +begin + drop_if_exists('TRIGGER', 'UT_TRIGGER_ANNOTATION_PARSING'); + drop_if_exists('SYNONYM','UT3_TRIGGER_ALIVE'); +end; +/ set echo on -drop trigger ut_trigger_annotation_parsing; - -drop synonym ut3_trigger_alive; - drop synonym be_between; drop synonym have_count; diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index daa3389bc..c3d619653 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -2843,5 +2843,22 @@ Check the query and data for errors.'; ut3.ut.expect(v_actual).to_equal(v_expected).exclude('ID'); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; + + procedure compare_long_column_names is + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + -- populate actual + open l_actual for + select rownum as id, '1' some_column_with_a_pretty_long_enough_name from dual; + + open l_expected for + select rownum as id, '1' some_column_with_a_pretty_long_enough_name from dual; + + ut3.ut.expect(l_actual).to_equal(l_expected).include('ID,SOME_COLUMN_WITH_A_PRETTY_LONG_ENOUGH_NAME').join_by('ID'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + end; / diff --git a/test/ut3_user/expectations/test_expectations_cursor.pks b/test/ut3_user/expectations/test_expectations_cursor.pks index 483968301..82fc47f3c 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pks +++ b/test/ut3_user/expectations/test_expectations_cursor.pks @@ -462,5 +462,8 @@ create or replace package test_expectations_cursor is --%test( Mixed column order exclusion ) procedure uc_columns_exclude; + --%test(Compares cursors with long column names - Issue #952 ) + procedure compare_long_column_names; + end; / From 0b02973e2366dc684bb5fb651bd7d179fb681d96 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Fri, 21 Jun 2019 18:59:20 +0000 Subject: [PATCH 0527/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 2ed5f28bb..10fa75c28 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 7bd95f244..592cc836f 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 63a5c486a..7b116d937 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 93456021f..6eb01aa5d 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index a1d71cfb6..24c30617d 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 9c97c5d67..2e19cd758 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 545a467d4..6f9875ffd 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 2f1d7cccd..5a2990b99 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index b448dfabe..5a6f321c4 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 486916500..9fb0f2361 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 59bc248f3..9f6aaf5b8 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index e59e35de7..3013c21a0 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index ba6289424..7f15c5696 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index e5c61f8ca..96ba700e2 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 1deb62e9c..12cb115f7 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index a9bfffab4..42192568a 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 0c0692e86..b9d61e19c 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3106--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 1fa128c64..d6a280625 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -776,7 +776,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.8.3106-develop + * secion v3.1.8.3111-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 9858bffac..6d740d524 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.8.3106-develop'; + gc_version constant varchar2(50) := 'v3.1.8.3111-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From c7b802f5fe40b6d751dd46cc8fc5d27903f96faf Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 22 Jun 2019 17:22:11 +0100 Subject: [PATCH 0528/1096] Cleanup some grants to internal objects & tables Removed grants: - execute on ut_annotations - execute on ut_annotation - execute on ut_annotated_object - execute on ut_annotated_objects - select on ut_annotation_cache - select on ut_annotation_cache_info - execute ut_annotation_cache_manager - execute ut_annotation_parser Reorganized code to accommodate for grants removal. Wrapped `sys.dbms_assert.qualified_sql_name` to support NULL values. Replaced calls to `dbms_crypto.hash` with `ut_utils.get_hash` - default `SHA1` --- .travis/install.sh | 2 +- source/api/ut_runner.pkb | 5 +- .../ut_annotation_cache_manager.pkb | 19 ++- .../ut_annotation_cache_manager.pks | 3 + .../annotations/ut_annotation_manager.pkb | 122 +++++--------- .../ut_annotation_obj_cache_info.tps | 3 +- source/core/ut_metadata.pkb | 2 +- source/core/ut_suite_manager.pkb | 44 ++--- source/core/ut_utils.pkb | 19 +++ source/core/ut_utils.pks | 21 ++- .../create_synonyms_and_grants_for_public.sql | 36 ++-- source/create_user_grants.sql | 35 ++-- .../data_values/ut_compound_data_helper.pkb | 12 +- .../data_values/ut_compound_data_helper.pks | 6 - .../data_values/ut_data_value_json.tpb | 12 +- .../data_values/ut_data_value_refcursor.tpb | 8 +- test/install_tests.sql | 156 ------------------ test/install_ut3_user_tests.sql | 3 + .../annotations/test_annotation_manager.pkb | 9 +- test/ut3_tester_helper/main_helper.pkb | 2 +- test/ut3_tester_helper/run_helper.pkb | 31 +++- test/ut3_tester_helper/run_helper.pks | 13 +- test/ut3_user/api/test_ut_runner.pkb | 58 ++++--- .../expectations/test_expectations_cursor.pkb | 149 ++++++----------- test/ut3_user/helpers/some_item.tps | 6 + test/ut3_user/helpers/some_items.tps | 2 + test/ut3_user/helpers/some_object.tps | 7 + 27 files changed, 324 insertions(+), 461 deletions(-) delete mode 100644 test/install_tests.sql create mode 100644 test/ut3_user/helpers/some_item.tps create mode 100644 test/ut3_user/helpers/some_items.tps create mode 100644 test/ut3_user/helpers/some_object.tps diff --git a/.travis/install.sh b/.travis/install.sh index 646458489..9d4ff6026 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -97,7 +97,7 @@ end; PROMPT Granting $UT3_OWNER tables to $UT3_TESTER begin - for i in ( select table_name from all_tables t where owner = 'UT3' and nested = 'NO' and IOT_TYPE is NULL) + for i in ( select table_name from all_tables t where owner = 'UT3' and nested = 'NO' and IOT_NAME is NULL) loop execute immediate 'grant select on UT3.'||i.table_name||' to UT3_TESTER'; end loop; diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index 7a20a8cf4..00b36573e 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -285,10 +285,7 @@ create or replace package body ut_runner is if l_item is not null then l_result := l_result || - dbms_crypto.hash( - to_char( dbms_utility.get_hash_value( l_item, 1, a_random_seed ) ), - dbms_crypto.hash_sh1 - ); + ut_utils.get_hash( to_char( dbms_utility.get_hash_value( l_item, 1, a_random_seed ) ) ); end if; exit when l_at_end; l_result := l_result || chr(0); diff --git a/source/core/annotations/ut_annotation_cache_manager.pkb b/source/core/annotations/ut_annotation_cache_manager.pkb index 21151de8b..eb60ac3dd 100644 --- a/source/core/annotations/ut_annotation_cache_manager.pkb +++ b/source/core/annotations/ut_annotation_cache_manager.pkb @@ -91,12 +91,29 @@ create or replace package body ut_annotation_cache_manager as commit; end; + function get_annotations_objects_info(a_object_owner varchar2, a_object_type varchar2) return ut_annotation_objs_cache_info is + l_result ut_annotation_objs_cache_info; + begin + select ut_annotation_obj_cache_info( + object_owner => i.object_owner, + object_name => i.object_name, + object_type => i.object_type, + needs_refresh => 'N', + parse_time => i.parse_time + ) + bulk collect into l_result + from ut_annotation_cache_info i + where i.object_owner = a_object_owner + and i.object_type = a_object_type; + return l_result; + end; + function get_cache_schema_info(a_object_owner varchar2, a_object_type varchar2) return t_cache_schema_info is l_result t_cache_schema_info; begin begin select * - into l_result + into l_result from ut_annotation_cache_schema s where s.object_type = a_object_type and s.object_owner = a_object_owner; exception diff --git a/source/core/annotations/ut_annotation_cache_manager.pks b/source/core/annotations/ut_annotation_cache_manager.pks index 4366cd536..2a1d60f1e 100644 --- a/source/core/annotations/ut_annotation_cache_manager.pks +++ b/source/core/annotations/ut_annotation_cache_manager.pks @@ -34,6 +34,9 @@ create or replace package ut_annotation_cache_manager authid definer as */ function get_annotations_for_objects(a_cached_objects ut_annotation_objs_cache_info, a_parse_time timestamp) return sys_refcursor; + + function get_annotations_objects_info(a_object_owner varchar2, a_object_type varchar2) return ut_annotation_objs_cache_info; + function get_cache_schema_info(a_object_owner varchar2, a_object_type varchar2) return t_cache_schema_info; /** diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index 009e2741d..0d98b81a0 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -16,6 +16,7 @@ create or replace package body ut_annotation_manager as limitations under the License. */ + gc_max_objects_limit integer := 1000000; ------------------------------ --private definitions @@ -24,29 +25,28 @@ create or replace package body ut_annotation_manager as l_ut_owner varchar2(250) := ut_utils.ut_owner; l_objects_view varchar2(200) := ut_metadata.get_objects_view_name(); l_cursor_text varchar2(32767); + l_data ut_annotation_objs_cache_info; l_result ut_annotation_objs_cache_info; + l_card natural; begin + l_data := ut_annotation_cache_manager.get_annotations_objects_info(a_object_owner, a_object_type); + l_card := ut_utils.scale_cardinality(cardinality(l_data)); + l_cursor_text := - q'[select ]'||l_ut_owner||q'[.ut_annotation_obj_cache_info( - object_owner => i.object_owner, - object_name => i.object_name, - object_type => i.object_type, - needs_refresh => null - ) - from ]'||l_ut_owner||q'[.ut_annotation_cache_info i + 'select /*+ cardinality(i '||l_card||') */ + value(i) + from table( cast( :l_data as '||l_ut_owner||'.ut_annotation_objs_cache_info ) ) i where not exists ( - select 1 from ]'||l_objects_view||q'[ o + select 1 from '||l_objects_view||q'[ o where o.owner = i.object_owner and o.object_name = i.object_name and o.object_type = i.object_type - and o.owner = :a_object_owner - and o.object_type = :a_object_type - ) - and i.object_owner = :a_object_owner - and i.object_type = :a_object_type]'; - open l_rows for l_cursor_text using a_object_owner, a_object_type, a_object_owner, a_object_type; - fetch l_rows bulk collect into l_result limit 1000000; + and o.owner = ']'||ut_utils.qualified_sql_name(a_object_owner)||q'[' + and o.object_type = ']'||ut_utils.qualified_sql_name(a_object_type)||q'[' + )]'; + open l_rows for l_cursor_text using l_data; + fetch l_rows bulk collect into l_result limit gc_max_objects_limit; close l_rows; return l_result; end; @@ -61,83 +61,48 @@ create or replace package body ut_annotation_manager as l_ut_owner varchar2(250) := ut_utils.ut_owner; l_objects_view varchar2(200) := ut_metadata.get_objects_view_name(); l_cursor_text varchar2(32767); + l_data ut_annotation_objs_cache_info; l_result ut_annotation_objs_cache_info; - l_object_owner varchar2(250); - l_object_type varchar2(250); begin ut_event_manager.trigger_event( 'get_annotation_objs_info - start ( a_full_scan = ' || ut_utils.to_string(a_full_scan) || ' )' ); + + l_data := ut_annotation_cache_manager.get_annotations_objects_info(a_object_owner, a_object_type); + if not a_full_scan then - l_cursor_text := - q'[select ]'||l_ut_owner||q'[.ut_annotation_obj_cache_info( - object_owner => i.object_owner, - object_name => i.object_name, - object_type => i.object_type, - needs_refresh => 'N' - ) - from ]'||l_ut_owner||q'[.ut_annotation_cache_info i - where i.object_owner = :a_object_owner - and i.object_type = :a_object_type]'; - open l_rows for l_cursor_text using a_object_owner, a_object_type; + l_result := l_data; else - if a_object_owner is not null then - l_object_owner := sys.dbms_assert.qualified_sql_name(a_object_owner); - end if; - if a_object_type is not null then - l_object_type := sys.dbms_assert.qualified_sql_name(a_object_type); - end if; l_cursor_text := - q'[select ]'||l_ut_owner||q'[.ut_annotation_obj_cache_info( - object_owner => o.owner, - object_name => o.object_name, - object_type => o.object_type, - needs_refresh => case when o.last_ddl_time < cast(i.parse_time as date) then 'N' else 'Y' end - ) - from ]'||l_objects_view||q'[ o - left join ]'||l_ut_owner||q'[.ut_annotation_cache_info i + 'select /*+ cardinality(i '||ut_utils.scale_cardinality(cardinality(l_data))||') */ + '||l_ut_owner||q'[.ut_annotation_obj_cache_info( + object_owner => o.owner, + object_name => o.object_name, + object_type => o.object_type, + needs_refresh => case when o.last_ddl_time < cast(i.parse_time as date) then 'N' else 'Y' end, + parse_time => i.parse_time + ) + from ]'||l_objects_view||' o + left join table( cast(:l_data as '||l_ut_owner||q'[.ut_annotation_objs_cache_info ) ) i on o.owner = i.object_owner and o.object_name = i.object_name and o.object_type = i.object_type - where o.owner = ']'||l_object_owner||q'[' - and o.object_type = ']'||l_object_type||q'[' + where o.owner = ']'||ut_utils.qualified_sql_name(a_object_owner)||q'[' + and o.object_type = ']'||ut_utils.qualified_sql_name(a_object_type)||q'[' and ]' || case when a_parse_date is null then ':a_parse_date is null' else 'o.last_ddl_time >= cast(:a_parse_date as date)' end; - open l_rows for l_cursor_text using a_parse_date; + open l_rows for l_cursor_text using l_data, a_parse_date; + fetch l_rows bulk collect into l_result limit gc_max_objects_limit; + close l_rows; end if; - fetch l_rows bulk collect into l_result limit 10000000; - close l_rows; ut_event_manager.trigger_event('get_annotation_objs_info - end (count='||l_result.count||')'); return l_result; end; - function get_sources_to_annotate(a_object_owner varchar2, a_object_type varchar2) return sys_refcursor is - l_result sys_refcursor; - l_sources_view varchar2(200) := ut_metadata.get_source_view_name(); - begin - open l_result for - q'[select s.name, s.text - from (select s.name, s.text, s.line, - max(case when s.text like '%--%\%%' escape '\' - and regexp_like(s.text,'--\s*%') - then 'Y' else 'N' end - ) - over(partition by s.name) is_annotated - from ]'||l_sources_view||q'[ s - where s.type = :a_object_type - and s.owner = :a_object_owner - ) s - where s.is_annotated = 'Y' - order by s.name, s.line]' - using a_object_type, a_object_owner, a_object_type, a_object_owner; - - return l_result; - end; - function get_sources_to_annotate(a_object_owner varchar2, a_object_type varchar2, a_objects_to_refresh ut_annotation_objs_cache_info) return sys_refcursor is l_result sys_refcursor; l_sources_view varchar2(200) := ut_metadata.get_source_view_name(); @@ -158,12 +123,12 @@ create or replace package body ut_annotation_manager as on s.name = r.object_name and s.owner = r.object_owner and s.type = r.object_type - where s.type = :a_object_type - and s.owner = :a_object_owner + where s.owner = ']'||ut_utils.qualified_sql_name(a_object_owner)||q'[' + and s.type = ']'||ut_utils.qualified_sql_name(a_object_type)||q'[' ) s where s.is_annotated = 'Y' order by s.name, s.line]' - using a_objects_to_refresh, a_object_type, a_object_owner; + using a_objects_to_refresh; return l_result; end; @@ -257,7 +222,6 @@ create or replace package body ut_annotation_manager as procedure trigger_obj_annotation_rebuild is l_sql_text ora_name_list_t; l_parts binary_integer; - l_object_to_parse ut_annotation_obj_cache_info; l_restricted_users ora_name_list_t; function get_source_from_sql_text(a_object_name varchar2, a_sql_text ora_name_list_t, a_parts binary_integer) return sys_refcursor is @@ -312,8 +276,6 @@ create or replace package body ut_annotation_manager as return; end if; - l_object_to_parse := ut_annotation_obj_cache_info(ora_dict_obj_owner, ora_dict_obj_name, ora_dict_obj_type, 'Y'); - if ora_sysevent = 'CREATE' then l_parts := ORA_SQL_TXT(l_sql_text); build_annot_cache_for_sources( @@ -324,9 +286,13 @@ create or replace package body ut_annotation_manager as build_annot_cache_for_sources( ora_dict_obj_owner, ora_dict_obj_type, get_source_for_object(ora_dict_obj_owner, ora_dict_obj_name, ora_dict_obj_type) - ); + ); elsif ora_sysevent = 'DROP' then - ut_annotation_cache_manager.remove_from_cache(ut_annotation_objs_cache_info(l_object_to_parse)); + ut_annotation_cache_manager.remove_from_cache( + ut_annotation_objs_cache_info( + ut_annotation_obj_cache_info(ora_dict_obj_owner, ora_dict_obj_name, ora_dict_obj_type, 'Y', null) + ) + ); end if; end if; end; diff --git a/source/core/annotations/ut_annotation_obj_cache_info.tps b/source/core/annotations/ut_annotation_obj_cache_info.tps index fd0ec51e7..4b8178a9d 100644 --- a/source/core/annotations/ut_annotation_obj_cache_info.tps +++ b/source/core/annotations/ut_annotation_obj_cache_info.tps @@ -18,6 +18,7 @@ create type ut_annotation_obj_cache_info as object( object_owner varchar2(250), object_name varchar2(250), object_type varchar2(250), - needs_refresh varchar2(1) + needs_refresh varchar2(1), + parse_time timestamp ) / diff --git a/source/core/ut_metadata.pkb b/source/core/ut_metadata.pkb index a33dfc1eb..7859d6b3f 100644 --- a/source/core/ut_metadata.pkb +++ b/source/core/ut_metadata.pkb @@ -292,7 +292,7 @@ create or replace package body ut_metadata as if not l_result like '"%"' then l_result := upper(l_result); end if; - return sys.dbms_assert.qualified_sql_name(l_result); + return ut_utils.qualified_sql_name(l_result); end; function get_anydata_compound_type(a_data_value anydata) return varchar2 is diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 65cefdc81..d0449e838 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -401,20 +401,22 @@ create or replace package body ut_suite_manager is l_cursor_text varchar2(32767); l_result ut_varchar2_rows; l_object_owner varchar2(250); + l_data ut_annotation_objs_cache_info; begin - l_object_owner := sys.dbms_assert.qualified_sql_name(a_object_owner); + l_object_owner := ut_utils.qualified_sql_name(a_object_owner); + l_data := ut_annotation_cache_manager.get_annotations_objects_info(a_object_owner, 'PACKAGE'); l_cursor_text := q'[select i.object_name from ]'||l_ut_owner||q'[.ut_suite_cache_package i where not exists ( - select 1 from ]'||l_ut_owner||q'[.ut_annotation_cache_info o + select 1 from table(:l_data) o where o.object_owner = i.object_owner and o.object_name = i.object_name and o.object_type = 'PACKAGE' ) and i.object_owner = ']'||l_object_owner||q'[']'; - open l_rows for l_cursor_text; + open l_rows for l_cursor_text using l_data; fetch l_rows bulk collect into l_result limit 1000000; close l_rows; return l_result; @@ -516,15 +518,9 @@ create or replace package body ut_suite_manager is l_object_name varchar2(250); l_procedure_name varchar2(250); begin - if a_object_owner is not null then - l_object_owner := sys.dbms_assert.qualified_sql_name(a_object_owner); - end if; - if a_object_name is not null then - l_object_name := sys.dbms_assert.qualified_sql_name(a_object_name); - end if; - if a_procedure_name is not null then - l_procedure_name := sys.dbms_assert.qualified_sql_name(a_procedure_name); - end if; + l_object_owner := ut_utils.qualified_sql_name(a_object_owner); + l_object_name := ut_utils.qualified_sql_name(a_object_name); + l_procedure_name := ut_utils.qualified_sql_name(a_procedure_name); if a_path is null and a_object_name is not null then execute immediate 'select min(path) from '||l_ut_owner||q'[.ut_suite_cache @@ -533,9 +529,7 @@ create or replace package body ut_suite_manager is and name = nvl(:a_procedure_name, name)]' into l_path using upper(l_object_owner), upper(l_object_name), upper(a_procedure_name); else - if a_path is not null then - l_path := lower(sys.dbms_assert.qualified_sql_name(a_path)); - end if; + l_path := lower(ut_utils.qualified_sql_name(a_path)); end if; l_suite_item_name := case when l_tags.count > 0 then 'suite_items_tags' else 'suite_items' end; @@ -804,12 +798,8 @@ create or replace package body ut_suite_manager is l_owner_name varchar2(250); l_package_name varchar2(250); begin - if a_owner_name is not null then - l_owner_name := sys.dbms_assert.qualified_sql_name(a_owner_name); - end if; - if a_package_name is not null then - l_package_name := sys.dbms_assert.qualified_sql_name(a_package_name); - end if; + l_owner_name := ut_utils.qualified_sql_name(a_owner_name); + l_package_name := ut_utils.qualified_sql_name(a_package_name); refresh_cache(l_owner_name); @@ -894,15 +884,9 @@ create or replace package body ut_suite_manager is l_package_name varchar2(250); l_procedure_name varchar2(250); begin - if a_owner_name is not null then - l_owner_name := sys.dbms_assert.qualified_sql_name(a_owner_name); - end if; - if a_package_name is not null then - l_package_name := sys.dbms_assert.qualified_sql_name(a_package_name); - end if; - if a_procedure_name is not null then - l_procedure_name := sys.dbms_assert.qualified_sql_name(a_procedure_name); - end if; + l_owner_name := ut_utils.qualified_sql_name(a_owner_name); + l_package_name := ut_utils.qualified_sql_name(a_package_name); + l_procedure_name := ut_utils.qualified_sql_name(a_procedure_name); refresh_cache(l_owner_name); diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 1fa128c64..1d451ddaa 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -865,5 +865,24 @@ create or replace package body ut_utils is return regexp_replace(a_item,a_prefix||a_connector); end; + function get_hash(a_data raw, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash is + begin + return dbms_crypto.hash(a_data, a_hash_type); + end; + + function get_hash(a_data clob, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash is + begin + return dbms_crypto.hash(a_data, a_hash_type); + end; + + function qualified_sql_name(a_name varchar2) return varchar2 is + begin + return + case + when a_name is not null + then sys.dbms_assert.qualified_sql_name(a_name) + end; + end; + end ut_utils; / diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 9858bffac..a39c28ded 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -420,5 +420,24 @@ create or replace package ut_utils authid definer is function strip_prefix(a_item varchar2, a_prefix varchar2, a_connector varchar2 := '/') return varchar2; - end ut_utils; + + subtype t_hash is raw(128); + + /* + * Wrapper function for calling dbms_crypto.hash + */ + function get_hash(a_data raw, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash; + + /* + * Wrapper function for calling dbms_crypto.hash + */ + function get_hash(a_data clob, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash; + + /* + * Verifies that the input string is a qualified SQL name using sys.dbms_assert.qualified_sql_name + * If null value passed returns null + */ + function qualified_sql_name(a_name varchar2) return varchar2; + +end ut_utils; / diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index c19d86261..24f2b29bc 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -31,6 +31,17 @@ whenever oserror exit failure rollback alter session set current_schema = &&ut3_owner; +--public API +grant execute on &&ut3_owner..ut to public; +grant execute on &&ut3_owner..ut_runner to public; +grant execute on &&ut3_owner..ut_file_mappings to public; +grant execute on &&ut3_owner..ut_file_mapping to public; +grant execute on &&ut3_owner..ut_file_mapper to public; +grant execute on &&ut3_owner..ut_key_value_pairs to public; +grant execute on &&ut3_owner..ut_key_value_pair to public; +grant execute on &&ut3_owner..ut_suite_items_info to public; +grant execute on &&ut3_owner..ut_suite_item_info to public; + --expectations grant execute on &&ut3_owner..ut_expectation to public; grant execute on &&ut3_owner..ut_expectation_compound to public; @@ -52,15 +63,6 @@ grant execute on &&ut3_owner..ut_equal to public; grant execute on &&ut3_owner..ut_have_count to public; grant execute on &&ut3_owner..ut_match to public; ---public API -grant execute on &&ut3_owner..ut to public; -grant execute on &&ut3_owner..ut_runner to public; -grant execute on &&ut3_owner..ut_file_mappings to public; -grant execute on &&ut3_owner..ut_file_mapping to public; -grant execute on &&ut3_owner..ut_file_mapper to public; -grant execute on &&ut3_owner..ut_key_value_pairs to public; -grant execute on &&ut3_owner..ut_key_value_pair to public; - --generic types grant execute on &&ut3_owner..ut_varchar2_list to public; grant execute on &&ut3_owner..ut_varchar2_rows to public; @@ -103,24 +105,17 @@ grant execute on &&ut3_owner..ut_output_clob_table_buffer to public; grant select, insert, update, delete on &&ut3_owner..ut_compound_data_tmp to public; grant select, insert, update, delete on &&ut3_owner..ut_compound_data_diff_tmp to public; -grant execute on &&ut3_owner..ut_annotations to public; -grant execute on &&ut3_owner..ut_annotation to public; -grant execute on &&ut3_owner..ut_annotated_object to public; -grant execute on &&ut3_owner..ut_annotated_objects to public; -grant select on &&ut3_owner..ut_annotation_cache_info to public; -grant select on &&ut3_owner..ut_annotation_cache to public; - +--other grants grant execute on &&ut3_owner..ut_executables to public; grant execute on &&ut3_owner..ut_executable_test to public; grant select on &&ut3_owner..ut_suite_cache to public; grant select on &&ut3_owner..ut_suite_cache_package to public; grant select on &&ut3_owner..ut_suite_cache_schema to public; -grant execute on &&ut3_owner..ut_annotation_cache_manager to public; -grant execute on &&ut3_owner..ut_annotation_parser to public; + +--needed for selecting from annotation objects grant execute on &&ut3_owner..ut_annotation_objs_cache_info to public; grant execute on &&ut3_owner..ut_annotation_obj_cache_info to public; -grant execute on &&ut3_owner..ut_suite_items_info to public; -grant execute on &&ut3_owner..ut_suite_item_info to public; + grant select, insert, delete, update on &&ut3_owner..dbmspcc_blocks to public; grant select, insert, delete, update on &&ut3_owner..dbmspcc_runs to public; grant select, insert, delete, update on &&ut3_owner..dbmspcc_units to public; @@ -128,6 +123,7 @@ grant execute on &&ut3_owner..ut_matcher_options to public; grant execute on &&ut3_owner..ut_matcher_options_items to public; grant execute on &&ut3_owner..ut_run_info to public; + prompt Creating synonyms for UTPLSQL objects in &&ut3_owner schema to PUBLIC create public synonym ut_expectation for &&ut3_owner..ut_expectation; diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql index 9da5ebebb..9b0f1287e 100644 --- a/source/create_user_grants.sql +++ b/source/create_user_grants.sql @@ -51,6 +51,17 @@ whenever oserror exit failure rollback alter session set current_schema = &&ut3_owner; +--public API +grant execute on &&ut3_owner..ut to &ut3_user; +grant execute on &&ut3_owner..ut_runner to &ut3_user; +grant execute on &&ut3_owner..ut_file_mappings to &ut3_user; +grant execute on &&ut3_owner..ut_file_mapping to &ut3_user; +grant execute on &&ut3_owner..ut_file_mapper to &ut3_user; +grant execute on &&ut3_owner..ut_key_value_pairs to &ut3_user; +grant execute on &&ut3_owner..ut_key_value_pair to &ut3_user; +grant execute on &&ut3_owner..ut_suite_items_info to &ut3_user; +grant execute on &&ut3_owner..ut_suite_item_info to &ut3_user; + --expectations grant execute on &&ut3_owner..ut_expectation to &ut3_user; grant execute on &&ut3_owner..ut_expectation_compound to &ut3_user; @@ -72,15 +83,6 @@ grant execute on &&ut3_owner..ut_equal to &ut3_user; grant execute on &&ut3_owner..ut_have_count to &ut3_user; grant execute on &&ut3_owner..ut_match to &ut3_user; ---public API -grant execute on &&ut3_owner..ut to &ut3_user; -grant execute on &&ut3_owner..ut_runner to &ut3_user; -grant execute on &&ut3_owner..ut_file_mappings to &ut3_user; -grant execute on &&ut3_owner..ut_file_mapping to &ut3_user; -grant execute on &&ut3_owner..ut_file_mapper to &ut3_user; -grant execute on &&ut3_owner..ut_key_value_pairs to &ut3_user; -grant execute on &&ut3_owner..ut_key_value_pair to &ut3_user; - --generic types grant execute on &&ut3_owner..ut_varchar2_list to &ut3_user; grant execute on &&ut3_owner..ut_varchar2_rows to &ut3_user; @@ -97,6 +99,7 @@ grant execute on &&ut3_owner..ut_coverage_html_reporter to &ut3_user; grant execute on &&ut3_owner..ut_coverage_sonar_reporter to &ut3_user; grant execute on &&ut3_owner..ut_coveralls_reporter to &ut3_user; grant execute on &&ut3_owner..ut_coverage_cobertura_reporter to &ut3_user; +grant execute on &&ut3_owner..ut_realtime_reporter to &ut3_user; grant execute on &&ut3_owner..ut_sonar_test_reporter to &ut3_user; --reporters base @@ -122,23 +125,17 @@ grant execute on &&ut3_owner..ut_output_clob_table_buffer to &ut3_user; grant select, insert, update, delete on &&ut3_owner..ut_compound_data_tmp to &ut3_user; grant select, insert, update, delete on &&ut3_owner..ut_compound_data_diff_tmp to &ut3_user; -grant execute on &&ut3_owner..ut_annotations to &ut3_user; -grant execute on &&ut3_owner..ut_annotation to &ut3_user; -grant execute on &&ut3_owner..ut_annotated_object to &ut3_user; -grant execute on &&ut3_owner..ut_annotated_objects to &ut3_user; -grant select on &&ut3_owner..ut_annotation_cache_info to &ut3_user; -grant select on &&ut3_owner..ut_annotation_cache to &ut3_user; - +--other grants grant execute on &&ut3_owner..ut_executables to &ut3_user; grant execute on &&ut3_owner..ut_executable_test to &ut3_user; grant select on &&ut3_owner..ut_suite_cache to &ut3_user; grant select on &&ut3_owner..ut_suite_cache_package to &ut3_user; grant select on &&ut3_owner..ut_suite_cache_schema to &ut3_user; -grant execute on &&ut3_owner..ut_annotation_cache_manager to &ut3_user; -grant execute on &&ut3_owner..ut_annotation_parser to &ut3_user; + +--needed for selecting from annotation objects grant execute on &&ut3_owner..ut_annotation_objs_cache_info to &ut3_user; grant execute on &&ut3_owner..ut_annotation_obj_cache_info to &ut3_user; -grant execute on &&ut3_owner..ut_realtime_reporter to &ut3_user; + grant select, insert, delete, update on &&ut3_owner..dbmspcc_blocks to &ut3_user; grant select, insert, delete, update on &&ut3_owner..dbmspcc_runs to &ut3_user; grant select, insert, delete, update on &&ut3_owner..dbmspcc_units to &ut3_user; diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index cbfc5ac58..e00df2cc7 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -210,7 +210,7 @@ create or replace package body ut_compound_data_helper is l_ut_owner varchar2(250) := ut_utils.ut_owner; begin if a_data_info.is_sql_diffable = 0 then - l_col_syntax := l_ut_owner ||'.ut_compound_data_helper.get_hash('||l_alias||a_data_info.transformed_name||'.getClobVal()) as '||a_data_info.transformed_name ; + l_col_syntax := l_ut_owner ||'.ut_utils.get_hash('||l_alias||a_data_info.transformed_name||'.getClobVal()) as '||a_data_info.transformed_name ; elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type = 'DATE' then l_col_syntax := 'to_date('||l_alias||a_data_info.transformed_name||') as '|| a_data_info.transformed_name; elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('TIMESTAMP') then @@ -536,16 +536,6 @@ create or replace package body ut_compound_data_helper is return l_results; end; - function get_hash(a_data raw, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash is - begin - return dbms_crypto.hash(a_data, a_hash_type); - end; - - function get_hash(a_data clob, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash is - begin - return dbms_crypto.hash(a_data, a_hash_type); - end; - function get_fixed_size_hash(a_string varchar2, a_base integer :=0,a_size integer := 9999999) return number is begin return dbms_utility.get_hash_value(a_string,a_base,a_size); diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 8d763c80c..209717b62 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -90,12 +90,6 @@ create or replace package ut_compound_data_helper authid definer is a_extract_path varchar2 ) return tt_row_diffs; - subtype t_hash is raw(128); - - function get_hash(a_data raw, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash; - - function get_hash(a_data clob, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash; - function get_fixed_size_hash(a_string varchar2, a_base integer :=0,a_size integer :=9999999) return number; function gen_compare_sql( diff --git a/source/expectations/data_values/ut_data_value_json.tpb b/source/expectations/data_values/ut_data_value_json.tpb index 0f3f5287b..e1ef4d7e2 100644 --- a/source/expectations/data_values/ut_data_value_json.tpb +++ b/source/expectations/data_values/ut_data_value_json.tpb @@ -53,7 +53,7 @@ create or replace type body ut_data_value_json as l_result_string varchar2(32767); l_other ut_data_value_json; l_self ut_data_value_json := self; - l_diff_id ut_compound_data_helper.t_hash; + l_diff_id ut_utils.t_hash; c_max_rows integer := ut_utils.gc_diff_max_rows; l_diffs ut_compound_data_helper.tt_json_diff_tab; l_message varchar2(32767); @@ -95,7 +95,7 @@ create or replace type body ut_data_value_json as end if; dbms_lob.createtemporary(l_result, true); l_other := treat(a_other as ut_data_value_json); - l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); + l_diff_id := ut_utils.get_hash(self.data_id||l_other.data_id); if not l_self.is_null and not l_other.is_null then l_diffs := ut_compound_data_helper.get_json_diffs_tmp(l_diff_id); @@ -129,13 +129,13 @@ create or replace type body ut_data_value_json as member function compare_implementation(a_other in ut_data_value,a_match_options ut_matcher_options) return integer is - l_result integer; - l_other ut_data_value_json; - l_diff_id ut_compound_data_helper.t_hash; + l_result integer; + l_other ut_data_value_json; + l_diff_id ut_utils.t_hash; begin if a_other is of (ut_data_value_json) then l_other := treat(a_other as ut_data_value_json); - l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id); + l_diff_id := ut_utils.get_hash(self.data_id||l_other.data_id); l_result := case when ut_compound_data_helper.insert_json_diffs( diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index eda5b2cd9..f6315cc1c 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -149,7 +149,7 @@ create or replace type body ut_data_value_refcursor as l_exp_missing_pk ut_varchar2_list := ut_varchar2_list(); c_max_rows integer := ut_utils.gc_diff_max_rows; - l_diff_id ut_compound_data_helper.t_hash; + l_diff_id ut_utils.t_hash; l_diff_row_count integer; l_row_diffs ut_compound_data_helper.tt_row_diffs; l_message varchar2(32767); @@ -243,7 +243,7 @@ create or replace type body ut_data_value_refcursor as --diff rows and row elements if the pk is not missing if l_act_missing_pk.count + l_exp_missing_pk.count = 0 then - l_diff_id := ut_compound_data_helper.get_hash( l_self.data_id || l_other.data_id ); + l_diff_id := ut_utils.get_hash( l_self.data_id || l_other.data_id ); -- First tell how many rows are different l_diff_row_count := ut_compound_data_helper.get_rows_diff_count; @@ -317,14 +317,14 @@ create or replace type body ut_data_value_refcursor as a_other ut_data_value_refcursor, a_diff_cursor_text clob ) return integer is - l_diff_id ut_compound_data_helper.t_hash; + l_diff_id ut_utils.t_hash; l_result integer; --We will start with number od differences being displayed. l_cursor sys_refcursor; l_diff_tab ut_compound_data_helper.t_diff_tab; l_diif_rowcount integer :=0; begin - l_diff_id := ut_compound_data_helper.get_hash(a_self.data_id||a_other.data_id); + l_diff_id := ut_utils.get_hash(a_self.data_id||a_other.data_id); begin l_cursor := ut_compound_data_helper.get_compare_cursor(a_diff_cursor_text, diff --git a/test/install_tests.sql b/test/install_tests.sql deleted file mode 100644 index 9ce06280d..000000000 --- a/test/install_tests.sql +++ /dev/null @@ -1,156 +0,0 @@ -set define off -whenever sqlerror exit failure rollback -whenever oserror exit failure rollback - -alter session set plsql_optimize_level=0; ---Install helpers -@@helpers/ut_test_table.sql -@@helpers/ut_example_tests.pks -@@helpers/ut_example_tests.pkb -@@helpers/ut_without_body.pks -@@helpers/ut_with_invalid_body.pks -@@helpers/ut_with_invalid_body.pkb -@@helpers/other_dummy_object.tps -@@helpers/test_dummy_object.tps -@@helpers/test_dummy_object_list.tps -@@helpers/test_event_object.tps -@@helpers/test_event_list.tps -@@helpers/test_tab_varchar2.tps -@@helpers/test_tab_varray.tps -@@helpers/ut3user#.test_cursor_grants.pks -@@helpers/ut3user#.test_cursor_grants.pkb - ---Install tests -@@core.pks -@@core/min_grant_user/test_min_grant_user.pks -@@api/test_ut_runner.pks -@@api/test_ut_run.pks -@@core/test_ut_utils.pks -@@core/test_ut_suite.pks -@@core/test_ut_test.pks -@@core/annotations/test_annotation_parser.pks -@@core/annotations/test_annotation_manager.pks -@@core/annotations/test_before_after_annotations.pks -@@core/expectations/test_expectation_processor.pks -@@core/expectations/test_matchers.pks -@@core/test_output_buffer.pks -@@core/test_file_mapper.pks -@@core/test_suite_manager.pks -@@core/test_ut_executable.pks -@@core/test_suite_builder.pks -@@core/reporters.pks -@@core/reporters/test_coverage.pks -set define on -@@install_above_12_1.sql 'core/reporters/test_extended_coverage.pks' -@@install_above_12_1.sql 'core/reporters/test_coverage/test_html_extended_reporter.pks' -set define off -@@core/reporters/test_coverage/test_coverage_sonar_reporter.pks -@@core/reporters/test_coverage/test_coveralls_reporter.pks -@@core/reporters/test_coverage/test_cov_cobertura_reporter.pks -@@core/reporters/test_junit_reporter.pks -@@core/reporters/test_realtime_reporter.pks -@@core/reporters/test_debug_reporter.pks -set define on -@@install_below_12_2.sql 'core/reporters/test_coverage/test_html_proftab_reporter.pks' -set define off -@@core/reporters/test_tfs_junit_reporter.pks -@@core/reporters/test_documentation_reporter.pks -@@core/reporters/test_sonar_test_reporter.pks -@@core/reporters/test_teamcity_reporter.pks -@@core/expectations.pks -@@core/expectations/binary/test_be_greater_or_equal.pks -@@core/expectations/binary/test_be_greater_than.pks -@@core/expectations/binary/test_be_less_or_equal.pks -@@core/expectations/binary/test_equal.pks -@@core/expectations/binary/test_expect_to_be_less_than.pks -@@core/expectations/unary/test_expect_to_be_empty.pks -@@core/expectations/unary/test_expect_to_have_count.pks -@@core/expectations/unary/test_expect_not_to_be_null.pks -@@core/expectations/unary/test_expect_to_be_not_null.pks -@@core/expectations/unary/test_expect_to_be_null.pks -@@core/expectations/unary/test_expect_to_be_true_false.pks -@@core/expectations/test_expectations_cursor.pks -@@core/expectations/test_expectation_anydata.pks -@@core/annotations/test_annot_throws_exception.pks - -@@core.pkb -@@core/min_grant_user/test_min_grant_user.pkb -@@api/test_ut_runner.pkb -@@api/test_ut_run.pkb -@@core/test_ut_utils.pkb -@@core/test_ut_suite.pkb -@@core/test_ut_test.pkb -@@core/annotations/test_annotation_parser.pkb -@@core/annotations/test_annotation_manager.pkb -@@core/expectations/test_expectation_processor.pkb -@@core/expectations/test_matchers.pkb -@@core/annotations/test_before_after_annotations.pkb -@@core/test_output_buffer.pkb -@@core/test_file_mapper.pkb -@@core/test_suite_manager.pkb -@@core/test_ut_executable.pkb -@@core/test_suite_builder.pkb -@@core/reporters.pkb -@@core/reporters/test_coverage.pkb -set define on -@@install_above_12_1.sql 'core/reporters/test_extended_coverage.pkb' -@@install_above_12_1.sql 'core/reporters/test_coverage/test_html_extended_reporter.pkb' -set define off -@@core/reporters/test_coverage/test_coverage_sonar_reporter.pkb -@@core/reporters/test_coverage/test_coveralls_reporter.pkb -@@core/reporters/test_coverage/test_cov_cobertura_reporter.pkb -@@core/reporters/test_junit_reporter.pkb -@@core/reporters/test_realtime_reporter.pkb -@@core/reporters/test_debug_reporter.pkb -set define on -@@install_below_12_2.sql 'core/reporters/test_coverage/test_html_proftab_reporter.pkb' -set define off -@@core/reporters/test_tfs_junit_reporter.pkb -@@core/reporters/test_documentation_reporter.pkb -@@core/reporters/test_sonar_test_reporter.pkb -@@core/reporters/test_teamcity_reporter.pkb -@@core/expectations.pkb -@@core/expectations/binary/test_be_greater_or_equal.pkb -@@core/expectations/binary/test_be_greater_than.pkb -@@core/expectations/binary/test_be_less_or_equal.pkb -@@core/expectations/binary/test_equal.pkb -@@core/expectations/binary/test_expect_to_be_less_than.pkb -@@core/expectations/unary/test_expect_to_be_empty.pkb -@@core/expectations/unary/test_expect_to_have_count.pkb -@@core/expectations/unary/test_expect_not_to_be_null.pkb -@@core/expectations/unary/test_expect_to_be_not_null.pkb -@@core/expectations/unary/test_expect_to_be_null.pkb -@@core/expectations/unary/test_expect_to_be_true_false.pkb -@@core/expectations/test_expectations_cursor.pkb -@@core/expectations/test_expectation_anydata.pkb -@@core/annotations/test_annot_throws_exception.pkb - -set linesize 200 -set define on -set verify off -column text format a100 -column error_count noprint new_value error_count - -prompt Validating installation - -set heading on -select type, name, sequence, line, position, text, count(1) over() error_count - from all_errors - where owner = USER - and name not like 'BIN$%' --not recycled - and name != 'UT_WITH_INVALID_BODY' - -- errors only. ignore warnings - and attribute = 'ERROR' - order by name, type, sequence -/ - -begin - if to_number('&&error_count') > 0 then - raise_application_error(-20000, 'Not all sources were successfully installed.'); - else - dbms_output.put_line('Installation completed successfully'); - end if; -end; -/ - -exit; diff --git a/test/install_ut3_user_tests.sql b/test/install_ut3_user_tests.sql index b7361e4aa..ef50432d1 100644 --- a/test/install_ut3_user_tests.sql +++ b/test/install_ut3_user_tests.sql @@ -8,6 +8,9 @@ alter session set plsql_optimize_level=0; @@common_helper/utplsql.pkb prompt Install user tests +@@ut3_user/helpers/some_item.tps +@@ut3_user/helpers/some_items.tps +@@ut3_user/helpers/some_object.tps @@ut3_user/test_user.pks @@ut3_user/expectations/unary/test_expect_not_to_be_null.pks @@ut3_user/expectations/unary/test_expect_to_be_null.pks diff --git a/test/ut3_tester/core/annotations/test_annotation_manager.pkb b/test/ut3_tester/core/annotations/test_annotation_manager.pkb index 944f6451d..d564e5d57 100644 --- a/test/ut3_tester/core/annotations/test_annotation_manager.pkb +++ b/test/ut3_tester/core/annotations/test_annotation_manager.pkb @@ -212,6 +212,14 @@ create or replace package body test_annotation_manager is procedure trg_not_add_new_package is l_actual sys_refcursor; begin + --Arrange + open l_actual for + select * + from ut3.ut_annotation_cache_info + where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PACKAGE' and object_name = 'DUMMY_PACKAGE'; + + ut.expect(l_actual).to_be_empty(); + --Act create_dummy_package(); --Assert @@ -236,7 +244,6 @@ create or replace package body test_annotation_manager is assert_dummy_test_package(l_start_date); end; - --%test(Removes annotations from cache when object was removed and user can't see whole schema) procedure trg_no_data_for_dropped_object is l_actual sys_refcursor; begin diff --git a/test/ut3_tester_helper/main_helper.pkb b/test/ut3_tester_helper/main_helper.pkb index de28083f9..2370f1db6 100644 --- a/test/ut3_tester_helper/main_helper.pkb +++ b/test/ut3_tester_helper/main_helper.pkb @@ -100,7 +100,7 @@ create or replace package body main_helper is pragma autonomous_transaction; begin delete from ut3.ut_annotation_cache_info - where object_owner = user and object_type = 'PACKAGE' and object_name in ('DUMMY_PACKAGE','DUMMY_TEST_PACKAGE'); + where object_owner = 'UT3_TESTER' and object_type = 'PACKAGE' and object_name in ('DUMMY_PACKAGE','DUMMY_TEST_PACKAGE'); commit; end; diff --git a/test/ut3_tester_helper/run_helper.pkb b/test/ut3_tester_helper/run_helper.pkb index 9bc2b7f79..bea89b901 100644 --- a/test/ut3_tester_helper/run_helper.pkb +++ b/test/ut3_tester_helper/run_helper.pkb @@ -627,6 +627,35 @@ create or replace package body run_helper is begin delete from ut3.ut_output_buffer_tmp; end; - + + function get_annotation_cache_info_cur( + a_owner varchar2, + a_type varchar2 + ) return sys_refcursor is + l_result sys_refcursor; + begin + open l_result for + select * from ut3.ut_annotation_cache_info + where object_owner = a_owner and object_type = a_type; + + return l_result; + end; + + function get_annotation_cache_cursor( + a_owner varchar2, + a_type varchar2, + a_name varchar2 := null + ) return sys_refcursor is + l_result sys_refcursor; + begin + open l_result for + select * + from ut3.ut_annotation_cache_info i + join ut3.ut_annotation_cache c on c.cache_id = i.cache_id + where object_owner = a_owner and object_type = a_type and object_name = nvl( a_name, object_name ); + + return l_result; + end; + end; / diff --git a/test/ut3_tester_helper/run_helper.pks b/test/ut3_tester_helper/run_helper.pks index e06401eae..0f5e5a925 100644 --- a/test/ut3_tester_helper/run_helper.pks +++ b/test/ut3_tester_helper/run_helper.pks @@ -63,6 +63,17 @@ create or replace package run_helper is function ut_output_buffer_tmp return t_out_buff_tab pipelined; procedure delete_buffer; - + + function get_annotation_cache_info_cur( + a_owner varchar2, + a_type varchar2 + ) return sys_refcursor; + + function get_annotation_cache_cursor( + a_owner varchar2, + a_type varchar2, + a_name varchar2 := null + ) return sys_refcursor; + end; / diff --git a/test/ut3_user/api/test_ut_runner.pkb b/test/ut3_user/api/test_ut_runner.pkb index 2baf4cbeb..28370ca96 100644 --- a/test/ut3_user/api/test_ut_runner.pkb +++ b/test/ut3_user/api/test_ut_runner.pkb @@ -198,54 +198,64 @@ end;'; procedure test_purge_cache_schema_type is l_actual sys_refcursor; begin + --Arrange + l_actual := ut3_tester_helper.run_helper.get_annotation_cache_info_cur( + a_owner => sys_context('USERENV', 'CURRENT_USER'), + a_type => 'PROCEDURE' + ); - open l_actual for - select * from ut3.ut_annotation_cache_info - where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PROCEDURE'; ut.expect(l_actual).not_to_be_empty(); --Act ut3.ut_runner.purge_cache(sys_context('USERENV', 'CURRENT_USER'),'PROCEDURE'); --Assert - open l_actual for - select * from ut3.ut_annotation_cache_info - where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PROCEDURE'; + + l_actual := ut3_tester_helper.run_helper.get_annotation_cache_info_cur( + a_owner => sys_context('USERENV', 'CURRENT_USER'), + a_type => 'PROCEDURE' + ); --Cache purged for object owner/type ut.expect(l_actual).to_be_empty(); - open l_actual for - select * from ut3.ut_annotation_cache_info - where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PACKAGE'; + + l_actual := ut3_tester_helper.run_helper.get_annotation_cache_info_cur( + a_owner => sys_context('USERENV', 'CURRENT_USER'), + a_type => 'PACKAGE' + ); --Cache not purged for other types ut.expect(l_actual).not_to_be_empty(); - open l_actual for - select * from ut3.ut_annotation_cache_info - where object_owner = 'UT3_TESTER_HELPER' and object_type = 'PROCEDURE'; + + l_actual := ut3_tester_helper.run_helper.get_annotation_cache_info_cur( + a_owner => 'UT3_TESTER_HELPER', + a_type => 'PROCEDURE' + ); --Cache not purged for other owners ut.expect(l_actual).not_to_be_empty(); end; procedure test_rebuild_cache_schema_type is - l_actual integer; + l_actual sys_refcursor; begin --Act - ut3.ut_runner.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); + ut3.ut_runner.rebuild_annotation_cache( sys_context('USERENV', 'CURRENT_USER'), 'PACKAGE' ); --Assert - select count(1) into l_actual - from ut3.ut_annotation_cache_info i - join ut3.ut_annotation_cache c on c.cache_id = i.cache_id - where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PACKAGE' and object_name = 'DUMMY_TEST_PACKAGE'; + l_actual := ut3_tester_helper.run_helper.get_annotation_cache_cursor( + a_owner => sys_context('USERENV', 'CURRENT_USER'), + a_type => 'PACKAGE', + a_name => 'DUMMY_TEST_PACKAGE' + ); + --Rebuild cache for sys_context('USERENV', 'CURRENT_USER')/packages - ut.expect(l_actual).to_equal(4); + ut.expect(l_actual).to_have_count(4); - select count(1) into l_actual - from ut3.ut_annotation_cache_info i - join ut3.ut_annotation_cache c on c.cache_id = i.cache_id - where object_owner = 'UT3_TESTER_HELPER' and object_type = 'PROCEDURE'; + l_actual := ut3_tester_helper.run_helper.get_annotation_cache_cursor( + a_owner => sys_context('USERENV', 'CURRENT_USER'), + a_type => 'PACKAGE' + ); --Did not rebuild cache for ut3/procedures - ut.expect(l_actual).to_equal(0); + ut.expect(l_actual).to_have_count(0); end; procedure test_get_suites_info_notag is diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index daa3389bc..4603f9eff 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -1967,23 +1967,15 @@ Diff:% end; procedure compare_rec_colltype_as_cols is - l_actual sys_refcursor; - l_expected sys_refcursor; - l_actual_tab ut3.ut_annotated_object; - l_expected_tab ut3.ut_annotated_object; - l_expected_message varchar2(32767); - l_actual_message varchar2(32767); + l_actual sys_refcursor; + l_expected sys_refcursor; + l_actual_tab some_object; + l_expected_tab some_object; begin - select ut3.ut_annotated_object('TEST','TEST','TEST', SYSDATE, - ut3.ut_annotations(ut3.ut_annotation(1,'test','test','test'), - ut3.ut_annotation(2,'test','test','test')) - ) + select some_object( user,'TEST', sysdate, some_items( some_item(1,'test'), some_item(2,'test') ) ) into l_actual_tab from dual; - select ut3.ut_annotated_object('TEST','TEST','TEST', SYSDATE, - ut3.ut_annotations(ut3.ut_annotation(1,'test','test','test'), - ut3.ut_annotation(2,'test','test','test')) - ) + select some_object( user,'TEST', sysdate, some_items( some_item(1,'test'), some_item(2,'test') ) ) into l_expected_tab from dual; --Arrange @@ -1999,24 +1991,16 @@ Diff:% end; procedure compare_rec_colltype_as_attr is - l_actual sys_refcursor; - l_expected sys_refcursor; - l_actual_tab ut3.ut_annotated_object; - l_expected_tab ut3.ut_annotated_object; - l_expected_message varchar2(32767); - l_actual_message varchar2(32767); + l_actual sys_refcursor; + l_expected sys_refcursor; + l_actual_tab some_object; + l_expected_tab some_object; begin - select ut3.ut_annotated_object('TEST','TEST','TEST', SYSDATE, - ut3.ut_annotations(ut3.ut_annotation(1,'test','test','test'), - ut3.ut_annotation(2,'test','test','test')) - ) - into l_actual_tab from dual; - - select ut3.ut_annotated_object('TEST','TEST','TEST', SYSDATE, - ut3.ut_annotations(ut3.ut_annotation(1,'test','test','test'), - ut3.ut_annotation(2,'test','test','test')) - ) - into l_expected_tab from dual; + select some_object( user,'TEST', sysdate, some_items( some_item(1,'test'), some_item(2,'test') ) ) + into l_actual_tab from dual; + + select some_object( user,'TEST', sysdate, some_items( some_item(1,'test'), some_item(2,'test') ) ) + into l_expected_tab from dual; --Arrange open l_actual for select l_actual_tab as nested_table from dual; @@ -2031,60 +2015,44 @@ Diff:% end; procedure compare_collection_in_rec is - l_actual sys_refcursor; - l_expected sys_refcursor; - l_actual_tab ut3.ut_annotated_object; - l_expected_tab ut3.ut_annotated_object; - l_expected_message varchar2(32767); - l_actual_message varchar2(32767); + l_actual sys_refcursor; + l_expected sys_refcursor; + l_actual_tab some_object; + l_expected_tab some_object; begin - select ut3.ut_annotated_object('TEST','TEST','TEST', SYSDATE, - ut3.ut_annotations(ut3.ut_annotation(1,'test','test','test'), - ut3.ut_annotation(2,'test','test','test')) - ) - into l_actual_tab from dual; - - select ut3.ut_annotated_object('TEST','TEST','TEST', SYSDATE, - ut3.ut_annotations(ut3.ut_annotation(1,'test','test','test'), - ut3.ut_annotation(2,'test','test','test')) - ) - into l_expected_tab from dual; - + select some_object( user,'TEST', sysdate, some_items( some_item(1,'test'), some_item(2,'test') ) ) + into l_actual_tab from dual; + + select some_object( user,'TEST', sysdate, some_items( some_item(1,'test'), some_item(2,'test') ) ) + into l_expected_tab from dual; + --Arrange open l_actual for select l_actual_tab as nested_table from dual; open l_expected for select l_expected_tab as nested_table from dual; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('NESTED_TABLE/ANNOTATIONS'); + ut3.ut.expect(l_actual).to_equal(l_expected).join_by('NESTED_TABLE/ITEMS'); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure compare_rec_coll_as_cols_fl is - l_actual sys_refcursor; - l_expected sys_refcursor; - l_actual_tab ut3.ut_annotated_object; - l_expected_tab ut3.ut_annotated_object; + l_actual sys_refcursor; + l_expected sys_refcursor; + l_actual_tab some_object; + l_expected_tab some_object; l_expected_message varchar2(32767); l_actual_message varchar2(32767); l_date date := sysdate; begin - select ut3.ut_annotated_object('TEST','TEST','TEST', l_date, - ut3.ut_annotations(ut3.ut_annotation(1,'test','test','test'), - ut3.ut_annotation(2,'test','test','test')) - ) - into l_actual_tab - from dual; - - select ut3.ut_annotated_object('TEST','TEST','TEST', l_date, - ut3.ut_annotations(ut3.ut_annotation(1,'1test','test','test'), - ut3.ut_annotation(2,'test','test','test')) - ) - into l_expected_tab - from dual; - + select some_object( 'TEST','TEST', l_date, some_items( some_item(1,'BAD'), some_item(2,'test') ) ) + into l_actual_tab from dual; + + select some_object( 'TEST','TEST', l_date, some_items( some_item(1,'TEST'), some_item(2,'test') ) ) + into l_expected_tab from dual; + --Arrange open l_actual for select rownum rn, l_actual_tab as nested_table from dual; @@ -2099,48 +2067,41 @@ Diff:% l_expected_message := q'[%Actual: refcursor [ count = 1 ] was expected to equal: refcursor [ count = 1 ] %Diff: %Rows: [ 1 differences ] -%PK TEST - Actual: TESTTESTTEST%1testtesttest2testtesttest% -%PK TEST - Expected: TESTTESTTEST%11testtesttest2testtesttest%]'; +%PK TEST - Actual: TESTTEST%1BAD2test% +%PK TEST - Expected: TESTTEST%1TEST2test%]'; l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); - --ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); - end; + end; procedure compare_rec_coll_as_join is - l_actual sys_refcursor; - l_expected sys_refcursor; - l_actual_tab ut3.ut_annotated_object; - l_expected_tab ut3.ut_annotated_object; + l_actual sys_refcursor; + l_expected sys_refcursor; + l_actual_tab some_object; + l_expected_tab some_object; l_expected_message varchar2(32767); l_actual_message varchar2(32767); begin - select ut3.ut_annotated_object('TEST','TEST','TEST', SYSDATE, - ut3.ut_annotations(ut3.ut_annotation(1,'1test','test','test'), - ut3.ut_annotation(2,'test','test','test')) - ) - into l_actual_tab from dual; - - select ut3.ut_annotated_object('TEST','TEST','TEST', SYSDATE, - ut3.ut_annotations(ut3.ut_annotation(1,'test','test','test'), - ut3.ut_annotation(2,'test','test','test')) - ) - into l_expected_tab from dual; - + select some_object( 'TEST','TEST', sysdate, some_items( some_item(1,'BAD'), some_item(2,'test') ) ) + into l_actual_tab from dual; + + select some_object( 'TEST','TEST', sysdate, some_items( some_item(1,'TEST'), some_item(2,'test') ) ) + into l_expected_tab from dual; + --Arrange open l_actual for select l_actual_tab as nested_table from dual; open l_expected for select l_expected_tab as nested_table from dual; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('NESTED_TABLE/ANNOTATIONS/TEXT'); + ut3.ut.expect(l_actual).to_equal(l_expected).join_by('NESTED_TABLE/ITEMS/ID'); --Assert - l_expected_message := q'[%Actual: refcursor [ count = 1 ] was expected to equal: refcursor [ count = 1 ]% + l_expected_message := q'[%Actual: refcursor [ count = 1 ] was expected to equal: refcursor [ count = 1 ]% %Diff:% %Unable to join sets:% -%Join key NESTED_TABLE/ANNOTATIONS/TEXT does not exists in expected% -%Join key NESTED_TABLE/ANNOTATIONS/TEXT does not exists in actual% +%Join key NESTED_TABLE/ITEMS/ID does not exists in expected% +%Join key NESTED_TABLE/ITEMS/ID does not exists in actual% %Please make sure that your join clause is not refferring to collection element%]'; l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert @@ -2550,7 +2511,7 @@ Diff:% begin l_exp_message :='ORA-20218: SQL exception thrown when fetching data from cursor: ORA-01476: divisor is equal to zero -at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line 2561 ut3.ut.expect(l_actual).to_equal(l_expected);% +at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line 2522 ut3.ut.expect(l_actual).to_equal(l_expected);% Check the query and data for errors.'; open l_actual for @@ -2575,7 +2536,7 @@ Check the query and data for errors.'; l_exp_message :='ORA-20218: SQL exception thrown when fetching data from cursor: ORA-01476: divisor is equal to zero -at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line 2586 ut3.ut.expect(l_actual).to_equal(l_expected);% +at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line 2547 ut3.ut.expect(l_actual).to_equal(l_expected);% Check the query and data for errors.'; open l_expected for diff --git a/test/ut3_user/helpers/some_item.tps b/test/ut3_user/helpers/some_item.tps new file mode 100644 index 000000000..336f44d9a --- /dev/null +++ b/test/ut3_user/helpers/some_item.tps @@ -0,0 +1,6 @@ +create or replace type some_item force as object( + item_id number(38), + item_name varchar2(250) +) +/ + diff --git a/test/ut3_user/helpers/some_items.tps b/test/ut3_user/helpers/some_items.tps new file mode 100644 index 000000000..8b984f8a4 --- /dev/null +++ b/test/ut3_user/helpers/some_items.tps @@ -0,0 +1,2 @@ +create or replace type some_items force as table of some_item +/ diff --git a/test/ut3_user/helpers/some_object.tps b/test/ut3_user/helpers/some_object.tps new file mode 100644 index 000000000..024379974 --- /dev/null +++ b/test/ut3_user/helpers/some_object.tps @@ -0,0 +1,7 @@ +create or replace type some_object force as object( + object_owner varchar2(250), + object_name varchar2(250), + create_time timestamp, + items some_items +) +/ From 862ac6f4243d697c13fa7726a0baf93cffd0d205 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 21 Jun 2019 19:46:43 +0100 Subject: [PATCH 0529/1096] Disabled test for version below 12.2. --- .../expectations/test_expectations_cursor.pkb | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index c3d619653..278e732c2 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -2849,15 +2849,19 @@ Check the query and data for errors.'; l_expected sys_refcursor; begin -- populate actual - open l_actual for - select rownum as id, '1' some_column_with_a_pretty_long_enough_name from dual; + $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then + open l_actual for + select rownum as id, '1' some_column_with_a_pretty_long_enough_name from dual; - open l_expected for - select rownum as id, '1' some_column_with_a_pretty_long_enough_name from dual; + open l_expected for + select rownum as id, '1' some_column_with_a_pretty_long_enough_name from dual; - ut3.ut.expect(l_actual).to_equal(l_expected).include('ID,SOME_COLUMN_WITH_A_PRETTY_LONG_ENOUGH_NAME').join_by('ID'); - --Assert - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + ut3.ut.expect(l_actual).to_equal(l_expected).include('ID,SOME_COLUMN_WITH_A_PRETTY_LONG_ENOUGH_NAME').join_by('ID'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + $else + null; + $end end; end; From 713e3aa99c569e2dd873d3ce11095334f80d7705 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 23 Jun 2019 15:41:38 +0100 Subject: [PATCH 0530/1096] Fixed uninstall script. --- source/uninstall_objects.sql | 2 -- 1 file changed, 2 deletions(-) diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index 88a5f8239..10dddc5e8 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -194,8 +194,6 @@ drop table ut_compound_data_diff_tmp purge; drop table ut_json_data_diff_tmp; -drop trigger ut_trigger_annotation_parsing; - drop package ut_annotation_manager; drop package ut_annotation_parser; From a62a6f1e2dd2c2298690dcc71fd19e79ef2b7200 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 23 Jun 2019 20:16:34 +0100 Subject: [PATCH 0531/1096] Removed public grants for: - `ut_coverage` - `ut_coverage_options` - `ut_coverage_helper` --- .../create_synonyms_and_grants_for_public.sql | 85 ++++++++------- source/create_user_grants.sql | 31 +++--- source/create_user_synonyms.sql | 46 +++++--- test/ut3_tester/core.pkb | 2 +- test/ut3_tester_helper/coverage_helper.pkb | 103 +++++++++++++----- test/ut3_tester_helper/coverage_helper.pks | 24 ++-- test/ut3_user/reporters/test_coverage.pkb | 21 +--- test/ut3_user/reporters/test_coverage.pks | 9 +- .../test_cov_cobertura_reporter.pkb | 2 +- .../test_coverage/test_coveralls_reporter.pkb | 2 +- .../reporters/test_extended_coverage.pkb | 32 ------ .../reporters/test_extended_coverage.pks | 6 +- .../reporters/test_proftab_coverage.pkb | 15 +-- .../reporters/test_proftab_coverage.pks | 4 +- test/ut3_user/test_user.pkb | 2 +- 15 files changed, 191 insertions(+), 193 deletions(-) diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index 24f2b29bc..63d772f25 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -37,11 +37,16 @@ grant execute on &&ut3_owner..ut_runner to public; grant execute on &&ut3_owner..ut_file_mappings to public; grant execute on &&ut3_owner..ut_file_mapping to public; grant execute on &&ut3_owner..ut_file_mapper to public; -grant execute on &&ut3_owner..ut_key_value_pairs to public; -grant execute on &&ut3_owner..ut_key_value_pair to public; grant execute on &&ut3_owner..ut_suite_items_info to public; grant execute on &&ut3_owner..ut_suite_item_info to public; +--generic types +grant execute on &&ut3_owner..ut_varchar2_list to public; +grant execute on &&ut3_owner..ut_varchar2_rows to public; +grant execute on &&ut3_owner..ut_integer_list to public; +grant execute on &&ut3_owner..ut_key_value_pairs to public; +grant execute on &&ut3_owner..ut_key_value_pair to public; + --expectations grant execute on &&ut3_owner..ut_expectation to public; grant execute on &&ut3_owner..ut_expectation_compound to public; @@ -63,37 +68,30 @@ grant execute on &&ut3_owner..ut_equal to public; grant execute on &&ut3_owner..ut_have_count to public; grant execute on &&ut3_owner..ut_match to public; ---generic types -grant execute on &&ut3_owner..ut_varchar2_list to public; -grant execute on &&ut3_owner..ut_varchar2_rows to public; -grant execute on &&ut3_owner..ut_integer_list to public; ---reporters -grant execute on &&ut3_owner..ut_debug_reporter to public; +--reporters - test results grant execute on &&ut3_owner..ut_teamcity_reporter to public; grant execute on &&ut3_owner..ut_xunit_reporter to public; grant execute on &&ut3_owner..ut_junit_reporter to public; grant execute on &&ut3_owner..ut_tfs_junit_reporter to public; grant execute on &&ut3_owner..ut_documentation_reporter to public; +grant execute on &&ut3_owner..ut_sonar_test_reporter to public; +grant execute on &&ut3_owner..ut_realtime_reporter to public; +--reporters - coverage grant execute on &&ut3_owner..ut_coverage_html_reporter to public; grant execute on &&ut3_owner..ut_coverage_sonar_reporter to public; grant execute on &&ut3_owner..ut_coveralls_reporter to public; grant execute on &&ut3_owner..ut_coverage_cobertura_reporter to public; -grant execute on &&ut3_owner..ut_realtime_reporter to public; -grant execute on &&ut3_owner..ut_sonar_test_reporter to public; +--reporters - debug +grant execute on &&ut3_owner..ut_debug_reporter to public; ---reporters base +--reporters - base types grant execute on &&ut3_owner..ut_reporters to public; grant execute on &&ut3_owner..ut_reporter_base to public; grant execute on &&ut3_owner..ut_output_reporter_base to public; grant execute on &&ut3_owner..ut_coverage_reporter_base to public; grant execute on &&ut3_owner..ut_console_reporter_base to public; ---coverage -grant execute on &&ut3_owner..ut_coverage to public; -grant execute on &&ut3_owner..ut_coverage_options to public; -grant execute on &&ut3_owner..ut_coverage_helper to public; - --outputs grant execute on &&ut3_owner..ut_output_data_row to public; grant execute on &&ut3_owner..ut_output_data_rows to public; @@ -105,6 +103,10 @@ grant execute on &&ut3_owner..ut_output_clob_table_buffer to public; grant select, insert, update, delete on &&ut3_owner..ut_compound_data_tmp to public; grant select, insert, update, delete on &&ut3_owner..ut_compound_data_diff_tmp to public; +--needed for selecting from annotation objects +grant execute on &&ut3_owner..ut_annotation_objs_cache_info to public; +grant execute on &&ut3_owner..ut_annotation_obj_cache_info to public; + --other grants grant execute on &&ut3_owner..ut_executables to public; grant execute on &&ut3_owner..ut_executable_test to public; @@ -112,10 +114,6 @@ grant select on &&ut3_owner..ut_suite_cache to public; grant select on &&ut3_owner..ut_suite_cache_package to public; grant select on &&ut3_owner..ut_suite_cache_schema to public; ---needed for selecting from annotation objects -grant execute on &&ut3_owner..ut_annotation_objs_cache_info to public; -grant execute on &&ut3_owner..ut_annotation_obj_cache_info to public; - grant select, insert, delete, update on &&ut3_owner..dbmspcc_blocks to public; grant select, insert, delete, update on &&ut3_owner..dbmspcc_runs to public; grant select, insert, delete, update on &&ut3_owner..dbmspcc_units to public; @@ -126,10 +124,28 @@ grant execute on &&ut3_owner..ut_run_info to public; prompt Creating synonyms for UTPLSQL objects in &&ut3_owner schema to PUBLIC +--public API +create public synonym ut for &&ut3_owner..ut; +create public synonym ut_runner for &&ut3_owner..ut_runner; +create public synonym ut_file_mappings for &&ut3_owner..ut_file_mappings; +create public synonym ut_file_mapping for &&ut3_owner..ut_file_mapping; +create public synonym ut_file_mapper for &&ut3_owner..ut_file_mapper; +create public synonym ut_suite_items_info for &&ut3_owner..ut_suite_items_info; +create public synonym ut_suite_item_info for &&ut3_owner..ut_suite_item_info; + +--generic types +create public synonym ut_varchar2_list for &&ut3_owner..ut_varchar2_list; +create public synonym ut_varchar2_rows for &&ut3_owner..ut_varchar2_rows; +create public synonym ut_integer_list for &&ut3_owner..ut_integer_list; +create public synonym ut_key_value_pairs for &&ut3_owner..ut_key_value_pairs; +create public synonym ut_key_value_pair for &&ut3_owner..ut_key_value_pair; + +--expectations create public synonym ut_expectation for &&ut3_owner..ut_expectation; create public synonym ut_expectation_compound for &&ut3_owner..ut_expectation_compound; create public synonym ut_expectation_json for &&ut3_owner..ut_expectation_json; +--matchers create public synonym be_between for &&ut3_owner..be_between; create public synonym be_empty for &&ut3_owner..be_empty; create public synonym be_false for &&ut3_owner..be_false; @@ -146,41 +162,34 @@ create public synonym equal for &&ut3_owner..equal; create public synonym have_count for &&ut3_owner..have_count; create public synonym match for &&ut3_owner..match; -create public synonym ut for &&ut3_owner..ut; -create public synonym ut_runner for &&ut3_owner..ut_runner; -create public synonym ut_debug_reporter for &&ut3_owner..ut_debug_reporter; +--reporters - test results create public synonym ut_teamcity_reporter for &&ut3_owner..ut_teamcity_reporter; create public synonym ut_xunit_reporter for &&ut3_owner..ut_xunit_reporter; create public synonym ut_junit_reporter for &&ut3_owner..ut_junit_reporter; create public synonym ut_tfs_junit_reporter for &&ut3_owner..ut_tfs_junit_reporter; create public synonym ut_documentation_reporter for &&ut3_owner..ut_documentation_reporter; +create public synonym ut_sonar_test_reporter for &&ut3_owner..ut_sonar_test_reporter; +create public synonym ut_realtime_reporter for &&ut3_owner..ut_realtime_reporter; +--reporters - coverage create public synonym ut_coverage_html_reporter for &&ut3_owner..ut_coverage_html_reporter; create public synonym ut_coverage_sonar_reporter for &&ut3_owner..ut_coverage_sonar_reporter; create public synonym ut_coveralls_reporter for &&ut3_owner..ut_coveralls_reporter; create public synonym ut_coverage_cobertura_reporter for &&ut3_owner..ut_coverage_cobertura_reporter; +--reporters - debug +create public synonym ut_debug_reporter for &&ut3_owner..ut_debug_reporter; + +--reporters - base types create public synonym ut_reporters for &&ut3_owner..ut_reporters; -create public synonym ut_varchar2_list for &&ut3_owner..ut_varchar2_list; -create public synonym ut_varchar2_rows for &&ut3_owner..ut_varchar2_rows; -create public synonym ut_integer_list for &&ut3_owner..ut_integer_list; create public synonym ut_reporter_base for &&ut3_owner..ut_reporter_base; create public synonym ut_output_reporter_base for &&ut3_owner..ut_output_reporter_base; + +--other synonyms create public synonym ut_output_data_row for &&ut3_owner..ut_output_data_row; create public synonym ut_output_data_rows for &&ut3_owner..ut_output_data_rows; -create public synonym ut_coverage for &&ut3_owner..ut_coverage; -create public synonym ut_coverage_options for &&ut3_owner..ut_coverage_options; -create public synonym ut_coverage_helper for &&ut3_owner..ut_coverage_helper; create public synonym ut_output_buffer_base for &&ut3_owner..ut_output_buffer_base; create public synonym ut_output_table_buffer for &&ut3_owner..ut_output_table_buffer; create public synonym ut_output_clob_table_buffer for &&ut3_owner..ut_output_clob_table_buffer; -create public synonym ut_file_mappings for &&ut3_owner..ut_file_mappings; -create public synonym ut_file_mapping for &&ut3_owner..ut_file_mapping; -create public synonym ut_file_mapper for &&ut3_owner..ut_file_mapper; -create public synonym ut_key_value_pairs for &&ut3_owner..ut_key_value_pairs; -create public synonym ut_key_value_pair for &&ut3_owner..ut_key_value_pair; -create public synonym ut_sonar_test_reporter for &&ut3_owner..ut_sonar_test_reporter; -create public synonym ut_suite_items_info for &&ut3_owner..ut_suite_items_info; -create public synonym ut_suite_item_info for &&ut3_owner..ut_suite_item_info; -create public synonym ut_realtime_reporter for &&ut3_owner..ut_realtime_reporter; + create public synonym dbmspcc_blocks for &&ut3_owner..dbmspcc_blocks; create public synonym dbmspcc_runs for &&ut3_owner..dbmspcc_runs; create public synonym dbmspcc_units for &&ut3_owner..dbmspcc_units; diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql index 9b0f1287e..c7dc5b06e 100644 --- a/source/create_user_grants.sql +++ b/source/create_user_grants.sql @@ -57,11 +57,16 @@ grant execute on &&ut3_owner..ut_runner to &ut3_user; grant execute on &&ut3_owner..ut_file_mappings to &ut3_user; grant execute on &&ut3_owner..ut_file_mapping to &ut3_user; grant execute on &&ut3_owner..ut_file_mapper to &ut3_user; -grant execute on &&ut3_owner..ut_key_value_pairs to &ut3_user; -grant execute on &&ut3_owner..ut_key_value_pair to &ut3_user; grant execute on &&ut3_owner..ut_suite_items_info to &ut3_user; grant execute on &&ut3_owner..ut_suite_item_info to &ut3_user; +--generic types +grant execute on &&ut3_owner..ut_varchar2_list to &ut3_user; +grant execute on &&ut3_owner..ut_varchar2_rows to &ut3_user; +grant execute on &&ut3_owner..ut_integer_list to &ut3_user; +grant execute on &&ut3_owner..ut_key_value_pairs to &ut3_user; +grant execute on &&ut3_owner..ut_key_value_pair to &ut3_user; + --expectations grant execute on &&ut3_owner..ut_expectation to &ut3_user; grant execute on &&ut3_owner..ut_expectation_compound to &ut3_user; @@ -83,37 +88,29 @@ grant execute on &&ut3_owner..ut_equal to &ut3_user; grant execute on &&ut3_owner..ut_have_count to &ut3_user; grant execute on &&ut3_owner..ut_match to &ut3_user; ---generic types -grant execute on &&ut3_owner..ut_varchar2_list to &ut3_user; -grant execute on &&ut3_owner..ut_varchar2_rows to &ut3_user; -grant execute on &&ut3_owner..ut_integer_list to &ut3_user; - ---reporters -grant execute on &&ut3_owner..ut_debug_reporter to &ut3_user; +--reporters - tests grant execute on &&ut3_owner..ut_teamcity_reporter to &ut3_user; grant execute on &&ut3_owner..ut_xunit_reporter to &ut3_user; grant execute on &&ut3_owner..ut_junit_reporter to &ut3_user; grant execute on &&ut3_owner..ut_tfs_junit_reporter to &ut3_user; grant execute on &&ut3_owner..ut_documentation_reporter to &ut3_user; +grant execute on &&ut3_owner..ut_realtime_reporter to &ut3_user; +grant execute on &&ut3_owner..ut_sonar_test_reporter to &ut3_user; +--reporters - coverage grant execute on &&ut3_owner..ut_coverage_html_reporter to &ut3_user; grant execute on &&ut3_owner..ut_coverage_sonar_reporter to &ut3_user; grant execute on &&ut3_owner..ut_coveralls_reporter to &ut3_user; grant execute on &&ut3_owner..ut_coverage_cobertura_reporter to &ut3_user; -grant execute on &&ut3_owner..ut_realtime_reporter to &ut3_user; -grant execute on &&ut3_owner..ut_sonar_test_reporter to &ut3_user; +--reporters - debug +grant execute on &&ut3_owner..ut_debug_reporter to &ut3_user; ---reporters base +--reporters - base types grant execute on &&ut3_owner..ut_reporters to &ut3_user; grant execute on &&ut3_owner..ut_reporter_base to &ut3_user; grant execute on &&ut3_owner..ut_output_reporter_base to &ut3_user; grant execute on &&ut3_owner..ut_coverage_reporter_base to &ut3_user; grant execute on &&ut3_owner..ut_console_reporter_base to &ut3_user; ---coverage -grant execute on &&ut3_owner..ut_coverage to &ut3_user; -grant execute on &&ut3_owner..ut_coverage_options to &ut3_user; -grant execute on &&ut3_owner..ut_coverage_helper to &ut3_user; - --outputs grant execute on &&ut3_owner..ut_output_buffer_base to &ut3_user; grant execute on &&ut3_owner..ut_output_data_row to &ut3_user; diff --git a/source/create_user_synonyms.sql b/source/create_user_synonyms.sql index b564dc6c4..af4eb8f63 100644 --- a/source/create_user_synonyms.sql +++ b/source/create_user_synonyms.sql @@ -53,10 +53,28 @@ alter session set current_schema = &&ut3_owner; prompt Creating synonyms for UTPLSQL objects in &&ut3_owner schema to user &&ut3_user +--public API +create or replace synonym &ut3_user..ut for &&ut3_owner..ut; +create or replace synonym &ut3_user..ut_runner for &&ut3_owner..ut_runner; +create or replace synonym &ut3_user..ut_file_mappings for &&ut3_owner..ut_file_mappings; +create or replace synonym &ut3_user..ut_file_mapping for &&ut3_owner..ut_file_mapping; +create or replace synonym &ut3_user..ut_file_mapper for &&ut3_owner..ut_file_mapper; +create or replace synonym &ut3_user..ut_suite_items_info for &&ut3_owner..ut_suite_items_info; +create or replace synonym &ut3_user..ut_suite_item_info for &&ut3_owner..ut_suite_item_info; + +--generic types +create or replace synonym &ut3_user..ut_varchar2_list for &&ut3_owner..ut_varchar2_list; +create or replace synonym &ut3_user..ut_varchar2_rows for &&ut3_owner..ut_varchar2_rows; +create or replace synonym &ut3_user..ut_integer_list for &&ut3_owner..ut_integer_list; +create or replace synonym &ut3_user..ut_key_value_pairs for &&ut3_owner..ut_key_value_pairs; +create or replace synonym &ut3_user..ut_key_value_pair for &&ut3_owner..ut_key_value_pair; + +--expectations create or replace synonym &ut3_user..ut_expectation for &&ut3_owner..ut_expectation; create or replace synonym &ut3_user..ut_expectation_compound for &&ut3_owner..ut_expectation_compound; create or replace synonym &ut3_user..ut_expectation_json for &&ut3_owner..ut_expectation_json; +--matchers create or replace synonym &ut3_user..be_between for &&ut3_owner..be_between; create or replace synonym &ut3_user..be_empty for &&ut3_owner..be_empty; create or replace synonym &ut3_user..be_false for &&ut3_owner..be_false; @@ -73,40 +91,34 @@ create or replace synonym &ut3_user..equal for &&ut3_owner..equal; create or replace synonym &ut3_user..have_count for &&ut3_owner..have_count; create or replace synonym &ut3_user..match for &&ut3_owner..match; -create or replace synonym &ut3_user..ut for &&ut3_owner..ut; -create or replace synonym &ut3_user..ut_runner for &&ut3_owner..ut_runner; -create or replace synonym &ut3_user..ut_debug_reporter for &&ut3_owner..ut_debug_reporter; + +--reporters - test results create or replace synonym &ut3_user..ut_teamcity_reporter for &&ut3_owner..ut_teamcity_reporter; create or replace synonym &ut3_user..ut_xunit_reporter for &&ut3_owner..ut_xunit_reporter; create or replace synonym &ut3_user..ut_junit_reporter for &&ut3_owner..ut_junit_reporter; create or replace synonym &ut3_user..ut_tfs_junit_reporter for &&ut3_owner..ut_tfs_junit_reporter; create or replace synonym &ut3_user..ut_documentation_reporter for &&ut3_owner..ut_documentation_reporter; +create or replace synonym &ut3_user..ut_sonar_test_reporter for &&ut3_owner..ut_sonar_test_reporter; +create or replace synonym &ut3_user..ut_realtime_reporter for &&ut3_owner..ut_realtime_reporter; +--reporters - coverage create or replace synonym &ut3_user..ut_coverage_html_reporter for &&ut3_owner..ut_coverage_html_reporter; create or replace synonym &ut3_user..ut_coverage_sonar_reporter for &&ut3_owner..ut_coverage_sonar_reporter; create or replace synonym &ut3_user..ut_coveralls_reporter for &&ut3_owner..ut_coveralls_reporter; create or replace synonym &ut3_user..ut_coverage_cobertura_reporter for &&ut3_owner..ut_coverage_cobertura_reporter; +--reporters - debug +create or replace synonym &ut3_user..ut_debug_reporter for &&ut3_owner..ut_debug_reporter; +--reporters - base types create or replace synonym &ut3_user..ut_reporters for &&ut3_owner..ut_reporters; -create or replace synonym &ut3_user..ut_varchar2_list for &&ut3_owner..ut_varchar2_list; -create or replace synonym &ut3_user..ut_varchar2_rows for &&ut3_owner..ut_varchar2_rows; -create or replace synonym &ut3_user..ut_integer_list for &&ut3_owner..ut_integer_list; create or replace synonym &ut3_user..ut_reporter_base for &&ut3_owner..ut_reporter_base; create or replace synonym &ut3_user..ut_output_reporter_base for &&ut3_owner..ut_output_reporter_base; + +--other synonyms create or replace synonym &ut3_user..ut_output_data_row for &&ut3_owner..ut_output_data_row; create or replace synonym &ut3_user..ut_output_data_rows for &&ut3_owner..ut_output_data_rows; -create or replace synonym &ut3_user..ut_coverage for &&ut3_owner..ut_coverage; -create or replace synonym &ut3_user..ut_coverage_options for &&ut3_owner..ut_coverage_options; -create or replace synonym &ut3_user..ut_coverage_helper for &&ut3_owner..ut_coverage_helper; create or replace synonym &ut3_user..ut_output_buffer_base for &&ut3_owner..ut_output_buffer_base; create or replace synonym &ut3_user..ut_output_table_buffer for &&ut3_owner..ut_output_table_buffer; create or replace synonym &ut3_user..ut_output_clob_table_buffer for &&ut3_owner..ut_output_clob_table_buffer; -create or replace synonym &ut3_user..ut_file_mappings for &&ut3_owner..ut_file_mappings; -create or replace synonym &ut3_user..ut_file_mapping for &&ut3_owner..ut_file_mapping; -create or replace synonym &ut3_user..ut_file_mapper for &&ut3_owner..ut_file_mapper; -create or replace synonym &ut3_user..ut_key_value_pairs for &&ut3_owner..ut_key_value_pairs; -create or replace synonym &ut3_user..ut_key_value_pair for &&ut3_owner..ut_key_value_pair; -create or replace synonym &ut3_user..ut_compound_data_tmp for &&ut3_owner..ut_cursor_data; -create or replace synonym &ut3_user..ut_sonar_test_reporter for &&ut3_owner..ut_sonar_test_reporter; -create or replace synonym &ut3_user..ut_realtime_reporter for &&ut3_owner..ut_realtime_reporter; + create or replace synonym &ut3_user..dbmspcc_blocks for &&ut3_owner..dbmspcc_blocks; create or replace synonym &ut3_user..dbmspcc_runs for &&ut3_owner..dbmspcc_runs; create or replace synonym &ut3_user..dbmspcc_units for &&ut3_owner..dbmspcc_units; diff --git a/test/ut3_tester/core.pkb b/test/ut3_tester/core.pkb index 505388a8f..41b6b10d1 100644 --- a/test/ut3_tester/core.pkb +++ b/test/ut3_tester/core.pkb @@ -2,7 +2,7 @@ create or replace package body core is procedure global_setup is begin - ut3.ut_coverage.set_develop_mode(true); + ut3_tester_helper.coverage_helper.set_develop_mode(); --improve performance of test execution by disabling all compiler optimizations ut3_tester_helper.main_helper.execute_autonomous('ALTER SESSION SET PLSQL_OPTIMIZE_LEVEL=0'); end; diff --git a/test/ut3_tester_helper/coverage_helper.pkb b/test/ut3_tester_helper/coverage_helper.pkb index feac8000d..74a33da54 100644 --- a/test/ut3_tester_helper/coverage_helper.pkb +++ b/test/ut3_tester_helper/coverage_helper.pkb @@ -1,6 +1,10 @@ create or replace package body coverage_helper is - - function get_mock_run_id return integer is + + g_run_ids ut3.ut_coverage.tt_coverage_id_arr; + g_profiler_run_id integer; + g_block_run_id integer; + + function get_mock_proftab_run_id return integer is v_result integer; begin select nvl(min(runid),0) - 1 into v_result @@ -12,23 +16,53 @@ create or replace package body coverage_helper is v_result integer; begin select nvl(min(run_id),0) - 1 into v_result - from dbmspcc_runs; + from ut3.dbmspcc_runs; return v_result; end; - - procedure mock_coverage_data(a_run_id integer,a_user in varchar2) is + + procedure setup_mock_coverage_id is + begin + g_profiler_run_id := get_mock_proftab_run_id(); + ut3.ut_coverage.mock_coverage_id(g_profiler_run_id, ut3.ut_coverage.gc_proftab_coverage); + end; + + procedure setup_mock_coverage_ids(a_profiler_run_id integer, a_block_run_id integer) is + l_coverage_ids ut3.ut_coverage.tt_coverage_id_arr; + begin + l_coverage_ids(ut3.ut_coverage.gc_proftab_coverage) := a_profiler_run_id; + l_coverage_ids(ut3.ut_coverage.gc_block_coverage) := a_block_run_id; + ut3.ut_coverage.mock_coverage_id(l_coverage_ids); + end; + + procedure setup_dummy_coverage is + pragma autonomous_transaction; + begin + create_dummy_12_2_cov_pck(); + create_dummy_12_2_cov_test(); + grant_exec_on_12_2_cov(); + + g_profiler_run_id := get_mock_proftab_run_id(); + g_block_run_id := get_mock_block_run_id(); + setup_mock_coverage_ids(g_profiler_run_id, g_block_run_id); + + mock_block_coverage_data(g_block_run_id, user); + mock_profiler_coverage_data(g_profiler_run_id, user); + commit; + end; + + procedure mock_coverage_data(a_user in varchar2) is c_unit_id constant integer := 1; begin insert into ut3.plsql_profiler_runs ( runid, run_owner, run_date, run_comment) - values(a_run_id, a_user, sysdate, 'unit testing utPLSQL'); + values(g_profiler_run_id, a_user, sysdate, 'unit testing utPLSQL'); insert into ut3.plsql_profiler_units ( runid, unit_number, unit_type, unit_owner, unit_name) - values(a_run_id, c_unit_id, 'PACKAGE BODY', 'UT3', 'DUMMY_COVERAGE'); + values(g_profiler_run_id, c_unit_id, 'PACKAGE BODY', 'UT3', 'DUMMY_COVERAGE'); insert into ut3.plsql_profiler_data ( runid, unit_number, line#, total_occur, total_time) - select a_run_id, c_unit_id, 4, 1, 1 from dual union all - select a_run_id, c_unit_id, 5, 0, 0 from dual union all - select a_run_id, c_unit_id, 7, 1, 1 from dual; + select g_profiler_run_id, c_unit_id, 4, 1, 1 from dual union all + select g_profiler_run_id, c_unit_id, 5, 0, 0 from dual union all + select g_profiler_run_id, c_unit_id, 7, 1, 1 from dual; end; procedure cleanup_dummy_coverage(a_run_id in integer) is @@ -39,7 +73,27 @@ create or replace package body coverage_helper is delete from ut3.plsql_profiler_runs where runid = a_run_id; commit; end; - + + procedure cleanup_dummy_coverage(a_block_id in integer, a_prof_id in integer) is + pragma autonomous_transaction; + begin + begin execute immediate q'[drop package ut3.test_block_dummy_coverage]'; exception when others then null; end; + begin execute immediate q'[drop package ut3.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long]'; exception when others then null; end; + delete from dbmspcc_blocks where run_id = a_block_id; + delete from dbmspcc_units where run_id = a_block_id; + delete from dbmspcc_runs where run_id = a_block_id; + cleanup_dummy_coverage(a_prof_id); + commit; + end; + + procedure cleanup_dummy_coverage is + begin + cleanup_dummy_coverage( + g_block_run_id, + g_profiler_run_id + ); + end; + procedure create_dummy_coverage_package is pragma autonomous_transaction; begin @@ -151,6 +205,8 @@ create or replace package body coverage_helper is end; end;]'; + execute immediate 'begin UT3.DUMMY_COVERAGE_1.grant_myself(); end;'; + execute immediate 'begin UT3.TEST_DUMMY_COVERAGE_1.grant_myself(); end;'; end; procedure drop_dummy_coverage_test_1 is @@ -160,13 +216,6 @@ create or replace package body coverage_helper is execute immediate q'[drop package UT3.TEST_DUMMY_COVERAGE_1]'; end; - procedure grant_exec_on_cov_1 is - pragma autonomous_transaction; - begin - execute immediate 'begin UT3.DUMMY_COVERAGE_1.grant_myself(); end;'; - execute immediate 'begin UT3.TEST_DUMMY_COVERAGE_1.grant_myself(); end;'; - end; - --12.2 Setup procedure create_dummy_12_2_cov_pck is pragma autonomous_transaction; @@ -253,23 +302,17 @@ create or replace package body coverage_helper is select a_run_id, c_unit_id, 7, 1, 1 from dual; end; - procedure cleanup_dummy_coverage(a_block_id in integer, a_prof_id in integer) is - pragma autonomous_transaction; - begin - begin execute immediate q'[drop package ut3.test_block_dummy_coverage]'; exception when others then null; end; - begin execute immediate q'[drop package ut3.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long]'; exception when others then null; end; - delete from dbmspcc_blocks where run_id = a_block_id; - delete from dbmspcc_units where run_id = a_block_id; - delete from dbmspcc_runs where run_id = a_block_id; - cleanup_dummy_coverage(a_prof_id); - commit; - end; - procedure grant_exec_on_12_2_cov is pragma autonomous_transaction; begin execute immediate 'begin UT3.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG.grant_myself(); end;'; execute immediate 'begin UT3.TEST_BLOCK_DUMMY_COVERAGE.grant_myself(); end;'; end; + + procedure set_develop_mode is + begin + ut3.ut_coverage.set_develop_mode(true); + end; + end; / diff --git a/test/ut3_tester_helper/coverage_helper.pks b/test/ut3_tester_helper/coverage_helper.pks index 73ff7b448..9e152707b 100644 --- a/test/ut3_tester_helper/coverage_helper.pks +++ b/test/ut3_tester_helper/coverage_helper.pks @@ -1,30 +1,34 @@ create or replace package coverage_helper is - g_run_id integer; - type prof_runs_tab is table of ut3.plsql_profiler_runs%rowtype; - function get_mock_run_id return integer; - function get_mock_block_run_id return integer; - procedure cleanup_dummy_coverage(a_run_id in integer); - procedure mock_coverage_data(a_run_id integer,a_user in varchar2); + function get_mock_proftab_run_id return integer; + + procedure setup_mock_coverage_id; + + procedure mock_coverage_data(a_user in varchar2); + + procedure cleanup_dummy_coverage; + + procedure setup_dummy_coverage; - --Profiler coveage + --Profiler coverage procedure create_dummy_coverage_package; procedure create_dummy_coverage_test; procedure grant_exec_on_cov; procedure mock_profiler_coverage_data(a_run_id integer,a_user in varchar2); procedure drop_dummy_coverage_pkg; + procedure create_dummy_coverage_test_1; procedure drop_dummy_coverage_test_1; - procedure grant_exec_on_cov_1; - + --Block coverage procedure create_dummy_12_2_cov_pck; procedure create_dummy_12_2_cov_test; procedure mock_block_coverage_data(a_run_id integer,a_user in varchar2); - procedure cleanup_dummy_coverage(a_block_id in integer, a_prof_id in integer); procedure grant_exec_on_12_2_cov; + + procedure set_develop_mode; end; / diff --git a/test/ut3_user/reporters/test_coverage.pkb b/test/ut3_user/reporters/test_coverage.pkb index 6b094f2ae..738ce67e4 100644 --- a/test/ut3_user/reporters/test_coverage.pkb +++ b/test/ut3_user/reporters/test_coverage.pkb @@ -1,11 +1,5 @@ create or replace package body test_coverage is - function get_mock_run_id return integer is - v_result integer; - begin - return ut3_tester_helper.coverage_helper.get_mock_run_id(); - end; - procedure create_dummy_coverage_pkg is begin ut3_tester_helper.coverage_helper.create_dummy_coverage_package(); @@ -16,21 +10,10 @@ create or replace package body test_coverage is procedure setup_dummy_coverage is pragma autonomous_transaction; begin - g_run_id := get_mock_run_id(); - ut3.ut_coverage.mock_coverage_id(g_run_id, ut3.ut_coverage.gc_proftab_coverage); - ut3_tester_helper.coverage_helper.mock_coverage_data(g_run_id,user); + ut3_tester_helper.coverage_helper.setup_mock_coverage_id(); + ut3_tester_helper.coverage_helper.mock_coverage_data(user); commit; end; - procedure drop_dummy_coverage_pkg is - begin - ut3_tester_helper.coverage_helper.drop_dummy_coverage_pkg(); - end; - - procedure cleanup_dummy_coverage is - begin - ut3_tester_helper.coverage_helper.cleanup_dummy_coverage(g_run_id); - end; - end; / diff --git a/test/ut3_user/reporters/test_coverage.pks b/test/ut3_user/reporters/test_coverage.pks index d56597d11..4c19e125a 100644 --- a/test/ut3_user/reporters/test_coverage.pks +++ b/test/ut3_user/reporters/test_coverage.pks @@ -3,18 +3,15 @@ create or replace package test_coverage is --%suite --%suitepath(utplsql.test_user.reporters) - g_run_id integer; - --%beforeall procedure create_dummy_coverage_pkg; --%beforeall procedure setup_dummy_coverage; - --%afterall - procedure drop_dummy_coverage_pkg; - --%afterall - procedure cleanup_dummy_coverage; + --%afterall(ut3_tester_helper.coverage_helper.drop_dummy_coverage_pkg) + + --%afterall(ut3_tester_helper.coverage_helper.cleanup_dummy_coverage) end; / diff --git a/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb index b3c0439b4..183492eb7 100644 --- a/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb +++ b/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb @@ -79,7 +79,7 @@ create or replace package body test_cov_cobertura_reporter is ]'; - test_coverage.cleanup_dummy_coverage; + ut3_tester_helper.coverage_helper.cleanup_dummy_coverage(); --Act select * bulk collect into l_results diff --git a/test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb index 0be0e8ce3..2d36d45cb 100644 --- a/test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb +++ b/test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb @@ -66,7 +66,7 @@ null, ]} ]'; - test_coverage.cleanup_dummy_coverage; + ut3_tester_helper.coverage_helper.cleanup_dummy_coverage(); --Act select * diff --git a/test/ut3_user/reporters/test_extended_coverage.pkb b/test/ut3_user/reporters/test_extended_coverage.pkb index bb8bd27a6..33d42d9ef 100644 --- a/test/ut3_user/reporters/test_extended_coverage.pkb +++ b/test/ut3_user/reporters/test_extended_coverage.pkb @@ -1,37 +1,5 @@ create or replace package body test_extended_coverage is - g_run_id ut3.ut_coverage.tt_coverage_id_arr; - - function get_mock_block_run_id return integer is - begin - return ut3_tester_helper.coverage_helper.get_mock_block_run_id(); - end; - - function get_mock_proftab_run_id return integer is - begin - return ut3_tester_helper.coverage_helper.get_mock_run_id(); - end; - - procedure setup_dummy_coverage is - pragma autonomous_transaction; - begin - ut3_tester_helper.coverage_helper.create_dummy_12_2_cov_pck(); - ut3_tester_helper.coverage_helper.create_dummy_12_2_cov_test(); - ut3_tester_helper.coverage_helper.grant_exec_on_12_2_cov(); - g_run_id(ut3.ut_coverage.gc_block_coverage) := get_mock_block_run_id(); - g_run_id(ut3.ut_coverage.gc_proftab_coverage) := get_mock_proftab_run_id(); - ut3.ut_coverage.mock_coverage_id(g_run_id); - ut3_tester_helper.coverage_helper.mock_block_coverage_data(g_run_id(ut3.ut_coverage.gc_block_coverage),user); - ut3_tester_helper.coverage_helper.mock_profiler_coverage_data(g_run_id(ut3.ut_coverage.gc_proftab_coverage),user); - commit; - end; - - procedure cleanup_dummy_coverage is - begin - ut3_tester_helper.coverage_helper.cleanup_dummy_coverage(g_run_id(ut3.ut_coverage.gc_block_coverage) - ,g_run_id(ut3.ut_coverage.gc_proftab_coverage)); - end; - procedure coverage_for_object is l_expected clob; l_actual clob; diff --git a/test/ut3_user/reporters/test_extended_coverage.pks b/test/ut3_user/reporters/test_extended_coverage.pks index aaef20877..a8460aa3a 100644 --- a/test/ut3_user/reporters/test_extended_coverage.pks +++ b/test/ut3_user/reporters/test_extended_coverage.pks @@ -3,11 +3,9 @@ create or replace package test_extended_coverage is --%suite --%suitepath(utplsql.test_user.reporters) - --%beforeall - procedure setup_dummy_coverage; + --%beforeall(ut3_tester_helper.coverage_helper.setup_dummy_coverage) - --%afterall - procedure cleanup_dummy_coverage; + --%afterall(ut3_tester_helper.coverage_helper.cleanup_dummy_coverage) --%test(Coverage is gathered for specified object - extended coverage type) procedure coverage_for_object; diff --git a/test/ut3_user/reporters/test_proftab_coverage.pkb b/test/ut3_user/reporters/test_proftab_coverage.pkb index c5ad8c112..74a33772e 100644 --- a/test/ut3_user/reporters/test_proftab_coverage.pkb +++ b/test/ut3_user/reporters/test_proftab_coverage.pkb @@ -1,16 +1,5 @@ create or replace package body test_proftab_coverage is - procedure create_dummy_coverage_test_1 is - begin - ut3_tester_helper.coverage_helper.create_dummy_coverage_test_1(); - ut3_tester_helper.coverage_helper.grant_exec_on_cov_1(); - end; - - procedure drop_dummy_coverage_test_1 is - begin - ut3_tester_helper.coverage_helper.drop_dummy_coverage_test_1(); - end; - procedure coverage_for_object is l_expected clob; l_actual clob; @@ -117,9 +106,9 @@ create or replace package body test_proftab_coverage is a_include_objects => ut3.ut_varchar2_list( 'ut3.dummy_coverage' ) ) ); - ut3_tester_helper.coverage_helper.cleanup_dummy_coverage(test_coverage.g_run_id); + ut3_tester_helper.coverage_helper.cleanup_dummy_coverage(); ut3_tester_helper.coverage_helper.drop_dummy_coverage_pkg(); - create_dummy_coverage_test_1; + ut3_tester_helper.coverage_helper.create_dummy_coverage_test_1(); --Act select * diff --git a/test/ut3_user/reporters/test_proftab_coverage.pks b/test/ut3_user/reporters/test_proftab_coverage.pks index 1bb5c10cd..6f2548158 100644 --- a/test/ut3_user/reporters/test_proftab_coverage.pks +++ b/test/ut3_user/reporters/test_proftab_coverage.pks @@ -18,10 +18,8 @@ create or replace package test_proftab_coverage is --%test(Coverage data is not cached between runs - issue #562 ) --%aftertest(ut3$user#.test_coverage.create_dummy_coverage_pkg) --%aftertest(ut3$user#.test_coverage.setup_dummy_coverage) - --%aftertest(drop_dummy_coverage_test_1) + --%aftertest(ut3_tester_helper.coverage_helper.drop_dummy_coverage_test_1) procedure coverage_tmp_data_refresh; - procedure drop_dummy_coverage_test_1; - end; / diff --git a/test/ut3_user/test_user.pkb b/test/ut3_user/test_user.pkb index ca84a1c69..9fec79d96 100644 --- a/test/ut3_user/test_user.pkb +++ b/test/ut3_user/test_user.pkb @@ -2,7 +2,7 @@ create or replace package body test_user is procedure global_setup is begin - ut3.ut_coverage.set_develop_mode(true); + ut3_tester_helper.coverage_helper.set_develop_mode(); --improve performance of test execution by disabling all compiler optimizations ut3_tester_helper.main_helper.execute_autonomous('ALTER SESSION SET PLSQL_OPTIMIZE_LEVEL=0'); end; From dd9afb00278dd3c6c1e7669664e00e724701566a Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 24 Jun 2019 00:07:21 +0100 Subject: [PATCH 0532/1096] Removed grant execute on: - ut_output_reporter_base - ut_coverage_reporter_base - ut_console_reporter_base - ut_output_data_row - ut_output_data_rows - ut_output_table_buffer - ut_output_clob_table_buffer --- .../create_synonyms_and_grants_for_public.sql | 18 ++---------------- source/create_user_grants.sql | 9 +-------- source/create_user_synonyms.sql | 9 +-------- test/ut3_user/reporters.pkb | 4 ++-- test/ut3_user/reporters.pks | 4 ++-- 5 files changed, 8 insertions(+), 36 deletions(-) diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index 63d772f25..370aa36e4 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -39,6 +39,7 @@ grant execute on &&ut3_owner..ut_file_mapping to public; grant execute on &&ut3_owner..ut_file_mapper to public; grant execute on &&ut3_owner..ut_suite_items_info to public; grant execute on &&ut3_owner..ut_suite_item_info to public; +grant execute on &&ut3_owner..ut_run_info to public; --generic types grant execute on &&ut3_owner..ut_varchar2_list to public; @@ -88,16 +89,9 @@ grant execute on &&ut3_owner..ut_debug_reporter to public; --reporters - base types grant execute on &&ut3_owner..ut_reporters to public; grant execute on &&ut3_owner..ut_reporter_base to public; -grant execute on &&ut3_owner..ut_output_reporter_base to public; -grant execute on &&ut3_owner..ut_coverage_reporter_base to public; -grant execute on &&ut3_owner..ut_console_reporter_base to public; --outputs -grant execute on &&ut3_owner..ut_output_data_row to public; -grant execute on &&ut3_owner..ut_output_data_rows to public; grant execute on &&ut3_owner..ut_output_buffer_base to public; -grant execute on &&ut3_owner..ut_output_table_buffer to public; -grant execute on &&ut3_owner..ut_output_clob_table_buffer to public; --user temp tables grant select, insert, update, delete on &&ut3_owner..ut_compound_data_tmp to public; @@ -119,7 +113,6 @@ grant select, insert, delete, update on &&ut3_owner..dbmspcc_runs to public; grant select, insert, delete, update on &&ut3_owner..dbmspcc_units to public; grant execute on &&ut3_owner..ut_matcher_options to public; grant execute on &&ut3_owner..ut_matcher_options_items to public; -grant execute on &&ut3_owner..ut_run_info to public; prompt Creating synonyms for UTPLSQL objects in &&ut3_owner schema to PUBLIC @@ -132,6 +125,7 @@ create public synonym ut_file_mapping for &&ut3_owner..ut_file_mapping; create public synonym ut_file_mapper for &&ut3_owner..ut_file_mapper; create public synonym ut_suite_items_info for &&ut3_owner..ut_suite_items_info; create public synonym ut_suite_item_info for &&ut3_owner..ut_suite_item_info; +create public synonym ut_run_info for &&ut3_owner..ut_run_info; --generic types create public synonym ut_varchar2_list for &&ut3_owner..ut_varchar2_list; @@ -181,16 +175,8 @@ create public synonym ut_debug_reporter for &&ut3_owner..ut_debug_reporter; --reporters - base types create public synonym ut_reporters for &&ut3_owner..ut_reporters; create public synonym ut_reporter_base for &&ut3_owner..ut_reporter_base; -create public synonym ut_output_reporter_base for &&ut3_owner..ut_output_reporter_base; --other synonyms -create public synonym ut_output_data_row for &&ut3_owner..ut_output_data_row; -create public synonym ut_output_data_rows for &&ut3_owner..ut_output_data_rows; -create public synonym ut_output_buffer_base for &&ut3_owner..ut_output_buffer_base; -create public synonym ut_output_table_buffer for &&ut3_owner..ut_output_table_buffer; -create public synonym ut_output_clob_table_buffer for &&ut3_owner..ut_output_clob_table_buffer; - create public synonym dbmspcc_blocks for &&ut3_owner..dbmspcc_blocks; create public synonym dbmspcc_runs for &&ut3_owner..dbmspcc_runs; create public synonym dbmspcc_units for &&ut3_owner..dbmspcc_units; -create public synonym ut_run_info for &&ut3_owner..ut_run_info; diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql index c7dc5b06e..34b15d254 100644 --- a/source/create_user_grants.sql +++ b/source/create_user_grants.sql @@ -59,6 +59,7 @@ grant execute on &&ut3_owner..ut_file_mapping to &ut3_user; grant execute on &&ut3_owner..ut_file_mapper to &ut3_user; grant execute on &&ut3_owner..ut_suite_items_info to &ut3_user; grant execute on &&ut3_owner..ut_suite_item_info to &ut3_user; +grant execute on &&ut3_owner..ut_run_info to &ut3_user; --generic types grant execute on &&ut3_owner..ut_varchar2_list to &ut3_user; @@ -107,16 +108,9 @@ grant execute on &&ut3_owner..ut_debug_reporter to &ut3_user; --reporters - base types grant execute on &&ut3_owner..ut_reporters to &ut3_user; grant execute on &&ut3_owner..ut_reporter_base to &ut3_user; -grant execute on &&ut3_owner..ut_output_reporter_base to &ut3_user; -grant execute on &&ut3_owner..ut_coverage_reporter_base to &ut3_user; -grant execute on &&ut3_owner..ut_console_reporter_base to &ut3_user; --outputs grant execute on &&ut3_owner..ut_output_buffer_base to &ut3_user; -grant execute on &&ut3_owner..ut_output_data_row to &ut3_user; -grant execute on &&ut3_owner..ut_output_data_rows to &ut3_user; -grant execute on &&ut3_owner..ut_output_table_buffer to &ut3_user; -grant execute on &&ut3_owner..ut_output_clob_table_buffer to &ut3_user; --user temp tables grant select, insert, update, delete on &&ut3_owner..ut_compound_data_tmp to &ut3_user; @@ -138,4 +132,3 @@ grant select, insert, delete, update on &&ut3_owner..dbmspcc_runs to &ut3_user; grant select, insert, delete, update on &&ut3_owner..dbmspcc_units to &ut3_user; grant execute on &&ut3_owner..ut_matcher_options to &ut3_user; grant execute on &&ut3_owner..ut_matcher_options_items to &ut3_user; -grant execute on &&ut3_owner..ut_run_info to &ut3_user; diff --git a/source/create_user_synonyms.sql b/source/create_user_synonyms.sql index af4eb8f63..469b9419a 100644 --- a/source/create_user_synonyms.sql +++ b/source/create_user_synonyms.sql @@ -61,6 +61,7 @@ create or replace synonym &ut3_user..ut_file_mapping for &&ut3_owner..ut_file_ma create or replace synonym &ut3_user..ut_file_mapper for &&ut3_owner..ut_file_mapper; create or replace synonym &ut3_user..ut_suite_items_info for &&ut3_owner..ut_suite_items_info; create or replace synonym &ut3_user..ut_suite_item_info for &&ut3_owner..ut_suite_item_info; +create or replace synonym &ut3_user..ut_run_info for &&ut3_owner..ut_run_info; --generic types create or replace synonym &ut3_user..ut_varchar2_list for &&ut3_owner..ut_varchar2_list; @@ -110,16 +111,8 @@ create or replace synonym &ut3_user..ut_debug_reporter for &&ut3_owner..ut_debug --reporters - base types create or replace synonym &ut3_user..ut_reporters for &&ut3_owner..ut_reporters; create or replace synonym &ut3_user..ut_reporter_base for &&ut3_owner..ut_reporter_base; -create or replace synonym &ut3_user..ut_output_reporter_base for &&ut3_owner..ut_output_reporter_base; --other synonyms -create or replace synonym &ut3_user..ut_output_data_row for &&ut3_owner..ut_output_data_row; -create or replace synonym &ut3_user..ut_output_data_rows for &&ut3_owner..ut_output_data_rows; -create or replace synonym &ut3_user..ut_output_buffer_base for &&ut3_owner..ut_output_buffer_base; -create or replace synonym &ut3_user..ut_output_table_buffer for &&ut3_owner..ut_output_table_buffer; -create or replace synonym &ut3_user..ut_output_clob_table_buffer for &&ut3_owner..ut_output_clob_table_buffer; - create or replace synonym &ut3_user..dbmspcc_blocks for &&ut3_owner..dbmspcc_blocks; create or replace synonym &ut3_user..dbmspcc_runs for &&ut3_owner..dbmspcc_runs; create or replace synonym &ut3_user..dbmspcc_units for &&ut3_owner..dbmspcc_units; -create or replace synonym &ut3_user..ut_run_info for &&ut3_owner..ut_run_info; diff --git a/test/ut3_user/reporters.pkb b/test/ut3_user/reporters.pkb index d6a104242..6d6d573aa 100644 --- a/test/ut3_user/reporters.pkb +++ b/test/ut3_user/reporters.pkb @@ -148,7 +148,7 @@ end;]'; end; procedure check_xml_encoding_included( - a_reporter ut3.ut_output_reporter_base, + a_reporter ut3.ut_reporter_base, a_client_character_set varchar2 ) is l_results ut3.ut_varchar2_list; @@ -164,7 +164,7 @@ end;]'; end; procedure check_xml_failure_escaped( - a_reporter ut3.ut_output_reporter_base + a_reporter ut3.ut_reporter_base ) is l_results ut3.ut_varchar2_list; l_actual clob; diff --git a/test/ut3_user/reporters.pks b/test/ut3_user/reporters.pks index 54800fa4a..d1ed8635f 100644 --- a/test/ut3_user/reporters.pks +++ b/test/ut3_user/reporters.pks @@ -10,12 +10,12 @@ create or replace package reporters is procedure reporters_cleanup; procedure check_xml_encoding_included( - a_reporter ut3.ut_output_reporter_base, + a_reporter ut3.ut_reporter_base, a_client_character_set varchar2 ); procedure check_xml_failure_escaped( - a_reporter ut3.ut_output_reporter_base + a_reporter ut3.ut_reporter_base ); end reporters; From 7fc8d2cbec12dffda88698599cb706f15f3ebfe2 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 24 Jun 2019 00:18:22 +0100 Subject: [PATCH 0533/1096] Recovered grant execute on ut_output_reporter_base --- source/create_synonyms_and_grants_for_public.sql | 2 ++ source/create_user_grants.sql | 1 + source/create_user_synonyms.sql | 1 + 3 files changed, 4 insertions(+) diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index 370aa36e4..e91b45e0e 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -89,6 +89,7 @@ grant execute on &&ut3_owner..ut_debug_reporter to public; --reporters - base types grant execute on &&ut3_owner..ut_reporters to public; grant execute on &&ut3_owner..ut_reporter_base to public; +grant execute on &&ut3_owner..ut_output_reporter_base to public; --outputs grant execute on &&ut3_owner..ut_output_buffer_base to public; @@ -175,6 +176,7 @@ create public synonym ut_debug_reporter for &&ut3_owner..ut_debug_reporter; --reporters - base types create public synonym ut_reporters for &&ut3_owner..ut_reporters; create public synonym ut_reporter_base for &&ut3_owner..ut_reporter_base; +create public synonym ut_output_reporter_base for &&ut3_owner..ut_output_reporter_base; --other synonyms create public synonym dbmspcc_blocks for &&ut3_owner..dbmspcc_blocks; diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql index 34b15d254..29b6a45bc 100644 --- a/source/create_user_grants.sql +++ b/source/create_user_grants.sql @@ -108,6 +108,7 @@ grant execute on &&ut3_owner..ut_debug_reporter to &ut3_user; --reporters - base types grant execute on &&ut3_owner..ut_reporters to &ut3_user; grant execute on &&ut3_owner..ut_reporter_base to &ut3_user; +grant execute on &&ut3_owner..ut_output_reporter_base to &ut3_user; --outputs grant execute on &&ut3_owner..ut_output_buffer_base to &ut3_user; diff --git a/source/create_user_synonyms.sql b/source/create_user_synonyms.sql index 469b9419a..d05b42fbf 100644 --- a/source/create_user_synonyms.sql +++ b/source/create_user_synonyms.sql @@ -111,6 +111,7 @@ create or replace synonym &ut3_user..ut_debug_reporter for &&ut3_owner..ut_debug --reporters - base types create or replace synonym &ut3_user..ut_reporters for &&ut3_owner..ut_reporters; create or replace synonym &ut3_user..ut_reporter_base for &&ut3_owner..ut_reporter_base; +create or replace synonym &ut3_user..ut_output_reporter_base for &&ut3_owner..ut_output_reporter_base; --other synonyms create or replace synonym &ut3_user..dbmspcc_blocks for &&ut3_owner..dbmspcc_blocks; From 744681980672ceda4b085bf62b12c0d00d656d5b Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 24 Jun 2019 19:38:55 +0000 Subject: [PATCH 0534/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 10fa75c28..2ee57e734 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 592cc836f..26a5219c5 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 7b116d937..0e57dc100 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 6eb01aa5d..01e774cd8 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 24c30617d..dec4f9d56 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 2e19cd758..adec48834 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 6f9875ffd..bcf2473e2 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 5a2990b99..57e874620 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 5a6f321c4..8b7912c73 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 9fb0f2361..af7c6db8b 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 9f6aaf5b8..bc29686c1 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 3013c21a0..323c303b3 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 7f15c5696..b8d394162 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 96ba700e2..d6dc62a5b 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 12cb115f7..ef4c9d680 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 42192568a..e7c405fdd 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index b9d61e19c..999372318 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3111--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index d6a280625..424debf30 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -776,7 +776,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.8.3111-develop + * secion v3.1.8.3126-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 6d740d524..26e0e0475 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.8.3111-develop'; + gc_version constant varchar2(50) := 'v3.1.8.3126-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From ae3326f1f878d353cfbff3a4122461fb7cb2db58 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 25 Jun 2019 00:37:30 +0100 Subject: [PATCH 0535/1096] Unified grants & synonyms scripts to avoid any disconnect between PUBLIC and private access to the framework. Resolves: #957 --- source/create_grants.sql | 138 +++++++++++++++ source/create_synonyms.sql | 133 ++++++++++++++ .../create_synonyms_and_grants_for_public.sql | 165 +----------------- source/create_user_grants.sql | 117 +------------ source/create_user_synonyms.sql | 101 +---------- 5 files changed, 275 insertions(+), 379 deletions(-) create mode 100644 source/create_grants.sql create mode 100644 source/create_synonyms.sql diff --git a/source/create_grants.sql b/source/create_grants.sql new file mode 100644 index 000000000..57aa61c1c --- /dev/null +++ b/source/create_grants.sql @@ -0,0 +1,138 @@ +/* + utPLSQL - Version 3 + Copyright 2016 - 2019 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +Create all necessary grant for the user who owns test packages and want to execute utPLSQL framework +*/ + +@@define_ut3_owner_param.sql + +column 2 new_value 2 noprint +select null as "2" from dual where 1=0; +spool params.sql.tmp +select + case + when '&&2' is null then q'[ACCEPT ut3_user CHAR DEFAULT 'PUBLIC' PROMPT 'Provide schema which should be granted access to the utPLSQL v3 framework (PUBLIC): ']' + else 'define ut3_user=&&2' + end +from dual; + +spool off +set termout on +@params.sql.tmp +set termout off +/* cleanup temporary sql files */ +--try running on windows +$ del params.sql.tmp +--try running on linux/unix +! rm params.sql.tmp +set termout on + +set echo off +set feedback on +set heading off +set verify off + +prompt Granting privileges on UTPLSQL objects in &&ut3_owner schema to user &&ut3_user + +whenever sqlerror exit failure rollback +whenever oserror exit failure rollback + +alter session set current_schema = &&ut3_owner; + +--public API +grant execute on &&ut3_owner..ut to &ut3_user; +grant execute on &&ut3_owner..ut_runner to &ut3_user; +grant execute on &&ut3_owner..ut_file_mappings to &ut3_user; +grant execute on &&ut3_owner..ut_file_mapping to &ut3_user; +grant execute on &&ut3_owner..ut_file_mapper to &ut3_user; +grant execute on &&ut3_owner..ut_suite_items_info to &ut3_user; +grant execute on &&ut3_owner..ut_suite_item_info to &ut3_user; +grant execute on &&ut3_owner..ut_run_info to &ut3_user; + +--generic types +grant execute on &&ut3_owner..ut_varchar2_list to &ut3_user; +grant execute on &&ut3_owner..ut_varchar2_rows to &ut3_user; +grant execute on &&ut3_owner..ut_integer_list to &ut3_user; +grant execute on &&ut3_owner..ut_key_value_pairs to &ut3_user; +grant execute on &&ut3_owner..ut_key_value_pair to &ut3_user; + +--expectations +grant execute on &&ut3_owner..ut_expectation to &ut3_user; +grant execute on &&ut3_owner..ut_expectation_compound to &ut3_user; +grant execute on &&ut3_owner..ut_expectation_json to &ut3_user; + +--matchers +grant execute on &&ut3_owner..ut_be_between to &ut3_user; +grant execute on &&ut3_owner..ut_be_empty to &ut3_user; +grant execute on &&ut3_owner..ut_be_false to &ut3_user; +grant execute on &&ut3_owner..ut_be_greater_or_equal to &ut3_user; +grant execute on &&ut3_owner..ut_be_greater_than to &ut3_user; +grant execute on &&ut3_owner..ut_be_less_or_equal to &ut3_user; +grant execute on &&ut3_owner..ut_be_less_than to &ut3_user; +grant execute on &&ut3_owner..ut_be_like to &ut3_user; +grant execute on &&ut3_owner..ut_be_not_null to &ut3_user; +grant execute on &&ut3_owner..ut_be_null to &ut3_user; +grant execute on &&ut3_owner..ut_be_true to &ut3_user; +grant execute on &&ut3_owner..ut_contain to &ut3_user; +grant execute on &&ut3_owner..ut_equal to &ut3_user; +grant execute on &&ut3_owner..ut_have_count to &ut3_user; +grant execute on &&ut3_owner..ut_match to &ut3_user; + +--reporters - test results +grant execute on &&ut3_owner..ut_teamcity_reporter to &ut3_user; +grant execute on &&ut3_owner..ut_xunit_reporter to &ut3_user; +grant execute on &&ut3_owner..ut_junit_reporter to &ut3_user; +grant execute on &&ut3_owner..ut_tfs_junit_reporter to &ut3_user; +grant execute on &&ut3_owner..ut_documentation_reporter to &ut3_user; +grant execute on &&ut3_owner..ut_sonar_test_reporter to &ut3_user; +grant execute on &&ut3_owner..ut_realtime_reporter to &ut3_user; +--reporters - coverage +grant execute on &&ut3_owner..ut_coverage_html_reporter to &ut3_user; +grant execute on &&ut3_owner..ut_coverage_sonar_reporter to &ut3_user; +grant execute on &&ut3_owner..ut_coveralls_reporter to &ut3_user; +grant execute on &&ut3_owner..ut_coverage_cobertura_reporter to &ut3_user; +--reporters - debug +grant execute on &&ut3_owner..ut_debug_reporter to &ut3_user; + +--reporters - base types +grant execute on &&ut3_owner..ut_reporters to &ut3_user; +grant execute on &&ut3_owner..ut_reporter_base to &ut3_user; +grant execute on &&ut3_owner..ut_output_reporter_base to &ut3_user; + +--outputs +grant execute on &&ut3_owner..ut_output_buffer_base to &ut3_user; + +--user temp tables +grant select, insert, update, delete on &&ut3_owner..ut_compound_data_tmp to &ut3_user; +grant select, insert, update, delete on &&ut3_owner..ut_compound_data_diff_tmp to &ut3_user; + +--needed for selecting from annotation objects +grant execute on &&ut3_owner..ut_annotation_objs_cache_info to &ut3_user; +grant execute on &&ut3_owner..ut_annotation_obj_cache_info to &ut3_user; + +--other grants +grant execute on &&ut3_owner..ut_executables to &ut3_user; +grant execute on &&ut3_owner..ut_executable_test to &ut3_user; +grant select on &&ut3_owner..ut_suite_cache to &ut3_user; +grant select on &&ut3_owner..ut_suite_cache_package to &ut3_user; +grant select on &&ut3_owner..ut_suite_cache_schema to &ut3_user; + +grant select, insert, delete, update on &&ut3_owner..dbmspcc_blocks to &ut3_user; +grant select, insert, delete, update on &&ut3_owner..dbmspcc_runs to &ut3_user; +grant select, insert, delete, update on &&ut3_owner..dbmspcc_units to &ut3_user; +grant execute on &&ut3_owner..ut_matcher_options to &ut3_user; +grant execute on &&ut3_owner..ut_matcher_options_items to &ut3_user; + diff --git a/source/create_synonyms.sql b/source/create_synonyms.sql new file mode 100644 index 000000000..39d559b20 --- /dev/null +++ b/source/create_synonyms.sql @@ -0,0 +1,133 @@ +/* + utPLSQL - Version 3 + Copyright 2016 - 2019 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +Create all necessary grant for the user who owns test packages and want to execute utPLSQL framework +*/ + +@@define_ut3_owner_param.sql + +column 2 new_value 2 noprint +select null as "2" from dual where 1=0; +spool params.sql.tmp +select + case + when '&&2' is null then q'[ACCEPT ut3_user CHAR DEFAULT 'PUBLIC' PROMPT 'Provide schema which should own synonyms for the utPLSQL v3 framework (PUBLIC): ']' + else 'define ut3_user=&&2.' + end +from dual; +spool off +set termout on +@params.sql.tmp +set termout off + +spool params.sql.tmp +select + case + when upper('&&ut3_user') = 'PUBLIC' then q'[define action_type='public' + ]'||q'[define ut3_user='' + ]'||q'[define grantee='PUBLIC']' + else q'[define action_type='or replace' + ]'||q'[define grantee='&&ut3_user'] + ]'||q'[define ut3_user='&&ut3_user..']' + end +from dual; + +spool off +set termout on +@params.sql.tmp +set termout off +/* cleanup temporary sql files */ +--try running on windows +$ del params.sql.tmp +--try running on linux/unix +! rm params.sql.tmp +set termout on + +set echo off +set feedback on +set heading off +set verify off + +whenever sqlerror exit failure rollback +whenever oserror exit failure rollback + +alter session set current_schema = &&ut3_owner; + +prompt Creating synonyms for UTPLSQL objects in &&ut3_owner schema to user &&grantee + +--public API +create &action_type. synonym &ut3_user.ut for &&ut3_owner..ut; +create &action_type. synonym &ut3_user.ut_runner for &&ut3_owner..ut_runner; +create &action_type. synonym &ut3_user.ut_file_mappings for &&ut3_owner..ut_file_mappings; +create &action_type. synonym &ut3_user.ut_file_mapping for &&ut3_owner..ut_file_mapping; +create &action_type. synonym &ut3_user.ut_file_mapper for &&ut3_owner..ut_file_mapper; +create &action_type. synonym &ut3_user.ut_suite_items_info for &&ut3_owner..ut_suite_items_info; +create &action_type. synonym &ut3_user.ut_suite_item_info for &&ut3_owner..ut_suite_item_info; +create &action_type. synonym &ut3_user.ut_run_info for &&ut3_owner..ut_run_info; + +--generic types +create &action_type. synonym &ut3_user.ut_varchar2_list for &&ut3_owner..ut_varchar2_list; +create &action_type. synonym &ut3_user.ut_varchar2_rows for &&ut3_owner..ut_varchar2_rows; +create &action_type. synonym &ut3_user.ut_integer_list for &&ut3_owner..ut_integer_list; +create &action_type. synonym &ut3_user.ut_key_value_pairs for &&ut3_owner..ut_key_value_pairs; +create &action_type. synonym &ut3_user.ut_key_value_pair for &&ut3_owner..ut_key_value_pair; + +--expectations +create &action_type. synonym &ut3_user.ut_expectation for &&ut3_owner..ut_expectation; +create &action_type. synonym &ut3_user.ut_expectation_compound for &&ut3_owner..ut_expectation_compound; +create &action_type. synonym &ut3_user.ut_expectation_json for &&ut3_owner..ut_expectation_json; + +--matchers +create &action_type. synonym &ut3_user.be_between for &&ut3_owner..be_between; +create &action_type. synonym &ut3_user.be_empty for &&ut3_owner..be_empty; +create &action_type. synonym &ut3_user.be_false for &&ut3_owner..be_false; +create &action_type. synonym &ut3_user.be_greater_or_equal for &&ut3_owner..be_greater_or_equal; +create &action_type. synonym &ut3_user.be_greater_than for &&ut3_owner..be_greater_than; +create &action_type. synonym &ut3_user.be_less_or_equal for &&ut3_owner..be_less_or_equal; +create &action_type. synonym &ut3_user.be_less_than for &&ut3_owner..be_less_than; +create &action_type. synonym &ut3_user.be_like for &&ut3_owner..be_like; +create &action_type. synonym &ut3_user.be_not_null for &&ut3_owner..be_not_null; +create &action_type. synonym &ut3_user.be_null for &&ut3_owner..be_null; +create &action_type. synonym &ut3_user.be_true for &&ut3_owner..be_true; +create &action_type. synonym &ut3_user.contain for &&ut3_owner..contain; +create &action_type. synonym &ut3_user.equal for &&ut3_owner..equal; +create &action_type. synonym &ut3_user.have_count for &&ut3_owner..have_count; +create &action_type. synonym &ut3_user.match for &&ut3_owner..match; + +--reporters - test results +create &action_type. synonym &ut3_user.ut_teamcity_reporter for &&ut3_owner..ut_teamcity_reporter; +create &action_type. synonym &ut3_user.ut_xunit_reporter for &&ut3_owner..ut_xunit_reporter; +create &action_type. synonym &ut3_user.ut_junit_reporter for &&ut3_owner..ut_junit_reporter; +create &action_type. synonym &ut3_user.ut_tfs_junit_reporter for &&ut3_owner..ut_tfs_junit_reporter; +create &action_type. synonym &ut3_user.ut_documentation_reporter for &&ut3_owner..ut_documentation_reporter; +create &action_type. synonym &ut3_user.ut_sonar_test_reporter for &&ut3_owner..ut_sonar_test_reporter; +create &action_type. synonym &ut3_user.ut_realtime_reporter for &&ut3_owner..ut_realtime_reporter; +--reporters - coverage +create &action_type. synonym &ut3_user.ut_coverage_html_reporter for &&ut3_owner..ut_coverage_html_reporter; +create &action_type. synonym &ut3_user.ut_coverage_sonar_reporter for &&ut3_owner..ut_coverage_sonar_reporter; +create &action_type. synonym &ut3_user.ut_coveralls_reporter for &&ut3_owner..ut_coveralls_reporter; +create &action_type. synonym &ut3_user.ut_coverage_cobertura_reporter for &&ut3_owner..ut_coverage_cobertura_reporter; +--reporters - debug +create &action_type. synonym &ut3_user.ut_debug_reporter for &&ut3_owner..ut_debug_reporter; +--reporters - base types +create &action_type. synonym &ut3_user.ut_reporters for &&ut3_owner..ut_reporters; +create &action_type. synonym &ut3_user.ut_reporter_base for &&ut3_owner..ut_reporter_base; +create &action_type. synonym &ut3_user.ut_output_reporter_base for &&ut3_owner..ut_output_reporter_base; + +--other synonyms +create &action_type. synonym &ut3_user.dbmspcc_blocks for &&ut3_owner..dbmspcc_blocks; +create &action_type. synonym &ut3_user.dbmspcc_runs for &&ut3_owner..dbmspcc_runs; +create &action_type. synonym &ut3_user.dbmspcc_units for &&ut3_owner..dbmspcc_units; diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index e91b45e0e..6d43c6b7a 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -19,166 +19,5 @@ Create all necessary grant for the user who owns test packages and want to execu @@define_ut3_owner_param.sql -set echo off -set feedback on -set heading off -set verify off - -prompt Granting privileges on UTPLSQL objects in &&ut3_owner schema to PUBLIC - -whenever sqlerror exit failure rollback -whenever oserror exit failure rollback - -alter session set current_schema = &&ut3_owner; - ---public API -grant execute on &&ut3_owner..ut to public; -grant execute on &&ut3_owner..ut_runner to public; -grant execute on &&ut3_owner..ut_file_mappings to public; -grant execute on &&ut3_owner..ut_file_mapping to public; -grant execute on &&ut3_owner..ut_file_mapper to public; -grant execute on &&ut3_owner..ut_suite_items_info to public; -grant execute on &&ut3_owner..ut_suite_item_info to public; -grant execute on &&ut3_owner..ut_run_info to public; - ---generic types -grant execute on &&ut3_owner..ut_varchar2_list to public; -grant execute on &&ut3_owner..ut_varchar2_rows to public; -grant execute on &&ut3_owner..ut_integer_list to public; -grant execute on &&ut3_owner..ut_key_value_pairs to public; -grant execute on &&ut3_owner..ut_key_value_pair to public; - ---expectations -grant execute on &&ut3_owner..ut_expectation to public; -grant execute on &&ut3_owner..ut_expectation_compound to public; -grant execute on &&ut3_owner..ut_expectation_json to public; - ---matchers -grant execute on &&ut3_owner..ut_be_between to public; -grant execute on &&ut3_owner..ut_be_empty to public; -grant execute on &&ut3_owner..ut_be_false to public; -grant execute on &&ut3_owner..ut_be_greater_or_equal to public; -grant execute on &&ut3_owner..ut_be_greater_than to public; -grant execute on &&ut3_owner..ut_be_less_or_equal to public; -grant execute on &&ut3_owner..ut_be_less_than to public; -grant execute on &&ut3_owner..ut_be_like to public; -grant execute on &&ut3_owner..ut_be_not_null to public; -grant execute on &&ut3_owner..ut_be_null to public; -grant execute on &&ut3_owner..ut_be_true to public; -grant execute on &&ut3_owner..ut_equal to public; -grant execute on &&ut3_owner..ut_have_count to public; -grant execute on &&ut3_owner..ut_match to public; - - ---reporters - test results -grant execute on &&ut3_owner..ut_teamcity_reporter to public; -grant execute on &&ut3_owner..ut_xunit_reporter to public; -grant execute on &&ut3_owner..ut_junit_reporter to public; -grant execute on &&ut3_owner..ut_tfs_junit_reporter to public; -grant execute on &&ut3_owner..ut_documentation_reporter to public; -grant execute on &&ut3_owner..ut_sonar_test_reporter to public; -grant execute on &&ut3_owner..ut_realtime_reporter to public; ---reporters - coverage -grant execute on &&ut3_owner..ut_coverage_html_reporter to public; -grant execute on &&ut3_owner..ut_coverage_sonar_reporter to public; -grant execute on &&ut3_owner..ut_coveralls_reporter to public; -grant execute on &&ut3_owner..ut_coverage_cobertura_reporter to public; ---reporters - debug -grant execute on &&ut3_owner..ut_debug_reporter to public; - ---reporters - base types -grant execute on &&ut3_owner..ut_reporters to public; -grant execute on &&ut3_owner..ut_reporter_base to public; -grant execute on &&ut3_owner..ut_output_reporter_base to public; - ---outputs -grant execute on &&ut3_owner..ut_output_buffer_base to public; - ---user temp tables -grant select, insert, update, delete on &&ut3_owner..ut_compound_data_tmp to public; -grant select, insert, update, delete on &&ut3_owner..ut_compound_data_diff_tmp to public; - ---needed for selecting from annotation objects -grant execute on &&ut3_owner..ut_annotation_objs_cache_info to public; -grant execute on &&ut3_owner..ut_annotation_obj_cache_info to public; - ---other grants -grant execute on &&ut3_owner..ut_executables to public; -grant execute on &&ut3_owner..ut_executable_test to public; -grant select on &&ut3_owner..ut_suite_cache to public; -grant select on &&ut3_owner..ut_suite_cache_package to public; -grant select on &&ut3_owner..ut_suite_cache_schema to public; - -grant select, insert, delete, update on &&ut3_owner..dbmspcc_blocks to public; -grant select, insert, delete, update on &&ut3_owner..dbmspcc_runs to public; -grant select, insert, delete, update on &&ut3_owner..dbmspcc_units to public; -grant execute on &&ut3_owner..ut_matcher_options to public; -grant execute on &&ut3_owner..ut_matcher_options_items to public; - - -prompt Creating synonyms for UTPLSQL objects in &&ut3_owner schema to PUBLIC - ---public API -create public synonym ut for &&ut3_owner..ut; -create public synonym ut_runner for &&ut3_owner..ut_runner; -create public synonym ut_file_mappings for &&ut3_owner..ut_file_mappings; -create public synonym ut_file_mapping for &&ut3_owner..ut_file_mapping; -create public synonym ut_file_mapper for &&ut3_owner..ut_file_mapper; -create public synonym ut_suite_items_info for &&ut3_owner..ut_suite_items_info; -create public synonym ut_suite_item_info for &&ut3_owner..ut_suite_item_info; -create public synonym ut_run_info for &&ut3_owner..ut_run_info; - ---generic types -create public synonym ut_varchar2_list for &&ut3_owner..ut_varchar2_list; -create public synonym ut_varchar2_rows for &&ut3_owner..ut_varchar2_rows; -create public synonym ut_integer_list for &&ut3_owner..ut_integer_list; -create public synonym ut_key_value_pairs for &&ut3_owner..ut_key_value_pairs; -create public synonym ut_key_value_pair for &&ut3_owner..ut_key_value_pair; - ---expectations -create public synonym ut_expectation for &&ut3_owner..ut_expectation; -create public synonym ut_expectation_compound for &&ut3_owner..ut_expectation_compound; -create public synonym ut_expectation_json for &&ut3_owner..ut_expectation_json; - ---matchers -create public synonym be_between for &&ut3_owner..be_between; -create public synonym be_empty for &&ut3_owner..be_empty; -create public synonym be_false for &&ut3_owner..be_false; -create public synonym be_greater_or_equal for &&ut3_owner..be_greater_or_equal; -create public synonym be_greater_than for &&ut3_owner..be_greater_than; -create public synonym be_less_or_equal for &&ut3_owner..be_less_or_equal; -create public synonym be_less_than for &&ut3_owner..be_less_than; -create public synonym be_like for &&ut3_owner..be_like; -create public synonym be_not_null for &&ut3_owner..be_not_null; -create public synonym be_null for &&ut3_owner..be_null; -create public synonym be_true for &&ut3_owner..be_true; -create public synonym contain for &&ut3_owner..contain; -create public synonym equal for &&ut3_owner..equal; -create public synonym have_count for &&ut3_owner..have_count; -create public synonym match for &&ut3_owner..match; - ---reporters - test results -create public synonym ut_teamcity_reporter for &&ut3_owner..ut_teamcity_reporter; -create public synonym ut_xunit_reporter for &&ut3_owner..ut_xunit_reporter; -create public synonym ut_junit_reporter for &&ut3_owner..ut_junit_reporter; -create public synonym ut_tfs_junit_reporter for &&ut3_owner..ut_tfs_junit_reporter; -create public synonym ut_documentation_reporter for &&ut3_owner..ut_documentation_reporter; -create public synonym ut_sonar_test_reporter for &&ut3_owner..ut_sonar_test_reporter; -create public synonym ut_realtime_reporter for &&ut3_owner..ut_realtime_reporter; ---reporters - coverage -create public synonym ut_coverage_html_reporter for &&ut3_owner..ut_coverage_html_reporter; -create public synonym ut_coverage_sonar_reporter for &&ut3_owner..ut_coverage_sonar_reporter; -create public synonym ut_coveralls_reporter for &&ut3_owner..ut_coveralls_reporter; -create public synonym ut_coverage_cobertura_reporter for &&ut3_owner..ut_coverage_cobertura_reporter; ---reporters - debug -create public synonym ut_debug_reporter for &&ut3_owner..ut_debug_reporter; - ---reporters - base types -create public synonym ut_reporters for &&ut3_owner..ut_reporters; -create public synonym ut_reporter_base for &&ut3_owner..ut_reporter_base; -create public synonym ut_output_reporter_base for &&ut3_owner..ut_output_reporter_base; - ---other synonyms -create public synonym dbmspcc_blocks for &&ut3_owner..dbmspcc_blocks; -create public synonym dbmspcc_runs for &&ut3_owner..dbmspcc_runs; -create public synonym dbmspcc_units for &&ut3_owner..dbmspcc_units; +@@create_grants.sql '&&ut3_owner' 'PUBLIC' +@@create_synonyms.sql '&&ut3_owner' 'PUBLIC' diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql index 29b6a45bc..4ca721cf4 100644 --- a/source/create_user_grants.sql +++ b/source/create_user_grants.sql @@ -17,119 +17,4 @@ Create all necessary grant for the user who owns test packages and want to execute utPLSQL framework */ -@@define_ut3_owner_param.sql - -column 2 new_value 2 noprint -select null as "2" from dual where 1=0; -spool params.sql.tmp -select - case - when '&&2' is null then q'[ACCEPT ut3_user CHAR PROMPT 'Provide schema to which should be granted the utPLSQL v3 ']' - else 'define ut3_user=&&2' - end -from dual; -spool off -set termout on -@params.sql.tmp -set termout off -/* cleanup temporary sql files */ ---try running on windows -$ del params.sql.tmp ---try running on linux/unix -! rm params.sql.tmp -set termout on - -set echo off -set feedback on -set heading off -set verify off - -prompt Granting privileges on UTPLSQL objects in &&ut3_owner schema to user &&ut3_user - -whenever sqlerror exit failure rollback -whenever oserror exit failure rollback - -alter session set current_schema = &&ut3_owner; - ---public API -grant execute on &&ut3_owner..ut to &ut3_user; -grant execute on &&ut3_owner..ut_runner to &ut3_user; -grant execute on &&ut3_owner..ut_file_mappings to &ut3_user; -grant execute on &&ut3_owner..ut_file_mapping to &ut3_user; -grant execute on &&ut3_owner..ut_file_mapper to &ut3_user; -grant execute on &&ut3_owner..ut_suite_items_info to &ut3_user; -grant execute on &&ut3_owner..ut_suite_item_info to &ut3_user; -grant execute on &&ut3_owner..ut_run_info to &ut3_user; - ---generic types -grant execute on &&ut3_owner..ut_varchar2_list to &ut3_user; -grant execute on &&ut3_owner..ut_varchar2_rows to &ut3_user; -grant execute on &&ut3_owner..ut_integer_list to &ut3_user; -grant execute on &&ut3_owner..ut_key_value_pairs to &ut3_user; -grant execute on &&ut3_owner..ut_key_value_pair to &ut3_user; - ---expectations -grant execute on &&ut3_owner..ut_expectation to &ut3_user; -grant execute on &&ut3_owner..ut_expectation_compound to &ut3_user; -grant execute on &&ut3_owner..ut_expectation_json to &ut3_user; - ---matchers -grant execute on &&ut3_owner..ut_be_between to &ut3_user; -grant execute on &&ut3_owner..ut_be_empty to &ut3_user; -grant execute on &&ut3_owner..ut_be_false to &ut3_user; -grant execute on &&ut3_owner..ut_be_greater_or_equal to &ut3_user; -grant execute on &&ut3_owner..ut_be_greater_than to &ut3_user; -grant execute on &&ut3_owner..ut_be_less_or_equal to &ut3_user; -grant execute on &&ut3_owner..ut_be_less_than to &ut3_user; -grant execute on &&ut3_owner..ut_be_like to &ut3_user; -grant execute on &&ut3_owner..ut_be_not_null to &ut3_user; -grant execute on &&ut3_owner..ut_be_null to &ut3_user; -grant execute on &&ut3_owner..ut_be_true to &ut3_user; -grant execute on &&ut3_owner..ut_equal to &ut3_user; -grant execute on &&ut3_owner..ut_have_count to &ut3_user; -grant execute on &&ut3_owner..ut_match to &ut3_user; - ---reporters - tests -grant execute on &&ut3_owner..ut_teamcity_reporter to &ut3_user; -grant execute on &&ut3_owner..ut_xunit_reporter to &ut3_user; -grant execute on &&ut3_owner..ut_junit_reporter to &ut3_user; -grant execute on &&ut3_owner..ut_tfs_junit_reporter to &ut3_user; -grant execute on &&ut3_owner..ut_documentation_reporter to &ut3_user; -grant execute on &&ut3_owner..ut_realtime_reporter to &ut3_user; -grant execute on &&ut3_owner..ut_sonar_test_reporter to &ut3_user; ---reporters - coverage -grant execute on &&ut3_owner..ut_coverage_html_reporter to &ut3_user; -grant execute on &&ut3_owner..ut_coverage_sonar_reporter to &ut3_user; -grant execute on &&ut3_owner..ut_coveralls_reporter to &ut3_user; -grant execute on &&ut3_owner..ut_coverage_cobertura_reporter to &ut3_user; ---reporters - debug -grant execute on &&ut3_owner..ut_debug_reporter to &ut3_user; - ---reporters - base types -grant execute on &&ut3_owner..ut_reporters to &ut3_user; -grant execute on &&ut3_owner..ut_reporter_base to &ut3_user; -grant execute on &&ut3_owner..ut_output_reporter_base to &ut3_user; - ---outputs -grant execute on &&ut3_owner..ut_output_buffer_base to &ut3_user; - ---user temp tables -grant select, insert, update, delete on &&ut3_owner..ut_compound_data_tmp to &ut3_user; -grant select, insert, update, delete on &&ut3_owner..ut_compound_data_diff_tmp to &ut3_user; - ---other grants -grant execute on &&ut3_owner..ut_executables to &ut3_user; -grant execute on &&ut3_owner..ut_executable_test to &ut3_user; -grant select on &&ut3_owner..ut_suite_cache to &ut3_user; -grant select on &&ut3_owner..ut_suite_cache_package to &ut3_user; -grant select on &&ut3_owner..ut_suite_cache_schema to &ut3_user; - ---needed for selecting from annotation objects -grant execute on &&ut3_owner..ut_annotation_objs_cache_info to &ut3_user; -grant execute on &&ut3_owner..ut_annotation_obj_cache_info to &ut3_user; - -grant select, insert, delete, update on &&ut3_owner..dbmspcc_blocks to &ut3_user; -grant select, insert, delete, update on &&ut3_owner..dbmspcc_runs to &ut3_user; -grant select, insert, delete, update on &&ut3_owner..dbmspcc_units to &ut3_user; -grant execute on &&ut3_owner..ut_matcher_options to &ut3_user; -grant execute on &&ut3_owner..ut_matcher_options_items to &ut3_user; +@@create_grants.sql diff --git a/source/create_user_synonyms.sql b/source/create_user_synonyms.sql index d05b42fbf..ee9f60fdd 100644 --- a/source/create_user_synonyms.sql +++ b/source/create_user_synonyms.sql @@ -17,103 +17,4 @@ Create all necessary grant for the user who owns test packages and want to execute utPLSQL framework */ -@@define_ut3_owner_param.sql - -column 2 new_value 2 noprint -select null as "2" from dual where 1=0; -spool params.sql.tmp -select - case - when '&&2' is null then q'[ACCEPT ut3_user CHAR PROMPT 'Provide schema name where synonyms for the utPLSQL v3 should be created ']' - else 'define ut3_user=&&2' - end -from dual; -spool off -set termout on -@params.sql.tmp -set termout off -/* cleanup temporary sql files */ ---try running on windows -$ del params.sql.tmp ---try running on linux/unix -! rm params.sql.tmp -set termout on - -set echo off -set feedback on -set heading off -set verify off - -prompt Granting privileges on UTPLSQL objects in &&ut3_owner schema to user &&ut3_user - -whenever sqlerror exit failure rollback -whenever oserror exit failure rollback - -alter session set current_schema = &&ut3_owner; - -prompt Creating synonyms for UTPLSQL objects in &&ut3_owner schema to user &&ut3_user - ---public API -create or replace synonym &ut3_user..ut for &&ut3_owner..ut; -create or replace synonym &ut3_user..ut_runner for &&ut3_owner..ut_runner; -create or replace synonym &ut3_user..ut_file_mappings for &&ut3_owner..ut_file_mappings; -create or replace synonym &ut3_user..ut_file_mapping for &&ut3_owner..ut_file_mapping; -create or replace synonym &ut3_user..ut_file_mapper for &&ut3_owner..ut_file_mapper; -create or replace synonym &ut3_user..ut_suite_items_info for &&ut3_owner..ut_suite_items_info; -create or replace synonym &ut3_user..ut_suite_item_info for &&ut3_owner..ut_suite_item_info; -create or replace synonym &ut3_user..ut_run_info for &&ut3_owner..ut_run_info; - ---generic types -create or replace synonym &ut3_user..ut_varchar2_list for &&ut3_owner..ut_varchar2_list; -create or replace synonym &ut3_user..ut_varchar2_rows for &&ut3_owner..ut_varchar2_rows; -create or replace synonym &ut3_user..ut_integer_list for &&ut3_owner..ut_integer_list; -create or replace synonym &ut3_user..ut_key_value_pairs for &&ut3_owner..ut_key_value_pairs; -create or replace synonym &ut3_user..ut_key_value_pair for &&ut3_owner..ut_key_value_pair; - ---expectations -create or replace synonym &ut3_user..ut_expectation for &&ut3_owner..ut_expectation; -create or replace synonym &ut3_user..ut_expectation_compound for &&ut3_owner..ut_expectation_compound; -create or replace synonym &ut3_user..ut_expectation_json for &&ut3_owner..ut_expectation_json; - ---matchers -create or replace synonym &ut3_user..be_between for &&ut3_owner..be_between; -create or replace synonym &ut3_user..be_empty for &&ut3_owner..be_empty; -create or replace synonym &ut3_user..be_false for &&ut3_owner..be_false; -create or replace synonym &ut3_user..be_greater_or_equal for &&ut3_owner..be_greater_or_equal; -create or replace synonym &ut3_user..be_greater_than for &&ut3_owner..be_greater_than; -create or replace synonym &ut3_user..be_less_or_equal for &&ut3_owner..be_less_or_equal; -create or replace synonym &ut3_user..be_less_than for &&ut3_owner..be_less_than; -create or replace synonym &ut3_user..be_like for &&ut3_owner..be_like; -create or replace synonym &ut3_user..be_not_null for &&ut3_owner..be_not_null; -create or replace synonym &ut3_user..be_null for &&ut3_owner..be_null; -create or replace synonym &ut3_user..be_true for &&ut3_owner..be_true; -create or replace synonym &ut3_user..contain for &&ut3_owner..contain; -create or replace synonym &ut3_user..equal for &&ut3_owner..equal; -create or replace synonym &ut3_user..have_count for &&ut3_owner..have_count; -create or replace synonym &ut3_user..match for &&ut3_owner..match; - - ---reporters - test results -create or replace synonym &ut3_user..ut_teamcity_reporter for &&ut3_owner..ut_teamcity_reporter; -create or replace synonym &ut3_user..ut_xunit_reporter for &&ut3_owner..ut_xunit_reporter; -create or replace synonym &ut3_user..ut_junit_reporter for &&ut3_owner..ut_junit_reporter; -create or replace synonym &ut3_user..ut_tfs_junit_reporter for &&ut3_owner..ut_tfs_junit_reporter; -create or replace synonym &ut3_user..ut_documentation_reporter for &&ut3_owner..ut_documentation_reporter; -create or replace synonym &ut3_user..ut_sonar_test_reporter for &&ut3_owner..ut_sonar_test_reporter; -create or replace synonym &ut3_user..ut_realtime_reporter for &&ut3_owner..ut_realtime_reporter; ---reporters - coverage -create or replace synonym &ut3_user..ut_coverage_html_reporter for &&ut3_owner..ut_coverage_html_reporter; -create or replace synonym &ut3_user..ut_coverage_sonar_reporter for &&ut3_owner..ut_coverage_sonar_reporter; -create or replace synonym &ut3_user..ut_coveralls_reporter for &&ut3_owner..ut_coveralls_reporter; -create or replace synonym &ut3_user..ut_coverage_cobertura_reporter for &&ut3_owner..ut_coverage_cobertura_reporter; ---reporters - debug -create or replace synonym &ut3_user..ut_debug_reporter for &&ut3_owner..ut_debug_reporter; ---reporters - base types -create or replace synonym &ut3_user..ut_reporters for &&ut3_owner..ut_reporters; -create or replace synonym &ut3_user..ut_reporter_base for &&ut3_owner..ut_reporter_base; -create or replace synonym &ut3_user..ut_output_reporter_base for &&ut3_owner..ut_output_reporter_base; - ---other synonyms -create or replace synonym &ut3_user..dbmspcc_blocks for &&ut3_owner..dbmspcc_blocks; -create or replace synonym &ut3_user..dbmspcc_runs for &&ut3_owner..dbmspcc_runs; -create or replace synonym &ut3_user..dbmspcc_units for &&ut3_owner..dbmspcc_units; +@@create_synonyms.sql From c66b4d7759ab3b47e7f76146229afe3492957949 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 25 Jun 2019 00:55:33 +0100 Subject: [PATCH 0536/1096] Assuring that no locks are held on temp tables after test run is finished and transaction is committed. --- source/core/coverage/ut_coverage_helper.pkb | 1 - source/core/ut_utils.pkb | 4 ++-- source/expectations/data_values/ut_compound_data_diff_tmp.sql | 2 +- source/expectations/data_values/ut_compound_data_tmp.sql | 2 +- source/expectations/data_values/ut_json_data_diff_tmp.sql | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/source/core/coverage/ut_coverage_helper.pkb b/source/core/coverage/ut_coverage_helper.pkb index 1c83606d8..dd703e6f1 100644 --- a/source/core/coverage/ut_coverage_helper.pkb +++ b/source/core/coverage/ut_coverage_helper.pkb @@ -43,7 +43,6 @@ create or replace package body ut_coverage_helper is procedure cleanup_tmp_table is pragma autonomous_transaction; begin - null; execute immediate 'truncate table ut_coverage_sources_tmp'; commit; end; diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 1d451ddaa..bbcdb5533 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -543,7 +543,7 @@ create or replace package body ut_utils is procedure read_cache_to_dbms_output is l_lines_data sys_refcursor; l_lines ut_varchar2_rows; - c_lines_limit constant integer := 100; + c_lines_limit constant integer := 1000; pragma autonomous_transaction; begin open l_lines_data for select text from ut_dbms_output_cache order by seq_no; @@ -558,7 +558,7 @@ create or replace package body ut_utils is end loop; exit when l_lines_data%notfound; end loop; - delete from ut_dbms_output_cache; + execute immediate 'truncate table ut_dbms_output_cache'; commit; end; diff --git a/source/expectations/data_values/ut_compound_data_diff_tmp.sql b/source/expectations/data_values/ut_compound_data_diff_tmp.sql index 19f2a6bb2..e96d716b5 100644 --- a/source/expectations/data_values/ut_compound_data_diff_tmp.sql +++ b/source/expectations/data_values/ut_compound_data_diff_tmp.sql @@ -23,4 +23,4 @@ create global temporary table ut_compound_data_diff_tmp( constraint ut_compound_data_diff_tmp_chk check( item_no is not null ) -) on commit preserve rows; +) on commit delete rows; diff --git a/source/expectations/data_values/ut_compound_data_tmp.sql b/source/expectations/data_values/ut_compound_data_tmp.sql index 10a88269e..c860a1872 100644 --- a/source/expectations/data_values/ut_compound_data_tmp.sql +++ b/source/expectations/data_values/ut_compound_data_tmp.sql @@ -19,5 +19,5 @@ create global temporary table ut_compound_data_tmp( pk_hash raw(128), duplicate_no integer, constraint ut_cmp_data_tmp_hash_pk unique (data_id, item_no, duplicate_no) -) on commit preserve rows; +) on commit delete rows; --xmltype column item_data store as binary xml; \ No newline at end of file diff --git a/source/expectations/data_values/ut_json_data_diff_tmp.sql b/source/expectations/data_values/ut_json_data_diff_tmp.sql index 3d77dca8b..bfaaa1b72 100644 --- a/source/expectations/data_values/ut_json_data_diff_tmp.sql +++ b/source/expectations/data_values/ut_json_data_diff_tmp.sql @@ -24,4 +24,4 @@ create global temporary table ut_json_data_diff_tmp( exp_json_type varchar2(2000), exp_access_path varchar2(4000), exp_parent_path varchar2(4000) -) on commit preserve rows; +) on commit delete rows; From 41c007c32eb763f5a0643bcf8183f616aa21e8c7 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 27 Jun 2019 01:31:01 +0100 Subject: [PATCH 0537/1096] Removed grants: - grant select, insert, update, delete on ut_compound_data_tmp - grant select, insert, update, delete on ut_compound_data_diff_tmp --- source/create_grants.sql | 6 +-- .../data_values/ut_compound_data_helper.pkb | 37 ++++++++++++++----- .../data_values/ut_compound_data_helper.pks | 4 ++ .../data_values/ut_compound_data_value.tpb | 16 ++------ .../data_values/ut_data_value_refcursor.tpb | 5 +-- 5 files changed, 37 insertions(+), 31 deletions(-) diff --git a/source/create_grants.sql b/source/create_grants.sql index 57aa61c1c..0562db067 100644 --- a/source/create_grants.sql +++ b/source/create_grants.sql @@ -115,11 +115,7 @@ grant execute on &&ut3_owner..ut_output_reporter_base to &ut3_user; --outputs grant execute on &&ut3_owner..ut_output_buffer_base to &ut3_user; ---user temp tables -grant select, insert, update, delete on &&ut3_owner..ut_compound_data_tmp to &ut3_user; -grant select, insert, update, delete on &&ut3_owner..ut_compound_data_diff_tmp to &ut3_user; - ---needed for selecting from annotation objects +--needed internally for selecting from annotation objects within packages that use invoker rights grant execute on &&ut3_owner..ut_annotation_objs_cache_info to &ut3_user; grant execute on &&ut3_owner..ut_annotation_obj_cache_info to &ut3_user; diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index e00df2cc7..51fa61fbd 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -35,7 +35,7 @@ create or replace package body ut_compound_data_helper is ,x.data_id data_id ,position + x.item_no item_no {:columns:} - from {:ut3_owner:}.ut_compound_data_tmp x, + from ut_compound_data_tmp x, xmltable('/ROWSET/ROW' passing x.item_data columns item_data xmltype path '*' ,position for ordinality @@ -53,7 +53,7 @@ create or replace package body ut_compound_data_helper is ,x.data_id data_id ,position + x.item_no item_no {:columns:} - from {:ut3_owner:}.ut_compound_data_tmp x, + from ut_compound_data_tmp x, xmltable('/ROWSET/ROW' passing x.item_data columns item_data xmltype path '*' ,position for ordinality @@ -207,10 +207,9 @@ create or replace package body ut_compound_data_helper is is l_alias varchar2(10) := a_alias; l_col_syntax varchar2(4000); - l_ut_owner varchar2(250) := ut_utils.ut_owner; - begin + begin if a_data_info.is_sql_diffable = 0 then - l_col_syntax := l_ut_owner ||'.ut_utils.get_hash('||l_alias||a_data_info.transformed_name||'.getClobVal()) as '||a_data_info.transformed_name ; + l_col_syntax := 'ut_utils.get_hash('||l_alias||a_data_info.transformed_name||'.getClobVal()) as '||a_data_info.transformed_name ; elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type = 'DATE' then l_col_syntax := 'to_date('||l_alias||a_data_info.transformed_name||') as '|| a_data_info.transformed_name; elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type in ('TIMESTAMP') then @@ -334,7 +333,6 @@ create or replace package body ut_compound_data_helper is l_join_on_stmt clob; l_not_equal_stmt clob; l_where_stmt clob; - l_ut_owner varchar2(250) := ut_utils.ut_owner; l_join_by_list ut_varchar2_list; function get_join_type(a_inclusion_compare in boolean,a_negated in boolean) return varchar2 is @@ -379,8 +377,7 @@ create or replace package body ut_compound_data_helper is l_compare_sql := replace(l_compare_sql,'{:duplicate_number:}',l_partition_stmt); l_compare_sql := replace(l_compare_sql,'{:columns:}',l_select_stmt); - l_compare_sql := replace(l_compare_sql,'{:ut3_owner:}',l_ut_owner); - l_compare_sql := replace(l_compare_sql,'{:xml_to_columns:}',l_xmltable_stmt); + l_compare_sql := replace(l_compare_sql,'{:xml_to_columns:}',l_xmltable_stmt); l_compare_sql := replace(l_compare_sql,'{:item_no:}',get_item_no(a_unordered)); l_compare_sql := replace(l_compare_sql,'{:join_type:}',get_join_type(a_inclusion_type,a_is_negated)); l_compare_sql := replace(l_compare_sql,'{:join_condition:}',l_join_on_stmt); @@ -613,8 +610,28 @@ create or replace package body ut_compound_data_helper is ut_utils.remove_error_from_stack(sqlerrm,ut_utils.gc_xml_processing)||chr(10)|| ut_expectation_processor.who_called_expectation(a_error_stack)|| 'Check the query and data for errors.'; - end; - + end; + + procedure save_cursor_data_for_diff(a_data_id raw, a_set_id integer, a_xml xmltype) is + begin + insert into ut_compound_data_tmp (data_id, item_no, item_data) values (a_data_id, a_set_id, a_xml); + end; + + function get_row_data_as_xml(a_data_id raw, a_max_rows integer) return ut_utils.t_clob_tab is + l_results ut_utils.t_clob_tab; + begin + select xmlserialize( content ucd.item_data no indent) + bulk collect into l_results + from ut_compound_data_tmp tmp + ,xmltable ( '/ROWSET' passing tmp.item_data + columns item_data xmltype PATH '*' + ) ucd + where tmp.data_id = a_data_id + and rownum <= a_max_rows; + + return l_results; + end; + function type_no_length ( a_type_name varchar2) return boolean is begin return case diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 209717b62..b39df0039 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -115,6 +115,10 @@ create or replace package ut_compound_data_helper authid definer is function get_compare_cursor(a_diff_cursor_text in clob,a_self_id raw, a_other_id raw) return sys_refcursor; function create_err_cursor_msg(a_error_stack varchar2) return varchar2; + + procedure save_cursor_data_for_diff(a_data_id raw, a_set_id integer, a_xml xmltype); + + function get_row_data_as_xml(a_data_id raw, a_max_rows integer) return ut_utils.t_clob_tab; /* * Function to return true or false if the type dont have an length diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index 3dbf9431a..5874beef8 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -44,18 +44,10 @@ create or replace type body ut_compound_data_value as if not self.is_null() then dbms_lob.createtemporary(l_result, true); ut_utils.append_to_clob(l_result,'Data:'||chr(10)); - --return first c_max_rows rows - execute immediate ' - select xmlserialize( content ucd.item_data no indent) - from '|| ut_utils.ut_owner ||q'[.ut_compound_data_tmp tmp - ,xmltable ( '/ROWSET' passing tmp.item_data - columns item_data xmltype PATH '*' - ) ucd - where tmp.data_id = :data_id - and rownum <= :max_rows]' - bulk collect into l_results using self.data_id, ut_utils.gc_diff_max_rows; - - ut_utils.append_to_clob(l_result,l_results); + ut_utils.append_to_clob( + l_result, + ut_compound_data_helper.get_row_data_as_xml( self.data_id, ut_utils.gc_diff_max_rows ) + ); l_result_string := ut_utils.to_string(l_result,null); dbms_lob.freetemporary(l_result); diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index f6315cc1c..dab76a817 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -58,10 +58,7 @@ create or replace type body ut_data_value_refcursor as null; $end l_elements_count := l_elements_count + dbms_xmlgen.getNumRowsProcessed(l_ctx); - execute immediate - 'insert into ' || l_ut_owner || '.ut_compound_data_tmp(data_id, item_no, item_data) ' || - 'values (:self_guid, :self_row_count, :l_xml)' - using in self.data_id, l_set_id, l_xml; + ut_compound_data_helper.save_cursor_data_for_diff( self.data_id, l_set_id, l_xml ); l_set_id := l_set_id + c_bulk_rows; end loop; From 6f0a939512ca44674f30e4d96a37afb348823948 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 28 Jun 2019 17:05:29 +0100 Subject: [PATCH 0538/1096] - removed grants to `ut_suite_cache` - changed `dbmspcc_...` tables to be global temporary - added cleanup of session level global temp tables after run --- source/api/ut_runner.pkb | 4 +- source/api/ut_suite_item_info.tps | 2 +- .../annotations/ut_annotation_manager.pkb | 6 +- source/core/coverage/dbms_plssqlcode.sql | 144 +----- source/core/coverage/ut_coverage.pkb | 4 - source/core/coverage/ut_coverage_helper.pkb | 1 - .../coverage/ut_coverage_helper_block.pkb | 22 +- source/core/types/ut_suite_cache_row.tps | 40 ++ source/core/types/ut_suite_cache_rows.tps | 19 + source/core/ut_suite_cache.sql | 62 +-- source/core/ut_suite_cache_manager.pkb | 281 +++++++++++- source/core/ut_suite_cache_manager.pks | 55 ++- source/core/ut_suite_manager.pkb | 424 +++--------------- source/core/ut_suite_manager.pks | 5 +- source/core/ut_utils.pkb | 8 +- source/core/ut_utils.pks | 8 +- source/create_grants.sql | 5 +- source/install.sql | 10 +- source/uninstall_objects.sql | 4 + 19 files changed, 528 insertions(+), 576 deletions(-) create mode 100644 source/core/types/ut_suite_cache_row.tps create mode 100644 source/core/types/ut_suite_cache_rows.tps diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index 00b36573e..2068bca3c 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -44,7 +44,6 @@ create or replace package body ut_runner is procedure finish_run(a_run ut_run, a_force_manual_rollback boolean) is begin - ut_utils.cleanup_temp_tables; ut_event_manager.trigger_event(ut_event_manager.gc_finalize, a_run); ut_metadata.reset_source_definition_cache; ut_utils.read_cache_to_dbms_output(); @@ -52,6 +51,7 @@ create or replace package body ut_runner is ut_compound_data_helper.cleanup_diff(); if not a_force_manual_rollback then rollback; + ut_utils.cleanup_session_temp_tables; end if; end; @@ -196,7 +196,7 @@ create or replace package body ut_runner is function get_suites_info(a_owner varchar2 := null, a_package_name varchar2 := null) return ut_suite_items_info pipelined is l_cursor sys_refcursor; l_results ut_suite_items_info; - c_bulk_limit constant integer := 10; + c_bulk_limit constant integer := 100; begin l_cursor := ut_suite_manager.get_suites_info( nvl(a_owner,sys_context('userenv', 'current_schema')), a_package_name ); loop diff --git a/source/api/ut_suite_item_info.tps b/source/api/ut_suite_item_info.tps index d37e89b59..807635d1b 100644 --- a/source/api/ut_suite_item_info.tps +++ b/source/api/ut_suite_item_info.tps @@ -18,7 +18,7 @@ create or replace type ut_suite_item_info as object ( object_owner varchar2( 250 ), -- the owner of test suite packages object_name varchar2( 250 ), -- the name of test suite package item_name varchar2( 250 ), -- the name of suite/test - item_description varchar2( 250 ), -- the description of suite/suite item + item_description varchar2( 4000 ), -- the description of suite/suite item item_type varchar2( 250 ), -- the type of item (UT_SUITE/UT_SUITE_CONTEXT/UT_TEST) item_line_no integer, -- line_number where annotation identifying the item exists path varchar2( 4000 ),-- suitepath of the item diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index 0d98b81a0..fd2997632 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -16,7 +16,6 @@ create or replace package body ut_annotation_manager as limitations under the License. */ - gc_max_objects_limit integer := 1000000; ------------------------------ --private definitions @@ -46,7 +45,7 @@ create or replace package body ut_annotation_manager as and o.object_type = ']'||ut_utils.qualified_sql_name(a_object_type)||q'[' )]'; open l_rows for l_cursor_text using l_data; - fetch l_rows bulk collect into l_result limit gc_max_objects_limit; + fetch l_rows bulk collect into l_result limit ut_utils.gc_max_objects_fetch_limit; close l_rows; return l_result; end; @@ -96,7 +95,7 @@ create or replace package body ut_annotation_manager as else 'o.last_ddl_time >= cast(:a_parse_date as date)' end; open l_rows for l_cursor_text using l_data, a_parse_date; - fetch l_rows bulk collect into l_result limit gc_max_objects_limit; + fetch l_rows bulk collect into l_result limit ut_utils.gc_max_objects_fetch_limit; close l_rows; end if; ut_event_manager.trigger_event('get_annotation_objs_info - end (count='||l_result.count||')'); @@ -172,7 +171,6 @@ create or replace package body ut_annotation_manager as l_object_lines.delete; end if; close a_sources_cursor; - commit; end; diff --git a/source/core/coverage/dbms_plssqlcode.sql b/source/core/coverage/dbms_plssqlcode.sql index 065563ef7..4bba7780c 100644 --- a/source/core/coverage/dbms_plssqlcode.sql +++ b/source/core/coverage/dbms_plssqlcode.sql @@ -7,69 +7,21 @@ begin select synonym_name from all_synonyms where synonym_name = 'DBMSPCC_BLOCKS' and owner = sys_context('USERENV','CURRENT_SCHEMA')); if l_tab_exist = 0 then execute immediate q'[ - create table dbmspcc_blocks ( + create global temporary table dbmspcc_blocks ( run_id number(38, 0), object_id number(38, 0), block number(38, 0), - line number(38, 0), - col number(38, 0), - covered number(1, 0), - not_feasible number(1, 0) - )]'; - execute immediate q'[ - create unique index dbmspcc_blocks_pk on - dbmspcc_blocks ( - run_id, - object_id, - block - )]'; - execute immediate q'[ - alter table dbmspcc_blocks modify ( - line - constraint dbmspcc_blocks_line_nn not null enable - )]'; - execute immediate q'[ - alter table dbmspcc_blocks modify ( - col - constraint dbmspcc_blocks_col_nn not null enable - )]'; - execute immediate q'[ - alter table dbmspcc_blocks modify ( - covered - constraint dbmspcc_blocks_covered_nn not null enable - )]'; - execute immediate q'[ - alter table dbmspcc_blocks modify ( - not_feasible - constraint dbmspcc_blocks_not_feasible_nn not null enable - )]'; - execute immediate q'[ - alter table dbmspcc_blocks - add constraint dbmspcc_blocks_block_ck check ( block >= 0 ) enable]'; - execute immediate q'[ - alter table dbmspcc_blocks - add constraint dbmspcc_blocks_line_ck check ( line >= 0 ) enable]'; - execute immediate q'[ - alter table dbmspcc_blocks - add constraint dbmspcc_blocks_col_ck check ( col >= 0 ) enable]'; - execute immediate q'[ - alter table dbmspcc_blocks - add constraint dbmspcc_blocks_covered_ck check ( covered in ( - 0, - 1 - ) ) enable]'; - execute immediate q'[ - alter table dbmspcc_blocks - add constraint dbmspcc_blocks_not_feasible_ck check ( not_feasible in ( - 0, - 1 - ) ) enable]'; - execute immediate q'[ - alter table dbmspcc_blocks - add constraint dbmspcc_blocks_pk primary key ( run_id, - object_id, - block ) - using index enable]'; + line number(38, 0) constraint dbmspcc_blocks_line_nn not null enable, + col number(38, 0) constraint dbmspcc_blocks_col_nn not null enable, + covered number(1, 0) constraint dbmspcc_blocks_covered_nn not null enable, + not_feasible number(1, 0) constraint dbmspcc_blocks_not_feasible_nn not null enable, + constraint dbmspcc_blocks_block_ck check ( block >= 0 ) enable, + constraint dbmspcc_blocks_line_ck check ( line >= 0 ) enable, + constraint dbmspcc_blocks_col_ck check ( col >= 0 ) enable, + constraint dbmspcc_blocks_covered_ck check ( covered in ( 0, 1 ) ) enable, + constraint dbmspcc_blocks_not_feasible_ck check ( not_feasible in ( 0, 1 ) ) enable, + constraint dbmspcc_blocks_pk primary key ( run_id, object_id, block ) using index + ) on commit preserve rows]'; end if; end; / @@ -82,31 +34,13 @@ begin select synonym_name from all_synonyms where synonym_name = 'DBMSPCC_RUNS' and owner = sys_context('USERENV','CURRENT_SCHEMA')); if l_tab_exist = 0 then execute immediate q'[ - create table dbmspcc_runs ( + create global temporary table dbmspcc_runs ( run_id number(38, 0), run_comment varchar2(4000 byte), - run_owner varchar2(128 byte), - run_timestamp date - )]'; - execute immediate q'[ - create unique index dbmspcc_runs_pk on - dbmspcc_runs ( - run_id - )]'; - execute immediate q'[ - alter table dbmspcc_runs modify ( - run_owner - constraint dbmspcc_runs_run_owner_nn not null enable - )]'; - execute immediate q'[ - alter table dbmspcc_runs modify ( - run_timestamp - constraint dbmspcc_runs_run_timestamp_nn not null enable - )]'; - execute immediate q'[ - alter table dbmspcc_runs - add constraint dbmspcc_runs_pk primary key ( run_id ) - using index enable]'; + run_owner varchar2(128 byte) constraint dbmspcc_runs_run_owner_nn not null enable, + run_timestamp date constraint dbmspcc_runs_run_timestamp_nn not null enable, + constraint dbmspcc_runs_pk primary key ( run_id ) using index enable + ) on commit preserve rows]'; end if; end; / @@ -119,45 +53,15 @@ begin select synonym_name from all_synonyms where synonym_name = 'DBMSPCC_UNITS' and owner = sys_context('USERENV','CURRENT_SCHEMA')); if l_tab_exist = 0 then execute immediate q'[ - create table dbmspcc_units ( + create global temporary table dbmspcc_units ( run_id number(38, 0), object_id number(38, 0), - owner varchar2(128 byte), - name varchar2(128 byte), - type varchar2(12 byte), - last_ddl_time date - )]'; - execute immediate q'[ - create unique index dbmspcc_units_pk on - dbmspcc_units ( - run_id, - object_id - )]'; - execute immediate q'[ - alter table dbmspcc_units modify ( - owner - constraint dbmspcc_units_owner_nn not null enable - )]'; - execute immediate q'[ - alter table dbmspcc_units modify ( - name - constraint dbmspcc_units_name_nn not null enable - )]'; - execute immediate q'[ - alter table dbmspcc_units modify ( - type - constraint dbmspcc_units_type_nn not null enable - )]'; - execute immediate q'[ - alter table dbmspcc_units modify ( - last_ddl_time - constraint dbmspcc_units_last_ddl_time_nn not null enable - )]'; - execute immediate q'[ - alter table dbmspcc_units - add constraint dbmspcc_units_pk primary key ( run_id, - object_id ) - using index enable]'; + owner varchar2(128 byte) constraint dbmspcc_units_owner_nn not null enable, + name varchar2(128 byte) constraint dbmspcc_units_name_nn not null enable, + type varchar2(12 byte) constraint dbmspcc_units_type_nn not null enable, + last_ddl_time date constraint dbmspcc_units_last_ddl_time_nn not null enable, + constraint dbmspcc_units_pk primary key ( run_id, object_id ) using index enable + ) on commit preserve rows]'; end if; end; / diff --git a/source/core/coverage/ut_coverage.pkb b/source/core/coverage/ut_coverage.pkb index 2fc5c4aec..5754cf4e9 100644 --- a/source/core/coverage/ut_coverage.pkb +++ b/source/core/coverage/ut_coverage.pkb @@ -161,9 +161,7 @@ create or replace package body ut_coverage is l_run_comment varchar2(200) := 'utPLSQL Code coverage run '||ut_utils.to_string(systimestamp); begin if not is_develop_mode() and not g_is_started then - $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then ut_coverage_helper_block.coverage_start( l_run_comment, g_coverage_id(gc_block_coverage) ); - $end ut_coverage_helper_profiler.coverage_start( l_run_comment, g_coverage_id(gc_proftab_coverage) ); coverage_pause(); g_is_started := true; @@ -200,9 +198,7 @@ create or replace package body ut_coverage is begin if not is_develop_mode() then g_is_started := false; - $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then ut_coverage_helper_block.coverage_stop(); - $end ut_coverage_helper_profiler.coverage_stop(); g_is_started := false; end if; diff --git a/source/core/coverage/ut_coverage_helper.pkb b/source/core/coverage/ut_coverage_helper.pkb index dd703e6f1..12ee9e1f7 100644 --- a/source/core/coverage/ut_coverage_helper.pkb +++ b/source/core/coverage/ut_coverage_helper.pkb @@ -44,7 +44,6 @@ create or replace package body ut_coverage_helper is pragma autonomous_transaction; begin execute immediate 'truncate table ut_coverage_sources_tmp'; - commit; end; function is_tmp_table_populated return boolean is diff --git a/source/core/coverage/ut_coverage_helper_block.pkb b/source/core/coverage/ut_coverage_helper_block.pkb index e8342a105..fc64c507f 100644 --- a/source/core/coverage/ut_coverage_helper_block.pkb +++ b/source/core/coverage/ut_coverage_helper_block.pkb @@ -49,28 +49,24 @@ create or replace package body ut_coverage_helper_block is end; function block_results(a_object_owner varchar2, a_object_name varchar2, a_coverage_id integer) return t_block_rows is - l_raw_coverage sys_refcursor; l_coverage_rows t_block_rows; - l_ut3_owner varchar2(128) := ut_utils.ut_owner(); begin - open l_raw_coverage for 'select ccb.line - ,count(ccb.block) totalblocks - ,sum(ccb.covered) + select ccb.line as line, + count(ccb.block) as blocks, + sum(ccb.covered) as covered_blocks + bulk collect into l_coverage_rows from dbmspcc_units ccu left outer join dbmspcc_blocks ccb on ccu.run_id = ccb.run_id and ccu.object_id = ccb.object_id - where ccu.run_id = :a_coverage_id - and ccu.owner = :a_object_owner - and ccu.name = :a_object_name + where ccu.run_id = a_coverage_id + and ccu.owner = a_object_owner + and ccu.name = a_object_name group by ccb.line - order by 1' using a_coverage_id,a_object_owner,a_object_name; + order by 1; - fetch l_raw_coverage bulk collect into l_coverage_rows; - close l_raw_coverage; - - return l_coverage_rows; + return l_coverage_rows; end; function get_raw_coverage_data(a_object_owner varchar2, a_object_name varchar2, a_coverage_id integer) return ut_coverage_helper.t_unit_line_calls is diff --git a/source/core/types/ut_suite_cache_row.tps b/source/core/types/ut_suite_cache_row.tps new file mode 100644 index 000000000..6817be5ec --- /dev/null +++ b/source/core/types/ut_suite_cache_row.tps @@ -0,0 +1,40 @@ +create type ut_suite_cache_row as object ( + /* + utPLSQL - Version 3 + Copyright 2016 - 2019 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + id number(22,0), + self_type varchar2(250 byte), + path varchar2(1000 byte), + object_owner varchar2(250 byte), + object_name varchar2(250 byte), + name varchar2(250 byte), + line_no number, + parse_time timestamp (6), + description varchar2(4000 byte), + rollback_type number, + disabled_flag number, + warnings ut_varchar2_rows, + before_all_list ut_executables, + after_all_list ut_executables, + before_each_list ut_executables, + before_test_list ut_executables, + after_each_list ut_executables, + after_test_list ut_executables, + expected_error_codes ut_integer_list, + tags ut_varchar2_rows, + item ut_executable_test +) +/ \ No newline at end of file diff --git a/source/core/types/ut_suite_cache_rows.tps b/source/core/types/ut_suite_cache_rows.tps new file mode 100644 index 000000000..660f934cf --- /dev/null +++ b/source/core/types/ut_suite_cache_rows.tps @@ -0,0 +1,19 @@ +create type ut_suite_cache_rows as + /* + utPLSQL - Version 3 + Copyright 2016 - 2019 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + table of ut_suite_cache_row +/ \ No newline at end of file diff --git a/source/core/ut_suite_cache.sql b/source/core/ut_suite_cache.sql index e4bf52439..a7f998f83 100644 --- a/source/core/ut_suite_cache.sql +++ b/source/core/ut_suite_cache.sql @@ -1,9 +1,4 @@ -create or replace type ut_suite_contexts as table of ut_suite_context -/ -create or replace type ut_tests as table of ut_test -/ - -create table ut_suite_cache ( +create table ut_suite_cache /* utPLSQL - Version 3 Copyright 2016 - 2019 utPLSQL Project @@ -17,28 +12,7 @@ create table ut_suite_cache ( See the License for the specific language governing permissions and limitations under the License. */ - id, - self_type, - path, - object_owner, - object_name, - name, - line_no, - parse_time, - description, - rollback_type, - disabled_flag, - warnings, - before_all_list, - after_all_list, - before_each_list, - before_test_list, - after_each_list, - after_test_list, - expected_error_codes, - tags, - item -) + of ut_suite_cache_row nested table warnings store as ut_suite_cache_warnings nested table before_all_list store as ut_suite_cache_before_all nested table after_all_list store as ut_suite_cache_after_all @@ -48,32 +22,6 @@ create table ut_suite_cache ( nested table after_test_list store as ut_suite_cache_after_test nested table expected_error_codes store as ut_suite_cache_throws nested table tags store as ut_suite_cache_tags return as locator - as - select - cast(null as number(22)) id, - c.self_type, - c.path, - c.object_owner, - c.object_name, - c.name, - c.line_no, - c.parse_time, - c.description, - c.rollback_type, - c.disabled_flag, - c.warnings, - c.before_all_list, - c.after_all_list, - t.before_each_list, - t.before_test_list, - t.after_each_list, - t.after_test_list, - t.expected_error_codes, - t.tags, - t.item - from table(ut_suite_contexts(ut_suite_context(user,'package_name','ctx_name',1))) c - cross join table(ut_tests(ut_test(user,'package_name','test_name',1))) t - where rownum < 0 / alter table ut_suite_cache modify (object_owner not null, path not null, self_type not null, object_name not null, name not null, parse_time not null) @@ -88,9 +36,3 @@ alter table ut_suite_cache add constraint ut_suite_cache_uk2 unique (object_owne alter table ut_suite_cache add constraint ut_suite_cache_schema_fk foreign key (object_owner, object_name) references ut_suite_cache_package(object_owner, object_name) on delete cascade / - -drop type ut_tests -/ - -drop type ut_suite_contexts -/ diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index b8b548a4b..f5c472e29 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -16,6 +16,210 @@ create or replace package body ut_suite_cache_manager is limitations under the License. */ + /* + * Private code + */ + + gc_get_cache_suite_sql constant varchar2(32767) := + q'[with + suite_items as ( + select /*+ cardinality(c 100) */ value(c) as obj + from ut_suite_cache c + where 1 = 1 + and c.object_owner = :l_object_owner + and ( {:path:} + and {:object_name:} + and {:procedure_name:} + ) + ) + ), + {:tags:} + suitepaths as ( + select distinct substr(c.obj.path,1,instr(c.obj.path,'.',-1)-1) as suitepath, + c.obj.path as path, + c.obj.object_owner as object_owner + from {:suite_item_name:} c + where c.obj.self_type = 'UT_SUITE' + ), + gen as ( + select rownum as pos + from xmltable('1 to 20') + ), + suitepath_part AS ( + select distinct + substr(b.suitepath, 1, instr(b.suitepath || '.', '.', 1, g.pos) -1) as path, + object_owner + from suitepaths b + join gen g + on g.pos <= regexp_count(b.suitepath, '\w+') + ), + logical_suite_data as ( + select 'UT_LOGICAL_SUITE' as self_type, p.path, p.object_owner, + upper( substr(p.path, instr( p.path, '.', -1 ) + 1 ) ) as object_name, + cast(null as ut_executables) as x, + cast(null as ut_integer_list) as y, + cast(null as ut_executable_test) as z + from suitepath_part p + where p.path + not in (select s.path from suitepaths s) + ), + logical_suites as ( + select ut_suite_cache_row( + null, + s.self_type, s.path, s.object_owner, s.object_name, + s.object_name, null, null, null, null, 0, + ut_varchar2_rows(), + s.x, s.x, s.x, s.x, s.x, s.x, + s.y, null, s.z + ) as obj + from logical_suite_data s + ), + items as ( + select obj from {:suite_item_name:} + union all + select obj from logical_suites + ) + select c.obj + from items c + order by c.obj.object_owner,{:random_seed:}]'; + + function get_missing_cache_objects(a_object_owner varchar2) return ut_varchar2_rows is + l_result ut_varchar2_rows; + l_data ut_annotation_objs_cache_info; + begin + l_data := ut_annotation_cache_manager.get_annotations_objects_info(a_object_owner, 'PACKAGE'); + + select i.object_name + bulk collect into l_result + from ut_suite_cache_package i + where not exists ( + select 1 from table(l_data) o + where o.object_owner = i.object_owner + and o.object_name = i.object_name + and o.object_type = 'PACKAGE' + ) + and i.object_owner = a_object_owner; + return l_result; + end; + + + function get_path_sql(a_path in varchar2) return varchar2 is + begin + return case when a_path is not null then q'[ + :l_path||'.' like c.path || '.%' /*all children and self*/ + or ( c.path||'.' like :l_path || '.%' --all parents + ]' + else ' :l_path is null and ( :l_path is null ' end; + end; + + function get_object_name_sql(a_object_name in varchar2) return varchar2 is + begin + return case when a_object_name is not null + then ' c.object_name = :a_object_name ' + else ' :a_object_name is null' end; + end; + + function get_procedure_name_sql(a_procedure_name in varchar2) return varchar2 is + begin + return case when a_procedure_name is not null + then ' c.name = :a_procedure_name' + else ' :a_procedure_name is null' end; + end; + + function get_tags_sql(a_tags_count in integer) return varchar2 is + begin + return case when a_tags_count > 0 then + q'[filter_tags as ( + select c.obj.path as path + from suite_items c + where c.obj.tags multiset intersect :a_tag_list is not empty + ), + suite_items_tags as ( + select c.* + from suite_items c + where exists ( + select 1 from filter_tags t + where t.path||'.' like c.obj.path || '.%' /*all children and self*/ + or c.obj.path||'.' like t.path || '.%' --all parents + ) + ),]' + else + q'[dummy as (select 'x' from dual where :a_tag_list is null ),]' + end; + end; + + function get_random_seed_sql(a_random_seed positive) return varchar2 is + begin + return case + when a_random_seed is null then q'[ + replace( + case + when c.obj.self_type in ( 'UT_TEST' ) + then substr(c.obj.path, 1, instr(c.obj.path, '.', -1) ) + else c.obj.path + end, '.', chr(0) + ) desc nulls last, + c.obj.object_name desc, + c.obj.line_no, + :a_random_seed]' + else + ' ut_runner.hash_suite_path( + c.obj.path, :a_random_seed + ) desc nulls last' + end; + end; + + + + /* + * Public code + */ + function get_cached_suite_rows( + a_object_owner varchar2, + a_path varchar2 := null, + a_object_name varchar2 := null, + a_procedure_name varchar2 := null, + a_random_seed positive := null, + a_tags ut_varchar2_rows := null + ) return ut_suite_cache_rows is + l_path varchar2(4000); + l_results ut_suite_cache_rows := ut_suite_cache_rows(); + l_sql varchar2(32767); + l_suite_item_name varchar2(20); + l_tags ut_varchar2_rows := coalesce(a_tags,ut_varchar2_rows()); + l_object_owner varchar2(250) := ut_utils.qualified_sql_name(a_object_owner); + l_object_name varchar2(250) := ut_utils.qualified_sql_name(a_object_name); + l_procedure_name varchar2(250) := ut_utils.qualified_sql_name(a_procedure_name); + begin + if a_path is null and a_object_name is not null then + select min(c.path) + into l_path + from ut_suite_cache c + where c.object_owner = upper(l_object_owner) + and c.object_name = upper(l_object_name) + and c.name = nvl(upper(l_procedure_name), c.name); + else + l_path := lower(ut_utils.qualified_sql_name(a_path)); + end if; + l_suite_item_name := case when l_tags.count > 0 then 'suite_items_tags' else 'suite_items' end; + + l_sql := gc_get_cache_suite_sql; + l_sql := replace(l_sql,'{:suite_item_name:}',l_suite_item_name); + l_sql := replace(l_sql,'{:object_owner:}',upper(l_object_owner)); + l_sql := replace(l_sql,'{:path:}',get_path_sql(l_path)); + l_sql := replace(l_sql,'{:object_name:}',get_object_name_sql(l_object_name)); + l_sql := replace(l_sql,'{:procedure_name:}',get_procedure_name_sql(l_procedure_name)); + l_sql := replace(l_sql,'{:tags:}',get_tags_sql(l_tags.count)); + l_sql := replace(l_sql,'{:random_seed:}',get_random_seed_sql(a_random_seed)); + + ut_event_manager.trigger_event(ut_event_manager.gc_debug, ut_key_anyvalues().put('l_sql',l_sql) ); + + execute immediate l_sql + bulk collect into l_results + using upper(l_object_owner), l_path, l_path, upper(a_object_name), upper(a_procedure_name), l_tags, a_random_seed; + return l_results; + end; + function get_schema_parse_time(a_schema_name varchar2) return timestamp result_cache is l_cache_parse_time timestamp; begin @@ -133,26 +337,95 @@ create or replace package body ut_suite_cache_manager is s.t.expected_error_codes as expected_error_codes, s.t.tags as test_tags, s.t.item as item from tests s; - + end if; end if; commit; end; - procedure remove_from_cache(a_schema_name varchar2, a_objects ut_varchar2_rows) is + procedure remove_missing_objs_from_cache(a_schema_name varchar2) is + l_objects ut_varchar2_rows; pragma autonomous_transaction; begin + l_objects := get_missing_cache_objects(a_schema_name); delete from ut_suite_cache i where i.object_owner = a_schema_name - and i.object_name in ( select column_value from table (a_objects) ); + and i.object_name in ( select column_value from table (l_objects) ); delete from ut_suite_cache_package i where i.object_owner = a_schema_name - and i.object_name in ( select column_value from table (a_objects) ); + and i.object_name in ( select column_value from table (l_objects) ); commit; end; + function get_cached_suite_info( + a_object_owner varchar2, + a_object_name varchar2 + ) return ut_suite_items_info is + l_cache_rows ut_suite_cache_rows; + l_results ut_suite_items_info; + begin + l_cache_rows := get_cached_suite_rows( a_object_owner, a_object_name ); + select ut_suite_item_info( + c.object_owner, c.object_name, c.name, + c.description, c.self_type, c.line_no, + c.path, c.disabled_flag, c.tags + ) + bulk collect into l_results + from table(l_cache_rows) c; + + return l_results; + end; + + function get_cached_packages( + a_schema_names ut_varchar2_rows + ) return ut_object_names is + l_results ut_object_names; + begin + select ut_object_name( c.object_owner, c.object_name ) + bulk collect into l_results + from ut_suite_cache_package c + join table ( a_schema_names ) s + on c.object_owner = upper(s.column_value); + return l_results; + end; + + function suite_item_exists( + a_owner_name varchar2, + a_package_name varchar2, + a_procedure_name varchar2 + ) return boolean is + l_count integer; + begin + if a_procedure_name is not null then + select count( 1 ) into l_count from dual + where exists( + select 1 + from ut_suite_cache c + where c.object_owner = a_owner_name + and c.object_name = a_package_name + and c.name = a_procedure_name + ); + elsif a_package_name is not null then + select count( 1 ) into l_count from dual + where exists( + select 1 + from ut_suite_cache_package c + where c.object_owner = a_owner_name + and c.object_name = a_package_name + ); + else + select count( 1 ) into l_count from dual + where exists( + select 1 + from ut_suite_cache_package c + where c.object_owner = a_owner_name + ); + end if; + + return l_count > 0; + end; end ut_suite_cache_manager; / diff --git a/source/core/ut_suite_cache_manager.pks b/source/core/ut_suite_cache_manager.pks index 03816ee70..d5b31ccee 100644 --- a/source/core/ut_suite_cache_manager.pks +++ b/source/core/ut_suite_cache_manager.pks @@ -20,6 +20,9 @@ create or replace package ut_suite_cache_manager authid definer is * Responsible for storing and retrieving suite data from cache */ + /* + * Saves suite items for individual package in suite cache + */ procedure save_object_cache( a_object_owner varchar2, a_object_name varchar2, @@ -27,9 +30,59 @@ create or replace package ut_suite_cache_manager authid definer is a_suite_items ut_suite_items ); + /* + * Returns time when schema was last saved in cache + */ function get_schema_parse_time(a_schema_name varchar2) return timestamp result_cache; - procedure remove_from_cache(a_schema_name varchar2, a_objects ut_varchar2_rows); + /* + * Removes packages that are no longer annotated from cache + */ + procedure remove_missing_objs_from_cache(a_schema_name varchar2); + + /* + * Retrieves suite items data from cache. + * Returned data is not filtered by user access rights. + * Not to be used publicly. Used internally for building suites at runtime. + */ + function get_cached_suite_rows( + a_object_owner varchar2, + a_path varchar2 := null, + a_object_name varchar2 := null, + a_procedure_name varchar2 := null, + a_random_seed positive := null, + a_tags ut_varchar2_rows := null + ) return ut_suite_cache_rows; + + /* + * Retrieves suite item info rows from cache. + * Returned data is not filtered by user access rights. + * Not to be used publicly. Used internally for building suites info. + */ + function get_cached_suite_info( + a_object_owner varchar2, + a_object_name varchar2 + ) return ut_suite_items_info; + + /* + * Retrieves list of cached suite packages. + * Returned data is not filtered by user access rights. + * Not to be used publicly. Used internally. + */ + function get_cached_packages( + a_schema_names ut_varchar2_rows + ) return ut_object_names; + + /* + * Returns true if given suite item exists in cache. + * Returned data is not filtered by user access rights. + * Not to be used publicly. Used internally. + */ + function suite_item_exists( + a_owner_name varchar2, + a_package_name varchar2, + a_procedure_name varchar2 + ) return boolean; end ut_suite_cache_manager; / diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index d0449e838..e71a51dc8 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -18,70 +18,6 @@ create or replace package body ut_suite_manager is gc_suitpath_error_message constant varchar2(100) := 'Suitepath exceeds 1000 CHAR on: '; - gc_get_cache_suite_sql constant varchar2(32767) := - q'[with - suite_items as ( - select /*+ cardinality(c 100) */ c.* - from {:owner:}.ut_suite_cache c - where 1 = 1 {:object_list:} - and c.object_owner = '{:object_owner:}' - and ( {:path:} - and {:object_name:} - and {:procedure_name:} - ) - ) - ), - {:tags:}, - suitepaths as ( - select distinct substr(path,1,instr(path,'.',-1)-1) as suitepath, - path, - object_owner - from {:suite_item_name:} - where self_type = 'UT_SUITE' - ), - gen as ( - select rownum as pos - from xmltable('1 to 20') - ), - suitepath_part AS ( - select distinct - substr(b.suitepath, 1, instr(b.suitepath || '.', '.', 1, g.pos) -1) as path, - object_owner - from suitepaths b - join gen g - on g.pos <= regexp_count(b.suitepath, '\w+') - ), - logical_suite_data as ( - select 'UT_LOGICAL_SUITE' as self_type, p.path, p.object_owner, - upper( substr(p.path, instr( p.path, '.', -1 ) + 1 ) ) as object_name, - cast(null as {:owner:}.ut_executables) as x, - cast(null as {:owner:}.ut_integer_list) as y, - cast(null as {:owner:}.ut_executable_test) as z - from suitepath_part p - where p.path - not in (select s.path from suitepaths s) - ), - logical_suites as ( - select to_number(null) as id, s.self_type, s.path, s.object_owner, s.object_name, - s.object_name as name, null as line_no, null as parse_time, - null as description, null as rollback_type, 0 as disabled_flag, - {:owner:}.ut_varchar2_rows() as warnings, - s.x as before_all_list, s.x as after_all_list, - s.x as before_each_list, s.x as before_test_list, - s.x as after_each_list, s.x as after_test_list, - s.y as expected_error_codes, null as test_tags, - s.z as item - from logical_suite_data s - ), - items as ( - select * from {:suite_item_name:} - union all - select * from logical_suites - ) - select c.* - from items c - order by c.object_owner,{:random_seed:}]'; - type t_path_item is record ( object_name varchar2(250), procedure_name varchar2(250), @@ -90,9 +26,9 @@ create or replace package body ut_suite_manager is type t_path_items is table of t_path_item; type t_schema_paths is table of t_path_items index by varchar2(250 char); - subtype t_cached_suite is ut_suite_cache%rowtype; - type tt_cached_suites is table of t_cached_suite; - type t_cached_suites_cursor is ref cursor return t_cached_suite; + cursor c_cached_suites_cursor is select * from table(ut_suite_cache_rows()); + type tt_cached_suites is table of c_cached_suites_cursor%rowtype; + type t_cached_suites_cursor is ref cursor return c_cached_suites_cursor%rowtype; type t_item_levels is table of ut_suite_items index by binary_integer; ------------------ @@ -395,110 +331,6 @@ create or replace package body ut_suite_manager is close a_suite_data_cursor; end reconstruct_from_cache; - function get_missing_objects(a_object_owner varchar2) return ut_varchar2_rows is - l_rows sys_refcursor; - l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_cursor_text varchar2(32767); - l_result ut_varchar2_rows; - l_object_owner varchar2(250); - l_data ut_annotation_objs_cache_info; - begin - l_object_owner := ut_utils.qualified_sql_name(a_object_owner); - l_data := ut_annotation_cache_manager.get_annotations_objects_info(a_object_owner, 'PACKAGE'); - l_cursor_text := - q'[select i.object_name - from ]'||l_ut_owner||q'[.ut_suite_cache_package i - where - not exists ( - select 1 from table(:l_data) o - where o.object_owner = i.object_owner - and o.object_name = i.object_name - and o.object_type = 'PACKAGE' - ) - and i.object_owner = ']'||l_object_owner||q'[']'; - open l_rows for l_cursor_text using l_data; - fetch l_rows bulk collect into l_result limit 1000000; - close l_rows; - return l_result; - end; - - function get_object_names_sql(a_skip_all_objects boolean ) return varchar2 is - begin - return case when not a_skip_all_objects then q'[ - and exists - ( select 1 - from all_objects a - where a.object_name = c.object_name - and a.owner = '{:object_owner:}' - and a.owner = c.object_owner - and a.object_type = 'PACKAGE' - )]' else null end; - end; - - function get_path_sql(a_path in varchar2) return varchar2 is - begin - return case when a_path is not null then q'[ - :l_path||'.' like c.path || '.%' /*all children and self*/ - or ( c.path||'.' like :l_path || '.%' --all parents - ]' - else ' :l_path is null and ( :l_path is null ' end; - end; - - function get_object_name_sql(a_object_name in varchar2) return varchar2 is - begin - return case when a_object_name is not null - then ' c.object_name = :a_object_name ' - else ' :a_object_name is null' end; - end; - - function get_procedure_name_sql(a_procedure_name in varchar2) return varchar2 is - begin - return case when a_procedure_name is not null - then ' c.name = :a_procedure_name' - else ' :a_procedure_name is null' end; - end; - - function get_tags_sql(a_tags_count in integer) return varchar2 is - begin - return case when a_tags_count > 0 then - q'[filter_tags as ( - select c.* - from suite_items c - where c.tags multiset intersect :a_tag_list is not empty - ), - suite_items_tags as ( - select c.* from suite_items c - where exists (select 1 from filter_tags t where - t.path||'.' like c.path || '.%' /*all children and self*/ - or c.path||'.' like t.path || '.%' --all parents - ) - )]' - else - q'[dummy as (select 'x' from dual where :a_tag_list is null )]' - end; - end; - - function get_random_seed_sql(a_random_seed positive) return varchar2 is - begin - return case - when a_random_seed is null then q'[ - replace( - case - when c.self_type in ( 'UT_TEST' ) - then substr(c.path, 1, instr(c.path, '.', -1) ) - else c.path - end, '.', chr(0) - ) desc nulls last, - c.object_name desc, - c.line_no, - :a_random_seed]' - else - ' {:owner:}.ut_runner.hash_suite_path( - c.path, :a_random_seed - ) desc nulls last' - end; - end; - function get_cached_suite_data( a_object_owner varchar2, a_path varchar2 := null, @@ -508,45 +340,32 @@ create or replace package body ut_suite_manager is a_random_seed positive, a_tags ut_varchar2_rows := null ) return t_cached_suites_cursor is - l_path varchar2(4000); - l_result sys_refcursor; - l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_sql varchar2(32767); - l_suite_item_name varchar2(20); - l_tags ut_varchar2_rows := coalesce(a_tags,ut_varchar2_rows()); - l_object_owner varchar2(250); - l_object_name varchar2(250); - l_procedure_name varchar2(250); + l_unfiltered_rows ut_suite_cache_rows; + l_result t_cached_suites_cursor; begin - l_object_owner := ut_utils.qualified_sql_name(a_object_owner); - l_object_name := ut_utils.qualified_sql_name(a_object_name); - l_procedure_name := ut_utils.qualified_sql_name(a_procedure_name); - if a_path is null and a_object_name is not null then - execute immediate 'select min(path) - from '||l_ut_owner||q'[.ut_suite_cache - where object_owner = :a_object_owner - and object_name = :a_object_name - and name = nvl(:a_procedure_name, name)]' - into l_path using upper(l_object_owner), upper(l_object_name), upper(a_procedure_name); + l_unfiltered_rows := ut_suite_cache_manager.get_cached_suite_rows( + a_object_owner, + a_path, + a_object_name, + a_procedure_name, + a_random_seed, + a_tags + ); + if a_skip_all_objects then + open l_result for + select c.* from table(l_unfiltered_rows) c; else - l_path := lower(ut_utils.qualified_sql_name(a_path)); + open l_result for + select c.* from table(l_unfiltered_rows) c + where exists + ( select 1 + from all_objects a + where a.object_name = c.object_name + and a.owner = c.object_owner + and a.object_type = 'PACKAGE' + ); end if; - l_suite_item_name := case when l_tags.count > 0 then 'suite_items_tags' else 'suite_items' end; - - l_sql := gc_get_cache_suite_sql; - l_sql := replace(l_sql,'{:suite_item_name:}',l_suite_item_name); - l_sql := replace(l_sql,'{:object_list:}',get_object_names_sql(a_skip_all_objects)); - l_sql := replace(l_sql,'{:object_owner:}',upper(l_object_owner)); - l_sql := replace(l_sql,'{:path:}',get_path_sql(l_path)); - l_sql := replace(l_sql,'{:object_name:}',get_object_name_sql(l_object_name)); - l_sql := replace(l_sql,'{:procedure_name:}',get_procedure_name_sql(l_procedure_name)); - l_sql := replace(l_sql,'{:tags:}',get_tags_sql(l_tags.count)); - l_sql := replace(l_sql,'{:random_seed:}',get_random_seed_sql(a_random_seed)); - l_sql := replace(l_sql,'{:owner:}',l_ut_owner); - - ut_event_manager.trigger_event(ut_event_manager.gc_debug, ut_key_anyvalues().put('l_sql',l_sql) ); - - open l_result for l_sql using l_path, l_path, upper(a_object_name), upper(a_procedure_name), l_tags, a_random_seed; + return l_result; end; @@ -615,7 +434,7 @@ create or replace package body ut_suite_manager is build_and_cache_suites(a_owner_name, l_annotations_cursor); if can_skip_all_objects_scan(a_owner_name) or ut_metadata.is_object_visible( 'dba_objects') then - ut_suite_cache_manager.remove_from_cache( a_owner_name, get_missing_objects(a_owner_name) ); + ut_suite_cache_manager.remove_missing_objs_from_cache( a_owner_name ); end if; ut_event_manager.trigger_event('refresh_cache - end'); @@ -680,41 +499,12 @@ create or replace package body ut_suite_manager is end; function get_schema_ut_packages(a_schema_names ut_varchar2_rows) return ut_object_names is - l_results ut_object_names := ut_object_names( ); - l_schema_names ut_varchar2_rows; - l_object_names ut_varchar2_rows; - l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_need_all_objects_scan boolean := true; begin - -- if current user is the onwer or current user has execute any procedure privilege - if ut_metadata.user_has_execute_any_proc() - or (a_schema_names is not null and a_schema_names.count = 1 - and sys_context('userenv','current_schema') = a_schema_names(1)) - then - l_need_all_objects_scan := false; - end if; - for i in 1 .. a_schema_names.count loop refresh_cache(a_schema_names(i)); end loop; - execute immediate 'select c.object_owner, c.object_name - from '||l_ut_owner||q'[.ut_suite_cache_package c - join table ( :a_schema_names ) s - on c.object_owner = upper(s.column_value)]' - || case when l_need_all_objects_scan then q'[ - where exists - (select 1 from all_objects a - where a.owner = c.object_owner - and a.object_name = c.object_name - and a.object_type = 'PACKAGE') - ]' end - bulk collect into l_schema_names, l_object_names using a_schema_names; - l_results.extend( l_schema_names.count ); - for i in 1 .. l_schema_names.count loop - l_results( i ) := ut_object_name( l_schema_names( i ), l_object_names( i ) ); - end loop; - return l_results; + return ut_suite_cache_manager.get_cached_packages( a_schema_names ); end; function get_schema_names(a_paths ut_varchar2_list) return ut_varchar2_rows is @@ -793,136 +583,64 @@ create or replace package body ut_suite_manager is a_owner_name varchar2, a_package_name varchar2 := null ) return sys_refcursor is - l_result sys_refcursor; - l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_owner_name varchar2(250); - l_package_name varchar2(250); + l_result sys_refcursor; + l_all_suite_info ut_suite_items_info; + l_owner_name varchar2(250) := ut_utils.qualified_sql_name(a_owner_name); + l_package_name varchar2(250) := ut_utils.qualified_sql_name(a_package_name); begin - l_owner_name := ut_utils.qualified_sql_name(a_owner_name); - l_package_name := ut_utils.qualified_sql_name(a_package_name); refresh_cache(l_owner_name); - - open l_result for - q'[with - suite_items as ( - select /*+ cardinality(c 100) */ c.* - from ]'||l_ut_owner||q'[.ut_suite_cache c - where 1 = 1 ]'||case when can_skip_all_objects_scan(l_owner_name) then q'[ - and exists - ( select 1 - from all_objects a - where a.object_name = c.object_name - and a.owner = ']'||upper(l_owner_name)||q'[' - and a.owner = c.object_owner - and a.object_type = 'PACKAGE' - )]' end ||q'[ - and c.object_owner = ']'||upper(l_owner_name)||q'[' - and ]' - || case when l_package_name is not null - then 'c.object_name = :a_package_name' - else ':a_package_name is null' end - || q'[ - ), - suitepaths as ( - select distinct - substr(path,1,instr(path,'.',-1)-1) as suitepath, - path, - object_owner - from suite_items - where self_type = 'UT_SUITE' - ), - gen as ( - select rownum as pos - from xmltable('1 to 20') - ), - suitepath_part AS ( - select distinct - substr(b.suitepath, 1, instr(b.suitepath || '.', '.', 1, g.pos) -1) as path, - object_owner - from suitepaths b - join gen g - on g.pos <= regexp_count(b.suitepath, '\w+') - ), - logical_suites as ( - select 'UT_LOGICAL_SUITE' as item_type, - p.path, p.object_owner, - upper( substr(p.path, instr( p.path, '.', -1 ) + 1 ) ) as object_name - from suitepath_part p - where p.path - not in (select s.path from suitepaths s) - ), - items as ( - select object_owner, object_name, name as item_name, - description as item_description, self_type as item_type, line_no as item_line_no, - path, disabled_flag,tags - from suite_items - union all - select object_owner, object_name, object_name as item_name, - null as item_description, item_type, null as item_line_no, - s.path, 0 as disabled_flag, ]'||l_ut_owner||q'[.ut_varchar2_rows() as tags - from logical_suites s - ) - select ]'||l_ut_owner||q'[.ut_suite_item_info( - object_owner, object_name, item_name, item_description, - item_type, item_line_no, path, disabled_flag, tags - ) - from items c]' using upper(l_package_name); + l_all_suite_info := ut_suite_cache_manager.get_cached_suite_info( l_owner_name, l_package_name ); + if can_skip_all_objects_scan( l_owner_name ) then + open l_result for + select value(c) + from table(l_all_suite_info) c + order by c.object_owner, c.object_name, c.item_line_no; + else + open l_result for + select value(c) + from table(l_all_suite_info) c + where exists + ( select 1 + from all_objects a + where a.object_name = c.object_name + and a.owner = c.object_owner + and a.object_type = 'PACKAGE' + ) + order by c.object_owner, c.object_name, c.item_line_no; + end if; return l_result; end; function suite_item_exists( a_owner_name varchar2, a_package_name varchar2 := null, - a_procedure_name varchar2 := null, - a_item_type varchar2 := null + a_procedure_name varchar2 := null ) return boolean is - l_result integer; - l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_owner_name varchar2(250); - l_package_name varchar2(250); - l_procedure_name varchar2(250); + l_count integer := 1; + l_item_exists boolean; + l_owner_name varchar2(250) := upper(a_owner_name); + l_package_name varchar2(250) := upper(a_package_name); + l_procedure_name varchar2(250) := upper(a_procedure_name); begin - l_owner_name := ut_utils.qualified_sql_name(a_owner_name); - l_package_name := ut_utils.qualified_sql_name(a_package_name); - l_procedure_name := ut_utils.qualified_sql_name(a_procedure_name); refresh_cache(l_owner_name); + l_item_exists := ut_suite_cache_manager.suite_item_exists( l_owner_name, l_package_name, l_procedure_name ); + if not can_skip_all_objects_scan( l_owner_name ) then + select count(1) + into l_count + from dual c + where exists + ( select 1 + from all_objects a + where a.object_name = l_package_name + and a.owner = l_owner_name + and a.object_type = 'PACKAGE' + ); + end if; - execute immediate q'[ - select count(1) from dual - where exists ( - select 1 - from ]'||l_ut_owner||q'[.ut_suite_cache c - where 1 = 1 ]'||case when not can_skip_all_objects_scan(l_owner_name) then q'[ - and exists - ( select 1 - from all_objects a - where a.object_name = c.object_name - and a.owner = :a_owner_name - and a.owner = c.object_owner - and a.object_type = 'PACKAGE' - )]' else q'[ - and :a_owner_name is not null ]' end ||q'[ - and c.object_owner = :a_owner_name - and ]' - || case when l_package_name is not null - then 'c.object_name = :a_package_name' - else ':a_package_name is null' end - || q'[ - and ]' - || case when l_procedure_name is not null - then 'c.name = :a_procedure_name' - else ':a_procedure_name is null' end - || q'[ - )]' - into l_result - using - upper(l_owner_name), upper(l_owner_name), - upper(l_package_name), upper(l_procedure_name); - - return l_result > 0; + return l_count > 0 and l_item_exists; end; end ut_suite_manager; diff --git a/source/core/ut_suite_manager.pks b/source/core/ut_suite_manager.pks index fe492b049..093201b36 100644 --- a/source/core/ut_suite_manager.pks +++ b/source/core/ut_suite_manager.pks @@ -24,6 +24,8 @@ create or replace package ut_suite_manager authid current_user is * @private * * Returns a list of Unit Test packages that exist in a given database schema + * IMPORTANT! The returned list is not filtered by user privileges. + * To be used internally only. * * @param a_schema_names list of schemas to return the information for * @return array containing unit test schema and object names @@ -99,8 +101,7 @@ create or replace package ut_suite_manager authid current_user is function suite_item_exists( a_owner_name varchar2, a_package_name varchar2 := null, - a_procedure_name varchar2 := null, - a_item_type varchar2 := null + a_procedure_name varchar2 := null ) return boolean; diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index bbcdb5533..5157278fc 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -488,11 +488,11 @@ create or replace package body ut_utils is return l_xpath; end; - procedure cleanup_temp_tables is + procedure cleanup_session_temp_tables is begin - execute immediate 'delete from ut_compound_data_tmp'; - execute immediate 'delete from ut_compound_data_diff_tmp'; - execute immediate 'delete from ut_json_data_diff_tmp'; + execute immediate 'truncate table dbmspcc_blocks'; + execute immediate 'truncate table dbmspcc_units'; + execute immediate 'truncate table dbmspcc_runs'; end; function to_version(a_version_no varchar2) return t_version is diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index a39c28ded..0ce50d24c 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -136,6 +136,8 @@ create or replace package ut_utils authid definer is gc_bc_fetch_limit constant integer := 1000; gc_diff_max_rows constant integer := 20; + gc_max_objects_fetch_limit constant integer := 1000000; + /** * Regexp to validate tag */ @@ -307,7 +309,11 @@ create or replace package ut_utils authid definer is function to_xpath(a_list ut_varchar2_list, a_ancestors varchar2 := '/*/') return varchar2; - procedure cleanup_temp_tables; + /* + * Truncates session-level GTT's (on commit preserve rows) + * IMPORTANT: Procedure will do an implicit commit when called + */ + procedure cleanup_session_temp_tables; /** * Converts version string into version record diff --git a/source/create_grants.sql b/source/create_grants.sql index 0562db067..5749d5dac 100644 --- a/source/create_grants.sql +++ b/source/create_grants.sql @@ -122,9 +122,8 @@ grant execute on &&ut3_owner..ut_annotation_obj_cache_info to &ut3_user; --other grants grant execute on &&ut3_owner..ut_executables to &ut3_user; grant execute on &&ut3_owner..ut_executable_test to &ut3_user; -grant select on &&ut3_owner..ut_suite_cache to &ut3_user; -grant select on &&ut3_owner..ut_suite_cache_package to &ut3_user; -grant select on &&ut3_owner..ut_suite_cache_schema to &ut3_user; +grant execute on &&ut3_owner..ut_suite_cache_row to &ut3_user; +grant execute on &&ut3_owner..ut_suite_cache_rows to &ut3_user; grant select, insert, delete, update on &&ut3_owner..dbmspcc_blocks to &ut3_user; grant select, insert, delete, update on &&ut3_owner..dbmspcc_runs to &ut3_user; diff --git a/source/install.sql b/source/install.sql index c8eab658c..0e28fa3ab 100644 --- a/source/install.sql +++ b/source/install.sql @@ -57,6 +57,10 @@ alter session set current_schema = &&ut3_owner; @@install_component.sql 'reporters/ut_ansiconsole_helper.pks' @@install_component.sql 'reporters/ut_ansiconsole_helper.pkb' +@@install_component.sql 'api/ut_suite_item_info.tps' +@@install_component.sql 'api/ut_suite_item_info.tpb' +@@install_component.sql 'api/ut_suite_items_info.tps' + --event manager objects @@install_component.sql 'core/events/ut_event_item.tps' @@install_component.sql 'core/events/ut_event_listener.tps' @@ -133,10 +137,13 @@ alter session set current_schema = &&ut3_owner; @@install_component.sql 'core/annotations/ut_annotation_manager.pkb' --suite builder +@@install_component.sql 'core/types/ut_suite_cache_row.tps' +@@install_component.sql 'core/types/ut_suite_cache_rows.tps' @@install_component.sql 'core/ut_suite_cache_schema.sql' @@install_component.sql 'core/ut_suite_cache_package.sql' @@install_component.sql 'core/ut_suite_cache_seq.sql' @@install_component.sql 'core/ut_suite_cache.sql' + @@install_component.sql 'core/ut_suite_cache_manager.pks' @@install_component.sql 'core/ut_suite_cache_manager.pkb' @@install_component.sql 'core/ut_suite_builder.pks' @@ -295,9 +302,6 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'reporters/ut_documentation_reporter.tpb' --plugin interface API for running utPLSQL -@@install_component.sql 'api/ut_suite_item_info.tps' -@@install_component.sql 'api/ut_suite_item_info.tpb' -@@install_component.sql 'api/ut_suite_items_info.tps' @@install_component.sql 'api/ut_runner.pks' @@install_component.sql 'api/ut_runner.pkb' diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index 9d2c0d61e..6b98bf19c 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -70,6 +70,10 @@ drop package ut_suite_cache_manager; drop table ut_suite_cache purge; +drop type ut_suite_cache_rows force; + +drop type ut_suite_cache_row force; + drop sequence ut_suite_cache_seq; drop table ut_suite_cache_package purge; From eaff7205951e5483aa38b58bc177e2a010b6ff9d Mon Sep 17 00:00:00 2001 From: Travis CI Date: Fri, 28 Jun 2019 16:56:37 +0000 Subject: [PATCH 0539/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 2ee57e734..814427880 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 26a5219c5..ea6912a6c 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 0e57dc100..2750b8a46 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 01e774cd8..aca29d08d 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index dec4f9d56..37a3350bc 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index adec48834..f7e24e0b3 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index bcf2473e2..6ffd06876 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 57e874620..5e5840553 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 8b7912c73..fdcdc5bd7 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index af7c6db8b..de6bb1073 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index bc29686c1..560538572 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 323c303b3..b2e450ffb 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index b8d394162..46906e9bb 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index d6dc62a5b..d69a823a6 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index ef4c9d680..7e7e9545b 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index e7c405fdd..d1534b105 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 999372318..1d5ac79f4 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3126--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index d65ce08c8..f4da8525a 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -776,7 +776,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.8.3126-develop + * secion v3.1.8.3135-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 0c0d80c39..db04a80de 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.8.3126-develop'; + gc_version constant varchar2(50) := 'v3.1.8.3135-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 611114f689e48eae53cb2cf1b7c4bd8cf6cbecd2 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Tue, 2 Jul 2019 00:04:12 +0200 Subject: [PATCH 0540/1096] fixes #961 - separate warnings and errors with two linefeeds instead of one --- source/reporters/ut_realtime_reporter.tpb | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/source/reporters/ut_realtime_reporter.tpb b/source/reporters/ut_realtime_reporter.tpb index 7a3176ee6..64eb343e5 100644 --- a/source/reporters/ut_realtime_reporter.tpb +++ b/source/reporters/ut_realtime_reporter.tpb @@ -15,7 +15,7 @@ create or replace type body ut_realtime_reporter is See the License for the specific language governing permissions and limitations under the License. */ - + constructor function ut_realtime_reporter( self in out nocopy ut_realtime_reporter ) return self as result is @@ -101,13 +101,13 @@ create or replace type body ut_realtime_reporter is self.print_node('error', to_char(a_run.results_count.errored_count)); self.print_node('warning', to_char(a_run.results_count.warnings_count)); self.print_end_node('counter'); - self.print_cdata_node('errorStack', ut_utils.table_to_clob(a_run.get_error_stack_traces())); + self.print_cdata_node('errorStack', ut_utils.table_to_clob(a_run.get_error_stack_traces(), chr(10)||chr(10))); self.print_cdata_node('serverOutput', a_run.get_serveroutputs()); self.print_end_node('run'); self.print_end_node('event'); self.flush_print_buffer('post-run'); end after_calling_run; - + overriding member procedure before_calling_suite( self in out nocopy ut_realtime_reporter, a_suite in ut_logical_suite @@ -139,9 +139,9 @@ create or replace type body ut_realtime_reporter is self.print_node('error', to_char(a_suite.results_count.errored_count)); self.print_node('warning', to_char(a_suite.results_count.warnings_count)); self.print_end_node('counter'); - self.print_cdata_node('errorStack', ut_utils.table_to_clob(a_suite.get_error_stack_traces())); + self.print_cdata_node('errorStack', ut_utils.table_to_clob(a_suite.get_error_stack_traces(), chr(10)||chr(10))); self.print_cdata_node('serverOutput', a_suite.get_serveroutputs()); - self.print_cdata_node('warnings', ut_utils.table_to_clob(a_suite.warnings)); + self.print_cdata_node('warnings', ut_utils.table_to_clob(a_suite.warnings, chr(10)||chr(10))); self.print_end_node('suite'); self.print_end_node('event'); self.flush_print_buffer('post-suite'); @@ -162,7 +162,7 @@ create or replace type body ut_realtime_reporter is self.print_end_node('event'); self.flush_print_buffer('pre-test'); end before_calling_test; - + overriding member procedure after_calling_test( self in out nocopy ut_realtime_reporter, a_test in ut_test @@ -183,7 +183,7 @@ create or replace type body ut_realtime_reporter is self.print_node('error', to_char(a_test.results_count.errored_count)); self.print_node('warning', to_char(a_test.results_count.warnings_count)); self.print_end_node('counter'); - self.print_cdata_node('errorStack', ut_utils.table_to_clob(a_test.get_error_stack_traces())); + self.print_cdata_node('errorStack', ut_utils.table_to_clob(a_test.get_error_stack_traces(), chr(10)||chr(10))); self.print_cdata_node('serverOutput', a_test.get_serveroutputs()); if a_test.failed_expectations.count > 0 then self.print_start_node('failedExpectations'); @@ -197,7 +197,7 @@ create or replace type body ut_realtime_reporter is end loop expectations; self.print_end_node('failedExpectations'); end if; - self.print_cdata_node('warnings', ut_utils.table_to_clob(a_test.warnings)); + self.print_cdata_node('warnings', ut_utils.table_to_clob(a_test.warnings, chr(10)||chr(10))); self.print_end_node('test'); self.print_end_node('event'); self.flush_print_buffer('post-test'); @@ -225,7 +225,7 @@ create or replace type body ut_realtime_reporter is 0, 1 ); end print_start_node; - + member procedure print_end_node( self in out nocopy ut_realtime_reporter, a_name in varchar2 @@ -244,7 +244,7 @@ create or replace type body ut_realtime_reporter is self.print_xml_fragment('<' || a_name || '>' || dbms_xmlgen.convert(a_content) || ''); end if; end print_node; - + member procedure print_cdata_node( self in out nocopy ut_realtime_reporter, a_name in varchar2, @@ -267,7 +267,7 @@ create or replace type body ut_realtime_reporter is ut_utils.append_to_list(print_buffer, lpad(' ', 2 * current_indent) || a_fragment); current_indent := current_indent + a_indent_summand_after; end print_xml_fragment; - + member procedure flush_print_buffer( self in out nocopy ut_realtime_reporter, a_item_type in varchar2 From 32728c0a6596be720ef797b0090fe855f6f280ee Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 1 Jul 2019 22:37:26 +0000 Subject: [PATCH 0541/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 814427880..208f6c896 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index ea6912a6c..d04819a5e 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 2750b8a46..064bc9459 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index aca29d08d..be4ec42f0 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 37a3350bc..7d696d524 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index f7e24e0b3..aefa1fc70 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 6ffd06876..610717a26 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 5e5840553..3b51abae6 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index fdcdc5bd7..797cf5d57 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index de6bb1073..70334b6cb 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 560538572..cd0be7597 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index b2e450ffb..5bd1b7523 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 46906e9bb..6c8bdbfe9 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index d69a823a6..fdb546d7e 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 7e7e9545b..c8bfb5225 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index d1534b105..8d7768fce 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 1d5ac79f4..99fbc5f6f 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3135--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index f4da8525a..43d207894 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -776,7 +776,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.8.3135-develop + * secion v3.1.8.3139-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index db04a80de..2d08f2618 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.8.3135-develop'; + gc_version constant varchar2(50) := 'v3.1.8.3139-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From c83f41934536fb3208f94a2b25141e8697df4402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 2 Jul 2019 02:09:31 +0100 Subject: [PATCH 0542/1096] Update create_grants.sql --- source/create_grants.sql | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/create_grants.sql b/source/create_grants.sql index 5749d5dac..96fcb7cfa 100644 --- a/source/create_grants.sql +++ b/source/create_grants.sql @@ -111,9 +111,13 @@ grant execute on &&ut3_owner..ut_debug_reporter to &ut3_user; grant execute on &&ut3_owner..ut_reporters to &ut3_user; grant execute on &&ut3_owner..ut_reporter_base to &ut3_user; grant execute on &&ut3_owner..ut_output_reporter_base to &ut3_user; +grant execute on &&ut3_owner..ut_coverage_reporter_base to &ut3_user; +grant execute on &&ut3_owner..ut_console_reporter_base to &ut3_user; --outputs grant execute on &&ut3_owner..ut_output_buffer_base to &ut3_user; +grant execute on &&ut3_owner..ut_output_table_buffer to &ut3_user; +grant execute on &&ut3_owner..ut_output_clob_table_buffer to &ut3_user; --needed internally for selecting from annotation objects within packages that use invoker rights grant execute on &&ut3_owner..ut_annotation_objs_cache_info to &ut3_user; From e2ff899e96486f6f8cd426f3b61327da5b59fb31 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 2 Jul 2019 02:12:37 +0100 Subject: [PATCH 0543/1096] Added `package` to annotation warnings. Resolves #960 --- source/core/ut_suite_builder.pkb | 47 ++++++++++++--------- test/ut3_tester/core/test_suite_builder.pkb | 8 ++-- 2 files changed, 31 insertions(+), 24 deletions(-) diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index d3de777db..101ab2179 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -95,6 +95,27 @@ create or replace package body ut_suite_builder is by_name tt_annotations_by_name ); + function get_qualified_object_name( + a_suite ut_suite_item, a_procedure_name t_object_name + ) return varchar2 is + l_result varchar2(1000); + begin + if a_suite is not null then + l_result := upper( a_suite.object_owner || '.' || a_suite.object_name ); + if a_procedure_name is not null then + l_result := l_result || upper( '.' || a_procedure_name ); + end if; + end if; + return l_result; + end; + + function get_object_reference( + a_suite ut_suite_item, a_procedure_name t_object_name, a_line_no binary_integer + ) return varchar2 is + begin + return chr( 10 ) || 'at package "' || get_qualified_object_name(a_suite, a_procedure_name) || '", line ' || a_line_no; + end; + procedure delete_annotations_range( a_annotations in out nocopy t_annotations_info, a_start_pos t_annotation_position, @@ -131,20 +152,6 @@ create or replace package body ut_suite_builder is -- Processing annotations ----------------------------------------------- - function get_qualified_object_name( - a_suite ut_suite_item, a_procedure_name t_object_name - ) return varchar2 is - l_result varchar2(1000); - begin - if a_suite is not null then - l_result := upper( a_suite.object_owner || '.' || a_suite.object_name ); - if a_procedure_name is not null then - l_result := l_result || upper( '.' || a_procedure_name ); - end if; - end if; - return l_result; - end; - procedure add_annotation_ignored_warning( a_suite in out nocopy ut_suite_item, a_annotation t_annotation_name, @@ -154,8 +161,8 @@ create or replace package body ut_suite_builder is ) is begin a_suite.put_warning( - replace(a_message,'%%%','"--%'||a_annotation||'"') || ' Annotation ignored.' - || chr( 10 ) || 'at "' || get_qualified_object_name(a_suite, a_procedure_name) || '", line ' || a_line_no + replace(a_message,'%%%','"--%'||a_annotation||'"') + || ' Annotation ignored.' || get_object_reference( a_suite, a_procedure_name, a_line_no ) ); end; @@ -271,8 +278,8 @@ create or replace package body ut_suite_builder is if l_exception_number is null then a_suite.put_warning( - 'Invalid parameter value "'||l_throws_list(i)||'" for "--%throws" annotation. Parameter ignored.' - || chr( 10 ) || 'at "' || get_qualified_object_name(a_suite, a_procedure_name) || '", line ' || a_line_no + 'Invalid parameter value "'||l_throws_list(i) + ||'" for "--%throws" annotation. Parameter ignored.'||get_object_reference( a_suite, a_procedure_name, a_line_no ) ); else l_exception_number_list.extend; @@ -291,7 +298,7 @@ create or replace package body ut_suite_builder is if a_throws_ann_text(l_annotation_pos) is null then a_suite.put_warning( '"--%throws" annotation requires a parameter. Annotation ignored.' - || chr( 10 ) || 'at "' || get_qualified_object_name(a_suite, a_procedure_name) || '", line ' || l_annotation_pos + || get_object_reference( a_suite, a_procedure_name, l_annotation_pos ) ); else a_list := @@ -321,7 +328,7 @@ create or replace package body ut_suite_builder is if a_tags_ann_text(l_annotation_pos) is null then a_suite.put_warning( '"--%tags" annotation requires a tag value populated. Annotation ignored.' - || chr( 10 ) || 'at "' || get_qualified_object_name(a_suite, a_procedure_name) || '", line ' || l_annotation_pos + || get_object_reference( a_suite, a_procedure_name, l_annotation_pos ) ); else l_tag_list := l_tag_list multiset union distinct ut_utils.trim_list_elements( diff --git a/test/ut3_tester/core/test_suite_builder.pkb b/test/ut3_tester/core/test_suite_builder.pkb index 523d31a3d..b49ecb2da 100644 --- a/test/ut3_tester/core/test_suite_builder.pkb +++ b/test/ut3_tester/core/test_suite_builder.pkb @@ -619,7 +619,7 @@ create or replace package body test_suite_builder is ut.expect(l_actual).to_match('(.*)()(.*)(Annotation "--%beforeeach")(.*)(line 3)(.*)()(.*)', 'n'); ut.expect(l_actual).to_match('(.*)()(.*)(Annotation "--%aftereach")(.*)(line 4)(.*)()(.*)', 'n'); ut.expect(l_actual).to_match('(.*)()(.*)(Annotation "--%afterall" cannot be used with "--%test". Annotation ignored.)' - ||'(.*)(at "UT3_TESTER.SOME_PACKAGE.DO_STUFF", line 5)(.*)()(.*)', 'n'); + ||'(.*)(at package "UT3_TESTER.SOME_PACKAGE.DO_STUFF", line 5)(.*)()(.*)', 'n'); ut.expect(l_actual).not_to_be_like('%%'); ut.expect(l_actual).not_to_be_like('%%'); ut.expect(l_actual).not_to_be_like('%%'); @@ -791,7 +791,7 @@ create or replace package body test_suite_builder is l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); --Assert ut.expect(l_actual).to_be_like( - '%Invalid annotation "--\%context". Cannot find following "--\%endcontext". Annotation ignored.%at "UT3_TESTER.SOME_PACKAGE", line 4%' + '%Invalid annotation "--\%context". Cannot find following "--\%endcontext". Annotation ignored.%at package "UT3_TESTER.SOME_PACKAGE", line 4%' ,'\' ); ut.expect(l_actual).to_be_like( @@ -835,7 +835,7 @@ create or replace package body test_suite_builder is l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); --Assert ut.expect(l_actual).to_be_like( - '%Invalid annotation "--\%endcontext". Cannot find preceding "--\%context". Annotation ignored.%at "UT3_TESTER.SOME_PACKAGE", line 9%' + '%Invalid annotation "--\%endcontext". Cannot find preceding "--\%context". Annotation ignored.%at package "UT3_TESTER.SOME_PACKAGE", line 9%' ,'\' ); ut.expect(l_actual).to_be_like( @@ -892,7 +892,7 @@ create or replace package body test_suite_builder is l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); --Assert ut.expect(l_actual).to_be_like( - '%Context name must be unique in a suite. Context and all of it's content ignored.%at "UT3_TESTER.SOME_PACKAGE", line 9%' + '%Context name must be unique in a suite. Context and all of it's content ignored.%at package "UT3_TESTER.SOME_PACKAGE", line 9%' ,'\' ); ut.expect(l_actual).to_be_like( From 2cc0d0541d6ada69897b6bc2b7ae65f34fa5c333 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 2 Jul 2019 01:21:08 +0000 Subject: [PATCH 0544/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 208f6c896..400f0cf5f 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index d04819a5e..1a64157e0 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 064bc9459..ace7386d1 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index be4ec42f0..d14fa2848 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 7d696d524..7bede822a 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index aefa1fc70..f04d22454 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 610717a26..778ec3403 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 3b51abae6..e06e54d8d 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 797cf5d57..348c2fc94 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 70334b6cb..76dd724cc 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index cd0be7597..34dd463f9 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 5bd1b7523..6972cf9ee 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 6c8bdbfe9..4940d2497 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index fdb546d7e..b1b8e5f81 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index c8bfb5225..7fe76ecc3 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 8d7768fce..04bd77b15 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 99fbc5f6f..28c4e282b 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3139--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 43d207894..e3c9f0b85 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -776,7 +776,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.8.3139-develop + * secion v3.1.8.3142-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 2d08f2618..c05892972 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.8.3139-develop'; + gc_version constant varchar2(50) := 'v3.1.8.3142-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From f4cfe930f818874f6a1a4a14d3a36d900d9c32dc Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 2 Jul 2019 09:43:32 +0000 Subject: [PATCH 0545/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 400f0cf5f..0e77a667c 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 1a64157e0..a72b1cfff 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index ace7386d1..90625903e 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index d14fa2848..cce617502 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 7bede822a..80a0bae10 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index f04d22454..740faa06f 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 778ec3403..50d65867e 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index e06e54d8d..2ce0d79ce 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 348c2fc94..504a67917 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 76dd724cc..91bb694db 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 34dd463f9..74ccecaca 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 6972cf9ee..848252599 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 4940d2497..8ccc4e278 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index b1b8e5f81..888db4adf 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 7fe76ecc3..91c8de0aa 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 04bd77b15..1bbcde963 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 28c4e282b..383c09dff 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3142--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index e3c9f0b85..ecd990a75 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -776,7 +776,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.8.3142-develop + * secion v3.1.8.3145-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index c05892972..7479177f8 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.8.3142-develop'; + gc_version constant varchar2(50) := 'v3.1.8.3145-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 8e6ea38d0c84e3397c9b0730d6088be1d9ffcf73 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Tue, 2 Jul 2019 16:46:33 +0200 Subject: [PATCH 0546/1096] ignore cobertura.xml which is created by a test run (#965) --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 059e3d5b4..be442d164 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ tfs_test_results.xml junit_test_results.xml test_results.xml *debug*.xml +cobertura.xml From 5599e96617d5e036e1d1a953c63bc7f68cbc25a8 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 2 Jul 2019 15:57:37 +0000 Subject: [PATCH 0547/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 0e77a667c..0633898f2 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index a72b1cfff..d10fa0292 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 90625903e..36c5871d8 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index cce617502..c078e79e4 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 80a0bae10..2ae93d915 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 740faa06f..195289392 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 50d65867e..8b8ac890e 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 2ce0d79ce..9b0196e0e 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 504a67917..b0d3d95d9 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 91bb694db..3e6b003b5 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 74ccecaca..970237723 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 848252599..d896ad382 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 8ccc4e278..612214806 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 888db4adf..cc9eb09a0 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 91c8de0aa..e957b6186 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 1bbcde963..eb06fd8c3 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 383c09dff..a88220dae 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3145--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index ecd990a75..f8c411ec1 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -776,7 +776,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.8.3145-develop + * secion v3.1.8.3148-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 7479177f8..779f941c7 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.8.3145-develop'; + gc_version constant varchar2(50) := 'v3.1.8.3148-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From f5fa46800c1bfe5f5db56a2b6ca759b97e49e7c0 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 2 Jul 2019 01:43:30 +0100 Subject: [PATCH 0548/1096] [WIP] Ability to run expectations without test > TODO - documentation updates Added ability to run expectations without tests. Expectation, when executed without test is reporter straight to dbms_output. So it is now possible to execute: `exec ut.expect(1).to_equal(0);` And get result: ``` FAILURE Actual: 1 (number) was expected to equal: 0 (number) ``` Resolves #956 Additionally: - utPLSQL is now cleaning up the application_info after run. - utPLSQL is setting session context during run, making it possible to access some of utPLSQL info within the test procedures directly. Resolves #781 The information is provided in sys_context(`UT3_INFO`,...). Following attributes are getting populated: - Always: - RUN_PATHS - SUITE_DESCRIPTION - SUITE_PACKAGE - SUITE_PATH - SUITE_START_TIME - CURRENT_EXECUTABLE_NAME - CURRENT_EXECUTABLE_TYPE - When running in suite context - CONTEXT_NAME - CONTEXT_PATH - CONTEXT_START_TIME - After first executable in suite - TIME_IN_SUITE - After first executable in suite context - TIME_IN_CONTEXT - When running a test or before/after each/test - TEST_DESCRIPTION - TEST_NAME - TEST_START_TIME - After first executable in test - TIME_IN_TEST --- .travis/install_utplsql_release.sh | 2 + source/api/ut_runner.pkb | 1 + .../session_context/ut_session_context.pkb | 52 +++ .../session_context/ut_session_context.pks | 45 ++ .../core/session_context/ut_session_info.tpb | 199 +++++++++ .../core/session_context/ut_session_info.tps | 52 +++ source/core/types/ut_executable.tpb | 4 - source/core/types/ut_executable_test.tpb | 17 + source/core/types/ut_reporter_info.tps | 2 +- source/core/types/ut_suite.tpb | 6 +- source/core/types/ut_test.tpb | 2 +- source/core/ut_expectation_processor.pkb | 17 +- source/core/ut_suite_cache_manager.pkb | 4 +- source/core/ut_utils.pkb | 10 - source/core/ut_utils.pks | 10 - source/install.sql | 15 +- source/uninstall_objects.sql | 4 + test/install_ut3_user_tests.sql | 2 + test/ut3_tester_helper/main_helper.pkb | 12 +- test/ut3_tester_helper/main_helper.pks | 4 + test/ut3_user/api/test_ut_run.pkb | 389 +++++++++++++++++- test/ut3_user/api/test_ut_run.pks | 51 ++- test/ut3_user/expectations.pkb | 31 ++ test/ut3_user/expectations.pks | 14 + 24 files changed, 899 insertions(+), 46 deletions(-) create mode 100644 source/core/session_context/ut_session_context.pkb create mode 100644 source/core/session_context/ut_session_context.pks create mode 100644 source/core/session_context/ut_session_info.tpb create mode 100644 source/core/session_context/ut_session_info.tps create mode 100644 test/ut3_user/expectations.pkb create mode 100644 test/ut3_user/expectations.pks diff --git a/.travis/install_utplsql_release.sh b/.travis/install_utplsql_release.sh index 6dc56c3f3..3e608b08f 100755 --- a/.travis/install_utplsql_release.sh +++ b/.travis/install_utplsql_release.sh @@ -43,6 +43,8 @@ fi "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA < gc_context_name, attribute => a_name ); + end; + + procedure clear_all_context is + begin + dbms_session.clear_all_context( namespace => gc_context_name ); + end; + + function is_ut_run return boolean is + l_paths varchar2(32767); + begin + l_paths := sys_context(gc_context_name, 'RUN_PATHS'); + return l_paths is not null; + end; + + function get_namespace return varchar2 is + begin + return gc_context_name; + end; + +end; +/ \ No newline at end of file diff --git a/source/core/session_context/ut_session_context.pks b/source/core/session_context/ut_session_context.pks new file mode 100644 index 000000000..bbe256db4 --- /dev/null +++ b/source/core/session_context/ut_session_context.pks @@ -0,0 +1,45 @@ +create or replace package ut_session_context as + /* + utPLSQL - Version 3 + Copyright 2016 - 2019 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + /* + * Sets value of a context + */ + procedure set_context(a_name varchar2, a_value varchar2); + + /* + * Clears value of a context + */ + procedure clear_context(a_name varchar2); + + /* + * Clears entire context for utPLSQL run + */ + procedure clear_all_context; + + /* + * Returns true, if session context UT3_INFO is not empty + */ + function is_ut_run return boolean; + + /* + * Returns utPLSQL session context namespace name + */ + function get_namespace return varchar2; + +end; +/ \ No newline at end of file diff --git a/source/core/session_context/ut_session_info.tpb b/source/core/session_context/ut_session_info.tpb new file mode 100644 index 000000000..398ff0067 --- /dev/null +++ b/source/core/session_context/ut_session_info.tpb @@ -0,0 +1,199 @@ +create or replace type body ut_session_info as + /* + utPLSQL - Version 3 + Copyright 2016 - 2019 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + constructor function ut_session_info(self in out nocopy ut_session_info) return self as result is + begin + self.self_type := $$plsql_unit; + dbms_application_info.read_client_info( client_info ); + dbms_application_info.read_module( module, action ); + return; + end; + + -- run hooks + member procedure before_calling_run(self in out nocopy ut_session_info, a_run in ut_run) is + begin + ut_session_context.set_context( 'run_paths', ut_utils.to_string( ut_utils.table_to_clob( a_run.run_paths,',' ), null ) ); + dbms_application_info.set_module( 'utPLSQL', null ); + end; + + member procedure after_calling_run(self in out nocopy ut_session_info, a_run in ut_run) is + begin + ut_session_context.clear_context( 'run_paths' ); + dbms_application_info.set_module( module, action ); + dbms_application_info.set_client_info( client_info ); + end; + + -- suite hooks + member procedure before_calling_suite(self in out nocopy ut_session_info, a_suite in ut_logical_suite) is + begin + if a_suite is not of (ut_suite_context) then + suite_start_time := a_suite.start_time; + ut_session_context.set_context( 'suite_path', a_suite.path ); + ut_session_context.set_context( 'suite_package', a_suite.object_owner||'.'||a_suite.object_name ); + ut_session_context.set_context( 'suite_description', a_suite.description ); + ut_session_context.set_context( 'suite_start_time', ut_utils.to_string(suite_start_time) ); + dbms_application_info.set_module( 'utPLSQL', a_suite.object_name ); + else + context_start_time := a_suite.start_time; + ut_session_context.set_context( 'context_name', a_suite.name ); + ut_session_context.set_context( 'context_path', a_suite.path); + ut_session_context.set_context( 'context_description', a_suite.description ); + ut_session_context.set_context( 'context_start_time', ut_utils.to_string(context_start_time) ); + end if; + end; + + member procedure after_calling_suite(self in out nocopy ut_session_info, a_suite in ut_logical_suite) is + begin + if a_suite is not of (ut_suite_context) then + ut_session_context.clear_context( 'suite_package' ); + ut_session_context.clear_context( 'suite_path' ); + ut_session_context.clear_context( 'suite_description' ); + ut_session_context.clear_context( 'suite_start_time' ); + ut_session_context.clear_context( 'time_in_suite' ); + suite_start_time := null; + else + ut_session_context.clear_context( 'context_name' ); + ut_session_context.clear_context( 'context_path' ); + ut_session_context.clear_context( 'context_description' ); + ut_session_context.clear_context( 'context_start_time' ); + ut_session_context.clear_context( 'time_in_context' ); + context_start_time := null; + end if; + end; + + + member procedure before_calling_test(self in out nocopy ut_session_info, a_test in ut_test) is + begin + test_start_time := a_test.start_time; + ut_session_context.set_context( 'test_name', a_test.object_owner||'.'||a_test.object_name||'.'||a_test.name ); + ut_session_context.set_context( 'test_description', a_test.description ); + ut_session_context.set_context( 'test_start_time', ut_utils.to_string(test_start_time) ); + end; + + member procedure after_calling_test (self in out nocopy ut_session_info, a_test in ut_test) is + begin + ut_session_context.clear_context( 'test_name' ); + ut_session_context.clear_context( 'test_description' ); + ut_session_context.clear_context( 'test_start_time' ); + ut_session_context.clear_context( 'time_in_test' ); + test_start_time := null; + end; + + member procedure before_calling_executable(self in out nocopy ut_session_info, a_executable in ut_executable) is + begin + ut_session_context.set_context( 'current_executable_type', a_executable.executable_type ); + ut_session_context.set_context( + 'current_executable_name', + a_executable.owner_name||'.'||a_executable.object_name||'.'||a_executable.procedure_name + ); + dbms_application_info.set_client_info( a_executable.procedure_name ); + if suite_start_time is not null then + ut_session_context.set_context( 'time_in_suite', current_timestamp - suite_start_time ); + if context_start_time is not null then + ut_session_context.set_context( 'time_in_context', current_timestamp - context_start_time ); + end if; + if test_start_time is not null then + ut_session_context.set_context( 'time_in_test', current_timestamp - test_start_time ); + end if; + end if; + end; + + member procedure after_calling_executable(self in out nocopy ut_session_info, a_executable in ut_executable) is + begin + ut_session_context.clear_context( 'current_executable_type' ); + ut_session_context.clear_context( 'current_executable_name' ); + dbms_application_info.set_client_info( null ); + end; + + member procedure on_finalize(self in out nocopy ut_session_info, a_run in ut_run) is + begin + dbms_application_info.set_client_info( client_info ); + dbms_application_info.set_module( module, action ); + ut_session_context.clear_all_context(); + end; + + overriding member function get_supported_events return ut_varchar2_list is + begin + return ut_varchar2_list( + ut_event_manager.gc_before_run, + ut_event_manager.gc_before_suite, + ut_event_manager.gc_before_test, + ut_event_manager.gc_before_before_all, + ut_event_manager.gc_before_before_each, + ut_event_manager.gc_before_before_test, + ut_event_manager.gc_before_test_execute, + ut_event_manager.gc_before_after_test, + ut_event_manager.gc_before_after_each, + ut_event_manager.gc_before_after_all, + ut_event_manager.gc_after_run, + ut_event_manager.gc_after_suite, + ut_event_manager.gc_after_test, + ut_event_manager.gc_after_before_all, + ut_event_manager.gc_after_before_each, + ut_event_manager.gc_after_before_test, + ut_event_manager.gc_after_test_execute, + ut_event_manager.gc_after_after_test, + ut_event_manager.gc_after_after_each, + ut_event_manager.gc_after_after_all, + ut_event_manager.gc_finalize + ); + end; + + overriding member procedure on_event( self in out nocopy ut_session_info, a_event_name varchar2, a_event_item ut_event_item) is + begin + case + when a_event_name in ( + ut_event_manager.gc_before_before_all, + ut_event_manager.gc_before_before_each, + ut_event_manager.gc_before_before_test, + ut_event_manager.gc_before_test_execute, + ut_event_manager.gc_before_after_test, + ut_event_manager.gc_before_after_each, + ut_event_manager.gc_before_after_all + ) + then before_calling_executable(treat(a_event_item as ut_executable)); + when a_event_name in ( + ut_event_manager.gc_after_before_all, + ut_event_manager.gc_after_before_each, + ut_event_manager.gc_after_before_test, + ut_event_manager.gc_after_test_execute, + ut_event_manager.gc_after_after_test, + ut_event_manager.gc_after_after_each, + ut_event_manager.gc_after_after_all + ) + then after_calling_executable(treat(a_event_item as ut_executable)); + when a_event_name = ut_event_manager.gc_before_test + then self.before_calling_test(treat(a_event_item as ut_test)); + when a_event_name = ut_event_manager.gc_after_test + then self.after_calling_test(treat(a_event_item as ut_test)); + when a_event_name = ut_event_manager.gc_after_suite + then after_calling_suite(treat(a_event_item as ut_logical_suite)); + when a_event_name = ut_event_manager.gc_before_suite + then before_calling_suite(treat(a_event_item as ut_logical_suite)); + when a_event_name = ut_event_manager.gc_before_run + then before_calling_run(treat(a_event_item as ut_run)); + when a_event_name = ut_event_manager.gc_after_run + then after_calling_run(treat(a_event_item as ut_run)); + when a_event_name = ut_event_manager.gc_finalize + then on_finalize(treat(a_event_item as ut_run)); + else null; + end case; + end; + +end; +/ \ No newline at end of file diff --git a/source/core/session_context/ut_session_info.tps b/source/core/session_context/ut_session_info.tps new file mode 100644 index 000000000..451d7b8f6 --- /dev/null +++ b/source/core/session_context/ut_session_info.tps @@ -0,0 +1,52 @@ +create or replace type ut_session_info under ut_event_listener ( + /* + utPLSQL - Version 3 + Copyright 2016 - 2019 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + module varchar2(4000), + action varchar2(4000), + client_info varchar2(4000), + suite_start_time timestamp, + context_start_time timestamp, + test_start_time timestamp, + constructor function ut_session_info(self in out nocopy ut_session_info) return self as result, + + member procedure before_calling_run(self in out nocopy ut_session_info, a_run in ut_run), + member procedure after_calling_run (self in out nocopy ut_session_info, a_run in ut_run), + + member procedure before_calling_suite(self in out nocopy ut_session_info, a_suite in ut_logical_suite), + member procedure after_calling_suite(self in out nocopy ut_session_info, a_suite in ut_logical_suite), + + member procedure before_calling_executable(self in out nocopy ut_session_info, a_executable in ut_executable), + member procedure after_calling_executable (self in out nocopy ut_session_info, a_executable in ut_executable), + + member procedure before_calling_test(self in out nocopy ut_session_info, a_test in ut_test), + member procedure after_calling_test (self in out nocopy ut_session_info, a_test in ut_test), + + member procedure on_finalize(self in out nocopy ut_session_info, a_run in ut_run), + + /** + * Returns the list of events that are supported by particular implementation of the reporter + */ + overriding member function get_supported_events return ut_varchar2_list, + + /** + * Delegates execution of event into individual reporting procedures + */ + overriding member procedure on_event( self in out nocopy ut_session_info, a_event_name varchar2, a_event_item ut_event_item) + +) final +/ \ No newline at end of file diff --git a/source/core/types/ut_executable.tpb b/source/core/types/ut_executable.tpb index 060f416aa..826a5aaa1 100644 --- a/source/core/types/ut_executable.tpb +++ b/source/core/types/ut_executable.tpb @@ -104,9 +104,6 @@ create or replace type body ut_executable is begin l_start_transaction_id := dbms_transaction.local_transaction_id(true); - -- report to application_info - ut_utils.set_client_info(self.procedure_name); - --listener - before call to executable ut_event_manager.trigger_event('before_'||self.executable_type, self); @@ -173,7 +170,6 @@ create or replace type body ut_executable is if l_start_transaction_id != l_end_transaction_id or l_end_transaction_id is null then a_item.add_transaction_invalidator(self.form_name()); end if; - ut_utils.set_client_info(null); return l_completed_without_errors; diff --git a/source/core/types/ut_executable_test.tpb b/source/core/types/ut_executable_test.tpb index 09ffab55d..a11797a54 100644 --- a/source/core/types/ut_executable_test.tpb +++ b/source/core/types/ut_executable_test.tpb @@ -1,4 +1,21 @@ create or replace type body ut_executable_test as + /* + utPLSQL - Version 3 + Copyright 2016 - 2019 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + constructor function ut_executable_test( self in out nocopy ut_executable_test, a_owner varchar2, a_package varchar2, a_procedure_name varchar2, a_executable_type varchar2 diff --git a/source/core/types/ut_reporter_info.tps b/source/core/types/ut_reporter_info.tps index a4028974f..d1f159211 100644 --- a/source/core/types/ut_reporter_info.tps +++ b/source/core/types/ut_reporter_info.tps @@ -15,7 +15,7 @@ create or replace type ut_reporter_info as object ( See the License for the specific language governing permissions and limitations under the License. */ - object_name varchar2(250), + object_name varchar2(250), is_output_reporter varchar2(1), is_instantiable varchar2(1), is_final varchar2(1) diff --git a/source/core/types/ut_suite.tpb b/source/core/types/ut_suite.tpb index ccf004a4b..baaaf044d 100644 --- a/source/core/types/ut_suite.tpb +++ b/source/core/types/ut_suite.tpb @@ -43,13 +43,11 @@ create or replace type body ut_suite as begin ut_utils.debug_log('ut_suite.execute'); - ut_utils.set_action(self.object_name); - if self.get_disabled_flag() then self.mark_as_skipped(); else - ut_event_manager.trigger_event(ut_event_manager.gc_before_suite, self); self.start_time := current_timestamp; + ut_event_manager.trigger_event(ut_event_manager.gc_before_suite, self); l_suite_savepoint := self.create_savepoint_if_needed(); @@ -83,8 +81,6 @@ create or replace type body ut_suite as ut_event_manager.trigger_event(ut_event_manager.gc_after_suite, self); end if; - ut_utils.set_action(null); - return l_no_errors; end; diff --git a/source/core/types/ut_test.tpb b/source/core/types/ut_test.tpb index 7b2c495de..9fbcf9269 100644 --- a/source/core/types/ut_test.tpb +++ b/source/core/types/ut_test.tpb @@ -56,8 +56,8 @@ create or replace type body ut_test as if self.get_disabled_flag() then mark_as_skipped(); else - ut_event_manager.trigger_event(ut_event_manager.gc_before_test, self); self.start_time := current_timestamp; + ut_event_manager.trigger_event(ut_event_manager.gc_before_test, self); l_savepoint := self.create_savepoint_if_needed(); diff --git a/source/core/ut_expectation_processor.pkb b/source/core/ut_expectation_processor.pkb index 96ab022e4..4d773f833 100644 --- a/source/core/ut_expectation_processor.pkb +++ b/source/core/ut_expectation_processor.pkb @@ -78,10 +78,19 @@ create or replace package body ut_expectation_processor as end get_failed_expectations; procedure add_expectation_result(a_expectation_result ut_expectation_result) is - begin - ut_event_manager.trigger_event(ut_event_manager.gc_debug, a_expectation_result); - g_expectations_called.extend; - g_expectations_called(g_expectations_called.last) := a_expectation_result; + l_results ut_varchar2_list; + begin + if ut_session_context.is_ut_run then + ut_event_manager.trigger_event(ut_event_manager.gc_debug, a_expectation_result); + g_expectations_called.extend; + g_expectations_called(g_expectations_called.last) := a_expectation_result; + else + l_results := a_expectation_result.get_result_lines(); + dbms_output.put_line( upper( ut_utils.test_result_to_char( a_expectation_result.status ) ) || ''); + for i in 1 .. l_results.count loop + dbms_output.put_line( ' ' || l_results(i) ); + end loop; + end if; end; procedure report_failure(a_message in varchar2) is diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index f5c472e29..a5ffd0e0d 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -411,7 +411,7 @@ create or replace package body ut_suite_cache_manager is select count( 1 ) into l_count from dual where exists( select 1 - from ut_suite_cache_package c + from ut_suite_cache c where c.object_owner = a_owner_name and c.object_name = a_package_name ); @@ -419,7 +419,7 @@ create or replace package body ut_suite_cache_manager is select count( 1 ) into l_count from dual where exists( select 1 - from ut_suite_cache_package c + from ut_suite_cache c where c.object_owner = a_owner_name ); end if; diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index f8c411ec1..95378a18e 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -446,16 +446,6 @@ create or replace package body ut_utils is return l_result; end; - procedure set_action(a_text in varchar2) is - begin - dbms_application_info.set_module('utPLSQL', a_text); - end; - - procedure set_client_info(a_text in varchar2) is - begin - dbms_application_info.set_client_info(a_text); - end; - function to_xpath(a_list varchar2, a_ancestors varchar2 := '/*/') return varchar2 is l_xpath varchar2(32767) := a_list; begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 779f941c7..d5b8c21ac 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -295,16 +295,6 @@ create or replace package ut_utils authid definer is function convert_collection(a_collection ut_varchar2_list) return ut_varchar2_rows; - /** - * Set session's action and module using dbms_application_info - */ - procedure set_action(a_text in varchar2); - - /** - * Set session's client info using dbms_application_info - */ - procedure set_client_info(a_text in varchar2); - function to_xpath(a_list varchar2, a_ancestors varchar2 := '/*/') return varchar2; function to_xpath(a_list ut_varchar2_list, a_ancestors varchar2 := '/*/') return varchar2; diff --git a/source/install.sql b/source/install.sql index 0e28fa3ab..1f9913b0a 100644 --- a/source/install.sql +++ b/source/install.sql @@ -31,9 +31,17 @@ prompt &&line_separator alter session set current_schema = &&ut3_owner; @@check_object_grants.sql -@@check_sys_grants.sql "'CREATE TYPE','CREATE VIEW','CREATE SYNONYM','CREATE SEQUENCE','CREATE PROCEDURE','CREATE TABLE'" +@@check_sys_grants.sql "'CREATE TYPE','CREATE VIEW','CREATE SYNONYM','CREATE SEQUENCE','CREATE PROCEDURE','CREATE TABLE', 'CREATE CONTEXT'" --set define off +begin + $if $$self_testing_install $then + execute immediate 'create or replace context &&ut3_owner._info using &&ut3_owner..ut_session_context'; + $else + execute immediate 'create or replace context ut3_info using &&ut3_owner..ut_session_context'; + $end +end; +/ --dbms_output buffer cache table @@install_component.sql 'core/ut_dbms_output_cache.sql' @@ -98,6 +106,11 @@ alter session set current_schema = &&ut3_owner; @@install_component.sql 'expectations/data_values/ut_key_anyval_pairs.tps' @@install_component.sql 'expectations/data_values/ut_key_anyvalues.tps' +--session_context +@@install_component.sql 'core/session_context/ut_session_context.pks' +@@install_component.sql 'core/session_context/ut_session_context.pkb' +@@install_component.sql 'core/session_context/ut_session_info.tps' +@@install_component.sql 'core/session_context/ut_session_info.tpb' --output buffer table @@install_component.sql 'core/output_buffers/ut_output_buffer_info_tmp.sql' diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index 4502f88a2..c905153f4 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -307,6 +307,10 @@ drop table ut_output_clob_buffer_tmp purge; drop table ut_output_buffer_info_tmp purge; +drop package ut_session_context; + +drop type ut_session_info force; + drop type ut_output_data_rows force; drop type ut_output_data_row force; diff --git a/test/install_ut3_user_tests.sql b/test/install_ut3_user_tests.sql index ef50432d1..05f2634e8 100644 --- a/test/install_ut3_user_tests.sql +++ b/test/install_ut3_user_tests.sql @@ -12,6 +12,8 @@ prompt Install user tests @@ut3_user/helpers/some_items.tps @@ut3_user/helpers/some_object.tps @@ut3_user/test_user.pks +@@ut3_user/expectations.pks +@@ut3_user/expectations.pkb @@ut3_user/expectations/unary/test_expect_not_to_be_null.pks @@ut3_user/expectations/unary/test_expect_to_be_null.pks @@ut3_user/expectations/unary/test_expect_to_be_empty.pks diff --git a/test/ut3_tester_helper/main_helper.pkb b/test/ut3_tester_helper/main_helper.pkb index 2370f1db6..c684054a1 100644 --- a/test/ut3_tester_helper/main_helper.pkb +++ b/test/ut3_tester_helper/main_helper.pkb @@ -153,6 +153,16 @@ create or replace package body main_helper is begin ut3.ut_utils.append_to_list(a_list,a_items); end; - + + procedure set_ut_run_context is + begin + ut3.ut_session_context.set_context('RUN_PATHS',' '); + end; + + procedure clear_ut_run_context is + begin + ut3.ut_session_context.clear_all_context; + end; + end; / diff --git a/test/ut3_tester_helper/main_helper.pks b/test/ut3_tester_helper/main_helper.pks index 7d349151c..63c99936c 100644 --- a/test/ut3_tester_helper/main_helper.pks +++ b/test/ut3_tester_helper/main_helper.pks @@ -44,6 +44,10 @@ create or replace package main_helper is procedure append_to_list(a_list in out nocopy ut3.ut_varchar2_rows, a_item clob); procedure append_to_list(a_list in out nocopy ut3.ut_varchar2_rows, a_items ut3.ut_varchar2_rows); + + procedure set_ut_run_context; + + procedure clear_ut_run_context; end; / diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index 3fb2fbfec..41e35a03d 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -1,6 +1,11 @@ create or replace package body test_ut_run is - g_owner varchar2(250) := sys_context('userenv', 'current_schema'); + gc_owner constant varchar2(250) := sys_context('userenv', 'current_schema'); + gc_module constant varchar2(32767) := 'test module'; + gc_action constant varchar2(32767) := 'test action'; + gc_client_info constant varchar2(32767) := 'test client info'; + + g_context_test_results clob; procedure clear_expectations is begin @@ -746,7 +751,7 @@ Failures:% l_expected clob; begin select * bulk collect into l_results - from table ( ut3.ut.run( g_owner||'.'||g_owner ) ); + from table ( ut3.ut.run( gc_owner||'.'||gc_owner ) ); l_expected := '%1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%'; ut.expect(ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( l_expected ); end; @@ -755,7 +760,7 @@ Failures:% pragma autonomous_transaction; begin execute immediate ' - create or replace package '||g_owner||'.'||g_owner||' as + create or replace package '||gc_owner||'.'||gc_owner||' as --%suite --%test @@ -763,7 +768,7 @@ Failures:% end;'; execute immediate ' - create or replace package body '||g_owner||'.'||g_owner||' as + create or replace package body '||gc_owner||'.'||gc_owner||' as procedure sample_test is begin ut.expect(1).to_equal(1); end; end;'; @@ -772,7 +777,7 @@ Failures:% procedure drop_schema_name_package is pragma autonomous_transaction; begin - execute immediate 'drop package '||g_owner||'.'||g_owner; + execute immediate 'drop package '||gc_owner||'.'||gc_owner; end; procedure run_with_random_order is @@ -1015,6 +1020,378 @@ Failures:% ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2.test2%executed%' ); ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_3%' ); end; - + + procedure set_application_info is + begin + dbms_application_info.set_module( gc_module, gc_action ); + dbms_application_info.set_client_info( gc_client_info ); + end; + + procedure create_context_test_suite is + pragma autonomous_transaction; + begin + execute immediate q'[ + create or replace package check_context is + --%suite(Suite description) + --%suitepath(some.suite.path) + + --%beforeall + procedure before_suite; + + --%context(some_context) + + --%displayname(context description) + + --%beforeall + procedure before_context; + + --%beforeeach + procedure before_each_test; + + --%test(Some test description) + --%beforetest(before_test) + --%aftertest(after_test) + procedure the_test; + procedure before_test; + procedure after_test; + + --%aftereach + procedure after_each_test; + + --%afterall + procedure after_context; + + --%endcontext + + + --%afterall + procedure after_suite; + + end;]'; + execute immediate q'[ + create or replace package body check_context is + + procedure print_context( a_procedure_name varchar2 ) is + l_results ut_varchar2_rows; + l_module varchar2(32767); + l_action varchar2(32767); + l_client_info varchar2(32767); + begin + select attribute||'='||value + bulk collect into l_results + from session_context where namespace = 'UT3_INFO' + order by attribute; + for i in 1 .. l_results.count loop + dbms_output.put_line( upper(a_procedure_name) ||':'|| l_results(i) ); + end loop; + dbms_application_info.read_module( l_module, l_action ); + dbms_application_info.read_client_info( l_client_info ); + + dbms_output.put_line( 'APPLICATION_INFO:MODULE=' || l_module ); + dbms_output.put_line( 'APPLICATION_INFO:ACTION=' || l_action ); + dbms_output.put_line( 'APPLICATION_INFO:CLIENT_INFO=' || l_client_info ); + end; + + procedure before_suite is + begin + print_context('before_suite'); + end; + + procedure before_context is + begin + print_context('before_context'); + end; + + procedure before_each_test is + begin + print_context('before_each_test'); + end; + + procedure the_test is + begin + print_context('the_test'); + end; + + procedure before_test is + begin + print_context('before_test'); + end; + + procedure after_test is + begin + print_context('after_test'); + end; + + procedure after_each_test is + begin + print_context('after_each_test'); + end; + + procedure after_context is + begin + print_context('after_context'); + end; + + procedure after_suite is + begin + print_context('after_suite'); + end; + + end;]'; + end; + + procedure drop_context_test_suite is + pragma autonomous_transaction; + begin + execute immediate q'[drop package check_context]'; + end; + + procedure run_context_test_suite is + l_lines ut3.ut_varchar2_list; + begin + select * bulk collect into l_lines from table(ut3.ut.run('check_context')); + g_context_test_results := ut3_tester_helper.main_helper.table_to_clob(l_lines); + end; + + + procedure sys_ctx_on_suite_beforeall is + begin + ut.expect(g_context_test_results).to_be_like( + '%BEFORE_SUITE:CURRENT_EXECUTABLE_NAME='||gc_owner||'.check_context.before_suite' + ||'%BEFORE_SUITE:CURRENT_EXECUTABLE_TYPE=beforeall' + ||'%BEFORE_SUITE:RUN_PATHS=check_context' + ||'%BEFORE_SUITE:SUITE_DESCRIPTION=Suite description' + ||'%BEFORE_SUITE:SUITE_PACKAGE='||gc_owner||'.check_context' + ||'%BEFORE_SUITE:SUITE_PATH=some.suite.path.check_context' + ||'%BEFORE_SUITE:SUITE_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%BEFORE_SUITE:TIME_IN_SUITE=+000000000 00:00:0' + ||'%APPLICATION_INFO:MODULE=utPLSQL' + ||'%APPLICATION_INFO:ACTION=check_context' + ||'%APPLICATION_INFO:CLIENT_INFO=before_suite%' + ); + ut.expect(g_context_test_results).not_to_be_like('%BEFORE_SUITE:CONTEXT_%'); + ut.expect(g_context_test_results).not_to_be_like('%BEFORE_SUITE:TEST_%'); + end; + + procedure sys_ctx_on_context_beforeall is + begin + ut.expect(g_context_test_results).to_be_like( + '%BEFORE_CONTEXT:CONTEXT_DESCRIPTION=context description' + ||'%BEFORE_CONTEXT:CONTEXT_NAME=some_context' + ||'%BEFORE_CONTEXT:CONTEXT_PATH=some.suite.path.check_context.some_context' + ||'%BEFORE_CONTEXT:CONTEXT_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%BEFORE_CONTEXT:CURRENT_EXECUTABLE_NAME='||gc_owner||'.check_context.before_context' + ||'%BEFORE_CONTEXT:CURRENT_EXECUTABLE_TYPE=beforeall' + ||'%BEFORE_CONTEXT:RUN_PATHS=check_context' + ||'%BEFORE_CONTEXT:SUITE_DESCRIPTION=Suite description' + ||'%BEFORE_CONTEXT:SUITE_PACKAGE='||gc_owner||'.check_context' + ||'%BEFORE_CONTEXT:SUITE_PATH=some.suite.path.check_context' + ||'%BEFORE_CONTEXT:SUITE_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%BEFORE_CONTEXT:TIME_IN_CONTEXT=+000000000 00:00:0' + ||'%BEFORE_CONTEXT:TIME_IN_SUITE=+000000000 00:00:0' + ||'%APPLICATION_INFO:MODULE=utPLSQL' + ||'%APPLICATION_INFO:ACTION=check_context' + ||'%APPLICATION_INFO:CLIENT_INFO=before_context%' + ); + ut.expect(g_context_test_results).not_to_be_like('%BEFORE_CONTEXT:TEST_%'); + end; + + procedure sys_ctx_on_beforeeach is + begin + ut.expect(g_context_test_results).to_be_like( + '%BEFORE_EACH_TEST:CONTEXT_DESCRIPTION=context description' + ||'%BEFORE_EACH_TEST:CONTEXT_NAME=some_context' + ||'%BEFORE_EACH_TEST:CONTEXT_PATH=some.suite.path.check_context.some_context' + ||'%BEFORE_EACH_TEST:CONTEXT_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%BEFORE_EACH_TEST:CURRENT_EXECUTABLE_NAME='||gc_owner||'.check_context.before_each_test' + ||'%BEFORE_EACH_TEST:CURRENT_EXECUTABLE_TYPE=beforeeach' + ||'%BEFORE_EACH_TEST:RUN_PATHS=check_context' + ||'%BEFORE_EACH_TEST:SUITE_DESCRIPTION=Suite description' + ||'%BEFORE_EACH_TEST:SUITE_PACKAGE='||gc_owner||'.check_context' + ||'%BEFORE_EACH_TEST:SUITE_PATH=some.suite.path.check_context' + ||'%BEFORE_EACH_TEST:SUITE_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%BEFORE_EACH_TEST:TEST_DESCRIPTION=Some test description' + ||'%BEFORE_EACH_TEST:TEST_NAME='||gc_owner||'.check_context.the_test' + ||'%BEFORE_EACH_TEST:TEST_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%BEFORE_EACH_TEST:TIME_IN_CONTEXT=+000000000 00:00:0%' + ||'%BEFORE_EACH_TEST:TIME_IN_SUITE=+000000000 00:00:0%' + ||'%BEFORE_EACH_TEST:TIME_IN_TEST=+000000000 00:00:0%' + ||'%APPLICATION_INFO:MODULE=utPLSQL' + ||'%APPLICATION_INFO:ACTION=check_context' + ||'%APPLICATION_INFO:CLIENT_INFO=before_each_test%' + ); + end; + + procedure sys_ctx_on_beforetest is + begin + ut.expect(g_context_test_results).to_be_like( + '%BEFORE_TEST:CONTEXT_DESCRIPTION=context description' + ||'%BEFORE_TEST:CONTEXT_NAME=some_context' + ||'%BEFORE_TEST:CONTEXT_PATH=some.suite.path.check_context.some_context' + ||'%BEFORE_TEST:CONTEXT_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%BEFORE_TEST:CURRENT_EXECUTABLE_NAME='||gc_owner||'.check_context.before_test' + ||'%BEFORE_TEST:CURRENT_EXECUTABLE_TYPE=beforetest' + ||'%BEFORE_TEST:RUN_PATHS=check_context' + ||'%BEFORE_TEST:SUITE_DESCRIPTION=Suite description' + ||'%BEFORE_TEST:SUITE_PACKAGE='||gc_owner||'.check_context' + ||'%BEFORE_TEST:SUITE_PATH=some.suite.path.check_context' + ||'%BEFORE_TEST:SUITE_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%BEFORE_TEST:TEST_DESCRIPTION=Some test description' + ||'%BEFORE_TEST:TEST_NAME='||gc_owner||'.check_context.the_test' + ||'%BEFORE_TEST:TEST_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%BEFORE_TEST:TIME_IN_CONTEXT=+000000000 00:00:0%' + ||'%BEFORE_TEST:TIME_IN_SUITE=+000000000 00:00:0%' + ||'%BEFORE_TEST:TIME_IN_TEST=+000000000 00:00:0%' + ||'%APPLICATION_INFO:MODULE=utPLSQL' + ||'%APPLICATION_INFO:ACTION=check_context' + ||'%APPLICATION_INFO:CLIENT_INFO=before_test%' + ); + end; + + procedure sys_ctx_on_test is + begin + ut.expect(g_context_test_results).to_be_like( + '%THE_TEST:CONTEXT_DESCRIPTION=context description' + ||'%THE_TEST:CONTEXT_NAME=some_context' + ||'%THE_TEST:CONTEXT_PATH=some.suite.path.check_context.some_context' + ||'%THE_TEST:CONTEXT_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%THE_TEST:CURRENT_EXECUTABLE_NAME='||gc_owner||'.check_context.the_test' + ||'%THE_TEST:CURRENT_EXECUTABLE_TYPE=test' + ||'%THE_TEST:RUN_PATHS=check_context' + ||'%THE_TEST:SUITE_DESCRIPTION=Suite description' + ||'%THE_TEST:SUITE_PACKAGE='||gc_owner||'.check_context' + ||'%THE_TEST:SUITE_PATH=some.suite.path.check_context' + ||'%THE_TEST:SUITE_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%THE_TEST:TEST_DESCRIPTION=Some test description' + ||'%THE_TEST:TEST_NAME='||gc_owner||'.check_context.the_test' + ||'%THE_TEST:TEST_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%THE_TEST:TIME_IN_CONTEXT=+000000000 00:00:0%' + ||'%THE_TEST:TIME_IN_SUITE=+000000000 00:00:0%' + ||'%THE_TEST:TIME_IN_TEST=+000000000 00:00:0%' + ||'%APPLICATION_INFO:MODULE=utPLSQL' + ||'%APPLICATION_INFO:ACTION=check_context' + ||'%APPLICATION_INFO:CLIENT_INFO=the_test%' + ); + end; + + procedure sys_ctx_on_aftertest is + begin + ut.expect(g_context_test_results).to_be_like( + '%AFTER_TEST:CONTEXT_DESCRIPTION=context description' + ||'%AFTER_TEST:CONTEXT_NAME=some_context' + ||'%AFTER_TEST:CONTEXT_PATH=some.suite.path.check_context.some_context' + ||'%AFTER_TEST:CONTEXT_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%AFTER_TEST:CURRENT_EXECUTABLE_NAME='||gc_owner||'.check_context.after_test' + ||'%AFTER_TEST:CURRENT_EXECUTABLE_TYPE=aftertest' + ||'%AFTER_TEST:RUN_PATHS=check_context' + ||'%AFTER_TEST:SUITE_DESCRIPTION=Suite description' + ||'%AFTER_TEST:SUITE_PACKAGE='||gc_owner||'.check_context' + ||'%AFTER_TEST:SUITE_PATH=some.suite.path.check_context' + ||'%AFTER_TEST:SUITE_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%AFTER_TEST:TEST_DESCRIPTION=Some test description' + ||'%AFTER_TEST:TEST_NAME='||gc_owner||'.check_context.the_test' + ||'%AFTER_TEST:TEST_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%AFTER_TEST:TIME_IN_CONTEXT=+000000000 00:00:0%' + ||'%AFTER_TEST:TIME_IN_SUITE=+000000000 00:00:0%' + ||'%AFTER_TEST:TIME_IN_TEST=+000000000 00:00:0%' + ||'%APPLICATION_INFO:MODULE=utPLSQL' + ||'%APPLICATION_INFO:ACTION=check_context' + ||'%APPLICATION_INFO:CLIENT_INFO=after_test%' + ); + end; + + procedure sys_ctx_on_aftereach is + begin + ut.expect(g_context_test_results).to_be_like( + '%AFTER_EACH_TEST:CONTEXT_DESCRIPTION=context description' + ||'%AFTER_EACH_TEST:CONTEXT_NAME=some_context' + ||'%AFTER_EACH_TEST:CONTEXT_PATH=some.suite.path.check_context.some_context' + ||'%AFTER_EACH_TEST:CONTEXT_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%AFTER_EACH_TEST:CURRENT_EXECUTABLE_NAME='||gc_owner||'.check_context.after_each_test' + ||'%AFTER_EACH_TEST:CURRENT_EXECUTABLE_TYPE=aftereach' + ||'%AFTER_EACH_TEST:RUN_PATHS=check_context' + ||'%AFTER_EACH_TEST:SUITE_DESCRIPTION=Suite description' + ||'%AFTER_EACH_TEST:SUITE_PACKAGE='||gc_owner||'.check_context' + ||'%AFTER_EACH_TEST:SUITE_PATH=some.suite.path.check_context' + ||'%AFTER_EACH_TEST:SUITE_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%AFTER_EACH_TEST:TEST_DESCRIPTION=Some test description' + ||'%AFTER_EACH_TEST:TEST_NAME='||gc_owner||'.check_context.the_test' + ||'%AFTER_EACH_TEST:TEST_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%AFTER_EACH_TEST:TIME_IN_CONTEXT=+000000000 00:00:0%' + ||'%AFTER_EACH_TEST:TIME_IN_SUITE=+000000000 00:00:0%' + ||'%AFTER_EACH_TEST:TIME_IN_TEST=+000000000 00:00:0%' + ||'%APPLICATION_INFO:MODULE=utPLSQL' + ||'%APPLICATION_INFO:ACTION=check_context' + ||'%APPLICATION_INFO:CLIENT_INFO=after_each_test%' + ); + end; + + procedure sys_ctx_on_context_afterall is + begin + ut.expect(g_context_test_results).to_be_like( + '%AFTER_CONTEXT:CONTEXT_DESCRIPTION=context description' + ||'%AFTER_CONTEXT:CONTEXT_NAME=some_context' + ||'%AFTER_CONTEXT:CONTEXT_PATH=some.suite.path.check_context.some_context' + ||'%AFTER_CONTEXT:CONTEXT_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%AFTER_CONTEXT:CURRENT_EXECUTABLE_NAME='||gc_owner||'.check_context.after_context' + ||'%AFTER_CONTEXT:CURRENT_EXECUTABLE_TYPE=afterall' + ||'%AFTER_CONTEXT:RUN_PATHS=check_context' + ||'%AFTER_CONTEXT:SUITE_DESCRIPTION=Suite description' + ||'%AFTER_CONTEXT:SUITE_PACKAGE='||gc_owner||'.check_context' + ||'%AFTER_CONTEXT:SUITE_PATH=some.suite.path.check_context' + ||'%AFTER_CONTEXT:SUITE_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%AFTER_CONTEXT:TIME_IN_CONTEXT=+000000000 00:00:0%' + ||'%AFTER_CONTEXT:TIME_IN_SUITE=+000000000 00:00:0%' + ||'%APPLICATION_INFO:MODULE=utPLSQL' + ||'%APPLICATION_INFO:ACTION=check_context' + ||'%APPLICATION_INFO:CLIENT_INFO=after_context%' + ); + ut.expect(g_context_test_results).not_to_be_like('%AFTER_CONTEXT:TEST_%'); + end; + + procedure sys_ctx_on_suite_afterall is + begin + ut.expect(g_context_test_results).to_be_like( + '%AFTER_SUITE:CURRENT_EXECUTABLE_NAME='||gc_owner||'.check_context.after_suite' + ||'%AFTER_SUITE:CURRENT_EXECUTABLE_TYPE=afterall' + ||'%AFTER_SUITE:RUN_PATHS=check_context' + ||'%AFTER_SUITE:SUITE_DESCRIPTION=Suite description' + ||'%AFTER_SUITE:SUITE_PACKAGE='||gc_owner||'.check_context' + ||'%AFTER_SUITE:SUITE_PATH=some.suite.path.check_context' + ||'%AFTER_SUITE:SUITE_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%AFTER_SUITE:TIME_IN_SUITE=+000000000 00:00:0%' + ||'%APPLICATION_INFO:MODULE=utPLSQL' + ||'%APPLICATION_INFO:ACTION=check_context' + ||'%APPLICATION_INFO:CLIENT_INFO=after_suite%' + ); + ut.expect(g_context_test_results).not_to_be_like('%AFTER_SUITE:CONTEXT_%'); + ut.expect(g_context_test_results).not_to_be_like('%AFTER_SUITE:TEST_%'); + end; + + procedure sys_ctx_clear_after_run is + l_actual sys_refcursor; + begin + open l_actual for + select attribute||'='||value + from session_context where namespace = 'UT3_INFO'; + + ut.expect(l_actual).to_be_empty(); + end; + + procedure app_info_restore_after_run is + l_module varchar2(32767); + l_action varchar2(32767); + l_client_info varchar2(32767); + begin + dbms_application_info.read_module( l_module, l_action ); + dbms_application_info.read_client_info( l_client_info ); + + ut.expect(l_module).to_equal(gc_module); + ut.expect(l_action).to_equal(gc_action); + --Disabled as it can't be tested. + --UT3_LATEST_RELEASE is also setting the client_info on each procedure + -- ut.expect(l_client_info).to_equal(gc_client_info); + end; + end; / diff --git a/test/ut3_user/api/test_ut_run.pks b/test/ut3_user/api/test_ut_run.pks index 406c70b09..38a6eee2c 100644 --- a/test/ut3_user/api/test_ut_run.pks +++ b/test/ut3_user/api/test_ut_run.pks @@ -11,7 +11,8 @@ create or replace package test_ut_run is procedure ut_version; --%test(ut.fail() marks test as failed) - --%aftertest(clear_expectations) + --%beforetest(ut3_tester_helper.main_helper.set_ut_run_context) + --%aftertest(clear_expectations, ut3_tester_helper.main_helper.clear_ut_run_context) procedure ut_fail; --%context(ut_run_procedure) @@ -228,6 +229,54 @@ create or replace package test_ut_run is procedure tag_run_func_path_list; --%endcontext + + --%context(ut3_info context) + + --%beforeall + procedure set_application_info; + --%beforeall + procedure create_context_test_suite; + + --%beforeall + procedure run_context_test_suite; + + --%afterall + procedure drop_context_test_suite; + + --%test(sets context for suite level beforeall) + procedure sys_ctx_on_suite_beforeall; + + --%test(sets context for context level beforeall) + procedure sys_ctx_on_context_beforeall; + + --%test(set for context level beforeeach) + procedure sys_ctx_on_beforeeach; + + --%test(set for context level beforetest) + procedure sys_ctx_on_beforetest; + + --%test(set for context level test) + procedure sys_ctx_on_test; + + --%test(set for context level aftertest) + procedure sys_ctx_on_aftertest; + + --%test(set for context level aftereach) + procedure sys_ctx_on_aftereach; + + --%test(set for context level afterall) + procedure sys_ctx_on_context_afterall; + + --%test(set for suite level afterall) + procedure sys_ctx_on_suite_afterall; + + --%test(is cleared after run) + procedure sys_ctx_clear_after_run; + + --%test(application info is restored after run) + procedure app_info_restore_after_run; + + --%endcontext end; / diff --git a/test/ut3_user/expectations.pkb b/test/ut3_user/expectations.pkb new file mode 100644 index 000000000..c1f07dd9f --- /dev/null +++ b/test/ut3_user/expectations.pkb @@ -0,0 +1,31 @@ +create or replace package body expectations as + + --%test(Expectations return data to screen when called standalone) + + procedure inline_expectation_to_dbms_out is + l_expected sys_refcursor; + l_actual sys_refcursor; + l_output dbmsoutput_linesarray; + l_results ut3.ut_varchar2_list; + l_lines number := 10000; + begin + --Arrange + ut3_tester_helper.main_helper.clear_ut_run_context; + open l_expected for + select 'FAILURE' as out_row from dual union all + select 'Actual: 1 (number) was expected to equal: 0 (number)' from dual union all + select 'SUCCESS' from dual union all + select 'Actual: 0 (number) was expected to equal: 0 (number)' from dual union all + select '' from dual; + --Act + ut3.ut.expect(1).to_equal(0); + ut3.ut.expect(0).to_equal(0); + + --Assert + dbms_output.get_lines(lines => l_output, numlines => l_lines); + open l_actual for select trim(column_value) as out_row from table(l_output); + + ut.expect(l_actual).to_equal(l_expected); + end; +end; +/ \ No newline at end of file diff --git a/test/ut3_user/expectations.pks b/test/ut3_user/expectations.pks new file mode 100644 index 000000000..ab8bd3835 --- /dev/null +++ b/test/ut3_user/expectations.pks @@ -0,0 +1,14 @@ +create or replace package expectations as + --%suite + --%suitepath(utplsql.test_user) + + --%beforeall(ut3_tester_helper.main_helper.set_ut_run_context) + + --%afterall(ut3_tester_helper.main_helper.clear_ut_run_context) + + --%test(Expectations return data to screen when called standalone) + --%aftertest(ut3_tester_helper.main_helper.set_ut_run_context) + procedure inline_expectation_to_dbms_out; + +end; +/ \ No newline at end of file From 99bae42e69b07c751fb57ce0922b05fae2b94347 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 3 Jul 2019 21:17:44 +0100 Subject: [PATCH 0549/1096] Removed `time_in_suite`, `time_in_context`, `time_in_test` as they are of low value and could bing confusion. --- .../core/session_context/ut_session_info.tpb | 24 +++---------------- .../core/session_context/ut_session_info.tps | 3 --- test/ut3_user/api/test_ut_run.pkb | 21 ---------------- 3 files changed, 3 insertions(+), 45 deletions(-) diff --git a/source/core/session_context/ut_session_info.tpb b/source/core/session_context/ut_session_info.tpb index 398ff0067..2d3fdbed9 100644 --- a/source/core/session_context/ut_session_info.tpb +++ b/source/core/session_context/ut_session_info.tpb @@ -42,18 +42,16 @@ create or replace type body ut_session_info as member procedure before_calling_suite(self in out nocopy ut_session_info, a_suite in ut_logical_suite) is begin if a_suite is not of (ut_suite_context) then - suite_start_time := a_suite.start_time; ut_session_context.set_context( 'suite_path', a_suite.path ); ut_session_context.set_context( 'suite_package', a_suite.object_owner||'.'||a_suite.object_name ); ut_session_context.set_context( 'suite_description', a_suite.description ); - ut_session_context.set_context( 'suite_start_time', ut_utils.to_string(suite_start_time) ); + ut_session_context.set_context( 'suite_start_time', ut_utils.to_string(a_suite.start_time) ); dbms_application_info.set_module( 'utPLSQL', a_suite.object_name ); else - context_start_time := a_suite.start_time; ut_session_context.set_context( 'context_name', a_suite.name ); ut_session_context.set_context( 'context_path', a_suite.path); ut_session_context.set_context( 'context_description', a_suite.description ); - ut_session_context.set_context( 'context_start_time', ut_utils.to_string(context_start_time) ); + ut_session_context.set_context( 'context_start_time', ut_utils.to_string(a_suite.start_time) ); end if; end; @@ -64,25 +62,20 @@ create or replace type body ut_session_info as ut_session_context.clear_context( 'suite_path' ); ut_session_context.clear_context( 'suite_description' ); ut_session_context.clear_context( 'suite_start_time' ); - ut_session_context.clear_context( 'time_in_suite' ); - suite_start_time := null; else ut_session_context.clear_context( 'context_name' ); ut_session_context.clear_context( 'context_path' ); ut_session_context.clear_context( 'context_description' ); ut_session_context.clear_context( 'context_start_time' ); - ut_session_context.clear_context( 'time_in_context' ); - context_start_time := null; end if; end; member procedure before_calling_test(self in out nocopy ut_session_info, a_test in ut_test) is begin - test_start_time := a_test.start_time; ut_session_context.set_context( 'test_name', a_test.object_owner||'.'||a_test.object_name||'.'||a_test.name ); ut_session_context.set_context( 'test_description', a_test.description ); - ut_session_context.set_context( 'test_start_time', ut_utils.to_string(test_start_time) ); + ut_session_context.set_context( 'test_start_time', ut_utils.to_string(a_test.start_time) ); end; member procedure after_calling_test (self in out nocopy ut_session_info, a_test in ut_test) is @@ -90,8 +83,6 @@ create or replace type body ut_session_info as ut_session_context.clear_context( 'test_name' ); ut_session_context.clear_context( 'test_description' ); ut_session_context.clear_context( 'test_start_time' ); - ut_session_context.clear_context( 'time_in_test' ); - test_start_time := null; end; member procedure before_calling_executable(self in out nocopy ut_session_info, a_executable in ut_executable) is @@ -102,15 +93,6 @@ create or replace type body ut_session_info as a_executable.owner_name||'.'||a_executable.object_name||'.'||a_executable.procedure_name ); dbms_application_info.set_client_info( a_executable.procedure_name ); - if suite_start_time is not null then - ut_session_context.set_context( 'time_in_suite', current_timestamp - suite_start_time ); - if context_start_time is not null then - ut_session_context.set_context( 'time_in_context', current_timestamp - context_start_time ); - end if; - if test_start_time is not null then - ut_session_context.set_context( 'time_in_test', current_timestamp - test_start_time ); - end if; - end if; end; member procedure after_calling_executable(self in out nocopy ut_session_info, a_executable in ut_executable) is diff --git a/source/core/session_context/ut_session_info.tps b/source/core/session_context/ut_session_info.tps index 451d7b8f6..863b0dc3e 100644 --- a/source/core/session_context/ut_session_info.tps +++ b/source/core/session_context/ut_session_info.tps @@ -19,9 +19,6 @@ create or replace type ut_session_info under ut_event_listener ( module varchar2(4000), action varchar2(4000), client_info varchar2(4000), - suite_start_time timestamp, - context_start_time timestamp, - test_start_time timestamp, constructor function ut_session_info(self in out nocopy ut_session_info) return self as result, member procedure before_calling_run(self in out nocopy ut_session_info, a_run in ut_run), diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index 41e35a03d..329b71357 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -1164,7 +1164,6 @@ Failures:% ||'%BEFORE_SUITE:SUITE_PACKAGE='||gc_owner||'.check_context' ||'%BEFORE_SUITE:SUITE_PATH=some.suite.path.check_context' ||'%BEFORE_SUITE:SUITE_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') - ||'%BEFORE_SUITE:TIME_IN_SUITE=+000000000 00:00:0' ||'%APPLICATION_INFO:MODULE=utPLSQL' ||'%APPLICATION_INFO:ACTION=check_context' ||'%APPLICATION_INFO:CLIENT_INFO=before_suite%' @@ -1187,8 +1186,6 @@ Failures:% ||'%BEFORE_CONTEXT:SUITE_PACKAGE='||gc_owner||'.check_context' ||'%BEFORE_CONTEXT:SUITE_PATH=some.suite.path.check_context' ||'%BEFORE_CONTEXT:SUITE_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') - ||'%BEFORE_CONTEXT:TIME_IN_CONTEXT=+000000000 00:00:0' - ||'%BEFORE_CONTEXT:TIME_IN_SUITE=+000000000 00:00:0' ||'%APPLICATION_INFO:MODULE=utPLSQL' ||'%APPLICATION_INFO:ACTION=check_context' ||'%APPLICATION_INFO:CLIENT_INFO=before_context%' @@ -1213,9 +1210,6 @@ Failures:% ||'%BEFORE_EACH_TEST:TEST_DESCRIPTION=Some test description' ||'%BEFORE_EACH_TEST:TEST_NAME='||gc_owner||'.check_context.the_test' ||'%BEFORE_EACH_TEST:TEST_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') - ||'%BEFORE_EACH_TEST:TIME_IN_CONTEXT=+000000000 00:00:0%' - ||'%BEFORE_EACH_TEST:TIME_IN_SUITE=+000000000 00:00:0%' - ||'%BEFORE_EACH_TEST:TIME_IN_TEST=+000000000 00:00:0%' ||'%APPLICATION_INFO:MODULE=utPLSQL' ||'%APPLICATION_INFO:ACTION=check_context' ||'%APPLICATION_INFO:CLIENT_INFO=before_each_test%' @@ -1239,9 +1233,6 @@ Failures:% ||'%BEFORE_TEST:TEST_DESCRIPTION=Some test description' ||'%BEFORE_TEST:TEST_NAME='||gc_owner||'.check_context.the_test' ||'%BEFORE_TEST:TEST_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') - ||'%BEFORE_TEST:TIME_IN_CONTEXT=+000000000 00:00:0%' - ||'%BEFORE_TEST:TIME_IN_SUITE=+000000000 00:00:0%' - ||'%BEFORE_TEST:TIME_IN_TEST=+000000000 00:00:0%' ||'%APPLICATION_INFO:MODULE=utPLSQL' ||'%APPLICATION_INFO:ACTION=check_context' ||'%APPLICATION_INFO:CLIENT_INFO=before_test%' @@ -1265,9 +1256,6 @@ Failures:% ||'%THE_TEST:TEST_DESCRIPTION=Some test description' ||'%THE_TEST:TEST_NAME='||gc_owner||'.check_context.the_test' ||'%THE_TEST:TEST_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') - ||'%THE_TEST:TIME_IN_CONTEXT=+000000000 00:00:0%' - ||'%THE_TEST:TIME_IN_SUITE=+000000000 00:00:0%' - ||'%THE_TEST:TIME_IN_TEST=+000000000 00:00:0%' ||'%APPLICATION_INFO:MODULE=utPLSQL' ||'%APPLICATION_INFO:ACTION=check_context' ||'%APPLICATION_INFO:CLIENT_INFO=the_test%' @@ -1291,9 +1279,6 @@ Failures:% ||'%AFTER_TEST:TEST_DESCRIPTION=Some test description' ||'%AFTER_TEST:TEST_NAME='||gc_owner||'.check_context.the_test' ||'%AFTER_TEST:TEST_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') - ||'%AFTER_TEST:TIME_IN_CONTEXT=+000000000 00:00:0%' - ||'%AFTER_TEST:TIME_IN_SUITE=+000000000 00:00:0%' - ||'%AFTER_TEST:TIME_IN_TEST=+000000000 00:00:0%' ||'%APPLICATION_INFO:MODULE=utPLSQL' ||'%APPLICATION_INFO:ACTION=check_context' ||'%APPLICATION_INFO:CLIENT_INFO=after_test%' @@ -1317,9 +1302,6 @@ Failures:% ||'%AFTER_EACH_TEST:TEST_DESCRIPTION=Some test description' ||'%AFTER_EACH_TEST:TEST_NAME='||gc_owner||'.check_context.the_test' ||'%AFTER_EACH_TEST:TEST_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') - ||'%AFTER_EACH_TEST:TIME_IN_CONTEXT=+000000000 00:00:0%' - ||'%AFTER_EACH_TEST:TIME_IN_SUITE=+000000000 00:00:0%' - ||'%AFTER_EACH_TEST:TIME_IN_TEST=+000000000 00:00:0%' ||'%APPLICATION_INFO:MODULE=utPLSQL' ||'%APPLICATION_INFO:ACTION=check_context' ||'%APPLICATION_INFO:CLIENT_INFO=after_each_test%' @@ -1340,8 +1322,6 @@ Failures:% ||'%AFTER_CONTEXT:SUITE_PACKAGE='||gc_owner||'.check_context' ||'%AFTER_CONTEXT:SUITE_PATH=some.suite.path.check_context' ||'%AFTER_CONTEXT:SUITE_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') - ||'%AFTER_CONTEXT:TIME_IN_CONTEXT=+000000000 00:00:0%' - ||'%AFTER_CONTEXT:TIME_IN_SUITE=+000000000 00:00:0%' ||'%APPLICATION_INFO:MODULE=utPLSQL' ||'%APPLICATION_INFO:ACTION=check_context' ||'%APPLICATION_INFO:CLIENT_INFO=after_context%' @@ -1359,7 +1339,6 @@ Failures:% ||'%AFTER_SUITE:SUITE_PACKAGE='||gc_owner||'.check_context' ||'%AFTER_SUITE:SUITE_PATH=some.suite.path.check_context' ||'%AFTER_SUITE:SUITE_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') - ||'%AFTER_SUITE:TIME_IN_SUITE=+000000000 00:00:0%' ||'%APPLICATION_INFO:MODULE=utPLSQL' ||'%APPLICATION_INFO:ACTION=check_context' ||'%APPLICATION_INFO:CLIENT_INFO=after_suite%' From d932f757c65ba49c14a39a3939c6e5e9b1e1c93e Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 8 Jul 2019 01:09:20 +0100 Subject: [PATCH 0550/1096] - Fixed minor typos, formatting and issues with expectation results. - Changed how stack trace is reported on expectations to provide more information to the user. - Fixed expectation messages for successful results - moved `to_be_empty` / `not_to_be_empty` to base `ut_expectation` type as it's available for `clob`/`blob` types too. - added-back grant on `ut_matcher` to allow for passing various matchers by users. - fixed issue with misleading message: `All rows are different as the columns position is not matching` when comparing a null collection/cursor {WIP] Updates to documentation for expectations. --- docs/userguide/expectations.md | 1231 ++++++++++------- source/core/types/ut_expectation_result.tpb | 2 +- source/core/ut_expectation_processor.pkb | 56 +- source/create_grants.sql | 1 + source/create_synonyms.sql | 1 + .../data_values/ut_compound_data_helper.pkb | 2 +- .../data_values/ut_compound_data_value.tpb | 8 +- .../data_values/ut_compound_data_value.tps | 3 +- .../data_values/ut_data_value.tpb | 2 +- .../data_values/ut_data_value_anydata.tpb | 2 +- .../data_values/ut_data_value_json.tpb | 7 +- .../data_values/ut_data_value_refcursor.tpb | 11 +- source/expectations/matchers/ut_contain.tpb | 3 +- source/expectations/matchers/ut_equal.tpb | 19 +- source/expectations/matchers/ut_matcher.tpb | 4 +- source/expectations/ut_expectation.tpb | 10 + source/expectations/ut_expectation.tps | 3 + .../expectations/ut_expectation_compound.tpb | 10 - .../expectations/ut_expectation_compound.tps | 2 - source/expectations/ut_expectation_json.tpb | 10 - source/expectations/ut_expectation_json.tps | 2 - .../test_expectation_processor.pkb | 46 +- .../test_expectation_processor.pks | 11 +- test/ut3_user/expectations.pkb | 49 +- test/ut3_user/expectations.pks | 6 +- .../expectations/test_expectation_anydata.pkb | 11 +- .../expectations/test_expectations_cursor.pkb | 6 +- .../unary/test_expect_to_be_empty.pkb | 2 +- .../reporters/test_realtime_reporter.pkb | 2 +- .../reporters/test_teamcity_reporter.pkb | 4 +- 30 files changed, 920 insertions(+), 606 deletions(-) diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 970237723..6f28325a2 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -2,93 +2,263 @@ # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. -utPLSQL uses a combination of expectation and matcher to perform the check on the data. +utPLSQL uses expectations and matchers to perform the check on the data. -Example of a unit test procedure body. +Example of an expectation ```sql begin - ut.expect( 'the tested value', 'optional custom failure message' ).to_( equal('the expected value') ); + ut.expect( 'the tested value' ).to_equal('the expected value'); end; +/ ``` -Expectation is a set of the expected value(s), actual values(s) and the matcher(s) to run on those values. -You can also add a custom failure message for an expectation. +Returns following output via DBMS_OUTPUT: +``` +FAILURE + Actual: 'the tested value' (varchar2) was expected to equal: 'the expected value' (varchar2) + at "anonymous block", line 2 +``` -Matcher defines the comparison operation to be performed on expected and actual values. +Expectation is a combination of: +- the expected value +- optional custom message for the expectation +- the matcher used to perform comparison +- them matcher parameters (actual value), depending on the matcher type + +**Note:** +> The output from expectation is provided directly DBMS_OUTPUT only when the expectation is executed standalone (not as part of unit test). +> The output from expectation contains call stack trace only when expectation fails. +> Source code of the line which called the expectation is only reported when the line is part of in-database code (package) and the user calling expectation has privileges to see that source code. + +Matcher defines the comparison operation to be performed on expected (and actual) value. Pseudo-code: ```sql ut.expect( a_actual {data-type} [, a_message {varchar2}] ).to_( {matcher} ); ut.expect( a_actual {data-type} [, a_message {varchar2}] ).not_to( {matcher} ); ``` -All matchers have shortcuts like below, sou you don't need to surround matcher with brackets, unless you want to pass it as parameter to the expectation. +Expectations provide two variants of syntax that you can use. Both variants are functionally-equal but give different usage flexibility. + +Syntax where matcher is passed as parameter to the expectation: ```sql - ut.expect( a_actual {data-type} ).to_{matcher}; - ut.expect( a_actual {data-type} ).not_to_{matcher}; + ut.expect( a_actual ).to_( {matcher} ); + ut.expect( a_actual ).not_to( {matcher} ); + -- example + ut.expect( 1 ).to_( be_null() ); +``` + +Shortcut syntax, where matcher is directly part of expectation: +```sql + ut.expect( a_actual ).to_{matcher}; + ut.expect( a_actual ).not_to_{matcher}; + + --example + ut.expect( 1 ).to_( be_null() ); +``` + +When using shortcut syntax you don't need to surround matcher with brackets. Shortcut syntax is provided for convenience. + +If you would like to perform more dynamic checks in your code, you could pass the matcher into a procedure like in the below example: +```sql +declare + procedure do_check( p_actual varchar2, p_matcher ut_matcher ) is + begin + ut.expect(p_actual).to_( p_matcher ); + end; +begin + do_check( 'a', equal('b') ); + do_check( 'Alibaba', match('ali','i') ); +end; +/ +``` + +Returns following output via DBMS_OUTPUT: +``` +FAILURE + Actual: 'a' (varchar2) was expected to equal: 'b' (varchar2) + at "anonymous block", line 4 + at "anonymous block", line 7 +SUCCESS + Actual: 'Alibaba' (varchar2) was expected to match: 'ali' , modifiers 'i' ``` -## Providing a custom failure message -You can provide a custom failure message as second argument for the expectation. +**Note:** +> The examples in the document will be only using shortcut syntax, to keep the document brief. + +# Matchers +utPLSQL provides the following matchers to perform checks on the expected and actual values. + +- `be_between( a_upper_bound {data-type}, a_lower_bound {data-type} )` +- `be_empty()` +- `be_false()` +- `be_greater_than( a_expected {data-type} )` +- `be_greater_or_equal( a_expected {data-type} )` +- `be_less_or_equal( a_expected {data-type} )` +- `be_less_than( a_expected {data-type} )` +- `be_like( a_mask {varchar2} [, a_escape_char {varchar2}] )` +- `be_not_null()` +- `be_null()` +- `be_true()` +- `equal( a_expected {data-type} [, a_nulls_are_equal {boolean}] )` +- `contain( a_expected {data-type})` +- `have_count( a_expected {integer} )` +- `match( a_patter {varchar2} [, a_modifiers {varchar2}] )` + +## Providing a custom message +You can provide a custom failure message as second argument for the expectation by passing message as the second parameter to the expectation. +`ut.expect( a_actual {data-type}, a_message {varchar2} ).to_{matcher}` + +Example: ````sql - -- Pseudocode - ut.expect( a_actual {data-type}, a_message {varchar2} ).to_{matcher}; - -- Example - ut.expect( 'supercat', 'checked superhero-animal was not a dog' ).to_( equal('superdog') ); +exec ut.expect( 'supercat', 'checked superhero-animal was not a dog' ).to_equal('superdog'); ```` +Returns following output via DBMS_OUTPUT: +``` +FAILURE + "checked superhero-animal was not a dog" + Actual: 'supercat' (varchar2) was expected to equal: 'superdog' (varchar2) + at "anonymous block", line 1 +``` If the message is provided, it is being added to the normal failure message returned by the matcher. - This is mostly useful when your expectations accept dynamic content, as you can provide additional context to make failing test results more readable. -### Dynamic tests example -You have a bunch of tables and an archive functionality for them and you want to test if the things you put into live-tables are removed from live-tables and present in archive-tables. +In most cases, there is no need to provide custom message to expectation. This is because utPLSQL identifies: +- The test used to execute the expectation +- The line number where the expectation is placed in your test code +- The line text of the expectation -````sql -procedure test_data_existance( i_tableName varchar2 ) - as - v_count_real integer; - v_count_archive integer; - begin - - execute immediate 'select count(*) from ' || i_tablename || '' into v_count_real; - execute immediate 'select count(*) from ' || i_tablename || '_ARCHIVE' into v_count_archive; - - ut.expect( v_count_archive, 'failure checking entry-count of ' || i_tablename || '_archive' ).to_( equal(1) ); - ut.expect( v_count_real, 'failure checking entry-count of ' || i_tablename ).to_( equal(0) ); +Custom message is useful, if your expectation is placed in a shared procedure to perform a check and your test is using the procedure multiple times. +Example: +```sql +create or replace package shared_expectation_test is + --%suite + + --%test + procedure the_test; +end; +/ +create or replace package body shared_expectation_test is + procedure table_is_empty(p_table_name varchar2) is + l_count integer; + begin + execute immediate 'select count(*) from '||p_table_name into l_count; + ut.expect( l_count, 'Checking table '||p_table_name ).to_equal(0); end; - - procedure test_archive_data - as + + procedure the_test is begin - -- Arrange - -- insert several data into real-tables here + table_is_empty('ALL_USERS'); + table_is_empty('ALL_TABLES'); + end; +end; +/ - -- Act - package_to_test.archive_data(); +exec ut.run('shared_expectation_test'); +``` - -- Assert - test_data_existance('TABLE_A'); - test_data_existance('TABLE_B'); - test_data_existance('TABLE_C'); - test_data_existance('TABLE_D'); -end; -```` -A failed output will look like this: -```` +Returns following output via DBMS_OUTPUT: +``` +shared_expectation_test + the_test [.064 sec] (FAILED - 1) + Failures: - 1) test_archive_data - "failure checking entry-count of table_a_archive" - Actual: 2 (number) was expected to equal: 1 (number) - at "UT_TEST_PACKAGE.TEST_DATA_EXISTANCE", line 12 ut.expect( v_count_archive, 'failure checking entry-count of ' || i_tablename || '_archive' ).to_( equal(1) ); -```` + 1) the_test + "Checking table ALL_USERS" + Actual: 28 (number) was expected to equal: 0 (number) + at "UT3$USER#.SHARED_EXPECTATION_TEST.TABLE_IS_EMPTY", line 6 ut.expect( l_count, 'Checking table '||p_table_name ).to_equal(0); + at "UT3$USER#.SHARED_EXPECTATION_TEST.THE_TEST", line 11 + + "Checking table ALL_TABLES" + Actual: 55 (number) was expected to equal: 0 (number) + at "UT3$USER#.SHARED_EXPECTATION_TEST.TABLE_IS_EMPTY", line 6 ut.expect( l_count, 'Checking table '||p_table_name ).to_equal(0); + at "UT3$USER#.SHARED_EXPECTATION_TEST.THE_TEST", line 12 + +Finished in .066344 seconds +1 tests, 1 failed, 0 errored, 0 disabled, 0 warning(s) +``` + +In the tests results window you can see the list of failed expectations for a test as well as: +- the additional message for expectation +- the reason why the expectation failed +- the line number of the expectation +- the line text of the expectations +- the call stack for the expectation (in the example it's the lines that called the procedure `table_is_empty`) + +## Negating a matcher + +Expectations provide a very convenient way to perform a check on a negated matcher. + +Syntax to check for matcher evaluating to true: +```sql +begin + ut.expect( a_actual {data-type} ).to_{matcher}; + ut.expect( a_actual {data-type} ).to_( {matcher} ); +end; +``` + +Syntax to check for matcher evaluating to false: +```sql +begin + ut.expect( a_actual {data-type} ).not_to_{matcher}; + ut.expect( a_actual {data-type} ).not_to( {matcher} ); +end; +``` + +If a matcher evaluated to NULL, then both `to_` and `not_to` will cause the expectation to report failure. + +Example: +```sql +declare + l_actual boolean; +begin + ut.expect( l_actual ).to_be_true(); + ut.expect( l_actual ).not_to_be_true(); +end; +/ +``` + +Returns following output via DBMS_OUTPUT: +``` +FAILURE + Actual: NULL (boolean) was expected to be true + at "anonymous block", line 4 +FAILURE + Actual: NULL (boolean) was expected not to be true + at "anonymous block", line 5 +``` +Since NULL is neither *true* nor *false*, both expectations will report failure. + +# Supported data types + +The matrix below illustrates the data types supported by different matchers. + +| Matcher | blob | boolean | clob | date | number | timestamp | timestamp
with
timezone | timestamp
with
local
timezone | varchar2 | interval
year
to
month | interval
day
to
second | cursor | nested
table
/ varray | object | json | +| :---------------------: | :--: | :-----: | :--: | :--: | :----: | :-------: | :---------------------------: | :------------------------------------: | :------: | :-----------------------------: | :-----------------------------: | :----: | :-------------------------: | :----: | :--: | +| **be_not_null** | X | X | X | X | X | X | X | X | X | X | X | X | X | X | X | +| **be_null** | X | X | X | X | X | X | X | X | X | X | X | X | X | X | X | +| **be_false** | | X | | | | | | | | | | | | | | +| **be_true** | | X | | | | | | | | | | | | | | +| **be_greater_than** | | | | X | X | X | X | X | | X | X | | | | | +| **be_greater_or_equal** | | | | X | X | X | X | X | | X | X | | | | | +| **be_less_or_equal** | | | | X | X | X | X | X | | X | X | | | | | +| **be_less_than** | | | | X | X | X | X | X | | X | X | | | | | +| **be_between** | | | | X | X | X | X | X | X | X | X | | | | | +| **equal** | X | X | X | X | X | X | X | X | X | X | X | X | X | X | X | +| **contain** | | | | | | | | | | | | X | X | X | | +| **match** | | | X | | | | | | X | | | | | | | +| **be_like** | | | X | | | | | | X | | | | | | | +| **be_empty** | X | | X | | | | | | | | | X | X | | X | +| **have_count** | | | | | | | | | | | | X | X | | X | + # Expecting exceptions -Testing is not limited to checking for happy-path scenarios. When writing tests, you often want to check that in specific scenarios, an exception is thrown. +Testing is not limited to checking for happy-path scenarios. When writing tests, you often want to validate that in specific scenarios, an exception is thrown. -Use the `--%throws` annotation, to test for expected exceptions +Use the `--%throws` annotation, to test for expected exceptions. Example: ```sql @@ -101,9 +271,6 @@ end; create or replace package test_divide as --%suite(Divide function) - --%test(Return divided numbers) - procedure divides_numbers; - --%test(Throws divisor equal) --%throws(-01476) procedure raises_divisor_exception; @@ -112,11 +279,6 @@ end; create or replace package body test_divide is - procedure divides_numbers is - begin - ut.expect(divide(6,2)).to_equal(3); - end; - procedure raises_divisor_exception is x integer; begin @@ -129,40 +291,77 @@ end; exec ut.run('test_divide'); ``` -For details see documentation of the [`--%throws` annotation.](annotations.md#throws-annotation) +Returns following output via DBMS_OUTPUT: +``` +Divide function + Throws divisor equal [.007 sec] + +Finished in .009229 seconds +1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s) +``` + +For more details see documentation of the [`--%throws` annotation.](annotations.md#throws-annotation) -# Matchers -utPLSQL provides the following matchers to perform checks on the expected and actual values. +# Matchers + +You can choose different matchers to validate the your PL/SQL code is working as expected. -- `be_between` -- `be_empty` -- `be_false` -- `be_greater_than` -- `be_greater_or_equal` -- `be_less_or_equal` -- `be_less_than` -- `be_like` -- `be_not_null` -- `be_null` -- `be_true` -- `equal` -- `contain` -- `have_count` -- `match` ## be_between Validates that the actual value is between the lower and upper bound. Example: ```sql +declare + l_timestamp timestamp := current_timestamp; + l_timestamp_tz timestamp with time zone := systimestamp; + l_timestamp_ltz timestamp with local time zone := systimestamp; + l_interval_ds interval day to second := interval '1' second; + l_interval_ym interval year to month := interval '1' year; begin - ut.expect( a_actual => 3 ).to_be_between( a_lower_bound => 1, a_upper_bound => 3 ); ut.expect( 3 ).to_be_between( 1, 3 ); - --or - ut.expect( a_actual => 3 ).to_( be_between( a_lower_bound => 1, a_upper_bound => 3 ) ); - ut.expect( 3 ).to_( be_between( 1, 3 ) ); + ut.expect( 5 ).to_( be_between( 1, 3 ) ); + ut.expect( 3 ).not_to_be_between( 1, 3 ); + ut.expect( 5 ).not_to( be_between( 1, 3 ) ); + ut.expect( sysdate ).to_be_between( sysdate, sysdate + 1 ); + ut.expect( l_timestamp ).to_be_between( l_timestamp, l_timestamp ); + ut.expect( systimestamp ).to_be_between( l_timestamp_tz, systimestamp ); + ut.expect( systimestamp ).to_be_between( l_timestamp_ltz, l_timestamp_ltz ); + ut.expect( l_interval_ds ).to_be_between( interval '0.1' second, interval '1' day ); + ut.expect( l_interval_ym ).to_be_between( interval '12' month, interval '12' year ); + ut.expect( 'Abb' ).to_be_between( 'Aba', 'Abc' ); end; +/ +``` + +Returns following output via DBMS_OUTPUT: +``` +SUCCESS + Actual: 3 (number) was expected to be between: 1 and 3 +FAILURE + Actual: 5 (number) was expected to be between: 1 and 3 + at "anonymous block", line 9 +FAILURE + Actual: 3 (number) was expected not to be between: 1 and 3 + at "anonymous block", line 10 +SUCCESS + Actual: 5 (number) was expected not to be between: 1 and 3 +SUCCESS + Actual: 2019-07-07T21:25:27 (date) was expected to be between: 2019-07-07T21:25:27 and 2019-07-08T21:25:27 +SUCCESS + Actual: 2019-07-07T22:25:27.701546000 (timestamp) was expected to be between: 2019-07-07T22:25:27.701546000 and 2019-07-07T22:25:27.701546000 +SUCCESS + Actual: 2019-07-07T21:25:27.705768000 +00:00 (timestamp with time zone) was expected to be between: 2019-07-07T21:25:27.701596000 +00:00 and 2019-07-07T21:25:27.705808000 +00:00 +FAILURE + The matcher 'be between' cannot be used with data type (timestamp with time zone). + at "anonymous block", line 15 +SUCCESS + Actual: +000000000 00:00:01.000000000 (interval day to second) was expected to be between: +000000000 00:00:00.100000000 and +000000001 00:00:00.000000000 +SUCCESS + Actual: +000000001-00 (interval year to month) was expected to be between: +000000001-00 and +000000012-00 +SUCCESS + Actual: 'Abb' (varchar2) was expected to be between: 'Aba' and 'Abc' ``` ## be_empty @@ -174,27 +373,44 @@ Can be used with `BLOB`,`CLOB`, `refcursor` or `nested table`/`varray` passed as BLOB/CLOB that is initialized is not NULL but it is actually equal to `empty_blob()`/`empty_clob()`. -Usage: +Example: ```sql -procedure test_if_cursor_is_empty is +declare l_cursor sys_refcursor; begin - open l_cursor for select * from dual where 1 = 0; + open l_cursor for select * from dual where 0=1; ut.expect( l_cursor ).to_be_empty(); - --or - ut.expect( l_cursor ).to_( be_empty() ); + ut.expect( anydata.convertCollection(ut_varchar2_list()) ).to_( be_empty() ); + ut.expect( empty_clob() ).not_to_be_empty(); + ut.expect( empty_blob() ).not_to( be_empty() ); + ut.expect( 1 ).not_to( be_empty() ); end; +/ ``` -```sql -procedure test_if_cursor_is_empty is - l_data ut_varchar2_list; -begin - l_data := ut_varchar2_list(); - ut.expect( anydata.convertCollection( l_data ) ).to_be_empty(); - --or - ut.expect( anydata.convertCollection( l_data ) ).to_( be_empty() ); -end; +Returns following output via DBMS_OUTPUT: +``` +SUCCESS + Actual: (refcursor [ count = 0 ]) + Data-types: + VARCHAR2 + Data: + was expected to be empty +SUCCESS + Actual: (ut3.ut_varchar2_list [ count = 0 ]) + Data-types: + VARCHAR2 + Data: + was expected to be empty +FAILURE + Actual: EMPTY (clob) was expected not to be empty + at "anonymous block", line 7 +FAILURE + Actual: EMPTY (blob) was expected not to be empty + at "anonymous block", line 8 +FAILURE + The matcher 'be empty' cannot be used with data type (number). + at "anonymous block", line 9 ``` ## be_false @@ -204,9 +420,25 @@ Usage: ```sql begin ut.expect( ( 1 = 0 ) ).to_be_false(); - --or - ut.expect( ( 1 = 0 ) ).to_( be_false() ); + ut.expect( ( 1 = 1 ) ).to_( be_false() ); + ut.expect( ( 1 = 0 ) ).not_to_be_false(); + ut.expect( ( 1 = 1 ) ).not_to( be_false() ); end; +/ +``` + +Returns following output via DBMS_OUTPUT: +``` +SUCCESS + Actual: FALSE (boolean) was expected to be false +FAILURE + Actual: TRUE (boolean) was expected to be false + at "anonymous block", line 3 +FAILURE + Actual: FALSE (boolean) was expected not to be false + at "anonymous block", line 4 +SUCCESS + Actual: TRUE (boolean) was expected not to be false ``` ## be_greater_or_equal @@ -216,9 +448,25 @@ Usage: ```sql begin ut.expect( sysdate ).to_be_greater_or_equal( sysdate - 1 ); - --or - ut.expect( sysdate ).to_( be_greater_or_equal( sysdate - 1 ) ); + ut.expect( sysdate ).to_( be_greater_or_equal( sysdate + 1 ) ); + ut.expect( sysdate ).not_to_be_greater_or_equal( sysdate - 1 ); + ut.expect( sysdate ).not_to( be_greater_or_equal( sysdate + 1 ) ); end; +/ +``` + +Returns following output via DBMS_OUTPUT: +``` +SUCCESS + Actual: 2019-07-07T22:43:29 (date) was expected to be greater or equal: 2019-07-06T22:43:29 (date) +FAILURE + Actual: 2019-07-07T22:43:29 (date) was expected to be greater or equal: 2019-07-08T22:43:29 (date) + at "anonymous block", line 3 +FAILURE + Actual: 2019-07-07T22:43:29 (date) was expected not to be greater or equal: 2019-07-06T22:43:29 (date) + at "anonymous block", line 4 +SUCCESS + Actual: 2019-07-07T22:43:29 (date) was expected not to be greater or equal: 2019-07-08T22:43:29 (date) ``` ## be_greater_than @@ -228,9 +476,25 @@ Usage: ```sql begin ut.expect( 2 ).to_be_greater_than( 1 ); - --or - ut.expect( 2 ).to_( be_greater_than( 1 ) ); + ut.expect( 0 ).to_( be_greater_than( 1 ) ); + ut.expect( 2 ).not_to_be_greater_than( 1 ); + ut.expect( 0 ).not_to( be_greater_than( 1 ) ); end; +/ +``` + +Returns following output via DBMS_OUTPUT: +``` +SUCCESS + Actual: 2 (number) was expected to be greater than: 1 (number) +FAILURE + Actual: 0 (number) was expected to be greater than: 1 (number) + at "anonymous block", line 3 +FAILURE + Actual: 2 (number) was expected not to be greater than: 1 (number) + at "anonymous block", line 4 +SUCCESS + Actual: 0 (number) was expected not to be greater than: 1 (number) ``` ## be_less_or_equal @@ -240,9 +504,25 @@ Usage: ```sql begin ut.expect( 3 ).to_be_less_or_equal( 3 ); - --or - ut.expect( 3 ).to_( be_less_or_equal( 3 ) ); + ut.expect( 4 ).to_( be_less_or_equal( 3 ) ); + ut.expect( 3 ).not_to_be_less_or_equal( 3 ); + ut.expect( 4 ).not_to( be_less_or_equal( 3 ) ); end; +/ +``` + +Returns following output via DBMS_OUTPUT: +``` +SUCCESS + Actual: 3 (number) was expected to be less or equal: 3 (number) +FAILURE + Actual: 4 (number) was expected to be less or equal: 3 (number) + at "anonymous block", line 3 +FAILURE + Actual: 3 (number) was expected not to be less or equal: 3 (number) + at "anonymous block", line 4 +SUCCESS + Actual: 4 (number) was expected not to be less or equal: 3 (number) ``` ## be_less_than @@ -252,30 +532,64 @@ Usage: ```sql begin ut.expect( 3 ).to_be_less_than( 2 ); - --or - ut.expect( 3 ).to_( be_less_than( 2 ) ); + ut.expect( 0 ).to_( be_less_than( 2 ) ); + ut.expect( 3 ).not_to_be_less_than( 2 ); + ut.expect( 0 ).not_to( be_less_than( 2 ) ); end; +/ ``` +Returns following output via DBMS_OUTPUT: +``` +FAILURE + Actual: 3 (number) was expected to be less than: 2 (number) + at "anonymous block", line 2 +SUCCESS + Actual: 0 (number) was expected to be less than: 2 (number) +SUCCESS + Actual: 3 (number) was expected not to be less than: 2 (number) +FAILURE + Actual: 0 (number) was expected not to be less than: 2 (number) + at "anonymous block", line 5 +``` ## be_like Validates that the actual value is like the expected expression. +Syntax: + +`ut.expect( a_actual ).to_be_like( a_mask [, a_escape_char] )` + +Parameters `a_mask` and `a_escape_char` represent valid parameters of the [Oracle LIKE condition](https://docs.oracle.com/database/121/SQLRF/conditions007.htm#SQLRF52142). + +If you use Oracle Database version 11.2.0.4, you may run into Oracle Bug 14402514: WRONG RESULTS WITH LIKE ON CLOB USING ESCAPE CHARACTER. In this case we recommend to use `match` instead of `be_like`. + Usage: ```sql begin - ut.expect( 'Lorem_impsum' ).to_be_like( a_mask => '%rem#_%', a_escape_char => '#' ); - ut.expect( 'Lorem_impsum' ).to_be_like( '%rem#_%', '#' ); - --or - ut.expect( 'Lorem_impsum' ).to_( be_like( a_mask => '%rem#_%', a_escape_char => '#' ) ); - ut.expect( 'Lorem_impsum' ).to_( be_like( '%rem#_%', '#' ) ); + ut.expect( 'Lorem_impsum' ).to_be_like( '%rem%'); + ut.expect( 'Lorem_impsum' ).to_be_like( '%rem\_i%', '\' ); + ut.expect( 'Lorem_impsum' ).to_( be_like( 'Lor_m%' ) ); + ut.expect( 'Lorem_impsum' ).not_to_be_like( '%rem%'); + ut.expect( 'Lorem_impsum' ).not_to( be_like( '%reM%') ); end; +/ ``` -Parameters `a_mask` and `a_escape_char` represent valid parameters of the [Oracle LIKE condition](https://docs.oracle.com/database/121/SQLRF/conditions007.htm#SQLRF52142). - -If you use Oracle Database version 11.2.0.4, you may run into Oracle Bug 14402514: WRONG RESULTS WITH LIKE ON CLOB USING ESCAPE CHARACTER. In this case we recommend to use `match` instead of `be_like`. - +Returns following output via DBMS_OUTPUT: +``` +SUCCESS + Actual: 'Lorem_impsum' (varchar2) was expected to be like: '%rem%' +SUCCESS + Actual: 'Lorem_impsum' (varchar2) was expected to be like: '%rem\_i%' , escape '\' +SUCCESS + Actual: 'Lorem_impsum' (varchar2) was expected to be like: 'Lor_m%' +FAILURE + Actual: 'Lorem_impsum' (varchar2) was expected not to be like: '%rem%' + at "anonymous block", line 5 +SUCCESS + Actual: 'Lorem_impsum' (varchar2) was expected not to be like: '%reM%' +``` ## be_not_null Unary matcher that validates if the actual value is not null. @@ -284,11 +598,25 @@ Usage: ```sql begin ut.expect( to_clob('ABC') ).to_be_not_null(); - --or - ut.expect( to_clob('ABC') ).to_( be_not_null() ); - --or - ut.expect( to_clob('ABC') ).not_to( be_null() ); + ut.expect( to_clob('') ).to_( be_not_null() ); + ut.expect( to_clob('ABC') ).not_to_be_not_null(); + ut.expect( '').not_to( be_not_null() ); end; +/ +``` + +Returns following output via DBMS_OUTPUT: +``` +SUCCESS + Actual: 'ABC' (clob) was expected to be not null +FAILURE + Actual: NULL (clob) was expected to be not null + at "anonymous block", line 3 +FAILURE + Actual: 'ABC' (clob) was expected not to be not null + at "anonymous block", line 4 +SUCCESS + Actual: NULL (varchar2) was expected not to be not null ``` ## be_null @@ -297,23 +625,54 @@ Unary matcher that validates if the actual value is null. Usage: ```sql begin - ut.expect( cast(null as varchar2(100)) ).to_be_null(); - --or - ut.expect( cast(null as varchar2(100)) ).to_( be_null() ); + ut.expect( '' ).to_be_null(); + ut.expect( 0 ).to_( be_null() ); + ut.expect( '' ).not_to_be_null(); + ut.expect( 0 ).not_to( be_null() ); end; +/ +``` + +Returns following output via DBMS_OUTPUT: +``` +SUCCESS + Actual: NULL (varchar2) was expected to be null +FAILURE + Actual: 0 (number) was expected to be null + at "anonymous block", line 3 +FAILURE + Actual: NULL (varchar2) was expected not to be null + at "anonymous block", line 4 +SUCCESS + Actual: 0 (number) was expected not to be null ``` ## be_true Unary matcher that validates if the provided value is true. -- `boolean` Usage: ```sql -begin - ut.expect( ( 1 = 1 ) ).to_be_true(); - --or +begin + ut.expect( ( 1 = 0 ) ).to_be_true(); ut.expect( ( 1 = 1 ) ).to_( be_true() ); + ut.expect( ( 1 = 0 ) ).not_to_be_true(); + ut.expect( ( 1 = 1 ) ).not_to( be_true() ); end; +/ +``` + +Returns following output via DBMS_OUTPUT: +``` +FAILURE + Actual: FALSE (boolean) was expected to be true + at "anonymous block", line 2 +SUCCESS + Actual: TRUE (boolean) was expected to be true +SUCCESS + Actual: FALSE (boolean) was expected not to be true +FAILURE + Actual: TRUE (boolean) was expected not to be true + at "anonymous block", line 5 ``` ## have_count @@ -323,123 +682,158 @@ Can be used with `refcursor` , `json`or `table type` Usage: ```sql -procedure test_if_cursor_is_empty is +declare l_cursor sys_refcursor; + l_collection ut_varchar2_list; begin open l_cursor for select * from dual connect by level <=10; ut.expect( l_cursor ).to_have_count(10); - --or + open l_cursor for select rownum from xmltable('1 to 5'); ut.expect( l_cursor ).to_( have_count(10) ); + l_collection := ut_varchar2_list( 'a', 'a', 'b' ); + ut.expect( anydata.convertCollection( l_collection ) ).not_to_have_count(10); + ut.expect( anydata.convertCollection( l_collection ) ).not_to( have_count(3) ); end; +/ +``` + +Returns following output via DBMS_OUTPUT: +``` +SUCCESS + Actual: (refcursor [ count = 10 ]) was expected to have [ count = 10 ] +FAILURE + Actual: (refcursor [ count = 5 ]) was expected to have [ count = 10 ] + at "anonymous block", line 8 +SUCCESS + Actual: ut3.ut_varchar2_list [ count = 3 ] was expected not to have [ count = 10 ] +FAILURE + Actual: ut3.ut_varchar2_list [ count = 3 ] was expected not to have [ count = 3 ] + at "anonymous block", line 11 ``` ## match Validates that the actual value is matching the expected regular expression. +Syntax: + +`ut.expect( a_actual ).to_match( a_pattern [, a_modifiers] );` + +Parameters `a_pattern` and `a_modifiers` represent a valid regexp pattern accepted by [Oracle REGEXP_LIKE condition](https://docs.oracle.com/database/121/SQLRF/conditions007.htm#SQLRF00501) + Usage: ```sql begin - ut.expect( a_actual => '123-456-ABcd' ).to_match( a_pattern => '\d{3}-\d{3}-[a-z]', a_modifiers => 'i' ); - ut.expect( 'some value' ).to_match( '^some.*' ); - --or - ut.expect( a_actual => '123-456-ABcd' ).to_( match( a_pattern => '\d{3}-\d{3}-[a-z]', a_modifiers => 'i' ) ); - ut.expect( 'some value' ).to_( match( '^some.*' ) ); + ut.expect( '123-456-ABcd' ).to_match( '\d{3}-\d{3}-[a-z]{4}', 'i' ); + ut.expect( 'some value' ).to_( match( '^some.*' ) ) ; + ut.expect( '123-456-ABcd' ).not_to_match( '\d{3}-\d{3}-[a-z]{4}', 'i' ); + ut.expect( 'some value' ).not_to( match( '^some.*' ) ) ; end; +/ ``` -Parameters `a_pattern` and `a_modifiers` represent a valid regexp pattern accepted by [Oracle REGEXP_LIKE condition](https://docs.oracle.com/database/121/SQLRF/conditions007.htm#SQLRF00501) +Returns following output via DBMS_OUTPUT: +``` +SUCCESS + Actual: '123-456-ABcd' (varchar2) was expected to match: '\d{3}-\d{3}-[a-z]{4}' , modifiers 'i' +SUCCESS + Actual: 'some value' (varchar2) was expected to match: '^some.*' +FAILURE + Actual: '123-456-ABcd' (varchar2) was expected not to match: '\d{3}-\d{3}-[a-z]{4}' , modifiers 'i' + at "anonymous block", line 4 +FAILURE + Actual: 'some value' (varchar2) was expected not to match: '^some.*' + at "anonymous block", line 5 +``` ## equal The equal matcher is very restrictive. Test using this matcher succeeds only when the compared data-types are exactly the same. If you are comparing `varchar2` to a `number` will fail even if the text contains the same numeric value as the number. The matcher will also fail when comparing a `timestamp` to a `timestamp with timezone` data-type etc. -The matcher enables detection data-type changes. + +The matcher enables detection of data-type changes. If you expect your variable to be a number and it is now some other type, the test will fail and give you early indication of a potential problem. To keep it simple, the `equal` matcher will only succeed if you compare apples to apples. +Syntax: + +`ut.expect( a_actual ).to_equal( a_expected [, a_nulls_are_equal])[.advanced_options]` Example usage ```sql -function get_animal return varchar2 is +declare + l_actual varchar2(20); + l_expected varchar2(20); begin - return 'a dog'; + --Arrange + l_actual := 'a dog'; + --Assert + ut.expect( l_actual ).to_equal( 'other_dog' ); + ut.expect( l_actual ).to_equal( '' ); + ut.expect( l_actual ).to_equal( 1 ); + + l_actual := null; + ut.expect( l_actual ).to_equal( '' ); + ut.expect( l_actual ).to_equal( '', a_nulls_are_equal => false ); + ut.expect( l_actual ).not_to_equal( '' ); + ut.expect( sysdate ).to_equal( sysdate ); + ut.expect( sysdate ).to_equal( current_timestamp ); + ut.expect( current_timestamp ).to_equal( systimestamp ); + ut.expect( to_clob('varchar') ).to_equal( 'varchar' ); + ut.expect( to_blob('aa') ).to_equal( to_blob('aa') ); + ut.expect( to_clob('aa') ).to_equal( to_clob('aa') ); + ut.expect( to_blob('aa') ).to_equal( to_clob('aa') ); end; / +``` -create or replace package test_animals_getter is - - --%suite(Animals getter tests) - - --%test(get_animal - returns a dog) - procedure test_variant_1_get_animal; - --%test(get_animal - returns a dog) - procedure test_variant_2_get_animal; - --%test(get_animal - returns a dog) - procedure test_variant_3_get_animal; - --%test(get_animal - returns a dog) - procedure test_variant_4_get_animal; - --%test(get_animal - returns a dog) - procedure test_variant_5_get_animal; -end; -/ -create or replace package body test_animals_getter is - - --The below tests perform exactly the same check. - --They use different syntax to achieve the goal. - procedure test_variant_1_get_animal is - l_actual varchar2(100) := 'a dog'; - l_expected varchar2(100); - begin - --Arrange - l_actual := 'a dog'; - --Act - l_expected := get_animal(); - --Assert - ut.expect( l_actual ).to_equal( l_expected ); - end; - - procedure test_variant_2_get_animal is - l_expected varchar2(100); - begin - --Act - l_expected := get_animal(); - --Assert - ut.expect( l_expected ).to_equal( 'a dog' ); - end; - - procedure test_variant_3_get_animal is - begin - --Act / Assert - ut.expect( get_animal() ).to_equal( 'a dog' ); - end; - - procedure test_variant_4_get_animal is - begin - --Act / Assert - ut.expect( get_animal() ).to_equal( 'a dog', a_nulls_are_equal => true ); - end; - - procedure test_variant_5_get_animal is - begin - --Act / Assert - ut.expect( get_animal() ).to_( equal( 'a dog' ) ); - end; - - procedure test_variant_6_get_animal is - begin - --Act / Assert - ut.expect( get_animal() ).to_( equal( 'a dog', a_nulls_are_equal => true ) ); - end; -end; +Returns following output via DBMS_OUTPUT: +``` +FAILURE + Actual: 'a dog' (varchar2) was expected to equal: 'other_dog' (varchar2) + at "anonymous block", line 8 +FAILURE + Actual: 'a dog' (varchar2) was expected to equal: NULL (varchar2) + at "anonymous block", line 9 +FAILURE + Actual (varchar2) cannot be compared to Expected (number) using matcher 'equal'. + at "anonymous block", line 10 +SUCCESS + Actual: NULL (varchar2) was expected to equal: NULL (varchar2) +FAILURE + Actual: NULL (varchar2) was expected to equal: NULL (varchar2) + at "anonymous block", line 14 +FAILURE + Actual: NULL (varchar2) was expected not to equal: NULL (varchar2) + at "anonymous block", line 15 +SUCCESS + Actual: 2019-07-07T22:50:21 (date) was expected to equal: 2019-07-07T22:50:21 (date) +FAILURE + Actual (date) cannot be compared to Expected (timestamp with time zone) using matcher 'equal'. + at "anonymous block", line 17 +FAILURE + Actual: 2019-07-07T23:50:21.159268000 +01:00 (timestamp with time zone) was expected to equal: 2019-07-07T22:50:21.159296000 +00:00 (timestamp with time zone) + at "anonymous block", line 18 +FAILURE + Actual (clob) cannot be compared to Expected (varchar2) using matcher 'equal'. + at "anonymous block", line 19 +SUCCESS + Actual: 'AA' (blob) was expected to equal: 'AA' (blob) +SUCCESS + Actual: 'aa' (clob) was expected to equal: 'aa' (clob) +FAILURE + Actual (blob) cannot be compared to Expected (clob) using matcher 'equal'. + at "anonymous block", line 22 ``` -**Comparing NULLs is by default a success!** + +**Note:** +>**Comparing NULLs gives success by default ** The `a_nulls_are_equal` parameter controls the behavior of a `null = null` comparison. To change the behavior of `NULL = NULL` comparison pass the `a_nulls_are_equal => false` to the `equal` matcher. ## contain -This matcher supports only compound data comparison. It check if the give set contain all values from given subset. +This matcher supports only compound data-types comparison. It check if the actual set contains all values of expected subset. When comparing data using `contain` matcher, the data-types of columns for compared compound types must be exactly the same. @@ -451,263 +845,180 @@ The matcher will cause a test to fail if actual data set does not contain any of ![included_set](../images/venn21.gif) -*Example 1*. - +**Example 1.** ```sql - procedure ut_refcursors is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; - begin - --Arrange - open l_actual for select rownum as rn from dual a connect by level < 10; - open l_expected for select rownum as rn from dual a connect by level < 4 - union all select rownum as rn from dual a connect by level < 4; - - --Act - ut.expect(l_actual).to_contain(l_expected); - end; +declare + l_actual sys_refcursor; + l_expected sys_refcursor; +begin + --Arrange + open l_actual for select rownum as rn from dual a connect by level < 10; + open l_expected for select rownum as rn from dual a connect by level < 4 + union all select rownum as rn from dual a connect by level < 4; + + --Act + ut.expect(l_actual).to_contain(l_expected); +end; +/ ``` -Will result in failure message - -```sql - 1) ut_refcursors - Actual: refcursor [ count = 9 ] was expected to contain: refcursor [ count = 6 ] - Diff: - Rows: [ 3 differences ] - Missing: 3 - Missing: 2 - Missing: 1 +Returns following output via DBMS_OUTPUT: +``` +FAILURE + Actual: refcursor [ count = 9 ] was expected to contain: refcursor [ count = 6 ] + Diff: + Rows: [ 3 differences ] + Missing: 1 + Missing: 2 + Missing: 3 + at "anonymous block", line 11 ``` - -When duplicate rows are present in expected data set, actual data set must also include the same amount of duplicates. - -*Example 2.* +When duplicate rows are present in expected data set, actual data set must also include the same amount of duplicates. +**Example 2.** ```sql -create or replace package ut_duplicate_test is - - --%suite(Sample Test Suite) - - --%test(Ref Cursor contain duplicates) - procedure ut_duplicate_contain; - -end ut_duplicate_test; +declare + l_actual ut_varchar2_list; + l_expected ut_varchar2_list; +begin + l_actual := ut_varchar2_list( 1, 2, 3, 4, 5, 6, 7, 8, 1 ); + l_expected := ut_varchar2_list( 1, 2, 1, 2 ); + ut.expect( anydata.convertCollection( l_actual ) ).to_contain( anydata.convertCollection( l_expected ) ); +end; / - -create or replace package body ut_duplicate_test is - procedure ut_duplicate_contain is - l_actual sys_refcursor; - l_expected sys_refcursor; - begin - open l_expected for select mod(level,2) as rn from dual connect by level < 5; - open l_actual for select mod(level,8) as rn from dual connect by level < 9; - ut.expect(l_actual).to_contain(l_expected); - end; - -end ut_duplicate_test; ``` -Will result in failure test message - -```sql - 1) ut_duplicate_contain - Actual: refcursor [ count = 8 ] was expected to contain: refcursor [ count = 4 ] - Diff: - Rows: [ 2 differences ] - Missing: 0 - Missing: 1 +Returns following output via DBMS_OUTPUT: +``` +FAILURE + Actual: ut3.ut_varchar2_list [ count = 9 ] was expected to contain: ut3.ut_varchar2_list [ count = 4 ] + Diff: + Rows: [ 1 differences ] + Missing: 2 + at "anonymous block", line 7 ``` - - The negated version of `contain` ( `not_to_contain` ) is successful only when all values from expected set are not part of actual (they are disjoint and there is no overlap). - ![not_overlapping_set](../images/venn22.gif) -*Example 3.* - -Set 1 is defined as [ A , B , C ] - -*Set 2 is defined as [A , D , E ]* - -*Result : This will fail both of options to `to_contain` and `not_to_contain`* - - - -*Example 4.* - -Set 1 is defined as [ A , B , C , D ] - -*Set 2 is defined as [A , B , D ]* - -*Result : This will be success on option `to_contain` and fail `not_to_contain`* - - - -*Example 5. - -Set 1 is defined as [ A , B , C ] - -*Set 2 is defined as [D, E , F ]* - -*Result : This will be success on options `not_to_contain` and fail `to_contain`* - - - -Example usage - +**Example 3.** ```sql -create or replace package example_contain is - --%suite(Contain test) - - --%test( Cursor contains data from another cursor) - procedure cursor_to_contain; - - --%test( Cursor contains data from another cursor) - procedure cursor_not_to_contain; - - --%test( Cursor fail on to_contain) - procedure cursor_fail_contain; - - --%test( Cursor fail not_to_contain) - procedure cursor_fail_not_contain; +declare + l_actual ut_varchar2_list; + l_expected ut_varchar2_list; +begin + l_actual := ut_varchar2_list( 'A', 'B', 'C' ); + l_expected := ut_varchar2_list( 'A', 'B', 'E' ); + ut.expect( anydata.convertCollection( l_actual ) ).to_contain( anydata.convertCollection( l_expected ) ); + ut.expect( anydata.convertCollection( l_actual ) ).not_to_contain( anydata.convertCollection( l_expected ) ); end; / - -create or replace package body example_contain is - - procedure cursor_to_contain is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; - begin - --Arrange - open l_actual for - select 'a' as name from dual union all - select 'b' as name from dual union all - select 'c' as name from dual union all - select 'd' as name from dual; - - open l_expected for - select 'a' as name from dual union all - select 'b' as name from dual union all - select 'c' as name from dual; - - --Act - ut.expect(l_actual).to_contain(l_expected); - end; - - procedure cursor_not_to_contain is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; - begin - --Arrange - open l_actual for - select 'a' as name from dual union all - select 'b' as name from dual union all - select 'c' as name from dual; - - open l_expected for - select 'd' as name from dual union all - select 'e' as name from dual union all - select 'f' as name from dual; - - --Act - ut.expect(l_actual).not_to_contain(l_expected); - end; - - procedure cursor_fail_contain is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; - begin - --Arrange - open l_actual for - select 'a' as name from dual union all - select 'b' as name from dual union all - select 'c' as name from dual; - - open l_expected for - select 'a' as name from dual union all - select 'd' as name from dual union all - select 'e' as name from dual; +``` - --Act - ut.expect(l_actual).to_contain(l_expected); - end; +Returns following output via DBMS_OUTPUT: +``` +FAILURE + Actual: ut3_latest_release.ut_varchar2_list [ count = 3 ] was expected to contain: ut3_latest_release.ut_varchar2_list [ count = 3 ] + Diff: + Rows: [ 1 differences ] + Missing: E + at "anonymous block", line 7 +FAILURE + Actual: (ut3_latest_release.ut_varchar2_list [ count = 3 ]) + Data-types: + VARCHAR2 + Data: + ABC + was expected not to contain:(ut3_latest_release.ut_varchar2_list [ count = 3 ]) + Data-types: + VARCHAR2 + Data: + ABE + at "anonymous block", line 8 +``` - procedure cursor_fail_not_contain is - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; - begin - --Arrange - open l_actual for - select 'a' as name from dual union all - select 'b' as name from dual union all - select 'c' as name from dual; - - open l_expected for - select 'a' as name from dual union all - select 'd' as name from dual union all - select 'e' as name from dual; +**Example 4.** - --Act - ut.expect(l_actual).not_to_contain(l_expected); - end; +```sql +declare + l_actual ut_varchar2_list; + l_expected ut_varchar2_list; +begin + l_actual := ut_varchar2_list( 'A', 'B', 'C', 'D' ); + l_expected := ut_varchar2_list( 'A', 'B', 'D' ); + ut.expect( anydata.convertCollection( l_actual ) ).to_contain( anydata.convertCollection( l_expected ) ); + ut.expect( anydata.convertCollection( l_actual ) ).not_to_contain( anydata.convertCollection( l_expected ) ); end; / ``` +Returns following output via DBMS_OUTPUT: +``` +SUCCESS + Actual: ut3_latest_release.ut_varchar2_list [ count = 4 ] was expected to contain: ut3_latest_release.ut_varchar2_list [ count = 3 ] +FAILURE + Actual: (ut3_latest_release.ut_varchar2_list [ count = 4 ]) + Data-types: + VARCHAR2 + Data: + ABCD + was expected not to contain:(ut3_latest_release.ut_varchar2_list [ count = 3 ]) + Data-types: + VARCHAR2 + Data: + ABD + at "anonymous block", line 8 +``` - -Above execution will provide results as follow: -Cursor contains data from another cursor -Cursor contains data from another cursor -Cursor fail on to_contain -Cursor fail not_to_contain +**Example 5.** ```sql -Contain test - Cursor contains data from another cursor [.045 sec] - Cursor contains data from another cursor [.039 sec] - Cursor fail on to_contain [.046 sec] (FAILED - 1) - Cursor fail not_to_contain [.043 sec] (FAILED - 2) - -Failures: - - 1) cursor_fail_contain - Actual: refcursor [ count = 3 ] was expected to contain: refcursor [ count = 3 ] - Diff: - Rows: [ 2 differences ] - Missing: d - Missing: e - at "UT3.EXAMPLE_CONTAIN.CURSOR_FAIL_CONTAIN", line 71 ut.expect(l_actual).to_contain(l_expected); - - - 2) cursor_fail_not_contain - Actual: (refcursor [ count = 3 ]) - Data-types: - CHAR - - Data: - a - b - c - was expected not to contain:(refcursor [ count = 3 ]) - Data-types: - CHAR - - Data: - a - d - e - at "UT3.EXAMPLE_CONTAIN.CURSOR_FAIL_NOT_CONTAIN", line 94 ut.expect(l_actual).not_to_contain(l_expected); +declare + l_actual ut_varchar2_list; + l_expected ut_varchar2_list; +begin + l_actual := ut_varchar2_list( 'A', 'B', 'C' ); + l_expected := ut_varchar2_list( 'D', 'E', 'F' ); + ut.expect( anydata.convertCollection( l_actual ) ).to_contain( anydata.convertCollection( l_expected ) ); + ut.expect( anydata.convertCollection( l_actual ) ).not_to_contain( anydata.convertCollection( l_expected ) ); +end; +/ +``` + +Returns following output via DBMS_OUTPUT: +``` +FAILURE + Actual: ut3_latest_release.ut_varchar2_list [ count = 3 ] was expected to contain: ut3_latest_release.ut_varchar2_list [ count = 3 ] + Diff: + Rows: [ 3 differences ] + Missing: D + Missing: E + Missing: F + at "anonymous block", line 7 +SUCCESS + Actual: (ut3_latest_release.ut_varchar2_list [ count = 3 ]) + Data-types: + VARCHAR2 + Data: + ABC + was expected not to contain:(ut3_latest_release.ut_varchar2_list [ count = 3 ]) + Data-types: + VARCHAR2 + Data: + DEF ``` +---------------------------------------------------------------------------------- +---------------------------------------------------------------------------------- + TODO - continue doc rewrite + TODO - fix negated results for contain & equal +---------------------------------------------------------------------------------- +---------------------------------------------------------------------------------- ## Comparing cursors, object types, nested tables and varrays @@ -1286,7 +1597,7 @@ create or replace package body test_expectations_json is ] }'); - ut3.ut.expect( l_actual ).to_equal( l_actual ); + ut.expect( l_actual ).to_equal( l_actual ); end; end; @@ -1374,69 +1685,9 @@ create or replace package body test_expectations_json is l_array_actual := json_array_t(json_query(l_actual.stringify,'$.Actors.children')); l_array_expected := json_array_t(json_query(l_expected.stringify,'$.Actors[1].children')); --Act - ut3.ut.expect(l_array_actual).to_equal(l_array_expected); + ut.expect(l_array_actual).to_equal(l_array_expected); end; end; / ``` - - - - - - - -# Negating a matcher - -Expectations provide a very convenient way to perform a check on a negated matcher. - -Syntax to check for matcher evaluating to true: -```sql -begin - ut.expect( a_actual {data-type} ).to_{matcher}; - ut.expect( a_actual {data-type} ).to_( {matcher} ); -end; -``` - -Syntax to check for matcher evaluating to false: -```sql -begin - ut.expect( a_actual {data-type} ).not_to_{matcher}; - ut.expect( a_actual {data-type} ).not_to( {matcher} ); -end; -``` - -If a matcher evaluated to NULL, then both `to_` and `not_to` will cause the expectation to report failure. - -Example: -```sql -begin - ut.expect( null ).to_( be_true() ); - ut.expect( null ).not_to( be_true() ); -end; -``` -Since NULL is neither *true* nor *false*, both expectations will report failure. - -# Supported data types - -The matrix below illustrates the data types supported by different matchers. - -| Matcher | blob | boolean | clob | date | number | timestamp | timestamp
with
timezone | timestamp
with
local
timezone | varchar2 | interval
year
to
month | interval
day
to
second | cursor | nested
table
/ varray | object | json | -| :---------------------: | :--: | :-----: | :--: | :--: | :----: | :-------: | :---------------------------: | :------------------------------------: | :------: | :-----------------------------: | :-----------------------------: | :----: | :-------------------------: | :----: | :--: | -| **be_not_null** | X | X | X | X | X | X | X | X | X | X | X | X | X | X | X | -| **be_null** | X | X | X | X | X | X | X | X | X | X | X | X | X | X | X | -| **be_false** | | X | | | | | | | | | | | | | | -| **be_true** | | X | | | | | | | | | | | | | | -| **be_greater_than** | | | | X | X | X | X | X | | X | X | | | | | -| **be_greater_or_equal** | | | | X | X | X | X | X | | X | X | | | | | -| **be_less_or_equal** | | | | X | X | X | X | X | | X | X | | | | | -| **be_less_than** | | | | X | X | X | X | X | | X | X | | | | | -| **be_between** | | | | X | X | X | X | X | X | X | X | | | | | -| **equal** | X | X | X | X | X | X | X | X | X | X | X | X | X | X | X | -| **contain** | | | | | | | | | | | | X | X | X | | -| **match** | | | X | | | | | | X | | | | | | | -| **be_like** | | | X | | | | | | X | | | | | | | -| **be_empty** | X | | X | | | | | | | | | X | X | | X | -| **have_count** | | | | | | | | | | | | X | X | | X | - diff --git a/source/core/types/ut_expectation_result.tpb b/source/core/types/ut_expectation_result.tpb index 097c900f4..9aa8b81c0 100644 --- a/source/core/types/ut_expectation_result.tpb +++ b/source/core/types/ut_expectation_result.tpb @@ -24,7 +24,7 @@ create or replace type body ut_expectation_result is self.self_type := $$plsql_unit; self.status := a_status; self.description := a_description; - self.message := a_message; + self.message := a_message; if self.status = ut_utils.gc_failure and a_include_caller_info then self.caller_info := ut_expectation_processor.who_called_expectation(dbms_utility.format_call_stack()); end if; diff --git a/source/core/ut_expectation_processor.pkb b/source/core/ut_expectation_processor.pkb index 4d773f833..0c2580220 100644 --- a/source/core/ut_expectation_processor.pkb +++ b/source/core/ut_expectation_processor.pkb @@ -90,6 +90,9 @@ create or replace package body ut_expectation_processor as for i in 1 .. l_results.count loop dbms_output.put_line( ' ' || l_results(i) ); end loop; + if a_expectation_result.caller_info is not null then + dbms_output.put_line( ut_utils.indent_lines( a_expectation_result.caller_info, 2, true) ); + end if; end if; end; @@ -147,28 +150,55 @@ create or replace package body ut_expectation_processor as function who_called_expectation(a_call_stack varchar2) return varchar2 is l_caller_stack_line varchar2(4000); + l_call_stack varchar2(4000); l_line_no integer; l_owner varchar2(1000); l_object_name varchar2(1000); - l_object_full_name varchar2(1000); l_result varchar2(4000); -- in 12.2 format_call_stack reportes not only package name, but also the procedure name -- when 11g and 12c reports only package name - c_expectation_search_pattern constant varchar2(500) := - '(.*\.(UT_EXPECTATION[A-Z0-9#_$]*|UT|UTASSERT2?)(\.[A-Z0-9#_$]+)?\s+)+(.*)'; + function cut_header_and_expectations( a_stack varchar2 ) return varchar2 is + begin + return regexp_substr( a_stack, '(.*\.(UT_EXPECTATION[A-Z0-9#_$]*|UT|UTASSERT2?)(\.[A-Z0-9#_$]+)?\s+)+((.|\s)*)', 1, 1, 'm', 4); + end; + function cut_address_columns( a_stack varchar2 ) return varchar2 is + begin + return regexp_replace( a_stack, '^(0x)?[0-9a-f]+\s+', '', 1, 0, 'm' ); + end; + function cut_framework_stack( a_stack varchar2 ) return varchar2 is + begin + return regexp_replace( + a_stack, + '[0-9]+\s+anonymous\s+block\s+[0-9]+\s+package\s+body\s+sys\.dbms_sql(\.execute)?\s+[0-9]+\s+[0-9_$#a-z ]+\.ut_executable.*', + '', + 1, 1, 'mni' + ); + end; + function format_stack( a_stack varchar2 ) return varchar2 is + begin + return regexp_replace( + a_stack, + '([0-9]+)\s+(.* )?((anonymous block)|(([0-9_$#a-z]+\.[0-9_$#a-z]+(\.([0-9_$#a-z])+)?)))', + 'at "\3", line \1', 1, 0, 'i' + ); + end; begin - l_caller_stack_line := regexp_substr( a_call_stack, c_expectation_search_pattern, 1, 1, 'm', 4); + l_call_stack := cut_header_and_expectations( a_call_stack ); + l_call_stack := cut_address_columns( l_call_stack ); + l_call_stack := cut_framework_stack( l_call_stack ); + l_call_stack := format_stack( l_call_stack ); + l_caller_stack_line := regexp_substr(l_call_stack,'^(.*)'); if l_caller_stack_line like '%.%' then - l_line_no := to_number( regexp_substr(l_caller_stack_line,'(0x)?[0-9a-f]+\s+(\d+)',subexpression => 2) ); - l_owner := regexp_substr(l_caller_stack_line,'([A-Za-z0-9$#_]+)\.([A-Za-z0-9$#_]|\.)+',subexpression => 1); - l_object_name := regexp_substr(l_caller_stack_line,'([A-Za-z0-9$#_]+)\.([A-Za-z0-9$#_]+)',subexpression => 2); - l_object_full_name := regexp_substr(l_caller_stack_line,'([A-Za-z0-9$#_]+)\.(([A-Za-z0-9$#_]|\.)+)',subexpression => 2); - if l_owner is not null and l_object_name is not null and l_line_no is not null then - l_result := 'at "' || l_owner || '.' || l_object_full_name || '", line '|| l_line_no || ' ' - || ut_metadata.get_source_definition_line(l_owner, l_object_name, l_line_no); - end if; + l_line_no := to_number( regexp_substr( l_caller_stack_line, ', line (\d+)', subexpression => 1 ) ); + l_owner := regexp_substr( l_caller_stack_line, 'at "([A-Za-z0-9$#_]+)\.(([A-Za-z0-9$#_]+)(\.([A-Za-z0-9$#_]+))?)", line (\d+)', subexpression => 1 ); + l_object_name := regexp_substr( l_caller_stack_line, 'at "([A-Za-z0-9$#_]+)\.(([A-Za-z0-9$#_]+)(\.([A-Za-z0-9$#_]+))?)", line (\d+)', subexpression => 3 ); + l_result := + l_caller_stack_line || ' ' || rtrim(ut_metadata.get_source_definition_line(l_owner, l_object_name, l_line_no),chr(10)) + || replace( l_call_stack, l_caller_stack_line ); + else + l_result := l_call_stack; end if; - return l_result; + return rtrim(l_result,chr(10)); end; procedure add_warning(a_messsage varchar2) is diff --git a/source/create_grants.sql b/source/create_grants.sql index 96fcb7cfa..4553c52f6 100644 --- a/source/create_grants.sql +++ b/source/create_grants.sql @@ -75,6 +75,7 @@ grant execute on &&ut3_owner..ut_expectation_compound to &ut3_user; grant execute on &&ut3_owner..ut_expectation_json to &ut3_user; --matchers +grant execute on &&ut3_owner..ut_matcher to &ut3_user; grant execute on &&ut3_owner..ut_be_between to &ut3_user; grant execute on &&ut3_owner..ut_be_empty to &ut3_user; grant execute on &&ut3_owner..ut_be_false to &ut3_user; diff --git a/source/create_synonyms.sql b/source/create_synonyms.sql index 39d559b20..36dc465de 100644 --- a/source/create_synonyms.sql +++ b/source/create_synonyms.sql @@ -91,6 +91,7 @@ create &action_type. synonym &ut3_user.ut_expectation_compound for &&ut3_owner.. create &action_type. synonym &ut3_user.ut_expectation_json for &&ut3_owner..ut_expectation_json; --matchers +create &action_type. synonym &ut3_user.ut_matcher for &&ut3_owner..ut_matcher; create &action_type. synonym &ut3_user.be_between for &&ut3_owner..be_between; create &action_type. synonym &ut3_user.be_empty for &&ut3_owner..be_empty; create &action_type. synonym &ut3_user.be_false for &&ut3_owner..be_false; diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 51fa61fbd..575568641 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -608,7 +608,7 @@ create or replace package body ut_compound_data_helper is begin return 'SQL exception thrown when fetching data from cursor:'|| ut_utils.remove_error_from_stack(sqlerrm,ut_utils.gc_xml_processing)||chr(10)|| - ut_expectation_processor.who_called_expectation(a_error_stack)|| + ut_expectation_processor.who_called_expectation(a_error_stack)||chr(10)|| 'Check the query and data for errors.'; end; diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index 5874beef8..627e14680 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -16,9 +16,14 @@ create or replace type body ut_compound_data_value as limitations under the License. */ + member function get_elements_count_info return varchar2 is + begin + return case when elements_count is null then ' [ null ]' else ' [ count = '||elements_count||' ]' end; + end; + overriding member function get_object_info return varchar2 is begin - return self.data_type||' [ count = '||self.elements_count||' ]'; + return self.data_type||get_elements_count_info(); end; overriding member function is_null return boolean is @@ -37,7 +42,6 @@ create or replace type body ut_compound_data_value as end; overriding member function to_string return varchar2 is - l_results ut_utils.t_clob_tab; l_result clob; l_result_string varchar2(32767); begin diff --git a/source/expectations/data_values/ut_compound_data_value.tps b/source/expectations/data_values/ut_compound_data_value.tps index a9b78f944..027b5ca26 100644 --- a/source/expectations/data_values/ut_compound_data_value.tps +++ b/source/expectations/data_values/ut_compound_data_value.tps @@ -39,7 +39,8 @@ create or replace type ut_compound_data_value force under ut_data_value( * Holds name for the type of compound */ compound_type varchar2(50), - + + member function get_elements_count_info return varchar2, overriding member function get_object_info return varchar2, overriding member function is_null return boolean, overriding member function is_diffable return boolean, diff --git a/source/expectations/data_values/ut_data_value.tpb b/source/expectations/data_values/ut_data_value.tpb index d8feb1a62..a644fe30e 100644 --- a/source/expectations/data_values/ut_data_value.tpb +++ b/source/expectations/data_values/ut_data_value.tpb @@ -59,7 +59,7 @@ create or replace type body ut_data_value as l_result := l_result || chr(10); end if; else - l_result := self.to_string() || ' ' || l_info || ' '; + l_result := self.to_string() || ' ' || l_info; end if; return l_result; end; diff --git a/source/expectations/data_values/ut_data_value_anydata.tpb b/source/expectations/data_values/ut_data_value_anydata.tpb index 0b5447758..a81b0f5c7 100644 --- a/source/expectations/data_values/ut_data_value_anydata.tpb +++ b/source/expectations/data_values/ut_data_value_anydata.tpb @@ -18,7 +18,7 @@ create or replace type body ut_data_value_anydata as overriding member function get_object_info return varchar2 is begin - return self.data_type || case when self.compound_type = 'collection' then ' [ count = '||self.elements_count||' ]' else null end; + return self.data_type || case when self.compound_type = 'collection' then self.get_elements_count_info() end; end; member function get_extract_path(a_data_value anydata) return varchar2 is diff --git a/source/expectations/data_values/ut_data_value_json.tpb b/source/expectations/data_values/ut_data_value_json.tpb index e1ef4d7e2..83916c30e 100644 --- a/source/expectations/data_values/ut_data_value_json.tpb +++ b/source/expectations/data_values/ut_data_value_json.tpb @@ -113,9 +113,10 @@ create or replace type body ut_data_value_json as ut_utils.append_to_clob(l_result, l_results); end if; - - - l_result_string := ut_utils.to_string(l_result,null); + + if l_result != empty_clob() then + l_result_string := chr(10) || 'Diff:' || ut_utils.to_string(l_result,null); + end if; dbms_lob.freetemporary(l_result); return l_result_string; end; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index dab76a817..801b35802 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -220,7 +220,7 @@ create or replace type body ut_data_value_refcursor as a_match_options.ordered_columns() ); - if l_column_diffs.count > 0 then + if l_column_diffs is not empty then ut_utils.append_to_clob(l_result,chr(10) || 'Columns:' || chr(10)); l_other_cols := remove_incomparable_cols( l_other_cols, l_column_diffs ); l_self_cols := remove_incomparable_cols( l_self_cols, l_column_diffs ); @@ -267,8 +267,8 @@ create or replace type body ut_data_value_refcursor as l_results(l_results.last) := get_diff_message(l_row_diffs(i),a_match_options.unordered); end loop; ut_utils.append_to_clob(l_result,l_results); - else - l_message:= chr(10)||'Rows: [ all different ]'||chr(10)||' All rows are different as the columns position is not matching.'; + elsif l_column_diffs is not empty then + l_message:= chr(10)||'Rows: [ all different ]'||chr(10)||' All rows are different as the columns position is not matching.'; ut_utils.append_to_clob( l_result, l_message ); end if; else @@ -287,8 +287,9 @@ create or replace type body ut_data_value_refcursor as end if; end if; - - l_result_string := ut_utils.to_string(l_result,null); + if l_result != empty_clob() then + l_result_string := chr(10) || 'Diff:' || ut_utils.to_string(l_result,null); + end if; dbms_lob.freetemporary(l_result); return l_result_string; end; diff --git a/source/expectations/matchers/ut_contain.tpb b/source/expectations/matchers/ut_contain.tpb index cf6653f63..c0c4f481a 100644 --- a/source/expectations/matchers/ut_contain.tpb +++ b/source/expectations/matchers/ut_contain.tpb @@ -55,8 +55,7 @@ create or replace type body ut_contain as begin if self.expected.data_type = a_actual.data_type and self.expected.is_diffable then l_result := - 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() - || chr(10) || 'Diff:' + 'Actual: '||a_actual.get_object_info()||self.description()||': '||self.expected.get_object_info() || treat(expected as ut_data_value_refcursor).diff( a_actual, self.options ); else l_result := (self as ut_matcher).failure_message(a_actual) || ': '|| self.expected.to_string_report(); diff --git a/source/expectations/matchers/ut_equal.tpb b/source/expectations/matchers/ut_equal.tpb index 2e774d396..afa2148f3 100644 --- a/source/expectations/matchers/ut_equal.tpb +++ b/source/expectations/matchers/ut_equal.tpb @@ -244,16 +244,15 @@ create or replace type body ut_equal as begin if self.expected.data_type = a_actual.data_type and self.expected.is_diffable then l_result := - 'Actual: '||a_actual.get_object_info()||' '||self.description()||': '||self.expected.get_object_info() - || chr(10) || 'Diff:' || - case - when self.expected is of (ut_data_value_refcursor) then - treat(expected as ut_data_value_refcursor).diff( a_actual, options ) - when self.expected is of (ut_data_value_json) then - treat(expected as ut_data_value_json).diff( a_actual, options ) - else - expected.diff( a_actual, options ) - end; + 'Actual: '||a_actual.get_object_info()||self.description()||': '||self.expected.get_object_info() + ||case + when self.expected is of (ut_data_value_refcursor) then + treat(expected as ut_data_value_refcursor).diff( a_actual, options ) + when self.expected is of (ut_data_value_json) then + treat(expected as ut_data_value_json).diff( a_actual, options ) + else + expected.diff( a_actual, options ) + end; else l_result := (self as ut_matcher).failure_message(a_actual) || ': '|| self.expected.to_string_report(); end if; diff --git a/source/expectations/matchers/ut_matcher.tpb b/source/expectations/matchers/ut_matcher.tpb index 228f2caad..11ff1b6b6 100644 --- a/source/expectations/matchers/ut_matcher.tpb +++ b/source/expectations/matchers/ut_matcher.tpb @@ -40,12 +40,12 @@ create or replace type body ut_matcher as member function description return varchar2 is begin - return 'was expected to '||name(); + return ' was expected to '||name(); end; member function description_when_negated return varchar2 is begin - return 'was expected not to '||name(); + return ' was expected not to '||name(); end; member function error_message(a_actual ut_data_value) return varchar2 is diff --git a/source/expectations/ut_expectation.tpb b/source/expectations/ut_expectation.tpb index b50efef6a..d8ed1f79a 100644 --- a/source/expectations/ut_expectation.tpb +++ b/source/expectations/ut_expectation.tpb @@ -81,6 +81,16 @@ create or replace type body ut_expectation as self.not_to( ut_be_false() ); end; + member procedure to_be_empty(self in ut_expectation) is + begin + self.to_( ut_be_empty() ); + end; + + member procedure not_to_be_empty(self in ut_expectation) is + begin + self.not_to( ut_be_empty() ); + end; + member procedure to_equal(self in ut_expectation, a_expected anydata, a_nulls_are_equal boolean := null) is begin self.to_( ut_equal(a_expected, a_nulls_are_equal) ); diff --git a/source/expectations/ut_expectation.tps b/source/expectations/ut_expectation.tps index 5b3370c43..37fefd085 100644 --- a/source/expectations/ut_expectation.tps +++ b/source/expectations/ut_expectation.tps @@ -33,6 +33,9 @@ create or replace type ut_expectation authid current_user as object( member procedure not_to_be_true(self in ut_expectation), member procedure not_to_be_false(self in ut_expectation), + member procedure to_be_empty(self in ut_expectation), + member procedure not_to_be_empty(self in ut_expectation), + -- this is done to provide strong type comparison. other comporators should be implemented in the type-specific classes member procedure to_equal(self in ut_expectation, a_expected anydata, a_nulls_are_equal boolean := null), member procedure to_equal(self in ut_expectation, a_expected anydata, a_exclude varchar2, a_nulls_are_equal boolean := null), diff --git a/source/expectations/ut_expectation_compound.tpb b/source/expectations/ut_expectation_compound.tpb index aaab7cb34..5e7268bd9 100644 --- a/source/expectations/ut_expectation_compound.tpb +++ b/source/expectations/ut_expectation_compound.tpb @@ -23,16 +23,6 @@ create or replace type body ut_expectation_compound as return; end; - member procedure to_be_empty(self in ut_expectation_compound) is - begin - self.to_( ut_be_empty() ); - end; - - member procedure not_to_be_empty(self in ut_expectation_compound) is - begin - self.not_to( ut_be_empty() ); - end; - member procedure to_have_count(self in ut_expectation_compound, a_expected integer) is begin self.to_( ut_have_count(a_expected) ); diff --git a/source/expectations/ut_expectation_compound.tps b/source/expectations/ut_expectation_compound.tps index bd17eb8b1..fc413e3fd 100644 --- a/source/expectations/ut_expectation_compound.tps +++ b/source/expectations/ut_expectation_compound.tps @@ -19,8 +19,6 @@ create or replace type ut_expectation_compound force under ut_expectation( constructor function ut_expectation_compound(self in out nocopy ut_expectation_compound, a_actual_data ut_data_value, a_description varchar2) return self as result, - member procedure to_be_empty(self in ut_expectation_compound), - member procedure not_to_be_empty(self in ut_expectation_compound), member procedure to_have_count(self in ut_expectation_compound, a_expected integer), member procedure not_to_have_count(self in ut_expectation_compound, a_expected integer), diff --git a/source/expectations/ut_expectation_json.tpb b/source/expectations/ut_expectation_json.tpb index 954daf4e7..49c0c2e1f 100644 --- a/source/expectations/ut_expectation_json.tpb +++ b/source/expectations/ut_expectation_json.tpb @@ -23,16 +23,6 @@ create or replace type body ut_expectation_json as return; end; - member procedure to_be_empty(self in ut_expectation_json) is - begin - self.to_( ut_be_empty() ); - end; - - member procedure not_to_be_empty(self in ut_expectation_json) is - begin - self.not_to( ut_be_empty() ); - end; - member function to_equal(a_expected json_element_t, a_nulls_are_equal boolean := null) return ut_expectation_json is l_result ut_expectation_json := self; begin diff --git a/source/expectations/ut_expectation_json.tps b/source/expectations/ut_expectation_json.tps index 9cc9aecb8..dd3aa5b25 100644 --- a/source/expectations/ut_expectation_json.tps +++ b/source/expectations/ut_expectation_json.tps @@ -19,8 +19,6 @@ create or replace type ut_expectation_json under ut_expectation( constructor function ut_expectation_json(self in out nocopy ut_expectation_json, a_actual_data ut_data_value, a_description varchar2) return self as result, - member procedure to_be_empty(self in ut_expectation_json), - member procedure not_to_be_empty(self in ut_expectation_json), member function to_equal(a_expected json_element_t , a_nulls_are_equal boolean := null) return ut_expectation_json, member function not_to_equal(a_expected json_element_t , a_nulls_are_equal boolean := null) return ut_expectation_json, member procedure to_have_count(self in ut_expectation_json, a_expected integer), diff --git a/test/ut3_tester/core/expectations/test_expectation_processor.pkb b/test/ut3_tester/core/expectations/test_expectation_processor.pkb index 17ffbec3c..ab413616e 100644 --- a/test/ut3_tester/core/expectations/test_expectation_processor.pkb +++ b/test/ut3_tester/core/expectations/test_expectation_processor.pkb @@ -1,5 +1,7 @@ create or replace package body test_expectation_processor is + gc_user constant varchar2(128) := sys_context('userenv','current_schema'); + procedure who_called_expectation is l_stack_trace varchar2(4000); l_source_line varchar2(4000); @@ -11,7 +13,9 @@ create or replace package body test_expectation_processor is 353dfeb2f8 26 SCH_TEST.UT_EXPECTATION_RESULT cba249ce0 112 SCH_TEST.UT_EXPECTATION 3539881cf0 21 SCH_TEST.UT_EXPECTATION_NUMBER -351a608008 28 package body SCH_TEST.TPKG_PRIOR_YEAR_GENERATION +351a608008 7 package body ]'||gc_user||q'[.TEST_EXPECTATION_PROCESSOR +351a608018 12 package body ]'||gc_user||q'[.TEST_EXPECTATION_PROCESSOR +351a608018 24 package body ]'||gc_user||q'[.TEST_EXPECTATION_PROCESSOR 351a6862b8 6 anonymous block 351fe31010 1825 package body SYS.DBMS_SQL 20befbe4d8 129 SCH_TEST.UT_EXECUTABLE @@ -30,7 +34,9 @@ cba24bfd0 75 SCH_TEST.UT_LOGICAL_SUITE ]'; ut.expect( ut3.ut_expectation_processor.who_called_expectation(l_stack_trace) - ).to_be_like('at "SCH_TEST.TPKG_PRIOR_YEAR_GENERATION", line 28 %'); + ).to_equal('at "'||gc_user||'.TEST_EXPECTATION_PROCESSOR", line 7 l_source_line varchar2(4000); +at "'||gc_user||'.TEST_EXPECTATION_PROCESSOR", line 12 +at "'||gc_user||'.TEST_EXPECTATION_PROCESSOR", line 24'); end; @@ -41,30 +47,24 @@ cba24bfd0 75 SCH_TEST.UT_LOGICAL_SUITE l_stack_trace := q'[----- PL/SQL Call Stack ----- object line object handle number name -34f88e4420 124 package body SCH_TEST.UT_EXPECTATION_PROCESSOR -353dfeb2f8 26 SCH_TEST.UT_EXPECTATION_RESULT -cba249ce0 112 SCH_TEST.UT_EXPECTATION -3539881cf0 21 SCH_TEST.UT_EXPECTATION_NUMBER -351a608008 28 package body SCH_TEST.TPKG_PRIOR_YEAR_GENERATION -351a6862b8 6 anonymous block -351fe31010 1825 package body SYS.DBMS_SQL -20befbe4d8 129 SCH_TEST.UT_EXECUTABLE -20befbe4d8 65 SCH_TEST.UT_EXECUTABLE -34f8ab7cd8 80 SCH_TEST.UT_TEST -34f8ab98f0 48 SCH_TEST.UT_SUITE_ITEM -34f8ab9b10 74 SCH_TEST.UT_SUITE -34f8ab98f0 48 SCH_TEST.UT_SUITE_ITEM -cba24bfd0 75 SCH_TEST.UT_LOGICAL_SUITE -353dfecf30 59 SCH_TEST.UT_RUN -34f8ab98f0 48 SCH_TEST.UT_SUITE_ITEM -357f5421e8 77 package body SCH_TEST.UT_RUNNER -357f5421e8 111 package body SCH_TEST.UT_RUNNER -20be951ab0 292 package body SCH_TEST.UT -20be951ab0 320 package body SCH_TEST.UT +0x80e701d8 26 UT3.UT_EXPECTATION_RESULT +0x85e10150 112 UT3.UT_EXPECTATION +0x8b54bad8 21 UT3.UT_EXPECTATION_NUMBER +0x85cfd238 20 package body UT3.UT_EXAMPLETEST +0x85def380 6 anonymous block +0x85e93750 1825 package body SYS.DBMS_SQL +0x80f4f608 129 UT3.UT_EXECUTABLE +0x80f4f608 65 UT3.UT_EXECUTABLE +0x8a116010 76 UT3.UT_TEST +0x8a3348a0 48 UT3.UT_SUITE_ITEM +0x887e9948 67 UT3.UT_LOGICAL_SUITE +0x8a26de20 59 UT3.UT_RUN +0x8a3348a0 48 UT3.UT_SUITE_ITEM +0x838d17c0 28 anonymous block ]'; ut.expect( ut3.ut_expectation_processor.who_called_expectation(l_stack_trace) - ).to_be_like('at "SCH_TEST.TPKG_PRIOR_YEAR_GENERATION", line 28 %'); + ).to_be_like('at "UT3.UT_EXAMPLETEST", line 20 %'); end; end; diff --git a/test/ut3_tester/core/expectations/test_expectation_processor.pks b/test/ut3_tester/core/expectations/test_expectation_processor.pks index 5b63c8938..73cf60d11 100644 --- a/test/ut3_tester/core/expectations/test_expectation_processor.pks +++ b/test/ut3_tester/core/expectations/test_expectation_processor.pks @@ -3,14 +3,17 @@ create or replace package test_expectation_processor is --%suite(expectation_processor) --%suitepath(utplsql.ut3_tester.core.expectations) - --%context(who_called_expectation) + --%beforeall(ut3_tester_helper.main_helper.set_ut_run_context) + --%afterall(ut3_tester_helper.main_helper.clear_ut_run_context) - --%test(parses stack trace and returns object and line that called expectation) - procedure who_called_expectation; + --%context(who_called_expectation_in_test) - --%test(parses stack trace containing 0x and returns object and line that called expectation) + --%test(parses stack trace containing 0x and returns objects and line that called expectation) procedure who_called_expectation_0x; + --%test(parses stack trace and returns objects and line that called expectation) + procedure who_called_expectation; + --%endcontext end; diff --git a/test/ut3_user/expectations.pkb b/test/ut3_user/expectations.pkb index c1f07dd9f..942da68f2 100644 --- a/test/ut3_user/expectations.pkb +++ b/test/ut3_user/expectations.pkb @@ -1,31 +1,64 @@ create or replace package body expectations as - --%test(Expectations return data to screen when called standalone) - procedure inline_expectation_to_dbms_out is l_expected sys_refcursor; l_actual sys_refcursor; l_output dbmsoutput_linesarray; l_results ut3.ut_varchar2_list; l_lines number := 10000; + pragma autonomous_transaction; begin --Arrange - ut3_tester_helper.main_helper.clear_ut_run_context; + --Act + execute immediate 'begin some_pkg.some_procedure; end;'; + ut3.ut.expect(1).to_equal(0); + ut3.ut.expect(0).to_equal(0); + + --Assert open l_expected for select 'FAILURE' as out_row from dual union all select 'Actual: 1 (number) was expected to equal: 0 (number)' from dual union all + select 'at "UT3$USER#.SOME_PKG.SOME_PROCEDURE", line 4 ut3.ut.expect(1).to_equal(0); + at "anonymous block", line 1 + at "UT3$USER#.EXPECTATIONS.INLINE_EXPECTATION_TO_DBMS_OUT", line 13' from dual union all + select 'SUCCESS' from dual union all + select 'Actual: 0 (number) was expected to equal: 0 (number)' from dual union all + select 'FAILURE' as out_row from dual union all + select 'Actual: 1 (number) was expected to equal: 0 (number)' from dual union all + select 'at "UT3$USER#.EXPECTATIONS.INLINE_EXPECTATION_TO_DBMS_OUT", line 14 ut3.ut.expect(1).to_equal(0);' from dual union all select 'SUCCESS' from dual union all select 'Actual: 0 (number) was expected to equal: 0 (number)' from dual union all select '' from dual; - --Act - ut3.ut.expect(1).to_equal(0); - ut3.ut.expect(0).to_equal(0); - - --Assert dbms_output.get_lines(lines => l_output, numlines => l_lines); open l_actual for select trim(column_value) as out_row from table(l_output); ut.expect(l_actual).to_equal(l_expected); + rollback; end; + + procedure create_some_pkg is + pragma autonomous_transaction; + begin + execute immediate q'[ + create or replace package some_pkg is + procedure some_procedure; + end;]'; + + execute immediate q'[ + create or replace package body some_pkg is + procedure some_procedure is + begin + ut3.ut.expect(1).to_equal(0); + ut3.ut.expect(0).to_equal(0); + end; + end;]'; + end; + + procedure drop_some_pkg is + pragma autonomous_transaction; + begin + execute immediate 'drop package some_pkg'; + end; + end; / \ No newline at end of file diff --git a/test/ut3_user/expectations.pks b/test/ut3_user/expectations.pks index ab8bd3835..0324f9ac0 100644 --- a/test/ut3_user/expectations.pks +++ b/test/ut3_user/expectations.pks @@ -7,8 +7,12 @@ create or replace package expectations as --%afterall(ut3_tester_helper.main_helper.clear_ut_run_context) --%test(Expectations return data to screen when called standalone) - --%aftertest(ut3_tester_helper.main_helper.set_ut_run_context) + --%beforetest( create_some_pkg, ut3_tester_helper.main_helper.clear_ut_run_context ) + --%aftertest( drop_some_pkg, ut3_tester_helper.main_helper.set_ut_run_context ) procedure inline_expectation_to_dbms_out; + procedure create_some_pkg; + procedure drop_some_pkg; + end; / \ No newline at end of file diff --git a/test/ut3_user/expectations/test_expectation_anydata.pkb b/test/ut3_user/expectations/test_expectation_anydata.pkb index 4838aabff..f94b0efc0 100644 --- a/test/ut3_user/expectations/test_expectation_anydata.pkb +++ b/test/ut3_user/expectations/test_expectation_anydata.pkb @@ -105,10 +105,7 @@ create or replace package body test_expectation_anydata is --Act ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); --Assert - l_expected_message := q'[%Actual: ut3_tester_helper.test_dummy_object_list [ count = ] was expected to equal: ut3_tester_helper.test_dummy_object_list [ count = 0 ] -%Diff: -%Rows: [ all different ] -%All rows are different as the columns position is not matching.]'; + l_expected_message := q'[%Actual: ut3_tester_helper.test_dummy_object_list [ null ] was expected to equal: ut3_tester_helper.test_dummy_object_list [ count = 0 ]]'; l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); @@ -126,7 +123,7 @@ create or replace package body test_expectation_anydata is --Act ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); --Assert - l_expected_message := q'[%Actual: ut3_tester_helper.test_dummy_object_list [ count = ] was expected to equal: ut3_tester_helper.test_dummy_object_list [ count = 1 ] + l_expected_message := q'[%Actual: ut3_tester_helper.test_dummy_object_list [ null ] was expected to equal: ut3_tester_helper.test_dummy_object_list [ count = 1 ] %Diff: %Rows: [ 1 differences ] %Row No. 1 - Missing: 1A0]'; @@ -665,7 +662,7 @@ Rows: [ 60 differences, showing first 20 ] g_test_actual := anydata.convertCollection( ut3_tester_helper.t_tab_varchar('A') ); --Act ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); - l_expected_message := q'[%Actual: ut3_tester_helper.t_tab_varchar [ count = 1 ] was expected to equal: ut3_tester_helper.t_tab_varchar [ count = ] + l_expected_message := q'[%Actual: ut3_tester_helper.t_tab_varchar [ count = 1 ] was expected to equal: ut3_tester_helper.t_tab_varchar [ null ] %Diff: %Rows: [ 1 differences ] %Row No. 1 - Extra: A]'; @@ -785,7 +782,7 @@ Rows: [ 60 differences, showing first 20 ] g_test_actual := anydata.convertCollection( ut3_tester_helper.t_varray(1) ); --Act ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); - l_expected_message := q'[%Actual: ut3_tester_helper.t_varray [ count = 1 ] was expected to equal: ut3_tester_helper.t_varray [ count = ] + l_expected_message := q'[%Actual: ut3_tester_helper.t_varray [ count = 1 ] was expected to equal: ut3_tester_helper.t_varray [ null ] %Diff: %Rows: [ 1 differences ] %Row No. 1 - Extra: 1]'; diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index 1cb544d44..dc439e7e0 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -702,7 +702,7 @@ Rows: [ 1 differences ] Diff: Columns: Column data-type is invalid. Expected: NUMBER, actual: VARCHAR2. -Rows: [ all different ] +Rows: [ all different ] All rows are different as the columns position is not matching.]'; l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert @@ -749,7 +749,7 @@ Columns: Column is misplaced. Expected position: 2, actual position: 4. Column is misplaced. Expected position: 3, actual position: 2. Column is misplaced. Expected position: 4, actual position: 3. -Rows: [ all different ] +Rows: [ all different ] All rows are different as the columns position is not matching.]'; l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert @@ -1117,7 +1117,7 @@ Rows: [ 4 differences ] %Column [data-type: NUMBER] is missing. Expected column position: 2. %Column <1> [position: 1, data-type: CHAR] is not expected in results. %Column <2> [position: 2, data-type: CHAR] is not expected in results. -%Rows: [ all different ] +%Rows: [ all different ] %All rows are different as the columns position is not matching.]'; l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert diff --git a/test/ut3_user/expectations/unary/test_expect_to_be_empty.pkb b/test/ut3_user/expectations/unary/test_expect_to_be_empty.pkb index 3694850fe..1447bd1f0 100644 --- a/test/ut3_user/expectations/unary/test_expect_to_be_empty.pkb +++ b/test/ut3_user/expectations/unary/test_expect_to_be_empty.pkb @@ -38,7 +38,7 @@ create or replace package body test_expect_to_be_empty is l_expected_message := q'[Actual: (refcursor [ count = 1 ])% X% -was expected to be empty%%]'; + was expected to be empty%]'; l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert diff --git a/test/ut3_user/reporters/test_realtime_reporter.pkb b/test/ut3_user/reporters/test_realtime_reporter.pkb index 28724facf..8eb490a11 100644 --- a/test/ut3_user/reporters/test_realtime_reporter.pkb +++ b/test/ut3_user/reporters/test_realtime_reporter.pkb @@ -302,7 +302,7 @@ create or replace package body test_realtime_reporter as procedure single_failed_message is l_actual varchar2(32767); - l_expected varchar2(80) := ''; + l_expected varchar2(80) := ''; begin select t.event_doc.extract( '/event/test/failedExpectations/expectation[1]/message/text()' diff --git a/test/ut3_user/reporters/test_teamcity_reporter.pkb b/test/ut3_user/reporters/test_teamcity_reporter.pkb index fc2ab169e..71d2f857d 100644 --- a/test/ut3_user/reporters/test_teamcity_reporter.pkb +++ b/test/ut3_user/reporters/test_teamcity_reporter.pkb @@ -57,7 +57,7 @@ create or replace package body test_teamcity_reporter as -%##teamcity[testFailed timestamp='%' details='Actual: |'number |[1|] |' (varchar2) was expected to equal: |'number |[2|] |' (varchar2) ' message='Fails as values are different' name='ut3$user#.test_reporters.failing_test'] +%##teamcity[testFailed timestamp='%' details='Actual: |'number |[1|] |' (varchar2) was expected to equal: |'number |[2|] |' (varchar2)' message='Fails as values are different' name='ut3$user#.test_reporters.failing_test'] %##teamcity[testFinished timestamp='%' duration='%' name='ut3$user#.test_reporters.failing_test'] %##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3$user#.test_reporters.erroring_test'] @@ -89,7 +89,7 @@ create or replace package body test_teamcity_reporter as begin l_expected := q'{%##teamcity[testSuiteStarted timestamp='%' name='A suite with |'quote|''] %##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3$user#.check_escape_special_chars.test_do_stuff'] -%##teamcity[testFailed timestamp='%' details='Actual: (varchar2)|n |' |[ |r|n |] |'|nwas expected to be null' name='ut3$user#.check_escape_special_chars.test_do_stuff'] +%##teamcity[testFailed timestamp='%' details='Actual: (varchar2)|n |' |[ |r|n |] |'|n was expected to be null' name='ut3$user#.check_escape_special_chars.test_do_stuff'] %##teamcity[testFinished timestamp='%' duration='%' name='ut3$user#.check_escape_special_chars.test_do_stuff'] %##teamcity[testSuiteFinished timestamp='%' name='A suite with |'quote|'']}'; --act From 2206ff9784ec717899f5f1f01cc184fdd2f037c9 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 8 Jul 2019 21:39:31 +0100 Subject: [PATCH 0551/1096] Fixing failing test. --- test/ut3_user/expectations.pkb | 38 +++++++++++++++------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/test/ut3_user/expectations.pkb b/test/ut3_user/expectations.pkb index 942da68f2..3f2ae543d 100644 --- a/test/ut3_user/expectations.pkb +++ b/test/ut3_user/expectations.pkb @@ -1,11 +1,8 @@ create or replace package body expectations as procedure inline_expectation_to_dbms_out is - l_expected sys_refcursor; - l_actual sys_refcursor; - l_output dbmsoutput_linesarray; - l_results ut3.ut_varchar2_list; - l_lines number := 10000; + l_expected clob; + l_actual clob; pragma autonomous_transaction; begin --Arrange @@ -15,24 +12,23 @@ create or replace package body expectations as ut3.ut.expect(0).to_equal(0); --Assert - open l_expected for - select 'FAILURE' as out_row from dual union all - select 'Actual: 1 (number) was expected to equal: 0 (number)' from dual union all - select 'at "UT3$USER#.SOME_PKG.SOME_PROCEDURE", line 4 ut3.ut.expect(1).to_equal(0); + l_actual := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + + l_expected := q'[FAILURE + Actual: 1 (number) was expected to equal: 0 (number) + at "UT3$USER#.SOME_PKG%", line 4 ut3.ut.expect(1).to_equal(0); at "anonymous block", line 1 - at "UT3$USER#.EXPECTATIONS.INLINE_EXPECTATION_TO_DBMS_OUT", line 13' from dual union all - select 'SUCCESS' from dual union all - select 'Actual: 0 (number) was expected to equal: 0 (number)' from dual union all - select 'FAILURE' as out_row from dual union all - select 'Actual: 1 (number) was expected to equal: 0 (number)' from dual union all - select 'at "UT3$USER#.EXPECTATIONS.INLINE_EXPECTATION_TO_DBMS_OUT", line 14 ut3.ut.expect(1).to_equal(0);' from dual union all - select 'SUCCESS' from dual union all - select 'Actual: 0 (number) was expected to equal: 0 (number)' from dual union all - select '' from dual; - dbms_output.get_lines(lines => l_output, numlines => l_lines); - open l_actual for select trim(column_value) as out_row from table(l_output); + at "UT3$USER#.EXPECTATIONS%", line 10 +SUCCESS + Actual: 0 (number) was expected to equal: 0 (number) +FAILURE + Actual: 1 (number) was expected to equal: 0 (number) + at "UT3$USER#.EXPECTATIONS%", line 11 ut3.ut.expect(1).to_equal(0); +SUCCESS + Actual: 0 (number) was expected to equal: 0 (number) +]'; - ut.expect(l_actual).to_equal(l_expected); + ut.expect(l_actual).to_be_like(l_expected); rollback; end; From 1ea69d8f7e766fb4a681efecc3fb0d4a59b1e323 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 11 Jul 2019 01:33:53 +0100 Subject: [PATCH 0552/1096] Updated documentation for expectations. --- docs/userguide/advanced_data_comparison.md | 475 +++++------ docs/userguide/expectations.md | 928 ++++++++++++--------- 2 files changed, 764 insertions(+), 639 deletions(-) diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 195289392..c45a09643 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -49,7 +49,7 @@ When specifying column/attribute names, keep in mind that the names are **case s Consider the following examples ```sql -procedure test_cur_skip_columns_eq is +declare l_expected sys_refcursor; l_actual sys_refcursor; begin @@ -57,8 +57,8 @@ begin open l_actual for select sysdate "ADate", d.* from user_tables d; ut.expect( l_actual ).to_equal( l_expected ).exclude( 'IGNORE_ME,ADate' ); end; - -procedure test_cur_skip_columns_cn is +/ +declare l_expected sys_refcursor; l_actual sys_refcursor; begin @@ -66,42 +66,67 @@ begin open l_actual for select sysdate "ADate", d.* from user_tables d; ut.expect( l_actual ).to_contain( l_expected ).exclude( 'IGNORE_ME,ADate' ); end; +/ ``` +Produces: +``` +SUCCESS + Actual: refcursor [ count = 23 ] was expected to equal: refcursor [ count = 23 ] -Columns 'ignore_me' and "ADate" will get excluded from cursor comparison. -The cursor data is equal or includes expected, when those columns are excluded. +SUCCESS + Actual: refcursor [ count = 23 ] was expected to contain: refcursor [ count = 1 ] +``` -This option is useful in scenarios, when you need to exclude incomparable/unpredictable column data like CREATE_DATE of a record that is maintained by default value on a table column. +Columns 'ignore_me' and "ADate" will get excluded from data comparison. +The actual data is equal/contains expected, when those columns are excluded. + +**Note** +>This option is useful in scenarios, when you need to exclude incomparable/unpredictable column data like CREATE_DATE of a record that is maintained by default value on a table column. ## Selecting columns for data comparison Consider the following example ```sql -procedure include_col_as_csv_eq is - l_actual sys_refcursor; - l_expected sys_refcursor; +declare + l_actual sys_refcursor; + l_expected sys_refcursor; begin - open l_expected for select rownum as rn, 'a' as "A_Column", 'x' SOME_COL from dual a connect by level < 4; - open l_actual for select rownum as rn, 'a' as "A_Column", 'x' SOME_COL, a.* from all_objects a where rownum < 4; - ut.expect( l_actual ).to_equal( l_expected ).include( 'RN,A_Column,SOME_COL' ); + open l_expected for select rownum as rn, 'a' as "A_Column", 'x' SOME_COL from dual a connect by level < 4; + open l_actual for select rownum as rn, 'a' as "A_Column", 'x' SOME_COL, a.* from all_objects a where rownum < 4; + ut.expect( l_actual ).to_equal( l_expected ).include( 'RN,A_Column,SOME_COL' ); end; - -procedure include_col_as_csv_cn is - l_actual sys_refcursor; - l_expected sys_refcursor; +/ +declare + l_actual sys_refcursor; + l_expected sys_refcursor; begin - open l_expected for select rownum as rn, 'a' as "A_Column", 'x' SOME_COL from dual a connect by level < 4; - open l_actual for select rownum as rn, 'a' as "A_Column", 'x' SOME_COL, a.* from all_objects a where rownum < 6; - ut.expect( l_actual ).to_contain( l_expected ).include( 'RN,A_Column,SOME_COL' ); + open l_expected for select rownum as rn, 'a' as "A_Column", 'x' SOME_COL from dual a connect by level < 4; + open l_actual for select rownum as rn, 'a' as "A_Column", 'x' SOME_COL, a.* from all_objects a where rownum < 6; + ut.expect( l_actual ).to_contain( l_expected ).include( 'RN,A_Column,SOME_COL' ); end; +/ +``` +Produces: ``` +SUCCESS + Actual: refcursor [ count = 3 ] was expected to equal: refcursor [ count = 3 ] + +SUCCESS + Actual: refcursor [ count = 5 ] was expected to contain: refcursor [ count = 3 ] +``` + +Only columns `RN`,`A_Column` and `SOME_COL ` will be included in data comparison. +The actual data is equal/contains expected, when only those columns are included. + +**Note** +>This option can be useful in scenarios where you need to narrow-down the scope of test so that the test is only focused on very specific data. ## Combining include/exclude options You can chain the advanced options in an expectation and mix the `varchar2` with `ut_varchar2_list` arguments. When doing so, the final list of items to include/exclude will be a concatenation of all items. ```sql -procedure include_col_as_csv_eq is +declare l_actual sys_refcursor; l_expected sys_refcursor; begin @@ -112,8 +137,8 @@ begin .include( ut_varchar2_list( 'A_Column', 'SOME_COL' ) ) .exclude( 'SOME_COL' ); end; - -procedure include_col_as_csv_cn is +/ +declare l_actual sys_refcursor; l_expected sys_refcursor; begin @@ -124,12 +149,21 @@ begin .include( ut_varchar2_list( 'A_Column', 'SOME_COL' ) ) .exclude( 'SOME_COL' ); end; +/ +``` + +Results: +``` +SUCCESS + Actual: refcursor [ count = 3 ] was expected to equal: refcursor [ count = 3 ] +SUCCESS + Actual: refcursor [ count = 5 ] was expected to contain: refcursor [ count = 3 ] ``` Example of `include / exclude` for anydata.convertCollection -```plsql +```sql create or replace type person as object( name varchar2(100), age integer @@ -138,77 +172,46 @@ create or replace type person as object( create or replace type people as table of person / -create or replace package ut_anydata_inc_exc IS - - --%suite(Anydata) - - --%test(Anydata include) - procedure ut_anydata_test_inc; - - --%test(Anydata exclude) - procedure ut_anydata_test_exc; - - --%test(Fail on age) - procedure ut_fail_anydata_test; - -end ut_anydata_inc_exc; -/ - -create or replace package body ut_anydata_inc_exc IS - - procedure ut_anydata_test_inc IS - l_actual people := people(person('Matt',45)); - l_expected people :=people(person('Matt',47)); - begin - ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).include('NAME'); - end; - - procedure ut_anydata_test_exc IS - l_actual people := people(person('Matt',45)); - l_expected people :=people(person('Matt',47)); - begin - --Arrange - ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).exclude('AGE'); - end; +declare + l_actual people := people(person('Matt',45)); + l_expected people :=people(person('Matt',47)); +begin + ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).include('NAME'); +end; - procedure ut_fail_anydata_test IS - l_actual people := people(person('Matt',45)); - l_expected people :=people(person('Matt',47)); - begin - --Arrange - ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).include('AGE'); - end; +declare + l_actual people := people(person('Matt',45)); + l_expected people :=people(person('Matt',47)); +begin + ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).exclude('AGE'); +end; -end ut_anydata_inc_exc; +declare + l_actual people := people(person('Matt',45)); + l_expected people :=people(person('Matt',47)); +begin + ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).include('AGE'); +end; / - ``` -will result in : - -```sql -Anydata - Anydata include [.044 sec] - Anydata exclude [.035 sec] - Fail on age [.058 sec] (FAILED - 1) - -Failures: - - 1) ut_fail_anydata_test - Actual: ut3.people [ count = 1 ] was expected to equal: ut3.people [ count = 1 ] - Diff: - Rows: [ 1 differences ] - Row No. 1 - Actual: 45 - Row No. 1 - Expected: 47 +Results: ``` +SUCCESS + Actual: ut3.people [ count = 1 ] was expected to equal: ut3.people [ count = 1 ] +SUCCESS + Actual: ut3.people [ count = 1 ] was expected to equal: ut3.people [ count = 1 ] +FAILURE + Actual: ut3.people [ count = 1 ] was expected to equal: ut3.people [ count = 1 ] + Diff: + Rows: [ 1 differences ] + Row No. 1 - Actual: 45 + Row No. 1 - Expected: 47 + at "anonymous block", line 5 -Example of exclude - -Only the columns 'RN', "A_Column" will be compared. Column 'SOME_COL' is excluded. - -This option can be useful in scenarios where you need to narrow-down the scope of test so that the test is only focused on very specific data. +``` ## Unordered @@ -217,35 +220,37 @@ Unordered option allows for quick comparison of two compound data types without Result of such comparison will be limited to only information about row existing or not existing in given set without actual information about exact differences. ```sql -procedure unordered_tst is - l_actual sys_refcursor; - l_expected sys_refcursor; +declare + l_actual sys_refcursor; + l_expected sys_refcursor; begin - open l_expected for - select username, user_id from all_users - union all - select 'TEST' username, -600 user_id from dual - order by 1 desc; - open l_actual for - select username, user_id from all_users - union all - select 'TEST' username, -610 user_id from dual - order by 1 asc; - ut.expect( l_actual ).to_equal( l_expected ).unordered; + open l_expected for + select username, user_id from all_users + union all + select 'TEST' username, -600 user_id from dual + order by 1 desc; + open l_actual for + select username, user_id from all_users + union all + select 'TEST' username, -610 user_id from dual + order by 1 asc; + ut.expect( l_actual ).to_equal( l_expected ).unordered; end; +/ ``` Above test will result in two differences of one row extra and one row missing. - -```sql - Diff: - Rows: [ 2 differences ] - Missing: TEST-600 - Extra: TEST-610 ``` - +FAILURE + Actual: refcursor [ count = 29 ] was expected to equal: refcursor [ count = 29 ] + Diff: + Rows: [ 2 differences ] + Extra: TEST-610 + Missing: TEST-600 + at "anonymous block", line 15 +``` **Note** - +> `join_by` matcher is much faster on performing data comparison, consider using `join_by` over unordered > `contain` matcher is not considering order of compared data-sets. Using `unordered` makes no difference (it's default) @@ -262,82 +267,99 @@ Join by option can be used in conjunction with include or exclude options. However if any of the join keys is part of exclude set, comparison will fail and report to user that sets could not be joined on specific key, as the key was excluded. ```sql -procedure join_by_username is - l_actual sys_refcursor; - l_expected sys_refcursor; +declare + l_actual sys_refcursor; + l_expected sys_refcursor; begin - open l_expected for - select username, user_id from all_users - union all - select 'TEST' username, -600 user_id from dual - order by 1 desc; - open l_actual for - select username, user_id from all_users - union all - select 'TEST' username, -610 user_id from dual - order by 1 asc; - ut.expect( l_actual ).to_equal( l_expected ).join_by('USERNAME'); + open l_expected for + select username, user_id from all_users + union all + select 'TEST' username, -600 user_id from dual + order by 1 desc; + open l_actual for + select username, user_id from all_users + union all + select 'TEST' username, -610 user_id from dual + order by 1 asc; + ut.expect( l_actual ).to_equal( l_expected ).join_by('USERNAME'); end; +/ ``` Above test will result in a difference in row 'TEST' regardless of data order. - -```sql - Rows: [ 1 differences ] - PK TEST - Expected: -600 - PK TEST - Actual: -610 +``` +FAILURE + Actual: refcursor [ count = 29 ] was expected to equal: refcursor [ count = 29 ] + Diff: + Rows: [ 1 differences ] + PK TEST - Actual: -610 + PK TEST - Expected: -600 + PK TEST - Extra: TEST-610 + at "anonymous block", line 15 ``` **Note** > When using `join_by`, the join column(s) are displayed first (as PK) to help you identify the mismatched rows/columns. -You can use `join_by` extended syntax in combination with `contain / include ` matcher. +You can use `join_by` syntax in combination with `contain` matcher. ```sql -procedure join_by_username_cn is - l_actual sys_refcursor; - l_expected sys_refcursor; +declare + l_actual sys_refcursor; + l_expected sys_refcursor; begin - open l_actual for select username, user_id from all_users; - open l_expected for - select username, user_id from all_users - union all - select 'TEST' username, -610 user_id from dual; - - ut.expect( l_actual ).to_contain( l_expected ).join_by('USERNAME'); + open l_actual for select username, user_id from all_users; + open l_expected for + select username, user_id from all_users + union all + select 'TEST' username, -610 user_id from dual; + + ut.expect( l_actual ).to_contain( l_expected ).join_by('USERNAME'); end; +/ ``` Above test will indicate that in actual data-set - ```sql - Actual: refcursor [ count = 43 ] was expected to contain: refcursor [ count = 44 ] - Diff: - Rows: [ 1 differences ] - PK TEST - Missing -610 +FAILURE + Actual: refcursor [ count = 28 ] was expected to contain: refcursor [ count = 29 ] + Diff: + Rows: [ 1 differences ] + PK TEST - Missing: TEST-610 + at "anonymous block", line 11 ``` - ### Joining using multiple columns You can specify multiple columns in `join_by` ```sql -procedure test_join_by_many_columns is - l_actual sys_refcursor; - l_expected sys_refcursor; +declare + l_actual sys_refcursor; + l_expected sys_refcursor; begin - open l_expected for - select username, user_id, created from all_users - order by 1 desc; - open l_actual for - select username, user_id, created from all_users - union all - select 'TEST' username, -610 user_id, sysdate from dual - order by 1 asc; - ut.expect( l_actual ).to_equal( l_expected ).join_by('USERNAME, USER_ID'); + open l_expected for + select username, user_id, created from all_users + order by 1 desc; + open l_actual for + select username, user_id, created from all_users + union all + select 'TEST' username, -610 user_id, sysdate from dual + order by 1 asc; + ut.expect( l_actual ).to_equal( l_expected ).join_by('USERNAME, USER_ID'); end; +/ +``` + +Produces: +``` +FAILURE + Actual: refcursor [ count = 29 ] was expected to equal: refcursor [ count = 28 ] + Diff: + Rows: [ 1 differences ] + PK TEST-610 - Extra: TEST-6102019-07-11 + at "anonymous block", line 13 ``` ### Joining using attributes of object in column list @@ -357,33 +379,34 @@ create or replace type person as object( create or replace type people as table of person / -create or replace package test_join_by is ---%suite - ---%test -procedure test_join_by_object_attribute; - -end; -/ - -create or replace package body test_join_by is - procedure test_join_by_object_attribute is - l_actual sys_refcursor; - l_expected sys_refcursor; - begin - open l_expected for - select person('Jack',42) someone from dual union all - select person('Pat', 44) someone from dual union all - select person('Matt',45) someone from dual; - open l_actual for - select person('Matt',55) someone from dual union all - select person('Pat', 44) someone from dual; - ut.expect( l_actual ).to_equal( l_expected ).join_by( 'SOMEONE/NAME' ); - end; - +declare + l_actual sys_refcursor; + l_expected sys_refcursor; +begin + open l_expected for + select person('Jack',42) someone from dual union all + select person('Pat', 44) someone from dual union all + select person('Matt',45) someone from dual; + open l_actual for + select person('Matt',55) someone from dual union all + select person('Pat', 44) someone from dual; + ut.expect( l_actual ).to_equal( l_expected ).join_by( 'SOMEONE/NAME' ); end; / +``` +Produces: +``` +FAILURE + Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 3 ] + Diff: + Rows: [ 2 differences ] + PK Matt - Actual: Matt55 + PK Matt - Actual: 55 + PK Matt - Expected: Matt45 + PK Matt - Expected: 45 + PK Jack - Missing: Jack42 + at "anonymous block", line 12 ``` **Note** @@ -399,15 +422,6 @@ create or replace type person as object( create or replace type people as table of person / -create or replace package test_join_by is ---%suite - ---%test -procedure test_join_by_collection_elem; - -end; -/ - create or replace package body test_join_by is procedure test_join_by_collection_elem is l_actual sys_refcursor; @@ -423,36 +437,51 @@ end; ``` ``` -Actual: refcursor [ count = 1 ] was expected to equal: refcursor [ count = 1 ] -Diff: -Unable to join sets: - Join key PERSONS/PERSON/NAME does not exists in expected - Join key PERSONS/PERSON/NAME does not exists in actual - Please make sure that your join clause is not refferring to collection element +FAILURE + Actual: refcursor [ count = 1 ] was expected to equal: refcursor [ count = 1 ] + Diff: + Unable to join sets: + Join key PERSONS/PERSON/NAME does not exists in expected + Join key PERSONS/PERSON/NAME does not exists in actual + Please make sure that your join clause is not refferring to collection element + + at "anonymous block", line 7 ``` **Note** ->`join_by` option is slower to process as it needs to perform a cursor join. +>`join_by` option is slower to process as it needs to perform a cursor join. It is still faster than the `unordered`. ## Defining item lists in option -XPath expressions are deprecated. They are currently still supported but in future versions they can be removed completely. Please use a current standard of defining items filter. -When using item list expression, keep in mind the following: +You may provide items for `include`/`exclude`/`join_by` as a single varchar2 value containing comma-separated list of attributes. +You may provide items for `include`/`exclude`/`join_by` as a a ut_varchar2_list of attributes. + +**Note** - object type attributes are nested under `` element - nested table and varray items type attributes are nested under `` elements Example of a valid parameter to include columns: `RN`, `A_Column`, `SOME_COL` in data comparison. ```sql -procedure include_col_list is +declare l_actual sys_refcursor; l_expected sys_refcursor; begin open l_expected for select rownum as rn, 'a' as "A_Column", 'x' SOME_COL from dual a connect by level < 4; open l_actual for select rownum as rn, 'a' as "A_Column", 'x' SOME_COL, a.* from all_objects a where rownum < 4; ut.expect( l_actual ).to_equal( l_expected ).include( 'RN,A_Column,SOME_COL' ); + open l_expected for select rownum as rn, 'a' as "A_Column", 'x' SOME_COL from dual a connect by level < 4; + open l_actual for select rownum as rn, 'a' as "A_Column", 'x' SOME_COL, a.* from all_objects a where rownum < 4; ut.expect( l_actual ).to_equal( l_expected ).include( ut_varchar2_list( 'RN', 'A_Column', 'SOME_COL' ) ); end; +/ +``` + +``` +SUCCESS + Actual: refcursor [ count = 3 ] was expected to equal: refcursor [ count = 3 ] +SUCCESS + Actual: refcursor [ count = 3 ] was expected to equal: refcursor [ count = 3 ] ``` ## Unordered columns / uc option @@ -465,44 +494,24 @@ Expectations that compare compound data type data with `unordered_columns` optio This option can be useful whn we have no control over the ordering of the column or the column order is not of importance from testing perspective. ```sql -create or replace package test_unordered_columns as - --%suite - - --%test - procedure cursor_include_unordered_cols; -end; -/ - -create or replace package body test_unordered_columns as - - procedure cursor_include_unordered_cols is - l_actual sys_refcursor; - l_expected sys_refcursor; - begin - --Arrange - open l_actual for select owner, object_name,object_type from all_objects where owner = user - order by 1,2,3 asc; - open l_expected for select object_type, owner, object_name from all_objects where owner = user - and rownum < 20; - - --Assert - ut.expect(l_actual).to_contain(l_expected).unordered_columns(); - end; +declare + l_actual sys_refcursor; + l_expected sys_refcursor; +begin + --Arrange + open l_actual for select owner, object_name, object_type from all_objects where owner = user + order by 1,2,3 asc; + open l_expected for select object_type, owner, object_name from all_objects where owner = user + and rownum < 20; + + --Assert + ut.expect(l_actual).to_contain(l_expected).unordered_columns(); end; / - -exec ut.run('test_unordered_columns'); ``` -The above test is successful despite the fact that column ordering in cursor is different. - +Produces: ``` -test_unordered_columns - cursor_include_unordered_cols [.042 sec] - -Finished in .046193 seconds -1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s) +SUCCESS + Actual: refcursor [ count = 348 ] was expected to contain: refcursor [ count = 19 ] ``` - - - diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 6f28325a2..391053fd6 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -2,6 +2,7 @@ # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. + utPLSQL uses expectations and matchers to perform the check on the data. Example of an expectation @@ -25,10 +26,6 @@ Expectation is a combination of: - the matcher used to perform comparison - them matcher parameters (actual value), depending on the matcher type -**Note:** -> The output from expectation is provided directly DBMS_OUTPUT only when the expectation is executed standalone (not as part of unit test). -> The output from expectation contains call stack trace only when expectation fails. -> Source code of the line which called the expectation is only reported when the line is part of in-database code (package) and the user calling expectation has privileges to see that source code. Matcher defines the comparison operation to be performed on expected (and actual) value. Pseudo-code: @@ -85,6 +82,90 @@ SUCCESS **Note:** > The examples in the document will be only using shortcut syntax, to keep the document brief. +# Using expectations +There are two ways to use expectations: +- by invoking utPLSQL framework to execute suite(s) of utPLSQL tests +- without invoking the utPLSQL framework - running expectations standalone + +## Running expectations within utPLSQL framework +When expectations are ran a part of test suite, the framework tracks: +- status of each expectation +- outcomes (messages) produced by each expectation +- call stack to each expectation + +In this case: +- expectation results of are not sent directly to `dbms_output` +- utPLSQL Reporters used when running suite decide on how the expectation results are formatted and displayed + +Example of test suite with an expectation: +```sql +create or replace package test_divide as + --%suite(Divide two numbers) + + --%test(Returns result when divisor is not zero) + procedure divide_6_by_2; + + --%test(Throws exception when divisor is zero) + --%throws(zero_divide) + procedure divide_by_0_throws; +end; +/ + +create or replace package body test_divide as + procedure divide_6_by_2 is + begin + ut.expect(6/2).to_equal(3); + end; + + procedure divide_by_0_throws is + begin + ut.expect(6/0).to_be_not_null(); + end; +end; +/ + +exec ut.run('test_divide'); + +drop package test_divide; +``` + +Produces following outputs: +``` +Package TEST_DIVIDE compiled + + +Package Body TEST_DIVIDE compiled + +Divide two numbers + Returns result when divisor is not zero [.003 sec] + Throws exception when divisor is zero [.003 sec] + +Finished in .009774 seconds +2 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s) + + + +PL/SQL procedure successfully completed. + + +Package TEST_DIVIDE dropped. +``` + +Please read about different options for [running test suites](running-unit-tests.md). + +## Running expectations outside utPLSQL framework +When expectations are invoked outside of utPLSQL framework the outputs from expectations are redirected straight to `dbms_output`. + +**Note:** +> The output from expectation contains call stack trace only when expectation fails. +> Source code of the line which called the expectation is only reported when the line is part of in-database code (package) and the user calling expectation has privileges to see that source code. + +**Important** +> Please do not use expectations as part of your production code. They are not designed to be used as part ot your code. Expectations are meant to be used only as part of your day-to-day testing activities. + +**Note:** +> The examples in the document will be only using standalone expectations, to keep the document brief. + # Matchers utPLSQL provides the following matchers to perform checks on the expected and actual values. @@ -922,18 +1003,18 @@ end; Returns following output via DBMS_OUTPUT: ``` FAILURE - Actual: ut3_latest_release.ut_varchar2_list [ count = 3 ] was expected to contain: ut3_latest_release.ut_varchar2_list [ count = 3 ] + Actual: ut3.ut_varchar2_list [ count = 3 ] was expected to contain: ut3.ut_varchar2_list [ count = 3 ] Diff: Rows: [ 1 differences ] Missing: E at "anonymous block", line 7 FAILURE - Actual: (ut3_latest_release.ut_varchar2_list [ count = 3 ]) + Actual: (ut3.ut_varchar2_list [ count = 3 ]) Data-types: VARCHAR2 Data: ABC - was expected not to contain:(ut3_latest_release.ut_varchar2_list [ count = 3 ]) + was expected not to contain:(ut3.ut_varchar2_list [ count = 3 ]) Data-types: VARCHAR2 Data: @@ -959,14 +1040,14 @@ end; Returns following output via DBMS_OUTPUT: ``` SUCCESS - Actual: ut3_latest_release.ut_varchar2_list [ count = 4 ] was expected to contain: ut3_latest_release.ut_varchar2_list [ count = 3 ] + Actual: ut3.ut_varchar2_list [ count = 4 ] was expected to contain: ut3.ut_varchar2_list [ count = 3 ] FAILURE - Actual: (ut3_latest_release.ut_varchar2_list [ count = 4 ]) + Actual: (ut3.ut_varchar2_list [ count = 4 ]) Data-types: VARCHAR2 Data: ABCD - was expected not to contain:(ut3_latest_release.ut_varchar2_list [ count = 3 ]) + was expected not to contain:(ut3.ut_varchar2_list [ count = 3 ]) Data-types: VARCHAR2 Data: @@ -992,7 +1073,7 @@ end; Returns following output via DBMS_OUTPUT: ``` FAILURE - Actual: ut3_latest_release.ut_varchar2_list [ count = 3 ] was expected to contain: ut3_latest_release.ut_varchar2_list [ count = 3 ] + Actual: ut3.ut_varchar2_list [ count = 3 ] was expected to contain: ut3.ut_varchar2_list [ count = 3 ] Diff: Rows: [ 3 differences ] Missing: D @@ -1000,12 +1081,12 @@ FAILURE Missing: F at "anonymous block", line 7 SUCCESS - Actual: (ut3_latest_release.ut_varchar2_list [ count = 3 ]) + Actual: (ut3.ut_varchar2_list [ count = 3 ]) Data-types: VARCHAR2 Data: ABC - was expected not to contain:(ut3_latest_release.ut_varchar2_list [ count = 3 ]) + was expected not to contain:(ut3.ut_varchar2_list [ count = 3 ]) Data-types: VARCHAR2 Data: @@ -1013,13 +1094,6 @@ SUCCESS ``` ----------------------------------------------------------------------------------- ----------------------------------------------------------------------------------- - TODO - continue doc rewrite - TODO - fix negated results for contain & equal ----------------------------------------------------------------------------------- ----------------------------------------------------------------------------------- - ## Comparing cursors, object types, nested tables and varrays utPLSQL is capable of comparing compound data-types including: @@ -1089,74 +1163,50 @@ utPLSQL will report all of the above differences in a readable format to help yo Below example illustrates, how utPLSQL will report such differences. ```sql -create or replace package test_cursor_compare as - --%suite - - --%test - procedure do_test; -end; -/ - -create or replace package body test_cursor_compare as - procedure do_test is - l_actual sys_refcursor; - l_expected sys_refcursor; - begin - open l_expected for - select 1 as ID, 'JACK' as FIRST_NAME, 'SPARROW' AS LAST_NAME, 10000 AS SALARY - from dual union all - select 2 as ID, 'LUKE' as FIRST_NAME, 'SKYWALKER' AS LAST_NAME, 1000 AS SALARY - from dual union all - select 3 as ID, 'TONY' as FIRST_NAME, 'STARK' AS LAST_NAME, 100000 AS SALARY - from dual; - open l_actual for - select 'M' AS GENDER, 'JACK' as FIRST_NAME, 'SPARROW' AS LAST_NAME, 1 as ID, '25000' AS SALARY - from dual union all - select 'M' AS GENDER, 'TONY' as FIRST_NAME, 'STARK' AS LAST_NAME, 3 as ID, '100000' AS SALARY - from dual union all - select 'F' AS GENDER, 'JESSICA' as FIRST_NAME, 'JONES' AS LAST_NAME, 4 as ID, '2345' AS SALARY - from dual union all - select 'M' AS GENDER, 'LUKE' as FIRST_NAME, 'SKYWALKER' AS LAST_NAME, 2 as ID, '1000' AS SALARY - from dual; - ut.expect(l_actual).to_equal(l_expected); - end; +declare + l_actual sys_refcursor; + l_expected sys_refcursor; +begin + open l_expected for + select 1 as ID, 'JACK' as FIRST_NAME, 'SPARROW' AS LAST_NAME, 10000 AS SALARY + from dual union all + select 2 as ID, 'LUKE' as FIRST_NAME, 'SKYWALKER' AS LAST_NAME, 1000 AS SALARY + from dual union all + select 3 as ID, 'TONY' as FIRST_NAME, 'STARK' AS LAST_NAME, 100000 AS SALARY + from dual; + open l_actual for + select 'M' AS GENDER, 'JACK' as FIRST_NAME, 'SPARROW' AS LAST_NAME, 1 as ID, '25000' AS SALARY + from dual union all + select 'M' AS GENDER, 'TONY' as FIRST_NAME, 'STARK' AS LAST_NAME, 3 as ID, '100000' AS SALARY + from dual union all + select 'F' AS GENDER, 'JESSICA' as FIRST_NAME, 'JONES' AS LAST_NAME, 4 as ID, '2345' AS SALARY + from dual union all + select 'M' AS GENDER, 'LUKE' as FIRST_NAME, 'SKYWALKER' AS LAST_NAME, 2 as ID, '1000' AS SALARY + from dual; + ut.expect(l_actual).to_equal(l_expected); end; / ``` -When the test package is executed using: - -```sql -set serverout on -exec ut.run('test_cursor_compare'); -``` -We get the following report: +Returns following output via DBMS_OUTPUT: ``` -test_cursor_compare - do_test [.052 sec] (FAILED - 1) - -Failures: - - 1) do_test - Actual: refcursor [ count = 4 ] was expected to equal: refcursor [ count = 3 ] - Diff: - Columns: - Column is misplaced. Expected position: 1, actual position: 4. - Column data-type is invalid. Expected: NUMBER, actual: VARCHAR2. - Column [position: 1, data-type: CHAR] is not expected in results. - Rows: [ 4 differences ] - Row No. 1 - Actual: 25000 - Row No. 1 - Expected: 10000 - Row No. 2 - Actual: TONYSTARK3100000 - Row No. 2 - Expected: 2LUKESKYWALKER1000 - Row No. 3 - Actual: JESSICAJONES42345 - Row No. 3 - Expected: 3TONYSTARK100000 - Row No. 4 - Extra: MLUKESKYWALKER21000 - at "UT3.TEST_CURSOR_COMPARE", line 22 ut.expect(l_actual).to_equal(l_expected); - - -Finished in .053553 seconds -1 tests, 1 failed, 0 errored, 0 disabled, 0 warning(s) +FAILURE + Actual: refcursor [ count = 4 ] was expected to equal: refcursor [ count = 3 ] + Diff: + Columns: + Column is misplaced. Expected position: 1, actual position: 4. + Column data-type is invalid. Expected: NUMBER, actual: VARCHAR2. + Column [position: 1, data-type: CHAR] is not expected in results. + Rows: [ 4 differences ] + Row No. 1 - Actual: 25000 + Row No. 1 - Expected: 10000 + Row No. 2 - Actual: TONYSTARK3100000 + Row No. 2 - Expected: 2LUKESKYWALKER1000 + Row No. 3 - Actual: JESSICAJONES42345 + Row No. 3 - Expected: 3TONYSTARK100000 + Row No. 4 - Extra: MLUKESKYWALKER21000 + Row No. 4 - Extra: MLUKESKYWALKER21000 + at "anonymous block", line 21 ``` utPLSQL identifies and reports on columns: @@ -1186,37 +1236,30 @@ Object type comparison. ```sql create type department as object(name varchar2(30)) / + create or replace function get_dept return department is begin return department('IT'); end; / -create or replace package demo_dept as - --%suite(demo) - --%test(demo of object to object comparison) - procedure test_department; -end; -/ -create or replace package body demo_dept as - procedure test_department is - v_actual department; - begin - --Act/ Assert - ut.expect( anydata.convertObject( get_dept() ) ).to_equal( anydata.convertObject( department('HR') ) ); - end; -end; -/ -begin - ut.run('demo_dept'); -end; -/ +exec ut.expect( anydata.convertObject( get_dept() ) ).to_equal( anydata.convertObject( department('HR') ) ); -drop package demo_dept; drop function get_dept; drop type department; ``` +Returns following output via DBMS_OUTPUT: +``` +FAILURE + Actual: ut3.department was expected to equal: ut3.department + Diff: + Rows: [ 1 differences ] + Row No. 1 - Actual: IT + Row No. 1 - Expected: HR + at "anonymous block", line 1 +``` + Table type comparison. ```sql create type department as object(name varchar2(30)) @@ -1228,87 +1271,215 @@ begin return departments( department('IT'), department('HR') ); end; / -create or replace package demo_depts as - --%suite(demo) - --%test(demo of collection comparison) - procedure test_departments; -end; -/ -create or replace package body demo_depts as - procedure test_departments is - v_expected departments; - v_actual departments; - begin - v_expected := departments(department('HR'), department('IT') ); - ut.expect( anydata.convertCollection( get_depts() ) ).to_equal( anydata.convertCollection( v_expected ) ); - end; -end; -/ +declare + v_expected departments; begin - ut.run('demo_depts'); + v_expected := departments(department('HR'), department('IT') ); + ut.expect( anydata.convertCollection( get_depts() ) ).to_equal( anydata.convertCollection( v_expected ) ); end; / -drop package demo_dept; drop type function get_depts; drop type departments; drop type department; ``` -Some of the possible combinations of the anydata and their results: +Returns following output via DBMS_OUTPUT: +``` +FAILURE + Actual: ut3.departments [ count = 2 ] was expected to equal: ut3.departments [ count = 2 ] + Diff: + Rows: [ 2 differences ] + Row No. 1 - Actual: IT + Row No. 1 - Expected: HR + Row No. 2 - Actual: HR + Row No. 2 - Expected: IT + at "anonymous block", line 5 +``` +Some of the possible combinations of anydata and their results: ```sql +clear screen +set serverout on +set feedback off + create or replace type t_tab_varchar is table of varchar2(1) / - create or replace type dummy_obj as object ( id number, "name" varchar2(30), "Value" varchar2(30) ) / - create or replace type dummy_obj_lst as table of dummy_obj / - create or replace type t_varray is varray(1) of number / +exec ut.expect( anydata.convertObject( dummy_obj( 1, 'A', '0' ) ) ).to_equal( anydata.convertObject( dummy_obj(1, 'A', '0') ) ); +exec ut.expect( anydata.convertCollection( t_tab_varchar('A') ) ).to_equal( anydata.convertCollection( t_tab_varchar('A') ) ); +exec ut.expect( anydata.convertCollection( t_tab_varchar('A') ) ).to_equal( anydata.convertCollection( t_tab_varchar('B') ) ); +exec ut.expect( anydata.convertCollection( t_tab_varchar() ) ).to_be_null(); +exec ut.expect( anydata.convertCollection( t_tab_varchar() ) ).to_equal( anydata.convertCollection( t_tab_varchar() ) ); +exec ut.expect( anydata.convertCollection( t_tab_varchar() ) ).to_equal( anydata.convertCollection( t_tab_varchar('A') ) ); +exec ut.expect( anydata.convertCollection( t_tab_varchar() ) ).to_have_count(0); +exec ut.expect( anydata.convertCollection( t_tab_varchar() ) ).to_equal( anydata.convertCollection( t_tab_varchar() ) ); +exec ut.expect( anydata.convertCollection( t_tab_varchar() ) ).to_equal( anydata.convertCollection( t_tab_varchar('A') ) ); +exec ut.expect( anydata.convertCollection( dummy_obj_lst( dummy_obj( 1, 'A', '0' ) ) ) ).to_equal( anydata.convertCollection( dummy_obj_lst( dummy_obj( 1, 'A', '0' ) ) ) ); +exec ut.expect( anydata.convertCollection( dummy_obj_lst( dummy_obj( 1, 'A', '0' ) ) ) ).to_equal( anydata.convertCollection( dummy_obj_lst( dummy_obj( 2, 'A', '0' ) ) ) ); +exec ut.expect( anydata.convertCollection( dummy_obj_lst() ) ).to_equal( anydata.convertCollection( dummy_obj_lst( dummy_obj( 1, 'A', '0' ) ) ) ); +exec ut.expect( anydata.convertCollection( dummy_obj_lst() ) ).to_be_null(); +exec ut.expect( anydata.convertCollection( dummy_obj_lst() ) ).to_equal( anydata.convertCollection( dummy_obj_lst() ) ); +exec ut.expect( anydata.convertCollection( dummy_obj_lst() ) ).to_have_count(0); +exec ut.expect( anydata.convertCollection( dummy_obj_lst() ) ).to_equal( anydata.convertCollection( dummy_obj_lst(dummy_obj(1, 'A', '0') ) ) ); +exec ut.expect( anydata.convertCollection( dummy_obj_lst() ) ).to_equal( anydata.convertCollection( dummy_obj_lst() ) ); +exec ut.expect( anydata.convertCollection( t_varray() ) ).to_be_null(); +exec ut.expect( anydata.convertCollection( t_varray() ) ).to_equal( anydata.convertCollection( t_varray() ) ); +exec ut.expect( anydata.convertCollection( t_varray() ) ).to_equal( anydata.convertCollection( t_varray(1) ) ); +exec ut.expect( anydata.convertCollection( t_varray() ) ).to_have_count(0); +exec ut.expect( anydata.convertCollection( t_varray() ) ).to_equal( anydata.convertCollection( t_varray() ) ); +exec ut.expect( anydata.convertCollection( t_varray() ) ).to_equal( anydata.convertCollection( t_varray(1) ) ); +exec ut.expect( anydata.convertCollection( t_varray(1) ) ).to_equal( anydata.convertCollection( t_varray(1) ) ); +exec ut.expect( anydata.convertCollection( t_varray(1) ) ).to_equal( anydata.convertCollection( t_varray(2) ) ); + +drop type t_varray; +drop type dummy_obj_lst; +drop type dummy_obj; +drop type t_tab_varchar; ``` +Returns following output via DBMS_OUTPUT: +``` +SUCCESS + Actual: ut3.dummy_obj was expected to equal: ut3.dummy_obj +SUCCESS + Actual: ut3.t_tab_varchar [ count = 1 ] was expected to equal: ut3.t_tab_varchar [ count = 1 ] +FAILURE + Actual: ut3.t_tab_varchar [ count = 1 ] was expected to equal: ut3.t_tab_varchar [ count = 1 ] + Diff: + Rows: [ 1 differences ] + Row No. 1 - Actual: A + Row No. 1 - Expected: B + at "anonymous block", line 1 + +FAILURE + Actual: (ut3.t_tab_varchar [ count = 0 ]) + Data-types: + VARCHAR2 + Data: + was expected to be null + at "anonymous block", line 1 +SUCCESS + Actual: ut3.t_tab_varchar [ count = 0 ] was expected to equal: ut3.t_tab_varchar [ count = 0 ] + +FAILURE + Actual: ut3.t_tab_varchar [ count = 0 ] was expected to equal: ut3.t_tab_varchar [ count = 1 ] + Diff: + Rows: [ 1 differences ] + Row No. 1 - Missing: A + at "anonymous block", line 1 + +SUCCESS + Actual: (ut3.t_tab_varchar [ count = 0 ]) was expected to have [ count = 0 ] + +SUCCESS + Actual: ut3.t_tab_varchar [ count = 0 ] was expected to equal: ut3.t_tab_varchar [ count = 0 ] + +FAILURE + Actual: ut3.t_tab_varchar [ count = 0 ] was expected to equal: ut3.t_tab_varchar [ count = 1 ] + Diff: + Rows: [ 1 differences ] + Row No. 1 - Missing: A + at "anonymous block", line 1 + +SUCCESS + Actual: ut3.dummy_obj_lst [ count = 1 ] was expected to equal: ut3.dummy_obj_lst [ count = 1 ] -| Type A | Comparisoon | Type B | Result | -| :------------------------------------- | :-----------: | :------------------------------------ | -----: | -| t_tab_varchar('A') | equal | t_tab_varchar('A') | Pass | -| t_tab_varchar('A') | equal | t_tab_varchar('B') | Fail | -| t_tab_varchar | is_null | | Pass | -| t_tab_varchar | equal | t_tab_varchar | Pass | -| t_tab_varchar | equal | t_tab_varchar('A') | Fail | -| t_tab_varchar() | have_count(0) | | Pass | -| t_tab_varchar() | equal | t_tab_varchar() | Pass | -| t_tab_varchar() | equal | t_tab_varchar('A') | Fail | -| dummy_obj_lst (dummy_obj(1, 'A', '0')) | equal | dummy_obj_lst(dummy_obj(1, 'A', '0')) | Pass | -| dummy_obj_lst (dummy_obj(1, 'A', '0')) | equal | dummy_obj_lst(dummy_obj(2, 'A', '0')) | Fail | -| dummy_obj_lst | equal | dummy_obj_lst(dummy_obj(1, 'A', '0')) | Fail | -| dummy_obj_lst | is_null | | Pass | -| dummy_obj_lst | equal | dummy_obj_lst | Pass | -| dummy_obj_lst() | have_count(0) | | Pass | -| dummy_obj_lst() | equal | dummy_obj_lst(dummy_obj(1, 'A', '0')) | Fail | -| dummy_obj_lst() | equal | dummy_obj_lst() | Pass | -| t_varray | is null | | Pass | -| t_varray | equal | t_varray | Pass | -| t_varray | equal | t_varray(1) | Fail | -| t_varray() | have_count(0) | | Pass | -| t_varray() | equal | t_varray() | Pass | -| t_varray() | equal | t_varray(1) | Fail | -| t_varray(1) | equal | t_varray(1) | Pass | -| t_varray(1) | equal | t_varray(2) | Fail | +FAILURE + Actual: ut3.dummy_obj_lst [ count = 1 ] was expected to equal: ut3.dummy_obj_lst [ count = 1 ] + Diff: + Rows: [ 1 differences ] + Row No. 1 - Actual: 1 + Row No. 1 - Expected: 2 + at "anonymous block", line 1 + +FAILURE + Actual: ut3.dummy_obj_lst [ count = 0 ] was expected to equal: ut3.dummy_obj_lst [ count = 1 ] + Diff: + Rows: [ 1 differences ] + Row No. 1 - Missing: 1A0 + at "anonymous block", line 1 + +FAILURE + Actual: (ut3.dummy_obj_lst [ count = 0 ]) + Data-types: + DUMMY_OBJ + Data: + was expected to be null + at "anonymous block", line 1 + +SUCCESS + Actual: ut3.dummy_obj_lst [ count = 0 ] was expected to equal: ut3.dummy_obj_lst [ count = 0 ] + +SUCCESS + Actual: (ut3.dummy_obj_lst [ count = 0 ]) was expected to have [ count = 0 ] + +FAILURE + Actual: ut3.dummy_obj_lst [ count = 0 ] was expected to equal: ut3.dummy_obj_lst [ count = 1 ] + Diff: + Rows: [ 1 differences ] + Row No. 1 - Missing: 1A0 + at "anonymous block", line 1 + +SUCCESS + Actual: ut3.dummy_obj_lst [ count = 0 ] was expected to equal: ut3.dummy_obj_lst [ count = 0 ] + +FAILURE + Actual: (ut3.t_varray [ count = 0 ]) + Data-types: + NUMBER + Data: + was expected to be null + at "anonymous block", line 1 + +SUCCESS + Actual: ut3.t_varray [ count = 0 ] was expected to equal: ut3.t_varray [ count = 0 ] + +FAILURE + Actual: ut3.t_varray [ count = 0 ] was expected to equal: ut3.t_varray [ count = 1 ] + Diff: + Rows: [ 1 differences ] + Row No. 1 - Missing: 1 + at "anonymous block", line 1 + +SUCCESS + Actual: (ut3.t_varray [ count = 0 ]) was expected to have [ count = 0 ] + +SUCCESS + Actual: ut3.t_varray [ count = 0 ] was expected to equal: ut3.t_varray [ count = 0 ] + +FAILURE + Actual: ut3.t_varray [ count = 0 ] was expected to equal: ut3.t_varray [ count = 1 ] + Diff: + Rows: [ 1 differences ] + Row No. 1 - Missing: 1 + at "anonymous block", line 1 +SUCCESS + Actual: ut3.t_varray [ count = 1 ] was expected to equal: ut3.t_varray [ count = 1 ] +FAILURE + Actual: ut3.t_varray [ count = 1 ] was expected to equal: ut3.t_varray [ count = 1 ] + Diff: + Rows: [ 1 differences ] + Row No. 1 - Actual: 1 + Row No. 1 - Expected: 2 + at "anonymous block", line 1 +``` ### Comparing cursor data containing DATE fields @@ -1324,74 +1495,79 @@ This way, the DATE data in cursors will be properly formatted for comparison usi The example below makes use of `ut.set_nls`, `ut.reset_nls`, so that the date in `l_expected` and `l_actual` is compared using date-time formatting. ```sql +clear screen +alter session set nls_date_format='yyyy-mm-dd'; +set serverout on +set feedback off create table events ( description varchar2(4000), event_date date ) / -create or replace function get_events return sys_refcursor is - l_result sys_refcursor; +declare + c_description constant varchar2(30) := 'Test event'; + c_event_date constant date := to_date('2016-09-08 06:51:22','yyyy-mm-dd hh24:mi:ss'); + c_second constant number := 1/24/60/60; + l_actual sys_refcursor; + l_expected sys_refcursor; begin - open l_result for select description, event_date from events; - return l_result; -end; -/ - -create or replace package test_get_events is - --%suite(get_events) - - --%beforeall - procedure setup_events; - --%test(returns event within date range) - procedure get_events_for_date_range; -end; -/ - -create or replace package body test_get_events is - - gc_description constant varchar2(30) := 'Test event'; - gc_event_date constant date := to_date('2016-09-08 06:51:22','yyyy-mm-dd hh24:mi:ss'); - gc_second constant number := 1/24/60/60; - procedure setup_events is - begin - insert into events (description, event_date) values (gc_description, gc_event_date); - end; + --Arrange + insert into events (description, event_date) values (c_description, c_event_date); - procedure get_events_for_date_range is - l_actual sys_refcursor; - l_expected_bad_date sys_refcursor; begin - --Arrange - ut.set_nls(); -- Change the NLS settings for date to be ISO date-time 'YYYY-MM-DD HH24:MI:SS' - open l_expected_bad_date for select gc_description as description, gc_event_date + gc_second as event_date from dual; + -- Change the NLS settings for date to be ISO date-time 'YYYY-MM-DD HH24:MI:SS' + ut.set_nls(); --Act - l_actual := get_events(); + open l_expected for select c_description as description, c_event_date + c_second as event_date from dual; + open l_actual for select description, event_date from events; --Assert - ut.expect( l_actual ).not_to_equal( l_expected_bad_date ); - ut.reset_nls(); -- Change the NLS settings after cursors were opened + ut.expect( l_actual ).not_to_equal( l_expected ); + -- Reset the NLS settings to their default values after cursor data was processed + ut.reset_nls(); end; - - procedure bad_test is - l_expected_bad_date sys_refcursor; + begin - --Arrange - open l_expected_bad_date for select gc_description as description, gc_event_date + gc_second as event_date from dual; - --Act / Assert - ut.expect( get_events() ).not_to_equal( l_expected_bad_date ); + --Act + open l_expected for select c_description as description, c_event_date + c_second as event_date from dual; + open l_actual for select description, event_date from events; + --Assert + ut.expect( l_actual ).not_to_equal( l_expected ); end; - -end; -/ - -begin - ut.run('test_get_events'); + --Cleanup + rollback; end; / drop table events; -drop function get_events; -drop package test_get_events; ``` + In the above example: -- The test `get_events_for_date_range` will succeed, as the `l_expected_bad_date` cursor contains different date-time then the cursor returned by `get_events` function call. -- The test `bad_test` will fail, as the column `event_date` will get compared as DATE without TIME. +- The first expectation is successful, as the `l_expected` cursor contains different date-time then the cursor returned by `get_events` function call +- The second expectation fails, as the column `event_date` will get compared as DATE without TIME (suing default current session NLS date format) + +Output via DBMS_OUTPUT from the above example: +``` +SUCCESS + Actual: (refcursor [ count = 1 ]) + Data-types: + VARCHAR2DATE + Data: + Test event2016-09-08T06:51:22 + was expected not to equal: (refcursor [ count = 1 ]) + Data-types: + VARCHAR2DATE + Data: + Test event2016-09-08T06:51:23 +FAILURE + Actual: (refcursor [ count = 1 ]) + Data-types: + VARCHAR2DATE + Data: + Test event2016-09-08 + was expected not to equal: (refcursor [ count = 1 ]) + Data-types: + VARCHAR2DATE + Data: + Test event2016-09-08 + at "anonymous block", line 28 +``` ### Comparing cursor data containing TIMESTAMP bind variables @@ -1400,98 +1576,73 @@ To properly compare `timestamp` column data returned by cursor against bind vari This applies to `timestamp`,`timestamp with timezone`, `timestamp with local timezone` data types. Example below illustrates usage of `cast` operator to assure appropriate precision is applied on timestamp bind-variables in cursor result-set + ```sql -drop table timestamps; +clear screen +set serverout on +set feedback off + create table timestamps ( ts3 timestamp (3), ts6 timestamp (6), ts9 timestamp (9) ); -create or replace package timestamps_api is - procedure load ( - i_timestamp3 timestamps.ts3%type, - i_timestamp6 timestamps.ts6%type, - i_timestamp9 timestamps.ts9%type - ); -end; -/ - -create or replace package body timestamps_api is - procedure load ( - i_timestamp3 timestamps.ts3%type, - i_timestamp6 timestamps.ts6%type, - i_timestamp9 timestamps.ts9%type - ) - is - begin - insert into timestamps (ts3, ts6, ts9) - values (i_timestamp3, i_timestamp6, i_timestamp9); - end; -end; -/ - - -create or replace package test_timestamps_api is - -- %suite +declare + l_time timestamp(9); + l_expected sys_refcursor; + l_actual sys_refcursor; +begin + --Arrange + l_time := systimestamp; - -- %test(Loads data into timestamps table) - procedure test_load; -end; -/ + insert into timestamps (ts3, ts6, ts9) values (l_time, l_time, l_time); -create or replace package body test_timestamps_api is - procedure test_load is - l_time timestamp(9); - l_expected sys_refcursor; - l_actual sys_refcursor; begin - --Arrange - l_time := systimestamp; - + --Act open l_expected for select cast(l_time as timestamp(3)) as ts3, cast(l_time as timestamp(6)) as ts6, cast(l_time as timestamp(9)) as ts9 - from dual; - - --Act - timestamps_api.load ( - l_time, l_time, l_time - ); - + from dual; + + open l_actual for select ts3, ts6, ts9 from timestamps; + --Assert - open l_actual for - select ts3, ts6, ts9 - from timestamps; - - ut.expect (l_actual).to_equal (l_expected); - + ut.expect (l_actual).to_equal (l_expected); + end; + begin + open l_expected for + select l_time as ts3, l_time as ts6, l_time as ts9 from dual; + + open l_actual for select ts3, ts6, ts9 from timestamps; + + --Assert + ut.expect (l_actual).to_equal (l_expected); end; end; / -begin - ut.run ('test_timestamps_api'); -end; -/ +drop table timestamps; ``` -The execution of the above runs successfully +Returns following output via DBMS_OUTPUT: ``` -test_timestamps_api - Loads data into timestamps table [.046 sec] - -Finished in .048181 seconds -1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s) +SUCCESS + Actual: refcursor [ count = 1 ] was expected to equal: refcursor [ count = 1 ] +FAILURE + Actual: refcursor [ count = 1 ] was expected to equal: refcursor [ count = 1 ] + Diff: + Rows: [ 1 differences ] + Row No. 1 - Actual: 2019-07-08T22:08:41.8992019-07-08T22:08:41.899319 + Row No. 1 - Expected: 2019-07-08T22:08:41.8993190002019-07-08T22:08:41.899319000 + at "anonymous block", line 32 ``` - - # Comparing Json objects -utPLSQL is capable of comparing json data-types on Oracle 12.2 and above. +utPLSQL is capable of comparing json data-types **on Oracle 12.2 and above**. ### Notes on comparison of json data @@ -1502,136 +1653,111 @@ utPLSQL is capable of comparing json data-types on Oracle 12.2 and above. -Some examples of using json data-types in matcher are : - +Compare JSON example: ```sql -create or replace package test_expectations_json is - - --%suite(json expectations) - - --%test(Gives success for identical data) - procedure success_on_same_data; -end; -/ - -create or replace package body test_expectations_json is - - procedure success_on_same_data is - l_expected json_element_t; - l_actual json_element_t; - begin - -- Arrange - l_expected := json_element_t.parse(' -{ - "Actors":[ - { - "name":"Tom Cruise", - "age":56, - "Born At":"Syracuse, NY", - "Birthdate":"July 3, 1962", - "photo":"https://jsonformatter.org/img/tom-cruise.jpg", - "wife":null, - "weight":67.5, - "hasChildren":true, - "hasGreyHair":false, - "children":[ - "Suri", - "Isabella Jane", +declare + l_expected json_element_t; + l_actual json_element_t; +begin + l_expected := json_element_t.parse(' + { + "Actors": [ + { + "name": "Tom Cruise", + "age": 56, + "Birthdate": "July 3, 1962", + "hasChildren": true, + "children": [ "Connor" - ] - }, - { - "name":"Robert Downey Jr.", - "age":53, - "Born At":"New York City, NY", - "Birthdate":"April 4, 1965", - "photo":"https://jsonformatter.org/img/Robert-Downey-Jr.jpg", - "wife":"Susan Downey", - "weight":77.1, - "hasChildren":true, - "hasGreyHair":false, - "children":[ - "Indio Falconer", - "Avri Roel", + ] + }, + { + "name": "Robert Downey Jr.", + "age": 53, + "Birthdate": "April 4, 1965", + "hasChildren": true, + "children": [ "Exton Elias" - ] - } - ] -}'); + ] + } + ] + }' + ); l_actual := json_element_t.parse(' -{ - "Actors":[ - { - "name":"Tom Cruise", - "age":56, - "Born At":"Syracuse, NY", - "Birthdate":"July 3, 1962", - "photo":"https://jsonformatter.org/img/tom-cruise.jpg", - "wife":null, - "weight":67.5, - "hasChildren":true, - "hasGreyHair":false, - "children":[ + { + "Actors": [ + { + "name": "Tom Cruise", + "age": 56, + "Birthdate": "1962.07.03", + "hasChildren": true, + "children": [ "Suri", "Isabella Jane", "Connor" - ] - }, - { - "name":"Robert Downey Jr.", - "age":53, - "Born At":"New York City, NY", - "Birthdate":"April 4, 1965", - "photo":"https://jsonformatter.org/img/Robert-Downey-Jr.jpg", - "wife":"Susan Downey", - "weight":77.1, - "hasChildren":true, - "hasGreyHair":false, - "children":[ + ] + }, + { + "name": "Jr., Robert Downey", + "age": 53, + "Birthdate": "April 4, 1965", + "hasChildren": true, + "children": [ "Indio Falconer", "Avri Roel", "Exton Elias" - ] - } - ] -}'); + ] + } + ] + }' + ); - ut.expect( l_actual ).to_equal( l_actual ); + ut.expect( l_actual ).to_equal( l_expected ); - end; end; -/ ``` -It is possible to use a PL/SQL to extract a piece of JSON and compare it as follow - +Returns following output via DBMS_OUTPUT: +``` +FAILURE + Actual: json was expected to equal: json + Diff: 8 differences found + 4 unequal values, 4 missing properties + Extra property: "Avri Roel" on path: $."Actors"[1]."children"[1] + Extra property: "Isabella Jane" on path: $."Actors"[0]."children"[1] + Extra property: "Connor" on path: $."Actors"[0]."children"[2] + Extra property: "Exton Elias" on path: $."Actors"[1]."children"[2] + Actual value: "Robert Downey Jr." was expected to be: "Jr., Robert Downey" on path: $."Actors"[1]."name" + Actual value: "July 3, 1962" was expected to be: "1962.07.03" on path: $."Actors"[0]."Birthdate" + Actual value: "Connor" was expected to be: "Suri" on path: $."Actors"[0]."children"[0] + Actual value: "Exton Elias" was expected to be: "Indio Falconer" on path: $."Actors"[1]."children"[0] + at "anonymous block", line 59 +``` + +Comparing parts of JSON example: ```sql -create or replace package test_expectations_json is - - --%suite(json expectations) - - --%test(Gives success for identical pieces of two different jsons) - procedure to_diff_json_extract_same; - -end; -/ - -create or replace package body test_expectations_json is - - procedure to_diff_json_extract_same as - l_expected json_object_t; - l_actual json_object_t; - l_array_actual json_array_t; - l_array_expected json_array_t; - begin - -- Arrange - l_expected := json_object_t.parse(' { +declare + l_actual json_object_t; + l_actual_extract json_array_t; + l_expected json_array_t; +begin + -- Arrange + l_expected := json_array_t.parse(' + [ + "Indio Falconer", + "Avri Roel", + "Exton Elias" + ]' + ); + + l_actual := json_object_t.parse(' + { "Actors": [ - { - "name": "Tom Cruise", + { + "name": "Tom Cruise", "age": 56, - "Born At": "Syracuse, NY", + "Born At": "Syracuse, NY", "Birthdate": "July 3, 1962", "photo": "https://jsonformatter.org/img/tom-cruise.jpg", "wife": null, @@ -1645,49 +1771,39 @@ create or replace package body test_expectations_json is ] }, { - "name": "Robert Downey Jr.", + "name": "Robert Downey Jr.", "age": 53, "Born At": "New York City, NY", "Birthdate": "April 4, 1965", "photo": "https://jsonformatter.org/img/Robert-Downey-Jr.jpg", "wife": "Susan Downey", - "weight": 77.1, + "weight": 77.1, "hasChildren": true, "hasGreyHair": false, "children": [ "Indio Falconer", - "Avri Roel", "Exton Elias" ] } ] }' - ); - - l_actual := json_object_t.parse(' { - "Actors": - { - "name": "Krzystof Jarzyna", - "age": 53, - "Born At": "Szczecin", - "Birthdate": "April 4, 1965", - "photo": "niewidzialny", - "wife": "Susan Downey", - "children": [ - "Indio Falconer", - "Avri Roel", - "Exton Elias" - ] - } - }' - ); + ); - l_array_actual := json_array_t(json_query(l_actual.stringify,'$.Actors.children')); - l_array_expected := json_array_t(json_query(l_expected.stringify,'$.Actors[1].children')); - --Act - ut.expect(l_array_actual).to_equal(l_array_expected); + l_actual_extract := json_array_t(json_query(l_actual.stringify,'$.Actors[1].children')); + --Act + ut.expect(l_actual_extract).to_equal(l_expected); - end; end; / ``` + +Returns following output via DBMS_OUTPUT: +``` +FAILURE + Actual: json was expected to equal: json + Diff: 2 differences found + 1 unequal values, 1 missing properties + Missing property: "Exton Elias" on path: $[2] + Actual value: "Avri Roel" was expected to be: "Exton Elias" on path: $[1] + at "anonymous block", line 55 +``` From 773eae25b2ea6982510d0f644609788af6836bf4 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 13 Jul 2019 03:50:45 +0100 Subject: [PATCH 0553/1096] Improved functionality of reporters to allow for inline calls. References #955 --- docs/userguide/running-unit-tests.md | 58 ++++++++++++++++++- source/core/types/ut_output_reporter_base.tpb | 9 ++- source/core/types/ut_output_reporter_base.tps | 1 + 3 files changed, 65 insertions(+), 3 deletions(-) diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index eb06fd8c3..0afda436c 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -31,6 +31,8 @@ curl -Lk "${DOWNLOAD_URL}" -o utplsql-cli.zip unzip -q utplsql-cli.zip ``` +Keep in mind that you will need to download/provide Oracle JDBC driver separately, as it is not part of utPLSQL-cli due to licensing restrictions. + # ut.run The `ut` package contains overloaded `run` procedures and functions. @@ -167,11 +169,63 @@ The main difference compared to the `ut.run` API is that `ut_runner.run` does no `ut_runner.run` accepts multiple reporters. Each reporter pipes to a separate output (uniquely identified by output_id). Outputs of multiple reporters can be consumed in parallel. This allows for live reporting of test execution progress with threads and several database sessions. -The concept is pretty simple. +`ut_runner.run` API is used by utPLSQL-cli, utPLSQL-SQLDeveloper extension and utPLSQL-maven-plugin and allows for: +- deciding on the scope of test run (by schema names, object names, suite paths or tags ) +- running tests with several concurrent reporters +- real-time reporting of test execution progress +- controlling colored text output to the screen +- controlling scope of code coverage reports +- mapping of database source code to project files +- controlling behavior on test-failures +- controlling client character set for HTML and XML reports +- controlling rollback behavior of test-run +- controlling random order of test execution + +Running with multiple reporters. - in the main thread (session), define the reporters to be used. Each reporter has it's output_id and so you need to extract and store those output_ids. - as a separate thread, start `ut_runner.run` and pass reporters with previously defined output_ids. -- for each reporter start a separate thread and read outputs from the `ut_output_buffer.get_lines` table function by providing the output_id defined in the main thread. +- for each reporter start a separate thread and read outputs from the `reporter.get_lines` table function or from `reporter.get_lines_cursor()` by providing the `reporter_id` defined in the main thread. +- each reporter for each test-run must have a unique `reporter_id`. The `reporter_id` is used between two sessions to identify the data stream + +Example: +```sql +--main test run ( session 1 ) +declare + l_reporter ut_realtime_reporter := ut_realtime_reporter(); +begin + l_reporter.set_reporter_id( 'd8a79e85915640a6a4e1698fdf90ba74' ); + l_reporter.output_buffer.init(); + ut_runner.run (ut_varchar2_list ('ut3_tester','ut3$user#'), ut_reporters( l_reporter ) ); +end; +/ +``` + +```sql +--report consumer ( session 2 ) +set arraysize 1 +set pagesize 0 + +select * + from table( + ut_realtime_reporter() + .set_reporter_id('d8a79e85915640a6a4e1698fdf90ba74') + .get_lines() + ); +``` + +```sql +--alternative version of report consumer ( session 2 ) +set arraysize 1 +set pagesize 0 + +select + ut_realtime_reporter() + .set_reporter_id('d8a79e85915640a6a4e1698fdf90ba74') + .get_lines_cursor() + from dual; +``` + # Order of test execution diff --git a/source/core/types/ut_output_reporter_base.tpb b/source/core/types/ut_output_reporter_base.tpb index d20f454a8..c4ba73ba5 100644 --- a/source/core/types/ut_output_reporter_base.tpb +++ b/source/core/types/ut_output_reporter_base.tpb @@ -31,7 +31,14 @@ create or replace type body ut_output_reporter_base is overriding member procedure set_reporter_id(self in out nocopy ut_output_reporter_base, a_reporter_id raw) is begin self.id := a_reporter_id; - self.output_buffer.output_id := a_reporter_id; + self.output_buffer.init(a_reporter_id); + end; + + member function set_reporter_id(self in ut_output_reporter_base, a_reporter_id raw) return ut_output_reporter_base is + l_result ut_output_reporter_base := self; + begin + l_result.set_reporter_id(a_reporter_id); + return l_result; end; overriding member procedure before_calling_run(self in out nocopy ut_output_reporter_base, a_run in ut_run) is diff --git a/source/core/types/ut_output_reporter_base.tps b/source/core/types/ut_output_reporter_base.tps index 95ee9c1f8..01350208a 100644 --- a/source/core/types/ut_output_reporter_base.tps +++ b/source/core/types/ut_output_reporter_base.tps @@ -19,6 +19,7 @@ create or replace type ut_output_reporter_base under ut_reporter_base( constructor function ut_output_reporter_base(self in out nocopy ut_output_reporter_base) return self as result, member procedure init(self in out nocopy ut_output_reporter_base, a_self_type varchar2, a_output_buffer ut_output_buffer_base := null), overriding member procedure set_reporter_id(self in out nocopy ut_output_reporter_base, a_reporter_id raw), + member function set_reporter_id(self in ut_output_reporter_base, a_reporter_id raw) return ut_output_reporter_base, overriding member procedure before_calling_run(self in out nocopy ut_output_reporter_base, a_run in ut_run), member procedure print_text(self in out nocopy ut_output_reporter_base, a_text varchar2, a_item_type varchar2 := null), From ac4ca0003cad161836b8ca4ac05625428a6ae5bf Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 13 Jul 2019 04:13:03 +0100 Subject: [PATCH 0554/1096] Added documentation section on `sys_context( 'UT3_INFO', attribute )`. --- docs/userguide/annotations.md | 107 ++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 8b8ac890e..8afd6acbd 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1733,6 +1733,113 @@ When processing the test suite `test_employee_pkg` defined in [Example of annota > >Order of execution within multiple occurrences of `before`/`after` procedures is determined by the order of annotations in specific block (context/suite) of package specification. +## sys_context + +It is possible to access information about currently running suite, test and befire/after procedure form within PLSQL procedure using SYS_CONTEXT. + +The information is available by calling `sys_context( 'UT3_INFO', attribute )`. + +Following attributes are populated: +- Always: + - `sys_context( 'UT3_INFO', 'RUN_PATHS' );` - list of suitepaths / suitenames used as input parameters for call to `ut.run(...)` or `ut_runner.run(...)` + - `sys_context( 'UT3_INFO', 'SUITE_DESCRIPTION' );` - the description of test suite that is currently being executed + - `sys_context( 'UT3_INFO', 'SUITE_PACKAGE' );` - the owner and name of test suite package that is currently being executed + - `sys_context( 'UT3_INFO', 'SUITE_PATH' );` - the suitepath for the test suite package that is currently being executed + - `sys_context( 'UT3_INFO', 'SUITE_START_TIME' );` - the execution start timestamp of test suite package that is currently being executed + - `sys_context( 'UT3_INFO', 'CURRENT_EXECUTABLE_NAME' );` - the owner.package.procedure of currently running test suite executable + - `sys_context( 'UT3_INFO', 'CURRENT_EXECUTABLE_TYPE' );` - the type of currently running test suite executable (one of: `beforeall`, `beforeeach`, `beforetest`, `test`, `aftertest`, `aftereach`, `afterall` + +- When running in suite context + - `sys_context( 'UT3_INFO', 'CONTEXT_DESCRIPTION' );` - the description of test suite context that is currently being executed + - `sys_context( 'UT3_INFO', 'CONTEXT_NAME' );` - the name of test suite context that is currently being executed + - `sys_context( 'UT3_INFO', 'CONTEXT_PATH' );` - the suitepath for the currently executed test suite context + - `sys_context( 'UT3_INFO', 'CONTEXT_START_TIME' );` - the execution start timestamp for the currently executed test suite context +- When running a suite executable procedure that is a `test` or `beforeeach`, `aftereach`, `beforetest`, `aftertest` + - `sys_context( 'UT3_INFO', 'TEST_DESCRIPTION' );` - the description of test for which the current executable is being invoked + - `sys_context( 'UT3_INFO', 'TEST_NAME' );` - the name of test for which the current executable is being invoked + - `sys_context( 'UT3_INFO', 'TEST_START_TIME' );` - the execution start timestamp of test that is currently being executed (the time when first `beforeeach`/`beforetest` was called for that test) + +Example: +```sql +create or replace procedure which_procecure_called_me is +begin + dbms_output.put_line( + 'Currently running utPLSQL ' ||sys_context( 'ut3_info', 'current_executable_type' ) + ||' ' ||sys_context( 'ut3_info', 'current_executable_name' ) + ); +end; +/ + +create or replace package test_call is + + --%suite + + --%beforeall + procedure beforeall; + + --%beforeeach + procedure beforeeach; + + --%test + procedure test1; + + --%test + procedure test2; + +end; +/ + +create or replace package body test_call is + + procedure beforeall is + begin + which_procecure_called_me(); + dbms_output.put_line('Current test procedure is: '||sys_context('ut3_info','test_name')); + end; + + procedure beforeeach is + begin + which_procecure_called_me(); + dbms_output.put_line('Current test procedure is: '||sys_context('ut3_info','test_name')); + end; + + procedure test1 is + begin + which_procecure_called_me(); + ut.expect(sys_context('ut3_info','suite_package')).to_equal(user||'.test_call'); + end; + + procedure test2 is + begin + which_procecure_called_me(); + ut.expect(sys_context('ut3_info','test_name')).to_equal(user||'.test_call.test2'); + end; + +end; +/ +``` + +```sql +exec ut.run('test_call'); +``` + +``` +test_call + Currently running utPLSQL beforeall UT3.test_call.beforeall + Current test procedure is: + test1 [.008 sec] + Currently running utPLSQL beforeeach UT3.test_call.beforeeach + Current test procedure is: UT3.test_call.test1 + Currently running utPLSQL test UT3.test_call.test1 + test2 [.004 sec] + Currently running utPLSQL beforeeach UT3.test_call.beforeeach + Current test procedure is: UT3.test_call.test2 + Currently running utPLSQL test UT3.test_call.test2 + +Finished in .021295 seconds +2 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s) +``` + ## Annotation cache From 29c37570cf2677e1eccff0dd0bfc69bf431d24d3 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sat, 13 Jul 2019 23:26:30 +0000 Subject: [PATCH 0555/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 0633898f2..deeddd5b1 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index d10fa0292..17dce1d1b 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 36c5871d8..84a2d227d 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index c078e79e4..df8afe7d5 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 2ae93d915..4493d203f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index c45a09643..118c8f1a8 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 8afd6acbd..6c36902a4 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 9b0196e0e..4a10e4048 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index b0d3d95d9..d9c200566 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 3e6b003b5..16fce32ac 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 391053fd6..9118afa8d 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index d896ad382..a0f94fe0d 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 612214806..e2d9def86 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index cc9eb09a0..a95c157b5 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index e957b6186..8edf418cd 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 0afda436c..ab4abe96f 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index a88220dae..1df738dba 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3148--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 95378a18e..46c4761f6 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -766,7 +766,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.8.3148-develop + * secion v3.1.8.3161-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index d5b8c21ac..b7f8a1be5 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.8.3148-develop'; + gc_version constant varchar2(50) := 'v3.1.8.3161-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 11b5f84e3e8a685b4437b659d27cf3757f7a78d1 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 16 Jul 2019 01:21:11 +0100 Subject: [PATCH 0556/1096] Fixed issue with get_Cached_suite_rows syntax. Resolves #974 --- source/core/ut_suite_cache_manager.pkb | 2 +- test/ut3_tester_helper/run_helper.pkb | 10 ++++++- test/ut3_user/api/test_ut_runner.pkb | 37 ++++++++++++++++++++------ 3 files changed, 39 insertions(+), 10 deletions(-) diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index a5ffd0e0d..ef12e1def 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -366,7 +366,7 @@ create or replace package body ut_suite_cache_manager is l_cache_rows ut_suite_cache_rows; l_results ut_suite_items_info; begin - l_cache_rows := get_cached_suite_rows( a_object_owner, a_object_name ); + l_cache_rows := get_cached_suite_rows( a_object_owner => a_object_owner, a_object_name =>a_object_name ); select ut_suite_item_info( c.object_owner, c.object_name, c.name, c.description, c.self_type, c.line_no, diff --git a/test/ut3_tester_helper/run_helper.pkb b/test/ut3_tester_helper/run_helper.pkb index bea89b901..ef6528e04 100644 --- a/test/ut3_tester_helper/run_helper.pkb +++ b/test/ut3_tester_helper/run_helper.pkb @@ -5,6 +5,7 @@ create or replace package body run_helper is begin execute immediate q'[create or replace package ut3$user#.dummy_test_package as --%suite(dummy_test_suite) + --%suitepath(some.path) --%rollback(manual) --%test(dummy_test) @@ -24,7 +25,13 @@ create or replace package body run_helper is null; end;]'; - execute immediate q'[grant execute on ut3_tester_helper.dummy_test_procedure to public]'; + execute immediate q'[grant execute on ut3_tester_helper.dummy_test_procedure to public]'; + + execute immediate q'[create or replace package ut3$user#.bad_test_package as + --%rollback(manual) + --%test(dummy_test) + procedure some_dummy_test_procedure; + end;]'; end; procedure setup_cache_objectstag is @@ -32,6 +39,7 @@ create or replace package body run_helper is begin execute immediate q'[create or replace package ut3$user#.dummy_test_package as --%suite(dummy_test_suite) + --%suitepath(some.path) --%tags(dummy) --%rollback(manual) diff --git a/test/ut3_user/api/test_ut_runner.pkb b/test/ut3_user/api/test_ut_runner.pkb index 28370ca96..e29bada11 100644 --- a/test/ut3_user/api/test_ut_runner.pkb +++ b/test/ut3_user/api/test_ut_runner.pkb @@ -267,12 +267,22 @@ end;'; select 'UT3$USER#' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'DUMMY_TEST_PACKAGE' item_name, 'dummy_test_suite' item_description, 'UT_SUITE' item_type, 2 item_line_no, - 'dummy_test_package' path, 0 disabled_flag,null tags + 'some.path.dummy_test_package' path, 0 disabled_flag,null tags from dual union all select 'UT3$USER#' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'SOME_DUMMY_TEST_PROCEDURE' item_name, - 'dummy_test' item_description, 'UT_TEST' item_type, 5 item_line_no, - 'dummy_test_package.some_dummy_test_procedure' path, 0 disabled_flag,null tags + 'dummy_test' item_description, 'UT_TEST' item_type, 6 item_line_no, + 'some.path.dummy_test_package.some_dummy_test_procedure' path, 0 disabled_flag,null tags + from dual union all + select + 'UT3$USER#' object_owner, 'PATH' object_name, 'PATH' item_name, + null item_description, 'UT_LOGICAL_SUITE' item_type, null item_line_no, + 'some.path' path, 0 disabled_flag, null tags + from dual union all + select + 'UT3$USER#' object_owner, 'SOME' object_name, 'SOME' item_name, + null item_description, 'UT_LOGICAL_SUITE' item_type, null item_line_no, + 'some' path, 0 disabled_flag, null tags from dual; --Act open l_actual for select * from table(ut3.ut_runner.get_suites_info('UT3$USER#','DUMMY_TEST_PACKAGE')); @@ -289,12 +299,22 @@ end;'; select 'UT3$USER#' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'DUMMY_TEST_PACKAGE' item_name, 'dummy_test_suite' item_description, 'UT_SUITE' item_type, 2 item_line_no, - 'dummy_test_package' path, 0 disabled_flag,'dummy' tags + 'some.path.dummy_test_package' path, 0 disabled_flag,'dummy' tags from dual union all select 'UT3$USER#' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'SOME_DUMMY_TEST_PROCEDURE' item_name, - 'dummy_test' item_description, 'UT_TEST' item_type, 6 item_line_no, - 'dummy_test_package.some_dummy_test_procedure' path, 0 disabled_flag,'testtag' tags + 'dummy_test' item_description, 'UT_TEST' item_type, 7 item_line_no, + 'some.path.dummy_test_package.some_dummy_test_procedure' path, 0 disabled_flag,'testtag' tags + from dual union all + select + 'UT3$USER#' object_owner, 'PATH' object_name, 'PATH' item_name, + null item_description, 'UT_LOGICAL_SUITE' item_type, null item_line_no, + 'some.path' path, 0 disabled_flag, null tags + from dual union all + select + 'UT3$USER#' object_owner, 'SOME' object_name, 'SOME' item_name, + null item_description, 'UT_LOGICAL_SUITE' item_type, null item_line_no, + 'some' path, 0 disabled_flag, null tags from dual; --Act open l_actual for select * from table(ut3.ut_runner.get_suites_info('UT3$USER#','DUMMY_TEST_PACKAGE')); @@ -562,7 +582,8 @@ end;'; procedure is_test_false is begin ut.expect( ut3.ut_runner.is_test( 'UT3$USER#','DUMMY_TEST_PACKAGE', 'BAD' ) ).to_be_false(); - ut.expect( ut3.ut_runner.is_test( 'UT3$USER#','DUMMY_TEST_PACKAGE', null ) ).to_be_false(); + ut.expect( ut3.ut_runner.is_test( 'UT3$USER#','BAD_TEST_PACKAGE', 'some_dummy_test_procedure' ) ).to_be_false(); + ut.expect( ut3.ut_runner.is_test( 'UT3$USER#','DUMMY_TEST_PACKAGE', null ) ).to_be_false(); ut.expect( ut3.ut_runner.is_test( 'UT3$USER#',null,'some_dummy_test_procedure' ) ).to_be_false(); ut.expect( ut3.ut_runner.is_test( null,'DUMMY_TEST_PACKAGE','some_dummy_test_procedure' ) ).to_be_false(); end; @@ -584,12 +605,12 @@ end;'; ut.expect( ut3.ut_runner.is_suite( 'UT3$USER#','BAD' ) ).to_be_false(); ut.expect( ut3.ut_runner.is_suite( 'UT3$USER#', null ) ).to_be_false(); ut.expect( ut3.ut_runner.is_suite( null,'DUMMY_TEST_PACKAGE' ) ).to_be_false(); + ut.expect( ut3.ut_runner.is_suite( 'UT3$USER#','bad_test_package' ) ).to_be_false(); end; procedure has_suites_true is begin ut.expect( ut3.ut_runner.has_suites( a_owner => 'UT3$USER#' ) ).to_be_true(); - ut.expect( ut3.ut_runner.has_suites( 'ut3$user#' ) ).to_be_true(); end; From 04a2b9b278c626de5d169963c97063f1d2c90158 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 16 Jul 2019 08:26:09 +0000 Subject: [PATCH 0557/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index deeddd5b1..ecbbf1db8 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 17dce1d1b..a5b4495d6 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 84a2d227d..530562421 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index df8afe7d5..ce27dff49 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 4493d203f..f789e272b 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 118c8f1a8..a24202cf4 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 6c36902a4..8ac1a4bb1 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 4a10e4048..c05f80f34 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index d9c200566..550eacb1a 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 16fce32ac..7292beda0 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 9118afa8d..ee5ea8cc0 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index a0f94fe0d..ac34e6175 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index e2d9def86..efa741d9b 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index a95c157b5..cd12e1039 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 8edf418cd..569b72c6c 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index ab4abe96f..84f104bd2 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 1df738dba..23389f7ae 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3161--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 46c4761f6..f2e2058aa 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -766,7 +766,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.8.3161-develop + * secion v3.1.8.3164-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index b7f8a1be5..2cb6278cb 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.8.3161-develop'; + gc_version constant varchar2(50) := 'v3.1.8.3164-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From abba642181ff9a94f48a913947e18acc3af934c5 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 11 May 2019 02:02:59 +0100 Subject: [PATCH 0558/1096] Trying different approach to coverage gathering. --- source/core/coverage/ut_coverage.pkb | 167 ++++++++++++++++++++------- 1 file changed, 125 insertions(+), 42 deletions(-) diff --git a/source/core/coverage/ut_coverage.pkb b/source/core/coverage/ut_coverage.pkb index 5754cf4e9..18df1487f 100644 --- a/source/core/coverage/ut_coverage.pkb +++ b/source/core/coverage/ut_coverage.pkb @@ -36,32 +36,39 @@ create or replace package body ut_coverage is end; function get_cov_sources_sql(a_coverage_options ut_coverage_options) return varchar2 is - l_result varchar2(32767); - l_full_name varchar2(100); - l_view_name varchar2(200) := ut_metadata.get_source_view_name(); + l_result varchar2(32767); + l_full_name varchar2(32767); + l_mappings varchar2(32767); + l_filters varchar2(32767); + l_mappings_cardinality integer := 0; begin - if a_coverage_options.file_mappings is not null and a_coverage_options.file_mappings.count > 0 then - l_full_name := 'f.file_name'; - else - l_full_name := 'lower(s.owner||''.''||s.name)'; - end if; - l_result := ' - select full_name, owner, name, line, to_be_skipped, text - from ( - select '||l_full_name||q'[ as full_name, + l_result := q'[ + with sources as ( + select /*+ cardinality(f {mappings_cardinality}) */ + {l_full_name} as full_name, s.owner, s.name, s.line, s.text + from {sources_view} s {file_mappings} + where s.type in ('PACKAGE BODY', 'TYPE BODY', 'PROCEDURE', 'FUNCTION') + {filters} + ), + trigger_sources as ( + select /*+ cardinality(f {mappings_cardinality}) */ + {l_full_name} as full_name, s.owner, s.name, - s.line - - coalesce( - case when type!='TRIGGER' then 0 end, - (select min(t.line) - 1 - from ]'||l_view_name||q'[ t + s.line + - (select min(t.line) - 1 + from {sources_view} t where t.owner = s.owner and t.type = s.type and t.name = s.name - and regexp_like( t.text, '[A-Za-z0-9$#_]*(begin|declare|compound).*','i')) - ) as line, - s.text, ]'; - l_result := l_result || - q'[case + and regexp_like( t.text, '[A-Za-z0-9$#_]*(begin|declare|compound).*', 'i' ) + ) as line, + s.text + from {sources_view} s {file_mappings} + where s.type = 'TRIGGER' + {filters} + ), + coverage_sources as ( + select full_name, owner, name, line, text, + case when -- to avoid execution of regexp_like on every line -- first do a rough check for existence of search pattern keyword @@ -76,31 +83,107 @@ create or replace package body ut_coverage is '^([\t ]*(((not)?\s*(overriding|final|instantiable)[\t ]*)*(static|constructor|member)?[\t ]*(procedure|function)|package([\t ]+body)|begin|end([\t ]+\S+)*[ \t]*;))', 'i' ) then 'Y' - end as to_be_skipped ]'; + end as to_be_skipped + from ( + select * from sources + union all + select * from trigger_sources + ) s + ) + select full_name, owner, name, line, to_be_skipped, text + from coverage_sources s + --Exclude calls to utPLSQL framework, Unit Test packages and objects from a_exclude_list parameter of coverage reporter + where (s.owner, s.name) not in ( select el.owner, el.name from table(:l_skipped_objects) el ) + and line > 0 + ]'; - l_result := l_result ||' from '||l_view_name||q'[ s]'; - if a_coverage_options.file_mappings is not empty then - l_result := l_result || ' + l_mappings_cardinality := ut_utils.scale_cardinality(cardinality(a_coverage_options.file_mappings)); + l_full_name := 'f.file_name'; + l_mappings := ' join table(:file_mappings) f on s.name = f.object_name and s.type = f.object_type - and s.owner = f.object_owner - where 1 = 1'; - elsif a_coverage_options.include_objects is not empty then - l_result := l_result || ' - where (s.owner, s.name) in (select il.owner, il.name from table(:include_objects) il)'; + and s.owner = f.object_owner'; else - l_result := l_result || ' - where s.owner in (select upper(t.column_value) from table(:l_schema_names) t)'; + l_full_name := q'[lower(s.owner||'.'||s.name)]'; + l_filters := case + when a_coverage_options.include_objects is not empty then ' + and (s.owner, s.name) in (select il.owner, il.name from table(:include_objects) il)' + else ' + and s.owner in (select upper(t.column_value) from table(:l_schema_names) t)' + end; end if; - l_result := l_result || q'[ - and s.type not in ('PACKAGE', 'TYPE', 'JAVA SOURCE') - --Exclude calls to utPLSQL framework, Unit Test packages and objects from a_exclude_list parameter of coverage reporter - and (s.owner, s.name) not in (select el.owner, el.name from table(:l_skipped_objects) el) - ) - where line > 0]'; + + l_result := replace(l_result, '{sources_view}', ut_metadata.get_source_view_name()); + l_result := replace(l_result, '{l_full_name}', l_full_name); + l_result := replace(l_result, '{file_mappings}', l_mappings); + l_result := replace(l_result, '{filters}', l_filters); + l_result := replace(l_result, '{mappings_cardinality}', l_mappings_cardinality); + return l_result; + +-- if a_coverage_options.file_mappings is not null and a_coverage_options.file_mappings.count > 0 then +-- l_full_name := 'f.file_name'; +-- else +-- l_full_name := 'lower(s.owner||''.''||s.name)'; +-- end if; +-- l_result := ' +-- select full_name, owner, name, line, to_be_skipped, text +-- from ( +-- select '||l_full_name||q'[ as full_name, +-- s.owner, +-- s.name, +-- s.line - +-- coalesce( +-- case when type!='TRIGGER' then 0 end, +-- (select min(t.line) - 1 +-- from ]'||ut_metadata.get_source_view_name()||q'[ t +-- where t.owner = s.owner and t.type = s.type and t.name = s.name +-- and regexp_like( t.text, '[A-Za-z0-9$#_]*(begin|declare|compound).*','i')) +-- ) as line, +-- s.text, ]'; +-- l_result := l_result || +-- q'[case +-- when +-- -- to avoid execution of regexp_like on every line +-- -- first do a rough check for existence of search pattern keyword +-- (lower(s.text) like '%procedure%' +-- or lower(s.text) like '%function%' +-- or lower(s.text) like '%begin%' +-- or lower(s.text) like '%end%' +-- or lower(s.text) like '%package%' +-- ) and +-- regexp_like( +-- s.text, +-- '^([\t ]*(((not)?\s*(overriding|final|instantiable)[\t ]*)*(static|constructor|member)?[\t ]*(procedure|function)|package([\t ]+body)|begin|end([\t ]+\S+)*[ \t]*;))', 'i' +-- ) +-- then 'Y' +-- end as to_be_skipped ]'; +-- +-- l_result := l_result ||' from '||ut_metadata.get_source_view_name()||q'[ s]'; +-- +-- if a_coverage_options.file_mappings is not empty then +-- l_result := l_result || ' +-- join table(:file_mappings) f +-- on s.name = f.object_name +-- and s.type = f.object_type +-- and s.owner = f.object_owner +-- where 1 = 1'; +-- elsif a_coverage_options.include_objects is not empty then +-- l_result := l_result || ' +-- where (s.owner, s.name) in (select il.owner, il.name from table(:include_objects) il)'; +-- else +-- l_result := l_result || ' +-- where s.owner in (select upper(t.column_value) from table(:l_schema_names) t)'; +-- end if; +-- l_result := l_result || q'[ +-- and s.type not in ('PACKAGE', 'TYPE', 'JAVA SOURCE') +-- --Exclude calls to utPLSQL framework, Unit Test packages and objects from a_exclude_list parameter of coverage reporter +-- and (s.owner, s.name) not in (select el.owner, el.name from table(:l_skipped_objects) el) +-- ) +-- where line > 0]'; +-- return l_result; end; function get_cov_sources_cursor(a_coverage_options in ut_coverage_options,a_sql in varchar2) return sys_refcursor is @@ -120,11 +203,11 @@ create or replace package body ut_coverage is raise_application_error(-20542, 'Possible SQL injection detected. a_sql parameter does not match valid pattern "' || l_valid_pattern || '".'); end if; if a_coverage_options.file_mappings is not empty then - open l_cursor for l_sql using a_coverage_options.file_mappings, l_skip_objects; + open l_cursor for l_sql using a_coverage_options.file_mappings, a_coverage_options.file_mappings, l_skip_objects; elsif a_coverage_options.include_objects is not empty then - open l_cursor for l_sql using a_coverage_options.include_objects, l_skip_objects; + open l_cursor for l_sql using a_coverage_options.include_objects, a_coverage_options.include_objects, l_skip_objects; else - open l_cursor for l_sql using a_coverage_options.schema_names, l_skip_objects; + open l_cursor for l_sql using a_coverage_options.schema_names, a_coverage_options.schema_names, l_skip_objects; end if; return l_cursor; end; From a8c0c82d8454cda6fa3bcf08b8aebb02040104b0 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 13 May 2019 08:18:37 +0100 Subject: [PATCH 0559/1096] Trying different approach to coverage gathering. --- source/core/coverage/ut_coverage.pkb | 71 ++-------------------------- 1 file changed, 5 insertions(+), 66 deletions(-) diff --git a/source/core/coverage/ut_coverage.pkb b/source/core/coverage/ut_coverage.pkb index 18df1487f..f87ba8249 100644 --- a/source/core/coverage/ut_coverage.pkb +++ b/source/core/coverage/ut_coverage.pkb @@ -38,7 +38,7 @@ create or replace package body ut_coverage is function get_cov_sources_sql(a_coverage_options ut_coverage_options) return varchar2 is l_result varchar2(32767); l_full_name varchar2(32767); - l_mappings varchar2(32767); + l_join_mappings varchar2(32767); l_filters varchar2(32767); l_mappings_cardinality integer := 0; begin @@ -46,7 +46,7 @@ create or replace package body ut_coverage is with sources as ( select /*+ cardinality(f {mappings_cardinality}) */ {l_full_name} as full_name, s.owner, s.name, s.line, s.text - from {sources_view} s {file_mappings} + from {sources_view} s {join_file_mappings} where s.type in ('PACKAGE BODY', 'TYPE BODY', 'PROCEDURE', 'FUNCTION') {filters} ), @@ -62,7 +62,7 @@ create or replace package body ut_coverage is and regexp_like( t.text, '[A-Za-z0-9$#_]*(begin|declare|compound).*', 'i' ) ) as line, s.text - from {sources_view} s {file_mappings} + from {sources_view} s {join_file_mappings} where s.type = 'TRIGGER' {filters} ), @@ -100,7 +100,7 @@ create or replace package body ut_coverage is if a_coverage_options.file_mappings is not empty then l_mappings_cardinality := ut_utils.scale_cardinality(cardinality(a_coverage_options.file_mappings)); l_full_name := 'f.file_name'; - l_mappings := ' + l_join_mappings := ' join table(:file_mappings) f on s.name = f.object_name and s.type = f.object_type @@ -117,73 +117,12 @@ create or replace package body ut_coverage is l_result := replace(l_result, '{sources_view}', ut_metadata.get_source_view_name()); l_result := replace(l_result, '{l_full_name}', l_full_name); - l_result := replace(l_result, '{file_mappings}', l_mappings); + l_result := replace(l_result, '{join_file_mappings}', l_join_mappings); l_result := replace(l_result, '{filters}', l_filters); l_result := replace(l_result, '{mappings_cardinality}', l_mappings_cardinality); return l_result; --- if a_coverage_options.file_mappings is not null and a_coverage_options.file_mappings.count > 0 then --- l_full_name := 'f.file_name'; --- else --- l_full_name := 'lower(s.owner||''.''||s.name)'; --- end if; --- l_result := ' --- select full_name, owner, name, line, to_be_skipped, text --- from ( --- select '||l_full_name||q'[ as full_name, --- s.owner, --- s.name, --- s.line - --- coalesce( --- case when type!='TRIGGER' then 0 end, --- (select min(t.line) - 1 --- from ]'||ut_metadata.get_source_view_name()||q'[ t --- where t.owner = s.owner and t.type = s.type and t.name = s.name --- and regexp_like( t.text, '[A-Za-z0-9$#_]*(begin|declare|compound).*','i')) --- ) as line, --- s.text, ]'; --- l_result := l_result || --- q'[case --- when --- -- to avoid execution of regexp_like on every line --- -- first do a rough check for existence of search pattern keyword --- (lower(s.text) like '%procedure%' --- or lower(s.text) like '%function%' --- or lower(s.text) like '%begin%' --- or lower(s.text) like '%end%' --- or lower(s.text) like '%package%' --- ) and --- regexp_like( --- s.text, --- '^([\t ]*(((not)?\s*(overriding|final|instantiable)[\t ]*)*(static|constructor|member)?[\t ]*(procedure|function)|package([\t ]+body)|begin|end([\t ]+\S+)*[ \t]*;))', 'i' --- ) --- then 'Y' --- end as to_be_skipped ]'; --- --- l_result := l_result ||' from '||ut_metadata.get_source_view_name()||q'[ s]'; --- --- if a_coverage_options.file_mappings is not empty then --- l_result := l_result || ' --- join table(:file_mappings) f --- on s.name = f.object_name --- and s.type = f.object_type --- and s.owner = f.object_owner --- where 1 = 1'; --- elsif a_coverage_options.include_objects is not empty then --- l_result := l_result || ' --- where (s.owner, s.name) in (select il.owner, il.name from table(:include_objects) il)'; --- else --- l_result := l_result || ' --- where s.owner in (select upper(t.column_value) from table(:l_schema_names) t)'; --- end if; --- l_result := l_result || q'[ --- and s.type not in ('PACKAGE', 'TYPE', 'JAVA SOURCE') --- --Exclude calls to utPLSQL framework, Unit Test packages and objects from a_exclude_list parameter of coverage reporter --- and (s.owner, s.name) not in (select el.owner, el.name from table(:l_skipped_objects) el) --- ) --- where line > 0]'; --- return l_result; end; function get_cov_sources_cursor(a_coverage_options in ut_coverage_options,a_sql in varchar2) return sys_refcursor is From f4bede09214a78636ee0a836a25b17a843366697 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 17 Jul 2019 02:31:12 +0100 Subject: [PATCH 0560/1096] Reworked coverage sources query --- source/core/coverage/ut_coverage.pkb | 134 +++++++++++++-------------- source/core/coverage/ut_coverage.pks | 3 +- 2 files changed, 67 insertions(+), 70 deletions(-) diff --git a/source/core/coverage/ut_coverage.pkb b/source/core/coverage/ut_coverage.pkb index f87ba8249..caa75ae51 100644 --- a/source/core/coverage/ut_coverage.pkb +++ b/source/core/coverage/ut_coverage.pkb @@ -35,7 +35,7 @@ create or replace package body ut_coverage is return g_develop_mode; end; - function get_cov_sources_sql(a_coverage_options ut_coverage_options) return varchar2 is + function get_cov_sources_sql(a_coverage_options ut_coverage_options, a_skip_objects ut_object_names) return varchar2 is l_result varchar2(32767); l_full_name varchar2(32767); l_join_mappings varchar2(32767); @@ -43,58 +43,51 @@ create or replace package body ut_coverage is l_mappings_cardinality integer := 0; begin l_result := q'[ - with sources as ( - select /*+ cardinality(f {mappings_cardinality}) */ - {l_full_name} as full_name, s.owner, s.name, s.line, s.text - from {sources_view} s {join_file_mappings} - where s.type in ('PACKAGE BODY', 'TYPE BODY', 'PROCEDURE', 'FUNCTION') - {filters} - ), - trigger_sources as ( - select /*+ cardinality(f {mappings_cardinality}) */ - {l_full_name} as full_name, - s.owner, - s.name, - s.line - - (select min(t.line) - 1 - from {sources_view} t - where t.owner = s.owner and t.type = s.type and t.name = s.name - and regexp_like( t.text, '[A-Za-z0-9$#_]*(begin|declare|compound).*', 'i' ) - ) as line, - s.text - from {sources_view} s {join_file_mappings} - where s.type = 'TRIGGER' - {filters} - ), - coverage_sources as ( - select full_name, owner, name, line, text, - case - when - -- to avoid execution of regexp_like on every line - -- first do a rough check for existence of search pattern keyword - (lower(s.text) like '%procedure%' - or lower(s.text) like '%function%' - or lower(s.text) like '%begin%' - or lower(s.text) like '%end%' - or lower(s.text) like '%package%' - ) and - regexp_like( - s.text, - '^([\t ]*(((not)?\s*(overriding|final|instantiable)[\t ]*)*(static|constructor|member)?[\t ]*(procedure|function)|package([\t ]+body)|begin|end([\t ]+\S+)*[ \t]*;))', 'i' - ) - then 'Y' - end as to_be_skipped - from ( - select * from sources - union all - select * from trigger_sources - ) s - ) - select full_name, owner, name, line, to_be_skipped, text - from coverage_sources s - --Exclude calls to utPLSQL framework, Unit Test packages and objects from a_exclude_list parameter of coverage reporter - where (s.owner, s.name) not in ( select el.owner, el.name from table(:l_skipped_objects) el ) - and line > 0 + with + trigger_source_offsets as ( + select min(s.line) - 1 offset, s.owner, s.name, s.type + from {sources_view} s + where s.type = 'TRIGGER' + {filters} + and (lower(s.text) like '%begin%' or lower(s.text) like '%declare%' or lower(s.text) like '%compound%') + group by s.owner, s.name, s.type + ), + sources as ( + select /*+ cardinality(f {mappings_cardinality}) */ + {l_full_name} as full_name, s.owner, s.name, + s.line - case when s.type = 'TRIGGER' then o.offset else 0 end as line, + s.text + from {sources_view} s {join_file_mappings} + left join trigger_source_offsets o + on (s.owner = o.owner and s.name = o.name and s.type = o.type) + where s.type in ('PACKAGE BODY', 'TYPE BODY', 'PROCEDURE', 'FUNCTION', 'TRIGGER') + {filters} + ), + coverage_sources as ( + select full_name, owner, name, line, text, + case + when + -- to avoid execution of regexp_like on every line + -- first do a rough check for existence of search pattern keyword + (lower(s.text) like '%procedure%' + or lower(s.text) like '%function%' + or lower(s.text) like '%begin%' + or lower(s.text) like '%end%' + or lower(s.text) like '%package%' + ) and + regexp_like( + s.text, + '^([\t ]*(((not)?\s*(overriding|final|instantiable)[\t ]*)*(static|constructor|member)?[\t ]*(procedure|function)|package([\t ]+body)|begin|end([\t ]+\S+)*[ \t]*;))', 'i' + ) + then 'Y' + end as to_be_skipped + from sources s + ) + select full_name, owner, name, line, to_be_skipped, text + from coverage_sources s + -- Exclude calls to utPLSQL framework, Unit Test packages and objects from a_exclude_list parameter of coverage reporter + where (s.owner, s.name) not in ( select /*+ cardinality(el {skipped_objects_cardinality})*/el.owner, el.name from table(:l_skipped_objects) el ) + and line > 0 ]'; if a_coverage_options.file_mappings is not empty then @@ -109,9 +102,16 @@ create or replace package body ut_coverage is l_full_name := q'[lower(s.owner||'.'||s.name)]'; l_filters := case when a_coverage_options.include_objects is not empty then ' - and (s.owner, s.name) in (select il.owner, il.name from table(:include_objects) il)' + and (s.owner, s.name) in ( + select /*+ cardinality(il '||ut_utils.scale_cardinality(cardinality(a_coverage_options.include_objects))||') */ + il.owner, il.name + from table(:include_objects) il + )' else ' - and s.owner in (select upper(t.column_value) from table(:l_schema_names) t)' + and s.owner in ( + select /*+ cardinality(t '||ut_utils.scale_cardinality(cardinality(a_coverage_options.schema_names))||') */ + upper(t.column_value) + from table(:l_schema_names) t)' end; end if; @@ -120,29 +120,28 @@ create or replace package body ut_coverage is l_result := replace(l_result, '{join_file_mappings}', l_join_mappings); l_result := replace(l_result, '{filters}', l_filters); l_result := replace(l_result, '{mappings_cardinality}', l_mappings_cardinality); + l_result := replace(l_result, '{skipped_objects_cardinality}', ut_utils.scale_cardinality(cardinality(a_skip_objects))); return l_result; end; - function get_cov_sources_cursor(a_coverage_options in ut_coverage_options,a_sql in varchar2) return sys_refcursor is + function get_cov_sources_cursor(a_coverage_options in ut_coverage_options) return sys_refcursor is l_cursor sys_refcursor; l_skip_objects ut_object_names; l_sql varchar2(32767); - l_valid_pattern varchar2(250) := '^\s*select.+$'; begin if not is_develop_mode() then --skip all the utplsql framework objects and all the unit test packages that could potentially be reported by coverage. l_skip_objects := ut_utils.get_utplsql_objects_list() multiset union all coalesce(a_coverage_options.exclude_objects, ut_object_names()); end if; - if regexp_like(a_sql, l_valid_pattern, 'mi') then - -- pseudo assert for PL/SQL Cop - l_sql := sys.dbms_assert.noop(a_sql); - else - raise_application_error(-20542, 'Possible SQL injection detected. a_sql parameter does not match valid pattern "' || l_valid_pattern || '".'); - end if; + + l_sql := get_cov_sources_sql(a_coverage_options, l_skip_objects); + + ut_event_manager.trigger_event(ut_event_manager.gc_debug, ut_key_anyvalues().put('l_sql',l_sql) ); + if a_coverage_options.file_mappings is not empty then - open l_cursor for l_sql using a_coverage_options.file_mappings, a_coverage_options.file_mappings, l_skip_objects; + open l_cursor for l_sql using a_coverage_options.file_mappings, l_skip_objects; elsif a_coverage_options.include_objects is not empty then open l_cursor for l_sql using a_coverage_options.include_objects, a_coverage_options.include_objects, l_skip_objects; else @@ -151,7 +150,7 @@ create or replace package body ut_coverage is return l_cursor; end; - procedure populate_tmp_table(a_coverage_options ut_coverage_options, a_sql in varchar2) is + procedure populate_tmp_table(a_coverage_options ut_coverage_options) is pragma autonomous_transaction; l_cov_sources_crsr sys_refcursor; l_cov_sources_data ut_coverage_helper.t_coverage_sources_tmp_rows; @@ -159,8 +158,7 @@ create or replace package body ut_coverage is if not ut_coverage_helper.is_tmp_table_populated() or is_develop_mode() then ut_coverage_helper.cleanup_tmp_table(); - ut_event_manager.trigger_event(ut_event_manager.gc_debug, ut_key_anyvalues().put('a_sql',a_sql) ); - l_cov_sources_crsr := get_cov_sources_cursor(a_coverage_options, a_sql); + l_cov_sources_crsr := get_cov_sources_cursor(a_coverage_options); loop fetch l_cov_sources_crsr bulk collect into l_cov_sources_data limit 10000; @@ -234,7 +232,7 @@ create or replace package body ut_coverage is begin --prepare global temp table with sources ut_event_manager.trigger_event('about to populate coverage temp table'); - populate_tmp_table(a_coverage_options, get_cov_sources_sql(a_coverage_options)); + populate_tmp_table(a_coverage_options); ut_event_manager.trigger_event('coverage temp table populated'); -- Get raw data for both reporters, order is important as tmp table will skip headers and dont populate diff --git a/source/core/coverage/ut_coverage.pks b/source/core/coverage/ut_coverage.pks index 9254e6d37..1d87d50c9 100644 --- a/source/core/coverage/ut_coverage.pks +++ b/source/core/coverage/ut_coverage.pks @@ -18,7 +18,6 @@ create or replace package ut_coverage authid current_user is gc_proftab_coverage constant varchar2(32) := 'proftab'; gc_block_coverage constant varchar2(32) := 'block'; - gc_extended_coverage constant varchar2(32) := 'extended'; type tt_coverage_id_arr is table of integer index by varchar2(30); @@ -75,7 +74,7 @@ create or replace package ut_coverage authid current_user is * Allows overwriting of private global variable g_coverage_id * Used internally, only for unit testing of the framework only */ - procedure mock_coverage_id(a_coverage_id integer,a_coverage_type in varchar2); + procedure mock_coverage_id(a_coverage_id integer, a_coverage_type in varchar2); procedure mock_coverage_id(a_coverage_id tt_coverage_id_arr); From a95ca5555c964d1aaa0bd7e8234e7e77810c4b07 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 17 Jul 2019 22:58:19 +0100 Subject: [PATCH 0561/1096] simplified profiler helper - no need for dynamic SQL and explicit cursor. --- .../coverage/ut_coverage_helper_profiler.pkb | 31 +++++++++---------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/source/core/coverage/ut_coverage_helper_profiler.pkb b/source/core/coverage/ut_coverage_helper_profiler.pkb index 6b685ede0..c90a5b36a 100644 --- a/source/core/coverage/ut_coverage_helper_profiler.pkb +++ b/source/core/coverage/ut_coverage_helper_profiler.pkb @@ -54,26 +54,23 @@ create or replace package body ut_coverage_helper_profiler is end; function proftab_results(a_object_owner varchar2, a_object_name varchar2, a_coverage_id integer) return t_proftab_rows is - l_raw_coverage sys_refcursor; - l_coverage_rows t_proftab_rows; + l_coverage_rows t_proftab_rows; begin - open l_raw_coverage for q'[select d.line#, + select + d.line#, case when sum(d.total_occur) = 0 and sum(d.total_time) > 0 then 1 else sum(d.total_occur) end total_occur - from plsql_profiler_units u - join plsql_profiler_data d - on u.runid = d.runid - and u.unit_number = d.unit_number - where u.runid = :a_coverage_id - and u.unit_owner = :a_object_owner - and u.unit_name = :a_object_name - and u.unit_type not in ('PACKAGE SPEC', 'TYPE SPEC', 'ANONYMOUS BLOCK') - group by d.line#]' using a_coverage_id,a_object_owner,a_object_name; + bulk collect into l_coverage_rows + from plsql_profiler_units u + join plsql_profiler_data d + on u.runid = d.runid + and u.unit_number = d.unit_number + where u.runid = a_coverage_id + and u.unit_owner = a_object_owner + and u.unit_name = a_object_name + and u.unit_type in ('PACKAGE BODY', 'TYPE BODY', 'PROCEDURE', 'FUNCTION', 'TRIGGER') + group by d.line#; - FETCH l_raw_coverage BULK COLLECT - INTO l_coverage_rows; - CLOSE l_raw_coverage; - - RETURN l_coverage_rows; + return l_coverage_rows; end; function get_raw_coverage_data(a_object_owner varchar2, a_object_name varchar2, a_coverage_id integer) return ut_coverage_helper.t_unit_line_calls is From 52a7cd69059a1366f8c7bc4994e5a5c0d0427d9d Mon Sep 17 00:00:00 2001 From: Travis CI Date: Thu, 18 Jul 2019 03:42:14 +0000 Subject: [PATCH 0562/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index ecbbf1db8..d486fde91 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index a5b4495d6..f988a85e3 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 530562421..93fe63df3 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index ce27dff49..60dacc2f1 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index f789e272b..187b02c0e 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index a24202cf4..a4f387676 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 8ac1a4bb1..a2520f2ba 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index c05f80f34..36acc19f6 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 550eacb1a..89098ecaf 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 7292beda0..7c8293095 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index ee5ea8cc0..7fc22f457 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index ac34e6175..99383552a 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index efa741d9b..cc387a34f 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index cd12e1039..71619bec3 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 569b72c6c..e7c5b5e8c 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 84f104bd2..7311d1b7a 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 23389f7ae..f11bcb48c 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3164--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index f2e2058aa..9641275ea 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -766,7 +766,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.8.3164-develop + * secion v3.1.8.3169-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 2cb6278cb..f4923a751 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.8.3164-develop'; + gc_version constant varchar2(50) := 'v3.1.8.3169-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 8c83b61ff90120e142c865ce9155060c3dcc971c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Mon, 2 Sep 2019 08:51:28 +0100 Subject: [PATCH 0563/1096] Update sonar-project.properties --- sonar-project.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index c627c45e0..bd6d73d43 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -33,6 +33,5 @@ sonar.plsql.jdbc.password=ut3 sonar.plsql.defaultSchema=UT3 - # Encoding of the source code. Default is default system encoding #sonar.sourceEncoding=UTF-8 From fc6a92526472000b90a6c691193e9a7b0ce299fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Mon, 2 Sep 2019 12:11:36 +0100 Subject: [PATCH 0564/1096] Resolve security issues around insecure username for utplsql owner Resolves #920 --- source/core/ut_utils.pkb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 9641275ea..693b56441 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -554,7 +554,7 @@ create or replace package body ut_utils is function ut_owner return varchar2 is begin - return sys_context('userenv','current_schema'); + return qualified_sql_name( sys_context('userenv','current_schema') ); end; function scale_cardinality(a_cardinality natural) return natural is From 055ea8d79c7014c4fbaf3a7fa54b97dc676701d9 Mon Sep 17 00:00:00 2001 From: Samuel Nitsche Date: Tue, 3 Sep 2019 22:43:29 +0200 Subject: [PATCH 0565/1096] Adjusted download script to use some cookie logic --- .travis/download.js | 18 +++++++++--------- .travis/download.sh | 1 + 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.travis/download.js b/.travis/download.js index 339001c57..67c45fac6 100644 --- a/.travis/download.js +++ b/.travis/download.js @@ -19,20 +19,19 @@ var agreementUrl = casper.cli.get(2); var downloadUrl = casper.cli.get(3); var downloaded = false; +phantom.addCookie({ + 'name': 'oraclelicense', + 'value': '152021', + 'domain': 'oracle.com' + }); + casper.start(); // TODO: Error handling. -// Accept the license agreement. -casper.thenOpen(agreementUrl, function () { - // this.echo("Accepting License"); - this.evaluate(function () { - acceptAgreement(window.self); - }); -}); // Try to access the download page, wait for redirection and submit the login form. casper.thenOpen(downloadUrl).waitForUrl(/signon\.jsp$/, function (re) { - // this.echo("Injecting Login Info"); + //this.echo("Injecting Login Info"); this.evaluate(function (username, password) { document.getElementById("sso_username").value = username; document.getElementById("ssopassword").value = password; @@ -42,8 +41,9 @@ casper.thenOpen(downloadUrl).waitForUrl(/signon\.jsp$/, function (re) { }); casper.on("resource.received", function (resource) { + //this.echo("Received something: " + resource.url); if (resource.url.indexOf("AuthParam") !== -1 && !downloaded) { - // this.echo("DownloadUrl:"); + //this.echo("DownloadUrl:"); // Print the download url. this.echo(resource.url); downloaded = true; diff --git a/.travis/download.sh b/.travis/download.sh index fdbcdef7c..8dfa1942d 100755 --- a/.travis/download.sh +++ b/.travis/download.sh @@ -62,6 +62,7 @@ fi if [ "$PRODUCT" == "sqlcl" ]; then agreementUrl="http://www.oracle.com/technetwork/developer-tools/sqlcl/downloads/index.html" downloadUrl="https://download.oracle.com/otn/java/sqldeveloper/sqlcl-18.3.0.259.2029.zip" + #downloadUrl="https://download.oracle.com/otn/java/sqldeveloper/sqlcl-19.2.1.206.1649.zip" outputFile=sqlcl-18.3.0.259.2029.zip downloadFile $agreementUrl $downloadUrl $outputFile exit 0 From 898fe26ca6700496868277c3b64badf9aa225b7a Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 3 Sep 2019 22:59:58 +0000 Subject: [PATCH 0566/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index d486fde91..99a7427a2 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3187--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index f988a85e3..61624fdac 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3187--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 93fe63df3..56ef5110b 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3187--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 60dacc2f1..b357f1f3c 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3187--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 187b02c0e..cd27af624 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3187--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index a4f387676..c0d8ce1de 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3187--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index a2520f2ba..631695efd 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3187--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 36acc19f6..846562f0e 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3187--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 89098ecaf..be989b84d 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3187--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 7c8293095..dd467e050 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3187--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 7fc22f457..21711a438 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3187--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 99383552a..a47384d29 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3187--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index cc387a34f..ea42b0d68 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3187--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 71619bec3..032e515b6 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3187--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index e7c5b5e8c..e73a51544 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3187--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 7311d1b7a..8a73df326 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3187--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index f11bcb48c..08beca82b 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3187--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 693b56441..0fbd0a0dd 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -766,7 +766,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.8.3169-develop + * secion v3.1.8.3187-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index f4923a751..ed64a851f 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.8.3169-develop'; + gc_version constant varchar2(50) := 'v3.1.8.3187-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 92091d7617edea8852ef4472d3f198b46c6f1dea Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 3 Sep 2019 23:08:54 +0000 Subject: [PATCH 0567/1096] Updated project version after build [skip ci] --- VERSION | 2 +- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- sonar-project.properties | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/VERSION b/VERSION index ff96ff1c9..25742a1c4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.8-develop +v3.1.8 diff --git a/docs/about/authors.md b/docs/about/authors.md index d486fde91..a18bfca23 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index f988a85e3..832b9e394 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 93fe63df3..f8dfb024c 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 60dacc2f1..1e2dcf3cc 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 187b02c0e..4ed6794ec 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index a4f387676..60f00e4bb 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index a2520f2ba..3567ffd96 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 36acc19f6..ae116381f 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 89098ecaf..9b8873f47 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 7c8293095..b023a50c8 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 7fc22f457..36d2cd79f 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 99383552a..4adc482aa 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index cc387a34f..289439ddf 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 71619bec3..173e696c6 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index e7c5b5e8c..379948e0d 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 7311d1b7a..21bcc77fc 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index f11bcb48c..e4fe75b72 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3169--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) # Upgrading from version 2 diff --git a/sonar-project.properties b/sonar-project.properties index bd6d73d43..b9220be6e 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,7 @@ sonar.projectKey=utPLSQL # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=utPLSQL -sonar.projectVersion=v3.1.8-develop +sonar.projectVersion=v3.1.8 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # Since SonarQube 4.2, this property is optional if sonar.modules is set. diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 693b56441..25bc32b34 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -766,7 +766,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.8.3169-develop + * secion v3.1.8.3188 */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index f4923a751..821c84dfe 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.8.3169-develop'; + gc_version constant varchar2(50) := 'v3.1.8.3188'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 307a1693a94c46ccd001375437c827d95c2a9b5b Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 4 Sep 2019 01:08:24 +0100 Subject: [PATCH 0568/1096] Updated version to 3.1.9 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 25742a1c4..76cb3f689 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.8 +v3.1.9 From 83b66c0d0563e54abadbe28a53a1ff315dfc6d98 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Wed, 4 Sep 2019 00:18:03 +0000 Subject: [PATCH 0569/1096] Updated project version after build [skip ci] --- VERSION | 2 +- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- sonar-project.properties | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/VERSION b/VERSION index 76cb3f689..272ed88b4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.9 +v3.1.9-develop diff --git a/docs/about/authors.md b/docs/about/authors.md index a18bfca23..a7b8cd428 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 832b9e394..571fddc79 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index f8dfb024c..0afd11623 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 1e2dcf3cc..5b5bc9124 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 4ed6794ec..82f3c7353 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 60f00e4bb..fc4b03283 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 3567ffd96..e2d9b7e00 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index ae116381f..c3d88c908 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 9b8873f47..e89438fbe 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index b023a50c8..74ddb8f24 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 36d2cd79f..b03af102f 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 4adc482aa..c4cb8bf0d 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 289439ddf..5236f6abd 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 173e696c6..6910ee2ab 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 379948e0d..d59b68642 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 21bcc77fc..1055f7a65 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index e4fe75b72..f07fba890 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.8.3188-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) # Upgrading from version 2 diff --git a/sonar-project.properties b/sonar-project.properties index b9220be6e..bb6e0f621 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,7 @@ sonar.projectKey=utPLSQL # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=utPLSQL -sonar.projectVersion=v3.1.8 +sonar.projectVersion=v3.1.9-develop # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # Since SonarQube 4.2, this property is optional if sonar.modules is set. diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 25bc32b34..2a6adccb9 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -766,7 +766,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.8.3188 + * secion v3.1.9.3191-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 821c84dfe..dac12fbc9 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.8.3188'; + gc_version constant varchar2(50) := 'v3.1.9.3191-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 3c888747d29c1982de63fc89e45f32e5d7031082 Mon Sep 17 00:00:00 2001 From: Pazus Date: Tue, 10 Sep 2019 08:54:07 +0300 Subject: [PATCH 0570/1096] Update .gitattributes --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index 02d2d5e4e..459450fce 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,3 +9,4 @@ tests export-ignore development export-ignore node_modules export-ignore ^docs/* linguist-documentation +*.sql linguist-language=PLSQL From 2de010d8805cf595939aaf18f4554920832b61f0 Mon Sep 17 00:00:00 2001 From: Pazus Date: Tue, 10 Sep 2019 20:40:51 +0300 Subject: [PATCH 0571/1096] Update .gitattributes --- .gitattributes | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitattributes b/.gitattributes index 459450fce..9cf0f2457 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,4 +9,8 @@ tests export-ignore development export-ignore node_modules export-ignore ^docs/* linguist-documentation +*.pkb linguist-language=PLSQL +*.pks linguist-language=PLSQL *.sql linguist-language=PLSQL +*.tpb linguist-language=PLSQL +*.tps linguist-language=PLSQL From a3faea485a7448225b4f4334d4f94613864c4cf3 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 10 Sep 2019 18:38:36 +0000 Subject: [PATCH 0572/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index a7b8cd428..67b0a444a 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 571fddc79..69e665c1f 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 0afd11623..bd12b27a1 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 5b5bc9124..812699af5 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 82f3c7353..faa3f74a6 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index fc4b03283..87808e754 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index e2d9b7e00..27f0d82de 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index c3d88c908..549b99773 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index e89438fbe..cd0542f59 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 74ddb8f24..32a6f6f40 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index b03af102f..4d52de5bd 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index c4cb8bf0d..669c82318 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 5236f6abd..b9d45150e 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 6910ee2ab..0f0f611b9 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index d59b68642..b59254a67 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 1055f7a65..771c4bf22 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index f07fba890..17792fe27 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3191--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 2a6adccb9..3b80d0c19 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -766,7 +766,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.9.3191-develop + * secion v3.1.9.3196-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index dac12fbc9..d0a2ee5c4 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.9.3191-develop'; + gc_version constant varchar2(50) := 'v3.1.9.3196-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 3ef06eb883131cc2a2763f5aea88b89e1b0f9134 Mon Sep 17 00:00:00 2001 From: MickeM Date: Thu, 12 Sep 2019 09:21:24 +0200 Subject: [PATCH 0573/1096] Fix check of sys grants with ANY (issue #992) --- source/check_sys_grants.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/check_sys_grants.sql b/source/check_sys_grants.sql index a31e9a9e1..7b1644952 100644 --- a/source/check_sys_grants.sql +++ b/source/check_sys_grants.sql @@ -21,7 +21,7 @@ begin (select privilege from user_sys_privs union all - select replace(privilege,' ANY ') privilege + select replace(privilege,' ANY') privilege from user_sys_privs) ); if l_missing_grants is not null then From 48b9d2e1d8cce7cce714bb6b0d1816788c4eb3a8 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Fri, 13 Sep 2019 18:43:00 +0000 Subject: [PATCH 0574/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 67b0a444a..8842f04fc 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 69e665c1f..afb54cdb7 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index bd12b27a1..f79b06f95 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 812699af5..75c71678e 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index faa3f74a6..fefa3c757 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 87808e754..17761fb7c 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 27f0d82de..623176db9 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 549b99773..0111c7b7f 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index cd0542f59..deb3f7ea6 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 32a6f6f40..52c96f287 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 4d52de5bd..03e2d9822 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 669c82318..42a82bf8a 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index b9d45150e..14d532d5d 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 0f0f611b9..40acf9a45 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index b59254a67..703f56138 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 771c4bf22..6e9d07a7a 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 17792fe27..651f4a900 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3196--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 3b80d0c19..ac4dde170 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -766,7 +766,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.9.3196-develop + * secion v3.1.9.3198-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index d0a2ee5c4..78a3906bc 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.9.3196-develop'; + gc_version constant varchar2(50) := 'v3.1.9.3198-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From c61f954db45406a71cce469fa5343099671e73d3 Mon Sep 17 00:00:00 2001 From: abasharin Date: Fri, 20 Sep 2019 16:00:31 -0400 Subject: [PATCH 0575/1096] Corrected rebuild_annotation_cache parameter --- docs/userguide/install.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 14d532d5d..0cbcd7a6a 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -141,7 +141,7 @@ sqlplus sys/sys_pass@db as sysdba @install_headless_with_trigger.sql utp3 my_ver **Note:** >When installing utPLSQL into database with existing unit test packages, utPLSQL will not be able to already-existing unit test packages. When utPSLQL was installed with DDL trigger, you have to do one of: >- Recompile existing Unit Test packages to make utPLSQL aware of their existence ->- Invoke `exec ut_runner.rebuild_annotation_cache(a_schema_name=> ... );` for every schema containing unit tests in your database +>- Invoke `exec ut_runner.rebuild_annotation_cache(a_object_owner=> ... );` for every schema containing unit tests in your database > > Steps above are required to assure annotation cache is populated properly from existing objects. Rebuilding annotation cache might be faster than code recompilation. From a02eed8d7ae6f577ca90ce68de367e1d961080b9 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sat, 21 Sep 2019 23:36:17 +0000 Subject: [PATCH 0576/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 8842f04fc..cac2070a3 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index afb54cdb7..656a6b644 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index f79b06f95..7eb424cfa 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 75c71678e..490af7126 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index fefa3c757..dc10e1cab 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 17761fb7c..a70f251b1 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 623176db9..ba2783348 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 0111c7b7f..4093037d6 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index deb3f7ea6..27543d243 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 52c96f287..569f53461 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 03e2d9822..b707d0e17 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 42a82bf8a..829ede576 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 0cbcd7a6a..11a7b8024 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 40acf9a45..2e5e3016e 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 703f56138..6eb712972 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 6e9d07a7a..4b8c26708 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 651f4a900..fa4c88fdd 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index ac4dde170..a1a262459 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -766,7 +766,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.9.3198-develop + * secion v3.1.9.3200-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 78a3906bc..2d48180f1 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.9.3198-develop'; + gc_version constant varchar2(50) := 'v3.1.9.3200-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 169d0fe07c69339d7b1bc5ca4965c307cdcb7f3c Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 22 Sep 2019 12:25:18 +0100 Subject: [PATCH 0577/1096] Changed names on internal columns in cursor & object compare. Columns: - ITEM_DATA - DATA_ID - ITEM_NO - DUP_NO - POSITION Can now be safely used in cursors. Resolves #997 Added delete on DIFF temp tables after cursor / object compare. Resolves #998 --- .../data_values/ut_compound_data_helper.pkb | 54 ++++++++++--------- .../expectations/test_expectations_cursor.pkb | 45 ++++++++++++++++ .../expectations/test_expectations_cursor.pks | 8 ++- 3 files changed, 80 insertions(+), 27 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 575568641..d7c0aab76 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -28,46 +28,46 @@ create or replace package body ut_compound_data_helper is with exp as ( select ucd.*, - {:duplicate_number:} dup_no + {:duplicate_number:} "UT3$_Dup#No" from ( select - ucd.item_data - ,x.data_id data_id - ,position + x.item_no item_no + ucd."UT3$_Item#Data" + ,x.data_id "UT3$_Data#Id" + ,ucd."UT3$_Position#" + x.item_no "UT3$_Item#No" {:columns:} from ut_compound_data_tmp x, xmltable('/ROWSET/ROW' passing x.item_data columns - item_data xmltype path '*' - ,position for ordinality + "UT3$_Item#Data" xmltype path '*' + ,"UT3$_Position#" for ordinality {:xml_to_columns:} ) ucd - where data_id = :exp_guid + where x.data_id = :exp_guid ) ucd ) , act as ( select ucd.*, - {:duplicate_number:} dup_no + {:duplicate_number:} "UT3$_Dup#No" from ( select - ucd.item_data - ,x.data_id data_id - ,position + x.item_no item_no + ucd."UT3$_Item#Data" + ,x.data_id "UT3$_Data#Id" + ,ucd."UT3$_Position#" + x.item_no "UT3$_Item#No" {:columns:} from ut_compound_data_tmp x, xmltable('/ROWSET/ROW' passing x.item_data columns - item_data xmltype path '*' - ,position for ordinality + "UT3$_Item#Data" xmltype path '*' + ,"UT3$_Position#" for ordinality {:xml_to_columns:} ) ucd - where data_id = :act_guid + where x.data_id = :act_guid ) ucd ) select - a.item_data as act_item_data, - a.data_id act_data_id, - e.item_data as exp_item_data, - e.data_id exp_data_id, + a."UT3$_Item#Data" as act_item_data, + a."UT3$_Data#Id" act_data_id, + e."UT3$_Item#Data" as exp_item_data, + e."UT3$_Data#Id" exp_data_id, {:item_no:} as item_no, - nvl(e.dup_no,a.dup_no) dup_no + nvl(e."UT3$_Dup#No",a."UT3$_Dup#No") dup_no from act a {:join_type:} exp e on ( {:join_condition:} ) where {:where_condition:}]'; @@ -306,16 +306,16 @@ create or replace package body ut_compound_data_helper is a_join_by_stmt := ut_utils.table_to_clob(l_join_by_list, ' and '); elsif a_unordered then -- If no key defined do the join on all columns - a_join_by_stmt := ' e.dup_no = a.dup_no and '||ut_utils.table_to_clob(l_equal_list, ' and '); + a_join_by_stmt := ' e."UT3$_Dup#No" = a."UT3$_Dup#No" and '||ut_utils.table_to_clob(l_equal_list, ' and '); else -- Else join on rownumber - a_join_by_stmt := 'a.item_no = e.item_no '; + a_join_by_stmt := 'a."UT3$_Item#No" = e."UT3$_Item#No" '; end if; a_not_equal_stmt := ut_utils.table_to_clob(l_not_equal_list, ' or '); else --Partition by piece when no data ut_utils.append_to_clob(a_partition_stmt,' 1 '); - a_join_by_stmt := 'a.item_no = e.item_no '; + a_join_by_stmt := 'a."UT3$_Item#No" = e."UT3$_Item#No" '; end if; end; @@ -349,8 +349,8 @@ create or replace package body ut_compound_data_helper is begin return case - when a_unordered then 'row_number() over ( order by nvl(e.item_no,a.item_no))' - else 'nvl(e.item_no,a.item_no) ' + when a_unordered then 'row_number() over ( order by nvl(e."UT3$_Item#No",a."UT3$_Item#No"))' + else 'nvl(e."UT3$_Item#No",a."UT3$_Item#No") ' end; end; @@ -387,9 +387,9 @@ create or replace package body ut_compound_data_helper is end if; --If its inclusion we expect a actual set to fully match and have no extra elements over expected if a_inclusion_type then - ut_utils.append_to_clob(l_where_stmt,case when a_is_negated then ' 1 = 1 ' else ' ( a.data_id is null ) ' end); + ut_utils.append_to_clob(l_where_stmt,case when a_is_negated then ' 1 = 1 ' else ' ( a."UT3$_Data#Id" is null ) ' end); else - ut_utils.append_to_clob(l_where_stmt,' (a.data_id is null or e.data_id is null) '); + ut_utils.append_to_clob(l_where_stmt,' (a."UT3$_Data#Id" is null or e."UT3$_Data#Id" is null) '); end if; l_compare_sql := replace(l_compare_sql,'{:where_condition:}',l_where_stmt); @@ -561,6 +561,8 @@ create or replace package body ut_compound_data_helper is procedure cleanup_diff is begin g_diff_count := 0; + delete from ut_compound_data_diff_tmp; + delete from ut_json_data_diff_tmp; end; function get_rows_diff_count return integer is diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index dc439e7e0..1c6f46532 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -2825,5 +2825,50 @@ Check the query and data for errors.'; $end end; + procedure compare_specific_column_names is + function get_cursor return sys_refcursor is + l_result sys_refcursor; + begin + open l_result for + select 'a' as item_data, rownum as data_id, rownum as item_no, rownum as dup_no, rownum as position from dual; + return l_result; + end; + begin + ut3.ut.expect(get_cursor()).to_equal(get_cursor()); + ut3.ut.expect(get_cursor()).to_equal(get_cursor()).unordered(); + ut3.ut.expect(get_cursor()).to_equal(get_cursor()).join_by('ITEM_DATA,DATA_ID,ITEM_NO,DUP_NO'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure multiple_cursor_expectations is + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + open l_actual for select rownum rn from dual connect by level < 5; + open l_expected for select rownum rn from dual connect by level = 1; + ut3.ut.expect(l_actual).to_equal(l_expected); + open l_actual for select rownum rn from dual connect by level < 3; + open l_expected for select * from (select rownum rn from dual connect by level < 3) order by 1 desc; + ut3.ut.expect(l_actual).to_equal(l_expected); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations(1)).to_equal( +'Actual: refcursor [ count = 4 ] was expected to equal: refcursor [ count = 1 ] +Diff: +Rows: [ 3 differences ] + Row No. 2 - Extra: 2 + Row No. 3 - Extra: 3 + Row No. 4 - Extra: 4' + ); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations(2)).to_equal( +'Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 2 ] +Diff: +Rows: [ 2 differences ] + Row No. 1 - Actual: 1 + Row No. 1 - Expected: 2 + Row No. 2 - Actual: 2 + Row No. 2 - Expected: 1' + ); + end; + end; / diff --git a/test/ut3_user/expectations/test_expectations_cursor.pks b/test/ut3_user/expectations/test_expectations_cursor.pks index 82fc47f3c..d3dbeb9a7 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pks +++ b/test/ut3_user/expectations/test_expectations_cursor.pks @@ -462,8 +462,14 @@ create or replace package test_expectations_cursor is --%test( Mixed column order exclusion ) procedure uc_columns_exclude; - --%test(Compares cursors with long column names - Issue #952 ) + --%test( Compares cursors with long column names - Issue #952 ) procedure compare_long_column_names; + --%test( Compares cursors with specific column names - Issue #997 ) + procedure compare_specific_column_names; + + --%test( Multiple failures reported correctly - Issue #998 ) + procedure multiple_cursor_expectations; + end; / From ba6243bdc49cf95c16fc87dba54616213d8e4f30 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 23 Sep 2019 19:54:21 +0000 Subject: [PATCH 0578/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index cac2070a3..e49dfa1bc 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 656a6b644..b76950338 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 7eb424cfa..8fbf1b75b 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 490af7126..ef3112e09 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index dc10e1cab..de477f45b 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index a70f251b1..7438fb3e0 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index ba2783348..1825a2b17 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 4093037d6..376fbe7fe 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 27543d243..319b81688 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 569f53461..82ebfd7e8 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index b707d0e17..92a1b463b 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 829ede576..7e11fe01f 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 11a7b8024..c1de96f3e 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 2e5e3016e..ee203672d 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 6eb712972..6e65d276a 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 4b8c26708..772fd7169 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index fa4c88fdd..e01ee15aa 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3200--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index a1a262459..a2d2eb324 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -766,7 +766,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.9.3200-develop + * secion v3.1.9.3204-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 2d48180f1..bbb9567ce 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.9.3200-develop'; + gc_version constant varchar2(50) := 'v3.1.9.3204-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 41ef9bbd585106a07a2bc84a5ee508c679a49855 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 27 Sep 2019 08:28:57 +0100 Subject: [PATCH 0579/1096] Fixed test dependency. Resolves #968 --- test/ut3_tester_helper/coverage_helper.pkb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/test/ut3_tester_helper/coverage_helper.pkb b/test/ut3_tester_helper/coverage_helper.pkb index 74a33da54..1db078a8b 100644 --- a/test/ut3_tester_helper/coverage_helper.pkb +++ b/test/ut3_tester_helper/coverage_helper.pkb @@ -20,12 +20,6 @@ create or replace package body coverage_helper is return v_result; end; - procedure setup_mock_coverage_id is - begin - g_profiler_run_id := get_mock_proftab_run_id(); - ut3.ut_coverage.mock_coverage_id(g_profiler_run_id, ut3.ut_coverage.gc_proftab_coverage); - end; - procedure setup_mock_coverage_ids(a_profiler_run_id integer, a_block_run_id integer) is l_coverage_ids ut3.ut_coverage.tt_coverage_id_arr; begin @@ -34,6 +28,13 @@ create or replace package body coverage_helper is ut3.ut_coverage.mock_coverage_id(l_coverage_ids); end; + procedure setup_mock_coverage_id is + begin + g_profiler_run_id := get_mock_proftab_run_id(); + g_block_run_id := get_mock_block_run_id(); + setup_mock_coverage_ids(g_profiler_run_id, g_block_run_id); + end; + procedure setup_dummy_coverage is pragma autonomous_transaction; begin From 14b624315398774c4f918996d09be0f75f278670 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 27 Sep 2019 08:40:20 +0100 Subject: [PATCH 0580/1096] Fixed issue with stack parsing on Windows install of utPLSQL Resolves #1000 --- source/core/ut_expectation_processor.pkb | 2 +- .../test_expectation_processor.pkb | 38 ++++++++++++++++++- .../test_expectation_processor.pks | 3 ++ 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/source/core/ut_expectation_processor.pkb b/source/core/ut_expectation_processor.pkb index 0c2580220..d65d210c8 100644 --- a/source/core/ut_expectation_processor.pkb +++ b/source/core/ut_expectation_processor.pkb @@ -163,7 +163,7 @@ create or replace package body ut_expectation_processor as end; function cut_address_columns( a_stack varchar2 ) return varchar2 is begin - return regexp_replace( a_stack, '^(0x)?[0-9a-f]+\s+', '', 1, 0, 'm' ); + return regexp_replace( a_stack, '^(0x)?[0-9a-f]+\s+', '', 1, 0, 'mi' ); end; function cut_framework_stack( a_stack varchar2 ) return varchar2 is begin diff --git a/test/ut3_tester/core/expectations/test_expectation_processor.pkb b/test/ut3_tester/core/expectations/test_expectation_processor.pkb index ab413616e..c061e55d4 100644 --- a/test/ut3_tester/core/expectations/test_expectation_processor.pkb +++ b/test/ut3_tester/core/expectations/test_expectation_processor.pkb @@ -11,7 +11,7 @@ create or replace package body test_expectation_processor is handle number name 34f88e4420 124 package body SCH_TEST.UT_EXPECTATION_PROCESSOR 353dfeb2f8 26 SCH_TEST.UT_EXPECTATION_RESULT -cba249ce0 112 SCH_TEST.UT_EXPECTATION +cba2493ce0 112 SCH_TEST.UT_EXPECTATION 3539881cf0 21 SCH_TEST.UT_EXPECTATION_NUMBER 351a608008 7 package body ]'||gc_user||q'[.TEST_EXPECTATION_PROCESSOR 351a608018 12 package body ]'||gc_user||q'[.TEST_EXPECTATION_PROCESSOR @@ -24,7 +24,7 @@ cba249ce0 112 SCH_TEST.UT_EXPECTATION 34f8ab98f0 48 SCH_TEST.UT_SUITE_ITEM 34f8ab9b10 74 SCH_TEST.UT_SUITE 34f8ab98f0 48 SCH_TEST.UT_SUITE_ITEM -cba24bfd0 75 SCH_TEST.UT_LOGICAL_SUITE +cba24bfad0 75 SCH_TEST.UT_LOGICAL_SUITE 353dfecf30 59 SCH_TEST.UT_RUN 34f8ab98f0 48 SCH_TEST.UT_SUITE_ITEM 357f5421e8 77 package body SCH_TEST.UT_RUNNER @@ -67,5 +67,39 @@ at "'||gc_user||'.TEST_EXPECTATION_PROCESSOR", line 24'); ).to_be_like('at "UT3.UT_EXAMPLETEST", line 20 %'); end; + procedure who_call_expectation_win_stack is + l_stack_trace varchar2(4000); + l_source_line varchar2(4000); + begin + l_stack_trace := q'[----- PL/SQL Call Stack ----- +object line object +handle number name +00007FF8547B7D30 124 package body SCH_TEST.UT_EXPECTATION_PROCESSOR +00007FF8547B7D30 26 SCH_TEST.UT_EXPECTATION_RESULT +00007FF8547B7D30 112 SCH_TEST.UT_EXPECTATION +00007FF8547B7D30 21 SCH_TEST.UT_EXPECTATION_NUMBER +00007FF8547B7D30 7 package body SCOTT.TEST_BETWNSTR.BASIC_USAGE +00007FF81FF207B0 345 type body SCOTT.TEST_BETWNSTR.BASIC_USAGE_TYP +00007FF8544B21B8 6 anonymous block +00007FF8267FBFC8 1721 package body SYS.DBMS_SQL.EXECUTE +00007FF852BCFC68 142 type body UT3.UT_EXECUTABLE.DO_EXECUTE +00007FF852BCFC68 44 type body UT3.UT_EXECUTABLE.DO_EXECUTE +00007FF8512F9A90 74 type body UT3.UT_EXECUTABLE_TEST.DO_EXECUTE +00007FF8512F9A90 38 type body UT3.UT_EXECUTABLE_TEST.DO_EXECUTE +00007FF8231A2088 79 type body UT3.UT_TEST.DO_EXECUTE +00007FF81FF207B0 49 type body UT3.UT_SUITE_ITEM.DO_EXECUTE +00007FF852C83270 66 type body UT3.UT_SUITE.DO_EXECUTE +00007FF82165F3B0 67 type body UT3.UT_RUN.DO_EXECUTE +00007FF81FF207B0 49 type body UT3.UT_SUITE_ITEM.DO_EXECUTE +00007FF8266285C0 172 package body UT3.UT_RUNNER.RUN +00007FF854710538 134 package body UT3.UT.RUN_AUTONOMOUS +00007FF854710538 488 package body UT3.UT.RUN +00007FF854710538 623 package body UT3.UT.RUN +00007FF81CFFA388 1 anonymous block]'; + ut.expect( + ut3.ut_expectation_processor.who_called_expectation(l_stack_trace) + ).to_be_like('at "SCOTT.TEST_BETWNSTR.BASIC_USAGE", line 7 %'); + end; + end; / diff --git a/test/ut3_tester/core/expectations/test_expectation_processor.pks b/test/ut3_tester/core/expectations/test_expectation_processor.pks index 73cf60d11..6087eb045 100644 --- a/test/ut3_tester/core/expectations/test_expectation_processor.pks +++ b/test/ut3_tester/core/expectations/test_expectation_processor.pks @@ -14,6 +14,9 @@ create or replace package test_expectation_processor is --%test(parses stack trace and returns objects and line that called expectation) procedure who_called_expectation; + --%test(parses stack trace for Windows DB os - regression for #1000) + procedure who_call_expectation_win_stack; + --%endcontext end; From 2f89527e4b3447e35b9affc006c2a8f45f7023e7 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sat, 28 Sep 2019 00:28:28 +0000 Subject: [PATCH 0581/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index e49dfa1bc..522b4a66b 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index b76950338..7cb44d258 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 8fbf1b75b..5e2518fa3 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index ef3112e09..9d75e9e44 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index de477f45b..ebd934948 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 7438fb3e0..0d3240a32 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 1825a2b17..664bcfdb0 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 376fbe7fe..31c75489a 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 319b81688..8d39ddca8 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 82ebfd7e8..8bc06049f 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 92a1b463b..9ea7a51fa 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 7e11fe01f..4d3b77711 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index c1de96f3e..69b3b2127 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index ee203672d..3dfd1d3fb 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 6e65d276a..84b5cdaf6 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 772fd7169..ce88c7889 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index e01ee15aa..bef70d5f7 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3204--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index a2d2eb324..d91c5e41d 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -766,7 +766,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.9.3204-develop + * secion v3.1.9.3211-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index bbb9567ce..14cb595fb 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.9.3204-develop'; + gc_version constant varchar2(50) := 'v3.1.9.3211-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 48a3f9ed6d63f20ce525e74965c0dfe27aff5969 Mon Sep 17 00:00:00 2001 From: pesse Date: Fri, 11 Oct 2019 17:03:21 +0200 Subject: [PATCH 0582/1096] Make "Version 2 to 3 comparison" an actual section in readme --- readme.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/readme.md b/readme.md index 315124db6..b0401647f 100644 --- a/readme.md +++ b/readme.md @@ -168,12 +168,25 @@ To sign up to the chat use [this link](http://utplsql-slack-invite.herokuapp.com ---------- [__Authors__](docs/about/authors.md) + +---------- +__Project Directories__ + +* .travis - contains files needed for travis-ci integration +* client_source - Sources to be used on the client-side. Developer workstation or CI platform to run the tests. +* development - Set of useful scripts and utilities for development and debugging of utPLSQL +* docs - Documentation of the project +* examples - Example source code and unit tests +* source - The installation code for utPLSQL +* tests - Tests for utPLSQL framework + ---------- -__Version 2 to Version 3 Comparison__ If you have a great feature in mind, that you would like to see in utPLSQL v3 please create an [issue on GitHub](https://github.com/utPLSQL/utPLSQL/issues) or discuss it with us in the [Slack chat rooms](http://utplsql-slack-invite.herokuapp.com/). +# Version 2 to Version 3 Comparison + | Feature | Version 2 | Version 3 | | -------------------------------------- | ---------------------- | ---------------------- | | Easy to install | Yes | Yes | @@ -224,19 +237,6 @@ If you have a great feature in mind, that you would like to see in utPLSQL v3 pl 3 Test execution comparison is in a single call so the results are combined. We know it was always possible to group in any way with multiple calls. But that may not be desired under a CI system where you want a single JUnit XML Output. - ----------- -__Project Directories__ - -* .travis - contains files needed for travis-ci integration -* client_source - Sources to be used on the client-side. Developer workstation or CI platform to run the tests. -* development - Set of useful scripts and utilities for development and debugging of utPLSQL -* docs - Documentation of the project -* examples - Example source code and unit tests -* source - The installation code for utPLSQL -* tests - Tests for utPLSQL framework - ------------ # Supporters The utPLSQL project is community-driven and is not commercially motivated. Nonetheless, donations and other contributions are always welcome, and are detailed below. From f8a3b87014aa5fd71b858dbd51ce7f60c9973aba Mon Sep 17 00:00:00 2001 From: pesse Date: Fri, 11 Oct 2019 17:14:07 +0200 Subject: [PATCH 0583/1096] Outsource the Version comparison to a separate file so it can be directly linked --- docs/compare_version2_to_3.md | 56 +++++++++++++++++++++++++++++++++++ docs/index.md | 1 + readme.md | 50 +------------------------------ 3 files changed, 58 insertions(+), 49 deletions(-) create mode 100644 docs/compare_version2_to_3.md diff --git a/docs/compare_version2_to_3.md b/docs/compare_version2_to_3.md new file mode 100644 index 000000000..624bf0df8 --- /dev/null +++ b/docs/compare_version2_to_3.md @@ -0,0 +1,56 @@ +For version 3 has been a complete rewrite of the framework, the way it can be used is different to +the previous versions, but also more in line with other modern unit-testing frameworks like JUnit and RSpec. + +There is a [migration tool](https://github.com/utPLSQL/utPLSQL-v2-v3-migration) that can help you to migrate your existing utPLSQL v2 tests to the v3 capabilities. + +# Feature comparison + +| Feature | Version 2 | Version 3 | +| -------------------------------------- | ---------------------- | ---------------------- | +| Easy to install | Yes | Yes | +| Documentation | Yes | Yes | +| License | GPL v2 | Apache 2.0 | +| **Tests Creation** | | | +| Declarative test configuration | No | Yes - Annotations1| +| Tests as Packages | Yes | Yes | +| Multiple Tests in a single Package | Yes | Yes | +| Optional Setup/Teardown | No | Yes | +| Different Setup/Teardown
For Each Test in a Single Package| No | Yes - Annotations1 | +| Suite Definition Storage | Tables | Package - Annotations1 | +| Multiple Suites | Yes | Yes | +| Suites can contain Suites | No | Yes | +| Automatic Test detection | No | Yes - Annotations1| +| Unconstrained naming of Test packages | No - prefixes | Yes - name not relevant| +| Require Prefix on Test procedures | No - prefixes | Yes - name not relevant| +| Auto Compilation of Tests | Yes | No (Let us know if you use this) | +| Assertion Library | 30 assertions2 | 26 matchers (13 + 13 negated) | +| Extendable assertions | No | Yes - custom matchers | +| PLSQL Record Assertions | generated code through **utRecEq** Package | [possible on Oracle 12c+](https://oracle-base.com/articles/12c/using-the-table-operator-with-locally-defined-types-in-plsql-12cr1) using [cursor matchers](docs/userguide/expectations.md#comparing-cursors)| +| Test Skeleton Generation | Yes | No (Let us know if you use this) | +| **Test Execution3** | | | +| Single Test Package Execution | Yes | Yes | +| Single Test Procedure Execution | No | Yes | +| Test Suite Execution | Yes | Yes | +| Subset of Suite Execution | No | Yes | +| Multiple Suite Execution | No | Yes | +| Organizing Suites into hierarchies | No | Yes | +| **Code Coverage Reporting** | No | Yes | +| Html Coverage Report | No | Yes | +| Sonar XML Coverage Report | No | Yes | +| Coveralls Json Coverage Report | No | Yes | +| Framework Transaction Control | No | Yes - Annotations1 | +| **Test Output** | | | +| Real-time test execution progress reporting | No | Yes | +| Multiple Output Reporters can be used during test execution | No| Yes | +| DBMS_OUTPUT | Yes | Yes (clean formatting) | +| File | Yes (to db server only)| Yes (on client side) | +| Stored in Table | Yes | No (can be added as custom reporter) | +| XUnit format support | No | Yes | +| HTML Format | Yes | No | +| Custom Output reporter | Yes-needs configuration| Yes - no config needed | + +1 Annotations are specially formatted comments in your package specification. This enables *declarative* test configuration that is coupled with the source code. See Documentation for more details. + +2 **utAssert2** package - Contains 59 Assertions - 2 Not implemented = 57, 28 are duplicated only change on outcome_in parameter 57-28 = 29, **utPipe** package - Contains 1 Assertion 29 + 1 = 30 + +3 Test execution comparison is in a single call so the results are combined. We know it was always possible to group in any way with multiple calls. But that may not be desired under a CI system where you want a single JUnit XML Output. diff --git a/docs/index.md b/docs/index.md index ebd934948..acc3c4861 100644 --- a/docs/index.md +++ b/docs/index.md @@ -25,6 +25,7 @@ The framework follows industry standards and best patterns of modern Unit Testin - [License](about/license.md) - [Support](about/support.md) - [Authors](about/authors.md) + - [Version 2 to Version 3 Comparison](compare_version2_to_3.md) # Demo project diff --git a/readme.md b/readme.md index b0401647f..864e1041e 100644 --- a/readme.md +++ b/readme.md @@ -187,55 +187,7 @@ If you have a great feature in mind, that you would like to see in utPLSQL v3 pl # Version 2 to Version 3 Comparison -| Feature | Version 2 | Version 3 | -| -------------------------------------- | ---------------------- | ---------------------- | -| Easy to install | Yes | Yes | -| Documentation | Yes | Yes | -| License | GPL v2 | Apache 2.0 | -| **Tests Creation** | | | -| Declarative test configuration | No | Yes - Annotations1| -| Tests as Packages | Yes | Yes | -| Multiple Tests in a single Package | Yes | Yes | -| Optional Setup/Teardown | No | Yes | -| Different Setup/Teardown
For Each Test in a Single Package| No | Yes - Annotations1 | -| Suite Definition Storage | Tables | Package - Annotations1 | -| Multiple Suites | Yes | Yes | -| Suites can contain Suites | No | Yes | -| Automatic Test detection | No | Yes - Annotations1| -| Unconstrained naming of Test packages | No - prefixes | Yes - name not relevant| -| Require Prefix on Test procedures | No - prefixes | Yes - name not relevant| -| Auto Compilation of Tests | Yes | No (Let us know if you use this) | -| Assertion Library | 30 assertions2 | 26 matchers (13 + 13 negated) | -| Extendable assertions | No | Yes - custom matchers | -| PLSQL Record Assertions | generated code through **utRecEq** Package | [possible on Oracle 12c+](https://oracle-base.com/articles/12c/using-the-table-operator-with-locally-defined-types-in-plsql-12cr1) using [cursor matchers](docs/userguide/expectations.md#comparing-cursors)| -| Test Skeleton Generation | Yes | No (Let us know if you use this) | -| **Test Execution3** | | | -| Single Test Package Execution | Yes | Yes | -| Single Test Procedure Execution | No | Yes | -| Test Suite Execution | Yes | Yes | -| Subset of Suite Execution | No | Yes | -| Multiple Suite Execution | No | Yes | -| Organizing Suites into hierarchies | No | Yes | -| **Code Coverage Reporting** | No | Yes | -| Html Coverage Report | No | Yes | -| Sonar XML Coverage Report | No | Yes | -| Coveralls Json Coverage Report | No | Yes | -| Framework Transaction Control | No | Yes - Annotations1 | -| **Test Output** | | | -| Real-time test execution progress reporting | No | Yes | -| Multiple Output Reporters can be used during test execution | No| Yes | -| DBMS_OUTPUT | Yes | Yes (clean formatting) | -| File | Yes (to db server only)| Yes (on client side) | -| Stored in Table | Yes | No (can be added as custom reporter) | -| XUnit format support | No | Yes | -| HTML Format | Yes | No | -| Custom Output reporter | Yes-needs configuration| Yes - no config needed | - -1 Annotations are specially formatted comments in your package specification. This enables *declarative* test configuration that is coupled with the source code. See Documentation for more details. - -2 **utAssert2** package - Contains 59 Assertions - 2 Not implemented = 57, 28 are duplicated only change on outcome_in parameter 57-28 = 29, **utPipe** package - Contains 1 Assertion 29 + 1 = 30 - -3 Test execution comparison is in a single call so the results are combined. We know it was always possible to group in any way with multiple calls. But that may not be desired under a CI system where you want a single JUnit XML Output. +[Version 2 to Version 3 Comparison](docs/compare_version2_to_3.md) # Supporters From 40badacae3f13163a28db55c522e60e7b280f62d Mon Sep 17 00:00:00 2001 From: pesse Date: Fri, 11 Oct 2019 17:58:54 +0200 Subject: [PATCH 0584/1096] Describe the usage of tags in the "Running"-section Fixes #1003 --- docs/userguide/running-unit-tests.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index ce88c7889..3e6ce8547 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -282,6 +282,23 @@ select * from table(ut.run('hr.test_apply_bonus', a_random_test_order_seed => 30 **Note** >Random order seed must be a positive number within range of 1 .. 1 000 000 000. +# Run by Tags + +In addition to the path, you can filter the tests to be run by specifying tags. Tags are defined in the test with the `--%tags`-annotation. +Multiple tags are separated by comma. If multiple tags are set, all tests with __any__ of them specified are run. + +Example Procedure: +```sql +begin + ut.run('hr.test_apply_bonus', a_tags => 'test1,test2'); +end; +``` +Example Function: +```sql +select * from table(ut.run('hr.test_apply_bonus', a_tags => 'suite1')) +``` + + # Keeping uncommitted data after test-run utPLSQL by default runs tests in autonomous transaction and performs automatic rollback to assure that tests do not impact one-another and do not have impact on the current session in your IDE. From 4cfb0cf8c552c6d087a250d1ba91664f508c3e49 Mon Sep 17 00:00:00 2001 From: pesse Date: Fri, 11 Oct 2019 18:01:34 +0200 Subject: [PATCH 0585/1096] Add link to Tag-annotation and tweak for consistency --- docs/userguide/running-unit-tests.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 3e6ce8547..a1535bc73 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -284,16 +284,14 @@ select * from table(ut.run('hr.test_apply_bonus', a_random_test_order_seed => 30 # Run by Tags -In addition to the path, you can filter the tests to be run by specifying tags. Tags are defined in the test with the `--%tags`-annotation. +In addition to the path, you can filter the tests to be run by specifying tags. Tags are defined in the test with the `--%tags`-annotation ([Read more](annotations.md#tags)). Multiple tags are separated by comma. If multiple tags are set, all tests with __any__ of them specified are run. -Example Procedure: ```sql begin ut.run('hr.test_apply_bonus', a_tags => 'test1,test2'); end; ``` -Example Function: ```sql select * from table(ut.run('hr.test_apply_bonus', a_tags => 'suite1')) ``` From d7c3a2f91b3b8e77f6f05850469b68c04ed26e32 Mon Sep 17 00:00:00 2001 From: pesse Date: Fri, 11 Oct 2019 18:10:20 +0200 Subject: [PATCH 0586/1096] Just trying to replace Java 9 with Java 11 --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7e9d94ccf..cf6c9be74 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,9 @@ addons: apt: packages: - unzip - # Java9 Required for Sonar and SQLCL - - oracle-java9-installer - - oracle-java9-set-default + # Java9+ Required for Sonar and SQLCL + - oracle-java11-installer + - oracle-java11-set-default sonarcloud: organization: utplsql token: From 0506cf16fb6628fb0c6b15b16f64faaae19f3846 Mon Sep 17 00:00:00 2001 From: pesse Date: Mon, 14 Oct 2019 08:53:53 +0200 Subject: [PATCH 0587/1096] Trying with OpenJDK instead --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cf6c9be74..67f9db5f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,7 @@ addons: packages: - unzip # Java9+ Required for Sonar and SQLCL - - oracle-java11-installer - - oracle-java11-set-default + - openjdk-9-jre-headless sonarcloud: organization: utplsql token: From 4252647ec6a2ca65a44a10cdf7e0148072f83fae Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 20 Oct 2019 13:10:46 +0100 Subject: [PATCH 0588/1096] Update cli version to 3.1.7 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 67f9db5f8..eaa76047e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,7 @@ env: #utPLSQL released version directory - UTPLSQL_DIR="utPLSQL_latest_release" - SELFTESTING_BRANCH=${TRAVIS_BRANCH} - - UTPLSQL_CLI_VERSION="3.1.6" + - UTPLSQL_CLI_VERSION="3.1.7" # Maven - MAVEN_HOME=/usr/local/maven - MAVEN_CFG=$HOME/.m2 From cdd7febf73aba4560b1ad95144e1ff38275effd4 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sun, 20 Oct 2019 12:59:16 +0000 Subject: [PATCH 0589/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 522b4a66b..f3ad589a7 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 7cb44d258..5d2ce212e 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 5e2518fa3..7bce22221 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 9d75e9e44..2ecaf6b9d 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index ebd934948..ec919ecf0 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 0d3240a32..940afbcf3 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 664bcfdb0..145d9e968 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 31c75489a..eb433554d 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 8d39ddca8..43aac6a78 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 8bc06049f..db8c25d02 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 9ea7a51fa..c3e7d7401 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 4d3b77711..3eb6179f5 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 69b3b2127..2ee30cb8b 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 3dfd1d3fb..7363f8e79 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 84b5cdaf6..2a2c61776 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index ce88c7889..280778636 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index bef70d5f7..727a748b7 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3211--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index d91c5e41d..30ff0f98e 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -766,7 +766,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.9.3211-develop + * secion v3.1.9.3226-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 14cb595fb..0896349cb 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.9.3211-develop'; + gc_version constant varchar2(50) := 'v3.1.9.3226-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From afca2482fbb59820709283373107d48c5df808a5 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 21 Oct 2019 00:31:45 +0100 Subject: [PATCH 0590/1096] Fixed broken doc link --- docs/compare_version2_to_3.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/compare_version2_to_3.md b/docs/compare_version2_to_3.md index 624bf0df8..5f53e41d4 100644 --- a/docs/compare_version2_to_3.md +++ b/docs/compare_version2_to_3.md @@ -25,7 +25,7 @@ There is a [migration tool](https://github.com/utPLSQL/utPLSQL-v2-v3-migration) | Auto Compilation of Tests | Yes | No (Let us know if you use this) | | Assertion Library | 30 assertions2 | 26 matchers (13 + 13 negated) | | Extendable assertions | No | Yes - custom matchers | -| PLSQL Record Assertions | generated code through **utRecEq** Package | [possible on Oracle 12c+](https://oracle-base.com/articles/12c/using-the-table-operator-with-locally-defined-types-in-plsql-12cr1) using [cursor matchers](docs/userguide/expectations.md#comparing-cursors)| +| PLSQL Record Assertions | generated code through **utRecEq** Package | [possible on Oracle 12c+](https://oracle-base.com/articles/12c/using-the-table-operator-with-locally-defined-types-in-plsql-12cr1) using [cursor matchers](userguide/expectations.md#comparing-cursors)| | Test Skeleton Generation | Yes | No (Let us know if you use this) | | **Test Execution3** | | | | Single Test Package Execution | Yes | Yes | From cdb6d3e40653ab30e0628cb11ab19dd2c926b60a Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 21 Oct 2019 00:01:25 +0100 Subject: [PATCH 0591/1096] Added ability to exclude items by tags. Resolves #983 --- docs/userguide/annotations.md | 66 ++++-- source/core/ut_suite_builder.pkb | 24 +- source/core/ut_suite_cache_manager.pkb | 40 +++- test/ut3_tester/core/test_suite_builder.pkb | 62 ++++- test/ut3_tester/core/test_suite_builder.pks | 238 ++++++++++---------- test/ut3_user/api/test_ut_run.pkb | 42 ++++ test/ut3_user/api/test_ut_run.pks | 107 +++++---- 7 files changed, 371 insertions(+), 208 deletions(-) diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 145d9e968..1d3f60d3c 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1225,11 +1225,11 @@ Finished in .035261 seconds ### Tags -Tag is a label attached to the test or a suite path. It is used for identification and execution a group of tests / suites that share same tag. +Tag is a label attached to the test or a suite. It is used for identification and execution a group of tests / suites that share same tag. -It allows us to group a tests / suites using a various categorization and place a test / suite in multiple buckets. Same tests can be group with other tests based on the functionality , frequency, type of output etc. +It allows for grouping of tests / suites using various categorization and place tests / suites in multiple buckets. Same tests can be grouped with other tests based on the functionality , frequency, type of output etc. -e.q. +e.g. ```sql --%tags(batch,daily,csv) @@ -1238,29 +1238,31 @@ e.q. or ```sql ---%tags(api,online,json) +--%tags(online,json) +--%tags(api) ``` +Tags are defined as a comma separated list within the `--%tags` annotation. +When executing a test run with tag filter applied, framework will find all tests associated with given tags and execute them. +Framework applies `OR` logic to all specified tags so any test / suite that matches at least one tag will be included in the test run. -Tags are defined as a coma separated list. When executing a test run with tag filter applied, framework will find all tests associated with given tags and execute them. Framework applies `OR` logic when resolving a tags so any tests / suites that match at least one tag will be included in the test run. +When a suite/context is tagged all of its children will automatically inherit a tag and get executed along with the parent. Parent suite tests are not executed, but a suitepath hierarchy is kept. -When a suite gets tagged all of its children will automatically inherit a tag and get executed along the parent. Parent suit tests are not executed. but a suitepath hierarchy is kept. - -Sample tag package. +Sample test suite package with tags. ```sql create or replace package ut_sample_test IS --%suite(Sample Test Suite) - --%tag(suite1) + --%tags(api) --%test(Compare Ref Cursors) - --%tag(test1,sample) + --%tags(complex,fast) procedure ut_refcursors1; --%test(Run equality test) - --%tag(test2,sample) + --%tags(simple,fast) procedure ut_test; end ut_sample_test; @@ -1290,28 +1292,42 @@ end ut_sample_test; Execution of the test is done by using a parameter `a_tags` ```sql -select * from table(ut.run(a_path => 'ut_sample_test',a_tags => 'suite1')); -select * from table(ut.run(a_tags => 'test1,test2')); -select * from table(ut.run(a_tags => 'sample')); +select * from table(ut.run(a_path => 'ut_sample_test',a_tags => 'api')); +``` +The above call will execute all tests from `ut_sample_test` package as the whole suite is tagged with `api` -begin - ut.run(a_path => 'ut_sample_test',a_tags => 'suite1'); -end; -/ +```sql +select * from table(ut.run(a_tags => 'complex')); +``` +The above call will execute only the `ut_sample_test.ut_refcursors1` test, as only the test `ut_refcursors1` is tagged with `complex` -exec ut.run('ut_sample_test', a_tags => 'sample'); +```sql +select * from table(ut.run(a_tags => 'fast')); ``` +The above call will execute both `ut_sample_test.ut_refcursors1` and `ut_sample_test.ut_test` tests, as both tests are tagged with `fast` + +#### Excluding tests/suites by tags +It is possible to exclude parts of test suites with tags. +In order to do so, prefix the tag name to exclude with a `-` (dash) sign when invoking the test run. +Examples (based on above sample test suite) -Tags should adhere to following rules: +```sql +select * from table(ut.run(a_tags => 'api,fast,-complex')); +``` +The above call will execute all suites/contexts/tests that are marked with any of tags `api` or `fast` except those suites/contexts/tests that are marked as `complex` +Given the above example package `ut_sample_test`, only `ut_sample_test.ut_test` will be executed. -- tags are case sensitive -- tags cannot be an empty string -- tags cannot contain spaces e.g. to create a multi-word `tag` please use underscores,dashes, dots etc. e.g. `test_of_batch` -- tags with empty spaces will be ignored during execution -- tags can contain special characters +**Note:** +Tags must follow the below naming convention: +- tag is case sensitive +- tag can contain special characters like `$#/\?-!` etc. +- tag cannot be an empty string +- tag cannot start with a dash e.g. `-some-stuff` is **not** a valid tag +- tag cannot contain spaces e.g. `test of batch`. To create a multi-word tag use underscores or dashes e.g. `test_of_batch`, `test-of-batch` +- leading and trailing spaces are ignored in tag name e.g. `--%tags( tag1 , tag2 )` becomes `tag1` and `tag2` tag names ### Suitepath diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index 101ab2179..111b77cbd 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -321,7 +321,8 @@ create or replace package body ut_suite_builder is a_procedure_name t_object_name := null ) is l_annotation_pos binary_integer; - l_tag_list ut_varchar2_list := ut_varchar2_list(); + l_tags_list ut_varchar2_list := ut_varchar2_list(); + l_tag_items ut_varchar2_list; begin l_annotation_pos := a_tags_ann_text.first; while l_annotation_pos is not null loop @@ -331,14 +332,25 @@ create or replace package body ut_suite_builder is || get_object_reference( a_suite, a_procedure_name, l_annotation_pos ) ); else - l_tag_list := l_tag_list multiset union distinct ut_utils.trim_list_elements( - ut_utils.string_to_table(a_tags_ann_text(l_annotation_pos),',') - ); + l_tag_items := ut_utils.trim_list_elements(ut_utils.string_to_table(a_tags_ann_text(l_annotation_pos),',')); + if l_tag_items is not empty then + for i in 1 .. l_tag_items.count loop + if regexp_like(l_tag_items(i),'^[^-](\S)+$') then + l_tags_list.extend(); + l_tags_list(l_tags_list.last) := l_tag_items(i); + else + a_suite.put_warning( + 'Invalid value "'||l_tag_items(i)||'" for "--%tags" annotation. See documentation for details on valid tag values. Annotation value ignored.' + || get_object_reference( a_suite, a_procedure_name, l_annotation_pos ) + ); + end if; + end loop; + end if; end if; l_annotation_pos := a_tags_ann_text.next(l_annotation_pos); end loop; - --remove empty strings from table list e.g. tag1,,tag2 and conver to rows - a_list := ut_utils.convert_collection( ut_utils.filter_list(l_tag_list,ut_utils.gc_word_no_space) ); + --remove empty strings from table list e.g. tag1,,tag2 and convert to rows + a_list := ut_utils.convert_collection( ut_utils.filter_list(set(l_tags_list),ut_utils.gc_word_no_space) ); end; procedure set_seq_no( diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index ef12e1def..6b080f528 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -30,8 +30,8 @@ create or replace package body ut_suite_cache_manager is and ( {:path:} and {:object_name:} and {:procedure_name:} + ) ) - ) ), {:tags:} suitepaths as ( @@ -106,8 +106,8 @@ create or replace package body ut_suite_cache_manager is function get_path_sql(a_path in varchar2) return varchar2 is begin return case when a_path is not null then q'[ - :l_path||'.' like c.path || '.%' /*all children and self*/ - or ( c.path||'.' like :l_path || '.%' --all parents + :l_path||'.' like c.path || '.%' /*all parents and self*/ + or ( c.path||'.' like :l_path || '.%' /*all children and self*/ ]' else ' :l_path is null and ( :l_path is null ' end; end; @@ -129,22 +129,40 @@ create or replace package body ut_suite_cache_manager is function get_tags_sql(a_tags_count in integer) return varchar2 is begin return case when a_tags_count > 0 then - q'[filter_tags as ( + q'[included_tags as ( select c.obj.path as path from suite_items c - where c.obj.tags multiset intersect :a_tag_list is not empty - ), + where exists ( + select * from table(c.obj.tags) + intersect + select * from table(:a_tag_list) where column_value not like '-%' + ) + or 0 = (select count(*) from table(:a_tag_list) where column_value not like '-%') + ), + excluded_tags as ( + select c.obj.path as path + from suite_items c + where exists ( + select * from table(c.obj.tags) + intersect + select ltrim(column_value,'-') from table(:a_tag_list) where column_value like '-%' + ) + ), suite_items_tags as ( select c.* from suite_items c where exists ( - select 1 from filter_tags t - where t.path||'.' like c.obj.path || '.%' /*all children and self*/ - or c.obj.path||'.' like t.path || '.%' --all parents + select 1 from included_tags t + where t.path||'.' like c.obj.path || '.%' /*all parents and self*/ + or c.obj.path||'.' like t.path || '.%' /*all children and self*/ + ) + and not exists ( + select 1 from excluded_tags t + where c.obj.path||'.' like t.path || '.%' /*all children and self*/ ) ),]' else - q'[dummy as (select 'x' from dual where :a_tag_list is null ),]' + q'[dummy as (select 'x' from dual where :a_tag_list is null and :a_tag_list is null and :a_tag_list is null),]' end; end; @@ -216,7 +234,7 @@ create or replace package body ut_suite_cache_manager is execute immediate l_sql bulk collect into l_results - using upper(l_object_owner), l_path, l_path, upper(a_object_name), upper(a_procedure_name), l_tags, a_random_seed; + using upper(l_object_owner), l_path, l_path, upper(a_object_name), upper(a_procedure_name), l_tags, l_tags, l_tags, a_random_seed; return l_results; end; diff --git a/test/ut3_tester/core/test_suite_builder.pkb b/test/ut3_tester/core/test_suite_builder.pkb index b49ecb2da..5f8b66ba8 100644 --- a/test/ut3_tester/core/test_suite_builder.pkb +++ b/test/ut3_tester/core/test_suite_builder.pkb @@ -1431,7 +1431,67 @@ create or replace package body test_suite_builder is '%%' ); - end; + end; + + procedure test_spaces_in_tag is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(2, 'suite','testsuite', null), + ut3.ut_annotation(3, 'tags',' good_tag , bad tag , good-tag ', null), + ut3.ut_annotation(8, 'test','Some test', 'test_procedure'), + ut3.ut_annotation(9, 'tags',' good_tag , bad tag , good-tag ', 'test_procedure') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%good_taggood-tag%'|| + 'good_taggood-tag%' + ); + ut.expect(l_actual).to_be_like( + '%Invalid value "bad tag" for "--%tags" annotation.'|| + ' See documentation for details on valid tag values. Annotation value ignored. +at package "UT3_TESTER.SOME_PACKAGE", line 3%' + ); + ut.expect(l_actual).to_be_like( + '%Invalid value "bad tag" for "--%tags" annotation.'|| + ' See documentation for details on valid tag values. Annotation value ignored. +at package "UT3_TESTER.SOME_PACKAGE.TEST_PROCEDURE", line 9%' + ); + end; + + procedure test_minus_in_tag is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(2, 'suite','testsuite', null), + ut3.ut_annotation(3, 'tags',' good_tag , -invalid_tag , good-tag ', null), + ut3.ut_annotation(8, 'test','Some test', 'test_procedure'), + ut3.ut_annotation(9, 'tags',' good_tag , -invalid_tag , good-tag ', 'test_procedure') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%good_taggood-tag%'|| + 'good_taggood-tag%' + ); + ut.expect(l_actual).to_be_like( + '%Invalid value "-invalid_tag" for "--%tags" annotation.'|| + ' See documentation for details on valid tag values. Annotation value ignored. +at package "UT3_TESTER.SOME_PACKAGE", line 3%' + ); + ut.expect(l_actual).to_be_like( + '%Invalid value "-invalid_tag" for "--%tags" annotation.'|| + ' See documentation for details on valid tag values. Annotation value ignored. +at package "UT3_TESTER.SOME_PACKAGE.TEST_PROCEDURE", line 9%' + ); + end; end test_suite_builder; / diff --git a/test/ut3_tester/core/test_suite_builder.pks b/test/ut3_tester/core/test_suite_builder.pks index 721db153f..fdf10b38d 100644 --- a/test/ut3_tester/core/test_suite_builder.pks +++ b/test/ut3_tester/core/test_suite_builder.pks @@ -5,218 +5,224 @@ create or replace package test_suite_builder is --%context(suite) --%displayname(--%suite annotation) - --%test(Sets suite name from package name and leaves description empty) - procedure no_suite_description; + --%test(Sets suite name from package name and leaves description empty) + procedure no_suite_description; - --%test(Sets suite description using first --%suite annotation) - procedure suite_description_from_suite; + --%test(Sets suite description using first --%suite annotation) + procedure suite_description_from_suite; - --%test(Gives warning if more than one --%suite annotation used) - procedure suite_annot_duplicated; + --%test(Gives warning if more than one --%suite annotation used) + procedure suite_annot_duplicated; --%endcontext --%context(displayname) --%displayname(--%displayname annotation) - --%test(Overrides suite description using first --%displayname annotation) - procedure suite_descr_from_displayname; + --%test(Overrides suite description using first --%displayname annotation) + procedure suite_descr_from_displayname; - --%test(Gives warning if more than one --%displayname annotation used) - procedure displayname_annot_duplicated; + --%test(Gives warning if more than one --%displayname annotation used) + procedure displayname_annot_duplicated; - --%test(Gives warning if --%displayname annotation has no value) - procedure displayname_annot_empty; + --%test(Gives warning if --%displayname annotation has no value) + procedure displayname_annot_empty; --%endcontext --%context(test) --%displayname(--%test annotation) - --%test(Creates a test item for procedure annotated with --%test annotation) - procedure test_annotation; + --%test(Creates a test item for procedure annotated with --%test annotation) + procedure test_annotation; - --%test(Gives warning if more than one --%test annotation used) - procedure test_annot_duplicated; + --%test(Gives warning if more than one --%test annotation used) + procedure test_annot_duplicated; - --%test(Is added to suite according to annotation order in package spec) - procedure test_annotation_ordering; + --%test(Is added to suite according to annotation order in package spec) + procedure test_annotation_ordering; --%endcontext --%context(suitepath) --%displayname(--%suitepath annotation) - --%test(Sets suite path using first --%suitepath annotation) - procedure suitepath_from_non_empty_path; + --%test(Sets suite path using first --%suitepath annotation) + procedure suitepath_from_non_empty_path; - --%test(Gives warning if more than one --%suitepath annotation used) - procedure suitepath_annot_duplicated; + --%test(Gives warning if more than one --%suitepath annotation used) + procedure suitepath_annot_duplicated; - --%test(Gives warning if --%suitepath annotation has no value) - procedure suitepath_annot_empty; + --%test(Gives warning if --%suitepath annotation has no value) + procedure suitepath_annot_empty; - --%test(Gives warning if --%suitepath annotation has invalid value) - procedure suitepath_annot_invalid_path; + --%test(Gives warning if --%suitepath annotation has invalid value) + procedure suitepath_annot_invalid_path; --%endcontext --%context(rollback) --%displayname(--%rollback annotation) - --%test(Sets rollback type using first --%rollback annotation) - procedure rollback_type_valid; + --%test(Sets rollback type using first --%rollback annotation) + procedure rollback_type_valid; - --%test(Gives warning if more than one --%rollback annotation used) - procedure rollback_type_duplicated; + --%test(Gives warning if more than one --%rollback annotation used) + procedure rollback_type_duplicated; - --%test(Gives warning if --%rollback annotation has no value) - procedure rollback_type_empty; + --%test(Gives warning if --%rollback annotation has no value) + procedure rollback_type_empty; - --%test(Gives warning if --%rollback annotation has invalid value) - procedure rollback_type_invalid; + --%test(Gives warning if --%rollback annotation has invalid value) + procedure rollback_type_invalid; --%endcontext --%context(before_after_all_each) --%displayname(--%before/after all/each annotations) - --%test(Supports multiple before/after all/each procedure level definitions) - procedure multiple_before_after; + --%test(Supports multiple before/after all/each procedure level definitions) + procedure multiple_before_after; - --%test(Supports multiple before/after all/each standalone level definitions) - procedure multiple_standalone_bef_aft; + --%test(Supports multiple before/after all/each standalone level definitions) + procedure multiple_standalone_bef_aft; - --%test(Supports mixing before/after all/each annotations on single procedure) - procedure before_after_on_single_proc; + --%test(Supports mixing before/after all/each annotations on single procedure) + procedure before_after_on_single_proc; - --%test(Supports mixed before/after all/each as standalone and procedure level definitions) - procedure multiple_mixed_bef_aft; + --%test(Supports mixed before/after all/each as standalone and procedure level definitions) + procedure multiple_mixed_bef_aft; - --%test(Gives warning if more than one --%beforeall annotation used on procedure) - procedure beforeall_annot_duplicated; + --%test(Gives warning if more than one --%beforeall annotation used on procedure) + procedure beforeall_annot_duplicated; - --%test(Gives warning if more than one --%beforeeach annotation used on procedure) - procedure beforeeach_annot_duplicated; + --%test(Gives warning if more than one --%beforeeach annotation used on procedure) + procedure beforeeach_annot_duplicated; - --%test(Gives warning if more than one --%afterall annotation used on procedure) - procedure afterall_annot_duplicated; + --%test(Gives warning if more than one --%afterall annotation used on procedure) + procedure afterall_annot_duplicated; - --%test(Gives warning if more than one --%aftereach annotation used on procedure) - procedure aftereach_annot_duplicated; + --%test(Gives warning if more than one --%aftereach annotation used on procedure) + procedure aftereach_annot_duplicated; - --%test(Gives warning on before/after all/each annotations mixed with test) - procedure before_after_mixed_with_test; + --%test(Gives warning on before/after all/each annotations mixed with test) + procedure before_after_mixed_with_test; --%endcontext --%context(context) --%displayname(--%context annotation) - --%test(Creates nested suite for content between context/endcontext annotations) - procedure suite_from_context; + --%test(Creates nested suite for content between context/endcontext annotations) + procedure suite_from_context; - --%test(Associates before/after all/each to tests in context only) - procedure before_after_in_context; + --%test(Associates before/after all/each to tests in context only) + procedure before_after_in_context; - --%test(Propagates beforeeach/aftereach to context) - procedure before_after_out_of_context; + --%test(Propagates beforeeach/aftereach to context) + procedure before_after_out_of_context; - --%test(Does not create context and gives warning when endcontext is missing) - procedure context_without_endcontext; + --%test(Does not create context and gives warning when endcontext is missing) + procedure context_without_endcontext; - --%test(Gives warning if --%endcontext is missing a preceding --%context) - procedure endcontext_without_context; + --%test(Gives warning if --%endcontext is missing a preceding --%context) + procedure endcontext_without_context; - --%test(Gives warning when two contexts have the same name and ignores duplicated context) - procedure duplicate_context_name; + --%test(Gives warning when two contexts have the same name and ignores duplicated context) + procedure duplicate_context_name; --%endcontext --%context(throws) --%displayname(--%throws annotation) - --%test(Gives warning if --%throws annotation has no value) - procedure throws_value_empty; + --%test(Gives warning if --%throws annotation has no value) + procedure throws_value_empty; - --%test(Gives warning if --%throws annotation has invalid value) - procedure throws_value_invalid; + --%test(Gives warning if --%throws annotation has invalid value) + procedure throws_value_invalid; --%endcontext --%context(beforetest_aftertest) --%displayname(--%beforetest/aftertest annotation) - --%test(Supports multiple occurrences of beforetest/aftertest for a test) - procedure before_aftertest_multi; + --%test(Supports multiple occurrences of beforetest/aftertest for a test) + procedure before_aftertest_multi; - --%test(Supports same procedure defined twice) - procedure before_aftertest_twice; + --%test(Supports same procedure defined twice) + procedure before_aftertest_twice; - --%test(Supports beforetest from external package) - procedure before_aftertest_pkg_proc; + --%test(Supports beforetest from external package) + procedure before_aftertest_pkg_proc; - --%test(Supports mix of procedure and package.procedure) - procedure before_aftertest_mixed_syntax; + --%test(Supports mix of procedure and package.procedure) + procedure before_aftertest_mixed_syntax; --%endcontext --%context(unknown_annotation) --%displayname(--%bad_annotation) - --%test(Gives warning when unknown procedure level annotation passed) - procedure test_bad_procedure_annotation; + --%test(Gives warning when unknown procedure level annotation passed) + procedure test_bad_procedure_annotation; - --%test(Gives warning when unknown package level annotation passed) - procedure test_bad_package_annotation; + --%test(Gives warning when unknown package level annotation passed) + procedure test_bad_package_annotation; --%endcontext --%context(tags_annotation) --%displayname(--%tag_annotation) - --%test(Build suite test with tag) - procedure test_tag_annotation; + --%test(Build suite test with tag) + procedure test_tag_annotation; - --%test(Build suite with tag) - procedure suite_tag_annotation; + --%test(Build suite with tag) + procedure suite_tag_annotation; - --%test(Build suite test with three tags) - procedure test_tags_annotation; - - --%test(Build suite with three tags) - procedure suite_tags_annotation; + --%test(Build suite test with three tags) + procedure test_tags_annotation; - --%test(Build suite test with two line tag annotation) - procedure test_2line_tags_annotation; - - --%test(Build suite with two line tag annotation) - procedure suite_2line_tags_annotation; + --%test(Build suite with three tags) + procedure suite_tags_annotation; - --%test(Build suite test with empty line tag annotation) - procedure test_empty_tag; - - --%test(Build suite with empty line tag annotation) - procedure suite_empty_tag; - - --%test(Build suite test with duplicate tag annotation) - procedure test_duplicate_tag; - - --%test(Build suite with duplicate tag annotation) - procedure suite_duplicate_tag; + --%test(Build suite test with two line tag annotation) + procedure test_2line_tags_annotation; - --%test(Build suite test with empty between tag annotation) - procedure test_empty_tag_between; - - --%test(Build suite with empty between tag annotation) - procedure suite_empty_tag_between; + --%test(Build suite with two line tag annotation) + procedure suite_2line_tags_annotation; + + --%test(Build suite test with empty line tag annotation) + procedure test_empty_tag; + + --%test(Build suite with empty line tag annotation) + procedure suite_empty_tag; + + --%test(Build suite test with duplicate tag annotation) + procedure test_duplicate_tag; + + --%test(Build suite with duplicate tag annotation) + procedure suite_duplicate_tag; + + --%test(Build suite test with empty between tag annotation) + procedure test_empty_tag_between; + + --%test(Build suite with empty between tag annotation) + procedure suite_empty_tag_between; + + --%test(Build suite test with special char tag annotation) + procedure test_special_char_tag; + + --%test(Build suite with special char tag annotation) + procedure suite_special_char_tag; + + --%test(Raise warning and ignore tag with spaces in tag name) + procedure test_spaces_in_tag; + + --%test(Raise warning and ignore tag starting ith '-') + procedure test_minus_in_tag; - --%test(Build suite test with special char tag annotation) - procedure test_special_char_tag; - - --%test(Build suite with special char tag annotation) - procedure suite_special_char_tag; - --%endcontext end test_suite_builder; diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index 329b71357..53a819299 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -1021,6 +1021,48 @@ Failures:% ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_3%' ); end; + procedure tag_inc_exc_run_func_path_list is + l_results ut3.ut_varchar2_list; + begin + l_results := ut3_tester_helper.run_helper.run(ut3.ut_varchar2_list(':tests.test_package_1',':tests'),a_tags => 'suite1test1,suite2test1,-suite2'); + --Assert + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1.test1%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_1.test2%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_3%' ); + end; + + procedure tag_exclude_run_func_path_list is + l_results ut3.ut_varchar2_list; + begin + l_results := ut3_tester_helper.run_helper.run(ut3.ut_varchar2_list(':tests,:tests2'),a_tags => '-suite1test2,-suite2test1,-test1suite3'); + --Assert + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_2%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_3%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1.test1%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_1.test2%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2.test1%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_2.test2%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_3.test1%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_3.test2%executed%' ); + end; + + procedure tag_include_exclude_run_func is + l_results ut3.ut_varchar2_list; + begin + l_results := ut3_tester_helper.run_helper.run(a_tags => 'suite1,-suite1test2,-suite2test1,-test1suite3'); + --Assert + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_2%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_3%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1.test1%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_1.test2%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2.test1%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_2.test2%executed%' ); + end; + procedure set_application_info is begin dbms_application_info.set_module( gc_module, gc_action ); diff --git a/test/ut3_user/api/test_ut_run.pks b/test/ut3_user/api/test_ut_run.pks index 38a6eee2c..ac2e50e25 100644 --- a/test/ut3_user/api/test_ut_run.pks +++ b/test/ut3_user/api/test_ut_run.pks @@ -175,59 +175,68 @@ create or replace package test_ut_run is --%endcontext --%context(run with tags) - --%displayname(Call ut.run with #tags) - --%beforeall(create_ut3$user#_tests) - --%afterall(drop_ut3$user#_tests) - - --%test(Execute test by tag ut_run) - procedure test_run_by_one_tag; - - --%test( Execute suite by one tag) - procedure suite_run_by_one_tag; - - --%test(Execute two tests by one tag) - procedure two_test_run_by_one_tag; - - --%test(Execute all suites tests with tag) - procedure all_suites_run_by_one_tag; - - --%test(Execute tests by passing two tags) - procedure two_test_run_by_two_tags; - - --%test(Execute suite and all of its children) - procedure suite_with_children_tag; - - --%test(Execute suite and parents) - procedure suite_with_tag_parent; - - --%test(Execute test for non existing tag) - procedure test_nonexists_tag; - - --%test(Execute test for duplicate list tags) - procedure test_duplicate_tag; - - --%test(Execute suite test for duplicate list tags) - procedure suite_duplicate_tag; - --%test(Runs given package only with package name given as path and filter by tag) - procedure run_proc_pkg_name_tag; - - --%test(Runs all from given package with package name given as path and coverage file list with tag) - procedure run_pkg_name_file_list_tag; - - --%test(Runs tests from given paths with paths list and tag) - procedure run_proc_path_list_tag; - - --%test(Runs all tests in current schema with default reporter when only tag is given) - procedure tag_run_func_no_params; + --%beforeall(create_ut3$user#_tests) + --%afterall(drop_ut3$user#_tests) + + --%test(Execute test by tag ut_run) + procedure test_run_by_one_tag; + + --%test( Execute suite by one tag) + procedure suite_run_by_one_tag; + + --%test(Execute two tests by one tag) + procedure two_test_run_by_one_tag; + + --%test(Execute all suites tests with tag) + procedure all_suites_run_by_one_tag; + + --%test(Execute tests by passing two tags) + procedure two_test_run_by_two_tags; + + --%test(Execute suite and all of its children) + procedure suite_with_children_tag; + + --%test(Execute suite and parents) + procedure suite_with_tag_parent; + + --%test(Execute test for non existing tag) + procedure test_nonexists_tag; + + --%test(Execute test for duplicate list tags) + procedure test_duplicate_tag; + + --%test(Execute suite test for duplicate list tags) + procedure suite_duplicate_tag; + + --%test(Runs given package only with package name given as path and filter by tag) + procedure run_proc_pkg_name_tag; + + --%test(Runs all from given package with package name given as path and coverage file list with tag) + procedure run_pkg_name_file_list_tag; + + --%test(Runs tests from given paths with paths list and tag) + procedure run_proc_path_list_tag; + + --%test(Runs all tests in current schema with default reporter when only tag is given) + procedure tag_run_func_no_params; + + --%test(Runs given package only with package name given as path and filter by tag) + procedure tag_run_func_pkg_name; + + --%test(Runs tests from given paths with paths list and a tag) + procedure tag_run_func_path_list; + + --%test(Runs tests from given paths with paths list and include/exclude tags) + procedure tag_inc_exc_run_func_path_list; + + --%test(Runs tests from given path and excludes specific tags) + procedure tag_exclude_run_func_path_list; - --%test(Runs given package only with package name given as path and filter by tag) - procedure tag_run_func_pkg_name; + --%test(Runs tests from given tags and exclude tags) + procedure tag_include_exclude_run_func; - --%test(Runs tests from given paths with paths list and a tag) - procedure tag_run_func_path_list; - --%endcontext --%context(ut3_info context) From 0d64c080b614a62680e6440ff262e7f2b6788de3 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 21 Oct 2019 01:10:45 +0100 Subject: [PATCH 0592/1096] Changed syntax to avoid Oracle internal errors on 11.2 and 12.1 --- source/core/ut_suite_cache_manager.pkb | 30 +++++++++++++++----------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index 6b080f528..f52d15bf7 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -132,21 +132,12 @@ create or replace package body ut_suite_cache_manager is q'[included_tags as ( select c.obj.path as path from suite_items c - where exists ( - select * from table(c.obj.tags) - intersect - select * from table(:a_tag_list) where column_value not like '-%' - ) - or 0 = (select count(*) from table(:a_tag_list) where column_value not like '-%') + where c.obj.tags multiset intersect :a_include_tag_list is not empty or :a_include_tag_list is empty ), excluded_tags as ( select c.obj.path as path from suite_items c - where exists ( - select * from table(c.obj.tags) - intersect - select ltrim(column_value,'-') from table(:a_tag_list) where column_value like '-%' - ) + where c.obj.tags multiset intersect :a_exclude_tag_list is not empty ), suite_items_tags as ( select c.* @@ -162,7 +153,7 @@ create or replace package body ut_suite_cache_manager is ) ),]' else - q'[dummy as (select 'x' from dual where :a_tag_list is null and :a_tag_list is null and :a_tag_list is null),]' + q'[dummy as (select 'x' from dual where :a_include_tag_list is null and :a_include_tag_list is null and :a_exclude_tag_list is null),]' end; end; @@ -205,10 +196,23 @@ create or replace package body ut_suite_cache_manager is l_sql varchar2(32767); l_suite_item_name varchar2(20); l_tags ut_varchar2_rows := coalesce(a_tags,ut_varchar2_rows()); + l_include_tags ut_varchar2_rows; + l_exclude_tags ut_varchar2_rows; l_object_owner varchar2(250) := ut_utils.qualified_sql_name(a_object_owner); l_object_name varchar2(250) := ut_utils.qualified_sql_name(a_object_name); l_procedure_name varchar2(250) := ut_utils.qualified_sql_name(a_procedure_name); begin + + select column_value + bulk collect into l_include_tags + from table(l_tags) + where column_value not like '-%'; + + select ltrim(column_value,'-') + bulk collect into l_exclude_tags + from table(l_tags) + where column_value like '-%'; + if a_path is null and a_object_name is not null then select min(c.path) into l_path @@ -234,7 +238,7 @@ create or replace package body ut_suite_cache_manager is execute immediate l_sql bulk collect into l_results - using upper(l_object_owner), l_path, l_path, upper(a_object_name), upper(a_procedure_name), l_tags, l_tags, l_tags, a_random_seed; + using upper(l_object_owner), l_path, l_path, upper(a_object_name), upper(a_procedure_name), l_include_tags, l_include_tags, l_exclude_tags, a_random_seed; return l_results; end; From 68e625fdf38f17f8986b0d257d588b643d253b8c Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 21 Oct 2019 00:53:40 +0000 Subject: [PATCH 0593/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index f3ad589a7..78e7232cc 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 5d2ce212e..26ab66407 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 7bce22221..68e62c388 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 2ecaf6b9d..86a0d5455 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index cc3e79595..6fbd6b988 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 940afbcf3..51ad19b30 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 145d9e968..b034e81db 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index eb433554d..58e60b83c 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 43aac6a78..3db4fb779 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index db8c25d02..4fff8cb3a 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index c3e7d7401..71d268fe3 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 3eb6179f5..e193548be 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 2ee30cb8b..1c9a61900 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 7363f8e79..9fdc6f82a 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 2a2c61776..c1b89c1b2 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 628ff38a5..9d5fc3bdd 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 727a748b7..6276c7dcc 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3226--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 30ff0f98e..df65dfaf5 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -766,7 +766,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.9.3226-develop + * secion v3.1.9.3237-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 0896349cb..84277737d 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.9.3226-develop'; + gc_version constant varchar2(50) := 'v3.1.9.3237-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From f48e7e5722c744938b0a079695f94c7596f12df9 Mon Sep 17 00:00:00 2001 From: pesse Date: Tue, 22 Oct 2019 08:49:13 +0200 Subject: [PATCH 0594/1096] Improve documentation around tags --- docs/userguide/annotations.md | 35 +++++++++++++++------------- docs/userguide/running-unit-tests.md | 10 ++++++-- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 3578765dc..35ed7d778 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1225,7 +1225,7 @@ Finished in .035261 seconds ### Tags -Tag is a label attached to the test or a suite. It is used for identification and execution a group of tests / suites that share same tag. +Tag is a label attached to the test or a suite. It is used for identification and execution of a group of tests / suites that share the same tag. It allows for grouping of tests / suites using various categorization and place tests / suites in multiple buckets. Same tests can be grouped with other tests based on the functionality , frequency, type of output etc. @@ -1244,15 +1244,15 @@ or Tags are defined as a comma separated list within the `--%tags` annotation. -When executing a test run with tag filter applied, framework will find all tests associated with given tags and execute them. -Framework applies `OR` logic to all specified tags so any test / suite that matches at least one tag will be included in the test run. +When executing a test run with tag filter applied, the framework will find all tests associated with the given tags and execute them. +The framework applies `OR` logic to all specified tags so any test / suite that matches at least one tag will be included in the test run. -When a suite/context is tagged all of its children will automatically inherit a tag and get executed along with the parent. Parent suite tests are not executed, but a suitepath hierarchy is kept. +When a suite/context is tagged, all of its children will automatically inherit the tag and get executed along with the parent. Parent suite tests are not executed, but a suitepath hierarchy is kept. Sample test suite package with tags. ```sql -create or replace package ut_sample_test IS +create or replace package ut_sample_test is --%suite(Sample Test Suite) --%tags(api) @@ -1289,7 +1289,7 @@ end ut_sample_test; / ``` -Execution of the test is done by using a parameter `a_tags` +Execution of the test is done by using the parameter `a_tags` ```sql select * from table(ut.run(a_path => 'ut_sample_test',a_tags => 'api')); @@ -1306,6 +1306,18 @@ select * from table(ut.run(a_tags => 'fast')); ``` The above call will execute both `ut_sample_test.ut_refcursors1` and `ut_sample_test.ut_test` tests, as both tests are tagged with `fast` +#### Tag naming convention + +Tags must follow the below naming convention: + +- tag is case sensitive +- tag can contain special characters like `$#/\?-!` etc. +- tag cannot be an empty string +- tag cannot start with a dash, e.g. `-some-stuff` is **not** a valid tag +- tag cannot contain spaces, e.g. `test of batch`. To create a multi-word tag use underscores or dashes, e.g. `test_of_batch`, `test-of-batch` +- leading and trailing spaces are ignored in tag name, e.g. `--%tags( tag1 , tag2 )` becomes `tag1` and `tag2` tag names + + #### Excluding tests/suites by tags It is possible to exclude parts of test suites with tags. @@ -1316,18 +1328,9 @@ Examples (based on above sample test suite) ```sql select * from table(ut.run(a_tags => 'api,fast,-complex')); ``` -The above call will execute all suites/contexts/tests that are marked with any of tags `api` or `fast` except those suites/contexts/tests that are marked as `complex` +The above call will execute all suites/contexts/tests that are marked with any of tags `api` or `fast` except those suites/contexts/tests that are marked as `complex`. Given the above example package `ut_sample_test`, only `ut_sample_test.ut_test` will be executed. -**Note:** -Tags must follow the below naming convention: - -- tag is case sensitive -- tag can contain special characters like `$#/\?-!` etc. -- tag cannot be an empty string -- tag cannot start with a dash e.g. `-some-stuff` is **not** a valid tag -- tag cannot contain spaces e.g. `test of batch`. To create a multi-word tag use underscores or dashes e.g. `test_of_batch`, `test-of-batch` -- leading and trailing spaces are ignored in tag name e.g. `--%tags( tag1 , tag2 )` becomes `tag1` and `tag2` tag names ### Suitepath diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 9d5fc3bdd..63dc32485 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -284,8 +284,9 @@ select * from table(ut.run('hr.test_apply_bonus', a_random_test_order_seed => 30 # Run by Tags -In addition to the path, you can filter the tests to be run by specifying tags. Tags are defined in the test with the `--%tags`-annotation ([Read more](annotations.md#tags)). -Multiple tags are separated by comma. If multiple tags are set, all tests with __any__ of them specified are run. +In addition to the path, you can filter the tests to be run by specifying tags. Tags are defined in the test / context / suite with the `--%tags`-annotation ([Read more](annotations.md#tags)). +Multiple tags are separated by comma. +The framework applies `OR` logic to all specified tags so any test / suite that matches at least one tag will be included in the test run. ```sql begin @@ -296,6 +297,11 @@ end; select * from table(ut.run('hr.test_apply_bonus', a_tags => 'suite1')) ``` +You can also exclude specific tags by adding a `-` (dash) in front of the tag + +```sql +select * from table(ut.run('hr.test_apply_bonus', a_tags => '-suite1')) +``` # Keeping uncommitted data after test-run From 2caa749327e714617169d51b9cb6460051ab193c Mon Sep 17 00:00:00 2001 From: pesse Date: Tue, 22 Oct 2019 22:14:44 +0200 Subject: [PATCH 0595/1096] Use cli 3.1.8 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index eaa76047e..e11a3ca3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,7 @@ env: #utPLSQL released version directory - UTPLSQL_DIR="utPLSQL_latest_release" - SELFTESTING_BRANCH=${TRAVIS_BRANCH} - - UTPLSQL_CLI_VERSION="3.1.7" + - UTPLSQL_CLI_VERSION="3.1.8" # Maven - MAVEN_HOME=/usr/local/maven - MAVEN_CFG=$HOME/.m2 From eebfba035b96346e49def5d82fdb2c6743419749 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 23 Oct 2019 01:44:31 +0100 Subject: [PATCH 0596/1096] Added support for nested contexts. TODO - review & update documentation & examples. --- source/core/ut_suite_builder.pkb | 61 ++++--- test/ut3_tester/core/test_suite_builder.pkb | 176 +++++++++++++++----- test/ut3_tester/core/test_suite_builder.pks | 3 + test/ut3_user/api/test_ut_run.pkb | 2 +- 4 files changed, 171 insertions(+), 71 deletions(-) diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index 101ab2179..fc3e72e60 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -625,7 +625,7 @@ create or replace package body ut_suite_builder is a_suite.path := lower(coalesce(a_suite.path, a_suite.object_name)); end; - procedure add_suite_tests( + procedure add_tests_to_items( a_suite in out nocopy ut_suite, a_annotations t_annotations_info, a_suite_items in out nocopy ut_suite_items @@ -738,7 +738,8 @@ create or replace package body ut_suite_builder is procedure get_suite_contexts_items( a_suite in out nocopy ut_suite, a_annotations in out nocopy t_annotations_info, - a_suite_items out nocopy ut_suite_items + a_suite_items out nocopy ut_suite_items, + a_parent_context_pos in integer := 0 ) is l_context_pos t_annotation_position; l_end_context_pos t_annotation_position; @@ -755,35 +756,43 @@ create or replace package body ut_suite_builder is return; end if; - l_context_pos := a_annotations.by_name( gc_context).first; + l_context_pos := a_annotations.by_name( gc_context).next(a_parent_context_pos); while l_context_pos is not null loop l_end_context_pos := get_endcontext_position(l_context_pos, a_annotations.by_name ); + + l_context_name := coalesce( a_annotations.by_line( l_context_pos ).text, gc_context||'_'||l_context_no ); + l_context := ut_suite_context(a_suite.object_owner, a_suite.object_name, l_context_name, l_context_pos ); + l_context.path := a_suite.path||'.'||l_context_name; + l_context.description := a_annotations.by_line( l_context_pos ).text; + l_context.parse_time := a_annotations.parse_time; + + --if nested context found + if a_annotations.by_name(gc_context).next(l_context_pos) < l_end_context_pos or l_end_context_pos is null then + get_suite_contexts_items( l_context, a_annotations, l_context_items, l_context_pos ); + l_end_context_pos := get_endcontext_position(l_context_pos, a_annotations.by_name ); + else + l_context_items := ut_suite_items(); + end if; - exit when l_end_context_pos is null; + if l_end_context_pos is null then + a_suite.put_warning( + 'Missing "--%endcontext" annotation for a "--%context" annotation. The end of package specification is effective end of context.'|| get_object_reference( a_suite, null, l_context_pos ) + ); + l_end_context_pos := a_annotations.by_line.last; + end if; - l_context_items := ut_suite_items(); --create a sub-set of annotations to process as sub-suite (context) - l_ctx_annotations := get_annotations_in_context( a_annotations, l_context_pos, l_end_context_pos); + l_ctx_annotations := get_annotations_in_context( a_annotations, l_context_pos, l_end_context_pos); - l_context_name := coalesce( - l_ctx_annotations.by_line( l_context_pos ).text - , gc_context||'_'||l_context_no - ); if l_context_names.exists(l_context_name) then add_annotation_ignored_warning( a_suite, 'context', 'Context name must be unique in a suite. Context and all of it''s content ignored.', l_context_pos ); else l_context_names(l_context_name) := true; - l_context := ut_suite_context(a_suite.object_owner, a_suite.object_name, l_context_name, l_context_pos ); - - l_context.path := a_suite.path||'.'||l_context_name; - l_context.description := l_ctx_annotations.by_line( l_context_pos ).text; - l_context.parse_time := a_annotations.parse_time; - warning_on_duplicate_annot( l_context, l_ctx_annotations.by_name, gc_context ); - add_suite_tests( l_context, l_ctx_annotations, l_context_items ); + add_tests_to_items( l_context, l_ctx_annotations, l_context_items ); add_items_to_list(a_suite_items, l_context_items); a_suite_items.extend; a_suite_items(a_suite_items.last) := l_context; @@ -798,27 +807,17 @@ create or replace package body ut_suite_builder is end loop; end; - procedure warning_on_incomplete_context( + procedure warning_on_floating_endcontext( a_suite in out nocopy ut_suite, a_package_ann_index tt_annotations_by_name ) is l_annotation_pos t_annotation_position; begin - if a_package_ann_index.exists(gc_context) then - l_annotation_pos := a_package_ann_index(gc_context).first; - while l_annotation_pos is not null loop - add_annotation_ignored_warning( - a_suite, gc_context, 'Invalid annotation %%%. Cannot find following "--%endcontext".', - l_annotation_pos - ); - l_annotation_pos := a_package_ann_index(gc_context).next(l_annotation_pos); - end loop; - end if; if a_package_ann_index.exists(gc_endcontext) then l_annotation_pos := a_package_ann_index(gc_endcontext).first; while l_annotation_pos is not null loop add_annotation_ignored_warning( - a_suite, gc_endcontext, 'Invalid annotation %%%. Cannot find preceding "--%context".', + a_suite, gc_endcontext, 'Extra %%% annotation found. Cannot find corresponding "--%context".', l_annotation_pos ); l_annotation_pos := a_package_ann_index(gc_endcontext).next(l_annotation_pos); @@ -891,10 +890,10 @@ create or replace package body ut_suite_builder is build_suitepath( l_suite, l_annotations ); get_suite_contexts_items( l_suite, l_annotations, a_suite_items ); --create suite tests and add - add_suite_tests( l_suite, l_annotations, a_suite_items ); + add_tests_to_items( l_suite, l_annotations, a_suite_items ); --by this time all contexts were consumed and l_annotations should not have any context/endcontext annotation in it. - warning_on_incomplete_context( l_suite, l_annotations.by_name ); + warning_on_floating_endcontext( l_suite, l_annotations.by_name ); a_suite_items.extend; a_suite_items( a_suite_items.last) := l_suite; diff --git a/test/ut3_tester/core/test_suite_builder.pkb b/test/ut3_tester/core/test_suite_builder.pkb index b49ecb2da..514becc1c 100644 --- a/test/ut3_tester/core/test_suite_builder.pkb +++ b/test/ut3_tester/core/test_suite_builder.pkb @@ -674,6 +674,99 @@ create or replace package body test_suite_builder is ); end; + procedure nested_contexts is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation( 1, 'suite','Cool', null), + ut3.ut_annotation( 2, 'beforeall',null, 'suite_level_beforeall'), + ut3.ut_annotation( 3, 'test','In suite', 'suite_level_test'), + ut3.ut_annotation( 4, 'context','a_context', null), + ut3.ut_annotation( 5, 'displayname','A context', null), + ut3.ut_annotation( 6, 'beforeall',null, 'context_setup'), + ut3.ut_annotation( 7, 'test', 'First test in context', 'first_test_in_a_context'), + ut3.ut_annotation( 8, 'context','a_nested_context', null), + ut3.ut_annotation( 9, 'displayname','A nested context', null), + ut3.ut_annotation(10, 'beforeall',null, 'nested_context_setup'), + ut3.ut_annotation(11, 'test', 'Test in nested context', 'test_in_nested_context'), + ut3.ut_annotation(12, 'endcontext',null, null), + ut3.ut_annotation(13, 'context','nested_context_2', null), + ut3.ut_annotation(14, 'test', 'Test in nested context', 'test_in_nested_context_2'), + ut3.ut_annotation(15, 'context','a_nested_context_3', null), + ut3.ut_annotation(16, 'test', 'Test in nested context', 'test_in_nested_context_3'), + ut3.ut_annotation(17, 'endcontext',null, null), + ut3.ut_annotation(18, 'endcontext',null, null), + ut3.ut_annotation(19, 'test', 'Second test in context', 'second_test_in_a_context'), + ut3.ut_annotation(20, 'endcontext',null, null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + ''|| + '' || + '%' || + '%' || + '' || + '%a_contextA contextsome_package.a_context' || + '%' || + '' || + '%nested_context_2nested_context_2some_package.a_context.nested_context_2' || + '%' || + '' || + '%a_nested_context_3a_nested_context_3some_package.a_context.nested_context_2.a_nested_context_3' || + '%' || + '' || + '%test_in_nested_context_3Test in nested contextsome_package.a_context.nested_context_2.a_nested_context_3.test_in_nested_context_3' || + '%' || + '' || + '' || + '%' || + '' || + '%test_in_nested_context_2Test in nested contextsome_package.a_context.nested_context_2.test_in_nested_context_2' || + '%' || + '' || + '' || + '%' || + '' || + '%a_nested_contextA nested contextsome_package.a_context.a_nested_context' || + '%' || + '' || + '%test_in_nested_contextTest in nested contextsome_package.a_context.a_nested_context.test_in_nested_context' || + '%' || + '' || + '' || + '%some_packagenested_context_setup' || + '%' || + '%' || + '' || + '%first_test_in_a_contextFirst test in contextsome_package.a_context.first_test_in_a_context' || + '%' || + '' || + '%second_test_in_a_contextSecond test in contextsome_package.a_context.second_test_in_a_context' || + '%' || + '' || + '' || + '%some_packagecontext_setup' || + '%' || + '' || + '' || + '' || + '%suite_level_testIn suitesome_package.suite_level_test' || + '%' || + '' || + '' || + '%some_packagesuite_level_beforeall' || + '%' || + '' || + ''|| + '' + ); + end; + + procedure before_after_in_context is l_actual clob; l_annotations ut3.ut_annotations; @@ -783,7 +876,7 @@ create or replace package body test_suite_builder is ut3.ut_annotation(1, 'suite','Cool', null), ut3.ut_annotation(2, 'beforeall',null, 'suite_level_beforeall'), ut3.ut_annotation(3, 'test','In suite', 'suite_level_test'), - ut3.ut_annotation(4, 'context','A context', null), + ut3.ut_annotation(4, 'context','a_context', null), ut3.ut_annotation(5, 'beforeall',null, 'context_setup'), ut3.ut_annotation(7, 'test', 'In context', 'test_in_a_context') ); @@ -791,25 +884,30 @@ create or replace package body test_suite_builder is l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); --Assert ut.expect(l_actual).to_be_like( - '%Invalid annotation "--\%context". Cannot find following "--\%endcontext". Annotation ignored.%at package "UT3_TESTER.SOME_PACKAGE", line 4%' + '%Missing "--\%endcontext" annotation for a "--\%context" annotation. The end of context considered be end of package.%at package "UT3_TESTER.SOME_PACKAGE", line 4%' ,'\' ); ut.expect(l_actual).to_be_like( ''|| '' || - '%' || - '' || - '%suite_level_testIn suitesome_package.suite_level_test' || - '%' || - '' || - '%test_in_a_contextIn contextsome_package.test_in_a_context' || - '%' || - '' || - '' || - '%some_packagesuite_level_beforeall' || - '%some_packagecontext_setup' || - '%' || - '' || + '%' || + '%a_contexta_contextsome_package.a_context' || + '%' || + '' || + '%test_in_a_contextIn contextsome_package.a_context.test_in_a_context' || + '%' || + '' || + '' || + '%some_packagecontext_setup' || + '%' || + '%' || + '%suite_level_testIn suitesome_package.suite_level_test' || + '%' || + '' || + '' || + '%some_packagesuite_level_beforeall' || + '%' || + '' || ''|| '' ); @@ -835,7 +933,7 @@ create or replace package body test_suite_builder is l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); --Assert ut.expect(l_actual).to_be_like( - '%Invalid annotation "--\%endcontext". Cannot find preceding "--\%context". Annotation ignored.%at package "UT3_TESTER.SOME_PACKAGE", line 9%' + '%Extra "--\%endcontext" annotation found. Cannot find corresponding "--\%context". Annotation ignored.%at package "UT3_TESTER.SOME_PACKAGE", line 9%' ,'\' ); ut.expect(l_actual).to_be_like( @@ -850,7 +948,7 @@ create or replace package body test_suite_builder is '%' || '' || '' || - '%some_packagecontext_setup' || + '%some_packagecontext_setup' || '%' || '' || '' || @@ -859,7 +957,7 @@ create or replace package body test_suite_builder is '%' || '' || '' || - '%some_packagesuite_level_beforeall' || + '%some_packagesuite_level_beforeall' || '%' || '' || ''|| @@ -1152,7 +1250,7 @@ create or replace package body test_suite_builder is '%testtag%'|| '%%' ); - + end; procedure suite_tag_annotation is @@ -1173,9 +1271,9 @@ create or replace package body test_suite_builder is '%suitetag%'|| '%%' ); - + end; - + procedure test_tags_annotation is l_actual clob; l_annotations ut3.ut_annotations; @@ -1195,7 +1293,7 @@ create or replace package body test_suite_builder is '%testtagtesttag2testtag3%'|| '%%' ); - + end; procedure suite_tags_annotation is @@ -1216,7 +1314,7 @@ create or replace package body test_suite_builder is '%suitetagsuitetag1suitetag2%'|| '%%' ); - + end; procedure test_2line_tags_annotation is @@ -1239,7 +1337,7 @@ create or replace package body test_suite_builder is '%testtagtesttag2%'|| '%%' ); - + end; procedure suite_2line_tags_annotation is @@ -1261,7 +1359,7 @@ create or replace package body test_suite_builder is '%suitetagsuitetag1%'|| '%%' ); - + end; procedure test_empty_tag is @@ -1280,9 +1378,9 @@ create or replace package body test_suite_builder is '%%"--%tags" annotation requires a tag value populated. Annotation ignored.%%'|| '%%' ); - + end; - + procedure suite_empty_tag is l_actual clob; l_annotations ut3.ut_annotations; @@ -1299,7 +1397,7 @@ create or replace package body test_suite_builder is '%"--%tags" annotation requires a tag value populated. Annotation ignored.%%'|| '%%' ); - + end; procedure test_duplicate_tag is @@ -1322,9 +1420,9 @@ create or replace package body test_suite_builder is '%testtagtesttag1testtag2%'|| '%%' ); - + end; - + procedure suite_duplicate_tag is l_actual clob; l_annotations ut3.ut_annotations; @@ -1344,7 +1442,7 @@ create or replace package body test_suite_builder is '%suitetagsuitetag1suitetag2%'|| '%%' ); - + end; procedure test_empty_tag_between is @@ -1366,9 +1464,9 @@ create or replace package body test_suite_builder is '%testtagtesttag1%'|| '%%' ); - + end; - + procedure suite_empty_tag_between is l_actual clob; l_annotations ut3.ut_annotations; @@ -1387,8 +1485,8 @@ create or replace package body test_suite_builder is '%suitetagsuitetag1%'|| '%%' ); - - end; + + end; procedure test_special_char_tag is l_actual clob; @@ -1409,9 +1507,9 @@ create or replace package body test_suite_builder is '%#?$%^&*!|\/@][%'|| '%%' ); - + end; - + procedure suite_special_char_tag is l_actual clob; l_annotations ut3.ut_annotations; @@ -1430,8 +1528,8 @@ create or replace package body test_suite_builder is '%#?$%^&*!|\/@][%'|| '%%' ); - - end; + + end; end test_suite_builder; / diff --git a/test/ut3_tester/core/test_suite_builder.pks b/test/ut3_tester/core/test_suite_builder.pks index 721db153f..688cc342c 100644 --- a/test/ut3_tester/core/test_suite_builder.pks +++ b/test/ut3_tester/core/test_suite_builder.pks @@ -116,6 +116,9 @@ create or replace package test_suite_builder is --%test(Creates nested suite for content between context/endcontext annotations) procedure suite_from_context; + --%test(Creates nested contexts inside a context) + procedure nested_contexts; + --%test(Associates before/after all/each to tests in context only) procedure before_after_in_context; diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index 329b71357..9160814dd 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -688,7 +688,7 @@ Failures:% select * bulk collect into l_results from table(ut3.ut.run('bad_annotations')); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); - ut.expect(l_actual).to_be_like('%Invalid annotation "--%context". Cannot find following "--%endcontext". Annotation ignored.% + ut.expect(l_actual).to_be_like('%Missing "--%endcontext" annotation for a "--%context" annotation. The end of context considered be end of package.% %1 tests, 0 failed, 0 errored, 0 disabled, 1 warning(s)%'); end; From d367d5201823bccb8f346476d7028b81d576d232 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Wed, 23 Oct 2019 01:06:05 +0000 Subject: [PATCH 0597/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 78e7232cc..8dd2880ca 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 26ab66407..7cee48900 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 68e62c388..359cfc251 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 86a0d5455..55e465162 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 6fbd6b988..3adbb4d3b 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 51ad19b30..1e0ac467a 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 35ed7d778..c7dea5865 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 58e60b83c..6ad0b7941 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 3db4fb779..e8015225a 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 4fff8cb3a..9d47351db 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 71d268fe3..67f199fd6 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index e193548be..95a9e9ef4 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 1c9a61900..6a49191c8 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 9fdc6f82a..8dc06652b 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index c1b89c1b2..747cfe3ba 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 63dc32485..66acceabb 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 6276c7dcc..551115f8c 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3237--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index df65dfaf5..5606423c9 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -766,7 +766,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.9.3237-develop + * secion v3.1.9.3245-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 84277737d..011f64b25 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.9.3237-develop'; + gc_version constant varchar2(50) := 'v3.1.9.3245-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From c5f81eb1b25729166f13182cdd508c4860cd6fcb Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 23 Oct 2019 02:23:12 +0100 Subject: [PATCH 0598/1096] Fixing failing tests --- source/core/ut_suite_builder.pkb | 2 +- test/ut3_tester/core/test_suite_builder.pkb | 2 +- test/ut3_tester/core/test_suite_builder.pks | 2 +- test/ut3_user/api/test_ut_run.pkb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index fc3e72e60..ebdd4a57c 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -777,7 +777,7 @@ create or replace package body ut_suite_builder is if l_end_context_pos is null then a_suite.put_warning( - 'Missing "--%endcontext" annotation for a "--%context" annotation. The end of package specification is effective end of context.'|| get_object_reference( a_suite, null, l_context_pos ) + 'Missing "--%endcontext" annotation for a "--%context" annotation. The end of package is considered end of context.'|| get_object_reference( a_suite, null, l_context_pos ) ); l_end_context_pos := a_annotations.by_line.last; end if; diff --git a/test/ut3_tester/core/test_suite_builder.pkb b/test/ut3_tester/core/test_suite_builder.pkb index 514becc1c..68d3f47f8 100644 --- a/test/ut3_tester/core/test_suite_builder.pkb +++ b/test/ut3_tester/core/test_suite_builder.pkb @@ -884,7 +884,7 @@ create or replace package body test_suite_builder is l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); --Assert ut.expect(l_actual).to_be_like( - '%Missing "--\%endcontext" annotation for a "--\%context" annotation. The end of context considered be end of package.%at package "UT3_TESTER.SOME_PACKAGE", line 4%' + '%Missing "--\%endcontext" annotation for a "--\%context" annotation. The end of package is considered end of context.%at package "UT3_TESTER.SOME_PACKAGE", line 4%' ,'\' ); ut.expect(l_actual).to_be_like( diff --git a/test/ut3_tester/core/test_suite_builder.pks b/test/ut3_tester/core/test_suite_builder.pks index 688cc342c..c4e945598 100644 --- a/test/ut3_tester/core/test_suite_builder.pks +++ b/test/ut3_tester/core/test_suite_builder.pks @@ -125,7 +125,7 @@ create or replace package test_suite_builder is --%test(Propagates beforeeach/aftereach to context) procedure before_after_out_of_context; - --%test(Does not create context and gives warning when endcontext is missing) + --%test(Gives warning when endcontext is missing) procedure context_without_endcontext; --%test(Gives warning if --%endcontext is missing a preceding --%context) diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index 9160814dd..6febdd0c1 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -688,7 +688,7 @@ Failures:% select * bulk collect into l_results from table(ut3.ut.run('bad_annotations')); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); - ut.expect(l_actual).to_be_like('%Missing "--%endcontext" annotation for a "--%context" annotation. The end of context considered be end of package.% + ut.expect(l_actual).to_be_like('%Missing "--%endcontext" annotation for a "--%context" annotation. The end of package is considered end of context.% %1 tests, 0 failed, 0 errored, 0 disabled, 1 warning(s)%'); end; From e1dfd05429ec432f5f3eb9c2338fb88c969e43b1 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 24 Oct 2019 00:02:26 +0100 Subject: [PATCH 0599/1096] Updated documentation. Added validation of context name. --- docs/userguide/annotations.md | 118 +++++++++++++++++--- source/core/ut_suite_builder.pkb | 10 ++ test/ut3_tester/core/test_suite_builder.pkb | 54 +++++++-- test/ut3_tester/core/test_suite_builder.pks | 3 + 4 files changed, 162 insertions(+), 23 deletions(-) diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index c7dea5865..5f51c4229 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -997,9 +997,9 @@ In most of the cases, the code to be tested is consisting of PLSQL packages cont When creating test suites, it's quite common to maintain `one to one` relationship between test suite packages and tested code. When it comes to test procedures themselves, it is best practice to have one test procedure for one tested behavior of the code that is tested. -The relationship between test procedure and tested procedure/function will be therefore `many to one` in most of the cases. +The relationship between test procedure and tested code will be therefore `many to one` or `many to many` in most of the cases. -With this comes a challenge. How to group tests, related to one tested procedure, so that it is obvious that they relate to the same code. +With this comes a challenge. How to group tests, related to one tested behavior, so that it is obvious that they relate to the same thing. This is where utPLSQL contexts come handy. @@ -1008,18 +1008,22 @@ Contexts allow for creating sub-suites within a suite package and they allow for In essence, context behaves like a suite within a suite. Context have following characteristics: -- start with the `--%context` annotation and ends with `--%endcontext` -- can have a name provided as parameter for example `--%context(remove_rooms_by_name)` -- when no name is provided for context, the context is names `context_N` where `N` is the number of the context in suite -- can have their own `--%beforeall`, `--%beforeeach`, `--%afterall` and `--%aftereach` procedures -- `--%beforeall`, `--%beforeeach`, `--%afterall` and `--%aftereach` procedures defined at suite level, propagate to context -- test suite package can have multiple contexts in it -- contexts cannot be nested - +- context starts with the `--%context` annotation and ends with `--%endcontext` +- can have a name provided as parameter for example `--%context(remove_rooms_by_name)`. This is different than with `suite` and `test` annotations, where name is taken from test `package/procedure` +- when no name is provided for context, the context is named `context_N` where `N` is the number of the context in suite or parent context +- context name must be unique within it's parent (suite or parent context) +- if context name is not unique within it's parent, context and it's entire content is excluded from execution +- context name should not contain spaces or special characters +- context name cannot contain a `.` (hard stop) character +- contexts can be nested, so a context can be nested within another context +- suite/context can have multiple nested sibling contexts in it +- contexts can have their own `--%beforeall`, `--%beforeeach`, `--%afterall` and `--%aftereach` procedures +- `--%beforeall`, `--%beforeeach`, `--%afterall` and `--%aftereach` procedures defined at ancestor level, propagate to context +- if `--%endcontext` is missing for a context, the context spans to the end of package specification The below example illustrates usage of `--%context` for separating tests for individual procedures of package. -Tested tables and code +Sample tables and code ```sql create table rooms ( room_key number primary key, @@ -1078,8 +1082,8 @@ end; Below test suite defines: - `--%beforeall` outside of context, that will be executed before all tests -- `--%context(remove_rooms_by_name)` to group tests for `remove_rooms_by_name` procedure -- `--%context(add_rooms_content)` to group tests for `add_rooms_content` procedure +- `--%context(remove_rooms_by_name)` to group tests related to `remove_rooms_by_name` functionality +- `--%context(add_rooms_content)` to group tests related to `add_rooms_content` functionality ```sql create or replace package test_rooms_management is @@ -1103,7 +1107,6 @@ create or replace package test_rooms_management is --%endcontext - --%context(add_rooms_content) --%displayname(Add content to a room) @@ -1221,6 +1224,93 @@ Finished in .035261 seconds 5 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s) ``` +Example of nested contexts test suite specification. +*Source - [slide 145](https://www.slideshare.net/Kevlin/structure-and-interpretation-of-test-cases/145?src=clipshare) of Structure and Interpretation of Test Cases by Kevlin Henney* + +```sql +create or replace package queue_spec as + --%suite(Queue specification) + + --%context(a_new_queue) + --%displayname(A new queue) + + --%test(Is empty) + procedure is_empty; + --%test(Preserves positive bounding capacity) + procedure positive_bounding_capacity; + --%test(Cannot be created with non positive bounding capacity) + procedure non_positive_bounding_cap; + --%endcontext + --%context(an_empty_queue) + --%displayname(An empty queue) + + --%test(Dequeues an empty value) + procedure deq_empty_value; + --%test(Remains empty when null enqueued) + procedure empty_with_null_enq; + --%test(Becomes non empty when non null value enqueued) + procedure non_empty_after_enq; + --%endcontext + --%context(a_non_empty_queue) + --%displayname(A non empty queue) + + --%context(that_is_not_full) + --%displayname(that is not full) + + --%test(Becomes longer when non null value enqueued) + procedure grow_on_enq_non_null; + --%test(Becomes full when enqueued up to capacity) + procedure full_on_enq_to_cap; + --%endcontext + --%context(that_is_full) + --%displayname(That is full) + + --%test(Ignores further enqueued values) + procedure full_ignore_enq; + --%test(Becomes non full when dequeued) + procedure non_full_on_deq; + --%endcontext + + --%test(Dequeues values in order enqueued) + procedure dequeue_ordered; + --%test(Remains unchanged when null enqueued) + procedure no_change_on_null_enq; + --%endcontext +end; +``` + + +When such specification gets executed `ut.run('queue_spec'')` (without body created) you will see the nesting of tests within contexts. +``` +Queue specification + An empty queue + Dequeues an empty value [.014 sec] (FAILED - 1) + Remains empty when null enqueued [.004 sec] (FAILED - 2) + Becomes non empty when non null value enqueued [.005 sec] (FAILED - 3) + A non empty queue + that is not full + Becomes longer when non null value enqueued [.005 sec] (FAILED - 4) + Becomes full when enqueued up to capacity [.005 sec] (FAILED - 5) + That is full + Ignores further enqueued values [.004 sec] (FAILED - 6) + Becomes non full when dequeued [.005 sec] (FAILED - 7) + Dequeues values in order enqueued [.006 sec] (FAILED - 8) + Remains unchanged when null enqueued [.004 sec] (FAILED - 9) + A new queue + Is empty [.007 sec] (FAILED - 10) + Preserves positive bounding capacity [.006 sec] (FAILED - 11) + Cannot be created with non positive bounding capacity [.005 sec] (FAILED - 12) +Failures: + 1) deq_empty_value + ORA-04067: not executed, package body "UT3.QUEUE_SPEC" does not exist + ORA-06508: PL/SQL: could not find program unit being called: "UT3.QUEUE_SPEC" + ORA-06512: at line 6 +... +Finished in .088573 seconds +12 tests, 0 failed, 12 errored, 0 disabled, 0 warning(s) +``` + +Suite nesting allows for organizing tests into human-readable specification of behavior. ### Tags diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index 9207f782f..4afbce48c 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -774,6 +774,16 @@ create or replace package body ut_suite_builder is l_end_context_pos := get_endcontext_position(l_context_pos, a_annotations.by_name ); l_context_name := coalesce( a_annotations.by_line( l_context_pos ).text, gc_context||'_'||l_context_no ); + if regexp_like( l_context_name, '\.' ) or l_context_name is null then + if regexp_like( l_context_name, '\.' ) then + a_suite.put_warning( + 'Invalid value "'||l_context_name||'" for context name. The name cannot contain "." (hard stop) character.' || + ' Context name ignored and fallback to auto-name "'||gc_context||'_'||l_context_no||'" ' || + get_object_reference( a_suite, null, l_context_pos ) + ); + end if; + l_context_name := gc_context||'_'||l_context_no; + end if; l_context := ut_suite_context(a_suite.object_owner, a_suite.object_name, l_context_name, l_context_pos ); l_context.path := a_suite.path||'.'||l_context_name; l_context.description := a_annotations.by_line( l_context_pos ).text; diff --git a/test/ut3_tester/core/test_suite_builder.pkb b/test/ut3_tester/core/test_suite_builder.pkb index d4879cb83..82d7ec840 100644 --- a/test/ut3_tester/core/test_suite_builder.pkb +++ b/test/ut3_tester/core/test_suite_builder.pkb @@ -965,7 +965,6 @@ create or replace package body test_suite_builder is ); end; - --%test(Gives warning when two contexts have the same name) procedure duplicate_context_name is l_actual clob; l_annotations ut3.ut_annotations; @@ -1022,6 +1021,43 @@ create or replace package body test_suite_builder is ); end; + procedure hard_stop_in_ctx_name is + l_actual clob; + l_annotations ut3.ut_annotations; + l_bad_name varchar2(100); + begin + --Arrange + l_bad_name := 'Context with invalid name. Should fail'; + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(4, 'context','Context with invalid name. Should fail', null), + ut3.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), + ut3.ut_annotation(13, 'endcontext',null, null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%Invalid value "'||l_bad_name||'" for context name. The name cannot contain "." (hard stop) character. Context name ignored and fallback to auto-name "context_1"%' + ); + ut.expect(l_actual).to_be_like( + ''|| + '' || + '%' || + '' || + '%context_1Context with invalid name. Should failsome_package.context_1' || + '%' || + '' || + '%test_in_a_contextIn contextsome_package.context_1.test_in_a_context' || + '%' || + '%' || + '%' || + '%' || + ''|| + '' + ); + end; + procedure throws_value_empty is l_actual clob; l_annotations ut3.ut_annotations; @@ -1551,13 +1587,13 @@ create or replace package body test_suite_builder is ); ut.expect(l_actual).to_be_like( '%Invalid value "bad tag" for "--%tags" annotation.'|| - ' See documentation for details on valid tag values. Annotation value ignored. -at package "UT3_TESTER.SOME_PACKAGE", line 3%' + ' See documentation for details on valid tag values. Annotation value ignored.' || + '%at package "UT3_TESTER.SOME_PACKAGE", line 3%' ); ut.expect(l_actual).to_be_like( '%Invalid value "bad tag" for "--%tags" annotation.'|| - ' See documentation for details on valid tag values. Annotation value ignored. -at package "UT3_TESTER.SOME_PACKAGE.TEST_PROCEDURE", line 9%' + ' See documentation for details on valid tag values. Annotation value ignored.' || + '%at package "UT3_TESTER.SOME_PACKAGE.TEST_PROCEDURE", line 9%' ); end; @@ -1581,13 +1617,13 @@ at package "UT3_TESTER.SOME_PACKAGE.TEST_PROCEDURE", line 9 ); ut.expect(l_actual).to_be_like( '%Invalid value "-invalid_tag" for "--%tags" annotation.'|| - ' See documentation for details on valid tag values. Annotation value ignored. -at package "UT3_TESTER.SOME_PACKAGE", line 3%' + ' See documentation for details on valid tag values. Annotation value ignored.' || + '%at package "UT3_TESTER.SOME_PACKAGE", line 3%' ); ut.expect(l_actual).to_be_like( '%Invalid value "-invalid_tag" for "--%tags" annotation.'|| - ' See documentation for details on valid tag values. Annotation value ignored. -at package "UT3_TESTER.SOME_PACKAGE.TEST_PROCEDURE", line 9%' + ' See documentation for details on valid tag values. Annotation value ignored.' || + '%at package "UT3_TESTER.SOME_PACKAGE.TEST_PROCEDURE", line 9%' ); end; diff --git a/test/ut3_tester/core/test_suite_builder.pks b/test/ut3_tester/core/test_suite_builder.pks index 3fd08607f..c9683cd9e 100644 --- a/test/ut3_tester/core/test_suite_builder.pks +++ b/test/ut3_tester/core/test_suite_builder.pks @@ -134,6 +134,9 @@ create or replace package test_suite_builder is --%test(Gives warning when two contexts have the same name and ignores duplicated context) procedure duplicate_context_name; + --%test(Fallback to default naming and gives warning when context name contains "." character) + procedure hard_stop_in_ctx_name; + --%endcontext --%context(throws) From 0070cf8ed0bf6ed33cf395f19640d7d4823fcaf2 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 24 Oct 2019 00:04:58 +0100 Subject: [PATCH 0600/1096] changed hard stop to "full stop/period" --- docs/userguide/annotations.md | 2 +- source/core/ut_suite_builder.pkb | 2 +- test/ut3_tester/core/test_suite_builder.pkb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 5f51c4229..51d94215d 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1014,7 +1014,7 @@ Context have following characteristics: - context name must be unique within it's parent (suite or parent context) - if context name is not unique within it's parent, context and it's entire content is excluded from execution - context name should not contain spaces or special characters -- context name cannot contain a `.` (hard stop) character +- context name cannot contain a `.` (full stop/period) character - contexts can be nested, so a context can be nested within another context - suite/context can have multiple nested sibling contexts in it - contexts can have their own `--%beforeall`, `--%beforeeach`, `--%afterall` and `--%aftereach` procedures diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index 4afbce48c..197bec926 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -777,7 +777,7 @@ create or replace package body ut_suite_builder is if regexp_like( l_context_name, '\.' ) or l_context_name is null then if regexp_like( l_context_name, '\.' ) then a_suite.put_warning( - 'Invalid value "'||l_context_name||'" for context name. The name cannot contain "." (hard stop) character.' || + 'Invalid value "'||l_context_name||'" for context name. The name cannot contain "." (full stop/period) character.' || ' Context name ignored and fallback to auto-name "'||gc_context||'_'||l_context_no||'" ' || get_object_reference( a_suite, null, l_context_pos ) ); diff --git a/test/ut3_tester/core/test_suite_builder.pkb b/test/ut3_tester/core/test_suite_builder.pkb index 82d7ec840..97de59c11 100644 --- a/test/ut3_tester/core/test_suite_builder.pkb +++ b/test/ut3_tester/core/test_suite_builder.pkb @@ -1038,7 +1038,7 @@ create or replace package body test_suite_builder is l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); --Assert ut.expect(l_actual).to_be_like( - '%Invalid value "'||l_bad_name||'" for context name. The name cannot contain "." (hard stop) character. Context name ignored and fallback to auto-name "context_1"%' + '%Invalid value "'||l_bad_name||'" for context name. The name cannot contain "." (full stop/period) character. Context name ignored and fallback to auto-name "context_1"%' ); ut.expect(l_actual).to_be_like( ''|| From 8f0b267086cc84feef0156a97d9f07626b73b1d1 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 24 Oct 2019 00:11:51 +0100 Subject: [PATCH 0601/1096] Cleanup --- source/core/ut_suite_builder.pkb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index 197bec926..4ab68afa6 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -829,7 +829,7 @@ create or replace package body ut_suite_builder is end loop; end; - procedure warning_on_floating_endcontext( + procedure warning_on_extra_endcontext( a_suite in out nocopy ut_suite, a_package_ann_index tt_annotations_by_name ) is @@ -915,7 +915,7 @@ create or replace package body ut_suite_builder is add_tests_to_items( l_suite, l_annotations, a_suite_items ); --by this time all contexts were consumed and l_annotations should not have any context/endcontext annotation in it. - warning_on_floating_endcontext( l_suite, l_annotations.by_name ); + warning_on_extra_endcontext( l_suite, l_annotations.by_name ); a_suite_items.extend; a_suite_items( a_suite_items.last) := l_suite; From c905233228c41d1edb367af53bbc6c412d9e240c Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 24 Oct 2019 01:08:36 +0100 Subject: [PATCH 0602/1096] Added downloads badge --- readme.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 864e1041e..e839f0620 100644 --- a/readme.md +++ b/readme.md @@ -2,8 +2,9 @@ ---------- -[![latest-release](https://img.shields.io/github/release/utPLSQL/utPLSQL.svg)](https://github.com/utPLSQL/utPLSQL/releases) [![license](https://img.shields.io/github/license/utPLSQL/utPLSQL.svg)](https://www.apache.org/licenses/LICENSE-2.0) +[![latest-release](https://img.shields.io/github/release/utPLSQL/utPLSQL.svg)](https://github.com/utPLSQL/utPLSQL/releases) +[![Github All Releases](https://img.shields.io/github/downloads/utPLSQL/utPLSQL/total.svg)](https://github.com/utPLSQL/utPLSQL/releases) [![chat](http://img.shields.io/badge/slack-team--chat-blue.svg)](http://utplsql-slack-invite.herokuapp.com/) [![twitter](https://img.shields.io/twitter/follow/utPLSQL.svg?style=social&label=Follow)](https://twitter.com/utPLSQL) From b07d0e9e08a8e29d99dbe19dcc939585a24adeaf Mon Sep 17 00:00:00 2001 From: Travis CI Date: Fri, 25 Oct 2019 00:58:08 +0000 Subject: [PATCH 0603/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 8dd2880ca..20be91502 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 7cee48900..56b8d62ee 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 359cfc251..a2b31ae87 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 55e465162..1621645f8 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 3adbb4d3b..e231e5732 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 1e0ac467a..1dea6837c 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index c7dea5865..c49289dc6 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 6ad0b7941..f1f6affe6 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index e8015225a..06e15c120 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 9d47351db..d519584a3 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 67f199fd6..157921f9b 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 95a9e9ef4..46d803623 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 6a49191c8..de8ccb8f0 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 8dc06652b..13f948168 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 747cfe3ba..0d0d0b0c7 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 66acceabb..88b45f981 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 551115f8c..0d68018e3 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3245--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 5606423c9..a10cd5fed 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -766,7 +766,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.9.3245-develop + * secion v3.1.9.3253-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 011f64b25..ac763e9d5 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.9.3245-develop'; + gc_version constant varchar2(50) := 'v3.1.9.3253-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 06a6881f6a5b370f1c8906e016876f21eca0b7fb Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 25 Oct 2019 02:11:34 +0100 Subject: [PATCH 0604/1096] Updated description of annotation types --- docs/userguide/annotations.md | 88 ++++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 2 deletions(-) diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index c49289dc6..8db62344f 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -9,11 +9,95 @@ The framework runner searches for all the suitable annotated packages, automatic Annotations are interpreted only in the package specification and are case-insensitive. We strongly recommend using lower-case annotations as described in this documentation. There are two distinct types of annotations, identified by their location in package: -- Procedure level annotations - placed directly before a procedure (`--%test`, `--%beforeall`, `--%beforeeach` etc.). -- Package level annotations - placed at any place in package except directly before procedure (`--%suite`, `--%suitepath` etc.). +### Procedure level annotations + +Annotation placed directly before a procedure (`--%test`, `--%beforeall`, `--%beforeeach` etc.). +There **can not** be any empty lines or comments between annotation line and procedure line. +There can be many annotations for a procedure. + +Valid procedure annotations example: +```sql +package test_package is + --%suite + + + --%test() + --%disabled + procedure my_first_procedure; + + $if dbms_db_version.version >= 12 $then --This is ok - annotation before procedure + --%test() + procedure my_first_procedure; + $end + + --A comment goes before annotations + --%test() + procedure my_first_procedure; +end; +``` + +Invalid procedure annotations examples: +```sql +package test_package is + --%suite + + --%test() --This is wrong as there is an empty line between procedure and annotation + + procedure my_first_procedure; + + --%test() + --This is wrong as there is a comment line between procedure and annotation + procedure proc1; + + --%test() --This is wrong as there is a compiler directive between procedure and annotation + $if dbms_db_version.version >= 12 $then + procedure proc_12; + $end + + --%test() + -- procedure another_proc; + /* The above is wrong as the procedure is commented out + and annotation is not procedure annotation anymore */ + +end; +``` + +### Package level annotations + +Those annotations placed at any place in package except directly before procedure (`--%suite`, `--%suitepath` etc.). We strongly recommend putting package level annotations at the very top of package except for the `--%context` annotations (described below) +Valid package annotations example: +```sql +package test_package is + + --%suite + + --%suitepath(org.utplsql.example) + + --%beforeall(some_package.some_procedure) + + --%context + + --%test() + procedure my_first_procedure; + --%endcontext +end; +``` + +Invalid package annotations examples: +```sql +package test_package is + --%suite --This is wrong as suite annotation is not a procedure annotation + procedure irrelevant; + + --%context --This is wrong as there is no empty line between package level annotation and procedure level annotation + --%test() + procedure my_first_procedure; + +end; +``` ## Supported annotations From c69af4651001e7bfdda61e88d0ca4804c8739a05 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sat, 26 Oct 2019 22:26:29 +0000 Subject: [PATCH 0605/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 20be91502..8194dd9e2 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 56b8d62ee..c23994d0a 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index a2b31ae87..badc71bee 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 1621645f8..d3996af6e 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index e231e5732..825789126 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 1dea6837c..4e3f340e4 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 8db62344f..0eb954e48 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index f1f6affe6..4bd6b6990 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 06e15c120..d815a375a 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index d519584a3..7c8850cce 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 157921f9b..f5f2cfbbe 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 46d803623..c07abd016 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index de8ccb8f0..7e2e403c3 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 13f948168..85b346f2d 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 0d0d0b0c7..1527349d8 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 88b45f981..bae5d60f4 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 0d68018e3..ca4d10cd8 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3253--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index a10cd5fed..fb7275ed7 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -766,7 +766,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.9.3253-develop + * secion v3.1.9.3258-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index ac763e9d5..849d8d552 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.9.3253-develop'; + gc_version constant varchar2(50) := 'v3.1.9.3258-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From be39586c8ee666100d267cf8e389f3f0cdb875b7 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 27 Oct 2019 12:28:57 +0000 Subject: [PATCH 0606/1096] Added support for `--%name` annotation, to name the contexts. Changed behavior of ``--%context` annotation. The value f annotation now only indicates the context description. Resolves #1016 --- docs/userguide/annotations.md | 161 ++++++++-- source/core/ut_suite_builder.pkb | 120 +++++--- test/ut3_tester/core/test_suite_builder.pkb | 291 +++++++++++++++--- test/ut3_tester/core/test_suite_builder.pks | 57 ++-- test/ut3_tester/core/test_suite_manager.pkb | 4 +- test/ut3_user/api/test_ut_run.pkb | 5 +- test/ut3_user/reporters.pkb | 4 +- .../reporters/test_realtime_reporter.pkb | 17 +- 8 files changed, 506 insertions(+), 153 deletions(-) diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index ddfec86f1..f8fbaa25d 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -21,9 +21,9 @@ We strongly recommend putting package level annotations at the very top of packa | --- | --- | --- | | `--%suite()` | Package | Mandatory. Marks package as a test suite. Optional suite description can be provided (see `displayname`). | | `--%suitepath()` | Package | Similar to java package. The annotation allows logical grouping of suites into hierarchies. | -| `--%displayname()` | Package/procedure | Human-readable and meaningful description of a context/suite/test. Provides description to a `context` when used within `context`. When used with `test` or `suite` annotation, overrides the `` provided with `suite`/`test`. | +| `--%displayname()` | Package/procedure | Human-readable and meaningful description of a context/suite/test. Overrides the `` provided with `suite`/`test`/`context` annotation. This annotation is redundant and might be removed in future releases. | | `--%test()` | Procedure | Denotes that the annotated procedure is a unit test procedure. Optional test description can by provided (see `displayname`). | -| `--%throws([,...])`| Procedure | Denotes that the annotated test procedure must throw one of the exceptions provided. Supported forms of exceptions are: numeric literals, numeric contant names, exception constant names, predefined Oracle exception names. | +| `--%throws([,...])`| Procedure | Denotes that the annotated test procedure must throw one of the exceptions provided. Supported forms of exceptions are: numeric literals, numeric constant names, exception constant names, predefined Oracle exception names. | | `--%beforeall` | Procedure | Denotes that the annotated procedure should be executed once before all elements of the suite. | | `--%beforeall([[.].][,...])` | Package | Denotes that the mentioned procedure(s) should be executed once before all elements of the suite. | | `--%afterall` | Procedure | Denotes that the annotated procedure should be executed once after all elements of the suite. | @@ -36,7 +36,8 @@ We strongly recommend putting package level annotations at the very top of packa | `--%aftertest([[.].][,...])` | Procedure | Denotes that mentioned procedure(s) should be executed after the annotated `%test` procedure. | | `--%rollback()` | Package/procedure | Defines transaction control. Supported values: `auto`(default) - a savepoint is created before invocation of each "before block" is and a rollback to specific savepoint is issued after each "after" block; `manual` - rollback is never issued automatically. Property can be overridden for child element (test in suite) | | `--%disabled` | Package/procedure | Used to disable a suite or a test. Disabled suites/tests do not get executed, they are however marked and reported as disabled in a test run. | -| `--%context()` | Package | Denotes start of a named context (sub-suite) in a suite package | +| `--%context()` | Package | Denotes start of a named context (sub-suite) in a suite package an optional description for context can be provided. | +| `--%name()` | Package | Denotes name for a context. Must be placed after the context annotation and before start of nested context. | | `--%endcontext` | Package | Denotes end of a nested context (sub-suite) in a suite package | | `--%tags` | Package/procedure | Used to label a test or a suite for purpose of identification | @@ -1008,14 +1009,15 @@ Contexts allow for creating sub-suites within a suite package and they allow for In essence, context behaves like a suite within a suite. Context have following characteristics: -- context starts with the `--%context` annotation and ends with `--%endcontext` -- can have a name provided as parameter for example `--%context(remove_rooms_by_name)`. This is different than with `suite` and `test` annotations, where name is taken from test `package/procedure` -- when no name is provided for context, the context is named `context_N` where `N` is the number of the context in suite or parent context -- context name must be unique within it's parent (suite or parent context) +- context starts with the `--%context` annotation and ends with `--%endcontext`. Everything placed between those two annotations belongs to that context +- can have a description provided as parameter for example `--%context(Some interesting stuff)`. +- can have a name provided with `--%name` annotation. This is different than with `suite` and `test` annotations, where name is taken from `package/procedure` name. +- contexts can be nested, you can place a context inside another context +- when no name is provided for context, the context is named `context_N` where `N` is the number of the context in suite or parent context. +- context name must be unique within it's parent (suite / parent context) - if context name is not unique within it's parent, context and it's entire content is excluded from execution - context name should not contain spaces or special characters - context name cannot contain a `.` (full stop/period) character -- contexts can be nested, so a context can be nested within another context - suite/context can have multiple nested sibling contexts in it - contexts can have their own `--%beforeall`, `--%beforeeach`, `--%afterall` and `--%aftereach` procedures - `--%beforeall`, `--%beforeeach`, `--%afterall` and `--%aftereach` procedures defined at ancestor level, propagate to context @@ -1231,8 +1233,7 @@ Example of nested contexts test suite specification. create or replace package queue_spec as --%suite(Queue specification) - --%context(a_new_queue) - --%displayname(A new queue) + --%context(A new queue) --%test(Is empty) procedure is_empty; @@ -1241,8 +1242,7 @@ create or replace package queue_spec as --%test(Cannot be created with non positive bounding capacity) procedure non_positive_bounding_cap; --%endcontext - --%context(an_empty_queue) - --%displayname(An empty queue) + --%context(An empty queue) --%test(Dequeues an empty value) procedure deq_empty_value; @@ -1251,19 +1251,16 @@ create or replace package queue_spec as --%test(Becomes non empty when non null value enqueued) procedure non_empty_after_enq; --%endcontext - --%context(a_non_empty_queue) - --%displayname(A non empty queue) + --%context(A non empty queue) - --%context(that_is_not_full) - --%displayname(that is not full) + --%context(that is not full) --%test(Becomes longer when non null value enqueued) procedure grow_on_enq_non_null; --%test(Becomes full when enqueued up to capacity) procedure full_on_enq_to_cap; --%endcontext - --%context(that_is_full) - --%displayname(That is full) + --%context(that is full) --%test(Ignores further enqueued values) procedure full_ignore_enq; @@ -1312,6 +1309,122 @@ Finished in .088573 seconds Suite nesting allows for organizing tests into human-readable specification of behavior. +### Name +The `--%name` annotation is currently only used only for naming a context. +If a context doesn't have explicit name specified, then the name is given automatically by framework. + +The automatic name will be `context_#n` where `n` is a context number within a suite/parent context. + +The `--%name` can be useful when you would like to run only a specific context or its items by `suitepath`. + +Consider the below example. + +```sql +create or replace package queue_spec as + --%suite(Queue specification) + + --%context(A new queue) + + --%test(Cannot be created with non positive bounding capacity) + procedure non_positive_bounding_cap; + --%endcontext + --%context(An empty queue) + + --%test(Becomes non empty when non null value enqueued) + procedure non_empty_after_enq; + --%endcontext + --%context(A non empty queue) + + --%context(that is not full) + + --%test(Becomes full when enqueued up to capacity) + procedure full_on_enq_to_cap; + --%endcontext + --%context(that is full) + + --%test(Becomes non full when dequeued) + procedure non_full_on_deq; + --%endcontext + + --%endcontext +end; +``` + +In the above code, suitepaths, context names and context descriptions will be as follows. + +| suitepath | description | name | +|-----------|------------|------| +| queue_spec | Queue specification | queue_spec | +| queue_spec.context_#1 | A new queue | context_#1 | +| queue_spec.context_#2 | An empty queue | context_#2 | +| queue_spec.context_#3 | A non empty queue | context_#3 | +| queue_spec.context_#3.context_#1 | that is not full | context_#1 | +| queue_spec.context_#3.context_#2 | that is full | context_#2 | + +In order to run only the tests for the context `A non empty queue that is not full` you will need to call utPLSQL as below: +```sql + exec ut.run(':queue_spec.context_#3.context_#1'); +``` + +You can use `--%name` annotation to explicitly name contexts on suitepath. +```sql +create or replace package queue_spec as + --%suite(Queue specification) + + --%context(A new queue) + --%name(a_new_queue) + + --%test(Cannot be created with non positive bounding capacity) + procedure non_positive_bounding_cap; + --%endcontext + --%context(An empty queue) + --%name(an_empty_queue) + + --%test(Becomes non empty when non null value enqueued) + procedure non_empty_after_enq; + --%endcontext + --%context(A non empty queue) + --%name(a_non_empty_queue) + + --%context(that is not full) + --%name(that_is_not_full) + + --%test(Becomes full when enqueued up to capacity) + procedure full_on_enq_to_cap; + --%endcontext + --%context(that is full) + --%name(that_is_full) + + --%test(Becomes non full when dequeued) + procedure non_full_on_deq; + --%endcontext + + --%endcontext +end; +``` + +In the above code, suitepaths, context names and context descriptions will be as follows. + +| suitepath | description | name | +|-----------|------------|------| +| queue_spec | Queue specification | queue_spec | +| queue_spec.a_new_queue | A new queue | a_new_queue | +| queue_spec.an_empty_queue | An empty queue | an_empty_queue | +| queue_spec.a_non_empty_queue | A non empty queue | a_non_empty_queue | +| queue_spec.a_non_empty_queue.that_is_not_full | that is not full | that_is_not_full | +| queue_spec.a_non_empty_queue.that_is_full | that is full | that_is_full | + + +The `--%name` annotation is only relevant for: +- running subsets of tests by given context suitepath +- some of test reports, like `ut_junit_reporter` that use suitepath or test-suite element names (not descriptions) for reporting + +#### Name naming convention + +The value of `--%name` annotation must follow the following naming rules: +- cannot contain spaces +- cannot contain a `.` (full stop/dot) +- is case-insensitive ### Tags @@ -1440,8 +1553,9 @@ If you want to create tests for your application it is recommended to structure * Payments recognition * Payments set off -The `%suitepath` annotation is used for such grouping. Even though test packages are defined in a flat structure the `%suitepath` is used by the framework to form them into a hierarchical structure. Your payments recognition test package might look like: +The `--%suitepath` annotation is used for such grouping. Even though test packages are defined in a flat structure the `--%suitepath` is used by the framework to form them into a hierarchical structure. +Your payments recognition test package might look like: ```sql create or replace package test_payment_recognition as @@ -1476,8 +1590,8 @@ create or replace package test_payment_set_off as end test_payment_set_off; ``` -When you execute tests for your application, the framework constructs a test suite for each test package. Then it combines suites into grouping suites by the `%suitepath` annotation value so that the fully qualified path to the `recognize_by_num` procedure is `USER:payments.test_payment_recognition.test_recognize_by_num`. If any of its expectations fails then the test is marked as failed, also the `test_payment_recognition` suite, the parent suite `payments` and the whole run is marked as failed. -The test report indicates which expectation has failed on the payments module. The payments recognition submodule is causing the failure as `recognize_by_num` has not met the expectations of the test. Grouping tests into modules and submodules using the `%suitepath` annotation allows you to logically organize your project's flat structure of packages into functional groups. +When you execute tests for your application, the framework constructs a test suite for each test package. Then it combines suites into grouping suites by the `--%suitepath` annotation value so that the fully qualified path to the `recognize_by_num` procedure is `USER:payments.test_payment_recognition.test_recognize_by_num`. If any of its expectations fails then the test is marked as failed, also the `test_payment_recognition` suite, the parent suite `payments` and the whole run is marked as failed. +The test report indicates which expectation has failed on the payments module. The payments recognition submodule is causing the failure as `recognize_by_num` has not met the expectations of the test. Grouping tests into modules and submodules using the `--%suitepath` annotation allows you to logically organize your project's flat structure of packages into functional groups. An additional advantage of such grouping is the fact that every element level of the grouping can be an actual unit test package containing a common module level setup for all of the submodules. So in addition to the packages mentioned above you could have the following package. ```sql @@ -1493,9 +1607,10 @@ create or replace package payments as end payments; ``` -A `%suitepath` can be provided in three ways: + +When executing tests, `path` for executing tests can be provided in three ways: * schema - execute all tests in the schema -* [schema]:suite1[.suite2][.suite3]...[.procedure] - execute all tests in all suites from suite1[.suite2][.suite3]...[.procedure] path. If schema is not provided, then the current schema is used. Example: `:all.rooms_tests` +* [schema]:suite1[.suite2][.suite3]...[.procedure] - execute all tests by `suitepath` in all suites on path suite1[.suite2][.suite3]...[.procedure]. If schema is not provided, then the current schema is used. Example: `:all.rooms_tests` * [schema.]package[.procedure] - execute all tests in the specified test package. The whole hierarchy of suites in the schema is built before all before/after hooks or part suites for the provided suite package are executed as well. Example: `tests.test_contact.test_last_name_validator` or simply `test_contact.test_last_name_validator` if `tests` is the current schema. diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index 4ab68afa6..b3c6f81dd 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -36,6 +36,7 @@ create or replace package body ut_suite_builder is gc_throws constant t_annotation_name := 'throws'; gc_rollback constant t_annotation_name := 'rollback'; gc_context constant t_annotation_name := 'context'; + gc_name constant t_annotation_name := 'name'; gc_endcontext constant t_annotation_name := 'endcontext'; type tt_annotations is table of t_annotation_name; @@ -57,6 +58,7 @@ create or replace package body ut_suite_builder is gc_throws, gc_rollback, gc_context, + gc_name, gc_endcontext ); @@ -747,21 +749,47 @@ create or replace package body ut_suite_builder is return l_result; end; - procedure get_suite_contexts_items( - a_suite in out nocopy ut_suite, + procedure get_context_items( + a_parent in out nocopy ut_suite, a_annotations in out nocopy t_annotations_info, a_suite_items out nocopy ut_suite_items, a_parent_context_pos in integer := 0 ) is - l_context_pos t_annotation_position; - l_end_context_pos t_annotation_position; - l_context_name t_object_name; - l_ctx_annotations t_annotations_info; - l_context ut_suite_context; - l_context_no binary_integer := 1; - l_context_items ut_suite_items; + l_context_pos t_annotation_position; + l_next_context_pos t_annotation_position; + l_end_context_pos t_annotation_position; + l_ctx_annotations t_annotations_info; + l_context ut_suite_context; + l_context_no binary_integer := 1; + l_context_items ut_suite_items; type tt_context_names is table of boolean index by t_object_name; - l_context_names tt_context_names; + l_used_context_names tt_context_names; + l_context_name t_object_name; + l_default_context_name t_object_name; + function get_context_name( + a_parent in out nocopy ut_suite, + a_context_names in tt_annotation_texts, + a_start_position binary_integer, + a_end_position binary_integer + ) return varchar2 is + l_result t_annotation_name; + l_found boolean; + l_annotation_pos binary_integer; + begin + l_annotation_pos := a_context_names.first; + while l_annotation_pos is not null loop + if l_annotation_pos > a_start_position and l_annotation_pos < a_end_position then + if l_found then + add_annotation_ignored_warning(a_parent, gc_name,'Duplicate annotation %%%.', l_annotation_pos); + else + l_result := a_context_names(l_annotation_pos); + end if; + l_found := true; + end if; + l_annotation_pos := a_context_names.next(l_annotation_pos); + end loop; + return l_result; + end; begin a_suite_items := ut_suite_items(); if not a_annotations.by_name.exists(gc_context) then @@ -771,35 +799,57 @@ create or replace package body ut_suite_builder is l_context_pos := a_annotations.by_name( gc_context).next(a_parent_context_pos); while l_context_pos is not null loop + l_default_context_name := 'nested_context_#'||l_context_no; l_end_context_pos := get_endcontext_position(l_context_pos, a_annotations.by_name ); - - l_context_name := coalesce( a_annotations.by_line( l_context_pos ).text, gc_context||'_'||l_context_no ); - if regexp_like( l_context_name, '\.' ) or l_context_name is null then - if regexp_like( l_context_name, '\.' ) then - a_suite.put_warning( - 'Invalid value "'||l_context_name||'" for context name. The name cannot contain "." (full stop/period) character.' || - ' Context name ignored and fallback to auto-name "'||gc_context||'_'||l_context_no||'" ' || - get_object_reference( a_suite, null, l_context_pos ) + + l_next_context_pos := a_annotations.by_name(gc_context).next(l_context_pos); + if a_annotations.by_name.exists(gc_name) then + l_context_name := + get_context_name( + a_parent, + a_annotations.by_name( gc_name ), + l_context_pos, + least( + coalesce( l_end_context_pos, a_annotations.by_line.last ), + coalesce( l_next_context_pos, a_annotations.by_line.last ) + ) + ); + end if; + if not regexp_like( l_context_name, '^(\w|[$#])+$' ) or l_context_name is null then + if not regexp_like( l_context_name, '^(\w|[$#])+$' ) then + a_parent.put_warning( + 'Invalid value "'||l_context_name||'" for context name.' || + ' Context name ignored and fallback to auto-name "'||l_default_context_name||'" ' || + get_object_reference( a_parent, null, l_context_pos ) ); end if; - l_context_name := gc_context||'_'||l_context_no; + l_context_name := l_default_context_name; + end if; + if l_used_context_names.exists(l_context_name) then + add_annotation_ignored_warning( + a_parent, gc_name, + 'Context name "'||l_context_name||'" already used in this scope. Name must be unique.' || + ' Using fallback name '||l_default_context_name||'.', l_context_pos ); + l_context_name := l_default_context_name; end if; - l_context := ut_suite_context(a_suite.object_owner, a_suite.object_name, l_context_name, l_context_pos ); - l_context.path := a_suite.path||'.'||l_context_name; - l_context.description := a_annotations.by_line( l_context_pos ).text; + l_used_context_names(l_context_name) := true; + + l_context := ut_suite_context(a_parent.object_owner, a_parent.object_name, l_context_name, l_context_pos ); + l_context.path := a_parent.path||'.'||l_context_name; + l_context.description := coalesce( a_annotations.by_line( l_context_pos ).text, l_context_name ); l_context.parse_time := a_annotations.parse_time; --if nested context found - if a_annotations.by_name(gc_context).next(l_context_pos) < l_end_context_pos or l_end_context_pos is null then - get_suite_contexts_items( l_context, a_annotations, l_context_items, l_context_pos ); + if l_next_context_pos < l_end_context_pos or l_end_context_pos is null then + get_context_items( l_context, a_annotations, l_context_items, l_context_pos ); l_end_context_pos := get_endcontext_position(l_context_pos, a_annotations.by_name ); else l_context_items := ut_suite_items(); end if; if l_end_context_pos is null then - a_suite.put_warning( - 'Missing "--%endcontext" annotation for a "--%context" annotation. The end of package is considered end of context.'|| get_object_reference( a_suite, null, l_context_pos ) + a_parent.put_warning( + 'Missing "--%endcontext" annotation for a "--%context" annotation. The end of package is considered end of context.'|| get_object_reference( a_parent, null, l_context_pos ) ); l_end_context_pos := a_annotations.by_line.last; end if; @@ -807,18 +857,12 @@ create or replace package body ut_suite_builder is --create a sub-set of annotations to process as sub-suite (context) l_ctx_annotations := get_annotations_in_context( a_annotations, l_context_pos, l_end_context_pos); - if l_context_names.exists(l_context_name) then - add_annotation_ignored_warning( a_suite, 'context', 'Context name must be unique in a suite. Context and all of it''s content ignored.', l_context_pos ); - else - l_context_names(l_context_name) := true; - - warning_on_duplicate_annot( l_context, l_ctx_annotations.by_name, gc_context ); + warning_on_duplicate_annot( l_context, l_ctx_annotations.by_name, gc_context ); - add_tests_to_items( l_context, l_ctx_annotations, l_context_items ); - add_items_to_list(a_suite_items, l_context_items); - a_suite_items.extend; - a_suite_items(a_suite_items.last) := l_context; - end if; + add_tests_to_items( l_context, l_ctx_annotations, l_context_items ); + add_items_to_list(a_suite_items, l_context_items); + a_suite_items.extend; + a_suite_items(a_suite_items.last) := l_context; -- remove annotations within context after processing them delete_annotations_range(a_annotations, l_context_pos, l_end_context_pos); @@ -910,7 +954,7 @@ create or replace package body ut_suite_builder is warning_on_duplicate_annot( l_suite, l_annotations.by_name, gc_suite ); build_suitepath( l_suite, l_annotations ); - get_suite_contexts_items( l_suite, l_annotations, a_suite_items ); + get_context_items( l_suite, l_annotations, a_suite_items ); --create suite tests and add add_tests_to_items( l_suite, l_annotations, a_suite_items ); diff --git a/test/ut3_tester/core/test_suite_builder.pkb b/test/ut3_tester/core/test_suite_builder.pkb index 97de59c11..9b2c26567 100644 --- a/test/ut3_tester/core/test_suite_builder.pkb +++ b/test/ut3_tester/core/test_suite_builder.pkb @@ -635,8 +635,8 @@ create or replace package body test_suite_builder is ut3.ut_annotation(1, 'suite','Cool', null), ut3.ut_annotation(2, 'beforeall',null, 'suite_level_beforeall'), ut3.ut_annotation(3, 'test','In suite', 'suite_level_test'), - ut3.ut_annotation(4, 'context','a_context', null), - ut3.ut_annotation(5, 'displayname','A context', null), + ut3.ut_annotation(4, 'context','A context', null), + ut3.ut_annotation(5, 'name','a_context', null), ut3.ut_annotation(6, 'beforeall',null, 'context_setup'), ut3.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), ut3.ut_annotation(8, 'endcontext',null, null) @@ -683,23 +683,24 @@ create or replace package body test_suite_builder is ut3.ut_annotation( 1, 'suite','Cool', null), ut3.ut_annotation( 2, 'beforeall',null, 'suite_level_beforeall'), ut3.ut_annotation( 3, 'test','In suite', 'suite_level_test'), - ut3.ut_annotation( 4, 'context','a_context', null), - ut3.ut_annotation( 5, 'displayname','A context', null), + ut3.ut_annotation( 4, 'context','A context', null), + ut3.ut_annotation( 5, 'name','a_context', null), ut3.ut_annotation( 6, 'beforeall',null, 'context_setup'), ut3.ut_annotation( 7, 'test', 'First test in context', 'first_test_in_a_context'), - ut3.ut_annotation( 8, 'context','a_nested_context', null), - ut3.ut_annotation( 9, 'displayname','A nested context', null), + ut3.ut_annotation( 8, 'context','A nested context', null), + ut3.ut_annotation( 9, 'name','a_nested_context', null), ut3.ut_annotation(10, 'beforeall',null, 'nested_context_setup'), ut3.ut_annotation(11, 'test', 'Test in nested context', 'test_in_nested_context'), ut3.ut_annotation(12, 'endcontext',null, null), - ut3.ut_annotation(13, 'context','nested_context_2', null), - ut3.ut_annotation(14, 'test', 'Test in nested context', 'test_in_nested_context_2'), - ut3.ut_annotation(15, 'context','a_nested_context_3', null), - ut3.ut_annotation(16, 'test', 'Test in nested context', 'test_in_nested_context_3'), - ut3.ut_annotation(17, 'endcontext',null, null), - ut3.ut_annotation(18, 'endcontext',null, null), - ut3.ut_annotation(19, 'test', 'Second test in context', 'second_test_in_a_context'), - ut3.ut_annotation(20, 'endcontext',null, null) + ut3.ut_annotation(13, 'context',null, null), + ut3.ut_annotation(14, 'name','nested_context_2', null), + ut3.ut_annotation(15, 'test', 'Test in nested context', 'test_in_nested_context_2'), + ut3.ut_annotation(16, 'context','a_nested_context_3', null), + ut3.ut_annotation(17, 'test', 'Test in nested context', 'test_in_nested_context_3'), + ut3.ut_annotation(18, 'endcontext',null, null), + ut3.ut_annotation(19, 'endcontext',null, null), + ut3.ut_annotation(20, 'test', 'Second test in context', 'second_test_in_a_context'), + ut3.ut_annotation(21, 'endcontext',null, null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -716,10 +717,10 @@ create or replace package body test_suite_builder is '%nested_context_2nested_context_2some_package.a_context.nested_context_2' || '%' || '' || - '%a_nested_context_3a_nested_context_3some_package.a_context.nested_context_2.a_nested_context_3' || + '%nested_context_#1a_nested_context_3some_package.a_context.nested_context_2.nested_context_#1' || '%' || '' || - '%test_in_nested_context_3Test in nested contextsome_package.a_context.nested_context_2.a_nested_context_3.test_in_nested_context_3' || + '%test_in_nested_context_3Test in nested contextsome_package.a_context.nested_context_2.nested_context_#1.test_in_nested_context_3' || '%' || '' || '' || @@ -775,7 +776,7 @@ create or replace package body test_suite_builder is l_annotations := ut3.ut_annotations( ut3.ut_annotation(1, 'suite', 'Cool', null), ut3.ut_annotation(2, 'test', 'In suite', 'suite_level_test'), - ut3.ut_annotation(3, 'context', 'a_context', null), + ut3.ut_annotation(3, 'context', 'A context', null), ut3.ut_annotation(4, 'beforeall', 'context_beforeall', null), ut3.ut_annotation(5, 'beforeeach', null, 'context_beforeeach'), ut3.ut_annotation(6, 'test', 'In context', 'test_in_a_context'), @@ -791,7 +792,7 @@ create or replace package body test_suite_builder is '' || '%' || '%' || - '%a_context' || + '%nested_context_#1A contextsome_package.nested_context_#1' || '%' || '%' || '%test_in_a_context' || @@ -827,7 +828,7 @@ create or replace package body test_suite_builder is ut3.ut_annotation(2, 'beforeall',null, 'suite_level_beforeall'), ut3.ut_annotation(3, 'beforeeach',null, 'suite_level_beforeeach'), ut3.ut_annotation(4, 'test','In suite', 'suite_level_test'), - ut3.ut_annotation(5, 'context','a_context', null), + ut3.ut_annotation(5, 'context',null, null), ut3.ut_annotation(6, 'test', 'In context', 'test_in_a_context'), ut3.ut_annotation(7, 'endcontext',null, null), ut3.ut_annotation(8, 'aftereach',null, 'suite_level_aftereach'), @@ -841,7 +842,7 @@ create or replace package body test_suite_builder is '' || '%' || '%' || - '%a_context' || + '%nested_context_#1nested_context_#1some_package.nested_context_#1' || '%' || '%' || '%test_in_a_context' || @@ -876,8 +877,9 @@ create or replace package body test_suite_builder is ut3.ut_annotation(1, 'suite','Cool', null), ut3.ut_annotation(2, 'beforeall',null, 'suite_level_beforeall'), ut3.ut_annotation(3, 'test','In suite', 'suite_level_test'), - ut3.ut_annotation(4, 'context','a_context', null), - ut3.ut_annotation(5, 'beforeall',null, 'context_setup'), + ut3.ut_annotation(4, 'context','Some context', null), + ut3.ut_annotation(5, 'name','a_context', null), + ut3.ut_annotation(6, 'beforeall',null, 'context_setup'), ut3.ut_annotation(7, 'test', 'In context', 'test_in_a_context') ); --Act @@ -891,7 +893,7 @@ create or replace package body test_suite_builder is ''|| '' || '%' || - '%a_contexta_contextsome_package.a_context' || + '%a_contextSome contextsome_package.a_context' || '%' || '' || '%test_in_a_contextIn contextsome_package.a_context.test_in_a_context' || @@ -922,8 +924,8 @@ create or replace package body test_suite_builder is ut3.ut_annotation(1, 'suite','Cool', null), ut3.ut_annotation(2, 'beforeall',null, 'suite_level_beforeall'), ut3.ut_annotation(3, 'test','In suite', 'suite_level_test'), - ut3.ut_annotation(4, 'context','a_context', null), - ut3.ut_annotation(5, 'displayname','A context', null), + ut3.ut_annotation(4, 'context','A context', null), + ut3.ut_annotation(5, 'name','a_context', null), ut3.ut_annotation(6, 'beforeall',null, 'context_setup'), ut3.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), ut3.ut_annotation(8, 'endcontext',null, null), @@ -974,13 +976,13 @@ create or replace package body test_suite_builder is ut3.ut_annotation(1, 'suite','Cool', null), ut3.ut_annotation(2, 'beforeall',null, 'suite_level_beforeall'), ut3.ut_annotation(3, 'test','In suite', 'suite_level_test'), - ut3.ut_annotation(4, 'context','a_context', null), - ut3.ut_annotation(5, 'displayname','A context', null), + ut3.ut_annotation(4, 'context','A context', null), + ut3.ut_annotation(5, 'name','a_context', null), ut3.ut_annotation(6, 'beforeall',null, 'context_setup'), ut3.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), ut3.ut_annotation(8, 'endcontext',null, null), - ut3.ut_annotation(9, 'context','a_context', null), - ut3.ut_annotation(10, 'displayname','A context', null), + ut3.ut_annotation(9, 'context','A context', null), + ut3.ut_annotation(10, 'name','a_context', null), ut3.ut_annotation(11, 'beforeall',null, 'setup_in_duplicated_context'), ut3.ut_annotation(12, 'test', 'In duplicated context', 'test_in_duplicated_context'), ut3.ut_annotation(13, 'endcontext',null, null) @@ -989,31 +991,43 @@ create or replace package body test_suite_builder is l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); --Assert ut.expect(l_actual).to_be_like( - '%Context name must be unique in a suite. Context and all of it's content ignored.%at package "UT3_TESTER.SOME_PACKAGE", line 9%' + '%Context name "a_context" already used in this scope. Name must be unique. Using fallback name nested_context_#2.%%' ,'\' ); ut.expect(l_actual).to_be_like( ''|| '' || '%' || - '' || - '%a_contextA contextsome_package.a_context' || - '%' || - '' || - '%test_in_a_contextIn contextsome_package.a_context.test_in_a_context' || - '%' || - '' || - '' || - '%some_packagecontext_setup' || - '%' || - '' || - '' || - '' || - '%suite_level_testIn suitesome_package.suite_level_test' || - '%' || + '' || + '%nested_context_#2A contextsome_package.nested_context_#2' || + '%' || + '' || + '%test_in_duplicated_contextIn duplicated contextsome_package.nested_context_#2.test_in_duplicated_context' || + '%' || + '' || + '' || + '%some_packagesetup_in_duplicated_context' || + '%' || + '' || + '' || + '' || + '%a_contextA contextsome_package.a_context' || + '%' || + '' || + '%test_in_a_contextIn contextsome_package.a_context.test_in_a_context' || + '%' || + '' || + '' || + '%some_packagecontext_setup' || + '%' || + '' || + '' || + '' || + '%suite_level_testIn suitesome_package.suite_level_test' || + '%' || '' || '' || - '%some_packagesuite_level_beforeall' || + '%some_packagesuite_level_beforeall' || '%' || '' || ''|| @@ -1027,10 +1041,11 @@ create or replace package body test_suite_builder is l_bad_name varchar2(100); begin --Arrange - l_bad_name := 'Context with invalid name. Should fail'; + l_bad_name := 'ctx_with_dot.in_it'; l_annotations := ut3.ut_annotations( ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(4, 'context','Context with invalid name. Should fail', null), + ut3.ut_annotation(4, 'context',null, null), + ut3.ut_annotation(5, 'name',l_bad_name, null), ut3.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), ut3.ut_annotation(13, 'endcontext',null, null) ); @@ -1038,17 +1053,17 @@ create or replace package body test_suite_builder is l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); --Assert ut.expect(l_actual).to_be_like( - '%Invalid value "'||l_bad_name||'" for context name. The name cannot contain "." (full stop/period) character. Context name ignored and fallback to auto-name "context_1"%' + '%Invalid value "'||l_bad_name||'" for context name. Context name ignored and fallback to auto-name "nested_context_#1"%' ); ut.expect(l_actual).to_be_like( ''|| '' || '%' || '' || - '%context_1Context with invalid name. Should failsome_package.context_1' || + '%nested_context_#1nested_context_#1some_package.nested_context_#1' || '%' || '' || - '%test_in_a_contextIn contextsome_package.context_1.test_in_a_context' || + '%test_in_a_contextIn contextsome_package.nested_context_#1.test_in_a_context' || '%' || '%' || '%' || @@ -1058,6 +1073,180 @@ create or replace package body test_suite_builder is ); end; + procedure name_with_spaces_invalid is + l_actual clob; + l_annotations ut3.ut_annotations; + l_bad_name varchar2(100); + begin + --Arrange + l_bad_name := 'context name with spaces'; + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(4, 'context',null, null), + ut3.ut_annotation(5, 'name',l_bad_name, null), + ut3.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), + ut3.ut_annotation(13, 'endcontext',null, null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%Invalid value "'||l_bad_name||'" for context name. Context name ignored and fallback to auto-name "nested_context_#1"%' + ); + ut.expect(l_actual).to_be_like( + ''|| + '' || + '%' || + '' || + '%nested_context_#1nested_context_#1some_package.nested_context_#1' || + '%' || + '' || + '%test_in_a_contextIn contextsome_package.nested_context_#1.test_in_a_context' || + '%' || + '%' || + '%' || + '%' || + ''|| + '' + ); + end; + + procedure duplicate_name_annotation is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(4, 'context','A context', null), + ut3.ut_annotation(5, 'name','a_context_name', null), + ut3.ut_annotation(6, 'name','a_newer_context_name', null), + ut3.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), + ut3.ut_annotation(8, 'endcontext',null, null), + ut3.ut_annotation(12, 'test', 'In suite', 'suite_level_test') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%Duplicate annotation "--%name". Annotation ignored.%%' + ,'\' + ); + ut.expect(l_actual).to_be_like( + ''|| + '' || + '%' || + '' || + '%a_context_nameA contextsome_package.a_context_name' || + '%' || + '' || + '%test_in_a_contextIn contextsome_package.a_context_name.test_in_a_context' || + '%' || + '' || + '' || + '' || + '' || + '' || + '%suite_level_testIn suitesome_package.suite_level_test' || + '%' || + '' || + '' || + '' || + ''|| + '' + ); + end; + + procedure name_outside_of_context is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(3, 'name','a_context_name', null), + ut3.ut_annotation(4, 'context','A context', null), + ut3.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), + ut3.ut_annotation(8, 'endcontext',null, null), + ut3.ut_annotation(12, 'test', 'In suite', 'suite_level_test') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%%' + ,'\' + ); + ut.expect(l_actual).to_be_like( + ''|| + '' || + '%' || + '' || + '%nested_context_#1A contextsome_package.nested_context_#1' || + '%' || + '' || + '%test_in_a_contextIn contextsome_package.nested_context_#1.test_in_a_context' || + '%' || + '' || + '' || + '' || + '' || + '' || + '%suite_level_testIn suitesome_package.suite_level_test' || + '%' || + '' || + '' || + '' || + ''|| + '' + ); + end; + + procedure name_empty_value is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(4, 'context','A context', null), + ut3.ut_annotation(5, 'name',null, null), + ut3.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), + ut3.ut_annotation(8, 'endcontext',null, null), + ut3.ut_annotation(12, 'test', 'In suite', 'suite_level_test') + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%%' + ,'\' + ); + ut.expect(l_actual).to_be_like( + ''|| + '' || + '%' || + '' || + '%nested_context_#1A contextsome_package.nested_context_#1' || + '%' || + '' || + '%test_in_a_contextIn contextsome_package.nested_context_#1.test_in_a_context' || + '%' || + '' || + '' || + '' || + '' || + '' || + '%suite_level_testIn suitesome_package.suite_level_test' || + '%' || + '' || + '' || + '' || + ''|| + '' + ); + end; + procedure throws_value_empty is l_actual clob; l_annotations ut3.ut_annotations; diff --git a/test/ut3_tester/core/test_suite_builder.pks b/test/ut3_tester/core/test_suite_builder.pks index c9683cd9e..f1fa7f157 100644 --- a/test/ut3_tester/core/test_suite_builder.pks +++ b/test/ut3_tester/core/test_suite_builder.pks @@ -2,8 +2,7 @@ create or replace package test_suite_builder is --%suite(suite_builder) --%suitepath(utplsql.ut3_tester.core) - --%context(suite) - --%displayname(--%suite annotation) + --%context(--%suite annotation) --%test(Sets suite name from package name and leaves description empty) procedure no_suite_description; @@ -16,8 +15,7 @@ create or replace package test_suite_builder is --%endcontext - --%context(displayname) - --%displayname(--%displayname annotation) + --%context(--%displayname annotation) --%test(Overrides suite description using first --%displayname annotation) procedure suite_descr_from_displayname; @@ -30,8 +28,7 @@ create or replace package test_suite_builder is --%endcontext - --%context(test) - --%displayname(--%test annotation) + --%context(--%test annotation) --%test(Creates a test item for procedure annotated with --%test annotation) procedure test_annotation; @@ -44,8 +41,7 @@ create or replace package test_suite_builder is --%endcontext - --%context(suitepath) - --%displayname(--%suitepath annotation) + --%context(--%suitepath annotation) --%test(Sets suite path using first --%suitepath annotation) procedure suitepath_from_non_empty_path; @@ -61,8 +57,7 @@ create or replace package test_suite_builder is --%endcontext - --%context(rollback) - --%displayname(--%rollback annotation) + --%context--%rollback annotation) --%test(Sets rollback type using first --%rollback annotation) procedure rollback_type_valid; @@ -78,8 +73,7 @@ create or replace package test_suite_builder is --%endcontext - --%context(before_after_all_each) - --%displayname(--%before/after all/each annotations) + --%context(--%before/after all/each annotations) --%test(Supports multiple before/after all/each procedure level definitions) procedure multiple_before_after; @@ -110,11 +104,10 @@ create or replace package test_suite_builder is --%endcontext - --%context(context) - --%displayname(--%context annotation) + --%context(--%context annotation) - --%test(Creates nested suite for content between context/endcontext annotations) - procedure suite_from_context; + --%test(Creates nested suite for content between context/endcontext annotations) + procedure suite_from_context; --%test(Creates nested contexts inside a context) procedure nested_contexts; @@ -131,16 +124,31 @@ create or replace package test_suite_builder is --%test(Gives warning if --%endcontext is missing a preceding --%context) procedure endcontext_without_context; - --%test(Gives warning when two contexts have the same name and ignores duplicated context) + --%test(Gives warning when two contexts have the same name and falls back to default context name) procedure duplicate_context_name; - --%test(Fallback to default naming and gives warning when context name contains "." character) + --%endcontext + + --%context(--%name annotation) + + --%test(Falls back to default context name and gives warning when context name contains "." character) procedure hard_stop_in_ctx_name; + --%test(Falls back to default context name and gives warning when name contains spaces) + procedure name_with_spaces_invalid; + + --%test(Raises warning when more than one name annotation used ) + procedure duplicate_name_annotation; + + --%test(Is ignored when used outside of context - no warning given) + procedure name_outside_of_context; + + --%test(Is ignored when name value is empty) + procedure name_empty_value; + --%endcontext - --%context(throws) - --%displayname(--%throws annotation) + --%context(--%throws annotation) --%test(Gives warning if --%throws annotation has no value) procedure throws_value_empty; @@ -150,8 +158,7 @@ create or replace package test_suite_builder is --%endcontext - --%context(beforetest_aftertest) - --%displayname(--%beforetest/aftertest annotation) + --%context(--%beforetest/aftertest annotation) --%test(Supports multiple occurrences of beforetest/aftertest for a test) procedure before_aftertest_multi; @@ -167,8 +174,7 @@ create or replace package test_suite_builder is --%endcontext - --%context(unknown_annotation) - --%displayname(--%bad_annotation) + --%context(--%bad_annotation) --%test(Gives warning when unknown procedure level annotation passed) procedure test_bad_procedure_annotation; @@ -178,8 +184,7 @@ create or replace package test_suite_builder is --%endcontext - --%context(tags_annotation) - --%displayname(--%tag_annotation) + --%context(--%tag_annotation) --%test(Build suite test with tag) procedure test_tag_annotation; diff --git a/test/ut3_tester/core/test_suite_manager.pkb b/test/ut3_tester/core/test_suite_manager.pkb index 6f4237f9c..e693771b4 100644 --- a/test/ut3_tester/core/test_suite_manager.pkb +++ b/test/ut3_tester/core/test_suite_manager.pkb @@ -259,8 +259,8 @@ end test_package_3;]'; gv_glob_val number; - --%context(some_context) - --%displayname(Some context description) + --%context(Some context description) + --%name(some_context) --%test --%displayname(Test1 from test package 1) diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index 46d7d6f80..feac3fe6e 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -1080,9 +1080,8 @@ Failures:% --%beforeall procedure before_suite; - --%context(some_context) - - --%displayname(context description) + --%context(context description) + --%name(some_context) --%beforeall procedure before_context; diff --git a/test/ut3_user/reporters.pkb b/test/ut3_user/reporters.pkb index 6d6d573aa..9f571a589 100644 --- a/test/ut3_user/reporters.pkb +++ b/test/ut3_user/reporters.pkb @@ -14,8 +14,8 @@ as --%beforeeach procedure beforeeach; - --%context(some_context) - --%displayname(A description of some context) + --%context(A description of some context) + --%name(some_context) --%test --%beforetest(beforetest) diff --git a/test/ut3_user/reporters/test_realtime_reporter.pkb b/test/ut3_user/reporters/test_realtime_reporter.pkb index 8eb490a11..155925f0f 100644 --- a/test/ut3_user/reporters/test_realtime_reporter.pkb +++ b/test/ut3_user/reporters/test_realtime_reporter.pkb @@ -9,7 +9,8 @@ create or replace package body test_realtime_reporter as --%suite(suite ) --%suitepath(realtime_reporting) - --%context(test context) + --%context + --%name(test_context) --%test(test 1 - OK) procedure test_1_ok; @@ -164,12 +165,12 @@ create or replace package body test_realtime_reporter as select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting2.test_5' as item_id from dual union all select 'post-suite' as event_type, 'realtime_reporting.check_realtime_reporting2' as item_id from dual union all select 'pre-suite' as event_type, 'realtime_reporting.check_realtime_reporting1' as item_id from dual union all - select 'pre-suite' as event_type, 'realtime_reporting.check_realtime_reporting1.test context' as item_id from dual union all - select 'pre-test' as event_type, 'realtime_reporting.check_realtime_reporting1.test context.test_1_ok' as item_id from dual union all - select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting1.test context.test_1_ok' as item_id from dual union all - select 'pre-test' as event_type, 'realtime_reporting.check_realtime_reporting1.test context.test_2_nok' as item_id from dual union all - select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting1.test context.test_2_nok' as item_id from dual union all - select 'post-suite' as event_type, 'realtime_reporting.check_realtime_reporting1.test context' as item_id from dual union all + select 'pre-suite' as event_type, 'realtime_reporting.check_realtime_reporting1.test_context' as item_id from dual union all + select 'pre-test' as event_type, 'realtime_reporting.check_realtime_reporting1.test_context.test_1_ok' as item_id from dual union all + select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting1.test_context.test_1_ok' as item_id from dual union all + select 'pre-test' as event_type, 'realtime_reporting.check_realtime_reporting1.test_context.test_2_nok' as item_id from dual union all + select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting1.test_context.test_2_nok' as item_id from dual union all + select 'post-suite' as event_type, 'realtime_reporting.check_realtime_reporting1.test_context' as item_id from dual union all select 'post-suite' as event_type, 'realtime_reporting.check_realtime_reporting1' as item_id from dual union all select 'post-suite' as event_type, 'realtime_reporting' as item_id from dual union all select 'post-run' as event_type, null as item_id from dual; @@ -310,7 +311,7 @@ create or replace package body test_realtime_reporter as into l_actual from table(g_events) t where t.event_doc.extract('/event[@type="post-test"]/test/@id').getstringval() - = 'realtime_reporting.check_realtime_reporting1.test context.test_2_nok'; + = 'realtime_reporting.check_realtime_reporting1.test_context.test_2_nok'; ut.expect(l_actual).to_equal(l_expected); end single_failed_message; From 4ca4ea83b8d7713ede513b6e092286ef83e2a673 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Fri, 1 Nov 2019 22:54:37 +0000 Subject: [PATCH 0607/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 8194dd9e2..bdb6d3bda 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index c23994d0a..fd79d6695 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index badc71bee..f933582b7 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index d3996af6e..b7e0c72c5 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 825789126..c5b31e165 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 4e3f340e4..534581d6d 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 864c0b8e5..e202907b8 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 4bd6b6990..222820ce9 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index d815a375a..9cf80ee91 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 7c8850cce..32cda255c 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index f5f2cfbbe..74d2a4d6f 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index c07abd016..187f9b070 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 7e2e403c3..bf5f93e48 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 85b346f2d..89257702c 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 1527349d8..4aa402a9d 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index bae5d60f4..408241e45 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index ca4d10cd8..fd303c445 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3258--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index fb7275ed7..a8561ee6f 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -766,7 +766,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.9.3258-develop + * secion v3.1.9.3261-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 849d8d552..75482a30b 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.9.3258-develop'; + gc_version constant varchar2(50) := 'v3.1.9.3261-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From bc49a818fee8bff9371691e27a3e4bb9f762c262 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 2 Nov 2019 00:23:09 +0000 Subject: [PATCH 0608/1096] Fixed issue fit false-positive warnings on suites with multiple contexts. --- source/core/ut_suite_builder.pkb | 1 + test/ut3_tester/core/test_suite_builder.pkb | 87 +++++++++++++++++---- test/ut3_tester/core/test_suite_builder.pks | 3 + 3 files changed, 74 insertions(+), 17 deletions(-) diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index b3c6f81dd..c7e968467 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -800,6 +800,7 @@ create or replace package body ut_suite_builder is while l_context_pos is not null loop l_default_context_name := 'nested_context_#'||l_context_no; + l_context_name := null; l_end_context_pos := get_endcontext_position(l_context_pos, a_annotations.by_name ); l_next_context_pos := a_annotations.by_name(gc_context).next(l_context_pos); diff --git a/test/ut3_tester/core/test_suite_builder.pkb b/test/ut3_tester/core/test_suite_builder.pkb index 9b2c26567..a204a04e6 100644 --- a/test/ut3_tester/core/test_suite_builder.pkb +++ b/test/ut3_tester/core/test_suite_builder.pkb @@ -1225,23 +1225,76 @@ create or replace package body test_suite_builder is ut.expect(l_actual).to_be_like( ''|| '' || - '%' || - '' || - '%nested_context_#1A contextsome_package.nested_context_#1' || - '%' || - '' || - '%test_in_a_contextIn contextsome_package.nested_context_#1.test_in_a_context' || - '%' || - '' || - '' || - '' || - '' || - '' || - '%suite_level_testIn suitesome_package.suite_level_test' || - '%' || - '' || - '' || - '' || + '%' || + '' || + '%nested_context_#1A contextsome_package.nested_context_#1' || + '%' || + '' || + '%test_in_a_contextIn contextsome_package.nested_context_#1.test_in_a_context' || + '%' || + '' || + '' || + '' || + '' || + '' || + '%suite_level_testIn suitesome_package.suite_level_test' || + '%' || + '' || + '' || + '' || + ''|| + '' + ); + end; + + procedure multiple_contexts is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation(1, 'suite','Cool', null), + ut3.ut_annotation(4, 'context','A context', null), + ut3.ut_annotation(6, 'test', 'In context1', 'test_in_a_context1'), + ut3.ut_annotation(7, 'endcontext',null, null), + ut3.ut_annotation(8, 'context','A context', null), + ut3.ut_annotation(10, 'test', 'In context2', 'test_in_a_context2'), + ut3.ut_annotation(11, 'endcontext',null, null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + '%%' + ,'\' + ); + ut.expect(l_actual).to_be_like( + ''|| + '' || + '%' || + '' || + '%nested_context_#2A contextsome_package.nested_context_#2' || + '%' || + '' || + '%test_in_a_context2In context2some_package.nested_context_#2.test_in_a_context2' || + '%' || + '' || + '' || + '' || + '' || + '' || + '%nested_context_#1A contextsome_package.nested_context_#1' || + '%' || + '' || + '%test_in_a_context1In context1some_package.nested_context_#1.test_in_a_context1' || + '%' || + '' || + '' || + '' || + '' || + '' || + '' || + '' || ''|| '' ); diff --git a/test/ut3_tester/core/test_suite_builder.pks b/test/ut3_tester/core/test_suite_builder.pks index f1fa7f157..7a85cb946 100644 --- a/test/ut3_tester/core/test_suite_builder.pks +++ b/test/ut3_tester/core/test_suite_builder.pks @@ -146,6 +146,9 @@ create or replace package test_suite_builder is --%test(Is ignored when name value is empty) procedure name_empty_value; + --%test(Is ignored when name value is empty) + procedure multiple_contexts; + --%endcontext --%context(--%throws annotation) From b08ede3342d37dc7d0d66cecff7653f75eb3ad69 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sat, 2 Nov 2019 01:30:35 +0000 Subject: [PATCH 0609/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index bdb6d3bda..5d12e80bc 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index fd79d6695..02b0444d5 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index f933582b7..46387124c 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index b7e0c72c5..1fad16411 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index c5b31e165..6f4e2e89c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 534581d6d..b7a343daf 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index e202907b8..f7a290acb 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 222820ce9..b379a365e 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 9cf80ee91..55d1576f5 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 32cda255c..258013720 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 74d2a4d6f..747b870a1 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 187f9b070..eae29e6e7 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index bf5f93e48..4ec99932d 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 89257702c..6d34c3f36 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 4aa402a9d..0687597b1 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 408241e45..3aefc0abf 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index fd303c445..72027166b 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3261--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index a8561ee6f..11048010c 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -766,7 +766,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.9.3261-develop + * secion v3.1.9.3264-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 75482a30b..fc3b7b046 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.9.3261-develop'; + gc_version constant varchar2(50) := 'v3.1.9.3264-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 57a89ba5a287522b302a098e8849416a1030caaa Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 5 Nov 2019 23:26:22 +0000 Subject: [PATCH 0610/1096] Touch readme to kickoff build. --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index e839f0620..2ccf8ee68 100644 --- a/readme.md +++ b/readme.md @@ -202,3 +202,4 @@ The utPLSQL project is community-driven and is not commercially motivated. Nonet + From 00d0fb444a35708870a7e7a4ab826c365b8e1390 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 5 Nov 2019 23:38:28 +0000 Subject: [PATCH 0611/1096] Updated project version after build [skip ci] --- VERSION | 2 +- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- sonar-project.properties | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/VERSION b/VERSION index 272ed88b4..76cb3f689 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.9-develop +v3.1.9 diff --git a/docs/about/authors.md b/docs/about/authors.md index 5d12e80bc..b1b2e54bc 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 02b0444d5..8b4b6bd32 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 46387124c..764472025 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 1fad16411..5871e959b 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 6f4e2e89c..29908c561 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index b7a343daf..6fe817336 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index f7a290acb..da3a66f80 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index b379a365e..6e2befa91 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 55d1576f5..340e850c2 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 258013720..f4d782329 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 747b870a1..4114198f1 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index eae29e6e7..3c0e64fe0 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 4ec99932d..a119aafac 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 6d34c3f36..c669bb9d5 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 0687597b1..53d534a38 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 3aefc0abf..d91940646 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 72027166b..c724947bb 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3264--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) # Upgrading from version 2 diff --git a/sonar-project.properties b/sonar-project.properties index bb6e0f621..da061019b 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,7 @@ sonar.projectKey=utPLSQL # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=utPLSQL -sonar.projectVersion=v3.1.9-develop +sonar.projectVersion=v3.1.9 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # Since SonarQube 4.2, this property is optional if sonar.modules is set. diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 11048010c..b82e96cba 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -766,7 +766,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.9.3264-develop + * secion v3.1.9.3265 */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index fc3b7b046..24593501c 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.9.3264-develop'; + gc_version constant varchar2(50) := 'v3.1.9.3265'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From c724493e0569f6d8af8fbc8e6ff5838fc2fd1f55 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 6 Nov 2019 00:34:30 +0000 Subject: [PATCH 0612/1096] Updated documentation. Resolves: #1010 --- docs/userguide/annotations.md | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index da3a66f80..bddbcfc7d 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -3,12 +3,33 @@ # Annotations Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package. -No configuration files or tables are needed. The annotation names are based on popular testing frameworks such as JUnit. +No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit. The framework runner searches for all the suitable annotated packages, automatically configures suites, forms the suite hierarchy, executes it and reports results in specified formats. -Annotations are interpreted only in the package specification and are case-insensitive. We strongly recommend using lower-case annotations as described in this documentation. +Annotation is defined by: +- single line comment `--` (double dash) +- followed directly by a `%` (percent) +- followed by annotation name +- followed by optional annotation text placed in single brackets. -There are two distinct types of annotations, identified by their location in package: +All of text between first opening bracket and last closing bracket in annotation line is considered to be annotation text + +Examples: +`--%suite(The name of my test suite)` - represents `suite` annotation with text `The name of my test suite` + +utPLSQL interprets the whole line of annotation and will treat all the text from the first opening bracket in the line to the last closing bracket + +Example: + `--%suite(Stuff) -- we should name this ( correctly )` - represents `suite` annotation with text `Stuff) -- we should name this ( correctly ` + +Do not place comments within annotation line to avoid unexpected behaviors. + +**Note:** +>Annotations are interpreted only in the package specification and are case-insensitive. We strongly recommend using lower-case annotations as described in this documentation. + +There are two distinct types of annotations, identified by their location in package. +- package annotations +- procedure annotations ### Procedure level annotations From 05c063f851a549c2343ad836f7a036a722684909 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 6 Nov 2019 00:44:21 +0000 Subject: [PATCH 0613/1096] Dash-> hyphen --- docs/userguide/annotations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index bddbcfc7d..b8180e4be 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -7,7 +7,7 @@ No additional configuration files or tables are needed for test cases. The annot The framework runner searches for all the suitable annotated packages, automatically configures suites, forms the suite hierarchy, executes it and reports results in specified formats. Annotation is defined by: -- single line comment `--` (double dash) +- single line comment `--` (double hyphen) - followed directly by a `%` (percent) - followed by annotation name - followed by optional annotation text placed in single brackets. From 2f089b341706b11ff06495b5e3292b0396702a27 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Wed, 6 Nov 2019 01:03:11 +0000 Subject: [PATCH 0614/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index b1b2e54bc..1f484feb4 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 8b4b6bd32..c0907e2f8 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 764472025..0ac2bca5e 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 5871e959b..52ee71946 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 29908c561..ce7cb39fa 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 6fe817336..e392a09c4 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index b8180e4be..034434c40 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 6e2befa91..9bcd04608 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 340e850c2..0957aa379 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index f4d782329..55829150a 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 4114198f1..e5ca19f47 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 3c0e64fe0..b7c581b75 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index a119aafac..3196fb54b 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index c669bb9d5..94c81e527 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 53d534a38..82119e5c7 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index d91940646..140197a48 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index c724947bb..026bcff1e 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3265-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index b82e96cba..887a38252 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -766,7 +766,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.9.3265 + * secion v3.1.9.3267 */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 24593501c..3c02855d0 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.9.3265'; + gc_version constant varchar2(50) := 'v3.1.9.3267'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 5b5ca128075a63f35eb824011b216b18f0794667 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 9 Nov 2019 23:35:14 +0000 Subject: [PATCH 0615/1096] Fixing issue with sonar token. --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e11a3ca3b..b48adb107 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,7 @@ addons: - openjdk-9-jre-headless sonarcloud: organization: utplsql - token: - secure: ${SONAR_TOKEN} + token: ${SONAR_TOKEN} services: - docker From e1b8ee649da0a1a6f5f7186acd705a0fccf77448 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sat, 9 Nov 2019 23:48:14 +0000 Subject: [PATCH 0616/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 1f484feb4..776e5cd44 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index c0907e2f8..edf1181bd 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 0ac2bca5e..46ddbf89b 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 52ee71946..4092c00c9 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index ce7cb39fa..20d119f93 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index e392a09c4..36ed86ae6 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 034434c40..33950623d 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 9bcd04608..3378cafe4 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 0957aa379..203daffe0 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 55829150a..3d01aafbd 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index e5ca19f47..fe2369957 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index b7c581b75..aab93b2f8 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 3196fb54b..3d6e23843 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 94c81e527..ceb1cbb13 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 82119e5c7..798b2fd0b 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 140197a48..2c8b4ebdd 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 026bcff1e..5e48ee239 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3267-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 887a38252..1e4b63c7f 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -766,7 +766,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.9.3267 + * secion v3.1.9.3268 */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 3c02855d0..f1a19efb9 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.9.3267'; + gc_version constant varchar2(50) := 'v3.1.9.3268'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 1f1828ffca6565076a26d418ee2d154cf0c90188 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 10 Nov 2019 11:54:13 +0000 Subject: [PATCH 0617/1096] Updated project version to 3.1.10 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 76cb3f689..04c455c73 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.9 +v3.1.10 From a33b53d6ff70c652d7d1e6380af2d3c65ba79c48 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sun, 10 Nov 2019 12:06:35 +0000 Subject: [PATCH 0618/1096] Updated project version after build [skip ci] --- VERSION | 2 +- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- sonar-project.properties | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/VERSION b/VERSION index 04c455c73..8961ff4ac 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.10 +v3.1.10-develop diff --git a/docs/about/authors.md b/docs/about/authors.md index 776e5cd44..5b6742c00 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index edf1181bd..ac12e0d57 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 46ddbf89b..1a7753962 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 4092c00c9..95bc201ea 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 20d119f93..abc4846c1 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 36ed86ae6..17549d2e5 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 33950623d..8e4ff4aed 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 3378cafe4..25b8c7170 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 203daffe0..b3210f9a7 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 3d01aafbd..798cf3a27 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index fe2369957..20a9c980f 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index aab93b2f8..713667d56 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 3d6e23843..71cada77d 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index ceb1cbb13..2992adff1 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 798b2fd0b..4d9f0a4b7 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 2c8b4ebdd..9ebd3f9bc 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 5e48ee239..2f82f3965 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.9.3268-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) # Upgrading from version 2 diff --git a/sonar-project.properties b/sonar-project.properties index da061019b..62c8f808f 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,7 @@ sonar.projectKey=utPLSQL # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=utPLSQL -sonar.projectVersion=v3.1.9 +sonar.projectVersion=v3.1.10-develop # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # Since SonarQube 4.2, this property is optional if sonar.modules is set. diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 1e4b63c7f..0185c5568 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -766,7 +766,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.9.3268 + * secion v3.1.10.3271-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index f1a19efb9..e5de08d1c 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.9.3268'; + gc_version constant varchar2(50) := 'v3.1.10.3271-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From a2c0a587d665913ec4a7dcd76798053b32685387 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 10 Nov 2019 13:27:14 +0000 Subject: [PATCH 0619/1096] Update link for utPLSQL download statistics --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 2ccf8ee68..0d66152d0 100644 --- a/readme.md +++ b/readme.md @@ -4,7 +4,7 @@ [![license](https://img.shields.io/github/license/utPLSQL/utPLSQL.svg)](https://www.apache.org/licenses/LICENSE-2.0) [![latest-release](https://img.shields.io/github/release/utPLSQL/utPLSQL.svg)](https://github.com/utPLSQL/utPLSQL/releases) -[![Github All Releases](https://img.shields.io/github/downloads/utPLSQL/utPLSQL/total.svg)](https://github.com/utPLSQL/utPLSQL/releases) +[![Download statistics](https://img.shields.io/github/downloads/utPLSQL/utPLSQL/total.svg)](http://gra.caldis.me/?url=https://github.com/utPLSQL/utPLSQL) [![chat](http://img.shields.io/badge/slack-team--chat-blue.svg)](http://utplsql-slack-invite.herokuapp.com/) [![twitter](https://img.shields.io/twitter/follow/utPLSQL.svg?style=social&label=Follow)](https://twitter.com/utPLSQL) From 52794ac13a8fd8e7749f29b895c8dae9ca1f2c4c Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sun, 10 Nov 2019 13:57:48 +0000 Subject: [PATCH 0620/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 5b6742c00..6a2b49ced 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index ac12e0d57..2d04c1cb8 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 1a7753962..c535b514d 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 95bc201ea..db847e339 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index abc4846c1..efe13d2df 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 17549d2e5..4693d3db4 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 8e4ff4aed..d7dc12567 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 25b8c7170..c9286f55b 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index b3210f9a7..8ea9d9df7 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 798cf3a27..813485e9b 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 20a9c980f..161e87a87 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 713667d56..e39989fc8 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 71cada77d..7c50c0138 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 2992adff1..421b7fab3 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 4d9f0a4b7..5d588a634 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 9ebd3f9bc..5ce154fa9 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 2f82f3965..d94dd2b56 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3271--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 0185c5568..83d519811 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -766,7 +766,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.10.3271-develop + * secion v3.1.10.3274-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index e5de08d1c..e3802e1f5 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.10.3271-develop'; + gc_version constant varchar2(50) := 'v3.1.10.3274-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From b3973d09a7d111e85b5e8a6c4904e1e1e28b35d1 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 29 Nov 2019 22:54:35 +0000 Subject: [PATCH 0621/1096] Fixed test dependency on user running them. Resolves #969 --- test/ut3_tester/core/test_ut_suite.pkb | 14 +++--- test/ut3_tester/core/test_ut_test.pkb | 60 +++++++++++++------------- test/ut3_tester_helper/run_helper.pkb | 6 +-- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/test/ut3_tester/core/test_ut_suite.pkb b/test/ut3_tester/core/test_ut_suite.pkb index 3ea323a6d..9c52df9e5 100644 --- a/test/ut3_tester/core/test_ut_suite.pkb +++ b/test/ut3_tester/core/test_ut_suite.pkb @@ -19,11 +19,11 @@ create or replace package body test_ut_suite is l_suite ut3.ut_suite; begin --Arrange - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); + l_suite := ut3.ut_suite(a_object_owner => 'ut3_tester_helper', a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); l_suite.path := 'ut3_tester_helper.ut_example_tests'; l_suite.disabled_flag := ut3.ut_utils.boolean_to_int(true); - l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'set_g_number_0', ut3.ut_utils.gc_before_all)); - l_suite.after_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'add_1_to_g_number', ut3.ut_utils.gc_before_all)); + l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'UT_EXAMPLE_TESTS', 'set_g_number_0', ut3.ut_utils.gc_before_all)); + l_suite.after_all_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'UT_EXAMPLE_TESTS', 'add_1_to_g_number', ut3.ut_utils.gc_before_all)); l_suite.items.extend; l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => 'ut3_tester_helper', a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); l_suite.items.extend; @@ -44,9 +44,9 @@ create or replace package body test_ut_suite is l_suite ut3.ut_suite; begin --Arrange - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); + l_suite := ut3.ut_suite(a_object_owner => 'ut3_tester_helper', a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); l_suite.path := 'ut3_tester_helper.ut_example_tests'; - l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'failing_procedure', ut3.ut_utils.gc_before_all)); + l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'UT_EXAMPLE_TESTS', 'failing_procedure', ut3.ut_utils.gc_before_all)); l_suite.items.extend; l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'set_g_number_0', a_line_no=> 1); --Act @@ -65,9 +65,9 @@ create or replace package body test_ut_suite is l_suite ut3.ut_suite; begin --Arrange - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); + l_suite := ut3.ut_suite(a_object_owner => 'ut3_tester_helper', a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); l_suite.path := 'ut3_tester_helper.ut_example_tests'; - l_suite.after_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_EXAMPLE_TESTS', 'failing_procedure', ut3.ut_utils.gc_after_all)); + l_suite.after_all_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'UT_EXAMPLE_TESTS', 'failing_procedure', ut3.ut_utils.gc_after_all)); l_suite.items.extend; l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => 'ut3_tester_helper', a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'set_g_number_0', a_line_no=> 1); diff --git a/test/ut3_tester/core/test_ut_test.pkb b/test/ut3_tester/core/test_ut_test.pkb index 2a85a323f..b4dcc2536 100644 --- a/test/ut3_tester/core/test_ut_test.pkb +++ b/test/ut3_tester/core/test_ut_test.pkb @@ -12,7 +12,7 @@ create or replace package body test_ut_test is --Arrange l_suite := ut3.ut_suite(a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_line_no=> 1); l_suite.path := 'ut3_tester_helper.ut_example_tests'; - l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_all)); + l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_all)); l_suite.items.extend; l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); @@ -38,11 +38,11 @@ create or replace package body test_ut_test is --Arrange l_suite := ut3.ut_suite(a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_line_no=> 1); l_suite.path := 'ut3_tester_helper.ut_example_tests'; - l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_all)); + l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_all)); l_test := ut3.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); - l_test.before_test_list := ut3.ut_executables(ut3.ut_executable(USER, 'ut_example_tests', 'add_1_to_g_number', ut3.ut_utils.gc_before_test)); - l_test.after_test_list := ut3.ut_executables(ut3.ut_executable(USER, 'ut_example_tests', 'failing_procedure', ut3.ut_utils.gc_after_test)); + l_test.before_test_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'add_1_to_g_number', ut3.ut_utils.gc_before_test)); + l_test.after_test_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'failing_procedure', ut3.ut_utils.gc_after_test)); l_suite.items.extend; l_suite.items(l_suite.items.last) := l_test; l_suite.items.extend; @@ -65,10 +65,10 @@ create or replace package body test_ut_test is begin --Arrange l_suite := ut3.ut_suite(a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_line_no=> 1); - l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_all)); + l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_all)); l_test := ut3.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); - l_test.before_each_list := ut3.ut_executables(ut3.ut_executable(USER, 'ut_example_tests', 'add_1_to_g_number', ut3.ut_utils.gc_before_each)); - l_test.after_each_list := ut3.ut_executables(ut3.ut_executable(USER, 'ut_example_tests', 'failing_procedure', ut3.ut_utils.gc_after_each)); + l_test.before_each_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'add_1_to_g_number', ut3.ut_utils.gc_before_each)); + l_test.after_each_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'failing_procedure', ut3.ut_utils.gc_after_each)); l_suite.items.extend; l_suite.items(l_suite.items.last) := l_test; l_suite.items.extend; @@ -90,11 +90,11 @@ create or replace package body test_ut_test is l_test ut3.ut_test; begin --Arrange - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'ut_example_tests', a_line_no=> 1); - l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_all)); + l_suite := ut3.ut_suite(a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_line_no=> 1); + l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_all)); l_test := ut3.ut_test(a_object_owner =>'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); - l_test.before_test_list := ut3.ut_executables(ut3.ut_executable(USER, 'ut_example_tests', 'failing_procedure', ut3.ut_utils.gc_before_test)); - l_test.after_test_list := ut3.ut_executables(ut3.ut_executable(USER, 'ut_example_tests', 'add_1_to_g_number', ut3.ut_utils.gc_after_test)); + l_test.before_test_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'failing_procedure', ut3.ut_utils.gc_before_test)); + l_test.after_test_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'add_1_to_g_number', ut3.ut_utils.gc_after_test)); l_suite.items.extend; l_suite.items(l_suite.items.last) := l_test; l_suite.items.extend; @@ -116,15 +116,15 @@ create or replace package body test_ut_test is l_test ut3.ut_test; begin --Arrange - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'ut_example_tests', a_line_no=> 1); - l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_all)); - l_test := ut3.ut_test(a_object_owner => USER,a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); - l_test.before_each_list := ut3.ut_executables(ut3.ut_executable(USER, 'ut_example_tests', 'failing_procedure', ut3.ut_utils.gc_before_each)); - l_test.after_each_list := ut3.ut_executables(ut3.ut_executable(USER, 'ut_example_tests', 'add_1_to_g_number', ut3.ut_utils.gc_after_each)); + l_suite := ut3.ut_suite(a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_line_no=> 1); + l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_all)); + l_test := ut3.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); + l_test.before_each_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'failing_procedure', ut3.ut_utils.gc_before_each)); + l_test.after_each_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'add_1_to_g_number', ut3.ut_utils.gc_after_each)); l_suite.items.extend; l_suite.items(l_suite.items.last) := l_test; l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => USER,a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); --Act l_suite.do_execute(); --Assert @@ -148,8 +148,8 @@ create or replace package body test_ut_test is begin l_test.after_each_list := ut3.ut_executables( ut3.ut_executable( - user, - 'UT_EXAMPLE_TESTS', + 'ut3_tester_helper', + 'ut_example_tests', 'add_1_to_g_number', ut3.ut_utils.gc_after_each ) @@ -171,7 +171,7 @@ create or replace package body test_ut_test is ); begin l_test.after_each_list := ut3.ut_executables( - ut3.ut_executable(user, 'ut_example_tests', 'invalid setup name', ut3.ut_utils.gc_after_each) + ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'invalid setup name', ut3.ut_utils.gc_after_each) ); --Act l_test.do_execute(); @@ -190,7 +190,7 @@ create or replace package body test_ut_test is ); begin l_test.after_each_list := ut3.ut_executables( - ut3.ut_executable(user, 'ut_example_tests', null, ut3.ut_utils.gc_after_each) + ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', null, ut3.ut_utils.gc_after_each) ); --Act l_test.do_execute(); @@ -325,7 +325,7 @@ create or replace package body test_ut_test is a_line_no => null ); begin - l_test.before_each_list := ut3.ut_executables(ut3.ut_executable(user, 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_each)); + l_test.before_each_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_each)); --Act l_test.do_execute(); --Assert @@ -344,7 +344,7 @@ create or replace package body test_ut_test is ); begin l_test.before_each_list := ut3.ut_executables( - ut3.ut_executable(user, 'ut_example_tests', 'invalid setup name', ut3.ut_utils.gc_before_each) + ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'invalid setup name', ut3.ut_utils.gc_before_each) ); --Act l_test.do_execute(); @@ -363,7 +363,7 @@ create or replace package body test_ut_test is ); begin l_test.before_each_list := ut3.ut_executables( - ut3.ut_executable(user, 'ut_example_tests', null, ut3.ut_utils.gc_before_each) + ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', null, ut3.ut_utils.gc_before_each) ); --Act l_test.do_execute(); @@ -529,7 +529,7 @@ create or replace package body test_ut_test is a_line_no => null ); begin - l_test.before_test_list := ut3.ut_executables(ut3.ut_executable(user, 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_test)); + l_test.before_test_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_test)); --Act l_test.do_execute(); --Assert @@ -547,7 +547,7 @@ create or replace package body test_ut_test is ); begin l_test.before_test_list := ut3.ut_executables( - ut3.ut_executable(user, 'ut_example_tests', 'invalid setup name', ut3.ut_utils.gc_before_test) + ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'invalid setup name', ut3.ut_utils.gc_before_test) ); --Act l_test.do_execute(); @@ -566,7 +566,7 @@ create or replace package body test_ut_test is ); begin l_test.before_test_list := ut3.ut_executables( - ut3.ut_executable(user, 'ut_example_tests', null, ut3.ut_utils.gc_before_test) + ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', null, ut3.ut_utils.gc_before_test) ); --Act l_test.do_execute(); @@ -584,7 +584,7 @@ create or replace package body test_ut_test is a_line_no => null ); begin - l_test.after_test_list := ut3.ut_executables(ut3.ut_executable(user, 'ut_example_tests', 'add_1_to_g_number', ut3.ut_utils.gc_after_test)); + l_test.after_test_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'add_1_to_g_number', ut3.ut_utils.gc_after_test)); --Act l_test.do_execute(); --Assert @@ -602,7 +602,7 @@ create or replace package body test_ut_test is ); begin l_test.after_test_list := ut3.ut_executables( - ut3.ut_executable(user, 'ut_example_tests', 'invalid procedure name', ut3.ut_utils.gc_after_test) + ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'invalid procedure name', ut3.ut_utils.gc_after_test) ); --Act l_test.do_execute(); @@ -621,7 +621,7 @@ create or replace package body test_ut_test is ); begin l_test.after_test_list := ut3.ut_executables( - ut3.ut_executable(user, 'ut_example_tests', null, ut3.ut_utils.gc_after_test) + ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', null, ut3.ut_utils.gc_after_test) ); --Act l_test.do_execute(); diff --git a/test/ut3_tester_helper/run_helper.pkb b/test/ut3_tester_helper/run_helper.pkb index ef6528e04..9a9c8587f 100644 --- a/test/ut3_tester_helper/run_helper.pkb +++ b/test/ut3_tester_helper/run_helper.pkb @@ -550,11 +550,11 @@ create or replace package body run_helper is begin --Arrange execute immediate 'delete from ut$test_table'; - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_TRANSACTION_CONTROL', a_line_no=> 1); + l_suite := ut3.ut_suite(a_object_owner => 'ut3_tester_helper', a_object_name => 'UT_TRANSACTION_CONTROL', a_line_no=> 1); l_suite.path := 'ut_transaction_control'; - l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_TRANSACTION_CONTROL', 'setup', ut3.ut_utils.gc_before_all)); + l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'UT_TRANSACTION_CONTROL', 'setup', ut3.ut_utils.gc_before_all)); l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => USER, a_object_name => 'ut_transaction_control',a_name => a_procedure_name, a_line_no=> 1); + l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_transaction_control',a_name => a_procedure_name, a_line_no=> 1); l_suite.set_rollback_type(a_rollback_type); --Act From 39d144ae7f55cf13cd22d5d313f96c742980b305 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 30 Nov 2019 00:59:11 +0000 Subject: [PATCH 0622/1096] Changed how savepoint name is generated. Resolves #982 --- source/core/coverage/proftab.sql | 2 +- source/core/ut_savepoint_seq.sql | 15 --------------- source/core/ut_utils.pkb | 2 +- source/install.sql | 1 - source/uninstall_objects.sql | 2 -- 5 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 source/core/ut_savepoint_seq.sql diff --git a/source/core/coverage/proftab.sql b/source/core/coverage/proftab.sql index 62c69dc9a..a5d09f43d 100644 --- a/source/core/coverage/proftab.sql +++ b/source/core/coverage/proftab.sql @@ -37,7 +37,7 @@ begin if l_tab_exist = 0 then execute immediate q'[create table plsql_profiler_units ( - runid number references plsql_profiler_runs, + runid number(18) references plsql_profiler_runs, unit_number number, -- internally generated library unit # unit_type varchar2(128), -- library unit type unit_owner varchar2(128), -- library unit owner name diff --git a/source/core/ut_savepoint_seq.sql b/source/core/ut_savepoint_seq.sql deleted file mode 100644 index e1d80f452..000000000 --- a/source/core/ut_savepoint_seq.sql +++ /dev/null @@ -1,15 +0,0 @@ -create sequence ut_savepoint_seq - /* - utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project - Licensed under the Apache License, Version 2.0 (the "License"): - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - start with 1 cache 20; \ No newline at end of file diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 83d519811..d593f0a65 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -59,7 +59,7 @@ create or replace package body ut_utils is function gen_savepoint_name return varchar2 is begin - return 's'||trim(to_char(ut_savepoint_seq.nextval,'0000000000000000000000000000')); + return 's'||to_char(systimestamp,'yyyymmddhh24missff9'); end; procedure debug_log(a_message varchar2) is diff --git a/source/install.sql b/source/install.sql index 1f9913b0a..5a4f1449c 100644 --- a/source/install.sql +++ b/source/install.sql @@ -59,7 +59,6 @@ end; @@install_component.sql 'core/types/ut_reporters_info.tps' @@install_component.sql 'core/ut_utils.pks' @@install_component.sql 'core/ut_metadata.pks' -@@install_component.sql 'core/ut_savepoint_seq.sql' @@install_component.sql 'core/ut_utils.pkb' @@install_component.sql 'core/ut_metadata.pkb' @@install_component.sql 'reporters/ut_ansiconsole_helper.pks' diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index c905153f4..d540efbbb 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -243,8 +243,6 @@ end; drop package ut_utils; -drop sequence ut_savepoint_seq; - drop type ut_documentation_reporter force; drop type ut_debug_reporter force; From 4bb7a951ef5bac19ec98233e979d093c3bef9bc8 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 30 Nov 2019 16:55:24 +0000 Subject: [PATCH 0623/1096] Added a hash of owner to the generated savepoint name. Resolves #982 --- source/core/coverage/proftab.sql | 2 +- source/core/ut_savepoint_seq.sql | 15 +++++++++++++++ source/core/ut_utils.pkb | 3 ++- source/install.sql | 1 + source/uninstall_objects.sql | 2 ++ 5 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 source/core/ut_savepoint_seq.sql diff --git a/source/core/coverage/proftab.sql b/source/core/coverage/proftab.sql index a5d09f43d..62c69dc9a 100644 --- a/source/core/coverage/proftab.sql +++ b/source/core/coverage/proftab.sql @@ -37,7 +37,7 @@ begin if l_tab_exist = 0 then execute immediate q'[create table plsql_profiler_units ( - runid number(18) references plsql_profiler_runs, + runid number references plsql_profiler_runs, unit_number number, -- internally generated library unit # unit_type varchar2(128), -- library unit type unit_owner varchar2(128), -- library unit owner name diff --git a/source/core/ut_savepoint_seq.sql b/source/core/ut_savepoint_seq.sql new file mode 100644 index 000000000..b87d18e6d --- /dev/null +++ b/source/core/ut_savepoint_seq.sql @@ -0,0 +1,15 @@ +create sequence ut_savepoint_seq + /* + utPLSQL - Version 3 + Copyright 2016 - 2019 utPLSQL Project + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + start with 1 cache 20 minvalue 1 maxvalue 99999999999999999 cycle; \ No newline at end of file diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index d593f0a65..8ebb50f53 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -22,6 +22,7 @@ create or replace package body ut_utils is gc_invalid_first_xml_char constant varchar2(50) := '[^_a-zA-Z]'; gc_invalid_xml_char constant varchar2(50) := '[^_a-zA-Z0-9\.-]'; gc_full_valid_xml_name constant varchar2(50) := '^([_a-zA-Z])([_a-zA-Z0-9\.-])*$'; + gc_owner_hash constant integer(11) := dbms_utility.get_hash_value( ut_owner(), 0, power(2,31)-1); function surround_with(a_value varchar2, a_quote_char varchar2) return varchar2 is begin @@ -59,7 +60,7 @@ create or replace package body ut_utils is function gen_savepoint_name return varchar2 is begin - return 's'||to_char(systimestamp,'yyyymmddhh24missff9'); + return 's'||gc_owner_hash||trim(to_char(ut_savepoint_seq.nextval,'00000000000000000')); end; procedure debug_log(a_message varchar2) is diff --git a/source/install.sql b/source/install.sql index 5a4f1449c..1f9913b0a 100644 --- a/source/install.sql +++ b/source/install.sql @@ -59,6 +59,7 @@ end; @@install_component.sql 'core/types/ut_reporters_info.tps' @@install_component.sql 'core/ut_utils.pks' @@install_component.sql 'core/ut_metadata.pks' +@@install_component.sql 'core/ut_savepoint_seq.sql' @@install_component.sql 'core/ut_utils.pkb' @@install_component.sql 'core/ut_metadata.pkb' @@install_component.sql 'reporters/ut_ansiconsole_helper.pks' diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index d540efbbb..c905153f4 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -243,6 +243,8 @@ end; drop package ut_utils; +drop sequence ut_savepoint_seq; + drop type ut_documentation_reporter force; drop type ut_debug_reporter force; From 42053b4c5bd3badb964176e83571b4c42791b734 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sat, 30 Nov 2019 18:39:06 +0000 Subject: [PATCH 0624/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 6a2b49ced..439a68670 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 2d04c1cb8..e0c634bf8 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index c535b514d..31192f201 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index db847e339..7a5f97899 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index efe13d2df..56f7877ca 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 4693d3db4..634c51837 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index d7dc12567..293977ac1 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index c9286f55b..2cbdf83f0 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 8ea9d9df7..53b4622c7 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 813485e9b..89d1f290f 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 161e87a87..4f983ee3a 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index e39989fc8..47d3803ae 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 7c50c0138..d1a35e5be 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 421b7fab3..d52fdbc87 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 5d588a634..91ebd0ced 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 5ce154fa9..9a727b56e 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index d94dd2b56..29af9c353 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3274--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 8ebb50f53..9d002b4ad 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -767,7 +767,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.10.3274-develop + * secion v3.1.10.3282-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index e3802e1f5..950b84216 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.10.3274-develop'; + gc_version constant varchar2(50) := 'v3.1.10.3282-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From d654cccee281ac28c4c437fdf6be9e5aa8e96287 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 1 Dec 2019 14:01:29 +0000 Subject: [PATCH 0625/1096] Changed the target location for published documentation. Now it's published into main utplsql.gihub.io repository. --- .travis.yml | 6 +- ..._gh_pages.sh => push_docs_to_github_io.sh} | 62 +++++++++---------- .travis/update_project_version.sh | 2 + 3 files changed, 33 insertions(+), 37 deletions(-) rename .travis/{push_docs_to_gh_pages.sh => push_docs_to_github_io.sh} (67%) mode change 100755 => 100644 diff --git a/.travis.yml b/.travis.yml index b48adb107..7ac28e41f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,6 @@ env: - CURRENT_BRANCH=${TRAVIS_BRANCH} - UTPLSQL_REPO="utPLSQL/utPLSQL" - UTPLSQL_BUILD_NO="${TRAVIS_BUILD_NUMBER:-0}" - - UTPLSQL_VERSION_PATTERN="v?([0-9]+\.){3}[0-9]+[^']*" - UTPLSQL_VERSION=$(. .travis/get_project_version.sh) - UTPLSQL_BUILD_VERSION=$(. .travis/get_project_build_version.sh) - UTPLSQL_SOURCES_DIR='source' @@ -115,16 +114,15 @@ jobs: - pip install mkdocs before_script: skip script: - - if [[ ($TRAVIS_BRANCH == develop) && ($TRAVIS_PULL_REQUEST == false) ]]; then bash .travis/trigger_travis.sh $TRAVIS_ACCESS_TOKEN; fi - - #The update_project_version.sh needs to be done before pushing changes to develop branch - bash .travis/update_project_version.sh - git config --global user.email "builds@travis-ci.com" - git config --global user.name "${UTPLSQL_BUILD_USER_NAME}" - git remote rm origin - git remote add origin https://${github_api_token}@github.com/${UTPLSQL_REPO} - if [[ ! $TRAVIS_TAG ]]; then bash .travis/push_release_version.sh; fi + - bash .travis/push_docs_to_github_io.sh - bash .travis/build_docs.sh - - bash .travis/push_docs_to_gh_pages.sh + - if [[ ($TRAVIS_BRANCH == develop) && ($TRAVIS_PULL_REQUEST == false) ]]; then bash .travis/trigger_travis.sh $TRAVIS_ACCESS_TOKEN; fi before_deploy: - bash .travis/build_release_archive.sh deploy: diff --git a/.travis/push_docs_to_gh_pages.sh b/.travis/push_docs_to_github_io.sh old mode 100755 new mode 100644 similarity index 67% rename from .travis/push_docs_to_gh_pages.sh rename to .travis/push_docs_to_github_io.sh index d2c5a685c..add63aa1b --- a/.travis/push_docs_to_gh_pages.sh +++ b/.travis/push_docs_to_github_io.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Many aspects of this came from https://gist.github.com/domenic/ec8b0fc8ab45f39403dd +# Based on `push_docs_to_gh_pages.sh` # Significant alterations # - Support for multiple copies of documentation, # - only clearing out develop @@ -13,59 +13,55 @@ # - File: "docs/index.md" with that contains develop docs # Required ENV Variables -PAGES_TARGET_BRANCH="gh-pages" LATEST_DOCS_BRANCH="develop" +GITHUB_IO_REPO='jgebal/jgebal.github.io' +GITHUB_IO_BRANCH='master' + # TRAVIS_* variables are set by travis directly and only need to be if testing externally -# We don't want a pull request automatically updating the repository +# We deploy only when building on develop branch or on TAG (release) if [ "$TRAVIS_PULL_REQUEST" == "false" ] && { [ "${CURRENT_BRANCH}" == "${LATEST_DOCS_BRANCH}" ] || [ -n "${TRAVIS_TAG}" ]; }; then # ENV Variable checks are to help with configuration troubleshooting, they silently exit with unique message. # Anyone one of them not set can be used to turn off this functionality. # If a version of the project is not defined - [[ -n "${UTPLSQL_VERSION}" ]] || { echo "variable UTPLSQL_VERSION is not defines or missing value"; exit 0; } + [[ -n "${UTPLSQL_VERSION}" ]] || { echo "variable UTPLSQL_VERSION is not defines or missing value"; exit 1; } # Fail if the markdown documentation is not present. [[ -f ./docs/index.md ]] || { echo "file docs/index.md not found"; exit 1; } - # Save some useful information + # Store latest commit SHA to be used when committing and pushing to github.io repo SHA=`git rev-parse --verify HEAD` - # clone the repository and switch to PAGES_TARGET_BRANCH branch + # clone the repository and switch to GITHUB_IO_BRANCH branch mkdir pages - cd pages - git clone https://${github_api_token}@github.com/${UTPLSQL_REPO} . - - PAGES_BRANCH_EXISTS=$(git ls-remote --heads origin ${PAGES_TARGET_BRANCH}) + cd ./pages + git clone --depth 1 https://${github_api_token}@github.com/${GITHUB_IO_REPO} -b ${GITHUB_IO_BRANCH} . - if [ -n "$PAGES_BRANCH_EXISTS" ] ; then - echo "Pages Branch Found" - git checkout ${PAGES_TARGET_BRANCH} - else - echo "Creating Pages Branch" - git checkout --orphan ${PAGES_TARGET_BRANCH} - git rm -rf . - fi + mkdir -p utPLSQL + cd ./utPLSQL #clear out develop documentation directory and copy docs contents to it. - echo "updating 'develop' directory" - mkdir -p develop - rm -rf develop/**./* || exit 0 - cp -a ../docs/. ./develop + echo "updating 'develop' documentation directory" + mkdir -p ./develop + rm -rf ./develop/**./* || exit 0 + cp -a ../../docs/. ./develop + # If a Tagged Build then copy to it's own directory as well and to the 'latest' release directory if [ -n "$TRAVIS_TAG" ]; then - echo "Creating ${UTPLSQL_VERSION}" - mkdir -p ${UTPLSQL_VERSION} - rm -rf ${UTPLSQL_VERSION}/**./* || exit 0 - cp -a ../docs/. ${UTPLSQL_VERSION} - echo "Populating 'latest' directory" - mkdir -p latest - rm -rf latest/**./* || exit 0 - cp -a ../docs/. latest + echo "Creating directory ./${UTPLSQL_VERSION}" + mkdir -p ./${UTPLSQL_VERSION} + rm -rf ./${UTPLSQL_VERSION}/**./* || exit 0 + cp -a ../../docs/. ./${UTPLSQL_VERSION} + echo "Populating 'latest' directory" + mkdir -p ./latest + rm -rf ./latest/**./* || exit 0 + cp -a ../../docs/. ./latest fi # Stage changes for commit git add . + #Check if there are doc changes, if none exit the script - if [[ -z `git diff HEAD --exit-code` ]] && [ -n "${PAGES_BRANCH_EXISTS}" ] ; then + if [[ -z `git diff HEAD --exit-code` ]]; then echo "No changes to docs detected." exit 0 fi @@ -75,7 +71,7 @@ if [ "$TRAVIS_PULL_REQUEST" == "false" ] && { [ "${CURRENT_BRANCH}" == "${LATEST echo "---" >>index.md echo "layout: default" >>index.md echo "---" >>index.md - echo "" >>index.md + echo "" >>index.md echo "# Documentation versions" >>index.md echo "" >>index.md echo "" >>index.md #- 7th line - placeholder for latest release doc @@ -96,6 +92,6 @@ if [ "$TRAVIS_PULL_REQUEST" == "false" ] && { [ "${CURRENT_BRANCH}" == "${LATEST git add . git commit -m "Deploy to gh-pages branch: base commit ${SHA}" # Now that we're all set up, we can push. - git push --quiet origin HEAD:${PAGES_TARGET_BRANCH} + git push --quiet origin HEAD:${GITHUB_IO_BRANCH} fi diff --git a/.travis/update_project_version.sh b/.travis/update_project_version.sh index 3f162fb78..c4540eef8 100755 --- a/.travis/update_project_version.sh +++ b/.travis/update_project_version.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +UTPLSQL_VERSION_PATTERN="v?([0-9]+\.){3}[0-9]+[^']*" + echo Current branch is "${CURRENT_BRANCH}" echo Update version in project source files From 090b74c083cdec6530e37958466277040157d34d Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sun, 1 Dec 2019 14:12:54 +0000 Subject: [PATCH 0626/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 439a68670..2ba4aff9a 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index e0c634bf8..33c552f78 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 31192f201..52c21c740 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 7a5f97899..e851d6ae5 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 56f7877ca..f17d3848c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 634c51837..4f39ca713 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 293977ac1..db061005f 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 2cbdf83f0..ea7b3e50f 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 53b4622c7..95c1dadcf 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 89d1f290f..4f3375f85 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 4f983ee3a..c1995e1bc 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 47d3803ae..30fe6fcda 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index d1a35e5be..ba3f6735a 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index d52fdbc87..35455a6cd 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 91ebd0ced..21f36e1a4 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 9a727b56e..22cf5cb5e 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 29af9c353..13135431c 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3282--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 9d002b4ad..0553f0343 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -767,7 +767,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.10.3282-develop + * secion v3.1.10.3290-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 950b84216..79bcc5107 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.10.3282-develop'; + gc_version constant varchar2(50) := 'v3.1.10.3290-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From e8f453291b58f90bde2fbac6a6b8562757997905 Mon Sep 17 00:00:00 2001 From: pesse Date: Thu, 19 Dec 2019 15:38:07 +0100 Subject: [PATCH 0627/1096] Skip as many %endcontext as nested %context annotations We need to make sure to calculate the corrent %endcontext annotation, not just the first that is greater than the next nested %context. To operate correctly during recursion we also need information about the parent %endcontext position Fixes #1034 --- source/core/ut_suite_builder.pkb | 56 ++++++++++++++--- test/ut3_tester/core/test_suite_builder.pkb | 68 +++++++++++++++++++++ test/ut3_tester/core/test_suite_builder.pks | 5 ++ 3 files changed, 119 insertions(+), 10 deletions(-) diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index c7e968467..f40d2f2a1 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -708,15 +708,49 @@ create or replace package body ut_suite_builder is a_context_ann_pos t_annotation_position, a_package_annotations in out nocopy tt_annotations_by_name ) return t_annotation_position is - l_result t_annotation_position; + l_next_endcontext_pos t_annotation_position; + l_next_context_pos t_annotation_position; + l_open_count integer := 0; begin if a_package_annotations.exists(gc_endcontext) then - l_result := a_package_annotations(gc_endcontext).first; - while l_result <= a_context_ann_pos loop - l_result := a_package_annotations(gc_endcontext).next(l_result); + l_next_endcontext_pos := a_package_annotations(gc_endcontext).first; + while l_next_endcontext_pos <= a_context_ann_pos loop + l_next_endcontext_pos := a_package_annotations(gc_endcontext).next(l_next_endcontext_pos); end loop; + + l_next_context_pos := a_package_annotations(gc_context).next(a_context_ann_pos); + loop + -- Get all the %context annotations between start and first %endcontext + while l_next_context_pos is not null and l_next_context_pos < l_next_endcontext_pos loop + l_open_count := l_open_count+1; + l_next_context_pos := a_package_annotations(gc_context).next(l_next_context_pos); + end loop; + -- Skip as many %endcontexts as we had additional contexts open + while l_open_count > 0 loop + l_open_count := l_open_count-1; + l_next_endcontext_pos := a_package_annotations(gc_endcontext).next(l_next_endcontext_pos); + end loop; + -- Repeat until the next %context is later than next %endcontext + exit when l_next_context_pos is null or l_next_context_pos > l_next_endcontext_pos; + end loop; end if; - return l_result; + return l_next_endcontext_pos; + end; + + function has_nested_context( + a_context_ann_pos t_annotation_position, + a_package_annotations in out nocopy tt_annotations_by_name + ) return boolean is + l_next_endcontext_pos t_annotation_position; + begin + if ( a_package_annotations.exists(gc_endcontext) and a_package_annotations.exists(gc_context)) then + l_next_endcontext_pos := a_package_annotations(gc_endcontext).first; + while l_next_endcontext_pos <= a_context_ann_pos loop + l_next_endcontext_pos := a_package_annotations(gc_endcontext).next(l_next_endcontext_pos); + end loop; + return l_next_endcontext_pos > a_package_annotations(gc_context).next(a_context_ann_pos); + end if; + return false; end; function get_annotations_in_context( @@ -753,7 +787,8 @@ create or replace package body ut_suite_builder is a_parent in out nocopy ut_suite, a_annotations in out nocopy t_annotations_info, a_suite_items out nocopy ut_suite_items, - a_parent_context_pos in integer := 0 + a_parent_context_pos in integer := 0, + a_parent_end_context_pos in integer default null ) is l_context_pos t_annotation_position; l_next_context_pos t_annotation_position; @@ -802,7 +837,6 @@ create or replace package body ut_suite_builder is l_default_context_name := 'nested_context_#'||l_context_no; l_context_name := null; l_end_context_pos := get_endcontext_position(l_context_pos, a_annotations.by_name ); - l_next_context_pos := a_annotations.by_name(gc_context).next(l_context_pos); if a_annotations.by_name.exists(gc_name) then l_context_name := @@ -841,9 +875,8 @@ create or replace package body ut_suite_builder is l_context.parse_time := a_annotations.parse_time; --if nested context found - if l_next_context_pos < l_end_context_pos or l_end_context_pos is null then - get_context_items( l_context, a_annotations, l_context_items, l_context_pos ); - l_end_context_pos := get_endcontext_position(l_context_pos, a_annotations.by_name ); + if has_nested_context(l_context_pos, a_annotations.by_name) then + get_context_items( l_context, a_annotations, l_context_items, l_context_pos, l_end_context_pos ); else l_context_items := ut_suite_items(); end if; @@ -870,6 +903,9 @@ create or replace package body ut_suite_builder is exit when not a_annotations.by_name.exists( gc_context); l_context_pos := a_annotations.by_name( gc_context).next( l_context_pos); + if ( a_parent_end_context_pos is not null and a_parent_end_context_pos <= l_context_pos ) then + l_context_pos := null; + end if; l_context_no := l_context_no + 1; end loop; end; diff --git a/test/ut3_tester/core/test_suite_builder.pkb b/test/ut3_tester/core/test_suite_builder.pkb index a204a04e6..8250eb96e 100644 --- a/test/ut3_tester/core/test_suite_builder.pkb +++ b/test/ut3_tester/core/test_suite_builder.pkb @@ -767,6 +767,74 @@ create or replace package body test_suite_builder is ); end; + procedure nested_contexts_2 is + l_actual clob; + l_annotations ut3.ut_annotations; + begin + --Arrange + l_annotations := ut3.ut_annotations( + ut3.ut_annotation( 1, 'suite','Cool', null), + ut3.ut_annotation( 2, 'suitepath','path', null), + ut3.ut_annotation( 3, 'context','Level 1', null), + ut3.ut_annotation( 4, 'name','context_1', null), + ut3.ut_annotation( 5, 'context','Level 1.1', null), + ut3.ut_annotation( 6, 'name','context_1_1', null), + ut3.ut_annotation( 7, 'test', 'Test 1.1.1', 'test_1_1_1'), + ut3.ut_annotation( 8, 'test', 'Test 1.1.2', 'test_1_1_2'), + ut3.ut_annotation( 9, 'endcontext', null, null), + ut3.ut_annotation(10, 'endcontext', null, null), + ut3.ut_annotation(11, 'context','Level 2', null), + ut3.ut_annotation(12, 'name','context_2', null), + ut3.ut_annotation(13, 'test', 'Test 2.1', 'test_2_1'), + ut3.ut_annotation(14, 'endcontext',null, null) + ); + --Act + l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); + --Assert + ut.expect(l_actual).to_be_like( + ''|| + '' || + '%%' || + '' || + '%context_1Level 1path.some_package.context_1' || + '%' || + '' || + '%context_1_1Level 1.1path.some_package.context_1.context_1_1' || + '%' || + '' || + '%test_1_1_1Test 1.1.1path.some_package.context_1.context_1_1.test_1_1_1' || + '%' || + '' || + '%test_1_1_2Test 1.1.2path.some_package.context_1.context_1_1.test_1_1_2' || + '%' || + '' || + '%' || + '%' || + '' || + '%' || + '%' || + '%'|| + '' + ); + -- Test both contexts separately due to ordering + ut.expect(l_actual).to_be_like( + ''|| + '' || + '%%' || + '' || + '%context_2Level 2path.some_package.context_2' || + '%' || + '' || + '%test_2_1Test 2.1path.some_package.context_2.test_2_1' || + '%' || + '%' || + '%' || + '%' || + '%'|| + '' + ); + end; + procedure before_after_in_context is l_actual clob; diff --git a/test/ut3_tester/core/test_suite_builder.pks b/test/ut3_tester/core/test_suite_builder.pks index 7a85cb946..98a61171e 100644 --- a/test/ut3_tester/core/test_suite_builder.pks +++ b/test/ut3_tester/core/test_suite_builder.pks @@ -3,6 +3,7 @@ create or replace package test_suite_builder is --%suitepath(utplsql.ut3_tester.core) --%context(--%suite annotation) + --%name(suite) --%test(Sets suite name from package name and leaves description empty) procedure no_suite_description; @@ -105,6 +106,7 @@ create or replace package test_suite_builder is --%endcontext --%context(--%context annotation) + --%name(context) --%test(Creates nested suite for content between context/endcontext annotations) procedure suite_from_context; @@ -112,6 +114,9 @@ create or replace package test_suite_builder is --%test(Creates nested contexts inside a context) procedure nested_contexts; + --%test(Creates multiple nested contexts inside a context) + procedure nested_contexts_2; + --%test(Associates before/after all/each to tests in context only) procedure before_after_in_context; From 8df3f7d5d505f463d8ca5162e1bc608e0d8997b3 Mon Sep 17 00:00:00 2001 From: pesse Date: Thu, 19 Dec 2019 15:49:06 +0100 Subject: [PATCH 0628/1096] Refactoring: Extract function, add variables for readability --- source/core/ut_suite_builder.pkb | 36 ++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index f40d2f2a1..a4a1da7ee 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -704,6 +704,22 @@ create or replace package body ut_suite_builder is set_seq_no(a_suite.after_all_list); end; + function get_next_annotation_of_type( + a_start_position t_annotation_position, + a_annotation_type varchar2, + a_package_annotations in out nocopy tt_annotations_by_name + ) return t_annotation_position is + l_result t_annotation_position; + begin + if a_package_annotations.exists(a_annotation_type) then + l_result := a_package_annotations(a_annotation_type).first; + while l_result <= a_start_position loop + l_result := a_package_annotations(a_annotation_type).next(l_result); + end loop; + end if; + return l_result; + end; + function get_endcontext_position( a_context_ann_pos t_annotation_position, a_package_annotations in out nocopy tt_annotations_by_name @@ -712,13 +728,10 @@ create or replace package body ut_suite_builder is l_next_context_pos t_annotation_position; l_open_count integer := 0; begin - if a_package_annotations.exists(gc_endcontext) then - l_next_endcontext_pos := a_package_annotations(gc_endcontext).first; - while l_next_endcontext_pos <= a_context_ann_pos loop - l_next_endcontext_pos := a_package_annotations(gc_endcontext).next(l_next_endcontext_pos); - end loop; + if a_package_annotations.exists(gc_endcontext) and a_package_annotations.exists(gc_context) then + l_next_endcontext_pos := get_next_annotation_of_type(a_context_ann_pos, gc_endcontext, a_package_annotations); + l_next_context_pos := a_package_annotations(gc_context).next(a_context_ann_pos); - l_next_context_pos := a_package_annotations(gc_context).next(a_context_ann_pos); loop -- Get all the %context annotations between start and first %endcontext while l_next_context_pos is not null and l_next_context_pos < l_next_endcontext_pos loop @@ -742,13 +755,14 @@ create or replace package body ut_suite_builder is a_package_annotations in out nocopy tt_annotations_by_name ) return boolean is l_next_endcontext_pos t_annotation_position; + l_next_context_pos t_annotation_position; begin if ( a_package_annotations.exists(gc_endcontext) and a_package_annotations.exists(gc_context)) then - l_next_endcontext_pos := a_package_annotations(gc_endcontext).first; - while l_next_endcontext_pos <= a_context_ann_pos loop - l_next_endcontext_pos := a_package_annotations(gc_endcontext).next(l_next_endcontext_pos); - end loop; - return l_next_endcontext_pos > a_package_annotations(gc_context).next(a_context_ann_pos); + l_next_endcontext_pos := get_next_annotation_of_type(a_context_ann_pos, gc_endcontext, a_package_annotations); + l_next_context_pos := a_package_annotations(gc_context).next(a_context_ann_pos); + if ( l_next_context_pos < l_next_endcontext_pos ) then + return true; + end if; end if; return false; end; From a4d92dea60e98246ec21db6bbc0dfa9a3fa46971 Mon Sep 17 00:00:00 2001 From: pesse Date: Thu, 19 Dec 2019 15:51:12 +0100 Subject: [PATCH 0629/1096] Refactoring: Add clarifying comment --- source/core/ut_suite_builder.pkb | 1 + 1 file changed, 1 insertion(+) diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index a4a1da7ee..810da27ab 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -917,6 +917,7 @@ create or replace package body ut_suite_builder is exit when not a_annotations.by_name.exists( gc_context); l_context_pos := a_annotations.by_name( gc_context).next( l_context_pos); + -- don't go on when the next context is outside the parent's context boundaries if ( a_parent_end_context_pos is not null and a_parent_end_context_pos <= l_context_pos ) then l_context_pos := null; end if; From 4d1500f9ac2c89aed17471bddf871ecdaceb200f Mon Sep 17 00:00:00 2001 From: pesse Date: Thu, 19 Dec 2019 21:04:21 +0100 Subject: [PATCH 0630/1096] Refactoring: Move responsibility to get context name completely to get_context_name --- source/core/ut_suite_builder.pkb | 53 ++++++++++++++++---------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index 810da27ab..d013c107e 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -817,26 +817,35 @@ create or replace package body ut_suite_builder is l_default_context_name t_object_name; function get_context_name( a_parent in out nocopy ut_suite, - a_context_names in tt_annotation_texts, - a_start_position binary_integer, - a_end_position binary_integer + a_start_position binary_integer ) return varchar2 is l_result t_annotation_name; l_found boolean; + l_end_position binary_integer; l_annotation_pos binary_integer; + l_context_names tt_annotation_texts; begin - l_annotation_pos := a_context_names.first; - while l_annotation_pos is not null loop - if l_annotation_pos > a_start_position and l_annotation_pos < a_end_position then - if l_found then - add_annotation_ignored_warning(a_parent, gc_name,'Duplicate annotation %%%.', l_annotation_pos); - else - l_result := a_context_names(l_annotation_pos); - end if; - l_found := true; - end if; - l_annotation_pos := a_context_names.next(l_annotation_pos); - end loop; + if a_annotations.by_name.exists(gc_name) then + l_context_names := a_annotations.by_name( gc_name ); + l_end_position := + least( + coalesce( get_endcontext_position(a_start_position, a_annotations.by_name), a_annotations.by_line.last ), + coalesce( a_annotations.by_name(gc_context).next(a_start_position), a_annotations.by_line.last ) + ); + l_annotation_pos := l_context_names.first; + + while l_annotation_pos is not null loop + if l_annotation_pos > a_start_position and l_annotation_pos < l_end_position then + if l_found then + add_annotation_ignored_warning(a_parent, gc_name,'Duplicate annotation %%%.', l_annotation_pos); + else + l_result := l_context_names(l_annotation_pos); + end if; + l_found := true; + end if; + l_annotation_pos := l_context_names.next(l_annotation_pos); + end loop; + end if; return l_result; end; begin @@ -852,18 +861,8 @@ create or replace package body ut_suite_builder is l_context_name := null; l_end_context_pos := get_endcontext_position(l_context_pos, a_annotations.by_name ); l_next_context_pos := a_annotations.by_name(gc_context).next(l_context_pos); - if a_annotations.by_name.exists(gc_name) then - l_context_name := - get_context_name( - a_parent, - a_annotations.by_name( gc_name ), - l_context_pos, - least( - coalesce( l_end_context_pos, a_annotations.by_line.last ), - coalesce( l_next_context_pos, a_annotations.by_line.last ) - ) - ); - end if; + l_context_name := get_context_name(a_parent, l_context_pos); + if not regexp_like( l_context_name, '^(\w|[$#])+$' ) or l_context_name is null then if not regexp_like( l_context_name, '^(\w|[$#])+$' ) then a_parent.put_warning( From 3c547ecd57d96101b81ca21e70003500e80a99b8 Mon Sep 17 00:00:00 2001 From: pesse Date: Fri, 20 Dec 2019 08:22:23 +0100 Subject: [PATCH 0631/1096] Fix intendation --- source/core/ut_suite_builder.pkb | 76 ++++++++++++++++---------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index d013c107e..0c0730c4b 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -15,7 +15,7 @@ create or replace package body ut_suite_builder is See the License for the specific language governing permissions and limitations under the License. */ - + subtype t_annotation_text is varchar2(4000); subtype t_annotation_name is varchar2(4000); subtype t_object_name is varchar2(500); @@ -315,13 +315,13 @@ create or replace package body ut_suite_builder is l_annotation_pos := a_throws_ann_text.next(l_annotation_pos); end loop; end; - + procedure add_tags_to_suite_item( a_suite in out nocopy ut_suite, a_tags_ann_text tt_annotation_texts, a_list in out nocopy ut_varchar2_rows, a_procedure_name t_object_name := null - ) is + ) is l_annotation_pos binary_integer; l_tags_list ut_varchar2_list := ut_varchar2_list(); l_tag_items ut_varchar2_list; @@ -354,7 +354,7 @@ create or replace package body ut_suite_builder is --remove empty strings from table list e.g. tag1,,tag2 and convert to rows a_list := ut_utils.convert_collection( ut_utils.filter_list(set(l_tags_list),ut_utils.gc_word_no_space) ); end; - + procedure set_seq_no( a_list in out nocopy ut_executables ) is @@ -533,16 +533,16 @@ create or replace package body ut_suite_builder is ); set_seq_no(l_test.after_test_list); end if; - + if l_proc_annotations.exists( gc_tags) then add_tags_to_suite_item(a_suite, l_proc_annotations( gc_tags), l_test.tags, a_procedure_name); end if; - + if l_proc_annotations.exists( gc_throws) then add_to_throws_numbers_list(a_suite, l_test.expected_error_codes, a_procedure_name, l_proc_annotations( gc_throws)); end if; l_test.disabled_flag := ut_utils.boolean_to_int( l_proc_annotations.exists( gc_disabled)); - + a_suite_items.extend; a_suite_items( a_suite_items.last ) := l_test; @@ -687,7 +687,7 @@ create or replace package body ut_suite_builder is if a_annotations.by_name.exists(gc_aftereach) then l_after_each_list := add_executables( a_suite.object_owner, a_suite.object_name, a_annotations.by_name(gc_aftereach), gc_aftereach ); end if; - + if a_annotations.by_name.exists(gc_tags) then add_tags_to_suite_item(a_suite, a_annotations.by_name(gc_tags),a_suite.tags); end if; @@ -730,22 +730,22 @@ create or replace package body ut_suite_builder is begin if a_package_annotations.exists(gc_endcontext) and a_package_annotations.exists(gc_context) then l_next_endcontext_pos := get_next_annotation_of_type(a_context_ann_pos, gc_endcontext, a_package_annotations); - l_next_context_pos := a_package_annotations(gc_context).next(a_context_ann_pos); + l_next_context_pos := a_package_annotations(gc_context).next(a_context_ann_pos); loop - -- Get all the %context annotations between start and first %endcontext + -- Get all the %context annotations between start and first %endcontext while l_next_context_pos is not null and l_next_context_pos < l_next_endcontext_pos loop - l_open_count := l_open_count+1; - l_next_context_pos := a_package_annotations(gc_context).next(l_next_context_pos); - end loop; - -- Skip as many %endcontexts as we had additional contexts open - while l_open_count > 0 loop - l_open_count := l_open_count-1; - l_next_endcontext_pos := a_package_annotations(gc_endcontext).next(l_next_endcontext_pos); - end loop; - -- Repeat until the next %context is later than next %endcontext - exit when l_next_context_pos is null or l_next_context_pos > l_next_endcontext_pos; - end loop; + l_open_count := l_open_count+1; + l_next_context_pos := a_package_annotations(gc_context).next(l_next_context_pos); + end loop; + -- Skip as many %endcontexts as we had additional contexts open + while l_open_count > 0 loop + l_open_count := l_open_count-1; + l_next_endcontext_pos := a_package_annotations(gc_endcontext).next(l_next_endcontext_pos); + end loop; + -- Repeat until the next %context is later than next %endcontext + exit when l_next_context_pos is null or l_next_context_pos > l_next_endcontext_pos; + end loop; end if; return l_next_endcontext_pos; end; @@ -758,11 +758,11 @@ create or replace package body ut_suite_builder is l_next_context_pos t_annotation_position; begin if ( a_package_annotations.exists(gc_endcontext) and a_package_annotations.exists(gc_context)) then - l_next_endcontext_pos := get_next_annotation_of_type(a_context_ann_pos, gc_endcontext, a_package_annotations); - l_next_context_pos := a_package_annotations(gc_context).next(a_context_ann_pos); - if ( l_next_context_pos < l_next_endcontext_pos ) then - return true; - end if; + l_next_endcontext_pos := get_next_annotation_of_type(a_context_ann_pos, gc_endcontext, a_package_annotations); + l_next_context_pos := a_package_annotations(gc_context).next(a_context_ann_pos); + if ( l_next_context_pos < l_next_endcontext_pos ) then + return true; + end if; end if; return false; end; @@ -834,17 +834,17 @@ create or replace package body ut_suite_builder is ); l_annotation_pos := l_context_names.first; - while l_annotation_pos is not null loop - if l_annotation_pos > a_start_position and l_annotation_pos < l_end_position then - if l_found then - add_annotation_ignored_warning(a_parent, gc_name,'Duplicate annotation %%%.', l_annotation_pos); - else - l_result := l_context_names(l_annotation_pos); - end if; - l_found := true; - end if; - l_annotation_pos := l_context_names.next(l_annotation_pos); - end loop; + while l_annotation_pos is not null loop + if l_annotation_pos > a_start_position and l_annotation_pos < l_end_position then + if l_found then + add_annotation_ignored_warning(a_parent, gc_name,'Duplicate annotation %%%.', l_annotation_pos); + else + l_result := l_context_names(l_annotation_pos); + end if; + l_found := true; + end if; + l_annotation_pos := l_context_names.next(l_annotation_pos); + end loop; end if; return l_result; end; @@ -918,7 +918,7 @@ create or replace package body ut_suite_builder is l_context_pos := a_annotations.by_name( gc_context).next( l_context_pos); -- don't go on when the next context is outside the parent's context boundaries if ( a_parent_end_context_pos is not null and a_parent_end_context_pos <= l_context_pos ) then - l_context_pos := null; + l_context_pos := null; end if; l_context_no := l_context_no + 1; end loop; From b4c1d7235481048da76c1d8d937e0c5129c67375 Mon Sep 17 00:00:00 2001 From: pesse Date: Fri, 20 Dec 2019 08:25:27 +0100 Subject: [PATCH 0632/1096] Refactoring: Use just one return to improve readability --- source/core/ut_suite_builder.pkb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index 0c0730c4b..32c12c7e5 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -754,17 +754,14 @@ create or replace package body ut_suite_builder is a_context_ann_pos t_annotation_position, a_package_annotations in out nocopy tt_annotations_by_name ) return boolean is - l_next_endcontext_pos t_annotation_position; - l_next_context_pos t_annotation_position; + l_next_endcontext_pos t_annotation_position := 0; + l_next_context_pos t_annotation_position := 0; begin if ( a_package_annotations.exists(gc_endcontext) and a_package_annotations.exists(gc_context)) then l_next_endcontext_pos := get_next_annotation_of_type(a_context_ann_pos, gc_endcontext, a_package_annotations); l_next_context_pos := a_package_annotations(gc_context).next(a_context_ann_pos); - if ( l_next_context_pos < l_next_endcontext_pos ) then - return true; - end if; end if; - return false; + return ( l_next_context_pos < l_next_endcontext_pos ); end; function get_annotations_in_context( From 86185a87599e71f65d27c4bba10848b74fc01937 Mon Sep 17 00:00:00 2001 From: pesse Date: Fri, 20 Dec 2019 09:02:34 +0100 Subject: [PATCH 0633/1096] Rewrite get_endcontext_position to be much easier to understand Using simple parenthesis counter and annotations_by_line --- source/core/ut_suite_builder.pkb | 44 +++++++++++++------------------- 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index 32c12c7e5..0b00801b8 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -722,32 +722,25 @@ create or replace package body ut_suite_builder is function get_endcontext_position( a_context_ann_pos t_annotation_position, - a_package_annotations in out nocopy tt_annotations_by_name + a_package_annotations in tt_annotations_by_line ) return t_annotation_position is - l_next_endcontext_pos t_annotation_position; - l_next_context_pos t_annotation_position; - l_open_count integer := 0; + l_result t_annotation_position; + l_open_count integer := 1; + l_idx t_annotation_position := a_package_annotations.next(a_context_ann_pos); begin - if a_package_annotations.exists(gc_endcontext) and a_package_annotations.exists(gc_context) then - l_next_endcontext_pos := get_next_annotation_of_type(a_context_ann_pos, gc_endcontext, a_package_annotations); - l_next_context_pos := a_package_annotations(gc_context).next(a_context_ann_pos); - - loop - -- Get all the %context annotations between start and first %endcontext - while l_next_context_pos is not null and l_next_context_pos < l_next_endcontext_pos loop - l_open_count := l_open_count+1; - l_next_context_pos := a_package_annotations(gc_context).next(l_next_context_pos); - end loop; - -- Skip as many %endcontexts as we had additional contexts open - while l_open_count > 0 loop - l_open_count := l_open_count-1; - l_next_endcontext_pos := a_package_annotations(gc_endcontext).next(l_next_endcontext_pos); - end loop; - -- Repeat until the next %context is later than next %endcontext - exit when l_next_context_pos is null or l_next_context_pos > l_next_endcontext_pos; - end loop; + while l_open_count > 0 and l_idx is not null loop + if ( a_package_annotations(l_idx).name = gc_context ) then + l_open_count := l_open_count+1; + elsif ( a_package_annotations(l_idx).name = gc_endcontext ) then + l_open_count := l_open_count-1; + l_result := l_idx; + end if; + l_idx := a_package_annotations.next(l_idx); + end loop; + if ( l_open_count > 0 ) then + l_result := null; end if; - return l_next_endcontext_pos; + return l_result; end; function has_nested_context( @@ -826,7 +819,7 @@ create or replace package body ut_suite_builder is l_context_names := a_annotations.by_name( gc_name ); l_end_position := least( - coalesce( get_endcontext_position(a_start_position, a_annotations.by_name), a_annotations.by_line.last ), + coalesce( get_endcontext_position(a_start_position, a_annotations.by_line), a_annotations.by_line.last ), coalesce( a_annotations.by_name(gc_context).next(a_start_position), a_annotations.by_line.last ) ); l_annotation_pos := l_context_names.first; @@ -856,10 +849,9 @@ create or replace package body ut_suite_builder is while l_context_pos is not null loop l_default_context_name := 'nested_context_#'||l_context_no; l_context_name := null; - l_end_context_pos := get_endcontext_position(l_context_pos, a_annotations.by_name ); + l_end_context_pos := get_endcontext_position(l_context_pos, a_annotations.by_line ); l_next_context_pos := a_annotations.by_name(gc_context).next(l_context_pos); l_context_name := get_context_name(a_parent, l_context_pos); - if not regexp_like( l_context_name, '^(\w|[$#])+$' ) or l_context_name is null then if not regexp_like( l_context_name, '^(\w|[$#])+$' ) then a_parent.put_warning( From 89df1ddbda8f1521c58483672315b0e41d1eb6dc Mon Sep 17 00:00:00 2001 From: pesse Date: Fri, 20 Dec 2019 09:09:31 +0100 Subject: [PATCH 0634/1096] Clarify intention of end-position, make it more visible how it's defined --- source/core/ut_suite_builder.pkb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index 0b00801b8..0b4551765 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -817,10 +817,11 @@ create or replace package body ut_suite_builder is begin if a_annotations.by_name.exists(gc_name) then l_context_names := a_annotations.by_name( gc_name ); + -- Maximum end-position to look for %name annotation is either the next %context or the next %endcontext annotation l_end_position := least( - coalesce( get_endcontext_position(a_start_position, a_annotations.by_line), a_annotations.by_line.last ), - coalesce( a_annotations.by_name(gc_context).next(a_start_position), a_annotations.by_line.last ) + coalesce( get_next_annotation_of_type(a_start_position, gc_endcontext, a_annotations.by_name), a_annotations.by_line.last ), + coalesce( get_next_annotation_of_type(a_start_position, gc_context, a_annotations.by_name), a_annotations.by_line.last ) ); l_annotation_pos := l_context_names.first; From c61abfaed5ce0e6d1d95596400486660f49abfc7 Mon Sep 17 00:00:00 2001 From: pesse Date: Fri, 20 Dec 2019 09:12:55 +0100 Subject: [PATCH 0635/1096] Get rid of several `in out nocopy` params where `in` would be sufficient --- source/core/ut_suite_builder.pkb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index 0b4551765..a44e73919 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -707,7 +707,7 @@ create or replace package body ut_suite_builder is function get_next_annotation_of_type( a_start_position t_annotation_position, a_annotation_type varchar2, - a_package_annotations in out nocopy tt_annotations_by_name + a_package_annotations in tt_annotations_by_name ) return t_annotation_position is l_result t_annotation_position; begin @@ -745,7 +745,7 @@ create or replace package body ut_suite_builder is function has_nested_context( a_context_ann_pos t_annotation_position, - a_package_annotations in out nocopy tt_annotations_by_name + a_package_annotations in tt_annotations_by_name ) return boolean is l_next_endcontext_pos t_annotation_position := 0; l_next_context_pos t_annotation_position := 0; From 35acf1438280a5714c26929b4ea17c6132c81e0d Mon Sep 17 00:00:00 2001 From: pesse Date: Fri, 20 Dec 2019 09:15:33 +0100 Subject: [PATCH 0636/1096] Not necessary to check for IS NOT NULL --- source/core/ut_suite_builder.pkb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index a44e73919..5f468f756 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -907,7 +907,7 @@ create or replace package body ut_suite_builder is l_context_pos := a_annotations.by_name( gc_context).next( l_context_pos); -- don't go on when the next context is outside the parent's context boundaries - if ( a_parent_end_context_pos is not null and a_parent_end_context_pos <= l_context_pos ) then + if (a_parent_end_context_pos <= l_context_pos ) then l_context_pos := null; end if; l_context_no := l_context_no + 1; From 3327fc371f8a5f3b5be9baea1745fce2dbd8b08d Mon Sep 17 00:00:00 2001 From: pesse Date: Fri, 20 Dec 2019 09:55:20 +0100 Subject: [PATCH 0637/1096] Fix intendation --- test/ut3_tester/core/test_suite_builder.pkb | 2 +- test/ut3_tester/core/test_suite_builder.pks | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/ut3_tester/core/test_suite_builder.pkb b/test/ut3_tester/core/test_suite_builder.pkb index 8250eb96e..86d86032a 100644 --- a/test/ut3_tester/core/test_suite_builder.pkb +++ b/test/ut3_tester/core/test_suite_builder.pkb @@ -767,7 +767,7 @@ create or replace package body test_suite_builder is ); end; - procedure nested_contexts_2 is + procedure nested_contexts_2 is l_actual clob; l_annotations ut3.ut_annotations; begin diff --git a/test/ut3_tester/core/test_suite_builder.pks b/test/ut3_tester/core/test_suite_builder.pks index 98a61171e..7c7fc77f6 100644 --- a/test/ut3_tester/core/test_suite_builder.pks +++ b/test/ut3_tester/core/test_suite_builder.pks @@ -106,7 +106,7 @@ create or replace package test_suite_builder is --%endcontext --%context(--%context annotation) - --%name(context) + --%name(context) --%test(Creates nested suite for content between context/endcontext annotations) procedure suite_from_context; From cef109b90206705f16a897688056f7185cfc0c03 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Fri, 20 Dec 2019 20:28:20 +0000 Subject: [PATCH 0638/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 2ba4aff9a..f607f7562 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 33c552f78..adfd52a46 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 52c21c740..971e9462e 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index e851d6ae5..82c0ce2af 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index f17d3848c..23f63009b 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 4f39ca713..16ec10576 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index db061005f..a62afed04 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index ea7b3e50f..b5f8a37cd 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 95c1dadcf..c12ec9e73 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 4f3375f85..e5f816f15 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index c1995e1bc..24e0f8f9d 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 30fe6fcda..14a440173 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index ba3f6735a..39baf4a18 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 35455a6cd..66e69d48b 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 21f36e1a4..bfe4523a9 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 22cf5cb5e..4b6e83db4 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 13135431c..53d30e474 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3290--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 0553f0343..33ab46b38 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -767,7 +767,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.10.3290-develop + * secion v3.1.10.3297-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 79bcc5107..9da213a3b 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.10.3290-develop'; + gc_version constant varchar2(50) := 'v3.1.10.3297-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From ad0f99d9fd2cc34383eabd284e7d8006d4aec286 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 22 Dec 2019 15:27:47 +0000 Subject: [PATCH 0639/1096] Fixed repo for publishing github docs. --- .travis/push_docs_to_github_io.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/push_docs_to_github_io.sh b/.travis/push_docs_to_github_io.sh index add63aa1b..e29f1c88c 100644 --- a/.travis/push_docs_to_github_io.sh +++ b/.travis/push_docs_to_github_io.sh @@ -14,7 +14,7 @@ # Required ENV Variables LATEST_DOCS_BRANCH="develop" -GITHUB_IO_REPO='jgebal/jgebal.github.io' +GITHUB_IO_REPO='utPLSQL/utPLSQL.github.io' GITHUB_IO_BRANCH='master' # TRAVIS_* variables are set by travis directly and only need to be if testing externally From 33f5152e99e4cbcc6150d3a86e606f3156db6029 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sun, 22 Dec 2019 15:37:53 +0000 Subject: [PATCH 0640/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index f607f7562..205fbef66 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index adfd52a46..923dd5b7d 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 971e9462e..260e05ede 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 82c0ce2af..6ff3b41be 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 23f63009b..fc2718b3f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 16ec10576..184866b7b 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index a62afed04..12ccc8a30 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index b5f8a37cd..0f0682924 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index c12ec9e73..4853bfca1 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index e5f816f15..ba4313743 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 24e0f8f9d..612b59444 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 14a440173..31988dcfe 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 39baf4a18..6de351376 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 66e69d48b..346de3cb9 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index bfe4523a9..7a8f10af6 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 4b6e83db4..7babf9366 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 53d30e474..cd6e8b065 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3297--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 33ab46b38..096761d0a 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -767,7 +767,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.10.3297-develop + * secion v3.1.10.3298-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 9da213a3b..671312a9f 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.10.3297-develop'; + gc_version constant varchar2(50) := 'v3.1.10.3298-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 8e43a089a67e26d951a929b5f285065938b10c3c Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 29 Dec 2019 15:53:09 +0000 Subject: [PATCH 0641/1096] Moved validation of `--%throws` annotation values. Now the validation is executed at runtime, when the tests is executed. This resolves issues related to the fact that some package constants may not exist or be valid at suite parse time. In such scenario, the annotations continued to be ignored despite the fact that package constants were valid at test runtime. With this change, tests can now have `--throws` annotations referencing constants that are undefined at compile time. Resolves #1033 --- source/core/types/ut_executable_test.tpb | 114 ++++- source/core/types/ut_executable_test.tps | 4 +- source/core/types/ut_suite_cache_row.tps | 2 +- source/core/types/ut_suite_item.tpb | 10 + source/core/types/ut_suite_item.tps | 3 +- source/core/types/ut_test.tpb | 2 +- source/core/types/ut_test.tps | 4 +- source/core/ut_suite_builder.pkb | 178 +------- source/core/ut_suite_cache_manager.pkb | 2 +- .../test_annot_throws_exception.pkb | 430 ++++++++++-------- .../test_annot_throws_exception.pks | 8 +- test/ut3_tester/core/test_suite_builder.pkb | 18 - test/ut3_tester/core/test_suite_builder.pks | 3 - 13 files changed, 390 insertions(+), 388 deletions(-) diff --git a/source/core/types/ut_executable_test.tpb b/source/core/types/ut_executable_test.tpb index a11797a54..89ab16dab 100644 --- a/source/core/types/ut_executable_test.tpb +++ b/source/core/types/ut_executable_test.tpb @@ -31,7 +31,7 @@ create or replace type body ut_executable_test as member procedure do_execute( self in out nocopy ut_executable_test, a_item in out nocopy ut_suite_item, - a_expected_error_codes in ut_integer_list + a_expected_error_codes in ut_varchar2_rows ) is l_completed_without_errors boolean; begin @@ -40,10 +40,114 @@ create or replace type body ut_executable_test as member function do_execute( self in out nocopy ut_executable_test, a_item in out nocopy ut_suite_item, - a_expected_error_codes in ut_integer_list + a_expected_error_codes in ut_varchar2_rows ) return boolean is l_expected_except_message varchar2(4000); + l_expected_error_numbers ut_integer_list; + function build_exception_numbers_list( + a_item in out nocopy ut_suite_item, + a_expected_error_codes in ut_varchar2_rows + ) return ut_integer_list is + l_exception_number integer; + l_exception_number_list ut_integer_list := ut_integer_list(); + c_regexp_for_exception_no constant varchar2(30) := '^-?[[:digit:]]{1,5}$'; + + c_integer_exception constant varchar2(1) := 'I'; + c_named_exception constant varchar2(1) := 'N'; + + function is_valid_qualified_name (a_name varchar2) return boolean is + l_name varchar2(500); + begin + l_name := dbms_assert.qualified_sql_name(a_name); + return true; + exception when others then + return false; + end; + + function check_exception_type(a_exception_name in varchar2) return varchar2 is + l_exception_type varchar2(50); + begin + --check if it is a predefined exception + begin + execute immediate 'begin null; exception when '||a_exception_name||' then null; end;'; + l_exception_type := c_named_exception; + exception + when others then + if dbms_utility.format_error_stack() like '%PLS-00485%' then + declare + e_invalid_number exception; + pragma exception_init ( e_invalid_number, -6502 ); + begin + execute immediate 'declare x integer := '||a_exception_name||'; begin null; end;'; + l_exception_type := c_integer_exception; + exception + when others then + null; + end; + end if; + end; + return l_exception_type; + end; + + function get_exception_number (a_exception_var in varchar2) return integer is + l_exc_no integer; + l_exc_type varchar2(50); + function remap_no_data_found (a_number integer) return integer is + begin + return case a_number when 100 then -1403 else a_number end; + end; + begin + l_exc_type := check_exception_type(a_exception_var); + + execute immediate + case l_exc_type + when c_integer_exception then + 'declare l_exception number; begin :l_exception := '||a_exception_var||'; end;' + when c_named_exception then + 'begin raise '||a_exception_var||'; exception when others then :l_exception := sqlcode; end;' + else + 'begin :l_exception := null; end;' + end + using out l_exc_no; + + return remap_no_data_found(l_exc_no); + end; + + begin + if a_expected_error_codes is not empty then + for i in 1 .. a_expected_error_codes.count loop + /** + * Check if its a valid qualified name and if so try to resolve name to an exception number + */ + if is_valid_qualified_name(a_expected_error_codes(i)) then + l_exception_number := get_exception_number(a_expected_error_codes(i)); + elsif regexp_like(a_expected_error_codes(i), c_regexp_for_exception_no) then + l_exception_number := a_expected_error_codes(i); + end if; + + if l_exception_number is null then + a_item.put_warning( + 'Invalid parameter value "'||a_expected_error_codes(i)||'" for "--%throws" annotation. Parameter ignored.', + self.procedure_name, + a_item.line_no + ); + elsif l_exception_number >= 0 then + a_item.put_warning( + 'Invalid parameter value "'||a_expected_error_codes(i)||'" for "--%throws" annotation. Exception value must be a negative integer. Parameter ignored.', + self.procedure_name, + a_item.line_no + ); + else + l_exception_number_list.extend; + l_exception_number_list(l_exception_number_list.last) := l_exception_number; + end if; + l_exception_number := null; + end loop; + end if; + + return l_exception_number_list; + end; function failed_expec_errnum_message(a_expected_error_codes in ut_integer_list) return varchar is l_actual_error_no integer; l_expected_error_codes varchar2(4000); @@ -72,9 +176,9 @@ create or replace type body ut_executable_test as begin --Create a ut_executable object and call do_execute after that get the data to know the test's execution result self.do_execute(a_item); - - if a_expected_error_codes is not null and a_expected_error_codes is not empty then - l_expected_except_message := failed_expec_errnum_message(a_expected_error_codes); + l_expected_error_numbers := build_exception_numbers_list(a_item, a_expected_error_codes); + if l_expected_error_numbers is not null and l_expected_error_numbers is not empty then + l_expected_except_message := failed_expec_errnum_message( l_expected_error_numbers ); if l_expected_except_message is not null then ut_expectation_processor.add_expectation_result( diff --git a/source/core/types/ut_executable_test.tps b/source/core/types/ut_executable_test.tps index 2772720de..88500c9be 100644 --- a/source/core/types/ut_executable_test.tps +++ b/source/core/types/ut_executable_test.tps @@ -22,12 +22,12 @@ create or replace type ut_executable_test authid current_user under ut_executabl member procedure do_execute( self in out nocopy ut_executable_test, a_item in out nocopy ut_suite_item, - a_expected_error_codes in ut_integer_list + a_expected_error_codes in ut_varchar2_rows ), member function do_execute( self in out nocopy ut_executable_test, a_item in out nocopy ut_suite_item, - a_expected_error_codes in ut_integer_list + a_expected_error_codes in ut_varchar2_rows ) return boolean ) final; diff --git a/source/core/types/ut_suite_cache_row.tps b/source/core/types/ut_suite_cache_row.tps index 6817be5ec..fb4a8bb9f 100644 --- a/source/core/types/ut_suite_cache_row.tps +++ b/source/core/types/ut_suite_cache_row.tps @@ -33,7 +33,7 @@ create type ut_suite_cache_row as object ( before_test_list ut_executables, after_each_list ut_executables, after_test_list ut_executables, - expected_error_codes ut_integer_list, + expected_error_codes ut_varchar2_rows, tags ut_varchar2_rows, item ut_executable_test ) diff --git a/source/core/types/ut_suite_item.tpb b/source/core/types/ut_suite_item.tpb index 6478d5c82..9b939727a 100644 --- a/source/core/types/ut_suite_item.tpb +++ b/source/core/types/ut_suite_item.tpb @@ -97,6 +97,16 @@ create or replace type body ut_suite_item as self.results_count.increase_warning_count; end; + member procedure put_warning(self in out nocopy ut_suite_item, a_message varchar2, a_procedure_name varchar2, a_line_no integer) is + l_result varchar2(1000); + begin + l_result := self.object_owner || '.' || self.object_name ; + if a_procedure_name is not null then + l_result := l_result || '.' || a_procedure_name ; + end if; + put_warning( a_message || chr( 10 ) || 'at package "' || upper(l_result) || '", line ' || a_line_no ); + end; + member function get_transaction_invalidators return ut_varchar2_list is begin return transaction_invalidators; diff --git a/source/core/types/ut_suite_item.tps b/source/core/types/ut_suite_item.tps index 53c59a2ea..87f577459 100644 --- a/source/core/types/ut_suite_item.tps +++ b/source/core/types/ut_suite_item.tps @@ -84,7 +84,8 @@ create or replace type ut_suite_item force under ut_event_item ( not instantiable member procedure mark_as_errored(self in out nocopy ut_suite_item, a_error_stack_trace varchar2), not instantiable member function get_error_stack_traces return ut_varchar2_list, not instantiable member function get_serveroutputs return clob, - member procedure put_warning(self in out nocopy ut_suite_item, a_message varchar2) + member procedure put_warning(self in out nocopy ut_suite_item, a_message varchar2), + member procedure put_warning(self in out nocopy ut_suite_item, a_message varchar2, a_procedure_name varchar2, a_line_no integer) ) not final not instantiable / diff --git a/source/core/types/ut_test.tpb b/source/core/types/ut_test.tpb index 9fbcf9269..4ed3f665e 100644 --- a/source/core/types/ut_test.tpb +++ b/source/core/types/ut_test.tpb @@ -18,7 +18,7 @@ create or replace type body ut_test as constructor function ut_test( self in out nocopy ut_test, a_object_owner varchar2 := null, a_object_name varchar2, a_name varchar2, - a_line_no integer, a_expected_error_codes ut_integer_list := null, a_tags ut_varchar2_rows := null + a_line_no integer, a_expected_error_codes ut_varchar2_rows := null, a_tags ut_varchar2_rows := null ) return self as result is begin self.self_type := $$plsql_unit; diff --git a/source/core/types/ut_test.tps b/source/core/types/ut_test.tps index fcf565671..85caf7380 100644 --- a/source/core/types/ut_test.tps +++ b/source/core/types/ut_test.tps @@ -54,10 +54,10 @@ create or replace type ut_test force under ut_suite_item ( /** *Holds the expected error codes list when the user use the annotation throws */ - expected_error_codes ut_integer_list, + expected_error_codes ut_varchar2_rows, constructor function ut_test( self in out nocopy ut_test, a_object_owner varchar2 := null, a_object_name varchar2, a_name varchar2, - a_line_no integer, a_expected_error_codes ut_integer_list := null, a_tags ut_varchar2_rows := null + a_line_no integer, a_expected_error_codes ut_varchar2_rows := null, a_tags ut_varchar2_rows := null ) return self as result, overriding member procedure mark_as_skipped(self in out nocopy ut_test), overriding member function do_execute(self in out nocopy ut_test) return boolean, diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index 5f468f756..d13cbaed9 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -62,9 +62,6 @@ create or replace package body ut_suite_builder is gc_endcontext ); - gc_integer_exception constant varchar2(1) := 'I'; - gc_named_exception constant varchar2(1) := 'N'; - type tt_executables is table of ut_executables index by t_annotation_position; type t_annotation is record( @@ -97,27 +94,6 @@ create or replace package body ut_suite_builder is by_name tt_annotations_by_name ); - function get_qualified_object_name( - a_suite ut_suite_item, a_procedure_name t_object_name - ) return varchar2 is - l_result varchar2(1000); - begin - if a_suite is not null then - l_result := upper( a_suite.object_owner || '.' || a_suite.object_name ); - if a_procedure_name is not null then - l_result := l_result || upper( '.' || a_procedure_name ); - end if; - end if; - return l_result; - end; - - function get_object_reference( - a_suite ut_suite_item, a_procedure_name t_object_name, a_line_no binary_integer - ) return varchar2 is - begin - return chr( 10 ) || 'at package "' || get_qualified_object_name(a_suite, a_procedure_name) || '", line ' || a_line_no; - end; - procedure delete_annotations_range( a_annotations in out nocopy t_annotations_info, a_start_pos t_annotation_position, @@ -163,8 +139,9 @@ create or replace package body ut_suite_builder is ) is begin a_suite.put_warning( - replace(a_message,'%%%','"--%'||a_annotation||'"') - || ' Annotation ignored.' || get_object_reference( a_suite, a_procedure_name, a_line_no ) + replace(a_message,'%%%','"--%'||a_annotation||'"')|| ' Annotation ignored.', + a_procedure_name, + a_line_no ); end; @@ -181,136 +158,26 @@ create or replace package body ut_suite_builder is procedure add_to_throws_numbers_list( a_suite in out nocopy ut_suite, - a_list in out nocopy ut_integer_list, + a_list in out nocopy ut_varchar2_rows, a_procedure_name t_object_name, a_throws_ann_text tt_annotation_texts ) is l_annotation_pos binary_integer; - function is_valid_qualified_name (a_name varchar2) return boolean is - l_name varchar2(500); - begin - l_name := dbms_assert.qualified_sql_name(a_name); - return true; - exception when others then - return false; - end; - - function check_exception_type(a_exception_name in varchar2) return varchar2 is - l_exception_type varchar2(50); - begin - --check if it is a predefined exception - begin - execute immediate 'begin null; exception when '||a_exception_name||' then null; end;'; - l_exception_type := gc_named_exception; - exception - when others then - if dbms_utility.format_error_stack() like '%PLS-00485%' then - begin - execute immediate 'declare x positiven := -('||a_exception_name||'); begin null; end;'; - l_exception_type := gc_integer_exception; - exception - when others then - --invalid exception number (positive) - --TODO add warning for this value - null; - end; - end if; - end; - return l_exception_type; - end; - - function get_exception_number (a_exception_var in varchar2) return integer is - l_exc_no integer; - l_exc_type varchar2(50); - function remap_no_data_found (a_number integer) return integer is - begin - return case a_number when 100 then -1403 else a_number end; - end; - begin - l_exc_type := check_exception_type(a_exception_var); - - if l_exc_type is not null then - - execute immediate - case l_exc_type - when gc_integer_exception then - 'declare - l_exception number; - begin - :l_exception := '||a_exception_var||'; ' - when gc_named_exception then - 'begin - raise '||a_exception_var||'; - exception - when others then - :l_exception := sqlcode; ' - end || - 'end;' - using out l_exc_no; - - end if; - return remap_no_data_found(l_exc_no); - end; - - function build_exception_numbers_list( - a_suite in out nocopy ut_suite, - a_procedure_name t_object_name, - a_line_no integer, - a_annotation_text in varchar2 - ) return ut_integer_list is - l_throws_list ut_varchar2_list; - l_exception_number integer; - l_exception_number_list ut_integer_list := ut_integer_list(); - c_regexp_for_exception_no constant varchar2(30) := '^-?[[:digit:]]{1,5}$'; - begin - --the a_expected_error_codes is converted to a ut_varchar2_list after that is trimmed and filtered to left only valid exception numbers - l_throws_list := ut_utils.trim_list_elements(ut_utils.string_to_table(a_annotation_text, ',', 'Y')); - - for i in 1 .. l_throws_list.count - loop - /** - * Check if its a valid qualified name and if so try to resolve name to an exception number - */ - if is_valid_qualified_name(l_throws_list(i)) then - l_exception_number := get_exception_number(l_throws_list(i)); - elsif regexp_like(l_throws_list(i), c_regexp_for_exception_no) then - l_exception_number := l_throws_list(i); - end if; - - if l_exception_number is null then - a_suite.put_warning( - 'Invalid parameter value "'||l_throws_list(i) - ||'" for "--%throws" annotation. Parameter ignored.'||get_object_reference( a_suite, a_procedure_name, a_line_no ) - ); - else - l_exception_number_list.extend; - l_exception_number_list(l_exception_number_list.last) := l_exception_number; - end if; - l_exception_number := null; - end loop; - - return l_exception_number_list; - end; - begin - a_list := ut_integer_list(); l_annotation_pos := a_throws_ann_text.first; while l_annotation_pos is not null loop if a_throws_ann_text(l_annotation_pos) is null then a_suite.put_warning( - '"--%throws" annotation requires a parameter. Annotation ignored.' - || get_object_reference( a_suite, a_procedure_name, l_annotation_pos ) + '"--%throws" annotation requires a parameter. Annotation ignored.', + a_procedure_name, + l_annotation_pos ); else - a_list := - a_list multiset union - build_exception_numbers_list( - a_suite, - a_procedure_name, - l_annotation_pos, - a_throws_ann_text(l_annotation_pos) - ); + ut_utils.append_to_list( + a_list, + ut_utils.convert_collection( ut_utils.trim_list_elements ( ut_utils.string_to_table( a_throws_ann_text(l_annotation_pos), ',' ) ) ) + ); end if; l_annotation_pos := a_throws_ann_text.next(l_annotation_pos); end loop; @@ -330,8 +197,9 @@ create or replace package body ut_suite_builder is while l_annotation_pos is not null loop if a_tags_ann_text(l_annotation_pos) is null then a_suite.put_warning( - '"--%tags" annotation requires a tag value populated. Annotation ignored.' - || get_object_reference( a_suite, a_procedure_name, l_annotation_pos ) + '"--%tags" annotation requires a tag value populated. Annotation ignored.', + a_procedure_name, + l_annotation_pos ); else l_tag_items := ut_utils.trim_list_elements(ut_utils.string_to_table(a_tags_ann_text(l_annotation_pos),',')); @@ -342,8 +210,9 @@ create or replace package body ut_suite_builder is l_tags_list(l_tags_list.last) := l_tag_items(i); else a_suite.put_warning( - 'Invalid value "'||l_tag_items(i)||'" for "--%tags" annotation. See documentation for details on valid tag values. Annotation value ignored.' - || get_object_reference( a_suite, a_procedure_name, l_annotation_pos ) + 'Invalid value "'||l_tag_items(i)||'" for "--%tags" annotation. See documentation for details on valid tag values. Annotation value ignored.', + a_procedure_name, + l_annotation_pos ); end if; end loop; @@ -857,9 +726,10 @@ create or replace package body ut_suite_builder is if not regexp_like( l_context_name, '^(\w|[$#])+$' ) then a_parent.put_warning( 'Invalid value "'||l_context_name||'" for context name.' || - ' Context name ignored and fallback to auto-name "'||l_default_context_name||'" ' || - get_object_reference( a_parent, null, l_context_pos ) - ); + ' Context name ignored and fallback to auto-name "'||l_default_context_name||'" ', + null, + l_context_pos + ); end if; l_context_name := l_default_context_name; end if; @@ -886,8 +756,10 @@ create or replace package body ut_suite_builder is if l_end_context_pos is null then a_parent.put_warning( - 'Missing "--%endcontext" annotation for a "--%context" annotation. The end of package is considered end of context.'|| get_object_reference( a_parent, null, l_context_pos ) - ); + 'Missing "--%endcontext" annotation for a "--%context" annotation. The end of package is considered end of context.', + null, + l_context_pos + ); l_end_context_pos := a_annotations.by_line.last; end if; diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index f52d15bf7..509b28498 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -57,7 +57,7 @@ create or replace package body ut_suite_cache_manager is select 'UT_LOGICAL_SUITE' as self_type, p.path, p.object_owner, upper( substr(p.path, instr( p.path, '.', -1 ) + 1 ) ) as object_name, cast(null as ut_executables) as x, - cast(null as ut_integer_list) as y, + cast(null as ut_varchar2_rows) as y, cast(null as ut_executable_test) as z from suitepath_part p where p.path diff --git a/test/ut3_tester/core/annotations/test_annot_throws_exception.pkb b/test/ut3_tester/core/annotations/test_annot_throws_exception.pkb index 1ad4f19a5..04e65a6c2 100644 --- a/test/ut3_tester/core/annotations/test_annot_throws_exception.pkb +++ b/test/ut3_tester/core/annotations/test_annot_throws_exception.pkb @@ -20,212 +20,230 @@ is c_e_diff_exc constant number := -20204; c_e_mix_list constant number := -20205; c_e_mix_missin constant number := -20206; - + c_e_positive constant number := 20207; + e_some_exception exception; pragma exception_init(e_some_exception, -20207); end;]'; l_package_spec := ' - create package annotated_package_with_throws is - --%suite(Dummy package to test annotation throws) - - --%test(Throws same annotated exception) - --%throws(-20145) - procedure raised_same_exception; - - --%test(Throws one of the listed exceptions) - --%throws(-20145,-20146, -20189 ,-20563) - procedure raised_one_listed_exception; - - --%test(Leading zero is ignored in exception list) - --%throws(-01476) - procedure leading_0_exception_no; - - --%test(Throws diff exception) - --%throws(-20144) - procedure raised_diff_exception; - - --%test(Throws empty) - --%throws() - procedure empty_throws; - - --%test(Ignores annotation and fails when exception was thrown) - --%throws(hello,784#,0-=234,,u1234) - procedure bad_paramters_with_except; - - --%test(Ignores annotation and succeeds when no exception thrown) - --%throws(hello,784#,0-=234,,u1234) - procedure bad_paramters_without_except; - - --%test(Detects a valid exception number within many invalid ones) - --%throws(7894562, operaqk, -=1, -1, pow74d, posdfk3) - procedure one_valid_exception_number; - - --%test(Gives failure when a exception is expected and nothing is thrown) - --%throws(-20459, -20136, -20145) - procedure nothing_thrown; - - --%test(Single exception defined as a constant number in package) - --%throws(exc_pkg.c_e_single_exc) - procedure single_exc_const_pkg; - - --%test(Gives success when one of annotated exception using constant is thrown) - --%throws(exc_pkg.c_e_list_1,exc_pkg.c_e_list_2) - procedure list_of_exc_constant; - - --%test(Gives failure when the raised exception is different that the annotated one using variable) - --%throws(exc_pkg.c_e_diff_exc) - procedure fail_not_match_exc; - - --%test(Success when one of exception from mixed list of number and constant is thrown) - --%throws(exc_pkg.c_e_mix_list,-20105) - procedure mixed_exc_list; - - --%test(Success when match exception even if other variable on list dont exists) - --%throws(exc_pkg.c_e_mix_missin,utter_rubbish) - procedure mixed_list_notexi; - - --%test(Success resolve and match named exception defined in pragma exception init) - --%throws(exc_pkg.e_some_exception) - procedure named_exc_pragma; - - --%test(Success resolve and match oracle named exception) - --%throws(NO_DATA_FOUND) - procedure named_exc_ora; - - --%test(Success resolve and match oracle named exception dup val index) - --%throws(DUP_VAL_ON_INDEX) - procedure named_exc_ora_dup_ind; - - --%test(Success map no data 100 to -1403) - --%throws(-1403) - procedure nodata_exc_ora; - - --%test(Success for exception defined as varchar) - --%throws(exc_pkg.c_e_varch_exc) - procedure defined_varchar_exc; - - --%test(Non existing constant exception) - --%throws(dummy.c_dummy); - procedure non_existing_const; - - --%test(Bad exception constant) - --%throws(exc_pkg.c_e_dummy); - procedure bad_exc_const; - - end; + create package annotated_package_with_throws is + --%suite(Dummy package to test annotation throws) + + --%test(Throws same annotated exception) + --%throws(-20145) + procedure raised_same_exception; + + --%test(Throws one of the listed exceptions) + --%throws(-20145,-20146, -20189 ,-20563) + procedure raised_one_listed_exception; + + --%test(Leading zero is ignored in exception list) + --%throws(-01476) + procedure leading_0_exception_no; + + --%test(Throws diff exception) + --%throws(-20144) + procedure raised_diff_exception; + + --%test(Throws empty) + --%throws() + procedure empty_throws; + + --%test(Ignores annotation and fails when exception was thrown) + --%throws(hello,784#,0-=234,,u1234) + procedure bad_paramters_with_except; + + --%test(Ignores annotation and succeeds when no exception thrown) + --%throws(hello,784#,0-=234,,u1234) + procedure bad_paramters_without_except; + + --%test(Ignores annotation for positive exception number value) + --%throws(20001) + procedure positive_exception_number; + + --%test(Ignores annotation for positive exception number variable) + --%throws(exc_pkg.c_e_positive) + procedure positive_exception_number_var; + + --%test(Detects a valid exception number within many invalid ones) + --%throws(7894562, operaqk, -=1, -1, pow74d, posdfk3) + procedure one_valid_exception_number; + + --%test(Gives failure when a exception is expected and nothing is thrown) + --%throws(-20459, -20136, -20145) + procedure nothing_thrown; + + --%test(Single exception defined as a constant number in package) + --%throws(exc_pkg.c_e_single_exc) + procedure single_exc_const_pkg; + + --%test(Gives success when one of annotated exception using constant is thrown) + --%throws(exc_pkg.c_e_list_1,exc_pkg.c_e_list_2) + procedure list_of_exc_constant; + + --%test(Gives failure when the raised exception is different that the annotated one using variable) + --%throws(exc_pkg.c_e_diff_exc) + procedure fail_not_match_exc; + + --%test(Success when one of exception from mixed list of number and constant is thrown) + --%throws(exc_pkg.c_e_mix_list,-20105) + procedure mixed_exc_list; + + --%test(Success when match exception even if other variable on list dont exists) + --%throws(exc_pkg.c_e_mix_missin,utter_rubbish) + procedure mixed_list_notexi; + + --%test(Success resolve and match named exception defined in pragma exception init) + --%throws(exc_pkg.e_some_exception) + procedure named_exc_pragma; + + --%test(Success resolve and match oracle named exception) + --%throws(NO_DATA_FOUND) + procedure named_exc_ora; + + --%test(Success resolve and match oracle named exception dup val index) + --%throws(DUP_VAL_ON_INDEX) + procedure named_exc_ora_dup_ind; + + --%test(Success map no data 100 to -1403) + --%throws(-1403) + procedure nodata_exc_ora; + + --%test(Success for exception defined as varchar) + --%throws(exc_pkg.c_e_varch_exc) + procedure defined_varchar_exc; + + --%test(Non existing constant exception) + --%throws(dummy.c_dummy); + procedure non_existing_const; + + --%test(Bad exception constant) + --%throws(exc_pkg.c_e_dummy); + procedure bad_exc_const; + end; '; l_package_body := ' - create package body annotated_package_with_throws is - procedure raised_same_exception is - begin - raise_application_error(-20145, ''Test error''); - end; - - procedure raised_one_listed_exception is - begin - raise_application_error(-20189, ''Test error''); - end; - - procedure leading_0_exception_no is - x integer; - begin - x := 1 / 0; - end; - - procedure raised_diff_exception is - begin - raise_application_error(-20143, ''Test error''); - end; - - procedure empty_throws is - begin - raise_application_error(-20143, ''Test error''); - end; - - procedure bad_paramters_with_except is - begin - raise_application_error(-20143, ''Test error''); - end; - - procedure bad_paramters_without_except is - begin - null; - end; - - procedure one_valid_exception_number is - begin - raise dup_val_on_index; - end; - - procedure nothing_thrown is - begin - null; - end; - - procedure single_exc_const_pkg is - begin - raise_application_error(exc_pkg.c_e_single_exc,''Test''); - end; - - procedure list_of_exc_constant is - begin - raise_application_error(exc_pkg.c_e_list_1,''Test''); - end; - - procedure fail_not_match_exc is - begin - raise NO_DATA_FOUND; - end; - - procedure mixed_exc_list is - begin - raise_application_error(exc_pkg.c_e_mix_list,''Test''); - end; - - procedure mixed_list_notexi is - begin - raise_application_error(exc_pkg.c_e_mix_missin,''Test''); - end; - - procedure named_exc_pragma is - begin - raise exc_pkg.e_some_exception; - end; - - procedure named_exc_ora is - begin - raise NO_DATA_FOUND; - end; - - procedure named_exc_ora_dup_ind is - begin - raise DUP_VAL_ON_INDEX; - end; - - procedure nodata_exc_ora is - begin - raise NO_DATA_FOUND; - end; - - procedure defined_varchar_exc is - begin - raise_application_error(exc_pkg.c_e_varch_exc,''Test''); - end; - - procedure non_existing_const is - begin - raise_application_error(-20143, ''Test error''); - end; - - procedure bad_exc_const is - begin - raise_application_error(-20143, ''Test error''); - end; - + create package body annotated_package_with_throws is + procedure raised_same_exception is + begin + raise_application_error(-20145, ''Test error''); + end; + + procedure raised_one_listed_exception is + begin + raise_application_error(-20189, ''Test error''); + end; + + procedure leading_0_exception_no is + x integer; + begin + x := 1 / 0; + end; + + procedure raised_diff_exception is + begin + raise_application_error(-20143, ''Test error''); + end; + + procedure empty_throws is + begin + raise_application_error(-20143, ''Test error''); + end; + + procedure bad_paramters_with_except is + begin + raise_application_error(-20143, ''Test error''); + end; + + procedure bad_paramters_without_except is + begin + null; + end; + + procedure positive_exception_number is + begin + null; + end; + + procedure positive_exception_number_var is + begin + null; + end; + + procedure one_valid_exception_number is + begin + raise dup_val_on_index; + end; + + procedure nothing_thrown is + begin + null; + end; + + procedure single_exc_const_pkg is + begin + raise_application_error(exc_pkg.c_e_single_exc,''Test''); + end; + + procedure list_of_exc_constant is + begin + raise_application_error(exc_pkg.c_e_list_1,''Test''); + end; + + procedure fail_not_match_exc is + begin + raise NO_DATA_FOUND; + end; + + procedure mixed_exc_list is + begin + raise_application_error(exc_pkg.c_e_mix_list,''Test''); + end; + + procedure mixed_list_notexi is + begin + raise_application_error(exc_pkg.c_e_mix_missin,''Test''); + end; + + procedure named_exc_pragma is + begin + raise exc_pkg.e_some_exception; + end; + + procedure named_exc_ora is + begin + raise NO_DATA_FOUND; + end; + + procedure named_exc_ora_dup_ind is + begin + raise DUP_VAL_ON_INDEX; + end; + + procedure nodata_exc_ora is + begin + raise NO_DATA_FOUND; + end; + + procedure defined_varchar_exc is + begin + raise_application_error(exc_pkg.c_e_varch_exc,''Test''); + end; + + procedure non_existing_const is + begin + raise_application_error(-20143, ''Test error''); end; + + procedure bad_exc_const is + begin + raise_application_error(-20143, ''Test error''); + end; + + end; '; execute immediate l_exception_spec; @@ -277,13 +295,25 @@ is procedure bad_paramters_without_except is begin ut.expect(g_tests_results).to_match('^\s*Ignores annotation and succeeds when no exception thrown \[[,\.0-9]+ sec\]\s*$','m'); - ut.expect(g_tests_results).not_to_match('bad_paramters_without_except'); + ut.expect(g_tests_results).to_match('bad_paramters_without_except\s*Invalid parameter value ".*" for "--%throws" annotation. Parameter ignored.','m'); + end; + + procedure positive_exception_number is + begin + ut.expect(g_tests_results).to_match('^\s*Ignores annotation for positive exception number value \[[,\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).to_match('positive_exception_number\s*Invalid parameter value "20001" for "--%throws" annotation. Exception value must be a negative integer. Parameter ignored.','m'); + end; + + procedure positive_exception_number_var is + begin + ut.expect(g_tests_results).to_match('^\s*Ignores annotation for positive exception number variable \[[,\.0-9]+ sec\]\s*$','m'); + ut.expect(g_tests_results).to_match('positive_exception_number_var\s*Invalid parameter value ".*" for "--%throws" annotation. Exception value must be a negative integer. Parameter ignored.','m'); end; procedure one_valid_exception_number is begin ut.expect(g_tests_results).to_match('^\s*Detects a valid exception number within many invalid ones \[[\.0-9]+ sec\]\s*$','m'); - ut.expect(g_tests_results).not_to_match('one_valid_exception_number'); + ut.expect(g_tests_results).to_match('one_valid_exception_number\s*Invalid parameter value ".*" for "--%throws" annotation. Parameter ignored.','m'); end; procedure nothing_thrown is @@ -319,13 +349,13 @@ is procedure mixed_list_notexi is begin ut.expect(g_tests_results).to_match('^\s*Success when match exception even if other variable on list dont exists \[[,\.0-9]+ sec\]\s*$','m'); - ut.expect(g_tests_results).not_to_match('mixed_list_notexi'); + ut.expect(g_tests_results).to_match('mixed_list_notexi\s*Invalid parameter value "utter_rubbish" for "--%throws" annotation. Parameter ignored.','m'); end; procedure named_exc_pragma is begin ut.expect(g_tests_results).to_match('^\s*Success resolve and match named exception defined in pragma exception init \[[,\.0-9]+ sec\]\s*$','m'); - ut.expect(g_tests_results).not_to_match('mixed_list_notexi'); + ut.expect(g_tests_results).not_to_match('named_exc_pragma'); end; procedure named_exc_ora is diff --git a/test/ut3_tester/core/annotations/test_annot_throws_exception.pks b/test/ut3_tester/core/annotations/test_annot_throws_exception.pks index ce2e6ba7a..a9d20183d 100644 --- a/test/ut3_tester/core/annotations/test_annot_throws_exception.pks +++ b/test/ut3_tester/core/annotations/test_annot_throws_exception.pks @@ -26,7 +26,13 @@ is --%test(Ignores when only bad parameters are passed, the test does not raise a exception and it shows successful test) procedure bad_paramters_without_except; - + + --%test(Ignores annotation for positive exception number value) + procedure positive_exception_number; + + --%test(Ignores annotation for positive exception number variable) + procedure positive_exception_number_var; + --%test(Detects a valid exception number within many invalid ones) procedure one_valid_exception_number; diff --git a/test/ut3_tester/core/test_suite_builder.pkb b/test/ut3_tester/core/test_suite_builder.pkb index 86d86032a..00d914413 100644 --- a/test/ut3_tester/core/test_suite_builder.pkb +++ b/test/ut3_tester/core/test_suite_builder.pkb @@ -1386,24 +1386,6 @@ create or replace package body test_suite_builder is ); end; - procedure throws_value_invalid is - l_actual clob; - l_annotations ut3.ut_annotations; - begin - --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(3, 'test','A test with invalid throws annotation', 'A_TEST_PROCEDURE'), - ut3.ut_annotation(3, 'throws',' -20145 , bad_variable_name ', 'A_TEST_PROCEDURE') - ); - --Act - l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); - --Assert - ut.expect(l_actual).to_be_like( - '%%Invalid parameter value "bad_variable_name" for "--%throws" annotation. Parameter ignored.%%' - ); - end; - procedure before_aftertest_multi is l_actual clob; diff --git a/test/ut3_tester/core/test_suite_builder.pks b/test/ut3_tester/core/test_suite_builder.pks index 7c7fc77f6..4b49e606f 100644 --- a/test/ut3_tester/core/test_suite_builder.pks +++ b/test/ut3_tester/core/test_suite_builder.pks @@ -161,9 +161,6 @@ create or replace package test_suite_builder is --%test(Gives warning if --%throws annotation has no value) procedure throws_value_empty; - --%test(Gives warning if --%throws annotation has invalid value) - procedure throws_value_invalid; - --%endcontext --%context(--%beforetest/aftertest annotation) From d33bd80f4a1b5c7e1c5188fa04ac5fcdfde9bf73 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 2 Jan 2020 19:11:57 +0000 Subject: [PATCH 0642/1096] Updated documentation for whitespace vs null compare. Updated tests o represent the issue more clearly. Closes #880 --- docs/userguide/expectations.md | 3 +- .../expectations/test_expectations_cursor.pkb | 56 +++++++------------ .../expectations/test_expectations_cursor.pks | 36 ++++++------ 3 files changed, 39 insertions(+), 56 deletions(-) diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 612b59444..9cd665314 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1114,7 +1114,8 @@ utPLSQL is capable of comparing compound data-types including: - It is possible to compare PL/SQL records, collections, varrays and associative arrays. To compare this types of data, use cursor comparison feature of utPLSQL and TABLE operator in SQL query - On Oracle 11g Release 2 - pipelined table functions are needed (see section [Implicit (Shadow) Types in this artcile](https://oracle-base.com/articles/misc/pipelined-table-functions)) - On Oracle 12c and above - use [TABLE function on nested tables/varrays/associative arrays of PL/SQL records](https://oracle-base.com/articles/12c/using-the-table-operator-with-locally-defined-types-in-plsql-12cr1) - +- utPLSQL is not able to distinguish a NULL column/attribute from a column/attribute containing whitespace-only when comparing compound data. This is due to Oracle limitation on of XMLType., utPLSQL is not able to distinguish between + See [issue #880](https://github.com/utPLSQL/utPLSQL/issues/880) for details. *Note: This behavior might be fixed in future relreases, when utPLSQL is no longer depending on XMLType for compound data comparison.* utPLSQL offers advanced data-comparison options, for comparing compound data-types. The options allow you to: - define columns/attributes to exclude from comparison diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index 1c6f46532..054c65e17 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -2639,7 +2639,7 @@ Check the query and data for errors.'; end; - procedure insginificant_whitespace1 is + procedure space_only_vs_empty is l_actual sys_refcursor; l_expected sys_refcursor; begin @@ -2650,79 +2650,65 @@ Check the query and data for errors.'; select column_value t1 from table(ut_varchar2_list(' ')); --Assert ut3.ut.expect( l_actual ).to_equal( l_expected ); - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; - procedure insginificant_whitespace2 is + procedure tab_only_vs_empty is l_actual sys_refcursor; l_expected sys_refcursor; begin open l_expected for - select ' t ' t1 from dual; - + select column_value t1 from table(ut_varchar2_list('')); + open l_actual for - select 't' t1 from dual; + select column_value t1 from table(ut_varchar2_list(chr(9))); --Assert ut3.ut.expect( l_actual ).to_equal( l_expected ); - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); - end; - - procedure insginificant_whitespace3 is - l_actual sys_refcursor; - l_expected sys_refcursor; - begin - open l_expected for - select 't ' t1 from dual; - - open l_actual for - select 't' t1 from dual; - --Assert - ut3.ut.expect( l_actual ).to_equal( l_expected ); - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; - - procedure insginificant_whitespace4 is + + procedure insignificant_start_end_space is l_actual sys_refcursor; l_expected sys_refcursor; begin open l_expected for - select ' t' t1 from dual; + select ' t ' t1 from dual; open l_actual for select 't' t1 from dual; --Assert ut3.ut.expect( l_actual ).to_equal( l_expected ); - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); - end; + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; - procedure insginificant_whitespace5 is + procedure double_vs_single_start_end_ws is l_actual sys_refcursor; l_expected sys_refcursor; begin open l_expected for - select ' ' t1 from dual; + select ' t ' t1 from dual; open l_actual for - select '' t1 from dual; + select ' t ' t1 from dual; --Assert ut3.ut.expect( l_actual ).to_equal( l_expected ); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); - end; + end; - procedure nulltowhitespace is + procedure leading_tab_vs_space is l_actual sys_refcursor; l_expected sys_refcursor; begin open l_expected for - select cast(null as varchar2(2)) t1 from dual; + select ' t' t1 from dual; open l_actual for - select ' ' t1 from dual; + select chr(9)||'t' t1 from dual; --Assert ut3.ut.expect( l_actual ).to_equal( l_expected ); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); - end; - + end; + procedure number_from_dual is l_actual sys_refcursor; l_expected sys_refcursor; diff --git a/test/ut3_user/expectations/test_expectations_cursor.pks b/test/ut3_user/expectations/test_expectations_cursor.pks index d3dbeb9a7..0ed249a49 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pks +++ b/test/ut3_user/expectations/test_expectations_cursor.pks @@ -417,31 +417,27 @@ create or replace package test_expectations_cursor is --%test(Check that column name accept non xml characters fix #902) procedure nonxmlchar_part_of_colname; - - - /*Oracle Bug not readin properly in xmltable */ - --%test ( Compare insiginificant whitespaces scenario 1 ) + + + /*Oracle Bug not reading properly in XMLTable - See - Issue #880 */ + --%disabled + --%test ( Space-only string is not equal empty string ) + procedure space_only_vs_empty; + + /*Oracle Bug not reading properly in XMLTable - See - Issue #880 */ --%disabled - procedure insginificant_whitespace1; + --%test ( Tab-only string is not equal empty string ) + procedure tab_only_vs_empty; - --%test ( Compare insiginificant whitespaces scenario 2 ) - procedure insginificant_whitespace2; + --%test ( Insignificant start/end whitespaces are considered ) + procedure insignificant_start_end_space; - --%test ( Compare insiginificant whitespaces scenario 3 ) - procedure insginificant_whitespace3; + --%test ( Double and single leading/trailing space is distinguished ) + procedure double_vs_single_start_end_ws; - --%test ( Compare insiginificant whitespaces scenario 4 ) - procedure insginificant_whitespace4; + --%test ( Leading Tab vs. Space is distinguished ) + procedure leading_tab_vs_space; - /*Oracle Bug not readin properly in xmltable */ - --%test ( Compare insiginificant whitespaces scenario 5 ) - --%disabled - procedure insginificant_whitespace5; - - /*Oracle Bug not readin properly in xmltable */ - --%test ( Compare null to whitespace ) - --%disabled - procedure nulltowhitespace; --%test(Check precision of number from dual #907) procedure number_from_dual; From 5510555c3b6cea45f273cb4135e811e959ce1877 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 3 Jan 2020 05:23:44 +0000 Subject: [PATCH 0643/1096] Fixed documentation. --- docs/userguide/expectations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 9cd665314..9f2842e2f 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1114,7 +1114,7 @@ utPLSQL is capable of comparing compound data-types including: - It is possible to compare PL/SQL records, collections, varrays and associative arrays. To compare this types of data, use cursor comparison feature of utPLSQL and TABLE operator in SQL query - On Oracle 11g Release 2 - pipelined table functions are needed (see section [Implicit (Shadow) Types in this artcile](https://oracle-base.com/articles/misc/pipelined-table-functions)) - On Oracle 12c and above - use [TABLE function on nested tables/varrays/associative arrays of PL/SQL records](https://oracle-base.com/articles/12c/using-the-table-operator-with-locally-defined-types-in-plsql-12cr1) -- utPLSQL is not able to distinguish a NULL column/attribute from a column/attribute containing whitespace-only when comparing compound data. This is due to Oracle limitation on of XMLType., utPLSQL is not able to distinguish between +- utPLSQL is not able to distinguish between a NULL and whitespace-only column/attribute from when comparing compound data. This is due to Oracle limitation on of XMLType. See [issue #880](https://github.com/utPLSQL/utPLSQL/issues/880) for details. *Note: This behavior might be fixed in future relreases, when utPLSQL is no longer depending on XMLType for compound data comparison.* utPLSQL offers advanced data-comparison options, for comparing compound data-types. The options allow you to: From d02ac9470627e0896922bdf37d03c89125b1422c Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 29 Dec 2019 00:58:47 +0000 Subject: [PATCH 0644/1096] Changed ordering of tests for suites with context Resolves #1036 --- source/core/ut_suite_cache_manager.pkb | 20 ++-- test/ut3_tester/core/test_suite_builder.pkb | 118 ++++++++++---------- test/ut3_tester/core/test_suite_builder.pks | 2 +- 3 files changed, 74 insertions(+), 66 deletions(-) diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index 509b28498..759f55278 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -162,14 +162,20 @@ create or replace package body ut_suite_cache_manager is return case when a_random_seed is null then q'[ replace( - case - when c.obj.self_type in ( 'UT_TEST' ) - then substr(c.obj.path, 1, instr(c.obj.path, '.', -1) ) - else c.obj.path - end, '.', chr(0) + substr( c.obj.path, 1, instr( c.obj.path, lower(c.obj.object_name), -1 ) + length(c.obj.object_name) ), + '.', + chr(0) ) desc nulls last, - c.obj.object_name desc, - c.obj.line_no, + case when c.obj.self_type = 'UT_SUITE_CONTEXT' then + ( select max( x.line_no ) + 1 + from ut_suite_cache x + where c.obj.object_owner = x.object_owner and c.obj.object_name = x.object_name and + x.path like c.obj.path || '.%' + ) + else + c.obj.line_no + end, + regexp_count(c.obj.path,'\.') desc, :a_random_seed]' else ' ut_runner.hash_suite_path( diff --git a/test/ut3_tester/core/test_suite_builder.pkb b/test/ut3_tester/core/test_suite_builder.pkb index 00d914413..8eedc1142 100644 --- a/test/ut3_tester/core/test_suite_builder.pkb +++ b/test/ut3_tester/core/test_suite_builder.pkb @@ -649,6 +649,9 @@ create or replace package body test_suite_builder is '' || '%' || '%' || + '' || + '%suite_level_testIn suitesome_package.suite_level_test' || + '%' || '' || '%a_contextA contextsome_package.a_context' || '%' || @@ -661,9 +664,6 @@ create or replace package body test_suite_builder is '%' || '' || '' || - '' || - '%suite_level_testIn suitesome_package.suite_level_test' || - '%' || '' || '' || '%some_packagesuite_level_beforeall' || @@ -710,26 +710,14 @@ create or replace package body test_suite_builder is '' || '%' || '%' || + '' || + '%suite_level_testIn suitesome_package.suite_level_test' || + '%' || '' || '%a_contextA contextsome_package.a_context' || '%' || '' || - '%nested_context_2nested_context_2some_package.a_context.nested_context_2' || - '%' || - '' || - '%nested_context_#1a_nested_context_3some_package.a_context.nested_context_2.nested_context_#1' || - '%' || - '' || - '%test_in_nested_context_3Test in nested contextsome_package.a_context.nested_context_2.nested_context_#1.test_in_nested_context_3' || - '%' || - '' || - '' || - '%' || - '' || - '%test_in_nested_context_2Test in nested contextsome_package.a_context.nested_context_2.test_in_nested_context_2' || - '%' || - '' || - '' || + '%first_test_in_a_contextFirst test in contextsome_package.a_context.first_test_in_a_context' || '%' || '' || '%a_nested_contextA nested contextsome_package.a_context.a_nested_context' || @@ -743,7 +731,22 @@ create or replace package body test_suite_builder is '%' || '%' || '' || - '%first_test_in_a_contextFirst test in contextsome_package.a_context.first_test_in_a_context' || + '%nested_context_2nested_context_2some_package.a_context.nested_context_2' || + '%' || + '' || + '%test_in_nested_context_2Test in nested contextsome_package.a_context.nested_context_2.test_in_nested_context_2' || + '%' || + '' || + '%nested_context_#1a_nested_context_3some_package.a_context.nested_context_2.nested_context_#1' || + '%' || + '' || + '%test_in_nested_context_3Test in nested contextsome_package.a_context.nested_context_2.nested_context_#1.test_in_nested_context_3' || + '%' || + '' || + '' || + '%' || + '' || + '' || '%' || '' || '%second_test_in_a_contextSecond test in contextsome_package.a_context.second_test_in_a_context' || @@ -754,9 +757,6 @@ create or replace package body test_suite_builder is '%' || '' || '' || - '' || - '%suite_level_testIn suitesome_package.suite_level_test' || - '%' || '' || '' || '%some_packagesuite_level_beforeall' || @@ -859,6 +859,10 @@ create or replace package body test_suite_builder is ''|| '' || '%' || + '%' || + '%suite_level_test' || + '%%suite_level_test%' || + '%' || '%' || '%nested_context_#1A contextsome_package.nested_context_#1' || '%' || @@ -872,10 +876,6 @@ create or replace package body test_suite_builder is '%%context_beforeall%' || '%%context_afterall%' || '%' || - '%' || - '%suite_level_test' || - '%%suite_level_test%' || - '%' || '%' || '%'|| '' @@ -909,6 +909,12 @@ create or replace package body test_suite_builder is ''|| '' || '%' || + '%' || + '%suite_level_test' || + '%%suite_level_beforeeach%' || + '%%suite_level_test%' || + '%%suite_level_aftereach%' || + '%' || '%' || '%nested_context_#1nested_context_#1some_package.nested_context_#1' || '%' || @@ -920,12 +926,6 @@ create or replace package body test_suite_builder is '%' || '%' || '%' || - '%' || - '%suite_level_test' || - '%%suite_level_beforeeach%' || - '%%suite_level_test%' || - '%%suite_level_aftereach%' || - '%' || '%' || '%%suite_level_beforeall%' || '%%suite_level_afterall%' || @@ -961,18 +961,20 @@ create or replace package body test_suite_builder is ''|| '' || '%' || - '%a_contextSome contextsome_package.a_context' || - '%' || - '' || - '%test_in_a_contextIn contextsome_package.a_context.test_in_a_context' || - '%' || - '' || - '' || - '%some_packagecontext_setup' || - '%' || '%' || '%suite_level_testIn suitesome_package.suite_level_test' || '%' || + '%' || + '%a_contextSome contextsome_package.a_context' || + '%' || + '' || + '%test_in_a_contextIn contextsome_package.a_context.test_in_a_context' || + '%' || + '' || + '' || + '%some_packagecontext_setup' || + '%' || + '%' || '' || '' || '%some_packagesuite_level_beforeall' || @@ -1010,6 +1012,9 @@ create or replace package body test_suite_builder is ''|| '' || '%' || + '' || + '%suite_level_testIn suitesome_package.suite_level_test' || + '%' || '' || '%a_contextA contextsome_package.a_context' || '%' || @@ -1022,9 +1027,6 @@ create or replace package body test_suite_builder is '%' || '' || '' || - '' || - '%suite_level_testIn suitesome_package.suite_level_test' || - '%' || '' || '' || '%some_packagesuite_level_beforeall' || @@ -1067,32 +1069,32 @@ create or replace package body test_suite_builder is '' || '%' || '' || - '%nested_context_#2A contextsome_package.nested_context_#2' || + '%suite_level_testIn suitesome_package.suite_level_test' || + '%' || + '' || + '%a_contextA contextsome_package.a_context' || '%' || '' || - '%test_in_duplicated_contextIn duplicated contextsome_package.nested_context_#2.test_in_duplicated_context' || + '%test_in_a_contextIn contextsome_package.a_context.test_in_a_context' || '%' || '' || '' || - '%some_packagesetup_in_duplicated_context' || + '%some_packagecontext_setup' || '%' || '' || '' || '' || - '%a_contextA contextsome_package.a_context' || + '%nested_context_#2A contextsome_package.nested_context_#2' || '%' || '' || - '%test_in_a_contextIn contextsome_package.a_context.test_in_a_context' || + '%test_in_duplicated_contextIn duplicated contextsome_package.nested_context_#2.test_in_duplicated_context' || '%' || '' || '' || - '%some_packagecontext_setup' || + '%some_packagesetup_in_duplicated_context' || '%' || '' || '' || - '' || - '%suite_level_testIn suitesome_package.suite_level_test' || - '%' || '' || '' || '%some_packagesuite_level_beforeall' || @@ -1341,20 +1343,20 @@ create or replace package body test_suite_builder is '' || '%' || '' || - '%nested_context_#2A contextsome_package.nested_context_#2' || + '%nested_context_#1A contextsome_package.nested_context_#1' || '%' || '' || - '%test_in_a_context2In context2some_package.nested_context_#2.test_in_a_context2' || + '%test_in_a_context1In context1some_package.nested_context_#1.test_in_a_context1' || '%' || '' || '' || '' || '' || '' || - '%nested_context_#1A contextsome_package.nested_context_#1' || + '%nested_context_#2A contextsome_package.nested_context_#2' || '%' || '' || - '%test_in_a_context1In context1some_package.nested_context_#1.test_in_a_context1' || + '%test_in_a_context2In context2some_package.nested_context_#2.test_in_a_context2' || '%' || '' || '' || diff --git a/test/ut3_tester/core/test_suite_builder.pks b/test/ut3_tester/core/test_suite_builder.pks index 4b49e606f..e451563e5 100644 --- a/test/ut3_tester/core/test_suite_builder.pks +++ b/test/ut3_tester/core/test_suite_builder.pks @@ -151,7 +151,7 @@ create or replace package test_suite_builder is --%test(Is ignored when name value is empty) procedure name_empty_value; - --%test(Is ignored when name value is empty) + --%test(Is is applied to corresponding context when multiple contexts used) procedure multiple_contexts; --%endcontext From 0a4edaf1812ea8207d2124613e50fecb7233c4d6 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 29 Dec 2019 01:03:06 +0000 Subject: [PATCH 0645/1096] Test name fix --- test/ut3_tester/core/test_suite_builder.pks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ut3_tester/core/test_suite_builder.pks b/test/ut3_tester/core/test_suite_builder.pks index e451563e5..4cbfcad74 100644 --- a/test/ut3_tester/core/test_suite_builder.pks +++ b/test/ut3_tester/core/test_suite_builder.pks @@ -151,7 +151,7 @@ create or replace package test_suite_builder is --%test(Is ignored when name value is empty) procedure name_empty_value; - --%test(Is is applied to corresponding context when multiple contexts used) + --%test(Is applied to corresponding context when multiple contexts used) procedure multiple_contexts; --%endcontext From 326e055007b38fc3ec3380aaae86483f6cb21579 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 3 Jan 2020 05:33:03 +0000 Subject: [PATCH 0646/1096] Added documenting comments for ordering of data from suite_cache. Fixed SQL formatting. --- source/core/ut_suite_cache_manager.pkb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index 759f55278..05984da3f 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -162,19 +162,23 @@ create or replace package body ut_suite_cache_manager is return case when a_random_seed is null then q'[ replace( + --suite path until objects name (excluding contexts and test path) with trailing dot (full stop) substr( c.obj.path, 1, instr( c.obj.path, lower(c.obj.object_name), -1 ) + length(c.obj.object_name) ), '.', + --'.' replaced with chr(0) to assure that child elements come before parent when sorting in descending oder chr(0) ) desc nulls last, case when c.obj.self_type = 'UT_SUITE_CONTEXT' then ( select max( x.line_no ) + 1 from ut_suite_cache x - where c.obj.object_owner = x.object_owner and c.obj.object_name = x.object_name and - x.path like c.obj.path || '.%' + where c.obj.object_owner = x.object_owner + and c.obj.object_name = x.object_name + and x.path like c.obj.path || '.%' ) else c.obj.line_no end, + --assures that child contexts come before parent contexts regexp_count(c.obj.path,'\.') desc, :a_random_seed]' else From a25b8b7c57c5928d38764b2997af0f1385561f2c Mon Sep 17 00:00:00 2001 From: Travis CI Date: Fri, 3 Jan 2020 05:54:05 +0000 Subject: [PATCH 0647/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 205fbef66..19adafe88 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 923dd5b7d..95fb477ff 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 260e05ede..a715c2ef6 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 6ff3b41be..1cde4188e 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index fc2718b3f..2e44c6ba1 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 184866b7b..423f50ee2 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 12ccc8a30..5d1efaa62 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 0f0682924..6092231de 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 4853bfca1..978a7d3e1 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index ba4313743..4c33cbed9 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 612b59444..2947e55b8 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 31988dcfe..944ecb385 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 6de351376..4a165913f 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 346de3cb9..9093bdffe 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 7a8f10af6..32721d647 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 7babf9366..c1f7733ce 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index cd6e8b065..e97253135 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3298--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 096761d0a..d6d65a826 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -767,7 +767,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.10.3298-develop + * secion v3.1.10.3311-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 671312a9f..aa074190e 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.10.3298-develop'; + gc_version constant varchar2(50) := 'v3.1.10.3311-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From d708443346b73a92fed3310605d4fa2a93ad914c Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 4 Jan 2020 10:45:23 +0000 Subject: [PATCH 0648/1096] Fixed documentation typos. --- docs/userguide/expectations.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 9f2842e2f..6410fc6f1 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1114,8 +1114,8 @@ utPLSQL is capable of comparing compound data-types including: - It is possible to compare PL/SQL records, collections, varrays and associative arrays. To compare this types of data, use cursor comparison feature of utPLSQL and TABLE operator in SQL query - On Oracle 11g Release 2 - pipelined table functions are needed (see section [Implicit (Shadow) Types in this artcile](https://oracle-base.com/articles/misc/pipelined-table-functions)) - On Oracle 12c and above - use [TABLE function on nested tables/varrays/associative arrays of PL/SQL records](https://oracle-base.com/articles/12c/using-the-table-operator-with-locally-defined-types-in-plsql-12cr1) -- utPLSQL is not able to distinguish between a NULL and whitespace-only column/attribute from when comparing compound data. This is due to Oracle limitation on of XMLType. - See [issue #880](https://github.com/utPLSQL/utPLSQL/issues/880) for details. *Note: This behavior might be fixed in future relreases, when utPLSQL is no longer depending on XMLType for compound data comparison.* +- utPLSQL is not able to distinguish between NULL and whitespace-only column/attribute value when comparing compound data. This is due to Oracle limitation on of XMLType. + See [issue #880](https://github.com/utPLSQL/utPLSQL/issues/880) for details. *Note: This behavior might be fixed in future releases, when utPLSQL is no longer depending on XMLType for compound data comparison.* utPLSQL offers advanced data-comparison options, for comparing compound data-types. The options allow you to: - define columns/attributes to exclude from comparison From 101bcbf8f09bafecb151ba4d281e76c801236cd2 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sat, 4 Jan 2020 12:43:38 +0000 Subject: [PATCH 0649/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 19adafe88..b526f0c8e 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 95fb477ff..207e0bae1 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index a715c2ef6..32346fa8a 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 1cde4188e..832a12eba 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 2e44c6ba1..b5615a2ed 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 423f50ee2..f5d78ea92 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 5d1efaa62..ddb939b76 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 6092231de..4bffbddfc 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 978a7d3e1..5ae210e58 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 4c33cbed9..3eeb45b45 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index dfbcc8651..374d35a62 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 944ecb385..1dab9dd0e 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 4a165913f..37d099545 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 9093bdffe..cd3a78dca 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 32721d647..8ff52311e 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index c1f7733ce..9ea158190 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index e97253135..f73c5a073 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3311--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index d6d65a826..dc49b6baf 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -767,7 +767,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.10.3311-develop + * secion v3.1.10.3319-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index aa074190e..299ff2181 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.10.3311-develop'; + gc_version constant varchar2(50) := 'v3.1.10.3319-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 1b0b8f8c616356a211005f11a8960eac5300a57c Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 15 Feb 2020 14:46:26 +0000 Subject: [PATCH 0650/1096] Refactored expectations on compound data With this change the reporting of differences is unified across: `unordered`, `ordered` and `join_by` comparison. --- .../data_values/ut_compound_data_helper.pkb | 131 +++++++++++------- .../expectations/test_expectation_anydata.pkb | 6 +- .../expectations/test_expectations_cursor.pkb | 22 ++- 3 files changed, 90 insertions(+), 69 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index d7c0aab76..6a6b30a50 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -417,39 +417,78 @@ create or replace package body ut_compound_data_helper is l_join_xpath varchar2(32767) := ut_utils.to_xpath(a_join_by_list); l_results tt_row_diffs; l_sql varchar2(32767); + l_column_order varchar2(100); begin + if a_enforce_column_order then + l_column_order := 'col_no'; + else + l_column_order := 'col_name'; + end if; l_sql := q'[ - with exp as ( + with + exp_rows as( + select + exp_data_id, extract( exp_item_data, :column_path ) exp_item_data, item_no, diff_id + from ut_compound_data_diff_tmp + where diff_id = :diff_id + and exp_data_id = :self_guid + ), + act_rows as ( + select + act_data_id, extract( act_item_data, :column_path ) act_item_data, item_no, diff_id + from ut_compound_data_diff_tmp ucd + where diff_id = :diff_id + and ucd.act_data_id = :other_guid + ), + exp_cols as ( select - exp_item_data, exp_data_id, item_no rn, rownum col_no, pk_value, + exp_item_data, exp_data_id, item_no rn, rownum col_no, diff_id, s.column_value col, s.column_value.getRootElement() col_name, nvl(s.column_value.getclobval(),empty_clob()) col_val - from ( - select - exp_data_id, extract( ucd.exp_item_data, :column_path ) exp_item_data, item_no, - replace( extract( ucd.exp_item_data, :join_by ).getclobval(), chr(10) ) pk_value - from ut_compound_data_diff_tmp ucd - where diff_id = :diff_id - and ucd.exp_data_id = :self_guid - ) i, - table( xmlsequence( extract(i.exp_item_data,:extract_path) ) ) s + from exp_rows i, + table( xmlsequence( extract( i.exp_item_data, :extract_path ) ) ) s ), - act as ( + act_cols as ( select - act_item_data, act_data_id, item_no rn, rownum col_no, pk_value, + act_item_data, act_data_id, item_no rn, rownum col_no, diff_id, s.column_value col, s.column_value.getRootElement() col_name, nvl(s.column_value.getclobval(),empty_clob()) col_val + from act_rows i, + table( xmlsequence( extract( i.act_item_data, :extract_path ) ) ) s + ), + data_diff as ( + select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, null pk_value, col_name, diff_id from ( - select - act_data_id, extract( ucd.act_item_data, :column_path ) act_item_data, item_no, - replace( extract( ucd.act_item_data, :join_by ).getclobval(), chr(10) ) pk_value - from ut_compound_data_diff_tmp ucd - where diff_id = :diff_id - and ucd.act_data_id = :other_guid - ) i, - table( xmlsequence( extract(i.act_item_data,:extract_path) ) ) s + select nvl(exp.rn, act.rn) rn, + exp.diff_id diff_id, + xmlagg(exp.col order by exp.col_no) exp_item, + xmlagg(act.col order by nvl(exp.col_no, act.col_no)) act_item, + max(nvl(exp.col_name,act.col_name)) col_name + from exp_cols exp + join act_cols act + on exp.rn = act.rn and exp.col_name = act.col_name + where dbms_lob.compare(exp.col_val, act.col_val) != 0 + group by nvl(exp.rn, act.rn), exp.diff_id + ) + unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:') ) + ), + unordered_diff as ( + select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, null pk_value, col_name, diff_id + from ( + select nvl(exp.rn, act.rn) rn, + exp.diff_id diff_id, + xmlagg(exp.col order by exp.col_name) exp_item, + xmlagg(act.col order by act.col_name) act_item, + max(nvl(exp.col_name,act.col_name)) col_name + from exp_cols exp + join act_cols act + on exp.rn = act.rn and exp.col_name = act.col_name + where dbms_lob.compare(exp.col_val, act.col_val) != 0 + group by nvl(exp.rn, act.rn), exp.diff_id + ) + unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:') ) ) - select rn, diff_type, diffed_row, pk_value pk_value + select rn, diff_type, diffed_row, pk_value from ( select rn, diff_type, diffed_row, pk_value, case when diff_type = 'Actual:' then 1 else 2 end rnk, @@ -457,33 +496,20 @@ create or replace package body ut_compound_data_helper is col_name from ( ]' || case when a_unordered then q'[ - select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, pk_value, col_name - from ( - select nvl(exp.rn, act.rn) rn, - nvl(exp.pk_value, act.pk_value) pk_value, - exp.col exp_item, - act.col act_item, - nvl(exp.col_name,act.col_name) col_name - from exp - join act - on exp.rn = act.rn and exp.col_name = act.col_name - where dbms_lob.compare(exp.col_val, act.col_val) != 0 - ) - unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:') ) ]' + select u.rn, u.diff_type, u.diffed_row, + replace( + extract( case when i.exp_data_id is null then i.act_item_data else i.exp_item_data end, :join_by ).getclobval(), + chr(10) + ) pk_value, + u.col_name + from data_diff u + join ut_compound_data_diff_tmp i + on i.diff_id = u.diff_id + and i.item_no = u.rn]' else q'[ - select rn, diff_type, xmlserialize(content data_item no indent) diffed_row, null pk_value, col_name - from ( - select nvl(exp.rn, act.rn) rn, - xmlagg(exp.col order by exp.col_no) exp_item, - xmlagg(act.col order by act.col_no) act_item, - max(nvl(exp.col_name,act.col_name)) col_name - from exp exp - join act act - on exp.rn = act.rn and exp.col_name = act.col_name - where dbms_lob.compare(exp.col_val, act.col_val) != 0 - group by (exp.rn, act.rn) - ) - unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:') ) ]' + select rn, diff_type, diffed_row, pk_value, col_name + from data_diff + where :join_by is null ]' end ||q'[ ) union all @@ -522,14 +548,13 @@ create or replace package body ut_compound_data_helper is case when final_order = 1 then to_char(rn) else col_name end, case when final_order = 1 then to_char(rnk) else col_name end ]' - else - null end; execute immediate l_sql bulk collect into l_results - using l_exp_extract_xpath, l_join_xpath, a_diff_id, a_expected_dataset_guid,a_extract_path, - l_act_extract_xpath, l_join_xpath, a_diff_id, a_actual_dataset_guid,a_extract_path, - l_join_xpath, l_join_xpath, a_diff_id; + using l_exp_extract_xpath, a_diff_id, a_expected_dataset_guid, + l_act_extract_xpath, a_diff_id, a_actual_dataset_guid, + a_extract_path, a_extract_path, + l_join_xpath, l_join_xpath, l_join_xpath, a_diff_id; return l_results; end; diff --git a/test/ut3_user/expectations/test_expectation_anydata.pkb b/test/ut3_user/expectations/test_expectation_anydata.pkb index f94b0efc0..ece5457a7 100644 --- a/test/ut3_user/expectations/test_expectation_anydata.pkb +++ b/test/ut3_user/expectations/test_expectation_anydata.pkb @@ -864,10 +864,8 @@ Rows: [ 60 differences, showing first 20 ] l_expected_message := q'[%Actual: ut3_tester_helper.test_dummy_object_list [ count = 2 ] was expected to equal: ut3_tester_helper.test_dummy_object_list [ count = 2 ] %Diff: %Rows: [ 3 differences ] -%PK 2 - Actual: Something 2 -%PK 2 - Actual: 2 -%PK 2 - Expected: Something 1 -%PK 2 - Expected: 1 +%PK 2 - Actual: Something 22 +%PK 2 - Expected: Something 11 %PK 1 - Extra: 1Something 11 %PK 4 - Missing: 4Something 22]'; l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index 054c65e17..5a0b68f2f 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -371,7 +371,7 @@ create or replace package body test_expectations_cursor is l_expected_message := q'[Actual: refcursor [ count = 1 ] was expected to equal: refcursor [ count = 1 ] %Diff: %Rows: [ 1 differences ] -%Row No. 1 - Actual: 4030 +%Row No. 1 - Actual: 3040 %Row No. 1 - Expected: 34]'; l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert @@ -394,7 +394,7 @@ create or replace package body test_expectations_cursor is l_expected_message := q'[Actual: refcursor [ count = 1 ] was expected to equal: refcursor [ count = 1 ] %Diff: %Rows: [ 1 differences ] -%Row No. 1 - Actual: 4030 +%Row No. 1 - Actual: 3040 %Row No. 1 - Expected: 34]'; l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert @@ -860,9 +860,9 @@ Columns: Rows: [ 4 differences ] Row No. 1 - Actual: 25000 Row No. 1 - Expected: 10000 - Row No. 2 - Actual: TONYSTARK3100000 + Row No. 2 - Actual: 3TONYSTARK100000 Row No. 2 - Expected: 2LUKESKYWALKER1000 - Row No. 3 - Actual: JESSICAJONES42345 + Row No. 3 - Actual: 4JESSICAJONES2345 Row No. 3 - Expected: 3TONYSTARK100000 Row No. 4 - Extra: MLUKESKYWALKER21000]'; l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); @@ -896,9 +896,9 @@ Columns: Rows: [ 4 differences ] Row No. 1 - Actual: 25000 Row No. 1 - Expected: 10000 - Row No. 2 - Actual: TONYSTARK3100000 + Row No. 2 - Actual: 3TONYSTARK100000 Row No. 2 - Expected: 2LUKESKYWALKER1000 - Row No. 3 - Actual: JESSICAJONES42345 + Row No. 3 - Actual: 4JESSICAJONES2345 Row No. 3 - Expected: 3TONYSTARK100000 Row No. 4 - Extra: MLUKESKYWALKER21000]'; l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); @@ -1237,10 +1237,8 @@ Rows: [ 4 differences ] l_expected_message := q'[Actual: refcursor [ count = 1 ] was expected to equal: refcursor [ count = 1 ] %Diff: %Rows: [ 1 differences ] -%PK 1 - Actual: 30 -%PK 1 - Expected: 3 -%PK 1 - Actual: 40 -%PK 1 - Expected: 4]'; +%PK 1 - Actual: 3040 +%PK 1 - Expected: 34]'; l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); @@ -2511,7 +2509,7 @@ Diff:% begin l_exp_message :='ORA-20218: SQL exception thrown when fetching data from cursor: ORA-01476: divisor is equal to zero -at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line 2522 ut3.ut.expect(l_actual).to_equal(l_expected);% +at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line % ut3.ut.expect(l_actual).to_equal(l_expected);% Check the query and data for errors.'; open l_actual for @@ -2536,7 +2534,7 @@ Check the query and data for errors.'; l_exp_message :='ORA-20218: SQL exception thrown when fetching data from cursor: ORA-01476: divisor is equal to zero -at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line 2547 ut3.ut.expect(l_actual).to_equal(l_expected);% +at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line % ut3.ut.expect(l_actual).to_equal(l_expected);% Check the query and data for errors.'; open l_expected for From 8eac19e41a7b20d9b443901cae90cd3429310835 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 15 Feb 2020 15:03:34 +0000 Subject: [PATCH 0651/1096] Changed maven repo url. --- .travis/maven_cfg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/maven_cfg.sh b/.travis/maven_cfg.sh index ef2348099..b24e56582 100755 --- a/.travis/maven_cfg.sh +++ b/.travis/maven_cfg.sh @@ -7,7 +7,7 @@ cd $(dirname $(readlink -f $0)) # Download wagon-http recommended by Oracle. # On maven latest version this is not needed, but travis doesn't have it. if [ ! -f $CACHE_DIR/wagon-http-2.8-shaded.jar ]; then - curl -L -O "http://central.maven.org/maven2/org/apache/maven/wagon/wagon-http/2.8/wagon-http-2.8-shaded.jar" + curl -L -O "https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-http/2.8/wagon-http-2.8-shaded.jar" mv wagon-http-2.8-shaded.jar $CACHE_DIR/ sudo cp $CACHE_DIR/wagon-http-2.8-shaded.jar $MAVEN_HOME/lib/ext/ else From d84a6845b2275ec77fdc48a083c8deaae05ad752 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 15 Feb 2020 15:32:30 +0000 Subject: [PATCH 0652/1096] Removing maven step for obtaining Oracle jdbc drivers - those are now available as part of `utPLSQL-cli` since version `3.1.8` --- .travis.yml | 2 -- .travis/maven_cfg.sh | 18 ------------- .travis/pom.xml | 62 -------------------------------------------- .travis/settings.xml | 51 ------------------------------------ 4 files changed, 133 deletions(-) delete mode 100755 .travis/maven_cfg.sh delete mode 100644 .travis/pom.xml delete mode 100644 .travis/settings.xml diff --git a/.travis.yml b/.travis.yml index 7ac28e41f..6d2514c1b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -80,8 +80,6 @@ before_install: install: #- unzip utPLSQL.zip - unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli - # Get ojdbc via maven - - bash .travis/maven_cfg.sh - bash .travis/install_sqlcl.sh - sudo mkdir -p /dev/pdbs - sudo chmod -R 777 /dev/pdbs diff --git a/.travis/maven_cfg.sh b/.travis/maven_cfg.sh deleted file mode 100755 index b24e56582..000000000 --- a/.travis/maven_cfg.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -set -ev -cp .travis/settings.xml $MAVEN_CFG/settings.xml - -cd $(dirname $(readlink -f $0)) - -# Download wagon-http recommended by Oracle. -# On maven latest version this is not needed, but travis doesn't have it. -if [ ! -f $CACHE_DIR/wagon-http-2.8-shaded.jar ]; then - curl -L -O "https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon-http/2.8/wagon-http-2.8-shaded.jar" - mv wagon-http-2.8-shaded.jar $CACHE_DIR/ - sudo cp $CACHE_DIR/wagon-http-2.8-shaded.jar $MAVEN_HOME/lib/ext/ -else - echo "Using cached wagon-http..." - sudo cp $CACHE_DIR/wagon-http-2.8-shaded.jar $MAVEN_HOME/lib/ext/ -fi - -mvn dependency:copy-dependencies -DoutputDirectory=../utPLSQL-cli/lib \ No newline at end of file diff --git a/.travis/pom.xml b/.travis/pom.xml deleted file mode 100644 index 706bd79bb..000000000 --- a/.travis/pom.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - 4.0.0 - org.utplsql - utplsql - 3.0.4-SNAPSHOT - jar - - utPLSQL - https://github.com/utPLSQL/utPLSQL - - - UTF-8 - - - - - com.oracle.jdbc - ojdbc8 - 12.2.0.1 - compile - - - com.oracle.jdbc - orai18n - 12.2.0.1 - compile - - - - - - maven.oracle.com - - true - - - false - - https://maven.oracle.com - default - - - - - - maven.oracle.com - https://maven.oracle.com - - - - - - - io.packagecloud.maven.wagon - maven-packagecloud-wagon - 0.0.6 - - - - diff --git a/.travis/settings.xml b/.travis/settings.xml deleted file mode 100644 index 731ef5298..000000000 --- a/.travis/settings.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - maven.oracle.com - ${env.ORACLE_OTN_USER} - ${env.ORACLE_OTN_PASSWORD} - - - ANY - ANY - OAM 11g - - - - - - http.protocol.allow-circular-redirects - %b,true - - - - - - - - - From 02ba32b6c660ceb8fdc58094943a4bc37e49a9ab Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 15 Feb 2020 15:34:22 +0000 Subject: [PATCH 0653/1096] Removing `/dev/pdbs` directory We do not use it since we switched to `small` databases. --- .travis.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6d2514c1b..018038144 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,10 +50,10 @@ env: - MAVEN_CFG=$HOME/.m2 matrix: - ORACLE_VERSION="${DOCKER_TAG_11G:-11g-r2-xe}" CONNECTION_STR='127.0.0.1:1521/XE' DOCKER_OPTIONS='--shm-size=1g' - - ORACLE_VERSION="${DOCKER_TAG_12C:-12c-r1-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs" - - ORACLE_VERSION="${DOCKER_TAG_12C2:-12c-r2-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs" - - ORACLE_VERSION="${DOCKER_TAG_18:-18c-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs" - - ORACLE_VERSION="${DOCKER_TAG_19:-19c-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs" + - ORACLE_VERSION="${DOCKER_TAG_12C:-12c-r1-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' + - ORACLE_VERSION="${DOCKER_TAG_12C2:-12c-r2-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' + - ORACLE_VERSION="${DOCKER_TAG_18:-18c-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' + - ORACLE_VERSION="${DOCKER_TAG_19:-19c-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' cache: pip: true @@ -81,8 +81,6 @@ install: #- unzip utPLSQL.zip - unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli - bash .travis/install_sqlcl.sh - - sudo mkdir -p /dev/pdbs - - sudo chmod -R 777 /dev/pdbs - if [[ ! $TRAVIS_TAG ]]; then bash .travis/start_db.sh; fi before_script: From 15d24afa58bc29a79fc7e0a80bfa31e6c363406c Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sat, 15 Feb 2020 16:21:50 +0000 Subject: [PATCH 0654/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index b526f0c8e..245d8504c 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 207e0bae1..5f5295da8 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 32346fa8a..73498a628 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 832a12eba..34f990b6f 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index b5615a2ed..c15e45936 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index f5d78ea92..d357cbd8c 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index ddb939b76..4c398a4a4 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 4bffbddfc..87f4f9519 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 5ae210e58..e1a9e09d1 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 3eeb45b45..624dba1ee 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 374d35a62..93b0f1258 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 1dab9dd0e..e37920255 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 37d099545..0a7a04b35 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index cd3a78dca..b6ef0def6 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 8ff52311e..3399c5c72 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 9ea158190..3ce5daace 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index f73c5a073..66617cb2e 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3319--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index dc49b6baf..13f64d1bd 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -767,7 +767,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.10.3319-develop + * secion v3.1.10.3327-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 299ff2181..3b23edad0 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.10.3319-develop'; + gc_version constant varchar2(50) := 'v3.1.10.3327-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From ba90abf5be5ba05b44a9080349f9edd54fe7a62b Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 5 Aug 2019 02:44:42 +0100 Subject: [PATCH 0655/1096] Cleanup and refactoring of annotation cache. Added ability to refresh annotation cache with DDL trigger enabled if schema was not full-scanned. Resolves: #975 --- .../annotations/ut_annotation_cache_info.sql | 7 +- .../ut_annotation_cache_manager.pkb | 123 ++++---- .../ut_annotation_cache_manager.pks | 19 +- .../ut_annotation_cache_schema.sql | 8 +- .../annotations/ut_annotation_manager.pkb | 230 +++++++-------- .../annotations/ut_annotation_manager.pks | 15 +- .../core/annotations/ut_annotation_parser.pkb | 15 +- .../core/annotations/ut_annotation_parser.pks | 2 +- source/core/annotations/ut_trigger_check.pkb | 4 +- source/core/types/ut_suite_cache_row.tps | 40 +-- source/core/ut_suite_cache_manager.pkb | 23 +- source/core/ut_utils.pkb | 10 +- .../annotations/test_annotation_manager.pkb | 263 +++++++++++------- .../annotations/test_annotation_manager.pks | 37 ++- test/ut3_tester/core/test_suite_manager.pkb | 4 +- test/ut3_tester_helper/run_helper.pkb | 2 +- test/ut3_tester_helper/run_helper.pks | 2 +- 17 files changed, 453 insertions(+), 351 deletions(-) diff --git a/source/core/annotations/ut_annotation_cache_info.sql b/source/core/annotations/ut_annotation_cache_info.sql index e8dc2bfdb..e0781cab7 100644 --- a/source/core/annotations/ut_annotation_cache_info.sql +++ b/source/core/annotations/ut_annotation_cache_info.sql @@ -17,7 +17,10 @@ create table ut_annotation_cache_info ( object_name varchar2(250) not null, object_type varchar2(250) not null, parse_time timestamp not null, - constraint ut_annotation_cache_info_pk primary key(cache_id), - constraint ut_annotation_cache_info_uk unique (object_owner, object_type, object_name) + is_annotated varchar2(1) not null, + constraint ut_annotation_cache_info_ck1 check(is_annotated in ('Y','N')), + constraint ut_annotation_cache_info_pk primary key(cache_id) using index, + constraint ut_annotation_cache_info_uk unique (object_owner, object_type, object_name) using index, + constraint ut_annotation_cache_info_fk foreign key(object_owner, object_type) references ut_annotation_cache_schema(object_owner, object_type) on delete cascade ) organization index; diff --git a/source/core/annotations/ut_annotation_cache_manager.pkb b/source/core/annotations/ut_annotation_cache_manager.pkb index eb60ac3dd..6060d6a21 100644 --- a/source/core/annotations/ut_annotation_cache_manager.pkb +++ b/source/core/annotations/ut_annotation_cache_manager.pkb @@ -17,15 +17,26 @@ create or replace package body ut_annotation_cache_manager as */ procedure update_cache(a_object ut_annotated_object) is - l_cache_id integer; - l_new_objects_count integer := 0; + l_cache_id integer; + l_timestamp timestamp := systimestamp; pragma autonomous_transaction; begin + update ut_annotation_cache_schema s + set s.max_parse_time = l_timestamp + where s.object_type = a_object.object_type and s.object_owner = a_object.object_owner; + + if sql%rowcount = 0 then + insert into ut_annotation_cache_schema s + (object_owner, object_type, max_parse_time) + values (a_object.object_owner, a_object.object_type, l_timestamp); + end if; + -- if not in trigger, or object has annotations if ora_sysevent is null or a_object.annotations is not null and a_object.annotations.count > 0 then update ut_annotation_cache_info i - set i.parse_time = systimestamp + set i.parse_time = l_timestamp, + i.is_annotated = case when a_object.annotations is not empty then 'Y' else 'N' end where (i.object_owner, i.object_name, i.object_type) in ((a_object.object_owner, a_object.object_name, a_object.object_type)) returning cache_id into l_cache_id; @@ -33,24 +44,15 @@ create or replace package body ut_annotation_cache_manager as if sql%rowcount = 0 then insert into ut_annotation_cache_info - (cache_id, object_owner, object_name, object_type, parse_time) - values (ut_annotation_cache_seq.nextval, a_object.object_owner, a_object.object_name, a_object.object_type, systimestamp) + (cache_id, object_owner, object_name, object_type, parse_time, is_annotated) + values (ut_annotation_cache_seq.nextval, a_object.object_owner, a_object.object_name, a_object.object_type, l_timestamp, + case when a_object.annotations is not empty then 'Y' else 'N' end + ) returning cache_id into l_cache_id; - l_new_objects_count := 1; end if; end if; - update ut_annotation_cache_schema s - set s.object_count = s.object_count + l_new_objects_count, s.max_parse_time = systimestamp - where s.object_type = a_object.object_type and s.object_owner = a_object.object_owner; - - if sql%rowcount = 0 then - insert into ut_annotation_cache_schema s - (object_owner, object_type, object_count, max_parse_time) - values (a_object.object_owner, a_object.object_type, l_new_objects_count, systimestamp); - end if; - delete from ut_annotation_cache c where cache_id = l_cache_id; if a_object.annotations is not null and a_object.annotations.count > 0 then @@ -63,7 +65,8 @@ create or replace package body ut_annotation_cache_manager as end; - procedure cleanup_cache(a_objects ut_annotation_objs_cache_info) is + procedure reset_objects_cache(a_objects ut_annotation_objs_cache_info) is + l_timestamp timestamp := systimestamp; pragma autonomous_transaction; begin @@ -77,21 +80,39 @@ create or replace package body ut_annotation_cache_manager as and o.object_owner = i.object_owner ); + update ut_annotation_cache_schema s + set s.max_parse_time = l_timestamp + where (s.object_owner, s.object_type) + in ( + select o.object_owner, o.object_type + from table(a_objects) o + ); + + if sql%rowcount = 0 then + insert into ut_annotation_cache_schema s + (object_owner, object_type, max_parse_time) + select distinct o.object_owner, o.object_type, l_timestamp + from table(a_objects) o; + end if; + merge into ut_annotation_cache_info i using (select o.object_name, o.object_type, o.object_owner from table(a_objects) o ) o on (o.object_name = i.object_name and o.object_type = i.object_type and o.object_owner = i.object_owner) - when matched then update set parse_time = systimestamp + when matched then + update + set parse_time = l_timestamp, + is_annotated = 'N' when not matched then insert - (cache_id, object_owner, object_name, object_type, parse_time) - values (ut_annotation_cache_seq.nextval, o.object_owner, o.object_name, o.object_type, systimestamp); + (cache_id, object_owner, object_name, object_type, parse_time, is_annotated) + values (ut_annotation_cache_seq.nextval, o.object_owner, o.object_name, o.object_type, l_timestamp, 'N'); commit; end; - function get_annotations_objects_info(a_object_owner varchar2, a_object_type varchar2) return ut_annotation_objs_cache_info is + function get_cached_objects_list(a_object_owner varchar2, a_object_type varchar2, a_parsed_after timestamp := null) return ut_annotation_objs_cache_info is l_result ut_annotation_objs_cache_info; begin select ut_annotation_obj_cache_info( @@ -104,7 +125,8 @@ create or replace package body ut_annotation_cache_manager as bulk collect into l_result from ut_annotation_cache_info i where i.object_owner = a_object_owner - and i.object_type = a_object_type; + and i.object_type = a_object_type + and (i.parse_time > a_parsed_after or a_parsed_after is null); return l_result; end; @@ -123,6 +145,16 @@ create or replace package body ut_annotation_cache_manager as return l_result; end; + procedure set_fully_refreshed(a_object_owner varchar2, a_object_type varchar2) is + pragma autonomous_transaction; + begin + update ut_annotation_cache_schema s + set s.full_refresh_time = s.max_parse_time + where s.object_owner = a_object_owner + and s.object_type = a_object_type; + commit; + end; + procedure remove_from_cache(a_objects ut_annotation_objs_cache_info) is pragma autonomous_transaction; begin @@ -138,10 +170,10 @@ create or replace package body ut_annotation_cache_manager as commit; end; - function get_annotations_for_objects(a_cached_objects ut_annotation_objs_cache_info, a_parse_time timestamp) return sys_refcursor is - l_results sys_refcursor; + function get_annotations_parsed_since(a_object_owner varchar2, a_object_type varchar2, a_parsed_after timestamp) return sys_refcursor is + l_results sys_refcursor; begin - open l_results for q'[ + open l_results for select ut_annotated_object( i.object_owner, i.object_name, i.object_type, i.parse_time, cast( @@ -151,14 +183,12 @@ create or replace package body ut_annotation_cache_manager as ) order by c.annotation_position ) as ut_annotations ) - ) - from table(:a_cached_objects) o - join ut_annotation_cache_info i - on o.object_owner = i.object_owner and o.object_name = i.object_name and o.object_type = i.object_type + ) as annotated_object + from ut_annotation_cache_info i join ut_annotation_cache c on i.cache_id = c.cache_id - where ]'|| case when a_parse_time is null then ':a_parse_date is null' else 'i.parse_time > :a_parse_time' end ||q'[ - group by i.object_owner, i.object_name, i.object_type, i.parse_time]' - using a_cached_objects, a_parse_time; + where i.object_owner = a_object_owner and i.object_type = a_object_type + and (i.parse_time > a_parsed_after or a_parsed_after is null) + group by i.object_owner, i.object_type, i.object_name, i.parse_time; return l_results; end; @@ -168,35 +198,24 @@ create or replace package body ut_annotation_cache_manager as pragma autonomous_transaction; begin if a_object_owner is null and a_object_type is null then - l_cache_filter := ':a_object_owner is null and :a_object_type is null'; - l_filter := l_cache_filter; + l_filter := ':a_object_owner is null and :a_object_type is null'; + l_cache_filter := l_filter; else - l_filter := - case when a_object_owner is null then ':a_object_owner is null' else 'object_owner = :a_object_owner' end || ' - and '||case when a_object_type is null then ':a_object_type is null' else 'object_type = :a_object_type' end; - l_cache_filter := ' c.cache_id - in (select i.cache_id - from ut_annotation_cache_info i - where '|| l_filter || ' - )'; + l_filter := case when a_object_owner is null then ':a_object_owner is null' else 'object_owner = :a_object_owner' end; + l_filter := l_filter || ' and ' || case when a_object_type is null then ':a_object_type is null' else 'object_type = :a_object_type' end; + l_cache_filter := ' c.cache_id in (select i.cache_id from ut_annotation_cache_info i where ' || l_filter || ' )'; end if; - execute immediate ' - delete from ut_annotation_cache c - where '||l_cache_filter + execute immediate 'delete from ut_annotation_cache c where ' || l_cache_filter using a_object_owner, a_object_type; - execute immediate ' - delete from ut_annotation_cache_info i - where ' || l_filter + execute immediate ' delete from ut_annotation_cache_info i where ' || l_filter using a_object_owner, a_object_type; - execute immediate ' - delete from ut_annotation_cache_schema s - where ' || l_filter + execute immediate ' delete from ut_annotation_cache_schema s where ' || l_filter using a_object_owner, a_object_type; commit; end; -end ut_annotation_cache_manager; +end; / diff --git a/source/core/annotations/ut_annotation_cache_manager.pks b/source/core/annotations/ut_annotation_cache_manager.pks index 2a1d60f1e..e4ba6dd7a 100644 --- a/source/core/annotations/ut_annotation_cache_manager.pks +++ b/source/core/annotations/ut_annotation_cache_manager.pks @@ -16,6 +16,7 @@ create or replace package ut_annotation_cache_manager authid definer as limitations under the License. */ subtype t_cache_schema_info is ut_annotation_cache_schema%rowtype; + /** * Populates cache with information about object and it's annotations * Cache information for individual object is modified by this code @@ -30,21 +31,27 @@ create or replace package ut_annotation_cache_manager authid definer as * Returns a ref_cursor containing `ut_annotated_object` as result * Range of data returned is limited by the input collection o cache object info * - * @param a_cached_objects a `ut_annotation_objs_cache_info` list with information about objects to get from cache + * @param a_cached_objects - list of `ut_annotation_objs_cache_info` containing objects to get from cache + * @param a_min_parse_time - limit results to annotations parsed after specified time only, + * if null - all cached annotations for given objects are returned */ - function get_annotations_for_objects(a_cached_objects ut_annotation_objs_cache_info, a_parse_time timestamp) return sys_refcursor; - + function get_annotations_parsed_since(a_object_owner varchar2, a_object_type varchar2, a_parsed_after timestamp) return sys_refcursor; - function get_annotations_objects_info(a_object_owner varchar2, a_object_type varchar2) return ut_annotation_objs_cache_info; + procedure set_fully_refreshed(a_object_owner varchar2, a_object_type varchar2); function get_cache_schema_info(a_object_owner varchar2, a_object_type varchar2) return t_cache_schema_info; /** - * Removes cached information about annotations for objects on the list and updates parse_time in cache info table. + * Returns information about all objects stored in annotation cache + */ + function get_cached_objects_list(a_object_owner varchar2, a_object_type varchar2, a_parsed_after timestamp := null) return ut_annotation_objs_cache_info; + + /** + * Resets cached information about annotations for objects on the list and updates parse_time in cache info table. * * @param a_objects a `ut_annotation_objs_cache_info` list with information about objects to remove annotations for */ - procedure cleanup_cache(a_objects ut_annotation_objs_cache_info); + procedure reset_objects_cache(a_objects ut_annotation_objs_cache_info); /** * Removes information about objects on the list diff --git a/source/core/annotations/ut_annotation_cache_schema.sql b/source/core/annotations/ut_annotation_cache_schema.sql index abab7385e..b8f908e84 100644 --- a/source/core/annotations/ut_annotation_cache_schema.sql +++ b/source/core/annotations/ut_annotation_cache_schema.sql @@ -12,10 +12,10 @@ create table ut_annotation_cache_schema ( See the License for the specific language governing permissions and limitations under the License. */ - object_owner varchar2(250) not null, - object_type varchar2(250) not null, - object_count integer not null, - max_parse_time date not null, + object_owner varchar2(250) not null, + object_type varchar2(250) not null, + max_parse_time date not null, + full_refresh_time timestamp, constraint ut_annotation_cache_schema_pk primary key(object_owner, object_type) ) organization index; diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index fd2997632..a37391d37 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -19,86 +19,85 @@ create or replace package body ut_annotation_manager as ------------------------------ --private definitions - function get_missing_objects(a_object_owner varchar2, a_object_type varchar2) return ut_annotation_objs_cache_info is - l_rows sys_refcursor; - l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_objects_view varchar2(200) := ut_metadata.get_objects_view_name(); - l_cursor_text varchar2(32767); - l_data ut_annotation_objs_cache_info; - l_result ut_annotation_objs_cache_info; - l_card natural; + function user_can_see_whole_schema( a_schema_name varchar2 ) return boolean is begin - l_data := ut_annotation_cache_manager.get_annotations_objects_info(a_object_owner, a_object_type); - l_card := ut_utils.scale_cardinality(cardinality(l_data)); - - l_cursor_text := - 'select /*+ cardinality(i '||l_card||') */ - value(i) - from table( cast( :l_data as '||l_ut_owner||'.ut_annotation_objs_cache_info ) ) i - where - not exists ( - select 1 from '||l_objects_view||q'[ o - where o.owner = i.object_owner - and o.object_name = i.object_name - and o.object_type = i.object_type - and o.owner = ']'||ut_utils.qualified_sql_name(a_object_owner)||q'[' - and o.object_type = ']'||ut_utils.qualified_sql_name(a_object_type)||q'[' - )]'; - open l_rows for l_cursor_text using l_data; - fetch l_rows bulk collect into l_result limit ut_utils.gc_max_objects_fetch_limit; - close l_rows; - return l_result; + return sys_context('userenv','current_schema') = a_schema_name + or ut_metadata.user_has_execute_any_proc() + or ut_metadata.is_object_visible('dba_objects'); end; - function get_annotation_objs_info( - a_object_owner varchar2, - a_object_type varchar2, - a_parse_date timestamp := null, - a_full_scan boolean := true - ) return ut_annotation_objs_cache_info is - l_rows sys_refcursor; - l_ut_owner varchar2(250) := ut_utils.ut_owner; - l_objects_view varchar2(200) := ut_metadata.get_objects_view_name(); - l_cursor_text varchar2(32767); - l_data ut_annotation_objs_cache_info; - l_result ut_annotation_objs_cache_info; + function get_non_existing_objects( a_object_owner varchar2, a_object_type varchar2 ) return ut_annotation_objs_cache_info is + l_objects_view varchar2(200) := ut_metadata.get_objects_view_name(); + l_object_to_delete ut_annotation_objs_cache_info := ut_annotation_objs_cache_info(); + l_cached_objects ut_annotation_objs_cache_info; begin - ut_event_manager.trigger_event( - 'get_annotation_objs_info - start ( a_full_scan = ' || ut_utils.to_string(a_full_scan) || ' )' - ); + l_cached_objects := ut_annotation_cache_manager.get_cached_objects_list( a_object_owner, a_object_type ); + + if l_cached_objects is not empty then + execute immediate 'select /*+ cardinality(i '||ut_utils.scale_cardinality(cardinality(l_cached_objects))||') */ + value(i) + from table( :l_data ) i + where + not exists ( + select 1 from '||l_objects_view||q'[ o + where o.owner = i.object_owner + and o.object_name = i.object_name + and o.object_type = i.object_type + and o.owner = ']'||ut_utils.qualified_sql_name(a_object_owner)||q'[' + and o.object_type = ']'||ut_utils.qualified_sql_name(a_object_type)||q'[' + )]' + bulk collect into l_object_to_delete + using l_cached_objects; + end if; + return l_object_to_delete; + end; - l_data := ut_annotation_cache_manager.get_annotations_objects_info(a_object_owner, a_object_type); + function get_objects_to_refresh( + a_object_owner varchar2, + a_object_type varchar2, + a_modified_after timestamp + ) return ut_annotation_objs_cache_info is + l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_refresh_needed boolean; + l_objects_view varchar2(200) := ut_metadata.get_objects_view_name(); + l_cached_objects ut_annotation_objs_cache_info; + l_result ut_annotation_objs_cache_info; + begin + ut_event_manager.trigger_event( 'get_objects_to_refresh - start' ); - if not a_full_scan then - l_result := l_data; - else - l_cursor_text := - 'select /*+ cardinality(i '||ut_utils.scale_cardinality(cardinality(l_data))||') */ - '||l_ut_owner||q'[.ut_annotation_obj_cache_info( - object_owner => o.owner, - object_name => o.object_name, - object_type => o.object_type, - needs_refresh => case when o.last_ddl_time < cast(i.parse_time as date) then 'N' else 'Y' end, - parse_time => i.parse_time - ) - from ]'||l_objects_view||' o - left join table( cast(:l_data as '||l_ut_owner||q'[.ut_annotation_objs_cache_info ) ) i - on o.owner = i.object_owner - and o.object_name = i.object_name - and o.object_type = i.object_type - where o.owner = ']'||ut_utils.qualified_sql_name(a_object_owner)||q'[' - and o.object_type = ']'||ut_utils.qualified_sql_name(a_object_type)||q'[' - and ]' + l_refresh_needed := ( ut_trigger_check.is_alive() = false ) or a_modified_after is null; + l_cached_objects := ut_annotation_cache_manager.get_cached_objects_list( a_object_owner, a_object_type, a_modified_after ); + if l_refresh_needed then + --limit the list to objects that exist and are visible to the invoking user + --enrich the list by info about cache validity + execute immediate + 'select /*+ cardinality(i '||ut_utils.scale_cardinality(cardinality(l_cached_objects))||') */ + '||l_ut_owner||q'[.ut_annotation_obj_cache_info( + object_owner => o.owner, + object_name => o.object_name, + object_type => o.object_type, + needs_refresh => 'Y', + parse_time => c.parse_time + ) + from ]'||l_objects_view||' o + left join table( cast(:l_cached_objects as '||l_ut_owner||q'[.ut_annotation_objs_cache_info ) ) c + on o.owner = c.object_owner + and o.object_name = c.object_name + and o.object_type = c.object_type + where o.owner = ']'||ut_utils.qualified_sql_name(a_object_owner)||q'[' + and o.object_type = ']'||ut_utils.qualified_sql_name(a_object_type)||q'[' + and case when o.last_ddl_time < cast(c.parse_time as date) then 'N' else 'Y' end = 'Y' + and ]' || case - when a_parse_date is null - then ':a_parse_date is null' - else 'o.last_ddl_time >= cast(:a_parse_date as date)' - end; - open l_rows for l_cursor_text using l_data, a_parse_date; - fetch l_rows bulk collect into l_result limit ut_utils.gc_max_objects_fetch_limit; - close l_rows; + when a_modified_after is null + then ':a_modified_after is null' + else 'o.last_ddl_time >= cast(:a_modified_after as date)' + end + bulk collect into l_result using l_cached_objects, a_modified_after; + else + l_result := l_cached_objects; end if; - ut_event_manager.trigger_event('get_annotation_objs_info - end (count='||l_result.count||')'); + ut_event_manager.trigger_event('get_objects_to_refresh - end (count='||l_result.count||')'); return l_result; end; @@ -109,24 +108,24 @@ create or replace package body ut_annotation_manager as begin l_card := ut_utils.scale_cardinality(cardinality(a_objects_to_refresh)); open l_result for - q'[select s.name, s.text + q'[select x.name, x.text from (select /*+ cardinality( r ]'||l_card||q'[ )*/ s.name, s.text, s.line, max(case when s.text like '%--%\%%' escape '\' - and regexp_like(s.text,'--\s*%') + and regexp_like(s.text,'^\s*--\s*%') then 'Y' else 'N' end ) over(partition by s.name) is_annotated from table(:a_objects_to_refresh) r join ]'||l_sources_view||q'[ s - on s.name = r.object_name + on s.name = r.object_name and s.owner = r.object_owner - and s.type = r.object_type - where s.owner = ']'||ut_utils.qualified_sql_name(a_object_owner)||q'[' - and s.type = ']'||ut_utils.qualified_sql_name(a_object_type)||q'[' - ) s - where s.is_annotated = 'Y' - order by s.name, s.line]' + and s.type = r.object_type + where s.owner = ']'||ut_utils.qualified_sql_name(a_object_owner)||q'[' + and s.type = ']'||ut_utils.qualified_sql_name(a_object_type)||q'[' + ) x + where x.is_annotated = 'Y' + order by x.name, x.line]' using a_objects_to_refresh; return l_result; @@ -174,47 +173,57 @@ create or replace package body ut_annotation_manager as end; - procedure refresh_annotation_cache( - a_object_owner varchar2, - a_object_type varchar2, - a_info_rows ut_annotation_objs_cache_info + procedure validate_annotation_cache( + a_object_owner varchar2, + a_object_type varchar2, + a_modified_after timestamp := null ) is - l_objects_to_parse ut_annotation_objs_cache_info; + l_objects_to_refresh ut_annotation_objs_cache_info; + l_modified_after timestamp := a_modified_after; begin - select value(x) - bulk collect into l_objects_to_parse - from table(a_info_rows) x where x.needs_refresh = 'Y'; + if ut_annotation_cache_manager.get_cache_schema_info(a_object_owner, a_object_type).full_refresh_time is null then + l_modified_after := null; + end if; - ut_event_manager.trigger_event('rebuild_annotation_cache - start (l_objects_to_parse.count = '||l_objects_to_parse.count||')'); - ut_annotation_cache_manager.cleanup_cache(l_objects_to_parse); + l_objects_to_refresh := get_objects_to_refresh(a_object_owner, a_object_type, l_modified_after); - if sys_context('userenv','current_schema') = a_object_owner - or ut_metadata.user_has_execute_any_proc() - or ut_metadata.is_object_visible('dba_objects') - then - ut_annotation_cache_manager.remove_from_cache( - get_missing_objects(a_object_owner, a_object_type) - ); + ut_event_manager.trigger_event('validate_annotation_cache - start (l_objects_to_refresh.count = '||l_objects_to_refresh.count||')'); + + + if user_can_see_whole_schema( a_object_owner ) then + --Remove non existing objects from cache only when user can see whole schema + ut_annotation_cache_manager.remove_from_cache( get_non_existing_objects( a_object_owner, a_object_type ) ); end if; --if some source needs parsing and putting into cache - if l_objects_to_parse.count > 0 then + if l_objects_to_refresh.count > 0 then + --Delete annotations for objects that are to be refreshed + ut_annotation_cache_manager.reset_objects_cache(l_objects_to_refresh); + --Rebuild cache from objects source build_annot_cache_for_sources( a_object_owner, a_object_type, - get_sources_to_annotate(a_object_owner, a_object_type, l_objects_to_parse) + get_sources_to_annotate(a_object_owner, a_object_type, l_objects_to_refresh) ); end if; - ut_event_manager.trigger_event('rebuild_annotation_cache - end'); + + if l_modified_after is null then + if user_can_see_whole_schema( a_object_owner ) then + ut_annotation_cache_manager.set_fully_refreshed( a_object_owner, a_object_type ); + else + -- if user cannot see full schema - we dont mark it as fully refreshed + -- it will get refreshed each time until someone with proper privs will refresh it + null; + end if; + end if; + ut_event_manager.trigger_event('validate_annotation_cache - end'); end; ------------------------------------------------------------ --public definitions ------------------------------------------------------------ procedure rebuild_annotation_cache(a_object_owner varchar2, a_object_type varchar2) is - l_annotation_objs_info ut_annotation_objs_cache_info; begin - l_annotation_objs_info := get_annotation_objs_info(a_object_owner, a_object_type, null, true); - refresh_annotation_cache( a_object_owner, a_object_type, l_annotation_objs_info ); + validate_annotation_cache( a_object_owner, a_object_type ); end; procedure trigger_obj_annotation_rebuild is @@ -295,17 +304,14 @@ create or replace package body ut_annotation_manager as end if; end; - function get_annotated_objects(a_object_owner varchar2, a_object_type varchar2, a_parse_date timestamp := null) return sys_refcursor is - l_annotation_objs_info ut_annotation_objs_cache_info; + function get_annotated_objects(a_object_owner varchar2, a_object_type varchar2, a_modified_after timestamp) return sys_refcursor is l_cursor sys_refcursor; - l_full_scan_needed boolean := not ut_trigger_check.is_alive(); begin - ut_event_manager.trigger_event('get_annotated_objects - start'); - l_annotation_objs_info := get_annotation_objs_info(a_object_owner, a_object_type, a_parse_date, l_full_scan_needed); - refresh_annotation_cache(a_object_owner, a_object_type, l_annotation_objs_info); + ut_event_manager.trigger_event('get_annotated_objects - start: a_modified_after='||ut_utils.to_string(a_modified_after)); + validate_annotation_cache(a_object_owner, a_object_type, a_modified_after); --pipe annotations from cache - l_cursor := ut_annotation_cache_manager.get_annotations_for_objects(l_annotation_objs_info, a_parse_date); + l_cursor := ut_annotation_cache_manager.get_annotations_parsed_since(a_object_owner, a_object_type, a_modified_after); ut_event_manager.trigger_event('get_annotated_objects - end'); return l_cursor; end; @@ -315,5 +321,5 @@ create or replace package body ut_annotation_manager as ut_annotation_cache_manager.purge_cache(a_object_owner, a_object_type); end; -end ut_annotation_manager; +end; / diff --git a/source/core/annotations/ut_annotation_manager.pks b/source/core/annotations/ut_annotation_manager.pks index 1d6bd3d71..70257afac 100644 --- a/source/core/annotations/ut_annotation_manager.pks +++ b/source/core/annotations/ut_annotation_manager.pks @@ -23,18 +23,17 @@ create or replace package ut_annotation_manager authid current_user as /** * Gets annotations for all objects of a specified type for database schema. * Annotations that are stale or missing are parsed and placed in persistent cache. - * After placing in cache, annotation data is returned as pipelined table data. + * After placing in cache, annotation data is returned as ref_cursor. * - * @param a_object_owner owner of objects to get annotations for - * @param a_object_type type of objects to get annotations for - * @param a_parse_date date when object was last parsed - * @return array containing annotated objects along with annotations for each object (nested) + * @param a_object_owner owner of objects to get annotations for + * @param a_object_type type of objects to get annotations for + * @param a_modified_after return only objects modified after thr timestamp + * @return cursor containing annotated objects along with annotations for each object (nested) */ - function get_annotated_objects(a_object_owner varchar2, a_object_type varchar2, a_parse_date timestamp := null) return sys_refcursor; + function get_annotated_objects(a_object_owner varchar2, a_object_type varchar2, a_modified_after timestamp) return sys_refcursor; /** * Rebuilds annotation cache for a specified schema and object type. - * The procedure is called internally by `get_annotated_objects` function. * It can be used to speedup initial execution of utPLSQL on a given schema * if it is executed before any call is made to `ut.run` or `ut_runner.run` procedure. * @@ -57,5 +56,5 @@ create or replace package ut_annotation_manager authid current_user as procedure purge_cache(a_object_owner varchar2, a_object_type varchar2); -end ut_annotation_manager; +end; / diff --git a/source/core/annotations/ut_annotation_parser.pkb b/source/core/annotations/ut_annotation_parser.pkb index bbe58a667..6248f36b9 100644 --- a/source/core/annotations/ut_annotation_parser.pkb +++ b/source/core/annotations/ut_annotation_parser.pkb @@ -212,14 +212,6 @@ create or replace package body ut_annotation_parser as select value(x) bulk collect into l_result from table(l_annotations) x order by x.position; - -- printing out parsed structure for debugging - $if $$ut_trace $then - print_parse_results(l_result); - dbms_output.put_line('Annotations count: ' || l_result.count); - for i in 1 .. l_result.count loop - dbms_output.put_line(xmltype(l_result(i)).getclobval()); - end loop; - $end return l_result; end parse_object_annotations; @@ -229,7 +221,8 @@ create or replace package body ut_annotation_parser as l_annotations ut_annotations := ut_annotations(); ex_package_is_wrapped exception; pragma exception_init(ex_package_is_wrapped, -24241); - + source_text_is_empty exception; + pragma exception_init(source_text_is_empty, -24236); begin if a_source_lines.count > 0 then --convert to post-processed source clob @@ -248,12 +241,12 @@ create or replace package body ut_annotation_parser as l_annotations := parse_object_annotations(l_source); dbms_lob.freetemporary(l_source); exception - when ex_package_is_wrapped then + when ex_package_is_wrapped or source_text_is_empty then null; end; end if; return l_annotations; end; -end ut_annotation_parser; +end; / diff --git a/source/core/annotations/ut_annotation_parser.pks b/source/core/annotations/ut_annotation_parser.pks index b0a61e576..0368811db 100644 --- a/source/core/annotations/ut_annotation_parser.pks +++ b/source/core/annotations/ut_annotation_parser.pks @@ -40,5 +40,5 @@ create or replace package ut_annotation_parser authid current_user as */ function parse_object_annotations(a_source clob) return ut_annotations; -end ut_annotation_parser; +end; / diff --git a/source/core/annotations/ut_trigger_check.pkb b/source/core/annotations/ut_trigger_check.pkb index e07acd3b2..76d3aa11c 100644 --- a/source/core/annotations/ut_trigger_check.pkb +++ b/source/core/annotations/ut_trigger_check.pkb @@ -22,9 +22,7 @@ create or replace package body ut_trigger_check is function is_alive return boolean is pragma autonomous_transaction; begin - if not g_is_trigger_live then - execute immediate 'create or replace synonym '||ut_utils.ut_owner||'.'||gc_check_object_name||' for no_object'; - end if; + execute immediate 'create or replace synonym '||ut_utils.ut_owner||'.'||gc_check_object_name||' for no_object'; return g_is_trigger_live; end; diff --git a/source/core/types/ut_suite_cache_row.tps b/source/core/types/ut_suite_cache_row.tps index fb4a8bb9f..d9f542de3 100644 --- a/source/core/types/ut_suite_cache_row.tps +++ b/source/core/types/ut_suite_cache_row.tps @@ -15,26 +15,26 @@ create type ut_suite_cache_row as object ( See the License for the specific language governing permissions and limitations under the License. */ - id number(22,0), - self_type varchar2(250 byte), - path varchar2(1000 byte), - object_owner varchar2(250 byte), - object_name varchar2(250 byte), - name varchar2(250 byte), - line_no number, - parse_time timestamp (6), - description varchar2(4000 byte), - rollback_type number, - disabled_flag number, - warnings ut_varchar2_rows, - before_all_list ut_executables, - after_all_list ut_executables, - before_each_list ut_executables, - before_test_list ut_executables, - after_each_list ut_executables, - after_test_list ut_executables, + id number(22,0), + self_type varchar2(250 byte), + path varchar2(1000 byte), + object_owner varchar2(250 byte), + object_name varchar2(250 byte), + name varchar2(250 byte), + line_no number, + parse_time timestamp (6), + description varchar2(4000 byte), + rollback_type number, + disabled_flag number, + warnings ut_varchar2_rows, + before_all_list ut_executables, + after_all_list ut_executables, + before_each_list ut_executables, + before_test_list ut_executables, + after_each_list ut_executables, + after_test_list ut_executables, expected_error_codes ut_varchar2_rows, - tags ut_varchar2_rows, - item ut_executable_test + tags ut_varchar2_rows, + item ut_executable_test ) / \ No newline at end of file diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index 05984da3f..7c4b1ee93 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -23,7 +23,7 @@ create or replace package body ut_suite_cache_manager is gc_get_cache_suite_sql constant varchar2(32767) := q'[with suite_items as ( - select /*+ cardinality(c 100) */ value(c) as obj + select /*+ cardinality(c 500) */ value(c) as obj from ut_suite_cache c where 1 = 1 and c.object_owner = :l_object_owner @@ -87,7 +87,7 @@ create or replace package body ut_suite_cache_manager is l_result ut_varchar2_rows; l_data ut_annotation_objs_cache_info; begin - l_data := ut_annotation_cache_manager.get_annotations_objects_info(a_object_owner, 'PACKAGE'); + l_data := ut_annotation_cache_manager.get_cached_objects_list(a_object_owner, 'PACKAGE'); select i.object_name bulk collect into l_result @@ -258,7 +258,7 @@ create or replace package body ut_suite_cache_manager is select min(t.parse_time) into l_cache_parse_time from ut_suite_cache_schema t - where object_owner = a_schema_name; + where object_owner = upper(a_schema_name); return l_cache_parse_time; end; @@ -380,13 +380,16 @@ create or replace package body ut_suite_cache_manager is pragma autonomous_transaction; begin l_objects := get_missing_cache_objects(a_schema_name); - delete from ut_suite_cache i - where i.object_owner = a_schema_name - and i.object_name in ( select column_value from table (l_objects) ); - delete from ut_suite_cache_package i - where i.object_owner = a_schema_name - and i.object_name in ( select column_value from table (l_objects) ); + if l_objects is not empty then + delete from ut_suite_cache i + where i.object_owner = a_schema_name + and i.object_name in ( select column_value from table (l_objects) ); + + delete from ut_suite_cache_package i + where i.object_owner = a_schema_name + and i.object_name in ( select column_value from table (l_objects) ); + end if; commit; end; @@ -459,5 +462,5 @@ create or replace package body ut_suite_cache_manager is return l_count > 0; end; -end ut_suite_cache_manager; +end; / diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 13f64d1bd..26de41e0e 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -512,9 +512,11 @@ create or replace package body ut_utils is procedure flush_lines(a_lines ut_varchar2_rows, a_offset integer) is begin - insert into ut_dbms_output_cache (seq_no,text) - select rownum+a_offset, column_value - from table(a_lines); + if a_lines is not empty then + insert into ut_dbms_output_cache (seq_no,text) + select rownum+a_offset, column_value + from table(a_lines); + end if; end; begin loop @@ -534,7 +536,7 @@ create or replace package body ut_utils is procedure read_cache_to_dbms_output is l_lines_data sys_refcursor; l_lines ut_varchar2_rows; - c_lines_limit constant integer := 1000; + c_lines_limit constant integer := 10000; pragma autonomous_transaction; begin open l_lines_data for select text from ut_dbms_output_cache order by seq_no; diff --git a/test/ut3_tester/core/annotations/test_annotation_manager.pkb b/test/ut3_tester/core/annotations/test_annotation_manager.pkb index d564e5d57..15bbee21a 100644 --- a/test/ut3_tester/core/annotations/test_annotation_manager.pkb +++ b/test/ut3_tester/core/annotations/test_annotation_manager.pkb @@ -1,45 +1,45 @@ create or replace package body test_annotation_manager is - procedure disable_ddl_trigger is + procedure exec_autonomous(a_sql varchar2) is pragma autonomous_transaction; begin - execute immediate 'alter trigger ut3.ut_trigger_annotation_parsing disable'; - execute immediate 'begin ut3.ut_trigger_check.is_alive(); end;'; + execute immediate a_sql; + end; + + procedure disable_ddl_trigger is + begin + exec_autonomous('alter trigger ut3.ut_trigger_annotation_parsing disable'); + exec_autonomous('begin ut3.ut_trigger_check.is_alive(); end;'); end; procedure enable_ddl_trigger is - pragma autonomous_transaction; begin - execute immediate 'alter trigger ut3.ut_trigger_annotation_parsing enable'; + exec_autonomous('alter trigger ut3.ut_trigger_annotation_parsing enable'); end; procedure create_dummy_package is - pragma autonomous_transaction; begin - execute immediate q'[create or replace package dummy_package as + exec_autonomous(q'[create or replace package dummy_package as procedure some_dummy_procedure; - end;]'; + end;]'); end; procedure drop_dummy_package is - pragma autonomous_transaction; begin - execute immediate q'[drop package dummy_package]'; + exec_autonomous(q'[drop package dummy_package]'); exception when others then null; end; procedure recompile_dummy_package is - pragma autonomous_transaction; begin - execute immediate q'[alter package dummy_package compile]'; + exec_autonomous(q'[alter package dummy_package compile]'); end; procedure create_dummy_test_package is - pragma autonomous_transaction; begin - execute immediate q'[ + exec_autonomous(q'[ /* * Some multiline comments before package spec create or replace package dummy_test_package dummy comment to prove that we pick the right piece of code @@ -55,34 +55,31 @@ create or replace package body test_annotation_manager is --%test(dummy_test) --%beforetest(some_procedure) procedure some_dummy_test_procedure; - end;]'; - execute immediate q'[grant execute on dummy_test_package to public]'; + end;]'); + exec_autonomous(q'[grant execute on dummy_test_package to public]'); end; procedure modify_dummy_test_package is - pragma autonomous_transaction; begin - execute immediate q'[create or replace package dummy_test_package as + exec_autonomous(q'[create or replace package dummy_test_package as --%suite(dummy_test_suite) --%test(dummy_test) procedure some_dummy_test_procedure; - end;]'; + end;]'); end; procedure drop_dummy_test_package is - pragma autonomous_transaction; begin - execute immediate q'[drop package dummy_test_package]'; + exec_autonomous(q'[drop package dummy_test_package]'); exception when others then null; end; procedure recompile_dummy_test_package is - pragma autonomous_transaction; begin - execute immediate q'[alter package dummy_test_package compile]'; + exec_autonomous(q'[alter package dummy_test_package compile]'); end; procedure create_parse_proc_as_ut3$user# is @@ -128,35 +125,31 @@ create or replace package body test_annotation_manager is ut.expect(l_actual).to_be_empty(); end; - procedure assert_dummy_test_package(a_start_date date) is + procedure assert_dummy_test_package(a_start_time timestamp) is l_actual_cache_id integer; + l_data ut3.ut_annotated_objects; + l_result sys_refcursor; l_actual sys_refcursor; l_expected sys_refcursor; begin - select max(cache_id) - into l_actual_cache_id - from ut3.ut_annotation_cache_info - where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PACKAGE' and object_name = 'DUMMY_TEST_PACKAGE' - and parse_time >= a_start_date; - ut.expect(l_actual_cache_id).to_be_not_null; - - open l_actual for - select annotation_position, annotation_name, annotation_text, subobject_name - from ut3.ut_annotation_cache where cache_id = l_actual_cache_id - order by annotation_position; - open l_expected for - select 2 as annotation_position, 'suite' as annotation_name, - 'dummy_test_suite' as annotation_text, '' as subobject_name - from dual union all - select 3, 'rollback' , 'manual', '' as subobject_name - from dual union all - select 7, 'test' , 'dummy_test', 'some_dummy_test_procedure' as subobject_name - from dual union all - select 8, 'beforetest' , 'some_procedure', 'some_dummy_test_procedure' as subobject_name - from dual; - - ut.expect(l_actual).to_equal(l_expected); + select + ut3.ut_annotated_object( + sys_context('USERENV', 'CURRENT_USER'), + 'DUMMY_TEST_PACKAGE', 'PACKAGE', a_start_time, + ut3.ut_annotations( + ut3.ut_annotation( 2, 'suite', 'dummy_test_suite', null ), + ut3.ut_annotation( 3, 'rollback', 'manual', null ), + ut3.ut_annotation( 7, 'test', 'dummy_test', 'some_dummy_test_procedure' ), + ut3.ut_annotation( 8, 'beforetest', 'some_procedure', 'some_dummy_test_procedure' ) + ) + ) annotated_object + from dual; + + l_result := ut3.ut_annotation_manager.get_annotated_objects(sys_context('USERENV', 'CURRENT_USER'), 'PACKAGE', a_start_time); + fetch l_result bulk collect into l_data; + open l_actual for select value(x) as annotated_object from table(l_data) x where object_name = 'DUMMY_TEST_PACKAGE'; + ut.expect(l_actual).to_equal(l_expected).exclude('ANNOTATED_OBJECT/PARSE_TIME').join_by('ANNOTATED_OBJECT/OBJECT_NAME'); end; @@ -259,74 +252,123 @@ create or replace package body test_annotation_manager is end; - --%test(Updates annotation cache when package recompiled) - procedure trg_update_modified_package is + procedure trg_populate_cache_after_purge is + l_start_date date; begin - null; + --Arrange + create_dummy_test_package(); + l_start_date := sysdate; + ut3.ut_annotation_manager.purge_cache(sys_context('USERENV', 'CURRENT_USER'), 'PACKAGE'); + --Act & Assert + assert_dummy_test_package(l_start_date); end; - procedure add_new_package is - l_actual_cache_id integer; - l_actual sys_refcursor; - l_start_date date; + procedure add_annotated_package is + l_start_time timestamp := systimestamp; begin + --Arrange + create_dummy_test_package(); + --Act & Assert + assert_dummy_test_package( l_start_time ); + end; + + procedure remove_annotated_package is + l_start_time timestamp := systimestamp; + begin + --Arrange + create_dummy_test_package(); + assert_dummy_test_package( l_start_time ); + --Act - l_start_date := sysdate; - ut3.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); + drop_dummy_test_package(); + --Assert - select max(cache_id) - into l_actual_cache_id - from ut3.ut_annotation_cache_info - where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PACKAGE' and object_name = 'DUMMY_PACKAGE' - and parse_time >= l_start_date; + ut.expect( + ut3.ut_annotation_manager.get_annotated_objects( + sys_context( 'USERENV', 'CURRENT_USER' ), 'PACKAGE', l_start_time + ), + 'Annotations are empty after package was dropped' + ).to_be_empty(); + end; - ut.expect(l_actual_cache_id).to_be_not_null; + procedure add_not_annotated_package is + l_start_time timestamp := systimestamp; + begin + --Arrange + create_dummy_package(); + --Act & Assert + ut.expect( + ut3.ut_annotation_manager.get_annotated_objects( + sys_context( 'USERENV', 'CURRENT_USER' ), 'PACKAGE', l_start_time + ), + 'Annotations are empty for not annotated package' + ).to_be_empty(); + end; - open l_actual for - select * - from ut3.ut_annotation_cache - where cache_id = l_actual_cache_id; + procedure remove_not_annotated_package is + l_start_time timestamp := systimestamp; + begin + --Arrange + create_dummy_package(); + ut.expect( + ut3.ut_annotation_manager.get_annotated_objects( + sys_context( 'USERENV', 'CURRENT_USER' ), 'PACKAGE', l_start_time + ), + 'Annotations are empty for non annotated package' + ).to_be_empty(); - ut.expect(l_actual).to_be_empty(); + --Act + drop_dummy_package(); + --Assert + ut.expect( + ut3.ut_annotation_manager.get_annotated_objects( + sys_context( 'USERENV', 'CURRENT_USER' ), 'PACKAGE', l_start_time + ), + 'Annotations are empty after non annoteted package was dropped' + ).to_be_empty(); end; - procedure update_modified_package is - l_actual integer; - l_start_date date; + procedure remove_annotations_from_pkg is + l_start_time timestamp := systimestamp; begin --Arrange - l_start_date := sysdate; - ut3.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); - recompile_dummy_package(); - l_start_date := sysdate; - $if dbms_db_version.version >= 18 $then - dbms_session.sleep(1); - $else - dbms_lock.sleep(1); - $end + create_dummy_test_package(); + assert_dummy_test_package( l_start_time ); --Act - ut3.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); + exec_autonomous(q'[create or replace package dummy_test_package as + procedure some_dummy_test_procedure; + end;]'); + --Assert - assert_dummy_package(l_start_date); + ut.expect( + ut3.ut_annotation_manager.get_annotated_objects( + sys_context( 'USERENV', 'CURRENT_USER' ), 'PACKAGE', l_start_time + ) + ).to_be_empty(); end; - - procedure add_new_test_package is - l_actual sys_refcursor; - l_expected sys_refcursor; - l_start_date date; + procedure add_annotations_to_package is + l_start_time timestamp := systimestamp; begin --Arrange - l_start_date := sysdate; + exec_autonomous(q'[create or replace package dummy_test_package as + procedure some_dummy_test_procedure; + end;]'); + ut.expect( + ut3.ut_annotation_manager.get_annotated_objects( + sys_context( 'USERENV', 'CURRENT_USER' ), 'PACKAGE', l_start_time + ) + ).to_be_empty(); + --Act - ut3.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); + create_dummy_test_package(); + --Assert - assert_dummy_test_package(l_start_date); + assert_dummy_test_package( l_start_time ); end; - procedure update_modified_test_package is l_actual_cache_id integer; l_actual sys_refcursor; @@ -365,29 +407,35 @@ create or replace package body test_annotation_manager is procedure keep_dropped_data_in_cache is - l_actual sys_refcursor; - l_expected sys_refcursor; - l_start_date date; + l_cache_count integer; + l_start_date date; begin - parse_dummy_test_as_ut3$user#(); l_start_date := sysdate; + parse_dummy_test_as_ut3$user#(); drop_dummy_test_package(); --Act parse_dummy_test_as_ut3$user#(); --Assert - assert_dummy_test_package(l_start_date); + select count(1) + into l_cache_count + from ut3.ut_annotation_cache_info + where object_owner = sys_context('USERENV', 'CURRENT_USER') + and object_type = 'PACKAGE' + and object_name = 'DUMMY_TEST_PACKAGE' + and parse_time > l_start_date; + ut.expect( l_cache_count ).to_equal(1); end; procedure no_data_for_dropped_object is - l_result sys_refcursor; - l_data ut3.ut_annotated_objects; - l_actual sys_refcursor; + l_result sys_refcursor; + l_data ut3.ut_annotated_objects; + l_actual sys_refcursor; + l_start_time timestamp := systimestamp; begin --Arrange - ut3.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); drop_dummy_test_package(); --Act - l_result := ut3.ut_annotation_manager.get_annotated_objects(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); + l_result := ut3.ut_annotation_manager.get_annotated_objects( sys_context('USERENV', 'CURRENT_USER'),'PACKAGE', l_start_time ); fetch l_result bulk collect into l_data; open l_actual for select object_name from table(l_data) where object_name = 'DUMMY_TEST_PACKAGE'; --Assert @@ -396,13 +444,9 @@ create or replace package body test_annotation_manager is procedure cleanup_dropped_data_in_cache is l_cache_count integer; - l_actual sys_refcursor; - l_expected sys_refcursor; - l_start_date date; begin --Arrange ut3.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); - l_start_date := sysdate; drop_dummy_test_package(); --Act ut3.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); @@ -418,5 +462,16 @@ create or replace package body test_annotation_manager is end; + procedure populate_cache_after_purge is + l_start_date date; + begin + --Arrange + create_dummy_test_package(); + l_start_date := sysdate; + ut3.ut_annotation_manager.purge_cache(sys_context('USERENV', 'CURRENT_USER'), 'PACKAGE'); + --Act & Assert + assert_dummy_test_package(l_start_date); + end; + end test_annotation_manager; / diff --git a/test/ut3_tester/core/annotations/test_annotation_manager.pks b/test/ut3_tester/core/annotations/test_annotation_manager.pks index fd5bc3410..cb0b85104 100644 --- a/test/ut3_tester/core/annotations/test_annotation_manager.pks +++ b/test/ut3_tester/core/annotations/test_annotation_manager.pks @@ -45,12 +45,13 @@ create or replace package test_annotation_manager is --%beforetest(create_dummy_test_package) procedure trg_no_data_for_dropped_object; - --%test(Updates annotation cache when package recompiled) - procedure trg_update_modified_package; + --%disabled(TODO) + --%test(Objects are populated on scan after cache was purged) + procedure trg_populate_cache_after_purge; --%endcontext - --%context(Without DDL trigger enabled) + --%context(Without DDL trigger) --%beforeall(disable_ddl_trigger) @@ -59,16 +60,29 @@ create or replace package test_annotation_manager is --%beforeeach(create_dummy_package) --%aftereach(drop_dummy_package) - --%test(Adds new package to annotation cache info when it is not unit test package) - procedure add_new_package; + --%test(Returns annotations when annotated package was created) + --%aftertest(drop_dummy_test_package) + procedure add_annotated_package; + + --%test(Doesn't return annotations when annotated package was removed) + --%aftertest(drop_dummy_test_package) + procedure remove_annotated_package; - --%test(Updates annotation cache info for modified package) - procedure update_modified_package; + --%test(Doesn't return annotations when package doesn't contain annotations) + --%aftertest(drop_dummy_package) + procedure add_not_annotated_package; - --%test(Adds annotations to cache for unit test package) - --%beforetest(create_dummy_test_package) + --%test(Doesn't return annotations when package without annotations was dropped) + --%aftertest(drop_dummy_package) + procedure remove_not_annotated_package; + + --%test(Doesn't return annotations when annotations removed from package) + --%aftertest(drop_dummy_test_package) + procedure remove_annotations_from_pkg; + + --%test(Returns annotations when annotations were added to package) --%aftertest(drop_dummy_test_package) - procedure add_new_test_package; + procedure add_annotations_to_package; --%test(Updates annotations in cache for modified test package) procedure update_modified_test_package; @@ -84,6 +98,9 @@ create or replace package test_annotation_manager is --%test(Remove object from cache when object dropped and user can see whole schema) procedure cleanup_dropped_data_in_cache; + --%test(Objects are populated on scan after cache was purged) + procedure populate_cache_after_purge; + --%endcontext end test_annotation_manager; diff --git a/test/ut3_tester/core/test_suite_manager.pkb b/test/ut3_tester/core/test_suite_manager.pkb index e693771b4..fd35adc70 100644 --- a/test/ut3_tester/core/test_suite_manager.pkb +++ b/test/ut3_tester/core/test_suite_manager.pkb @@ -1437,7 +1437,7 @@ end;]'; l_expected := ut3.ut_object_names( ut3.ut_object_name('UT3','SOME_TEST_PACKAGE') ); - l_actual := ut3_tester_helper.run_helper.get_object_name('UT3'); + l_actual := ut3_tester_helper.run_helper.get_schema_ut_packages('UT3'); ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); end; @@ -1458,7 +1458,7 @@ end;]'; l_expected_message varchar2(500); begin l_expected_message := q'[ORA-20217: 'Suitepath exceeds 1000 CHAR on: UT3.DUMMY_LONG_TEST_PACKAGE,UT3.DUMMY_LONG_TEST_PACKAGE1'%]'; - l_actual := ut3_tester_helper.run_helper.get_object_name('UT3'); + l_actual := ut3_tester_helper.run_helper.get_schema_ut_packages('UT3'); ut.fail('Expected exception for suitpaths over 1k for two packages'); exception when others then diff --git a/test/ut3_tester_helper/run_helper.pkb b/test/ut3_tester_helper/run_helper.pkb index 9a9c8587f..70695977b 100644 --- a/test/ut3_tester_helper/run_helper.pkb +++ b/test/ut3_tester_helper/run_helper.pkb @@ -614,7 +614,7 @@ create or replace package body run_helper is execute immediate q'[drop package ut3.some_test_package]'; end; - function get_object_name(a_owner in varchar2) return ut3.ut_object_names is + function get_schema_ut_packages(a_owner in varchar2) return ut3.ut_object_names is begin return ut3.ut_suite_manager.get_schema_ut_packages(ut3.ut_varchar2_rows(a_owner)); end; diff --git a/test/ut3_tester_helper/run_helper.pks b/test/ut3_tester_helper/run_helper.pks index 0f5e5a925..03eb314a7 100644 --- a/test/ut3_tester_helper/run_helper.pks +++ b/test/ut3_tester_helper/run_helper.pks @@ -59,7 +59,7 @@ create or replace package run_helper is procedure drop_dummy_long_test_package; procedure create_ut3_suite; procedure drop_ut3_suite; - function get_object_name(a_owner in varchar2) return ut3.ut_object_names; + function get_schema_ut_packages(a_owner in varchar2) return ut3.ut_object_names; function ut_output_buffer_tmp return t_out_buff_tab pipelined; procedure delete_buffer; From 335e420f7a70eb60aed97909122da2c5ad91ef1a Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 12 Nov 2019 01:09:13 +0000 Subject: [PATCH 0656/1096] Fixed loophole in privilege check. --- source/core/types/ut_executable_test.tpb | 2 +- source/core/ut_metadata.pkb | 2 +- source/core/ut_suite_manager.pkb | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/source/core/types/ut_executable_test.tpb b/source/core/types/ut_executable_test.tpb index 89ab16dab..6f25ea1c8 100644 --- a/source/core/types/ut_executable_test.tpb +++ b/source/core/types/ut_executable_test.tpb @@ -160,7 +160,7 @@ create or replace type body ut_executable_test as l_fail_message := 'Expected one of exceptions ('||l_expected_error_codes||') but nothing was raised.'; else l_actual_error_no := regexp_substr(self.error_stack, '^[a-zA-Z]{3}(-[0-9]+)', subexpression=>1); - if not l_actual_error_no member of a_expected_error_codes then + if not l_actual_error_no member of a_expected_error_codes or l_actual_error_no is null then l_fail_message := 'Actual: '||l_actual_error_no||' was expected to '; if cardinality(a_expected_error_codes) > 1 then l_fail_message := l_fail_message || 'be one of: ('||l_expected_error_codes||')'; diff --git a/source/core/ut_metadata.pkb b/source/core/ut_metadata.pkb index 7859d6b3f..5448f1b5f 100644 --- a/source/core/ut_metadata.pkb +++ b/source/core/ut_metadata.pkb @@ -123,7 +123,7 @@ create or replace package body ut_metadata as function user_has_execute_any_proc return boolean is l_ut_owner varchar2(250) := ut_utils.ut_owner; begin - return is_object_visible(l_ut_owner||'.ut_utils'); + return is_object_visible(l_ut_owner||'.ut_utils') and sys_context('userenv','current_schema') != l_ut_owner; end; function is_object_visible(a_object_name varchar2) return boolean is diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index e71a51dc8..30bcd4db2 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -373,7 +373,10 @@ create or replace package body ut_suite_manager is a_owner_name varchar2 ) return boolean is begin - return sys_context( 'userenv', 'current_schema' ) = a_owner_name or ut_metadata.user_has_execute_any_proc() or ut_trigger_check.is_alive(); + return sys_context( 'userenv', 'current_schema' ) = a_owner_name or ut_metadata.user_has_execute_any_proc() + or ( ut_trigger_check.is_alive() + and ut_annotation_cache_manager.get_cache_schema_info(a_owner_name, 'PACKAGE').full_refresh_time is not null + ); end; procedure build_and_cache_suites( From 054c39fb522fd456aeb39545d395bb840296db7c Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 16 Feb 2020 00:02:29 +0000 Subject: [PATCH 0657/1096] Fixed issues with new cursor-results compare query on 11g --- .../data_values/ut_compound_data_helper.pkb | 50 +++++++++---------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 6a6b30a50..69ba90811 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -119,8 +119,6 @@ create or replace package body ut_compound_data_helper is || case when a_order_enforced then q'[ --column position is not matching (both when excluded extra/missing columns as well as when they are included) or (a_pos_nn != e_pos_nn and exp_col_pos != act_col_pos)]' - else - null end ||q'[ order by exp_col_pos, act_col_pos]' bulk collect into l_results using a_expected, a_actual; @@ -426,34 +424,34 @@ create or replace package body ut_compound_data_helper is end if; l_sql := q'[ with - exp_rows as( - select - exp_data_id, extract( exp_item_data, :column_path ) exp_item_data, item_no, diff_id - from ut_compound_data_diff_tmp - where diff_id = :diff_id - and exp_data_id = :self_guid - ), - act_rows as ( - select - act_data_id, extract( act_item_data, :column_path ) act_item_data, item_no, diff_id - from ut_compound_data_diff_tmp ucd - where diff_id = :diff_id - and ucd.act_data_id = :other_guid - ), exp_cols as ( select - exp_item_data, exp_data_id, item_no rn, rownum col_no, diff_id, + i.exp_item_data, i.exp_data_id, i.item_no rn, rownum col_no, i.diff_id, s.column_value col, s.column_value.getRootElement() col_name, - nvl(s.column_value.getclobval(),empty_clob()) col_val - from exp_rows i, + nvl( s.column_value.getclobval(), empty_clob() ) col_val + from ( + select + ucd.exp_data_id, extract( ucd.exp_item_data, :column_path ) exp_item_data, + ucd.item_no, ucd.diff_id + from ut_compound_data_diff_tmp ucd + where ucd.diff_id = :diff_id + and ucd.exp_data_id = :self_guid + ) i, table( xmlsequence( extract( i.exp_item_data, :extract_path ) ) ) s ), act_cols as ( select - act_item_data, act_data_id, item_no rn, rownum col_no, diff_id, + i.act_item_data, i.act_data_id, i.item_no rn, rownum col_no, i.diff_id, s.column_value col, s.column_value.getRootElement() col_name, - nvl(s.column_value.getclobval(),empty_clob()) col_val - from act_rows i, + nvl( s.column_value.getclobval(), empty_clob() ) col_val + from ( + select + ucd.act_data_id, extract( ucd.act_item_data, :column_path ) act_item_data, + ucd.item_no, ucd.diff_id + from ut_compound_data_diff_tmp ucd + where ucd.diff_id = :diff_id + and ucd.act_data_id = :other_guid + ) i, table( xmlsequence( extract( i.act_item_data, :extract_path ) ) ) s ), data_diff as ( @@ -496,7 +494,8 @@ create or replace package body ut_compound_data_helper is col_name from ( ]' || case when a_unordered then q'[ - select u.rn, u.diff_type, u.diffed_row, + select /*+ no_unnest */ + u.rn, u.diff_type, u.diffed_row, replace( extract( case when i.exp_data_id is null then i.act_item_data else i.exp_item_data end, :join_by ).getclobval(), chr(10) @@ -551,9 +550,8 @@ create or replace package body ut_compound_data_helper is end; execute immediate l_sql bulk collect into l_results - using l_exp_extract_xpath, a_diff_id, a_expected_dataset_guid, - l_act_extract_xpath, a_diff_id, a_actual_dataset_guid, - a_extract_path, a_extract_path, + using l_exp_extract_xpath, a_diff_id, a_expected_dataset_guid, a_extract_path, + l_act_extract_xpath, a_diff_id, a_actual_dataset_guid, a_extract_path, l_join_xpath, l_join_xpath, l_join_xpath, a_diff_id; return l_results; end; From b39c5be19044b75f112ad5c150e209c923c6dacb Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 17 Feb 2020 00:11:13 +0000 Subject: [PATCH 0658/1096] Added additional tests for annotation cache refresh with/without DDL trigger. Fixed issues found while testing the code. --- .travis/install.sh | 35 +- development/cleanup.sh | 5 + docs/userguide/install.md | 7 - .../ut_annotation_cache_manager.pkb | 9 +- source/core/ut_suite_manager.pkb | 11 +- test/install_ut3_tester_helper.sql | 4 + test/install_ut3_tester_tests.sql | 4 +- .../annotations/test_annotation_cache.pkb | 503 ++++++++++++++++++ .../annotations/test_annotation_cache.pks | 273 ++++++++++ .../annotations/test_annotation_manager.pkb | 23 +- .../annotations/test_annotation_manager.pks | 15 +- .../annotation_cache_helper.pkb | 167 ++++++ .../annotation_cache_helper.pks | 21 + 13 files changed, 1027 insertions(+), 50 deletions(-) create mode 100644 test/ut3_tester/core/annotations/test_annotation_cache.pkb create mode 100644 test/ut3_tester/core/annotations/test_annotation_cache.pks create mode 100644 test/ut3_tester_helper/annotation_cache_helper.pkb create mode 100644 test/ut3_tester_helper/annotation_cache_helper.pks diff --git a/.travis/install.sh b/.travis/install.sh index 4806105b1..dfcf63efb 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -74,12 +74,6 @@ PROMPT Creating $UT3_TESTER - Power-user for testing internal framework code create user $UT3_TESTER identified by "$UT3_TESTER_PASSWORD" default tablespace $UT3_TABLESPACE quota unlimited on $UT3_TABLESPACE; grant create session, create procedure, create type, create table to $UT3_TESTER; -PROMPT Additional grants for disabling DDL trigger and testing parser without trigger enabled/present - -grant alter any trigger to $UT3_TESTER; -grant administer database trigger to $UT3_TESTER; -grant execute on dbms_lock to $UT3_TESTER; - PROMPT Granting $UT3_OWNER code to $UT3_TESTER begin @@ -98,7 +92,7 @@ end; PROMPT Granting $UT3_OWNER tables to $UT3_TESTER begin - for i in ( select table_name from all_tables t where owner = 'UT3' and nested = 'NO' and IOT_NAME is NULL) + for i in ( select table_name from all_tables t where owner = 'UT3' and nested = 'NO' and iot_name is null) loop execute immediate 'grant select on UT3.'||i.table_name||' to UT3_TESTER'; end loop; @@ -124,8 +118,33 @@ grant create public database link to $UT3_TESTER_HELPER; grant drop public database link to $UT3_TESTER_HELPER; PROMPT Grants for testing coverage outside of main UT3 schema. -grant create any procedure, drop any procedure, execute any procedure, create any type, drop any type, execute any type, under any type, select any table, update any table, insert any table, delete any table, create any table, drop any table, alter any table, select any dictionary, create any synonym, drop any synonym to $UT3_TESTER_HELPER; +grant create any procedure, drop any procedure, execute any procedure, create any type, drop any type, execute any type, under any type, + select any table, update any table, insert any table, delete any table, create any table, drop any table, alter any table, + select any dictionary, create any synonym, drop any synonym, + grant any object privilege, grant any privilege + to $UT3_TESTER_HELPER; + grant create job to $UT3_TESTER_HELPER; +PROMPT Additional grants for disabling DDL trigger and testing parser without trigger enabled/present + +grant alter any trigger to $UT3_TESTER_HELPER; +grant administer database trigger to $UT3_TESTER_HELPER; +grant execute on dbms_lock to $UT3_TESTER_HELPER; + +create user ut3_cache_test_owner identified by ut3; +grant create session, create procedure to ut3_cache_test_owner; + +create user ut3_no_extra_priv_user identified by ut3; +grant create session, create procedure to ut3_no_extra_priv_user; + +create user ut3_select_catalog_user identified by ut3; +grant create session, create procedure, select_catalog_role to ut3_select_catalog_user; + +create user ut3_select_any_table_user identified by ut3; +grant create session, create procedure, select any table to ut3_select_any_table_user; + +create user ut3_execute_any_proc_user identified by ut3; +grant create session, create procedure, execute any procedure to ut3_execute_any_proc_user; exit SQL diff --git a/development/cleanup.sh b/development/cleanup.sh index 313e382ca..4df1e43f5 100755 --- a/development/cleanup.sh +++ b/development/cleanup.sh @@ -23,6 +23,11 @@ drop user ${UT3_RELEASE_VERSION_SCHEMA} cascade; drop user ${UT3_TESTER} cascade; drop user ${UT3_TESTER_HELPER} cascade; drop user ${UT3_USER} cascade; +drop user ut3_cache_test_owner cascade; +drop user ut3_no_extra_priv_user cascade; +drop user ut3_select_catalog_user cascade; +drop user ut3_select_any_table_user cascade; +drop user ut3_execute_any_proc_user cascade; begin for i in ( diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 0a7a04b35..dd80f98ee 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -138,13 +138,6 @@ cd source sqlplus sys/sys_pass@db as sysdba @install_headless_with_trigger.sql utp3 my_verySecret_password utp3_tablespace ``` -**Note:** ->When installing utPLSQL into database with existing unit test packages, utPLSQL will not be able to already-existing unit test packages. When utPSLQL was installed with DDL trigger, you have to do one of: ->- Recompile existing Unit Test packages to make utPLSQL aware of their existence ->- Invoke `exec ut_runner.rebuild_annotation_cache(a_object_owner=> ... );` for every schema containing unit tests in your database -> -> Steps above are required to assure annotation cache is populated properly from existing objects. Rebuilding annotation cache might be faster than code recompilation. - # Recommended Schema It is highly recommended to install utPLSQL in it's own schema. You are free to choose any name for this schema. Installing uPLSQL into shared schema is really not recommended as you loose isolation of framework. diff --git a/source/core/annotations/ut_annotation_cache_manager.pkb b/source/core/annotations/ut_annotation_cache_manager.pkb index 6060d6a21..377dc4492 100644 --- a/source/core/annotations/ut_annotation_cache_manager.pkb +++ b/source/core/annotations/ut_annotation_cache_manager.pkb @@ -78,6 +78,7 @@ create or replace package body ut_annotation_cache_manager as on o.object_name = i.object_name and o.object_type = i.object_type and o.object_owner = i.object_owner + and o.needs_refresh = 'Y' ); update ut_annotation_cache_schema s @@ -86,18 +87,22 @@ create or replace package body ut_annotation_cache_manager as in ( select o.object_owner, o.object_type from table(a_objects) o + where o.needs_refresh = 'Y' ); if sql%rowcount = 0 then insert into ut_annotation_cache_schema s (object_owner, object_type, max_parse_time) select distinct o.object_owner, o.object_type, l_timestamp - from table(a_objects) o; + from table(a_objects) o + where o.needs_refresh = 'Y'; end if; merge into ut_annotation_cache_info i using (select o.object_name, o.object_type, o.object_owner - from table(a_objects) o ) o + from table(a_objects) o + where o.needs_refresh = 'Y' + ) o on (o.object_name = i.object_name and o.object_type = i.object_type and o.object_owner = i.object_owner) diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 30bcd4db2..ee5063105 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -363,7 +363,8 @@ create or replace package body ut_suite_manager is where a.object_name = c.object_name and a.owner = c.object_owner and a.object_type = 'PACKAGE' - ); + ) + or c.self_type = 'UT_LOGICAL_SUITE'; end if; return l_result; @@ -373,10 +374,7 @@ create or replace package body ut_suite_manager is a_owner_name varchar2 ) return boolean is begin - return sys_context( 'userenv', 'current_schema' ) = a_owner_name or ut_metadata.user_has_execute_any_proc() - or ( ut_trigger_check.is_alive() - and ut_annotation_cache_manager.get_cache_schema_info(a_owner_name, 'PACKAGE').full_refresh_time is not null - ); + return sys_context( 'userenv', 'current_schema' ) = a_owner_name or ut_metadata.user_has_execute_any_proc(); end; procedure build_and_cache_suites( @@ -611,6 +609,7 @@ create or replace package body ut_suite_manager is and a.owner = c.object_owner and a.object_type = 'PACKAGE' ) + or c.item_type = 'UT_LOGICAL_SUITE' order by c.object_owner, c.object_name, c.item_line_no; end if; return l_result; @@ -630,7 +629,7 @@ create or replace package body ut_suite_manager is refresh_cache(l_owner_name); l_item_exists := ut_suite_cache_manager.suite_item_exists( l_owner_name, l_package_name, l_procedure_name ); - if not can_skip_all_objects_scan( l_owner_name ) then + if not can_skip_all_objects_scan( l_owner_name ) and l_package_name is not null then select count(1) into l_count from dual c diff --git a/test/install_ut3_tester_helper.sql b/test/install_ut3_tester_helper.sql index c6244fd39..c0c20634e 100644 --- a/test/install_ut3_tester_helper.sql +++ b/test/install_ut3_tester_helper.sql @@ -26,6 +26,10 @@ alter session set plsql_optimize_level=0; @@ut3_tester_helper/expectations_helper.pkb @@ut3_tester_helper/ut_example_tests.pkb +@@ut3_tester_helper/annotation_cache_helper.pks +@@ut3_tester_helper/annotation_cache_helper.pkb +create or replace synonym ut3_tester.annotation_cache_helper for ut3_tester_helper.annotation_cache_helper; + set linesize 200 set define on set verify off diff --git a/test/install_ut3_tester_tests.sql b/test/install_ut3_tester_tests.sql index 6b3a5356c..9548d5148 100644 --- a/test/install_ut3_tester_tests.sql +++ b/test/install_ut3_tester_tests.sql @@ -13,6 +13,7 @@ alter session set plsql_optimize_level=0; @@ut3_tester/core/annotations/test_annotation_parser.pks @@ut3_tester/core/annotations/test_annot_throws_exception.pks @@ut3_tester/core/annotations/test_annotation_manager.pks +@@ut3_tester/core/annotations/test_annotation_cache.pks @@ut3_tester/core/expectations/test_expectation_processor.pks @@ut3_tester/core/test_ut_utils.pks @@ut3_tester/core/test_ut_test.pks @@ -27,9 +28,10 @@ alter session set plsql_optimize_level=0; @@ut3_tester/core.pkb @@ut3_tester/core/annotations/test_before_after_annotations.pkb @@ut3_tester/core/annotations/test_annotation_parser.pkb -@@ut3_tester/core/expectations/test_expectation_processor.pkb @@ut3_tester/core/annotations/test_annotation_manager.pkb @@ut3_tester/core/annotations/test_annot_throws_exception.pkb +@@ut3_tester/core/annotations/test_annotation_cache.pkb +@@ut3_tester/core/expectations/test_expectation_processor.pkb @@ut3_tester/core/test_ut_utils.pkb @@ut3_tester/core/test_ut_test.pkb @@ut3_tester/core/test_ut_suite.pkb diff --git a/test/ut3_tester/core/annotations/test_annotation_cache.pkb b/test/ut3_tester/core/annotations/test_annotation_cache.pkb new file mode 100644 index 000000000..983004eeb --- /dev/null +++ b/test/ut3_tester/core/annotations/test_annotation_cache.pkb @@ -0,0 +1,503 @@ +create or replace package body test_annotation_cache is + + procedure cache_populated_for_packages(a_packages ut_varchar2_rows) is + l_actual_cache_info sys_refcursor; + l_expected_cache_info sys_refcursor; + begin + open l_actual_cache_info for + select * + from ut3.ut_annotation_cache_info + where object_owner = 'UT3_CACHE_TEST_OWNER'; + open l_expected_cache_info for + select 'UT3_CACHE_TEST_OWNER' as object_owner, upper( column_value ) as object_name, 'Y' as is_annotated + from table (a_packages) x; + ut.expect( l_actual_cache_info ).to_equal( l_expected_cache_info ).exclude( 'CACHE_ID,PARSE_TIME,OBJECT_TYPE' ).JOIN_BY('OBJECT_NAME'); + end; + + procedure can_run_one_package(a_user varchar2) is + l_actual clob; + l_current_time date := sysdate; + pragma autonomous_transaction; + begin + --Act + l_actual := annotation_cache_helper.run_tests_as( a_user ); + + --Assert - only granted_test_suite is invoked + ut.expect( l_actual ).to_be_like( 'granted_test_suite%2 tests, 0 failed%' ); + rollback; + end; + + procedure can_run_new_package(a_user varchar2) is + l_actual clob; + l_current_time date := sysdate; + pragma autonomous_transaction; + begin + --Arrange + l_actual := annotation_cache_helper.run_tests_as( a_user ); + annotation_cache_helper.add_new_suite( ); + --Act + l_actual := annotation_cache_helper.run_tests_as( a_user ); + --Assert -Both granted_test_suite and new_suite are invoked + ut.expect( l_actual ).to_be_like( 'granted_test_suite%new_suite%4 tests, 0 failed%' ); + rollback; + end ; + + procedure cant_run_revoked_package(a_user varchar2) is + l_actual clob; + l_current_time date := sysdate; + pragma autonomous_transaction; + begin + --Arrange + l_actual := annotation_cache_helper.run_tests_as( a_user ); + annotation_cache_helper.add_new_suite( ); + annotation_cache_helper.revoke_granted_suite( ); + + --Act + l_actual := annotation_cache_helper.run_tests_as( a_user ); + --Assert -Only new_suite gets invoked + ut.expect( l_actual ).to_be_like( 'new_suite%2 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%' ); + ut.expect( l_actual ).not_to_be_like( '%granted_test_suite%' ); + rollback; + end; + + procedure cant_run_dropped_package(a_user varchar2) is + l_actual clob; + l_current_time date := sysdate; + pragma autonomous_transaction; + begin + --Arrange + l_actual := annotation_cache_helper.run_tests_as( a_user ); + annotation_cache_helper.add_new_suite( ); + l_actual := annotation_cache_helper.run_tests_as( a_user ); + annotation_cache_helper.revoke_granted_suite( ); + annotation_cache_helper.cleanup_new_suite( ); + + --Act + l_actual := annotation_cache_helper.run_tests_as( a_user ); + --Assert - no test suites are invoked + ut.expect( l_actual ).to_be_like( '%0 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%' ); + ut.expect( l_actual ).not_to_be_like( '%new_suite%' ); + ut.expect( l_actual ).not_to_be_like( '%granted_test_suite%' ); + rollback; + end; + + procedure can_run_all_packages(a_user varchar2) is + l_actual clob; + l_current_time date := sysdate; + pragma autonomous_transaction; + begin + --Act + l_actual := annotation_cache_helper.run_tests_as( a_user ); + + --Assert - only granted_test_suite is invoked + ut.expect( l_actual ).to_be_like( 'granted_test_suite%not_granted_test_suite%4 tests, 0 failed%' ); + rollback; + end; + + procedure can_run_all_new_packages(a_user varchar2) is + l_actual clob; + l_current_time date := sysdate; + pragma autonomous_transaction; + begin + --Arrange + l_actual := annotation_cache_helper.run_tests_as( a_user ); + annotation_cache_helper.add_new_suite( ); + --Act + l_actual := annotation_cache_helper.run_tests_as( a_user ); + + --Assert - only granted_test_suite is invoked + ut.expect( l_actual ).to_be_like( 'granted_test_suite%new_suite%not_granted_test_suite% tests, 0 failed%' ); + rollback; + end; + + procedure can_run_revoked_packages(a_user varchar2) is + l_actual clob; + l_current_time date := sysdate; + pragma autonomous_transaction; + begin + --Arrange + l_actual := annotation_cache_helper.run_tests_as( a_user ); + annotation_cache_helper.add_new_suite( ); + annotation_cache_helper.revoke_granted_suite( ); + --Act + l_actual := annotation_cache_helper.run_tests_as( a_user ); + + --Assert - only granted_test_suite is invoked + ut.expect( l_actual ).to_be_like( 'granted_test_suite%new_suite%not_granted_test_suite% tests, 0 failed%' ); + rollback; + end; + + procedure can_run_all_but_dropped(a_user varchar2) is + l_actual clob; + l_current_time date := sysdate; + pragma autonomous_transaction; + begin + --Arrange + l_actual := annotation_cache_helper.run_tests_as( a_user ); + annotation_cache_helper.add_new_suite( ); + l_actual := annotation_cache_helper.run_tests_as( a_user ); + annotation_cache_helper.revoke_granted_suite( ); + annotation_cache_helper.cleanup_new_suite( ); + + --Act + l_actual := annotation_cache_helper.run_tests_as( a_user ); + --Assert - no test suites are invoked + ut.expect( l_actual ).to_be_like( 'granted_test_suite%not_granted_test_suite%4 tests, 0 failed%' ); + ut.expect( l_actual ).not_to_be_like( '%new_suite%' ); + rollback; + end; + + + procedure user_can_run_one_package is + begin + can_run_one_package( 'ut3_no_extra_priv_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE' ) ); + end; + + procedure user_can_run_new_package is + begin + can_run_new_package( 'ut3_no_extra_priv_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NEW_SUITE' ) ); + end; + + procedure user_cant_run_revoked_package is + begin + cant_run_revoked_package( 'ut3_no_extra_priv_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NEW_SUITE' ) ); + end; + + procedure user_cant_run_dropped_package is + begin + cant_run_dropped_package( 'ut3_no_extra_priv_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NEW_SUITE' ) ); + end; + + procedure sel_cat_user_can_run_one is + begin + can_run_one_package( 'ut3_select_catalog_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE' ) ); + end; + + procedure sel_cat_user_can_run_new is + begin + can_run_new_package( 'ut3_select_catalog_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NEW_SUITE' ) ); + end; + + procedure sel_cat_user_cant_run_revoked is + begin + cant_run_revoked_package( 'ut3_select_catalog_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NEW_SUITE' ) ); + end; + + procedure sel_cat_user_cant_run_dropped is + begin + cant_run_dropped_package( 'ut3_select_catalog_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NEW_SUITE' ) ); + end; + + procedure sel_any_user_can_run_one is + begin + can_run_one_package( 'ut3_select_any_table_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE' ) ); + end; + + procedure sel_any_user_can_run_new is + begin + can_run_new_package( 'ut3_select_any_table_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NEW_SUITE' ) ); + end; + + procedure sel_any_user_cant_run_revoked is + begin + cant_run_revoked_package( 'ut3_select_any_table_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NEW_SUITE' ) ); + end; + + procedure sel_any_user_cant_run_dropped is + begin + cant_run_dropped_package( 'ut3_select_any_table_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NEW_SUITE' ) ); + end; + + procedure exe_any_user_can_run_all is + begin + can_run_all_packages( 'ut3_execute_any_proc_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + procedure exe_any_user_can_run_new is + begin + can_run_all_new_packages( 'ut3_execute_any_proc_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NEW_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + procedure exe_any_user_can_run_revoked is + begin + can_run_revoked_packages('ut3_execute_any_proc_user'); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NEW_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + procedure exe_any_user_cant_run_dropped is + begin + can_run_all_but_dropped('ut3_execute_any_proc_user'); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + procedure owner_user_can_run_all is + begin + can_run_all_packages( 'ut3_cache_test_owner' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + + procedure owner_user_can_run_new is + begin + can_run_all_new_packages( 'ut3_cache_test_owner' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NEW_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + procedure owner_user_cant_run_dropped is + begin + can_run_all_but_dropped('ut3_cache_test_owner'); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + + procedure t_user_can_run_one_package is + begin + can_run_one_package( 'ut3_no_extra_priv_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + procedure t_user_can_run_new_package is + begin + can_run_new_package( 'ut3_no_extra_priv_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NEW_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + procedure t_user_cant_run_revoked_pkg is + begin + cant_run_revoked_package( 'ut3_no_extra_priv_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NEW_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + procedure t_user_cant_run_dropped_pkg is + begin + cant_run_dropped_package( 'ut3_no_extra_priv_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + procedure t_sel_cat_user_can_run_one is + begin + can_run_one_package( 'ut3_select_catalog_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + procedure t_sel_cat_user_can_run_new is + begin + can_run_new_package( 'ut3_select_catalog_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NEW_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + procedure t_sel_cat_user_cant_run_revokd is + begin + cant_run_revoked_package( 'ut3_select_catalog_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NEW_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + procedure t_sel_cat_user_cant_run_dropd is + begin + cant_run_dropped_package( 'ut3_select_catalog_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + + procedure t_sel_any_user_can_run_one is + begin + can_run_one_package( 'ut3_select_any_table_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + procedure t_sel_any_user_can_run_new is + begin + can_run_new_package( 'ut3_select_any_table_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NEW_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + procedure t_sel_any_user_cant_run_revokd is + begin + cant_run_revoked_package( 'ut3_select_any_table_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NEW_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + procedure t_sel_any_user_cant_run_dropd is + begin + cant_run_dropped_package( 'ut3_select_any_table_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + + procedure t_exe_any_user_can_run_all is + begin + can_run_all_packages( 'ut3_execute_any_proc_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + procedure t_exe_any_user_can_run_new is + begin + can_run_all_new_packages( 'ut3_execute_any_proc_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NEW_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + procedure t_exe_any_user_can_run_revokd is + begin + can_run_revoked_packages( 'ut3_execute_any_proc_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NEW_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + procedure t_exe_any_user_cant_run_dropd is + begin + can_run_all_but_dropped( 'ut3_execute_any_proc_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + procedure t_owner_user_can_run_all is + begin + can_run_all_packages( 'ut3_cache_test_owner' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + procedure t_owner_user_can_run_new is + begin + can_run_all_new_packages( 'ut3_cache_test_owner' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NEW_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + procedure t_owner_user_cant_run_dropd is + begin + can_run_all_but_dropped( 'ut3_cache_test_owner' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + + + + procedure p_user_can_run_one_package is + begin + can_run_one_package( 'ut3_no_extra_priv_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE' ) ); + end; + + procedure p_user_can_run_new_package is + begin + can_run_new_package( 'ut3_no_extra_priv_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NEW_SUITE' ) ); + end; + + procedure p_user_cant_run_revoked_pack is + begin + cant_run_revoked_package( 'ut3_no_extra_priv_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NEW_SUITE' ) ); + end; + + procedure p_user_cant_run_dropped_pack is + begin + cant_run_dropped_package( 'ut3_no_extra_priv_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE' ) ); + end; + + + + procedure p_sel_cat_user_can_run_one is + begin + can_run_one_package( 'ut3_select_catalog_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE' ) ); + end; + + procedure p_sel_cat_user_can_run_new is + begin + can_run_new_package( 'ut3_select_catalog_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NEW_SUITE' ) ); + end; + + procedure p_sel_cat_user_cant_run_revokd is + begin + cant_run_revoked_package( 'ut3_select_catalog_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NEW_SUITE' ) ); + end; + + procedure p_sel_cat_user_cant_run_dropd is + begin + cant_run_dropped_package( 'ut3_select_catalog_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE' ) ); + end; + + procedure p_sel_any_user_can_run_one is + begin + can_run_one_package( 'ut3_select_any_table_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE' ) ); + end; + + procedure p_sel_any_user_can_run_new is + begin + can_run_new_package( 'ut3_select_any_table_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NEW_SUITE' ) ); + end; + + procedure p_sel_any_user_cant_run_revokd is + begin + cant_run_revoked_package( 'ut3_select_any_table_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NEW_SUITE' ) ); + end; + + procedure p_sel_any_user_cant_run_dropd is + begin + cant_run_dropped_package( 'ut3_select_any_table_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE' ) ); + end; + + procedure p_exe_any_user_can_run_all is + begin + can_run_all_packages( 'ut3_execute_any_proc_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + procedure p_exe_any_user_can_run_new is + begin + can_run_all_new_packages( 'ut3_execute_any_proc_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NEW_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + procedure p_exe_any_user_can_run_revokd is + begin + can_run_revoked_packages( 'ut3_execute_any_proc_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NEW_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + procedure p_exe_any_user_cant_run_dropd is + begin + can_run_all_but_dropped( 'ut3_execute_any_proc_user' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + procedure p_owner_user_can_run_all is + begin + can_run_all_packages( 'ut3_cache_test_owner' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + procedure p_owner_user_can_run_new is + begin + can_run_all_new_packages( 'ut3_cache_test_owner' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NEW_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + + procedure p_owner_user_cant_run_dropped is + begin + can_run_all_but_dropped( 'ut3_cache_test_owner' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; + +end; +/ diff --git a/test/ut3_tester/core/annotations/test_annotation_cache.pks b/test/ut3_tester/core/annotations/test_annotation_cache.pks new file mode 100644 index 000000000..f44b816e1 --- /dev/null +++ b/test/ut3_tester/core/annotations/test_annotation_cache.pks @@ -0,0 +1,273 @@ +create or replace package test_annotation_cache is + + --%suite(annotation cache) + --%suitepath(utplsql.ut3_tester.core.annotations) + --%beforeall(annotation_cache_helper.create_run_function_for_users) + --%afterall(annotation_cache_helper.drop_run_function_for_users) + + --%context(With DDL trigger enabled) + + --%beforeall(annotation_cache_helper.enable_ddl_trigger) + --%beforeeach(annotation_cache_helper.setup_two_suites) + --%aftereach(annotation_cache_helper.cleanup_new_suite) + --%afterall(annotation_cache_helper.cleanup_two_suites) + + --%context(User without elevated privileges) + + --%test(Can only execute granted packages) + procedure t_user_can_run_one_package; + + --%test(Can see newly created packages as they are added) + procedure t_user_can_run_new_package; + + --%test(Cannot execute revoked packages) + procedure t_user_cant_run_revoked_pkg; + + --%test(Cannot execute dropped unit test packages) + procedure t_user_cant_run_dropped_pkg; + + --%endcontext + + --%context(User with select_catalog_role) + + --%test(Can only execute granted packages) + procedure t_sel_cat_user_can_run_one; + + --%test(Can see newly created packages as they are added) + procedure t_sel_cat_user_can_run_new; + + --%test(Cannot execute revoked packages) + procedure t_sel_cat_user_cant_run_revokd; + + --%test(Cannot execute dropped unit test packages) + procedure t_sel_cat_user_cant_run_dropd; + + --%endcontext + + --%context(User with select any table privilege) + + --%test(Can only execute granted packages) + procedure t_sel_any_user_can_run_one; + + --%test(Can see newly created packages as they are added) + procedure t_sel_any_user_can_run_new; + + --%test(Cannot execute revoked packages) + procedure t_sel_any_user_cant_run_revokd; + + --%test(Cannot execute dropped unit test packages) + procedure t_sel_any_user_cant_run_dropd; + + --%endcontext + + --%context(User with execute any procedure) + + --%test(Can execute and see all unit test packages) + procedure t_exe_any_user_can_run_all; + + --%test(Can see newly created packages as they are added) + procedure t_exe_any_user_can_run_new; + + --%test(Can execute revoked packages) + procedure t_exe_any_user_can_run_revokd; + + --%test(Cannot execute dropped unit test packages) + procedure t_exe_any_user_cant_run_dropd; + + --%endcontext + + --%context(User owning test packages) + + --%test(Can execute and see all unit test packages) + procedure t_owner_user_can_run_all; + + --%test(Can see newly created packages as they are added) + procedure t_owner_user_can_run_new; + + --%test(Cannot execute dropped unit test packages) + procedure t_owner_user_cant_run_dropd; + + --%endcontext + + --%endcontext + + --%context(With DDL trigger disabled) + + --%beforeall(annotation_cache_helper.disable_ddl_trigger) + --%beforeeach(annotation_cache_helper.setup_two_suites) + --%beforeeach(annotation_cache_helper.purge_annotation_cache) + --%aftereach(annotation_cache_helper.cleanup_new_suite) + --%afterall(annotation_cache_helper.enable_ddl_trigger) + --%afterall(annotation_cache_helper.cleanup_two_suites) + + --%context(User without elevated privileges) + + --%test(Can only execute granted packages) + procedure user_can_run_one_package; + + --%test(Can see newly created packages as they are added) + procedure user_can_run_new_package; + + --%test(Cannot execute revoked packages) + procedure user_cant_run_revoked_package; + + --%test(Cannot execute dropped unit test packages) + procedure user_cant_run_dropped_package; + + --%endcontext + + --%context(User with select_catalog_role) + + --%test(Can only execute granted packages) + procedure sel_cat_user_can_run_one; + + --%test(Can see newly created packages as they are added) + procedure sel_cat_user_can_run_new; + + --%test(Cannot execute revoked packages) + procedure sel_cat_user_cant_run_revoked; + + --%test(Cannot execute dropped unit test packages) + procedure sel_cat_user_cant_run_dropped; + + --%endcontext + + --%context(User with select any table privilege) + + --%test(Can only execute granted packages) + procedure sel_any_user_can_run_one; + + --%test(Can see newly created packages as they are added) + procedure sel_any_user_can_run_new; + + --%test(Cannot execute revoked packages) + procedure sel_any_user_cant_run_revoked; + + --%test(Cannot execute dropped unit test packages) + procedure sel_any_user_cant_run_dropped; + + --%endcontext + + --%context(User with execute any procedure) + + --%test(Can execute and see all unit test packages) + procedure exe_any_user_can_run_all; + + --%test(Can see newly created packages as they are added) + procedure exe_any_user_can_run_new; + + --%test(Can execute revoked packages) + procedure exe_any_user_can_run_revoked; + + --%test(Cannot execute dropped unit test packages) + procedure exe_any_user_cant_run_dropped; + + --%endcontext + + --%context(User owning test packages) + + --%test(Can execute and see all unit test packages) + procedure owner_user_can_run_all; + + --%test(Can see newly created packages as they are added) + procedure owner_user_can_run_new; + + --%test(Cannot execute dropped unit test packages) + procedure owner_user_cant_run_dropped; + + --%endcontext + + --%endcontext + + --%context(With DDL trigger enabled and cache purged) + + --%beforeall(annotation_cache_helper.enable_ddl_trigger) + + --%beforeeach(annotation_cache_helper.setup_two_suites) + --%beforeeach(annotation_cache_helper.purge_annotation_cache) + + --%aftereach(annotation_cache_helper.cleanup_new_suite) + --%aftereach(annotation_cache_helper.cleanup_two_suites) + + --%context(User without elevated privileges) + + --%test(Can only execute granted packages) + procedure p_user_can_run_one_package; + + --%test(Can see newly created packages as they are added) + procedure p_user_can_run_new_package; + + --%test(Cannot execute revoked packages) + procedure p_user_cant_run_revoked_pack; + + --%test(Cannot execute dropped unit test packages) + procedure p_user_cant_run_dropped_pack; + + --%endcontext + + --%context(User with select_catalog_role) + + --%test(Can only execute granted packages) + procedure p_sel_cat_user_can_run_one; + + --%test(Can see newly created packages as they are added) + procedure p_sel_cat_user_can_run_new; + + --%test(Cannot execute revoked packages) + procedure p_sel_cat_user_cant_run_revokd; + + --%test(Cannot execute dropped unit test packages) + procedure p_sel_cat_user_cant_run_dropd; + + --%endcontext + + --%context(User with select any table privilege) + + --%test(Can only execute granted packages) + procedure p_sel_any_user_can_run_one; + + --%test(Can see newly created packages as they are added) + procedure p_sel_any_user_can_run_new; + + --%test(Cannot execute revoked packages) + procedure p_sel_any_user_cant_run_revokd; + + --%test(Cannot execute dropped unit test packages) + procedure p_sel_any_user_cant_run_dropd; + + --%endcontext + + --%context(User with execute any procedure) + + --%test(Can execute and see all unit test packages) + procedure p_exe_any_user_can_run_all; + + --%test(Can see newly created packages as they are added) + procedure p_exe_any_user_can_run_new; + + --%test(Can execute revoked packages) + procedure p_exe_any_user_can_run_revokd; + + --%test(Cannot execute dropped unit test packages) + procedure p_exe_any_user_cant_run_dropd; + + --%endcontext + + --%context(User owning test packages) + + --%test(Can execute and see all unit test packages) + procedure p_owner_user_can_run_all; + + --%test(Can see newly created packages as they are added) + procedure p_owner_user_can_run_new; + + --%test(Cannot execute dropped unit test packages) + procedure p_owner_user_cant_run_dropped; + + --%endcontext + + + --%endcontext + +end; +/ diff --git a/test/ut3_tester/core/annotations/test_annotation_manager.pkb b/test/ut3_tester/core/annotations/test_annotation_manager.pkb index 15bbee21a..8a3efc508 100644 --- a/test/ut3_tester/core/annotations/test_annotation_manager.pkb +++ b/test/ut3_tester/core/annotations/test_annotation_manager.pkb @@ -6,17 +6,6 @@ create or replace package body test_annotation_manager is execute immediate a_sql; end; - procedure disable_ddl_trigger is - begin - exec_autonomous('alter trigger ut3.ut_trigger_annotation_parsing disable'); - exec_autonomous('begin ut3.ut_trigger_check.is_alive(); end;'); - end; - - procedure enable_ddl_trigger is - begin - exec_autonomous('alter trigger ut3.ut_trigger_annotation_parsing enable'); - end; - procedure create_dummy_package is begin exec_autonomous(q'[create or replace package dummy_package as @@ -157,10 +146,10 @@ create or replace package body test_annotation_manager is l_actual_cache_id integer; begin --Arrange - disable_ddl_trigger(); + annotation_cache_helper.disable_ddl_trigger(); create_dummy_test_package(); --Act - enable_ddl_trigger(); + annotation_cache_helper.enable_ddl_trigger(); --Assert select max(cache_id) into l_actual_cache_id @@ -175,10 +164,10 @@ create or replace package body test_annotation_manager is l_start_date date; begin --Arrange - disable_ddl_trigger(); + annotation_cache_helper.disable_ddl_trigger(); create_dummy_test_package(); --Act - enable_ddl_trigger(); + annotation_cache_helper.enable_ddl_trigger(); l_start_date := sysdate; recompile_dummy_test_package(); --Assert @@ -190,11 +179,11 @@ create or replace package body test_annotation_manager is l_start_date date; begin --Arrange - disable_ddl_trigger(); + annotation_cache_helper.disable_ddl_trigger(); create_dummy_test_package(); create_dummy_package(); --Act - enable_ddl_trigger(); + annotation_cache_helper.enable_ddl_trigger(); l_start_date := sysdate; ut3.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); --Assert diff --git a/test/ut3_tester/core/annotations/test_annotation_manager.pks b/test/ut3_tester/core/annotations/test_annotation_manager.pks index cb0b85104..5d7464fd2 100644 --- a/test/ut3_tester/core/annotations/test_annotation_manager.pks +++ b/test/ut3_tester/core/annotations/test_annotation_manager.pks @@ -3,13 +3,11 @@ create or replace package test_annotation_manager is --%suite(ut_annotation_manager) --%suitepath(utplsql.ut3_tester.core.annotations) + --%afterall(drop_dummy_test_package) + --%aftereach procedure cleanup_annotation_cache; - procedure disable_ddl_trigger; - - procedure enable_ddl_trigger; - procedure create_dummy_package; procedure drop_dummy_package; @@ -45,17 +43,18 @@ create or replace package test_annotation_manager is --%beforetest(create_dummy_test_package) procedure trg_no_data_for_dropped_object; - --%disabled(TODO) --%test(Objects are populated on scan after cache was purged) + --%beforetest(annotation_cache_helper.disable_ddl_trigger) + --%aftertest(annotation_cache_helper.enable_ddl_trigger) procedure trg_populate_cache_after_purge; --%endcontext --%context(Without DDL trigger) - --%beforeall(disable_ddl_trigger) + --%beforeall(annotation_cache_helper.disable_ddl_trigger) - --%afterall(enable_ddl_trigger) + --%afterall(annotation_cache_helper.enable_ddl_trigger) --%beforeeach(create_dummy_package) --%aftereach(drop_dummy_package) @@ -69,11 +68,9 @@ create or replace package test_annotation_manager is procedure remove_annotated_package; --%test(Doesn't return annotations when package doesn't contain annotations) - --%aftertest(drop_dummy_package) procedure add_not_annotated_package; --%test(Doesn't return annotations when package without annotations was dropped) - --%aftertest(drop_dummy_package) procedure remove_not_annotated_package; --%test(Doesn't return annotations when annotations removed from package) diff --git a/test/ut3_tester_helper/annotation_cache_helper.pkb b/test/ut3_tester_helper/annotation_cache_helper.pkb new file mode 100644 index 000000000..0d56823df --- /dev/null +++ b/test/ut3_tester_helper/annotation_cache_helper.pkb @@ -0,0 +1,167 @@ +create or replace package body annotation_cache_helper as + + procedure setup_two_suites is + pragma autonomous_transaction; + begin + execute immediate + 'create or replace package ut3_cache_test_owner.granted_test_suite is + --%suite + + --%test + procedure test1; + --%test + procedure test2; + end;'; + + execute immediate + 'create or replace package body ut3_cache_test_owner.granted_test_suite is + procedure test1 is begin ut3.ut.expect( 1 ).to_equal( 1 ); end; + procedure test2 is begin ut3.ut.expect( 1 ).to_equal( 1 ); end; + end;'; + execute immediate + 'create or replace package ut3_cache_test_owner.not_granted_test_suite is + --%suite + + --%test + procedure test1; + --%test + procedure test2; + end;'; + execute immediate + 'create or replace package body ut3_cache_test_owner.not_granted_test_suite is + procedure test1 is begin ut3.ut.expect( 1 ).to_equal( 1 ); end; + procedure test2 is begin ut3.ut.expect( 1 ).to_equal( 1 ); end; + end;'; + + execute immediate + 'grant execute on ut3_cache_test_owner.granted_test_suite to + ut3_execute_any_proc_user, ut3_select_any_table_user, ut3_select_catalog_user, ut3_no_extra_priv_user'; + end; + + procedure revoke_granted_suite is + pragma autonomous_transaction; + begin + execute immediate + 'revoke execute on ut3_cache_test_owner.granted_test_suite from + ut3_execute_any_proc_user, ut3_select_any_table_user, ut3_select_catalog_user, ut3_no_extra_priv_user'; + exception + when others then + null; + end; + + + procedure add_new_suite is + pragma autonomous_transaction; + begin + execute immediate + 'create or replace package ut3_cache_test_owner.new_suite is + --%suite + + --%test + procedure test1; + --%test + procedure test2; + end;'; + + execute immediate + 'create or replace package body ut3_cache_test_owner.new_suite is + procedure test1 is begin ut3.ut.expect( 1 ).to_equal( 1 ); end; + procedure test2 is begin ut3.ut.expect( 1 ).to_equal( 1 ); end; + end;'; + execute immediate + 'grant execute on ut3_cache_test_owner.new_suite to + ut3_execute_any_proc_user, ut3_select_any_table_user, ut3_select_catalog_user, ut3_no_extra_priv_user'; + end; + + procedure cleanup_two_suites is + pragma autonomous_transaction; + begin + begin + execute immediate 'drop package ut3_cache_test_owner.not_granted_test_suite'; + exception + when others then + null; + end; + begin + execute immediate 'drop package ut3_cache_test_owner.granted_test_suite'; + exception + when others then + null; + end; + end; + + procedure cleanup_new_suite is + pragma autonomous_transaction; + begin + execute immediate 'drop package ut3_cache_test_owner.new_suite'; + exception + when others then + null; + end; + + procedure purge_annotation_cache is + begin + ut3.ut_runner.purge_cache( 'UT3_CACHE_TEST_OWNER' ); + end; + + + procedure disable_ddl_trigger is + pragma autonomous_transaction; + begin + execute immediate 'alter trigger ut3.ut_trigger_annotation_parsing disable'; + execute immediate 'begin ut3.ut_trigger_check.is_alive( ); end;'; + end; + + procedure enable_ddl_trigger is + pragma autonomous_transaction; + begin + execute immediate 'alter trigger ut3.ut_trigger_annotation_parsing enable'; + end; + + procedure create_run_function_for_user(a_user varchar2) is + pragma autonomous_transaction; + begin + execute immediate + 'create or replace function ' || a_user || '.ut_run return clob is + l_data ut3.ut_varchar2_list; + l_results clob; + begin + select * bulk collect into l_data from table (ut3.ut.run( ''ut3_cache_test_owner'' )); + return ut3_tester_helper.main_helper.table_to_clob( l_data ); + end; + '; + execute immediate 'grant execute on ' || a_user || '.ut_run to public '; + end; + + procedure drop_run_function_for_user(a_user varchar2) is + pragma autonomous_transaction; + begin + execute immediate 'drop function ' || a_user || '.ut_run'; + end; + + procedure create_run_function_for_users is + begin + create_run_function_for_user( 'ut3_no_extra_priv_user' ); + create_run_function_for_user( 'ut3_select_catalog_user' ); + create_run_function_for_user( 'ut3_select_any_table_user' ); + create_run_function_for_user( 'ut3_execute_any_proc_user' ); + create_run_function_for_user( 'ut3_cache_test_owner' ); + end; + + procedure drop_run_function_for_users is + begin + drop_run_function_for_user( 'ut3_no_extra_priv_user' ); + drop_run_function_for_user( 'ut3_select_catalog_user' ); + drop_run_function_for_user( 'ut3_select_any_table_user' ); + drop_run_function_for_user( 'ut3_execute_any_proc_user' ); + drop_run_function_for_user( 'ut3_cache_test_owner' ); + end; + + function run_tests_as(a_user varchar2) return clob is + l_results clob; + begin + execute immediate 'begin :x := '||a_user||'.ut_run; end;' using out l_results; + return l_results; + end; +end; +/ \ No newline at end of file diff --git a/test/ut3_tester_helper/annotation_cache_helper.pks b/test/ut3_tester_helper/annotation_cache_helper.pks new file mode 100644 index 000000000..d6ab1f8e2 --- /dev/null +++ b/test/ut3_tester_helper/annotation_cache_helper.pks @@ -0,0 +1,21 @@ +create or replace package annotation_cache_helper as + + procedure setup_two_suites; + procedure add_new_suite; + procedure revoke_granted_suite; + + procedure cleanup_two_suites; + procedure cleanup_new_suite; + + procedure purge_annotation_cache; + + procedure disable_ddl_trigger; + procedure enable_ddl_trigger; + + procedure create_run_function_for_users; + procedure drop_run_function_for_users; + + function run_tests_as(a_user varchar2) return clob; + +end; +/ \ No newline at end of file From 5eab4aaf4d06e8e9fb914690a6bd42a05f33e75b Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 18 Feb 2020 01:08:18 +0000 Subject: [PATCH 0659/1096] Fixed Teamcity reporting of errors Resolves #1045 --- source/reporters/ut_teamcity_reporter.tpb | 4 ++-- test/ut3_user/reporters/test_teamcity_reporter.pkb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/reporters/ut_teamcity_reporter.tpb b/source/reporters/ut_teamcity_reporter.tpb index ee0a53098..9475c0a90 100644 --- a/source/reporters/ut_teamcity_reporter.tpb +++ b/source/reporters/ut_teamcity_reporter.tpb @@ -74,7 +74,7 @@ create or replace type body ut_teamcity_reporter is begin l_idx := a_executables.first; while l_idx is not null loop - l_message := l_message || add_error_message(a_executables(l_idx).error_backtrace, a_message_name); + l_message := l_message || add_error_message( a_executables(l_idx).get_error_stack_trace(), a_message_name ); l_idx := a_executables.next(l_idx); end loop; return l_message; @@ -92,7 +92,7 @@ create or replace type body ut_teamcity_reporter is if a_test.result = ut_utils.gc_error then l_std_err_msg := l_std_err_msg || add_error_messages(a_test.before_each_list, 'Before each exception:'); l_std_err_msg := l_std_err_msg || add_error_messages(a_test.before_test_list, 'Before test exception:'); - l_std_err_msg := l_std_err_msg || add_error_message(a_test.item.error_backtrace, 'Test exception:'); + l_std_err_msg := l_std_err_msg || add_error_message(a_test.item.get_error_stack_trace(), 'Test exception:'); l_std_err_msg := l_std_err_msg || add_error_messages(a_test.after_test_list, 'After test exception:'); l_std_err_msg := l_std_err_msg || add_error_messages(a_test.after_each_list, 'After each exception:'); diff --git a/test/ut3_user/reporters/test_teamcity_reporter.pkb b/test/ut3_user/reporters/test_teamcity_reporter.pkb index 71d2f857d..032399aee 100644 --- a/test/ut3_user/reporters/test_teamcity_reporter.pkb +++ b/test/ut3_user/reporters/test_teamcity_reporter.pkb @@ -63,8 +63,8 @@ create or replace package body test_teamcity_reporter as -%##teamcity[testStdErr timestamp='%' name='ut3$user#.test_reporters.erroring_test' out='Test exception:|nORA-06512: at "UT3$USER#.TEST_REPORTERS", line %|nORA-06512: at %|n|n'] -%##teamcity[testFailed timestamp='%' details='Test exception:|nORA-06512: at "UT3$USER#.TEST_REPORTERS", line %|nORA-06512: at %|n|n' message='Error occured' name='ut3$user#.test_reporters.erroring_test'] +%##teamcity[testStdErr timestamp='%' name='ut3$user#.test_reporters.erroring_test' out='Test exception:|nORA-06502: PL/SQL: numeric or value error: character to number conversion error|nORA-06512: at "UT3$USER#.TEST_REPORTERS", line %|nORA-06512: at %|nORA-06512: at %|n'] +%##teamcity[testFailed timestamp='%' details='Test exception:|nORA-06502: PL/SQL: numeric or value error: character to number conversion error|nORA-06512: at "UT3$USER#.TEST_REPORTERS", line %|nORA-06512: at %|nORA-06512: at %|n' message='Error occured' name='ut3$user#.test_reporters.erroring_test'] %##teamcity[testFinished timestamp='%' duration='%' name='ut3$user#.test_reporters.erroring_test'] %##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3$user#.test_reporters.disabled_test'] %##teamcity[testIgnored timestamp='%' name='ut3$user#.test_reporters.disabled_test'] From 641b3b460798012207fc4a2433b1b937d895d21c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 18 Feb 2020 01:30:09 +0000 Subject: [PATCH 0660/1096] Update install.sh --- .travis/install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis/install.sh b/.travis/install.sh index dfcf63efb..2e96ebfb2 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -74,6 +74,8 @@ PROMPT Creating $UT3_TESTER - Power-user for testing internal framework code create user $UT3_TESTER identified by "$UT3_TESTER_PASSWORD" default tablespace $UT3_TABLESPACE quota unlimited on $UT3_TABLESPACE; grant create session, create procedure, create type, create table to $UT3_TESTER; +grant execute on dbms_lock to $UT3_TESTER; + PROMPT Granting $UT3_OWNER code to $UT3_TESTER begin From 67c4e7816b453824722391d79bcee634af5bfda4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 18 Feb 2020 01:33:23 +0000 Subject: [PATCH 0661/1096] Update test_teamcity_reporter.pkb --- test/ut3_user/reporters/test_teamcity_reporter.pkb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/ut3_user/reporters/test_teamcity_reporter.pkb b/test/ut3_user/reporters/test_teamcity_reporter.pkb index 032399aee..a5261d7f9 100644 --- a/test/ut3_user/reporters/test_teamcity_reporter.pkb +++ b/test/ut3_user/reporters/test_teamcity_reporter.pkb @@ -63,8 +63,8 @@ create or replace package body test_teamcity_reporter as -%##teamcity[testStdErr timestamp='%' name='ut3$user#.test_reporters.erroring_test' out='Test exception:|nORA-06502: PL/SQL: numeric or value error: character to number conversion error|nORA-06512: at "UT3$USER#.TEST_REPORTERS", line %|nORA-06512: at %|nORA-06512: at %|n'] -%##teamcity[testFailed timestamp='%' details='Test exception:|nORA-06502: PL/SQL: numeric or value error: character to number conversion error|nORA-06512: at "UT3$USER#.TEST_REPORTERS", line %|nORA-06512: at %|nORA-06512: at %|n' message='Error occured' name='ut3$user#.test_reporters.erroring_test'] +%##teamcity[testStdErr timestamp='%' name='ut3$user#.test_reporters.erroring_test' out='Test exception:|nORA-06502: PL/SQL: numeric or value error: character to number conversion error|nORA-06512: at "UT3$USER#.TEST_REPORTERS", line %|nORA-06512: at %|n'] +%##teamcity[testFailed timestamp='%' details='Test exception:|nORA-06502: PL/SQL: numeric or value error: character to number conversion error|nORA-06512: at "UT3$USER#.TEST_REPORTERS", line %|nORA-06512: at %|n' message='Error occured' name='ut3$user#.test_reporters.erroring_test'] %##teamcity[testFinished timestamp='%' duration='%' name='ut3$user#.test_reporters.erroring_test'] %##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3$user#.test_reporters.disabled_test'] %##teamcity[testIgnored timestamp='%' name='ut3$user#.test_reporters.disabled_test'] From 3c0351f25bbb5692dab42c49b5be1e17813dbfb7 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 18 Feb 2020 08:51:02 +0000 Subject: [PATCH 0662/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 245d8504c..e1bcfa633 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 5f5295da8..97c065fe2 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 73498a628..6c2b47ac0 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 34f990b6f..92b0ca1d4 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index c15e45936..4a7e105b7 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index d357cbd8c..431ec1493 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 4c398a4a4..dc61b998c 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 87f4f9519..2ad5aa9cb 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index e1a9e09d1..4f0ba15ec 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 624dba1ee..a0fc1981b 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 93b0f1258..c9b2bf362 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index e37920255..8df1d7aa2 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 0a7a04b35..823426318 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index b6ef0def6..cdd7d5230 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 3399c5c72..a046affea 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 3ce5daace..f050c9417 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 66617cb2e..c7e566681 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3327--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 13f64d1bd..4b7747dfa 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -767,7 +767,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.10.3327-develop + * secion v3.1.10.3342-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 3b23edad0..6a3c2cebd 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.10.3327-develop'; + gc_version constant varchar2(50) := 'v3.1.10.3342-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 29b6db484f1b042b91cf18496fcbd18e5c2d35c3 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 18 Feb 2020 09:27:06 +0000 Subject: [PATCH 0663/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index e1bcfa633..da8a160ba 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 97c065fe2..92742a4a4 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 6c2b47ac0..4df80bc5c 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 92b0ca1d4..f009b0c32 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 4a7e105b7..f1253349b 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 431ec1493..4cb07e043 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index dc61b998c..e606a4caf 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 2ad5aa9cb..592eae131 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 4f0ba15ec..00c568012 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index a0fc1981b..9f06ff7c0 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index c9b2bf362..8842461eb 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 8df1d7aa2..df5f8d9d1 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 823426318..3a292a670 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index cdd7d5230..a2e4856e7 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index a046affea..bc642b035 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index f050c9417..295df814e 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index c7e566681..6aeee036d 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3342--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 4b7747dfa..2986a3707 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -767,7 +767,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.10.3342-develop + * secion v3.1.10.3343-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 6a3c2cebd..73884bdca 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.10.3342-develop'; + gc_version constant varchar2(50) := 'v3.1.10.3343-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 5d4c33c8c74bcf2479e16a961a2b39f7e430b04f Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 22 Feb 2020 14:16:44 +0000 Subject: [PATCH 0664/1096] Removed unneeded `is_annotated` column --- .../annotations/ut_annotation_cache_info.sql | 2 -- .../annotations/ut_annotation_cache_manager.pkb | 16 ++++++---------- .../core/annotations/test_annotation_cache.pkb | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/source/core/annotations/ut_annotation_cache_info.sql b/source/core/annotations/ut_annotation_cache_info.sql index e0781cab7..7bbf99e00 100644 --- a/source/core/annotations/ut_annotation_cache_info.sql +++ b/source/core/annotations/ut_annotation_cache_info.sql @@ -17,8 +17,6 @@ create table ut_annotation_cache_info ( object_name varchar2(250) not null, object_type varchar2(250) not null, parse_time timestamp not null, - is_annotated varchar2(1) not null, - constraint ut_annotation_cache_info_ck1 check(is_annotated in ('Y','N')), constraint ut_annotation_cache_info_pk primary key(cache_id) using index, constraint ut_annotation_cache_info_uk unique (object_owner, object_type, object_name) using index, constraint ut_annotation_cache_info_fk foreign key(object_owner, object_type) references ut_annotation_cache_schema(object_owner, object_type) on delete cascade diff --git a/source/core/annotations/ut_annotation_cache_manager.pkb b/source/core/annotations/ut_annotation_cache_manager.pkb index 377dc4492..4882108fc 100644 --- a/source/core/annotations/ut_annotation_cache_manager.pkb +++ b/source/core/annotations/ut_annotation_cache_manager.pkb @@ -35,8 +35,7 @@ create or replace package body ut_annotation_cache_manager as if ora_sysevent is null or a_object.annotations is not null and a_object.annotations.count > 0 then update ut_annotation_cache_info i - set i.parse_time = l_timestamp, - i.is_annotated = case when a_object.annotations is not empty then 'Y' else 'N' end + set i.parse_time = l_timestamp where (i.object_owner, i.object_name, i.object_type) in ((a_object.object_owner, a_object.object_name, a_object.object_type)) returning cache_id into l_cache_id; @@ -44,10 +43,8 @@ create or replace package body ut_annotation_cache_manager as if sql%rowcount = 0 then insert into ut_annotation_cache_info - (cache_id, object_owner, object_name, object_type, parse_time, is_annotated) - values (ut_annotation_cache_seq.nextval, a_object.object_owner, a_object.object_name, a_object.object_type, l_timestamp, - case when a_object.annotations is not empty then 'Y' else 'N' end - ) + (cache_id, object_owner, object_name, object_type, parse_time) + values (ut_annotation_cache_seq.nextval, a_object.object_owner, a_object.object_name, a_object.object_type, l_timestamp) returning cache_id into l_cache_id; end if; @@ -108,11 +105,10 @@ create or replace package body ut_annotation_cache_manager as and o.object_owner = i.object_owner) when matched then update - set parse_time = l_timestamp, - is_annotated = 'N' + set parse_time = l_timestamp when not matched then insert - (cache_id, object_owner, object_name, object_type, parse_time, is_annotated) - values (ut_annotation_cache_seq.nextval, o.object_owner, o.object_name, o.object_type, l_timestamp, 'N'); + (cache_id, object_owner, object_name, object_type, parse_time) + values (ut_annotation_cache_seq.nextval, o.object_owner, o.object_name, o.object_type, l_timestamp); commit; end; diff --git a/test/ut3_tester/core/annotations/test_annotation_cache.pkb b/test/ut3_tester/core/annotations/test_annotation_cache.pkb index 983004eeb..372fec890 100644 --- a/test/ut3_tester/core/annotations/test_annotation_cache.pkb +++ b/test/ut3_tester/core/annotations/test_annotation_cache.pkb @@ -9,7 +9,7 @@ create or replace package body test_annotation_cache is from ut3.ut_annotation_cache_info where object_owner = 'UT3_CACHE_TEST_OWNER'; open l_expected_cache_info for - select 'UT3_CACHE_TEST_OWNER' as object_owner, upper( column_value ) as object_name, 'Y' as is_annotated + select 'UT3_CACHE_TEST_OWNER' as object_owner, upper( column_value ) as object_name from table (a_packages) x; ut.expect( l_actual_cache_info ).to_equal( l_expected_cache_info ).exclude( 'CACHE_ID,PARSE_TIME,OBJECT_TYPE' ).JOIN_BY('OBJECT_NAME'); end; From 8e548733cc2c672e189630b646c19722762ae54f Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sun, 23 Feb 2020 14:05:14 +0000 Subject: [PATCH 0665/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index da8a160ba..3f583531c 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 92742a4a4..5de382e0a 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 4df80bc5c..64b28b164 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index f009b0c32..e36040752 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index f1253349b..74398a481 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 4cb07e043..c1a1bd4a0 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index e606a4caf..c46406ee8 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 592eae131..56a469d69 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 00c568012..cd81dda4c 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 9f06ff7c0..0e9510ddb 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 8842461eb..0f4684306 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index df5f8d9d1..1a7d45224 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 98be5fb6b..78368ab0a 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index a2e4856e7..01b4d597b 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index bc642b035..677ea9493 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 295df814e..55d58eb2b 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 6aeee036d..bb4b24fca 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3343--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 4aa6850af..65452ee2e 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -769,7 +769,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.10.3343-develop + * secion v3.1.10.3346-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 73884bdca..097078d81 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.10.3343-develop'; + gc_version constant varchar2(50) := 'v3.1.10.3346-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From a2d163802ba4699b14f0241c46eae10787f8760a Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 23 Feb 2020 15:45:37 +0000 Subject: [PATCH 0666/1096] Update `releasing.md` file --- development/releasing.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/development/releasing.md b/development/releasing.md index 3e9ac64fa..93634018d 100644 --- a/development/releasing.md +++ b/development/releasing.md @@ -1,9 +1,10 @@ -The release process is semi-automated. +## Release process With every build, the build process on Travis updates files with an appropriate version number before deployment into the database. This step is performed, to confirm that the update of versions works properly. -To create a release: +## To create a release + - create release branch from development branch and make sure to name the release branch: `release/vX.Y.Z` - update, commit and push at least one file change in the release branch, to kickoff a Travis build - wait for th build to complete successfully From 903425084daee1ec84b8dbda4dcb102a27fe7d58 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sun, 23 Feb 2020 16:02:01 +0000 Subject: [PATCH 0667/1096] Updated project version after build [skip ci] --- VERSION | 2 +- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- sonar-project.properties | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/VERSION b/VERSION index 8961ff4ac..04c455c73 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.10-develop +v3.1.10 diff --git a/docs/about/authors.md b/docs/about/authors.md index 3f583531c..3ed66a43f 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 5de382e0a..31072519e 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 64b28b164..10ce84eb1 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index e36040752..2c9fcb98d 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 74398a481..3d48c47e6 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index c1a1bd4a0..feb521f69 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index c46406ee8..bb56ab4ef 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 56a469d69..89aa004ac 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index cd81dda4c..115678802 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 0e9510ddb..14cded7c6 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 0f4684306..7876c7a79 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 1a7d45224..290419986 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 78368ab0a..520533cae 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 01b4d597b..d07c4836c 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 677ea9493..8b3033539 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 55d58eb2b..4d7882852 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index bb4b24fca..924e80d17 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3346--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) # Upgrading from version 2 diff --git a/sonar-project.properties b/sonar-project.properties index 62c8f808f..7ab61df28 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,7 @@ sonar.projectKey=utPLSQL # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=utPLSQL -sonar.projectVersion=v3.1.10-develop +sonar.projectVersion=v3.1.10 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # Since SonarQube 4.2, this property is optional if sonar.modules is set. diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 65452ee2e..87a14763c 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -769,7 +769,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.10.3346-develop + * secion v3.1.10.3347 */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 097078d81..bd017020a 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.10.3346-develop'; + gc_version constant varchar2(50) := 'v3.1.10.3347'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 532073bfc4d8f7eabb9a67c9668836a01cc1b255 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 23 Feb 2020 16:46:06 +0000 Subject: [PATCH 0668/1096] Updated version to 3.1.11 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 04c455c73..021c7c624 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.10 +v3.1.11 From 1b00d2759104ce7371c9417a3a0308bdf06825a7 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sun, 23 Feb 2020 16:57:36 +0000 Subject: [PATCH 0669/1096] Updated project version after build [skip ci] --- VERSION | 2 +- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- sonar-project.properties | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/VERSION b/VERSION index 021c7c624..571f2ad11 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.11 +v3.1.11-develop diff --git a/docs/about/authors.md b/docs/about/authors.md index 3ed66a43f..8fb7b1928 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 31072519e..f5f26f2d2 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 10ce84eb1..3f14e0b9c 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 2c9fcb98d..0f3a92f1a 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 3d48c47e6..b53ed957f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index feb521f69..66035803b 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index bb56ab4ef..7d8f127f6 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 89aa004ac..4c5a6cbe1 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 115678802..69e5d41c7 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 14cded7c6..077527813 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 7876c7a79..a0db755d7 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 290419986..bbe051b15 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 520533cae..ee1de1d80 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index d07c4836c..8c3349d72 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 8b3033539..320bf797a 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 4d7882852..c263c58ab 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 924e80d17..126f92011 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.10.3347-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) # Upgrading from version 2 diff --git a/sonar-project.properties b/sonar-project.properties index 7ab61df28..ddd794a91 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,7 @@ sonar.projectKey=utPLSQL # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=utPLSQL -sonar.projectVersion=v3.1.10 +sonar.projectVersion=v3.1.11-develop # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # Since SonarQube 4.2, this property is optional if sonar.modules is set. diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 87a14763c..0ad70d5a1 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -769,7 +769,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.10.3347 + * secion v3.1.11.3350-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index bd017020a..ebdff001f 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.10.3347'; + gc_version constant varchar2(50) := 'v3.1.11.3350-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 63f17a288c75c29fe0fb7da2435dea27ba12356c Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 12 Mar 2020 23:16:46 +0000 Subject: [PATCH 0670/1096] Improved the way utPLSQL checks if user has the `execute any procedure` privilege. Added additional test to assure that invoking tests from utPLSQL owner doesn't break annotation Resolves #1051 --- .travis/install.sh | 4 ++-- .../annotations/ut_annotation_manager.pkb | 2 +- source/core/ut_metadata.pkb | 21 +++++++++++++++++-- source/core/ut_suite_manager.pkb | 2 +- .../annotations/test_annotation_cache.pkb | 18 ++++++++++++++++ .../annotations/test_annotation_cache.pks | 7 +++++++ .../annotation_cache_helper.pkb | 10 +++++---- 7 files changed, 54 insertions(+), 10 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index 2e96ebfb2..dd21c4fbc 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -86,7 +86,7 @@ begin and generated = 'N' and object_name not like 'SYS%') loop - execute immediate 'grant execute on ut3."'||i.object_name||'" to UT3_TESTER'; + execute immediate 'grant execute on $UT3_OWNER."'||i.object_name||'" to $UT3_TESTER'; end loop; end; / @@ -96,7 +96,7 @@ PROMPT Granting $UT3_OWNER tables to $UT3_TESTER begin for i in ( select table_name from all_tables t where owner = 'UT3' and nested = 'NO' and iot_name is null) loop - execute immediate 'grant select on UT3.'||i.table_name||' to UT3_TESTER'; + execute immediate 'grant select on $UT3_OWNER.'||i.table_name||' to $UT3_TESTER'; end loop; end; / diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index a37391d37..f8ca03326 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -21,7 +21,7 @@ create or replace package body ut_annotation_manager as function user_can_see_whole_schema( a_schema_name varchar2 ) return boolean is begin - return sys_context('userenv','current_schema') = a_schema_name + return sys_context('userenv','current_user') = a_schema_name or ut_metadata.user_has_execute_any_proc() or ut_metadata.is_object_visible('dba_objects'); end; diff --git a/source/core/ut_metadata.pkb b/source/core/ut_metadata.pkb index 5448f1b5f..727dd6318 100644 --- a/source/core/ut_metadata.pkb +++ b/source/core/ut_metadata.pkb @@ -121,9 +121,26 @@ create or replace package body ut_metadata as end; function user_has_execute_any_proc return boolean is - l_ut_owner varchar2(250) := ut_utils.ut_owner; + l_has_execute_any varchar2(1); begin - return is_object_visible(l_ut_owner||'.ut_utils') and sys_context('userenv','current_schema') != l_ut_owner; + select decode( count( 1 ), 0, 'N', 'Y' ) + into l_has_execute_any + from dual + where + exists( + select 1 + from + role_sys_privs + join session_roles + using ( role ) + where privilege = 'EXECUTE ANY PROCEDURE' + ) or + exists( + select 1 + from user_sys_privs + where privilege = 'EXECUTE ANY PROCEDURE' + ); + return l_has_execute_any = 'Y'; end; function is_object_visible(a_object_name varchar2) return boolean is diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index ee5063105..789255f99 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -374,7 +374,7 @@ create or replace package body ut_suite_manager is a_owner_name varchar2 ) return boolean is begin - return sys_context( 'userenv', 'current_schema' ) = a_owner_name or ut_metadata.user_has_execute_any_proc(); + return sys_context( 'userenv', 'current_user' ) = a_owner_name or ut_metadata.user_has_execute_any_proc(); end; procedure build_and_cache_suites( diff --git a/test/ut3_tester/core/annotations/test_annotation_cache.pkb b/test/ut3_tester/core/annotations/test_annotation_cache.pkb index 372fec890..1faa7ce09 100644 --- a/test/ut3_tester/core/annotations/test_annotation_cache.pkb +++ b/test/ut3_tester/core/annotations/test_annotation_cache.pkb @@ -14,6 +14,19 @@ create or replace package body test_annotation_cache is ut.expect( l_actual_cache_info ).to_equal( l_expected_cache_info ).exclude( 'CACHE_ID,PARSE_TIME,OBJECT_TYPE' ).JOIN_BY('OBJECT_NAME'); end; + procedure cant_run_any_packages(a_user varchar2) is + l_actual clob; + l_current_time date := sysdate; + pragma autonomous_transaction; + begin + --Act + l_actual := annotation_cache_helper.run_tests_as( a_user ); + + --Assert - no suites are + ut.expect( l_actual ).to_be_like( '%0 tests, 0 failed%' ); + rollback; + end; + procedure can_run_one_package(a_user varchar2) is l_actual clob; l_current_time date := sysdate; @@ -380,6 +393,11 @@ create or replace package body test_annotation_cache is cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); end; + procedure t_ut_owner_cannot_run_tests is + begin + cant_run_any_packages( 'ut3' ); + cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); + end; diff --git a/test/ut3_tester/core/annotations/test_annotation_cache.pks b/test/ut3_tester/core/annotations/test_annotation_cache.pks index f44b816e1..5a3fdd8ca 100644 --- a/test/ut3_tester/core/annotations/test_annotation_cache.pks +++ b/test/ut3_tester/core/annotations/test_annotation_cache.pks @@ -89,6 +89,13 @@ create or replace package test_annotation_cache is --%endcontext + --%context(utPLSQL framework owner) + + --%test(Cannot see any tests and doesn't impact annotation cache ) + procedure t_ut_owner_cannot_run_tests; + + --%endcontext + --%endcontext --%context(With DDL trigger disabled) diff --git a/test/ut3_tester_helper/annotation_cache_helper.pkb b/test/ut3_tester_helper/annotation_cache_helper.pkb index 0d56823df..c61c797fc 100644 --- a/test/ut3_tester_helper/annotation_cache_helper.pkb +++ b/test/ut3_tester_helper/annotation_cache_helper.pkb @@ -122,7 +122,7 @@ create or replace package body annotation_cache_helper as pragma autonomous_transaction; begin execute immediate - 'create or replace function ' || a_user || '.ut_run return clob is + 'create or replace function ' || a_user || '.call_ut_run return clob is l_data ut3.ut_varchar2_list; l_results clob; begin @@ -130,13 +130,13 @@ create or replace package body annotation_cache_helper as return ut3_tester_helper.main_helper.table_to_clob( l_data ); end; '; - execute immediate 'grant execute on ' || a_user || '.ut_run to public '; + execute immediate 'grant execute on ' || a_user || '.call_ut_run to public '; end; procedure drop_run_function_for_user(a_user varchar2) is pragma autonomous_transaction; begin - execute immediate 'drop function ' || a_user || '.ut_run'; + execute immediate 'drop function ' || a_user || '.call_ut_run'; end; procedure create_run_function_for_users is @@ -146,6 +146,7 @@ create or replace package body annotation_cache_helper as create_run_function_for_user( 'ut3_select_any_table_user' ); create_run_function_for_user( 'ut3_execute_any_proc_user' ); create_run_function_for_user( 'ut3_cache_test_owner' ); + create_run_function_for_user( 'ut3' ); end; procedure drop_run_function_for_users is @@ -155,12 +156,13 @@ create or replace package body annotation_cache_helper as drop_run_function_for_user( 'ut3_select_any_table_user' ); drop_run_function_for_user( 'ut3_execute_any_proc_user' ); drop_run_function_for_user( 'ut3_cache_test_owner' ); + drop_run_function_for_user( 'ut3' ); end; function run_tests_as(a_user varchar2) return clob is l_results clob; begin - execute immediate 'begin :x := '||a_user||'.ut_run; end;' using out l_results; + execute immediate 'begin :x := '||a_user||'.call_ut_run; end;' using out l_results; return l_results; end; end; From 4979cf924df78137e31d40f8d24cff1cb8191776 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 12 Mar 2020 23:18:02 +0000 Subject: [PATCH 0671/1096] Added check for sys grants added via role when installing utPLSQL framework. Resolves #1050 --- source/check_sys_grants.sql | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/source/check_sys_grants.sql b/source/check_sys_grants.sql index 7b1644952..79b657328 100644 --- a/source/check_sys_grants.sql +++ b/source/check_sys_grants.sql @@ -12,18 +12,29 @@ begin end if; end loop; end if; + + with + x as ( + select '' as remove from dual + union all + select ' ANY' as remove from dual + ) select listagg(' - '||privilege,CHR(10)) within group(order by privilege) - into l_missing_grants - from ( - select column_value as privilege - from table(l_expected_grants) - minus - (select privilege - from user_sys_privs - union all - select replace(privilege,' ANY') privilege - from user_sys_privs) - ); + into l_missing_grants + from ( + select column_value as privilege + from table(l_expected_grants) + minus ( + select replace(p.privilege, x.remove) as privilege + from role_sys_privs p + join session_roles r using (role) + cross join x + union all + select replace(p.privilege, x.remove) as privilege + from user_sys_privs p + cross join x + ) + ); if l_missing_grants is not null then raise_application_error( -20000 From 4d865ae171636df012b8288bdfdf61aa0e7bbbf6 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 14 Mar 2020 17:41:09 +0000 Subject: [PATCH 0672/1096] Fixed flay tests that can fail on occasion when a second flips during test execution. --- .../expectations/test_expectations_cursor.pkb | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index 5a0b68f2f..4f9cd72d6 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -419,13 +419,12 @@ create or replace package body test_expectations_cursor is as l_expected sys_refcursor; l_actual sys_refcursor; - l_date date := sysdate; - l_second number := 1/24/60/60; + c_second constant number := 1/24/60/60; begin --Arrange ut3.ut.set_nls; - open l_actual for select l_date as some_date from dual; - open l_expected for select l_date-l_second some_date from dual; + open l_actual for select gc_date as some_date from dual; + open l_expected for select gc_date - c_second some_date from dual; --Act ut3.ut.expect( l_actual ).to_equal( l_expected ); --Assert @@ -439,8 +438,8 @@ create or replace package body test_expectations_cursor is l_expected sys_refcursor; begin --Arrange - open l_actual for select sysdate as some_date from dual; - open l_expected for select to_date(to_char(sysdate)) as some_date from dual; + open l_actual for select gc_date as some_date from dual; + open l_expected for select to_date(to_char(gc_date)) as some_date from dual; --Act ut3.ut.expect(l_actual).to_equal(l_expected); --Assert @@ -1970,10 +1969,10 @@ Diff:% l_actual_tab some_object; l_expected_tab some_object; begin - select some_object( user,'TEST', sysdate, some_items( some_item(1,'test'), some_item(2,'test') ) ) + select some_object( user,'TEST', gc_date, some_items( some_item(1,'test'), some_item(2,'test') ) ) into l_actual_tab from dual; - select some_object( user,'TEST', sysdate, some_items( some_item(1,'test'), some_item(2,'test') ) ) + select some_object( user,'TEST', gc_date, some_items( some_item(1,'test'), some_item(2,'test') ) ) into l_expected_tab from dual; --Arrange @@ -1994,10 +1993,10 @@ Diff:% l_actual_tab some_object; l_expected_tab some_object; begin - select some_object( user,'TEST', sysdate, some_items( some_item(1,'test'), some_item(2,'test') ) ) + select some_object( user,'TEST', gc_date, some_items( some_item(1,'test'), some_item(2,'test') ) ) into l_actual_tab from dual; - select some_object( user,'TEST', sysdate, some_items( some_item(1,'test'), some_item(2,'test') ) ) + select some_object( user,'TEST', gc_date, some_items( some_item(1,'test'), some_item(2,'test') ) ) into l_expected_tab from dual; --Arrange @@ -2018,10 +2017,10 @@ Diff:% l_actual_tab some_object; l_expected_tab some_object; begin - select some_object( user,'TEST', sysdate, some_items( some_item(1,'test'), some_item(2,'test') ) ) + select some_object( user,'TEST', gc_date, some_items( some_item(1,'test'), some_item(2,'test') ) ) into l_actual_tab from dual; - select some_object( user,'TEST', sysdate, some_items( some_item(1,'test'), some_item(2,'test') ) ) + select some_object( user,'TEST', gc_date, some_items( some_item(1,'test'), some_item(2,'test') ) ) into l_expected_tab from dual; --Arrange @@ -2043,12 +2042,11 @@ Diff:% l_expected_tab some_object; l_expected_message varchar2(32767); l_actual_message varchar2(32767); - l_date date := sysdate; begin - select some_object( 'TEST','TEST', l_date, some_items( some_item(1,'BAD'), some_item(2,'test') ) ) + select some_object( 'TEST','TEST', gc_date, some_items( some_item(1,'BAD'), some_item(2,'test') ) ) into l_actual_tab from dual; - select some_object( 'TEST','TEST', l_date, some_items( some_item(1,'TEST'), some_item(2,'test') ) ) + select some_object( 'TEST','TEST', gc_date, some_items( some_item(1,'TEST'), some_item(2,'test') ) ) into l_expected_tab from dual; --Arrange @@ -2080,10 +2078,10 @@ Diff:% l_expected_message varchar2(32767); l_actual_message varchar2(32767); begin - select some_object( 'TEST','TEST', sysdate, some_items( some_item(1,'BAD'), some_item(2,'test') ) ) + select some_object( 'TEST','TEST', gc_date, some_items( some_item(1,'BAD'), some_item(2,'test') ) ) into l_actual_tab from dual; - select some_object( 'TEST','TEST', sysdate, some_items( some_item(1,'TEST'), some_item(2,'test') ) ) + select some_object( 'TEST','TEST', gc_date, some_items( some_item(1,'TEST'), some_item(2,'test') ) ) into l_expected_tab from dual; --Arrange From 8d375915b5dff7da7095a535802473bc6919405f Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sat, 14 Mar 2020 18:33:22 +0000 Subject: [PATCH 0673/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 8fb7b1928..2fe5655e8 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index f5f26f2d2..576f861d1 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 3f14e0b9c..e868fecd0 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 0f3a92f1a..8df21fea3 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index b53ed957f..f641c25ae 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 66035803b..d6fc7bcd0 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 7d8f127f6..8f4acbd3a 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 4c5a6cbe1..6046a2241 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 69e5d41c7..022fce376 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 077527813..a10554155 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index a0db755d7..111a95ff7 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index bbe051b15..5dcf6c056 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index ee1de1d80..b2048a75c 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 8c3349d72..f4fcb065e 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 320bf797a..f2a86cf5d 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index c263c58ab..490a21c1c 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 126f92011..5e33365af 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3350--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 0ad70d5a1..6f92f7901 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -769,7 +769,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.11.3350-develop + * secion v3.1.11.3357-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index ebdff001f..2ecbbc095 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.11.3350-develop'; + gc_version constant varchar2(50) := 'v3.1.11.3357-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 725d367c4e28226e4fc206937e46f5105e23b9fe Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 15 Mar 2020 22:01:51 +0000 Subject: [PATCH 0674/1096] Refactored and fixed code to use be fully schema-independent. --- .travis.yml | 11 ++++---- .travis/install.sh | 41 +++++++++++++++++------------- .travis/install_utplsql_release.sh | 8 +++--- .travis/run_examples.sh | 2 +- development/cleanup.sh | 4 +-- development/install.sh | 2 +- development/refresh_ut3.sh | 4 +-- development/template.env.sh | 11 ++++---- docs/userguide/install.md | 2 +- source/core/ut_suite_manager.pkb | 13 +++++----- source/create_utplsql_owner.sql | 18 ++++++------- 11 files changed, 62 insertions(+), 54 deletions(-) diff --git a/.travis.yml b/.travis.yml index 018038144..265fc0888 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,14 +16,15 @@ services: env: global: - - UT3_OWNER=ut3 - - UT3_OWNER_PASSWORD=ut3 - - UT3_RELEASE_VERSION_SCHEMA=UT3_LATEST_RELEASE + - UT3_DEVELOP_SCHEMA=UT3_DEVELOP + - UT3_DEVELOP_SCHEMA_PASSWORD=ut3 + - UT3_RELEASE_VERSION_SCHEMA=UT3 + - UT3_RELEASE_VERSION_SCHEMA_PASSWORD=ut3 - UT3_USER="UT3\$USER#" - UT3_USER_PASSWORD=ut3 - - UT3_TESTER=ut3_tester + - UT3_TESTER=UT3_TESTER - UT3_TESTER_PASSWORD=ut3 - - UT3_TESTER_HELPER=ut3_tester_helper + - UT3_TESTER_HELPER=UT3_TESTER_HELPER - UT3_TESTER_HELPER_PASSWORD=ut3 - UT3_TABLESPACE=users # Environment for building a release diff --git a/.travis/install.sh b/.travis/install.sh index dd21c4fbc..99c88c79b 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -3,6 +3,11 @@ cd source set -ev +INSTALL_FILE="install_headless_with_trigger.sql" +if [[ ! -f "${INSTALL_FILE}" ]]; then + INSTALL_FILE="install_headless.sql" +fi + #install core of utplsql time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL whenever sqlerror exit failure rollback @@ -11,14 +16,14 @@ set verify off --alter session set plsql_warnings = 'ENABLE:ALL', 'DISABLE:(5004,5018,6000,6001,6003,6009,6010,7206)'; alter session set plsql_optimize_level=0; -@install_headless_with_trigger.sql $UT3_OWNER $UT3_OWNER_PASSWORD +@${INSTALL_FILE} $UT3_DEVELOP_SCHEMA $UT3_DEVELOP_SCHEMA_PASSWORD SQL #Run this step only on second child job (12.1 - at it's fastest) if [[ "${TRAVIS_JOB_NUMBER}" =~ \.2$ ]]; then #check code-style for errors - time "$SQLCLI" $UT3_OWNER/$UT3_OWNER_PASSWORD@//$CONNECTION_STR @../development/utplsql_style_check.sql + time "$SQLCLI" $UT3_DEVELOP_SCHEMA/$UT3_DEVELOP_SCHEMA_PASSWORD@//$CONNECTION_STR @../development/utplsql_style_check.sql #test install/uninstall process time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL @@ -26,7 +31,7 @@ if [[ "${TRAVIS_JOB_NUMBER}" =~ \.2$ ]]; then set verify off whenever sqlerror exit failure rollback - @uninstall_all.sql $UT3_OWNER + @uninstall_all.sql $UT3_DEVELOP_SCHEMA whenever sqlerror exit failure rollback declare v_leftover_objects_count integer; @@ -34,10 +39,10 @@ if [[ "${TRAVIS_JOB_NUMBER}" =~ \.2$ ]]; then select sum(cnt) into v_leftover_objects_count from ( - select count(1) cnt from dba_objects where owner = '$UT3_OWNER' + select count(1) cnt from dba_objects where owner = '$UT3_DEVELOP_SCHEMA' where object_name not like 'PLSQL_PROFILER%' and object_name not like 'DBMSPCC_%' union all - select count(1) cnt from dba_synonyms where table_owner = '$UT3_OWNER' + select count(1) cnt from dba_synonyms where table_owner = '$UT3_DEVELOP_SCHEMA' where table_name not like 'PLSQL_PROFILER%' and table_name not like 'DBMSPCC_%' ); if v_leftover_objects_count > 0 then @@ -52,9 +57,9 @@ SQL set verify off alter session set plsql_optimize_level=0; - @install.sql $UT3_OWNER - @install_ddl_trigger.sql $UT3_OWNER - @create_synonyms_and_grants_for_public.sql $UT3_OWNER + @install.sql $UT3_DEVELOP_SCHEMA + @install_ddl_trigger.sql $UT3_DEVELOP_SCHEMA + @create_synonyms_and_grants_for_public.sql $UT3_DEVELOP_SCHEMA SQL fi @@ -65,8 +70,8 @@ set feedback off whenever sqlerror exit failure rollback -------------------------------------------------------------------------------- -PROMPT Adding back create-trigger privilege to $UT3_OWNER for testing -grant administer database trigger to $UT3_OWNER; +PROMPT Adding back create-trigger privilege to $UT3_DEVELOP_SCHEMA for testing +grant administer database trigger to $UT3_DEVELOP_SCHEMA; -------------------------------------------------------------------------------- PROMPT Creating $UT3_TESTER - Power-user for testing internal framework code @@ -76,27 +81,27 @@ grant create session, create procedure, create type, create table to $UT3_TESTER grant execute on dbms_lock to $UT3_TESTER; -PROMPT Granting $UT3_OWNER code to $UT3_TESTER +PROMPT Granting $UT3_DEVELOP_SCHEMA code to $UT3_TESTER begin for i in ( select object_name from all_objects t where t.object_type in ('PACKAGE','TYPE') - and owner = 'UT3' + and owner = '$UT3_DEVELOP_SCHEMA' and generated = 'N' and object_name not like 'SYS%') loop - execute immediate 'grant execute on $UT3_OWNER."'||i.object_name||'" to $UT3_TESTER'; + execute immediate 'grant execute on $UT3_DEVELOP_SCHEMA."'||i.object_name||'" to $UT3_TESTER'; end loop; end; / -PROMPT Granting $UT3_OWNER tables to $UT3_TESTER +PROMPT Granting $UT3_DEVELOP_SCHEMA tables to $UT3_TESTER begin - for i in ( select table_name from all_tables t where owner = 'UT3' and nested = 'NO' and iot_name is null) + for i in ( select table_name from all_tables t where owner = '$UT3_DEVELOP_SCHEMA' and nested = 'NO' and iot_name is null) loop - execute immediate 'grant select on $UT3_OWNER.'||i.table_name||' to $UT3_TESTER'; + execute immediate 'grant select on $UT3_DEVELOP_SCHEMA.'||i.table_name||' to $UT3_TESTER'; end loop; end; / @@ -119,11 +124,11 @@ PROMPT Grants for testing distributed transactions grant create public database link to $UT3_TESTER_HELPER; grant drop public database link to $UT3_TESTER_HELPER; -PROMPT Grants for testing coverage outside of main UT3 schema. +PROMPT Grants for testing coverage outside of main $UT3_DEVELOP_SCHEMA schema. grant create any procedure, drop any procedure, execute any procedure, create any type, drop any type, execute any type, under any type, select any table, update any table, insert any table, delete any table, create any table, drop any table, alter any table, select any dictionary, create any synonym, drop any synonym, - grant any object privilege, grant any privilege + grant any object privilege, grant any privilege, create public synonym, drop public synonym to $UT3_TESTER_HELPER; grant create job to $UT3_TESTER_HELPER; diff --git a/.travis/install_utplsql_release.sh b/.travis/install_utplsql_release.sh index 3e608b08f..12ec50118 100755 --- a/.travis/install_utplsql_release.sh +++ b/.travis/install_utplsql_release.sh @@ -11,7 +11,7 @@ set trimspool on declare i integer := 0; begin - dbms_output.put_line('Dropping synonyms pointing to schema '||upper('${UT3_OWNER}')); + dbms_output.put_line('Dropping synonyms pointing to schema '||upper('${UT3_DEVELOP_SCHEMA}')); for syn in ( select case when owner = 'PUBLIC' @@ -19,7 +19,7 @@ begin else 'synonym ' || owner || '.' end || synonym_name as syn_name, table_owner||'.'||table_name as for_object from all_synonyms s - where table_owner = upper('${UT3_OWNER}') and table_owner != owner + where table_owner = upper('${UT3_DEVELOP_SCHEMA}') and table_owner != owner ) loop i := i + 1; @@ -28,7 +28,7 @@ begin dbms_output.put_line('Dropped '||syn.syn_name||' for object '||syn.for_object); exception when others then - dbms_output.put_line('FAILED to drop '||syn.syn_name||' for object '||syn.for_object); + dbms_output.put_line('FAILED to drop '||syn.syn_name||' for object '||syn.for_object||' with error '||sqlerrm); end; end loop; dbms_output.put_line(i||' synonyms dropped'); @@ -45,7 +45,7 @@ fi alter session set plsql_optimize_level=0; alter session set plsql_ccflags = 'SELF_TESTING_INSTALL:TRUE'; -@${INSTALL_FILE} ${UT3_RELEASE_VERSION_SCHEMA} +@${INSTALL_FILE} ${UT3_RELEASE_VERSION_SCHEMA} ${UT3_RELEASE_VERSION_SCHEMA_PASSWORD} exit SQL diff --git a/.travis/run_examples.sh b/.travis/run_examples.sh index 967b621c7..2f05b101b 100755 --- a/.travis/run_examples.sh +++ b/.travis/run_examples.sh @@ -2,7 +2,7 @@ set -ev -"$SQLCLI" $UT3_OWNER/$UT3_OWNER_PASSWORD@//$CONNECTION_STR < Date: Sun, 15 Mar 2020 22:16:36 +0000 Subject: [PATCH 0675/1096] Refactored tests to comply with new schema layout --- test/run_tests.sh | 2 +- .../test_annot_throws_exception.pkb | 6 +- .../annotations/test_annotation_cache.pkb | 4 +- .../annotations/test_annotation_manager.pkb | 66 +- .../annotations/test_annotation_parser.pkb | 218 ++--- .../test_before_after_annotations.pkb | 4 +- .../test_expectation_processor.pkb | 56 +- test/ut3_tester/core/test_file_mapper.pkb | 30 +- test/ut3_tester/core/test_output_buffer.pkb | 34 +- test/ut3_tester/core/test_suite_builder.pkb | 896 +++++++++--------- test/ut3_tester/core/test_suite_manager.pkb | 544 +++++------ test/ut3_tester/core/test_ut_executable.pkb | 34 +- test/ut3_tester/core/test_ut_suite.pkb | 74 +- test/ut3_tester/core/test_ut_test.pkb | 226 ++--- test/ut3_tester/core/test_ut_utils.pkb | 130 +-- .../annotation_cache_helper.pkb | 28 +- test/ut3_tester_helper/coverage_helper.pkb | 100 +- test/ut3_tester_helper/coverage_helper.pks | 2 +- .../ut3_tester_helper/expectations_helper.pkb | 6 +- test/ut3_tester_helper/main_helper.pkb | 58 +- test/ut3_tester_helper/main_helper.pks | 18 +- test/ut3_tester_helper/run_helper.pkb | 140 +-- test/ut3_tester_helper/run_helper.pks | 52 +- test/ut3_user/api/test_ut_run.pkb | 194 ++-- test/ut3_user/api/test_ut_runner.pkb | 168 ++-- test/ut3_user/expectations.pkb | 12 +- .../binary/test_be_greater_or_equal.pkb | 2 +- .../binary/test_be_greater_than.pkb | 2 +- .../binary/test_be_less_or_equal.pkb | 2 +- .../expectations/binary/test_equal.pkb | 2 +- .../binary/test_expect_to_be_less_than.pkb | 2 +- .../expectations/test_expectation_anydata.pkb | 160 ++-- .../expectations/test_expectations_cursor.pkb | 380 ++++---- .../expectations/test_expectations_json.pkb | 46 +- test/ut3_user/expectations/test_matchers.pkb | 22 +- .../unary/test_expect_to_be_empty.pkb | 50 +- .../unary/test_expect_to_be_true_false.pkb | 32 +- .../unary/test_expect_to_have_count.pkb | 34 +- test/ut3_user/reporters.pkb | 24 +- test/ut3_user/reporters.pks | 4 +- .../test_cov_cobertura_reporter.pkb | 30 +- .../test_coverage_sonar_reporter.pkb | 16 +- .../test_coverage/test_coveralls_reporter.pkb | 26 +- .../test_html_extended_reporter.pkb | 14 +- .../test_html_proftab_reporter.pkb | 14 +- .../reporters/test_debug_reporter.pkb | 6 +- .../reporters/test_documentation_reporter.pkb | 2 +- .../reporters/test_extended_coverage.pkb | 40 +- .../reporters/test_junit_reporter.pkb | 52 +- .../reporters/test_proftab_coverage.pkb | 68 +- .../reporters/test_realtime_reporter.pkb | 40 +- .../reporters/test_sonar_test_reporter.pkb | 12 +- .../reporters/test_teamcity_reporter.pkb | 16 +- .../reporters/test_tfs_junit_reporter.pkb | 34 +- 54 files changed, 2117 insertions(+), 2117 deletions(-) diff --git a/test/run_tests.sh b/test/run_tests.sh index 29086f5f7..0edc4d96d 100755 --- a/test/run_tests.sh +++ b/test/run_tests.sh @@ -5,7 +5,7 @@ set -ev git rev-parse && cd "$(git rev-parse --show-cdup)" time utPLSQL-cli/bin/utplsql run ${UT3_TESTER_HELPER}/${UT3_TESTER_HELPER_PASSWORD}@${CONNECTION_STR} \ --source_path=source -owner=ut3 \ +-source_path=source -owner=ut3_develop \ -p='ut3_tester,ut3$user#' \ -test_path=test -c \ -f=ut_coverage_sonar_reporter -o=coverage.xml \ diff --git a/test/ut3_tester/core/annotations/test_annot_throws_exception.pkb b/test/ut3_tester/core/annotations/test_annot_throws_exception.pkb index 04e65a6c2..ac51d3a49 100644 --- a/test/ut3_tester/core/annotations/test_annot_throws_exception.pkb +++ b/test/ut3_tester/core/annotations/test_annot_throws_exception.pkb @@ -8,7 +8,7 @@ is l_package_spec varchar2(32737); l_package_body varchar2(32737); l_exception_spec varchar2(32737); - l_test_results ut3.ut_varchar2_list; + l_test_results ut3_develop.ut_varchar2_list; begin l_exception_spec := q'[ create or replace package exc_pkg is @@ -251,9 +251,9 @@ is execute immediate l_package_body; - select * bulk collect into l_test_results from table(ut3.ut.run(('annotated_package_with_throws'))); + select * bulk collect into l_test_results from table(ut3_develop.ut.run(('annotated_package_with_throws'))); - g_tests_results := ut3.ut_utils.table_to_clob(l_test_results); + g_tests_results := ut3_develop.ut_utils.table_to_clob(l_test_results); end; procedure throws_same_annotated_except is diff --git a/test/ut3_tester/core/annotations/test_annotation_cache.pkb b/test/ut3_tester/core/annotations/test_annotation_cache.pkb index 1faa7ce09..eefaf8800 100644 --- a/test/ut3_tester/core/annotations/test_annotation_cache.pkb +++ b/test/ut3_tester/core/annotations/test_annotation_cache.pkb @@ -6,7 +6,7 @@ create or replace package body test_annotation_cache is begin open l_actual_cache_info for select * - from ut3.ut_annotation_cache_info + from ut3_develop.ut_annotation_cache_info where object_owner = 'UT3_CACHE_TEST_OWNER'; open l_expected_cache_info for select 'UT3_CACHE_TEST_OWNER' as object_owner, upper( column_value ) as object_name @@ -395,7 +395,7 @@ create or replace package body test_annotation_cache is procedure t_ut_owner_cannot_run_tests is begin - cant_run_any_packages( 'ut3' ); + cant_run_any_packages( 'ut3_develop' ); cache_populated_for_packages( ut_varchar2_rows( 'GRANTED_TEST_SUITE', 'NOT_GRANTED_TEST_SUITE' ) ); end; diff --git a/test/ut3_tester/core/annotations/test_annotation_manager.pkb b/test/ut3_tester/core/annotations/test_annotation_manager.pkb index 8a3efc508..a5503f841 100644 --- a/test/ut3_tester/core/annotations/test_annotation_manager.pkb +++ b/test/ut3_tester/core/annotations/test_annotation_manager.pkb @@ -101,14 +101,14 @@ create or replace package body test_annotation_manager is begin select max(cache_id) into l_actual_cache_id - from ut3.ut_annotation_cache_info + from ut3_develop.ut_annotation_cache_info where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PACKAGE' and object_name = 'DUMMY_PACKAGE' and parse_time >= a_start_date; ut.expect(l_actual_cache_id).to_be_not_null; open l_actual for select annotation_position, annotation_name, annotation_text, subobject_name - from ut3.ut_annotation_cache where cache_id = l_actual_cache_id + from ut3_develop.ut_annotation_cache where cache_id = l_actual_cache_id order by annotation_position; ut.expect(l_actual).to_be_empty(); @@ -116,26 +116,26 @@ create or replace package body test_annotation_manager is procedure assert_dummy_test_package(a_start_time timestamp) is l_actual_cache_id integer; - l_data ut3.ut_annotated_objects; + l_data ut3_develop.ut_annotated_objects; l_result sys_refcursor; l_actual sys_refcursor; l_expected sys_refcursor; begin open l_expected for select - ut3.ut_annotated_object( + ut3_develop.ut_annotated_object( sys_context('USERENV', 'CURRENT_USER'), 'DUMMY_TEST_PACKAGE', 'PACKAGE', a_start_time, - ut3.ut_annotations( - ut3.ut_annotation( 2, 'suite', 'dummy_test_suite', null ), - ut3.ut_annotation( 3, 'rollback', 'manual', null ), - ut3.ut_annotation( 7, 'test', 'dummy_test', 'some_dummy_test_procedure' ), - ut3.ut_annotation( 8, 'beforetest', 'some_procedure', 'some_dummy_test_procedure' ) + ut3_develop.ut_annotations( + ut3_develop.ut_annotation( 2, 'suite', 'dummy_test_suite', null ), + ut3_develop.ut_annotation( 3, 'rollback', 'manual', null ), + ut3_develop.ut_annotation( 7, 'test', 'dummy_test', 'some_dummy_test_procedure' ), + ut3_develop.ut_annotation( 8, 'beforetest', 'some_procedure', 'some_dummy_test_procedure' ) ) ) annotated_object from dual; - l_result := ut3.ut_annotation_manager.get_annotated_objects(sys_context('USERENV', 'CURRENT_USER'), 'PACKAGE', a_start_time); + l_result := ut3_develop.ut_annotation_manager.get_annotated_objects(sys_context('USERENV', 'CURRENT_USER'), 'PACKAGE', a_start_time); fetch l_result bulk collect into l_data; open l_actual for select value(x) as annotated_object from table(l_data) x where object_name = 'DUMMY_TEST_PACKAGE'; ut.expect(l_actual).to_equal(l_expected).exclude('ANNOTATED_OBJECT/PARSE_TIME').join_by('ANNOTATED_OBJECT/OBJECT_NAME'); @@ -153,7 +153,7 @@ create or replace package body test_annotation_manager is --Assert select max(cache_id) into l_actual_cache_id - from ut3.ut_annotation_cache_info + from ut3_develop.ut_annotation_cache_info where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PACKAGE' and object_name = 'DUMMY_TEST_PACKAGE'; ut.expect(l_actual_cache_id).to_be_null; @@ -185,7 +185,7 @@ create or replace package body test_annotation_manager is --Act annotation_cache_helper.enable_ddl_trigger(); l_start_date := sysdate; - ut3.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); + ut3_develop.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); --Assert assert_dummy_test_package(l_start_date); assert_dummy_package(l_start_date); @@ -197,7 +197,7 @@ create or replace package body test_annotation_manager is --Arrange open l_actual for select * - from ut3.ut_annotation_cache_info + from ut3_develop.ut_annotation_cache_info where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PACKAGE' and object_name = 'DUMMY_PACKAGE'; ut.expect(l_actual).to_be_empty(); @@ -207,7 +207,7 @@ create or replace package body test_annotation_manager is --Assert open l_actual for select * - from ut3.ut_annotation_cache_info + from ut3_develop.ut_annotation_cache_info where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PACKAGE' and object_name = 'DUMMY_PACKAGE'; ut.expect(l_actual).to_be_empty(); @@ -233,7 +233,7 @@ create or replace package body test_annotation_manager is --Assert open l_actual for select * - from ut3.ut_annotation_cache_info + from ut3_develop.ut_annotation_cache_info where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PACKAGE' and object_name = 'DUMMY_TEST_PACKAGE'; @@ -247,7 +247,7 @@ create or replace package body test_annotation_manager is --Arrange create_dummy_test_package(); l_start_date := sysdate; - ut3.ut_annotation_manager.purge_cache(sys_context('USERENV', 'CURRENT_USER'), 'PACKAGE'); + ut3_develop.ut_annotation_manager.purge_cache(sys_context('USERENV', 'CURRENT_USER'), 'PACKAGE'); --Act & Assert assert_dummy_test_package(l_start_date); end; @@ -273,7 +273,7 @@ create or replace package body test_annotation_manager is --Assert ut.expect( - ut3.ut_annotation_manager.get_annotated_objects( + ut3_develop.ut_annotation_manager.get_annotated_objects( sys_context( 'USERENV', 'CURRENT_USER' ), 'PACKAGE', l_start_time ), 'Annotations are empty after package was dropped' @@ -287,7 +287,7 @@ create or replace package body test_annotation_manager is create_dummy_package(); --Act & Assert ut.expect( - ut3.ut_annotation_manager.get_annotated_objects( + ut3_develop.ut_annotation_manager.get_annotated_objects( sys_context( 'USERENV', 'CURRENT_USER' ), 'PACKAGE', l_start_time ), 'Annotations are empty for not annotated package' @@ -300,7 +300,7 @@ create or replace package body test_annotation_manager is --Arrange create_dummy_package(); ut.expect( - ut3.ut_annotation_manager.get_annotated_objects( + ut3_develop.ut_annotation_manager.get_annotated_objects( sys_context( 'USERENV', 'CURRENT_USER' ), 'PACKAGE', l_start_time ), 'Annotations are empty for non annotated package' @@ -311,7 +311,7 @@ create or replace package body test_annotation_manager is --Assert ut.expect( - ut3.ut_annotation_manager.get_annotated_objects( + ut3_develop.ut_annotation_manager.get_annotated_objects( sys_context( 'USERENV', 'CURRENT_USER' ), 'PACKAGE', l_start_time ), 'Annotations are empty after non annoteted package was dropped' @@ -332,7 +332,7 @@ create or replace package body test_annotation_manager is --Assert ut.expect( - ut3.ut_annotation_manager.get_annotated_objects( + ut3_develop.ut_annotation_manager.get_annotated_objects( sys_context( 'USERENV', 'CURRENT_USER' ), 'PACKAGE', l_start_time ) ).to_be_empty(); @@ -346,7 +346,7 @@ create or replace package body test_annotation_manager is procedure some_dummy_test_procedure; end;]'); ut.expect( - ut3.ut_annotation_manager.get_annotated_objects( + ut3_develop.ut_annotation_manager.get_annotated_objects( sys_context( 'USERENV', 'CURRENT_USER' ), 'PACKAGE', l_start_time ) ).to_be_empty(); @@ -365,15 +365,15 @@ create or replace package body test_annotation_manager is l_start_date date; begin --Arrange - ut3.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); + ut3_develop.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); l_start_date := sysdate; modify_dummy_test_package(); --Act - ut3.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); + ut3_develop.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); --Assert select max(cache_id) into l_actual_cache_id - from ut3.ut_annotation_cache_info + from ut3_develop.ut_annotation_cache_info where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PACKAGE' and object_name = 'DUMMY_TEST_PACKAGE' and parse_time >= l_start_date; @@ -381,7 +381,7 @@ create or replace package body test_annotation_manager is open l_actual for select annotation_position, annotation_name, annotation_text, subobject_name - from ut3.ut_annotation_cache where cache_id = l_actual_cache_id + from ut3_develop.ut_annotation_cache where cache_id = l_actual_cache_id order by annotation_position; open l_expected for @@ -407,7 +407,7 @@ create or replace package body test_annotation_manager is --Assert select count(1) into l_cache_count - from ut3.ut_annotation_cache_info + from ut3_develop.ut_annotation_cache_info where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PACKAGE' and object_name = 'DUMMY_TEST_PACKAGE' @@ -417,14 +417,14 @@ create or replace package body test_annotation_manager is procedure no_data_for_dropped_object is l_result sys_refcursor; - l_data ut3.ut_annotated_objects; + l_data ut3_develop.ut_annotated_objects; l_actual sys_refcursor; l_start_time timestamp := systimestamp; begin --Arrange drop_dummy_test_package(); --Act - l_result := ut3.ut_annotation_manager.get_annotated_objects( sys_context('USERENV', 'CURRENT_USER'),'PACKAGE', l_start_time ); + l_result := ut3_develop.ut_annotation_manager.get_annotated_objects( sys_context('USERENV', 'CURRENT_USER'),'PACKAGE', l_start_time ); fetch l_result bulk collect into l_data; open l_actual for select object_name from table(l_data) where object_name = 'DUMMY_TEST_PACKAGE'; --Assert @@ -435,14 +435,14 @@ create or replace package body test_annotation_manager is l_cache_count integer; begin --Arrange - ut3.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); + ut3_develop.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); drop_dummy_test_package(); --Act - ut3.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); + ut3_develop.ut_annotation_manager.rebuild_annotation_cache(sys_context('USERENV', 'CURRENT_USER'),'PACKAGE'); --Assert select count(1) into l_cache_count - from ut3.ut_annotation_cache_info + from ut3_develop.ut_annotation_cache_info where object_owner = sys_context('USERENV', 'CURRENT_USER') and object_type = 'PACKAGE' and object_name = 'DUMMY_TEST_PACKAGE'; @@ -457,7 +457,7 @@ create or replace package body test_annotation_manager is --Arrange create_dummy_test_package(); l_start_date := sysdate; - ut3.ut_annotation_manager.purge_cache(sys_context('USERENV', 'CURRENT_USER'), 'PACKAGE'); + ut3_develop.ut_annotation_manager.purge_cache(sys_context('USERENV', 'CURRENT_USER'), 'PACKAGE'); --Act & Assert assert_dummy_test_package(l_start_date); end; diff --git a/test/ut3_tester/core/annotations/test_annotation_parser.pkb b/test/ut3_tester/core/annotations/test_annotation_parser.pkb index c4c90c046..bc789c377 100644 --- a/test/ut3_tester/core/annotations/test_annotation_parser.pkb +++ b/test/ut3_tester/core/annotations/test_annotation_parser.pkb @@ -2,8 +2,8 @@ create or replace package body test_annotation_parser is procedure test_proc_comments is l_source clob; - l_actual ut3.ut_annotations; - l_expected ut3.ut_annotations; + l_actual ut3_develop.ut_annotations; + l_expected ut3_develop.ut_annotations; begin l_source := 'PACKAGE test_tt AS @@ -18,16 +18,16 @@ create or replace package body test_annotation_parser is END;'; --Act - l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); + l_actual := ut3_develop.ut_annotation_parser.parse_object_annotations(l_source); --Assert - l_expected := ut3.ut_annotations( - ut3.ut_annotation(2,'suite',null, null), - ut3.ut_annotation(3,'displayname','Name of suite',null), - ut3.ut_annotation(4,'suitepath','all.globaltests',null), - ut3.ut_annotation(6,'ann1','Name of suite',null), - ut3.ut_annotation(8,'ann2','some_value','foo') + l_expected := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(2,'suite',null, null), + ut3_develop.ut_annotation(3,'displayname','Name of suite',null), + ut3_develop.ut_annotation(4,'suitepath','all.globaltests',null), + ut3_develop.ut_annotation(6,'ann1','Name of suite',null), + ut3_develop.ut_annotation(8,'ann2','some_value','foo') ); ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); @@ -35,8 +35,8 @@ create or replace package body test_annotation_parser is procedure include_floating_annotations is l_source clob; - l_actual ut3.ut_annotations; - l_expected ut3.ut_annotations; + l_actual ut3_develop.ut_annotations; + l_expected ut3_develop.ut_annotations; begin l_source := 'PACKAGE test_tt AS -- %suite @@ -57,19 +57,19 @@ create or replace package body test_annotation_parser is END;'; --Act - l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); + l_actual := ut3_develop.ut_annotation_parser.parse_object_annotations(l_source); --Assert - l_expected := ut3.ut_annotations( - ut3.ut_annotation( 2, 'suite', null, null ), - ut3.ut_annotation( 3, 'displayname', 'Name of suite', null ), - ut3.ut_annotation( 4, 'suitepath', 'all.globaltests', null ), - ut3.ut_annotation( 6, 'ann1', 'Name of suite', null ), - ut3.ut_annotation( 7, 'ann2', 'all.globaltests', null ), - ut3.ut_annotation( 9, 'test', null, 'foo'), - ut3.ut_annotation( 12, 'ann3', 'Name of suite', null ), - ut3.ut_annotation( 13, 'ann4', 'all.globaltests', null ), - ut3.ut_annotation( 15, 'test', null, 'bar') + l_expected := ut3_develop.ut_annotations( + ut3_develop.ut_annotation( 2, 'suite', null, null ), + ut3_develop.ut_annotation( 3, 'displayname', 'Name of suite', null ), + ut3_develop.ut_annotation( 4, 'suitepath', 'all.globaltests', null ), + ut3_develop.ut_annotation( 6, 'ann1', 'Name of suite', null ), + ut3_develop.ut_annotation( 7, 'ann2', 'all.globaltests', null ), + ut3_develop.ut_annotation( 9, 'test', null, 'foo'), + ut3_develop.ut_annotation( 12, 'ann3', 'Name of suite', null ), + ut3_develop.ut_annotation( 13, 'ann4', 'all.globaltests', null ), + ut3_develop.ut_annotation( 15, 'test', null, 'bar') ); ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); @@ -78,8 +78,8 @@ create or replace package body test_annotation_parser is procedure parse_complex_with_functions is l_source clob; - l_actual ut3.ut_annotations; - l_expected ut3.ut_annotations; + l_actual ut3_develop.ut_annotations; + l_expected ut3_develop.ut_annotations; begin l_source := 'PACKAGE test_tt AS @@ -110,17 +110,17 @@ create or replace package body test_annotation_parser is END;'; --Act - l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); + l_actual := ut3_develop.ut_annotation_parser.parse_object_annotations(l_source); --Assert - l_expected := ut3.ut_annotations( - ut3.ut_annotation( 2, 'suite', null, null ), - ut3.ut_annotation( 3, 'displayname', 'Name of suite', null ), - ut3.ut_annotation( 4, 'suitepath', 'all.globaltests', null ), - ut3.ut_annotation( 6, 'test', null, 'foo' ), - ut3.ut_annotation( 10, 'beforeeach', null,'foo2' ), - ut3.ut_annotation( 20, 'beforeeach', 'key=testval','foo3' ), - ut3.ut_annotation( 23, 'all', null,'foo4' ) + l_expected := ut3_develop.ut_annotations( + ut3_develop.ut_annotation( 2, 'suite', null, null ), + ut3_develop.ut_annotation( 3, 'displayname', 'Name of suite', null ), + ut3_develop.ut_annotation( 4, 'suitepath', 'all.globaltests', null ), + ut3_develop.ut_annotation( 6, 'test', null, 'foo' ), + ut3_develop.ut_annotation( 10, 'beforeeach', null,'foo2' ), + ut3_develop.ut_annotation( 20, 'beforeeach', 'key=testval','foo3' ), + ut3_develop.ut_annotation( 23, 'all', null,'foo4' ) ); ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); @@ -129,8 +129,8 @@ create or replace package body test_annotation_parser is procedure no_procedure_annotation is l_source clob; - l_actual ut3.ut_annotations; - l_expected ut3.ut_annotations; + l_actual ut3_develop.ut_annotations; + l_expected ut3_develop.ut_annotations; begin l_source := 'PACKAGE test_tt AS @@ -142,13 +142,13 @@ create or replace package body test_annotation_parser is END;'; --Act - l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); + l_actual := ut3_develop.ut_annotation_parser.parse_object_annotations(l_source); --Assert - l_expected := ut3.ut_annotations( - ut3.ut_annotation( 2, 'suite', null, null ), - ut3.ut_annotation( 3, 'displayname', 'Name of suite', null ), - ut3.ut_annotation( 4, 'suitepath', 'all.globaltests', null ) + l_expected := ut3_develop.ut_annotations( + ut3_develop.ut_annotation( 2, 'suite', null, null ), + ut3_develop.ut_annotation( 3, 'displayname', 'Name of suite', null ), + ut3_develop.ut_annotation( 4, 'suitepath', 'all.globaltests', null ) ); ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); @@ -157,8 +157,8 @@ create or replace package body test_annotation_parser is procedure parse_accessible_by is l_source clob; - l_actual ut3.ut_annotations; - l_expected ut3.ut_annotations; + l_actual ut3_develop.ut_annotations; + l_expected ut3_develop.ut_annotations; begin l_source := 'PACKAGE test_tt accessible by (foo) AS @@ -170,13 +170,13 @@ create or replace package body test_annotation_parser is END;'; --Act - l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); + l_actual := ut3_develop.ut_annotation_parser.parse_object_annotations(l_source); --Assert - l_expected := ut3.ut_annotations( - ut3.ut_annotation( 2, 'suite', null, null ), - ut3.ut_annotation( 3, 'displayname', 'Name of suite', null ), - ut3.ut_annotation( 4, 'suitepath', 'all.globaltests', null ) + l_expected := ut3_develop.ut_annotations( + ut3_develop.ut_annotation( 2, 'suite', null, null ), + ut3_develop.ut_annotation( 3, 'displayname', 'Name of suite', null ), + ut3_develop.ut_annotation( 4, 'suitepath', 'all.globaltests', null ) ); ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); @@ -185,8 +185,8 @@ create or replace package body test_annotation_parser is procedure complex_package_declaration is l_source clob; - l_actual ut3.ut_annotations; - l_expected ut3.ut_annotations; + l_actual ut3_develop.ut_annotations; + l_expected ut3_develop.ut_annotations; begin l_source := 'PACKAGE test_tt @@ -201,13 +201,13 @@ create or replace package body test_annotation_parser is END;'; --Act - l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); + l_actual := ut3_develop.ut_annotation_parser.parse_object_annotations(l_source); --Assert - l_expected := ut3.ut_annotations( - ut3.ut_annotation( 5, 'suite', null, null ), - ut3.ut_annotation( 6, 'displayname', 'Name of suite', null ), - ut3.ut_annotation( 7, 'suitepath', 'all.globaltests', null ) + l_expected := ut3_develop.ut_annotations( + ut3_develop.ut_annotation( 5, 'suite', null, null ), + ut3_develop.ut_annotation( 6, 'displayname', 'Name of suite', null ), + ut3_develop.ut_annotation( 7, 'suitepath', 'all.globaltests', null ) ); ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); @@ -216,8 +216,8 @@ create or replace package body test_annotation_parser is procedure complex_text is l_source clob; - l_actual ut3.ut_annotations; - l_expected ut3.ut_annotations; + l_actual ut3_develop.ut_annotations; + l_expected ut3_develop.ut_annotations; begin l_source := 'PACKAGE test_tt AS @@ -229,13 +229,13 @@ create or replace package body test_annotation_parser is END;'; --Act - l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); + l_actual := ut3_develop.ut_annotation_parser.parse_object_annotations(l_source); --Assert - l_expected := ut3.ut_annotations( - ut3.ut_annotation( 2, 'suite', null, null ), - ut3.ut_annotation( 3, 'displayname', 'name = Name of suite', null ), - ut3.ut_annotation( 4, 'suitepath', 'key=all.globaltests,key2=foo,"--%some text"', null ) + l_expected := ut3_develop.ut_annotations( + ut3_develop.ut_annotation( 2, 'suite', null, null ), + ut3_develop.ut_annotation( 3, 'displayname', 'name = Name of suite', null ), + ut3_develop.ut_annotation( 4, 'suitepath', 'key=all.globaltests,key2=foo,"--%some text"', null ) ); ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); @@ -244,8 +244,8 @@ create or replace package body test_annotation_parser is procedure ignore_annotations_in_comments is l_source clob; - l_actual ut3.ut_annotations; - l_expected ut3.ut_annotations; + l_actual ut3_develop.ut_annotations; + l_expected ut3_develop.ut_annotations; begin l_source := 'PACKAGE test_tt AS @@ -262,13 +262,13 @@ create or replace package body test_annotation_parser is END;'; --Act - l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); + l_actual := ut3_develop.ut_annotation_parser.parse_object_annotations(l_source); --Assert - l_expected := ut3.ut_annotations( - ut3.ut_annotation( 7, 'suite', null, null ), - ut3.ut_annotation( 8, 'displayname', 'Name of suite', null ), - ut3.ut_annotation( 9, 'suitepath', 'all.globaltests', null ) + l_expected := ut3_develop.ut_annotations( + ut3_develop.ut_annotation( 7, 'suite', null, null ), + ut3_develop.ut_annotation( 8, 'displayname', 'Name of suite', null ), + ut3_develop.ut_annotation( 9, 'suitepath', 'all.globaltests', null ) ); ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); @@ -277,7 +277,7 @@ create or replace package body test_annotation_parser is procedure ignore_wrapped_package is l_source dbms_preprocessor.source_lines_t; - l_actual ut3.ut_annotations; + l_actual ut3_develop.ut_annotations; begin --Arrange l_source(1) := 'create or replace PACKAGE tst_wrapped_pck wrapped @@ -305,7 +305,7 @@ v58yvbLAXLi9gYHwoIvAgccti+Cmpg0DKLY= -- %some_annotation_like_text '; --Act - l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source,'PACKAGE'); + l_actual := ut3_develop.ut_annotation_parser.parse_object_annotations(l_source,'PACKAGE'); --Assert ut.expect(anydata.convertCollection(l_actual)).to_be_empty(); end; @@ -313,19 +313,19 @@ v58yvbLAXLi9gYHwoIvAgccti+Cmpg0DKLY= procedure brackets_in_desc is l_source clob; - l_actual ut3.ut_annotations; - l_expected ut3.ut_annotations; + l_actual ut3_develop.ut_annotations; + l_expected ut3_develop.ut_annotations; begin l_source := 'PACKAGE test_tt AS -- %suite(Name of suite (including some brackets) and some more text) END;'; --Act - l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); + l_actual := ut3_develop.ut_annotation_parser.parse_object_annotations(l_source); --Assert - l_expected := ut3.ut_annotations( - ut3.ut_annotation( 2, 'suite', 'Name of suite (including some brackets) and some more text', null ) + l_expected := ut3_develop.ut_annotations( + ut3_develop.ut_annotation( 2, 'suite', 'Name of suite (including some brackets) and some more text', null ) ); ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); @@ -333,8 +333,8 @@ END;'; procedure test_space_before_annot_params is l_source clob; - l_actual ut3.ut_annotations; - l_expected ut3.ut_annotations; + l_actual ut3_develop.ut_annotations; + l_expected ut3_develop.ut_annotations; begin l_source := 'PACKAGE test_tt AS @@ -349,12 +349,12 @@ END;'; END;'; --Act - l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); + l_actual := ut3_develop.ut_annotation_parser.parse_object_annotations(l_source); --Assert - l_expected := ut3.ut_annotations( - ut3.ut_annotation( 6, 'suite', null, null ), - ut3.ut_annotation( 7, 'suitepath', 'all.globaltests', null ) + l_expected := ut3_develop.ut_annotations( + ut3_develop.ut_annotation( 6, 'suite', null, null ), + ut3_develop.ut_annotation( 7, 'suitepath', 'all.globaltests', null ) ); ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); @@ -363,8 +363,8 @@ END;'; procedure test_windows_newline as l_source clob; - l_actual ut3.ut_annotations; - l_expected ut3.ut_annotations; + l_actual ut3_develop.ut_annotations; + l_expected ut3_develop.ut_annotations; begin l_source := 'PACKAGE test_tt AS -- %suite @@ -373,13 +373,13 @@ END;'; END;'; --Act - l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); + l_actual := ut3_develop.ut_annotation_parser.parse_object_annotations(l_source); --Assert - l_expected := ut3.ut_annotations( - ut3.ut_annotation( 2, 'suite', null, null ), - ut3.ut_annotation( 3, 'displayname', 'Name of suite', null ), - ut3.ut_annotation( 4, 'suitepath', 'all.globaltests', null ) + l_expected := ut3_develop.ut_annotations( + ut3_develop.ut_annotation( 2, 'suite', null, null ), + ut3_develop.ut_annotation( 3, 'displayname', 'Name of suite', null ), + ut3_develop.ut_annotation( 4, 'suitepath', 'all.globaltests', null ) ); ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); @@ -388,8 +388,8 @@ END;'; procedure test_annot_very_long_name as l_source clob; - l_actual ut3.ut_annotations; - l_expected ut3.ut_annotations; + l_actual ut3_develop.ut_annotations; + l_expected ut3_develop.ut_annotations; begin l_source := 'PACKAGE very_long_procedure_name_valid_for_oracle_12_so_utPLSQL_should_allow_it_definitely_well_still_not_reached_128_but_wait_we_did_it AS -- %suite @@ -401,14 +401,14 @@ END;'; END;'; --Act - l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); + l_actual := ut3_develop.ut_annotation_parser.parse_object_annotations(l_source); --Assert - l_expected := ut3.ut_annotations( - ut3.ut_annotation( 2, 'suite', null, null ), - ut3.ut_annotation( 3, 'displayname', 'Name of suite', null ), - ut3.ut_annotation( 4, 'suitepath', 'all.globaltests', null ), - ut3.ut_annotation( 6, 'test', null, 'very_long_procedure_name_valid_for_oracle_12_so_utPLSQL_should_allow_it_definitely_well_still_not_reached_128_but_wait_we_dit_it' ) + l_expected := ut3_develop.ut_annotations( + ut3_develop.ut_annotation( 2, 'suite', null, null ), + ut3_develop.ut_annotation( 3, 'displayname', 'Name of suite', null ), + ut3_develop.ut_annotation( 4, 'suitepath', 'all.globaltests', null ), + ut3_develop.ut_annotation( 6, 'test', null, 'very_long_procedure_name_valid_for_oracle_12_so_utPLSQL_should_allow_it_definitely_well_still_not_reached_128_but_wait_we_dit_it' ) ); ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); @@ -416,8 +416,8 @@ END;'; procedure test_upper_annot is l_source clob; - l_actual ut3.ut_annotations; - l_expected ut3.ut_annotations; + l_actual ut3_develop.ut_annotations; + l_expected ut3_develop.ut_annotations; begin l_source := 'PACKAGE test_tt AS -- %SUITE @@ -438,19 +438,19 @@ END;'; END;'; --Act - l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source); + l_actual := ut3_develop.ut_annotation_parser.parse_object_annotations(l_source); --Assert - l_expected := ut3.ut_annotations( - ut3.ut_annotation( 2, 'suite', null, null ), - ut3.ut_annotation( 3, 'displayname', 'Name of suite', null ), - ut3.ut_annotation( 4, 'suitepath', 'all.globaltests', null ), - ut3.ut_annotation( 6, 'ann1', 'Name of suite', null ), - ut3.ut_annotation( 7, 'ann2', 'all.globaltests', null ), - ut3.ut_annotation( 9, 'test', null, 'foo'), - ut3.ut_annotation( 12, 'ann3', 'Name of suite', null ), - ut3.ut_annotation( 13, 'ann4', 'all.globaltests', null ), - ut3.ut_annotation( 15, 'test', null, 'bar') + l_expected := ut3_develop.ut_annotations( + ut3_develop.ut_annotation( 2, 'suite', null, null ), + ut3_develop.ut_annotation( 3, 'displayname', 'Name of suite', null ), + ut3_develop.ut_annotation( 4, 'suitepath', 'all.globaltests', null ), + ut3_develop.ut_annotation( 6, 'ann1', 'Name of suite', null ), + ut3_develop.ut_annotation( 7, 'ann2', 'all.globaltests', null ), + ut3_develop.ut_annotation( 9, 'test', null, 'foo'), + ut3_develop.ut_annotation( 12, 'ann3', 'Name of suite', null ), + ut3_develop.ut_annotation( 13, 'ann4', 'all.globaltests', null ), + ut3_develop.ut_annotation( 15, 'test', null, 'bar') ); ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); diff --git a/test/ut3_tester/core/annotations/test_before_after_annotations.pkb b/test/ut3_tester/core/annotations/test_before_after_annotations.pkb index e2f34e847..75bbadcc0 100644 --- a/test/ut3_tester/core/annotations/test_before_after_annotations.pkb +++ b/test/ut3_tester/core/annotations/test_before_after_annotations.pkb @@ -28,7 +28,7 @@ create or replace package body test_before_after_annotations is l_dummy_utility_pkg_body varchar2(32737); l_test_package_spec varchar2(32737); l_test_package_body varchar2(32737); - l_test_results ut3.ut_varchar2_list; + l_test_results ut3_develop.ut_varchar2_list; begin l_dummy_utility_pkg_spec := q'[ @@ -200,7 +200,7 @@ create or replace package body test_before_after_annotations is execute immediate l_test_package_body; --Execute the tests and collect the results - select * bulk collect into l_test_results from table(ut3.ut.run(('ut3_tester.dummy_before_after_test'))); + select * bulk collect into l_test_results from table(ut3_develop.ut.run(('ut3_tester.dummy_before_after_test'))); execute immediate 'drop package dummy_before_after_test'; execute immediate 'drop package shared_test_package'; diff --git a/test/ut3_tester/core/expectations/test_expectation_processor.pkb b/test/ut3_tester/core/expectations/test_expectation_processor.pkb index c061e55d4..63ce3c791 100644 --- a/test/ut3_tester/core/expectations/test_expectation_processor.pkb +++ b/test/ut3_tester/core/expectations/test_expectation_processor.pkb @@ -33,7 +33,7 @@ cba24bfad0 75 SCH_TEST.UT_LOGICAL_SUITE 20be951ab0 320 package body SCH_TEST.UT ]'; ut.expect( - ut3.ut_expectation_processor.who_called_expectation(l_stack_trace) + ut3_develop.ut_expectation_processor.who_called_expectation(l_stack_trace) ).to_equal('at "'||gc_user||'.TEST_EXPECTATION_PROCESSOR", line 7 l_source_line varchar2(4000); at "'||gc_user||'.TEST_EXPECTATION_PROCESSOR", line 12 at "'||gc_user||'.TEST_EXPECTATION_PROCESSOR", line 24'); @@ -47,24 +47,24 @@ at "'||gc_user||'.TEST_EXPECTATION_PROCESSOR", line 24'); l_stack_trace := q'[----- PL/SQL Call Stack ----- object line object handle number name -0x80e701d8 26 UT3.UT_EXPECTATION_RESULT -0x85e10150 112 UT3.UT_EXPECTATION -0x8b54bad8 21 UT3.UT_EXPECTATION_NUMBER -0x85cfd238 20 package body UT3.UT_EXAMPLETEST +0x80e701d8 26 UT3_DEVELOP.UT_EXPECTATION_RESULT +0x85e10150 112 UT3_DEVELOP.UT_EXPECTATION +0x8b54bad8 21 UT3_DEVELOP.UT_EXPECTATION_NUMBER +0x85cfd238 20 package body UT3_DEVELOP.UT_EXAMPLETEST 0x85def380 6 anonymous block 0x85e93750 1825 package body SYS.DBMS_SQL -0x80f4f608 129 UT3.UT_EXECUTABLE -0x80f4f608 65 UT3.UT_EXECUTABLE -0x8a116010 76 UT3.UT_TEST -0x8a3348a0 48 UT3.UT_SUITE_ITEM -0x887e9948 67 UT3.UT_LOGICAL_SUITE -0x8a26de20 59 UT3.UT_RUN -0x8a3348a0 48 UT3.UT_SUITE_ITEM +0x80f4f608 129 UT3_DEVELOP.UT_EXECUTABLE +0x80f4f608 65 UT3_DEVELOP.UT_EXECUTABLE +0x8a116010 76 UT3_DEVELOP.UT_TEST +0x8a3348a0 48 UT3_DEVELOP.UT_SUITE_ITEM +0x887e9948 67 UT3_DEVELOP.UT_LOGICAL_SUITE +0x8a26de20 59 UT3_DEVELOP.UT_RUN +0x8a3348a0 48 UT3_DEVELOP.UT_SUITE_ITEM 0x838d17c0 28 anonymous block ]'; ut.expect( - ut3.ut_expectation_processor.who_called_expectation(l_stack_trace) - ).to_be_like('at "UT3.UT_EXAMPLETEST", line 20 %'); + ut3_develop.ut_expectation_processor.who_called_expectation(l_stack_trace) + ).to_be_like('at "UT3_DEVELOP.UT_EXAMPLETEST", line 20 %'); end; procedure who_call_expectation_win_stack is @@ -82,22 +82,22 @@ handle number name 00007FF81FF207B0 345 type body SCOTT.TEST_BETWNSTR.BASIC_USAGE_TYP 00007FF8544B21B8 6 anonymous block 00007FF8267FBFC8 1721 package body SYS.DBMS_SQL.EXECUTE -00007FF852BCFC68 142 type body UT3.UT_EXECUTABLE.DO_EXECUTE -00007FF852BCFC68 44 type body UT3.UT_EXECUTABLE.DO_EXECUTE -00007FF8512F9A90 74 type body UT3.UT_EXECUTABLE_TEST.DO_EXECUTE -00007FF8512F9A90 38 type body UT3.UT_EXECUTABLE_TEST.DO_EXECUTE -00007FF8231A2088 79 type body UT3.UT_TEST.DO_EXECUTE -00007FF81FF207B0 49 type body UT3.UT_SUITE_ITEM.DO_EXECUTE -00007FF852C83270 66 type body UT3.UT_SUITE.DO_EXECUTE -00007FF82165F3B0 67 type body UT3.UT_RUN.DO_EXECUTE -00007FF81FF207B0 49 type body UT3.UT_SUITE_ITEM.DO_EXECUTE -00007FF8266285C0 172 package body UT3.UT_RUNNER.RUN -00007FF854710538 134 package body UT3.UT.RUN_AUTONOMOUS -00007FF854710538 488 package body UT3.UT.RUN -00007FF854710538 623 package body UT3.UT.RUN +00007FF852BCFC68 142 type body UT3_DEVELOP.UT_EXECUTABLE.DO_EXECUTE +00007FF852BCFC68 44 type body UT3_DEVELOP.UT_EXECUTABLE.DO_EXECUTE +00007FF8512F9A90 74 type body UT3_DEVELOP.UT_EXECUTABLE_TEST.DO_EXECUTE +00007FF8512F9A90 38 type body UT3_DEVELOP.UT_EXECUTABLE_TEST.DO_EXECUTE +00007FF8231A2088 79 type body UT3_DEVELOP.UT_TEST.DO_EXECUTE +00007FF81FF207B0 49 type body UT3_DEVELOP.UT_SUITE_ITEM.DO_EXECUTE +00007FF852C83270 66 type body UT3_DEVELOP.UT_SUITE.DO_EXECUTE +00007FF82165F3B0 67 type body UT3_DEVELOP.UT_RUN.DO_EXECUTE +00007FF81FF207B0 49 type body UT3_DEVELOP.UT_SUITE_ITEM.DO_EXECUTE +00007FF8266285C0 172 package body UT3_DEVELOP.UT_RUNNER.RUN +00007FF854710538 134 package body UT3_DEVELOP.UT.RUN_AUTONOMOUS +00007FF854710538 488 package body UT3_DEVELOP.UT.RUN +00007FF854710538 623 package body UT3_DEVELOP.UT.RUN 00007FF81CFFA388 1 anonymous block]'; ut.expect( - ut3.ut_expectation_processor.who_called_expectation(l_stack_trace) + ut3_develop.ut_expectation_processor.who_called_expectation(l_stack_trace) ).to_be_like('at "SCOTT.TEST_BETWNSTR.BASIC_USAGE", line 7 %'); end; diff --git a/test/ut3_tester/core/test_file_mapper.pkb b/test/ut3_tester/core/test_file_mapper.pkb index 3813c9450..fccc487bd 100644 --- a/test/ut3_tester/core/test_file_mapper.pkb +++ b/test/ut3_tester/core/test_file_mapper.pkb @@ -1,17 +1,17 @@ create or replace package body test_file_mapper is procedure default_mappings is - l_actual ut3.ut_file_mappings; - l_expected ut3.ut_file_mappings; + l_actual ut3_develop.ut_file_mappings; + l_expected ut3_develop.ut_file_mappings; begin --Arrange - l_expected := ut3.ut_file_mappings( - ut3.ut_file_mapping('C:\tests\helpers\core.pkb',sys_context('USERENV', 'CURRENT_USER'),'CORE','PACKAGE BODY'), - ut3.ut_file_mapping('tests/helpers/test_file_mapper.pkb',sys_context('USERENV', 'CURRENT_USER'),'TEST_FILE_MAPPER','PACKAGE BODY') + l_expected := ut3_develop.ut_file_mappings( + ut3_develop.ut_file_mapping('C:\tests\helpers\core.pkb',sys_context('USERENV', 'CURRENT_USER'),'CORE','PACKAGE BODY'), + ut3_develop.ut_file_mapping('tests/helpers/test_file_mapper.pkb',sys_context('USERENV', 'CURRENT_USER'),'TEST_FILE_MAPPER','PACKAGE BODY') ); --Act - l_actual := ut3.ut_file_mapper.build_file_mappings( - ut3.ut_varchar2_list( + l_actual := ut3_develop.ut_file_mapper.build_file_mappings( + ut3_develop.ut_varchar2_list( 'C:\tests\helpers\core.pkb', 'tests/helpers/test_file_mapper.pkb' ) @@ -21,18 +21,18 @@ create or replace package body test_file_mapper is end; procedure specific_owner is - l_actual ut3.ut_file_mappings; - l_expected ut3.ut_file_mappings; + l_actual ut3_develop.ut_file_mappings; + l_expected ut3_develop.ut_file_mappings; begin --Arrange - l_expected := ut3.ut_file_mappings( - ut3.ut_file_mapping('C:\source\core\types\ut_file_mapping.tpb','UT3','UT_FILE_MAPPING','TYPE BODY'), - ut3.ut_file_mapping('source/core/ut_file_mapper.pkb','UT3','UT_FILE_MAPPER','PACKAGE BODY') + l_expected := ut3_develop.ut_file_mappings( + ut3_develop.ut_file_mapping('C:\source\core\types\ut_file_mapping.tpb','UT3_DEVELOP','UT_FILE_MAPPING','TYPE BODY'), + ut3_develop.ut_file_mapping('source/core/ut_file_mapper.pkb','UT3_DEVELOP','UT_FILE_MAPPER','PACKAGE BODY') ); --Act - l_actual := ut3.ut_file_mapper.build_file_mappings( - 'UT3', - ut3.ut_varchar2_list( + l_actual := ut3_develop.ut_file_mapper.build_file_mappings( + 'UT3_DEVELOP', + ut3_develop.ut_varchar2_list( 'C:\source\core\types\ut_file_mapping.tpb', 'source/core/ut_file_mapper.pkb' ) diff --git a/test/ut3_tester/core/test_output_buffer.pkb b/test/ut3_tester/core/test_output_buffer.pkb index 7aab6f389..a552cc567 100644 --- a/test/ut3_tester/core/test_output_buffer.pkb +++ b/test/ut3_tester/core/test_output_buffer.pkb @@ -6,10 +6,10 @@ create or replace package body test_output_buffer is l_remaining integer; l_expected_text clob; l_expected_item_type varchar2(1000); - l_buffer ut3.ut_output_buffer_base; + l_buffer ut3_develop.ut_output_buffer_base; begin --Arrange - l_buffer := ut3.ut_output_clob_table_buffer(); + l_buffer := ut3_develop.ut_output_clob_table_buffer(); l_expected_text := to_clob(lpad('a text', 31000, ',a text')) || chr(10) || to_clob(lpad('a text', 31000, ',a text')) || chr(13) || to_clob(lpad('a text', 31000, ',a text')) @@ -36,7 +36,7 @@ create or replace package body test_output_buffer is procedure test_doesnt_send_on_null_text is l_cur sys_refcursor; l_result integer; - l_buffer ut3.ut_output_buffer_base := ut3.ut_output_table_buffer(); + l_buffer ut3_develop.ut_output_buffer_base := ut3_develop.ut_output_table_buffer(); begin ut3_tester_helper.run_helper.delete_buffer(); --Act @@ -50,14 +50,14 @@ create or replace package body test_output_buffer is procedure test_doesnt_send_on_null_elem is l_cur sys_refcursor; l_result integer; - l_buffer ut3.ut_output_buffer_base := ut3.ut_output_table_buffer(); + l_buffer ut3_develop.ut_output_buffer_base := ut3_develop.ut_output_table_buffer(); l_message_id varchar2(255); l_text varchar2(4000); begin ut3_tester_helper.run_helper.delete_buffer(); --Act - l_buffer.send_lines(ut3.ut_varchar2_rows(null)); - l_buffer.send_lines(ut3.ut_varchar2_rows('test')); + l_buffer.send_lines(ut3_develop.ut_varchar2_rows(null)); + l_buffer.send_lines(ut3_develop.ut_varchar2_rows('test')); select message_id, text into l_message_id, l_text from table(ut3_tester_helper.run_helper.ut_output_buffer_tmp); ut.expect(l_message_id).to_equal('1'); @@ -67,7 +67,7 @@ create or replace package body test_output_buffer is procedure test_send_line is l_result varchar2(4000); c_expected constant varchar2(4000) := lpad('a text',4000,',a text'); - l_buffer ut3.ut_output_buffer_base := ut3.ut_output_table_buffer(); + l_buffer ut3_develop.ut_output_buffer_base := ut3_develop.ut_output_table_buffer(); begin l_buffer.send_line(c_expected); @@ -80,7 +80,7 @@ create or replace package body test_output_buffer is l_result clob; l_remaining integer; l_expected clob; - l_buffer ut3.ut_output_buffer_base := ut3.ut_output_table_buffer(); + l_buffer ut3_develop.ut_output_buffer_base := ut3_develop.ut_output_table_buffer(); l_start timestamp; l_duration interval day to second; begin @@ -99,7 +99,7 @@ create or replace package body test_output_buffer is --Fetches data from output ut.expect(l_result).to_equal(l_expected); --Throws a timeout exception - ut.expect(dbms_utility.format_error_stack()).to_match('ORA'||ut3.ut_utils.gc_out_buffer_timeout); + ut.expect(dbms_utility.format_error_stack()).to_match('ORA'||ut3_develop.ut_utils.gc_out_buffer_timeout); --Waited for one second ut.expect(l_duration).to_be_greater_than(interval '0.99' second); end; @@ -110,10 +110,10 @@ create or replace package body test_output_buffer is end; - procedure test_purge(a_buffer ut3.ut_output_buffer_base ) is - l_stale_buffer ut3.ut_output_buffer_base := a_buffer; - l_fresh_buffer ut3.ut_output_buffer_base; - l_buffer ut3.ut_output_buffer_base; + procedure test_purge(a_buffer ut3_develop.ut_output_buffer_base ) is + l_stale_buffer ut3_develop.ut_output_buffer_base := a_buffer; + l_fresh_buffer ut3_develop.ut_output_buffer_base; + l_buffer ut3_develop.ut_output_buffer_base; begin --Arrange l_stale_buffer.start_date := sysdate - 2; @@ -122,12 +122,12 @@ create or replace package body test_output_buffer is l_stale_buffer.send_line('some text'); l_stale_buffer.close(); - l_fresh_buffer := ut3.ut_output_table_buffer(); + l_fresh_buffer := ut3_develop.ut_output_table_buffer(); l_fresh_buffer.send_line('some text'); l_fresh_buffer.close(); --Act - purge is performed on new buffer create - l_buffer := ut3.ut_output_table_buffer(); + l_buffer := ut3_develop.ut_output_table_buffer(); --Assert -- Data in "fresh" buffer remains @@ -138,12 +138,12 @@ create or replace package body test_output_buffer is procedure test_purge_text_buffer is begin - test_purge(ut3.ut_output_table_buffer()); + test_purge(ut3_develop.ut_output_table_buffer()); end; procedure test_purge_clob_buffer is begin - test_purge(ut3.ut_output_clob_table_buffer()); + test_purge(ut3_develop.ut_output_clob_table_buffer()); end; end test_output_buffer; diff --git a/test/ut3_tester/core/test_suite_builder.pkb b/test/ut3_tester/core/test_suite_builder.pkb index 8eedc1142..570d86a0d 100644 --- a/test/ut3_tester/core/test_suite_builder.pkb +++ b/test/ut3_tester/core/test_suite_builder.pkb @@ -1,29 +1,29 @@ create or replace package body test_suite_builder is function invoke_builder_for_annotations( - a_annotations ut3.ut_annotations, + a_annotations ut3_develop.ut_annotations, a_package_name varchar2 := 'TEST_SUITE_BUILDER_PACKAGE' ) return clob is - l_suites ut3.ut_suite_items; - l_suite ut3.ut_logical_suite; + l_suites ut3_develop.ut_suite_items; + l_suite ut3_develop.ut_logical_suite; l_cursor sys_refcursor; l_type_cursor sys_refcursor; l_ctx dbms_xmlgen.ctxhandle; l_xml xmltype; begin open l_cursor for select value(x) from table( - ut3.ut_annotated_objects( - ut3.ut_annotated_object('UT3_TESTER', a_package_name, 'PACKAGE', systimestamp, a_annotations) + ut3_develop.ut_annotated_objects( + ut3_develop.ut_annotated_object('UT3_TESTER', a_package_name, 'PACKAGE', systimestamp, a_annotations) ) ) x; - l_suites := ut3.ut_suite_manager.build_suites_from_annotations( + l_suites := ut3_develop.ut_suite_manager.build_suites_from_annotations( a_owner_name => 'UT3_TESTER', a_annotated_objects => l_cursor, a_path => null, a_object_name => a_package_name, a_skip_all_objects => true ); - l_suite := treat( l_suites(l_suites.first) as ut3.ut_logical_suite); + l_suite := treat( l_suites(l_suites.first) as ut3_develop.ut_logical_suite); open l_type_cursor for select l_suite as "UT_LOGICAL_SUITE" from dual; l_ctx := dbms_xmlgen.newcontext(l_type_cursor); @@ -43,11 +43,11 @@ create or replace package body test_suite_builder is procedure no_suite_description is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite',null, null) + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite',null, null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -59,12 +59,12 @@ create or replace package body test_suite_builder is procedure suite_description_from_suite is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Some description', null), - ut3.ut_annotation(2, 'suite','Another description', null) + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Some description', null), + ut3_develop.ut_annotation(2, 'suite','Another description', null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -76,13 +76,13 @@ create or replace package body test_suite_builder is procedure suitepath_from_non_empty_path is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite',null, null), - ut3.ut_annotation(2, 'suitepath','org.utplsql.some', null), - ut3.ut_annotation(3, 'suitepath','dummy.utplsql.some', null) + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite',null, null), + ut3_develop.ut_annotation(2, 'suitepath','org.utplsql.some', null), + ut3_develop.ut_annotation(3, 'suitepath','dummy.utplsql.some', null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -94,14 +94,14 @@ create or replace package body test_suite_builder is procedure suite_descr_from_displayname is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Some description', null), - ut3.ut_annotation(2, 'suite','Another description', null), - ut3.ut_annotation(3, 'displayname','New description', null), - ut3.ut_annotation(4, 'displayname','Newest description', null) + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Some description', null), + ut3_develop.ut_annotation(2, 'suite','Another description', null), + ut3_develop.ut_annotation(3, 'displayname','New description', null), + ut3_develop.ut_annotation(4, 'displayname','Newest description', null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -113,31 +113,31 @@ create or replace package body test_suite_builder is procedure rollback_type_valid is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite',null, null), - ut3.ut_annotation(2, 'rollback','manual', null), - ut3.ut_annotation(3, 'rollback','bad', null) + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite',null, null), + ut3_develop.ut_annotation(2, 'rollback','manual', null), + ut3_develop.ut_annotation(3, 'rollback','bad', null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); --Assert ut.expect(l_actual).to_be_like( - '%'||ut3.ut_utils.gc_rollback_manual||'%' + '%'||ut3_develop.ut_utils.gc_rollback_manual||'%' ); end; procedure rollback_type_duplicated is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite',null, null), - ut3.ut_annotation(2, 'rollback','manual', null), - ut3.ut_annotation(3, 'rollback','bad', null) + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite',null, null), + ut3_develop.ut_annotation(2, 'rollback','manual', null), + ut3_develop.ut_annotation(3, 'rollback','bad', null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -149,12 +149,12 @@ create or replace package body test_suite_builder is procedure suite_annot_duplicated is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','Cool', null), - ut3.ut_annotation(8, 'suite','bad', null) + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(2, 'suite','Cool', null), + ut3_develop.ut_annotation(8, 'suite','bad', null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -166,12 +166,12 @@ create or replace package body test_suite_builder is procedure test_annotation is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','Cool', null), - ut3.ut_annotation(8, 'test','Some test', 'test_procedure') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(2, 'suite','Cool', null), + ut3_develop.ut_annotation(8, 'test','Some test', 'test_procedure') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -185,13 +185,13 @@ create or replace package body test_suite_builder is procedure test_annot_duplicated is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','Cool', null), - ut3.ut_annotation(8, 'test','Some test', 'test_procedure'), - ut3.ut_annotation(9, 'test','Dup', 'test_procedure') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(2, 'suite','Cool', null), + ut3_develop.ut_annotation(8, 'test','Some test', 'test_procedure'), + ut3_develop.ut_annotation(9, 'test','Dup', 'test_procedure') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -203,13 +203,13 @@ create or replace package body test_suite_builder is procedure beforeall_annot_duplicated is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','Cool', null), - ut3.ut_annotation(8, 'beforeall', null, 'test_procedure'), - ut3.ut_annotation(9, 'beforeall', null, 'test_procedure') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(2, 'suite','Cool', null), + ut3_develop.ut_annotation(8, 'beforeall', null, 'test_procedure'), + ut3_develop.ut_annotation(9, 'beforeall', null, 'test_procedure') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -221,13 +221,13 @@ create or replace package body test_suite_builder is procedure beforeeach_annot_duplicated is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','Cool', null), - ut3.ut_annotation(8, 'beforeeach', null, 'test_procedure'), - ut3.ut_annotation(9, 'beforeeach', null, 'test_procedure') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(2, 'suite','Cool', null), + ut3_develop.ut_annotation(8, 'beforeeach', null, 'test_procedure'), + ut3_develop.ut_annotation(9, 'beforeeach', null, 'test_procedure') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -239,13 +239,13 @@ create or replace package body test_suite_builder is procedure afterall_annot_duplicated is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','Cool', null), - ut3.ut_annotation(8, 'afterall', null, 'test_procedure'), - ut3.ut_annotation(9, 'afterall', null, 'test_procedure') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(2, 'suite','Cool', null), + ut3_develop.ut_annotation(8, 'afterall', null, 'test_procedure'), + ut3_develop.ut_annotation(9, 'afterall', null, 'test_procedure') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -257,13 +257,13 @@ create or replace package body test_suite_builder is procedure aftereach_annot_duplicated is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','Cool', null), - ut3.ut_annotation(8, 'aftereach', null, 'test_procedure'), - ut3.ut_annotation(9, 'aftereach', null, 'test_procedure') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(2, 'suite','Cool', null), + ut3_develop.ut_annotation(8, 'aftereach', null, 'test_procedure'), + ut3_develop.ut_annotation(9, 'aftereach', null, 'test_procedure') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -275,13 +275,13 @@ create or replace package body test_suite_builder is procedure suitepath_annot_duplicated is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','Cool', null), - ut3.ut_annotation(3, 'suitepath','dummy.utplsql.some', null), - ut3.ut_annotation(4, 'suitepath','org.utplsql.some', null) + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(2, 'suite','Cool', null), + ut3_develop.ut_annotation(3, 'suitepath','dummy.utplsql.some', null), + ut3_develop.ut_annotation(4, 'suitepath','org.utplsql.some', null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -293,13 +293,13 @@ create or replace package body test_suite_builder is procedure displayname_annot_duplicated is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','Cool', null), - ut3.ut_annotation(4, 'displayname','New description', null), - ut3.ut_annotation(5, 'displayname','Newest description', null) + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(2, 'suite','Cool', null), + ut3_develop.ut_annotation(4, 'displayname','New description', null), + ut3_develop.ut_annotation(5, 'displayname','Newest description', null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -311,12 +311,12 @@ create or replace package body test_suite_builder is procedure suitepath_annot_empty is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(3, 'suitepath',null, null) + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Cool', null), + ut3_develop.ut_annotation(3, 'suitepath',null, null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -328,12 +328,12 @@ create or replace package body test_suite_builder is procedure suitepath_annot_invalid_path is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(2, 'suitepath','path with spaces', null) + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Cool', null), + ut3_develop.ut_annotation(2, 'suitepath','path with spaces', null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -345,12 +345,12 @@ create or replace package body test_suite_builder is procedure displayname_annot_empty is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(3, 'displayname',null, null) + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Cool', null), + ut3_develop.ut_annotation(3, 'displayname',null, null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -362,12 +362,12 @@ create or replace package body test_suite_builder is procedure rollback_type_empty is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(3, 'rollback',null, null) + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Cool', null), + ut3_develop.ut_annotation(3, 'rollback',null, null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -379,12 +379,12 @@ create or replace package body test_suite_builder is procedure rollback_type_invalid is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(2, 'rollback','bad', null) + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Cool', null), + ut3_develop.ut_annotation(2, 'rollback','bad', null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -396,24 +396,24 @@ create or replace package body test_suite_builder is procedure multiple_before_after is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(2, 'beforeall',null, 'first_before_all'), - ut3.ut_annotation(3, 'beforeall',null, 'another_before_all'), - ut3.ut_annotation(4, 'beforeeach',null, 'first_before_each'), - ut3.ut_annotation(5, 'beforeeach',null, 'another_before_each'), - ut3.ut_annotation(6, 'aftereach',null, 'first_after_each'), - ut3.ut_annotation(7, 'aftereach',null, 'another_after_each'), - ut3.ut_annotation(8, 'afterall',null, 'first_after_all'), - ut3.ut_annotation(9, 'afterall',null, 'another_after_all'), - ut3.ut_annotation(14, 'test','A test', 'some_test'), - ut3.ut_annotation(15, 'beforetest','before_test_proc', 'some_test'), - ut3.ut_annotation(16, 'beforetest','before_test_proc2', 'some_test'), - ut3.ut_annotation(18, 'aftertest','after_test_proc', 'some_test'), - ut3.ut_annotation(20, 'aftertest','after_test_proc2', 'some_test') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Cool', null), + ut3_develop.ut_annotation(2, 'beforeall',null, 'first_before_all'), + ut3_develop.ut_annotation(3, 'beforeall',null, 'another_before_all'), + ut3_develop.ut_annotation(4, 'beforeeach',null, 'first_before_each'), + ut3_develop.ut_annotation(5, 'beforeeach',null, 'another_before_each'), + ut3_develop.ut_annotation(6, 'aftereach',null, 'first_after_each'), + ut3_develop.ut_annotation(7, 'aftereach',null, 'another_after_each'), + ut3_develop.ut_annotation(8, 'afterall',null, 'first_after_all'), + ut3_develop.ut_annotation(9, 'afterall',null, 'another_after_all'), + ut3_develop.ut_annotation(14, 'test','A test', 'some_test'), + ut3_develop.ut_annotation(15, 'beforetest','before_test_proc', 'some_test'), + ut3_develop.ut_annotation(16, 'beforetest','before_test_proc2', 'some_test'), + ut3_develop.ut_annotation(18, 'aftertest','after_test_proc', 'some_test'), + ut3_develop.ut_annotation(20, 'aftertest','after_test_proc2', 'some_test') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -450,24 +450,24 @@ create or replace package body test_suite_builder is procedure multiple_standalone_bef_aft is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(2, 'beforeall', 'some_package.first_before_all',null), - ut3.ut_annotation(3, 'beforeall', 'different_package.another_before_all',null), - ut3.ut_annotation(4, 'beforeeach', 'first_before_each',null), - ut3.ut_annotation(5, 'beforeeach', 'different_owner.different_package.another_before_each',null), - ut3.ut_annotation(6, 'aftereach', 'first_after_each',null), - ut3.ut_annotation(7, 'aftereach', 'another_after_each,different_owner.different_package.one_more_after_each',null), - ut3.ut_annotation(8, 'afterall', 'first_after_all',null), - ut3.ut_annotation(9, 'afterall', 'another_after_all',null), - ut3.ut_annotation(14, 'test','A test', 'some_test'), - ut3.ut_annotation(15, 'beforetest','before_test_proc', 'some_test'), - ut3.ut_annotation(16, 'beforetest','before_test_proc2', 'some_test'), - ut3.ut_annotation(18, 'aftertest','after_test_proc', 'some_test'), - ut3.ut_annotation(20, 'aftertest','after_test_proc2', 'some_test') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Cool', null), + ut3_develop.ut_annotation(2, 'beforeall', 'some_package.first_before_all',null), + ut3_develop.ut_annotation(3, 'beforeall', 'different_package.another_before_all',null), + ut3_develop.ut_annotation(4, 'beforeeach', 'first_before_each',null), + ut3_develop.ut_annotation(5, 'beforeeach', 'different_owner.different_package.another_before_each',null), + ut3_develop.ut_annotation(6, 'aftereach', 'first_after_each',null), + ut3_develop.ut_annotation(7, 'aftereach', 'another_after_each,different_owner.different_package.one_more_after_each',null), + ut3_develop.ut_annotation(8, 'afterall', 'first_after_all',null), + ut3_develop.ut_annotation(9, 'afterall', 'another_after_all',null), + ut3_develop.ut_annotation(14, 'test','A test', 'some_test'), + ut3_develop.ut_annotation(15, 'beforetest','before_test_proc', 'some_test'), + ut3_develop.ut_annotation(16, 'beforetest','before_test_proc2', 'some_test'), + ut3_develop.ut_annotation(18, 'aftertest','after_test_proc', 'some_test'), + ut3_develop.ut_annotation(20, 'aftertest','after_test_proc2', 'some_test') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -505,16 +505,16 @@ create or replace package body test_suite_builder is procedure before_after_on_single_proc is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(2, 'beforeall',null, 'do_stuff'), - ut3.ut_annotation(3, 'beforeeach',null, 'do_stuff'), - ut3.ut_annotation(4, 'aftereach',null, 'do_stuff'), - ut3.ut_annotation(5, 'afterall',null, 'do_stuff'), - ut3.ut_annotation(6, 'test','A test', 'some_test') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Cool', null), + ut3_develop.ut_annotation(2, 'beforeall',null, 'do_stuff'), + ut3_develop.ut_annotation(3, 'beforeeach',null, 'do_stuff'), + ut3_develop.ut_annotation(4, 'aftereach',null, 'do_stuff'), + ut3_develop.ut_annotation(5, 'afterall',null, 'do_stuff'), + ut3_develop.ut_annotation(6, 'test','A test', 'some_test') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -539,27 +539,27 @@ create or replace package body test_suite_builder is procedure multiple_mixed_bef_aft is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(2, 'beforeall', null,'first_before_all'), - ut3.ut_annotation(3, 'beforeall', 'different_package.another_before_all',null), - ut3.ut_annotation(4, 'beforeeach', 'first_before_each',null), - ut3.ut_annotation(5, 'beforeeach', 'different_owner.different_package.another_before_each',null), - ut3.ut_annotation(6, 'aftereach', null, 'first_after_each'), - ut3.ut_annotation(7, 'aftereach', 'another_after_each,different_owner.different_package.one_more_after_each',null), - ut3.ut_annotation(8, 'afterall', 'first_after_all',null), - ut3.ut_annotation(9, 'afterall', 'another_after_all',null), - ut3.ut_annotation(14, 'test','A test', 'some_test'), - ut3.ut_annotation(15, 'beforetest','before_test_proc', 'some_test'), - ut3.ut_annotation(16, 'beforetest','before_test_proc2', 'some_test'), - ut3.ut_annotation(18, 'aftertest','after_test_proc', 'some_test'), - ut3.ut_annotation(20, 'aftertest','after_test_proc2', 'some_test'), - ut3.ut_annotation(21, 'beforeall', null,'last_before_all'), - ut3.ut_annotation(22, 'aftereach', null, 'last_after_each'), - ut3.ut_annotation(23, 'afterall', null, 'last_after_all') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Cool', null), + ut3_develop.ut_annotation(2, 'beforeall', null,'first_before_all'), + ut3_develop.ut_annotation(3, 'beforeall', 'different_package.another_before_all',null), + ut3_develop.ut_annotation(4, 'beforeeach', 'first_before_each',null), + ut3_develop.ut_annotation(5, 'beforeeach', 'different_owner.different_package.another_before_each',null), + ut3_develop.ut_annotation(6, 'aftereach', null, 'first_after_each'), + ut3_develop.ut_annotation(7, 'aftereach', 'another_after_each,different_owner.different_package.one_more_after_each',null), + ut3_develop.ut_annotation(8, 'afterall', 'first_after_all',null), + ut3_develop.ut_annotation(9, 'afterall', 'another_after_all',null), + ut3_develop.ut_annotation(14, 'test','A test', 'some_test'), + ut3_develop.ut_annotation(15, 'beforetest','before_test_proc', 'some_test'), + ut3_develop.ut_annotation(16, 'beforetest','before_test_proc2', 'some_test'), + ut3_develop.ut_annotation(18, 'aftertest','after_test_proc', 'some_test'), + ut3_develop.ut_annotation(20, 'aftertest','after_test_proc2', 'some_test'), + ut3_develop.ut_annotation(21, 'beforeall', null,'last_before_all'), + ut3_develop.ut_annotation(22, 'aftereach', null, 'last_after_each'), + ut3_develop.ut_annotation(23, 'afterall', null, 'last_after_all') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -601,16 +601,16 @@ create or replace package body test_suite_builder is procedure before_after_mixed_with_test is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(2, 'beforeall',null, 'do_stuff'), - ut3.ut_annotation(3, 'beforeeach',null, 'do_stuff'), - ut3.ut_annotation(4, 'aftereach',null, 'do_stuff'), - ut3.ut_annotation(5, 'afterall',null, 'do_stuff'), - ut3.ut_annotation(6, 'test','A test', 'do_stuff') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Cool', null), + ut3_develop.ut_annotation(2, 'beforeall',null, 'do_stuff'), + ut3_develop.ut_annotation(3, 'beforeeach',null, 'do_stuff'), + ut3_develop.ut_annotation(4, 'aftereach',null, 'do_stuff'), + ut3_develop.ut_annotation(5, 'afterall',null, 'do_stuff'), + ut3_develop.ut_annotation(6, 'test','A test', 'do_stuff') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -628,18 +628,18 @@ create or replace package body test_suite_builder is procedure suite_from_context is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(2, 'beforeall',null, 'suite_level_beforeall'), - ut3.ut_annotation(3, 'test','In suite', 'suite_level_test'), - ut3.ut_annotation(4, 'context','A context', null), - ut3.ut_annotation(5, 'name','a_context', null), - ut3.ut_annotation(6, 'beforeall',null, 'context_setup'), - ut3.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), - ut3.ut_annotation(8, 'endcontext',null, null) + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Cool', null), + ut3_develop.ut_annotation(2, 'beforeall',null, 'suite_level_beforeall'), + ut3_develop.ut_annotation(3, 'test','In suite', 'suite_level_test'), + ut3_develop.ut_annotation(4, 'context','A context', null), + ut3_develop.ut_annotation(5, 'name','a_context', null), + ut3_develop.ut_annotation(6, 'beforeall',null, 'context_setup'), + ut3_develop.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), + ut3_develop.ut_annotation(8, 'endcontext',null, null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -676,31 +676,31 @@ create or replace package body test_suite_builder is procedure nested_contexts is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation( 1, 'suite','Cool', null), - ut3.ut_annotation( 2, 'beforeall',null, 'suite_level_beforeall'), - ut3.ut_annotation( 3, 'test','In suite', 'suite_level_test'), - ut3.ut_annotation( 4, 'context','A context', null), - ut3.ut_annotation( 5, 'name','a_context', null), - ut3.ut_annotation( 6, 'beforeall',null, 'context_setup'), - ut3.ut_annotation( 7, 'test', 'First test in context', 'first_test_in_a_context'), - ut3.ut_annotation( 8, 'context','A nested context', null), - ut3.ut_annotation( 9, 'name','a_nested_context', null), - ut3.ut_annotation(10, 'beforeall',null, 'nested_context_setup'), - ut3.ut_annotation(11, 'test', 'Test in nested context', 'test_in_nested_context'), - ut3.ut_annotation(12, 'endcontext',null, null), - ut3.ut_annotation(13, 'context',null, null), - ut3.ut_annotation(14, 'name','nested_context_2', null), - ut3.ut_annotation(15, 'test', 'Test in nested context', 'test_in_nested_context_2'), - ut3.ut_annotation(16, 'context','a_nested_context_3', null), - ut3.ut_annotation(17, 'test', 'Test in nested context', 'test_in_nested_context_3'), - ut3.ut_annotation(18, 'endcontext',null, null), - ut3.ut_annotation(19, 'endcontext',null, null), - ut3.ut_annotation(20, 'test', 'Second test in context', 'second_test_in_a_context'), - ut3.ut_annotation(21, 'endcontext',null, null) + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation( 1, 'suite','Cool', null), + ut3_develop.ut_annotation( 2, 'beforeall',null, 'suite_level_beforeall'), + ut3_develop.ut_annotation( 3, 'test','In suite', 'suite_level_test'), + ut3_develop.ut_annotation( 4, 'context','A context', null), + ut3_develop.ut_annotation( 5, 'name','a_context', null), + ut3_develop.ut_annotation( 6, 'beforeall',null, 'context_setup'), + ut3_develop.ut_annotation( 7, 'test', 'First test in context', 'first_test_in_a_context'), + ut3_develop.ut_annotation( 8, 'context','A nested context', null), + ut3_develop.ut_annotation( 9, 'name','a_nested_context', null), + ut3_develop.ut_annotation(10, 'beforeall',null, 'nested_context_setup'), + ut3_develop.ut_annotation(11, 'test', 'Test in nested context', 'test_in_nested_context'), + ut3_develop.ut_annotation(12, 'endcontext',null, null), + ut3_develop.ut_annotation(13, 'context',null, null), + ut3_develop.ut_annotation(14, 'name','nested_context_2', null), + ut3_develop.ut_annotation(15, 'test', 'Test in nested context', 'test_in_nested_context_2'), + ut3_develop.ut_annotation(16, 'context','a_nested_context_3', null), + ut3_develop.ut_annotation(17, 'test', 'Test in nested context', 'test_in_nested_context_3'), + ut3_develop.ut_annotation(18, 'endcontext',null, null), + ut3_develop.ut_annotation(19, 'endcontext',null, null), + ut3_develop.ut_annotation(20, 'test', 'Second test in context', 'second_test_in_a_context'), + ut3_develop.ut_annotation(21, 'endcontext',null, null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -769,24 +769,24 @@ create or replace package body test_suite_builder is procedure nested_contexts_2 is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation( 1, 'suite','Cool', null), - ut3.ut_annotation( 2, 'suitepath','path', null), - ut3.ut_annotation( 3, 'context','Level 1', null), - ut3.ut_annotation( 4, 'name','context_1', null), - ut3.ut_annotation( 5, 'context','Level 1.1', null), - ut3.ut_annotation( 6, 'name','context_1_1', null), - ut3.ut_annotation( 7, 'test', 'Test 1.1.1', 'test_1_1_1'), - ut3.ut_annotation( 8, 'test', 'Test 1.1.2', 'test_1_1_2'), - ut3.ut_annotation( 9, 'endcontext', null, null), - ut3.ut_annotation(10, 'endcontext', null, null), - ut3.ut_annotation(11, 'context','Level 2', null), - ut3.ut_annotation(12, 'name','context_2', null), - ut3.ut_annotation(13, 'test', 'Test 2.1', 'test_2_1'), - ut3.ut_annotation(14, 'endcontext',null, null) + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation( 1, 'suite','Cool', null), + ut3_develop.ut_annotation( 2, 'suitepath','path', null), + ut3_develop.ut_annotation( 3, 'context','Level 1', null), + ut3_develop.ut_annotation( 4, 'name','context_1', null), + ut3_develop.ut_annotation( 5, 'context','Level 1.1', null), + ut3_develop.ut_annotation( 6, 'name','context_1_1', null), + ut3_develop.ut_annotation( 7, 'test', 'Test 1.1.1', 'test_1_1_1'), + ut3_develop.ut_annotation( 8, 'test', 'Test 1.1.2', 'test_1_1_2'), + ut3_develop.ut_annotation( 9, 'endcontext', null, null), + ut3_develop.ut_annotation(10, 'endcontext', null, null), + ut3_develop.ut_annotation(11, 'context','Level 2', null), + ut3_develop.ut_annotation(12, 'name','context_2', null), + ut3_develop.ut_annotation(13, 'test', 'Test 2.1', 'test_2_1'), + ut3_develop.ut_annotation(14, 'endcontext',null, null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -838,19 +838,19 @@ create or replace package body test_suite_builder is procedure before_after_in_context is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite', 'Cool', null), - ut3.ut_annotation(2, 'test', 'In suite', 'suite_level_test'), - ut3.ut_annotation(3, 'context', 'A context', null), - ut3.ut_annotation(4, 'beforeall', 'context_beforeall', null), - ut3.ut_annotation(5, 'beforeeach', null, 'context_beforeeach'), - ut3.ut_annotation(6, 'test', 'In context', 'test_in_a_context'), - ut3.ut_annotation(7, 'aftereach', 'context_aftereach' ,null), - ut3.ut_annotation(8, 'afterall', null, 'context_afterall'), - ut3.ut_annotation(9, 'endcontext', null, null) + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite', 'Cool', null), + ut3_develop.ut_annotation(2, 'test', 'In suite', 'suite_level_test'), + ut3_develop.ut_annotation(3, 'context', 'A context', null), + ut3_develop.ut_annotation(4, 'beforeall', 'context_beforeall', null), + ut3_develop.ut_annotation(5, 'beforeeach', null, 'context_beforeeach'), + ut3_develop.ut_annotation(6, 'test', 'In context', 'test_in_a_context'), + ut3_develop.ut_annotation(7, 'aftereach', 'context_aftereach' ,null), + ut3_develop.ut_annotation(8, 'afterall', null, 'context_afterall'), + ut3_develop.ut_annotation(9, 'endcontext', null, null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -888,19 +888,19 @@ create or replace package body test_suite_builder is procedure before_after_out_of_context is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(2, 'beforeall',null, 'suite_level_beforeall'), - ut3.ut_annotation(3, 'beforeeach',null, 'suite_level_beforeeach'), - ut3.ut_annotation(4, 'test','In suite', 'suite_level_test'), - ut3.ut_annotation(5, 'context',null, null), - ut3.ut_annotation(6, 'test', 'In context', 'test_in_a_context'), - ut3.ut_annotation(7, 'endcontext',null, null), - ut3.ut_annotation(8, 'aftereach',null, 'suite_level_aftereach'), - ut3.ut_annotation(9, 'afterall',null, 'suite_level_afterall') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Cool', null), + ut3_develop.ut_annotation(2, 'beforeall',null, 'suite_level_beforeall'), + ut3_develop.ut_annotation(3, 'beforeeach',null, 'suite_level_beforeeach'), + ut3_develop.ut_annotation(4, 'test','In suite', 'suite_level_test'), + ut3_develop.ut_annotation(5, 'context',null, null), + ut3_develop.ut_annotation(6, 'test', 'In context', 'test_in_a_context'), + ut3_develop.ut_annotation(7, 'endcontext',null, null), + ut3_develop.ut_annotation(8, 'aftereach',null, 'suite_level_aftereach'), + ut3_develop.ut_annotation(9, 'afterall',null, 'suite_level_afterall') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -938,17 +938,17 @@ create or replace package body test_suite_builder is procedure context_without_endcontext is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(2, 'beforeall',null, 'suite_level_beforeall'), - ut3.ut_annotation(3, 'test','In suite', 'suite_level_test'), - ut3.ut_annotation(4, 'context','Some context', null), - ut3.ut_annotation(5, 'name','a_context', null), - ut3.ut_annotation(6, 'beforeall',null, 'context_setup'), - ut3.ut_annotation(7, 'test', 'In context', 'test_in_a_context') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Cool', null), + ut3_develop.ut_annotation(2, 'beforeall',null, 'suite_level_beforeall'), + ut3_develop.ut_annotation(3, 'test','In suite', 'suite_level_test'), + ut3_develop.ut_annotation(4, 'context','Some context', null), + ut3_develop.ut_annotation(5, 'name','a_context', null), + ut3_develop.ut_annotation(6, 'beforeall',null, 'context_setup'), + ut3_develop.ut_annotation(7, 'test', 'In context', 'test_in_a_context') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -987,19 +987,19 @@ create or replace package body test_suite_builder is procedure endcontext_without_context is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(2, 'beforeall',null, 'suite_level_beforeall'), - ut3.ut_annotation(3, 'test','In suite', 'suite_level_test'), - ut3.ut_annotation(4, 'context','A context', null), - ut3.ut_annotation(5, 'name','a_context', null), - ut3.ut_annotation(6, 'beforeall',null, 'context_setup'), - ut3.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), - ut3.ut_annotation(8, 'endcontext',null, null), - ut3.ut_annotation(9, 'endcontext',null, null) + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Cool', null), + ut3_develop.ut_annotation(2, 'beforeall',null, 'suite_level_beforeall'), + ut3_develop.ut_annotation(3, 'test','In suite', 'suite_level_test'), + ut3_develop.ut_annotation(4, 'context','A context', null), + ut3_develop.ut_annotation(5, 'name','a_context', null), + ut3_develop.ut_annotation(6, 'beforeall',null, 'context_setup'), + ut3_develop.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), + ut3_develop.ut_annotation(8, 'endcontext',null, null), + ut3_develop.ut_annotation(9, 'endcontext',null, null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1039,23 +1039,23 @@ create or replace package body test_suite_builder is procedure duplicate_context_name is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(2, 'beforeall',null, 'suite_level_beforeall'), - ut3.ut_annotation(3, 'test','In suite', 'suite_level_test'), - ut3.ut_annotation(4, 'context','A context', null), - ut3.ut_annotation(5, 'name','a_context', null), - ut3.ut_annotation(6, 'beforeall',null, 'context_setup'), - ut3.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), - ut3.ut_annotation(8, 'endcontext',null, null), - ut3.ut_annotation(9, 'context','A context', null), - ut3.ut_annotation(10, 'name','a_context', null), - ut3.ut_annotation(11, 'beforeall',null, 'setup_in_duplicated_context'), - ut3.ut_annotation(12, 'test', 'In duplicated context', 'test_in_duplicated_context'), - ut3.ut_annotation(13, 'endcontext',null, null) + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Cool', null), + ut3_develop.ut_annotation(2, 'beforeall',null, 'suite_level_beforeall'), + ut3_develop.ut_annotation(3, 'test','In suite', 'suite_level_test'), + ut3_develop.ut_annotation(4, 'context','A context', null), + ut3_develop.ut_annotation(5, 'name','a_context', null), + ut3_develop.ut_annotation(6, 'beforeall',null, 'context_setup'), + ut3_develop.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), + ut3_develop.ut_annotation(8, 'endcontext',null, null), + ut3_develop.ut_annotation(9, 'context','A context', null), + ut3_develop.ut_annotation(10, 'name','a_context', null), + ut3_develop.ut_annotation(11, 'beforeall',null, 'setup_in_duplicated_context'), + ut3_develop.ut_annotation(12, 'test', 'In duplicated context', 'test_in_duplicated_context'), + ut3_develop.ut_annotation(13, 'endcontext',null, null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1107,17 +1107,17 @@ create or replace package body test_suite_builder is procedure hard_stop_in_ctx_name is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; l_bad_name varchar2(100); begin --Arrange l_bad_name := 'ctx_with_dot.in_it'; - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(4, 'context',null, null), - ut3.ut_annotation(5, 'name',l_bad_name, null), - ut3.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), - ut3.ut_annotation(13, 'endcontext',null, null) + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Cool', null), + ut3_develop.ut_annotation(4, 'context',null, null), + ut3_develop.ut_annotation(5, 'name',l_bad_name, null), + ut3_develop.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), + ut3_develop.ut_annotation(13, 'endcontext',null, null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1145,17 +1145,17 @@ create or replace package body test_suite_builder is procedure name_with_spaces_invalid is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; l_bad_name varchar2(100); begin --Arrange l_bad_name := 'context name with spaces'; - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(4, 'context',null, null), - ut3.ut_annotation(5, 'name',l_bad_name, null), - ut3.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), - ut3.ut_annotation(13, 'endcontext',null, null) + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Cool', null), + ut3_develop.ut_annotation(4, 'context',null, null), + ut3_develop.ut_annotation(5, 'name',l_bad_name, null), + ut3_develop.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), + ut3_develop.ut_annotation(13, 'endcontext',null, null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1183,17 +1183,17 @@ create or replace package body test_suite_builder is procedure duplicate_name_annotation is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(4, 'context','A context', null), - ut3.ut_annotation(5, 'name','a_context_name', null), - ut3.ut_annotation(6, 'name','a_newer_context_name', null), - ut3.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), - ut3.ut_annotation(8, 'endcontext',null, null), - ut3.ut_annotation(12, 'test', 'In suite', 'suite_level_test') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Cool', null), + ut3_develop.ut_annotation(4, 'context','A context', null), + ut3_develop.ut_annotation(5, 'name','a_context_name', null), + ut3_develop.ut_annotation(6, 'name','a_newer_context_name', null), + ut3_develop.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), + ut3_develop.ut_annotation(8, 'endcontext',null, null), + ut3_develop.ut_annotation(12, 'test', 'In suite', 'suite_level_test') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1229,16 +1229,16 @@ create or replace package body test_suite_builder is procedure name_outside_of_context is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(3, 'name','a_context_name', null), - ut3.ut_annotation(4, 'context','A context', null), - ut3.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), - ut3.ut_annotation(8, 'endcontext',null, null), - ut3.ut_annotation(12, 'test', 'In suite', 'suite_level_test') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Cool', null), + ut3_develop.ut_annotation(3, 'name','a_context_name', null), + ut3_develop.ut_annotation(4, 'context','A context', null), + ut3_develop.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), + ut3_develop.ut_annotation(8, 'endcontext',null, null), + ut3_develop.ut_annotation(12, 'test', 'In suite', 'suite_level_test') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1274,16 +1274,16 @@ create or replace package body test_suite_builder is procedure name_empty_value is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(4, 'context','A context', null), - ut3.ut_annotation(5, 'name',null, null), - ut3.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), - ut3.ut_annotation(8, 'endcontext',null, null), - ut3.ut_annotation(12, 'test', 'In suite', 'suite_level_test') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Cool', null), + ut3_develop.ut_annotation(4, 'context','A context', null), + ut3_develop.ut_annotation(5, 'name',null, null), + ut3_develop.ut_annotation(7, 'test', 'In context', 'test_in_a_context'), + ut3_develop.ut_annotation(8, 'endcontext',null, null), + ut3_develop.ut_annotation(12, 'test', 'In suite', 'suite_level_test') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1319,17 +1319,17 @@ create or replace package body test_suite_builder is procedure multiple_contexts is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(4, 'context','A context', null), - ut3.ut_annotation(6, 'test', 'In context1', 'test_in_a_context1'), - ut3.ut_annotation(7, 'endcontext',null, null), - ut3.ut_annotation(8, 'context','A context', null), - ut3.ut_annotation(10, 'test', 'In context2', 'test_in_a_context2'), - ut3.ut_annotation(11, 'endcontext',null, null) + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Cool', null), + ut3_develop.ut_annotation(4, 'context','A context', null), + ut3_develop.ut_annotation(6, 'test', 'In context1', 'test_in_a_context1'), + ut3_develop.ut_annotation(7, 'endcontext',null, null), + ut3_develop.ut_annotation(8, 'context','A context', null), + ut3_develop.ut_annotation(10, 'test', 'In context2', 'test_in_a_context2'), + ut3_develop.ut_annotation(11, 'endcontext',null, null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1372,13 +1372,13 @@ create or replace package body test_suite_builder is procedure throws_value_empty is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(3, 'test','A test with empty throws annotation', 'A_TEST_PROCEDURE'), - ut3.ut_annotation(3, 'throws',null, 'A_TEST_PROCEDURE') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Cool', null), + ut3_develop.ut_annotation(3, 'test','A test with empty throws annotation', 'A_TEST_PROCEDURE'), + ut3_develop.ut_annotation(3, 'throws',null, 'A_TEST_PROCEDURE') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1391,16 +1391,16 @@ create or replace package body test_suite_builder is procedure before_aftertest_multi is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(14, 'test','A test', 'some_test'), - ut3.ut_annotation(15, 'beforetest','before_test_proc', 'some_test'), - ut3.ut_annotation(16, 'beforetest','before_test_proc2', 'some_test'), - ut3.ut_annotation(18, 'aftertest','after_test_proc', 'some_test'), - ut3.ut_annotation(20, 'aftertest','after_test_proc2', 'some_test') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Cool', null), + ut3_develop.ut_annotation(14, 'test','A test', 'some_test'), + ut3_develop.ut_annotation(15, 'beforetest','before_test_proc', 'some_test'), + ut3_develop.ut_annotation(16, 'beforetest','before_test_proc2', 'some_test'), + ut3_develop.ut_annotation(18, 'aftertest','after_test_proc', 'some_test'), + ut3_develop.ut_annotation(20, 'aftertest','after_test_proc2', 'some_test') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1421,16 +1421,16 @@ create or replace package body test_suite_builder is procedure before_aftertest_twice is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(14, 'test','A test', 'some_test'), - ut3.ut_annotation(15, 'beforetest','before_test_proc, before_test_proc2', 'some_test'), - ut3.ut_annotation(16, 'beforetest','before_test_proc3', 'some_test'), - ut3.ut_annotation(18, 'aftertest','after_test_proc,after_test_proc2', 'some_test'), - ut3.ut_annotation(20, 'aftertest','after_test_proc3', 'some_test') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Cool', null), + ut3_develop.ut_annotation(14, 'test','A test', 'some_test'), + ut3_develop.ut_annotation(15, 'beforetest','before_test_proc, before_test_proc2', 'some_test'), + ut3_develop.ut_annotation(16, 'beforetest','before_test_proc3', 'some_test'), + ut3_develop.ut_annotation(18, 'aftertest','after_test_proc,after_test_proc2', 'some_test'), + ut3_develop.ut_annotation(20, 'aftertest','after_test_proc3', 'some_test') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1453,14 +1453,14 @@ create or replace package body test_suite_builder is procedure before_aftertest_pkg_proc is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(14, 'test','A test', 'some_test'), - ut3.ut_annotation(15, 'beforetest','external_package.before_test_proc', 'some_test'), - ut3.ut_annotation(18, 'aftertest','external_package.after_test_proc', 'some_test') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Cool', null), + ut3_develop.ut_annotation(14, 'test','A test', 'some_test'), + ut3_develop.ut_annotation(15, 'beforetest','external_package.before_test_proc', 'some_test'), + ut3_develop.ut_annotation(18, 'aftertest','external_package.after_test_proc', 'some_test') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1479,14 +1479,14 @@ create or replace package body test_suite_builder is procedure before_aftertest_mixed_syntax is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(14, 'test','A test', 'some_test'), - ut3.ut_annotation(15, 'beforetest','external_package.before_test_proc, before_test_proc2', 'some_test'), - ut3.ut_annotation(18, 'aftertest','external_package.after_test_proc, after_test_proc2', 'some_test') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Cool', null), + ut3_develop.ut_annotation(14, 'test','A test', 'some_test'), + ut3_develop.ut_annotation(15, 'beforetest','external_package.before_test_proc, before_test_proc2', 'some_test'), + ut3_develop.ut_annotation(18, 'aftertest','external_package.after_test_proc, after_test_proc2', 'some_test') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1507,14 +1507,14 @@ create or replace package body test_suite_builder is procedure test_annotation_ordering is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(4, 'test','B test', 'b_test'), - ut3.ut_annotation(10, 'test','Z test', 'z_test'), - ut3.ut_annotation(14, 'test','A test', 'a_test') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Cool', null), + ut3_develop.ut_annotation(4, 'test','B test', 'b_test'), + ut3_develop.ut_annotation(10, 'test','Z test', 'z_test'), + ut3_develop.ut_annotation(14, 'test','A test', 'a_test') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1531,13 +1531,13 @@ create or replace package body test_suite_builder is procedure test_bad_procedure_annotation is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(2, 'bad_procedure_annotation',null, 'some_procedure'), - ut3.ut_annotation(6, 'test','A test', 'do_stuff') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Cool', null), + ut3_develop.ut_annotation(2, 'bad_procedure_annotation',null, 'some_procedure'), + ut3_develop.ut_annotation(6, 'test','A test', 'do_stuff') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1547,13 +1547,13 @@ create or replace package body test_suite_builder is procedure test_bad_package_annotation is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(17, 'bad_package_annotation',null, null), - ut3.ut_annotation(24, 'test','A test', 'do_stuff') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(1, 'suite','Cool', null), + ut3_develop.ut_annotation(17, 'bad_package_annotation',null, null), + ut3_develop.ut_annotation(24, 'test','A test', 'do_stuff') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1563,13 +1563,13 @@ create or replace package body test_suite_builder is procedure test_tag_annotation is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','testsuite', null), - ut3.ut_annotation(8, 'test','Some test', 'test_procedure'), - ut3.ut_annotation(9, 'tags','testtag', 'test_procedure') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(2, 'suite','testsuite', null), + ut3_develop.ut_annotation(8, 'test','Some test', 'test_procedure'), + ut3_develop.ut_annotation(9, 'tags','testtag', 'test_procedure') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1585,12 +1585,12 @@ create or replace package body test_suite_builder is procedure suite_tag_annotation is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','testsuite', null), - ut3.ut_annotation(3, 'tags','suitetag', null) + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(2, 'suite','testsuite', null), + ut3_develop.ut_annotation(3, 'tags','suitetag', null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1606,13 +1606,13 @@ create or replace package body test_suite_builder is procedure test_tags_annotation is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','testsuite', null), - ut3.ut_annotation(8, 'test','Some test', 'test_procedure'), - ut3.ut_annotation(9, 'tags','testtag,testtag2,testtag3', 'test_procedure') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(2, 'suite','testsuite', null), + ut3_develop.ut_annotation(8, 'test','Some test', 'test_procedure'), + ut3_develop.ut_annotation(9, 'tags','testtag,testtag2,testtag3', 'test_procedure') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1628,12 +1628,12 @@ create or replace package body test_suite_builder is procedure suite_tags_annotation is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','testsuite', null), - ut3.ut_annotation(3, 'tags','suitetag,suitetag1,suitetag2', null) + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(2, 'suite','testsuite', null), + ut3_develop.ut_annotation(3, 'tags','suitetag,suitetag1,suitetag2', null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1649,14 +1649,14 @@ create or replace package body test_suite_builder is procedure test_2line_tags_annotation is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','testsuite', null), - ut3.ut_annotation(8, 'test','Some test', 'test_procedure'), - ut3.ut_annotation(9, 'tags','testtag', 'test_procedure'), - ut3.ut_annotation(10, 'tags','testtag2', 'test_procedure') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(2, 'suite','testsuite', null), + ut3_develop.ut_annotation(8, 'test','Some test', 'test_procedure'), + ut3_develop.ut_annotation(9, 'tags','testtag', 'test_procedure'), + ut3_develop.ut_annotation(10, 'tags','testtag2', 'test_procedure') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1672,13 +1672,13 @@ create or replace package body test_suite_builder is procedure suite_2line_tags_annotation is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','testsuite', null), - ut3.ut_annotation(3, 'tags','suitetag', null), - ut3.ut_annotation(4, 'tags','suitetag1', null) + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(2, 'suite','testsuite', null), + ut3_develop.ut_annotation(3, 'tags','suitetag', null), + ut3_develop.ut_annotation(4, 'tags','suitetag1', null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1694,12 +1694,12 @@ create or replace package body test_suite_builder is procedure test_empty_tag is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','testsuite', null), - ut3.ut_annotation(8, 'test','Some test', 'test_procedure'), - ut3.ut_annotation(9, 'tags',null, 'test_procedure') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(2, 'suite','testsuite', null), + ut3_develop.ut_annotation(8, 'test','Some test', 'test_procedure'), + ut3_develop.ut_annotation(9, 'tags',null, 'test_procedure') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1713,12 +1713,12 @@ create or replace package body test_suite_builder is procedure suite_empty_tag is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','testsuite', null), - ut3.ut_annotation(3, 'tags',null, null) + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(2, 'suite','testsuite', null), + ut3_develop.ut_annotation(3, 'tags',null, null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1732,14 +1732,14 @@ create or replace package body test_suite_builder is procedure test_duplicate_tag is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','testsuite', null), - ut3.ut_annotation(8, 'test','Some test', 'test_procedure'), - ut3.ut_annotation(9, 'tags','testtag,testtag1,testtag', 'test_procedure'), - ut3.ut_annotation(10, 'tags',' testtag,testtag1,testtag2', 'test_procedure') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(2, 'suite','testsuite', null), + ut3_develop.ut_annotation(8, 'test','Some test', 'test_procedure'), + ut3_develop.ut_annotation(9, 'tags','testtag,testtag1,testtag', 'test_procedure'), + ut3_develop.ut_annotation(10, 'tags',' testtag,testtag1,testtag2', 'test_procedure') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1755,13 +1755,13 @@ create or replace package body test_suite_builder is procedure suite_duplicate_tag is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','testsuite', null), - ut3.ut_annotation(3, 'tags','suitetag,suitetag1,suitetag', null), - ut3.ut_annotation(4, 'tags',' suitetag1,suitetag2', null) + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(2, 'suite','testsuite', null), + ut3_develop.ut_annotation(3, 'tags','suitetag,suitetag1,suitetag', null), + ut3_develop.ut_annotation(4, 'tags',' suitetag1,suitetag2', null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1777,13 +1777,13 @@ create or replace package body test_suite_builder is procedure test_empty_tag_between is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','testsuite', null), - ut3.ut_annotation(8, 'test','Some test', 'test_procedure'), - ut3.ut_annotation(9, 'tags','testtag,, ,testtag1', 'test_procedure') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(2, 'suite','testsuite', null), + ut3_develop.ut_annotation(8, 'test','Some test', 'test_procedure'), + ut3_develop.ut_annotation(9, 'tags','testtag,, ,testtag1', 'test_procedure') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1799,12 +1799,12 @@ create or replace package body test_suite_builder is procedure suite_empty_tag_between is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','testsuite', null), - ut3.ut_annotation(3, 'tags','suitetag,, ,suitetag1', null) + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(2, 'suite','testsuite', null), + ut3_develop.ut_annotation(3, 'tags','suitetag,, ,suitetag1', null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1820,13 +1820,13 @@ create or replace package body test_suite_builder is procedure test_special_char_tag is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','testsuite', null), - ut3.ut_annotation(8, 'test','Some test', 'test_procedure'), - ut3.ut_annotation(9, 'tags','#?$%^&*!|\/@][', 'test_procedure') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(2, 'suite','testsuite', null), + ut3_develop.ut_annotation(8, 'test','Some test', 'test_procedure'), + ut3_develop.ut_annotation(9, 'tags','#?$%^&*!|\/@][', 'test_procedure') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1842,12 +1842,12 @@ create or replace package body test_suite_builder is procedure suite_special_char_tag is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','testsuite', null), - ut3.ut_annotation(3, 'tags','#?$%^&*!|\/@][', null) + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(2, 'suite','testsuite', null), + ut3_develop.ut_annotation(3, 'tags','#?$%^&*!|\/@][', null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1863,14 +1863,14 @@ create or replace package body test_suite_builder is procedure test_spaces_in_tag is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','testsuite', null), - ut3.ut_annotation(3, 'tags',' good_tag , bad tag , good-tag ', null), - ut3.ut_annotation(8, 'test','Some test', 'test_procedure'), - ut3.ut_annotation(9, 'tags',' good_tag , bad tag , good-tag ', 'test_procedure') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(2, 'suite','testsuite', null), + ut3_develop.ut_annotation(3, 'tags',' good_tag , bad tag , good-tag ', null), + ut3_develop.ut_annotation(8, 'test','Some test', 'test_procedure'), + ut3_develop.ut_annotation(9, 'tags',' good_tag , bad tag , good-tag ', 'test_procedure') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); @@ -1893,14 +1893,14 @@ create or replace package body test_suite_builder is procedure test_minus_in_tag is l_actual clob; - l_annotations ut3.ut_annotations; + l_annotations ut3_develop.ut_annotations; begin --Arrange - l_annotations := ut3.ut_annotations( - ut3.ut_annotation(2, 'suite','testsuite', null), - ut3.ut_annotation(3, 'tags',' good_tag , -invalid_tag , good-tag ', null), - ut3.ut_annotation(8, 'test','Some test', 'test_procedure'), - ut3.ut_annotation(9, 'tags',' good_tag , -invalid_tag , good-tag ', 'test_procedure') + l_annotations := ut3_develop.ut_annotations( + ut3_develop.ut_annotation(2, 'suite','testsuite', null), + ut3_develop.ut_annotation(3, 'tags',' good_tag , -invalid_tag , good-tag ', null), + ut3_develop.ut_annotation(8, 'test','Some test', 'test_procedure'), + ut3_develop.ut_annotation(9, 'tags',' good_tag , -invalid_tag , good-tag ', 'test_procedure') ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); diff --git a/test/ut3_tester/core/test_suite_manager.pkb b/test/ut3_tester/core/test_suite_manager.pkb index fd35adc70..11cc7acfe 100644 --- a/test/ut3_tester/core/test_suite_manager.pkb +++ b/test/ut3_tester/core/test_suite_manager.pkb @@ -292,15 +292,15 @@ end test_package_with_ctx;]'; procedure test_schema_run is c_path constant varchar2(100) := sys_context('USERENV', 'CURRENT_USER'); - l_objects_to_run ut3.ut_suite_items := ut3.ut_suite_items(); - l_all_objects_to_run ut3.ut_suite_items; + l_objects_to_run ut3_develop.ut_suite_items := ut3_develop.ut_suite_items(); + l_all_objects_to_run ut3_develop.ut_suite_items; - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test2_suite ut3.ut_logical_suite; + l_test0_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_logical_suite; + l_test2_suite ut3_develop.ut_logical_suite; begin --Act - l_all_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + l_all_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); for i in 1..l_all_objects_to_run.count loop if l_all_objects_to_run(i).name in ('tests', 'tests2') then @@ -313,21 +313,21 @@ end test_package_with_ctx;]'; ut.expect(l_objects_to_run.count).to_equal(2); for i in 1 .. 2 loop - l_test0_suite := treat(l_objects_to_run(i) as ut3.ut_logical_suite); + l_test0_suite := treat(l_objects_to_run(i) as ut3_develop.ut_logical_suite); ut.expect(l_test0_suite.name in ('tests', 'tests2')).to_be_true; - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_logical_suite); case l_test0_suite.name when 'tests' then ut.expect(l_test1_suite.name).to_equal('test_package_1'); ut.expect(l_test1_suite.items.count).to_equal(3); - ut.expect(l_test1_suite.rollback_type).to_equal(ut3.ut_utils.gc_rollback_manual); - l_test2_suite := treat(l_test1_suite.items(1) as ut3.ut_logical_suite); + ut.expect(l_test1_suite.rollback_type).to_equal(ut3_develop.ut_utils.gc_rollback_manual); + l_test2_suite := treat(l_test1_suite.items(1) as ut3_develop.ut_logical_suite); ut.expect(l_test2_suite.name).to_equal('test_package_2'); ut.expect(l_test2_suite.items.count).to_equal(3); - ut.expect(l_test2_suite.rollback_type).to_equal(ut3.ut_utils.gc_rollback_manual); + ut.expect(l_test2_suite.rollback_type).to_equal(ut3_develop.ut_utils.gc_rollback_manual); when 'tests2' then ut.expect(l_test1_suite.name).to_equal('test_package_3'); ut.expect(l_test1_suite.items.count).to_equal(3); @@ -339,84 +339,84 @@ end test_package_with_ctx;]'; procedure test_top2_by_name is c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||'.test_package_2'; - l_objects_to_run ut3.ut_suite_items; + l_objects_to_run ut3_develop.ut_suite_items; - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test2_suite ut3.ut_logical_suite; + l_test0_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_logical_suite; + l_test2_suite ut3_develop.ut_logical_suite; begin --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); --Assert ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + l_test0_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); ut.expect(l_test0_suite.name).to_equal('tests'); ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_logical_suite); ut.expect(l_test1_suite.name).to_equal('test_package_1'); ut.expect(l_test1_suite.items.count).to_equal(1); - ut.expect(l_test1_suite.rollback_type).to_equal(ut3.ut_utils.gc_rollback_manual); - l_test2_suite := treat(l_test1_suite.items(1) as ut3.ut_logical_suite); + ut.expect(l_test1_suite.rollback_type).to_equal(ut3_develop.ut_utils.gc_rollback_manual); + l_test2_suite := treat(l_test1_suite.items(1) as ut3_develop.ut_logical_suite); ut.expect(l_test2_suite.name).to_equal('test_package_2'); - ut.expect(l_test2_suite.rollback_type).to_equal(ut3.ut_utils.gc_rollback_manual); + ut.expect(l_test2_suite.rollback_type).to_equal(ut3_develop.ut_utils.gc_rollback_manual); ut.expect(l_test2_suite.items.count).to_equal(3); end; procedure test_top2_bt_name_cur_user is c_path varchar2(100) := 'test_package_2'; - l_objects_to_run ut3.ut_suite_items; + l_objects_to_run ut3_develop.ut_suite_items; - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test2_suite ut3.ut_logical_suite; + l_test0_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_logical_suite; + l_test2_suite ut3_develop.ut_logical_suite; begin --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); --Assert ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + l_test0_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); ut.expect(l_test0_suite.name).to_equal('tests'); ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_logical_suite); ut.expect(l_test1_suite.name).to_equal('test_package_1'); ut.expect(l_test1_suite.items.count).to_equal(1); - ut.expect(l_test1_suite.rollback_type).to_equal(ut3.ut_utils.gc_rollback_manual); - l_test2_suite := treat(l_test1_suite.items(1) as ut3.ut_logical_suite); + ut.expect(l_test1_suite.rollback_type).to_equal(ut3_develop.ut_utils.gc_rollback_manual); + l_test2_suite := treat(l_test1_suite.items(1) as ut3_develop.ut_logical_suite); ut.expect(l_test2_suite.name).to_equal('test_package_2'); - ut.expect(l_test2_suite.rollback_type).to_equal(ut3.ut_utils.gc_rollback_manual); + ut.expect(l_test2_suite.rollback_type).to_equal(ut3_develop.ut_utils.gc_rollback_manual); ut.expect(l_test2_suite.items.count).to_equal(3); end; procedure test_by_path_to_subsuite is c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||':tests.test_package_1.test_package_2'; - l_objects_to_run ut3.ut_suite_items; + l_objects_to_run ut3_develop.ut_suite_items; - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test2_suite ut3.ut_logical_suite; + l_test0_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_logical_suite; + l_test2_suite ut3_develop.ut_logical_suite; begin --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); --Assert ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + l_test0_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); ut.expect(l_test0_suite.name).to_equal('tests'); ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_logical_suite); ut.expect(l_test1_suite.name).to_equal('test_package_1'); ut.expect(l_test1_suite.items.count).to_equal(1); - l_test2_suite := treat(l_test1_suite.items(1) as ut3.ut_logical_suite); + l_test2_suite := treat(l_test1_suite.items(1) as ut3_develop.ut_logical_suite); ut.expect(l_test2_suite.name).to_equal('test_package_2'); ut.expect(l_test2_suite.items.count).to_equal(3); @@ -424,26 +424,26 @@ end test_package_with_ctx;]'; procedure test_by_path_to_subsuite_cu is c_path varchar2(100) := ':tests.test_package_1.test_package_2'; - l_objects_to_run ut3.ut_suite_items; + l_objects_to_run ut3_develop.ut_suite_items; - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test2_suite ut3.ut_logical_suite; + l_test0_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_logical_suite; + l_test2_suite ut3_develop.ut_logical_suite; begin --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); --Assert ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + l_test0_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); ut.expect(l_test0_suite.name).to_equal('tests'); ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_logical_suite); ut.expect(l_test1_suite.name).to_equal('test_package_1'); ut.expect(l_test1_suite.items.count).to_equal(1); - l_test2_suite := treat(l_test1_suite.items(1) as ut3.ut_logical_suite); + l_test2_suite := treat(l_test1_suite.items(1) as ut3_develop.ut_logical_suite); ut.expect(l_test2_suite.name).to_equal('test_package_2'); ut.expect(l_test2_suite.items.count).to_equal(3); @@ -451,36 +451,36 @@ end test_package_with_ctx;]'; procedure test_subsute_proc_by_path is c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||':tests.test_package_1.test_package_2.test2'; - l_objects_to_run ut3.ut_suite_items; + l_objects_to_run ut3_develop.ut_suite_items; - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test2_suite ut3.ut_logical_suite; - l_test_proc ut3.ut_test; + l_test0_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_logical_suite; + l_test2_suite ut3_develop.ut_logical_suite; + l_test_proc ut3_develop.ut_test; begin --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); --Assert ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + l_test0_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); ut.expect(l_test0_suite.name).to_equal('tests'); ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_logical_suite); ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.rollback_type).to_equal(ut3.ut_utils.gc_rollback_manual); + ut.expect(l_test1_suite.rollback_type).to_equal(ut3_develop.ut_utils.gc_rollback_manual); ut.expect(l_test1_suite.items.count).to_equal(1); - l_test2_suite := treat(l_test1_suite.items(1) as ut3.ut_logical_suite); + l_test2_suite := treat(l_test1_suite.items(1) as ut3_develop.ut_logical_suite); ut.expect(l_test2_suite.name).to_equal('test_package_2'); - ut.expect(l_test2_suite.rollback_type).to_equal(ut3.ut_utils.gc_rollback_manual); + ut.expect(l_test2_suite.rollback_type).to_equal(ut3_develop.ut_utils.gc_rollback_manual); ut.expect(l_test2_suite.items.count).to_equal(1); - l_test_proc := treat(l_test2_suite.items(1) as ut3.ut_test); + l_test_proc := treat(l_test2_suite.items(1) as ut3_develop.ut_test); ut.expect(l_test_proc.name).to_equal('test2'); - ut.expect(l_test_proc.rollback_type).to_equal(ut3.ut_utils.gc_rollback_manual); + ut.expect(l_test_proc.rollback_type).to_equal(ut3_develop.ut_utils.gc_rollback_manual); ut.expect(l_test_proc.before_test_list.count).to_be_greater_than(0); ut.expect(l_test_proc.after_test_list.count).to_be_greater_than(0); @@ -488,32 +488,32 @@ end test_package_with_ctx;]'; procedure test_subsute_proc_by_path_cu is c_path varchar2(100) := ':tests.test_package_1.test_package_2.test2'; - l_objects_to_run ut3.ut_suite_items; + l_objects_to_run ut3_develop.ut_suite_items; - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test2_suite ut3.ut_logical_suite; - l_test_proc ut3.ut_test; + l_test0_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_logical_suite; + l_test2_suite ut3_develop.ut_logical_suite; + l_test_proc ut3_develop.ut_test; begin --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); --Assert ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + l_test0_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); ut.expect(l_test0_suite.name).to_equal('tests'); ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_logical_suite); ut.expect(l_test1_suite.name).to_equal('test_package_1'); ut.expect(l_test1_suite.items.count).to_equal(1); - l_test2_suite := treat(l_test1_suite.items(1) as ut3.ut_logical_suite); + l_test2_suite := treat(l_test1_suite.items(1) as ut3_develop.ut_logical_suite); ut.expect(l_test2_suite.name).to_equal('test_package_2'); ut.expect(l_test2_suite.items.count).to_equal(1); - l_test_proc := treat(l_test2_suite.items(1) as ut3.ut_test); + l_test_proc := treat(l_test2_suite.items(1) as ut3_develop.ut_test); ut.expect(l_test_proc.name).to_equal('test2'); ut.expect(l_test_proc.before_test_list.count).to_be_greater_than(0); ut.expect(l_test_proc.after_test_list.count).to_be_greater_than(0); @@ -521,101 +521,101 @@ end test_package_with_ctx;]'; procedure test_top_pack_by_name is c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||'.test_package_1'; - l_objects_to_run ut3.ut_suite_items; + l_objects_to_run ut3_develop.ut_suite_items; - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_suite; + l_test0_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_suite; begin --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); --Assert ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + l_test0_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); ut.expect(l_test0_suite.name).to_equal('tests'); ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_suite); + l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_suite); ut.expect(l_test1_suite.name).to_equal('test_package_1'); ut.expect(l_test1_suite.items.count).to_equal(2); ut.expect(l_test1_suite.items(1).name).to_equal('test1'); ut.expect(l_test1_suite.items(1).description).to_equal('Test1 from test package 1'); - ut.expect(treat(l_test1_suite.items(1) as ut3.ut_test).before_test_list.count).to_equal(0); - ut.expect(treat(l_test1_suite.items(1) as ut3.ut_test).after_test_list.count).to_equal(0); - ut.expect(treat(l_test1_suite.items(1) as ut3.ut_test).before_each_list.count).to_be_greater_than(0); - ut.expect(treat(l_test1_suite.items(1) as ut3.ut_test).disabled_flag).to_equal(0); + ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).before_test_list.count).to_equal(0); + ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).after_test_list.count).to_equal(0); + ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).before_each_list.count).to_be_greater_than(0); + ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).disabled_flag).to_equal(0); ut.expect(l_test1_suite.items(2).name).to_equal('test2'); ut.expect(l_test1_suite.items(2).description).to_equal('Test2 from test package 1'); - ut.expect(treat(l_test1_suite.items(2) as ut3.ut_test).before_test_list.count).to_be_greater_than(0); - ut.expect(treat(l_test1_suite.items(2) as ut3.ut_test).after_test_list.count).to_be_greater_than(0); - ut.expect(treat(l_test1_suite.items(2) as ut3.ut_test).before_each_list.count).to_be_greater_than(0); - ut.expect(treat(l_test1_suite.items(2) as ut3.ut_test).disabled_flag).to_equal(0); + ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).before_test_list.count).to_be_greater_than(0); + ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).after_test_list.count).to_be_greater_than(0); + ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).before_each_list.count).to_be_greater_than(0); + ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).disabled_flag).to_equal(0); end; procedure test_top_pack_by_name_cu is c_path varchar2(100) := 'test_package_1'; - l_objects_to_run ut3.ut_suite_items; + l_objects_to_run ut3_develop.ut_suite_items; - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_suite; - l_test2_suite ut3.ut_suite; + l_test0_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_suite; + l_test2_suite ut3_develop.ut_suite; begin --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); --Assert ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + l_test0_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); ut.expect(l_test0_suite.name).to_equal('tests'); ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_suite); + l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_suite); ut.expect(l_test1_suite.name).to_equal('test_package_1'); ut.expect(l_test1_suite.items.count).to_equal(2); ut.expect(l_test1_suite.items(1).name).to_equal('test1'); ut.expect(l_test1_suite.items(1).description).to_equal('Test1 from test package 1'); - ut.expect(treat(l_test1_suite.items(1) as ut3.ut_test).before_test_list.count).to_equal(0); - ut.expect(treat(l_test1_suite.items(1) as ut3.ut_test).after_test_list.count).to_equal(0); - ut.expect(treat(l_test1_suite.items(1) as ut3.ut_test).before_each_list.count).to_be_greater_than(0); - ut.expect(treat(l_test1_suite.items(1) as ut3.ut_test).disabled_flag).to_equal(0); + ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).before_test_list.count).to_equal(0); + ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).after_test_list.count).to_equal(0); + ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).before_each_list.count).to_be_greater_than(0); + ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).disabled_flag).to_equal(0); ut.expect(l_test1_suite.items(2).name).to_equal('test2'); ut.expect(l_test1_suite.items(2).description).to_equal('Test2 from test package 1'); - ut.expect(treat(l_test1_suite.items(2) as ut3.ut_test).before_test_list.count).to_be_greater_than(0); - ut.expect(treat(l_test1_suite.items(2) as ut3.ut_test).after_test_list.count).to_be_greater_than(0); - ut.expect(treat(l_test1_suite.items(2) as ut3.ut_test).before_each_list.count).to_be_greater_than(0); - ut.expect(treat(l_test1_suite.items(2) as ut3.ut_test).disabled_flag).to_equal(0); + ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).before_test_list.count).to_be_greater_than(0); + ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).after_test_list.count).to_be_greater_than(0); + ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).before_each_list.count).to_be_greater_than(0); + ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).disabled_flag).to_equal(0); end; procedure test_top_pack_by_path is c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||':tests'; - l_objects_to_run ut3.ut_suite_items; + l_objects_to_run ut3_develop.ut_suite_items; - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test2_suite ut3.ut_logical_suite; + l_test0_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_logical_suite; + l_test2_suite ut3_develop.ut_logical_suite; begin --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); --Assert ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + l_test0_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); ut.expect(l_test0_suite.name).to_equal('tests'); ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_logical_suite); ut.expect(l_test1_suite.name).to_equal('test_package_1'); ut.expect(l_test1_suite.items.count).to_equal(3); - l_test2_suite := treat(l_test1_suite.items(1) as ut3.ut_logical_suite); + l_test2_suite := treat(l_test1_suite.items(1) as ut3_develop.ut_logical_suite); ut.expect(l_test2_suite.name).to_equal('test_package_2'); ut.expect(l_test2_suite.items.count).to_equal(3); @@ -623,26 +623,26 @@ end test_package_with_ctx;]'; procedure test_top_pack_by_path_cu is c_path varchar2(100) := ':tests'; - l_objects_to_run ut3.ut_suite_items; + l_objects_to_run ut3_develop.ut_suite_items; - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test2_suite ut3.ut_logical_suite; + l_test0_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_logical_suite; + l_test2_suite ut3_develop.ut_logical_suite; begin --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); --Assert ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + l_test0_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); ut.expect(l_test0_suite.name).to_equal('tests'); ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_logical_suite); ut.expect(l_test1_suite.name).to_equal('test_package_1'); ut.expect(l_test1_suite.items.count).to_equal(3); - l_test2_suite := treat(l_test1_suite.items(1) as ut3.ut_logical_suite); + l_test2_suite := treat(l_test1_suite.items(1) as ut3_develop.ut_logical_suite); ut.expect(l_test2_suite.name).to_equal('test_package_2'); ut.expect(l_test2_suite.items.count).to_equal(3); @@ -650,27 +650,27 @@ end test_package_with_ctx;]'; procedure test_top_pck_proc_by_path is c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||':tests.test_package_1.test2'; - l_objects_to_run ut3.ut_suite_items; + l_objects_to_run ut3_develop.ut_suite_items; - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test2_suite ut3.ut_logical_suite; - l_test_proc ut3.ut_test; + l_test0_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_logical_suite; + l_test2_suite ut3_develop.ut_logical_suite; + l_test_proc ut3_develop.ut_test; begin --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); --Assert ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + l_test0_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); ut.expect(l_test0_suite.name).to_equal('tests'); ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_logical_suite); ut.expect(l_test1_suite.name).to_equal('test_package_1'); ut.expect(l_test1_suite.items.count).to_equal(1); - l_test_proc := treat(l_test1_suite.items(1) as ut3.ut_test); + l_test_proc := treat(l_test1_suite.items(1) as ut3_develop.ut_test); ut.expect(l_test_proc.name).to_equal('test2'); ut.expect(l_test_proc.description).to_equal('Test2 from test package 1'); @@ -680,27 +680,27 @@ end test_package_with_ctx;]'; procedure test_top_pck_proc_by_path_cu is c_path varchar2(100) := ':tests.test_package_1.test2'; - l_objects_to_run ut3.ut_suite_items; + l_objects_to_run ut3_develop.ut_suite_items; - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test2_suite ut3.ut_logical_suite; - l_test_proc ut3.ut_test; + l_test0_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_logical_suite; + l_test2_suite ut3_develop.ut_logical_suite; + l_test_proc ut3_develop.ut_test; begin --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); --Assert ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + l_test0_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); ut.expect(l_test0_suite.name).to_equal('tests'); ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_logical_suite); ut.expect(l_test1_suite.name).to_equal('test_package_1'); ut.expect(l_test1_suite.items.count).to_equal(1); - l_test_proc := treat(l_test1_suite.items(1) as ut3.ut_test); + l_test_proc := treat(l_test1_suite.items(1) as ut3_develop.ut_test); ut.expect(l_test_proc.name).to_equal('test2'); ut.expect(l_test_proc.description).to_equal('Test2 from test package 1'); @@ -710,27 +710,27 @@ end test_package_with_ctx;]'; procedure test_top_pkc_proc_by_name is c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||'.test_package_1.test2'; - l_objects_to_run ut3.ut_suite_items; + l_objects_to_run ut3_develop.ut_suite_items; - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test_proc ut3.ut_test; + l_test0_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_logical_suite; + l_test_proc ut3_develop.ut_test; begin --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); --Assert ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + l_test0_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); ut.expect(l_test0_suite.name).to_equal('tests'); ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_logical_suite); ut.expect(l_test1_suite.name).to_equal('test_package_1'); ut.expect(l_test1_suite.items.count).to_equal(1); - l_test_proc := treat(l_test1_suite.items(1) as ut3.ut_test); + l_test_proc := treat(l_test1_suite.items(1) as ut3_develop.ut_test); ut.expect(l_test_proc.name).to_equal('test2'); ut.expect(l_test_proc.before_test_list.count).to_be_greater_than(0); ut.expect(l_test_proc.after_test_list.count).to_be_greater_than(0); @@ -738,27 +738,27 @@ end test_package_with_ctx;]'; procedure test_top_pkc_proc_by_name_cu is c_path varchar2(100) := 'test_package_1.test2'; - l_objects_to_run ut3.ut_suite_items; + l_objects_to_run ut3_develop.ut_suite_items; - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test_proc ut3.ut_test; + l_test0_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_logical_suite; + l_test_proc ut3_develop.ut_test; begin --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); --Assert ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + l_test0_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); ut.expect(l_test0_suite.name).to_equal('tests'); ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_logical_suite); ut.expect(l_test1_suite.name).to_equal('test_package_1'); ut.expect(l_test1_suite.items.count).to_equal(1); - l_test_proc := treat(l_test1_suite.items(1) as ut3.ut_test); + l_test_proc := treat(l_test1_suite.items(1) as ut3_develop.ut_test); ut.expect(l_test_proc.name).to_equal('test2'); ut.expect(l_test_proc.before_test_list.count).to_be_greater_than(0); ut.expect(l_test_proc.after_test_list.count).to_be_greater_than(0); @@ -766,139 +766,139 @@ end test_package_with_ctx;]'; procedure test_top_pkc_nosub_by_name is c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||'.test_package_3'; - l_objects_to_run ut3.ut_suite_items; + l_objects_to_run ut3_develop.ut_suite_items; - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test1 ut3.ut_test; - l_test3 ut3.ut_test; + l_test0_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_logical_suite; + l_test1 ut3_develop.ut_test; + l_test3 ut3_develop.ut_test; begin --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); --Assert ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + l_test0_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); ut.expect(l_test0_suite.name).to_equal('tests2'); ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_logical_suite); ut.expect(l_test1_suite.name).to_equal('test_package_3'); ut.expect(l_test1_suite.items.count).to_equal(3); - l_test1 := treat(l_test1_suite.items(1) as ut3.ut_test); + l_test1 := treat(l_test1_suite.items(1) as ut3_develop.ut_test); ut.expect(l_test1.name).to_equal('test1'); ut.expect(l_test1.DISABLED_FLAG).to_equal(0); - l_test3 := treat(l_test1_suite.items(3) as ut3.ut_test); + l_test3 := treat(l_test1_suite.items(3) as ut3_develop.ut_test); ut.expect(l_test3.name).to_equal('disabled_test'); ut.expect(l_test3.DISABLED_FLAG).to_equal(1); end; procedure test_top_pkc_nosub_by_name_cu is c_path varchar2(100) := 'test_package_3'; - l_objects_to_run ut3.ut_suite_items; + l_objects_to_run ut3_develop.ut_suite_items; - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test1 ut3.ut_test; - l_test3 ut3.ut_test; + l_test0_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_logical_suite; + l_test1 ut3_develop.ut_test; + l_test3 ut3_develop.ut_test; begin --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); --Assert ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + l_test0_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); ut.expect(l_test0_suite.name).to_equal('tests2'); ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_logical_suite); ut.expect(l_test1_suite.name).to_equal('test_package_3'); ut.expect(l_test1_suite.items.count).to_equal(3); - l_test1 := treat(l_test1_suite.items(1) as ut3.ut_test); + l_test1 := treat(l_test1_suite.items(1) as ut3_develop.ut_test); ut.expect(l_test1.name).to_equal('test1'); ut.expect(l_test1.DISABLED_FLAG).to_equal(0); - l_test3 := treat(l_test1_suite.items(3) as ut3.ut_test); + l_test3 := treat(l_test1_suite.items(3) as ut3_develop.ut_test); ut.expect(l_test3.name).to_equal('disabled_test'); ut.expect(l_test3.DISABLED_FLAG).to_equal(1); end; procedure test_top_subpck_by_path is c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||':tests2.test_package_3'; - l_objects_to_run ut3.ut_suite_items; + l_objects_to_run ut3_develop.ut_suite_items; - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test1 ut3.ut_test; - l_test3 ut3.ut_test; + l_test0_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_logical_suite; + l_test1 ut3_develop.ut_test; + l_test3 ut3_develop.ut_test; begin --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); --Assert ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + l_test0_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); ut.expect(l_test0_suite.name).to_equal('tests2'); ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_logical_suite); ut.expect(l_test1_suite.name).to_equal('test_package_3'); ut.expect(l_test1_suite.items.count).to_equal(3); - l_test1 := treat(l_test1_suite.items(1) as ut3.ut_test); + l_test1 := treat(l_test1_suite.items(1) as ut3_develop.ut_test); ut.expect(l_test1.name).to_equal('test1'); ut.expect(l_test1.DISABLED_FLAG).to_equal(0); - l_test3 := treat(l_test1_suite.items(3) as ut3.ut_test); + l_test3 := treat(l_test1_suite.items(3) as ut3_develop.ut_test); ut.expect(l_test3.name).to_equal('disabled_test'); ut.expect(l_test3.DISABLED_FLAG).to_equal(1); end; procedure test_top_subpck_by_path_cu is c_path varchar2(100) := ':tests2.test_package_3'; - l_objects_to_run ut3.ut_suite_items; + l_objects_to_run ut3_develop.ut_suite_items; - l_test0_suite ut3.ut_logical_suite; - l_test1_suite ut3.ut_logical_suite; - l_test1 ut3.ut_test; - l_test3 ut3.ut_test; + l_test0_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_logical_suite; + l_test1 ut3_develop.ut_test; + l_test3 ut3_develop.ut_test; begin --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); --Assert ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + l_test0_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); ut.expect(l_test0_suite.name).to_equal('tests2'); ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut3.ut_logical_suite); + l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_logical_suite); ut.expect(l_test1_suite.name).to_equal('test_package_3'); ut.expect(l_test1_suite.items.count).to_equal(3); - l_test1 := treat(l_test1_suite.items(1) as ut3.ut_test); + l_test1 := treat(l_test1_suite.items(1) as ut3_develop.ut_test); ut.expect(l_test1.name).to_equal('test1'); ut.expect(l_test1.DISABLED_FLAG).to_equal(0); - l_test3 := treat(l_test1_suite.items(3) as ut3.ut_test); + l_test3 := treat(l_test1_suite.items(3) as ut3_develop.ut_test); ut.expect(l_test3.name).to_equal('disabled_test'); ut.expect(l_test3.DISABLED_FLAG).to_equal(1); end; procedure test_search_invalid_pck is - l_objects_to_run ut3.ut_suite_items; + l_objects_to_run ut3_develop.ut_suite_items; begin - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('failing_invalid_spec')); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list('failing_invalid_spec')); - ut3.ut.expect(l_objects_to_run.count).to_be_greater_than(0); - ut3.ut.expect(l_objects_to_run(l_objects_to_run.first).object_name).to_equal('failing_invalid_spec'); + ut3_develop.ut.expect(l_objects_to_run.count).to_be_greater_than(0); + ut3_develop.ut.expect(l_objects_to_run(l_objects_to_run.first).object_name).to_equal('failing_invalid_spec'); end; procedure compile_invalid_package is @@ -936,9 +936,9 @@ end;]'; end; procedure test_search_nonexisting_pck is - l_objects_to_run ut3.ut_suite_items; + l_objects_to_run ut3_develop.ut_suite_items; begin - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('ut3.failing_non_existing')); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list('ut3_develop.failing_non_existing')); ut.fail('Non existing package did not raise exception'); exception when others then @@ -946,9 +946,9 @@ end;]'; end; procedure test_search_nonexist_sch_pck is - l_objects_to_run ut3.ut_suite_items; + l_objects_to_run ut3_develop.ut_suite_items; begin - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('failing_non_existing')); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list('failing_non_existing')); ut.fail('Non existing package without schema did not raise exception'); exception when others then @@ -956,27 +956,27 @@ end;]'; end; procedure test_desc_with_comma is - l_objects_to_run ut3.ut_suite_items; - l_suite ut3.ut_suite; - l_test ut3.ut_test; + l_objects_to_run ut3_develop.ut_suite_items; + l_suite ut3_develop.ut_suite; + l_test ut3_develop.ut_test; begin - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('tst_package_to_be_dropped')); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list('tst_package_to_be_dropped')); --Assert ut.expect(l_objects_to_run.count).to_equal(1); - l_suite := treat(l_objects_to_run(1) as ut3.ut_suite); + l_suite := treat(l_objects_to_run(1) as ut3_develop.ut_suite); ut.expect(l_suite.name).to_equal('tst_package_to_be_dropped'); ut.expect(l_suite.description).to_equal('A suite description, though with comma, is assigned by suite_manager'); ut.expect(l_suite.items.count).to_equal(2); - l_test := treat(l_suite.items(1) as ut3.ut_test); + l_test := treat(l_suite.items(1) as ut3_develop.ut_test); ut.expect(l_test.name).to_equal('test1'); ut.expect(l_test.description).to_equal('A test description, though with comma, is assigned by suite_manager'); --- l_test := treat(l_suite.items(2) as ut3.ut_test); +-- l_test := treat(l_suite.items(2) as ut3_develop.ut_test); -- -- ut.expect(l_test.name).to_equal('test2'); -- ut.expect(l_test.description).to_equal('A test description, though with comma, is assigned by suite_manager'); @@ -1013,16 +1013,16 @@ end;'; end; procedure test_inv_cache_on_drop is - l_test_report ut3.ut_varchar2_list; + l_test_report ut3_develop.ut_varchar2_list; begin - select * bulk collect into l_test_report from table(ut3.ut.run(sys_context('USERENV', 'CURRENT_USER')||'.tst_package_to_be_dropped')); + select * bulk collect into l_test_report from table(ut3_develop.ut.run(sys_context('USERENV', 'CURRENT_USER')||'.tst_package_to_be_dropped')); -- drop package clean_inv_cache_on_drop; begin - select * bulk collect into l_test_report from table(ut3.ut.run(sys_context('USERENV', 'CURRENT_USER') || '.tst_package_to_be_dropped')); + select * bulk collect into l_test_report from table(ut3_develop.ut.run(sys_context('USERENV', 'CURRENT_USER') || '.tst_package_to_be_dropped')); ut.fail('Cache not invalidated on package drop'); exception when others then @@ -1056,15 +1056,15 @@ end;'; end; procedure test_inv_pck_bodies is - l_test_report ut3.ut_varchar2_list; + l_test_report ut3_develop.ut_varchar2_list; begin - select * bulk collect into l_test_report from table(ut3.ut.run(sys_context('USERENV', 'CURRENT_USER')||'.test_dependencies')); + select * bulk collect into l_test_report from table(ut3_develop.ut.run(sys_context('USERENV', 'CURRENT_USER')||'.test_dependencies')); ut.expect(l_test_report(l_test_report.count-1)).to_be_like('1 test_, 0 failed, 0 errored, 0 disabled, 0 warning(s)'); - --execute immediate 'select * from table(ut3.ut.run(''UT3.test_dependencies'', ut3.utplsql_test_reporter()))' into l_result; + --execute immediate 'select * from table(ut3_develop.ut.run(''UT3_DEVELOP.test_dependencies'', ut3_develop.utplsql_test_reporter()))' into l_result; --- ut.expect(l_result).to_equal(ut3.ut_utils.gc_success); +-- ut.expect(l_result).to_equal(ut3_develop.ut_utils.gc_success); end; procedure setup_inv_pck_bodies is pragma autonomous_transaction; @@ -1092,16 +1092,16 @@ end;'; end; procedure test_pck_with_dollar is - l_objects_to_run ut3.ut_suite_items; - l_suite ut3.ut_suite; + l_objects_to_run ut3_develop.ut_suite_items; + l_suite ut3_develop.ut_suite; begin --act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('tst_package_with$dollar')); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list('tst_package_with$dollar')); --Assert ut.expect(l_objects_to_run.count).to_equal(1); - l_suite := treat(l_objects_to_run(1) as ut3.ut_suite); + l_suite := treat(l_objects_to_run(1) as ut3_develop.ut_suite); ut.expect(l_suite.name).to_equal('tst_package_with$dollar'); end; procedure setup_pck_with_dollar is @@ -1127,16 +1127,16 @@ end;'; procedure test_pck_with_hash is - l_objects_to_run ut3.ut_suite_items; - l_suite ut3.ut_suite; + l_objects_to_run ut3_develop.ut_suite_items; + l_suite ut3_develop.ut_suite; begin --act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('tst_package_with#hash')); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list('tst_package_with#hash')); --Assert ut.expect(l_objects_to_run.count).to_equal(1); - l_suite := treat(l_objects_to_run(1) as ut3.ut_suite); + l_suite := treat(l_objects_to_run(1) as ut3_develop.ut_suite); ut.expect(l_suite.name).to_equal('tst_package_with#hash'); end; procedure setup_pck_with_hash is @@ -1162,22 +1162,22 @@ end;'; procedure test_test_with_dollar is - l_objects_to_run ut3.ut_suite_items; - l_suite ut3.ut_suite; - l_test ut3.ut_test; + l_objects_to_run ut3_develop.ut_suite_items; + l_suite ut3_develop.ut_suite; + l_test ut3_develop.ut_test; begin --act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('tst_package_with_dollar_test.test$1')); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list('tst_package_with_dollar_test.test$1')); --Assert ut.expect(l_objects_to_run.count).to_equal(1); - l_suite := treat(l_objects_to_run(1) as ut3.ut_suite); + l_suite := treat(l_objects_to_run(1) as ut3_develop.ut_suite); ut.expect(l_suite.name).to_equal('tst_package_with_dollar_test'); ut.expect(l_suite.items.count).to_equal(1); - l_test := treat(l_suite.items(1) as ut3.ut_test); + l_test := treat(l_suite.items(1) as ut3_develop.ut_test); ut.expect(l_test.name).to_equal('test$1'); @@ -1203,22 +1203,22 @@ end;'; end; procedure test_test_with_hash is - l_objects_to_run ut3.ut_suite_items; - l_suite ut3.ut_suite; - l_test ut3.ut_test; + l_objects_to_run ut3_develop.ut_suite_items; + l_suite ut3_develop.ut_suite; + l_test ut3_develop.ut_test; begin --act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('tst_package_with_hash_test.test#1')); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list('tst_package_with_hash_test.test#1')); --Assert ut.expect(l_objects_to_run.count).to_equal(1); - l_suite := treat(l_objects_to_run(1) as ut3.ut_suite); + l_suite := treat(l_objects_to_run(1) as ut3_develop.ut_suite); ut.expect(l_suite.name).to_equal('tst_package_with_hash_test'); ut.expect(l_suite.items.count).to_equal(1); - l_test := treat(l_suite.items(1) as ut3.ut_test); + l_test := treat(l_suite.items(1) as ut3_develop.ut_test); ut.expect(l_test.name).to_equal('test#1'); @@ -1244,17 +1244,17 @@ end;'; end; procedure test_empty_suite_path is - l_objects_to_run ut3.ut_suite_items; - l_suite ut3.ut_suite; + l_objects_to_run ut3_develop.ut_suite_items; + l_suite ut3_develop.ut_suite; begin --act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('tst_empty_suite_path')); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list('tst_empty_suite_path')); --Assert ut.expect(l_objects_to_run.count).to_equal(1); - l_suite := treat(l_objects_to_run(1) as ut3.ut_suite); + l_suite := treat(l_objects_to_run(1) as ut3_develop.ut_suite); ut.expect(l_suite.name).to_equal('tst_empty_suite_path'); end; @@ -1281,25 +1281,25 @@ end;'; end; procedure test_pck_with_same_path is - l_objects_to_run ut3.ut_suite_items; - l_suite1 ut3.ut_logical_suite; - l_suite2 ut3.ut_logical_suite; - l_suite3 ut3.ut_suite; + l_objects_to_run ut3_develop.ut_suite_items; + l_suite1 ut3_develop.ut_logical_suite; + l_suite2 ut3_develop.ut_logical_suite; + l_suite3 ut3_develop.ut_suite; begin - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(':test1.test2$.test_package_same_1')); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(':test1.test2$.test_package_same_1')); --Assert ut.expect(l_objects_to_run.count).to_equal(1); - l_suite1 := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + l_suite1 := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); ut.expect(l_suite1.name).to_equal('test1'); ut.expect(l_suite1.items.count).to_equal(1); - l_suite2 := treat(l_suite1.items(1) as ut3.ut_logical_suite); + l_suite2 := treat(l_suite1.items(1) as ut3_develop.ut_logical_suite); ut.expect(l_suite2.name).to_equal('test2$'); ut.expect(l_suite2.items.count).to_equal(1); - l_suite3 := treat(l_suite2.items(1) as ut3.ut_suite); + l_suite3 := treat(l_suite2.items(1) as ut3_develop.ut_suite); ut.expect(l_suite3.name).to_equal('test_package_same_1'); end; @@ -1359,17 +1359,17 @@ end;]'; end; procedure disable_suite_floating_annot is - l_objects_to_run ut3.ut_suite_items; - l_suite ut3.ut_suite; + l_objects_to_run ut3_develop.ut_suite_items; + l_suite ut3_develop.ut_suite; begin --Arrange setup_disabled_pck; --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list('test_disabled_floating')); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list('test_disabled_floating')); --Assert ut.expect(l_objects_to_run.count).to_equal(1); - l_suite := treat(l_objects_to_run(1) as ut3.ut_suite); + l_suite := treat(l_objects_to_run(1) as ut3_develop.ut_suite); ut.expect(l_suite.name).to_equal('test_disabled_floating'); ut.expect(l_suite.get_disabled_flag()).to_be_true(); @@ -1378,66 +1378,66 @@ end;]'; procedure pck_proc_in_ctx_by_name is c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||'.test_package_with_ctx.test1'; - l_objects_to_run ut3.ut_suite_items; + l_objects_to_run ut3_develop.ut_suite_items; - l_test_suite ut3.ut_logical_suite; - l_ctx_suite ut3.ut_logical_suite; - l_test_proc ut3.ut_test; + l_test_suite ut3_develop.ut_logical_suite; + l_ctx_suite ut3_develop.ut_logical_suite; + l_test_proc ut3_develop.ut_test; begin --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); --Assert ut.expect(l_objects_to_run.count).to_equal(1); - l_test_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + l_test_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); ut.expect(l_test_suite.name).to_equal('test_package_with_ctx'); ut.expect(l_test_suite.items.count).to_equal(1); - l_ctx_suite := treat(l_test_suite.items(1) as ut3.ut_logical_suite); + l_ctx_suite := treat(l_test_suite.items(1) as ut3_develop.ut_logical_suite); ut.expect(l_ctx_suite.name).to_equal('some_context'); ut.expect(l_ctx_suite.description).to_equal('Some context description'); ut.expect(l_ctx_suite.items.count).to_equal(1); - l_test_proc := treat(l_ctx_suite.items(1) as ut3.ut_test); + l_test_proc := treat(l_ctx_suite.items(1) as ut3_develop.ut_test); ut.expect(l_test_proc.name).to_equal('test1'); end; procedure pck_proc_in_ctx_by_path is c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||':test_package_with_ctx.some_context.test1'; - l_objects_to_run ut3.ut_suite_items; + l_objects_to_run ut3_develop.ut_suite_items; - l_test_suite ut3.ut_logical_suite; - l_ctx_suite ut3.ut_logical_suite; - l_test_proc ut3.ut_test; + l_test_suite ut3_develop.ut_logical_suite; + l_ctx_suite ut3_develop.ut_logical_suite; + l_test_proc ut3_develop.ut_test; begin --Act - l_objects_to_run := ut3.ut_suite_manager.configure_execution_by_path(ut3.ut_varchar2_list(c_path)); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); --Assert ut.expect(l_objects_to_run.count).to_equal(1); - l_test_suite := treat(l_objects_to_run(1) as ut3.ut_logical_suite); + l_test_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); ut.expect(l_test_suite.name).to_equal('test_package_with_ctx'); ut.expect(l_test_suite.items.count).to_equal(1); - l_ctx_suite := treat(l_test_suite.items(1) as ut3.ut_logical_suite); + l_ctx_suite := treat(l_test_suite.items(1) as ut3_develop.ut_logical_suite); ut.expect(l_ctx_suite.name).to_equal('some_context'); ut.expect(l_ctx_suite.description).to_equal('Some context description'); ut.expect(l_ctx_suite.items.count).to_equal(1); - l_test_proc := treat(l_ctx_suite.items(1) as ut3.ut_test); + l_test_proc := treat(l_ctx_suite.items(1) as ut3_develop.ut_test); ut.expect(l_test_proc.name).to_equal('test1'); end; procedure test_get_schema_ut_packages is - l_expected ut3.ut_object_names; - l_actual ut3.ut_object_names; + l_expected ut3_develop.ut_object_names; + l_actual ut3_develop.ut_object_names; begin - l_expected := ut3.ut_object_names( - ut3.ut_object_name('UT3','SOME_TEST_PACKAGE') + l_expected := ut3_develop.ut_object_names( + ut3_develop.ut_object_name('UT3_DEVELOP','SOME_TEST_PACKAGE') ); - l_actual := ut3_tester_helper.run_helper.get_schema_ut_packages('UT3'); + l_actual := ut3_tester_helper.run_helper.get_schema_ut_packages('UT3_DEVELOP'); ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); end; @@ -1454,16 +1454,16 @@ end;]'; end; procedure add_new_long_test_package is - l_actual ut3.ut_object_names; + l_actual ut3_develop.ut_object_names; l_expected_message varchar2(500); begin - l_expected_message := q'[ORA-20217: 'Suitepath exceeds 1000 CHAR on: UT3.DUMMY_LONG_TEST_PACKAGE,UT3.DUMMY_LONG_TEST_PACKAGE1'%]'; - l_actual := ut3_tester_helper.run_helper.get_schema_ut_packages('UT3'); + l_expected_message := q'[ORA-20217: 'Suitepath exceeds 1000 CHAR on: UT3_DEVELOP.DUMMY_LONG_TEST_PACKAGE,UT3_DEVELOP.DUMMY_LONG_TEST_PACKAGE1'%]'; + l_actual := ut3_tester_helper.run_helper.get_schema_ut_packages('UT3_DEVELOP'); ut.fail('Expected exception for suitpaths over 1k for two packages'); exception when others then ut.expect(dbms_utility.format_error_stack()).to_be_like(l_expected_message); - ut.expect(SQLCODE).to_equal(ut3.ut_utils.gc_value_too_large); + ut.expect(SQLCODE).to_equal(ut3_develop.ut_utils.gc_value_too_large); end; end test_suite_manager; diff --git a/test/ut3_tester/core/test_ut_executable.pkb b/test/ut3_tester/core/test_ut_executable.pkb index 92420de47..337095607 100644 --- a/test/ut3_tester/core/test_ut_executable.pkb +++ b/test/ut3_tester/core/test_ut_executable.pkb @@ -3,13 +3,13 @@ create or replace package body test_ut_executable is g_dbms_output_text varchar2(30) := 'Some output from procedure'; procedure exec_schema_package_proc is - l_executable ut3.ut_executable; - l_test ut3.ut_test; + l_executable ut3_develop.ut_executable; + l_test ut3_develop.ut_test; l_result boolean; begin --Arrange - l_test := ut3.ut_test(a_object_name => 'test_ut_executable',a_name => 'test_ut_executable', a_line_no=> 1); - l_executable := ut3.ut_executable_test( null, 'test_ut_executable', 'passing_proc', ut3.ut_utils.gc_test_execute ); + l_test := ut3_develop.ut_test(a_object_name => 'test_ut_executable',a_name => 'test_ut_executable', a_line_no=> 1); + l_executable := ut3_develop.ut_executable_test( null, 'test_ut_executable', 'passing_proc', ut3_develop.ut_utils.gc_test_execute ); --Act l_result := l_executable.do_execute(l_test); --Assert @@ -19,14 +19,14 @@ create or replace package body test_ut_executable is end; procedure exec_package_proc_output is - l_executable ut3.ut_executable; - l_test ut3.ut_test; + l_executable ut3_develop.ut_executable; + l_test ut3_develop.ut_test; l_result boolean; begin --Arrange - l_test := ut3.ut_test(a_object_owner => 'ut3_tester', a_object_name => 'test_ut_executable',a_name => 'test_ut_executable', a_line_no=> 1); - l_executable := ut3.ut_executable_test( a_owner => 'ut3_tester', a_package => 'test_ut_executable', - a_procedure_name => 'output_proc', a_executable_type => ut3.ut_utils.gc_test_execute ); + l_test := ut3_develop.ut_test(a_object_owner => 'ut3_tester', a_object_name => 'test_ut_executable',a_name => 'test_ut_executable', a_line_no=> 1); + l_executable := ut3_develop.ut_executable_test( a_owner => 'ut3_tester', a_package => 'test_ut_executable', + a_procedure_name => 'output_proc', a_executable_type => ut3_develop.ut_utils.gc_test_execute ); --Act l_result := l_executable.do_execute(l_test); --Assert @@ -36,13 +36,13 @@ create or replace package body test_ut_executable is end; procedure exec_failing_proc is - l_executable ut3.ut_executable; - l_test ut3.ut_test; + l_executable ut3_develop.ut_executable; + l_test ut3_develop.ut_test; l_result boolean; begin --Arrange - l_test := ut3.ut_test(a_object_owner => 'ut3_tester', a_object_name => 'test_ut_executable',a_name => 'test_ut_executable', a_line_no=> 1); - l_executable := ut3.ut_executable_test( 'ut3_tester', 'test_ut_executable', 'throwing_proc', ut3.ut_utils.gc_test_execute ); + l_test := ut3_develop.ut_test(a_object_owner => 'ut3_tester', a_object_name => 'test_ut_executable',a_name => 'test_ut_executable', a_line_no=> 1); + l_executable := ut3_develop.ut_executable_test( 'ut3_tester', 'test_ut_executable', 'throwing_proc', ut3_develop.ut_utils.gc_test_execute ); --Act l_result := l_executable.do_execute(l_test); --Assert @@ -83,10 +83,10 @@ create or replace package body test_ut_executable is procedure form_name is begin - ut.expect(ut3.ut_executable_test( user, ' package ', 'proc', null ).form_name()).to_equal(user||'.package.proc'); - ut.expect(ut3.ut_executable_test( null, 'package', ' proc ', null ).form_name()).to_equal('package.proc'); - ut.expect(ut3.ut_executable_test( null, 'proc', null, null ).form_name()).to_equal('proc'); - ut.expect(ut3.ut_executable_test( ' '||user||' ', 'proc', null, null ).form_name()).to_equal(user||'.proc'); + ut.expect(ut3_develop.ut_executable_test( user, ' package ', 'proc', null ).form_name()).to_equal(user||'.package.proc'); + ut.expect(ut3_develop.ut_executable_test( null, 'package', ' proc ', null ).form_name()).to_equal('package.proc'); + ut.expect(ut3_develop.ut_executable_test( null, 'proc', null, null ).form_name()).to_equal('proc'); + ut.expect(ut3_develop.ut_executable_test( ' '||user||' ', 'proc', null, null ).form_name()).to_equal(user||'.proc'); end; procedure passing_proc is diff --git a/test/ut3_tester/core/test_ut_suite.pkb b/test/ut3_tester/core/test_ut_suite.pkb index 9c52df9e5..7cb9121f6 100644 --- a/test/ut3_tester/core/test_ut_suite.pkb +++ b/test/ut3_tester/core/test_ut_suite.pkb @@ -16,23 +16,23 @@ create or replace package body test_ut_suite is end; procedure disabled_suite is - l_suite ut3.ut_suite; + l_suite ut3_develop.ut_suite; begin --Arrange - l_suite := ut3.ut_suite(a_object_owner => 'ut3_tester_helper', a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); + l_suite := ut3_develop.ut_suite(a_object_owner => 'ut3_tester_helper', a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); l_suite.path := 'ut3_tester_helper.ut_example_tests'; - l_suite.disabled_flag := ut3.ut_utils.boolean_to_int(true); - l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'UT_EXAMPLE_TESTS', 'set_g_number_0', ut3.ut_utils.gc_before_all)); - l_suite.after_all_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'UT_EXAMPLE_TESTS', 'add_1_to_g_number', ut3.ut_utils.gc_before_all)); + l_suite.disabled_flag := ut3_develop.ut_utils.boolean_to_int(true); + l_suite.before_all_list := ut3_develop.ut_executables(ut3_develop.ut_executable('ut3_tester_helper', 'UT_EXAMPLE_TESTS', 'set_g_number_0', ut3_develop.ut_utils.gc_before_all)); + l_suite.after_all_list := ut3_develop.ut_executables(ut3_develop.ut_executable('ut3_tester_helper', 'UT_EXAMPLE_TESTS', 'add_1_to_g_number', ut3_develop.ut_utils.gc_before_all)); l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => 'ut3_tester_helper', a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); + l_suite.items(l_suite.items.last) := ut3_develop.ut_test(a_object_owner => 'ut3_tester_helper', a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => 'ut3_tester_helper', a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); + l_suite.items(l_suite.items.last) := ut3_develop.ut_test(a_object_owner => 'ut3_tester_helper', a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); --Act l_suite.do_execute(); --Assert ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_be_null; - ut.expect(l_suite.result).to_equal(ut3.ut_utils.gc_disabled); + ut.expect(l_suite.result).to_equal(ut3_develop.ut_utils.gc_disabled); ut.expect(l_suite.results_count.disabled_count).to_equal(2); ut.expect(l_suite.results_count.warnings_count).to_equal(0); ut.expect(l_suite.results_count.success_count).to_equal(0); @@ -41,19 +41,19 @@ create or replace package body test_ut_suite is end; procedure beforeall_errors is - l_suite ut3.ut_suite; + l_suite ut3_develop.ut_suite; begin --Arrange - l_suite := ut3.ut_suite(a_object_owner => 'ut3_tester_helper', a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); + l_suite := ut3_develop.ut_suite(a_object_owner => 'ut3_tester_helper', a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); l_suite.path := 'ut3_tester_helper.ut_example_tests'; - l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'UT_EXAMPLE_TESTS', 'failing_procedure', ut3.ut_utils.gc_before_all)); + l_suite.before_all_list := ut3_develop.ut_executables(ut3_develop.ut_executable('ut3_tester_helper', 'UT_EXAMPLE_TESTS', 'failing_procedure', ut3_develop.ut_utils.gc_before_all)); l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'set_g_number_0', a_line_no=> 1); + l_suite.items(l_suite.items.last) := ut3_develop.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'set_g_number_0', a_line_no=> 1); --Act l_suite.do_execute(); --Assert ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_be_null; - ut.expect(l_suite.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(l_suite.result).to_equal(ut3_develop.ut_utils.gc_error); ut.expect(l_suite.results_count.disabled_count).to_equal(0); ut.expect(l_suite.results_count.warnings_count).to_equal(0); ut.expect(l_suite.results_count.success_count).to_equal(0); @@ -62,22 +62,22 @@ create or replace package body test_ut_suite is end; procedure aftereall_errors is - l_suite ut3.ut_suite; + l_suite ut3_develop.ut_suite; begin --Arrange - l_suite := ut3.ut_suite(a_object_owner => 'ut3_tester_helper', a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); + l_suite := ut3_develop.ut_suite(a_object_owner => 'ut3_tester_helper', a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); l_suite.path := 'ut3_tester_helper.ut_example_tests'; - l_suite.after_all_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'UT_EXAMPLE_TESTS', 'failing_procedure', ut3.ut_utils.gc_after_all)); + l_suite.after_all_list := ut3_develop.ut_executables(ut3_develop.ut_executable('ut3_tester_helper', 'UT_EXAMPLE_TESTS', 'failing_procedure', ut3_develop.ut_utils.gc_after_all)); l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => 'ut3_tester_helper', a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'set_g_number_0', a_line_no=> 1); + l_suite.items(l_suite.items.last) := ut3_develop.ut_test(a_object_owner => 'ut3_tester_helper', a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'set_g_number_0', a_line_no=> 1); l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => 'ut3_tester_helper', a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); + l_suite.items(l_suite.items.last) := ut3_develop.ut_test(a_object_owner => 'ut3_tester_helper', a_object_name => 'UT_EXAMPLE_TESTS',a_name => 'add_1_to_g_number', a_line_no=> 1); --Act l_suite.do_execute(); --Assert ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_equal(1); - ut.expect(l_suite.result).to_equal(ut3.ut_utils.gc_success); + ut.expect(l_suite.result).to_equal(ut3_develop.ut_utils.gc_success); ut.expect(l_suite.results_count.disabled_count).to_equal(0); ut.expect(l_suite.results_count.warnings_count).to_equal(1); ut.expect(l_suite.results_count.success_count).to_equal(2); @@ -86,42 +86,42 @@ create or replace package body test_ut_suite is end; procedure package_without_body is - l_suite ut3.ut_suite; + l_suite ut3_develop.ut_suite; begin - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_WITHOUT_BODY', a_line_no=> 1); + l_suite := ut3_develop.ut_suite(a_object_owner => USER, a_object_name => 'UT_WITHOUT_BODY', a_line_no=> 1); l_suite.path := 'UT_WITHOUT_BODY'; l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_name => 'ut_without_body',a_name => 'test1', a_line_no=> 1); + l_suite.items(l_suite.items.last) := ut3_develop.ut_test(a_object_name => 'ut_without_body',a_name => 'test1', a_line_no=> 1); --Act l_suite.do_execute(); --Assert - ut.expect(l_suite.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(l_suite.result).to_equal(ut3_develop.ut_utils.gc_error); end; procedure package_with_invalid_body is - l_suite ut3.ut_suite; + l_suite ut3_develop.ut_suite; begin - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_WITH_INVALID_BODY', a_line_no=> 1); + l_suite := ut3_develop.ut_suite(a_object_owner => USER, a_object_name => 'UT_WITH_INVALID_BODY', a_line_no=> 1); l_suite.path := 'UT_WITH_INVALID_BODY'; l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_name => 'ut_with_invalid_body',a_name => 'test1', a_line_no=> 1); + l_suite.items(l_suite.items.last) := ut3_develop.ut_test(a_object_name => 'ut_with_invalid_body',a_name => 'test1', a_line_no=> 1); --Act l_suite.do_execute(); --Assert - ut.expect(l_suite.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(l_suite.result).to_equal(ut3_develop.ut_utils.gc_error); end; procedure rollback_auto is - l_suite ut3.ut_suite; + l_suite ut3_develop.ut_suite; begin --Arrange execute immediate 'delete from ut3_tester_helper.ut$test_table'; - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_TRANSACTION_CONTROL', a_line_no=> 1); + l_suite := ut3_develop.ut_suite(a_object_owner => USER, a_object_name => 'UT_TRANSACTION_CONTROL', a_line_no=> 1); l_suite.path := 'ut3_tester_helper.ut_transaction_control'; - l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable(USER, 'UT_TRANSACTION_CONTROL', 'setup', ut3.ut_utils.gc_before_all)); + l_suite.before_all_list := ut3_develop.ut_executables(ut3_develop.ut_executable(USER, 'UT_TRANSACTION_CONTROL', 'setup', ut3_develop.ut_utils.gc_before_all)); l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => USER, a_object_name => 'ut_transaction_control',a_name => 'test', a_line_no=> 1); - l_suite.set_rollback_type(ut3.ut_utils.gc_rollback_auto); + l_suite.items(l_suite.items.last) := ut3_develop.ut_test(a_object_owner => USER, a_object_name => 'ut_transaction_control',a_name => 'test', a_line_no=> 1); + l_suite.set_rollback_type(ut3_develop.ut_utils.gc_rollback_auto); --Act l_suite.do_execute(); @@ -133,24 +133,24 @@ create or replace package body test_ut_suite is procedure rollback_auto_on_failure is begin - ut3_tester_helper.run_helper.test_rollback_type('test_failure', ut3.ut_utils.gc_rollback_auto, equal(0) ); + ut3_tester_helper.run_helper.test_rollback_type('test_failure', ut3_develop.ut_utils.gc_rollback_auto, equal(0) ); end; procedure rollback_manual is begin - ut3_tester_helper.run_helper.test_rollback_type('test', ut3.ut_utils.gc_rollback_manual, be_greater_than(0) ); + ut3_tester_helper.run_helper.test_rollback_type('test', ut3_develop.ut_utils.gc_rollback_manual, be_greater_than(0) ); end; procedure rollback_manual_on_failure is begin - ut3_tester_helper.run_helper.test_rollback_type('test_failure', ut3.ut_utils.gc_rollback_manual, be_greater_than(0) ); + ut3_tester_helper.run_helper.test_rollback_type('test_failure', ut3_develop.ut_utils.gc_rollback_manual, be_greater_than(0) ); end; procedure trim_transaction_invalidators is - l_suite ut3.ut_suite; + l_suite ut3_develop.ut_suite; begin --arrange - l_suite := ut3.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); + l_suite := ut3_develop.ut_suite(a_object_owner => USER, a_object_name => 'UT_EXAMPLE_TESTS', a_line_no=> 1); for i in 1 .. 100 loop l_suite.add_transaction_invalidator('schema_name.package_name.procedure_name'||i); end loop; diff --git a/test/ut3_tester/core/test_ut_test.pkb b/test/ut3_tester/core/test_ut_test.pkb index b4dcc2536..f6f59df08 100644 --- a/test/ut3_tester/core/test_ut_test.pkb +++ b/test/ut3_tester/core/test_ut_test.pkb @@ -6,24 +6,24 @@ create or replace package body test_ut_test is end; procedure disabled_test is - l_suite ut3.ut_suite; - l_test ut3.ut_test; + l_suite ut3_develop.ut_suite; + l_test ut3_develop.ut_test; begin --Arrange - l_suite := ut3.ut_suite(a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_line_no=> 1); + l_suite := ut3_develop.ut_suite(a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_line_no=> 1); l_suite.path := 'ut3_tester_helper.ut_example_tests'; - l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_all)); + l_suite.before_all_list := ut3_develop.ut_executables(ut3_develop.ut_executable('ut3_tester_helper', 'ut_example_tests', 'set_g_number_0', ut3_develop.ut_utils.gc_before_all)); l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); + l_suite.items(l_suite.items.last) := ut3_develop.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 2); - l_suite.items(l_suite.items.last).disabled_flag := ut3.ut_utils.boolean_to_int(true); + l_suite.items(l_suite.items.last) := ut3_develop.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 2); + l_suite.items(l_suite.items.last).disabled_flag := ut3_develop.ut_utils.boolean_to_int(true); --Act l_suite.do_execute(); --Assert ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_equal(1); - ut.expect(l_suite.result).to_equal(ut3.ut_utils.gc_success); + ut.expect(l_suite.result).to_equal(ut3_develop.ut_utils.gc_success); ut.expect(l_suite.results_count.disabled_count).to_equal(1); ut.expect(l_suite.results_count.warnings_count).to_equal(0); ut.expect(l_suite.results_count.success_count).to_equal(1); @@ -32,26 +32,26 @@ create or replace package body test_ut_test is end; procedure aftertest_errors is - l_suite ut3.ut_suite; - l_test ut3.ut_test; + l_suite ut3_develop.ut_suite; + l_test ut3_develop.ut_test; begin --Arrange - l_suite := ut3.ut_suite(a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_line_no=> 1); + l_suite := ut3_develop.ut_suite(a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_line_no=> 1); l_suite.path := 'ut3_tester_helper.ut_example_tests'; - l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_all)); + l_suite.before_all_list := ut3_develop.ut_executables(ut3_develop.ut_executable('ut3_tester_helper', 'ut_example_tests', 'set_g_number_0', ut3_develop.ut_utils.gc_before_all)); - l_test := ut3.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); - l_test.before_test_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'add_1_to_g_number', ut3.ut_utils.gc_before_test)); - l_test.after_test_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'failing_procedure', ut3.ut_utils.gc_after_test)); + l_test := ut3_develop.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); + l_test.before_test_list := ut3_develop.ut_executables(ut3_develop.ut_executable('ut3_tester_helper', 'ut_example_tests', 'add_1_to_g_number', ut3_develop.ut_utils.gc_before_test)); + l_test.after_test_list := ut3_develop.ut_executables(ut3_develop.ut_executable('ut3_tester_helper', 'ut_example_tests', 'failing_procedure', ut3_develop.ut_utils.gc_after_test)); l_suite.items.extend; l_suite.items(l_suite.items.last) := l_test; l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); + l_suite.items(l_suite.items.last) := ut3_develop.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); --Act l_suite.do_execute(); --Assert ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_equal(3); - ut.expect(l_suite.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(l_suite.result).to_equal(ut3_develop.ut_utils.gc_error); ut.expect(l_suite.results_count.disabled_count).to_equal(0); ut.expect(l_suite.results_count.warnings_count).to_equal(0); ut.expect(l_suite.results_count.success_count).to_equal(1); @@ -60,24 +60,24 @@ create or replace package body test_ut_test is end; procedure aftereach_errors is - l_suite ut3.ut_suite; - l_test ut3.ut_test; + l_suite ut3_develop.ut_suite; + l_test ut3_develop.ut_test; begin --Arrange - l_suite := ut3.ut_suite(a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_line_no=> 1); - l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_all)); - l_test := ut3.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); - l_test.before_each_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'add_1_to_g_number', ut3.ut_utils.gc_before_each)); - l_test.after_each_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'failing_procedure', ut3.ut_utils.gc_after_each)); + l_suite := ut3_develop.ut_suite(a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_line_no=> 1); + l_suite.before_all_list := ut3_develop.ut_executables(ut3_develop.ut_executable('ut3_tester_helper', 'ut_example_tests', 'set_g_number_0', ut3_develop.ut_utils.gc_before_all)); + l_test := ut3_develop.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); + l_test.before_each_list := ut3_develop.ut_executables(ut3_develop.ut_executable('ut3_tester_helper', 'ut_example_tests', 'add_1_to_g_number', ut3_develop.ut_utils.gc_before_each)); + l_test.after_each_list := ut3_develop.ut_executables(ut3_develop.ut_executable('ut3_tester_helper', 'ut_example_tests', 'failing_procedure', ut3_develop.ut_utils.gc_after_each)); l_suite.items.extend; l_suite.items(l_suite.items.last) := l_test; l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); + l_suite.items(l_suite.items.last) := ut3_develop.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); --Act l_suite.do_execute(); --Assert ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_equal(3); - ut.expect(l_suite.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(l_suite.result).to_equal(ut3_develop.ut_utils.gc_error); ut.expect(l_suite.results_count.disabled_count).to_equal(0); ut.expect(l_suite.results_count.warnings_count).to_equal(0); ut.expect(l_suite.results_count.success_count).to_equal(1); @@ -86,24 +86,24 @@ create or replace package body test_ut_test is end; procedure beforetest_errors is - l_suite ut3.ut_suite; - l_test ut3.ut_test; + l_suite ut3_develop.ut_suite; + l_test ut3_develop.ut_test; begin --Arrange - l_suite := ut3.ut_suite(a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_line_no=> 1); - l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_all)); - l_test := ut3.ut_test(a_object_owner =>'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); - l_test.before_test_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'failing_procedure', ut3.ut_utils.gc_before_test)); - l_test.after_test_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'add_1_to_g_number', ut3.ut_utils.gc_after_test)); + l_suite := ut3_develop.ut_suite(a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_line_no=> 1); + l_suite.before_all_list := ut3_develop.ut_executables(ut3_develop.ut_executable('ut3_tester_helper', 'ut_example_tests', 'set_g_number_0', ut3_develop.ut_utils.gc_before_all)); + l_test := ut3_develop.ut_test(a_object_owner =>'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); + l_test.before_test_list := ut3_develop.ut_executables(ut3_develop.ut_executable('ut3_tester_helper', 'ut_example_tests', 'failing_procedure', ut3_develop.ut_utils.gc_before_test)); + l_test.after_test_list := ut3_develop.ut_executables(ut3_develop.ut_executable('ut3_tester_helper', 'ut_example_tests', 'add_1_to_g_number', ut3_develop.ut_utils.gc_after_test)); l_suite.items.extend; l_suite.items(l_suite.items.last) := l_test; l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner =>'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); + l_suite.items(l_suite.items.last) := ut3_develop.ut_test(a_object_owner =>'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); --Act l_suite.do_execute(); --Assert ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_equal(2); - ut.expect(l_suite.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(l_suite.result).to_equal(ut3_develop.ut_utils.gc_error); ut.expect(l_suite.results_count.disabled_count).to_equal(0); ut.expect(l_suite.results_count.warnings_count).to_equal(0); ut.expect(l_suite.results_count.success_count).to_equal(1); @@ -112,24 +112,24 @@ create or replace package body test_ut_test is end; procedure beforeeach_errors is - l_suite ut3.ut_suite; - l_test ut3.ut_test; + l_suite ut3_develop.ut_suite; + l_test ut3_develop.ut_test; begin --Arrange - l_suite := ut3.ut_suite(a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_line_no=> 1); - l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_all)); - l_test := ut3.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); - l_test.before_each_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'failing_procedure', ut3.ut_utils.gc_before_each)); - l_test.after_each_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'add_1_to_g_number', ut3.ut_utils.gc_after_each)); + l_suite := ut3_develop.ut_suite(a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_line_no=> 1); + l_suite.before_all_list := ut3_develop.ut_executables(ut3_develop.ut_executable('ut3_tester_helper', 'ut_example_tests', 'set_g_number_0', ut3_develop.ut_utils.gc_before_all)); + l_test := ut3_develop.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); + l_test.before_each_list := ut3_develop.ut_executables(ut3_develop.ut_executable('ut3_tester_helper', 'ut_example_tests', 'failing_procedure', ut3_develop.ut_utils.gc_before_each)); + l_test.after_each_list := ut3_develop.ut_executables(ut3_develop.ut_executable('ut3_tester_helper', 'ut_example_tests', 'add_1_to_g_number', ut3_develop.ut_utils.gc_after_each)); l_suite.items.extend; l_suite.items(l_suite.items.last) := l_test; l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); + l_suite.items(l_suite.items.last) := ut3_develop.ut_test(a_object_owner => 'ut3_tester_helper',a_object_name => 'ut_example_tests',a_name => 'add_1_to_g_number', a_line_no=> 1); --Act l_suite.do_execute(); --Assert ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_equal(2); - ut.expect(l_suite.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(l_suite.result).to_equal(ut3_develop.ut_utils.gc_error); ut.expect(l_suite.results_count.disabled_count).to_equal(0); ut.expect(l_suite.results_count.warnings_count).to_equal(0); ut.expect(l_suite.results_count.success_count).to_equal(1); @@ -139,63 +139,63 @@ create or replace package body test_ut_test is procedure after_each_executed is --Arrange - l_test ut3.ut_test := ut3.ut_test( + l_test ut3_develop.ut_test := ut3_develop.ut_test( a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_name => 'set_g_number_0', a_line_no => null ); begin - l_test.after_each_list := ut3.ut_executables( - ut3.ut_executable( + l_test.after_each_list := ut3_develop.ut_executables( + ut3_develop.ut_executable( 'ut3_tester_helper', 'ut_example_tests', 'add_1_to_g_number', - ut3.ut_utils.gc_after_each + ut3_develop.ut_utils.gc_after_each ) ); --Act l_test.do_execute(); --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_success); + ut.expect(l_test.result).to_equal(ut3_develop.ut_utils.gc_success); ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_equal(1); end; procedure after_each_proc_name_invalid is --Arrange - l_test ut3.ut_test := ut3.ut_test( + l_test ut3_develop.ut_test := ut3_develop.ut_test( a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_name => 'set_g_number_0', a_line_no => null ); begin - l_test.after_each_list := ut3.ut_executables( - ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'invalid setup name', ut3.ut_utils.gc_after_each) + l_test.after_each_list := ut3_develop.ut_executables( + ut3_develop.ut_executable('ut3_tester_helper', 'ut_example_tests', 'invalid setup name', ut3_develop.ut_utils.gc_after_each) ); --Act l_test.do_execute(); --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(l_test.result).to_equal(ut3_develop.ut_utils.gc_error); ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_equal(0); end; procedure after_each_procedure_name_null is --Arrange - l_test ut3.ut_test := ut3.ut_test( + l_test ut3_develop.ut_test := ut3_develop.ut_test( a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_name => 'set_g_number_0', a_line_no => null ); begin - l_test.after_each_list := ut3.ut_executables( - ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', null, ut3.ut_utils.gc_after_each) + l_test.after_each_list := ut3_develop.ut_executables( + ut3_develop.ut_executable('ut3_tester_helper', 'ut_example_tests', null, ut3_develop.ut_utils.gc_after_each) ); --Act l_test.do_execute(); --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(l_test.result).to_equal(ut3_develop.ut_utils.gc_error); ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_equal(0); end; @@ -292,7 +292,7 @@ create or replace package body test_ut_test is end; procedure application_info_on_execution is - l_output_data ut3.ut_varchar2_list; + l_output_data ut3_develop.ut_varchar2_list; l_output clob; function get_test_value(a_variable_name varchar2) return varchar2 is l_result varchar2(4000); @@ -303,8 +303,8 @@ create or replace package body test_ut_test is begin --act select * bulk collect into l_output_data - from table(ut3.ut.run('ut_output_tests')); - l_output := ut3.ut_utils.table_to_clob(l_output_data); + from table(ut3_develop.ut.run('ut_output_tests')); + l_output := ut3_develop.ut_utils.table_to_clob(l_output_data); --assert ut.expect(get_test_value('gv_before_all_client_info')).to_equal('beforeall'); @@ -318,80 +318,80 @@ create or replace package body test_ut_test is procedure before_each_executed is --Arrange - l_test ut3.ut_test := ut3.ut_test( + l_test ut3_develop.ut_test := ut3_develop.ut_test( a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_name => 'add_1_to_g_number', a_line_no => null ); begin - l_test.before_each_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_each)); + l_test.before_each_list := ut3_develop.ut_executables(ut3_develop.ut_executable('ut3_tester_helper', 'ut_example_tests', 'set_g_number_0', ut3_develop.ut_utils.gc_before_each)); --Act l_test.do_execute(); --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_success); + ut.expect(l_test.result).to_equal(ut3_develop.ut_utils.gc_success); ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_equal(1); end; procedure before_each_proc_name_invalid is --Arrange - l_test ut3.ut_test := ut3.ut_test( + l_test ut3_develop.ut_test := ut3_develop.ut_test( a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_name => 'set_g_number_0', a_line_no => null ); begin - l_test.before_each_list := ut3.ut_executables( - ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'invalid setup name', ut3.ut_utils.gc_before_each) + l_test.before_each_list := ut3_develop.ut_executables( + ut3_develop.ut_executable('ut3_tester_helper', 'ut_example_tests', 'invalid setup name', ut3_develop.ut_utils.gc_before_each) ); --Act l_test.do_execute(); --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(l_test.result).to_equal(ut3_develop.ut_utils.gc_error); ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_be_null; end; procedure before_each_proc_name_null is --Arrange - l_test ut3.ut_test := ut3.ut_test( + l_test ut3_develop.ut_test := ut3_develop.ut_test( a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_name => 'set_g_number_0', a_line_no => null ); begin - l_test.before_each_list := ut3.ut_executables( - ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', null, ut3.ut_utils.gc_before_each) + l_test.before_each_list := ut3_develop.ut_executables( + ut3_develop.ut_executable('ut3_tester_helper', 'ut_example_tests', null, ut3_develop.ut_utils.gc_before_each) ); --Act l_test.do_execute(); --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(l_test.result).to_equal(ut3_develop.ut_utils.gc_error); ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_be_null; end; procedure ignore_savepoint_exception is pragma autonomous_transaction; --Arrange - l_test ut3.ut_test := ut3.ut_test( + l_test ut3_develop.ut_test := ut3_develop.ut_test( a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_name => 'ut_commit_test', a_line_no => null ); begin - l_test.rollback_type := ut3.ut_utils.gc_rollback_auto; + l_test.rollback_type := ut3_develop.ut_utils.gc_rollback_auto; --Act l_test.do_execute(); --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_success); + ut.expect(l_test.result).to_equal(ut3_develop.ut_utils.gc_success); end; procedure owner_name_invalid is --Arrange - l_test ut3.ut_test := ut3.ut_test( + l_test ut3_develop.ut_test := ut3_develop.ut_test( a_object_owner => 'invalid owner name', a_object_name => 'ut_example_tests', a_name => 'set_g_number_0', @@ -401,7 +401,7 @@ create or replace package body test_ut_test is --Act l_test.do_execute(); --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(l_test.result).to_equal(ut3_develop.ut_utils.gc_error); end; procedure create_synonym is @@ -416,7 +416,7 @@ create or replace package body test_ut_test is procedure owner_name_null is --Arrange - l_test ut3.ut_test := ut3.ut_test( + l_test ut3_develop.ut_test := ut3_develop.ut_test( a_object_name => 'ut_example_tests', a_name => 'set_g_number_0', a_line_no => null @@ -425,7 +425,7 @@ create or replace package body test_ut_test is --Act l_test.do_execute(); --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_success); + ut.expect(l_test.result).to_equal(ut3_develop.ut_utils.gc_success); ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_equal(0); end; @@ -450,7 +450,7 @@ create or replace package body test_ut_test is procedure package_in_invalid_state is --Arrange - l_test ut3.ut_test := ut3.ut_test( + l_test ut3_develop.ut_test := ut3_develop.ut_test( a_object_name => 'invalid_package', a_name => 'ut_exampletest', a_line_no => null @@ -459,12 +459,12 @@ create or replace package body test_ut_test is --Act l_test.do_execute(); --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(l_test.result).to_equal(ut3_develop.ut_utils.gc_error); end; procedure package_name_invalid is --Arrange - l_test ut3.ut_test := ut3.ut_test( + l_test ut3_develop.ut_test := ut3_develop.ut_test( a_object_name => 'invalid package name', a_name => 'set_g_number_0', a_line_no => null @@ -473,12 +473,12 @@ create or replace package body test_ut_test is --Act l_test.do_execute(); --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(l_test.result).to_equal(ut3_develop.ut_utils.gc_error); end; procedure package_name_null is --Arrange - l_test ut3.ut_test := ut3.ut_test( + l_test ut3_develop.ut_test := ut3_develop.ut_test( a_object_name => null, a_name => 'set_g_number_0', a_line_no => null @@ -487,12 +487,12 @@ create or replace package body test_ut_test is --Act l_test.do_execute(); --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(l_test.result).to_equal(ut3_develop.ut_utils.gc_error); end; procedure procedure_name_invalid is --Arrange - l_test ut3.ut_test := ut3.ut_test( + l_test ut3_develop.ut_test := ut3_develop.ut_test( a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_name => 'invalid procedure name', @@ -502,12 +502,12 @@ create or replace package body test_ut_test is --Act l_test.do_execute(); --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(l_test.result).to_equal(ut3_develop.ut_utils.gc_error); end; procedure procedure_name_null is --Arrange - l_test ut3.ut_test := ut3.ut_test( + l_test ut3_develop.ut_test := ut3_develop.ut_test( a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_name => null, @@ -517,116 +517,116 @@ create or replace package body test_ut_test is --Act l_test.do_execute(); --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(l_test.result).to_equal(ut3_develop.ut_utils.gc_error); end; procedure before_test_executed is --Arrange - l_test ut3.ut_test := ut3.ut_test( + l_test ut3_develop.ut_test := ut3_develop.ut_test( a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_name => 'add_1_to_g_number', a_line_no => null ); begin - l_test.before_test_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'set_g_number_0', ut3.ut_utils.gc_before_test)); + l_test.before_test_list := ut3_develop.ut_executables(ut3_develop.ut_executable('ut3_tester_helper', 'ut_example_tests', 'set_g_number_0', ut3_develop.ut_utils.gc_before_test)); --Act l_test.do_execute(); --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_success); + ut.expect(l_test.result).to_equal(ut3_develop.ut_utils.gc_success); ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_equal(1); end; procedure before_test_proc_name_invalid is --Arrange - l_test ut3.ut_test := ut3.ut_test( + l_test ut3_develop.ut_test := ut3_develop.ut_test( a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_name => 'set_g_number_0', a_line_no => null ); begin - l_test.before_test_list := ut3.ut_executables( - ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'invalid setup name', ut3.ut_utils.gc_before_test) + l_test.before_test_list := ut3_develop.ut_executables( + ut3_develop.ut_executable('ut3_tester_helper', 'ut_example_tests', 'invalid setup name', ut3_develop.ut_utils.gc_before_test) ); --Act l_test.do_execute(); --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(l_test.result).to_equal(ut3_develop.ut_utils.gc_error); ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_be_null; end; procedure before_test_proc_name_null is --Arrange - l_test ut3.ut_test := ut3.ut_test( + l_test ut3_develop.ut_test := ut3_develop.ut_test( a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_name => 'set_g_number_0', a_line_no => null ); begin - l_test.before_test_list := ut3.ut_executables( - ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', null, ut3.ut_utils.gc_before_test) + l_test.before_test_list := ut3_develop.ut_executables( + ut3_develop.ut_executable('ut3_tester_helper', 'ut_example_tests', null, ut3_develop.ut_utils.gc_before_test) ); --Act l_test.do_execute(); --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(l_test.result).to_equal(ut3_develop.ut_utils.gc_error); ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_be_null; end; procedure after_test_executed is --Arrange - l_test ut3.ut_test := ut3.ut_test( + l_test ut3_develop.ut_test := ut3_develop.ut_test( a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_name => 'set_g_number_0', a_line_no => null ); begin - l_test.after_test_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'add_1_to_g_number', ut3.ut_utils.gc_after_test)); + l_test.after_test_list := ut3_develop.ut_executables(ut3_develop.ut_executable('ut3_tester_helper', 'ut_example_tests', 'add_1_to_g_number', ut3_develop.ut_utils.gc_after_test)); --Act l_test.do_execute(); --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_success); + ut.expect(l_test.result).to_equal(ut3_develop.ut_utils.gc_success); ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_equal(1); end; procedure after_test_proce_name_invalid is --Arrange - l_test ut3.ut_test := ut3.ut_test( + l_test ut3_develop.ut_test := ut3_develop.ut_test( a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_name => 'set_g_number_0', a_line_no => null ); begin - l_test.after_test_list := ut3.ut_executables( - ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', 'invalid procedure name', ut3.ut_utils.gc_after_test) + l_test.after_test_list := ut3_develop.ut_executables( + ut3_develop.ut_executable('ut3_tester_helper', 'ut_example_tests', 'invalid procedure name', ut3_develop.ut_utils.gc_after_test) ); --Act l_test.do_execute(); --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(l_test.result).to_equal(ut3_develop.ut_utils.gc_error); ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_equal(0); end; procedure after_test_proc_name_null is --Arrange - l_test ut3.ut_test := ut3.ut_test( + l_test ut3_develop.ut_test := ut3_develop.ut_test( a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_example_tests', a_name => 'set_g_number_0', a_line_no => null ); begin - l_test.after_test_list := ut3.ut_executables( - ut3.ut_executable('ut3_tester_helper', 'ut_example_tests', null, ut3.ut_utils.gc_after_test) + l_test.after_test_list := ut3_develop.ut_executables( + ut3_develop.ut_executable('ut3_tester_helper', 'ut_example_tests', null, ut3_develop.ut_utils.gc_after_test) ); --Act l_test.do_execute(); --Assert - ut.expect(l_test.result).to_equal(ut3.ut_utils.gc_error); + ut.expect(l_test.result).to_equal(ut3_develop.ut_utils.gc_error); ut.expect(ut3_tester_helper.ut_example_tests.g_number).to_equal(0); end; @@ -711,12 +711,12 @@ create or replace package body test_ut_test is end; procedure test_output_gathering is - l_output_data ut3.ut_varchar2_list; + l_output_data ut3_develop.ut_varchar2_list; l_output clob; begin select * bulk collect into l_output_data - from table(ut3.ut.run('ut_output_tests')); - l_output := ut3.ut_utils.table_to_clob(l_output_data); + from table(ut3_develop.ut.run('ut_output_tests')); + l_output := ut3_develop.ut_utils.table_to_clob(l_output_data); ut.expect(l_output).to_be_like( '%%%%%%%%1 tests, 0 failed, 0 errored%' ); diff --git a/test/ut3_tester/core/test_ut_utils.pkb b/test/ut3_tester/core/test_ut_utils.pkb index 31e1520d2..a3ed605f9 100644 --- a/test/ut3_tester/core/test_ut_utils.pkb +++ b/test/ut3_tester/core/test_ut_utils.pkb @@ -33,17 +33,17 @@ create or replace package body test_ut_utils is end; - procedure common_clob_to_table_exec(p_clob varchar2, p_delimiter varchar2, p_expected_list ut3.ut_varchar2_list, p_limit number) is + procedure common_clob_to_table_exec(p_clob varchar2, p_delimiter varchar2, p_expected_list ut3_develop.ut_varchar2_list, p_limit number) is begin execute immediate 'declare l_clob clob := '''||p_clob||'''; l_delimiter varchar2(1) := '''||p_delimiter||'''; - l_expected ut3.ut_varchar2_list := :p_expected_list; - l_result ut3.ut_varchar2_list; + l_expected ut3_develop.ut_varchar2_list := :p_expected_list; + l_result ut3_develop.ut_varchar2_list; l_limit integer := '||p_limit||q'[; l_result_str varchar2(32767); l_errors integer := 0; - function compare_element(a_element_id integer, a_expected ut3.ut_varchar2_list, a_actual ut3.ut_varchar2_list) return integer is + function compare_element(a_element_id integer, a_expected ut3_develop.ut_varchar2_list, a_actual ut3_develop.ut_varchar2_list) return integer is begin if a_expected.exists(a_element_id) and a_actual.exists(a_element_id) then if a_expected(a_element_id) = a_actual(a_element_id) or a_expected(a_element_id) is null and a_actual(a_element_id) is null then @@ -63,7 +63,7 @@ create or replace package body test_ut_utils is end; begin --Act - select column_value bulk collect into l_result from table( ut3.ut_utils.clob_to_table(l_clob, l_limit, l_delimiter) ); + select column_value bulk collect into l_result from table( ut3_develop.ut_utils.clob_to_table(l_clob, l_limit, l_delimiter) ); for i in 1 .. l_result.count loop l_result_str := l_result_str||''''||l_result(i)||''''||l_delimiter; end loop; @@ -78,68 +78,68 @@ end;]' using p_expected_list; procedure test_clob_to_table is begin - common_clob_to_table_exec('a,b,c,d', ',', ut3.ut_varchar2_list('a','b','c','d'), 1000); - common_clob_to_table_exec( '', ',', ut3.ut_varchar2_list(), 1000); - common_clob_to_table_exec( '1,b,c,d', '', ut3.ut_varchar2_list('1,b,','c,d'), 4); - common_clob_to_table_exec( 'abcdefg,hijk,axa,a', ',', ut3.ut_varchar2_list('abc','def','g','hij','k','axa','a'), 3); - common_clob_to_table_exec( ',a,,c,d,', ',', ut3.ut_varchar2_list('','a','','c','d',''), 1000); + common_clob_to_table_exec('a,b,c,d', ',', ut3_develop.ut_varchar2_list('a','b','c','d'), 1000); + common_clob_to_table_exec( '', ',', ut3_develop.ut_varchar2_list(), 1000); + common_clob_to_table_exec( '1,b,c,d', '', ut3_develop.ut_varchar2_list('1,b,','c,d'), 4); + common_clob_to_table_exec( 'abcdefg,hijk,axa,a', ',', ut3_develop.ut_varchar2_list('abc','def','g','hij','k','axa','a'), 3); + common_clob_to_table_exec( ',a,,c,d,', ',', ut3_develop.ut_varchar2_list('','a','','c','d',''), 1000); end; procedure test_test_result_to_char is begin - ut.expect(ut3.ut_utils.test_result_to_char(-1),'test unknown').to_equal('Unknown(-1)'); - ut.expect(ut3.ut_utils.test_result_to_char(null),'test unknown').to_equal('Unknown(NULL)'); - ut.expect(ut3.ut_utils.test_result_to_char(ut3.ut_utils.gc_success),'test unknown').to_equal(ut3.ut_utils.gc_success_char); + ut.expect(ut3_develop.ut_utils.test_result_to_char(-1),'test unknown').to_equal('Unknown(-1)'); + ut.expect(ut3_develop.ut_utils.test_result_to_char(null),'test unknown').to_equal('Unknown(NULL)'); + ut.expect(ut3_develop.ut_utils.test_result_to_char(ut3_develop.ut_utils.gc_success),'test unknown').to_equal(ut3_develop.ut_utils.gc_success_char); end; procedure to_string_emptyblob is begin - ut.expect(ut3.ut_data_value_blob(empty_blob()).to_string()).to_equal('EMPTY'); + ut.expect(ut3_develop.ut_data_value_blob(empty_blob()).to_string()).to_equal('EMPTY'); end; procedure to_string_emptyclob is begin - ut.expect(ut3.ut_data_value_clob(empty_clob()).to_string()).to_equal('EMPTY'); + ut.expect(ut3_develop.ut_data_value_clob(empty_clob()).to_string()).to_equal('EMPTY'); end; procedure to_string_nullblob is begin - ut.expect(ut3.ut_data_value_blob(null).to_string()).to_equal('NULL'); + ut.expect(ut3_develop.ut_data_value_blob(null).to_string()).to_equal('NULL'); end; procedure to_string_nullclob is begin - ut.expect(ut3.ut_data_value_clob(null).to_string()).to_equal('NULL'); + ut.expect(ut3_develop.ut_data_value_clob(null).to_string()).to_equal('NULL'); end; procedure to_string_nulldate is begin - ut.expect(ut3.ut_data_value_date(null).to_string()).to_equal('NULL'); + ut.expect(ut3_develop.ut_data_value_date(null).to_string()).to_equal('NULL'); end; procedure to_string_nullnumber is begin - ut.expect(ut3.ut_data_value_number(null).to_string()).to_equal('NULL'); + ut.expect(ut3_develop.ut_data_value_number(null).to_string()).to_equal('NULL'); end; procedure to_string_nulltimestamp is begin - ut.expect(ut3.ut_data_value_timestamp(null).to_string()).to_equal('NULL'); + ut.expect(ut3_develop.ut_data_value_timestamp(null).to_string()).to_equal('NULL'); end; procedure to_string_nulltimestamp_ltz is begin - ut.expect(ut3.ut_data_value_timestamp_ltz(null).to_string()).to_equal('NULL'); + ut.expect(ut3_develop.ut_data_value_timestamp_ltz(null).to_string()).to_equal('NULL'); end; procedure to_string_nulltimestamp_tz is begin - ut.expect(ut3.ut_data_value_timestamp_tz(null).to_string()).to_equal('NULL'); + ut.expect(ut3_develop.ut_data_value_timestamp_tz(null).to_string()).to_equal('NULL'); end; procedure to_string_nullvarchar2 is begin - ut.expect(ut3.ut_data_value_varchar2(null).to_string()).to_equal('NULL'); + ut.expect(ut3_develop.ut_data_value_varchar2(null).to_string()).to_equal('NULL'); end; procedure to_string_blob is @@ -147,49 +147,49 @@ end;]' using p_expected_list; l_value blob := utl_raw.cast_to_raw(l_text); l_expected varchar2(32767) := ''''||rawtohex(l_value)||''''; begin - ut.expect(ut3.ut_data_value_blob(l_value).to_string()).to_equal(l_expected); + ut.expect(ut3_develop.ut_data_value_blob(l_value).to_string()).to_equal(l_expected); end; procedure to_string_clob is l_value clob := 'A test char'; l_expected varchar2(32767) := ''''||l_value||''''; begin - ut.expect(ut3.ut_data_value_clob(l_value).to_string()).to_equal(l_expected); + ut.expect(ut3_develop.ut_data_value_clob(l_value).to_string()).to_equal(l_expected); end; procedure to_string_date is l_value date := to_date('2016-12-31 23:59:59', 'yyyy-mm-dd hh24:mi:ss'); l_expected varchar2(100) := '2016-12-31T23:59:59'; begin - ut.expect(ut3.ut_data_value_date(l_value).to_string()).to_equal(l_expected); + ut.expect(ut3_develop.ut_data_value_date(l_value).to_string()).to_equal(l_expected); end; procedure to_string_timestamp is l_value timestamp(9) := to_timestamp('2016-12-31 23:59:59.123456789', 'yyyy-mm-dd hh24:mi:ss.ff'); l_expected varchar2(100) := '2016-12-31T23:59:59'||gc_delimiter||'123456789'; begin - ut.expect(ut3.ut_data_value_timestamp(l_value).to_string()).to_equal(l_expected); + ut.expect(ut3_develop.ut_data_value_timestamp(l_value).to_string()).to_equal(l_expected); end; procedure to_string_timestamp_ltz is l_value timestamp(9) with local time zone := to_timestamp('2016-12-31 23:59:59.123456789', 'yyyy-mm-dd hh24:mi:ss.ff'); l_expected varchar2(100) := '2016-12-31T23:59:59'||gc_delimiter||'123456789'; begin - ut.expect(ut3.ut_data_value_timestamp_ltz(l_value).to_string()).to_equal(l_expected); + ut.expect(ut3_develop.ut_data_value_timestamp_ltz(l_value).to_string()).to_equal(l_expected); end; procedure to_string_timestamp_tz is l_value timestamp(9) with time zone := to_timestamp_tz('2016-12-31 23:59:59.123456789 -8:00', 'yyyy-mm-dd hh24:mi:ss.ff tzh:tzm'); l_expected varchar2(100) := '2016-12-31T23:59:59'||gc_delimiter||'123456789 -08:00'; begin - ut.expect(ut3.ut_data_value_timestamp_tz(l_value).to_string()).to_equal(l_expected); + ut.expect(ut3_develop.ut_data_value_timestamp_tz(l_value).to_string()).to_equal(l_expected); end; procedure to_string_varchar2 is l_value varchar2(20) := 'A test char'; l_expected varchar2(100) := ''''||l_value||''''; begin - ut.expect(ut3.ut_data_value_varchar2(l_value).to_string()).to_equal(l_expected); + ut.expect(ut3_develop.ut_data_value_varchar2(l_value).to_string()).to_equal(l_expected); end; procedure to_string_verybigblob is @@ -197,53 +197,53 @@ end;]' using p_expected_list; l_value blob; begin l_value := clob_to_blob(l_text); - ut.expect(length(ut3.ut_data_value_blob(l_value).to_string())).to_equal(ut3.ut_utils.gc_max_output_string_length); - ut.expect(ut3.ut_data_value_blob(l_value).to_string()).to_be_like('%'||ut3.ut_utils.gc_more_data_string); + ut.expect(length(ut3_develop.ut_data_value_blob(l_value).to_string())).to_equal(ut3_develop.ut_utils.gc_max_output_string_length); + ut.expect(ut3_develop.ut_data_value_blob(l_value).to_string()).to_be_like('%'||ut3_develop.ut_utils.gc_more_data_string); end; procedure to_string_verybigclob is l_value clob := lpad('A test char',32767,'1')||lpad('1',32767,'1'); begin - ut.expect(length(ut3.ut_data_value_clob(l_value).to_string())).to_equal(ut3.ut_utils.gc_max_output_string_length); - ut.expect(ut3.ut_data_value_clob(l_value).to_string()).to_be_like('%'||ut3.ut_utils.gc_more_data_string); + ut.expect(length(ut3_develop.ut_data_value_clob(l_value).to_string())).to_equal(ut3_develop.ut_utils.gc_max_output_string_length); + ut.expect(ut3_develop.ut_data_value_clob(l_value).to_string()).to_be_like('%'||ut3_develop.ut_utils.gc_more_data_string); end; procedure to_string_verybignumber is l_value number := 1234567890123456789012345678901234567890; l_expected varchar2(100) := '1234567890123456789012345678901234567890'; begin - ut.expect(ut3.ut_data_value_number(l_value).to_string()).to_equal(l_expected); + ut.expect(ut3_develop.ut_data_value_number(l_value).to_string()).to_equal(l_expected); end; procedure to_string_verybigvarchar2 is l_value varchar2(32767) := lpad('A test char',32767,'1'); l_result varchar2(32767); begin - ut.expect(length(ut3.ut_data_value_varchar2(l_value).to_string())).to_equal(ut3.ut_utils.gc_max_output_string_length); - ut.expect(ut3.ut_data_value_varchar2(l_value).to_string()).to_be_like('%'||ut3.ut_utils.gc_more_data_string); + ut.expect(length(ut3_develop.ut_data_value_varchar2(l_value).to_string())).to_equal(ut3_develop.ut_utils.gc_max_output_string_length); + ut.expect(ut3_develop.ut_data_value_varchar2(l_value).to_string()).to_be_like('%'||ut3_develop.ut_utils.gc_more_data_string); end; procedure to_string_verysmallnumber is l_value number := 0.123456789012345678901234567890123456789; l_expected varchar2(100) := gc_delimiter||'123456789012345678901234567890123456789'; begin - ut.expect(ut3.ut_data_value_number(l_value).to_string()).to_equal(l_expected); + ut.expect(ut3_develop.ut_data_value_number(l_value).to_string()).to_equal(l_expected); end; procedure test_table_to_clob is - procedure exec_table_to_clob(a_list ut3.ut_varchar2_list, a_delimiter varchar2, a_expected clob) is + procedure exec_table_to_clob(a_list ut3_develop.ut_varchar2_list, a_delimiter varchar2, a_expected clob) is l_result clob; begin - l_result := ut3.ut_utils.table_to_clob(a_list, a_delimiter); + l_result := ut3_develop.ut_utils.table_to_clob(a_list, a_delimiter); ut.expect(l_result).to_equal(a_expected, a_nulls_are_equal => true); end; begin exec_table_to_clob(null, ',', ''); - exec_table_to_clob(ut3.ut_varchar2_list(), ',', ''); - exec_table_to_clob(ut3.ut_varchar2_list('a', 'b', 'c', 'd'), ',', 'a,b,c,d'); - exec_table_to_clob(ut3.ut_varchar2_list('1,b,', 'c,d'), ',', '1,b,,c,d'); - exec_table_to_clob(ut3.ut_varchar2_list('', 'a', '', 'c', 'd', ''), ',', ',a,,c,d,'); + exec_table_to_clob(ut3_develop.ut_varchar2_list(), ',', ''); + exec_table_to_clob(ut3_develop.ut_varchar2_list('a', 'b', 'c', 'd'), ',', 'a,b,c,d'); + exec_table_to_clob(ut3_develop.ut_varchar2_list('1,b,', 'c,d'), ',', '1,b,,c,d'); + exec_table_to_clob(ut3_develop.ut_varchar2_list('', 'a', '', 'c', 'd', ''), ',', ',a,,c,d,'); end; procedure test_append_with_multibyte is @@ -258,7 +258,7 @@ end;]' using p_expected_list; for i in 1..l_lines.count loop l_result := null; - ut3.ut_utils.append_to_clob(l_result, l_lines(i)); + ut3_develop.ut_utils.append_to_clob(l_result, l_lines(i)); --Assert ut.expect(dbms_lob.getlength(l_result),'Error for index '||i).to_equal(dbms_lob.getlength(l_lines(i))); @@ -289,21 +289,21 @@ end;'; l_singlebyte_string_max_size varchar2(32767 char) := rpad('x',l_varchar2_byte_limit,'x'); l_twobyte_character char(1 char) := '�?'; l_clob_multibyte clob := l_twobyte_character||l_singlebyte_string_max_size; --here we have 32769(2+32767) bytes and 32768 chars - l_expected ut3.ut_varchar2_list := ut3.ut_varchar2_list(); - l_result ut3.ut_varchar2_list; + l_expected ut3_develop.ut_varchar2_list := ut3_develop.ut_varchar2_list(); + l_result ut3_develop.ut_varchar2_list; begin l_expected.extend(1); l_expected(1) := l_twobyte_character||substr(l_singlebyte_string_max_size,1,l_workaround_byte_limit-1); --Act - l_result := ut3.ut_utils.clob_to_table(l_clob_multibyte); + l_result := ut3_develop.ut_utils.clob_to_table(l_clob_multibyte); --Assert ut.expect(l_result(1)).to_equal(l_expected(1)); end; procedure test_to_version_split is - l_version ut3.ut_utils.t_version; + l_version ut3_develop.ut_utils.t_version; begin - l_version := ut3.ut_utils.to_version('v034.0.0456.0333'); + l_version := ut3_develop.ut_utils.to_version('v034.0.0456.0333'); ut.expect(l_version.major).to_equal(34); ut.expect(l_version.minor).to_equal(0); ut.expect(l_version.bugfix).to_equal(456); @@ -312,62 +312,62 @@ end;'; procedure test_trim_list_elements is - l_list_to_be_equal ut3.ut_varchar2_list := ut3.ut_varchar2_list('hello', 'world', 'okay'); - l_list ut3.ut_varchar2_list := ut3.ut_varchar2_list(' hello ', chr(9)||'world ', 'okay'); + l_list_to_be_equal ut3_develop.ut_varchar2_list := ut3_develop.ut_varchar2_list('hello', 'world', 'okay'); + l_list ut3_develop.ut_varchar2_list := ut3_develop.ut_varchar2_list(' hello ', chr(9)||'world ', 'okay'); begin --Act - l_list := ut3.ut_utils.trim_list_elements(l_list); + l_list := ut3_develop.ut_utils.trim_list_elements(l_list); --Assert ut.expect(anydata.convertcollection(l_list)).to_equal(anydata.convertcollection(l_list_to_be_equal)); end; procedure trim_list_elemts_null_collect is - l_list_to_be_null ut3.ut_varchar2_list; + l_list_to_be_null ut3_develop.ut_varchar2_list; begin --Act - l_list_to_be_null := ut3.ut_utils.trim_list_elements(l_list_to_be_null); + l_list_to_be_null := ut3_develop.ut_utils.trim_list_elements(l_list_to_be_null); --Assert ut.expect(anydata.convertcollection(l_list_to_be_null)).to_be_null; end; procedure trim_list_elemts_empty_collect is - l_list_to_be_empty ut3.ut_varchar2_list := ut3.ut_varchar2_list(); + l_list_to_be_empty ut3_develop.ut_varchar2_list := ut3_develop.ut_varchar2_list(); begin --Act - l_list_to_be_empty := ut3.ut_utils.trim_list_elements(l_list_to_be_empty); + l_list_to_be_empty := ut3_develop.ut_utils.trim_list_elements(l_list_to_be_empty); --Assert ut.expect(anydata.convertcollection(l_list_to_be_empty)).to_be_empty; end; procedure test_filter_list is - l_list_to_be_equal ut3.ut_varchar2_list := ut3.ut_varchar2_list('-12458', '8956', '789'); - l_list ut3.ut_varchar2_list := ut3.ut_varchar2_list('-12458', '8956', 'okay', null,'458963', '789'); + l_list_to_be_equal ut3_develop.ut_varchar2_list := ut3_develop.ut_varchar2_list('-12458', '8956', '789'); + l_list ut3_develop.ut_varchar2_list := ut3_develop.ut_varchar2_list('-12458', '8956', 'okay', null,'458963', '789'); begin --Act - l_list := ut3.ut_utils.filter_list(l_list, '^-?[[:digit:]]{1,5}$'); + l_list := ut3_develop.ut_utils.filter_list(l_list, '^-?[[:digit:]]{1,5}$'); --Assert ut.expect(anydata.convertcollection(l_list)).to_equal(anydata.convertcollection(l_list_to_be_equal)); end; procedure filter_list_null_collection is - l_list_to_be_null ut3.ut_varchar2_list; + l_list_to_be_null ut3_develop.ut_varchar2_list; begin --Act - l_list_to_be_null := ut3.ut_utils.filter_list(l_list_to_be_null, '^-?[[:digit:]]{1,5}$'); + l_list_to_be_null := ut3_develop.ut_utils.filter_list(l_list_to_be_null, '^-?[[:digit:]]{1,5}$'); --Assert ut.expect(anydata.convertcollection(l_list_to_be_null)).to_be_null; end; procedure filter_list_empty_collection is - l_list_to_be_empty ut3.ut_varchar2_list := ut3.ut_varchar2_list(); + l_list_to_be_empty ut3_develop.ut_varchar2_list := ut3_develop.ut_varchar2_list(); begin --Act - l_list_to_be_empty := ut3.ut_utils.filter_list(l_list_to_be_empty, '^-?[[:digit:]]{1,5}$'); + l_list_to_be_empty := ut3_develop.ut_utils.filter_list(l_list_to_be_empty, '^-?[[:digit:]]{1,5}$'); --Assert ut.expect(anydata.convertcollection(l_list_to_be_empty)).to_be_empty; end; @@ -428,7 +428,7 @@ create or replace package dummy as end; ]'; --Act - l_actual := ut3.ut_utils.replace_multiline_comments(l_source); + l_actual := ut3_develop.ut_utils.replace_multiline_comments(l_source); --Assert ut.expect(l_actual).to_equal(l_expected); end; diff --git a/test/ut3_tester_helper/annotation_cache_helper.pkb b/test/ut3_tester_helper/annotation_cache_helper.pkb index c61c797fc..1a52faade 100644 --- a/test/ut3_tester_helper/annotation_cache_helper.pkb +++ b/test/ut3_tester_helper/annotation_cache_helper.pkb @@ -15,8 +15,8 @@ create or replace package body annotation_cache_helper as execute immediate 'create or replace package body ut3_cache_test_owner.granted_test_suite is - procedure test1 is begin ut3.ut.expect( 1 ).to_equal( 1 ); end; - procedure test2 is begin ut3.ut.expect( 1 ).to_equal( 1 ); end; + procedure test1 is begin ut3_develop.ut.expect( 1 ).to_equal( 1 ); end; + procedure test2 is begin ut3_develop.ut.expect( 1 ).to_equal( 1 ); end; end;'; execute immediate 'create or replace package ut3_cache_test_owner.not_granted_test_suite is @@ -29,8 +29,8 @@ create or replace package body annotation_cache_helper as end;'; execute immediate 'create or replace package body ut3_cache_test_owner.not_granted_test_suite is - procedure test1 is begin ut3.ut.expect( 1 ).to_equal( 1 ); end; - procedure test2 is begin ut3.ut.expect( 1 ).to_equal( 1 ); end; + procedure test1 is begin ut3_develop.ut.expect( 1 ).to_equal( 1 ); end; + procedure test2 is begin ut3_develop.ut.expect( 1 ).to_equal( 1 ); end; end;'; execute immediate @@ -65,8 +65,8 @@ create or replace package body annotation_cache_helper as execute immediate 'create or replace package body ut3_cache_test_owner.new_suite is - procedure test1 is begin ut3.ut.expect( 1 ).to_equal( 1 ); end; - procedure test2 is begin ut3.ut.expect( 1 ).to_equal( 1 ); end; + procedure test1 is begin ut3_develop.ut.expect( 1 ).to_equal( 1 ); end; + procedure test2 is begin ut3_develop.ut.expect( 1 ).to_equal( 1 ); end; end;'; execute immediate 'grant execute on ut3_cache_test_owner.new_suite to @@ -101,21 +101,21 @@ create or replace package body annotation_cache_helper as procedure purge_annotation_cache is begin - ut3.ut_runner.purge_cache( 'UT3_CACHE_TEST_OWNER' ); + ut3_develop.ut_runner.purge_cache( 'UT3_CACHE_TEST_OWNER' ); end; procedure disable_ddl_trigger is pragma autonomous_transaction; begin - execute immediate 'alter trigger ut3.ut_trigger_annotation_parsing disable'; - execute immediate 'begin ut3.ut_trigger_check.is_alive( ); end;'; + execute immediate 'alter trigger ut3_develop.ut_trigger_annotation_parsing disable'; + execute immediate 'begin ut3_develop.ut_trigger_check.is_alive( ); end;'; end; procedure enable_ddl_trigger is pragma autonomous_transaction; begin - execute immediate 'alter trigger ut3.ut_trigger_annotation_parsing enable'; + execute immediate 'alter trigger ut3_develop.ut_trigger_annotation_parsing enable'; end; procedure create_run_function_for_user(a_user varchar2) is @@ -123,10 +123,10 @@ create or replace package body annotation_cache_helper as begin execute immediate 'create or replace function ' || a_user || '.call_ut_run return clob is - l_data ut3.ut_varchar2_list; + l_data ut3_develop.ut_varchar2_list; l_results clob; begin - select * bulk collect into l_data from table (ut3.ut.run( ''ut3_cache_test_owner'' )); + select * bulk collect into l_data from table (ut3_develop.ut.run( ''ut3_cache_test_owner'' )); return ut3_tester_helper.main_helper.table_to_clob( l_data ); end; '; @@ -146,7 +146,7 @@ create or replace package body annotation_cache_helper as create_run_function_for_user( 'ut3_select_any_table_user' ); create_run_function_for_user( 'ut3_execute_any_proc_user' ); create_run_function_for_user( 'ut3_cache_test_owner' ); - create_run_function_for_user( 'ut3' ); + create_run_function_for_user( 'ut3_develop' ); end; procedure drop_run_function_for_users is @@ -156,7 +156,7 @@ create or replace package body annotation_cache_helper as drop_run_function_for_user( 'ut3_select_any_table_user' ); drop_run_function_for_user( 'ut3_execute_any_proc_user' ); drop_run_function_for_user( 'ut3_cache_test_owner' ); - drop_run_function_for_user( 'ut3' ); + drop_run_function_for_user( 'ut3_develop' ); end; function run_tests_as(a_user varchar2) return clob is diff --git a/test/ut3_tester_helper/coverage_helper.pkb b/test/ut3_tester_helper/coverage_helper.pkb index 1db078a8b..e86a155fa 100644 --- a/test/ut3_tester_helper/coverage_helper.pkb +++ b/test/ut3_tester_helper/coverage_helper.pkb @@ -1,6 +1,6 @@ create or replace package body coverage_helper is - g_run_ids ut3.ut_coverage.tt_coverage_id_arr; + g_run_ids ut3_develop.ut_coverage.tt_coverage_id_arr; g_profiler_run_id integer; g_block_run_id integer; @@ -8,7 +8,7 @@ create or replace package body coverage_helper is v_result integer; begin select nvl(min(runid),0) - 1 into v_result - from ut3.plsql_profiler_runs; + from ut3_develop.plsql_profiler_runs; return v_result; end; @@ -16,16 +16,16 @@ create or replace package body coverage_helper is v_result integer; begin select nvl(min(run_id),0) - 1 into v_result - from ut3.dbmspcc_runs; + from ut3_develop.dbmspcc_runs; return v_result; end; procedure setup_mock_coverage_ids(a_profiler_run_id integer, a_block_run_id integer) is - l_coverage_ids ut3.ut_coverage.tt_coverage_id_arr; + l_coverage_ids ut3_develop.ut_coverage.tt_coverage_id_arr; begin - l_coverage_ids(ut3.ut_coverage.gc_proftab_coverage) := a_profiler_run_id; - l_coverage_ids(ut3.ut_coverage.gc_block_coverage) := a_block_run_id; - ut3.ut_coverage.mock_coverage_id(l_coverage_ids); + l_coverage_ids(ut3_develop.ut_coverage.gc_proftab_coverage) := a_profiler_run_id; + l_coverage_ids(ut3_develop.ut_coverage.gc_block_coverage) := a_block_run_id; + ut3_develop.ut_coverage.mock_coverage_id(l_coverage_ids); end; procedure setup_mock_coverage_id is @@ -54,13 +54,13 @@ create or replace package body coverage_helper is procedure mock_coverage_data(a_user in varchar2) is c_unit_id constant integer := 1; begin - insert into ut3.plsql_profiler_runs ( runid, run_owner, run_date, run_comment) + insert into ut3_develop.plsql_profiler_runs ( runid, run_owner, run_date, run_comment) values(g_profiler_run_id, a_user, sysdate, 'unit testing utPLSQL'); - insert into ut3.plsql_profiler_units ( runid, unit_number, unit_type, unit_owner, unit_name) - values(g_profiler_run_id, c_unit_id, 'PACKAGE BODY', 'UT3', 'DUMMY_COVERAGE'); + insert into ut3_develop.plsql_profiler_units ( runid, unit_number, unit_type, unit_owner, unit_name) + values(g_profiler_run_id, c_unit_id, 'PACKAGE BODY', 'UT3_DEVELOP', 'DUMMY_COVERAGE'); - insert into ut3.plsql_profiler_data ( runid, unit_number, line#, total_occur, total_time) + insert into ut3_develop.plsql_profiler_data ( runid, unit_number, line#, total_occur, total_time) select g_profiler_run_id, c_unit_id, 4, 1, 1 from dual union all select g_profiler_run_id, c_unit_id, 5, 0, 0 from dual union all select g_profiler_run_id, c_unit_id, 7, 1, 1 from dual; @@ -69,17 +69,17 @@ create or replace package body coverage_helper is procedure cleanup_dummy_coverage(a_run_id in integer) is pragma autonomous_transaction; begin - delete from ut3.plsql_profiler_data where runid = a_run_id; - delete from ut3.plsql_profiler_units where runid = a_run_id; - delete from ut3.plsql_profiler_runs where runid = a_run_id; + delete from ut3_develop.plsql_profiler_data where runid = a_run_id; + delete from ut3_develop.plsql_profiler_units where runid = a_run_id; + delete from ut3_develop.plsql_profiler_runs where runid = a_run_id; commit; end; procedure cleanup_dummy_coverage(a_block_id in integer, a_prof_id in integer) is pragma autonomous_transaction; begin - begin execute immediate q'[drop package ut3.test_block_dummy_coverage]'; exception when others then null; end; - begin execute immediate q'[drop package ut3.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long]'; exception when others then null; end; + begin execute immediate q'[drop package ut3_develop.test_block_dummy_coverage]'; exception when others then null; end; + begin execute immediate q'[drop package ut3_develop.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long]'; exception when others then null; end; delete from dbmspcc_blocks where run_id = a_block_id; delete from dbmspcc_units where run_id = a_block_id; delete from dbmspcc_runs where run_id = a_block_id; @@ -98,12 +98,12 @@ create or replace package body coverage_helper is procedure create_dummy_coverage_package is pragma autonomous_transaction; begin - execute immediate q'[create or replace package UT3.DUMMY_COVERAGE is + execute immediate q'[create or replace package UT3_DEVELOP.DUMMY_COVERAGE is procedure do_stuff; procedure grant_myself; end;]'; - execute immediate q'[create or replace package body UT3.DUMMY_COVERAGE is + execute immediate q'[create or replace package body UT3_DEVELOP.DUMMY_COVERAGE is procedure do_stuff is begin if 1 = 2 then @@ -115,7 +115,7 @@ create or replace package body coverage_helper is procedure grant_myself is begin - execute immediate 'grant debug,execute on UT3.DUMMY_COVERAGE to ut3$user#'; + execute immediate 'grant debug,execute on UT3_DEVELOP.DUMMY_COVERAGE to ut3$user#'; end; end;]'; @@ -124,7 +124,7 @@ create or replace package body coverage_helper is procedure create_dummy_coverage_test is pragma autonomous_transaction; begin - execute immediate q'[create or replace package UT3.TEST_DUMMY_COVERAGE is + execute immediate q'[create or replace package UT3_DEVELOP.TEST_DUMMY_COVERAGE is --%suite(dummy coverage test) --%suitepath(coverage_testing) @@ -133,7 +133,7 @@ create or replace package body coverage_helper is procedure grant_myself; end;]'; - execute immediate q'[create or replace package body UT3.TEST_DUMMY_COVERAGE is + execute immediate q'[create or replace package body UT3_DEVELOP.TEST_DUMMY_COVERAGE is procedure test_do_stuff is begin dummy_coverage.do_stuff; @@ -141,7 +141,7 @@ create or replace package body coverage_helper is procedure grant_myself is begin - execute immediate 'grant debug,execute on UT3.TEST_DUMMY_COVERAGE to ut3$user#'; + execute immediate 'grant debug,execute on UT3_DEVELOP.TEST_DUMMY_COVERAGE to ut3$user#'; end; end;]'; @@ -150,26 +150,26 @@ create or replace package body coverage_helper is procedure grant_exec_on_cov is pragma autonomous_transaction; begin - execute immediate 'begin UT3.DUMMY_COVERAGE.grant_myself(); end;'; - execute immediate 'begin UT3.TEST_DUMMY_COVERAGE.grant_myself(); end;'; + execute immediate 'begin UT3_DEVELOP.DUMMY_COVERAGE.grant_myself(); end;'; + execute immediate 'begin UT3_DEVELOP.TEST_DUMMY_COVERAGE.grant_myself(); end;'; end; procedure drop_dummy_coverage_pkg is pragma autonomous_transaction; begin - begin execute immediate q'[drop package ut3.test_dummy_coverage]'; exception when others then null; end; - begin execute immediate q'[drop package ut3.dummy_coverage]'; exception when others then null; end; + begin execute immediate q'[drop package ut3_develop.test_dummy_coverage]'; exception when others then null; end; + begin execute immediate q'[drop package ut3_develop.dummy_coverage]'; exception when others then null; end; end; procedure create_dummy_coverage_test_1 is pragma autonomous_transaction; begin - execute immediate q'[create or replace package UT3.DUMMY_COVERAGE_1 is + execute immediate q'[create or replace package UT3_DEVELOP.DUMMY_COVERAGE_1 is procedure do_stuff; procedure grant_myself; end;]'; - execute immediate q'[create or replace package body UT3.DUMMY_COVERAGE_1 is + execute immediate q'[create or replace package body UT3_DEVELOP.DUMMY_COVERAGE_1 is procedure do_stuff is begin if 1 = 2 then @@ -181,11 +181,11 @@ create or replace package body coverage_helper is procedure grant_myself is begin - execute immediate 'grant debug,execute on UT3.DUMMY_COVERAGE_1 to ut3$user#'; + execute immediate 'grant debug,execute on UT3_DEVELOP.DUMMY_COVERAGE_1 to ut3$user#'; end; end;]'; - execute immediate q'[create or replace package UT3.TEST_DUMMY_COVERAGE_1 is + execute immediate q'[create or replace package UT3_DEVELOP.TEST_DUMMY_COVERAGE_1 is --%suite(dummy coverage test 1) --%suitepath(coverage_testing) @@ -194,7 +194,7 @@ create or replace package body coverage_helper is procedure grant_myself; end;]'; - execute immediate q'[create or replace package body UT3.TEST_DUMMY_COVERAGE_1 is + execute immediate q'[create or replace package body UT3_DEVELOP.TEST_DUMMY_COVERAGE_1 is procedure test_do_stuff is begin dummy_coverage_1.do_stuff; @@ -202,31 +202,31 @@ create or replace package body coverage_helper is procedure grant_myself is begin - execute immediate 'grant debug,execute on UT3.TEST_DUMMY_COVERAGE_1 to ut3$user#'; + execute immediate 'grant debug,execute on UT3_DEVELOP.TEST_DUMMY_COVERAGE_1 to ut3$user#'; end; end;]'; - execute immediate 'begin UT3.DUMMY_COVERAGE_1.grant_myself(); end;'; - execute immediate 'begin UT3.TEST_DUMMY_COVERAGE_1.grant_myself(); end;'; + execute immediate 'begin UT3_DEVELOP.DUMMY_COVERAGE_1.grant_myself(); end;'; + execute immediate 'begin UT3_DEVELOP.TEST_DUMMY_COVERAGE_1.grant_myself(); end;'; end; procedure drop_dummy_coverage_test_1 is pragma autonomous_transaction; begin - execute immediate q'[drop package UT3.DUMMY_COVERAGE_1]'; - execute immediate q'[drop package UT3.TEST_DUMMY_COVERAGE_1]'; + execute immediate q'[drop package UT3_DEVELOP.DUMMY_COVERAGE_1]'; + execute immediate q'[drop package UT3_DEVELOP.TEST_DUMMY_COVERAGE_1]'; end; --12.2 Setup procedure create_dummy_12_2_cov_pck is pragma autonomous_transaction; begin - execute immediate q'[create or replace package UT3.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG is + execute immediate q'[create or replace package UT3_DEVELOP.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG is procedure do_stuff(i_input in number); procedure grant_myself; end;]'; - execute immediate q'[create or replace package body UT3.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG is + execute immediate q'[create or replace package body UT3_DEVELOP.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG is procedure do_stuff(i_input in number) is begin if i_input = 2 then @@ -238,7 +238,7 @@ create or replace package body coverage_helper is procedure grant_myself is begin - execute immediate 'grant debug,execute on UT3.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG to ut3$user#'; + execute immediate 'grant debug,execute on UT3_DEVELOP.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG to ut3$user#'; end; end;]'; @@ -247,7 +247,7 @@ create or replace package body coverage_helper is procedure create_dummy_12_2_cov_test is pragma autonomous_transaction; begin - execute immediate q'[create or replace package UT3.TEST_BLOCK_DUMMY_COVERAGE is + execute immediate q'[create or replace package UT3_DEVELOP.TEST_BLOCK_DUMMY_COVERAGE is --%suite(dummy coverage test) --%suitepath(coverage_testing) @@ -257,7 +257,7 @@ create or replace package body coverage_helper is procedure grant_myself; end;]'; - execute immediate q'[create or replace package body UT3.TEST_BLOCK_DUMMY_COVERAGE is + execute immediate q'[create or replace package body UT3_DEVELOP.TEST_BLOCK_DUMMY_COVERAGE is procedure test_do_stuff is begin dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long.do_stuff(1); @@ -266,7 +266,7 @@ create or replace package body coverage_helper is procedure grant_myself is begin - execute immediate 'grant debug,execute on UT3.TEST_BLOCK_DUMMY_COVERAGE to ut3$user#'; + execute immediate 'grant debug,execute on UT3_DEVELOP.TEST_BLOCK_DUMMY_COVERAGE to ut3$user#'; end; end;]'; end; @@ -278,7 +278,7 @@ create or replace package body coverage_helper is values(a_run_id, a_user, sysdate, 'unit testing utPLSQL'); insert into dbmspcc_units ( run_id, object_id, type, owner, name,last_ddl_time) - values(a_run_id, c_unit_id, 'PACKAGE BODY', 'UT3', 'DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG',sysdate); + values(a_run_id, c_unit_id, 'PACKAGE BODY', 'UT3_DEVELOP', 'DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG',sysdate); insert into dbmspcc_blocks ( run_id, object_id, line,block,col,covered,not_feasible) select a_run_id, c_unit_id,4,1,1,1,0 from dual union all @@ -290,13 +290,13 @@ create or replace package body coverage_helper is procedure mock_profiler_coverage_data(a_run_id integer,a_user in varchar2) is c_unit_id constant integer := 1; begin - insert into ut3.plsql_profiler_runs ( runid, run_owner, run_date, run_comment) + insert into ut3_develop.plsql_profiler_runs ( runid, run_owner, run_date, run_comment) values(a_run_id, a_user, sysdate, 'unit testing utPLSQL'); - insert into ut3.plsql_profiler_units ( runid, unit_number, unit_type, unit_owner, unit_name) - values(a_run_id, c_unit_id, 'PACKAGE BODY', 'UT3', 'DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG'); + insert into ut3_develop.plsql_profiler_units ( runid, unit_number, unit_type, unit_owner, unit_name) + values(a_run_id, c_unit_id, 'PACKAGE BODY', 'UT3_DEVELOP', 'DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG'); - insert into ut3.plsql_profiler_data ( runid, unit_number, line#, total_occur, total_time) + insert into ut3_develop.plsql_profiler_data ( runid, unit_number, line#, total_occur, total_time) select a_run_id, c_unit_id, 4, 1, 1 from dual union all select a_run_id, c_unit_id, 5, 0, 0 from dual union all select a_run_id, c_unit_id, 6, 1, 0 from dual union all @@ -306,13 +306,13 @@ create or replace package body coverage_helper is procedure grant_exec_on_12_2_cov is pragma autonomous_transaction; begin - execute immediate 'begin UT3.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG.grant_myself(); end;'; - execute immediate 'begin UT3.TEST_BLOCK_DUMMY_COVERAGE.grant_myself(); end;'; + execute immediate 'begin UT3_DEVELOP.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG.grant_myself(); end;'; + execute immediate 'begin UT3_DEVELOP.TEST_BLOCK_DUMMY_COVERAGE.grant_myself(); end;'; end; procedure set_develop_mode is begin - ut3.ut_coverage.set_develop_mode(true); + ut3_develop.ut_coverage.set_develop_mode(true); end; end; diff --git a/test/ut3_tester_helper/coverage_helper.pks b/test/ut3_tester_helper/coverage_helper.pks index 9e152707b..c240ed490 100644 --- a/test/ut3_tester_helper/coverage_helper.pks +++ b/test/ut3_tester_helper/coverage_helper.pks @@ -1,6 +1,6 @@ create or replace package coverage_helper is - type prof_runs_tab is table of ut3.plsql_profiler_runs%rowtype; + type prof_runs_tab is table of ut3_develop.plsql_profiler_runs%rowtype; function get_mock_proftab_run_id return integer; diff --git a/test/ut3_tester_helper/expectations_helper.pkb b/test/ut3_tester_helper/expectations_helper.pkb index cc86f18a6..c5c1f379f 100644 --- a/test/ut3_tester_helper/expectations_helper.pkb +++ b/test/ut3_tester_helper/expectations_helper.pkb @@ -12,7 +12,7 @@ create or replace package body expectations_helper is l_expected '||a_data_type||' := '||a_data_value||'; begin --act - execute the expectation - ut3.ut.expect(l_expected).'||a_matcher_name||'(); + ut3_develop.ut.expect(l_expected).'||a_matcher_name||'(); end;'; return l_execute; end; @@ -28,7 +28,7 @@ create or replace package body expectations_helper is declare l_object '||a_object_name||' := '||a_object_value||'; begin - ut3.ut.expect(anydata.convert'||a_object_type||'(l_object)).'||a_matcher_name||'(); + ut3_develop.ut.expect(anydata.convert'||a_object_type||'(l_object)).'||a_matcher_name||'(); end;'; end; @@ -48,7 +48,7 @@ create or replace package body expectations_helper is l_expected '||a_expected_data_type||' := '||a_expected_data||'; begin --act - execute the expectation - ut3.ut.expect( l_actual ).'||a_matcher_name||'(l_expected); + ut3_develop.ut.expect( l_actual ).'||a_matcher_name||'(l_expected); end;'; return l_execute; end; diff --git a/test/ut3_tester_helper/main_helper.pkb b/test/ut3_tester_helper/main_helper.pkb index c684054a1..5c3032b75 100644 --- a/test/ut3_tester_helper/main_helper.pkb +++ b/test/ut3_tester_helper/main_helper.pkb @@ -12,7 +12,7 @@ create or replace package body main_helper is end if; while l_status != 1 loop if l_line is not null then - ut3.ut_utils.append_to_clob(l_result, l_line||chr(10)); + ut3_develop.ut_utils.append_to_clob(l_result, l_line||chr(10)); end if; dbms_output.get_line(line => l_line, status => l_status); end loop; @@ -29,10 +29,10 @@ create or replace package body main_helper is end; function run_test(a_path varchar2) return clob is - l_lines ut3.ut_varchar2_list; + l_lines ut3_develop.ut_varchar2_list; begin - select * bulk collect into l_lines from table(ut3.ut.run(a_path)); - return ut3.ut_utils.table_to_clob(l_lines); + select * bulk collect into l_lines from table(ut3_develop.ut.run(a_path)); + return ut3_develop.ut_utils.table_to_clob(l_lines); end; function get_value(a_variable varchar2) return integer is @@ -42,9 +42,9 @@ create or replace package body main_helper is return l_glob_val; end; - function get_failed_expectations return ut3.ut_varchar2_list is - l_expectations_result ut3.ut_expectation_results := ut3.ut_expectation_processor.get_failed_expectations(); - l_result ut3.ut_varchar2_list := ut3.ut_varchar2_list(); + function get_failed_expectations return ut3_develop.ut_varchar2_list is + l_expectations_result ut3_develop.ut_expectation_results := ut3_develop.ut_expectation_processor.get_failed_expectations(); + l_result ut3_develop.ut_varchar2_list := ut3_develop.ut_varchar2_list(); begin for i in 1..l_expectations_result.count loop l_result := l_result multiset union l_expectations_result(i).get_result_lines(); @@ -53,19 +53,19 @@ create or replace package body main_helper is end; function get_failed_expectations(a_pos in number) return varchar2 is - l_result varchar2(32767) := ut3.ut_expectation_processor.get_failed_expectations()(a_pos).message; + l_result varchar2(32767) := ut3_develop.ut_expectation_processor.get_failed_expectations()(a_pos).message; begin return l_result; end; function failed_expectations_data return anydata is begin - return anydata.convertCollection(ut3.ut_expectation_processor.get_failed_expectations()); + return anydata.convertCollection(ut3_develop.ut_expectation_processor.get_failed_expectations()); end; function get_failed_expectations_num return number is l_num_failed number; - l_results ut3.ut_expectation_results := ut3.ut_expectation_processor.get_failed_expectations(); + l_results ut3_develop.ut_expectation_results := ut3_develop.ut_expectation_processor.get_failed_expectations(); begin l_num_failed := l_results.count; return l_num_failed; @@ -73,33 +73,33 @@ create or replace package body main_helper is procedure clear_expectations is begin - ut3.ut_expectation_processor.clear_expectations(); + ut3_develop.ut_expectation_processor.clear_expectations(); end; - function table_to_clob(a_results in ut3.ut_varchar2_list) return clob is + function table_to_clob(a_results in ut3_develop.ut_varchar2_list) return clob is begin - return ut3.ut_utils.table_to_clob(a_results); + return ut3_develop.ut_utils.table_to_clob(a_results); end; - function get_warnings return ut3.ut_varchar2_rows is + function get_warnings return ut3_develop.ut_varchar2_rows is begin - return ut3.ut_expectation_processor.get_warnings(); + return ut3_develop.ut_expectation_processor.get_warnings(); end; procedure reset_nulls_equal is begin - ut3.ut_expectation_processor.nulls_Are_equal(ut3.ut_expectation_processor.gc_default_nulls_are_equal); + ut3_develop.ut_expectation_processor.nulls_Are_equal(ut3_develop.ut_expectation_processor.gc_default_nulls_are_equal); end; procedure nulls_are_equal(a_nulls_equal boolean := true) is begin - ut3.ut_expectation_processor.nulls_Are_equal(a_nulls_equal); + ut3_develop.ut_expectation_processor.nulls_Are_equal(a_nulls_equal); end; procedure cleanup_annotation_cache is pragma autonomous_transaction; begin - delete from ut3.ut_annotation_cache_info + delete from ut3_develop.ut_annotation_cache_info where object_owner = 'UT3_TESTER' and object_type = 'PACKAGE' and object_name in ('DUMMY_PACKAGE','DUMMY_TEST_PACKAGE'); commit; end; @@ -110,7 +110,7 @@ create or replace package body main_helper is execute immediate q'[ create or replace procedure ut3$user#.parse_annotations is begin - ut3.ut_runner.rebuild_annotation_cache('UT3_TESTER','PACKAGE'); + ut3_develop.ut_runner.rebuild_annotation_cache('UT3_TESTER','PACKAGE'); end;]'; end; @@ -134,34 +134,34 @@ create or replace package body main_helper is where srj.job_name = a_job_name; end; - procedure append_to_list(a_list in out nocopy ut3.ut_varchar2_list, a_item varchar2) is + procedure append_to_list(a_list in out nocopy ut3_develop.ut_varchar2_list, a_item varchar2) is begin - ut3.ut_utils.append_to_list(a_list,a_item); + ut3_develop.ut_utils.append_to_list(a_list,a_item); end; - procedure append_to_list(a_list in out nocopy ut3.ut_varchar2_rows, a_item varchar2) is + procedure append_to_list(a_list in out nocopy ut3_develop.ut_varchar2_rows, a_item varchar2) is begin - ut3.ut_utils.append_to_list(a_list,a_item); + ut3_develop.ut_utils.append_to_list(a_list,a_item); end; - procedure append_to_list(a_list in out nocopy ut3.ut_varchar2_rows, a_item clob) is + procedure append_to_list(a_list in out nocopy ut3_develop.ut_varchar2_rows, a_item clob) is begin - ut3.ut_utils.append_to_list(a_list,a_item); + ut3_develop.ut_utils.append_to_list(a_list,a_item); end; - procedure append_to_list(a_list in out nocopy ut3.ut_varchar2_rows, a_items ut3.ut_varchar2_rows) is + procedure append_to_list(a_list in out nocopy ut3_develop.ut_varchar2_rows, a_items ut3_develop.ut_varchar2_rows) is begin - ut3.ut_utils.append_to_list(a_list,a_items); + ut3_develop.ut_utils.append_to_list(a_list,a_items); end; procedure set_ut_run_context is begin - ut3.ut_session_context.set_context('RUN_PATHS',' '); + ut3_develop.ut_session_context.set_context('RUN_PATHS',' '); end; procedure clear_ut_run_context is begin - ut3.ut_session_context.clear_all_context; + ut3_develop.ut_session_context.clear_all_context; end; end; diff --git a/test/ut3_tester_helper/main_helper.pks b/test/ut3_tester_helper/main_helper.pks index 63c99936c..e675e267e 100644 --- a/test/ut3_tester_helper/main_helper.pks +++ b/test/ut3_tester_helper/main_helper.pks @@ -1,7 +1,7 @@ create or replace package main_helper is - gc_success number := ut3.ut_utils.gc_success; - gc_failure number := ut3.ut_utils.gc_failure; + gc_success number := ut3_develop.ut_utils.gc_success; + gc_failure number := ut3_develop.ut_utils.gc_failure; procedure execute_autonomous(a_sql varchar2); @@ -11,7 +11,7 @@ create or replace package main_helper is function get_dbms_output_as_clob return clob; - function get_failed_expectations return ut3.ut_varchar2_list; + function get_failed_expectations return ut3_develop.ut_varchar2_list; function get_failed_expectations(a_pos in number) return varchar2; @@ -19,9 +19,9 @@ create or replace package main_helper is procedure clear_expectations; - function table_to_clob(a_results in ut3.ut_varchar2_list) return clob; + function table_to_clob(a_results in ut3_develop.ut_varchar2_list) return clob; - function get_warnings return ut3.ut_varchar2_rows; + function get_warnings return ut3_develop.ut_varchar2_rows; procedure reset_nulls_equal; @@ -37,13 +37,13 @@ create or replace package main_helper is function get_job_count(a_job_name varchar2) return number; - procedure append_to_list(a_list in out nocopy ut3.ut_varchar2_list, a_item varchar2); + procedure append_to_list(a_list in out nocopy ut3_develop.ut_varchar2_list, a_item varchar2); - procedure append_to_list(a_list in out nocopy ut3.ut_varchar2_rows, a_item varchar2); + procedure append_to_list(a_list in out nocopy ut3_develop.ut_varchar2_rows, a_item varchar2); - procedure append_to_list(a_list in out nocopy ut3.ut_varchar2_rows, a_item clob); + procedure append_to_list(a_list in out nocopy ut3_develop.ut_varchar2_rows, a_item clob); - procedure append_to_list(a_list in out nocopy ut3.ut_varchar2_rows, a_items ut3.ut_varchar2_rows); + procedure append_to_list(a_list in out nocopy ut3_develop.ut_varchar2_rows, a_items ut3_develop.ut_varchar2_rows); procedure set_ut_run_context; diff --git a/test/ut3_tester_helper/run_helper.pkb b/test/ut3_tester_helper/run_helper.pkb index 70695977b..c2a50170e 100644 --- a/test/ut3_tester_helper/run_helper.pkb +++ b/test/ut3_tester_helper/run_helper.pkb @@ -141,15 +141,15 @@ create or replace package body run_helper is pragma autonomous_transaction; begin setup_cache_objects(); - ut3.ut_annotation_manager.rebuild_annotation_cache('UT3$USER#','PACKAGE'); - ut3.ut_annotation_manager.rebuild_annotation_cache('UT3$USER#','PROCEDURE'); - ut3.ut_annotation_manager.rebuild_annotation_cache('UT3_TESTER_HELPER','PROCEDURE'); + ut3_develop.ut_annotation_manager.rebuild_annotation_cache('UT3$USER#','PACKAGE'); + ut3_develop.ut_annotation_manager.rebuild_annotation_cache('UT3$USER#','PROCEDURE'); + ut3_develop.ut_annotation_manager.rebuild_annotation_cache('UT3_TESTER_HELPER','PROCEDURE'); end; procedure cleanup_cache is pragma autonomous_transaction; begin - delete from ut3.ut_annotation_cache_info + delete from ut3_develop.ut_annotation_cache_info where object_type = 'PROCEDURE' and object_owner in ('UT3$USER#','UT3_TESTER_HELPER') or object_type = 'PACKAGE' and object_owner = user and object_name = 'DUMMY_TEST_PACKAGE'; execute immediate q'[drop package ut3$user#.dummy_test_package]'; @@ -199,7 +199,7 @@ create or replace package body run_helper is begin select 1 into a_value from dual@db_loopback; - ut3.ut.expect(a_value).to_be_null(); + ut3_develop.ut.expect(a_value).to_be_null(); end; end;]'; @@ -390,7 +390,7 @@ create or replace package body run_helper is procedure failing_stateful_test is begin - ut3.ut.expect(stateful_package.get_state@db_loopback).to_equal('abc'); + ut3_develop.ut.expect(stateful_package.get_state@db_loopback).to_equal('abc'); end; procedure rebuild_stateful_package is @@ -435,126 +435,126 @@ create or replace package body run_helper is execute immediate 'drop package ut_without_body'; end; - procedure run(a_reporter ut3.ut_reporter_base := null) is + procedure run(a_reporter ut3_develop.ut_reporter_base := null) is begin - ut3.ut.run(a_reporter); + ut3_develop.ut.run(a_reporter); end; - procedure run(a_path varchar2, a_reporter ut3.ut_reporter_base := null) is + procedure run(a_path varchar2, a_reporter ut3_develop.ut_reporter_base := null) is begin - ut3.ut.run(a_path, a_reporter); + ut3_develop.ut.run(a_path, a_reporter); end; - procedure run(a_paths ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base := null) is + procedure run(a_paths ut3_develop.ut_varchar2_list, a_reporter ut3_develop.ut_reporter_base := null) is begin - ut3.ut.run(a_paths, a_reporter); + ut3_develop.ut.run(a_paths, a_reporter); end; - procedure run(a_paths ut3.ut_varchar2_list, a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base) is + procedure run(a_paths ut3_develop.ut_varchar2_list, a_test_files ut3_develop.ut_varchar2_list, a_reporter ut3_develop.ut_reporter_base) is begin - ut3.ut.run( + ut3_develop.ut.run( a_paths, a_reporter, - a_source_files => ut3.ut_varchar2_list(), + a_source_files => ut3_develop.ut_varchar2_list(), a_test_files => a_test_files ); end; - function run(a_reporter ut3.ut_reporter_base := null) return ut3.ut_varchar2_list is - l_results ut3.ut_varchar2_list; + function run(a_reporter ut3_develop.ut_reporter_base := null) return ut3_develop.ut_varchar2_list is + l_results ut3_develop.ut_varchar2_list; begin - select * bulk collect into l_results from table (ut3.ut.run(a_reporter)); + select * bulk collect into l_results from table (ut3_develop.ut.run(a_reporter)); return l_results; end; - function run(a_paths ut3.ut_varchar2_list, a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base) return ut3.ut_varchar2_list is - l_results ut3.ut_varchar2_list; + function run(a_paths ut3_develop.ut_varchar2_list, a_test_files ut3_develop.ut_varchar2_list, a_reporter ut3_develop.ut_reporter_base) return ut3_develop.ut_varchar2_list is + l_results ut3_develop.ut_varchar2_list; begin select * bulk collect into l_results from table ( - ut3.ut.run( + ut3_develop.ut.run( a_paths, - a_reporter, a_source_files => ut3.ut_varchar2_list(), + a_reporter, a_source_files => ut3_develop.ut_varchar2_list(), a_test_files => a_test_files )); return l_results; end; - function run(a_path varchar2, a_reporter ut3.ut_reporter_base := null) - return ut3.ut_varchar2_list is - l_results ut3.ut_varchar2_list; + function run(a_path varchar2, a_reporter ut3_develop.ut_reporter_base := null) + return ut3_develop.ut_varchar2_list is + l_results ut3_develop.ut_varchar2_list; begin - select * bulk collect into l_results from table (ut3.ut.run(a_path, a_reporter)); + select * bulk collect into l_results from table (ut3_develop.ut.run(a_path, a_reporter)); return l_results; end; - function run(a_paths ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base := null) - return ut3.ut_varchar2_list is - l_results ut3.ut_varchar2_list; + function run(a_paths ut3_develop.ut_varchar2_list, a_reporter ut3_develop.ut_reporter_base := null) + return ut3_develop.ut_varchar2_list is + l_results ut3_develop.ut_varchar2_list; begin - select * bulk collect into l_results from table (ut3.ut.run(a_paths, a_reporter)); + select * bulk collect into l_results from table (ut3_develop.ut.run(a_paths, a_reporter)); return l_results; end; - function run(a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base) - return ut3.ut_varchar2_list is - l_results ut3.ut_varchar2_list; + function run(a_test_files ut3_develop.ut_varchar2_list, a_reporter ut3_develop.ut_reporter_base) + return ut3_develop.ut_varchar2_list is + l_results ut3_develop.ut_varchar2_list; begin select * bulk collect into l_results from table ( - ut3.ut.run( - a_reporter, a_source_files => ut3.ut_varchar2_list(), + ut3_develop.ut.run( + a_reporter, a_source_files => ut3_develop.ut_varchar2_list(), a_test_files => a_test_files )); return l_results; end; - procedure run(a_reporter ut3.ut_reporter_base := null,a_tags varchar2) is + procedure run(a_reporter ut3_develop.ut_reporter_base := null,a_tags varchar2) is begin - ut3.ut.run(a_reporter,a_tags => a_tags); + ut3_develop.ut.run(a_reporter,a_tags => a_tags); end; - procedure run(a_path varchar2, a_reporter ut3.ut_reporter_base := null,a_tags varchar2) is + procedure run(a_path varchar2, a_reporter ut3_develop.ut_reporter_base := null,a_tags varchar2) is begin - ut3.ut.run(a_path, a_reporter,a_tags => a_tags); + ut3_develop.ut.run(a_path, a_reporter,a_tags => a_tags); end; - procedure run(a_paths ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base := null, a_tags varchar2) is + procedure run(a_paths ut3_develop.ut_varchar2_list, a_reporter ut3_develop.ut_reporter_base := null, a_tags varchar2) is begin - ut3.ut.run(a_paths, a_reporter,a_tags => a_tags); + ut3_develop.ut.run(a_paths, a_reporter,a_tags => a_tags); end; - function run(a_reporter ut3.ut_reporter_base := null,a_tags varchar2) return ut3.ut_varchar2_list is - l_results ut3.ut_varchar2_list; + function run(a_reporter ut3_develop.ut_reporter_base := null,a_tags varchar2) return ut3_develop.ut_varchar2_list is + l_results ut3_develop.ut_varchar2_list; begin - select * bulk collect into l_results from table (ut3.ut.run(a_reporter, a_tags => a_tags)); + select * bulk collect into l_results from table (ut3_develop.ut.run(a_reporter, a_tags => a_tags)); return l_results; end; - function run(a_path varchar2, a_reporter ut3.ut_reporter_base := null, a_tags varchar2) - return ut3.ut_varchar2_list is - l_results ut3.ut_varchar2_list; + function run(a_path varchar2, a_reporter ut3_develop.ut_reporter_base := null, a_tags varchar2) + return ut3_develop.ut_varchar2_list is + l_results ut3_develop.ut_varchar2_list; begin - select * bulk collect into l_results from table (ut3.ut.run(a_path, a_reporter,a_tags => a_tags)); + select * bulk collect into l_results from table (ut3_develop.ut.run(a_path, a_reporter,a_tags => a_tags)); return l_results; end; - function run(a_paths ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base := null, a_tags varchar2) - return ut3.ut_varchar2_list is - l_results ut3.ut_varchar2_list; + function run(a_paths ut3_develop.ut_varchar2_list, a_reporter ut3_develop.ut_reporter_base := null, a_tags varchar2) + return ut3_develop.ut_varchar2_list is + l_results ut3_develop.ut_varchar2_list; begin - select * bulk collect into l_results from table (ut3.ut.run(a_paths, a_reporter, a_tags => a_tags)); + select * bulk collect into l_results from table (ut3_develop.ut.run(a_paths, a_reporter, a_tags => a_tags)); return l_results; end; - procedure test_rollback_type(a_procedure_name varchar2, a_rollback_type integer, a_expectation ut3_latest_release.ut_matcher) is - l_suite ut3.ut_suite; + procedure test_rollback_type(a_procedure_name varchar2, a_rollback_type integer, a_expectation ut_matcher) is + l_suite ut3_develop.ut_suite; begin --Arrange execute immediate 'delete from ut$test_table'; - l_suite := ut3.ut_suite(a_object_owner => 'ut3_tester_helper', a_object_name => 'UT_TRANSACTION_CONTROL', a_line_no=> 1); + l_suite := ut3_develop.ut_suite(a_object_owner => 'ut3_tester_helper', a_object_name => 'UT_TRANSACTION_CONTROL', a_line_no=> 1); l_suite.path := 'ut_transaction_control'; - l_suite.before_all_list := ut3.ut_executables(ut3.ut_executable('ut3_tester_helper', 'UT_TRANSACTION_CONTROL', 'setup', ut3.ut_utils.gc_before_all)); + l_suite.before_all_list := ut3_develop.ut_executables(ut3_develop.ut_executable('ut3_tester_helper', 'UT_TRANSACTION_CONTROL', 'setup', ut3_develop.ut_utils.gc_before_all)); l_suite.items.extend; - l_suite.items(l_suite.items.last) := ut3.ut_test(a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_transaction_control',a_name => a_procedure_name, a_line_no=> 1); + l_suite.items(l_suite.items.last) := ut3_develop.ut_test(a_object_owner => 'ut3_tester_helper', a_object_name => 'ut_transaction_control',a_name => a_procedure_name, a_line_no=> 1); l_suite.set_rollback_type(a_rollback_type); --Act @@ -568,7 +568,7 @@ create or replace package body run_helper is procedure create_dummy_long_test_package is pragma autonomous_transaction; begin - execute immediate q'[create or replace package ut3.dummy_long_test_package as + execute immediate q'[create or replace package ut3_develop.dummy_long_test_package as --%suitepath(verylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtext) --%suite(dummy_test_suite) @@ -577,7 +577,7 @@ create or replace package body run_helper is procedure some_dummy_test_procedure; end;]'; - execute immediate q'[create or replace package ut3.dummy_long_test_package1 as + execute immediate q'[create or replace package ut3_develop.dummy_long_test_package1 as --%suitepath(verylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtext) --%suite(dummy_test_suite1) @@ -590,15 +590,15 @@ create or replace package body run_helper is procedure drop_dummy_long_test_package is pragma autonomous_transaction; begin - execute immediate q'[drop package ut3.dummy_long_test_package]'; - execute immediate q'[drop package ut3.dummy_long_test_package1]'; + execute immediate q'[drop package ut3_develop.dummy_long_test_package]'; + execute immediate q'[drop package ut3_develop.dummy_long_test_package1]'; end; procedure create_ut3_suite is pragma autonomous_transaction; begin execute immediate q'[ - create or replace package ut3.some_test_package + create or replace package ut3_develop.some_test_package as --%suite @@ -611,18 +611,18 @@ create or replace package body run_helper is procedure drop_ut3_suite is pragma autonomous_transaction; begin - execute immediate q'[drop package ut3.some_test_package]'; + execute immediate q'[drop package ut3_develop.some_test_package]'; end; - function get_schema_ut_packages(a_owner in varchar2) return ut3.ut_object_names is + function get_schema_ut_packages(a_owner in varchar2) return ut3_develop.ut_object_names is begin - return ut3.ut_suite_manager.get_schema_ut_packages(ut3.ut_varchar2_rows(a_owner)); + return ut3_develop.ut_suite_manager.get_schema_ut_packages(ut3_develop.ut_varchar2_rows(a_owner)); end; function ut_output_buffer_tmp return t_out_buff_tab pipelined is l_buffer_tab t_out_buff_tab; cursor get_buffer is - select * from ut3.ut_output_buffer_tmp; + select * from ut3_develop.ut_output_buffer_tmp; begin open get_buffer; fetch get_buffer bulk collect into l_buffer_tab; @@ -633,7 +633,7 @@ create or replace package body run_helper is procedure delete_buffer is begin - delete from ut3.ut_output_buffer_tmp; + delete from ut3_develop.ut_output_buffer_tmp; end; function get_annotation_cache_info_cur( @@ -643,7 +643,7 @@ create or replace package body run_helper is l_result sys_refcursor; begin open l_result for - select * from ut3.ut_annotation_cache_info + select * from ut3_develop.ut_annotation_cache_info where object_owner = a_owner and object_type = a_type; return l_result; @@ -658,8 +658,8 @@ create or replace package body run_helper is begin open l_result for select * - from ut3.ut_annotation_cache_info i - join ut3.ut_annotation_cache c on c.cache_id = i.cache_id + from ut3_develop.ut_annotation_cache_info i + join ut3_develop.ut_annotation_cache c on c.cache_id = i.cache_id where object_owner = a_owner and object_type = a_type and object_name = nvl( a_name, object_name ); return l_result; diff --git a/test/ut3_tester_helper/run_helper.pks b/test/ut3_tester_helper/run_helper.pks index 03eb314a7..88f55d961 100644 --- a/test/ut3_tester_helper/run_helper.pks +++ b/test/ut3_tester_helper/run_helper.pks @@ -2,8 +2,8 @@ create or replace package run_helper is g_run_id integer; - type t_out_buff_tab is table of ut3.ut_output_buffer_tmp%rowtype; - type prof_runs_tab is table of ut3.plsql_profiler_runs%rowtype; + type t_out_buff_tab is table of ut3_develop.ut_output_buffer_tmp%rowtype; + type prof_runs_tab is table of ut3_develop.plsql_profiler_runs%rowtype; procedure setup_cache_objects; procedure setup_cache_objectstag; @@ -29,37 +29,37 @@ create or replace package run_helper is procedure create_trans_control; procedure drop_trans_control; - procedure run(a_reporter ut3.ut_reporter_base := null); - procedure run(a_path varchar2, a_reporter ut3.ut_reporter_base := null); - procedure run(a_paths ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base := null); - procedure run(a_paths ut3.ut_varchar2_list, a_test_files ut3.ut_varchar2_list, - a_reporter ut3.ut_reporter_base); - function run(a_reporter ut3.ut_reporter_base := null) return ut3.ut_varchar2_list; - function run(a_paths ut3.ut_varchar2_list, a_test_files ut3.ut_varchar2_list, - a_reporter ut3.ut_reporter_base) return ut3.ut_varchar2_list; - function run(a_path varchar2, a_reporter ut3.ut_reporter_base := null) - return ut3.ut_varchar2_list; - function run(a_paths ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base := null) - return ut3.ut_varchar2_list; - function run(a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base) - return ut3.ut_varchar2_list; + procedure run(a_reporter ut3_develop.ut_reporter_base := null); + procedure run(a_path varchar2, a_reporter ut3_develop.ut_reporter_base := null); + procedure run(a_paths ut3_develop.ut_varchar2_list, a_reporter ut3_develop.ut_reporter_base := null); + procedure run(a_paths ut3_develop.ut_varchar2_list, a_test_files ut3_develop.ut_varchar2_list, + a_reporter ut3_develop.ut_reporter_base); + function run(a_reporter ut3_develop.ut_reporter_base := null) return ut3_develop.ut_varchar2_list; + function run(a_paths ut3_develop.ut_varchar2_list, a_test_files ut3_develop.ut_varchar2_list, + a_reporter ut3_develop.ut_reporter_base) return ut3_develop.ut_varchar2_list; + function run(a_path varchar2, a_reporter ut3_develop.ut_reporter_base := null) + return ut3_develop.ut_varchar2_list; + function run(a_paths ut3_develop.ut_varchar2_list, a_reporter ut3_develop.ut_reporter_base := null) + return ut3_develop.ut_varchar2_list; + function run(a_test_files ut3_develop.ut_varchar2_list, a_reporter ut3_develop.ut_reporter_base) + return ut3_develop.ut_varchar2_list; - procedure run(a_reporter ut3.ut_reporter_base := null,a_tags varchar2); - procedure run(a_path varchar2, a_reporter ut3.ut_reporter_base := null,a_tags varchar2); - procedure run(a_paths ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base := null, a_tags varchar2); - function run(a_reporter ut3.ut_reporter_base := null,a_tags varchar2) return ut3.ut_varchar2_list; - function run(a_path varchar2, a_reporter ut3.ut_reporter_base := null, a_tags varchar2) - return ut3.ut_varchar2_list; - function run(a_paths ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base := null, a_tags varchar2) - return ut3.ut_varchar2_list; + procedure run(a_reporter ut3_develop.ut_reporter_base := null,a_tags varchar2); + procedure run(a_path varchar2, a_reporter ut3_develop.ut_reporter_base := null,a_tags varchar2); + procedure run(a_paths ut3_develop.ut_varchar2_list, a_reporter ut3_develop.ut_reporter_base := null, a_tags varchar2); + function run(a_reporter ut3_develop.ut_reporter_base := null,a_tags varchar2) return ut3_develop.ut_varchar2_list; + function run(a_path varchar2, a_reporter ut3_develop.ut_reporter_base := null, a_tags varchar2) + return ut3_develop.ut_varchar2_list; + function run(a_paths ut3_develop.ut_varchar2_list, a_reporter ut3_develop.ut_reporter_base := null, a_tags varchar2) + return ut3_develop.ut_varchar2_list; - procedure test_rollback_type(a_procedure_name varchar2, a_rollback_type integer, a_expectation ut3_latest_release.ut_matcher); + procedure test_rollback_type(a_procedure_name varchar2, a_rollback_type integer, a_expectation ut_matcher); procedure create_dummy_long_test_package; procedure drop_dummy_long_test_package; procedure create_ut3_suite; procedure drop_ut3_suite; - function get_schema_ut_packages(a_owner in varchar2) return ut3.ut_object_names; + function get_schema_ut_packages(a_owner in varchar2) return ut3_develop.ut_object_names; function ut_output_buffer_tmp return t_out_buff_tab pipelined; procedure delete_buffer; diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index feac3fe6e..8aed1d36e 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -24,13 +24,13 @@ create or replace package body test_ut_run is procedure ut_version is begin - ut.expect(ut3.ut.version()).to_match('^v\d+\.\d+\.\d+\.\d+(-\w+)?$'); + ut.expect(ut3_develop.ut.version()).to_match('^v\d+\.\d+\.\d+\.\d+(-\w+)?$'); end; procedure ut_fail is begin --Act - ut3.ut.fail('Testing failure message'); + ut3_develop.ut.fail('Testing failure message'); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations(1)) .to_be_like('%Testing failure message%'); @@ -49,7 +49,7 @@ create or replace package body test_ut_run is l_results clob; begin --Act - ut3.ut.run('ut3_tester_helper',a_reporter => ut3.ut_documentation_reporter() ); + ut3_develop.ut.run('ut3_tester_helper',a_reporter => ut3_develop.ut_documentation_reporter() ); l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); --Assert ut.expect( l_results ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); @@ -59,11 +59,11 @@ create or replace package body test_ut_run is l_results clob; begin --Act - ut3.ut.run( + ut3_develop.ut.run( 'ut3_tester_helper', - a_reporter => ut3.ut_sonar_test_reporter(), - a_source_files => ut3.ut_varchar2_list(), - a_test_files => ut3.ut_varchar2_list('tests/ut3_tester_helper.test_package_1.pkb', + a_reporter => ut3_develop.ut_sonar_test_reporter(), + a_source_files => ut3_develop.ut_varchar2_list(), + a_test_files => ut3_develop.ut_varchar2_list('tests/ut3_tester_helper.test_package_1.pkb', 'tests/ut3_tester_helper.test_package_2.pkb', 'tests/ut3_tester_helper.test_package_3.pkb') ); @@ -78,7 +78,7 @@ create or replace package body test_ut_run is procedure run_proc_pkg_name is l_results clob; begin - ut3.ut.run('ut3_tester_helper.test_package_1'); + ut3_develop.ut.run('ut3_tester_helper.test_package_1'); l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); --Assert ut.expect( l_results ).to_be_like( '%test_package_1%' ); @@ -89,10 +89,10 @@ create or replace package body test_ut_run is procedure run_proc_pkg_name_file_list is l_results clob; begin - ut3.ut.run( + ut3_develop.ut.run( 'ut3_tester_helper.test_package_3', - ut3.ut_sonar_test_reporter(), a_source_files => ut3.ut_varchar2_list(), - a_test_files => ut3.ut_varchar2_list('tests/ut3_tester_helper.test_package_1.pkb', + ut3_develop.ut_sonar_test_reporter(), a_source_files => ut3_develop.ut_varchar2_list(), + a_test_files => ut3_develop.ut_varchar2_list('tests/ut3_tester_helper.test_package_1.pkb', 'tests/ut3_tester_helper.test_package_2.pkb', 'tests/ut3_tester_helper.test_package_3.pkb') ); @@ -106,7 +106,7 @@ create or replace package body test_ut_run is procedure run_proc_path_list is l_results clob; begin - ut3_tester_helper.run_helper.run(ut3.ut_varchar2_list(':tests.test_package_1',':tests')); + ut3_tester_helper.run_helper.run(ut3_develop.ut_varchar2_list(':tests.test_package_1',':tests')); l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); --Assert ut.expect( l_results ).to_be_like( '%test_package_1%' ); @@ -118,9 +118,9 @@ create or replace package body test_ut_run is l_results clob; begin ut3_tester_helper.run_helper.run( - a_paths => ut3.ut_varchar2_list(':tests.test_package_1',':tests'), - a_reporter => ut3.ut_sonar_test_reporter(), - a_test_files => ut3.ut_varchar2_list('tests/ut3_tester_helper.test_package_1.pkb', + a_paths => ut3_develop.ut_varchar2_list(':tests.test_package_1',':tests'), + a_reporter => ut3_develop.ut_sonar_test_reporter(), + a_test_files => ut3_develop.ut_varchar2_list('tests/ut3_tester_helper.test_package_1.pkb', 'tests/ut3_tester_helper.test_package_2.pkb', 'tests/ut3_tester_helper.test_package_3.pkb') ); @@ -135,7 +135,7 @@ create or replace package body test_ut_run is l_results clob; begin --Act - ut3.ut.run('ut3_tester_helper', cast(null as ut3.ut_reporter_base)); + ut3_develop.ut.run('ut3_tester_helper', cast(null as ut3_develop.ut_reporter_base)); l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); --Assert ut.expect( l_results ).to_be_like( '%tests%test_package_1%test_package_2%tests2%test_package_3%' ); @@ -153,7 +153,7 @@ create or replace package body test_ut_run is procedure run_proc_null_path_list is l_results clob; - l_paths ut3.ut_varchar2_list; + l_paths ut3_develop.ut_varchar2_list; begin --Act ut3_tester_helper.run_helper.run(l_paths); @@ -166,7 +166,7 @@ create or replace package body test_ut_run is l_results clob; begin --Act - ut3_tester_helper.run_helper.run(ut3.ut_varchar2_list()); + ut3_tester_helper.run_helper.run(ut3_develop.ut_varchar2_list()); l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); --Assert ut.expect( l_results ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); @@ -185,7 +185,7 @@ create or replace package body test_ut_run is execute immediate 'create or replace package body test_commit_warning is procedure does_commit is begin - ut3.ut.expect(1).to_equal(1); + ut3_develop.ut.expect(1).to_equal(1); commit; end; end;'; @@ -200,7 +200,7 @@ create or replace package body test_ut_run is procedure run_proc_warn_on_commit is l_results clob; begin - ut3.ut.run('test_commit_warning'); + ut3_develop.ut.run('test_commit_warning'); l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); ut.expect(l_results).to_be_like( '%Unable to perform automatic rollback after test%'|| @@ -236,7 +236,7 @@ create or replace package body test_ut_run is execute immediate 'create or replace package body child_suite is procedure does_stuff is begin - ut3.ut.expect(1).to_equal(1); + ut3_develop.ut.expect(1).to_equal(1); end; end;'; end; @@ -251,7 +251,7 @@ create or replace package body test_ut_run is procedure run_proc_fail_child_suites is l_results clob; begin - ut3.ut.run('child_suite'); + ut3_develop.ut.run('child_suite'); l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); ut.expect(l_results).to_be_like( '%1) does_stuff%' || @@ -314,7 +314,7 @@ create or replace package body test_ut_run is insert into transaction_test_table values (''1 - inside the test_ut_run.run_proc_keep_test_changes test'')'; --Act - ut3.ut.run('test_transaction.insert_row', a_force_manual_rollback => true); + ut3_develop.ut.run('test_transaction.insert_row', a_force_manual_rollback => true); l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); --Assert @@ -339,7 +339,7 @@ create or replace package body test_ut_run is insert into transaction_test_table values (''1 - inside the test_ut_run.run_proc_keep_test_changes test'')'; --Act - ut3.ut.run('test_transaction.insert_and_raise', a_force_manual_rollback => true); + ut3_develop.ut.run('test_transaction.insert_and_raise', a_force_manual_rollback => true); l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); --Assert @@ -364,7 +364,7 @@ create or replace package body test_ut_run is insert into transaction_test_table values (''1 - inside the test_ut_run.run_proc_keep_test_changes test'')'; --Act - ut3.ut.run('test_transaction.insert_row'); + ut3_develop.ut.run('test_transaction.insert_row'); l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); --Assert @@ -377,7 +377,7 @@ create or replace package body test_ut_run is end; procedure run_func_no_params is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; begin l_results := ut3_tester_helper.run_helper.run(); --Assert @@ -385,23 +385,23 @@ create or replace package body test_ut_run is end; procedure run_func_specific_reporter is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; begin --Act - l_results := ut3_tester_helper.run_helper.run(ut3.ut_documentation_reporter()); + l_results := ut3_tester_helper.run_helper.run(ut3_develop.ut_documentation_reporter()); --Assert ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); end; procedure run_func_cov_file_list is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; begin --Act select * bulk collect into l_results from table ( - ut3.ut.run('ut3_tester_helper', - ut3.ut_sonar_test_reporter(), - a_source_files => ut3.ut_varchar2_list(), - a_test_files => ut3.ut_varchar2_list('tests/ut3_tester_helper.test_package_1.pkb', + ut3_develop.ut.run('ut3_tester_helper', + ut3_develop.ut_sonar_test_reporter(), + a_source_files => ut3_develop.ut_varchar2_list(), + a_test_files => ut3_develop.ut_varchar2_list('tests/ut3_tester_helper.test_package_1.pkb', 'tests/ut3_tester_helper.test_package_2.pkb', 'tests/ut3_tester_helper.test_package_3.pkb') )); @@ -410,9 +410,9 @@ create or replace package body test_ut_run is end; procedure run_func_pkg_name is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; begin - select * bulk collect into l_results from table (ut3.ut.run('ut3_tester_helper.test_package_1')); + select * bulk collect into l_results from table (ut3_develop.ut.run('ut3_tester_helper.test_package_1')); --Assert ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%' ); ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2%' ); @@ -420,13 +420,13 @@ create or replace package body test_ut_run is end; procedure run_func_pkg_name_file_list is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; begin select * bulk collect into l_results from table ( - ut3.ut.run('ut3_tester_helper.test_package_3', - ut3.ut_sonar_test_reporter(), - a_source_files => ut3.ut_varchar2_list(), - a_test_files => ut3.ut_varchar2_list('tests/ut3_tester_helper.test_package_1.pkb', + ut3_develop.ut.run('ut3_tester_helper.test_package_3', + ut3_develop.ut_sonar_test_reporter(), + a_source_files => ut3_develop.ut_varchar2_list(), + a_test_files => ut3_develop.ut_varchar2_list('tests/ut3_tester_helper.test_package_1.pkb', 'tests/ut3_tester_helper.test_package_2.pkb', 'tests/ut3_tester_helper.test_package_3.pkb') )); @@ -437,9 +437,9 @@ create or replace package body test_ut_run is end; procedure run_func_path_list is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; begin - l_results := ut3_tester_helper.run_helper.run(ut3.ut_varchar2_list(':tests.test_package_1',':tests')); + l_results := ut3_tester_helper.run_helper.run(ut3_develop.ut_varchar2_list(':tests.test_package_1',':tests')); --Assert ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%' ); ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_2%' ); @@ -447,12 +447,12 @@ create or replace package body test_ut_run is end; procedure run_func_path_list_file_list is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; begin l_results := ut3_tester_helper.run_helper.run( - a_paths => ut3.ut_varchar2_list(':tests.test_package_1',':tests'), - a_reporter => ut3.ut_sonar_test_reporter(), - a_test_files => ut3.ut_varchar2_list('tests/ut3_tester_helper.test_package_1.pkb', + a_paths => ut3_develop.ut_varchar2_list(':tests.test_package_1',':tests'), + a_reporter => ut3_develop.ut_sonar_test_reporter(), + a_test_files => ut3_develop.ut_varchar2_list('tests/ut3_tester_helper.test_package_1.pkb', 'tests/ut3_tester_helper.test_package_2.pkb', 'tests/ut3_tester_helper.test_package_3.pkb') ); @@ -463,16 +463,16 @@ create or replace package body test_ut_run is end; procedure run_func_null_reporter is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; begin --Act - select * bulk collect into l_results from table (ut3.ut.run('ut3_tester_helper',cast(null as ut3.ut_reporter_base))); + select * bulk collect into l_results from table (ut3_develop.ut.run('ut3_tester_helper',cast(null as ut3_develop.ut_reporter_base))); --Assert ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%tests%test_package_1%test_package_2%tests2%test_package_3%' ); end; procedure run_func_null_path is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; begin --Act l_results := ut3_tester_helper.run_helper.run(cast(null as varchar2)); @@ -481,8 +481,8 @@ create or replace package body test_ut_run is end; procedure run_func_null_path_list is - l_results ut3.ut_varchar2_list; - l_paths ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; + l_paths ut3_develop.ut_varchar2_list; begin --Act l_results := ut3_tester_helper.run_helper.run(l_paths); @@ -491,29 +491,29 @@ create or replace package body test_ut_run is end; procedure run_func_empty_path_list is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; begin --Act - l_results := ut3_tester_helper.run_helper.run(ut3.ut_varchar2_list()); + l_results := ut3_tester_helper.run_helper.run(ut3_develop.ut_varchar2_list()); --Assert ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); end; procedure run_func_cov_file_lst_null_rep is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; begin --Act l_results := ut3_tester_helper.run_helper.run( - a_test_files => ut3.ut_varchar2_list('tests/ut3_tester_helper.test_package_1.pkb', + a_test_files => ut3_develop.ut_varchar2_list('tests/ut3_tester_helper.test_package_1.pkb', 'tests/ut3_tester_helper.test_package_2.pkb', 'tests/ut3_tester_helper.test_package_3.pkb'), - a_reporter => cast(null as ut3.ut_reporter_base)); + a_reporter => cast(null as ut3_develop.ut_reporter_base)); --Assert ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); end; procedure run_func_empty_suite is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_expected varchar2(32767); pragma autonomous_transaction; begin @@ -528,7 +528,7 @@ create or replace package body test_ut_run is end;]'; l_expected := '%empty_suite%0 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%'; --Act - select * bulk collect into l_results from table(ut3.ut.run('empty_suite')); + select * bulk collect into l_results from table(ut3_develop.ut.run('empty_suite')); --Assert ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( l_expected ); @@ -538,7 +538,7 @@ create or replace package body test_ut_run is end; procedure raise_in_invalid_state is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_expected varchar2(32767); begin --Arrange @@ -554,7 +554,7 @@ Failures:% 1 tests, 0 failed, 1 errored, 0 disabled, 0 warning(s)%'; --Act - select * bulk collect into l_results from table(ut3.ut.run('ut3_tester_helper.test_stateful')); + select * bulk collect into l_results from table(ut3_develop.ut.run('ut3_tester_helper.test_stateful')); --Assert ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( l_expected ); @@ -576,11 +576,11 @@ Failures:% end; procedure run_in_invalid_state is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_actual clob; l_expected varchar2(32767); begin - select * bulk collect into l_results from table(ut3.ut.run('failing_invalid_spec')); + select * bulk collect into l_results from table(ut3_develop.ut.run('failing_invalid_spec')); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); ut.expect(l_actual).to_be_like('%Call params for % are not valid: package %FAILING_INVALID_SPEC% does not exist or is invalid.%'); @@ -618,7 +618,7 @@ Failures:% end; procedure run_and_revalidate_specs is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_actual clob; l_is_invalid number; begin @@ -626,7 +626,7 @@ Failures:% and o.status = 'INVALID' and o.object_name= :object_name]' into l_is_invalid using 'UT3$USER#','INVALID_PCKAG_THAT_REVALIDATES'; - select * bulk collect into l_results from table(ut3.ut.run('invalid_pckag_that_revalidates')); + select * bulk collect into l_results from table(ut3_develop.ut.run('invalid_pckag_that_revalidates')); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); ut.expect(1).to_equal(l_is_invalid); @@ -681,11 +681,11 @@ Failures:% end; procedure run_and_report_warnings is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_actual clob; begin - select * bulk collect into l_results from table(ut3.ut.run('bad_annotations')); + select * bulk collect into l_results from table(ut3_develop.ut.run('bad_annotations')); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); ut.expect(l_actual).to_be_like('%Missing "--%endcontext" annotation for a "--%context" annotation. The end of package is considered end of context.% @@ -733,12 +733,12 @@ Failures:% procedure savepoints_on_db_links is l_results clob; begin - ut3.ut.run('ut3_tester_helper.test_distributed_savepoint'); + ut3_develop.ut.run('ut3_tester_helper.test_distributed_savepoint'); l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); ut.expect(l_results).to_be_like('%1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%'); end; - procedure remove_time_from_results(a_results in out nocopy ut3.ut_varchar2_list) is + procedure remove_time_from_results(a_results in out nocopy ut3_develop.ut_varchar2_list) is begin for i in 1 .. a_results.count loop a_results(i) := regexp_replace(a_results(i),'\[[0-9]*[\.,][0-9]+ sec\]',''); @@ -747,11 +747,11 @@ Failures:% end; procedure run_schema_name_test is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_expected clob; begin select * bulk collect into l_results - from table ( ut3.ut.run( gc_owner||'.'||gc_owner ) ); + from table ( ut3_develop.ut.run( gc_owner||'.'||gc_owner ) ); l_expected := '%1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%'; ut.expect(ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( l_expected ); end; @@ -781,16 +781,16 @@ Failures:% end; procedure run_with_random_order is - l_random_results ut3.ut_varchar2_list; - l_results ut3.ut_varchar2_list; + l_random_results ut3_develop.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; begin select * bulk collect into l_random_results - from table ( ut3.ut.run( 'ut3_tester_helper.test_package_1', a_random_test_order_seed => 3 ) ) + from table ( ut3_develop.ut.run( 'ut3_tester_helper.test_package_1', a_random_test_order_seed => 3 ) ) where trim(column_value) is not null and column_value not like 'Finished in %' and column_value not like '%Tests were executed with random order %'; select * bulk collect into l_results - from table ( ut3.ut.run( 'ut3_tester_helper.test_package_1' ) ) + from table ( ut3_develop.ut.run( 'ut3_tester_helper.test_package_1' ) ) --TODO this condition should be removed once issues with unordered compare and 'blank text rows' are resolved. where trim(column_value) is not null and column_value not like 'Finished in %'; @@ -802,23 +802,23 @@ Failures:% end; procedure run_and_report_random_ord_seed is - l_actual ut3.ut_varchar2_list; + l_actual ut3_develop.ut_varchar2_list; begin select * bulk collect into l_actual - from table ( ut3.ut.run( 'ut3_tester_helper.test_package_1', a_random_test_order_seed => 123456789 ) ); + from table ( ut3_develop.ut.run( 'ut3_tester_helper.test_package_1', a_random_test_order_seed => 123456789 ) ); ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_actual) ).to_be_like( q'[%Tests were executed with random order seed '123456789'.%]' ); end; procedure run_with_random_order_seed is - l_expected ut3.ut_varchar2_list; - l_actual ut3.ut_varchar2_list; + l_expected ut3_develop.ut_varchar2_list; + l_actual ut3_develop.ut_varchar2_list; begin select * bulk collect into l_expected - from table ( ut3.ut.run( 'ut3_tester_helper.test_package_1', a_random_test_order_seed => 3 ) ); + from table ( ut3_develop.ut.run( 'ut3_tester_helper.test_package_1', a_random_test_order_seed => 3 ) ); select * bulk collect into l_actual - from table ( ut3.ut.run( 'ut3_tester_helper.test_package_1', a_random_test_order_seed => 3 ) ); + from table ( ut3_develop.ut.run( 'ut3_tester_helper.test_package_1', a_random_test_order_seed => 3 ) ); remove_time_from_results(l_actual); remove_time_from_results(l_expected); @@ -948,7 +948,7 @@ Failures:% procedure run_proc_pkg_name_tag is l_results clob; begin - ut3.ut.run('ut3_tester_helper.test_package_1',a_tags => 'suite1test1'); + ut3_develop.ut.run('ut3_tester_helper.test_package_1',a_tags => 'suite1test1'); l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); --Assert ut.expect( l_results ).to_be_like( '%test_package_1%' ); @@ -961,7 +961,7 @@ Failures:% procedure run_pkg_name_file_list_tag is l_results clob; begin - ut3.ut.run('ut3_tester_helper.test_package_1',a_tags => 'suite1test1'); + ut3_develop.ut.run('ut3_tester_helper.test_package_1',a_tags => 'suite1test1'); l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); --Assert ut.expect( l_results ).to_be_like( '%test_package_1%' ); @@ -974,10 +974,10 @@ Failures:% procedure run_proc_path_list_tag is l_results clob; begin - ut3.ut.run( + ut3_develop.ut.run( 'ut3_tester_helper.test_package_1', - ut3.ut_sonar_test_reporter(), a_source_files => ut3.ut_varchar2_list(),a_tags => 'suite1', - a_test_files => ut3.ut_varchar2_list('tests/ut3_tester_helper.test_package_1.pkb', + ut3_develop.ut_sonar_test_reporter(), a_source_files => ut3_develop.ut_varchar2_list(),a_tags => 'suite1', + a_test_files => ut3_develop.ut_varchar2_list('tests/ut3_tester_helper.test_package_1.pkb', 'tests/ut3_tester_helper.test_package_2.pkb', 'tests/ut3_tester_helper.test_package_3.pkb') ); @@ -989,7 +989,7 @@ Failures:% end; procedure tag_run_func_no_params is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; begin l_results := ut3_tester_helper.run_helper.run(a_tags => 'helper'); --Assert @@ -997,9 +997,9 @@ Failures:% end; procedure tag_run_func_pkg_name is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; begin - select * bulk collect into l_results from table (ut3.ut.run('ut3_tester_helper.test_package_1', a_tags => 'suite1test1')); + select * bulk collect into l_results from table (ut3_develop.ut.run('ut3_tester_helper.test_package_1', a_tags => 'suite1test1')); --Assert ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1.test1%executed%' ); ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_1.test2%executed%' ); @@ -1008,9 +1008,9 @@ Failures:% end; procedure tag_run_func_path_list is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; begin - l_results := ut3_tester_helper.run_helper.run(ut3.ut_varchar2_list(':tests.test_package_1',':tests'),a_tags => 'suite1test1,suite2test1'); + l_results := ut3_tester_helper.run_helper.run(ut3_develop.ut_varchar2_list(':tests.test_package_1',':tests'),a_tags => 'suite1test1,suite2test1'); --Assert ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%' ); ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_2%' ); @@ -1022,9 +1022,9 @@ Failures:% end; procedure tag_inc_exc_run_func_path_list is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; begin - l_results := ut3_tester_helper.run_helper.run(ut3.ut_varchar2_list(':tests.test_package_1',':tests'),a_tags => 'suite1test1,suite2test1,-suite2'); + l_results := ut3_tester_helper.run_helper.run(ut3_develop.ut_varchar2_list(':tests.test_package_1',':tests'),a_tags => 'suite1test1,suite2test1,-suite2'); --Assert ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%' ); ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2%' ); @@ -1034,9 +1034,9 @@ Failures:% end; procedure tag_exclude_run_func_path_list is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; begin - l_results := ut3_tester_helper.run_helper.run(ut3.ut_varchar2_list(':tests,:tests2'),a_tags => '-suite1test2,-suite2test1,-test1suite3'); + l_results := ut3_tester_helper.run_helper.run(ut3_develop.ut_varchar2_list(':tests,:tests2'),a_tags => '-suite1test2,-suite2test1,-test1suite3'); --Assert ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%' ); ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_2%' ); @@ -1050,7 +1050,7 @@ Failures:% end; procedure tag_include_exclude_run_func is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; begin l_results := ut3_tester_helper.run_helper.run(a_tags => 'suite1,-suite1test2,-suite2test1,-test1suite3'); --Assert @@ -1188,9 +1188,9 @@ Failures:% end; procedure run_context_test_suite is - l_lines ut3.ut_varchar2_list; + l_lines ut3_develop.ut_varchar2_list; begin - select * bulk collect into l_lines from table(ut3.ut.run('check_context')); + select * bulk collect into l_lines from table(ut3_develop.ut.run('check_context')); g_context_test_results := ut3_tester_helper.main_helper.table_to_clob(l_lines); end; diff --git a/test/ut3_user/api/test_ut_runner.pkb b/test/ut3_user/api/test_ut_runner.pkb index e29bada11..2aa624ed8 100644 --- a/test/ut3_user/api/test_ut_runner.pkb +++ b/test/ut3_user/api/test_ut_runner.pkb @@ -45,7 +45,7 @@ end; execute immediate 'create or replace package body test_cache as procedure failing_test is begin - ut3.ut.expect('||a_number||').to_be_null; + ut3_develop.ut.expect('||a_number||').to_be_null; end; end;'; end; @@ -69,7 +69,7 @@ end;'; create_test_body(0); l_expected := dbms_transaction.local_transaction_id(true); --Act - ut3.ut.run('test_cache'); + ut3_develop.ut.run('test_cache'); dbms_output.get_lines( l_output_data, l_num_lines); --Assert ut.expect(dbms_transaction.local_transaction_id()).to_equal(l_expected); @@ -86,7 +86,7 @@ end;'; create_test_body(0); rollback; --Act - ut3.ut.run('test_cache'); + ut3_develop.ut.run('test_cache'); dbms_output.get_lines( l_output_data, l_num_lines); --Assert ut.expect(dbms_transaction.local_transaction_id()).to_be_null(); @@ -95,35 +95,35 @@ end;'; procedure version_comp_check_compare is begin - ut.expect( ut3.ut_runner.version_compatibility_check('v3.0.0.0','v3.0.0.0') ).to_equal(1); - ut.expect( ut3.ut_runner.version_compatibility_check('v3.0.0.0','v3.0.123.0') ).to_equal(1); - ut.expect( ut3.ut_runner.version_compatibility_check('v3.0.0.0','v3.123.0.0') ).to_equal(1); - ut.expect( ut3.ut_runner.version_compatibility_check('v3.0.0.0','v3.13.31.0') ).to_equal(1); - ut.expect( ut3.ut_runner.version_compatibility_check('v3.0.1.0','v3.0.0.0') ).to_equal(0); - ut.expect( ut3.ut_runner.version_compatibility_check('v3.1.0.0','v3.0.0.0') ).to_equal(0); - ut.expect( ut3.ut_runner.version_compatibility_check('v3.0.0.0','v2.0.0.0') ).to_equal(0); - ut.expect( ut3.ut_runner.version_compatibility_check('v3.0.0.0','v4.0.0.0') ).to_equal(0); + ut.expect( ut3_develop.ut_runner.version_compatibility_check('v3.0.0.0','v3.0.0.0') ).to_equal(1); + ut.expect( ut3_develop.ut_runner.version_compatibility_check('v3.0.0.0','v3.0.123.0') ).to_equal(1); + ut.expect( ut3_develop.ut_runner.version_compatibility_check('v3.0.0.0','v3.123.0.0') ).to_equal(1); + ut.expect( ut3_develop.ut_runner.version_compatibility_check('v3.0.0.0','v3.13.31.0') ).to_equal(1); + ut.expect( ut3_develop.ut_runner.version_compatibility_check('v3.0.1.0','v3.0.0.0') ).to_equal(0); + ut.expect( ut3_develop.ut_runner.version_compatibility_check('v3.1.0.0','v3.0.0.0') ).to_equal(0); + ut.expect( ut3_develop.ut_runner.version_compatibility_check('v3.0.0.0','v2.0.0.0') ).to_equal(0); + ut.expect( ut3_develop.ut_runner.version_compatibility_check('v3.0.0.0','v4.0.0.0') ).to_equal(0); end; procedure version_comp_check_ignore is begin - ut.expect( ut3.ut_runner.version_compatibility_check('v3.0.0.123','v3.0.0.0') ).to_equal(1); - ut.expect( ut3.ut_runner.version_compatibility_check('v3.0.0.0','v3.0.0.123') ).to_equal(1); - ut.expect( ut3.ut_runner.version_compatibility_check('v3.0.0','v3.0.0.0') ).to_equal(1); + ut.expect( ut3_develop.ut_runner.version_compatibility_check('v3.0.0.123','v3.0.0.0') ).to_equal(1); + ut.expect( ut3_develop.ut_runner.version_compatibility_check('v3.0.0.0','v3.0.0.123') ).to_equal(1); + ut.expect( ut3_develop.ut_runner.version_compatibility_check('v3.0.0','v3.0.0.0') ).to_equal(1); end; procedure version_comp_check_short is begin - ut.expect( ut3.ut_runner.version_compatibility_check('v3.0.0','v3.0.0.0') ).to_equal(1); - ut.expect( ut3.ut_runner.version_compatibility_check('v3.0','v3.0.123.0') ).to_equal(1); - ut.expect( ut3.ut_runner.version_compatibility_check('v3','v3.123.0.0') ).to_equal(1); + ut.expect( ut3_develop.ut_runner.version_compatibility_check('v3.0.0','v3.0.0.0') ).to_equal(1); + ut.expect( ut3_develop.ut_runner.version_compatibility_check('v3.0','v3.0.123.0') ).to_equal(1); + ut.expect( ut3_develop.ut_runner.version_compatibility_check('v3','v3.123.0.0') ).to_equal(1); end; procedure version_comp_check_exception is procedure throws(a_requested varchar2, a_current varchar2) is l_compatible integer; begin - l_compatible := ut3.ut_runner.version_compatibility_check(a_requested,a_current); + l_compatible := ut3_develop.ut_runner.version_compatibility_check(a_requested,a_current); ut.fail('Expected exception but nothing was raised'); exception when others then @@ -135,7 +135,7 @@ end;'; end; procedure run_reset_package_body_cache is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_expected clob; l_actual clob; begin @@ -144,16 +144,16 @@ end;'; create_test_body(0); select * bulk collect into l_results - from table(ut3.ut.run('test_cache')); + from table(ut3_develop.ut.run('test_cache')); --Act create_test_body(1); select * bulk collect into l_results - from table(ut3.ut.run('test_cache')); + from table(ut3_develop.ut.run('test_cache')); --Assert l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); - l_expected := '%ut3.ut.expect(1).to_be_null;%'; + l_expected := '%ut3_develop.ut.expect(1).to_be_null;%'; ut.expect(l_actual).to_be_like(l_expected); drop_test_package(); end; @@ -161,7 +161,7 @@ end;'; procedure run_keep_dbms_output_buffer is l_expected dbmsoutput_linesarray; l_actual dbmsoutput_linesarray; - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_lines number := 10000; begin --Arrange @@ -185,7 +185,7 @@ end;'; --Act select * bulk collect into l_results - from table(ut3.ut.run('test_cache')); + from table(ut3_develop.ut.run('test_cache')); --Assert dbms_output.get_lines(lines => l_actual, numlines => l_lines); @@ -207,7 +207,7 @@ end;'; ut.expect(l_actual).not_to_be_empty(); --Act - ut3.ut_runner.purge_cache(sys_context('USERENV', 'CURRENT_USER'),'PROCEDURE'); + ut3_develop.ut_runner.purge_cache(sys_context('USERENV', 'CURRENT_USER'),'PROCEDURE'); --Assert @@ -238,7 +238,7 @@ end;'; l_actual sys_refcursor; begin --Act - ut3.ut_runner.rebuild_annotation_cache( sys_context('USERENV', 'CURRENT_USER'), 'PACKAGE' ); + ut3_develop.ut_runner.rebuild_annotation_cache( sys_context('USERENV', 'CURRENT_USER'), 'PACKAGE' ); --Assert l_actual := ut3_tester_helper.run_helper.get_annotation_cache_cursor( a_owner => sys_context('USERENV', 'CURRENT_USER'), @@ -254,7 +254,7 @@ end;'; a_type => 'PACKAGE' ); - --Did not rebuild cache for ut3/procedures + --Did not rebuild cache for ut3_develop/procedures ut.expect(l_actual).to_have_count(0); end; @@ -285,7 +285,7 @@ end;'; 'some' path, 0 disabled_flag, null tags from dual; --Act - open l_actual for select * from table(ut3.ut_runner.get_suites_info('UT3$USER#','DUMMY_TEST_PACKAGE')); + open l_actual for select * from table(ut3_develop.ut_runner.get_suites_info('UT3$USER#','DUMMY_TEST_PACKAGE')); --Assert ut.expect(l_actual).to_equal(l_expected); end; @@ -317,7 +317,7 @@ end;'; 'some' path, 0 disabled_flag, null tags from dual; --Act - open l_actual for select * from table(ut3.ut_runner.get_suites_info('UT3$USER#','DUMMY_TEST_PACKAGE')); + open l_actual for select * from table(ut3_develop.ut_runner.get_suites_info('UT3$USER#','DUMMY_TEST_PACKAGE')); --Assert ut.expect(l_actual).to_equal(l_expected); end; @@ -339,7 +339,7 @@ end;'; 'dummy_test_package.some_dummy_test_procedure' path, 0 disabled_flag,'testtag1,testtag2' tags from dual; --Act - open l_actual for select * from table(ut3.ut_runner.get_suites_info('UT3$USER#','DUMMY_TEST_PACKAGE')); + open l_actual for select * from table(ut3_develop.ut_runner.get_suites_info('UT3$USER#','DUMMY_TEST_PACKAGE')); --Assert ut.expect(l_actual).to_equal(l_expected); end; @@ -350,21 +350,21 @@ end;'; begin --Arrange open l_expected for - select 'UT3.UT_COVERAGE_COBERTURA_REPORTER' reporter_object_name, 'Y' is_output_reporter from dual union all - select 'UT3.UT_DEBUG_REPORTER', 'Y' from dual union all - select 'UT3.UT_COVERAGE_HTML_REPORTER', 'Y' from dual union all - select 'UT3.UT_COVERAGE_SONAR_REPORTER', 'Y' from dual union all - select 'UT3.UT_COVERALLS_REPORTER', 'Y' from dual union all - select 'UT3.UT_DOCUMENTATION_REPORTER', 'Y' from dual union all - select 'UT3.UT_JUNIT_REPORTER', 'Y' from dual union all - select 'UT3.UT_REALTIME_REPORTER', 'Y' from dual union all - select 'UT3.UT_SONAR_TEST_REPORTER', 'Y' from dual union all - select 'UT3.UT_TEAMCITY_REPORTER', 'Y' from dual union all - select 'UT3.UT_TFS_JUNIT_REPORTER', 'Y' from dual union all - select 'UT3.UT_XUNIT_REPORTER', 'Y' from dual + select 'UT3_DEVELOP.UT_COVERAGE_COBERTURA_REPORTER' reporter_object_name, 'Y' is_output_reporter from dual union all + select 'UT3_DEVELOP.UT_DEBUG_REPORTER', 'Y' from dual union all + select 'UT3_DEVELOP.UT_COVERAGE_HTML_REPORTER', 'Y' from dual union all + select 'UT3_DEVELOP.UT_COVERAGE_SONAR_REPORTER', 'Y' from dual union all + select 'UT3_DEVELOP.UT_COVERALLS_REPORTER', 'Y' from dual union all + select 'UT3_DEVELOP.UT_DOCUMENTATION_REPORTER', 'Y' from dual union all + select 'UT3_DEVELOP.UT_JUNIT_REPORTER', 'Y' from dual union all + select 'UT3_DEVELOP.UT_REALTIME_REPORTER', 'Y' from dual union all + select 'UT3_DEVELOP.UT_SONAR_TEST_REPORTER', 'Y' from dual union all + select 'UT3_DEVELOP.UT_TEAMCITY_REPORTER', 'Y' from dual union all + select 'UT3_DEVELOP.UT_TFS_JUNIT_REPORTER', 'Y' from dual union all + select 'UT3_DEVELOP.UT_XUNIT_REPORTER', 'Y' from dual order by 1; --Act - open l_actual for select * from table(ut3.ut_runner.GET_REPORTERS_LIST()) order by 1; + open l_actual for select * from table(ut3_develop.ut_runner.GET_REPORTERS_LIST()) order by 1; --Assert ut.expect(l_actual).to_equal(l_expected); end; @@ -382,13 +382,13 @@ end;'; end; procedure raises_20213_on_fail_link is - l_reporter ut3.ut_documentation_reporter := ut3.ut_documentation_reporter(); - l_lines ut3.ut_varchar2_list; + l_reporter ut3_develop.ut_documentation_reporter := ut3_develop.ut_documentation_reporter(); + l_lines ut3_develop.ut_varchar2_list; pragma autonomous_transaction; begin --Arrange --Act - ut3.ut_runner.run(ut3.ut_varchar2_list('test_db_link'), ut3.ut_reporters(l_reporter), a_fail_on_errors=> true); + ut3_develop.ut_runner.run(ut3_develop.ut_varchar2_list('test_db_link'), ut3_develop.ut_reporters(l_reporter), a_fail_on_errors=> true); ut.fail('Expected exception but nothing was raised'); exception when others then @@ -419,12 +419,12 @@ end;'; procedure one_is_one is begin - ut3.ut.expect(1).to_equal(1); + ut3_develop.ut.expect(1).to_equal(1); end; procedure two_is_two is begin - ut3.ut.expect(2).to_equal(2); + ut3_develop.ut.expect(2).to_equal(2); end; end; @@ -449,12 +449,12 @@ end;'; procedure one_is_one is begin - ut3.ut.expect(1).to_equal(1); + ut3_develop.ut.expect(1).to_equal(1); end; procedure two_is_two is begin - ut3.ut.expect(2).to_equal(2); + ut3_develop.ut.expect(2).to_equal(2); end; end; @@ -470,12 +470,12 @@ end;'; end; procedure pass_varchar2_name_list is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_actual clob; begin select * bulk collect into l_results - from table(ut3.ut.run(ut3.ut_varchar2_list('test_csl_names1','test_csl_names2'))); + from table(ut3_develop.ut.run(ut3_develop.ut_varchar2_list('test_csl_names1','test_csl_names2'))); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); ut.expect(l_actual).to_be_like('%Finished in % seconds @@ -483,12 +483,12 @@ end;'; end; procedure pass_varchar2_name is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_actual clob; begin select * bulk collect into l_results - from table(ut3.ut.run('test_csl_names1')); + from table(ut3_develop.ut.run('test_csl_names1')); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); ut.expect(l_actual).to_be_like('%Finished in % seconds @@ -496,12 +496,12 @@ end;'; end; procedure pass_varchar2_suite_csl is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_actual clob; begin select * bulk collect into l_results - from table(ut3.ut.run('test_csl_names1,test_csl_names2')); + from table(ut3_develop.ut.run('test_csl_names1,test_csl_names2')); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); ut.expect(l_actual).to_be_like('%Finished in % seconds @@ -509,12 +509,12 @@ end;'; end; procedure pass_varchar2_test_csl is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_actual clob; begin select * bulk collect into l_results - from table(ut3.ut.run('test_csl_names1.one_is_one,test_csl_names2.one_is_one')); + from table(ut3_develop.ut.run('test_csl_names1.one_is_one,test_csl_names2.one_is_one')); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); ut.expect(l_actual).to_be_like('%Finished in % seconds @@ -522,12 +522,12 @@ end;'; end; procedure pass_varch_test_csl_spc is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_actual clob; begin select * bulk collect into l_results - from table(ut3.ut.run('test_csl_names1.one_is_one, test_csl_names2.one_is_one')); + from table(ut3_develop.ut.run('test_csl_names1.one_is_one, test_csl_names2.one_is_one')); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); ut.expect(l_actual).to_be_like('%Finished in % seconds @@ -535,17 +535,17 @@ end;'; end; procedure pass_csl_with_srcfile is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_actual clob; begin select * bulk collect into l_results from table( - ut3.ut.run( + ut3_develop.ut.run( a_path => 'test_csl_names1.one_is_one,test_csl_names2.one_is_one', - a_source_files => ut3.ut_varchar2_list('ut3.ut'), - a_test_files => ut3.ut_varchar2_list('ut3_tester.test_csl_names2') + a_source_files => ut3_develop.ut_varchar2_list('ut3_develop.ut'), + a_test_files => ut3_develop.ut_varchar2_list('ut3_tester.test_csl_names2') ) ); @@ -555,12 +555,12 @@ end;'; end; procedure pass_csl_within_var2list is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_actual clob; begin select * bulk collect into l_results - from table(ut3.ut.run(ut3.ut_varchar2_list('test_csl_names1.one_is_one,test_csl_names2.one_is_one'))); + from table(ut3_develop.ut.run(ut3_develop.ut_varchar2_list('test_csl_names1.one_is_one,test_csl_names2.one_is_one'))); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); ut.expect(l_actual).to_be_like('%Finished in % seconds @@ -570,55 +570,55 @@ end;'; procedure is_test_true is begin ut.expect( - ut3.ut_runner.is_test( + ut3_develop.ut_runner.is_test( a_owner => 'UT3$USER#', a_package_name => 'DUMMY_TEST_PACKAGE', a_procedure_name => 'SOME_DUMMY_TEST_PROCEDURE' ) ).to_be_true(); - ut.expect( ut3.ut_runner.is_test( 'ut3$user#','dummy_test_package','some_dummy_test_procedure' ) ).to_be_true(); + ut.expect( ut3_develop.ut_runner.is_test( 'ut3$user#','dummy_test_package','some_dummy_test_procedure' ) ).to_be_true(); end; procedure is_test_false is begin - ut.expect( ut3.ut_runner.is_test( 'UT3$USER#','DUMMY_TEST_PACKAGE', 'BAD' ) ).to_be_false(); - ut.expect( ut3.ut_runner.is_test( 'UT3$USER#','BAD_TEST_PACKAGE', 'some_dummy_test_procedure' ) ).to_be_false(); - ut.expect( ut3.ut_runner.is_test( 'UT3$USER#','DUMMY_TEST_PACKAGE', null ) ).to_be_false(); - ut.expect( ut3.ut_runner.is_test( 'UT3$USER#',null,'some_dummy_test_procedure' ) ).to_be_false(); - ut.expect( ut3.ut_runner.is_test( null,'DUMMY_TEST_PACKAGE','some_dummy_test_procedure' ) ).to_be_false(); + ut.expect( ut3_develop.ut_runner.is_test( 'UT3$USER#','DUMMY_TEST_PACKAGE', 'BAD' ) ).to_be_false(); + ut.expect( ut3_develop.ut_runner.is_test( 'UT3$USER#','BAD_TEST_PACKAGE', 'some_dummy_test_procedure' ) ).to_be_false(); + ut.expect( ut3_develop.ut_runner.is_test( 'UT3$USER#','DUMMY_TEST_PACKAGE', null ) ).to_be_false(); + ut.expect( ut3_develop.ut_runner.is_test( 'UT3$USER#',null,'some_dummy_test_procedure' ) ).to_be_false(); + ut.expect( ut3_develop.ut_runner.is_test( null,'DUMMY_TEST_PACKAGE','some_dummy_test_procedure' ) ).to_be_false(); end; procedure is_suite_true is begin ut.expect( - ut3.ut_runner.is_suite( + ut3_develop.ut_runner.is_suite( a_owner => 'UT3$USER#', a_package_name => 'DUMMY_TEST_PACKAGE' ) ).to_be_true(); - ut.expect( ut3.ut_runner.is_suite( 'ut3$user#','dummy_test_package' ) ).to_be_true(); + ut.expect( ut3_develop.ut_runner.is_suite( 'ut3$user#','dummy_test_package' ) ).to_be_true(); end; procedure is_suite_false is begin - ut.expect( ut3.ut_runner.is_suite( 'UT3$USER#','BAD' ) ).to_be_false(); - ut.expect( ut3.ut_runner.is_suite( 'UT3$USER#', null ) ).to_be_false(); - ut.expect( ut3.ut_runner.is_suite( null,'DUMMY_TEST_PACKAGE' ) ).to_be_false(); - ut.expect( ut3.ut_runner.is_suite( 'UT3$USER#','bad_test_package' ) ).to_be_false(); + ut.expect( ut3_develop.ut_runner.is_suite( 'UT3$USER#','BAD' ) ).to_be_false(); + ut.expect( ut3_develop.ut_runner.is_suite( 'UT3$USER#', null ) ).to_be_false(); + ut.expect( ut3_develop.ut_runner.is_suite( null,'DUMMY_TEST_PACKAGE' ) ).to_be_false(); + ut.expect( ut3_develop.ut_runner.is_suite( 'UT3$USER#','bad_test_package' ) ).to_be_false(); end; procedure has_suites_true is begin - ut.expect( ut3.ut_runner.has_suites( a_owner => 'UT3$USER#' ) ).to_be_true(); - ut.expect( ut3.ut_runner.has_suites( 'ut3$user#' ) ).to_be_true(); + ut.expect( ut3_develop.ut_runner.has_suites( a_owner => 'UT3$USER#' ) ).to_be_true(); + ut.expect( ut3_develop.ut_runner.has_suites( 'ut3$user#' ) ).to_be_true(); end; procedure has_suites_false is begin - ut.expect( ut3.ut_runner.has_suites( 'UT3_LATEST_RELEASE' ) ).to_be_false(); - ut.expect( ut3.ut_runner.has_suites( 'BAD' ) ).to_be_false(); - ut.expect( ut3.ut_runner.has_suites( null ) ).to_be_false(); + ut.expect( ut3_develop.ut_runner.has_suites( 'UT3' ) ).to_be_false(); + ut.expect( ut3_develop.ut_runner.has_suites( 'BAD' ) ).to_be_false(); + ut.expect( ut3_develop.ut_runner.has_suites( null ) ).to_be_false(); end; end; diff --git a/test/ut3_user/expectations.pkb b/test/ut3_user/expectations.pkb index 3f2ae543d..30af48a44 100644 --- a/test/ut3_user/expectations.pkb +++ b/test/ut3_user/expectations.pkb @@ -8,22 +8,22 @@ create or replace package body expectations as --Arrange --Act execute immediate 'begin some_pkg.some_procedure; end;'; - ut3.ut.expect(1).to_equal(0); - ut3.ut.expect(0).to_equal(0); + ut3_develop.ut.expect(1).to_equal(0); + ut3_develop.ut.expect(0).to_equal(0); --Assert l_actual := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); l_expected := q'[FAILURE Actual: 1 (number) was expected to equal: 0 (number) - at "UT3$USER#.SOME_PKG%", line 4 ut3.ut.expect(1).to_equal(0); + at "UT3$USER#.SOME_PKG%", line 4 ut3_develop.ut.expect(1).to_equal(0); at "anonymous block", line 1 at "UT3$USER#.EXPECTATIONS%", line 10 SUCCESS Actual: 0 (number) was expected to equal: 0 (number) FAILURE Actual: 1 (number) was expected to equal: 0 (number) - at "UT3$USER#.EXPECTATIONS%", line 11 ut3.ut.expect(1).to_equal(0); + at "UT3$USER#.EXPECTATIONS%", line 11 ut3_develop.ut.expect(1).to_equal(0); SUCCESS Actual: 0 (number) was expected to equal: 0 (number) ]'; @@ -44,8 +44,8 @@ SUCCESS create or replace package body some_pkg is procedure some_procedure is begin - ut3.ut.expect(1).to_equal(0); - ut3.ut.expect(0).to_equal(0); + ut3_develop.ut.expect(1).to_equal(0); + ut3_develop.ut.expect(0).to_equal(0); end; end;]'; end; diff --git a/test/ut3_user/expectations/binary/test_be_greater_or_equal.pkb b/test/ut3_user/expectations/binary/test_be_greater_or_equal.pkb index 5d99d07b6..3f92c84c7 100644 --- a/test/ut3_user/expectations/binary/test_be_greater_or_equal.pkb +++ b/test/ut3_user/expectations/binary/test_be_greater_or_equal.pkb @@ -254,7 +254,7 @@ create or replace package body test_be_greater_or_equal is procedure actual_clob is begin --Act - ut3.ut.expect(to_clob('3')).to_( ut3.be_greater_or_equal(3) ); + ut3_develop.ut.expect(to_clob('3')).to_( ut3_develop.be_greater_or_equal(3) ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; diff --git a/test/ut3_user/expectations/binary/test_be_greater_than.pkb b/test/ut3_user/expectations/binary/test_be_greater_than.pkb index 37e15f633..6724b5c41 100644 --- a/test/ut3_user/expectations/binary/test_be_greater_than.pkb +++ b/test/ut3_user/expectations/binary/test_be_greater_than.pkb @@ -254,7 +254,7 @@ create or replace package body test_be_greater_than is procedure actual_clob is begin --Act - ut3.ut.expect(to_clob('3')).to_( ut3.be_greater_than(2) ); + ut3_develop.ut.expect(to_clob('3')).to_( ut3_develop.be_greater_than(2) ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; diff --git a/test/ut3_user/expectations/binary/test_be_less_or_equal.pkb b/test/ut3_user/expectations/binary/test_be_less_or_equal.pkb index bf7632cc4..aefb58849 100644 --- a/test/ut3_user/expectations/binary/test_be_less_or_equal.pkb +++ b/test/ut3_user/expectations/binary/test_be_less_or_equal.pkb @@ -254,7 +254,7 @@ create or replace package body test_be_less_or_equal is procedure actual_clob is begin --Act - ut3.ut.expect(to_clob('3')).to_( ut3.be_less_or_equal(3) ); + ut3_develop.ut.expect(to_clob('3')).to_( ut3_develop.be_less_or_equal(3) ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; diff --git a/test/ut3_user/expectations/binary/test_equal.pkb b/test/ut3_user/expectations/binary/test_equal.pkb index 95fd594c7..735915348 100644 --- a/test/ut3_user/expectations/binary/test_equal.pkb +++ b/test/ut3_user/expectations/binary/test_equal.pkb @@ -26,7 +26,7 @@ create or replace package body test_equal is l_actual '||a_actual_type||' := '||a_actual||'; l_expected '||a_expected_type||' := '||a_expected||'; begin - ut3.ut.expect( l_actual ).'||a_matcher_name||'(l_expected, a_nulls_are_equal=>'||l_nulls_equal||'); + ut3_develop.ut.expect( l_actual ).'||a_matcher_name||'(l_expected, a_nulls_are_equal=>'||l_nulls_equal||'); end;'; end; diff --git a/test/ut3_user/expectations/binary/test_expect_to_be_less_than.pkb b/test/ut3_user/expectations/binary/test_expect_to_be_less_than.pkb index d7bf5533b..dbf6e30a4 100644 --- a/test/ut3_user/expectations/binary/test_expect_to_be_less_than.pkb +++ b/test/ut3_user/expectations/binary/test_expect_to_be_less_than.pkb @@ -254,7 +254,7 @@ create or replace package body test_expect_to_be_less_than is procedure actual_clob is begin --Act - ut3.ut.expect(to_clob('3')).to_( ut3.be_less_than(4) ); + ut3_develop.ut.expect(to_clob('3')).to_( ut3_develop.be_less_than(4) ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; diff --git a/test/ut3_user/expectations/test_expectation_anydata.pkb b/test/ut3_user/expectations/test_expectation_anydata.pkb index ece5457a7..be666b284 100644 --- a/test/ut3_user/expectations/test_expectation_anydata.pkb +++ b/test/ut3_user/expectations/test_expectation_anydata.pkb @@ -23,7 +23,7 @@ create or replace package body test_expectation_anydata is g_test_expected := anydata.convertObject( cast(null as ut3_tester_helper.test_dummy_object) ); g_test_actual := anydata.convertObject( cast(null as ut3_tester_helper.other_dummy_object) ); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ); --Assert l_expected_message := q'[%Actual (ut3_tester_helper.other_dummy_object) cannot be compared to Expected (ut3_tester_helper.test_dummy_object) using matcher 'equal'.]'; l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); @@ -39,7 +39,7 @@ create or replace package body test_expectation_anydata is g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(1, 'A', '0') ); g_test_actual := anydata.convertObject( ut3_tester_helper.other_dummy_object(1, 'A', '0') ); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ); --Assert l_expected_message := q'[%Actual (ut3_tester_helper.other_dummy_object) cannot be compared to Expected (ut3_tester_helper.test_dummy_object) using matcher 'equal'.]'; l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); @@ -53,7 +53,7 @@ create or replace package body test_expectation_anydata is g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(1, 'A', '0') ); g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(1, null, '0') ); --Act - ut3.ut.expect( g_test_actual ).not_to_equal( g_test_expected ); + ut3_develop.ut.expect( g_test_actual ).not_to_equal( g_test_expected ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -66,7 +66,7 @@ create or replace package body test_expectation_anydata is g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(1, 'A', '0') ); g_test_actual := anydata.convertObject( cast(null as ut3_tester_helper.test_dummy_object) ); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ); --Assert l_expected_message := q'[%Actual: ut3_tester_helper.test_dummy_object was expected to equal: ut3_tester_helper.test_dummy_object %Diff: @@ -86,7 +86,7 @@ create or replace package body test_expectation_anydata is g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(1, 'A', '0') ); g_test_actual := anydata.convertCollection( ut3_tester_helper.test_dummy_object_list(ut3_tester_helper.test_dummy_object(1, 'A', '0')) ); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ); --Assert l_expected_message := q'[%Actual (ut3_tester_helper.test_dummy_object_list) cannot be compared to Expected (ut3_tester_helper.test_dummy_object) using matcher 'equal'.]'; l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); @@ -103,7 +103,7 @@ create or replace package body test_expectation_anydata is g_test_expected := anydata.convertCollection( ut3_tester_helper.test_dummy_object_list() ); g_test_actual := anydata.convertCollection( l_null_list ); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ); --Assert l_expected_message := q'[%Actual: ut3_tester_helper.test_dummy_object_list [ null ] was expected to equal: ut3_tester_helper.test_dummy_object_list [ count = 0 ]]'; l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); @@ -121,7 +121,7 @@ create or replace package body test_expectation_anydata is g_test_expected := anydata.convertCollection( ut3_tester_helper.test_dummy_object_list(ut3_tester_helper.test_dummy_object(1, 'A', '0')) ); g_test_actual := anydata.convertCollection( l_null_list ); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ); --Assert l_expected_message := q'[%Actual: ut3_tester_helper.test_dummy_object_list [ null ] was expected to equal: ut3_tester_helper.test_dummy_object_list [ count = 1 ] %Diff: @@ -140,7 +140,7 @@ create or replace package body test_expectation_anydata is g_test_expected := anydata.convertCollection( ut3_tester_helper.test_dummy_object_list(ut3_tester_helper.test_dummy_object(1, 'A', '0')) ); g_test_actual := anydata.convertCollection( ut3_tester_helper.test_dummy_object_list() ); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ); --Assert l_expected_message := q'[%Actual: ut3_tester_helper.test_dummy_object_list [ count = 0 ] was expected to equal: ut3_tester_helper.test_dummy_object_list [ count = 1 ] %Diff: @@ -161,7 +161,7 @@ create or replace package body test_expectation_anydata is g_test_expected := anydata.convertCollection( ut3_tester_helper.test_dummy_object_list(l_obj) ); g_test_actual := anydata.convertCollection( ut3_tester_helper.test_dummy_object_list(l_obj, l_obj) ); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ); --Assert l_expected_message := q'[%Actual: ut3_tester_helper.test_dummy_object_list [ count = 2 ] was expected to equal: ut3_tester_helper.test_dummy_object_list [ count = 1 ] %Diff: @@ -178,7 +178,7 @@ create or replace package body test_expectation_anydata is l_null_anydata anydata; begin --Act - ut3.ut.expect( l_null_anydata ).to_equal( l_null_anydata ); + ut3_develop.ut.expect( l_null_anydata ).to_equal( l_null_anydata ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -189,7 +189,7 @@ create or replace package body test_expectation_anydata is l_anydata anydata := anydata.convertObject(l_null_object); begin --Act - ut3.ut.expect( l_anydata ).to_equal( l_anydata ); + ut3_develop.ut.expect( l_anydata ).to_equal( l_anydata ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -200,7 +200,7 @@ create or replace package body test_expectation_anydata is l_anydata anydata := anydata.convertCollection(l_null_collection); begin --Act - ut3.ut.expect( l_anydata ).to_equal( l_anydata ); + ut3_develop.ut.expect( l_anydata ).to_equal( l_anydata ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -211,7 +211,7 @@ create or replace package body test_expectation_anydata is g_test_expected := anydata.convertCollection( ut3_tester_helper.test_dummy_object_list(ut3_tester_helper.test_dummy_object(1, 'A', '0')) ); g_test_actual := anydata.convertCollection( ut3_tester_helper.test_dummy_object_list(ut3_tester_helper.test_dummy_object(1, 'A', '0')) ); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -226,7 +226,7 @@ create or replace package body test_expectation_anydata is g_test_expected := anydata.convertCollection( ut3_tester_helper.test_dummy_object_list(l_first_obj, l_second_obj) ); g_test_actual := anydata.convertCollection( ut3_tester_helper.test_dummy_object_list(l_second_obj, l_first_obj) ); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -237,20 +237,20 @@ create or replace package body test_expectation_anydata is g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(1, 'A', '0') ); g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(1, 'A', '0') ); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure exclude_attributes_as_list is - l_list ut3.ut_varchar2_list; + l_list ut3_develop.ut_varchar2_list; begin --Arrange - l_list := ut3.ut_varchar2_list('Value','/ID'); + l_list := ut3_develop.ut_varchar2_list('Value','/ID'); g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>3, "name"=>'A',"Value"=>'1') ); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected, a_exclude=> l_list ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected, a_exclude=> l_list ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -263,7 +263,7 @@ create or replace package body test_expectation_anydata is g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>2, "name"=>'A',"Value"=>'1') ); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected, a_exclude=> l_list ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected, a_exclude=> l_list ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -276,7 +276,7 @@ create or replace package body test_expectation_anydata is g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>2, "name"=>'A',"Value"=>'1') ); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected, a_exclude=> l_xpath ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected, a_exclude=> l_xpath ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -289,20 +289,20 @@ create or replace package body test_expectation_anydata is g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected, a_exclude=> l_exclude ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected, a_exclude=> l_exclude ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure include_attributes_as_list is - l_list ut3.ut_varchar2_list; + l_list ut3_develop.ut_varchar2_list; begin --Arrange - l_list := ut3.ut_varchar2_list('Value','ID'); + l_list := ut3_develop.ut_varchar2_list('Value','ID'); g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'b',"Value"=>'0') ); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ).include( l_list ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ).include( l_list ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -315,7 +315,7 @@ create or replace package body test_expectation_anydata is g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'1') ); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ).include( l_xpath ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ).include( l_xpath ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -328,7 +328,7 @@ create or replace package body test_expectation_anydata is g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'0') ); g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'1') ); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ).include( l_xpath ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ).include( l_xpath ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -341,7 +341,7 @@ create or replace package body test_expectation_anydata is g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'B',"Value"=>'0') ); g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'1') ); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ).include( l_include ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ).include( l_include ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -356,24 +356,24 @@ create or replace package body test_expectation_anydata is g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'B',"Value"=>'0') ); g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'1') ); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ).exclude( l_exclude ).include( l_include ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ).exclude( l_exclude ).include( l_include ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; procedure include_exclude_attrib_list is - l_exclude ut3.ut_varchar2_list; - l_include ut3.ut_varchar2_list; + l_exclude ut3_develop.ut_varchar2_list; + l_include ut3_develop.ut_varchar2_list; l_expected varchar2(32767); l_actual varchar2(32767); begin --Arrange - l_include := ut3.ut_varchar2_list('key','ID','Value'); - l_exclude := ut3.ut_varchar2_list('key','Value'); + l_include := ut3_develop.ut_varchar2_list('key','ID','Value'); + l_exclude := ut3_develop.ut_varchar2_list('key','Value'); g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'B',"Value"=>'0') ); g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(id=>1, "name"=>'A',"Value"=>'1') ); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ).exclude( l_exclude ).include( l_include ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ).exclude( l_exclude ).include( l_include ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -391,7 +391,7 @@ Rows: [ 1 differences ] Row No. 1 - Actual: Row No. 1 - Expected: A]'; --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ); --Assert l_actual := ut3_tester_helper.main_helper.get_failed_expectations(1); ut.expect(l_actual).to_be_like(l_expected); @@ -411,7 +411,7 @@ Diff: Rows: [ 1 differences ] Row No. 2 - Extra: 1A0]'; --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ); --Assert l_actual := ut3_tester_helper.main_helper.get_failed_expectations(1); ut.expect(l_actual).to_be_like(l_expected); @@ -425,7 +425,7 @@ Rows: [ 1 differences ] procedure deprec_to_equal_excl_varch is begin --Act - ut3.ut.expect(get_anydata()).to_equal(get_anydata(), a_exclude => 'A_COLUMN,Some_Col'); + ut3_develop.ut.expect(get_anydata()).to_equal(get_anydata(), a_exclude => 'A_COLUMN,Some_Col'); --Assert ut.expect(cardinality(ut3_tester_helper.main_helper.get_warnings())).to_equal(1); ut.expect(ut3_tester_helper.main_helper.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); @@ -434,7 +434,7 @@ Rows: [ 1 differences ] procedure deprec_to_equal_excl_list is begin --Act - ut3.ut.expect(get_anydata()).to_equal(get_anydata(), a_exclude => ut3.ut_varchar2_list('A_COLUMN','Some_Col')); + ut3_develop.ut.expect(get_anydata()).to_equal(get_anydata(), a_exclude => ut3_develop.ut_varchar2_list('A_COLUMN','Some_Col')); --Assert ut.expect(cardinality(ut3_tester_helper.main_helper.get_warnings())).to_equal(1); ut.expect(ut3_tester_helper.main_helper.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); @@ -443,7 +443,7 @@ Rows: [ 1 differences ] procedure deprec_not_to_equal_excl_varch is begin --Act - ut3.ut.expect(get_anydata()).not_to_equal(get_anydata(), a_exclude => 'A_COLUMN,Some_Col'); + ut3_develop.ut.expect(get_anydata()).not_to_equal(get_anydata(), a_exclude => 'A_COLUMN,Some_Col'); --Assert ut.expect(cardinality(ut3_tester_helper.main_helper.get_warnings())).to_equal(1); ut.expect(ut3_tester_helper.main_helper.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); @@ -452,7 +452,7 @@ Rows: [ 1 differences ] procedure deprec_not_to_equal_excl_list is begin --Act - ut3.ut.expect(get_anydata()).not_to_equal(get_anydata(), a_exclude => ut3.ut_varchar2_list('A_COLUMN','Some_Col')); + ut3_develop.ut.expect(get_anydata()).not_to_equal(get_anydata(), a_exclude => ut3_develop.ut_varchar2_list('A_COLUMN','Some_Col')); --Assert ut.expect(cardinality(ut3_tester_helper.main_helper.get_warnings())).to_equal(1); ut.expect(ut3_tester_helper.main_helper.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); @@ -461,7 +461,7 @@ Rows: [ 1 differences ] procedure deprec_equal_excl_varch is begin --Act - ut3.ut.expect(get_anydata()).to_(ut3.equal(get_anydata(), a_exclude => 'A_COLUMN,Some_Col')); + ut3_develop.ut.expect(get_anydata()).to_(ut3_develop.equal(get_anydata(), a_exclude => 'A_COLUMN,Some_Col')); --Assert ut.expect(cardinality(ut3_tester_helper.main_helper.get_warnings())).to_equal(1); ut.expect(ut3_tester_helper.main_helper.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); @@ -470,7 +470,7 @@ Rows: [ 1 differences ] procedure deprec_equal_excl_list is begin --Act - ut3.ut.expect(get_anydata()).to_(ut3.equal(get_anydata(), a_exclude => ut3.ut_varchar2_list('A_COLUMN','Some_Col'))); + ut3_develop.ut.expect(get_anydata()).to_(ut3_develop.equal(get_anydata(), a_exclude => ut3_develop.ut_varchar2_list('A_COLUMN','Some_Col'))); --Assert ut.expect(cardinality(ut3_tester_helper.main_helper.get_warnings())).to_equal(1); ut.expect(ut3_tester_helper.main_helper.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); @@ -491,7 +491,7 @@ Rows: [ 1 differences ] from dual connect by level <=2 order by rownum desc; --Act - ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); + ut3_develop.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); l_expected_message := q'[Actual: ut3_tester_helper.test_dummy_object_list [ count = 2 ] was expected to equal: ut3_tester_helper.test_dummy_object_list [ count = 2 ] Diff: @@ -521,7 +521,7 @@ Rows: [ 2 differences ] bulk collect into l_expected from dual connect by level <=110; --Act - ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); + ut3_develop.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)); l_expected_message := q'[Actual: ut3_tester_helper.test_dummy_object_list [ count = 100 ] was expected to equal: ut3_tester_helper.test_dummy_object_list [ count = 110 ] Diff: @@ -543,9 +543,9 @@ Rows: [ 60 differences, showing first 20 ] procedure collection_include_list is l_actual ut3_tester_helper.test_dummy_object_list; l_expected ut3_tester_helper.test_dummy_object_list; - l_list ut3.ut_varchar2_list; + l_list ut3_develop.ut_varchar2_list; begin - l_list := ut3.ut_varchar2_list('Value','ID'); + l_list := ut3_develop.ut_varchar2_list('Value','ID'); --Arrange select ut3_tester_helper.test_dummy_object( rownum, 'SomethingsDifferent '||rownum, rownum) bulk collect into l_actual @@ -554,7 +554,7 @@ Rows: [ 60 differences, showing first 20 ] bulk collect into l_expected from dual connect by level <=2; --Act - ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).include( l_list ); + ut3_develop.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).include( l_list ); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -562,9 +562,9 @@ Rows: [ 60 differences, showing first 20 ] procedure collection_exclude_list is l_actual ut3_tester_helper.test_dummy_object_list; l_expected ut3_tester_helper.test_dummy_object_list; - l_list ut3.ut_varchar2_list; + l_list ut3_develop.ut_varchar2_list; begin - l_list := ut3.ut_varchar2_list('Value','ID'); + l_list := ut3_develop.ut_varchar2_list('Value','ID'); --Arrange select ut3_tester_helper.test_dummy_object( rownum*2, 'Something '||rownum, rownum*2) bulk collect into l_actual @@ -573,7 +573,7 @@ Rows: [ 60 differences, showing first 20 ] bulk collect into l_expected from dual connect by level <=2; --Act - ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).exclude( l_list ); + ut3_develop.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).exclude( l_list ); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -581,11 +581,11 @@ Rows: [ 60 differences, showing first 20 ] procedure collection_include_list_fail is l_actual ut3_tester_helper.test_dummy_object_list; l_expected ut3_tester_helper.test_dummy_object_list; - l_list ut3.ut_varchar2_list; + l_list ut3_develop.ut_varchar2_list; l_actual_message varchar2(32767); l_expected_message varchar2(32767); begin - l_list := ut3.ut_varchar2_list('name'); + l_list := ut3_develop.ut_varchar2_list('name'); --Arrange select ut3_tester_helper.test_dummy_object( rownum, 'SomethingsDifferent '||rownum, rownum) bulk collect into l_actual @@ -594,7 +594,7 @@ Rows: [ 60 differences, showing first 20 ] bulk collect into l_expected from dual connect by level <=2; --Act - ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).include( l_list ); + ut3_develop.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).include( l_list ); l_expected_message := q'[%Actual: ut3_tester_helper.test_dummy_object_list [ count = 2 ] was expected to equal: ut3_tester_helper.test_dummy_object_list [ count = 2 ] %Diff: @@ -614,7 +614,7 @@ Rows: [ 60 differences, showing first 20 ] g_test_expected := anydata.convertCollection( ut3_tester_helper.t_tab_varchar('A') ); g_test_actual := anydata.convertCollection( ut3_tester_helper.t_tab_varchar('A') ); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -626,7 +626,7 @@ Rows: [ 60 differences, showing first 20 ] g_test_expected := anydata.convertCollection( ut3_tester_helper.t_tab_varchar('A') ); g_test_actual := anydata.convertCollection( ut3_tester_helper.t_tab_varchar('B') ); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ); l_expected_message := q'[%Actual: ut3_tester_helper.t_tab_varchar [ count = 1 ] was expected to equal: ut3_tester_helper.t_tab_varchar [ count = 1 ] %Diff: %Rows: [ 1 differences ] @@ -640,7 +640,7 @@ Rows: [ 60 differences, showing first 20 ] procedure array_is_null is l_is_null ut3_tester_helper.t_tab_varchar ; begin - ut3.ut.expect( anydata.convertCollection( l_is_null ) ).to_be_null; + ut3_develop.ut.expect( anydata.convertCollection( l_is_null ) ).to_be_null; ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -648,7 +648,7 @@ Rows: [ 60 differences, showing first 20 ] l_is_null ut3_tester_helper.t_tab_varchar ; l_is_null_bis ut3_tester_helper.t_tab_varchar ; begin - ut3.ut.expect( anydata.convertCollection( l_is_null ) ).to_equal(anydata.convertCollection( l_is_null_bis )); + ut3_develop.ut.expect( anydata.convertCollection( l_is_null ) ).to_equal(anydata.convertCollection( l_is_null_bis )); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -661,7 +661,7 @@ Rows: [ 60 differences, showing first 20 ] g_test_expected := anydata.convertCollection( l_is_null ); g_test_actual := anydata.convertCollection( ut3_tester_helper.t_tab_varchar('A') ); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ); l_expected_message := q'[%Actual: ut3_tester_helper.t_tab_varchar [ count = 1 ] was expected to equal: ut3_tester_helper.t_tab_varchar [ null ] %Diff: %Rows: [ 1 differences ] @@ -673,7 +673,7 @@ Rows: [ 60 differences, showing first 20 ] procedure empty_array_have_zero_elem is begin - ut3.ut.expect( anydata.convertCollection(ut3_tester_helper.t_tab_varchar())).to_have_count(0); + ut3_develop.ut.expect( anydata.convertCollection(ut3_tester_helper.t_tab_varchar())).to_have_count(0); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -683,7 +683,7 @@ Rows: [ 60 differences, showing first 20 ] g_test_expected := anydata.convertCollection(ut3_tester_helper.t_tab_varchar()); g_test_actual := anydata.convertCollection(ut3_tester_helper.t_tab_varchar()); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -696,7 +696,7 @@ Rows: [ 60 differences, showing first 20 ] g_test_expected := anydata.convertCollection( ut3_tester_helper.t_tab_varchar() ); g_test_actual := anydata.convertCollection( ut3_tester_helper.t_tab_varchar('A') ); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ); l_expected_message := q'[%Actual: ut3_tester_helper.t_tab_varchar [ count = 1 ] was expected to equal: ut3_tester_helper.t_tab_varchar [ count = 0 ] %Diff: %Rows: [ 1 differences ] @@ -712,7 +712,7 @@ Rows: [ 60 differences, showing first 20 ] --Arrange g_test_actual := anydata.convertCollection( l_null_list ); --Act - ut3.ut.expect( g_test_actual ).to_be_null; + ut3_develop.ut.expect( g_test_actual ).to_be_null; --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -722,7 +722,7 @@ Rows: [ 60 differences, showing first 20 ] --Arrange g_test_actual := anydata.convertCollection( ut3_tester_helper.test_dummy_object_list() ); --Act - ut3.ut.expect( g_test_actual ).to_have_count(0); + ut3_develop.ut.expect( g_test_actual ).to_have_count(0); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); @@ -734,7 +734,7 @@ Rows: [ 60 differences, showing first 20 ] g_test_expected := anydata.convertCollection( ut3_tester_helper.t_varray(1) ); g_test_actual := anydata.convertCollection( ut3_tester_helper.t_varray(1) ); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -746,7 +746,7 @@ Rows: [ 60 differences, showing first 20 ] g_test_expected := anydata.convertCollection( ut3_tester_helper.t_varray(1) ); g_test_actual := anydata.convertCollection( ut3_tester_helper.t_varray(2) ); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ); l_expected_message := q'[%Actual: ut3_tester_helper.t_varray [ count = 1 ] was expected to equal: ut3_tester_helper.t_varray [ count = 1 ] %Diff: %Rows: [ 1 differences ] @@ -760,7 +760,7 @@ Rows: [ 60 differences, showing first 20 ] procedure varray_is_null is l_is_null ut3_tester_helper.t_varray ; begin - ut3.ut.expect( anydata.convertCollection( l_is_null ) ).to_be_null; + ut3_develop.ut.expect( anydata.convertCollection( l_is_null ) ).to_be_null; ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -768,7 +768,7 @@ Rows: [ 60 differences, showing first 20 ] l_is_null ut3_tester_helper.t_varray ; l_is_null_bis ut3_tester_helper.t_varray ; begin - ut3.ut.expect( anydata.convertCollection( l_is_null ) ).to_equal(anydata.convertCollection( l_is_null_bis )); + ut3_develop.ut.expect( anydata.convertCollection( l_is_null ) ).to_equal(anydata.convertCollection( l_is_null_bis )); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -781,7 +781,7 @@ Rows: [ 60 differences, showing first 20 ] g_test_expected := anydata.convertCollection( l_is_null ); g_test_actual := anydata.convertCollection( ut3_tester_helper.t_varray(1) ); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ); l_expected_message := q'[%Actual: ut3_tester_helper.t_varray [ count = 1 ] was expected to equal: ut3_tester_helper.t_varray [ null ] %Diff: %Rows: [ 1 differences ] @@ -793,7 +793,7 @@ Rows: [ 60 differences, showing first 20 ] procedure empty_varray_have_zero_elem is begin - ut3.ut.expect( anydata.convertCollection(ut3_tester_helper.t_varray())).to_have_count(0); + ut3_develop.ut.expect( anydata.convertCollection(ut3_tester_helper.t_varray())).to_have_count(0); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -803,7 +803,7 @@ Rows: [ 60 differences, showing first 20 ] g_test_expected := anydata.convertCollection(ut3_tester_helper.t_varray()); g_test_actual := anydata.convertCollection(ut3_tester_helper.t_varray()); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -816,7 +816,7 @@ Rows: [ 60 differences, showing first 20 ] g_test_expected := anydata.convertCollection( ut3_tester_helper.t_varray() ); g_test_actual := anydata.convertCollection( ut3_tester_helper.t_varray(1) ); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ); l_expected_message := q'[%Actual: ut3_tester_helper.t_varray [ count = 1 ] was expected to equal: ut3_tester_helper.t_varray [ count = 0 ] %Diff: %Rows: [ 1 differences ] @@ -841,7 +841,7 @@ Rows: [ 60 differences, showing first 20 ] from dual connect by level <=2 order by rownum desc; --Act - ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).join_by('ID'); + ut3_develop.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).join_by('ID'); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -860,7 +860,7 @@ Rows: [ 60 differences, showing first 20 ] from dual connect by level <=2 order by rownum desc; --Act - ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).join_by('ID'); + ut3_develop.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).join_by('ID'); l_expected_message := q'[%Actual: ut3_tester_helper.test_dummy_object_list [ count = 2 ] was expected to equal: ut3_tester_helper.test_dummy_object_list [ count = 2 ] %Diff: %Rows: [ 3 differences ] @@ -886,7 +886,7 @@ Rows: [ 60 differences, showing first 20 ] from dual connect by level <=3 order by rownum desc; --Act - ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).unordered; + ut3_develop.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).unordered; ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -913,7 +913,7 @@ Rows: [ 60 differences, showing first 20 ] %Missing: 4Something 22 %Missing: 2Something 11]'; - ut3.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).unordered; + ut3_develop.ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected)).unordered; l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); @@ -926,7 +926,7 @@ Rows: [ 60 differences, showing first 20 ] g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(1, 'A', '0') ); --Act - ut3.ut.expect(g_test_actual).to_equal(g_test_expected).join_by('ID'); + ut3_develop.ut.expect(g_test_actual).to_equal(g_test_expected).join_by('ID'); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -936,7 +936,7 @@ Rows: [ 60 differences, showing first 20 ] g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(1, 'A', '0') ); --Act - ut3.ut.expect(g_test_actual).to_equal(g_test_expected).unordered; + ut3_develop.ut.expect(g_test_actual).to_equal(g_test_expected).unordered; ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -953,7 +953,7 @@ Rows: [ 60 differences, showing first 20 ] from dual connect by level <=2 order by rownum desc; --Act - ut3.ut.expect(anydata.convertCollection(l_actual)).to_contain(anydata.convertCollection(l_expected)); + ut3_develop.ut.expect(anydata.convertCollection(l_actual)).to_contain(anydata.convertCollection(l_expected)); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -964,7 +964,7 @@ Rows: [ 60 differences, showing first 20 ] g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_object(1, 'A', '0') ); --Act - ut3.ut.expect(g_test_actual).to_contain(g_test_expected); + ut3_develop.ut.expect(g_test_actual).to_contain(g_test_expected); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -975,7 +975,7 @@ Rows: [ 60 differences, showing first 20 ] g_test_actual := anydata.convertCollection(ut3_tester_helper.t_tab_varchar(null)); --Act - ut3.ut.expect( g_test_actual ).to_equal( g_test_expected ).unordered(); + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ).unordered(); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -987,7 +987,7 @@ Rows: [ 60 differences, showing first 20 ] g_test_actual := anydata.convertCollection(ut3_tester_helper.t_tab_varchar(' ')); --Act - ut3.ut.expect( g_test_actual ).not_to_equal( g_test_expected ).unordered(); + ut3_develop.ut.expect( g_test_actual ).not_to_equal( g_test_expected ).unordered(); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index 4f9cd72d6..f06132009 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -48,7 +48,7 @@ create or replace package body test_expectations_cursor is select 'Other test entry' as value from dual; open l_actual for 'select * from gtt_test_table'; --Act - execute the expectation on cursor opened on GTT - ut3.ut.expect( l_actual ).to_equal( l_expected ); + ut3_develop.ut.expect( l_actual ).to_equal( l_expected ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); --Cleanup @@ -62,7 +62,7 @@ create or replace package body test_expectations_cursor is l_actual sys_refcursor; begin -- Arrange - ut3.ut.set_nls; + ut3_develop.ut.set_nls; open l_expected for select 1 as my_num, 'This is my test string' as my_string, @@ -76,10 +76,10 @@ create or replace package body test_expectations_cursor is to_date('1984-09-05', 'YYYY-MM-DD') as my_date from dual; --Act - ut3.ut.expect( l_actual ).to_equal( l_expected ); + ut3_develop.ut.expect( l_actual ).to_equal( l_expected ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); - ut3.ut.reset_nls; + ut3_develop.ut.reset_nls; end; procedure success_on_same_data_float @@ -88,7 +88,7 @@ create or replace package body test_expectations_cursor is l_actual sys_refcursor; begin -- Arrange - ut3.ut.set_nls; + ut3_develop.ut.set_nls; open l_expected for select cast(3.14 as binary_double) as pi_double, cast(3.14 as binary_float) as pi_float @@ -98,10 +98,10 @@ create or replace package body test_expectations_cursor is cast(3.14 as binary_float) as pi_float from dual; --Act - ut3.ut.expect( l_actual ).to_equal( l_expected ); + ut3_develop.ut.expect( l_actual ).to_equal( l_expected ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); - ut3.ut.reset_nls; + ut3_develop.ut.reset_nls; end; procedure success_on_empty @@ -113,7 +113,7 @@ create or replace package body test_expectations_cursor is open l_expected for select * from dual where 1=0; open l_actual for select * from dual where 1=0; --Act - ut3.ut.expect( l_actual ).to_equal( l_expected ); + ut3_develop.ut.expect( l_actual ).to_equal( l_expected ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -124,7 +124,7 @@ create or replace package body test_expectations_cursor is l_actual sys_refcursor; begin --Act - ut3.ut.expect( l_actual ).to_equal( l_expected ); + ut3_develop.ut.expect( l_actual ).to_equal( l_expected ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -134,7 +134,7 @@ create or replace package body test_expectations_cursor is l_actual sys_refcursor; begin --Act - ut3.ut.expect( l_actual ).to_be_null(); + ut3_develop.ut.expect( l_actual ).to_be_null(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -144,7 +144,7 @@ create or replace package body test_expectations_cursor is l_actual sys_refcursor; begin --Act - ut3.ut.expect( l_actual ).not_to_be_not_null(); + ut3_develop.ut.expect( l_actual ).not_to_be_not_null(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -156,7 +156,7 @@ create or replace package body test_expectations_cursor is --Arrange open l_actual for select * from dual; --Act - ut3.ut.expect( l_actual ).to_be_not_null(); + ut3_develop.ut.expect( l_actual ).to_be_not_null(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -168,7 +168,7 @@ create or replace package body test_expectations_cursor is --Arrange open l_actual for select * from dual; --Act - ut3.ut.expect( l_actual ).to_be_not_null(); + ut3_develop.ut.expect( l_actual ).to_be_not_null(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -180,7 +180,7 @@ create or replace package body test_expectations_cursor is --Arrange open l_actual for select * from dual where 0=1; --Act - ut3.ut.expect( l_actual ).to_be_empty(); + ut3_develop.ut.expect( l_actual ).to_be_empty(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -192,7 +192,7 @@ create or replace package body test_expectations_cursor is --Arrange open l_actual for select * from dual; --Act - ut3.ut.expect( l_actual ).not_to_be_empty(); + ut3_develop.ut.expect( l_actual ).not_to_be_empty(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -204,7 +204,7 @@ create or replace package body test_expectations_cursor is --Arrange open l_actual for select * from dual; --Act - ut3.ut.expect( l_actual ).to_be_null(); + ut3_develop.ut.expect( l_actual ).to_be_null(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -214,7 +214,7 @@ create or replace package body test_expectations_cursor is l_actual sys_refcursor; begin --Act - ut3.ut.expect( l_actual ).not_to_be_null(); + ut3_develop.ut.expect( l_actual ).not_to_be_null(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -226,7 +226,7 @@ create or replace package body test_expectations_cursor is --Arrange open l_actual for select * from dual; --Act - ut3.ut.expect( l_actual ).to_be_empty(); + ut3_develop.ut.expect( l_actual ).to_be_empty(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -238,7 +238,7 @@ create or replace package body test_expectations_cursor is --Arrange open l_actual for select * from dual where 0=1; --Act - ut3.ut.expect( l_actual ).not_to_be_empty(); + ut3_develop.ut.expect( l_actual ).not_to_be_empty(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -251,7 +251,7 @@ create or replace package body test_expectations_cursor is --Arrange open l_expected for select * from dual where 1=0; --Act - ut3.ut.expect( l_actual ).not_to_equal( l_expected ); + ut3_develop.ut.expect( l_actual ).not_to_equal( l_expected ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -265,7 +265,7 @@ create or replace package body test_expectations_cursor is open l_expected for select to_clob('This is an even longer test clob') as my_clob from dual; open l_actual for select to_clob('Another totally different story') as my_clob from dual; --Act - ut3.ut.expect( l_actual ).to_equal( l_expected ); + ut3_develop.ut.expect( l_actual ).to_equal( l_expected ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -279,7 +279,7 @@ create or replace package body test_expectations_cursor is open l_expected for select 1 as my_num from dual; open l_actual for select 1 as my_num from dual union all select 1 as my_num from dual; --Act - ut3.ut.expect( l_actual ).to_equal( l_expected ); + ut3_develop.ut.expect( l_actual ).to_equal( l_expected ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -293,7 +293,7 @@ create or replace package body test_expectations_cursor is open l_expected for select 1 as my_num from dual union all select 1 as my_num from dual; open l_actual for select 1 as my_num from dual; --Act - ut3.ut.expect( l_actual ).to_equal( l_expected ); + ut3_develop.ut.expect( l_actual ).to_equal( l_expected ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -307,7 +307,7 @@ create or replace package body test_expectations_cursor is open l_expected for select 1 as col_1 from dual; open l_actual for select 1 as col_2 from dual; --Act - ut3.ut.expect( l_actual ).to_equal( l_expected ); + ut3_develop.ut.expect( l_actual ).to_equal( l_expected ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -322,7 +322,7 @@ create or replace package body test_expectations_cursor is open l_expected for select 1 as col_1, 2 as col_2 from dual; open l_actual for select 2 as col_2, 1 as col_1 from dual; --Act - ut3.ut.expect( l_actual ).to_equal( l_expected ); + ut3_develop.ut.expect( l_actual ).to_equal( l_expected ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -336,7 +336,7 @@ create or replace package body test_expectations_cursor is open l_expected for select 1 as col_1, 2 as col_2 from dual; open l_actual for select 2 as col_2, 1 as col_1 from dual; --Act - ut3.ut.expect( l_actual ).to_equal( l_expected ).unordered_columns; + ut3_develop.ut.expect( l_actual ).to_equal( l_expected ).unordered_columns; --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -350,7 +350,7 @@ create or replace package body test_expectations_cursor is open l_expected for select 1 as col_1, 2 as col_2 from dual; open l_actual for select 2 as col_2, 1 as col_1 from dual; --Act - ut3.ut.expect( l_actual ).to_equal( l_expected ).uc; + ut3_develop.ut.expect( l_actual ).to_equal( l_expected ).uc; --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -366,7 +366,7 @@ create or replace package body test_expectations_cursor is open l_expected for select 1 as col_1, 2 as col_2,3 as col_3, 4 as col_4,5 col_5 from dual; open l_actual for select 2 as col_2, 1 as col_1,40 as col_4, 5 as col_5, 30 col_3 from dual; --Act - ut3.ut.expect( l_actual ).to_equal( l_expected ).unordered_columns; + ut3_develop.ut.expect( l_actual ).to_equal( l_expected ).unordered_columns; --Assert l_expected_message := q'[Actual: refcursor [ count = 1 ] was expected to equal: refcursor [ count = 1 ] %Diff: @@ -389,7 +389,7 @@ create or replace package body test_expectations_cursor is open l_expected for select 1 as col_1, 2 as col_2,3 as col_3, 4 as col_4,5 col_5 from dual; open l_actual for select 2 as col_2, 1 as col_1,40 as col_4, 5 as col_5, 30 col_3 from dual; --Act - ut3.ut.expect( l_actual ).to_equal( l_expected ).uc; + ut3_develop.ut.expect( l_actual ).to_equal( l_expected ).uc; --Assert l_expected_message := q'[Actual: refcursor [ count = 1 ] was expected to equal: refcursor [ count = 1 ] %Diff: @@ -410,7 +410,7 @@ create or replace package body test_expectations_cursor is open l_expected for select 1 as my_num from dual union all select 2 as my_num from dual; open l_actual for select 2 as my_num from dual union all select 1 as my_num from dual; --Act - ut3.ut.expect( l_actual ).to_equal( l_expected ); + ut3_develop.ut.expect( l_actual ).to_equal( l_expected ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -422,14 +422,14 @@ create or replace package body test_expectations_cursor is c_second constant number := 1/24/60/60; begin --Arrange - ut3.ut.set_nls; + ut3_develop.ut.set_nls; open l_actual for select gc_date as some_date from dual; open l_expected for select gc_date - c_second some_date from dual; --Act - ut3.ut.expect( l_actual ).to_equal( l_expected ); + ut3_develop.ut.expect( l_actual ).to_equal( l_expected ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); - ut3.ut.reset_nls; + ut3_develop.ut.reset_nls; end; procedure uses_default_nls_for_date @@ -441,7 +441,7 @@ create or replace package body test_expectations_cursor is open l_actual for select gc_date as some_date from dual; open l_expected for select to_date(to_char(gc_date)) as some_date from dual; --Act - ut3.ut.expect(l_actual).to_equal(l_expected); + ut3_develop.ut.expect(l_actual).to_equal(l_expected); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -455,7 +455,7 @@ create or replace package body test_expectations_cursor is open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 4; open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_equal(l_expected, a_exclude=>ut3.ut_varchar2_list('A_COLUMN','Some_Col')); + ut3_develop.ut.expect(l_actual).to_equal(l_expected, a_exclude=>ut3_develop.ut_varchar2_list('A_COLUMN','Some_Col')); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -469,7 +469,7 @@ create or replace package body test_expectations_cursor is open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 4; open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_equal(l_expected, a_exclude=>'A_COLUMN,Some_Col'); + ut3_develop.ut.expect(l_actual).to_equal(l_expected, a_exclude=>'A_COLUMN,Some_Col'); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -482,7 +482,7 @@ create or replace package body test_expectations_cursor is open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 4; open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_equal(l_expected, a_exclude=>ut3.ut_varchar2_list('A_COLUMN','/ROW/Some_Col')); + ut3_develop.ut.expect(l_actual).to_equal(l_expected, a_exclude=>ut3_develop.ut_varchar2_list('A_COLUMN','/ROW/Some_Col')); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -495,7 +495,7 @@ create or replace package body test_expectations_cursor is open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 4; open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_equal(l_expected, a_exclude=>'A_COLUMN,/ROW/Some_Col'); + ut3_develop.ut.expect(l_actual).to_equal(l_expected, a_exclude=>'A_COLUMN,/ROW/Some_Col'); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -511,7 +511,7 @@ create or replace package body test_expectations_cursor is open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 4; open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_equal(l_expected, a_exclude=>'/ROW/A_COLUMN,\\//Some_Col'); + ut3_develop.ut.expect(l_actual).to_equal(l_expected, a_exclude=>'/ROW/A_COLUMN,\\//Some_Col'); --Assert l_expected_message := q'[Actual: refcursor [ count = 3 ] was expected to equal: refcursor [ count = 3 ] %Diff: @@ -536,7 +536,7 @@ create or replace package body test_expectations_cursor is open l_actual for select 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual; open l_expected for select 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual; --Act - ut3.ut.expect(l_actual).to_equal(l_expected, a_exclude=>'/ROW/A_COLUMN|/ROW/Some_Col'); + ut3_develop.ut.expect(l_actual).to_equal(l_expected, a_exclude=>'/ROW/A_COLUMN|/ROW/Some_Col'); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -550,7 +550,7 @@ create or replace package body test_expectations_cursor is open l_actual for select rownum as rn, 'c' as A_COLUMN from dual a connect by level < 4; open l_expected for select rownum as rn, 'd' as A_COLUMN from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_equal(l_expected, a_exclude=>ut3.ut_varchar2_list('A_COLUMN','non_existing_column')); + ut3_develop.ut.expect(l_actual).to_equal(l_expected, a_exclude=>ut3_develop.ut_varchar2_list('A_COLUMN','non_existing_column')); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -564,7 +564,7 @@ create or replace package body test_expectations_cursor is open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 4; open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).include(ut3_develop.ut_varchar2_list('RN','//A_Column','SOME_COL')); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -578,7 +578,7 @@ create or replace package body test_expectations_cursor is open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 4; open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).include('RN,//A_Column, SOME_COL'); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).include('RN,//A_Column, SOME_COL'); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -592,7 +592,7 @@ create or replace package body test_expectations_cursor is open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual connect by level < 4; open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual connect by level < 4; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).include('/ROW/RN|//A_Column|//SOME_COL'); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).include('/ROW/RN|//A_Column|//SOME_COL'); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -606,7 +606,7 @@ create or replace package body test_expectations_cursor is open l_actual for select rownum as rn, 'c' as A_COLUMN from dual a connect by level < 4; open l_expected for select rownum as rn, 'd' as A_COLUMN from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).include(ut3.ut_varchar2_list(' RN ',' non_existing_column ')); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).include(ut3_develop.ut_varchar2_list(' RN ',' non_existing_column ')); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -620,7 +620,7 @@ create or replace package body test_expectations_cursor is open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual connect by level < 4; open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual connect by level < 4; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).exclude('Some_Col').include('/ROW/RN|//Some_Col'); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).exclude('Some_Col').include('/ROW/RN|//Some_Col'); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -634,7 +634,7 @@ create or replace package body test_expectations_cursor is open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual connect by level < 4; open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual connect by level < 4; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).exclude(ut3.ut_varchar2_list('A_COLUMN')).include(ut3.ut_varchar2_list('RN','A_Column','A_COLUMN')); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).exclude(ut3_develop.ut_varchar2_list('A_COLUMN')).include(ut3_develop.ut_varchar2_list('RN','A_Column','A_COLUMN')); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -650,7 +650,7 @@ create or replace package body test_expectations_cursor is open l_actual for select 1 rn from dual union all select 6 rn from dual; open l_expected for select rownum rn from dual connect by level <=3; --Act - ut3.ut.expect(l_actual).to_equal(l_expected); + ut3_develop.ut.expect(l_actual).to_equal(l_expected); l_expected_message := q'[Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 3 ] Diff: @@ -673,7 +673,7 @@ Rows: [ 2 differences ] open l_actual for select cast('a' as char(1)) a_column, 1 as id from dual; open l_expected for select cast('a' as varchar2(10)) a_column from dual; --Act - ut3.ut.expect(l_actual).to_equal(l_expected); + ut3_develop.ut.expect(l_actual).to_equal(l_expected); l_expected_message := q'[Actual: refcursor [ count = 1 ] was expected to equal: refcursor [ count = 1 ] Diff: Columns: @@ -695,7 +695,7 @@ Rows: [ 1 differences ] open l_actual for select to_char(rownum) rn, rownum another_rn from dual connect by level <=2; open l_expected for select rownum rn, rownum another_rn from dual connect by level <=2; --Act - ut3.ut.expect(l_actual).to_equal(l_expected); + ut3_develop.ut.expect(l_actual).to_equal(l_expected); l_expected_message := q'[Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 2 ] Diff: @@ -718,7 +718,7 @@ Rows: [ all different ] open l_actual for select rownum rn, rownum bad_column_name from dual connect by level <=2; open l_expected for select rownum rn, rownum expected_column_name from dual connect by level <=2; --Act - ut3.ut.expect(l_actual).to_equal(l_expected); + ut3_develop.ut.expect(l_actual).to_equal(l_expected); l_expected_message := q'[Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 2 ] Diff: @@ -740,7 +740,7 @@ Columns:% open l_actual for select rownum+1 col_1, rownum+2 col_2, rownum+3 col_3, rownum+4 col_4 from dual connect by level <=2; open l_expected for select rownum+1 col_1, rownum+4 col_4, rownum+2 col_2, rownum+3 col_3 from dual connect by level <=2; --Act - ut3.ut.expect(l_actual).to_equal(l_expected); + ut3_develop.ut.expect(l_actual).to_equal(l_expected); l_expected_message := q'[Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 2 ] Diff: @@ -765,7 +765,7 @@ Rows: [ all different ] open l_actual for select rownum+1 col_1, rownum+2 col_2, rownum+3 col_3, rownum+4 col_4 from dual connect by level <=2; open l_expected for select rownum+1 col_1, rownum+4 col_4, rownum+2 col_2, rownum+3 col_3 from dual connect by level <=2; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).unordered_columns; + ut3_develop.ut.expect(l_actual).to_equal(l_expected).unordered_columns; ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -781,7 +781,7 @@ Rows: [ all different ] open l_actual for select rownum good_col, -rownum bad_col from dual connect by level <=2; open l_expected for select rownum good_col, rownum bad_col from dual connect by level <=2; --Act - ut3.ut.expect(l_actual).to_equal(l_expected); + ut3_develop.ut.expect(l_actual).to_equal(l_expected); l_expected_message := q'[Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 2 ] Diff: @@ -809,7 +809,7 @@ Rows: [ 2 differences ] from dual connect by level <=100; open l_expected for select rownum bad_col, rownum good_col from dual connect by level <=110; --Act - ut3.ut.expect(l_actual).to_equal(l_expected); + ut3_develop.ut.expect(l_actual).to_equal(l_expected); l_expected_message := q'[Actual: refcursor [ count = 100 ] was expected to equal: refcursor [ count = 110 ] Diff: @@ -849,7 +849,7 @@ Rows: [ 60 differences, showing first 20 ] select 'F' AS GENDER, 'JESSICA' as FIRST_NAME, 'JONES' AS LAST_NAME, 4 as ID, '2345' AS SALARY from dual union all select 'M' AS GENDER, 'LUKE' as FIRST_NAME, 'SKYWALKER' AS LAST_NAME, 2 as ID, '1000' AS SALARY from dual; --Act - ut3.ut.expect(l_actual).to_equal(l_expected); + ut3_develop.ut.expect(l_actual).to_equal(l_expected); l_expected_message := q'[Actual: refcursor [ count = 4 ] was expected to equal: refcursor [ count = 3 ] Diff: Columns: @@ -886,7 +886,7 @@ Rows: [ 4 differences ] select 'F' AS GENDER, 'JESSICA' as FIRST_NAME, 'JONES' AS LAST_NAME, 4 as ID, '2345' AS SALARY from dual union all select 'M' AS GENDER, 'LUKE' as FIRST_NAME, 'SKYWALKER' AS LAST_NAME, 2 as ID, '1000' AS SALARY from dual; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).unordered_columns; + ut3_develop.ut.expect(l_actual).to_equal(l_expected).unordered_columns; l_expected_message := q'[Actual: refcursor [ count = 4 ] was expected to equal: refcursor [ count = 3 ] Diff: Columns: @@ -956,7 +956,7 @@ Rows: [ 4 differences ] from dual; open l_actual for q'[select * from test_table_for_cursors]'; --Act - ut3.ut.expect(l_expected).to_equal(l_actual); + ut3_develop.ut.expect(l_expected).to_equal(l_actual); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -968,7 +968,7 @@ Rows: [ 4 differences ] --Arrange open l_actual for select 1 as value from dual; --Act - ut3.ut.expect(l_actual).to_be_empty(); + ut3_develop.ut.expect(l_actual).to_be_empty(); --Assert ut.expect(l_actual%isopen).to_be_false(); end; @@ -981,7 +981,7 @@ Rows: [ 4 differences ] open l_actual for select 1/0 as value from dual; --Act begin - ut3.ut.expect(l_actual).to_be_empty(); + ut3_develop.ut.expect(l_actual).to_be_empty(); exception when others then null; @@ -996,7 +996,7 @@ Rows: [ 4 differences ] begin --Act open l_actual for select 1/0 as error_column from dual connect by level < 10; - ut3.ut.expect(l_actual).to_be_empty(); + ut3_develop.ut.expect(l_actual).to_be_empty(); ut.fail('Expected exception on cursor fetch'); exception @@ -1014,7 +1014,7 @@ Rows: [ 4 differences ] open l_actual for select * from dual; close l_actual; --Act - ut3.ut.expect( l_actual ).not_to_be_null; + ut3_develop.ut.expect( l_actual ).not_to_be_null; exception when others then --Assert @@ -1030,7 +1030,7 @@ Rows: [ 4 differences ] open l_actual for select rownum object_name from dual connect by level <=1100; open l_expected for select rownum object_name from dual connect by level <=1100; --Act - ut3.ut.expect(l_actual).to_equal(l_expected); + ut3_develop.ut.expect(l_actual).to_equal(l_expected); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); @@ -1046,7 +1046,7 @@ Rows: [ 4 differences ] procedure deprec_to_equal_excl_varch is begin --Act - ut3.ut.expect(get_cursor()).to_equal(get_cursor(), a_exclude => 'A_COLUMN,Some_Col'); + ut3_develop.ut.expect(get_cursor()).to_equal(get_cursor(), a_exclude => 'A_COLUMN,Some_Col'); --Assert ut.expect(cardinality(ut3_tester_helper.main_helper.get_warnings())).to_equal(1); ut.expect(ut3_tester_helper.main_helper.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); @@ -1055,7 +1055,7 @@ Rows: [ 4 differences ] procedure deprec_to_equal_excl_list is begin --Act - ut3.ut.expect(get_cursor()).to_equal(get_cursor(), a_exclude => ut3.ut_varchar2_list('A_COLUMN','Some_Col')); + ut3_develop.ut.expect(get_cursor()).to_equal(get_cursor(), a_exclude => ut3_develop.ut_varchar2_list('A_COLUMN','Some_Col')); --Assert ut.expect(cardinality(ut3_tester_helper.main_helper.get_warnings())).to_equal(1); ut.expect(ut3_tester_helper.main_helper.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); @@ -1064,7 +1064,7 @@ Rows: [ 4 differences ] procedure deprec_not_to_equal_excl_varch is begin --Act - ut3.ut.expect(get_cursor()).not_to_equal(get_cursor(), a_exclude => 'A_COLUMN,Some_Col'); + ut3_develop.ut.expect(get_cursor()).not_to_equal(get_cursor(), a_exclude => 'A_COLUMN,Some_Col'); --Assert ut.expect(cardinality(ut3_tester_helper.main_helper.get_warnings())).to_equal(1); ut.expect(ut3_tester_helper.main_helper.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); @@ -1073,7 +1073,7 @@ Rows: [ 4 differences ] procedure deprec_not_to_equal_excl_list is begin --Act - ut3.ut.expect(get_cursor()).not_to_equal(get_cursor(), a_exclude => ut3.ut_varchar2_list('A_COLUMN','Some_Col')); + ut3_develop.ut.expect(get_cursor()).not_to_equal(get_cursor(), a_exclude => ut3_develop.ut_varchar2_list('A_COLUMN','Some_Col')); --Assert ut.expect(cardinality(ut3_tester_helper.main_helper.get_warnings())).to_equal(1); ut.expect(ut3_tester_helper.main_helper.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); @@ -1082,7 +1082,7 @@ Rows: [ 4 differences ] procedure deprec_equal_excl_varch is begin --Act - ut3.ut.expect(get_cursor()).to_(ut3.equal(get_cursor(), a_exclude => 'A_COLUMN,Some_Col')); + ut3_develop.ut.expect(get_cursor()).to_(ut3_develop.equal(get_cursor(), a_exclude => 'A_COLUMN,Some_Col')); --Assert ut.expect(cardinality(ut3_tester_helper.main_helper.get_warnings())).to_equal(1); ut.expect(ut3_tester_helper.main_helper.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); @@ -1091,7 +1091,7 @@ Rows: [ 4 differences ] procedure deprec_equal_excl_list is begin --Act - ut3.ut.expect(get_cursor()).to_(ut3.equal(get_cursor(), a_exclude => ut3.ut_varchar2_list('A_COLUMN','Some_Col'))); + ut3_develop.ut.expect(get_cursor()).to_(ut3_develop.equal(get_cursor(), a_exclude => ut3_develop.ut_varchar2_list('A_COLUMN','Some_Col'))); --Assert ut.expect(cardinality(ut3_tester_helper.main_helper.get_warnings())).to_equal(1); ut.expect(ut3_tester_helper.main_helper.get_warnings()(1)).to_be_like('The syntax: "%" is deprecated.%'); @@ -1107,7 +1107,7 @@ Rows: [ 4 differences ] open l_actual for select '1' , '2' from dual connect by level <=2; open l_expected for select rownum , rownum expected_column_name from dual connect by level <=2; --Act - ut3.ut.expect(l_actual).to_equal(l_expected); + ut3_develop.ut.expect(l_actual).to_equal(l_expected); l_expected_message := q'[%Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 2 ] %Diff: @@ -1133,7 +1133,7 @@ Rows: [ 4 differences ] open l_actual for select '1' , rownum from dual connect by level <=2; open l_expected for select '1' , rownum from dual connect by level <=2; --Act - ut3.ut.expect(l_actual).to_equal(l_expected); + ut3_develop.ut.expect(l_actual).to_equal(l_expected); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -1146,7 +1146,7 @@ Rows: [ 4 differences ] open l_actual for select username , user_id from all_users order by username asc; open l_expected for select username , user_id from all_users order by username desc; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).unordered; + ut3_develop.ut.expect(l_actual).to_equal(l_expected).unordered; --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -1159,7 +1159,7 @@ Rows: [ 4 differences ] open l_actual for select user_id, username from all_users order by username asc; open l_expected for select username , user_id from all_users order by username desc; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).unordered().uc(); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).unordered().uc(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -1181,7 +1181,7 @@ Rows: [ 4 differences ] select 'test' username,-667 user_id from dual order by 1 desc; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).unordered; + ut3_develop.ut.expect(l_actual).to_equal(l_expected).unordered; l_expected_message := q'[%Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 2 ]% %Diff:% %Rows: [ 2 differences ]% @@ -1201,7 +1201,7 @@ Rows: [ 4 differences ] open l_expected for select object_id, owner, object_name,object_type from all_objects where owner = user; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OBJECT_ID').uc(); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).join_by('OBJECT_ID').uc(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -1215,7 +1215,7 @@ Rows: [ 4 differences ] open l_expected for select object_id, owner, object_name,object_type from all_objects where owner = user; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OBJECT_ID'); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).join_by('OBJECT_ID'); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -1231,7 +1231,7 @@ Rows: [ 4 differences ] open l_expected for select 1 as col_1, 2 as col_2,3 as col_3, 4 as col_4,5 col_5 from dual; open l_actual for select 2 as col_2, 1 as col_1,40 as col_4, 5 as col_5, 30 col_3 from dual; --Act - ut3.ut.expect( l_actual ).to_equal( l_expected ).join_by('COL_1').unordered_columns; + ut3_develop.ut.expect( l_actual ).to_equal( l_expected ).join_by('COL_1').unordered_columns; --Assert l_expected_message := q'[Actual: refcursor [ count = 1 ] was expected to equal: refcursor [ count = 1 ] %Diff: @@ -1252,7 +1252,7 @@ Rows: [ 4 differences ] open l_expected for select object_id, owner, object_name,object_type from all_objects where owner = user; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by(ut3.ut_varchar2_list('OBJECT_ID,OBJECT_NAME')); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).join_by(ut3_develop.ut_varchar2_list('OBJECT_ID,OBJECT_NAME')); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -1268,7 +1268,7 @@ Rows: [ 4 differences ] open l_expected for select rownum as rn, 'x' SOME_COL from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OWNER'); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).join_by('OWNER'); --Assert l_expected_message := q'[%Actual: refcursor [ count = 3 ] was expected to equal: refcursor [ count = 3 ]% Diff:% @@ -1291,7 +1291,7 @@ Diff:% open l_expected for select rownum as rn, 'x' SOME_COL from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by(ut3.ut_varchar2_list('OWNER,USER_ID')); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).join_by(ut3_develop.ut_varchar2_list('OWNER,USER_ID')); --Assert l_expected_message := q'[%Actual: refcursor [ count = 3 ] was expected to equal: refcursor [ count = 3 ]% Diff:% @@ -1316,7 +1316,7 @@ Diff:% open l_expected for select rownum as rn, 'x' SOME_COL from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('SOME_COL').exclude('SOME_COL'); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).join_by('SOME_COL').exclude('SOME_COL'); --Assert l_expected_message := q'[%Actual: refcursor [ count = 3 ] was expected to equal: refcursor [ count = 3 ]% Diff:% @@ -1339,7 +1339,7 @@ Diff:% open l_expected for select rownum as rn, 'x' SOME_COL from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by(ut3.ut_varchar2_list('RN,SOME_COL')).exclude('RN'); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).join_by(ut3_develop.ut_varchar2_list('RN,SOME_COL')).exclude('RN'); --Assert l_expected_message := q'[%Actual: refcursor [ count = 3 ] was expected to equal: refcursor [ count = 3 ]% Diff:% @@ -1362,7 +1362,7 @@ Diff:% open l_expected for select rownum as rn, 'x' SOME_COL from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('RNI'); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).join_by('RNI'); --Assert l_expected_message := q'[%Actual: refcursor [ count = 3 ] was expected to equal: refcursor [ count = 3 ]% Diff:% @@ -1384,7 +1384,7 @@ Diff:% open l_expected for select rownum as rni, 'x' SOME_COL from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('RNI'); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).join_by('RNI'); --Assert l_expected_message := q'[%Actual: refcursor [ count = 3 ] was expected to equal: refcursor [ count = 3 ]% Diff:% @@ -1403,7 +1403,7 @@ Diff:% open l_actual for select level object_id, level || '_TEST' object_name from dual connect by level <=1100; open l_expected for select level object_id, level || '_TEST' object_name from dual connect by level <=1100; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OBJECT_ID'); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).join_by('OBJECT_ID'); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -1416,7 +1416,7 @@ Diff:% open l_actual for select level object_id, level || '_TEST' object_name from dual connect by level <=1100; open l_expected for select level object_id, level || '_TEST' object_name from dual connect by level <=1100; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).unordered; + ut3_develop.ut.expect(l_actual).to_equal(l_expected).unordered; --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -1435,7 +1435,7 @@ Diff:% select 'TEST' username, -610 user_id from dual order by 1 asc; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('USERNAME'); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).join_by('USERNAME'); --Assert l_expected_message := q'[%Actual: refcursor [ count = % ] was expected to equal: refcursor [ count = % ] %Diff:% @@ -1461,7 +1461,7 @@ Diff:% select 'TEST' username, -610 user_id from dual order by 1 asc; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by(ut3.ut_varchar2_list('USERNAME,USER_ID')); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).join_by(ut3_develop.ut_varchar2_list('USERNAME,USER_ID')); --Assert l_expected_message := q'[%Actual: refcursor [ count = % ] was expected to equal: refcursor [ count = % ] %Diff:% @@ -1487,7 +1487,7 @@ Diff:% select 'TEST' username, -610 user_id,'Y' is_valid from dual order by 1 asc; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by(ut3.ut_varchar2_list('USERNAME,IS_VALID')); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).join_by(ut3_develop.ut_varchar2_list('USERNAME,IS_VALID')); --Assert l_expected_message := q'[%Actual: refcursor [ count = % ] was expected to equal: refcursor [ count = % ] %Diff:% @@ -1508,7 +1508,7 @@ Diff:% open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 4; open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')).unordered; + ut3_develop.ut.expect(l_actual).to_equal(l_expected).include(ut3_develop.ut_varchar2_list('RN','//A_Column','SOME_COL')).unordered; --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -1522,7 +1522,7 @@ Diff:% open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 4; open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')).join_by('RN'); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).include(ut3_develop.ut_varchar2_list('RN','//A_Column','SOME_COL')).join_by('RN'); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -1536,7 +1536,7 @@ Diff:% open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 4; open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).exclude(ut3.ut_varchar2_list('//Some_Col','A_COLUMN')).join_by('RN'); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).exclude(ut3_develop.ut_varchar2_list('//Some_Col','A_COLUMN')).join_by('RN'); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -1550,7 +1550,7 @@ Diff:% open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 4; open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).exclude(ut3.ut_varchar2_list('A_COLUMN|//Some_Col')).unordered; + ut3_develop.ut.expect(l_actual).to_equal(l_expected).exclude(ut3_develop.ut_varchar2_list('A_COLUMN|//Some_Col')).unordered; --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -1564,7 +1564,7 @@ Diff:% open l_actual for select rownum as rn, 'TEST' as A_COLUMN from dual a connect by level < 4; open l_expected for select rownum as rn, 1 as A_COLUMN from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).exclude(ut3.ut_varchar2_list('A_COLUMN')); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).exclude(ut3_develop.ut_varchar2_list('A_COLUMN')); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -1578,7 +1578,7 @@ Diff:% open l_actual for select rownum as rn, 'TEST' as A_COLUMN from dual a connect by level < 4; open l_expected for select rownum as rn, 1 as A_COLUMN from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).include(ut3.ut_varchar2_list('RN')); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).include(ut3_develop.ut_varchar2_list('RN')); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -1592,7 +1592,7 @@ Diff:% open l_actual for select rownum as rn, 'TEST' as A_COLUMN from dual a connect by level < 4; open l_expected for select rownum as rn, 1 as A_COLUMN from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).include(ut3.ut_varchar2_list('RN')).exclude(ut3.ut_varchar2_list('A_COLUMN')); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).include(ut3_develop.ut_varchar2_list('RN')).exclude(ut3_develop.ut_varchar2_list('A_COLUMN')); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -1609,7 +1609,7 @@ Diff:% from dual connect by level <=2 order by rownum desc; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).unordered; + ut3_develop.ut.expect(l_actual).to_equal(l_expected).unordered; --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -1626,7 +1626,7 @@ Diff:% from dual connect by level <=2 order by rownum desc; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('COLVAL/ID'); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).join_by('COLVAL/ID'); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -1645,7 +1645,7 @@ Diff:% from dual connect by level <=3 order by rownum desc; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).unordered; + ut3_develop.ut.expect(l_actual).to_equal(l_expected).unordered; l_expected_message := q'[%Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 3 ]% Diff:% Rows: [ 5 differences% @@ -1671,7 +1671,7 @@ Rows: [ 5 differences% from dual connect by level <=2 order by rownum desc; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('COLVAL/ID'); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).join_by('COLVAL/ID'); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -1688,7 +1688,7 @@ Rows: [ 5 differences% from dual connect by level <=2 order by rownum desc; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by(ut3.ut_varchar2_list('RN,COLVAL/ID')); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).join_by(ut3_develop.ut_varchar2_list('RN,COLVAL/ID')); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -1707,7 +1707,7 @@ Rows: [ 5 differences% from dual connect by level <=2 order by rownum desc; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('COLVAL/IDS'); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).join_by('COLVAL/IDS'); l_expected_message := q'[%Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 2 ]% Diff:% @@ -1722,16 +1722,16 @@ Diff:% procedure compare_nest_tab_col_jb is l_actual sys_refcursor; l_expected sys_refcursor; - l_actual_tab ut3.ut_key_value_pairs := ut3.ut_key_value_pairs(); - l_expected_tab ut3.ut_key_value_pairs := ut3.ut_key_value_pairs(); + l_actual_tab ut3_develop.ut_key_value_pairs := ut3_develop.ut_key_value_pairs(); + l_expected_tab ut3_develop.ut_key_value_pairs := ut3_develop.ut_key_value_pairs(); l_expected_message varchar2(32767); l_actual_message varchar2(32767); begin - select ut3.ut_key_value_pair(rownum,'Something '||rownum) + select ut3_develop.ut_key_value_pair(rownum,'Something '||rownum) bulk collect into l_actual_tab from dual connect by level <=2; - select ut3.ut_key_value_pair(rownum,'Something '||rownum) + select ut3_develop.ut_key_value_pair(rownum,'Something '||rownum) bulk collect into l_expected_tab from dual connect by level <=2; @@ -1743,7 +1743,7 @@ Diff:% from table(l_expected_tab) order by 1 desc; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('KEY'); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).join_by('KEY'); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); @@ -1752,16 +1752,16 @@ Diff:% procedure compare_nest_tab_col_jb_fail is l_actual sys_refcursor; l_expected sys_refcursor; - l_actual_tab ut3.ut_key_value_pairs := ut3.ut_key_value_pairs(); - l_expected_tab ut3.ut_key_value_pairs := ut3.ut_key_value_pairs(); + l_actual_tab ut3_develop.ut_key_value_pairs := ut3_develop.ut_key_value_pairs(); + l_expected_tab ut3_develop.ut_key_value_pairs := ut3_develop.ut_key_value_pairs(); l_expected_message varchar2(32767); l_actual_message varchar2(32767); begin - select ut3.ut_key_value_pair(rownum,'Something '||rownum) + select ut3_develop.ut_key_value_pair(rownum,'Something '||rownum) bulk collect into l_actual_tab from dual connect by level <=2; - select ut3.ut_key_value_pair(rownum,'Somethings '||rownum) + select ut3_develop.ut_key_value_pair(rownum,'Somethings '||rownum) bulk collect into l_expected_tab from dual connect by level <=2; @@ -1773,7 +1773,7 @@ Diff:% from table(l_expected_tab) order by 1 desc; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('KEY'); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).join_by('KEY'); l_expected_message := q'[%Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 2 ]% %Diff:% %Rows: [ 2 differences ]% @@ -1789,16 +1789,16 @@ Diff:% procedure compare_nest_tab_cols_jb is l_actual sys_refcursor; l_expected sys_refcursor; - l_actual_tab ut3.ut_key_value_pairs := ut3.ut_key_value_pairs(); - l_expected_tab ut3.ut_key_value_pairs := ut3.ut_key_value_pairs(); + l_actual_tab ut3_develop.ut_key_value_pairs := ut3_develop.ut_key_value_pairs(); + l_expected_tab ut3_develop.ut_key_value_pairs := ut3_develop.ut_key_value_pairs(); l_expected_message varchar2(32767); l_actual_message varchar2(32767); begin - select ut3.ut_key_value_pair(rownum,'Something '||rownum) + select ut3_develop.ut_key_value_pair(rownum,'Something '||rownum) bulk collect into l_actual_tab from dual connect by level <=2; - select ut3.ut_key_value_pair(rownum,'Something '||rownum) + select ut3_develop.ut_key_value_pair(rownum,'Something '||rownum) bulk collect into l_expected_tab from dual connect by level <=2; @@ -1810,7 +1810,7 @@ Diff:% from table(l_expected_tab) order by 1 desc; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by(ut3.ut_varchar2_list('KEY,VALUE')); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).join_by(ut3_develop.ut_varchar2_list('KEY,VALUE')); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); @@ -1819,16 +1819,16 @@ Diff:% procedure compare_nest_tab_cols_jb_fail is l_actual sys_refcursor; l_expected sys_refcursor; - l_actual_tab ut3.ut_key_value_pairs := ut3.ut_key_value_pairs(); - l_expected_tab ut3.ut_key_value_pairs := ut3.ut_key_value_pairs(); + l_actual_tab ut3_develop.ut_key_value_pairs := ut3_develop.ut_key_value_pairs(); + l_expected_tab ut3_develop.ut_key_value_pairs := ut3_develop.ut_key_value_pairs(); l_expected_message varchar2(32767); l_actual_message varchar2(32767); begin - select ut3.ut_key_value_pair(rownum,'Something '||rownum) + select ut3_develop.ut_key_value_pair(rownum,'Something '||rownum) bulk collect into l_actual_tab from dual connect by level <=2; - select ut3.ut_key_value_pair(rownum,'Somethings '||rownum) + select ut3_develop.ut_key_value_pair(rownum,'Somethings '||rownum) bulk collect into l_expected_tab from dual connect by level <=2; @@ -1840,7 +1840,7 @@ Diff:% from table(l_expected_tab) order by 1 desc; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by(ut3.ut_varchar2_list('KEY,VALUE')); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).join_by(ut3_develop.ut_varchar2_list('KEY,VALUE')); l_expected_message := q'[%Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 2 ]% %Diff:% %Rows: [ 4 differences ]% @@ -1856,16 +1856,16 @@ Diff:% procedure compare_tabtype_as_cols_jb is l_actual sys_refcursor; l_expected sys_refcursor; - l_actual_tab ut3.ut_key_value_pairs := ut3.ut_key_value_pairs(); - l_expected_tab ut3.ut_key_value_pairs := ut3.ut_key_value_pairs(); + l_actual_tab ut3_develop.ut_key_value_pairs := ut3_develop.ut_key_value_pairs(); + l_expected_tab ut3_develop.ut_key_value_pairs := ut3_develop.ut_key_value_pairs(); l_expected_message varchar2(32767); l_actual_message varchar2(32767); begin - select ut3.ut_key_value_pair(rownum,'Something '||rownum) + select ut3_develop.ut_key_value_pair(rownum,'Something '||rownum) bulk collect into l_actual_tab from dual connect by level <=2; - select ut3.ut_key_value_pair(rownum,'Somethings '||rownum) + select ut3_develop.ut_key_value_pair(rownum,'Somethings '||rownum) bulk collect into l_expected_tab from dual connect by level <=2; @@ -1877,7 +1877,7 @@ Diff:% from dual connect by level <=2; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('NESTED_TABLE'); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).join_by('NESTED_TABLE'); --Assert l_expected_message := q'[%Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 2 ]% @@ -1896,16 +1896,16 @@ Diff:% procedure compare_tabtype_as_cols is l_actual sys_refcursor; l_expected sys_refcursor; - l_actual_tab ut3.ut_key_value_pairs := ut3.ut_key_value_pairs(); - l_expected_tab ut3.ut_key_value_pairs := ut3.ut_key_value_pairs(); + l_actual_tab ut3_develop.ut_key_value_pairs := ut3_develop.ut_key_value_pairs(); + l_expected_tab ut3_develop.ut_key_value_pairs := ut3_develop.ut_key_value_pairs(); l_expected_message varchar2(32767); l_actual_message varchar2(32767); begin - select ut3.ut_key_value_pair(rownum,'Something '||rownum) + select ut3_develop.ut_key_value_pair(rownum,'Something '||rownum) bulk collect into l_actual_tab from dual connect by level <=2 order by rownum asc; - select ut3.ut_key_value_pair(rownum,'Something '||rownum) + select ut3_develop.ut_key_value_pair(rownum,'Something '||rownum) bulk collect into l_expected_tab from dual connect by level <=2 order by rownum asc; @@ -1917,7 +1917,7 @@ Diff:% from dual connect by level <=2; --Act - ut3.ut.expect(l_actual).to_equal(l_expected); + ut3_develop.ut.expect(l_actual).to_equal(l_expected); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); @@ -1926,16 +1926,16 @@ Diff:% procedure compare_tabtype_as_cols_coll is l_actual sys_refcursor; l_expected sys_refcursor; - l_actual_tab ut3.ut_key_value_pairs := ut3.ut_key_value_pairs(); - l_expected_tab ut3.ut_key_value_pairs := ut3.ut_key_value_pairs(); + l_actual_tab ut3_develop.ut_key_value_pairs := ut3_develop.ut_key_value_pairs(); + l_expected_tab ut3_develop.ut_key_value_pairs := ut3_develop.ut_key_value_pairs(); l_expected_message varchar2(32767); l_actual_message varchar2(32767); begin - select ut3.ut_key_value_pair(rownum,'Apples '||rownum) + select ut3_develop.ut_key_value_pair(rownum,'Apples '||rownum) bulk collect into l_actual_tab from dual connect by level <=2; - select ut3.ut_key_value_pair(rownum,'Peaches '||rownum) + select ut3_develop.ut_key_value_pair(rownum,'Peaches '||rownum) bulk collect into l_expected_tab from dual connect by level <=2; @@ -1947,7 +1947,7 @@ Diff:% from dual connect by level <=2; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('NESTED_TABLE/UT_KEY_VALUE_PAIRS'); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).join_by('NESTED_TABLE/UT_KEY_VALUE_PAIRS'); --Assert l_expected_message := q'[%Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 2 ] @@ -1981,7 +1981,7 @@ Diff:% open l_expected for select l_expected_tab as nested_table from dual; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('NESTED_TABLE'); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).join_by('NESTED_TABLE'); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); @@ -2005,7 +2005,7 @@ Diff:% open l_expected for select l_expected_tab as nested_table from dual; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('NESTED_TABLE/OBJECT_OWNER'); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).join_by('NESTED_TABLE/OBJECT_OWNER'); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); @@ -2029,7 +2029,7 @@ Diff:% open l_expected for select l_expected_tab as nested_table from dual; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('NESTED_TABLE/ITEMS'); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).join_by('NESTED_TABLE/ITEMS'); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); @@ -2057,7 +2057,7 @@ Diff:% from dual; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('NESTED_TABLE/OBJECT_OWNER'); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).join_by('NESTED_TABLE/OBJECT_OWNER'); --Assert l_expected_message := q'[%Actual: refcursor [ count = 1 ] was expected to equal: refcursor [ count = 1 ] @@ -2090,7 +2090,7 @@ Diff:% open l_expected for select l_expected_tab as nested_table from dual; --Act - ut3.ut.expect(l_actual).to_equal(l_expected).join_by('NESTED_TABLE/ITEMS/ID'); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).join_by('NESTED_TABLE/ITEMS/ID'); --Assert l_expected_message := q'[%Actual: refcursor [ count = 1 ] was expected to equal: refcursor [ count = 1 ]% @@ -2124,7 +2124,7 @@ Diff:% select 'Table' as name from dual; --Assert - ut3.ut.expect( l_actual ).to_equal( l_expected ).unordered(); + ut3_develop.ut.expect( l_actual ).to_equal( l_expected ).unordered(); --Assert l_expected_message := q'[%Actual: refcursor [ count = 2 ] was expected to equal: refcursor [ count = 3 ] @@ -2148,7 +2148,7 @@ Diff:% and rownum < 20; --Act - ut3.ut.expect(l_actual).to_contain(l_expected); + ut3_develop.ut.expect(l_actual).to_contain(l_expected); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -2164,7 +2164,7 @@ Diff:% and rownum < 20; --Act - ut3.ut.expect(l_actual).to_contain(l_expected).uc(); + ut3_develop.ut.expect(l_actual).to_contain(l_expected).uc(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -2181,7 +2181,7 @@ Diff:% select rownum owner, rownum||'name' object_name,'PACKAGE' object_type from dual connect by level < 10; --Act - ut3.ut.expect(l_actual).to_contain(l_expected).unordered(); + ut3_develop.ut.expect(l_actual).to_contain(l_expected).unordered(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -2197,7 +2197,7 @@ Diff:% open l_expected for select rownum owner,rownum object_name, 'PACKAGE' object_type from dual connect by level < 10; --Act - ut3.ut.expect(l_actual).to_contain(l_expected); + ut3_develop.ut.expect(l_actual).to_contain(l_expected); --Assert l_expected_message := q'[%Actual: refcursor [ count = 4 ] was expected to contain: refcursor [ count = 9 ] %Diff: @@ -2221,7 +2221,7 @@ Diff:% open l_expected for select username ,user_id from all_users where rownum < 5; --Act - ut3.ut.expect(l_actual).to_contain(l_expected).join_by('USERNAME'); + ut3_develop.ut.expect(l_actual).to_contain(l_expected).join_by('USERNAME'); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -2243,7 +2243,7 @@ Diff:% order by 1 asc; --Act - ut3.ut.expect(l_actual).to_contain(l_expected).join_by('USERNAME'); + ut3_develop.ut.expect(l_actual).to_contain(l_expected).join_by('USERNAME'); --Assert l_expected_message := q'[%Actual: refcursor [ count = % ] was expected to contain: refcursor [ count = % ] %Diff: @@ -2265,7 +2265,7 @@ Diff:% open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 6; open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_contain(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')); + ut3_develop.ut.expect(l_actual).to_contain(l_expected).include(ut3_develop.ut_varchar2_list('RN','//A_Column','SOME_COL')); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -2279,7 +2279,7 @@ Diff:% open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 10; open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_contain(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')).join_by('RN'); + ut3_develop.ut.expect(l_actual).to_contain(l_expected).include(ut3_develop.ut_varchar2_list('RN','//A_Column','SOME_COL')).join_by('RN'); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -2293,7 +2293,7 @@ Diff:% open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 10; open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_contain(l_expected).exclude(ut3.ut_varchar2_list('//Some_Col','A_COLUMN')).join_by('RN'); + ut3_develop.ut.expect(l_actual).to_contain(l_expected).exclude(ut3_develop.ut_varchar2_list('//Some_Col','A_COLUMN')).join_by('RN'); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -2307,7 +2307,7 @@ Diff:% open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 10; open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_contain(l_expected).exclude(ut3.ut_varchar2_list('A_COLUMN|//Some_Col')); + ut3_develop.ut.expect(l_actual).to_contain(l_expected).exclude(ut3_develop.ut_varchar2_list('A_COLUMN|//Some_Col')); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -2324,7 +2324,7 @@ Diff:% select 'TEST1' username, -601 user_id from dual; --Act - ut3.ut.expect(l_actual).not_to_contain(l_expected); + ut3_develop.ut.expect(l_actual).not_to_contain(l_expected); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -2343,7 +2343,7 @@ Diff:% select 'TEST' username, -600 user_id from dual; --Act - ut3.ut.expect(l_actual).not_to_contain(l_expected); + ut3_develop.ut.expect(l_actual).not_to_contain(l_expected); --Assert l_expected_message := q'[%Actual: (refcursor [ count = % ])% %Data-types:% @@ -2368,7 +2368,7 @@ Diff:% open l_expected for select username||to_char(rownum) username ,rownum user_id from all_users where rownum < 5; --Act - ut3.ut.expect(l_actual).not_to_contain(l_expected).join_by('USER_ID'); + ut3_develop.ut.expect(l_actual).not_to_contain(l_expected).join_by('USER_ID'); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -2381,7 +2381,7 @@ Diff:% open l_actual for select rownum as rn, 'b' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 10; open l_expected for select rownum * 20 rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).not_to_contain(l_expected).include(ut3.ut_varchar2_list('RN','//A_Column','SOME_COL')).join_by('RN'); + ut3_develop.ut.expect(l_actual).not_to_contain(l_expected).include(ut3_develop.ut_varchar2_list('RN','//A_Column','SOME_COL')).join_by('RN'); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -2394,7 +2394,7 @@ Diff:% open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'y' SOME_COL, 'd' "Some_Col" from dual a connect by level < 10; open l_expected for select rownum * 20 as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).not_to_contain(l_expected).exclude(ut3.ut_varchar2_list('//Some_Col','A_COLUMN')).join_by('RN'); + ut3_develop.ut.expect(l_actual).not_to_contain(l_expected).exclude(ut3_develop.ut_varchar2_list('//Some_Col','A_COLUMN')).join_by('RN'); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -2410,7 +2410,7 @@ Diff:% open l_expected for select rownum as rn from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_contain(l_expected); + ut3_develop.ut.expect(l_actual).to_contain(l_expected); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -2427,7 +2427,7 @@ Diff:% union all select rownum as rn from dual a connect by level < 4; --Act - ut3.ut.expect(l_actual).to_contain(l_expected); + ut3_develop.ut.expect(l_actual).to_contain(l_expected); --Assert l_expected_message := q'[%Actual: refcursor [ count = 9 ] was expected to contain: refcursor [ count = 6 ] %Diff: @@ -2443,11 +2443,11 @@ Diff:% procedure udt_messg_format_eq is l_actual sys_refcursor; l_expected sys_refcursor; - l_expected_tab ut3.ut_key_value_pairs := ut3.ut_key_value_pairs(); + l_expected_tab ut3_develop.ut_key_value_pairs := ut3_develop.ut_key_value_pairs(); l_expected_message varchar2(32767); l_actual_message varchar2(32767); begin - select ut3.ut_key_value_pair(rownum,'Something '||rownum) + select ut3_develop.ut_key_value_pair(rownum,'Something '||rownum) bulk collect into l_expected_tab from dual connect by level <=2; @@ -2456,7 +2456,7 @@ Diff:% open l_expected for select value(x) as udt from table(l_expected_tab) x; --Act - ut3.ut.expect(l_actual).to_contain(l_expected); + ut3_develop.ut.expect(l_actual).to_contain(l_expected); --Assert l_expected_message := q'[%Actual: refcursor [ count = 2 ] was expected to contain: refcursor [ count = 2 ] %Diff: @@ -2474,11 +2474,11 @@ Diff:% procedure udt_messg_format_empt is l_actual sys_refcursor; - l_actual_tab ut3.ut_key_value_pairs := ut3.ut_key_value_pairs(); + l_actual_tab ut3_develop.ut_key_value_pairs := ut3_develop.ut_key_value_pairs(); l_actual_message varchar2(32767); l_expected_message varchar2(32767); begin - select ut3.ut_key_value_pair(rownum,'Something '||rownum) + select ut3_develop.ut_key_value_pair(rownum,'Something '||rownum) bulk collect into l_actual_tab from dual connect by level <=2; @@ -2486,7 +2486,7 @@ Diff:% open l_actual for select value(x) as udt from table(l_actual_tab) x; --Act - ut3.ut.expect(l_actual).to_be_empty(); + ut3_develop.ut.expect(l_actual).to_be_empty(); --Assert l_expected_message := q'[%Actual: (refcursor [ count = 2 ]) %Data-types: @@ -2507,7 +2507,7 @@ Diff:% begin l_exp_message :='ORA-20218: SQL exception thrown when fetching data from cursor: ORA-01476: divisor is equal to zero -at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line % ut3.ut.expect(l_actual).to_equal(l_expected);% +at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line % ut3_develop.ut.expect(l_actual).to_equal(l_expected);% Check the query and data for errors.'; open l_actual for @@ -2515,7 +2515,7 @@ Check the query and data for errors.'; open l_expected for select 1/0 as test from dual; - ut3.ut.expect(l_actual).to_equal(l_expected); + ut3_develop.ut.expect(l_actual).to_equal(l_expected); --Line that error relates to in expected messag ut.fail('Expected exception on cursor fetch'); @@ -2532,7 +2532,7 @@ Check the query and data for errors.'; l_exp_message :='ORA-20218: SQL exception thrown when fetching data from cursor: ORA-01476: divisor is equal to zero -at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line % ut3.ut.expect(l_actual).to_equal(l_expected);% +at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line % ut3_develop.ut.expect(l_actual).to_equal(l_expected);% Check the query and data for errors.'; open l_expected for @@ -2540,7 +2540,7 @@ Check the query and data for errors.'; open l_actual for select 1 as test from dual; - ut3.ut.expect(l_actual).to_equal(l_expected); + ut3_develop.ut.expect(l_actual).to_equal(l_expected); ut.fail('Expected exception on cursor fetch'); exception @@ -2552,7 +2552,7 @@ Check the query and data for errors.'; l_actual sys_refcursor; l_expected sys_refcursor; begin - ut3.ut.set_nls; + ut3_develop.ut.set_nls; open l_expected for select cast(3.14 as binary_double) as pi_double, cast(3.14 as binary_float) as pi_float, @@ -2569,10 +2569,10 @@ Check the query and data for errors.'; numtoyminterval(1.1, 'year') row_ym_interval from dual; --Act - ut3.ut.expect( l_actual ).to_equal( l_expected ); + ut3_develop.ut.expect( l_actual ).to_equal( l_expected ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); - ut3.ut.reset_nls; + ut3_develop.ut.reset_nls; end; @@ -2597,7 +2597,7 @@ Check the query and data for errors.'; OPEN l_exp_cur FOR SELECT l_exp.key, l_exp.value FROM dual; - ut3.ut.expect(l_act_cur).to_equal(l_exp_cur); + ut3_develop.ut.expect(l_act_cur).to_equal(l_exp_cur); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -2613,7 +2613,7 @@ Check the query and data for errors.'; OPEN l_exp_cur FOR SELECT 1 as "$Test", 2 as "&Test" FROM dual; - ut3.ut.expect(l_act_cur).to_equal(l_exp_cur); + ut3_develop.ut.expect(l_act_cur).to_equal(l_exp_cur); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -2629,7 +2629,7 @@ Check the query and data for errors.'; OPEN l_exp_cur FOR SELECT 1 as "", 2 as "_Test", 3 as ".Test>" FROM dual; - ut3.ut.expect(l_act_cur).to_equal(l_exp_cur); + ut3_develop.ut.expect(l_act_cur).to_equal(l_exp_cur); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -2645,7 +2645,7 @@ Check the query and data for errors.'; open l_actual for select column_value t1 from table(ut_varchar2_list(' ')); --Assert - ut3.ut.expect( l_actual ).to_equal( l_expected ); + ut3_develop.ut.expect( l_actual ).to_equal( l_expected ); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -2659,7 +2659,7 @@ Check the query and data for errors.'; open l_actual for select column_value t1 from table(ut_varchar2_list(chr(9))); --Assert - ut3.ut.expect( l_actual ).to_equal( l_expected ); + ut3_develop.ut.expect( l_actual ).to_equal( l_expected ); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -2673,7 +2673,7 @@ Check the query and data for errors.'; open l_actual for select 't' t1 from dual; --Assert - ut3.ut.expect( l_actual ).to_equal( l_expected ); + ut3_develop.ut.expect( l_actual ).to_equal( l_expected ); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -2687,7 +2687,7 @@ Check the query and data for errors.'; open l_actual for select ' t ' t1 from dual; --Assert - ut3.ut.expect( l_actual ).to_equal( l_expected ); + ut3_develop.ut.expect( l_actual ).to_equal( l_expected ); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -2701,7 +2701,7 @@ Check the query and data for errors.'; open l_actual for select chr(9)||'t' t1 from dual; --Assert - ut3.ut.expect( l_actual ).to_equal( l_expected ); + ut3_develop.ut.expect( l_actual ).to_equal( l_expected ); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -2728,7 +2728,7 @@ Check the query and data for errors.'; 7456123.9 as n6, 7456123.89 as n7 from dual; - ut3.ut.expect(l_actual).to_equal(l_expected); + ut3_develop.ut.expect(l_actual).to_equal(l_expected); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -2760,7 +2760,7 @@ Check the query and data for errors.'; ,-1 as col5 from dual; - ut3.ut.expect(l_actual).to_equal(a_expected => l_expected); + ut3_develop.ut.expect(l_actual).to_equal(a_expected => l_expected); l_expected_message := q'[%Actual: refcursor [ count = 1 ] was expected to equal: refcursor [ count = 1 ] %Diff: @@ -2783,7 +2783,7 @@ Check the query and data for errors.'; open v_actual for select 'ok' name, to_number(null) id from dual; - ut3.ut.expect(v_actual).to_equal(v_expected).exclude('ID'); + ut3_develop.ut.expect(v_actual).to_equal(v_expected).exclude('ID'); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -2799,7 +2799,7 @@ Check the query and data for errors.'; open l_expected for select rownum as id, '1' some_column_with_a_pretty_long_enough_name from dual; - ut3.ut.expect(l_actual).to_equal(l_expected).include('ID,SOME_COLUMN_WITH_A_PRETTY_LONG_ENOUGH_NAME').join_by('ID'); + ut3_develop.ut.expect(l_actual).to_equal(l_expected).include('ID,SOME_COLUMN_WITH_A_PRETTY_LONG_ENOUGH_NAME').join_by('ID'); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); $else @@ -2816,9 +2816,9 @@ Check the query and data for errors.'; return l_result; end; begin - ut3.ut.expect(get_cursor()).to_equal(get_cursor()); - ut3.ut.expect(get_cursor()).to_equal(get_cursor()).unordered(); - ut3.ut.expect(get_cursor()).to_equal(get_cursor()).join_by('ITEM_DATA,DATA_ID,ITEM_NO,DUP_NO'); + ut3_develop.ut.expect(get_cursor()).to_equal(get_cursor()); + ut3_develop.ut.expect(get_cursor()).to_equal(get_cursor()).unordered(); + ut3_develop.ut.expect(get_cursor()).to_equal(get_cursor()).join_by('ITEM_DATA,DATA_ID,ITEM_NO,DUP_NO'); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -2829,10 +2829,10 @@ Check the query and data for errors.'; begin open l_actual for select rownum rn from dual connect by level < 5; open l_expected for select rownum rn from dual connect by level = 1; - ut3.ut.expect(l_actual).to_equal(l_expected); + ut3_develop.ut.expect(l_actual).to_equal(l_expected); open l_actual for select rownum rn from dual connect by level < 3; open l_expected for select * from (select rownum rn from dual connect by level < 3) order by 1 desc; - ut3.ut.expect(l_actual).to_equal(l_expected); + ut3_develop.ut.expect(l_actual).to_equal(l_expected); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations(1)).to_equal( 'Actual: refcursor [ count = 4 ] was expected to equal: refcursor [ count = 1 ] Diff: diff --git a/test/ut3_user/expectations/test_expectations_json.pkb b/test/ut3_user/expectations/test_expectations_json.pkb index 6214d2237..670502c0d 100644 --- a/test/ut3_user/expectations/test_expectations_json.pkb +++ b/test/ut3_user/expectations/test_expectations_json.pkb @@ -49,7 +49,7 @@ create or replace package body test_expectations_json is }'); --Act - ut3.ut.expect( l_actual ).to_equal( l_actual ); + ut3_develop.ut.expect( l_actual ).to_equal( l_actual ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -66,7 +66,7 @@ create or replace package body test_expectations_json is l_actual := json_element_t.parse('{"Aidan Gillen": {"array": ["Game of Thron\"es","The Wire"],"string": "some string","int": 2,"aboolean": true, "boolean": true,"object": {"foo": "bar","object1": {"new prop1": "new prop value"},"object2": {"new prop1": "new prop value"},"object3": {"new prop1": "new prop value"},"object4": {"new prop1": "new prop value"}}},"Amy Ryan": {"one": "In Treatment","two": "The Wire"},"Annie Fitzgerald": ["Big Love","True Blood"],"Anwan Glover": ["Treme","The Wire"],"Alexander Skarsgard": ["Generation Kill","True Blood"], "Clarke Peters": null}'); --Act - ut3.ut.expect( l_actual ).to_equal( l_expected ); + ut3_develop.ut.expect( l_actual ).to_equal( l_expected ); --Assert l_expected_message := q'[%Diff: 20 differences found %3 incorrect types, 4 unequal values, 13 missing properties @@ -103,7 +103,7 @@ create or replace package body test_expectations_json is l_expected := cast (null as json_object_t ); --Act - ut3.ut.expect( l_expected ).to_be_null; + ut3_develop.ut.expect( l_expected ).to_be_null; --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -116,7 +116,7 @@ create or replace package body test_expectations_json is l_expected := json_object_t(); --Act - ut3.ut.expect( l_expected ).not_to_be_null; + ut3_develop.ut.expect( l_expected ).not_to_be_null; --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -131,7 +131,7 @@ create or replace package body test_expectations_json is l_expected := json_object_t('{ "t" : "1" }'); --Act - ut3.ut.expect( l_expected ).to_be_null; + ut3_develop.ut.expect( l_expected ).to_be_null; --Assert l_expected_message := q'[%Actual: (json) %'{"t":"1"}' @@ -151,7 +151,7 @@ create or replace package body test_expectations_json is l_expected := cast (null as json_object_t ); --Act - ut3.ut.expect( l_expected ).not_to_be_null; + ut3_develop.ut.expect( l_expected ).not_to_be_null; --Assert l_expected_message := q'[%Actual: NULL (json) was expected not to be null%]'; l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); @@ -167,7 +167,7 @@ create or replace package body test_expectations_json is l_expected := json_object_t(); --Act - ut3.ut.expect( l_expected ).to_be_empty; + ut3_develop.ut.expect( l_expected ).to_be_empty; --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -180,7 +180,7 @@ create or replace package body test_expectations_json is l_expected := json_object_t.parse('{ "name" : "test" }'); --Act - ut3.ut.expect( l_expected ).not_to_be_empty; + ut3_develop.ut.expect( l_expected ).not_to_be_empty; --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -195,7 +195,7 @@ create or replace package body test_expectations_json is l_expected := json_object_t.parse('{ "name" : "test" }'); --Act - ut3.ut.expect( l_expected ).to_be_empty; + ut3_develop.ut.expect( l_expected ).to_be_empty; --Assert l_expected_message := q'[%Actual: (json) %'{"name":"test"}' @@ -215,7 +215,7 @@ create or replace package body test_expectations_json is l_expected := json_object_t(); --Act - ut3.ut.expect( l_expected ).not_to_be_empty; + ut3_develop.ut.expect( l_expected ).not_to_be_empty; --Assert l_expected_message := q'[%Actual: (json) %'{}' @@ -234,7 +234,7 @@ create or replace package body test_expectations_json is l_actual := json_element_t.parse('{"Aidan Gillen": {"array": ["Game of Thrones","The Wire"],"string": "some string","int": "2","otherint": 4, "aboolean": "true", "boolean": false,"object": {"foo": "bar"}},"Amy Ryan": ["In Treatment","The Wire"],"Annie Fitzgerald": ["True Blood","Big Love","The Sopranos","Oz"],"Anwan Glover": ["Treme","The Wire"],"Alexander Skarsg?rd": ["Generation Kill","True Blood"],"Alice Farmer": ["The Corner","Oz","The Wire"]}'); --Act - ut3.ut.expect( l_actual ).to_have_count( 6 ); + ut3_develop.ut.expect( l_actual ).to_have_count( 6 ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); @@ -251,7 +251,7 @@ create or replace package body test_expectations_json is l_actual := json_element_t.parse('{"Aidan Gillen": {"array": ["Game of Thrones","The Wire"],"string": "some string","int": "2","otherint": 4, "aboolean": "true", "boolean": false,"object": {"foo": "bar"}},"Amy Ryan": ["In Treatment","The Wire"],"Annie Fitzgerald": ["True Blood","Big Love","The Sopranos","Oz"],"Anwan Glover": ["Treme","The Wire"],"Alexander Skarsg?rd": ["Generation Kill","True Blood"],"Alice Farmer": ["The Corner","Oz","The Wire"]}'); --Act - ut3.ut.expect( l_actual ).to_have_count( 2 ); + ut3_develop.ut.expect( l_actual ).to_have_count( 2 ); --Assert l_expected_message := q'[%Actual: (json [ count = 6 ]) was expected to have [ count = 2 ]%]'; l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); @@ -270,7 +270,7 @@ create or replace package body test_expectations_json is l_actual := json_element_t.parse('{"Aidan Gillen": {"array": ["Game of Thrones","The Wire"],"string": "some string","int": "2","otherint": 4, "aboolean": "true", "boolean": false,"object": {"foo": "bar"}},"Amy Ryan": ["In Treatment","The Wire"],"Annie Fitzgerald": ["True Blood","Big Love","The Sopranos","Oz"],"Anwan Glover": ["Treme","The Wire"],"Alexander Skarsg?rd": ["Generation Kill","True Blood"],"Alice Farmer": ["The Corner","Oz","The Wire"]}'); --Act - ut3.ut.expect( l_actual ).not_to_have_count( 7 ); + ut3_develop.ut.expect( l_actual ).not_to_have_count( 7 ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -285,7 +285,7 @@ create or replace package body test_expectations_json is l_actual := json_element_t.parse('{"Aidan Gillen": {"array": ["Game of Thrones","The Wire"],"string": "some string","int": "2","otherint": 4, "aboolean": "true", "boolean": false,"object": {"foo": "bar"}},"Amy Ryan": ["In Treatment","The Wire"],"Annie Fitzgerald": ["True Blood","Big Love","The Sopranos","Oz"],"Anwan Glover": ["Treme","The Wire"],"Alexander Skarsg?rd": ["Generation Kill","True Blood"],"Alice Farmer": ["The Corner","Oz","The Wire"]}'); --Act - ut3.ut.expect( l_actual ).not_to_have_count( 6 ); + ut3_develop.ut.expect( l_actual ).not_to_have_count( 6 ); --Assert l_expected_message := q'[%Actual: json [ count = 6 ] was expected not to have [ count = 6 ]%]'; l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); @@ -303,7 +303,7 @@ create or replace package body test_expectations_json is l_actual := json_element_t.parse('["Game of Thrones","The Wire"]'); --Act - ut3.ut.expect( l_actual ).to_have_count( 2 ); + ut3_develop.ut.expect( l_actual ).to_have_count( 2 ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -371,7 +371,7 @@ create or replace package body test_expectations_json is --Act - ut3.ut.expect(json_array_t(json_query(l_actual.stringify,'$.Actors.children'))).to_equal(json_array_t(json_query(l_expected + ut3_develop.ut.expect(json_array_t(json_query(l_actual.stringify,'$.Actors.children'))).to_equal(json_array_t(json_query(l_expected .stringify,'$.Actors[1].children'))); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); @@ -442,7 +442,7 @@ create or replace package body test_expectations_json is --Act - ut3.ut.expect(json_array_t(json_query(l_actual.stringify,'$.Actors.children'))).to_equal(json_array_t(json_query(l_expected + ut3_develop.ut.expect(json_array_t(json_query(l_actual.stringify,'$.Actors.children'))).to_equal(json_array_t(json_query(l_expected .stringify,'$.Actors[1].children'))); --Assert l_expected_message := q'[%Actual: json was expected to equal: json @@ -732,7 +732,7 @@ create or replace package body test_expectations_json is ]'); --Act - ut3.ut.expect( l_actual ).to_equal( l_actual ); + ut3_develop.ut.expect( l_actual ).to_equal( l_actual ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -759,7 +759,7 @@ create or replace package body test_expectations_json is }'); --Act - ut3.ut.expect( l_actual ).to_equal( l_expected ); + ut3_develop.ut.expect( l_actual ).to_equal( l_expected ); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -1041,7 +1041,7 @@ create or replace package body test_expectations_json is ]'); --Act - ut3.ut.expect( l_actual ).to_equal( l_actual ); + ut3_develop.ut.expect( l_actual ).to_equal( l_actual ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -1554,7 +1554,7 @@ create or replace package body test_expectations_json is ]'); --Act - ut3.ut.expect( l_actual ).to_equal( l_expected ); + ut3_develop.ut.expect( l_actual ).to_equal( l_expected ); --Assert l_expected_message := q'[%Diff: 133 differences found, showing first 20 %132 unequal values, 1 missing properties @@ -1590,7 +1590,7 @@ create or replace package body test_expectations_json is begin l_expected := json_object_t('{ "name" : "Bond", "proffesion" : "spy", "drink" : "martini"}'); l_actual := json_object_t('{ "proffesion" : "spy","name" : "Bond", "drink" : "martini"}'); - ut3.ut.expect( l_actual ).to_equal( l_expected ); + ut3_develop.ut.expect( l_actual ).to_equal( l_expected ); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -1600,7 +1600,7 @@ create or replace package body test_expectations_json is begin l_expected := json_array_t('[ {"name" : "Bond", "proffesion" : "spy", "drink" : "martini"} , {"name" : "Kloss", "proffesion" : "spy", "drink" : "beer"} ]'); l_actual := json_array_t('[ {"name" : "Bond", "proffesion" : "spy", "drink" : "martini"} , {"name" : "Kloss", "proffesion" : "spy", "drink" : "beer"} ]'); - ut3.ut.expect( l_actual ).to_equal( l_expected ); + ut3_develop.ut.expect( l_actual ).to_equal( l_expected ); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; diff --git a/test/ut3_user/expectations/test_matchers.pkb b/test/ut3_user/expectations/test_matchers.pkb index 88e25e8b1..e1d87d4cb 100644 --- a/test/ut3_user/expectations/test_matchers.pkb +++ b/test/ut3_user/expectations/test_matchers.pkb @@ -13,7 +13,7 @@ create or replace package body test_matchers is l_actual '||a_type||' := '||a_actual_value||'; l_expected '||a_type||' := '||a_expected_value||'; begin - ut3.ut.expect( l_actual ).'||a_prefix||'to_'||a_matcher||'( l_expected ); + ut3_develop.ut.expect( l_actual ).'||a_prefix||'to_'||a_matcher||'( l_expected ); end;'; execute immediate l_statement; if a_result = ut3_tester_helper.main_helper.gc_success then @@ -33,7 +33,7 @@ create or replace package body test_matchers is l_lower '||a_type||' := '||a_expected1_value||'; l_higher '||a_type||' := '||a_expected2_value||'; begin - ut3.ut.expect(l_actual_value).to_be_between(l_lower, l_higher); + ut3_develop.ut.expect(l_actual_value).to_be_between(l_lower, l_higher); end;'; execute immediate l_statement; if a_result = ut3_tester_helper.main_helper.gc_success then @@ -53,7 +53,7 @@ create or replace package body test_matchers is l_value1 '||a_type||' := '||a_expected1_value||'; l_value2 '||a_type||' := '||a_expected2_value||'; begin - ut3.ut.expect(l_actual_value).'||a_not_prefix||'to_be_between(l_value1, l_value2); + ut3_develop.ut.expect(l_actual_value).'||a_not_prefix||'to_be_between(l_value1, l_value2); end;'; execute immediate l_statement; if a_result = ut3_tester_helper.main_helper.gc_success then @@ -73,7 +73,7 @@ create or replace package body test_matchers is l_escape_char varchar2(32767) := :a_escape; l_result integer; begin - ut3.ut.expect( l_actual ).' || a_prefix ||q'[to_be_like(l_pattern, l_escape_char); + ut3_develop.ut.expect( l_actual ).' || a_prefix ||q'[to_be_like(l_pattern, l_escape_char); end;]' using a_pattern, a_escape; if a_result = ut3_tester_helper.main_helper.gc_success then @@ -94,7 +94,7 @@ create or replace package body test_matchers is l_modifiers varchar2(32767) := :a_modifiers; l_result integer; begin - ut3.ut.expect( l_actual ).'||a_not_prefix||'to_match(l_pattern, l_modifiers); + ut3_develop.ut.expect( l_actual ).'||a_not_prefix||'to_match(l_pattern, l_modifiers); end;'; execute immediate l_statement using a_pattern, a_modifiers; if a_result = ut3_tester_helper.main_helper.gc_success then @@ -245,8 +245,8 @@ create or replace package body test_matchers is l_value_lower timestamp := to_timestamp('1997-01-31 09:26:50.11','YYYY-MM-DD HH24.MI.SS.FF'); l_value_upper timestamp := to_timestamp('1997-01-31 09:26:50.14','YYYY-MM-DD HH24.MI.SS.FF'); begin - ut3.ut.expect(l_value).to_be_between(l_value_lower, l_value_upper); - ut3.ut.expect(l_value).not_to_be_between(l_value_upper, l_value_lower); + ut3_develop.ut.expect(l_value).to_be_between(l_value_lower, l_value_upper); + ut3_develop.ut.expect(l_value).not_to_be_between(l_value_upper, l_value_lower); end; procedure test_timestamp_ltz_between is @@ -254,8 +254,8 @@ create or replace package body test_matchers is l_value_lower timestamp with local time zone := to_timestamp_tz('1997-01-31 09:26:50.12 +03:00','YYYY-MM-DD HH24.MI.SS.FF TZR'); l_value_upper timestamp with local time zone := to_timestamp_tz('1997-01-31 09:26:50.12 +01:00','YYYY-MM-DD HH24.MI.SS.FF TZR'); begin - ut3.ut.expect(l_value).to_be_between(l_value_lower, l_value_upper); - ut3.ut.expect(l_value).not_to_be_between(l_value_upper, l_value_lower); + ut3_develop.ut.expect(l_value).to_be_between(l_value_lower, l_value_upper); + ut3_develop.ut.expect(l_value).not_to_be_between(l_value_upper, l_value_lower); end; procedure test_timestamp_tz_between is @@ -263,8 +263,8 @@ create or replace package body test_matchers is l_value_lower timestamp with time zone := to_timestamp_tz('1997-01-31 09:26:50.12 +03:00','YYYY-MM-DD HH24.MI.SS.FF TZR'); l_value_upper timestamp with time zone := to_timestamp_tz('1997-01-31 09:26:50.12 +01:00','YYYY-MM-DD HH24.MI.SS.FF TZR'); begin - ut3.ut.expect(l_value).to_be_between(l_value_lower, l_value_upper); - ut3.ut.expect(l_value).not_to_be_between(l_value_upper, l_value_lower); + ut3_develop.ut.expect(l_value).to_be_between(l_value_lower, l_value_upper); + ut3_develop.ut.expect(l_value).not_to_be_between(l_value_upper, l_value_lower); end; end test_matchers; diff --git a/test/ut3_user/expectations/unary/test_expect_to_be_empty.pkb b/test/ut3_user/expectations/unary/test_expect_to_be_empty.pkb index 1447bd1f0..931e24d10 100644 --- a/test/ut3_user/expectations/unary/test_expect_to_be_empty.pkb +++ b/test/ut3_user/expectations/unary/test_expect_to_be_empty.pkb @@ -10,7 +10,7 @@ create or replace package body test_expect_to_be_empty is --Arrange open l_cursor for select * from dual where 1 = 2; --Act - ut3.ut.expect(l_cursor).to_be_empty; + ut3_develop.ut.expect(l_cursor).to_be_empty; --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -21,7 +21,7 @@ create or replace package body test_expect_to_be_empty is --Arrange open l_cursor for select * from dual; --Act - ut3.ut.expect(l_cursor).to_be_empty; + ut3_develop.ut.expect(l_cursor).to_be_empty; --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -34,7 +34,7 @@ create or replace package body test_expect_to_be_empty is --Arrange open l_cursor for select * from dual; --Act - ut3.ut.expect(l_cursor).to_be_empty; + ut3_develop.ut.expect(l_cursor).to_be_empty; l_expected_message := q'[Actual: (refcursor [ count = 1 ])% X% @@ -51,7 +51,7 @@ create or replace package body test_expect_to_be_empty is --Arrange open l_cursor for select * from dual; --Act - ut3.ut.expect(l_cursor).not_to_be_empty; + ut3_develop.ut.expect(l_cursor).not_to_be_empty; --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -62,7 +62,7 @@ create or replace package body test_expect_to_be_empty is --Arrange open l_cursor for select * from dual where 1 = 2; --Act - ut3.ut.expect(l_cursor).not_to_be_empty; + ut3_develop.ut.expect(l_cursor).not_to_be_empty; --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -73,7 +73,7 @@ create or replace package body test_expect_to_be_empty is --Arrange l_actual := anydata.convertcollection(ora_mining_varchar2_nt()); -- Act - ut3.ut.expect(l_actual).to_be_empty(); + ut3_develop.ut.expect(l_actual).to_be_empty(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -84,7 +84,7 @@ create or replace package body test_expect_to_be_empty is --Arrange l_actual := anydata.convertcollection(ora_mining_varchar2_nt('a')); -- Act - ut3.ut.expect(l_actual).to_be_empty(); + ut3_develop.ut.expect(l_actual).to_be_empty(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -95,7 +95,7 @@ create or replace package body test_expect_to_be_empty is --Arrange l_actual := anydata.convertcollection(ora_mining_varchar2_nt('a')); -- Act - ut3.ut.expect(l_actual).not_to_be_empty(); + ut3_develop.ut.expect(l_actual).not_to_be_empty(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -106,7 +106,7 @@ create or replace package body test_expect_to_be_empty is --Arrange l_actual := anydata.convertcollection(ora_mining_varchar2_nt()); -- Act - ut3.ut.expect(l_actual).not_to_be_empty(); + ut3_develop.ut.expect(l_actual).not_to_be_empty(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -118,7 +118,7 @@ create or replace package body test_expect_to_be_empty is --Arrange l_actual := anydata.convertcollection(l_data); -- Act - ut3.ut.expect(l_actual).to_be_empty(); + ut3_develop.ut.expect(l_actual).to_be_empty(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -130,7 +130,7 @@ create or replace package body test_expect_to_be_empty is --Arrange l_actual := anydata.convertcollection(l_data); -- Act - ut3.ut.expect(l_actual).not_to_be_empty(); + ut3_develop.ut.expect(l_actual).not_to_be_empty(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -141,7 +141,7 @@ create or replace package body test_expect_to_be_empty is --Arrange l_actual := anydata.convertObject(ut3_tester_helper.test_dummy_number(1)); -- Act - ut3.ut.expect(l_actual).to_be_empty(); + ut3_develop.ut.expect(l_actual).to_be_empty(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -153,7 +153,7 @@ create or replace package body test_expect_to_be_empty is --Arrange l_actual := anydata.convertObject(l_data); -- Act - ut3.ut.expect(l_actual).to_be_empty(); + ut3_develop.ut.expect(l_actual).to_be_empty(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -161,7 +161,7 @@ create or replace package body test_expect_to_be_empty is procedure fail_be_empty_number is begin -- Act - ut3.ut.expect( 1 ).to_( ut3.be_empty() ); + ut3_develop.ut.expect( 1 ).to_( ut3_develop.be_empty() ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -176,7 +176,7 @@ create or replace package body test_expect_to_be_empty is --Arrange l_actual := anydata.convertObject(ut3_tester_helper.test_dummy_number(1)); -- Act - ut3.ut.expect(l_actual).not_to_be_empty(); + ut3_develop.ut.expect(l_actual).not_to_be_empty(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -188,7 +188,7 @@ create or replace package body test_expect_to_be_empty is --Arrange l_actual := anydata.convertObject(l_data); -- Act - ut3.ut.expect(l_actual).not_to_be_empty(); + ut3_develop.ut.expect(l_actual).not_to_be_empty(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -196,7 +196,7 @@ create or replace package body test_expect_to_be_empty is procedure fail_not_be_empty_number is begin -- Act - ut3.ut.expect( 1 ).not_to( ut3.be_empty() ); + ut3_develop.ut.expect( 1 ).not_to( ut3_develop.be_empty() ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -204,7 +204,7 @@ create or replace package body test_expect_to_be_empty is procedure success_be_empty_clob is begin -- Act - ut3.ut.expect( empty_clob() ).to_( ut3.be_empty() ); + ut3_develop.ut.expect( empty_clob() ).to_( ut3_develop.be_empty() ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -212,7 +212,7 @@ create or replace package body test_expect_to_be_empty is procedure fail_be_empty_clob is begin -- Act - ut3.ut.expect( to_clob(' ') ).to_( ut3.be_empty() ); + ut3_develop.ut.expect( to_clob(' ') ).to_( ut3_develop.be_empty() ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -220,7 +220,7 @@ create or replace package body test_expect_to_be_empty is procedure success_be_empty_blob is begin -- Act - ut3.ut.expect( empty_blob() ).to_( ut3.be_empty() ); + ut3_develop.ut.expect( empty_blob() ).to_( ut3_develop.be_empty() ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -228,7 +228,7 @@ create or replace package body test_expect_to_be_empty is procedure fail_be_empty_blob is begin -- Act - ut3.ut.expect( to_blob('AA') ).to_( ut3.be_empty() ); + ut3_develop.ut.expect( to_blob('AA') ).to_( ut3_develop.be_empty() ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -237,7 +237,7 @@ create or replace package body test_expect_to_be_empty is procedure fail_not_be_empty_clob is begin -- Act - ut3.ut.expect( empty_clob() ).not_to( ut3.be_empty() ); + ut3_develop.ut.expect( empty_clob() ).not_to( ut3_develop.be_empty() ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -245,7 +245,7 @@ create or replace package body test_expect_to_be_empty is procedure success_not_be_empty_clob is begin -- Act - ut3.ut.expect( to_clob(' ') ).not_to( ut3.be_empty() ); + ut3_develop.ut.expect( to_clob(' ') ).not_to( ut3_develop.be_empty() ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -253,7 +253,7 @@ create or replace package body test_expect_to_be_empty is procedure fail_not_be_empty_blob is begin -- Act - ut3.ut.expect( empty_blob() ).not_to( ut3.be_empty() ); + ut3_develop.ut.expect( empty_blob() ).not_to( ut3_develop.be_empty() ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -261,7 +261,7 @@ create or replace package body test_expect_to_be_empty is procedure success_not_be_empty_blob is begin -- Act - ut3.ut.expect( to_blob('AA') ).not_to( ut3.be_empty() ); + ut3_develop.ut.expect( to_blob('AA') ).not_to( ut3_develop.be_empty() ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; diff --git a/test/ut3_user/expectations/unary/test_expect_to_be_true_false.pkb b/test/ut3_user/expectations/unary/test_expect_to_be_true_false.pkb index 6a621c6b3..c1067044b 100644 --- a/test/ut3_user/expectations/unary/test_expect_to_be_true_false.pkb +++ b/test/ut3_user/expectations/unary/test_expect_to_be_true_false.pkb @@ -9,7 +9,7 @@ is procedure to_be_true_null_boolean is begin --Act - ut3.ut.expect( 1=null ).to_be_true(); + ut3_develop.ut.expect( 1=null ).to_be_true(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -17,7 +17,7 @@ is procedure to_be_true_success is begin --Act - ut3.ut.expect( 1=1 ).to_be_true(); + ut3_develop.ut.expect( 1=1 ).to_be_true(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -25,7 +25,7 @@ is procedure to_be_true_failure is begin --Act - ut3.ut.expect( 1=2 ).to_be_true(); + ut3_develop.ut.expect( 1=2 ).to_be_true(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -33,7 +33,7 @@ is procedure to_be_true_bad_type is begin --Act - ut3.ut.expect( 1 ).to_be_true(); + ut3_develop.ut.expect( 1 ).to_be_true(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -41,7 +41,7 @@ is procedure not_to_be_true_null_boolean is begin --Act - ut3.ut.expect( 1=null ).not_to_be_true(); + ut3_develop.ut.expect( 1=null ).not_to_be_true(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -49,7 +49,7 @@ is procedure not_to_be_true_success is begin --Act - ut3.ut.expect( 1=2 ).not_to_be_true(); + ut3_develop.ut.expect( 1=2 ).not_to_be_true(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -57,7 +57,7 @@ is procedure not_to_be_true_failure is begin --Act - ut3.ut.expect( 1=1 ).not_to_be_true(); + ut3_develop.ut.expect( 1=1 ).not_to_be_true(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -66,7 +66,7 @@ is procedure not_to_be_true_bad_type is begin --Act - ut3.ut.expect( 1 ).not_to_be_true(); + ut3_develop.ut.expect( 1 ).not_to_be_true(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -74,7 +74,7 @@ is procedure to_be_false_null_boolean is begin --Act - ut3.ut.expect( 1=null ).to_be_false(); + ut3_develop.ut.expect( 1=null ).to_be_false(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -82,7 +82,7 @@ is procedure to_be_false_success is begin --Act - ut3.ut.expect( 1=2 ).to_be_false(); + ut3_develop.ut.expect( 1=2 ).to_be_false(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -90,7 +90,7 @@ is procedure to_be_false_failure is begin --Act - ut3.ut.expect( 1=1 ).to_be_false(); + ut3_develop.ut.expect( 1=1 ).to_be_false(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -98,7 +98,7 @@ is procedure to_be_false_bad_type is begin --Act - ut3.ut.expect( 1 ).to_be_false(); + ut3_develop.ut.expect( 1 ).to_be_false(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -106,7 +106,7 @@ is procedure not_to_be_false_null_boolean is begin --Act - ut3.ut.expect( 1=null ).not_to_be_false(); + ut3_develop.ut.expect( 1=null ).not_to_be_false(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -114,7 +114,7 @@ is procedure not_to_be_false_success is begin --Act - ut3.ut.expect( 1=1 ).not_to_be_false(); + ut3_develop.ut.expect( 1=1 ).not_to_be_false(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -122,7 +122,7 @@ is procedure not_to_be_false_failure is begin --Act - ut3.ut.expect( 1=2 ).not_to_be_false(); + ut3_develop.ut.expect( 1=2 ).not_to_be_false(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -130,7 +130,7 @@ is procedure not_to_be_false_bad_type is begin --Act - ut3.ut.expect( 1 ).not_to_be_false(); + ut3_develop.ut.expect( 1 ).not_to_be_false(); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; diff --git a/test/ut3_user/expectations/unary/test_expect_to_have_count.pkb b/test/ut3_user/expectations/unary/test_expect_to_have_count.pkb index 327ced120..2167c44ef 100644 --- a/test/ut3_user/expectations/unary/test_expect_to_have_count.pkb +++ b/test/ut3_user/expectations/unary/test_expect_to_have_count.pkb @@ -11,7 +11,7 @@ create or replace package body test_expect_to_have_count is --Arrange open l_cursor for select * from dual connect by level <= 11; --Act - ut3.ut.expect(l_cursor).to_have_count(11); + ut3_develop.ut.expect(l_cursor).to_have_count(11); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -22,7 +22,7 @@ create or replace package body test_expect_to_have_count is --Arrange open l_cursor for select * from dual where 0=1; --Act - ut3.ut.expect(l_cursor).to_have_count(1); + ut3_develop.ut.expect(l_cursor).to_have_count(1); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -35,7 +35,7 @@ create or replace package body test_expect_to_have_count is --Arrange open l_cursor for select * from dual; --Act - ut3.ut.expect(l_cursor).to_have_count(2); + ut3_develop.ut.expect(l_cursor).to_have_count(2); l_expected_message := q'[Actual: (refcursor [ count = 1 ]) was expected to have [ count = 2 ]%]'; l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); @@ -50,7 +50,7 @@ create or replace package body test_expect_to_have_count is --Arrange open l_cursor for select * from dual; --Act - ut3.ut.expect(l_cursor).not_to_have_count(2); + ut3_develop.ut.expect(l_cursor).not_to_have_count(2); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -61,7 +61,7 @@ create or replace package body test_expect_to_have_count is --Arrange open l_cursor for select * from dual where 1 = 2; --Act - ut3.ut.expect(l_cursor).not_to_have_count(0); + ut3_develop.ut.expect(l_cursor).not_to_have_count(0); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -72,7 +72,7 @@ create or replace package body test_expect_to_have_count is --Arrange l_actual := anydata.convertcollection(ora_mining_varchar2_nt()); -- Act - ut3.ut.expect(l_actual).to_have_count(0); + ut3_develop.ut.expect(l_actual).to_have_count(0); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -83,7 +83,7 @@ create or replace package body test_expect_to_have_count is --Arrange l_actual := anydata.convertcollection(ora_mining_varchar2_nt('a')); -- Act - ut3.ut.expect(l_actual).to_have_count(0); + ut3_develop.ut.expect(l_actual).to_have_count(0); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -94,7 +94,7 @@ create or replace package body test_expect_to_have_count is --Arrange l_actual := anydata.convertcollection(ora_mining_varchar2_nt('a')); -- Act - ut3.ut.expect(l_actual).not_to_have_count(2); + ut3_develop.ut.expect(l_actual).not_to_have_count(2); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -105,7 +105,7 @@ create or replace package body test_expect_to_have_count is --Arrange l_actual := anydata.convertcollection(ora_mining_varchar2_nt()); -- Act - ut3.ut.expect(l_actual).not_to_have_count(0); + ut3_develop.ut.expect(l_actual).not_to_have_count(0); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -117,7 +117,7 @@ create or replace package body test_expect_to_have_count is --Arrange l_actual := anydata.convertcollection(l_data); -- Act - ut3.ut.expect(l_actual).to_have_count(0); + ut3_develop.ut.expect(l_actual).to_have_count(0); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -129,7 +129,7 @@ create or replace package body test_expect_to_have_count is --Arrange l_actual := anydata.convertcollection(l_data); -- Act - ut3.ut.expect(l_actual).not_to_have_count(0); + ut3_develop.ut.expect(l_actual).not_to_have_count(0); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -140,7 +140,7 @@ create or replace package body test_expect_to_have_count is --Arrange l_actual := anydata.convertObject(ut3_tester_helper.test_dummy_number(1)); -- Act - ut3.ut.expect(l_actual).to_have_count(0); + ut3_develop.ut.expect(l_actual).to_have_count(0); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -152,7 +152,7 @@ create or replace package body test_expect_to_have_count is --Arrange l_actual := anydata.convertObject(l_data); -- Act - ut3.ut.expect(l_actual).to_have_count(0); + ut3_develop.ut.expect(l_actual).to_have_count(0); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -162,7 +162,7 @@ create or replace package body test_expect_to_have_count is l_actual_message varchar2(32767); begin -- Act - ut3.ut.expect( 1 ).to_( ut3.have_count(0) ); + ut3_develop.ut.expect( 1 ).to_( ut3_develop.have_count(0) ); --Assert l_expected_message := q'[%The matcher 'have count' cannot be used with data type (number).%]'; l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); @@ -178,7 +178,7 @@ create or replace package body test_expect_to_have_count is --Arrange l_actual := anydata.convertObject(ut3_tester_helper.test_dummy_number(1)); -- Act - ut3.ut.expect(l_actual).not_to_have_count(0); + ut3_develop.ut.expect(l_actual).not_to_have_count(0); --Assert l_expected_message := q'[%The matcher 'have count' cannot be used with data type (ut3_tester_helper.test_dummy_number).%]'; l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); @@ -193,7 +193,7 @@ create or replace package body test_expect_to_have_count is --Arrange l_actual := anydata.convertObject(l_data); -- Act - ut3.ut.expect(l_actual).not_to_have_count(0); + ut3_develop.ut.expect(l_actual).not_to_have_count(0); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; @@ -201,7 +201,7 @@ create or replace package body test_expect_to_have_count is procedure fail_not_have_count_number is begin -- Act - ut3.ut.expect( 1 ).not_to( ut3.have_count(0) ); + ut3_develop.ut.expect( 1 ).not_to( ut3_develop.have_count(0) ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; diff --git a/test/ut3_user/reporters.pkb b/test/ut3_user/reporters.pkb index 9f571a589..edd26189c 100644 --- a/test/ut3_user/reporters.pkb +++ b/test/ut3_user/reporters.pkb @@ -74,14 +74,14 @@ as is begin dbms_output.put_line(''); - ut3.ut.expect(1,'Test 1 Should Pass').to_equal(1); + ut3_develop.ut.expect(1,'Test 1 Should Pass').to_equal(1); end; procedure failing_test is begin dbms_output.put_line(''); - ut3.ut.expect('number [1] ','Fails as values are different').to_equal('number [2] '); + ut3_develop.ut.expect('number [1] ','Fails as values are different').to_equal('number [2] '); end; procedure erroring_test @@ -90,14 +90,14 @@ as begin dbms_output.put_line(''); l_variable := 'a string'; - ut3.ut.expect(l_variable).to_equal(1); + ut3_develop.ut.expect(l_variable).to_equal(1); end; procedure disabled_test is begin dbms_output.put_line(''); - ut3.ut.expect(1,'this should not execute').to_equal(1); + ut3_develop.ut.expect(1,'this should not execute').to_equal(1); end; procedure beforeall is @@ -124,7 +124,7 @@ end;]'; execute immediate q'[create or replace package body check_fail_escape is procedure fail_miserably is begin - ut3.ut.expect('test').to_equal(''); + ut3_develop.ut.expect('test').to_equal(''); end; end;]'; @@ -148,36 +148,36 @@ end;]'; end; procedure check_xml_encoding_included( - a_reporter ut3.ut_reporter_base, + a_reporter ut3_develop.ut_reporter_base, a_client_character_set varchar2 ) is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_actual clob; begin --Act select * bulk collect into l_results - from table(ut3.ut.run('test_reporters', a_reporter, a_client_character_set => a_client_character_set)); + from table(ut3_develop.ut.run('test_reporters', a_reporter, a_client_character_set => a_client_character_set)); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); --Assert ut.expect(l_actual).to_be_like('%'); end; procedure check_xml_failure_escaped( - a_reporter ut3.ut_reporter_base + a_reporter ut3_develop.ut_reporter_base ) is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_actual clob; begin --Act select * bulk collect into l_results - from table( ut3.ut.run( 'check_fail_escape', a_reporter ) ); + from table( ut3_develop.ut.run( 'check_fail_escape', a_reporter ) ); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); --Assert ut.expect(l_actual).to_be_like('%' (varchar2)%]' - ||q'[at "UT3$USER#.CHECK_FAIL_ESCAPE%", line % ut3.ut.expect('test').to_equal('');]' + ||q'[at "UT3$USER#.CHECK_FAIL_ESCAPE%", line % ut3_develop.ut.expect('test').to_equal('');]' ||'%]]>%' ); end; diff --git a/test/ut3_user/reporters.pks b/test/ut3_user/reporters.pks index d1ed8635f..c5ad72e22 100644 --- a/test/ut3_user/reporters.pks +++ b/test/ut3_user/reporters.pks @@ -10,12 +10,12 @@ create or replace package reporters is procedure reporters_cleanup; procedure check_xml_encoding_included( - a_reporter ut3.ut_reporter_base, + a_reporter ut3_develop.ut_reporter_base, a_client_character_set varchar2 ); procedure check_xml_failure_escaped( - a_reporter ut3.ut_reporter_base + a_reporter ut3_develop.ut_reporter_base ); end reporters; diff --git a/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb index 183492eb7..7ae4b6f0d 100644 --- a/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb +++ b/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb @@ -1,7 +1,7 @@ create or replace package body test_cov_cobertura_reporter is procedure report_on_file is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_expected clob; l_actual clob; begin @@ -11,11 +11,11 @@ create or replace package body test_cov_cobertura_reporter is -test/ut3.dummy_coverage.pkb +test/ut3_develop.dummy_coverage.pkb - + @@ -29,11 +29,11 @@ create or replace package body test_cov_cobertura_reporter is select * bulk collect into l_results from table( - ut3.ut.run( - a_path => 'ut3.test_dummy_coverage', - a_reporter=> ut3.ut_coverage_cobertura_reporter( ), - a_source_files => ut3.ut_varchar2_list( 'test/ut3.dummy_coverage.pkb' ), - a_test_files => ut3.ut_varchar2_list( ) + ut3_develop.ut.run( + a_path => 'ut3_develop.test_dummy_coverage', + a_reporter=> ut3_develop.ut_coverage_cobertura_reporter( ), + a_source_files => ut3_develop.ut_varchar2_list( 'test/ut3_develop.dummy_coverage.pkb' ), + a_test_files => ut3_develop.ut_varchar2_list( ) ) ); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); @@ -42,7 +42,7 @@ create or replace package body test_cov_cobertura_reporter is end; procedure report_zero_coverage is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_expected clob; l_actual clob; begin @@ -52,11 +52,11 @@ create or replace package body test_cov_cobertura_reporter is -ut3.dummy_coverage +ut3_develop.dummy_coverage - + @@ -84,10 +84,10 @@ create or replace package body test_cov_cobertura_reporter is select * bulk collect into l_results from table( - ut3.ut.run( - a_path => 'ut3.test_dummy_coverage', - a_reporter=> ut3.ut_coverage_cobertura_reporter( ), - a_include_objects => ut3.ut_varchar2_list('UT3.DUMMY_COVERAGE') + ut3_develop.ut.run( + a_path => 'ut3_develop.test_dummy_coverage', + a_reporter=> ut3_develop.ut_coverage_cobertura_reporter( ), + a_include_objects => ut3_develop.ut_varchar2_list('UT3_DEVELOP.DUMMY_COVERAGE') ) ); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); diff --git a/test/ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pkb index 5cd53a093..b0cb05a5b 100644 --- a/test/ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pkb +++ b/test/ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pkb @@ -1,14 +1,14 @@ create or replace package body test_coverage_sonar_reporter is procedure report_on_file is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_expected clob; l_actual clob; begin --Arrange l_expected := ' - + @@ -18,11 +18,11 @@ create or replace package body test_coverage_sonar_reporter is select * bulk collect into l_results from table( - ut3.ut.run( - a_path => 'ut3.test_dummy_coverage', - a_reporter=> ut3.ut_coverage_sonar_reporter( ), - a_source_files => ut3.ut_varchar2_list( 'test/ut3.dummy_coverage.pkb' ), - a_test_files => ut3.ut_varchar2_list( ) + ut3_develop.ut.run( + a_path => 'ut3_develop.test_dummy_coverage', + a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), + a_source_files => ut3_develop.ut_varchar2_list( 'test/ut3_develop.dummy_coverage.pkb' ), + a_test_files => ut3_develop.ut_varchar2_list( ) ) ); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); @@ -32,7 +32,7 @@ create or replace package body test_coverage_sonar_reporter is procedure check_encoding_included is begin - reporters.check_xml_encoding_included(ut3.ut_coverage_sonar_reporter(), 'UTF-8'); + reporters.check_xml_encoding_included(ut3_develop.ut_coverage_sonar_reporter(), 'UTF-8'); end; end; diff --git a/test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb index 2d36d45cb..73dde1b78 100644 --- a/test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb +++ b/test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb @@ -1,13 +1,13 @@ create or replace package body test_coveralls_reporter is procedure report_on_file is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_expected clob; l_actual clob; begin --Arrange l_expected := q'[{"source_files":[ -{ "name": "test/ut3.dummy_coverage.pkb", +{ "name": "test/ut3_develop.dummy_coverage.pkb", "coverage": [ null, null, @@ -24,11 +24,11 @@ null, select * bulk collect into l_results from table( - ut3.ut.run( - a_path => 'ut3.test_dummy_coverage', - a_reporter=> ut3.ut_coveralls_reporter( ), - a_source_files => ut3.ut_varchar2_list( 'test/ut3.dummy_coverage.pkb' ), - a_test_files => ut3.ut_varchar2_list( ) + ut3_develop.ut.run( + a_path => 'ut3_develop.test_dummy_coverage', + a_reporter=> ut3_develop.ut_coveralls_reporter( ), + a_source_files => ut3_develop.ut_varchar2_list( 'test/ut3_develop.dummy_coverage.pkb' ), + a_test_files => ut3_develop.ut_varchar2_list( ) ) ); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); @@ -37,14 +37,14 @@ null, end; procedure report_zero_coverage is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_expected clob; l_actual clob; pragma autonomous_transaction; begin --Arrange l_expected := q'[{"source_files":[ -{ "name": "ut3.dummy_coverage", +{ "name": "ut3_develop.dummy_coverage", "coverage": [ 0, 0, @@ -72,10 +72,10 @@ null, select * bulk collect into l_results from table( - ut3.ut.run( - 'ut3.test_dummy_coverage', - ut3.ut_coveralls_reporter(), - a_include_objects => ut3.ut_varchar2_list('UT3.DUMMY_COVERAGE') + ut3_develop.ut.run( + 'ut3_develop.test_dummy_coverage', + ut3_develop.ut_coveralls_reporter(), + a_include_objects => ut3_develop.ut_varchar2_list('UT3_DEVELOP.DUMMY_COVERAGE') ) ); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); diff --git a/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pkb index 02b275020..8c6ae9e02 100644 --- a/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pkb +++ b/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pkb @@ -1,22 +1,22 @@ create or replace package body test_html_extended_reporter is procedure report_on_file is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_expected varchar2(32767); l_actual clob; l_charset varchar2(100) := 'ISO-8859-1'; begin --Arrange - l_expected := '%%

UT3.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG

%4 relevant lines. 3 lines covered (including 1 lines partially covered ) and 1 lines missed%'; + l_expected := '%%

UT3_DEVELOP.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG

%4 relevant lines. 3 lines covered (including 1 lines partially covered ) and 1 lines missed%'; select * bulk collect into l_results from table( - ut3.ut.run( - a_path => 'ut3.test_block_dummy_coverage', - a_reporter=> ut3.ut_coverage_html_reporter(), - a_source_files => ut3.ut_varchar2_list( 'test/ut3.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long.pkb' ), - a_test_files => ut3.ut_varchar2_list( ), + ut3_develop.ut.run( + a_path => 'ut3_develop.test_block_dummy_coverage', + a_reporter=> ut3_develop.ut_coverage_html_reporter(), + a_source_files => ut3_develop.ut_varchar2_list( 'test/ut3_develop.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long.pkb' ), + a_test_files => ut3_develop.ut_varchar2_list( ), a_client_character_set => l_charset ) ); diff --git a/test/ut3_user/reporters/test_coverage/test_html_proftab_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_html_proftab_reporter.pkb index 8daf36513..9f3fb90e5 100644 --- a/test/ut3_user/reporters/test_coverage/test_html_proftab_reporter.pkb +++ b/test/ut3_user/reporters/test_coverage/test_html_proftab_reporter.pkb @@ -1,22 +1,22 @@ create or replace package body test_html_proftab_reporter is procedure report_on_file is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_expected varchar2(32767); l_actual clob; l_charset varchar2(100) := 'ISO-8859-1'; begin --Arrange - l_expected := '%%

UT3.DUMMY_COVERAGE

%3 relevant lines. 2 lines covered and 1 lines missed%'; + l_expected := '%%

UT3_DEVELOP.DUMMY_COVERAGE

%3 relevant lines. 2 lines covered and 1 lines missed%'; --Act select * bulk collect into l_results from table( - ut3.ut.run( - a_path => 'ut3.test_dummy_coverage', - a_reporter=> ut3.ut_coverage_html_reporter(), - a_source_files => ut3.ut_varchar2_list( 'test/ut3.dummy_coverage.pkb' ), - a_test_files => ut3.ut_varchar2_list( ), + ut3_develop.ut.run( + a_path => 'ut3_develop.test_dummy_coverage', + a_reporter=> ut3_develop.ut_coverage_html_reporter(), + a_source_files => ut3_develop.ut_varchar2_list( 'test/ut3_develop.dummy_coverage.pkb' ), + a_test_files => ut3_develop.ut_varchar2_list( ), a_client_character_set => l_charset ) ); diff --git a/test/ut3_user/reporters/test_debug_reporter.pkb b/test/ut3_user/reporters/test_debug_reporter.pkb index f108ec577..ed7e14fcf 100644 --- a/test/ut3_user/reporters/test_debug_reporter.pkb +++ b/test/ut3_user/reporters/test_debug_reporter.pkb @@ -3,14 +3,14 @@ create or replace package body test_debug_reporter as g_actual clob; procedure run_reporter is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; begin select * bulk collect into l_results from table( - ut3.ut.run( + ut3_develop.ut.run( 'test_reporters', - ut3.ut_debug_reporter() + ut3_develop.ut_debug_reporter() ) ); g_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); diff --git a/test/ut3_user/reporters/test_documentation_reporter.pkb b/test/ut3_user/reporters/test_documentation_reporter.pkb index a1f895947..456fa86f9 100644 --- a/test/ut3_user/reporters/test_documentation_reporter.pkb +++ b/test/ut3_user/reporters/test_documentation_reporter.pkb @@ -1 +1 @@ -create or replace package body test_documentation_reporter as procedure report_produces_expected_out is l_results ut3.ut_varchar2_list; l_actual clob; l_expected varchar2(32767):=q'[%org utplsql tests helpers A suite for testing different outcomes from reporters A description of some context passing_test [% sec] a test with failing assertion [% sec] (FAILED - 1) a test raising unhandled exception [% sec] (FAILED - 2) a disabled test [0 sec] (DISABLED) % Failures: % 1) failing_test "Fails as values are different" Actual: 'number [1] ' (varchar2) was expected to equal: 'number [2] ' (varchar2)% at "UT3$USER#.TEST_REPORTERS%", line 36 ut3.ut.expect('number [1] ','Fails as values are different').to_equal('number [2] '); % % 2) erroring_test ORA-06502: PL/SQL: numeric or value error: character to number conversion error ORA-06512: at "UT3$USER#.TEST_REPORTERS", line 44% ORA-06512: at line 6 Finished in % seconds 4 tests, 1 failed, 1 errored, 1 disabled, 0 warning(s)%]'; begin select * bulk collect into l_results from table( ut3.ut.run( 'test_reporters', ut3.ut_documentation_reporter() ) ); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); ut.expect(l_actual).to_be_like(l_expected); end; end; / \ No newline at end of file +create or replace package body test_documentation_reporter as procedure report_produces_expected_out is l_results ut3_develop.ut_varchar2_list; l_actual clob; l_expected varchar2(32767):=q'[%org utplsql tests helpers A suite for testing different outcomes from reporters A description of some context passing_test [% sec] a test with failing assertion [% sec] (FAILED - 1) a test raising unhandled exception [% sec] (FAILED - 2) a disabled test [0 sec] (DISABLED) % Failures: % 1) failing_test "Fails as values are different" Actual: 'number [1] ' (varchar2) was expected to equal: 'number [2] ' (varchar2)% at "UT3$USER#.TEST_REPORTERS%", line 36 ut3_develop.ut.expect('number [1] ','Fails as values are different').to_equal('number [2] '); % % 2) erroring_test ORA-06502: PL/SQL: numeric or value error: character to number conversion error ORA-06512: at "UT3$USER#.TEST_REPORTERS", line 44% ORA-06512: at line 6 Finished in % seconds 4 tests, 1 failed, 1 errored, 1 disabled, 0 warning(s)%]'; begin select * bulk collect into l_results from table( ut3_develop.ut.run( 'test_reporters', ut3_develop.ut_documentation_reporter() ) ); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); ut.expect(l_actual).to_be_like(l_expected); end; end; / \ No newline at end of file diff --git a/test/ut3_user/reporters/test_extended_coverage.pkb b/test/ut3_user/reporters/test_extended_coverage.pkb index 33d42d9ef..28742aa70 100644 --- a/test/ut3_user/reporters/test_extended_coverage.pkb +++ b/test/ut3_user/reporters/test_extended_coverage.pkb @@ -3,18 +3,18 @@ create or replace package body test_extended_coverage is procedure coverage_for_object is l_expected clob; l_actual clob; - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; begin --Arrange - l_expected := '%%%'; + l_expected := '%%%'; --Act select * bulk collect into l_results from table( - ut3.ut.run( - a_path => 'ut3.test_block_dummy_coverage', - a_reporter=> ut3.ut_coverage_sonar_reporter( ), - a_include_objects => ut3.ut_varchar2_list( 'ut3.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long' ) + ut3_develop.ut.run( + a_path => 'ut3_develop.test_block_dummy_coverage', + a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), + a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long' ) ) ); --Assert @@ -25,44 +25,44 @@ create or replace package body test_extended_coverage is procedure coverage_for_schema is l_expected clob; l_actual clob; - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; begin --Arrange - l_expected := '%%%'; + l_expected := '%%%'; --Act select * bulk collect into l_results from table( - ut3.ut.run( - a_path => 'ut3.test_block_dummy_coverage', - a_reporter=> ut3.ut_coverage_sonar_reporter( ), - a_coverage_schemes => ut3.ut_varchar2_list( 'ut3' ) + ut3_develop.ut.run( + a_path => 'ut3_develop.test_block_dummy_coverage', + a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), + a_coverage_schemes => ut3_develop.ut_varchar2_list( 'ut3_develop' ) ) ); --Assert l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); ut.expect(l_actual).to_be_like(l_expected); - ut.expect(l_actual).to_be_like('%%%'); + ut.expect(l_actual).to_be_like('%%%'); end; procedure coverage_for_file is l_expected clob; l_actual clob; - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_file_path varchar2(250); begin --Arrange - l_file_path := lower('test/ut3.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long.pkb'); + l_file_path := lower('test/ut3_develop.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long.pkb'); l_expected := '%%%'; --Act select * bulk collect into l_results from table( - ut3.ut.run( - a_path => 'ut3.test_block_dummy_coverage', - a_reporter=> ut3.ut_coverage_sonar_reporter( ), - a_source_files => ut3.ut_varchar2_list( l_file_path ), - a_test_files => ut3.ut_varchar2_list( ) + ut3_develop.ut.run( + a_path => 'ut3_develop.test_block_dummy_coverage', + a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), + a_source_files => ut3_develop.ut_varchar2_list( l_file_path ), + a_test_files => ut3_develop.ut_varchar2_list( ) ) ); --Assert diff --git a/test/ut3_user/reporters/test_junit_reporter.pkb b/test/ut3_user/reporters/test_junit_reporter.pkb index e1b790156..f3cc6c6d2 100644 --- a/test/ut3_user/reporters/test_junit_reporter.pkb +++ b/test/ut3_user/reporters/test_junit_reporter.pkb @@ -13,8 +13,8 @@ create or replace package body test_junit_reporter as execute immediate q'[create or replace package body check_junit_reporting is procedure test_do_stuff is begin - ut3.ut.expect(1).to_equal(1); - ut3.ut.expect(1).to_equal(2); + ut3_develop.ut.expect(1).to_equal(1); + ut3_develop.ut.expect(1).to_equal(2); end; end;]'; @@ -31,7 +31,7 @@ create or replace package body test_junit_reporter as execute immediate q'[create or replace package body check_junit_rep_suitepath is procedure check_junit_rep_suitepath is begin - ut3.ut.expect(1).to_equal(1); + ut3_develop.ut.expect(1).to_equal(1); end; end;]'; @@ -76,13 +76,13 @@ create or replace package body test_junit_reporter as end; procedure escapes_special_chars is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_actual clob; begin --Act select * bulk collect into l_results - from table(ut3.ut.run('check_junit_reporting',ut3.ut_junit_reporter())); + from table(ut3_develop.ut.run('check_junit_reporting',ut3_develop.ut_junit_reporter())); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); --Assert ut.expect(l_actual).not_to_be_like('%%'); @@ -90,13 +90,13 @@ create or replace package body test_junit_reporter as end; procedure reports_only_failed_or_errored is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_actual clob; begin --Act select * bulk collect into l_results - from table(ut3.ut.run('check_junit_reporting',ut3.ut_junit_reporter())); + from table(ut3_develop.ut.run('check_junit_reporting',ut3_develop.ut_junit_reporter())); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); --Assert ut.expect(l_actual).not_to_be_like('%Actual: 1 (number) was expected to equal: 1 (number)%'); @@ -104,13 +104,13 @@ create or replace package body test_junit_reporter as end; procedure reports_xunit_only_fail_or_err is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_actual clob; begin --Act select * bulk collect into l_results - from table(ut3.ut.run('check_junit_reporting',ut3.ut_xunit_reporter())); + from table(ut3_develop.ut.run('check_junit_reporting',ut3_develop.ut_xunit_reporter())); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); --Assert ut.expect(l_actual).not_to_be_like('%Actual: 1 (number) was expected to equal: 1 (number)%'); @@ -118,20 +118,20 @@ create or replace package body test_junit_reporter as end; procedure check_classname_suite is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_actual clob; begin --Act select * bulk collect into l_results - from table(ut3.ut.run('check_junit_reporting',ut3.ut_junit_reporter())); + from table(ut3_develop.ut.run('check_junit_reporting',ut3_develop.ut_junit_reporter())); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); --Assert ut.expect(l_actual).to_be_like('%testcase classname="check_junit_reporting" assertions="%" name="%"%'); end; procedure check_nls_number_formatting is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_actual clob; l_nls_numeric_characters varchar2(30); begin @@ -143,7 +143,7 @@ create or replace package body test_junit_reporter as --Act select * bulk collect into l_results - from table(ut3.ut.run('check_junit_reporting', ut3.ut_junit_reporter())); + from table(ut3_develop.ut.run('check_junit_reporting', ut3_develop.ut_junit_reporter())); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); --Assert ut.expect(l_actual).to_match('time="[0-9]*\.[0-9]{3,6}"'); @@ -152,20 +152,20 @@ create or replace package body test_junit_reporter as end; procedure check_classname_suitepath is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_actual clob; begin --Act select * bulk collect into l_results - from table(ut3.ut.run('check_junit_rep_suitepath',ut3.ut_junit_reporter())); + from table(ut3_develop.ut.run('check_junit_rep_suitepath',ut3_develop.ut_junit_reporter())); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); --Assert ut.expect(l_actual).to_be_like('%testcase classname="core.check_junit_rep_suitepath" assertions="%" name="%"%'); end; procedure report_test_without_desc is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_actual clob; l_expected varchar2(32767):= q'[ @@ -185,13 +185,13 @@ create or replace package body test_junit_reporter as begin select * bulk collect into l_results - from table(ut3.ut.run('tst_package_junit_nodesc',ut3.ut_junit_reporter())); + from table(ut3_develop.ut.run('tst_package_junit_nodesc',ut3_develop.ut_junit_reporter())); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); ut.expect(l_actual).to_be_like(l_expected); end; procedure report_suite_without_desc is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_actual clob; l_expected varchar2(32767):= q'[ @@ -207,13 +207,13 @@ create or replace package body test_junit_reporter as begin select * bulk collect into l_results - from table(ut3.ut.run('tst_package_junit_nosuite',ut3.ut_junit_reporter())); + from table(ut3_develop.ut.run('tst_package_junit_nosuite',ut3_develop.ut_junit_reporter())); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); ut.expect(l_actual).to_be_like(l_expected); end; procedure reporort_produces_expected_out is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_actual clob; l_expected varchar2(32767):=q'[ @@ -263,20 +263,20 @@ create or replace package body test_junit_reporter as begin select * bulk collect into l_results - from table(ut3.ut.run('test_reporters',ut3.ut_junit_reporter())); + from table(ut3_develop.ut.run('test_reporters',ut3_develop.ut_junit_reporter())); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); ut.expect(l_actual).to_be_like(l_expected); end; procedure check_failure_escaped is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_actual clob; begin - reporters.check_xml_failure_escaped(ut3.ut_junit_reporter()); + reporters.check_xml_failure_escaped(ut3_develop.ut_junit_reporter()); end; procedure check_classname_is_populated is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_actual clob; l_expected varchar2(32767):= q'[ @@ -292,14 +292,14 @@ create or replace package body test_junit_reporter as begin select * bulk collect into l_results - from table(ut3.ut.run('Tst_Fix_Case_Sensitive',ut3.ut_junit_reporter())); + from table(ut3_develop.ut.run('Tst_Fix_Case_Sensitive',ut3_develop.ut_junit_reporter())); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); ut.expect(l_actual).to_be_like(l_expected); end; procedure check_encoding_included is begin - reporters.check_xml_encoding_included(ut3.ut_junit_reporter(), 'UTF-8'); + reporters.check_xml_encoding_included(ut3_develop.ut_junit_reporter(), 'UTF-8'); end; procedure remove_test_package is diff --git a/test/ut3_user/reporters/test_proftab_coverage.pkb b/test/ut3_user/reporters/test_proftab_coverage.pkb index 74a33772e..c132517a7 100644 --- a/test/ut3_user/reporters/test_proftab_coverage.pkb +++ b/test/ut3_user/reporters/test_proftab_coverage.pkb @@ -3,18 +3,18 @@ create or replace package body test_proftab_coverage is procedure coverage_for_object is l_expected clob; l_actual clob; - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; begin --Arrange - l_expected := '%%'; + l_expected := '%%'; --Act select * bulk collect into l_results from table( - ut3.ut.run( - a_path => 'ut3.test_dummy_coverage', - a_reporter=> ut3.ut_coverage_sonar_reporter( ), - a_include_objects => ut3.ut_varchar2_list( 'ut3.dummy_coverage' ) + ut3_develop.ut.run( + a_path => 'ut3_develop.test_dummy_coverage', + a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), + a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.dummy_coverage' ) ) ); --Assert @@ -25,18 +25,18 @@ create or replace package body test_proftab_coverage is procedure coverage_for_object_no_owner is l_expected clob; l_actual clob; - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; begin --Arrange - l_expected := '%%'; + l_expected := '%%'; --Act select * bulk collect into l_results from table( - ut3.ut.run( - a_path => 'ut3.test_dummy_coverage', - a_reporter=> ut3.ut_coverage_sonar_reporter( ), - a_include_objects => ut3.ut_varchar2_list( 'dummy_coverage' ) + ut3_develop.ut.run( + a_path => 'ut3_develop.test_dummy_coverage', + a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), + a_include_objects => ut3_develop.ut_varchar2_list( 'dummy_coverage' ) ) ); --Assert @@ -47,19 +47,19 @@ create or replace package body test_proftab_coverage is procedure coverage_for_schema is l_expected clob; l_actual clob; - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; begin --Arrange - l_expected := ''; + l_expected := ''; l_expected := '%'||l_expected||'%'||l_expected||'%'; --Act select * bulk collect into l_results from table( - ut3.ut.run( - a_path => 'ut3.test_dummy_coverage', - a_reporter=> ut3.ut_coverage_sonar_reporter( ), - a_coverage_schemes => ut3.ut_varchar2_list( 'ut3' ) + ut3_develop.ut.run( + a_path => 'ut3_develop.test_dummy_coverage', + a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), + a_coverage_schemes => ut3_develop.ut_varchar2_list( 'ut3_develop' ) ) ); --Assert @@ -70,21 +70,21 @@ create or replace package body test_proftab_coverage is procedure coverage_for_file is l_expected clob; l_actual clob; - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_file_path varchar2(100); begin --Arrange - l_file_path := lower('test/ut3.dummy_coverage.pkb'); + l_file_path := lower('test/ut3_develop.dummy_coverage.pkb'); l_expected := '%%'; --Act select * bulk collect into l_results from table( - ut3.ut.run( - a_path => 'ut3.test_dummy_coverage', - a_reporter=> ut3.ut_coverage_sonar_reporter( ), - a_source_files => ut3.ut_varchar2_list( l_file_path ), - a_test_files => ut3.ut_varchar2_list( ) + ut3_develop.ut.run( + a_path => 'ut3_develop.test_dummy_coverage', + a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), + a_source_files => ut3_develop.ut_varchar2_list( l_file_path ), + a_test_files => ut3_develop.ut_varchar2_list( ) ) ); --Assert @@ -94,16 +94,16 @@ create or replace package body test_proftab_coverage is procedure coverage_tmp_data_refresh is l_actual clob; - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; begin --Arrange select * bulk collect into l_results from table( - ut3.ut.run( - a_path => 'ut3:coverage_testing', - a_reporter=> ut3.ut_coverage_sonar_reporter( ), - a_include_objects => ut3.ut_varchar2_list( 'ut3.dummy_coverage' ) + ut3_develop.ut.run( + a_path => 'ut3_develop:coverage_testing', + a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), + a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.dummy_coverage' ) ) ); ut3_tester_helper.coverage_helper.cleanup_dummy_coverage(); @@ -114,10 +114,10 @@ create or replace package body test_proftab_coverage is select * bulk collect into l_results from table( - ut3.ut.run( - a_path => 'ut3:coverage_testing', - a_reporter=> ut3.ut_coverage_sonar_reporter( ), - a_include_objects => ut3.ut_varchar2_list( 'ut3.dummy_coverage' ) + ut3_develop.ut.run( + a_path => 'ut3_develop:coverage_testing', + a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), + a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.dummy_coverage' ) ) ); diff --git a/test/ut3_user/reporters/test_realtime_reporter.pkb b/test/ut3_user/reporters/test_realtime_reporter.pkb index 155925f0f..53a268ff4 100644 --- a/test/ut3_user/reporters/test_realtime_reporter.pkb +++ b/test/ut3_user/reporters/test_realtime_reporter.pkb @@ -23,12 +23,12 @@ create or replace package body test_realtime_reporter as execute immediate q'[create or replace package body check_realtime_reporting1 is procedure test_1_ok is begin - ut3.ut.expect(1).to_equal(1); + ut3_develop.ut.expect(1).to_equal(1); end; procedure test_2_nok is begin - ut3.ut.expect(1).to_equal(2); + ut3_develop.ut.expect(1).to_equal(2); end; end;]'; @@ -49,13 +49,13 @@ create or replace package body test_realtime_reporter as execute immediate q'[create or replace package body check_realtime_reporting2 is procedure test_3_ok is begin - ut3.ut.expect(2).to_equal(2); + ut3_develop.ut.expect(2).to_equal(2); end; procedure test_4_nok is begin - ut3.ut.expect(2).to_equal(3); - ut3.ut.expect(2).to_equal(4); + ut3_develop.ut.expect(2).to_equal(3); + ut3_develop.ut.expect(2).to_equal(4); end; procedure test_5 is @@ -82,13 +82,13 @@ create or replace package body test_realtime_reporter as l_actual integer; begin execute immediate 'select 6 from non_existing_table' into l_actual; - ut3.ut.expect(6).to_equal(l_actual); + ut3_develop.ut.expect(6).to_equal(l_actual); end; procedure test_7_with_serveroutput is begin dbms_output.put_line('before test 7'); - ut3.ut.expect(7).to_equal(7); + ut3_develop.ut.expect(7).to_equal(7); dbms_output.put_line('after test 7'); end; @@ -114,18 +114,18 @@ create or replace package body test_realtime_reporter as procedure test_8_with_warning is begin commit; -- this will raise a warning - ut3.ut.expect(8).to_equal(8); + ut3_develop.ut.expect(8).to_equal(8); end; end;]'; <> declare - l_reporter ut3.ut_realtime_reporter := ut3.ut_realtime_reporter(); + l_reporter ut3_develop.ut_realtime_reporter := ut3_develop.ut_realtime_reporter(); begin -- produce - ut3.ut_runner.run( - a_paths => ut3.ut_varchar2_list(':realtime_reporting'), - a_reporters => ut3.ut_reporters(l_reporter) + ut3_develop.ut_runner.run( + a_paths => ut3_develop.ut_varchar2_list(':realtime_reporting'), + a_reporters => ut3_develop.ut_reporters(l_reporter) ); -- consume select ut3_tester_helper.test_event_object(item_type, xmltype(text)) @@ -337,7 +337,7 @@ create or replace package body test_realtime_reporter as procedure serveroutput_of_test is l_actual clob; - l_expected_list ut3.ut_varchar2_list; + l_expected_list ut3_develop.ut_varchar2_list; l_expected clob; begin select t.event_doc.extract('//event/test/serverOutput/text()').getstringval() @@ -354,7 +354,7 @@ create or replace package body test_realtime_reporter as procedure serveroutput_of_testsuite is l_actual clob; - l_expected_list ut3.ut_varchar2_list; + l_expected_list ut3_develop.ut_varchar2_list; l_expected clob; begin select t.event_doc.extract('//event/suite/serverOutput/text()').getstringval() @@ -372,7 +372,7 @@ create or replace package body test_realtime_reporter as procedure error_stack_of_test is l_actual clob; - l_expected_list ut3.ut_varchar2_list; + l_expected_list ut3_develop.ut_varchar2_list; l_expected clob; begin select t.event_doc.extract('//event/test/errorStack/text()').getstringval() @@ -389,7 +389,7 @@ create or replace package body test_realtime_reporter as procedure error_stack_of_testsuite is l_actual clob; - l_expected_list ut3.ut_varchar2_list; + l_expected_list ut3_develop.ut_varchar2_list; l_expected clob; begin select t.event_doc.extract('//event/suite/errorStack/text()').getstringval() @@ -406,7 +406,7 @@ create or replace package body test_realtime_reporter as procedure warnings_of_test is l_actual clob; - l_expected_list ut3.ut_varchar2_list; + l_expected_list ut3_develop.ut_varchar2_list; l_expected clob; begin select t.event_doc.extract('//event/test/warnings/text()').getstringval() @@ -422,7 +422,7 @@ create or replace package body test_realtime_reporter as procedure warnings_of_testsuite is l_actual clob; - l_expected_list ut3.ut_varchar2_list; + l_expected_list ut3_develop.ut_varchar2_list; l_expected clob; begin select t.event_doc.extract('//event/suite/warnings/text()').getstringval() @@ -440,11 +440,11 @@ create or replace package body test_realtime_reporter as end warnings_of_testsuite; procedure get_description is - l_reporter ut3.ut_realtime_reporter; + l_reporter ut3_develop.ut_realtime_reporter; l_actual varchar2(4000); l_expected varchar2(80) := '%SQL Developer%'; begin - l_reporter := ut3.ut_realtime_reporter(); + l_reporter := ut3_develop.ut_realtime_reporter(); l_actual := l_reporter.get_description(); ut.expect(l_actual).to_be_like(l_expected); end get_description; diff --git a/test/ut3_user/reporters/test_sonar_test_reporter.pkb b/test/ut3_user/reporters/test_sonar_test_reporter.pkb index 357eff0a2..5821b2071 100644 --- a/test/ut3_user/reporters/test_sonar_test_reporter.pkb +++ b/test/ut3_user/reporters/test_sonar_test_reporter.pkb @@ -1,7 +1,7 @@ create or replace package body test_sonar_test_reporter as procedure report_produces_expected_out is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_actual clob; l_expected varchar2(32767):=q'[ @@ -17,10 +17,10 @@ create or replace package body test_sonar_test_reporter as select * bulk collect into l_results from table( - ut3.ut.run( + ut3_develop.ut.run( 'test_reporters', - ut3.ut_sonar_test_reporter(), - a_test_file_mappings => ut3.ut_file_mapper.build_file_mappings( sys_context('USERENV', 'CURRENT_USER'), ut3.ut_varchar2_list('tests/helpers/test_reporters.pkb')) + ut3_develop.ut_sonar_test_reporter(), + a_test_file_mappings => ut3_develop.ut_file_mapper.build_file_mappings( sys_context('USERENV', 'CURRENT_USER'), ut3_develop.ut_varchar2_list('tests/helpers/test_reporters.pkb')) ) ); l_actual :=ut3_tester_helper.main_helper.table_to_clob(l_results); @@ -29,12 +29,12 @@ create or replace package body test_sonar_test_reporter as procedure check_encoding_included is begin - reporters.check_xml_encoding_included(ut3.ut_sonar_test_reporter(), 'UTF-8'); + reporters.check_xml_encoding_included(ut3_develop.ut_sonar_test_reporter(), 'UTF-8'); end; procedure check_failure_escaped is begin - reporters.check_xml_failure_escaped(ut3.ut_sonar_test_reporter()); + reporters.check_xml_failure_escaped(ut3_develop.ut_sonar_test_reporter()); end; end; diff --git a/test/ut3_user/reporters/test_teamcity_reporter.pkb b/test/ut3_user/reporters/test_teamcity_reporter.pkb index a5261d7f9..6d471b2b0 100644 --- a/test/ut3_user/reporters/test_teamcity_reporter.pkb +++ b/test/ut3_user/reporters/test_teamcity_reporter.pkb @@ -13,7 +13,7 @@ create or replace package body test_teamcity_reporter as execute immediate q'[create or replace package body check_escape_special_chars is procedure test_do_stuff is begin - ut3.ut.expect(' [ ' || chr(13) || chr(10) || ' ] ' ).to_be_null; + ut3_develop.ut.expect(' [ ' || chr(13) || chr(10) || ' ] ' ).to_be_null; end; end;]'; @@ -27,7 +27,7 @@ create or replace package body test_teamcity_reporter as execute immediate q'[create or replace package body check_trims_long_output is procedure long_output is begin - ut3.ut.expect(rpad('aVarchar',4000,'a')).to_be_null; + ut3_develop.ut.expect(rpad('aVarchar',4000,'a')).to_be_null; end; end;]'; @@ -35,7 +35,7 @@ create or replace package body test_teamcity_reporter as procedure report_produces_expected_out is - l_output_data ut3.ut_varchar2_list; + l_output_data ut3_develop.ut_varchar2_list; l_output clob; l_expected varchar2(32767); begin @@ -76,14 +76,14 @@ create or replace package body test_teamcity_reporter as --act select * bulk collect into l_output_data - from table(ut3.ut.run('test_reporters',ut3.ut_teamcity_reporter())); + from table(ut3_develop.ut.run('test_reporters',ut3_develop.ut_teamcity_reporter())); --assert ut.expect(ut3_tester_helper.main_helper.table_to_clob(l_output_data)).to_be_like(l_expected); end; procedure escape_special_chars is - l_output_data ut3.ut_varchar2_list; + l_output_data ut3_develop.ut_varchar2_list; l_output clob; l_expected varchar2(32767); begin @@ -95,14 +95,14 @@ create or replace package body test_teamcity_reporter as --act select * bulk collect into l_output_data - from table(ut3.ut.run('check_escape_special_chars',ut3.ut_teamcity_reporter())); + from table(ut3_develop.ut.run('check_escape_special_chars',ut3_develop.ut_teamcity_reporter())); --assert ut.expect(ut3_tester_helper.main_helper.table_to_clob(l_output_data)).to_be_like(l_expected); end; procedure trims_long_output is - l_output_data ut3.ut_varchar2_list; + l_output_data ut3_develop.ut_varchar2_list; l_output clob; l_expected varchar2(32767); begin @@ -114,7 +114,7 @@ create or replace package body test_teamcity_reporter as --act select * bulk collect into l_output_data - from table(ut3.ut.run('check_trims_long_output',ut3.ut_teamcity_reporter())); + from table(ut3_develop.ut.run('check_trims_long_output',ut3_develop.ut_teamcity_reporter())); --assert ut.expect(ut3_tester_helper.main_helper.table_to_clob(l_output_data)).to_be_like(l_expected); diff --git a/test/ut3_user/reporters/test_tfs_junit_reporter.pkb b/test/ut3_user/reporters/test_tfs_junit_reporter.pkb index 196a2ec08..7eb4f8ab6 100644 --- a/test/ut3_user/reporters/test_tfs_junit_reporter.pkb +++ b/test/ut3_user/reporters/test_tfs_junit_reporter.pkb @@ -13,8 +13,8 @@ create or replace package body test_tfs_junit_reporter as execute immediate q'[create or replace package body check_junit_reporting is procedure test_do_stuff is begin - ut3.ut.expect(1).to_equal(1); - ut3.ut.expect(1).to_equal(2); + ut3_develop.ut.expect(1).to_equal(1); + ut3_develop.ut.expect(1).to_equal(2); end; end;]'; @@ -31,7 +31,7 @@ create or replace package body test_tfs_junit_reporter as execute immediate q'[create or replace package body check_junit_rep_suitepath is procedure check_junit_rep_suitepath is begin - ut3.ut.expect(1).to_equal(1); + ut3_develop.ut.expect(1).to_equal(1); end; end;]'; @@ -53,13 +53,13 @@ create or replace package body test_tfs_junit_reporter as procedure escapes_special_chars is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_actual clob; begin --Act select * bulk collect into l_results - from table(ut3.ut.run('check_junit_reporting',ut3.ut_tfs_junit_reporter())); + from table(ut3_develop.ut.run('check_junit_reporting',ut3_develop.ut_tfs_junit_reporter())); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); --Assert ut.expect(l_actual).not_to_be_like('%%'); @@ -67,13 +67,13 @@ create or replace package body test_tfs_junit_reporter as end; procedure reports_only_failed_or_errored is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_actual clob; begin --Act select * bulk collect into l_results - from table(ut3.ut.run('check_junit_reporting',ut3.ut_tfs_junit_reporter())); + from table(ut3_develop.ut.run('check_junit_reporting',ut3_develop.ut_tfs_junit_reporter())); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); --Assert ut.expect(l_actual).not_to_be_like('%Actual: 1 (number) was expected to equal: 1 (number)%'); @@ -81,26 +81,26 @@ create or replace package body test_tfs_junit_reporter as end; procedure check_classname_suite is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_actual clob; begin --Act select * bulk collect into l_results - from table(ut3.ut.run('check_junit_reporting',ut3.ut_tfs_junit_reporter())); + from table(ut3_develop.ut.run('check_junit_reporting',ut3_develop.ut_tfs_junit_reporter())); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); --Assert ut.expect(l_actual).to_be_like('%testcase classname="check_junit_reporting"%'); end; procedure check_flatten_nested_suites is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_actual clob; begin --Act select * bulk collect into l_results - from table(ut3.ut.run('check_junit_flat_suitepath',ut3.ut_tfs_junit_reporter())); + from table(ut3_develop.ut.run('check_junit_flat_suitepath',ut3_develop.ut_tfs_junit_reporter())); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); --Assert ut.expect(l_actual).to_be_like(' @@ -113,7 +113,7 @@ create or replace package body test_tfs_junit_reporter as end; procedure check_nls_number_formatting is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_actual clob; l_nls_numeric_characters varchar2(30); begin @@ -125,7 +125,7 @@ create or replace package body test_tfs_junit_reporter as --Act select * bulk collect into l_results - from table(ut3.ut.run('check_junit_reporting', ut3.ut_tfs_junit_reporter())); + from table(ut3_develop.ut.run('check_junit_reporting', ut3_develop.ut_tfs_junit_reporter())); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); --Assert ut.expect(l_actual).to_match('time="[0-9]*\.[0-9]{3,6}"'); @@ -135,17 +135,17 @@ create or replace package body test_tfs_junit_reporter as procedure check_failure_escaped is begin - reporters.check_xml_failure_escaped(ut3.ut_tfs_junit_reporter()); + reporters.check_xml_failure_escaped(ut3_develop.ut_tfs_junit_reporter()); end; procedure check_classname_suitepath is - l_results ut3.ut_varchar2_list; + l_results ut3_develop.ut_varchar2_list; l_actual clob; begin --Act select * bulk collect into l_results - from table(ut3.ut.run('check_junit_rep_suitepath',ut3.ut_tfs_junit_reporter())); + from table(ut3_develop.ut.run('check_junit_rep_suitepath',ut3_develop.ut_tfs_junit_reporter())); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); --Assert ut.expect(l_actual).to_be_like('%testcase classname="core.check_junit_rep_suitepath"%'); @@ -160,7 +160,7 @@ create or replace package body test_tfs_junit_reporter as procedure check_encoding_included is begin - reporters.check_xml_encoding_included(ut3.ut_tfs_junit_reporter(), 'UTF-8'); + reporters.check_xml_encoding_included(ut3_develop.ut_tfs_junit_reporter(), 'UTF-8'); end; end; From 0d9eddc4debaa12154f259eeb76e165399d7f8b9 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 15 Mar 2020 22:43:56 +0000 Subject: [PATCH 0676/1096] Fixing examples run --- .travis/run_examples.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis/run_examples.sh b/.travis/run_examples.sh index 2f05b101b..6a9affde5 100755 --- a/.travis/run_examples.sh +++ b/.travis/run_examples.sh @@ -1,14 +1,17 @@ #!/bin/bash +cd "$(dirname "$(readlink -f "$0")")"/../examples + set -ev "$SQLCLI" $UT3_DEVELOP_SCHEMA/$UT3_DEVELOP_SCHEMA_PASSWORD@//$CONNECTION_STR < Date: Sun, 15 Mar 2020 22:51:20 +0000 Subject: [PATCH 0677/1096] Enabled echo and feedback for examples --- .travis/run_examples.sh | 4 ---- examples/RunAllExamples.sql | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.travis/run_examples.sh b/.travis/run_examples.sh index 6a9affde5..935037245 100755 --- a/.travis/run_examples.sh +++ b/.travis/run_examples.sh @@ -5,10 +5,6 @@ cd "$(dirname "$(readlink -f "$0")")"/../examples set -ev "$SQLCLI" $UT3_DEVELOP_SCHEMA/$UT3_DEVELOP_SCHEMA_PASSWORD@//$CONNECTION_STR < Date: Sun, 15 Mar 2020 22:58:38 +0000 Subject: [PATCH 0678/1096] Enabled echo and feedback for examples --- examples/RunDeveloperExamples.sql | 4 ++-- examples/RunUserExamples.sql | 4 ++-- examples/between_string/run_betwnstr_test_coverage.sql | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/RunDeveloperExamples.sql b/examples/RunDeveloperExamples.sql index d34914b58..eaf87c143 100644 --- a/examples/RunDeveloperExamples.sql +++ b/examples/RunDeveloperExamples.sql @@ -1,7 +1,7 @@ PROMPT Run developer examples Clear Screen -set echo off -set feedback off +set echo on +set feedback on set linesize 1000 exec ut_ansiconsole_helper.color_enabled(true); diff --git a/examples/RunUserExamples.sql b/examples/RunUserExamples.sql index 5323a07aa..702ccbce8 100644 --- a/examples/RunUserExamples.sql +++ b/examples/RunUserExamples.sql @@ -1,6 +1,6 @@ PROMPT Run user examples -set echo off -set feedback off +set echo on +set feedback on set linesize 1000 prompt Common examples from web diff --git a/examples/between_string/run_betwnstr_test_coverage.sql b/examples/between_string/run_betwnstr_test_coverage.sql index efbbb20fe..ab75872ce 100644 --- a/examples/between_string/run_betwnstr_test_coverage.sql +++ b/examples/between_string/run_betwnstr_test_coverage.sql @@ -11,7 +11,7 @@ set serveroutput on size unlimited format truncated set feedback off set termout off spool coverage.html -exec ut.run(user, ut_coverage_html_reporter(a_project_name=>'Demo of between string function tests', a_include_object_list=>ut_varchar2_list('ut3.betwnstr'))); +exec ut.run(user, ut_coverage_html_reporter(a_project_name=>'Demo of between string function tests', a_include_object_list=>ut_varchar2_list('betwnstr'))); spool off From eb5dad665e6b7a11fc44f42c24cb95a99edf1efb Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 15 Mar 2020 23:30:19 +0000 Subject: [PATCH 0679/1096] Changed the way session context is created. --- docs/userguide/annotations.md | 10 ++++++++-- source/core/session_context/ut_session_context.pkb | 4 ---- source/install.sql | 9 +-------- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 8f4acbd3a..355a03f7b 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -2064,9 +2064,15 @@ When processing the test suite `test_employee_pkg` defined in [Example of annota ## sys_context -It is possible to access information about currently running suite, test and befire/after procedure form within PLSQL procedure using SYS_CONTEXT. - +It is possible to access information about currently running suite. The information is available by calling `sys_context( 'UT3_INFO', attribute )`. +It can be accessed from any procecure invoked as part of utPLSQL test execution. + +**Note:** +> Context name is derived from schema name where utPLSQL is installed. +> The context name in below examples represents the default install schema -> `UT3` +> If you install utPLSQL into another schema the context name will be different. +> For example if utPLSQL is installed into `HR` schema, the context name will be `HR_INFO` Following attributes are populated: - Always: diff --git a/source/core/session_context/ut_session_context.pkb b/source/core/session_context/ut_session_context.pkb index 427d722da..2364d8513 100644 --- a/source/core/session_context/ut_session_context.pkb +++ b/source/core/session_context/ut_session_context.pkb @@ -15,11 +15,7 @@ create or replace package body ut_session_context as See the License for the specific language governing permissions and limitations under the License. */ - $IF $$SELF_TESTING_INSTALL $THEN gc_context_name constant varchar2(30) := ut_utils.ut_owner()||'_INFO'; - $ELSE - gc_context_name constant varchar2(30) := 'UT3_INFO'; - $END procedure set_context(a_name varchar2, a_value varchar2) is begin diff --git a/source/install.sql b/source/install.sql index 1f9913b0a..253b13fb2 100644 --- a/source/install.sql +++ b/source/install.sql @@ -34,14 +34,7 @@ alter session set current_schema = &&ut3_owner; @@check_sys_grants.sql "'CREATE TYPE','CREATE VIEW','CREATE SYNONYM','CREATE SEQUENCE','CREATE PROCEDURE','CREATE TABLE', 'CREATE CONTEXT'" --set define off -begin - $if $$self_testing_install $then - execute immediate 'create or replace context &&ut3_owner._info using &&ut3_owner..ut_session_context'; - $else - execute immediate 'create or replace context ut3_info using &&ut3_owner..ut_session_context'; - $end -end; -/ +create or replace context &&ut3_owner._info using &&ut3_owner..ut_session_context; --dbms_output buffer cache table @@install_component.sql 'core/ut_dbms_output_cache.sql' From 22f0ec7f791e995fb249812eb806ad0358ae4940 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 16 Mar 2020 00:11:40 +0000 Subject: [PATCH 0680/1096] Fixed failing tests - wrong context name --- source/create_synonyms.sql | 2 +- test/ut3_user/api/test_ut_run.pkb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/create_synonyms.sql b/source/create_synonyms.sql index 36dc465de..425ca57a6 100644 --- a/source/create_synonyms.sql +++ b/source/create_synonyms.sql @@ -36,7 +36,7 @@ set termout off spool params.sql.tmp select case - when upper('&&ut3_user') = 'PUBLIC' then q'[define action_type='public' + when upper('&&ut3_user') = 'PUBLIC' then q'[define action_type='or replace public' ]'||q'[define ut3_user='' ]'||q'[define grantee='PUBLIC']' else q'[define action_type='or replace' diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index 8aed1d36e..5142b1770 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -1120,7 +1120,7 @@ Failures:% begin select attribute||'='||value bulk collect into l_results - from session_context where namespace = 'UT3_INFO' + from session_context where namespace = 'UT3_DEVELOP_INFO' order by attribute; for i in 1 .. l_results.count loop dbms_output.put_line( upper(a_procedure_name) ||':'|| l_results(i) ); @@ -1393,7 +1393,7 @@ Failures:% begin open l_actual for select attribute||'='||value - from session_context where namespace = 'UT3_INFO'; + from session_context where namespace = 'UT3_DEVELOP_INFO'; ut.expect(l_actual).to_be_empty(); end; From 09b79bfc07e7fe679fc1986999f9ef8e5ee89581 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 17 Mar 2020 14:11:13 +0000 Subject: [PATCH 0681/1096] Removed copy of ojdbc jar files - no longed valid and no longer needed. --- development/refresh_sources.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/development/refresh_sources.sh b/development/refresh_sources.sh index 9474c3553..e051787a1 100755 --- a/development/refresh_sources.sh +++ b/development/refresh_sources.sh @@ -16,4 +16,3 @@ curl -Lk -o utPLSQL-cli.zip https://github.com/utPLSQL/utPLSQL-cli/releases/down # unzip utPLSQL-cli and remove the zip file unzip utPLSQL-cli.zip && chmod u+x utPLSQL-cli/bin/utplsql && rm utPLSQL-cli.zip -cp development/*.jar utPLSQL-cli/lib/ From 6e2a4b47f511e745bef7503e54b3443651ee35d6 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 17 Mar 2020 14:15:00 +0000 Subject: [PATCH 0682/1096] Updated documentation. No need to download OJDBC drivers anymore. --- CONTRIBUTING.md | 11 +++-------- docs/index.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/running-unit-tests.md | 1 - readme.md | 2 +- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6e4e8fe7c..895b53fb9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -43,10 +43,11 @@ Your local environment can be of any flavor (Unix/Linux/Windows/Mac). At minimum you need to have Oracle database 11.2 XE accessible for the project and SYS account access to install and develop utPLSQL. We use four different database accounts (users) for development process. -* `ut3_latest_release` - holds latest released version of utPLSQL. This schema holds the testing framework used for self-testing of utPLSQL development. -* `ut3` - holds the version of utPLSQL of your current branch. This is the schema you will be working on. +* `ut3` - holds latest released version of utPLSQL. This schema holds the testing framework used for self-testing of utPLSQL development. +* `ut3_develop` - holds the version of utPLSQL of your current branch. This is the schema you will be working on. * `ut3_tester` - holds unit test packages for development of utPLSQL. * `ut3$user#` - used for testing accessibility to schema names with special characters. +* `ut3_tester_helper` - elevated privileges user, used for creating and dropping objects in other schemas during test run. @@ -89,12 +90,6 @@ export CONNECTION_STR=127.0.0.1:1521/xe # Adjust the connect string export ORACLE_PWD=oracle # Adjust your local SYS password ``` -### Download Oracle JDBC drivers - -Download `ojdbc8-xxx.jar` and `orai18n-xxx.jar` from [Oracle](https://www.oracle.com/technetwork/database/features/jdbc/jdbc-ucp-122-3110062.html). -Place them in `development` directory of the project. - - ### Download utPLSQL release sources and utplsq-cli The below script is fetching latest release version from utPLSQL repository. Latest release version is used for self-testing. diff --git a/docs/index.md b/docs/index.md index f641c25ae..84cf62691 100644 --- a/docs/index.md +++ b/docs/index.md @@ -57,7 +57,7 @@ Amongst many benefits they provide ability to: * use many reporting formats simultaneously and save reports to files (publish) * map your project source files and test files into database objects -Just download the [latest client](https://github.com/utPLSQL/utPLSQL-cli/releases/latest), download Oracle jdbc driver you are good to go. +Download the [latest client](https://github.com/utPLSQL/utPLSQL-cli/releases/latest) and you are good to go. See [project readme](https://github.com/utPLSQL/utPLSQL-cli/blob/develop/README.md) for details. # Coverage diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 022fce376..2b4189f38 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -243,7 +243,7 @@ By default, utPLSQL will convert file paths into database objects using the foll > This is done to simplify the syntax of regular expressions. Regular expression will always use '/' as a directory separator on a file path regardless of whether you're on a Windows or Unix system. **Note** -> Below examples assume that you have downloaded latest version of [utPLSQL-cli](https://github.com/utPLSQL/utPLSQL-cli/releases), extracted it into your projects root directory (my_project) and placed ojdbc8.jar and orai18n.jar files in utPLSQL-cli\lib directory. +> Below examples assume that you have downloaded latest version of [utPLSQL-cli](https://github.com/utPLSQL/utPLSQL-cli/releases) and extracted it into your projects root directory (my_project). > The examples assume that you run the utPLSQL-cli from `my_project` directory. Windows: diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 490a21c1c..63182f9ef 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -31,7 +31,6 @@ curl -Lk "${DOWNLOAD_URL}" -o utplsql-cli.zip unzip -q utplsql-cli.zip ``` -Keep in mind that you will need to download/provide Oracle JDBC driver separately, as it is not part of utPLSQL-cli due to licensing restrictions. # ut.run diff --git a/readme.md b/readme.md index 0d66152d0..c3429a07e 100644 --- a/readme.md +++ b/readme.md @@ -85,7 +85,7 @@ Amongst many benefits it provides ability to: * use many reporting formats simultaneously and save reports to files (publish) * map your project source files and test files into database objects -Just download the [latest client](https://github.com/utPLSQL/utPLSQL-cli/releases/latest), download Oracle jdbc driver you are good to go. +Download the [latest client](https://github.com/utPLSQL/utPLSQL-cli/releases/latest) and are good to go. See [project readme](https://github.com/utPLSQL/utPLSQL-cli/blob/develop/README.md) for details. From ea4c9fb851f00de72a97d8282283e1d0f84a6193 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 17 Mar 2020 21:00:59 +0000 Subject: [PATCH 0683/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 2fe5655e8..b6522f218 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 576f861d1..1152fecd6 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index e868fecd0..56eaa0bb5 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 8df21fea3..8a71b3ae3 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 84cf62691..d4a394ab7 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index d6fc7bcd0..b049bc25e 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 355a03f7b..ea8ebce66 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 6046a2241..ae1023f06 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 2b4189f38..0279f2ff6 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index a10554155..43ae9dbea 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 111a95ff7..a0fc5ea6c 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 5dcf6c056..8e4d9f5ef 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 4b42710a9..279b02213 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) # Downloading latest version of utPLSQL diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index f4fcb065e..8efdcfaa9 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index f2a86cf5d..1e820dc79 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 63182f9ef..a81807f7a 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 5e33365af..2c49ebe75 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3357--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 6f92f7901..e917c1288 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -769,7 +769,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.11.3357-develop + * secion v3.1.11.3367-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 2ecbbc095..441202df8 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.11.3357-develop'; + gc_version constant varchar2(50) := 'v3.1.11.3367-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From b8c028766a6e87b700f68b11c6f62cca1daa8f94 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 25 Mar 2020 00:22:00 +0000 Subject: [PATCH 0684/1096] Resolves issue #1060 with suites not properly built with GERMAN (non-standard) NLS_SORT --- source/core/ut_suite_cache_manager.pkb | 19 +++--- test/ut3_tester/core/test_suite_manager.pks | 5 +- test/ut3_user/api/test_ut_run.pkb | 68 +++++++++++++++++++++ test/ut3_user/api/test_ut_run.pks | 7 +++ 4 files changed, 88 insertions(+), 11 deletions(-) diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index 7c4b1ee93..06c4c76a5 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -161,13 +161,16 @@ create or replace package body ut_suite_cache_manager is begin return case when a_random_seed is null then q'[ - replace( - --suite path until objects name (excluding contexts and test path) with trailing dot (full stop) - substr( c.obj.path, 1, instr( c.obj.path, lower(c.obj.object_name), -1 ) + length(c.obj.object_name) ), - '.', - --'.' replaced with chr(0) to assure that child elements come before parent when sorting in descending oder - chr(0) - ) desc nulls last, + nlssort( + replace( + /*suite path until objects name (excluding contexts and test path) with trailing dot (full stop)*/ + substr( c.obj.path, 1, instr( c.obj.path, lower(c.obj.object_name), -1 ) + length(c.obj.object_name) ), + '.', + /*'.' replaced with chr(0) to assure that child elements come before parent when sorting in descending order*/ + chr(0) + ), + 'nls_sort=binary' + )desc nulls last, case when c.obj.self_type = 'UT_SUITE_CONTEXT' then ( select max( x.line_no ) + 1 from ut_suite_cache x @@ -178,7 +181,7 @@ create or replace package body ut_suite_cache_manager is else c.obj.line_no end, - --assures that child contexts come before parent contexts + /*assures that child contexts come before parent contexts*/ regexp_count(c.obj.path,'\.') desc, :a_random_seed]' else diff --git a/test/ut3_tester/core/test_suite_manager.pks b/test/ut3_tester/core/test_suite_manager.pks index ed318b890..90b589b9e 100644 --- a/test/ut3_tester/core/test_suite_manager.pks +++ b/test/ut3_tester/core/test_suite_manager.pks @@ -3,9 +3,6 @@ create or replace package test_suite_manager is --%suite(suite_manager) --%suitepath(utplsql.ut3_tester.core) - procedure create_dummy_long_test_package; - - procedure drop_dummy_long_test_package; --%beforeall procedure compile_dummy_packages; @@ -170,6 +167,8 @@ create or replace package test_suite_manager is --%beforetest(create_dummy_long_test_package) --%aftertest(drop_dummy_long_test_package) procedure add_new_long_test_package; + procedure create_dummy_long_test_package; + procedure drop_dummy_long_test_package; end test_suite_manager; / diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index 5142b1770..e3af7c5ad 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -780,6 +780,74 @@ Failures:% execute immediate 'drop package '||gc_owner||'.'||gc_owner; end; + procedure create_suites_with_path is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package ut_abc is + -- %suite + -- %suitepath(main.abc) + + -- %test + procedure ut_test_01; + end ut_abc;]'; + + execute immediate q'[create or replace package body ut_abc + is + procedure ut_test_01 as begin ut.expect(true).to_be_true(); end; + end;]'; + + execute immediate q'[create or replace package ut_abc_def + is + -- %suite + -- %suitepath(main.abc_def) + + -- %test + procedure ut_test_01; + end ut_abc_def;]'; + + execute immediate q'[create or replace package body ut_abc_def + is + procedure ut_test_01 as begin ut.expect(true).to_be_true(); end; + end;]'; + + end; + + procedure drop_suites_with_path is + pragma autonomous_transaction; + begin + execute immediate q'[drop package ut_abc]'; + execute immediate q'[drop package ut_abc_def]'; + end; + + procedure run_suite_with_nls_sort is + L_current_sort varchar2(2000); + l_results ut3_develop.ut_varchar2_list; + l_expected clob; + begin + --Arrange + select value + into l_current_sort + from nls_session_parameters where parameter = 'NLS_SORT'; + + execute immediate 'alter session set nls_sort=GERMAN'; + + --Act + select * + bulk collect into l_results + from table ( ut3_develop.ut.run( gc_owner||':main' ) ); + --Assert + l_expected := q'[main% + abc_def% + ut_abc_def% + ut_test_01% + abc% + ut_abc% + ut_test_01%]'; + ut.expect(ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( l_expected ); + + execute immediate 'alter session set nls_sort='||l_current_sort; + end; + procedure run_with_random_order is l_random_results ut3_develop.ut_varchar2_list; l_results ut3_develop.ut_varchar2_list; diff --git a/test/ut3_user/api/test_ut_run.pks b/test/ut3_user/api/test_ut_run.pks index ac2e50e25..753af79da 100644 --- a/test/ut3_user/api/test_ut_run.pks +++ b/test/ut3_user/api/test_ut_run.pks @@ -155,6 +155,13 @@ create or replace package test_ut_run is procedure create_schema_name_package; procedure drop_schema_name_package; + --%test(Runs properly formed suite hierarchy regardless of NLS_SORT settings - Issue #1060) + --%beforetest(create_suites_with_path) + --%aftertest(drop_suites_with_path) + procedure run_suite_with_nls_sort; + procedure create_suites_with_path; + procedure drop_suites_with_path; + --%endcontext --%context(random_order) From fa4c6b7ccaf4b55671ac7d3ea2e7f73b342d39a5 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 25 Mar 2020 21:21:56 +0000 Subject: [PATCH 0685/1096] Restructuring utPSLQL install guide. Resolves #1062 --- docs/userguide/install.md | 70 ++++++++++++++++++++++++--------------- 1 file changed, 43 insertions(+), 27 deletions(-) diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 279b02213..54d326160 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,10 +1,35 @@ ![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) -# Downloading latest version of utPLSQL +# Supported database versions + +utPLSQL is continuously tested against following versions of Oracle databases +* 11g R2 +* 12c +* 12c R2 +* 18c +* 19c + +We do our best to assure fill compatibility with supported versions of Oracle databases [See](http://www.oracle.com/us/support/library/lifetime-support-technology-069183.pdf#page=6) + +# Downloading utPLSQL + +## Manual download + +- Go to GitHub releases page for utPLSQL `https://github.com/utPLSQL/utPLSQL/releases` +- Download and one of files + - utPLSQL.tar.gz + - utPLSQL.zip + +The files have identical content but different compression (tar / zip ) so choose whichever you preref depending on your platform (Win/Mac/Unix/Linux) + -To download latest version of utPLSQL from github on both Unix/Linux as well as Windows machines use the below snippets. +## Scripted download of latest utPLSQL version -## Unix/Linux +The below snippets can be used to download latest version of utPLSQL from github releases. + +Installation instructions are outlined in next sections of this document. + +### Unix/Linux ```bash #!/bin/bash @@ -22,7 +47,7 @@ You may download with a one-liner if that is more convenient. curl -LOk $(curl --silent https://api.github.com/repos/utPLSQL/utPLSQL/releases/latest | awk '/browser_download_url/ { print $2 }' | grep ".zip\"" | sed 's/"//g') ``` -## Windows +### Windows To run the script on windows you will need [PowerShell 3.0](https://blogs.technet.microsoft.com/heyscriptingguy/2013/06/02/weekend-scripter-install-powershell-3-0-on-windows-7/) or above. You will also need .NET 4.0 Framework or above. @@ -51,29 +76,6 @@ foreach ($i in $urlList) { } ``` -# Checking environment and utPLSQL version - -To check the framework version execute the following query: -```sql -select substr(ut.version(),1,60) as ut_version from dual; -``` - -Additionally you may retrieve more information about your environment by executing the following query: -```sql -select - xmlserialize( content xmltype(ut_run_info()) as clob indent size = 2 ) - from dual; -``` - -# Supported database versions - -The utPLSQL may be installed on any supported version of Oracle Database [see](http://www.oracle.com/us/support/library/lifetime-support-technology-069183.pdf#page=6) -* 11g R2 -* 12c -* 12c R2 -* 18c -* 19c - # Headless installation utPLSQL can be installed with DDL trigger, to enable tracking of DDL changes to your unit test packages. @@ -235,6 +237,20 @@ The following tools that support the SQL*Plus commands can be used to run the in - [SQLcl](http://www.oracle.com/technetwork/developer-tools/sqlcl/overview/index.html) - [Oracle SQL Developer](http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/index.html) +# Checking environment and utPLSQL version + +To check the framework version execute the following query: +```sql +select substr(ut.version(),1,60) as ut_version from dual; +``` + +Additionally you may retrieve more information about your environment by executing the following query: +```sql +select + xmlserialize( content xmltype(ut_run_info()) as clob indent size = 2 ) + from dual; +``` + # Additional requirements In order to use the Code Coverage functionality of utPLSQL, users executing the tests must have the CREATE privilege on the PLSQL code that the coverage is gathered on. From 62ef235a6559993ccd5896e6fff6ff3a60eb5785 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 26 Mar 2020 21:32:00 +0000 Subject: [PATCH 0686/1096] Fixed some typos --- docs/userguide/install.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 54d326160..2da512eaa 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -9,25 +9,26 @@ utPLSQL is continuously tested against following versions of Oracle databases * 18c * 19c -We do our best to assure fill compatibility with supported versions of Oracle databases [See](http://www.oracle.com/us/support/library/lifetime-support-technology-069183.pdf#page=6) +We do our best to assure full compatibility with supported versions of Oracle databases [See](http://www.oracle.com/us/support/library/lifetime-support-technology-069183.pdf#page=6) # Downloading utPLSQL ## Manual download -- Go to GitHub releases page for utPLSQL `https://github.com/utPLSQL/utPLSQL/releases` -- Download and one of files +- Go to GitHub releases page for utPLSQL [`https://github.com/utPLSQL/utPLSQL/releases`](https://github.com/utPLSQL/utPLSQL/releases) +- Choose the version to download - latest is always greatest +- Download one of files - utPLSQL.tar.gz - utPLSQL.zip -The files have identical content but different compression (tar / zip ) so choose whichever you preref depending on your platform (Win/Mac/Unix/Linux) +The files have identical content but use different compression (tar / zip ) so choose whichever you prefer depending on your platform (Win/Mac/Unix/Linux). ## Scripted download of latest utPLSQL version The below snippets can be used to download latest version of utPLSQL from github releases. -Installation instructions are outlined in next sections of this document. +After downloading follow the installation instructions in next sections of this document. ### Unix/Linux From 72a680988398e1952b5d1ea774be493473ac1e07 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Fri, 27 Mar 2020 22:55:04 +0000 Subject: [PATCH 0687/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index b6522f218..a2fd028f0 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 1152fecd6..863f71804 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 56eaa0bb5..f823ebea9 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 8a71b3ae3..98c7bfd68 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index d4a394ab7..f3f6be050 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index b049bc25e..3dc0487a8 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index ea8ebce66..648a5c06f 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index ae1023f06..3dae9b813 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 0279f2ff6..463a115d2 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 43ae9dbea..e81b24ead 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index a0fc5ea6c..b9f30abef 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 8e4d9f5ef..498cf2338 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 2da512eaa..c9506c6af 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 8efdcfaa9..f43a63677 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 1e820dc79..afe851f2e 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index a81807f7a..d35940acc 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 2c49ebe75..8d2b01bd8 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3367--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index e917c1288..95ada6e13 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -769,7 +769,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.11.3367-develop + * secion v3.1.11.3375-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 441202df8..6558cc8d7 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.11.3367-develop'; + gc_version constant varchar2(50) := 'v3.1.11.3375-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 83ee513ed61574f8e94cb3b61746441266ceb17e Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 29 Mar 2020 17:56:46 +0100 Subject: [PATCH 0688/1096] Added explicit requirements Resolves #1064 updated invite link for slack as the herokuapp invite solution doesn't since quite some time and Slack has it's own invite links now. --- .github/ISSUE_TEMPLATE/feature_request.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/userguide/install.md | 27 ++++++++++++++++++++++- readme.md | 6 ++--- 5 files changed, 32 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index c54bff550..4cd72f51c 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -23,4 +23,4 @@ Add any other context or screenshots about the feature request here. > Please do not create issues for generic SQL or PL/SQL questions. There are other forums and communities to help you with those. See [ASKTom](https://asktom.oracle.com) for example. **Want to discuss** -If you want to discuss your issue, join [our SLACK chat](http://utplsql-slack-invite.herokuapp.com/). +If you want to discuss your issue, join [our SLACK chat](https://join.slack.com/t/utplsql/shared_invite/zt-d6zor80g-WWqAhbLWioJZUtLYeXetzA). diff --git a/docs/about/project-details.md b/docs/about/project-details.md index f823ebea9..fdc541be9 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -4,7 +4,7 @@ [![chat](http://img.shields.io/badge/GitHub_Project-Active-blue.svg)](https://github.com/utPLSQL/utPLSQL) [![license](http://img.shields.io/badge/license-apache%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0) -[![chat](http://img.shields.io/badge/chat-slack-blue.svg)](http://utplsql-slack-invite.herokuapp.com/) +[![chat](http://img.shields.io/badge/chat-slack-blue.svg)](https://join.slack.com/t/utplsql/shared_invite/zt-d6zor80g-WWqAhbLWioJZUtLYeXetzA) [![twitter](https://img.shields.io/twitter/follow/utPLSQL.svg?style=social&label=Follow)](https://twitter.com/utPLSQL) diff --git a/docs/about/support.md b/docs/about/support.md index 98c7bfd68..237f22c3b 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -3,4 +3,4 @@ # How to get support - Feel free to post questions, bugs or issues in the [issues area of GitHub](https://github.com/utPLSQL/utPLSQL/issues) -- Join developers at the [utPLSQL team](http://utplsql-slack-invite.herokuapp.com) on [Slack](https://slack.com/) +- [Join](https://join.slack.com/t/utplsql/shared_invite/zt-d6zor80g-WWqAhbLWioJZUtLYeXetzA) developers team on utPLSQL [Slack](https://utplsql.slack.com/) diff --git a/docs/userguide/install.md b/docs/userguide/install.md index c9506c6af..61550cf85 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -11,6 +11,31 @@ utPLSQL is continuously tested against following versions of Oracle databases We do our best to assure full compatibility with supported versions of Oracle databases [See](http://www.oracle.com/us/support/library/lifetime-support-technology-069183.pdf#page=6) +# Requirements + +## Licensed features required + +utPLSQL doesn't require any extra licensed features of Oracle database. It can be installed on any Standard Edition Oracle Database. + +In fact, it even supports Oracle 11g XE which is a free Oracle Database version with minimal features and storage limits. + +## Storage requirements + +utPLSQL will use tablespace for the following: +- storage of annotation cache +- storage of suite cache +- storage of profiler results +- storage for staging utPLSQL reports outputs + + +utPLSQL purges the staging storage for reports while fetching reports to screen / saving reports to files. + +Suite and annotation cache storage requirements are minimal and unless you have hundreds of thousands of tests, you'll probably not even notice the space used. + +Profiler results may require regular purging to assure low space consumption. +utPLSQl does not purge profiler tables as those tables can can be shared with other tools. + + # Downloading utPLSQL ## Manual download @@ -143,7 +168,7 @@ sqlplus sys/sys_pass@db as sysdba @install_headless_with_trigger.sql utp3 my_ver # Recommended Schema It is highly recommended to install utPLSQL in it's own schema. You are free to choose any name for this schema. -Installing uPLSQL into shared schema is really not recommended as you loose isolation of framework. +Installing uPLSQL into a shared schema is really not recommended as you loose isolation of framework. If the installing user and utPLSQL owner is one and the same, the user must have the following Oracle system permissions before you can proceed with the installation. diff --git a/readme.md b/readme.md index c3429a07e..715b87302 100644 --- a/readme.md +++ b/readme.md @@ -5,7 +5,7 @@ [![license](https://img.shields.io/github/license/utPLSQL/utPLSQL.svg)](https://www.apache.org/licenses/LICENSE-2.0) [![latest-release](https://img.shields.io/github/release/utPLSQL/utPLSQL.svg)](https://github.com/utPLSQL/utPLSQL/releases) [![Download statistics](https://img.shields.io/github/downloads/utPLSQL/utPLSQL/total.svg)](http://gra.caldis.me/?url=https://github.com/utPLSQL/utPLSQL) -[![chat](http://img.shields.io/badge/slack-team--chat-blue.svg)](http://utplsql-slack-invite.herokuapp.com/) +[![chat](http://img.shields.io/badge/slack-team--chat-blue.svg)](https://join.slack.com/t/utplsql/shared_invite/zt-d6zor80g-WWqAhbLWioJZUtLYeXetzA) [![twitter](https://img.shields.io/twitter/follow/utPLSQL.svg?style=social&label=Follow)](https://twitter.com/utPLSQL) [![build](https://img.shields.io/travis/utPLSQL/utPLSQL/master.svg?label=master%20branch)](https://travis-ci.org/utPLSQL/utPLSQL) @@ -163,7 +163,7 @@ We welcome new developers to join our community and contribute to the utPLSQL pr If you are interested in helping please read our [guide to contributing](CONTRIBUTING.md) The best place to start is to read the documentation and get familiar with the existing code base. A [slack chat](https://utplsql.slack.com/) is the place to go if you want to talk with team members. -To sign up to the chat use [this link](http://utplsql-slack-invite.herokuapp.com/) +To sign up to the chat use [this link](https://join.slack.com/t/utplsql/shared_invite/zt-d6zor80g-WWqAhbLWioJZUtLYeXetzA). ---------- @@ -183,7 +183,7 @@ __Project Directories__ ---------- -If you have a great feature in mind, that you would like to see in utPLSQL v3 please create an [issue on GitHub](https://github.com/utPLSQL/utPLSQL/issues) or discuss it with us in the [Slack chat rooms](http://utplsql-slack-invite.herokuapp.com/). +If you have a great feature in mind, that you would like to see in utPLSQL v3 please create an [issue on GitHub](https://github.com/utPLSQL/utPLSQL/issues) or discuss it with us in the [slack chat rooms](https://utplsql.slack.com/). Use [invite link](https://join.slack.com/t/utplsql/shared_invite/zt-d6zor80g-WWqAhbLWioJZUtLYeXetzA) to join the chat. # Version 2 to Version 3 Comparison From c5d53fbdd36fc08aff977c015ee7ab6330fe88b7 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 29 Mar 2020 20:34:32 +0100 Subject: [PATCH 0689/1096] Added explicit 11g release 2 requirement --- docs/userguide/install.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 61550cf85..e2fae2944 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -13,6 +13,8 @@ We do our best to assure full compatibility with supported versions of Oracle da # Requirements +utPLSQL will run on any Oracle Database version 11g relase 2 or above. + ## Licensed features required utPLSQL doesn't require any extra licensed features of Oracle database. It can be installed on any Standard Edition Oracle Database. From 789ad61af1ff2509ed737ae87428bda506a1d1b4 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Wed, 1 Apr 2020 12:09:46 +0000 Subject: [PATCH 0690/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index a2fd028f0..dc1b0c36e 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 863f71804..48355af2e 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index fdc541be9..964b7a743 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 237f22c3b..27b9d0798 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index f3f6be050..73a257690 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 3dc0487a8..b46032a15 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 648a5c06f..c573f8858 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 3dae9b813..0ac1a14c8 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 463a115d2..b0fcab539 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index e81b24ead..a7603da59 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index b9f30abef..5924be80f 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 498cf2338..c528766ae 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index e2fae2944..a65943e81 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index f43a63677..32506007c 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index afe851f2e..6eb5cf4d0 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index d35940acc..243026021 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 8d2b01bd8..7328451ef 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3375--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 95ada6e13..ba98763e0 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -769,7 +769,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.11.3375-develop + * secion v3.1.11.3380-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 6558cc8d7..6ed6c4ac9 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.11.3375-develop'; + gc_version constant varchar2(50) := 'v3.1.11.3380-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 48abf1a83c36ca44c2f395eceea5473ac99a0221 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Mon, 1 Jun 2020 21:58:35 +0100 Subject: [PATCH 0691/1096] Initial checkin --- source/expectations/matchers/ut_equal.tpb | 7 +++++++ source/expectations/matchers/ut_equal.tps | 3 ++- source/expectations/matchers/ut_matcher.tps | 7 +++---- .../expectations/matchers/ut_matcher_base.tpb | 20 +++++++++++++++++++ .../expectations/matchers/ut_matcher_base.tps | 4 ++++ source/expectations/ut_expectation.tpb | 10 +++++----- source/expectations/ut_expectation.tps | 8 ++++---- .../expectations/ut_expectation_compound.tpb | 5 +++-- .../expectations/ut_expectation_compound.tps | 4 ++-- 9 files changed, 50 insertions(+), 18 deletions(-) create mode 100644 source/expectations/matchers/ut_matcher_base.tpb create mode 100644 source/expectations/matchers/ut_matcher_base.tps diff --git a/source/expectations/matchers/ut_equal.tpb b/source/expectations/matchers/ut_equal.tpb index afa2148f3..4f6fee119 100644 --- a/source/expectations/matchers/ut_equal.tpb +++ b/source/expectations/matchers/ut_equal.tpb @@ -172,6 +172,13 @@ create or replace type body ut_equal as return l_result; end; + member procedure include(self in ut_equal, a_items varchar2) is + --l_result ut_equal := self; + begin + null; + --l_result.expectation.to_(l_result ); + end; + member function exclude(a_items varchar2) return ut_equal is l_result ut_equal := self; begin diff --git a/source/expectations/matchers/ut_equal.tps b/source/expectations/matchers/ut_equal.tps index 1f42324d7..3a2ad6061 100644 --- a/source/expectations/matchers/ut_equal.tps +++ b/source/expectations/matchers/ut_equal.tps @@ -43,6 +43,7 @@ create or replace type ut_equal force under ut_comparison_matcher( constructor function ut_equal(self in out nocopy ut_equal, a_expected dsinterval_unconstrained, a_nulls_are_equal boolean := null) return self as result, constructor function ut_equal(self in out nocopy ut_equal, a_expected json_element_t, a_nulls_are_equal boolean := null) return self as result, member function include(a_items varchar2) return ut_equal, + member procedure include(self in ut_equal, a_items varchar2), member function include(a_items ut_varchar2_list) return ut_equal, member function exclude(a_items varchar2) return ut_equal, member function exclude(a_items ut_varchar2_list) return ut_equal, @@ -56,4 +57,4 @@ create or replace type ut_equal force under ut_comparison_matcher( member function uc return ut_equal ) not final -/ + diff --git a/source/expectations/matchers/ut_matcher.tps b/source/expectations/matchers/ut_matcher.tps index 34e1742df..b37c06741 100644 --- a/source/expectations/matchers/ut_matcher.tps +++ b/source/expectations/matchers/ut_matcher.tps @@ -1,4 +1,4 @@ -create or replace type ut_matcher authid current_user as object( +create or replace type ut_matcher force under ut_matcher_base( /* utPLSQL - Version 3 Copyright 2016 - 2019 utPLSQL Project @@ -15,10 +15,9 @@ create or replace type ut_matcher authid current_user as object( See the License for the specific language governing permissions and limitations under the License. */ - self_type varchar2(250), is_errored integer, is_negated_flag number(1,0), - + expectation ut_expectation, /* function: run_matcher @@ -41,4 +40,4 @@ create or replace type ut_matcher authid current_user as object( member function negated return ut_matcher, member function is_negated return boolean ) not final not instantiable -/ + diff --git a/source/expectations/matchers/ut_matcher_base.tpb b/source/expectations/matchers/ut_matcher_base.tpb new file mode 100644 index 000000000..bf3d9a187 --- /dev/null +++ b/source/expectations/matchers/ut_matcher_base.tpb @@ -0,0 +1,20 @@ +create or replace type body ut_matcher_base as + /* + utPLSQL - Version 3 + Copyright 2016 - 2019 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + +end; +/ diff --git a/source/expectations/matchers/ut_matcher_base.tps b/source/expectations/matchers/ut_matcher_base.tps new file mode 100644 index 000000000..7c18d35d7 --- /dev/null +++ b/source/expectations/matchers/ut_matcher_base.tps @@ -0,0 +1,4 @@ +create or replace type ut_matcher_base force authid current_user as object( + self_type varchar2(250) +) +not final not instantiable \ No newline at end of file diff --git a/source/expectations/ut_expectation.tpb b/source/expectations/ut_expectation.tpb index d8ed1f79a..b18e2f7b0 100644 --- a/source/expectations/ut_expectation.tpb +++ b/source/expectations/ut_expectation.tpb @@ -15,12 +15,12 @@ create or replace type body ut_expectation as See the License for the specific language governing permissions and limitations under the License. */ - member procedure to_(self in ut_expectation, a_matcher ut_matcher) is + member procedure to_(self in ut_expectation, a_matcher ut_matcher_base) is l_expectation_result boolean; - l_matcher ut_matcher := a_matcher; + l_matcher ut_matcher := treat(a_matcher as ut_matcher); l_message varchar2(32767); begin - if a_matcher.is_negated() then + if l_matcher.is_negated() then self.not_to( a_matcher ); else l_expectation_result := l_matcher.run_matcher( self.actual_data ); @@ -30,9 +30,9 @@ create or replace type body ut_expectation as end if; end; - member procedure not_to(self in ut_expectation, a_matcher ut_matcher) is + member procedure not_to(self in ut_expectation, a_matcher ut_matcher_base) is l_expectation_result boolean; - l_matcher ut_matcher := a_matcher; + l_matcher ut_matcher := treat(a_matcher as ut_matcher); l_message varchar2(32767); begin l_expectation_result := coalesce( l_matcher.run_matcher_negated( self.actual_data ), false ); diff --git a/source/expectations/ut_expectation.tps b/source/expectations/ut_expectation.tps index 37fefd085..ffaa73981 100644 --- a/source/expectations/ut_expectation.tps +++ b/source/expectations/ut_expectation.tps @@ -1,4 +1,4 @@ -create or replace type ut_expectation authid current_user as object( +create or replace type ut_expectation force authid current_user as object( /* utPLSQL - Version 3 Copyright 2016 - 2019 utPLSQL Project @@ -19,8 +19,8 @@ create or replace type ut_expectation authid current_user as object( description varchar2(4000 char), --base matcher executors - member procedure to_(self in ut_expectation, a_matcher ut_matcher), - member procedure not_to(self in ut_expectation, a_matcher ut_matcher), + member procedure to_(self in ut_expectation, a_matcher ut_matcher_base), + member procedure not_to(self in ut_expectation, a_matcher ut_matcher_base), --shortcuts member procedure to_be_null(self in ut_expectation), @@ -172,4 +172,4 @@ create or replace type ut_expectation authid current_user as object( ) not final -/ + diff --git a/source/expectations/ut_expectation_compound.tpb b/source/expectations/ut_expectation_compound.tpb index 5e7268bd9..8fc67a5c9 100644 --- a/source/expectations/ut_expectation_compound.tpb +++ b/source/expectations/ut_expectation_compound.tpb @@ -48,11 +48,12 @@ create or replace type body ut_expectation_compound as return l_result; end; - member function to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_compound is + member function to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_equal is l_result ut_expectation_compound := self; begin l_result.matcher := ut_equal(a_expected, a_nulls_are_equal); - return l_result; + l_result.matcher.expectation := l_result; + return treat(l_result.matcher as ut_equal); end; member function not_to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_compound is diff --git a/source/expectations/ut_expectation_compound.tps b/source/expectations/ut_expectation_compound.tps index fc413e3fd..ea5f9d30a 100644 --- a/source/expectations/ut_expectation_compound.tps +++ b/source/expectations/ut_expectation_compound.tps @@ -24,7 +24,7 @@ create or replace type ut_expectation_compound force under ut_expectation( member function to_equal(a_expected anydata, a_nulls_are_equal boolean := null) return ut_expectation_compound, member function not_to_equal(a_expected anydata, a_nulls_are_equal boolean := null) return ut_expectation_compound, - member function to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_compound, + member function to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_equal, member function not_to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_compound, member function to_contain(a_expected sys_refcursor) return ut_expectation_compound, member function not_to_contain(a_expected sys_refcursor) return ut_expectation_compound, @@ -51,4 +51,4 @@ create or replace type ut_expectation_compound force under ut_expectation( member function uc return ut_expectation_compound, member procedure uc(self in ut_expectation_compound) ) -/ + From 70419127716a0a5e8ad4bad7847f0d16a79af4d7 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Tue, 2 Jun 2020 19:46:33 +0100 Subject: [PATCH 0692/1096] added expectation --- source/expectations/matchers/ut_equal.tpb | 5 ++--- source/expectations/matchers/ut_equal.tps | 4 ++-- source/expectations/matchers/ut_matcher.tps | 4 ++-- .../expectations/matchers/ut_matcher_base.tpb | 20 ------------------- .../expectations/matchers/ut_matcher_base.tps | 3 ++- source/expectations/ut_expectation.tps | 4 ++-- .../expectations/ut_expectation_compound.tpb | 10 +++++----- .../expectations/ut_expectation_compound.tps | 4 ++-- source/install.sql | 3 ++- 9 files changed, 19 insertions(+), 38 deletions(-) delete mode 100644 source/expectations/matchers/ut_matcher_base.tpb diff --git a/source/expectations/matchers/ut_equal.tpb b/source/expectations/matchers/ut_equal.tpb index 4f6fee119..1ac449cf6 100644 --- a/source/expectations/matchers/ut_equal.tpb +++ b/source/expectations/matchers/ut_equal.tpb @@ -173,10 +173,9 @@ create or replace type body ut_equal as end; member procedure include(self in ut_equal, a_items varchar2) is - --l_result ut_equal := self; + l_result ut_equal := self; begin - null; - --l_result.expectation.to_(l_result ); + l_result.expectation.to_(l_result ); end; member function exclude(a_items varchar2) return ut_equal is diff --git a/source/expectations/matchers/ut_equal.tps b/source/expectations/matchers/ut_equal.tps index 3a2ad6061..52f116715 100644 --- a/source/expectations/matchers/ut_equal.tps +++ b/source/expectations/matchers/ut_equal.tps @@ -1,4 +1,4 @@ -create or replace type ut_equal force under ut_comparison_matcher( +create or replace type ut_equal under ut_comparison_matcher( /* utPLSQL - Version 3 Copyright 2016 - 2019 utPLSQL Project @@ -57,4 +57,4 @@ create or replace type ut_equal force under ut_comparison_matcher( member function uc return ut_equal ) not final - +/ diff --git a/source/expectations/matchers/ut_matcher.tps b/source/expectations/matchers/ut_matcher.tps index b37c06741..16af94a1a 100644 --- a/source/expectations/matchers/ut_matcher.tps +++ b/source/expectations/matchers/ut_matcher.tps @@ -1,4 +1,4 @@ -create or replace type ut_matcher force under ut_matcher_base( +create or replace type ut_matcher under ut_matcher_base( /* utPLSQL - Version 3 Copyright 2016 - 2019 utPLSQL Project @@ -40,4 +40,4 @@ create or replace type ut_matcher force under ut_matcher_base( member function negated return ut_matcher, member function is_negated return boolean ) not final not instantiable - +/ diff --git a/source/expectations/matchers/ut_matcher_base.tpb b/source/expectations/matchers/ut_matcher_base.tpb deleted file mode 100644 index bf3d9a187..000000000 --- a/source/expectations/matchers/ut_matcher_base.tpb +++ /dev/null @@ -1,20 +0,0 @@ -create or replace type body ut_matcher_base as - /* - utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project - - Licensed under the Apache License, Version 2.0 (the "License"): - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - -end; -/ diff --git a/source/expectations/matchers/ut_matcher_base.tps b/source/expectations/matchers/ut_matcher_base.tps index 7c18d35d7..ec37267a0 100644 --- a/source/expectations/matchers/ut_matcher_base.tps +++ b/source/expectations/matchers/ut_matcher_base.tps @@ -1,4 +1,5 @@ create or replace type ut_matcher_base force authid current_user as object( self_type varchar2(250) ) -not final not instantiable \ No newline at end of file +not final not instantiable +/ \ No newline at end of file diff --git a/source/expectations/ut_expectation.tps b/source/expectations/ut_expectation.tps index ffaa73981..95aeb9fce 100644 --- a/source/expectations/ut_expectation.tps +++ b/source/expectations/ut_expectation.tps @@ -1,4 +1,4 @@ -create or replace type ut_expectation force authid current_user as object( +create or replace type ut_expectation authid current_user as object( /* utPLSQL - Version 3 Copyright 2016 - 2019 utPLSQL Project @@ -172,4 +172,4 @@ create or replace type ut_expectation force authid current_user as object( ) not final - +/ diff --git a/source/expectations/ut_expectation_compound.tpb b/source/expectations/ut_expectation_compound.tpb index 8fc67a5c9..674b468b2 100644 --- a/source/expectations/ut_expectation_compound.tpb +++ b/source/expectations/ut_expectation_compound.tpb @@ -48,12 +48,12 @@ create or replace type body ut_expectation_compound as return l_result; end; - member function to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_equal is - l_result ut_expectation_compound := self; + member function to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_equal is + l_result ut_matcher; begin - l_result.matcher := ut_equal(a_expected, a_nulls_are_equal); - l_result.matcher.expectation := l_result; - return treat(l_result.matcher as ut_equal); + l_result := ut_equal(a_expected, a_nulls_are_equal); + l_result.expectation := self; + return treat(l_result as ut_equal); end; member function not_to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_compound is diff --git a/source/expectations/ut_expectation_compound.tps b/source/expectations/ut_expectation_compound.tps index ea5f9d30a..4b2347859 100644 --- a/source/expectations/ut_expectation_compound.tps +++ b/source/expectations/ut_expectation_compound.tps @@ -1,4 +1,4 @@ -create or replace type ut_expectation_compound force under ut_expectation( +create or replace type ut_expectation_compound under ut_expectation( /* utPLSQL - Version 3 Copyright 2016 - 2019 utPLSQL Project @@ -51,4 +51,4 @@ create or replace type ut_expectation_compound force under ut_expectation( member function uc return ut_expectation_compound, member procedure uc(self in ut_expectation_compound) ) - +/ diff --git a/source/install.sql b/source/install.sql index 253b13fb2..45a67f924 100644 --- a/source/install.sql +++ b/source/install.sql @@ -236,6 +236,8 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/data_values/ut_data_value_xmltype.tps' @@install_component.sql 'expectations/data_values/ut_compound_data_helper.pks' @@install_component.sql 'expectations/data_values/ut_data_value_json.tps' +@@install_component.sql 'expectations/ut_expectation.tps' +@@install_component.sql 'expectations/matchers/ut_matcher_base.tps' @@install_component.sql 'expectations/matchers/ut_matcher.tps' @@install_component.sql 'expectations/matchers/ut_comparison_matcher.tps' @@install_component.sql 'expectations/matchers/ut_be_false.tps' @@ -253,7 +255,6 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/matchers/ut_be_between.tps' @@install_component.sql 'expectations/matchers/ut_be_empty.tps' @@install_component.sql 'expectations/matchers/ut_match.tps' -@@install_component.sql 'expectations/ut_expectation.tps' @@install_component.sql 'expectations/data_values/ut_json_leaf.tpb' @@install_component.sql 'expectations/data_values/ut_json_tree_details.tpb' @@install_component.sql 'expectations/data_values/ut_cursor_column.tpb' From 13d86b6d74e7aee203625e719640edb04e80551b Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Tue, 2 Jun 2020 21:11:00 +0100 Subject: [PATCH 0693/1096] Adding more methods --- source/expectations/matchers/ut_equal.tpb | 54 +++++++- source/expectations/matchers/ut_equal.tps | 14 +- .../expectations/ut_expectation_compound.tpb | 129 ++---------------- .../expectations/ut_expectation_compound.tps | 29 +--- 4 files changed, 83 insertions(+), 143 deletions(-) diff --git a/source/expectations/matchers/ut_equal.tpb b/source/expectations/matchers/ut_equal.tpb index 1ac449cf6..5eb256c22 100644 --- a/source/expectations/matchers/ut_equal.tpb +++ b/source/expectations/matchers/ut_equal.tpb @@ -173,8 +173,14 @@ create or replace type body ut_equal as end; member procedure include(self in ut_equal, a_items varchar2) is + begin + include( ut_varchar2_list( a_items ) ); + end; + + member procedure include(self in ut_equal, a_items ut_varchar2_list) is l_result ut_equal := self; begin + l_result.options.include.add_items(a_items); l_result.expectation.to_(l_result ); end; @@ -192,6 +198,18 @@ create or replace type body ut_equal as return l_result; end; + member procedure exclude(self in ut_equal, a_items varchar2) is + begin + exclude( ut_varchar2_list( a_items ) ); + end; + + member procedure exclude(self in ut_equal, a_items ut_varchar2_list) is + l_result ut_equal := self; + begin + l_result.options.exclude.add_items(a_items); + l_result.expectation.to_(l_result ); + end; + member function unordered return ut_equal is l_result ut_equal := self; begin @@ -199,6 +217,13 @@ create or replace type body ut_equal as return l_result; end; + member procedure unordered(self in ut_equal) is + l_result ut_equal := self; + begin + l_result.options.unordered(); + l_result.expectation.to_(l_result ); + end; + member function join_by(a_columns varchar2) return ut_equal is l_result ut_equal := self; begin @@ -215,18 +240,43 @@ create or replace type body ut_equal as return l_result; end; - member function uc return ut_equal is + member procedure join_by(self in ut_equal, a_columns varchar2) is begin - return unordered_columns; + join_by( ut_varchar2_list( a_columns ) ); end; + member procedure join_by(self in ut_equal, a_columns ut_varchar2_list) is + l_result ut_equal := self; + begin + l_result.options.unordered(); + l_result.options.join_by.add_items(a_columns); + l_result.expectation.to_(l_result ); + end; + member function unordered_columns return ut_equal is l_result ut_equal := self; begin l_result.options.unordered_columns(); return l_result; end; + + member procedure unordered_columns(self in ut_equal) is + l_result ut_equal := self; + begin + l_result.options.unordered_columns(); + l_result.expectation.to_(l_result ); + end; + + member function uc return ut_equal is + begin + return unordered_columns; + end; + member procedure uc(self in ut_equal) is + begin + unordered_columns; + end; + overriding member function run_matcher(self in out nocopy ut_equal, a_actual ut_data_value) return boolean is l_result boolean; begin diff --git a/source/expectations/matchers/ut_equal.tps b/source/expectations/matchers/ut_equal.tps index 52f116715..8701fca94 100644 --- a/source/expectations/matchers/ut_equal.tps +++ b/source/expectations/matchers/ut_equal.tps @@ -1,4 +1,4 @@ -create or replace type ut_equal under ut_comparison_matcher( +create or replace type ut_equal force under ut_comparison_matcher( /* utPLSQL - Version 3 Copyright 2016 - 2019 utPLSQL Project @@ -43,18 +43,26 @@ create or replace type ut_equal under ut_comparison_matcher( constructor function ut_equal(self in out nocopy ut_equal, a_expected dsinterval_unconstrained, a_nulls_are_equal boolean := null) return self as result, constructor function ut_equal(self in out nocopy ut_equal, a_expected json_element_t, a_nulls_are_equal boolean := null) return self as result, member function include(a_items varchar2) return ut_equal, + member function include(a_items ut_varchar2_list) return ut_equal, member procedure include(self in ut_equal, a_items varchar2), - member function include(a_items ut_varchar2_list) return ut_equal, + member procedure include(self in ut_equal, a_items ut_varchar2_list), member function exclude(a_items varchar2) return ut_equal, member function exclude(a_items ut_varchar2_list) return ut_equal, + member procedure exclude(self in ut_equal, a_items varchar2), + member procedure exclude(self in ut_equal, a_items ut_varchar2_list), member function unordered return ut_equal, + member procedure unordered(self in ut_equal), member function join_by(a_columns varchar2) return ut_equal, member function join_by(a_columns ut_varchar2_list) return ut_equal, + member procedure join_by(self in ut_equal, a_columns varchar2), + member procedure join_by(self in ut_equal, a_columns ut_varchar2_list), overriding member function run_matcher(self in out nocopy ut_equal, a_actual ut_data_value) return boolean, overriding member function failure_message(a_actual ut_data_value) return varchar2, overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2, member function unordered_columns return ut_equal, - member function uc return ut_equal + member procedure unordered_columns(self in ut_equal), + member function uc return ut_equal, + member procedure uc(self in ut_equal) ) not final / diff --git a/source/expectations/ut_expectation_compound.tpb b/source/expectations/ut_expectation_compound.tpb index 674b468b2..365272b21 100644 --- a/source/expectations/ut_expectation_compound.tpb +++ b/source/expectations/ut_expectation_compound.tpb @@ -34,18 +34,20 @@ create or replace type body ut_expectation_compound as end; - member function to_equal(a_expected anydata, a_nulls_are_equal boolean := null) return ut_expectation_compound is - l_result ut_expectation_compound := self; + member function to_equal(a_expected anydata, a_nulls_are_equal boolean := null) return ut_equal is + l_result ut_matcher; begin - l_result.matcher := ut_equal(a_expected, a_nulls_are_equal); - return l_result; + l_result := ut_equal(a_expected, a_nulls_are_equal); + l_result.expectation := self; + return treat(l_result as ut_equal); end; - member function not_to_equal(a_expected anydata, a_nulls_are_equal boolean := null) return ut_expectation_compound is - l_result ut_expectation_compound := self; + member function not_to_equal(a_expected anydata, a_nulls_are_equal boolean := null) return ut_equal is + l_result ut_matcher; begin - l_result.matcher := ut_equal(a_expected, a_nulls_are_equal).negated(); - return l_result; + l_result := ut_equal(a_expected, a_nulls_are_equal).negated(); + l_result.expectation := self; + return treat(l_result as ut_equal); end; member function to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_equal is @@ -56,11 +58,12 @@ create or replace type body ut_expectation_compound as return treat(l_result as ut_equal); end; - member function not_to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_compound is - l_result ut_expectation_compound := self; + member function not_to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_equal is + l_result ut_matcher; begin - l_result.matcher := ut_equal(a_expected, a_nulls_are_equal).negated(); - return l_result; + l_result := ut_equal(a_expected, a_nulls_are_equal).negated(); + l_result.expectation := self; + return treat(l_result as ut_equal); end; member function to_contain(a_expected sys_refcursor) return ut_expectation_compound is @@ -91,107 +94,5 @@ create or replace type body ut_expectation_compound as return l_result; end; - member function include(a_items varchar2) return ut_expectation_compound is - begin - return include( ut_varchar2_list( a_items ) ); - end; - - member function include(a_items ut_varchar2_list) return ut_expectation_compound is - l_result ut_expectation_compound := self; - begin - l_result.matcher := treat(l_result.matcher as ut_equal).include(a_items); - return l_result; - end; - - member procedure include(self in ut_expectation_compound, a_items varchar2) is - begin - include( ut_varchar2_list( a_items ) ); - end; - - member procedure include(self in ut_expectation_compound, a_items ut_varchar2_list) is - begin - self.to_( treat(matcher as ut_equal).include(a_items) ); - end; - - member function exclude(a_items varchar2) return ut_expectation_compound is - begin - return exclude( ut_varchar2_list( a_items ) ); - end; - - member function exclude(a_items ut_varchar2_list) return ut_expectation_compound is - l_result ut_expectation_compound := self; - begin - l_result.matcher := treat(l_result.matcher as ut_equal).exclude(a_items); - return l_result; - end; - - member procedure exclude(self in ut_expectation_compound, a_items varchar2) is - begin - exclude( ut_varchar2_list( a_items ) ); - end; - - member procedure exclude(self in ut_expectation_compound, a_items ut_varchar2_list) is - begin - self.to_( treat(matcher as ut_equal).exclude(a_items) ); - end; - - member function unordered return ut_expectation_compound is - l_result ut_expectation_compound := self; - begin - l_result.matcher := treat(l_result.matcher as ut_equal).unordered(); - return l_result; - end; - - member procedure unordered(self in ut_expectation_compound) is - begin - self.to_( treat(matcher as ut_equal).unordered() ); - end; - - member function join_by(a_columns varchar2) return ut_expectation_compound is - begin - return join_by( ut_varchar2_list( a_columns ) ); - end; - - member function join_by(a_columns ut_varchar2_list) return ut_expectation_compound is - l_result ut_expectation_compound; - begin - l_result := self; - l_result.matcher := treat(l_result.matcher as ut_equal).join_by(a_columns); - return l_result; - end; - - member procedure join_by(self in ut_expectation_compound, a_columns varchar2) is - begin - join_by( ut_varchar2_list( a_columns ) ); - end; - - member procedure join_by(self in ut_expectation_compound, a_columns ut_varchar2_list) is - begin - self.to_( treat(matcher as ut_equal).join_by(a_columns) ); - end; - - member function unordered_columns return ut_expectation_compound is - l_result ut_expectation_compound; - begin - l_result := self; - l_result.matcher := treat(l_result.matcher as ut_equal).unordered_columns; - return l_result; - end; - - member procedure unordered_columns(self in ut_expectation_compound) is - begin - self.to_( treat(matcher as ut_equal).unordered_columns ); - end; - - member function uc return ut_expectation_compound is - begin - return unordered_columns; - end; - - member procedure uc(self in ut_expectation_compound) is - begin - unordered_columns; - end; - end; / diff --git a/source/expectations/ut_expectation_compound.tps b/source/expectations/ut_expectation_compound.tps index 4b2347859..3aae56670 100644 --- a/source/expectations/ut_expectation_compound.tps +++ b/source/expectations/ut_expectation_compound.tps @@ -22,33 +22,14 @@ create or replace type ut_expectation_compound under ut_expectation( member procedure to_have_count(self in ut_expectation_compound, a_expected integer), member procedure not_to_have_count(self in ut_expectation_compound, a_expected integer), - member function to_equal(a_expected anydata, a_nulls_are_equal boolean := null) return ut_expectation_compound, - member function not_to_equal(a_expected anydata, a_nulls_are_equal boolean := null) return ut_expectation_compound, + member function to_equal(a_expected anydata, a_nulls_are_equal boolean := null) return ut_equal, + member function not_to_equal(a_expected anydata, a_nulls_are_equal boolean := null) return ut_equal, member function to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_equal, - member function not_to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_compound, + member function not_to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_equal, member function to_contain(a_expected sys_refcursor) return ut_expectation_compound, member function not_to_contain(a_expected sys_refcursor) return ut_expectation_compound, member function to_contain(a_expected anydata) return ut_expectation_compound, - member function not_to_contain(a_expected anydata) return ut_expectation_compound, - - member function include(a_items varchar2) return ut_expectation_compound, - member function include(a_items ut_varchar2_list) return ut_expectation_compound, - member procedure include(self in ut_expectation_compound, a_items varchar2), - member procedure include(self in ut_expectation_compound, a_items ut_varchar2_list), - member function exclude(a_items varchar2) return ut_expectation_compound, - member function exclude(a_items ut_varchar2_list) return ut_expectation_compound, - member procedure exclude(self in ut_expectation_compound, a_items varchar2), - member procedure exclude(self in ut_expectation_compound, a_items ut_varchar2_list), - member function unordered return ut_expectation_compound, - member procedure unordered(self in ut_expectation_compound), - member function join_by(a_columns varchar2) return ut_expectation_compound, - member function join_by(a_columns ut_varchar2_list) return ut_expectation_compound, - member procedure join_by(self in ut_expectation_compound, a_columns varchar2), - member procedure join_by(self in ut_expectation_compound, a_columns ut_varchar2_list), - - member function unordered_columns return ut_expectation_compound, - member procedure unordered_columns(self in ut_expectation_compound), - member function uc return ut_expectation_compound, - member procedure uc(self in ut_expectation_compound) + member function not_to_contain(a_expected anydata) return ut_expectation_compound ) / + From caeeb30ea4fef1eeeea2283e5c76b717eb9809e3 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Tue, 2 Jun 2020 21:30:05 +0100 Subject: [PATCH 0694/1096] Adding contain and not contain --- .../expectations/ut_expectation_compound.tpb | 38 ++++++++++--------- .../expectations/ut_expectation_compound.tps | 8 ++-- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/source/expectations/ut_expectation_compound.tpb b/source/expectations/ut_expectation_compound.tpb index 365272b21..7043ec053 100644 --- a/source/expectations/ut_expectation_compound.tpb +++ b/source/expectations/ut_expectation_compound.tpb @@ -66,32 +66,36 @@ create or replace type body ut_expectation_compound as return treat(l_result as ut_equal); end; - member function to_contain(a_expected sys_refcursor) return ut_expectation_compound is - l_result ut_expectation_compound := self; + member function to_contain(a_expected sys_refcursor) return ut_equal is + l_result ut_matcher; begin - l_result.matcher := ut_contain(a_expected); - return l_result; + l_result := ut_contain(a_expected); + l_result.expectation := self; + return treat(l_result as ut_equal); end; - member function not_to_contain(a_expected sys_refcursor) return ut_expectation_compound is - l_result ut_expectation_compound := self; + member function not_to_contain(a_expected sys_refcursor) return ut_equal is + l_result ut_matcher; begin - l_result.matcher := ut_contain(a_expected).negated(); - return l_result; + l_result := ut_contain(a_expected).negated(); + l_result.expectation := self; + return treat(l_result as ut_equal); end; - - member function to_contain(a_expected anydata) return ut_expectation_compound is - l_result ut_expectation_compound := self; + + member function to_contain(a_expected anydata) return ut_equal is + l_result ut_matcher; begin - l_result.matcher := ut_contain(a_expected); - return l_result; + l_result := ut_contain(a_expected); + l_result.expectation := self; + return treat(l_result as ut_equal); end; - member function not_to_contain(a_expected anydata) return ut_expectation_compound is - l_result ut_expectation_compound := self; + member function not_to_contain(a_expected anydata) return ut_equal is + l_result ut_matcher; begin - l_result.matcher := ut_contain(a_expected).negated(); - return l_result; + l_result := ut_contain(a_expected).negated(); + l_result.expectation := self; + return treat(l_result as ut_equal); end; end; diff --git a/source/expectations/ut_expectation_compound.tps b/source/expectations/ut_expectation_compound.tps index 3aae56670..c840aaf35 100644 --- a/source/expectations/ut_expectation_compound.tps +++ b/source/expectations/ut_expectation_compound.tps @@ -26,10 +26,10 @@ create or replace type ut_expectation_compound under ut_expectation( member function not_to_equal(a_expected anydata, a_nulls_are_equal boolean := null) return ut_equal, member function to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_equal, member function not_to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_equal, - member function to_contain(a_expected sys_refcursor) return ut_expectation_compound, - member function not_to_contain(a_expected sys_refcursor) return ut_expectation_compound, - member function to_contain(a_expected anydata) return ut_expectation_compound, - member function not_to_contain(a_expected anydata) return ut_expectation_compound + member function to_contain(a_expected sys_refcursor) return ut_equal, + member function not_to_contain(a_expected sys_refcursor) return ut_equal, + member function to_contain(a_expected anydata) return ut_equal, + member function not_to_contain(a_expected anydata) return ut_equal ) / From 0dd978f6c11eece36eb226e518610f5925deef01 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Thu, 4 Jun 2020 18:35:51 +0200 Subject: [PATCH 0695/1096] grant privileges to debug via UT3_USER --- .travis/install.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.travis/install.sh b/.travis/install.sh index 99c88c79b..b914dd4d3 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -113,6 +113,20 @@ PROMPT Creating $UT3_USER - minimal privileges user for API testing create user $UT3_USER identified by "$UT3_USER_PASSWORD" default tablespace $UT3_TABLESPACE quota unlimited on $UT3_TABLESPACE; grant create session, create procedure, create type, create table to $UT3_USER; +PROMPT Grants for starting a debugging session from $UT3_USER +grant debug connect session to $UT3_USER; +begin + dbms_network_acl_admin.append_host_ace ( + host =>'*', + ace => sys.xs\$ace_type( + privilege_list => sys.xs\$name_list('JDWP') , + principal_name => '$UT3_USER', + principal_type => sys.xs_acl.ptype_db + ) + ); +end; +/ +grant debug any procedure to $UT3_USER; -------------------------------------------------------------------------------- PROMPT Creating $UT3_TESTER_HELPER - provides functions to allow min grant test user setup tests. From 9ea6ab408dc66df31372dc4bb19eb0fd19366c52 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Thu, 4 Jun 2020 18:36:35 +0200 Subject: [PATCH 0696/1096] add test case to reproduce bug #1073 --- .../reporters/test_realtime_reporter.pkb | 46 +++++++++++++++++++ .../reporters/test_realtime_reporter.pks | 3 ++ 2 files changed, 49 insertions(+) diff --git a/test/ut3_user/reporters/test_realtime_reporter.pkb b/test/ut3_user/reporters/test_realtime_reporter.pkb index 53a268ff4..ad354133b 100644 --- a/test/ut3_user/reporters/test_realtime_reporter.pkb +++ b/test/ut3_user/reporters/test_realtime_reporter.pkb @@ -118,6 +118,22 @@ create or replace package body test_realtime_reporter as end; end;]'; + execute immediate q'[create or replace package check_realtime_reporting5 is + --%suite + --%suitepath(realtime_reporting_bufix) + + --%test(test XML with nested CDATA) + procedure test_nested_cdata; + end;]'; + + execute immediate q'[create or replace package body check_realtime_reporting5 is + procedure test_nested_cdata is + begin + dbms_output.put_line('nested cdata block: , to be handled.'); + ut.expect(1).to_equal(1); + end; + end;]'; + <> declare l_reporter ut3_develop.ut_realtime_reporter := ut3_develop.ut_realtime_reporter(); @@ -448,6 +464,35 @@ create or replace package body test_realtime_reporter as l_actual := l_reporter.get_description(); ut.expect(l_actual).to_be_like(l_expected); end get_description; + + procedure nested_cdata_output is + l_text varchar2(4000); + l_xml xmltype; + -- + function produce_and_consume return varchar2 is + pragma autonomous_transaction; + l_reporter ut3_develop.ut_realtime_reporter := ut3_develop.ut_realtime_reporter(); + l_text varchar2(4000); + begin + -- produce + ut3_develop.ut_runner.run( + a_paths => ut3_develop.ut_varchar2_list(':realtime_reporting_bufix'), + a_reporters => ut3_develop.ut_reporters(l_reporter) + ); + -- consume + select text + into l_text + from table(l_reporter.get_lines()) + where item_type = 'post-test'; + return l_text; + end produce_and_consume; + begin + l_text := produce_and_consume(); + ut.expect(l_text).to_be_not_null(); + -- this fails, if l_text is not a valid XML + l_xml := xmltype(l_text); + ut.expect(l_xml is not null).to_be_true(); + end; procedure remove_test_suites is pragma autonomous_transaction; @@ -456,6 +501,7 @@ create or replace package body test_realtime_reporter as execute immediate 'drop package check_realtime_reporting2'; execute immediate 'drop package check_realtime_reporting3'; execute immediate 'drop package check_realtime_reporting4'; + execute immediate 'drop package check_realtime_reporting5'; end remove_test_suites; end test_realtime_reporter; diff --git a/test/ut3_user/reporters/test_realtime_reporter.pks b/test/ut3_user/reporters/test_realtime_reporter.pks index e57ccab21..453824ca5 100644 --- a/test/ut3_user/reporters/test_realtime_reporter.pks +++ b/test/ut3_user/reporters/test_realtime_reporter.pks @@ -54,6 +54,9 @@ create or replace package test_realtime_reporter as --%test(Provide a description of the reporter explaining the use for SQL Developer) procedure get_description; + --%test(Escape nested CDATA sections in test output) + procedure nested_cdata_output; + --%afterall procedure remove_test_suites; From bfe94cd6abe68ee50d54f51e2ee624f1ba1c939c Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Thu, 4 Jun 2020 18:37:09 +0200 Subject: [PATCH 0697/1096] handle nested CDATA sections to fix bug #1073 --- source/reporters/ut_realtime_reporter.tpb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/reporters/ut_realtime_reporter.tpb b/source/reporters/ut_realtime_reporter.tpb index 64eb343e5..367b2c51a 100644 --- a/source/reporters/ut_realtime_reporter.tpb +++ b/source/reporters/ut_realtime_reporter.tpb @@ -252,7 +252,7 @@ create or replace type body ut_realtime_reporter is ) is begin if a_content is not null then - self.print_xml_fragment('<' || a_name || '>'); + self.print_xml_fragment('<' || a_name || '>'); end if; end print_cdata_node; From 6631930da1a70d26f2f828b6c061292f577f39ad Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Thu, 4 Jun 2020 20:17:41 +0200 Subject: [PATCH 0698/1096] support Oracle DB 11.2, add ace only on 12c and higher --- .travis/install.sh | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index b914dd4d3..225b6ff52 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -115,18 +115,23 @@ grant create session, create procedure, create type, create table to $UT3_USER; PROMPT Grants for starting a debugging session from $UT3_USER grant debug connect session to $UT3_USER; +grant debug any procedure to $UT3_USER; begin - dbms_network_acl_admin.append_host_ace ( - host =>'*', - ace => sys.xs\$ace_type( - privilege_list => sys.xs\$name_list('JDWP') , - principal_name => '$UT3_USER', - principal_type => sys.xs_acl.ptype_db - ) - ); + \$if dbms_db_version.version <= 11 \$then + null; -- no addition action necessary + \$else + -- necessary on 12c or higher + dbms_network_acl_admin.append_host_ace ( + host =>'*', + ace => sys.xs\$ace_type( + privilege_list => sys.xs\$name_list('JDWP') , + principal_name => '$UT3_USER', + principal_type => sys.xs_acl.ptype_db + ) + ); + \$end end; / -grant debug any procedure to $UT3_USER; -------------------------------------------------------------------------------- PROMPT Creating $UT3_TESTER_HELPER - provides functions to allow min grant test user setup tests. From c4651518b5b896a263b41663411293c87f2f76a6 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Thu, 4 Jun 2020 19:07:42 +0000 Subject: [PATCH 0699/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index dc1b0c36e..aca93a957 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 48355af2e..4fcdda511 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 964b7a743..884fc6c07 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 27b9d0798..63f8e851d 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 73a257690..e0cf1b0c9 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index b46032a15..7ed3dce21 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index c573f8858..cf72be22d 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 0ac1a14c8..0fbcb4851 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index b0fcab539..3b968ccc4 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index a7603da59..3487ffac6 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 5924be80f..2a1044454 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index c528766ae..bc9894cee 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index a65943e81..385db7257 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 32506007c..66b52496f 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 6eb5cf4d0..24dabecf8 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 243026021..7bbbe2df1 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 7328451ef..af711ae4f 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3380--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index ba98763e0..6bceb5261 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -769,7 +769,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.11.3380-develop + * secion v3.1.11.3392-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 6ed6c4ac9..ec8781391 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.11.3380-develop'; + gc_version constant varchar2(50) := 'v3.1.11.3392-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 8ff4f6bbf847bab652a1628aa68abc140655d7fe Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sat, 6 Jun 2020 01:16:30 +0100 Subject: [PATCH 0700/1096] Adding code and tests,. --- source/core/ut_utils.pkb | 25 ++++ source/core/ut_utils.pks | 9 +- .../data_values/ut_data_value_dsinterval.tpb | 2 +- .../data_values/ut_data_value_yminterval.tpb | 2 +- source/expectations/matchers/ut_be_within.tpb | 104 +++++++++++++ source/expectations/matchers/ut_be_within.tps | 38 +++++ source/expectations/matchers/ut_matcher.tps | 2 +- source/expectations/ut_expectation.tpb | 57 +++---- source/expectations/ut_expectation.tps | 16 +- source/expectations/ut_expectation_base.tpb | 44 ++++++ source/expectations/ut_expectation_base.tps | 25 ++++ .../expectations/ut_expectation_compound.tps | 1 + source/install.sql | 6 +- test/install_ut3_user_tests.sql | 2 + .../ut3_tester_helper/expectations_helper.pkb | 26 +++- .../ut3_tester_helper/expectations_helper.pks | 10 ++ .../expectations/binary/test_to_be_within.pkb | 141 ++++++++++++++++++ .../expectations/binary/test_to_be_within.pks | 31 ++++ 18 files changed, 501 insertions(+), 40 deletions(-) create mode 100644 source/expectations/matchers/ut_be_within.tpb create mode 100644 source/expectations/matchers/ut_be_within.tps create mode 100644 source/expectations/ut_expectation_base.tpb create mode 100644 source/expectations/ut_expectation_base.tps create mode 100644 test/ut3_user/expectations/binary/test_to_be_within.pkb create mode 100644 test/ut3_user/expectations/binary/test_to_be_within.pks diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index ba98763e0..8e96870d9 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -877,5 +877,30 @@ create or replace package body ut_utils is end; end; + function interval_to_text(a_interval dsinterval_unconstrained) return varchar2 is + l_day varchar2(100) := extract(day from a_interval); + l_hour varchar2(100) := extract(hour from a_interval); + l_minute varchar2(100) := extract(minute from a_interval); + l_second varchar2(100) := extract(second from a_interval); + l_result varchar2(32767); + begin + l_result := case when l_day > 0 then l_day ||' day' else null end; + l_result := l_result || case when l_hour > 0 then ' '|| l_hour ||' hour' else null end; + l_result := l_result || case when l_minute> 0 then ' '||l_minute ||' minute' else null end; + l_result := l_result || case when l_second > 0 then ' '||l_second ||' second' else null end; + return trim(leading ' ' from l_result); + end; + + function interval_to_text(a_interval yminterval_unconstrained) return varchar2 is + l_year varchar2(4) := extract(year from a_interval); + l_month varchar2(20) := extract(month from a_interval); + l_result varchar2(32767); + begin + l_result := case when l_year > 0 then l_year ||' year' else null end; + l_result := l_result || case when l_month > 0 then ' '||l_month ||' month' else null end; + return trim(leading ' ' from l_result); + end; + + end ut_utils; / diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 6ed6c4ac9..750b17a77 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -434,6 +434,13 @@ create or replace package ut_utils authid definer is * If null value passed returns null */ function qualified_sql_name(a_name varchar2) return varchar2; - + + /* + * Return value of interval in plain english + */ + function interval_to_text(a_interval dsinterval_unconstrained) return varchar2; + + function interval_to_text(a_interval yminterval_unconstrained) return varchar2; + end ut_utils; / diff --git a/source/expectations/data_values/ut_data_value_dsinterval.tpb b/source/expectations/data_values/ut_data_value_dsinterval.tpb index ff9d5fe1e..e55b2fb17 100644 --- a/source/expectations/data_values/ut_data_value_dsinterval.tpb +++ b/source/expectations/data_values/ut_data_value_dsinterval.tpb @@ -31,7 +31,7 @@ create or replace type body ut_data_value_dsinterval as overriding member function to_string return varchar2 is begin - return ut_utils.to_string(self.data_value); + return ut_utils.interval_to_text(self.data_value); end; overriding member function compare_implementation(a_other ut_data_value) return integer is diff --git a/source/expectations/data_values/ut_data_value_yminterval.tpb b/source/expectations/data_values/ut_data_value_yminterval.tpb index 6d6a05b4a..225406756 100644 --- a/source/expectations/data_values/ut_data_value_yminterval.tpb +++ b/source/expectations/data_values/ut_data_value_yminterval.tpb @@ -31,7 +31,7 @@ create or replace type body ut_data_value_yminterval as overriding member function to_string return varchar2 is begin - return ut_utils.to_string(self.data_value); + return ut_utils.interval_to_text(self.data_value); end; overriding member function compare_implementation(a_other ut_data_value) return integer is diff --git a/source/expectations/matchers/ut_be_within.tpb b/source/expectations/matchers/ut_be_within.tpb new file mode 100644 index 000000000..0832b4946 --- /dev/null +++ b/source/expectations/matchers/ut_be_within.tpb @@ -0,0 +1,104 @@ +create or replace type body ut_be_within as + /* + utPLSQL - Version 3 + Copyright 2016 - 2019 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + member procedure init(self in out nocopy ut_be_within, a_dist ut_data_value, a_is_pct number , a_self_type varchar2 := null) is + begin + self.dist := a_dist; + self.is_pct := nvl(a_is_pct,0); + self.self_type := nvl( a_self_type, $$plsql_unit ); + end; + + constructor function ut_be_within(self in out nocopy ut_be_within, a_dist number, a_is_pct number) return self as result is + begin + init(ut_data_value_number(a_dist),a_is_pct); + return; + end; + + constructor function ut_be_within(self in out nocopy ut_be_within, a_dist dsinterval_unconstrained, a_is_pct number) return self as result is + begin + init(ut_data_value_dsinterval(a_dist),a_is_pct); + return; + end; + + constructor function ut_be_within(self in out nocopy ut_be_within, a_dist yminterval_unconstrained, a_is_pct number) return self as result is + begin + init(ut_data_value_yminterval(a_dist),a_is_pct); + return; + end; + + member procedure of_(self in ut_be_within, a_expected number) is + l_result ut_be_within := self; + begin + l_result.expected := ut_data_value_number(a_expected); + l_result.expectation.to_(l_result ); + end; + + member procedure of_(self in ut_be_within, a_expected date) is + l_result ut_be_within := self; + begin + l_result.expected := ut_data_value_date(a_expected); + l_result.expectation.to_(l_result ); + end; + + overriding member function run_matcher(self in out nocopy ut_be_within, a_actual ut_data_value) return boolean is + l_result boolean; + begin + if self.expected.data_type = a_actual.data_type then + if self.expected is of (ut_data_value_number) and self.is_pct = 0 then + l_result := abs((treat(self.expected as ut_data_value_number).data_value - treat(a_actual as ut_data_value_number).data_value)) <= treat(self.dist as ut_data_value_number).data_value; + elsif self.expected is of (ut_data_value_number) and self.is_pct = 1 then + l_result := treat(self.dist as ut_data_value_number).data_value >= ((treat(self.expected as ut_data_value_number).data_value - treat(a_actual as ut_data_value_number).data_value ) * 100 ) / + (treat(self.expected as ut_data_value_number).data_value) ; + elsif self.expected is of (ut_data_value_date) and self.dist is of ( ut_data_value_yminterval) then + l_result := treat(a_actual as ut_data_value_date).data_value between (treat(self.expected as ut_data_value_date).data_value) - treat(self.dist as ut_data_value_yminterval).data_value + and (treat(self.expected as ut_data_value_date).data_value) + treat(self.dist as ut_data_value_yminterval).data_value; + elsif self.expected is of (ut_data_value_date) and self.dist is of ( ut_data_value_dsinterval) then + l_result := treat(a_actual as ut_data_value_date).data_value between (treat(self.expected as ut_data_value_date).data_value) - treat(self.dist as ut_data_value_dsinterval).data_value + and (treat(self.expected as ut_data_value_date).data_value) + treat(self.dist as ut_data_value_dsinterval).data_value; + end if; + else + l_result := (self as ut_matcher).run_matcher(a_actual); + end if; + return l_result; + end; + + overriding member function failure_message(a_actual ut_data_value) return varchar2 is + l_distance varchar2(32767); + begin + l_distance := case + when self.dist is of (ut_data_value_number) then + treat(self.dist as ut_data_value_number).to_string + when self.dist is of (ut_data_value_yminterval) then + treat(self.dist as ut_data_value_yminterval).to_string + when self.dist is of (ut_data_value_dsinterval) then + treat(self.dist as ut_data_value_dsinterval).to_string + else + null + end; + + return (self as ut_matcher).failure_message(a_actual) || ' '||l_distance ||' of '|| expected.to_string_report(); + end; + + overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2 is + l_result varchar2(32767); + begin + return (self as ut_matcher).failure_message_when_negated(a_actual) || ': '|| expected.to_string_report(); + end; + +end; +/ \ No newline at end of file diff --git a/source/expectations/matchers/ut_be_within.tps b/source/expectations/matchers/ut_be_within.tps new file mode 100644 index 000000000..30947d2aa --- /dev/null +++ b/source/expectations/matchers/ut_be_within.tps @@ -0,0 +1,38 @@ +create or replace type ut_be_within under ut_comparison_matcher( + /* + utPLSQL - Version 3 + Copyright 2016 - 2019 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + + /** + * Holds information about mather options + */ + dist ut_data_value, + is_pct number(1,0), + + member procedure init(self in out nocopy ut_be_within, a_dist ut_data_value, a_is_pct number , a_self_type varchar2 := null), + constructor function ut_be_within(self in out nocopy ut_be_within, a_dist number, a_is_pct number) return self as result, + constructor function ut_be_within(self in out nocopy ut_be_within, a_dist dsinterval_unconstrained, a_is_pct number) return self as result, + constructor function ut_be_within(self in out nocopy ut_be_within, a_dist yminterval_unconstrained, a_is_pct number) return self as result, + member procedure of_(self in ut_be_within, a_expected number), + member procedure of_(self in ut_be_within, a_expected date), + + overriding member function run_matcher(self in out nocopy ut_be_within, a_actual ut_data_value) return boolean, + overriding member function failure_message(a_actual ut_data_value) return varchar2, + overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2 +) +not final +/ \ No newline at end of file diff --git a/source/expectations/matchers/ut_matcher.tps b/source/expectations/matchers/ut_matcher.tps index 16af94a1a..75231d4f3 100644 --- a/source/expectations/matchers/ut_matcher.tps +++ b/source/expectations/matchers/ut_matcher.tps @@ -17,7 +17,7 @@ create or replace type ut_matcher under ut_matcher_base( */ is_errored integer, is_negated_flag number(1,0), - expectation ut_expectation, + expectation ut_expectation_base, /* function: run_matcher diff --git a/source/expectations/ut_expectation.tpb b/source/expectations/ut_expectation.tpb index b18e2f7b0..288c6cf19 100644 --- a/source/expectations/ut_expectation.tpb +++ b/source/expectations/ut_expectation.tpb @@ -15,31 +15,6 @@ create or replace type body ut_expectation as See the License for the specific language governing permissions and limitations under the License. */ - member procedure to_(self in ut_expectation, a_matcher ut_matcher_base) is - l_expectation_result boolean; - l_matcher ut_matcher := treat(a_matcher as ut_matcher); - l_message varchar2(32767); - begin - if l_matcher.is_negated() then - self.not_to( a_matcher ); - else - l_expectation_result := l_matcher.run_matcher( self.actual_data ); - l_expectation_result := coalesce(l_expectation_result,false); - l_message := coalesce( l_matcher.error_message( self.actual_data ), l_matcher.failure_message( self.actual_data ) ); - ut_expectation_processor.add_expectation_result( ut_expectation_result( ut_utils.to_test_result( l_expectation_result ), self.description, l_message ) ); - end if; - end; - - member procedure not_to(self in ut_expectation, a_matcher ut_matcher_base) is - l_expectation_result boolean; - l_matcher ut_matcher := treat(a_matcher as ut_matcher); - l_message varchar2(32767); - begin - l_expectation_result := coalesce( l_matcher.run_matcher_negated( self.actual_data ), false ); - - l_message := coalesce( l_matcher.error_message( self.actual_data ), l_matcher.failure_message_when_negated( self.actual_data ) ); - ut_expectation_processor.add_expectation_result( ut_expectation_result( ut_utils.to_test_result( l_expectation_result ), self.description, l_message ) ); - end; member procedure to_be_null(self in ut_expectation) is begin @@ -719,5 +694,37 @@ create or replace type body ut_expectation as self.not_to( ut_contain(a_expected).negated() ); end; + member function to_be_within(a_dist natural) return ut_be_within is + l_result ut_matcher; + begin + l_result := ut_be_within(a_dist,0); + l_result.expectation := self; + return treat(l_result as ut_be_within); + end; + + member function to_be_within(a_dist dsinterval_unconstrained) return ut_be_within is + l_result ut_matcher; + begin + l_result := ut_be_within(a_dist,0); + l_result.expectation := self; + return treat(l_result as ut_be_within); + end; + + member function to_be_within(a_dist yminterval_unconstrained) return ut_be_within is + l_result ut_matcher; + begin + l_result := ut_be_within(a_dist,0); + l_result.expectation := self; + return treat(l_result as ut_be_within); + end; + + member function to_be_within_pct(a_dist natural) return ut_be_within is + l_result ut_matcher; + begin + l_result := ut_be_within(a_dist,1); + l_result.expectation := self; + return treat(l_result as ut_be_within); + end; + end; / diff --git a/source/expectations/ut_expectation.tps b/source/expectations/ut_expectation.tps index 95aeb9fce..b45141b5c 100644 --- a/source/expectations/ut_expectation.tps +++ b/source/expectations/ut_expectation.tps @@ -1,4 +1,4 @@ -create or replace type ut_expectation authid current_user as object( +create or replace type ut_expectation under ut_expectation_base( /* utPLSQL - Version 3 Copyright 2016 - 2019 utPLSQL Project @@ -15,13 +15,7 @@ create or replace type ut_expectation authid current_user as object( See the License for the specific language governing permissions and limitations under the License. */ - actual_data ut_data_value, - description varchar2(4000 char), - - --base matcher executors - member procedure to_(self in ut_expectation, a_matcher ut_matcher_base), - member procedure not_to(self in ut_expectation, a_matcher ut_matcher_base), - + --shortcuts member procedure to_be_null(self in ut_expectation), member procedure to_be_not_null(self in ut_expectation), @@ -168,8 +162,12 @@ create or replace type ut_expectation authid current_user as object( member procedure to_contain(self in ut_expectation, a_expected sys_refcursor), member procedure not_to_contain(self in ut_expectation, a_expected sys_refcursor), member procedure to_contain(self in ut_expectation, a_expected anydata), - member procedure not_to_contain(self in ut_expectation, a_expected anydata) + member procedure not_to_contain(self in ut_expectation, a_expected anydata), + member function to_be_within(a_dist natural) return ut_be_within, + member function to_be_within(a_dist dsinterval_unconstrained) return ut_be_within, + member function to_be_within(a_dist yminterval_unconstrained) return ut_be_within, + member function to_be_within_pct(a_dist natural) return ut_be_within ) not final / diff --git a/source/expectations/ut_expectation_base.tpb b/source/expectations/ut_expectation_base.tpb new file mode 100644 index 000000000..d657c2822 --- /dev/null +++ b/source/expectations/ut_expectation_base.tpb @@ -0,0 +1,44 @@ +create or replace type body ut_expectation_base as + /* + utPLSQL - Version 3 + Copyright 2016 - 2019 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + member procedure to_(self in ut_expectation_base, a_matcher ut_matcher_base) is + l_expectation_result boolean; + l_matcher ut_matcher := treat(a_matcher as ut_matcher); + l_message varchar2(32767); + begin + if l_matcher.is_negated() then + self.not_to( a_matcher ); + else + l_expectation_result := l_matcher.run_matcher( self.actual_data ); + l_expectation_result := coalesce(l_expectation_result,false); + l_message := coalesce( l_matcher.error_message( self.actual_data ), l_matcher.failure_message( self.actual_data ) ); + ut_expectation_processor.add_expectation_result( ut_expectation_result( ut_utils.to_test_result( l_expectation_result ), self.description, l_message ) ); + end if; + end; + + member procedure not_to(self in ut_expectation_base, a_matcher ut_matcher_base) is + l_expectation_result boolean; + l_matcher ut_matcher := treat(a_matcher as ut_matcher); + l_message varchar2(32767); + begin + l_expectation_result := coalesce( l_matcher.run_matcher_negated( self.actual_data ), false ); + + l_message := coalesce( l_matcher.error_message( self.actual_data ), l_matcher.failure_message_when_negated( self.actual_data ) ); + ut_expectation_processor.add_expectation_result( ut_expectation_result( ut_utils.to_test_result( l_expectation_result ), self.description, l_message ) ); + end; +end; +/ \ No newline at end of file diff --git a/source/expectations/ut_expectation_base.tps b/source/expectations/ut_expectation_base.tps new file mode 100644 index 000000000..87c0083b0 --- /dev/null +++ b/source/expectations/ut_expectation_base.tps @@ -0,0 +1,25 @@ +create or replace type ut_expectation_base force authid current_user as object( + /* + utPLSQL - Version 3 + Copyright 2016 - 2019 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + actual_data ut_data_value, + description varchar2(4000 char), + + --base matcher executors + member procedure to_(self in ut_expectation_base, a_matcher ut_matcher_base), + member procedure not_to(self in ut_expectation_base, a_matcher ut_matcher_base) +) not final +/ \ No newline at end of file diff --git a/source/expectations/ut_expectation_compound.tps b/source/expectations/ut_expectation_compound.tps index c840aaf35..a2c06ce76 100644 --- a/source/expectations/ut_expectation_compound.tps +++ b/source/expectations/ut_expectation_compound.tps @@ -33,3 +33,4 @@ create or replace type ut_expectation_compound under ut_expectation( ) / + diff --git a/source/install.sql b/source/install.sql index 45a67f924..911760a63 100644 --- a/source/install.sql +++ b/source/install.sql @@ -236,10 +236,12 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/data_values/ut_data_value_xmltype.tps' @@install_component.sql 'expectations/data_values/ut_compound_data_helper.pks' @@install_component.sql 'expectations/data_values/ut_data_value_json.tps' -@@install_component.sql 'expectations/ut_expectation.tps' @@install_component.sql 'expectations/matchers/ut_matcher_base.tps' +@@install_component.sql 'expectations/ut_expectation_base.tps' @@install_component.sql 'expectations/matchers/ut_matcher.tps' @@install_component.sql 'expectations/matchers/ut_comparison_matcher.tps' +@@install_component.sql 'expectations/matchers/ut_be_within.tps' +@@install_component.sql 'expectations/ut_expectation.tps' @@install_component.sql 'expectations/matchers/ut_be_false.tps' @@install_component.sql 'expectations/matchers/ut_be_greater_or_equal.tps' @@install_component.sql 'expectations/matchers/ut_be_greater_than.tps' @@ -294,11 +296,13 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/matchers/ut_be_null.tpb' @@install_component.sql 'expectations/matchers/ut_be_true.tpb' @@install_component.sql 'expectations/matchers/ut_equal.tpb' +@@install_component.sql 'expectations/matchers/ut_be_within.tpb' @@install_component.sql 'expectations/matchers/ut_contain.tpb' @@install_component.sql 'expectations/matchers/ut_have_count.tpb' @@install_component.sql 'expectations/matchers/ut_be_between.tpb' @@install_component.sql 'expectations/matchers/ut_be_empty.tpb' @@install_component.sql 'expectations/matchers/ut_match.tpb' +@@install_component.sql 'expectations/ut_expectation_base.tpb' @@install_component.sql 'expectations/ut_expectation.tpb' @@install_component.sql 'expectations/ut_expectation_compound.tpb' @@install_component.sql 'expectations/ut_expectation_json.tpb' diff --git a/test/install_ut3_user_tests.sql b/test/install_ut3_user_tests.sql index 05f2634e8..1330a7f75 100644 --- a/test/install_ut3_user_tests.sql +++ b/test/install_ut3_user_tests.sql @@ -25,6 +25,7 @@ prompt Install user tests @@ut3_user/expectations/binary/test_be_less_or_equal.pks @@ut3_user/expectations/binary/test_be_greater_or_equal.pks @@ut3_user/expectations/binary/test_be_greater_than.pks +@@ut3_user/expectations/binary/test_to_be_within.pks @@ut3_user/expectations/test_matchers.pks @@ut3_user/expectations/test_expectation_anydata.pks @@ut3_user/expectations/test_expectations_cursor.pks @@ -66,6 +67,7 @@ set define off @@ut3_user/expectations/binary/test_be_less_or_equal.pkb @@ut3_user/expectations/binary/test_be_greater_or_equal.pkb @@ut3_user/expectations/binary/test_be_greater_than.pkb +@@ut3_user/expectations/binary/test_to_be_within.pkb @@ut3_user/expectations/test_matchers.pkb @@ut3_user/expectations/test_expectation_anydata.pkb @@ut3_user/expectations/test_expectations_cursor.pkb diff --git a/test/ut3_tester_helper/expectations_helper.pkb b/test/ut3_tester_helper/expectations_helper.pkb index c5c1f379f..7714e1ea3 100644 --- a/test/ut3_tester_helper/expectations_helper.pkb +++ b/test/ut3_tester_helper/expectations_helper.pkb @@ -1,4 +1,4 @@ -create or replace package body expectations_helper is +create or replace package body ut3_tester_helper.expectations_helper is function unary_expectation_block( a_matcher_name varchar2, @@ -53,5 +53,29 @@ create or replace package body expectations_helper is return l_execute; end; + function be_within_expectation_block( + a_matcher_name varchar2, + a_actual_data_type varchar2, + a_actual_data varchar2, + a_expected_data_type varchar2, + a_expected_data varchar2, + a_distance varchar2, + a_distance_data_type varchar2 + ) return varchar2 + is + l_execute varchar2(32000); + begin + l_execute := ' + declare + l_actual '||a_actual_data_type||' := '||a_actual_data||'; + l_expected '||a_expected_data_type||' := '||a_expected_data||'; + l_distance '||a_distance_data_type||' := '||a_distance||'; + begin + --act - execute the expectation + ut3_develop.ut.expect( l_actual ).'||a_matcher_name||'(l_distance).of_(l_expected); + end;'; + return l_execute; + end; + end; / diff --git a/test/ut3_tester_helper/expectations_helper.pks b/test/ut3_tester_helper/expectations_helper.pks index 9c1d54333..3b0a754d2 100644 --- a/test/ut3_tester_helper/expectations_helper.pks +++ b/test/ut3_tester_helper/expectations_helper.pks @@ -21,5 +21,15 @@ create or replace package expectations_helper is a_expected_data varchar2 ) return varchar2; + function be_within_expectation_block( + a_matcher_name varchar2, + a_actual_data_type varchar2, + a_actual_data varchar2, + a_expected_data_type varchar2, + a_expected_data varchar2, + a_distance varchar2, + a_distance_data_type varchar2 + ) return varchar2; + end; / diff --git a/test/ut3_user/expectations/binary/test_to_be_within.pkb b/test/ut3_user/expectations/binary/test_to_be_within.pkb new file mode 100644 index 000000000..eb4f2da68 --- /dev/null +++ b/test/ut3_user/expectations/binary/test_to_be_within.pkb @@ -0,0 +1,141 @@ +create or replace package body test_to_be_within is + + procedure cleanup_expectations is + begin + ut3_tester_helper.main_helper.clear_expectations( ); + end; + + function be_within_expectation_block( + a_matcher_name varchar2, + a_data_type varchar2, + a_actual varchar2, + a_expected varchar2, + a_distance varchar2, + a_distance_data_type varchar2 + ) return varchar2 is + begin + return ut3_tester_helper.expectations_helper.be_within_expectation_block( + a_matcher_name, a_data_type, a_actual, a_data_type, a_expected,a_distance,a_distance_data_type + ); + end; + + procedure test_to_be_within_fail( + a_matcher_name varchar2, + a_data_type varchar2, + a_actual varchar2, + a_expected varchar2, + a_distance varchar2, + a_distance_data_type varchar2 + ) is + begin + execute immediate be_within_expectation_block(a_matcher_name,a_data_type, a_actual, a_expected,a_distance,a_distance_data_type); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).not_to_equal(0); + cleanup_expectations; + end; + + procedure test_to_be_within_success( + a_matcher_name varchar2, + a_data_type varchar2, + a_actual varchar2, + a_expected varchar2, + a_distance varchar2, + a_distance_data_type varchar2 + ) is + begin + execute immediate be_within_expectation_block(a_matcher_name,a_data_type, a_actual, a_expected,a_distance,a_distance_data_type); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + cleanup_expectations; + end; + + procedure success_tests is + begin + test_to_be_within_success('to_be_within','number', '2', '4','2','number'); + test_to_be_within_success('to_be_within','number', '4', '2','2','number'); + test_to_be_within_success('to_be_within','date', 'sysdate+1', 'sysdate','''1 0:00:11.333''','interval day to second'); + test_to_be_within_success('to_be_within','date', 'sysdate', 'sysdate+1','''1 0:00:11.333''','interval day to second'); + test_to_be_within_success('to_be_within','date', 'sysdate', 'sysdate+200','''1-0''','interval year to month'); + test_to_be_within_success('to_be_within','date', 'sysdate+200', 'sysdate','''1-0''','interval year to month'); + end; + + procedure failed_tests is + begin + test_to_be_within_fail('to_be_within','number', '2', '4','1','number'); + test_to_be_within_fail('to_be_within','number', '4', '2','1','number'); + test_to_be_within_fail('to_be_within','date', 'sysdate', 'sysdate+1','''0 0:00:11.333''','interval day to second'); + test_to_be_within_fail('to_be_within','date', 'sysdate+1', 'sysdate','''0 0:00:11.333''','interval day to second'); + test_to_be_within_fail('to_be_within','date', 'sysdate', 'sysdate+750','''1-0''','interval year to month'); + test_to_be_within_fail('to_be_within','date', 'sysdate+750', 'sysdate','''1-0''','interval year to month'); + end; + + procedure fail_for_number_not_within is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + --Act + ut3_develop.ut.expect(4).to_be_within(1).of_(7); + --Assert + l_expected_message := q'[Actual: 4 (number) was expected to be within 1 of 7 (number)]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure fail_for_ds_interval_not_within is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + --Act + ut3_develop.ut.expect(sysdate).to_be_within(interval '1' second).of_(sysdate+1); + --Assert + l_expected_message := q'[Actual: % (date) was expected to be within 1 second of % (date)]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure fail_for_custom_ds_interval_not_within is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + --Act + ut3_develop.ut.expect(sysdate).to_be_within(INTERVAL '2 3:04:11.333' DAY TO SECOND).of_(sysdate+100); + --Assert + l_expected_message := q'[Actual: % (date) was expected to be within 2 day 3 hour 4 minute 11.333 second of % (date)]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure fail_for_ym_interval_not_within is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + --Act + ut3_develop.ut.expect(sysdate).to_be_within(INTERVAL '1' MONTH).of_(sysdate+ 45); + --Assert + l_expected_message := q'[Actual: % (date) was expected to be within 1 month of % (date)]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure fail_for_custom_ym_interval_not_within is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + --Act + ut3_develop.ut.expect(sysdate).to_be_within(INTERVAL '1-3' YEAR TO MONTH).of_(sysdate+720); + --Assert + l_expected_message := q'[Actual: % (date) was expected to be within 1 year 3 month % (date)]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + +end; +/ \ No newline at end of file diff --git a/test/ut3_user/expectations/binary/test_to_be_within.pks b/test/ut3_user/expectations/binary/test_to_be_within.pks new file mode 100644 index 000000000..259a80915 --- /dev/null +++ b/test/ut3_user/expectations/binary/test_to_be_within.pks @@ -0,0 +1,31 @@ +create or replace package test_to_be_within is + + --%suite((not)to_be_less_or_equal) + --%suitepath(utplsql.test_user.expectations.binary) + + --%aftereach + procedure cleanup_expectations; + + --%test(Gives failure when number is not within positive distance) + procedure success_tests; + + --%test(Gives failure when number is not within negative distance) + procedure failed_tests; + + --%test(Check failure message for number not within) + procedure fail_for_number_not_within; + + --%test(Check failure message for inteval of 1 sec not within) + procedure fail_for_ds_interval_not_within; + + --%test(Check failure message for custom ds interval not within) + procedure fail_for_custom_ds_interval_not_within; + + --%test(Check failure message for inteval of 1 month not within) + procedure fail_for_ym_interval_not_within; + + --%test(Check failure message for custom ym interval not within) + procedure fail_for_custom_ym_interval_not_within; + +end; +/ \ No newline at end of file From 89cb0bcfef59e838e493482d00427a750b5c27a9 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sat, 6 Jun 2020 02:00:39 +0100 Subject: [PATCH 0701/1096] Fixingtoo long names --- docs/userguide/expectations.md | 12 ++++++++++++ .../expectations/binary/test_to_be_within.pkb | 8 ++++---- .../expectations/binary/test_to_be_within.pks | 8 ++++---- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 5924be80f..0d8893ba4 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -333,6 +333,7 @@ The matrix below illustrates the data types supported by different matchers. | **be_like** | | | X | | | | | | X | | | | | | | | **be_empty** | X | | X | | | | | | | | | X | X | | X | | **have_count** | | | | | | | | | | | | X | X | | X | +| **be_within().of_()** | | | | x | x | | | | | | | X | X | | X | # Expecting exceptions @@ -1093,6 +1094,17 @@ SUCCESS DEF ``` +## to_be_within of + +This fuzzy matcher is designed to allow user to compare a numbers and dates within distance of error. + +We are allowing a numbers to be compared within a absolute distance from other number of within a percentage calculated based on expected value. + +When comparing a date a distance is measured in interval. + + + + ## Comparing cursors, object types, nested tables and varrays diff --git a/test/ut3_user/expectations/binary/test_to_be_within.pkb b/test/ut3_user/expectations/binary/test_to_be_within.pkb index eb4f2da68..727ebbc03 100644 --- a/test/ut3_user/expectations/binary/test_to_be_within.pkb +++ b/test/ut3_user/expectations/binary/test_to_be_within.pkb @@ -81,7 +81,7 @@ create or replace package body test_to_be_within is ut.expect(l_actual_message).to_be_like(l_expected_message); end; - procedure fail_for_ds_interval_not_within is + procedure fail_for_number_not_within is l_actual_message varchar2(32767); l_expected_message varchar2(32767); begin @@ -95,7 +95,7 @@ create or replace package body test_to_be_within is ut.expect(l_actual_message).to_be_like(l_expected_message); end; - procedure fail_for_custom_ds_interval_not_within is + procedure fail_for_custom_ds_int is l_actual_message varchar2(32767); l_expected_message varchar2(32767); begin @@ -109,7 +109,7 @@ create or replace package body test_to_be_within is ut.expect(l_actual_message).to_be_like(l_expected_message); end; - procedure fail_for_ym_interval_not_within is + procedure fail_for_ym_int_not_within is l_actual_message varchar2(32767); l_expected_message varchar2(32767); begin @@ -123,7 +123,7 @@ create or replace package body test_to_be_within is ut.expect(l_actual_message).to_be_like(l_expected_message); end; - procedure fail_for_custom_ym_interval_not_within is + procedure fail_for_custom_ym_int is l_actual_message varchar2(32767); l_expected_message varchar2(32767); begin diff --git a/test/ut3_user/expectations/binary/test_to_be_within.pks b/test/ut3_user/expectations/binary/test_to_be_within.pks index 259a80915..5c042bd53 100644 --- a/test/ut3_user/expectations/binary/test_to_be_within.pks +++ b/test/ut3_user/expectations/binary/test_to_be_within.pks @@ -16,16 +16,16 @@ create or replace package test_to_be_within is procedure fail_for_number_not_within; --%test(Check failure message for inteval of 1 sec not within) - procedure fail_for_ds_interval_not_within; + procedure fail_for_ds_int_not_within; --%test(Check failure message for custom ds interval not within) - procedure fail_for_custom_ds_interval_not_within; + procedure fail_for_custom_ds_int; --%test(Check failure message for inteval of 1 month not within) - procedure fail_for_ym_interval_not_within; + procedure fail_for_ym_int_not_within; --%test(Check failure message for custom ym interval not within) - procedure fail_for_custom_ym_interval_not_within; + procedure fail_for_custom_ym_int; end; / \ No newline at end of file From a5481ac993f3fd4951a40c1a14ff44b05452045d Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sat, 6 Jun 2020 02:21:16 +0100 Subject: [PATCH 0702/1096] fixing issue --- test/ut3_user/expectations/binary/test_to_be_within.pkb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ut3_user/expectations/binary/test_to_be_within.pkb b/test/ut3_user/expectations/binary/test_to_be_within.pkb index 727ebbc03..b4c727a34 100644 --- a/test/ut3_user/expectations/binary/test_to_be_within.pkb +++ b/test/ut3_user/expectations/binary/test_to_be_within.pkb @@ -81,7 +81,7 @@ create or replace package body test_to_be_within is ut.expect(l_actual_message).to_be_like(l_expected_message); end; - procedure fail_for_number_not_within is + procedure fail_for_ds_int_not_within is l_actual_message varchar2(32767); l_expected_message varchar2(32767); begin From 9ee0e75cfa6f3e8cfef95e7f47d54f62c1990d93 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sun, 7 Jun 2020 14:34:48 +0100 Subject: [PATCH 0703/1096] Update documentation and tests --- docs/userguide/expectations.md | 76 ++++++++++++++++++- source/core/ut_utils.pkb | 40 ++++++++-- source/expectations/matchers/ut_be_within.tpb | 23 ++++-- test/ut3_tester/core/test_ut_utils.pkb | 57 ++++++++++++++ test/ut3_tester/core/test_ut_utils.pks | 29 +++++++ .../expectations/binary/test_to_be_within.pkb | 4 +- 6 files changed, 211 insertions(+), 18 deletions(-) diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 0d8893ba4..4e93f0be1 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1096,15 +1096,85 @@ SUCCESS ## to_be_within of -This fuzzy matcher is designed to allow user to compare a numbers and dates within distance of error. +This matcher is created to determine wheter expected value is approximately equal or "close" to another value. -We are allowing a numbers to be compared within a absolute distance from other number of within a percentage calculated based on expected value. +Matcher will allow to compare numbers as well as dates. -When comparing a date a distance is measured in interval. +When comparing a number the tolerance / distance can be expressed as another postive number or a percentage. +When comparing a two dates tolerance can be expressed in interval time either Day-To-Second or Year-To-Month. +Matcher for numbers will calculate a absolute distance between expected and actual and check whether that value is within a tolerance. +When comparing a date a distance is measured in interval, the check is done that actual value is within date range of expected taking into account interval plus and minus. +**Example 1.** +```sql +begin + ut.expect(3).to_be_within(1).of_(4); +end; +/ +``` + +**Example 2.** +```sql +begin + ut.expect(9).to_be_within_pct(10).of_(10); +end; +/ +``` + +**Example 3.** +```sql +begin + ut.expect(sysdate).to_be_within_pct(interval '1' day).of_(sysdate + 1); +end; +/ +``` + +**Example 4.** +```sql +begin + ut.expect(sysdate).to_be_within_pct(interval '1' month).of_(add_months(sysdate,1)); +end; +/ +``` + +**Example 5.** +```sql +begin + ut.expect(3).to_be_within(1).of_(5); +end; +/ +``` + +Returns following output via DBMS_OUTPUT: +``` +Failures: + + 1) wihtin_test + Actual: 3 (number) was expected to be within 1 of 5 (number) + at "UT3_DEVELOP.UT_BE_WITHIN.OF_", line 48 l_result.expectation.to_(l_result ); + at "UT3_DEVELOP.TEST_BETWNSTR.WIHTIN_TEST", line 5 +``` + +**Example 6.** +```sql +begin + ut.expect(sysdate).to_be_within(interval '1' day).of_(sysdate+2); +end; +/ +``` + +Returns following output via DBMS_OUTPUT: +``` +Failures: + + 1) wihtin_test + Actual: 2020-06-07T13:32:58 (date) was expected to be within 1 day of 2020-06-09T13:32:58 (date) + at "UT3_DEVELOP.UT_BE_WITHIN.OF_", line 55 l_result.expectation.to_(l_result ); + at "UT3_DEVELOP.TEST_BETWNSTR.WIHTIN_TEST", line 5 +``` ## Comparing cursors, object types, nested tables and varrays diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 8e96870d9..4b6c66d95 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -884,10 +884,29 @@ create or replace package body ut_utils is l_second varchar2(100) := extract(second from a_interval); l_result varchar2(32767); begin - l_result := case when l_day > 0 then l_day ||' day' else null end; - l_result := l_result || case when l_hour > 0 then ' '|| l_hour ||' hour' else null end; - l_result := l_result || case when l_minute> 0 then ' '||l_minute ||' minute' else null end; - l_result := l_result || case when l_second > 0 then ' '||l_second ||' second' else null end; + l_result := case + when l_day = 1 then l_day ||' day' + when l_day > 1 then l_day ||' days' + else null + end; + l_result := l_result || + case + when l_hour = 1 then ' '|| l_hour ||' hour' + when l_hour > 1 then ' '|| l_hour ||' hours' + else null + end; + l_result := l_result || + case + when l_minute = 1 then ' '||l_minute ||' minute' + when l_minute > 1 then ' '||l_minute ||' minutes' + else null + end; + l_result := l_result || + case + when l_second = 1 then ' '||l_second ||' second' + when l_second > 1 then ' '||l_second ||' seconds' + else null + end; return trim(leading ' ' from l_result); end; @@ -896,8 +915,17 @@ create or replace package body ut_utils is l_month varchar2(20) := extract(month from a_interval); l_result varchar2(32767); begin - l_result := case when l_year > 0 then l_year ||' year' else null end; - l_result := l_result || case when l_month > 0 then ' '||l_month ||' month' else null end; + l_result := case + when l_year = 1 then l_year ||' year' + when l_year > 1 then l_year ||' years' + else null + end; + l_result := l_result || + case + when l_month = 1 then ' '||l_month ||' month' + when l_month > 1 then ' '||l_month ||' months' + else null + end; return trim(leading ' ' from l_result); end; diff --git a/source/expectations/matchers/ut_be_within.tpb b/source/expectations/matchers/ut_be_within.tpb index 0832b4946..ab4ed8b6f 100644 --- a/source/expectations/matchers/ut_be_within.tpb +++ b/source/expectations/matchers/ut_be_within.tpb @@ -60,16 +60,25 @@ create or replace type body ut_be_within as begin if self.expected.data_type = a_actual.data_type then if self.expected is of (ut_data_value_number) and self.is_pct = 0 then - l_result := abs((treat(self.expected as ut_data_value_number).data_value - treat(a_actual as ut_data_value_number).data_value)) <= treat(self.dist as ut_data_value_number).data_value; + l_result := abs((treat(self.expected as ut_data_value_number).data_value - treat(a_actual as ut_data_value_number).data_value)) <= + treat(self.dist as ut_data_value_number).data_value; elsif self.expected is of (ut_data_value_number) and self.is_pct = 1 then - l_result := treat(self.dist as ut_data_value_number).data_value >= ((treat(self.expected as ut_data_value_number).data_value - treat(a_actual as ut_data_value_number).data_value ) * 100 ) / - (treat(self.expected as ut_data_value_number).data_value) ; + l_result := treat(self.dist as ut_data_value_number).data_value >= + ( + ((treat(self.expected as ut_data_value_number).data_value - treat(a_actual as ut_data_value_number).data_value ) * 100 ) / + (treat(self.expected as ut_data_value_number).data_value)) ; elsif self.expected is of (ut_data_value_date) and self.dist is of ( ut_data_value_yminterval) then - l_result := treat(a_actual as ut_data_value_date).data_value between (treat(self.expected as ut_data_value_date).data_value) - treat(self.dist as ut_data_value_yminterval).data_value - and (treat(self.expected as ut_data_value_date).data_value) + treat(self.dist as ut_data_value_yminterval).data_value; + l_result := treat(a_actual as ut_data_value_date).data_value + between + (treat(self.expected as ut_data_value_date).data_value) - treat(self.dist as ut_data_value_yminterval).data_value + and + (treat(self.expected as ut_data_value_date).data_value) + treat(self.dist as ut_data_value_yminterval).data_value; elsif self.expected is of (ut_data_value_date) and self.dist is of ( ut_data_value_dsinterval) then - l_result := treat(a_actual as ut_data_value_date).data_value between (treat(self.expected as ut_data_value_date).data_value) - treat(self.dist as ut_data_value_dsinterval).data_value - and (treat(self.expected as ut_data_value_date).data_value) + treat(self.dist as ut_data_value_dsinterval).data_value; + l_result := treat(a_actual as ut_data_value_date).data_value + between + (treat(self.expected as ut_data_value_date).data_value) - treat(self.dist as ut_data_value_dsinterval).data_value + and + (treat(self.expected as ut_data_value_date).data_value) + treat(self.dist as ut_data_value_dsinterval).data_value; end if; else l_result := (self as ut_matcher).run_matcher(a_actual); diff --git a/test/ut3_tester/core/test_ut_utils.pkb b/test/ut3_tester/core/test_ut_utils.pkb index a3ed605f9..61bc61a84 100644 --- a/test/ut3_tester/core/test_ut_utils.pkb +++ b/test/ut3_tester/core/test_ut_utils.pkb @@ -432,5 +432,62 @@ end; --Assert ut.expect(l_actual).to_equal(l_expected); end; + + procedure int_conv_ds_sec is + l_expected varchar2(100) := '1 second'; + l_actual varchar2(200) := ut3_develop.ut_utils.interval_to_text(interval '1' second); + begin + ut.expect(l_expected).to_equal(l_actual); + end; + + procedure int_conv_ds_minute is + l_expected varchar2(100) := '1 minute'; + l_actual varchar2(200) := ut3_develop.ut_utils.interval_to_text(interval '1' minute); + begin + ut.expect(l_expected).to_equal(l_actual); + end; + + procedure int_conv_ds_hour is + l_expected varchar2(100) := '1 hour'; + l_actual varchar2(200) := ut3_develop.ut_utils.interval_to_text(interval '1' hour); + begin + ut.expect(l_expected).to_equal(l_actual); + end; + + procedure int_conv_ds_day is + l_expected varchar2(100) := '1 day'; + l_actual varchar2(200) := ut3_develop.ut_utils.interval_to_text(interval '1' day); + begin + ut.expect(l_expected).to_equal(l_actual); + end; + + procedure int_conv_ds_date is + l_expected varchar2(100) := '2 days 3 hours 4 minutes 11.333 seconds'; + l_actual varchar2(200) := ut3_develop.ut_utils.interval_to_text(INTERVAL '2 3:04:11.333' DAY TO SECOND); + begin + ut.expect(l_expected).to_equal(l_actual); + end; + + procedure int_conv_ym_year is + l_expected varchar2(100) := '1 year'; + l_actual varchar2(200) := ut3_develop.ut_utils.interval_to_text(interval '1' year); + begin + ut.expect(l_expected).to_equal(l_actual); + end; + + procedure int_conv_ym_month is + l_expected varchar2(100) := '1 month'; + l_actual varchar2(200) := ut3_develop.ut_utils.interval_to_text(interval '1' month); + begin + ut.expect(l_expected).to_equal(l_actual); + end; + + procedure int_conv_ym_date is + l_expected varchar2(100) := '1 year 2 months'; + l_actual varchar2(200) := ut3_develop.ut_utils.interval_to_text(INTERVAL '1-2' YEAR TO MONTH); + begin + ut.expect(l_expected).to_equal(l_actual); + end; + end test_ut_utils; / diff --git a/test/ut3_tester/core/test_ut_utils.pks b/test/ut3_tester/core/test_ut_utils.pks index d8fca3b60..9d428b363 100644 --- a/test/ut3_tester/core/test_ut_utils.pks +++ b/test/ut3_tester/core/test_ut_utils.pks @@ -128,5 +128,34 @@ create or replace package test_ut_utils is --%test(replace_multiline_comments - replaces multi-line comments with empty lines) procedure replace_multiline_comments; + --%context(interval_converter_to_strin) + + --%test(Test day to second interval passing a second) + procedure int_conv_ds_sec; + + --%test(Test day to second interval passing a minute) + procedure int_conv_ds_minute; + + --%test(Test day to second interval passing a hour) + procedure int_conv_ds_hour; + + --%test(Test day to second interval passing a day) + procedure int_conv_ds_day; + + --%test(Test day to second interval passing a custom date ) + procedure int_conv_ds_date; + + --%test(Test year to month interval passing a hour) + procedure int_conv_ym_year; + + --%test(Test year to month interval passing a day) + procedure int_conv_ym_month; + + --%test(Test year to month interval passing a custom date ) + procedure int_conv_ym_date; + + + --%endcontext + end test_ut_utils; / diff --git a/test/ut3_user/expectations/binary/test_to_be_within.pkb b/test/ut3_user/expectations/binary/test_to_be_within.pkb index b4c727a34..af672e809 100644 --- a/test/ut3_user/expectations/binary/test_to_be_within.pkb +++ b/test/ut3_user/expectations/binary/test_to_be_within.pkb @@ -103,7 +103,7 @@ create or replace package body test_to_be_within is --Act ut3_develop.ut.expect(sysdate).to_be_within(INTERVAL '2 3:04:11.333' DAY TO SECOND).of_(sysdate+100); --Assert - l_expected_message := q'[Actual: % (date) was expected to be within 2 day 3 hour 4 minute 11.333 second of % (date)]'; + l_expected_message := q'[Actual: % (date) was expected to be within 2 days 3 hours 4 minutes 11.333 seconds of % (date)]'; l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); @@ -131,7 +131,7 @@ create or replace package body test_to_be_within is --Act ut3_develop.ut.expect(sysdate).to_be_within(INTERVAL '1-3' YEAR TO MONTH).of_(sysdate+720); --Assert - l_expected_message := q'[Actual: % (date) was expected to be within 1 year 3 month % (date)]'; + l_expected_message := q'[Actual: % (date) was expected to be within 1 year 3 months % (date)]'; l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); From a3b3a203e91e001b6bcd5ae0a0212242410afe35 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 10 Jun 2020 23:28:47 +0100 Subject: [PATCH 0704/1096] Changed `dbms_plssqlcode` tables to be permanent. --- source/core/coverage/dbms_plssqlcode.sql | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source/core/coverage/dbms_plssqlcode.sql b/source/core/coverage/dbms_plssqlcode.sql index 4bba7780c..1ae287207 100644 --- a/source/core/coverage/dbms_plssqlcode.sql +++ b/source/core/coverage/dbms_plssqlcode.sql @@ -7,7 +7,7 @@ begin select synonym_name from all_synonyms where synonym_name = 'DBMSPCC_BLOCKS' and owner = sys_context('USERENV','CURRENT_SCHEMA')); if l_tab_exist = 0 then execute immediate q'[ - create global temporary table dbmspcc_blocks ( + create table dbmspcc_blocks ( run_id number(38, 0), object_id number(38, 0), block number(38, 0), @@ -21,7 +21,7 @@ begin constraint dbmspcc_blocks_covered_ck check ( covered in ( 0, 1 ) ) enable, constraint dbmspcc_blocks_not_feasible_ck check ( not_feasible in ( 0, 1 ) ) enable, constraint dbmspcc_blocks_pk primary key ( run_id, object_id, block ) using index - ) on commit preserve rows]'; + )]'; end if; end; / @@ -34,13 +34,13 @@ begin select synonym_name from all_synonyms where synonym_name = 'DBMSPCC_RUNS' and owner = sys_context('USERENV','CURRENT_SCHEMA')); if l_tab_exist = 0 then execute immediate q'[ - create global temporary table dbmspcc_runs ( + create table dbmspcc_runs ( run_id number(38, 0), run_comment varchar2(4000 byte), run_owner varchar2(128 byte) constraint dbmspcc_runs_run_owner_nn not null enable, run_timestamp date constraint dbmspcc_runs_run_timestamp_nn not null enable, constraint dbmspcc_runs_pk primary key ( run_id ) using index enable - ) on commit preserve rows]'; + )]'; end if; end; / @@ -53,7 +53,7 @@ begin select synonym_name from all_synonyms where synonym_name = 'DBMSPCC_UNITS' and owner = sys_context('USERENV','CURRENT_SCHEMA')); if l_tab_exist = 0 then execute immediate q'[ - create global temporary table dbmspcc_units ( + create table dbmspcc_units ( run_id number(38, 0), object_id number(38, 0), owner varchar2(128 byte) constraint dbmspcc_units_owner_nn not null enable, @@ -61,7 +61,7 @@ begin type varchar2(12 byte) constraint dbmspcc_units_type_nn not null enable, last_ddl_time date constraint dbmspcc_units_last_ddl_time_nn not null enable, constraint dbmspcc_units_pk primary key ( run_id, object_id ) using index enable - ) on commit preserve rows]'; + )]'; end if; end; / From 93fd222b3133aad57ce8bec57ad0fdf71d3d5dfc Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 10 Jun 2020 23:29:15 +0100 Subject: [PATCH 0705/1096] Reworked coverage to allow for gathering coverage without calling utPLSQL. Enables multi-session coverage too. --- examples/RunExpectations.sql | 2 +- source/api/ut.pkb | 36 ++ source/api/ut_runner.pkb | 77 ++-- source/api/ut_runner.pks | 4 + source/core/coverage/ut_coverage.pkb | 61 ++- source/core/coverage/ut_coverage.pks | 34 +- source/core/coverage/ut_coverage_block.pkb | 8 +- source/core/coverage/ut_coverage_block.pks | 2 +- source/core/coverage/ut_coverage_helper.pkb | 16 +- source/core/coverage/ut_coverage_helper.pks | 2 + .../coverage/ut_coverage_helper_block.pkb | 67 ++-- .../coverage/ut_coverage_helper_block.pks | 6 +- .../coverage/ut_coverage_helper_profiler.pkb | 20 +- .../coverage/ut_coverage_helper_profiler.pks | 6 +- source/core/coverage/ut_coverage_profiler.pkb | 8 +- source/core/coverage/ut_coverage_profiler.pks | 2 +- .../coverage/ut_coverage_reporter_base.tpb | 28 +- .../coverage/ut_coverage_reporter_base.tps | 5 +- source/core/coverage/ut_coverage_runs.sql | 20 + .../output_buffers/ut_output_buffer_base.tpb | 2 +- source/core/types/ut_coverage_options.tpb | 64 ++++ source/core/types/ut_coverage_options.tps | 11 +- source/core/types/ut_run.tpb | 14 +- source/core/types/ut_run.tps | 7 +- source/core/ut_utils.pkb | 33 +- source/core/ut_utils.pks | 43 ++- source/create_grants.sql | 2 + source/create_synonyms.sql | 1 + source/install.sql | 2 + .../ut_coverage_cobertura_reporter.tpb | 2 +- .../ut_coverage_report_html_helper.pkb | 2 +- .../reporters/ut_coverage_sonar_reporter.tpb | 2 +- source/reporters/ut_coveralls_reporter.tpb | 2 +- source/uninstall_coverage_tables.sql | 2 +- source/uninstall_objects.sql | 4 +- test/install_ut3_user_tests.sql | 10 +- test/ut3_tester/core/test_output_buffer.pkb | 2 +- test/ut3_tester/core/test_ut_executable.pkb | 30 -- test/ut3_tester/core/test_ut_test.pks | 2 +- test/ut3_tester_helper/coverage_helper.pkb | 355 +++++++++++------- test/ut3_tester_helper/coverage_helper.pks | 21 +- test/ut3_tester_helper/main_helper.pkb | 8 - test/ut3_tester_helper/main_helper.pks | 6 +- test/ut3_user/reporters/test_coverage.pkb | 8 +- test/ut3_user/reporters/test_coverage.pks | 15 +- .../test_cov_cobertura_reporter.pkb | 55 +-- .../test_coverage_sonar_reporter.pkb | 33 +- .../test_coverage_standalone.pkb | 36 ++ .../test_coverage_standalone.pks | 13 + .../test_coverage/test_coveralls_reporter.pkb | 58 +-- .../test_coverage/test_extended_coverage.pkb | 71 ++++ .../test_extended_coverage.pks | 6 +- .../test_html_extended_reporter.pkb | 31 +- .../test_html_extended_reporter.pks | 2 +- .../test_coverage/test_proftab_coverage.pkb | 133 +++++++ .../test_proftab_coverage.pks | 3 +- .../reporters/test_extended_coverage.pkb | 74 ---- .../reporters/test_proftab_coverage.pkb | 132 ------- 58 files changed, 1009 insertions(+), 692 deletions(-) create mode 100644 source/core/coverage/ut_coverage_runs.sql create mode 100644 source/core/types/ut_coverage_options.tpb create mode 100644 test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb create mode 100644 test/ut3_user/reporters/test_coverage/test_coverage_standalone.pks create mode 100644 test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb rename test/ut3_user/reporters/{ => test_coverage}/test_extended_coverage.pks (66%) create mode 100644 test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb rename test/ut3_user/reporters/{ => test_coverage}/test_proftab_coverage.pks (85%) delete mode 100644 test/ut3_user/reporters/test_extended_coverage.pkb delete mode 100644 test/ut3_user/reporters/test_proftab_coverage.pkb diff --git a/examples/RunExpectations.sql b/examples/RunExpectations.sql index aeb5c40bc..eed123e72 100644 --- a/examples/RunExpectations.sql +++ b/examples/RunExpectations.sql @@ -11,7 +11,7 @@ set echo off @@demo_expectations.pck begin - ut_coverage.coverage_start(); + ut_coverage.coverage_start(sys_guid()); ut_coverage.set_develop_mode(true); ut.run(); ut_coverage.set_develop_mode(false); diff --git a/source/api/ut.pkb b/source/api/ut.pkb index 3b94a2bf7..72e868a9d 100644 --- a/source/api/ut.pkb +++ b/source/api/ut.pkb @@ -248,6 +248,12 @@ create or replace package body ut is end loop; end if; return; + exception + when no_data_needed then + if l_results%isopen then + close l_results; + end if; + raise; end; function run( @@ -287,6 +293,12 @@ create or replace package body ut is end loop; end if; return; + exception + when no_data_needed then + if l_results%isopen then + close l_results; + end if; + raise; end; function run( @@ -327,6 +339,12 @@ create or replace package body ut is end loop; end if; return; + exception + when no_data_needed then + if l_results%isopen then + close l_results; + end if; + raise; end; function run( @@ -367,6 +385,12 @@ create or replace package body ut is end loop; end if; return; + exception + when no_data_needed then + if l_results%isopen then + close l_results; + end if; + raise; end; function run( @@ -407,6 +431,12 @@ create or replace package body ut is end loop; end if; return; + exception + when no_data_needed then + if l_results%isopen then + close l_results; + end if; + raise; end; function run( @@ -447,6 +477,12 @@ create or replace package body ut is end loop; end if; return; + exception + when no_data_needed then + if l_results%isopen then + close l_results; + end if; + raise; end; procedure run( diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index 2f523e1dd..31306b1c9 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -20,27 +20,6 @@ create or replace package body ut_runner is /** * Private functions */ - function to_ut_object_list(a_names ut_varchar2_list, a_schema_names ut_varchar2_rows) return ut_object_names is - l_result ut_object_names; - l_object_name ut_object_name; - begin - if a_names is not empty then - l_result := ut_object_names(); - for i in 1 .. a_names.count loop - l_object_name := ut_object_name(a_names(i)); - if l_object_name.owner is null then - for i in 1 .. cardinality(a_schema_names) loop - l_result.extend; - l_result(l_result.last) := ut_object_name(a_schema_names(i)||'.'||l_object_name.name); - end loop; - else - l_result.extend; - l_result(l_result.last) := l_object_name; - end if; - end loop; - end if; - return l_result; - end; procedure finish_run(a_run ut_run, a_force_manual_rollback boolean) is begin @@ -51,7 +30,6 @@ create or replace package body ut_runner is ut_compound_data_helper.cleanup_diff(); if not a_force_manual_rollback then rollback; - ut_utils.cleanup_session_temp_tables; end if; end; @@ -95,9 +73,7 @@ create or replace package body ut_runner is ) is l_run ut_run; l_coverage_schema_names ut_varchar2_rows; - l_exclude_object_names ut_object_names := ut_object_names(); - l_include_object_names ut_object_names; - l_paths ut_varchar2_list := ut_varchar2_list(); + l_paths ut_varchar2_list; l_random_test_order_seed positive; l_tags ut_varchar2_rows := ut_varchar2_rows(); begin @@ -113,18 +89,17 @@ create or replace package body ut_runner is ut_event_manager.trigger_event(ut_event_manager.gc_initialize); ut_event_manager.trigger_event(ut_event_manager.gc_debug, ut_run_info()); + if a_random_test_order_seed is not null then l_random_test_order_seed := a_random_test_order_seed; elsif a_random_test_order then dbms_random.seed( to_char(systimestamp,'yyyyddmmhh24missffff') ); l_random_test_order_seed := trunc(dbms_random.value(1, 1000000000)); end if; - if a_paths is null or a_paths is empty or a_paths.count = 1 and a_paths(1) is null then + + l_paths := ut_utils.filter_list(ut_utils.string_table_to_table(a_paths,','), '.+'); + if l_paths is null or l_paths is empty then l_paths := ut_varchar2_list(sys_context('userenv', 'current_schema')); - else - for i in 1..a_paths.count loop - l_paths := l_paths multiset union ut_utils.string_to_table(a_string => a_paths(i),a_delimiter => ','); - end loop; end if; begin @@ -132,36 +107,32 @@ create or replace package body ut_runner is ut_utils.save_dbms_output_to_cache(); ut_console_reporter_base.set_color_enabled(a_color_console); + if a_coverage_schemes is not empty then l_coverage_schema_names := ut_utils.convert_collection(a_coverage_schemes); else l_coverage_schema_names := ut_suite_manager.get_schema_names(l_paths); end if; - if a_exclude_objects is not empty then - l_exclude_object_names := to_ut_object_list(a_exclude_objects, l_coverage_schema_names); - end if; - + if a_tags is not null then - l_tags := l_tags multiset union distinct ut_utils.convert_collection( + l_tags := l_tags multiset union distinct ut_utils.convert_collection( ut_utils.trim_list_elements(ut_utils.filter_list(ut_utils.string_to_table(a_tags,','),ut_utils.gc_word_no_space)) ); end if; - l_exclude_object_names := l_exclude_object_names multiset union all ut_suite_manager.get_schema_ut_packages(l_coverage_schema_names); - - l_include_object_names := to_ut_object_list(a_include_objects, l_coverage_schema_names); l_run := ut_run( - null, - l_paths, - l_coverage_schema_names, - l_exclude_object_names, - l_include_object_names, - set(a_source_file_mappings), - set(a_test_file_mappings), - a_client_character_set, - l_random_test_order_seed, - l_tags + a_run_paths => l_paths, + a_coverage_options => ut_coverage_options( + schema_names => l_coverage_schema_names, + exclude_objects => ut_utils.convert_collection(a_exclude_objects), + include_objects => ut_utils.convert_collection(a_include_objects), + file_mappings => set(a_source_file_mappings) + ), + a_test_file_mappings => set(a_test_file_mappings), + a_client_character_set => a_client_character_set, + a_random_test_order_seed => l_random_test_order_seed, + a_run_tags => l_tags ); ut_suite_manager.configure_execution_by_path(l_paths, l_run.items, l_random_test_order_seed, l_tags); @@ -296,5 +267,15 @@ create or replace package body ut_runner is return l_result; end; + procedure coverage_start(a_coverage_run_id raw) is + begin + ut_coverage.coverage_start(a_coverage_run_id); + end; + + procedure coverage_stop is + begin + ut_coverage.coverage_stop; + end; + end ut_runner; / diff --git a/source/api/ut_runner.pks b/source/api/ut_runner.pks index 38167ac57..61578a4e0 100644 --- a/source/api/ut_runner.pks +++ b/source/api/ut_runner.pks @@ -145,5 +145,9 @@ create or replace package ut_runner authid current_user is */ function hash_suite_path(a_path varchar2, a_random_seed positiven) return varchar2; + procedure coverage_start(a_coverage_run_id raw); + + procedure coverage_stop; + end ut_runner; / diff --git a/source/core/coverage/ut_coverage.pkb b/source/core/coverage/ut_coverage.pkb index caa75ae51..879b6f5b5 100644 --- a/source/core/coverage/ut_coverage.pkb +++ b/source/core/coverage/ut_coverage.pkb @@ -16,26 +16,21 @@ create or replace package body ut_coverage is limitations under the License. */ - g_coverage_id tt_coverage_id_arr; - g_develop_mode boolean not null := false; - g_is_started boolean not null := false; + g_coverage_run_id raw(32); + g_develop_mode boolean not null := false; + g_is_started boolean not null := false; procedure set_develop_mode(a_develop_mode in boolean) is - begin - g_develop_mode := a_develop_mode; - end; - - function get_coverage_id(a_coverage_type in varchar2) return integer is - begin - return g_coverage_id(a_coverage_type); - end; + begin + g_develop_mode := a_develop_mode; + end; function is_develop_mode return boolean is - begin - return g_develop_mode; - end; + begin + return g_develop_mode; + end; - function get_cov_sources_sql(a_coverage_options ut_coverage_options, a_skip_objects ut_object_names) return varchar2 is + function get_cov_sources_sql(a_coverage_options ut_coverage_options, a_skip_objects ut_object_names) return varchar2 is l_result varchar2(32767); l_full_name varchar2(32767); l_join_mappings varchar2(32767); @@ -177,14 +172,16 @@ create or replace package body ut_coverage is /** * Public functions */ - procedure coverage_start(a_coverage_options ut_coverage_options default null) is + procedure coverage_start(a_coverage_run_id t_coverage_run_id) is l_run_comment varchar2(200) := 'utPLSQL Code coverage run '||ut_utils.to_string(systimestamp); + l_line_coverage_id integer; + l_block_coverage_id integer; begin if not is_develop_mode() and not g_is_started then - ut_coverage_helper_block.coverage_start( l_run_comment, g_coverage_id(gc_block_coverage) ); - ut_coverage_helper_profiler.coverage_start( l_run_comment, g_coverage_id(gc_proftab_coverage) ); - coverage_pause(); + l_line_coverage_id := ut_coverage_helper_profiler.coverage_start( l_run_comment ); + l_block_coverage_id := ut_coverage_helper_block.coverage_start( l_run_comment ); g_is_started := true; + ut_coverage_helper.set_coverage_run_ids(a_coverage_run_id, l_line_coverage_id, l_block_coverage_id); end if; end; @@ -200,18 +197,14 @@ create or replace package body ut_coverage is ut_coverage_helper_profiler.coverage_resume(); end; - procedure mock_coverage_id(a_coverage_id integer,a_coverage_type in varchar2) is + procedure mock_coverage_id( + a_coverage_run_id t_coverage_run_id, a_line_coverage_id integer, a_block_coverage_id integer + ) is begin g_develop_mode := true; g_is_started := true; - g_coverage_id(a_coverage_type) := a_coverage_id; - end; - - procedure mock_coverage_id(a_coverage_id tt_coverage_id_arr) is - begin - g_develop_mode := true; - g_is_started := true; - g_coverage_id := a_coverage_id; + g_coverage_run_id := a_coverage_run_id; + ut_coverage_helper.set_coverage_run_ids(a_coverage_run_id, a_line_coverage_id, a_block_coverage_id); end; procedure coverage_stop is @@ -227,22 +220,26 @@ create or replace package body ut_coverage is function get_coverage_data(a_coverage_options ut_coverage_options) return t_coverage is l_result_block ut_coverage.t_coverage; l_result_profiler_enrich ut_coverage.t_coverage; - l_object ut_coverage.t_full_name; + l_object ut_coverage.t_object_name; l_line_no binary_integer; + l_coverage_options ut_coverage_options := a_coverage_options; begin + if is_develop_mode() then + l_coverage_options.coverage_run_id := coalesce(g_coverage_run_id, l_coverage_options.coverage_run_id); + end if; --prepare global temp table with sources ut_event_manager.trigger_event('about to populate coverage temp table'); - populate_tmp_table(a_coverage_options); + populate_tmp_table(l_coverage_options); ut_event_manager.trigger_event('coverage temp table populated'); -- Get raw data for both reporters, order is important as tmp table will skip headers and dont populate -- tmp table for block again. - l_result_profiler_enrich:= ut_coverage_profiler.get_coverage_data( a_coverage_options, get_coverage_id(gc_proftab_coverage) ); + l_result_profiler_enrich := ut_coverage_profiler.get_coverage_data( l_coverage_options ); ut_event_manager.trigger_event('profiler coverage data retrieved'); -- If block coverage available we will use it. $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then - l_result_block := ut_coverage_block.get_coverage_data( a_coverage_options, get_coverage_id(gc_block_coverage) ); + l_result_block := ut_coverage_block.get_coverage_data( l_coverage_options ); ut_event_manager.trigger_event('block coverage data retrieved'); -- Enrich profiler results with some of the block results diff --git a/source/core/coverage/ut_coverage.pks b/source/core/coverage/ut_coverage.pks index 1d87d50c9..5e960c5ea 100644 --- a/source/core/coverage/ut_coverage.pks +++ b/source/core/coverage/ut_coverage.pks @@ -16,25 +16,21 @@ create or replace package ut_coverage authid current_user is limitations under the License. */ - gc_proftab_coverage constant varchar2(32) := 'proftab'; - gc_block_coverage constant varchar2(32) := 'block'; - - type tt_coverage_id_arr is table of integer index by varchar2(30); + subtype t_coverage_run_id is raw(32) not null; -- total run coverage information - subtype t_full_name is varchar2(4000); - subtype t_object_name is varchar2(250); - - --subtype t_line_executions is binary_integer; + subtype t_object_name is varchar2(257); + subtype t_line_no is binary_integer; type t_line_executions is record( - executions binary_integer - ,partcove binary_integer - ,no_blocks binary_integer + executions binary_integer + ,partcove binary_integer + ,no_blocks binary_integer ,covered_blocks binary_integer); + -- line coverage information indexed by line no. - --type tt_lines is table of t_line_executions index by binary_integer; - type tt_lines is table of t_line_executions index by binary_integer; + type tt_lines is table of t_line_executions index by t_line_no; + --unit coverage information record type t_unit_coverage is record( owner varchar2(128) @@ -50,7 +46,7 @@ create or replace package ut_coverage authid current_user is ,lines tt_lines); -- coverage information indexed by full object name (schema.object) - type tt_program_units is table of t_unit_coverage index by t_full_name; + type tt_program_units is table of t_unit_coverage index by t_object_name; -- total run coverage information type t_coverage is record( @@ -64,8 +60,6 @@ create or replace package ut_coverage authid current_user is ,executions number(38, 0) := 0 ,objects tt_program_units); - function get_coverage_id(a_coverage_type in varchar2) return integer; - procedure set_develop_mode(a_develop_mode in boolean); function is_develop_mode return boolean; @@ -74,11 +68,11 @@ create or replace package ut_coverage authid current_user is * Allows overwriting of private global variable g_coverage_id * Used internally, only for unit testing of the framework only */ - procedure mock_coverage_id(a_coverage_id integer, a_coverage_type in varchar2); - - procedure mock_coverage_id(a_coverage_id tt_coverage_id_arr); + procedure mock_coverage_id( + a_coverage_run_id t_coverage_run_id, a_line_coverage_id integer, a_block_coverage_id integer + ); - procedure coverage_start(a_coverage_options ut_coverage_options default null); + procedure coverage_start(a_coverage_run_id t_coverage_run_id); procedure coverage_stop; diff --git a/source/core/coverage/ut_coverage_block.pkb b/source/core/coverage/ut_coverage_block.pkb index c6d0f409d..0e0373a48 100644 --- a/source/core/coverage/ut_coverage_block.pkb +++ b/source/core/coverage/ut_coverage_block.pkb @@ -23,7 +23,7 @@ create or replace package body ut_coverage_block is * Public functions */ - function get_coverage_data(a_coverage_options ut_coverage_options, a_coverage_id integer) return ut_coverage.t_coverage is + function get_coverage_data(a_coverage_options ut_coverage_options) return ut_coverage.t_coverage is l_line_calls ut_coverage_helper.t_unit_line_calls; l_result ut_coverage.t_coverage; l_new_unit ut_coverage.t_unit_coverage; @@ -40,7 +40,11 @@ create or replace package body ut_coverage_block is exit when l_source_objects_crsr%notfound; --get coverage data - l_line_calls := ut_coverage_helper_block.get_raw_coverage_data(l_source_object.owner, l_source_object.name, a_coverage_id); + l_line_calls := ut_coverage_helper_block.get_raw_coverage_data( + l_source_object.owner, + l_source_object.name, + a_coverage_options.coverage_run_id + ); --if there is coverage, we need to filter out the garbage (badly indicated data) if l_line_calls.count > 0 then --remove lines that should not be indicted as meaningful diff --git a/source/core/coverage/ut_coverage_block.pks b/source/core/coverage/ut_coverage_block.pks index 26c79317e..08de58e69 100644 --- a/source/core/coverage/ut_coverage_block.pks +++ b/source/core/coverage/ut_coverage_block.pks @@ -16,7 +16,7 @@ create or replace package ut_coverage_block authid current_user is limitations under the License. */ - function get_coverage_data(a_coverage_options ut_coverage_options, a_coverage_id integer) return ut_coverage.t_coverage; + function get_coverage_data(a_coverage_options ut_coverage_options) return ut_coverage.t_coverage; end; / diff --git a/source/core/coverage/ut_coverage_helper.pkb b/source/core/coverage/ut_coverage_helper.pkb index 12ee9e1f7..5762452c4 100644 --- a/source/core/coverage/ut_coverage_helper.pkb +++ b/source/core/coverage/ut_coverage_helper.pkb @@ -60,10 +60,10 @@ create or replace package body ut_coverage_helper is l_result t_tmp_table_objects_crsr; begin open l_result for - select o.owner, o.name, o.full_name, max(o.line) lines_count, + select o.owner, o.name, o.full_name, max(o.line) as lines_count, cast( collect(decode(to_be_skipped, 'Y', to_char(line))) as ut_varchar2_list - ) to_be_skipped_list + ) as to_be_skipped_list from ut_coverage_sources_tmp o group by o.owner, o.name, o.full_name; @@ -73,7 +73,7 @@ create or replace package body ut_coverage_helper is function get_tmp_table_object_lines(a_owner varchar2, a_object_name varchar2) return ut_varchar2_list is l_result ut_varchar2_list; begin - select rtrim(s.text,chr(10)) text + select rtrim(s.text,chr(10)) as text bulk collect into l_result from ut_coverage_sources_tmp s where s.owner = a_owner @@ -83,5 +83,15 @@ create or replace package body ut_coverage_helper is return l_result; end; + procedure set_coverage_run_ids( a_coverage_run_id raw, a_line_coverage_id integer, a_block_coverage_id integer ) is + pragma autonomous_transaction; + begin + insert into ut_coverage_runs + ( coverage_run_id, line_coverage_id, block_coverage_id ) + values + ( a_coverage_run_id, a_line_coverage_id, a_block_coverage_id ); + commit; + end; + end; / diff --git a/source/core/coverage/ut_coverage_helper.pks b/source/core/coverage/ut_coverage_helper.pks index 85a54a7ca..955542633 100644 --- a/source/core/coverage/ut_coverage_helper.pks +++ b/source/core/coverage/ut_coverage_helper.pks @@ -59,5 +59,7 @@ create or replace package ut_coverage_helper authid definer is function get_tmp_table_object_lines(a_owner varchar2, a_object_name varchar2) return ut_varchar2_list; + procedure set_coverage_run_ids( a_coverage_run_id raw, a_line_coverage_id integer, a_block_coverage_id integer ); + end; / diff --git a/source/core/coverage/ut_coverage_helper_block.pkb b/source/core/coverage/ut_coverage_helper_block.pkb index fc64c507f..b81292017 100644 --- a/source/core/coverage/ut_coverage_helper_block.pkb +++ b/source/core/coverage/ut_coverage_helper_block.pkb @@ -30,12 +30,12 @@ create or replace package body ut_coverage_helper_block is type t_block_rows is table of t_block_row; - procedure coverage_start(a_run_comment varchar2, a_coverage_id out integer) is + function coverage_start(a_run_comment varchar2) return integer is begin $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then - a_coverage_id := dbms_plsql_code_coverage.start_coverage(run_comment => a_run_comment); + return dbms_plsql_code_coverage.start_coverage(run_comment => a_run_comment); $else - null; + return null; $end end; @@ -48,45 +48,54 @@ create or replace package body ut_coverage_helper_block is $end end; - function block_results(a_object_owner varchar2, a_object_name varchar2, a_coverage_id integer) return t_block_rows is + function block_results(a_object_owner varchar2, a_object_name varchar2, a_coverage_run_id raw) return t_block_rows is l_coverage_rows t_block_rows; + l_ut_owner varchar2(250) := ut_utils.ut_owner; begin - - select ccb.line as line, - count(ccb.block) as blocks, - sum(ccb.covered) as covered_blocks - bulk collect into l_coverage_rows - from dbmspcc_units ccu - left outer join dbmspcc_blocks ccb - on ccu.run_id = ccb.run_id - and ccu.object_id = ccb.object_id - where ccu.run_id = a_coverage_id - and ccu.owner = a_object_owner - and ccu.name = a_object_name - group by ccb.line - order by 1; - - return l_coverage_rows; + execute immediate q'[ + select line as line, + count(block) as blocks, + sum(covered) as covered_blocks + from (select line, + block, + max(covered) as covered + from dbmspcc_units ccu + join ]'||l_ut_owner||q'[.ut_coverage_runs r + on r.block_coverage_id = ccu.run_id + left join dbmspcc_blocks ccb + on ccu.run_id = ccb.run_id + and ccu.object_id = ccb.object_id + where r.coverage_run_id = :a_coverage_run_id + and ccu.owner = :a_object_owner + and ccu.name = :a_object_name + group by ccb.line, ccb.block + ) + group by line + order by line]' + bulk collect into l_coverage_rows using a_coverage_run_id, a_object_owner, a_object_name; + return l_coverage_rows; end; - function get_raw_coverage_data(a_object_owner varchar2, a_object_name varchar2, a_coverage_id integer) return ut_coverage_helper.t_unit_line_calls is + function get_raw_coverage_data( + a_object_owner varchar2, a_object_name varchar2, a_coverage_run_id raw + ) return ut_coverage_helper.t_unit_line_calls is l_tmp_data t_block_rows; l_results ut_coverage_helper.t_unit_line_calls; begin $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then - l_tmp_data := block_results(a_object_owner, a_object_name, a_coverage_id); + l_tmp_data := block_results(a_object_owner, a_object_name, a_coverage_run_id); for i in 1 .. l_tmp_data.count loop l_results(l_tmp_data(i).line).blocks := l_tmp_data(i).blocks; l_results(l_tmp_data(i).line).covered_blocks := l_tmp_data(i).covered_blocks; - l_results(l_tmp_data(i).line).partcovered := case - when (l_tmp_data(i).covered_blocks > 0) and - (l_tmp_data(i).blocks > l_tmp_data(i).covered_blocks) then - 1 - else - 0 - end; + l_results(l_tmp_data(i).line).partcovered := + case + when (l_tmp_data(i).covered_blocks > 0) + and (l_tmp_data(i).blocks > l_tmp_data(i).covered_blocks) + then 1 + else 0 + end; end loop; $end return l_results; diff --git a/source/core/coverage/ut_coverage_helper_block.pks b/source/core/coverage/ut_coverage_helper_block.pks index 0afa3ab15..9d24989d6 100644 --- a/source/core/coverage/ut_coverage_helper_block.pks +++ b/source/core/coverage/ut_coverage_helper_block.pks @@ -16,11 +16,13 @@ create or replace package ut_coverage_helper_block authid current_user is limitations under the License. */ - procedure coverage_start(a_run_comment in varchar2,a_coverage_id out integer); + function coverage_start(a_run_comment in varchar2) return integer; procedure coverage_stop; - function get_raw_coverage_data(a_object_owner varchar2, a_object_name varchar2, a_coverage_id integer) return ut_coverage_helper.t_unit_line_calls; + function get_raw_coverage_data( + a_object_owner varchar2, a_object_name varchar2, a_coverage_run_id raw + ) return ut_coverage_helper.t_unit_line_calls; end; / diff --git a/source/core/coverage/ut_coverage_helper_profiler.pkb b/source/core/coverage/ut_coverage_helper_profiler.pkb index c90a5b36a..dde3bf3ea 100644 --- a/source/core/coverage/ut_coverage_helper_profiler.pkb +++ b/source/core/coverage/ut_coverage_helper_profiler.pkb @@ -31,9 +31,11 @@ create or replace package body ut_coverage_helper_profiler is type t_block_rows is table of t_block_row; - procedure coverage_start(a_run_comment varchar2,a_coverage_id out integer) is + function coverage_start(a_run_comment varchar2) return integer is + l_coverage_id integer; begin - dbms_profiler.start_profiler(run_comment => a_run_comment, run_number => a_coverage_id); + dbms_profiler.start_profiler(run_comment => a_run_comment, run_number => l_coverage_id); + return l_coverage_id; end; procedure coverage_pause is @@ -53,7 +55,7 @@ create or replace package body ut_coverage_helper_profiler is dbms_profiler.stop_profiler(); end; - function proftab_results(a_object_owner varchar2, a_object_name varchar2, a_coverage_id integer) return t_proftab_rows is + function proftab_results(a_object_owner varchar2, a_object_name varchar2, a_coverage_run_id raw) return t_proftab_rows is l_coverage_rows t_proftab_rows; begin select @@ -64,20 +66,24 @@ create or replace package body ut_coverage_helper_profiler is join plsql_profiler_data d on u.runid = d.runid and u.unit_number = d.unit_number - where u.runid = a_coverage_id + join ut_coverage_runs r + on r.line_coverage_id = u.runid + where r.coverage_run_id = a_coverage_run_id and u.unit_owner = a_object_owner and u.unit_name = a_object_name and u.unit_type in ('PACKAGE BODY', 'TYPE BODY', 'PROCEDURE', 'FUNCTION', 'TRIGGER') group by d.line#; - + return l_coverage_rows; end; - function get_raw_coverage_data(a_object_owner varchar2, a_object_name varchar2, a_coverage_id integer) return ut_coverage_helper.t_unit_line_calls is + function get_raw_coverage_data( + a_object_owner varchar2, a_object_name varchar2, a_coverage_run_id raw + ) return ut_coverage_helper.t_unit_line_calls is l_tmp_data t_proftab_rows; l_results ut_coverage_helper.t_unit_line_calls; begin - l_tmp_data := proftab_results(a_object_owner, a_object_name, a_coverage_id); + l_tmp_data := proftab_results(a_object_owner, a_object_name, a_coverage_run_id); for i in 1 .. l_tmp_data.count loop l_results(l_tmp_data(i).line).calls := l_tmp_data(i).calls; diff --git a/source/core/coverage/ut_coverage_helper_profiler.pks b/source/core/coverage/ut_coverage_helper_profiler.pks index 9345f4b88..390495810 100644 --- a/source/core/coverage/ut_coverage_helper_profiler.pks +++ b/source/core/coverage/ut_coverage_helper_profiler.pks @@ -16,7 +16,7 @@ create or replace package ut_coverage_helper_profiler authid definer is limitations under the License. */ - procedure coverage_start(a_run_comment in varchar2,a_coverage_id out integer); + function coverage_start(a_run_comment in varchar2) return integer; procedure coverage_stop; @@ -24,7 +24,9 @@ create or replace package ut_coverage_helper_profiler authid definer is procedure coverage_resume; - function get_raw_coverage_data(a_object_owner varchar2, a_object_name varchar2, a_coverage_id integer) return ut_coverage_helper.t_unit_line_calls; + function get_raw_coverage_data( + a_object_owner varchar2, a_object_name varchar2, a_coverage_run_id raw + ) return ut_coverage_helper.t_unit_line_calls; end; / diff --git a/source/core/coverage/ut_coverage_profiler.pkb b/source/core/coverage/ut_coverage_profiler.pkb index 160e2dd41..274f6949c 100644 --- a/source/core/coverage/ut_coverage_profiler.pkb +++ b/source/core/coverage/ut_coverage_profiler.pkb @@ -19,7 +19,7 @@ create or replace package body ut_coverage_profiler is /** * Public functions */ - function get_coverage_data(a_coverage_options ut_coverage_options, a_coverage_id integer) return ut_coverage.t_coverage is + function get_coverage_data(a_coverage_options ut_coverage_options) return ut_coverage.t_coverage is l_line_calls ut_coverage_helper.t_unit_line_calls; l_result ut_coverage.t_coverage; l_new_unit ut_coverage.t_unit_coverage; @@ -34,7 +34,11 @@ create or replace package body ut_coverage_profiler is exit when l_source_objects_crsr%notfound; --get coverage data - l_line_calls := ut_coverage_helper_profiler.get_raw_coverage_data( l_source_object.owner, l_source_object.name, a_coverage_id); + l_line_calls := ut_coverage_helper_profiler.get_raw_coverage_data( + l_source_object.owner, + l_source_object.name, + a_coverage_options.coverage_run_id + ); --if there is coverage, we need to filter out the garbage (badly indicated data from dbms_profiler) if l_line_calls.count > 0 then diff --git a/source/core/coverage/ut_coverage_profiler.pks b/source/core/coverage/ut_coverage_profiler.pks index 8e671f899..59256ae65 100644 --- a/source/core/coverage/ut_coverage_profiler.pks +++ b/source/core/coverage/ut_coverage_profiler.pks @@ -16,7 +16,7 @@ create or replace package ut_coverage_profiler authid current_user is limitations under the License. */ - function get_coverage_data(a_coverage_options ut_coverage_options, a_coverage_id integer) return ut_coverage.t_coverage; + function get_coverage_data(a_coverage_options ut_coverage_options) return ut_coverage.t_coverage; end; / diff --git a/source/core/coverage/ut_coverage_reporter_base.tpb b/source/core/coverage/ut_coverage_reporter_base.tpb index 5067f9221..6300348e0 100644 --- a/source/core/coverage/ut_coverage_reporter_base.tpb +++ b/source/core/coverage/ut_coverage_reporter_base.tpb @@ -19,7 +19,8 @@ create or replace type body ut_coverage_reporter_base is overriding final member procedure before_calling_run(self in out nocopy ut_coverage_reporter_base, a_run ut_run) as begin (self as ut_output_reporter_base).before_calling_run(a_run); - ut_coverage.coverage_start(a_coverage_options => a_run.coverage_options); + ut_coverage.coverage_start(a_coverage_run_id => a_run.coverage_options.coverage_run_id); + ut_coverage.coverage_pause(); end; overriding final member procedure before_calling_before_all(self in out nocopy ut_coverage_reporter_base, a_executable in ut_executable) is @@ -85,5 +86,30 @@ create or replace type body ut_coverage_reporter_base is ut_coverage.coverage_pause(); end; + final member function get_report( a_coverage_options ut_coverage_options ) return ut_varchar2_rows pipelined is + l_reporter ut_coverage_reporter_base := self; + begin + ut_coverage_helper.cleanup_tmp_table(); + (l_reporter as ut_output_reporter_base).before_calling_run(null); + l_reporter.after_calling_run( ut_run( a_coverage_options => a_coverage_options ) ); + l_reporter.on_finalize(null); + for i in (select x.text from table(l_reporter.get_lines(1, 1)) x ) loop + pipe row (i.text); + end loop; + return; + end; + + final member function get_report_cursor( a_coverage_options ut_coverage_options ) return sys_refcursor is + l_reporter ut_coverage_reporter_base := self; + l_result sys_refcursor; + begin + ut_coverage_helper.cleanup_tmp_table(); + (l_reporter as ut_output_reporter_base).before_calling_run(null); + l_reporter.after_calling_run( ut_run( a_coverage_options => a_coverage_options ) ); + l_reporter.on_finalize(null); + open l_result for select x.text from table(l_reporter.get_lines(1, 1)) x; + return l_result; + end; + end; / diff --git a/source/core/coverage/ut_coverage_reporter_base.tps b/source/core/coverage/ut_coverage_reporter_base.tps index 2b9d1c625..039bbe320 100644 --- a/source/core/coverage/ut_coverage_reporter_base.tps +++ b/source/core/coverage/ut_coverage_reporter_base.tps @@ -36,8 +36,9 @@ create or replace type ut_coverage_reporter_base under ut_output_reporter_base( overriding final member procedure after_calling_after_each (self in out nocopy ut_coverage_reporter_base, a_executable in ut_executable), overriding final member procedure before_calling_after_all(self in out nocopy ut_coverage_reporter_base, a_executable in ut_executable), - overriding final member procedure after_calling_after_all (self in out nocopy ut_coverage_reporter_base, a_executable in ut_executable) - + overriding final member procedure after_calling_after_all (self in out nocopy ut_coverage_reporter_base, a_executable in ut_executable), + final member function get_report(a_coverage_options ut_coverage_options ) return ut_varchar2_rows pipelined, + final member function get_report_cursor(a_coverage_options ut_coverage_options ) return sys_refcursor ) not final not instantiable / diff --git a/source/core/coverage/ut_coverage_runs.sql b/source/core/coverage/ut_coverage_runs.sql new file mode 100644 index 000000000..78230240d --- /dev/null +++ b/source/core/coverage/ut_coverage_runs.sql @@ -0,0 +1,20 @@ +declare + l_tab_exist number; +begin + select count(*) into l_tab_exist + from all_tables + where table_name = 'UT_COVERAGE_RUNS' and owner = sys_context('USERENV','CURRENT_SCHEMA'); + if l_tab_exist = 0 then + execute immediate q'[create table ut_coverage_runs + ( + coverage_run_id raw(32) not null, + line_coverage_id number(38,0) unique not null, + block_coverage_id number(38,0) unique, + constraint ut_coverage_runs primary key (coverage_run_id, line_coverage_id) + ) organization index ]'; + execute immediate q'[comment on table ut_coverage_runs is + 'Map of block and line coverage runs for a test-run']'; + dbms_output.put_line('UT_COVERAGE_RUNS table created'); + end if; +end; +/ diff --git a/source/core/output_buffers/ut_output_buffer_base.tpb b/source/core/output_buffers/ut_output_buffer_base.tpb index 018250e4b..38f008e75 100644 --- a/source/core/output_buffers/ut_output_buffer_base.tpb +++ b/source/core/output_buffers/ut_output_buffer_base.tpb @@ -44,7 +44,7 @@ create or replace type body ut_output_buffer_base is return l_lines; end; - member procedure lines_to_dbms_output(self in ut_output_buffer_base, a_initial_timeout natural := null, a_timeout_sec natural := null) is + member procedure lines_to_dbms_output(self in ut_output_buffer_base, a_initial_timeout natural := null, a_timeout_sec natural := null) is l_data sys_refcursor; l_clob clob; l_item_type varchar2(32767); diff --git a/source/core/types/ut_coverage_options.tpb b/source/core/types/ut_coverage_options.tpb new file mode 100644 index 000000000..48a0f27c8 --- /dev/null +++ b/source/core/types/ut_coverage_options.tpb @@ -0,0 +1,64 @@ +create or replace type body ut_coverage_options as + /* + utPLSQL - Version 3 + Copyright 2016 - 2019 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + constructor function ut_coverage_options( + self in out nocopy ut_coverage_options, + coverage_run_id raw := null, + schema_names ut_varchar2_rows := null, + exclude_objects ut_varchar2_rows := null, + include_objects ut_varchar2_rows := null, + file_mappings ut_file_mappings := null + ) return self as result is + function to_ut_object_list(a_names ut_varchar2_rows, a_schema_names ut_varchar2_rows) return ut_object_names is + l_result ut_object_names; + l_object_name ut_object_name; + begin + if a_names is not empty then + l_result := ut_object_names(); + for i in 1 .. a_names.count loop + l_object_name := ut_object_name(a_names(i)); + if l_object_name.owner is null then + for i in 1 .. cardinality(a_schema_names) loop + l_result.extend; + l_result(l_result.last) := ut_object_name(a_schema_names(i)||'.'||l_object_name.name); + end loop; + else + l_result.extend; + l_result(l_result.last) := l_object_name; + end if; + end loop; + end if; + return l_result; + end; + begin + self.coverage_run_id := coalesce(coverage_run_id, sys_guid()); + self.file_mappings := file_mappings; + self.schema_names := schema_names; + self.exclude_objects := ut_object_names(); + + if exclude_objects is not empty then + self.exclude_objects := to_ut_object_list(exclude_objects, self.schema_names); + end if; +-- self.exclude_objects := self.exclude_objects multiset union all ut_suite_manager.get_schema_ut_packages(schema_names); + + self.include_objects := to_ut_object_list(include_objects, self.schema_names); + + return; + end; +end; +/ diff --git a/source/core/types/ut_coverage_options.tps b/source/core/types/ut_coverage_options.tps index bcdbc0b32..0de07b568 100644 --- a/source/core/types/ut_coverage_options.tps +++ b/source/core/types/ut_coverage_options.tps @@ -16,9 +16,18 @@ create or replace type ut_coverage_options force as object ( limitations under the License. */ + coverage_run_id raw(32), schema_names ut_varchar2_rows, exclude_objects ut_object_names, include_objects ut_object_names, - file_mappings ut_file_mappings + file_mappings ut_file_mappings, + constructor function ut_coverage_options( + self in out nocopy ut_coverage_options, + coverage_run_id raw := null, + schema_names ut_varchar2_rows := null, + exclude_objects ut_varchar2_rows := null, + include_objects ut_varchar2_rows := null, + file_mappings ut_file_mappings := null + ) return self as result ) / diff --git a/source/core/types/ut_run.tpb b/source/core/types/ut_run.tpb index bff16dc69..395b164f0 100644 --- a/source/core/types/ut_run.tpb +++ b/source/core/types/ut_run.tpb @@ -18,12 +18,9 @@ create or replace type body ut_run as constructor function ut_run( self in out nocopy ut_run, - a_items ut_suite_items, + a_items ut_suite_items := null, a_run_paths ut_varchar2_list := null, - a_schema_names ut_varchar2_rows := null, - a_exclude_objects ut_object_names := null, - a_include_objects ut_object_names := null, - a_project_file_mappings ut_file_mappings := null, + a_coverage_options ut_coverage_options := null, a_test_file_mappings ut_file_mappings := null, a_client_character_set varchar2 := null, a_random_test_order_seed positive := null, @@ -38,12 +35,7 @@ create or replace type body ut_run as self.random_test_order_seed := a_random_test_order_seed; self.results_count := ut_results_counter(); self.test_file_mappings := coalesce(a_test_file_mappings, ut_file_mappings()); - self.coverage_options := ut_coverage_options( - a_schema_names, - a_exclude_objects, - a_include_objects, - a_project_file_mappings - ); + self.coverage_options := a_coverage_options; return; end; diff --git a/source/core/types/ut_run.tps b/source/core/types/ut_run.tps index 2a4e11656..617347b25 100644 --- a/source/core/types/ut_run.tps +++ b/source/core/types/ut_run.tps @@ -28,12 +28,9 @@ create or replace type ut_run under ut_suite_item ( random_test_order_seed number(38,0), constructor function ut_run( self in out nocopy ut_run, - a_items ut_suite_items, + a_items ut_suite_items := null, a_run_paths ut_varchar2_list := null, - a_schema_names ut_varchar2_rows := null, - a_exclude_objects ut_object_names := null, - a_include_objects ut_object_names := null, - a_project_file_mappings ut_file_mappings := null, + a_coverage_options ut_coverage_options := null, a_test_file_mappings ut_file_mappings := null, a_client_character_set varchar2 := null, a_random_test_order_seed positive := null, diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 6bceb5261..c6a1b0657 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -229,6 +229,19 @@ create or replace package body ut_utils is return l_result; end; + function string_table_to_table(a_list ut_varchar2_list, a_delimiter varchar2:= chr(10), a_skip_leading_delimiter varchar2 := 'N') return ut_varchar2_list is + l_result ut_varchar2_list; + begin + if a_delimiter is null then + l_result := a_list; + elsif a_list is not empty then + for i in 1 .. a_list.count loop + ut_utils.append_to_list(l_result, ut_utils.string_to_table(a_list(i), a_delimiter, a_skip_leading_delimiter) ); + end loop; + end if; + return l_result; + end; + function clob_to_table(a_clob clob, a_max_amount integer := 8191, a_delimiter varchar2:= chr(10)) return ut_varchar2_list is l_offset integer := 1; l_length integer := dbms_lob.getlength(a_clob); @@ -369,6 +382,19 @@ create or replace package body ut_utils is end if; end; + procedure append_to_list(a_list in out nocopy ut_varchar2_list, a_items ut_varchar2_list) is + begin + if a_items is not null then + if a_list is null then + a_list := ut_varchar2_list(); + end if; + for i in 1 .. a_items.count loop + a_list.extend; + a_list(a_list.last) := a_items(i); + end loop; + end if; + end; + procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_item clob) is begin append_to_list( @@ -479,13 +505,6 @@ create or replace package body ut_utils is return l_xpath; end; - procedure cleanup_session_temp_tables is - begin - execute immediate 'truncate table dbmspcc_blocks'; - execute immediate 'truncate table dbmspcc_units'; - execute immediate 'truncate table dbmspcc_runs'; - end; - function to_version(a_version_no varchar2) return t_version is l_result t_version; c_version_part_regex constant varchar2(20) := '[0-9]+'; diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index ec8781391..8d3093108 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -216,8 +216,10 @@ create or replace package ut_utils authid definer is * * Splits a given string into table of string by delimiter. * The delimiter gets removed. - * If null passed as any of the parameters, empty table is returned. - * If no occurence of a_delimiter found in a_text then text is returned as a single row of the table. + * If null a_string passed, empty table is returned. + * If null a_delimiter passed, a_string is returned as element of result table. + * If null a_skip_leading_delimiter, it defaults to 'N' + * If no occurrence of a_delimiter found in a_text then text is returned as a single row of the table. * If no text between delimiters found then an empty row is returned, example: * string_to_table( 'a,,b', ',' ) gives table ut_varchar2_list( 'a', null, 'b' ); * @@ -229,14 +231,36 @@ create or replace package ut_utils authid definer is */ function string_to_table(a_string varchar2, a_delimiter varchar2:= chr(10), a_skip_leading_delimiter varchar2 := 'N') return ut_varchar2_list; + /** + * + * Splits each string in table of string into a table of string using specified delimiter. + * The delimiter gets removed. + * If null a_delimiter passed, a_list is returned as-is. + * If null a_list passed, empty table is returned. + * If null a_skip_leading_delimiter, it defaults to 'N' + * If no occurrence of a_delimiter found in a_text then text is returned as a single row of the table. + * If no text between delimiters found then an empty row is returned, example: + * string_table_to_table( a_list => ut_varchar2_list('x','y',null,'a,,b'), a_delimiter=>',' ) gives table ut_varchar2_list( 'x', 'y', null, 'a', null, 'b' ); + * + * @param a_list the table of texts to be split. + * @param a_delimiter the delimiter character or string + * @param a_skip_leading_delimiter determines if the leading delimiter should be ignored, used by clob_to_table + * + * @return table of varchar2 values + */ + function string_table_to_table(a_list ut_varchar2_list, a_delimiter varchar2:= chr(10), a_skip_leading_delimiter varchar2 := 'N') return ut_varchar2_list; + /** * Splits a given string into table of string by delimiter. * Default value of a_max_amount is 8191 because of code can contains multibyte character. * The delimiter gets removed. - * If null passed as any of the parameters, empty table is returned. + * If null a_clob passed, empty table is returned. + * If null a_delimiter passed, a_string is returned as element of result table. + * If null a_skip_leading_delimiter, it defaults to 'N' + * If no occurrence of a_delimiter found in a_text then text is returned as a single row of the table. * If split text is longer than a_max_amount it gets split into pieces of a_max_amount. * If no text between delimiters found then an empty row is returned, example: - * string_to_table( 'a,,b', ',' ) gives table ut_varchar2_list( 'a', null, 'b' ); + * clob_to_table( 'a,,b', ',' ) gives table ut_varchar2_list( 'a', null, 'b' ); * * @param a_clob the text to be split. * @param a_delimiter the delimiter character or string (default chr(10) ) @@ -287,6 +311,11 @@ create or replace package ut_utils authid definer is */ procedure append_to_list(a_list in out nocopy ut_varchar2_rows, a_items ut_varchar2_rows); + /** + * Append a list of items to the end of ut_varchar2_list + */ + procedure append_to_list(a_list in out nocopy ut_varchar2_list, a_items ut_varchar2_list); + procedure append_to_clob(a_src_clob in out nocopy clob, a_clob_table t_clob_tab, a_delimiter varchar2 := chr(10)); procedure append_to_clob(a_src_clob in out nocopy clob, a_new_data clob); @@ -299,12 +328,6 @@ create or replace package ut_utils authid definer is function to_xpath(a_list ut_varchar2_list, a_ancestors varchar2 := '/*/') return varchar2; - /* - * Truncates session-level GTT's (on commit preserve rows) - * IMPORTANT: Procedure will do an implicit commit when called - */ - procedure cleanup_session_temp_tables; - /** * Converts version string into version record * diff --git a/source/create_grants.sql b/source/create_grants.sql index 4553c52f6..db26faa24 100644 --- a/source/create_grants.sql +++ b/source/create_grants.sql @@ -61,6 +61,7 @@ grant execute on &&ut3_owner..ut_file_mapper to &ut3_user; grant execute on &&ut3_owner..ut_suite_items_info to &ut3_user; grant execute on &&ut3_owner..ut_suite_item_info to &ut3_user; grant execute on &&ut3_owner..ut_run_info to &ut3_user; +grant execute on &&ut3_owner..ut_coverage_options to &ut3_user; --generic types grant execute on &&ut3_owner..ut_varchar2_list to &ut3_user; @@ -133,6 +134,7 @@ grant execute on &&ut3_owner..ut_suite_cache_rows to &ut3_user; grant select, insert, delete, update on &&ut3_owner..dbmspcc_blocks to &ut3_user; grant select, insert, delete, update on &&ut3_owner..dbmspcc_runs to &ut3_user; grant select, insert, delete, update on &&ut3_owner..dbmspcc_units to &ut3_user; +grant select on &&ut3_owner..ut_coverage_runs to &ut3_user; grant execute on &&ut3_owner..ut_matcher_options to &ut3_user; grant execute on &&ut3_owner..ut_matcher_options_items to &ut3_user; diff --git a/source/create_synonyms.sql b/source/create_synonyms.sql index 425ca57a6..3f18ba3ed 100644 --- a/source/create_synonyms.sql +++ b/source/create_synonyms.sql @@ -77,6 +77,7 @@ create &action_type. synonym &ut3_user.ut_file_mapper for &&ut3_owner..ut_file_m create &action_type. synonym &ut3_user.ut_suite_items_info for &&ut3_owner..ut_suite_items_info; create &action_type. synonym &ut3_user.ut_suite_item_info for &&ut3_owner..ut_suite_item_info; create &action_type. synonym &ut3_user.ut_run_info for &&ut3_owner..ut_run_info; +create &action_type. synonym &ut3_user.ut_coverage_options for &&ut3_owner..ut_coverage_options; --generic types create &action_type. synonym &ut3_user.ut_varchar2_list for &&ut3_owner..ut_varchar2_list; diff --git a/source/install.sql b/source/install.sql index 253b13fb2..3249e3e49 100644 --- a/source/install.sql +++ b/source/install.sql @@ -177,6 +177,7 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema --gathering coverage @@install_component.sql 'core/coverage/ut_coverage_sources_tmp.sql' +@@install_component.sql 'core/coverage/ut_coverage_runs.sql' @@install_component.sql 'core/coverage/ut_coverage_helper.pks' @@install_component.sql 'core/coverage/ut_coverage_helper_block.pks' @@install_component.sql 'core/coverage/ut_coverage_helper_profiler.pks' @@ -199,6 +200,7 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'core/types/ut_logical_suite.tpb' @@install_component.sql 'core/types/ut_suite.tpb' @@install_component.sql 'core/types/ut_suite_context.tpb' +@@install_component.sql 'core/types/ut_coverage_options.tpb' @@install_component.sql 'core/types/ut_run.tpb' @@install_component.sql 'core/types/ut_expectation_result.tpb' @@install_component.sql 'core/types/ut_reporter_base.tpb' diff --git a/source/reporters/ut_coverage_cobertura_reporter.tpb b/source/reporters/ut_coverage_cobertura_reporter.tpb index eed8e8e73..2b34193ce 100644 --- a/source/reporters/ut_coverage_cobertura_reporter.tpb +++ b/source/reporters/ut_coverage_cobertura_reporter.tpb @@ -70,7 +70,7 @@ create or replace type body ut_coverage_cobertura_reporter is ) return ut_varchar2_rows is l_file_part varchar2(32767); l_result ut_varchar2_rows := ut_varchar2_rows(); - l_unit ut_coverage.t_full_name; + l_unit ut_coverage.t_object_name; l_obj_name ut_coverage.t_object_name; c_coverage_def constant varchar2(200) := ''; c_file_footer constant varchar2(30) := ''; diff --git a/source/reporters/ut_coverage_report_html_helper.pkb b/source/reporters/ut_coverage_report_html_helper.pkb index 00a53c4c6..d673a7f6c 100644 --- a/source/reporters/ut_coverage_report_html_helper.pkb +++ b/source/reporters/ut_coverage_report_html_helper.pkb @@ -287,7 +287,7 @@ create or replace package body ut_coverage_report_html_helper is l_coverage_pct number(5, 2); l_time_str varchar2(50); l_using varchar2(1000); - l_unit ut_coverage.t_full_name; + l_unit ut_coverage.t_object_name; l_charset varchar2(1000); begin l_charset := coalesce(upper(a_charset),'UTF-8'); diff --git a/source/reporters/ut_coverage_sonar_reporter.tpb b/source/reporters/ut_coverage_sonar_reporter.tpb index bfe0d890b..68f4a7989 100644 --- a/source/reporters/ut_coverage_sonar_reporter.tpb +++ b/source/reporters/ut_coverage_sonar_reporter.tpb @@ -61,7 +61,7 @@ create or replace type body ut_coverage_sonar_reporter is a_run ut_run ) return ut_varchar2_rows is l_result ut_varchar2_rows := ut_varchar2_rows(); - l_unit ut_coverage.t_full_name; + l_unit ut_coverage.t_object_name; c_coverage_header constant varchar2(30) := ''; c_file_footer constant varchar2(30) := ''; c_coverage_footer constant varchar2(30) := ''; diff --git a/source/reporters/ut_coveralls_reporter.tpb b/source/reporters/ut_coveralls_reporter.tpb index 1ca317c69..f2cb73abe 100644 --- a/source/reporters/ut_coveralls_reporter.tpb +++ b/source/reporters/ut_coveralls_reporter.tpb @@ -62,7 +62,7 @@ create or replace type body ut_coveralls_reporter is a_coverage_data ut_coverage.t_coverage ) return ut_varchar2_rows is l_result ut_varchar2_rows := ut_varchar2_rows(); - l_unit ut_coverage.t_full_name; + l_unit ut_coverage.t_object_name; c_coverage_header constant varchar2(30) := '{"source_files":['; c_coverage_footer constant varchar2(30) := ']}'||chr(10)||' '; begin diff --git a/source/uninstall_coverage_tables.sql b/source/uninstall_coverage_tables.sql index 8de75b51e..890aa7090 100644 --- a/source/uninstall_coverage_tables.sql +++ b/source/uninstall_coverage_tables.sql @@ -11,7 +11,7 @@ begin and owner = sys_context( 'USERENV', 'CURRENT_SCHEMA' ) ) loop - execute immediate 'drop table '||to_be_dopped.table_name||' cascade constraints'; + execute immediate 'drop table '||to_be_dopped.table_name||' cascade constraints purge'; dbms_output.put_line('Table '||to_be_dopped.table_name||' dropped'); end loop; end; diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index c905153f4..230e394ee 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -74,6 +74,8 @@ drop package ut_coverage_helper; drop table ut_coverage_sources_tmp purge; +drop table ut_coverage_runs purge; + drop package ut_teamcity_reporter_helper; drop package ut_runner; @@ -196,7 +198,7 @@ drop table ut_compound_data_tmp purge; drop table ut_compound_data_diff_tmp purge; -drop table ut_json_data_diff_tmp; +drop table ut_json_data_diff_tmp purge; drop package ut_annotation_manager; diff --git a/test/install_ut3_user_tests.sql b/test/install_ut3_user_tests.sql index 05f2634e8..336a63241 100644 --- a/test/install_ut3_user_tests.sql +++ b/test/install_ut3_user_tests.sql @@ -42,15 +42,16 @@ set define off @@ut3_user/reporters/test_debug_reporter.pks @@ut3_user/reporters/test_realtime_reporter.pks @@ut3_user/reporters/test_coverage.pks +@@ut3_user/reporters/test_coverage/test_coverage_standalone.pks set define on -@@install_above_12_1.sql 'ut3_user/reporters/test_extended_coverage.pks' +@@install_above_12_1.sql 'ut3_user/reporters/test_coverage/test_extended_coverage.pks' @@install_above_12_1.sql 'ut3_user/reporters/test_coverage/test_html_extended_reporter.pks' set define off @@ut3_user/reporters/test_coverage/test_coveralls_reporter.pks @@ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pks @@ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pks set define on -@@install_below_12_2.sql 'ut3_user/reporters/test_proftab_coverage.pks' +@@install_below_12_2.sql 'ut3_user/reporters/test_coverage/test_proftab_coverage.pks' @@install_below_12_2.sql 'ut3_user/reporters/test_coverage/test_html_proftab_reporter.pks' set define off @@ -83,15 +84,16 @@ set define off @@ut3_user/reporters/test_debug_reporter.pkb @@ut3_user/reporters/test_realtime_reporter.pkb @@ut3_user/reporters/test_coverage.pkb +@@ut3_user/reporters/test_coverage/test_coverage_standalone.pkb set define on -@@install_above_12_1.sql 'ut3_user/reporters/test_extended_coverage.pkb' +@@install_above_12_1.sql 'ut3_user/reporters/test_coverage/test_extended_coverage.pkb' @@install_above_12_1.sql 'ut3_user/reporters/test_coverage/test_html_extended_reporter.pkb' set define off @@ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb @@ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb @@ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pkb set define on -@@install_below_12_2.sql 'ut3_user/reporters/test_proftab_coverage.pkb' +@@install_below_12_2.sql 'ut3_user/reporters/test_coverage/test_proftab_coverage.pkb' @@install_below_12_2.sql 'ut3_user/reporters/test_coverage/test_html_proftab_reporter.pkb' set define off diff --git a/test/ut3_tester/core/test_output_buffer.pkb b/test/ut3_tester/core/test_output_buffer.pkb index a552cc567..2e8b3337c 100644 --- a/test/ut3_tester/core/test_output_buffer.pkb +++ b/test/ut3_tester/core/test_output_buffer.pkb @@ -132,7 +132,7 @@ create or replace package body test_output_buffer is --Assert -- Data in "fresh" buffer remains ut.expect( l_fresh_buffer.get_lines_cursor(0,0), l_buffer.self_type ).to_have_count(1); - -- Data in "slate" buffer is purged and so the call to get_lines_cursor throws ORA-20218 + -- Data in "stale" buffer is purged and so the call to get_lines_cursor throws ORA-20218 ut.expect( l_stale_buffer.get_lines_cursor(0,0), l_buffer.self_type ).to_be_empty(); end; diff --git a/test/ut3_tester/core/test_ut_executable.pkb b/test/ut3_tester/core/test_ut_executable.pkb index 337095607..e27a2e432 100644 --- a/test/ut3_tester/core/test_ut_executable.pkb +++ b/test/ut3_tester/core/test_ut_executable.pkb @@ -51,36 +51,6 @@ create or replace package body test_ut_executable is ut.expect(l_executable.get_error_stack_trace()).to_be_like('ORA-06501: PL/SQL: program error%'); end; - procedure modify_stateful_package is - l_job_name varchar2(30) := 'recreate_stateful_package'; - l_cnt integer := 1; - pragma autonomous_transaction; - begin - dbms_scheduler.create_job( - job_name => l_job_name, - job_type => 'PLSQL_BLOCK', - job_action => q'/ - begin - execute immediate q'[ - create or replace package stateful_package as - g_state varchar2(3) := 'abc'; - end;]'; - end;/', - start_date => localtimestamp, - enabled => TRUE, - auto_drop => TRUE, - comments => 'one-time job' - ); - $if dbms_db_version.version >= 18 $then - dbms_session.sleep(0.4); - $else - dbms_lock.sleep(0.4); - $end - while l_cnt > 0 loop - l_cnt:=ut3_tester_helper.main_helper.get_job_count(l_job_name); - end loop; - end; - procedure form_name is begin ut.expect(ut3_develop.ut_executable_test( user, ' package ', 'proc', null ).form_name()).to_equal(user||'.package.proc'); diff --git a/test/ut3_tester/core/test_ut_test.pks b/test/ut3_tester/core/test_ut_test.pks index 18ea6613f..caf75eb6c 100644 --- a/test/ut3_tester/core/test_ut_test.pks +++ b/test/ut3_tester/core/test_ut_test.pks @@ -29,7 +29,7 @@ create or replace package test_ut_test is --%test(Fails test when aftereach procedure name invalid) procedure after_each_proc_name_invalid; - --%test(Tails test when aftereach procedure name null) + --%test(Fails test when aftereach procedure name null) procedure after_each_procedure_name_null; procedure create_app_info_package; diff --git a/test/ut3_tester_helper/coverage_helper.pkb b/test/ut3_tester_helper/coverage_helper.pkb index e86a155fa..9aec00f8e 100644 --- a/test/ut3_tester_helper/coverage_helper.pkb +++ b/test/ut3_tester_helper/coverage_helper.pkb @@ -1,103 +1,87 @@ create or replace package body coverage_helper is - g_run_ids ut3_develop.ut_coverage.tt_coverage_id_arr; - g_profiler_run_id integer; - g_block_run_id integer; - - function get_mock_proftab_run_id return integer is - v_result integer; - begin - select nvl(min(runid),0) - 1 into v_result - from ut3_develop.plsql_profiler_runs; - return v_result; - end; - - function get_mock_block_run_id return integer is - v_result integer; - begin - select nvl(min(run_id),0) - 1 into v_result - from ut3_develop.dbmspcc_runs; - return v_result; - end; - - procedure setup_mock_coverage_ids(a_profiler_run_id integer, a_block_run_id integer) is - l_coverage_ids ut3_develop.ut_coverage.tt_coverage_id_arr; - begin - l_coverage_ids(ut3_develop.ut_coverage.gc_proftab_coverage) := a_profiler_run_id; - l_coverage_ids(ut3_develop.ut_coverage.gc_block_coverage) := a_block_run_id; - ut3_develop.ut_coverage.mock_coverage_id(l_coverage_ids); - end; + g_job_no integer := 0; procedure setup_mock_coverage_id is begin - g_profiler_run_id := get_mock_proftab_run_id(); - g_block_run_id := get_mock_block_run_id(); - setup_mock_coverage_ids(g_profiler_run_id, g_block_run_id); + null; end; - procedure setup_dummy_coverage is + procedure setup_long_name_package is pragma autonomous_transaction; begin - create_dummy_12_2_cov_pck(); - create_dummy_12_2_cov_test(); - grant_exec_on_12_2_cov(); + execute immediate q'[create or replace package UT3_DEVELOP.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG is + procedure do_stuff(i_input in number); - g_profiler_run_id := get_mock_proftab_run_id(); - g_block_run_id := get_mock_block_run_id(); - setup_mock_coverage_ids(g_profiler_run_id, g_block_run_id); + procedure grant_myself; + end;]'; + execute immediate q'[create or replace package body UT3_DEVELOP.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG is + procedure do_stuff(i_input in number) is + begin + if i_input = 2 then dbms_output.put_line('should not get here'); else dbms_output.put_line('should get here'); end if; + end; - mock_block_coverage_data(g_block_run_id, user); - mock_profiler_coverage_data(g_profiler_run_id, user); - commit; - end; + procedure grant_myself is + begin + execute immediate 'grant debug,execute on UT3_DEVELOP.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG to ut3$user#'; + end; - procedure mock_coverage_data(a_user in varchar2) is - c_unit_id constant integer := 1; - begin - insert into ut3_develop.plsql_profiler_runs ( runid, run_owner, run_date, run_comment) - values(g_profiler_run_id, a_user, sysdate, 'unit testing utPLSQL'); + end;]'; - insert into ut3_develop.plsql_profiler_units ( runid, unit_number, unit_type, unit_owner, unit_name) - values(g_profiler_run_id, c_unit_id, 'PACKAGE BODY', 'UT3_DEVELOP', 'DUMMY_COVERAGE'); + execute immediate q'[create or replace package UT3_DEVELOP.TEST_BLOCK_DUMMY_COVERAGE is + --%suite(dummy coverage test) + --%suitepath(coverage_testing) - insert into ut3_develop.plsql_profiler_data ( runid, unit_number, line#, total_occur, total_time) - select g_profiler_run_id, c_unit_id, 4, 1, 1 from dual union all - select g_profiler_run_id, c_unit_id, 5, 0, 0 from dual union all - select g_profiler_run_id, c_unit_id, 7, 1, 1 from dual; - end; + --%test + procedure test_do_stuff; + + procedure grant_myself; + + end;]'; + execute immediate q'[create or replace package body UT3_DEVELOP.TEST_BLOCK_DUMMY_COVERAGE is + procedure test_do_stuff is + begin + dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long.do_stuff(1); + ut.expect(1).to_equal(1); + end; + + procedure grant_myself is + begin + execute immediate 'grant debug,execute on UT3_DEVELOP.TEST_BLOCK_DUMMY_COVERAGE to ut3$user#'; + end; + end;]'; + + + execute immediate 'begin UT3_DEVELOP.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG.grant_myself(); end;'; + execute immediate 'begin UT3_DEVELOP.TEST_BLOCK_DUMMY_COVERAGE.grant_myself(); end;'; - procedure cleanup_dummy_coverage(a_run_id in integer) is - pragma autonomous_transaction; - begin - delete from ut3_develop.plsql_profiler_data where runid = a_run_id; - delete from ut3_develop.plsql_profiler_units where runid = a_run_id; - delete from ut3_develop.plsql_profiler_runs where runid = a_run_id; commit; end; - procedure cleanup_dummy_coverage(a_block_id in integer, a_prof_id in integer) is - pragma autonomous_transaction; + procedure mock_coverage_data(a_user in varchar2) is begin - begin execute immediate q'[drop package ut3_develop.test_block_dummy_coverage]'; exception when others then null; end; - begin execute immediate q'[drop package ut3_develop.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long]'; exception when others then null; end; - delete from dbmspcc_blocks where run_id = a_block_id; - delete from dbmspcc_units where run_id = a_block_id; - delete from dbmspcc_runs where run_id = a_block_id; - cleanup_dummy_coverage(a_prof_id); - commit; + null; end; - procedure cleanup_dummy_coverage is + procedure cleanup_long_name_package is + pragma autonomous_transaction; begin - cleanup_dummy_coverage( - g_block_run_id, - g_profiler_run_id - ); + begin + execute immediate q'[drop package ut3_develop.test_block_dummy_coverage]'; + exception + when others then null; + end; + begin + execute immediate q'[drop package ut3_develop.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long]'; + exception + when others then null; + end; end; procedure create_dummy_coverage_package is pragma autonomous_transaction; begin + execute immediate 'alter session set plsql_optimize_level=0'; execute immediate q'[create or replace package UT3_DEVELOP.DUMMY_COVERAGE is procedure do_stuff; @@ -116,6 +100,7 @@ create or replace package body coverage_helper is procedure grant_myself is begin execute immediate 'grant debug,execute on UT3_DEVELOP.DUMMY_COVERAGE to ut3$user#'; + execute immediate 'grant debug,execute on UT3_DEVELOP.DUMMY_COVERAGE to ut3_tester_helper'; end; end;]'; @@ -130,6 +115,9 @@ create or replace package body coverage_helper is --%test procedure test_do_stuff; + + --%test + procedure zero_coverage; procedure grant_myself; end;]'; @@ -138,7 +126,12 @@ create or replace package body coverage_helper is begin dummy_coverage.do_stuff; end; - + + procedure zero_coverage is + begin + null; + end; + procedure grant_myself is begin execute immediate 'grant debug,execute on UT3_DEVELOP.TEST_DUMMY_COVERAGE to ut3$user#'; @@ -213,62 +206,8 @@ create or replace package body coverage_helper is procedure drop_dummy_coverage_test_1 is pragma autonomous_transaction; begin - execute immediate q'[drop package UT3_DEVELOP.DUMMY_COVERAGE_1]'; - execute immediate q'[drop package UT3_DEVELOP.TEST_DUMMY_COVERAGE_1]'; - end; - - --12.2 Setup - procedure create_dummy_12_2_cov_pck is - pragma autonomous_transaction; - begin - execute immediate q'[create or replace package UT3_DEVELOP.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG is - procedure do_stuff(i_input in number); - - procedure grant_myself; - end;]'; - execute immediate q'[create or replace package body UT3_DEVELOP.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG is - procedure do_stuff(i_input in number) is - begin - if i_input = 2 then - dbms_output.put_line('should not get here'); - else - dbms_output.put_line('should get here'); - end if; - end; - - procedure grant_myself is - begin - execute immediate 'grant debug,execute on UT3_DEVELOP.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG to ut3$user#'; - end; - - end;]'; - end; - - procedure create_dummy_12_2_cov_test is - pragma autonomous_transaction; - begin - execute immediate q'[create or replace package UT3_DEVELOP.TEST_BLOCK_DUMMY_COVERAGE is - --%suite(dummy coverage test) - --%suitepath(coverage_testing) - - --%test - procedure test_do_stuff; - - procedure grant_myself; - - end;]'; - execute immediate q'[create or replace package body UT3_DEVELOP.TEST_BLOCK_DUMMY_COVERAGE is - procedure test_do_stuff is - begin - dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long.do_stuff(1); - ut.expect(1).to_equal(1); - end; - - procedure grant_myself is - begin - execute immediate 'grant debug,execute on UT3_DEVELOP.TEST_BLOCK_DUMMY_COVERAGE to ut3$user#'; - end; - end;]'; + begin execute immediate q'[drop package UT3_DEVELOP.DUMMY_COVERAGE_1]'; exception when others then null; end; + begin execute immediate q'[drop package UT3_DEVELOP.TEST_DUMMY_COVERAGE_1]'; exception when others then null; end; end; procedure mock_block_coverage_data(a_run_id integer,a_user in varchar2) is @@ -303,17 +242,161 @@ create or replace package body coverage_helper is select a_run_id, c_unit_id, 7, 1, 1 from dual; end; - procedure grant_exec_on_12_2_cov is - pragma autonomous_transaction; - begin - execute immediate 'begin UT3_DEVELOP.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG.grant_myself(); end;'; - execute immediate 'begin UT3_DEVELOP.TEST_BLOCK_DUMMY_COVERAGE.grant_myself(); end;'; - end; procedure set_develop_mode is begin ut3_develop.ut_coverage.set_develop_mode(true); end; + procedure create_coverage_pkg is + pragma autonomous_transaction; + begin + execute immediate 'alter session set plsql_optimize_level=0'; + execute immediate q'[create or replace package coverage_pkg as + function run_some_branching_code(a_input integer) return integer; + end;]'; + execute immediate q'[create or replace package body coverage_pkg as + function run_some_branching_code(a_input integer) return integer is + l_result integer; + begin + if a_input = 1 then return -1; elsif a_input = 2 then return 0; + else + return a_input; + end if; + end; + end;]'; + execute immediate 'grant debug on coverage_pkg to ut3$user#'; + end; + + procedure drop_coverage_pkg is + pragma autonomous_transaction; + begin + execute immediate q'[drop package coverage_pkg]'; + end; + + procedure run_standalone_coverage(a_coverage_run_id raw, a_input integer) is + x integer; + begin + ut3_develop.ut_runner.coverage_start(a_coverage_run_id); + execute immediate 'begin :x := coverage_pkg.run_some_branching_code(:a_input); end;' using out x, in a_input; + ut3_develop.ut_runner.coverage_stop(); + end; + + function get_job_status(a_job_name varchar2, a_job_started_after timestamp with time zone) return varchar2 is + l_status varchar2(1000); + begin + begin + select status into l_status + from user_scheduler_job_run_details + where job_name = upper(a_job_name) + and req_start_date >= a_job_started_after; + exception + when no_data_found then + null; + end; + return l_status; + end; + + procedure sleep(a_time number) is + begin + $if dbms_db_version.version >= 18 $then + dbms_session.sleep(a_time); + $else + dbms_lock.sleep(a_time ); + $end + end; + + procedure run_job_and_wait_for_finish(a_job_action varchar2) is + l_status varchar2(1000); + l_job_name varchar2(30); + l_timestamp timestamp with time zone := current_timestamp; + i integer := 0; + pragma autonomous_transaction; + begin + g_job_no := g_job_no + 1; + l_job_name := 'utPLSQL_selftest_job_'||g_job_no; + sleep(0.01); + dbms_scheduler.create_job( + job_name => l_job_name, + job_type => 'PLSQL_BLOCK', + job_action => a_job_action, + start_date => l_timestamp, + enabled => TRUE, + auto_drop => TRUE, + comments => 'one-time-job' + ); + while (l_status is null or l_status not in ('SUCCEEDED','FAILED')) and i < 30 loop + l_status := get_job_status( l_job_name, l_timestamp ); + sleep(0.1); + i := i + 1; + end loop; + commit; + if l_status = 'FAILED' then + raise_application_error(-20000, 'Running a scheduler job failed'); + end if; + end; + + procedure run_coverage_job(a_coverage_run_id raw, a_input integer) is + begin + run_job_and_wait_for_finish( + 'begin coverage_helper.run_standalone_coverage('''||a_coverage_run_id||''', '||a_input||'); end;' + ); + end; + + procedure create_test_results_table is + pragma autonomous_transaction; + e_exists exception; + pragma exception_init ( e_exists, -955 ); + begin + execute immediate 'create table test_results (text varchar2(4000))'; + exception + when e_exists then + null; + end; + + procedure drop_test_results_table is + pragma autonomous_transaction; + e_not_exists exception; + pragma exception_init ( e_not_exists, -942 ); + begin + execute immediate 'drop table test_results'; + exception + when e_not_exists then + null; + end; + + function run_code_as_job( a_plsql_block varchar2 ) return clob is + l_result_clob clob; + pragma autonomous_transaction; + begin + run_job_and_wait_for_finish( a_plsql_block ); + + execute immediate q'[ + declare + l_results ut3_develop.ut_varchar2_list; + begin + select * + bulk collect into l_results + from test_results; + delete from test_results; + commit; + :clob_results := ut3_tester_helper.main_helper.table_to_clob(l_results); + end; + ]' + using out l_result_clob; + + return l_result_clob; + end; + + function run_tests_as_job( a_run_command varchar2 ) return clob is + l_plsql_block varchar2(32767); + l_result_clob clob; + pragma autonomous_transaction; + begin + l_plsql_block := 'begin insert into test_results select * from table( {a_run_command} ); commit; end;'; + l_plsql_block := replace(l_plsql_block,'{a_run_command}',a_run_command); + return run_code_as_job( l_plsql_block ); + end; + end; / diff --git a/test/ut3_tester_helper/coverage_helper.pks b/test/ut3_tester_helper/coverage_helper.pks index c240ed490..7abeb5770 100644 --- a/test/ut3_tester_helper/coverage_helper.pks +++ b/test/ut3_tester_helper/coverage_helper.pks @@ -2,15 +2,13 @@ create or replace package coverage_helper is type prof_runs_tab is table of ut3_develop.plsql_profiler_runs%rowtype; - function get_mock_proftab_run_id return integer; - procedure setup_mock_coverage_id; procedure mock_coverage_data(a_user in varchar2); - procedure cleanup_dummy_coverage; + procedure cleanup_long_name_package; - procedure setup_dummy_coverage; + procedure setup_long_name_package; --Profiler coverage procedure create_dummy_coverage_package; @@ -23,12 +21,19 @@ create or replace package coverage_helper is procedure drop_dummy_coverage_test_1; --Block coverage - procedure create_dummy_12_2_cov_pck; - procedure create_dummy_12_2_cov_test; procedure mock_block_coverage_data(a_run_id integer,a_user in varchar2); - procedure grant_exec_on_12_2_cov; procedure set_develop_mode; - + + procedure run_standalone_coverage(a_coverage_run_id raw, a_input integer); + procedure run_coverage_job(a_coverage_run_id raw, a_input integer); + procedure create_coverage_pkg; + procedure drop_coverage_pkg; + + function run_tests_as_job( a_run_command varchar2 ) return clob; + function run_code_as_job( a_plsql_block varchar2 ) return clob; + procedure create_test_results_table; + procedure drop_test_results_table; + end; / diff --git a/test/ut3_tester_helper/main_helper.pkb b/test/ut3_tester_helper/main_helper.pkb index 5c3032b75..76245ea12 100644 --- a/test/ut3_tester_helper/main_helper.pkb +++ b/test/ut3_tester_helper/main_helper.pkb @@ -126,14 +126,6 @@ create or replace package body main_helper is execute immediate 'begin ut3$user#.parse_annotations; end;'; end; - function get_job_count(a_job_name varchar2) return number is - l_cnt number; - begin - select count(1) into l_cnt - from dba_scheduler_running_jobs srj - where srj.job_name = a_job_name; - end; - procedure append_to_list(a_list in out nocopy ut3_develop.ut_varchar2_list, a_item varchar2) is begin ut3_develop.ut_utils.append_to_list(a_list,a_item); diff --git a/test/ut3_tester_helper/main_helper.pks b/test/ut3_tester_helper/main_helper.pks index e675e267e..6dd453446 100644 --- a/test/ut3_tester_helper/main_helper.pks +++ b/test/ut3_tester_helper/main_helper.pks @@ -1,7 +1,7 @@ create or replace package main_helper is - gc_success number := ut3_develop.ut_utils.gc_success; - gc_failure number := ut3_develop.ut_utils.gc_failure; + gc_success number := ut3_develop.ut_utils.gc_success; + gc_failure number := ut3_develop.ut_utils.gc_failure; procedure execute_autonomous(a_sql varchar2); @@ -35,8 +35,6 @@ create or replace package main_helper is procedure parse_dummy_test_as_ut3$user#; - function get_job_count(a_job_name varchar2) return number; - procedure append_to_list(a_list in out nocopy ut3_develop.ut_varchar2_list, a_item varchar2); procedure append_to_list(a_list in out nocopy ut3_develop.ut_varchar2_rows, a_item varchar2); diff --git a/test/ut3_user/reporters/test_coverage.pkb b/test/ut3_user/reporters/test_coverage.pkb index 738ce67e4..dcee1f8f8 100644 --- a/test/ut3_user/reporters/test_coverage.pkb +++ b/test/ut3_user/reporters/test_coverage.pkb @@ -1,15 +1,11 @@ create or replace package body test_coverage is - procedure create_dummy_coverage_pkg is + procedure setup is + pragma autonomous_transaction; begin ut3_tester_helper.coverage_helper.create_dummy_coverage_package(); ut3_tester_helper.coverage_helper.create_dummy_coverage_test(); ut3_tester_helper.coverage_helper.grant_exec_on_cov(); - end; - - procedure setup_dummy_coverage is - pragma autonomous_transaction; - begin ut3_tester_helper.coverage_helper.setup_mock_coverage_id(); ut3_tester_helper.coverage_helper.mock_coverage_data(user); commit; diff --git a/test/ut3_user/reporters/test_coverage.pks b/test/ut3_user/reporters/test_coverage.pks index 4c19e125a..bc9379298 100644 --- a/test/ut3_user/reporters/test_coverage.pks +++ b/test/ut3_user/reporters/test_coverage.pks @@ -3,15 +3,20 @@ create or replace package test_coverage is --%suite --%suitepath(utplsql.test_user.reporters) + $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then + gc_block_coverage_enabled constant boolean := true; + $else + gc_block_coverage_enabled constant boolean := false; + $end + --%beforeall - procedure create_dummy_coverage_pkg; - --%beforeall - procedure setup_dummy_coverage; + procedure setup; + --%beforeall(ut3_tester_helper.coverage_helper.create_test_results_table) --%afterall(ut3_tester_helper.coverage_helper.drop_dummy_coverage_pkg) - - --%afterall(ut3_tester_helper.coverage_helper.cleanup_dummy_coverage) + --%afterall(ut3_tester_helper.coverage_helper.cleanup_long_name_package) + --%afterall(ut3_tester_helper.coverage_helper.drop_test_results_table) end; / diff --git a/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb index 7ae4b6f0d..a0ee44219 100644 --- a/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb +++ b/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb @@ -1,7 +1,6 @@ create or replace package body test_cov_cobertura_reporter is procedure report_on_file is - l_results ut3_develop.ut_varchar2_list; l_expected clob; l_actual clob; begin @@ -9,7 +8,7 @@ create or replace package body test_cov_cobertura_reporter is l_expected := q'[ - + test/ut3_develop.dummy_coverage.pkb @@ -20,29 +19,30 @@ create or replace package body test_cov_cobertura_reporter is + + ]'; --Act - select * - bulk collect into l_results - from table( - ut3_develop.ut.run( - a_path => 'ut3_develop.test_dummy_coverage', - a_reporter=> ut3_develop.ut_coverage_cobertura_reporter( ), - a_source_files => ut3_develop.ut_varchar2_list( 'test/ut3_develop.dummy_coverage.pkb' ), - a_test_files => ut3_develop.ut_varchar2_list( ) - ) - ); - l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + l_actual := + ut3_tester_helper.coverage_helper.run_tests_as_job( + q'[ + ut3_develop.ut.run( + a_path => 'ut3_develop.test_dummy_coverage', + a_reporter => ut3_develop.ut_coverage_cobertura_reporter( ), + a_source_files => ut3_develop.ut_varchar2_list( 'test/ut3_develop.dummy_coverage.pkb' ), + a_test_files => ut3_develop.ut_varchar2_list( ) + ) + ]' + ); --Assert ut.expect(l_actual).to_be_like(l_expected); end; procedure report_zero_coverage is - l_results ut3_develop.ut_varchar2_list; l_expected clob; l_actual clob; begin @@ -50,7 +50,7 @@ create or replace package body test_cov_cobertura_reporter is l_expected := q'[ - + ut3_develop.dummy_coverage @@ -73,28 +73,29 @@ create or replace package body test_cov_cobertura_reporter is + ]'; - ut3_tester_helper.coverage_helper.cleanup_dummy_coverage(); + ut3_tester_helper.coverage_helper.cleanup_long_name_package(); --Act - select * - bulk collect into l_results - from table( - ut3_develop.ut.run( - a_path => 'ut3_develop.test_dummy_coverage', - a_reporter=> ut3_develop.ut_coverage_cobertura_reporter( ), - a_include_objects => ut3_develop.ut_varchar2_list('UT3_DEVELOP.DUMMY_COVERAGE') - ) - ); - l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + l_actual := + ut3_tester_helper.coverage_helper.run_tests_as_job( + q'[ + ut3_develop.ut.run( + 'ut3_develop.test_dummy_coverage.zero_coverage', + ut3_develop.ut_coverage_cobertura_reporter(), + a_include_objects => ut3_develop.ut_varchar2_list('UT3_DEVELOP.DUMMY_COVERAGE') + ) + ]' + ); --Assert ut.expect(l_actual).to_be_like(l_expected); --Cleanup - test_coverage.setup_dummy_coverage; + test_coverage.setup; end; end; diff --git a/test/ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pkb index b0cb05a5b..e6c71563f 100644 --- a/test/ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pkb +++ b/test/ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pkb @@ -1,31 +1,38 @@ create or replace package body test_coverage_sonar_reporter is procedure report_on_file is - l_results ut3_develop.ut_varchar2_list; l_expected clob; l_actual clob; + l_block_cov clob; begin --Arrange + if test_coverage.gc_block_coverage_enabled then + l_block_cov := ''; + else + l_block_cov := ''; + end if; l_expected := ' - +'||l_block_cov||' + + '; --Act - select * - bulk collect into l_results - from table( - ut3_develop.ut.run( - a_path => 'ut3_develop.test_dummy_coverage', - a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), - a_source_files => ut3_develop.ut_varchar2_list( 'test/ut3_develop.dummy_coverage.pkb' ), - a_test_files => ut3_develop.ut_varchar2_list( ) - ) - ); - l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + l_actual := + ut3_tester_helper.coverage_helper.run_tests_as_job( + q'[ + ut3_develop.ut.run( + a_path => 'ut3_develop.test_dummy_coverage', + a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), + a_source_files => ut3_develop.ut_varchar2_list( 'test/ut3_develop.dummy_coverage.pkb' ), + a_test_files => ut3_develop.ut_varchar2_list( ) + ) + ]' + ); --Assert ut.expect(l_actual).to_equal(l_expected); end; diff --git a/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb b/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb new file mode 100644 index 000000000..1b508cc01 --- /dev/null +++ b/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb @@ -0,0 +1,36 @@ +create or replace package body test_coverage_standalone is + + procedure coverage_without_ut_run is + l_coverage_run_id raw(32) := sys_guid(); + l_actual ut3_develop.ut_varchar2_list; + l_expected clob; + begin + --Arrange + l_expected := '%ut3_tester_helper.coverage_pkg' || + '%' || + '%' || + '%%'; + --Act + ut3_tester_helper.coverage_helper.run_coverage_job(l_coverage_run_id, 1); + ut3_tester_helper.coverage_helper.run_coverage_job(l_coverage_run_id, 3); + + --Assert + select * + bulk collect into l_actual + from + table ( + ut3_develop.ut_coverage_cobertura_reporter( ).get_report( + ut3_develop.ut_coverage_options( + coverage_run_id => l_coverage_run_id, + include_objects => ut3_develop.ut_varchar2_rows('COVERAGE_PKG'), + schema_names => ut3_develop.ut_varchar2_rows('UT3_TESTER_HELPER') + ) + ) + ); + ut.expect(ut3_tester_helper.main_helper.table_to_clob(l_actual)).to_be_like( l_expected ); + end; + +end; +/ diff --git a/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pks b/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pks new file mode 100644 index 000000000..662dedf66 --- /dev/null +++ b/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pks @@ -0,0 +1,13 @@ +create or replace package test_coverage_standalone authid current_user is + + --%suite + --%suitepath(utplsql.test_user.reporters) + + --%beforeall(ut3_tester_helper.coverage_helper.create_coverage_pkg) + --%afterall(ut3_tester_helper.coverage_helper.drop_coverage_pkg) + + --%test(Coverage can be invoked standalone in multiple sessions and a combined report can be produced at the end) + procedure coverage_without_ut_run; + +end; +/ diff --git a/test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb index 73dde1b78..56290ea3d 100644 --- a/test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb +++ b/test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb @@ -1,7 +1,6 @@ create or replace package body test_coveralls_reporter is procedure report_on_file is - l_results ut3_develop.ut_varchar2_list; l_expected clob; l_actual clob; begin @@ -15,32 +14,36 @@ null, 1, 0, null, -1 +1, +null, +null, +null, +null, +null, +0, +0 ] } ]} ]'; - --Act - select * - bulk collect into l_results - from table( - ut3_develop.ut.run( - a_path => 'ut3_develop.test_dummy_coverage', - a_reporter=> ut3_develop.ut_coveralls_reporter( ), - a_source_files => ut3_develop.ut_varchar2_list( 'test/ut3_develop.dummy_coverage.pkb' ), - a_test_files => ut3_develop.ut_varchar2_list( ) - ) + l_actual := + ut3_tester_helper.coverage_helper.run_tests_as_job( + q'[ + ut3_develop.ut.run( + a_path => 'ut3_develop.test_dummy_coverage', + a_reporter => ut3_develop.ut_coveralls_reporter( ), + a_source_files => ut3_develop.ut_varchar2_list( 'test/ut3_develop.dummy_coverage.pkb' ), + a_test_files => ut3_develop.ut_varchar2_list( ) + ) + ]' ); - l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); --Assert ut.expect(l_actual).to_equal(l_expected); end; procedure report_zero_coverage is - l_results ut3_develop.ut_varchar2_list; l_expected clob; l_actual clob; - pragma autonomous_transaction; begin --Arrange l_expected := q'[{"source_files":[ @@ -60,30 +63,27 @@ null, 0, 0, 0, +0, 0 ] } ]} ]'; - ut3_tester_helper.coverage_helper.cleanup_dummy_coverage(); - --Act - select * - bulk collect into l_results - from table( - ut3_develop.ut.run( - 'ut3_develop.test_dummy_coverage', - ut3_develop.ut_coveralls_reporter(), - a_include_objects => ut3_develop.ut_varchar2_list('UT3_DEVELOP.DUMMY_COVERAGE') - ) - ); - l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + l_actual := + ut3_tester_helper.coverage_helper.run_tests_as_job( + q'[ + ut3_develop.ut.run( + 'ut3_develop.test_dummy_coverage.zero_coverage', + ut3_develop.ut_coveralls_reporter(), + a_include_objects => ut3_develop.ut_varchar2_list('UT3_DEVELOP.DUMMY_COVERAGE') + ) + ]' + ); --Assert ut.expect(l_actual).to_equal(l_expected); - test_coverage.setup_dummy_coverage; - end; end; diff --git a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb new file mode 100644 index 000000000..8617b79ce --- /dev/null +++ b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb @@ -0,0 +1,71 @@ +create or replace package body test_extended_coverage is + + procedure coverage_for_object is + l_expected clob; + l_actual clob; + begin + --Arrange + l_expected := '%%%'; + --Act + l_actual := + ut3_tester_helper.coverage_helper.run_tests_as_job( + q'[ + ut3_develop.ut.run( + a_path => 'ut3_develop.test_block_dummy_coverage', + a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), + a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long' ) + ) + ]' + ); + --Assert + ut.expect(l_actual).to_be_like(l_expected); + end; + + procedure coverage_for_schema is + l_expected clob; + l_actual clob; + begin + --Arrange + l_expected := '%%%'; + --Act + l_actual := + ut3_tester_helper.coverage_helper.run_tests_as_job( + q'[ + ut3_develop.ut.run( + a_path => 'ut3_develop.test_block_dummy_coverage', + a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), + a_coverage_schemes => ut3_develop.ut_varchar2_list( 'ut3_develop' ) + ) + ]' + ); + --Assert + ut.expect(l_actual).to_be_like(l_expected); + ut.expect(l_actual).to_be_like('%%%'); + end; + + procedure coverage_for_file is + l_expected clob; + l_actual clob; + l_file_path varchar2(250); + begin + --Arrange + l_file_path := 'test/ut3_develop.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long.pkb'; + l_expected := '%%%'; + --Act + l_actual := + ut3_tester_helper.coverage_helper.run_tests_as_job( + q'[ + ut3_develop.ut.run( + a_path => 'ut3_develop.test_block_dummy_coverage', + a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), + a_source_files => ut3_develop.ut_varchar2_list( ']'||l_file_path||q'[' ), + a_test_files => ut3_develop.ut_varchar2_list( ) + ) + ]' + ); + --Assert + ut.expect(l_actual).to_be_like(l_expected); + end; + +end; +/ diff --git a/test/ut3_user/reporters/test_extended_coverage.pks b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pks similarity index 66% rename from test/ut3_user/reporters/test_extended_coverage.pks rename to test/ut3_user/reporters/test_coverage/test_extended_coverage.pks index a8460aa3a..b2abb7c6d 100644 --- a/test/ut3_user/reporters/test_extended_coverage.pks +++ b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pks @@ -1,11 +1,11 @@ create or replace package test_extended_coverage is --%suite - --%suitepath(utplsql.test_user.reporters) + --%suitepath(utplsql.test_user.reporters.test_coverage) - --%beforeall(ut3_tester_helper.coverage_helper.setup_dummy_coverage) + --%beforeall(ut3_tester_helper.coverage_helper.setup_long_name_package) + --%afterall(ut3_tester_helper.coverage_helper.cleanup_long_name_package) - --%afterall(ut3_tester_helper.coverage_helper.cleanup_dummy_coverage) --%test(Coverage is gathered for specified object - extended coverage type) procedure coverage_for_object; diff --git a/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pkb index 8c6ae9e02..f54c8bda3 100644 --- a/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pkb +++ b/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pkb @@ -7,20 +7,23 @@ create or replace package body test_html_extended_reporter is l_charset varchar2(100) := 'ISO-8859-1'; begin --Arrange - l_expected := '%%

UT3_DEVELOP.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG

%4 relevant lines. 3 lines covered (including 1 lines partially covered ) and 1 lines missed%'; - - select * - bulk collect into l_results - from table( - ut3_develop.ut.run( - a_path => 'ut3_develop.test_block_dummy_coverage', - a_reporter=> ut3_develop.ut_coverage_html_reporter(), - a_source_files => ut3_develop.ut_varchar2_list( 'test/ut3_develop.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long.pkb' ), - a_test_files => ut3_develop.ut_varchar2_list( ), - a_client_character_set => l_charset - ) - ); - l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + l_expected := '%%

UT3_DEVELOP.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_' || + 'LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG

' || + '%2 relevant lines. 1 lines covered ' || + '(including 1 lines partially covered ) and 1 lines missed%'; + + l_actual := + ut3_tester_helper.coverage_helper.run_tests_as_job( + q'[ + ut3_develop.ut.run( + a_path => 'ut3_develop.test_block_dummy_coverage', + a_reporter=> ut3_develop.ut_coverage_html_reporter(), + a_source_files => ut3_develop.ut_varchar2_list( 'test/ut3_develop.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long.pkb' ), + a_test_files => ut3_develop.ut_varchar2_list( ), + a_client_character_set => ']'||l_charset||q'[' + ) + ]' + ); --Assert ut.expect(l_actual).to_be_like(l_expected); end; diff --git a/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pks b/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pks index dbe31b83d..3158b3777 100644 --- a/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pks +++ b/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pks @@ -1,7 +1,7 @@ create or replace package test_html_extended_reporter is --%suite(ut_html_extended_reporter) - --%suitepath(utplsql.test_user.reporters.test_extended_coverage) + --%suitepath(utplsql.test_user.reporters.test_coverage.test_extended_coverage) --%test(reports on a project file mapped to database object in extended profiler coverage) procedure report_on_file; diff --git a/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb b/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb new file mode 100644 index 000000000..e55d0abec --- /dev/null +++ b/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb @@ -0,0 +1,133 @@ +create or replace package body test_proftab_coverage is + + procedure coverage_for_object is + l_expected clob; + l_actual clob; + begin + --Arrange + l_expected := '%%'; + --Act + l_actual := + ut3_tester_helper.coverage_helper.run_tests_as_job( + q'[ + ut3_develop.ut.run( + a_path => 'ut3_develop.test_dummy_coverage', + a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), + a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.dummy_coverage' ) + ) + ]' + ); + --Assert + ut.expect(l_actual).to_be_like(l_expected); + end; + + procedure coverage_for_object_no_owner is + l_expected clob; + l_actual clob; + begin + --Arrange + l_expected := '%%'; + --Act + l_actual := + ut3_tester_helper.coverage_helper.run_tests_as_job( + q'[ + ut3_develop.ut.run( + a_path => 'ut3_develop.test_dummy_coverage', + a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), + a_include_objects => ut3_develop.ut_varchar2_list( 'dummy_coverage' ) + ) + ]' + ); + --Assert + ut.expect(l_actual).to_be_like(l_expected); + end; + + procedure coverage_for_schema is + l_expected clob; + l_actual clob; + begin + --Arrange + l_expected := ''; + l_expected := '%'||l_expected||'%'||l_expected||'%'; + --Act + l_actual := + ut3_tester_helper.coverage_helper.run_tests_as_job( + q'[ + ut3_develop.ut.run( + a_path => 'ut3_develop.test_dummy_coverage', + a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), + a_coverage_schemes => ut3_develop.ut_varchar2_list( 'ut3_develop' ) + ) + ]' + ); + --Assert + ut.expect(l_actual).to_be_like(l_expected); + end; + + procedure coverage_for_file is + l_expected clob; + l_actual clob; + l_file_path varchar2(100); + begin + --Arrange + l_file_path := 'test/ut3_develop.dummy_coverage.pkb'; + l_expected := '%%'; + --Act + l_actual := + ut3_tester_helper.coverage_helper.run_tests_as_job( + q'[ + ut3_develop.ut.run( + a_path => 'ut3_develop.test_dummy_coverage', + a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), + a_source_files => ut3_develop.ut_varchar2_list( ']'||l_file_path||q'[' ), + a_test_files => ut3_develop.ut_varchar2_list( ) + ) + ]' + ); + --Assert + ut.expect(l_actual).to_be_like(l_expected); + end; + + procedure coverage_tmp_data_refresh is + l_actual clob; + l_test_code varchar2(32767); + begin + l_test_code := q'[ + declare + l_tmp_data ut3_develop.ut_varchar2_list; + begin + --Arrange + select * bulk collect into l_tmp_data + from table( + ut3_develop.ut.run( + a_path => 'ut3_develop:coverage_testing', + a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), + a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.dummy_coverage' ) + ) + ); + coverage_helper.drop_dummy_coverage_pkg(); + coverage_helper.create_dummy_coverage_test_1(); + + --Act + insert into test_results + select * + from table( + ut3_develop.ut.run( + a_path => 'ut3_develop:coverage_testing', + a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), + a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.dummy_coverage' ) + ) + ); + commit; + end; + ]'; + + l_actual := ut3_tester_helper.coverage_helper.run_code_as_job( l_test_code ); + --Assert + ut.expect(l_actual).to_equal(to_clob(' + +')); + end; + +end; +/ diff --git a/test/ut3_user/reporters/test_proftab_coverage.pks b/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pks similarity index 85% rename from test/ut3_user/reporters/test_proftab_coverage.pks rename to test/ut3_user/reporters/test_coverage/test_proftab_coverage.pks index 6f2548158..8c9ecd5f8 100644 --- a/test/ut3_user/reporters/test_proftab_coverage.pks +++ b/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pks @@ -16,8 +16,7 @@ create or replace package test_proftab_coverage is procedure coverage_for_file; --%test(Coverage data is not cached between runs - issue #562 ) - --%aftertest(ut3$user#.test_coverage.create_dummy_coverage_pkg) - --%aftertest(ut3$user#.test_coverage.setup_dummy_coverage) + --%aftertest(ut3$user#.test_coverage.setup) --%aftertest(ut3_tester_helper.coverage_helper.drop_dummy_coverage_test_1) procedure coverage_tmp_data_refresh; diff --git a/test/ut3_user/reporters/test_extended_coverage.pkb b/test/ut3_user/reporters/test_extended_coverage.pkb deleted file mode 100644 index 28742aa70..000000000 --- a/test/ut3_user/reporters/test_extended_coverage.pkb +++ /dev/null @@ -1,74 +0,0 @@ -create or replace package body test_extended_coverage is - - procedure coverage_for_object is - l_expected clob; - l_actual clob; - l_results ut3_develop.ut_varchar2_list; - begin - --Arrange - l_expected := '%%%'; - --Act - select * - bulk collect into l_results - from table( - ut3_develop.ut.run( - a_path => 'ut3_develop.test_block_dummy_coverage', - a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), - a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long' ) - ) - ); - --Assert - l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); - ut.expect(l_actual).to_be_like(l_expected); - end; - - procedure coverage_for_schema is - l_expected clob; - l_actual clob; - l_results ut3_develop.ut_varchar2_list; - begin - --Arrange - l_expected := '%%%'; - --Act - select * - bulk collect into l_results - from table( - ut3_develop.ut.run( - a_path => 'ut3_develop.test_block_dummy_coverage', - a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), - a_coverage_schemes => ut3_develop.ut_varchar2_list( 'ut3_develop' ) - ) - ); - --Assert - l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); - ut.expect(l_actual).to_be_like(l_expected); - ut.expect(l_actual).to_be_like('%%%'); - end; - - procedure coverage_for_file is - l_expected clob; - l_actual clob; - l_results ut3_develop.ut_varchar2_list; - l_file_path varchar2(250); - begin - --Arrange - l_file_path := lower('test/ut3_develop.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long.pkb'); - l_expected := '%%%'; - --Act - select * - bulk collect into l_results - from table( - ut3_develop.ut.run( - a_path => 'ut3_develop.test_block_dummy_coverage', - a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), - a_source_files => ut3_develop.ut_varchar2_list( l_file_path ), - a_test_files => ut3_develop.ut_varchar2_list( ) - ) - ); - --Assert - l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); - ut.expect(l_actual).to_be_like(l_expected); - end; - -end; -/ diff --git a/test/ut3_user/reporters/test_proftab_coverage.pkb b/test/ut3_user/reporters/test_proftab_coverage.pkb deleted file mode 100644 index c132517a7..000000000 --- a/test/ut3_user/reporters/test_proftab_coverage.pkb +++ /dev/null @@ -1,132 +0,0 @@ -create or replace package body test_proftab_coverage is - - procedure coverage_for_object is - l_expected clob; - l_actual clob; - l_results ut3_develop.ut_varchar2_list; - begin - --Arrange - l_expected := '%%'; - --Act - select * - bulk collect into l_results - from table( - ut3_develop.ut.run( - a_path => 'ut3_develop.test_dummy_coverage', - a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), - a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.dummy_coverage' ) - ) - ); - --Assert - l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); - ut.expect(l_actual).to_be_like(l_expected); - end; - - procedure coverage_for_object_no_owner is - l_expected clob; - l_actual clob; - l_results ut3_develop.ut_varchar2_list; - begin - --Arrange - l_expected := '%%'; - --Act - select * - bulk collect into l_results - from table( - ut3_develop.ut.run( - a_path => 'ut3_develop.test_dummy_coverage', - a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), - a_include_objects => ut3_develop.ut_varchar2_list( 'dummy_coverage' ) - ) - ); - --Assert - l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); - ut.expect(l_actual).to_be_like(l_expected); - end; - - procedure coverage_for_schema is - l_expected clob; - l_actual clob; - l_results ut3_develop.ut_varchar2_list; - begin - --Arrange - l_expected := ''; - l_expected := '%'||l_expected||'%'||l_expected||'%'; - --Act - select * - bulk collect into l_results - from table( - ut3_develop.ut.run( - a_path => 'ut3_develop.test_dummy_coverage', - a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), - a_coverage_schemes => ut3_develop.ut_varchar2_list( 'ut3_develop' ) - ) - ); - --Assert - l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); - ut.expect(l_actual).to_be_like(l_expected); - end; - - procedure coverage_for_file is - l_expected clob; - l_actual clob; - l_results ut3_develop.ut_varchar2_list; - l_file_path varchar2(100); - begin - --Arrange - l_file_path := lower('test/ut3_develop.dummy_coverage.pkb'); - l_expected := '%%'; - --Act - select * - bulk collect into l_results - from table( - ut3_develop.ut.run( - a_path => 'ut3_develop.test_dummy_coverage', - a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), - a_source_files => ut3_develop.ut_varchar2_list( l_file_path ), - a_test_files => ut3_develop.ut_varchar2_list( ) - ) - ); - --Assert - l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); - ut.expect(l_actual).to_be_like(l_expected); - end; - - procedure coverage_tmp_data_refresh is - l_actual clob; - l_results ut3_develop.ut_varchar2_list; - begin - --Arrange - select * - bulk collect into l_results - from table( - ut3_develop.ut.run( - a_path => 'ut3_develop:coverage_testing', - a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), - a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.dummy_coverage' ) - ) - ); - ut3_tester_helper.coverage_helper.cleanup_dummy_coverage(); - ut3_tester_helper.coverage_helper.drop_dummy_coverage_pkg(); - ut3_tester_helper.coverage_helper.create_dummy_coverage_test_1(); - - --Act - select * - bulk collect into l_results - from table( - ut3_develop.ut.run( - a_path => 'ut3_develop:coverage_testing', - a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), - a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.dummy_coverage' ) - ) - ); - - --Assert - l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); - ut.expect(l_actual).to_equal(to_clob(' - -')); - end; - -end; -/ From a23f7be2161626c0055f7a370a061d42a2715461 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Wed, 10 Jun 2020 23:30:50 +0000 Subject: [PATCH 0706/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index aca93a957..2d0bce9da 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 4fcdda511..23fc28fc7 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 884fc6c07..0e8334ea1 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 63f8e851d..b7ae9d169 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index e0cf1b0c9..22387ed5a 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 7ed3dce21..202ddbbad 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index cf72be22d..65a9ac0fe 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 0fbcb4851..576fe89b6 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 3b968ccc4..0f001a5a8 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 3487ffac6..72e5c476a 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 2a1044454..a9a29e213 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index bc9894cee..0de315b4a 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 385db7257..f3ab786e8 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 66b52496f..6ea157369 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 24dabecf8..ac03362a5 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 7bbbe2df1..a3d8b0cb0 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index af711ae4f..3c7565323 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 6bceb5261..7779c3dfe 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -769,7 +769,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.11.3392-develop + * secion v3.1.11.3400-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index ec8781391..c109a6c26 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.11.3392-develop'; + gc_version constant varchar2(50) := 'v3.1.11.3400-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 641d87c1cb40c260f4a7d2c2b6e6ef457ecb75ab Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 13 Jun 2020 22:14:51 +0100 Subject: [PATCH 0707/1096] Removed mocking API for coverage, Fixed failing tests for 11.2 and 12.1 Refactored some parts of tests --- source/core/coverage/ut_coverage.pkb | 14 -- source/core/coverage/ut_coverage.pks | 8 -- test/ut3_tester_helper/coverage_helper.pkb | 121 ++---------------- test/ut3_tester_helper/coverage_helper.pks | 21 +-- test/ut3_tester_helper/run_helper.pks | 1 - test/ut3_user/reporters/test_coverage.pkb | 11 -- test/ut3_user/reporters/test_coverage.pks | 8 +- .../test_cov_cobertura_reporter.pkb | 16 +-- .../test_coverage_sonar_reporter.pkb | 2 - .../test_coverage_standalone.pkb | 16 ++- .../test_coverage/test_coveralls_reporter.pkb | 15 +-- .../test_coverage/test_extended_coverage.pks | 4 +- .../test_html_extended_reporter.pkb | 5 +- .../test_html_proftab_reporter.pkb | 25 ++-- .../test_coverage/test_proftab_coverage.pkb | 2 +- .../test_coverage/test_proftab_coverage.pks | 2 +- 16 files changed, 49 insertions(+), 222 deletions(-) diff --git a/source/core/coverage/ut_coverage.pkb b/source/core/coverage/ut_coverage.pkb index 879b6f5b5..a05fa554a 100644 --- a/source/core/coverage/ut_coverage.pkb +++ b/source/core/coverage/ut_coverage.pkb @@ -16,7 +16,6 @@ create or replace package body ut_coverage is limitations under the License. */ - g_coverage_run_id raw(32); g_develop_mode boolean not null := false; g_is_started boolean not null := false; @@ -197,16 +196,6 @@ create or replace package body ut_coverage is ut_coverage_helper_profiler.coverage_resume(); end; - procedure mock_coverage_id( - a_coverage_run_id t_coverage_run_id, a_line_coverage_id integer, a_block_coverage_id integer - ) is - begin - g_develop_mode := true; - g_is_started := true; - g_coverage_run_id := a_coverage_run_id; - ut_coverage_helper.set_coverage_run_ids(a_coverage_run_id, a_line_coverage_id, a_block_coverage_id); - end; - procedure coverage_stop is begin if not is_develop_mode() then @@ -224,9 +213,6 @@ create or replace package body ut_coverage is l_line_no binary_integer; l_coverage_options ut_coverage_options := a_coverage_options; begin - if is_develop_mode() then - l_coverage_options.coverage_run_id := coalesce(g_coverage_run_id, l_coverage_options.coverage_run_id); - end if; --prepare global temp table with sources ut_event_manager.trigger_event('about to populate coverage temp table'); populate_tmp_table(l_coverage_options); diff --git a/source/core/coverage/ut_coverage.pks b/source/core/coverage/ut_coverage.pks index 5e960c5ea..ba5263dd2 100644 --- a/source/core/coverage/ut_coverage.pks +++ b/source/core/coverage/ut_coverage.pks @@ -64,14 +64,6 @@ create or replace package ut_coverage authid current_user is function is_develop_mode return boolean; - /*** - * Allows overwriting of private global variable g_coverage_id - * Used internally, only for unit testing of the framework only - */ - procedure mock_coverage_id( - a_coverage_run_id t_coverage_run_id, a_line_coverage_id integer, a_block_coverage_id integer - ); - procedure coverage_start(a_coverage_run_id t_coverage_run_id); procedure coverage_stop; diff --git a/test/ut3_tester_helper/coverage_helper.pkb b/test/ut3_tester_helper/coverage_helper.pkb index 9aec00f8e..20a041321 100644 --- a/test/ut3_tester_helper/coverage_helper.pkb +++ b/test/ut3_tester_helper/coverage_helper.pkb @@ -2,30 +2,17 @@ create or replace package body coverage_helper is g_job_no integer := 0; - procedure setup_mock_coverage_id is - begin - null; - end; - - procedure setup_long_name_package is + procedure create_long_name_package is pragma autonomous_transaction; begin execute immediate q'[create or replace package UT3_DEVELOP.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG is procedure do_stuff(i_input in number); - - procedure grant_myself; end;]'; execute immediate q'[create or replace package body UT3_DEVELOP.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG is procedure do_stuff(i_input in number) is begin if i_input = 2 then dbms_output.put_line('should not get here'); else dbms_output.put_line('should get here'); end if; end; - - procedure grant_myself is - begin - execute immediate 'grant debug,execute on UT3_DEVELOP.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG to ut3$user#'; - end; - end;]'; execute immediate q'[create or replace package UT3_DEVELOP.TEST_BLOCK_DUMMY_COVERAGE is @@ -34,9 +21,6 @@ create or replace package body coverage_helper is --%test procedure test_do_stuff; - - procedure grant_myself; - end;]'; execute immediate q'[create or replace package body UT3_DEVELOP.TEST_BLOCK_DUMMY_COVERAGE is procedure test_do_stuff is @@ -44,26 +28,11 @@ create or replace package body coverage_helper is dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long.do_stuff(1); ut.expect(1).to_equal(1); end; - - procedure grant_myself is - begin - execute immediate 'grant debug,execute on UT3_DEVELOP.TEST_BLOCK_DUMMY_COVERAGE to ut3$user#'; - end; end;]'; - - execute immediate 'begin UT3_DEVELOP.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG.grant_myself(); end;'; - execute immediate 'begin UT3_DEVELOP.TEST_BLOCK_DUMMY_COVERAGE.grant_myself(); end;'; - - commit; - end; - - procedure mock_coverage_data(a_user in varchar2) is - begin - null; end; - procedure cleanup_long_name_package is + procedure drop_long_name_package is pragma autonomous_transaction; begin begin @@ -78,14 +47,15 @@ create or replace package body coverage_helper is end; end; - procedure create_dummy_coverage_package is + + + + procedure create_dummy_coverage is pragma autonomous_transaction; begin execute immediate 'alter session set plsql_optimize_level=0'; execute immediate q'[create or replace package UT3_DEVELOP.DUMMY_COVERAGE is procedure do_stuff; - - procedure grant_myself; end;]'; execute immediate q'[create or replace package body UT3_DEVELOP.DUMMY_COVERAGE is procedure do_stuff is @@ -96,19 +66,7 @@ create or replace package body coverage_helper is dbms_output.put_line('should get here'); end if; end; - - procedure grant_myself is - begin - execute immediate 'grant debug,execute on UT3_DEVELOP.DUMMY_COVERAGE to ut3$user#'; - execute immediate 'grant debug,execute on UT3_DEVELOP.DUMMY_COVERAGE to ut3_tester_helper'; - end; end;]'; - - end; - - procedure create_dummy_coverage_test is - pragma autonomous_transaction; - begin execute immediate q'[create or replace package UT3_DEVELOP.TEST_DUMMY_COVERAGE is --%suite(dummy coverage test) --%suitepath(coverage_testing) @@ -118,8 +76,6 @@ create or replace package body coverage_helper is --%test procedure zero_coverage; - - procedure grant_myself; end;]'; execute immediate q'[create or replace package body UT3_DEVELOP.TEST_DUMMY_COVERAGE is procedure test_do_stuff is @@ -131,23 +87,11 @@ create or replace package body coverage_helper is begin null; end; - - procedure grant_myself is - begin - execute immediate 'grant debug,execute on UT3_DEVELOP.TEST_DUMMY_COVERAGE to ut3$user#'; - end; end;]'; end; - - procedure grant_exec_on_cov is - pragma autonomous_transaction; - begin - execute immediate 'begin UT3_DEVELOP.DUMMY_COVERAGE.grant_myself(); end;'; - execute immediate 'begin UT3_DEVELOP.TEST_DUMMY_COVERAGE.grant_myself(); end;'; - end; - - procedure drop_dummy_coverage_pkg is + + procedure drop_dummy_coverage is pragma autonomous_transaction; begin begin execute immediate q'[drop package ut3_develop.test_dummy_coverage]'; exception when others then null; end; @@ -160,7 +104,6 @@ create or replace package body coverage_helper is begin execute immediate q'[create or replace package UT3_DEVELOP.DUMMY_COVERAGE_1 is procedure do_stuff; - procedure grant_myself; end;]'; execute immediate q'[create or replace package body UT3_DEVELOP.DUMMY_COVERAGE_1 is procedure do_stuff is @@ -171,12 +114,6 @@ create or replace package body coverage_helper is dbms_output.put_line('should get here'); end if; end; - - procedure grant_myself is - begin - execute immediate 'grant debug,execute on UT3_DEVELOP.DUMMY_COVERAGE_1 to ut3$user#'; - end; - end;]'; execute immediate q'[create or replace package UT3_DEVELOP.TEST_DUMMY_COVERAGE_1 is --%suite(dummy coverage test 1) @@ -184,8 +121,6 @@ create or replace package body coverage_helper is --%test procedure test_do_stuff; - - procedure grant_myself; end;]'; execute immediate q'[create or replace package body UT3_DEVELOP.TEST_DUMMY_COVERAGE_1 is procedure test_do_stuff is @@ -193,14 +128,7 @@ create or replace package body coverage_helper is dummy_coverage_1.do_stuff; end; - procedure grant_myself is - begin - execute immediate 'grant debug,execute on UT3_DEVELOP.TEST_DUMMY_COVERAGE_1 to ut3$user#'; - end; - end;]'; - execute immediate 'begin UT3_DEVELOP.DUMMY_COVERAGE_1.grant_myself(); end;'; - execute immediate 'begin UT3_DEVELOP.TEST_DUMMY_COVERAGE_1.grant_myself(); end;'; end; procedure drop_dummy_coverage_test_1 is @@ -210,39 +138,6 @@ create or replace package body coverage_helper is begin execute immediate q'[drop package UT3_DEVELOP.TEST_DUMMY_COVERAGE_1]'; exception when others then null; end; end; - procedure mock_block_coverage_data(a_run_id integer,a_user in varchar2) is - c_unit_id constant integer := 1; - begin - insert into dbmspcc_runs ( run_id, run_owner, run_timestamp, run_comment) - values(a_run_id, a_user, sysdate, 'unit testing utPLSQL'); - - insert into dbmspcc_units ( run_id, object_id, type, owner, name,last_ddl_time) - values(a_run_id, c_unit_id, 'PACKAGE BODY', 'UT3_DEVELOP', 'DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG',sysdate); - - insert into dbmspcc_blocks ( run_id, object_id, line,block,col,covered,not_feasible) - select a_run_id, c_unit_id,4,1,1,1,0 from dual union all - select a_run_id, c_unit_id,4,2,2,0,0 from dual union all - select a_run_id, c_unit_id,5,3,0,1,0 from dual union all - select a_run_id, c_unit_id,7,4,1,1,0 from dual; - end; - - procedure mock_profiler_coverage_data(a_run_id integer,a_user in varchar2) is - c_unit_id constant integer := 1; - begin - insert into ut3_develop.plsql_profiler_runs ( runid, run_owner, run_date, run_comment) - values(a_run_id, a_user, sysdate, 'unit testing utPLSQL'); - - insert into ut3_develop.plsql_profiler_units ( runid, unit_number, unit_type, unit_owner, unit_name) - values(a_run_id, c_unit_id, 'PACKAGE BODY', 'UT3_DEVELOP', 'DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG'); - - insert into ut3_develop.plsql_profiler_data ( runid, unit_number, line#, total_occur, total_time) - select a_run_id, c_unit_id, 4, 1, 1 from dual union all - select a_run_id, c_unit_id, 5, 0, 0 from dual union all - select a_run_id, c_unit_id, 6, 1, 0 from dual union all - select a_run_id, c_unit_id, 7, 1, 1 from dual; - end; - - procedure set_develop_mode is begin ut3_develop.ut_coverage.set_develop_mode(true); diff --git a/test/ut3_tester_helper/coverage_helper.pks b/test/ut3_tester_helper/coverage_helper.pks index 7abeb5770..124b1e24e 100644 --- a/test/ut3_tester_helper/coverage_helper.pks +++ b/test/ut3_tester_helper/coverage_helper.pks @@ -1,28 +1,15 @@ create or replace package coverage_helper is - type prof_runs_tab is table of ut3_develop.plsql_profiler_runs%rowtype; - - procedure setup_mock_coverage_id; - - procedure mock_coverage_data(a_user in varchar2); - - procedure cleanup_long_name_package; - - procedure setup_long_name_package; + procedure create_long_name_package; + procedure drop_long_name_package; --Profiler coverage - procedure create_dummy_coverage_package; - procedure create_dummy_coverage_test; - procedure grant_exec_on_cov; - procedure mock_profiler_coverage_data(a_run_id integer,a_user in varchar2); - procedure drop_dummy_coverage_pkg; + procedure create_dummy_coverage; + procedure drop_dummy_coverage; procedure create_dummy_coverage_test_1; procedure drop_dummy_coverage_test_1; - --Block coverage - procedure mock_block_coverage_data(a_run_id integer,a_user in varchar2); - procedure set_develop_mode; procedure run_standalone_coverage(a_coverage_run_id raw, a_input integer); diff --git a/test/ut3_tester_helper/run_helper.pks b/test/ut3_tester_helper/run_helper.pks index 88f55d961..0657c1a51 100644 --- a/test/ut3_tester_helper/run_helper.pks +++ b/test/ut3_tester_helper/run_helper.pks @@ -3,7 +3,6 @@ create or replace package run_helper is g_run_id integer; type t_out_buff_tab is table of ut3_develop.ut_output_buffer_tmp%rowtype; - type prof_runs_tab is table of ut3_develop.plsql_profiler_runs%rowtype; procedure setup_cache_objects; procedure setup_cache_objectstag; diff --git a/test/ut3_user/reporters/test_coverage.pkb b/test/ut3_user/reporters/test_coverage.pkb index dcee1f8f8..6a7536370 100644 --- a/test/ut3_user/reporters/test_coverage.pkb +++ b/test/ut3_user/reporters/test_coverage.pkb @@ -1,15 +1,4 @@ create or replace package body test_coverage is - procedure setup is - pragma autonomous_transaction; - begin - ut3_tester_helper.coverage_helper.create_dummy_coverage_package(); - ut3_tester_helper.coverage_helper.create_dummy_coverage_test(); - ut3_tester_helper.coverage_helper.grant_exec_on_cov(); - ut3_tester_helper.coverage_helper.setup_mock_coverage_id(); - ut3_tester_helper.coverage_helper.mock_coverage_data(user); - commit; - end; - end; / diff --git a/test/ut3_user/reporters/test_coverage.pks b/test/ut3_user/reporters/test_coverage.pks index bc9379298..ea906ff62 100644 --- a/test/ut3_user/reporters/test_coverage.pks +++ b/test/ut3_user/reporters/test_coverage.pks @@ -9,13 +9,11 @@ create or replace package test_coverage is gc_block_coverage_enabled constant boolean := false; $end - --%beforeall - procedure setup; - --%beforeall(ut3_tester_helper.coverage_helper.create_test_results_table) + --%beforeall(ut3_tester_helper.coverage_helper.create_dummy_coverage) + - --%afterall(ut3_tester_helper.coverage_helper.drop_dummy_coverage_pkg) - --%afterall(ut3_tester_helper.coverage_helper.cleanup_long_name_package) + --%afterall(ut3_tester_helper.coverage_helper.drop_dummy_coverage) --%afterall(ut3_tester_helper.coverage_helper.drop_test_results_table) end; diff --git a/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb index a0ee44219..c8a97bb71 100644 --- a/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb +++ b/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb @@ -8,7 +8,7 @@ create or replace package body test_cov_cobertura_reporter is l_expected := q'[ - + test/ut3_develop.dummy_coverage.pkb @@ -19,8 +19,6 @@ create or replace package body test_cov_cobertura_reporter is - - @@ -50,7 +48,7 @@ create or replace package body test_cov_cobertura_reporter is l_expected := q'[ - + ut3_develop.dummy_coverage @@ -68,19 +66,13 @@ create or replace package body test_cov_cobertura_reporter is - - - - - - ]'; - ut3_tester_helper.coverage_helper.cleanup_long_name_package(); + ut3_tester_helper.coverage_helper.drop_long_name_package(); --Act l_actual := ut3_tester_helper.coverage_helper.run_tests_as_job( @@ -95,7 +87,7 @@ create or replace package body test_cov_cobertura_reporter is --Assert ut.expect(l_actual).to_be_like(l_expected); --Cleanup - test_coverage.setup; + ut3_tester_helper.coverage_helper.create_dummy_coverage; end; end; diff --git a/test/ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pkb index e6c71563f..935c7d10b 100644 --- a/test/ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pkb +++ b/test/ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pkb @@ -17,8 +17,6 @@ create or replace package body test_coverage_sonar_reporter is '||l_block_cov||' - - '; --Act diff --git a/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb b/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb index 1b508cc01..b72ec9217 100644 --- a/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb +++ b/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb @@ -4,14 +4,20 @@ create or replace package body test_coverage_standalone is l_coverage_run_id raw(32) := sys_guid(); l_actual ut3_develop.ut_varchar2_list; l_expected clob; + l_block_cov clob; begin --Arrange + if test_coverage.gc_block_coverage_enabled then + l_block_cov := '%'; + else + l_block_cov := '%'; + end if; l_expected := '%ut3_tester_helper.coverage_pkg' || - '%' || - '%' || - '%%'; + '%' || + l_block_cov || + '%%'; --Act ut3_tester_helper.coverage_helper.run_coverage_job(l_coverage_run_id, 1); ut3_tester_helper.coverage_helper.run_coverage_job(l_coverage_run_id, 3); diff --git a/test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb index 56290ea3d..1baf88a61 100644 --- a/test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb +++ b/test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb @@ -14,14 +14,7 @@ null, 1, 0, null, -1, -null, -null, -null, -null, -null, -0, -0 +1 ] } ]} @@ -58,12 +51,6 @@ null, 0, 0, 0, -0, -0, -0, -0, -0, -0, 0 ] } diff --git a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pks b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pks index b2abb7c6d..bbc644100 100644 --- a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pks +++ b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pks @@ -3,8 +3,8 @@ create or replace package test_extended_coverage is --%suite --%suitepath(utplsql.test_user.reporters.test_coverage) - --%beforeall(ut3_tester_helper.coverage_helper.setup_long_name_package) - --%afterall(ut3_tester_helper.coverage_helper.cleanup_long_name_package) + --%beforeall(ut3_tester_helper.coverage_helper.create_long_name_package) + --%afterall(ut3_tester_helper.coverage_helper.drop_long_name_package) --%test(Coverage is gathered for specified object - extended coverage type) diff --git a/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pkb index f54c8bda3..b7b8722e4 100644 --- a/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pkb +++ b/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pkb @@ -1,7 +1,6 @@ create or replace package body test_html_extended_reporter is procedure report_on_file is - l_results ut3_develop.ut_varchar2_list; l_expected varchar2(32767); l_actual clob; l_charset varchar2(100) := 'ISO-8859-1'; @@ -9,8 +8,8 @@ create or replace package body test_html_extended_reporter is --Arrange l_expected := '%%

UT3_DEVELOP.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_' || 'LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG

' || - '%2 relevant lines. 1 lines covered ' || - '(including 1 lines partially covered ) and 1 lines missed%'; + '%1 relevant lines. 1 lines covered ' || + '(including 1 lines partially covered ) and 0 lines missed%'; l_actual := ut3_tester_helper.coverage_helper.run_tests_as_job( diff --git a/test/ut3_user/reporters/test_coverage/test_html_proftab_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_html_proftab_reporter.pkb index 9f3fb90e5..2102137ee 100644 --- a/test/ut3_user/reporters/test_coverage/test_html_proftab_reporter.pkb +++ b/test/ut3_user/reporters/test_coverage/test_html_proftab_reporter.pkb @@ -1,7 +1,6 @@ create or replace package body test_html_proftab_reporter is procedure report_on_file is - l_results ut3_develop.ut_varchar2_list; l_expected varchar2(32767); l_actual clob; l_charset varchar2(100) := 'ISO-8859-1'; @@ -9,18 +8,18 @@ create or replace package body test_html_proftab_reporter is --Arrange l_expected := '%%

UT3_DEVELOP.DUMMY_COVERAGE

%3 relevant lines. 2 lines covered and 1 lines missed%'; --Act - select * - bulk collect into l_results - from table( - ut3_develop.ut.run( - a_path => 'ut3_develop.test_dummy_coverage', - a_reporter=> ut3_develop.ut_coverage_html_reporter(), - a_source_files => ut3_develop.ut_varchar2_list( 'test/ut3_develop.dummy_coverage.pkb' ), - a_test_files => ut3_develop.ut_varchar2_list( ), - a_client_character_set => l_charset - ) - ); - l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + l_actual := + ut3_tester_helper.coverage_helper.run_tests_as_job( + q'[ + ut3_develop.ut.run( + a_path => 'ut3_develop.test_dummy_coverage', + a_reporter=> ut3_develop.ut_coverage_html_reporter(), + a_source_files => ut3_develop.ut_varchar2_list( 'test/ut3_develop.dummy_coverage.pkb' ), + a_test_files => ut3_develop.ut_varchar2_list( ), + a_client_character_set => ']'||l_charset||q'[' + ) + ]' + ); --Assert ut.expect(l_actual).to_be_like(l_expected); end; diff --git a/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb b/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb index e55d0abec..a707c33d2 100644 --- a/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb +++ b/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb @@ -105,7 +105,7 @@ create or replace package body test_proftab_coverage is a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.dummy_coverage' ) ) ); - coverage_helper.drop_dummy_coverage_pkg(); + coverage_helper.drop_dummy_coverage(); coverage_helper.create_dummy_coverage_test_1(); --Act diff --git a/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pks b/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pks index 8c9ecd5f8..3bfec567c 100644 --- a/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pks +++ b/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pks @@ -16,7 +16,7 @@ create or replace package test_proftab_coverage is procedure coverage_for_file; --%test(Coverage data is not cached between runs - issue #562 ) - --%aftertest(ut3$user#.test_coverage.setup) + --%aftertest(ut3_tester_helper.coverage_helper.create_dummy_coverage) --%aftertest(ut3_tester_helper.coverage_helper.drop_dummy_coverage_test_1) procedure coverage_tmp_data_refresh; From 52e1db9cbc94632f51f9d5f723a812f94847c31d Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 14 Jun 2020 01:06:11 +0100 Subject: [PATCH 0708/1096] Workaround for 12.2 issue with conditional compilation in package spec. Added missing testcase for get_report_cursor --- test/ut3_user/reporters/test_coverage.pkb | 9 +++++ test/ut3_user/reporters/test_coverage.pks | 6 +-- .../test_coverage_sonar_reporter.pkb | 2 +- .../test_coverage_standalone.pkb | 39 ++++++++++++++++++- .../test_coverage_standalone.pks | 2 + 5 files changed, 51 insertions(+), 7 deletions(-) diff --git a/test/ut3_user/reporters/test_coverage.pkb b/test/ut3_user/reporters/test_coverage.pkb index 6a7536370..aa1acde77 100644 --- a/test/ut3_user/reporters/test_coverage.pkb +++ b/test/ut3_user/reporters/test_coverage.pkb @@ -1,4 +1,13 @@ create or replace package body test_coverage is + function block_coverage_available return boolean is + begin + $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then + return true; + $else + return false; + $end + end; + end; / diff --git a/test/ut3_user/reporters/test_coverage.pks b/test/ut3_user/reporters/test_coverage.pks index ea906ff62..06eec3690 100644 --- a/test/ut3_user/reporters/test_coverage.pks +++ b/test/ut3_user/reporters/test_coverage.pks @@ -3,11 +3,7 @@ create or replace package test_coverage is --%suite --%suitepath(utplsql.test_user.reporters) - $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then - gc_block_coverage_enabled constant boolean := true; - $else - gc_block_coverage_enabled constant boolean := false; - $end + function block_coverage_available return boolean; --%beforeall(ut3_tester_helper.coverage_helper.create_test_results_table) --%beforeall(ut3_tester_helper.coverage_helper.create_dummy_coverage) diff --git a/test/ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pkb index 935c7d10b..477ad2ade 100644 --- a/test/ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pkb +++ b/test/ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pkb @@ -6,7 +6,7 @@ create or replace package body test_coverage_sonar_reporter is l_block_cov clob; begin --Arrange - if test_coverage.gc_block_coverage_enabled then + if test_coverage.block_coverage_available then l_block_cov := ''; else l_block_cov := ''; diff --git a/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb b/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb index b72ec9217..9aa0060ff 100644 --- a/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb +++ b/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb @@ -7,7 +7,7 @@ create or replace package body test_coverage_standalone is l_block_cov clob; begin --Arrange - if test_coverage.gc_block_coverage_enabled then + if test_coverage.block_coverage_available then l_block_cov := '%'; else l_block_cov := '%'; @@ -38,5 +38,42 @@ create or replace package body test_coverage_standalone is ut.expect(ut3_tester_helper.main_helper.table_to_clob(l_actual)).to_be_like( l_expected ); end; + procedure coverage_cursor_without_ut_run is + l_coverage_run_id raw(32) := sys_guid(); + l_coverage_cursor sys_refcursor; + l_actual ut3_develop.ut_varchar2_list; + l_expected clob; + l_block_cov clob; + begin + --Arrange + if test_coverage.block_coverage_available then + l_block_cov := '%'; + else + l_block_cov := '%'; + end if; + l_expected := '%ut3_tester_helper.coverage_pkg' || + '%' || + l_block_cov || + '%%'; + --Act + ut3_tester_helper.coverage_helper.run_coverage_job(l_coverage_run_id, 1); + ut3_tester_helper.coverage_helper.run_coverage_job(l_coverage_run_id, 3); + + --Assert + l_coverage_cursor := + ut3_develop.ut_coverage_cobertura_reporter( ).get_report_cursor( + ut3_develop.ut_coverage_options( + coverage_run_id => l_coverage_run_id, + include_objects => ut3_develop.ut_varchar2_rows('COVERAGE_PKG'), + schema_names => ut3_develop.ut_varchar2_rows('UT3_TESTER_HELPER') + ) + ); + fetch l_coverage_cursor bulk collect into l_actual; + close l_coverage_cursor; + ut.expect(ut3_tester_helper.main_helper.table_to_clob(l_actual)).to_be_like( l_expected ); + end; + end; / diff --git a/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pks b/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pks index 662dedf66..69aae3f25 100644 --- a/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pks +++ b/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pks @@ -9,5 +9,7 @@ create or replace package test_coverage_standalone authid current_user is --%test(Coverage can be invoked standalone in multiple sessions and a combined report can be produced at the end) procedure coverage_without_ut_run; + --%test(Coverage can be invoked standalone in multiple sessions and a combined report can be produced at the end as cursor) + procedure coverage_cursor_without_ut_run; end; / From a17c3aff4b45d085869c80cacd3d9437c3ac001f Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 14 Jun 2020 01:43:23 +0100 Subject: [PATCH 0709/1096] cleanup of unneeded safety code --- source/api/ut.pkb | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/source/api/ut.pkb b/source/api/ut.pkb index 72e868a9d..3b94a2bf7 100644 --- a/source/api/ut.pkb +++ b/source/api/ut.pkb @@ -248,12 +248,6 @@ create or replace package body ut is end loop; end if; return; - exception - when no_data_needed then - if l_results%isopen then - close l_results; - end if; - raise; end; function run( @@ -293,12 +287,6 @@ create or replace package body ut is end loop; end if; return; - exception - when no_data_needed then - if l_results%isopen then - close l_results; - end if; - raise; end; function run( @@ -339,12 +327,6 @@ create or replace package body ut is end loop; end if; return; - exception - when no_data_needed then - if l_results%isopen then - close l_results; - end if; - raise; end; function run( @@ -385,12 +367,6 @@ create or replace package body ut is end loop; end if; return; - exception - when no_data_needed then - if l_results%isopen then - close l_results; - end if; - raise; end; function run( @@ -431,12 +407,6 @@ create or replace package body ut is end loop; end if; return; - exception - when no_data_needed then - if l_results%isopen then - close l_results; - end if; - raise; end; function run( @@ -477,12 +447,6 @@ create or replace package body ut is end loop; end if; return; - exception - when no_data_needed then - if l_results%isopen then - close l_results; - end if; - raise; end; procedure run( From 09ab22632f7e83df3cb9e24b1a780b332ff0eac1 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 14 Jun 2020 03:47:14 +0100 Subject: [PATCH 0710/1096] Refactoring tests --- test/install_ut3_tester_helper.sql | 1 + test/install_ut3_user_tests.sql | 15 +-- test/ut3_tester_helper/coverage_helper.pkb | 119 ++++++++---------- test/ut3_tester_helper/coverage_helper.pks | 20 +-- test/ut3_user/reporters/test_coverage.pkb | 13 -- test/ut3_user/reporters/test_coverage.pks | 2 - .../test_cov_cobertura_reporter.pkb | 79 +++--------- .../test_cov_cobertura_reporter.pks | 3 - .../test_coverage_sonar_reporter.pkb | 13 +- .../test_coverage_standalone.pkb | 4 +- .../test_coverage/test_coveralls_reporter.pkb | 16 +-- .../test_coverage/test_extended_coverage.pkb | 32 +++-- .../test_coverage/test_extended_coverage.pks | 4 - ...er.pkb => test_html_coverage_reporter.pkb} | 18 ++- ...er.pks => test_html_coverage_reporter.pks} | 4 +- .../test_html_extended_reporter.pkb | 31 ----- .../test_html_proftab_reporter.pks | 10 -- .../test_coverage/test_proftab_coverage.pkb | 96 ++++++++++---- .../test_coverage/test_proftab_coverage.pks | 5 +- 19 files changed, 225 insertions(+), 260 deletions(-) delete mode 100644 test/ut3_user/reporters/test_coverage.pkb rename test/ut3_user/reporters/test_coverage/{test_html_proftab_reporter.pkb => test_html_coverage_reporter.pkb} (54%) rename test/ut3_user/reporters/test_coverage/{test_html_extended_reporter.pks => test_html_coverage_reporter.pks} (73%) delete mode 100644 test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pkb delete mode 100644 test/ut3_user/reporters/test_coverage/test_html_proftab_reporter.pks diff --git a/test/install_ut3_tester_helper.sql b/test/install_ut3_tester_helper.sql index c0c20634e..9841252a0 100644 --- a/test/install_ut3_tester_helper.sql +++ b/test/install_ut3_tester_helper.sql @@ -29,6 +29,7 @@ alter session set plsql_optimize_level=0; @@ut3_tester_helper/annotation_cache_helper.pks @@ut3_tester_helper/annotation_cache_helper.pkb create or replace synonym ut3_tester.annotation_cache_helper for ut3_tester_helper.annotation_cache_helper; +create or replace synonym ut3$user#.coverage_helper for ut3_tester_helper.coverage_helper; set linesize 200 set define on diff --git a/test/install_ut3_user_tests.sql b/test/install_ut3_user_tests.sql index 336a63241..e790293c8 100644 --- a/test/install_ut3_user_tests.sql +++ b/test/install_ut3_user_tests.sql @@ -44,15 +44,14 @@ set define off @@ut3_user/reporters/test_coverage.pks @@ut3_user/reporters/test_coverage/test_coverage_standalone.pks set define on -@@install_above_12_1.sql 'ut3_user/reporters/test_coverage/test_extended_coverage.pks' -@@install_above_12_1.sql 'ut3_user/reporters/test_coverage/test_html_extended_reporter.pks' +@@ut3_user/reporters/test_coverage/test_extended_coverage.pks +@@ut3_user/reporters/test_coverage/test_html_coverage_reporter.pks set define off @@ut3_user/reporters/test_coverage/test_coveralls_reporter.pks @@ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pks @@ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pks set define on -@@install_below_12_2.sql 'ut3_user/reporters/test_coverage/test_proftab_coverage.pks' -@@install_below_12_2.sql 'ut3_user/reporters/test_coverage/test_html_proftab_reporter.pks' +@@ut3_user/reporters/test_coverage/test_proftab_coverage.pks set define off @@ut3_user/test_user.pkb @@ -83,18 +82,16 @@ set define off @@ut3_user/reporters/test_documentation_reporter.pkb @@ut3_user/reporters/test_debug_reporter.pkb @@ut3_user/reporters/test_realtime_reporter.pkb -@@ut3_user/reporters/test_coverage.pkb @@ut3_user/reporters/test_coverage/test_coverage_standalone.pkb set define on -@@install_above_12_1.sql 'ut3_user/reporters/test_coverage/test_extended_coverage.pkb' -@@install_above_12_1.sql 'ut3_user/reporters/test_coverage/test_html_extended_reporter.pkb' +@@ut3_user/reporters/test_coverage/test_extended_coverage.pkb +@@ut3_user/reporters/test_coverage/test_html_coverage_reporter.pkb set define off @@ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb @@ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb @@ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pkb set define on -@@install_below_12_2.sql 'ut3_user/reporters/test_coverage/test_proftab_coverage.pkb' -@@install_below_12_2.sql 'ut3_user/reporters/test_coverage/test_html_proftab_reporter.pkb' +@@ut3_user/reporters/test_coverage/test_proftab_coverage.pkb set define off diff --git a/test/ut3_tester_helper/coverage_helper.pkb b/test/ut3_tester_helper/coverage_helper.pkb index 20a041321..67bef571a 100644 --- a/test/ut3_tester_helper/coverage_helper.pkb +++ b/test/ut3_tester_helper/coverage_helper.pkb @@ -2,72 +2,56 @@ create or replace package body coverage_helper is g_job_no integer := 0; - procedure create_long_name_package is - pragma autonomous_transaction; + function block_coverage_available return boolean is begin - execute immediate q'[create or replace package UT3_DEVELOP.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG is - procedure do_stuff(i_input in number); - end;]'; - execute immediate q'[create or replace package body UT3_DEVELOP.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG is - procedure do_stuff(i_input in number) is - begin - if i_input = 2 then dbms_output.put_line('should not get here'); else dbms_output.put_line('should get here'); end if; - end; - end;]'; - - execute immediate q'[create or replace package UT3_DEVELOP.TEST_BLOCK_DUMMY_COVERAGE is - --%suite(dummy coverage test) - --%suitepath(coverage_testing) - - --%test - procedure test_do_stuff; - end;]'; - execute immediate q'[create or replace package body UT3_DEVELOP.TEST_BLOCK_DUMMY_COVERAGE is - procedure test_do_stuff is - begin - dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long.do_stuff(1); - ut.expect(1).to_equal(1); - end; - end;]'; - + $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then + return true; + $else + return false; + $end end; - procedure drop_long_name_package is - pragma autonomous_transaction; + function covered_package_name return varchar2 is begin - begin - execute immediate q'[drop package ut3_develop.test_block_dummy_coverage]'; - exception - when others then null; - end; - begin - execute immediate q'[drop package ut3_develop.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long]'; - exception - when others then null; - end; + $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then + return 'dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long'; + $else + return 'dummy_coverage'; + $end end; + function substitute_covered_package( + a_text varchar2, + a_substitution varchar2 + ) return varchar2 is + begin + return replace( replace( a_text, a_substitution, covered_package_name() ), upper(a_substitution), upper(covered_package_name()) ); + end; + procedure set_develop_mode is + begin + ut3_develop.ut_coverage.set_develop_mode(true); + end; procedure create_dummy_coverage is pragma autonomous_transaction; begin - execute immediate 'alter session set plsql_optimize_level=0'; - execute immediate q'[create or replace package UT3_DEVELOP.DUMMY_COVERAGE is - procedure do_stuff; + execute immediate q'[create or replace package ut3_develop.]'||covered_package_name||q'[ is + procedure do_stuff(i_input in number); end;]'; - execute immediate q'[create or replace package body UT3_DEVELOP.DUMMY_COVERAGE is - procedure do_stuff is + + execute immediate q'[create or replace package body ut3_develop.]'||covered_package_name||q'[ is + procedure do_stuff(i_input in number) is begin - if 1 = 2 then - dbms_output.put_line('should not get here'); + if i_input = 2 then dbms_output.put_line('should not get here'); elsif i_input = 1 then dbms_output.put_line('should get here'); else - dbms_output.put_line('should get here'); + dbms_output.put_line('should not get here'); end if; end; end;]'; - execute immediate q'[create or replace package UT3_DEVELOP.TEST_DUMMY_COVERAGE is + + execute immediate q'[create or replace package ut3_develop.test_dummy_coverage is --%suite(dummy coverage test) --%suitepath(coverage_testing) @@ -77,35 +61,37 @@ create or replace package body coverage_helper is --%test procedure zero_coverage; end;]'; - execute immediate q'[create or replace package body UT3_DEVELOP.TEST_DUMMY_COVERAGE is + + execute immediate q'[create or replace package body ut3_develop.test_dummy_coverage is procedure test_do_stuff is begin - dummy_coverage.do_stuff; + ]'||covered_package_name||q'[.do_stuff(1); + ut.expect(1).to_equal(1); end; - procedure zero_coverage is begin null; end; end;]'; - + end; procedure drop_dummy_coverage is pragma autonomous_transaction; begin - begin execute immediate q'[drop package ut3_develop.test_dummy_coverage]'; exception when others then null; end; - begin execute immediate q'[drop package ut3_develop.dummy_coverage]'; exception when others then null; end; + begin execute immediate q'[drop package ut3_develop.test_dummy_coverage]'; exception when others then null; end; + begin execute immediate q'[drop package ut3_develop.]'||covered_package_name; exception when others then null; end; end; - procedure create_dummy_coverage_test_1 is + procedure create_dummy_coverage_1 is pragma autonomous_transaction; begin - execute immediate q'[create or replace package UT3_DEVELOP.DUMMY_COVERAGE_1 is + execute immediate q'[create or replace package ut3_develop.dummy_coverage_1 is procedure do_stuff; end;]'; - execute immediate q'[create or replace package body UT3_DEVELOP.DUMMY_COVERAGE_1 is + + execute immediate q'[create or replace package body ut3_develop.dummy_coverage_1 is procedure do_stuff is begin if 1 = 2 then @@ -115,14 +101,16 @@ create or replace package body coverage_helper is end if; end; end;]'; - execute immediate q'[create or replace package UT3_DEVELOP.TEST_DUMMY_COVERAGE_1 is + + execute immediate q'[create or replace package ut3_develop.test_dummy_coverage_1 is --%suite(dummy coverage test 1) --%suitepath(coverage_testing) --%test procedure test_do_stuff; end;]'; - execute immediate q'[create or replace package body UT3_DEVELOP.TEST_DUMMY_COVERAGE_1 is + + execute immediate q'[create or replace package body ut3_develop.test_dummy_coverage_1 is procedure test_do_stuff is begin dummy_coverage_1.do_stuff; @@ -131,16 +119,11 @@ create or replace package body coverage_helper is end;]'; end; - procedure drop_dummy_coverage_test_1 is + procedure drop_dummy_coverage_1 is pragma autonomous_transaction; begin - begin execute immediate q'[drop package UT3_DEVELOP.DUMMY_COVERAGE_1]'; exception when others then null; end; - begin execute immediate q'[drop package UT3_DEVELOP.TEST_DUMMY_COVERAGE_1]'; exception when others then null; end; - end; - - procedure set_develop_mode is - begin - ut3_develop.ut_coverage.set_develop_mode(true); + begin execute immediate q'[drop package ut3_develop.dummy_coverage_1]'; exception when others then null; end; + begin execute immediate q'[drop package ut3_develop.test_dummy_coverage_1]'; exception when others then null; end; end; procedure create_coverage_pkg is @@ -169,6 +152,8 @@ create or replace package body coverage_helper is execute immediate q'[drop package coverage_pkg]'; end; + + procedure run_standalone_coverage(a_coverage_run_id raw, a_input integer) is x integer; begin diff --git a/test/ut3_tester_helper/coverage_helper.pks b/test/ut3_tester_helper/coverage_helper.pks index 124b1e24e..470b1971d 100644 --- a/test/ut3_tester_helper/coverage_helper.pks +++ b/test/ut3_tester_helper/coverage_helper.pks @@ -1,19 +1,25 @@ create or replace package coverage_helper is - procedure create_long_name_package; - procedure drop_long_name_package; + function block_coverage_available return boolean; - --Profiler coverage - procedure create_dummy_coverage; - procedure drop_dummy_coverage; + function covered_package_name return varchar2; - procedure create_dummy_coverage_test_1; - procedure drop_dummy_coverage_test_1; + function substitute_covered_package( + a_text varchar2, + a_substitution varchar2 := '{p}' + ) return varchar2; procedure set_develop_mode; + procedure create_dummy_coverage; + procedure drop_dummy_coverage; + + procedure create_dummy_coverage_1; + procedure drop_dummy_coverage_1; + procedure run_standalone_coverage(a_coverage_run_id raw, a_input integer); procedure run_coverage_job(a_coverage_run_id raw, a_input integer); + procedure create_coverage_pkg; procedure drop_coverage_pkg; diff --git a/test/ut3_user/reporters/test_coverage.pkb b/test/ut3_user/reporters/test_coverage.pkb deleted file mode 100644 index aa1acde77..000000000 --- a/test/ut3_user/reporters/test_coverage.pkb +++ /dev/null @@ -1,13 +0,0 @@ -create or replace package body test_coverage is - - function block_coverage_available return boolean is - begin - $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then - return true; - $else - return false; - $end - end; - -end; -/ diff --git a/test/ut3_user/reporters/test_coverage.pks b/test/ut3_user/reporters/test_coverage.pks index 06eec3690..11bc6d480 100644 --- a/test/ut3_user/reporters/test_coverage.pks +++ b/test/ut3_user/reporters/test_coverage.pks @@ -3,8 +3,6 @@ create or replace package test_coverage is --%suite --%suitepath(utplsql.test_user.reporters) - function block_coverage_available return boolean; - --%beforeall(ut3_tester_helper.coverage_helper.create_test_results_table) --%beforeall(ut3_tester_helper.coverage_helper.create_dummy_coverage) diff --git a/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb index c8a97bb71..098405ff9 100644 --- a/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb +++ b/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb @@ -3,91 +3,52 @@ create or replace package body test_cov_cobertura_reporter is procedure report_on_file is l_expected clob; l_actual clob; + l_block_cov clob; + l_name varchar2(250); + l_file_path varchar2(250); begin - --Arrange - l_expected := - q'[ - - - -test/ut3_develop.dummy_coverage.pkb - - - - - - - - - - - - -]'; - --Act - l_actual := - ut3_tester_helper.coverage_helper.run_tests_as_job( - q'[ - ut3_develop.ut.run( - a_path => 'ut3_develop.test_dummy_coverage', - a_reporter => ut3_develop.ut_coverage_cobertura_reporter( ), - a_source_files => ut3_develop.ut_varchar2_list( 'test/ut3_develop.dummy_coverage.pkb' ), - a_test_files => ut3_develop.ut_varchar2_list( ) - ) - ]' - ); - --Assert - ut.expect(l_actual).to_be_like(l_expected); - end; - procedure report_zero_coverage is - l_expected clob; - l_actual clob; - begin + --Arrange + l_name := ut3_tester_helper.coverage_helper.covered_package_name; + l_file_path := 'test/ut3_develop.'||ut3_tester_helper.coverage_helper.covered_package_name||'.pkb'; + if ut3_tester_helper.coverage_helper.block_coverage_available then + l_block_cov := ''; + else + l_block_cov := ''; + end if; l_expected := q'[ - + -ut3_develop.dummy_coverage +]'||l_file_path||q'[ - - + + - - - - - +]'||l_block_cov||q'[ - - - - ]'; - - ut3_tester_helper.coverage_helper.drop_long_name_package(); --Act l_actual := ut3_tester_helper.coverage_helper.run_tests_as_job( q'[ ut3_develop.ut.run( - 'ut3_develop.test_dummy_coverage.zero_coverage', - ut3_develop.ut_coverage_cobertura_reporter(), - a_include_objects => ut3_develop.ut_varchar2_list('UT3_DEVELOP.DUMMY_COVERAGE') + a_path => 'ut3_develop.test_dummy_coverage', + a_reporter => ut3_develop.ut_coverage_cobertura_reporter( ), + a_source_files => ut3_develop.ut_varchar2_list( ']'||l_file_path||q'[' ), + a_test_files => ut3_develop.ut_varchar2_list( ) ) ]' ); --Assert ut.expect(l_actual).to_be_like(l_expected); - --Cleanup - ut3_tester_helper.coverage_helper.create_dummy_coverage; end; end; diff --git a/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pks b/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pks index 0016641d5..365815964 100644 --- a/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pks +++ b/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pks @@ -6,8 +6,5 @@ create or replace package test_cov_cobertura_reporter is --%test(reports on a project file mapped to database object) procedure report_on_file; - --%test(reports zero coverage on each line of non-executed database object - Issue #917) - procedure report_zero_coverage; - end test_cov_cobertura_reporter; / diff --git a/test/ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pkb index 477ad2ade..50d7bfe4c 100644 --- a/test/ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pkb +++ b/test/ut3_user/reporters/test_coverage/test_coverage_sonar_reporter.pkb @@ -6,17 +6,16 @@ create or replace package body test_coverage_sonar_reporter is l_block_cov clob; begin --Arrange - if test_coverage.block_coverage_available then - l_block_cov := ''; + if ut3_tester_helper.coverage_helper.block_coverage_available then + l_block_cov := ''; else - l_block_cov := ''; + l_block_cov := ''; end if; l_expected := ' - - - + '||l_block_cov||' + '; --Act @@ -26,7 +25,7 @@ create or replace package body test_coverage_sonar_reporter is ut3_develop.ut.run( a_path => 'ut3_develop.test_dummy_coverage', a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), - a_source_files => ut3_develop.ut_varchar2_list( 'test/ut3_develop.dummy_coverage.pkb' ), + a_source_files => ut3_develop.ut_varchar2_list( 'test/ut3_develop.]'||ut3_tester_helper.coverage_helper.covered_package_name||q'[.pkb' ), a_test_files => ut3_develop.ut_varchar2_list( ) ) ]' diff --git a/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb b/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb index 9aa0060ff..8816d4895 100644 --- a/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb +++ b/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb @@ -7,7 +7,7 @@ create or replace package body test_coverage_standalone is l_block_cov clob; begin --Arrange - if test_coverage.block_coverage_available then + if ut3_tester_helper.coverage_helper.block_coverage_available then l_block_cov := '%'; else l_block_cov := '%'; @@ -46,7 +46,7 @@ create or replace package body test_coverage_standalone is l_block_cov clob; begin --Arrange - if test_coverage.block_coverage_available then + if ut3_tester_helper.coverage_helper.block_coverage_available then l_block_cov := '%'; else l_block_cov := '%'; diff --git a/test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb index 1baf88a61..48a62f7f6 100644 --- a/test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb +++ b/test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb @@ -3,18 +3,19 @@ create or replace package body test_coveralls_reporter is procedure report_on_file is l_expected clob; l_actual clob; + l_file_path varchar2(250); begin --Arrange + l_file_path := 'test/ut3_develop.'||ut3_tester_helper.coverage_helper.covered_package_name||'.pkb'; l_expected := q'[{"source_files":[ -{ "name": "test/ut3_develop.dummy_coverage.pkb", +{ "name": "]'||l_file_path||q'[", "coverage": [ null, null, null, -1, -0, +3, null, -1 +0 ] } ]} @@ -25,7 +26,7 @@ null, ut3_develop.ut.run( a_path => 'ut3_develop.test_dummy_coverage', a_reporter => ut3_develop.ut_coveralls_reporter( ), - a_source_files => ut3_develop.ut_varchar2_list( 'test/ut3_develop.dummy_coverage.pkb' ), + a_source_files => ut3_develop.ut_varchar2_list( ']'||l_file_path||q'[' ), a_test_files => ut3_develop.ut_varchar2_list( ) ) ]' @@ -40,7 +41,7 @@ null, begin --Arrange l_expected := q'[{"source_files":[ -{ "name": "ut3_develop.dummy_coverage", +{ "name": "ut3_develop.]'||ut3_tester_helper.coverage_helper.covered_package_name||q'[", "coverage": [ 0, 0, @@ -50,7 +51,6 @@ null, 0, 0, 0, -0, 0 ] } @@ -64,7 +64,7 @@ null, ut3_develop.ut.run( 'ut3_develop.test_dummy_coverage.zero_coverage', ut3_develop.ut_coveralls_reporter(), - a_include_objects => ut3_develop.ut_varchar2_list('UT3_DEVELOP.DUMMY_COVERAGE') + a_include_objects => ut3_develop.ut_varchar2_list('UT3_DEVELOP.]'||ut3_tester_helper.coverage_helper.covered_package_name||q'[') ) ]' ); diff --git a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb index 8617b79ce..4b995b7c8 100644 --- a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb +++ b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb @@ -1,19 +1,31 @@ create or replace package body test_extended_coverage is + function get_block_coverage_line return clob is + begin + return + case + when ut3_tester_helper.coverage_helper.block_coverage_available then + '%' + else + '%' + end; + end; procedure coverage_for_object is l_expected clob; l_actual clob; begin --Arrange - l_expected := '%%%'; + l_expected := '%' || + get_block_coverage_line|| + '%%'; --Act l_actual := ut3_tester_helper.coverage_helper.run_tests_as_job( q'[ ut3_develop.ut.run( - a_path => 'ut3_develop.test_block_dummy_coverage', + a_path => 'ut3_develop.test_dummy_coverage', a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), - a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long' ) + a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.]'||ut3_tester_helper.coverage_helper.covered_package_name||q'[' ) ) ]' ); @@ -26,13 +38,15 @@ create or replace package body test_extended_coverage is l_actual clob; begin --Arrange - l_expected := '%%%'; + l_expected := '%' || + get_block_coverage_line || + '%%'; --Act l_actual := ut3_tester_helper.coverage_helper.run_tests_as_job( q'[ ut3_develop.ut.run( - a_path => 'ut3_develop.test_block_dummy_coverage', + a_path => 'ut3_develop.test_dummy_coverage', a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), a_coverage_schemes => ut3_develop.ut_varchar2_list( 'ut3_develop' ) ) @@ -49,14 +63,16 @@ create or replace package body test_extended_coverage is l_file_path varchar2(250); begin --Arrange - l_file_path := 'test/ut3_develop.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long.pkb'; - l_expected := '%%%'; + l_file_path := 'test/ut3_develop.'||ut3_tester_helper.coverage_helper.covered_package_name||'.pkb'; + l_expected := '%' || + get_block_coverage_line || + '%%'; --Act l_actual := ut3_tester_helper.coverage_helper.run_tests_as_job( q'[ ut3_develop.ut.run( - a_path => 'ut3_develop.test_block_dummy_coverage', + a_path => 'ut3_develop.test_dummy_coverage', a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), a_source_files => ut3_develop.ut_varchar2_list( ']'||l_file_path||q'[' ), a_test_files => ut3_develop.ut_varchar2_list( ) diff --git a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pks b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pks index bbc644100..600a87e16 100644 --- a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pks +++ b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pks @@ -3,10 +3,6 @@ create or replace package test_extended_coverage is --%suite --%suitepath(utplsql.test_user.reporters.test_coverage) - --%beforeall(ut3_tester_helper.coverage_helper.create_long_name_package) - --%afterall(ut3_tester_helper.coverage_helper.drop_long_name_package) - - --%test(Coverage is gathered for specified object - extended coverage type) procedure coverage_for_object; diff --git a/test/ut3_user/reporters/test_coverage/test_html_proftab_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_html_coverage_reporter.pkb similarity index 54% rename from test/ut3_user/reporters/test_coverage/test_html_proftab_reporter.pkb rename to test/ut3_user/reporters/test_coverage/test_html_coverage_reporter.pkb index 2102137ee..d1645acae 100644 --- a/test/ut3_user/reporters/test_coverage/test_html_proftab_reporter.pkb +++ b/test/ut3_user/reporters/test_coverage/test_html_coverage_reporter.pkb @@ -1,20 +1,28 @@ -create or replace package body test_html_proftab_reporter is +create or replace package body test_html_coverage_reporter is procedure report_on_file is l_expected varchar2(32767); l_actual clob; + l_block_cov clob; + l_name varchar2(250); l_charset varchar2(100) := 'ISO-8859-1'; begin --Arrange - l_expected := '%%

UT3_DEVELOP.DUMMY_COVERAGE

%3 relevant lines. 2 lines covered and 1 lines missed%'; - --Act + l_name := ut3_tester_helper.coverage_helper.covered_package_name; + if ut3_tester_helper.coverage_helper.block_coverage_available then + l_block_cov := '(including 1 lines partially covered ) '; + end if; + l_expected := '%%

UT3_DEVELOP.'||upper(l_name)||'

' || + '%2 relevant lines. 1 lines covered ' || + l_block_cov || 'and 1 lines missed%'; + l_actual := ut3_tester_helper.coverage_helper.run_tests_as_job( q'[ ut3_develop.ut.run( a_path => 'ut3_develop.test_dummy_coverage', a_reporter=> ut3_develop.ut_coverage_html_reporter(), - a_source_files => ut3_develop.ut_varchar2_list( 'test/ut3_develop.dummy_coverage.pkb' ), + a_source_files => ut3_develop.ut_varchar2_list( 'test/ut3_develop.]'||l_name||q'[.pkb' ), a_test_files => ut3_develop.ut_varchar2_list( ), a_client_character_set => ']'||l_charset||q'[' ) @@ -24,5 +32,5 @@ create or replace package body test_html_proftab_reporter is ut.expect(l_actual).to_be_like(l_expected); end; -end test_html_proftab_reporter; +end test_html_coverage_reporter; / diff --git a/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pks b/test/ut3_user/reporters/test_coverage/test_html_coverage_reporter.pks similarity index 73% rename from test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pks rename to test/ut3_user/reporters/test_coverage/test_html_coverage_reporter.pks index 3158b3777..629d41793 100644 --- a/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pks +++ b/test/ut3_user/reporters/test_coverage/test_html_coverage_reporter.pks @@ -1,4 +1,4 @@ -create or replace package test_html_extended_reporter is +create or replace package test_html_coverage_reporter is --%suite(ut_html_extended_reporter) --%suitepath(utplsql.test_user.reporters.test_coverage.test_extended_coverage) @@ -6,5 +6,5 @@ create or replace package test_html_extended_reporter is --%test(reports on a project file mapped to database object in extended profiler coverage) procedure report_on_file; -end test_html_extended_reporter; +end test_html_coverage_reporter; / diff --git a/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pkb deleted file mode 100644 index b7b8722e4..000000000 --- a/test/ut3_user/reporters/test_coverage/test_html_extended_reporter.pkb +++ /dev/null @@ -1,31 +0,0 @@ -create or replace package body test_html_extended_reporter is - - procedure report_on_file is - l_expected varchar2(32767); - l_actual clob; - l_charset varchar2(100) := 'ISO-8859-1'; - begin - --Arrange - l_expected := '%%

UT3_DEVELOP.DUMMY_COVERAGE_PACKAGE_WITH_AN_AMAZINGLY_' || - 'LONG_NAME_THAT_YOU_WOULD_NOT_THINK_OF_IN_REAL_LIFE_PROJECT_BECAUSE_ITS_SIMPLY_TOO_LONG

' || - '%1 relevant lines. 1 lines covered ' || - '(including 1 lines partially covered ) and 0 lines missed%'; - - l_actual := - ut3_tester_helper.coverage_helper.run_tests_as_job( - q'[ - ut3_develop.ut.run( - a_path => 'ut3_develop.test_block_dummy_coverage', - a_reporter=> ut3_develop.ut_coverage_html_reporter(), - a_source_files => ut3_develop.ut_varchar2_list( 'test/ut3_develop.dummy_coverage_package_with_an_amazingly_long_name_that_you_would_not_think_of_in_real_life_project_because_its_simply_too_long.pkb' ), - a_test_files => ut3_develop.ut_varchar2_list( ), - a_client_character_set => ']'||l_charset||q'[' - ) - ]' - ); - --Assert - ut.expect(l_actual).to_be_like(l_expected); - end; - -end test_html_extended_reporter; -/ diff --git a/test/ut3_user/reporters/test_coverage/test_html_proftab_reporter.pks b/test/ut3_user/reporters/test_coverage/test_html_proftab_reporter.pks deleted file mode 100644 index 02973fbe0..000000000 --- a/test/ut3_user/reporters/test_coverage/test_html_proftab_reporter.pks +++ /dev/null @@ -1,10 +0,0 @@ -create or replace package test_html_proftab_reporter is - - --%suite(ut_html_proftab_reporter) - --%suitepath(utplsql.test_user.reporters.test_coverage.test_proftab_coverage) - - --%test(reports on a project file mapped to database object in profiler coverage) - procedure report_on_file; - -end test_html_proftab_reporter; -/ diff --git a/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb b/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb index a707c33d2..c6e087462 100644 --- a/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb +++ b/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb @@ -5,17 +5,19 @@ create or replace package body test_proftab_coverage is l_actual clob; begin --Arrange - l_expected := '%%'; + l_expected := coverage_helper.substitute_covered_package('%%'); --Act l_actual := ut3_tester_helper.coverage_helper.run_tests_as_job( - q'[ - ut3_develop.ut.run( - a_path => 'ut3_develop.test_dummy_coverage', - a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), - a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.dummy_coverage' ) - ) - ]' + coverage_helper.substitute_covered_package( + q'[ + ut3_develop.ut.run( + a_path => 'ut3_develop.test_dummy_coverage', + a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), + a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.{p}' ) + ) + ]' + ) ); --Assert ut.expect(l_actual).to_be_like(l_expected); @@ -26,17 +28,19 @@ create or replace package body test_proftab_coverage is l_actual clob; begin --Arrange - l_expected := '%%'; + l_expected := coverage_helper.substitute_covered_package('%%'); --Act l_actual := ut3_tester_helper.coverage_helper.run_tests_as_job( - q'[ - ut3_develop.ut.run( - a_path => 'ut3_develop.test_dummy_coverage', - a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), - a_include_objects => ut3_develop.ut_varchar2_list( 'dummy_coverage' ) - ) - ]' + coverage_helper.substitute_covered_package( + q'[ + ut3_develop.ut.run( + a_path => 'ut3_develop.test_dummy_coverage', + a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), + a_include_objects => ut3_develop.ut_varchar2_list( '{p}' ) + ) + ]' + ) ); --Assert ut.expect(l_actual).to_be_like(l_expected); @@ -67,10 +71,10 @@ create or replace package body test_proftab_coverage is procedure coverage_for_file is l_expected clob; l_actual clob; - l_file_path varchar2(100); + l_file_path varchar2(250); begin --Arrange - l_file_path := 'test/ut3_develop.dummy_coverage.pkb'; + l_file_path := coverage_helper.substitute_covered_package('test/ut3_develop.{p}.pkb'); l_expected := '%%'; --Act l_actual := @@ -102,11 +106,11 @@ create or replace package body test_proftab_coverage is ut3_develop.ut.run( a_path => 'ut3_develop:coverage_testing', a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), - a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.dummy_coverage' ) + a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.{p}' ) ) ); coverage_helper.drop_dummy_coverage(); - coverage_helper.create_dummy_coverage_test_1(); + coverage_helper.create_dummy_coverage_1(); --Act insert into test_results @@ -115,19 +119,67 @@ create or replace package body test_proftab_coverage is ut3_develop.ut.run( a_path => 'ut3_develop:coverage_testing', a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), - a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.dummy_coverage' ) + a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.{p}' ) ) ); commit; end; ]'; - l_actual := ut3_tester_helper.coverage_helper.run_code_as_job( l_test_code ); + l_actual := ut3_tester_helper.coverage_helper.run_code_as_job( coverage_helper.substitute_covered_package(l_test_code) ); --Assert ut.expect(l_actual).to_equal(to_clob(' ')); end; + procedure report_zero_coverage is + l_expected clob; + l_actual clob; + begin + --Arrange + l_expected := + q'[ + + + +ut3_develop.{p} + + + + + + + + + + + + + + + + + + +]'; + + --Act + l_actual := + ut3_tester_helper.coverage_helper.run_tests_as_job( + coverage_helper.substitute_covered_package( + q'[ + ut3_develop.ut.run( + 'ut3_develop.test_dummy_coverage.zero_coverage', + ut3_develop.ut_coverage_cobertura_reporter(), + a_include_objects => ut3_develop.ut_varchar2_list('UT3_DEVELOP.{P}') + ) + ]' + ) + ); + --Assert + ut.expect(l_actual).to_be_like(coverage_helper.substitute_covered_package(l_expected)); + end; + end; / diff --git a/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pks b/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pks index 3bfec567c..055422bf7 100644 --- a/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pks +++ b/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pks @@ -16,9 +16,12 @@ create or replace package test_proftab_coverage is procedure coverage_for_file; --%test(Coverage data is not cached between runs - issue #562 ) + --%aftertest(ut3_tester_helper.coverage_helper.drop_dummy_coverage_1) --%aftertest(ut3_tester_helper.coverage_helper.create_dummy_coverage) - --%aftertest(ut3_tester_helper.coverage_helper.drop_dummy_coverage_test_1) procedure coverage_tmp_data_refresh; + --%test(reports zero coverage on each line of non-executed database object - Issue #917) + procedure report_zero_coverage; + end; / From 631d6da109b9a50c19abd930fe6c6d41286ad4f9 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 14 Jun 2020 16:28:54 +0100 Subject: [PATCH 0711/1096] Renamed master to main --- .travis.yml | 2 +- .travis/push_docs_to_github_io.sh | 2 +- CONTRIBUTING.md | 2 +- development/refresh_sources.sh | 6 +++--- development/releasing.md | 10 +++++----- readme.md | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 265fc0888..d3299de4e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,7 +74,7 @@ before_install: - git fetch --unshallow # download latest utPLSQL release #- curl -LOk $(curl --silent https://api.github.com/repos/utPLSQL/utPLSQL/releases/latest | awk '/browser_download_url/ { print $2 }' | grep ".zip" | sed 's/"//g') - - git clone --depth=1 --branch=${SELFTESTING_BRANCH:-master} https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR + - git clone --depth=1 --branch=${SELFTESTING_BRANCH:-main} https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR # download latest utPLSQL-cli release - curl -Lk -o utPLSQL-cli.zip https://github.com/utPLSQL/utPLSQL-cli/releases/download/v${UTPLSQL_CLI_VERSION}/utPLSQL-cli.zip diff --git a/.travis/push_docs_to_github_io.sh b/.travis/push_docs_to_github_io.sh index e29f1c88c..80fd47b43 100644 --- a/.travis/push_docs_to_github_io.sh +++ b/.travis/push_docs_to_github_io.sh @@ -15,7 +15,7 @@ # Required ENV Variables LATEST_DOCS_BRANCH="develop" GITHUB_IO_REPO='utPLSQL/utPLSQL.github.io' -GITHUB_IO_BRANCH='master' +GITHUB_IO_BRANCH='main' # TRAVIS_* variables are set by travis directly and only need to be if testing externally diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 895b53fb9..a65b7b685 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -107,7 +107,7 @@ development/install.sh You now have the following: - sources from `develop` branch of your fork of utPLSQL repository in `utPLSQL/ut3_latest_release` directory -- sources from `master` branch of utPLSQL/utPLSQL repository in `utPLSQL/ut3_latest_release` directory +- sources from `main` branch of utPLSQL/utPLSQL repository in `utPLSQL/ut3_latest_release` directory - binaries of `utplsql-cli` in `utPLSQL/utPLSQL-cli` directory - database users created - your current branch of utPLSQL deployed into `ut3` schema diff --git a/development/refresh_sources.sh b/development/refresh_sources.sh index e051787a1..7af3aaec0 100755 --- a/development/refresh_sources.sh +++ b/development/refresh_sources.sh @@ -5,10 +5,10 @@ git rev-parse && cd "$(git rev-parse --show-cdup)" . development/env.sh -# remove sub-direcotry containing master branch shallow copy +# remove sub-direcotry containing main branch shallow copy rm -rf ${UTPLSQL_DIR:-utPLSQL_latest_release} -# clone utPLSQL master branch from upstream into utPLSQL sub-directory of your project -git clone --depth=1 --branch=${SELFTESTING_BRANCH:-master} https://github.com/utPLSQL/utPLSQL.git ${UTPLSQL_DIR:-utPLSQL_latest_release} +# clone utPLSQL main branch from upstream into utPLSQL sub-directory of your project +git clone --depth=1 --branch=${SELFTESTING_BRANCH:-main} https://github.com/utPLSQL/utPLSQL.git ${UTPLSQL_DIR:-utPLSQL_latest_release} rm -rf utPLSQL-cli/* # download latest release version of utPLSQL-cli diff --git a/development/releasing.md b/development/releasing.md index 93634018d..f85e18c3c 100644 --- a/development/releasing.md +++ b/development/releasing.md @@ -8,19 +8,19 @@ This step is performed, to confirm that the update of versions works properly. - create release branch from development branch and make sure to name the release branch: `release/vX.Y.Z` - update, commit and push at least one file change in the release branch, to kickoff a Travis build - wait for th build to complete successfully - - merge the release branch to master and wait for master build to complete successfully (do not use Squash/rebase for merge operation) - - create a Github release from the master branch using [github releases page](https://github.com/utPLSQL/utPLSQL/releases) and populate release description using information found on the issues and pull requests since previous release. + - merge the release branch to main and wait for main build to complete successfully (do not use Squash/rebase for merge operation) + - create a Github release from the main branch using [github releases page](https://github.com/utPLSQL/utPLSQL/releases) and populate release description using information found on the issues and pull requests since previous release. To find issues closed after certain date use [advanced filters](https://help.github.com/articles/searching-issues-and-pull-requests/#search-by-open-or-closed-state). Example: [`is:issue closed:>2018-07-22`](https://github.com/utPLSQL/utPLSQL/issues?utf8=%E2%9C%93&q=is%3Aissue+closed%3A%3E2018-07-22+) - - After A build was completed on a TAG (github release) was successful, merge master branch back into develop branch. - - At this point, master branch and release tag should be at the same commit version and artifacts should be uploaded into Github release. + - After A build was completed on a TAG (github release) was successful, merge main branch back into develop branch. + - At this point, main branch and release tag should be at the same commit version and artifacts should be uploaded into Github release. - After develop branch was built, update version number in `VERSION` file to represent next planned release version. - Clone `utplsql.githug.io` project and add a new announcement about next version being released in `_posts`. Use previous announcements as a template. Make sure to set date, time and post title properly. The following will happen: - build executed on branch `release/vX.Y.Z-[something]` updates files `sonar-project.properties`, `VERSION` with project version derived from the release branch name - changes to those two files are committed and pushed back to release branch by Travis - - builds on master branch are **not getting executed** + - builds on main branch are **not getting executed** - when a Github release is created, a new tag is added in on the repository and a tag build is executed - the documentation for new release is published on `utplsql.github.io` and installation archives are added to the tag. diff --git a/readme.md b/readme.md index 715b87302..7adecd3e0 100644 --- a/readme.md +++ b/readme.md @@ -8,7 +8,7 @@ [![chat](http://img.shields.io/badge/slack-team--chat-blue.svg)](https://join.slack.com/t/utplsql/shared_invite/zt-d6zor80g-WWqAhbLWioJZUtLYeXetzA) [![twitter](https://img.shields.io/twitter/follow/utPLSQL.svg?style=social&label=Follow)](https://twitter.com/utPLSQL) -[![build](https://img.shields.io/travis/utPLSQL/utPLSQL/master.svg?label=master%20branch)](https://travis-ci.org/utPLSQL/utPLSQL) +[![build](https://img.shields.io/travis/utPLSQL/utPLSQL/main.svg?label=main%20branch)](https://travis-ci.org/utPLSQL/utPLSQL) [![build](https://img.shields.io/travis/utPLSQL/utPLSQL/develop.svg?label=develop%20branch)](https://travis-ci.org/utPLSQL/utPLSQL) [![sonar](https://sonarcloud.io/api/project_badges/measure?project=utPLSQL&metric=sqale_rating)](https://sonarcloud.io/dashboard/index?id=utPLSQL) [![Coveralls coverage](https://coveralls.io/repos/github/utPLSQL/utPLSQL/badge.svg?branch=develop)](https://coveralls.io/github/utPLSQL/utPLSQL?branch=develop) From a660208acc592faee891a4ca22e7835fdca4224c Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sun, 14 Jun 2020 20:02:49 +0100 Subject: [PATCH 0712/1096] First code corrections --- docs/userguide/expectations.md | 18 +------ source/core/ut_utils.pkb | 18 ++----- source/core/ut_utils.pks | 3 ++ source/expectations/matchers/ut_be_within.tpb | 52 +++++++++---------- source/expectations/matchers/ut_be_within.tps | 12 ++--- .../expectations/matchers/ut_matcher_base.tps | 2 +- source/expectations/ut_expectation_base.tpb | 2 +- source/expectations/ut_expectation_base.tps | 4 +- 8 files changed, 44 insertions(+), 67 deletions(-) diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 4e93f0be1..3049ac447 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1126,22 +1126,6 @@ end; **Example 3.** ```sql -begin - ut.expect(sysdate).to_be_within_pct(interval '1' day).of_(sysdate + 1); -end; -/ -``` - -**Example 4.** -```sql -begin - ut.expect(sysdate).to_be_within_pct(interval '1' month).of_(add_months(sysdate,1)); -end; -/ -``` - -**Example 5.** -```sql begin ut.expect(3).to_be_within(1).of_(5); end; @@ -1158,7 +1142,7 @@ Failures: at "UT3_DEVELOP.TEST_BETWNSTR.WIHTIN_TEST", line 5 ``` -**Example 6.** +**Example 4.** ```sql begin ut.expect(sysdate).to_be_within(interval '1' day).of_(sysdate+2); diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 4b6c66d95..e2804a3b8 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -887,25 +887,18 @@ create or replace package body ut_utils is l_result := case when l_day = 1 then l_day ||' day' when l_day > 1 then l_day ||' days' - else null - end; - l_result := l_result || + end || case when l_hour = 1 then ' '|| l_hour ||' hour' when l_hour > 1 then ' '|| l_hour ||' hours' - else null - end; - l_result := l_result || + end || case when l_minute = 1 then ' '||l_minute ||' minute' when l_minute > 1 then ' '||l_minute ||' minutes' - else null - end; - l_result := l_result || + end || case when l_second = 1 then ' '||l_second ||' second' when l_second > 1 then ' '||l_second ||' seconds' - else null end; return trim(leading ' ' from l_result); end; @@ -918,13 +911,10 @@ create or replace package body ut_utils is l_result := case when l_year = 1 then l_year ||' year' when l_year > 1 then l_year ||' years' - else null - end; - l_result := l_result || + end || case when l_month = 1 then ' '||l_month ||' month' when l_month > 1 then ' '||l_month ||' months' - else null end; return trim(leading ' ' from l_result); end; diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 750b17a77..e8219374b 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -440,6 +440,9 @@ create or replace package ut_utils authid definer is */ function interval_to_text(a_interval dsinterval_unconstrained) return varchar2; + /* + * Return value of interval in plain english + */ function interval_to_text(a_interval yminterval_unconstrained) return varchar2; end ut_utils; diff --git a/source/expectations/matchers/ut_be_within.tpb b/source/expectations/matchers/ut_be_within.tpb index ab4ed8b6f..b6e975166 100644 --- a/source/expectations/matchers/ut_be_within.tpb +++ b/source/expectations/matchers/ut_be_within.tpb @@ -16,28 +16,28 @@ create or replace type body ut_be_within as limitations under the License. */ - member procedure init(self in out nocopy ut_be_within, a_dist ut_data_value, a_is_pct number , a_self_type varchar2 := null) is + member procedure init(self in out nocopy ut_be_within, a_distance_from_expected ut_data_value, a_is_pct number , a_self_type varchar2 := null) is begin - self.dist := a_dist; + self.distance_from_expected := a_distance_from_expected; self.is_pct := nvl(a_is_pct,0); self.self_type := nvl( a_self_type, $$plsql_unit ); end; - constructor function ut_be_within(self in out nocopy ut_be_within, a_dist number, a_is_pct number) return self as result is + constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected number, a_is_pct number) return self as result is begin - init(ut_data_value_number(a_dist),a_is_pct); + init(ut_data_value_number(a_distance_from_expected),a_is_pct); return; end; - constructor function ut_be_within(self in out nocopy ut_be_within, a_dist dsinterval_unconstrained, a_is_pct number) return self as result is + constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected dsinterval_unconstrained, a_is_pct number) return self as result is begin - init(ut_data_value_dsinterval(a_dist),a_is_pct); + init(ut_data_value_dsinterval(a_distance_from_expected),a_is_pct); return; end; - constructor function ut_be_within(self in out nocopy ut_be_within, a_dist yminterval_unconstrained, a_is_pct number) return self as result is + constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected yminterval_unconstrained, a_is_pct number) return self as result is begin - init(ut_data_value_yminterval(a_dist),a_is_pct); + init(ut_data_value_yminterval(a_distance_from_expected),a_is_pct); return; end; @@ -61,24 +61,24 @@ create or replace type body ut_be_within as if self.expected.data_type = a_actual.data_type then if self.expected is of (ut_data_value_number) and self.is_pct = 0 then l_result := abs((treat(self.expected as ut_data_value_number).data_value - treat(a_actual as ut_data_value_number).data_value)) <= - treat(self.dist as ut_data_value_number).data_value; + treat(self.distance_from_expected as ut_data_value_number).data_value; elsif self.expected is of (ut_data_value_number) and self.is_pct = 1 then - l_result := treat(self.dist as ut_data_value_number).data_value >= + l_result := treat(self.distance_from_expected as ut_data_value_number).data_value >= ( ((treat(self.expected as ut_data_value_number).data_value - treat(a_actual as ut_data_value_number).data_value ) * 100 ) / (treat(self.expected as ut_data_value_number).data_value)) ; - elsif self.expected is of (ut_data_value_date) and self.dist is of ( ut_data_value_yminterval) then + elsif self.expected is of (ut_data_value_date) and self.distance_from_expected is of ( ut_data_value_yminterval) then l_result := treat(a_actual as ut_data_value_date).data_value between - (treat(self.expected as ut_data_value_date).data_value) - treat(self.dist as ut_data_value_yminterval).data_value + (treat(self.expected as ut_data_value_date).data_value) - treat(self.distance_from_expected as ut_data_value_yminterval).data_value and - (treat(self.expected as ut_data_value_date).data_value) + treat(self.dist as ut_data_value_yminterval).data_value; - elsif self.expected is of (ut_data_value_date) and self.dist is of ( ut_data_value_dsinterval) then + (treat(self.expected as ut_data_value_date).data_value) + treat(self.distance_from_expected as ut_data_value_yminterval).data_value; + elsif self.expected is of (ut_data_value_date) and self.distance_from_expected is of ( ut_data_value_dsinterval) then l_result := treat(a_actual as ut_data_value_date).data_value between - (treat(self.expected as ut_data_value_date).data_value) - treat(self.dist as ut_data_value_dsinterval).data_value + (treat(self.expected as ut_data_value_date).data_value) - treat(self.distance_from_expected as ut_data_value_dsinterval).data_value and - (treat(self.expected as ut_data_value_date).data_value) + treat(self.dist as ut_data_value_dsinterval).data_value; + (treat(self.expected as ut_data_value_date).data_value) + treat(self.distance_from_expected as ut_data_value_dsinterval).data_value; end if; else l_result := (self as ut_matcher).run_matcher(a_actual); @@ -87,20 +87,20 @@ create or replace type body ut_be_within as end; overriding member function failure_message(a_actual ut_data_value) return varchar2 is - l_distance varchar2(32767); + l_distance_from_expected varchar2(32767); begin - l_distance := case - when self.dist is of (ut_data_value_number) then - treat(self.dist as ut_data_value_number).to_string - when self.dist is of (ut_data_value_yminterval) then - treat(self.dist as ut_data_value_yminterval).to_string - when self.dist is of (ut_data_value_dsinterval) then - treat(self.dist as ut_data_value_dsinterval).to_string + l_distance_from_expected := case + when self.distance_from_expected is of (ut_data_value_number) then + treat(self.distance_from_expected as ut_data_value_number).to_string + when self.distance_from_expected is of (ut_data_value_yminterval) then + treat(self.distance_from_expected as ut_data_value_yminterval).to_string + when self.distance_from_expected is of (ut_data_value_dsinterval) then + treat(self.distance_from_expected as ut_data_value_dsinterval).to_string else null end; - return (self as ut_matcher).failure_message(a_actual) || ' '||l_distance ||' of '|| expected.to_string_report(); + return (self as ut_matcher).failure_message(a_actual) || ' '||l_distance_from_expected ||' of '|| expected.to_string_report(); end; overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2 is @@ -110,4 +110,4 @@ create or replace type body ut_be_within as end; end; -/ \ No newline at end of file +/ diff --git a/source/expectations/matchers/ut_be_within.tps b/source/expectations/matchers/ut_be_within.tps index 30947d2aa..9b0d0109d 100644 --- a/source/expectations/matchers/ut_be_within.tps +++ b/source/expectations/matchers/ut_be_within.tps @@ -20,13 +20,13 @@ create or replace type ut_be_within under ut_comparison_matcher( /** * Holds information about mather options */ - dist ut_data_value, + distance_from_expected ut_data_value, is_pct number(1,0), - member procedure init(self in out nocopy ut_be_within, a_dist ut_data_value, a_is_pct number , a_self_type varchar2 := null), - constructor function ut_be_within(self in out nocopy ut_be_within, a_dist number, a_is_pct number) return self as result, - constructor function ut_be_within(self in out nocopy ut_be_within, a_dist dsinterval_unconstrained, a_is_pct number) return self as result, - constructor function ut_be_within(self in out nocopy ut_be_within, a_dist yminterval_unconstrained, a_is_pct number) return self as result, + member procedure init(self in out nocopy ut_be_within, a_distance_from_expected ut_data_value, a_is_pct number , a_self_type varchar2 := null), + constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected number, a_is_pct number) return self as result, + constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected dsinterval_unconstrained, a_is_pct number) return self as result, + constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected yminterval_unconstrained, a_is_pct number) return self as result, member procedure of_(self in ut_be_within, a_expected number), member procedure of_(self in ut_be_within, a_expected date), @@ -35,4 +35,4 @@ create or replace type ut_be_within under ut_comparison_matcher( overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2 ) not final -/ \ No newline at end of file +/ diff --git a/source/expectations/matchers/ut_matcher_base.tps b/source/expectations/matchers/ut_matcher_base.tps index ec37267a0..ef7fd98a2 100644 --- a/source/expectations/matchers/ut_matcher_base.tps +++ b/source/expectations/matchers/ut_matcher_base.tps @@ -2,4 +2,4 @@ create or replace type ut_matcher_base force authid current_user as object( self_type varchar2(250) ) not final not instantiable -/ \ No newline at end of file +/ diff --git a/source/expectations/ut_expectation_base.tpb b/source/expectations/ut_expectation_base.tpb index d657c2822..20b3e7a95 100644 --- a/source/expectations/ut_expectation_base.tpb +++ b/source/expectations/ut_expectation_base.tpb @@ -41,4 +41,4 @@ create or replace type body ut_expectation_base as ut_expectation_processor.add_expectation_result( ut_expectation_result( ut_utils.to_test_result( l_expectation_result ), self.description, l_message ) ); end; end; -/ \ No newline at end of file +/ diff --git a/source/expectations/ut_expectation_base.tps b/source/expectations/ut_expectation_base.tps index 87c0083b0..ad96ea97b 100644 --- a/source/expectations/ut_expectation_base.tps +++ b/source/expectations/ut_expectation_base.tps @@ -21,5 +21,5 @@ create or replace type ut_expectation_base force authid current_user as object( --base matcher executors member procedure to_(self in ut_expectation_base, a_matcher ut_matcher_base), member procedure not_to(self in ut_expectation_base, a_matcher ut_matcher_base) -) not final -/ \ No newline at end of file +) not final not instantiable +/ From ada1ea44fcaac3c118253f32ba710f2214e81705 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sun, 14 Jun 2020 20:35:33 +0100 Subject: [PATCH 0713/1096] Resolving another comment --- source/expectations/ut_expectation_compound.tpb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/source/expectations/ut_expectation_compound.tpb b/source/expectations/ut_expectation_compound.tpb index 7043ec053..ec6bf392c 100644 --- a/source/expectations/ut_expectation_compound.tpb +++ b/source/expectations/ut_expectation_compound.tpb @@ -35,11 +35,11 @@ create or replace type body ut_expectation_compound as member function to_equal(a_expected anydata, a_nulls_are_equal boolean := null) return ut_equal is - l_result ut_matcher; + l_result ut_equal; begin l_result := ut_equal(a_expected, a_nulls_are_equal); l_result.expectation := self; - return treat(l_result as ut_equal); + return l_result; end; member function not_to_equal(a_expected anydata, a_nulls_are_equal boolean := null) return ut_equal is @@ -51,11 +51,11 @@ create or replace type body ut_expectation_compound as end; member function to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_equal is - l_result ut_matcher; + l_result ut_equal; begin l_result := ut_equal(a_expected, a_nulls_are_equal); l_result.expectation := self; - return treat(l_result as ut_equal); + return l_result; end; member function not_to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_equal is @@ -67,11 +67,11 @@ create or replace type body ut_expectation_compound as end; member function to_contain(a_expected sys_refcursor) return ut_equal is - l_result ut_matcher; + l_result ut_equal; begin l_result := ut_contain(a_expected); l_result.expectation := self; - return treat(l_result as ut_equal); + return l_result; end; member function not_to_contain(a_expected sys_refcursor) return ut_equal is @@ -83,11 +83,11 @@ create or replace type body ut_expectation_compound as end; member function to_contain(a_expected anydata) return ut_equal is - l_result ut_matcher; + l_result ut_equal; begin l_result := ut_contain(a_expected); l_result.expectation := self; - return treat(l_result as ut_equal); + return l_result; end; member function not_to_contain(a_expected anydata) return ut_equal is From fe1b0cb4c93314257b196157e33eec42f3c7d251 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sun, 14 Jun 2020 20:51:18 +0100 Subject: [PATCH 0714/1096] Updating issues --- source/expectations/ut_expectation_compound.tpb | 16 ++++++++-------- source/expectations/ut_expectation_compound.tps | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/source/expectations/ut_expectation_compound.tpb b/source/expectations/ut_expectation_compound.tpb index ec6bf392c..6a2047aed 100644 --- a/source/expectations/ut_expectation_compound.tpb +++ b/source/expectations/ut_expectation_compound.tpb @@ -66,36 +66,36 @@ create or replace type body ut_expectation_compound as return treat(l_result as ut_equal); end; - member function to_contain(a_expected sys_refcursor) return ut_equal is - l_result ut_equal; + member function to_contain(a_expected sys_refcursor) return ut_contain is + l_result ut_contain; begin l_result := ut_contain(a_expected); l_result.expectation := self; return l_result; end; - member function not_to_contain(a_expected sys_refcursor) return ut_equal is + member function not_to_contain(a_expected sys_refcursor) return ut_contain is l_result ut_matcher; begin l_result := ut_contain(a_expected).negated(); l_result.expectation := self; - return treat(l_result as ut_equal); + return treat(l_result as ut_contain); end; - member function to_contain(a_expected anydata) return ut_equal is - l_result ut_equal; + member function to_contain(a_expected anydata) return ut_contain is + l_result ut_contain; begin l_result := ut_contain(a_expected); l_result.expectation := self; return l_result; end; - member function not_to_contain(a_expected anydata) return ut_equal is + member function not_to_contain(a_expected anydata) return ut_contain is l_result ut_matcher; begin l_result := ut_contain(a_expected).negated(); l_result.expectation := self; - return treat(l_result as ut_equal); + return treat(l_result as ut_contain); end; end; diff --git a/source/expectations/ut_expectation_compound.tps b/source/expectations/ut_expectation_compound.tps index a2c06ce76..71c5e2ce9 100644 --- a/source/expectations/ut_expectation_compound.tps +++ b/source/expectations/ut_expectation_compound.tps @@ -26,10 +26,10 @@ create or replace type ut_expectation_compound under ut_expectation( member function not_to_equal(a_expected anydata, a_nulls_are_equal boolean := null) return ut_equal, member function to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_equal, member function not_to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_equal, - member function to_contain(a_expected sys_refcursor) return ut_equal, - member function not_to_contain(a_expected sys_refcursor) return ut_equal, - member function to_contain(a_expected anydata) return ut_equal, - member function not_to_contain(a_expected anydata) return ut_equal + member function to_contain(a_expected sys_refcursor) return ut_contain, + member function not_to_contain(a_expected sys_refcursor) return ut_contain, + member function to_contain(a_expected anydata) return ut_contain, + member function not_to_contain(a_expected anydata) return ut_contain ) / From 013db74c9e0be8c67ffb7e3288b5027fac759296 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sun, 14 Jun 2020 23:12:56 +0100 Subject: [PATCH 0715/1096] Update tble --- docs/userguide/expectations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 3049ac447..3ecf8db0a 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -333,7 +333,7 @@ The matrix below illustrates the data types supported by different matchers. | **be_like** | | | X | | | | | | X | | | | | | | | **be_empty** | X | | X | | | | | | | | | X | X | | X | | **have_count** | | | | | | | | | | | | X | X | | X | -| **be_within().of_()** | | | | x | x | | | | | | | X | X | | X | +| **be_within().of_()** | | | | x | x | | | | | | | | | | | # Expecting exceptions From 4e7631b996b52d6317bf1bf30f6fb394b4124d81 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 15 Jun 2020 07:49:21 +0000 Subject: [PATCH 0716/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 2d0bce9da..40066e6aa 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 23fc28fc7..35cf2e9b8 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 0e8334ea1..c2d7c8f54 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index b7ae9d169..458a925a9 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 22387ed5a..8c47b7c55 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 202ddbbad..3baefddfc 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 65a9ac0fe..191f3fdc4 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 576fe89b6..0cd0fb9ae 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 0f001a5a8..e15167f1a 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 72e5c476a..fce6a83fd 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index a9a29e213..a43f3ebec 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 0de315b4a..95e82dcd9 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index f3ab786e8..fca4bcf13 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 6ea157369..7107cc139 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index ac03362a5..7730c7c6c 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index a3d8b0cb0..6f9774a8b 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 3c7565323..eab281d70 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3400--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 7779c3dfe..e12b91752 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -769,7 +769,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.11.3400-develop + * secion v3.1.11.3422-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index c109a6c26..b0ee188fc 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.11.3400-develop'; + gc_version constant varchar2(50) := 'v3.1.11.3422-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From b5c73b44898bfcfe28497f0ff27df4df892f6af2 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 19 Jun 2020 10:11:55 +0100 Subject: [PATCH 0717/1096] Separated into two different matchers Added synonym and grant for matcher Reworked expectation to work fine with syntax `to_( matcher() )` for to_be_within. TODO - add tests for other matchers with `to_( matcher )` and `not_to( matcher )` syntax --- source/api/be_within.syn | 1 + source/create_grants.sql | 1 + source/create_synonyms.sql | 1 + source/expectations/matchers/ut_be_within.tpb | 42 ++++++---- source/expectations/matchers/ut_be_within.tps | 14 ++-- .../matchers/ut_be_within_pct.tpb | 42 ++++++++++ .../matchers/ut_be_within_pct.tps | 24 ++++++ source/expectations/matchers/ut_matcher.tpb | 5 -- source/expectations/ut_expectation.tpb | 52 +++++++++--- source/expectations/ut_expectation.tps | 6 +- source/install.sql | 3 + .../ut3_tester_helper/expectations_helper.pkb | 24 ------ .../ut3_tester_helper/expectations_helper.pks | 10 --- .../expectations/binary/test_to_be_within.pkb | 81 ++++++++++++++++--- .../expectations/binary/test_to_be_within.pks | 2 +- 15 files changed, 220 insertions(+), 88 deletions(-) create mode 100644 source/api/be_within.syn create mode 100644 source/expectations/matchers/ut_be_within_pct.tpb create mode 100644 source/expectations/matchers/ut_be_within_pct.tps diff --git a/source/api/be_within.syn b/source/api/be_within.syn new file mode 100644 index 000000000..e00005bb7 --- /dev/null +++ b/source/api/be_within.syn @@ -0,0 +1 @@ +create synonym be_within for ut_be_within; diff --git a/source/create_grants.sql b/source/create_grants.sql index 4553c52f6..111294cef 100644 --- a/source/create_grants.sql +++ b/source/create_grants.sql @@ -87,6 +87,7 @@ grant execute on &&ut3_owner..ut_be_like to &ut3_user; grant execute on &&ut3_owner..ut_be_not_null to &ut3_user; grant execute on &&ut3_owner..ut_be_null to &ut3_user; grant execute on &&ut3_owner..ut_be_true to &ut3_user; +grant execute on &&ut3_owner..ut_be_within to &ut3_user; grant execute on &&ut3_owner..ut_contain to &ut3_user; grant execute on &&ut3_owner..ut_equal to &ut3_user; grant execute on &&ut3_owner..ut_have_count to &ut3_user; diff --git a/source/create_synonyms.sql b/source/create_synonyms.sql index 425ca57a6..53e2bb65f 100644 --- a/source/create_synonyms.sql +++ b/source/create_synonyms.sql @@ -103,6 +103,7 @@ create &action_type. synonym &ut3_user.be_like for &&ut3_owner..be_like; create &action_type. synonym &ut3_user.be_not_null for &&ut3_owner..be_not_null; create &action_type. synonym &ut3_user.be_null for &&ut3_owner..be_null; create &action_type. synonym &ut3_user.be_true for &&ut3_owner..be_true; +create &action_type. synonym &ut3_user.be_within for &&ut3_owner..be_within; create &action_type. synonym &ut3_user.contain for &&ut3_owner..contain; create &action_type. synonym &ut3_user.equal for &&ut3_owner..equal; create &action_type. synonym &ut3_user.have_count for &&ut3_owner..have_count; diff --git a/source/expectations/matchers/ut_be_within.tpb b/source/expectations/matchers/ut_be_within.tpb index b6e975166..a5b5d6cbf 100644 --- a/source/expectations/matchers/ut_be_within.tpb +++ b/source/expectations/matchers/ut_be_within.tpb @@ -16,28 +16,27 @@ create or replace type body ut_be_within as limitations under the License. */ - member procedure init(self in out nocopy ut_be_within, a_distance_from_expected ut_data_value, a_is_pct number , a_self_type varchar2 := null) is + member procedure init(self in out nocopy ut_be_within, a_distance_from_expected ut_data_value) is begin self.distance_from_expected := a_distance_from_expected; - self.is_pct := nvl(a_is_pct,0); - self.self_type := nvl( a_self_type, $$plsql_unit ); + self.self_type := $$plsql_unit; end; - constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected number, a_is_pct number) return self as result is + constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected number) return self as result is begin - init(ut_data_value_number(a_distance_from_expected),a_is_pct); + init(ut_data_value_number(a_distance_from_expected)); return; end; - constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected dsinterval_unconstrained, a_is_pct number) return self as result is + constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected dsinterval_unconstrained) return self as result is begin - init(ut_data_value_dsinterval(a_distance_from_expected),a_is_pct); + init(ut_data_value_dsinterval(a_distance_from_expected)); return; end; - constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected yminterval_unconstrained, a_is_pct number) return self as result is + constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected yminterval_unconstrained) return self as result is begin - init(ut_data_value_yminterval(a_distance_from_expected),a_is_pct); + init(ut_data_value_yminterval(a_distance_from_expected)); return; end; @@ -54,20 +53,29 @@ create or replace type body ut_be_within as l_result.expected := ut_data_value_date(a_expected); l_result.expectation.to_(l_result ); end; - + + member function of_(self in ut_be_within, a_expected number) return ut_be_within is + l_result ut_be_within := self; + begin + l_result.expected := ut_data_value_number(a_expected); + return l_result; + end; + + member function of_(self in ut_be_within, a_expected date) return ut_be_within is + l_result ut_be_within := self; + begin + l_result.expected := ut_data_value_date(a_expected); + return l_result; + end; + overriding member function run_matcher(self in out nocopy ut_be_within, a_actual ut_data_value) return boolean is l_result boolean; begin if self.expected.data_type = a_actual.data_type then - if self.expected is of (ut_data_value_number) and self.is_pct = 0 then + if self.expected is of (ut_data_value_number) then l_result := abs((treat(self.expected as ut_data_value_number).data_value - treat(a_actual as ut_data_value_number).data_value)) <= treat(self.distance_from_expected as ut_data_value_number).data_value; - elsif self.expected is of (ut_data_value_number) and self.is_pct = 1 then - l_result := treat(self.distance_from_expected as ut_data_value_number).data_value >= - ( - ((treat(self.expected as ut_data_value_number).data_value - treat(a_actual as ut_data_value_number).data_value ) * 100 ) / - (treat(self.expected as ut_data_value_number).data_value)) ; - elsif self.expected is of (ut_data_value_date) and self.distance_from_expected is of ( ut_data_value_yminterval) then + elsif self.expected is of (ut_data_value_date) and self.distance_from_expected is of ( ut_data_value_yminterval) then l_result := treat(a_actual as ut_data_value_date).data_value between (treat(self.expected as ut_data_value_date).data_value) - treat(self.distance_from_expected as ut_data_value_yminterval).data_value diff --git a/source/expectations/matchers/ut_be_within.tps b/source/expectations/matchers/ut_be_within.tps index 9b0d0109d..55f32bc4e 100644 --- a/source/expectations/matchers/ut_be_within.tps +++ b/source/expectations/matchers/ut_be_within.tps @@ -21,15 +21,15 @@ create or replace type ut_be_within under ut_comparison_matcher( * Holds information about mather options */ distance_from_expected ut_data_value, - is_pct number(1,0), - - member procedure init(self in out nocopy ut_be_within, a_distance_from_expected ut_data_value, a_is_pct number , a_self_type varchar2 := null), - constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected number, a_is_pct number) return self as result, - constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected dsinterval_unconstrained, a_is_pct number) return self as result, - constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected yminterval_unconstrained, a_is_pct number) return self as result, + member procedure init(self in out nocopy ut_be_within, a_distance_from_expected ut_data_value), + constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected number) return self as result, + constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected dsinterval_unconstrained) return self as result, + constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected yminterval_unconstrained) return self as result, member procedure of_(self in ut_be_within, a_expected number), member procedure of_(self in ut_be_within, a_expected date), - + member function of_(self in ut_be_within, a_expected number) return ut_be_within, + member function of_(self in ut_be_within, a_expected date) return ut_be_within, + overriding member function run_matcher(self in out nocopy ut_be_within, a_actual ut_data_value) return boolean, overriding member function failure_message(a_actual ut_data_value) return varchar2, overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2 diff --git a/source/expectations/matchers/ut_be_within_pct.tpb b/source/expectations/matchers/ut_be_within_pct.tpb new file mode 100644 index 000000000..326197fe6 --- /dev/null +++ b/source/expectations/matchers/ut_be_within_pct.tpb @@ -0,0 +1,42 @@ +create or replace type body ut_be_within_pct as + /* + utPLSQL - Version 3 + Copyright 2016 - 2019 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + constructor function ut_be_within_pct(self in out nocopy ut_be_within_pct, a_distance_from_expected number) return self as result is + begin + self.init(ut_data_value_number(a_distance_from_expected)); + return; + end; + + overriding member function run_matcher(self in out nocopy ut_be_within_pct, a_actual ut_data_value) return boolean is + l_result boolean; + begin + if self.expected.data_type = a_actual.data_type then + if self.expected is of (ut_data_value_number) then + l_result := treat(self.distance_from_expected as ut_data_value_number).data_value >= + ( + ((treat(self.expected as ut_data_value_number).data_value - treat(a_actual as ut_data_value_number).data_value ) * 100 ) / + (treat(self.expected as ut_data_value_number).data_value)) ; + end if; + else + l_result := (self as ut_matcher).run_matcher(a_actual); + end if; + return l_result; + end; + +end; +/ diff --git a/source/expectations/matchers/ut_be_within_pct.tps b/source/expectations/matchers/ut_be_within_pct.tps new file mode 100644 index 000000000..b47c7a9fd --- /dev/null +++ b/source/expectations/matchers/ut_be_within_pct.tps @@ -0,0 +1,24 @@ +create or replace type ut_be_within_pct under ut_be_within( + /* + utPLSQL - Version 3 + Copyright 2016 - 2019 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + + constructor function ut_be_within_pct(self in out nocopy ut_be_within_pct, a_distance_from_expected number) return self as result, + overriding member function run_matcher(self in out nocopy ut_be_within_pct, a_actual ut_data_value) return boolean +) +not final +/ diff --git a/source/expectations/matchers/ut_matcher.tpb b/source/expectations/matchers/ut_matcher.tpb index 11ff1b6b6..ca8598fd8 100644 --- a/source/expectations/matchers/ut_matcher.tpb +++ b/source/expectations/matchers/ut_matcher.tpb @@ -20,11 +20,6 @@ create or replace type body ut_matcher as begin ut_utils.debug_log('Failure - ut_matcher.run_matcher'||'(a_actual '||a_actual.data_type||')'); self.is_errored := ut_utils.boolean_to_int(true); --- self.error_message := 'The matcher '''||name()||''' cannot be used'; --- if self.expected is not null then --- self.error_message := self.error_message ||' for comparison of data type ('||self.expected.data_type||')'; --- end if; --- self.error_message := self.error_message ||' with data type ('||a_actual.data_type||').'; return null; end; diff --git a/source/expectations/ut_expectation.tpb b/source/expectations/ut_expectation.tpb index 288c6cf19..8801af724 100644 --- a/source/expectations/ut_expectation.tpb +++ b/source/expectations/ut_expectation.tpb @@ -694,37 +694,69 @@ create or replace type body ut_expectation as self.not_to( ut_contain(a_expected).negated() ); end; - member function to_be_within(a_dist natural) return ut_be_within is + member function to_be_within(a_dist natural) return ut_be_within is l_result ut_matcher; begin - l_result := ut_be_within(a_dist,0); + l_result := ut_be_within(a_dist); l_result.expectation := self; return treat(l_result as ut_be_within); end; - member function to_be_within(a_dist dsinterval_unconstrained) return ut_be_within is + member function to_be_within(a_dist dsinterval_unconstrained) return ut_be_within is l_result ut_matcher; begin - l_result := ut_be_within(a_dist,0); + l_result := ut_be_within(a_dist); l_result.expectation := self; return treat(l_result as ut_be_within); end; - member function to_be_within(a_dist yminterval_unconstrained) return ut_be_within is + member function to_be_within(a_dist yminterval_unconstrained) return ut_be_within is l_result ut_matcher; begin - l_result := ut_be_within(a_dist,0); + l_result := ut_be_within(a_dist); l_result.expectation := self; return treat(l_result as ut_be_within); end; - member function to_be_within_pct(a_dist natural) return ut_be_within is + member function to_be_within_pct(a_dist natural) return ut_be_within_pct is + l_result ut_matcher; + begin + l_result := ut_be_within_pct(a_dist); + l_result.expectation := self; + return treat(l_result as ut_be_within_pct); + end; + + member function not_to_be_within(a_dist natural) return ut_be_within is l_result ut_matcher; begin - l_result := ut_be_within(a_dist,1); + l_result := ut_be_within(a_dist).negated(); l_result.expectation := self; return treat(l_result as ut_be_within); - end; - + end; + + member function not_to_be_within(a_dist dsinterval_unconstrained) return ut_be_within is + l_result ut_matcher; + begin + l_result := ut_be_within(a_dist).negated(); + l_result.expectation := self; + return treat(l_result as ut_be_within); + end; + + member function not_to_be_within(a_dist yminterval_unconstrained) return ut_be_within is + l_result ut_matcher; + begin + l_result := ut_be_within(a_dist).negated(); + l_result.expectation := self; + return treat(l_result as ut_be_within); + end; + + member function not_to_be_within_pct(a_dist natural) return ut_be_within_pct is + l_result ut_matcher; + begin + l_result := ut_be_within_pct(a_dist).negated(); + l_result.expectation := self; + return treat(l_result as ut_be_within_pct); + end; + end; / diff --git a/source/expectations/ut_expectation.tps b/source/expectations/ut_expectation.tps index b45141b5c..31144d82c 100644 --- a/source/expectations/ut_expectation.tps +++ b/source/expectations/ut_expectation.tps @@ -167,7 +167,11 @@ create or replace type ut_expectation under ut_expectation_base( member function to_be_within(a_dist natural) return ut_be_within, member function to_be_within(a_dist dsinterval_unconstrained) return ut_be_within, member function to_be_within(a_dist yminterval_unconstrained) return ut_be_within, - member function to_be_within_pct(a_dist natural) return ut_be_within + member function to_be_within_pct(a_dist natural) return ut_be_within_pct, + member function not_to_be_within(a_dist natural) return ut_be_within, + member function not_to_be_within(a_dist dsinterval_unconstrained) return ut_be_within, + member function not_to_be_within(a_dist yminterval_unconstrained) return ut_be_within, + member function not_to_be_within_pct(a_dist natural) return ut_be_within_pct ) not final / diff --git a/source/install.sql b/source/install.sql index 911760a63..af639ac78 100644 --- a/source/install.sql +++ b/source/install.sql @@ -241,6 +241,7 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/matchers/ut_matcher.tps' @@install_component.sql 'expectations/matchers/ut_comparison_matcher.tps' @@install_component.sql 'expectations/matchers/ut_be_within.tps' +@@install_component.sql 'expectations/matchers/ut_be_within_pct.tps' @@install_component.sql 'expectations/ut_expectation.tps' @@install_component.sql 'expectations/matchers/ut_be_false.tps' @@install_component.sql 'expectations/matchers/ut_be_greater_or_equal.tps' @@ -297,6 +298,7 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/matchers/ut_be_true.tpb' @@install_component.sql 'expectations/matchers/ut_equal.tpb' @@install_component.sql 'expectations/matchers/ut_be_within.tpb' +@@install_component.sql 'expectations/matchers/ut_be_within_pct.tpb' @@install_component.sql 'expectations/matchers/ut_contain.tpb' @@install_component.sql 'expectations/matchers/ut_have_count.tpb' @@install_component.sql 'expectations/matchers/ut_be_between.tpb' @@ -360,6 +362,7 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'api/be_not_null.syn' @@install_component.sql 'api/be_null.syn' @@install_component.sql 'api/be_true.syn' +@@install_component.sql 'api/be_within.syn' @@install_component.sql 'api/equal.syn' @@install_component.sql 'api/have_count.syn' @@install_component.sql 'api/match.syn' diff --git a/test/ut3_tester_helper/expectations_helper.pkb b/test/ut3_tester_helper/expectations_helper.pkb index 7714e1ea3..b2fb04320 100644 --- a/test/ut3_tester_helper/expectations_helper.pkb +++ b/test/ut3_tester_helper/expectations_helper.pkb @@ -53,29 +53,5 @@ create or replace package body ut3_tester_helper.expectations_helper is return l_execute; end; - function be_within_expectation_block( - a_matcher_name varchar2, - a_actual_data_type varchar2, - a_actual_data varchar2, - a_expected_data_type varchar2, - a_expected_data varchar2, - a_distance varchar2, - a_distance_data_type varchar2 - ) return varchar2 - is - l_execute varchar2(32000); - begin - l_execute := ' - declare - l_actual '||a_actual_data_type||' := '||a_actual_data||'; - l_expected '||a_expected_data_type||' := '||a_expected_data||'; - l_distance '||a_distance_data_type||' := '||a_distance||'; - begin - --act - execute the expectation - ut3_develop.ut.expect( l_actual ).'||a_matcher_name||'(l_distance).of_(l_expected); - end;'; - return l_execute; - end; - end; / diff --git a/test/ut3_tester_helper/expectations_helper.pks b/test/ut3_tester_helper/expectations_helper.pks index 3b0a754d2..9c1d54333 100644 --- a/test/ut3_tester_helper/expectations_helper.pks +++ b/test/ut3_tester_helper/expectations_helper.pks @@ -21,15 +21,5 @@ create or replace package expectations_helper is a_expected_data varchar2 ) return varchar2; - function be_within_expectation_block( - a_matcher_name varchar2, - a_actual_data_type varchar2, - a_actual_data varchar2, - a_expected_data_type varchar2, - a_expected_data varchar2, - a_distance varchar2, - a_distance_data_type varchar2 - ) return varchar2; - end; / diff --git a/test/ut3_user/expectations/binary/test_to_be_within.pkb b/test/ut3_user/expectations/binary/test_to_be_within.pkb index af672e809..2605d3c53 100644 --- a/test/ut3_user/expectations/binary/test_to_be_within.pkb +++ b/test/ut3_user/expectations/binary/test_to_be_within.pkb @@ -7,16 +7,27 @@ create or replace package body test_to_be_within is function be_within_expectation_block( a_matcher_name varchar2, - a_data_type varchar2, - a_actual varchar2, - a_expected varchar2, + a_actual_data_type varchar2, + a_actual_data varchar2, + a_expected_data_type varchar2, + a_expected_data varchar2, a_distance varchar2, - a_distance_data_type varchar2 - ) return varchar2 is + a_distance_data_type varchar2, + a_matcher_end varchar2 + ) return varchar2 + is + l_execute varchar2(32000); begin - return ut3_tester_helper.expectations_helper.be_within_expectation_block( - a_matcher_name, a_data_type, a_actual, a_data_type, a_expected,a_distance,a_distance_data_type - ); + l_execute := ' + declare + l_actual '||a_actual_data_type||' := '||a_actual_data||'; + l_expected '||a_expected_data_type||' := '||a_expected_data||'; + l_distance '||a_distance_data_type||' := '||a_distance||'; + begin + --act - execute the expectation + ut3_develop.ut.expect( l_actual ).'||a_matcher_name||'(l_distance).of_(l_expected)'||a_matcher_end||'; + end;'; + return l_execute; end; procedure test_to_be_within_fail( @@ -25,10 +36,14 @@ create or replace package body test_to_be_within is a_actual varchar2, a_expected varchar2, a_distance varchar2, - a_distance_data_type varchar2 + a_distance_data_type varchar2, + a_matcher_end varchar2 := null ) is begin - execute immediate be_within_expectation_block(a_matcher_name,a_data_type, a_actual, a_expected,a_distance,a_distance_data_type); + execute immediate be_within_expectation_block( + a_matcher_name,a_data_type, a_actual, a_data_type, a_expected, + a_distance,a_distance_data_type, a_matcher_end + ); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).not_to_equal(0); cleanup_expectations; end; @@ -39,10 +54,14 @@ create or replace package body test_to_be_within is a_actual varchar2, a_expected varchar2, a_distance varchar2, - a_distance_data_type varchar2 + a_distance_data_type varchar2, + a_matcher_end varchar2 := null ) is begin - execute immediate be_within_expectation_block(a_matcher_name,a_data_type, a_actual, a_expected,a_distance,a_distance_data_type); + execute immediate be_within_expectation_block( + a_matcher_name,a_data_type, a_actual, a_data_type, a_expected, + a_distance,a_distance_data_type, a_matcher_end + ); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); cleanup_expectations; end; @@ -55,6 +74,24 @@ create or replace package body test_to_be_within is test_to_be_within_success('to_be_within','date', 'sysdate', 'sysdate+1','''1 0:00:11.333''','interval day to second'); test_to_be_within_success('to_be_within','date', 'sysdate', 'sysdate+200','''1-0''','interval year to month'); test_to_be_within_success('to_be_within','date', 'sysdate+200', 'sysdate','''1-0''','interval year to month'); + test_to_be_within_success('to_( ut3_develop.be_within','number', '2', '4','2','number', ')'); + test_to_be_within_success('to_( ut3_develop.be_within','number', '4', '2','2','number', ')'); + test_to_be_within_success('to_( ut3_develop.be_within','date', 'sysdate+1', 'sysdate','''1 0:00:11.333''','interval day to second', ')'); + test_to_be_within_success('to_( ut3_develop.be_within','date', 'sysdate', 'sysdate+1','''1 0:00:11.333''','interval day to second', ')'); + test_to_be_within_success('to_( ut3_develop.be_within','date', 'sysdate', 'sysdate+200','''1-0''','interval year to month', ')'); + test_to_be_within_success('to_( ut3_develop.be_within','date', 'sysdate+200', 'sysdate','''1-0''','interval year to month', ')'); + test_to_be_within_fail('not_to_be_within','number', '2', '4','2','number'); + test_to_be_within_fail('not_to_be_within','number', '4', '2','2','number'); + test_to_be_within_fail('not_to_be_within','date', 'sysdate+1', 'sysdate','''1 0:00:11.333''','interval day to second'); + test_to_be_within_fail('not_to_be_within','date', 'sysdate', 'sysdate+1','''1 0:00:11.333''','interval day to second'); + test_to_be_within_fail('not_to_be_within','date', 'sysdate', 'sysdate+200','''1-0''','interval year to month'); + test_to_be_within_fail('not_to_be_within','date', 'sysdate+200', 'sysdate','''1-0''','interval year to month'); + test_to_be_within_fail('not_to( ut3_develop.be_within','number', '2', '4','2','number',')'); + test_to_be_within_fail('not_to( ut3_develop.be_within','number', '4', '2','2','number',')'); + test_to_be_within_fail('not_to( ut3_develop.be_within','date', 'sysdate+1', 'sysdate','''1 0:00:11.333''','interval day to second',')'); + test_to_be_within_fail('not_to( ut3_develop.be_within','date', 'sysdate', 'sysdate+1','''1 0:00:11.333''','interval day to second',')'); + test_to_be_within_fail('not_to( ut3_develop.be_within','date', 'sysdate', 'sysdate+200','''1-0''','interval year to month',')'); + test_to_be_within_fail('not_to( ut3_develop.be_within','date', 'sysdate+200', 'sysdate','''1-0''','interval year to month',')'); end; procedure failed_tests is @@ -65,7 +102,25 @@ create or replace package body test_to_be_within is test_to_be_within_fail('to_be_within','date', 'sysdate+1', 'sysdate','''0 0:00:11.333''','interval day to second'); test_to_be_within_fail('to_be_within','date', 'sysdate', 'sysdate+750','''1-0''','interval year to month'); test_to_be_within_fail('to_be_within','date', 'sysdate+750', 'sysdate','''1-0''','interval year to month'); - end; + test_to_be_within_fail('to_( ut3_develop.be_within','number', '2', '4','1','number',')'); + test_to_be_within_fail('to_( ut3_develop.be_within','number', '4', '2','1','number',')'); + test_to_be_within_fail('to_( ut3_develop.be_within','date', 'sysdate', 'sysdate+1','''0 0:00:11.333''','interval day to second',')'); + test_to_be_within_fail('to_( ut3_develop.be_within','date', 'sysdate+1', 'sysdate','''0 0:00:11.333''','interval day to second',')'); + test_to_be_within_fail('to_( ut3_develop.be_within','date', 'sysdate', 'sysdate+750','''1-0''','interval year to month',')'); + test_to_be_within_fail('to_( ut3_develop.be_within','date', 'sysdate+750', 'sysdate','''1-0''','interval year to month',')'); + test_to_be_within_success('not_to_be_within','number', '2', '4','1','number'); + test_to_be_within_success('not_to_be_within','number', '4', '2','1','number'); + test_to_be_within_success('not_to_be_within','date', 'sysdate', 'sysdate+1','''0 0:00:11.333''','interval day to second'); + test_to_be_within_success('not_to_be_within','date', 'sysdate+1', 'sysdate','''0 0:00:11.333''','interval day to second'); + test_to_be_within_success('not_to_be_within','date', 'sysdate', 'sysdate+750','''1-0''','interval year to month'); + test_to_be_within_success('not_to_be_within','date', 'sysdate+750', 'sysdate','''1-0''','interval year to month'); + test_to_be_within_success('not_to( ut3_develop.be_within','number', '2', '4','1','number',')'); + test_to_be_within_success('not_to( ut3_develop.be_within','number', '4', '2','1','number',')'); + test_to_be_within_success('not_to( ut3_develop.be_within','date', 'sysdate', 'sysdate+1','''0 0:00:11.333''','interval day to second',')'); + test_to_be_within_success('not_to( ut3_develop.be_within','date', 'sysdate+1', 'sysdate','''0 0:00:11.333''','interval day to second',')'); + test_to_be_within_success('not_to( ut3_develop.be_within','date', 'sysdate', 'sysdate+750','''1-0''','interval year to month',')'); + test_to_be_within_success('not_to( ut3_develop.be_within','date', 'sysdate+750', 'sysdate','''1-0''','interval year to month',')'); + end; procedure fail_for_number_not_within is l_actual_message varchar2(32767); diff --git a/test/ut3_user/expectations/binary/test_to_be_within.pks b/test/ut3_user/expectations/binary/test_to_be_within.pks index 5c042bd53..dcfb471af 100644 --- a/test/ut3_user/expectations/binary/test_to_be_within.pks +++ b/test/ut3_user/expectations/binary/test_to_be_within.pks @@ -1,6 +1,6 @@ create or replace package test_to_be_within is - --%suite((not)to_be_less_or_equal) + --%suite((not)to_be_within) --%suitepath(utplsql.test_user.expectations.binary) --%aftereach From 2e721da4635da8652d69fecbc908b961962bf8c1 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Fri, 19 Jun 2020 16:53:32 +0100 Subject: [PATCH 0718/1096] CHECKPOINT --- source/expectations/matchers/ut_be_within.tpb | 12 +++++-- source/expectations/ut_expectation.tpb | 33 +++++++++++++++++++ source/expectations/ut_expectation.tps | 8 ++++- source/expectations/ut_expectation_base.tps | 2 +- test/ut3_tester/core/test_ut_utils.pks | 16 ++++----- .../ut3_tester_helper/expectations_helper.pkb | 2 +- .../expectations/binary/test_to_be_within.pkb | 2 +- .../expectations/binary/test_to_be_within.pks | 8 ++--- 8 files changed, 65 insertions(+), 18 deletions(-) diff --git a/source/expectations/matchers/ut_be_within.tpb b/source/expectations/matchers/ut_be_within.tpb index b6e975166..028bd6ad9 100644 --- a/source/expectations/matchers/ut_be_within.tpb +++ b/source/expectations/matchers/ut_be_within.tpb @@ -45,14 +45,22 @@ create or replace type body ut_be_within as l_result ut_be_within := self; begin l_result.expected := ut_data_value_number(a_expected); - l_result.expectation.to_(l_result ); + if l_result.is_negated_flag = 1 then + l_result.expectation.not_to(l_result ); + else + l_result.expectation.to_(l_result ); + end if; end; member procedure of_(self in ut_be_within, a_expected date) is l_result ut_be_within := self; begin l_result.expected := ut_data_value_date(a_expected); - l_result.expectation.to_(l_result ); + if l_result.is_negated_flag = 1 then + l_result.expectation.not_to(l_result ); + else + l_result.expectation.to_(l_result ); + end if; end; overriding member function run_matcher(self in out nocopy ut_be_within, a_actual ut_data_value) return boolean is diff --git a/source/expectations/ut_expectation.tpb b/source/expectations/ut_expectation.tpb index 288c6cf19..6ef07c47b 100644 --- a/source/expectations/ut_expectation.tpb +++ b/source/expectations/ut_expectation.tpb @@ -725,6 +725,39 @@ create or replace type body ut_expectation as l_result.expectation := self; return treat(l_result as ut_be_within); end; + + member function not_to_be_within(a_dist natural) return ut_be_within is + l_result ut_matcher; + begin + l_result := ut_be_within(a_dist,0).negated; + l_result.expectation := self; + return treat(l_result as ut_be_within); + end; + + member function not_to_be_within(a_dist dsinterval_unconstrained) return ut_be_within is + l_result ut_matcher; + begin + l_result := ut_be_within(a_dist,0).negated; + l_result.expectation := self; + return treat(l_result as ut_be_within); + end; + + member function not_to_be_within(a_dist yminterval_unconstrained) return ut_be_within is + l_result ut_matcher; + begin + l_result := ut_be_within(a_dist,0).negated; + l_result.expectation := self; + return treat(l_result as ut_be_within); + end; + + member function not_to_be_within_pct(a_dist natural) return ut_be_within is + l_result ut_matcher; + begin + l_result := ut_be_within(a_dist,0).negated; + l_result.expectation := self; + return treat(l_result as ut_be_within); + end; end; / + diff --git a/source/expectations/ut_expectation.tps b/source/expectations/ut_expectation.tps index b45141b5c..d4c446ea8 100644 --- a/source/expectations/ut_expectation.tps +++ b/source/expectations/ut_expectation.tps @@ -167,7 +167,13 @@ create or replace type ut_expectation under ut_expectation_base( member function to_be_within(a_dist natural) return ut_be_within, member function to_be_within(a_dist dsinterval_unconstrained) return ut_be_within, member function to_be_within(a_dist yminterval_unconstrained) return ut_be_within, - member function to_be_within_pct(a_dist natural) return ut_be_within + member function to_be_within_pct(a_dist natural) return ut_be_within, + + member function not_to_be_within(a_dist natural) return ut_be_within, + member function not_to_be_within(a_dist dsinterval_unconstrained) return ut_be_within, + member function not_to_be_within(a_dist yminterval_unconstrained) return ut_be_within, + member function not_to_be_within_pct(a_dist natural) return ut_be_within + ) not final / diff --git a/source/expectations/ut_expectation_base.tps b/source/expectations/ut_expectation_base.tps index ad96ea97b..a542d26ea 100644 --- a/source/expectations/ut_expectation_base.tps +++ b/source/expectations/ut_expectation_base.tps @@ -1,4 +1,4 @@ -create or replace type ut_expectation_base force authid current_user as object( +create or replace type ut_expectation_base authid current_user as object( /* utPLSQL - Version 3 Copyright 2016 - 2019 utPLSQL Project diff --git a/test/ut3_tester/core/test_ut_utils.pks b/test/ut3_tester/core/test_ut_utils.pks index 9d428b363..4d83b5042 100644 --- a/test/ut3_tester/core/test_ut_utils.pks +++ b/test/ut3_tester/core/test_ut_utils.pks @@ -130,28 +130,28 @@ create or replace package test_ut_utils is --%context(interval_converter_to_strin) - --%test(Test day to second interval passing a second) + --%test(returns text representation of interval day to second for 1 second interval) procedure int_conv_ds_sec; - --%test(Test day to second interval passing a minute) + --%test(returns text representation of interval day to second for 1 minute interval) procedure int_conv_ds_minute; - --%test(Test day to second interval passing a hour) + --%test(returns text representation of interval day to second for 1 hour interval) procedure int_conv_ds_hour; - --%test(Test day to second interval passing a day) + --%test(returns text representation of interval day to second for 1 day interval) procedure int_conv_ds_day; - --%test(Test day to second interval passing a custom date ) + --%test(returns text representation of interval day to second for combination interval) procedure int_conv_ds_date; - --%test(Test year to month interval passing a hour) + --%test(returns text representation of interval year to month for 1 year interval) procedure int_conv_ym_year; - --%test(Test year to month interval passing a day) + --%test(returns text representation of interval year to month for 1 month interval) procedure int_conv_ym_month; - --%test(Test year to month interval passing a custom date ) + --%test(returns text representation of interval year to month for custom interval) procedure int_conv_ym_date; diff --git a/test/ut3_tester_helper/expectations_helper.pkb b/test/ut3_tester_helper/expectations_helper.pkb index 7714e1ea3..eafb9fa3e 100644 --- a/test/ut3_tester_helper/expectations_helper.pkb +++ b/test/ut3_tester_helper/expectations_helper.pkb @@ -1,4 +1,4 @@ -create or replace package body ut3_tester_helper.expectations_helper is +create or replace package body expectations_helper is function unary_expectation_block( a_matcher_name varchar2, diff --git a/test/ut3_user/expectations/binary/test_to_be_within.pkb b/test/ut3_user/expectations/binary/test_to_be_within.pkb index af672e809..97dd865f4 100644 --- a/test/ut3_user/expectations/binary/test_to_be_within.pkb +++ b/test/ut3_user/expectations/binary/test_to_be_within.pkb @@ -138,4 +138,4 @@ create or replace package body test_to_be_within is end; end; -/ \ No newline at end of file +/ diff --git a/test/ut3_user/expectations/binary/test_to_be_within.pks b/test/ut3_user/expectations/binary/test_to_be_within.pks index 5c042bd53..76b606446 100644 --- a/test/ut3_user/expectations/binary/test_to_be_within.pks +++ b/test/ut3_user/expectations/binary/test_to_be_within.pks @@ -6,10 +6,10 @@ create or replace package test_to_be_within is --%aftereach procedure cleanup_expectations; - --%test(Gives failure when number is not within positive distance) + --%test(gives success for values within a distance) procedure success_tests; - --%test(Gives failure when number is not within negative distance) + --%test(gives failure when number is not within distance) procedure failed_tests; --%test(Check failure message for number not within) @@ -25,7 +25,7 @@ create or replace package test_to_be_within is procedure fail_for_ym_int_not_within; --%test(Check failure message for custom ym interval not within) - procedure fail_for_custom_ym_int; + procedure fail_for_custom_ym_int; end; -/ \ No newline at end of file +/ From f1824303682355d85ca52fe0a45623225582e836 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Fri, 19 Jun 2020 19:48:49 +0100 Subject: [PATCH 0719/1096] Update uninstall --- source/uninstall_objects.sql | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index c905153f4..82d8a7e5a 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -54,6 +54,8 @@ drop synonym be_true; drop synonym equal; +drop synonym be_within; + drop type ut_coveralls_reporter force; drop type ut_coverage_sonar_reporter force; @@ -140,6 +142,10 @@ drop type ut_be_less_than force; drop type ut_be_false force; +drop type ut_be_within_pct force; + +drop type ut_be_within force; + drop type ut_comparison_matcher force; drop type ut_matcher force; From e3fb2d7f15062b91a81570973f56209be8f89cb3 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Fri, 19 Jun 2020 20:26:26 +0100 Subject: [PATCH 0720/1096] Update progress --- docs/userguide/expectations.md | 36 +++++++++++++------ source/expectations/matchers/ut_be_within.tpb | 20 +++-------- source/expectations/ut_expectation.tpb | 18 +++++----- .../expectations/binary/test_to_be_within.pkb | 15 ++++++++ .../expectations/binary/test_to_be_within.pks | 15 ++++---- 5 files changed, 63 insertions(+), 41 deletions(-) diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 3ecf8db0a..3f26a0eff 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -334,7 +334,7 @@ The matrix below illustrates the data types supported by different matchers. | **be_empty** | X | | X | | | | | | | | | X | X | | X | | **have_count** | | | | | | | | | | | | X | X | | X | | **be_within().of_()** | | | | x | x | | | | | | | | | | | - +| **be_within_pct().of()**| | | | | x | | | | | | | | | | | # Expecting exceptions @@ -1118,14 +1118,6 @@ end; **Example 2.** ```sql -begin - ut.expect(9).to_be_within_pct(10).of_(10); -end; -/ -``` - -**Example 3.** -```sql begin ut.expect(3).to_be_within(1).of_(5); end; @@ -1142,7 +1134,7 @@ Failures: at "UT3_DEVELOP.TEST_BETWNSTR.WIHTIN_TEST", line 5 ``` -**Example 4.** +**Example 3.** ```sql begin ut.expect(sysdate).to_be_within(interval '1' day).of_(sysdate+2); @@ -1160,6 +1152,30 @@ Failures: at "UT3_DEVELOP.TEST_BETWNSTR.WIHTIN_TEST", line 5 ``` + +## to_be_within_pct of + +This matcher is created to determine wheter expected value is approximately equal or "close" to another value within percentage value of expected. + +Matcher will allow to compare numbers. + +When comparing a number the tolerance / distance can be expressed as another postive number or a percentage. + +When comparing a two dates tolerance can be expressed in interval time either Day-To-Second or Year-To-Month. + +Matcher for numbers will calculate a absolute distance between expected and actual and check whether that value is within a tolerance. + +When comparing a date a distance is measured in interval, the check is done that actual value is within date range of expected taking into account interval plus and minus. + +**Example 1.** +```sql +begin + ut.expect(9).to_be_within_pct(10).of_(10); +end; +/ +``` + + ## Comparing cursors, object types, nested tables and varrays utPLSQL is capable of comparing compound data-types including: diff --git a/source/expectations/matchers/ut_be_within.tpb b/source/expectations/matchers/ut_be_within.tpb index 9089c0033..52fe6aef0 100644 --- a/source/expectations/matchers/ut_be_within.tpb +++ b/source/expectations/matchers/ut_be_within.tpb @@ -103,26 +103,14 @@ create or replace type body ut_be_within as end; overriding member function failure_message(a_actual ut_data_value) return varchar2 is - l_distance_from_expected varchar2(32767); - begin - l_distance_from_expected := case - when self.distance_from_expected is of (ut_data_value_number) then - treat(self.distance_from_expected as ut_data_value_number).to_string - when self.distance_from_expected is of (ut_data_value_yminterval) then - treat(self.distance_from_expected as ut_data_value_yminterval).to_string - when self.distance_from_expected is of (ut_data_value_dsinterval) then - treat(self.distance_from_expected as ut_data_value_dsinterval).to_string - else - null - end; - - return (self as ut_matcher).failure_message(a_actual) || ' '||l_distance_from_expected ||' of '|| expected.to_string_report(); + begin + return (self as ut_matcher).failure_message(a_actual) || ' '||self.distance_from_expected.to_string ||' of '|| expected.to_string_report(); end; overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2 is l_result varchar2(32767); - begin - return (self as ut_matcher).failure_message_when_negated(a_actual) || ': '|| expected.to_string_report(); + begin + return (self as ut_matcher).failure_message_when_negated(a_actual) || ' '||self.distance_from_expected.to_string ||' of '|| expected.to_string_report(); end; end; diff --git a/source/expectations/ut_expectation.tpb b/source/expectations/ut_expectation.tpb index 710e8f68c..4c25872f5 100644 --- a/source/expectations/ut_expectation.tpb +++ b/source/expectations/ut_expectation.tpb @@ -695,35 +695,35 @@ create or replace type body ut_expectation as end; member function to_be_within(a_dist natural) return ut_be_within is - l_result ut_matcher; + l_result ut_be_within; begin l_result := ut_be_within(a_dist); l_result.expectation := self; - return treat(l_result as ut_be_within); + return l_result; end; member function to_be_within(a_dist dsinterval_unconstrained) return ut_be_within is - l_result ut_matcher; + l_result ut_be_within; begin l_result := ut_be_within(a_dist); l_result.expectation := self; - return treat(l_result as ut_be_within); + return l_result; end; member function to_be_within(a_dist yminterval_unconstrained) return ut_be_within is - l_result ut_matcher; + l_result ut_be_within; begin l_result := ut_be_within(a_dist); l_result.expectation := self; - return treat(l_result as ut_be_within); + return l_result; end; member function to_be_within_pct(a_dist natural) return ut_be_within_pct is - l_result ut_matcher; + l_result ut_be_within_pct; begin l_result := ut_be_within_pct(a_dist); l_result.expectation := self; - return treat(l_result as ut_be_within_pct); + return l_result; end; member function not_to_be_within(a_dist natural) return ut_be_within is @@ -731,7 +731,7 @@ create or replace type body ut_expectation as begin l_result := ut_be_within(a_dist).negated(); l_result.expectation := self; - return treat(l_result as ut_be_within); + return treat(l_result as ut_be_within); end; member function not_to_be_within(a_dist dsinterval_unconstrained) return ut_be_within is diff --git a/test/ut3_user/expectations/binary/test_to_be_within.pkb b/test/ut3_user/expectations/binary/test_to_be_within.pkb index cb1b3317b..b845bb26a 100644 --- a/test/ut3_user/expectations/binary/test_to_be_within.pkb +++ b/test/ut3_user/expectations/binary/test_to_be_within.pkb @@ -192,5 +192,20 @@ create or replace package body test_to_be_within is ut.expect(l_actual_message).to_be_like(l_expected_message); end; + procedure fail_msg_when_not_within is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + --Act + ut3_develop.ut.expect(1).to_be_within(3).of_(12); + --Assert + l_expected_message := q'[Actual: 1 (number) was expected to be within 3 of 12 (number)]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + end; / diff --git a/test/ut3_user/expectations/binary/test_to_be_within.pks b/test/ut3_user/expectations/binary/test_to_be_within.pks index 6c3406ac4..8aa6798e2 100644 --- a/test/ut3_user/expectations/binary/test_to_be_within.pks +++ b/test/ut3_user/expectations/binary/test_to_be_within.pks @@ -12,20 +12,23 @@ create or replace package test_to_be_within is --%test(gives failure when number is not within distance) procedure failed_tests; - --%test(Check failure message for number not within) + --%test(check failure message for number not within) procedure fail_for_number_not_within; - --%test(Check failure message for inteval of 1 sec not within) + --%test(check failure message for inteval of 1 sec not within) procedure fail_for_ds_int_not_within; - --%test(Check failure message for custom ds interval not within) + --%test(check failure message for custom ds interval not within) procedure fail_for_custom_ds_int; - --%test(Check failure message for inteval of 1 month not within) + --%test(check failure message for inteval of 1 month not within) procedure fail_for_ym_int_not_within; - --%test(Check failure message for custom ym interval not within) + --%test(check failure message for custom ym interval not within) procedure fail_for_custom_ym_int; - + + --%test(check failure message for simple within) + procedure fail_msg_when_not_within; + end; / From 322e0a15c5ea5a8879ee92a6950b7bc1f24a840a Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Fri, 19 Jun 2020 20:57:41 +0100 Subject: [PATCH 0721/1096] Making code a bit more readable --- source/expectations/matchers/ut_be_within.tpb | 43 ++++++++++++------- .../expectations/binary/test_to_be_within.pks | 12 +++--- 2 files changed, 34 insertions(+), 21 deletions(-) diff --git a/source/expectations/matchers/ut_be_within.tpb b/source/expectations/matchers/ut_be_within.tpb index 52fe6aef0..6f09f0392 100644 --- a/source/expectations/matchers/ut_be_within.tpb +++ b/source/expectations/matchers/ut_be_within.tpb @@ -75,26 +75,39 @@ create or replace type body ut_be_within as l_result.expected := ut_data_value_date(a_expected); return l_result; end; - + overriding member function run_matcher(self in out nocopy ut_be_within, a_actual ut_data_value) return boolean is l_result boolean; + function l_result_from_number return boolean is + l_expected number := treat(self.expected as ut_data_value_number).data_value; + l_actual number := treat(a_actual as ut_data_value_number).data_value; + l_distance number := treat(self.distance_from_expected as ut_data_value_number).data_value; + begin + return abs(l_expected - l_actual) <= l_distance; + end; + + function l_result_from_date(a_distance ut_data_value) return boolean is + l_expected date := treat(self.expected as ut_data_value_date).data_value; + l_actual date := treat(a_actual as ut_data_value_date).data_value; + l_distance_ym yminterval_unconstrained := case when self.distance_from_expected is of ( ut_data_value_yminterval) + then treat(self.distance_from_expected as ut_data_value_yminterval).data_value + end; + l_distance_ds dsinterval_unconstrained := case when self.distance_from_expected is of ( ut_data_value_dsinterval) + then treat(self.distance_from_expected as ut_data_value_dsinterval).data_value + end; + begin + return case when l_distance_ym is not null + then l_actual between l_expected - l_distance_ym and l_expected + l_distance_ym + else l_actual between l_expected - l_distance_ds and l_expected + l_distance_ds + end; + end; + begin if self.expected.data_type = a_actual.data_type then if self.expected is of (ut_data_value_number) then - l_result := abs((treat(self.expected as ut_data_value_number).data_value - treat(a_actual as ut_data_value_number).data_value)) <= - treat(self.distance_from_expected as ut_data_value_number).data_value; - elsif self.expected is of (ut_data_value_date) and self.distance_from_expected is of ( ut_data_value_yminterval) then - l_result := treat(a_actual as ut_data_value_date).data_value - between - (treat(self.expected as ut_data_value_date).data_value) - treat(self.distance_from_expected as ut_data_value_yminterval).data_value - and - (treat(self.expected as ut_data_value_date).data_value) + treat(self.distance_from_expected as ut_data_value_yminterval).data_value; - elsif self.expected is of (ut_data_value_date) and self.distance_from_expected is of ( ut_data_value_dsinterval) then - l_result := treat(a_actual as ut_data_value_date).data_value - between - (treat(self.expected as ut_data_value_date).data_value) - treat(self.distance_from_expected as ut_data_value_dsinterval).data_value - and - (treat(self.expected as ut_data_value_date).data_value) + treat(self.distance_from_expected as ut_data_value_dsinterval).data_value; + l_result := l_result_from_number; + elsif self.expected is of (ut_data_value_date)then + l_result := l_result_from_date(self.distance_from_expected); end if; else l_result := (self as ut_matcher).run_matcher(a_actual); diff --git a/test/ut3_user/expectations/binary/test_to_be_within.pks b/test/ut3_user/expectations/binary/test_to_be_within.pks index 8aa6798e2..b2f456584 100644 --- a/test/ut3_user/expectations/binary/test_to_be_within.pks +++ b/test/ut3_user/expectations/binary/test_to_be_within.pks @@ -12,22 +12,22 @@ create or replace package test_to_be_within is --%test(gives failure when number is not within distance) procedure failed_tests; - --%test(check failure message for number not within) + --%test(returns well formatted failure message when expectation fails) procedure fail_for_number_not_within; - --%test(check failure message for inteval of 1 sec not within) + --%test(returns well formatted failure message for inteval of 1 sec not within) procedure fail_for_ds_int_not_within; - --%test(check failure message for custom ds interval not within) + --%test(returns well formatted failure message for custom ds interval not within) procedure fail_for_custom_ds_int; - --%test(check failure message for inteval of 1 month not within) + --%test(returns well formatted failure message for inteval of 1 month not within) procedure fail_for_ym_int_not_within; - --%test(check failure message for custom ym interval not within) + --%test(returns well formatted failure message for custom ym interval not within) procedure fail_for_custom_ym_int; - --%test(check failure message for simple within) + --%test(returns well formatted failure message for simple within) procedure fail_msg_when_not_within; end; From ff15596a7c8c3b907136ea2e83bb52f33dff00ca Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 20 Jun 2020 21:57:10 +0100 Subject: [PATCH 0722/1096] Added tests for `be_within_pct` Reorganized code so that `be_within_pct` is only supported for `number` Added tests for non-supported syntax --- source/api/be_within_pct.syn | 1 + source/core/ut_expectation_processor.pkb | 1 + source/create_grants.sql | 1 + source/create_synonyms.sql | 1 + source/expectations/matchers/ut_be_within.tpb | 43 +--- source/expectations/matchers/ut_be_within.tps | 10 +- .../matchers/ut_be_within_pct.tpb | 46 ++++- .../matchers/ut_be_within_pct.tps | 16 +- source/install.sql | 5 +- source/uninstall_objects.sql | 2 + test/install_ut3_user_tests.sql | 2 + .../binary/test_to_be_within_pct.pkb | 184 ++++++++++++++++++ .../binary/test_to_be_within_pct.pks | 22 +++ 13 files changed, 280 insertions(+), 54 deletions(-) create mode 100644 source/api/be_within_pct.syn create mode 100644 test/ut3_user/expectations/binary/test_to_be_within_pct.pkb create mode 100644 test/ut3_user/expectations/binary/test_to_be_within_pct.pks diff --git a/source/api/be_within_pct.syn b/source/api/be_within_pct.syn new file mode 100644 index 000000000..40e3fb8b9 --- /dev/null +++ b/source/api/be_within_pct.syn @@ -0,0 +1 @@ +create synonym be_within_pct for ut_be_within_pct; diff --git a/source/core/ut_expectation_processor.pkb b/source/core/ut_expectation_processor.pkb index d65d210c8..4bf15ee55 100644 --- a/source/core/ut_expectation_processor.pkb +++ b/source/core/ut_expectation_processor.pkb @@ -183,6 +183,7 @@ create or replace package body ut_expectation_processor as ); end; begin +-- dbms_output.put_line(a_call_stack); l_call_stack := cut_header_and_expectations( a_call_stack ); l_call_stack := cut_address_columns( l_call_stack ); l_call_stack := cut_framework_stack( l_call_stack ); diff --git a/source/create_grants.sql b/source/create_grants.sql index 111294cef..d2f51e121 100644 --- a/source/create_grants.sql +++ b/source/create_grants.sql @@ -88,6 +88,7 @@ grant execute on &&ut3_owner..ut_be_not_null to &ut3_user; grant execute on &&ut3_owner..ut_be_null to &ut3_user; grant execute on &&ut3_owner..ut_be_true to &ut3_user; grant execute on &&ut3_owner..ut_be_within to &ut3_user; +grant execute on &&ut3_owner..ut_be_within_pct to &ut3_user; grant execute on &&ut3_owner..ut_contain to &ut3_user; grant execute on &&ut3_owner..ut_equal to &ut3_user; grant execute on &&ut3_owner..ut_have_count to &ut3_user; diff --git a/source/create_synonyms.sql b/source/create_synonyms.sql index 53e2bb65f..7b04dacd0 100644 --- a/source/create_synonyms.sql +++ b/source/create_synonyms.sql @@ -104,6 +104,7 @@ create &action_type. synonym &ut3_user.be_not_null for &&ut3_owner..be_not_null; create &action_type. synonym &ut3_user.be_null for &&ut3_owner..be_null; create &action_type. synonym &ut3_user.be_true for &&ut3_owner..be_true; create &action_type. synonym &ut3_user.be_within for &&ut3_owner..be_within; +create &action_type. synonym &ut3_user.be_within_pct for &&ut3_owner..be_within_pct; create &action_type. synonym &ut3_user.contain for &&ut3_owner..contain; create &action_type. synonym &ut3_user.equal for &&ut3_owner..equal; create &action_type. synonym &ut3_user.have_count for &&ut3_owner..have_count; diff --git a/source/expectations/matchers/ut_be_within.tpb b/source/expectations/matchers/ut_be_within.tpb index 6f09f0392..40bcfbab0 100644 --- a/source/expectations/matchers/ut_be_within.tpb +++ b/source/expectations/matchers/ut_be_within.tpb @@ -16,41 +16,24 @@ create or replace type body ut_be_within as limitations under the License. */ - member procedure init(self in out nocopy ut_be_within, a_distance_from_expected ut_data_value) is - begin - self.distance_from_expected := a_distance_from_expected; - self.self_type := $$plsql_unit; - end; - constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected number) return self as result is begin - init(ut_data_value_number(a_distance_from_expected)); + self.init(ut_data_value_number(a_distance_from_expected), $$plsql_unit); return; end; constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected dsinterval_unconstrained) return self as result is begin - init(ut_data_value_dsinterval(a_distance_from_expected)); + self.init(ut_data_value_dsinterval(a_distance_from_expected), $$plsql_unit); return; end; - + constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected yminterval_unconstrained) return self as result is begin - init(ut_data_value_yminterval(a_distance_from_expected)); + self.init(ut_data_value_yminterval(a_distance_from_expected), $$plsql_unit); return; end; - member procedure of_(self in ut_be_within, a_expected number) is - l_result ut_be_within := self; - begin - l_result.expected := ut_data_value_number(a_expected); - if l_result.is_negated_flag = 1 then - l_result.expectation.not_to(l_result ); - else - l_result.expectation.to_(l_result ); - end if; - end; - member procedure of_(self in ut_be_within, a_expected date) is l_result ut_be_within := self; begin @@ -62,13 +45,6 @@ create or replace type body ut_be_within as end if; end; - member function of_(self in ut_be_within, a_expected number) return ut_be_within is - l_result ut_be_within := self; - begin - l_result.expected := ut_data_value_number(a_expected); - return l_result; - end; - member function of_(self in ut_be_within, a_expected date) return ut_be_within is l_result ut_be_within := self; begin @@ -96,7 +72,7 @@ create or replace type body ut_be_within as then treat(self.distance_from_expected as ut_data_value_dsinterval).data_value end; begin - return case when l_distance_ym is not null + return case when l_distance_ym is not null then l_actual between l_expected - l_distance_ym and l_expected + l_distance_ym else l_actual between l_expected - l_distance_ds and l_expected + l_distance_ds end; @@ -116,15 +92,14 @@ create or replace type body ut_be_within as end; overriding member function failure_message(a_actual ut_data_value) return varchar2 is - begin + begin return (self as ut_matcher).failure_message(a_actual) || ' '||self.distance_from_expected.to_string ||' of '|| expected.to_string_report(); end; overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2 is - l_result varchar2(32767); - begin + begin return (self as ut_matcher).failure_message_when_negated(a_actual) || ' '||self.distance_from_expected.to_string ||' of '|| expected.to_string_report(); - end; - + end; + end; / diff --git a/source/expectations/matchers/ut_be_within.tps b/source/expectations/matchers/ut_be_within.tps index 55f32bc4e..5090d3414 100644 --- a/source/expectations/matchers/ut_be_within.tps +++ b/source/expectations/matchers/ut_be_within.tps @@ -1,4 +1,4 @@ -create or replace type ut_be_within under ut_comparison_matcher( +create or replace type ut_be_within under ut_be_within_pct( /* utPLSQL - Version 3 Copyright 2016 - 2019 utPLSQL Project @@ -17,19 +17,11 @@ create or replace type ut_be_within under ut_comparison_matcher( */ - /** - * Holds information about mather options - */ - distance_from_expected ut_data_value, - member procedure init(self in out nocopy ut_be_within, a_distance_from_expected ut_data_value), constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected number) return self as result, constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected dsinterval_unconstrained) return self as result, constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected yminterval_unconstrained) return self as result, - member procedure of_(self in ut_be_within, a_expected number), member procedure of_(self in ut_be_within, a_expected date), - member function of_(self in ut_be_within, a_expected number) return ut_be_within, member function of_(self in ut_be_within, a_expected date) return ut_be_within, - overriding member function run_matcher(self in out nocopy ut_be_within, a_actual ut_data_value) return boolean, overriding member function failure_message(a_actual ut_data_value) return varchar2, overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2 diff --git a/source/expectations/matchers/ut_be_within_pct.tpb b/source/expectations/matchers/ut_be_within_pct.tpb index 326197fe6..bf662c066 100644 --- a/source/expectations/matchers/ut_be_within_pct.tpb +++ b/source/expectations/matchers/ut_be_within_pct.tpb @@ -16,21 +16,45 @@ create or replace type body ut_be_within_pct as limitations under the License. */ - constructor function ut_be_within_pct(self in out nocopy ut_be_within_pct, a_distance_from_expected number) return self as result is + constructor function ut_be_within_pct(self in out nocopy ut_be_within_pct, a_pct_of_expected number) return self as result is begin - self.init(ut_data_value_number(a_distance_from_expected)); + self.init(ut_data_value_number(a_pct_of_expected), $$plsql_unit); return; end; + member procedure init(self in out nocopy ut_be_within_pct, a_distance_from_expected ut_data_value, self_type varchar2) is + begin + self.distance_from_expected := a_distance_from_expected; + self.self_type := self_type; + end; + + member procedure of_(self in ut_be_within_pct, a_expected number) is + l_result ut_be_within_pct := self; + begin + l_result.expected := ut_data_value_number(a_expected); + if l_result.is_negated_flag = 1 then + l_result.expectation.not_to(l_result ); + else + l_result.expectation.to_(l_result ); + end if; + end; + + member function of_(self in ut_be_within_pct, a_expected number) return ut_be_within_pct is + l_result ut_be_within_pct := self; + begin + l_result.expected := ut_data_value_number(a_expected); + return l_result; + end; + overriding member function run_matcher(self in out nocopy ut_be_within_pct, a_actual ut_data_value) return boolean is l_result boolean; begin if self.expected.data_type = a_actual.data_type then if self.expected is of (ut_data_value_number) then - l_result := treat(self.distance_from_expected as ut_data_value_number).data_value >= - ( - ((treat(self.expected as ut_data_value_number).data_value - treat(a_actual as ut_data_value_number).data_value ) * 100 ) / - (treat(self.expected as ut_data_value_number).data_value)) ; + l_result := + treat(self.distance_from_expected as ut_data_value_number).data_value + >= ( ( treat(self.expected as ut_data_value_number).data_value - treat(a_actual as ut_data_value_number).data_value ) * 100 ) / + treat(self.expected as ut_data_value_number).data_value; end if; else l_result := (self as ut_matcher).run_matcher(a_actual); @@ -38,5 +62,15 @@ create or replace type body ut_be_within_pct as return l_result; end; + overriding member function failure_message(a_actual ut_data_value) return varchar2 is + begin + return rtrim( (self as ut_matcher).failure_message(a_actual), 'pct' ) || self.distance_from_expected.to_string ||' % of '|| expected.to_string_report(); + end; + + overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2 is + begin + return rtrim( (self as ut_matcher).failure_message_when_negated(a_actual), 'pct' ) || self.distance_from_expected.to_string ||' % of '|| expected.to_string_report(); + end; + end; / diff --git a/source/expectations/matchers/ut_be_within_pct.tps b/source/expectations/matchers/ut_be_within_pct.tps index b47c7a9fd..b1c7e4dfc 100644 --- a/source/expectations/matchers/ut_be_within_pct.tps +++ b/source/expectations/matchers/ut_be_within_pct.tps @@ -1,4 +1,4 @@ -create or replace type ut_be_within_pct under ut_be_within( +create or replace type ut_be_within_pct under ut_comparison_matcher( /* utPLSQL - Version 3 Copyright 2016 - 2019 utPLSQL Project @@ -17,8 +17,18 @@ create or replace type ut_be_within_pct under ut_be_within( */ - constructor function ut_be_within_pct(self in out nocopy ut_be_within_pct, a_distance_from_expected number) return self as result, - overriding member function run_matcher(self in out nocopy ut_be_within_pct, a_actual ut_data_value) return boolean + /** + * Holds information about mather options + */ + distance_from_expected ut_data_value, + + constructor function ut_be_within_pct(self in out nocopy ut_be_within_pct, a_pct_of_expected number) return self as result, + member procedure init(self in out nocopy ut_be_within_pct, a_distance_from_expected ut_data_value, self_type varchar2), + member procedure of_(self in ut_be_within_pct, a_expected number), + member function of_(self in ut_be_within_pct, a_expected number) return ut_be_within_pct, + overriding member function run_matcher(self in out nocopy ut_be_within_pct, a_actual ut_data_value) return boolean, + overriding member function failure_message(a_actual ut_data_value) return varchar2, + overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2 ) not final / diff --git a/source/install.sql b/source/install.sql index af639ac78..a3cf2c3d8 100644 --- a/source/install.sql +++ b/source/install.sql @@ -240,8 +240,8 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/ut_expectation_base.tps' @@install_component.sql 'expectations/matchers/ut_matcher.tps' @@install_component.sql 'expectations/matchers/ut_comparison_matcher.tps' -@@install_component.sql 'expectations/matchers/ut_be_within.tps' @@install_component.sql 'expectations/matchers/ut_be_within_pct.tps' +@@install_component.sql 'expectations/matchers/ut_be_within.tps' @@install_component.sql 'expectations/ut_expectation.tps' @@install_component.sql 'expectations/matchers/ut_be_false.tps' @@install_component.sql 'expectations/matchers/ut_be_greater_or_equal.tps' @@ -297,8 +297,8 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/matchers/ut_be_null.tpb' @@install_component.sql 'expectations/matchers/ut_be_true.tpb' @@install_component.sql 'expectations/matchers/ut_equal.tpb' -@@install_component.sql 'expectations/matchers/ut_be_within.tpb' @@install_component.sql 'expectations/matchers/ut_be_within_pct.tpb' +@@install_component.sql 'expectations/matchers/ut_be_within.tpb' @@install_component.sql 'expectations/matchers/ut_contain.tpb' @@install_component.sql 'expectations/matchers/ut_have_count.tpb' @@install_component.sql 'expectations/matchers/ut_be_between.tpb' @@ -362,6 +362,7 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'api/be_not_null.syn' @@install_component.sql 'api/be_null.syn' @@install_component.sql 'api/be_true.syn' +@@install_component.sql 'api/be_within_pct.syn' @@install_component.sql 'api/be_within.syn' @@install_component.sql 'api/equal.syn' @@install_component.sql 'api/have_count.syn' diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index 82d8a7e5a..ee76cb8eb 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -56,6 +56,8 @@ drop synonym equal; drop synonym be_within; +drop synonym be_within_pct; + drop type ut_coveralls_reporter force; drop type ut_coverage_sonar_reporter force; diff --git a/test/install_ut3_user_tests.sql b/test/install_ut3_user_tests.sql index 1330a7f75..8431c69ed 100644 --- a/test/install_ut3_user_tests.sql +++ b/test/install_ut3_user_tests.sql @@ -26,6 +26,7 @@ prompt Install user tests @@ut3_user/expectations/binary/test_be_greater_or_equal.pks @@ut3_user/expectations/binary/test_be_greater_than.pks @@ut3_user/expectations/binary/test_to_be_within.pks +@@ut3_user/expectations/binary/test_to_be_within_pct.pks @@ut3_user/expectations/test_matchers.pks @@ut3_user/expectations/test_expectation_anydata.pks @@ut3_user/expectations/test_expectations_cursor.pks @@ -68,6 +69,7 @@ set define off @@ut3_user/expectations/binary/test_be_greater_or_equal.pkb @@ut3_user/expectations/binary/test_be_greater_than.pkb @@ut3_user/expectations/binary/test_to_be_within.pkb +@@ut3_user/expectations/binary/test_to_be_within_pct.pkb @@ut3_user/expectations/test_matchers.pkb @@ut3_user/expectations/test_expectation_anydata.pkb @@ut3_user/expectations/test_expectations_cursor.pkb diff --git a/test/ut3_user/expectations/binary/test_to_be_within_pct.pkb b/test/ut3_user/expectations/binary/test_to_be_within_pct.pkb new file mode 100644 index 000000000..728cdeec6 --- /dev/null +++ b/test/ut3_user/expectations/binary/test_to_be_within_pct.pkb @@ -0,0 +1,184 @@ +create or replace package body test_to_be_within_pct is + + procedure cleanup_expectations is + begin + ut3_tester_helper.main_helper.clear_expectations( ); + end; + + function be_within_expectation_block( + a_matcher varchar2, + a_actual_type varchar2, + a_actual varchar2, + a_expected_type varchar2, + a_expected varchar2, + a_distance varchar2, + a_distance_type varchar2, + a_matcher_end varchar2 + ) return varchar2 + is + l_execute varchar2(32000); + begin + l_execute := ' + declare + l_actual '||a_actual_type||' := '||a_actual||'; + l_expected '||a_expected_type||' := '||a_expected||'; + l_distance '||a_distance_type||' := '||a_distance||'; + begin + --act - execute the expectation + ut3_develop.ut.expect( l_actual ).'||a_matcher||'( l_distance ).of_( l_expected )'||a_matcher_end||'; + end;'; + return l_execute; + end; + + procedure test_to_be_within_fail( + a_matcher varchar2, + a_actual_type varchar2, + a_actual varchar2, + a_expected_type varchar2, + a_expected varchar2, + a_distance varchar2, + a_distance_type varchar2, + a_failure_message varchar2 := null, + a_matcher_end varchar2 := null + ) is + l_failure_text varchar2(4000); + begin + execute immediate be_within_expectation_block( + a_matcher,a_actual_type, a_actual, a_expected_type, a_expected, + a_distance,a_distance_type, a_matcher_end + ); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(1); + if a_failure_message is not null then + l_failure_text := ut3_tester_helper.main_helper.get_failed_expectations(1); + ut.expect( l_failure_text ).to_be_like('%'||a_failure_message||'%' ); + end if; + cleanup_expectations; + end; + + procedure test_to_be_within_success( + a_matcher varchar2, + a_actual_type varchar2, + a_actual varchar2, + a_expected_type varchar2, + a_expected varchar2, + a_distance varchar2, + a_distance_type varchar2, + a_matcher_end varchar2 := null + ) is + begin + execute immediate be_within_expectation_block( + a_matcher,a_actual_type, a_actual, a_expected_type, a_expected, + a_distance,a_distance_type, a_matcher_end + ); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + cleanup_expectations; + end; + + + procedure test_to_be_within_error( + a_matcher varchar2, + a_actual_type varchar2, + a_actual varchar2, + a_expected_type varchar2, + a_expected varchar2, + a_distance varchar2, + a_distance_type varchar2, + a_error_message varchar2, + a_matcher_end varchar2 := null + ) is + begin + execute immediate be_within_expectation_block( + a_matcher,a_actual_type, a_actual, a_expected_type, a_expected, + a_distance,a_distance_type, a_matcher_end + ); + cleanup_expectations; + ut.fail('Expected exception but nothing was raised'); + exception + when others then + ut.expect(sqlerrm).to_be_like('%'||a_error_message||'%'); + cleanup_expectations; + end; + + + procedure expect_success is + begin + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + cleanup_expectations; + end; + + procedure expect_failure is + begin + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(1); + cleanup_expectations; + end; + + procedure success_tests is + begin + ut3_develop.ut.expect( 2.987654321 ).to_be_within_pct( 1 ).of_(3); + expect_success; + + ut3_develop.ut.expect( 2.987654321 ).to_( ut3_develop.be_within_pct( 1 ).of_(3) ); + expect_success; + + ut3_develop.ut.expect( 2.987654321 ).not_to_be_within_pct( 0.1 ).of_(3); + expect_success; + + ut3_develop.ut.expect( 2.987654321 ).not_to( ut3_develop.be_within_pct( 0.1 ).of_(3) ); + expect_success; + end; + + procedure failed_tests is + begin + ut3_develop.ut.expect( 2.987654321 ).to_be_within_pct( 0.1 ).of_(3); + expect_failure; + + ut3_develop.ut.expect( 2.987654321 ).to_( ut3_develop.be_within_pct( 0.1 ).of_(3) ); + expect_failure; + + ut3_develop.ut.expect( 2.987654321 ).not_to_be_within_pct( 1 ).of_(3); + expect_failure; + + ut3_develop.ut.expect( 2.987654321 ).not_to( ut3_develop.be_within_pct( 1 ).of_(3) ); + expect_failure; + end; + + procedure fail_for_number_not_within is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + --Act + ut3_develop.ut.expect(4).to_be_within_pct(1).of_(7); + --Assert + l_expected_message := q'[Actual: 4 (number) was expected to be within 1 % of 7 (number)]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure fail_to_compile_for_types is + begin + test_to_be_within_error( + 'to_be_within_pct','date', 'sysdate', 'date','sysdate', + '''0 0:00:11.333''','interval day to second', + 'wrong number or types of arguments in call to ''TO_BE_WITHIN_PCT''' + ); + test_to_be_within_error( + 'to_be_within_pct','number','1', 'date', 'sysdate', + '1','number', + ' wrong number or types of arguments in call to ''OF_''' + ); + test_to_be_within_error( + 'to_be_within_pct','number','1','number','1', + 'sysdate', 'date', + ' wrong number or types of arguments in call to ''TO_BE_WITHIN_PCT''' + ); + test_to_be_within_fail( + 'to_be_within_pct','date', 'sysdate', 'number','1', + '1','number', + 'Actual (date) cannot be compared to Expected (number) using matcher ''be within pct''' + ); + end; + +end; +/ diff --git a/test/ut3_user/expectations/binary/test_to_be_within_pct.pks b/test/ut3_user/expectations/binary/test_to_be_within_pct.pks new file mode 100644 index 000000000..6203d48e3 --- /dev/null +++ b/test/ut3_user/expectations/binary/test_to_be_within_pct.pks @@ -0,0 +1,22 @@ +create or replace package test_to_be_within_pct is + + --%suite((not)to_be_within_pct) + --%suitepath(utplsql.test_user.expectations.binary) + + --%aftereach + procedure cleanup_expectations; + + --%test(gives success for values within a distance) + procedure success_tests; + + --%test(gives failure when number is not within distance) + procedure failed_tests; + + --%test(returns well formatted failure message when expectation fails) + procedure fail_for_number_not_within; + + --%test(fails at compile or run time for unsupported data-types ) + procedure fail_in_invalid_argument_types; + +end; +/ From 3cae9a2d75311abda3c8cdd736848615682dddd9 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 20 Jun 2020 22:20:28 +0100 Subject: [PATCH 0723/1096] Fixed test issue --- .../binary/test_to_be_within_pct.pkb | 17 ++++++----------- .../binary/test_to_be_within_pct.pks | 2 +- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/test/ut3_user/expectations/binary/test_to_be_within_pct.pkb b/test/ut3_user/expectations/binary/test_to_be_within_pct.pkb index 728cdeec6..a184c3728 100644 --- a/test/ut3_user/expectations/binary/test_to_be_within_pct.pkb +++ b/test/ut3_user/expectations/binary/test_to_be_within_pct.pkb @@ -143,20 +143,15 @@ create or replace package body test_to_be_within_pct is end; procedure fail_for_number_not_within is - l_actual_message varchar2(32767); - l_expected_message varchar2(32767); begin - --Arrange - --Act - ut3_develop.ut.expect(4).to_be_within_pct(1).of_(7); - --Assert - l_expected_message := q'[Actual: 4 (number) was expected to be within 1 % of 7 (number)]'; - l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); - --Assert - ut.expect(l_actual_message).to_be_like(l_expected_message); + test_to_be_within_fail( + 'to_be_within_pct','number', '4', 'number','7', + '1','number', + q'[Actual: 4 (number) was expected to be within 1 % of 7 (number)]' + ); end; - procedure fail_to_compile_for_types is + procedure fail_at_invalid_argument_types is begin test_to_be_within_error( 'to_be_within_pct','date', 'sysdate', 'date','sysdate', diff --git a/test/ut3_user/expectations/binary/test_to_be_within_pct.pks b/test/ut3_user/expectations/binary/test_to_be_within_pct.pks index 6203d48e3..4b8f0cb4c 100644 --- a/test/ut3_user/expectations/binary/test_to_be_within_pct.pks +++ b/test/ut3_user/expectations/binary/test_to_be_within_pct.pks @@ -16,7 +16,7 @@ create or replace package test_to_be_within_pct is procedure fail_for_number_not_within; --%test(fails at compile or run time for unsupported data-types ) - procedure fail_in_invalid_argument_types; + procedure fail_at_invalid_argument_types; end; / From 22549db1c0aaa2d34c43d8365de6e6023807247d Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 21 Jun 2020 12:11:58 +0100 Subject: [PATCH 0724/1096] Fixed stacktrace for failed expectations on chained matchers. --- source/core/ut_expectation_processor.pkb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/core/ut_expectation_processor.pkb b/source/core/ut_expectation_processor.pkb index 4bf15ee55..7e1217acf 100644 --- a/source/core/ut_expectation_processor.pkb +++ b/source/core/ut_expectation_processor.pkb @@ -159,7 +159,7 @@ create or replace package body ut_expectation_processor as -- when 11g and 12c reports only package name function cut_header_and_expectations( a_stack varchar2 ) return varchar2 is begin - return regexp_substr( a_stack, '(.*\.(UT_EXPECTATION[A-Z0-9#_$]*|UT|UTASSERT2?)(\.[A-Z0-9#_$]+)?\s+)+((.|\s)*)', 1, 1, 'm', 4); + return regexp_substr( a_stack, '(.*\.(UT_EQUAL|UT_BE_WITHIN[A-Z0-9#_$]*|UT_EXPECTATION[A-Z0-9#_$]*|UT|UTASSERT2?)(\.[A-Z0-9#_$]+)?\s+)+((.|\s)*)', 1, 1, 'm', 4); end; function cut_address_columns( a_stack varchar2 ) return varchar2 is begin @@ -183,7 +183,6 @@ create or replace package body ut_expectation_processor as ); end; begin --- dbms_output.put_line(a_call_stack); l_call_stack := cut_header_and_expectations( a_call_stack ); l_call_stack := cut_address_columns( l_call_stack ); l_call_stack := cut_framework_stack( l_call_stack ); From e9e4b9ed3d5dd9f65f5f52dd080920ca4eefc1ff Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 21 Jun 2020 14:18:27 +0100 Subject: [PATCH 0725/1096] Reorganized and cleaned up tests to have only one package used for coverage tests. --- test/ut3_tester_helper/coverage_helper.pkb | 36 +------- test/ut3_tester_helper/coverage_helper.pks | 8 +- .../test_coverage_standalone.pkb | 88 +++++++++++-------- .../test_coverage_standalone.pks | 5 +- 4 files changed, 56 insertions(+), 81 deletions(-) diff --git a/test/ut3_tester_helper/coverage_helper.pkb b/test/ut3_tester_helper/coverage_helper.pkb index 67bef571a..9b595a0b3 100644 --- a/test/ut3_tester_helper/coverage_helper.pkb +++ b/test/ut3_tester_helper/coverage_helper.pkb @@ -20,10 +20,7 @@ create or replace package body coverage_helper is $end end; - function substitute_covered_package( - a_text varchar2, - a_substitution varchar2 - ) return varchar2 is + function substitute_covered_package( a_text varchar2, a_substitution varchar2 ) return varchar2 is begin return replace( replace( a_text, a_substitution, covered_package_name() ), upper(a_substitution), upper(covered_package_name()) ); end; @@ -126,39 +123,10 @@ create or replace package body coverage_helper is begin execute immediate q'[drop package ut3_develop.test_dummy_coverage_1]'; exception when others then null; end; end; - procedure create_coverage_pkg is - pragma autonomous_transaction; - begin - execute immediate 'alter session set plsql_optimize_level=0'; - execute immediate q'[create or replace package coverage_pkg as - function run_some_branching_code(a_input integer) return integer; - end;]'; - execute immediate q'[create or replace package body coverage_pkg as - function run_some_branching_code(a_input integer) return integer is - l_result integer; - begin - if a_input = 1 then return -1; elsif a_input = 2 then return 0; - else - return a_input; - end if; - end; - end;]'; - execute immediate 'grant debug on coverage_pkg to ut3$user#'; - end; - - procedure drop_coverage_pkg is - pragma autonomous_transaction; - begin - execute immediate q'[drop package coverage_pkg]'; - end; - - - procedure run_standalone_coverage(a_coverage_run_id raw, a_input integer) is - x integer; begin ut3_develop.ut_runner.coverage_start(a_coverage_run_id); - execute immediate 'begin :x := coverage_pkg.run_some_branching_code(:a_input); end;' using out x, in a_input; + execute immediate 'begin ut3_develop.'||covered_package_name||'.do_stuff(:a_input); end;' using in a_input; ut3_develop.ut_runner.coverage_stop(); end; diff --git a/test/ut3_tester_helper/coverage_helper.pks b/test/ut3_tester_helper/coverage_helper.pks index 470b1971d..b044c897b 100644 --- a/test/ut3_tester_helper/coverage_helper.pks +++ b/test/ut3_tester_helper/coverage_helper.pks @@ -4,10 +4,7 @@ create or replace package coverage_helper is function covered_package_name return varchar2; - function substitute_covered_package( - a_text varchar2, - a_substitution varchar2 := '{p}' - ) return varchar2; + function substitute_covered_package( a_text varchar2, a_substitution varchar2 := '{p}' ) return varchar2; procedure set_develop_mode; @@ -20,9 +17,6 @@ create or replace package coverage_helper is procedure run_standalone_coverage(a_coverage_run_id raw, a_input integer); procedure run_coverage_job(a_coverage_run_id raw, a_input integer); - procedure create_coverage_pkg; - procedure drop_coverage_pkg; - function run_tests_as_job( a_run_command varchar2 ) return clob; function run_code_as_job( a_plsql_block varchar2 ) return clob; procedure create_test_results_table; diff --git a/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb b/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb index 8816d4895..6ec700b16 100644 --- a/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb +++ b/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb @@ -1,28 +1,52 @@ create or replace package body test_coverage_standalone is - procedure coverage_without_ut_run is - l_coverage_run_id raw(32) := sys_guid(); - l_actual ut3_develop.ut_varchar2_list; + function run_coverage_twice(a_overage_run_id raw, a_object_name varchar2) return clob is l_expected clob; l_block_cov clob; + l_file_path varchar2(250); begin + l_file_path := 'ut3_develop.'||a_object_name; --Arrange if ut3_tester_helper.coverage_helper.block_coverage_available then - l_block_cov := '%'; + l_block_cov := ''; else - l_block_cov := '%'; + l_block_cov := ''; end if; - l_expected := '%ut3_tester_helper.coverage_pkg' || - '%' || - l_block_cov || - '%%'; - --Act - ut3_tester_helper.coverage_helper.run_coverage_job(l_coverage_run_id, 1); - ut3_tester_helper.coverage_helper.run_coverage_job(l_coverage_run_id, 3); + l_expected := + q'[ + + + +]'||l_file_path||q'[ + + + + + +]'||l_block_cov||q'[ + + + + + +]'; + --Act + ut3_tester_helper.coverage_helper.run_coverage_job(a_overage_run_id, 1); + ut3_tester_helper.coverage_helper.run_coverage_job(a_overage_run_id, 3); + return l_expected; + end; + + procedure coverage_without_ut_run is + l_coverage_run_id raw(32) := sys_guid(); + l_actual ut3_develop.ut_varchar2_list; + l_expected clob; + l_name varchar2(250); + begin + l_name := ut3_tester_helper.coverage_helper.covered_package_name; + + --Arrange and Act + l_expected := run_coverage_twice(l_coverage_run_id, l_name); - --Assert select * bulk collect into l_actual from @@ -30,11 +54,13 @@ create or replace package body test_coverage_standalone is ut3_develop.ut_coverage_cobertura_reporter( ).get_report( ut3_develop.ut_coverage_options( coverage_run_id => l_coverage_run_id, - include_objects => ut3_develop.ut_varchar2_rows('COVERAGE_PKG'), - schema_names => ut3_develop.ut_varchar2_rows('UT3_TESTER_HELPER') + include_objects => ut3_develop.ut_varchar2_rows(l_name), + schema_names => ut3_develop.ut_varchar2_rows('UT3_DEVELOP') ) ) ); + + --Assert ut.expect(ut3_tester_helper.main_helper.table_to_clob(l_actual)).to_be_like( l_expected ); end; @@ -43,35 +69,25 @@ create or replace package body test_coverage_standalone is l_coverage_cursor sys_refcursor; l_actual ut3_develop.ut_varchar2_list; l_expected clob; - l_block_cov clob; + l_name varchar2(250); begin - --Arrange - if ut3_tester_helper.coverage_helper.block_coverage_available then - l_block_cov := '%'; - else - l_block_cov := '%'; - end if; - l_expected := '%ut3_tester_helper.coverage_pkg' || - '%' || - l_block_cov || - '%%'; - --Act - ut3_tester_helper.coverage_helper.run_coverage_job(l_coverage_run_id, 1); - ut3_tester_helper.coverage_helper.run_coverage_job(l_coverage_run_id, 3); + l_name := ut3_tester_helper.coverage_helper.covered_package_name; + + --Arrange and Act + l_expected := run_coverage_twice(l_coverage_run_id, l_name); - --Assert l_coverage_cursor := ut3_develop.ut_coverage_cobertura_reporter( ).get_report_cursor( ut3_develop.ut_coverage_options( coverage_run_id => l_coverage_run_id, - include_objects => ut3_develop.ut_varchar2_rows('COVERAGE_PKG'), - schema_names => ut3_develop.ut_varchar2_rows('UT3_TESTER_HELPER') + include_objects => ut3_develop.ut_varchar2_rows(l_name), + schema_names => ut3_develop.ut_varchar2_rows('UT3_DEVELOP') ) ); fetch l_coverage_cursor bulk collect into l_actual; close l_coverage_cursor; + + --Assert ut.expect(ut3_tester_helper.main_helper.table_to_clob(l_actual)).to_be_like( l_expected ); end; diff --git a/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pks b/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pks index 69aae3f25..1d5bb9a2c 100644 --- a/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pks +++ b/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pks @@ -1,10 +1,7 @@ create or replace package test_coverage_standalone authid current_user is --%suite - --%suitepath(utplsql.test_user.reporters) - - --%beforeall(ut3_tester_helper.coverage_helper.create_coverage_pkg) - --%afterall(ut3_tester_helper.coverage_helper.drop_coverage_pkg) + --%suitepath(utplsql.test_user.reporters.test_coverage) --%test(Coverage can be invoked standalone in multiple sessions and a combined report can be produced at the end) procedure coverage_without_ut_run; From a4ae4cf875cf7e925d7c7634786a4811474bc8a5 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 21 Jun 2020 15:48:48 +0100 Subject: [PATCH 0726/1096] Removed dead code. --- source/core/coverage/ut_coverage_helper_block.pkb | 7 ------- 1 file changed, 7 deletions(-) diff --git a/source/core/coverage/ut_coverage_helper_block.pkb b/source/core/coverage/ut_coverage_helper_block.pkb index b81292017..1ded434ba 100644 --- a/source/core/coverage/ut_coverage_helper_block.pkb +++ b/source/core/coverage/ut_coverage_helper_block.pkb @@ -16,13 +16,6 @@ create or replace package body ut_coverage_helper_block is limitations under the License. */ - type t_proftab_row is record ( - line binary_integer, - calls number(38,0) - ); - - type t_proftab_rows is table of t_proftab_row; - type t_block_row is record( line binary_integer ,blocks binary_integer From 0e72abc1198ff3bdc585ef4bb1c0f5611b834419 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 21 Jun 2020 20:59:24 +0100 Subject: [PATCH 0727/1096] Added support for client_character_set as report parameter. --- .../coverage/ut_coverage_reporter_base.tpb | 8 +++---- .../coverage/ut_coverage_reporter_base.tps | 4 ++-- .../test_coverage_standalone.pkb | 22 +++++++++++-------- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/source/core/coverage/ut_coverage_reporter_base.tpb b/source/core/coverage/ut_coverage_reporter_base.tpb index 6300348e0..96c4b5066 100644 --- a/source/core/coverage/ut_coverage_reporter_base.tpb +++ b/source/core/coverage/ut_coverage_reporter_base.tpb @@ -86,12 +86,12 @@ create or replace type body ut_coverage_reporter_base is ut_coverage.coverage_pause(); end; - final member function get_report( a_coverage_options ut_coverage_options ) return ut_varchar2_rows pipelined is + final member function get_report( a_coverage_options ut_coverage_options, a_client_character_set varchar2 := null ) return ut_varchar2_rows pipelined is l_reporter ut_coverage_reporter_base := self; begin ut_coverage_helper.cleanup_tmp_table(); (l_reporter as ut_output_reporter_base).before_calling_run(null); - l_reporter.after_calling_run( ut_run( a_coverage_options => a_coverage_options ) ); + l_reporter.after_calling_run( ut_run( a_coverage_options => a_coverage_options, a_client_character_set => a_client_character_set ) ); l_reporter.on_finalize(null); for i in (select x.text from table(l_reporter.get_lines(1, 1)) x ) loop pipe row (i.text); @@ -99,13 +99,13 @@ create or replace type body ut_coverage_reporter_base is return; end; - final member function get_report_cursor( a_coverage_options ut_coverage_options ) return sys_refcursor is + final member function get_report_cursor( a_coverage_options ut_coverage_options, a_client_character_set varchar2 := null ) return sys_refcursor is l_reporter ut_coverage_reporter_base := self; l_result sys_refcursor; begin ut_coverage_helper.cleanup_tmp_table(); (l_reporter as ut_output_reporter_base).before_calling_run(null); - l_reporter.after_calling_run( ut_run( a_coverage_options => a_coverage_options ) ); + l_reporter.after_calling_run( ut_run( a_coverage_options => a_coverage_options, a_client_character_set => a_client_character_set ) ); l_reporter.on_finalize(null); open l_result for select x.text from table(l_reporter.get_lines(1, 1)) x; return l_result; diff --git a/source/core/coverage/ut_coverage_reporter_base.tps b/source/core/coverage/ut_coverage_reporter_base.tps index 039bbe320..cae165258 100644 --- a/source/core/coverage/ut_coverage_reporter_base.tps +++ b/source/core/coverage/ut_coverage_reporter_base.tps @@ -37,8 +37,8 @@ create or replace type ut_coverage_reporter_base under ut_output_reporter_base( overriding final member procedure before_calling_after_all(self in out nocopy ut_coverage_reporter_base, a_executable in ut_executable), overriding final member procedure after_calling_after_all (self in out nocopy ut_coverage_reporter_base, a_executable in ut_executable), - final member function get_report(a_coverage_options ut_coverage_options ) return ut_varchar2_rows pipelined, - final member function get_report_cursor(a_coverage_options ut_coverage_options ) return sys_refcursor + final member function get_report( a_coverage_options ut_coverage_options, a_client_character_set varchar2 := null ) return ut_varchar2_rows pipelined, + final member function get_report_cursor( a_coverage_options ut_coverage_options, a_client_character_set varchar2 := null ) return sys_refcursor ) not final not instantiable / diff --git a/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb b/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb index 6ec700b16..ef7014235 100644 --- a/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb +++ b/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb @@ -1,6 +1,6 @@ create or replace package body test_coverage_standalone is - function run_coverage_twice(a_overage_run_id raw, a_object_name varchar2) return clob is + function run_coverage_twice(a_overage_run_id raw, a_object_name varchar2, a_charset varchar2) return clob is l_expected clob; l_block_cov clob; l_file_path varchar2(250); @@ -13,7 +13,7 @@ create or replace package body test_coverage_standalone is l_block_cov := ''; end if; l_expected := - q'[ + q'[ @@ -41,22 +41,24 @@ create or replace package body test_coverage_standalone is l_actual ut3_develop.ut_varchar2_list; l_expected clob; l_name varchar2(250); + l_charset varchar2(100) := 'ISO-8859-1'; begin l_name := ut3_tester_helper.coverage_helper.covered_package_name; --Arrange and Act - l_expected := run_coverage_twice(l_coverage_run_id, l_name); + l_expected := run_coverage_twice(l_coverage_run_id, l_name, l_charset); select * bulk collect into l_actual from table ( - ut3_develop.ut_coverage_cobertura_reporter( ).get_report( - ut3_develop.ut_coverage_options( + ut3_develop.ut_coverage_cobertura_reporter().get_report( + a_coverage_options => ut3_develop.ut_coverage_options( coverage_run_id => l_coverage_run_id, include_objects => ut3_develop.ut_varchar2_rows(l_name), schema_names => ut3_develop.ut_varchar2_rows('UT3_DEVELOP') - ) + ), + a_client_character_set => l_charset ) ); @@ -70,19 +72,21 @@ create or replace package body test_coverage_standalone is l_actual ut3_develop.ut_varchar2_list; l_expected clob; l_name varchar2(250); + l_charset varchar2(100) := 'ISO-8859-1'; begin l_name := ut3_tester_helper.coverage_helper.covered_package_name; --Arrange and Act - l_expected := run_coverage_twice(l_coverage_run_id, l_name); + l_expected := run_coverage_twice(l_coverage_run_id, l_name, l_charset); l_coverage_cursor := ut3_develop.ut_coverage_cobertura_reporter( ).get_report_cursor( - ut3_develop.ut_coverage_options( + a_coverage_options => ut3_develop.ut_coverage_options( coverage_run_id => l_coverage_run_id, include_objects => ut3_develop.ut_varchar2_rows(l_name), schema_names => ut3_develop.ut_varchar2_rows('UT3_DEVELOP') - ) + ), + a_client_character_set => l_charset ); fetch l_coverage_cursor bulk collect into l_actual; close l_coverage_cursor; From 955de5c2dc527a98a6f5dc0dd8bd8d81a44c459f Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 21 Jun 2020 22:36:02 +0100 Subject: [PATCH 0728/1096] Made coverage_run_id mandatory in `ut_coverage_options` Added documentation --- docs/userguide/coverage.md | 143 ++++++++++++++++++++-- source/api/ut_runner.pkb | 1 + source/core/types/ut_coverage_options.tpb | 4 +- source/core/types/ut_coverage_options.tps | 2 +- 4 files changed, 134 insertions(+), 16 deletions(-) diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 3b968ccc4..893c2e3a6 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,7 +1,7 @@ ![version](https://img.shields.io/badge/version-v3.1.11.3392--develop-blue.svg) # Coverage -utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. +utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. Code coverage is gathered for the following source types: * package bodies * type bodies @@ -11,9 +11,9 @@ Code coverage is gathered for the following source types: **Note** -> The package and type specifications are explicitly excluded from code coverage analysis. This limitation is introduced to avoid false-negatives. Typically package specifications contain no executable code. The only exception is initialization of global constants and variables in package specification. Since most package specifications are not executable at all, there is no information available on the number of lines covered and those would be reported as 0% covered, which is not desirable. +> The package and type specifications are excluded from code coverage analysis. This limitation is introduced to avoid false-negatives. Typically package specifications contain no executable code. The only exception is initialization of global constants and variables in package specification. Since most package specifications are not executable at all, there is no information available on the number of lines covered and those would be reported as 0% covered, which is not desirable. -To obtain information about code coverage of your unit tests, all you need to do is run your unit tests with one of built-in code coverage reporters. +To obtain information about code coverage for unit tests, run utPLSQL with one of built-in code coverage reporters. The following code coverage reporters are supplied with utPLSQL: * `ut_coverage_html_reporter` - generates a HTML coverage report providing summary and detailed information on code coverage. The HTML reporter is based on the open-source [simplecov-html](https://github.com/colszowka/simplecov-html) reporter for Ruby. It includes source code of the code that was covered (if possible) * `ut_coveralls_reporter` - generates a [Coveralls compatible JSON](https://coveralls.zendesk.com/hc/en-us/articles/201774865-API-Introduction) coverage report providing detailed information on code coverage with line numbers. This coverage report is designed to be consumed by cloud services like [Coveralls](https://coveralls.io) @@ -33,8 +33,8 @@ If you have `execute` privilege only on the unit tests, but do not have `execute If the code that is being tested is complied as NATIVE, the code coverage will not be reported as well. ## Running unit tests with coverage -Using the code coverage functionality is as easy as using any other [reporter](reporters.md) for the utPLSQL project. You just run your tests from your preferred SQL tool and save the reporter results to a file. -All you need to do is pass the constructor of the reporter to your `ut.run` +Using the code coverage functionality is as easy as using any other [reporter](reporters.md) for the utPLSQL test-run. You just run your tests from your preferred SQL tool and save the reporter results to a file. +All you need to do is pass the constructor of the reporter to the `ut.run` procedure call. Example: ```sql @@ -43,10 +43,10 @@ begin end; / ``` -Executes all unit tests in the current schema, gathers information about code coverage and outputs the HTML text into DBMS_OUTPUT. +The above command executes all unit tests in the **current schema**, gathers information about code coverage and outputs the HTML report as text into DBMS_OUTPUT. The `ut_coverage_html_reporter` will produce an interactive HTML report. You can see a sample of code coverage for the utPLSQL project [here](https://utplsql.github.io/utPLSQL-coverage-html/) -The report provides summary information with a list of source code that was expected to be covered. +The report provides summary information with a list of source code that should be covered. ![Coverage Summary page](../images/coverage_html_summary.png) @@ -57,8 +57,8 @@ The report allow you to navigate to each source file and inspect line by line co #### Oracle 12.2 extended coverage with profiler and block coverage Using data collected from profiler and block coverage running parallel we are able to enrich information about coverage. -For every line recorded by profiler if we have a partially covered same line in block coverage we will display that information -presenting line as partially covered, displaying number of block and how many blocks been covered in that line.The feature will be automatically enabled in the Oracle database version 12.2 and higher, for older versions current profiler will be used. +For every line recorded by the profiler if we have a partially covered same line in block coverage we will display that information +presenting line as partially covered, displaying number of block and how many blocks have been covered in that line.The feature will be automatically enabled in the Oracle database version 12.2 and higher, for older versions current profiler will be used. utPLSQL installation automatically creates tables needed by `dbms_plsql_code_coverage` on databases in versions above 12c Release 1. Due to security model of `dbms_plsql_code_coverage` package, utPLSQL grants access to those tables and creates synonyms for those tables. @@ -92,7 +92,8 @@ The default behavior of coverage reporting can be altered using invocation param ### Schema based Coverage -To simply gather coverage for all objects in your current schema execute tests with coverage reporting. +To gather coverage for all objects in the **current schema** execute tests with coverage report as argument. +This is the default reporting option and therefore additional coverage options don't need to be provided. ```sql exec ut.run(ut_coverage_html_reporter()); @@ -109,7 +110,7 @@ exec ut.run(ut_coverage_html_reporter()); #### Setting coverage schema(s) By default, coverage is gathered on the schema(s) derived from suite paths provided to execute tests. -This is correct as long as your test packages and tested code share the same schema. +This is a valid approach as long as your test packages and tested code share the same schema. So when you run: ```sql @@ -531,8 +532,8 @@ Unit test code is mapped to files in `test_results.xml` In order to allow deterministic and accurate mapping of database source-code into project files, the project directory and file structure needs to meet certain criteria. - Source code is kept separate from test code (separate directories) -- Each database (source-code) object is stored in individual file. Package/type specification is kept separate from it's body. -- File name (file path) contains name of database object +- Each database (source-code) object is stored in an individual file. Package/type specification is kept separate from its body. +- File name (file path) contains the name of database object - Each file-path clearly identifies object type (by file extension) - Each file contains representation of database object "as is". No extra commands (like `set echo off` `ALTER SESSION SET PLSQL_CCFLAGS = 'debug:TRUE';`) or blank lines are present before `CREATE TYPE`,`CREATE TYPE` etc. - When project is spanning across multiple database schemes, each file-path clearly and uniformly identifies object owner @@ -659,3 +660,119 @@ begin end; ``` +## Reporting coverage outside of utPLSQL + +utPSLQL allows fo standalone reporting code coverage across multiple database sessions. This functionality enables coverage reporting for external testing tools. + +Following API calls enable the standalone coverage reporting. + +- `ut_runner.coverage_start( coverage_run_id );` - initiates code coverage within a session +- `ut_runner.coverage_stop();` - stops gathering of code coverage within a session +- `.get_report( ... )` - coverage reporters function producing coverage report as pipelined data-set (to be used in SQL query) +- `.get_report_cursor( ... )` - coverage reporters function producing coverage report as ref-cursor + +Example: +```sql +--SESSION 1 +-- gather coverage on code using specific coverage_run_id value +declare + l_coverage_run_id raw(32); +begin + l_coverage_run_id := 'A6AA5B7361251CE6E053020011ACA055'; +-- l_coverage_run_id := sys_guid; + ut_runner.coverage_start(l_coverage_run_id); + + --The code to gather coverage on goes here + + ut_runner.coverage_stop(); +end; +/ +``` + +```sql +--SESSION 2 +-- alternative approach +-- gather coverage on code using specific coverage_run_id value +exec ut_runner.coverage_start('A6AA5B7361251CE6E053020011ACA055'); + +--The code to gather coverage on goes here + +exec ut_runner.coverage_stop(); +``` + + +```sql +--SESSION 1 or SESSION2 2 or SESSION 3 +-- run after calls in SESSION 1 & 2 are finshed +-- retrieve coverage report in HTML format coverage_run_id value +select * + from table( + ut_coverage_html_reporter().get_report( + a_coverage_options => ut_coverage_options( + coverage_run_id => 'A6AA5B7361251CE6E053020011ACA055' + ) + ) + ); +``` + +```sql +--SESSION 1 or SESSION2 2 or SESSION 3 +-- run after calls in SESSION 1 & 2 are finshed +declare + l_results_cursor sys_refcursor; +begin + l_results_cursor := ut_coverage_html_reporter().get_report_cursor( + a_coverage_options => ut_coverage_options( + coverage_run_id => 'A6AA5B7361251CE6E053020011ACA055' + ) + ); + --fetch and process the cursor results + close l_results_cursor; +end; +/ +``` + +Specification of parameters for `get_report` and `get_report_cursor` +```sql +function get_report( + a_coverage_options ut_coverage_options, + a_client_character_set varchar2 := null +) return ut_varchar2_rows pipelined +``` + +```sql +function get_report_cursor( + a_coverage_options ut_coverage_options, + a_client_character_set varchar2 := null +) return sys_refcursor +``` +```sql +ut_coverage_options( + coverage_run_id raw, + schema_names ut_varchar2_rows := null, + exclude_objects ut_varchar2_rows := null, + include_objects ut_varchar2_rows := null, + file_mappings ut_file_mappings := null +); +``` + +The `a_client_character_set` is used to provide character set to the report. Coverage reports in XML and HTML format include this information to assure that HMTL/XML encoding tag is aligned with encoding of the report produced. +Use this parameter to provide encoding of your client application. + +The `a_coverage_options` parameter is used to control the scope and formatting of data returned by report. + +`ut_coverage_options` object accepts the following arguments + +- `coverage_run_id` - identifier of coverage run to generate report for - data-type `RAW(32)` +- `schema_names` - optional - list of schema names to include in coverage report - data-type `UT_VARCHAR2_ROWS` +- `exclude_objects` - optional - list of object names to exclude from report - data-type `UT_VARCHAR2_ROWS` +- `include_objects` - optional - list of object names to gather coverage on - data-type `UT_VARCHAR2_ROWS` +- `file_mappings` - optional - list of schema names to gather coverage on - data-type `UT_FILE_MAPPINGS` + +`coverage_run_id` parameter identifies a common coverage run. The valid value type for that parameter is RAW(32). +It is recommended to use `sys_guid()` to generate a common, unique identifier for a specific coverage run. +If the identifier is not unique, previous runs of coverage that used the same `coverage_run_id` will be aggregated to the resulting coverage report. + +For details on the meaning of `schema_names`, `exclude_objects`, `include_objects`, `file_mappings` see sections above. +Note that data-types of include/exclude/schema lists are different when calling `ut.run` vs. calling `get_report/get_report_cursor`. + diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index 31306b1c9..bb7d3e458 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -124,6 +124,7 @@ create or replace package body ut_runner is l_run := ut_run( a_run_paths => l_paths, a_coverage_options => ut_coverage_options( + coverage_run_id => sys_guid(), schema_names => l_coverage_schema_names, exclude_objects => ut_utils.convert_collection(a_exclude_objects), include_objects => ut_utils.convert_collection(a_include_objects), diff --git a/source/core/types/ut_coverage_options.tpb b/source/core/types/ut_coverage_options.tpb index 48a0f27c8..6eb4921a7 100644 --- a/source/core/types/ut_coverage_options.tpb +++ b/source/core/types/ut_coverage_options.tpb @@ -18,7 +18,7 @@ create or replace type body ut_coverage_options as constructor function ut_coverage_options( self in out nocopy ut_coverage_options, - coverage_run_id raw := null, + coverage_run_id raw, schema_names ut_varchar2_rows := null, exclude_objects ut_varchar2_rows := null, include_objects ut_varchar2_rows := null, @@ -46,7 +46,7 @@ create or replace type body ut_coverage_options as return l_result; end; begin - self.coverage_run_id := coalesce(coverage_run_id, sys_guid()); + self.coverage_run_id := coverage_run_id; self.file_mappings := file_mappings; self.schema_names := schema_names; self.exclude_objects := ut_object_names(); diff --git a/source/core/types/ut_coverage_options.tps b/source/core/types/ut_coverage_options.tps index 0de07b568..d6e86b653 100644 --- a/source/core/types/ut_coverage_options.tps +++ b/source/core/types/ut_coverage_options.tps @@ -23,7 +23,7 @@ create or replace type ut_coverage_options force as object ( file_mappings ut_file_mappings, constructor function ut_coverage_options( self in out nocopy ut_coverage_options, - coverage_run_id raw := null, + coverage_run_id raw, schema_names ut_varchar2_rows := null, exclude_objects ut_varchar2_rows := null, include_objects ut_varchar2_rows := null, From 1d771a546e1a081c07c1ad539624e6c67b2f97be Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Thu, 25 Jun 2020 20:31:51 +0100 Subject: [PATCH 0729/1096] Update timestamps No tests --- source/expectations/matchers/ut_be_within.tpb | 81 +++++++++++++++++++ source/expectations/matchers/ut_be_within.tps | 6 ++ .../expectations/binary/test_to_be_within.pkb | 6 ++ 3 files changed, 93 insertions(+) diff --git a/source/expectations/matchers/ut_be_within.tpb b/source/expectations/matchers/ut_be_within.tpb index 40bcfbab0..7e90ff4e6 100644 --- a/source/expectations/matchers/ut_be_within.tpb +++ b/source/expectations/matchers/ut_be_within.tpb @@ -52,6 +52,60 @@ create or replace type body ut_be_within as return l_result; end; + member procedure of_(self in ut_be_within, a_expected timestamp) is + l_result ut_be_within := self; + begin + l_result.expected := ut_data_value_timestamp(a_expected); + if l_result.is_negated_flag = 1 then + l_result.expectation.not_to(l_result ); + else + l_result.expectation.to_(l_result ); + end if; + end; + + member function of_(self in ut_be_within, a_expected timestamp) return ut_be_within is + l_result ut_be_within := self; + begin + l_result.expected := ut_data_value_timestamp(a_expected); + return l_result; + end; + + member procedure of_(self in ut_be_within, a_expected timestamp_tz_unconstrained) is + l_result ut_be_within := self; + begin + l_result.expected := ut_data_value_timestamp_tz(a_expected); + if l_result.is_negated_flag = 1 then + l_result.expectation.not_to(l_result ); + else + l_result.expectation.to_(l_result ); + end if; + end; + + member function of_(self in ut_be_within, a_expected timestamp_tz_unconstrained) return ut_be_within is + l_result ut_be_within := self; + begin + l_result.expected := ut_data_value_timestamp_tz(a_expected); + return l_result; + end; + + member procedure of_(self in ut_be_within, a_expected timestamp_ltz_unconstrained) is + l_result ut_be_within := self; + begin + l_result.expected := ut_data_value_timestamp_ltz(a_expected); + if l_result.is_negated_flag = 1 then + l_result.expectation.not_to(l_result ); + else + l_result.expectation.to_(l_result ); + end if; + end; + + member function of_(self in ut_be_within, a_expected timestamp_ltz_unconstrained) return ut_be_within is + l_result ut_be_within := self; + begin + l_result.expected := ut_data_value_timestamp_ltz(a_expected); + return l_result; + end; + overriding member function run_matcher(self in out nocopy ut_be_within, a_actual ut_data_value) return boolean is l_result boolean; function l_result_from_number return boolean is @@ -78,12 +132,39 @@ create or replace type body ut_be_within as end; end; + function l_result_from_timestamp (a_distance ut_data_value) return boolean is + l_expected timestamp := case when self.expected is of ( ut_data_value_timestamp) then + treat(self.expected as ut_data_value_timestamp).data_value + when self.expected is of ( ut_data_value_timestamp_tz) then + treat(self.expected as ut_data_value_timestamp_tz).data_value + when self.expected is of ( ut_data_value_timestamp_ltz) then + treat(self.expected as ut_data_value_timestamp_ltz).data_value + end; + l_actual timestamp with time zone := treat(a_actual as ut_data_value_date).data_value; + l_distance_ym yminterval_unconstrained := case when self.distance_from_expected is of ( ut_data_value_yminterval) + then treat(self.distance_from_expected as ut_data_value_yminterval).data_value + end; + l_distance_ds dsinterval_unconstrained := case when self.distance_from_expected is of ( ut_data_value_dsinterval) + then treat(self.distance_from_expected as ut_data_value_dsinterval).data_value + end; + begin + return case when l_distance_ym is not null + then l_actual between l_expected - l_distance_ym and l_expected + l_distance_ym + else l_actual between l_expected - l_distance_ds and l_expected + l_distance_ds + end; + end; + + begin if self.expected.data_type = a_actual.data_type then if self.expected is of (ut_data_value_number) then l_result := l_result_from_number; elsif self.expected is of (ut_data_value_date)then l_result := l_result_from_date(self.distance_from_expected); + elsif self.expected is of (ut_data_value_timestamp_tz)then + l_result := l_result_from_date(self.distance_from_expected); + elsif self.expected is of (ut_data_value_timestamp_ltz)then + l_result := l_result_from_date(self.distance_from_expected); end if; else l_result := (self as ut_matcher).run_matcher(a_actual); diff --git a/source/expectations/matchers/ut_be_within.tps b/source/expectations/matchers/ut_be_within.tps index 5090d3414..0b14bce44 100644 --- a/source/expectations/matchers/ut_be_within.tps +++ b/source/expectations/matchers/ut_be_within.tps @@ -22,6 +22,12 @@ create or replace type ut_be_within under ut_be_within_pct( constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected yminterval_unconstrained) return self as result, member procedure of_(self in ut_be_within, a_expected date), member function of_(self in ut_be_within, a_expected date) return ut_be_within, + member procedure of_(self in ut_be_within, a_expected timestamp), + member function of_(self in ut_be_within, a_expected timestamp) return ut_be_within, + member procedure of_(self in ut_be_within, a_expected timestamp_tz_unconstrained ), + member function of_(self in ut_be_within, a_expected timestamp_tz_unconstrained) return ut_be_within, + member procedure of_(self in ut_be_within, a_expected timestamp_ltz_unconstrained), + member function of_(self in ut_be_within, a_expected timestamp_ltz_unconstrained) return ut_be_within, overriding member function run_matcher(self in out nocopy ut_be_within, a_actual ut_data_value) return boolean, overriding member function failure_message(a_actual ut_data_value) return varchar2, overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2 diff --git a/test/ut3_user/expectations/binary/test_to_be_within.pkb b/test/ut3_user/expectations/binary/test_to_be_within.pkb index b845bb26a..2ea90bd6b 100644 --- a/test/ut3_user/expectations/binary/test_to_be_within.pkb +++ b/test/ut3_user/expectations/binary/test_to_be_within.pkb @@ -74,6 +74,12 @@ create or replace package body test_to_be_within is test_to_be_within_success('to_be_within','date', 'sysdate', 'sysdate+1','''1 0:00:11.333''','interval day to second'); test_to_be_within_success('to_be_within','date', 'sysdate', 'sysdate+200','''1-0''','interval year to month'); test_to_be_within_success('to_be_within','date', 'sysdate+200', 'sysdate','''1-0''','interval year to month'); + + test_to_be_within_success('to_be_within','timestamp_tz_unconstrained', q'[TIMESTAMP '2017-08-09 07:00:00 -7:00']', 'sysdate','''1 0:00:11.333''','interval day to second'); + test_to_be_within_success('to_be_within','timestamp_tz_unconstrained', q'[TIMESTAMP '2017-08-09 07:00:00 -7:00']', 'sysdate+1','''1 0:00:11.333''','interval day to second'); + test_to_be_within_success('to_be_within','timestamp_ltz_unconstrained', q'[TIMESTAMP '2017-08-09 07:00:00 -7:00']', 'sysdate+200','''1-0''','interval year to month'); + test_to_be_within_success('to_be_within','timestamp_ltz_unconstrained', 'sysdate+200', 'sysdate','''1-0''','interval year to month'); + test_to_be_within_success('to_( ut3_develop.be_within','number', '2', '4','2','number', ')'); test_to_be_within_success('to_( ut3_develop.be_within','number', '4', '2','2','number', ')'); test_to_be_within_success('to_( ut3_develop.be_within','date', 'sysdate+1', 'sysdate','''1 0:00:11.333''','interval day to second', ')'); From 363c333ba466eef38b57992f821afd397bb08d6a Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 27 Jun 2020 01:07:06 +0100 Subject: [PATCH 0730/1096] Fixed and simplified matcher --- .../data_values/ut_data_value_dsinterval.tps | 2 +- .../data_values/ut_data_value_yminterval.tps | 2 +- source/expectations/matchers/ut_be_within.tpb | 63 ++----------------- .../matchers/ut_be_within_helper.pkb | 41 ++++++++++++ .../matchers/ut_be_within_helper.pks | 24 +++++++ source/install.sql | 2 + source/uninstall_objects.sql | 2 + .../expectations/binary/test_to_be_within.pkb | 18 ++++-- 8 files changed, 90 insertions(+), 64 deletions(-) create mode 100644 source/expectations/matchers/ut_be_within_helper.pkb create mode 100644 source/expectations/matchers/ut_be_within_helper.pks diff --git a/source/expectations/data_values/ut_data_value_dsinterval.tps b/source/expectations/data_values/ut_data_value_dsinterval.tps index 114619bf2..09aa7ac0d 100644 --- a/source/expectations/data_values/ut_data_value_dsinterval.tps +++ b/source/expectations/data_values/ut_data_value_dsinterval.tps @@ -15,7 +15,7 @@ create or replace type ut_data_value_dsinterval under ut_data_value( See the License for the specific language governing permissions and limitations under the License. */ - data_value dsinterval_unconstrained, + data_value interval day(9) to second(9), constructor function ut_data_value_dsinterval(self in out nocopy ut_data_value_dsinterval, a_value dsinterval_unconstrained) return self as result, overriding member function is_null return boolean, overriding member function to_string return varchar2, diff --git a/source/expectations/data_values/ut_data_value_yminterval.tps b/source/expectations/data_values/ut_data_value_yminterval.tps index d20dfcad7..3144d205c 100644 --- a/source/expectations/data_values/ut_data_value_yminterval.tps +++ b/source/expectations/data_values/ut_data_value_yminterval.tps @@ -15,7 +15,7 @@ create or replace type ut_data_value_yminterval under ut_data_value( See the License for the specific language governing permissions and limitations under the License. */ - data_value yminterval_unconstrained, + data_value interval year(9) to month, constructor function ut_data_value_yminterval(self in out nocopy ut_data_value_yminterval, a_value yminterval_unconstrained) return self as result, overriding member function is_null return boolean, overriding member function to_string return varchar2, diff --git a/source/expectations/matchers/ut_be_within.tpb b/source/expectations/matchers/ut_be_within.tpb index 7e90ff4e6..c411c4f61 100644 --- a/source/expectations/matchers/ut_be_within.tpb +++ b/source/expectations/matchers/ut_be_within.tpb @@ -107,64 +107,13 @@ create or replace type body ut_be_within as end; overriding member function run_matcher(self in out nocopy ut_be_within, a_actual ut_data_value) return boolean is - l_result boolean; - function l_result_from_number return boolean is - l_expected number := treat(self.expected as ut_data_value_number).data_value; - l_actual number := treat(a_actual as ut_data_value_number).data_value; - l_distance number := treat(self.distance_from_expected as ut_data_value_number).data_value; - begin - return abs(l_expected - l_actual) <= l_distance; - end; - - function l_result_from_date(a_distance ut_data_value) return boolean is - l_expected date := treat(self.expected as ut_data_value_date).data_value; - l_actual date := treat(a_actual as ut_data_value_date).data_value; - l_distance_ym yminterval_unconstrained := case when self.distance_from_expected is of ( ut_data_value_yminterval) - then treat(self.distance_from_expected as ut_data_value_yminterval).data_value - end; - l_distance_ds dsinterval_unconstrained := case when self.distance_from_expected is of ( ut_data_value_dsinterval) - then treat(self.distance_from_expected as ut_data_value_dsinterval).data_value - end; - begin - return case when l_distance_ym is not null - then l_actual between l_expected - l_distance_ym and l_expected + l_distance_ym - else l_actual between l_expected - l_distance_ds and l_expected + l_distance_ds - end; - end; - - function l_result_from_timestamp (a_distance ut_data_value) return boolean is - l_expected timestamp := case when self.expected is of ( ut_data_value_timestamp) then - treat(self.expected as ut_data_value_timestamp).data_value - when self.expected is of ( ut_data_value_timestamp_tz) then - treat(self.expected as ut_data_value_timestamp_tz).data_value - when self.expected is of ( ut_data_value_timestamp_ltz) then - treat(self.expected as ut_data_value_timestamp_ltz).data_value - end; - l_actual timestamp with time zone := treat(a_actual as ut_data_value_date).data_value; - l_distance_ym yminterval_unconstrained := case when self.distance_from_expected is of ( ut_data_value_yminterval) - then treat(self.distance_from_expected as ut_data_value_yminterval).data_value - end; - l_distance_ds dsinterval_unconstrained := case when self.distance_from_expected is of ( ut_data_value_dsinterval) - then treat(self.distance_from_expected as ut_data_value_dsinterval).data_value - end; - begin - return case when l_distance_ym is not null - then l_actual between l_expected - l_distance_ym and l_expected + l_distance_ym - else l_actual between l_expected - l_distance_ds and l_expected + l_distance_ds - end; - end; - - - begin + l_result boolean; + begin if self.expected.data_type = a_actual.data_type then - if self.expected is of (ut_data_value_number) then - l_result := l_result_from_number; - elsif self.expected is of (ut_data_value_date)then - l_result := l_result_from_date(self.distance_from_expected); - elsif self.expected is of (ut_data_value_timestamp_tz)then - l_result := l_result_from_date(self.distance_from_expected); - elsif self.expected is of (ut_data_value_timestamp_ltz)then - l_result := l_result_from_date(self.distance_from_expected); + if self.expected is of (ut_data_value_date, ut_data_value_number, ut_data_value_timestamp, ut_data_value_timestamp_tz, ut_data_value_timestamp_ltz) then + l_result := ut_be_within_helper.values_within_abs_distance(self.expected, a_actual, self.distance_from_expected) ; + else + l_result := (self as ut_matcher).run_matcher(a_actual); end if; else l_result := (self as ut_matcher).run_matcher(a_actual); diff --git a/source/expectations/matchers/ut_be_within_helper.pkb b/source/expectations/matchers/ut_be_within_helper.pkb new file mode 100644 index 000000000..a958c3e0f --- /dev/null +++ b/source/expectations/matchers/ut_be_within_helper.pkb @@ -0,0 +1,41 @@ +create or replace package body ut_be_within_helper as + /* + utPLSQL - Version 3 + Copyright 2016 - 2019 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + function values_within_abs_distance( + a_value_1 ut_data_value, a_value_2 ut_data_value, a_distance ut_data_value + ) return boolean is + l_result boolean; + begin + execute immediate q'[ + begin + :result := + treat(:a_value_1 as ut3_develop.]'||a_value_1.self_type||q'[).data_value + between + treat(:a_value_2 as ut3_develop.]'||a_value_2.self_type||q'[).data_value + - treat(:a_distance as ut3_develop.]'||a_distance.self_type||q'[).data_value + and + treat(:a_value_2 as ut3_develop.]'||a_value_2.self_type||q'[).data_value + + treat(:a_distance as ut3_develop.]'||a_distance.self_type||q'[).data_value; + end; + ]' + using out l_result, a_value_1, a_value_2, a_distance; + return l_result; + end; + +end; +/ diff --git a/source/expectations/matchers/ut_be_within_helper.pks b/source/expectations/matchers/ut_be_within_helper.pks new file mode 100644 index 000000000..0cb146a98 --- /dev/null +++ b/source/expectations/matchers/ut_be_within_helper.pks @@ -0,0 +1,24 @@ +create or replace package ut_be_within_helper authid definer as + /* + utPLSQL - Version 3 + Copyright 2016 - 2019 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + function values_within_abs_distance( + a_value_1 ut_data_value, a_value_2 ut_data_value, a_distance ut_data_value + ) return boolean; + +end; +/ diff --git a/source/install.sql b/source/install.sql index a3cf2c3d8..8a855f817 100644 --- a/source/install.sql +++ b/source/install.sql @@ -242,6 +242,7 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/matchers/ut_comparison_matcher.tps' @@install_component.sql 'expectations/matchers/ut_be_within_pct.tps' @@install_component.sql 'expectations/matchers/ut_be_within.tps' +@@install_component.sql 'expectations/matchers/ut_be_within_helper.pks' @@install_component.sql 'expectations/ut_expectation.tps' @@install_component.sql 'expectations/matchers/ut_be_false.tps' @@install_component.sql 'expectations/matchers/ut_be_greater_or_equal.tps' @@ -299,6 +300,7 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'expectations/matchers/ut_equal.tpb' @@install_component.sql 'expectations/matchers/ut_be_within_pct.tpb' @@install_component.sql 'expectations/matchers/ut_be_within.tpb' +@@install_component.sql 'expectations/matchers/ut_be_within_helper.pkb' @@install_component.sql 'expectations/matchers/ut_contain.tpb' @@install_component.sql 'expectations/matchers/ut_have_count.tpb' @@install_component.sql 'expectations/matchers/ut_be_between.tpb' diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index ee76cb8eb..84d319f96 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -148,6 +148,8 @@ drop type ut_be_within_pct force; drop type ut_be_within force; +drop package ut_be_within_helper; + drop type ut_comparison_matcher force; drop type ut_matcher force; diff --git a/test/ut3_user/expectations/binary/test_to_be_within.pkb b/test/ut3_user/expectations/binary/test_to_be_within.pkb index 2ea90bd6b..ae6220d2a 100644 --- a/test/ut3_user/expectations/binary/test_to_be_within.pkb +++ b/test/ut3_user/expectations/binary/test_to_be_within.pkb @@ -75,11 +75,19 @@ create or replace package body test_to_be_within is test_to_be_within_success('to_be_within','date', 'sysdate', 'sysdate+200','''1-0''','interval year to month'); test_to_be_within_success('to_be_within','date', 'sysdate+200', 'sysdate','''1-0''','interval year to month'); - test_to_be_within_success('to_be_within','timestamp_tz_unconstrained', q'[TIMESTAMP '2017-08-09 07:00:00 -7:00']', 'sysdate','''1 0:00:11.333''','interval day to second'); - test_to_be_within_success('to_be_within','timestamp_tz_unconstrained', q'[TIMESTAMP '2017-08-09 07:00:00 -7:00']', 'sysdate+1','''1 0:00:11.333''','interval day to second'); - test_to_be_within_success('to_be_within','timestamp_ltz_unconstrained', q'[TIMESTAMP '2017-08-09 07:00:00 -7:00']', 'sysdate+200','''1-0''','interval year to month'); - test_to_be_within_success('to_be_within','timestamp_ltz_unconstrained', 'sysdate+200', 'sysdate','''1-0''','interval year to month'); - + test_to_be_within_success('to_be_within','timestamp', q'[TIMESTAMP '2017-08-09 07:00:00']', q'[TIMESTAMP '2017-08-08 06:59:48.667']','''1 0:00:11.333''','interval day to second'); + test_to_be_within_success('to_be_within','timestamp', q'[TIMESTAMP '2017-08-08 06:59:48.667']', q'[TIMESTAMP '2017-08-09 07:00:00']','''1 0:00:11.333''','interval day to second'); + test_to_be_within_success('to_be_within','timestamp', q'[TIMESTAMP '2017-08-09 07:00:00']', q'[TIMESTAMP '2018-08-09 07:00:00']','''1-0''','interval year to month'); + test_to_be_within_success('to_be_within','timestamp', q'[TIMESTAMP '2018-08-09 07:00:00']', q'[TIMESTAMP '2017-08-09 07:00:00']','''1-0''','interval year to month'); + test_to_be_within_success('to_be_within','timestamp_tz_unconstrained', q'[TIMESTAMP '2017-08-09 07:00:00 -7:00']', q'[TIMESTAMP '2017-08-08 05:59:48.668 -8:00']','''1 0:00:11.333''','interval day to second'); + test_to_be_within_success('to_be_within','timestamp_tz_unconstrained', q'[TIMESTAMP '2017-08-08 05:59:48.668 -8:00']', q'[TIMESTAMP '2017-08-09 07:00:00 -7:00']','''1 0:00:11.333''','interval day to second'); + test_to_be_within_success('to_be_within','timestamp_tz_unconstrained', q'[TIMESTAMP '2017-08-09 07:00:00 -7:00']', q'[TIMESTAMP '2018-08-09 07:00:00 -7:00']','''1-0''','interval year to month'); + test_to_be_within_success('to_be_within','timestamp_tz_unconstrained', q'[TIMESTAMP '2018-08-09 07:00:00 -7:00']', q'[TIMESTAMP '2017-08-09 07:00:00 -7:00']','''1-0''','interval year to month'); + test_to_be_within_success('to_be_within','timestamp_ltz_unconstrained', q'[TIMESTAMP '2017-08-09 07:00:00 -7:00']', q'[TIMESTAMP '2017-08-08 05:59:48.668 -8:00']','''1 0:00:11.333''','interval day to second'); + test_to_be_within_success('to_be_within','timestamp_ltz_unconstrained', q'[TIMESTAMP '2017-08-08 05:59:48.668 -8:00']', q'[TIMESTAMP '2017-08-09 07:00:00 -7:00']','''1 0:00:11.333''','interval day to second'); + test_to_be_within_success('to_be_within','timestamp_ltz_unconstrained', q'[TIMESTAMP '2017-08-09 07:00:00 -7:00']', q'[TIMESTAMP '2018-08-09 07:00:00 -7:00']','''1-0''','interval year to month'); + test_to_be_within_success('to_be_within','timestamp_ltz_unconstrained', q'[TIMESTAMP '2018-08-09 07:00:00 -7:00']', q'[TIMESTAMP '2017-08-09 07:00:00 -7:00']','''1-0''','interval year to month'); + test_to_be_within_success('to_( ut3_develop.be_within','number', '2', '4','2','number', ')'); test_to_be_within_success('to_( ut3_develop.be_within','number', '4', '2','2','number', ')'); test_to_be_within_success('to_( ut3_develop.be_within','date', 'sysdate+1', 'sysdate','''1 0:00:11.333''','interval day to second', ')'); From 0ea892522cad433a18664e20da41d2e559157d90 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 28 Jun 2020 12:15:37 +0100 Subject: [PATCH 0731/1096] Fixed native dynamic SQL types compatibility for 11g --- .../matchers/ut_be_within_helper.pkb | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/source/expectations/matchers/ut_be_within_helper.pkb b/source/expectations/matchers/ut_be_within_helper.pkb index a958c3e0f..03f88e3a4 100644 --- a/source/expectations/matchers/ut_be_within_helper.pkb +++ b/source/expectations/matchers/ut_be_within_helper.pkb @@ -19,22 +19,26 @@ create or replace package body ut_be_within_helper as function values_within_abs_distance( a_value_1 ut_data_value, a_value_2 ut_data_value, a_distance ut_data_value ) return boolean is - l_result boolean; + l_result integer; begin execute immediate q'[ begin :result := - treat(:a_value_1 as ut3_develop.]'||a_value_1.self_type||q'[).data_value - between - treat(:a_value_2 as ut3_develop.]'||a_value_2.self_type||q'[).data_value - - treat(:a_distance as ut3_develop.]'||a_distance.self_type||q'[).data_value - and - treat(:a_value_2 as ut3_develop.]'||a_value_2.self_type||q'[).data_value - + treat(:a_distance as ut3_develop.]'||a_distance.self_type||q'[).data_value; + case + when + treat(:a_value_1 as ut3_develop.]'||a_value_1.self_type||q'[).data_value + between + treat(:a_value_2 as ut3_develop.]'||a_value_2.self_type||q'[).data_value + - treat(:a_distance as ut3_develop.]'||a_distance.self_type||q'[).data_value + and + treat(:a_value_2 as ut3_develop.]'||a_value_2.self_type||q'[).data_value + + treat(:a_distance as ut3_develop.]'||a_distance.self_type||q'[).data_value + then 1 + end; end; ]' using out l_result, a_value_1, a_value_2, a_distance; - return l_result; + return l_result > 0; end; end; From 7c01afbcbe5e7fba235dba49d1eb9d693bd4157f Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 28 Jun 2020 12:21:03 +0100 Subject: [PATCH 0732/1096] Fixed native dynamic SQL types compatibility for 11g --- source/expectations/matchers/ut_be_within_helper.pkb | 1 + 1 file changed, 1 insertion(+) diff --git a/source/expectations/matchers/ut_be_within_helper.pkb b/source/expectations/matchers/ut_be_within_helper.pkb index 03f88e3a4..aecaf7179 100644 --- a/source/expectations/matchers/ut_be_within_helper.pkb +++ b/source/expectations/matchers/ut_be_within_helper.pkb @@ -34,6 +34,7 @@ create or replace package body ut_be_within_helper as treat(:a_value_2 as ut3_develop.]'||a_value_2.self_type||q'[).data_value + treat(:a_distance as ut3_develop.]'||a_distance.self_type||q'[).data_value then 1 + else 0 end; end; ]' From cd7d738d23ee25d24596986ba81afaeab66fc1ea Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 28 Jun 2020 16:12:33 +0100 Subject: [PATCH 0733/1096] Fixed CDATA tagging in JUnit reporter Resolves #1084 --- source/core/ut_utils.pkb | 3 +++ source/reporters/ut_realtime_reporter.tpb | 2 +- test/ut3_user/reporters/test_junit_reporter.pkb | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index e12b91752..caaca44b3 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -827,6 +827,9 @@ create or replace package body ut_utils is begin if a_clob is not null and a_clob != empty_clob() then l_result := replace( a_clob, gc_cdata_end_tag, gc_cdata_end_tag_wrap ); + l_result := to_clob(gc_cdata_start_tag) + || replace( a_clob, gc_cdata_end_tag, gc_cdata_end_tag_wrap ) + || to_clob(gc_cdata_end_tag); else l_result := a_clob; end if; diff --git a/source/reporters/ut_realtime_reporter.tpb b/source/reporters/ut_realtime_reporter.tpb index 367b2c51a..443c7c4e7 100644 --- a/source/reporters/ut_realtime_reporter.tpb +++ b/source/reporters/ut_realtime_reporter.tpb @@ -252,7 +252,7 @@ create or replace type body ut_realtime_reporter is ) is begin if a_content is not null then - self.print_xml_fragment('<' || a_name || '>'); + self.print_xml_fragment('<' || a_name || '>' || ut_utils.to_cdata(a_content) || ''); end if; end print_cdata_node; diff --git a/test/ut3_user/reporters/test_junit_reporter.pkb b/test/ut3_user/reporters/test_junit_reporter.pkb index f3cc6c6d2..8f015e80b 100644 --- a/test/ut3_user/reporters/test_junit_reporter.pkb +++ b/test/ut3_user/reporters/test_junit_reporter.pkb @@ -15,6 +15,7 @@ create or replace package body test_junit_reporter as begin ut3_develop.ut.expect(1).to_equal(1); ut3_develop.ut.expect(1).to_equal(2); + dbms_output.put_line(' ]]>'); end; end;]'; @@ -87,6 +88,8 @@ create or replace package body test_junit_reporter as --Assert ut.expect(l_actual).not_to_be_like('%%'); ut.expect(l_actual).to_be_like('%<tag>%'); + ut.expect(l_actual).to_be_like(q'/% ]]]]> +]]>%/'); end; procedure reports_only_failed_or_errored is From 2956d07688ad7089ee9add699c09fa249c24ebb0 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sat, 18 Jul 2020 16:20:08 +0000 Subject: [PATCH 0734/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 40066e6aa..36821dadf 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 35cf2e9b8..06f26aa11 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index c2d7c8f54..b4fe423aa 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 458a925a9..d4be9073b 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 8c47b7c55..177f3bc70 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 3baefddfc..7b50ae506 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 191f3fdc4..f83515d85 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 0cd0fb9ae..c01c417ca 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index e15167f1a..11d2aea40 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting is based on the DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index fce6a83fd..a41802a66 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index a43f3ebec..3d0a9da11 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 95e82dcd9..0d79a5f3c 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index fca4bcf13..0025cc7eb 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 7107cc139..15e726c22 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 7730c7c6c..e04f89c97 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 6f9774a8b..72f73f2fd 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index eab281d70..042ba91a9 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3422--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index caaca44b3..b58876369 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -769,7 +769,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.11.3422-develop + * secion v3.1.11.3455-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index b0ee188fc..bdddb5815 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.11.3422-develop'; + gc_version constant varchar2(50) := 'v3.1.11.3455-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 89d546abb854d0854fd505449d10c02227086b76 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 18 Jul 2020 17:53:57 +0100 Subject: [PATCH 0735/1096] Extended UK on ut_coverage_sources_tmp table. Resolves #1086 TODO - need to fix coverage reporting so that coverage is grouped by object type not only object name --- .travis/install.sh | 2 +- source/core/coverage/ut_coverage.pkb | 6 +-- source/core/coverage/ut_coverage_block.pkb | 6 +-- source/core/coverage/ut_coverage_helper.pkb | 8 +-- source/core/coverage/ut_coverage_helper.pks | 2 + .../coverage/ut_coverage_helper_block.pkb | 15 +++--- .../coverage/ut_coverage_helper_block.pks | 4 +- .../coverage/ut_coverage_helper_profiler.pkb | 14 +++-- .../coverage/ut_coverage_helper_profiler.pks | 4 +- source/core/coverage/ut_coverage_profiler.pkb | 6 +-- .../core/coverage/ut_coverage_sources_tmp.sql | 3 +- test/ut3_tester_helper/coverage_helper.pkb | 53 +++++++++++++++++++ test/ut3_tester_helper/coverage_helper.pks | 3 ++ .../test_coverage/test_proftab_coverage.pkb | 21 ++++++++ .../test_coverage/test_proftab_coverage.pks | 5 ++ 15 files changed, 113 insertions(+), 39 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index 225b6ff52..537fddb66 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -147,7 +147,7 @@ PROMPT Grants for testing coverage outside of main $UT3_DEVELOP_SCHEMA schema. grant create any procedure, drop any procedure, execute any procedure, create any type, drop any type, execute any type, under any type, select any table, update any table, insert any table, delete any table, create any table, drop any table, alter any table, select any dictionary, create any synonym, drop any synonym, - grant any object privilege, grant any privilege, create public synonym, drop public synonym + grant any object privilege, grant any privilege, create public synonym, drop public synonym, create any trigger to $UT3_TESTER_HELPER; grant create job to $UT3_TESTER_HELPER; diff --git a/source/core/coverage/ut_coverage.pkb b/source/core/coverage/ut_coverage.pkb index a05fa554a..e1b7572be 100644 --- a/source/core/coverage/ut_coverage.pkb +++ b/source/core/coverage/ut_coverage.pkb @@ -48,7 +48,7 @@ create or replace package body ut_coverage is ), sources as ( select /*+ cardinality(f {mappings_cardinality}) */ - {l_full_name} as full_name, s.owner, s.name, + {l_full_name} as full_name, s.owner, s.name, s.type, s.line - case when s.type = 'TRIGGER' then o.offset else 0 end as line, s.text from {sources_view} s {join_file_mappings} @@ -58,7 +58,7 @@ create or replace package body ut_coverage is {filters} ), coverage_sources as ( - select full_name, owner, name, line, text, + select full_name, owner, name, type, line, text, case when -- to avoid execution of regexp_like on every line @@ -77,7 +77,7 @@ create or replace package body ut_coverage is end as to_be_skipped from sources s ) - select full_name, owner, name, line, to_be_skipped, text + select full_name, owner, name, type, line, to_be_skipped, text from coverage_sources s -- Exclude calls to utPLSQL framework, Unit Test packages and objects from a_exclude_list parameter of coverage reporter where (s.owner, s.name) not in ( select /*+ cardinality(el {skipped_objects_cardinality})*/el.owner, el.name from table(:l_skipped_objects) el ) diff --git a/source/core/coverage/ut_coverage_block.pkb b/source/core/coverage/ut_coverage_block.pkb index 0e0373a48..79fd42699 100644 --- a/source/core/coverage/ut_coverage_block.pkb +++ b/source/core/coverage/ut_coverage_block.pkb @@ -40,11 +40,7 @@ create or replace package body ut_coverage_block is exit when l_source_objects_crsr%notfound; --get coverage data - l_line_calls := ut_coverage_helper_block.get_raw_coverage_data( - l_source_object.owner, - l_source_object.name, - a_coverage_options.coverage_run_id - ); + l_line_calls := ut_coverage_helper_block.get_raw_coverage_data(l_source_object, a_coverage_options.coverage_run_id); --if there is coverage, we need to filter out the garbage (badly indicated data) if l_line_calls.count > 0 then --remove lines that should not be indicted as meaningful diff --git a/source/core/coverage/ut_coverage_helper.pkb b/source/core/coverage/ut_coverage_helper.pkb index 5762452c4..4c41aa2f6 100644 --- a/source/core/coverage/ut_coverage_helper.pkb +++ b/source/core/coverage/ut_coverage_helper.pkb @@ -36,8 +36,8 @@ create or replace package body ut_coverage_helper is begin forall i in 1 .. a_data.count insert into ut_coverage_sources_tmp - (full_name,owner,name,line,text, to_be_skipped) - values(a_data(i).full_name,a_data(i).owner,a_data(i).name,a_data(i).line,a_data(i).text,a_data(i).to_be_skipped); + (full_name,owner,name,type,line,text,to_be_skipped) + values(a_data(i).full_name,a_data(i).owner,a_data(i).name,a_data(i).type,a_data(i).line,a_data(i).text,a_data(i).to_be_skipped); end; procedure cleanup_tmp_table is @@ -60,12 +60,12 @@ create or replace package body ut_coverage_helper is l_result t_tmp_table_objects_crsr; begin open l_result for - select o.owner, o.name, o.full_name, max(o.line) as lines_count, + select o.owner, o.name, o.type, o.full_name, max(o.line) as lines_count, cast( collect(decode(to_be_skipped, 'Y', to_char(line))) as ut_varchar2_list ) as to_be_skipped_list from ut_coverage_sources_tmp o - group by o.owner, o.name, o.full_name; + group by o.owner, o.name, o.type, o.full_name; return l_result; end; diff --git a/source/core/coverage/ut_coverage_helper.pks b/source/core/coverage/ut_coverage_helper.pks index 955542633..632b18a0d 100644 --- a/source/core/coverage/ut_coverage_helper.pks +++ b/source/core/coverage/ut_coverage_helper.pks @@ -32,6 +32,7 @@ create or replace package ut_coverage_helper authid definer is full_name ut_coverage_sources_tmp.full_name%type, owner ut_coverage_sources_tmp.owner%type, name ut_coverage_sources_tmp.name%type, + type ut_coverage_sources_tmp.type%type, line ut_coverage_sources_tmp.line%type, to_be_skipped ut_coverage_sources_tmp.to_be_skipped%type, text ut_coverage_sources_tmp.text%type @@ -42,6 +43,7 @@ create or replace package ut_coverage_helper authid definer is type t_tmp_table_object is record( owner ut_coverage_sources_tmp.owner%type, name ut_coverage_sources_tmp.name%type, + type ut_coverage_sources_tmp.type%type, full_name ut_coverage_sources_tmp.full_name%type, lines_count integer, to_be_skipped_list ut_varchar2_list diff --git a/source/core/coverage/ut_coverage_helper_block.pkb b/source/core/coverage/ut_coverage_helper_block.pkb index 1ded434ba..6f0e66783 100644 --- a/source/core/coverage/ut_coverage_helper_block.pkb +++ b/source/core/coverage/ut_coverage_helper_block.pkb @@ -41,7 +41,7 @@ create or replace package body ut_coverage_helper_block is $end end; - function block_results(a_object_owner varchar2, a_object_name varchar2, a_coverage_run_id raw) return t_block_rows is + function block_results(a_object ut_coverage_helper.t_tmp_table_object, a_coverage_run_id raw) return t_block_rows is l_coverage_rows t_block_rows; l_ut_owner varchar2(250) := ut_utils.ut_owner; begin @@ -61,23 +61,26 @@ create or replace package body ut_coverage_helper_block is where r.coverage_run_id = :a_coverage_run_id and ccu.owner = :a_object_owner and ccu.name = :a_object_name + and ccu.type = :a_object_type group by ccb.line, ccb.block ) group by line order by line]' - bulk collect into l_coverage_rows using a_coverage_run_id, a_object_owner, a_object_name; + bulk collect into l_coverage_rows + using + a_coverage_run_id, a_object.owner, + a_object.name, a_object.type; + return l_coverage_rows; end; - function get_raw_coverage_data( - a_object_owner varchar2, a_object_name varchar2, a_coverage_run_id raw - ) return ut_coverage_helper.t_unit_line_calls is + function get_raw_coverage_data(a_object ut_coverage_helper.t_tmp_table_object, a_coverage_run_id raw) return ut_coverage_helper.t_unit_line_calls is l_tmp_data t_block_rows; l_results ut_coverage_helper.t_unit_line_calls; begin $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then - l_tmp_data := block_results(a_object_owner, a_object_name, a_coverage_run_id); + l_tmp_data := block_results(a_object, a_coverage_run_id); for i in 1 .. l_tmp_data.count loop l_results(l_tmp_data(i).line).blocks := l_tmp_data(i).blocks; diff --git a/source/core/coverage/ut_coverage_helper_block.pks b/source/core/coverage/ut_coverage_helper_block.pks index 9d24989d6..18adf4fbd 100644 --- a/source/core/coverage/ut_coverage_helper_block.pks +++ b/source/core/coverage/ut_coverage_helper_block.pks @@ -20,9 +20,7 @@ create or replace package ut_coverage_helper_block authid current_user is procedure coverage_stop; - function get_raw_coverage_data( - a_object_owner varchar2, a_object_name varchar2, a_coverage_run_id raw - ) return ut_coverage_helper.t_unit_line_calls; + function get_raw_coverage_data(a_object ut_coverage_helper.t_tmp_table_object, a_coverage_run_id raw) return ut_coverage_helper.t_unit_line_calls; end; / diff --git a/source/core/coverage/ut_coverage_helper_profiler.pkb b/source/core/coverage/ut_coverage_helper_profiler.pkb index dde3bf3ea..dacfcbaa3 100644 --- a/source/core/coverage/ut_coverage_helper_profiler.pkb +++ b/source/core/coverage/ut_coverage_helper_profiler.pkb @@ -55,7 +55,7 @@ create or replace package body ut_coverage_helper_profiler is dbms_profiler.stop_profiler(); end; - function proftab_results(a_object_owner varchar2, a_object_name varchar2, a_coverage_run_id raw) return t_proftab_rows is + function proftab_results(a_object ut_coverage_helper.t_tmp_table_object, a_coverage_run_id raw) return t_proftab_rows is l_coverage_rows t_proftab_rows; begin select @@ -69,21 +69,19 @@ create or replace package body ut_coverage_helper_profiler is join ut_coverage_runs r on r.line_coverage_id = u.runid where r.coverage_run_id = a_coverage_run_id - and u.unit_owner = a_object_owner - and u.unit_name = a_object_name - and u.unit_type in ('PACKAGE BODY', 'TYPE BODY', 'PROCEDURE', 'FUNCTION', 'TRIGGER') + and u.unit_owner = a_object.owner + and u.unit_name = a_object.name + and u.unit_type = a_object.type group by d.line#; return l_coverage_rows; end; - function get_raw_coverage_data( - a_object_owner varchar2, a_object_name varchar2, a_coverage_run_id raw - ) return ut_coverage_helper.t_unit_line_calls is + function get_raw_coverage_data(a_object ut_coverage_helper.t_tmp_table_object, a_coverage_run_id raw) return ut_coverage_helper.t_unit_line_calls is l_tmp_data t_proftab_rows; l_results ut_coverage_helper.t_unit_line_calls; begin - l_tmp_data := proftab_results(a_object_owner, a_object_name, a_coverage_run_id); + l_tmp_data := proftab_results(a_object, a_coverage_run_id); for i in 1 .. l_tmp_data.count loop l_results(l_tmp_data(i).line).calls := l_tmp_data(i).calls; diff --git a/source/core/coverage/ut_coverage_helper_profiler.pks b/source/core/coverage/ut_coverage_helper_profiler.pks index 390495810..f105d3c9c 100644 --- a/source/core/coverage/ut_coverage_helper_profiler.pks +++ b/source/core/coverage/ut_coverage_helper_profiler.pks @@ -24,9 +24,7 @@ create or replace package ut_coverage_helper_profiler authid definer is procedure coverage_resume; - function get_raw_coverage_data( - a_object_owner varchar2, a_object_name varchar2, a_coverage_run_id raw - ) return ut_coverage_helper.t_unit_line_calls; + function get_raw_coverage_data(a_object ut_coverage_helper.t_tmp_table_object, a_coverage_run_id raw) return ut_coverage_helper.t_unit_line_calls; end; / diff --git a/source/core/coverage/ut_coverage_profiler.pkb b/source/core/coverage/ut_coverage_profiler.pkb index 274f6949c..6d9f894d5 100644 --- a/source/core/coverage/ut_coverage_profiler.pkb +++ b/source/core/coverage/ut_coverage_profiler.pkb @@ -34,11 +34,7 @@ create or replace package body ut_coverage_profiler is exit when l_source_objects_crsr%notfound; --get coverage data - l_line_calls := ut_coverage_helper_profiler.get_raw_coverage_data( - l_source_object.owner, - l_source_object.name, - a_coverage_options.coverage_run_id - ); + l_line_calls := ut_coverage_helper_profiler.get_raw_coverage_data( l_source_object, a_coverage_options.coverage_run_id); --if there is coverage, we need to filter out the garbage (badly indicated data from dbms_profiler) if l_line_calls.count > 0 then diff --git a/source/core/coverage/ut_coverage_sources_tmp.sql b/source/core/coverage/ut_coverage_sources_tmp.sql index f53283dcd..abaae5353 100644 --- a/source/core/coverage/ut_coverage_sources_tmp.sql +++ b/source/core/coverage/ut_coverage_sources_tmp.sql @@ -15,10 +15,11 @@ create global temporary table ut_coverage_sources_tmp( full_name varchar2(4000), owner varchar2(250), name varchar2(250), + type varchar2(250), line number(38,0), to_be_skipped varchar2(1), text varchar2(4000), - constraint ut_coverage_sources_tmp_pk primary key (owner,name,line) + constraint ut_coverage_sources_tmp_pk primary key (owner,name,type,line) ) on commit preserve rows; --is this needed? diff --git a/test/ut3_tester_helper/coverage_helper.pkb b/test/ut3_tester_helper/coverage_helper.pkb index 9b595a0b3..73dec720b 100644 --- a/test/ut3_tester_helper/coverage_helper.pkb +++ b/test/ut3_tester_helper/coverage_helper.pkb @@ -246,5 +246,58 @@ create or replace package body coverage_helper is return run_code_as_job( l_plsql_block ); end; + procedure create_dup_object_name is + pragma autonomous_transaction; + begin + execute immediate 'create table ut3_develop.test_table(id integer)'; + execute immediate q'[ + create or replace trigger ut3_develop.duplicate_name + before insert on ut3_develop.test_table + begin + + dbms_output.put_line('A'); + end; + ]'; + execute immediate q'[ + create or replace package ut3_develop.duplicate_name is + procedure some_procedure; + end; + ]'; + execute immediate q'[ + create or replace package body ut3_develop.duplicate_name is + procedure some_procedure is + begin + insert into test_table(id) values(1); + end; + end; + ]'; + execute immediate q'[ + create or replace package ut3_develop.test_duplicate_name is + --%suite + + --%test + procedure run_duplicate_name; + end; + ]'; + execute immediate q'[ + create or replace package body ut3_develop.test_duplicate_name is + procedure run_duplicate_name is + l_actual sys_refcursor; + begin + ut3_develop.duplicate_name.some_procedure; + ut.expect(l_actual).to_have_count(1); + end; + end; + ]'; + end; + + procedure drop_dup_object_name is + pragma autonomous_transaction; + begin + execute immediate 'drop table ut3_develop.test_table'; + execute immediate 'drop package ut3_develop.duplicate_name'; + execute immediate 'drop package ut3_develop.test_duplicate_name'; + end; + end; / diff --git a/test/ut3_tester_helper/coverage_helper.pks b/test/ut3_tester_helper/coverage_helper.pks index b044c897b..9a3bd1db6 100644 --- a/test/ut3_tester_helper/coverage_helper.pks +++ b/test/ut3_tester_helper/coverage_helper.pks @@ -22,5 +22,8 @@ create or replace package coverage_helper is procedure create_test_results_table; procedure drop_test_results_table; + procedure drop_dup_object_name; + procedure create_dup_object_name; + end; / diff --git a/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb b/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb index c6e087462..9fbc24718 100644 --- a/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb +++ b/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb @@ -92,6 +92,27 @@ create or replace package body test_proftab_coverage is ut.expect(l_actual).to_be_like(l_expected); end; + procedure dup_object_name_coverage is + l_actual clob; + l_expected clob; + begin + l_expected := '%'; + --Act + l_actual := + ut3_tester_helper.coverage_helper.run_tests_as_job( + q'[ + ut3_develop.ut.run( + a_path => 'ut3_develop.test_duplicate_name', + a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), + a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.duplicate_name' ) + ) + ]' + ); + --Assert + --TODO - need to fix coverage reporting so that coverage is grouped by object type not only object name + ut.expect(l_actual).to_be_like(l_expected); + end; + procedure coverage_tmp_data_refresh is l_actual clob; l_test_code varchar2(32767); diff --git a/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pks b/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pks index 055422bf7..740862f86 100644 --- a/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pks +++ b/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pks @@ -14,6 +14,11 @@ create or replace package test_proftab_coverage is --%test(Coverage is gathered for specified file - default coverage type) procedure coverage_for_file; + + --%beforetest(ut3_tester_helper.coverage_helper.create_dup_object_name) + --%aftertest(ut3_tester_helper.coverage_helper.drop_dup_object_name) + --%test(Coverage on duplicate object name) + procedure dup_object_name_coverage; --%test(Coverage data is not cached between runs - issue #562 ) --%aftertest(ut3_tester_helper.coverage_helper.drop_dummy_coverage_1) From 461bc016fdbb34f72761ebd087e108942743a345 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sun, 19 Jul 2020 22:56:30 +0000 Subject: [PATCH 0736/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 36821dadf..9e6c42d93 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 06f26aa11..fbf99289b 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index b4fe423aa..43671176f 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index d4be9073b..b66268f5f 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 177f3bc70..b83b9e941 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 7b50ae506..a074e1b35 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index f83515d85..333ff300a 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index c01c417ca..4c0282a0a 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 45f552769..ccc5e9b44 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index a41802a66..f6115ba45 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 3d0a9da11..72e634deb 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 0d79a5f3c..97b7fd91b 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 0025cc7eb..0c5023eb8 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 15e726c22..c23674e60 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index e04f89c97..2fe5f4d2a 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 72f73f2fd..8e933a8d8 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 042ba91a9..9e12db146 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3455--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 56db02fa3..e9df15926 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -788,7 +788,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.11.3455-develop + * secion v3.1.11.3456-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 68e5a962d..443548b83 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.11.3455-develop'; + gc_version constant varchar2(50) := 'v3.1.11.3456-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From e96b9780257ee0bcf73404db1440a2248d9169e4 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 20 Jul 2020 01:00:00 +0100 Subject: [PATCH 0737/1096] Added object type to name in coverage reports. Fixed issue with reporting non-block coverage as block coverage. Resolves #1086 --- source/core/coverage/ut_coverage.pkb | 2 +- source/core/coverage/ut_coverage_helper_block.pkb | 1 + .../test_coverage/test_coverage_standalone.pkb | 2 +- .../test_coverage/test_coveralls_reporter.pkb | 2 +- .../test_coverage/test_extended_coverage.pkb | 6 +++--- .../test_coverage/test_proftab_coverage.pkb | 14 ++++++++------ 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/source/core/coverage/ut_coverage.pkb b/source/core/coverage/ut_coverage.pkb index e1b7572be..81d17704a 100644 --- a/source/core/coverage/ut_coverage.pkb +++ b/source/core/coverage/ut_coverage.pkb @@ -93,7 +93,7 @@ create or replace package body ut_coverage is and s.type = f.object_type and s.owner = f.object_owner'; else - l_full_name := q'[lower(s.owner||'.'||s.name)]'; + l_full_name := q'[lower(s.type||' '||s.owner||'.'||s.name)]'; l_filters := case when a_coverage_options.include_objects is not empty then ' and (s.owner, s.name) in ( diff --git a/source/core/coverage/ut_coverage_helper_block.pkb b/source/core/coverage/ut_coverage_helper_block.pkb index 6f0e66783..e030f2c37 100644 --- a/source/core/coverage/ut_coverage_helper_block.pkb +++ b/source/core/coverage/ut_coverage_helper_block.pkb @@ -65,6 +65,7 @@ create or replace package body ut_coverage_helper_block is group by ccb.line, ccb.block ) group by line + having count(block) > 1 order by line]' bulk collect into l_coverage_rows using diff --git a/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb b/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb index ef7014235..bcd933eed 100644 --- a/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb +++ b/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb @@ -5,7 +5,7 @@ create or replace package body test_coverage_standalone is l_block_cov clob; l_file_path varchar2(250); begin - l_file_path := 'ut3_develop.'||a_object_name; + l_file_path := 'package body ut3_develop.'||a_object_name; --Arrange if ut3_tester_helper.coverage_helper.block_coverage_available then l_block_cov := ''; diff --git a/test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb index 48a62f7f6..e3806cd97 100644 --- a/test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb +++ b/test/ut3_user/reporters/test_coverage/test_coveralls_reporter.pkb @@ -41,7 +41,7 @@ null, begin --Arrange l_expected := q'[{"source_files":[ -{ "name": "ut3_develop.]'||ut3_tester_helper.coverage_helper.covered_package_name||q'[", +{ "name": "package body ut3_develop.]'||ut3_tester_helper.coverage_helper.covered_package_name||q'[", "coverage": [ 0, 0, diff --git a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb index 4b995b7c8..ec95c0bfb 100644 --- a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb +++ b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb @@ -15,7 +15,7 @@ create or replace package body test_extended_coverage is l_actual clob; begin --Arrange - l_expected := '%' || + l_expected := '%' || get_block_coverage_line|| '%%'; --Act @@ -38,7 +38,7 @@ create or replace package body test_extended_coverage is l_actual clob; begin --Arrange - l_expected := '%' || + l_expected := '%' || get_block_coverage_line || '%%'; --Act @@ -54,7 +54,7 @@ create or replace package body test_extended_coverage is ); --Assert ut.expect(l_actual).to_be_like(l_expected); - ut.expect(l_actual).to_be_like('%%%'); + ut.expect(l_actual).to_be_like('%%%'); end; procedure coverage_for_file is diff --git a/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb b/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb index 9fbc24718..6171ecb80 100644 --- a/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb +++ b/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb @@ -5,7 +5,7 @@ create or replace package body test_proftab_coverage is l_actual clob; begin --Arrange - l_expected := coverage_helper.substitute_covered_package('%%'); + l_expected := coverage_helper.substitute_covered_package('%%'); --Act l_actual := ut3_tester_helper.coverage_helper.run_tests_as_job( @@ -28,7 +28,7 @@ create or replace package body test_proftab_coverage is l_actual clob; begin --Arrange - l_expected := coverage_helper.substitute_covered_package('%%'); + l_expected := coverage_helper.substitute_covered_package('%%'); --Act l_actual := ut3_tester_helper.coverage_helper.run_tests_as_job( @@ -51,7 +51,7 @@ create or replace package body test_proftab_coverage is l_actual clob; begin --Arrange - l_expected := ''; + l_expected := ''; l_expected := '%'||l_expected||'%'||l_expected||'%'; --Act l_actual := @@ -96,7 +96,9 @@ create or replace package body test_proftab_coverage is l_actual clob; l_expected clob; begin - l_expected := '%'; + l_expected := + '%%' || + '%%%'; --Act l_actual := ut3_tester_helper.coverage_helper.run_tests_as_job( @@ -164,11 +166,11 @@ create or replace package body test_proftab_coverage is -ut3_develop.{p} +package body ut3_develop.{p} - + From 507c176cee4f6e291728354a3db1cac1e06d5ec9 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 20 Jul 2020 17:32:54 +0000 Subject: [PATCH 0738/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 9e6c42d93..0b67eb07c 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index fbf99289b..ac992ab44 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 43671176f..9c8ff22d3 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index b66268f5f..2c808838f 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index b83b9e941..a3aa9bee9 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index a074e1b35..3f32da536 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 333ff300a..1d2c81694 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 4c0282a0a..14e835f69 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index ccc5e9b44..52e34332d 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index f6115ba45..fa7ebda44 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 72e634deb..9a872becf 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 97b7fd91b..54aa18234 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 0c5023eb8..09484b850 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index c23674e60..c0263af1e 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 2fe5f4d2a..09febcd38 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 8e933a8d8..194c0b44c 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 9e12db146..b5be914e2 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3456--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index e9df15926..6a5788a71 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -788,7 +788,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.11.3456-develop + * secion v3.1.11.3460-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 443548b83..cc4cc3f52 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.11.3456-develop'; + gc_version constant varchar2(50) := 'v3.1.11.3460-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 959c1c95dc862233f776fc0465e5a0386dbc3f5a Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 3 Aug 2020 14:28:36 +0100 Subject: [PATCH 0739/1096] Added example of a reporter that reports out all expectation outputs, not only the failed ones. The success & failure of expectation is also reported inline with tests (not at the end in the summary section of report). Reorganized some of examples as well. --- examples/RunAllExamplesAsTests.sql | 4 + examples/RunCustomReportersExamples.sql | 10 ++ examples/RunDeveloperExamples.sql | 2 - examples/between_string/run_betwnstr_test.sql | 3 +- .../run_betwnstr_test_coverage.sql | 3 +- .../{test_betwnstr.pkg => test_betwnstr.pkb} | 22 --- examples/between_string/test_betwnstr.pks | 22 +++ .../run_ut_custom_reporter.sql | 16 ++ .../run_ut_expectations_reporter.sql | 16 ++ .../ut_custom_reporter.tpb | 0 .../ut_custom_reporter.tps | 6 + .../ut_expectations_reporter.tpb | 149 ++++++++++++++++++ .../ut_expectations_reporter.tps | 30 ++++ .../demo_equal_matcher.sql | 4 +- .../drop_demo_equal_matcher.sql | 5 + examples/demo_of_expectations/run.sql | 5 +- .../RunExampleTestSuiteWithCustomReporter.sql | 56 ------- 17 files changed, 265 insertions(+), 88 deletions(-) create mode 100644 examples/RunCustomReportersExamples.sql rename examples/between_string/{test_betwnstr.pkg => test_betwnstr.pkb} (52%) create mode 100644 examples/between_string/test_betwnstr.pks create mode 100644 examples/custom_reporters/run_ut_custom_reporter.sql create mode 100644 examples/custom_reporters/run_ut_expectations_reporter.sql rename examples/{developer_examples => custom_reporters}/ut_custom_reporter.tpb (100%) rename examples/{developer_examples => custom_reporters}/ut_custom_reporter.tps (69%) create mode 100644 examples/custom_reporters/ut_expectations_reporter.tpb create mode 100644 examples/custom_reporters/ut_expectations_reporter.tps create mode 100644 examples/demo_of_expectations/drop_demo_equal_matcher.sql delete mode 100644 examples/developer_examples/RunExampleTestSuiteWithCustomReporter.sql diff --git a/examples/RunAllExamplesAsTests.sql b/examples/RunAllExamplesAsTests.sql index 458f11091..d089ba447 100644 --- a/examples/RunAllExamplesAsTests.sql +++ b/examples/RunAllExamplesAsTests.sql @@ -3,3 +3,7 @@ whenever oserror exit failure rollback @@RunAllExamples.sql +prompt ******************************************************************************* +prompt All examples completed successfully +prompt ******************************************************************************* +prompt diff --git a/examples/RunCustomReportersExamples.sql b/examples/RunCustomReportersExamples.sql new file mode 100644 index 000000000..730946662 --- /dev/null +++ b/examples/RunCustomReportersExamples.sql @@ -0,0 +1,10 @@ +prompt ******************************************************************************* +prompt Running custom reporters examples +prompt ******************************************************************************* +Clear Screen +set echo off +set feedback on +set linesize 1000 + +@@custom_reporters/run_ut_custom_reporter.sql +@@custom_reporters/run_ut_expectations_reporter.sql diff --git a/examples/RunDeveloperExamples.sql b/examples/RunDeveloperExamples.sql index eaf87c143..2f4ca13e3 100644 --- a/examples/RunDeveloperExamples.sql +++ b/examples/RunDeveloperExamples.sql @@ -6,8 +6,6 @@ set linesize 1000 exec ut_ansiconsole_helper.color_enabled(true); --developer examples -prompt RunExampleTestSuiteWithCustomReporter -@@developer_examples/RunExampleTestSuiteWithCustomReporter.sql prompt RunExampleTestAnnotationsParsingTimeHugePackage @@developer_examples/RunExampleTestAnnotationsParsingTimeHugePackage.sql prompt RunExampleTestSuite diff --git a/examples/between_string/run_betwnstr_test.sql b/examples/between_string/run_betwnstr_test.sql index 120645410..31edc52cf 100644 --- a/examples/between_string/run_betwnstr_test.sql +++ b/examples/between_string/run_betwnstr_test.sql @@ -1,5 +1,6 @@ @@betwnstr.sql -@@test_betwnstr.pkg +@@test_betwnstr.pks +@@test_betwnstr.pkb set serveroutput on size unlimited format truncated diff --git a/examples/between_string/run_betwnstr_test_coverage.sql b/examples/between_string/run_betwnstr_test_coverage.sql index ab75872ce..098445cae 100644 --- a/examples/between_string/run_betwnstr_test_coverage.sql +++ b/examples/between_string/run_betwnstr_test_coverage.sql @@ -4,7 +4,8 @@ set pagesize 0 set long 200000000 set longchunksize 1000000 @@betwnstr.sql -@@test_betwnstr.pkg +@@test_betwnstr.pks +@@test_betwnstr.pkb set serveroutput on size unlimited format truncated diff --git a/examples/between_string/test_betwnstr.pkg b/examples/between_string/test_betwnstr.pkb similarity index 52% rename from examples/between_string/test_betwnstr.pkg rename to examples/between_string/test_betwnstr.pkb index 84f153ecc..f872f6447 100644 --- a/examples/between_string/test_betwnstr.pkg +++ b/examples/between_string/test_betwnstr.pkb @@ -1,25 +1,3 @@ -create or replace package test_betwnstr as - - -- %suite(Between string function) - - -- %test(Returns substring from start position to end position) - procedure normal_case; - - -- %test(Returns substring when start position is zero) - procedure zero_start_position; - - -- %test(Returns string until end if end position is greater than string length) - procedure big_end_position; - - -- %test(Returns null for null input string value) - procedure null_string; - - -- %test(Demo of a disabled test) - -- %disabled - procedure disabled_test; - -end; -/ create or replace package body test_betwnstr as procedure normal_case is diff --git a/examples/between_string/test_betwnstr.pks b/examples/between_string/test_betwnstr.pks new file mode 100644 index 000000000..7b98d0005 --- /dev/null +++ b/examples/between_string/test_betwnstr.pks @@ -0,0 +1,22 @@ +create or replace package test_betwnstr as + + -- %suite(Between string function) + + -- %test(Returns substring from start position to end position) + procedure normal_case; + + -- %test(Returns substring when start position is zero) + procedure zero_start_position; + + -- %test(Returns string until end if end position is greater than string length) + procedure big_end_position; + + -- %test(Returns null for null input string value) + procedure null_string; + + -- %test(Demo of a disabled test) + -- %disabled + procedure disabled_test; + +end; +/ diff --git a/examples/custom_reporters/run_ut_custom_reporter.sql b/examples/custom_reporters/run_ut_custom_reporter.sql new file mode 100644 index 000000000..dbb142ce1 --- /dev/null +++ b/examples/custom_reporters/run_ut_custom_reporter.sql @@ -0,0 +1,16 @@ +prompt ******************************************************************************* +prompt Runnign tests with UT_CUSTOM_REPORTER on top of UT_DOCUMENTATION_REPROTER +prompt ******************************************************************************* + +set echo off +--install the example unit test packages +@demo_of_expectations/demo_equal_matcher.sql +@@ut_custom_reporter.tps +@@ut_custom_reporter.tpb + +set serveroutput on size unlimited format truncated + +exec ut.run('demo_equal_matcher', ut_custom_reporter()); + +@demo_of_expectations/drop_demo_equal_matcher.sql +drop type ut_custom_reporter; diff --git a/examples/custom_reporters/run_ut_expectations_reporter.sql b/examples/custom_reporters/run_ut_expectations_reporter.sql new file mode 100644 index 000000000..90b1ff9ff --- /dev/null +++ b/examples/custom_reporters/run_ut_expectations_reporter.sql @@ -0,0 +1,16 @@ +prompt ******************************************************************************* +prompt Runnign tests with UT_CUSTOM_REPORTER on top of UT_DOCUMENTATION_REPROTER +prompt ******************************************************************************* + +set echo off +--install the example unit test packages +@demo_of_expectations/demo_equal_matcher.sql +@@ut_expectations_reporter.tps +@@ut_expectations_reporter.tpb + +set serveroutput on size unlimited format truncated + +exec ut.run('demo_equal_matcher', ut_expectations_reporter()); + +@demo_of_expectations/drop_demo_equal_matcher.sql +drop type ut_expectations_reporter; diff --git a/examples/developer_examples/ut_custom_reporter.tpb b/examples/custom_reporters/ut_custom_reporter.tpb similarity index 100% rename from examples/developer_examples/ut_custom_reporter.tpb rename to examples/custom_reporters/ut_custom_reporter.tpb diff --git a/examples/developer_examples/ut_custom_reporter.tps b/examples/custom_reporters/ut_custom_reporter.tps similarity index 69% rename from examples/developer_examples/ut_custom_reporter.tps rename to examples/custom_reporters/ut_custom_reporter.tps index cc7de666e..0cc3d67ed 100644 --- a/examples/developer_examples/ut_custom_reporter.tps +++ b/examples/custom_reporters/ut_custom_reporter.tps @@ -4,6 +4,12 @@ create or replace type ut_custom_reporter under ut_documentation_reporter -- Member functions and procedures constructor function ut_custom_reporter(a_tab_size integer default 4) return self as result, + + /* The reporter is using base functions of parent type ( UT_DOCUMENTATION_REPORTER ) + It is altering the behavior of the base functions by change of the indentation. + So the custom reporter is same as documentation reporter except that the tab size is bigger. + Additionally, the reporter constructor accepts parameter to indicate the indentation size + */ overriding member function tab(self in ut_custom_reporter) return varchar2, overriding member procedure print_text(a_text varchar2, a_item_type varchar2 := null), overriding member procedure before_calling_suite(self in out nocopy ut_custom_reporter, a_suite ut_logical_suite), diff --git a/examples/custom_reporters/ut_expectations_reporter.tpb b/examples/custom_reporters/ut_expectations_reporter.tpb new file mode 100644 index 000000000..af9cceb28 --- /dev/null +++ b/examples/custom_reporters/ut_expectations_reporter.tpb @@ -0,0 +1,149 @@ +create or replace type body ut_expectations_reporter is + /* + utPLSQL - Version 3 + Copyright 2016 - 2020 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + constructor function ut_expectations_reporter(a_report_all_expectations varchar2 := 'Y')return self as result is + begin + self.init($$plsql_unit); + self.lvl := 0; + self.report_all_expectations := substr(a_report_all_expectations,1,1); + self.failed_test_running_count := 0; + return; + end; + + /* The reporter procedure after_calling_test from ut_documentation_reporter is overriden here so that: + - the test name is printed + - the test staus is printed + - test duration is printed + - all expectation results from the test are printed (default) or only the failing ones + - error stack trace is printed + - dbms_output from test run is always printed + */ + overriding member procedure after_calling_test(a_test ut_test) as + l_message varchar2(4000); + + procedure print_expectation(a_expectation ut_expectation_result) is + l_lines ut_varchar2_list; + l_failed boolean := a_expectation.status > ut_utils.gc_success; + begin + if l_failed or self.report_all_expectations = 'Y' then + l_lines := a_expectation.get_result_lines(); + for i in 1 .. l_lines.count loop + if l_failed then + self.print_red_text(l_lines(i)); + else + self.print_green_text(l_lines(i)); + end if; + end loop; + self.print_cyan_text(a_expectation.caller_info); + self.print_text(' '); + end if; + end; + + procedure print_results_for_test(a_test ut_test) is + begin + self.lvl := self.lvl + 3; + self.print_red_text(ut_utils.table_to_clob( a_test.get_error_stack_traces() )); + for j in 1 .. a_test.all_expectations.count loop + print_expectation(a_test.all_expectations(j)); + end loop; + self.lvl := self.lvl - 3; + end; + begin + l_message := coalesce(a_test.description, a_test.name)||' ['||round(a_test.execution_time,3)||' sec]'; + --if test failed, then add it to the failures list, print failure with number + if a_test.result = ut_utils.gc_disabled then + self.print_yellow_text(l_message || ' (DISABLED)'); + elsif a_test.result = ut_utils.gc_success then + self.print_green_text(l_message); + elsif a_test.result > ut_utils.gc_success then + self.failed_test_running_count := self.failed_test_running_count + 1; + self.print_red_text(l_message || ' (FAILED - ' || failed_test_running_count || ')'); + end if; + + print_results_for_test(a_test); + -- reproduce the output from before/after procedures and the test + self.print_clob(a_test.get_serveroutputs); + end; + + overriding member procedure after_calling_run(a_run in ut_run) as + l_summary_text varchar2(4000); + l_warning_index pls_integer := 0; + -- make all warning indexes uniformly indented + c_warnings_lpad constant integer := length(to_char(a_run.results_count.warnings_count)); + + procedure print_item_warnings(a_item in ut_suite_item) is + l_items ut_suite_items; + begin + if a_item is of (ut_logical_suite) then + l_items := treat(a_item as ut_logical_suite).items; + for i in 1 .. l_items.count loop + print_item_warnings(l_items(i)); + end loop; + end if; + + if a_item.warnings is not null and a_item.warnings.count > 0 then + for i in 1 .. a_item.warnings.count loop + l_warning_index := l_warning_index + 1; + self.print_text(' ' || lpad(l_warning_index, c_warnings_lpad) || ') ' || a_item.path); + self.lvl := self.lvl + 3; + self.print_red_text(a_item.warnings(i)); + self.lvl := self.lvl - 3; + end loop; + self.print_text(' '); + end if; + end; + + procedure print_warnings(a_run in ut_run) is + begin + if a_run.results_count.warnings_count > 0 then + self.print_text(' '); + self.print_text('Warnings:'); + self.print_text(' '); + for i in 1 .. a_run.items.count loop + print_item_warnings(treat(a_run.items(i) as ut_suite_item)); + end loop; + end if; + end; + + begin + print_warnings(a_run); + self.print_text('Finished in ' || a_run.execution_time || ' seconds'); + + l_summary_text := + a_run.results_count.total_count || ' tests, ' + || a_run.results_count.failure_count || ' failed, ' || a_run.results_count.errored_count || ' errored, ' + || a_run.results_count.disabled_count ||' disabled, ' || a_run.results_count.warnings_count || ' warning(s)'; + if a_run.results_count.failure_count + a_run.results_count.errored_count + a_run.results_count.warnings_count > 0 then + self.print_red_text(l_summary_text); + else + self.print_green_text(l_summary_text); + end if; + if a_run.random_test_order_seed is not null then + self.print_text('Tests were executed with random order seed '''||a_run.random_test_order_seed||'''.'); + end if; + self.print_text(' '); + (self as ut_reporter_base).after_calling_run(a_run); + end; + + overriding member function get_description return varchar2 as + begin + return 'A custom reporter for pretty-printing all expectation results directly under the test'; + end; + +end; +/ diff --git a/examples/custom_reporters/ut_expectations_reporter.tps b/examples/custom_reporters/ut_expectations_reporter.tps new file mode 100644 index 000000000..a4238c302 --- /dev/null +++ b/examples/custom_reporters/ut_expectations_reporter.tps @@ -0,0 +1,30 @@ +create or replace type ut_expectations_reporter under ut_documentation_reporter( + /* + utPLSQL - Version 3 + Copyright 2016 - 2020 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + report_all_expectations varchar2(1), + + + constructor function ut_expectations_reporter(a_report_all_expectations varchar2 := 'Y') return self as result, + + overriding member procedure after_calling_test(a_test ut_test), + overriding member procedure after_calling_run(a_run in ut_run), + + overriding member function get_description return varchar2 + +) +not final +/ diff --git a/examples/demo_of_expectations/demo_equal_matcher.sql b/examples/demo_of_expectations/demo_equal_matcher.sql index 0836eeb52..f7b20581f 100644 --- a/examples/demo_of_expectations/demo_equal_matcher.sql +++ b/examples/demo_of_expectations/demo_equal_matcher.sql @@ -18,7 +18,7 @@ create or replace package demo_equal_matcher as -- %suitepath(org.utplsql.v3.demo.matchers) -- TODO this should go into context(compare_objects, Comparing objects) - -- %context(compare_objects, Comparing objects) + -- %context(Comparing objects) -- %test -- %displayname(Gives success when comparing identical objects containing identical data) @@ -48,7 +48,7 @@ create or replace package demo_equal_matcher as -- %displayname(Gives failure when comparing different objects containing identical data) procedure object_compare_different_type; - -- %end_context + -- %endcontext end; / diff --git a/examples/demo_of_expectations/drop_demo_equal_matcher.sql b/examples/demo_of_expectations/drop_demo_equal_matcher.sql new file mode 100644 index 000000000..8ec8cfa83 --- /dev/null +++ b/examples/demo_of_expectations/drop_demo_equal_matcher.sql @@ -0,0 +1,5 @@ +drop package demo_equal_matcher; +drop type demo_departments; +drop type demo_department_new; +drop type demo_department; + diff --git a/examples/demo_of_expectations/run.sql b/examples/demo_of_expectations/run.sql index a5f93a05f..42a43400c 100644 --- a/examples/demo_of_expectations/run.sql +++ b/examples/demo_of_expectations/run.sql @@ -4,8 +4,5 @@ set serveroutput on size unlimited format truncated exec ut.run(user||'.demo_equal_matcher'); -drop package demo_equal_matcher; -drop type demo_departments; -drop type demo_department_new; -drop type demo_department; +@@drop_demo_equal_matcher.sql diff --git a/examples/developer_examples/RunExampleTestSuiteWithCustomReporter.sql b/examples/developer_examples/RunExampleTestSuiteWithCustomReporter.sql deleted file mode 100644 index 285cbf9a1..000000000 --- a/examples/developer_examples/RunExampleTestSuiteWithCustomReporter.sql +++ /dev/null @@ -1,56 +0,0 @@ ---Shows how to create a test suite with the default reporter which is dbms_output ---No tables are used for this. ---Suite Management packages are when developed will make this easier. ---Clear Screen ---http://stackoverflow.com/questions/2584492/how-to-prevent-dbms-output-put-line-from-trimming-leading-whitespace -Set Serveroutput On Size Unlimited format truncated -set echo off ---install the example unit test packages -@@ut_exampletest.pks -@@ut_exampletest.pkb -@@ut_exampletest2.pks -@@ut_exampletest2.pkb -@@ut_custom_reporter.tps -@@ut_custom_reporter.tpb - -declare - l_suite ut_logical_suite; - l_test ut_test; - l_reporter ut_output_reporter_base; - l_run ut_run; -begin - ut_event_manager.initialize(); - -- Install ut_custom_reporter first from example folder - - l_suite := ut_suite(user, 'ut_exampletest',a_line_no=>1); - - l_test := ut_test(user, 'ut_exampletest','ut_exAmpletest',a_line_no=>3); - l_test.description := 'Example test1'; - l_test.before_test_list := ut_executables(ut_executable(user, 'ut_exampletest','Setup',ut_utils.gc_before_test)); - l_test.after_test_list := ut_executables(ut_executable(user, 'ut_exampletest','tEardown',ut_utils.gc_after_test)); - l_suite.items.extend; - l_suite.items(l_suite.items.last) := l_test; - - l_test := ut_test(user, 'UT_EXAMPLETEST2','ut_exAmpletest',a_line_no=>6); - l_test.description := 'Another example test'; - l_test.before_test_list := ut_executables(ut_executable(user, 'ut_exampletest','SETUP',ut_utils.gc_before_test)); - l_test.after_test_list := ut_executables(ut_executable(user, 'ut_exampletest','TEARDOWN',ut_utils.gc_after_test)); - l_suite.items.extend; - l_suite.items(l_suite.items.last) := l_test; - - -- provide a reporter to process results tabbing each hierarcy level by tab_size - l_reporter := ut_custom_reporter(a_tab_size => 2); - ut_event_manager.add_listener(l_reporter); - l_run := ut_run(ut_suite_items(l_suite)); - l_run.do_execute(); - ut_event_manager.trigger_event(ut_event_manager.gc_finalize, l_run); - l_reporter.lines_to_dbms_output(0,0); -end; -/ - - ---FIXME this drop is causing issues when executing script several times within single session -drop type ut_custom_reporter; -drop package ut_exampletest; -drop package ut_exampletest2; -exec dbms_session.reset_package; From 81d4194383ec00cf2e6cdf10da0443f91256bdc5 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 3 Aug 2020 17:38:34 +0100 Subject: [PATCH 0740/1096] Fixes to annotation parsing. Resolves #1088 Changed tests to reproduce issue with `dbms_preprocessor` failing to parse source that start with: `package owner.name authid definer is ...` --- test/ut3_tester_helper/annotation_cache_helper.pkb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/ut3_tester_helper/annotation_cache_helper.pkb b/test/ut3_tester_helper/annotation_cache_helper.pkb index 1a52faade..0715b6af1 100644 --- a/test/ut3_tester_helper/annotation_cache_helper.pkb +++ b/test/ut3_tester_helper/annotation_cache_helper.pkb @@ -4,7 +4,7 @@ create or replace package body annotation_cache_helper as pragma autonomous_transaction; begin execute immediate - 'create or replace package ut3_cache_test_owner.granted_test_suite is + 'create or replace package ut3_cache_test_owner.granted_test_suite authid definer is --%suite --%test @@ -19,7 +19,7 @@ create or replace package body annotation_cache_helper as procedure test2 is begin ut3_develop.ut.expect( 1 ).to_equal( 1 ); end; end;'; execute immediate - 'create or replace package ut3_cache_test_owner.not_granted_test_suite is + 'create or replace package ut3_cache_test_owner.not_granted_test_suite authid definer is --%suite --%test @@ -54,7 +54,7 @@ create or replace package body annotation_cache_helper as pragma autonomous_transaction; begin execute immediate - 'create or replace package ut3_cache_test_owner.new_suite is + 'create or replace package ut3_cache_test_owner.new_suite authid definer is --%suite --%test From 86e335e8c534db4f0f93f7a64683971acba1442f Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 3 Aug 2020 17:45:34 +0100 Subject: [PATCH 0741/1096] Fixed issue by removing owner from beginning of source code. --- source/core/annotations/ut_annotation_manager.pkb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index f8ca03326..c9de1c7e4 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -246,6 +246,9 @@ create or replace package body ut_annotation_manager as -- remove the "create [or replace] [[non]editionable] " so that we have only "type|package" for parsing -- needed for dbms_preprocessor l_sql_clob := regexp_replace(l_sql_clob, '^(.*?\s*create(\s+or\s+replace)?(\s+(editionable|noneditionable))?\s+?)((package|type).*)', '\5', 1, 1, 'ni'); + -- remove "OWNER." from create or replace statement. + -- Owner is not supported along with AUTHID - see issue https://github.com/utPLSQL/utPLSQL/issues/1088 + l_sql_clob := regexp_replace(l_sql_clob, '^(package|type)\s+("?[a-zA-Z][a-zA-Z0-9#_$]*"?\.)(.*)', '\1 \3', 1, 1, 'ni'); l_sql_lines := ut_utils.convert_collection( ut_utils.clob_to_table(l_sql_clob) ); end if; open l_result for From 7eeae3967d4b583654008c65ee8b7f11c1eca746 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sun, 9 Aug 2020 13:43:28 +0000 Subject: [PATCH 0742/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 0b67eb07c..dd64b7637 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index ac992ab44..f38b2a891 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 9c8ff22d3..3cfb82e48 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 2c808838f..a59a7cc46 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index a3aa9bee9..e5bec6b03 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 3f32da536..03b8172db 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 1d2c81694..8794e6011 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 14e835f69..0f02b8da2 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 52e34332d..7bddca771 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index fa7ebda44..5649582de 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 9a872becf..c1091fffa 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 54aa18234..cbf82ef53 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 09484b850..ed803222d 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index c0263af1e..2644fc9e8 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 09febcd38..ca1c376c6 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 194c0b44c..777d84a09 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index b5be914e2..736f3b44e 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3460--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 6a5788a71..7fd15dd5d 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -788,7 +788,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.11.3460-develop + * secion v3.1.11.3466-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index cc4cc3f52..c704a37ab 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.11.3460-develop'; + gc_version constant varchar2(50) := 'v3.1.11.3466-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From eced7a58415d7f8f7c17ad35f98de222c0f422b6 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Wed, 9 Dec 2020 01:12:39 +0100 Subject: [PATCH 0743/1096] add executable flag (required on macOS and Linux) --- .travis/push_docs_to_github_io.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .travis/push_docs_to_github_io.sh diff --git a/.travis/push_docs_to_github_io.sh b/.travis/push_docs_to_github_io.sh old mode 100644 new mode 100755 From 7812a8a22643e44ce8012cd02721ef715f343ba1 Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Wed, 9 Dec 2020 01:25:28 +0100 Subject: [PATCH 0744/1096] resolves #1111 - use dbms_crypto instead of dbms_obfuscation_toolkit --- source/reporters/ut_coverage_report_html_helper.pkb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/reporters/ut_coverage_report_html_helper.pkb b/source/reporters/ut_coverage_report_html_helper.pkb index d673a7f6c..f4b633c1f 100644 --- a/source/reporters/ut_coverage_report_html_helper.pkb +++ b/source/reporters/ut_coverage_report_html_helper.pkb @@ -90,7 +90,7 @@ create or replace package body ut_coverage_report_html_helper is function object_id(a_object_full_name varchar2) return varchar2 is begin - return rawtohex(utl_raw.cast_to_raw(dbms_obfuscation_toolkit.md5(input_string => a_object_full_name))); + return rawtohex(dbms_crypto.hash(src => utl_raw.cast_to_raw(a_object_full_name), typ => dbms_crypto.hash_md5)); end; function link_to_source_file(a_object_full_name varchar2) return varchar2 is From 04b5f5287b77cbd62f1aa6ff2ff8fd594ad5dc0b Mon Sep 17 00:00:00 2001 From: Travis CI Date: Wed, 9 Dec 2020 21:57:59 +0000 Subject: [PATCH 0745/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index dd64b7637..d40eec597 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index f38b2a891..75a456bfe 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 3cfb82e48..4e33bdfa1 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index a59a7cc46..6fe4368b3 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index e5bec6b03..86f38c43f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 03b8172db..7da4985a6 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 8794e6011..06572c9e0 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 0f02b8da2..de98a9b5b 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 7bddca771..92eef8dc1 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 5649582de..88d3e0154 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index c1091fffa..e0b2b5191 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index cbf82ef53..35ea4b45e 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index ed803222d..c87401929 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 2644fc9e8..0c461c71f 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index ca1c376c6..ab5252ca3 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 777d84a09..c8ad285ab 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 736f3b44e..7b922264a 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3466--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 7fd15dd5d..6f0be724d 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -788,7 +788,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.11.3466-develop + * secion v3.1.11.3469-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index c704a37ab..839deefe7 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.11.3466-develop'; + gc_version constant varchar2(50) := 'v3.1.11.3469-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From ae50802f0c05f78f0dc0749a36830de1e802c3bc Mon Sep 17 00:00:00 2001 From: Blaine Carter Date: Thu, 20 May 2021 12:11:05 -0600 Subject: [PATCH 0746/1096] Added missing tag #1107 The missing tags cause several CICD tools fail when displaying test coverage --- source/reporters/ut_coverage_cobertura_reporter.tpb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/source/reporters/ut_coverage_cobertura_reporter.tpb b/source/reporters/ut_coverage_cobertura_reporter.tpb index 2b34193ce..d8aae7f7a 100644 --- a/source/reporters/ut_coverage_cobertura_reporter.tpb +++ b/source/reporters/ut_coverage_cobertura_reporter.tpb @@ -79,6 +79,7 @@ create or replace type body ut_coverage_cobertura_reporter is c_packages_footer constant varchar2(30) := ''; c_package_footer constant varchar2(30) := ''; c_class_footer constant varchar2(30) := ''; + c_classes_footer constant varchar2(30) := ''; c_lines_footer constant varchar2(30) := ''; l_epoch varchar2(50) := (sysdate - to_date('01-01-1970 00:00:00', 'dd-mm-yyyy hh24:mi:ss')) * 24 * 60 * 60; begin @@ -116,6 +117,11 @@ create or replace type body ut_coverage_cobertura_reporter is l_result, '' ); + + ut_utils.append_to_list( + l_result, + '' + ); ut_utils.append_to_list( l_result, @@ -129,6 +135,7 @@ create or replace type body ut_coverage_cobertura_reporter is ut_utils.append_to_list(l_result, c_lines_footer); ut_utils.append_to_list(l_result, c_class_footer); + ut_utils.append_to_list(l_result, c_classes_footer); ut_utils.append_to_list(l_result, c_package_footer); l_unit := a_coverage_data.objects.next(l_unit); From 12f9bdfa1d4b60b65234a915d8dfb090e98ba1d5 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 20 May 2021 22:51:29 +0100 Subject: [PATCH 0747/1096] Updated unit tests after coverage format fix by @OsBlaineOra References: #1137 --- .../reporters/test_coverage/test_cov_cobertura_reporter.pkb | 2 ++ .../reporters/test_coverage/test_coverage_standalone.pkb | 2 ++ test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb | 2 ++ 3 files changed, 6 insertions(+) diff --git a/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb index 098405ff9..a18409463 100644 --- a/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb +++ b/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb @@ -26,12 +26,14 @@ create or replace package body test_cov_cobertura_reporter is + ]'||l_block_cov||q'[ + ]'; diff --git a/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb b/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb index bcd933eed..d94108a32 100644 --- a/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb +++ b/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb @@ -21,12 +21,14 @@ create or replace package body test_coverage_standalone is + ]'||l_block_cov||q'[ + ]'; diff --git a/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb b/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb index 6171ecb80..81a9a4c58 100644 --- a/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb +++ b/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb @@ -170,6 +170,7 @@ create or replace package body test_proftab_coverage is + @@ -183,6 +184,7 @@ create or replace package body test_proftab_coverage is + ]'; From 75037c8ec46aa280058e047015c9a50a60ec6b0c Mon Sep 17 00:00:00 2001 From: Travis CI Date: Thu, 20 May 2021 23:09:10 +0000 Subject: [PATCH 0748/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index d40eec597..8fb6b36a4 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 75a456bfe..9e97f9a38 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 4e33bdfa1..3576d6137 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 6fe4368b3..1acbd4f25 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 86f38c43f..a2c178ad7 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 7da4985a6..7b85ca542 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 06572c9e0..7d6801320 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index de98a9b5b..4be85696a 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 92eef8dc1..3698f4076 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 88d3e0154..6da6a5fbe 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index e0b2b5191..1d98faa6c 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 35ea4b45e..db7bff7cd 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index c87401929..e8ff255c5 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 0c461c71f..f15eb029a 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index ab5252ca3..fc0d8f714 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index c8ad285ab..e8e411613 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 7b922264a..ad5f2bf8f 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3469--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 6f0be724d..05339a831 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -788,7 +788,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.11.3469-develop + * secion v3.1.11.3475-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 839deefe7..3faa88f99 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.11.3469-develop'; + gc_version constant varchar2(50) := 'v3.1.11.3475-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 74985306f9f52b85bdc9ae69729ec402f02a3754 Mon Sep 17 00:00:00 2001 From: Blaine Carter Date: Tue, 1 Jun 2021 14:17:11 -0600 Subject: [PATCH 0749/1096] Replaced hard coded 0 in total test coverage with covered lines / total total lines. Rounding to 17 decimal places since that's what I found when looking at cobertura examples online. Used an rpad to generate the format mask to avoid having a long string of 9s. This was mentioned in #1107 but does not have an issue of its own. --- source/reporters/ut_coverage_cobertura_reporter.tpb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/reporters/ut_coverage_cobertura_reporter.tpb b/source/reporters/ut_coverage_cobertura_reporter.tpb index d8aae7f7a..7bc8bfcd4 100644 --- a/source/reporters/ut_coverage_cobertura_reporter.tpb +++ b/source/reporters/ut_coverage_cobertura_reporter.tpb @@ -90,7 +90,9 @@ create or replace type body ut_coverage_cobertura_reporter is --write header ut_utils.append_to_list( l_result, - '' From 70ccc22ed61ef9b68d0ba64b8226d673b608cef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 17 Aug 2021 23:15:41 +0100 Subject: [PATCH 0750/1096] Update readme.md --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index 7adecd3e0..e3cc9b8ba 100644 --- a/readme.md +++ b/readme.md @@ -203,3 +203,4 @@ The utPLSQL project is community-driven and is not commercially motivated. Nonet + From 3b7687bf833800739693f4be9b7432ca14528a24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Tue, 17 Aug 2021 23:28:23 +0100 Subject: [PATCH 0751/1096] Update readme.md --- readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/readme.md b/readme.md index e3cc9b8ba..7adecd3e0 100644 --- a/readme.md +++ b/readme.md @@ -203,4 +203,3 @@ The utPLSQL project is community-driven and is not commercially motivated. Nonet - From cbfac19f1a6ebb599748eee5db50e02093c59e7d Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 17 Aug 2021 22:39:29 +0000 Subject: [PATCH 0752/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 8fb6b36a4..299e6b049 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 9e97f9a38..5838bab87 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 3576d6137..e501f57cc 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 1acbd4f25..95ec7714b 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index a2c178ad7..211bf0b10 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 7b85ca542..c5618dd9a 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 7d6801320..15fdb6ef9 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 4be85696a..0139d4527 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 3698f4076..360959c9b 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 6da6a5fbe..217c43357 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 1d98faa6c..0a54c9a93 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index db7bff7cd..885b8e63d 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index e8ff255c5..dab73b03a 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index f15eb029a..c539e6158 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index fc0d8f714..08387879b 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index e8e411613..b4baa8602 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index ad5f2bf8f..91a0c35d5 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3475--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 05339a831..01a7d2637 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -788,7 +788,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.11.3475-develop + * secion v3.1.11.3477-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 3faa88f99..7ecddc593 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.11.3475-develop'; + gc_version constant varchar2(50) := 'v3.1.11.3477-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 4acb559cc42d5c99dd8707ca6e7793fd0f69172e Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 17 Aug 2021 23:44:46 +0100 Subject: [PATCH 0753/1096] Adjusting build to work with new travis server. --- .travis.yml | 9 ++++----- .travis/trigger_travis.sh | 2 +- readme.md | 3 +-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index d3299de4e..615851748 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,10 @@ sudo: required language: python +os: linux + +jdk: openjdk10 addons: - apt: - packages: - - unzip - # Java9+ Required for Sonar and SQLCL - - openjdk-9-jre-headless sonarcloud: organization: utplsql token: ${SONAR_TOKEN} @@ -65,6 +63,7 @@ cache: - $MAVEN_CFG before_install: + #cache to be used between stages. Based on https://github.com/travis-ci/docs-travis-ci-com/issues/1329 #delete all files in cache that are older than 5 days - mkdir -p $CACHE_DIR/stages_cache; find $CACHE_DIR/stages_cache/ -mtime +5 -exec rm {} \; diff --git a/.travis/trigger_travis.sh b/.travis/trigger_travis.sh index 039b00bbb..10083dd89 100755 --- a/.travis/trigger_travis.sh +++ b/.travis/trigger_travis.sh @@ -15,7 +15,7 @@ echoerr() { echo "$@" 1>&2; } -TRAVIS_URL=travis-ci.org +TRAVIS_URL=travis-ci.com BRANCH=develop USER="utPLSQL" RESULT=1 diff --git a/readme.md b/readme.md index 7adecd3e0..e7bceaac9 100644 --- a/readme.md +++ b/readme.md @@ -8,8 +8,7 @@ [![chat](http://img.shields.io/badge/slack-team--chat-blue.svg)](https://join.slack.com/t/utplsql/shared_invite/zt-d6zor80g-WWqAhbLWioJZUtLYeXetzA) [![twitter](https://img.shields.io/twitter/follow/utPLSQL.svg?style=social&label=Follow)](https://twitter.com/utPLSQL) -[![build](https://img.shields.io/travis/utPLSQL/utPLSQL/main.svg?label=main%20branch)](https://travis-ci.org/utPLSQL/utPLSQL) -[![build](https://img.shields.io/travis/utPLSQL/utPLSQL/develop.svg?label=develop%20branch)](https://travis-ci.org/utPLSQL/utPLSQL) +[![build](https://travis-ci.com/utPLSQL/utPLSQL.svg?branch=develop)](https://travis-ci.com/utPLSQL/utPLSQL) [![sonar](https://sonarcloud.io/api/project_badges/measure?project=utPLSQL&metric=sqale_rating)](https://sonarcloud.io/dashboard/index?id=utPLSQL) [![Coveralls coverage](https://coveralls.io/repos/github/utPLSQL/utPLSQL/badge.svg?branch=develop)](https://coveralls.io/github/utPLSQL/utPLSQL?branch=develop) From ff1158477c85e59b61f7640af01221204b2be32a Mon Sep 17 00:00:00 2001 From: Travis CI Date: Wed, 18 Aug 2021 22:36:42 +0000 Subject: [PATCH 0754/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 299e6b049..31d64ac84 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 5838bab87..d4b01ef7d 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index e501f57cc..c5434f5cb 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 95ec7714b..5f748d405 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 211bf0b10..29abf5a7a 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index c5618dd9a..b24e39f26 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 15fdb6ef9..8ceed197f 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 0139d4527..ad379211d 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 360959c9b..c222ca214 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 217c43357..4f8175a34 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 0a54c9a93..14d79e24b 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 885b8e63d..5e9f2ffb1 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index dab73b03a..a7fd36511 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index c539e6158..b5fc20a90 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 08387879b..c0ba24869 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index b4baa8602..1c8b71e27 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 91a0c35d5..6fef62333 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3477--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 01a7d2637..d7dc9e0ed 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -788,7 +788,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.11.3477-develop + * secion v3.1.11.3490-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 7ecddc593..ca18ce4e4 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.11.3477-develop'; + gc_version constant varchar2(50) := 'v3.1.11.3490-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From b0031ab305ffccbded4f5ac2f7a7ab2c8b49dfcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Fri, 3 Sep 2021 17:12:21 +0300 Subject: [PATCH 0755/1096] Update annotations documentation Resolves #1154 --- docs/userguide/annotations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 8ceed197f..faf2bf689 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1029,7 +1029,7 @@ If `--%aftertest` raises an unhandled exception the following will happen: - the `--%afterall` procedures **will be executed** - test execution will continue uninterrupted for rest of the suite -When multiple `--%aftertest` procedures are defined for a test, all of them will be executed before invoking the test. +When multiple `--%aftertest` procedures are defined for a test, all of them will be executed after invoking the test. The order of execution for `--%aftertest` procedures is defined by: - position of procedure on the list within single annotation From b33d395a828c348abf5cd882fafced7bfef0fe2f Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sat, 4 Sep 2021 09:23:49 +0000 Subject: [PATCH 0756/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 31d64ac84..abedc2646 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index d4b01ef7d..3ed9e01c3 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index c5434f5cb..eedb55e83 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 5f748d405..6d426ebf9 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 29abf5a7a..dcbda7778 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index b24e39f26..e62f2214d 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index faf2bf689..530d1a535 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index ad379211d..676cbbf9d 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index c222ca214..d1b8e0cb8 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 4f8175a34..a65a09c15 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 14d79e24b..4a56bf00d 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 5e9f2ffb1..6523a9bb2 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index a7fd36511..6f2392411 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index b5fc20a90..a74851764 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index c0ba24869..d02128d9d 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 1c8b71e27..838b2f09e 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 6fef62333..b1b14352f 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3490--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index d7dc9e0ed..7a4a6db84 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -788,7 +788,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.11.3490-develop + * secion v3.1.11.3491-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index ca18ce4e4..f07a53376 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.11.3490-develop'; + gc_version constant varchar2(50) := 'v3.1.11.3491-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 4e2b9f5f7b5ee5a39fac59a5fc20bb28f7c27d98 Mon Sep 17 00:00:00 2001 From: Blaine Carter Date: Tue, 7 Sep 2021 16:13:23 -0600 Subject: [PATCH 0757/1096] Fixed a divide by zero error. I introduced the error in the previous commit. To fix I added a l_lines_valid variable, used a case statement to check for 0 else return the calculation. I also replaced the lines_valid calculation to use the new variable to reduce code duplication. --- source/reporters/ut_coverage_cobertura_reporter.tpb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/source/reporters/ut_coverage_cobertura_reporter.tpb b/source/reporters/ut_coverage_cobertura_reporter.tpb index 7bc8bfcd4..e34bca79b 100644 --- a/source/reporters/ut_coverage_cobertura_reporter.tpb +++ b/source/reporters/ut_coverage_cobertura_reporter.tpb @@ -79,9 +79,10 @@ create or replace type body ut_coverage_cobertura_reporter is c_packages_footer constant varchar2(30) := ''; c_package_footer constant varchar2(30) := ''; c_class_footer constant varchar2(30) := ''; - c_classes_footer constant varchar2(30) := ''; + c_classes_footer constant varchar2(30) := ''; c_lines_footer constant varchar2(30) := ''; l_epoch varchar2(50) := (sysdate - to_date('01-01-1970 00:00:00', 'dd-mm-yyyy hh24:mi:ss')) * 24 * 60 * 60; + l_lines_valid number := a_coverage_data.covered_lines + a_coverage_data.uncovered_lines; begin ut_utils.append_to_list( l_result, ut_utils.get_xml_header(a_run.client_character_set) ); @@ -91,10 +92,10 @@ create or replace type body ut_coverage_cobertura_reporter is ut_utils.append_to_list( l_result, '' ); From 9cbcaa18e72424a86e931f73e131256ec0c7328e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Fri, 29 Oct 2021 12:21:45 +0300 Subject: [PATCH 0758/1096] Update of slack invite link --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index e7bceaac9..14b8c56ba 100644 --- a/readme.md +++ b/readme.md @@ -5,7 +5,7 @@ [![license](https://img.shields.io/github/license/utPLSQL/utPLSQL.svg)](https://www.apache.org/licenses/LICENSE-2.0) [![latest-release](https://img.shields.io/github/release/utPLSQL/utPLSQL.svg)](https://github.com/utPLSQL/utPLSQL/releases) [![Download statistics](https://img.shields.io/github/downloads/utPLSQL/utPLSQL/total.svg)](http://gra.caldis.me/?url=https://github.com/utPLSQL/utPLSQL) -[![chat](http://img.shields.io/badge/slack-team--chat-blue.svg)](https://join.slack.com/t/utplsql/shared_invite/zt-d6zor80g-WWqAhbLWioJZUtLYeXetzA) +[![chat](http://img.shields.io/badge/slack-team--chat-blue.svg)](https://join.slack.com/t/utplsql/shared_invite/zt-hsu14tf7-GLUyLpj~x2LIL_F57PMbhA) [![twitter](https://img.shields.io/twitter/follow/utPLSQL.svg?style=social&label=Follow)](https://twitter.com/utPLSQL) [![build](https://travis-ci.com/utPLSQL/utPLSQL.svg?branch=develop)](https://travis-ci.com/utPLSQL/utPLSQL) From 56ee7c98fa47d04404a6d322a654ef32988e9069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Fri, 29 Oct 2021 12:26:11 +0300 Subject: [PATCH 0759/1096] Update link for slack --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 14b8c56ba..e56aba1d4 100644 --- a/readme.md +++ b/readme.md @@ -5,7 +5,7 @@ [![license](https://img.shields.io/github/license/utPLSQL/utPLSQL.svg)](https://www.apache.org/licenses/LICENSE-2.0) [![latest-release](https://img.shields.io/github/release/utPLSQL/utPLSQL.svg)](https://github.com/utPLSQL/utPLSQL/releases) [![Download statistics](https://img.shields.io/github/downloads/utPLSQL/utPLSQL/total.svg)](http://gra.caldis.me/?url=https://github.com/utPLSQL/utPLSQL) -[![chat](http://img.shields.io/badge/slack-team--chat-blue.svg)](https://join.slack.com/t/utplsql/shared_invite/zt-hsu14tf7-GLUyLpj~x2LIL_F57PMbhA) +[![chat](http://img.shields.io/badge/slack-team--chat-blue.svg)](https://join.slack.com/t/utplsql/shared_invite/zt-xwm68udy-4cF_3PNEyczYEbWr38W5ww) [![twitter](https://img.shields.io/twitter/follow/utPLSQL.svg?style=social&label=Follow)](https://twitter.com/utPLSQL) [![build](https://travis-ci.com/utPLSQL/utPLSQL.svg?branch=develop)](https://travis-ci.com/utPLSQL/utPLSQL) From 29677259995bd08bba856b5e513c5dfd919df168 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 3 Nov 2021 15:00:32 +0200 Subject: [PATCH 0760/1096] Adjusting tests for Oracle21cXE --- .../expectations/test_expectations_json.pkb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/test/ut3_user/expectations/test_expectations_json.pkb b/test/ut3_user/expectations/test_expectations_json.pkb index 670502c0d..9516ecb04 100644 --- a/test/ut3_user/expectations/test_expectations_json.pkb +++ b/test/ut3_user/expectations/test_expectations_json.pkb @@ -68,9 +68,7 @@ create or replace package body test_expectations_json is --Act ut3_develop.ut.expect( l_actual ).to_equal( l_expected ); --Assert - l_expected_message := q'[%Diff: 20 differences found -%3 incorrect types, 4 unequal values, 13 missing properties -%Missing property: "Alexander Skarsg?rd" on path: $ + l_expected_message := q'[%Missing property: "Alexander Skarsg?rd" on path: $ %Extra property: "Alexander Skarsgard" on path: $ %Missing property: "Alice Farmer" on path: $ %Extra property: "Clarke Peters" on path: $ @@ -93,6 +91,10 @@ create or replace package body test_expectations_json is l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); + ut.expect(l_actual_message).to_be_like('%Diff: 20 differences found%'); + ut.expect(l_actual_message).to_be_like('%13 missing properties%'); + ut.expect(l_actual_message).to_be_like('%4 unequal values%'); + ut.expect(l_actual_message).to_be_like('%3 incorrect types%'); end; procedure null_json_variable @@ -1556,9 +1558,7 @@ create or replace package body test_expectations_json is --Act ut3_develop.ut.expect( l_actual ).to_equal( l_expected ); --Assert - l_expected_message := q'[%Diff: 133 differences found, showing first 20 -%132 unequal values, 1 missing properties -%Extra property: object on path: $[5] + l_expected_message := q'[%Extra property: object on path: $[5] %Actual value: "5ce6ec46cb9977b050f15d97" was expected to be: "5ce6ec6660565269b16cf836" on path: $[0]."_id" %Actual value: "5ce6ec469ba57bef5c421021" was expected to be: "5ce6ec66383ddbf3c400e3ed" on path: $[1]."_id" %Actual value: "5ce6ec4632328a654d592cb6" was expected to be: "5ce6ec6600fb7aaee2d1243e" on path: $[3]."_id" @@ -1582,6 +1582,9 @@ create or replace package body test_expectations_json is l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); + ut.expect(l_actual_message).to_be_like('%Diff: 133 differences found, showing first 20%'); + ut.expect(l_actual_message).to_be_like('%1 missing properties%'); + ut.expect(l_actual_message).to_be_like('%132 unequal values%'); end; procedure check_json_objects is From a36d796a63168241cd139f84fc3008fa2e01da79 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 3 Nov 2021 21:30:58 +0200 Subject: [PATCH 0761/1096] Adding ORacle 21c XE to the build process --- .travis.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 615851748..e2f19e950 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,11 +48,12 @@ env: - MAVEN_HOME=/usr/local/maven - MAVEN_CFG=$HOME/.m2 matrix: - - ORACLE_VERSION="${DOCKER_TAG_11G:-11g-r2-xe}" CONNECTION_STR='127.0.0.1:1521/XE' DOCKER_OPTIONS='--shm-size=1g' - - ORACLE_VERSION="${DOCKER_TAG_12C:-12c-r1-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' - - ORACLE_VERSION="${DOCKER_TAG_12C2:-12c-r2-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' - - ORACLE_VERSION="${DOCKER_TAG_18:-18c-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' - - ORACLE_VERSION="${DOCKER_TAG_19:-19c-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' + - ORACLE_VERSION="${DOCKER_TAG_11G:-11g-r2-xe}" CONNECTION_STR='127.0.0.1:1521/XE' DOCKER_OPTIONS='--shm-size=1g' + - ORACLE_VERSION="${DOCKER_TAG_12C:-12c-r1-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' + - ORACLE_VERSION="${DOCKER_TAG_12C2:-12c-r2-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' + - ORACLE_VERSION="${DOCKER_TAG_18:-18c-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' + - ORACLE_VERSION="${DOCKER_TAG_19:-19c-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' + - ORACLE_VERSION="${DOCKER_TAG_19:-utplsqlv3/oracledb:21c-xe-full}" CONNECTION_STR='127.0.0.1:1521/XEPDB1' DOCKER_OPTIONS='-e ORACLE_PASSWORD=oracle' cache: pip: true From ee7d9e2686c82c1d7f4870100a4e5f1e5bbb2a26 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 3 Nov 2021 21:35:50 +0200 Subject: [PATCH 0762/1096] Adding Oracle 21c XE to the build process --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e2f19e950..7d04693e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,7 +53,7 @@ env: - ORACLE_VERSION="${DOCKER_TAG_12C2:-12c-r2-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' - ORACLE_VERSION="${DOCKER_TAG_18:-18c-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' - ORACLE_VERSION="${DOCKER_TAG_19:-19c-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' - - ORACLE_VERSION="${DOCKER_TAG_19:-utplsqlv3/oracledb:21c-xe-full}" CONNECTION_STR='127.0.0.1:1521/XEPDB1' DOCKER_OPTIONS='-e ORACLE_PASSWORD=oracle' + - ORACLE_VERSION="${DOCKER_TAG_21XE:-21c-xe-full}" CONNECTION_STR='127.0.0.1:1521/XEPDB1' DOCKER_OPTIONS='-e ORACLE_PASSWORD=oracle' cache: pip: true From e48508f2c6abe3f91f9b146b50bc70f02f2c2d67 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Thu, 4 Nov 2021 06:59:20 +0000 Subject: [PATCH 0763/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index abedc2646..46014790f 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 3ed9e01c3..6514efb62 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index eedb55e83..b2bdb573c 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 6d426ebf9..7a951b76d 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index dcbda7778..65934b0e8 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index e62f2214d..7b9cfa641 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 530d1a535..6eb8b1b6c 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 676cbbf9d..ded4b085c 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index d1b8e0cb8..f514b031c 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index a65a09c15..a063f45d2 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 4a56bf00d..670ce1741 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 6523a9bb2..86ec6a4c7 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 6f2392411..8b99a5e0f 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index a74851764..ebc5b12b9 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index d02128d9d..70e0952b3 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 838b2f09e..63a9e0de4 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index b1b14352f..5a62efd2b 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3491--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 7a4a6db84..69e6c4725 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -788,7 +788,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.11.3491-develop + * secion v3.1.11.3495-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index f07a53376..3f5631aab 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.11.3491-develop'; + gc_version constant varchar2(50) := 'v3.1.11.3495-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 14eca7f6422aaf8998ead771fc53004c94d5d736 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 17 Aug 2021 23:35:47 +0100 Subject: [PATCH 0764/1096] Adding noparallel hint to elements causing issues on parallel-enabled servers. --- .../ut_annotation_cache_manager.pkb | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/source/core/annotations/ut_annotation_cache_manager.pkb b/source/core/annotations/ut_annotation_cache_manager.pkb index 4882108fc..475e05536 100644 --- a/source/core/annotations/ut_annotation_cache_manager.pkb +++ b/source/core/annotations/ut_annotation_cache_manager.pkb @@ -21,12 +21,12 @@ create or replace package body ut_annotation_cache_manager as l_timestamp timestamp := systimestamp; pragma autonomous_transaction; begin - update ut_annotation_cache_schema s + update /*+ noparallel */ ut_annotation_cache_schema s set s.max_parse_time = l_timestamp where s.object_type = a_object.object_type and s.object_owner = a_object.object_owner; if sql%rowcount = 0 then - insert into ut_annotation_cache_schema s + insert /*+ noparallel */ into ut_annotation_cache_schema s (object_owner, object_type, max_parse_time) values (a_object.object_owner, a_object.object_type, l_timestamp); end if; @@ -34,7 +34,7 @@ create or replace package body ut_annotation_cache_manager as -- if not in trigger, or object has annotations if ora_sysevent is null or a_object.annotations is not null and a_object.annotations.count > 0 then - update ut_annotation_cache_info i + update /*+ noparallel */ ut_annotation_cache_info i set i.parse_time = l_timestamp where (i.object_owner, i.object_name, i.object_type) in ((a_object.object_owner, a_object.object_name, a_object.object_type)) @@ -42,7 +42,7 @@ create or replace package body ut_annotation_cache_manager as if sql%rowcount = 0 then - insert into ut_annotation_cache_info + insert /*+ noparallel */ into ut_annotation_cache_info (cache_id, object_owner, object_name, object_type, parse_time) values (ut_annotation_cache_seq.nextval, a_object.object_owner, a_object.object_name, a_object.object_type, l_timestamp) returning cache_id into l_cache_id; @@ -50,10 +50,10 @@ create or replace package body ut_annotation_cache_manager as end if; - delete from ut_annotation_cache c where cache_id = l_cache_id; + delete /*+ noparallel */ from ut_annotation_cache c where cache_id = l_cache_id; if a_object.annotations is not null and a_object.annotations.count > 0 then - insert into ut_annotation_cache + insert /*+ noparallel */ into ut_annotation_cache (cache_id, annotation_position, annotation_name, annotation_text, subobject_name) select l_cache_id, a.position, a.name, a.text, a.subobject_name from table(a_object.annotations) a; @@ -67,7 +67,7 @@ create or replace package body ut_annotation_cache_manager as pragma autonomous_transaction; begin - delete from ut_annotation_cache c + delete /*+ noparallel */ from ut_annotation_cache c where c.cache_id in (select i.cache_id from ut_annotation_cache_info i @@ -78,7 +78,7 @@ create or replace package body ut_annotation_cache_manager as and o.needs_refresh = 'Y' ); - update ut_annotation_cache_schema s + update /*+ noparallel */ ut_annotation_cache_schema s set s.max_parse_time = l_timestamp where (s.object_owner, s.object_type) in ( @@ -88,14 +88,15 @@ create or replace package body ut_annotation_cache_manager as ); if sql%rowcount = 0 then - insert into ut_annotation_cache_schema s + insert /*+ noparallel */ into ut_annotation_cache_schema s (object_owner, object_type, max_parse_time) select distinct o.object_owner, o.object_type, l_timestamp from table(a_objects) o where o.needs_refresh = 'Y'; end if; - merge into ut_annotation_cache_info i + merge /*+ noparallel */ + into ut_annotation_cache_info i using (select o.object_name, o.object_type, o.object_owner from table(a_objects) o where o.needs_refresh = 'Y' @@ -149,7 +150,7 @@ create or replace package body ut_annotation_cache_manager as procedure set_fully_refreshed(a_object_owner varchar2, a_object_type varchar2) is pragma autonomous_transaction; begin - update ut_annotation_cache_schema s + update /*+ noparallel */ ut_annotation_cache_schema s set s.full_refresh_time = s.max_parse_time where s.object_owner = a_object_owner and s.object_type = a_object_type; @@ -160,7 +161,7 @@ create or replace package body ut_annotation_cache_manager as pragma autonomous_transaction; begin - delete from ut_annotation_cache_info i + delete /*+ noparallel */ from ut_annotation_cache_info i where exists ( select 1 from table (a_objects) o where o.object_name = i.object_name @@ -206,13 +207,13 @@ create or replace package body ut_annotation_cache_manager as l_filter := l_filter || ' and ' || case when a_object_type is null then ':a_object_type is null' else 'object_type = :a_object_type' end; l_cache_filter := ' c.cache_id in (select i.cache_id from ut_annotation_cache_info i where ' || l_filter || ' )'; end if; - execute immediate 'delete from ut_annotation_cache c where ' || l_cache_filter + execute immediate 'delete /*+ noparallel */ from ut_annotation_cache c where ' || l_cache_filter using a_object_owner, a_object_type; - execute immediate ' delete from ut_annotation_cache_info i where ' || l_filter + execute immediate ' delete /*+ noparallel */ from ut_annotation_cache_info i where ' || l_filter using a_object_owner, a_object_type; - execute immediate ' delete from ut_annotation_cache_schema s where ' || l_filter + execute immediate ' delete /*+ noparallel */ from ut_annotation_cache_schema s where ' || l_filter using a_object_owner, a_object_type; commit; From f35694e744e2bd8d322a0f3a153cfe54c36b5525 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 7 Nov 2021 22:34:57 +0200 Subject: [PATCH 0765/1096] Added no_parallel hints to all SQLs to assure stable performance on parallel-enabled systems. --- source/api/ut.pkb | 2 +- source/check_object_grants.sql | 2 +- .../ut_annotation_cache_manager.pkb | 50 +++++++++---------- .../annotations/ut_annotation_manager.pkb | 12 ++--- .../core/annotations/ut_annotation_parser.pkb | 2 +- source/core/coverage/ut_coverage.pkb | 2 +- source/core/coverage/ut_coverage_helper.pkb | 10 ++-- .../coverage/ut_coverage_helper_block.pkb | 3 +- .../coverage/ut_coverage_helper_profiler.pkb | 2 +- .../coverage/ut_coverage_reporter_base.tpb | 4 +- .../output_buffers/ut_output_buffer_base.tpb | 8 +-- .../ut_output_clob_table_buffer.tpb | 14 +++--- .../output_buffers/ut_output_table_buffer.tpb | 14 +++--- source/core/types/ut_output_reporter_base.tpb | 2 +- source/core/types/ut_run_info.tpb | 10 ++-- source/core/ut_dbms_output_cache.sql | 2 +- source/core/ut_expectation_processor.pkb | 2 +- source/core/ut_metadata.pkb | 10 ++-- source/core/ut_suite_cache_manager.pkb | 50 +++++++++---------- source/core/ut_suite_manager.pkb | 10 ++-- source/core/ut_utils.pkb | 16 +++--- .../data_values/ut_compound_data_helper.pkb | 20 ++++---- .../data_values/ut_cursor_details.tpb | 16 +++--- .../data_values/ut_data_value_anydata.tpb | 4 +- .../data_values/ut_data_value_refcursor.tpb | 2 +- source/reporters/ut_debug_reporter.tpb | 2 +- 26 files changed, 136 insertions(+), 135 deletions(-) diff --git a/source/api/ut.pkb b/source/api/ut.pkb index 3b94a2bf7..81d3e59a7 100644 --- a/source/api/ut.pkb +++ b/source/api/ut.pkb @@ -674,7 +674,7 @@ create or replace package body ut is procedure set_nls is begin if g_nls_date_format is null then - select nsp.value + select /*+ no_parallel */ nsp.value into g_nls_date_format from nls_session_parameters nsp where parameter = 'NLS_DATE_FORMAT'; diff --git a/source/check_object_grants.sql b/source/check_object_grants.sql index d499ced9c..5f560e6b1 100644 --- a/source/check_object_grants.sql +++ b/source/check_object_grants.sql @@ -24,7 +24,7 @@ begin l_target_table := get_view('dba_tab_privs'); l_owner_column := case when l_target_table like 'dba%' then 'owner' else 'table_schema' end; execute immediate q'[ - select listagg(' - '||object_name,CHR(10)) within group(order by object_name) + select /*+ no_parallel */ listagg(' - '||object_name,CHR(10)) within group(order by object_name) from ( select column_value as object_name from table(:l_expected_grants) diff --git a/source/core/annotations/ut_annotation_cache_manager.pkb b/source/core/annotations/ut_annotation_cache_manager.pkb index 475e05536..cef6fa519 100644 --- a/source/core/annotations/ut_annotation_cache_manager.pkb +++ b/source/core/annotations/ut_annotation_cache_manager.pkb @@ -21,12 +21,12 @@ create or replace package body ut_annotation_cache_manager as l_timestamp timestamp := systimestamp; pragma autonomous_transaction; begin - update /*+ noparallel */ ut_annotation_cache_schema s + update /*+ no_parallel */ ut_annotation_cache_schema s set s.max_parse_time = l_timestamp where s.object_type = a_object.object_type and s.object_owner = a_object.object_owner; if sql%rowcount = 0 then - insert /*+ noparallel */ into ut_annotation_cache_schema s + insert /*+ no_parallel */ into ut_annotation_cache_schema s (object_owner, object_type, max_parse_time) values (a_object.object_owner, a_object.object_type, l_timestamp); end if; @@ -34,7 +34,7 @@ create or replace package body ut_annotation_cache_manager as -- if not in trigger, or object has annotations if ora_sysevent is null or a_object.annotations is not null and a_object.annotations.count > 0 then - update /*+ noparallel */ ut_annotation_cache_info i + update /*+ no_parallel */ ut_annotation_cache_info i set i.parse_time = l_timestamp where (i.object_owner, i.object_name, i.object_type) in ((a_object.object_owner, a_object.object_name, a_object.object_type)) @@ -42,7 +42,7 @@ create or replace package body ut_annotation_cache_manager as if sql%rowcount = 0 then - insert /*+ noparallel */ into ut_annotation_cache_info + insert /*+ no_parallel */ into ut_annotation_cache_info (cache_id, object_owner, object_name, object_type, parse_time) values (ut_annotation_cache_seq.nextval, a_object.object_owner, a_object.object_name, a_object.object_type, l_timestamp) returning cache_id into l_cache_id; @@ -50,12 +50,12 @@ create or replace package body ut_annotation_cache_manager as end if; - delete /*+ noparallel */ from ut_annotation_cache c where cache_id = l_cache_id; + delete /*+ no_parallel */ from ut_annotation_cache c where cache_id = l_cache_id; if a_object.annotations is not null and a_object.annotations.count > 0 then - insert /*+ noparallel */ into ut_annotation_cache + insert /*+ no_parallel */ into ut_annotation_cache (cache_id, annotation_position, annotation_name, annotation_text, subobject_name) - select l_cache_id, a.position, a.name, a.text, a.subobject_name + select /*+ no_parallel */ l_cache_id, a.position, a.name, a.text, a.subobject_name from table(a_object.annotations) a; end if; commit; @@ -67,9 +67,9 @@ create or replace package body ut_annotation_cache_manager as pragma autonomous_transaction; begin - delete /*+ noparallel */ from ut_annotation_cache c + delete /*+ no_parallel */ from ut_annotation_cache c where c.cache_id - in (select i.cache_id + in (select /*+ no_parallel */ i.cache_id from ut_annotation_cache_info i join table (a_objects) o on o.object_name = i.object_name @@ -78,26 +78,26 @@ create or replace package body ut_annotation_cache_manager as and o.needs_refresh = 'Y' ); - update /*+ noparallel */ ut_annotation_cache_schema s + update /*+ no_parallel */ ut_annotation_cache_schema s set s.max_parse_time = l_timestamp where (s.object_owner, s.object_type) in ( - select o.object_owner, o.object_type + select /*+ no_parallel */ o.object_owner, o.object_type from table(a_objects) o where o.needs_refresh = 'Y' ); if sql%rowcount = 0 then - insert /*+ noparallel */ into ut_annotation_cache_schema s + insert /*+ no_parallel */ into ut_annotation_cache_schema s (object_owner, object_type, max_parse_time) - select distinct o.object_owner, o.object_type, l_timestamp + select /*+ no_parallel */ distinct o.object_owner, o.object_type, l_timestamp from table(a_objects) o where o.needs_refresh = 'Y'; end if; - merge /*+ noparallel */ + merge /*+ no_parallel */ into ut_annotation_cache_info i - using (select o.object_name, o.object_type, o.object_owner + using (select /*+ no_parallel */ o.object_name, o.object_type, o.object_owner from table(a_objects) o where o.needs_refresh = 'Y' ) o @@ -117,7 +117,7 @@ create or replace package body ut_annotation_cache_manager as function get_cached_objects_list(a_object_owner varchar2, a_object_type varchar2, a_parsed_after timestamp := null) return ut_annotation_objs_cache_info is l_result ut_annotation_objs_cache_info; begin - select ut_annotation_obj_cache_info( + select /*+ no_parallel */ ut_annotation_obj_cache_info( object_owner => i.object_owner, object_name => i.object_name, object_type => i.object_type, @@ -136,7 +136,7 @@ create or replace package body ut_annotation_cache_manager as l_result t_cache_schema_info; begin begin - select * + select /*+ no_parallel */ * into l_result from ut_annotation_cache_schema s where s.object_type = a_object_type and s.object_owner = a_object_owner; @@ -150,7 +150,7 @@ create or replace package body ut_annotation_cache_manager as procedure set_fully_refreshed(a_object_owner varchar2, a_object_type varchar2) is pragma autonomous_transaction; begin - update /*+ noparallel */ ut_annotation_cache_schema s + update /*+ no_parallel */ ut_annotation_cache_schema s set s.full_refresh_time = s.max_parse_time where s.object_owner = a_object_owner and s.object_type = a_object_type; @@ -161,9 +161,9 @@ create or replace package body ut_annotation_cache_manager as pragma autonomous_transaction; begin - delete /*+ noparallel */ from ut_annotation_cache_info i + delete /*+ no_parallel */ from ut_annotation_cache_info i where exists ( - select 1 from table (a_objects) o + select /*+ no_parallel */ 1 from table (a_objects) o where o.object_name = i.object_name and o.object_type = i.object_type and o.object_owner = i.object_owner @@ -176,7 +176,7 @@ create or replace package body ut_annotation_cache_manager as l_results sys_refcursor; begin open l_results for - select ut_annotated_object( + select /*+ no_parallel */ ut_annotated_object( i.object_owner, i.object_name, i.object_type, i.parse_time, cast( collect( @@ -205,15 +205,15 @@ create or replace package body ut_annotation_cache_manager as else l_filter := case when a_object_owner is null then ':a_object_owner is null' else 'object_owner = :a_object_owner' end; l_filter := l_filter || ' and ' || case when a_object_type is null then ':a_object_type is null' else 'object_type = :a_object_type' end; - l_cache_filter := ' c.cache_id in (select i.cache_id from ut_annotation_cache_info i where ' || l_filter || ' )'; + l_cache_filter := ' c.cache_id in (select /*+ no_parallel */ i.cache_id from ut_annotation_cache_info i where ' || l_filter || ' )'; end if; - execute immediate 'delete /*+ noparallel */ from ut_annotation_cache c where ' || l_cache_filter + execute immediate 'delete /*+ no_parallel */ from ut_annotation_cache c where ' || l_cache_filter using a_object_owner, a_object_type; - execute immediate ' delete /*+ noparallel */ from ut_annotation_cache_info i where ' || l_filter + execute immediate ' delete /*+ no_parallel */ from ut_annotation_cache_info i where ' || l_filter using a_object_owner, a_object_type; - execute immediate ' delete /*+ noparallel */ from ut_annotation_cache_schema s where ' || l_filter + execute immediate ' delete /*+ no_parallel */ from ut_annotation_cache_schema s where ' || l_filter using a_object_owner, a_object_type; commit; diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index c9de1c7e4..ca0c358cf 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -34,7 +34,7 @@ create or replace package body ut_annotation_manager as l_cached_objects := ut_annotation_cache_manager.get_cached_objects_list( a_object_owner, a_object_type ); if l_cached_objects is not empty then - execute immediate 'select /*+ cardinality(i '||ut_utils.scale_cardinality(cardinality(l_cached_objects))||') */ + execute immediate 'select /*+ no_parallel cardinality(i '||ut_utils.scale_cardinality(cardinality(l_cached_objects))||') */ value(i) from table( :l_data ) i where @@ -71,7 +71,7 @@ create or replace package body ut_annotation_manager as --limit the list to objects that exist and are visible to the invoking user --enrich the list by info about cache validity execute immediate - 'select /*+ cardinality(i '||ut_utils.scale_cardinality(cardinality(l_cached_objects))||') */ + 'select /*+ no_parallel cardinality(i '||ut_utils.scale_cardinality(cardinality(l_cached_objects))||') */ '||l_ut_owner||q'[.ut_annotation_obj_cache_info( object_owner => o.owner, object_name => o.object_name, @@ -108,7 +108,7 @@ create or replace package body ut_annotation_manager as begin l_card := ut_utils.scale_cardinality(cardinality(a_objects_to_refresh)); open l_result for - q'[select x.name, x.text + q'[select /*+ no_parallel */ x.name, x.text from (select /*+ cardinality( r ]'||l_card||q'[ )*/ s.name, s.text, s.line, max(case when s.text like '%--%\%%' escape '\' @@ -252,7 +252,7 @@ create or replace package body ut_annotation_manager as l_sql_lines := ut_utils.convert_collection( ut_utils.clob_to_table(l_sql_clob) ); end if; open l_result for - select a_object_name as name, column_value||chr(10) as text from table(l_sql_lines); + select /*+ no_parallel */ a_object_name as name, column_value||chr(10) as text from table(l_sql_lines); return l_result; end; @@ -261,7 +261,7 @@ create or replace package body ut_annotation_manager as l_sources_view varchar2(200) := ut_metadata.get_source_view_name(); begin open l_result for - q'[select :a_object_name, s.text + q'[select /*+ no_parallel */ :a_object_name, s.text from ]'||l_sources_view||q'[ s where s.type = :a_object_type and s.owner = :a_object_owner @@ -279,7 +279,7 @@ create or replace package body ut_annotation_manager as 'GSMCATUSER','GSMUSER','ORACLE_OCM','OUTLN','REMOTE_SCHEDULER_AGENT','SYS','SYS$UMF', 'SYSBACKUP','SYSDG','SYSKM','SYSRAC','SYSTEM','WMSYS','XDB','XS$NULL'); $else - select username bulk collect into l_restricted_users + select /*+ no_parallel */ username bulk collect into l_restricted_users from all_users where oracle_maintained = 'Y'; $end if ora_dict_obj_owner member of l_restricted_users then diff --git a/source/core/annotations/ut_annotation_parser.pkb b/source/core/annotations/ut_annotation_parser.pkb index 6248f36b9..6ef15a3ac 100644 --- a/source/core/annotations/ut_annotation_parser.pkb +++ b/source/core/annotations/ut_annotation_parser.pkb @@ -210,7 +210,7 @@ create or replace package body ut_annotation_parser as dbms_lob.freetemporary(l_source); - select value(x) bulk collect into l_result from table(l_annotations) x order by x.position; + select /*+ no_parallel */ value(x) bulk collect into l_result from table(l_annotations) x order by x.position; return l_result; end parse_object_annotations; diff --git a/source/core/coverage/ut_coverage.pkb b/source/core/coverage/ut_coverage.pkb index 81d17704a..1900e6c3c 100644 --- a/source/core/coverage/ut_coverage.pkb +++ b/source/core/coverage/ut_coverage.pkb @@ -77,7 +77,7 @@ create or replace package body ut_coverage is end as to_be_skipped from sources s ) - select full_name, owner, name, type, line, to_be_skipped, text + select /*+ no_parallel */ full_name, owner, name, type, line, to_be_skipped, text from coverage_sources s -- Exclude calls to utPLSQL framework, Unit Test packages and objects from a_exclude_list parameter of coverage reporter where (s.owner, s.name) not in ( select /*+ cardinality(el {skipped_objects_cardinality})*/el.owner, el.name from table(:l_skipped_objects) el ) diff --git a/source/core/coverage/ut_coverage_helper.pkb b/source/core/coverage/ut_coverage_helper.pkb index 4c41aa2f6..a000237c6 100644 --- a/source/core/coverage/ut_coverage_helper.pkb +++ b/source/core/coverage/ut_coverage_helper.pkb @@ -35,7 +35,7 @@ create or replace package body ut_coverage_helper is procedure insert_into_tmp_table(a_data t_coverage_sources_tmp_rows) is begin forall i in 1 .. a_data.count - insert into ut_coverage_sources_tmp + insert /*+ no_parallel */ into ut_coverage_sources_tmp (full_name,owner,name,type,line,text,to_be_skipped) values(a_data(i).full_name,a_data(i).owner,a_data(i).name,a_data(i).type,a_data(i).line,a_data(i).text,a_data(i).to_be_skipped); end; @@ -49,7 +49,7 @@ create or replace package body ut_coverage_helper is function is_tmp_table_populated return boolean is l_result integer; begin - select 1 into l_result from ut_coverage_sources_tmp where rownum = 1; + select /*+ no_parallel */ 1 into l_result from ut_coverage_sources_tmp where rownum = 1; return (l_result = 1); exception when no_data_found then @@ -60,7 +60,7 @@ create or replace package body ut_coverage_helper is l_result t_tmp_table_objects_crsr; begin open l_result for - select o.owner, o.name, o.type, o.full_name, max(o.line) as lines_count, + select /*+ no_parallel */ o.owner, o.name, o.type, o.full_name, max(o.line) as lines_count, cast( collect(decode(to_be_skipped, 'Y', to_char(line))) as ut_varchar2_list ) as to_be_skipped_list @@ -73,7 +73,7 @@ create or replace package body ut_coverage_helper is function get_tmp_table_object_lines(a_owner varchar2, a_object_name varchar2) return ut_varchar2_list is l_result ut_varchar2_list; begin - select rtrim(s.text,chr(10)) as text + select /*+ no_parallel */ rtrim(s.text,chr(10)) as text bulk collect into l_result from ut_coverage_sources_tmp s where s.owner = a_owner @@ -86,7 +86,7 @@ create or replace package body ut_coverage_helper is procedure set_coverage_run_ids( a_coverage_run_id raw, a_line_coverage_id integer, a_block_coverage_id integer ) is pragma autonomous_transaction; begin - insert into ut_coverage_runs + insert /*+ no_parallel */ into ut_coverage_runs ( coverage_run_id, line_coverage_id, block_coverage_id ) values ( a_coverage_run_id, a_line_coverage_id, a_block_coverage_id ); diff --git a/source/core/coverage/ut_coverage_helper_block.pkb b/source/core/coverage/ut_coverage_helper_block.pkb index e030f2c37..913b0fb4c 100644 --- a/source/core/coverage/ut_coverage_helper_block.pkb +++ b/source/core/coverage/ut_coverage_helper_block.pkb @@ -46,7 +46,8 @@ create or replace package body ut_coverage_helper_block is l_ut_owner varchar2(250) := ut_utils.ut_owner; begin execute immediate q'[ - select line as line, + select /*+ no_parallel */ + line as line, count(block) as blocks, sum(covered) as covered_blocks from (select line, diff --git a/source/core/coverage/ut_coverage_helper_profiler.pkb b/source/core/coverage/ut_coverage_helper_profiler.pkb index dacfcbaa3..22aa6619d 100644 --- a/source/core/coverage/ut_coverage_helper_profiler.pkb +++ b/source/core/coverage/ut_coverage_helper_profiler.pkb @@ -58,7 +58,7 @@ create or replace package body ut_coverage_helper_profiler is function proftab_results(a_object ut_coverage_helper.t_tmp_table_object, a_coverage_run_id raw) return t_proftab_rows is l_coverage_rows t_proftab_rows; begin - select + select /*+ no_parallel */ d.line#, case when sum(d.total_occur) = 0 and sum(d.total_time) > 0 then 1 else sum(d.total_occur) end total_occur bulk collect into l_coverage_rows diff --git a/source/core/coverage/ut_coverage_reporter_base.tpb b/source/core/coverage/ut_coverage_reporter_base.tpb index 96c4b5066..1cc856ea6 100644 --- a/source/core/coverage/ut_coverage_reporter_base.tpb +++ b/source/core/coverage/ut_coverage_reporter_base.tpb @@ -93,7 +93,7 @@ create or replace type body ut_coverage_reporter_base is (l_reporter as ut_output_reporter_base).before_calling_run(null); l_reporter.after_calling_run( ut_run( a_coverage_options => a_coverage_options, a_client_character_set => a_client_character_set ) ); l_reporter.on_finalize(null); - for i in (select x.text from table(l_reporter.get_lines(1, 1)) x ) loop + for i in (select /*+ no_parallel */ x.text from table(l_reporter.get_lines(1, 1)) x ) loop pipe row (i.text); end loop; return; @@ -107,7 +107,7 @@ create or replace type body ut_coverage_reporter_base is (l_reporter as ut_output_reporter_base).before_calling_run(null); l_reporter.after_calling_run( ut_run( a_coverage_options => a_coverage_options, a_client_character_set => a_client_character_set ) ); l_reporter.on_finalize(null); - open l_result for select x.text from table(l_reporter.get_lines(1, 1)) x; + open l_result for select /*+ no_parallel */ x.text from table(l_reporter.get_lines(1, 1)) x; return l_result; end; diff --git a/source/core/output_buffers/ut_output_buffer_base.tpb b/source/core/output_buffers/ut_output_buffer_base.tpb index 38f008e75..412f30836 100644 --- a/source/core/output_buffers/ut_output_buffer_base.tpb +++ b/source/core/output_buffers/ut_output_buffer_base.tpb @@ -25,11 +25,11 @@ create or replace type body ut_output_buffer_base is self.output_id := coalesce(a_output_id, self.output_id, sys_guid()); self.start_date := coalesce(self.start_date, sysdate); self.last_message_id := 0; - select count(*) into l_exists from ut_output_buffer_info_tmp where output_id = self.output_id; + select /*+ no_parallel */ count(*) into l_exists from ut_output_buffer_info_tmp where output_id = self.output_id; if ( l_exists > 0 ) then - update ut_output_buffer_info_tmp set start_date = self.start_date where output_id = self.output_id; + update /*+ no_parallel */ ut_output_buffer_info_tmp set start_date = self.start_date where output_id = self.output_id; else - insert into ut_output_buffer_info_tmp(output_id, start_date) values (self.output_id, self.start_date); + insert /*+ no_parallel */ into ut_output_buffer_info_tmp(output_id, start_date) values (self.output_id, self.start_date); end if; commit; self.is_closed := 0; @@ -39,7 +39,7 @@ create or replace type body ut_output_buffer_base is l_lines sys_refcursor; begin open l_lines for - select text, item_type + select /*+ no_parallel */ text, item_type from table(self.get_lines(a_initial_timeout, a_timeout_sec)); return l_lines; end; diff --git a/source/core/output_buffers/ut_output_clob_table_buffer.tpb b/source/core/output_buffers/ut_output_clob_table_buffer.tpb index 8c2825151..8d23b9422 100644 --- a/source/core/output_buffers/ut_output_clob_table_buffer.tpb +++ b/source/core/output_buffers/ut_output_clob_table_buffer.tpb @@ -26,7 +26,7 @@ create or replace type body ut_output_clob_table_buffer is pragma autonomous_transaction; begin self.last_message_id := self.last_message_id + 1; - insert into ut_output_clob_buffer_tmp(output_id, message_id, is_finished) + insert /*+ no_parallel */ into ut_output_clob_buffer_tmp(output_id, message_id, is_finished) values (self.output_id, self.last_message_id, 1); commit; self.is_closed := 1; @@ -37,7 +37,7 @@ create or replace type body ut_output_clob_table_buffer is begin if a_text is not null or a_item_type is not null then self.last_message_id := self.last_message_id + 1; - insert into ut_output_clob_buffer_tmp(output_id, message_id, text, item_type) + insert /*+ no_parallel */ into ut_output_clob_buffer_tmp(output_id, message_id, text, item_type) values (self.output_id, self.last_message_id, a_text, a_item_type); end if; commit; @@ -46,8 +46,8 @@ create or replace type body ut_output_clob_table_buffer is overriding member procedure send_lines(self in out nocopy ut_output_clob_table_buffer, a_text_list ut_varchar2_rows, a_item_type varchar2 := null) is pragma autonomous_transaction; begin - insert into ut_output_clob_buffer_tmp(output_id, message_id, text, item_type) - select self.output_id, self.last_message_id + rownum, t.column_value, a_item_type + insert /*+ no_parallel */ into ut_output_clob_buffer_tmp(output_id, message_id, text, item_type) + select /*+ no_parallel */ self.output_id, self.last_message_id + rownum, t.column_value, a_item_type from table(a_text_list) t where t.column_value is not null or a_item_type is not null; self.last_message_id := self.last_message_id + SQL%rowcount; @@ -59,7 +59,7 @@ create or replace type body ut_output_clob_table_buffer is begin if a_text is not null and a_text != empty_clob() or a_item_type is not null then self.last_message_id := self.last_message_id + 1; - insert into ut_output_clob_buffer_tmp(output_id, message_id, text, item_type) + insert /*+ no_parallel */ into ut_output_clob_buffer_tmp(output_id, message_id, text, item_type) values (self.output_id, self.last_message_id, a_text, a_item_type); end if; commit; @@ -102,13 +102,13 @@ create or replace type body ut_output_clob_table_buffer is begin while not l_finished loop with ordered_buffer as ( - select /*+ index(a) */ a.rowid, ut_output_data_row(a.text, a.item_type), is_finished + select /*+ no_parallel index(a) */ a.rowid, ut_output_data_row(a.text, a.item_type), is_finished from ut_output_clob_buffer_tmp a where a.output_id = self.output_id and a.message_id <= l_max_message_id order by a.message_id ) - select b.* + select /*+ no_parallel */ b.* bulk collect into l_message_rowids, l_buffer_data, l_finished_flags from ordered_buffer b; diff --git a/source/core/output_buffers/ut_output_table_buffer.tpb b/source/core/output_buffers/ut_output_table_buffer.tpb index e3f869b22..5f9c536f9 100644 --- a/source/core/output_buffers/ut_output_table_buffer.tpb +++ b/source/core/output_buffers/ut_output_table_buffer.tpb @@ -26,7 +26,7 @@ create or replace type body ut_output_table_buffer is pragma autonomous_transaction; begin self.last_message_id := self.last_message_id + 1; - insert into ut_output_buffer_tmp(output_id, message_id, is_finished) + insert /*+ no_parallel */ into ut_output_buffer_tmp(output_id, message_id, is_finished) values (self.output_id, self.last_message_id, 1); commit; self.is_closed := 1; @@ -45,7 +45,7 @@ create or replace type body ut_output_table_buffer is ); else self.last_message_id := self.last_message_id + 1; - insert into ut_output_buffer_tmp(output_id, message_id, text, item_type) + insert /*+ no_parallel */ into ut_output_buffer_tmp(output_id, message_id, text, item_type) values (self.output_id, self.last_message_id, a_text, a_item_type); end if; commit; @@ -55,8 +55,8 @@ create or replace type body ut_output_table_buffer is overriding member procedure send_lines(self in out nocopy ut_output_table_buffer, a_text_list ut_varchar2_rows, a_item_type varchar2 := null) is pragma autonomous_transaction; begin - insert into ut_output_buffer_tmp(output_id, message_id, text, item_type) - select self.output_id, self.last_message_id + rownum, t.column_value, a_item_type + insert /*+ no_parallel */ into ut_output_buffer_tmp(output_id, message_id, text, item_type) + select /*+ no_parallel */ self.output_id, self.last_message_id + rownum, t.column_value, a_item_type from table(a_text_list) t where t.column_value is not null or a_item_type is not null; self.last_message_id := self.last_message_id + SQL%rowcount; @@ -76,7 +76,7 @@ create or replace type body ut_output_table_buffer is ); else self.last_message_id := self.last_message_id + 1; - insert into ut_output_buffer_tmp(output_id, message_id, text, item_type) + insert /*+ no_parallel */ into ut_output_buffer_tmp(output_id, message_id, text, item_type) values (self.output_id, self.last_message_id, a_text, a_item_type); end if; commit; @@ -107,8 +107,8 @@ create or replace type body ut_output_table_buffer is ) is pragma autonomous_transaction; begin - delete from ( - select * + delete /*+ no_parallel */ from ( + select /*+ no_parallel */ * from ut_output_buffer_tmp o where o.output_id = self.output_id and o.message_id <= a_max_message_id diff --git a/source/core/types/ut_output_reporter_base.tpb b/source/core/types/ut_output_reporter_base.tpb index c4ba73ba5..b8dc24667 100644 --- a/source/core/types/ut_output_reporter_base.tpb +++ b/source/core/types/ut_output_reporter_base.tpb @@ -65,7 +65,7 @@ create or replace type body ut_output_reporter_base is final member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural) return ut_output_data_rows pipelined is begin - for i in (select value(x) val from table(self.output_buffer.get_lines(a_initial_timeout, a_timeout_sec)) x ) loop + for i in (select /*+ no_parallel */ value(x) val from table(self.output_buffer.get_lines(a_initial_timeout, a_timeout_sec)) x ) loop pipe row (i.val); end loop; end; diff --git a/source/core/types/ut_run_info.tpb b/source/core/types/ut_run_info.tpb index 8e06d6137..ffa1a6372 100644 --- a/source/core/types/ut_run_info.tpb +++ b/source/core/types/ut_run_info.tpb @@ -20,27 +20,27 @@ create or replace type body ut_run_info as begin self.self_type := $$plsql_unit; execute immediate - 'select '||l_ut_owner||'.ut.version() from dual' + 'select /*+ no_parallel */ '||l_ut_owner||'.ut.version() from dual' into self.ut_version; dbms_utility.db_version( self.db_version, self.db_compatibility ); db_os_type := dbms_utility.port_string(); execute immediate - 'select '||l_ut_owner||'.ut_key_value_pair(x.product, x.version) from product_component_version x' + 'select /*+ no_parallel */ '||l_ut_owner||'.ut_key_value_pair(x.product, x.version) from product_component_version x' bulk collect into self.db_component_version; execute immediate - 'select '||l_ut_owner||'.ut_key_value_pair(x.parameter, x.value) + 'select /*+ no_parallel */ '||l_ut_owner||'.ut_key_value_pair(x.parameter, x.value) from nls_session_parameters x' bulk collect into self.nls_session_params; execute immediate - 'select '||l_ut_owner||'.ut_key_value_pair(x.parameter, x.value) from nls_instance_parameters x' + 'select /*+ no_parallel */ '||l_ut_owner||'.ut_key_value_pair(x.parameter, x.value) from nls_instance_parameters x' bulk collect into self.nls_instance_params; execute immediate - 'select '||l_ut_owner||'.ut_key_value_pair(x.parameter, x.value) from nls_database_parameters x' + 'select /*+ no_parallel */ '||l_ut_owner||'.ut_key_value_pair(x.parameter, x.value) from nls_database_parameters x' bulk collect into self.nls_db_params; return; end; diff --git a/source/core/ut_dbms_output_cache.sql b/source/core/ut_dbms_output_cache.sql index 1fe4251c7..3d4c12845 100644 --- a/source/core/ut_dbms_output_cache.sql +++ b/source/core/ut_dbms_output_cache.sql @@ -19,7 +19,7 @@ limitations under the License. declare l_tab_exist number; begin - select count(*) into l_tab_exist from + select /*+ no_parallel */ count(*) into l_tab_exist from (select table_name from all_tables where table_name = 'UT_DBMS_OUTPUT_CACHE' and owner = sys_context('USERENV','CURRENT_SCHEMA') union all select synonym_name from all_synonyms where synonym_name = 'UT_DBMS_OUTPUT_CACHE' and owner = sys_context('USERENV','CURRENT_SCHEMA')); diff --git a/source/core/ut_expectation_processor.pkb b/source/core/ut_expectation_processor.pkb index d65d210c8..22e268dca 100644 --- a/source/core/ut_expectation_processor.pkb +++ b/source/core/ut_expectation_processor.pkb @@ -104,7 +104,7 @@ create or replace package body ut_expectation_processor as function get_session_parameters return tt_nls_params is l_session_params tt_nls_params; begin - select nsp.parameter, nsp.value + select /*+ no_parallel */ nsp.parameter, nsp.value bulk collect into l_session_params from nls_session_parameters nsp where parameter diff --git a/source/core/ut_metadata.pkb b/source/core/ut_metadata.pkb index 727dd6318..3afc9d1c6 100644 --- a/source/core/ut_metadata.pkb +++ b/source/core/ut_metadata.pkb @@ -39,7 +39,7 @@ create or replace package body ut_metadata as l_view_name varchar2(200) := get_objects_view_name; begin - execute immediate q'[select count(*) + execute immediate q'[select /*+ no_parallel */ count(*) from ]'||l_view_name||q'[ where owner = :a_owner_name and object_name = :a_package_name @@ -58,7 +58,7 @@ create or replace package body ut_metadata as l_view_name varchar2(200) := get_dba_view('dba_procedures'); begin execute immediate - 'select count(*) from '||l_view_name + 'select /*+ no_parallel */ count(*) from '||l_view_name ||' where owner = :l_schema and object_name = :l_package_name and procedure_name = :l_procedure_name and rownum = 1' into l_cnt using a_owner_name, a_package_name, a_procedure_name; @@ -77,7 +77,7 @@ create or replace package body ut_metadata as if not nvl(c_key = g_cached_object, false) then g_cached_object := c_key; execute immediate - 'select trim(text) text + 'select /*+ no_parallel */ trim(text) text from '||l_view_name||q'[ s where s.owner = :a_owner and s.name = :a_object_name @@ -123,7 +123,7 @@ create or replace package body ut_metadata as function user_has_execute_any_proc return boolean is l_has_execute_any varchar2(1); begin - select decode( count( 1 ), 0, 'N', 'Y' ) + select /*+ no_parallel */ decode( count( 1 ), 0, 'N', 'Y' ) into l_has_execute_any from dual where @@ -157,7 +157,7 @@ create or replace package body ut_metadata as l_cnt number; c_current_schema constant all_tables.owner%type := sys_context('USERENV','CURRENT_SCHEMA'); begin - select count(*) + select /*+ no_parallel */ count(*) into l_cnt from all_objects t where t.object_name = a_object_name diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index 06c4c76a5..ebc9a839d 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -79,7 +79,7 @@ create or replace package body ut_suite_cache_manager is union all select obj from logical_suites ) - select c.obj + select /*+ no_parallel */ c.obj from items c order by c.obj.object_owner,{:random_seed:}]'; @@ -89,7 +89,7 @@ create or replace package body ut_suite_cache_manager is begin l_data := ut_annotation_cache_manager.get_cached_objects_list(a_object_owner, 'PACKAGE'); - select i.object_name + select /*+ no_parallel */ i.object_name bulk collect into l_result from ut_suite_cache_package i where not exists ( @@ -172,7 +172,7 @@ create or replace package body ut_suite_cache_manager is 'nls_sort=binary' )desc nulls last, case when c.obj.self_type = 'UT_SUITE_CONTEXT' then - ( select max( x.line_no ) + 1 + ( select /*+ no_parallel */ max( x.line_no ) + 1 from ut_suite_cache x where c.obj.object_owner = x.object_owner and c.obj.object_name = x.object_name @@ -216,18 +216,18 @@ create or replace package body ut_suite_cache_manager is l_procedure_name varchar2(250) := ut_utils.qualified_sql_name(a_procedure_name); begin - select column_value + select /*+ no_parallel */ column_value bulk collect into l_include_tags from table(l_tags) where column_value not like '-%'; - select ltrim(column_value,'-') + select /*+ no_parallel */ ltrim(column_value,'-') bulk collect into l_exclude_tags from table(l_tags) where column_value like '-%'; if a_path is null and a_object_name is not null then - select min(c.path) + select /*+ no_parallel */ min(c.path) into l_path from ut_suite_cache c where c.object_owner = upper(l_object_owner) @@ -258,7 +258,7 @@ create or replace package body ut_suite_cache_manager is function get_schema_parse_time(a_schema_name varchar2) return timestamp result_cache is l_cache_parse_time timestamp; begin - select min(t.parse_time) + select /*+ no_parallel */ min(t.parse_time) into l_cache_parse_time from ut_suite_cache_schema t where object_owner = upper(a_schema_name); @@ -288,7 +288,7 @@ create or replace package body ut_suite_cache_manager is else - select min(parse_time) + select /*+ no_parallel */ min(parse_time) into l_cached_parse_time from ut_suite_cache_package t where t.object_name = l_object_name @@ -296,23 +296,23 @@ create or replace package body ut_suite_cache_manager is if a_parse_time > l_cached_parse_time or l_cached_parse_time is null then - update ut_suite_cache_schema t + update /*+ no_parallel */ ut_suite_cache_schema t set t.parse_time = a_parse_time where object_owner = l_object_owner; if sql%rowcount = 0 then - insert into ut_suite_cache_schema + insert /*+ no_parallel */ into ut_suite_cache_schema (object_owner, parse_time) values (l_object_owner, a_parse_time); end if; - update ut_suite_cache_package t + update /*+ no_parallel */ ut_suite_cache_package t set t.parse_time = a_parse_time where t.object_owner = l_object_owner and t.object_name = l_object_name; if sql%rowcount = 0 then - insert into ut_suite_cache_package + insert /*+ no_parallel */ into ut_suite_cache_package (object_owner, object_name, parse_time) values (l_object_owner, l_object_name, a_parse_time ); end if; @@ -321,7 +321,7 @@ create or replace package body ut_suite_cache_manager is where t.object_owner = l_object_owner and t.object_name = l_object_name; - insert into ut_suite_cache t + insert /*+ no_parallel */ into ut_suite_cache t ( id, self_type, path, object_owner, object_name, name, line_no, parse_time, description, @@ -336,7 +336,7 @@ create or replace package body ut_suite_cache_manager is select treat(value(x) as ut_suite) i from table(a_suite_items) x where x.self_type in( 'UT_SUITE', 'UT_SUITE_CONTEXT' ) ) - select ut_suite_cache_seq.nextval, s.i.self_type as self_type, s.i.path as path, + select /*+ no_parallel */ ut_suite_cache_seq.nextval, s.i.self_type as self_type, s.i.path as path, upper(s.i.object_owner) as object_owner, upper(s.i.object_name) as object_name, upper(s.i.name) as name, s.i.line_no as line_no, s.i.parse_time as parse_time, s.i.description as description, s.i.rollback_type as rollback_type, s.i.disabled_flag as disabled_flag, s.i.warnings as warnings, @@ -347,7 +347,7 @@ create or replace package body ut_suite_cache_manager is null item from suites s; - insert into ut_suite_cache t + insert /*+ no_parallel */ into ut_suite_cache t ( id, self_type, path, object_owner, object_name, name, line_no, parse_time, description, @@ -362,7 +362,7 @@ create or replace package body ut_suite_cache_manager is select treat(value(x) as ut_test) t from table ( a_suite_items ) x where x.self_type in ( 'UT_TEST' ) ) - select ut_suite_cache_seq.nextval, s.t.self_type as self_type, s.t.path as path, + select /*+ no_parallel */ ut_suite_cache_seq.nextval, s.t.self_type as self_type, s.t.path as path, upper(s.t.object_owner) as object_owner, upper(s.t.object_name) as object_name, upper(s.t.name) as name, s.t.line_no as line_no, s.t.parse_time as parse_time, s.t.description as description, s.t.rollback_type as rollback_type, s.t.disabled_flag as disabled_flag, s.t.warnings as warnings, @@ -385,13 +385,13 @@ create or replace package body ut_suite_cache_manager is l_objects := get_missing_cache_objects(a_schema_name); if l_objects is not empty then - delete from ut_suite_cache i + delete /*+ no_parallel */ from ut_suite_cache i where i.object_owner = a_schema_name - and i.object_name in ( select column_value from table (l_objects) ); + and i.object_name in ( select /*+ no_parallel */ column_value from table (l_objects) ); - delete from ut_suite_cache_package i + delete /*+ no_parallel */ from ut_suite_cache_package i where i.object_owner = a_schema_name - and i.object_name in ( select column_value from table (l_objects) ); + and i.object_name in ( select /*+ no_parallel */ column_value from table (l_objects) ); end if; commit; @@ -405,7 +405,7 @@ create or replace package body ut_suite_cache_manager is l_results ut_suite_items_info; begin l_cache_rows := get_cached_suite_rows( a_object_owner => a_object_owner, a_object_name =>a_object_name ); - select ut_suite_item_info( + select /*+ no_parallel */ ut_suite_item_info( c.object_owner, c.object_name, c.name, c.description, c.self_type, c.line_no, c.path, c.disabled_flag, c.tags @@ -421,7 +421,7 @@ create or replace package body ut_suite_cache_manager is ) return ut_object_names is l_results ut_object_names; begin - select ut_object_name( c.object_owner, c.object_name ) + select /*+ no_parallel */ ut_object_name( c.object_owner, c.object_name ) bulk collect into l_results from ut_suite_cache_package c join table ( a_schema_names ) s @@ -437,7 +437,7 @@ create or replace package body ut_suite_cache_manager is l_count integer; begin if a_procedure_name is not null then - select count( 1 ) into l_count from dual + select /*+ no_parallel */ count( 1 ) into l_count from dual where exists( select 1 from ut_suite_cache c @@ -446,7 +446,7 @@ create or replace package body ut_suite_cache_manager is and c.name = a_procedure_name ); elsif a_package_name is not null then - select count( 1 ) into l_count from dual + select /*+ no_parallel */ count( 1 ) into l_count from dual where exists( select 1 from ut_suite_cache c @@ -454,7 +454,7 @@ create or replace package body ut_suite_cache_manager is and c.object_name = a_package_name ); else - select count( 1 ) into l_count from dual + select /*+ no_parallel */ count( 1 ) into l_count from dual where exists( select 1 from ut_suite_cache c diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 603e713ec..60c33f21f 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -353,10 +353,10 @@ create or replace package body ut_suite_manager is ); if a_skip_all_objects then open l_result for - select c.* from table(l_unfiltered_rows) c; + select /*+ no_parallel */ c.* from table(l_unfiltered_rows) c; else open l_result for - select c.* from table(l_unfiltered_rows) c + select /*+ no_parallel */ c.* from table(l_unfiltered_rows) c where exists ( select 1 from all_objects a @@ -596,12 +596,12 @@ create or replace package body ut_suite_manager is l_all_suite_info := ut_suite_cache_manager.get_cached_suite_info( l_owner_name, l_package_name ); if can_skip_all_objects_scan( l_owner_name ) then open l_result for - select value(c) + select /*+ no_parallel */ value(c) from table(l_all_suite_info) c order by c.object_owner, c.object_name, c.item_line_no; else open l_result for - select value(c) + select /*+ no_parallel */ value(c) from table(l_all_suite_info) c where exists ( select 1 @@ -631,7 +631,7 @@ create or replace package body ut_suite_manager is refresh_cache(l_owner_name); l_item_exists := ut_suite_cache_manager.suite_item_exists( l_owner_name, l_package_name, l_procedure_name ); if not can_skip_all_objects_scan( l_owner_name ) and l_package_name is not null then - select count(1) + select /*+ no_parallel */ count(1) into l_count from dual c where exists diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 69e6c4725..fa7d229aa 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -350,7 +350,7 @@ create or replace package body ut_utils is function get_utplsql_objects_list return ut_object_names is l_result ut_object_names; begin - select distinct ut_object_name(sys_context('userenv','current_user'), o.object_name) + select /*+ no_parallel */ distinct ut_object_name(sys_context('userenv','current_user'), o.object_name) bulk collect into l_result from user_objects o where o.object_name = 'UT' or object_name like 'UT\_%' escape '\' @@ -532,8 +532,8 @@ create or replace package body ut_utils is procedure flush_lines(a_lines ut_varchar2_rows, a_offset integer) is begin if a_lines is not empty then - insert into ut_dbms_output_cache (seq_no,text) - select rownum+a_offset, column_value + insert /*+ no_parallel */ into ut_dbms_output_cache (seq_no,text) + select /*+ no_parallel */ rownum+a_offset, column_value from table(a_lines); end if; end; @@ -558,7 +558,7 @@ create or replace package body ut_utils is c_lines_limit constant integer := 10000; pragma autonomous_transaction; begin - open l_lines_data for select text from ut_dbms_output_cache order by seq_no; + open l_lines_data for select /*+ no_parallel */ text from ut_dbms_output_cache order by seq_no; loop fetch l_lines_data bulk collect into l_lines limit c_lines_limit; for i in 1 .. l_lines.count loop @@ -646,10 +646,10 @@ create or replace package body ut_utils is function xmlgen_escaped_string(a_string in varchar2) return varchar2 is l_result varchar2(4000) := a_string; - l_sql varchar2(32767) := q'!select q'[!'||a_string||q'!]' as "!'||a_string||'" from dual'; + l_sql varchar2(32767) := q'!select /*+ no_parallel */ q'[!'||a_string||q'!]' as "!'||a_string||'" from dual'; begin if a_string is not null then - select extract(dbms_xmlgen.getxmltype(l_sql),'/*/*/*').getRootElement() + select /*+ no_parallel */ extract(dbms_xmlgen.getxmltype(l_sql),'/*/*/*').getRootElement() into l_result from dual; end if; @@ -753,7 +753,7 @@ create or replace package body ut_utils is l_for_reporters := ut_reporters_info(ut_reporter_info('UT_REPORTER_BASE','N','N','N')); end if; - select /*+ cardinality(f 10) */ + select /*+ no_parallel cardinality(f 10) */ ut_reporter_info( object_name => t.type_name, is_output_reporter => @@ -801,7 +801,7 @@ create or replace package body ut_utils is function build_valid_xml_name(a_preprocessed_name varchar2) return varchar2 is l_post_processed varchar2(4000); begin - for i in (select regexp_substr( a_preprocessed_name ,'(.{1})', 1, level, null, 1 ) AS string_char,level level_no + for i in (select /*+ no_parallel */ regexp_substr( a_preprocessed_name ,'(.{1})', 1, level, null, 1 ) AS string_char,level level_no from dual connect by level <= regexp_count(a_preprocessed_name, '(.{1})')) loop if i.level_no = 1 and regexp_like(i.string_char,gc_invalid_first_xml_char) then diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 69ba90811..657c02ce3 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -61,7 +61,7 @@ create or replace package body ut_compound_data_helper is where x.data_id = :act_guid ) ucd ) - select + select /*+ no_parallel */ a."UT3$_Item#Data" as act_item_data, a."UT3$_Data#Id" act_data_id, e."UT3$_Item#Data" as exp_item_data, @@ -103,7 +103,7 @@ create or replace package body ut_compound_data_helper is full outer join actual_cols a on e.exp_column_name = a.act_column_name ) - select case + select /*+ no_parallel */ case when exp_col_pos is null and act_col_pos is not null then '+' when exp_col_pos is not null and act_col_pos is null then '-' when exp_col_type_compare != act_col_type_compare then 't' @@ -486,7 +486,7 @@ create or replace package body ut_compound_data_helper is ) unpivot ( data_item for diff_type in (exp_item as 'Expected:', act_item as 'Actual:') ) ) - select rn, diff_type, diffed_row, pk_value + select /*+ no_parallel */ rn, diff_type, diffed_row, pk_value from ( select rn, diff_type, diffed_row, pk_value, case when diff_type = 'Actual:' then 1 else 2 end rnk, @@ -564,7 +564,7 @@ create or replace package body ut_compound_data_helper is procedure insert_diffs_result(a_diff_tab t_diff_tab, a_diff_id raw) is begin forall idx in 1..a_diff_tab.count save exceptions - insert into ut_compound_data_diff_tmp + insert /*+ no_parallel */ into ut_compound_data_diff_tmp ( diff_id, act_item_data, act_data_id, exp_item_data, exp_data_id, item_no, duplicate_no ) values (a_diff_id, @@ -639,13 +639,13 @@ create or replace package body ut_compound_data_helper is procedure save_cursor_data_for_diff(a_data_id raw, a_set_id integer, a_xml xmltype) is begin - insert into ut_compound_data_tmp (data_id, item_no, item_data) values (a_data_id, a_set_id, a_xml); + insert /*+ no_parallel */ into ut_compound_data_tmp (data_id, item_no, item_data) values (a_data_id, a_set_id, a_xml); end; function get_row_data_as_xml(a_data_id raw, a_max_rows integer) return ut_utils.t_clob_tab is l_results ut_utils.t_clob_tab; begin - select xmlserialize( content ucd.item_data no indent) + select /*+ no_parallel */ xmlserialize( content ucd.item_data no indent) bulk collect into l_results from ut_compound_data_tmp tmp ,xmltable ( '/ROWSET' passing tmp.item_data @@ -720,7 +720,7 @@ create or replace package body ut_compound_data_helper is or (a.json_type != e.json_type) or (decode(a.element_value,e.element_value,1,0) = 0) ) - select difference_type, + select /*+ no_parallel */ difference_type, act_element_name, act_element_value, act_json_type, act_access_path, act_parent_path, exp_element_name, exp_element_value, exp_json_type, exp_access_path, exp_parent_path bulk collect into l_result_diff @@ -742,7 +742,7 @@ create or replace package body ut_compound_data_helper is l_diffs tt_json_diff_tab := compare_json_data(a_act_json_data,a_exp_json_data); begin forall i in 1..l_diffs.count - insert into ut_json_data_diff_tmp ( + insert /*+ no_parallel */ into ut_json_data_diff_tmp ( diff_id, difference_type, act_element_name, act_element_value, act_json_type, act_access_path, act_parent_path, exp_element_name, exp_element_value, exp_json_type, exp_access_path, exp_parent_path @@ -759,7 +759,7 @@ create or replace package body ut_compound_data_helper is function get_json_diffs_type(a_diff_id raw) return tt_json_diff_type_tab is l_diffs_summary tt_json_diff_type_tab := tt_json_diff_type_tab(); begin - select d.difference_type,count(1) + select /*+ no_parallel */ d.difference_type,count(1) bulk collect into l_diffs_summary from ut_json_data_diff_tmp d where diff_id = a_diff_id @@ -771,7 +771,7 @@ create or replace package body ut_compound_data_helper is function get_json_diffs_tmp(a_diff_id raw) return tt_json_diff_tab is l_diffs tt_json_diff_tab; begin - select difference_type, + select /*+ no_parallel */ difference_type, act_element_name, act_element_value, act_json_type, act_access_path, act_parent_path, exp_element_name, exp_element_value, exp_json_type, exp_access_path, exp_parent_path bulk collect into l_diffs diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb index 20313ed96..adc705f65 100644 --- a/source/expectations/data_values/ut_cursor_details.tpb +++ b/source/expectations/data_values/ut_cursor_details.tpb @@ -3,7 +3,7 @@ create or replace type body ut_cursor_details as member function equals( a_other ut_cursor_details, a_match_options ut_matcher_options ) return boolean is l_diffs integer; begin - select count(1) into l_diffs + select /*+ no_parallel */ count(1) into l_diffs from table(self.cursor_columns_info) a full outer join table(a_other.cursor_columns_info) e on decode(a.parent_name,e.parent_name,1,0)= 1 @@ -139,7 +139,7 @@ create or replace type body ut_cursor_details as member function contains_collection return boolean is l_collection_elements number; begin - select count(1) into l_collection_elements + select /*+ no_parallel */ count(1) into l_collection_elements from table(cursor_columns_info) c where c.is_collection = 1 and rownum = 1; return l_collection_elements > 0; @@ -149,7 +149,7 @@ create or replace type body ut_cursor_details as l_result ut_varchar2_list; begin --regexp_replace(c.access_path,'^\/?([^\/]+\/){1}') - select fl.column_value + select /*+ no_parallel */ fl.column_value bulk collect into l_result from table(a_expected_columns) fl where not exists ( @@ -179,7 +179,7 @@ create or replace type body ut_cursor_details as select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names from table(a_match_options.exclude.items) ) - select value(x) + select /*+ no_parallel */ value(x) bulk collect into l_result.cursor_columns_info from table(self.cursor_columns_info) x where exists( @@ -192,7 +192,7 @@ create or replace type body ut_cursor_details as select regexp_replace( column_value, c_xpath_extract_reg, '\5' ) col_names from table(a_match_options.exclude.items) ) - select value(x) + select /*+ no_parallel */ value(x) bulk collect into l_result.cursor_columns_info from table(self.cursor_columns_info) x where not exists( @@ -202,7 +202,7 @@ create or replace type body ut_cursor_details as --Rewrite column order after columns been excluded for i in ( - select parent_name, access_path, display_path, has_nested_col, + select /*+ no_parallel */ parent_name, access_path, display_path, has_nested_col, transformed_name, hierarchy_level, rownum as new_position, xml_valid_name, column_name, column_type, column_type_name, column_schema, @@ -224,7 +224,7 @@ create or replace type body ut_cursor_details as member function get_xml_children(a_parent_name varchar2 := null) return xmltype is l_result xmltype; begin - select xmlagg(xmlelement(evalname t.column_name,t.column_type_name)) + select /*+ no_parallel */ xmlagg(xmlelement(evalname t.column_name,t.column_type_name)) into l_result from table(self.cursor_columns_info) t where (a_parent_name is null and parent_name is null and hierarchy_level = 1 and column_name is not null) @@ -236,7 +236,7 @@ create or replace type body ut_cursor_details as l_root varchar2(250); begin if self.cursor_columns_info.count > 0 then - select x.access_path into l_root from table(self.cursor_columns_info) x + select /*+ no_parallel */ x.access_path into l_root from table(self.cursor_columns_info) x where x.hierarchy_level = 1; else l_root := null; diff --git a/source/expectations/data_values/ut_data_value_anydata.tpb b/source/expectations/data_values/ut_data_value_anydata.tpb index a81b0f5c7..bb52159e0 100644 --- a/source/expectations/data_values/ut_data_value_anydata.tpb +++ b/source/expectations/data_values/ut_data_value_anydata.tpb @@ -48,11 +48,11 @@ create or replace type body ut_data_value_anydata as begin l_status := l_value.get'||self.compound_type||'(l_data); '|| case when self.compound_type = 'collection' then - q'[ open :l_tmp_refcursor for select value(x) as "]'|| + q'[ open :l_tmp_refcursor for select /*+ no_parallel */ value(x) as "]'|| ut_metadata.get_object_name(ut_metadata.get_collection_element(a_data_value))|| q'[" from table(l_data) x;]' else - q'[ open :l_tmp_refcursor for select l_data as "]'||ut_metadata.get_object_name(self.data_type)|| + q'[ open :l_tmp_refcursor for select /*+ no_parallel */ l_data as "]'||ut_metadata.get_object_name(self.data_type)|| q'[" from dual;]' end || 'end;'; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 801b35802..da5c1a381 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -178,7 +178,7 @@ create or replace type body ut_data_value_refcursor as l_missing_cols(l_missing_cols.last) := coalesce(a_column_diffs(i).expected_name, a_column_diffs(i).actual_name); end if; end loop; - select value(i) bulk collect into l_result + select /*+ no_parallel */ value(i) bulk collect into l_result from table(a_cursor_details) i where i.access_path not in ( select c.column_value diff --git a/source/reporters/ut_debug_reporter.tpb b/source/reporters/ut_debug_reporter.tpb index 365f77755..5f457bb79 100644 --- a/source/reporters/ut_debug_reporter.tpb +++ b/source/reporters/ut_debug_reporter.tpb @@ -71,7 +71,7 @@ create or replace type body ut_debug_reporter is member function event_item_to_clob(a_event_item ut_event_item) return clob is l_clob clob; begin - select xmlserialize( content deletexml(xmltype(a_event_item),'/*/ITEMS|/*/ALL_EXPECTATIONS|/*/FAILED_EXPECTATIONS') as clob indent size = 2 ) into l_clob from dual; + select /*+ no_parallel */ xmlserialize( content deletexml(xmltype(a_event_item),'/*/ITEMS|/*/ALL_EXPECTATIONS|/*/FAILED_EXPECTATIONS') as clob indent size = 2 ) into l_clob from dual; return l_clob; end; From c930ba6885d74d73890876ab478b55041a40f5cf Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sun, 7 Nov 2021 21:10:05 +0000 Subject: [PATCH 0766/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 46014790f..58e628fdf 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 6514efb62..6f1301ebc 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index b2bdb573c..32f61f685 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 7a951b76d..a7f46d889 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 65934b0e8..11cef2063 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 7b9cfa641..2d368ece8 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 6eb8b1b6c..bbcadda92 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index ded4b085c..20be24aab 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index f514b031c..a154c1063 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index a063f45d2..6f62e6621 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 670ce1741..9805c8882 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 86ec6a4c7..8de75e8b9 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 8b99a5e0f..7123d71e7 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index ebc5b12b9..043589462 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 70e0952b3..3ba0f209a 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 63a9e0de4..2d3e786a0 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 5a62efd2b..dfb729941 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3495--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 69e6c4725..bdc46c952 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -788,7 +788,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.11.3495-develop + * secion v3.1.11.3502-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 3f5631aab..6e4faea13 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.11.3495-develop'; + gc_version constant varchar2(50) := 'v3.1.11.3502-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 45d1d5b9b32fc1a94d2c525e807c7d863c61732f Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 9 Nov 2021 00:03:38 +0200 Subject: [PATCH 0767/1096] Improved build speed by ~1.5 minute Added bind mount to DB docker at runtime to enable faster execution of scripts Removed need for sqlcl locally in build Added download of ojdbc and orai18n directly without click-through Cleanup of build scripts to make them more TRAVIS-agnostic --- .travis.yml | 40 +++++++++---- .travis/coveralls_uploader.js | 2 +- .travis/install.sh | 5 +- .travis/install_sqlcl.sh | 20 ------- .travis/install_utplsql_release.sh | 4 +- .travis/push_docs_to_github_io.sh | 10 ++-- .travis/push_release_version.sh | 4 +- .travis/run_examples.sh | 4 +- .travis/run_sonar_scanner.sh | 16 ++--- .travis/start_db.sh | 5 +- .travis/validate_report_files.sh | 4 +- development/template.env.sh | 3 +- test/install_tests.sh | 6 +- .../reporters/test_documentation_reporter.pkb | 60 ++++++++++++++++++- 14 files changed, 118 insertions(+), 65 deletions(-) delete mode 100755 .travis/install_sqlcl.sh diff --git a/.travis.yml b/.travis.yml index 7d04693e0..d51089389 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,15 @@ env: - UT3_TESTER_HELPER=UT3_TESTER_HELPER - UT3_TESTER_HELPER_PASSWORD=ut3 - UT3_TABLESPACE=users + - BUILD_DIR=${TRAVIS_BUILD_DIR} + - JOB_ID=${TRAVIS_JOB_ID} + - JOB_NUMBER=${TRAVIS_JOB_NUMBER} + - PULL_REQUEST_NAME=${TRAVIS_PULL_REQUEST} + - PULL_REQUEST_BRANCH=${TRAVIS_PULL_REQUEST_BRANCH} + - TAG_NAME=${TRAVIS_TAG} + - REPO_SLUG=${TRAVIS_REPO_SLUG} + - PR_SLUG=${TRAVIS_PULL_REQUEST_SLUG} + - BRANCH_NAME=${TRAVIS_BRANCH} # Environment for building a release - CURRENT_BRANCH=${TRAVIS_BRANCH} - UTPLSQL_REPO="utPLSQL/utPLSQL" @@ -35,11 +44,13 @@ env: - UTPLSQL_BUILD_USER_NAME="Travis CI" - CACHE_DIR=$HOME/.cache # Database Env - - SQLCLI="$HOME/sqlcl/bin/sql" - - OJDBC_HOME="$HOME/sqlcl/lib" + - SQLCLI="${BUILD_DIR}/sqlcl/bin/sql" + - OJDBC_HOME="${BUILD_DIR}/ojdbc" - ORACLE_PWD="oracle" - UT3_DOCKER_REPO="utplsqlv3/oracledb" - DOCKHER_HUB_REPO="${DOCKER_BASE_TAG:-$UT3_DOCKER_REPO}" + - DOCKER_VOLUME="/home/oracle/host" + - DOCKER_ENV="-e SQLCLI=sqlplus -e UT3_DEVELOP_SCHEMA -e UT3_DEVELOP_SCHEMA_PASSWORD -e UT3_RELEASE_VERSION_SCHEMA -e UT3_RELEASE_VERSION_SCHEMA_PASSWORD -e UT3_USER -e UT3_USER_PASSWORD -e UT3_TESTER -e UT3_TESTER_PASSWORD -e UT3_TESTER_HELPER -e UT3_TESTER_HELPER_PASSWORD -e UT3_TABLESPACE -e ORACLE_PWD -e CONNECTION_STR -e UTPLSQL_DIR" #utPLSQL released version directory - UTPLSQL_DIR="utPLSQL_latest_release" - SELFTESTING_BRANCH=${TRAVIS_BRANCH} @@ -47,13 +58,13 @@ env: # Maven - MAVEN_HOME=/usr/local/maven - MAVEN_CFG=$HOME/.m2 - matrix: - - ORACLE_VERSION="${DOCKER_TAG_11G:-11g-r2-xe}" CONNECTION_STR='127.0.0.1:1521/XE' DOCKER_OPTIONS='--shm-size=1g' + jobs: + - ORACLE_VERSION="${DOCKER_TAG_11G:-11g-r2-xe}" CONNECTION_STR='127.0.0.1:1521/XE' DOCKER_VOLUME="/mnt/host" DOCKER_OPTIONS='--shm-size=1g' - ORACLE_VERSION="${DOCKER_TAG_12C:-12c-r1-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' - ORACLE_VERSION="${DOCKER_TAG_12C2:-12c-r2-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' - ORACLE_VERSION="${DOCKER_TAG_18:-18c-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' - ORACLE_VERSION="${DOCKER_TAG_19:-19c-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' - - ORACLE_VERSION="${DOCKER_TAG_21XE:-21c-xe-full}" CONNECTION_STR='127.0.0.1:1521/XEPDB1' DOCKER_OPTIONS='-e ORACLE_PASSWORD=oracle' + - ORACLE_VERSION="${DOCKER_TAG_21XE:-21c-xe-full}" CONNECTION_STR='127.0.0.1:1521/XEPDB1' DOCKER_OPTIONS='-e ORACLE_PASSWORD=oracle' cache: pip: true @@ -73,24 +84,29 @@ before_install: #Allow for sonar to blame issues - git fetch --unshallow # download latest utPLSQL release - #- curl -LOk $(curl --silent https://api.github.com/repos/utPLSQL/utPLSQL/releases/latest | awk '/browser_download_url/ { print $2 }' | grep ".zip" | sed 's/"//g') - git clone --depth=1 --branch=${SELFTESTING_BRANCH:-main} https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR # download latest utPLSQL-cli release - curl -Lk -o utPLSQL-cli.zip https://github.com/utPLSQL/utPLSQL-cli/releases/download/v${UTPLSQL_CLI_VERSION}/utPLSQL-cli.zip install: - #- unzip utPLSQL.zip - unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli - - bash .travis/install_sqlcl.sh +# - curl -Lk -o sqlcl-latest.zip https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-latest.zip +# - unzip -q sqlcl-latest.zip -d $HOME + - mkdir -p ${OJDBC_HOME} #get JDBC driver and orai18n + - curl -Lk -o ${OJDBC_HOME}/ojdbc8.jar https://download.oracle.com/otn-pub/otn_software/jdbc/213/ojdbc8.jar + - curl -Lk -o ${OJDBC_HOME}/orai18n.jar https://download.oracle.com/otn-pub/otn_software/jdbc/213/orai18n.jar + # Chmod is needed to allow for write access within from docker container volume + - chmod -R go+w ./{source,test,examples,${UTPLSQL_DIR}/source} - if [[ ! $TRAVIS_TAG ]]; then bash .travis/start_db.sh; fi + - if [[ ! $TRAVIS_TAG ]]; then docker exec ${ORACLE_VERSION} ${DOCKER_VOLUME}/.travis/install.sh; fi + - if [[ ! $TRAVIS_TAG ]]; then docker exec ${ORACLE_VERSION} ${DOCKER_VOLUME}/.travis/install_utplsql_release.sh; fi before_script: - - if [[ ! $TRAVIS_TAG ]]; then bash .travis/install.sh; fi - - if [[ ! $TRAVIS_TAG ]]; then bash .travis/install_utplsql_release.sh; fi - - if [[ ! $TRAVIS_TAG ]]; then bash .travis/run_examples.sh; fi + - if [[ ! $TRAVIS_TAG ]]; then docker exec ${ORACLE_VERSION} ${DOCKER_VOLUME}/.travis/run_examples.sh; fi + - if [[ ! $TRAVIS_TAG ]]; then docker exec ${ORACLE_VERSION} ${DOCKER_VOLUME}/test/install_tests.sh; fi script: - - if [[ ! $TRAVIS_TAG ]]; then bash test/install_and_run_tests.sh; fi + - if [[ ! $TRAVIS_TAG ]]; then bash test/run_tests.sh; fi - if [[ ! $TRAVIS_TAG ]]; then bash .travis/validate_report_files.sh; fi - if [[ ! $TRAVIS_TAG ]] && [[ ("${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" && "${TRAVIS_PULL_REQUEST}" == false) || ("${TRAVIS_PULL_REQUEST_SLUG}" = "${UTPLSQL_REPO}") ]]; then bash .travis/run_sonar_scanner.sh; fi - if [[ ! $TRAVIS_TAG ]]; then bash .travis/coveralls_uploader.sh; fi diff --git a/.travis/coveralls_uploader.js b/.travis/coveralls_uploader.js index ad6eeee74..182f84066 100644 --- a/.travis/coveralls_uploader.js +++ b/.travis/coveralls_uploader.js @@ -14,7 +14,7 @@ fs.readFile('../coverage.json',function (err,data) { return console.log(err); } req = JSON.parse(data); - req.service_job_id = process.env.TRAVIS_JOB_ID; + req.service_job_id = process.env.JOB_ID; req.service_name = 'travis-ci'; if (process.env.COVERALLS_REPO_TOKEN) { req.repo_token = process.env.COVERALLS_REPO_TOKEN; diff --git a/.travis/install.sh b/.travis/install.sh index 537fddb66..603cb7d1e 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -1,7 +1,8 @@ #!/bin/bash -cd source set -ev +SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" +cd ${SCRIPT_DIR}/../source INSTALL_FILE="install_headless_with_trigger.sql" if [[ ! -f "${INSTALL_FILE}" ]]; then @@ -20,7 +21,7 @@ alter session set plsql_optimize_level=0; SQL #Run this step only on second child job (12.1 - at it's fastest) -if [[ "${TRAVIS_JOB_NUMBER}" =~ \.2$ ]]; then +if [[ "${JOB_NUMBER}" =~ \.2$ ]]; then #check code-style for errors time "$SQLCLI" $UT3_DEVELOP_SCHEMA/$UT3_DEVELOP_SCHEMA_PASSWORD@//$CONNECTION_STR @../development/utplsql_style_check.sql diff --git a/.travis/install_sqlcl.sh b/.travis/install_sqlcl.sh deleted file mode 100755 index 9743ddac2..000000000 --- a/.travis/install_sqlcl.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -set -e - -SQLCL_FILE=sqlcl-18.3.0.259.2029.zip -cd .travis - -# Download if not present on cache dir. -if [ ! -f $CACHE_DIR/$SQLCL_FILE ]; then - npm install -g phantomjs-prebuilt casperjs - bash download.sh -p sqlcl - mv $SQLCL_FILE $CACHE_DIR -else - echo "Installing sqlcl from cache..." -fi; - -# Install sqlcl. -unzip -q $CACHE_DIR/$SQLCL_FILE -d $HOME - -# Check if it is installed correctly. -$SQLCLI -v diff --git a/.travis/install_utplsql_release.sh b/.travis/install_utplsql_release.sh index 12ec50118..fea162f8f 100755 --- a/.travis/install_utplsql_release.sh +++ b/.travis/install_utplsql_release.sh @@ -1,8 +1,8 @@ #!/bin/bash set -ev - -cd $UTPLSQL_DIR/source +SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" +cd ${SCRIPT_DIR}/../${UTPLSQL_DIR}/source "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <>index.md fi #If build running on a TAG - it's a new release - need to add it to documentation - if [ -n "${TRAVIS_TAG}" ]; then - sed -i '7s@.*@'" - [Latest ${TRAVIS_TAG} documentation](latest/) - Created $now"'@' index.md + if [ -n "${TAG_NAME}" ]; then + sed -i '7s@.*@'" - [Latest ${TAG_NAME} documentation](latest/) - Created $now"'@' index.md #add entry to the top of version history (line end of file - ## Released Version Doc History - sed -i '12i'" - [${TRAVIS_TAG} documentation](${UTPLSQL_VERSION}/) - Created $now" index.md + sed -i '12i'" - [${TAG_NAME} documentation](${UTPLSQL_VERSION}/) - Created $now" index.md fi #replace 4th line in log sed -i '8s@.*@'" - [Latest development version](develop/) - Created $now"'@' index.md diff --git a/.travis/push_release_version.sh b/.travis/push_release_version.sh index 082359af4..f4ca8f819 100755 --- a/.travis/push_release_version.sh +++ b/.travis/push_release_version.sh @@ -3,7 +3,7 @@ # We are updating version number only when: # - not a pull request # - branch name is = develop or branch name is like release/vX.X.X... -if [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [[ "${CURRENT_BRANCH}" =~ ^(release/v[0-9]+\.[0-9]+\.[0-9]+.*|develop)$ ]]; then +if [ "${REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [ "${PULL_REQUEST_NAME}" == "false" ] && [[ "${CURRENT_BRANCH}" =~ ^(release/v[0-9]+\.[0-9]+\.[0-9]+.*|develop)$ ]]; then echo Current branch is "${CURRENT_BRANCH}" echo "Committing version & buildNo into branch (${CURRENT_BRANCH})" git add sonar-project.properties @@ -14,5 +14,5 @@ if [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [ "$TRAVIS_PULL_REQUEST" == echo "Pushing to origin" git push --quiet origin HEAD:${CURRENT_BRANCH} else - echo "Publishing of version skipped for branch ${CURRENT_BRANCH}, pull request ${TRAVIS_PULL_REQUEST}" + echo "Publishing of version skipped for branch ${CURRENT_BRANCH}, pull request ${PULL_REQUEST_NAME}" fi diff --git a/.travis/run_examples.sh b/.travis/run_examples.sh index 935037245..8eb3d097f 100755 --- a/.travis/run_examples.sh +++ b/.travis/run_examples.sh @@ -1,8 +1,8 @@ #!/bin/bash -cd "$(dirname "$(readlink -f "$0")")"/../examples - set -ev +SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" +cd ${SCRIPT_DIR}/../examples "$SQLCLI" $UT3_DEVELOP_SCHEMA/$UT3_DEVELOP_SCHEMA_PASSWORD@//$CONNECTION_STR <> sonar-project.properties - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then + if [ "${PULL_REQUEST_NAME}" == "false" ]; then echo "Updating sonar properties to include branch ${BRANCH}" add_sonar_property "${BRANCH_SONAR_PROPERTY}" "${BRANCH}" add_sonar_property "${BRANCH_SONAR_TARGET_PROPERTY}" "${MAIN_DEV_BRANCH}" - elif [ "${TRAVIS_PULL_REQUEST_SLUG}" = "${TRAVIS_REPO_SLUG}" ]; then + elif [ "${PR_SLUG}" = "${REPO_SLUG}" ]; then echo "Updating sonar properties to include pull request ${BRANCH}" add_sonar_property "${PR_SONAR_TOKEN_PROPERTY}" "${GITHUB_TRAVISCI_TOKEN}" add_sonar_property "${PR_SONAR_BRANCH_PROPERTY}" "${BRANCH}" diff --git a/.travis/start_db.sh b/.travis/start_db.sh index e42656987..285f8172f 100755 --- a/.travis/start_db.sh +++ b/.travis/start_db.sh @@ -10,9 +10,6 @@ else mkdir -p $HOME/.docker && cp $CACHE_DIR/.docker/config.json $HOME/.docker/ fi -df -h time docker pull $DOCKHER_HUB_REPO:$ORACLE_VERSION -df -h -docker run -d --name $ORACLE_VERSION $DOCKER_OPTIONS -p 1521:1521 $DOCKHER_HUB_REPO:$ORACLE_VERSION +docker run -d --name $ORACLE_VERSION --mount type=bind,source=${BUILD_DIR},target=${DOCKER_VOLUME} $DOCKER_OPTIONS $DOCKER_ENV -p 1521:1521 $DOCKHER_HUB_REPO:$ORACLE_VERSION time docker logs -f $ORACLE_VERSION | grep -m 1 "DATABASE IS READY TO USE!" --line-buffered -df -h diff --git a/.travis/validate_report_files.sh b/.travis/validate_report_files.sh index 621297a0b..7c7d1354d 100755 --- a/.travis/validate_report_files.sh +++ b/.travis/validate_report_files.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash GL_VALID=1 -XSD_DIR="$TRAVIS_BUILD_DIR/.travis/xsd" -XML_JAR_DIR="$TRAVIS_BUILD_DIR/.travis/lib" +XSD_DIR="$BUILD_DIR/.travis/xsd" +XML_JAR_DIR="$BUILD_DIR/.travis/lib" #XML Validator XML_VALIDATOR="$XML_JAR_DIR/xml_validator.jar" HTML_VALIDATOR_URL="https://validator.w3.org/nu/" diff --git a/development/template.env.sh b/development/template.env.sh index 5e1aaad1a..521d9343d 100755 --- a/development/template.env.sh +++ b/development/template.env.sh @@ -2,7 +2,7 @@ export SQLCLI=sql # For sqlcl client #export SQLCLI=sqlplus # For sqlplus client -export CONNECTION_STR=127.0.0.1:1521/xe # Adjust the connect string +export CONNECTION_STR=127.0.0.1:1521/xe ORACLE_VERSION=11g-r2-xe# Adjust the connect string export ORACLE_PWD=oracle # Adjust your local SYS password export UTPLSQL_CLI_VERSION="3.1.6" export SELFTESTING_BRANCH=develop @@ -19,3 +19,4 @@ export UT3_TESTER_HELPER_PASSWORD=ut3 export UT3_TABLESPACE=users export UT3_USER="UT3\$USER#" export UT3_USER_PASSWORD=ut3 +export DOCKER_ENV="-e SQLCLI=sqlplus -e UT3_DEVELOP_SCHEMA -e UT3_DEVELOP_SCHEMA_PASSWORD -e UT3_RELEASE_VERSION_SCHEMA -e UT3_RELEASE_VERSION_SCHEMA_PASSWORD -e UT3_USER -e UT3_USER_PASSWORD -e UT3_TESTER -e UT3_TESTER_PASSWORD -e UT3_TESTER_HELPER -e UT3_TESTER_HELPER_PASSWORD -e UT3_TABLESPACE -e ORACLE_PWD -e CONNECTION_STR -e UTPLSQL_DIR" diff --git a/test/install_tests.sh b/test/install_tests.sh index e07b4d2b3..4ccc312e8 100755 --- a/test/install_tests.sh +++ b/test/install_tests.sh @@ -1,9 +1,9 @@ #!/bin/bash set -ev -#goto git root directory -git rev-parse && cd "$(git rev-parse --show-cdup)" -cd test +SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" +cd ${SCRIPT_DIR} + "$SQLCLI" ${UT3_TESTER_HELPER}/${UT3_TESTER_HELPER_PASSWORD}@//${CONNECTION_STR} @install_ut3_tester_helper.sql diff --git a/test/ut3_user/reporters/test_documentation_reporter.pkb b/test/ut3_user/reporters/test_documentation_reporter.pkb index 456fa86f9..03759fe6a 100644 --- a/test/ut3_user/reporters/test_documentation_reporter.pkb +++ b/test/ut3_user/reporters/test_documentation_reporter.pkb @@ -1 +1,59 @@ -create or replace package body test_documentation_reporter as procedure report_produces_expected_out is l_results ut3_develop.ut_varchar2_list; l_actual clob; l_expected varchar2(32767):=q'[%org utplsql tests helpers A suite for testing different outcomes from reporters A description of some context passing_test [% sec] a test with failing assertion [% sec] (FAILED - 1) a test raising unhandled exception [% sec] (FAILED - 2) a disabled test [0 sec] (DISABLED) % Failures: % 1) failing_test "Fails as values are different" Actual: 'number [1] ' (varchar2) was expected to equal: 'number [2] ' (varchar2)% at "UT3$USER#.TEST_REPORTERS%", line 36 ut3_develop.ut.expect('number [1] ','Fails as values are different').to_equal('number [2] '); % % 2) erroring_test ORA-06502: PL/SQL: numeric or value error: character to number conversion error ORA-06512: at "UT3$USER#.TEST_REPORTERS", line 44% ORA-06512: at line 6 Finished in % seconds 4 tests, 1 failed, 1 errored, 1 disabled, 0 warning(s)%]'; begin select * bulk collect into l_results from table( ut3_develop.ut.run( 'test_reporters', ut3_develop.ut_documentation_reporter() ) ); l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); ut.expect(l_actual).to_be_like(l_expected); end; end; / \ No newline at end of file +create or replace package body test_documentation_reporter as + + procedure report_produces_expected_out is + l_results ut3_develop.ut_varchar2_list; + l_actual clob; + l_expected varchar2(32767):=q'[%org + utplsql + tests + helpers + A suite for testing different outcomes from reporters + + A description of some context + passing_test [% sec] + + + + + + a test with failing assertion [% sec] (FAILED - 1) + + + + a test raising unhandled exception [% sec] (FAILED - 2) + + + + a disabled test [0 sec] (DISABLED) + +% +Failures: +% + 1) failing_test + "Fails as values are different" + Actual: 'number [1] ' (varchar2) was expected to equal: 'number [2] ' (varchar2)% + at "UT3$USER#.TEST_REPORTERS%", line 36 ut3_develop.ut.expect('number [1] ','Fails as values are different').to_equal('number [2] '); +% +% + 2) erroring_test + ORA-06502: PL/SQL: numeric or value error: character to number conversion error + ORA-06512: at "UT3$USER#.TEST_REPORTERS", line 44% + ORA-06512: at line 6 +Finished in % seconds +4 tests, 1 failed, 1 errored, 1 disabled, 0 warning(s)%]'; + + begin + select * + bulk collect into l_results + from table( + ut3_develop.ut.run( + 'test_reporters', + ut3_develop.ut_documentation_reporter() + ) + ); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + ut.expect(l_actual).to_be_like(l_expected); + end; + +end; +/ From 8080604df0256ab2202c9f64bb67671d55c63710 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 9 Nov 2021 23:44:54 +0200 Subject: [PATCH 0768/1096] Testing build on images from Gerald Venzl --- .travis.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index d51089389..b20bee6c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,8 +47,7 @@ env: - SQLCLI="${BUILD_DIR}/sqlcl/bin/sql" - OJDBC_HOME="${BUILD_DIR}/ojdbc" - ORACLE_PWD="oracle" - - UT3_DOCKER_REPO="utplsqlv3/oracledb" - - DOCKHER_HUB_REPO="${DOCKER_BASE_TAG:-$UT3_DOCKER_REPO}" + - DOCKHER_HUB_REPO="utplsqlv3/oracledb" - DOCKER_VOLUME="/home/oracle/host" - DOCKER_ENV="-e SQLCLI=sqlplus -e UT3_DEVELOP_SCHEMA -e UT3_DEVELOP_SCHEMA_PASSWORD -e UT3_RELEASE_VERSION_SCHEMA -e UT3_RELEASE_VERSION_SCHEMA_PASSWORD -e UT3_USER -e UT3_USER_PASSWORD -e UT3_TESTER -e UT3_TESTER_PASSWORD -e UT3_TESTER_HELPER -e UT3_TESTER_HELPER_PASSWORD -e UT3_TABLESPACE -e ORACLE_PWD -e CONNECTION_STR -e UTPLSQL_DIR" #utPLSQL released version directory @@ -59,12 +58,14 @@ env: - MAVEN_HOME=/usr/local/maven - MAVEN_CFG=$HOME/.m2 jobs: - - ORACLE_VERSION="${DOCKER_TAG_11G:-11g-r2-xe}" CONNECTION_STR='127.0.0.1:1521/XE' DOCKER_VOLUME="/mnt/host" DOCKER_OPTIONS='--shm-size=1g' - - ORACLE_VERSION="${DOCKER_TAG_12C:-12c-r1-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' - - ORACLE_VERSION="${DOCKER_TAG_12C2:-12c-r2-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' - - ORACLE_VERSION="${DOCKER_TAG_18:-18c-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' - - ORACLE_VERSION="${DOCKER_TAG_19:-19c-se2-small}" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' - - ORACLE_VERSION="${DOCKER_TAG_21XE:-21c-xe-full}" CONNECTION_STR='127.0.0.1:1521/XEPDB1' DOCKER_OPTIONS='-e ORACLE_PASSWORD=oracle' + - ORACLE_VERSION="11g-r2-xe" CONNECTION_STR='127.0.0.1:1521/XE' DOCKER_VOLUME="/mnt/host" DOCKER_OPTIONS='--shm-size=1g' + - ORACLE_VERSION="11-slim" CONNECTION_STR='127.0.0.1:1521/XE' DOCKHER_HUB_REPO="gvenzl/oracle-xe" DOCKER_OPTIONS='-e ORACLE_PASSWORD=oracle' DOCKER_VOLUME="/mnt/host" + - ORACLE_VERSION="12c-r1-se2-small" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' + - ORACLE_VERSION="12c-r2-se2-small" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' + - ORACLE_VERSION="18-slim" CONNECTION_STR='127.0.0.1:1521/XEPDB1' DOCKHER_HUB_REPO="gvenzl/oracle-xe" DOCKER_OPTIONS='-e ORACLE_PASSWORD=oracle' + - ORACLE_VERSION="18c-se2-small" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' + - ORACLE_VERSION="19c-se2-small" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' + - ORACLE_VERSION="21-full" CONNECTION_STR='127.0.0.1:1521/XEPDB1' DOCKHER_HUB_REPO="gvenzl/oracle-xe" DOCKER_OPTIONS='-e ORACLE_PASSWORD=oracle' cache: pip: true From 23d86513f00c3198e4e206748b936dd18a3a98c2 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 11 Nov 2021 01:37:07 +0200 Subject: [PATCH 0769/1096] Testing build on images from Gerald Venzl --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b20bee6c2..e7e168c49 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,7 +59,7 @@ env: - MAVEN_CFG=$HOME/.m2 jobs: - ORACLE_VERSION="11g-r2-xe" CONNECTION_STR='127.0.0.1:1521/XE' DOCKER_VOLUME="/mnt/host" DOCKER_OPTIONS='--shm-size=1g' - - ORACLE_VERSION="11-slim" CONNECTION_STR='127.0.0.1:1521/XE' DOCKHER_HUB_REPO="gvenzl/oracle-xe" DOCKER_OPTIONS='-e ORACLE_PASSWORD=oracle' DOCKER_VOLUME="/mnt/host" + - ORACLE_VERSION="11-full" CONNECTION_STR='127.0.0.1:1521/XE' DOCKHER_HUB_REPO="gvenzl/oracle-xe" DOCKER_OPTIONS='-e ORACLE_PASSWORD=oracle --shm-size=1g' DOCKER_VOLUME="/mnt/host" - ORACLE_VERSION="12c-r1-se2-small" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' - ORACLE_VERSION="12c-r2-se2-small" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' - ORACLE_VERSION="18-slim" CONNECTION_STR='127.0.0.1:1521/XEPDB1' DOCKHER_HUB_REPO="gvenzl/oracle-xe" DOCKER_OPTIONS='-e ORACLE_PASSWORD=oracle' From 2c1624e9725f25ab001ed6ac3bfedba11b3279f2 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 11 Nov 2021 11:26:21 +0200 Subject: [PATCH 0770/1096] Disabled 11g build from Gerald as utPLSQL fails on that build. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e7e168c49..cd1e8efe0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,7 +59,7 @@ env: - MAVEN_CFG=$HOME/.m2 jobs: - ORACLE_VERSION="11g-r2-xe" CONNECTION_STR='127.0.0.1:1521/XE' DOCKER_VOLUME="/mnt/host" DOCKER_OPTIONS='--shm-size=1g' - - ORACLE_VERSION="11-full" CONNECTION_STR='127.0.0.1:1521/XE' DOCKHER_HUB_REPO="gvenzl/oracle-xe" DOCKER_OPTIONS='-e ORACLE_PASSWORD=oracle --shm-size=1g' DOCKER_VOLUME="/mnt/host" +# - ORACLE_VERSION="11-full" CONNECTION_STR='127.0.0.1:1521/XE' DOCKHER_HUB_REPO="gvenzl/oracle-xe" DOCKER_OPTIONS='-e ORACLE_PASSWORD=oracle --shm-size=1g' DOCKER_VOLUME="/mnt/host" - ORACLE_VERSION="12c-r1-se2-small" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' - ORACLE_VERSION="12c-r2-se2-small" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' - ORACLE_VERSION="18-slim" CONNECTION_STR='127.0.0.1:1521/XEPDB1' DOCKHER_HUB_REPO="gvenzl/oracle-xe" DOCKER_OPTIONS='-e ORACLE_PASSWORD=oracle' From 78ae58db7e5b3e04be797e85ddec75ef77d4ab23 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 11 Nov 2021 18:37:45 +0200 Subject: [PATCH 0771/1096] Increasing wait time before proceeding with background job run for tests --- test/ut3_tester_helper/coverage_helper.pkb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ut3_tester_helper/coverage_helper.pkb b/test/ut3_tester_helper/coverage_helper.pkb index 73dec720b..e9385d7d9 100644 --- a/test/ut3_tester_helper/coverage_helper.pkb +++ b/test/ut3_tester_helper/coverage_helper.pkb @@ -163,7 +163,7 @@ create or replace package body coverage_helper is begin g_job_no := g_job_no + 1; l_job_name := 'utPLSQL_selftest_job_'||g_job_no; - sleep(0.01); + sleep(0.15); dbms_scheduler.create_job( job_name => l_job_name, job_type => 'PLSQL_BLOCK', From 9388cb36bbbc2fcff67061df80fabfc001517099 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Thu, 11 Nov 2021 18:54:10 +0000 Subject: [PATCH 0772/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 58e628fdf..0b2b353a8 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 6f1301ebc..e6d021790 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 32f61f685..5001c3498 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index a7f46d889..be257a0e2 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 11cef2063..8126a2a68 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 2d368ece8..6563f0a42 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index bbcadda92..3ccf528dc 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 20be24aab..0d7b1d7f0 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index a154c1063..4482d51d1 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 6f62e6621..7c8d4c397 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 9805c8882..193055557 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 8de75e8b9..ec1e69bc0 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 7123d71e7..d7fa81ce9 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 043589462..c82efe503 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 3ba0f209a..849fbc4e1 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 2d3e786a0..c956429ec 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index dfb729941..a87e5f132 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3502--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index fd2985f11..dd8120419 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -788,7 +788,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.11.3502-develop + * secion v3.1.11.3548-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 6e4faea13..7fb359d0f 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.11.3502-develop'; + gc_version constant varchar2(50) := 'v3.1.11.3548-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 1e1952028617990963d32d195335f057692ecf84 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Thu, 11 Nov 2021 23:01:34 +0000 Subject: [PATCH 0773/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 0b2b353a8..cd16c82b6 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index e6d021790..7758a2190 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 5001c3498..f0304acf9 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index be257a0e2..ed6c34fe8 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 8126a2a68..57a29707b 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 6563f0a42..a5331ff2e 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 3ccf528dc..b760cb1b1 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 0d7b1d7f0..bf7189d10 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 4482d51d1..814733301 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 7c8d4c397..71113a1d6 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 193055557..3bc60effb 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index ec1e69bc0..8a14cd767 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index d7fa81ce9..144b4a835 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index c82efe503..79942bb30 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 849fbc4e1..ebb32163d 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index c956429ec..0dee54b06 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index a87e5f132..6f6af8798 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3548--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index dd8120419..4e0bafe7c 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -788,7 +788,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.11.3548-develop + * secion v3.1.11.3549-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 7fb359d0f..35aff2929 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.11.3548-develop'; + gc_version constant varchar2(50) := 'v3.1.11.3549-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 38c53b6cabebe81e4421562654bc9331c5653b47 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 15 Nov 2021 20:38:59 +0200 Subject: [PATCH 0774/1096] Update copyright dates in license --- source/api/ut.pkb | 2 +- source/api/ut.pks | 2 +- source/api/ut_runner.pkb | 2 +- source/api/ut_runner.pks | 2 +- source/api/ut_suite_item_info.tpb | 2 +- source/api/ut_suite_item_info.tps | 2 +- source/api/ut_suite_items_info.tps | 2 +- source/core/annotations/ut_annotated_object.tps | 2 +- source/core/annotations/ut_annotated_objects.tps | 2 +- source/core/annotations/ut_annotation.tps | 2 +- source/core/annotations/ut_annotation_cache.sql | 2 +- source/core/annotations/ut_annotation_cache_info.sql | 2 +- source/core/annotations/ut_annotation_cache_manager.pkb | 2 +- source/core/annotations/ut_annotation_cache_manager.pks | 2 +- source/core/annotations/ut_annotation_cache_schema.sql | 2 +- source/core/annotations/ut_annotation_cache_seq.sql | 2 +- source/core/annotations/ut_annotation_manager.pkb | 2 +- source/core/annotations/ut_annotation_manager.pks | 2 +- source/core/annotations/ut_annotation_obj_cache_info.tps | 2 +- source/core/annotations/ut_annotation_objs_cache_info.tps | 2 +- source/core/annotations/ut_annotation_parser.pkb | 2 +- source/core/annotations/ut_annotation_parser.pks | 2 +- source/core/annotations/ut_annotations.tps | 2 +- source/core/annotations/ut_trigger_check.pkb | 2 +- source/core/annotations/ut_trigger_check.pks | 2 +- source/core/coverage/ut_coverage.pkb | 2 +- source/core/coverage/ut_coverage.pks | 2 +- source/core/coverage/ut_coverage_block.pkb | 2 +- source/core/coverage/ut_coverage_block.pks | 2 +- source/core/coverage/ut_coverage_helper.pkb | 2 +- source/core/coverage/ut_coverage_helper.pks | 2 +- source/core/coverage/ut_coverage_helper_block.pkb | 2 +- source/core/coverage/ut_coverage_helper_block.pks | 2 +- source/core/coverage/ut_coverage_helper_profiler.pkb | 2 +- source/core/coverage/ut_coverage_helper_profiler.pks | 2 +- source/core/coverage/ut_coverage_profiler.pkb | 2 +- source/core/coverage/ut_coverage_profiler.pks | 2 +- source/core/coverage/ut_coverage_reporter_base.tpb | 2 +- source/core/coverage/ut_coverage_reporter_base.tps | 2 +- source/core/coverage/ut_coverage_sources_tmp.sql | 2 +- source/core/events/ut_event_item.tps | 2 +- source/core/events/ut_event_listener.tps | 2 +- source/core/events/ut_event_manager.pkb | 2 +- source/core/events/ut_event_manager.pks | 2 +- source/core/output_buffers/ut_output_buffer_base.tpb | 2 +- source/core/output_buffers/ut_output_buffer_base.tps | 2 +- source/core/output_buffers/ut_output_buffer_info_tmp.sql | 2 +- source/core/output_buffers/ut_output_buffer_tmp.sql | 2 +- source/core/output_buffers/ut_output_clob_buffer_tmp.sql | 2 +- source/core/output_buffers/ut_output_clob_table_buffer.tpb | 2 +- source/core/output_buffers/ut_output_clob_table_buffer.tps | 2 +- source/core/output_buffers/ut_output_data_row.tps | 2 +- source/core/output_buffers/ut_output_data_rows.tps | 2 +- source/core/output_buffers/ut_output_table_buffer.tpb | 2 +- source/core/output_buffers/ut_output_table_buffer.tps | 2 +- source/core/session_context/ut_session_context.pkb | 2 +- source/core/session_context/ut_session_context.pks | 2 +- source/core/session_context/ut_session_info.tpb | 2 +- source/core/session_context/ut_session_info.tps | 2 +- source/core/types/ut_console_reporter_base.tpb | 2 +- source/core/types/ut_console_reporter_base.tps | 2 +- source/core/types/ut_coverage_options.tpb | 2 +- source/core/types/ut_coverage_options.tps | 2 +- source/core/types/ut_executable.tpb | 2 +- source/core/types/ut_executable.tps | 2 +- source/core/types/ut_executable_test.tpb | 2 +- source/core/types/ut_executable_test.tps | 2 +- source/core/types/ut_executables.tps | 2 +- source/core/types/ut_expectation_result.tpb | 2 +- source/core/types/ut_expectation_result.tps | 2 +- source/core/types/ut_expectation_results.tps | 2 +- source/core/types/ut_file_mapping.tpb | 2 +- source/core/types/ut_file_mapping.tps | 2 +- source/core/types/ut_file_mappings.tps | 2 +- source/core/types/ut_integer_list.tps | 2 +- source/core/types/ut_key_value_pair.tps | 2 +- source/core/types/ut_key_value_pairs.tps | 2 +- source/core/types/ut_logical_suite.tpb | 2 +- source/core/types/ut_logical_suite.tps | 2 +- source/core/types/ut_object_name.tpb | 2 +- source/core/types/ut_object_name.tps | 2 +- source/core/types/ut_object_names.tps | 2 +- source/core/types/ut_output_reporter_base.tpb | 2 +- source/core/types/ut_output_reporter_base.tps | 2 +- source/core/types/ut_reporter_base.tpb | 2 +- source/core/types/ut_reporter_base.tps | 2 +- source/core/types/ut_reporter_info.tps | 2 +- source/core/types/ut_reporters.tps | 2 +- source/core/types/ut_reporters_info.tps | 2 +- source/core/types/ut_results_counter.tpb | 2 +- source/core/types/ut_results_counter.tps | 2 +- source/core/types/ut_run.tpb | 2 +- source/core/types/ut_run.tps | 2 +- source/core/types/ut_run_info.tpb | 2 +- source/core/types/ut_run_info.tps | 2 +- source/core/types/ut_suite.tpb | 2 +- source/core/types/ut_suite.tps | 2 +- source/core/types/ut_suite_cache_row.tps | 2 +- source/core/types/ut_suite_cache_rows.tps | 2 +- source/core/types/ut_suite_context.tpb | 2 +- source/core/types/ut_suite_context.tps | 2 +- source/core/types/ut_suite_item.tpb | 2 +- source/core/types/ut_suite_item.tps | 2 +- source/core/types/ut_suite_items.tps | 2 +- source/core/types/ut_test.tpb | 2 +- source/core/types/ut_test.tps | 2 +- source/core/types/ut_varchar2_list.tps | 2 +- source/core/types/ut_varchar2_rows.tps | 2 +- source/core/ut_dbms_output_cache.sql | 2 +- source/core/ut_expectation_processor.pkb | 2 +- source/core/ut_expectation_processor.pks | 2 +- source/core/ut_file_mapper.pkb | 2 +- source/core/ut_file_mapper.pks | 2 +- source/core/ut_metadata.pkb | 2 +- source/core/ut_metadata.pks | 2 +- source/core/ut_savepoint_seq.sql | 2 +- source/core/ut_suite_builder.pkb | 2 +- source/core/ut_suite_builder.pks | 2 +- source/core/ut_suite_cache.sql | 2 +- source/core/ut_suite_cache_manager.pkb | 2 +- source/core/ut_suite_cache_manager.pks | 2 +- source/core/ut_suite_cache_package.sql | 2 +- source/core/ut_suite_cache_schema.sql | 2 +- source/core/ut_suite_cache_seq.sql | 2 +- source/core/ut_suite_manager.pkb | 2 +- source/core/ut_suite_manager.pks | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- source/create_grants.sql | 2 +- source/create_synonyms.sql | 2 +- source/create_synonyms_and_grants_for_public.sql | 2 +- source/create_user_grants.sql | 2 +- source/create_user_synonyms.sql | 2 +- source/create_utplsql_owner.sql | 2 +- source/define_ut3_owner_param.sql | 2 +- source/expectations/data_values/ut_compound_data_diff_tmp.sql | 2 +- source/expectations/data_values/ut_compound_data_helper.pkb | 2 +- source/expectations/data_values/ut_compound_data_helper.pks | 2 +- source/expectations/data_values/ut_compound_data_tmp.sql | 2 +- source/expectations/data_values/ut_compound_data_value.tpb | 2 +- source/expectations/data_values/ut_compound_data_value.tps | 2 +- source/expectations/data_values/ut_cursor_column.tps | 2 +- source/expectations/data_values/ut_cursor_column_tab.tps | 2 +- source/expectations/data_values/ut_cursor_details.tps | 2 +- source/expectations/data_values/ut_data_value.tpb | 2 +- source/expectations/data_values/ut_data_value.tps | 2 +- source/expectations/data_values/ut_data_value_anydata.tpb | 2 +- source/expectations/data_values/ut_data_value_anydata.tps | 2 +- source/expectations/data_values/ut_data_value_blob.tpb | 2 +- source/expectations/data_values/ut_data_value_blob.tps | 2 +- source/expectations/data_values/ut_data_value_boolean.tpb | 2 +- source/expectations/data_values/ut_data_value_boolean.tps | 2 +- source/expectations/data_values/ut_data_value_clob.tpb | 2 +- source/expectations/data_values/ut_data_value_clob.tps | 2 +- source/expectations/data_values/ut_data_value_date.tpb | 2 +- source/expectations/data_values/ut_data_value_date.tps | 2 +- source/expectations/data_values/ut_data_value_dsinterval.tpb | 2 +- source/expectations/data_values/ut_data_value_dsinterval.tps | 2 +- source/expectations/data_values/ut_data_value_json.tpb | 2 +- source/expectations/data_values/ut_data_value_json.tps | 2 +- source/expectations/data_values/ut_data_value_number.tpb | 2 +- source/expectations/data_values/ut_data_value_number.tps | 2 +- source/expectations/data_values/ut_data_value_refcursor.tpb | 2 +- source/expectations/data_values/ut_data_value_refcursor.tps | 2 +- source/expectations/data_values/ut_data_value_timestamp.tpb | 2 +- source/expectations/data_values/ut_data_value_timestamp.tps | 2 +- source/expectations/data_values/ut_data_value_timestamp_ltz.tpb | 2 +- source/expectations/data_values/ut_data_value_timestamp_ltz.tps | 2 +- source/expectations/data_values/ut_data_value_timestamp_tz.tpb | 2 +- source/expectations/data_values/ut_data_value_timestamp_tz.tps | 2 +- source/expectations/data_values/ut_data_value_varchar2.tpb | 2 +- source/expectations/data_values/ut_data_value_varchar2.tps | 2 +- source/expectations/data_values/ut_data_value_xmltype.tpb | 2 +- source/expectations/data_values/ut_data_value_xmltype.tps | 2 +- source/expectations/data_values/ut_data_value_yminterval.tpb | 2 +- source/expectations/data_values/ut_data_value_yminterval.tps | 2 +- source/expectations/data_values/ut_json_data_diff_tmp.sql | 2 +- source/expectations/data_values/ut_json_leaf.tps | 2 +- source/expectations/data_values/ut_json_leaf_tab.tps | 2 +- source/expectations/data_values/ut_json_tree_details.tps | 2 +- source/expectations/data_values/ut_key_anyval_pair.tps | 2 +- source/expectations/data_values/ut_key_anyval_pairs.tps | 2 +- source/expectations/data_values/ut_key_anyvalues.tpb | 2 +- source/expectations/data_values/ut_key_anyvalues.tps | 2 +- source/expectations/matchers/ut_be_between.tpb | 2 +- source/expectations/matchers/ut_be_between.tps | 2 +- source/expectations/matchers/ut_be_empty.tpb | 2 +- source/expectations/matchers/ut_be_empty.tps | 2 +- source/expectations/matchers/ut_be_false.tpb | 2 +- source/expectations/matchers/ut_be_false.tps | 2 +- source/expectations/matchers/ut_be_greater_or_equal.tpb | 2 +- source/expectations/matchers/ut_be_greater_or_equal.tps | 2 +- source/expectations/matchers/ut_be_greater_than.tpb | 2 +- source/expectations/matchers/ut_be_greater_than.tps | 2 +- source/expectations/matchers/ut_be_less_or_equal.tpb | 2 +- source/expectations/matchers/ut_be_less_or_equal.tps | 2 +- source/expectations/matchers/ut_be_less_than.tpb | 2 +- source/expectations/matchers/ut_be_less_than.tps | 2 +- source/expectations/matchers/ut_be_like.tpb | 2 +- source/expectations/matchers/ut_be_like.tps | 2 +- source/expectations/matchers/ut_be_not_null.tpb | 2 +- source/expectations/matchers/ut_be_not_null.tps | 2 +- source/expectations/matchers/ut_be_null.tpb | 2 +- source/expectations/matchers/ut_be_null.tps | 2 +- source/expectations/matchers/ut_be_true.tpb | 2 +- source/expectations/matchers/ut_be_true.tps | 2 +- source/expectations/matchers/ut_comparison_matcher.tpb | 2 +- source/expectations/matchers/ut_comparison_matcher.tps | 2 +- source/expectations/matchers/ut_contain.tpb | 2 +- source/expectations/matchers/ut_contain.tps | 2 +- source/expectations/matchers/ut_equal.tpb | 2 +- source/expectations/matchers/ut_equal.tps | 2 +- source/expectations/matchers/ut_have_count.tpb | 2 +- source/expectations/matchers/ut_have_count.tps | 2 +- source/expectations/matchers/ut_match.tpb | 2 +- source/expectations/matchers/ut_match.tps | 2 +- source/expectations/matchers/ut_matcher.tpb | 2 +- source/expectations/matchers/ut_matcher.tps | 2 +- source/expectations/matchers/ut_matcher_options.tpb | 2 +- source/expectations/matchers/ut_matcher_options.tps | 2 +- source/expectations/matchers/ut_matcher_options_items.tpb | 2 +- source/expectations/matchers/ut_matcher_options_items.tps | 2 +- source/expectations/ut_expectation.tpb | 2 +- source/expectations/ut_expectation.tps | 2 +- source/expectations/ut_expectation_compound.tpb | 2 +- source/expectations/ut_expectation_compound.tps | 2 +- source/expectations/ut_expectation_json.tpb | 2 +- source/expectations/ut_expectation_json.tps | 2 +- source/install.sql | 2 +- source/install_component.sql | 2 +- source/install_ddl_trigger.sql | 2 +- source/install_headless.sql | 2 +- source/install_headless_with_trigger.sql | 2 +- source/reporters/ut_ansiconsole_helper.pkb | 2 +- source/reporters/ut_ansiconsole_helper.pks | 2 +- source/reporters/ut_coverage_cobertura_reporter.tpb | 2 +- source/reporters/ut_coverage_cobertura_reporter.tps | 2 +- source/reporters/ut_coverage_html_reporter.tpb | 2 +- source/reporters/ut_coverage_html_reporter.tps | 2 +- source/reporters/ut_coverage_report_html_helper.pkb | 2 +- source/reporters/ut_coverage_report_html_helper.pks | 2 +- source/reporters/ut_coverage_sonar_reporter.tpb | 2 +- source/reporters/ut_coverage_sonar_reporter.tps | 2 +- source/reporters/ut_coveralls_reporter.tpb | 2 +- source/reporters/ut_coveralls_reporter.tps | 2 +- source/reporters/ut_debug_reporter.tpb | 2 +- source/reporters/ut_debug_reporter.tps | 2 +- source/reporters/ut_documentation_reporter.tpb | 2 +- source/reporters/ut_documentation_reporter.tps | 2 +- source/reporters/ut_junit_reporter.tpb | 2 +- source/reporters/ut_junit_reporter.tps | 2 +- source/reporters/ut_realtime_reporter.tpb | 2 +- source/reporters/ut_realtime_reporter.tps | 2 +- source/reporters/ut_sonar_test_reporter.tpb | 2 +- source/reporters/ut_sonar_test_reporter.tps | 2 +- source/reporters/ut_teamcity_reporter.tpb | 2 +- source/reporters/ut_teamcity_reporter.tps | 2 +- source/reporters/ut_teamcity_reporter_helper.pkb | 2 +- source/reporters/ut_teamcity_reporter_helper.pks | 2 +- source/reporters/ut_tfs_junit_reporter.tpb | 2 +- source/reporters/ut_tfs_junit_reporter.tps | 2 +- source/reporters/ut_xunit_reporter.tpb | 2 +- source/reporters/ut_xunit_reporter.tps | 2 +- source/set_install_params.sql | 2 +- source/uninstall.sql | 2 +- source/uninstall_all.sql | 2 +- 266 files changed, 266 insertions(+), 266 deletions(-) diff --git a/source/api/ut.pkb b/source/api/ut.pkb index 81d3e59a7..9e3defe16 100644 --- a/source/api/ut.pkb +++ b/source/api/ut.pkb @@ -2,7 +2,7 @@ create or replace package body ut is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/api/ut.pks b/source/api/ut.pks index ff75179b0..2cce4e183 100644 --- a/source/api/ut.pks +++ b/source/api/ut.pks @@ -2,7 +2,7 @@ create or replace package ut authid current_user as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index bb7d3e458..d2bd74b91 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -2,7 +2,7 @@ create or replace package body ut_runner is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/api/ut_runner.pks b/source/api/ut_runner.pks index 61578a4e0..75aa12f8f 100644 --- a/source/api/ut_runner.pks +++ b/source/api/ut_runner.pks @@ -2,7 +2,7 @@ create or replace package ut_runner authid current_user is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/api/ut_suite_item_info.tpb b/source/api/ut_suite_item_info.tpb index 9b142acb0..97d931c59 100644 --- a/source/api/ut_suite_item_info.tpb +++ b/source/api/ut_suite_item_info.tpb @@ -1,7 +1,7 @@ create or replace type body ut_suite_item_info is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/api/ut_suite_item_info.tps b/source/api/ut_suite_item_info.tps index 807635d1b..2c0f16198 100644 --- a/source/api/ut_suite_item_info.tps +++ b/source/api/ut_suite_item_info.tps @@ -1,7 +1,7 @@ create or replace type ut_suite_item_info as object ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/api/ut_suite_items_info.tps b/source/api/ut_suite_items_info.tps index 7c9ac33c3..208098f9d 100644 --- a/source/api/ut_suite_items_info.tps +++ b/source/api/ut_suite_items_info.tps @@ -1,7 +1,7 @@ create or replace type ut_suite_items_info as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/annotations/ut_annotated_object.tps b/source/core/annotations/ut_annotated_object.tps index 06a0f4a36..3fda363fe 100644 --- a/source/core/annotations/ut_annotated_object.tps +++ b/source/core/annotations/ut_annotated_object.tps @@ -1,7 +1,7 @@ create type ut_annotated_object as object( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/annotations/ut_annotated_objects.tps b/source/core/annotations/ut_annotated_objects.tps index c7b142a32..c67c1bd53 100644 --- a/source/core/annotations/ut_annotated_objects.tps +++ b/source/core/annotations/ut_annotated_objects.tps @@ -1,7 +1,7 @@ create type ut_annotated_objects as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/annotations/ut_annotation.tps b/source/core/annotations/ut_annotation.tps index 982c0348c..3d0311571 100644 --- a/source/core/annotations/ut_annotation.tps +++ b/source/core/annotations/ut_annotation.tps @@ -1,7 +1,7 @@ create type ut_annotation as object( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/annotations/ut_annotation_cache.sql b/source/core/annotations/ut_annotation_cache.sql index 8baa6e75c..67149ce60 100644 --- a/source/core/annotations/ut_annotation_cache.sql +++ b/source/core/annotations/ut_annotation_cache.sql @@ -1,7 +1,7 @@ create table ut_annotation_cache ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/core/annotations/ut_annotation_cache_info.sql b/source/core/annotations/ut_annotation_cache_info.sql index 7bbf99e00..167973a04 100644 --- a/source/core/annotations/ut_annotation_cache_info.sql +++ b/source/core/annotations/ut_annotation_cache_info.sql @@ -1,7 +1,7 @@ create table ut_annotation_cache_info ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/core/annotations/ut_annotation_cache_manager.pkb b/source/core/annotations/ut_annotation_cache_manager.pkb index cef6fa519..17129c316 100644 --- a/source/core/annotations/ut_annotation_cache_manager.pkb +++ b/source/core/annotations/ut_annotation_cache_manager.pkb @@ -1,7 +1,7 @@ create or replace package body ut_annotation_cache_manager as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/annotations/ut_annotation_cache_manager.pks b/source/core/annotations/ut_annotation_cache_manager.pks index e4ba6dd7a..1e9734934 100644 --- a/source/core/annotations/ut_annotation_cache_manager.pks +++ b/source/core/annotations/ut_annotation_cache_manager.pks @@ -1,7 +1,7 @@ create or replace package ut_annotation_cache_manager authid definer as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/annotations/ut_annotation_cache_schema.sql b/source/core/annotations/ut_annotation_cache_schema.sql index b8f908e84..8889b9abf 100644 --- a/source/core/annotations/ut_annotation_cache_schema.sql +++ b/source/core/annotations/ut_annotation_cache_schema.sql @@ -1,7 +1,7 @@ create table ut_annotation_cache_schema ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/core/annotations/ut_annotation_cache_seq.sql b/source/core/annotations/ut_annotation_cache_seq.sql index 0a898e98e..b371b382b 100644 --- a/source/core/annotations/ut_annotation_cache_seq.sql +++ b/source/core/annotations/ut_annotation_cache_seq.sql @@ -1,7 +1,7 @@ create sequence ut_annotation_cache_seq /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index ca0c358cf..95d944843 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -1,7 +1,7 @@ create or replace package body ut_annotation_manager as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/annotations/ut_annotation_manager.pks b/source/core/annotations/ut_annotation_manager.pks index 70257afac..20fcd810f 100644 --- a/source/core/annotations/ut_annotation_manager.pks +++ b/source/core/annotations/ut_annotation_manager.pks @@ -1,7 +1,7 @@ create or replace package ut_annotation_manager authid current_user as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/annotations/ut_annotation_obj_cache_info.tps b/source/core/annotations/ut_annotation_obj_cache_info.tps index 4b8178a9d..1db3fd190 100644 --- a/source/core/annotations/ut_annotation_obj_cache_info.tps +++ b/source/core/annotations/ut_annotation_obj_cache_info.tps @@ -1,7 +1,7 @@ create type ut_annotation_obj_cache_info as object( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/annotations/ut_annotation_objs_cache_info.tps b/source/core/annotations/ut_annotation_objs_cache_info.tps index bab33a9d3..fc96e7d25 100644 --- a/source/core/annotations/ut_annotation_objs_cache_info.tps +++ b/source/core/annotations/ut_annotation_objs_cache_info.tps @@ -1,7 +1,7 @@ create type ut_annotation_objs_cache_info as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/annotations/ut_annotation_parser.pkb b/source/core/annotations/ut_annotation_parser.pkb index 6ef15a3ac..f0271c957 100644 --- a/source/core/annotations/ut_annotation_parser.pkb +++ b/source/core/annotations/ut_annotation_parser.pkb @@ -1,7 +1,7 @@ create or replace package body ut_annotation_parser as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/annotations/ut_annotation_parser.pks b/source/core/annotations/ut_annotation_parser.pks index 0368811db..2f474c883 100644 --- a/source/core/annotations/ut_annotation_parser.pks +++ b/source/core/annotations/ut_annotation_parser.pks @@ -1,7 +1,7 @@ create or replace package ut_annotation_parser authid current_user as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/annotations/ut_annotations.tps b/source/core/annotations/ut_annotations.tps index 85be05e72..a6579d236 100644 --- a/source/core/annotations/ut_annotations.tps +++ b/source/core/annotations/ut_annotations.tps @@ -1,7 +1,7 @@ create type ut_annotations /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/annotations/ut_trigger_check.pkb b/source/core/annotations/ut_trigger_check.pkb index 76d3aa11c..34e43ba46 100644 --- a/source/core/annotations/ut_trigger_check.pkb +++ b/source/core/annotations/ut_trigger_check.pkb @@ -1,7 +1,7 @@ create or replace package body ut_trigger_check is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/annotations/ut_trigger_check.pks b/source/core/annotations/ut_trigger_check.pks index c4c27c596..cee0b06fd 100644 --- a/source/core/annotations/ut_trigger_check.pks +++ b/source/core/annotations/ut_trigger_check.pks @@ -1,7 +1,7 @@ create or replace package ut_trigger_check authid definer is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/coverage/ut_coverage.pkb b/source/core/coverage/ut_coverage.pkb index 1900e6c3c..ddcdeaf2e 100644 --- a/source/core/coverage/ut_coverage.pkb +++ b/source/core/coverage/ut_coverage.pkb @@ -1,7 +1,7 @@ create or replace package body ut_coverage is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/coverage/ut_coverage.pks b/source/core/coverage/ut_coverage.pks index ba5263dd2..210cb13f6 100644 --- a/source/core/coverage/ut_coverage.pks +++ b/source/core/coverage/ut_coverage.pks @@ -1,7 +1,7 @@ create or replace package ut_coverage authid current_user is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/coverage/ut_coverage_block.pkb b/source/core/coverage/ut_coverage_block.pkb index 79fd42699..a906b81a3 100644 --- a/source/core/coverage/ut_coverage_block.pkb +++ b/source/core/coverage/ut_coverage_block.pkb @@ -1,7 +1,7 @@ create or replace package body ut_coverage_block is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/coverage/ut_coverage_block.pks b/source/core/coverage/ut_coverage_block.pks index 08de58e69..01caca035 100644 --- a/source/core/coverage/ut_coverage_block.pks +++ b/source/core/coverage/ut_coverage_block.pks @@ -1,7 +1,7 @@ create or replace package ut_coverage_block authid current_user is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/coverage/ut_coverage_helper.pkb b/source/core/coverage/ut_coverage_helper.pkb index a000237c6..e249b3381 100644 --- a/source/core/coverage/ut_coverage_helper.pkb +++ b/source/core/coverage/ut_coverage_helper.pkb @@ -1,7 +1,7 @@ create or replace package body ut_coverage_helper is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/coverage/ut_coverage_helper.pks b/source/core/coverage/ut_coverage_helper.pks index 632b18a0d..cd6ed9ec7 100644 --- a/source/core/coverage/ut_coverage_helper.pks +++ b/source/core/coverage/ut_coverage_helper.pks @@ -1,7 +1,7 @@ create or replace package ut_coverage_helper authid definer is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/coverage/ut_coverage_helper_block.pkb b/source/core/coverage/ut_coverage_helper_block.pkb index 913b0fb4c..25cb00f90 100644 --- a/source/core/coverage/ut_coverage_helper_block.pkb +++ b/source/core/coverage/ut_coverage_helper_block.pkb @@ -1,7 +1,7 @@ create or replace package body ut_coverage_helper_block is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/coverage/ut_coverage_helper_block.pks b/source/core/coverage/ut_coverage_helper_block.pks index 18adf4fbd..a147d9f4f 100644 --- a/source/core/coverage/ut_coverage_helper_block.pks +++ b/source/core/coverage/ut_coverage_helper_block.pks @@ -1,7 +1,7 @@ create or replace package ut_coverage_helper_block authid current_user is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/coverage/ut_coverage_helper_profiler.pkb b/source/core/coverage/ut_coverage_helper_profiler.pkb index 22aa6619d..f29291efb 100644 --- a/source/core/coverage/ut_coverage_helper_profiler.pkb +++ b/source/core/coverage/ut_coverage_helper_profiler.pkb @@ -1,7 +1,7 @@ create or replace package body ut_coverage_helper_profiler is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/coverage/ut_coverage_helper_profiler.pks b/source/core/coverage/ut_coverage_helper_profiler.pks index f105d3c9c..0c54a83bf 100644 --- a/source/core/coverage/ut_coverage_helper_profiler.pks +++ b/source/core/coverage/ut_coverage_helper_profiler.pks @@ -1,7 +1,7 @@ create or replace package ut_coverage_helper_profiler authid definer is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/coverage/ut_coverage_profiler.pkb b/source/core/coverage/ut_coverage_profiler.pkb index 6d9f894d5..663ceab7f 100644 --- a/source/core/coverage/ut_coverage_profiler.pkb +++ b/source/core/coverage/ut_coverage_profiler.pkb @@ -1,7 +1,7 @@ create or replace package body ut_coverage_profiler is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/coverage/ut_coverage_profiler.pks b/source/core/coverage/ut_coverage_profiler.pks index 59256ae65..9ce9a27f0 100644 --- a/source/core/coverage/ut_coverage_profiler.pks +++ b/source/core/coverage/ut_coverage_profiler.pks @@ -1,7 +1,7 @@ create or replace package ut_coverage_profiler authid current_user is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/coverage/ut_coverage_reporter_base.tpb b/source/core/coverage/ut_coverage_reporter_base.tpb index 1cc856ea6..aff4e6560 100644 --- a/source/core/coverage/ut_coverage_reporter_base.tpb +++ b/source/core/coverage/ut_coverage_reporter_base.tpb @@ -1,7 +1,7 @@ create or replace type body ut_coverage_reporter_base is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/coverage/ut_coverage_reporter_base.tps b/source/core/coverage/ut_coverage_reporter_base.tps index cae165258..305c5d757 100644 --- a/source/core/coverage/ut_coverage_reporter_base.tps +++ b/source/core/coverage/ut_coverage_reporter_base.tps @@ -1,7 +1,7 @@ create or replace type ut_coverage_reporter_base under ut_output_reporter_base( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/coverage/ut_coverage_sources_tmp.sql b/source/core/coverage/ut_coverage_sources_tmp.sql index abaae5353..c091d5955 100644 --- a/source/core/coverage/ut_coverage_sources_tmp.sql +++ b/source/core/coverage/ut_coverage_sources_tmp.sql @@ -1,7 +1,7 @@ create global temporary table ut_coverage_sources_tmp( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/core/events/ut_event_item.tps b/source/core/events/ut_event_item.tps index efec940f5..c0ea653ea 100644 --- a/source/core/events/ut_event_item.tps +++ b/source/core/events/ut_event_item.tps @@ -1,7 +1,7 @@ create or replace type ut_event_item authid current_user as object ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/events/ut_event_listener.tps b/source/core/events/ut_event_listener.tps index 71ee16a0f..bbcdbf218 100644 --- a/source/core/events/ut_event_listener.tps +++ b/source/core/events/ut_event_listener.tps @@ -1,7 +1,7 @@ create or replace type ut_event_listener authid current_user as object ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/events/ut_event_manager.pkb b/source/core/events/ut_event_manager.pkb index 039eb43a0..f51019421 100644 --- a/source/core/events/ut_event_manager.pkb +++ b/source/core/events/ut_event_manager.pkb @@ -1,7 +1,7 @@ create or replace package body ut_event_manager as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/events/ut_event_manager.pks b/source/core/events/ut_event_manager.pks index f67bd0f4d..03b18b728 100644 --- a/source/core/events/ut_event_manager.pks +++ b/source/core/events/ut_event_manager.pks @@ -1,7 +1,7 @@ create or replace package ut_event_manager authid current_user as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/output_buffers/ut_output_buffer_base.tpb b/source/core/output_buffers/ut_output_buffer_base.tpb index 412f30836..6d7964150 100644 --- a/source/core/output_buffers/ut_output_buffer_base.tpb +++ b/source/core/output_buffers/ut_output_buffer_base.tpb @@ -1,7 +1,7 @@ create or replace type body ut_output_buffer_base is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/output_buffers/ut_output_buffer_base.tps b/source/core/output_buffers/ut_output_buffer_base.tps index 745692f38..98a6847cd 100644 --- a/source/core/output_buffers/ut_output_buffer_base.tps +++ b/source/core/output_buffers/ut_output_buffer_base.tps @@ -1,7 +1,7 @@ create or replace type ut_output_buffer_base force authid definer as object( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/output_buffers/ut_output_buffer_info_tmp.sql b/source/core/output_buffers/ut_output_buffer_info_tmp.sql index ec09619d2..af730d394 100644 --- a/source/core/output_buffers/ut_output_buffer_info_tmp.sql +++ b/source/core/output_buffers/ut_output_buffer_info_tmp.sql @@ -1,7 +1,7 @@ create table ut_output_buffer_info_tmp( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/core/output_buffers/ut_output_buffer_tmp.sql b/source/core/output_buffers/ut_output_buffer_tmp.sql index 49fefa24d..57027817e 100644 --- a/source/core/output_buffers/ut_output_buffer_tmp.sql +++ b/source/core/output_buffers/ut_output_buffer_tmp.sql @@ -1,7 +1,7 @@ create table ut_output_buffer_tmp( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/core/output_buffers/ut_output_clob_buffer_tmp.sql b/source/core/output_buffers/ut_output_clob_buffer_tmp.sql index 48cfe6fde..40dda121f 100644 --- a/source/core/output_buffers/ut_output_clob_buffer_tmp.sql +++ b/source/core/output_buffers/ut_output_clob_buffer_tmp.sql @@ -6,7 +6,7 @@ begin v_table_sql := 'create table ut_output_clob_buffer_tmp( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/core/output_buffers/ut_output_clob_table_buffer.tpb b/source/core/output_buffers/ut_output_clob_table_buffer.tpb index 8d23b9422..66ff71c62 100644 --- a/source/core/output_buffers/ut_output_clob_table_buffer.tpb +++ b/source/core/output_buffers/ut_output_clob_table_buffer.tpb @@ -1,7 +1,7 @@ create or replace type body ut_output_clob_table_buffer is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/output_buffers/ut_output_clob_table_buffer.tps b/source/core/output_buffers/ut_output_clob_table_buffer.tps index 2eb3640b0..7b98efaba 100644 --- a/source/core/output_buffers/ut_output_clob_table_buffer.tps +++ b/source/core/output_buffers/ut_output_clob_table_buffer.tps @@ -1,7 +1,7 @@ create or replace type ut_output_clob_table_buffer under ut_output_buffer_base ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/output_buffers/ut_output_data_row.tps b/source/core/output_buffers/ut_output_data_row.tps index b0f5efe91..c5dd95e98 100644 --- a/source/core/output_buffers/ut_output_data_row.tps +++ b/source/core/output_buffers/ut_output_data_row.tps @@ -1,7 +1,7 @@ create or replace type ut_output_data_row as object ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/output_buffers/ut_output_data_rows.tps b/source/core/output_buffers/ut_output_data_rows.tps index 1918f0c81..097e9beff 100644 --- a/source/core/output_buffers/ut_output_data_rows.tps +++ b/source/core/output_buffers/ut_output_data_rows.tps @@ -1,7 +1,7 @@ create or replace type ut_output_data_rows as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/output_buffers/ut_output_table_buffer.tpb b/source/core/output_buffers/ut_output_table_buffer.tpb index 5f9c536f9..1809a49d5 100644 --- a/source/core/output_buffers/ut_output_table_buffer.tpb +++ b/source/core/output_buffers/ut_output_table_buffer.tpb @@ -1,7 +1,7 @@ create or replace type body ut_output_table_buffer is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/output_buffers/ut_output_table_buffer.tps b/source/core/output_buffers/ut_output_table_buffer.tps index 3e395304a..726b692f8 100644 --- a/source/core/output_buffers/ut_output_table_buffer.tps +++ b/source/core/output_buffers/ut_output_table_buffer.tps @@ -1,7 +1,7 @@ create or replace type ut_output_table_buffer under ut_output_buffer_base ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/session_context/ut_session_context.pkb b/source/core/session_context/ut_session_context.pkb index 2364d8513..a97505e9c 100644 --- a/source/core/session_context/ut_session_context.pkb +++ b/source/core/session_context/ut_session_context.pkb @@ -1,7 +1,7 @@ create or replace package body ut_session_context as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/session_context/ut_session_context.pks b/source/core/session_context/ut_session_context.pks index bbe256db4..63da3399e 100644 --- a/source/core/session_context/ut_session_context.pks +++ b/source/core/session_context/ut_session_context.pks @@ -1,7 +1,7 @@ create or replace package ut_session_context as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/session_context/ut_session_info.tpb b/source/core/session_context/ut_session_info.tpb index 2d3fdbed9..c7fe7dc5f 100644 --- a/source/core/session_context/ut_session_info.tpb +++ b/source/core/session_context/ut_session_info.tpb @@ -1,7 +1,7 @@ create or replace type body ut_session_info as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/session_context/ut_session_info.tps b/source/core/session_context/ut_session_info.tps index 863b0dc3e..17e596d88 100644 --- a/source/core/session_context/ut_session_info.tps +++ b/source/core/session_context/ut_session_info.tps @@ -1,7 +1,7 @@ create or replace type ut_session_info under ut_event_listener ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_console_reporter_base.tpb b/source/core/types/ut_console_reporter_base.tpb index df256e832..909e9355a 100644 --- a/source/core/types/ut_console_reporter_base.tpb +++ b/source/core/types/ut_console_reporter_base.tpb @@ -1,7 +1,7 @@ create or replace type body ut_console_reporter_base is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_console_reporter_base.tps b/source/core/types/ut_console_reporter_base.tps index 6c0a08502..a2c4b6b8c 100644 --- a/source/core/types/ut_console_reporter_base.tps +++ b/source/core/types/ut_console_reporter_base.tps @@ -1,7 +1,7 @@ create or replace type ut_console_reporter_base under ut_output_reporter_base( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_coverage_options.tpb b/source/core/types/ut_coverage_options.tpb index 6eb4921a7..308c75553 100644 --- a/source/core/types/ut_coverage_options.tpb +++ b/source/core/types/ut_coverage_options.tpb @@ -1,7 +1,7 @@ create or replace type body ut_coverage_options as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_coverage_options.tps b/source/core/types/ut_coverage_options.tps index d6e86b653..1be518c5e 100644 --- a/source/core/types/ut_coverage_options.tps +++ b/source/core/types/ut_coverage_options.tps @@ -1,7 +1,7 @@ create or replace type ut_coverage_options force as object ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_executable.tpb b/source/core/types/ut_executable.tpb index 826a5aaa1..d2ce9b79d 100644 --- a/source/core/types/ut_executable.tpb +++ b/source/core/types/ut_executable.tpb @@ -1,7 +1,7 @@ create or replace type body ut_executable is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_executable.tps b/source/core/types/ut_executable.tps index 786d926ad..aaa5a3a72 100644 --- a/source/core/types/ut_executable.tps +++ b/source/core/types/ut_executable.tps @@ -1,7 +1,7 @@ create or replace type ut_executable under ut_event_item( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_executable_test.tpb b/source/core/types/ut_executable_test.tpb index 6f25ea1c8..c5a7f29a1 100644 --- a/source/core/types/ut_executable_test.tpb +++ b/source/core/types/ut_executable_test.tpb @@ -1,7 +1,7 @@ create or replace type body ut_executable_test as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_executable_test.tps b/source/core/types/ut_executable_test.tps index 88500c9be..42b6080df 100644 --- a/source/core/types/ut_executable_test.tps +++ b/source/core/types/ut_executable_test.tps @@ -1,7 +1,7 @@ create or replace type ut_executable_test authid current_user under ut_executable ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_executables.tps b/source/core/types/ut_executables.tps index f5732d5a1..d6d52b3d2 100644 --- a/source/core/types/ut_executables.tps +++ b/source/core/types/ut_executables.tps @@ -1,7 +1,7 @@ create or replace type ut_executables as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_expectation_result.tpb b/source/core/types/ut_expectation_result.tpb index 9aa8b81c0..0b3adf983 100644 --- a/source/core/types/ut_expectation_result.tpb +++ b/source/core/types/ut_expectation_result.tpb @@ -1,7 +1,7 @@ create or replace type body ut_expectation_result is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_expectation_result.tps b/source/core/types/ut_expectation_result.tps index 815d90820..d4b4c7548 100644 --- a/source/core/types/ut_expectation_result.tps +++ b/source/core/types/ut_expectation_result.tps @@ -1,7 +1,7 @@ create or replace type ut_expectation_result under ut_event_item( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_expectation_results.tps b/source/core/types/ut_expectation_results.tps index 963c726f8..e5e4c6223 100644 --- a/source/core/types/ut_expectation_results.tps +++ b/source/core/types/ut_expectation_results.tps @@ -1,7 +1,7 @@ create or replace type ut_expectation_results as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_file_mapping.tpb b/source/core/types/ut_file_mapping.tpb index 247aa5ac8..dab1e35c5 100644 --- a/source/core/types/ut_file_mapping.tpb +++ b/source/core/types/ut_file_mapping.tpb @@ -1,7 +1,7 @@ create or replace type body ut_file_mapping as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_file_mapping.tps b/source/core/types/ut_file_mapping.tps index c032e0b77..941d95283 100644 --- a/source/core/types/ut_file_mapping.tps +++ b/source/core/types/ut_file_mapping.tps @@ -1,7 +1,7 @@ create or replace type ut_file_mapping as object( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_file_mappings.tps b/source/core/types/ut_file_mappings.tps index a48c3e872..240fb8dd7 100644 --- a/source/core/types/ut_file_mappings.tps +++ b/source/core/types/ut_file_mappings.tps @@ -1,7 +1,7 @@ create or replace type ut_file_mappings as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_integer_list.tps b/source/core/types/ut_integer_list.tps index 25f1679b2..ec9a2a78f 100644 --- a/source/core/types/ut_integer_list.tps +++ b/source/core/types/ut_integer_list.tps @@ -1,7 +1,7 @@ create or replace type ut_integer_list as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_key_value_pair.tps b/source/core/types/ut_key_value_pair.tps index 873a354fd..5a337e608 100644 --- a/source/core/types/ut_key_value_pair.tps +++ b/source/core/types/ut_key_value_pair.tps @@ -1,7 +1,7 @@ create or replace type ut_key_value_pair force as object( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_key_value_pairs.tps b/source/core/types/ut_key_value_pairs.tps index 28fa87cf0..24bdded36 100644 --- a/source/core/types/ut_key_value_pairs.tps +++ b/source/core/types/ut_key_value_pairs.tps @@ -1,7 +1,7 @@ create or replace type ut_key_value_pairs as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_logical_suite.tpb b/source/core/types/ut_logical_suite.tpb index 74c7ff81c..486cb83e7 100644 --- a/source/core/types/ut_logical_suite.tpb +++ b/source/core/types/ut_logical_suite.tpb @@ -1,7 +1,7 @@ create or replace type body ut_logical_suite as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_logical_suite.tps b/source/core/types/ut_logical_suite.tps index 71cfdb23d..0f816f26b 100644 --- a/source/core/types/ut_logical_suite.tps +++ b/source/core/types/ut_logical_suite.tps @@ -1,7 +1,7 @@ create or replace type ut_logical_suite under ut_suite_item ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_object_name.tpb b/source/core/types/ut_object_name.tpb index cf1ab2a78..76acc15bf 100644 --- a/source/core/types/ut_object_name.tpb +++ b/source/core/types/ut_object_name.tpb @@ -1,7 +1,7 @@ create or replace type body ut_object_name as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_object_name.tps b/source/core/types/ut_object_name.tps index 28e41958f..5f8f724c4 100644 --- a/source/core/types/ut_object_name.tps +++ b/source/core/types/ut_object_name.tps @@ -1,7 +1,7 @@ create or replace type ut_object_name as object ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_object_names.tps b/source/core/types/ut_object_names.tps index 2f7e5ea16..03830be17 100644 --- a/source/core/types/ut_object_names.tps +++ b/source/core/types/ut_object_names.tps @@ -1,7 +1,7 @@ create or replace type ut_object_names as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_output_reporter_base.tpb b/source/core/types/ut_output_reporter_base.tpb index b8dc24667..f6bb27b94 100644 --- a/source/core/types/ut_output_reporter_base.tpb +++ b/source/core/types/ut_output_reporter_base.tpb @@ -1,7 +1,7 @@ create or replace type body ut_output_reporter_base is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_output_reporter_base.tps b/source/core/types/ut_output_reporter_base.tps index 01350208a..22f507f8d 100644 --- a/source/core/types/ut_output_reporter_base.tps +++ b/source/core/types/ut_output_reporter_base.tps @@ -1,7 +1,7 @@ create or replace type ut_output_reporter_base under ut_reporter_base( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_reporter_base.tpb b/source/core/types/ut_reporter_base.tpb index 94d518af4..3f8984331 100644 --- a/source/core/types/ut_reporter_base.tpb +++ b/source/core/types/ut_reporter_base.tpb @@ -1,7 +1,7 @@ create or replace type body ut_reporter_base is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_reporter_base.tps b/source/core/types/ut_reporter_base.tps index 36af70776..de157136e 100644 --- a/source/core/types/ut_reporter_base.tps +++ b/source/core/types/ut_reporter_base.tps @@ -1,7 +1,7 @@ create or replace type ut_reporter_base under ut_event_listener ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_reporter_info.tps b/source/core/types/ut_reporter_info.tps index d1f159211..f09c42e07 100644 --- a/source/core/types/ut_reporter_info.tps +++ b/source/core/types/ut_reporter_info.tps @@ -1,7 +1,7 @@ create or replace type ut_reporter_info as object ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_reporters.tps b/source/core/types/ut_reporters.tps index b16e74653..a2802bb26 100644 --- a/source/core/types/ut_reporters.tps +++ b/source/core/types/ut_reporters.tps @@ -1,7 +1,7 @@ create or replace type ut_reporters as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_reporters_info.tps b/source/core/types/ut_reporters_info.tps index 6e9a866ef..82c264f36 100644 --- a/source/core/types/ut_reporters_info.tps +++ b/source/core/types/ut_reporters_info.tps @@ -1,7 +1,7 @@ create or replace type ut_reporters_info as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_results_counter.tpb b/source/core/types/ut_results_counter.tpb index 0007acd9b..811389e0e 100644 --- a/source/core/types/ut_results_counter.tpb +++ b/source/core/types/ut_results_counter.tpb @@ -1,7 +1,7 @@ create or replace type body ut_results_counter as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_results_counter.tps b/source/core/types/ut_results_counter.tps index 1b26b673a..913ae0967 100644 --- a/source/core/types/ut_results_counter.tps +++ b/source/core/types/ut_results_counter.tps @@ -1,7 +1,7 @@ create or replace type ut_results_counter as object( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_run.tpb b/source/core/types/ut_run.tpb index 395b164f0..258396427 100644 --- a/source/core/types/ut_run.tpb +++ b/source/core/types/ut_run.tpb @@ -1,7 +1,7 @@ create or replace type body ut_run as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_run.tps b/source/core/types/ut_run.tps index 617347b25..f556934ce 100644 --- a/source/core/types/ut_run.tps +++ b/source/core/types/ut_run.tps @@ -1,7 +1,7 @@ create or replace type ut_run under ut_suite_item ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_run_info.tpb b/source/core/types/ut_run_info.tpb index ffa1a6372..6edc0f109 100644 --- a/source/core/types/ut_run_info.tpb +++ b/source/core/types/ut_run_info.tpb @@ -1,7 +1,7 @@ create or replace type body ut_run_info as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_run_info.tps b/source/core/types/ut_run_info.tps index f59c22c05..4a3da691f 100644 --- a/source/core/types/ut_run_info.tps +++ b/source/core/types/ut_run_info.tps @@ -1,7 +1,7 @@ create or replace type ut_run_info under ut_event_item ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_suite.tpb b/source/core/types/ut_suite.tpb index baaaf044d..2ec1c9ccd 100644 --- a/source/core/types/ut_suite.tpb +++ b/source/core/types/ut_suite.tpb @@ -1,7 +1,7 @@ create or replace type body ut_suite as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_suite.tps b/source/core/types/ut_suite.tps index ffe2d2d42..ff7f3e171 100644 --- a/source/core/types/ut_suite.tps +++ b/source/core/types/ut_suite.tps @@ -1,7 +1,7 @@ create or replace type ut_suite under ut_logical_suite ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_suite_cache_row.tps b/source/core/types/ut_suite_cache_row.tps index d9f542de3..9c5990bfd 100644 --- a/source/core/types/ut_suite_cache_row.tps +++ b/source/core/types/ut_suite_cache_row.tps @@ -1,7 +1,7 @@ create type ut_suite_cache_row as object ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_suite_cache_rows.tps b/source/core/types/ut_suite_cache_rows.tps index 660f934cf..9b6919df5 100644 --- a/source/core/types/ut_suite_cache_rows.tps +++ b/source/core/types/ut_suite_cache_rows.tps @@ -1,7 +1,7 @@ create type ut_suite_cache_rows as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_suite_context.tpb b/source/core/types/ut_suite_context.tpb index 3669d3d7e..be92e6fc9 100644 --- a/source/core/types/ut_suite_context.tpb +++ b/source/core/types/ut_suite_context.tpb @@ -1,7 +1,7 @@ create or replace type body ut_suite_context as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_suite_context.tps b/source/core/types/ut_suite_context.tps index a328e7657..5e3d20f87 100644 --- a/source/core/types/ut_suite_context.tps +++ b/source/core/types/ut_suite_context.tps @@ -1,7 +1,7 @@ create or replace type ut_suite_context under ut_suite ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_suite_item.tpb b/source/core/types/ut_suite_item.tpb index 9b939727a..12f857cba 100644 --- a/source/core/types/ut_suite_item.tpb +++ b/source/core/types/ut_suite_item.tpb @@ -1,7 +1,7 @@ create or replace type body ut_suite_item as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_suite_item.tps b/source/core/types/ut_suite_item.tps index 87f577459..d96ec8c30 100644 --- a/source/core/types/ut_suite_item.tps +++ b/source/core/types/ut_suite_item.tps @@ -1,7 +1,7 @@ create or replace type ut_suite_item force under ut_event_item ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_suite_items.tps b/source/core/types/ut_suite_items.tps index e80bcc7b4..615283446 100644 --- a/source/core/types/ut_suite_items.tps +++ b/source/core/types/ut_suite_items.tps @@ -1,7 +1,7 @@ create or replace type ut_suite_items as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_test.tpb b/source/core/types/ut_test.tpb index 4ed3f665e..9a36205c1 100644 --- a/source/core/types/ut_test.tpb +++ b/source/core/types/ut_test.tpb @@ -1,7 +1,7 @@ create or replace type body ut_test as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_test.tps b/source/core/types/ut_test.tps index 85caf7380..07958ec0f 100644 --- a/source/core/types/ut_test.tps +++ b/source/core/types/ut_test.tps @@ -1,7 +1,7 @@ create or replace type ut_test force under ut_suite_item ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_varchar2_list.tps b/source/core/types/ut_varchar2_list.tps index dd15f0d8f..f0b5df509 100644 --- a/source/core/types/ut_varchar2_list.tps +++ b/source/core/types/ut_varchar2_list.tps @@ -1,7 +1,7 @@ create or replace type ut_varchar2_list as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_varchar2_rows.tps b/source/core/types/ut_varchar2_rows.tps index d56eeee46..e7fa29c29 100644 --- a/source/core/types/ut_varchar2_rows.tps +++ b/source/core/types/ut_varchar2_rows.tps @@ -1,7 +1,7 @@ create or replace type ut_varchar2_rows as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/ut_dbms_output_cache.sql b/source/core/ut_dbms_output_cache.sql index 3d4c12845..e61b403c8 100644 --- a/source/core/ut_dbms_output_cache.sql +++ b/source/core/ut_dbms_output_cache.sql @@ -1,6 +1,6 @@ /* utPLSQL - Version 3 -Copyright 2016 - 2019 utPLSQL Project +Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/core/ut_expectation_processor.pkb b/source/core/ut_expectation_processor.pkb index 22e268dca..a03a28965 100644 --- a/source/core/ut_expectation_processor.pkb +++ b/source/core/ut_expectation_processor.pkb @@ -1,7 +1,7 @@ create or replace package body ut_expectation_processor as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/ut_expectation_processor.pks b/source/core/ut_expectation_processor.pks index cfcae8b42..dd9187526 100644 --- a/source/core/ut_expectation_processor.pks +++ b/source/core/ut_expectation_processor.pks @@ -1,7 +1,7 @@ create or replace package ut_expectation_processor authid current_user as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/ut_file_mapper.pkb b/source/core/ut_file_mapper.pkb index adecb7dc8..425360533 100644 --- a/source/core/ut_file_mapper.pkb +++ b/source/core/ut_file_mapper.pkb @@ -1,7 +1,7 @@ create or replace package body ut_file_mapper is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/ut_file_mapper.pks b/source/core/ut_file_mapper.pks index 4ed670ee5..adc4c983f 100644 --- a/source/core/ut_file_mapper.pks +++ b/source/core/ut_file_mapper.pks @@ -1,7 +1,7 @@ create or replace package ut_file_mapper authid current_user is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/ut_metadata.pkb b/source/core/ut_metadata.pkb index 3afc9d1c6..700c0efb0 100644 --- a/source/core/ut_metadata.pkb +++ b/source/core/ut_metadata.pkb @@ -1,7 +1,7 @@ create or replace package body ut_metadata as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/ut_metadata.pks b/source/core/ut_metadata.pks index bf62c4e52..27bfa5d30 100644 --- a/source/core/ut_metadata.pks +++ b/source/core/ut_metadata.pks @@ -1,7 +1,7 @@ create or replace package ut_metadata authid current_user as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/ut_savepoint_seq.sql b/source/core/ut_savepoint_seq.sql index b87d18e6d..5b0cda35e 100644 --- a/source/core/ut_savepoint_seq.sql +++ b/source/core/ut_savepoint_seq.sql @@ -1,7 +1,7 @@ create sequence ut_savepoint_seq /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index d13cbaed9..2dac6b4ad 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -1,7 +1,7 @@ create or replace package body ut_suite_builder is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/ut_suite_builder.pks b/source/core/ut_suite_builder.pks index e982fdbc1..352601a6d 100644 --- a/source/core/ut_suite_builder.pks +++ b/source/core/ut_suite_builder.pks @@ -1,7 +1,7 @@ create or replace package ut_suite_builder authid current_user is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/ut_suite_cache.sql b/source/core/ut_suite_cache.sql index a7f998f83..182caabd0 100644 --- a/source/core/ut_suite_cache.sql +++ b/source/core/ut_suite_cache.sql @@ -1,7 +1,7 @@ create table ut_suite_cache /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index ebc9a839d..0ae8d7104 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -1,7 +1,7 @@ create or replace package body ut_suite_cache_manager is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/ut_suite_cache_manager.pks b/source/core/ut_suite_cache_manager.pks index d5b31ccee..0a38851fe 100644 --- a/source/core/ut_suite_cache_manager.pks +++ b/source/core/ut_suite_cache_manager.pks @@ -1,7 +1,7 @@ create or replace package ut_suite_cache_manager authid definer is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/ut_suite_cache_package.sql b/source/core/ut_suite_cache_package.sql index 06f786949..7a146ff83 100644 --- a/source/core/ut_suite_cache_package.sql +++ b/source/core/ut_suite_cache_package.sql @@ -1,7 +1,7 @@ create table ut_suite_cache_package ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/core/ut_suite_cache_schema.sql b/source/core/ut_suite_cache_schema.sql index 46c7b0ef3..636816e65 100644 --- a/source/core/ut_suite_cache_schema.sql +++ b/source/core/ut_suite_cache_schema.sql @@ -1,7 +1,7 @@ create table ut_suite_cache_schema ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/core/ut_suite_cache_seq.sql b/source/core/ut_suite_cache_seq.sql index 36de28809..e1e560286 100644 --- a/source/core/ut_suite_cache_seq.sql +++ b/source/core/ut_suite_cache_seq.sql @@ -1,7 +1,7 @@ create sequence ut_suite_cache_seq /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 60c33f21f..8a5bcb9b8 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -1,7 +1,7 @@ create or replace package body ut_suite_manager is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/ut_suite_manager.pks b/source/core/ut_suite_manager.pks index 093201b36..5ae98d72a 100644 --- a/source/core/ut_suite_manager.pks +++ b/source/core/ut_suite_manager.pks @@ -1,7 +1,7 @@ create or replace package ut_suite_manager authid current_user is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 4e0bafe7c..7c0daf878 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -1,7 +1,7 @@ create or replace package body ut_utils is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 35aff2929..f8dcc19ab 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -1,7 +1,7 @@ create or replace package ut_utils authid definer is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/create_grants.sql b/source/create_grants.sql index db26faa24..f7f37a662 100644 --- a/source/create_grants.sql +++ b/source/create_grants.sql @@ -1,6 +1,6 @@ /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/create_synonyms.sql b/source/create_synonyms.sql index 3f18ba3ed..a4f06c228 100644 --- a/source/create_synonyms.sql +++ b/source/create_synonyms.sql @@ -1,6 +1,6 @@ /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/create_synonyms_and_grants_for_public.sql b/source/create_synonyms_and_grants_for_public.sql index 6d43c6b7a..050162d72 100644 --- a/source/create_synonyms_and_grants_for_public.sql +++ b/source/create_synonyms_and_grants_for_public.sql @@ -1,6 +1,6 @@ /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/create_user_grants.sql b/source/create_user_grants.sql index 4ca721cf4..83e594884 100644 --- a/source/create_user_grants.sql +++ b/source/create_user_grants.sql @@ -1,6 +1,6 @@ /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/create_user_synonyms.sql b/source/create_user_synonyms.sql index ee9f60fdd..a1e7a6acc 100644 --- a/source/create_user_synonyms.sql +++ b/source/create_user_synonyms.sql @@ -1,6 +1,6 @@ /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/create_utplsql_owner.sql b/source/create_utplsql_owner.sql index 81325e925..1af2cf168 100644 --- a/source/create_utplsql_owner.sql +++ b/source/create_utplsql_owner.sql @@ -1,6 +1,6 @@ /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/define_ut3_owner_param.sql b/source/define_ut3_owner_param.sql index 1b183b581..259b49712 100644 --- a/source/define_ut3_owner_param.sql +++ b/source/define_ut3_owner_param.sql @@ -1,6 +1,6 @@ /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_compound_data_diff_tmp.sql b/source/expectations/data_values/ut_compound_data_diff_tmp.sql index e96d716b5..c10e8d2e8 100644 --- a/source/expectations/data_values/ut_compound_data_diff_tmp.sql +++ b/source/expectations/data_values/ut_compound_data_diff_tmp.sql @@ -1,7 +1,7 @@ create global temporary table ut_compound_data_diff_tmp( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 657c02ce3..37d9901ff 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -1,7 +1,7 @@ create or replace package body ut_compound_data_helper is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index b39df0039..53b0846b8 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -1,7 +1,7 @@ create or replace package ut_compound_data_helper authid definer is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_compound_data_tmp.sql b/source/expectations/data_values/ut_compound_data_tmp.sql index c860a1872..1bfa77fca 100644 --- a/source/expectations/data_values/ut_compound_data_tmp.sql +++ b/source/expectations/data_values/ut_compound_data_tmp.sql @@ -1,7 +1,7 @@ create global temporary table ut_compound_data_tmp( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb index 627e14680..2c52ff8fa 100644 --- a/source/expectations/data_values/ut_compound_data_value.tpb +++ b/source/expectations/data_values/ut_compound_data_value.tpb @@ -1,7 +1,7 @@ create or replace type body ut_compound_data_value as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_compound_data_value.tps b/source/expectations/data_values/ut_compound_data_value.tps index 027b5ca26..c14dadceb 100644 --- a/source/expectations/data_values/ut_compound_data_value.tps +++ b/source/expectations/data_values/ut_compound_data_value.tps @@ -1,7 +1,7 @@ create or replace type ut_compound_data_value force under ut_data_value( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_cursor_column.tps b/source/expectations/data_values/ut_cursor_column.tps index c865ea64b..77bf78f01 100644 --- a/source/expectations/data_values/ut_cursor_column.tps +++ b/source/expectations/data_values/ut_cursor_column.tps @@ -1,7 +1,7 @@ create or replace type ut_cursor_column authid current_user as object ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_cursor_column_tab.tps b/source/expectations/data_values/ut_cursor_column_tab.tps index b1b33f7fe..106023d96 100644 --- a/source/expectations/data_values/ut_cursor_column_tab.tps +++ b/source/expectations/data_values/ut_cursor_column_tab.tps @@ -1,7 +1,7 @@ create or replace type ut_cursor_column_tab as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_cursor_details.tps b/source/expectations/data_values/ut_cursor_details.tps index 7092e834f..e7f9405eb 100644 --- a/source/expectations/data_values/ut_cursor_details.tps +++ b/source/expectations/data_values/ut_cursor_details.tps @@ -1,7 +1,7 @@ create or replace type ut_cursor_details authid current_user as object ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value.tpb b/source/expectations/data_values/ut_data_value.tpb index a644fe30e..6b1763dd0 100644 --- a/source/expectations/data_values/ut_data_value.tpb +++ b/source/expectations/data_values/ut_data_value.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value.tps b/source/expectations/data_values/ut_data_value.tps index ca7e18308..6864bc52e 100644 --- a/source/expectations/data_values/ut_data_value.tps +++ b/source/expectations/data_values/ut_data_value.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value force authid current_user as object ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_anydata.tpb b/source/expectations/data_values/ut_data_value_anydata.tpb index bb52159e0..f6fbdc840 100644 --- a/source/expectations/data_values/ut_data_value_anydata.tpb +++ b/source/expectations/data_values/ut_data_value_anydata.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value_anydata as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_anydata.tps b/source/expectations/data_values/ut_data_value_anydata.tps index 5ed0406ca..60dba5515 100644 --- a/source/expectations/data_values/ut_data_value_anydata.tps +++ b/source/expectations/data_values/ut_data_value_anydata.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value_anydata under ut_data_value_refcursor( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_blob.tpb b/source/expectations/data_values/ut_data_value_blob.tpb index 11af6d2f7..a7b5fbeca 100644 --- a/source/expectations/data_values/ut_data_value_blob.tpb +++ b/source/expectations/data_values/ut_data_value_blob.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value_blob as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_blob.tps b/source/expectations/data_values/ut_data_value_blob.tps index f557ffbce..6df3f3273 100644 --- a/source/expectations/data_values/ut_data_value_blob.tps +++ b/source/expectations/data_values/ut_data_value_blob.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value_blob under ut_data_value( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_boolean.tpb b/source/expectations/data_values/ut_data_value_boolean.tpb index 0645d3269..798222e30 100644 --- a/source/expectations/data_values/ut_data_value_boolean.tpb +++ b/source/expectations/data_values/ut_data_value_boolean.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value_boolean as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_boolean.tps b/source/expectations/data_values/ut_data_value_boolean.tps index a254e05c0..e25b6e0fd 100644 --- a/source/expectations/data_values/ut_data_value_boolean.tps +++ b/source/expectations/data_values/ut_data_value_boolean.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value_boolean under ut_data_value( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_clob.tpb b/source/expectations/data_values/ut_data_value_clob.tpb index dacb390b6..9cfe9b283 100644 --- a/source/expectations/data_values/ut_data_value_clob.tpb +++ b/source/expectations/data_values/ut_data_value_clob.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value_clob as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_clob.tps b/source/expectations/data_values/ut_data_value_clob.tps index 1ff5d5623..6869798d1 100644 --- a/source/expectations/data_values/ut_data_value_clob.tps +++ b/source/expectations/data_values/ut_data_value_clob.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value_clob under ut_data_value( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_date.tpb b/source/expectations/data_values/ut_data_value_date.tpb index dd87156bc..5b5b1d387 100644 --- a/source/expectations/data_values/ut_data_value_date.tpb +++ b/source/expectations/data_values/ut_data_value_date.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value_date as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_date.tps b/source/expectations/data_values/ut_data_value_date.tps index 4435a3512..f64a577e0 100644 --- a/source/expectations/data_values/ut_data_value_date.tps +++ b/source/expectations/data_values/ut_data_value_date.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value_date under ut_data_value( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_dsinterval.tpb b/source/expectations/data_values/ut_data_value_dsinterval.tpb index ff9d5fe1e..f81f35974 100644 --- a/source/expectations/data_values/ut_data_value_dsinterval.tpb +++ b/source/expectations/data_values/ut_data_value_dsinterval.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value_dsinterval as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_dsinterval.tps b/source/expectations/data_values/ut_data_value_dsinterval.tps index 114619bf2..a047ead48 100644 --- a/source/expectations/data_values/ut_data_value_dsinterval.tps +++ b/source/expectations/data_values/ut_data_value_dsinterval.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value_dsinterval under ut_data_value( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_json.tpb b/source/expectations/data_values/ut_data_value_json.tpb index 83916c30e..dfb3275ab 100644 --- a/source/expectations/data_values/ut_data_value_json.tpb +++ b/source/expectations/data_values/ut_data_value_json.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value_json as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_json.tps b/source/expectations/data_values/ut_data_value_json.tps index bfaccb2e2..135124e64 100644 --- a/source/expectations/data_values/ut_data_value_json.tps +++ b/source/expectations/data_values/ut_data_value_json.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value_json under ut_compound_data_value( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_number.tpb b/source/expectations/data_values/ut_data_value_number.tpb index b8a28a124..c5c4fe2c3 100644 --- a/source/expectations/data_values/ut_data_value_number.tpb +++ b/source/expectations/data_values/ut_data_value_number.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value_number as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_number.tps b/source/expectations/data_values/ut_data_value_number.tps index 872ab405e..86d68f356 100644 --- a/source/expectations/data_values/ut_data_value_number.tps +++ b/source/expectations/data_values/ut_data_value_number.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value_number under ut_data_value( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index da5c1a381..2715614c4 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value_refcursor as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_refcursor.tps b/source/expectations/data_values/ut_data_value_refcursor.tps index 4de253b8f..594695e32 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tps +++ b/source/expectations/data_values/ut_data_value_refcursor.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value_refcursor under ut_compound_data_value( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_timestamp.tpb b/source/expectations/data_values/ut_data_value_timestamp.tpb index adb18e360..79facae4a 100644 --- a/source/expectations/data_values/ut_data_value_timestamp.tpb +++ b/source/expectations/data_values/ut_data_value_timestamp.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value_timestamp as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_timestamp.tps b/source/expectations/data_values/ut_data_value_timestamp.tps index ebd00762c..c047e3c79 100644 --- a/source/expectations/data_values/ut_data_value_timestamp.tps +++ b/source/expectations/data_values/ut_data_value_timestamp.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value_timestamp under ut_data_value( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_timestamp_ltz.tpb b/source/expectations/data_values/ut_data_value_timestamp_ltz.tpb index 0f41e16b1..f2c5cddbd 100644 --- a/source/expectations/data_values/ut_data_value_timestamp_ltz.tpb +++ b/source/expectations/data_values/ut_data_value_timestamp_ltz.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value_timestamp_ltz as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_timestamp_ltz.tps b/source/expectations/data_values/ut_data_value_timestamp_ltz.tps index 3608ebd37..7bb296bc9 100644 --- a/source/expectations/data_values/ut_data_value_timestamp_ltz.tps +++ b/source/expectations/data_values/ut_data_value_timestamp_ltz.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value_timestamp_ltz under ut_data_value( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_timestamp_tz.tpb b/source/expectations/data_values/ut_data_value_timestamp_tz.tpb index 710a313a7..0991e9e9f 100644 --- a/source/expectations/data_values/ut_data_value_timestamp_tz.tpb +++ b/source/expectations/data_values/ut_data_value_timestamp_tz.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value_timestamp_tz as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_timestamp_tz.tps b/source/expectations/data_values/ut_data_value_timestamp_tz.tps index ca0bfc5cb..01cf11124 100644 --- a/source/expectations/data_values/ut_data_value_timestamp_tz.tps +++ b/source/expectations/data_values/ut_data_value_timestamp_tz.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value_timestamp_tz under ut_data_value( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_varchar2.tpb b/source/expectations/data_values/ut_data_value_varchar2.tpb index da4276d51..307ca583d 100644 --- a/source/expectations/data_values/ut_data_value_varchar2.tpb +++ b/source/expectations/data_values/ut_data_value_varchar2.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value_varchar2 as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_varchar2.tps b/source/expectations/data_values/ut_data_value_varchar2.tps index 27bb720ce..3fbeb378b 100644 --- a/source/expectations/data_values/ut_data_value_varchar2.tps +++ b/source/expectations/data_values/ut_data_value_varchar2.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value_varchar2 under ut_data_value( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_xmltype.tpb b/source/expectations/data_values/ut_data_value_xmltype.tpb index 3b10aadce..d17896492 100644 --- a/source/expectations/data_values/ut_data_value_xmltype.tpb +++ b/source/expectations/data_values/ut_data_value_xmltype.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value_xmltype as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_xmltype.tps b/source/expectations/data_values/ut_data_value_xmltype.tps index 476097de3..9ba738b88 100644 --- a/source/expectations/data_values/ut_data_value_xmltype.tps +++ b/source/expectations/data_values/ut_data_value_xmltype.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value_xmltype under ut_data_value( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_yminterval.tpb b/source/expectations/data_values/ut_data_value_yminterval.tpb index 6d6a05b4a..7de3e58cd 100644 --- a/source/expectations/data_values/ut_data_value_yminterval.tpb +++ b/source/expectations/data_values/ut_data_value_yminterval.tpb @@ -1,7 +1,7 @@ create or replace type body ut_data_value_yminterval as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_data_value_yminterval.tps b/source/expectations/data_values/ut_data_value_yminterval.tps index d20dfcad7..278a2f803 100644 --- a/source/expectations/data_values/ut_data_value_yminterval.tps +++ b/source/expectations/data_values/ut_data_value_yminterval.tps @@ -1,7 +1,7 @@ create or replace type ut_data_value_yminterval under ut_data_value( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_json_data_diff_tmp.sql b/source/expectations/data_values/ut_json_data_diff_tmp.sql index bfaaa1b72..5ff3440d8 100644 --- a/source/expectations/data_values/ut_json_data_diff_tmp.sql +++ b/source/expectations/data_values/ut_json_data_diff_tmp.sql @@ -1,7 +1,7 @@ create global temporary table ut_json_data_diff_tmp( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/source/expectations/data_values/ut_json_leaf.tps b/source/expectations/data_values/ut_json_leaf.tps index c38c3b238..8aa8afd6a 100644 --- a/source/expectations/data_values/ut_json_leaf.tps +++ b/source/expectations/data_values/ut_json_leaf.tps @@ -1,7 +1,7 @@ create or replace type ut_json_leaf authid current_user as object ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_json_leaf_tab.tps b/source/expectations/data_values/ut_json_leaf_tab.tps index 0c7a40b9f..395ab5d9e 100644 --- a/source/expectations/data_values/ut_json_leaf_tab.tps +++ b/source/expectations/data_values/ut_json_leaf_tab.tps @@ -1,7 +1,7 @@ create or replace type ut_json_leaf_tab as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_json_tree_details.tps b/source/expectations/data_values/ut_json_tree_details.tps index 0684ecafe..20ac2fdcc 100644 --- a/source/expectations/data_values/ut_json_tree_details.tps +++ b/source/expectations/data_values/ut_json_tree_details.tps @@ -1,7 +1,7 @@ create or replace type ut_json_tree_details force as object ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_key_anyval_pair.tps b/source/expectations/data_values/ut_key_anyval_pair.tps index 4903282e9..d1068f109 100644 --- a/source/expectations/data_values/ut_key_anyval_pair.tps +++ b/source/expectations/data_values/ut_key_anyval_pair.tps @@ -1,7 +1,7 @@ create or replace type ut_key_anyval_pair force as object( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_key_anyval_pairs.tps b/source/expectations/data_values/ut_key_anyval_pairs.tps index 94bd5df54..7e10bf50f 100644 --- a/source/expectations/data_values/ut_key_anyval_pairs.tps +++ b/source/expectations/data_values/ut_key_anyval_pairs.tps @@ -1,7 +1,7 @@ create or replace type ut_key_anyval_pairs as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_key_anyvalues.tpb b/source/expectations/data_values/ut_key_anyvalues.tpb index 93bf1eb53..d30d8a841 100644 --- a/source/expectations/data_values/ut_key_anyvalues.tpb +++ b/source/expectations/data_values/ut_key_anyvalues.tpb @@ -1,7 +1,7 @@ create or replace type body ut_key_anyvalues as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/data_values/ut_key_anyvalues.tps b/source/expectations/data_values/ut_key_anyvalues.tps index 6dd32a76d..8c672bd00 100644 --- a/source/expectations/data_values/ut_key_anyvalues.tps +++ b/source/expectations/data_values/ut_key_anyvalues.tps @@ -1,7 +1,7 @@ create or replace type ut_key_anyvalues under ut_event_item ( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_between.tpb b/source/expectations/matchers/ut_be_between.tpb index 7368ad5a7..6aea96f55 100644 --- a/source/expectations/matchers/ut_be_between.tpb +++ b/source/expectations/matchers/ut_be_between.tpb @@ -1,7 +1,7 @@ create or replace type body ut_be_between is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_between.tps b/source/expectations/matchers/ut_be_between.tps index 7e254719e..9e984085b 100644 --- a/source/expectations/matchers/ut_be_between.tps +++ b/source/expectations/matchers/ut_be_between.tps @@ -1,7 +1,7 @@ create or replace type ut_be_between under ut_matcher( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_empty.tpb b/source/expectations/matchers/ut_be_empty.tpb index 08523fb02..e5e02f6b2 100644 --- a/source/expectations/matchers/ut_be_empty.tpb +++ b/source/expectations/matchers/ut_be_empty.tpb @@ -1,7 +1,7 @@ create or replace type body ut_be_empty as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_empty.tps b/source/expectations/matchers/ut_be_empty.tps index 76af402fe..9e9f899d0 100644 --- a/source/expectations/matchers/ut_be_empty.tps +++ b/source/expectations/matchers/ut_be_empty.tps @@ -1,7 +1,7 @@ create or replace type ut_be_empty under ut_matcher( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_false.tpb b/source/expectations/matchers/ut_be_false.tpb index 671f43cbe..4cc88600a 100644 --- a/source/expectations/matchers/ut_be_false.tpb +++ b/source/expectations/matchers/ut_be_false.tpb @@ -1,7 +1,7 @@ create or replace type body ut_be_false as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_false.tps b/source/expectations/matchers/ut_be_false.tps index 3d4e8dda9..ede510719 100644 --- a/source/expectations/matchers/ut_be_false.tps +++ b/source/expectations/matchers/ut_be_false.tps @@ -1,7 +1,7 @@ create or replace type ut_be_false under ut_matcher( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_greater_or_equal.tpb b/source/expectations/matchers/ut_be_greater_or_equal.tpb index 6877eb32c..1c2a19c09 100644 --- a/source/expectations/matchers/ut_be_greater_or_equal.tpb +++ b/source/expectations/matchers/ut_be_greater_or_equal.tpb @@ -1,7 +1,7 @@ create or replace type body ut_be_greater_or_equal AS /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_greater_or_equal.tps b/source/expectations/matchers/ut_be_greater_or_equal.tps index facd33b3d..b3ab54ff1 100644 --- a/source/expectations/matchers/ut_be_greater_or_equal.tps +++ b/source/expectations/matchers/ut_be_greater_or_equal.tps @@ -1,7 +1,7 @@ create or replace type ut_be_greater_or_equal under ut_comparison_matcher( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_greater_than.tpb b/source/expectations/matchers/ut_be_greater_than.tpb index da46347af..9cce79119 100644 --- a/source/expectations/matchers/ut_be_greater_than.tpb +++ b/source/expectations/matchers/ut_be_greater_than.tpb @@ -1,7 +1,7 @@ create or replace type body ut_be_greater_than AS /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_greater_than.tps b/source/expectations/matchers/ut_be_greater_than.tps index fa19a9bd4..a5a44692d 100644 --- a/source/expectations/matchers/ut_be_greater_than.tps +++ b/source/expectations/matchers/ut_be_greater_than.tps @@ -1,7 +1,7 @@ create or replace type ut_be_greater_than under ut_comparison_matcher( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_less_or_equal.tpb b/source/expectations/matchers/ut_be_less_or_equal.tpb index 98c4238eb..6acec1dda 100644 --- a/source/expectations/matchers/ut_be_less_or_equal.tpb +++ b/source/expectations/matchers/ut_be_less_or_equal.tpb @@ -1,7 +1,7 @@ create or replace type body ut_be_less_or_equal AS /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_less_or_equal.tps b/source/expectations/matchers/ut_be_less_or_equal.tps index 225c99b72..118611a41 100644 --- a/source/expectations/matchers/ut_be_less_or_equal.tps +++ b/source/expectations/matchers/ut_be_less_or_equal.tps @@ -1,7 +1,7 @@ create or replace type ut_be_less_or_equal under ut_comparison_matcher( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_less_than.tpb b/source/expectations/matchers/ut_be_less_than.tpb index e1c5c84b1..7608e4917 100644 --- a/source/expectations/matchers/ut_be_less_than.tpb +++ b/source/expectations/matchers/ut_be_less_than.tpb @@ -1,7 +1,7 @@ create or replace type body ut_be_less_than as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_less_than.tps b/source/expectations/matchers/ut_be_less_than.tps index 8482f0327..b652de789 100644 --- a/source/expectations/matchers/ut_be_less_than.tps +++ b/source/expectations/matchers/ut_be_less_than.tps @@ -1,7 +1,7 @@ create or replace type ut_be_less_than under ut_comparison_matcher( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_like.tpb b/source/expectations/matchers/ut_be_like.tpb index dbcd1c798..6865c2942 100644 --- a/source/expectations/matchers/ut_be_like.tpb +++ b/source/expectations/matchers/ut_be_like.tpb @@ -1,7 +1,7 @@ create or replace type body ut_be_like as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_like.tps b/source/expectations/matchers/ut_be_like.tps index 0c1609a98..dae93a1d9 100644 --- a/source/expectations/matchers/ut_be_like.tps +++ b/source/expectations/matchers/ut_be_like.tps @@ -1,7 +1,7 @@ create or replace type ut_be_like under ut_matcher( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_not_null.tpb b/source/expectations/matchers/ut_be_not_null.tpb index 94ee0ce0a..194e2ea32 100644 --- a/source/expectations/matchers/ut_be_not_null.tpb +++ b/source/expectations/matchers/ut_be_not_null.tpb @@ -1,7 +1,7 @@ create or replace type body ut_be_not_null as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_not_null.tps b/source/expectations/matchers/ut_be_not_null.tps index 34cc2bfd0..196aac9fb 100644 --- a/source/expectations/matchers/ut_be_not_null.tps +++ b/source/expectations/matchers/ut_be_not_null.tps @@ -1,7 +1,7 @@ create or replace type ut_be_not_null under ut_matcher( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_null.tpb b/source/expectations/matchers/ut_be_null.tpb index 3194f092f..8c672791b 100644 --- a/source/expectations/matchers/ut_be_null.tpb +++ b/source/expectations/matchers/ut_be_null.tpb @@ -1,7 +1,7 @@ create or replace type body ut_be_null as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_null.tps b/source/expectations/matchers/ut_be_null.tps index 486e11f28..3b2d6ac84 100644 --- a/source/expectations/matchers/ut_be_null.tps +++ b/source/expectations/matchers/ut_be_null.tps @@ -1,7 +1,7 @@ create or replace type ut_be_null under ut_matcher( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_true.tpb b/source/expectations/matchers/ut_be_true.tpb index 565ab590b..fe78b4e22 100644 --- a/source/expectations/matchers/ut_be_true.tpb +++ b/source/expectations/matchers/ut_be_true.tpb @@ -1,7 +1,7 @@ create or replace type body ut_be_true as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_be_true.tps b/source/expectations/matchers/ut_be_true.tps index b994913f5..8b5491e39 100644 --- a/source/expectations/matchers/ut_be_true.tps +++ b/source/expectations/matchers/ut_be_true.tps @@ -1,7 +1,7 @@ create or replace type ut_be_true under ut_matcher( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_comparison_matcher.tpb b/source/expectations/matchers/ut_comparison_matcher.tpb index 50f8d6050..20ed35927 100644 --- a/source/expectations/matchers/ut_comparison_matcher.tpb +++ b/source/expectations/matchers/ut_comparison_matcher.tpb @@ -1,7 +1,7 @@ create or replace type body ut_comparison_matcher as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_comparison_matcher.tps b/source/expectations/matchers/ut_comparison_matcher.tps index 76520a296..68ecb4462 100644 --- a/source/expectations/matchers/ut_comparison_matcher.tps +++ b/source/expectations/matchers/ut_comparison_matcher.tps @@ -1,7 +1,7 @@ create or replace type ut_comparison_matcher under ut_matcher( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_contain.tpb b/source/expectations/matchers/ut_contain.tpb index c0c4f481a..7591925f5 100644 --- a/source/expectations/matchers/ut_contain.tpb +++ b/source/expectations/matchers/ut_contain.tpb @@ -1,7 +1,7 @@ create or replace type body ut_contain as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_contain.tps b/source/expectations/matchers/ut_contain.tps index 518352573..e572edf62 100644 --- a/source/expectations/matchers/ut_contain.tps +++ b/source/expectations/matchers/ut_contain.tps @@ -1,7 +1,7 @@ create or replace type ut_contain under ut_equal( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_equal.tpb b/source/expectations/matchers/ut_equal.tpb index afa2148f3..05caf3b09 100644 --- a/source/expectations/matchers/ut_equal.tpb +++ b/source/expectations/matchers/ut_equal.tpb @@ -1,7 +1,7 @@ create or replace type body ut_equal as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_equal.tps b/source/expectations/matchers/ut_equal.tps index 1f42324d7..eecbe8c1d 100644 --- a/source/expectations/matchers/ut_equal.tps +++ b/source/expectations/matchers/ut_equal.tps @@ -1,7 +1,7 @@ create or replace type ut_equal force under ut_comparison_matcher( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_have_count.tpb b/source/expectations/matchers/ut_have_count.tpb index b0f4e06d4..457cd6272 100644 --- a/source/expectations/matchers/ut_have_count.tpb +++ b/source/expectations/matchers/ut_have_count.tpb @@ -1,7 +1,7 @@ create or replace type body ut_have_count as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_have_count.tps b/source/expectations/matchers/ut_have_count.tps index fb0fc76fc..d48dc44c8 100644 --- a/source/expectations/matchers/ut_have_count.tps +++ b/source/expectations/matchers/ut_have_count.tps @@ -1,7 +1,7 @@ create or replace type ut_have_count under ut_matcher( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_match.tpb b/source/expectations/matchers/ut_match.tpb index 57fabbaec..3c7a71402 100644 --- a/source/expectations/matchers/ut_match.tpb +++ b/source/expectations/matchers/ut_match.tpb @@ -1,7 +1,7 @@ create or replace type body ut_match as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_match.tps b/source/expectations/matchers/ut_match.tps index 8d6b0f73a..ee51a4c28 100644 --- a/source/expectations/matchers/ut_match.tps +++ b/source/expectations/matchers/ut_match.tps @@ -1,7 +1,7 @@ create or replace type ut_match under ut_matcher( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_matcher.tpb b/source/expectations/matchers/ut_matcher.tpb index 11ff1b6b6..c64b6d246 100644 --- a/source/expectations/matchers/ut_matcher.tpb +++ b/source/expectations/matchers/ut_matcher.tpb @@ -1,7 +1,7 @@ create or replace type body ut_matcher as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_matcher.tps b/source/expectations/matchers/ut_matcher.tps index 34e1742df..ba8bb7e85 100644 --- a/source/expectations/matchers/ut_matcher.tps +++ b/source/expectations/matchers/ut_matcher.tps @@ -1,7 +1,7 @@ create or replace type ut_matcher authid current_user as object( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_matcher_options.tpb b/source/expectations/matchers/ut_matcher_options.tpb index 6fec3dee6..8730c204b 100644 --- a/source/expectations/matchers/ut_matcher_options.tpb +++ b/source/expectations/matchers/ut_matcher_options.tpb @@ -1,7 +1,7 @@ create or replace type body ut_matcher_options as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_matcher_options.tps b/source/expectations/matchers/ut_matcher_options.tps index dbdf985f0..276cad2ec 100644 --- a/source/expectations/matchers/ut_matcher_options.tps +++ b/source/expectations/matchers/ut_matcher_options.tps @@ -1,7 +1,7 @@ create or replace type ut_matcher_options authid current_user as object( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_matcher_options_items.tpb b/source/expectations/matchers/ut_matcher_options_items.tpb index 2c3f51d34..92da588ce 100644 --- a/source/expectations/matchers/ut_matcher_options_items.tpb +++ b/source/expectations/matchers/ut_matcher_options_items.tpb @@ -1,7 +1,7 @@ create or replace type body ut_matcher_options_items is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/matchers/ut_matcher_options_items.tps b/source/expectations/matchers/ut_matcher_options_items.tps index cc74650f3..53787070d 100644 --- a/source/expectations/matchers/ut_matcher_options_items.tps +++ b/source/expectations/matchers/ut_matcher_options_items.tps @@ -1,7 +1,7 @@ create or replace type ut_matcher_options_items authid current_user as object( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/ut_expectation.tpb b/source/expectations/ut_expectation.tpb index d8ed1f79a..dfad630a6 100644 --- a/source/expectations/ut_expectation.tpb +++ b/source/expectations/ut_expectation.tpb @@ -1,7 +1,7 @@ create or replace type body ut_expectation as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/ut_expectation.tps b/source/expectations/ut_expectation.tps index 37fefd085..45d768200 100644 --- a/source/expectations/ut_expectation.tps +++ b/source/expectations/ut_expectation.tps @@ -1,7 +1,7 @@ create or replace type ut_expectation authid current_user as object( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/ut_expectation_compound.tpb b/source/expectations/ut_expectation_compound.tpb index 5e7268bd9..9dfd78e3e 100644 --- a/source/expectations/ut_expectation_compound.tpb +++ b/source/expectations/ut_expectation_compound.tpb @@ -1,7 +1,7 @@ create or replace type body ut_expectation_compound as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/ut_expectation_compound.tps b/source/expectations/ut_expectation_compound.tps index fc413e3fd..ab320cae0 100644 --- a/source/expectations/ut_expectation_compound.tps +++ b/source/expectations/ut_expectation_compound.tps @@ -1,7 +1,7 @@ create or replace type ut_expectation_compound force under ut_expectation( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/ut_expectation_json.tpb b/source/expectations/ut_expectation_json.tpb index 49c0c2e1f..b71e8ea83 100644 --- a/source/expectations/ut_expectation_json.tpb +++ b/source/expectations/ut_expectation_json.tpb @@ -1,7 +1,7 @@ create or replace type body ut_expectation_json as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/expectations/ut_expectation_json.tps b/source/expectations/ut_expectation_json.tps index dd3aa5b25..f33c6a580 100644 --- a/source/expectations/ut_expectation_json.tps +++ b/source/expectations/ut_expectation_json.tps @@ -1,7 +1,7 @@ create or replace type ut_expectation_json under ut_expectation( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/install.sql b/source/install.sql index 3249e3e49..f7df12b39 100644 --- a/source/install.sql +++ b/source/install.sql @@ -1,6 +1,6 @@ /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/install_component.sql b/source/install_component.sql index 857c1771c..373c85c54 100644 --- a/source/install_component.sql +++ b/source/install_component.sql @@ -1,6 +1,6 @@ /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/install_ddl_trigger.sql b/source/install_ddl_trigger.sql index 843ee0c07..bc147c2be 100644 --- a/source/install_ddl_trigger.sql +++ b/source/install_ddl_trigger.sql @@ -1,6 +1,6 @@ /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/install_headless.sql b/source/install_headless.sql index e8cf00705..183262675 100644 --- a/source/install_headless.sql +++ b/source/install_headless.sql @@ -1,6 +1,6 @@ /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/install_headless_with_trigger.sql b/source/install_headless_with_trigger.sql index 16d81f3c6..76ae48ccb 100644 --- a/source/install_headless_with_trigger.sql +++ b/source/install_headless_with_trigger.sql @@ -1,6 +1,6 @@ /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_ansiconsole_helper.pkb b/source/reporters/ut_ansiconsole_helper.pkb index b015e50be..53e6bc6aa 100644 --- a/source/reporters/ut_ansiconsole_helper.pkb +++ b/source/reporters/ut_ansiconsole_helper.pkb @@ -1,7 +1,7 @@ create or replace package body ut_ansiconsole_helper as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_ansiconsole_helper.pks b/source/reporters/ut_ansiconsole_helper.pks index 7c83ca73b..217d36a49 100644 --- a/source/reporters/ut_ansiconsole_helper.pks +++ b/source/reporters/ut_ansiconsole_helper.pks @@ -1,7 +1,7 @@ create or replace package ut_ansiconsole_helper as /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_coverage_cobertura_reporter.tpb b/source/reporters/ut_coverage_cobertura_reporter.tpb index d8aae7f7a..0c3857b7e 100644 --- a/source/reporters/ut_coverage_cobertura_reporter.tpb +++ b/source/reporters/ut_coverage_cobertura_reporter.tpb @@ -1,7 +1,7 @@ create or replace type body ut_coverage_cobertura_reporter is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_coverage_cobertura_reporter.tps b/source/reporters/ut_coverage_cobertura_reporter.tps index ec5cef2cb..1292e60fb 100644 --- a/source/reporters/ut_coverage_cobertura_reporter.tps +++ b/source/reporters/ut_coverage_cobertura_reporter.tps @@ -1,7 +1,7 @@ create or replace type ut_coverage_cobertura_reporter under ut_coverage_reporter_base( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_coverage_html_reporter.tpb b/source/reporters/ut_coverage_html_reporter.tpb index 9e51b5cc2..c88c91a80 100644 --- a/source/reporters/ut_coverage_html_reporter.tpb +++ b/source/reporters/ut_coverage_html_reporter.tpb @@ -1,7 +1,7 @@ create or replace type body ut_coverage_html_reporter is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_coverage_html_reporter.tps b/source/reporters/ut_coverage_html_reporter.tps index f6bdcc249..42f2fd4e3 100644 --- a/source/reporters/ut_coverage_html_reporter.tps +++ b/source/reporters/ut_coverage_html_reporter.tps @@ -1,7 +1,7 @@ create or replace type ut_coverage_html_reporter under ut_coverage_reporter_base( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_coverage_report_html_helper.pkb b/source/reporters/ut_coverage_report_html_helper.pkb index f4b633c1f..2bb9a87d9 100644 --- a/source/reporters/ut_coverage_report_html_helper.pkb +++ b/source/reporters/ut_coverage_report_html_helper.pkb @@ -1,7 +1,7 @@ create or replace package body ut_coverage_report_html_helper is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_coverage_report_html_helper.pks b/source/reporters/ut_coverage_report_html_helper.pks index 48dd76acf..42a59c123 100644 --- a/source/reporters/ut_coverage_report_html_helper.pks +++ b/source/reporters/ut_coverage_report_html_helper.pks @@ -1,7 +1,7 @@ create or replace package ut_coverage_report_html_helper authid current_user is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_coverage_sonar_reporter.tpb b/source/reporters/ut_coverage_sonar_reporter.tpb index 68f4a7989..4bde1a88d 100644 --- a/source/reporters/ut_coverage_sonar_reporter.tpb +++ b/source/reporters/ut_coverage_sonar_reporter.tpb @@ -1,7 +1,7 @@ create or replace type body ut_coverage_sonar_reporter is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_coverage_sonar_reporter.tps b/source/reporters/ut_coverage_sonar_reporter.tps index aa21cafe3..f3076368f 100644 --- a/source/reporters/ut_coverage_sonar_reporter.tps +++ b/source/reporters/ut_coverage_sonar_reporter.tps @@ -1,7 +1,7 @@ create or replace type ut_coverage_sonar_reporter under ut_coverage_reporter_base( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_coveralls_reporter.tpb b/source/reporters/ut_coveralls_reporter.tpb index f2cb73abe..3a54aa7f7 100644 --- a/source/reporters/ut_coveralls_reporter.tpb +++ b/source/reporters/ut_coveralls_reporter.tpb @@ -1,7 +1,7 @@ create or replace type body ut_coveralls_reporter is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_coveralls_reporter.tps b/source/reporters/ut_coveralls_reporter.tps index 53e86338e..f3cad3a4e 100644 --- a/source/reporters/ut_coveralls_reporter.tps +++ b/source/reporters/ut_coveralls_reporter.tps @@ -1,7 +1,7 @@ create or replace type ut_coveralls_reporter under ut_coverage_reporter_base( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_debug_reporter.tpb b/source/reporters/ut_debug_reporter.tpb index 5f457bb79..879725172 100644 --- a/source/reporters/ut_debug_reporter.tpb +++ b/source/reporters/ut_debug_reporter.tpb @@ -1,7 +1,7 @@ create or replace type body ut_debug_reporter is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_debug_reporter.tps b/source/reporters/ut_debug_reporter.tps index 5fbab61fb..2123f19cc 100644 --- a/source/reporters/ut_debug_reporter.tps +++ b/source/reporters/ut_debug_reporter.tps @@ -1,7 +1,7 @@ create or replace type ut_debug_reporter under ut_output_reporter_base( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_documentation_reporter.tpb b/source/reporters/ut_documentation_reporter.tpb index 7210e1cb6..8b92d447f 100644 --- a/source/reporters/ut_documentation_reporter.tpb +++ b/source/reporters/ut_documentation_reporter.tpb @@ -1,7 +1,7 @@ create or replace type body ut_documentation_reporter is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_documentation_reporter.tps b/source/reporters/ut_documentation_reporter.tps index 08097e7d4..422225117 100644 --- a/source/reporters/ut_documentation_reporter.tps +++ b/source/reporters/ut_documentation_reporter.tps @@ -1,7 +1,7 @@ create or replace type ut_documentation_reporter under ut_console_reporter_base( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_junit_reporter.tpb b/source/reporters/ut_junit_reporter.tpb index aa6786f6f..94ea5c5e6 100644 --- a/source/reporters/ut_junit_reporter.tpb +++ b/source/reporters/ut_junit_reporter.tpb @@ -1,7 +1,7 @@ create or replace type body ut_junit_reporter is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_junit_reporter.tps b/source/reporters/ut_junit_reporter.tps index ca6cf505b..6cdaff1b9 100644 --- a/source/reporters/ut_junit_reporter.tps +++ b/source/reporters/ut_junit_reporter.tps @@ -1,7 +1,7 @@ create or replace type ut_junit_reporter force under ut_output_reporter_base( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_realtime_reporter.tpb b/source/reporters/ut_realtime_reporter.tpb index 443c7c4e7..837643b0b 100644 --- a/source/reporters/ut_realtime_reporter.tpb +++ b/source/reporters/ut_realtime_reporter.tpb @@ -1,7 +1,7 @@ create or replace type body ut_realtime_reporter is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_realtime_reporter.tps b/source/reporters/ut_realtime_reporter.tps index 99efed387..0501006e4 100644 --- a/source/reporters/ut_realtime_reporter.tps +++ b/source/reporters/ut_realtime_reporter.tps @@ -1,7 +1,7 @@ create or replace type ut_realtime_reporter force under ut_output_reporter_base( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_sonar_test_reporter.tpb b/source/reporters/ut_sonar_test_reporter.tpb index 6d76b5d41..8b043832a 100644 --- a/source/reporters/ut_sonar_test_reporter.tpb +++ b/source/reporters/ut_sonar_test_reporter.tpb @@ -1,7 +1,7 @@ create or replace type body ut_sonar_test_reporter is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_sonar_test_reporter.tps b/source/reporters/ut_sonar_test_reporter.tps index 8bdb067df..ac3b16bd1 100644 --- a/source/reporters/ut_sonar_test_reporter.tps +++ b/source/reporters/ut_sonar_test_reporter.tps @@ -1,7 +1,7 @@ create or replace type ut_sonar_test_reporter under ut_output_reporter_base( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_teamcity_reporter.tpb b/source/reporters/ut_teamcity_reporter.tpb index 9475c0a90..3e1a4bcf8 100644 --- a/source/reporters/ut_teamcity_reporter.tpb +++ b/source/reporters/ut_teamcity_reporter.tpb @@ -1,7 +1,7 @@ create or replace type body ut_teamcity_reporter is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_teamcity_reporter.tps b/source/reporters/ut_teamcity_reporter.tps index 2738ec00e..e03fa3643 100644 --- a/source/reporters/ut_teamcity_reporter.tps +++ b/source/reporters/ut_teamcity_reporter.tps @@ -1,7 +1,7 @@ create or replace type ut_teamcity_reporter under ut_output_reporter_base( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_teamcity_reporter_helper.pkb b/source/reporters/ut_teamcity_reporter_helper.pkb index 2d165d7a3..3a4679cb4 100644 --- a/source/reporters/ut_teamcity_reporter_helper.pkb +++ b/source/reporters/ut_teamcity_reporter_helper.pkb @@ -1,7 +1,7 @@ create or replace package body ut_teamcity_reporter_helper is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_teamcity_reporter_helper.pks b/source/reporters/ut_teamcity_reporter_helper.pks index 7258999e1..d94099411 100644 --- a/source/reporters/ut_teamcity_reporter_helper.pks +++ b/source/reporters/ut_teamcity_reporter_helper.pks @@ -1,7 +1,7 @@ create or replace package ut_teamcity_reporter_helper is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_tfs_junit_reporter.tpb b/source/reporters/ut_tfs_junit_reporter.tpb index 5262ac687..e14af1d4d 100644 --- a/source/reporters/ut_tfs_junit_reporter.tpb +++ b/source/reporters/ut_tfs_junit_reporter.tpb @@ -1,7 +1,7 @@ create or replace type body ut_tfs_junit_reporter is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_tfs_junit_reporter.tps b/source/reporters/ut_tfs_junit_reporter.tps index ecf422bd3..61cbc3fd8 100644 --- a/source/reporters/ut_tfs_junit_reporter.tps +++ b/source/reporters/ut_tfs_junit_reporter.tps @@ -1,7 +1,7 @@ create or replace type ut_tfs_junit_reporter under ut_output_reporter_base( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_xunit_reporter.tpb b/source/reporters/ut_xunit_reporter.tpb index b06c20810..eab0c8a3c 100644 --- a/source/reporters/ut_xunit_reporter.tpb +++ b/source/reporters/ut_xunit_reporter.tpb @@ -1,7 +1,7 @@ create or replace type body ut_xunit_reporter is /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/reporters/ut_xunit_reporter.tps b/source/reporters/ut_xunit_reporter.tps index b09205171..6c530fee4 100644 --- a/source/reporters/ut_xunit_reporter.tps +++ b/source/reporters/ut_xunit_reporter.tps @@ -1,7 +1,7 @@ create or replace type ut_xunit_reporter under ut_junit_reporter( /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/set_install_params.sql b/source/set_install_params.sql index 4dc33c367..34a23dc93 100644 --- a/source/set_install_params.sql +++ b/source/set_install_params.sql @@ -1,6 +1,6 @@ /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/uninstall.sql b/source/uninstall.sql index 760bf89b7..ced7b8dc4 100644 --- a/source/uninstall.sql +++ b/source/uninstall.sql @@ -1,6 +1,6 @@ /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/uninstall_all.sql b/source/uninstall_all.sql index 32180d762..cfaaaa29f 100644 --- a/source/uninstall_all.sql +++ b/source/uninstall_all.sql @@ -1,6 +1,6 @@ /* utPLSQL - Version 3 - Copyright 2016 - 2019 utPLSQL Project + Copyright 2016 - 2021 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. From 000aeabab0072ab1d4584ef1661146e12f51e312 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 15 Nov 2021 18:53:23 +0000 Subject: [PATCH 0775/1096] Updated project version after build [skip ci] --- VERSION | 2 +- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- sonar-project.properties | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/VERSION b/VERSION index 571f2ad11..021c7c624 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.11-develop +v3.1.11 diff --git a/docs/about/authors.md b/docs/about/authors.md index cd16c82b6..6575abbec 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 7758a2190..772fa553f 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index f0304acf9..4f4f34f1a 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index ed6c34fe8..15906a35b 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 57a29707b..7654a2e01 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index a5331ff2e..557dc2d9c 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index b760cb1b1..443c7ae21 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index bf7189d10..c0fa4ee10 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 814733301..40aacae39 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 71113a1d6..0794f4ca7 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 3bc60effb..1da384c1d 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 8a14cd767..c1233c258 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 144b4a835..f9af73346 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 79942bb30..e280a3187 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index ebb32163d..ac00118db 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 0dee54b06..c2c1f6a33 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 6f6af8798..7e21cbd27 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) # Upgrading from version 2 diff --git a/sonar-project.properties b/sonar-project.properties index ddd794a91..6220e0b90 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,7 @@ sonar.projectKey=utPLSQL # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=utPLSQL -sonar.projectVersion=v3.1.11-develop +sonar.projectVersion=v3.1.11 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # Since SonarQube 4.2, this property is optional if sonar.modules is set. diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 7c0daf878..b5951a905 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -788,7 +788,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.11.3549-develop + * secion v3.1.11.3550 */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index f8dcc19ab..6e5f149eb 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.11.3549-develop'; + gc_version constant varchar2(50) := 'v3.1.11.3550'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 581991b4127445f1846cc89823329f3c3309c396 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 15 Nov 2021 21:39:13 +0200 Subject: [PATCH 0776/1096] Fixed failing tests and improved coverage reporting --- source/reporters/ut_coverage_cobertura_reporter.tpb | 6 +++--- .../reporters/test_coverage/test_cov_cobertura_reporter.pkb | 2 +- .../reporters/test_coverage/test_coverage_standalone.pkb | 2 +- .../reporters/test_coverage/test_proftab_coverage.pkb | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/reporters/ut_coverage_cobertura_reporter.tpb b/source/reporters/ut_coverage_cobertura_reporter.tpb index e34bca79b..8ee6dd31a 100644 --- a/source/reporters/ut_coverage_cobertura_reporter.tpb +++ b/source/reporters/ut_coverage_cobertura_reporter.tpb @@ -82,7 +82,7 @@ create or replace type body ut_coverage_cobertura_reporter is c_classes_footer constant varchar2(30) := ''; c_lines_footer constant varchar2(30) := ''; l_epoch varchar2(50) := (sysdate - to_date('01-01-1970 00:00:00', 'dd-mm-yyyy hh24:mi:ss')) * 24 * 60 * 60; - l_lines_valid number := a_coverage_data.covered_lines + a_coverage_data.uncovered_lines; + l_lines_valid integer := a_coverage_data.covered_lines + a_coverage_data.uncovered_lines; begin ut_utils.append_to_list( l_result, ut_utils.get_xml_header(a_run.client_character_set) ); @@ -92,10 +92,10 @@ create or replace type body ut_coverage_cobertura_reporter is ut_utils.append_to_list( l_result, '' ); diff --git a/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb index a18409463..2c36f37ba 100644 --- a/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb +++ b/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb @@ -20,7 +20,7 @@ create or replace package body test_cov_cobertura_reporter is l_expected := q'[ - + ]'||l_file_path||q'[ diff --git a/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb b/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb index d94108a32..e5706f885 100644 --- a/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb +++ b/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb @@ -15,7 +15,7 @@ create or replace package body test_coverage_standalone is l_expected := q'[ - + ]'||l_file_path||q'[ diff --git a/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb b/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb index 81a9a4c58..7256fc202 100644 --- a/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb +++ b/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb @@ -164,7 +164,7 @@ create or replace package body test_proftab_coverage is l_expected := q'[ - + package body ut3_develop.{p} From ad5faa8ca06f3e81ce21708fdfb44ff35e6057b6 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 15 Nov 2021 20:25:41 +0000 Subject: [PATCH 0777/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index cd16c82b6..bbfd22348 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 7758a2190..3568a0c9d 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index f0304acf9..4dd55a8ba 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index ed6c34fe8..e396c4ebc 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 57a29707b..1a1b91e1d 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index a5331ff2e..1be56953d 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index b760cb1b1..a4aad38a5 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index bf7189d10..d7b1d29af 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 814733301..78e7131d3 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 71113a1d6..fa6ab38d2 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 3bc60effb..0ae2bd9c7 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 8a14cd767..80c96a78b 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 144b4a835..04cc5e7db 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 79942bb30..2de932893 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index ebb32163d..c7185af3e 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 0dee54b06..74b185f1e 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 6f6af8798..ae0dee73a 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3549--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 4e0bafe7c..fd53b50ce 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -788,7 +788,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.11.3549-develop + * secion v3.1.11.3553-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 35aff2929..ff443849b 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.11.3549-develop'; + gc_version constant varchar2(50) := 'v3.1.11.3553-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From fae53a4c2f9a9e183b63197f7f73bb13406bdb47 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 16 Nov 2021 11:41:59 +0200 Subject: [PATCH 0778/1096] Removed duplicate profiler table installation. Resolves #1149 --- source/install.sql | 3 --- 1 file changed, 3 deletions(-) diff --git a/source/install.sql b/source/install.sql index 3249e3e49..42d37ac9f 100644 --- a/source/install.sql +++ b/source/install.sql @@ -165,9 +165,6 @@ create or replace context &&ut3_owner._info using &&ut3_owner..ut_session_contex prompt Installing PLSQL profiler objects into &&ut3_owner schema @@core/coverage/proftab.sql -prompt Installing PLSQL profiler objects into &&ut3_owner schema -@@core/coverage/proftab.sql - prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@core/coverage/dbms_plssqlcode.sql From f841ecf9ebbd19286a7bc276f33b4774f091e95e Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 16 Nov 2021 10:17:44 +0000 Subject: [PATCH 0779/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index bbfd22348..fd7f57822 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3556--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 3568a0c9d..b3838b1fb 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3556--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 4dd55a8ba..9dfa29abe 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3556--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index e396c4ebc..4ee320a9f 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3556--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 1a1b91e1d..300177ae2 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3556--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 1be56953d..6767f0735 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3556--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index a4aad38a5..94ac10f67 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3556--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index d7b1d29af..b2b4ab9f3 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3556--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 78e7131d3..a5e34b45d 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3556--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index fa6ab38d2..7bec5c32d 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3556--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 0ae2bd9c7..7b17dfdc8 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3556--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 80c96a78b..9dbe473ec 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3556--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 04cc5e7db..e26b9046f 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3556--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 2de932893..a4334834c 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3556--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index c7185af3e..77d3f24ff 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3556--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 74b185f1e..4832681e7 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3556--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index ae0dee73a..9dc6968cc 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3553--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3556--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index fd53b50ce..58c137e65 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -788,7 +788,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.11.3553-develop + * secion v3.1.11.3556-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index ff443849b..1562be8a1 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.11.3553-develop'; + gc_version constant varchar2(50) := 'v3.1.11.3556-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 5eaefd36b32de62bbc3649e9e205cbf8931d4cff Mon Sep 17 00:00:00 2001 From: Travis CI Date: Tue, 16 Nov 2021 22:40:32 +0000 Subject: [PATCH 0780/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 6575abbec..d03e93575 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 772fa553f..41f07a7a7 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 4f4f34f1a..63db76bbb 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 15906a35b..1e07adab3 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 7654a2e01..6940d4b94 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 557dc2d9c..a9dec00dd 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 443c7ae21..ee3033da8 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index c0fa4ee10..b75ef1413 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 40aacae39..e0935b2ea 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 0794f4ca7..ce2264fcf 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 1da384c1d..4fcb47322 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index c1233c258..f2acf0e02 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index f9af73346..743858b2f 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index e280a3187..8ab8efc4d 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index ac00118db..2c41bd54b 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index c2c1f6a33..acda0fea7 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 7e21cbd27..af5e2d585 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3550-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index b5951a905..f76a2668d 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -788,7 +788,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.11.3550 + * secion v3.1.11.3557 */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 6e5f149eb..a2c3bb4d7 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.11.3550'; + gc_version constant varchar2(50) := 'v3.1.11.3557'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 158c9853660edc75abecfdf1673088d5a3636dea Mon Sep 17 00:00:00 2001 From: Travis CI Date: Thu, 18 Nov 2021 00:21:06 +0000 Subject: [PATCH 0781/1096] Updated project version after build [skip ci] --- VERSION | 2 +- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- sonar-project.properties | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/VERSION b/VERSION index 021c7c624..571f2ad11 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.11 +v3.1.11-develop diff --git a/docs/about/authors.md b/docs/about/authors.md index d03e93575..b80140085 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 41f07a7a7..95ddbd696 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 63db76bbb..ce19bb28f 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 1e07adab3..1044fb383 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 6940d4b94..2ba06cd92 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index a9dec00dd..06ea7759b 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index ee3033da8..bdad4fadc 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index b75ef1413..b02209ba5 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index e0935b2ea..fbc50e2e3 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index ce2264fcf..25fdb2d3c 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 4fcb47322..b36dff50d 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index f2acf0e02..536c837b2 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 743858b2f..5cd5ba241 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 8ab8efc4d..a581458b3 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 2c41bd54b..2109b10e1 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index acda0fea7..cb8714f7d 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index af5e2d585..dcdc7217e 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3557-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) # Upgrading from version 2 diff --git a/sonar-project.properties b/sonar-project.properties index 6220e0b90..ddd794a91 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,7 @@ sonar.projectKey=utPLSQL # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=utPLSQL -sonar.projectVersion=v3.1.11 +sonar.projectVersion=v3.1.11-develop # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # Since SonarQube 4.2, this property is optional if sonar.modules is set. diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index f76a2668d..b50fb4d95 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -788,7 +788,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.11.3557 + * secion v3.1.11.3561-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index a2c3bb4d7..0038c46f1 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.11.3557'; + gc_version constant varchar2(50) := 'v3.1.11.3561-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 3d25924712d1a82475ee3a58537abf69518f0aee Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 18 Nov 2021 02:23:21 +0200 Subject: [PATCH 0782/1096] Updated version to 3.1.12 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 571f2ad11..8ecb8bfc6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.11-develop +v3.1.12 From bb1e9b3518ab2ce9519eb33a679c01e9d4562721 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Thu, 18 Nov 2021 00:43:01 +0000 Subject: [PATCH 0783/1096] Updated project version after build [skip ci] --- VERSION | 2 +- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- sonar-project.properties | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/VERSION b/VERSION index 8ecb8bfc6..a0d004aa2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.12 +v3.1.12-develop diff --git a/docs/about/authors.md b/docs/about/authors.md index b80140085..34b6dc228 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 95ddbd696..1d85c978a 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index ce19bb28f..e166099de 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 1044fb383..5ad87fc66 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 2ba06cd92..0815fafac 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 06ea7759b..6117b8fb5 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index bdad4fadc..f5f5c9d06 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index b02209ba5..3fac28b94 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index fbc50e2e3..e89ad4562 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 25fdb2d3c..5c78ada34 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index b36dff50d..3bce1033f 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 536c837b2..4ab0c3904 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 5cd5ba241..227e7c22a 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index a581458b3..81e53b98b 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 2109b10e1..18e5e307e 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index cb8714f7d..5bb5b7d6d 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index dcdc7217e..af4ef241e 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.11.3561--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) # Upgrading from version 2 diff --git a/sonar-project.properties b/sonar-project.properties index ddd794a91..d81d0a2b2 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,7 @@ sonar.projectKey=utPLSQL # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=utPLSQL -sonar.projectVersion=v3.1.11-develop +sonar.projectVersion=v3.1.12-develop # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # Since SonarQube 4.2, this property is optional if sonar.modules is set. diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index b50fb4d95..cf189e768 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -788,7 +788,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.11.3561-develop + * secion v3.1.12.3562-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 0038c46f1..49e81558e 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.11.3561-develop'; + gc_version constant varchar2(50) := 'v3.1.12.3562-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 0354c1a009f78df774b5c264c297eee4aa4f2d71 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 24 Nov 2021 23:15:02 +0200 Subject: [PATCH 0784/1096] First attempt at running as github actions --- .github/workflows/build.yml | 122 ++++++++++++++++++++++++++++++++++ .travis/download.js | 56 ---------------- .travis/download.sh | 72 -------------------- .travis.yml => old.travis.yml | 0 4 files changed, 122 insertions(+), 128 deletions(-) create mode 100644 .github/workflows/build.yml delete mode 100644 .travis/download.js delete mode 100755 .travis/download.sh rename .travis.yml => old.travis.yml (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 000000000..d3f4f0f4f --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,122 @@ +name: Deploy and test +env: + UT3_DEVELOP_SCHEMA: UT3_DEVELOP + UT3_DEVELOP_SCHEMA_PASSWORD: ut3 + UT3_RELEASE_VERSION_SCHEMA: UT3 + UT3_RELEASE_VERSION_SCHEMA_PASSWORD: ut3 + UT3_USER: 'UT3\$USER#' + UT3_USER_PASSWORD: ut3 + UT3_TESTER: UT3_TESTER + UT3_TESTER_PASSWORD: ut3 + UT3_TESTER_HELPER: UT3_TESTER_HELPER + UT3_TESTER_HELPER_PASSWORD: ut3 + UT3_TABLESPACE: users + BUILD_DIR: ${{env.GITHUB_WORKSPACE}} + JOB_ID: ${{env.GITHUB_RUN_ID}} + JOB_NUMBER: ${{env.GITHUB_RUN_NUMBER}} + PULL_REQUEST_NAME: ${env.GITHUB_HEAD_REF} + PULL_REQUEST_BRANCH: ${{env.GITHUB_HEAD_REF}} + TAG_NAME: ${TRAVIS_TAG} + REPO_SLUG: ${TRAVIS_REPO_SLUG} + PR_SLUG: ${{env.GITHUB_REPOSITORY}} + BRANCH_NAME: ${TRAVIS_BRANCH} + # Environment for building a release + CURRENT_BRANCH: ${TRAVIS_BRANCH} + UTPLSQL_REPO: "utPLSQL/utPLSQL" + UTPLSQL_BUILD_NO: ${{env.GITHUB_RUN_ID}} + UTPLSQL_VERSION: $(. .travis/get_project_version.sh) + UTPLSQL_BUILD_VERSION: $(. .travis/get_project_build_version.sh) + UTPLSQL_SOURCES_DIR: 'source' + UTPLSQL_BUILD_USER_NAME: "Travis CI" + CACHE_DIR: $HOME/.cache + # Database Env + SQLCLI: "${BUILD_DIR}/sqlcl/bin/sql" + OJDBC_HOME: "${BUILD_DIR}/ojdbc" + ORACLE_PWD: "oracle" + DOCKHER_HUB_REPO: "utplsqlv3/oracledb" + DOCKER_VOLUME: "/home/oracle/host" + DOCKER_ENV: "-e SQLCLI=sqlplus -e UT3_DEVELOP_SCHEMA -e UT3_DEVELOP_SCHEMA_PASSWORD -e UT3_RELEASE_VERSION_SCHEMA -e UT3_RELEASE_VERSION_SCHEMA_PASSWORD -e UT3_USER -e UT3_USER_PASSWORD -e UT3_TESTER -e UT3_TESTER_PASSWORD -e UT3_TESTER_HELPER -e UT3_TESTER_HELPER_PASSWORD -e UT3_TABLESPACE -e ORACLE_PWD -e CONNECTION_STR -e UTPLSQL_DIR" + #utPLSQL released version directory + UTPLSQL_DIR: "utPLSQL_latest_release" + SELFTESTING_BRANCH: ${TRAVIS_BRANCH} + UTPLSQL_CLI_VERSION: "3.1.8" + # Maven + MAVEN_HOME: /usr/local/maven + MAVEN_CFG: $HOME/.m2 + +on: + push: + branches: [ develop, feature/github_actions ] + pull_request: + branches: [ develop ] + + workflow_dispatch: + +jobs: + build: + + env: + UTPLSQL_VERSION: ${{matrix.utplsql-version}} + + runs-on: ubuntu-latest + strategy: + matrix: + include: + - oracle-version: "gvenzl/oracle-xe:11-slim" + connection-str: '127.0.0.1:1521/XE' +# docker-options: '--shm-size=1g' +# - oracle-version: "utplsqlv3/oracledb:12c-r1-se2-small" +# connection-str: '127.0.0.1:1521/ORCLCDB' +# - oracle-version: "utplsqlv3/oracledb:12c-r2-se2-small" +# connection-str: '127.0.0.1:1521/ORCLCDB' + - oracle-version: "gvenzl/oracle-xe:18-slim" + connection-str: '127.0.0.1:1521/XE' + docker-options: '-e ORACLE_PASSWORD=oracle' +# - oracle-version: "utplsqlv3/oracledb:18c-se2-small" +# connection-str: '127.0.0.1:1521/ORCLCDB' +# - oracle-version: "utplsqlv3/oracledb:19c-se2-small" +# connection-str: '127.0.0.1:1521/ORCLCDB' + - oracle-version: "gvenzl/oracle-xe:21-full" + connection-str: '127.0.0.1:1521/XE' + docker-options: '-e ORACLE_PASSWORD=oracle' + + services: + oracle: + image: ${matrix.oracle-version} + env: + CONNECTION_STR: ${matrix.connection-str} + ORACLE_PASSWORD: oracle + ports: + - 1521:1521 + options: >- + --health-cmd healthcheck.sh + --health-interval 10s + --health-timeout 5s + --health-retries 10 + ${matrix.docker-options} + + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Install utPLSQL ${{matrix.utplsql-version}} + run: echo Installing ${UTPLSQL_VERSION} && sh ${{ github.workspace }}/scripts/1_install_utplsql.sh + + - name: Install utPLSQL-cli + run: curl -Lk -o utPLSQL-cli.zip "https://github.com/utPLSQL/utPLSQL-cli/releases/download/v3.1.8/utPLSQL-cli.zip" && unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli + + - name: Install demo project + run: sh ${{ github.workspace }}/scripts/2_install_demo_project.sh + + - name: Install unit tests + run: sh ${{ github.workspace }}/scripts/3_install_tests.sh + + - name: Run unit tests + run: sh ${{ github.workspace }}/scripts/4_run_tests.sh + + - name: SonarCloud Scan + uses: SonarSource/sonarcloud-github-action@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/.travis/download.js b/.travis/download.js deleted file mode 100644 index 67c45fac6..000000000 --- a/.travis/download.js +++ /dev/null @@ -1,56 +0,0 @@ - -var casper = require("casper").create({ - // verbose: true, - // logLevel: "debug", - pageSettings: { - loadImages: false, - loadPlugins: false - } -}); - -if (casper.cli.args.length < 4) { - casper.echo("Missing parameters: username password agreementUrl downloadUrl").exit(1); -} - -// Script parameters. -var paramUsername = casper.cli.get(0); -var paramPassword = casper.cli.get(1); -var agreementUrl = casper.cli.get(2); -var downloadUrl = casper.cli.get(3); -var downloaded = false; - -phantom.addCookie({ - 'name': 'oraclelicense', - 'value': '152021', - 'domain': 'oracle.com' - }); - -casper.start(); -// TODO: Error handling. - - -// Try to access the download page, wait for redirection and submit the login form. -casper.thenOpen(downloadUrl).waitForUrl(/signon\.jsp$/, function (re) { - //this.echo("Injecting Login Info"); - this.evaluate(function (username, password) { - document.getElementById("sso_username").value = username; - document.getElementById("ssopassword").value = password; - doLogin(document.LoginForm); - }, paramUsername, paramPassword); - // this.capture("Screenshot.png"); -}); - -casper.on("resource.received", function (resource) { - //this.echo("Received something: " + resource.url); - if (resource.url.indexOf("AuthParam") !== -1 && !downloaded) { - //this.echo("DownloadUrl:"); - // Print the download url. - this.echo(resource.url); - downloaded = true; - // TODO: Try to download file from here. this.download is not working because of cross site request. - } -}); - -casper.run(function () { - this.exit(); -}); diff --git a/.travis/download.sh b/.travis/download.sh deleted file mode 100755 index 8dfa1942d..000000000 --- a/.travis/download.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/bash -set -e - -if [ "$ORACLE_OTN_USER" == "" ] || [ "$ORACLE_OTN_PASSWORD" == "" ]; then - echo "Error: Oracle OTN username/password not specified." - exit 1 -fi - -PRODUCT="" - -# Call the casperjs script to return the download url. -# Then download the file using curl. -downloadFile() { - downloadUrl=$(exec casperjs download.js $ORACLE_OTN_USER $ORACLE_OTN_PASSWORD $1 $2) - downloadUrl=${downloadUrl%$'\r'} - echo "DownloadURL: $downloadUrl" - curl -o $3 -L "$downloadUrl" -} - -############################# -########### START ########### -############################# - -while getopts "p:" OPTNAME; do - case "${OPTNAME}" in - "p") PRODUCT="${OPTARG}" ;; - esac -done - -if [ "$PRODUCT" == "se12c" ]; then - agreementUrl="http://www.oracle.com/technetwork/database/enterprise-edition/downloads/index.html" - downloadUrl="http://download.oracle.com/otn/linux/oracle12c/121020/linuxamd64_12102_database_se2_1of2.zip" - outputFile=linuxamd64_12102_database_se2_1of2.zip - downloadFile $agreementUrl $downloadUrl $outputFile - agreementUrl="http://www.oracle.com/technetwork/database/enterprise-edition/downloads/index.html" - downloadUrl="http://download.oracle.com/otn/linux/oracle12c/121020/linuxamd64_12102_database_se2_2of2.zip" - outputFile=linuxamd64_12102_database_se2_2of2.zip - downloadFile $agreementUrl $downloadUrl $outputFile - exit 0 -fi - -if [ "$PRODUCT" == "ee12c" ]; then - agreementUrl="http://www.oracle.com/technetwork/database/enterprise-edition/downloads/index.html" - downloadUrl="http://download.oracle.com/otn/linux/oracle12c/121020/linuxamd64_12102_database_1of2.zip" - outputFile=linuxamd64_12102_database_1of2.zip - downloadFile $agreementUrl $downloadUrl $outputFile - agreementUrl="http://www.oracle.com/technetwork/database/enterprise-edition/downloads/index.html" - DOWNLOAD_URL="http://download.oracle.com/otn/linux/oracle12c/121020/linuxamd64_12102_database_2of2.zip" - outputFile=linuxamd64_12102_database_2of2.zip - downloadFile $agreementUrl $downloadUrl $outputFile - exit 0 -fi - -if [ "$PRODUCT" == "xe11g" ]; then - agreementUrl="http://www.oracle.com/technetwork/database/database-technologies/express-edition/downloads/index.html" - downloadUrl="https://edelivery.oracle.com/akam/otn/linux/oracle11g/xe/oracle-xe-11.2.0-1.0.x86_64.rpm.zip" - outputFile=oracle-xe-11.2.0-1.0.x86_64.rpm.zip - downloadFile $agreementUrl $downloadUrl $outputFile - exit 0 -fi - -if [ "$PRODUCT" == "sqlcl" ]; then - agreementUrl="http://www.oracle.com/technetwork/developer-tools/sqlcl/downloads/index.html" - downloadUrl="https://download.oracle.com/otn/java/sqldeveloper/sqlcl-18.3.0.259.2029.zip" - #downloadUrl="https://download.oracle.com/otn/java/sqldeveloper/sqlcl-19.2.1.206.1649.zip" - outputFile=sqlcl-18.3.0.259.2029.zip - downloadFile $agreementUrl $downloadUrl $outputFile - exit 0 -fi - -echo "Error: invalid product: $PRODUCT" -exit 1 diff --git a/.travis.yml b/old.travis.yml similarity index 100% rename from .travis.yml rename to old.travis.yml From 99774b9af4d4a4d1167df3ad7f2f222810eb4533 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Kukie=C5=82a?= <53443372+kukimik@users.noreply.github.com> Date: Mon, 6 Dec 2021 16:40:17 +0100 Subject: [PATCH 0785/1096] Rewording of a note --- docs/userguide/advanced_data_comparison.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 6117b8fb5..d25411370 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -250,8 +250,9 @@ FAILURE at "anonymous block", line 15 ``` **Note** -> `join_by` matcher is much faster on performing data comparison, consider using `join_by` over unordered -> `contain` matcher is not considering order of compared data-sets. Using `unordered` makes no difference (it's default) +> Consider using `join_by( columns... )` over `unordered()` with the `equal` matcher. The `join_by` method is much faster at performing data comparison. +> +> The `contain` matcher is not considering the order of the compared data-sets. Using `unordered` makes no difference (it's default). ## Join By option From 66f29f4e6500d7e66014ca7f09434948afa9e790 Mon Sep 17 00:00:00 2001 From: kukimik Date: Wed, 22 Dec 2021 22:59:51 +0100 Subject: [PATCH 0786/1096] Minor typo, style, grammar fixes --- docs/userguide/expectations.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 3bce1033f..0c45df2ea 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -24,7 +24,7 @@ Expectation is a combination of: - the expected value - optional custom message for the expectation - the matcher used to perform comparison -- them matcher parameters (actual value), depending on the matcher type +- the matcher parameters (actual value), depending on the matcher type Matcher defines the comparison operation to be performed on expected (and actual) value. @@ -88,7 +88,7 @@ There are two ways to use expectations: - without invoking the utPLSQL framework - running expectations standalone ## Running expectations within utPLSQL framework -When expectations are ran a part of test suite, the framework tracks: +When expectations are ran as a part of a test suite, the framework tracks: - status of each expectation - outcomes (messages) produced by each expectation - call stack to each expectation @@ -161,7 +161,7 @@ When expectations are invoked outside of utPLSQL framework the outputs from expe > Source code of the line which called the expectation is only reported when the line is part of in-database code (package) and the user calling expectation has privileges to see that source code. **Important** -> Please do not use expectations as part of your production code. They are not designed to be used as part ot your code. Expectations are meant to be used only as part of your day-to-day testing activities. +> Please do not use expectations as part of your production code. They are not designed to be used as part of your code. Expectations are meant to be used only as part of your day-to-day testing activities. **Note:** > The examples in the document will be only using standalone expectations, to keep the document brief. @@ -186,7 +186,7 @@ utPLSQL provides the following matchers to perform checks on the expected and ac - `match( a_patter {varchar2} [, a_modifiers {varchar2}] )` ## Providing a custom message -You can provide a custom failure message as second argument for the expectation by passing message as the second parameter to the expectation. +You can provide a custom failure message by passing it as the second parameter to the expectation. `ut.expect( a_actual {data-type}, a_message {varchar2} ).to_{matcher}` Example: @@ -386,7 +386,7 @@ For more details see documentation of the [`--%throws` annotation.](annotations. # Matchers -You can choose different matchers to validate the your PL/SQL code is working as expected. +You can choose different matchers to validate that your PL/SQL code is working as expected. ## be_between @@ -759,7 +759,7 @@ FAILURE ## have_count Unary matcher that validates if the provided dataset count is equal to expected value. -Can be used with `refcursor` , `json`or `table type` +Can be used with `refcursor`, `json` or `table type` Usage: ```sql @@ -827,8 +827,8 @@ FAILURE ``` ## equal -The equal matcher is very restrictive. Test using this matcher succeeds only when the compared data-types are exactly the same. -If you are comparing `varchar2` to a `number` will fail even if the text contains the same numeric value as the number. +The `equal` matcher is very restrictive. Test using this matcher succeeds only when the compared data-types are exactly the same. +If you are comparing a `varchar2` to a `number`, it will fail even if the text contains the same numeric value as the number. The matcher will also fail when comparing a `timestamp` to a `timestamp with timezone` data-type etc. The matcher enables detection of data-type changes. @@ -916,13 +916,13 @@ To change the behavior of `NULL = NULL` comparison pass the `a_nulls_are_equal = This matcher supports only compound data-types comparison. It check if the actual set contains all values of expected subset. -When comparing data using `contain` matcher, the data-types of columns for compared compound types must be exactly the same. +When comparing data using the `contain` matcher, the data-types of columns for compared compound types must be exactly the same. The matcher supports all advanced comparison options as `equal` like: `include` , `exclude`, `join_by` etc.. The matcher is successful when actual data set contains all of the values from expected results. -The matcher will cause a test to fail if actual data set does not contain any of expected values. +The matcher will cause a test to fail if actual data set does not contain some of expected values. ![included_set](../images/venn21.gif) @@ -1108,7 +1108,7 @@ utPLSQL is capable of comparing compound data-types including: - Columns in compound data are compared as **ordered list of elements** by default. Use `unordered_columns` option when order of columns in cursor is not relevant - Comparison of compound data is data-type aware. So a column `ID NUMBER` in a cursor is not the same as `ID VARCHAR2(100)`, even if they both hold the same numeric values. - Comparison of cursor columns containing `DATE` will only compare date part **and ignore time** by default. See [Comparing cursor data containing DATE fields](#comparing-cursor-data-containing-date-fields) to check how to enable date-time comparison in cursors. -- Comparison of cursor returning `TIMESTAMP` **columns** against cursor returning `TIMESTAMP` **bind variables** requires variables to be casted to proper precision. This is an Oracle SQL - PLSQL compatibility issue and usage of CAST is the only known workaround for now. See [Comparing cursor data containing TIMESTAMP bind variables](#comparing-cursor-data-containing-timestamp-bind-variables) for examples. +- Comparison of cursor returning `TIMESTAMP` **columns** against cursor returning `TIMESTAMP` **bind variables** requires variables to be cast to proper precision. This is an Oracle SQL - PLSQL compatibility issue and usage of CAST is the only known workaround for now. See [Comparing cursor data containing TIMESTAMP bind variables](#comparing-cursor-data-containing-timestamp-bind-variables) for examples. - To compare nested table/varray type you need to convert it to `anydata` by using `anydata.convertCollection()` - To compare object type you need to convert it to `anydata` by using `anydata.convertObject()` - It is possible to compare PL/SQL records, collections, varrays and associative arrays. To compare this types of data, use cursor comparison feature of utPLSQL and TABLE operator in SQL query @@ -1541,7 +1541,7 @@ drop table events; In the above example: - The first expectation is successful, as the `l_expected` cursor contains different date-time then the cursor returned by `get_events` function call -- The second expectation fails, as the column `event_date` will get compared as DATE without TIME (suing default current session NLS date format) +- The second expectation fails, as the column `event_date` will get compared as DATE without TIME (using default current session NLS date format) Output via DBMS_OUTPUT from the above example: ``` From 0bb6cdbd9752e464eb5448c7e4030a9a2deb846f Mon Sep 17 00:00:00 2001 From: kukimik Date: Tue, 4 Jan 2022 22:41:45 +0100 Subject: [PATCH 0787/1096] replace inactive Slack invitation link --- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- readme.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/about/project-details.md b/docs/about/project-details.md index e166099de..0790f1356 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -4,7 +4,7 @@ [![chat](http://img.shields.io/badge/GitHub_Project-Active-blue.svg)](https://github.com/utPLSQL/utPLSQL) [![license](http://img.shields.io/badge/license-apache%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0) -[![chat](http://img.shields.io/badge/chat-slack-blue.svg)](https://join.slack.com/t/utplsql/shared_invite/zt-d6zor80g-WWqAhbLWioJZUtLYeXetzA) +[![chat](http://img.shields.io/badge/chat-slack-blue.svg)](https://join.slack.com/t/utplsql/shared_invite/zt-xwm68udy-4cF_3PNEyczYEbWr38W5ww) [![twitter](https://img.shields.io/twitter/follow/utPLSQL.svg?style=social&label=Follow)](https://twitter.com/utPLSQL) diff --git a/docs/about/support.md b/docs/about/support.md index 5ad87fc66..3dc0c0412 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -3,4 +3,4 @@ # How to get support - Feel free to post questions, bugs or issues in the [issues area of GitHub](https://github.com/utPLSQL/utPLSQL/issues) -- [Join](https://join.slack.com/t/utplsql/shared_invite/zt-d6zor80g-WWqAhbLWioJZUtLYeXetzA) developers team on utPLSQL [Slack](https://utplsql.slack.com/) +- [Join](https://join.slack.com/t/utplsql/shared_invite/zt-xwm68udy-4cF_3PNEyczYEbWr38W5ww) developers team on utPLSQL [Slack](https://utplsql.slack.com/) diff --git a/readme.md b/readme.md index e56aba1d4..2cc72040d 100644 --- a/readme.md +++ b/readme.md @@ -162,7 +162,7 @@ We welcome new developers to join our community and contribute to the utPLSQL pr If you are interested in helping please read our [guide to contributing](CONTRIBUTING.md) The best place to start is to read the documentation and get familiar with the existing code base. A [slack chat](https://utplsql.slack.com/) is the place to go if you want to talk with team members. -To sign up to the chat use [this link](https://join.slack.com/t/utplsql/shared_invite/zt-d6zor80g-WWqAhbLWioJZUtLYeXetzA). +To sign up to the chat use [this link](https://join.slack.com/t/utplsql/shared_invite/zt-xwm68udy-4cF_3PNEyczYEbWr38W5ww). ---------- @@ -182,7 +182,7 @@ __Project Directories__ ---------- -If you have a great feature in mind, that you would like to see in utPLSQL v3 please create an [issue on GitHub](https://github.com/utPLSQL/utPLSQL/issues) or discuss it with us in the [slack chat rooms](https://utplsql.slack.com/). Use [invite link](https://join.slack.com/t/utplsql/shared_invite/zt-d6zor80g-WWqAhbLWioJZUtLYeXetzA) to join the chat. +If you have a great feature in mind, that you would like to see in utPLSQL v3 please create an [issue on GitHub](https://github.com/utPLSQL/utPLSQL/issues) or discuss it with us in the [slack chat rooms](https://utplsql.slack.com/). Use [invite link](https://join.slack.com/t/utplsql/shared_invite/zt-xwm68udy-4cF_3PNEyczYEbWr38W5ww) to join the chat. # Version 2 to Version 3 Comparison From de73451b9a4ad7531ab481284d1f941e20886504 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 24 Nov 2021 23:35:29 +0200 Subject: [PATCH 0788/1096] Building github actions --- .github/workflows/build.yml | 84 ++++++++++++++++++++++--------------- 1 file changed, 50 insertions(+), 34 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d3f4f0f4f..20a011d34 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,38 +4,36 @@ env: UT3_DEVELOP_SCHEMA_PASSWORD: ut3 UT3_RELEASE_VERSION_SCHEMA: UT3 UT3_RELEASE_VERSION_SCHEMA_PASSWORD: ut3 - UT3_USER: 'UT3\$USER#' + UT3_USER: 'UT3$USER#' UT3_USER_PASSWORD: ut3 UT3_TESTER: UT3_TESTER UT3_TESTER_PASSWORD: ut3 UT3_TESTER_HELPER: UT3_TESTER_HELPER UT3_TESTER_HELPER_PASSWORD: ut3 UT3_TABLESPACE: users - BUILD_DIR: ${{env.GITHUB_WORKSPACE}} - JOB_ID: ${{env.GITHUB_RUN_ID}} - JOB_NUMBER: ${{env.GITHUB_RUN_NUMBER}} - PULL_REQUEST_NAME: ${env.GITHUB_HEAD_REF} - PULL_REQUEST_BRANCH: ${{env.GITHUB_HEAD_REF}} + BUILD_DIR: ${{github.workspace}} + JOB_ID: ${{github.run_id}} + JOB_NUMBER: ${{github.run_number}} + PULL_REQUEST_NAME: ${github.head_ref} + PULL_REQUEST_BRANCH: ${{github.head_ref}} TAG_NAME: ${TRAVIS_TAG} REPO_SLUG: ${TRAVIS_REPO_SLUG} - PR_SLUG: ${{env.GITHUB_REPOSITORY}} + PR_SLUG: ${{github.repository}} BRANCH_NAME: ${TRAVIS_BRANCH} # Environment for building a release CURRENT_BRANCH: ${TRAVIS_BRANCH} UTPLSQL_REPO: "utPLSQL/utPLSQL" - UTPLSQL_BUILD_NO: ${{env.GITHUB_RUN_ID}} + UTPLSQL_BUILD_NO: ${{github.run_id}} UTPLSQL_VERSION: $(. .travis/get_project_version.sh) UTPLSQL_BUILD_VERSION: $(. .travis/get_project_build_version.sh) UTPLSQL_SOURCES_DIR: 'source' UTPLSQL_BUILD_USER_NAME: "Travis CI" CACHE_DIR: $HOME/.cache # Database Env - SQLCLI: "${BUILD_DIR}/sqlcl/bin/sql" + SQLCLI: "sqlplus" OJDBC_HOME: "${BUILD_DIR}/ojdbc" ORACLE_PWD: "oracle" DOCKHER_HUB_REPO: "utplsqlv3/oracledb" - DOCKER_VOLUME: "/home/oracle/host" - DOCKER_ENV: "-e SQLCLI=sqlplus -e UT3_DEVELOP_SCHEMA -e UT3_DEVELOP_SCHEMA_PASSWORD -e UT3_RELEASE_VERSION_SCHEMA -e UT3_RELEASE_VERSION_SCHEMA_PASSWORD -e UT3_USER -e UT3_USER_PASSWORD -e UT3_TESTER -e UT3_TESTER_PASSWORD -e UT3_TESTER_HELPER -e UT3_TESTER_HELPER_PASSWORD -e UT3_TABLESPACE -e ORACLE_PWD -e CONNECTION_STR -e UTPLSQL_DIR" #utPLSQL released version directory UTPLSQL_DIR: "utPLSQL_latest_release" SELFTESTING_BRANCH: ${TRAVIS_BRANCH} @@ -56,36 +54,40 @@ jobs: build: env: - UTPLSQL_VERSION: ${{matrix.utplsql-version}} + ORACLE_VERSION: ${{matrix.oracle-version}} + CONNECTION_STR: ${{matrix.connection-str}} + ORACLE_PASSWORD: oracle + DOCKER_VOLUME: ${{matrix.docker-volume}} + DOCKER_ENV: "-e SQLCLI=sqlplus -e UT3_DEVELOP_SCHEMA -e UT3_DEVELOP_SCHEMA_PASSWORD -e UT3_RELEASE_VERSION_SCHEMA -e UT3_RELEASE_VERSION_SCHEMA_PASSWORD -e UT3_USER -e UT3_USER_PASSWORD -e UT3_TESTER -e UT3_TESTER_PASSWORD -e UT3_TESTER_HELPER -e UT3_TESTER_HELPER_PASSWORD -e UT3_TABLESPACE -e ORACLE_PWD -e CONNECTION_STR -e UTPLSQL_DIR" runs-on: ubuntu-latest strategy: + fail-fast: false matrix: include: - - oracle-version: "gvenzl/oracle-xe:11-slim" + - oracle-version: "gvenzl/oracle-xe:11-full" connection-str: '127.0.0.1:1521/XE' -# docker-options: '--shm-size=1g' # - oracle-version: "utplsqlv3/oracledb:12c-r1-se2-small" # connection-str: '127.0.0.1:1521/ORCLCDB' # - oracle-version: "utplsqlv3/oracledb:12c-r2-se2-small" # connection-str: '127.0.0.1:1521/ORCLCDB' - oracle-version: "gvenzl/oracle-xe:18-slim" connection-str: '127.0.0.1:1521/XE' - docker-options: '-e ORACLE_PASSWORD=oracle' # - oracle-version: "utplsqlv3/oracledb:18c-se2-small" # connection-str: '127.0.0.1:1521/ORCLCDB' # - oracle-version: "utplsqlv3/oracledb:19c-se2-small" # connection-str: '127.0.0.1:1521/ORCLCDB' - - oracle-version: "gvenzl/oracle-xe:21-full" - connection-str: '127.0.0.1:1521/XE' - docker-options: '-e ORACLE_PASSWORD=oracle' +# - oracle-version: "gvenzl/oracle-xe:21-full" +# connection-str: '127.0.0.1:1521/XE' services: oracle: - image: ${matrix.oracle-version} + image: ${{matrix.oracle-version}} env: - CONNECTION_STR: ${matrix.connection-str} ORACLE_PASSWORD: oracle +# credentials: +# username: ${{ secrets.DOCKER_USER }} +# password: ${{ secrets.DOCKER_PASSWORD }} ports: - 1521:1521 options: >- @@ -93,30 +95,44 @@ jobs: --health-interval 10s --health-timeout 5s --health-retries 10 - ${matrix.docker-options} + -e SQLCLI=sqlplus -e UT3_DEVELOP_SCHEMA -e UT3_DEVELOP_SCHEMA_PASSWORD -e UT3_RELEASE_VERSION_SCHEMA -e UT3_RELEASE_VERSION_SCHEMA_PASSWORD -e UT3_USER -e UT3_USER_PASSWORD -e UT3_TESTER -e UT3_TESTER_PASSWORD -e UT3_TESTER_HELPER -e UT3_TESTER_HELPER_PASSWORD -e UT3_TABLESPACE -e ORACLE_PWD -e CONNECTION_STR -e UTPLSQL_DIR steps: - uses: actions/checkout@v2 with: fetch-depth: 0 - - name: Install utPLSQL ${{matrix.utplsql-version}} - run: echo Installing ${UTPLSQL_VERSION} && sh ${{ github.workspace }}/scripts/1_install_utplsql.sh +# - name: Update project version & build number +# run: sh ${{ github.workspace }}/.travis/update_project_version.sh + + - name: Download latest utPLSQL release + run: git clone --depth=1 --branch=main https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR - name: Install utPLSQL-cli run: curl -Lk -o utPLSQL-cli.zip "https://github.com/utPLSQL/utPLSQL-cli/releases/download/v3.1.8/utPLSQL-cli.zip" && unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli - - name: Install demo project - run: sh ${{ github.workspace }}/scripts/2_install_demo_project.sh + - name: Update privileges on sources + run: chmod -R go+w ./{source,test,examples,${UTPLSQL_DIR}/source} - - name: Install unit tests - run: sh ${{ github.workspace }}/scripts/3_install_tests.sh + - name: Install utPLSQL + run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .travis/install.sh - - name: Run unit tests - run: sh ${{ github.workspace }}/scripts/4_run_tests.sh + - name: Install utPLSQL release + run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} ./.travis/install_utplsql_release.sh - - name: SonarCloud Scan - uses: SonarSource/sonarcloud-github-action@master - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + - name: Run Examples + run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} ./.travis/run_examples.sh + + - name: Install tests + run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} ./test/install_tests.sh + + - name: Run Tests + run: bash $(pwd)/test/run_tests.sh + + +# +# - name: SonarCloud Scan +# uses: SonarSource/sonarcloud-github-action@master +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any +# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} From 1c3004a5b28b44c3a1ea65308e97fbf59b215c3c Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 25 Nov 2021 09:43:25 +0200 Subject: [PATCH 0789/1096] Adding OJDBC Download --- .github/workflows/build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 20a011d34..88d84c3bd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,8 @@ env: CACHE_DIR: $HOME/.cache # Database Env SQLCLI: "sqlplus" - OJDBC_HOME: "${BUILD_DIR}/ojdbc" + OJDBC_HOME: ${{github.workspace}}/ojdbc + OJDBC_URL: "https://download.oracle.com/otn-pub/otn_software/jdbc/213" ORACLE_PWD: "oracle" DOCKHER_HUB_REPO: "utplsqlv3/oracledb" #utPLSQL released version directory @@ -108,6 +109,9 @@ jobs: - name: Download latest utPLSQL release run: git clone --depth=1 --branch=main https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR + - name: Add OJDBC home + run: mkdir -p ${OJDBC_HOME} && curl -Lk -o ${OJDBC_HOME}/ojdbc8.jar ${OJDBC_URL}/ojdbc8.jar && curl -Lk -o ${OJDBC_HOME}/orai18n.jar ${OJDBC_URL}/orai18n.jar + - name: Install utPLSQL-cli run: curl -Lk -o utPLSQL-cli.zip "https://github.com/utPLSQL/utPLSQL-cli/releases/download/v3.1.8/utPLSQL-cli.zip" && unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli From 0b9f937822f233c5b241cb873b25c5bd600a4111 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 25 Nov 2021 09:47:54 +0200 Subject: [PATCH 0790/1096] Adding TimeZone --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 88d84c3bd..0153beeb1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,6 +39,7 @@ env: UTPLSQL_DIR: "utPLSQL_latest_release" SELFTESTING_BRANCH: ${TRAVIS_BRANCH} UTPLSQL_CLI_VERSION: "3.1.8" + TZ: "Europe/London" # Maven MAVEN_HOME: /usr/local/maven MAVEN_CFG: $HOME/.m2 From 0ce0368c41e26b5fd8819ae534c636c3cf41322d Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 25 Nov 2021 10:25:52 +0200 Subject: [PATCH 0791/1096] Adding 21xe-full --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0153beeb1..3c49f9d6a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -79,8 +79,8 @@ jobs: # connection-str: '127.0.0.1:1521/ORCLCDB' # - oracle-version: "utplsqlv3/oracledb:19c-se2-small" # connection-str: '127.0.0.1:1521/ORCLCDB' -# - oracle-version: "gvenzl/oracle-xe:21-full" -# connection-str: '127.0.0.1:1521/XE' + - oracle-version: "gvenzl/oracle-xe:21-full" + connection-str: '127.0.0.1:1521/XE' services: oracle: From 49216103029909e92e86fdc8d32f5fcc109dd352 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 30 Nov 2021 23:03:08 +0200 Subject: [PATCH 0792/1096] Switching to 21c-xe-slim --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3c49f9d6a..5afb5aeee 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -79,7 +79,7 @@ jobs: # connection-str: '127.0.0.1:1521/ORCLCDB' # - oracle-version: "utplsqlv3/oracledb:19c-se2-small" # connection-str: '127.0.0.1:1521/ORCLCDB' - - oracle-version: "gvenzl/oracle-xe:21-full" + - oracle-version: "gvenzl/oracle-xe:21-slim" connection-str: '127.0.0.1:1521/XE' services: From 09d32618b5887449d601ba4d6ccef25576bd2e1a Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 2 Dec 2021 22:38:30 +0200 Subject: [PATCH 0793/1096] Fixing build numbers and sonar analysis configuration. --- .github/workflows/build.yml | 27 ++++++++++++++++++++------- .travis/coveralls_uploader.js | 2 +- readme.md | 4 ++-- sonar-project.properties | 1 + 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5afb5aeee..e88fca2b6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,8 @@ env: # Environment for building a release CURRENT_BRANCH: ${TRAVIS_BRANCH} UTPLSQL_REPO: "utPLSQL/utPLSQL" - UTPLSQL_BUILD_NO: ${{github.run_id}} + UTPLSQL_BUILD_NO_OFFSET: 3563 + UTPLSQL_BUILD_NO: $( expr ${{github.run_number}} + ${UTPLSQL_BUILD_NO_OFFSET} ) UTPLSQL_VERSION: $(. .travis/get_project_version.sh) UTPLSQL_BUILD_VERSION: $(. .travis/get_project_build_version.sh) UTPLSQL_SOURCES_DIR: 'source' @@ -104,6 +105,17 @@ jobs: with: fetch-depth: 0 + - name: Set build no + run: echo "UTPLSQL_BUILD_NO=$( expr ${{github.run_number}} + ${UTPLSQL_BUILD_NO_OFFSET} )" >> $GITHUB_ENV + + - name: Set version + run: echo "UTPLSQL_VERSION=$(. .travis/get_project_version.sh)" >> $GITHUB_ENV + + - name: Set version build no + + run: echo "UTPLSQL_BUILD_VERSION=$(. .travis/get_project_build_version.sh)" >> $GITHUB_ENV + - name: Output Run numbers + run: echo github.run_id is ${{ github.run_id }} github.run_number is ${{ github.run_number }} UTPLSQL_BUILD_NO is $UTPLSQL_BUILD_NO UTPLSQL_VERSION is $UTPLSQL_VERSION UTPLSQL_BUILD_VERSION is $UTPLSQL_BUILD_VERSION # - name: Update project version & build number # run: sh ${{ github.workspace }}/.travis/update_project_version.sh @@ -134,10 +146,11 @@ jobs: - name: Run Tests run: bash $(pwd)/test/run_tests.sh + - name: Validate utPLSQL reports format + run: bash .travis/validate_report_files.sh -# -# - name: SonarCloud Scan -# uses: SonarSource/sonarcloud-github-action@master -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any -# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + - name: SonarCloud Scan + uses: SonarSource/sonarcloud-github-action@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/.travis/coveralls_uploader.js b/.travis/coveralls_uploader.js index 182f84066..b76c8f496 100644 --- a/.travis/coveralls_uploader.js +++ b/.travis/coveralls_uploader.js @@ -15,7 +15,7 @@ fs.readFile('../coverage.json',function (err,data) { } req = JSON.parse(data); req.service_job_id = process.env.JOB_ID; - req.service_name = 'travis-ci'; + req.service_name = 'github-actions'; if (process.env.COVERALLS_REPO_TOKEN) { req.repo_token = process.env.COVERALLS_REPO_TOKEN; } diff --git a/readme.md b/readme.md index e56aba1d4..0928f2b95 100644 --- a/readme.md +++ b/readme.md @@ -9,8 +9,8 @@ [![twitter](https://img.shields.io/twitter/follow/utPLSQL.svg?style=social&label=Follow)](https://twitter.com/utPLSQL) [![build](https://travis-ci.com/utPLSQL/utPLSQL.svg?branch=develop)](https://travis-ci.com/utPLSQL/utPLSQL) -[![sonar](https://sonarcloud.io/api/project_badges/measure?project=utPLSQL&metric=sqale_rating)](https://sonarcloud.io/dashboard/index?id=utPLSQL) -[![Coveralls coverage](https://coveralls.io/repos/github/utPLSQL/utPLSQL/badge.svg?branch=develop)](https://coveralls.io/github/utPLSQL/utPLSQL?branch=develop) +[![QualityGate](https://sonarcloud.io/api/project_badges/measure?project=utPLSQL&metric=sqale_rating)](https://sonarcloud.io/dashboard/index?id=utPLSQL) +[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=utPLSQL&metric=coverage)](https://sonarcloud.io/summary/new_code?id=utPLSQL) ---------- utPLSQL version 3 is a complete rewrite of utPLSQL v2 from scratch. diff --git a/sonar-project.properties b/sonar-project.properties index d81d0a2b2..b68d13879 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,4 +1,5 @@ # must be unique in a given SonarQube instance +sonar.organization=utplsql sonar.projectKey=utPLSQL # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=utPLSQL From e3e8c79375d7855598ae2acb56267418a2405608 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 5 Jan 2022 01:28:13 +0200 Subject: [PATCH 0794/1096] Added update of project version and build number. --- .github/workflows/build.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e88fca2b6..295e3ca63 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -111,13 +111,14 @@ jobs: - name: Set version run: echo "UTPLSQL_VERSION=$(. .travis/get_project_version.sh)" >> $GITHUB_ENV - - name: Set version build no + - name: Set version with build no + run: echo UTPLSQL_BUILD_VERSION=$(sed -E "s/(v?[0-9]+\.)([0-9]+\.)([0-9]+)(-.*)?/\1\2\3\.${UTPLSQL_BUILD_NO}\4/" <<< "${UTPLSQL_VERSION}") >> $GITHUB_ENV - run: echo "UTPLSQL_BUILD_VERSION=$(. .travis/get_project_build_version.sh)" >> $GITHUB_ENV - name: Output Run numbers run: echo github.run_id is ${{ github.run_id }} github.run_number is ${{ github.run_number }} UTPLSQL_BUILD_NO is $UTPLSQL_BUILD_NO UTPLSQL_VERSION is $UTPLSQL_VERSION UTPLSQL_BUILD_VERSION is $UTPLSQL_BUILD_VERSION -# - name: Update project version & build number -# run: sh ${{ github.workspace }}/.travis/update_project_version.sh + + - name: Update project version & build number + run: sh ${{ github.workspace }}/.travis/update_project_version.sh - name: Download latest utPLSQL release run: git clone --depth=1 --branch=main https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR From e841b9b9a0acc690e27faeb1b2353b4c050ba42d Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 5 Jan 2022 02:15:48 +0200 Subject: [PATCH 0795/1096] Fixing docs update --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 295e3ca63..358e0b01e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,9 +19,9 @@ env: TAG_NAME: ${TRAVIS_TAG} REPO_SLUG: ${TRAVIS_REPO_SLUG} PR_SLUG: ${{github.repository}} - BRANCH_NAME: ${TRAVIS_BRANCH} + BRANCH_NAME: ${github.ref} # Environment for building a release - CURRENT_BRANCH: ${TRAVIS_BRANCH} + CURRENT_BRANCH: ${{github.ref}} UTPLSQL_REPO: "utPLSQL/utPLSQL" UTPLSQL_BUILD_NO_OFFSET: 3563 UTPLSQL_BUILD_NO: $( expr ${{github.run_number}} + ${UTPLSQL_BUILD_NO_OFFSET} ) @@ -118,7 +118,7 @@ jobs: run: echo github.run_id is ${{ github.run_id }} github.run_number is ${{ github.run_number }} UTPLSQL_BUILD_NO is $UTPLSQL_BUILD_NO UTPLSQL_VERSION is $UTPLSQL_VERSION UTPLSQL_BUILD_VERSION is $UTPLSQL_BUILD_VERSION - name: Update project version & build number - run: sh ${{ github.workspace }}/.travis/update_project_version.sh + run: .travis/update_project_version.sh - name: Download latest utPLSQL release run: git clone --depth=1 --branch=main https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR @@ -145,7 +145,7 @@ jobs: run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} ./test/install_tests.sh - name: Run Tests - run: bash $(pwd)/test/run_tests.sh + run: bash test/run_tests.sh - name: Validate utPLSQL reports format run: bash .travis/validate_report_files.sh From cae6a3589840f73be5896dc0f6bcb010404faf7a Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 5 Jan 2022 02:25:48 +0200 Subject: [PATCH 0796/1096] Update env variables --- .github/workflows/build.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 358e0b01e..193872b4d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,11 +17,8 @@ env: PULL_REQUEST_NAME: ${github.head_ref} PULL_REQUEST_BRANCH: ${{github.head_ref}} TAG_NAME: ${TRAVIS_TAG} - REPO_SLUG: ${TRAVIS_REPO_SLUG} + REPO_SLUG: ${{github.repository}} PR_SLUG: ${{github.repository}} - BRANCH_NAME: ${github.ref} - # Environment for building a release - CURRENT_BRANCH: ${{github.ref}} UTPLSQL_REPO: "utPLSQL/utPLSQL" UTPLSQL_BUILD_NO_OFFSET: 3563 UTPLSQL_BUILD_NO: $( expr ${{github.run_number}} + ${UTPLSQL_BUILD_NO_OFFSET} ) @@ -70,6 +67,7 @@ jobs: include: - oracle-version: "gvenzl/oracle-xe:11-full" connection-str: '127.0.0.1:1521/XE' +# TODO - need to add healthcheck.sh into our containers # - oracle-version: "utplsqlv3/oracledb:12c-r1-se2-small" # connection-str: '127.0.0.1:1521/ORCLCDB' # - oracle-version: "utplsqlv3/oracledb:12c-r2-se2-small" @@ -105,6 +103,11 @@ jobs: with: fetch-depth: 0 + - uses: nelonoel/branch-name@v1.0.1 + + - name: Set current branch name + run: echo "CURRENT_BRANCH=${BRANCH_NAME}" >> $GITHUB_ENV + - name: Set build no run: echo "UTPLSQL_BUILD_NO=$( expr ${{github.run_number}} + ${UTPLSQL_BUILD_NO_OFFSET} )" >> $GITHUB_ENV From 7e875588f1a096654883ab3db6adf660b44f7788 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 5 Jan 2022 03:19:35 +0200 Subject: [PATCH 0797/1096] Formatting and cleanup --- .github/workflows/build.yml | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 193872b4d..03bbb03af 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -105,20 +105,19 @@ jobs: - uses: nelonoel/branch-name@v1.0.1 - - name: Set current branch name - run: echo "CURRENT_BRANCH=${BRANCH_NAME}" >> $GITHUB_ENV - - - name: Set build no - run: echo "UTPLSQL_BUILD_NO=$( expr ${{github.run_number}} + ${UTPLSQL_BUILD_NO_OFFSET} )" >> $GITHUB_ENV - - - name: Set version - run: echo "UTPLSQL_VERSION=$(. .travis/get_project_version.sh)" >> $GITHUB_ENV - - - name: Set version with build no - run: echo UTPLSQL_BUILD_VERSION=$(sed -E "s/(v?[0-9]+\.)([0-9]+\.)([0-9]+)(-.*)?/\1\2\3\.${UTPLSQL_BUILD_NO}\4/" <<< "${UTPLSQL_VERSION}") >> $GITHUB_ENV - - - name: Output Run numbers - run: echo github.run_id is ${{ github.run_id }} github.run_number is ${{ github.run_number }} UTPLSQL_BUILD_NO is $UTPLSQL_BUILD_NO UTPLSQL_VERSION is $UTPLSQL_VERSION UTPLSQL_BUILD_VERSION is $UTPLSQL_BUILD_VERSION + - name: Set dynamic environment variables + run: | + echo "CURRENT_BRANCH=${BRANCH_NAME}" >> $GITHUB_ENV + echo "UTPLSQL_BUILD_NO=$( expr ${{github.run_number}} + ${UTPLSQL_BUILD_NO_OFFSET} )" >> $GITHUB_ENV + echo "UTPLSQL_VERSION=$(. .travis/get_project_version.sh)" >> $GITHUB_ENV + echo UTPLSQL_BUILD_VERSION=$(sed -E "s/(v?[0-9]+\.)([0-9]+\.)([0-9]+)(-.*)?/\1\2\3\.${UTPLSQL_BUILD_NO}\4/" <<< "${UTPLSQL_VERSION}") >> $GITHUB_ENV + +# - name: print variables +# run: | +# echo github.run_number is ${{ github.run_number }} +# echo UTPLSQL_BUILD_NO is $UTPLSQL_BUILD_NO +# echo UTPLSQL_VERSION is $UTPLSQL_VERSION +# echo UTPLSQL_BUILD_VERSION is $UTPLSQL_BUILD_VERSION - name: Update project version & build number run: .travis/update_project_version.sh From 9307524cd9a8ac309e694ddf2191ea47c0a1dcf1 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 5 Jan 2022 23:02:51 +0200 Subject: [PATCH 0798/1096] Adding publishing of project version updates --- .github/workflows/build.yml | 247 ++++++++++++++++++------------ .travis/push_project_version.sh | 12 ++ .travis/push_release_version.sh | 18 --- .travis/update_project_version.sh | 2 +- 4 files changed, 165 insertions(+), 114 deletions(-) create mode 100755 .travis/push_project_version.sh delete mode 100755 .travis/push_release_version.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 03bbb03af..f6de8da00 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,5 +1,6 @@ name: Deploy and test env: + #utPLSQL install env UT3_DEVELOP_SCHEMA: UT3_DEVELOP UT3_DEVELOP_SCHEMA_PASSWORD: ut3 UT3_RELEASE_VERSION_SCHEMA: UT3 @@ -11,22 +12,17 @@ env: UT3_TESTER_HELPER: UT3_TESTER_HELPER UT3_TESTER_HELPER_PASSWORD: ut3 UT3_TABLESPACE: users + #Build env BUILD_DIR: ${{github.workspace}} JOB_ID: ${{github.run_id}} JOB_NUMBER: ${{github.run_number}} - PULL_REQUEST_NAME: ${github.head_ref} + PULL_REQUEST_NAME: ${{github.head_ref}} PULL_REQUEST_BRANCH: ${{github.head_ref}} TAG_NAME: ${TRAVIS_TAG} REPO_SLUG: ${{github.repository}} PR_SLUG: ${{github.repository}} UTPLSQL_REPO: "utPLSQL/utPLSQL" UTPLSQL_BUILD_NO_OFFSET: 3563 - UTPLSQL_BUILD_NO: $( expr ${{github.run_number}} + ${UTPLSQL_BUILD_NO_OFFSET} ) - UTPLSQL_VERSION: $(. .travis/get_project_version.sh) - UTPLSQL_BUILD_VERSION: $(. .travis/get_project_build_version.sh) - UTPLSQL_SOURCES_DIR: 'source' - UTPLSQL_BUILD_USER_NAME: "Travis CI" - CACHE_DIR: $HOME/.cache # Database Env SQLCLI: "sqlplus" OJDBC_HOME: ${{github.workspace}}/ojdbc @@ -51,52 +47,120 @@ on: workflow_dispatch: jobs: - build: - - env: - ORACLE_VERSION: ${{matrix.oracle-version}} - CONNECTION_STR: ${{matrix.connection-str}} - ORACLE_PASSWORD: oracle - DOCKER_VOLUME: ${{matrix.docker-volume}} - DOCKER_ENV: "-e SQLCLI=sqlplus -e UT3_DEVELOP_SCHEMA -e UT3_DEVELOP_SCHEMA_PASSWORD -e UT3_RELEASE_VERSION_SCHEMA -e UT3_RELEASE_VERSION_SCHEMA_PASSWORD -e UT3_USER -e UT3_USER_PASSWORD -e UT3_TESTER -e UT3_TESTER_PASSWORD -e UT3_TESTER_HELPER -e UT3_TESTER_HELPER_PASSWORD -e UT3_TABLESPACE -e ORACLE_PWD -e CONNECTION_STR -e UTPLSQL_DIR" +# build: +# env: +# ORACLE_VERSION: ${{matrix.oracle-version}} +# CONNECTION_STR: ${{matrix.connection-str}} +# ORACLE_PASSWORD: oracle +# DOCKER_VOLUME: ${{matrix.docker-volume}} +# DOCKER_ENV: "-e SQLCLI=sqlplus -e UT3_DEVELOP_SCHEMA -e UT3_DEVELOP_SCHEMA_PASSWORD -e UT3_RELEASE_VERSION_SCHEMA -e UT3_RELEASE_VERSION_SCHEMA_PASSWORD -e UT3_USER -e UT3_USER_PASSWORD -e UT3_TESTER -e UT3_TESTER_PASSWORD -e UT3_TESTER_HELPER -e UT3_TESTER_HELPER_PASSWORD -e UT3_TABLESPACE -e ORACLE_PWD -e CONNECTION_STR -e UTPLSQL_DIR" +# +# runs-on: ubuntu-latest +# strategy: +# fail-fast: false +# matrix: +# include: +# - oracle-version: "gvenzl/oracle-xe:11-full" +# connection-str: '127.0.0.1:1521/XE' +## TODO - need to add healthcheck.sh into our containers +## - oracle-version: "utplsqlv3/oracledb:12c-r1-se2-small" +## connection-str: '127.0.0.1:1521/ORCLCDB' +## - oracle-version: "utplsqlv3/oracledb:12c-r2-se2-small" +## connection-str: '127.0.0.1:1521/ORCLCDB' +# - oracle-version: "gvenzl/oracle-xe:18-slim" +# connection-str: '127.0.0.1:1521/XE' +## - oracle-version: "utplsqlv3/oracledb:18c-se2-small" +## connection-str: '127.0.0.1:1521/ORCLCDB' +## - oracle-version: "utplsqlv3/oracledb:19c-se2-small" +## connection-str: '127.0.0.1:1521/ORCLCDB' +# - oracle-version: "gvenzl/oracle-xe:21-slim" +# connection-str: '127.0.0.1:1521/XE' +# +# services: +# oracle: +# image: ${{matrix.oracle-version}} +# env: +# ORACLE_PASSWORD: oracle +## credentials: +## username: ${{ secrets.DOCKER_USER }} +## password: ${{ secrets.DOCKER_PASSWORD }} +# ports: +# - 1521:1521 +# options: >- +# --health-cmd healthcheck.sh +# --health-interval 10s +# --health-timeout 5s +# --health-retries 10 +# -e SQLCLI=sqlplus -e UT3_DEVELOP_SCHEMA -e UT3_DEVELOP_SCHEMA_PASSWORD -e UT3_RELEASE_VERSION_SCHEMA -e UT3_RELEASE_VERSION_SCHEMA_PASSWORD -e UT3_USER -e UT3_USER_PASSWORD -e UT3_TESTER -e UT3_TESTER_PASSWORD -e UT3_TESTER_HELPER -e UT3_TESTER_HELPER_PASSWORD -e UT3_TABLESPACE -e ORACLE_PWD -e CONNECTION_STR -e UTPLSQL_DIR +# +# steps: +# - uses: actions/checkout@v2 +# with: +# fetch-depth: 0 +# +# - uses: nelonoel/branch-name@v1.0.1 +# +# - name: Set dynamic environment variables +# run: | +# echo "CURRENT_BRANCH=${BRANCH_NAME}" >> $GITHUB_ENV +# echo "UTPLSQL_BUILD_NO=$( expr ${{github.run_number}} + ${UTPLSQL_BUILD_NO_OFFSET} )" >> $GITHUB_ENV +# echo "UTPLSQL_VERSION=$(.travis/get_project_version.sh)" >> $GITHUB_ENV +# shell: bash +# +# - name: Set buid version number +# run: echo UTPLSQL_BUILD_VERSION=$(echo ${UTPLSQL_VERSION} | sed -E "s/(v?[0-9]+\.)([0-9]+\.)([0-9]+)(-.*)?/\1\2\3\.${UTPLSQL_BUILD_NO}\4/") >> $GITHUB_ENV +# shell: bash +# +# - name: print variables +# run: | +# echo github.run_number is ${{ github.run_number }} +# echo UTPLSQL_BUILD_NO is $UTPLSQL_BUILD_NO +# echo UTPLSQL_VERSION is $UTPLSQL_VERSION +# echo UTPLSQL_BUILD_VERSION is $UTPLSQL_BUILD_VERSION +# +# - name: Update project version & build number to verify that code is deployable after the update +# run: .travis/update_project_version.sh +# +# - name: Download latest utPLSQL release +# run: git clone --depth=1 --branch=main https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR +# +# - name: Add OJDBC home +# run: mkdir -p ${OJDBC_HOME} && curl -Lk -o ${OJDBC_HOME}/ojdbc8.jar ${OJDBC_URL}/ojdbc8.jar && curl -Lk -o ${OJDBC_HOME}/orai18n.jar ${OJDBC_URL}/orai18n.jar +# +# - name: Install utPLSQL-cli +# run: curl -Lk -o utPLSQL-cli.zip "https://github.com/utPLSQL/utPLSQL-cli/releases/download/v3.1.8/utPLSQL-cli.zip" && unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli +# +# - name: Update privileges on sources +# run: chmod -R go+w ./{source,test,examples,${UTPLSQL_DIR}/source} +# +# - name: Install utPLSQL +# run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .travis/install.sh +# +# - name: Install utPLSQL release +# run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} ./.travis/install_utplsql_release.sh +# +# - name: Run Examples +# run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} ./.travis/run_examples.sh +# +# - name: Install tests +# run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} ./test/install_tests.sh +# +# - name: Run Tests +# run: bash test/run_tests.sh +# +# - name: Validate utPLSQL reports format +# run: bash .travis/validate_report_files.sh +# +# - name: SonarCloud Scan +# uses: SonarSource/sonarcloud-github-action@master +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any +# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + + publish: +# needs: build runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - include: - - oracle-version: "gvenzl/oracle-xe:11-full" - connection-str: '127.0.0.1:1521/XE' -# TODO - need to add healthcheck.sh into our containers -# - oracle-version: "utplsqlv3/oracledb:12c-r1-se2-small" -# connection-str: '127.0.0.1:1521/ORCLCDB' -# - oracle-version: "utplsqlv3/oracledb:12c-r2-se2-small" -# connection-str: '127.0.0.1:1521/ORCLCDB' - - oracle-version: "gvenzl/oracle-xe:18-slim" - connection-str: '127.0.0.1:1521/XE' -# - oracle-version: "utplsqlv3/oracledb:18c-se2-small" -# connection-str: '127.0.0.1:1521/ORCLCDB' -# - oracle-version: "utplsqlv3/oracledb:19c-se2-small" -# connection-str: '127.0.0.1:1521/ORCLCDB' - - oracle-version: "gvenzl/oracle-xe:21-slim" - connection-str: '127.0.0.1:1521/XE' - - services: - oracle: - image: ${{matrix.oracle-version}} - env: - ORACLE_PASSWORD: oracle -# credentials: -# username: ${{ secrets.DOCKER_USER }} -# password: ${{ secrets.DOCKER_PASSWORD }} - ports: - - 1521:1521 - options: >- - --health-cmd healthcheck.sh - --health-interval 10s - --health-timeout 5s - --health-retries 10 - -e SQLCLI=sqlplus -e UT3_DEVELOP_SCHEMA -e UT3_DEVELOP_SCHEMA_PASSWORD -e UT3_RELEASE_VERSION_SCHEMA -e UT3_RELEASE_VERSION_SCHEMA_PASSWORD -e UT3_USER -e UT3_USER_PASSWORD -e UT3_TESTER -e UT3_TESTER_PASSWORD -e UT3_TESTER_HELPER -e UT3_TESTER_HELPER_PASSWORD -e UT3_TABLESPACE -e ORACLE_PWD -e CONNECTION_STR -e UTPLSQL_DIR steps: - uses: actions/checkout@v2 @@ -109,51 +173,44 @@ jobs: run: | echo "CURRENT_BRANCH=${BRANCH_NAME}" >> $GITHUB_ENV echo "UTPLSQL_BUILD_NO=$( expr ${{github.run_number}} + ${UTPLSQL_BUILD_NO_OFFSET} )" >> $GITHUB_ENV - echo "UTPLSQL_VERSION=$(. .travis/get_project_version.sh)" >> $GITHUB_ENV - echo UTPLSQL_BUILD_VERSION=$(sed -E "s/(v?[0-9]+\.)([0-9]+\.)([0-9]+)(-.*)?/\1\2\3\.${UTPLSQL_BUILD_NO}\4/" <<< "${UTPLSQL_VERSION}") >> $GITHUB_ENV + echo "UTPLSQL_VERSION=$(.travis/get_project_version.sh)" >> $GITHUB_ENV + shell: bash -# - name: print variables -# run: | -# echo github.run_number is ${{ github.run_number }} -# echo UTPLSQL_BUILD_NO is $UTPLSQL_BUILD_NO -# echo UTPLSQL_VERSION is $UTPLSQL_VERSION -# echo UTPLSQL_BUILD_VERSION is $UTPLSQL_BUILD_VERSION - - - name: Update project version & build number - run: .travis/update_project_version.sh - - - name: Download latest utPLSQL release - run: git clone --depth=1 --branch=main https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR - - - name: Add OJDBC home - run: mkdir -p ${OJDBC_HOME} && curl -Lk -o ${OJDBC_HOME}/ojdbc8.jar ${OJDBC_URL}/ojdbc8.jar && curl -Lk -o ${OJDBC_HOME}/orai18n.jar ${OJDBC_URL}/orai18n.jar - - - name: Install utPLSQL-cli - run: curl -Lk -o utPLSQL-cli.zip "https://github.com/utPLSQL/utPLSQL-cli/releases/download/v3.1.8/utPLSQL-cli.zip" && unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli - - - name: Update privileges on sources - run: chmod -R go+w ./{source,test,examples,${UTPLSQL_DIR}/source} + - name: Set buid version number + run: echo UTPLSQL_BUILD_VERSION=$(echo ${UTPLSQL_VERSION} | sed -E "s/(v?[0-9]+\.)([0-9]+\.)([0-9]+)(-.*)?/\1\2\3\.${UTPLSQL_BUILD_NO}\4/") >> $GITHUB_ENV + shell: bash - - name: Install utPLSQL - run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .travis/install.sh - - name: Install utPLSQL release - run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} ./.travis/install_utplsql_release.sh + - name: Install MkDocs + run: pip install mkdocs - - name: Run Examples - run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} ./.travis/run_examples.sh - - - name: Install tests - run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} ./test/install_tests.sh - - - name: Run Tests - run: bash test/run_tests.sh - - - name: Validate utPLSQL reports format - run: bash .travis/validate_report_files.sh - - - name: SonarCloud Scan - uses: SonarSource/sonarcloud-github-action@master - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + - name: Update project version & build number in source code and documentation + run: .travis/update_project_version.sh + shell: bash + + - name: Push version update to repository + uses: test-room-7/action-update-file@v1 + with: + file-path: | + sonar-project.properties + VERSION + source/** + docs/** + commit-msg: Updated project version after build [skip ci] + github-token: ${{ secrets.PUSH_TOKEN }} + branch: ${{ env.CURRENT_BRANCH }} + if: | + ${{ + github.ref_type == 'branch' + && github.repository == 'utPLSQL/utPLSQL' + && ( startsWith(env.CURRENT_BRANCH,'release/') + || env.CURRENT_BRANCH == 'develop' + || env.CURRENT_BRANCH == 'feature/github_actions' + ) + }} + + +# TODO - add slack notifications +# TODO - add push of documentation +# TODO - add building of release archive +# TODO - add publishing of release diff --git a/.travis/push_project_version.sh b/.travis/push_project_version.sh new file mode 100755 index 000000000..1b38e6c24 --- /dev/null +++ b/.travis/push_project_version.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +set -v +echo Current branch is "${CURRENT_BRANCH}" +echo "Committing version & buildNo into branch (${CURRENT_BRANCH})" +git add sonar-project.properties +git add VERSION +git add source/* +git add docs/* +git commit -m 'Updated project version after build [skip ci]' +echo "Pushing to origin" +git push --quiet origin HEAD:${CURRENT_BRANCH} diff --git a/.travis/push_release_version.sh b/.travis/push_release_version.sh deleted file mode 100755 index f4ca8f819..000000000 --- a/.travis/push_release_version.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash - -# We are updating version number only when: -# - not a pull request -# - branch name is = develop or branch name is like release/vX.X.X... -if [ "${REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [ "${PULL_REQUEST_NAME}" == "false" ] && [[ "${CURRENT_BRANCH}" =~ ^(release/v[0-9]+\.[0-9]+\.[0-9]+.*|develop)$ ]]; then - echo Current branch is "${CURRENT_BRANCH}" - echo "Committing version & buildNo into branch (${CURRENT_BRANCH})" - git add sonar-project.properties - git add VERSION - git add source/* - git add docs/* - git commit -m 'Updated project version after build [skip ci]' - echo "Pushing to origin" - git push --quiet origin HEAD:${CURRENT_BRANCH} -else - echo "Publishing of version skipped for branch ${CURRENT_BRANCH}, pull request ${PULL_REQUEST_NAME}" -fi diff --git a/.travis/update_project_version.sh b/.travis/update_project_version.sh index c4540eef8..bb6f72f00 100755 --- a/.travis/update_project_version.sh +++ b/.travis/update_project_version.sh @@ -5,7 +5,7 @@ UTPLSQL_VERSION_PATTERN="v?([0-9]+\.){3}[0-9]+[^']*" echo Current branch is "${CURRENT_BRANCH}" echo Update version in project source files -find ${UTPLSQL_SOURCES_DIR} -type f -name '*' -exec sed -i -r "s/${UTPLSQL_VERSION_PATTERN}/${UTPLSQL_BUILD_VERSION}/" {} \; +find source -type f -name '*' -exec sed -i -r "s/${UTPLSQL_VERSION_PATTERN}/${UTPLSQL_BUILD_VERSION}/" {} \; echo Source files updated with version tag: ${UTPLSQL_BUILD_VERSION} echo Update version in documentation files From 169f61c80d646e5fd308942790637ea1507c8446 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 6 Jan 2022 15:34:26 +0200 Subject: [PATCH 0799/1096] Update of token --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f6de8da00..a998a7c91 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -197,7 +197,7 @@ jobs: source/** docs/** commit-msg: Updated project version after build [skip ci] - github-token: ${{ secrets.PUSH_TOKEN }} + github-token: ${{ secrets.API_TOKEN_GITHUB }} branch: ${{ env.CURRENT_BRANCH }} if: | ${{ From 82c4d21a97c29d6fa85df65d9688ad1b70e4677f Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 6 Jan 2022 15:52:02 +0200 Subject: [PATCH 0800/1096] Testing publishing of documentation to gh-pages --- .github/workflows/build.yml | 18 ++++ .travis/push_docs_to_github_io.sh | 134 +++++++++++++++--------------- 2 files changed, 84 insertions(+), 68 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a998a7c91..45956f696 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -209,6 +209,24 @@ jobs: ) }} + - name: Copy and push documentation to utPLSQL-github-io repo + env: + API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }} + run: .travis/push_docs_to_github_io.sh + shell: bash + if: | + ${{ + github.repository == 'utPLSQL/utPLSQL' + && (github.ref_type == 'branch' + && ( startsWith(env.CURRENT_BRANCH,'release/') + || env.CURRENT_BRANCH == 'develop' + || env.CURRENT_BRANCH == 'feature/github_actions' + ) + || github.ref_type == 'tag' + ) + }} + + # TODO - add slack notifications # TODO - add push of documentation diff --git a/.travis/push_docs_to_github_io.sh b/.travis/push_docs_to_github_io.sh index 5c3fcd672..ae36dc5db 100755 --- a/.travis/push_docs_to_github_io.sh +++ b/.travis/push_docs_to_github_io.sh @@ -17,81 +17,79 @@ LATEST_DOCS_BRANCH="develop" GITHUB_IO_REPO='utPLSQL/utPLSQL.github.io' GITHUB_IO_BRANCH='main' -# TRAVIS_* variables are set by travis directly and only need to be if testing externally -# We deploy only when building on develop branch or on TAG (release) -if [ "${PULL_REQUEST_NAME}" == "false" ] && { [ "${CURRENT_BRANCH}" == "${LATEST_DOCS_BRANCH}" ] || [ -n "${TAG_NAME}" ]; }; then +# ENV Variable checks are to help with configuration troubleshooting, they silently exit with unique message. +# Anyone one of them not set can be used to turn off this functionality. - # ENV Variable checks are to help with configuration troubleshooting, they silently exit with unique message. - # Anyone one of them not set can be used to turn off this functionality. +# If a version of the project is not defined +[[ -n "${UTPLSQL_VERSION}" ]] || { echo "variable UTPLSQL_VERSION is not defines or missing value"; exit 1; } +# Fail if the markdown documentation is not present. +[[ -f ./docs/index.md ]] || { echo "file docs/index.md not found"; exit 1; } - # If a version of the project is not defined - [[ -n "${UTPLSQL_VERSION}" ]] || { echo "variable UTPLSQL_VERSION is not defines or missing value"; exit 1; } - # Fail if the markdown documentation is not present. - [[ -f ./docs/index.md ]] || { echo "file docs/index.md not found"; exit 1; } +# Store latest commit SHA to be used when committing and pushing to github.io repo +SHA=`git rev-parse --verify HEAD` - # Store latest commit SHA to be used when committing and pushing to github.io repo - SHA=`git rev-parse --verify HEAD` +# clone the repository and switch to GITHUB_IO_BRANCH branch +mkdir pages +cd ./pages +git clone --depth 1 https://${API_TOKEN_GITHUB}@github.com/${GITHUB_IO_REPO} -b ${GITHUB_IO_BRANCH} . - # clone the repository and switch to GITHUB_IO_BRANCH branch - mkdir pages - cd ./pages - git clone --depth 1 https://${github_api_token}@github.com/${GITHUB_IO_REPO} -b ${GITHUB_IO_BRANCH} . +git config user.email "github-actions[bot]@users.noreply.github.com" +git config user.name "github-actions[bot]" - mkdir -p utPLSQL - cd ./utPLSQL - #clear out develop documentation directory and copy docs contents to it. - echo "updating 'develop' documentation directory" - mkdir -p ./develop - rm -rf ./develop/**./* || exit 0 - cp -a ../../docs/. ./develop +mkdir -p utPLSQL +cd ./utPLSQL +#clear out develop documentation directory and copy docs contents to it. +echo "updating 'develop' documentation directory" +mkdir -p ./develop +rm -rf ./develop/**./* || exit 0 +cp -a ../../docs/. ./develop - # If a Tagged Build then copy to it's own directory as well and to the 'latest' release directory - if [ -n "${TAG_NAME}" ]; then - echo "Creating directory ./${UTPLSQL_VERSION}" - mkdir -p ./${UTPLSQL_VERSION} - rm -rf ./${UTPLSQL_VERSION}/**./* || exit 0 - cp -a ../../docs/. ./${UTPLSQL_VERSION} - echo "Populating 'latest' directory" - mkdir -p ./latest - rm -rf ./latest/**./* || exit 0 - cp -a ../../docs/. ./latest - fi - # Stage changes for commit - git add . +# If a Tagged Build then copy to it's own directory as well and to the 'latest' release directory +if [ "${GITHUB_REF_TYPE}" == "tag" ]; then + echo "Creating directory ./${UTPLSQL_VERSION}" + mkdir -p ./${UTPLSQL_VERSION} + rm -rf ./${UTPLSQL_VERSION}/**./* || exit 0 + cp -a ../../docs/. ./${UTPLSQL_VERSION} + echo "Populating 'latest' directory" + mkdir -p ./latest + rm -rf ./latest/**./* || exit 0 + cp -a ../../docs/. ./latest +fi +# Stage changes for commit +git add . - #Check if there are doc changes, if none exit the script - if [[ -z `git diff HEAD --exit-code` ]]; then - echo "No changes to docs detected." - exit 0 - fi - #Changes where detected, so we need to update the version log. - now=$(date +"%d %b %Y - %r") - if [ ! -f index.md ]; then - echo "---" >>index.md - echo "layout: default" >>index.md - echo "---" >>index.md - echo "" >>index.md - echo "# Documentation versions" >>index.md - echo "" >>index.md - echo "" >>index.md #- 7th line - placeholder for latest release doc - echo "" >>index.md #- 8th line - placeholder for develop branch doc - echo "" >>index.md - echo "## Released Version Doc History" >>index.md - echo "" >>index.md - fi - #If build running on a TAG - it's a new release - need to add it to documentation - if [ -n "${TAG_NAME}" ]; then - sed -i '7s@.*@'" - [Latest ${TAG_NAME} documentation](latest/) - Created $now"'@' index.md - #add entry to the top of version history (line end of file - ## Released Version Doc History - sed -i '12i'" - [${TAG_NAME} documentation](${UTPLSQL_VERSION}/) - Created $now" index.md - fi - #replace 4th line in log - sed -i '8s@.*@'" - [Latest development version](develop/) - Created $now"'@' index.md - #Add and Commit the changes back to pages repo. - git add . - git commit -m "Deploy to gh-pages branch: base commit ${SHA}" - # Now that we're all set up, we can push. - git push --quiet origin HEAD:${GITHUB_IO_BRANCH} +#Check if there are doc changes, if none exit the script +if [[ -z `git diff HEAD --exit-code` ]]; then + echo "No changes to docs detected." + exit 0 +fi +#Changes where detected, so we need to update the version log. +now=$(date +"%d %b %Y - %r") +if [ ! -f index.md ]; then + echo "---" >>index.md + echo "layout: default" >>index.md + echo "---" >>index.md + echo "" >>index.md + echo "# Documentation versions" >>index.md + echo "" >>index.md + echo "" >>index.md #- 7th line - placeholder for latest release doc + echo "" >>index.md #- 8th line - placeholder for develop branch doc + echo "" >>index.md + echo "## Released Version Doc History" >>index.md + echo "" >>index.md +fi +#If build running on a TAG - it's a new release - need to add it to documentation +if [ "${GITHUB_REF_TYPE}" == "tag" ]; then + sed -i '7s@.*@'" - [Latest ${CURRENT_BRANCH} documentation](latest/) - Created $now"'@' index.md + #add entry to the top of version history (line end of file - ## Released Version Doc History + sed -i '12i'" - [${CURRENT_BRANCH} documentation](${UTPLSQL_VERSION}/) - Created $now" index.md fi +#replace 4th line in log +sed -i '8s@.*@'" - [Latest development version](develop/) - Created $now"'@' index.md +#Add and Commit the changes back to pages repo. +git add . +git commit -m "Deploy to gh-pages branch: base commit ${SHA}" +# Now that we're all set up, we can push. +git push --quiet origin HEAD:${GITHUB_IO_BRANCH} From 532be8d07a63a423eb105fe43a6e411f4853cbfc Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 7 Jan 2022 01:43:57 +0200 Subject: [PATCH 0801/1096] Externalizing env variables. Cleanup and refactoring. --- .github/scripts/set_version_numbers_env.sh | 10 + .github/variables/.env | 33 +++ .github/workflows/build.yml | 306 +++++++------------- .github/workflows/release_documentation.yml | 56 ++++ .travis/coveralls_uploader.js | 31 -- .travis/coveralls_uploader.sh | 6 - .travis/push_docs_to_github_io.sh | 3 - .travis/run_sonar_scanner.sh | 68 ----- .travis/start_db.sh | 15 - 9 files changed, 209 insertions(+), 319 deletions(-) create mode 100755 .github/scripts/set_version_numbers_env.sh create mode 100644 .github/variables/.env create mode 100644 .github/workflows/release_documentation.yml delete mode 100644 .travis/coveralls_uploader.js delete mode 100755 .travis/coveralls_uploader.sh delete mode 100755 .travis/run_sonar_scanner.sh delete mode 100755 .travis/start_db.sh diff --git a/.github/scripts/set_version_numbers_env.sh b/.github/scripts/set_version_numbers_env.sh new file mode 100755 index 000000000..8f463c49b --- /dev/null +++ b/.github/scripts/set_version_numbers_env.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +UTPLSQL_BUILD_NO=$( expr ${JOB_NUMBER} + ${UTPLSQL_BUILD_NO_OFFSET} ) +UTPLSQL_VERSION=$(.travis/get_project_version.sh) + +echo "UTPLSQL_BUILD_NO=${UTPLSQL_BUILD_NO}" >> $GITHUB_ENV +echo "UTPLSQL_VERSION=${UTPLSQL_VERSION}" >> $GITHUB_ENV +echo UTPLSQL_BUILD_VERSION=$(echo ${UTPLSQL_VERSION} | sed -E "s/(v?[0-9]+\.)([0-9]+\.)([0-9]+)(-.*)?/\1\2\3\.${UTPLSQL_BUILD_NO}\4/") >> $GITHUB_ENV + +echo "CURRENT_BRANCH=${BRANCH_NAME}" >> $GITHUB_ENV diff --git a/.github/variables/.env b/.github/variables/.env new file mode 100644 index 000000000..9f35a080c --- /dev/null +++ b/.github/variables/.env @@ -0,0 +1,33 @@ +#utPLSQL install env +UT3_DEVELOP_SCHEMA=UT3_DEVELOP +UT3_DEVELOP_SCHEMA_PASSWORD=ut3 +UT3_RELEASE_VERSION_SCHEMA=UT3 +UT3_RELEASE_VERSION_SCHEMA_PASSWORD=ut3 +UT3_USER='UT3$USER#' +UT3_USER_PASSWORD=ut3 +UT3_TESTER=UT3_TESTER +UT3_TESTER_PASSWORD=ut3 +UT3_TESTER_HELPER=UT3_TESTER_HELPER +UT3_TESTER_HELPER_PASSWORD=ut3 +UT3_TABLESPACE=users + +# Database Env +SQLCLI="sqlplus" +OJDBC_HOME=ojdbc +OJDBC_URL="https://download.oracle.com/otn-pub/otn_software/jdbc/213" +ORACLE_PWD="oracle" +TZ="Europe/London" + +#Build env +UTPLSQL_CLI_VERSION="3.1.8" +UTPLSQL_DIR="utPLSQL_latest_release" +UTPLSQL_BUILD_NO_OFFSET=3563 + +#Git configuration +GIT_AUTHOR_NAME="github-actions[bot]" +GIT_AUTHOR_EMAIL="github-actions[bot]@users.noreply.github.com" +GIT_COMMITTER_NAME="github-actions[bot]" +GIT_COMMITTER_EMAIL="github-actions[bot]@users.noreply.github.com" + +#Docker environment for running utPLSQL install commands +DOCKER_ENV="-e SQLCLI=sqlplus -e UT3_DEVELOP_SCHEMA -e UT3_DEVELOP_SCHEMA_PASSWORD -e UT3_RELEASE_VERSION_SCHEMA -e UT3_RELEASE_VERSION_SCHEMA_PASSWORD -e UT3_USER -e UT3_USER_PASSWORD -e UT3_TESTER -e UT3_TESTER_PASSWORD -e UT3_TESTER_HELPER -e UT3_TESTER_HELPER_PASSWORD -e UT3_TABLESPACE -e ORACLE_PWD -e CONNECTION_STR -e UTPLSQL_DIR" \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 45956f696..e509ffe98 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,42 +1,7 @@ -name: Deploy and test +name: Build and test env: - #utPLSQL install env - UT3_DEVELOP_SCHEMA: UT3_DEVELOP - UT3_DEVELOP_SCHEMA_PASSWORD: ut3 - UT3_RELEASE_VERSION_SCHEMA: UT3 - UT3_RELEASE_VERSION_SCHEMA_PASSWORD: ut3 - UT3_USER: 'UT3$USER#' - UT3_USER_PASSWORD: ut3 - UT3_TESTER: UT3_TESTER - UT3_TESTER_PASSWORD: ut3 - UT3_TESTER_HELPER: UT3_TESTER_HELPER - UT3_TESTER_HELPER_PASSWORD: ut3 - UT3_TABLESPACE: users - #Build env BUILD_DIR: ${{github.workspace}} - JOB_ID: ${{github.run_id}} JOB_NUMBER: ${{github.run_number}} - PULL_REQUEST_NAME: ${{github.head_ref}} - PULL_REQUEST_BRANCH: ${{github.head_ref}} - TAG_NAME: ${TRAVIS_TAG} - REPO_SLUG: ${{github.repository}} - PR_SLUG: ${{github.repository}} - UTPLSQL_REPO: "utPLSQL/utPLSQL" - UTPLSQL_BUILD_NO_OFFSET: 3563 - # Database Env - SQLCLI: "sqlplus" - OJDBC_HOME: ${{github.workspace}}/ojdbc - OJDBC_URL: "https://download.oracle.com/otn-pub/otn_software/jdbc/213" - ORACLE_PWD: "oracle" - DOCKHER_HUB_REPO: "utplsqlv3/oracledb" - #utPLSQL released version directory - UTPLSQL_DIR: "utPLSQL_latest_release" - SELFTESTING_BRANCH: ${TRAVIS_BRANCH} - UTPLSQL_CLI_VERSION: "3.1.8" - TZ: "Europe/London" - # Maven - MAVEN_HOME: /usr/local/maven - MAVEN_CFG: $HOME/.m2 on: push: @@ -46,189 +11,138 @@ on: workflow_dispatch: +defaults: + run: + shell: bash + jobs: -# build: -# env: -# ORACLE_VERSION: ${{matrix.oracle-version}} -# CONNECTION_STR: ${{matrix.connection-str}} -# ORACLE_PASSWORD: oracle -# DOCKER_VOLUME: ${{matrix.docker-volume}} -# DOCKER_ENV: "-e SQLCLI=sqlplus -e UT3_DEVELOP_SCHEMA -e UT3_DEVELOP_SCHEMA_PASSWORD -e UT3_RELEASE_VERSION_SCHEMA -e UT3_RELEASE_VERSION_SCHEMA_PASSWORD -e UT3_USER -e UT3_USER_PASSWORD -e UT3_TESTER -e UT3_TESTER_PASSWORD -e UT3_TESTER_HELPER -e UT3_TESTER_HELPER_PASSWORD -e UT3_TABLESPACE -e ORACLE_PWD -e CONNECTION_STR -e UTPLSQL_DIR" -# -# runs-on: ubuntu-latest -# strategy: -# fail-fast: false -# matrix: -# include: -# - oracle-version: "gvenzl/oracle-xe:11-full" -# connection-str: '127.0.0.1:1521/XE' -## TODO - need to add healthcheck.sh into our containers -## - oracle-version: "utplsqlv3/oracledb:12c-r1-se2-small" -## connection-str: '127.0.0.1:1521/ORCLCDB' -## - oracle-version: "utplsqlv3/oracledb:12c-r2-se2-small" -## connection-str: '127.0.0.1:1521/ORCLCDB' -# - oracle-version: "gvenzl/oracle-xe:18-slim" -# connection-str: '127.0.0.1:1521/XE' -## - oracle-version: "utplsqlv3/oracledb:18c-se2-small" -## connection-str: '127.0.0.1:1521/ORCLCDB' -## - oracle-version: "utplsqlv3/oracledb:19c-se2-small" -## connection-str: '127.0.0.1:1521/ORCLCDB' -# - oracle-version: "gvenzl/oracle-xe:21-slim" -# connection-str: '127.0.0.1:1521/XE' -# -# services: -# oracle: -# image: ${{matrix.oracle-version}} -# env: -# ORACLE_PASSWORD: oracle -## credentials: -## username: ${{ secrets.DOCKER_USER }} -## password: ${{ secrets.DOCKER_PASSWORD }} -# ports: -# - 1521:1521 -# options: >- -# --health-cmd healthcheck.sh -# --health-interval 10s -# --health-timeout 5s -# --health-retries 10 -# -e SQLCLI=sqlplus -e UT3_DEVELOP_SCHEMA -e UT3_DEVELOP_SCHEMA_PASSWORD -e UT3_RELEASE_VERSION_SCHEMA -e UT3_RELEASE_VERSION_SCHEMA_PASSWORD -e UT3_USER -e UT3_USER_PASSWORD -e UT3_TESTER -e UT3_TESTER_PASSWORD -e UT3_TESTER_HELPER -e UT3_TESTER_HELPER_PASSWORD -e UT3_TABLESPACE -e ORACLE_PWD -e CONNECTION_STR -e UTPLSQL_DIR -# -# steps: -# - uses: actions/checkout@v2 -# with: -# fetch-depth: 0 -# -# - uses: nelonoel/branch-name@v1.0.1 -# -# - name: Set dynamic environment variables -# run: | -# echo "CURRENT_BRANCH=${BRANCH_NAME}" >> $GITHUB_ENV -# echo "UTPLSQL_BUILD_NO=$( expr ${{github.run_number}} + ${UTPLSQL_BUILD_NO_OFFSET} )" >> $GITHUB_ENV -# echo "UTPLSQL_VERSION=$(.travis/get_project_version.sh)" >> $GITHUB_ENV -# shell: bash -# -# - name: Set buid version number -# run: echo UTPLSQL_BUILD_VERSION=$(echo ${UTPLSQL_VERSION} | sed -E "s/(v?[0-9]+\.)([0-9]+\.)([0-9]+)(-.*)?/\1\2\3\.${UTPLSQL_BUILD_NO}\4/") >> $GITHUB_ENV -# shell: bash -# -# - name: print variables -# run: | -# echo github.run_number is ${{ github.run_number }} -# echo UTPLSQL_BUILD_NO is $UTPLSQL_BUILD_NO -# echo UTPLSQL_VERSION is $UTPLSQL_VERSION -# echo UTPLSQL_BUILD_VERSION is $UTPLSQL_BUILD_VERSION -# -# - name: Update project version & build number to verify that code is deployable after the update -# run: .travis/update_project_version.sh -# -# - name: Download latest utPLSQL release -# run: git clone --depth=1 --branch=main https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR -# -# - name: Add OJDBC home -# run: mkdir -p ${OJDBC_HOME} && curl -Lk -o ${OJDBC_HOME}/ojdbc8.jar ${OJDBC_URL}/ojdbc8.jar && curl -Lk -o ${OJDBC_HOME}/orai18n.jar ${OJDBC_URL}/orai18n.jar -# -# - name: Install utPLSQL-cli -# run: curl -Lk -o utPLSQL-cli.zip "https://github.com/utPLSQL/utPLSQL-cli/releases/download/v3.1.8/utPLSQL-cli.zip" && unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli -# -# - name: Update privileges on sources -# run: chmod -R go+w ./{source,test,examples,${UTPLSQL_DIR}/source} -# -# - name: Install utPLSQL -# run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .travis/install.sh -# -# - name: Install utPLSQL release -# run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} ./.travis/install_utplsql_release.sh -# -# - name: Run Examples -# run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} ./.travis/run_examples.sh -# -# - name: Install tests -# run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} ./test/install_tests.sh -# -# - name: Run Tests -# run: bash test/run_tests.sh -# -# - name: Validate utPLSQL reports format -# run: bash .travis/validate_report_files.sh -# -# - name: SonarCloud Scan -# uses: SonarSource/sonarcloud-github-action@master -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any -# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + build: + env: + ORACLE_VERSION: ${{matrix.oracle-version}} + CONNECTION_STR: ${{matrix.connection-str}} + ORACLE_PASSWORD: oracle + DOCKER_VOLUME: ${{matrix.docker-volume}} - publish: -# needs: build runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - oracle-version: "gvenzl/oracle-xe:11-full" + connection-str: '127.0.0.1:1521/XE' +# TODO - need to add healthcheck.sh into our containers +# - oracle-version: "utplsqlv3/oracledb:12c-r1-se2-small" +# connection-str: '127.0.0.1:1521/ORCLCDB' +# - oracle-version: "utplsqlv3/oracledb:12c-r2-se2-small" +# connection-str: '127.0.0.1:1521/ORCLCDB' + - oracle-version: "gvenzl/oracle-xe:18-slim" + connection-str: '127.0.0.1:1521/XE' +# - oracle-version: "utplsqlv3/oracledb:18c-se2-small" +# connection-str: '127.0.0.1:1521/ORCLCDB' +# - oracle-version: "utplsqlv3/oracledb:19c-se2-small" +# connection-str: '127.0.0.1:1521/ORCLCDB' + - oracle-version: "gvenzl/oracle-xe:21-slim" + connection-str: '127.0.0.1:1521/XE' + + services: + oracle: + image: ${{matrix.oracle-version}} + env: + ORACLE_PASSWORD: oracle +# credentials: +# username: ${{ secrets.DOCKER_USER }} +# password: ${{ secrets.DOCKER_PASSWORD }} + ports: + - 1521:1521 + options: >- + --health-cmd healthcheck.sh + --health-interval 10s + --health-timeout 5s + --health-retries 10 steps: - uses: actions/checkout@v2 with: fetch-depth: 0 - - uses: nelonoel/branch-name@v1.0.1 + - uses: c-py/action-dotenv-to-setenv@v2 + with: + env-file: .github/variables/.env + + + - name: Set buid version number env variables + run: .github/scripts/set_version_numbers_env.sh + + - name: Update project version & build number to verify that code is deployable after the update + run: .travis/update_project_version.sh + + - name: Download latest utPLSQL release + run: git clone --depth=1 --branch=main https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR + + - name: Add OJDBC home + run: mkdir -p ${OJDBC_HOME} && curl -Lk -o ${OJDBC_HOME}/ojdbc8.jar ${OJDBC_URL}/ojdbc8.jar && curl -Lk -o ${OJDBC_HOME}/orai18n.jar ${OJDBC_URL}/orai18n.jar + + - name: Install utPLSQL-cli + run: curl -Lk -o utPLSQL-cli.zip "https://github.com/utPLSQL/utPLSQL-cli/releases/download/v3.1.8/utPLSQL-cli.zip" && unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli + + - name: Update privileges on sources + run: chmod -R go+w ./{source,test,examples,${UTPLSQL_DIR}/source} + + - name: Install utPLSQL + run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .travis/install.sh + + - name: Install utPLSQL release + run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} ./.travis/install_utplsql_release.sh - - name: Set dynamic environment variables - run: | - echo "CURRENT_BRANCH=${BRANCH_NAME}" >> $GITHUB_ENV - echo "UTPLSQL_BUILD_NO=$( expr ${{github.run_number}} + ${UTPLSQL_BUILD_NO_OFFSET} )" >> $GITHUB_ENV - echo "UTPLSQL_VERSION=$(.travis/get_project_version.sh)" >> $GITHUB_ENV - shell: bash + - name: Run Examples + run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} ./.travis/run_examples.sh - - name: Set buid version number - run: echo UTPLSQL_BUILD_VERSION=$(echo ${UTPLSQL_VERSION} | sed -E "s/(v?[0-9]+\.)([0-9]+\.)([0-9]+)(-.*)?/\1\2\3\.${UTPLSQL_BUILD_NO}\4/") >> $GITHUB_ENV - shell: bash + - name: Install tests + run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} ./test/install_tests.sh + - name: Run Tests + run: bash test/run_tests.sh - - name: Install MkDocs - run: pip install mkdocs + - name: Validate utPLSQL reports format + run: bash .travis/validate_report_files.sh + + - name: SonarCloud Scan + uses: SonarSource/sonarcloud-github-action@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + + publish: + needs: build + runs-on: ubuntu-latest + if: | + ${{ github.repository == 'utPLSQL/utPLSQL' && github.base_ref == null + && ( startsWith( github.ref, 'refs/heads/release/v' ) || github.ref == 'refs/heads/develop' ) + }} + + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + #Populates the value of BRANCH_NAME env variable + - uses: nelonoel/branch-name@v1.0.1 + - uses: c-py/action-dotenv-to-setenv@v2 + with: + env-file: .github/variables/.env + + - name: Set buid version number env variables + run: .github/scripts/set_version_numbers_env.sh - name: Update project version & build number in source code and documentation run: .travis/update_project_version.sh - shell: bash - name: Push version update to repository - uses: test-room-7/action-update-file@v1 - with: - file-path: | - sonar-project.properties - VERSION - source/** - docs/** - commit-msg: Updated project version after build [skip ci] - github-token: ${{ secrets.API_TOKEN_GITHUB }} - branch: ${{ env.CURRENT_BRANCH }} - if: | - ${{ - github.ref_type == 'branch' - && github.repository == 'utPLSQL/utPLSQL' - && ( startsWith(env.CURRENT_BRANCH,'release/') - || env.CURRENT_BRANCH == 'develop' - || env.CURRENT_BRANCH == 'feature/github_actions' - ) - }} + run: .travis/push_project_version.sh - name: Copy and push documentation to utPLSQL-github-io repo env: API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }} run: .travis/push_docs_to_github_io.sh - shell: bash - if: | - ${{ - github.repository == 'utPLSQL/utPLSQL' - && (github.ref_type == 'branch' - && ( startsWith(env.CURRENT_BRANCH,'release/') - || env.CURRENT_BRANCH == 'develop' - || env.CURRENT_BRANCH == 'feature/github_actions' - ) - || github.ref_type == 'tag' - ) - }} - - # TODO - add slack notifications -# TODO - add push of documentation -# TODO - add building of release archive -# TODO - add publishing of release diff --git a/.github/workflows/release_documentation.yml b/.github/workflows/release_documentation.yml new file mode 100644 index 000000000..8d07e53d8 --- /dev/null +++ b/.github/workflows/release_documentation.yml @@ -0,0 +1,56 @@ +name: Create and publish release artifacts +env: + BUILD_DIR: ${{github.workspace}} + JOB_NUMBER: ${{github.run_number}} + PULL_REQUEST_NAME: ${{github.head_ref}} + PULL_REQUEST_BRANCH: ${{github.head_ref}} + REPO_SLUG: ${{github.repository}} + PR_SLUG: ${{github.repository}} + +on: + release: + types: [ created ] +#See: https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions#example-using-multiple-events-with-activity-types-or-configuration + +defaults: + run: + shell: bash + +jobs: + + publish: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - uses: nelonoel/branch-name@v1.0.1 + + - name: Set buid version number env variables + run: .github/scripts/set_version_numbers_env.sh + + - name: Setup git config + run: | + git config --global user.email "github-actions[bot]@users.noreply.github.com" + git config --global user.name "github-actions[bot]" + + - name: Install MkDocs + run: pip install mkdocs + + - name: Update project version & build number in source code and documentation + run: .travis/update_project_version.sh + + - name: Push version update to repository + run: .travis/push_project_version.sh + + - name: Copy and push documentation to utPLSQL-github-io repo + env: + API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }} + run: .travis/push_docs_to_github_io.sh + + +# TODO - add slack notifications +# TODO - add building of release archive +# TODO - add publishing of release diff --git a/.travis/coveralls_uploader.js b/.travis/coveralls_uploader.js deleted file mode 100644 index b76c8f496..000000000 --- a/.travis/coveralls_uploader.js +++ /dev/null @@ -1,31 +0,0 @@ -var fs = require('fs'); -var request = require('request'); -const md5File = require('md5-file'); - -var url -if (process.env.COVERALLS_URL_BASE) { - url = process.env.COVERALLS_URL_BASE+'/api/v1/jobs'; -} else { - url = 'https://coveralls.io/api/v1/jobs'; -} - -fs.readFile('../coverage.json',function (err,data) { - if (err) { - return console.log(err); - } - req = JSON.parse(data); - req.service_job_id = process.env.JOB_ID; - req.service_name = 'github-actions'; - if (process.env.COVERALLS_REPO_TOKEN) { - req.repo_token = process.env.COVERALLS_REPO_TOKEN; - } - - for (var i in req.source_files) { - req.source_files[i].source_digest = md5File.sync("../" + req.source_files[i].name); - } - - var requestStr = JSON.stringify(req); - - request.post({url : url, form : { json:requestStr}}, function(err, response, body){process.stdout.write(body);}); - -}); diff --git a/.travis/coveralls_uploader.sh b/.travis/coveralls_uploader.sh deleted file mode 100755 index 8fcbad58d..000000000 --- a/.travis/coveralls_uploader.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -e -echo "coveralls_uploader" -npm install request --save -npm install --save md5-file -cd "$(dirname "$(readlink -f "$0")")" -exec node coveralls_uploader.js diff --git a/.travis/push_docs_to_github_io.sh b/.travis/push_docs_to_github_io.sh index ae36dc5db..689cb99c9 100755 --- a/.travis/push_docs_to_github_io.sh +++ b/.travis/push_docs_to_github_io.sh @@ -34,9 +34,6 @@ mkdir pages cd ./pages git clone --depth 1 https://${API_TOKEN_GITHUB}@github.com/${GITHUB_IO_REPO} -b ${GITHUB_IO_BRANCH} . -git config user.email "github-actions[bot]@users.noreply.github.com" -git config user.name "github-actions[bot]" - mkdir -p utPLSQL cd ./utPLSQL #clear out develop documentation directory and copy docs contents to it. diff --git a/.travis/run_sonar_scanner.sh b/.travis/run_sonar_scanner.sh deleted file mode 100755 index f0a2805c1..000000000 --- a/.travis/run_sonar_scanner.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!/usr/bin/env bash - -#Run Sonar based on conditions - -MAIN_DEV_BRANCH="develop" - -BRANCH_SONAR_PROPERTY="sonar.branch.name" -BRANCH_SONAR_TARGET_PROPERTY="sonar.branch.target" - -PR_SONAR_BRANCH_PROPERTY="sonar.pullrequest.branch" -PR_KEY_PROPERTY="sonar.pullrequest.key" -PR_SONAR_BASE_PROPERTY="sonar.pullrequest.base" -PR_SONAR_TOKEN_PROPERTY="sonar.pullrequest.github.token.secured" - -DB_URL_SONAR_PROPERTY="sonar.plsql.jdbc.url" -DB_DRIVER_PATH="sonar.plsql.jdbc.driver.path" - -#Add property to file -function add_sonar_property { - echo "$1=$2" >> sonar-project.properties -} - - -if [ "${PULL_REQUEST_NAME}" == "false" ]; then - BRANCH=${BRANCH_NAME}; - PR_BRANCH="" - echo "BRANCH=$BRANCH" -else - BRANCH=${PULL_REQUEST_BRANCH} - PR_BRANCH=${BRANCH_NAME} - echo "TRAVIS_BRANCH=$TRAVIS_BRANCH, PR=${PULL_REQUEST_NAME}, BRANCH=$BRANCH" - -fi - - -#Are we running on utPLSQL repo and not an external PR? -echo "Check if we running from develop or on branch" -if [ "${REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [[ ! "${BRANCH}" =~ ^(release/v[0-9]+\.[0-9]+\.[0-9]+.*|"${MAIN_DEV_BRANCH}")$ ]]; then - - echo "" >> sonar-project.properties - if [ "${PULL_REQUEST_NAME}" == "false" ]; then - echo "Updating sonar properties to include branch ${BRANCH}" - add_sonar_property "${BRANCH_SONAR_PROPERTY}" "${BRANCH}" - add_sonar_property "${BRANCH_SONAR_TARGET_PROPERTY}" "${MAIN_DEV_BRANCH}" - elif [ "${PR_SLUG}" = "${REPO_SLUG}" ]; then - echo "Updating sonar properties to include pull request ${BRANCH}" - add_sonar_property "${PR_SONAR_TOKEN_PROPERTY}" "${GITHUB_TRAVISCI_TOKEN}" - add_sonar_property "${PR_SONAR_BRANCH_PROPERTY}" "${BRANCH}" - add_sonar_property "${PR_KEY_PROPERTY}" "${PR}" - add_sonar_property "${PR_SONAR_BASE_PROPERTY}" "${PR_BRANCH}" - else - echo "PR from external source no changes to properties." - fi -else - echo "No need to update sonar we building on release or develop" -fi - -#Address issue : Could not find ref 'develop' in refs/heads or refs/remotes/origin -git fetch --no-tags https://github.com/utPLSQL/utPLSQL.git +refs/heads/develop:refs/remotes/origin/develop - -echo "Adding OJDBC Driver Path ${OJDBC_HOME}/ojdbc8.jar" -add_sonar_property "${DB_URL_SONAR_PROPERTY}" "jdbc:oracle:thin:@${CONNECTION_STR}" -add_sonar_property "${DB_DRIVER_PATH}" "${OJDBC_HOME}/ojdbc8.jar" - - -#Execute Sonar scanner -echo "Executing sonar scanner" -sonar-scanner diff --git a/.travis/start_db.sh b/.travis/start_db.sh deleted file mode 100755 index 285f8172f..000000000 --- a/.travis/start_db.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -set -e - -# Private Repo Login -if [ ! -f $CACHE_DIR/.docker/config.json ]; then - docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD" - mkdir -p $CACHE_DIR/.docker && cp $HOME/.docker/config.json $CACHE_DIR/.docker/ -else - echo "Using docker login from cache..." - mkdir -p $HOME/.docker && cp $CACHE_DIR/.docker/config.json $HOME/.docker/ -fi - -time docker pull $DOCKHER_HUB_REPO:$ORACLE_VERSION -docker run -d --name $ORACLE_VERSION --mount type=bind,source=${BUILD_DIR},target=${DOCKER_VOLUME} $DOCKER_OPTIONS $DOCKER_ENV -p 1521:1521 $DOCKHER_HUB_REPO:$ORACLE_VERSION -time docker logs -f $ORACLE_VERSION | grep -m 1 "DATABASE IS READY TO USE!" --line-buffered From 12757eaa7eeeb728950f742226956b253c50a716 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 7 Jan 2022 03:19:24 +0200 Subject: [PATCH 0802/1096] Added job names. Added id for matrix jobs. Adding slack notification. Adding semaphore to prevent concurrency when publishing documentation. --- .github/workflows/build.yml | 64 ++++++++++++++++++--- .github/workflows/release_documentation.yml | 1 + 2 files changed, 57 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e509ffe98..16a5d7094 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Build and test +name: Build, test, deploy documentation env: BUILD_DIR: ${{github.workspace}} JOB_NUMBER: ${{github.run_number}} @@ -11,13 +11,16 @@ on: workflow_dispatch: +concurrency: ${{github.ref}} + defaults: run: shell: bash jobs: - build: + build-and-test: + name: Build and test on ${{matrix.db_version_name}} DB env: ORACLE_VERSION: ${{matrix.oracle-version}} CONNECTION_STR: ${{matrix.connection-str}} @@ -31,19 +34,33 @@ jobs: include: - oracle-version: "gvenzl/oracle-xe:11-full" connection-str: '127.0.0.1:1521/XE' + id: 1 + db_version_name: '11xe' # TODO - need to add healthcheck.sh into our containers # - oracle-version: "utplsqlv3/oracledb:12c-r1-se2-small" # connection-str: '127.0.0.1:1521/ORCLCDB' +# id: 2 +# db_version_name: '12.1se' # - oracle-version: "utplsqlv3/oracledb:12c-r2-se2-small" # connection-str: '127.0.0.1:1521/ORCLCDB' +# id: 3 +# db_version_name: '12.2se' - oracle-version: "gvenzl/oracle-xe:18-slim" connection-str: '127.0.0.1:1521/XE' + id: 4 + db_version_name: '18xe' # - oracle-version: "utplsqlv3/oracledb:18c-se2-small" # connection-str: '127.0.0.1:1521/ORCLCDB' +# id: 5 +# db_version_name: '18se' # - oracle-version: "utplsqlv3/oracledb:19c-se2-small" # connection-str: '127.0.0.1:1521/ORCLCDB' +# id: 6 +# db_version_name: '19se' - oracle-version: "gvenzl/oracle-xe:21-slim" connection-str: '127.0.0.1:1521/XE' + id: 7 + db_version_name: '21xe' services: oracle: @@ -71,50 +88,63 @@ jobs: env-file: .github/variables/.env - - name: Set buid version number env variables + - name: Set build version number env variables + id: set-build-version-number-vars run: .github/scripts/set_version_numbers_env.sh - name: Update project version & build number to verify that code is deployable after the update + id: update-project-version run: .travis/update_project_version.sh - name: Download latest utPLSQL release run: git clone --depth=1 --branch=main https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR + - name: Update privileges on sources + run: chmod -R go+w ./{source,test,examples,${UTPLSQL_DIR}/source} + - name: Add OJDBC home + id: get-ojdbc run: mkdir -p ${OJDBC_HOME} && curl -Lk -o ${OJDBC_HOME}/ojdbc8.jar ${OJDBC_URL}/ojdbc8.jar && curl -Lk -o ${OJDBC_HOME}/orai18n.jar ${OJDBC_URL}/orai18n.jar - name: Install utPLSQL-cli + id: install-utplsql-cli run: curl -Lk -o utPLSQL-cli.zip "https://github.com/utPLSQL/utPLSQL-cli/releases/download/v3.1.8/utPLSQL-cli.zip" && unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli - - name: Update privileges on sources - run: chmod -R go+w ./{source,test,examples,${UTPLSQL_DIR}/source} - - name: Install utPLSQL + id: install-utplsql run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .travis/install.sh - name: Install utPLSQL release + id: install-utplsql-release run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} ./.travis/install_utplsql_release.sh - name: Run Examples + id: run-examples run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} ./.travis/run_examples.sh - name: Install tests + id: install-tests run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} ./test/install_tests.sh - name: Run Tests + id: run-tests run: bash test/run_tests.sh - name: Validate utPLSQL reports format + id: validate-reports-format run: bash .travis/validate_report_files.sh - name: SonarCloud Scan + id: sonar uses: SonarSource/sonarcloud-github-action@master env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} publish: - needs: build + name: Deploy documentation + needs: [build-and-test] + concurrency: publish runs-on: ubuntu-latest if: | ${{ github.repository == 'utPLSQL/utPLSQL' && github.base_ref == null @@ -132,17 +162,35 @@ jobs: env-file: .github/variables/.env - name: Set buid version number env variables + id: set-build-version-number-vars run: .github/scripts/set_version_numbers_env.sh - name: Update project version & build number in source code and documentation + id: update-project-version run: .travis/update_project_version.sh - name: Push version update to repository + id: push-version-number-update run: .travis/push_project_version.sh - name: Copy and push documentation to utPLSQL-github-io repo + id: push-documentation env: API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }} run: .travis/push_docs_to_github_io.sh -# TODO - add slack notifications + slack-workflow-status: + if: always() + name: Post Workflow Status To Slack + needs: [build-and-test, publish] + runs-on: ubuntu-latest + steps: + - name: Slack Workflow Notification + uses: Gamesight/slack-workflow-status@master + with: + # Required Input + repo_token: ${{secrets.GITHUB_TOKEN}} + slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}} + # Optional Input + name: 'Github Actions[bot]' + icon_url: 'https://octodex.github.com/images/mona-the-rivetertocat.png' diff --git a/.github/workflows/release_documentation.yml b/.github/workflows/release_documentation.yml index 8d07e53d8..fbf31a718 100644 --- a/.github/workflows/release_documentation.yml +++ b/.github/workflows/release_documentation.yml @@ -19,6 +19,7 @@ defaults: jobs: publish: + concurrency: publish runs-on: ubuntu-latest steps: From ddd3862927f54b5e2d6e5d802eda7618a692cb12 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 7 Jan 2022 10:56:23 +0200 Subject: [PATCH 0803/1096] Fixing multi-line if statement. Refactoring. --- .github/scripts/set_version_numbers_env.sh | 4 +- .github/workflows/build.yml | 59 +++++++++++++++------ .github/workflows/release_documentation.yml | 28 +++++++--- .travis/get_project_version.sh | 6 +-- .travis/install.sh | 3 +- .travis/push_docs_to_github_io.sh | 4 +- .travis/update_project_version.sh | 2 +- .travis/validate_report_files.sh | 4 +- 8 files changed, 73 insertions(+), 37 deletions(-) diff --git a/.github/scripts/set_version_numbers_env.sh b/.github/scripts/set_version_numbers_env.sh index 8f463c49b..ea019ea07 100755 --- a/.github/scripts/set_version_numbers_env.sh +++ b/.github/scripts/set_version_numbers_env.sh @@ -1,10 +1,10 @@ #!/bin/bash -UTPLSQL_BUILD_NO=$( expr ${JOB_NUMBER} + ${UTPLSQL_BUILD_NO_OFFSET} ) +UTPLSQL_BUILD_NO=$( expr ${GITHUB_RUN_NUMBER} + ${UTPLSQL_BUILD_NO_OFFSET} ) UTPLSQL_VERSION=$(.travis/get_project_version.sh) echo "UTPLSQL_BUILD_NO=${UTPLSQL_BUILD_NO}" >> $GITHUB_ENV echo "UTPLSQL_VERSION=${UTPLSQL_VERSION}" >> $GITHUB_ENV echo UTPLSQL_BUILD_VERSION=$(echo ${UTPLSQL_VERSION} | sed -E "s/(v?[0-9]+\.)([0-9]+\.)([0-9]+)(-.*)?/\1\2\3\.${UTPLSQL_BUILD_NO}\4/") >> $GITHUB_ENV -echo "CURRENT_BRANCH=${BRANCH_NAME}" >> $GITHUB_ENV +echo "CURRENT_BRANCH=${CI_ACTION_REF_NAME}" >> $GITHUB_ENV diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 16a5d7094..d09dbb8d4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,4 @@ name: Build, test, deploy documentation -env: - BUILD_DIR: ${{github.workspace}} - JOB_NUMBER: ${{github.run_number}} on: push: @@ -12,7 +9,6 @@ on: workflow_dispatch: concurrency: ${{github.ref}} - defaults: run: shell: bash @@ -21,13 +17,12 @@ jobs: build-and-test: name: Build and test on ${{matrix.db_version_name}} DB + runs-on: ubuntu-latest env: ORACLE_VERSION: ${{matrix.oracle-version}} CONNECTION_STR: ${{matrix.connection-str}} ORACLE_PASSWORD: oracle DOCKER_VOLUME: ${{matrix.docker-volume}} - - runs-on: ubuntu-latest strategy: fail-fast: false matrix: @@ -67,9 +62,10 @@ jobs: image: ${{matrix.oracle-version}} env: ORACLE_PASSWORD: oracle -# credentials: -# username: ${{ secrets.DOCKER_USER }} -# password: ${{ secrets.DOCKER_PASSWORD }} + MATRIX_JOB_ID: ${{matrix.id}} + credentials: + username: ${{ secrets.DOCKER_USER }} + password: ${{ secrets.DOCKER_PASSWORD }} ports: - 1521:1521 options: >- @@ -82,11 +78,37 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 - - uses: nelonoel/branch-name@v1.0.1 - uses: c-py/action-dotenv-to-setenv@v2 with: env-file: .github/variables/.env - + - uses: FranzDiebold/github-env-vars-action@v2 #https://github.com/marketplace/actions/github-environment-variables-action + + - name: Print environment variables + run: | + echo "CI_REPOSITORY_SLUG=$CI_REPOSITORY_SLUG" + echo "CI_REPOSITORY_OWNER=$CI_REPOSITORY_OWNER" + echo "CI_REPOSITORY_OWNER_SLUG=$CI_REPOSITORY_OWNER_SLUG" + echo "CI_REPOSITORY_NAME=$CI_REPOSITORY_NAME" + echo "CI_REPOSITORY_NAME_SLUG=$CI_REPOSITORY_NAME_SLUG" + echo "CI_REPOSITORY=$CI_REPOSITORY" + echo "CI_REF_SLUG=$CI_REF_SLUG" + echo "CI_ACTION_REF_NAME=$CI_ACTION_REF_NAME" + echo "CI_ACTION_REF_NAME_SLUG=$CI_ACTION_REF_NAME_SLUG" + echo "CI_REF_NAME=$CI_REF_NAME" + echo "CI_REF_NAME_SLUG=$CI_REF_NAME_SLUG" + echo "CI_REF=$CI_REF" + echo "CI_HEAD_REF_SLUG=$CI_HEAD_REF_SLUG" + echo "CI_HEAD_REF=$CI_HEAD_REF" + echo "CI_BASE_REF_SLUG=$CI_BASE_REF_SLUG" + echo "CI_BASE_REF=$CI_BASE_REF" + echo "CI_SHA_SHORT=$CI_SHA_SHORT" + echo "CI_SHA=$CI_SHA" + echo "CI_ACTOR=$CI_ACTOR" + echo "CI_EVENT_NAME=$CI_EVENT_NAME" + echo "CI_RUN_ID=$CI_RUN_ID" + echo "CI_RUN_NUMBER=$CI_RUN_NUMBER" + echo "CI_WORKFLOW=$CI_WORKFLOW" + echo "CI_ACTION=$CI_ACTION" - name: Set build version number env variables id: set-build-version-number-vars @@ -147,19 +169,19 @@ jobs: concurrency: publish runs-on: ubuntu-latest if: | - ${{ github.repository == 'utPLSQL/utPLSQL' && github.base_ref == null - && ( startsWith( github.ref, 'refs/heads/release/v' ) || github.ref == 'refs/heads/develop' ) - }} + github.repository == 'utPLSQL/utPLSQL' && + github.base_ref == null && + ( startsWith( github.ref, 'refs/heads/release/v' ) || + github.ref == 'refs/heads/develop' ) steps: - uses: actions/checkout@v2 with: fetch-depth: 0 - #Populates the value of BRANCH_NAME env variable - - uses: nelonoel/branch-name@v1.0.1 - uses: c-py/action-dotenv-to-setenv@v2 with: env-file: .github/variables/.env + - uses: FranzDiebold/github-env-vars-action@v2 #https://github.com/marketplace/actions/github-environment-variables-action - name: Set buid version number env variables id: set-build-version-number-vars @@ -171,7 +193,10 @@ jobs: - name: Push version update to repository id: push-version-number-update - run: .travis/push_project_version.sh + run: | + git add sonar-project.properties VERSION source/* docs/* + git commit -m 'Updated project version after build [skip ci]' + git push --quiet origin HEAD:${CI_ACTION_REF_NAME} - name: Copy and push documentation to utPLSQL-github-io repo id: push-documentation diff --git a/.github/workflows/release_documentation.yml b/.github/workflows/release_documentation.yml index fbf31a718..16412aa8f 100644 --- a/.github/workflows/release_documentation.yml +++ b/.github/workflows/release_documentation.yml @@ -1,7 +1,5 @@ name: Create and publish release artifacts env: - BUILD_DIR: ${{github.workspace}} - JOB_NUMBER: ${{github.run_number}} PULL_REQUEST_NAME: ${{github.head_ref}} PULL_REQUEST_BRANCH: ${{github.head_ref}} REPO_SLUG: ${{github.repository}} @@ -26,8 +24,10 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 - - - uses: nelonoel/branch-name@v1.0.1 + - uses: c-py/action-dotenv-to-setenv@v2 + with: + env-file: .github/variables/.env + - uses: FranzDiebold/github-env-vars-action@v2 #https://github.com/marketplace/actions/github-environment-variables-action - name: Set buid version number env variables run: .github/scripts/set_version_numbers_env.sh @@ -43,15 +43,27 @@ jobs: - name: Update project version & build number in source code and documentation run: .travis/update_project_version.sh - - name: Push version update to repository - run: .travis/push_project_version.sh - - name: Copy and push documentation to utPLSQL-github-io repo env: API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }} run: .travis/push_docs_to_github_io.sh -# TODO - add slack notifications + slack-workflow-status: + if: always() + name: Post Workflow Status To Slack + needs: [publish] + runs-on: ubuntu-latest + steps: + - name: Slack Workflow Notification + uses: Gamesight/slack-workflow-status@master + with: + # Required Input + repo_token: ${{secrets.GITHUB_TOKEN}} + slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}} + # Optional Input + name: 'Github Actions[bot]' + icon_url: 'https://octodex.github.com/images/mona-the-rivetertocat.png' + # TODO - add building of release archive # TODO - add publishing of release diff --git a/.travis/get_project_version.sh b/.travis/get_project_version.sh index 20a658ed9..60fc0a796 100755 --- a/.travis/get_project_version.sh +++ b/.travis/get_project_version.sh @@ -1,13 +1,13 @@ #!/usr/bin/env bash #When building a new version from a release branch, the version is taken from release branch name -if [[ "${CURRENT_BRANCH}" =~ ^release/v[0-9]+\.[0-9]+\.[0-9]+.*$ ]]; then - version=${CURRENT_BRANCH#release\/} +if [[ "${CI_ACTION_REF_NAME}" =~ ^release/v[0-9]+\.[0-9]+\.[0-9]+.*$ ]]; then + version=${CI_ACTION_REF_NAME#release\/} else #Otherwise, version is taken from the VERSION file version=`cat VERSION` #When on develop branch, add "-develop" to the version text - if [[ "${CURRENT_BRANCH}" == "develop" ]]; then + if [[ "${CI_ACTION_REF_NAME}" == "develop" ]]; then version=`sed -E "s/(v?[0-9]+\.[0-9]+\.[0-9]+).*/\1-develop/" <<< "${version}"` fi fi diff --git a/.travis/install.sh b/.travis/install.sh index 603cb7d1e..4db64ccdb 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -20,8 +20,7 @@ alter session set plsql_optimize_level=0; @${INSTALL_FILE} $UT3_DEVELOP_SCHEMA $UT3_DEVELOP_SCHEMA_PASSWORD SQL -#Run this step only on second child job (12.1 - at it's fastest) -if [[ "${JOB_NUMBER}" =~ \.2$ ]]; then +if [[ "${MATRIX_JOB_ID}" == 1 ]]; then #check code-style for errors time "$SQLCLI" $UT3_DEVELOP_SCHEMA/$UT3_DEVELOP_SCHEMA_PASSWORD@//$CONNECTION_STR @../development/utplsql_style_check.sql diff --git a/.travis/push_docs_to_github_io.sh b/.travis/push_docs_to_github_io.sh index 689cb99c9..83babbae7 100755 --- a/.travis/push_docs_to_github_io.sh +++ b/.travis/push_docs_to_github_io.sh @@ -78,9 +78,9 @@ if [ ! -f index.md ]; then fi #If build running on a TAG - it's a new release - need to add it to documentation if [ "${GITHUB_REF_TYPE}" == "tag" ]; then - sed -i '7s@.*@'" - [Latest ${CURRENT_BRANCH} documentation](latest/) - Created $now"'@' index.md + sed -i '7s@.*@'" - [Latest ${CI_ACTION_REF_NAME} documentation](latest/) - Created $now"'@' index.md #add entry to the top of version history (line end of file - ## Released Version Doc History - sed -i '12i'" - [${CURRENT_BRANCH} documentation](${UTPLSQL_VERSION}/) - Created $now" index.md + sed -i '12i'" - [${CI_ACTION_REF_NAME} documentation](${UTPLSQL_VERSION}/) - Created $now" index.md fi #replace 4th line in log sed -i '8s@.*@'" - [Latest development version](develop/) - Created $now"'@' index.md diff --git a/.travis/update_project_version.sh b/.travis/update_project_version.sh index bb6f72f00..586cb5b64 100755 --- a/.travis/update_project_version.sh +++ b/.travis/update_project_version.sh @@ -2,7 +2,7 @@ UTPLSQL_VERSION_PATTERN="v?([0-9]+\.){3}[0-9]+[^']*" -echo Current branch is "${CURRENT_BRANCH}" +echo Current branch is "${CI_ACTION_REF_NAME}" echo Update version in project source files find source -type f -name '*' -exec sed -i -r "s/${UTPLSQL_VERSION_PATTERN}/${UTPLSQL_BUILD_VERSION}/" {} \; diff --git a/.travis/validate_report_files.sh b/.travis/validate_report_files.sh index 7c7d1354d..e9479a42e 100755 --- a/.travis/validate_report_files.sh +++ b/.travis/validate_report_files.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash GL_VALID=1 -XSD_DIR="$BUILD_DIR/.travis/xsd" -XML_JAR_DIR="$BUILD_DIR/.travis/lib" +XSD_DIR=".travis/xsd" +XML_JAR_DIR=".travis/lib" #XML Validator XML_VALIDATOR="$XML_JAR_DIR/xml_validator.jar" HTML_VALIDATOR_URL="https://validator.w3.org/nu/" From 5b64836a255df7f69846ee7224db7ad1ded6e6e8 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 8 Jan 2022 01:17:09 +0200 Subject: [PATCH 0804/1096] Implementing Release Action --- .github/workflows/build.yml | 5 +- ...{release_documentation.yml => release.yml} | 57 ++++++++++++++----- .travis/build_docs.sh | 6 -- .travis/build_release_archive.sh | 18 ------ 4 files changed, 47 insertions(+), 39 deletions(-) rename .github/workflows/{release_documentation.yml => release.yml} (55%) delete mode 100755 .travis/build_docs.sh delete mode 100755 .travis/build_release_archive.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d09dbb8d4..55df103ce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -165,7 +165,7 @@ jobs: publish: name: Deploy documentation - needs: [build-and-test] + needs: [ build-and-test ] concurrency: publish runs-on: ubuntu-latest if: | @@ -207,7 +207,7 @@ jobs: slack-workflow-status: if: always() name: Post Workflow Status To Slack - needs: [build-and-test, publish] + needs: [ build-and-test, publish ] runs-on: ubuntu-latest steps: - name: Slack Workflow Notification @@ -219,3 +219,4 @@ jobs: # Optional Input name: 'Github Actions[bot]' icon_url: 'https://octodex.github.com/images/mona-the-rivetertocat.png' +#TODO - add triggering of builds on other repositories \ No newline at end of file diff --git a/.github/workflows/release_documentation.yml b/.github/workflows/release.yml similarity index 55% rename from .github/workflows/release_documentation.yml rename to .github/workflows/release.yml index 16412aa8f..eb8bf34b5 100644 --- a/.github/workflows/release_documentation.yml +++ b/.github/workflows/release.yml @@ -1,13 +1,7 @@ name: Create and publish release artifacts -env: - PULL_REQUEST_NAME: ${{github.head_ref}} - PULL_REQUEST_BRANCH: ${{github.head_ref}} - REPO_SLUG: ${{github.repository}} - PR_SLUG: ${{github.repository}} - on: release: - types: [ created ] + types: [ released ] #See: https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions#example-using-multiple-events-with-activity-types-or-configuration defaults: @@ -17,6 +11,7 @@ defaults: jobs: publish: + name: Deploy documentation concurrency: publish runs-on: ubuntu-latest @@ -37,9 +32,6 @@ jobs: git config --global user.email "github-actions[bot]@users.noreply.github.com" git config --global user.name "github-actions[bot]" - - name: Install MkDocs - run: pip install mkdocs - - name: Update project version & build number in source code and documentation run: .travis/update_project_version.sh @@ -48,11 +40,52 @@ jobs: API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }} run: .travis/push_docs_to_github_io.sh + upload_artifacts: + name: Upload archives + concurrency: upload + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Update project version & build number in source code and documentation + run: .travis/update_project_version.sh + + - name: Setup git config + run: | + git config --global user.email "github-actions[bot]@users.noreply.github.com" + git config --global user.name "github-actions[bot]" + + - name: Build html documentation + run: | + pip install mkdocs + mkdocs build --clean --strict + rm -rf docs/* + cp -r -v site/* docs + git add . + git commit -m "tmp commit of HTML documentation for building a release archive" + + - name: Build release archives + run: | + git archive --prefix=utPLSQL/ -o utPLSQL.zip --format=zip HEAD + git archive --prefix=utPLSQL/ -o utPLSQL.tar.gz --format=tar.gz HEAD + md5sum utPLSQL.zip --tag > utPLSQL.zip.md5 + md5sum utPLSQL.tar.gz --tag > utPLSQL.tar.gz.md5 + + - name: Release + uses: softprops/action-gh-release@v1 + with: + files: | + utPLSQL.zip + utPLSQL.zip.md5 + utPLSQL.tar.gz + utPLSQL.tar.gz.md5 slack-workflow-status: if: always() name: Post Workflow Status To Slack - needs: [publish] + needs: [ publish, upload_artifacts ] runs-on: ubuntu-latest steps: - name: Slack Workflow Notification @@ -65,5 +98,3 @@ jobs: name: 'Github Actions[bot]' icon_url: 'https://octodex.github.com/images/mona-the-rivetertocat.png' -# TODO - add building of release archive -# TODO - add publishing of release diff --git a/.travis/build_docs.sh b/.travis/build_docs.sh deleted file mode 100755 index db43d7ca9..000000000 --- a/.travis/build_docs.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -# Change working directory to script directory -cd "${0%/*}" -# Change back to root -cd .. -mkdocs build --clean --strict diff --git a/.travis/build_release_archive.sh b/.travis/build_release_archive.sh deleted file mode 100755 index 9667cba7e..000000000 --- a/.travis/build_release_archive.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -# remove markdown documentation -rm -rf docs/* -# and replace it with generated html documentation from the ignored site folder -cp -r -v site/* docs - -git add . -git commit -m "tmp commit for building a release archive" - -# git archive --prefix="utPLSQL${UTPLSQL_BUILD_VERSION}"/ -o "utPLSQL${UTPLSQL_BUILD_VERSION}".zip --format=zip HEAD -# git archive --prefix="utPLSQL${UTPLSQL_BUILD_VERSION}"/ -o "utPLSQL${UTPLSQL_BUILD_VERSION}".tar.gz --format=tar.gz HEAD - -git archive --prefix=utPLSQL/ -o utPLSQL.zip --format=zip HEAD -git archive --prefix=utPLSQL/ -o utPLSQL.tar.gz --format=tar.gz HEAD -md5sum utPLSQL.zip --tag > utPLSQL.zip.md5 -md5sum utPLSQL.tar.gz --tag > utPLSQL.tar.gz.md5 - From 28cdee35174e069113e3e22048fe53a52501a496 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 9 Jan 2022 01:20:28 +0200 Subject: [PATCH 0805/1096] Refactoring and adding dispatch of other repositories --- .gitattributes | 1 + .../scripts}/get_project_build_version.sh | 0 .../scripts}/get_project_version.sh | 0 {.travis => .github/scripts}/install.sh | 2 +- .../scripts}/install_utplsql_release.sh | 2 +- .../scripts}/lib/xml_validator.jar | Bin .../scripts}/push_docs_to_github_io.sh | 12 +-- .../scripts}/push_project_version.sh | 0 {.travis => .github/scripts}/run_examples.sh | 2 +- .github/scripts/set_version_numbers_env.sh | 2 +- .../scripts}/update_project_version.sh | 0 .../scripts}/validate_report_files.sh | 6 +- {.travis => .github/scripts}/xsd/junit4.xsd | 0 .../scripts}/xsd/junit_windy.xsd | 0 .github/workflows/build.yml | 93 ++++++++---------- .github/workflows/release.yml | 6 +- development/install.sh | 4 +- readme.md | 1 + 18 files changed, 64 insertions(+), 67 deletions(-) rename {.travis => .github/scripts}/get_project_build_version.sh (100%) rename {.travis => .github/scripts}/get_project_version.sh (100%) rename {.travis => .github/scripts}/install.sh (99%) rename {.travis => .github/scripts}/install_utplsql_release.sh (97%) rename {.travis => .github/scripts}/lib/xml_validator.jar (100%) rename {.travis => .github/scripts}/push_docs_to_github_io.sh (92%) rename {.travis => .github/scripts}/push_project_version.sh (100%) rename {.travis => .github/scripts}/run_examples.sh (87%) rename {.travis => .github/scripts}/update_project_version.sh (100%) rename {.travis => .github/scripts}/validate_report_files.sh (93%) rename {.travis => .github/scripts}/xsd/junit4.xsd (100%) rename {.travis => .github/scripts}/xsd/junit_windy.xsd (100%) diff --git a/.gitattributes b/.gitattributes index 9cf0f2457..abd1d5471 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,6 +4,7 @@ .travis.yml export-ignore mkdocs.yml export-ignore .travis export-ignore +.github export-ignore sonar-project.properties export-ignore tests export-ignore development export-ignore diff --git a/.travis/get_project_build_version.sh b/.github/scripts/get_project_build_version.sh similarity index 100% rename from .travis/get_project_build_version.sh rename to .github/scripts/get_project_build_version.sh diff --git a/.travis/get_project_version.sh b/.github/scripts/get_project_version.sh similarity index 100% rename from .travis/get_project_version.sh rename to .github/scripts/get_project_version.sh diff --git a/.travis/install.sh b/.github/scripts/install.sh similarity index 99% rename from .travis/install.sh rename to .github/scripts/install.sh index 4db64ccdb..095d33810 100755 --- a/.travis/install.sh +++ b/.github/scripts/install.sh @@ -2,7 +2,7 @@ set -ev SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" -cd ${SCRIPT_DIR}/../source +cd ${SCRIPT_DIR}/../../source INSTALL_FILE="install_headless_with_trigger.sql" if [[ ! -f "${INSTALL_FILE}" ]]; then diff --git a/.travis/install_utplsql_release.sh b/.github/scripts/install_utplsql_release.sh similarity index 97% rename from .travis/install_utplsql_release.sh rename to .github/scripts/install_utplsql_release.sh index fea162f8f..e50718c7b 100755 --- a/.travis/install_utplsql_release.sh +++ b/.github/scripts/install_utplsql_release.sh @@ -2,7 +2,7 @@ set -ev SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" -cd ${SCRIPT_DIR}/../${UTPLSQL_DIR}/source +cd ${SCRIPT_DIR}/../../${UTPLSQL_DIR}/source "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <>index.md echo "layout: default" >>index.md echo "---" >>index.md - echo "" >>index.md + echo "" >>index.md echo "# Documentation versions" >>index.md echo "" >>index.md echo "" >>index.md #- 7th line - placeholder for latest release doc diff --git a/.travis/push_project_version.sh b/.github/scripts/push_project_version.sh similarity index 100% rename from .travis/push_project_version.sh rename to .github/scripts/push_project_version.sh diff --git a/.travis/run_examples.sh b/.github/scripts/run_examples.sh similarity index 87% rename from .travis/run_examples.sh rename to .github/scripts/run_examples.sh index 8eb3d097f..bfa4f7e1a 100755 --- a/.travis/run_examples.sh +++ b/.github/scripts/run_examples.sh @@ -2,7 +2,7 @@ set -ev SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" -cd ${SCRIPT_DIR}/../examples +cd ${SCRIPT_DIR}/../../examples "$SQLCLI" $UT3_DEVELOP_SCHEMA/$UT3_DEVELOP_SCHEMA_PASSWORD@//$CONNECTION_STR <> $GITHUB_ENV echo "UTPLSQL_VERSION=${UTPLSQL_VERSION}" >> $GITHUB_ENV diff --git a/.travis/update_project_version.sh b/.github/scripts/update_project_version.sh similarity index 100% rename from .travis/update_project_version.sh rename to .github/scripts/update_project_version.sh diff --git a/.travis/validate_report_files.sh b/.github/scripts/validate_report_files.sh similarity index 93% rename from .travis/validate_report_files.sh rename to .github/scripts/validate_report_files.sh index e9479a42e..59376a174 100755 --- a/.travis/validate_report_files.sh +++ b/.github/scripts/validate_report_files.sh @@ -1,8 +1,10 @@ #!/usr/bin/env bash +SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" + GL_VALID=1 -XSD_DIR=".travis/xsd" -XML_JAR_DIR=".travis/lib" +XSD_DIR="${SCRIPT_DIR}/xsd" +XML_JAR_DIR="${SCRIPT_DIR}/lib" #XML Validator XML_VALIDATOR="$XML_JAR_DIR/xml_validator.jar" HTML_VALIDATOR_URL="https://validator.w3.org/nu/" diff --git a/.travis/xsd/junit4.xsd b/.github/scripts/xsd/junit4.xsd similarity index 100% rename from .travis/xsd/junit4.xsd rename to .github/scripts/xsd/junit4.xsd diff --git a/.travis/xsd/junit_windy.xsd b/.github/scripts/xsd/junit_windy.xsd similarity index 100% rename from .travis/xsd/junit_windy.xsd rename to .github/scripts/xsd/junit_windy.xsd diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 55df103ce..c05b81977 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,8 +1,7 @@ name: Build, test, deploy documentation - on: push: - branches: [ develop, feature/github_actions ] + branches-ignore: [ main ] pull_request: branches: [ develop ] @@ -15,7 +14,7 @@ defaults: jobs: - build-and-test: + build: name: Build and test on ${{matrix.db_version_name}} DB runs-on: ubuntu-latest env: @@ -83,43 +82,17 @@ jobs: env-file: .github/variables/.env - uses: FranzDiebold/github-env-vars-action@v2 #https://github.com/marketplace/actions/github-environment-variables-action - - name: Print environment variables - run: | - echo "CI_REPOSITORY_SLUG=$CI_REPOSITORY_SLUG" - echo "CI_REPOSITORY_OWNER=$CI_REPOSITORY_OWNER" - echo "CI_REPOSITORY_OWNER_SLUG=$CI_REPOSITORY_OWNER_SLUG" - echo "CI_REPOSITORY_NAME=$CI_REPOSITORY_NAME" - echo "CI_REPOSITORY_NAME_SLUG=$CI_REPOSITORY_NAME_SLUG" - echo "CI_REPOSITORY=$CI_REPOSITORY" - echo "CI_REF_SLUG=$CI_REF_SLUG" - echo "CI_ACTION_REF_NAME=$CI_ACTION_REF_NAME" - echo "CI_ACTION_REF_NAME_SLUG=$CI_ACTION_REF_NAME_SLUG" - echo "CI_REF_NAME=$CI_REF_NAME" - echo "CI_REF_NAME_SLUG=$CI_REF_NAME_SLUG" - echo "CI_REF=$CI_REF" - echo "CI_HEAD_REF_SLUG=$CI_HEAD_REF_SLUG" - echo "CI_HEAD_REF=$CI_HEAD_REF" - echo "CI_BASE_REF_SLUG=$CI_BASE_REF_SLUG" - echo "CI_BASE_REF=$CI_BASE_REF" - echo "CI_SHA_SHORT=$CI_SHA_SHORT" - echo "CI_SHA=$CI_SHA" - echo "CI_ACTOR=$CI_ACTOR" - echo "CI_EVENT_NAME=$CI_EVENT_NAME" - echo "CI_RUN_ID=$CI_RUN_ID" - echo "CI_RUN_NUMBER=$CI_RUN_NUMBER" - echo "CI_WORKFLOW=$CI_WORKFLOW" - echo "CI_ACTION=$CI_ACTION" - - name: Set build version number env variables id: set-build-version-number-vars run: .github/scripts/set_version_numbers_env.sh - name: Update project version & build number to verify that code is deployable after the update id: update-project-version - run: .travis/update_project_version.sh + run: .github/scripts/update_project_version.sh - - name: Download latest utPLSQL release - run: git clone --depth=1 --branch=main https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR + - name: Download utPLSQL release for testing +# For PR build - test using target branch as framework, for branch build use self as testing framework + run: git clone --depth=1 --branch=${CI_HEAD_REF:-$CI_REF_NAME} https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR - name: Update privileges on sources run: chmod -R go+w ./{source,test,examples,${UTPLSQL_DIR}/source} @@ -134,19 +107,19 @@ jobs: - name: Install utPLSQL id: install-utplsql - run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .travis/install.sh + run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .github/scripts/install.sh - name: Install utPLSQL release id: install-utplsql-release - run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} ./.travis/install_utplsql_release.sh + run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .github/scripts/install_utplsql_release.sh - name: Run Examples id: run-examples - run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} ./.travis/run_examples.sh + run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .github/scripts/run_examples.sh - name: Install tests id: install-tests - run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} ./test/install_tests.sh + run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} test/install_tests.sh - name: Run Tests id: run-tests @@ -154,7 +127,7 @@ jobs: - name: Validate utPLSQL reports format id: validate-reports-format - run: bash .travis/validate_report_files.sh + run: bash .github/scripts/validate_report_files.sh - name: SonarCloud Scan id: sonar @@ -165,15 +138,16 @@ jobs: publish: name: Deploy documentation - needs: [ build-and-test ] + needs: [ build ] concurrency: publish runs-on: ubuntu-latest if: | github.repository == 'utPLSQL/utPLSQL' && github.base_ref == null && - ( startsWith( github.ref, 'refs/heads/release/v' ) || - github.ref == 'refs/heads/develop' ) - + ( startsWith( github.ref, 'refs/heads/release/v' ) + || github.ref == 'refs/heads/develop' + || github.ref == 'refs/heads/feature/github_actions' + ) steps: - uses: actions/checkout@v2 with: @@ -182,32 +156,52 @@ jobs: with: env-file: .github/variables/.env - uses: FranzDiebold/github-env-vars-action@v2 #https://github.com/marketplace/actions/github-environment-variables-action - - name: Set buid version number env variables id: set-build-version-number-vars run: .github/scripts/set_version_numbers_env.sh - - name: Update project version & build number in source code and documentation id: update-project-version - run: .travis/update_project_version.sh - + run: .github/scripts/update_project_version.sh - name: Push version update to repository id: push-version-number-update run: | git add sonar-project.properties VERSION source/* docs/* git commit -m 'Updated project version after build [skip ci]' git push --quiet origin HEAD:${CI_ACTION_REF_NAME} - - name: Copy and push documentation to utPLSQL-github-io repo id: push-documentation env: API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }} - run: .travis/push_docs_to_github_io.sh + run: .github/scripts/push_docs_to_github_io.sh + + dispatch: + name: Dispatch downstream builds + concurrency: trigger + needs: [ build, publish ] + runs-on: ubuntu-latest + if: | + github.repository == 'utPLSQL/utPLSQL' && + github.base_ref == null && + ( startsWith( github.ref, 'refs/heads/release/v' ) + || github.ref == 'refs/heads/develop' + || github.ref == 'refs/heads/feature/github_actions' + ) + strategy: + matrix: + repo: ['utPLSQL/utPLSQL-maven-plugin', 'utPLSQL/utPLSQL-demo-project'] +# repo: ['utPLSQL/utPLSQL-java-api', 'utPLSQL/utPLSQL-v2-v3-migration', 'utPLSQL/utPLSQL-cli', 'utPLSQL/utPLSQL-maven-plugin', 'utPLSQL/utPLSQL-demo-project'] + steps: + - name: Repository Dispatch + uses: peter-evans/repository-dispatch@v1 + with: + token: ${{ secrets.API_TOKEN_GITHUB }} + repository: ${{ matrix.repo }} + event-type: utPLSQL-build slack-workflow-status: if: always() name: Post Workflow Status To Slack - needs: [ build-and-test, publish ] + needs: [ build, publish, dispatch ] runs-on: ubuntu-latest steps: - name: Slack Workflow Notification @@ -219,4 +213,3 @@ jobs: # Optional Input name: 'Github Actions[bot]' icon_url: 'https://octodex.github.com/images/mona-the-rivetertocat.png' -#TODO - add triggering of builds on other repositories \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index eb8bf34b5..3d1ecb6b8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,12 +33,12 @@ jobs: git config --global user.name "github-actions[bot]" - name: Update project version & build number in source code and documentation - run: .travis/update_project_version.sh + run: .github/scripts/update_project_version.sh - name: Copy and push documentation to utPLSQL-github-io repo env: API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }} - run: .travis/push_docs_to_github_io.sh + run: .github/scripts/push_docs_to_github_io.sh upload_artifacts: name: Upload archives @@ -50,7 +50,7 @@ jobs: with: fetch-depth: 0 - name: Update project version & build number in source code and documentation - run: .travis/update_project_version.sh + run: .github/scripts/update_project_version.sh - name: Setup git config run: | diff --git a/development/install.sh b/development/install.sh index ff112392f..627bd113d 100755 --- a/development/install.sh +++ b/development/install.sh @@ -10,11 +10,11 @@ if ! development/cleanup.sh; then echo -e ${header}"\nFailed to cleanup utPLSQL environment\n"${header} exit 1 fi -if ! .travis/install.sh; then +if ! .github/scripts/install.sh; then echo -e ${header}"\nFailed to install utPLSQL from current branch into ${UT3_DEVELOP_SCHEMA} schema\n"${header} exit 1 fi -if ! .travis/install_utplsql_release.sh; then +if ! .github/scripts/install_utplsql_release.sh; then echo -e ${header}"\nFailed to install utPLSQL from branch ${SELFTESTING_BRANCH} into ${UT3_RELEASE_VERSION_SCHEMA}\n"${header} exit 1 fi diff --git a/readme.md b/readme.md index 0928f2b95..b3a12d5d6 100644 --- a/readme.md +++ b/readme.md @@ -172,6 +172,7 @@ To sign up to the chat use [this link](https://join.slack.com/t/utplsql/shared_i ---------- __Project Directories__ +* .github - contains files needed for github Actions integration * .travis - contains files needed for travis-ci integration * client_source - Sources to be used on the client-side. Developer workstation or CI platform to run the tests. * development - Set of useful scripts and utilities for development and debugging of utPLSQL From 0e6eb7077727b977081fcb90dac1151e5f4f90aa Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 9 Jan 2022 02:55:40 +0200 Subject: [PATCH 0806/1096] Testing triggering of build process on other repositories --- .github/workflows/build.yml | 352 ++++++++++++++++++------------------ 1 file changed, 176 insertions(+), 176 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c05b81977..231137bcb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,170 +14,170 @@ defaults: jobs: - build: - name: Build and test on ${{matrix.db_version_name}} DB - runs-on: ubuntu-latest - env: - ORACLE_VERSION: ${{matrix.oracle-version}} - CONNECTION_STR: ${{matrix.connection-str}} - ORACLE_PASSWORD: oracle - DOCKER_VOLUME: ${{matrix.docker-volume}} - strategy: - fail-fast: false - matrix: - include: - - oracle-version: "gvenzl/oracle-xe:11-full" - connection-str: '127.0.0.1:1521/XE' - id: 1 - db_version_name: '11xe' -# TODO - need to add healthcheck.sh into our containers -# - oracle-version: "utplsqlv3/oracledb:12c-r1-se2-small" -# connection-str: '127.0.0.1:1521/ORCLCDB' -# id: 2 -# db_version_name: '12.1se' -# - oracle-version: "utplsqlv3/oracledb:12c-r2-se2-small" -# connection-str: '127.0.0.1:1521/ORCLCDB' -# id: 3 -# db_version_name: '12.2se' - - oracle-version: "gvenzl/oracle-xe:18-slim" - connection-str: '127.0.0.1:1521/XE' - id: 4 - db_version_name: '18xe' -# - oracle-version: "utplsqlv3/oracledb:18c-se2-small" -# connection-str: '127.0.0.1:1521/ORCLCDB' -# id: 5 -# db_version_name: '18se' -# - oracle-version: "utplsqlv3/oracledb:19c-se2-small" -# connection-str: '127.0.0.1:1521/ORCLCDB' -# id: 6 -# db_version_name: '19se' - - oracle-version: "gvenzl/oracle-xe:21-slim" - connection-str: '127.0.0.1:1521/XE' - id: 7 - db_version_name: '21xe' - - services: - oracle: - image: ${{matrix.oracle-version}} - env: - ORACLE_PASSWORD: oracle - MATRIX_JOB_ID: ${{matrix.id}} - credentials: - username: ${{ secrets.DOCKER_USER }} - password: ${{ secrets.DOCKER_PASSWORD }} - ports: - - 1521:1521 - options: >- - --health-cmd healthcheck.sh - --health-interval 10s - --health-timeout 5s - --health-retries 10 - - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - uses: c-py/action-dotenv-to-setenv@v2 - with: - env-file: .github/variables/.env - - uses: FranzDiebold/github-env-vars-action@v2 #https://github.com/marketplace/actions/github-environment-variables-action - - - name: Set build version number env variables - id: set-build-version-number-vars - run: .github/scripts/set_version_numbers_env.sh - - - name: Update project version & build number to verify that code is deployable after the update - id: update-project-version - run: .github/scripts/update_project_version.sh - - - name: Download utPLSQL release for testing -# For PR build - test using target branch as framework, for branch build use self as testing framework - run: git clone --depth=1 --branch=${CI_HEAD_REF:-$CI_REF_NAME} https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR - - - name: Update privileges on sources - run: chmod -R go+w ./{source,test,examples,${UTPLSQL_DIR}/source} - - - name: Add OJDBC home - id: get-ojdbc - run: mkdir -p ${OJDBC_HOME} && curl -Lk -o ${OJDBC_HOME}/ojdbc8.jar ${OJDBC_URL}/ojdbc8.jar && curl -Lk -o ${OJDBC_HOME}/orai18n.jar ${OJDBC_URL}/orai18n.jar - - - name: Install utPLSQL-cli - id: install-utplsql-cli - run: curl -Lk -o utPLSQL-cli.zip "https://github.com/utPLSQL/utPLSQL-cli/releases/download/v3.1.8/utPLSQL-cli.zip" && unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli - - - name: Install utPLSQL - id: install-utplsql - run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .github/scripts/install.sh - - - name: Install utPLSQL release - id: install-utplsql-release - run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .github/scripts/install_utplsql_release.sh - - - name: Run Examples - id: run-examples - run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .github/scripts/run_examples.sh - - - name: Install tests - id: install-tests - run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} test/install_tests.sh - - - name: Run Tests - id: run-tests - run: bash test/run_tests.sh - - - name: Validate utPLSQL reports format - id: validate-reports-format - run: bash .github/scripts/validate_report_files.sh - - - name: SonarCloud Scan - id: sonar - uses: SonarSource/sonarcloud-github-action@master - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - - publish: - name: Deploy documentation - needs: [ build ] - concurrency: publish - runs-on: ubuntu-latest - if: | - github.repository == 'utPLSQL/utPLSQL' && - github.base_ref == null && - ( startsWith( github.ref, 'refs/heads/release/v' ) - || github.ref == 'refs/heads/develop' - || github.ref == 'refs/heads/feature/github_actions' - ) - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - uses: c-py/action-dotenv-to-setenv@v2 - with: - env-file: .github/variables/.env - - uses: FranzDiebold/github-env-vars-action@v2 #https://github.com/marketplace/actions/github-environment-variables-action - - name: Set buid version number env variables - id: set-build-version-number-vars - run: .github/scripts/set_version_numbers_env.sh - - name: Update project version & build number in source code and documentation - id: update-project-version - run: .github/scripts/update_project_version.sh - - name: Push version update to repository - id: push-version-number-update - run: | - git add sonar-project.properties VERSION source/* docs/* - git commit -m 'Updated project version after build [skip ci]' - git push --quiet origin HEAD:${CI_ACTION_REF_NAME} - - name: Copy and push documentation to utPLSQL-github-io repo - id: push-documentation - env: - API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }} - run: .github/scripts/push_docs_to_github_io.sh +# build: +# name: Build and test on ${{matrix.db_version_name}} DB +# runs-on: ubuntu-latest +# env: +# ORACLE_VERSION: ${{matrix.oracle-version}} +# CONNECTION_STR: ${{matrix.connection-str}} +# ORACLE_PASSWORD: oracle +# DOCKER_VOLUME: ${{matrix.docker-volume}} +# strategy: +# fail-fast: false +# matrix: +# include: +# - oracle-version: "gvenzl/oracle-xe:11-full" +# connection-str: '127.0.0.1:1521/XE' +# id: 1 +# db_version_name: '11xe' +## TODO - need to add healthcheck.sh into our containers +## - oracle-version: "utplsqlv3/oracledb:12c-r1-se2-small" +## connection-str: '127.0.0.1:1521/ORCLCDB' +## id: 2 +## db_version_name: '12.1se' +## - oracle-version: "utplsqlv3/oracledb:12c-r2-se2-small" +## connection-str: '127.0.0.1:1521/ORCLCDB' +## id: 3 +## db_version_name: '12.2se' +# - oracle-version: "gvenzl/oracle-xe:18-slim" +# connection-str: '127.0.0.1:1521/XE' +# id: 4 +# db_version_name: '18xe' +## - oracle-version: "utplsqlv3/oracledb:18c-se2-small" +## connection-str: '127.0.0.1:1521/ORCLCDB' +## id: 5 +## db_version_name: '18se' +## - oracle-version: "utplsqlv3/oracledb:19c-se2-small" +## connection-str: '127.0.0.1:1521/ORCLCDB' +## id: 6 +## db_version_name: '19se' +# - oracle-version: "gvenzl/oracle-xe:21-slim" +# connection-str: '127.0.0.1:1521/XE' +# id: 7 +# db_version_name: '21xe' +# +# services: +# oracle: +# image: ${{matrix.oracle-version}} +# env: +# ORACLE_PASSWORD: oracle +# MATRIX_JOB_ID: ${{matrix.id}} +# credentials: +# username: ${{ secrets.DOCKER_USER }} +# password: ${{ secrets.DOCKER_PASSWORD }} +# ports: +# - 1521:1521 +# options: >- +# --health-cmd healthcheck.sh +# --health-interval 10s +# --health-timeout 5s +# --health-retries 10 +# +# steps: +# - uses: actions/checkout@v2 +# with: +# fetch-depth: 0 +# - uses: c-py/action-dotenv-to-setenv@v2 +# with: +# env-file: .github/variables/.env +# - uses: FranzDiebold/github-env-vars-action@v2 #https://github.com/marketplace/actions/github-environment-variables-action +# +# - name: Set build version number env variables +# id: set-build-version-number-vars +# run: .github/scripts/set_version_numbers_env.sh +# +# - name: Update project version & build number to verify that code is deployable after the update +# id: update-project-version +# run: .github/scripts/update_project_version.sh +# +# - name: Download utPLSQL release for testing +## For PR build - test using target branch as framework, for branch build use self as testing framework +# run: git clone --depth=1 --branch=${CI_HEAD_REF:-$CI_REF_NAME} https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR +# +# - name: Update privileges on sources +# run: chmod -R go+w ./{source,test,examples,${UTPLSQL_DIR}/source} +# +# - name: Add OJDBC home +# id: get-ojdbc +# run: mkdir -p ${OJDBC_HOME} && curl -Lk -o ${OJDBC_HOME}/ojdbc8.jar ${OJDBC_URL}/ojdbc8.jar && curl -Lk -o ${OJDBC_HOME}/orai18n.jar ${OJDBC_URL}/orai18n.jar +# +# - name: Install utPLSQL-cli +# id: install-utplsql-cli +# run: curl -Lk -o utPLSQL-cli.zip "https://github.com/utPLSQL/utPLSQL-cli/releases/download/v3.1.8/utPLSQL-cli.zip" && unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli +# +# - name: Install utPLSQL +# id: install-utplsql +# run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .github/scripts/install.sh +# +# - name: Install utPLSQL release +# id: install-utplsql-release +# run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .github/scripts/install_utplsql_release.sh +# +# - name: Run Examples +# id: run-examples +# run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .github/scripts/run_examples.sh +# +# - name: Install tests +# id: install-tests +# run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} test/install_tests.sh +# +# - name: Run Tests +# id: run-tests +# run: bash test/run_tests.sh +# +# - name: Validate utPLSQL reports format +# id: validate-reports-format +# run: bash .github/scripts/validate_report_files.sh +# +# - name: SonarCloud Scan +# id: sonar +# uses: SonarSource/sonarcloud-github-action@master +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any +# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} +# +# publish: +# name: Deploy documentation +# needs: [ build ] +# concurrency: publish +# runs-on: ubuntu-latest +# if: | +# github.repository == 'utPLSQL/utPLSQL' && +# github.base_ref == null && +# ( startsWith( github.ref, 'refs/heads/release/v' ) +# || github.ref == 'refs/heads/develop' +# || github.ref == 'refs/heads/feature/github_actions' +# ) +# steps: +# - uses: actions/checkout@v2 +# with: +# fetch-depth: 0 +# - uses: c-py/action-dotenv-to-setenv@v2 +# with: +# env-file: .github/variables/.env +# - uses: FranzDiebold/github-env-vars-action@v2 #https://github.com/marketplace/actions/github-environment-variables-action +# - name: Set buid version number env variables +# id: set-build-version-number-vars +# run: .github/scripts/set_version_numbers_env.sh +# - name: Update project version & build number in source code and documentation +# id: update-project-version +# run: .github/scripts/update_project_version.sh +# - name: Push version update to repository +# id: push-version-number-update +# run: | +# git add sonar-project.properties VERSION source/* docs/* +# git commit -m 'Updated project version after build [skip ci]' +# git push --quiet origin HEAD:${CI_ACTION_REF_NAME} +# - name: Copy and push documentation to utPLSQL-github-io repo +# id: push-documentation +# env: +# API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }} +# run: .github/scripts/push_docs_to_github_io.sh dispatch: name: Dispatch downstream builds concurrency: trigger - needs: [ build, publish ] +# needs: [ build, publish ] runs-on: ubuntu-latest if: | github.repository == 'utPLSQL/utPLSQL' && @@ -195,21 +195,21 @@ jobs: uses: peter-evans/repository-dispatch@v1 with: token: ${{ secrets.API_TOKEN_GITHUB }} - repository: ${{ matrix.repo }} + repository: ${{ matrix.repo }} event-type: utPLSQL-build - slack-workflow-status: - if: always() - name: Post Workflow Status To Slack - needs: [ build, publish, dispatch ] - runs-on: ubuntu-latest - steps: - - name: Slack Workflow Notification - uses: Gamesight/slack-workflow-status@master - with: - # Required Input - repo_token: ${{secrets.GITHUB_TOKEN}} - slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}} - # Optional Input - name: 'Github Actions[bot]' - icon_url: 'https://octodex.github.com/images/mona-the-rivetertocat.png' +# slack-workflow-status: +# if: always() +# name: Post Workflow Status To Slack +# needs: [ build, publish, dispatch ] +# runs-on: ubuntu-latest +# steps: +# - name: Slack Workflow Notification +# uses: Gamesight/slack-workflow-status@master +# with: +# # Required Input +# repo_token: ${{secrets.GITHUB_TOKEN}} +# slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}} +# # Optional Input +# name: 'Github Actions[bot]' +# icon_url: 'https://octodex.github.com/images/mona-the-rivetertocat.png' From 06f35569d226984d6d929082d9f00a4ee4efc09e Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 10 Jan 2022 10:43:16 +0200 Subject: [PATCH 0807/1096] Enabling build and slack notification --- .github/workflows/build.yml | 348 ++++++++++++++++++------------------ 1 file changed, 174 insertions(+), 174 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 231137bcb..b09f4de53 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,165 +14,165 @@ defaults: jobs: -# build: -# name: Build and test on ${{matrix.db_version_name}} DB -# runs-on: ubuntu-latest -# env: -# ORACLE_VERSION: ${{matrix.oracle-version}} -# CONNECTION_STR: ${{matrix.connection-str}} -# ORACLE_PASSWORD: oracle -# DOCKER_VOLUME: ${{matrix.docker-volume}} -# strategy: -# fail-fast: false -# matrix: -# include: -# - oracle-version: "gvenzl/oracle-xe:11-full" -# connection-str: '127.0.0.1:1521/XE' -# id: 1 -# db_version_name: '11xe' -## TODO - need to add healthcheck.sh into our containers -## - oracle-version: "utplsqlv3/oracledb:12c-r1-se2-small" -## connection-str: '127.0.0.1:1521/ORCLCDB' -## id: 2 -## db_version_name: '12.1se' -## - oracle-version: "utplsqlv3/oracledb:12c-r2-se2-small" -## connection-str: '127.0.0.1:1521/ORCLCDB' -## id: 3 -## db_version_name: '12.2se' -# - oracle-version: "gvenzl/oracle-xe:18-slim" -# connection-str: '127.0.0.1:1521/XE' -# id: 4 -# db_version_name: '18xe' -## - oracle-version: "utplsqlv3/oracledb:18c-se2-small" -## connection-str: '127.0.0.1:1521/ORCLCDB' -## id: 5 -## db_version_name: '18se' -## - oracle-version: "utplsqlv3/oracledb:19c-se2-small" -## connection-str: '127.0.0.1:1521/ORCLCDB' -## id: 6 -## db_version_name: '19se' -# - oracle-version: "gvenzl/oracle-xe:21-slim" -# connection-str: '127.0.0.1:1521/XE' -# id: 7 -# db_version_name: '21xe' -# -# services: -# oracle: -# image: ${{matrix.oracle-version}} -# env: -# ORACLE_PASSWORD: oracle -# MATRIX_JOB_ID: ${{matrix.id}} -# credentials: -# username: ${{ secrets.DOCKER_USER }} -# password: ${{ secrets.DOCKER_PASSWORD }} -# ports: -# - 1521:1521 -# options: >- -# --health-cmd healthcheck.sh -# --health-interval 10s -# --health-timeout 5s -# --health-retries 10 -# -# steps: -# - uses: actions/checkout@v2 -# with: -# fetch-depth: 0 -# - uses: c-py/action-dotenv-to-setenv@v2 -# with: -# env-file: .github/variables/.env -# - uses: FranzDiebold/github-env-vars-action@v2 #https://github.com/marketplace/actions/github-environment-variables-action -# -# - name: Set build version number env variables -# id: set-build-version-number-vars -# run: .github/scripts/set_version_numbers_env.sh -# -# - name: Update project version & build number to verify that code is deployable after the update -# id: update-project-version -# run: .github/scripts/update_project_version.sh -# -# - name: Download utPLSQL release for testing -## For PR build - test using target branch as framework, for branch build use self as testing framework -# run: git clone --depth=1 --branch=${CI_HEAD_REF:-$CI_REF_NAME} https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR -# -# - name: Update privileges on sources -# run: chmod -R go+w ./{source,test,examples,${UTPLSQL_DIR}/source} -# -# - name: Add OJDBC home -# id: get-ojdbc -# run: mkdir -p ${OJDBC_HOME} && curl -Lk -o ${OJDBC_HOME}/ojdbc8.jar ${OJDBC_URL}/ojdbc8.jar && curl -Lk -o ${OJDBC_HOME}/orai18n.jar ${OJDBC_URL}/orai18n.jar -# -# - name: Install utPLSQL-cli -# id: install-utplsql-cli -# run: curl -Lk -o utPLSQL-cli.zip "https://github.com/utPLSQL/utPLSQL-cli/releases/download/v3.1.8/utPLSQL-cli.zip" && unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli -# -# - name: Install utPLSQL -# id: install-utplsql -# run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .github/scripts/install.sh -# -# - name: Install utPLSQL release -# id: install-utplsql-release -# run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .github/scripts/install_utplsql_release.sh -# -# - name: Run Examples -# id: run-examples -# run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .github/scripts/run_examples.sh -# -# - name: Install tests -# id: install-tests -# run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} test/install_tests.sh -# -# - name: Run Tests -# id: run-tests -# run: bash test/run_tests.sh -# -# - name: Validate utPLSQL reports format -# id: validate-reports-format -# run: bash .github/scripts/validate_report_files.sh -# -# - name: SonarCloud Scan -# id: sonar -# uses: SonarSource/sonarcloud-github-action@master -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any -# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} -# -# publish: -# name: Deploy documentation -# needs: [ build ] -# concurrency: publish -# runs-on: ubuntu-latest -# if: | -# github.repository == 'utPLSQL/utPLSQL' && -# github.base_ref == null && -# ( startsWith( github.ref, 'refs/heads/release/v' ) -# || github.ref == 'refs/heads/develop' -# || github.ref == 'refs/heads/feature/github_actions' -# ) -# steps: -# - uses: actions/checkout@v2 -# with: -# fetch-depth: 0 -# - uses: c-py/action-dotenv-to-setenv@v2 -# with: -# env-file: .github/variables/.env -# - uses: FranzDiebold/github-env-vars-action@v2 #https://github.com/marketplace/actions/github-environment-variables-action -# - name: Set buid version number env variables -# id: set-build-version-number-vars -# run: .github/scripts/set_version_numbers_env.sh -# - name: Update project version & build number in source code and documentation -# id: update-project-version -# run: .github/scripts/update_project_version.sh -# - name: Push version update to repository -# id: push-version-number-update -# run: | -# git add sonar-project.properties VERSION source/* docs/* -# git commit -m 'Updated project version after build [skip ci]' -# git push --quiet origin HEAD:${CI_ACTION_REF_NAME} -# - name: Copy and push documentation to utPLSQL-github-io repo -# id: push-documentation -# env: -# API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }} -# run: .github/scripts/push_docs_to_github_io.sh + build: + name: Build and test on ${{matrix.db_version_name}} DB + runs-on: ubuntu-latest + env: + ORACLE_VERSION: ${{matrix.oracle-version}} + CONNECTION_STR: ${{matrix.connection-str}} + ORACLE_PASSWORD: oracle + DOCKER_VOLUME: ${{matrix.docker-volume}} + strategy: + fail-fast: false + matrix: + include: + - oracle-version: "gvenzl/oracle-xe:11-full" + connection-str: '127.0.0.1:1521/XE' + id: 1 + db_version_name: '11xe' +# TODO - need to add healthcheck.sh into our containers +# - oracle-version: "utplsqlv3/oracledb:12c-r1-se2-small" +# connection-str: '127.0.0.1:1521/ORCLCDB' +# id: 2 +# db_version_name: '12.1se' +# - oracle-version: "utplsqlv3/oracledb:12c-r2-se2-small" +# connection-str: '127.0.0.1:1521/ORCLCDB' +# id: 3 +# db_version_name: '12.2se' + - oracle-version: "gvenzl/oracle-xe:18-slim" + connection-str: '127.0.0.1:1521/XE' + id: 4 + db_version_name: '18xe' +# - oracle-version: "utplsqlv3/oracledb:18c-se2-small" +# connection-str: '127.0.0.1:1521/ORCLCDB' +# id: 5 +# db_version_name: '18se' +# - oracle-version: "utplsqlv3/oracledb:19c-se2-small" +# connection-str: '127.0.0.1:1521/ORCLCDB' +# id: 6 +# db_version_name: '19se' + - oracle-version: "gvenzl/oracle-xe:21-slim" + connection-str: '127.0.0.1:1521/XE' + id: 7 + db_version_name: '21xe' + + services: + oracle: + image: ${{matrix.oracle-version}} + env: + ORACLE_PASSWORD: oracle + MATRIX_JOB_ID: ${{matrix.id}} + credentials: + username: ${{ secrets.DOCKER_USER }} + password: ${{ secrets.DOCKER_PASSWORD }} + ports: + - 1521:1521 + options: >- + --health-cmd healthcheck.sh + --health-interval 10s + --health-timeout 5s + --health-retries 10 + + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - uses: c-py/action-dotenv-to-setenv@v2 + with: + env-file: .github/variables/.env + - uses: FranzDiebold/github-env-vars-action@v2 #https://github.com/marketplace/actions/github-environment-variables-action + + - name: Set build version number env variables + id: set-build-version-number-vars + run: .github/scripts/set_version_numbers_env.sh + + - name: Update project version & build number to verify that code is deployable after the update + id: update-project-version + run: .github/scripts/update_project_version.sh + + - name: Download utPLSQL release for testing +# For PR build - test using target branch as framework, for branch build use self as testing framework + run: git clone --depth=1 --branch=${CI_HEAD_REF:-$CI_REF_NAME} https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR + + - name: Update privileges on sources + run: chmod -R go+w ./{source,test,examples,${UTPLSQL_DIR}/source} + + - name: Add OJDBC home + id: get-ojdbc + run: mkdir -p ${OJDBC_HOME} && curl -Lk -o ${OJDBC_HOME}/ojdbc8.jar ${OJDBC_URL}/ojdbc8.jar && curl -Lk -o ${OJDBC_HOME}/orai18n.jar ${OJDBC_URL}/orai18n.jar + + - name: Install utPLSQL-cli + id: install-utplsql-cli + run: curl -Lk -o utPLSQL-cli.zip "https://github.com/utPLSQL/utPLSQL-cli/releases/download/v3.1.8/utPLSQL-cli.zip" && unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli + + - name: Install utPLSQL + id: install-utplsql + run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .github/scripts/install.sh + + - name: Install utPLSQL release + id: install-utplsql-release + run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .github/scripts/install_utplsql_release.sh + + - name: Run Examples + id: run-examples + run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .github/scripts/run_examples.sh + + - name: Install tests + id: install-tests + run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} test/install_tests.sh + + - name: Run Tests + id: run-tests + run: bash test/run_tests.sh + + - name: Validate utPLSQL reports format + id: validate-reports-format + run: bash .github/scripts/validate_report_files.sh + + - name: SonarCloud Scan + id: sonar + uses: SonarSource/sonarcloud-github-action@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + + publish: + name: Deploy documentation + needs: [ build ] + concurrency: publish + runs-on: ubuntu-latest + if: | + github.repository == 'utPLSQL/utPLSQL' && + github.base_ref == null && + ( startsWith( github.ref, 'refs/heads/release/v' ) + || github.ref == 'refs/heads/develop' + || github.ref == 'refs/heads/feature/github_actions' + ) + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - uses: c-py/action-dotenv-to-setenv@v2 + with: + env-file: .github/variables/.env + - uses: FranzDiebold/github-env-vars-action@v2 #https://github.com/marketplace/actions/github-environment-variables-action + - name: Set buid version number env variables + id: set-build-version-number-vars + run: .github/scripts/set_version_numbers_env.sh + - name: Update project version & build number in source code and documentation + id: update-project-version + run: .github/scripts/update_project_version.sh + - name: Push version update to repository + id: push-version-number-update + run: | + git add sonar-project.properties VERSION source/* docs/* + git commit -m 'Updated project version after build [skip ci]' + git push --quiet origin HEAD:${CI_ACTION_REF_NAME} + - name: Copy and push documentation to utPLSQL-github-io repo + id: push-documentation + env: + API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }} + run: .github/scripts/push_docs_to_github_io.sh dispatch: name: Dispatch downstream builds @@ -198,18 +198,18 @@ jobs: repository: ${{ matrix.repo }} event-type: utPLSQL-build -# slack-workflow-status: -# if: always() -# name: Post Workflow Status To Slack -# needs: [ build, publish, dispatch ] -# runs-on: ubuntu-latest -# steps: -# - name: Slack Workflow Notification -# uses: Gamesight/slack-workflow-status@master -# with: -# # Required Input -# repo_token: ${{secrets.GITHUB_TOKEN}} -# slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}} -# # Optional Input -# name: 'Github Actions[bot]' -# icon_url: 'https://octodex.github.com/images/mona-the-rivetertocat.png' + slack-workflow-status: + if: always() + name: Post Workflow Status To Slack + needs: [ build, publish, dispatch ] + runs-on: ubuntu-latest + steps: + - name: Slack Workflow Notification + uses: Gamesight/slack-workflow-status@master + with: + # Required Input + repo_token: ${{secrets.GITHUB_TOKEN}} + slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}} + # Optional Input + name: 'Github Actions[bot]' + icon_url: 'https://octodex.github.com/images/mona-the-rivetertocat.png' From 6cd8b16c19dd1ef6664c63805e289191d710e1fd Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 10 Jan 2022 10:44:21 +0200 Subject: [PATCH 0808/1096] Update documentation publish condition --- .github/workflows/build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b09f4de53..25e24259d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -144,10 +144,7 @@ jobs: if: | github.repository == 'utPLSQL/utPLSQL' && github.base_ref == null && - ( startsWith( github.ref, 'refs/heads/release/v' ) - || github.ref == 'refs/heads/develop' - || github.ref == 'refs/heads/feature/github_actions' - ) + ( startsWith( github.ref, 'refs/heads/release/v' ) || github.ref == 'refs/heads/develop' ) steps: - uses: actions/checkout@v2 with: From 1fc87de3500301c4f81fcb0fac2c3bcc26db5335 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 10 Jan 2022 10:45:58 +0200 Subject: [PATCH 0809/1096] Enable dependency on downstream job dispatch --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 25e24259d..a19e638b3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -174,7 +174,7 @@ jobs: dispatch: name: Dispatch downstream builds concurrency: trigger -# needs: [ build, publish ] + needs: [ build, publish ] runs-on: ubuntu-latest if: | github.repository == 'utPLSQL/utPLSQL' && From 31cc42dda3497a7a57a5c3f14d36cb6442b14fd8 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 13 Jan 2022 23:35:56 +0200 Subject: [PATCH 0810/1096] Final cleanup of travis build leftovers. --- .github/workflows/build.yml | 10 +-- .github/workflows/release.yml | 2 - .travis/trigger_travis.sh | 69 --------------- old.travis.yml | 153 ---------------------------------- 4 files changed, 2 insertions(+), 232 deletions(-) delete mode 100755 .travis/trigger_travis.sh delete mode 100644 old.travis.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a19e638b3..8c72e5043 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -177,12 +177,8 @@ jobs: needs: [ build, publish ] runs-on: ubuntu-latest if: | - github.repository == 'utPLSQL/utPLSQL' && - github.base_ref == null && - ( startsWith( github.ref, 'refs/heads/release/v' ) - || github.ref == 'refs/heads/develop' - || github.ref == 'refs/heads/feature/github_actions' - ) + github.repository == 'utPLSQL/utPLSQL' && github.base_ref == null && + ( startsWith( github.ref, 'refs/heads/release/v' ) || github.ref == 'refs/heads/develop' ) strategy: matrix: repo: ['utPLSQL/utPLSQL-maven-plugin', 'utPLSQL/utPLSQL-demo-project'] @@ -204,9 +200,7 @@ jobs: - name: Slack Workflow Notification uses: Gamesight/slack-workflow-status@master with: - # Required Input repo_token: ${{secrets.GITHUB_TOKEN}} slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}} - # Optional Input name: 'Github Actions[bot]' icon_url: 'https://octodex.github.com/images/mona-the-rivetertocat.png' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3d1ecb6b8..ad1e782c5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -91,10 +91,8 @@ jobs: - name: Slack Workflow Notification uses: Gamesight/slack-workflow-status@master with: - # Required Input repo_token: ${{secrets.GITHUB_TOKEN}} slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}} - # Optional Input name: 'Github Actions[bot]' icon_url: 'https://octodex.github.com/images/mona-the-rivetertocat.png' diff --git a/.travis/trigger_travis.sh b/.travis/trigger_travis.sh deleted file mode 100755 index 10083dd89..000000000 --- a/.travis/trigger_travis.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/bash - -# Trigger a new Travis-CI job. -# Ordinarily, a new Travis job is triggered when a commit is pushed to a -# GitHub repository. The trigger-travis.sh script provides a programmatic -# way to trigger a new Travis job. - -# To use this script to trigger a dependent build in Travis, do two things: -# -# 1. Set an environment variable TRAVIS_ACCESS_TOKEN by navigating to -# https://travis-ci.org/MYGITHUBID/MYGITHUBPROJECT/settings -# The TRAVIS_ACCESS_TOKEN environment variable will be set when Travis runs -# the job, but won't be visible to anyone browsing https://travis-ci.org/. -# - -echoerr() { echo "$@" 1>&2; } - -TRAVIS_URL=travis-ci.com -BRANCH=develop -USER="utPLSQL" -RESULT=1 -declare -a REPO_MATRIX=("utPLSQL-java-api" "utPLSQL-v2-v3-migration" "utPLSQL-cli" "utPLSQL-maven-plugin" "utPLSQL-demo-project") - -TOKEN=$1 - -if [ -n "$TRAVIS_REPO_SLUG" ] ; then - MESSAGE=",\"message\": \"Triggered by upstream build of $TRAVIS_REPO_SLUG commit "`git rev-parse --short HEAD`"\"" -else - MESSAGE=",\"message\": \"Triggered manually from shell\"" -fi - -# For debugging: -#echo "MESSAGE=$MESSAGE" - -body="{ -\"request\": { - \"branch\":\"$BRANCH\" - $MESSAGE -}}" - -for DOWNSTREAM_BUILD in "${REPO_MATRIX[@]}"; do - - curl -s -X POST \ - -H "Content-Type: application/json" \ - -H "Accept: application/json" \ - -H "Travis-API-Version: 3" \ - -H "Authorization: token ${TOKEN}" \ - -d "$body" \ - https://api.${TRAVIS_URL}/repo/${USER}%2F${DOWNSTREAM_BUILD}/requests \ - | tee ${DOWNSTREAM_BUILD}-output.txt - - if grep -q '"@type": "error"' ${DOWNSTREAM_BUILD}-output.txt; then - RESULT=0 - echoerr "" - echoerr "ERROR: Failed to start ${DOWNSTREAM_BUILD}" - echoerr "" - fi - if grep -q 'access denied' ${DOWNSTREAM_BUILD}-output.txt; then - RESULT=0 - echoerr "" - echoerr "ERROR: Failed to start ${DOWNSTREAM_BUILD} - access denied" - echoerr "" - fi - -done - -if [[ RESULT -eq 0 ]]; then - exit 1 -fi diff --git a/old.travis.yml b/old.travis.yml deleted file mode 100644 index cd1e8efe0..000000000 --- a/old.travis.yml +++ /dev/null @@ -1,153 +0,0 @@ -sudo: required -language: python -os: linux - -jdk: openjdk10 - -addons: - sonarcloud: - organization: utplsql - token: ${SONAR_TOKEN} - -services: - - docker - -env: - global: - - UT3_DEVELOP_SCHEMA=UT3_DEVELOP - - UT3_DEVELOP_SCHEMA_PASSWORD=ut3 - - UT3_RELEASE_VERSION_SCHEMA=UT3 - - UT3_RELEASE_VERSION_SCHEMA_PASSWORD=ut3 - - UT3_USER="UT3\$USER#" - - UT3_USER_PASSWORD=ut3 - - UT3_TESTER=UT3_TESTER - - UT3_TESTER_PASSWORD=ut3 - - UT3_TESTER_HELPER=UT3_TESTER_HELPER - - UT3_TESTER_HELPER_PASSWORD=ut3 - - UT3_TABLESPACE=users - - BUILD_DIR=${TRAVIS_BUILD_DIR} - - JOB_ID=${TRAVIS_JOB_ID} - - JOB_NUMBER=${TRAVIS_JOB_NUMBER} - - PULL_REQUEST_NAME=${TRAVIS_PULL_REQUEST} - - PULL_REQUEST_BRANCH=${TRAVIS_PULL_REQUEST_BRANCH} - - TAG_NAME=${TRAVIS_TAG} - - REPO_SLUG=${TRAVIS_REPO_SLUG} - - PR_SLUG=${TRAVIS_PULL_REQUEST_SLUG} - - BRANCH_NAME=${TRAVIS_BRANCH} - # Environment for building a release - - CURRENT_BRANCH=${TRAVIS_BRANCH} - - UTPLSQL_REPO="utPLSQL/utPLSQL" - - UTPLSQL_BUILD_NO="${TRAVIS_BUILD_NUMBER:-0}" - - UTPLSQL_VERSION=$(. .travis/get_project_version.sh) - - UTPLSQL_BUILD_VERSION=$(. .travis/get_project_build_version.sh) - - UTPLSQL_SOURCES_DIR='source' - - UTPLSQL_BUILD_USER_NAME="Travis CI" - - CACHE_DIR=$HOME/.cache - # Database Env - - SQLCLI="${BUILD_DIR}/sqlcl/bin/sql" - - OJDBC_HOME="${BUILD_DIR}/ojdbc" - - ORACLE_PWD="oracle" - - DOCKHER_HUB_REPO="utplsqlv3/oracledb" - - DOCKER_VOLUME="/home/oracle/host" - - DOCKER_ENV="-e SQLCLI=sqlplus -e UT3_DEVELOP_SCHEMA -e UT3_DEVELOP_SCHEMA_PASSWORD -e UT3_RELEASE_VERSION_SCHEMA -e UT3_RELEASE_VERSION_SCHEMA_PASSWORD -e UT3_USER -e UT3_USER_PASSWORD -e UT3_TESTER -e UT3_TESTER_PASSWORD -e UT3_TESTER_HELPER -e UT3_TESTER_HELPER_PASSWORD -e UT3_TABLESPACE -e ORACLE_PWD -e CONNECTION_STR -e UTPLSQL_DIR" - #utPLSQL released version directory - - UTPLSQL_DIR="utPLSQL_latest_release" - - SELFTESTING_BRANCH=${TRAVIS_BRANCH} - - UTPLSQL_CLI_VERSION="3.1.8" - # Maven - - MAVEN_HOME=/usr/local/maven - - MAVEN_CFG=$HOME/.m2 - jobs: - - ORACLE_VERSION="11g-r2-xe" CONNECTION_STR='127.0.0.1:1521/XE' DOCKER_VOLUME="/mnt/host" DOCKER_OPTIONS='--shm-size=1g' -# - ORACLE_VERSION="11-full" CONNECTION_STR='127.0.0.1:1521/XE' DOCKHER_HUB_REPO="gvenzl/oracle-xe" DOCKER_OPTIONS='-e ORACLE_PASSWORD=oracle --shm-size=1g' DOCKER_VOLUME="/mnt/host" - - ORACLE_VERSION="12c-r1-se2-small" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' - - ORACLE_VERSION="12c-r2-se2-small" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' - - ORACLE_VERSION="18-slim" CONNECTION_STR='127.0.0.1:1521/XEPDB1' DOCKHER_HUB_REPO="gvenzl/oracle-xe" DOCKER_OPTIONS='-e ORACLE_PASSWORD=oracle' - - ORACLE_VERSION="18c-se2-small" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' - - ORACLE_VERSION="19c-se2-small" CONNECTION_STR='127.0.0.1:1521/ORCLCDB' - - ORACLE_VERSION="21-full" CONNECTION_STR='127.0.0.1:1521/XEPDB1' DOCKHER_HUB_REPO="gvenzl/oracle-xe" DOCKER_OPTIONS='-e ORACLE_PASSWORD=oracle' - -cache: - pip: true - directories: - - $CACHE_DIR - - /home/travis/.sonar/cache - - node_modules - - $MAVEN_CFG - -before_install: - - #cache to be used between stages. Based on https://github.com/travis-ci/docs-travis-ci-com/issues/1329 - #delete all files in cache that are older than 5 days - - mkdir -p $CACHE_DIR/stages_cache; find $CACHE_DIR/stages_cache/ -mtime +5 -exec rm {} \; - #The update_project_version.sh is done before deployment to validate that the change of project files does not break installation - - bash .travis/update_project_version.sh - #Allow for sonar to blame issues - - git fetch --unshallow - # download latest utPLSQL release - - git clone --depth=1 --branch=${SELFTESTING_BRANCH:-main} https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR - # download latest utPLSQL-cli release - - curl -Lk -o utPLSQL-cli.zip https://github.com/utPLSQL/utPLSQL-cli/releases/download/v${UTPLSQL_CLI_VERSION}/utPLSQL-cli.zip - -install: - - unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli -# - curl -Lk -o sqlcl-latest.zip https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-latest.zip -# - unzip -q sqlcl-latest.zip -d $HOME - - mkdir -p ${OJDBC_HOME} #get JDBC driver and orai18n - - curl -Lk -o ${OJDBC_HOME}/ojdbc8.jar https://download.oracle.com/otn-pub/otn_software/jdbc/213/ojdbc8.jar - - curl -Lk -o ${OJDBC_HOME}/orai18n.jar https://download.oracle.com/otn-pub/otn_software/jdbc/213/orai18n.jar - # Chmod is needed to allow for write access within from docker container volume - - chmod -R go+w ./{source,test,examples,${UTPLSQL_DIR}/source} - - if [[ ! $TRAVIS_TAG ]]; then bash .travis/start_db.sh; fi - - if [[ ! $TRAVIS_TAG ]]; then docker exec ${ORACLE_VERSION} ${DOCKER_VOLUME}/.travis/install.sh; fi - - if [[ ! $TRAVIS_TAG ]]; then docker exec ${ORACLE_VERSION} ${DOCKER_VOLUME}/.travis/install_utplsql_release.sh; fi - -before_script: - - if [[ ! $TRAVIS_TAG ]]; then docker exec ${ORACLE_VERSION} ${DOCKER_VOLUME}/.travis/run_examples.sh; fi - - if [[ ! $TRAVIS_TAG ]]; then docker exec ${ORACLE_VERSION} ${DOCKER_VOLUME}/test/install_tests.sh; fi - -script: - - if [[ ! $TRAVIS_TAG ]]; then bash test/run_tests.sh; fi - - if [[ ! $TRAVIS_TAG ]]; then bash .travis/validate_report_files.sh; fi - - if [[ ! $TRAVIS_TAG ]] && [[ ("${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" && "${TRAVIS_PULL_REQUEST}" == false) || ("${TRAVIS_PULL_REQUEST_SLUG}" = "${UTPLSQL_REPO}") ]]; then bash .travis/run_sonar_scanner.sh; fi - - if [[ ! $TRAVIS_TAG ]]; then bash .travis/coveralls_uploader.sh; fi - -notifications: - slack: - rooms: - - secure: "nemt9n2y5sVCAKqa/s7JDQ8AcM59Xu/XbH/RkMOXvPgc+KtR8lBtVD1LkvJ5BaQhqgjuDT7DNt/uisQJ7k6a2OsrVFbnkypZ1hCvntOBpJyoSpD/YL1X8a9GbGojuJcph0BX76KN21LaOVdyOfY0TSlw53XiYWS8iL5HtjpWCbIwHL1SJ8JT8mhdT4hDoUWZjcZ4s4bLH6BQm4un/bMQOmB4sDoCeg4CllJwxgkswVF7OHpOFjgPetvUp7ps8b/Rj8en6zCj9drb0SVbXFgumo2Wd1bC3HHZB8MAZU0kuEV5VgUdum6EelUL5yfB72hssNQA0+CaT3HjBFkTlqWYJmjC4/xyGN3sseiW82T9FDY0g0GAGayNRW+QSiTQ1hbJEcAnNe0GrBUdRsgXdI6COd76YP5VxzRSF6H7niLfgCZdKbIivKUd1o+wBhuyJmqCFIkRWmT38tMGJqJAzbY1jq5gQXbb6E7gt+KdTjlSjcnJYf7XI7zqm+BRr+fbA0ixfXHvfqOBgZN6g08y9nPlDnIjtSF2NSdrj2zqYQAtKuWSOD1bnTyfDJyrtK7OLffZcMYD5Bcss4c8op8tP7MGTjt1S046SJocboh6H4c/nTokpoMRsWs6MKRdebl8C2RObGf5FebSOJg+oh2ZYS5Z/G9GshiY2BD/81+Hc4Miacc=" - on_success: change - on_failure: always - -jobs: - include: - - stage: deploy - env: ORACLE_VERSION="none" - before_install: skip - install: - - pip install mkdocs - before_script: skip - script: - - bash .travis/update_project_version.sh - - git config --global user.email "builds@travis-ci.com" - - git config --global user.name "${UTPLSQL_BUILD_USER_NAME}" - - git remote rm origin - - git remote add origin https://${github_api_token}@github.com/${UTPLSQL_REPO} - - if [[ ! $TRAVIS_TAG ]]; then bash .travis/push_release_version.sh; fi - - bash .travis/push_docs_to_github_io.sh - - bash .travis/build_docs.sh - - if [[ ($TRAVIS_BRANCH == develop) && ($TRAVIS_PULL_REQUEST == false) ]]; then bash .travis/trigger_travis.sh $TRAVIS_ACCESS_TOKEN; fi - before_deploy: - - bash .travis/build_release_archive.sh - deploy: - provider: releases - api_key: $github_api_token - file: - - utPLSQL.zip - - utPLSQL.tar.gz - - utPLSQL.zip.md5 - - utPLSQL.tar.gz.md5 - skip_cleanup: true - on: - repo: ${UTPLSQL_REPO} - tags: true From b94a3f72dd398ba1c869d44f9cbfdc9980cc7265 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 15 Jan 2022 01:13:40 +0200 Subject: [PATCH 0811/1096] Addding `utPLSQL-java-api` repo to dispatch post-build. --- .github/workflows/build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8c72e5043..da5a51cda 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -153,18 +153,22 @@ jobs: with: env-file: .github/variables/.env - uses: FranzDiebold/github-env-vars-action@v2 #https://github.com/marketplace/actions/github-environment-variables-action + - name: Set buid version number env variables id: set-build-version-number-vars run: .github/scripts/set_version_numbers_env.sh + - name: Update project version & build number in source code and documentation id: update-project-version run: .github/scripts/update_project_version.sh + - name: Push version update to repository id: push-version-number-update run: | git add sonar-project.properties VERSION source/* docs/* git commit -m 'Updated project version after build [skip ci]' git push --quiet origin HEAD:${CI_ACTION_REF_NAME} + - name: Copy and push documentation to utPLSQL-github-io repo id: push-documentation env: @@ -181,7 +185,7 @@ jobs: ( startsWith( github.ref, 'refs/heads/release/v' ) || github.ref == 'refs/heads/develop' ) strategy: matrix: - repo: ['utPLSQL/utPLSQL-maven-plugin', 'utPLSQL/utPLSQL-demo-project'] + repo: ['utPLSQL/utPLSQL-maven-plugin', 'utPLSQL/utPLSQL-demo-project','utPLSQL/utPLSQL-java-api'] # repo: ['utPLSQL/utPLSQL-java-api', 'utPLSQL/utPLSQL-v2-v3-migration', 'utPLSQL/utPLSQL-cli', 'utPLSQL/utPLSQL-maven-plugin', 'utPLSQL/utPLSQL-demo-project'] steps: - name: Repository Dispatch From 79c3510c600258a0e00f9fde61a187298cb33fd5 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 16 Jan 2022 14:12:23 +0200 Subject: [PATCH 0812/1096] Fix for releasing version update. --- .github/scripts/push_project_version.sh | 12 ------------ .github/workflows/build.yml | 10 +++++++++- 2 files changed, 9 insertions(+), 13 deletions(-) delete mode 100755 .github/scripts/push_project_version.sh diff --git a/.github/scripts/push_project_version.sh b/.github/scripts/push_project_version.sh deleted file mode 100755 index 1b38e6c24..000000000 --- a/.github/scripts/push_project_version.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -set -v -echo Current branch is "${CURRENT_BRANCH}" -echo "Committing version & buildNo into branch (${CURRENT_BRANCH})" -git add sonar-project.properties -git add VERSION -git add source/* -git add docs/* -git commit -m 'Updated project version after build [skip ci]' -echo "Pushing to origin" -git push --quiet origin HEAD:${CURRENT_BRANCH} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index da5a51cda..0bdda4797 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -141,14 +141,22 @@ jobs: needs: [ build ] concurrency: publish runs-on: ubuntu-latest + env: + API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }} if: | github.repository == 'utPLSQL/utPLSQL' && github.base_ref == null && ( startsWith( github.ref, 'refs/heads/release/v' ) || github.ref == 'refs/heads/develop' ) steps: + - name: 🔍 API_TOKEN_GITHUB + if: env.API_TOKEN_GITHUB == '' + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: echo "API_TOKEN_GITHUB=${GITHUB_TOKEN}" >> $GITHUB_ENV - uses: actions/checkout@v2 with: fetch-depth: 0 + token: ${{ env.API_TOKEN_GITHUB }} - uses: c-py/action-dotenv-to-setenv@v2 with: env-file: .github/variables/.env @@ -164,7 +172,7 @@ jobs: - name: Push version update to repository id: push-version-number-update - run: | + run: | git add sonar-project.properties VERSION source/* docs/* git commit -m 'Updated project version after build [skip ci]' git push --quiet origin HEAD:${CI_ACTION_REF_NAME} From 9abdd36c03f3d8f3df7ba8cab0ddbcebe3ffc1ce Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 16 Jan 2022 13:41:39 +0000 Subject: [PATCH 0813/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 34b6dc228..28c43e3e6 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 1d85c978a..4e059bce9 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 0790f1356..43ff8fd64 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 3dc0c0412..2d00bd44d 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 0815fafac..248b18014 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index d25411370..ab40cbfb7 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index f5f5c9d06..c27db2f0b 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 3fac28b94..b9eb8b5a4 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index e89ad4562..a44cb104c 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 5c78ada34..f9e4f8b1e 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 0c45df2ea..b51c10384 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 4ab0c3904..59d8822f1 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 227e7c22a..5f66df953 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 81e53b98b..c95d55bbf 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 18e5e307e..500cbb300 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 5bb5b7d6d..de33bd530 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index af4ef241e..eb56d14e6 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3562--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index cf189e768..b20476414 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -788,7 +788,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.12.3562-develop + * secion v3.1.12.3718-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 49e81558e..a014eaf28 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.12.3562-develop'; + gc_version constant varchar2(50) := 'v3.1.12.3718-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 4453b562b0afb62888ca31e9f6205ca75dbf0f7e Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 16 Jan 2022 18:07:30 +0200 Subject: [PATCH 0814/1096] Fixing badge --- .github/workflows/build.yml | 2 +- readme.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0bdda4797..a0bf8b120 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -194,7 +194,7 @@ jobs: strategy: matrix: repo: ['utPLSQL/utPLSQL-maven-plugin', 'utPLSQL/utPLSQL-demo-project','utPLSQL/utPLSQL-java-api'] -# repo: ['utPLSQL/utPLSQL-java-api', 'utPLSQL/utPLSQL-v2-v3-migration', 'utPLSQL/utPLSQL-cli', 'utPLSQL/utPLSQL-maven-plugin', 'utPLSQL/utPLSQL-demo-project'] +# repo: [ 'utPLSQL/utPLSQL-v2-v3-migration', 'utPLSQL/utPLSQL-cli' ] steps: - name: Repository Dispatch uses: peter-evans/repository-dispatch@v1 diff --git a/readme.md b/readme.md index 8367362cd..f96b88d7f 100644 --- a/readme.md +++ b/readme.md @@ -8,7 +8,7 @@ [![chat](http://img.shields.io/badge/slack-team--chat-blue.svg)](https://join.slack.com/t/utplsql/shared_invite/zt-xwm68udy-4cF_3PNEyczYEbWr38W5ww) [![twitter](https://img.shields.io/twitter/follow/utPLSQL.svg?style=social&label=Follow)](https://twitter.com/utPLSQL) -[![build](https://travis-ci.com/utPLSQL/utPLSQL.svg?branch=develop)](https://travis-ci.com/utPLSQL/utPLSQL) +[![build](https://github.com/utPLSQL/utPLSQL/actions/workflows/build.yml/badge.svg)](https://github.com/utPLSQL/utPLSQL/actions/workflows/build.yml) [![QualityGate](https://sonarcloud.io/api/project_badges/measure?project=utPLSQL&metric=sqale_rating)](https://sonarcloud.io/dashboard/index?id=utPLSQL) [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=utPLSQL&metric=coverage)](https://sonarcloud.io/summary/new_code?id=utPLSQL) From 2f4e32037006ea8896894d720b70ecb36bac4514 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 17 Jan 2022 10:02:00 +0200 Subject: [PATCH 0815/1096] REmoved dispatching of projects that depend on utPLSQL-java-api. Those will be dispatched after successful build of utPLSQL-java-api --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a0bf8b120..87d577554 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -193,8 +193,8 @@ jobs: ( startsWith( github.ref, 'refs/heads/release/v' ) || github.ref == 'refs/heads/develop' ) strategy: matrix: - repo: ['utPLSQL/utPLSQL-maven-plugin', 'utPLSQL/utPLSQL-demo-project','utPLSQL/utPLSQL-java-api'] -# repo: [ 'utPLSQL/utPLSQL-v2-v3-migration', 'utPLSQL/utPLSQL-cli' ] + repo: [ 'utPLSQL/utPLSQL-demo-project', 'utPLSQL/utPLSQL-java-api' ] +# repo: [ 'utPLSQL/utPLSQL-v2-v3-migration' ] steps: - name: Repository Dispatch uses: peter-evans/repository-dispatch@v1 From f28ae6232c5e3ebac8d4e36938eec4f4d9e19935 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 17 Jan 2022 08:18:58 +0000 Subject: [PATCH 0816/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 28c43e3e6..c9ec27342 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 4e059bce9..9f271da68 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 43ff8fd64..307dd5a8b 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 2d00bd44d..78de8ab87 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 248b18014..000fcd906 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index ab40cbfb7..8b1c1ef22 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index c27db2f0b..e2927918f 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index b9eb8b5a4..38234be6c 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index a44cb104c..753fc1b5b 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index f9e4f8b1e..784fa65ac 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index b51c10384..debcd6025 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 59d8822f1..d2ac915a5 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 5f66df953..87e3dba0c 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index c95d55bbf..d41111356 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 500cbb300..67a424c6d 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index de33bd530..9fb53e98f 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index eb56d14e6..92581f966 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3718--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index b20476414..6073eb50b 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -788,7 +788,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.12.3718-develop + * secion v3.1.12.3719-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index a014eaf28..85f621842 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.12.3718-develop'; + gc_version constant varchar2(50) := 'v3.1.12.3719-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From c11aa2456f479fe26194e03b0363ecbf4982268a Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Wed, 26 Jan 2022 00:37:26 +0000 Subject: [PATCH 0817/1096] Initial check in. Covers issues of displaying wrong info in diff message for nested objects. Exclude object type from being part of the SQL generation. --- .../data_values/ut_compound_data_helper.pkb | 39 +++++++++++++++---- test/install_ut3_tester_helper.sql | 1 + .../test_dummy_nested_object.tps | 15 +++++++ .../expectations/test_expectation_anydata.pkb | 19 +++++++++ .../expectations/test_expectation_anydata.pks | 4 ++ 5 files changed, 70 insertions(+), 8 deletions(-) create mode 100644 test/ut3_tester_helper/test_dummy_nested_object.tps diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 37d9901ff..bfd0865d4 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -144,7 +144,9 @@ create or replace package body ut_compound_data_helper is l_index := a_pk_table.next(l_index); end loop; end if; - if not(l_exists) then + if a_data_info.column_type in ('OBJECT') then + null; + elsif not(l_exists) then l_sql_stmt := ' (decode(a.'||a_data_info.transformed_name||','||' e.'||a_data_info.transformed_name||',1,0) = 0)'; end if; return l_sql_stmt; @@ -161,7 +163,9 @@ create or replace package body ut_compound_data_helper is if l_pk_tab.count <> 0 then l_index:= l_pk_tab.first; loop - if l_pk_tab(l_index) in (a_data_info.access_path, a_data_info.parent_name) then + if a_data_info.column_type in ('OBJECT') then + null; + elsif l_pk_tab(l_index) in (a_data_info.access_path, a_data_info.parent_name) then --When then table is nested and join is on whole table l_sql_stmt := l_sql_stmt ||' a.'||a_data_info.transformed_name||q'[ = ]'||' e.'||a_data_info.transformed_name; end if; @@ -187,7 +191,9 @@ create or replace package body ut_compound_data_helper is if a_pk_table is not empty then l_index:= a_pk_table.first; loop - if a_pk_table(l_index) in (a_data_info.access_path, a_data_info.parent_name) then + if a_data_info.column_type in ('OBJECT') then + null; + elsif a_pk_table(l_index) in (a_data_info.access_path, a_data_info.parent_name) then --When then table is nested and join is on whole table l_sql_stmt := l_sql_stmt ||a_alias||a_data_info.transformed_name; end if; @@ -195,7 +201,11 @@ create or replace package body ut_compound_data_helper is l_index := a_pk_table.next(l_index); end loop; else - l_sql_stmt := a_alias||a_data_info.transformed_name; + if a_data_info.column_type in ('OBJECT') then + null; + else + l_sql_stmt := a_alias||a_data_info.transformed_name; + end if; end if; return l_sql_stmt; end; @@ -206,7 +216,9 @@ create or replace package body ut_compound_data_helper is l_alias varchar2(10) := a_alias; l_col_syntax varchar2(4000); begin - if a_data_info.is_sql_diffable = 0 then + if a_data_info.column_type in ('OBJECT') then + null; + elsif a_data_info.is_sql_diffable = 0 then l_col_syntax := 'ut_utils.get_hash('||l_alias||a_data_info.transformed_name||'.getClobVal()) as '||a_data_info.transformed_name ; elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type = 'DATE' then l_col_syntax := 'to_date('||l_alias||a_data_info.transformed_name||') as '|| a_data_info.transformed_name; @@ -238,6 +250,8 @@ create or replace package body ut_compound_data_helper is --We cannot use a precision and scale as dbms_sql.describe_columns3 return precision 0 for dual table -- there is also no need for that as we not process data but only read and compare as they are stored l_col_type := a_data_info.column_type; + elsif a_data_info.column_type in ('OBJECT') then + null; else l_col_type := a_data_info.column_type ||case when a_data_info.column_len is not null @@ -245,7 +259,11 @@ create or replace package body ut_compound_data_helper is else null end; end if; - return a_data_info.transformed_name||' '||l_col_type||q'[ PATH ']'||a_data_info.access_path||q'[']'; + if a_data_info.column_type in ('OBJECT') then + return null; + else + return a_data_info.transformed_name||' '||l_col_type||q'[ PATH ']'||a_data_info.access_path||q'[']'; + end if; end; procedure gen_sql_pieces_out_of_cursor( @@ -398,8 +416,12 @@ create or replace package body ut_compound_data_helper is l_column_list ut_varchar2_list := ut_varchar2_list(); begin for i in 1..a_cursor_info.count loop - l_column_list.extend; - l_column_list(l_column_list.last) := a_cursor_info(i).access_path; + --This avoids extracting single columns from nested objects. + --as we can go down to any level but we will lose visibility of parent. + if a_cursor_info(i).hierarchy_level = 1 then + l_column_list.extend; + l_column_list(l_column_list.last) := a_cursor_info(i).access_path; + end if; end loop; return l_column_list; end; @@ -571,6 +593,7 @@ create or replace package body ut_compound_data_helper is xmlelement( name "ROW", a_diff_tab(idx).act_item_data), a_diff_tab(idx).act_data_id, xmlelement( name "ROW", a_diff_tab(idx).exp_item_data), a_diff_tab(idx).exp_data_id, a_diff_tab(idx).item_no, a_diff_tab(idx).dup_no); + exception when ut_utils.ex_failure_for_all then raise_application_error(ut_utils.gc_dml_for_all,'Failure to insert a diff tmp data.'); diff --git a/test/install_ut3_tester_helper.sql b/test/install_ut3_tester_helper.sql index 9841252a0..7fb9aacf6 100644 --- a/test/install_ut3_tester_helper.sql +++ b/test/install_ut3_tester_helper.sql @@ -6,6 +6,7 @@ alter session set plsql_optimize_level=0; --Install ut3_tester_helper @@ut3_tester_helper/test_dummy_object.tps @@ut3_tester_helper/other_dummy_object.tps +@@ut3_tester_helper/test_dummy_nested_object.tps @@ut3_tester_helper/test_dummy_object_list.tps @@ut3_tester_helper/test_tab_varchar2.tps @@ut3_tester_helper/test_tab_varray.tps diff --git a/test/ut3_tester_helper/test_dummy_nested_object.tps b/test/ut3_tester_helper/test_dummy_nested_object.tps new file mode 100644 index 000000000..6aef3bef8 --- /dev/null +++ b/test/ut3_tester_helper/test_dummy_nested_object.tps @@ -0,0 +1,15 @@ +declare + l_exists integer; +begin + select count(1) into l_exists from user_types where type_name = 'TEST_DUMMY_NESTED_OBJECT'; + if l_exists > 0 then + execute immediate 'drop type test_dummy_nested_object force'; + end if; +end; +/ + +create or replace type test_dummy_nested_object as object ( + first_nested_obj test_dummy_object, + sec_nested_obj test_dummy_object +) +/ \ No newline at end of file diff --git a/test/ut3_user/expectations/test_expectation_anydata.pkb b/test/ut3_user/expectations/test_expectation_anydata.pkb index be666b284..d783fc86c 100644 --- a/test/ut3_user/expectations/test_expectation_anydata.pkb +++ b/test/ut3_user/expectations/test_expectation_anydata.pkb @@ -991,6 +991,25 @@ Rows: [ 60 differences, showing first 20 ] ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; + + procedure failure_nesting_objects is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_nested_object(ut3_tester_helper.test_dummy_object(1, 'A', '0'),ut3_tester_helper.test_dummy_object(1, 'B', '0') )); + g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_nested_object(ut3_tester_helper.test_dummy_object(1, 'A', '0'),ut3_tester_helper.test_dummy_object(1, 'C', '0') )); + --Act + l_expected_message := q'[%Actual: ut3_develop.some_item was expected to equal: ut3_develop.some_item +%Diff: +%Rows: [ 1 differences ] +%Row No. 1 - Actual: 1B0 +%Row No. 1 - Expected: 1C0]'; + ut3_develop.ut.expect(g_test_actual).to_equal(g_test_expected); + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; end; / \ No newline at end of file diff --git a/test/ut3_user/expectations/test_expectation_anydata.pks b/test/ut3_user/expectations/test_expectation_anydata.pks index a6eeb25fb..f74d15241 100644 --- a/test/ut3_user/expectations/test_expectation_anydata.pks +++ b/test/ut3_user/expectations/test_expectation_anydata.pks @@ -203,5 +203,9 @@ create or replace package test_expectation_anydata is --%test ( Empty Array not equal array with space ) procedure arr_empty_nqua_arr_e_unord; + + --%test ( Failure of comparing nesting objects ) + procedure failure_nesting_objects; + end; / From e0ac97ca4ebb3cdb391ebdf09084413961322657 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Wed, 26 Jan 2022 01:19:53 +0000 Subject: [PATCH 0818/1096] Adding test for double nested objects --- .../data_values/ut_compound_data_helper.pkb | 32 ++++--------------- test/install_ut3_tester_helper.sql | 1 + .../test_dummy_double_nested_object.tps | 15 +++++++++ .../expectations/test_expectation_anydata.pkb | 25 +++++++++++++-- .../expectations/test_expectation_anydata.pks | 3 ++ 5 files changed, 48 insertions(+), 28 deletions(-) create mode 100644 test/ut3_tester_helper/test_dummy_double_nested_object.tps diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index bfd0865d4..71c1b9ee2 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -144,9 +144,7 @@ create or replace package body ut_compound_data_helper is l_index := a_pk_table.next(l_index); end loop; end if; - if a_data_info.column_type in ('OBJECT') then - null; - elsif not(l_exists) then + if not(l_exists) then l_sql_stmt := ' (decode(a.'||a_data_info.transformed_name||','||' e.'||a_data_info.transformed_name||',1,0) = 0)'; end if; return l_sql_stmt; @@ -163,9 +161,7 @@ create or replace package body ut_compound_data_helper is if l_pk_tab.count <> 0 then l_index:= l_pk_tab.first; loop - if a_data_info.column_type in ('OBJECT') then - null; - elsif l_pk_tab(l_index) in (a_data_info.access_path, a_data_info.parent_name) then + if l_pk_tab(l_index) in (a_data_info.access_path, a_data_info.parent_name) then --When then table is nested and join is on whole table l_sql_stmt := l_sql_stmt ||' a.'||a_data_info.transformed_name||q'[ = ]'||' e.'||a_data_info.transformed_name; end if; @@ -191,9 +187,7 @@ create or replace package body ut_compound_data_helper is if a_pk_table is not empty then l_index:= a_pk_table.first; loop - if a_data_info.column_type in ('OBJECT') then - null; - elsif a_pk_table(l_index) in (a_data_info.access_path, a_data_info.parent_name) then + if a_pk_table(l_index) in (a_data_info.access_path, a_data_info.parent_name) then --When then table is nested and join is on whole table l_sql_stmt := l_sql_stmt ||a_alias||a_data_info.transformed_name; end if; @@ -201,11 +195,7 @@ create or replace package body ut_compound_data_helper is l_index := a_pk_table.next(l_index); end loop; else - if a_data_info.column_type in ('OBJECT') then - null; - else - l_sql_stmt := a_alias||a_data_info.transformed_name; - end if; + l_sql_stmt := a_alias||a_data_info.transformed_name; end if; return l_sql_stmt; end; @@ -216,9 +206,7 @@ create or replace package body ut_compound_data_helper is l_alias varchar2(10) := a_alias; l_col_syntax varchar2(4000); begin - if a_data_info.column_type in ('OBJECT') then - null; - elsif a_data_info.is_sql_diffable = 0 then + if a_data_info.is_sql_diffable = 0 then l_col_syntax := 'ut_utils.get_hash('||l_alias||a_data_info.transformed_name||'.getClobVal()) as '||a_data_info.transformed_name ; elsif a_data_info.is_sql_diffable = 1 and a_data_info.column_type = 'DATE' then l_col_syntax := 'to_date('||l_alias||a_data_info.transformed_name||') as '|| a_data_info.transformed_name; @@ -250,8 +238,6 @@ create or replace package body ut_compound_data_helper is --We cannot use a precision and scale as dbms_sql.describe_columns3 return precision 0 for dual table -- there is also no need for that as we not process data but only read and compare as they are stored l_col_type := a_data_info.column_type; - elsif a_data_info.column_type in ('OBJECT') then - null; else l_col_type := a_data_info.column_type ||case when a_data_info.column_len is not null @@ -259,11 +245,7 @@ create or replace package body ut_compound_data_helper is else null end; end if; - if a_data_info.column_type in ('OBJECT') then - return null; - else - return a_data_info.transformed_name||' '||l_col_type||q'[ PATH ']'||a_data_info.access_path||q'[']'; - end if; + return a_data_info.transformed_name||' '||l_col_type||q'[ PATH ']'||a_data_info.access_path||q'[']'; end; procedure gen_sql_pieces_out_of_cursor( @@ -296,7 +278,7 @@ create or replace package body ut_compound_data_helper is begin if a_data_info is not empty then for i in 1..a_data_info.count loop - if a_data_info(i).has_nested_col = 0 then + if a_data_info(i).has_nested_col = 0 and a_data_info(i).column_type <> 'OBJECT' then --Get XMLTABLE column list add_element_to_list(l_xmltab_list,generate_xmltab_stmt(a_data_info(i))); --Get Select statment list of columns diff --git a/test/install_ut3_tester_helper.sql b/test/install_ut3_tester_helper.sql index 7fb9aacf6..c31b670bb 100644 --- a/test/install_ut3_tester_helper.sql +++ b/test/install_ut3_tester_helper.sql @@ -7,6 +7,7 @@ alter session set plsql_optimize_level=0; @@ut3_tester_helper/test_dummy_object.tps @@ut3_tester_helper/other_dummy_object.tps @@ut3_tester_helper/test_dummy_nested_object.tps +@@ut3_tester_helper/test_dummy_double_nested_object.tps @@ut3_tester_helper/test_dummy_object_list.tps @@ut3_tester_helper/test_tab_varchar2.tps @@ut3_tester_helper/test_tab_varray.tps diff --git a/test/ut3_tester_helper/test_dummy_double_nested_object.tps b/test/ut3_tester_helper/test_dummy_double_nested_object.tps new file mode 100644 index 000000000..bfd29447c --- /dev/null +++ b/test/ut3_tester_helper/test_dummy_double_nested_object.tps @@ -0,0 +1,15 @@ +declare + l_exists integer; +begin + select count(1) into l_exists from user_types where type_name = 'TEST_DUMMY_DOUBLE_NESTED_OBJECT'; + if l_exists > 0 then + execute immediate 'drop type test_dummy_double_nested_object force'; + end if; +end; +/ + +create or replace type test_dummy_double_nested_object as object ( + first_double_nested_obj test_dummy_nested_object, + "Value" varchar2(30) +) +/ \ No newline at end of file diff --git a/test/ut3_user/expectations/test_expectation_anydata.pkb b/test/ut3_user/expectations/test_expectation_anydata.pkb index d783fc86c..5c76226da 100644 --- a/test/ut3_user/expectations/test_expectation_anydata.pkb +++ b/test/ut3_user/expectations/test_expectation_anydata.pkb @@ -1000,16 +1000,35 @@ Rows: [ 60 differences, showing first 20 ] g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_nested_object(ut3_tester_helper.test_dummy_object(1, 'A', '0'),ut3_tester_helper.test_dummy_object(1, 'B', '0') )); g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_nested_object(ut3_tester_helper.test_dummy_object(1, 'A', '0'),ut3_tester_helper.test_dummy_object(1, 'C', '0') )); --Act - l_expected_message := q'[%Actual: ut3_develop.some_item was expected to equal: ut3_develop.some_item + l_expected_message := q'[%Actual: ut3_tester_helper.test_dummy_nested_object was expected to equal: ut3_tester_helper.test_dummy_nested_object %Diff: %Rows: [ 1 differences ] -%Row No. 1 - Actual: 1B0 -%Row No. 1 - Expected: 1C0]'; +%Row No. 1 - Actual: 1C0 +%Row No. 1 - Expected: 1B0]'; ut3_develop.ut.expect(g_test_actual).to_equal(g_test_expected); l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; + procedure failure_double_nested_objects is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_double_nested_object(ut3_tester_helper.test_dummy_nested_object(ut3_tester_helper.test_dummy_object(1, 'A', '0'),ut3_tester_helper.test_dummy_object(1, 'B', '0') ),'Test')); + g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_double_nested_object(ut3_tester_helper.test_dummy_nested_object(ut3_tester_helper.test_dummy_object(1, 'A', '0'),ut3_tester_helper.test_dummy_object(1, 'C', '0') ),'Test')); + --Act + l_expected_message := q'[%Actual: ut3_tester_helper.test_dummy_double_nested_object was expected to equal: ut3_tester_helper.test_dummy_double_nested_object +%Diff: +%Rows: [ 1 differences ] +%Row No. 1 - Actual: 1A01C0 +%Row No. 1 - Expected: 1A01B0]'; + ut3_develop.ut.expect(g_test_actual).to_equal(g_test_expected); + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + end; / \ No newline at end of file diff --git a/test/ut3_user/expectations/test_expectation_anydata.pks b/test/ut3_user/expectations/test_expectation_anydata.pks index f74d15241..4b24a2ad9 100644 --- a/test/ut3_user/expectations/test_expectation_anydata.pks +++ b/test/ut3_user/expectations/test_expectation_anydata.pks @@ -206,6 +206,9 @@ create or replace package test_expectation_anydata is --%test ( Failure of comparing nesting objects ) procedure failure_nesting_objects; + + --%test ( Failure of comparing double nested objects ) + procedure failure_double_nested_objects; end; / From 5e983a847abc93b9de02965270b48a0fb328a1bf Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Wed, 26 Jan 2022 01:24:36 +0000 Subject: [PATCH 0819/1096] Fixing test object name as its too large for 11gR2 (31 char) --- test/ut3_tester_helper/test_dummy_double_nested_object.tps | 6 +++--- test/ut3_user/expectations/test_expectation_anydata.pkb | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/ut3_tester_helper/test_dummy_double_nested_object.tps b/test/ut3_tester_helper/test_dummy_double_nested_object.tps index bfd29447c..8f74f7ecb 100644 --- a/test/ut3_tester_helper/test_dummy_double_nested_object.tps +++ b/test/ut3_tester_helper/test_dummy_double_nested_object.tps @@ -1,14 +1,14 @@ declare l_exists integer; begin - select count(1) into l_exists from user_types where type_name = 'TEST_DUMMY_DOUBLE_NESTED_OBJECT'; + select count(1) into l_exists from user_types where type_name = 'TEST_DUMMY_DOUBLE_NESTED_OBJ'; if l_exists > 0 then - execute immediate 'drop type test_dummy_double_nested_object force'; + execute immediate 'drop type test_dummy_double_nested_obj force'; end if; end; / -create or replace type test_dummy_double_nested_object as object ( +create or replace type test_dummy_double_nested_obj as object ( first_double_nested_obj test_dummy_nested_object, "Value" varchar2(30) ) diff --git a/test/ut3_user/expectations/test_expectation_anydata.pkb b/test/ut3_user/expectations/test_expectation_anydata.pkb index 5c76226da..521734223 100644 --- a/test/ut3_user/expectations/test_expectation_anydata.pkb +++ b/test/ut3_user/expectations/test_expectation_anydata.pkb @@ -1016,10 +1016,10 @@ Rows: [ 60 differences, showing first 20 ] l_expected_message varchar2(32767); begin --Arrange - g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_double_nested_object(ut3_tester_helper.test_dummy_nested_object(ut3_tester_helper.test_dummy_object(1, 'A', '0'),ut3_tester_helper.test_dummy_object(1, 'B', '0') ),'Test')); - g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_double_nested_object(ut3_tester_helper.test_dummy_nested_object(ut3_tester_helper.test_dummy_object(1, 'A', '0'),ut3_tester_helper.test_dummy_object(1, 'C', '0') ),'Test')); + g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_double_nested_obj(ut3_tester_helper.test_dummy_nested_object(ut3_tester_helper.test_dummy_object(1, 'A', '0'),ut3_tester_helper.test_dummy_object(1, 'B', '0') ),'Test')); + g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_double_nested_obj(ut3_tester_helper.test_dummy_nested_object(ut3_tester_helper.test_dummy_object(1, 'A', '0'),ut3_tester_helper.test_dummy_object(1, 'C', '0') ),'Test')); --Act - l_expected_message := q'[%Actual: ut3_tester_helper.test_dummy_double_nested_object was expected to equal: ut3_tester_helper.test_dummy_double_nested_object + l_expected_message := q'[%Actual: ut3_tester_helper.test_dummy_double_nested_obj was expected to equal: ut3_tester_helper.test_dummy_double_nested_obj %Diff: %Rows: [ 1 differences ] %Row No. 1 - Actual: 1A01C0 From 3c3d32055457a9c4ab36e61cc79179a536e2f8aa Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Wed, 26 Jan 2022 10:46:41 +0000 Subject: [PATCH 0820/1096] Fixing issue when a hash was tried to be generated on the null value from XML extract causing to fail. Please see #1098 Resolve a situation where a more than two levels of nesting were causing ambiguity on the column name for hash. E.g. Was taking into hash consideration only parent. --- source/core/ut_utils.pkb | 6 ++++-- source/expectations/data_values/ut_cursor_column.tpb | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 6073eb50b..51e07a6b5 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -882,12 +882,14 @@ create or replace package body ut_utils is function get_hash(a_data raw, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash is begin - return dbms_crypto.hash(a_data, a_hash_type); + --We cannot run hash on null + return case when a_data is null then null else dbms_crypto.hash(a_data, a_hash_type) end; end; function get_hash(a_data clob, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash is begin - return dbms_crypto.hash(a_data, a_hash_type); + --We cannot run hash on null + return case when a_data is null then null else dbms_crypto.hash(a_data, a_hash_type) end; end; function qualified_sql_name(a_name varchar2) return varchar2 is diff --git a/source/expectations/data_values/ut_cursor_column.tpb b/source/expectations/data_values/ut_cursor_column.tpb index 13b1b3158..3c39c2464 100644 --- a/source/expectations/data_values/ut_cursor_column.tpb +++ b/source/expectations/data_values/ut_cursor_column.tpb @@ -28,12 +28,13 @@ create or replace type body ut_cursor_column as a_access_path||'/'||self.xml_valid_name end; --Access path used for XMLTABLE query self.filter_path := '/'||self.access_path; --Filter path will differ from access path in anydata type + --Transformed name needs to be build on full access path to avoid ambiguity when there is 3 or more levels of nesting. self.transformed_name := case when length(self.xml_valid_name) > 30 then - '"'||ut_compound_data_helper.get_fixed_size_hash(self.parent_name||self.xml_valid_name)||'"' + '"'||ut_compound_data_helper.get_fixed_size_hash(self.access_path)||'"' when self.parent_name is null then '"'||self.xml_valid_name||'"' else - '"'||ut_compound_data_helper.get_fixed_size_hash(self.parent_name||self.xml_valid_name)||'"' + '"'||ut_compound_data_helper.get_fixed_size_hash(self.access_path)||'"' end; --when is nestd we need to hash name to make sure we dont exceed 30 char self.column_type := a_col_type; --column type e.g. user_defined , varchar2 self.column_schema := a_col_schema_name; -- schema name From 14b0b8d7953c62fe4ca94d78d830e20c41c82c13 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Wed, 26 Jan 2022 22:41:28 +0000 Subject: [PATCH 0821/1096] Fixing issue when a collection nested inside object was failing due to fact that there was no name for collection columns as part of cursor only data type. Added extra tests. --- .../data_values/ut_cursor_column.tpb | 7 +- test/install_ut3_tester_helper.sql | 2 + .../test_dummy_nested_object_list.tps | 14 +++ .../test_dummy_object_list.tps | 10 ++ .../test_nested_tab_varray.tps | 14 +++ .../expectations/test_expectation_anydata.pkb | 99 +++++++++++++++++++ .../expectations/test_expectation_anydata.pks | 19 +++- 7 files changed, 162 insertions(+), 3 deletions(-) create mode 100644 test/ut3_tester_helper/test_dummy_nested_object_list.tps create mode 100644 test/ut3_tester_helper/test_nested_tab_varray.tps diff --git a/source/expectations/data_values/ut_cursor_column.tpb b/source/expectations/data_values/ut_cursor_column.tpb index 3c39c2464..a9fb6b0f4 100644 --- a/source/expectations/data_values/ut_cursor_column.tpb +++ b/source/expectations/data_values/ut_cursor_column.tpb @@ -14,8 +14,11 @@ create or replace type body ut_cursor_column as self.column_len := a_col_max_len; --length of column self.column_precision := a_col_precision; self.column_scale := a_col_scale; - self.column_name := TRIM( BOTH '''' FROM a_col_name); --name of the column self.column_type_name := coalesce(a_col_type_name,a_col_type); --type name e.g. test_dummy_object or varchar2 + self.column_name := case when a_col_name is null and a_collection = 1 then + self.column_type_name + else TRIM( BOTH '''' FROM a_col_name) + end; --name of the column, however in nested object for collection name is not defined in cursor. self.xml_valid_name := ut_utils.get_valid_xml_name(self.column_name); self.display_path := case when a_access_path is null then self.column_name @@ -25,7 +28,7 @@ create or replace type body ut_cursor_column as self.access_path := case when a_access_path is null then self.xml_valid_name else - a_access_path||'/'||self.xml_valid_name + a_access_path||'/'||self.xml_valid_name end; --Access path used for XMLTABLE query self.filter_path := '/'||self.access_path; --Filter path will differ from access path in anydata type --Transformed name needs to be build on full access path to avoid ambiguity when there is 3 or more levels of nesting. diff --git a/test/install_ut3_tester_helper.sql b/test/install_ut3_tester_helper.sql index c31b670bb..b2e0d57c4 100644 --- a/test/install_ut3_tester_helper.sql +++ b/test/install_ut3_tester_helper.sql @@ -9,8 +9,10 @@ alter session set plsql_optimize_level=0; @@ut3_tester_helper/test_dummy_nested_object.tps @@ut3_tester_helper/test_dummy_double_nested_object.tps @@ut3_tester_helper/test_dummy_object_list.tps +@@ut3_tester_helper/test_dummy_nested_object_list.tps @@ut3_tester_helper/test_tab_varchar2.tps @@ut3_tester_helper/test_tab_varray.tps +@@ut3_tester_helper/test_nested_tab_varray.tps @@ut3_tester_helper/test_dummy_number.tps @@ut3_tester_helper/ut_test_table.sql @@ut3_tester_helper/test_event_object.tps diff --git a/test/ut3_tester_helper/test_dummy_nested_object_list.tps b/test/ut3_tester_helper/test_dummy_nested_object_list.tps new file mode 100644 index 000000000..ca2c0d6df --- /dev/null +++ b/test/ut3_tester_helper/test_dummy_nested_object_list.tps @@ -0,0 +1,14 @@ +declare + l_exists integer; +begin + select count(1) into l_exists from user_types where type_name = 'TEST_DUMMY_NESTED_OBJECT_LIST'; + if l_exists > 0 then + execute immediate 'drop type test_dummy_nested_object_list force'; + end if; +end; +/ + +create or replace type test_dummy_nested_object_list as object ( + first_nested_obj test_dummy_object_list +) +/ \ No newline at end of file diff --git a/test/ut3_tester_helper/test_dummy_object_list.tps b/test/ut3_tester_helper/test_dummy_object_list.tps index 67bba558e..849974da1 100644 --- a/test/ut3_tester_helper/test_dummy_object_list.tps +++ b/test/ut3_tester_helper/test_dummy_object_list.tps @@ -1,2 +1,12 @@ +declare + l_exists integer; +begin + select count(1) into l_exists from user_types where type_name = 'TEST_DUMMY_OBJECT_LIST'; + if l_exists > 0 then + execute immediate 'drop type test_dummy_object_list force'; + end if; +end; +/ + create or replace type test_dummy_object_list as table of test_dummy_object / diff --git a/test/ut3_tester_helper/test_nested_tab_varray.tps b/test/ut3_tester_helper/test_nested_tab_varray.tps new file mode 100644 index 000000000..9f58d090e --- /dev/null +++ b/test/ut3_tester_helper/test_nested_tab_varray.tps @@ -0,0 +1,14 @@ +declare + l_exists integer; +begin + select count(1) into l_exists from user_types where type_name = 'TEST_NESTED_TAB_VARRAY'; + if l_exists > 0 then + execute immediate 'drop type test_nested_tab_varray force'; + end if; +end; +/ + +create or replace type test_nested_tab_varray as object ( + n_varray t_varray +) +/ diff --git a/test/ut3_user/expectations/test_expectation_anydata.pkb b/test/ut3_user/expectations/test_expectation_anydata.pkb index 521734223..bd57a860a 100644 --- a/test/ut3_user/expectations/test_expectation_anydata.pkb +++ b/test/ut3_user/expectations/test_expectation_anydata.pkb @@ -1029,6 +1029,105 @@ Rows: [ 60 differences, showing first 20 ] --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; + + procedure success_nesting_objects is + begin + --Arrange + g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_nested_object(ut3_tester_helper.test_dummy_object(1, 'A', '0'),ut3_tester_helper.test_dummy_object(1, 'B', '0') )); + g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_nested_object(ut3_tester_helper.test_dummy_object(1, 'A', '0'),ut3_tester_helper.test_dummy_object(1, 'B', '0') )); + --Act + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + procedure success_double_nested_objects is + begin + --Arrange + g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_double_nested_obj(ut3_tester_helper.test_dummy_nested_object(ut3_tester_helper.test_dummy_object(1, 'A', '0'),ut3_tester_helper.test_dummy_object(1, 'B', '0') ),'Test')); + g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_double_nested_obj(ut3_tester_helper.test_dummy_nested_object(ut3_tester_helper.test_dummy_object(1, 'A', '0'),ut3_tester_helper.test_dummy_object(1, 'B', '0') ),'Test')); + --Act + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure failure_nested_object_list is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + l_actual ut3_tester_helper.test_dummy_object_list; + l_expected ut3_tester_helper.test_dummy_object_list; + begin + --Arrange + select ut3_tester_helper.test_dummy_object( rownum + 1, 'Something '||rownum, rownum) + bulk collect into l_actual + from dual connect by level <=2 + order by rownum desc; + select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) + bulk collect into l_expected + from dual connect by level <=2 + order by rownum desc; + --Arrange + g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_nested_object_list(l_actual)); + g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_nested_object_list(l_expected)); + --Act + l_expected_message := q'[%Actual: ut3_tester_helper.test_dummy_nested_object_list was expected to equal: ut3_tester_helper.test_dummy_nested_object_list +%Diff: +%Rows: [ 1 differences ] +%Row No. 1 - Actual: 2Something 221Something 11 +%Row No. 1 - Expected: 3Something 222Something 11]'; + ut3_develop.ut.expect(g_test_actual).to_equal(g_test_expected); + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure success_nested_object_list is + l_actual ut3_tester_helper.test_dummy_object_list; + l_expected ut3_tester_helper.test_dummy_object_list; + begin + --Arrange + select ut3_tester_helper.test_dummy_object( rownum , 'Something '||rownum, rownum) + bulk collect into l_actual + from dual connect by level <=2 + order by rownum desc; + select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) + bulk collect into l_expected + from dual connect by level <=2 + order by rownum desc; + --Arrange + g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_nested_object_list(l_actual)); + g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_nested_object_list(l_expected)); + --Act + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure nested_varray_same_data is + begin + --Arrange + g_test_expected := anydata.convertObject( ut3_tester_helper.test_nested_tab_varray(ut3_tester_helper.t_varray(1)) ); + g_test_actual := anydata.convertObject( ut3_tester_helper.test_nested_tab_varray(ut3_tester_helper.t_varray(1)) ); + --Act + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure nested_varray_diff_data is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Arrange + g_test_expected := anydata.convertObject( ut3_tester_helper.test_nested_tab_varray(ut3_tester_helper.t_varray(1)) ); + g_test_actual := anydata.convertObject( ut3_tester_helper.test_nested_tab_varray(ut3_tester_helper.t_varray(2)) ); + --Act + ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ); + l_expected_message := q'[%Actual: ut3_tester_helper.test_nested_tab_varray was expected to equal: ut3_tester_helper.test_nested_tab_varray +%Diff: +%Rows: [ 1 differences ] +%Row No. 1 - Actual: 2 +%Row No. 1 - Expected: 1]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; end; / \ No newline at end of file diff --git a/test/ut3_user/expectations/test_expectation_anydata.pks b/test/ut3_user/expectations/test_expectation_anydata.pks index 4b24a2ad9..a073c0701 100644 --- a/test/ut3_user/expectations/test_expectation_anydata.pks +++ b/test/ut3_user/expectations/test_expectation_anydata.pks @@ -204,11 +204,28 @@ create or replace package test_expectation_anydata is --%test ( Empty Array not equal array with space ) procedure arr_empty_nqua_arr_e_unord; - --%test ( Failure of comparing nesting objects ) + --%test ( Failure of comparing nested objects ) procedure failure_nesting_objects; --%test ( Failure of comparing double nested objects ) procedure failure_double_nested_objects; + --%test ( Success of comparing nested objects ) + procedure success_nesting_objects; + + --%test ( Success of comparing double nested objects ) + procedure success_double_nested_objects; + + --%test ( Failure of comparing nested object list ) + procedure failure_nested_object_list; + + --%test ( Success of comparing nested object list ) + procedure success_nested_object_list; + + --%test(Nested VARRAYS with same data) + procedure nested_varray_same_data; + + --%test(Nested VARRAYS with different data) + procedure nested_varray_diff_data; end; / From 85b2349a947bafdaf316a152186fb537f3244d44 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Wed, 26 Jan 2022 23:06:12 +0000 Subject: [PATCH 0822/1096] Removing empty line from code. --- source/expectations/data_values/ut_compound_data_helper.pkb | 1 - 1 file changed, 1 deletion(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 71c1b9ee2..6d21aaa21 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -575,7 +575,6 @@ create or replace package body ut_compound_data_helper is xmlelement( name "ROW", a_diff_tab(idx).act_item_data), a_diff_tab(idx).act_data_id, xmlelement( name "ROW", a_diff_tab(idx).exp_item_data), a_diff_tab(idx).exp_data_id, a_diff_tab(idx).item_no, a_diff_tab(idx).dup_no); - exception when ut_utils.ex_failure_for_all then raise_application_error(ut_utils.gc_dml_for_all,'Failure to insert a diff tmp data.'); From bc6da9840cdbcf9c3ffa7a140e3a2b98a5aeec93 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Thu, 27 Jan 2022 16:17:12 +0000 Subject: [PATCH 0823/1096] Adding option to remove a cache for annotations whenever package is modified and annotation removed from procedure. --- .../ut_annotation_cache_manager.pkb | 15 +-- test/ut3_tester/core/test_suite_manager.pkb | 94 +++++++++++++++++++ test/ut3_tester/core/test_suite_manager.pks | 16 ++++ 3 files changed, 119 insertions(+), 6 deletions(-) diff --git a/source/core/annotations/ut_annotation_cache_manager.pkb b/source/core/annotations/ut_annotation_cache_manager.pkb index 17129c316..e1131b3bd 100644 --- a/source/core/annotations/ut_annotation_cache_manager.pkb +++ b/source/core/annotations/ut_annotation_cache_manager.pkb @@ -32,7 +32,7 @@ create or replace package body ut_annotation_cache_manager as end if; -- if not in trigger, or object has annotations - if ora_sysevent is null or a_object.annotations is not null and a_object.annotations.count > 0 then + if a_object.annotations is not null and a_object.annotations.count > 0 then update /*+ no_parallel */ ut_annotation_cache_info i set i.parse_time = l_timestamp @@ -47,16 +47,19 @@ create or replace package body ut_annotation_cache_manager as values (ut_annotation_cache_seq.nextval, a_object.object_owner, a_object.object_name, a_object.object_type, l_timestamp) returning cache_id into l_cache_id; end if; + + delete /*+ no_parallel */ from ut_annotation_cache c where cache_id = l_cache_id; - end if; - - delete /*+ no_parallel */ from ut_annotation_cache c where cache_id = l_cache_id; - - if a_object.annotations is not null and a_object.annotations.count > 0 then insert /*+ no_parallel */ into ut_annotation_cache (cache_id, annotation_position, annotation_name, annotation_text, subobject_name) select /*+ no_parallel */ l_cache_id, a.position, a.name, a.text, a.subobject_name from table(a_object.annotations) a; + elsif a_object.annotations is null or a_object.annotations.count = 0 then + ut_annotation_cache_manager.remove_from_cache( + ut_annotation_objs_cache_info( + ut_annotation_obj_cache_info(a_object.object_owner, a_object.object_name, a_object.object_type, 'Y', null) + ) + ); end if; commit; end; diff --git a/test/ut3_tester/core/test_suite_manager.pkb b/test/ut3_tester/core/test_suite_manager.pkb index 11cc7acfe..c8b4a9453 100644 --- a/test/ut3_tester/core/test_suite_manager.pkb +++ b/test/ut3_tester/core/test_suite_manager.pkb @@ -1466,5 +1466,99 @@ end;]'; ut.expect(SQLCODE).to_equal(ut3_develop.ut_utils.gc_value_too_large); end; + procedure setup_remove_annot_test is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package test_removing_annotation as + --%suite + + --%test + procedure test1; + + --%test + procedure test2; + +end;]'; + end; + + procedure remove_annot_from_test is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package test_removing_annotation as + + procedure test1; + + procedure test2; + +end;]'; + end; + + procedure rem_one_annot_test is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package test_removing_annotation as + --%suite + + procedure test1; + + --%test + procedure test2; + +end;]'; + execute immediate q'[create or replace package body test_removing_annotation as + + procedure test1 is + begin + ut.expect(1).to_equal(1); + end; + + procedure test2 is + begin + ut.expect(1).to_equal(1); + end; + +end;]'; + end; + + procedure clean_remove_annot_test is + pragma autonomous_transaction; + begin + execute immediate 'drop package test_removing_annotation'; + end; + + procedure test_rem_cache_on_create is + l_test_report ut3_develop.ut_varchar2_list; + begin + + select * bulk collect into l_test_report from table(ut3_develop.ut.run(sys_context('USERENV', 'CURRENT_USER')||'.test_removing_annotation')); + + -- drop all tests + remove_annot_from_test; + + begin + select * bulk collect into l_test_report from table(ut3_develop.ut.run(sys_context('USERENV', 'CURRENT_USER') || '.test_removing_annotation')); + exception + when others then + ut.expect(sqlerrm).to_be_like('%ORA-20204: Suite package ut3_tester.test_removing_annotation does not exist%'); + end; + + end; + + procedure test_rem_cache_on_crt_anno is + l_test_report ut3_develop.ut_varchar2_list; + l_results clob; + begin + + select * bulk collect into l_test_report from table(ut3_develop.ut.run(sys_context('USERENV', 'CURRENT_USER')||'.test_removing_annotation')); + + -- drop single test + rem_one_annot_test; + ut3_develop.ut.run(sys_context('USERENV', 'CURRENT_USER')|| '.test_removing_annotation',a_reporter => ut3_develop.ut_documentation_reporter() ); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%' ); + + end; + end test_suite_manager; / diff --git a/test/ut3_tester/core/test_suite_manager.pks b/test/ut3_tester/core/test_suite_manager.pks index 90b589b9e..154df9ca6 100644 --- a/test/ut3_tester/core/test_suite_manager.pks +++ b/test/ut3_tester/core/test_suite_manager.pks @@ -170,5 +170,21 @@ create or replace package test_suite_manager is procedure create_dummy_long_test_package; procedure drop_dummy_long_test_package; + + procedure setup_remove_annot_test; + procedure clean_remove_annot_test; + + --%test(Remove cache on package create or replace when all annotations removed) + --%beforetest(setup_remove_annot_test) + --%aftertest(clean_remove_annot_test) + procedure test_rem_cache_on_create; + + + --%test(Remove cache on package create or replace when single annotation removed) + --%beforetest(setup_remove_annot_test) + --%aftertest(clean_remove_annot_test) + procedure test_rem_cache_on_crt_anno; + + end test_suite_manager; / From e3580375ff1d61e24fa345e5661e25cd3ae88e5c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 28 Jan 2022 18:55:40 +0000 Subject: [PATCH 0824/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index c9ec27342..232846f54 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 9f271da68..b664a9b7a 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 307dd5a8b..83d1dc066 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 78de8ab87..16164a94b 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 000fcd906..be6b10a3e 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 8b1c1ef22..38498b481 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index e2927918f..1b9b4faee 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 38234be6c..999a4ea9d 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 753fc1b5b..6e921c40c 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 784fa65ac..830384f2b 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index debcd6025..c07f3782e 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index d2ac915a5..087fd91c1 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 87e3dba0c..aa869dc1e 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index d41111356..d805dd936 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 67a424c6d..81cc1c5c8 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 9fb53e98f..e441c8ce6 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 92581f966..bee737ae7 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3719--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 6073eb50b..81a610a0c 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -788,7 +788,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.12.3719-develop + * secion v3.1.12.3731-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 85f621842..c7d20ad0c 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.12.3719-develop'; + gc_version constant varchar2(50) := 'v3.1.12.3731-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 590fb38c589b661a07488310d6a1113f031bbe6c Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 28 Jan 2022 23:20:04 +0200 Subject: [PATCH 0825/1096] Improving test stability (flaky tests) --- test/ut3_tester_helper/coverage_helper.pkb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ut3_tester_helper/coverage_helper.pkb b/test/ut3_tester_helper/coverage_helper.pkb index e9385d7d9..0abe10a4f 100644 --- a/test/ut3_tester_helper/coverage_helper.pkb +++ b/test/ut3_tester_helper/coverage_helper.pkb @@ -173,7 +173,7 @@ create or replace package body coverage_helper is auto_drop => TRUE, comments => 'one-time-job' ); - while (l_status is null or l_status not in ('SUCCEEDED','FAILED')) and i < 30 loop + while (l_status is null or l_status not in ('SUCCEEDED','FAILED')) and i < 150 loop l_status := get_job_status( l_job_name, l_timestamp ); sleep(0.1); i := i + 1; From 5e2642ae2d0b8304bc8132a1015aaa08cf07e1ab Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 28 Jan 2022 23:23:12 +0200 Subject: [PATCH 0826/1096] Removing reference to ut3_develop schema. Added sql-injection check. --- source/expectations/matchers/ut_be_within_helper.pkb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/expectations/matchers/ut_be_within_helper.pkb b/source/expectations/matchers/ut_be_within_helper.pkb index aecaf7179..87fb2940b 100644 --- a/source/expectations/matchers/ut_be_within_helper.pkb +++ b/source/expectations/matchers/ut_be_within_helper.pkb @@ -26,13 +26,13 @@ create or replace package body ut_be_within_helper as :result := case when - treat(:a_value_1 as ut3_develop.]'||a_value_1.self_type||q'[).data_value + treat(:a_value_1 as ]'||dbms_assert.sql_object_name(a_value_1.self_type)||q'[).data_value between - treat(:a_value_2 as ut3_develop.]'||a_value_2.self_type||q'[).data_value - - treat(:a_distance as ut3_develop.]'||a_distance.self_type||q'[).data_value + treat(:a_value_2 as ]'||dbms_assert.sql_object_name(a_value_2.self_type)||q'[).data_value + - treat(:a_distance as ]'||dbms_assert.sql_object_name(a_distance.self_type)||q'[).data_value and - treat(:a_value_2 as ut3_develop.]'||a_value_2.self_type||q'[).data_value - + treat(:a_distance as ut3_develop.]'||a_distance.self_type||q'[).data_value + treat(:a_value_2 as ]'||dbms_assert.sql_object_name(a_value_2.self_type)||q'[).data_value + + treat(:a_distance as ]'||dbms_assert.sql_object_name(a_distance.self_type)||q'[).data_value then 1 else 0 end; From ed06e332faedcc77b1e67250faca258e11c7b4b3 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 28 Jan 2022 23:42:01 +0200 Subject: [PATCH 0827/1096] Relaxed sql-injection check to work with 11g2 --- source/expectations/matchers/ut_be_within_helper.pkb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/expectations/matchers/ut_be_within_helper.pkb b/source/expectations/matchers/ut_be_within_helper.pkb index 87fb2940b..14444ea3e 100644 --- a/source/expectations/matchers/ut_be_within_helper.pkb +++ b/source/expectations/matchers/ut_be_within_helper.pkb @@ -26,13 +26,13 @@ create or replace package body ut_be_within_helper as :result := case when - treat(:a_value_1 as ]'||dbms_assert.sql_object_name(a_value_1.self_type)||q'[).data_value + treat(:a_value_1 as ]'||dbms_assert.simple_sql_name(a_value_1.self_type)||q'[).data_value between - treat(:a_value_2 as ]'||dbms_assert.sql_object_name(a_value_2.self_type)||q'[).data_value - - treat(:a_distance as ]'||dbms_assert.sql_object_name(a_distance.self_type)||q'[).data_value + treat(:a_value_2 as ]'||dbms_assert.simple_sql_name(a_value_2.self_type)||q'[).data_value + - treat(:a_distance as ]'||dbms_assert.simple_sql_name(a_distance.self_type)||q'[).data_value and - treat(:a_value_2 as ]'||dbms_assert.sql_object_name(a_value_2.self_type)||q'[).data_value - + treat(:a_distance as ]'||dbms_assert.sql_object_name(a_distance.self_type)||q'[).data_value + treat(:a_value_2 as ]'||dbms_assert.simple_sql_name(a_value_2.self_type)||q'[).data_value + + treat(:a_distance as ]'||dbms_assert.simple_sql_name(a_distance.self_type)||q'[).data_value then 1 else 0 end; From c14a3adb30358b19e6e8ef67c32bc37fadfdfb09 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Fri, 28 Jan 2022 22:49:03 +0000 Subject: [PATCH 0828/1096] Address PR comments --- .../expectations/test_expectation_anydata.pks | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/ut3_user/expectations/test_expectation_anydata.pks b/test/ut3_user/expectations/test_expectation_anydata.pks index a073c0701..b11353ebb 100644 --- a/test/ut3_user/expectations/test_expectation_anydata.pks +++ b/test/ut3_user/expectations/test_expectation_anydata.pks @@ -204,28 +204,28 @@ create or replace package test_expectation_anydata is --%test ( Empty Array not equal array with space ) procedure arr_empty_nqua_arr_e_unord; - --%test ( Failure of comparing nested objects ) + --%test ( Reports diff between not equal nested objects ) procedure failure_nesting_objects; - --%test ( Failure of comparing double nested objects ) + --%test ( Reports diff between not equal double nested objects ) procedure failure_double_nested_objects; - --%test ( Success of comparing nested objects ) + --%test (Reports success when comparing identical nested object ) procedure success_nesting_objects; - --%test ( Success of comparing double nested objects ) + --%test ( Reports success when comparing identical double nested object ) procedure success_double_nested_objects; - --%test ( Failure of comparing nested object list ) + --%test ( Reports diff between two not equal nested object list ) procedure failure_nested_object_list; - --%test ( Success of comparing nested object list ) + --%test ( Reports success when comparing identical nested object list ) procedure success_nested_object_list; - --%test(Nested VARRAYS with same data) + --%test ( Reports success when comparing identical nested VARRAYS ) procedure nested_varray_same_data; - --%test(Nested VARRAYS with different data) + --%test ( Reports diff between two not equal nested VARRAYS ) procedure nested_varray_diff_data; end; / From a2cf02e38f3ad38384b938da0521bb669954320b Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sat, 29 Jan 2022 19:09:34 +0000 Subject: [PATCH 0829/1096] Creating regression test scenario for fixed issue 1098 and supporting test types. --- test/install_ut3_tester_helper.sql | 2 + .../test_dummy_dble_nest_lst_obj.tps | 17 ++++ .../test_dummy_double_nested_list.tps | 13 +++ .../test_dummy_nested_object_list.tps | 3 +- .../expectations/test_expectation_anydata.pkb | 90 ++++++++++++++++++- .../expectations/test_expectation_anydata.pks | 8 +- 6 files changed, 127 insertions(+), 6 deletions(-) create mode 100644 test/ut3_tester_helper/test_dummy_dble_nest_lst_obj.tps create mode 100644 test/ut3_tester_helper/test_dummy_double_nested_list.tps diff --git a/test/install_ut3_tester_helper.sql b/test/install_ut3_tester_helper.sql index b2e0d57c4..d9aacdf36 100644 --- a/test/install_ut3_tester_helper.sql +++ b/test/install_ut3_tester_helper.sql @@ -10,6 +10,8 @@ alter session set plsql_optimize_level=0; @@ut3_tester_helper/test_dummy_double_nested_object.tps @@ut3_tester_helper/test_dummy_object_list.tps @@ut3_tester_helper/test_dummy_nested_object_list.tps +@@ut3_tester_helper/test_dummy_double_nested_list.tps +@@ut3_tester_helper/test_dummy_dble_nest_lst_obj.tps @@ut3_tester_helper/test_tab_varchar2.tps @@ut3_tester_helper/test_tab_varray.tps @@ut3_tester_helper/test_nested_tab_varray.tps diff --git a/test/ut3_tester_helper/test_dummy_dble_nest_lst_obj.tps b/test/ut3_tester_helper/test_dummy_dble_nest_lst_obj.tps new file mode 100644 index 000000000..5134fef21 --- /dev/null +++ b/test/ut3_tester_helper/test_dummy_dble_nest_lst_obj.tps @@ -0,0 +1,17 @@ +declare + l_exists integer; +begin + select count(1) into l_exists from user_types where type_name = 'TEST_DUMMY_DBLE_NEST_LST_OBJ'; + if l_exists > 0 then + execute immediate 'drop type test_dummy_dble_nest_lst_obj force'; + end if; +end; +/ + +CREATE TYPE test_dummy_dble_nest_lst_obj AS OBJECT +( + some_number_id NUMBER, + some_name VARCHAR2 (25), + dummy_list test_dummy_double_nested_list +); +/ \ No newline at end of file diff --git a/test/ut3_tester_helper/test_dummy_double_nested_list.tps b/test/ut3_tester_helper/test_dummy_double_nested_list.tps new file mode 100644 index 000000000..625462824 --- /dev/null +++ b/test/ut3_tester_helper/test_dummy_double_nested_list.tps @@ -0,0 +1,13 @@ +declare + l_exists integer; +begin + select count(1) into l_exists from user_types where type_name = 'TEST_DUMMY_DOUBLE_NESTED_LIST'; + if l_exists > 0 then + execute immediate 'drop type test_dummy_double_nested_list force'; + end if; +end; +/ + +CREATE TYPE test_dummy_double_nested_list AS + TABLE OF test_dummy_nested_object_list; +/ diff --git a/test/ut3_tester_helper/test_dummy_nested_object_list.tps b/test/ut3_tester_helper/test_dummy_nested_object_list.tps index ca2c0d6df..fd47b55bd 100644 --- a/test/ut3_tester_helper/test_dummy_nested_object_list.tps +++ b/test/ut3_tester_helper/test_dummy_nested_object_list.tps @@ -9,6 +9,7 @@ end; / create or replace type test_dummy_nested_object_list as object ( - first_nested_obj test_dummy_object_list + first_nested_obj test_dummy_object_list, + somename varchar2(50) ) / \ No newline at end of file diff --git a/test/ut3_user/expectations/test_expectation_anydata.pkb b/test/ut3_user/expectations/test_expectation_anydata.pkb index bd57a860a..d364afca0 100644 --- a/test/ut3_user/expectations/test_expectation_anydata.pkb +++ b/test/ut3_user/expectations/test_expectation_anydata.pkb @@ -1066,8 +1066,8 @@ Rows: [ 60 differences, showing first 20 ] from dual connect by level <=2 order by rownum desc; --Arrange - g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_nested_object_list(l_actual)); - g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_nested_object_list(l_expected)); + g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_nested_object_list(l_actual,'Test')); + g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_nested_object_list(l_expected,'Test')); --Act l_expected_message := q'[%Actual: ut3_tester_helper.test_dummy_nested_object_list was expected to equal: ut3_tester_helper.test_dummy_nested_object_list %Diff: @@ -1094,8 +1094,8 @@ Rows: [ 60 differences, showing first 20 ] from dual connect by level <=2 order by rownum desc; --Arrange - g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_nested_object_list(l_actual)); - g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_nested_object_list(l_expected)); + g_test_expected := anydata.convertObject( ut3_tester_helper.test_dummy_nested_object_list(l_actual,'Test')); + g_test_actual := anydata.convertObject( ut3_tester_helper.test_dummy_nested_object_list(l_expected,'Test')); --Act ut3_develop.ut.expect( g_test_actual ).to_equal( g_test_expected ); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); @@ -1129,5 +1129,87 @@ Rows: [ 60 differences, showing first 20 ] --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; + + procedure user_defined_type_null_issue_1098 is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + l_actual ut3_tester_helper.test_dummy_dble_nest_lst_obj; + l_expected ut3_tester_helper.test_dummy_dble_nest_lst_obj; + begin + l_actual:= ut3_tester_helper.test_dummy_dble_nest_lst_obj( + 1, 'North America', + ut3_tester_helper.test_dummy_double_nested_list ( + ut3_tester_helper.test_dummy_nested_object_list( + ut3_tester_helper.test_dummy_object_list( + ut3_tester_helper.test_dummy_object(1, '100 Broadway', 02474), + ut3_tester_helper.test_dummy_object(2, '200 Indian School Rd', 85016) + ),'USA' + ), + ut3_tester_helper.test_dummy_nested_object_list( + ut3_tester_helper.test_dummy_object_list(),'USA' + ) + ) + ); + + l_expected := ut3_tester_helper.test_dummy_dble_nest_lst_obj( + 1, + 'North America', + ut3_tester_helper.test_dummy_double_nested_list(ut3_tester_helper.test_dummy_nested_object_list(ut3_tester_helper.test_dummy_object_list( + ut3_tester_helper.test_dummy_object(1, '100 Broadway', 02474), + ut3_tester_helper.test_dummy_object(2, '200 Indian School Rd', 85016) + ), 'USA')) + ); + ut3_develop.ut.expect(anydata.convertObject(l_actual)).to_equal(anydata.convertObject(l_expected)).unordered; + + l_expected_message := q'[%Actual: ut3_tester_helper.test_dummy_dble_nest_lst_obj was expected to equal: ut3_tester_helper.test_dummy_dble_nest_lst_obj +%Diff: +%Rows: [ 2 differences ] +%Extra: 1North America1100 Broadway24742200 Indian School Rd85016USAUSA +%Missing: 1North America1100 Broadway24742200 Indian School Rd85016USA]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + + end; + + procedure complex_nested_object_success is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + l_actual ut3_tester_helper.test_dummy_dble_nest_lst_obj; + l_expected ut3_tester_helper.test_dummy_dble_nest_lst_obj; + begin + l_actual:= ut3_tester_helper.test_dummy_dble_nest_lst_obj( + 1, 'North America', + ut3_tester_helper.test_dummy_double_nested_list ( + ut3_tester_helper.test_dummy_nested_object_list( + ut3_tester_helper.test_dummy_object_list( + ut3_tester_helper.test_dummy_object(1, '100 Broadway', 02474), + ut3_tester_helper.test_dummy_object(2, '200 Indian School Rd', 85016) + ),'USA' + ), + ut3_tester_helper.test_dummy_nested_object_list( + ut3_tester_helper.test_dummy_object_list(),'USA' + ) + ) + ); + + l_expected := ut3_tester_helper.test_dummy_dble_nest_lst_obj( + 1, 'North America', + ut3_tester_helper.test_dummy_double_nested_list ( + ut3_tester_helper.test_dummy_nested_object_list( + ut3_tester_helper.test_dummy_object_list( + ut3_tester_helper.test_dummy_object(1, '100 Broadway', 02474), + ut3_tester_helper.test_dummy_object(2, '200 Indian School Rd', 85016) + ),'USA' + ), + ut3_tester_helper.test_dummy_nested_object_list( + ut3_tester_helper.test_dummy_object_list(),'USA' + ) + ) + ); + ut3_develop.ut.expect(anydata.convertObject(l_actual)).to_equal(anydata.convertObject(l_expected)).unordered; + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + + end; end; / \ No newline at end of file diff --git a/test/ut3_user/expectations/test_expectation_anydata.pks b/test/ut3_user/expectations/test_expectation_anydata.pks index b11353ebb..c954eed49 100644 --- a/test/ut3_user/expectations/test_expectation_anydata.pks +++ b/test/ut3_user/expectations/test_expectation_anydata.pks @@ -226,6 +226,12 @@ create or replace package test_expectation_anydata is procedure nested_varray_same_data; --%test ( Reports diff between two not equal nested VARRAYS ) - procedure nested_varray_diff_data; + procedure nested_varray_diff_data; + + --%test ( Comparision won't fail on user_defined type that is null as per issue 1098 ) + procedure user_defined_type_null_issue_1098; + + --%test ( Reports success when comparing complex nested objects ) + procedure complex_nested_object_success; end; / From b11e799c3f9f329c05befa5087c0d89c7f60bf25 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sat, 29 Jan 2022 19:20:07 +0000 Subject: [PATCH 0830/1096] Fixing an 11g limit on size of the procedure of 30. --- test/ut3_user/expectations/test_expectation_anydata.pkb | 2 +- test/ut3_user/expectations/test_expectation_anydata.pks | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/ut3_user/expectations/test_expectation_anydata.pkb b/test/ut3_user/expectations/test_expectation_anydata.pkb index d364afca0..98938c107 100644 --- a/test/ut3_user/expectations/test_expectation_anydata.pkb +++ b/test/ut3_user/expectations/test_expectation_anydata.pkb @@ -1130,7 +1130,7 @@ Rows: [ 60 differences, showing first 20 ] ut.expect(l_actual_message).to_be_like(l_expected_message); end; - procedure user_defined_type_null_issue_1098 is + procedure user_def_type_null_issue_1098 is l_actual_message varchar2(32767); l_expected_message varchar2(32767); l_actual ut3_tester_helper.test_dummy_dble_nest_lst_obj; diff --git a/test/ut3_user/expectations/test_expectation_anydata.pks b/test/ut3_user/expectations/test_expectation_anydata.pks index c954eed49..2abb48b7f 100644 --- a/test/ut3_user/expectations/test_expectation_anydata.pks +++ b/test/ut3_user/expectations/test_expectation_anydata.pks @@ -229,7 +229,7 @@ create or replace package test_expectation_anydata is procedure nested_varray_diff_data; --%test ( Comparision won't fail on user_defined type that is null as per issue 1098 ) - procedure user_defined_type_null_issue_1098; + procedure user_def_type_null_issue_1098; --%test ( Reports success when comparing complex nested objects ) procedure complex_nested_object_success; From f091985ca0cd69eec255ac24919165c9cf6b215d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 29 Jan 2022 21:14:56 +0000 Subject: [PATCH 0831/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 232846f54..9d2c26e0b 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index b664a9b7a..67cb1a976 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 83d1dc066..92889b02c 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 16164a94b..33db70018 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index be6b10a3e..a459f259a 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 38498b481..340952f7e 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 1b9b4faee..cade9ac97 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 999a4ea9d..270f07a8e 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 6e921c40c..a6037b4e2 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 830384f2b..11cad317f 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index c07f3782e..488fbeea9 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 087fd91c1..7610573e5 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index aa869dc1e..548a2cb5a 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index d805dd936..88a724257 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 81cc1c5c8..dae47df96 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index e441c8ce6..6731fada4 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index bee737ae7..cde37ed6d 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 5b8a57b3b..af3b3498e 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -788,7 +788,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.12.3731-develop + * secion v3.1.12.3742-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index c7d20ad0c..5e0b7820e 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.12.3731-develop'; + gc_version constant varchar2(50) := 'v3.1.12.3742-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 38f3cbc1ff2ea87627e6744481715fa6571ad36a Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 31 Jan 2022 01:48:12 +0200 Subject: [PATCH 0832/1096] Fixed issues with comparison of dates×tamps using interval year-month Improved error handling for null values and incompatible datatypes Improved handling of negative dates (BC) Improved reporting of interval text value Improved datatypes to handle large&small precissions for timestamps --- docs/userguide/expectations.md | 38 ++--- source/core/ut_utils.pkb | 33 +++-- source/core/ut_utils.pks | 6 +- .../data_values/ut_data_value.tps | 1 + .../data_values/ut_data_value_blob.tpb | 1 + .../data_values/ut_data_value_boolean.tpb | 1 + .../data_values/ut_data_value_clob.tpb | 1 + .../data_values/ut_data_value_date.tpb | 1 + .../data_values/ut_data_value_dsinterval.tpb | 1 + .../data_values/ut_data_value_number.tpb | 1 + .../data_values/ut_data_value_refcursor.tpb | 1 + .../data_values/ut_data_value_timestamp.tpb | 1 + .../ut_data_value_timestamp_ltz.tpb | 1 + .../ut_data_value_timestamp_tz.tpb | 1 + .../data_values/ut_data_value_varchar2.tpb | 1 + .../data_values/ut_data_value_xmltype.tpb | 1 + .../data_values/ut_data_value_yminterval.tpb | 1 + source/expectations/matchers/ut_be_within.tpb | 46 +++--- source/expectations/matchers/ut_be_within.tps | 6 +- .../matchers/ut_be_within_helper.pkb | 33 +++-- .../matchers/ut_be_within_helper.pks | 2 +- .../matchers/ut_be_within_pct.tpb | 13 +- .../matchers/ut_be_within_pct.tps | 5 +- test/ut3_tester/core/test_ut_utils.pkb | 8 +- test/ut3_user/api/test_ut_run.pkb | 42 +++--- .../expectations/binary/test_to_be_within.pkb | 136 +++++++++++++++++- .../expectations/binary/test_to_be_within.pks | 29 +++- .../binary/test_to_be_within_pct.pkb | 2 +- .../reporters/test_debug_reporter.pkb | 2 +- 29 files changed, 312 insertions(+), 103 deletions(-) diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 851eb9955..833235c24 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -316,25 +316,25 @@ Since NULL is neither *true* nor *false*, both expectations will report failure. The matrix below illustrates the data types supported by different matchers. -| Matcher | blob | boolean | clob | date | number | timestamp | timestamp
with
timezone | timestamp
with
local
timezone | varchar2 | interval
year
to
month | interval
day
to
second | cursor | nested
table
/ varray | object | json | -| :---------------------: | :--: | :-----: | :--: | :--: | :----: | :-------: | :---------------------------: | :------------------------------------: | :------: | :-----------------------------: | :-----------------------------: | :----: | :-------------------------: | :----: | :--: | -| **be_not_null** | X | X | X | X | X | X | X | X | X | X | X | X | X | X | X | -| **be_null** | X | X | X | X | X | X | X | X | X | X | X | X | X | X | X | -| **be_false** | | X | | | | | | | | | | | | | | -| **be_true** | | X | | | | | | | | | | | | | | -| **be_greater_than** | | | | X | X | X | X | X | | X | X | | | | | -| **be_greater_or_equal** | | | | X | X | X | X | X | | X | X | | | | | -| **be_less_or_equal** | | | | X | X | X | X | X | | X | X | | | | | -| **be_less_than** | | | | X | X | X | X | X | | X | X | | | | | -| **be_between** | | | | X | X | X | X | X | X | X | X | | | | | -| **equal** | X | X | X | X | X | X | X | X | X | X | X | X | X | X | X | -| **contain** | | | | | | | | | | | | X | X | X | | -| **match** | | | X | | | | | | X | | | | | | | -| **be_like** | | | X | | | | | | X | | | | | | | -| **be_empty** | X | | X | | | | | | | | | X | X | | X | -| **have_count** | | | | | | | | | | | | X | X | | X | -| **be_within().of_()** | | | | x | x | | | | | | | | | | | -| **be_within_pct().of()**| | | | | x | | | | | | | | | | | +| Matcher | blob | boolean | clob | date | number | timestamp | timestamp
with
timezone | timestamp
with
local
timezone | varchar2 | interval
year
to
month | interval
day
to
second | cursor | nested
table
/ varray | object | json | +| :-----------------------: | :--: | :-----: | :--: | :--: | :----: | :-------: | :---------------------------: | :------------------------------------: | :------: | :-----------------------------: | :-----------------------------: | :----: | :-------------------------: | :----: | :--: | +| **be_not_null** | X | X | X | X | X | X | X | X | X | X | X | X | X | X | X | +| **be_null** | X | X | X | X | X | X | X | X | X | X | X | X | X | X | X | +| **be_false** | | X | | | | | | | | | | | | | | +| **be_true** | | X | | | | | | | | | | | | | | +| **be_greater_than** | | | | X | X | X | X | X | | X | X | | | | | +| **be_greater_or_equal** | | | | X | X | X | X | X | | X | X | | | | | +| **be_less_or_equal** | | | | X | X | X | X | X | | X | X | | | | | +| **be_less_than** | | | | X | X | X | X | X | | X | X | | | | | +| **be_between** | | | | X | X | X | X | X | X | X | X | | | | | +| **equal** | X | X | X | X | X | X | X | X | X | X | X | X | X | X | X | +| **contain** | | | | | | | | | | | | X | X | X | | +| **match** | | | X | | | | | | X | | | | | | | +| **be_like** | | | X | | | | | | X | | | | | | | +| **be_empty** | X | | X | | | | | | | | | X | X | | X | +| **have_count** | | | | | | | | | | | | X | X | | X | +| **be_within().of_()** | | | | x | x | | | | | | | | | | | +| **be_within_pct().of_()** | | | | | x | | | | | | | | | | | # Expecting exceptions diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 1c1943f1d..655b20d3d 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -919,12 +919,20 @@ create or replace package body ut_utils is when l_minute > 1 then ' '||l_minute ||' minutes' end || case - when l_second = 1 then ' '||l_second ||' second' - when l_second > 1 then ' '||l_second ||' seconds' - end; - return trim(leading ' ' from l_result); + when l_second > 1 then ' '||l_second ||' seconds' + when l_second = 1 then ' '||l_second ||' second' + when l_second > 0 then ' '||l_second ||' seconds' + end; + l_result := + case + when a_interval is null then 'NULL' + when l_result is null then '0 seconds' + else ltrim(l_result,' ') + end; + + return l_result; end; - + function interval_to_text(a_interval yminterval_unconstrained) return varchar2 is l_year varchar2(4) := extract(year from a_interval); l_month varchar2(20) := extract(month from a_interval); @@ -935,10 +943,17 @@ create or replace package body ut_utils is when l_year > 1 then l_year ||' years' end || case - when l_month = 1 then ' '||l_month ||' month' - when l_month > 1 then ' '||l_month ||' months' - end; - return trim(leading ' ' from l_result); + when l_month > 1 then ' '||l_month ||' months' + when l_month = 1 then ' '||l_month ||' month' + end; + l_result := + case + when a_interval is null then 'NULL' + when l_result is null then '0 months' + else ltrim(l_result,' ') + end; + + return l_result; end; diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 228500396..4c8b14e3d 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -127,9 +127,9 @@ create or replace package ut_utils authid definer is gc_more_data_string constant varchar2(5) := '[...]'; gc_more_data_string_len constant integer := length( gc_more_data_string ); gc_number_format constant varchar2(100) := 'TM9'; - gc_date_format constant varchar2(100) := 'yyyy-mm-dd"T"hh24:mi:ss'; - gc_timestamp_format constant varchar2(100) := 'yyyy-mm-dd"T"hh24:mi:ssxff'; - gc_timestamp_tz_format constant varchar2(100) := 'yyyy-mm-dd"T"hh24:mi:ssxff tzh:tzm'; + gc_date_format constant varchar2(100) := 'syyyy-mm-dd"T"hh24:mi:ss'; + gc_timestamp_format constant varchar2(100) := 'syyyy-mm-dd"T"hh24:mi:ssxff'; + gc_timestamp_tz_format constant varchar2(100) := 'syyyy-mm-dd"T"hh24:mi:ssxff tzh:tzm'; gc_null_string constant varchar2(4) := 'NULL'; gc_empty_string constant varchar2(5) := 'EMPTY'; diff --git a/source/expectations/data_values/ut_data_value.tps b/source/expectations/data_values/ut_data_value.tps index 6864bc52e..beda3d911 100644 --- a/source/expectations/data_values/ut_data_value.tps +++ b/source/expectations/data_values/ut_data_value.tps @@ -16,6 +16,7 @@ create or replace type ut_data_value force authid current_user as object ( limitations under the License. */ data_type varchar2(250 char), + data_type_plsql varchar2(250 char), self_type varchar2(250 char), not instantiable member function is_null return boolean, not instantiable member function to_string return varchar2, diff --git a/source/expectations/data_values/ut_data_value_blob.tpb b/source/expectations/data_values/ut_data_value_blob.tpb index a7b5fbeca..e145a8d4f 100644 --- a/source/expectations/data_values/ut_data_value_blob.tpb +++ b/source/expectations/data_values/ut_data_value_blob.tpb @@ -21,6 +21,7 @@ create or replace type body ut_data_value_blob as self.data_value := a_value; self.self_type := $$plsql_unit; self.data_type := 'blob'; + self.data_type_plsql := 'blob'; return; end; diff --git a/source/expectations/data_values/ut_data_value_boolean.tpb b/source/expectations/data_values/ut_data_value_boolean.tpb index 798222e30..867c3c19c 100644 --- a/source/expectations/data_values/ut_data_value_boolean.tpb +++ b/source/expectations/data_values/ut_data_value_boolean.tpb @@ -21,6 +21,7 @@ create or replace type body ut_data_value_boolean as self.data_value := ut_utils.boolean_to_int(a_value); self.self_type := $$plsql_unit; self.data_type := 'boolean'; + self.data_type_plsql := 'boolean'; return; end; diff --git a/source/expectations/data_values/ut_data_value_clob.tpb b/source/expectations/data_values/ut_data_value_clob.tpb index 9cfe9b283..f8a53a035 100644 --- a/source/expectations/data_values/ut_data_value_clob.tpb +++ b/source/expectations/data_values/ut_data_value_clob.tpb @@ -21,6 +21,7 @@ create or replace type body ut_data_value_clob as self.data_value := a_value; self.self_type := $$plsql_unit; self.data_type := 'clob'; + self.data_type_plsql := 'clob'; return; end; diff --git a/source/expectations/data_values/ut_data_value_date.tpb b/source/expectations/data_values/ut_data_value_date.tpb index 5b5b1d387..20424d193 100644 --- a/source/expectations/data_values/ut_data_value_date.tpb +++ b/source/expectations/data_values/ut_data_value_date.tpb @@ -21,6 +21,7 @@ create or replace type body ut_data_value_date as self.data_value := a_value; self.self_type := $$plsql_unit; self.data_type := 'date'; + self.data_type_plsql := 'date'; return; end; diff --git a/source/expectations/data_values/ut_data_value_dsinterval.tpb b/source/expectations/data_values/ut_data_value_dsinterval.tpb index fd6b03234..026d4970f 100644 --- a/source/expectations/data_values/ut_data_value_dsinterval.tpb +++ b/source/expectations/data_values/ut_data_value_dsinterval.tpb @@ -21,6 +21,7 @@ create or replace type body ut_data_value_dsinterval as self.data_value := a_value; self.self_type := $$plsql_unit; self.data_type := 'interval day to second'; + self.data_type_plsql := 'dsinterval_unconstrained'; return; end; diff --git a/source/expectations/data_values/ut_data_value_number.tpb b/source/expectations/data_values/ut_data_value_number.tpb index c5c4fe2c3..382e6e9aa 100644 --- a/source/expectations/data_values/ut_data_value_number.tpb +++ b/source/expectations/data_values/ut_data_value_number.tpb @@ -21,6 +21,7 @@ create or replace type body ut_data_value_number as self.data_value := a_value; self.self_type := $$plsql_unit; self.data_type := 'number'; + self.data_type_plsql := 'number'; return; end; diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb index 2715614c4..a4f0cf7a0 100644 --- a/source/expectations/data_values/ut_data_value_refcursor.tpb +++ b/source/expectations/data_values/ut_data_value_refcursor.tpb @@ -81,6 +81,7 @@ create or replace type body ut_data_value_refcursor as self.self_type := $$plsql_unit; self.data_id := sys_guid(); self.data_type := 'refcursor'; + self.data_type_plsql := 'sys_refcursor'; self.compound_type := 'refcursor'; self.extract_path := '/*'; ut_compound_data_helper.cleanup_diff; diff --git a/source/expectations/data_values/ut_data_value_timestamp.tpb b/source/expectations/data_values/ut_data_value_timestamp.tpb index 79facae4a..318f799a3 100644 --- a/source/expectations/data_values/ut_data_value_timestamp.tpb +++ b/source/expectations/data_values/ut_data_value_timestamp.tpb @@ -21,6 +21,7 @@ create or replace type body ut_data_value_timestamp as self.data_value := a_value; self.self_type := $$plsql_unit; self.data_type := 'timestamp'; + self.data_type_plsql := 'timestamp_unconstrained'; return; end; diff --git a/source/expectations/data_values/ut_data_value_timestamp_ltz.tpb b/source/expectations/data_values/ut_data_value_timestamp_ltz.tpb index f2c5cddbd..6127de5f1 100644 --- a/source/expectations/data_values/ut_data_value_timestamp_ltz.tpb +++ b/source/expectations/data_values/ut_data_value_timestamp_ltz.tpb @@ -21,6 +21,7 @@ create or replace type body ut_data_value_timestamp_ltz as self.data_value := a_value; self.self_type := $$plsql_unit; self.data_type := 'timestamp with local time zone'; + self.data_type_plsql := 'timestamp_ltz_unconstrained'; return; end; diff --git a/source/expectations/data_values/ut_data_value_timestamp_tz.tpb b/source/expectations/data_values/ut_data_value_timestamp_tz.tpb index 0991e9e9f..d5d5cdd13 100644 --- a/source/expectations/data_values/ut_data_value_timestamp_tz.tpb +++ b/source/expectations/data_values/ut_data_value_timestamp_tz.tpb @@ -21,6 +21,7 @@ create or replace type body ut_data_value_timestamp_tz as self.data_value := a_value; self.self_type := $$plsql_unit; self.data_type := 'timestamp with time zone'; + self.data_type_plsql := 'timestamp_tz_unconstrained'; return; end; diff --git a/source/expectations/data_values/ut_data_value_varchar2.tpb b/source/expectations/data_values/ut_data_value_varchar2.tpb index 307ca583d..d04398697 100644 --- a/source/expectations/data_values/ut_data_value_varchar2.tpb +++ b/source/expectations/data_values/ut_data_value_varchar2.tpb @@ -21,6 +21,7 @@ create or replace type body ut_data_value_varchar2 as self.data_value := a_value; self.self_type := $$plsql_unit; self.data_type := 'varchar2'; + self.data_type_plsql := 'varchar2(32767)'; return; end; diff --git a/source/expectations/data_values/ut_data_value_xmltype.tpb b/source/expectations/data_values/ut_data_value_xmltype.tpb index d17896492..4b21a8937 100644 --- a/source/expectations/data_values/ut_data_value_xmltype.tpb +++ b/source/expectations/data_values/ut_data_value_xmltype.tpb @@ -21,6 +21,7 @@ create or replace type body ut_data_value_xmltype as self.data_value := a_value; self.self_type := $$plsql_unit; self.data_type := 'xmltype'; + self.data_type_plsql := 'xmltype'; return; end; diff --git a/source/expectations/data_values/ut_data_value_yminterval.tpb b/source/expectations/data_values/ut_data_value_yminterval.tpb index df4a46a5c..a3a1e7a2f 100644 --- a/source/expectations/data_values/ut_data_value_yminterval.tpb +++ b/source/expectations/data_values/ut_data_value_yminterval.tpb @@ -21,6 +21,7 @@ create or replace type body ut_data_value_yminterval as self.data_value := a_value; self.self_type := $$plsql_unit; self.data_type := 'interval year to month'; + self.data_type_plsql := 'yminterval_unconstrained'; return; end; diff --git a/source/expectations/matchers/ut_be_within.tpb b/source/expectations/matchers/ut_be_within.tpb index c411c4f61..e2aa792d0 100644 --- a/source/expectations/matchers/ut_be_within.tpb +++ b/source/expectations/matchers/ut_be_within.tpb @@ -39,9 +39,9 @@ create or replace type body ut_be_within as begin l_result.expected := ut_data_value_date(a_expected); if l_result.is_negated_flag = 1 then - l_result.expectation.not_to(l_result ); + l_result.expectation.not_to(l_result); else - l_result.expectation.to_(l_result ); + l_result.expectation.to_(l_result); end if; end; @@ -51,33 +51,33 @@ create or replace type body ut_be_within as l_result.expected := ut_data_value_date(a_expected); return l_result; end; - - member procedure of_(self in ut_be_within, a_expected timestamp) is + + member procedure of_(self in ut_be_within, a_expected timestamp_unconstrained) is l_result ut_be_within := self; begin l_result.expected := ut_data_value_timestamp(a_expected); if l_result.is_negated_flag = 1 then - l_result.expectation.not_to(l_result ); + l_result.expectation.not_to(l_result); else - l_result.expectation.to_(l_result ); + l_result.expectation.to_(l_result); end if; end; - member function of_(self in ut_be_within, a_expected timestamp) return ut_be_within is + member function of_(self in ut_be_within, a_expected timestamp_unconstrained) return ut_be_within is l_result ut_be_within := self; begin l_result.expected := ut_data_value_timestamp(a_expected); return l_result; - end; + end; member procedure of_(self in ut_be_within, a_expected timestamp_tz_unconstrained) is l_result ut_be_within := self; begin l_result.expected := ut_data_value_timestamp_tz(a_expected); if l_result.is_negated_flag = 1 then - l_result.expectation.not_to(l_result ); + l_result.expectation.not_to(l_result); else - l_result.expectation.to_(l_result ); + l_result.expectation.to_(l_result); end if; end; @@ -86,16 +86,16 @@ create or replace type body ut_be_within as begin l_result.expected := ut_data_value_timestamp_tz(a_expected); return l_result; - end; - + end; + member procedure of_(self in ut_be_within, a_expected timestamp_ltz_unconstrained) is l_result ut_be_within := self; begin l_result.expected := ut_data_value_timestamp_ltz(a_expected); if l_result.is_negated_flag = 1 then - l_result.expectation.not_to(l_result ); + l_result.expectation.not_to(l_result); else - l_result.expectation.to_(l_result ); + l_result.expectation.to_(l_result); end if; end; @@ -104,17 +104,19 @@ create or replace type body ut_be_within as begin l_result.expected := ut_data_value_timestamp_ltz(a_expected); return l_result; - end; - + end; + overriding member function run_matcher(self in out nocopy ut_be_within, a_actual ut_data_value) return boolean is l_result boolean; begin - if self.expected.data_type = a_actual.data_type then - if self.expected is of (ut_data_value_date, ut_data_value_number, ut_data_value_timestamp, ut_data_value_timestamp_tz, ut_data_value_timestamp_ltz) then - l_result := ut_be_within_helper.values_within_abs_distance(self.expected, a_actual, self.distance_from_expected) ; - else - l_result := (self as ut_matcher).run_matcher(a_actual); - end if; + if self.expected.data_type = a_actual.data_type + and ( + self.expected is of (ut_data_value_date, ut_data_value_timestamp, ut_data_value_timestamp_tz, ut_data_value_timestamp_ltz) + and self.distance_from_expected is of (ut_data_value_yminterval, ut_data_value_dsinterval) + or self.expected is of (ut_data_value_number) and self.distance_from_expected is of (ut_data_value_number) + ) + then + l_result := ut_be_within_helper.values_within_abs_distance( a_actual, self.expected, self.distance_from_expected) ; else l_result := (self as ut_matcher).run_matcher(a_actual); end if; diff --git a/source/expectations/matchers/ut_be_within.tps b/source/expectations/matchers/ut_be_within.tps index 0b14bce44..576f9ff37 100644 --- a/source/expectations/matchers/ut_be_within.tps +++ b/source/expectations/matchers/ut_be_within.tps @@ -1,4 +1,4 @@ -create or replace type ut_be_within under ut_be_within_pct( +create or replace type ut_be_within force under ut_be_within_pct( /* utPLSQL - Version 3 Copyright 2016 - 2019 utPLSQL Project @@ -22,8 +22,8 @@ create or replace type ut_be_within under ut_be_within_pct( constructor function ut_be_within(self in out nocopy ut_be_within, a_distance_from_expected yminterval_unconstrained) return self as result, member procedure of_(self in ut_be_within, a_expected date), member function of_(self in ut_be_within, a_expected date) return ut_be_within, - member procedure of_(self in ut_be_within, a_expected timestamp), - member function of_(self in ut_be_within, a_expected timestamp) return ut_be_within, + member procedure of_(self in ut_be_within, a_expected timestamp_unconstrained), + member function of_(self in ut_be_within, a_expected timestamp_unconstrained) return ut_be_within, member procedure of_(self in ut_be_within, a_expected timestamp_tz_unconstrained ), member function of_(self in ut_be_within, a_expected timestamp_tz_unconstrained) return ut_be_within, member procedure of_(self in ut_be_within, a_expected timestamp_ltz_unconstrained), diff --git a/source/expectations/matchers/ut_be_within_helper.pkb b/source/expectations/matchers/ut_be_within_helper.pkb index 14444ea3e..5dd82baa2 100644 --- a/source/expectations/matchers/ut_be_within_helper.pkb +++ b/source/expectations/matchers/ut_be_within_helper.pkb @@ -17,28 +17,37 @@ create or replace package body ut_be_within_helper as */ function values_within_abs_distance( - a_value_1 ut_data_value, a_value_2 ut_data_value, a_distance ut_data_value + a_actual ut_data_value, a_expected ut_data_value, a_distance ut_data_value ) return boolean is l_result integer; + l_YM_conversion varchar2(50) := case when a_distance is of (ut_data_value_yminterval) then ' year to month ' end; + l_formula varchar2(4000); + l_code varchar2(4000); begin - execute immediate q'[ + l_formula := + case + when a_actual is of (ut_data_value_date) + then '( cast(greatest(l_actual, l_expected) as timestamp) - cast(least(l_actual, l_expected) as timestamp) ) '||l_YM_conversion||' <= l_distance' + else '( greatest(l_actual, l_expected) - least(l_actual, l_expected) ) '||l_YM_conversion||' <= l_distance' + end; + l_code := + q'[ + declare + l_actual ]'||dbms_assert.simple_sql_name(a_actual.data_type_plsql)|| q'[ := treat(:a_actual as ]'||dbms_assert.simple_sql_name(a_actual.self_type)||q'[).data_value; + l_expected ]'||dbms_assert.simple_sql_name(a_expected.data_type_plsql)||q'[ := treat(:a_expected as ]'||dbms_assert.simple_sql_name(a_expected.self_type)||q'[).data_value; + l_distance ]'||dbms_assert.simple_sql_name(a_distance.data_type_plsql)||q'[ := treat(:a_distance as ]'||dbms_assert.simple_sql_name(a_distance.self_type)||q'[).data_value; begin :result := case - when - treat(:a_value_1 as ]'||dbms_assert.simple_sql_name(a_value_1.self_type)||q'[).data_value - between - treat(:a_value_2 as ]'||dbms_assert.simple_sql_name(a_value_2.self_type)||q'[).data_value - - treat(:a_distance as ]'||dbms_assert.simple_sql_name(a_distance.self_type)||q'[).data_value - and - treat(:a_value_2 as ]'||dbms_assert.simple_sql_name(a_value_2.self_type)||q'[).data_value - + treat(:a_distance as ]'||dbms_assert.simple_sql_name(a_distance.self_type)||q'[).data_value + when + ]'||l_formula||q'[ then 1 else 0 end; end; - ]' - using out l_result, a_value_1, a_value_2, a_distance; + ]'; + execute immediate l_code + using a_actual, a_expected, a_distance, out l_result; return l_result > 0; end; diff --git a/source/expectations/matchers/ut_be_within_helper.pks b/source/expectations/matchers/ut_be_within_helper.pks index 0cb146a98..41737cc8f 100644 --- a/source/expectations/matchers/ut_be_within_helper.pks +++ b/source/expectations/matchers/ut_be_within_helper.pks @@ -17,7 +17,7 @@ create or replace package ut_be_within_helper authid definer as */ function values_within_abs_distance( - a_value_1 ut_data_value, a_value_2 ut_data_value, a_distance ut_data_value + a_actual ut_data_value, a_expected ut_data_value, a_distance ut_data_value ) return boolean; end; diff --git a/source/expectations/matchers/ut_be_within_pct.tpb b/source/expectations/matchers/ut_be_within_pct.tpb index bf662c066..fabab2d09 100644 --- a/source/expectations/matchers/ut_be_within_pct.tpb +++ b/source/expectations/matchers/ut_be_within_pct.tpb @@ -33,9 +33,9 @@ create or replace type body ut_be_within_pct as begin l_result.expected := ut_data_value_number(a_expected); if l_result.is_negated_flag = 1 then - l_result.expectation.not_to(l_result ); + l_result.expectation.not_to(l_result); else - l_result.expectation.to_(l_result ); + l_result.expectation.to_(l_result); end if; end; @@ -72,5 +72,14 @@ create or replace type body ut_be_within_pct as return rtrim( (self as ut_matcher).failure_message_when_negated(a_actual), 'pct' ) || self.distance_from_expected.to_string ||' % of '|| expected.to_string_report(); end; + overriding member function error_message(a_actual ut_data_value) return varchar2 is + l_result varchar2(32767); + begin + if ut_utils.int_to_boolean(self.is_errored) then + l_result := 'Matcher '''||self.name()||''' cannot be used to compare Actual ('||a_actual.data_type||') with Expected ('||expected.data_type||') using distance ('||self.distance_from_expected.data_type||').'; + end if; + return l_result; + end; + end; / diff --git a/source/expectations/matchers/ut_be_within_pct.tps b/source/expectations/matchers/ut_be_within_pct.tps index b1c7e4dfc..499e9a2d8 100644 --- a/source/expectations/matchers/ut_be_within_pct.tps +++ b/source/expectations/matchers/ut_be_within_pct.tps @@ -1,4 +1,4 @@ -create or replace type ut_be_within_pct under ut_comparison_matcher( +create or replace type ut_be_within_pct force under ut_comparison_matcher( /* utPLSQL - Version 3 Copyright 2016 - 2019 utPLSQL Project @@ -28,7 +28,8 @@ create or replace type ut_be_within_pct under ut_comparison_matcher( member function of_(self in ut_be_within_pct, a_expected number) return ut_be_within_pct, overriding member function run_matcher(self in out nocopy ut_be_within_pct, a_actual ut_data_value) return boolean, overriding member function failure_message(a_actual ut_data_value) return varchar2, - overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2 + overriding member function failure_message_when_negated(a_actual ut_data_value) return varchar2, + overriding member function error_message(a_actual ut_data_value) return varchar2 ) not final / diff --git a/test/ut3_tester/core/test_ut_utils.pkb b/test/ut3_tester/core/test_ut_utils.pkb index 61bc61a84..4ed718777 100644 --- a/test/ut3_tester/core/test_ut_utils.pkb +++ b/test/ut3_tester/core/test_ut_utils.pkb @@ -159,28 +159,28 @@ end;]' using p_expected_list; procedure to_string_date is l_value date := to_date('2016-12-31 23:59:59', 'yyyy-mm-dd hh24:mi:ss'); - l_expected varchar2(100) := '2016-12-31T23:59:59'; + l_expected varchar2(100) := ' 2016-12-31T23:59:59'; begin ut.expect(ut3_develop.ut_data_value_date(l_value).to_string()).to_equal(l_expected); end; procedure to_string_timestamp is l_value timestamp(9) := to_timestamp('2016-12-31 23:59:59.123456789', 'yyyy-mm-dd hh24:mi:ss.ff'); - l_expected varchar2(100) := '2016-12-31T23:59:59'||gc_delimiter||'123456789'; + l_expected varchar2(100) := ' 2016-12-31T23:59:59'||gc_delimiter||'123456789'; begin ut.expect(ut3_develop.ut_data_value_timestamp(l_value).to_string()).to_equal(l_expected); end; procedure to_string_timestamp_ltz is l_value timestamp(9) with local time zone := to_timestamp('2016-12-31 23:59:59.123456789', 'yyyy-mm-dd hh24:mi:ss.ff'); - l_expected varchar2(100) := '2016-12-31T23:59:59'||gc_delimiter||'123456789'; + l_expected varchar2(100) := ' 2016-12-31T23:59:59'||gc_delimiter||'123456789'; begin ut.expect(ut3_develop.ut_data_value_timestamp_ltz(l_value).to_string()).to_equal(l_expected); end; procedure to_string_timestamp_tz is l_value timestamp(9) with time zone := to_timestamp_tz('2016-12-31 23:59:59.123456789 -8:00', 'yyyy-mm-dd hh24:mi:ss.ff tzh:tzm'); - l_expected varchar2(100) := '2016-12-31T23:59:59'||gc_delimiter||'123456789 -08:00'; + l_expected varchar2(100) := ' 2016-12-31T23:59:59'||gc_delimiter||'123456789 -08:00'; begin ut.expect(ut3_develop.ut_data_value_timestamp_tz(l_value).to_string()).to_equal(l_expected); end; diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index e3af7c5ad..19c69c74e 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -1272,7 +1272,7 @@ Failures:% ||'%BEFORE_SUITE:SUITE_DESCRIPTION=Suite description' ||'%BEFORE_SUITE:SUITE_PACKAGE='||gc_owner||'.check_context' ||'%BEFORE_SUITE:SUITE_PATH=some.suite.path.check_context' - ||'%BEFORE_SUITE:SUITE_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%BEFORE_SUITE:SUITE_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%APPLICATION_INFO:MODULE=utPLSQL' ||'%APPLICATION_INFO:ACTION=check_context' ||'%APPLICATION_INFO:CLIENT_INFO=before_suite%' @@ -1287,14 +1287,14 @@ Failures:% '%BEFORE_CONTEXT:CONTEXT_DESCRIPTION=context description' ||'%BEFORE_CONTEXT:CONTEXT_NAME=some_context' ||'%BEFORE_CONTEXT:CONTEXT_PATH=some.suite.path.check_context.some_context' - ||'%BEFORE_CONTEXT:CONTEXT_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%BEFORE_CONTEXT:CONTEXT_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%BEFORE_CONTEXT:CURRENT_EXECUTABLE_NAME='||gc_owner||'.check_context.before_context' ||'%BEFORE_CONTEXT:CURRENT_EXECUTABLE_TYPE=beforeall' ||'%BEFORE_CONTEXT:RUN_PATHS=check_context' ||'%BEFORE_CONTEXT:SUITE_DESCRIPTION=Suite description' ||'%BEFORE_CONTEXT:SUITE_PACKAGE='||gc_owner||'.check_context' ||'%BEFORE_CONTEXT:SUITE_PATH=some.suite.path.check_context' - ||'%BEFORE_CONTEXT:SUITE_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%BEFORE_CONTEXT:SUITE_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%APPLICATION_INFO:MODULE=utPLSQL' ||'%APPLICATION_INFO:ACTION=check_context' ||'%APPLICATION_INFO:CLIENT_INFO=before_context%' @@ -1308,17 +1308,17 @@ Failures:% '%BEFORE_EACH_TEST:CONTEXT_DESCRIPTION=context description' ||'%BEFORE_EACH_TEST:CONTEXT_NAME=some_context' ||'%BEFORE_EACH_TEST:CONTEXT_PATH=some.suite.path.check_context.some_context' - ||'%BEFORE_EACH_TEST:CONTEXT_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%BEFORE_EACH_TEST:CONTEXT_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%BEFORE_EACH_TEST:CURRENT_EXECUTABLE_NAME='||gc_owner||'.check_context.before_each_test' ||'%BEFORE_EACH_TEST:CURRENT_EXECUTABLE_TYPE=beforeeach' ||'%BEFORE_EACH_TEST:RUN_PATHS=check_context' ||'%BEFORE_EACH_TEST:SUITE_DESCRIPTION=Suite description' ||'%BEFORE_EACH_TEST:SUITE_PACKAGE='||gc_owner||'.check_context' ||'%BEFORE_EACH_TEST:SUITE_PATH=some.suite.path.check_context' - ||'%BEFORE_EACH_TEST:SUITE_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%BEFORE_EACH_TEST:SUITE_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%BEFORE_EACH_TEST:TEST_DESCRIPTION=Some test description' ||'%BEFORE_EACH_TEST:TEST_NAME='||gc_owner||'.check_context.the_test' - ||'%BEFORE_EACH_TEST:TEST_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%BEFORE_EACH_TEST:TEST_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%APPLICATION_INFO:MODULE=utPLSQL' ||'%APPLICATION_INFO:ACTION=check_context' ||'%APPLICATION_INFO:CLIENT_INFO=before_each_test%' @@ -1331,17 +1331,17 @@ Failures:% '%BEFORE_TEST:CONTEXT_DESCRIPTION=context description' ||'%BEFORE_TEST:CONTEXT_NAME=some_context' ||'%BEFORE_TEST:CONTEXT_PATH=some.suite.path.check_context.some_context' - ||'%BEFORE_TEST:CONTEXT_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%BEFORE_TEST:CONTEXT_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%BEFORE_TEST:CURRENT_EXECUTABLE_NAME='||gc_owner||'.check_context.before_test' ||'%BEFORE_TEST:CURRENT_EXECUTABLE_TYPE=beforetest' ||'%BEFORE_TEST:RUN_PATHS=check_context' ||'%BEFORE_TEST:SUITE_DESCRIPTION=Suite description' ||'%BEFORE_TEST:SUITE_PACKAGE='||gc_owner||'.check_context' ||'%BEFORE_TEST:SUITE_PATH=some.suite.path.check_context' - ||'%BEFORE_TEST:SUITE_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%BEFORE_TEST:SUITE_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%BEFORE_TEST:TEST_DESCRIPTION=Some test description' ||'%BEFORE_TEST:TEST_NAME='||gc_owner||'.check_context.the_test' - ||'%BEFORE_TEST:TEST_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%BEFORE_TEST:TEST_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%APPLICATION_INFO:MODULE=utPLSQL' ||'%APPLICATION_INFO:ACTION=check_context' ||'%APPLICATION_INFO:CLIENT_INFO=before_test%' @@ -1354,17 +1354,17 @@ Failures:% '%THE_TEST:CONTEXT_DESCRIPTION=context description' ||'%THE_TEST:CONTEXT_NAME=some_context' ||'%THE_TEST:CONTEXT_PATH=some.suite.path.check_context.some_context' - ||'%THE_TEST:CONTEXT_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%THE_TEST:CONTEXT_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%THE_TEST:CURRENT_EXECUTABLE_NAME='||gc_owner||'.check_context.the_test' ||'%THE_TEST:CURRENT_EXECUTABLE_TYPE=test' ||'%THE_TEST:RUN_PATHS=check_context' ||'%THE_TEST:SUITE_DESCRIPTION=Suite description' ||'%THE_TEST:SUITE_PACKAGE='||gc_owner||'.check_context' ||'%THE_TEST:SUITE_PATH=some.suite.path.check_context' - ||'%THE_TEST:SUITE_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%THE_TEST:SUITE_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%THE_TEST:TEST_DESCRIPTION=Some test description' ||'%THE_TEST:TEST_NAME='||gc_owner||'.check_context.the_test' - ||'%THE_TEST:TEST_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%THE_TEST:TEST_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%APPLICATION_INFO:MODULE=utPLSQL' ||'%APPLICATION_INFO:ACTION=check_context' ||'%APPLICATION_INFO:CLIENT_INFO=the_test%' @@ -1377,17 +1377,17 @@ Failures:% '%AFTER_TEST:CONTEXT_DESCRIPTION=context description' ||'%AFTER_TEST:CONTEXT_NAME=some_context' ||'%AFTER_TEST:CONTEXT_PATH=some.suite.path.check_context.some_context' - ||'%AFTER_TEST:CONTEXT_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%AFTER_TEST:CONTEXT_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%AFTER_TEST:CURRENT_EXECUTABLE_NAME='||gc_owner||'.check_context.after_test' ||'%AFTER_TEST:CURRENT_EXECUTABLE_TYPE=aftertest' ||'%AFTER_TEST:RUN_PATHS=check_context' ||'%AFTER_TEST:SUITE_DESCRIPTION=Suite description' ||'%AFTER_TEST:SUITE_PACKAGE='||gc_owner||'.check_context' ||'%AFTER_TEST:SUITE_PATH=some.suite.path.check_context' - ||'%AFTER_TEST:SUITE_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%AFTER_TEST:SUITE_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%AFTER_TEST:TEST_DESCRIPTION=Some test description' ||'%AFTER_TEST:TEST_NAME='||gc_owner||'.check_context.the_test' - ||'%AFTER_TEST:TEST_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%AFTER_TEST:TEST_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%APPLICATION_INFO:MODULE=utPLSQL' ||'%APPLICATION_INFO:ACTION=check_context' ||'%APPLICATION_INFO:CLIENT_INFO=after_test%' @@ -1400,17 +1400,17 @@ Failures:% '%AFTER_EACH_TEST:CONTEXT_DESCRIPTION=context description' ||'%AFTER_EACH_TEST:CONTEXT_NAME=some_context' ||'%AFTER_EACH_TEST:CONTEXT_PATH=some.suite.path.check_context.some_context' - ||'%AFTER_EACH_TEST:CONTEXT_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%AFTER_EACH_TEST:CONTEXT_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%AFTER_EACH_TEST:CURRENT_EXECUTABLE_NAME='||gc_owner||'.check_context.after_each_test' ||'%AFTER_EACH_TEST:CURRENT_EXECUTABLE_TYPE=aftereach' ||'%AFTER_EACH_TEST:RUN_PATHS=check_context' ||'%AFTER_EACH_TEST:SUITE_DESCRIPTION=Suite description' ||'%AFTER_EACH_TEST:SUITE_PACKAGE='||gc_owner||'.check_context' ||'%AFTER_EACH_TEST:SUITE_PATH=some.suite.path.check_context' - ||'%AFTER_EACH_TEST:SUITE_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%AFTER_EACH_TEST:SUITE_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%AFTER_EACH_TEST:TEST_DESCRIPTION=Some test description' ||'%AFTER_EACH_TEST:TEST_NAME='||gc_owner||'.check_context.the_test' - ||'%AFTER_EACH_TEST:TEST_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%AFTER_EACH_TEST:TEST_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%APPLICATION_INFO:MODULE=utPLSQL' ||'%APPLICATION_INFO:ACTION=check_context' ||'%APPLICATION_INFO:CLIENT_INFO=after_each_test%' @@ -1423,14 +1423,14 @@ Failures:% '%AFTER_CONTEXT:CONTEXT_DESCRIPTION=context description' ||'%AFTER_CONTEXT:CONTEXT_NAME=some_context' ||'%AFTER_CONTEXT:CONTEXT_PATH=some.suite.path.check_context.some_context' - ||'%AFTER_CONTEXT:CONTEXT_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%AFTER_CONTEXT:CONTEXT_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%AFTER_CONTEXT:CURRENT_EXECUTABLE_NAME='||gc_owner||'.check_context.after_context' ||'%AFTER_CONTEXT:CURRENT_EXECUTABLE_TYPE=afterall' ||'%AFTER_CONTEXT:RUN_PATHS=check_context' ||'%AFTER_CONTEXT:SUITE_DESCRIPTION=Suite description' ||'%AFTER_CONTEXT:SUITE_PACKAGE='||gc_owner||'.check_context' ||'%AFTER_CONTEXT:SUITE_PATH=some.suite.path.check_context' - ||'%AFTER_CONTEXT:SUITE_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%AFTER_CONTEXT:SUITE_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%APPLICATION_INFO:MODULE=utPLSQL' ||'%APPLICATION_INFO:ACTION=check_context' ||'%APPLICATION_INFO:CLIENT_INFO=after_context%' @@ -1447,7 +1447,7 @@ Failures:% ||'%AFTER_SUITE:SUITE_DESCRIPTION=Suite description' ||'%AFTER_SUITE:SUITE_PACKAGE='||gc_owner||'.check_context' ||'%AFTER_SUITE:SUITE_PATH=some.suite.path.check_context' - ||'%AFTER_SUITE:SUITE_START_TIME='||to_char(current_timestamp,'yyyy-mm-dd"T"hh24:mi') + ||'%AFTER_SUITE:SUITE_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%APPLICATION_INFO:MODULE=utPLSQL' ||'%APPLICATION_INFO:ACTION=check_context' ||'%APPLICATION_INFO:CLIENT_INFO=after_suite%' diff --git a/test/ut3_user/expectations/binary/test_to_be_within.pkb b/test/ut3_user/expectations/binary/test_to_be_within.pkb index ae6220d2a..5213bd362 100644 --- a/test/ut3_user/expectations/binary/test_to_be_within.pkb +++ b/test/ut3_user/expectations/binary/test_to_be_within.pkb @@ -62,7 +62,13 @@ create or replace package body test_to_be_within is a_matcher_name,a_data_type, a_actual, a_data_type, a_expected, a_distance,a_distance_data_type, a_matcher_end ); - ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + ut.expect + (ut3_tester_helper.main_helper.get_failed_expectations_num + ,be_within_expectation_block( + a_matcher_name,a_data_type, a_actual, a_data_type, a_expected, + a_distance,a_distance_data_type, a_matcher_end + ) + ).to_equal(0); cleanup_expectations; end; @@ -94,6 +100,9 @@ create or replace package body test_to_be_within is test_to_be_within_success('to_( ut3_develop.be_within','date', 'sysdate', 'sysdate+1','''1 0:00:11.333''','interval day to second', ')'); test_to_be_within_success('to_( ut3_develop.be_within','date', 'sysdate', 'sysdate+200','''1-0''','interval year to month', ')'); test_to_be_within_success('to_( ut3_develop.be_within','date', 'sysdate+200', 'sysdate','''1-0''','interval year to month', ')'); + test_to_be_within_success('to_( ut3_develop.be_within','timestamp', q'[TIMESTAMP '2018-08-09 07:00:00']', q'[TIMESTAMP '2017-08-09 07:00:00']','''1-0''','interval year to month', ')'); + test_to_be_within_success('to_( ut3_develop.be_within','timestamp_tz_unconstrained', q'[TIMESTAMP '2017-08-09 07:00:00 -7:00']', q'[TIMESTAMP '2017-08-08 05:59:48.668 -8:00']','''1 0:00:11.333''','interval day to second', ')'); + test_to_be_within_success('to_( ut3_develop.be_within','timestamp_ltz_unconstrained', q'[TIMESTAMP '2017-08-09 07:00:00 -7:00']', q'[TIMESTAMP '2017-08-08 05:59:48.668 -8:00']','''1 0:00:11.333''','interval day to second', ')'); test_to_be_within_fail('not_to_be_within','number', '2', '4','2','number'); test_to_be_within_fail('not_to_be_within','number', '4', '2','2','number'); test_to_be_within_fail('not_to_be_within','date', 'sysdate+1', 'sysdate','''1 0:00:11.333''','interval day to second'); @@ -106,6 +115,9 @@ create or replace package body test_to_be_within is test_to_be_within_fail('not_to( ut3_develop.be_within','date', 'sysdate', 'sysdate+1','''1 0:00:11.333''','interval day to second',')'); test_to_be_within_fail('not_to( ut3_develop.be_within','date', 'sysdate', 'sysdate+200','''1-0''','interval year to month',')'); test_to_be_within_fail('not_to( ut3_develop.be_within','date', 'sysdate+200', 'sysdate','''1-0''','interval year to month',')'); + test_to_be_within_fail('not_to( ut3_develop.be_within','timestamp', q'[TIMESTAMP '2018-08-09 07:00:00']', q'[TIMESTAMP '2017-08-09 07:00:00']','''1-0''','interval year to month', ')'); + test_to_be_within_fail('not_to( ut3_develop.be_within','timestamp_tz_unconstrained', q'[TIMESTAMP '2017-08-09 07:00:00 -7:00']', q'[TIMESTAMP '2017-08-08 05:59:48.668 -8:00']','''1 0:00:11.333''','interval day to second', ')'); + test_to_be_within_fail('not_to( ut3_develop.be_within','timestamp_ltz_unconstrained', q'[TIMESTAMP '2017-08-09 07:00:00 -7:00']', q'[TIMESTAMP '2017-08-08 05:59:48.668 -8:00']','''1 0:00:11.333''','interval day to second', ')'); end; procedure failed_tests is @@ -220,6 +232,126 @@ create or replace package body test_to_be_within is ut.expect(l_actual_message).to_be_like(l_expected_message); end; - + procedure fail_msg_wrong_types is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Act + ut3_develop.ut.expect(sysdate).to_be_within(interval '1' second).of_(systimestamp); + --Assert + l_expected_message := q'[Matcher 'be within' cannot be used to compare Actual (date) with Expected (timestamp with time zone) using distance (interval day to second).]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure null_expected is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Act + ut3_develop.ut.expect(sysdate).to_be_within(interval '1' second).of_(to_date(null)); + --Assert + l_expected_message := q'[Actual: % (date) was expected to be within 1 second of NULL (date)]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure null_actual_and_expected is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Act + ut3_develop.ut.expect(to_date(null)).to_be_within(interval '1' second).of_(to_date(null)); + --Assert + l_expected_message := q'[Actual: NULL (date) was expected to be within 1 second of NULL (date)]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure null_actual is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Act + ut3_develop.ut.expect(to_date(null)).to_be_within(interval '1' second).of_(sysdate); + --Assert + l_expected_message := q'[Actual: NULL (date) was expected to be within 1 second of % (date)]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + + procedure null_distance is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Act + ut3_develop.ut.expect(sysdate).to_be_within(cast(null as interval day to second)).of_(sysdate); + --Assert + l_expected_message := q'[Actual: % (date) was expected to be within NULL of % (date)]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + + procedure invalid_distance_for_number is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Act + ut3_develop.ut.expect(2).to_be_within(interval '1' second).of_(1); + --Assert + l_expected_message := q'[Matcher 'be within' cannot be used to compare Actual (number) with Expected (number) using distance (interval day to second).]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + + procedure invalid_distance_for_timestamp is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Act + ut3_develop.ut.expect(sysdate).to_be_within(1).of_(sysdate); + --Assert + l_expected_message := q'[Matcher 'be within' cannot be used to compare Actual (date) with Expected (date) using distance (number).]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + procedure failure_on_tiny_time_diff is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Act + ut3_develop.ut.expect(timestamp'2022-01-29 23:23:23.000000009').to_be_within(interval '0.000000001' second).of_(timestamp'2022-01-29 23:23:23.000000001'); + --Assert + l_expected_message := q'[Actual: 2022-01-29T23:23:23.000000009 (timestamp) was expected to be within .000000001 seconds of 2022-01-29T23:23:23.000000001 (timestamp)]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + + procedure failure_on_large_years_compare is + l_actual_message varchar2(32767); + l_expected_message varchar2(32767); + begin + --Act + ut3_develop.ut.expect(to_date('-4000-01-01','syyyy-mm-dd')).to_be_within(interval '9990' year).of_(date '9999-12-31'); + --Assert + l_expected_message := q'[Actual: -4000-01-01T00:00:00 (date) was expected to be within 9990 years of 9999-12-31T00:00:00 (date)]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + end; / diff --git a/test/ut3_user/expectations/binary/test_to_be_within.pks b/test/ut3_user/expectations/binary/test_to_be_within.pks index b2f456584..966e9baaf 100644 --- a/test/ut3_user/expectations/binary/test_to_be_within.pks +++ b/test/ut3_user/expectations/binary/test_to_be_within.pks @@ -9,7 +9,7 @@ create or replace package test_to_be_within is --%test(gives success for values within a distance) procedure success_tests; - --%test(gives failure when number is not within distance) + --%test(gives failure when value is not within distance) procedure failed_tests; --%test(returns well formatted failure message when expectation fails) @@ -30,5 +30,32 @@ create or replace package test_to_be_within is --%test(returns well formatted failure message for simple within) procedure fail_msg_when_not_within; + --%test(returns well formatted failure message when comparing different datatypes) + procedure fail_msg_wrong_types; + + --%test(failure on null expected value) + procedure null_expected; + + --%test(failure on null actual value) + procedure null_actual; + + --%test(failure on null expected and actual value) + procedure null_actual_and_expected; + + --%test(failure on null distance value) + procedure null_distance; + + --%test(failure on invalid distance datatype for number expected) + procedure invalid_distance_for_number; + + --%test(failure on invalid distance datatype for timestamp expected) + procedure invalid_distance_for_timestamp; + + --%test(failure on exceeding difference in day second time by nanosecond) + procedure failure_on_tiny_time_diff; + + --%test(failure when comparing very large year difference) + procedure failure_on_large_years_compare; + end; / diff --git a/test/ut3_user/expectations/binary/test_to_be_within_pct.pkb b/test/ut3_user/expectations/binary/test_to_be_within_pct.pkb index a184c3728..d1e71943a 100644 --- a/test/ut3_user/expectations/binary/test_to_be_within_pct.pkb +++ b/test/ut3_user/expectations/binary/test_to_be_within_pct.pkb @@ -171,7 +171,7 @@ create or replace package body test_to_be_within_pct is test_to_be_within_fail( 'to_be_within_pct','date', 'sysdate', 'number','1', '1','number', - 'Actual (date) cannot be compared to Expected (number) using matcher ''be within pct''' + 'Matcher ''be within pct'' cannot be used to compare Actual (date) with Expected (number) using distance (number).' ); end; diff --git a/test/ut3_user/reporters/test_debug_reporter.pkb b/test/ut3_user/reporters/test_debug_reporter.pkb index ed7e14fcf..a022b5af8 100644 --- a/test/ut3_user/reporters/test_debug_reporter.pkb +++ b/test/ut3_user/reporters/test_debug_reporter.pkb @@ -21,7 +21,7 @@ create or replace package body test_debug_reporter as begin l_expected := '\s+' || '(\s+' || - '[0-9\-]+T[0-9:\.]+<\/TIMESTAMP>\s+' || + ' [0-9\-]+T[0-9:\.]+<\/TIMESTAMP>\s+' || '[0-9 \+:\.]+<\/TIME_FROM_START>\s+' || '[0-9 \+:\.]+<\/TIME_FROM_PREVIOUS>\s+' || '\w+<\/EVENT_NAME>\s+' || From 9b8d7f7e889593777ae46c3485d36d7ae3ef4bf9 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Mon, 31 Jan 2022 00:42:59 +0000 Subject: [PATCH 0833/1096] First commit of adding a new 21c json type. --- source/api/ut.pkb | 5 + source/api/ut.pks | 2 + .../data_values/ut_data_value_json.tpb | 7 + .../data_values/ut_data_value_json.tps | 1 + source/expectations/json_objects_specs.sql | 7 +- source/expectations/matchers/ut_equal.tpb | 6 + source/expectations/matchers/ut_equal.tps | 1 + source/expectations/ut_expectation.tpb | 5 + source/expectations/ut_expectation.tps | 1 + source/expectations/ut_expectation_json.tps | 2 +- .../expectations/test_expectations_json.pkb | 174 ++++++++++++++++++ .../expectations/test_expectations_json.pks | 25 ++- 12 files changed, 232 insertions(+), 4 deletions(-) diff --git a/source/api/ut.pkb b/source/api/ut.pkb index 9e3defe16..ee3d85342 100644 --- a/source/api/ut.pkb +++ b/source/api/ut.pkb @@ -98,6 +98,11 @@ create or replace package body ut is return ut_expectation_json(ut_data_value_json(a_actual), a_message); end; + function expect(a_actual in json , a_message varchar2 := null) return ut_expectation_json is + begin + return ut_expectation_json(ut_data_value_json(a_actual), a_message); + end; + procedure fail(a_message in varchar2) is begin ut_expectation_processor.report_failure(a_message); diff --git a/source/api/ut.pks b/source/api/ut.pks index 2cce4e183..df5a8d8e5 100644 --- a/source/api/ut.pks +++ b/source/api/ut.pks @@ -47,6 +47,8 @@ create or replace package ut authid current_user as function expect(a_actual in json_element_t , a_message varchar2 := null) return ut_expectation_json; + function expect(a_actual in json , a_message varchar2 := null) return ut_expectation_json; + procedure fail(a_message in varchar2); function run( diff --git a/source/expectations/data_values/ut_data_value_json.tpb b/source/expectations/data_values/ut_data_value_json.tpb index dfb3275ab..5d7232851 100644 --- a/source/expectations/data_values/ut_data_value_json.tpb +++ b/source/expectations/data_values/ut_data_value_json.tpb @@ -32,6 +32,13 @@ create or replace type body ut_data_value_json as return; end; + constructor function ut_data_value_json(self in out nocopy ut_data_value_json, a_value json) return self as result is + l_value json_element_t := case when a_value is null then cast (null as json_element_t ) else json_element_t.parse(json_query(a_value, '$' returning clob)) end; + begin + init(l_value); + return; + end; + overriding member function is_null return boolean is begin return (ut_utils.int_to_boolean(self.is_data_null)); diff --git a/source/expectations/data_values/ut_data_value_json.tps b/source/expectations/data_values/ut_data_value_json.tps index 135124e64..3b77e54eb 100644 --- a/source/expectations/data_values/ut_data_value_json.tps +++ b/source/expectations/data_values/ut_data_value_json.tps @@ -19,6 +19,7 @@ create or replace type ut_data_value_json under ut_compound_data_value( json_tree ut_json_tree_details, member procedure init (self in out nocopy ut_data_value_json, a_value json_element_t), constructor function ut_data_value_json(self in out nocopy ut_data_value_json, a_value json_element_t) return self as result, + constructor function ut_data_value_json(self in out nocopy ut_data_value_json, a_value json) return self as result, overriding member function is_null return boolean, overriding member function is_empty return boolean, overriding member function to_string return varchar2, diff --git a/source/expectations/json_objects_specs.sql b/source/expectations/json_objects_specs.sql index c0d42e8fb..58877eacd 100644 --- a/source/expectations/json_objects_specs.sql +++ b/source/expectations/json_objects_specs.sql @@ -1,7 +1,12 @@ BEGIN - $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then + $if dbms_db_version.version >= 21 $then dbms_output.put_line('Object exists , dont install'); + $elsif dbms_db_version.version = 12 and dbms_db_version.release >= 2 or ( dbms_db_version.version > 12 and dbms_db_version.version < 21 ) $then + dbms_output.put_line('Installing json structures specs.'); + execute immediate q'[create or replace TYPE JSON FORCE AUTHID CURRENT_USER AS OBJECT( + dummyobjt NUMBER +) NOT FINAL NOT INSTANTIABLE;]'; $else dbms_output.put_line('Installing json structures specs.'); execute immediate q'[create or replace TYPE JSON_Element_T FORCE AUTHID CURRENT_USER AS OBJECT( diff --git a/source/expectations/matchers/ut_equal.tpb b/source/expectations/matchers/ut_equal.tpb index 05caf3b09..1519ede5b 100644 --- a/source/expectations/matchers/ut_equal.tpb +++ b/source/expectations/matchers/ut_equal.tpb @@ -158,6 +158,12 @@ create or replace type body ut_equal as return; end; + constructor function ut_equal(self in out nocopy ut_equal, a_expected json, a_nulls_are_equal boolean := null) return self as result is + begin + init(ut_data_value_json(a_expected), a_nulls_are_equal); + return; + end; + member function include(a_items varchar2) return ut_equal is l_result ut_equal := self; begin diff --git a/source/expectations/matchers/ut_equal.tps b/source/expectations/matchers/ut_equal.tps index eecbe8c1d..f348b39c7 100644 --- a/source/expectations/matchers/ut_equal.tps +++ b/source/expectations/matchers/ut_equal.tps @@ -42,6 +42,7 @@ create or replace type ut_equal force under ut_comparison_matcher( constructor function ut_equal(self in out nocopy ut_equal, a_expected yminterval_unconstrained, a_nulls_are_equal boolean := null) return self as result, constructor function ut_equal(self in out nocopy ut_equal, a_expected dsinterval_unconstrained, a_nulls_are_equal boolean := null) return self as result, constructor function ut_equal(self in out nocopy ut_equal, a_expected json_element_t, a_nulls_are_equal boolean := null) return self as result, + constructor function ut_equal(self in out nocopy ut_equal, a_expected json, a_nulls_are_equal boolean := null) return self as result, member function include(a_items varchar2) return ut_equal, member function include(a_items ut_varchar2_list) return ut_equal, member function exclude(a_items varchar2) return ut_equal, diff --git a/source/expectations/ut_expectation.tpb b/source/expectations/ut_expectation.tpb index dfad630a6..6579e2a00 100644 --- a/source/expectations/ut_expectation.tpb +++ b/source/expectations/ut_expectation.tpb @@ -201,6 +201,11 @@ create or replace type body ut_expectation as self.to_( ut_equal(a_expected, a_nulls_are_equal) ); end; + member procedure to_equal(self in ut_expectation, a_expected json, a_nulls_are_equal boolean := null) is + begin + self.to_( ut_equal(a_expected, a_nulls_are_equal) ); + end; + member procedure not_to_equal(self in ut_expectation, a_expected anydata, a_nulls_are_equal boolean := null) is begin self.not_to( ut_equal(a_expected, a_nulls_are_equal) ); diff --git a/source/expectations/ut_expectation.tps b/source/expectations/ut_expectation.tps index 45d768200..57691d109 100644 --- a/source/expectations/ut_expectation.tps +++ b/source/expectations/ut_expectation.tps @@ -55,6 +55,7 @@ create or replace type ut_expectation authid current_user as object( member procedure to_equal(self in ut_expectation, a_expected yminterval_unconstrained, a_nulls_are_equal boolean := null), member procedure to_equal(self in ut_expectation, a_expected dsinterval_unconstrained, a_nulls_are_equal boolean := null), member procedure to_equal(self in ut_expectation, a_expected json_element_t, a_nulls_are_equal boolean := null), + member procedure to_equal(self in ut_expectation, a_expected json, a_nulls_are_equal boolean := null), member procedure not_to_equal(self in ut_expectation, a_expected anydata, a_nulls_are_equal boolean := null), member procedure not_to_equal(self in ut_expectation, a_expected anydata, a_exclude varchar2, a_nulls_are_equal boolean := null), diff --git a/source/expectations/ut_expectation_json.tps b/source/expectations/ut_expectation_json.tps index f33c6a580..561c5d11f 100644 --- a/source/expectations/ut_expectation_json.tps +++ b/source/expectations/ut_expectation_json.tps @@ -24,4 +24,4 @@ create or replace type ut_expectation_json under ut_expectation( member procedure to_have_count(self in ut_expectation_json, a_expected integer), member procedure not_to_have_count(self in ut_expectation_json, a_expected integer) ) -/ +/ \ No newline at end of file diff --git a/test/ut3_user/expectations/test_expectations_json.pkb b/test/ut3_user/expectations/test_expectations_json.pkb index 9516ecb04..731cbcfd9 100644 --- a/test/ut3_user/expectations/test_expectations_json.pkb +++ b/test/ut3_user/expectations/test_expectations_json.pkb @@ -1608,5 +1608,179 @@ create or replace package body test_expectations_json is end; + procedure success_on_same_data_njson + as + l_actual json; + begin + -- Arrange + l_actual := json(' { + "Actors": [ + { + "name": "Tom Cruise", + "age": 56, + "Born At": "Syracuse, NY", + "Birthdate": "July 3, 1962", + "photo": "https://jsonformatter.org/img/tom-cruise.jpg", + "wife": null, + "weight": 67.5, + "hasChildren": true, + "hasGreyHair": false, + "children": [ + "Suri", + "Isabella Jane", + "Connor" + ] + }, + { + "name": "Robert Downey Jr.", + "age": 53, + "Born At": "New York City, NY", + "Birthdate": "April 4, 1965", + "photo": "https://jsonformatter.org/img/Robert-Downey-Jr.jpg", + "wife": "Susan Downey", + "weight": 77.1, + "hasChildren": true, + "hasGreyHair": false, + "children": [ + "Indio Falconer", + "Avri Roel", + "Exton Elias" + ] + } + ] + }'); + + --Act + ut3_develop.ut.expect( l_actual ).to_equal( l_actual ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure fail_on_diff_data_njson + as + l_expected json; + l_actual json; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + -- Arrange + l_expected := json('{"Aidan Gillen": {"array": ["Game of Thrones","The Wire"],"string": "some string","int": "2","otherint": 4, "aboolean": "true", "boolean": false,"object": {"foo": "bar"}},"Amy Ryan": ["In Treatment","The Wire"],"Annie Fitzgerald": ["True Blood","Big Love","The Sopranos","Oz"],"Anwan Glover": ["Treme","The Wire"],"Alexander Skarsg?rd": ["Generation Kill","True Blood"],"Alice Farmer": ["The Corner","Oz","The Wire"]}'); + l_actual := json('{"Aidan Gillen": {"array": ["Game of Thron\"es","The Wire"],"string": "some string","int": 2,"aboolean": true, "boolean": true,"object": {"foo": "bar","object1": {"new prop1": "new prop value"},"object2": {"new prop1": "new prop value"},"object3": {"new prop1": "new prop value"},"object4": {"new prop1": "new prop value"}}},"Amy Ryan": {"one": "In Treatment","two": "The Wire"},"Annie Fitzgerald": ["Big Love","True Blood"],"Anwan Glover": ["Treme","The Wire"],"Alexander Skarsgard": ["Generation Kill","True Blood"], "Clarke Peters": null}'); + + --Act + ut3_develop.ut.expect( l_actual ).to_equal( l_expected ); + --Assert + l_expected_message := q'[%Missing property: "Alexander Skarsg?rd" on path: $ +%Extra property: "Alexander Skarsgard" on path: $ +%Missing property: "Alice Farmer" on path: $ +%Extra property: "Clarke Peters" on path: $ +%Extra property: "one" on path: $."Amy Ryan" +%Missing property: "The Sopranos" on path: $."Annie Fitzgerald"[2] +%Extra property: "two" on path: $."Amy Ryan" +%Missing property: "Oz" on path: $."Annie Fitzgerald"[3] +%Missing property: "otherint" on path: $."Aidan Gillen" +%Extra property: "object1" on path: $."Aidan Gillen"."object" +%Extra property: "object2" on path: $."Aidan Gillen"."object" +%Extra property: "object3" on path: $."Aidan Gillen"."object" +%Extra property: "object4" on path: $."Aidan Gillen"."object" +%Actual type: 'array' was expected to be: 'object' on path: $."Amy Ryan" +%Actual type: 'string' was expected to be: 'number' on path: $."Aidan Gillen"."int" +%Actual type: 'string' was expected to be: 'boolean' on path: $."Aidan Gillen"."aboolean" +%Actual value: "True Blood" was expected to be: "Big Love" on path: $."Annie Fitzgerald"[0] +%Actual value: "Big Love" was expected to be: "True Blood" on path: $."Annie Fitzgerald"[1] +%Actual value: FALSE was expected to be: TRUE on path: $."Aidan Gillen"."boolean" +%Actual value: "Game of Thrones" was expected to be: "Game of Thron\"es" on path: $."Aidan Gillen"."array"[0]%]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + ut.expect(l_actual_message).to_be_like('%Diff: 20 differences found%'); + ut.expect(l_actual_message).to_be_like('%13 missing properties%'); + ut.expect(l_actual_message).to_be_like('%4 unequal values%'); + ut.expect(l_actual_message).to_be_like('%3 incorrect types%'); + end; + + + --Please note that by the looks of things the call to json() results in null value being returned. + procedure null_json_variable_njson + as + l_expected json ; + begin + -- Arrange + l_expected := cast (null as json ); + + --Act + ut3_develop.ut.expect( l_expected ).to_be_null; + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure to_have_count_njson as + l_actual json; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + -- Arrange + l_actual := json('{"Aidan Gillen": {"array": ["Game of Thrones","The Wire"],"string": "some string","int": "2","otherint": 4, "aboolean": "true", "boolean": false,"object": {"foo": "bar"}},"Amy Ryan": ["In Treatment","The Wire"],"Annie Fitzgerald": ["True Blood","Big Love","The Sopranos","Oz"],"Anwan Glover": ["Treme","The Wire"],"Alexander Skarsg?rd": ["Generation Kill","True Blood"],"Alice Farmer": ["The Corner","Oz","The Wire"]}'); + + --Act + ut3_develop.ut.expect( l_actual ).to_have_count( 6 ); + + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + + end; + + procedure fail_to_have_count_njson + as + l_actual json; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + -- Arrange + l_actual := json('{"Aidan Gillen": {"array": ["Game of Thrones","The Wire"],"string": "some string","int": "2","otherint": 4, "aboolean": "true", "boolean": false,"object": {"foo": "bar"}},"Amy Ryan": ["In Treatment","The Wire"],"Annie Fitzgerald": ["True Blood","Big Love","The Sopranos","Oz"],"Anwan Glover": ["Treme","The Wire"],"Alexander Skarsg?rd": ["Generation Kill","True Blood"],"Alice Farmer": ["The Corner","Oz","The Wire"]}'); + + --Act + ut3_develop.ut.expect( l_actual ).to_have_count( 2 ); + --Assert + l_expected_message := q'[%Actual: (json [ count = 6 ]) was expected to have [ count = 2 ]%]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + + end; + + procedure not_to_have_count_njson + as + l_actual json; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + -- Arrange + l_actual := json('{"Aidan Gillen": {"array": ["Game of Thrones","The Wire"],"string": "some string","int": "2","otherint": 4, "aboolean": "true", "boolean": false,"object": {"foo": "bar"}},"Amy Ryan": ["In Treatment","The Wire"],"Annie Fitzgerald": ["True Blood","Big Love","The Sopranos","Oz"],"Anwan Glover": ["Treme","The Wire"],"Alexander Skarsg?rd": ["Generation Kill","True Blood"],"Alice Farmer": ["The Corner","Oz","The Wire"]}'); + + --Act + ut3_develop.ut.expect( l_actual ).not_to_have_count( 7 ); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + + procedure fail_not_to_have_count_njson + as + l_actual json; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + -- Arrange + l_actual := json('{"Aidan Gillen": {"array": ["Game of Thrones","The Wire"],"string": "some string","int": "2","otherint": 4, "aboolean": "true", "boolean": false,"object": {"foo": "bar"}},"Amy Ryan": ["In Treatment","The Wire"],"Annie Fitzgerald": ["True Blood","Big Love","The Sopranos","Oz"],"Anwan Glover": ["Treme","The Wire"],"Alexander Skarsg?rd": ["Generation Kill","True Blood"],"Alice Farmer": ["The Corner","Oz","The Wire"]}'); + + --Act + ut3_develop.ut.expect( l_actual ).not_to_have_count( 6 ); + --Assert + l_expected_message := q'[%Actual: json [ count = 6 ] was expected not to have [ count = 6 ]%]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + end; / diff --git a/test/ut3_user/expectations/test_expectations_json.pks b/test/ut3_user/expectations/test_expectations_json.pks index 64dff42e8..4cee67526 100644 --- a/test/ut3_user/expectations/test_expectations_json.pks +++ b/test/ut3_user/expectations/test_expectations_json.pks @@ -39,13 +39,13 @@ create or replace package test_expectations_json is --%test( Json object to have count ) procedure to_have_count; - --%test( Fail Json object to have count) + --%test( Fail Json object to have count) procedure fail_to_have_count; --%test( Json object not to have count) procedure not_to_have_count; - --%test( Fail Json object not to have count) + --%test( Fail Json object not to have count) procedure fail_not_to_have_count; --%test( Json object to have count on array) @@ -74,6 +74,27 @@ create or replace package test_expectations_json is --%test( Compare two json arrays ) procedure check_json_arrays; + + --%test(Gives success for identical data using native json for 21c and above) + procedure success_on_same_data_njson; + + --%test(Gives failure for different data using native json for 21c and above) + procedure fail_on_diff_data_njson; + + --%test( Json variable is null using native json for 21c and above) + procedure null_json_variable_njson; + + --%test( Json object to have count using native json for 21c and above) + procedure to_have_count_njson; + + --%test( Fail Json object to have count using native json for 21c and above) + procedure fail_to_have_count_njson; + + --%test( Json object not to have count using native json for 21c and above) + procedure not_to_have_count_njson; + + --%test( Fail Json object not to have count using native json for 21c and above) + procedure fail_not_to_have_count_njson; end; / From 3d3f0bee3e9708f6402e59029e9728b0d82bdefc Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Mon, 31 Jan 2022 00:50:46 +0000 Subject: [PATCH 0834/1096] Update install on 11c to add new json type. --- source/expectations/json_objects_specs.sql | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/source/expectations/json_objects_specs.sql b/source/expectations/json_objects_specs.sql index 58877eacd..39c2c4e23 100644 --- a/source/expectations/json_objects_specs.sql +++ b/source/expectations/json_objects_specs.sql @@ -3,11 +3,16 @@ BEGIN $if dbms_db_version.version >= 21 $then dbms_output.put_line('Object exists , dont install'); $elsif dbms_db_version.version = 12 and dbms_db_version.release >= 2 or ( dbms_db_version.version > 12 and dbms_db_version.version < 21 ) $then - dbms_output.put_line('Installing json structures specs.'); + dbms_output.put_line('Installing json structures specs for native json.'); + execute immediate q'[create or replace TYPE JSON FORCE AUTHID CURRENT_USER AS OBJECT( + dummyobjt NUMBER +) NOT FINAL NOT INSTANTIABLE;]'; + $else + dbms_output.put_line('Installing json structures specs for native json.'); execute immediate q'[create or replace TYPE JSON FORCE AUTHID CURRENT_USER AS OBJECT( dummyobjt NUMBER ) NOT FINAL NOT INSTANTIABLE;]'; - $else + dbms_output.put_line('Installing json structures specs.'); execute immediate q'[create or replace TYPE JSON_Element_T FORCE AUTHID CURRENT_USER AS OBJECT( dummyobjt NUMBER, From 86e84c8b349ddc4c0b488f8efada429c08271210 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 31 Jan 2022 23:04:57 +0200 Subject: [PATCH 0835/1096] Improving code coverage. --- source/expectations/ut_expectation.tpb | 42 +++++++++---------- .../expectations/test_expectations_cursor.pkb | 6 +-- .../expectations/test_expectations_json.pkb | 2 +- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/source/expectations/ut_expectation.tpb b/source/expectations/ut_expectation.tpb index 95a117bc1..cc5bfe0ca 100644 --- a/source/expectations/ut_expectation.tpb +++ b/source/expectations/ut_expectation.tpb @@ -718,44 +718,44 @@ create or replace type body ut_expectation as return l_result; end; - member function to_be_within_pct(a_dist natural) return ut_be_within_pct is - l_result ut_be_within_pct; - begin - l_result := ut_be_within_pct(a_dist); - l_result.expectation := self; - return l_result; + member function to_be_within_pct(a_dist natural) return ut_be_within_pct is + l_result ut_be_within_pct; + begin + l_result := ut_be_within_pct(a_dist); + l_result.expectation := self; + return l_result; end; member function not_to_be_within(a_dist natural) return ut_be_within is - l_result ut_matcher; + l_result ut_be_within; begin - l_result := ut_be_within(a_dist).negated(); + l_result := treat( ut_be_within(a_dist).negated() as ut_be_within); l_result.expectation := self; - return treat(l_result as ut_be_within); + return l_result; end; member function not_to_be_within(a_dist dsinterval_unconstrained) return ut_be_within is - l_result ut_matcher; + l_result ut_be_within; begin - l_result := ut_be_within(a_dist).negated(); + l_result := treat( ut_be_within(a_dist).negated() as ut_be_within); l_result.expectation := self; - return treat(l_result as ut_be_within); + return l_result; end; member function not_to_be_within(a_dist yminterval_unconstrained) return ut_be_within is - l_result ut_matcher; + l_result ut_be_within; begin - l_result := ut_be_within(a_dist).negated(); + l_result := treat( ut_be_within(a_dist).negated() as ut_be_within); l_result.expectation := self; - return treat(l_result as ut_be_within); + return l_result; end; - member function not_to_be_within_pct(a_dist natural) return ut_be_within_pct is - l_result ut_matcher; - begin - l_result := ut_be_within_pct(a_dist).negated(); - l_result.expectation := self; - return treat(l_result as ut_be_within_pct); + member function not_to_be_within_pct(a_dist natural) return ut_be_within_pct is + l_result ut_be_within_pct; + begin + l_result := treat( ut_be_within_pct(a_dist).negated() as ut_be_within_pct); + l_result.expectation := self; + return l_result; end; end; diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index f06132009..409c81ace 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -336,7 +336,7 @@ create or replace package body test_expectations_cursor is open l_expected for select 1 as col_1, 2 as col_2 from dual; open l_actual for select 2 as col_2, 1 as col_1 from dual; --Act - ut3_develop.ut.expect( l_actual ).to_equal( l_expected ).unordered_columns; + ut3_develop.ut.expect( l_actual ).to_( ut3_develop.equal( l_expected ).unordered_columns() ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -350,7 +350,7 @@ create or replace package body test_expectations_cursor is open l_expected for select 1 as col_1, 2 as col_2 from dual; open l_actual for select 2 as col_2, 1 as col_1 from dual; --Act - ut3_develop.ut.expect( l_actual ).to_equal( l_expected ).uc; + ut3_develop.ut.expect( l_actual ).to_( ut3_develop.equal( l_expected ).uc() ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; @@ -592,7 +592,7 @@ create or replace package body test_expectations_cursor is open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual connect by level < 4; open l_expected for select rownum as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual connect by level < 4; --Act - ut3_develop.ut.expect(l_actual).to_equal(l_expected).include('/ROW/RN|//A_Column|//SOME_COL'); + ut3_develop.ut.expect(l_actual).to_( ut3_develop.equal(l_expected).include('/ROW/RN|//A_Column|//SOME_COL') ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; diff --git a/test/ut3_user/expectations/test_expectations_json.pkb b/test/ut3_user/expectations/test_expectations_json.pkb index 9516ecb04..afc7198a2 100644 --- a/test/ut3_user/expectations/test_expectations_json.pkb +++ b/test/ut3_user/expectations/test_expectations_json.pkb @@ -49,7 +49,7 @@ create or replace package body test_expectations_json is }'); --Act - ut3_develop.ut.expect( l_actual ).to_equal( l_actual ); + ut3_develop.ut.expect( l_actual ).to_( ut3_develop.equal( l_actual ) ); --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; From 718ac0d45b52099d2dfa0a8f2f934cd8e758a00d Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 1 Feb 2022 00:14:48 +0200 Subject: [PATCH 0836/1096] Improved test stability. Added human-readable reporting of tests run-time into `ut_documentation_reporter`. --- .../reporters/ut_documentation_reporter.tpb | 2 +- test/ut3_user/api/test_ut_run.pkb | 44 ++++++++++--------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/source/reporters/ut_documentation_reporter.tpb b/source/reporters/ut_documentation_reporter.tpb index 8b92d447f..30ab8f856 100644 --- a/source/reporters/ut_documentation_reporter.tpb +++ b/source/reporters/ut_documentation_reporter.tpb @@ -198,7 +198,7 @@ create or replace type body ut_documentation_reporter is begin print_failures_details(a_run); print_warnings(a_run); - self.print_text('Finished in ' || a_run.execution_time || ' seconds'); + self.print_text('Finished in ' || ut_utils.interval_to_text(numtodsinterval(a_run.execution_time,'second')) ); l_summary_text := a_run.results_count.total_count || ' tests, ' diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index 19c69c74e..8ec19f6d8 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -6,6 +6,7 @@ create or replace package body test_ut_run is gc_client_info constant varchar2(32767) := 'test client info'; g_context_test_results clob; + g_timestamp timestamp; procedure clear_expectations is begin @@ -1260,6 +1261,7 @@ Failures:% begin select * bulk collect into l_lines from table(ut3_develop.ut.run('check_context')); g_context_test_results := ut3_tester_helper.main_helper.table_to_clob(l_lines); + g_timestamp := current_timestamp; end; @@ -1272,7 +1274,7 @@ Failures:% ||'%BEFORE_SUITE:SUITE_DESCRIPTION=Suite description' ||'%BEFORE_SUITE:SUITE_PACKAGE='||gc_owner||'.check_context' ||'%BEFORE_SUITE:SUITE_PATH=some.suite.path.check_context' - ||'%BEFORE_SUITE:SUITE_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') + ||'%BEFORE_SUITE:SUITE_START_TIME='||to_char(g_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%APPLICATION_INFO:MODULE=utPLSQL' ||'%APPLICATION_INFO:ACTION=check_context' ||'%APPLICATION_INFO:CLIENT_INFO=before_suite%' @@ -1287,14 +1289,14 @@ Failures:% '%BEFORE_CONTEXT:CONTEXT_DESCRIPTION=context description' ||'%BEFORE_CONTEXT:CONTEXT_NAME=some_context' ||'%BEFORE_CONTEXT:CONTEXT_PATH=some.suite.path.check_context.some_context' - ||'%BEFORE_CONTEXT:CONTEXT_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') + ||'%BEFORE_CONTEXT:CONTEXT_START_TIME='||to_char(g_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%BEFORE_CONTEXT:CURRENT_EXECUTABLE_NAME='||gc_owner||'.check_context.before_context' ||'%BEFORE_CONTEXT:CURRENT_EXECUTABLE_TYPE=beforeall' ||'%BEFORE_CONTEXT:RUN_PATHS=check_context' ||'%BEFORE_CONTEXT:SUITE_DESCRIPTION=Suite description' ||'%BEFORE_CONTEXT:SUITE_PACKAGE='||gc_owner||'.check_context' ||'%BEFORE_CONTEXT:SUITE_PATH=some.suite.path.check_context' - ||'%BEFORE_CONTEXT:SUITE_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') + ||'%BEFORE_CONTEXT:SUITE_START_TIME='||to_char(g_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%APPLICATION_INFO:MODULE=utPLSQL' ||'%APPLICATION_INFO:ACTION=check_context' ||'%APPLICATION_INFO:CLIENT_INFO=before_context%' @@ -1308,17 +1310,17 @@ Failures:% '%BEFORE_EACH_TEST:CONTEXT_DESCRIPTION=context description' ||'%BEFORE_EACH_TEST:CONTEXT_NAME=some_context' ||'%BEFORE_EACH_TEST:CONTEXT_PATH=some.suite.path.check_context.some_context' - ||'%BEFORE_EACH_TEST:CONTEXT_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') + ||'%BEFORE_EACH_TEST:CONTEXT_START_TIME='||to_char(g_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%BEFORE_EACH_TEST:CURRENT_EXECUTABLE_NAME='||gc_owner||'.check_context.before_each_test' ||'%BEFORE_EACH_TEST:CURRENT_EXECUTABLE_TYPE=beforeeach' ||'%BEFORE_EACH_TEST:RUN_PATHS=check_context' ||'%BEFORE_EACH_TEST:SUITE_DESCRIPTION=Suite description' ||'%BEFORE_EACH_TEST:SUITE_PACKAGE='||gc_owner||'.check_context' ||'%BEFORE_EACH_TEST:SUITE_PATH=some.suite.path.check_context' - ||'%BEFORE_EACH_TEST:SUITE_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') + ||'%BEFORE_EACH_TEST:SUITE_START_TIME='||to_char(g_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%BEFORE_EACH_TEST:TEST_DESCRIPTION=Some test description' ||'%BEFORE_EACH_TEST:TEST_NAME='||gc_owner||'.check_context.the_test' - ||'%BEFORE_EACH_TEST:TEST_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') + ||'%BEFORE_EACH_TEST:TEST_START_TIME='||to_char(g_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%APPLICATION_INFO:MODULE=utPLSQL' ||'%APPLICATION_INFO:ACTION=check_context' ||'%APPLICATION_INFO:CLIENT_INFO=before_each_test%' @@ -1331,17 +1333,17 @@ Failures:% '%BEFORE_TEST:CONTEXT_DESCRIPTION=context description' ||'%BEFORE_TEST:CONTEXT_NAME=some_context' ||'%BEFORE_TEST:CONTEXT_PATH=some.suite.path.check_context.some_context' - ||'%BEFORE_TEST:CONTEXT_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') + ||'%BEFORE_TEST:CONTEXT_START_TIME='||to_char(g_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%BEFORE_TEST:CURRENT_EXECUTABLE_NAME='||gc_owner||'.check_context.before_test' ||'%BEFORE_TEST:CURRENT_EXECUTABLE_TYPE=beforetest' ||'%BEFORE_TEST:RUN_PATHS=check_context' ||'%BEFORE_TEST:SUITE_DESCRIPTION=Suite description' ||'%BEFORE_TEST:SUITE_PACKAGE='||gc_owner||'.check_context' ||'%BEFORE_TEST:SUITE_PATH=some.suite.path.check_context' - ||'%BEFORE_TEST:SUITE_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') + ||'%BEFORE_TEST:SUITE_START_TIME='||to_char(g_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%BEFORE_TEST:TEST_DESCRIPTION=Some test description' ||'%BEFORE_TEST:TEST_NAME='||gc_owner||'.check_context.the_test' - ||'%BEFORE_TEST:TEST_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') + ||'%BEFORE_TEST:TEST_START_TIME='||to_char(g_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%APPLICATION_INFO:MODULE=utPLSQL' ||'%APPLICATION_INFO:ACTION=check_context' ||'%APPLICATION_INFO:CLIENT_INFO=before_test%' @@ -1354,17 +1356,17 @@ Failures:% '%THE_TEST:CONTEXT_DESCRIPTION=context description' ||'%THE_TEST:CONTEXT_NAME=some_context' ||'%THE_TEST:CONTEXT_PATH=some.suite.path.check_context.some_context' - ||'%THE_TEST:CONTEXT_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') + ||'%THE_TEST:CONTEXT_START_TIME='||to_char(g_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%THE_TEST:CURRENT_EXECUTABLE_NAME='||gc_owner||'.check_context.the_test' ||'%THE_TEST:CURRENT_EXECUTABLE_TYPE=test' ||'%THE_TEST:RUN_PATHS=check_context' ||'%THE_TEST:SUITE_DESCRIPTION=Suite description' ||'%THE_TEST:SUITE_PACKAGE='||gc_owner||'.check_context' ||'%THE_TEST:SUITE_PATH=some.suite.path.check_context' - ||'%THE_TEST:SUITE_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') + ||'%THE_TEST:SUITE_START_TIME='||to_char(g_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%THE_TEST:TEST_DESCRIPTION=Some test description' ||'%THE_TEST:TEST_NAME='||gc_owner||'.check_context.the_test' - ||'%THE_TEST:TEST_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') + ||'%THE_TEST:TEST_START_TIME='||to_char(g_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%APPLICATION_INFO:MODULE=utPLSQL' ||'%APPLICATION_INFO:ACTION=check_context' ||'%APPLICATION_INFO:CLIENT_INFO=the_test%' @@ -1377,17 +1379,17 @@ Failures:% '%AFTER_TEST:CONTEXT_DESCRIPTION=context description' ||'%AFTER_TEST:CONTEXT_NAME=some_context' ||'%AFTER_TEST:CONTEXT_PATH=some.suite.path.check_context.some_context' - ||'%AFTER_TEST:CONTEXT_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') + ||'%AFTER_TEST:CONTEXT_START_TIME='||to_char(g_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%AFTER_TEST:CURRENT_EXECUTABLE_NAME='||gc_owner||'.check_context.after_test' ||'%AFTER_TEST:CURRENT_EXECUTABLE_TYPE=aftertest' ||'%AFTER_TEST:RUN_PATHS=check_context' ||'%AFTER_TEST:SUITE_DESCRIPTION=Suite description' ||'%AFTER_TEST:SUITE_PACKAGE='||gc_owner||'.check_context' ||'%AFTER_TEST:SUITE_PATH=some.suite.path.check_context' - ||'%AFTER_TEST:SUITE_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') + ||'%AFTER_TEST:SUITE_START_TIME='||to_char(g_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%AFTER_TEST:TEST_DESCRIPTION=Some test description' ||'%AFTER_TEST:TEST_NAME='||gc_owner||'.check_context.the_test' - ||'%AFTER_TEST:TEST_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') + ||'%AFTER_TEST:TEST_START_TIME='||to_char(g_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%APPLICATION_INFO:MODULE=utPLSQL' ||'%APPLICATION_INFO:ACTION=check_context' ||'%APPLICATION_INFO:CLIENT_INFO=after_test%' @@ -1400,17 +1402,17 @@ Failures:% '%AFTER_EACH_TEST:CONTEXT_DESCRIPTION=context description' ||'%AFTER_EACH_TEST:CONTEXT_NAME=some_context' ||'%AFTER_EACH_TEST:CONTEXT_PATH=some.suite.path.check_context.some_context' - ||'%AFTER_EACH_TEST:CONTEXT_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') + ||'%AFTER_EACH_TEST:CONTEXT_START_TIME='||to_char(g_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%AFTER_EACH_TEST:CURRENT_EXECUTABLE_NAME='||gc_owner||'.check_context.after_each_test' ||'%AFTER_EACH_TEST:CURRENT_EXECUTABLE_TYPE=aftereach' ||'%AFTER_EACH_TEST:RUN_PATHS=check_context' ||'%AFTER_EACH_TEST:SUITE_DESCRIPTION=Suite description' ||'%AFTER_EACH_TEST:SUITE_PACKAGE='||gc_owner||'.check_context' ||'%AFTER_EACH_TEST:SUITE_PATH=some.suite.path.check_context' - ||'%AFTER_EACH_TEST:SUITE_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') + ||'%AFTER_EACH_TEST:SUITE_START_TIME='||to_char(g_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%AFTER_EACH_TEST:TEST_DESCRIPTION=Some test description' ||'%AFTER_EACH_TEST:TEST_NAME='||gc_owner||'.check_context.the_test' - ||'%AFTER_EACH_TEST:TEST_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') + ||'%AFTER_EACH_TEST:TEST_START_TIME='||to_char(g_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%APPLICATION_INFO:MODULE=utPLSQL' ||'%APPLICATION_INFO:ACTION=check_context' ||'%APPLICATION_INFO:CLIENT_INFO=after_each_test%' @@ -1423,14 +1425,14 @@ Failures:% '%AFTER_CONTEXT:CONTEXT_DESCRIPTION=context description' ||'%AFTER_CONTEXT:CONTEXT_NAME=some_context' ||'%AFTER_CONTEXT:CONTEXT_PATH=some.suite.path.check_context.some_context' - ||'%AFTER_CONTEXT:CONTEXT_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') + ||'%AFTER_CONTEXT:CONTEXT_START_TIME='||to_char(g_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%AFTER_CONTEXT:CURRENT_EXECUTABLE_NAME='||gc_owner||'.check_context.after_context' ||'%AFTER_CONTEXT:CURRENT_EXECUTABLE_TYPE=afterall' ||'%AFTER_CONTEXT:RUN_PATHS=check_context' ||'%AFTER_CONTEXT:SUITE_DESCRIPTION=Suite description' ||'%AFTER_CONTEXT:SUITE_PACKAGE='||gc_owner||'.check_context' ||'%AFTER_CONTEXT:SUITE_PATH=some.suite.path.check_context' - ||'%AFTER_CONTEXT:SUITE_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') + ||'%AFTER_CONTEXT:SUITE_START_TIME='||to_char(g_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%APPLICATION_INFO:MODULE=utPLSQL' ||'%APPLICATION_INFO:ACTION=check_context' ||'%APPLICATION_INFO:CLIENT_INFO=after_context%' @@ -1447,7 +1449,7 @@ Failures:% ||'%AFTER_SUITE:SUITE_DESCRIPTION=Suite description' ||'%AFTER_SUITE:SUITE_PACKAGE='||gc_owner||'.check_context' ||'%AFTER_SUITE:SUITE_PATH=some.suite.path.check_context' - ||'%AFTER_SUITE:SUITE_START_TIME='||to_char(current_timestamp,'syyyy-mm-dd"T"hh24:mi') + ||'%AFTER_SUITE:SUITE_START_TIME='||to_char(g_timestamp,'syyyy-mm-dd"T"hh24:mi') ||'%APPLICATION_INFO:MODULE=utPLSQL' ||'%APPLICATION_INFO:ACTION=check_context' ||'%APPLICATION_INFO:CLIENT_INFO=after_suite%' From 6dbef20a5b0d7c67d709bd5ea519e5a27b1f049e Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 1 Feb 2022 00:29:16 +0200 Subject: [PATCH 0837/1096] Fixing build process to build using develop branch as testing framework for Pull Requests --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 87d577554..8703e24d9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -92,7 +92,7 @@ jobs: - name: Download utPLSQL release for testing # For PR build - test using target branch as framework, for branch build use self as testing framework - run: git clone --depth=1 --branch=${CI_HEAD_REF:-$CI_REF_NAME} https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR + run: git clone --depth=1 --branch=${CI_BASE_REF:-$CI_REF_NAME} https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR - name: Update privileges on sources run: chmod -R go+w ./{source,test,examples,${UTPLSQL_DIR}/source} From 25b55b4cb776e6a4aeb019297e7be12ff6699784 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 1 Feb 2022 00:44:49 +0200 Subject: [PATCH 0838/1096] Improving test coverage. --- test/ut3_user/expectations/binary/test_to_be_within.pkb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/ut3_user/expectations/binary/test_to_be_within.pkb b/test/ut3_user/expectations/binary/test_to_be_within.pkb index 5213bd362..d490a8280 100644 --- a/test/ut3_user/expectations/binary/test_to_be_within.pkb +++ b/test/ut3_user/expectations/binary/test_to_be_within.pkb @@ -118,6 +118,9 @@ create or replace package body test_to_be_within is test_to_be_within_fail('not_to( ut3_develop.be_within','timestamp', q'[TIMESTAMP '2018-08-09 07:00:00']', q'[TIMESTAMP '2017-08-09 07:00:00']','''1-0''','interval year to month', ')'); test_to_be_within_fail('not_to( ut3_develop.be_within','timestamp_tz_unconstrained', q'[TIMESTAMP '2017-08-09 07:00:00 -7:00']', q'[TIMESTAMP '2017-08-08 05:59:48.668 -8:00']','''1 0:00:11.333''','interval day to second', ')'); test_to_be_within_fail('not_to( ut3_develop.be_within','timestamp_ltz_unconstrained', q'[TIMESTAMP '2017-08-09 07:00:00 -7:00']', q'[TIMESTAMP '2017-08-08 05:59:48.668 -8:00']','''1 0:00:11.333''','interval day to second', ')'); + test_to_be_within_fail('not_to_be_within','timestamp', q'[TIMESTAMP '2018-08-09 07:00:00']', q'[TIMESTAMP '2017-08-09 07:00:00']','''1-0''','interval year to month'); + test_to_be_within_fail('not_to_be_within','timestamp_tz_unconstrained', q'[TIMESTAMP '2017-08-09 07:00:00 -7:00']', q'[TIMESTAMP '2017-08-08 05:59:48.668 -8:00']','''1 0:00:11.333''','interval day to second'); + test_to_be_within_fail('not_to_be_within','timestamp_ltz_unconstrained', q'[TIMESTAMP '2017-08-09 07:00:00 -7:00']', q'[TIMESTAMP '2017-08-08 05:59:48.668 -8:00']','''1 0:00:11.333''','interval day to second'); end; procedure failed_tests is From 5b5a5c017d70e0a17ffdf872850e757f69ed9ea9 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 1 Feb 2022 01:58:44 +0200 Subject: [PATCH 0839/1096] Improving matcher documentation --- docs/userguide/expectations.md | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 833235c24..88c244977 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -333,8 +333,8 @@ The matrix below illustrates the data types supported by different matchers. | **be_like** | | | X | | | | | | X | | | | | | | | **be_empty** | X | | X | | | | | | | | | X | X | | X | | **have_count** | | | | | | | | | | | | X | X | | X | -| **be_within().of_()** | | | | x | x | | | | | | | | | | | -| **be_within_pct().of_()** | | | | | x | | | | | | | | | | | +| **be_within().of_()** | | | | X | X | X | X | X | | | | | | | | +| **be_within_pct().of_()** | | | | | X | | | | | | | | | | | # Expecting exceptions @@ -1096,17 +1096,34 @@ SUCCESS ## to_be_within of -This matcher is created to determine wheter expected value is approximately equal or "close" to another value. +This matcher determines wheter expected value is within range from another value. -Matcher will allow to compare numbers as well as dates. +The logical formual used for calcuating the matcher is: +`abs( expected - actual ) <= distance` +The matcher will succeed if the `expected` and `actual` are not more than `distance` apart from each other. -When comparing a number the tolerance / distance can be expressed as another postive number or a percentage. +The matcher works with data-type number, date, timestamp, timestamp with time zone, timestamp with local time zone. +The data-types of compared values must match exactly and if type does not match, the expectation will fail. -When comparing a two dates tolerance can be expressed in interval time either Day-To-Second or Year-To-Month. +| expected/actual
data-type | distance data-type | +|:------------------------------:|:----------------------:| +| number | number | +| date | interval day to second | +| date | interval year to month | +| timestamp | interval day to second | +| timestamp | interval year to month | +| timestamp with time zone | interval day to second | +| timestamp with time zone | interval year to month | +| timestamp with local time zone | interval day to second | +| timestamp with local time zone | interval year to month | -Matcher for numbers will calculate a absolute distance between expected and actual and check whether that value is within a tolerance. -When comparing a date a distance is measured in interval, the check is done that actual value is within date range of expected taking into account interval plus and minus. +The distance can be expressed as a postive number or positive interval. + +>Note: +> Interval year-to-moth as a distance is giving sucess if the distance between the given dates/timestamps evaluates to value less or equal of the specified interval +> Keep in mind that a distance of `interval '0-1' year to month` will actuall be successful if the distance isnot greater than a month and a half. +> This is due to how oracle evaluates conversion between timestamp difference converted to `year to month interval`. **Example 1.** ```sql From 9002fbce682677e8983e3a3e1f338f58aecc0817 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Tue, 1 Feb 2022 00:14:40 +0000 Subject: [PATCH 0840/1096] Making tests below 21 compilation conditional so it wont fail. --- .../data_values/ut_compound_data_helper.pkb | 11 +++++++++++ .../data_values/ut_compound_data_helper.pks | 2 ++ .../expectations/data_values/ut_data_value_json.tpb | 2 +- test/ut3_user/expectations/test_expectations_json.pkb | 6 ++++-- test/ut3_user/expectations/test_expectations_json.pks | 5 ++++- 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 37d9901ff..4847a248c 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -781,6 +781,17 @@ create or replace package body ut_compound_data_helper is return l_diffs; end; + function get_json_object(a_json_t json) return json_element_t is + l_json JSON; + l_obj json_element_t; + begin + $if dbms_db_version.version >= 21 $then + l_obj := case when a_json_t is null then cast (null as json_element_t ) else json_element_t.parse(json_query(a_value, '$' returning clob)) end; + $else + l_obj := null; + $end + end; + begin g_anytype_name_map(dbms_types.typecode_date) := 'DATE'; g_anytype_name_map(dbms_types.typecode_number) := 'NUMBER'; diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks index 53b0846b8..451cd9bac 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pks +++ b/source/expectations/data_values/ut_compound_data_helper.pks @@ -134,5 +134,7 @@ create or replace package ut_compound_data_helper authid definer is function get_json_diffs_type(a_diff_id raw) return tt_json_diff_type_tab; + function get_json_object(a_json_t json) return json_element_t; + end; / diff --git a/source/expectations/data_values/ut_data_value_json.tpb b/source/expectations/data_values/ut_data_value_json.tpb index 5d7232851..40bf81dbb 100644 --- a/source/expectations/data_values/ut_data_value_json.tpb +++ b/source/expectations/data_values/ut_data_value_json.tpb @@ -33,7 +33,7 @@ create or replace type body ut_data_value_json as end; constructor function ut_data_value_json(self in out nocopy ut_data_value_json, a_value json) return self as result is - l_value json_element_t := case when a_value is null then cast (null as json_element_t ) else json_element_t.parse(json_query(a_value, '$' returning clob)) end; + l_value json_element_t := ut_compound_data_helper.get_json_object(a_value); begin init(l_value); return; diff --git a/test/ut3_user/expectations/test_expectations_json.pkb b/test/ut3_user/expectations/test_expectations_json.pkb index 731cbcfd9..3fc28ff03 100644 --- a/test/ut3_user/expectations/test_expectations_json.pkb +++ b/test/ut3_user/expectations/test_expectations_json.pkb @@ -1607,7 +1607,8 @@ create or replace package body test_expectations_json is ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; - + $if dbms_db_version.version >= 21 $then + procedure success_on_same_data_njson as l_actual json; @@ -1781,6 +1782,7 @@ create or replace package body test_expectations_json is --Assert ut.expect(l_actual_message).to_be_like(l_expected_message); end; - + + $end end; / diff --git a/test/ut3_user/expectations/test_expectations_json.pks b/test/ut3_user/expectations/test_expectations_json.pks index 4cee67526..286106a58 100644 --- a/test/ut3_user/expectations/test_expectations_json.pks +++ b/test/ut3_user/expectations/test_expectations_json.pks @@ -75,6 +75,8 @@ create or replace package test_expectations_json is --%test( Compare two json arrays ) procedure check_json_arrays; + $if dbms_db_version.version >= 21 $then + --%test(Gives success for identical data using native json for 21c and above) procedure success_on_same_data_njson; @@ -95,6 +97,7 @@ create or replace package test_expectations_json is --%test( Fail Json object not to have count using native json for 21c and above) procedure fail_not_to_have_count_njson; - + + $end end; / From b270d4e02745ca3455c4b1db2523161d683b369c Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Tue, 1 Feb 2022 00:26:56 +0000 Subject: [PATCH 0841/1096] Fixing conditional compilation --- source/expectations/data_values/ut_compound_data_helper.pkb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 4847a248c..fe3dc6946 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -786,7 +786,7 @@ create or replace package body ut_compound_data_helper is l_obj json_element_t; begin $if dbms_db_version.version >= 21 $then - l_obj := case when a_json_t is null then cast (null as json_element_t ) else json_element_t.parse(json_query(a_value, '$' returning clob)) end; + l_obj := case when a_json_t is null then cast (null as json_element_t ) else json_element_t.parse(json_query(a_json_t, '$' returning clob)) end; $else l_obj := null; $end From 5b1c1d38984e08f04467e3a4e44cc6032b2f6fef Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Tue, 1 Feb 2022 00:36:02 +0000 Subject: [PATCH 0842/1096] Missing return from function. --- source/expectations/data_values/ut_compound_data_helper.pkb | 1 + 1 file changed, 1 insertion(+) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index fe3dc6946..558b007d9 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -790,6 +790,7 @@ create or replace package body ut_compound_data_helper is $else l_obj := null; $end + return l_obj; end; begin From 0d8cbea403026db10e939e942fdca01de98adec0 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Tue, 1 Feb 2022 01:01:13 +0000 Subject: [PATCH 0843/1096] Added mention about new type into userguide. --- docs/userguide/expectations.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index c07f3782e..07ff647e5 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1643,7 +1643,7 @@ FAILURE # Comparing Json objects -utPLSQL is capable of comparing json data-types **on Oracle 12.2 and above**. +utPLSQL is capable of comparing json data-types of `json_element_t` **on Oracle 12.2 and above**, and also `json` **on Oracle 21 and above** ### Notes on comparison of json data @@ -1651,10 +1651,11 @@ utPLSQL is capable of comparing json data-types **on Oracle 12.2 and above**. - During comparison of json objects the order doesn't matter. - During comparison of json arrays the index of element is taken into account - To compare json you have to make sure its type of `json_element_t` or its subtypes +- From version 21 and above a native `json` type is supported. -Compare JSON example: +Compare JSON example using `json_element_t`: ```sql declare l_expected json_element_t; @@ -1736,7 +1737,7 @@ FAILURE at "anonymous block", line 59 ``` -Comparing parts of JSON example: +Comparing parts of JSON example using `json_element_t` subtypes: ```sql declare l_actual json_object_t; From 21b3cb39415331a93378ffc61752c149a5481cbf Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Tue, 1 Feb 2022 01:15:19 +0000 Subject: [PATCH 0844/1096] Fixing sonar. --- source/expectations/data_values/ut_compound_data_helper.pkb | 1 - 1 file changed, 1 deletion(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 558b007d9..e29f10279 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -782,7 +782,6 @@ create or replace package body ut_compound_data_helper is end; function get_json_object(a_json_t json) return json_element_t is - l_json JSON; l_obj json_element_t; begin $if dbms_db_version.version >= 21 $then From 075fe522031534e5aceea1f0d33a531dec8b522b Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Tue, 1 Feb 2022 19:58:30 +0000 Subject: [PATCH 0845/1096] Adding conditional execution of sonarcloud. --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 87d577554..7d42b08f1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -131,6 +131,7 @@ jobs: - name: SonarCloud Scan id: sonar + if: ${{ matrix.db_version_name == '21xe' }} uses: SonarSource/sonarcloud-github-action@master env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any From dc14dc754505f4d979fd21dcded366bd94c84a84 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Wed, 2 Feb 2022 09:39:52 +0000 Subject: [PATCH 0846/1096] Fixing issue 1113 where the act were inserted into exp --- .../data_values/ut_data_value_json.tpb | 2 +- .../expectations/test_expectations_json.pkb | 39 ++++++++++++++----- .../expectations/test_expectations_json.pks | 4 ++ 3 files changed, 34 insertions(+), 11 deletions(-) diff --git a/source/expectations/data_values/ut_data_value_json.tpb b/source/expectations/data_values/ut_data_value_json.tpb index 40bf81dbb..b703af181 100644 --- a/source/expectations/data_values/ut_data_value_json.tpb +++ b/source/expectations/data_values/ut_data_value_json.tpb @@ -147,7 +147,7 @@ create or replace type body ut_data_value_json as l_result := case when ut_compound_data_helper.insert_json_diffs( - l_diff_id, self.json_tree.json_tree_info, l_other.json_tree.json_tree_info + l_diff_id, l_other.json_tree.json_tree_info, self.json_tree.json_tree_info ) > 0 then 1 else 0 end; diff --git a/test/ut3_user/expectations/test_expectations_json.pkb b/test/ut3_user/expectations/test_expectations_json.pkb index 3fc28ff03..677ba2578 100644 --- a/test/ut3_user/expectations/test_expectations_json.pkb +++ b/test/ut3_user/expectations/test_expectations_json.pkb @@ -62,8 +62,8 @@ create or replace package body test_expectations_json is l_actual_message varchar2(32767); begin -- Arrange - l_expected := json_element_t.parse('{"Aidan Gillen": {"array": ["Game of Thrones","The Wire"],"string": "some string","int": "2","otherint": 4, "aboolean": "true", "boolean": false,"object": {"foo": "bar"}},"Amy Ryan": ["In Treatment","The Wire"],"Annie Fitzgerald": ["True Blood","Big Love","The Sopranos","Oz"],"Anwan Glover": ["Treme","The Wire"],"Alexander Skarsg?rd": ["Generation Kill","True Blood"],"Alice Farmer": ["The Corner","Oz","The Wire"]}'); - l_actual := json_element_t.parse('{"Aidan Gillen": {"array": ["Game of Thron\"es","The Wire"],"string": "some string","int": 2,"aboolean": true, "boolean": true,"object": {"foo": "bar","object1": {"new prop1": "new prop value"},"object2": {"new prop1": "new prop value"},"object3": {"new prop1": "new prop value"},"object4": {"new prop1": "new prop value"}}},"Amy Ryan": {"one": "In Treatment","two": "The Wire"},"Annie Fitzgerald": ["Big Love","True Blood"],"Anwan Glover": ["Treme","The Wire"],"Alexander Skarsgard": ["Generation Kill","True Blood"], "Clarke Peters": null}'); + l_actual := json_element_t.parse('{"Aidan Gillen": {"array": ["Game of Thrones","The Wire"],"string": "some string","int": "2","otherint": 4, "aboolean": "true", "boolean": false,"object": {"foo": "bar"}},"Amy Ryan": ["In Treatment","The Wire"],"Annie Fitzgerald": ["True Blood","Big Love","The Sopranos","Oz"],"Anwan Glover": ["Treme","The Wire"],"Alexander Skarsg?rd": ["Generation Kill","True Blood"],"Alice Farmer": ["The Corner","Oz","The Wire"]}'); + l_expected := json_element_t.parse('{"Aidan Gillen": {"array": ["Game of Thron\"es","The Wire"],"string": "some string","int": 2,"aboolean": true, "boolean": true,"object": {"foo": "bar","object1": {"new prop1": "new prop value"},"object2": {"new prop1": "new prop value"},"object3": {"new prop1": "new prop value"},"object4": {"new prop1": "new prop value"}}},"Amy Ryan": {"one": "In Treatment","two": "The Wire"},"Annie Fitzgerald": ["Big Love","True Blood"],"Anwan Glover": ["Treme","The Wire"],"Alexander Skarsgard": ["Generation Kill","True Blood"], "Clarke Peters": null}'); --Act ut3_develop.ut.expect( l_actual ).to_equal( l_expected ); @@ -387,7 +387,7 @@ create or replace package body test_expectations_json is l_actual_message varchar2(32767); begin -- Arrange - l_expected := json_object_t.parse(' { + l_actual := json_object_t.parse(' { "Actors": [ { "name": "Tom Cruise", @@ -424,7 +424,7 @@ create or replace package body test_expectations_json is ] }' ); - l_actual := json_object_t.parse(' { + l_expected := json_object_t.parse(' { "Actors": { "name": "Krzystof Jarzyna", @@ -444,8 +444,8 @@ create or replace package body test_expectations_json is --Act - ut3_develop.ut.expect(json_array_t(json_query(l_actual.stringify,'$.Actors.children'))).to_equal(json_array_t(json_query(l_expected - .stringify,'$.Actors[1].children'))); + ut3_develop.ut.expect(json_array_t(json_query(l_actual.stringify,'$.Actors[1].children'))).to_equal(json_array_t(json_query(l_expected + .stringify,'$.Actors.children'))); --Assert l_expected_message := q'[%Actual: json was expected to equal: json %Diff: 1 differences found @@ -1055,7 +1055,7 @@ create or replace package body test_expectations_json is l_actual_message varchar2(32767); begin -- Arrange - l_expected := json_element_t.parse('[ + l_actual := json_element_t.parse('[ { "_id": "5ce6ec46cb9977b050f15d97", "index": 0, @@ -1282,7 +1282,7 @@ create or replace package body test_expectations_json is "favoriteFruit": "strawberry" } ]'); - l_actual := json_element_t.parse('[ + l_expected := json_element_t.parse('[ { "_id": "5ce6ec6660565269b16cf836", "index": 0, @@ -1665,8 +1665,8 @@ create or replace package body test_expectations_json is l_actual_message varchar2(32767); begin -- Arrange - l_expected := json('{"Aidan Gillen": {"array": ["Game of Thrones","The Wire"],"string": "some string","int": "2","otherint": 4, "aboolean": "true", "boolean": false,"object": {"foo": "bar"}},"Amy Ryan": ["In Treatment","The Wire"],"Annie Fitzgerald": ["True Blood","Big Love","The Sopranos","Oz"],"Anwan Glover": ["Treme","The Wire"],"Alexander Skarsg?rd": ["Generation Kill","True Blood"],"Alice Farmer": ["The Corner","Oz","The Wire"]}'); - l_actual := json('{"Aidan Gillen": {"array": ["Game of Thron\"es","The Wire"],"string": "some string","int": 2,"aboolean": true, "boolean": true,"object": {"foo": "bar","object1": {"new prop1": "new prop value"},"object2": {"new prop1": "new prop value"},"object3": {"new prop1": "new prop value"},"object4": {"new prop1": "new prop value"}}},"Amy Ryan": {"one": "In Treatment","two": "The Wire"},"Annie Fitzgerald": ["Big Love","True Blood"],"Anwan Glover": ["Treme","The Wire"],"Alexander Skarsgard": ["Generation Kill","True Blood"], "Clarke Peters": null}'); + l_actual := json('{"Aidan Gillen": {"array": ["Game of Thrones","The Wire"],"string": "some string","int": "2","otherint": 4, "aboolean": "true", "boolean": false,"object": {"foo": "bar"}},"Amy Ryan": ["In Treatment","The Wire"],"Annie Fitzgerald": ["True Blood","Big Love","The Sopranos","Oz"],"Anwan Glover": ["Treme","The Wire"],"Alexander Skarsg?rd": ["Generation Kill","True Blood"],"Alice Farmer": ["The Corner","Oz","The Wire"]}'); + l_expected := json('{"Aidan Gillen": {"array": ["Game of Thron\"es","The Wire"],"string": "some string","int": 2,"aboolean": true, "boolean": true,"object": {"foo": "bar","object1": {"new prop1": "new prop value"},"object2": {"new prop1": "new prop value"},"object3": {"new prop1": "new prop value"},"object4": {"new prop1": "new prop value"}}},"Amy Ryan": {"one": "In Treatment","two": "The Wire"},"Annie Fitzgerald": ["Big Love","True Blood"],"Anwan Glover": ["Treme","The Wire"],"Alexander Skarsgard": ["Generation Kill","True Blood"], "Clarke Peters": null}'); --Act ut3_develop.ut.expect( l_actual ).to_equal( l_expected ); @@ -1784,5 +1784,24 @@ create or replace package body test_expectations_json is end; $end + + procedure p_1113_reg_exp_chg_with_act is + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + ut3_develop.ut.expect(json_element_t.parse('{"a":"value a"}')).to_equal(json_element_t.parse('{"a":"value b"}')); + + --Assert + l_expected_message := q'[%Actual: json was expected to equal: json +%Diff: 1 differences found +%1 unequal values +%Actual value: "value a" was expected to be: "value b" on path: $."a"%]'; + + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + + end; / diff --git a/test/ut3_user/expectations/test_expectations_json.pks b/test/ut3_user/expectations/test_expectations_json.pks index 286106a58..410c3050b 100644 --- a/test/ut3_user/expectations/test_expectations_json.pks +++ b/test/ut3_user/expectations/test_expectations_json.pks @@ -99,5 +99,9 @@ create or replace package test_expectations_json is procedure fail_not_to_have_count_njson; $end + + --%test( Regression scenario tests for issue #1113 where the expected has been switched with actual) + procedure p_1113_reg_exp_chg_with_act; + end; / From 7fec0f998c59fcd2fac6f4d97f508b53bd6d3d15 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 3 Feb 2022 01:03:18 +0200 Subject: [PATCH 0847/1096] Added tests for 0 value of actual and expected and actual greater than expected (not only smaller). Updated documentation. --- docs/userguide/expectations.md | 43 +++++++++++-------- .../matchers/ut_be_within_pct.tpb | 5 +-- .../binary/test_to_be_within_pct.pkb | 36 ++++++++++++++++ 3 files changed, 63 insertions(+), 21 deletions(-) diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 88c244977..a74e2576e 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1096,13 +1096,17 @@ SUCCESS ## to_be_within of -This matcher determines wheter expected value is within range from another value. +Determines wheter expected value is within range (tolerance) from another value. -The logical formual used for calcuating the matcher is: -`abs( expected - actual ) <= distance` -The matcher will succeed if the `expected` and `actual` are not more than `distance` apart from each other. +The logical formual used for calcuating the matcher is: +``` + result := ( abs( expected - actual ) <= distance ) +``` +The actual formula used for calculation is more complex to handle different data-types of expected/actual values as well as differnet types of distance value. +The matcher will fail if the `expected` and `actual` are more than `distance` apart from each other. +The matcher will fail if the dataypes of `expected` and `actual` are not the same. -The matcher works with data-type number, date, timestamp, timestamp with time zone, timestamp with local time zone. +The matcher works with data-types: `number`, `date`, `timestamp`, `timestamp with time zone`, `timestamp with local time zone` The data-types of compared values must match exactly and if type does not match, the expectation will fail. | expected/actual
data-type | distance data-type | @@ -1118,12 +1122,13 @@ The data-types of compared values must match exactly and if type does not match, | timestamp with local time zone | interval year to month | -The distance can be expressed as a postive number or positive interval. +The distance must be expressed as a non-negative number or non-negative interval. >Note: > Interval year-to-moth as a distance is giving sucess if the distance between the given dates/timestamps evaluates to value less or equal of the specified interval -> Keep in mind that a distance of `interval '0-1' year to month` will actuall be successful if the distance isnot greater than a month and a half. -> This is due to how oracle evaluates conversion between timestamp difference converted to `year to month interval`. +> Keep in mind that a checking for distance of `interval '0-1' year to month` will actuall be successful if the distance is less than a month and 15 days. +> This is due to how oracle evaluates conversion between timestamp difference converted to `year to month interval`. +> The behavior is similar to a call to `months_between()` function with results rounded to full monts ie. round(months_between(date, date)) **Example 1.** ```sql @@ -1172,17 +1177,14 @@ Failures: ## to_be_within_pct of -This matcher is created to determine wheter expected value is approximately equal or "close" to another value within percentage value of expected. - -Matcher will allow to compare numbers. - -When comparing a number the tolerance / distance can be expressed as another postive number or a percentage. - -When comparing a two dates tolerance can be expressed in interval time either Day-To-Second or Year-To-Month. - -Matcher for numbers will calculate a absolute distance between expected and actual and check whether that value is within a tolerance. +Determines wheter actual value is within percentage range of expected value. +The matcher only works with `number` data-type. -When comparing a date a distance is measured in interval, the check is done that actual value is within date range of expected taking into account interval plus and minus. +The percentage deviation (distance) must be expressed as a non-negative number. +The formula used for calcuation of expectation is: +``` + result := ( ( distance ) * expected >= abs( expected - actual ) * 100 ) +``` **Example 1.** ```sql @@ -1192,6 +1194,11 @@ end; / ``` +``` +SUCCESS + Actual: 9 (number) was expected to be within 10 % of 10 (number) +``` + ## Comparing cursors, object types, nested tables and varrays diff --git a/source/expectations/matchers/ut_be_within_pct.tpb b/source/expectations/matchers/ut_be_within_pct.tpb index fabab2d09..8b280ffff 100644 --- a/source/expectations/matchers/ut_be_within_pct.tpb +++ b/source/expectations/matchers/ut_be_within_pct.tpb @@ -52,9 +52,8 @@ create or replace type body ut_be_within_pct as if self.expected.data_type = a_actual.data_type then if self.expected is of (ut_data_value_number) then l_result := - treat(self.distance_from_expected as ut_data_value_number).data_value - >= ( ( treat(self.expected as ut_data_value_number).data_value - treat(a_actual as ut_data_value_number).data_value ) * 100 ) / - treat(self.expected as ut_data_value_number).data_value; + abs(treat(self.distance_from_expected as ut_data_value_number).data_value) * treat(self.expected as ut_data_value_number).data_value + >= abs( ( treat(self.expected as ut_data_value_number).data_value - treat(a_actual as ut_data_value_number).data_value ) * 100 ); end if; else l_result := (self as ut_matcher).run_matcher(a_actual); diff --git a/test/ut3_user/expectations/binary/test_to_be_within_pct.pkb b/test/ut3_user/expectations/binary/test_to_be_within_pct.pkb index d1e71943a..5214b540c 100644 --- a/test/ut3_user/expectations/binary/test_to_be_within_pct.pkb +++ b/test/ut3_user/expectations/binary/test_to_be_within_pct.pkb @@ -125,6 +125,27 @@ create or replace package body test_to_be_within_pct is ut3_develop.ut.expect( 2.987654321 ).not_to( ut3_develop.be_within_pct( 0.1 ).of_(3) ); expect_success; + + ut3_develop.ut.expect( 3.012345679 ).to_be_within_pct( 1 ).of_(3); + expect_success; + + ut3_develop.ut.expect( 3.012345679 ).to_( ut3_develop.be_within_pct( 1 ).of_(3) ); + expect_success; + + ut3_develop.ut.expect( 3.012345679 ).not_to_be_within_pct( 0.1 ).of_(3); + expect_success; + + ut3_develop.ut.expect( 3.012345679 ).not_to( ut3_develop.be_within_pct( 0.1 ).of_(3) ); + expect_success; + + ut3_develop.ut.expect( 0 ).to_be_within_pct( 10 ).of_( 0 ); + expect_success; + + ut3_develop.ut.expect( 0 ).to_be_within_pct( 100 ).of_( 1 ); + expect_success; + + ut3_develop.ut.expect( -1 ).to_be_within_pct( 200 ).of_( 1 ); + expect_success; end; procedure failed_tests is @@ -140,6 +161,21 @@ create or replace package body test_to_be_within_pct is ut3_develop.ut.expect( 2.987654321 ).not_to( ut3_develop.be_within_pct( 1 ).of_(3) ); expect_failure; + + ut3_develop.ut.expect( 3.012345679 ).to_be_within_pct( 0.1 ).of_(3); + expect_failure; + + ut3_develop.ut.expect( 3.012345679 ).to_( ut3_develop.be_within_pct( 0.1 ).of_(3) ); + expect_failure; + + ut3_develop.ut.expect( 3.012345679 ).not_to_be_within_pct( 1 ).of_(3); + expect_failure; + + ut3_develop.ut.expect( 3.012345679 ).not_to( ut3_develop.be_within_pct( 1 ).of_(3) ); + expect_failure; + + ut3_develop.ut.expect( 0.1 ).to_be_within_pct( 10 ).of_( 0 ); + expect_failure; end; procedure fail_for_number_not_within is From fd7ef9c14111a48e03fff7851f990c7192539170 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 3 Feb 2022 01:39:09 +0200 Subject: [PATCH 0848/1096] Fixed issues with precission of distance. `NATURAL` is a subtype of integer and cannot be used to express a decimal distace value. Improved tests coverage for various scenarios. --- source/expectations/ut_expectation.tpb | 8 ++-- source/expectations/ut_expectation.tps | 10 ++--- .../binary/test_to_be_within_pct.pkb | 42 +++++++++++-------- 3 files changed, 33 insertions(+), 27 deletions(-) diff --git a/source/expectations/ut_expectation.tpb b/source/expectations/ut_expectation.tpb index cc5bfe0ca..dabe8fbff 100644 --- a/source/expectations/ut_expectation.tpb +++ b/source/expectations/ut_expectation.tpb @@ -694,7 +694,7 @@ create or replace type body ut_expectation as self.not_to( ut_contain(a_expected).negated() ); end; - member function to_be_within(a_dist natural) return ut_be_within is + member function to_be_within(a_dist number) return ut_be_within is l_result ut_be_within; begin l_result := ut_be_within(a_dist); @@ -718,7 +718,7 @@ create or replace type body ut_expectation as return l_result; end; - member function to_be_within_pct(a_dist natural) return ut_be_within_pct is + member function to_be_within_pct(a_dist number) return ut_be_within_pct is l_result ut_be_within_pct; begin l_result := ut_be_within_pct(a_dist); @@ -726,7 +726,7 @@ create or replace type body ut_expectation as return l_result; end; - member function not_to_be_within(a_dist natural) return ut_be_within is + member function not_to_be_within(a_dist number) return ut_be_within is l_result ut_be_within; begin l_result := treat( ut_be_within(a_dist).negated() as ut_be_within); @@ -750,7 +750,7 @@ create or replace type body ut_expectation as return l_result; end; - member function not_to_be_within_pct(a_dist natural) return ut_be_within_pct is + member function not_to_be_within_pct(a_dist number) return ut_be_within_pct is l_result ut_be_within_pct; begin l_result := treat( ut_be_within_pct(a_dist).negated() as ut_be_within_pct); diff --git a/source/expectations/ut_expectation.tps b/source/expectations/ut_expectation.tps index ce58fc2e0..86edc9cee 100644 --- a/source/expectations/ut_expectation.tps +++ b/source/expectations/ut_expectation.tps @@ -1,4 +1,4 @@ -create or replace type ut_expectation under ut_expectation_base( +create or replace type ut_expectation force under ut_expectation_base( /* utPLSQL - Version 3 Copyright 2016 - 2021 utPLSQL Project @@ -164,14 +164,14 @@ create or replace type ut_expectation under ut_expectation_base( member procedure to_contain(self in ut_expectation, a_expected anydata), member procedure not_to_contain(self in ut_expectation, a_expected anydata), - member function to_be_within(a_dist natural) return ut_be_within, + member function to_be_within(a_dist number) return ut_be_within, member function to_be_within(a_dist dsinterval_unconstrained) return ut_be_within, member function to_be_within(a_dist yminterval_unconstrained) return ut_be_within, - member function to_be_within_pct(a_dist natural) return ut_be_within_pct, - member function not_to_be_within(a_dist natural) return ut_be_within, + member function to_be_within_pct(a_dist number) return ut_be_within_pct, + member function not_to_be_within(a_dist number) return ut_be_within, member function not_to_be_within(a_dist dsinterval_unconstrained) return ut_be_within, member function not_to_be_within(a_dist yminterval_unconstrained) return ut_be_within, - member function not_to_be_within_pct(a_dist natural) return ut_be_within_pct + member function not_to_be_within_pct(a_dist number) return ut_be_within_pct ) not final / diff --git a/test/ut3_user/expectations/binary/test_to_be_within_pct.pkb b/test/ut3_user/expectations/binary/test_to_be_within_pct.pkb index 5214b540c..da634d90e 100644 --- a/test/ut3_user/expectations/binary/test_to_be_within_pct.pkb +++ b/test/ut3_user/expectations/binary/test_to_be_within_pct.pkb @@ -114,31 +114,31 @@ create or replace package body test_to_be_within_pct is procedure success_tests is begin - ut3_develop.ut.expect( 2.987654321 ).to_be_within_pct( 1 ).of_(3); + ut3_develop.ut.expect( 1 ).to_be_within_pct( 0.01 ).of_(1.0001); expect_success; - ut3_develop.ut.expect( 2.987654321 ).to_( ut3_develop.be_within_pct( 1 ).of_(3) ); + ut3_develop.ut.expect( 1.0001 ).to_( ut3_develop.be_within_pct( 0.01 ).of_(1) ); expect_success; - ut3_develop.ut.expect( 2.987654321 ).not_to_be_within_pct( 0.1 ).of_(3); + ut3_develop.ut.expect( 1.0002 ).not_to_be_within_pct( 0.01 ).of_(1); expect_success; - ut3_develop.ut.expect( 2.987654321 ).not_to( ut3_develop.be_within_pct( 0.1 ).of_(3) ); + ut3_develop.ut.expect( 1 ).not_to( ut3_develop.be_within_pct( 0.01 ).of_(1.0002) ); expect_success; - ut3_develop.ut.expect( 3.012345679 ).to_be_within_pct( 1 ).of_(3); + ut3_develop.ut.expect( 1.0001 ).to_be_within_pct( -0.01 ).of_(1); expect_success; - ut3_develop.ut.expect( 3.012345679 ).to_( ut3_develop.be_within_pct( 1 ).of_(3) ); + ut3_develop.ut.expect( 1 ).to_( ut3_develop.be_within_pct( -0.01 ).of_(1.0001) ); expect_success; - ut3_develop.ut.expect( 3.012345679 ).not_to_be_within_pct( 0.1 ).of_(3); + ut3_develop.ut.expect( 1.00000001 ).not_to_be_within_pct( 0 ).of_(1); expect_success; - ut3_develop.ut.expect( 3.012345679 ).not_to( ut3_develop.be_within_pct( 0.1 ).of_(3) ); + ut3_develop.ut.expect( 0 ).not_to( ut3_develop.be_within_pct( 0.01 ).of_(0.000001) ); expect_success; - ut3_develop.ut.expect( 0 ).to_be_within_pct( 10 ).of_( 0 ); + ut3_develop.ut.expect( 0 ).to_be_within_pct( 0 ).of_( 0 ); expect_success; ut3_develop.ut.expect( 0 ).to_be_within_pct( 100 ).of_( 1 ); @@ -150,31 +150,37 @@ create or replace package body test_to_be_within_pct is procedure failed_tests is begin - ut3_develop.ut.expect( 2.987654321 ).to_be_within_pct( 0.1 ).of_(3); + ut3_develop.ut.expect( 1 ).not_to_be_within_pct( 0.01 ).of_(1.0001); expect_failure; - ut3_develop.ut.expect( 2.987654321 ).to_( ut3_develop.be_within_pct( 0.1 ).of_(3) ); + ut3_develop.ut.expect( 1.0001 ).not_to( ut3_develop.be_within_pct( 0.01 ).of_(1) ); expect_failure; - ut3_develop.ut.expect( 2.987654321 ).not_to_be_within_pct( 1 ).of_(3); + ut3_develop.ut.expect( 1.0002 ).to_be_within_pct( 0.01 ).of_(1); expect_failure; - ut3_develop.ut.expect( 2.987654321 ).not_to( ut3_develop.be_within_pct( 1 ).of_(3) ); + ut3_develop.ut.expect( 1 ).to_( ut3_develop.be_within_pct( 0.01 ).of_(1.0002) ); expect_failure; - ut3_develop.ut.expect( 3.012345679 ).to_be_within_pct( 0.1 ).of_(3); + ut3_develop.ut.expect( 1.0001 ).not_to_be_within_pct( -0.01 ).of_(1); expect_failure; - ut3_develop.ut.expect( 3.012345679 ).to_( ut3_develop.be_within_pct( 0.1 ).of_(3) ); + ut3_develop.ut.expect( 1 ).not_to( ut3_develop.be_within_pct( -0.01 ).of_(1.0001) ); expect_failure; - ut3_develop.ut.expect( 3.012345679 ).not_to_be_within_pct( 1 ).of_(3); + ut3_develop.ut.expect( 1.00000001 ).to_be_within_pct( 0 ).of_(1); expect_failure; - ut3_develop.ut.expect( 3.012345679 ).not_to( ut3_develop.be_within_pct( 1 ).of_(3) ); + ut3_develop.ut.expect( 0 ).to_( ut3_develop.be_within_pct( 0.01 ).of_(0.000001) ); expect_failure; - ut3_develop.ut.expect( 0.1 ).to_be_within_pct( 10 ).of_( 0 ); + ut3_develop.ut.expect( 0 ).not_to_be_within_pct( 0 ).of_( 0 ); + expect_failure; + + ut3_develop.ut.expect( 0 ).not_to_be_within_pct( 100 ).of_( 1 ); + expect_failure; + + ut3_develop.ut.expect( -1 ).not_to_be_within_pct( 200 ).of_( 1 ); expect_failure; end; From 3b7b9445ef44faf2d3c32df76efde17ed0009012 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 5 Feb 2022 00:46:57 +0200 Subject: [PATCH 0849/1096] Composing a separate build string for sonar analysis on parallel builds --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8703e24d9..5d6c5391f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -135,6 +135,9 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + with: + args: > + -Dsonar.buildString=${{ format( '{0}.{1}', env.UTPLSQL_BUILD_VERSION, matrix.id ) }} publish: name: Deploy documentation From f216a282c98158496261bc8c61a6a25d7852d0ab Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 5 Feb 2022 01:23:07 +0200 Subject: [PATCH 0850/1096] Adding data-dictionary analysis --- .github/workflows/build.yml | 2 ++ sonar-project.properties | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5d6c5391f..0d5d3267d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -138,6 +138,8 @@ jobs: with: args: > -Dsonar.buildString=${{ format( '{0}.{1}', env.UTPLSQL_BUILD_VERSION, matrix.id ) }} + -Dsonar.plsql.jdbc.url=${{ format( 'jdbc:oracle:thin:@{0}', env.CONNECTION_STR ) }} + -Dsonar.plsql.jdbc.driver.path=${{ format( '{0}/ojdbc8.jar', env.OJDBC_HOME ) }} publish: name: Deploy documentation diff --git a/sonar-project.properties b/sonar-project.properties index b68d13879..7559b58a1 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -29,9 +29,9 @@ sonar.pullrequest.github.endpoint=https://api.github.com/ sonar.pullrequest.github.repository=utPLSQL/utPLSQL sonar.plsql.jdbc.driver.class=oracle.jdbc.OracleDriver -sonar.plsql.jdbc.user=UT3 +sonar.plsql.jdbc.user=UT3_DEVELOP sonar.plsql.jdbc.password=ut3 -sonar.plsql.defaultSchema=UT3 +sonar.plsql.defaultSchema=UT3_DEVELOP # Encoding of the source code. Default is default system encoding From 3f4d2f601088e399c4f25ae57f72a070851b5233 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 6 Feb 2022 00:47:51 +0200 Subject: [PATCH 0851/1096] Adding Codecov. Trying to fix Sonar DB level analysis. --- .github/workflows/build.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0d5d3267d..209cb0fe1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -129,6 +129,15 @@ jobs: id: validate-reports-format run: bash .github/scripts/validate_report_files.sh + - name: Codecov + uses: codecov/codecov-action@v2 + with: + token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos + files: ./cobertura.xml + flags: ${{matrix.db_version_name}} + fail_ci_if_error: true # optional (default = false) + verbose: true # optional (default = false) + - name: SonarCloud Scan id: sonar uses: SonarSource/sonarcloud-github-action@master @@ -138,7 +147,7 @@ jobs: with: args: > -Dsonar.buildString=${{ format( '{0}.{1}', env.UTPLSQL_BUILD_VERSION, matrix.id ) }} - -Dsonar.plsql.jdbc.url=${{ format( 'jdbc:oracle:thin:@{0}', env.CONNECTION_STR ) }} + -Dsonar.plsql.jdbc.url=${{ format( 'jdbc:oracle:thin:@//{0}', env.CONNECTION_STR ) }} -Dsonar.plsql.jdbc.driver.path=${{ format( '{0}/ojdbc8.jar', env.OJDBC_HOME ) }} publish: From 0e5d40401b0e57a4450d94a402dfb5067fa7a755 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 6 Feb 2022 01:18:53 +0200 Subject: [PATCH 0852/1096] Trying to fix Sonar DB level analysis. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 209cb0fe1..a0ed47f21 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -147,7 +147,7 @@ jobs: with: args: > -Dsonar.buildString=${{ format( '{0}.{1}', env.UTPLSQL_BUILD_VERSION, matrix.id ) }} - -Dsonar.plsql.jdbc.url=${{ format( 'jdbc:oracle:thin:@//{0}', env.CONNECTION_STR ) }} + -Dsonar.plsql.jdbc.url=${{ format( 'jdbc:oracle:thin:@//oracle:1521/XE', env.CONNECTION_STR ) }} -Dsonar.plsql.jdbc.driver.path=${{ format( '{0}/ojdbc8.jar', env.OJDBC_HOME ) }} publish: From 6bcf8a4e711af5369bc001178b257060d94bf633 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 6 Feb 2022 01:57:45 +0200 Subject: [PATCH 0853/1096] Parametrizing Sonar Oracle DB SID --- .github/workflows/build.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a0ed47f21..dcf70799f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,6 +19,7 @@ jobs: runs-on: ubuntu-latest env: ORACLE_VERSION: ${{matrix.oracle-version}} + ORACLE_SID: ${{matrix.oracle-sid}} CONNECTION_STR: ${{matrix.connection-str}} ORACLE_PASSWORD: oracle DOCKER_VOLUME: ${{matrix.docker-volume}} @@ -27,31 +28,38 @@ jobs: matrix: include: - oracle-version: "gvenzl/oracle-xe:11-full" + oracle-sid: 'XE' connection-str: '127.0.0.1:1521/XE' id: 1 db_version_name: '11xe' # TODO - need to add healthcheck.sh into our containers # - oracle-version: "utplsqlv3/oracledb:12c-r1-se2-small" +# oracle-sid: 'ORCLCDB' # connection-str: '127.0.0.1:1521/ORCLCDB' # id: 2 # db_version_name: '12.1se' # - oracle-version: "utplsqlv3/oracledb:12c-r2-se2-small" +# oracle-sid: 'ORCLCDB' # connection-str: '127.0.0.1:1521/ORCLCDB' # id: 3 # db_version_name: '12.2se' - oracle-version: "gvenzl/oracle-xe:18-slim" + oracle-sid: 'XE' connection-str: '127.0.0.1:1521/XE' id: 4 db_version_name: '18xe' # - oracle-version: "utplsqlv3/oracledb:18c-se2-small" +# oracle-sid: 'ORCLCDB' # connection-str: '127.0.0.1:1521/ORCLCDB' # id: 5 # db_version_name: '18se' # - oracle-version: "utplsqlv3/oracledb:19c-se2-small" +# oracle-sid: 'ORCLCDB' # connection-str: '127.0.0.1:1521/ORCLCDB' # id: 6 # db_version_name: '19se' - oracle-version: "gvenzl/oracle-xe:21-slim" + oracle-sid: 'XE' connection-str: '127.0.0.1:1521/XE' id: 7 db_version_name: '21xe' @@ -147,7 +155,7 @@ jobs: with: args: > -Dsonar.buildString=${{ format( '{0}.{1}', env.UTPLSQL_BUILD_VERSION, matrix.id ) }} - -Dsonar.plsql.jdbc.url=${{ format( 'jdbc:oracle:thin:@//oracle:1521/XE', env.CONNECTION_STR ) }} + -Dsonar.plsql.jdbc.url=${{ format( 'jdbc:oracle:thin:@//oracle:1521/{0}', env.ORACLE_SID ) }} -Dsonar.plsql.jdbc.driver.path=${{ format( '{0}/ojdbc8.jar', env.OJDBC_HOME ) }} publish: From afa7bce4b73e0b1d8223d84d73e13680c5aecea0 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 6 Feb 2022 02:25:54 +0200 Subject: [PATCH 0854/1096] Adding test results publishing --- .github/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dcf70799f..4ad7a176d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -146,6 +146,12 @@ jobs: fail_ci_if_error: true # optional (default = false) verbose: true # optional (default = false) + - name: Publish unit test results + uses: EnricoMi/publish-unit-test-result-action@v1.24 + if: always() + with: + files: junit_test_results.xml + - name: SonarCloud Scan id: sonar uses: SonarSource/sonarcloud-github-action@master From 1448ef1e6977ec5adeba67562480367b049e434a Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 6 Feb 2022 16:36:22 +0200 Subject: [PATCH 0855/1096] CodeCov changes --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4ad7a176d..05fc26c3a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -144,7 +144,6 @@ jobs: files: ./cobertura.xml flags: ${{matrix.db_version_name}} fail_ci_if_error: true # optional (default = false) - verbose: true # optional (default = false) - name: Publish unit test results uses: EnricoMi/publish-unit-test-result-action@v1.24 From 02bf59985086e94732b9d5e5cd8b03f05f8c8040 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 6 Feb 2022 14:53:01 +0000 Subject: [PATCH 0856/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 9d2c26e0b..5747ee5e0 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 67cb1a976..01f39d138 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 92889b02c..4294753e7 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 33db70018..adec7b7dc 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index a459f259a..7a11e5132 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 340952f7e..c22fd54bb 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index cade9ac97..f44da6f6a 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 270f07a8e..e4dca3223 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index a6037b4e2..265c65bdb 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 11cad317f..e0ddfa62b 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 0db801ccf..08ae9e3a3 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 7610573e5..623abfda5 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 548a2cb5a..17225bc88 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 88a724257..64ab627cf 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index dae47df96..44d5c81a9 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 6731fada4..36ce5aa31 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index cde37ed6d..2370743c8 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 93bf00bd3..44aaf4e5e 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -788,7 +788,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.12.3742-develop + * secion v3.1.12.3791-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index f8a9f6b47..99512e1b4 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.12.3742-develop'; + gc_version constant varchar2(50) := 'v3.1.12.3791-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 987d3911c703ce9da8334b6a4cc3a8c9d0d4c49f Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sun, 6 Feb 2022 15:49:24 +0000 Subject: [PATCH 0857/1096] Update code. --- docs/userguide/annotations.md | 58 +- source/api/ut_suite_item_info.tpb | 6 +- source/api/ut_suite_item_info.tps | 3 +- source/core/types/ut_logical_suite.tpb | 4 +- source/core/types/ut_logical_suite.tps | 4 +- source/core/types/ut_run.tpb | 2 +- source/core/types/ut_run.tps | 2 +- source/core/types/ut_suite.tpb | 2 +- source/core/types/ut_suite_cache_row.tps | 3 +- source/core/types/ut_suite_item.tpb | 1 + source/core/types/ut_suite_item.tps | 6 +- source/core/types/ut_test.tpb | 5 +- source/core/types/ut_test.tps | 2 +- source/core/ut_suite_builder.pkb | 14 +- source/core/ut_suite_cache_manager.pkb | 12 +- source/core/ut_suite_manager.pkb | 14 +- .../reporters/ut_documentation_reporter.tpb | 6 +- test/install_ut3_tester_tests.sql | 2 + .../test_annot_disabled_reason.pkb | 533 ++++++++++++++++++ .../test_annot_disabled_reason.pks | 31 + test/ut3_user/api/test_ut_runner.pkb | 20 +- 21 files changed, 685 insertions(+), 45 deletions(-) create mode 100644 test/ut3_tester/core/annotations/test_annot_disabled_reason.pkb create mode 100644 test/ut3_tester/core/annotations/test_annot_disabled_reason.pks diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 1b9b4faee..92cae5d71 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -140,7 +140,7 @@ end; | `--%beforetest([[.].][,...])` | Procedure | Denotes that mentioned procedure(s) should be executed before the annotated `%test` procedure. | | `--%aftertest([[.].][,...])` | Procedure | Denotes that mentioned procedure(s) should be executed after the annotated `%test` procedure. | | `--%rollback()` | Package/procedure | Defines transaction control. Supported values: `auto`(default) - a savepoint is created before invocation of each "before block" is and a rollback to specific savepoint is issued after each "after" block; `manual` - rollback is never issued automatically. Property can be overridden for child element (test in suite) | -| `--%disabled` | Package/procedure | Used to disable a suite or a test. Disabled suites/tests do not get executed, they are however marked and reported as disabled in a test run. | +| `--%disabled()` | Package/procedure | Used to disable a suite, whole context or a test. Disabled suites/contexts/tests do not get executed, they are however marked and reported as disabled in a test run. The reason that will be displayed next to disabled tests is decided based on hierarchy suites -> context -> test | | `--%context()` | Package | Denotes start of a named context (sub-suite) in a suite package an optional description for context can be provided. | | `--%name()` | Package | Denotes name for a context. Must be placed after the context annotation and before start of nested context. | | `--%endcontext` | Package | Denotes end of a nested context (sub-suite) in a suite package | @@ -343,12 +343,13 @@ Finished in .008815 seconds ### Disabled Marks annotated suite package or test procedure as disabled. +You can provide the reason why the test is disabled that will be displayed in output. Disabling suite. ```sql create or replace package test_package as --%suite(Tests for a package) - --%disabled + --%disabled(Reason for disabling suite) --%test(Description of tested behavior) procedure some_test; @@ -371,13 +372,58 @@ exec ut.run('test_package'); ``` ``` Tests for a package - Description of tested behavior [0 sec] (DISABLED) - Description of another behavior [0 sec] (DISABLED) + Description of tested behavior [0 sec] (DISABLED - Reason for disabling suite) + Description of another behavior [0 sec] (DISABLED - Reason for disabling suite) Finished in .001441 seconds 2 tests, 0 failed, 0 errored, 2 disabled, 0 warning(s) ``` +Disabling the context(s). +```sql +create or replace package test_package as + --%suite(Tests for a package) + + --%context(Context1) + + --%test(Description of tested behavior) + procedure some_test; + + --%endcontext + + --%context(Context2) + + --%disabled(Reason for disabling context2) + + --%test(Description of another behavior) + procedure other_test; + + --%endcontext +end; +/ +create or replace package body test_package as + + procedure some_test is begin null; end; + + procedure other_test is begin null; end; +end; +/ +``` + +```sql +exec ut.run('test_package'); +``` +``` +Tests for a package + Context1 + Description of tested behavior [.002 sec] + Context2 + Description of another behavior [0 sec] (DISABLED - Reason for disabling context2) + +Finished in .005079 seconds +2 tests, 0 failed, 0 errored, 1 disabled, 0 warning(s) +``` + Disabling individual test(s). ```sql create or replace package test_package as @@ -387,7 +433,7 @@ create or replace package test_package as procedure some_test; --%test(Description of another behavior) - --%disabled + --%disabled(Reason for disabling test) procedure other_test; end; / @@ -406,7 +452,7 @@ exec ut.run('test_package'); ``` Tests for a package Description of tested behavior [.004 sec] - Description of another behavior [0 sec] (DISABLED) + Description of another behavior [0 sec] (DISABLED - Reason for disabling test) Finished in .005868 seconds 2 tests, 0 failed, 0 errored, 1 disabled, 0 warning(s) diff --git a/source/api/ut_suite_item_info.tpb b/source/api/ut_suite_item_info.tpb index 97d931c59..3315f7a16 100644 --- a/source/api/ut_suite_item_info.tpb +++ b/source/api/ut_suite_item_info.tpb @@ -17,7 +17,7 @@ create or replace type body ut_suite_item_info is */ constructor function ut_suite_item_info(a_object_owner varchar2, a_object_name varchar2, a_item_name varchar2, a_item_description varchar2, a_item_type varchar2, a_item_line_no integer, a_path varchar2, a_disabled_flag integer, - a_tags ut_varchar2_rows) return self as result is + a_disabled_reason varchar2, a_tags ut_varchar2_rows) return self as result is begin self.object_owner := a_object_owner; self.object_name := a_object_name; @@ -27,6 +27,10 @@ create or replace type body ut_suite_item_info is self.item_line_no := a_item_line_no; self.path := a_path; self.disabled_flag := a_disabled_flag; + self.disabled_reason := case when + a_disabled_flag = 1 then a_disabled_reason + else null + end; self.tags := case when a_tags is null then null when a_tags.count = 0 then null diff --git a/source/api/ut_suite_item_info.tps b/source/api/ut_suite_item_info.tps index 2c0f16198..2c92f261d 100644 --- a/source/api/ut_suite_item_info.tps +++ b/source/api/ut_suite_item_info.tps @@ -23,9 +23,10 @@ create or replace type ut_suite_item_info as object ( item_line_no integer, -- line_number where annotation identifying the item exists path varchar2( 4000 ),-- suitepath of the item disabled_flag integer, -- 0 (zero) if item is not disabled, 1 if item is disabled by --%disabled annotation + disabled_reason varchar2(4000), -- if disable flag is set then you can pass reason tags varchar2(4000), constructor function ut_suite_item_info(a_object_owner varchar2, a_object_name varchar2, a_item_name varchar2, a_item_description varchar2, a_item_type varchar2, a_item_line_no integer, a_path varchar2, a_disabled_flag integer, - a_tags ut_varchar2_rows) return self as result + a_disabled_reason varchar2, a_tags ut_varchar2_rows) return self as result ) / diff --git a/source/core/types/ut_logical_suite.tpb b/source/core/types/ut_logical_suite.tpb index 486cb83e7..036d40d51 100644 --- a/source/core/types/ut_logical_suite.tpb +++ b/source/core/types/ut_logical_suite.tpb @@ -16,12 +16,12 @@ create or replace type body ut_logical_suite as limitations under the License. */ - overriding member procedure mark_as_skipped(self in out nocopy ut_logical_suite) is + overriding member procedure mark_as_skipped(self in out nocopy ut_logical_suite, a_skip_reason in varchar2) is begin ut_event_manager.trigger_event(ut_event_manager.gc_before_suite, self); self.start_time := current_timestamp; for i in 1 .. self.items.count loop - self.items(i).mark_as_skipped(); + self.items(i).mark_as_skipped(coalesce(a_skip_reason,self.disabled_reason)); end loop; self.end_time := self.start_time; ut_event_manager.trigger_event(ut_event_manager.gc_after_suite, self); diff --git a/source/core/types/ut_logical_suite.tps b/source/core/types/ut_logical_suite.tps index 0f816f26b..c4f2f699b 100644 --- a/source/core/types/ut_logical_suite.tps +++ b/source/core/types/ut_logical_suite.tps @@ -1,4 +1,4 @@ -create or replace type ut_logical_suite under ut_suite_item ( +create or replace type ut_logical_suite force under ut_suite_item ( /* utPLSQL - Version 3 Copyright 2016 - 2021 utPLSQL Project @@ -21,7 +21,7 @@ create or replace type ut_logical_suite under ut_suite_item ( */ items ut_suite_items, - overriding member procedure mark_as_skipped(self in out nocopy ut_logical_suite), + overriding member procedure mark_as_skipped(self in out nocopy ut_logical_suite, a_skip_reason in varchar2), overriding member procedure set_rollback_type(self in out nocopy ut_logical_suite, a_rollback_type integer, a_force boolean := false), overriding member function do_execute(self in out nocopy ut_logical_suite) return boolean, overriding member procedure calc_execution_result(self in out nocopy ut_logical_suite), diff --git a/source/core/types/ut_run.tpb b/source/core/types/ut_run.tpb index 258396427..cdafb30fc 100644 --- a/source/core/types/ut_run.tpb +++ b/source/core/types/ut_run.tpb @@ -39,7 +39,7 @@ create or replace type body ut_run as return; end; - overriding member procedure mark_as_skipped(self in out nocopy ut_run) is + overriding member procedure mark_as_skipped(self in out nocopy ut_run,a_skip_reason in varchar2) is begin null; end; diff --git a/source/core/types/ut_run.tps b/source/core/types/ut_run.tps index f556934ce..debf847cd 100644 --- a/source/core/types/ut_run.tps +++ b/source/core/types/ut_run.tps @@ -36,7 +36,7 @@ create or replace type ut_run under ut_suite_item ( a_random_test_order_seed positive := null, a_run_tags ut_varchar2_rows := null ) return self as result, - overriding member procedure mark_as_skipped(self in out nocopy ut_run), + overriding member procedure mark_as_skipped(self in out nocopy ut_run,a_skip_reason in varchar2), overriding member function do_execute(self in out nocopy ut_run) return boolean, overriding member procedure set_rollback_type(self in out nocopy ut_run, a_rollback_type integer, a_force boolean := false), overriding member procedure calc_execution_result(self in out nocopy ut_run), diff --git a/source/core/types/ut_suite.tpb b/source/core/types/ut_suite.tpb index 2ec1c9ccd..e3a4687d8 100644 --- a/source/core/types/ut_suite.tpb +++ b/source/core/types/ut_suite.tpb @@ -44,7 +44,7 @@ create or replace type body ut_suite as ut_utils.debug_log('ut_suite.execute'); if self.get_disabled_flag() then - self.mark_as_skipped(); + self.mark_as_skipped(a_skip_reason => self.disabled_reason); else self.start_time := current_timestamp; ut_event_manager.trigger_event(ut_event_manager.gc_before_suite, self); diff --git a/source/core/types/ut_suite_cache_row.tps b/source/core/types/ut_suite_cache_row.tps index 9c5990bfd..c147a8757 100644 --- a/source/core/types/ut_suite_cache_row.tps +++ b/source/core/types/ut_suite_cache_row.tps @@ -1,4 +1,4 @@ -create type ut_suite_cache_row as object ( +create or replace type ut_suite_cache_row as object ( /* utPLSQL - Version 3 Copyright 2016 - 2021 utPLSQL Project @@ -26,6 +26,7 @@ create type ut_suite_cache_row as object ( description varchar2(4000 byte), rollback_type number, disabled_flag number, + disabled_reason varchar2(4000 byte), warnings ut_varchar2_rows, before_all_list ut_executables, after_all_list ut_executables, diff --git a/source/core/types/ut_suite_item.tpb b/source/core/types/ut_suite_item.tpb index 12f857cba..648f10dd1 100644 --- a/source/core/types/ut_suite_item.tpb +++ b/source/core/types/ut_suite_item.tpb @@ -26,6 +26,7 @@ create or replace type body ut_suite_item as self.line_no := a_line_no; self.transaction_invalidators := ut_varchar2_list(); self.disabled_flag := ut_utils.boolean_to_int(false); + self.disabled_reason := null; end; member function get_disabled_flag return boolean is diff --git a/source/core/types/ut_suite_item.tps b/source/core/types/ut_suite_item.tps index d96ec8c30..8184f2a63 100644 --- a/source/core/types/ut_suite_item.tps +++ b/source/core/types/ut_suite_item.tps @@ -46,6 +46,10 @@ create or replace type ut_suite_item force under ut_event_item ( */ disabled_flag integer(1), /** + * Indicates reason whysa test is to be disabled by execution + */ + disabled_reason varchar2(4000), + /** * Line no where annotation identifying this item is placed in package */ line_no integer, @@ -66,7 +70,7 @@ create or replace type ut_suite_item force under ut_event_item ( tags ut_varchar2_rows, member procedure init(self in out nocopy ut_suite_item, a_object_owner varchar2, a_object_name varchar2, a_name varchar2, a_line_no integer), member function get_disabled_flag return boolean, - not instantiable member procedure mark_as_skipped(self in out nocopy ut_suite_item), + not instantiable member procedure mark_as_skipped(self in out nocopy ut_suite_item, a_skip_reason in varchar2), member procedure set_rollback_type(self in out nocopy ut_suite_item, a_rollback_type integer, a_force boolean := false), member function get_rollback_type return integer, member function create_savepoint_if_needed return varchar2, diff --git a/source/core/types/ut_test.tpb b/source/core/types/ut_test.tpb index 9a36205c1..946f8990d 100644 --- a/source/core/types/ut_test.tpb +++ b/source/core/types/ut_test.tpb @@ -35,11 +35,12 @@ create or replace type body ut_test as return; end; - overriding member procedure mark_as_skipped(self in out nocopy ut_test) is + overriding member procedure mark_as_skipped(self in out nocopy ut_test, a_skip_reason in varchar2) is begin ut_event_manager.trigger_event(ut_event_manager.gc_before_test, self); self.start_time := current_timestamp; self.result := ut_utils.gc_disabled; + self.disabled_reason := coalesce(a_skip_reason,self.disabled_reason); ut_utils.debug_log('ut_test.execute - disabled'); self.results_count.set_counter_values(self.result); self.end_time := self.start_time; @@ -54,7 +55,7 @@ create or replace type body ut_test as ut_utils.debug_log('ut_test.execute'); if self.get_disabled_flag() then - mark_as_skipped(); + mark_as_skipped(self.disabled_reason); else self.start_time := current_timestamp; ut_event_manager.trigger_event(ut_event_manager.gc_before_test, self); diff --git a/source/core/types/ut_test.tps b/source/core/types/ut_test.tps index 07958ec0f..dbba64961 100644 --- a/source/core/types/ut_test.tps +++ b/source/core/types/ut_test.tps @@ -59,7 +59,7 @@ create or replace type ut_test force under ut_suite_item ( self in out nocopy ut_test, a_object_owner varchar2 := null, a_object_name varchar2, a_name varchar2, a_line_no integer, a_expected_error_codes ut_varchar2_rows := null, a_tags ut_varchar2_rows := null ) return self as result, - overriding member procedure mark_as_skipped(self in out nocopy ut_test), + overriding member procedure mark_as_skipped(self in out nocopy ut_test, a_skip_reason in varchar2), overriding member function do_execute(self in out nocopy ut_test) return boolean, overriding member procedure calc_execution_result(self in out nocopy ut_test), overriding member procedure mark_as_errored(self in out nocopy ut_test, a_error_stack_trace varchar2), diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index 2dac6b4ad..7ad24bd57 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -355,6 +355,7 @@ create or replace package body ut_suite_builder is l_annotation_texts tt_annotation_texts; l_proc_annotations tt_annotations_by_name := a_annotations.by_proc(a_procedure_name); begin + if not l_proc_annotations.exists(gc_test) then return; end if; @@ -412,6 +413,12 @@ create or replace package body ut_suite_builder is end if; l_test.disabled_flag := ut_utils.boolean_to_int( l_proc_annotations.exists( gc_disabled)); + if l_proc_annotations.exists(gc_disabled) then + l_annotation_texts := l_proc_annotations( gc_disabled); + --take the last definition if more than one was provided + l_test.disabled_reason := l_annotation_texts(l_annotation_texts.first); + end if; + a_suite_items.extend; a_suite_items( a_suite_items.last ) := l_test; @@ -560,8 +567,13 @@ create or replace package body ut_suite_builder is if a_annotations.by_name.exists(gc_tags) then add_tags_to_suite_item(a_suite, a_annotations.by_name(gc_tags),a_suite.tags); end if; + a_suite.disabled_flag := ut_utils.boolean_to_int(a_annotations.by_name.exists(gc_disabled)); - + if a_annotations.by_name.exists(gc_disabled) then + l_annotation_text := trim(a_annotations.by_name(gc_disabled)(a_annotations.by_name(gc_disabled).first)); + a_suite.disabled_reason := l_annotation_text; + end if; + --process procedure annotations for suite get_annotated_procedures(a_annotations, a_suite, a_suite_items, l_before_each_list, l_after_each_list, l_before_all_list, l_after_all_list); diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index 0ae8d7104..ad1634c10 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -67,7 +67,7 @@ create or replace package body ut_suite_cache_manager is select ut_suite_cache_row( null, s.self_type, s.path, s.object_owner, s.object_name, - s.object_name, null, null, null, null, 0, + s.object_name, null, null, null, null, 0,null, ut_varchar2_rows(), s.x, s.x, s.x, s.x, s.x, s.x, s.y, null, s.z @@ -325,7 +325,7 @@ create or replace package body ut_suite_cache_manager is ( id, self_type, path, object_owner, object_name, name, line_no, parse_time, description, - rollback_type, disabled_flag, warnings, + rollback_type, disabled_flag,disabled_reason, warnings, before_all_list, after_all_list, before_each_list, after_each_list, before_test_list, after_test_list, @@ -339,7 +339,7 @@ create or replace package body ut_suite_cache_manager is select /*+ no_parallel */ ut_suite_cache_seq.nextval, s.i.self_type as self_type, s.i.path as path, upper(s.i.object_owner) as object_owner, upper(s.i.object_name) as object_name, upper(s.i.name) as name, s.i.line_no as line_no, s.i.parse_time as parse_time, s.i.description as description, - s.i.rollback_type as rollback_type, s.i.disabled_flag as disabled_flag, s.i.warnings as warnings, + s.i.rollback_type as rollback_type, s.i.disabled_flag as disabled_flag,s.i.disabled_reason as disabled_reason, s.i.warnings as warnings, s.i.before_all_list as before_all_list, s.i.after_all_list as after_all_list, null before_each_list, null after_each_list, null before_test_list, null after_test_list, @@ -351,7 +351,7 @@ create or replace package body ut_suite_cache_manager is ( id, self_type, path, object_owner, object_name, name, line_no, parse_time, description, - rollback_type, disabled_flag, warnings, + rollback_type, disabled_flag,disabled_reason, warnings, before_all_list, after_all_list, before_each_list, after_each_list, before_test_list, after_test_list, @@ -365,7 +365,7 @@ create or replace package body ut_suite_cache_manager is select /*+ no_parallel */ ut_suite_cache_seq.nextval, s.t.self_type as self_type, s.t.path as path, upper(s.t.object_owner) as object_owner, upper(s.t.object_name) as object_name, upper(s.t.name) as name, s.t.line_no as line_no, s.t.parse_time as parse_time, s.t.description as description, - s.t.rollback_type as rollback_type, s.t.disabled_flag as disabled_flag, s.t.warnings as warnings, + s.t.rollback_type as rollback_type, s.t.disabled_flag as disabled_flag, s.t.disabled_reason as disabled_reason, s.t.warnings as warnings, null before_all_list, null after_all_list, s.t.before_each_list as before_each_list, s.t.after_each_list as after_each_list, s.t.before_test_list as before_test_list, s.t.after_test_list as after_test_list, @@ -408,7 +408,7 @@ create or replace package body ut_suite_cache_manager is select /*+ no_parallel */ ut_suite_item_info( c.object_owner, c.object_name, c.name, c.description, c.self_type, c.line_no, - c.path, c.disabled_flag, c.tags + c.path, c.disabled_flag, c.disabled_reason, c.tags ) bulk collect into l_results from table(l_cache_rows) c; diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 8a5bcb9b8..4bcb83afa 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -187,7 +187,7 @@ create or replace package body ut_suite_manager is self_type => a_rows( a_idx ).self_type, object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, - rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, + rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, disabled_reason => a_rows(a_idx).disabled_reason, line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), @@ -200,7 +200,7 @@ create or replace package body ut_suite_manager is self_type => a_rows( a_idx ).self_type, object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, - rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, + rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, disabled_reason => a_rows(a_idx).disabled_reason, line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), @@ -216,7 +216,7 @@ create or replace package body ut_suite_manager is self_type => a_rows( a_idx ).self_type, object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, - rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, + rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, disabled_reason => a_rows(a_idx).disabled_reason, line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), @@ -229,7 +229,7 @@ create or replace package body ut_suite_manager is self_type => a_rows( a_idx ).self_type, object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, - rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, + rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, disabled_reason => a_rows(a_idx).disabled_reason, line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), @@ -245,7 +245,7 @@ create or replace package body ut_suite_manager is self_type => a_rows( a_idx ).self_type, object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, - rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, + rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, disabled_reason => a_rows(a_idx).disabled_reason, line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), @@ -256,7 +256,7 @@ create or replace package body ut_suite_manager is self_type => a_rows( a_idx ).self_type, object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, - rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, + rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, disabled_reason => a_rows(a_idx).disabled_reason, line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), @@ -269,7 +269,7 @@ create or replace package body ut_suite_manager is self_type => a_rows(a_idx).self_type, object_owner => a_rows(a_idx).object_owner, object_name => lower(a_rows(a_idx).object_name), name => lower(a_rows(a_idx).name), description => a_rows(a_idx).description, path => a_rows(a_idx).path, - rollback_type => a_rows(a_idx).rollback_type, disabled_flag => a_rows(a_idx).disabled_flag, + rollback_type => a_rows(a_idx).rollback_type, disabled_flag => a_rows(a_idx).disabled_flag, disabled_reason => a_rows(a_idx).disabled_reason, line_no => a_rows(a_idx).line_no, parse_time => a_rows(a_idx).parse_time, start_time => null, end_time => null, result => null, warnings => a_rows(a_idx).warnings, results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), diff --git a/source/reporters/ut_documentation_reporter.tpb b/source/reporters/ut_documentation_reporter.tpb index 8b92d447f..1dbe0cb92 100644 --- a/source/reporters/ut_documentation_reporter.tpb +++ b/source/reporters/ut_documentation_reporter.tpb @@ -68,7 +68,11 @@ create or replace type body ut_documentation_reporter is l_message := coalesce(a_test.description, a_test.name)||' ['||round(a_test.execution_time,3)||' sec]'; --if test failed, then add it to the failures list, print failure with number if a_test.result = ut_utils.gc_disabled then - self.print_yellow_text(l_message || ' (DISABLED)'); + self.print_yellow_text(l_message || ' (DISABLED'|| + case when a_test.disabled_reason is not null + then ' - '||a_test.disabled_reason + else null + end || ')'); elsif a_test.result = ut_utils.gc_success then self.print_green_text(l_message); elsif a_test.result > ut_utils.gc_success then diff --git a/test/install_ut3_tester_tests.sql b/test/install_ut3_tester_tests.sql index 9548d5148..8163a39f2 100644 --- a/test/install_ut3_tester_tests.sql +++ b/test/install_ut3_tester_tests.sql @@ -14,6 +14,7 @@ alter session set plsql_optimize_level=0; @@ut3_tester/core/annotations/test_annot_throws_exception.pks @@ut3_tester/core/annotations/test_annotation_manager.pks @@ut3_tester/core/annotations/test_annotation_cache.pks +@@ut3_tester/core/annotations/test_annot_disabled_reason.pks @@ut3_tester/core/expectations/test_expectation_processor.pks @@ut3_tester/core/test_ut_utils.pks @@ut3_tester/core/test_ut_test.pks @@ -31,6 +32,7 @@ alter session set plsql_optimize_level=0; @@ut3_tester/core/annotations/test_annotation_manager.pkb @@ut3_tester/core/annotations/test_annot_throws_exception.pkb @@ut3_tester/core/annotations/test_annotation_cache.pkb +@@ut3_tester/core/annotations/test_annot_disabled_reason.pkb @@ut3_tester/core/expectations/test_expectation_processor.pkb @@ut3_tester/core/test_ut_utils.pkb @@ut3_tester/core/test_ut_test.pkb diff --git a/test/ut3_tester/core/annotations/test_annot_disabled_reason.pkb b/test/ut3_tester/core/annotations/test_annot_disabled_reason.pkb new file mode 100644 index 000000000..70015484f --- /dev/null +++ b/test/ut3_tester/core/annotations/test_annot_disabled_reason.pkb @@ -0,0 +1,533 @@ +create or replace package body test_annot_disabled_reason +is + + procedure compile_dummy_packages is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package test_package_1 is + + --%suite + --%displayname(disable_test_suite_level) + --%suitepath(tests) + --%rollback(manual) + + --%disabled( Tests are disabled on suite level ) + + --%context( First context ) + + --%test(Test1 from test package 1) + procedure test1; + + --%test(Test2 from test package 1) + procedure test2; + + --%endcontext + + --%context( Second context ) + + --%test(Test3 from test package 1) + procedure test3; + + --%test(Test4 from test package 1) + procedure test4; + + --%endcontext + +end test_package_1;]'; + + execute immediate q'[create or replace package body test_package_1 is + + procedure test1 is + begin + ut.expect(1).to_equal(1); + end; + + procedure test2 is + begin + ut.expect(2).to_equal(2); + end; + + procedure test3 is + begin + ut.expect(1).to_equal(1); + end; + + procedure test4 is + begin + ut.expect(2).to_equal(2); + end; + +end test_package_1;]'; + + execute immediate q'[create or replace package test_package_2 is + + --%suite + --%displayname(Disable on context level) + --%suitepath(tests) + --%rollback(manual) + + --%context( First context ) + + --%disabled( Tests and disabled on first context level ) + + --%test(Test1 from test package 2) + procedure test1; + + --%test(Test2 from test package 2) + procedure test2; + + --%endcontext + + --%context( Second context ) + + --%test(Test3 from test package 2) + procedure test3; + + --%test(Test4 from test package 3) + procedure test4; + + --%endcontext + +end test_package_2;]'; + + execute immediate q'[create or replace package body test_package_2 is + + procedure test1 is + begin + ut.expect(1).to_equal(1); + end; + + procedure test2 is + begin + ut.expect(2).to_equal(2); + end; + + procedure test3 is + begin + ut.expect(1).to_equal(1); + end; + + procedure test4 is + begin + ut.expect(2).to_equal(2); + end; + +end test_package_2;]'; + + execute immediate q'[create or replace package test_package_3 is + + --%suite + --%displayname(Disable tests on test level) + --%suitepath(tests) + --%rollback(manual) + + --%context( First context ) + + --%test(Test1 from test package 3) + --%disabled( Test1 disabled from first context ) + procedure test1; + + --%test(Test2 from test package 3) + procedure test2; + + --%endcontext + + --%context( Second context ) + + --%test(Test3 from test package 3) + procedure test3; + + --%test(Test4 from test package 3) + --%disabled( Test4 disabled from second context ) + procedure test4; + + --%endcontext + +end test_package_3;]'; + + execute immediate q'[create or replace package body test_package_3 is + + procedure test1 is + begin + ut.expect(1).to_equal(1); + end; + + procedure test2 is + begin + ut.expect(2).to_equal(2); + end; + + procedure test3 is + begin + ut.expect(1).to_equal(1); + end; + + procedure test4 is + begin + ut.expect(2).to_equal(2); + end; + +end test_package_3;]'; + + execute immediate q'[create or replace package test_package_4 is + + --%suite + --%displayname(Disable reason is very long or have special characters) + --%suitepath(tests) + --%rollback(manual) + + + --%test(Test1 from test package 4) + --%disabled( $#?!%*&-/\^ ) + procedure test1; + + --%test(Test2 from test package 4) --%disabled(verylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtext) + procedure test2; + +end test_package_4;]'; + + execute immediate q'[create or replace package body test_package_4 is + + procedure test1 is + begin + ut.expect(1).to_equal(1); + end; + + procedure test2 is + begin + ut.expect(2).to_equal(2); + end; + +end test_package_4;]'; + + execute immediate q'[create or replace package test_package_5 is + + --%suite + --%displayname(Disable tests on suite level overriding rest) + --%suitepath(tests) + --%rollback(manual) + + --%disabled( Disable on suite level ) + + --%context( First context ) + + --%disabled( Disable on 1st context level ) + + --%test(Test1 from test package 3) + --%disabled( Disable on 1st test level ) + procedure test1; + + --%test(Test2 from test package 3) + --%disabled( Disable on 2nd test level ) + procedure test2; + + --%endcontext + + --%context( Second context ) + + --%disabled( Disable on 2nd context level ) + + --%test(Test3 from test package 3) + --%disabled( Disable on 3rd test level ) + procedure test3; + + --%test(Test4 from test package 3) + --%disabled( Disable on 4th test level ) + procedure test4; + + --%endcontext + +end test_package_5;]'; + + execute immediate q'[create or replace package body test_package_5 is + + procedure test1 is + begin + ut.expect(1).to_equal(1); + end; + + procedure test2 is + begin + ut.expect(2).to_equal(2); + end; + + procedure test3 is + begin + ut.expect(1).to_equal(1); + end; + + procedure test4 is + begin + ut.expect(2).to_equal(2); + end; + +end test_package_5;]'; + + execute immediate q'[create or replace package test_package_6 is + + --%suite + --%displayname(Disable tests on each of ctx level overriding rest) + --%suitepath(tests) + --%rollback(manual) + + --%context( First context ) + + --%disabled( Disable on 1st context level ) + + --%test(Test1 from test package 3) + --%disabled( Disable on 1st test level ) + procedure test1; + + --%test(Test2 from test package 3) + --%disabled( Disable on 2nd test level ) + procedure test2; + + --%endcontext + + --%context( Second context ) + + --%disabled( Disable on 2nd context level ) + + --%test(Test3 from test package 3) + --%disabled( Disable on 3rd test level ) + procedure test3; + + --%test(Test4 from test package 3) + --%disabled( Disable on 4th test level ) + procedure test4; + + --%endcontext + +end test_package_6;]'; + + execute immediate q'[create or replace package body test_package_6 is + + procedure test1 is + begin + ut.expect(1).to_equal(1); + end; + + procedure test2 is + begin + ut.expect(2).to_equal(2); + end; + + procedure test3 is + begin + ut.expect(1).to_equal(1); + end; + + procedure test4 is + begin + ut.expect(2).to_equal(2); + end; + +end test_package_6;]'; + + end; + + + procedure drop_dummy_packages is + pragma autonomous_transaction; + begin + execute immediate 'drop package test_package_1'; + execute immediate 'drop package test_package_2'; + execute immediate 'drop package test_package_3'; + execute immediate 'drop package test_package_4'; + execute immediate 'drop package test_package_5'; + execute immediate 'drop package test_package_6'; + end; + + procedure test_disable_on_suite_level is + c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||'.test_package_1'; + l_objects_to_run ut3_develop.ut_suite_items; + + l_test0_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_suite; + begin + --Act + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test0_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); + l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_suite); + + ut.expect(l_test1_suite.items(1).name).to_equal('test1'); + ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).disabled_flag).to_equal(1); + ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).disabled_reason).to_equal('Tests are disabled on suite level'); + + ut.expect(l_test1_suite.items(2).name).to_equal('test2'); + ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).disabled_flag).to_equal(1); + ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).disabled_reason).to_equal('Tests are disabled on suite level'); + + ut.expect(l_test1_suite.items(3).name).to_equal('test3'); + ut.expect(treat(l_test1_suite.items(3) as ut3_develop.ut_test).disabled_flag).to_equal(1); + ut.expect(treat(l_test1_suite.items(3) as ut3_develop.ut_test).disabled_reason).to_equal('Tests are disabled on suite level'); + + ut.expect(l_test1_suite.items(4).name).to_equal('test4'); + ut.expect(treat(l_test1_suite.items(4) as ut3_develop.ut_test).disabled_flag).to_equal(1); + ut.expect(treat(l_test1_suite.items(4) as ut3_develop.ut_test).disabled_reason).to_equal('Tests are disabled on suite level'); + + end; + + procedure test_dis_on_1st_ctx_level is + c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||'.test_package_2'; + l_objects_to_run ut3_develop.ut_suite_items; + + l_test0_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_suite; + begin + --Act + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test0_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); + l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_suite); + + ut.expect(l_test1_suite.items(1).name).to_equal('test1'); + ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).disabled_flag).to_equal(1); + ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).disabled_reason).to_equal('Tests and disabled on first context level'); + + ut.expect(l_test1_suite.items(2).name).to_equal('test2'); + ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).disabled_flag).to_equal(1); + ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).disabled_reason).to_equal('Tests and disabled on first context level'); + + ut.expect(l_test1_suite.items(3).name).to_equal('test3'); + ut.expect(treat(l_test1_suite.items(3) as ut3_develop.ut_test).disabled_flag).to_equal(0); + ut.expect(treat(l_test1_suite.items(3) as ut3_develop.ut_test).disabled_reason).to_be_null; + + ut.expect(l_test1_suite.items(4).name).to_equal('test4'); + ut.expect(treat(l_test1_suite.items(4) as ut3_develop.ut_test).disabled_flag).to_equal(0); + ut.expect(treat(l_test1_suite.items(4) as ut3_develop.ut_test).disabled_reason).to_be_null; + + end; + + procedure test_disable_tests_level is + c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||'.test_package_3'; + l_objects_to_run ut3_develop.ut_suite_items; + + l_test0_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_suite; + begin + --Act + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test0_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); + l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_suite); + + ut.expect(l_test1_suite.items(1).name).to_equal('test1'); + ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).disabled_flag).to_equal(1); + ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).disabled_reason).to_equal('Test1 disabled from first context'); + + ut.expect(l_test1_suite.items(2).name).to_equal('test2'); + ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).disabled_flag).to_equal(0); + ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).disabled_reason).to_be_null; + + ut.expect(l_test1_suite.items(3).name).to_equal('test3'); + ut.expect(treat(l_test1_suite.items(3) as ut3_develop.ut_test).disabled_flag).to_equal(0); + ut.expect(treat(l_test1_suite.items(3) as ut3_develop.ut_test).disabled_reason).to_be_null; + + ut.expect(l_test1_suite.items(4).name).to_equal('test4'); + ut.expect(treat(l_test1_suite.items(4) as ut3_develop.ut_test).disabled_flag).to_equal(1); + ut.expect(treat(l_test1_suite.items(4) as ut3_develop.ut_test).disabled_reason).to_equal('Test4 disabled from second context'); + + end; + + procedure test_long_text_spec_chr is + c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||'.test_package_4'; + l_objects_to_run ut3_develop.ut_suite_items; + + l_test0_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_suite; + begin + --Act + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test0_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); + l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_suite); + + ut.expect(l_test1_suite.items(1).name).to_equal('test1'); + ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).disabled_flag).to_equal(1); + ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).disabled_reason).to_equal('$#?!%*&-/\^'); + + ut.expect(l_test1_suite.items(2).name).to_equal('test2'); + ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).disabled_flag).to_equal(1); + ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).disabled_reason).to_equal('verylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtext'); + + + end; + + procedure test_disable_suite_ctx_tst is + c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||'.test_package_5'; + l_objects_to_run ut3_develop.ut_suite_items; + + l_test0_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_suite; + begin + --Act + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test0_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); + l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_suite); + + ut.expect(l_test1_suite.items(1).name).to_equal('test1'); + ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).disabled_flag).to_equal(1); + ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).disabled_reason).to_equal('Disable on suite level'); + + ut.expect(l_test1_suite.items(2).name).to_equal('test2'); + ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).disabled_flag).to_equal(1); + ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).disabled_reason).to_equal('Disable on suite level'); + + ut.expect(l_test1_suite.items(3).name).to_equal('test3'); + ut.expect(treat(l_test1_suite.items(3) as ut3_develop.ut_test).disabled_flag).to_equal(1); + ut.expect(treat(l_test1_suite.items(3) as ut3_develop.ut_test).disabled_reason).to_equal('Disable on suite level'); + + ut.expect(l_test1_suite.items(4).name).to_equal('test4'); + ut.expect(treat(l_test1_suite.items(4) as ut3_develop.ut_test).disabled_flag).to_equal(1); + ut.expect(treat(l_test1_suite.items(4) as ut3_develop.ut_test).disabled_reason).to_equal('Disable on suite level'); + + end; + + procedure test_disable_ctx_tst is + c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||'.test_package_6'; + l_objects_to_run ut3_develop.ut_suite_items; + + l_test0_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_suite; + begin + --Act + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test0_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); + l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_suite); + + ut.expect(l_test1_suite.items(1).name).to_equal('test1'); + ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).disabled_flag).to_equal(1); + ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).disabled_reason).to_equal('Disable on 1st context level'); + + ut.expect(l_test1_suite.items(2).name).to_equal('test2'); + ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).disabled_flag).to_equal(1); + ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).disabled_reason).to_equal('Disable on 1st context level'); + + ut.expect(l_test1_suite.items(3).name).to_equal('test3'); + ut.expect(treat(l_test1_suite.items(3) as ut3_develop.ut_test).disabled_flag).to_equal(1); + ut.expect(treat(l_test1_suite.items(3) as ut3_develop.ut_test).disabled_reason).to_equal('Disable on 2nd context level'); + + ut.expect(l_test1_suite.items(4).name).to_equal('test4'); + ut.expect(treat(l_test1_suite.items(4) as ut3_develop.ut_test).disabled_flag).to_equal(1); + ut.expect(treat(l_test1_suite.items(4) as ut3_develop.ut_test).disabled_reason).to_equal('Disable on 2nd context level'); + + end; + +end; +/ diff --git a/test/ut3_tester/core/annotations/test_annot_disabled_reason.pks b/test/ut3_tester/core/annotations/test_annot_disabled_reason.pks new file mode 100644 index 000000000..cae5da1ee --- /dev/null +++ b/test/ut3_tester/core/annotations/test_annot_disabled_reason.pks @@ -0,0 +1,31 @@ +create or replace package test_annot_disabled_reason +is + --%suite(annotations - disabled) + --%suitepath(utplsql.ut3_tester.core.annotations) + + --%beforeall + procedure compile_dummy_packages; + + --%afterall + procedure drop_dummy_packages; + + --%test(Disable all tests under the suite displaying suite level reason) + procedure test_disable_on_suite_level; + + --%test(Disable all tests under one of two contexts displaying context level reason) + procedure test_dis_on_1st_ctx_level; + + --%test(Disable a single tests from each of the contexts displaying test level reason) + procedure test_disable_tests_level; + + --%test(Disable tests with reason using special characters and long reason) + procedure test_long_text_spec_chr; + + --%test(Disable tests on suite , context and test level and display suite level reason) + procedure test_disable_suite_ctx_tst; + + --%test(Disable tests on context and test level and display context level reason) + procedure test_disable_ctx_tst; + +end; +/ diff --git a/test/ut3_user/api/test_ut_runner.pkb b/test/ut3_user/api/test_ut_runner.pkb index 2aa624ed8..a24fc2d51 100644 --- a/test/ut3_user/api/test_ut_runner.pkb +++ b/test/ut3_user/api/test_ut_runner.pkb @@ -267,22 +267,22 @@ end;'; select 'UT3$USER#' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'DUMMY_TEST_PACKAGE' item_name, 'dummy_test_suite' item_description, 'UT_SUITE' item_type, 2 item_line_no, - 'some.path.dummy_test_package' path, 0 disabled_flag,null tags + 'some.path.dummy_test_package' path, 0 disabled_flag, null disabled_reason,null tags from dual union all select 'UT3$USER#' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'SOME_DUMMY_TEST_PROCEDURE' item_name, 'dummy_test' item_description, 'UT_TEST' item_type, 6 item_line_no, - 'some.path.dummy_test_package.some_dummy_test_procedure' path, 0 disabled_flag,null tags + 'some.path.dummy_test_package.some_dummy_test_procedure' path, 0 disabled_flag, null disabled_reason,null tags from dual union all select 'UT3$USER#' object_owner, 'PATH' object_name, 'PATH' item_name, null item_description, 'UT_LOGICAL_SUITE' item_type, null item_line_no, - 'some.path' path, 0 disabled_flag, null tags + 'some.path' path, 0 disabled_flag, null disabled_reason, null tags from dual union all select 'UT3$USER#' object_owner, 'SOME' object_name, 'SOME' item_name, null item_description, 'UT_LOGICAL_SUITE' item_type, null item_line_no, - 'some' path, 0 disabled_flag, null tags + 'some' path, 0 disabled_flag, null disabled_reason, null tags from dual; --Act open l_actual for select * from table(ut3_develop.ut_runner.get_suites_info('UT3$USER#','DUMMY_TEST_PACKAGE')); @@ -299,22 +299,22 @@ end;'; select 'UT3$USER#' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'DUMMY_TEST_PACKAGE' item_name, 'dummy_test_suite' item_description, 'UT_SUITE' item_type, 2 item_line_no, - 'some.path.dummy_test_package' path, 0 disabled_flag,'dummy' tags + 'some.path.dummy_test_package' path, 0 disabled_flag, null disabled_reason,'dummy' tags from dual union all select 'UT3$USER#' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'SOME_DUMMY_TEST_PROCEDURE' item_name, 'dummy_test' item_description, 'UT_TEST' item_type, 7 item_line_no, - 'some.path.dummy_test_package.some_dummy_test_procedure' path, 0 disabled_flag,'testtag' tags + 'some.path.dummy_test_package.some_dummy_test_procedure' path, 0 disabled_flag, null disabled_reason,'testtag' tags from dual union all select 'UT3$USER#' object_owner, 'PATH' object_name, 'PATH' item_name, null item_description, 'UT_LOGICAL_SUITE' item_type, null item_line_no, - 'some.path' path, 0 disabled_flag, null tags + 'some.path' path, 0 disabled_flag, null disabled_reason, null tags from dual union all select 'UT3$USER#' object_owner, 'SOME' object_name, 'SOME' item_name, null item_description, 'UT_LOGICAL_SUITE' item_type, null item_line_no, - 'some' path, 0 disabled_flag, null tags + 'some' path, 0 disabled_flag, null disabled_reason, null tags from dual; --Act open l_actual for select * from table(ut3_develop.ut_runner.get_suites_info('UT3$USER#','DUMMY_TEST_PACKAGE')); @@ -331,12 +331,12 @@ end;'; select 'UT3$USER#' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'DUMMY_TEST_PACKAGE' item_name, 'dummy_test_suite' item_description, 'UT_SUITE' item_type, 2 item_line_no, - 'dummy_test_package' path, 0 disabled_flag,'suitetag1,suitetag2' tags + 'dummy_test_package' path, 0 disabled_flag, null disabled_reason,'suitetag1,suitetag2' tags from dual union all select 'UT3$USER#' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'SOME_DUMMY_TEST_PROCEDURE' item_name, 'dummy_test' item_description, 'UT_TEST' item_type, 6 item_line_no, - 'dummy_test_package.some_dummy_test_procedure' path, 0 disabled_flag,'testtag1,testtag2' tags + 'dummy_test_package.some_dummy_test_procedure' path, 0 disabled_flag, null disabled_reason,'testtag1,testtag2' tags from dual; --Act open l_actual for select * from table(ut3_develop.ut_runner.get_suites_info('UT3$USER#','DUMMY_TEST_PACKAGE')); From cbe03e830810da8ce588368eacc6504f1e42dd22 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sun, 6 Feb 2022 16:09:07 +0000 Subject: [PATCH 0858/1096] Update test coverage and documentation --- docs/userguide/expectations.md | 4 ++++ source/expectations/data_values/ut_compound_data_helper.pkb | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 07ff647e5..52e233125 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1645,6 +1645,10 @@ FAILURE utPLSQL is capable of comparing json data-types of `json_element_t` **on Oracle 12.2 and above**, and also `json` **on Oracle 21 and above** +**Note:** +> Whenever a database is upgraded to compatible version the utPLSQL needs to be reinstalled to pick up json changes. E.g. upgrade from 18c to 21c to enable `json` type compare. + + ### Notes on comparison of json data - Json data can contain objects, scalar or arrays. diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index e29f10279..94c7c1ab8 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -786,8 +786,6 @@ create or replace package body ut_compound_data_helper is begin $if dbms_db_version.version >= 21 $then l_obj := case when a_json_t is null then cast (null as json_element_t ) else json_element_t.parse(json_query(a_json_t, '$' returning clob)) end; - $else - l_obj := null; $end return l_obj; end; From 08bb27b790945c664387867f62ed91d2733816a8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 6 Feb 2022 16:54:30 +0000 Subject: [PATCH 0859/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pkb | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 5747ee5e0..20a49b3bc 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 01f39d138..27b93a7d2 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 4294753e7..9a0ff9234 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index adec7b7dc..606a59eb0 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 7a11e5132..697f2e525 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index c22fd54bb..98df0e6f3 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index f44da6f6a..8b0924d25 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index e4dca3223..9f74d801f 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 265c65bdb..08e2ccd1e 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index e0ddfa62b..c70fac545 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 1a19a2d67..90f3a3798 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 623abfda5..220f650cd 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 17225bc88..3503d645a 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 64ab627cf..c96aed1ac 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 44d5c81a9..8e8786f6b 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 36ce5aa31..649337d63 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 2370743c8..707de2e7e 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3791--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 44aaf4e5e..36db42f05 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -788,7 +788,7 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.12.3791-develop + * secion v3.1.12.3796-develop */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 99512e1b4..c8b434592 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.12.3791-develop'; + gc_version constant varchar2(50) := 'v3.1.12.3796-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From fddde601f3895f2e7ab24866dd5b9dc4213647ee Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sun, 6 Feb 2022 17:09:07 +0000 Subject: [PATCH 0860/1096] Updating testss --- .../test_annot_disabled_reason.pkb | 261 +++++++----------- 1 file changed, 106 insertions(+), 155 deletions(-) diff --git a/test/ut3_tester/core/annotations/test_annot_disabled_reason.pkb b/test/ut3_tester/core/annotations/test_annot_disabled_reason.pkb index 70015484f..e3df44425 100644 --- a/test/ut3_tester/core/annotations/test_annot_disabled_reason.pkb +++ b/test/ut3_tester/core/annotations/test_annot_disabled_reason.pkb @@ -1,6 +1,7 @@ create or replace package body test_annot_disabled_reason is + procedure compile_dummy_packages is pragma autonomous_transaction; begin @@ -181,7 +182,8 @@ end test_package_3;]'; --%disabled( $#?!%*&-/\^ ) procedure test1; - --%test(Test2 from test package 4) --%disabled(verylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtext) + --%test(Test2 from test package 4) + --%disabled(verylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtext) procedure test2; end test_package_4;]'; @@ -339,193 +341,142 @@ end test_package_6;]'; end; procedure test_disable_on_suite_level is - c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||'.test_package_1'; - l_objects_to_run ut3_develop.ut_suite_items; - - l_test0_suite ut3_develop.ut_logical_suite; - l_test1_suite ut3_develop.ut_suite; + l_test_results ut3_develop.ut_varchar2_list; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); begin --Act - l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); - l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_suite); - - ut.expect(l_test1_suite.items(1).name).to_equal('test1'); - ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).disabled_flag).to_equal(1); - ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).disabled_reason).to_equal('Tests are disabled on suite level'); - - ut.expect(l_test1_suite.items(2).name).to_equal('test2'); - ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).disabled_flag).to_equal(1); - ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).disabled_reason).to_equal('Tests are disabled on suite level'); - - ut.expect(l_test1_suite.items(3).name).to_equal('test3'); - ut.expect(treat(l_test1_suite.items(3) as ut3_develop.ut_test).disabled_flag).to_equal(1); - ut.expect(treat(l_test1_suite.items(3) as ut3_develop.ut_test).disabled_reason).to_equal('Tests are disabled on suite level'); - - ut.expect(l_test1_suite.items(4).name).to_equal('test4'); - ut.expect(treat(l_test1_suite.items(4) as ut3_develop.ut_test).disabled_flag).to_equal(1); - ut.expect(treat(l_test1_suite.items(4) as ut3_develop.ut_test).disabled_reason).to_equal('Tests are disabled on suite level'); + + select * bulk collect into l_test_results from table(ut3_develop.ut.run((sys_context('USERENV', 'CURRENT_USER')||'.test_package_1'))); + + l_actual_message := ut3_develop.ut_utils.table_to_clob(l_test_results); + + l_expected_message := q'[%tests +%disable_test_suite_level +%First context +%Test1 from test package 1 [0 sec] (DISABLED - Tests are disabled on suite level) +%Test2 from test package 1 [0 sec] (DISABLED - Tests are disabled on suite level) +%Second context +%Test3 from test package 1 [0 sec] (DISABLED - Tests are disabled on suite level) +%Test4 from test package 1 [0 sec] (DISABLED - Tests are disabled on suite level)%]'; + ut.expect(l_actual_message).to_be_like(l_expected_message); end; procedure test_dis_on_1st_ctx_level is - c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||'.test_package_2'; - l_objects_to_run ut3_develop.ut_suite_items; - - l_test0_suite ut3_develop.ut_logical_suite; - l_test1_suite ut3_develop.ut_suite; + l_test_results ut3_develop.ut_varchar2_list; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); begin --Act - l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); - l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_suite); - - ut.expect(l_test1_suite.items(1).name).to_equal('test1'); - ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).disabled_flag).to_equal(1); - ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).disabled_reason).to_equal('Tests and disabled on first context level'); - - ut.expect(l_test1_suite.items(2).name).to_equal('test2'); - ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).disabled_flag).to_equal(1); - ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).disabled_reason).to_equal('Tests and disabled on first context level'); - - ut.expect(l_test1_suite.items(3).name).to_equal('test3'); - ut.expect(treat(l_test1_suite.items(3) as ut3_develop.ut_test).disabled_flag).to_equal(0); - ut.expect(treat(l_test1_suite.items(3) as ut3_develop.ut_test).disabled_reason).to_be_null; - - ut.expect(l_test1_suite.items(4).name).to_equal('test4'); - ut.expect(treat(l_test1_suite.items(4) as ut3_develop.ut_test).disabled_flag).to_equal(0); - ut.expect(treat(l_test1_suite.items(4) as ut3_develop.ut_test).disabled_reason).to_be_null; + + select * bulk collect into l_test_results from table(ut3_develop.ut.run((sys_context('USERENV', 'CURRENT_USER')||'.test_package_2'))); + + l_actual_message := ut3_develop.ut_utils.table_to_clob(l_test_results); + + l_expected_message := q'[%tests +%Disable on context level +%First context +%Test1 from test package 2 [0 sec] (DISABLED - Tests and disabled on first context level) +%Test2 from test package 2 [0 sec] (DISABLED - Tests and disabled on first context level) +%Second context +%Test3 from test package 2 [% sec] +%Test4 from test package 3 [% sec]%]'; + + ut.expect(l_actual_message).to_be_like(l_expected_message); end; procedure test_disable_tests_level is - c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||'.test_package_3'; - l_objects_to_run ut3_develop.ut_suite_items; - - l_test0_suite ut3_develop.ut_logical_suite; - l_test1_suite ut3_develop.ut_suite; + l_test_results ut3_develop.ut_varchar2_list; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); begin --Act - l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); - l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_suite); - - ut.expect(l_test1_suite.items(1).name).to_equal('test1'); - ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).disabled_flag).to_equal(1); - ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).disabled_reason).to_equal('Test1 disabled from first context'); - - ut.expect(l_test1_suite.items(2).name).to_equal('test2'); - ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).disabled_flag).to_equal(0); - ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).disabled_reason).to_be_null; - - ut.expect(l_test1_suite.items(3).name).to_equal('test3'); - ut.expect(treat(l_test1_suite.items(3) as ut3_develop.ut_test).disabled_flag).to_equal(0); - ut.expect(treat(l_test1_suite.items(3) as ut3_develop.ut_test).disabled_reason).to_be_null; - - ut.expect(l_test1_suite.items(4).name).to_equal('test4'); - ut.expect(treat(l_test1_suite.items(4) as ut3_develop.ut_test).disabled_flag).to_equal(1); - ut.expect(treat(l_test1_suite.items(4) as ut3_develop.ut_test).disabled_reason).to_equal('Test4 disabled from second context'); + + select * bulk collect into l_test_results from table(ut3_develop.ut.run((sys_context('USERENV', 'CURRENT_USER')||'.test_package_3'))); + + l_actual_message := ut3_develop.ut_utils.table_to_clob(l_test_results); + + l_expected_message := q'[%tests +%Disable tests on test level +%First context +%Test1 from test package 3 [0 sec] (DISABLED - Test1 disabled from first context) +%Test2 from test package 3 [% sec] +%Second context +%Test3 from test package 3 [% sec] +%Test4 from test package 3 [0 sec] (DISABLED - Test4 disabled from second context)%]'; + + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; procedure test_long_text_spec_chr is - c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||'.test_package_4'; - l_objects_to_run ut3_develop.ut_suite_items; - - l_test0_suite ut3_develop.ut_logical_suite; - l_test1_suite ut3_develop.ut_suite; + l_test_results ut3_develop.ut_varchar2_list; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); begin --Act - l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); - l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_suite); - - ut.expect(l_test1_suite.items(1).name).to_equal('test1'); - ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).disabled_flag).to_equal(1); - ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).disabled_reason).to_equal('$#?!%*&-/\^'); - - ut.expect(l_test1_suite.items(2).name).to_equal('test2'); - ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).disabled_flag).to_equal(1); - ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).disabled_reason).to_equal('verylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtext'); + + select * bulk collect into l_test_results from table(ut3_develop.ut.run((sys_context('USERENV', 'CURRENT_USER')||'.test_package_4'))); + l_actual_message := ut3_develop.ut_utils.table_to_clob(l_test_results); + + l_expected_message := q'[%tests +%Disable reason is very long or have special characters +%Test1 from test package 4 [0 sec] (DISABLED - $#?!%*&-/\^) +%Test2 from test package 4 [0 sec] (DISABLED - verylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtextverylongtext)%]'; + ut.expect(l_actual_message).to_be_like(l_expected_message); end; procedure test_disable_suite_ctx_tst is - c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||'.test_package_5'; - l_objects_to_run ut3_develop.ut_suite_items; - - l_test0_suite ut3_develop.ut_logical_suite; - l_test1_suite ut3_develop.ut_suite; + l_test_results ut3_develop.ut_varchar2_list; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); begin --Act - l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); - l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_suite); - - ut.expect(l_test1_suite.items(1).name).to_equal('test1'); - ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).disabled_flag).to_equal(1); - ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).disabled_reason).to_equal('Disable on suite level'); - - ut.expect(l_test1_suite.items(2).name).to_equal('test2'); - ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).disabled_flag).to_equal(1); - ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).disabled_reason).to_equal('Disable on suite level'); - - ut.expect(l_test1_suite.items(3).name).to_equal('test3'); - ut.expect(treat(l_test1_suite.items(3) as ut3_develop.ut_test).disabled_flag).to_equal(1); - ut.expect(treat(l_test1_suite.items(3) as ut3_develop.ut_test).disabled_reason).to_equal('Disable on suite level'); - - ut.expect(l_test1_suite.items(4).name).to_equal('test4'); - ut.expect(treat(l_test1_suite.items(4) as ut3_develop.ut_test).disabled_flag).to_equal(1); - ut.expect(treat(l_test1_suite.items(4) as ut3_develop.ut_test).disabled_reason).to_equal('Disable on suite level'); + + select * bulk collect into l_test_results from table(ut3_develop.ut.run((sys_context('USERENV', 'CURRENT_USER')||'.test_package_5'))); + + l_actual_message := ut3_develop.ut_utils.table_to_clob(l_test_results); + + l_expected_message := q'[%tests +%Disable tests on suite level overriding rest +%First context +%Test1 from test package 3 [0 sec] (DISABLED - Disable on suite level) +%Test2 from test package 3 [0 sec] (DISABLED - Disable on suite level) +%Second context +%Test3 from test package 3 [0 sec] (DISABLED - Disable on suite level) +%Test4 from test package 3 [0 sec] (DISABLED - Disable on suite level)%]'; + + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; procedure test_disable_ctx_tst is - c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||'.test_package_6'; - l_objects_to_run ut3_develop.ut_suite_items; - - l_test0_suite ut3_develop.ut_logical_suite; - l_test1_suite ut3_develop.ut_suite; + l_test_results ut3_develop.ut_varchar2_list; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); begin --Act - l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); - - --Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); - l_test1_suite := treat(l_test0_suite.items(1) as ut3_develop.ut_suite); - - ut.expect(l_test1_suite.items(1).name).to_equal('test1'); - ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).disabled_flag).to_equal(1); - ut.expect(treat(l_test1_suite.items(1) as ut3_develop.ut_test).disabled_reason).to_equal('Disable on 1st context level'); - - ut.expect(l_test1_suite.items(2).name).to_equal('test2'); - ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).disabled_flag).to_equal(1); - ut.expect(treat(l_test1_suite.items(2) as ut3_develop.ut_test).disabled_reason).to_equal('Disable on 1st context level'); - - ut.expect(l_test1_suite.items(3).name).to_equal('test3'); - ut.expect(treat(l_test1_suite.items(3) as ut3_develop.ut_test).disabled_flag).to_equal(1); - ut.expect(treat(l_test1_suite.items(3) as ut3_develop.ut_test).disabled_reason).to_equal('Disable on 2nd context level'); - - ut.expect(l_test1_suite.items(4).name).to_equal('test4'); - ut.expect(treat(l_test1_suite.items(4) as ut3_develop.ut_test).disabled_flag).to_equal(1); - ut.expect(treat(l_test1_suite.items(4) as ut3_develop.ut_test).disabled_reason).to_equal('Disable on 2nd context level'); + + select * bulk collect into l_test_results from table(ut3_develop.ut.run((sys_context('USERENV', 'CURRENT_USER')||'.test_package_6'))); + + l_actual_message := ut3_develop.ut_utils.table_to_clob(l_test_results); + + l_expected_message := q'[%tests +%Disable tests on each of ctx level overriding rest +%First context +%Test1 from test package 3 [0 sec] (DISABLED - Disable on 1st context level) +%Test2 from test package 3 [0 sec] (DISABLED - Disable on 1st context level) +%Second context +%Test3 from test package 3 [0 sec] (DISABLED - Disable on 2nd context level) +%Test4 from test package 3 [0 sec] (DISABLED - Disable on 2nd context level)%]'; + + ut.expect(l_actual_message).to_be_like(l_expected_message); end; From 201050f33a5010ddffa891ef2c9a3099f04e2c51 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 7 Feb 2022 00:48:25 +0200 Subject: [PATCH 0861/1096] Gather coverage on code calling DBMS_STATS. Implemented a workaround that allows for running utPLSQL tests with code coverage on source with calls to DBMS_STATS. Resolves: #1097 Resolves: #1094 --- .../coverage/ut_coverage_helper_block.pkb | 8 ++++ test/ut3_tester_helper/coverage_helper.pkb | 44 +++++++++++++++++++ test/ut3_tester_helper/coverage_helper.pks | 3 ++ .../test_coverage/test_extended_coverage.pkb | 23 ++++++++++ .../test_coverage/test_extended_coverage.pks | 6 +++ 5 files changed, 84 insertions(+) diff --git a/source/core/coverage/ut_coverage_helper_block.pkb b/source/core/coverage/ut_coverage_helper_block.pkb index 25cb00f90..fb4d4812e 100644 --- a/source/core/coverage/ut_coverage_helper_block.pkb +++ b/source/core/coverage/ut_coverage_helper_block.pkb @@ -39,6 +39,14 @@ create or replace package body ut_coverage_helper_block is $else null; $end + exception + when others then + if sqlcode = -08402 then + dbms_output.put_line('Unable to finish gathering coverage with DBMS_PLSQL_CODE_COVERAGE. '); + dbms_output.put_line('Encountered exception `ORA-08402` when calling procedure `DBMS_PLSQL_CODE_COVERAGE.STOP_COVERAGE()`.'); + dbms_output.put_line('Coverage report will only include line-level code-coverage (without branches).'); + dbms_output.put_line('Please reference following issue for details on possible causes: https://github.com/utPLSQL/utPLSQL/issues/1097 '); + end if; end; function block_results(a_object ut_coverage_helper.t_tmp_table_object, a_coverage_run_id raw) return t_block_rows is diff --git a/test/ut3_tester_helper/coverage_helper.pkb b/test/ut3_tester_helper/coverage_helper.pkb index 0abe10a4f..137c7e953 100644 --- a/test/ut3_tester_helper/coverage_helper.pkb +++ b/test/ut3_tester_helper/coverage_helper.pkb @@ -123,6 +123,50 @@ create or replace package body coverage_helper is begin execute immediate q'[drop package ut3_develop.test_dummy_coverage_1]'; exception when others then null; end; end; + procedure create_cov_with_dbms_stats is + pragma autonomous_transaction; + begin + execute immediate q'[create table ut3_develop.table_to_test_stats as select * from user_objects]'; + + execute immediate q'[create or replace package ut3_develop.stats is + procedure gather; + end;]'; + + execute immediate q'[create or replace package body ut3_develop.stats is + procedure gather is + begin + dbms_Stats.gather_table_stats('UT3_DEVELOP','TABLE_TO_TEST_STATS'); + end; + end;]'; + + execute immediate q'[create or replace package ut3_develop.test_stats is + --%suite(stats gathering coverage test) + --%suitepath(coverage_testing) + + --%test + procedure test_stats_gather; + + end;]'; + + execute immediate q'[create or replace package body ut3_develop.test_stats is + procedure test_stats_gather is + begin + stats.gather; + ut.expect(1).to_equal(1); + end; + end;]'; + + end; + + procedure drop_cov_with_dbms_stats is + pragma autonomous_transaction; + begin + begin execute immediate q'[drop package ut3_develop.test_stats]'; exception when others then null; end; + begin execute immediate q'[drop package ut3_develop.stats]'; exception when others then null; end; + begin execute immediate q'[drop table ut3_develop.table_to_test_stats]'; exception when others then null; end; + end; + + procedure run_standalone_coverage(a_coverage_run_id raw, a_input integer) is begin ut3_develop.ut_runner.coverage_start(a_coverage_run_id); diff --git a/test/ut3_tester_helper/coverage_helper.pks b/test/ut3_tester_helper/coverage_helper.pks index 9a3bd1db6..1db09a01b 100644 --- a/test/ut3_tester_helper/coverage_helper.pks +++ b/test/ut3_tester_helper/coverage_helper.pks @@ -14,6 +14,9 @@ create or replace package coverage_helper is procedure create_dummy_coverage_1; procedure drop_dummy_coverage_1; + procedure create_cov_with_dbms_stats; + procedure drop_cov_with_dbms_stats; + procedure run_standalone_coverage(a_coverage_run_id raw, a_input integer); procedure run_coverage_job(a_coverage_run_id raw, a_input integer); diff --git a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb index ec95c0bfb..a8d104e28 100644 --- a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb +++ b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb @@ -83,5 +83,28 @@ create or replace package body test_extended_coverage is ut.expect(l_actual).to_be_like(l_expected); end; + procedure coverage_with_dbms_stats is + l_expected clob; + l_actual clob; + begin + --Arrange + l_expected := '%' || + '%%'; + --Act + l_actual := + ut3_tester_helper.coverage_helper.run_tests_as_job( + q'[ + ut3_develop.ut.run( + a_path => 'ut3_develop.test_stats', + a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), + a_coverage_schemes => ut3_develop.ut_varchar2_list( 'ut3_develop' ), + a_include_objects => ut3_develop.ut_varchar2_list('stats') + ) + ]' + ); + --Assert + ut.expect(l_actual).to_be_like(l_expected); + end; + end; / diff --git a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pks b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pks index 600a87e16..c575c240c 100644 --- a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pks +++ b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pks @@ -11,6 +11,12 @@ create or replace package test_extended_coverage is --%test(Coverage is gathered for specified file - extended coverage type) procedure coverage_for_file; + + --%beforetest(ut3_tester_helper.coverage_helper.create_cov_with_dbms_stats) + --%aftertest(ut3_tester_helper.coverage_helper.drop_cov_with_dbms_stats) + --%tags(#1097,#1094) + --%test(Extended coverage does not fail the test run then tested code calls DBMS_STATS) + procedure coverage_with_dbms_stats; end; / From 449bb708c6584a2d4f682366e9a1546380e13961 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 7 Feb 2022 00:57:22 +0200 Subject: [PATCH 0862/1096] Testing reporting of failing tests in branch and PR builds. --- test/ut3_user/expectations.pkb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/ut3_user/expectations.pkb b/test/ut3_user/expectations.pkb index 30af48a44..b4dfe5b41 100644 --- a/test/ut3_user/expectations.pkb +++ b/test/ut3_user/expectations.pkb @@ -28,7 +28,8 @@ SUCCESS Actual: 0 (number) was expected to equal: 0 (number) ]'; - ut.expect(l_actual).to_be_like(l_expected); + --deliberate change to make a test fail + ut.expect(l_actual).not_to_be_like(l_expected); rollback; end; From 2f29162369713529e69879056bd61e4a3372242b Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 7 Feb 2022 01:16:00 +0200 Subject: [PATCH 0863/1096] Reorganizing matrix variables. --- .github/workflows/build.yml | 42 ++++++++++++++----------------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9048db4ee..8f11522fd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,49 +20,39 @@ jobs: env: ORACLE_VERSION: ${{matrix.oracle-version}} ORACLE_SID: ${{matrix.oracle-sid}} - CONNECTION_STR: ${{matrix.connection-str}} + CONNECTION_STR: ${{ format( '127.0.0.1:1521/{0}', matrix.oracle-sid ) }} ORACLE_PASSWORD: oracle DOCKER_VOLUME: ${{matrix.docker-volume}} strategy: fail-fast: false matrix: include: - - oracle-version: "gvenzl/oracle-xe:11-full" + - id: 1 + db_version_name: '11XE' oracle-sid: 'XE' - connection-str: '127.0.0.1:1521/XE' - id: 1 - db_version_name: '11xe' + oracle-version: "gvenzl/oracle-xe:11-full" # TODO - need to add healthcheck.sh into our containers -# - oracle-version: "utplsqlv3/oracledb:12c-r1-se2-small" +# - id: 2 +# db_version_name: '12.1EE' # oracle-sid: 'ORCLCDB' -# connection-str: '127.0.0.1:1521/ORCLCDB' -# id: 2 -# db_version_name: '12.1se' +# oracle-version: "utplsqlv3/oracledb:12c-r1-ee-small" # - oracle-version: "utplsqlv3/oracledb:12c-r2-se2-small" # oracle-sid: 'ORCLCDB' # connection-str: '127.0.0.1:1521/ORCLCDB' # id: 3 # db_version_name: '12.2se' - - oracle-version: "gvenzl/oracle-xe:18-slim" + - id: 4 + db_version_name: '18XE' oracle-sid: 'XE' - connection-str: '127.0.0.1:1521/XE' - id: 4 - db_version_name: '18xe' -# - oracle-version: "utplsqlv3/oracledb:18c-se2-small" -# oracle-sid: 'ORCLCDB' -# connection-str: '127.0.0.1:1521/ORCLCDB' -# id: 5 -# db_version_name: '18se' -# - oracle-version: "utplsqlv3/oracledb:19c-se2-small" -# oracle-sid: 'ORCLCDB' -# connection-str: '127.0.0.1:1521/ORCLCDB' -# id: 6 + oracle-version: "gvenzl/oracle-xe:18-slim" +# - id: 5 # db_version_name: '19se' - - oracle-version: "gvenzl/oracle-xe:21-slim" +# oracle-sid: 'ORCLCDB' +# oracle-version: "utplsqlv3/oracledb:19c-se2-small" + - id: 6 + db_version_name: '21XE' oracle-sid: 'XE' - connection-str: '127.0.0.1:1521/XE' - id: 7 - db_version_name: '21xe' + oracle-version: "gvenzl/oracle-xe:21-slim" services: oracle: From 79da316a860c4eb2dd7aa11253b377aa3e4a3772 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Mon, 7 Feb 2022 09:06:00 +0000 Subject: [PATCH 0864/1096] Resolving a code comments --- source/core/ut_suite_builder.pkb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index 7ad24bd57..ebb113370 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -570,8 +570,7 @@ create or replace package body ut_suite_builder is a_suite.disabled_flag := ut_utils.boolean_to_int(a_annotations.by_name.exists(gc_disabled)); if a_annotations.by_name.exists(gc_disabled) then - l_annotation_text := trim(a_annotations.by_name(gc_disabled)(a_annotations.by_name(gc_disabled).first)); - a_suite.disabled_reason := l_annotation_text; + a_suite.disabled_reason := a_annotations.by_name(gc_disabled)(a_annotations.by_name(gc_disabled).first); end if; --process procedure annotations for suite From ed156d791f979196b3a0dd4b986f2e527733059f Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Mon, 7 Feb 2022 13:32:50 +0000 Subject: [PATCH 0865/1096] Updating reporters --- source/reporters/ut_junit_reporter.tpb | 8 +++++++- source/reporters/ut_teamcity_reporter.tpb | 2 +- source/reporters/ut_teamcity_reporter_helper.pkb | 5 ++++- source/reporters/ut_teamcity_reporter_helper.pks | 2 +- source/reporters/ut_tfs_junit_reporter.tpb | 6 ++++++ test/ut3_user/reporters.pkb | 2 +- test/ut3_user/reporters/test_documentation_reporter.pkb | 2 +- test/ut3_user/reporters/test_junit_reporter.pkb | 4 +++- 8 files changed, 24 insertions(+), 7 deletions(-) diff --git a/source/reporters/ut_junit_reporter.tpb b/source/reporters/ut_junit_reporter.tpb index 94ea5c5e6..44affa030 100644 --- a/source/reporters/ut_junit_reporter.tpb +++ b/source/reporters/ut_junit_reporter.tpb @@ -44,7 +44,13 @@ create or replace type body ut_junit_reporter is ' status="' || ut_utils.test_result_to_char(a_test.result) || '"' end || '>' ); if a_test.result = ut_utils.gc_disabled then - ut_utils.append_to_list( l_results, '' ); + if a_test.disabled_reason is not null then + ut_utils.append_to_list( l_results, '' ); + ut_utils.append_to_list( l_results, ut_utils.to_cdata( a_test.disabled_reason ) ); + ut_utils.append_to_list( l_results, '' ); + else + ut_utils.append_to_list( l_results, '' ); + end if; end if; if a_test.result = ut_utils.gc_error then ut_utils.append_to_list( l_results, ''); diff --git a/source/reporters/ut_teamcity_reporter.tpb b/source/reporters/ut_teamcity_reporter.tpb index 3e1a4bcf8..95bea32b8 100644 --- a/source/reporters/ut_teamcity_reporter.tpb +++ b/source/reporters/ut_teamcity_reporter.tpb @@ -84,7 +84,7 @@ create or replace type body ut_teamcity_reporter is lower(a_test.item.procedure_name); if a_test.result = ut_utils.gc_disabled then - ut_utils.append_to_list( l_results, ut_teamcity_reporter_helper.test_disabled(l_test_full_name)); + ut_utils.append_to_list( l_results, ut_teamcity_reporter_helper.test_disabled(l_test_full_name,a_test.disabled_reason)); else ut_utils.append_to_list( l_results, a_test.get_serveroutputs()); diff --git a/source/reporters/ut_teamcity_reporter_helper.pkb b/source/reporters/ut_teamcity_reporter_helper.pkb index 3a4679cb4..84a9d19e8 100644 --- a/source/reporters/ut_teamcity_reporter_helper.pkb +++ b/source/reporters/ut_teamcity_reporter_helper.pkb @@ -89,10 +89,13 @@ create or replace package body ut_teamcity_reporter_helper is return message('testFinished', l_props); end; - function test_disabled(a_test_name varchar2, a_flow_id varchar2 default null) return varchar2 is + function test_disabled(a_test_name varchar2,a_msg varchar2 default null, a_flow_id varchar2 default null) return varchar2 is l_props t_props; begin l_props('name') := a_test_name; + if a_msg is not null then + l_props('message') := a_msg; + end if; l_props('flowId') := a_flow_id; return message('testIgnored', l_props); end; diff --git a/source/reporters/ut_teamcity_reporter_helper.pks b/source/reporters/ut_teamcity_reporter_helper.pks index d94099411..d7fa86cdc 100644 --- a/source/reporters/ut_teamcity_reporter_helper.pks +++ b/source/reporters/ut_teamcity_reporter_helper.pks @@ -21,7 +21,7 @@ create or replace package ut_teamcity_reporter_helper is function test_started(a_test_name varchar2, a_capture_standard_output boolean default null, a_flow_id varchar2 default null) return varchar2; function test_finished(a_test_name varchar2, a_test_duration_milisec number default null, a_flow_id varchar2 default null) return varchar2; - function test_disabled(a_test_name varchar2, a_flow_id varchar2 default null) return varchar2; + function test_disabled(a_test_name varchar2,a_msg varchar2 default null, a_flow_id varchar2 default null) return varchar2; function test_failed(a_test_name varchar2, a_msg in varchar2 default null, a_details varchar2 default null, a_flow_id varchar2 default null, a_actual varchar2 default null, a_expected varchar2 default null) return varchar2; function test_std_err(a_test_name varchar2, a_out in varchar2, a_flow_id in varchar2 default null) return varchar2; diff --git a/source/reporters/ut_tfs_junit_reporter.tpb b/source/reporters/ut_tfs_junit_reporter.tpb index e14af1d4d..710c3bc7f 100644 --- a/source/reporters/ut_tfs_junit_reporter.tpb +++ b/source/reporters/ut_tfs_junit_reporter.tpb @@ -69,6 +69,12 @@ create or replace type body ut_tfs_junit_reporter is ut_utils.append_to_list( l_results, ut_utils.to_cdata( ut_utils.convert_collection( a_test.get_error_stack_traces() ) ) ); ut_utils.append_to_list( l_results, ''); -- Do not count error as failure + elsif a_test.result = ut_utils.gc_disabled then + if a_test.disabled_reason is not null then + ut_utils.append_to_list( l_results, ''); + else + ut_utils.append_to_list( l_results, '' ); + end if; elsif a_test.result = ut_utils.gc_failure then ut_utils.append_to_list( l_results, ''); ut_utils.append_to_list( l_results, ut_utils.to_cdata( a_test.get_failed_expectation_lines() ) ); diff --git a/test/ut3_user/reporters.pkb b/test/ut3_user/reporters.pkb index edd26189c..d33adce23 100644 --- a/test/ut3_user/reporters.pkb +++ b/test/ut3_user/reporters.pkb @@ -35,7 +35,7 @@ as procedure erroring_test; --%test(a disabled test) - --%disabled + --%disabled(Disabled for testing purpose) procedure disabled_test; --%aftereach diff --git a/test/ut3_user/reporters/test_documentation_reporter.pkb b/test/ut3_user/reporters/test_documentation_reporter.pkb index 03759fe6a..4d44d2f63 100644 --- a/test/ut3_user/reporters/test_documentation_reporter.pkb +++ b/test/ut3_user/reporters/test_documentation_reporter.pkb @@ -24,7 +24,7 @@ create or replace package body test_documentation_reporter as - a disabled test [0 sec] (DISABLED) + a disabled test [0 sec] (DISABLED - Disabled for testing purpose) % Failures: diff --git a/test/ut3_user/reporters/test_junit_reporter.pkb b/test/ut3_user/reporters/test_junit_reporter.pkb index 8f015e80b..24012f6bb 100644 --- a/test/ut3_user/reporters/test_junit_reporter.pkb +++ b/test/ut3_user/reporters/test_junit_reporter.pkb @@ -249,7 +249,9 @@ create or replace package body test_junit_reporter as - + + + From 2ea9a53d3bc67588ffa0b1078deb141695833ad1 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Mon, 7 Feb 2022 13:41:41 +0000 Subject: [PATCH 0866/1096] Updates to junit xsd --- .github/scripts/xsd/junit_windy.xsd | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/.github/scripts/xsd/junit_windy.xsd b/.github/scripts/xsd/junit_windy.xsd index fe134662a..320779edd 100644 --- a/.github/scripts/xsd/junit_windy.xsd +++ b/.github/scripts/xsd/junit_windy.xsd @@ -1,6 +1,6 @@ - - @@ -71,10 +71,11 @@ Permission to waive conditions of this license may be requested from Windy Road - - - Indicates that the test errored. An errored test is one that had an unanticipated problem. e.g., an unchecked throwable; or a problem with the implementation of the test. Contains as a text node relevant data for the error, e.g., a stack trace - + + + + Indicates that the test errored. An errored test is one that had an unanticipated problem. e.g., an unchecked throwable; or a problem with the implementation of the test. Contains as a text node relevant data for the error, e.g., a stack trace + @@ -93,9 +94,9 @@ Permission to waive conditions of this license may be requested from Windy Road - - Indicates that the test failed. A failure is a test which the code has explicitly failed by using the mechanisms for that purpose. e.g., via an assertEquals. Contains as a text node relevant data for the failure, e.g., a stack trace - + + Indicates that the test failed. A failure is a test which the code has explicitly failed by using the mechanisms for that purpose. e.g., via an assertEquals. Contains as a text node relevant data for the failure, e.g., a stack trace + @@ -192,6 +193,11 @@ Permission to waive conditions of this license may be requested from Windy Road The total number of tests in the suite that errored. An errored test is one that had an unanticipated problem. e.g., an unchecked throwable; or a problem with the implementation of the test. + + + The total number of ignored or skipped tests in the suite. + + Time taken (in seconds) to execute the tests in the suite @@ -203,4 +209,4 @@ Permission to waive conditions of this license may be requested from Windy Road - + \ No newline at end of file From 78cfb830176d5eb0d6456f4c83244586225b4b3e Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Mon, 7 Feb 2022 14:19:48 +0000 Subject: [PATCH 0867/1096] Update coverage --- test/ut3_user/reporters.pkb | 11 +++++++++++ .../reporters/test_documentation_reporter.pkb | 3 ++- test/ut3_user/reporters/test_junit_reporter.pkb | 17 +++++++++++------ 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/test/ut3_user/reporters.pkb b/test/ut3_user/reporters.pkb index d33adce23..76d345a3d 100644 --- a/test/ut3_user/reporters.pkb +++ b/test/ut3_user/reporters.pkb @@ -38,6 +38,10 @@ as --%disabled(Disabled for testing purpose) procedure disabled_test; + --%test(a disabled test with no reason) + --%disabled + procedure disabled_test_no_reason; + --%aftereach procedure aftereach; @@ -100,6 +104,13 @@ as ut3_develop.ut.expect(1,'this should not execute').to_equal(1); end; + procedure disabled_test_no_reason + is + begin + dbms_output.put_line(''); + ut3_develop.ut.expect(1,'this should not execute').to_equal(1); + end; + procedure beforeall is begin dbms_output.put_line(''); diff --git a/test/ut3_user/reporters/test_documentation_reporter.pkb b/test/ut3_user/reporters/test_documentation_reporter.pkb index 4d44d2f63..a627d26b4 100644 --- a/test/ut3_user/reporters/test_documentation_reporter.pkb +++ b/test/ut3_user/reporters/test_documentation_reporter.pkb @@ -25,6 +25,7 @@ create or replace package body test_documentation_reporter as a disabled test [0 sec] (DISABLED - Disabled for testing purpose) + a disabled test with no reason [0 sec] (DISABLED) % Failures: @@ -40,7 +41,7 @@ Failures: ORA-06512: at "UT3$USER#.TEST_REPORTERS", line 44% ORA-06512: at line 6 Finished in % seconds -4 tests, 1 failed, 1 errored, 1 disabled, 0 warning(s)%]'; +5 tests, 1 failed, 1 errored, 2 disabled, 0 warning(s)%]'; begin select * diff --git a/test/ut3_user/reporters/test_junit_reporter.pkb b/test/ut3_user/reporters/test_junit_reporter.pkb index 24012f6bb..4a574591c 100644 --- a/test/ut3_user/reporters/test_junit_reporter.pkb +++ b/test/ut3_user/reporters/test_junit_reporter.pkb @@ -219,12 +219,12 @@ create or replace package body test_junit_reporter as l_results ut3_develop.ut_varchar2_list; l_actual clob; l_expected varchar2(32767):=q'[ - - - - - - + + + + + + % @@ -255,6 +255,11 @@ create or replace package body test_junit_reporter as + + + + + % From 9912dfac23a1d3d964e11ae7102fd30fecd4652c Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 7 Feb 2022 22:42:10 +0200 Subject: [PATCH 0868/1096] Removing comment line that keeps getting updated with update_project_version action --- source/core/ut_utils.pkb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 36db42f05..3675e834d 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -787,9 +787,9 @@ create or replace package body ut_utils is /** * Change string into unicode to match xmlgen format _00_ + * See the section of Oracle documentation called: Escape of Characters in Generated XML Data * https://docs.oracle.com/en/database/oracle/oracle-database/12.2/adxdb/generation-of-XML-data-from-relational-data.html#GUID-5BE09A7D-80D8-4734-B9AF-4A61F27FA9B2 - * secion v3.1.12.3796-develop - */ + */ function char_to_xmlgen_unicode(a_character varchar2) return varchar2 is begin return '_x00'||rawtohex(utl_raw.cast_to_raw(a_character))||'_'; From 2a0b2c96a308bb4dd13863a6ebba2b29694ff655 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 8 Feb 2022 00:14:14 +0200 Subject: [PATCH 0869/1096] Reorganizing install scripts to make the code-style chech, uninstall validate, create test users and reinstall steps explicit in deployment pipeline --- .github/scripts/create_test_users.sh | 115 +++++++++++++ .github/scripts/install.sh | 155 ------------------ .github/scripts/uninstall_validate_utplsql.sh | 32 ++++ .github/workflows/build.yml | 21 ++- development/install.sh | 4 + 5 files changed, 171 insertions(+), 156 deletions(-) create mode 100755 .github/scripts/create_test_users.sh create mode 100755 .github/scripts/uninstall_validate_utplsql.sh diff --git a/.github/scripts/create_test_users.sh b/.github/scripts/create_test_users.sh new file mode 100755 index 000000000..43f64784d --- /dev/null +++ b/.github/scripts/create_test_users.sh @@ -0,0 +1,115 @@ +#!/bin/bash + +set -ev +SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" +cd ${SCRIPT_DIR}/../../source + +time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL +set feedback off +whenever sqlerror exit failure rollback + +-------------------------------------------------------------------------------- +PROMPT Adding back create-trigger privilege to $UT3_DEVELOP_SCHEMA for testing +grant administer database trigger to $UT3_DEVELOP_SCHEMA; + +-------------------------------------------------------------------------------- +PROMPT Creating $UT3_TESTER - Power-user for testing internal framework code + +create user $UT3_TESTER identified by "$UT3_TESTER_PASSWORD" default tablespace $UT3_TABLESPACE quota unlimited on $UT3_TABLESPACE; +grant create session, create procedure, create type, create table to $UT3_TESTER; + +grant execute on dbms_lock to $UT3_TESTER; + +PROMPT Granting $UT3_DEVELOP_SCHEMA code to $UT3_TESTER + +begin + for i in ( + select object_name from all_objects t + where t.object_type in ('PACKAGE','TYPE') + and owner = '$UT3_DEVELOP_SCHEMA' + and generated = 'N' + and object_name not like 'SYS%') + loop + execute immediate 'grant execute on $UT3_DEVELOP_SCHEMA."'||i.object_name||'" to $UT3_TESTER'; + end loop; +end; +/ + +PROMPT Granting $UT3_DEVELOP_SCHEMA tables to $UT3_TESTER + +begin + for i in ( select table_name from all_tables t where owner = '$UT3_DEVELOP_SCHEMA' and nested = 'NO' and iot_name is null) + loop + execute immediate 'grant select on $UT3_DEVELOP_SCHEMA.'||i.table_name||' to $UT3_TESTER'; + end loop; +end; +/ + + +-------------------------------------------------------------------------------- +PROMPT Creating $UT3_USER - minimal privileges user for API testing + +create user $UT3_USER identified by "$UT3_USER_PASSWORD" default tablespace $UT3_TABLESPACE quota unlimited on $UT3_TABLESPACE; +grant create session, create procedure, create type, create table to $UT3_USER; + +PROMPT Grants for starting a debugging session from $UT3_USER +grant debug connect session to $UT3_USER; +grant debug any procedure to $UT3_USER; +begin + \$if dbms_db_version.version <= 11 \$then + null; -- no addition action necessary + \$else + -- necessary on 12c or higher + dbms_network_acl_admin.append_host_ace ( + host =>'*', + ace => sys.xs\$ace_type( + privilege_list => sys.xs\$name_list('JDWP') , + principal_name => '$UT3_USER', + principal_type => sys.xs_acl.ptype_db + ) + ); + \$end +end; +/ + +-------------------------------------------------------------------------------- +PROMPT Creating $UT3_TESTER_HELPER - provides functions to allow min grant test user setup tests. + +create user $UT3_TESTER_HELPER identified by "$UT3_TESTER_HELPER_PASSWORD" default tablespace $UT3_TABLESPACE quota unlimited on $UT3_TABLESPACE; +grant create session, create procedure, create type, create table to $UT3_TESTER_HELPER; + +PROMPT Grants for testing distributed transactions +grant create public database link to $UT3_TESTER_HELPER; +grant drop public database link to $UT3_TESTER_HELPER; + +PROMPT Grants for testing coverage outside of main $UT3_DEVELOP_SCHEMA schema. +grant create any procedure, drop any procedure, execute any procedure, create any type, drop any type, execute any type, under any type, + select any table, update any table, insert any table, delete any table, create any table, drop any table, alter any table, + select any dictionary, create any synonym, drop any synonym, + grant any object privilege, grant any privilege, create public synonym, drop public synonym, create any trigger + to $UT3_TESTER_HELPER; + +grant create job to $UT3_TESTER_HELPER; + +PROMPT Additional grants for disabling DDL trigger and testing parser without trigger enabled/present + +grant alter any trigger to $UT3_TESTER_HELPER; +grant administer database trigger to $UT3_TESTER_HELPER; +grant execute on dbms_lock to $UT3_TESTER_HELPER; + +create user ut3_cache_test_owner identified by ut3; +grant create session, create procedure to ut3_cache_test_owner; + +create user ut3_no_extra_priv_user identified by ut3; +grant create session, create procedure to ut3_no_extra_priv_user; + +create user ut3_select_catalog_user identified by ut3; +grant create session, create procedure, select_catalog_role to ut3_select_catalog_user; + +create user ut3_select_any_table_user identified by ut3; +grant create session, create procedure, select any table to ut3_select_any_table_user; + +create user ut3_execute_any_proc_user identified by ut3; +grant create session, create procedure, execute any procedure to ut3_execute_any_proc_user; +exit +SQL diff --git a/.github/scripts/install.sh b/.github/scripts/install.sh index 095d33810..46750b89c 100755 --- a/.github/scripts/install.sh +++ b/.github/scripts/install.sh @@ -19,158 +19,3 @@ set verify off alter session set plsql_optimize_level=0; @${INSTALL_FILE} $UT3_DEVELOP_SCHEMA $UT3_DEVELOP_SCHEMA_PASSWORD SQL - -if [[ "${MATRIX_JOB_ID}" == 1 ]]; then - - #check code-style for errors - time "$SQLCLI" $UT3_DEVELOP_SCHEMA/$UT3_DEVELOP_SCHEMA_PASSWORD@//$CONNECTION_STR @../development/utplsql_style_check.sql - - #test install/uninstall process - time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL - set feedback off - set verify off - whenever sqlerror exit failure rollback - - @uninstall_all.sql $UT3_DEVELOP_SCHEMA - whenever sqlerror exit failure rollback - declare - v_leftover_objects_count integer; - begin - select sum(cnt) - into v_leftover_objects_count - from ( - select count(1) cnt from dba_objects where owner = '$UT3_DEVELOP_SCHEMA' - where object_name not like 'PLSQL_PROFILER%' and object_name not like 'DBMSPCC_%' - union all - select count(1) cnt from dba_synonyms where table_owner = '$UT3_DEVELOP_SCHEMA' - where table_name not like 'PLSQL_PROFILER%' and table_name not like 'DBMSPCC_%' - ); - if v_leftover_objects_count > 0 then - raise_application_error(-20000, 'Not all objects were successfully uninstalled - leftover objects count='||v_leftover_objects_count); - end if; - end; - / -SQL - - time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL - set feedback off - set verify off - - alter session set plsql_optimize_level=0; - @install.sql $UT3_DEVELOP_SCHEMA - @install_ddl_trigger.sql $UT3_DEVELOP_SCHEMA - @create_synonyms_and_grants_for_public.sql $UT3_DEVELOP_SCHEMA -SQL - -fi - - -time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL -set feedback off -whenever sqlerror exit failure rollback - --------------------------------------------------------------------------------- -PROMPT Adding back create-trigger privilege to $UT3_DEVELOP_SCHEMA for testing -grant administer database trigger to $UT3_DEVELOP_SCHEMA; - --------------------------------------------------------------------------------- -PROMPT Creating $UT3_TESTER - Power-user for testing internal framework code - -create user $UT3_TESTER identified by "$UT3_TESTER_PASSWORD" default tablespace $UT3_TABLESPACE quota unlimited on $UT3_TABLESPACE; -grant create session, create procedure, create type, create table to $UT3_TESTER; - -grant execute on dbms_lock to $UT3_TESTER; - -PROMPT Granting $UT3_DEVELOP_SCHEMA code to $UT3_TESTER - -begin - for i in ( - select object_name from all_objects t - where t.object_type in ('PACKAGE','TYPE') - and owner = '$UT3_DEVELOP_SCHEMA' - and generated = 'N' - and object_name not like 'SYS%') - loop - execute immediate 'grant execute on $UT3_DEVELOP_SCHEMA."'||i.object_name||'" to $UT3_TESTER'; - end loop; -end; -/ - -PROMPT Granting $UT3_DEVELOP_SCHEMA tables to $UT3_TESTER - -begin - for i in ( select table_name from all_tables t where owner = '$UT3_DEVELOP_SCHEMA' and nested = 'NO' and iot_name is null) - loop - execute immediate 'grant select on $UT3_DEVELOP_SCHEMA.'||i.table_name||' to $UT3_TESTER'; - end loop; -end; -/ - - --------------------------------------------------------------------------------- -PROMPT Creating $UT3_USER - minimal privileges user for API testing - -create user $UT3_USER identified by "$UT3_USER_PASSWORD" default tablespace $UT3_TABLESPACE quota unlimited on $UT3_TABLESPACE; -grant create session, create procedure, create type, create table to $UT3_USER; - -PROMPT Grants for starting a debugging session from $UT3_USER -grant debug connect session to $UT3_USER; -grant debug any procedure to $UT3_USER; -begin - \$if dbms_db_version.version <= 11 \$then - null; -- no addition action necessary - \$else - -- necessary on 12c or higher - dbms_network_acl_admin.append_host_ace ( - host =>'*', - ace => sys.xs\$ace_type( - privilege_list => sys.xs\$name_list('JDWP') , - principal_name => '$UT3_USER', - principal_type => sys.xs_acl.ptype_db - ) - ); - \$end -end; -/ - --------------------------------------------------------------------------------- -PROMPT Creating $UT3_TESTER_HELPER - provides functions to allow min grant test user setup tests. - -create user $UT3_TESTER_HELPER identified by "$UT3_TESTER_HELPER_PASSWORD" default tablespace $UT3_TABLESPACE quota unlimited on $UT3_TABLESPACE; -grant create session, create procedure, create type, create table to $UT3_TESTER_HELPER; - -PROMPT Grants for testing distributed transactions -grant create public database link to $UT3_TESTER_HELPER; -grant drop public database link to $UT3_TESTER_HELPER; - -PROMPT Grants for testing coverage outside of main $UT3_DEVELOP_SCHEMA schema. -grant create any procedure, drop any procedure, execute any procedure, create any type, drop any type, execute any type, under any type, - select any table, update any table, insert any table, delete any table, create any table, drop any table, alter any table, - select any dictionary, create any synonym, drop any synonym, - grant any object privilege, grant any privilege, create public synonym, drop public synonym, create any trigger - to $UT3_TESTER_HELPER; - -grant create job to $UT3_TESTER_HELPER; - -PROMPT Additional grants for disabling DDL trigger and testing parser without trigger enabled/present - -grant alter any trigger to $UT3_TESTER_HELPER; -grant administer database trigger to $UT3_TESTER_HELPER; -grant execute on dbms_lock to $UT3_TESTER_HELPER; - -create user ut3_cache_test_owner identified by ut3; -grant create session, create procedure to ut3_cache_test_owner; - -create user ut3_no_extra_priv_user identified by ut3; -grant create session, create procedure to ut3_no_extra_priv_user; - -create user ut3_select_catalog_user identified by ut3; -grant create session, create procedure, select_catalog_role to ut3_select_catalog_user; - -create user ut3_select_any_table_user identified by ut3; -grant create session, create procedure, select any table to ut3_select_any_table_user; - -create user ut3_execute_any_proc_user identified by ut3; -grant create session, create procedure, execute any procedure to ut3_execute_any_proc_user; -exit -SQL diff --git a/.github/scripts/uninstall_validate_utplsql.sh b/.github/scripts/uninstall_validate_utplsql.sh new file mode 100755 index 000000000..d8a34999a --- /dev/null +++ b/.github/scripts/uninstall_validate_utplsql.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +set -ev +SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" +cd ${SCRIPT_DIR}/../../source + +time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL + set feedback off + set verify off + whenever sqlerror exit failure rollback + + @uninstall_all.sql $UT3_DEVELOP_SCHEMA + whenever sqlerror exit failure rollback + declare + v_leftover_objects_count integer; + begin + select sum(cnt) + into v_leftover_objects_count + from ( + select count(1) cnt from dba_objects where owner = '$UT3_DEVELOP_SCHEMA' + where object_name not like 'PLSQL_PROFILER%' and object_name not like 'DBMSPCC_%' + union all + select count(1) cnt from dba_synonyms where table_owner = '$UT3_DEVELOP_SCHEMA' + where table_name not like 'PLSQL_PROFILER%' and table_name not like 'DBMSPCC_%' + ); + if v_leftover_objects_count > 0 then + raise_application_error(-20000, 'Not all objects were successfully uninstalled - leftover objects count='||v_leftover_objects_count); + end if; + end; + / + drop user $UT3_DEVELOP_SCHEMA cascade; +SQL diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8f11522fd..11f2e1383 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -107,6 +107,25 @@ jobs: id: install-utplsql run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .github/scripts/install.sh + - name: Check code style + if: ${{ matrix.id == 1 }} + id: check-coding-style + run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} "$SQLCLI" $UT3_DEVELOP_SCHEMA/$UT3_DEVELOP_SCHEMA_PASSWORD@//$CONNECTION_STR @development/utplsql_style_check.sql + + - name: Validate utPLSQL uninstall + if: ${{ matrix.id == 1 }} + id: validate-uninstall + run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .github/scripts/uninstall_validate_utplsql.sh + + - name: Reinstall utPLSQL + if: ${{ matrix.id == 1 }} + id: reinstall-utplsql + run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .github/scripts/install.sh + + - name: Create test users + id: create-test-users + run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .github/scripts/create_test_users.sh + - name: Install utPLSQL release id: install-utplsql-release run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} .github/scripts/install_utplsql_release.sh @@ -143,7 +162,7 @@ jobs: - name: SonarCloud Scan id: sonar - if: ${{ matrix.db_version_name == '21xe' }} + if: ${{ matrix.db_version_name == '21XE' }} uses: SonarSource/sonarcloud-github-action@master env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any diff --git a/development/install.sh b/development/install.sh index 627bd113d..f3a62b0ec 100755 --- a/development/install.sh +++ b/development/install.sh @@ -14,6 +14,10 @@ if ! .github/scripts/install.sh; then echo -e ${header}"\nFailed to install utPLSQL from current branch into ${UT3_DEVELOP_SCHEMA} schema\n"${header} exit 1 fi +if ! .github/scripts/create_test_users.sh; then + echo -e ${header}"\nFailed to create test users from current branch\n"${header} + exit 1 +fi if ! .github/scripts/install_utplsql_release.sh; then echo -e ${header}"\nFailed to install utPLSQL from branch ${SELFTESTING_BRANCH} into ${UT3_RELEASE_VERSION_SCHEMA}\n"${header} exit 1 From 07fcf3582fcbce236112cfc1dae44ea7da4ccbb3 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 8 Feb 2022 00:59:41 +0200 Subject: [PATCH 0870/1096] Adding and testing diagnostics steps --- .github/workflows/build.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 11f2e1383..e6b07e114 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -59,10 +59,11 @@ jobs: image: ${{matrix.oracle-version}} env: ORACLE_PASSWORD: oracle - MATRIX_JOB_ID: ${{matrix.id}} credentials: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASSWORD }} + volumes: + - ${{github.workspace}}:/utPLSQL ports: - 1521:1521 options: >- @@ -70,6 +71,7 @@ jobs: --health-interval 10s --health-timeout 5s --health-retries 10 + --name oracle steps: - uses: actions/checkout@v2 @@ -142,6 +144,20 @@ jobs: id: run-tests run: bash test/run_tests.sh +#Needed to diagnose occasional failures of DB on test runs + - name: Get ORACLE_BASE/diag data + id: get-oracle-diag-data + if: ${{ always() && steps.run-tests.outcome == 'failure' }} + run: docker exec oracle bash -c "cp -r ${ORACLE_BASE}/diag /utPLSQL/database-diag" +#Needed to diagnose occasional failures of DB on test runs + - name: Upload ORACLE_BASE/diag data Artifact + id: upload + if: ${{ always() && steps.run-tests.outcome == 'failure' }} + uses: actions/upload-artifact@v2 + with: + name: my-artifact$-${{matrix.db_version_name}} + path: ${{github.workspace}}/database-diag + - name: Validate utPLSQL reports format id: validate-reports-format run: bash .github/scripts/validate_report_files.sh From 75ca38eef0d07a1976d786873b846fef61915395 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 8 Feb 2022 01:38:18 +0200 Subject: [PATCH 0871/1096] Fixing check of code style --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e6b07e114..eb853b652 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -112,7 +112,7 @@ jobs: - name: Check code style if: ${{ matrix.id == 1 }} id: check-coding-style - run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint bash ${DOCKER_ENV} ${ORACLE_VERSION} "$SQLCLI" $UT3_DEVELOP_SCHEMA/$UT3_DEVELOP_SCHEMA_PASSWORD@//$CONNECTION_STR @development/utplsql_style_check.sql + run: docker run --rm -v $(pwd):/utPLSQL -w /utPLSQL --network host --entrypoint "$SQLCLI" ${DOCKER_ENV} ${ORACLE_VERSION} $UT3_DEVELOP_SCHEMA/$UT3_DEVELOP_SCHEMA_PASSWORD@//$CONNECTION_STR @development/utplsql_style_check.sql - name: Validate utPLSQL uninstall if: ${{ matrix.id == 1 }} From cb26d102a21a5cdd69e858251f36e0b94d232d1d Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 8 Feb 2022 01:42:42 +0200 Subject: [PATCH 0872/1096] Fixing gathering of diag data --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eb853b652..efa4fe403 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -148,7 +148,7 @@ jobs: - name: Get ORACLE_BASE/diag data id: get-oracle-diag-data if: ${{ always() && steps.run-tests.outcome == 'failure' }} - run: docker exec oracle bash -c "cp -r ${ORACLE_BASE}/diag /utPLSQL/database-diag" + run: docker exec oracle bash -c "cp -r /opt/oracle/diag /utPLSQL/database-diag" #Needed to diagnose occasional failures of DB on test runs - name: Upload ORACLE_BASE/diag data Artifact id: upload From 610067fc74710f308b2dc22d5235d664013588fe Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 8 Feb 2022 03:09:04 +0200 Subject: [PATCH 0873/1096] Fixing gathering of diag data Fixing uninstall validation --- .github/scripts/uninstall_validate_utplsql.sh | 4 ++++ .github/workflows/build.yml | 10 ++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/scripts/uninstall_validate_utplsql.sh b/.github/scripts/uninstall_validate_utplsql.sh index d8a34999a..ee3fd3f40 100755 --- a/.github/scripts/uninstall_validate_utplsql.sh +++ b/.github/scripts/uninstall_validate_utplsql.sh @@ -10,6 +10,10 @@ time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL whenever sqlerror exit failure rollback @uninstall_all.sql $UT3_DEVELOP_SCHEMA +SQL +time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL + set feedback off + set verify off whenever sqlerror exit failure rollback declare v_leftover_objects_count integer; diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index efa4fe403..66a3a64b7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -144,12 +144,17 @@ jobs: id: run-tests run: bash test/run_tests.sh -#Needed to diagnose occasional failures of DB on test runs +#Start Needed to diagnose occasional failures of DB on test runs + - name: Prepare diagnostic directory + id: preapre-oracle-diag-dir + if: ${{ always() && steps.run-tests.outcome == 'failure' }} + run: | + mkdir database-diag + chmod +777 database-diag - name: Get ORACLE_BASE/diag data id: get-oracle-diag-data if: ${{ always() && steps.run-tests.outcome == 'failure' }} run: docker exec oracle bash -c "cp -r /opt/oracle/diag /utPLSQL/database-diag" -#Needed to diagnose occasional failures of DB on test runs - name: Upload ORACLE_BASE/diag data Artifact id: upload if: ${{ always() && steps.run-tests.outcome == 'failure' }} @@ -157,6 +162,7 @@ jobs: with: name: my-artifact$-${{matrix.db_version_name}} path: ${{github.workspace}}/database-diag +#End Needed to diagnose occasional failures of DB on test runs - name: Validate utPLSQL reports format id: validate-reports-format From 14d61bcf80b6d4d01bf18365825c209902b04188 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 8 Feb 2022 03:21:17 +0200 Subject: [PATCH 0874/1096] Fixing uninstall validation --- .github/scripts/uninstall_validate_utplsql.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/scripts/uninstall_validate_utplsql.sh b/.github/scripts/uninstall_validate_utplsql.sh index ee3fd3f40..2863e1fe2 100755 --- a/.github/scripts/uninstall_validate_utplsql.sh +++ b/.github/scripts/uninstall_validate_utplsql.sh @@ -21,11 +21,13 @@ time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL select sum(cnt) into v_leftover_objects_count from ( - select count(1) cnt from dba_objects where owner = '$UT3_DEVELOP_SCHEMA' - where object_name not like 'PLSQL_PROFILER%' and object_name not like 'DBMSPCC_%' + select count(1) cnt from dba_objects + where owner = '$UT3_DEVELOP_SCHEMA' + and object_name not like 'PLSQL_PROFILER%' and object_name not like 'DBMSPCC_%' union all - select count(1) cnt from dba_synonyms where table_owner = '$UT3_DEVELOP_SCHEMA' - where table_name not like 'PLSQL_PROFILER%' and table_name not like 'DBMSPCC_%' + select count(1) cnt from dba_synonyms + where table_owner = '$UT3_DEVELOP_SCHEMA' + and table_name not like 'PLSQL_PROFILER%' and table_name not like 'DBMSPCC_%' ); if v_leftover_objects_count > 0 then raise_application_error(-20000, 'Not all objects were successfully uninstalled - leftover objects count='||v_leftover_objects_count); From 7b71d0237800f4912882daff5a6db414e65a5ad1 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 8 Feb 2022 03:25:00 +0200 Subject: [PATCH 0875/1096] Fixing oracle diag --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 66a3a64b7..03e06f2f9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -154,7 +154,7 @@ jobs: - name: Get ORACLE_BASE/diag data id: get-oracle-diag-data if: ${{ always() && steps.run-tests.outcome == 'failure' }} - run: docker exec oracle bash -c "cp -r /opt/oracle/diag /utPLSQL/database-diag" + run: docker exec oracle bash -c "chmod -R +777 /opt/oracle/diag && cp -r /opt/oracle/diag /utPLSQL/database-diag" - name: Upload ORACLE_BASE/diag data Artifact id: upload if: ${{ always() && steps.run-tests.outcome == 'failure' }} From 82ac7f4e0f2b6e23fd28b5484ac390b25aaead42 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 8 Feb 2022 08:40:49 +0000 Subject: [PATCH 0876/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 20a49b3bc..3c63cb962 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 27b93a7d2..4fa5004bb 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 9a0ff9234..a33f67842 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 606a59eb0..3ad731d81 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 697f2e525..b1eb78458 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 98df0e6f3..67f922c58 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 8b0924d25..54551e0df 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 9f74d801f..aff07ac72 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 08e2ccd1e..8951b3621 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index c70fac545..0e4da487d 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 90f3a3798..7f396910a 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 220f650cd..35406ddc9 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 3503d645a..469ea1071 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index c96aed1ac..aa22452ae 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 8e8786f6b..c8c02daf5 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 649337d63..c231955af 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 707de2e7e..403e1eedd 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3796--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index c8b434592..907aa7ccc 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.12.3796-develop'; + gc_version constant varchar2(50) := 'v3.1.12.3843-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From c762920238473c1792fa1163e6e5f25724c89021 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Tue, 8 Feb 2022 10:06:14 +0000 Subject: [PATCH 0877/1096] Update sonar --- source/reporters/ut_sonar_test_reporter.tpb | 2 +- test/ut3_user/reporters/test_sonar_test_reporter.pkb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/reporters/ut_sonar_test_reporter.tpb b/source/reporters/ut_sonar_test_reporter.tpb index 8b043832a..20624fae9 100644 --- a/source/reporters/ut_sonar_test_reporter.tpb +++ b/source/reporters/ut_sonar_test_reporter.tpb @@ -47,7 +47,7 @@ create or replace type body ut_sonar_test_reporter is begin ut_utils.append_to_list( l_results, ''); if a_test.result = ut_utils.gc_disabled then - ut_utils.append_to_list( l_results, ''); + ut_utils.append_to_list( l_results, ''); elsif a_test.result = ut_utils.gc_error then ut_utils.append_to_list( l_results, ''); ut_utils.append_to_list( l_results, ut_utils.to_cdata( ut_utils.convert_collection( a_test.get_error_stack_traces() ) ) ); diff --git a/test/ut3_user/reporters/test_sonar_test_reporter.pkb b/test/ut3_user/reporters/test_sonar_test_reporter.pkb index 5821b2071..7c30fd91d 100644 --- a/test/ut3_user/reporters/test_sonar_test_reporter.pkb +++ b/test/ut3_user/reporters/test_sonar_test_reporter.pkb @@ -9,7 +9,8 @@ create or replace package body test_sonar_test_reporter as % %%% %%% -%% +%% +%% ]'; From 8c91c7b784fac9cf1a9c0010e5bbb5ba31fe88ef Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 8 Feb 2022 13:02:53 +0000 Subject: [PATCH 0878/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 3c63cb962..16f90c86e 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 4fa5004bb..357f2db99 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index a33f67842..96b4a1125 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 3ad731d81..72279191f 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index b1eb78458..b6088eceb 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 67f922c58..cd616bde0 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 99a8c0a37..e778b8d8c 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index aff07ac72..95591d7ef 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 8951b3621..89a17d5ef 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 0e4da487d..97209655a 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 7f396910a..ea4b37e3d 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 35406ddc9..83e06cf8a 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 469ea1071..2a09222be 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index aa22452ae..9bceca36a 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index c8c02daf5..bc18b0035 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index c231955af..20cecb601 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 403e1eedd..25252df0a 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3843--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 907aa7ccc..a2a3528ca 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.12.3843-develop'; + gc_version constant varchar2(50) := 'v3.1.12.3846-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 9010fcb18451c7af7882078ff80d382d1005f16d Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 9 Feb 2022 00:31:40 +0200 Subject: [PATCH 0879/1096] Fixing gaps in uninstall process. --- .github/scripts/uninstall_validate_utplsql.sh | 17 ++++++++++++++++- source/expectations/json_objects_specs.sql | 14 ++++---------- source/uninstall_objects.sql | 15 ++++++++++++--- 3 files changed, 32 insertions(+), 14 deletions(-) diff --git a/.github/scripts/uninstall_validate_utplsql.sh b/.github/scripts/uninstall_validate_utplsql.sh index 2863e1fe2..d0a2070a8 100755 --- a/.github/scripts/uninstall_validate_utplsql.sh +++ b/.github/scripts/uninstall_validate_utplsql.sh @@ -15,6 +15,21 @@ time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL set feedback off set verify off whenever sqlerror exit failure rollback + set serverout on + begin + for i in ( + select o.object_type||' '||o.owner||'.'||o.object_name as obj + from dba_objects o + where owner = '$UT3_DEVELOP_SCHEMA' + union all + select 'SYNONYM '||s.owner||'.'||s.synonym_name||' FOR '||s.table_owner||'.'||s.table_name as obj + from dba_synonyms s + where table_owner = '$UT3_DEVELOP_SCHEMA' + ) loop + dbms_output.put_line(i.obj); + end loop; + end; + / declare v_leftover_objects_count integer; begin @@ -34,5 +49,5 @@ time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL end if; end; / - drop user $UT3_DEVELOP_SCHEMA cascade; + drop user $UT3_DEVELOP_SCHEMA; SQL diff --git a/source/expectations/json_objects_specs.sql b/source/expectations/json_objects_specs.sql index 39c2c4e23..a5d936afb 100644 --- a/source/expectations/json_objects_specs.sql +++ b/source/expectations/json_objects_specs.sql @@ -1,18 +1,12 @@ BEGIN - - $if dbms_db_version.version >= 21 $then - dbms_output.put_line('Object exists , dont install'); - $elsif dbms_db_version.version = 12 and dbms_db_version.release >= 2 or ( dbms_db_version.version > 12 and dbms_db_version.version < 21 ) $then - dbms_output.put_line('Installing json structures specs for native json.'); - execute immediate q'[create or replace TYPE JSON FORCE AUTHID CURRENT_USER AS OBJECT( - dummyobjt NUMBER -) NOT FINAL NOT INSTANTIABLE;]'; - $else + null; + $if dbms_db_version.version < 21 $then dbms_output.put_line('Installing json structures specs for native json.'); execute immediate q'[create or replace TYPE JSON FORCE AUTHID CURRENT_USER AS OBJECT( dummyobjt NUMBER ) NOT FINAL NOT INSTANTIABLE;]'; - + $end + $if dbms_db_version.version = 12 and dbms_db_version.release = 1 or dbms_db_version.version < 12 $then dbms_output.put_line('Installing json structures specs.'); execute immediate q'[create or replace TYPE JSON_Element_T FORCE AUTHID CURRENT_USER AS OBJECT( dummyobjt NUMBER, diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index bc41cb63a..4d77d9993 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -156,6 +156,10 @@ drop type ut_comparison_matcher force; drop type ut_matcher force; +drop type ut_expectation_base force; + +drop type ut_matcher_base force; + drop type ut_data_value_yminterval force; drop type ut_data_value_varchar2 force; @@ -245,10 +249,15 @@ drop package ut_metadata; drop package ut_ansiconsole_helper; begin + null; + $if dbms_db_version.version < 21 $then + begin execute immediate 'drop type json force'; exception when others then null; end; + $end $if dbms_db_version.version = 12 and dbms_db_version.release = 1 or dbms_db_version.version < 12 $then - execute immediate 'drop type json_element_t force'; - $else - dbms_output.put_line('Nothing to drop'); + begin execute immediate 'drop type json_element_t force'; exception when others then null; end; + begin execute immediate 'drop type json_object_t force'; exception when others then null; end; + begin execute immediate 'drop type json_array_t force'; exception when others then null; end; + begin execute immediate 'drop type json_key_list force'; exception when others then null; end; $end end; / From 54af5faea9f12c3ec622f01c151796c5ef8a9fd5 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 9 Feb 2022 00:36:28 +0200 Subject: [PATCH 0880/1096] Fixes and improvements to uninstall doc --- docs/userguide/install.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 3503d645a..601b3ca08 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -184,10 +184,9 @@ If the installing user and utPLSQL owner is one and the same, the user must have - ALTER SESSION - CREATE TRIGGER -In addition the user must be granted the execute privilege on `DBMS_LOCK` and `DBMS_CRYPTO` packages. +In addition, the user must be granted the execute privilege on `DBMS_LOCK` and `DBMS_CRYPTO` packages. utPLSQL is using [DBMS_PROFILER tables](https://docs.oracle.com/cd/E18283_01/appdev.112/e16760/d_profil.htm#i999476) for code coverage. The tables required by DBMS_PROFILER will be created in the installation schema unless they already exist. -The uninstall process will **not** drop profiler tables, as they can potentially be shared and reused for profiling PLSQL code. It is up to DBA to maintain the storage of the profiler tables. @@ -297,7 +296,7 @@ cd source sqlplus admin/admins_password@database @uninstall.sql ut3 ``` -The uninstall script will remove all the objects installed by the install script. +The uninstall script will remove all the objects installed by the installation script. Additionally, all the public and private synonyms pointing to the objects in the utPLSQL schema will be removed. If you have extended any utPLSQL types such as a custom reporter, these will need to be dropped before the uninstall, otherwise the uninstall script might fail. @@ -305,7 +304,7 @@ If you have extended any utPLSQL types such as a custom reporter, these will nee The uninstall script does not drop the schema. **In order for the uninstall to be successful, you need to use the uninstall script that was provided with the exact utPLSQL version installed on your database.** -i.e. the uninstall script provided with version 3.0.1 will probably not work if you want to remove version 3.0.0 from your database. +i.e. the uninstall script provided with version 3.1.11 will not work correctly if you want to remove version 3.0.0 from your database. Alternatively you can drop the user that owns utPLSQL and re-create it using headless install. From d999d31266fd62b54705eb8cb340c4442b09b911 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 9 Feb 2022 00:37:17 +0200 Subject: [PATCH 0881/1096] Revert "Testing reporting of failing tests in branch and PR builds." This reverts commit 449bb708c6584a2d4f682366e9a1546380e13961. --- test/ut3_user/expectations.pkb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/ut3_user/expectations.pkb b/test/ut3_user/expectations.pkb index b4dfe5b41..30af48a44 100644 --- a/test/ut3_user/expectations.pkb +++ b/test/ut3_user/expectations.pkb @@ -28,8 +28,7 @@ SUCCESS Actual: 0 (number) was expected to equal: 0 (number) ]'; - --deliberate change to make a test fail - ut.expect(l_actual).not_to_be_like(l_expected); + ut.expect(l_actual).to_be_like(l_expected); rollback; end; From cb64865fd7c9399557173fc36e97a30ce5a92d85 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 9 Feb 2022 01:04:01 +0200 Subject: [PATCH 0882/1096] Fixing oracle-diag dir --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 03e06f2f9..dbac6b4fe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,6 +31,7 @@ jobs: db_version_name: '11XE' oracle-sid: 'XE' oracle-version: "gvenzl/oracle-xe:11-full" + oracle-base: '/u01/app/oracle' # TODO - need to add healthcheck.sh into our containers # - id: 2 # db_version_name: '12.1EE' @@ -45,6 +46,7 @@ jobs: db_version_name: '18XE' oracle-sid: 'XE' oracle-version: "gvenzl/oracle-xe:18-slim" + oracle-base: '/opt/oracle' # - id: 5 # db_version_name: '19se' # oracle-sid: 'ORCLCDB' @@ -53,6 +55,7 @@ jobs: db_version_name: '21XE' oracle-sid: 'XE' oracle-version: "gvenzl/oracle-xe:21-slim" + oracle-base: '/opt/oracle' services: oracle: @@ -154,7 +157,7 @@ jobs: - name: Get ORACLE_BASE/diag data id: get-oracle-diag-data if: ${{ always() && steps.run-tests.outcome == 'failure' }} - run: docker exec oracle bash -c "chmod -R +777 /opt/oracle/diag && cp -r /opt/oracle/diag /utPLSQL/database-diag" + run: docker exec oracle bash -c "chmod -R +777 ${{matrix.oracle-base}}/diag && cp -r ${{matrix.oracle-base}}/diag /utPLSQL/database-diag" - name: Upload ORACLE_BASE/diag data Artifact id: upload if: ${{ always() && steps.run-tests.outcome == 'failure' }} From 8761ff59f0f24f550f1c8bd7553fdfb2f9901088 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 9 Feb 2022 01:31:28 +0200 Subject: [PATCH 0883/1096] Adding 12.1EE again --- .github/workflows/build.yml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dbac6b4fe..e31c6f198 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,25 +32,27 @@ jobs: oracle-sid: 'XE' oracle-version: "gvenzl/oracle-xe:11-full" oracle-base: '/u01/app/oracle' -# TODO - need to add healthcheck.sh into our containers -# - id: 2 -# db_version_name: '12.1EE' -# oracle-sid: 'ORCLCDB' -# oracle-version: "utplsqlv3/oracledb:12c-r1-ee-small" -# - oracle-version: "utplsqlv3/oracledb:12c-r2-se2-small" -# oracle-sid: 'ORCLCDB' -# connection-str: '127.0.0.1:1521/ORCLCDB' -# id: 3 + - id: 2 + db_version_name: '12.1EE' + oracle-sid: 'ORCLCDB' + oracle-version: "utplsqlv3/oracledb:12c-r1-ee-small" + oracle-base: '/opt/oracle' +# - id: 3 # db_version_name: '12.2se' +# oracle-sid: 'ORCLCDB' +# oracle-version: "utplsqlv3/oracledb:12c-r2-se2-small" +# oracle-base: '/opt/oracle' - id: 4 db_version_name: '18XE' oracle-sid: 'XE' oracle-version: "gvenzl/oracle-xe:18-slim" oracle-base: '/opt/oracle' +# TODO - need to add healthcheck.sh into our containers # - id: 5 # db_version_name: '19se' # oracle-sid: 'ORCLCDB' # oracle-version: "utplsqlv3/oracledb:19c-se2-small" +# oracle-base: '/opt/oracle' - id: 6 db_version_name: '21XE' oracle-sid: 'XE' From 5fe9a0e21e04af84fd48d7e29a59447b453b7434 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 9 Feb 2022 15:08:53 +0200 Subject: [PATCH 0884/1096] Testing without explicit call to ``--health-cmd healthcheck.sh` --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e31c6f198..0c9789173 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -72,11 +72,11 @@ jobs: ports: - 1521:1521 options: >- - --health-cmd healthcheck.sh --health-interval 10s --health-timeout 5s --health-retries 10 --name oracle +# --health-cmd healthcheck.sh steps: - uses: actions/checkout@v2 From 0c57a9cbb495d7d152e60068b28d21926b1ba7af Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Wed, 9 Feb 2022 21:03:44 +0000 Subject: [PATCH 0885/1096] Initial checkin for exclude objects regex. --- docs/userguide/coverage.md | 11 +- source/api/ut.pkb | 175 ++++++++++++++++++---- source/api/ut.pks | 72 +++++++-- source/api/ut_runner.pkb | 14 +- source/api/ut_runner.pks | 6 +- source/core/coverage/ut_coverage.pkb | 33 +++- source/core/types/ut_coverage_options.tpb | 13 +- source/core/types/ut_coverage_options.tps | 10 +- 8 files changed, 278 insertions(+), 56 deletions(-) diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 8951b3621..59baf5a04 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -128,16 +128,19 @@ exec ut.run('unit_test_schema', ut_coverage_html_reporter(), a_coverage_schemes #### Filtering objects in coverage reports -There are two options that can be used to narrow down the scope of coverage report: -- `a_include_objects` - list of `[object_owner.].object_name` to be included in the coverage report +There are six options that can be used to narrow down the scope of coverage report: +- `a_include_objects` - list of `[object_owner.].object_name` to be included in the coverage report. - `a_exclude_objects` - list of `[object_owner.].object_name` to be excluded from the coverage report +- `a_include_schema_expr` - string of regex expression of schemas to be included in the coverage report. It will override `a_include_objects` +- `a_include_object_expr` - string of regex expression of objects ( no schema names included ) to be included in the coverage report. It will override `a_include_objects` +- `a_exclude_schema_expr` - string of regex expression of schemas to be excluded from the coverage report. It will override `a_exclude_objects` +- `a_exclude_object_expr` - string of regex expression of objects to be excluded from the coverage report. It will override `a_exclude_objects` -You may specify both _include_ and _exclude_ object lists to gain more control over what needs to be included / excluded from the coverage report. +You may specify both _include_ and _exclude_ options to gain more control over what needs to be included / excluded from the coverage report. The object owner is optional in the object list. If you do not provide an object owner, the _include_/_exclude_ list will be considered for every schema used for coverage gathering (as described above). - Example: Limiting coverage by object name, for tested code located in the same schema as the unit tests. ```sql exec ut.run(ut_varchar2_list('user_1','user_2'), ut_coverage_html_reporter(), a_include_objects=>ut_varchar2_list('award_bonus')); diff --git a/source/api/ut.pkb b/source/api/ut.pkb index ee3d85342..5c91e54d4 100644 --- a/source/api/ut.pkb +++ b/source/api/ut.pkb @@ -131,7 +131,11 @@ create or replace package body ut is a_client_character_set varchar2, a_random_test_order integer, a_random_test_order_seed positive, - a_tags varchar2 := null + a_tags varchar2 := null, + a_include_schema_expr varchar2 := null, + a_include_object_expr varchar2 := null, + a_exclude_schema_expr varchar2 := null, + a_exclude_object_expr varchar2 := null ) is pragma autonomous_transaction; begin @@ -150,7 +154,11 @@ create or replace package body ut is false, ut_utils.int_to_boolean(a_random_test_order), a_random_test_order_seed, - a_tags + a_tags, + a_include_schema_expr, + a_include_object_expr, + a_exclude_schema_expr, + a_exclude_object_expr ); rollback; end; @@ -167,10 +175,15 @@ create or replace package body ut is a_client_character_set varchar2, a_random_test_order integer, a_random_test_order_seed positive, - a_tags varchar2 := null + a_tags varchar2 := null, + a_include_schema_expr varchar2 := null, + a_include_object_expr varchar2 := null, + a_exclude_schema_expr varchar2 := null, + a_exclude_object_expr varchar2 := null ) is pragma autonomous_transaction; begin + a_reporter := coalesce(a_reporter,ut_documentation_reporter()); ut_runner.run( a_paths, @@ -186,7 +199,11 @@ create or replace package body ut is false, ut_utils.int_to_boolean(a_random_test_order), a_random_test_order_seed, - a_tags + a_tags, + a_include_schema_expr, + a_include_object_expr, + a_exclude_schema_expr, + a_exclude_object_expr ); rollback; end; @@ -227,7 +244,11 @@ create or replace package body ut is a_client_character_set varchar2 := null, a_random_test_order integer := 0, a_random_test_order_seed positive := null, - a_tags varchar2 := null + a_tags varchar2 := null, + a_include_schema_expr varchar2 := null, + a_include_object_expr varchar2 := null, + a_exclude_schema_expr varchar2 := null, + a_exclude_object_expr varchar2 := null ) return ut_varchar2_rows pipelined is l_reporter ut_reporter_base := a_reporter; l_results sys_refcursor; @@ -244,7 +265,11 @@ create or replace package body ut is a_client_character_set, a_random_test_order, a_random_test_order_seed, - a_tags + a_tags, + a_include_schema_expr, + a_include_object_expr, + a_exclude_schema_expr, + a_exclude_object_expr ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); @@ -266,7 +291,11 @@ create or replace package body ut is a_client_character_set varchar2 := null, a_random_test_order integer := 0, a_random_test_order_seed positive := null, - a_tags varchar2 := null + a_tags varchar2 := null, + a_include_schema_expr varchar2 := null, + a_include_object_expr varchar2 := null, + a_exclude_schema_expr varchar2 := null, + a_exclude_object_expr varchar2 := null ) return ut_varchar2_rows pipelined is l_reporter ut_reporter_base := a_reporter; l_results sys_refcursor; @@ -283,7 +312,11 @@ create or replace package body ut is a_client_character_set, a_random_test_order, a_random_test_order_seed, - a_tags + a_tags, + a_include_schema_expr, + a_include_object_expr, + a_exclude_schema_expr, + a_exclude_object_expr ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); @@ -306,7 +339,11 @@ create or replace package body ut is a_client_character_set varchar2 := null, a_random_test_order integer := 0, a_random_test_order_seed positive := null, - a_tags varchar2 := null + a_tags varchar2 := null, + a_include_schema_expr varchar2 := null, + a_include_object_expr varchar2 := null, + a_exclude_schema_expr varchar2 := null, + a_exclude_object_expr varchar2 := null ) return ut_varchar2_rows pipelined is l_reporter ut_reporter_base := a_reporter; l_results sys_refcursor; @@ -323,7 +360,11 @@ create or replace package body ut is a_client_character_set, a_random_test_order, a_random_test_order_seed, - a_tags + a_tags, + a_include_schema_expr, + a_include_object_expr, + a_exclude_schema_expr, + a_exclude_object_expr ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); @@ -346,7 +387,11 @@ create or replace package body ut is a_client_character_set varchar2 := null, a_random_test_order integer := 0, a_random_test_order_seed positive := null, - a_tags varchar2 := null + a_tags varchar2 := null, + a_include_schema_expr varchar2 := null, + a_include_object_expr varchar2 := null, + a_exclude_schema_expr varchar2 := null, + a_exclude_object_expr varchar2 := null ) return ut_varchar2_rows pipelined is l_reporter ut_reporter_base := a_reporter; l_results sys_refcursor; @@ -363,7 +408,11 @@ create or replace package body ut is a_client_character_set, a_random_test_order, a_random_test_order_seed, - a_tags + a_tags, + a_include_schema_expr, + a_include_object_expr, + a_exclude_schema_expr, + a_exclude_object_expr ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); @@ -386,7 +435,11 @@ create or replace package body ut is a_client_character_set varchar2 := null, a_random_test_order integer := 0, a_random_test_order_seed positive := null, - a_tags varchar2 := null + a_tags varchar2 := null, + a_include_schema_expr varchar2 := null, + a_include_object_expr varchar2 := null, + a_exclude_schema_expr varchar2 := null, + a_exclude_object_expr varchar2 := null ) return ut_varchar2_rows pipelined is l_reporter ut_reporter_base := a_reporter; l_results sys_refcursor; @@ -403,7 +456,11 @@ create or replace package body ut is a_client_character_set, a_random_test_order, a_random_test_order_seed, - a_tags + a_tags, + a_include_schema_expr, + a_include_object_expr, + a_exclude_schema_expr, + a_exclude_object_expr ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); @@ -426,7 +483,11 @@ create or replace package body ut is a_client_character_set varchar2 := null, a_random_test_order integer := 0, a_random_test_order_seed positive := null, - a_tags varchar2 := null + a_tags varchar2 := null, + a_include_schema_expr varchar2 := null, + a_include_object_expr varchar2 := null, + a_exclude_schema_expr varchar2 := null, + a_exclude_object_expr varchar2 := null ) return ut_varchar2_rows pipelined is l_reporter ut_reporter_base := a_reporter; l_results sys_refcursor; @@ -443,7 +504,11 @@ create or replace package body ut is a_client_character_set, a_random_test_order, a_random_test_order_seed, - a_tags + a_tags, + a_include_schema_expr, + a_include_object_expr, + a_exclude_schema_expr, + a_exclude_object_expr ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); @@ -467,7 +532,11 @@ create or replace package body ut is a_force_manual_rollback boolean := false, a_random_test_order boolean := false, a_random_test_order_seed positive := null, - a_tags varchar2 := null + a_tags varchar2 := null, + a_include_schema_expr varchar2 := null, + a_include_object_expr varchar2 := null, + a_exclude_schema_expr varchar2 := null, + a_exclude_object_expr varchar2 := null ) is l_reporter ut_reporter_base := a_reporter; begin @@ -487,7 +556,11 @@ create or replace package body ut is a_force_manual_rollback, a_random_test_order, a_random_test_order_seed, - a_tags + a_tags, + a_include_schema_expr, + a_include_object_expr, + a_exclude_schema_expr, + a_exclude_object_expr ); else run_autonomous( @@ -502,7 +575,11 @@ create or replace package body ut is a_client_character_set, ut_utils.boolean_to_int(a_random_test_order), a_random_test_order_seed, - a_tags + a_tags, + a_include_schema_expr, + a_include_object_expr, + a_exclude_schema_expr, + a_exclude_object_expr ); end if; if l_reporter is of (ut_output_reporter_base) then @@ -524,7 +601,11 @@ create or replace package body ut is a_force_manual_rollback boolean := false, a_random_test_order boolean := false, a_random_test_order_seed positive := null, - a_tags varchar2 := null + a_tags varchar2 := null, + a_include_schema_expr varchar2 := null, + a_include_object_expr varchar2 := null, + a_exclude_schema_expr varchar2 := null, + a_exclude_object_expr varchar2 := null ) is l_reporter ut_reporter_base := a_reporter; begin @@ -541,7 +622,11 @@ create or replace package body ut is a_force_manual_rollback, a_random_test_order, a_random_test_order_seed, - a_tags + a_tags, + a_include_schema_expr, + a_include_object_expr, + a_exclude_schema_expr, + a_exclude_object_expr ); end; @@ -557,7 +642,11 @@ create or replace package body ut is a_force_manual_rollback boolean := false, a_random_test_order boolean := false, a_random_test_order_seed positive := null, - a_tags varchar2 := null + a_tags varchar2 := null, + a_include_schema_expr varchar2 := null, + a_include_object_expr varchar2 := null, + a_exclude_schema_expr varchar2 := null, + a_exclude_object_expr varchar2 := null ) is begin ut.run( @@ -573,7 +662,11 @@ create or replace package body ut is a_force_manual_rollback, a_random_test_order, a_random_test_order_seed, - a_tags + a_tags, + a_include_schema_expr, + a_include_object_expr, + a_exclude_schema_expr, + a_exclude_object_expr ); end; @@ -589,7 +682,11 @@ create or replace package body ut is a_force_manual_rollback boolean := false, a_random_test_order boolean := false, a_random_test_order_seed positive := null, - a_tags varchar2 := null + a_tags varchar2 := null, + a_include_schema_expr varchar2 := null, + a_include_object_expr varchar2 := null, + a_exclude_schema_expr varchar2 := null, + a_exclude_object_expr varchar2 := null ) is begin ut.run( @@ -605,7 +702,11 @@ create or replace package body ut is a_force_manual_rollback, a_random_test_order, a_random_test_order_seed, - a_tags + a_tags, + a_include_schema_expr, + a_include_object_expr, + a_exclude_schema_expr, + a_exclude_object_expr ); end; @@ -622,7 +723,11 @@ create or replace package body ut is a_force_manual_rollback boolean := false, a_random_test_order boolean := false, a_random_test_order_seed positive := null, - a_tags varchar2 := null + a_tags varchar2 := null, + a_include_schema_expr varchar2 := null, + a_include_object_expr varchar2 := null, + a_exclude_schema_expr varchar2 := null, + a_exclude_object_expr varchar2 := null ) is begin ut.run( @@ -638,7 +743,11 @@ create or replace package body ut is a_force_manual_rollback, a_random_test_order, a_random_test_order_seed, - a_tags + a_tags, + a_include_schema_expr, + a_include_object_expr, + a_exclude_schema_expr, + a_exclude_object_expr ); end; @@ -655,7 +764,11 @@ create or replace package body ut is a_force_manual_rollback boolean := false, a_random_test_order boolean := false, a_random_test_order_seed positive := null, - a_tags varchar2 := null + a_tags varchar2 := null, + a_include_schema_expr varchar2 := null, + a_include_object_expr varchar2 := null, + a_exclude_schema_expr varchar2 := null, + a_exclude_object_expr varchar2 := null ) is begin ut.run( @@ -671,7 +784,11 @@ create or replace package body ut is a_force_manual_rollback, a_random_test_order, a_random_test_order_seed, - a_tags + a_tags, + a_include_schema_expr, + a_include_object_expr, + a_exclude_schema_expr, + a_exclude_object_expr ); end; diff --git a/source/api/ut.pks b/source/api/ut.pks index df5a8d8e5..f72c82a0c 100644 --- a/source/api/ut.pks +++ b/source/api/ut.pks @@ -62,7 +62,11 @@ create or replace package ut authid current_user as a_client_character_set varchar2 := null, a_random_test_order integer := 0, a_random_test_order_seed positive := null, - a_tags varchar2 := null + a_tags varchar2 := null, + a_include_schema_expr varchar2 := null, + a_include_object_expr varchar2 := null, + a_exclude_schema_expr varchar2 := null, + a_exclude_object_expr varchar2 := null ) return ut_varchar2_rows pipelined; function run( @@ -76,7 +80,11 @@ create or replace package ut authid current_user as a_client_character_set varchar2 := null, a_random_test_order integer := 0, a_random_test_order_seed positive := null, - a_tags varchar2 := null + a_tags varchar2 := null, + a_include_schema_expr varchar2 := null, + a_include_object_expr varchar2 := null, + a_exclude_schema_expr varchar2 := null, + a_exclude_object_expr varchar2 := null ) return ut_varchar2_rows pipelined; function run( @@ -91,7 +99,11 @@ create or replace package ut authid current_user as a_client_character_set varchar2 := null, a_random_test_order integer := 0, a_random_test_order_seed positive := null, - a_tags varchar2 := null + a_tags varchar2 := null, + a_include_schema_expr varchar2 := null, + a_include_object_expr varchar2 := null, + a_exclude_schema_expr varchar2 := null, + a_exclude_object_expr varchar2 := null ) return ut_varchar2_rows pipelined; function run( @@ -106,7 +118,11 @@ create or replace package ut authid current_user as a_client_character_set varchar2 := null, a_random_test_order integer := 0, a_random_test_order_seed positive := null, - a_tags varchar2 := null + a_tags varchar2 := null, + a_include_schema_expr varchar2 := null, + a_include_object_expr varchar2 := null, + a_exclude_schema_expr varchar2 := null, + a_exclude_object_expr varchar2 := null ) return ut_varchar2_rows pipelined; function run( @@ -121,7 +137,11 @@ create or replace package ut authid current_user as a_client_character_set varchar2 := null, a_random_test_order integer := 0, a_random_test_order_seed positive := null, - a_tags varchar2 := null + a_tags varchar2 := null, + a_include_schema_expr varchar2 := null, + a_include_object_expr varchar2 := null, + a_exclude_schema_expr varchar2 := null, + a_exclude_object_expr varchar2 := null ) return ut_varchar2_rows pipelined; function run( @@ -136,7 +156,11 @@ create or replace package ut authid current_user as a_client_character_set varchar2 := null, a_random_test_order integer := 0, a_random_test_order_seed positive := null, - a_tags varchar2 := null + a_tags varchar2 := null, + a_include_schema_expr varchar2 := null, + a_include_object_expr varchar2 := null, + a_exclude_schema_expr varchar2 := null, + a_exclude_object_expr varchar2 := null ) return ut_varchar2_rows pipelined; procedure run( @@ -151,7 +175,11 @@ create or replace package ut authid current_user as a_force_manual_rollback boolean := false, a_random_test_order boolean := false, a_random_test_order_seed positive := null, - a_tags varchar2 := null + a_tags varchar2 := null, + a_include_schema_expr varchar2 := null, + a_include_object_expr varchar2 := null, + a_exclude_schema_expr varchar2 := null, + a_exclude_object_expr varchar2 := null ); procedure run( @@ -166,7 +194,11 @@ create or replace package ut authid current_user as a_force_manual_rollback boolean := false, a_random_test_order boolean := false, a_random_test_order_seed positive := null, - a_tags varchar2 := null + a_tags varchar2 := null, + a_include_schema_expr varchar2 := null, + a_include_object_expr varchar2 := null, + a_exclude_schema_expr varchar2 := null, + a_exclude_object_expr varchar2 := null ); procedure run( @@ -182,7 +214,11 @@ create or replace package ut authid current_user as a_force_manual_rollback boolean := false, a_random_test_order boolean := false, a_random_test_order_seed positive := null, - a_tags varchar2 := null + a_tags varchar2 := null, + a_include_schema_expr varchar2 := null, + a_include_object_expr varchar2 := null, + a_exclude_schema_expr varchar2 := null, + a_exclude_object_expr varchar2 := null ); procedure run( @@ -198,7 +234,11 @@ create or replace package ut authid current_user as a_force_manual_rollback boolean := false, a_random_test_order boolean := false, a_random_test_order_seed positive := null, - a_tags varchar2 := null + a_tags varchar2 := null, + a_include_schema_expr varchar2 := null, + a_include_object_expr varchar2 := null, + a_exclude_schema_expr varchar2 := null, + a_exclude_object_expr varchar2 := null ); procedure run( @@ -214,7 +254,11 @@ create or replace package ut authid current_user as a_force_manual_rollback boolean := false, a_random_test_order boolean := false, a_random_test_order_seed positive := null, - a_tags varchar2 := null + a_tags varchar2 := null, + a_include_schema_expr varchar2 := null, + a_include_object_expr varchar2 := null, + a_exclude_schema_expr varchar2 := null, + a_exclude_object_expr varchar2 := null ); procedure run( @@ -230,7 +274,11 @@ create or replace package ut authid current_user as a_force_manual_rollback boolean := false, a_random_test_order boolean := false, a_random_test_order_seed positive := null, - a_tags varchar2 := null + a_tags varchar2 := null, + a_include_schema_expr varchar2 := null, + a_include_object_expr varchar2 := null, + a_exclude_schema_expr varchar2 := null, + a_exclude_object_expr varchar2 := null ); /** diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index d2bd74b91..af168fe5d 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -69,7 +69,11 @@ create or replace package body ut_runner is a_force_manual_rollback boolean := false, a_random_test_order boolean := false, a_random_test_order_seed positive := null, - a_tags varchar2 := null + a_tags varchar2 := null, + a_include_schema_expr varchar2 := null, + a_include_object_expr varchar2 := null, + a_exclude_schema_expr varchar2 := null, + a_exclude_object_expr varchar2 := null ) is l_run ut_run; l_coverage_schema_names ut_varchar2_rows; @@ -120,7 +124,6 @@ create or replace package body ut_runner is ut_utils.trim_list_elements(ut_utils.filter_list(ut_utils.string_to_table(a_tags,','),ut_utils.gc_word_no_space)) ); end if; - l_run := ut_run( a_run_paths => l_paths, a_coverage_options => ut_coverage_options( @@ -128,7 +131,11 @@ create or replace package body ut_runner is schema_names => l_coverage_schema_names, exclude_objects => ut_utils.convert_collection(a_exclude_objects), include_objects => ut_utils.convert_collection(a_include_objects), - file_mappings => set(a_source_file_mappings) + file_mappings => set(a_source_file_mappings), + include_schema_expr => a_include_schema_expr, + include_object_expr => a_include_object_expr, + exclude_schema_expr => a_exclude_schema_expr, + exclude_object_expr => a_exclude_object_expr ), a_test_file_mappings => set(a_test_file_mappings), a_client_character_set => a_client_character_set, @@ -142,7 +149,6 @@ create or replace package body ut_runner is end if; l_run.do_execute(); - finish_run(l_run, a_force_manual_rollback); exception when others then diff --git a/source/api/ut_runner.pks b/source/api/ut_runner.pks index 75aa12f8f..3170dedee 100644 --- a/source/api/ut_runner.pks +++ b/source/api/ut_runner.pks @@ -71,7 +71,11 @@ create or replace package ut_runner authid current_user is a_force_manual_rollback boolean := false, a_random_test_order boolean := false, a_random_test_order_seed positive := null, - a_tags varchar2 := null + a_tags varchar2 := null, + a_include_schema_expr varchar2 := null, + a_include_object_expr varchar2 := null, + a_exclude_schema_expr varchar2 := null, + a_exclude_object_expr varchar2 := null ); /** diff --git a/source/core/coverage/ut_coverage.pkb b/source/core/coverage/ut_coverage.pkb index ddcdeaf2e..b3667bb26 100644 --- a/source/core/coverage/ut_coverage.pkb +++ b/source/core/coverage/ut_coverage.pkb @@ -30,11 +30,12 @@ create or replace package body ut_coverage is end; function get_cov_sources_sql(a_coverage_options ut_coverage_options, a_skip_objects ut_object_names) return varchar2 is - l_result varchar2(32767); + l_result varchar2(32767); --QUESTION: Given fact that we can pass large regex filters same as objects filter should we consider a clob ? l_full_name varchar2(32767); l_join_mappings varchar2(32767); l_filters varchar2(32767); l_mappings_cardinality integer := 0; + l_regex_exc_filters varchar2(32767); begin l_result := q'[ with @@ -82,8 +83,9 @@ create or replace package body ut_coverage is -- Exclude calls to utPLSQL framework, Unit Test packages and objects from a_exclude_list parameter of coverage reporter where (s.owner, s.name) not in ( select /*+ cardinality(el {skipped_objects_cardinality})*/el.owner, el.name from table(:l_skipped_objects) el ) and line > 0 + {regex_filters} ]'; - + if a_coverage_options.file_mappings is not empty then l_mappings_cardinality := ut_utils.scale_cardinality(cardinality(a_coverage_options.file_mappings)); l_full_name := 'f.file_name'; @@ -92,6 +94,15 @@ create or replace package body ut_coverage is on s.name = f.object_name and s.type = f.object_type and s.owner = f.object_owner'; + elsif a_coverage_options.include_schema_expr is not null or a_coverage_options.include_object_expr is not null then + l_full_name := q'[lower(s.type||' '||s.owner||'.'||s.name)]'; + if a_coverage_options.include_schema_expr is not null then + l_filters := q'[and regexp_like(s.owner,']'||a_coverage_options.include_schema_expr||q'[','i')]'; + end if; + + if a_coverage_options.include_object_expr is not null then + l_filters := l_filters|| q'[ and regexp_like(s.name,']'||a_coverage_options.include_object_expr||q'[','i')]'; + end if; else l_full_name := q'[lower(s.type||' '||s.owner||'.'||s.name)]'; l_filters := case @@ -109,13 +120,27 @@ create or replace package body ut_coverage is end; end if; + + if a_coverage_options.exclude_schema_expr is not null then + l_regex_exc_filters := l_regex_exc_filters||q'[and not regexp_like(s.owner,']'||a_coverage_options.exclude_schema_expr||q'[,'i') + ]'; + end if; + + if a_coverage_options.exclude_object_expr is not null then + l_regex_exc_filters := l_regex_exc_filters||q'[and not regexp_like(s.name,']'||a_coverage_options.exclude_object_expr||q'[,'i') + ]'; + end if; + + + l_result := replace(l_result, '{sources_view}', ut_metadata.get_source_view_name()); l_result := replace(l_result, '{l_full_name}', l_full_name); l_result := replace(l_result, '{join_file_mappings}', l_join_mappings); l_result := replace(l_result, '{filters}', l_filters); l_result := replace(l_result, '{mappings_cardinality}', l_mappings_cardinality); l_result := replace(l_result, '{skipped_objects_cardinality}', ut_utils.scale_cardinality(cardinality(a_skip_objects))); - + l_result := replace(l_result, '{regex_filters}', l_regex_exc_filters); + return l_result; end; @@ -138,6 +163,8 @@ create or replace package body ut_coverage is open l_cursor for l_sql using a_coverage_options.file_mappings, l_skip_objects; elsif a_coverage_options.include_objects is not empty then open l_cursor for l_sql using a_coverage_options.include_objects, a_coverage_options.include_objects, l_skip_objects; + elsif a_coverage_options.include_schema_expr is not null or a_coverage_options.include_object_expr is not null then + open l_cursor for l_sql using l_skip_objects; else open l_cursor for l_sql using a_coverage_options.schema_names, a_coverage_options.schema_names, l_skip_objects; end if; diff --git a/source/core/types/ut_coverage_options.tpb b/source/core/types/ut_coverage_options.tpb index 308c75553..a091802af 100644 --- a/source/core/types/ut_coverage_options.tpb +++ b/source/core/types/ut_coverage_options.tpb @@ -22,7 +22,11 @@ create or replace type body ut_coverage_options as schema_names ut_varchar2_rows := null, exclude_objects ut_varchar2_rows := null, include_objects ut_varchar2_rows := null, - file_mappings ut_file_mappings := null + file_mappings ut_file_mappings := null, + include_schema_expr varchar2 := null, + include_object_expr varchar2 := null, + exclude_schema_expr varchar2 := null, + exclude_object_expr varchar2 := null ) return self as result is function to_ut_object_list(a_names ut_varchar2_rows, a_schema_names ut_varchar2_rows) return ut_object_names is l_result ut_object_names; @@ -54,10 +58,15 @@ create or replace type body ut_coverage_options as if exclude_objects is not empty then self.exclude_objects := to_ut_object_list(exclude_objects, self.schema_names); end if; --- self.exclude_objects := self.exclude_objects multiset union all ut_suite_manager.get_schema_ut_packages(schema_names); self.include_objects := to_ut_object_list(include_objects, self.schema_names); + self.include_schema_expr := include_schema_expr; + self.include_object_expr := include_object_expr; + self.exclude_schema_expr := exclude_schema_expr; + self.exclude_object_expr := exclude_object_expr; + + return; end; end; diff --git a/source/core/types/ut_coverage_options.tps b/source/core/types/ut_coverage_options.tps index 1be518c5e..245539179 100644 --- a/source/core/types/ut_coverage_options.tps +++ b/source/core/types/ut_coverage_options.tps @@ -21,13 +21,21 @@ create or replace type ut_coverage_options force as object ( exclude_objects ut_object_names, include_objects ut_object_names, file_mappings ut_file_mappings, + include_schema_expr varchar2(32767), + include_object_expr varchar2(32767), + exclude_schema_expr varchar2(32767), + exclude_object_expr varchar2(32767), constructor function ut_coverage_options( self in out nocopy ut_coverage_options, coverage_run_id raw, schema_names ut_varchar2_rows := null, exclude_objects ut_varchar2_rows := null, include_objects ut_varchar2_rows := null, - file_mappings ut_file_mappings := null + file_mappings ut_file_mappings := null, + include_schema_expr varchar2 := null, + include_object_expr varchar2 := null, + exclude_schema_expr varchar2 := null, + exclude_object_expr varchar2 := null ) return self as result ) / From ddf775fa1e0fa4a7475de147fd20dd25fdfcaa60 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 10 Feb 2022 10:41:17 +0200 Subject: [PATCH 0886/1096] Testing after fixing the workdir for 12.1EE image --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0c9789173..cf36d4c55 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,7 +76,7 @@ jobs: --health-timeout 5s --health-retries 10 --name oracle -# --health-cmd healthcheck.sh + --health-cmd healthcheck.sh steps: - uses: actions/checkout@v2 @@ -159,7 +159,7 @@ jobs: - name: Get ORACLE_BASE/diag data id: get-oracle-diag-data if: ${{ always() && steps.run-tests.outcome == 'failure' }} - run: docker exec oracle bash -c "chmod -R +777 ${{matrix.oracle-base}}/diag && cp -r ${{matrix.oracle-base}}/diag /utPLSQL/database-diag" + run: docker exec oracle bash -c "chmod -R +777 ./diag && cp -r ./diag /utPLSQL/database-diag" - name: Upload ORACLE_BASE/diag data Artifact id: upload if: ${{ always() && steps.run-tests.outcome == 'failure' }} From 7ecc9b2d52ca091aad74309ce07a8d1e38042b70 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 11 Feb 2022 00:08:45 +0000 Subject: [PATCH 0887/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 16f90c86e..de17e4487 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 357f2db99..ffbf00693 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 96b4a1125..c3bc234bc 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 72279191f..c8a8a5bed 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index b6088eceb..a6961d57a 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index cd616bde0..0c9a7c63f 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index e778b8d8c..e1c55833e 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 95591d7ef..bf1283e69 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 89a17d5ef..cbf2a2df6 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 97209655a..90b0e6b3f 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index ea4b37e3d..444568c54 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 83e06cf8a..a29262da0 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index f6f46c8a2..2c5e7cdfb 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 9bceca36a..5cc980f3f 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index bc18b0035..6904fb346 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 20cecb601..40171c205 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 25252df0a..91d9bc914 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3846--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index a2a3528ca..4974306a3 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.12.3846-develop'; + gc_version constant varchar2(50) := 'v3.1.12.3865-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 51dbe87604a626b76aef4c9b3b9be5a24c6913e1 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 14 Feb 2022 01:23:15 +0200 Subject: [PATCH 0888/1096] Improved get_cov_sources SQL query. References #1169 --- source/core/coverage/ut_coverage.pkb | 30 +++++++++++++++------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/source/core/coverage/ut_coverage.pkb b/source/core/coverage/ut_coverage.pkb index ddcdeaf2e..8bdcec4eb 100644 --- a/source/core/coverage/ut_coverage.pkb +++ b/source/core/coverage/ut_coverage.pkb @@ -38,22 +38,20 @@ create or replace package body ut_coverage is begin l_result := q'[ with - trigger_source_offsets as ( - select min(s.line) - 1 offset, s.owner, s.name, s.type - from {sources_view} s - where s.type = 'TRIGGER' - {filters} - and (lower(s.text) like '%begin%' or lower(s.text) like '%declare%' or lower(s.text) like '%compound%') - group by s.owner, s.name, s.type - ), sources as ( select /*+ cardinality(f {mappings_cardinality}) */ {l_full_name} as full_name, s.owner, s.name, s.type, - s.line - case when s.type = 'TRIGGER' then o.offset else 0 end as line, + s.line + - case + when s.type = 'TRIGGER' + then + /* calculate offset of line number for trigger source in coverage reporting */ + min(case when lower(s.text) like '%begin%' or lower(s.text) like '%declare%' or lower(s.text) like '%compound%' then s.line-1 end) + over (partition by s.owner, s.type, s.name) + else 0 + end as line, s.text from {sources_view} s {join_file_mappings} - left join trigger_source_offsets o - on (s.owner = o.owner and s.name = o.name and s.type = o.type) where s.type in ('PACKAGE BODY', 'TYPE BODY', 'PROCEDURE', 'FUNCTION', 'TRIGGER') {filters} ), @@ -80,7 +78,11 @@ create or replace package body ut_coverage is select /*+ no_parallel */ full_name, owner, name, type, line, to_be_skipped, text from coverage_sources s -- Exclude calls to utPLSQL framework, Unit Test packages and objects from a_exclude_list parameter of coverage reporter - where (s.owner, s.name) not in ( select /*+ cardinality(el {skipped_objects_cardinality})*/el.owner, el.name from table(:l_skipped_objects) el ) + where not exists ( + select /*+ cardinality(el {skipped_objects_cardinality})*/ 1 + from table(:l_skipped_objects) el + where s.owner = el.owner and s.name = el.name + ) and line > 0 ]'; @@ -137,9 +139,9 @@ create or replace package body ut_coverage is if a_coverage_options.file_mappings is not empty then open l_cursor for l_sql using a_coverage_options.file_mappings, l_skip_objects; elsif a_coverage_options.include_objects is not empty then - open l_cursor for l_sql using a_coverage_options.include_objects, a_coverage_options.include_objects, l_skip_objects; + open l_cursor for l_sql using a_coverage_options.include_objects, l_skip_objects; else - open l_cursor for l_sql using a_coverage_options.schema_names, a_coverage_options.schema_names, l_skip_objects; + open l_cursor for l_sql using a_coverage_options.schema_names, l_skip_objects; end if; return l_cursor; end; From 4515e0b5a3b4b0de0c2198db3235ef8614bff4d8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 14 Feb 2022 10:13:50 +0000 Subject: [PATCH 0889/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index de17e4487..37bf4e2d1 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index ffbf00693..f064966b3 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index c3bc234bc..7979e1c23 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index c8a8a5bed..4772a25de 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index a6961d57a..537da5148 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 0c9a7c63f..617e888ac 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index e1c55833e..e46c20029 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index bf1283e69..dc4a8ffda 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index cbf2a2df6..0fabf61bd 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 90b0e6b3f..be7e9b125 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 444568c54..a50797b2e 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index a29262da0..c4b2b1a0b 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 2c5e7cdfb..27b2989cf 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 5cc980f3f..d6e75700c 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 6904fb346..ebc28ec38 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 40171c205..03fe03f3e 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 91d9bc914..177f13589 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3865--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 4974306a3..4401742f8 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.12.3865-develop'; + gc_version constant varchar2(50) := 'v3.1.12.3872-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 8370aa98ee48c2a2d4dc5f6cacf75d519a4a6e54 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Tue, 22 Feb 2022 11:21:22 +0000 Subject: [PATCH 0890/1096] commit changes --- source/core/coverage/ut_coverage.pkb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/source/core/coverage/ut_coverage.pkb b/source/core/coverage/ut_coverage.pkb index b3667bb26..93439daea 100644 --- a/source/core/coverage/ut_coverage.pkb +++ b/source/core/coverage/ut_coverage.pkb @@ -122,13 +122,11 @@ create or replace package body ut_coverage is if a_coverage_options.exclude_schema_expr is not null then - l_regex_exc_filters := l_regex_exc_filters||q'[and not regexp_like(s.owner,']'||a_coverage_options.exclude_schema_expr||q'[,'i') - ]'; + l_regex_exc_filters := l_regex_exc_filters||q'[ and not regexp_like(s.owner,']'||a_coverage_options.exclude_schema_expr||q'[,'i')]'; end if; if a_coverage_options.exclude_object_expr is not null then - l_regex_exc_filters := l_regex_exc_filters||q'[and not regexp_like(s.name,']'||a_coverage_options.exclude_object_expr||q'[,'i') - ]'; + l_regex_exc_filters := l_regex_exc_filters||q'[ and not regexp_like(s.name,']'||a_coverage_options.exclude_object_expr||q'[,'i')]'; end if; From b52f97d11d0b1fe65ad0a98ea515b1862653ce6f Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 23 Feb 2022 01:24:48 +0200 Subject: [PATCH 0891/1096] Update of releasing.md --- development/releasing.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/development/releasing.md b/development/releasing.md index f85e18c3c..ef8edbfc2 100644 --- a/development/releasing.md +++ b/development/releasing.md @@ -1,17 +1,17 @@ ## Release process -With every build, the build process on Travis updates files with an appropriate version number before deployment into the database. -This step is performed, to confirm that the update of versions works properly. +To create a release follow the below steps -## To create a release - - - create release branch from development branch and make sure to name the release branch: `release/vX.Y.Z` - - update, commit and push at least one file change in the release branch, to kickoff a Travis build - - wait for th build to complete successfully - - merge the release branch to main and wait for main build to complete successfully (do not use Squash/rebase for merge operation) - - create a Github release from the main branch using [github releases page](https://github.com/utPLSQL/utPLSQL/releases) and populate release description using information found on the issues and pull requests since previous release. +## Release preparation + - create a draft of Release from the `main` branch using [github releases page](https://github.com/utPLSQL/utPLSQL/releases) and populate release description using information found on the issues and pull requests **since previous release**. To find issues closed after certain date use [advanced filters](https://help.github.com/articles/searching-issues-and-pull-requests/#search-by-open-or-closed-state). Example: [`is:issue closed:>2018-07-22`](https://github.com/utPLSQL/utPLSQL/issues?utf8=%E2%9C%93&q=is%3Aissue+closed%3A%3E2018-07-22+) + +## Performing a release + - create release branch from development branch and make sure to name the release branch: `release/vX.Y.Z` + - update, commit and push at least one file change in the release branch, to kick off a build on [GithubActions](https://github.com/utPLSQL/utPLSQL/actions) + - wait for the build to complete successfully + - merge the release branch to `main` branch and wait for build on `main` branch to complete successfully (do not use Squash/rebase for merge operation) - After A build was completed on a TAG (github release) was successful, merge main branch back into develop branch. - At this point, main branch and release tag should be at the same commit version and artifacts should be uploaded into Github release. - After develop branch was built, update version number in `VERSION` file to represent next planned release version. @@ -19,11 +19,11 @@ This step is performed, to confirm that the update of versions works properly. The following will happen: - build executed on branch `release/vX.Y.Z-[something]` updates files `sonar-project.properties`, `VERSION` with project version derived from the release branch name - - changes to those two files are committed and pushed back to release branch by Travis + - changes to those two files are committed and pushed back to release branch - builds on main branch are **not getting executed** - when a Github release is created, a new tag is added in on the repository and a tag build is executed - the documentation for new release is published on `utplsql.github.io` and installation archives are added to the tag. -Note: -The sources for release are provided in separate zip files delivered from the Travis build process. +# Note: +The sources for release are provided in separate zip files delivered by the build process. The built zip files include HTML documentation generated from MD files. From 6ba87ac94d644f7afbc7f6727bce12c35bfd0deb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 22 Feb 2022 23:31:23 +0000 Subject: [PATCH 0892/1096] Updated project version after build [skip ci] --- VERSION | 2 +- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- sonar-project.properties | 2 +- source/core/ut_utils.pks | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/VERSION b/VERSION index a0d004aa2..8ecb8bfc6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.12-develop +v3.1.12 diff --git a/docs/about/authors.md b/docs/about/authors.md index 37bf4e2d1..19bb1c0e0 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index f064966b3..f1021f44e 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 7979e1c23..436e8879e 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 4772a25de..b9ac72097 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 537da5148..3163d3bc0 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 617e888ac..8d55bb8fc 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index e46c20029..aa45f16aa 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index dc4a8ffda..e8d91bd95 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 0fabf61bd..98503395f 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index be7e9b125..2c1c1fdde 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index a50797b2e..b4b5e54be 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index c4b2b1a0b..341c36f4c 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 27b2989cf..662021e0c 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index d6e75700c..ee88a45d3 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index ebc28ec38..203dac782 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 03fe03f3e..ed6bc8956 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 177f13589..3d47d8313 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) # Upgrading from version 2 diff --git a/sonar-project.properties b/sonar-project.properties index 7559b58a1..0d7f7c9ce 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -3,7 +3,7 @@ sonar.organization=utplsql sonar.projectKey=utPLSQL # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=utPLSQL -sonar.projectVersion=v3.1.12-develop +sonar.projectVersion=v3.1.12 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # Since SonarQube 4.2, this property is optional if sonar.modules is set. diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 4401742f8..7a4899df5 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.12.3872-develop'; + gc_version constant varchar2(50) := 'v3.1.12.3873'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From c62d69ca50e80a37573d8811d8e93facfb9b9c79 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 24 Feb 2022 00:34:21 +0200 Subject: [PATCH 0893/1096] Updated releasing.md and .gitattributes files. --- .gitattributes | 13 ++++++------- development/releasing.md | 23 ++++++++++++----------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.gitattributes b/.gitattributes index abd1d5471..5e0c801de 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,17 +1,16 @@ +.github export-ignore +.idea export-ignore +development export-ignore +test export-ignore .gitattributes export-ignore .gitignore export-ignore .gitmodules export-ignore -.travis.yml export-ignore mkdocs.yml export-ignore -.travis export-ignore -.github export-ignore sonar-project.properties export-ignore -tests export-ignore -development export-ignore -node_modules export-ignore -^docs/* linguist-documentation +^docs/** linguist-documentation *.pkb linguist-language=PLSQL *.pks linguist-language=PLSQL *.sql linguist-language=PLSQL *.tpb linguist-language=PLSQL *.tps linguist-language=PLSQL +*.sh text eol=lf diff --git a/development/releasing.md b/development/releasing.md index ef8edbfc2..bcc89067a 100644 --- a/development/releasing.md +++ b/development/releasing.md @@ -3,27 +3,28 @@ To create a release follow the below steps ## Release preparation - - create a draft of Release from the `main` branch using [github releases page](https://github.com/utPLSQL/utPLSQL/releases) and populate release description using information found on the issues and pull requests **since previous release**. + - Create a **draft** of Release from the `main` branch using [github releases page](https://github.com/utPLSQL/utPLSQL/releases) and populate release description using information found on the issues and pull requests **since previous release**. To find issues closed after certain date use [advanced filters](https://help.github.com/articles/searching-issues-and-pull-requests/#search-by-open-or-closed-state). Example: [`is:issue closed:>2018-07-22`](https://github.com/utPLSQL/utPLSQL/issues?utf8=%E2%9C%93&q=is%3Aissue+closed%3A%3E2018-07-22+) ## Performing a release - - create release branch from development branch and make sure to name the release branch: `release/vX.Y.Z` - - update, commit and push at least one file change in the release branch, to kick off a build on [GithubActions](https://github.com/utPLSQL/utPLSQL/actions) - - wait for the build to complete successfully + - create the release branch from `develop` branch and make sure to name the release branch: `release/vX.Y.Z` + - update, commit and push at least one file change in the release branch, to kick off a build on [GithubActions](https://github.com/utPLSQL/utPLSQL/actions) or kick-off a build manually for that branch after it was created on github. + - wait for the build to complete successfully as it will update the version to be release number (without develop) - merge the release branch to `main` branch and wait for build on `main` branch to complete successfully (do not use Squash/rebase for merge operation) - - After A build was completed on a TAG (github release) was successful, merge main branch back into develop branch. + - Publish the release on the `main` branch and tag it with version number `vX.Y.Z` + - Wait for the release build to finish successfully on Github Actions as this will upload release artifacts (`zip` and `tar.gz` files along with `md5`) + - After A Release build was completed successfully, merge main branch back into develop branch. - At this point, main branch and release tag should be at the same commit version and artifacts should be uploaded into Github release. - - After develop branch was built, update version number in `VERSION` file to represent next planned release version. + - After develop branch was built, increase the version number in `VERSION` file to represent next planned release version. - Clone `utplsql.githug.io` project and add a new announcement about next version being released in `_posts`. Use previous announcements as a template. Make sure to set date, time and post title properly. The following will happen: - build executed on branch `release/vX.Y.Z-[something]` updates files `sonar-project.properties`, `VERSION` with project version derived from the release branch name - changes to those two files are committed and pushed back to release branch - - builds on main branch are **not getting executed** - - when a Github release is created, a new tag is added in on the repository and a tag build is executed - - the documentation for new release is published on `utplsql.github.io` and installation archives are added to the tag. + - when a Github release is published, a new tag is added in on the repository and a release build is executed + - With Release build, the documentation for new release is published on `utplsql.github.io` and installation archives are added to the release. # Note: -The sources for release are provided in separate zip files delivered by the build process. -The built zip files include HTML documentation generated from MD files. +The utPLSQL installation files are uploaded by the release build process as release artifacts (separate `zip` and `tar.gz` files). +The release artifacts include HTML documentation generated from MD files, sources and tests From c677c5ce0e95a86f5b99c1b2101c29c40bac19af Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 23 Feb 2022 22:55:42 +0000 Subject: [PATCH 0894/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 19bb1c0e0..305bf5ed4 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3876-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index f1021f44e..92d2cc380 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3876-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 436e8879e..1d11c0dd1 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3876-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index b9ac72097..837c895fc 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3876-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 3163d3bc0..637615fef 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3876-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 8d55bb8fc..dea2d2a81 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3876-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index aa45f16aa..b1d09d24e 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3876-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index e8d91bd95..0180f940a 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3876-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 98503395f..ed615a4a2 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3876-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 2c1c1fdde..cd14c0841 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3876-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index b4b5e54be..2ee5c440a 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3876-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 341c36f4c..c366b06d1 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3876-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 662021e0c..429bec5da 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3876-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index ee88a45d3..818219fcc 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3876-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 203dac782..94ffd569a 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3876-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index ed6bc8956..b14caec93 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3876-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 3d47d8313..079ed06ef 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3873-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3876-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 7a4899df5..d43c1c813 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.12.3873'; + gc_version constant varchar2(50) := 'v3.1.12.3876'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 7b9e0859438765be9585de966777cd043b4932a5 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Fri, 25 Feb 2022 00:05:47 +0000 Subject: [PATCH 0895/1096] Making more changes --- source/core/coverage/ut_coverage.pkb | 33 +++++---- test/ut3_tester_helper/coverage_helper.pkb | 22 ++++-- .../test_coverage/test_extended_coverage.pkb | 71 +++++++++++++++++++ .../test_coverage/test_extended_coverage.pks | 16 ++++- 4 files changed, 122 insertions(+), 20 deletions(-) diff --git a/source/core/coverage/ut_coverage.pkb b/source/core/coverage/ut_coverage.pkb index 18d359b72..cdef6dd04 100644 --- a/source/core/coverage/ut_coverage.pkb +++ b/source/core/coverage/ut_coverage.pkb @@ -55,6 +55,7 @@ create or replace package body ut_coverage is from {sources_view} s {join_file_mappings} where s.type in ('PACKAGE BODY', 'TYPE BODY', 'PROCEDURE', 'FUNCTION', 'TRIGGER') {filters} + {regex_exc_filters} ), coverage_sources as ( select full_name, owner, name, type, line, text, @@ -85,7 +86,6 @@ create or replace package body ut_coverage is where s.owner = el.owner and s.name = el.name ) and line > 0 - {regex_filters} ]'; if a_coverage_options.file_mappings is not empty then @@ -99,11 +99,14 @@ create or replace package body ut_coverage is elsif a_coverage_options.include_schema_expr is not null or a_coverage_options.include_object_expr is not null then l_full_name := q'[lower(s.type||' '||s.owner||'.'||s.name)]'; if a_coverage_options.include_schema_expr is not null then - l_filters := q'[and regexp_like(s.owner,']'||a_coverage_options.include_schema_expr||q'[','i')]'; - end if; - + l_filters := q'[and regexp_like(s.owner,:a_include_schema_expr,'i')]'; + else + l_filters := 'and :a_include_schema_expr is null'; + end if; if a_coverage_options.include_object_expr is not null then - l_filters := l_filters|| q'[ and regexp_like(s.name,']'||a_coverage_options.include_object_expr||q'[','i')]'; + l_filters := l_filters|| q'[ and regexp_like(s.name,:a_include_object_expr,'i')]'; + else + l_filters := l_filters|| 'and :a_include_object_expr is null'; end if; else l_full_name := q'[lower(s.type||' '||s.owner||'.'||s.name)]'; @@ -124,11 +127,15 @@ create or replace package body ut_coverage is if a_coverage_options.exclude_schema_expr is not null then - l_regex_exc_filters := l_regex_exc_filters||q'[ and not regexp_like(s.owner,']'||a_coverage_options.exclude_schema_expr||q'[,'i')]'; + l_regex_exc_filters := q'[ and not regexp_like(s.owner,:a_exclude_schema_expr,'i')]'; + else + l_regex_exc_filters := ' and :a_exclude_schema_expr is null '; end if; if a_coverage_options.exclude_object_expr is not null then - l_regex_exc_filters := l_regex_exc_filters||q'[ and not regexp_like(s.name,']'||a_coverage_options.exclude_object_expr||q'[,'i')]'; + l_regex_exc_filters := l_regex_exc_filters||q'[ and not regexp_like(s.name,:a_exclude_obj_expr:,'i')]'; + else + l_regex_exc_filters := l_regex_exc_filters||'and :a_exclude_obj_expr is null '; end if; @@ -139,7 +146,7 @@ create or replace package body ut_coverage is l_result := replace(l_result, '{filters}', l_filters); l_result := replace(l_result, '{mappings_cardinality}', l_mappings_cardinality); l_result := replace(l_result, '{skipped_objects_cardinality}', ut_utils.scale_cardinality(cardinality(a_skip_objects))); - l_result := replace(l_result, '{regex_filters}', l_regex_exc_filters); + l_result := replace(l_result, '{regex_exc_filters}', l_regex_exc_filters); return l_result; @@ -160,13 +167,15 @@ create or replace package body ut_coverage is ut_event_manager.trigger_event(ut_event_manager.gc_debug, ut_key_anyvalues().put('l_sql',l_sql) ); if a_coverage_options.file_mappings is not empty then - open l_cursor for l_sql using a_coverage_options.file_mappings, l_skip_objects; + open l_cursor for l_sql using a_coverage_options.file_mappings,a_coverage_options.exclude_schema_expr,a_coverage_options.exclude_object_expr,l_skip_objects; elsif a_coverage_options.include_objects is not empty then - open l_cursor for l_sql using a_coverage_options.include_objects, l_skip_objects; + open l_cursor for l_sql using a_coverage_options.include_objects,a_coverage_options.exclude_schema_expr,a_coverage_options.exclude_object_expr,l_skip_objects; elsif a_coverage_options.include_schema_expr is not null or a_coverage_options.include_object_expr is not null then - open l_cursor for l_sql using l_skip_objects; + open l_cursor for l_sql using a_coverage_options.include_schema_expr,a_coverage_options.include_object_expr, + a_coverage_options.exclude_schema_expr,a_coverage_options.exclude_object_expr, + l_skip_objects; else - open l_cursor for l_sql using a_coverage_options.schema_names, l_skip_objects; + open l_cursor for l_sql using a_coverage_options.schema_names,a_coverage_options.exclude_schema_expr,a_coverage_options.exclude_object_expr,l_skip_objects; end if; return l_cursor; end; diff --git a/test/ut3_tester_helper/coverage_helper.pkb b/test/ut3_tester_helper/coverage_helper.pkb index 4be062645..bbf288ed4 100644 --- a/test/ut3_tester_helper/coverage_helper.pkb +++ b/test/ut3_tester_helper/coverage_helper.pkb @@ -200,14 +200,14 @@ create or replace package body coverage_helper is begin execute immediate q'[drop package ut3_develop.test_regex_dummy_cov]'; exception when others then null; end; end; - procedure create_regex_dummy_cov_schema is + procedure create_regex_dummy_for_schema(p_schema in varchar2) is pragma autonomous_transaction; begin - execute immediate q'[create or replace package ut3_develop.]'||covered_package_name||q'[ is + execute immediate q'[create or replace package ]'||p_schema||q'[.regex_dummy_cov_schema is procedure do_stuff(i_input in number); end;]'; - execute immediate q'[create or replace package body ut3_develop.]'||covered_package_name||q'[ is + execute immediate q'[create or replace package body ]'||p_schema||q'[.regex_dummy_cov_schema is procedure do_stuff(i_input in number) is begin if i_input = 2 then dbms_output.put_line('should not get here'); elsif i_input = 1 then dbms_output.put_line('should get here'); @@ -217,7 +217,7 @@ create or replace package body coverage_helper is end; end;]'; - execute immediate q'[create or replace package ut3_develop.test_dummy_coverage is + execute immediate q'[create or replace package ]'||p_schema||q'[.test_regex_dummy_cov_schema is --%suite(dummy coverage test) --%suitepath(coverage_testing) @@ -228,10 +228,10 @@ create or replace package body coverage_helper is procedure zero_coverage; end;]'; - execute immediate q'[create or replace package body ut3_develop.test_dummy_coverage is + execute immediate q'[create or replace package body ]'||p_schema||q'[.test_regex_dummy_cov_schema is procedure test_do_stuff is begin - ]'||covered_package_name||q'[.do_stuff(1); + regex_dummy_cov_schema.do_stuff(1); ut.expect(1).to_equal(1); end; procedure zero_coverage is @@ -241,11 +241,19 @@ create or replace package body coverage_helper is end;]'; end; + procedure create_regex_dummy_cov_schema is + begin + create_regex_dummy_for_schema('ut3_develop'); + create_regex_dummy_for_schema('ut3_tester_helper'); + end; + procedure drop_regex_dummy_cov_schema is pragma autonomous_transaction; begin - begin execute immediate q'[drop package ut3_helper.regex_dummy_cov_schema]'; exception when others then null; end; + begin execute immediate q'[drop package ut3_develop.regex_dummy_cov_schema]'; exception when others then null; end; begin execute immediate q'[drop package ut3_develop.test_regex_dummy_cov_schema]'; exception when others then null; end; + begin execute immediate q'[drop package ut3_tester_helper.regex_dummy_cov_schema]'; exception when others then null; end; + begin execute immediate q'[drop package ut3_tester_helper.test_regex_dummy_cov_schema]'; exception when others then null; end; end; diff --git a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb index a8d104e28..5aea2e184 100644 --- a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb +++ b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb @@ -106,5 +106,76 @@ create or replace package body test_extended_coverage is ut.expect(l_actual).to_be_like(l_expected); end; + procedure coverage_regex_include_schema is + l_expected_ut3 clob; + l_expected_help clob; + l_actual_ut3 clob; + l_actual_help clob; + l_actual_both clob; + + begin + --Arrange + l_expected_ut3 := '%' || + '%%'; + l_expected_help := '%' || + '%%'; + --Act + l_actual_ut3 := + ut3_tester_helper.coverage_helper.run_tests_as_job( + q'[ + ut3_develop.ut.run( + a_paths => ut3_develop.ut_varchar2_list('ut3_develop.test_regex_dummy_cov_schema', 'ut3_tester_helper.test_regex_dummy_cov_schema'), + a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), + a_include_schema_expr => '^ut3_develop' + ) + ]' + ); + /* + l_actual_help := + ut3_tester_helper.coverage_helper.run_tests_as_job( + q'[ + ut3_develop.ut.run( + a_paths => ut3_develop.ut_varchar2_list('ut3_develop.test_regex_dummy_cov_schema', 'ut3_tester_helper.test_regex_dummy_cov_schema'), + a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), + a_include_schema_expr => '^ut3_tester_helper' + ) + ]' + ); + + l_actual_both := + ut3_tester_helper.coverage_helper.run_tests_as_job( + q'[ + ut3_develop.ut.run( + a_paths => ut3_develop.ut_varchar2_list('ut3_develop.test_regex_dummy_cov_schema', 'ut3_tester_helper.test_regex_dummy_cov_schema'), + a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), + a_include_schema_expr => '^ut3_tester_helper||^ut3_tester_helper' + ) + ]' + ); + */ + --Assert + ut.expect(l_actual_ut3).to_be_like(l_expected_ut3); + ut.expect(l_actual_ut3).not_to_be_like(l_expected_help); + --ut.expect(l_actual_help).to_be_like(l_expected_help); + --ut.expect(l_actual_help).not_to_be_like(l_expected_ut3); + --ut.expect(l_actual_both).to_be_like(l_expected_ut3); + --ut.expect(l_actual_both).to_be_like(l_expected_help); + end; + + procedure coverage_regex_include_object is + begin + null; + end; + + procedure coverage_regex_exclude_schema is + begin + null; + end; + + procedure coverage_regex_exclude_object is + begin + null; + end; + end; / diff --git a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pks b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pks index c575c240c..a8c71f442 100644 --- a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pks +++ b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pks @@ -17,6 +17,20 @@ create or replace package test_extended_coverage is --%tags(#1097,#1094) --%test(Extended coverage does not fail the test run then tested code calls DBMS_STATS) procedure coverage_with_dbms_stats; - + + --%beforetest(ut3_tester_helper.coverage_helper.create_regex_dummy_cov_schema) + --%aftertest(ut3_tester_helper.coverage_helper.drop_regex_dummy_cov_schema) + --%test(Collect coverage for objects with schema regex include) + procedure coverage_regex_include_schema; + + --%test(Collect coverage for objects with schema regex include) + procedure coverage_regex_include_object; + + --%test(Collect coverage for objects with schema regex include) + procedure coverage_regex_exclude_schema; + + --%test(Collect coverage for objects with schema regex include) + procedure coverage_regex_exclude_object; + end; / From 1a5b2647297f50cb960f58d68ab360d934c2b53c Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Fri, 25 Feb 2022 00:09:06 +0000 Subject: [PATCH 0896/1096] The env are not set for archives files. Between each job looks like all settings and env needs to be set again. --- .github/workflows/release.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ad1e782c5..bd977d447 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -49,6 +49,14 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 + - uses: c-py/action-dotenv-to-setenv@v2 + with: + env-file: .github/variables/.env + - uses: FranzDiebold/github-env-vars-action@v2 #https://github.com/marketplace/actions/github-environment-variables-action + + - name: Set buid version number env variables + run: .github/scripts/set_version_numbers_env.sh + - name: Update project version & build number in source code and documentation run: .github/scripts/update_project_version.sh From b3dba1905941d3ef778d1ebf8372026e7aad97ea Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 25 Feb 2022 00:46:31 +0000 Subject: [PATCH 0897/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 37bf4e2d1..8c02ce441 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index f064966b3..1fd31b877 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 7979e1c23..05a2abdde 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 4772a25de..9a746a84c 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 537da5148..1ce42648a 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 617e888ac..941f5c364 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index e46c20029..104e82f7c 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index dc4a8ffda..65e044fd8 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 0fabf61bd..b9a0a70a0 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index be7e9b125..c7b9a3847 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index a50797b2e..f95607466 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index c4b2b1a0b..476b826fd 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 27b2989cf..70441da7e 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index d6e75700c..78735f144 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index ebc28ec38..ee366861f 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 03fe03f3e..1313dc90b 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 177f13589..516850fec 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3872--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 4401742f8..24ea09d0d 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.12.3872-develop'; + gc_version constant varchar2(50) := 'v3.1.12.3879-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From ca3dec790a9821cc2bdbf1bd2e12c33615339b52 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 25 Feb 2022 17:47:58 +0200 Subject: [PATCH 0898/1096] Updated project version to 3.1.13 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index a0d004aa2..d0237db61 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.12-develop +v3.1.13-develop From fd81df2439703943825cbf2d4f98e37f31568fa9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 25 Feb 2022 15:56:06 +0000 Subject: [PATCH 0899/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- sonar-project.properties | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 8c02ce441..70bdb2613 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 1fd31b877..cdc5d1330 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 05a2abdde..99b9f26d4 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 9a746a84c..fea1bfcad 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 1ce42648a..99a7df954 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 941f5c364..685449c27 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 104e82f7c..6667189e2 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 65e044fd8..415b477b6 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index b9a0a70a0..4cda2c9d4 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index c7b9a3847..645d17c89 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index f95607466..5b5d3079f 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 476b826fd..edaf0310d 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 70441da7e..9bbe8a452 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 78735f144..09cfd0029 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index ee366861f..27b37c276 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 1313dc90b..308788d62 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 516850fec..0ec9e80ee 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.12.3879--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) # Upgrading from version 2 diff --git a/sonar-project.properties b/sonar-project.properties index 7559b58a1..5d6cefe12 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -3,7 +3,7 @@ sonar.organization=utplsql sonar.projectKey=utPLSQL # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=utPLSQL -sonar.projectVersion=v3.1.12-develop +sonar.projectVersion=v3.1.13-develop # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # Since SonarQube 4.2, this property is optional if sonar.modules is set. diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 24ea09d0d..69955bab0 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.12.3879-develop'; + gc_version constant varchar2(50) := 'v3.1.13.3880-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 7e680eeaa67b94bcface6034ecca7e2ed7684f7e Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 25 Feb 2022 18:49:42 +0200 Subject: [PATCH 0900/1096] Added disabledReason to `ut_realtime_reporter` --- source/reporters/ut_realtime_reporter.tpb | 1 + .../reporters/test_realtime_reporter.pkb | 38 ++++++++++++++++--- .../reporters/test_realtime_reporter.pks | 3 ++ 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/source/reporters/ut_realtime_reporter.tpb b/source/reporters/ut_realtime_reporter.tpb index 837643b0b..9c2af57ec 100644 --- a/source/reporters/ut_realtime_reporter.tpb +++ b/source/reporters/ut_realtime_reporter.tpb @@ -43,6 +43,7 @@ create or replace type body ut_realtime_reporter is self.print_node('objectName', a_test.item.object_name); self.print_node('procedureName', a_test.item.procedure_name); self.print_node('disabled', case when a_test.get_disabled_flag() then 'true' else 'false' end); + self.print_node('disabledReason', a_test.disabled_reason); self.print_node('name', a_test.name); self.print_node('description', a_test.description); self.print_node('testNumber', to_char(total_number_of_tests)); diff --git a/test/ut3_user/reporters/test_realtime_reporter.pkb b/test/ut3_user/reporters/test_realtime_reporter.pkb index ad354133b..2dafa71d0 100644 --- a/test/ut3_user/reporters/test_realtime_reporter.pkb +++ b/test/ut3_user/reporters/test_realtime_reporter.pkb @@ -45,6 +45,10 @@ create or replace package body test_realtime_reporter as --%test --%disabled procedure test_5; + + --%test + --%disabled(Cannot run this item at this time runtime > 10 mins.) + procedure test_6_disabled_reason; end;]'; execute immediate q'[create or replace package body check_realtime_reporting2 is procedure test_3_ok is @@ -62,6 +66,11 @@ create or replace package body test_realtime_reporter as begin null; end; + + procedure test_6_disabled_reason is + begin + null; + end; end;]'; execute immediate q'[create or replace package check_realtime_reporting3 is @@ -179,6 +188,8 @@ create or replace package body test_realtime_reporter as select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting2.test_4_nok' as item_id from dual union all select 'pre-test' as event_type, 'realtime_reporting.check_realtime_reporting2.test_5' as item_id from dual union all select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting2.test_5' as item_id from dual union all + select 'pre-test' as event_type, 'realtime_reporting.check_realtime_reporting2.test_6_disabled_reason' as item_id from dual union all + select 'post-test' as event_type, 'realtime_reporting.check_realtime_reporting2.test_6_disabled_reason' as item_id from dual union all select 'post-suite' as event_type, 'realtime_reporting.check_realtime_reporting2' as item_id from dual union all select 'pre-suite' as event_type, 'realtime_reporting.check_realtime_reporting1' as item_id from dual union all select 'pre-suite' as event_type, 'realtime_reporting.check_realtime_reporting1.test_context' as item_id from dual union all @@ -226,6 +237,7 @@ create or replace package body test_realtime_reporter as select 'event/items/suite/items/suite/items/test' as node_path from dual union all select 'event/items/suite/items/suite/items/test' as node_path from dual union all select 'event/items/suite/items/suite/items/test' as node_path from dual union all + select 'event/items/suite/items/suite/items/test' as node_path from dual union all select 'event/items/suite/items/suite' as node_path from dual union all select 'event/items/suite/items/suite/items' as node_path from dual union all select 'event/items/suite/items/suite/items/suite' as node_path from dual union all @@ -237,7 +249,7 @@ create or replace package body test_realtime_reporter as procedure total_number_of_tests is l_actual integer; - l_expected integer := 8; + l_expected integer := 9; begin select t.event_doc.extract('/event/totalNumberOfTests/text()').getnumberval() into l_actual @@ -283,9 +295,9 @@ create or replace package body test_realtime_reporter as and t.event_doc.extract('//test/@id').getstringval() is not null; open l_expected for select level as test_number, - 8 as total_number_of_tests + 9 as total_number_of_tests from dual - connect by level <= 8; + connect by level <= 9; ut.expect(l_actual).to_equal(l_expected).unordered; end pre_test_nodes; @@ -311,9 +323,9 @@ create or replace package body test_realtime_reporter as and t.event_doc.extract('//test/counter/warning/text()').getnumberval() is not null; open l_expected for select level as test_number, - 8 as total_number_of_tests + 9 as total_number_of_tests from dual - connect by level <= 8; + connect by level <= 9; ut.expect(l_actual).to_equal(l_expected).unordered; end post_test_nodes; @@ -494,6 +506,22 @@ create or replace package body test_realtime_reporter as ut.expect(l_xml is not null).to_be_true(); end; + procedure disabled_reason is + l_actual varchar2(32767); + l_expected varchar2(80) := dbms_xmlgen.convert('Cannot run this item at this time runtime > 10 mins.'); + begin + select t.event_doc.extract( + '//test/disabledReason/text()' + ).getstringval() + into l_actual + from table(g_events) t + where xmlexists( + '/event[@type="pre-run"]/*//test[@id="realtime_reporting.check_realtime_reporting2.test_6_disabled_reason"]' + passing t.event_doc + ); + ut.expect(l_actual).to_equal(l_expected); + end; + procedure remove_test_suites is pragma autonomous_transaction; begin diff --git a/test/ut3_user/reporters/test_realtime_reporter.pks b/test/ut3_user/reporters/test_realtime_reporter.pks index 453824ca5..087713f79 100644 --- a/test/ut3_user/reporters/test_realtime_reporter.pks +++ b/test/ut3_user/reporters/test_realtime_reporter.pks @@ -57,6 +57,9 @@ create or replace package test_realtime_reporter as --%test(Escape nested CDATA sections in test output) procedure nested_cdata_output; + --%test(Provide reason disabled test) + procedure disabled_reason; + --%afterall procedure remove_test_suites; From 4eec03e223c942471112ee9e68303b962e0cd25d Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Fri, 25 Feb 2022 20:19:42 +0000 Subject: [PATCH 0901/1096] Update to code to address sql injection concerns. Dealing with precedence. Adding some more tests. --- source/core/coverage/ut_coverage.pkb | 14 ++- test/ut3_tester_helper/coverage_helper.pkb | 52 ++++---- test/ut3_tester_helper/coverage_helper.pks | 3 - .../test_coverage/test_extended_coverage.pkb | 115 ++++++++++++------ .../test_coverage/test_extended_coverage.pks | 16 ++- 5 files changed, 123 insertions(+), 77 deletions(-) diff --git a/source/core/coverage/ut_coverage.pkb b/source/core/coverage/ut_coverage.pkb index cdef6dd04..3c5bde7af 100644 --- a/source/core/coverage/ut_coverage.pkb +++ b/source/core/coverage/ut_coverage.pkb @@ -133,7 +133,7 @@ create or replace package body ut_coverage is end if; if a_coverage_options.exclude_object_expr is not null then - l_regex_exc_filters := l_regex_exc_filters||q'[ and not regexp_like(s.name,:a_exclude_obj_expr:,'i')]'; + l_regex_exc_filters := l_regex_exc_filters||q'[ and not regexp_like(s.name,:a_exclude_obj_expr,'i')]'; else l_regex_exc_filters := l_regex_exc_filters||'and :a_exclude_obj_expr is null '; end if; @@ -147,7 +147,7 @@ create or replace package body ut_coverage is l_result := replace(l_result, '{mappings_cardinality}', l_mappings_cardinality); l_result := replace(l_result, '{skipped_objects_cardinality}', ut_utils.scale_cardinality(cardinality(a_skip_objects))); l_result := replace(l_result, '{regex_exc_filters}', l_regex_exc_filters); - + return l_result; end; @@ -159,7 +159,11 @@ create or replace package body ut_coverage is begin if not is_develop_mode() then --skip all the utplsql framework objects and all the unit test packages that could potentially be reported by coverage. - l_skip_objects := ut_utils.get_utplsql_objects_list() multiset union all coalesce(a_coverage_options.exclude_objects, ut_object_names()); + l_skip_objects := coalesce(ut_utils.get_utplsql_objects_list(),ut_object_names()); + --Regex exclusion override the standard exclusion objects. + if a_coverage_options.exclude_schema_expr is null and a_coverage_options.exclude_object_expr is null then + l_skip_objects := l_skip_objects multiset union all coalesce(a_coverage_options.exclude_objects, ut_object_names()); + end if; end if; l_sql := get_cov_sources_sql(a_coverage_options, l_skip_objects); @@ -168,12 +172,12 @@ create or replace package body ut_coverage is if a_coverage_options.file_mappings is not empty then open l_cursor for l_sql using a_coverage_options.file_mappings,a_coverage_options.exclude_schema_expr,a_coverage_options.exclude_object_expr,l_skip_objects; - elsif a_coverage_options.include_objects is not empty then - open l_cursor for l_sql using a_coverage_options.include_objects,a_coverage_options.exclude_schema_expr,a_coverage_options.exclude_object_expr,l_skip_objects; elsif a_coverage_options.include_schema_expr is not null or a_coverage_options.include_object_expr is not null then open l_cursor for l_sql using a_coverage_options.include_schema_expr,a_coverage_options.include_object_expr, a_coverage_options.exclude_schema_expr,a_coverage_options.exclude_object_expr, l_skip_objects; + elsif a_coverage_options.include_objects is not empty then + open l_cursor for l_sql using a_coverage_options.include_objects,a_coverage_options.exclude_schema_expr,a_coverage_options.exclude_object_expr,l_skip_objects; else open l_cursor for l_sql using a_coverage_options.schema_names,a_coverage_options.exclude_schema_expr,a_coverage_options.exclude_object_expr,l_skip_objects; end if; diff --git a/test/ut3_tester_helper/coverage_helper.pkb b/test/ut3_tester_helper/coverage_helper.pkb index bbf288ed4..5f255a2e6 100644 --- a/test/ut3_tester_helper/coverage_helper.pkb +++ b/test/ut3_tester_helper/coverage_helper.pkb @@ -158,14 +158,14 @@ create or replace package body coverage_helper is end; - procedure create_regex_dummy_cov is + procedure create_regex_dummy_for_schema(p_schema in varchar2) is pragma autonomous_transaction; begin - execute immediate q'[create or replace package ut3_develop.regex_dummy_cov is + execute immediate q'[create or replace package ]'||p_schema||q'[.regex_dummy_cov is procedure do_stuff(i_input in number); end;]'; - execute immediate q'[create or replace package body ut3_develop.regex_dummy_cov is + execute immediate q'[create or replace package body ]'||p_schema||q'[.regex_dummy_cov is procedure do_stuff(i_input in number) is begin if i_input = 2 then dbms_output.put_line('should not get here'); elsif i_input = 1 then dbms_output.put_line('should get here'); @@ -175,39 +175,38 @@ create or replace package body coverage_helper is end; end;]'; - execute immediate q'[create or replace package ut3_develop.test_regex_dummy_cov is + execute immediate q'[create or replace package ]'||p_schema||q'[.test_regex_dummy_cov is --%suite(dummy coverage test) --%suitepath(coverage_testing) --%test procedure test_do_stuff; + --%test + procedure zero_coverage; end;]'; - execute immediate q'[create or replace package body ut3_develop.test_regex_dummy_cov is + execute immediate q'[create or replace package body ]'||p_schema||q'[.test_regex_dummy_cov is procedure test_do_stuff is begin regex_dummy_cov.do_stuff(1); ut.expect(1).to_equal(1); end; + procedure zero_coverage is + begin + null; + end; end;]'; end; - - procedure drop_regex_dummy_cov is - pragma autonomous_transaction; - begin - begin execute immediate q'[drop package ut3_develop.regex_dummy_cov]'; exception when others then null; end; - begin execute immediate q'[drop package ut3_develop.test_regex_dummy_cov]'; exception when others then null; end; - end; - procedure create_regex_dummy_for_schema(p_schema in varchar2) is + procedure create_regex_dummy_obj is pragma autonomous_transaction; begin - execute immediate q'[create or replace package ]'||p_schema||q'[.regex_dummy_cov_schema is + execute immediate q'[create or replace package ut3_develop.regex123_dummy_cov is procedure do_stuff(i_input in number); end;]'; - execute immediate q'[create or replace package body ]'||p_schema||q'[.regex_dummy_cov_schema is + execute immediate q'[create or replace package body ut3_develop.regex123_dummy_cov is procedure do_stuff(i_input in number) is begin if i_input = 2 then dbms_output.put_line('should not get here'); elsif i_input = 1 then dbms_output.put_line('should get here'); @@ -217,7 +216,7 @@ create or replace package body coverage_helper is end; end;]'; - execute immediate q'[create or replace package ]'||p_schema||q'[.test_regex_dummy_cov_schema is + execute immediate q'[create or replace package ut3_develop.test_regex123_dummy_cov is --%suite(dummy coverage test) --%suitepath(coverage_testing) @@ -228,10 +227,10 @@ create or replace package body coverage_helper is procedure zero_coverage; end;]'; - execute immediate q'[create or replace package body ]'||p_schema||q'[.test_regex_dummy_cov_schema is + execute immediate q'[create or replace package body ut3_develop.test_regex123_dummy_cov is procedure test_do_stuff is begin - regex_dummy_cov_schema.do_stuff(1); + regex123_dummy_cov.do_stuff(1); ut.expect(1).to_equal(1); end; procedure zero_coverage is @@ -240,20 +239,23 @@ create or replace package body coverage_helper is end; end;]'; end; - - procedure create_regex_dummy_cov_schema is + + procedure create_regex_dummy_cov is begin create_regex_dummy_for_schema('ut3_develop'); create_regex_dummy_for_schema('ut3_tester_helper'); + create_regex_dummy_obj; end; - procedure drop_regex_dummy_cov_schema is + procedure drop_regex_dummy_cov is pragma autonomous_transaction; begin - begin execute immediate q'[drop package ut3_develop.regex_dummy_cov_schema]'; exception when others then null; end; - begin execute immediate q'[drop package ut3_develop.test_regex_dummy_cov_schema]'; exception when others then null; end; - begin execute immediate q'[drop package ut3_tester_helper.regex_dummy_cov_schema]'; exception when others then null; end; - begin execute immediate q'[drop package ut3_tester_helper.test_regex_dummy_cov_schema]'; exception when others then null; end; + begin execute immediate q'[drop package ut3_develop.regex_dummy_cov]'; exception when others then null; end; + begin execute immediate q'[drop package ut3_develop.test_regex_dummy_cov]'; exception when others then null; end; + begin execute immediate q'[drop package ut3_tester_helper.regex_dummy_cov]'; exception when others then null; end; + begin execute immediate q'[drop package ut3_tester_helper.test_regex_dummy_cov]'; exception when others then null; end; + begin execute immediate q'[drop package ut3_develop.regex123_dummy_cov]'; exception when others then null; end; + begin execute immediate q'[drop package ut3_develop.test_regex123_dummy_cov]'; exception when others then null; end; end; diff --git a/test/ut3_tester_helper/coverage_helper.pks b/test/ut3_tester_helper/coverage_helper.pks index 04bb0029c..c5e862612 100644 --- a/test/ut3_tester_helper/coverage_helper.pks +++ b/test/ut3_tester_helper/coverage_helper.pks @@ -17,9 +17,6 @@ create or replace package coverage_helper is procedure create_regex_dummy_cov; procedure drop_regex_dummy_cov; - procedure create_regex_dummy_cov_schema; - procedure drop_regex_dummy_cov_schema; - procedure create_cov_with_dbms_stats; procedure drop_cov_with_dbms_stats; diff --git a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb index 5aea2e184..f14eac984 100644 --- a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb +++ b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb @@ -107,74 +107,111 @@ create or replace package body test_extended_coverage is end; procedure coverage_regex_include_schema is - l_expected_ut3 clob; - l_expected_help clob; - l_actual_ut3 clob; - l_actual_help clob; - l_actual_both clob; - + l_expected clob; + l_not_expected clob; + l_actual clob; begin --Arrange - l_expected_ut3 := '%' || + l_expected := '%' || '%%'; - l_expected_help := '%' || + l_not_expected := '%' || '%%'; --Act - l_actual_ut3 := + l_actual := ut3_tester_helper.coverage_helper.run_tests_as_job( q'[ ut3_develop.ut.run( - a_paths => ut3_develop.ut_varchar2_list('ut3_develop.test_regex_dummy_cov_schema', 'ut3_tester_helper.test_regex_dummy_cov_schema'), + a_paths => ut3_develop.ut_varchar2_list('ut3_develop.test_regex_dummy_cov', 'ut3_tester_helper.test_regex_dummy_cov'), a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), - a_include_schema_expr => '^ut3_develop' + a_include_schema_expr => '^ut3_develop', + a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_tester_helper.regex_dummy_cov' ) ) ]' - ); - /* - l_actual_help := + ); + --Assert + ut.expect(l_actual).to_be_like(l_expected); + ut.expect(l_actual).not_to_be_like(l_not_expected); + end; + + procedure coverage_regex_include_object is + l_expected clob; + l_not_expected clob; + l_actual clob; + begin + --Arrange + l_expected := '%' || + '%%'; + l_not_expected := '%' || + '%%'; + --Act + l_actual := ut3_tester_helper.coverage_helper.run_tests_as_job( q'[ ut3_develop.ut.run( - a_paths => ut3_develop.ut_varchar2_list('ut3_develop.test_regex_dummy_cov_schema', 'ut3_tester_helper.test_regex_dummy_cov_schema'), + a_paths => ut3_develop.ut_varchar2_list('ut3_develop.test_regex_dummy_cov', 'ut3_develop.test_regex123_dummy_cov'), a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), - a_include_schema_expr => '^ut3_tester_helper' + a_include_object_expr => 'regex123', + a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.regex_dummy_cov' ) ) ]' - ); + ); + --Assert + ut.expect(l_actual).to_be_like(l_expected); + ut.expect(l_actual).not_to_be_like(l_not_expected); + end; - l_actual_both := + procedure coverage_regex_exclude_schema is + l_expected clob; + l_not_expected clob; + l_actual clob; + begin + --Arrange + l_expected := '%' || + '%%'; + l_not_expected := '%' || + '%%'; + --Act + l_actual := ut3_tester_helper.coverage_helper.run_tests_as_job( q'[ ut3_develop.ut.run( - a_paths => ut3_develop.ut_varchar2_list('ut3_develop.test_regex_dummy_cov_schema', 'ut3_tester_helper.test_regex_dummy_cov_schema'), + a_paths => ut3_develop.ut_varchar2_list('ut3_develop.test_regex_dummy_cov', 'ut3_tester_helper.test_regex_dummy_cov'), a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), - a_include_schema_expr => '^ut3_tester_helper||^ut3_tester_helper' + a_exclude_schema_expr => '^ut3_tester', + a_exclude_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.regex_dummy_cov' ) ) ]' - ); - */ + ); --Assert - ut.expect(l_actual_ut3).to_be_like(l_expected_ut3); - ut.expect(l_actual_ut3).not_to_be_like(l_expected_help); - --ut.expect(l_actual_help).to_be_like(l_expected_help); - --ut.expect(l_actual_help).not_to_be_like(l_expected_ut3); - --ut.expect(l_actual_both).to_be_like(l_expected_ut3); - --ut.expect(l_actual_both).to_be_like(l_expected_help); - end; - - procedure coverage_regex_include_object is - begin - null; - end; - - procedure coverage_regex_exclude_schema is - begin - null; + ut.expect(l_actual).to_be_like(l_expected); + ut.expect(l_actual).not_to_be_like(l_not_expected); end; procedure coverage_regex_exclude_object is + l_expected clob; + l_not_expected clob; + l_actual clob; begin - null; + --Arrange + l_expected := '%' || + '%%'; + l_not_expected := '%' || + '%%'; + --Act + l_actual := + ut3_tester_helper.coverage_helper.run_tests_as_job( + q'[ + ut3_develop.ut.run( + a_paths => ut3_develop.ut_varchar2_list('ut3_develop.test_regex_dummy_cov', 'ut3_develop.test_regex123_dummy_cov'), + a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), + a_exclude_object_expr => 'regex123', + a_exclude_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.regex_dummy_cov' ) + ) + ]' + ); + --Assert + ut.expect(l_actual).to_be_like(l_expected); + ut.expect(l_actual).not_to_be_like(l_not_expected); end; end; diff --git a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pks b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pks index a8c71f442..99d7c5db4 100644 --- a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pks +++ b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pks @@ -18,18 +18,24 @@ create or replace package test_extended_coverage is --%test(Extended coverage does not fail the test run then tested code calls DBMS_STATS) procedure coverage_with_dbms_stats; - --%beforetest(ut3_tester_helper.coverage_helper.create_regex_dummy_cov_schema) - --%aftertest(ut3_tester_helper.coverage_helper.drop_regex_dummy_cov_schema) + --%beforetest(ut3_tester_helper.coverage_helper.create_regex_dummy_cov) + --%aftertest(ut3_tester_helper.coverage_helper.drop_regex_dummy_cov) --%test(Collect coverage for objects with schema regex include) procedure coverage_regex_include_schema; - --%test(Collect coverage for objects with schema regex include) + --%beforetest(ut3_tester_helper.coverage_helper.create_regex_dummy_cov) + --%aftertest(ut3_tester_helper.coverage_helper.drop_regex_dummy_cov) + --%test(Collect coverage for objects with object regex include) procedure coverage_regex_include_object; - --%test(Collect coverage for objects with schema regex include) + --%beforetest(ut3_tester_helper.coverage_helper.create_regex_dummy_cov) + --%aftertest(ut3_tester_helper.coverage_helper.drop_regex_dummy_cov) + --%test(Collect coverage for objects with schema regex exclude) procedure coverage_regex_exclude_schema; - --%test(Collect coverage for objects with schema regex include) + --%beforetest(ut3_tester_helper.coverage_helper.create_regex_dummy_cov) + --%aftertest(ut3_tester_helper.coverage_helper.drop_regex_dummy_cov) + --%test(Collect coverage for objects with object regex exclude) procedure coverage_regex_exclude_object; end; From e7d59b4b3eea36cea8fbbaeb7640b1f82ec8ba7b Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Fri, 25 Feb 2022 20:55:36 +0000 Subject: [PATCH 0902/1096] Splitting skipped framework objects and excluded objects into separate table types. Update docs. --- docs/userguide/coverage.md | 32 +++++++++++++++++++--- source/core/coverage/ut_coverage.pkb | 40 +++++++++++++++++++--------- 2 files changed, 55 insertions(+), 17 deletions(-) diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 1f6cc4be5..29651b68c 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -131,10 +131,34 @@ exec ut.run('unit_test_schema', ut_coverage_html_reporter(), a_coverage_schemes There are six options that can be used to narrow down the scope of coverage report: - `a_include_objects` - list of `[object_owner.].object_name` to be included in the coverage report. - `a_exclude_objects` - list of `[object_owner.].object_name` to be excluded from the coverage report -- `a_include_schema_expr` - string of regex expression of schemas to be included in the coverage report. It will override `a_include_objects` -- `a_include_object_expr` - string of regex expression of objects ( no schema names included ) to be included in the coverage report. It will override `a_include_objects` -- `a_exclude_schema_expr` - string of regex expression of schemas to be excluded from the coverage report. It will override `a_exclude_objects` -- `a_exclude_object_expr` - string of regex expression of objects to be excluded from the coverage report. It will override `a_exclude_objects` +- `a_include_schema_expr` - string of regex expression of schemas to be included in the coverage report. It will override `a_include_objects` for example : + ```sql + a_include_schema_expr => '^ut3_develop', + a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_tester_helper.regex_dummy_cov' ) + ``` + Will result in showing coverage for all schemas that match regular expression `^ut3_develop` and ignore objectes defined by parameter `a_include_objects` + +- `a_include_object_expr` - string of regex expression of objects ( no schema names included ) to be included in the coverage report. It will override `a_include_objects` for example: + ```sql + a_include_object_expr => 'regex123', + a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_tester_helper.regex_dummy_cov' ) + ``` + Will result in showing coverage for all objects that name match regular expression `regex123` and ignore objectes defined by parameter `a_include_objects` + +- `a_exclude_schema_expr` - string of regex expression of schemas to be excluded from the coverage report. It will override `a_exclude_objects` for example: + ```sql + a_exclude_schema_expr => '^ut3_tester', + a_exclude_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.regex_dummy_cov' ) + ``` + Will result in showing coverage for all objects that schema is not matching regular expression `^ut3_tester` and ignore exclusion defined by parameter `a_exclude_objects` + +- `a_exclude_object_expr` - string of regex expression of objects to be excluded from the coverage report. It will override `a_exclude_objects` for example + ```sql + a_exclude_object_expr => 'regex123', + a_exclude_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.regex_dummy_cov' ) + ``` + Will result in showing coverage for all objects that name is not matching regular expression `regex123` and ignore exclusion defined by parameter `a_exclude_objects` + You may specify both _include_ and _exclude_ options to gain more control over what needs to be included / excluded from the coverage report. diff --git a/source/core/coverage/ut_coverage.pkb b/source/core/coverage/ut_coverage.pkb index 3c5bde7af..06951fc2f 100644 --- a/source/core/coverage/ut_coverage.pkb +++ b/source/core/coverage/ut_coverage.pkb @@ -30,7 +30,7 @@ create or replace package body ut_coverage is end; function get_cov_sources_sql(a_coverage_options ut_coverage_options, a_skip_objects ut_object_names) return varchar2 is - l_result varchar2(32767); --QUESTION: Given fact that we can pass large regex filters same as objects filter should we consider a clob ? + l_result varchar2(32767); l_full_name varchar2(32767); l_join_mappings varchar2(32767); l_filters varchar2(32767); @@ -55,7 +55,12 @@ create or replace package body ut_coverage is from {sources_view} s {join_file_mappings} where s.type in ('PACKAGE BODY', 'TYPE BODY', 'PROCEDURE', 'FUNCTION', 'TRIGGER') {filters} - {regex_exc_filters} + {regex_exc_filters} + and not exists ( + select /*+ cardinality(el {excuded_objects_cardinality})*/ 1 + from table(:l_excluded_objects) el + where s.owner = el.owner and s.name = el.name + ) ), coverage_sources as ( select full_name, owner, name, type, line, text, @@ -146,6 +151,7 @@ create or replace package body ut_coverage is l_result := replace(l_result, '{filters}', l_filters); l_result := replace(l_result, '{mappings_cardinality}', l_mappings_cardinality); l_result := replace(l_result, '{skipped_objects_cardinality}', ut_utils.scale_cardinality(cardinality(a_skip_objects))); + l_result := replace(l_result, '{excuded_objects_cardinality}', ut_utils.scale_cardinality(cardinality(coalesce(a_coverage_options.exclude_objects, ut_object_names())))); l_result := replace(l_result, '{regex_exc_filters}', l_regex_exc_filters); return l_result; @@ -153,33 +159,41 @@ create or replace package body ut_coverage is end; function get_cov_sources_cursor(a_coverage_options in ut_coverage_options) return sys_refcursor is - l_cursor sys_refcursor; - l_skip_objects ut_object_names; - l_sql varchar2(32767); + l_cursor sys_refcursor; + l_skip_objects ut_object_names; + l_excluded_objects ut_object_names; + l_sql varchar2(32767); begin if not is_develop_mode() then --skip all the utplsql framework objects and all the unit test packages that could potentially be reported by coverage. l_skip_objects := coalesce(ut_utils.get_utplsql_objects_list(),ut_object_names()); - --Regex exclusion override the standard exclusion objects. - if a_coverage_options.exclude_schema_expr is null and a_coverage_options.exclude_object_expr is null then - l_skip_objects := l_skip_objects multiset union all coalesce(a_coverage_options.exclude_objects, ut_object_names()); - end if; end if; + --Regex exclusion override the standard exclusion objects. + if a_coverage_options.exclude_schema_expr is null and a_coverage_options.exclude_object_expr is null then + l_excluded_objects := coalesce(a_coverage_options.exclude_objects, ut_object_names()); + end if; + l_sql := get_cov_sources_sql(a_coverage_options, l_skip_objects); ut_event_manager.trigger_event(ut_event_manager.gc_debug, ut_key_anyvalues().put('l_sql',l_sql) ); if a_coverage_options.file_mappings is not empty then - open l_cursor for l_sql using a_coverage_options.file_mappings,a_coverage_options.exclude_schema_expr,a_coverage_options.exclude_object_expr,l_skip_objects; + open l_cursor for l_sql using a_coverage_options.file_mappings,a_coverage_options.exclude_schema_expr, + a_coverage_options.exclude_object_expr,l_excluded_objects, + l_skip_objects; elsif a_coverage_options.include_schema_expr is not null or a_coverage_options.include_object_expr is not null then open l_cursor for l_sql using a_coverage_options.include_schema_expr,a_coverage_options.include_object_expr, a_coverage_options.exclude_schema_expr,a_coverage_options.exclude_object_expr, - l_skip_objects; + l_excluded_objects,l_skip_objects; elsif a_coverage_options.include_objects is not empty then - open l_cursor for l_sql using a_coverage_options.include_objects,a_coverage_options.exclude_schema_expr,a_coverage_options.exclude_object_expr,l_skip_objects; + open l_cursor for l_sql using a_coverage_options.include_objects,a_coverage_options.exclude_schema_expr, + a_coverage_options.exclude_object_expr,l_excluded_objects, + l_skip_objects; else - open l_cursor for l_sql using a_coverage_options.schema_names,a_coverage_options.exclude_schema_expr,a_coverage_options.exclude_object_expr,l_skip_objects; + open l_cursor for l_sql using a_coverage_options.schema_names,a_coverage_options.exclude_schema_expr, + a_coverage_options.exclude_object_expr,l_excluded_objects, + l_skip_objects; end if; return l_cursor; end; From 9f229b8f34750f5e6da31fa0bf6070b49b0f48eb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 25 Feb 2022 22:58:15 +0000 Subject: [PATCH 0903/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 70bdb2613..34f00c50c 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index cdc5d1330..43a9c7144 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 99b9f26d4..48ece4cc6 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index fea1bfcad..0da2b42fe 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 99a7df954..2437aa9c1 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 685449c27..bfd2a13da 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 6667189e2..d3ae90eca 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 415b477b6..b4052a74a 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 4cda2c9d4..813815239 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 645d17c89..a78657be0 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 5b5d3079f..91d8d02b3 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index edaf0310d..91099d1bb 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 9bbe8a452..05fed3990 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 09cfd0029..a4e8f1a5d 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 27b37c276..1961e5f98 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 308788d62..ba552ef2d 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 0ec9e80ee..14ac4988c 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3880--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 69955bab0..9d31d71b3 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.13.3880-develop'; + gc_version constant varchar2(50) := 'v3.1.13.3889-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 6f5b2dc81148c7723a1d174992603c5203af1dbd Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 26 Feb 2022 01:25:02 +0200 Subject: [PATCH 0904/1096] Update of coverage documentation --- docs/userguide/coverage.md | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 29651b68c..42f35c08a 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -780,6 +780,10 @@ ut_coverage_options( exclude_objects ut_varchar2_rows := null, include_objects ut_varchar2_rows := null, file_mappings ut_file_mappings := null + include_schema_expr varchar2(4000) := null, + include_object_expr varchar2(4000) := null, + exclude_schema_expr varchar2(4000) := null, + exclude_object_expr varchar2(4000) := null ); ``` @@ -795,6 +799,10 @@ The `a_coverage_options` parameter is used to control the scope and formatting o - `exclude_objects` - optional - list of object names to exclude from report - data-type `UT_VARCHAR2_ROWS` - `include_objects` - optional - list of object names to gather coverage on - data-type `UT_VARCHAR2_ROWS` - `file_mappings` - optional - list of schema names to gather coverage on - data-type `UT_FILE_MAPPINGS` +- `include_schema_expr` - optional - regular expression to match against schema name to include in coverage - data-type `VARCHAR2(4000)` +- `include_object_expr` - optional - regular expression to match against object name to include in coverage - data-type `VARCHAR2(4000)` +- `exclude_schema_expr` - optional - regular expression to match against schema name to exclude in coverage - data-type `VARCHAR2(4000)` +- `exclude_object_expr` - optional - regular expression to match against object name to exclude in coverage - data-type `VARCHAR2(4000)` `coverage_run_id` parameter identifies a common coverage run. The valid value type for that parameter is RAW(32). It is recommended to use `sys_guid()` to generate a common, unique identifier for a specific coverage run. @@ -802,4 +810,10 @@ If the identifier is not unique, previous runs of coverage that used the same `c For details on the meaning of `schema_names`, `exclude_objects`, `include_objects`, `file_mappings` see sections above. Note that data-types of include/exclude/schema lists are different when calling `ut.run` vs. calling `get_report/get_report_cursor`. - + +The order of priority is for evaluation of include/exclude is as follows. +- if `file_mappings` is specified then all include/exclude parameters are ignored +- else if `..._expr` is specified then include_objects/exclude_objects parameters are ignored +- else if `schema_names` is specified then the coverage is gathered on all object of specified schemas +- else coverage is gathered on all schemas specified in paths passed to run procedure +- if no paths were specified, the coverage is gathered on current schema of the session running the tests From b430b437d8f7c98a54e082cc1260b93cec1d9d28 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 26 Feb 2022 01:36:19 +0200 Subject: [PATCH 0905/1096] Fixed typo in documentation --- docs/userguide/coverage.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 42f35c08a..663df7f3d 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -730,7 +730,7 @@ exec ut_runner.coverage_stop(); ```sql --SESSION 1 or SESSION2 2 or SESSION 3 --- run after calls in SESSION 1 & 2 are finshed +-- run after calls in SESSION 1 & 2 are finished -- retrieve coverage report in HTML format coverage_run_id value select * from table( @@ -744,7 +744,7 @@ select * ```sql --SESSION 1 or SESSION2 2 or SESSION 3 --- run after calls in SESSION 1 & 2 are finshed +-- run after calls in SESSION 1 & 2 are finished declare l_results_cursor sys_refcursor; begin From b8a3fb6c02e0e52dca57d608aab8f27647f0a62a Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 26 Feb 2022 02:14:17 +0200 Subject: [PATCH 0906/1096] Adding COVERAGE_RUN_ID to the utPLSQL context to allow for more accurate coverage reporting when runnign tests against the coverage module of the framework. --- docs/userguide/annotations.md | 3 ++- source/core/session_context/ut_session_info.tpb | 2 ++ test/ut3_user/api/test_ut_run.pkb | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index d3ae90eca..72ae33e10 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -2121,7 +2121,8 @@ It can be accessed from any procecure invoked as part of utPLSQL test execution. > For example if utPLSQL is installed into `HR` schema, the context name will be `HR_INFO` Following attributes are populated: -- Always: +- For entire duration of the test-run: + - `sys_context( 'UT3_INFO', 'COVERAGE_RUN_ID' );` - Value of COVERAGE_RUN_ID used by utPLSQL internally for coverage gathering - `sys_context( 'UT3_INFO', 'RUN_PATHS' );` - list of suitepaths / suitenames used as input parameters for call to `ut.run(...)` or `ut_runner.run(...)` - `sys_context( 'UT3_INFO', 'SUITE_DESCRIPTION' );` - the description of test suite that is currently being executed - `sys_context( 'UT3_INFO', 'SUITE_PACKAGE' );` - the owner and name of test suite package that is currently being executed diff --git a/source/core/session_context/ut_session_info.tpb b/source/core/session_context/ut_session_info.tpb index c7fe7dc5f..7d469651a 100644 --- a/source/core/session_context/ut_session_info.tpb +++ b/source/core/session_context/ut_session_info.tpb @@ -28,12 +28,14 @@ create or replace type body ut_session_info as member procedure before_calling_run(self in out nocopy ut_session_info, a_run in ut_run) is begin ut_session_context.set_context( 'run_paths', ut_utils.to_string( ut_utils.table_to_clob( a_run.run_paths,',' ), null ) ); + ut_session_context.set_context( 'coverage_run_id', rawtohex( a_run.coverage_options.coverage_run_id ) ); dbms_application_info.set_module( 'utPLSQL', null ); end; member procedure after_calling_run(self in out nocopy ut_session_info, a_run in ut_run) is begin ut_session_context.clear_context( 'run_paths' ); + ut_session_context.clear_context( 'coverage_run_id' ); dbms_application_info.set_module( module, action ); dbms_application_info.set_client_info( client_info ); end; diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index 8ec19f6d8..b4f5a5238 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -1268,7 +1268,8 @@ Failures:% procedure sys_ctx_on_suite_beforeall is begin ut.expect(g_context_test_results).to_be_like( - '%BEFORE_SUITE:CURRENT_EXECUTABLE_NAME='||gc_owner||'.check_context.before_suite' + '%BEFORE_SUITE:COVERAGE_RUN_ID=________________________________%' + ||'%BEFORE_SUITE:CURRENT_EXECUTABLE_NAME='||gc_owner||'.check_context.before_suite' ||'%BEFORE_SUITE:CURRENT_EXECUTABLE_TYPE=beforeall' ||'%BEFORE_SUITE:RUN_PATHS=check_context' ||'%BEFORE_SUITE:SUITE_DESCRIPTION=Suite description' From 4602023a08403869b4b80124f7e24e08a67d514d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 26 Feb 2022 01:04:42 +0000 Subject: [PATCH 0907/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 34f00c50c..ceff64be9 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 43a9c7144..110f3197c 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 48ece4cc6..7b4a67750 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 0da2b42fe..4fc3f72f7 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 2437aa9c1..f7b8f7a26 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index bfd2a13da..93da6013e 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 72ae33e10..af996f73c 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index b4052a74a..b5b7cb286 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 813815239..3e541ffbe 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index a78657be0..fd6cc6f98 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 91d8d02b3..1335b1d98 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 91099d1bb..b5b9d09f1 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 05fed3990..9f92b7c6a 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index a4e8f1a5d..aac098805 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 1961e5f98..06eefcede 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index ba552ef2d..73e469da3 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 14ac4988c..f0ef68ab2 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3889--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 9d31d71b3..b9917f2a7 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.13.3889-develop'; + gc_version constant varchar2(50) := 'v3.1.13.3896-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From f3ea9e5c5859a271de0738d1db1c6b3fe6c46b3d Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 26 Feb 2022 15:18:37 +0100 Subject: [PATCH 0908/1096] fix typo, "can be provided" instead of "can by provided" --- docs/userguide/annotations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index af996f73c..f28e0cd5b 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -127,7 +127,7 @@ end; | `--%suite()` | Package | Mandatory. Marks package as a test suite. Optional suite description can be provided (see `displayname`). | | `--%suitepath()` | Package | Similar to java package. The annotation allows logical grouping of suites into hierarchies. | | `--%displayname()` | Package/procedure | Human-readable and meaningful description of a context/suite/test. Overrides the `` provided with `suite`/`test`/`context` annotation. This annotation is redundant and might be removed in future releases. | -| `--%test()` | Procedure | Denotes that the annotated procedure is a unit test procedure. Optional test description can by provided (see `displayname`). | +| `--%test()` | Procedure | Denotes that the annotated procedure is a unit test procedure. Optional test description can be provided (see `displayname`). | | `--%throws([,...])`| Procedure | Denotes that the annotated test procedure must throw one of the exceptions provided. Supported forms of exceptions are: numeric literals, numeric constant names, exception constant names, predefined Oracle exception names. | | `--%beforeall` | Procedure | Denotes that the annotated procedure should be executed once before all elements of the suite. | | `--%beforeall([[.].][,...])` | Package | Denotes that the mentioned procedure(s) should be executed once before all elements of the suite. | From 5ff7f44ee583b356e635949b95695933fa86927a Mon Sep 17 00:00:00 2001 From: Philipp Salvisberg Date: Sat, 26 Feb 2022 16:24:09 +0100 Subject: [PATCH 0909/1096] fix typo in expectations.md, whether instead of wheter --- docs/userguide/expectations.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 1335b1d98..3bd3e090b 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1096,7 +1096,7 @@ SUCCESS ## to_be_within of -Determines wheter expected value is within range (tolerance) from another value. +Determines whether expected value is within range (tolerance) from another value. The logical formual used for calcuating the matcher is: ``` @@ -1177,7 +1177,7 @@ Failures: ## to_be_within_pct of -Determines wheter actual value is within percentage range of expected value. +Determines whether actual value is within percentage range of expected value. The matcher only works with `number` data-type. The percentage deviation (distance) must be expressed as a non-negative number. From 4ab0f5875d3da51a8fdf17964f9018b71d04845b Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 26 Feb 2022 18:11:49 +0200 Subject: [PATCH 0910/1096] Added ability to publish coverage generated by test jobs running utPLSQL with coverage into main testing session coverage. --- source/api/ut_runner.pkb | 2 +- source/core/coverage/ut_coverage.pkb | 13 ++++- source/core/coverage/ut_coverage.pks | 2 + test/ut3_tester_helper/coverage_helper.pkb | 67 +++++++++++++++++++++- 4 files changed, 78 insertions(+), 6 deletions(-) diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index af168fe5d..cbf1971e7 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -127,7 +127,7 @@ create or replace package body ut_runner is l_run := ut_run( a_run_paths => l_paths, a_coverage_options => ut_coverage_options( - coverage_run_id => sys_guid(), + coverage_run_id => ut_coverage.get_coverage_run_id(), schema_names => l_coverage_schema_names, exclude_objects => ut_utils.convert_collection(a_exclude_objects), include_objects => ut_utils.convert_collection(a_include_objects), diff --git a/source/core/coverage/ut_coverage.pkb b/source/core/coverage/ut_coverage.pkb index 06951fc2f..eeedfc665 100644 --- a/source/core/coverage/ut_coverage.pkb +++ b/source/core/coverage/ut_coverage.pkb @@ -18,6 +18,7 @@ create or replace package body ut_coverage is g_develop_mode boolean not null := false; g_is_started boolean not null := false; + g_coverage_run_id raw(32); procedure set_develop_mode(a_develop_mode in boolean) is begin @@ -231,6 +232,7 @@ create or replace package body ut_coverage is l_block_coverage_id integer; begin if not is_develop_mode() and not g_is_started then + g_coverage_run_id := a_coverage_run_id; l_line_coverage_id := ut_coverage_helper_profiler.coverage_start( l_run_comment ); l_block_coverage_id := ut_coverage_helper_block.coverage_start( l_run_comment ); g_is_started := true; @@ -256,7 +258,6 @@ create or replace package body ut_coverage is g_is_started := false; ut_coverage_helper_block.coverage_stop(); ut_coverage_helper_profiler.coverage_stop(); - g_is_started := false; end if; end; @@ -314,7 +315,15 @@ create or replace package body ut_coverage is $end return l_result_profiler_enrich; - end get_coverage_data; + end get_coverage_data; + + function get_coverage_run_id return raw is + begin + if g_coverage_run_id is null then + g_coverage_run_id := sys_guid(); + end if; + return g_coverage_run_id; + end; end; / diff --git a/source/core/coverage/ut_coverage.pks b/source/core/coverage/ut_coverage.pks index 210cb13f6..21f3b1f9e 100644 --- a/source/core/coverage/ut_coverage.pks +++ b/source/core/coverage/ut_coverage.pks @@ -74,5 +74,7 @@ create or replace package ut_coverage authid current_user is function get_coverage_data(a_coverage_options ut_coverage_options) return t_coverage; + function get_coverage_run_id return raw; + end; / diff --git a/test/ut3_tester_helper/coverage_helper.pkb b/test/ut3_tester_helper/coverage_helper.pkb index 5f255a2e6..ab5a09515 100644 --- a/test/ut3_tester_helper/coverage_helper.pkb +++ b/test/ut3_tester_helper/coverage_helper.pkb @@ -381,14 +381,75 @@ create or replace package body coverage_helper is return l_result_clob; end; + procedure copy_coverage_data_to_ut3(a_coverage_run_id raw) is + pragma autonomous_transaction; + l_current_coverage_run_id raw(32) := hextoraw(sys_context('UT3_INFO','COVERAGE_RUN_ID')); + begin + insert into ut3.ut_coverage_runs(coverage_run_id, line_coverage_id, block_coverage_id) + select l_current_coverage_run_id, -line_coverage_id, -block_coverage_id + from ut3_develop.ut_coverage_runs + where coverage_run_id = a_coverage_run_id; + + insert into ut3.plsql_profiler_runs(runid, related_run, run_owner, run_date, run_comment, run_total_time, run_system_info, run_comment1, spare1) + select -runid, related_run, run_owner, run_date, run_comment, run_total_time, run_system_info, run_comment1, spare1 + from ut3_develop.plsql_profiler_runs c + join ut3_develop.ut_coverage_runs r + on r.line_coverage_id = c.runid + where r.coverage_run_id = a_coverage_run_id; + + insert into ut3.plsql_profiler_units(runid, unit_number, unit_type, unit_owner, unit_name, unit_timestamp, total_time, spare1, spare2) + select -runid, unit_number, unit_type, unit_owner, unit_name, unit_timestamp, total_time, spare1, spare2 + from ut3_develop.plsql_profiler_units c + join ut3_develop.ut_coverage_runs r + on r.line_coverage_id = c.runid + where r.coverage_run_id = a_coverage_run_id; + + insert into ut3.plsql_profiler_data(runid, unit_number, line#, total_occur, total_time, min_time, max_time, spare1, spare2, spare3, spare4) + select -runid, unit_number, line#, total_occur, total_time, min_time, max_time, spare1, spare2, spare3, spare4 + from ut3_develop.plsql_profiler_data c + join ut3_develop.ut_coverage_runs r + on r.line_coverage_id = c.runid + where r.coverage_run_id = a_coverage_run_id; + + insert into ut3.dbmspcc_runs(run_id, run_comment, run_owner, run_timestamp) + select -run_id, run_comment, run_owner, run_timestamp + from ut3_develop.dbmspcc_runs c + join ut3_develop.ut_coverage_runs r + on r.block_coverage_id = c.run_id + where r.coverage_run_id = a_coverage_run_id; + + insert into ut3.dbmspcc_units(run_id, object_id, owner, name, type, last_ddl_time) + select -run_id, object_id, owner, name, type, last_ddl_time + from ut3_develop.dbmspcc_units c + join ut3_develop.ut_coverage_runs r + on r.block_coverage_id = c.run_id + where r.coverage_run_id = a_coverage_run_id; + + insert into ut3.dbmspcc_blocks(run_id, object_id, block, line, col, covered, not_feasible) + select -run_id, object_id, block, line, col, covered, not_feasible + from ut3_develop.dbmspcc_blocks c + join ut3_develop.ut_coverage_runs r + on r.block_coverage_id = c.run_id + where r.coverage_run_id = a_coverage_run_id; + + commit; + end; + function run_tests_as_job( a_run_command varchar2 ) return clob is l_plsql_block varchar2(32767); l_result_clob clob; - pragma autonomous_transaction; + l_coverage_id raw(32) := sys_guid(); begin - l_plsql_block := 'begin insert into test_results select * from table( {a_run_command} ); commit; end;'; + l_plsql_block := q'[ + begin + ut3_develop.ut_runner.coverage_start(']'||rawtohex(l_coverage_id)||q'['); + insert into test_results select * from table( {a_run_command} ); + commit; + end;]'; l_plsql_block := replace(l_plsql_block,'{a_run_command}',a_run_command); - return run_code_as_job( l_plsql_block ); + l_result_clob := run_code_as_job( l_plsql_block ); + copy_coverage_data_to_ut3(l_coverage_id); + return l_result_clob; end; procedure create_dup_object_name is From 311d5a7250e94decfa79f3a65280153fe5fe95d3 Mon Sep 17 00:00:00 2001 From: Felipe Zorzo Date: Sat, 26 Feb 2022 16:18:03 -0300 Subject: [PATCH 0911/1096] Fix links to SonarCloud projects and SonarQube documentation --- docs/index.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/reporters.md | 2 +- readme.md | 2 +- source/reporters/ut_coverage_sonar_reporter.tpb | 6 +++--- source/reporters/ut_coverage_sonar_reporter.tps | 2 +- source/reporters/ut_coveralls_reporter.tps | 2 +- source/reporters/ut_sonar_test_reporter.tpb | 6 +++--- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/index.md b/docs/index.md index 537da5148..b079557ed 100644 --- a/docs/index.md +++ b/docs/index.md @@ -31,7 +31,7 @@ The framework follows industry standards and best patterns of modern Unit Testin Have a look at our [demo project](https://github.com/utPLSQL/utPLSQL-demo-project/). -It uses [Travis CI](https://travis-ci.org/utPLSQL/utPLSQL-demo-project) to build on every commit, runs all tests, publishes test results and code coverage to [SonarQube](https://sonarqube.com/dashboard?id=utPLSQL%3AutPLSQL-demo-project%3Adevelop). +It uses [Travis CI](https://travis-ci.org/utPLSQL/utPLSQL-demo-project) to build on every commit, runs all tests, publishes test results and code coverage to [SonarCloud](https://sonarcloud.io/project/overview?id=utPLSQL:utPLSQL-demo-project). # Three steps diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 0fabf61bd..0da111301 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -17,7 +17,7 @@ To obtain information about code coverage for unit tests, run utPLSQL with one o The following code coverage reporters are supplied with utPLSQL: * `ut_coverage_html_reporter` - generates a HTML coverage report providing summary and detailed information on code coverage. The HTML reporter is based on the open-source [simplecov-html](https://github.com/colszowka/simplecov-html) reporter for Ruby. It includes source code of the code that was covered (if possible) * `ut_coveralls_reporter` - generates a [Coveralls compatible JSON](https://coveralls.zendesk.com/hc/en-us/articles/201774865-API-Introduction) coverage report providing detailed information on code coverage with line numbers. This coverage report is designed to be consumed by cloud services like [Coveralls](https://coveralls.io) -* `ut_coverage_sonar_reporter` - generates a [Sonar Compatible XML](https://docs.sonarqube.org/display/SONAR/Generic+Test+Data) coverage report providing detailed information on code coverage with line numbers. This coverage report is designed to be consumed by services like [SonarQube/SonarCloud](https://about.sonarcloud.io/) +* `ut_coverage_sonar_reporter` - generates a [Sonar Compatible XML](https://docs.sonarqube.org/latest/analysis/generic-test/) coverage report providing detailed information on code coverage with line numbers. This coverage report is designed to be consumed by services like [SonarQube](https://www.sonarqube.org/) and [SonarCloud](https://about.sonarcloud.io/) * `ut_coverage_cobertura_reporter` - generates a basic Cobertura coverage (http://cobertura.sourceforge.net/xml/coverage-04.dtd) report providing detailed information on code coverage with line numbers. This coverage report is designed to be consumed by services like TFS and Jenkins. Check this link for an example of XML generated by Java: https://raw.githubusercontent.com/jenkinsci/cobertura-plugin/master/src/test/resources/hudson/plugins/cobertura/coverage-with-data.xml ## Security model diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index ebc28ec38..176027a99 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -84,7 +84,7 @@ Example of failure report details # Sonar test reporter -If you are using [SonarQube](https://about.sonarqube.com/) to do static code analysis for you PLSQL projects, your code analysis can benefit from code coverage and test results. +If you are using [SonarQube](https://www.sonarqube.org/) or [SonarCloud](https://about.sonarcloud.io/) to do static code analysis for you PLSQL projects, your code analysis can benefit from code coverage and test results. utPLSQL provides two reporters to for SonarQube: - `ut_sonar_test_reporter` - provides an XML output of each test executed per each project test file (package) - `ut_coverage_sonar_reporter` - provides XML output of code coverage per each project source file diff --git a/readme.md b/readme.md index f96b88d7f..141c68ffe 100644 --- a/readme.md +++ b/readme.md @@ -9,7 +9,7 @@ [![twitter](https://img.shields.io/twitter/follow/utPLSQL.svg?style=social&label=Follow)](https://twitter.com/utPLSQL) [![build](https://github.com/utPLSQL/utPLSQL/actions/workflows/build.yml/badge.svg)](https://github.com/utPLSQL/utPLSQL/actions/workflows/build.yml) -[![QualityGate](https://sonarcloud.io/api/project_badges/measure?project=utPLSQL&metric=sqale_rating)](https://sonarcloud.io/dashboard/index?id=utPLSQL) +[![QualityGate](https://sonarcloud.io/api/project_badges/measure?project=utPLSQL&metric=sqale_rating)](https://sonarcloud.io/summary/new_code?id=utPLSQL) [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=utPLSQL&metric=coverage)](https://sonarcloud.io/summary/new_code?id=utPLSQL) ---------- diff --git a/source/reporters/ut_coverage_sonar_reporter.tpb b/source/reporters/ut_coverage_sonar_reporter.tpb index 4bde1a88d..8ee78dc24 100644 --- a/source/reporters/ut_coverage_sonar_reporter.tpb +++ b/source/reporters/ut_coverage_sonar_reporter.tpb @@ -96,9 +96,9 @@ create or replace type body ut_coverage_sonar_reporter is overriding member function get_description return varchar2 as begin - return 'Generates a JSON coverage report providing information on code coverage with line numbers.' || chr(10) || - 'Designed for [SonarQube](https://about.sonarqube.com/) to report coverage.' || chr(10) || - 'JSON format returned conforms with the Sonar specification: https://docs.sonarqube.org/display/SONAR/Generic+Test+Data'; + return 'Generates a XML coverage report providing information on code coverage with line numbers.' || chr(10) || + 'Designed for [SonarQube](https://www.sonarqube.org/) to report coverage.' || chr(10) || + 'XML format returned conforms with the Sonar specification: https://docs.sonarqube.org/latest/analysis/generic-test/'; end; end; diff --git a/source/reporters/ut_coverage_sonar_reporter.tps b/source/reporters/ut_coverage_sonar_reporter.tps index f3076368f..715bdefd2 100644 --- a/source/reporters/ut_coverage_sonar_reporter.tps +++ b/source/reporters/ut_coverage_sonar_reporter.tps @@ -18,7 +18,7 @@ create or replace type ut_coverage_sonar_reporter under ut_coverage_reporter_bas /** * Builds a coverage XML report that follows rules described in - * https://docs.sonarqube.org/display/SONAR/Generic+Test+Data + * https://docs.sonarqube.org/latest/analysis/generic-test/ */ constructor function ut_coverage_sonar_reporter( self in out nocopy ut_coverage_sonar_reporter diff --git a/source/reporters/ut_coveralls_reporter.tps b/source/reporters/ut_coveralls_reporter.tps index f3cad3a4e..74363b751 100644 --- a/source/reporters/ut_coveralls_reporter.tps +++ b/source/reporters/ut_coveralls_reporter.tps @@ -18,7 +18,7 @@ create or replace type ut_coveralls_reporter under ut_coverage_reporter_base( /** * Builds a coverage XML report that follows rules described in - * https://docs.sonarqube.org/display/SONAR/Generic+Test+Data + * https://docs.coveralls.io/api-introduction */ constructor function ut_coveralls_reporter( self in out nocopy ut_coveralls_reporter diff --git a/source/reporters/ut_sonar_test_reporter.tpb b/source/reporters/ut_sonar_test_reporter.tpb index 20624fae9..a3ec72241 100644 --- a/source/reporters/ut_sonar_test_reporter.tpb +++ b/source/reporters/ut_sonar_test_reporter.tpb @@ -106,9 +106,9 @@ create or replace type body ut_sonar_test_reporter is overriding member function get_description return varchar2 as begin - return 'Generates a JSON report providing detailed information on test execution.' || chr(10) || - 'Designed for [SonarQube](https://about.sonarqube.com/) to report test execution.' || chr(10) || - 'JSON format returned conforms with the Sonar specification: https://docs.sonarqube.org/display/SONAR/Generic+Test+Data'; + return 'Generates a XML report providing detailed information on test execution.' || chr(10) || + 'Designed for [SonarQube](https://www.sonarqube.org/) to report test execution.' || chr(10) || + 'XML format returned conforms with the Sonar specification: https://docs.sonarqube.org/latest/analysis/generic-test/'; end; end; From 25af9edbcd5b7a9627c667225105bf70ede6a010 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 26 Feb 2022 22:11:18 +0000 Subject: [PATCH 0912/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index ceff64be9..c8e1f017a 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 110f3197c..7b95eee4f 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 7b4a67750..2e0d31c99 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 4fc3f72f7..5cbe4dbda 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 2380c0473..695a3e0fb 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 93da6013e..6f382970a 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index f28e0cd5b..192ea7b8d 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index b5b7cb286..4c203e73d 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index f6cdcbc93..2c59a8126 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index fd6cc6f98..484681b9b 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 3bd3e090b..1000b7747 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index b5b9d09f1..548359f7f 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 9f92b7c6a..c4c5ac903 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index aac098805..e8d36cd72 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 1e0f134b6..5777b36b0 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 73e469da3..4bbd665cd 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index f0ef68ab2..631dc1d56 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3896--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index b9917f2a7..8ef9cff39 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.13.3896-develop'; + gc_version constant varchar2(50) := 'v3.1.13.3905-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 969f52ee0b374a3a491526f49dad09baa9724629 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 27 Feb 2022 00:26:52 +0200 Subject: [PATCH 0913/1096] Testing local html validator (as a container) --- .github/scripts/validate_report_files.sh | 2 +- .github/workflows/build.yml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/scripts/validate_report_files.sh b/.github/scripts/validate_report_files.sh index 59376a174..722a9220a 100755 --- a/.github/scripts/validate_report_files.sh +++ b/.github/scripts/validate_report_files.sh @@ -7,7 +7,7 @@ XSD_DIR="${SCRIPT_DIR}/xsd" XML_JAR_DIR="${SCRIPT_DIR}/lib" #XML Validator XML_VALIDATOR="$XML_JAR_DIR/xml_validator.jar" -HTML_VALIDATOR_URL="https://validator.w3.org/nu/" +HTML_VALIDATOR_URL="http://localhost:8888/" HTML_FILENAME="coverage.html" declare -A XML_FILES diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cf36d4c55..816f0ab39 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -60,6 +60,10 @@ jobs: oracle-base: '/opt/oracle' services: + html_checker: + image: ghcr.io/validator/validator:latest + options: >- + -p 8888:8888 oracle: image: ${{matrix.oracle-version}} env: From b4d72e391f2e7f5d920ec08744a30431ef201027 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 26 Feb 2022 23:07:21 +0000 Subject: [PATCH 0914/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index c8e1f017a..002c7ee3b 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 7b95eee4f..fa782b2ad 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 2e0d31c99..400ead44a 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 5cbe4dbda..11beecd51 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 695a3e0fb..89c4b41b4 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 6f382970a..d7c5b6bb0 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 192ea7b8d..c36b06450 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 4c203e73d..35485e4db 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 2c59a8126..664fb78cb 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 484681b9b..dbd70d9a0 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 1000b7747..96fd4e2c4 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 548359f7f..548994f5b 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index c4c5ac903..88b4d0942 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index e8d36cd72..6140f2cc7 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 5777b36b0..a6f37d0a6 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 4bbd665cd..88fa7ad0c 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 631dc1d56..1cc6dd58b 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3905--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 8ef9cff39..a19bd82dd 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.13.3905-develop'; + gc_version constant varchar2(50) := 'v3.1.13.3908-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From a84246be72ffa0196d4ebb408b1afda0966158c9 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sun, 27 Feb 2022 17:47:35 +0000 Subject: [PATCH 0915/1096] Adding extra tests for code coverage --- source/core/coverage/ut_coverage.pkb | 4 +- test/ut3_tester_helper/coverage_helper.pkb | 40 +++++++++ test/ut3_tester_helper/coverage_helper.pks | 1 + .../test_coverage/test_extended_coverage.pkb | 84 ++++++++++++++++++- .../test_coverage/test_extended_coverage.pks | 28 ++++++- 5 files changed, 149 insertions(+), 8 deletions(-) diff --git a/source/core/coverage/ut_coverage.pkb b/source/core/coverage/ut_coverage.pkb index eeedfc665..b606a6dc1 100644 --- a/source/core/coverage/ut_coverage.pkb +++ b/source/core/coverage/ut_coverage.pkb @@ -102,7 +102,7 @@ create or replace package body ut_coverage is on s.name = f.object_name and s.type = f.object_type and s.owner = f.object_owner'; - elsif a_coverage_options.include_schema_expr is not null or a_coverage_options.include_object_expr is not null then + elsif coalesce(a_coverage_options.include_schema_expr,a_coverage_options.include_object_expr) is not null then l_full_name := q'[lower(s.type||' '||s.owner||'.'||s.name)]'; if a_coverage_options.include_schema_expr is not null then l_filters := q'[and regexp_like(s.owner,:a_include_schema_expr,'i')]'; @@ -183,7 +183,7 @@ create or replace package body ut_coverage is open l_cursor for l_sql using a_coverage_options.file_mappings,a_coverage_options.exclude_schema_expr, a_coverage_options.exclude_object_expr,l_excluded_objects, l_skip_objects; - elsif a_coverage_options.include_schema_expr is not null or a_coverage_options.include_object_expr is not null then + elsif coalesce(a_coverage_options.include_schema_expr,a_coverage_options.include_object_expr) is not null then open l_cursor for l_sql using a_coverage_options.include_schema_expr,a_coverage_options.include_object_expr, a_coverage_options.exclude_schema_expr,a_coverage_options.exclude_object_expr, l_excluded_objects,l_skip_objects; diff --git a/test/ut3_tester_helper/coverage_helper.pkb b/test/ut3_tester_helper/coverage_helper.pkb index ab5a09515..e59fde122 100644 --- a/test/ut3_tester_helper/coverage_helper.pkb +++ b/test/ut3_tester_helper/coverage_helper.pkb @@ -435,6 +435,46 @@ create or replace package body coverage_helper is commit; end; + function gather_coverage_on_coverage( a_cov_options varchar2) return clob is + pragma autonomous_transaction; + l_plsql_block varchar2(32767); + l_result_clob clob; + l_coverage_id raw(32) := sys_guid(); + begin + l_plsql_block := q'[ + declare + l_coverage_options ut3_develop.ut_coverage_options; + l_coverage_run_id raw(32) := ']'||rawtohex(l_coverage_id)||q'['; + l_result ut3_develop.ut_coverage.t_coverage; + begin + ut3_develop.ut_runner.coverage_start(l_coverage_run_id); + ut3_develop.ut_coverage.set_develop_mode(a_develop_mode => true); + l_coverage_options := {a_cov_options}; + l_result := ut3_develop.ut_coverage.get_coverage_data(l_coverage_options); + ut3_develop.ut_coverage.set_develop_mode(a_develop_mode => false); + ut3_develop.ut_runner.coverage_stop(); + insert into test_results select owner||'.'||name from ut3_develop.ut_coverage_sources_tmp; + commit; + end;]'; + l_plsql_block := replace(l_plsql_block,'{a_cov_options}',a_cov_options); + run_job_and_wait_for_finish( l_plsql_block ); + execute immediate q'[ + declare + l_results ut3_develop.ut_varchar2_list; + begin + select * + bulk collect into l_results + from test_results; + delete from test_results; + commit; + :clob_results := ut3_tester_helper.main_helper.table_to_clob(l_results); + end; + ]' + using out l_result_clob; + copy_coverage_data_to_ut3(l_coverage_id); + return l_result_clob; + end; + function run_tests_as_job( a_run_command varchar2 ) return clob is l_plsql_block varchar2(32767); l_result_clob clob; diff --git a/test/ut3_tester_helper/coverage_helper.pks b/test/ut3_tester_helper/coverage_helper.pks index c5e862612..8d2c1c150 100644 --- a/test/ut3_tester_helper/coverage_helper.pks +++ b/test/ut3_tester_helper/coverage_helper.pks @@ -23,6 +23,7 @@ create or replace package coverage_helper is procedure run_standalone_coverage(a_coverage_run_id raw, a_input integer); procedure run_coverage_job(a_coverage_run_id raw, a_input integer); + function gather_coverage_on_coverage( a_cov_options varchar2) return clob; function run_tests_as_job( a_run_command varchar2 ) return clob; function run_code_as_job( a_plsql_block varchar2 ) return clob; procedure create_test_results_table; diff --git a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb index f14eac984..d22570df0 100644 --- a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb +++ b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb @@ -141,7 +141,7 @@ create or replace package body test_extended_coverage is --Arrange l_expected := '%' || '%%'; - l_not_expected := '%' || + l_not_expected := '%' || '%%'; --Act l_actual := @@ -195,7 +195,7 @@ create or replace package body test_extended_coverage is --Arrange l_expected := '%' || '%%'; - l_not_expected := '%' || + l_not_expected := '%' || '%%'; --Act l_actual := @@ -214,5 +214,85 @@ create or replace package body test_extended_coverage is ut.expect(l_actual).not_to_be_like(l_not_expected); end; + procedure cove_rgx_inc_schema_norun is + l_expected clob; + l_not_expected clob; + l_actual clob; + begin + --Arrange + l_expected := '%UT3_DEVELOP.REGEX_DUMMY_COV%'; + l_not_expected := '%UT3_TESTER_HELPER.REGEX123_DUMMY_COV%'; + --Act + l_actual := ut3_tester_helper.coverage_helper.gather_coverage_on_coverage( + q'[ut3_develop.ut_coverage_options( + coverage_run_id => l_coverage_run_id, + include_schema_expr => '^ut3_develop' + )]'); + --Assert + ut.expect(l_actual).to_be_like(l_expected); + ut.expect(l_actual).not_to_be_like(l_not_expected); + end; + + procedure cove_rgx_inc_object_norun is + l_expected clob; + l_not_expected clob; + l_actual clob; + begin + --Arrange + l_expected := '%UT3_DEVELOP.REGEX123_DUMMY_COV%'; + l_not_expected := '%UT3_DEVELOP.REGEX_DUMMY_COV%'; + --Act + l_actual := ut3_tester_helper.coverage_helper.gather_coverage_on_coverage( + q'[ut3_develop.ut_coverage_options( + coverage_run_id => l_coverage_run_id, + include_object_expr => 'regex123' + )]'); + --Assert + ut.expect(l_actual).to_be_like(l_expected); + ut.expect(l_actual).not_to_be_like(l_not_expected); + end; + + procedure cove_rgx_exc_schema_norun is + l_expected clob; + l_not_expected clob; + l_actual clob; + begin + --Arrange + l_expected := '%UT3_DEVELOP.REGEX_DUMMY_COV%'; + l_not_expected := '%UT3_TESTER_HELPER.REGEX_DUMMY_COV%'; + --Act + l_actual := ut3_tester_helper.coverage_helper.gather_coverage_on_coverage( + q'[ut3_develop.ut_coverage_options( + coverage_run_id => l_coverage_run_id, + schema_names => ut3_develop.ut_varchar2_rows( 'UT3_DEVELOP','UT3_TESTER_HELPER' ), + exclude_schema_expr => '^ut3_tester', + exclude_objects => ut3_develop.ut_varchar2_rows( 'ut3_develop.regex_dummy_cov' ) + )]'); + --Assert + ut.expect(l_actual).to_be_like(l_expected); + ut.expect(l_actual).not_to_be_like(l_not_expected); + end; + + procedure cove_rgx_exc_object_norun is + l_expected clob; + l_not_expected clob; + l_actual clob; + begin + --Arrange + l_expected := '%UT3_DEVELOP.REGEX_DUMMY_COV%'; + l_not_expected := '%UT3_DEVELOP.REGEX123_DUMMY_COV%'; + --Act + l_actual := ut3_tester_helper.coverage_helper.gather_coverage_on_coverage( + q'[ut3_develop.ut_coverage_options( + coverage_run_id => l_coverage_run_id, + schema_names => ut3_develop.ut_varchar2_rows( 'UT3_DEVELOP' ), + exclude_object_expr => 'regex123', + exclude_objects => ut3_develop.ut_varchar2_rows( 'ut3_develop.regex_dummy_cov' ) + )]'); + --Assert + ut.expect(l_actual).to_be_like(l_expected); + ut.expect(l_actual).not_to_be_like(l_not_expected); + end; + end; / diff --git a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pks b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pks index 99d7c5db4..108c5ae52 100644 --- a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pks +++ b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pks @@ -20,23 +20,43 @@ create or replace package test_extended_coverage is --%beforetest(ut3_tester_helper.coverage_helper.create_regex_dummy_cov) --%aftertest(ut3_tester_helper.coverage_helper.drop_regex_dummy_cov) - --%test(Collect coverage for objects with schema regex include) + --%test(Collect coverage for objects with schema regex include with ut_run) procedure coverage_regex_include_schema; --%beforetest(ut3_tester_helper.coverage_helper.create_regex_dummy_cov) --%aftertest(ut3_tester_helper.coverage_helper.drop_regex_dummy_cov) - --%test(Collect coverage for objects with object regex include) + --%test(Collect coverage for objects with object regex include with ut_run) procedure coverage_regex_include_object; --%beforetest(ut3_tester_helper.coverage_helper.create_regex_dummy_cov) --%aftertest(ut3_tester_helper.coverage_helper.drop_regex_dummy_cov) - --%test(Collect coverage for objects with schema regex exclude) + --%test(Collect coverage for objects with schema regex exclude with ut_run) procedure coverage_regex_exclude_schema; --%beforetest(ut3_tester_helper.coverage_helper.create_regex_dummy_cov) --%aftertest(ut3_tester_helper.coverage_helper.drop_regex_dummy_cov) - --%test(Collect coverage for objects with object regex exclude) + --%test(Collect coverage for objects with object regex exclude with ut_run) procedure coverage_regex_exclude_object; + --%beforetest(ut3_tester_helper.coverage_helper.create_regex_dummy_cov) + --%aftertest(ut3_tester_helper.coverage_helper.drop_regex_dummy_cov) + --%test(Collect coverage for objects with schema regex include without ut_run) + procedure cove_rgx_inc_schema_norun; + + --%beforetest(ut3_tester_helper.coverage_helper.create_regex_dummy_cov) + --%aftertest(ut3_tester_helper.coverage_helper.drop_regex_dummy_cov) + --%test(Collect coverage for objects with object regex include without ut_run) + procedure cove_rgx_inc_object_norun; + + --%beforetest(ut3_tester_helper.coverage_helper.create_regex_dummy_cov) + --%aftertest(ut3_tester_helper.coverage_helper.drop_regex_dummy_cov) + --%test(Collect coverage for objects with schema regex exclude without ut_run) + procedure cove_rgx_exc_schema_norun; + + --%beforetest(ut3_tester_helper.coverage_helper.create_regex_dummy_cov) + --%aftertest(ut3_tester_helper.coverage_helper.drop_regex_dummy_cov) + --%test(Collect coverage for objects with object regex exclude without ut_run) + procedure cove_rgx_exc_object_norun; + end; / From 090207c6dadf985d9c88ec646c0fee327785d5fd Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sun, 27 Feb 2022 19:52:16 +0000 Subject: [PATCH 0916/1096] Added extra coverage for file mapping. --- .../test_coverage/test_extended_coverage.pkb | 17 +++++++++++++++++ .../test_coverage/test_extended_coverage.pks | 4 ++++ 2 files changed, 21 insertions(+) diff --git a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb index d22570df0..3c8781bc4 100644 --- a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb +++ b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb @@ -294,5 +294,22 @@ create or replace package body test_extended_coverage is ut.expect(l_actual).not_to_be_like(l_not_expected); end; + procedure cov_file_mapping_no_utrun is + l_expected clob; + l_not_expected clob; + l_actual clob; + begin + --Arrange + l_expected := '%UT3_DEVELOP.REGEX_DUMMY_COV%'; + --Act + l_actual := ut3_tester_helper.coverage_helper.gather_coverage_on_coverage( + q'[ut3_develop.ut_coverage_options( + coverage_run_id => l_coverage_run_id, + file_mappings => ut3_develop.ut_file_mappings( ut3_develop.ut_file_mapping('C:\tests\helpers\core.pkb','UT3_DEVELOP','REGEX_DUMMY_COV','PACKAGE BODY')) + )]'); + --Assert + ut.expect(l_actual).to_be_like(l_expected); + end; + end; / diff --git a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pks b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pks index 108c5ae52..82b19fbed 100644 --- a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pks +++ b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pks @@ -58,5 +58,9 @@ create or replace package test_extended_coverage is --%test(Collect coverage for objects with object regex exclude without ut_run) procedure cove_rgx_exc_object_norun; + --%beforetest(ut3_tester_helper.coverage_helper.create_regex_dummy_cov) + --%aftertest(ut3_tester_helper.coverage_helper.drop_regex_dummy_cov) + --%test(Collect coverage for file mapping without ut_run) + procedure cov_file_mapping_no_utrun; end; / From df31fba9decf27bd5308a1df49655200de5238b1 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 28 Feb 2022 01:45:42 +0200 Subject: [PATCH 0917/1096] g_coverage_run_id is now reset after coverage collection is stopped. --- source/core/coverage/ut_coverage.pkb | 1 + 1 file changed, 1 insertion(+) diff --git a/source/core/coverage/ut_coverage.pkb b/source/core/coverage/ut_coverage.pkb index b606a6dc1..1bd88a186 100644 --- a/source/core/coverage/ut_coverage.pkb +++ b/source/core/coverage/ut_coverage.pkb @@ -256,6 +256,7 @@ create or replace package body ut_coverage is begin if not is_develop_mode() then g_is_started := false; + g_coverage_run_id := null; ut_coverage_helper_block.coverage_stop(); ut_coverage_helper_profiler.coverage_stop(); end if; From 0a2f478aa0c68753be358db0c9a4857a25c1361b Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 28 Feb 2022 01:47:10 +0200 Subject: [PATCH 0918/1096] Improved coverage collection scope and stability on self-tests for utPLSQL --- test/ut3_tester_helper/coverage_helper.pkb | 22 +++++++++++++------ .../test_coverage/test_proftab_coverage.pkb | 4 ++-- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/test/ut3_tester_helper/coverage_helper.pkb b/test/ut3_tester_helper/coverage_helper.pkb index e59fde122..fdfa32364 100644 --- a/test/ut3_tester_helper/coverage_helper.pkb +++ b/test/ut3_tester_helper/coverage_helper.pkb @@ -341,7 +341,7 @@ create or replace package body coverage_helper is e_exists exception; pragma exception_init ( e_exists, -955 ); begin - execute immediate 'create table test_results (text varchar2(4000))'; + execute immediate 'create table test_results (id integer, text varchar2(4000))'; exception when e_exists then null; @@ -368,9 +368,10 @@ create or replace package body coverage_helper is declare l_results ut3_develop.ut_varchar2_list; begin - select * + select text bulk collect into l_results - from test_results; + from test_results + order by id; delete from test_results; commit; :clob_results := ut3_tester_helper.main_helper.table_to_clob(l_results); @@ -453,7 +454,7 @@ create or replace package body coverage_helper is l_result := ut3_develop.ut_coverage.get_coverage_data(l_coverage_options); ut3_develop.ut_coverage.set_develop_mode(a_develop_mode => false); ut3_develop.ut_runner.coverage_stop(); - insert into test_results select owner||'.'||name from ut3_develop.ut_coverage_sources_tmp; + insert into test_results select rownum, owner||'.'||name from ut3_develop.ut_coverage_sources_tmp; commit; end;]'; l_plsql_block := replace(l_plsql_block,'{a_cov_options}',a_cov_options); @@ -462,9 +463,10 @@ create or replace package body coverage_helper is declare l_results ut3_develop.ut_varchar2_list; begin - select * + select text bulk collect into l_results - from test_results; + from test_results + order by id; delete from test_results; commit; :clob_results := ut3_tester_helper.main_helper.table_to_clob(l_results); @@ -483,7 +485,13 @@ create or replace package body coverage_helper is l_plsql_block := q'[ begin ut3_develop.ut_runner.coverage_start(']'||rawtohex(l_coverage_id)||q'['); - insert into test_results select * from table( {a_run_command} ); + ut3_develop.ut_coverage.set_develop_mode(a_develop_mode => true); + --gather coverage on the command executed + begin {a_run_command}; end; + ut3_develop.ut_coverage.set_develop_mode(a_develop_mode => false); + ut3_develop.ut_runner.coverage_stop(); + --get the actual results of the command gathering the coverage + insert into test_results select rownum as id, x.* from table( {a_run_command} ) x; commit; end;]'; l_plsql_block := replace(l_plsql_block,'{a_run_command}',a_run_command); diff --git a/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb b/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb index 7256fc202..7cad0a67e 100644 --- a/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb +++ b/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb @@ -137,14 +137,14 @@ create or replace package body test_proftab_coverage is --Act insert into test_results - select * + select rownum, x.* from table( ut3_develop.ut.run( a_path => 'ut3_develop:coverage_testing', a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.{p}' ) ) - ); + ) x; commit; end; ]'; From bd05e4cb19ea7a77ad1bc629124e58a714c13226 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 2 Mar 2022 01:23:47 +0200 Subject: [PATCH 0919/1096] Coverage documentation improvements. Fixed datatype for ut_coverage_options.tps attributes Formatting. --- docs/userguide/coverage.md | 122 ++++++++++++++-------- source/core/coverage/ut_coverage.pkb | 21 ++-- source/core/types/ut_coverage_options.tps | 8 +- 3 files changed, 91 insertions(+), 60 deletions(-) diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index b09eaf124..26b00bd85 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,7 +1,7 @@ ![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) # Coverage -utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database. +utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. Code coverage is gathered for the following source types: * package bodies * type bodies @@ -15,7 +15,7 @@ Code coverage is gathered for the following source types: To obtain information about code coverage for unit tests, run utPLSQL with one of built-in code coverage reporters. The following code coverage reporters are supplied with utPLSQL: -* `ut_coverage_html_reporter` - generates a HTML coverage report providing summary and detailed information on code coverage. The HTML reporter is based on the open-source [simplecov-html](https://github.com/colszowka/simplecov-html) reporter for Ruby. It includes source code of the code that was covered (if possible) +* `ut_coverage_html_reporter` - generates a HTML coverage report providing summary and detailed information on code coverage. The HTML reporter is based on the open-source [simplecov-html](https://github.com/colszowka/simplecov-html) reporter for Ruby. It includes source code of the code that was covered (if the code is accessible for test user) * `ut_coveralls_reporter` - generates a [Coveralls compatible JSON](https://coveralls.zendesk.com/hc/en-us/articles/201774865-API-Introduction) coverage report providing detailed information on code coverage with line numbers. This coverage report is designed to be consumed by cloud services like [Coveralls](https://coveralls.io) * `ut_coverage_sonar_reporter` - generates a [Sonar Compatible XML](https://docs.sonarqube.org/latest/analysis/generic-test/) coverage report providing detailed information on code coverage with line numbers. This coverage report is designed to be consumed by services like [SonarQube](https://www.sonarqube.org/) and [SonarCloud](https://about.sonarcloud.io/) * `ut_coverage_cobertura_reporter` - generates a basic Cobertura coverage (http://cobertura.sourceforge.net/xml/coverage-04.dtd) report providing detailed information on code coverage with line numbers. This coverage report is designed to be consumed by services like TFS and Jenkins. Check this link for an example of XML generated by Java: https://raw.githubusercontent.com/jenkinsci/cobertura-plugin/master/src/test/resources/hudson/plugins/cobertura/coverage-with-data.xml @@ -30,7 +30,7 @@ In order to be able to gather coverage information, the user executing unit test If you have `execute` privilege on the code that is being tested, but do not have `create any procedure` system privilege, then the code that is being tested will be reported as not covered (coverage = 0%). If you have `execute` privilege only on the unit tests, but do not have `execute` privilege on the code that is being tested, the code will not be reported by coverage - as if it did not exist in the database. -If the code that is being tested is complied as NATIVE, the code coverage will not be reported as well. +If the code that is being tested is compiled as NATIVE, the code coverage will not be reported as well. ## Running unit tests with coverage Using the code coverage functionality is as easy as using any other [reporter](reporters.md) for the utPLSQL test-run. You just run your tests from your preferred SQL tool and save the reporter results to a file. @@ -65,6 +65,7 @@ Due to security model of `dbms_plsql_code_coverage` package, utPLSQL grants acce The access and synonyms will be public when using the headless installation. This approach avoids complexity of forcing every user of utPLSQL framework to create tables on their own. Sample output: + ![Package Coverage Summary](../images/extended_coverage_html_summary.png) ![Line Coverage Details](../images/extended_coverage_html_line.png) @@ -128,42 +129,80 @@ exec ut.run('unit_test_schema', ut_coverage_html_reporter(), a_coverage_schemes #### Filtering objects in coverage reports -There are six options that can be used to narrow down the scope of coverage report: -- `a_include_objects` - list of `[object_owner.].object_name` to be included in the coverage report. -- `a_exclude_objects` - list of `[object_owner.].object_name` to be excluded from the coverage report -- `a_include_schema_expr` - string of regex expression of schemas to be included in the coverage report. It will override `a_include_objects` for example : - ```sql - a_include_schema_expr => '^ut3_develop', - a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_tester_helper.regex_dummy_cov' ) - ``` - Will result in showing coverage for all schemas that match regular expression `^ut3_develop` and ignore objectes defined by parameter `a_include_objects` - -- `a_include_object_expr` - string of regex expression of objects ( no schema names included ) to be included in the coverage report. It will override `a_include_objects` for example: - ```sql - a_include_object_expr => 'regex123', - a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_tester_helper.regex_dummy_cov' ) - ``` - Will result in showing coverage for all objects that name match regular expression `regex123` and ignore objectes defined by parameter `a_include_objects` - -- `a_exclude_schema_expr` - string of regex expression of schemas to be excluded from the coverage report. It will override `a_exclude_objects` for example: - ```sql - a_exclude_schema_expr => '^ut3_tester', - a_exclude_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.regex_dummy_cov' ) - ``` - Will result in showing coverage for all objects that schema is not matching regular expression `^ut3_tester` and ignore exclusion defined by parameter `a_exclude_objects` - -- `a_exclude_object_expr` - string of regex expression of objects to be excluded from the coverage report. It will override `a_exclude_objects` for example - ```sql - a_exclude_object_expr => 'regex123', - a_exclude_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.regex_dummy_cov' ) - ``` - Will result in showing coverage for all objects that name is not matching regular expression `regex123` and ignore exclusion defined by parameter `a_exclude_objects` - +There are multiple parameters that can be used to define the scope of coverage report: +- `a_source_file_mappings ( ut_file_mappings )` - map of filenames to database objects. It is used for file-based coverage - see below. +- `a_include_schema_expr ( varchar(4000) )` - string of regex expression of schemas to be included in the coverage report. +- `a_include_object_expr ( varchar(4000) )` - string of regex expression of objects ( without schema name ) to be included in the coverage report. +- `a_exclude_schema_expr ( varchar(4000) )` - string of regex expression of schemas to be excluded from the coverage report. +- `a_exclude_object_expr ( varchar(4000) )` - string of regex expression of objects to be excluded from the coverage report. +- `a_coverage_schemes ( ut_varchar2_list )` - List of database schema names to gather coverage on. +- `a_include_objects ( ut_varchar2_list )` - list of `[object_owner.]object_name` to be included in the coverage report. +- `a_exclude_objects ( ut_varchar2_list )` - list of `[object_owner.]object_name` to be excluded from the coverage report. You may specify both _include_ and _exclude_ options to gain more control over what needs to be included / excluded from the coverage report. -The object owner is optional in the object list. -If you do not provide an object owner, the _include_/_exclude_ list will be considered for every schema used for coverage gathering (as described above). +**Important notes** +The order of priority is for evaluation of include/exclude filter parameters is as follows. +- if `a_source_file_mappings` is defined then all include/exclude parameters are ignored (see section below for usage of `a_source_file_mappings` parameter ) +- else if `a_include_schema_expr` or `a_include_object_expr` parameter is specified then parameters `a_coverage_schemes` and `a_include_objects` are ignored +- else if `a_include_objects` is specified then the coverage is gathered only on specified database objects. + - if `a_coverage_schemes` is specified then those schemas are used for objects in `a_include_objects` without schema name + - if `a_coverage_schemes` is not specified then schema from paths (`a_paths`) parameter are used for objects in `a_include_objects` without schema name +- else if, only the `a_coverage_schemes` is specified then the coverage is gathered only on specified database schemas +- else if no coverage specific parameters are provided coverage is gathered on all schemas specified in paths passed to run procedure +- else if no paths were specified, the coverage is gathered on current schema of the session running the tests + + +Example: Limiting coverage by schema regex. +```sql +begin + ut.run(ut_varchar2_list('user_1','user_2'), ut_coverage_html_reporter(), + a_include_schema_expr => '^ut3_develop' + ); +end; +``` +Will result in showing coverage for all schemas that match regular expression `^ut3_develop` + +```sql +begin + ut.run(ut_varchar2_list('user_1','user_2'), ut_coverage_html_reporter(), + a_include_schema_expr => '^ut3_develop', a_include_objects => ut_varchar2_list( 'ut3_tester_helper.regex_dummy_cov' ) + ); +end; +``` +Will result in showing coverage for all schemas that match regular expression `^ut3_develop`. +Will ignore the `a_include_objects` parameter + +```sql +begin + ut.run(ut_varchar2_list('user_1','user_2'), ut_coverage_html_reporter(), + a_include_object_expr => 'regex123', a_include_objects => ut_varchar2_list( 'ut3_tester_helper.regex_dummy_cov' ) + ); +end; +``` +Will result in showing coverage for all objects that name match regular expression `regex123`. +Will ignore the `a_include_objects` parameter. + +```sql +begin + ut.run(ut_varchar2_list('user_1','user_2'), ut_coverage_html_reporter(), + a_exclude_schema_expr => '^ut3_tester', a_exclude_objects => ut_varchar2_list( 'regex_dummy_cov' ) + ); +end; +``` +Will result in showing coverage for objects in all schema except schemas that are matching regular expression `^ut3_tester` +Will ignore exclusion defined by parameter `a_exclude_objects` + +```sql +begin + ut.run(ut_varchar2_list('user_1','user_2'), ut_coverage_html_reporter(), + a_exclude_object_expr => 'regex123', a_exclude_objects => ut_varchar2_list( 'regex_dummy_cov' ) + ); +end; +``` +Will result in showing coverage for all objects that name is not matching regular expression `regex123`. +Will ignore exclusion defined by parameter `a_exclude_objects`. + Example: Limiting coverage by object name, for tested code located in the same schema as the unit tests. ```sql @@ -214,7 +253,8 @@ Executes test `test_award_bonus` in schema `unit_test_schema`. Coverage will be **Note** > When running coverage on schema objects, all source code of package bodies, functions, procedures, type bodies and triggers that were not executed will be reported as having 0% code coverage and all source code lines will show as uncovered. -> This is different than the behavior when gathering coverage on project files. +> This is different from the behavior when gathering coverage on project files. + ### Project based Coverage @@ -687,7 +727,7 @@ begin end; ``` -## Reporting coverage outside of utPLSQL +## Reporting coverage outside utPLSQL and in parallel sessions utPSLQL allows fo standalone reporting code coverage across multiple database sessions. This functionality enables coverage reporting for external testing tools. @@ -811,9 +851,3 @@ If the identifier is not unique, previous runs of coverage that used the same `c For details on the meaning of `schema_names`, `exclude_objects`, `include_objects`, `file_mappings` see sections above. Note that data-types of include/exclude/schema lists are different when calling `ut.run` vs. calling `get_report/get_report_cursor`. -The order of priority is for evaluation of include/exclude is as follows. -- if `file_mappings` is specified then all include/exclude parameters are ignored -- else if `..._expr` is specified then include_objects/exclude_objects parameters are ignored -- else if `schema_names` is specified then the coverage is gathered on all object of specified schemas -- else coverage is gathered on all schemas specified in paths passed to run procedure -- if no paths were specified, the coverage is gathered on current schema of the session running the tests diff --git a/source/core/coverage/ut_coverage.pkb b/source/core/coverage/ut_coverage.pkb index 1bd88a186..f5eccc893 100644 --- a/source/core/coverage/ut_coverage.pkb +++ b/source/core/coverage/ut_coverage.pkb @@ -180,21 +180,18 @@ create or replace package body ut_coverage is ut_event_manager.trigger_event(ut_event_manager.gc_debug, ut_key_anyvalues().put('l_sql',l_sql) ); if a_coverage_options.file_mappings is not empty then - open l_cursor for l_sql using a_coverage_options.file_mappings,a_coverage_options.exclude_schema_expr, - a_coverage_options.exclude_object_expr,l_excluded_objects, - l_skip_objects; + open l_cursor for l_sql using a_coverage_options.file_mappings, a_coverage_options.exclude_schema_expr, + a_coverage_options.exclude_object_expr, l_excluded_objects, l_skip_objects; elsif coalesce(a_coverage_options.include_schema_expr,a_coverage_options.include_object_expr) is not null then - open l_cursor for l_sql using a_coverage_options.include_schema_expr,a_coverage_options.include_object_expr, - a_coverage_options.exclude_schema_expr,a_coverage_options.exclude_object_expr, - l_excluded_objects,l_skip_objects; + open l_cursor for l_sql using a_coverage_options.include_schema_expr, a_coverage_options.include_object_expr, + a_coverage_options.exclude_schema_expr, a_coverage_options.exclude_object_expr, + l_excluded_objects, l_skip_objects; elsif a_coverage_options.include_objects is not empty then - open l_cursor for l_sql using a_coverage_options.include_objects,a_coverage_options.exclude_schema_expr, - a_coverage_options.exclude_object_expr,l_excluded_objects, - l_skip_objects; + open l_cursor for l_sql using a_coverage_options.include_objects, a_coverage_options.exclude_schema_expr, + a_coverage_options.exclude_object_expr, l_excluded_objects, l_skip_objects; else - open l_cursor for l_sql using a_coverage_options.schema_names,a_coverage_options.exclude_schema_expr, - a_coverage_options.exclude_object_expr,l_excluded_objects, - l_skip_objects; + open l_cursor for l_sql using a_coverage_options.schema_names, a_coverage_options.exclude_schema_expr, + a_coverage_options.exclude_object_expr, l_excluded_objects, l_skip_objects; end if; return l_cursor; end; diff --git a/source/core/types/ut_coverage_options.tps b/source/core/types/ut_coverage_options.tps index 245539179..a8e3d5129 100644 --- a/source/core/types/ut_coverage_options.tps +++ b/source/core/types/ut_coverage_options.tps @@ -21,10 +21,10 @@ create or replace type ut_coverage_options force as object ( exclude_objects ut_object_names, include_objects ut_object_names, file_mappings ut_file_mappings, - include_schema_expr varchar2(32767), - include_object_expr varchar2(32767), - exclude_schema_expr varchar2(32767), - exclude_object_expr varchar2(32767), + include_schema_expr varchar2(4000), + include_object_expr varchar2(4000), + exclude_schema_expr varchar2(4000), + exclude_object_expr varchar2(4000), constructor function ut_coverage_options( self in out nocopy ut_coverage_options, coverage_run_id raw, From 3b9b6260a75d47332611bce939f317b295a36ba7 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 2 Mar 2022 01:26:48 +0200 Subject: [PATCH 0920/1096] Coverage documentation improvements. --- docs/userguide/coverage.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 26b00bd85..20210ab47 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -152,6 +152,7 @@ The order of priority is for evaluation of include/exclude filter parameters is - else if no coverage specific parameters are provided coverage is gathered on all schemas specified in paths passed to run procedure - else if no paths were specified, the coverage is gathered on current schema of the session running the tests +The exclude parameters are not mutually-exclusive and can be mixed together. All of exclude parameters are always applied. Example: Limiting coverage by schema regex. ```sql From 3bdb9d05dffb2456d004849c870e660f8113a337 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 2 Mar 2022 12:57:42 +0200 Subject: [PATCH 0921/1096] Fixing flaky test --- test/ut3_user/expectations/binary/test_to_be_within.pkb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ut3_user/expectations/binary/test_to_be_within.pkb b/test/ut3_user/expectations/binary/test_to_be_within.pkb index d490a8280..032b684a5 100644 --- a/test/ut3_user/expectations/binary/test_to_be_within.pkb +++ b/test/ut3_user/expectations/binary/test_to_be_within.pkb @@ -199,7 +199,7 @@ create or replace package body test_to_be_within is begin --Arrange --Act - ut3_develop.ut.expect(sysdate).to_be_within(INTERVAL '1' MONTH).of_(sysdate+ 45); + ut3_develop.ut.expect(sysdate).to_be_within(INTERVAL '1' MONTH).of_(sysdate+ 46); --Assert l_expected_message := q'[Actual: % (date) was expected to be within 1 month of % (date)]'; l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); From 1d86276dd76d64b87f81cebc3287397912ce1eaa Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 3 Mar 2022 00:24:21 +0200 Subject: [PATCH 0922/1096] Fix for unit-test results reporting into Sonar --- .github/variables/.env | 2 +- CONTRIBUTING.md | 2 +- docs/userguide/expectations.md | 8 ++--- docs/userguide/running-unit-tests.md | 2 +- test/install_ut3_tester_helper.sql | 2 +- test/run_tests.sh | 6 +++- .../annotations/test_annotation_manager.pkb | 16 ++++----- .../annotations/test_annotation_manager.pks | 8 ++--- test/ut3_tester_helper/main_helper.pkb | 12 +++---- test/ut3_tester_helper/main_helper.pks | 6 ++-- test/ut3_tester_helper/run_helper.pkb | 34 +++++++++---------- test/ut3_tester_helper/run_helper.pks | 4 +-- test/ut3_user/api/test_ut_run.pkb | 10 +++--- test/ut3_user/api/test_ut_run.pks | 20 +++++------ test/ut3_user/api/test_ut_runner.pkb | 24 ++++++------- test/ut3_user/expectations.pkb | 6 ++-- test/ut3_user/reporters.pkb | 2 +- .../reporters/test_documentation_reporter.pkb | 4 +-- .../reporters/test_teamcity_reporter.pkb | 34 +++++++++---------- 19 files changed, 103 insertions(+), 99 deletions(-) diff --git a/.github/variables/.env b/.github/variables/.env index 9f35a080c..e0a579d52 100644 --- a/.github/variables/.env +++ b/.github/variables/.env @@ -3,7 +3,7 @@ UT3_DEVELOP_SCHEMA=UT3_DEVELOP UT3_DEVELOP_SCHEMA_PASSWORD=ut3 UT3_RELEASE_VERSION_SCHEMA=UT3 UT3_RELEASE_VERSION_SCHEMA_PASSWORD=ut3 -UT3_USER='UT3$USER#' +UT3_USER='UT3_USER' UT3_USER_PASSWORD=ut3 UT3_TESTER=UT3_TESTER UT3_TESTER_PASSWORD=ut3 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a65b7b685..41a86ecdd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -46,7 +46,7 @@ We use four different database accounts (users) for development process. * `ut3` - holds latest released version of utPLSQL. This schema holds the testing framework used for self-testing of utPLSQL development. * `ut3_develop` - holds the version of utPLSQL of your current branch. This is the schema you will be working on. * `ut3_tester` - holds unit test packages for development of utPLSQL. -* `ut3$user#` - used for testing accessibility to schema names with special characters. +* `ut3_user` - used for testing accessibility to schema names with special characters. * `ut3_tester_helper` - elevated privileges user, used for creating and dropping objects in other schemas during test run. diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 96fd4e2c4..387149138 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -249,13 +249,13 @@ Failures: 1) the_test "Checking table ALL_USERS" Actual: 28 (number) was expected to equal: 0 (number) - at "UT3$USER#.SHARED_EXPECTATION_TEST.TABLE_IS_EMPTY", line 6 ut.expect( l_count, 'Checking table '||p_table_name ).to_equal(0); - at "UT3$USER#.SHARED_EXPECTATION_TEST.THE_TEST", line 11 + at "UT3_USER.SHARED_EXPECTATION_TEST.TABLE_IS_EMPTY", line 6 ut.expect( l_count, 'Checking table '||p_table_name ).to_equal(0); + at "UT3_USER.SHARED_EXPECTATION_TEST.THE_TEST", line 11 "Checking table ALL_TABLES" Actual: 55 (number) was expected to equal: 0 (number) - at "UT3$USER#.SHARED_EXPECTATION_TEST.TABLE_IS_EMPTY", line 6 ut.expect( l_count, 'Checking table '||p_table_name ).to_equal(0); - at "UT3$USER#.SHARED_EXPECTATION_TEST.THE_TEST", line 12 + at "UT3_USER.SHARED_EXPECTATION_TEST.TABLE_IS_EMPTY", line 6 ut.expect( l_count, 'Checking table '||p_table_name ).to_equal(0); + at "UT3_USER.SHARED_EXPECTATION_TEST.THE_TEST", line 12 Finished in .066344 seconds 1 tests, 1 failed, 0 errored, 0 disabled, 0 warning(s) diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 88fa7ad0c..ec9cb0d83 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -195,7 +195,7 @@ declare begin l_reporter.set_reporter_id( 'd8a79e85915640a6a4e1698fdf90ba74' ); l_reporter.output_buffer.init(); - ut_runner.run (ut_varchar2_list ('ut3_tester','ut3$user#'), ut_reporters( l_reporter ) ); + ut_runner.run (ut_varchar2_list ('ut3_tester','ut3_user'), ut_reporters( l_reporter ) ); end; / ``` diff --git a/test/install_ut3_tester_helper.sql b/test/install_ut3_tester_helper.sql index d9aacdf36..b78221627 100644 --- a/test/install_ut3_tester_helper.sql +++ b/test/install_ut3_tester_helper.sql @@ -35,7 +35,7 @@ alter session set plsql_optimize_level=0; @@ut3_tester_helper/annotation_cache_helper.pks @@ut3_tester_helper/annotation_cache_helper.pkb create or replace synonym ut3_tester.annotation_cache_helper for ut3_tester_helper.annotation_cache_helper; -create or replace synonym ut3$user#.coverage_helper for ut3_tester_helper.coverage_helper; +create or replace synonym ut3_user.coverage_helper for ut3_tester_helper.coverage_helper; set linesize 200 set define on diff --git a/test/run_tests.sh b/test/run_tests.sh index 0edc4d96d..ae4a739d9 100755 --- a/test/run_tests.sh +++ b/test/run_tests.sh @@ -6,8 +6,12 @@ git rev-parse && cd "$(git rev-parse --show-cdup)" time utPLSQL-cli/bin/utplsql run ${UT3_TESTER_HELPER}/${UT3_TESTER_HELPER_PASSWORD}@${CONNECTION_STR} \ -source_path=source -owner=ut3_develop \ --p='ut3_tester,ut3$user#' \ +-p='ut3_tester,ut3_user' \ -test_path=test -c \ + -regex_expression="test/(\w+)(/(\w+))*/(\w+)\.(.{3})$" \ + -owner_subexpression=1 \ + -type_subexpression=5 \ + -name_subexpression=4 \ -f=ut_coverage_sonar_reporter -o=coverage.xml \ -f=ut_coverage_cobertura_reporter -o=cobertura.xml \ -f=ut_coverage_html_reporter -o=coverage.html \ diff --git a/test/ut3_tester/core/annotations/test_annotation_manager.pkb b/test/ut3_tester/core/annotations/test_annotation_manager.pkb index a5503f841..8eb3c2f6d 100644 --- a/test/ut3_tester/core/annotations/test_annotation_manager.pkb +++ b/test/ut3_tester/core/annotations/test_annotation_manager.pkb @@ -71,19 +71,19 @@ create or replace package body test_annotation_manager is exec_autonomous(q'[alter package dummy_test_package compile]'); end; - procedure create_parse_proc_as_ut3$user# is + procedure create_parse_proc_as_ut3_user is begin - ut3_tester_helper.main_helper.create_parse_proc_as_ut3$user#(); + ut3_tester_helper.main_helper.create_parse_proc_as_ut3_user(); end; - procedure parse_dummy_test_as_ut3$user# is + procedure parse_dummy_test_as_ut3_user is begin - ut3_tester_helper.main_helper.parse_dummy_test_as_ut3$user#(); + ut3_tester_helper.main_helper.parse_dummy_test_as_ut3_user(); end; - procedure drop_parse_proc_as_ut3$user# is + procedure drop_parse_proc_as_ut3_user is begin - ut3_tester_helper.main_helper.drop_parse_proc_as_ut3$user#(); + ut3_tester_helper.main_helper.drop_parse_proc_as_ut3_user(); exception when others then null; @@ -400,10 +400,10 @@ create or replace package body test_annotation_manager is l_start_date date; begin l_start_date := sysdate; - parse_dummy_test_as_ut3$user#(); + parse_dummy_test_as_ut3_user(); drop_dummy_test_package(); --Act - parse_dummy_test_as_ut3$user#(); + parse_dummy_test_as_ut3_user(); --Assert select count(1) into l_cache_count diff --git a/test/ut3_tester/core/annotations/test_annotation_manager.pks b/test/ut3_tester/core/annotations/test_annotation_manager.pks index 5d7464fd2..7207917f3 100644 --- a/test/ut3_tester/core/annotations/test_annotation_manager.pks +++ b/test/ut3_tester/core/annotations/test_annotation_manager.pks @@ -14,9 +14,9 @@ create or replace package test_annotation_manager is procedure create_dummy_test_package; - procedure create_parse_proc_as_ut3$user#; + procedure create_parse_proc_as_ut3_user; - procedure drop_parse_proc_as_ut3$user#; + procedure drop_parse_proc_as_ut3_user; procedure drop_dummy_test_package; @@ -85,8 +85,8 @@ create or replace package test_annotation_manager is procedure update_modified_test_package; --%test(Keeps annotations in cache when object was removed but user can't see whole schema) - --%beforetest(create_dummy_test_package,create_parse_proc_as_ut3$user#) - --%aftertest(drop_parse_proc_as_ut3$user#) + --%beforetest(create_dummy_test_package,create_parse_proc_as_ut3_user) + --%aftertest(drop_parse_proc_as_ut3_user) procedure keep_dropped_data_in_cache; --%test(Does not return data for dropped object) diff --git a/test/ut3_tester_helper/main_helper.pkb b/test/ut3_tester_helper/main_helper.pkb index 76245ea12..f1dadec66 100644 --- a/test/ut3_tester_helper/main_helper.pkb +++ b/test/ut3_tester_helper/main_helper.pkb @@ -104,26 +104,26 @@ create or replace package body main_helper is commit; end; - procedure create_parse_proc_as_ut3$user# is + procedure create_parse_proc_as_ut3_user is pragma autonomous_transaction; begin execute immediate q'[ - create or replace procedure ut3$user#.parse_annotations is + create or replace procedure ut3_user.parse_annotations is begin ut3_develop.ut_runner.rebuild_annotation_cache('UT3_TESTER','PACKAGE'); end;]'; end; - procedure drop_parse_proc_as_ut3$user# is + procedure drop_parse_proc_as_ut3_user is pragma autonomous_transaction; begin - execute immediate 'drop procedure ut3$user#.parse_annotations'; + execute immediate 'drop procedure ut3_user.parse_annotations'; end; - procedure parse_dummy_test_as_ut3$user# is + procedure parse_dummy_test_as_ut3_user is pragma autonomous_transaction; begin - execute immediate 'begin ut3$user#.parse_annotations; end;'; + execute immediate 'begin ut3_user.parse_annotations; end;'; end; procedure append_to_list(a_list in out nocopy ut3_develop.ut_varchar2_list, a_item varchar2) is diff --git a/test/ut3_tester_helper/main_helper.pks b/test/ut3_tester_helper/main_helper.pks index 6dd453446..7decad88d 100644 --- a/test/ut3_tester_helper/main_helper.pks +++ b/test/ut3_tester_helper/main_helper.pks @@ -29,11 +29,11 @@ create or replace package main_helper is procedure cleanup_annotation_cache; - procedure create_parse_proc_as_ut3$user#; + procedure create_parse_proc_as_ut3_user; - procedure drop_parse_proc_as_ut3$user#; + procedure drop_parse_proc_as_ut3_user; - procedure parse_dummy_test_as_ut3$user#; + procedure parse_dummy_test_as_ut3_user; procedure append_to_list(a_list in out nocopy ut3_develop.ut_varchar2_list, a_item varchar2); diff --git a/test/ut3_tester_helper/run_helper.pkb b/test/ut3_tester_helper/run_helper.pkb index c2a50170e..95f93f751 100644 --- a/test/ut3_tester_helper/run_helper.pkb +++ b/test/ut3_tester_helper/run_helper.pkb @@ -3,7 +3,7 @@ create or replace package body run_helper is procedure setup_cache_objects is pragma autonomous_transaction; begin - execute immediate q'[create or replace package ut3$user#.dummy_test_package as + execute immediate q'[create or replace package ut3_user.dummy_test_package as --%suite(dummy_test_suite) --%suitepath(some.path) --%rollback(manual) @@ -12,7 +12,7 @@ create or replace package body run_helper is --%beforetest(some_procedure) procedure some_dummy_test_procedure; end;]'; - execute immediate q'[create or replace procedure ut3$user#.dummy_test_procedure as + execute immediate q'[create or replace procedure ut3_user.dummy_test_procedure as --%some_annotation(some_text) --%rollback(manual) begin @@ -27,7 +27,7 @@ create or replace package body run_helper is execute immediate q'[grant execute on ut3_tester_helper.dummy_test_procedure to public]'; - execute immediate q'[create or replace package ut3$user#.bad_test_package as + execute immediate q'[create or replace package ut3_user.bad_test_package as --%rollback(manual) --%test(dummy_test) procedure some_dummy_test_procedure; @@ -37,7 +37,7 @@ create or replace package body run_helper is procedure setup_cache_objectstag is pragma autonomous_transaction; begin - execute immediate q'[create or replace package ut3$user#.dummy_test_package as + execute immediate q'[create or replace package ut3_user.dummy_test_package as --%suite(dummy_test_suite) --%suitepath(some.path) --%tags(dummy) @@ -48,7 +48,7 @@ create or replace package body run_helper is --%beforetest(some_procedure) procedure some_dummy_test_procedure; end;]'; - execute immediate q'[create or replace procedure ut3$user#.dummy_test_procedure as + execute immediate q'[create or replace procedure ut3_user.dummy_test_procedure as --%some_annotation(some_text) --%rollback(manual) begin @@ -67,7 +67,7 @@ create or replace package body run_helper is procedure setup_cache_twotags is pragma autonomous_transaction; begin - execute immediate q'[create or replace package ut3$user#.dummy_test_package as + execute immediate q'[create or replace package ut3_user.dummy_test_package as --%suite(dummy_test_suite) --%tags(suitetag1,suitetag2) --%rollback(manual) @@ -77,7 +77,7 @@ create or replace package body run_helper is --%beforetest(some_procedure) procedure some_dummy_test_procedure; end;]'; - execute immediate q'[create or replace procedure ut3$user#.dummy_test_procedure as + execute immediate q'[create or replace procedure ut3_user.dummy_test_procedure as --%some_annotation(some_text) --%rollback(manual) begin @@ -141,8 +141,8 @@ create or replace package body run_helper is pragma autonomous_transaction; begin setup_cache_objects(); - ut3_develop.ut_annotation_manager.rebuild_annotation_cache('UT3$USER#','PACKAGE'); - ut3_develop.ut_annotation_manager.rebuild_annotation_cache('UT3$USER#','PROCEDURE'); + ut3_develop.ut_annotation_manager.rebuild_annotation_cache('UT3_USER','PACKAGE'); + ut3_develop.ut_annotation_manager.rebuild_annotation_cache('UT3_USER','PROCEDURE'); ut3_develop.ut_annotation_manager.rebuild_annotation_cache('UT3_TESTER_HELPER','PROCEDURE'); end; @@ -150,10 +150,10 @@ create or replace package body run_helper is pragma autonomous_transaction; begin delete from ut3_develop.ut_annotation_cache_info - where object_type = 'PROCEDURE' and object_owner in ('UT3$USER#','UT3_TESTER_HELPER') + where object_type = 'PROCEDURE' and object_owner in ('UT3_USER','UT3_TESTER_HELPER') or object_type = 'PACKAGE' and object_owner = user and object_name = 'DUMMY_TEST_PACKAGE'; - execute immediate q'[drop package ut3$user#.dummy_test_package]'; - execute immediate q'[drop procedure ut3$user#.dummy_test_procedure]'; + execute immediate q'[drop package ut3_user.dummy_test_package]'; + execute immediate q'[drop procedure ut3_user.dummy_test_procedure]'; execute immediate q'[drop procedure ut3_tester_helper.dummy_test_procedure]'; end; @@ -185,7 +185,7 @@ create or replace package body run_helper is begin create_db_link; execute immediate q'[ - create or replace package ut3$user#.test_db_link is + create or replace package ut3_user.test_db_link is --%suite --%test @@ -193,7 +193,7 @@ create or replace package body run_helper is end;]'; execute immediate q'[ - create or replace package body ut3$user#.test_db_link is + create or replace package body ut3_user.test_db_link is procedure runs_with_db_link is a_value integer; begin @@ -208,7 +208,7 @@ create or replace package body run_helper is procedure db_link_cleanup is begin drop_db_link; - begin execute immediate 'drop package ut3$user#.test_db_link'; exception when others then null; end; + begin execute immediate 'drop package ut3_user.test_db_link'; exception when others then null; end; end; procedure create_suite_with_link is @@ -258,7 +258,7 @@ create or replace package body run_helper is execute immediate 'drop package test_distributed_savepoint'; end; - procedure create_ut3$user#_tests is + procedure create_ut3_user_tests is pragma autonomous_transaction; begin execute immediate q'[create or replace package test_package_1 is @@ -348,7 +348,7 @@ create or replace package body run_helper is execute immediate q'[grant execute on test_package_3 to public]'; end; - procedure drop_ut3$user#_tests is + procedure drop_ut3_user_tests is pragma autonomous_transaction; begin execute immediate q'[drop package test_package_1]'; diff --git a/test/ut3_tester_helper/run_helper.pks b/test/ut3_tester_helper/run_helper.pks index 0657c1a51..ad0f615e5 100644 --- a/test/ut3_tester_helper/run_helper.pks +++ b/test/ut3_tester_helper/run_helper.pks @@ -17,8 +17,8 @@ create or replace package run_helper is procedure create_suite_with_link; procedure drop_suite_with_link; - procedure create_ut3$user#_tests; - procedure drop_ut3$user#_tests; + procedure create_ut3_user_tests; + procedure drop_ut3_user_tests; procedure create_test_suite; procedure drop_test_suite; diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index b4f5a5238..7b47193c9 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -13,14 +13,14 @@ create or replace package body test_ut_run is ut3_tester_helper.main_helper.clear_expectations(); end; - procedure create_ut3$user#_tests is + procedure create_ut3_user_tests is begin - ut3_tester_helper.run_helper.create_ut3$user#_tests(); + ut3_tester_helper.run_helper.create_ut3_user_tests(); end; - procedure drop_ut3$user#_tests is + procedure drop_ut3_user_tests is begin - ut3_tester_helper.run_helper.drop_ut3$user#_tests(); + ut3_tester_helper.run_helper.drop_ut3_user_tests(); end; procedure ut_version is @@ -257,7 +257,7 @@ create or replace package body test_ut_run is ut.expect(l_results).to_be_like( '%1) does_stuff%' || 'ORA-01403: no data found%' || - 'ORA-06512: at "UT3$USER#.PARENT_SUITE%' + 'ORA-06512: at "UT3_USER.PARENT_SUITE%' ); end; diff --git a/test/ut3_user/api/test_ut_run.pks b/test/ut3_user/api/test_ut_run.pks index 753af79da..b3be8700d 100644 --- a/test/ut3_user/api/test_ut_run.pks +++ b/test/ut3_user/api/test_ut_run.pks @@ -4,8 +4,8 @@ create or replace package test_ut_run is procedure clear_expectations; - procedure create_ut3$user#_tests; - procedure drop_ut3$user#_tests; + procedure create_ut3_user_tests; + procedure drop_ut3_user_tests; --%test(ut.version() returns version of the framework) procedure ut_version; @@ -17,8 +17,8 @@ create or replace package test_ut_run is --%context(ut_run_procedure) --%displayname(ut.run() procedure options) - --%beforeall(create_ut3$user#_tests) - --%afterall(drop_ut3$user#_tests) + --%beforeall(create_ut3_user_tests) + --%afterall(drop_ut3_user_tests) --%test(Runs all tests in current schema with default reporter when no parameters given) procedure run_proc_no_params; @@ -88,8 +88,8 @@ create or replace package test_ut_run is --%context(ut_run_function) --%displayname(ut.run() function options) - --%beforeall(create_ut3$user#_tests) - --%afterall(drop_ut3$user#_tests) + --%beforeall(create_ut3_user_tests) + --%afterall(drop_ut3_user_tests) --%test(Runs all tests in current schema with default reporter when no parameters given) procedure run_func_no_params; @@ -167,8 +167,8 @@ create or replace package test_ut_run is --%context(random_order) --%displayname(Random test execution order) - --%beforeall(create_ut3$user#_tests) - --%afterall(drop_ut3$user#_tests) + --%beforeall(create_ut3_user_tests) + --%afterall(drop_ut3_user_tests) --%test(Runs tests in random order) procedure run_with_random_order; @@ -184,8 +184,8 @@ create or replace package test_ut_run is --%context(run with tags) --%displayname(Call ut.run with #tags) - --%beforeall(create_ut3$user#_tests) - --%afterall(drop_ut3$user#_tests) + --%beforeall(create_ut3_user_tests) + --%afterall(drop_ut3_user_tests) --%test(Execute test by tag ut_run) procedure test_run_by_one_tag; diff --git a/test/ut3_user/api/test_ut_runner.pkb b/test/ut3_user/api/test_ut_runner.pkb index a24fc2d51..6774698f2 100644 --- a/test/ut3_user/api/test_ut_runner.pkb +++ b/test/ut3_user/api/test_ut_runner.pkb @@ -265,27 +265,27 @@ end;'; --Arrange open l_expected for select - 'UT3$USER#' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'DUMMY_TEST_PACKAGE' item_name, + 'UT3_USER' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'DUMMY_TEST_PACKAGE' item_name, 'dummy_test_suite' item_description, 'UT_SUITE' item_type, 2 item_line_no, 'some.path.dummy_test_package' path, 0 disabled_flag, null disabled_reason,null tags from dual union all select - 'UT3$USER#' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'SOME_DUMMY_TEST_PROCEDURE' item_name, + 'UT3_USER' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'SOME_DUMMY_TEST_PROCEDURE' item_name, 'dummy_test' item_description, 'UT_TEST' item_type, 6 item_line_no, 'some.path.dummy_test_package.some_dummy_test_procedure' path, 0 disabled_flag, null disabled_reason,null tags from dual union all select - 'UT3$USER#' object_owner, 'PATH' object_name, 'PATH' item_name, + 'UT3_USER' object_owner, 'PATH' object_name, 'PATH' item_name, null item_description, 'UT_LOGICAL_SUITE' item_type, null item_line_no, 'some.path' path, 0 disabled_flag, null disabled_reason, null tags from dual union all select - 'UT3$USER#' object_owner, 'SOME' object_name, 'SOME' item_name, + 'UT3_USER' object_owner, 'SOME' object_name, 'SOME' item_name, null item_description, 'UT_LOGICAL_SUITE' item_type, null item_line_no, 'some' path, 0 disabled_flag, null disabled_reason, null tags from dual; --Act - open l_actual for select * from table(ut3_develop.ut_runner.get_suites_info('UT3$USER#','DUMMY_TEST_PACKAGE')); + open l_actual for select * from table(ut3_develop.ut_runner.get_suites_info('UT3_USER','DUMMY_TEST_PACKAGE')); --Assert ut.expect(l_actual).to_equal(l_expected); end; @@ -297,27 +297,27 @@ end;'; --Arrange open l_expected for select - 'UT3$USER#' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'DUMMY_TEST_PACKAGE' item_name, + 'UT3_USER' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'DUMMY_TEST_PACKAGE' item_name, 'dummy_test_suite' item_description, 'UT_SUITE' item_type, 2 item_line_no, 'some.path.dummy_test_package' path, 0 disabled_flag, null disabled_reason,'dummy' tags from dual union all select - 'UT3$USER#' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'SOME_DUMMY_TEST_PROCEDURE' item_name, + 'UT3_USER' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'SOME_DUMMY_TEST_PROCEDURE' item_name, 'dummy_test' item_description, 'UT_TEST' item_type, 7 item_line_no, 'some.path.dummy_test_package.some_dummy_test_procedure' path, 0 disabled_flag, null disabled_reason,'testtag' tags from dual union all select - 'UT3$USER#' object_owner, 'PATH' object_name, 'PATH' item_name, + 'UT3_USER' object_owner, 'PATH' object_name, 'PATH' item_name, null item_description, 'UT_LOGICAL_SUITE' item_type, null item_line_no, 'some.path' path, 0 disabled_flag, null disabled_reason, null tags from dual union all select - 'UT3$USER#' object_owner, 'SOME' object_name, 'SOME' item_name, + 'UT3_USER' object_owner, 'SOME' object_name, 'SOME' item_name, null item_description, 'UT_LOGICAL_SUITE' item_type, null item_line_no, 'some' path, 0 disabled_flag, null disabled_reason, null tags from dual; --Act - open l_actual for select * from table(ut3_develop.ut_runner.get_suites_info('UT3$USER#','DUMMY_TEST_PACKAGE')); + open l_actual for select * from table(ut3_develop.ut_runner.get_suites_info('UT3_USER','DUMMY_TEST_PACKAGE')); --Assert ut.expect(l_actual).to_equal(l_expected); end; @@ -329,12 +329,12 @@ end;'; --Arrange open l_expected for select - 'UT3$USER#' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'DUMMY_TEST_PACKAGE' item_name, + 'UT3_USER' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'DUMMY_TEST_PACKAGE' item_name, 'dummy_test_suite' item_description, 'UT_SUITE' item_type, 2 item_line_no, 'dummy_test_package' path, 0 disabled_flag, null disabled_reason,'suitetag1,suitetag2' tags from dual union all select - 'UT3$USER#' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'SOME_DUMMY_TEST_PROCEDURE' item_name, + 'UT3_USER' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'SOME_DUMMY_TEST_PROCEDURE' item_name, 'dummy_test' item_description, 'UT_TEST' item_type, 6 item_line_no, 'dummy_test_package.some_dummy_test_procedure' path, 0 disabled_flag, null disabled_reason,'testtag1,testtag2' tags from dual; diff --git a/test/ut3_user/expectations.pkb b/test/ut3_user/expectations.pkb index 30af48a44..be8627712 100644 --- a/test/ut3_user/expectations.pkb +++ b/test/ut3_user/expectations.pkb @@ -16,14 +16,14 @@ create or replace package body expectations as l_expected := q'[FAILURE Actual: 1 (number) was expected to equal: 0 (number) - at "UT3$USER#.SOME_PKG%", line 4 ut3_develop.ut.expect(1).to_equal(0); + at "UT3_USER.SOME_PKG%", line 4 ut3_develop.ut.expect(1).to_equal(0); at "anonymous block", line 1 - at "UT3$USER#.EXPECTATIONS%", line 10 + at "UT3_USER.EXPECTATIONS%", line 10 SUCCESS Actual: 0 (number) was expected to equal: 0 (number) FAILURE Actual: 1 (number) was expected to equal: 0 (number) - at "UT3$USER#.EXPECTATIONS%", line 11 ut3_develop.ut.expect(1).to_equal(0); + at "UT3_USER.EXPECTATIONS%", line 11 ut3_develop.ut.expect(1).to_equal(0); SUCCESS Actual: 0 (number) was expected to equal: 0 (number) ]'; diff --git a/test/ut3_user/reporters.pkb b/test/ut3_user/reporters.pkb index 76d345a3d..b6d43b144 100644 --- a/test/ut3_user/reporters.pkb +++ b/test/ut3_user/reporters.pkb @@ -188,7 +188,7 @@ end;]'; --Assert ut.expect(l_actual).to_be_like('%' (varchar2)%]' - ||q'[at "UT3$USER#.CHECK_FAIL_ESCAPE%", line % ut3_develop.ut.expect('test').to_equal('');]' + ||q'[at "UT3_USER.CHECK_FAIL_ESCAPE%", line % ut3_develop.ut.expect('test').to_equal('');]' ||'%]]>%' ); end; diff --git a/test/ut3_user/reporters/test_documentation_reporter.pkb b/test/ut3_user/reporters/test_documentation_reporter.pkb index a627d26b4..6ace70c49 100644 --- a/test/ut3_user/reporters/test_documentation_reporter.pkb +++ b/test/ut3_user/reporters/test_documentation_reporter.pkb @@ -33,12 +33,12 @@ Failures: 1) failing_test "Fails as values are different" Actual: 'number [1] ' (varchar2) was expected to equal: 'number [2] ' (varchar2)% - at "UT3$USER#.TEST_REPORTERS%", line 36 ut3_develop.ut.expect('number [1] ','Fails as values are different').to_equal('number [2] '); + at "UT3_USER.TEST_REPORTERS%", line 36 ut3_develop.ut.expect('number [1] ','Fails as values are different').to_equal('number [2] '); % % 2) erroring_test ORA-06502: PL/SQL: numeric or value error: character to number conversion error - ORA-06512: at "UT3$USER#.TEST_REPORTERS", line 44% + ORA-06512: at "UT3_USER.TEST_REPORTERS", line 44% ORA-06512: at line 6 Finished in % seconds 5 tests, 1 failed, 1 errored, 2 disabled, 0 warning(s)%]'; diff --git a/test/ut3_user/reporters/test_teamcity_reporter.pkb b/test/ut3_user/reporters/test_teamcity_reporter.pkb index 6d471b2b0..ff550e488 100644 --- a/test/ut3_user/reporters/test_teamcity_reporter.pkb +++ b/test/ut3_user/reporters/test_teamcity_reporter.pkb @@ -45,29 +45,29 @@ create or replace package body test_teamcity_reporter as %##teamcity[testSuiteStarted timestamp='%' name='org.utplsql.tests.helpers'] %##teamcity[testSuiteStarted timestamp='%' name='A suite for testing different outcomes from reporters'] %##teamcity[testSuiteStarted timestamp='%' name='A description of some context'] -%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3$user#.test_reporters.passing_test'] +%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3_user.test_reporters.passing_test'] -%##teamcity[testFinished timestamp='%' duration='%' name='ut3$user#.test_reporters.passing_test'] +%##teamcity[testFinished timestamp='%' duration='%' name='ut3_user.test_reporters.passing_test'] %##teamcity[testSuiteFinished timestamp='%' name='A description of some context'] -%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3$user#.test_reporters.failing_test'] +%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3_user.test_reporters.failing_test'] -%##teamcity[testFailed timestamp='%' details='Actual: |'number |[1|] |' (varchar2) was expected to equal: |'number |[2|] |' (varchar2)' message='Fails as values are different' name='ut3$user#.test_reporters.failing_test'] -%##teamcity[testFinished timestamp='%' duration='%' name='ut3$user#.test_reporters.failing_test'] -%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3$user#.test_reporters.erroring_test'] +%##teamcity[testFailed timestamp='%' details='Actual: |'number |[1|] |' (varchar2) was expected to equal: |'number |[2|] |' (varchar2)' message='Fails as values are different' name='ut3_user.test_reporters.failing_test'] +%##teamcity[testFinished timestamp='%' duration='%' name='ut3_user.test_reporters.failing_test'] +%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3_user.test_reporters.erroring_test'] -%##teamcity[testStdErr timestamp='%' name='ut3$user#.test_reporters.erroring_test' out='Test exception:|nORA-06502: PL/SQL: numeric or value error: character to number conversion error|nORA-06512: at "UT3$USER#.TEST_REPORTERS", line %|nORA-06512: at %|n'] -%##teamcity[testFailed timestamp='%' details='Test exception:|nORA-06502: PL/SQL: numeric or value error: character to number conversion error|nORA-06512: at "UT3$USER#.TEST_REPORTERS", line %|nORA-06512: at %|n' message='Error occured' name='ut3$user#.test_reporters.erroring_test'] -%##teamcity[testFinished timestamp='%' duration='%' name='ut3$user#.test_reporters.erroring_test'] -%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3$user#.test_reporters.disabled_test'] -%##teamcity[testIgnored timestamp='%' name='ut3$user#.test_reporters.disabled_test'] +%##teamcity[testStdErr timestamp='%' name='ut3_user.test_reporters.erroring_test' out='Test exception:|nORA-06502: PL/SQL: numeric or value error: character to number conversion error|nORA-06512: at "UT3_USER.TEST_REPORTERS", line %|nORA-06512: at %|n'] +%##teamcity[testFailed timestamp='%' details='Test exception:|nORA-06502: PL/SQL: numeric or value error: character to number conversion error|nORA-06512: at "UT3_USER.TEST_REPORTERS", line %|nORA-06512: at %|n' message='Error occured' name='ut3_user.test_reporters.erroring_test'] +%##teamcity[testFinished timestamp='%' duration='%' name='ut3_user.test_reporters.erroring_test'] +%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3_user.test_reporters.disabled_test'] +%##teamcity[testIgnored timestamp='%' name='ut3_user.test_reporters.disabled_test'] %##teamcity[testSuiteFinished timestamp='%' name='A suite for testing different outcomes from reporters'] %##teamcity[testSuiteFinished timestamp='%' name='org.utplsql.tests.helpers'] %##teamcity[testSuiteFinished timestamp='%' name='org.utplsql.tests'] @@ -88,9 +88,9 @@ create or replace package body test_teamcity_reporter as l_expected varchar2(32767); begin l_expected := q'{%##teamcity[testSuiteStarted timestamp='%' name='A suite with |'quote|''] -%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3$user#.check_escape_special_chars.test_do_stuff'] -%##teamcity[testFailed timestamp='%' details='Actual: (varchar2)|n |' |[ |r|n |] |'|n was expected to be null' name='ut3$user#.check_escape_special_chars.test_do_stuff'] -%##teamcity[testFinished timestamp='%' duration='%' name='ut3$user#.check_escape_special_chars.test_do_stuff'] +%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3_user.check_escape_special_chars.test_do_stuff'] +%##teamcity[testFailed timestamp='%' details='Actual: (varchar2)|n |' |[ |r|n |] |'|n was expected to be null' name='ut3_user.check_escape_special_chars.test_do_stuff'] +%##teamcity[testFinished timestamp='%' duration='%' name='ut3_user.check_escape_special_chars.test_do_stuff'] %##teamcity[testSuiteFinished timestamp='%' name='A suite with |'quote|'']}'; --act select * @@ -107,9 +107,9 @@ create or replace package body test_teamcity_reporter as l_expected varchar2(32767); begin l_expected := q'{%##teamcity[testSuiteStarted timestamp='%' name='check_trims_long_output'] -%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3$user#.check_trims_long_output.long_output'] -%##teamcity[testFailed timestamp='%' details='Actual: (varchar2)|n |'aVarcharaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|[...|]' name='ut3$user#.check_trims_long_output.long_output'] -%##teamcity[testFinished timestamp='%' duration='%' name='ut3$user#.check_trims_long_output.long_output'] +%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3_user.check_trims_long_output.long_output'] +%##teamcity[testFailed timestamp='%' details='Actual: (varchar2)|n |'aVarcharaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|[...|]' name='ut3_user.check_trims_long_output.long_output'] +%##teamcity[testFinished timestamp='%' duration='%' name='ut3_user.check_trims_long_output.long_output'] %##teamcity[testSuiteFinished timestamp='%' name='check_trims_long_output']}'; --act select * From 7cca6b468bc31194f2ecd0d9b2812982037c0578 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 3 Mar 2022 00:58:59 +0200 Subject: [PATCH 0923/1096] Update of coverage.md --- docs/userguide/coverage.md | 73 +++++++++++++++++++++++++++----------- 1 file changed, 53 insertions(+), 20 deletions(-) diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 20210ab47..cdc573758 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -32,18 +32,19 @@ If you have `execute` privilege on the code that is being tested, but do not hav If you have `execute` privilege only on the unit tests, but do not have `execute` privilege on the code that is being tested, the code will not be reported by coverage - as if it did not exist in the database. If the code that is being tested is compiled as NATIVE, the code coverage will not be reported as well. -## Running unit tests with coverage -Using the code coverage functionality is as easy as using any other [reporter](reporters.md) for the utPLSQL test-run. You just run your tests from your preferred SQL tool and save the reporter results to a file. -All you need to do is pass the constructor of the reporter to the `ut.run` procedure call. +## Manually running unit tests with coverage +Using the code coverage functionality is as easy as using any other [reporter](reporters.md) for the utPLSQL test-run. Run your tests from your preferred SQL tool and save the reporter results to a file. +All you need to do, is pass the constructor of the reporter to the `ut.run` procedure call. Example: ```sql +set serveroutput on begin ut.run(ut_coverage_html_reporter()); end; / ``` -The above command executes all unit tests in the **current schema**, gathers information about code coverage and outputs the HTML report as text into DBMS_OUTPUT. +The above command executes all unit tests in the **current schema**, gathers information about code coverage for all sources in that schema and outputs the HTML report as text into DBMS_OUTPUT. The `ut_coverage_html_reporter` will produce an interactive HTML report. You can see a sample of code coverage for the utPLSQL project [here](https://utplsql.github.io/utPLSQL-coverage-html/) The report provides summary information with a list of source code that should be covered. @@ -79,14 +80,14 @@ There are two distinct ways to gather code coverage: - Coverage on project files Those two options are mutually exclusive and cannot be mixed. -By default, when using one of coverage reporters, coverage is gathered on schema(s). +By default, when using one of coverage reporters, coverage is gathered on schema(s). +The database schema(s) containing the tests that were executed during the run will be reported on by coverage reporter. The parameters used to execute tests determine if utPLSQL will be using one approach or the other. +If parameter `a_source_file_mappings` or `a_source_files` is provided, then coverage is gathered on project files provided, otherwise coverage is gathered on schemas. -The database schema(s) containing the tests that were executed during the run will be reported on by coverage reporter. **Note** - > Regardless of the options provided, all unit test packages are excluded from the coverage report. Coverage reports provide information only about the **tested** code. The default behavior of coverage reporting can be altered using invocation parameters. @@ -131,10 +132,10 @@ exec ut.run('unit_test_schema', ut_coverage_html_reporter(), a_coverage_schemes There are multiple parameters that can be used to define the scope of coverage report: - `a_source_file_mappings ( ut_file_mappings )` - map of filenames to database objects. It is used for file-based coverage - see below. -- `a_include_schema_expr ( varchar(4000) )` - string of regex expression of schemas to be included in the coverage report. -- `a_include_object_expr ( varchar(4000) )` - string of regex expression of objects ( without schema name ) to be included in the coverage report. -- `a_exclude_schema_expr ( varchar(4000) )` - string of regex expression of schemas to be excluded from the coverage report. -- `a_exclude_object_expr ( varchar(4000) )` - string of regex expression of objects to be excluded from the coverage report. +- `a_include_schema_expr ( varchar(4000) )` - string of regex expression of schemas to be included in the coverage report. Case-insensitive. +- `a_include_object_expr ( varchar(4000) )` - string of regex expression of objects ( without schema name ) to be included in the coverage report. Case-insensitive. +- `a_exclude_schema_expr ( varchar(4000) )` - string of regex expression of schemas to be excluded from the coverage report. Case-insensitive. +- `a_exclude_object_expr ( varchar(4000) )` - string of regex expression of objects ( without schema name ) to be excluded from the coverage report. Case-insensitive. - `a_coverage_schemes ( ut_varchar2_list )` - List of database schema names to gather coverage on. - `a_include_objects ( ut_varchar2_list )` - list of `[object_owner.]object_name` to be included in the coverage report. - `a_exclude_objects ( ut_varchar2_list )` - list of `[object_owner.]object_name` to be excluded from the coverage report. @@ -164,6 +165,7 @@ end; ``` Will result in showing coverage for all schemas that match regular expression `^ut3_develop` +Example: Limiting coverage by schema regex with parameter `a_include_objects` ignored. ```sql begin ut.run(ut_varchar2_list('user_1','user_2'), ut_coverage_html_reporter(), @@ -172,37 +174,68 @@ begin end; ``` Will result in showing coverage for all schemas that match regular expression `^ut3_develop`. -Will ignore the `a_include_objects` parameter +Example: Limiting coverage by object regex. ```sql begin ut.run(ut_varchar2_list('user_1','user_2'), ut_coverage_html_reporter(), - a_include_object_expr => 'regex123', a_include_objects => ut_varchar2_list( 'ut3_tester_helper.regex_dummy_cov' ) + a_include_object_expr => 'regex123' ); end; ``` Will result in showing coverage for all objects that name match regular expression `regex123`. -Will ignore the `a_include_objects` parameter. +Example: Limiting coverage by object regex with parameter `a_include_objects` ignored. +```sql +begin + ut.run(ut_varchar2_list('user_1','user_2'), ut_coverage_html_reporter(), + a_include_object_expr => 'utl', a_include_objects => ut_varchar2_list( 'user_2.utils_package' ) + ); +end; +``` +Will result in showing coverage for all objects that name match regular expression `utl`. + +Example: Limiting coverage by excluding schema with regex. +```sql +begin + ut.run(ut_varchar2_list('user_1','user_2'), ut_coverage_html_reporter(), + a_exclude_schema_expr => 'er_1$' + ); +end; +``` +Will result in showing coverage for objects in all schema except schemas that are matching regular expression `er_1$` + +Example: Limiting coverage by excluding schema with regex and excluding specific object. +```sql +begin + ut.run(ut_varchar2_list('user_1','user_2'), ut_coverage_html_reporter(), + a_exclude_schema_expr => 'er_1$', a_exclude_objects => ut_varchar2_list( 'user_2.utils_package' ) + ); +end; +``` +Will result in showing coverage for objects in all schemas except schemas that are matching regular expression `er_1$` +Will also exclude object `user_2.utils_package` from coverage report + +Example: Limiting coverage by excluding objects with regex. ```sql begin ut.run(ut_varchar2_list('user_1','user_2'), ut_coverage_html_reporter(), - a_exclude_schema_expr => '^ut3_tester', a_exclude_objects => ut_varchar2_list( 'regex_dummy_cov' ) + a_exclude_object_expr => 'utl' ); end; ``` -Will result in showing coverage for objects in all schema except schemas that are matching regular expression `^ut3_tester` -Will ignore exclusion defined by parameter `a_exclude_objects` +Will result in showing coverage for all objects that name is not matching regular expression `utl`. +Example: Limiting coverage by excluding objects with regex with parameter `a_exclude_objects` ignored. ```sql begin ut.run(ut_varchar2_list('user_1','user_2'), ut_coverage_html_reporter(), - a_exclude_object_expr => 'regex123', a_exclude_objects => ut_varchar2_list( 'regex_dummy_cov' ) + a_exclude_object_expr => 'utl', a_exclude_objects => ut_varchar2_list( 'user_2.utils_package' ) ); end; ``` -Will result in showing coverage for all objects that name is not matching regular expression `regex123`. -Will ignore exclusion defined by parameter `a_exclude_objects`. +Will result in showing coverage for all objects that name is not matching regular expression `utl`. +Will also exclude object `user_2.utils_package` from coverage report Example: Limiting coverage by object name, for tested code located in the same schema as the unit tests. From a0462a7584113c494d37fd2c6ceb1bbfec404b35 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 3 Mar 2022 01:12:55 +0200 Subject: [PATCH 0924/1096] Fixing tests after schema rename. Make sure SONAR runs, even if build fails. --- .github/workflows/build.yml | 2 +- test/ut3_user/api/test_ut_run.pkb | 2 +- test/ut3_user/api/test_ut_runner.pkb | 28 +++++++++---------- .../expectations/test_expectations_cursor.pkb | 4 +-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 816f0ab39..a0aae6b64 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -193,7 +193,7 @@ jobs: - name: SonarCloud Scan id: sonar - if: ${{ matrix.db_version_name == '21XE' }} + if: ${{ always() && matrix.db_version_name == '21XE' }} uses: SonarSource/sonarcloud-github-action@master env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index 7b47193c9..492efcba2 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -625,7 +625,7 @@ Failures:% begin execute immediate q'[select count(1) from all_objects o where o.owner = :object_owner and o.object_type = 'PACKAGE' and o.status = 'INVALID' and o.object_name= :object_name]' into l_is_invalid - using 'UT3$USER#','INVALID_PCKAG_THAT_REVALIDATES'; + using 'UT3_USER','INVALID_PCKAG_THAT_REVALIDATES'; select * bulk collect into l_results from table(ut3_develop.ut.run('invalid_pckag_that_revalidates')); diff --git a/test/ut3_user/api/test_ut_runner.pkb b/test/ut3_user/api/test_ut_runner.pkb index 6774698f2..80b1cd60b 100644 --- a/test/ut3_user/api/test_ut_runner.pkb +++ b/test/ut3_user/api/test_ut_runner.pkb @@ -339,7 +339,7 @@ end;'; 'dummy_test_package.some_dummy_test_procedure' path, 0 disabled_flag, null disabled_reason,'testtag1,testtag2' tags from dual; --Act - open l_actual for select * from table(ut3_develop.ut_runner.get_suites_info('UT3$USER#','DUMMY_TEST_PACKAGE')); + open l_actual for select * from table(ut3_develop.ut_runner.get_suites_info('UT3_USER','DUMMY_TEST_PACKAGE')); --Assert ut.expect(l_actual).to_equal(l_expected); end; @@ -571,20 +571,20 @@ end;'; begin ut.expect( ut3_develop.ut_runner.is_test( - a_owner => 'UT3$USER#', + a_owner => 'UT3_USER', a_package_name => 'DUMMY_TEST_PACKAGE', a_procedure_name => 'SOME_DUMMY_TEST_PROCEDURE' ) ).to_be_true(); - ut.expect( ut3_develop.ut_runner.is_test( 'ut3$user#','dummy_test_package','some_dummy_test_procedure' ) ).to_be_true(); + ut.expect( ut3_develop.ut_runner.is_test( 'ut3_user','dummy_test_package','some_dummy_test_procedure' ) ).to_be_true(); end; procedure is_test_false is begin - ut.expect( ut3_develop.ut_runner.is_test( 'UT3$USER#','DUMMY_TEST_PACKAGE', 'BAD' ) ).to_be_false(); - ut.expect( ut3_develop.ut_runner.is_test( 'UT3$USER#','BAD_TEST_PACKAGE', 'some_dummy_test_procedure' ) ).to_be_false(); - ut.expect( ut3_develop.ut_runner.is_test( 'UT3$USER#','DUMMY_TEST_PACKAGE', null ) ).to_be_false(); - ut.expect( ut3_develop.ut_runner.is_test( 'UT3$USER#',null,'some_dummy_test_procedure' ) ).to_be_false(); + ut.expect( ut3_develop.ut_runner.is_test( 'UT3_USER','DUMMY_TEST_PACKAGE', 'BAD' ) ).to_be_false(); + ut.expect( ut3_develop.ut_runner.is_test( 'UT3_USER','BAD_TEST_PACKAGE', 'some_dummy_test_procedure' ) ).to_be_false(); + ut.expect( ut3_develop.ut_runner.is_test( 'UT3_USER','DUMMY_TEST_PACKAGE', null ) ).to_be_false(); + ut.expect( ut3_develop.ut_runner.is_test( 'UT3_USER',null,'some_dummy_test_procedure' ) ).to_be_false(); ut.expect( ut3_develop.ut_runner.is_test( null,'DUMMY_TEST_PACKAGE','some_dummy_test_procedure' ) ).to_be_false(); end; @@ -592,26 +592,26 @@ end;'; begin ut.expect( ut3_develop.ut_runner.is_suite( - a_owner => 'UT3$USER#', + a_owner => 'UT3_USER', a_package_name => 'DUMMY_TEST_PACKAGE' ) ).to_be_true(); - ut.expect( ut3_develop.ut_runner.is_suite( 'ut3$user#','dummy_test_package' ) ).to_be_true(); + ut.expect( ut3_develop.ut_runner.is_suite( 'ut3_user','dummy_test_package' ) ).to_be_true(); end; procedure is_suite_false is begin - ut.expect( ut3_develop.ut_runner.is_suite( 'UT3$USER#','BAD' ) ).to_be_false(); - ut.expect( ut3_develop.ut_runner.is_suite( 'UT3$USER#', null ) ).to_be_false(); + ut.expect( ut3_develop.ut_runner.is_suite( 'UT3_USER','BAD' ) ).to_be_false(); + ut.expect( ut3_develop.ut_runner.is_suite( 'UT3_USER', null ) ).to_be_false(); ut.expect( ut3_develop.ut_runner.is_suite( null,'DUMMY_TEST_PACKAGE' ) ).to_be_false(); - ut.expect( ut3_develop.ut_runner.is_suite( 'UT3$USER#','bad_test_package' ) ).to_be_false(); + ut.expect( ut3_develop.ut_runner.is_suite( 'UT3_USER','bad_test_package' ) ).to_be_false(); end; procedure has_suites_true is begin - ut.expect( ut3_develop.ut_runner.has_suites( a_owner => 'UT3$USER#' ) ).to_be_true(); - ut.expect( ut3_develop.ut_runner.has_suites( 'ut3$user#' ) ).to_be_true(); + ut.expect( ut3_develop.ut_runner.has_suites( a_owner => 'UT3_USER' ) ).to_be_true(); + ut.expect( ut3_develop.ut_runner.has_suites( 'ut3_user' ) ).to_be_true(); end; procedure has_suites_false is diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index 409c81ace..952084fd3 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -2507,7 +2507,7 @@ Diff:% begin l_exp_message :='ORA-20218: SQL exception thrown when fetching data from cursor: ORA-01476: divisor is equal to zero -at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line % ut3_develop.ut.expect(l_actual).to_equal(l_expected);% +at "UT3_USER.TEST_EXPECTATIONS_CURSOR%", line % ut3_develop.ut.expect(l_actual).to_equal(l_expected);% Check the query and data for errors.'; open l_actual for @@ -2532,7 +2532,7 @@ Check the query and data for errors.'; l_exp_message :='ORA-20218: SQL exception thrown when fetching data from cursor: ORA-01476: divisor is equal to zero -at "UT3$USER#.TEST_EXPECTATIONS_CURSOR%", line % ut3_develop.ut.expect(l_actual).to_equal(l_expected);% +at "UT3_USER.TEST_EXPECTATIONS_CURSOR%", line % ut3_develop.ut.expect(l_actual).to_equal(l_expected);% Check the query and data for errors.'; open l_expected for From 25336385a0d7192d704fcfe67860f5efd5af5d24 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 3 Mar 2022 01:17:09 +0200 Subject: [PATCH 0925/1096] Update coverage.md --- docs/userguide/coverage.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index cdc573758..664c972d1 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -130,7 +130,7 @@ exec ut.run('unit_test_schema', ut_coverage_html_reporter(), a_coverage_schemes #### Filtering objects in coverage reports -There are multiple parameters that can be used to define the scope of coverage report: +Multiple parameters can be used to define the scope of coverage report. - `a_source_file_mappings ( ut_file_mappings )` - map of filenames to database objects. It is used for file-based coverage - see below. - `a_include_schema_expr ( varchar(4000) )` - string of regex expression of schemas to be included in the coverage report. Case-insensitive. - `a_include_object_expr ( varchar(4000) )` - string of regex expression of objects ( without schema name ) to be included in the coverage report. Case-insensitive. From 79fcf85bf07b4694f34c2d6821b8694233427226 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 2 Mar 2022 23:54:33 +0000 Subject: [PATCH 0926/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 002c7ee3b..718422bd7 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index fa782b2ad..dce7a66bd 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 400ead44a..73bb5df36 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 11beecd51..c11655c2f 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 89c4b41b4..cec5f8eb4 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index d7c5b6bb0..420c72cfe 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index c36b06450..c7f1f152f 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 35485e4db..cf2e1cc1c 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 664c972d1..6415b538d 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index dbd70d9a0..f4cc81754 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 96fd4e2c4..71311c2c9 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 548994f5b..6e29a82da 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 88b4d0942..6a7562b8c 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 6140f2cc7..7a164257c 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index a6f37d0a6..3b8510f89 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 88fa7ad0c..538d2be49 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 1cc6dd58b..825c122cf 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3908--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index a19bd82dd..c233b22f7 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.13.3908-develop'; + gc_version constant varchar2(50) := 'v3.1.13.3931-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From ed936458138849bd4c38009cc45ea75f05fe0b1d Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 4 Mar 2022 00:48:22 +0200 Subject: [PATCH 0927/1096] Fixing stability of data setup rename of test_package_3 to testing_package_3 to avoid odd behavior on 11g --- .../annotations/test_annot_disabled_reason.pkb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/test/ut3_tester/core/annotations/test_annot_disabled_reason.pkb b/test/ut3_tester/core/annotations/test_annot_disabled_reason.pkb index e3df44425..7f1e068a8 100644 --- a/test/ut3_tester/core/annotations/test_annot_disabled_reason.pkb +++ b/test/ut3_tester/core/annotations/test_annot_disabled_reason.pkb @@ -115,7 +115,7 @@ end test_package_2;]'; end test_package_2;]'; - execute immediate q'[create or replace package test_package_3 is + execute immediate q'[create or replace package testing_package_3 is --%suite --%displayname(Disable tests on test level) @@ -144,9 +144,9 @@ end test_package_2;]'; --%endcontext -end test_package_3;]'; +end testing_package_3;]'; - execute immediate q'[create or replace package body test_package_3 is + execute immediate q'[create or replace package body testing_package_3 is procedure test1 is begin @@ -168,7 +168,7 @@ end test_package_3;]'; ut.expect(2).to_equal(2); end; -end test_package_3;]'; +end testing_package_3;]'; execute immediate q'[create or replace package test_package_4 is @@ -334,10 +334,10 @@ end test_package_6;]'; begin execute immediate 'drop package test_package_1'; execute immediate 'drop package test_package_2'; - execute immediate 'drop package test_package_3'; - execute immediate 'drop package test_package_4'; - execute immediate 'drop package test_package_5'; - execute immediate 'drop package test_package_6'; + execute immediate 'drop package testing_package_3'; + execute immediate 'drop package test_package_4'; + execute immediate 'drop package test_package_5'; + execute immediate 'drop package test_package_6'; end; procedure test_disable_on_suite_level is @@ -394,7 +394,7 @@ end test_package_6;]'; begin --Act - select * bulk collect into l_test_results from table(ut3_develop.ut.run((sys_context('USERENV', 'CURRENT_USER')||'.test_package_3'))); + select * bulk collect into l_test_results from table(ut3_develop.ut.run((sys_context('USERENV', 'CURRENT_USER')||'.testing_package_3'))); l_actual_message := ut3_develop.ut_utils.table_to_clob(l_test_results); From 85fd36d222680ebe1420d0fe40ed34520595a0b2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 3 Mar 2022 22:56:23 +0000 Subject: [PATCH 0928/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 718422bd7..846862073 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index dce7a66bd..c03c53846 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 73bb5df36..7a49d944f 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index c11655c2f..af0c3f5f1 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index cec5f8eb4..e87cd94d9 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 420c72cfe..ae00602cf 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index c7f1f152f..53d291fa3 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index cf2e1cc1c..4d7517f7d 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 6415b538d..82c4c34b2 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index f4cc81754..5fbec44a0 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index e13de9936..7129cd87c 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 6e29a82da..9668b49ef 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 6a7562b8c..42ff5ddd1 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 7a164257c..a68c427a4 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 3b8510f89..804cd64f6 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 46499273b..92d77cdba 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 825c122cf..b7399c1f6 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3931--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index c233b22f7..27979bf38 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.13.3931-develop'; + gc_version constant varchar2(50) := 'v3.1.13.3935-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 61ce1bb2380e7335132f206dba7ad7008c0f61ed Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 14 Mar 2022 01:13:46 +0200 Subject: [PATCH 0929/1096] Removed test users env variables Those variables are not needed and bring no real benefit asu the usernames actually cannot be configured and even if they were, there would be no real benefit to it. --- .github/scripts/create_test_users.sh | 50 ++++++++++++++-------------- .github/variables/.env | 8 +---- development/cleanup.sh | 6 ++-- development/template.env.sh | 7 ---- test/install_tests.sh | 6 ++-- test/run_tests.sh | 2 +- 6 files changed, 33 insertions(+), 46 deletions(-) diff --git a/.github/scripts/create_test_users.sh b/.github/scripts/create_test_users.sh index 43f64784d..fe43b7467 100755 --- a/.github/scripts/create_test_users.sh +++ b/.github/scripts/create_test_users.sh @@ -13,14 +13,14 @@ PROMPT Adding back create-trigger privilege to $UT3_DEVELOP_SCHEMA for testing grant administer database trigger to $UT3_DEVELOP_SCHEMA; -------------------------------------------------------------------------------- -PROMPT Creating $UT3_TESTER - Power-user for testing internal framework code +PROMPT Creating UT3_TESTER - Power-user for testing internal framework code -create user $UT3_TESTER identified by "$UT3_TESTER_PASSWORD" default tablespace $UT3_TABLESPACE quota unlimited on $UT3_TABLESPACE; -grant create session, create procedure, create type, create table to $UT3_TESTER; +create user UT3_TESTER identified by "ut3" default tablespace $UT3_TABLESPACE quota unlimited on $UT3_TABLESPACE; +grant create session, create procedure, create type, create table to UT3_TESTER; -grant execute on dbms_lock to $UT3_TESTER; +grant execute on dbms_lock to UT3_TESTER; -PROMPT Granting $UT3_DEVELOP_SCHEMA code to $UT3_TESTER +PROMPT Granting $UT3_DEVELOP_SCHEMA code to UT3_TESTER begin for i in ( @@ -30,31 +30,31 @@ begin and generated = 'N' and object_name not like 'SYS%') loop - execute immediate 'grant execute on $UT3_DEVELOP_SCHEMA."'||i.object_name||'" to $UT3_TESTER'; + execute immediate 'grant execute on $UT3_DEVELOP_SCHEMA."'||i.object_name||'" to UT3_TESTER'; end loop; end; / -PROMPT Granting $UT3_DEVELOP_SCHEMA tables to $UT3_TESTER +PROMPT Granting $UT3_DEVELOP_SCHEMA tables to UT3_TESTER begin for i in ( select table_name from all_tables t where owner = '$UT3_DEVELOP_SCHEMA' and nested = 'NO' and iot_name is null) loop - execute immediate 'grant select on $UT3_DEVELOP_SCHEMA.'||i.table_name||' to $UT3_TESTER'; + execute immediate 'grant select on $UT3_DEVELOP_SCHEMA.'||i.table_name||' to UT3_TESTER'; end loop; end; / -------------------------------------------------------------------------------- -PROMPT Creating $UT3_USER - minimal privileges user for API testing +PROMPT Creating UT3_USER - minimal privileges user for API testing -create user $UT3_USER identified by "$UT3_USER_PASSWORD" default tablespace $UT3_TABLESPACE quota unlimited on $UT3_TABLESPACE; -grant create session, create procedure, create type, create table to $UT3_USER; +create user UT3_USER identified by "ut3" default tablespace $UT3_TABLESPACE quota unlimited on $UT3_TABLESPACE; +grant create session, create procedure, create type, create table to UT3_USER; -PROMPT Grants for starting a debugging session from $UT3_USER -grant debug connect session to $UT3_USER; -grant debug any procedure to $UT3_USER; +PROMPT Grants for starting a debugging session from UT3_USER +grant debug connect session to UT3_USER; +grant debug any procedure to UT3_USER; begin \$if dbms_db_version.version <= 11 \$then null; -- no addition action necessary @@ -64,7 +64,7 @@ begin host =>'*', ace => sys.xs\$ace_type( privilege_list => sys.xs\$name_list('JDWP') , - principal_name => '$UT3_USER', + principal_name => 'UT3_USER', principal_type => sys.xs_acl.ptype_db ) ); @@ -73,29 +73,29 @@ end; / -------------------------------------------------------------------------------- -PROMPT Creating $UT3_TESTER_HELPER - provides functions to allow min grant test user setup tests. +PROMPT Creating UT3_TESTER_HELPER - provides functions to allow min grant test user setup tests. -create user $UT3_TESTER_HELPER identified by "$UT3_TESTER_HELPER_PASSWORD" default tablespace $UT3_TABLESPACE quota unlimited on $UT3_TABLESPACE; -grant create session, create procedure, create type, create table to $UT3_TESTER_HELPER; +create user UT3_TESTER_HELPER identified by "ut3" default tablespace $UT3_TABLESPACE quota unlimited on $UT3_TABLESPACE; +grant create session, create procedure, create type, create table to UT3_TESTER_HELPER; PROMPT Grants for testing distributed transactions -grant create public database link to $UT3_TESTER_HELPER; -grant drop public database link to $UT3_TESTER_HELPER; +grant create public database link to UT3_TESTER_HELPER; +grant drop public database link to UT3_TESTER_HELPER; PROMPT Grants for testing coverage outside of main $UT3_DEVELOP_SCHEMA schema. grant create any procedure, drop any procedure, execute any procedure, create any type, drop any type, execute any type, under any type, select any table, update any table, insert any table, delete any table, create any table, drop any table, alter any table, select any dictionary, create any synonym, drop any synonym, grant any object privilege, grant any privilege, create public synonym, drop public synonym, create any trigger - to $UT3_TESTER_HELPER; + to UT3_TESTER_HELPER; -grant create job to $UT3_TESTER_HELPER; +grant create job to UT3_TESTER_HELPER; PROMPT Additional grants for disabling DDL trigger and testing parser without trigger enabled/present -grant alter any trigger to $UT3_TESTER_HELPER; -grant administer database trigger to $UT3_TESTER_HELPER; -grant execute on dbms_lock to $UT3_TESTER_HELPER; +grant alter any trigger to UT3_TESTER_HELPER; +grant administer database trigger to UT3_TESTER_HELPER; +grant execute on dbms_lock to UT3_TESTER_HELPER; create user ut3_cache_test_owner identified by ut3; grant create session, create procedure to ut3_cache_test_owner; diff --git a/.github/variables/.env b/.github/variables/.env index e0a579d52..7bb5003e8 100644 --- a/.github/variables/.env +++ b/.github/variables/.env @@ -3,12 +3,6 @@ UT3_DEVELOP_SCHEMA=UT3_DEVELOP UT3_DEVELOP_SCHEMA_PASSWORD=ut3 UT3_RELEASE_VERSION_SCHEMA=UT3 UT3_RELEASE_VERSION_SCHEMA_PASSWORD=ut3 -UT3_USER='UT3_USER' -UT3_USER_PASSWORD=ut3 -UT3_TESTER=UT3_TESTER -UT3_TESTER_PASSWORD=ut3 -UT3_TESTER_HELPER=UT3_TESTER_HELPER -UT3_TESTER_HELPER_PASSWORD=ut3 UT3_TABLESPACE=users # Database Env @@ -30,4 +24,4 @@ GIT_COMMITTER_NAME="github-actions[bot]" GIT_COMMITTER_EMAIL="github-actions[bot]@users.noreply.github.com" #Docker environment for running utPLSQL install commands -DOCKER_ENV="-e SQLCLI=sqlplus -e UT3_DEVELOP_SCHEMA -e UT3_DEVELOP_SCHEMA_PASSWORD -e UT3_RELEASE_VERSION_SCHEMA -e UT3_RELEASE_VERSION_SCHEMA_PASSWORD -e UT3_USER -e UT3_USER_PASSWORD -e UT3_TESTER -e UT3_TESTER_PASSWORD -e UT3_TESTER_HELPER -e UT3_TESTER_HELPER_PASSWORD -e UT3_TABLESPACE -e ORACLE_PWD -e CONNECTION_STR -e UTPLSQL_DIR" \ No newline at end of file +DOCKER_ENV="-e SQLCLI=sqlplus -e UT3_DEVELOP_SCHEMA -e UT3_DEVELOP_SCHEMA_PASSWORD -e UT3_RELEASE_VERSION_SCHEMA -e UT3_RELEASE_VERSION_SCHEMA_PASSWORD -e UT3_TABLESPACE -e ORACLE_PWD -e CONNECTION_STR -e UTPLSQL_DIR" \ No newline at end of file diff --git a/development/cleanup.sh b/development/cleanup.sh index c13ddb4aa..33358302a 100755 --- a/development/cleanup.sh +++ b/development/cleanup.sh @@ -20,9 +20,9 @@ end; drop user ${UT3_DEVELOP_SCHEMA} cascade; drop user ${UT3_RELEASE_VERSION_SCHEMA} cascade; -drop user ${UT3_TESTER} cascade; -drop user ${UT3_TESTER_HELPER} cascade; -drop user ${UT3_USER} cascade; +drop user ut3_tester cascade; +drop user ut3_tester_helper cascade; +drop user ut3_user cascade; drop user ut3_cache_test_owner cascade; drop user ut3_no_extra_priv_user cascade; drop user ut3_select_catalog_user cascade; diff --git a/development/template.env.sh b/development/template.env.sh index 521d9343d..e69aa81aa 100755 --- a/development/template.env.sh +++ b/development/template.env.sh @@ -12,11 +12,4 @@ export UT3_DEVELOP_SCHEMA=UT3_DEVELOP export UT3_DEVELOP_SCHEMA_PASSWORD=ut3 export UT3_RELEASE_VERSION_SCHEMA=UT3 export UT3_RELEASE_VERSION_SCHEMA_PASSWORD=ut3 -export UT3_TESTER=UT3_TESTER -export UT3_TESTER_PASSWORD=ut3 -export UT3_TESTER_HELPER=UT3_TESTER_HELPER -export UT3_TESTER_HELPER_PASSWORD=ut3 export UT3_TABLESPACE=users -export UT3_USER="UT3\$USER#" -export UT3_USER_PASSWORD=ut3 -export DOCKER_ENV="-e SQLCLI=sqlplus -e UT3_DEVELOP_SCHEMA -e UT3_DEVELOP_SCHEMA_PASSWORD -e UT3_RELEASE_VERSION_SCHEMA -e UT3_RELEASE_VERSION_SCHEMA_PASSWORD -e UT3_USER -e UT3_USER_PASSWORD -e UT3_TESTER -e UT3_TESTER_PASSWORD -e UT3_TESTER_HELPER -e UT3_TESTER_HELPER_PASSWORD -e UT3_TABLESPACE -e ORACLE_PWD -e CONNECTION_STR -e UTPLSQL_DIR" diff --git a/test/install_tests.sh b/test/install_tests.sh index 4ccc312e8..1b97ec33d 100755 --- a/test/install_tests.sh +++ b/test/install_tests.sh @@ -5,9 +5,9 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) cd ${SCRIPT_DIR} -"$SQLCLI" ${UT3_TESTER_HELPER}/${UT3_TESTER_HELPER_PASSWORD}@//${CONNECTION_STR} @install_ut3_tester_helper.sql +"$SQLCLI" UT3_TESTER_HELPER/ut3@//${CONNECTION_STR} @install_ut3_tester_helper.sql -"$SQLCLI" ${UT3_USER}/${UT3_USER_PASSWORD}@//${CONNECTION_STR} @install_ut3_user_tests.sql +"$SQLCLI" UT3_USER/ut3@//${CONNECTION_STR} @install_ut3_user_tests.sql -"$SQLCLI" ${UT3_TESTER}/${UT3_TESTER_PASSWORD}@//${CONNECTION_STR} @install_ut3_tester_tests.sql +"$SQLCLI" UT3_TESTER/ut3@//${CONNECTION_STR} @install_ut3_tester_tests.sql diff --git a/test/run_tests.sh b/test/run_tests.sh index ae4a739d9..118bab920 100755 --- a/test/run_tests.sh +++ b/test/run_tests.sh @@ -4,7 +4,7 @@ set -ev #goto git root directory git rev-parse && cd "$(git rev-parse --show-cdup)" -time utPLSQL-cli/bin/utplsql run ${UT3_TESTER_HELPER}/${UT3_TESTER_HELPER_PASSWORD}@${CONNECTION_STR} \ +time utPLSQL-cli/bin/utplsql run UT3_TESTER_HELPER/ut3@${CONNECTION_STR} \ -source_path=source -owner=ut3_develop \ -p='ut3_tester,ut3_user' \ -test_path=test -c \ From 8e54e91a844d87ea8029212269ab830910fccf65 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 14 Mar 2022 08:48:00 +0000 Subject: [PATCH 0930/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 846862073..b93720226 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index c03c53846..a96043438 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 7a49d944f..1402d09ad 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index af0c3f5f1..9c2e9ee4a 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index e87cd94d9..740bc199a 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index ae00602cf..72aca4936 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 53d291fa3..3017acdc5 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 4d7517f7d..8a7045e9c 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 82c4c34b2..018b206bd 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 5fbec44a0..7a1445c2d 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 7129cd87c..34f0970d5 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 9668b49ef..28cc3de62 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 42ff5ddd1..f1e96e50d 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index a68c427a4..2d947f391 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 804cd64f6..3ba397177 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 92d77cdba..f392dd1e5 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index b7399c1f6..5137e6490 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3935--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 27979bf38..aeff16dd8 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.13.3935-develop'; + gc_version constant varchar2(50) := 'v3.1.13.3940-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 86d4d0a76475a8a2eb78c1a1ae72e930c3afbf33 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Fri, 18 Mar 2022 16:33:57 +0000 Subject: [PATCH 0931/1096] Initial check-in. There is still no error handling. --- source/core/types/ut_path_item.tpb | 42 ++++++ source/core/types/ut_path_item.tps | 26 ++++ source/core/types/ut_path_items.tps | 19 +++ source/core/ut_suite_cache_manager.pkb | 182 ++++++++++++++++++++++++- source/core/ut_suite_cache_manager.pks | 6 + source/core/ut_suite_manager.pkb | 134 +++++++++--------- source/install.sql | 4 +- source/uninstall_objects.sql | 4 + 8 files changed, 354 insertions(+), 63 deletions(-) create mode 100644 source/core/types/ut_path_item.tpb create mode 100644 source/core/types/ut_path_item.tps create mode 100644 source/core/types/ut_path_items.tps diff --git a/source/core/types/ut_path_item.tpb b/source/core/types/ut_path_item.tpb new file mode 100644 index 000000000..3878b544c --- /dev/null +++ b/source/core/types/ut_path_item.tpb @@ -0,0 +1,42 @@ +create or replace type body ut_path_item as + /* + utPLSQL - Version 3 + Copyright 2016 - 2021 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2, object_name varchar2,procedure_name varchar2) return self as result is + begin + self.schema_name := schema_name; + self.object_name := object_name; + self.procedure_name := procedure_name; + return; + end; + + constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2,suite_path varchar2) return self as result is + begin + self.schema_name := schema_name; + self.suite_path := suite_path; + return; + end; + + constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2, object_name varchar2,procedure_name varchar2,suite_path varchar2) return self as result is + begin + self.schema_name := schema_name; + self.object_name := object_name; + self.procedure_name := procedure_name; + self.suite_path := suite_path; + return; + end; +end; +/ \ No newline at end of file diff --git a/source/core/types/ut_path_item.tps b/source/core/types/ut_path_item.tps new file mode 100644 index 000000000..9a5ef51d0 --- /dev/null +++ b/source/core/types/ut_path_item.tps @@ -0,0 +1,26 @@ +create or replace type ut_path_item as object ( + /* + utPLSQL - Version 3 + Copyright 2016 - 2021 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + schema_name varchar2(4000), + object_name varchar2(250), + procedure_name varchar2(250), + suite_path varchar2(4000), + constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2, object_name varchar2,procedure_name varchar2) return self as result, + constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2,suite_path varchar2) return self as result, + constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2, object_name varchar2,procedure_name varchar2,suite_path varchar2) return self as result +) +/ \ No newline at end of file diff --git a/source/core/types/ut_path_items.tps b/source/core/types/ut_path_items.tps new file mode 100644 index 000000000..0c87cf28c --- /dev/null +++ b/source/core/types/ut_path_items.tps @@ -0,0 +1,19 @@ +create or replace type ut_path_items as + /* + utPLSQL - Version 3 + Copyright 2016 - 2021 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + table of ut_path_item +/ diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index ad1634c10..cc5cd0f19 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -20,7 +20,7 @@ create or replace package body ut_suite_cache_manager is * Private code */ - gc_get_cache_suite_sql constant varchar2(32767) := + gc_get_cache_suite_sql constant varchar2(32767) := q'[with suite_items as ( select /*+ cardinality(c 500) */ value(c) as obj @@ -83,6 +83,87 @@ create or replace package body ut_suite_cache_manager is from items c order by c.obj.object_owner,{:random_seed:}]'; + + gc_get_bulk_cache_suite_sql constant varchar2(32767) := + q'[with + suite_paths_tabs as ( + select schema_name,object_name,procedure_name,suite_path + from table(:l_schema_paths) + ), + suite_items as ( + select /*+ cardinality(c 500) */ value(c) as obj + from ut_suite_cache c, + suite_paths_tabs sp + where c.object_owner = upper(sp.schema_name) + and sp.suite_path is not null + and ( + sp.suite_path||'.' like c.path||'.%' /*all parents and self*/ + or + ( + c.path||'.' like sp.suite_path||'.%' /*all children and self*/ + and c.object_name like nvl(upper(sp.object_name),c.object_name) + and c.name like nvl(upper(sp.procedure_name),c.name) + ) + ) + union all + select /*+ cardinality(c 500) */ value(c) as obj + from ut_suite_cache c, + suite_paths_tabs sp + where c.object_owner = upper(sp.schema_name) + and sp.suite_path is null + and c.object_name like nvl(upper(replace(sp.object_name,'*','%')),c.object_name) + and c.name like nvl(upper(replace(sp.procedure_name,'*','%')),c.name) + ), + {:tags:} + suitepaths as ( + select distinct substr(c.obj.path,1,instr(c.obj.path,'.',-1)-1) as suitepath, + c.obj.path as path, + c.obj.object_owner as object_owner + from {:suite_item_name:} c + where c.obj.self_type = 'UT_SUITE' + ), + gen as ( + select rownum as pos + from xmltable('1 to 20') + ), + suitepath_part AS ( + select distinct + substr(b.suitepath, 1, instr(b.suitepath || '.', '.', 1, g.pos) -1) as path, + object_owner + from suitepaths b + join gen g + on g.pos <= regexp_count(b.suitepath, '\w+') + ), + logical_suite_data as ( + select 'UT_LOGICAL_SUITE' as self_type, p.path, p.object_owner, + upper( substr(p.path, instr( p.path, '.', -1 ) + 1 ) ) as object_name, + cast(null as ut_executables) as x, + cast(null as ut_varchar2_rows) as y, + cast(null as ut_executable_test) as z + from suitepath_part p + where p.path + not in (select s.path from suitepaths s) + ), + logical_suites as ( + select ut_suite_cache_row( + null, + s.self_type, s.path, s.object_owner, s.object_name, + s.object_name, null, null, null, null, 0,null, + ut_varchar2_rows(), + s.x, s.x, s.x, s.x, s.x, s.x, + s.y, null, s.z + ) as obj + from logical_suite_data s + ), + items as ( + select obj from {:suite_item_name:} + union all + select obj from logical_suites + ) + select /*+ no_parallel */ c.obj + from items c + order by c.obj.object_owner,{:random_seed:}]'; + function get_missing_cache_objects(a_object_owner varchar2) return ut_varchar2_rows is l_result ut_varchar2_rows; l_data ut_annotation_objs_cache_info; @@ -190,6 +271,29 @@ create or replace package body ut_suite_cache_manager is ) desc nulls last' end; end; + + --Possible move logic to type + function group_paths_by_schema(a_paths ut_varchar2_list) return ut_path_items is + c_package_path_regex constant varchar2(100) := '^([A-Za-z0-9$#_]+)(\.([A-Za-z0-9$#_\*]+))?(\.([A-Za-z0-9$#_\*]+))?$'; + l_results ut_path_items := ut_path_items(); + l_path_item ut_path_item; + begin + for i in 1 .. a_paths.count loop + l_results.extend; + if a_paths(i) like '%:%' then + l_path_item := ut_path_item(upper(regexp_substr(a_paths(i),'^[^.:]+')), + ltrim(regexp_substr(a_paths(i),'[.:].*$'),':')); + l_results(l_results.last) := l_path_item; + else + l_path_item := ut_path_item(regexp_substr(a_paths(i), c_package_path_regex, subexpression => 1), + regexp_substr(a_paths(i), c_package_path_regex, subexpression => 3), + regexp_substr(a_paths(i), c_package_path_regex, subexpression => 5)); + l_results(l_results.last) := l_path_item; + end if; + end loop; + + return l_results; + end; @@ -254,6 +358,82 @@ create or replace package body ut_suite_cache_manager is using upper(l_object_owner), l_path, l_path, upper(a_object_name), upper(a_procedure_name), l_include_tags, l_include_tags, l_exclude_tags, a_random_seed; return l_results; end; + + function expand_paths(a_schema_paths ut_path_items) return ut_path_items is + l_schema_paths ut_path_items:= ut_path_items(); + begin + with paths_to_expand as ( + select /*+ no_parallel */ min(path) as suite_path,sp.schema_name as schema_name,nvl(sp.object_name,c.object_name) as object_name,sp.procedure_name as procedure_name + from ut_suite_cache c, + table(a_schema_paths) sp + where c.object_owner = upper(sp.schema_name) + and c.object_name like nvl(replace(upper(sp.object_name),'*','%'),c.object_name) + and c.name like nvl(replace(upper(sp.procedure_name),'*','%'), c.name) + and sp.suite_path is null + group by sp.schema_name,nvl(sp.object_name,c.object_name),sp.procedure_name + union all + select /*+ no_parallel */ c.path as suite_path,sp.schema_name,sp.object_name,sp.procedure_name as procedure_name + from + ut_suite_cache c, + table(a_schema_paths) sp + where c.object_owner = upper(sp.schema_name) + and sp.suite_path is not null + and instr(sp.suite_path,'*') > 0 + and c.path like replace(sp.suite_path,'*','%') + union all + select /*+ no_parallel */ sp.suite_path as suite_path,sp.schema_name,sp.object_name,sp.procedure_name as procedure_name + from table(a_schema_paths) sp + where sp.suite_path is not null + and instr(sp.suite_path,'*') = 0 + ) + select ut_path_item(schema_name,object_name,procedure_name,suite_path) + bulk collect into l_schema_paths + from paths_to_expand; + return l_schema_paths; + end; + + function get_cached_suite_rows( + a_paths ut_varchar2_list, + a_random_seed positive := null, + a_tags ut_varchar2_rows := null + ) return ut_suite_cache_rows is + l_results ut_suite_cache_rows := ut_suite_cache_rows(); + l_schema_paths ut_path_items; + l_tags ut_varchar2_rows := coalesce(a_tags,ut_varchar2_rows()); + l_include_tags ut_varchar2_rows; + l_exclude_tags ut_varchar2_rows; + l_suite_item_name varchar2(20); + l_paths ut_varchar2_rows; + l_schema varchar2(4000); + l_sql varchar2(32767); + begin + select /*+ no_parallel */ column_value + bulk collect into l_include_tags + from table(l_tags) + where column_value not like '-%'; + + select /*+ no_parallel */ ltrim(column_value,'-') + bulk collect into l_exclude_tags + from table(l_tags) + where column_value like '-%'; + + l_schema_paths := expand_paths(group_paths_by_schema(a_paths)); + --We still need to turn this into qualified SQL name....maybe as part of results ? + l_suite_item_name := case when l_tags.count > 0 then 'suite_items_tags' else 'suite_items' end; + + l_sql := gc_get_bulk_cache_suite_sql; + l_sql := replace(l_sql,'{:suite_item_name:}',l_suite_item_name); + l_sql := replace(l_sql,'{:tags:}',get_tags_sql(l_tags.count)); + l_sql := replace(l_sql,'{:random_seed:}',get_random_seed_sql(a_random_seed)); + ut_event_manager.trigger_event(ut_event_manager.gc_debug, ut_key_anyvalues().put('l_sql',l_sql) ); + + execute immediate l_sql + bulk collect into l_results + using l_schema_paths, l_include_tags, l_include_tags, l_exclude_tags, a_random_seed; + return l_results; + end; + + function get_schema_parse_time(a_schema_name varchar2) return timestamp result_cache is l_cache_parse_time timestamp; diff --git a/source/core/ut_suite_cache_manager.pks b/source/core/ut_suite_cache_manager.pks index 0a38851fe..10444a4d2 100644 --- a/source/core/ut_suite_cache_manager.pks +++ b/source/core/ut_suite_cache_manager.pks @@ -53,6 +53,12 @@ create or replace package ut_suite_cache_manager authid definer is a_random_seed positive := null, a_tags ut_varchar2_rows := null ) return ut_suite_cache_rows; + + function get_cached_suite_rows( + a_paths ut_varchar2_list, + a_random_seed positive := null, + a_tags ut_varchar2_rows := null + ) return ut_suite_cache_rows; /* * Retrieves suite item info rows from cache. diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 4bcb83afa..2f081d2c2 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -18,14 +18,6 @@ create or replace package body ut_suite_manager is gc_suitpath_error_message constant varchar2(100) := 'Suitepath exceeds 1000 CHAR on: '; - type t_path_item is record ( - object_name varchar2(250), - procedure_name varchar2(250), - suite_path varchar2(4000) - ); - type t_path_items is table of t_path_item; - type t_schema_paths is table of t_path_items index by varchar2(250 char); - cursor c_cached_suites_cursor is select * from table(ut_suite_cache_rows()); type tt_cached_suites is table of c_cached_suites_cursor%rowtype; type t_cached_suites_cursor is ref cursor return c_cached_suites_cursor%rowtype; @@ -41,7 +33,8 @@ create or replace package body ut_suite_manager is else for i in 1 .. a_paths.count loop l_path := a_paths(i); - if l_path is null or not (regexp_like(l_path, '^[A-Za-z0-9$#_]+(\.[A-Za-z0-9$#_]+){0,2}$') or regexp_like(l_path, '^([A-Za-z0-9$#_]+)?:[A-Za-z0-9$#_]+(\.[A-Za-z0-9$#_]+)*$')) then + if l_path is null or not ( + regexp_like(l_path, '^[A-Za-z0-9$#_\*]+(\.[A-Za-z0-9$#_\*]+){0,2}$') or regexp_like(l_path, '^([A-Za-z0-9$#_]+)?:[A-Za-z0-9$#_\*]+(\.[A-Za-z0-9$#_\*]+)*$')) then raise_application_error(ut_utils.gc_invalid_path_format, 'Invalid path format: ' || nvl(l_path, 'NULL')); end if; end loop; @@ -84,12 +77,17 @@ create or replace package body ut_suite_manager is -- get schema name / object.[procedure] name -- When path is one of: schema or schema.package[.object] or package[.object] -- transform it back to schema[.package[.object]] + -- Object name or procedure is allowed to have filter char + -- However this is not allowed on schema begin - l_object := regexp_substr(a_paths(i), '^[A-Za-z0-9$#_]+'); + l_object := regexp_substr(a_paths(i), '^[A-Za-z0-9$#_\*]+'); l_schema := sys.dbms_assert.schema_name(upper(l_object)); exception when sys.dbms_assert.invalid_schema_name then - if ut_metadata.package_exists_in_cur_schema(upper(l_object)) then + if l_object like '%*%' then + a_paths(i) := c_current_schema || '.' || a_paths(i); + l_schema := c_current_schema; + elsif ut_metadata.package_exists_in_cur_schema(upper(l_object)) then a_paths(i) := c_current_schema || '.' || a_paths(i); l_schema := c_current_schema; else @@ -110,34 +108,6 @@ create or replace package body ut_suite_manager is l_schema_names := resolve_schema_names(a_paths); end; - function group_paths_by_schema(a_paths ut_varchar2_list) return t_schema_paths is - c_package_path_regex constant varchar2(100) := '^([A-Za-z0-9$#_]+)(\.([A-Za-z0-9$#_]+))?(\.([A-Za-z0-9$#_]+))?$'; - l_schema varchar2(4000); - l_empty_result t_path_item; - l_result t_path_item; - l_results t_schema_paths; - begin - for i in 1 .. a_paths.count loop - l_result := l_empty_result; - if a_paths(i) like '%:%' then - l_schema := upper(regexp_substr(a_paths(i),'^[^.:]+')); - l_result.suite_path := ltrim(regexp_substr(a_paths(i),'[.:].*$'),':'); - else - l_schema := regexp_substr(a_paths(i), c_package_path_regex, subexpression => 1); - l_result.object_name := regexp_substr(a_paths(i), c_package_path_regex, subexpression => 3); - l_result.procedure_name := regexp_substr(a_paths(i), c_package_path_regex, subexpression => 5); - end if; - if l_results.exists(l_schema) then - l_results(l_schema).extend; - l_results(l_schema)(l_results(l_schema).last) := l_result; - else - l_results(l_schema) := t_path_items(l_result); - end if; - end loop; - return l_results; - end; - - function sort_by_seq_no( a_list ut_executables ) return ut_executables is @@ -370,6 +340,45 @@ create or replace package body ut_suite_manager is return l_result; end; + function get_cached_suite_data( + a_paths ut_varchar2_list, + a_random_seed positive, + a_tags ut_varchar2_rows := null + ) return t_cached_suites_cursor is + l_unfiltered_rows ut_suite_cache_rows; + l_result t_cached_suites_cursor; + begin + l_unfiltered_rows := ut_suite_cache_manager.get_cached_suite_rows( + a_paths, + a_random_seed, + a_tags + ); + + if ut_metadata.user_has_execute_any_proc() then + open l_result for + select /*+ no_parallel */ c.* from table(l_unfiltered_rows) c; + else + open l_result for + select /*+ no_parallel */ c.* from table(l_unfiltered_rows) c + where sys_context( 'userenv', 'current_user' ) = upper(c.object_owner) + union all + select /*+ no_parallel */ c.* from table(l_unfiltered_rows) c + where sys_context( 'userenv', 'current_user' ) != upper(c.object_owner) + and ( exists + ( select 1 + from all_objects a + where a.object_name = c.object_name + and a.owner = c.object_owner + and a.object_type = 'PACKAGE' + ) + or c.self_type = 'UT_LOGICAL_SUITE'); + + end if; + return l_result; + + return l_result; + end; + function can_skip_all_objects_scan( a_owner_name varchar2 ) return boolean is @@ -442,31 +451,21 @@ create or replace package body ut_suite_manager is ut_event_manager.trigger_event('refresh_cache - end'); end; - procedure add_suites_for_path( - a_owner_name varchar2, - a_path varchar2 := null, - a_object_name varchar2 := null, - a_procedure_name varchar2 := null, + procedure add_suites_for_paths( + a_paths ut_varchar2_list, a_suites in out nocopy ut_suite_items, a_random_seed positive, a_tags ut_varchar2_rows := null ) is begin - refresh_cache(a_owner_name); - reconstruct_from_cache( a_suites, get_cached_suite_data( - a_owner_name, - a_path, - a_object_name, - a_procedure_name, - can_skip_all_objects_scan(a_owner_name), + a_paths, a_random_seed, a_tags ) ); - end; ----------------------------------------------- @@ -530,20 +529,32 @@ create or replace package body ut_suite_manager is a_tags ut_varchar2_rows := ut_varchar2_rows() ) is l_paths ut_varchar2_list := a_paths; - l_path_items t_path_items; - l_path_item t_path_item; + l_schema_names ut_varchar2_rows; l_schema varchar2(4000); l_suites_count pls_integer := 0; l_index varchar2(4000 char); - l_schema_paths t_schema_paths; begin ut_event_manager.trigger_event('configure_execution_by_path - start'); - a_suites := ut_suite_items(); + a_suites := ut_suite_items(); --resolve schema names from paths and group paths by schema name - resolve_schema_names(l_paths); - - l_schema_paths := group_paths_by_schema(l_paths); + l_schema_names := resolve_schema_names(l_paths); + --refresh cache + l_schema := l_schema_names.first; + while l_schema is not null loop + refresh_cache(upper(l_schema_names(l_schema))); + l_schema := l_schema_names.next(l_schema); + end loop; + + --We will get a single list of paths rather than loop by loop. + add_suites_for_paths( + l_paths, + a_suites, + a_random_seed, + a_tags + ); + + /* l_schema := l_schema_paths.first; while l_schema is not null loop l_path_items := l_schema_paths(l_schema); @@ -571,8 +582,9 @@ create or replace package body ut_suite_manager is l_suites_count := a_suites.count; end loop; l_schema := l_schema_paths.next(l_schema); - end loop; - + end loop;*/ + + --propagate rollback type to suite items after organizing suites into hierarchy for i in 1 .. a_suites.count loop a_suites(i).set_rollback_type( a_suites(i).get_rollback_type() ); diff --git a/source/install.sql b/source/install.sql index cda057bdf..6f3c16801 100644 --- a/source/install.sql +++ b/source/install.sql @@ -89,7 +89,8 @@ create or replace context &&ut3_owner._info using &&ut3_owner..ut_session_contex @@install_component.sql 'core/types/ut_run.tps' @@install_component.sql 'core/types/ut_reporter_base.tps' @@install_component.sql 'core/types/ut_reporters.tps' - +@@install_component.sql 'core/types/ut_path_item.tps' +@@install_component.sql 'core/types/ut_path_items.tps' @@install_component.sql 'expectations/json_objects_specs.sql' @@install_component.sql 'expectations/matchers/ut_matcher_options_items.tps' @@ -207,6 +208,7 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema @@install_component.sql 'core/types/ut_executable_test.tpb' @@install_component.sql 'core/types/ut_console_reporter_base.tps' @@install_component.sql 'core/types/ut_console_reporter_base.tpb' +@@install_component.sql 'core/types/ut_path_item.tpb' --expectations and matchers @@install_component.sql 'expectations/data_values/ut_compound_data_tmp.sql' diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index 4d77d9993..ab4069497 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -88,6 +88,10 @@ drop type ut_suite_items_info force; drop type ut_suite_item_info force; +drop type ut_path_items force; + +drop type ut_path_item force; + drop package ut_suite_manager; drop package ut_suite_builder; From f1f6d71db4728e89413b5ab52a0e973cd3ff5f58 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sat, 19 Mar 2022 14:12:28 +0000 Subject: [PATCH 0932/1096] Tidy up code to make sure we got distinct set of expanded tests. Addressing issue of WITH error ORA-32036: unsupported case for inlining of query name in WITH clause --- source/core/ut_suite_cache_manager.pkb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index cc5cd0f19..562435e0f 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -85,15 +85,11 @@ create or replace package body ut_suite_cache_manager is gc_get_bulk_cache_suite_sql constant varchar2(32767) := - q'[with - suite_paths_tabs as ( - select schema_name,object_name,procedure_name,suite_path - from table(:l_schema_paths) - ), + q'[with suite_items as ( select /*+ cardinality(c 500) */ value(c) as obj from ut_suite_cache c, - suite_paths_tabs sp + table(:l_schema_paths) sp where c.object_owner = upper(sp.schema_name) and sp.suite_path is not null and ( @@ -108,7 +104,7 @@ create or replace package body ut_suite_cache_manager is union all select /*+ cardinality(c 500) */ value(c) as obj from ut_suite_cache c, - suite_paths_tabs sp + table(:l_schema_paths) sp where c.object_owner = upper(sp.schema_name) and sp.suite_path is null and c.object_name like nvl(upper(replace(sp.object_name,'*','%')),c.object_name) @@ -388,7 +384,11 @@ create or replace package body ut_suite_cache_manager is ) select ut_path_item(schema_name,object_name,procedure_name,suite_path) bulk collect into l_schema_paths - from paths_to_expand; + from + (select schema_name,object_name,procedure_name,suite_path, + row_number() over ( partition by schema_name,object_name,procedure_name,suite_path order by 1) r_num + from paths_to_expand) + where r_num = 1 ; return l_schema_paths; end; @@ -429,7 +429,7 @@ create or replace package body ut_suite_cache_manager is execute immediate l_sql bulk collect into l_results - using l_schema_paths, l_include_tags, l_include_tags, l_exclude_tags, a_random_seed; + using l_schema_paths, l_schema_paths, l_include_tags, l_include_tags, l_exclude_tags, a_random_seed; return l_results; end; From 01ec694a0289562f7434699493fa6dbed5af7022 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 19 Mar 2022 17:14:08 +0000 Subject: [PATCH 0933/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index b93720226..ad0cad34c 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index a96043438..9641132fd 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 1402d09ad..c1eefa2dd 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 9c2e9ee4a..5812e2cab 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 740bc199a..140c3e3dd 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 72aca4936..9e4528342 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 3017acdc5..a2612c3b8 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 8a7045e9c..9c90a1865 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 018b206bd..2c262abbf 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 7a1445c2d..27dfc6c1f 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 34f0970d5..8e1872497 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 28cc3de62..3aa97dcb8 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index f1e96e50d..08308bc8a 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 2d947f391..11e08be1d 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 3ba397177..373830f95 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index f392dd1e5..d3fcfd520 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 5137e6490..bf5cf8c7b 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3940--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index aeff16dd8..027a06c21 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.13.3940-develop'; + gc_version constant varchar2(50) := 'v3.1.13.3943-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 1454221535f2dc53e2e776a1bbf97bc09da8a079 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Wed, 23 Mar 2022 19:45:20 +0000 Subject: [PATCH 0934/1096] Adding extra fields. --- source/core/types/ut_path_item.tpb | 9 ++- source/core/types/ut_path_item.tps | 15 +++-- source/core/ut_suite_cache_manager.pkb | 67 +++++++++++-------- source/core/ut_suite_cache_manager.pks | 4 +- source/core/ut_suite_manager.pkb | 93 ++++++++++++++++++-------- source/core/ut_suite_manager.pks | 4 ++ 6 files changed, 126 insertions(+), 66 deletions(-) diff --git a/source/core/types/ut_path_item.tpb b/source/core/types/ut_path_item.tpb index 3878b544c..2973b3412 100644 --- a/source/core/types/ut_path_item.tpb +++ b/source/core/types/ut_path_item.tpb @@ -15,27 +15,30 @@ create or replace type body ut_path_item as See the License for the specific language governing permissions and limitations under the License. */ - constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2, object_name varchar2,procedure_name varchar2) return self as result is + constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2, object_name varchar2,procedure_name varchar2, originated_path varchar2) return self as result is begin self.schema_name := schema_name; self.object_name := object_name; self.procedure_name := procedure_name; + self.originated_path := originated_path; return; end; - constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2,suite_path varchar2) return self as result is + constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2,suite_path varchar2, originated_path varchar2) return self as result is begin self.schema_name := schema_name; self.suite_path := suite_path; + self.originated_path := originated_path; return; end; - constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2, object_name varchar2,procedure_name varchar2,suite_path varchar2) return self as result is + constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2, object_name varchar2,procedure_name varchar2,suite_path varchar2, originated_path varchar2) return self as result is begin self.schema_name := schema_name; self.object_name := object_name; self.procedure_name := procedure_name; self.suite_path := suite_path; + self.originated_path := originated_path; return; end; end; diff --git a/source/core/types/ut_path_item.tps b/source/core/types/ut_path_item.tps index 9a5ef51d0..c4b751abc 100644 --- a/source/core/types/ut_path_item.tps +++ b/source/core/types/ut_path_item.tps @@ -15,12 +15,13 @@ create or replace type ut_path_item as object ( See the License for the specific language governing permissions and limitations under the License. */ - schema_name varchar2(4000), - object_name varchar2(250), - procedure_name varchar2(250), - suite_path varchar2(4000), - constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2, object_name varchar2,procedure_name varchar2) return self as result, - constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2,suite_path varchar2) return self as result, - constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2, object_name varchar2,procedure_name varchar2,suite_path varchar2) return self as result + schema_name varchar2(4000), + object_name varchar2(250), + procedure_name varchar2(250), + suite_path varchar2(4000), + originated_path varchar2(4000), + constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2, object_name varchar2,procedure_name varchar2, originated_path varchar2) return self as result, + constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2, suite_path varchar2, originated_path varchar2) return self as result, + constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2, object_name varchar2,procedure_name varchar2,suite_path varchar2, originated_path varchar2) return self as result ) / \ No newline at end of file diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index 562435e0f..aea6fc24b 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -277,13 +277,15 @@ create or replace package body ut_suite_cache_manager is for i in 1 .. a_paths.count loop l_results.extend; if a_paths(i) like '%:%' then - l_path_item := ut_path_item(upper(regexp_substr(a_paths(i),'^[^.:]+')), - ltrim(regexp_substr(a_paths(i),'[.:].*$'),':')); + l_path_item := ut_path_item(schema_name => upper(regexp_substr(a_paths(i),'^[^.:]+')), + suite_path => ltrim(regexp_substr(a_paths(i),'[.:].*$'),':'), + originated_path => a_paths(i)); l_results(l_results.last) := l_path_item; else - l_path_item := ut_path_item(regexp_substr(a_paths(i), c_package_path_regex, subexpression => 1), - regexp_substr(a_paths(i), c_package_path_regex, subexpression => 3), - regexp_substr(a_paths(i), c_package_path_regex, subexpression => 5)); + l_path_item := ut_path_item(schema_name => regexp_substr(a_paths(i), c_package_path_regex, subexpression => 1), + object_name => regexp_substr(a_paths(i), c_package_path_regex, subexpression => 3), + procedure_name => regexp_substr(a_paths(i), c_package_path_regex, subexpression => 5), + originated_path => a_paths(i)); l_results(l_results.last) := l_path_item; end if; end loop; @@ -359,41 +361,50 @@ create or replace package body ut_suite_cache_manager is l_schema_paths ut_path_items:= ut_path_items(); begin with paths_to_expand as ( - select /*+ no_parallel */ min(path) as suite_path,sp.schema_name as schema_name,nvl(sp.object_name,c.object_name) as object_name,sp.procedure_name as procedure_name - from ut_suite_cache c, - table(a_schema_paths) sp - where c.object_owner = upper(sp.schema_name) - and c.object_name like nvl(replace(upper(sp.object_name),'*','%'),c.object_name) - and c.name like nvl(replace(upper(sp.procedure_name),'*','%'), c.name) - and sp.suite_path is null - group by sp.schema_name,nvl(sp.object_name,c.object_name),sp.procedure_name + select /*+ no_parallel */ min(path) as suite_path,sp.schema_name as schema_name,nvl(sp.object_name,c.object_name) as object_name, + sp.procedure_name as procedure_name,sp.originated_path + from table(a_schema_paths) sp left outer join ut_suite_cache c + on ( c.object_owner = upper(sp.schema_name) + and c.object_name like replace(upper(sp.object_name),'*','%') + and c.name like nvl(replace(upper(sp.procedure_name),'*','%'), c.name)) + where sp.suite_path is null + and sp.object_name is not null + group by sp.schema_name,nvl(sp.object_name,c.object_name),sp.procedure_name,sp.originated_path union all - select /*+ no_parallel */ c.path as suite_path,sp.schema_name,sp.object_name,sp.procedure_name as procedure_name - from - ut_suite_cache c, - table(a_schema_paths) sp - where c.object_owner = upper(sp.schema_name) - and sp.suite_path is not null - and instr(sp.suite_path,'*') > 0 - and c.path like replace(sp.suite_path,'*','%') + select /*+ no_parallel */ c.path as suite_path,sp.schema_name,sp.object_name,sp.procedure_name as procedure_name,sp.originated_path + from + table(a_schema_paths) sp left outer join ut_suite_cache c on + ( c.object_owner = upper(sp.schema_name) + and sp.suite_path is not null + and instr(sp.suite_path,'*') > 0) + where c.path like replace(sp.suite_path,'*','%') union all - select /*+ no_parallel */ sp.suite_path as suite_path,sp.schema_name,sp.object_name,sp.procedure_name as procedure_name - from table(a_schema_paths) sp + select /*+ no_parallel */ sp.suite_path as suite_path,sp.schema_name,sp.object_name,sp.procedure_name as procedure_name,sp.originated_path + from table(a_schema_paths) sp where sp.suite_path is not null - and instr(sp.suite_path,'*') = 0 + and instr(sp.suite_path,'*') = 0 + union all + select /*+ no_parallel */ sp.suite_path as suite_path,sp.schema_name,sp.object_name,sp.procedure_name as procedure_name,sp.originated_path + from table(a_schema_paths) sp + where sp.suite_path is null and sp.object_name is null ) - select ut_path_item(schema_name,object_name,procedure_name,suite_path) + select ut_path_item(schema_name,object_name,procedure_name,suite_path,originated_path) bulk collect into l_schema_paths from - (select schema_name,object_name,procedure_name,suite_path, + (select schema_name,object_name,procedure_name,suite_path,originated_path, row_number() over ( partition by schema_name,object_name,procedure_name,suite_path order by 1) r_num from paths_to_expand) where r_num = 1 ; return l_schema_paths; end; + function get_schema_paths(a_paths in ut_varchar2_list) return ut_path_items is + begin + return expand_paths(group_paths_by_schema(a_paths)); + end; + function get_cached_suite_rows( - a_paths ut_varchar2_list, + a_schema_paths ut_path_items, a_random_seed positive := null, a_tags ut_varchar2_rows := null ) return ut_suite_cache_rows is @@ -417,7 +428,7 @@ create or replace package body ut_suite_cache_manager is from table(l_tags) where column_value like '-%'; - l_schema_paths := expand_paths(group_paths_by_schema(a_paths)); + l_schema_paths := a_schema_paths; --We still need to turn this into qualified SQL name....maybe as part of results ? l_suite_item_name := case when l_tags.count > 0 then 'suite_items_tags' else 'suite_items' end; diff --git a/source/core/ut_suite_cache_manager.pks b/source/core/ut_suite_cache_manager.pks index 10444a4d2..3e2ac6451 100644 --- a/source/core/ut_suite_cache_manager.pks +++ b/source/core/ut_suite_cache_manager.pks @@ -54,8 +54,10 @@ create or replace package ut_suite_cache_manager authid definer is a_tags ut_varchar2_rows := null ) return ut_suite_cache_rows; + function get_schema_paths(a_paths in ut_varchar2_list) return ut_path_items; + function get_cached_suite_rows( - a_paths ut_varchar2_list, + a_schema_paths ut_path_items, a_random_seed positive := null, a_tags ut_varchar2_rows := null ) return ut_suite_cache_rows; diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 2f081d2c2..2f019438c 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -18,10 +18,7 @@ create or replace package body ut_suite_manager is gc_suitpath_error_message constant varchar2(100) := 'Suitepath exceeds 1000 CHAR on: '; - cursor c_cached_suites_cursor is select * from table(ut_suite_cache_rows()); - type tt_cached_suites is table of c_cached_suites_cursor%rowtype; type t_cached_suites_cursor is ref cursor return c_cached_suites_cursor%rowtype; - type t_item_levels is table of ut_suite_items index by binary_integer; ------------------ @@ -339,30 +336,20 @@ create or replace package body ut_suite_manager is return l_result; end; - - function get_cached_suite_data( - a_paths ut_varchar2_list, - a_random_seed positive, - a_tags ut_varchar2_rows := null - ) return t_cached_suites_cursor is - l_unfiltered_rows ut_suite_cache_rows; + + function get_filtered_cursor(a_unfiltered_rows in ut_suite_cache_rows) + return t_cached_suites_cursor is l_result t_cached_suites_cursor; begin - l_unfiltered_rows := ut_suite_cache_manager.get_cached_suite_rows( - a_paths, - a_random_seed, - a_tags - ); - if ut_metadata.user_has_execute_any_proc() then open l_result for - select /*+ no_parallel */ c.* from table(l_unfiltered_rows) c; + select /*+ no_parallel */ c.* from table(a_unfiltered_rows) c; else open l_result for - select /*+ no_parallel */ c.* from table(l_unfiltered_rows) c + select /*+ no_parallel */ c.* from table(a_unfiltered_rows) c where sys_context( 'userenv', 'current_user' ) = upper(c.object_owner) union all - select /*+ no_parallel */ c.* from table(l_unfiltered_rows) c + select /*+ no_parallel */ c.* from table(a_unfiltered_rows) c where sys_context( 'userenv', 'current_user' ) != upper(c.object_owner) and ( exists ( select 1 @@ -371,13 +358,61 @@ create or replace package body ut_suite_manager is and a.owner = c.object_owner and a.object_type = 'PACKAGE' ) - or c.self_type = 'UT_LOGICAL_SUITE'); - - end if; - return l_result; - + or c.self_type = 'UT_LOGICAL_SUITE'); + end if; return l_result; end; + + procedure reconcile_paths_and_suites( + a_schema_paths ut_path_items, + a_filtered_rows t_cached_suites_cursor + ) is + l_rows_tmp tt_cached_suites:= tt_cached_suites(); + l_rows tt_cached_suites := tt_cached_suites(); + l_limit number := 5000; + begin + loop + fetch a_filtered_rows bulk collect into l_rows_tmp limit l_limit; + l_rows := l_rows multiset union l_rows_tmp; + exit when a_filtered_rows%NOTFOUND; + end loop; + close a_filtered_rows; + + for i in ( select /*+ no_parallel */sp.schema_name,sp.object_name,sp.procedure_name, + sp.suite_path,sp.originated_path,sc.path + from table(a_schema_paths) sp left outer join + table(l_rows) sc on + (( upper(sp.schema_name) = upper(sc.object_owner) and upper(sp.object_name) = upper(sc.object_name) + and nvl(upper(sp.procedure_name),sc.name) = sc.name ) + or (sc.path = sp.suite_path)) + where sc.path is null) + loop + if i.suite_path is not null then + raise_application_error(ut_utils.gc_suite_package_not_found,'No suite packages found for path '||i.schema_name||':'||i.suite_path|| '.'); + elsif i.procedure_name is not null then + raise_application_error(ut_utils.gc_suite_package_not_found,'Suite test '||i.schema_name||'.'||i.object_name|| '.'||i.procedure_name||' does not exist'); + elsif i.object_name is not null then + raise_application_error(ut_utils.gc_suite_package_not_found,'Suite package '||i.schema_name||'.'||i.object_name|| ' does not exist'); + end if; + end loop; + end; + + function get_cached_suite_data( + a_schema_paths ut_path_items, + a_random_seed positive, + a_tags ut_varchar2_rows := null + ) return t_cached_suites_cursor is + l_unfiltered_rows ut_suite_cache_rows; + l_result t_cached_suites_cursor; + begin + l_unfiltered_rows := ut_suite_cache_manager.get_cached_suite_rows( + a_schema_paths, + a_random_seed, + a_tags + ); + reconcile_paths_and_suites(a_schema_paths,get_filtered_cursor(l_unfiltered_rows)); + return get_filtered_cursor(l_unfiltered_rows); + end; function can_skip_all_objects_scan( a_owner_name varchar2 @@ -452,7 +487,7 @@ create or replace package body ut_suite_manager is end; procedure add_suites_for_paths( - a_paths ut_varchar2_list, + a_schema_paths ut_path_items, a_suites in out nocopy ut_suite_items, a_random_seed positive, a_tags ut_varchar2_rows := null @@ -461,7 +496,7 @@ create or replace package body ut_suite_manager is reconstruct_from_cache( a_suites, get_cached_suite_data( - a_paths, + a_schema_paths, a_random_seed, a_tags ) @@ -530,6 +565,8 @@ create or replace package body ut_suite_manager is ) is l_paths ut_varchar2_list := a_paths; l_schema_names ut_varchar2_rows; + l_schema_paths ut_path_items; + l_reconcile_paths ut_path_items; l_schema varchar2(4000); l_suites_count pls_integer := 0; l_index varchar2(4000 char); @@ -546,9 +583,11 @@ create or replace package body ut_suite_manager is l_schema := l_schema_names.next(l_schema); end loop; + l_schema_paths := ut_suite_cache_manager.get_schema_paths(l_paths); + --We will get a single list of paths rather than loop by loop. add_suites_for_paths( - l_paths, + l_schema_paths, a_suites, a_random_seed, a_tags diff --git a/source/core/ut_suite_manager.pks b/source/core/ut_suite_manager.pks index 5ae98d72a..e4160f599 100644 --- a/source/core/ut_suite_manager.pks +++ b/source/core/ut_suite_manager.pks @@ -20,6 +20,10 @@ create or replace package ut_suite_manager authid current_user is * Resposible for building hierarhy of sutes from individual suites created by suite_builder */ + cursor c_cached_suites_cursor is select * from table(ut_suite_cache_rows()); + type tt_cached_suites is table of c_cached_suites_cursor%rowtype; + + /** * @private * From ce4df285da6cd303fd38df345b0d68389dcaf348 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Tue, 29 Mar 2022 17:30:36 +0100 Subject: [PATCH 0935/1096] Stage 3. Fixing error calls. --- source/core/types/ut_path_item.tpb | 9 +- source/core/types/ut_path_item.tps | 7 +- source/core/ut_suite_cache_manager.pkb | 25 ++-- source/core/ut_suite_manager.pkb | 196 ++++++++++++++++++++++--- source/core/ut_suite_manager.pks | 3 - 5 files changed, 194 insertions(+), 46 deletions(-) diff --git a/source/core/types/ut_path_item.tpb b/source/core/types/ut_path_item.tpb index 2973b3412..3878b544c 100644 --- a/source/core/types/ut_path_item.tpb +++ b/source/core/types/ut_path_item.tpb @@ -15,30 +15,27 @@ create or replace type body ut_path_item as See the License for the specific language governing permissions and limitations under the License. */ - constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2, object_name varchar2,procedure_name varchar2, originated_path varchar2) return self as result is + constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2, object_name varchar2,procedure_name varchar2) return self as result is begin self.schema_name := schema_name; self.object_name := object_name; self.procedure_name := procedure_name; - self.originated_path := originated_path; return; end; - constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2,suite_path varchar2, originated_path varchar2) return self as result is + constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2,suite_path varchar2) return self as result is begin self.schema_name := schema_name; self.suite_path := suite_path; - self.originated_path := originated_path; return; end; - constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2, object_name varchar2,procedure_name varchar2,suite_path varchar2, originated_path varchar2) return self as result is + constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2, object_name varchar2,procedure_name varchar2,suite_path varchar2) return self as result is begin self.schema_name := schema_name; self.object_name := object_name; self.procedure_name := procedure_name; self.suite_path := suite_path; - self.originated_path := originated_path; return; end; end; diff --git a/source/core/types/ut_path_item.tps b/source/core/types/ut_path_item.tps index c4b751abc..f6c64195c 100644 --- a/source/core/types/ut_path_item.tps +++ b/source/core/types/ut_path_item.tps @@ -19,9 +19,8 @@ create or replace type ut_path_item as object ( object_name varchar2(250), procedure_name varchar2(250), suite_path varchar2(4000), - originated_path varchar2(4000), - constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2, object_name varchar2,procedure_name varchar2, originated_path varchar2) return self as result, - constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2, suite_path varchar2, originated_path varchar2) return self as result, - constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2, object_name varchar2,procedure_name varchar2,suite_path varchar2, originated_path varchar2) return self as result + constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2, object_name varchar2,procedure_name varchar2) return self as result, + constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2, suite_path varchar2) return self as result, + constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2, object_name varchar2,procedure_name varchar2,suite_path varchar2) return self as result ) / \ No newline at end of file diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index aea6fc24b..a83be01a0 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -278,14 +278,12 @@ create or replace package body ut_suite_cache_manager is l_results.extend; if a_paths(i) like '%:%' then l_path_item := ut_path_item(schema_name => upper(regexp_substr(a_paths(i),'^[^.:]+')), - suite_path => ltrim(regexp_substr(a_paths(i),'[.:].*$'),':'), - originated_path => a_paths(i)); + suite_path => ltrim(regexp_substr(a_paths(i),'[.:].*$'),':')); l_results(l_results.last) := l_path_item; else l_path_item := ut_path_item(schema_name => regexp_substr(a_paths(i), c_package_path_regex, subexpression => 1), object_name => regexp_substr(a_paths(i), c_package_path_regex, subexpression => 3), - procedure_name => regexp_substr(a_paths(i), c_package_path_regex, subexpression => 5), - originated_path => a_paths(i)); + procedure_name => regexp_substr(a_paths(i), c_package_path_regex, subexpression => 5)); l_results(l_results.last) := l_path_item; end if; end loop; @@ -359,19 +357,19 @@ create or replace package body ut_suite_cache_manager is function expand_paths(a_schema_paths ut_path_items) return ut_path_items is l_schema_paths ut_path_items:= ut_path_items(); - begin + begin with paths_to_expand as ( select /*+ no_parallel */ min(path) as suite_path,sp.schema_name as schema_name,nvl(sp.object_name,c.object_name) as object_name, - sp.procedure_name as procedure_name,sp.originated_path + sp.procedure_name as procedure_name from table(a_schema_paths) sp left outer join ut_suite_cache c on ( c.object_owner = upper(sp.schema_name) and c.object_name like replace(upper(sp.object_name),'*','%') and c.name like nvl(replace(upper(sp.procedure_name),'*','%'), c.name)) where sp.suite_path is null and sp.object_name is not null - group by sp.schema_name,nvl(sp.object_name,c.object_name),sp.procedure_name,sp.originated_path + group by sp.schema_name,nvl(sp.object_name,c.object_name),sp.procedure_name union all - select /*+ no_parallel */ c.path as suite_path,sp.schema_name,sp.object_name,sp.procedure_name as procedure_name,sp.originated_path + select /*+ no_parallel */ c.path as suite_path,sp.schema_name,sp.object_name,sp.procedure_name as procedure_name from table(a_schema_paths) sp left outer join ut_suite_cache c on ( c.object_owner = upper(sp.schema_name) @@ -379,22 +377,25 @@ create or replace package body ut_suite_cache_manager is and instr(sp.suite_path,'*') > 0) where c.path like replace(sp.suite_path,'*','%') union all - select /*+ no_parallel */ sp.suite_path as suite_path,sp.schema_name,sp.object_name,sp.procedure_name as procedure_name,sp.originated_path + select /*+ no_parallel */ sp.suite_path as suite_path,sp.schema_name,sp.object_name,sp.procedure_name as procedure_name from table(a_schema_paths) sp where sp.suite_path is not null and instr(sp.suite_path,'*') = 0 union all - select /*+ no_parallel */ sp.suite_path as suite_path,sp.schema_name,sp.object_name,sp.procedure_name as procedure_name,sp.originated_path + select /*+ no_parallel */ sp.suite_path as suite_path,sp.schema_name,sp.object_name,sp.procedure_name as procedure_name from table(a_schema_paths) sp where sp.suite_path is null and sp.object_name is null ) - select ut_path_item(schema_name,object_name,procedure_name,suite_path,originated_path) + select ut_path_item(schema_name,object_name,procedure_name,suite_path) bulk collect into l_schema_paths from - (select schema_name,object_name,procedure_name,suite_path,originated_path, + (select schema_name,object_name,procedure_name,suite_path, row_number() over ( partition by schema_name,object_name,procedure_name,suite_path order by 1) r_num from paths_to_expand) where r_num = 1 ; + + + return l_schema_paths; end; diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 2f019438c..2f21cdb67 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -17,7 +17,8 @@ create or replace package body ut_suite_manager is */ gc_suitpath_error_message constant varchar2(100) := 'Suitepath exceeds 1000 CHAR on: '; - + cursor c_cached_suites_cursor is select * from table(ut_suite_cache_rows()); + type tt_cached_suites is table of c_cached_suites_cursor%rowtype; type t_cached_suites_cursor is ref cursor return c_cached_suites_cursor%rowtype; type t_item_levels is table of ut_suite_items index by binary_integer; ------------------ @@ -252,6 +253,121 @@ create or replace package body ut_suite_manager is return l_result; end; + function get_logical_suite( + a_rows ut_suite_cache_rows, + a_idx pls_integer, + a_level pls_integer, + a_prev_level pls_integer, + a_items_at_level t_item_levels + ) return ut_suite_item is + l_result ut_suite_item; + begin + case a_rows( a_idx ).self_type + when 'UT_SUITE' then + l_result := + case when a_prev_level > a_level then + ut_suite( + self_type => a_rows( a_idx ).self_type, + object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), + name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, + rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, disabled_reason => a_rows(a_idx).disabled_reason, + line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, + start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, + results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), + items => a_items_at_level(a_prev_level), + before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( + a_rows( a_idx ).after_all_list), tags => a_rows(a_idx).tags + ) + else + ut_suite( + self_type => a_rows( a_idx ).self_type, + object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), + name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, + rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, disabled_reason => a_rows(a_idx).disabled_reason, + line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, + start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, + results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), + items => ut_suite_items(), + before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( + a_rows( a_idx ).after_all_list), tags => a_rows(a_idx).tags + ) + end; + when 'UT_SUITE_CONTEXT' then + l_result := + case when a_prev_level > a_level then + ut_suite_context( + self_type => a_rows( a_idx ).self_type, + object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), + name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, + rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, disabled_reason => a_rows(a_idx).disabled_reason, + line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, + start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, + results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), + items => a_items_at_level(a_prev_level), + before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( + a_rows( a_idx ).after_all_list), tags => a_rows(a_idx).tags + ) + else + ut_suite_context( + self_type => a_rows( a_idx ).self_type, + object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), + name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, + rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, disabled_reason => a_rows(a_idx).disabled_reason, + line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, + start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, + results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), + items => ut_suite_items(), + before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( + a_rows( a_idx ).after_all_list), tags => a_rows(a_idx).tags + ) + end; + when 'UT_LOGICAL_SUITE' then + l_result := + case when a_prev_level > a_level then + ut_logical_suite( + self_type => a_rows( a_idx ).self_type, + object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), + name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, + rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, disabled_reason => a_rows(a_idx).disabled_reason, + line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, + start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, + results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), + items => a_items_at_level(a_prev_level), tags => null + ) + else + ut_logical_suite( + self_type => a_rows( a_idx ).self_type, + object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), + name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, + rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, disabled_reason => a_rows(a_idx).disabled_reason, + line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, + start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, + results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), + items => ut_suite_items(), tags => null + ) + end; + when 'UT_TEST' then + l_result := + ut_test( + self_type => a_rows(a_idx).self_type, + object_owner => a_rows(a_idx).object_owner, object_name => lower(a_rows(a_idx).object_name), + name => lower(a_rows(a_idx).name), description => a_rows(a_idx).description, path => a_rows(a_idx).path, + rollback_type => a_rows(a_idx).rollback_type, disabled_flag => a_rows(a_idx).disabled_flag, disabled_reason => a_rows(a_idx).disabled_reason, + line_no => a_rows(a_idx).line_no, parse_time => a_rows(a_idx).parse_time, + start_time => null, end_time => null, result => null, warnings => a_rows(a_idx).warnings, + results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), + before_each_list => sort_by_seq_no(a_rows(a_idx).before_each_list), before_test_list => sort_by_seq_no(a_rows(a_idx).before_test_list), + item => a_rows(a_idx).item, + after_test_list => sort_by_seq_no(a_rows(a_idx).after_test_list), after_each_list => sort_by_seq_no(a_rows(a_idx).after_each_list), + all_expectations => ut_expectation_results(), failed_expectations => ut_expectation_results(), + parent_error_stack_trace => null, expected_error_codes => a_rows(a_idx).expected_error_codes, + tags => a_rows(a_idx).tags + ); + end case; + l_result.results_count.warnings_count := l_result.warnings.count; + return l_result; + end; + procedure reconstruct_from_cache( a_suites in out nocopy ut_suite_items, a_suite_data_cursor sys_refcursor @@ -298,6 +414,47 @@ create or replace package body ut_suite_manager is close a_suite_data_cursor; end reconstruct_from_cache; + procedure reconstruct_from_cache( + a_suites in out nocopy ut_suite_items, + a_suite_data_cursor ut_suite_cache_rows + ) is + c_bulk_limit constant pls_integer := 1000; + l_items_at_level t_item_levels; + l_rows ut_suite_cache_rows := a_suite_data_cursor; + l_level pls_integer; + l_prev_level pls_integer; + l_idx integer; + begin + l_idx := l_rows.first; + while l_idx is not null loop + l_level := length(l_rows(l_idx).path) - length( replace(l_rows(l_idx).path, '.') ) + 1; + if l_level > 1 then + if not l_items_at_level.exists(l_level) then + l_items_at_level(l_level) := ut_suite_items(); + end if; + l_items_at_level(l_level).extend; + pragma inline(get_logical_suite, 'YES'); + l_items_at_level(l_level)(l_items_at_level(l_level).last) := get_logical_suite(l_rows, l_idx, l_level,l_prev_level, l_items_at_level ); + else + a_suites.extend; + pragma inline(get_logical_suite, 'YES'); + a_suites(a_suites.last) := get_logical_suite(l_rows, l_idx, l_level,l_prev_level, l_items_at_level ); + end if; + if l_prev_level > l_level then + l_items_at_level(l_prev_level).delete; + end if; + l_prev_level := l_level; + l_idx := l_rows.next(l_idx); + end loop; + + reverse_list_order( a_suites ); + + for i in 1 .. a_suites.count loop + a_suites( i ).set_rollback_type( a_suites( i ).get_rollback_type ); + end loop; + end reconstruct_from_cache; + + function get_cached_suite_data( a_object_owner varchar2, a_path varchar2 := null, @@ -338,14 +495,13 @@ create or replace package body ut_suite_manager is end; function get_filtered_cursor(a_unfiltered_rows in ut_suite_cache_rows) - return t_cached_suites_cursor is - l_result t_cached_suites_cursor; + return ut_suite_cache_rows is + l_result ut_suite_cache_rows := ut_suite_cache_rows(); begin if ut_metadata.user_has_execute_any_proc() then - open l_result for - select /*+ no_parallel */ c.* from table(a_unfiltered_rows) c; + l_result := a_unfiltered_rows; else - open l_result for + for i in ( select /*+ no_parallel */ c.* from table(a_unfiltered_rows) c where sys_context( 'userenv', 'current_user' ) = upper(c.object_owner) union all @@ -358,30 +514,29 @@ create or replace package body ut_suite_manager is and a.owner = c.object_owner and a.object_type = 'PACKAGE' ) - or c.self_type = 'UT_LOGICAL_SUITE'); + or c.self_type = 'UT_LOGICAL_SUITE')) + loop + l_result.extend; + l_result(l_result.last) := ut_suite_cache_row(i.id,i.self_type,i.path,i.object_owner,i.object_name,i.name,i.line_no,i.parse_time, + i.description,i.rollback_type,i.disabled_flag,i.disabled_reason,i.warnings,i.before_all_list,i.after_all_list,i.before_each_list, + i.before_test_list,i.after_each_list,i.after_test_list,i.expected_error_codes,i.tags,i.item); + end loop; end if; return l_result; end; procedure reconcile_paths_and_suites( a_schema_paths ut_path_items, - a_filtered_rows t_cached_suites_cursor + a_filtered_rows ut_suite_cache_rows ) is l_rows_tmp tt_cached_suites:= tt_cached_suites(); l_rows tt_cached_suites := tt_cached_suites(); l_limit number := 5000; - begin - loop - fetch a_filtered_rows bulk collect into l_rows_tmp limit l_limit; - l_rows := l_rows multiset union l_rows_tmp; - exit when a_filtered_rows%NOTFOUND; - end loop; - close a_filtered_rows; - - for i in ( select /*+ no_parallel */sp.schema_name,sp.object_name,sp.procedure_name, - sp.suite_path,sp.originated_path,sc.path + begin + for i in ( select /*+ no_parallel */ sp.schema_name,sp.object_name,sp.procedure_name, + sp.suite_path,sc.path from table(a_schema_paths) sp left outer join - table(l_rows) sc on + table(a_filtered_rows) sc on (( upper(sp.schema_name) = upper(sc.object_owner) and upper(sp.object_name) = upper(sc.object_name) and nvl(upper(sp.procedure_name),sc.name) = sc.name ) or (sc.path = sp.suite_path)) @@ -401,9 +556,8 @@ create or replace package body ut_suite_manager is a_schema_paths ut_path_items, a_random_seed positive, a_tags ut_varchar2_rows := null - ) return t_cached_suites_cursor is + ) return ut_suite_cache_rows is l_unfiltered_rows ut_suite_cache_rows; - l_result t_cached_suites_cursor; begin l_unfiltered_rows := ut_suite_cache_manager.get_cached_suite_rows( a_schema_paths, diff --git a/source/core/ut_suite_manager.pks b/source/core/ut_suite_manager.pks index e4160f599..acc298516 100644 --- a/source/core/ut_suite_manager.pks +++ b/source/core/ut_suite_manager.pks @@ -20,9 +20,6 @@ create or replace package ut_suite_manager authid current_user is * Resposible for building hierarhy of sutes from individual suites created by suite_builder */ - cursor c_cached_suites_cursor is select * from table(ut_suite_cache_rows()); - type tt_cached_suites is table of c_cached_suites_cursor%rowtype; - /** * @private From 273962b39c864cfcc38616f3827d434e6fc4879b Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Wed, 30 Mar 2022 00:13:11 +0100 Subject: [PATCH 0936/1096] Fixing issue with a non visible tests. --- source/core/ut_suite_manager.pkb | 173 ++----------------------------- 1 file changed, 11 insertions(+), 162 deletions(-) diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 2f21cdb67..45eec7c14 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -253,121 +253,6 @@ create or replace package body ut_suite_manager is return l_result; end; - function get_logical_suite( - a_rows ut_suite_cache_rows, - a_idx pls_integer, - a_level pls_integer, - a_prev_level pls_integer, - a_items_at_level t_item_levels - ) return ut_suite_item is - l_result ut_suite_item; - begin - case a_rows( a_idx ).self_type - when 'UT_SUITE' then - l_result := - case when a_prev_level > a_level then - ut_suite( - self_type => a_rows( a_idx ).self_type, - object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), - name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, - rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, disabled_reason => a_rows(a_idx).disabled_reason, - line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, - start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, - results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), - items => a_items_at_level(a_prev_level), - before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( - a_rows( a_idx ).after_all_list), tags => a_rows(a_idx).tags - ) - else - ut_suite( - self_type => a_rows( a_idx ).self_type, - object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), - name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, - rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, disabled_reason => a_rows(a_idx).disabled_reason, - line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, - start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, - results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), - items => ut_suite_items(), - before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( - a_rows( a_idx ).after_all_list), tags => a_rows(a_idx).tags - ) - end; - when 'UT_SUITE_CONTEXT' then - l_result := - case when a_prev_level > a_level then - ut_suite_context( - self_type => a_rows( a_idx ).self_type, - object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), - name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, - rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, disabled_reason => a_rows(a_idx).disabled_reason, - line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, - start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, - results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), - items => a_items_at_level(a_prev_level), - before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( - a_rows( a_idx ).after_all_list), tags => a_rows(a_idx).tags - ) - else - ut_suite_context( - self_type => a_rows( a_idx ).self_type, - object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), - name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, - rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, disabled_reason => a_rows(a_idx).disabled_reason, - line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, - start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, - results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), - items => ut_suite_items(), - before_all_list => sort_by_seq_no( a_rows( a_idx ).before_all_list), after_all_list => sort_by_seq_no( - a_rows( a_idx ).after_all_list), tags => a_rows(a_idx).tags - ) - end; - when 'UT_LOGICAL_SUITE' then - l_result := - case when a_prev_level > a_level then - ut_logical_suite( - self_type => a_rows( a_idx ).self_type, - object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), - name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, - rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, disabled_reason => a_rows(a_idx).disabled_reason, - line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, - start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, - results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), - items => a_items_at_level(a_prev_level), tags => null - ) - else - ut_logical_suite( - self_type => a_rows( a_idx ).self_type, - object_owner => a_rows( a_idx ).object_owner, object_name => lower( a_rows( a_idx ).object_name), - name => lower( a_rows( a_idx ).name), description => a_rows( a_idx ).description, path => a_rows( a_idx ).path, - rollback_type => a_rows( a_idx ).rollback_type, disabled_flag => a_rows( a_idx ).disabled_flag, disabled_reason => a_rows(a_idx).disabled_reason, - line_no => a_rows( a_idx ).line_no, parse_time => a_rows( a_idx ).parse_time, - start_time => null, end_time => null, result => null, warnings => a_rows( a_idx ).warnings, - results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), - items => ut_suite_items(), tags => null - ) - end; - when 'UT_TEST' then - l_result := - ut_test( - self_type => a_rows(a_idx).self_type, - object_owner => a_rows(a_idx).object_owner, object_name => lower(a_rows(a_idx).object_name), - name => lower(a_rows(a_idx).name), description => a_rows(a_idx).description, path => a_rows(a_idx).path, - rollback_type => a_rows(a_idx).rollback_type, disabled_flag => a_rows(a_idx).disabled_flag, disabled_reason => a_rows(a_idx).disabled_reason, - line_no => a_rows(a_idx).line_no, parse_time => a_rows(a_idx).parse_time, - start_time => null, end_time => null, result => null, warnings => a_rows(a_idx).warnings, - results_count => ut_results_counter(), transaction_invalidators => ut_varchar2_list(), - before_each_list => sort_by_seq_no(a_rows(a_idx).before_each_list), before_test_list => sort_by_seq_no(a_rows(a_idx).before_test_list), - item => a_rows(a_idx).item, - after_test_list => sort_by_seq_no(a_rows(a_idx).after_test_list), after_each_list => sort_by_seq_no(a_rows(a_idx).after_each_list), - all_expectations => ut_expectation_results(), failed_expectations => ut_expectation_results(), - parent_error_stack_trace => null, expected_error_codes => a_rows(a_idx).expected_error_codes, - tags => a_rows(a_idx).tags - ); - end case; - l_result.results_count.warnings_count := l_result.warnings.count; - return l_result; - end; - procedure reconstruct_from_cache( a_suites in out nocopy ut_suite_items, a_suite_data_cursor sys_refcursor @@ -414,47 +299,7 @@ create or replace package body ut_suite_manager is close a_suite_data_cursor; end reconstruct_from_cache; - procedure reconstruct_from_cache( - a_suites in out nocopy ut_suite_items, - a_suite_data_cursor ut_suite_cache_rows - ) is - c_bulk_limit constant pls_integer := 1000; - l_items_at_level t_item_levels; - l_rows ut_suite_cache_rows := a_suite_data_cursor; - l_level pls_integer; - l_prev_level pls_integer; - l_idx integer; - begin - l_idx := l_rows.first; - while l_idx is not null loop - l_level := length(l_rows(l_idx).path) - length( replace(l_rows(l_idx).path, '.') ) + 1; - if l_level > 1 then - if not l_items_at_level.exists(l_level) then - l_items_at_level(l_level) := ut_suite_items(); - end if; - l_items_at_level(l_level).extend; - pragma inline(get_logical_suite, 'YES'); - l_items_at_level(l_level)(l_items_at_level(l_level).last) := get_logical_suite(l_rows, l_idx, l_level,l_prev_level, l_items_at_level ); - else - a_suites.extend; - pragma inline(get_logical_suite, 'YES'); - a_suites(a_suites.last) := get_logical_suite(l_rows, l_idx, l_level,l_prev_level, l_items_at_level ); - end if; - if l_prev_level > l_level then - l_items_at_level(l_prev_level).delete; - end if; - l_prev_level := l_level; - l_idx := l_rows.next(l_idx); - end loop; - - reverse_list_order( a_suites ); - - for i in 1 .. a_suites.count loop - a_suites( i ).set_rollback_type( a_suites( i ).get_rollback_type ); - end loop; - end reconstruct_from_cache; - - + function get_cached_suite_data( a_object_owner varchar2, a_path varchar2 := null, @@ -529,9 +374,6 @@ create or replace package body ut_suite_manager is a_schema_paths ut_path_items, a_filtered_rows ut_suite_cache_rows ) is - l_rows_tmp tt_cached_suites:= tt_cached_suites(); - l_rows tt_cached_suites := tt_cached_suites(); - l_limit number := 5000; begin for i in ( select /*+ no_parallel */ sp.schema_name,sp.object_name,sp.procedure_name, sp.suite_path,sc.path @@ -556,16 +398,23 @@ create or replace package body ut_suite_manager is a_schema_paths ut_path_items, a_random_seed positive, a_tags ut_varchar2_rows := null - ) return ut_suite_cache_rows is + ) return t_cached_suites_cursor is l_unfiltered_rows ut_suite_cache_rows; + l_filtered_rows ut_suite_cache_rows; + l_result t_cached_suites_cursor; begin l_unfiltered_rows := ut_suite_cache_manager.get_cached_suite_rows( a_schema_paths, a_random_seed, a_tags ); - reconcile_paths_and_suites(a_schema_paths,get_filtered_cursor(l_unfiltered_rows)); - return get_filtered_cursor(l_unfiltered_rows); + + l_filtered_rows := get_filtered_cursor(l_unfiltered_rows); + reconcile_paths_and_suites(a_schema_paths,l_filtered_rows); + + open l_result for + select * from table(l_filtered_rows); + return l_result; end; function can_skip_all_objects_scan( From a753e66aa3f8062d0aa6aa3fc2d7386e61fc6176 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Wed, 30 Mar 2022 09:54:03 +0100 Subject: [PATCH 0937/1096] Fixing ORA-600 --- source/core/ut_suite_cache_manager.pkb | 123 ++++++++++++++++--------- 1 file changed, 80 insertions(+), 43 deletions(-) diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index a83be01a0..154af6f0c 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -88,34 +88,12 @@ create or replace package body ut_suite_cache_manager is q'[with suite_items as ( select /*+ cardinality(c 500) */ value(c) as obj - from ut_suite_cache c, - table(:l_schema_paths) sp - where c.object_owner = upper(sp.schema_name) - and sp.suite_path is not null - and ( - sp.suite_path||'.' like c.path||'.%' /*all parents and self*/ - or - ( - c.path||'.' like sp.suite_path||'.%' /*all children and self*/ - and c.object_name like nvl(upper(sp.object_name),c.object_name) - and c.name like nvl(upper(sp.procedure_name),c.name) - ) - ) - union all - select /*+ cardinality(c 500) */ value(c) as obj - from ut_suite_cache c, - table(:l_schema_paths) sp - where c.object_owner = upper(sp.schema_name) - and sp.suite_path is null - and c.object_name like nvl(upper(replace(sp.object_name,'*','%')),c.object_name) - and c.name like nvl(upper(replace(sp.procedure_name,'*','%')),c.name) - ), - {:tags:} + from table(:suite_items) c), suitepaths as ( select distinct substr(c.obj.path,1,instr(c.obj.path,'.',-1)-1) as suitepath, c.obj.path as path, c.obj.object_owner as object_owner - from {:suite_item_name:} c + from suite_items c where c.obj.self_type = 'UT_SUITE' ), gen as ( @@ -152,7 +130,7 @@ create or replace package body ut_suite_cache_manager is from logical_suite_data s ), items as ( - select obj from {:suite_item_name:} + select obj from suite_items union all select obj from logical_suites ) @@ -404,44 +382,103 @@ create or replace package body ut_suite_cache_manager is return expand_paths(group_paths_by_schema(a_paths)); end; + function get_suite_items ( + a_schema_paths ut_path_items + ) return ut_suite_cache_rows is + l_suite_items ut_suite_cache_rows := ut_suite_cache_rows(); + begin + select /*+ cardinality(c 500) */ value(c) as obj + bulk collect into l_suite_items + from ut_suite_cache c, + table(a_schema_paths) sp + where c.object_owner = upper(sp.schema_name) + and ( + (sp.suite_path is not null and + sp.suite_path||'.' like c.path||'.%' /*all parents and self*/ + or + ( c.path||'.' like sp.suite_path||'.%' /*all children and self*/ + and c.object_name like nvl(upper(sp.object_name),c.object_name) + and c.name like nvl(upper(sp.procedure_name),c.name) ) ) + or + ( sp.suite_path is null + and c.object_name like nvl(upper(replace(sp.object_name,'*','%')),c.object_name) + and c.name like nvl(upper(replace(sp.procedure_name,'*','%')),c.name) + )); + return l_suite_items; + end; + + function get_tags_suites ( + a_suite_items ut_suite_cache_rows, + a_tags ut_varchar2_rows + ) return ut_suite_cache_rows is + l_suite_tags ut_suite_cache_rows := ut_suite_cache_rows(); + l_include_tags ut_varchar2_rows; + l_exclude_tags ut_varchar2_rows; + begin + + select /*+ no_parallel */ column_value + bulk collect into l_include_tags + from table(a_tags) + where column_value not like '-%'; + + select /*+ no_parallel */ ltrim(column_value,'-') + bulk collect into l_exclude_tags + from table(a_tags) + where column_value like '-%'; + + with included_tags as ( + select c.path as path + from table(a_suite_items) c + where c.tags multiset intersect l_include_tags is not empty or l_include_tags is empty + ), + excluded_tags as ( + select c.path as path + from table(a_suite_items) c + where c.tags multiset intersect l_exclude_tags is not empty + ) + select value(c) as obj + bulk collect into l_suite_tags + from table(a_suite_items) c + where exists ( + select 1 from included_tags t + where t.path||'.' like c.path || '.%' /*all parents and self*/ + or c.path||'.' like t.path || '.%' /*all children and self*/ + ) + and not exists ( + select 1 from excluded_tags t + where c.path||'.' like t.path || '.%' /*all children and self*/ + ); + return l_suite_tags; + end; + function get_cached_suite_rows( a_schema_paths ut_path_items, a_random_seed positive := null, a_tags ut_varchar2_rows := null ) return ut_suite_cache_rows is l_results ut_suite_cache_rows := ut_suite_cache_rows(); + l_suite_items ut_suite_cache_rows := ut_suite_cache_rows(); l_schema_paths ut_path_items; l_tags ut_varchar2_rows := coalesce(a_tags,ut_varchar2_rows()); - l_include_tags ut_varchar2_rows; - l_exclude_tags ut_varchar2_rows; + l_suite_item_name varchar2(20); l_paths ut_varchar2_rows; l_schema varchar2(4000); l_sql varchar2(32767); begin - select /*+ no_parallel */ column_value - bulk collect into l_include_tags - from table(l_tags) - where column_value not like '-%'; - - select /*+ no_parallel */ ltrim(column_value,'-') - bulk collect into l_exclude_tags - from table(l_tags) - where column_value like '-%'; l_schema_paths := a_schema_paths; - --We still need to turn this into qualified SQL name....maybe as part of results ? - l_suite_item_name := case when l_tags.count > 0 then 'suite_items_tags' else 'suite_items' end; - l_sql := gc_get_bulk_cache_suite_sql; - l_sql := replace(l_sql,'{:suite_item_name:}',l_suite_item_name); - l_sql := replace(l_sql,'{:tags:}',get_tags_sql(l_tags.count)); l_sql := replace(l_sql,'{:random_seed:}',get_random_seed_sql(a_random_seed)); + l_suite_items := get_suite_items(a_schema_paths); + if l_tags.count > 0 then + l_suite_items := get_tags_suites(l_suite_items,l_tags); + end if; ut_event_manager.trigger_event(ut_event_manager.gc_debug, ut_key_anyvalues().put('l_sql',l_sql) ); - + execute immediate l_sql bulk collect into l_results - using l_schema_paths, l_schema_paths, l_include_tags, l_include_tags, l_exclude_tags, a_random_seed; + using l_suite_items, a_random_seed; return l_results; end; From 0d8d34dae7636626f30da9c285127ad4d3ecc31b Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Wed, 30 Mar 2022 13:34:12 +0100 Subject: [PATCH 0938/1096] Cleanup Phase1. --- source/core/ut_suite_cache_manager.pkb | 220 ++++--------------------- source/core/ut_suite_manager.pkb | 95 ++--------- 2 files changed, 41 insertions(+), 274 deletions(-) diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index 154af6f0c..b0b3f7d71 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -20,70 +20,6 @@ create or replace package body ut_suite_cache_manager is * Private code */ - gc_get_cache_suite_sql constant varchar2(32767) := - q'[with - suite_items as ( - select /*+ cardinality(c 500) */ value(c) as obj - from ut_suite_cache c - where 1 = 1 - and c.object_owner = :l_object_owner - and ( {:path:} - and {:object_name:} - and {:procedure_name:} - ) - ) - ), - {:tags:} - suitepaths as ( - select distinct substr(c.obj.path,1,instr(c.obj.path,'.',-1)-1) as suitepath, - c.obj.path as path, - c.obj.object_owner as object_owner - from {:suite_item_name:} c - where c.obj.self_type = 'UT_SUITE' - ), - gen as ( - select rownum as pos - from xmltable('1 to 20') - ), - suitepath_part AS ( - select distinct - substr(b.suitepath, 1, instr(b.suitepath || '.', '.', 1, g.pos) -1) as path, - object_owner - from suitepaths b - join gen g - on g.pos <= regexp_count(b.suitepath, '\w+') - ), - logical_suite_data as ( - select 'UT_LOGICAL_SUITE' as self_type, p.path, p.object_owner, - upper( substr(p.path, instr( p.path, '.', -1 ) + 1 ) ) as object_name, - cast(null as ut_executables) as x, - cast(null as ut_varchar2_rows) as y, - cast(null as ut_executable_test) as z - from suitepath_part p - where p.path - not in (select s.path from suitepaths s) - ), - logical_suites as ( - select ut_suite_cache_row( - null, - s.self_type, s.path, s.object_owner, s.object_name, - s.object_name, null, null, null, null, 0,null, - ut_varchar2_rows(), - s.x, s.x, s.x, s.x, s.x, s.x, - s.y, null, s.z - ) as obj - from logical_suite_data s - ), - items as ( - select obj from {:suite_item_name:} - union all - select obj from logical_suites - ) - select /*+ no_parallel */ c.obj - from items c - order by c.obj.object_owner,{:random_seed:}]'; - - gc_get_bulk_cache_suite_sql constant varchar2(32767) := q'[with suite_items as ( @@ -157,61 +93,6 @@ create or replace package body ut_suite_cache_manager is return l_result; end; - - function get_path_sql(a_path in varchar2) return varchar2 is - begin - return case when a_path is not null then q'[ - :l_path||'.' like c.path || '.%' /*all parents and self*/ - or ( c.path||'.' like :l_path || '.%' /*all children and self*/ - ]' - else ' :l_path is null and ( :l_path is null ' end; - end; - - function get_object_name_sql(a_object_name in varchar2) return varchar2 is - begin - return case when a_object_name is not null - then ' c.object_name = :a_object_name ' - else ' :a_object_name is null' end; - end; - - function get_procedure_name_sql(a_procedure_name in varchar2) return varchar2 is - begin - return case when a_procedure_name is not null - then ' c.name = :a_procedure_name' - else ' :a_procedure_name is null' end; - end; - - function get_tags_sql(a_tags_count in integer) return varchar2 is - begin - return case when a_tags_count > 0 then - q'[included_tags as ( - select c.obj.path as path - from suite_items c - where c.obj.tags multiset intersect :a_include_tag_list is not empty or :a_include_tag_list is empty - ), - excluded_tags as ( - select c.obj.path as path - from suite_items c - where c.obj.tags multiset intersect :a_exclude_tag_list is not empty - ), - suite_items_tags as ( - select c.* - from suite_items c - where exists ( - select 1 from included_tags t - where t.path||'.' like c.obj.path || '.%' /*all parents and self*/ - or c.obj.path||'.' like t.path || '.%' /*all children and self*/ - ) - and not exists ( - select 1 from excluded_tags t - where c.obj.path||'.' like t.path || '.%' /*all children and self*/ - ) - ),]' - else - q'[dummy as (select 'x' from dual where :a_include_tag_list is null and :a_include_tag_list is null and :a_exclude_tag_list is null),]' - end; - end; - function get_random_seed_sql(a_random_seed positive) return varchar2 is begin return case @@ -269,70 +150,6 @@ create or replace package body ut_suite_cache_manager is return l_results; end; - - - /* - * Public code - */ - function get_cached_suite_rows( - a_object_owner varchar2, - a_path varchar2 := null, - a_object_name varchar2 := null, - a_procedure_name varchar2 := null, - a_random_seed positive := null, - a_tags ut_varchar2_rows := null - ) return ut_suite_cache_rows is - l_path varchar2(4000); - l_results ut_suite_cache_rows := ut_suite_cache_rows(); - l_sql varchar2(32767); - l_suite_item_name varchar2(20); - l_tags ut_varchar2_rows := coalesce(a_tags,ut_varchar2_rows()); - l_include_tags ut_varchar2_rows; - l_exclude_tags ut_varchar2_rows; - l_object_owner varchar2(250) := ut_utils.qualified_sql_name(a_object_owner); - l_object_name varchar2(250) := ut_utils.qualified_sql_name(a_object_name); - l_procedure_name varchar2(250) := ut_utils.qualified_sql_name(a_procedure_name); - begin - - select /*+ no_parallel */ column_value - bulk collect into l_include_tags - from table(l_tags) - where column_value not like '-%'; - - select /*+ no_parallel */ ltrim(column_value,'-') - bulk collect into l_exclude_tags - from table(l_tags) - where column_value like '-%'; - - if a_path is null and a_object_name is not null then - select /*+ no_parallel */ min(c.path) - into l_path - from ut_suite_cache c - where c.object_owner = upper(l_object_owner) - and c.object_name = upper(l_object_name) - and c.name = nvl(upper(l_procedure_name), c.name); - else - l_path := lower(ut_utils.qualified_sql_name(a_path)); - end if; - l_suite_item_name := case when l_tags.count > 0 then 'suite_items_tags' else 'suite_items' end; - - l_sql := gc_get_cache_suite_sql; - l_sql := replace(l_sql,'{:suite_item_name:}',l_suite_item_name); - l_sql := replace(l_sql,'{:object_owner:}',upper(l_object_owner)); - l_sql := replace(l_sql,'{:path:}',get_path_sql(l_path)); - l_sql := replace(l_sql,'{:object_name:}',get_object_name_sql(l_object_name)); - l_sql := replace(l_sql,'{:procedure_name:}',get_procedure_name_sql(l_procedure_name)); - l_sql := replace(l_sql,'{:tags:}',get_tags_sql(l_tags.count)); - l_sql := replace(l_sql,'{:random_seed:}',get_random_seed_sql(a_random_seed)); - - ut_event_manager.trigger_event(ut_event_manager.gc_debug, ut_key_anyvalues().put('l_sql',l_sql) ); - - execute immediate l_sql - bulk collect into l_results - using upper(l_object_owner), l_path, l_path, upper(a_object_name), upper(a_procedure_name), l_include_tags, l_include_tags, l_exclude_tags, a_random_seed; - return l_results; - end; - function expand_paths(a_schema_paths ut_path_items) return ut_path_items is l_schema_paths ut_path_items:= ut_path_items(); begin @@ -371,17 +188,9 @@ create or replace package body ut_suite_cache_manager is row_number() over ( partition by schema_name,object_name,procedure_name,suite_path order by 1) r_num from paths_to_expand) where r_num = 1 ; - - - return l_schema_paths; end; - - function get_schema_paths(a_paths in ut_varchar2_list) return ut_path_items is - begin - return expand_paths(group_paths_by_schema(a_paths)); - end; - + function get_suite_items ( a_schema_paths ut_path_items ) return ut_suite_cache_rows is @@ -451,6 +260,33 @@ create or replace package body ut_suite_cache_manager is return l_suite_tags; end; + /* + * Public code + */ + + function get_schema_paths(a_paths in ut_varchar2_list) return ut_path_items is + begin + return expand_paths(group_paths_by_schema(a_paths)); + end; + + function get_cached_suite_rows( + a_object_owner varchar2, + a_path varchar2 := null, + a_object_name varchar2 := null, + a_procedure_name varchar2 := null, + a_random_seed positive := null, + a_tags ut_varchar2_rows := null + ) return ut_suite_cache_rows is + l_tags ut_varchar2_rows := coalesce(a_tags,ut_varchar2_rows()); + l_object_owner varchar2(250) := ut_utils.qualified_sql_name(a_object_owner); + l_object_name varchar2(250) := ut_utils.qualified_sql_name(a_object_name); + l_procedure_name varchar2(250) := ut_utils.qualified_sql_name(a_procedure_name); + l_schema_paths ut_path_items; + begin + l_schema_paths := ut_path_items(ut_path_item(a_object_owner,a_object_name,a_procedure_name,a_path)); + return get_cached_suite_rows(l_schema_paths,a_random_seed,l_tags); + end; + function get_cached_suite_rows( a_schema_paths ut_path_items, a_random_seed positive := null, diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 45eec7c14..16beb0e36 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -299,51 +299,14 @@ create or replace package body ut_suite_manager is close a_suite_data_cursor; end reconstruct_from_cache; - - function get_cached_suite_data( - a_object_owner varchar2, - a_path varchar2 := null, - a_object_name varchar2 := null, - a_procedure_name varchar2 := null, - a_skip_all_objects boolean := false, - a_random_seed positive, - a_tags ut_varchar2_rows := null - ) return t_cached_suites_cursor is - l_unfiltered_rows ut_suite_cache_rows; - l_result t_cached_suites_cursor; - begin - l_unfiltered_rows := ut_suite_cache_manager.get_cached_suite_rows( - a_object_owner, - a_path, - a_object_name, - a_procedure_name, - a_random_seed, - a_tags - ); - if a_skip_all_objects then - open l_result for - select /*+ no_parallel */ c.* from table(l_unfiltered_rows) c; - else - open l_result for - select /*+ no_parallel */ c.* from table(l_unfiltered_rows) c - where exists - ( select 1 - from all_objects a - where a.object_name = c.object_name - and a.owner = c.object_owner - and a.object_type = 'PACKAGE' - ) - or c.self_type = 'UT_LOGICAL_SUITE'; - end if; - - return l_result; - end; - - function get_filtered_cursor(a_unfiltered_rows in ut_suite_cache_rows) + function get_filtered_cursor( + a_unfiltered_rows in ut_suite_cache_rows, + a_skip_all_objects boolean := false + ) return ut_suite_cache_rows is l_result ut_suite_cache_rows := ut_suite_cache_rows(); begin - if ut_metadata.user_has_execute_any_proc() then + if ut_metadata.user_has_execute_any_proc() or a_skip_all_objects then l_result := a_unfiltered_rows; else for i in ( @@ -397,7 +360,8 @@ create or replace package body ut_suite_manager is function get_cached_suite_data( a_schema_paths ut_path_items, a_random_seed positive, - a_tags ut_varchar2_rows := null + a_tags ut_varchar2_rows := null, + a_skip_all_objects boolean := false ) return t_cached_suites_cursor is l_unfiltered_rows ut_suite_cache_rows; l_filtered_rows ut_suite_cache_rows; @@ -409,7 +373,7 @@ create or replace package body ut_suite_manager is a_tags ); - l_filtered_rows := get_filtered_cursor(l_unfiltered_rows); + l_filtered_rows := get_filtered_cursor(l_unfiltered_rows,a_skip_all_objects); reconcile_paths_and_suites(a_schema_paths,l_filtered_rows); open l_result for @@ -519,19 +483,17 @@ create or replace package body ut_suite_manager is a_skip_all_objects boolean := false ) return ut_suite_items is l_suites ut_suite_items := ut_suite_items(); + l_schema_paths ut_path_items; begin build_and_cache_suites(a_owner_name, a_annotated_objects); - + l_schema_paths := ut_path_items(ut_path_item(a_owner_name,a_object_name,a_procedure_name,a_path)); reconstruct_from_cache( l_suites, get_cached_suite_data( - a_owner_name, - a_path, - a_object_name, - a_procedure_name, - a_skip_all_objects, + l_schema_paths, null, - null + null, + a_skip_all_objects ) ); return l_suites; @@ -596,37 +558,6 @@ create or replace package body ut_suite_manager is a_tags ); - /* - l_schema := l_schema_paths.first; - while l_schema is not null loop - l_path_items := l_schema_paths(l_schema); - for i in 1 .. l_path_items.count loop - l_path_item := l_path_items(i); - add_suites_for_path( - upper(l_schema), - l_path_item.suite_path, - l_path_item.object_name, - l_path_item.procedure_name, - a_suites, - a_random_seed, - a_tags - ); - if a_suites.count = l_suites_count then - if l_path_item.suite_path is not null then - raise_application_error(ut_utils.gc_suite_package_not_found,'No suite packages found for path '||l_schema||':'||l_path_item.suite_path|| '.'); - elsif l_path_item.procedure_name is not null then - raise_application_error(ut_utils.gc_suite_package_not_found,'Suite test '||l_schema||'.'||l_path_item.object_name|| '.'||l_path_item.procedure_name||' does not exist'); - elsif l_path_item.object_name is not null then - raise_application_error(ut_utils.gc_suite_package_not_found,'Suite package '||l_schema||'.'||l_path_item.object_name|| ' does not exist'); - end if; - end if; - l_index := a_suites.first; - l_suites_count := a_suites.count; - end loop; - l_schema := l_schema_paths.next(l_schema); - end loop;*/ - - --propagate rollback type to suite items after organizing suites into hierarchy for i in 1 .. a_suites.count loop a_suites(i).set_rollback_type( a_suites(i).get_rollback_type() ); From 95ddec1e535aa720a4383affecdb7ac158cba91e Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Thu, 31 Mar 2022 11:53:03 +0100 Subject: [PATCH 0939/1096] Adding tests. modifying code to cater for path with wildcard that can result in large item duplication due to parent/child search. --- source/core/ut_suite_cache_manager.pkb | 65 +++++--- source/core/ut_suite_manager.pks | 1 - test/ut3_tester/core/test_suite_manager.pkb | 162 ++++++++++++++++++++ test/ut3_tester/core/test_suite_manager.pks | 22 ++- 4 files changed, 225 insertions(+), 25 deletions(-) diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index b0b3f7d71..fe0aaabae 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -127,7 +127,6 @@ create or replace package body ut_suite_cache_manager is end; end; - --Possible move logic to type function group_paths_by_schema(a_paths ut_varchar2_list) return ut_path_items is c_package_path_regex constant varchar2(100) := '^([A-Za-z0-9$#_]+)(\.([A-Za-z0-9$#_\*]+))?(\.([A-Za-z0-9$#_\*]+))?$'; l_results ut_path_items := ut_path_items(); @@ -152,34 +151,41 @@ create or replace package body ut_suite_cache_manager is function expand_paths(a_schema_paths ut_path_items) return ut_path_items is l_schema_paths ut_path_items:= ut_path_items(); - begin + begin with paths_to_expand as ( - select /*+ no_parallel */ min(path) as suite_path,sp.schema_name as schema_name,nvl(sp.object_name,c.object_name) as object_name, - sp.procedure_name as procedure_name + /* + The object name is populate but suitepath not + We will use that object and try to match. + We can pass also a wildcard this will result in one to many. + */ + select /*+ no_parallel */ min(path) as suite_path,sp.schema_name as schema_name,nvl(c.object_name,sp.object_name) as object_name, + nvl2(sp.procedure_name,c.name,null) as procedure_name from table(a_schema_paths) sp left outer join ut_suite_cache c on ( c.object_owner = upper(sp.schema_name) and c.object_name like replace(upper(sp.object_name),'*','%') and c.name like nvl(replace(upper(sp.procedure_name),'*','%'), c.name)) - where sp.suite_path is null - and sp.object_name is not null - group by sp.schema_name,nvl(sp.object_name,c.object_name),sp.procedure_name + where sp.suite_path is null and sp.object_name is not null + group by sp.schema_name,nvl(c.object_name,sp.object_name),nvl2(sp.procedure_name,c.name,null) union all - select /*+ no_parallel */ c.path as suite_path,sp.schema_name,sp.object_name,sp.procedure_name as procedure_name + select /*+ no_parallel */ nvl(c.path,sp.suite_path) as suite_path,sp.schema_name,sp.object_name,sp.procedure_name as procedure_name from table(a_schema_paths) sp left outer join ut_suite_cache c on - ( c.object_owner = upper(sp.schema_name) - and sp.suite_path is not null - and instr(sp.suite_path,'*') > 0) - where c.path like replace(sp.suite_path,'*','%') + ( c.object_owner = upper(sp.schema_name) + and c.path like replace(sp.suite_path,'*','%')) + where sp.suite_path is not null and instr(sp.suite_path,'*') > 0 union all + /* + Get all data that do not have an wildcard and not require expanding. + We will take them as they are. + a)suite path is populated + b)suite path and object is empty so schema name is by default ( or passed) + */ select /*+ no_parallel */ sp.suite_path as suite_path,sp.schema_name,sp.object_name,sp.procedure_name as procedure_name from table(a_schema_paths) sp - where sp.suite_path is not null - and instr(sp.suite_path,'*') = 0 - union all - select /*+ no_parallel */ sp.suite_path as suite_path,sp.schema_name,sp.object_name,sp.procedure_name as procedure_name - from table(a_schema_paths) sp - where sp.suite_path is null and sp.object_name is null + where + (sp.suite_path is not null and instr(sp.suite_path,'*') = 0) + or + (sp.suite_path is null and sp.object_name is null) ) select ut_path_item(schema_name,object_name,procedure_name,suite_path) bulk collect into l_schema_paths @@ -190,14 +196,25 @@ create or replace package body ut_suite_cache_manager is where r_num = 1 ; return l_schema_paths; end; - + + /* + Get a suite items rows that matching our criteria like + path,object_name etc. + We need to consider also an wildcard character on our procedures and object + names. + Were the path is populated we need to make sure we dont return duplicates + as the wildcard can produce multiple results from same path and + parents and child for each can be same resulting in duplicates + TODO: Verify that this not duplicate with a expand paths. + */ function get_suite_items ( a_schema_paths ut_path_items ) return ut_suite_cache_rows is l_suite_items ut_suite_cache_rows := ut_suite_cache_rows(); begin - select /*+ cardinality(c 500) */ value(c) as obj - bulk collect into l_suite_items + select obj bulk collect into l_suite_items + from ( + select /*+ cardinality(c 500) */ value(c) as obj,row_number() over ( partition by path order by path asc) r_num from ut_suite_cache c, table(a_schema_paths) sp where c.object_owner = upper(sp.schema_name) @@ -212,10 +229,14 @@ create or replace package body ut_suite_cache_manager is ( sp.suite_path is null and c.object_name like nvl(upper(replace(sp.object_name,'*','%')),c.object_name) and c.name like nvl(upper(replace(sp.procedure_name,'*','%')),c.name) - )); + ))) where r_num = 1; return l_suite_items; end; + /* + Having a base set of suites we will do a further filter down if there are + any tags defined. + */ function get_tags_suites ( a_suite_items ut_suite_cache_rows, a_tags ut_varchar2_rows diff --git a/source/core/ut_suite_manager.pks b/source/core/ut_suite_manager.pks index acc298516..5ae98d72a 100644 --- a/source/core/ut_suite_manager.pks +++ b/source/core/ut_suite_manager.pks @@ -20,7 +20,6 @@ create or replace package ut_suite_manager authid current_user is * Resposible for building hierarhy of sutes from individual suites created by suite_builder */ - /** * @private * diff --git a/test/ut3_tester/core/test_suite_manager.pkb b/test/ut3_tester/core/test_suite_manager.pkb index c8b4a9453..48ecf91f0 100644 --- a/test/ut3_tester/core/test_suite_manager.pkb +++ b/test/ut3_tester/core/test_suite_manager.pkb @@ -945,6 +945,26 @@ end;]'; ut.expect(sqlerrm).to_be_like('%failing_non_existing%'); end; + procedure test_search_nonex_pck_wild is + l_objects_to_run ut3_develop.ut_suite_items; + begin + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list('ut3_develop.failing_non_*')); + ut.fail('Non existing package did not raise exception'); + exception + when others then + ut.expect(sqlerrm).to_be_like('%failing_non_*%'); + end; + + procedure test_search_nonex_path_wild is + l_objects_to_run ut3_develop.ut_suite_items; + begin + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list('ut3_develop:failing_non_*')); + ut.fail('Non existing path did not raise exception'); + exception + when others then + ut.expect(sqlerrm).to_be_like('%:failing_non_*%'); + end; + procedure test_search_nonexist_sch_pck is l_objects_to_run ut3_develop.ut_suite_items; begin @@ -1560,5 +1580,147 @@ end;]'; end; + procedure test_wild_card_obj_name is + c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||'.test_package_*'; + l_objects_to_run ut3_develop.ut_suite_items; + l_test_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_logical_suite; + l_test2_suite ut3_develop.ut_logical_suite; + l_ctx_suite ut3_develop.ut_logical_suite; + l_test_proc ut3_develop.ut_test; + begin + --Act + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(3); + + + for i in 1 .. 3 loop + l_test_suite := treat(l_objects_to_run(i) as ut3_develop.ut_logical_suite); + ut.expect(l_test_suite.name in ('test_package_with_ctx','tests', 'tests2')).to_be_true; + + case l_test_suite.name + when 'test_package_with_ctx' then + ut.expect(l_test_suite.items.count).to_equal(1); + l_ctx_suite:= treat(l_test_suite.items(1) as ut3_develop.ut_logical_suite); + ut.expect(l_ctx_suite.name).to_equal('some_context'); + ut.expect(l_ctx_suite.description).to_equal('Some context description'); + ut.expect(l_ctx_suite.items.count).to_equal(1); + l_test_proc := treat(l_ctx_suite.items(1) as ut3_develop.ut_test); + ut.expect(l_test_proc.name).to_equal('test1'); + when 'tests' then + l_test1_suite := treat(l_test_suite.items(1) as ut3_develop.ut_logical_suite); + ut.expect(l_test1_suite.name).to_equal('test_package_1'); + ut.expect(l_test1_suite.items.count).to_equal(3); + ut.expect(l_test1_suite.rollback_type).to_equal(ut3_develop.ut_utils.gc_rollback_manual); + l_test2_suite := treat(l_test1_suite.items(1) as ut3_develop.ut_logical_suite); + + ut.expect(l_test2_suite.name).to_equal('test_package_2'); + ut.expect(l_test2_suite.items.count).to_equal(3); + ut.expect(l_test2_suite.rollback_type).to_equal(ut3_develop.ut_utils.gc_rollback_manual); + when 'tests2' then + l_test1_suite := treat(l_test_suite.items(1) as ut3_develop.ut_logical_suite); + ut.expect(l_test1_suite.name).to_equal('test_package_3'); + ut.expect(l_test1_suite.items.count).to_equal(3); + end case; + + end loop; + + end; + + procedure test_wild_card_prc_name is + c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||'.test_package_1.test*'; + l_objects_to_run ut3_develop.ut_suite_items; + l_test_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_logical_suite; + l_test1_proc ut3_develop.ut_test; + l_test2_proc ut3_develop.ut_test; + begin + --Act + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); + ut.expect(l_test_suite.name).to_equal('tests'); + + l_test1_suite := treat(l_test_suite.items(1) as ut3_develop.ut_logical_suite); + ut.expect(l_test1_suite.name).to_equal('test_package_1'); + ut.expect(l_test1_suite.items.count).to_equal(2); + + l_test1_proc := treat(l_test1_suite.items(1) as ut3_develop.ut_test); + ut.expect(l_test1_proc.name).to_equal('test1'); + + l_test2_proc := treat(l_test1_suite.items(2) as ut3_develop.ut_test); + ut.expect(l_test2_proc.name).to_equal('test2'); + end; + + procedure test_wild_card_path_name is + c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||':tests*'; + l_objects_to_run ut3_develop.ut_suite_items; + l_test_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_logical_suite; + l_test2_suite ut3_develop.ut_logical_suite; + l_test3_suite ut3_develop.ut_logical_suite; + l_ctx_suite ut3_develop.ut_logical_suite; + l_test_proc ut3_develop.ut_test; + begin + --Act + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(2); + + + for i in 1 .. 2 loop + l_test_suite := treat(l_objects_to_run(i) as ut3_develop.ut_logical_suite); + ut.expect(l_test_suite.name in ('tests', 'tests2')).to_be_true; + + case l_test_suite.name + when 'tests' then + l_test1_suite := treat(l_test_suite.items(1) as ut3_develop.ut_logical_suite); + ut.expect(l_test1_suite.name).to_equal('test_package_1'); + ut.expect(l_test1_suite.items.count).to_equal(3); + + for i in 1 ..3 loop + --l_test2_suite := treat(l_test1_suite.items(i) as ut3_develop.ut_logical_suite); + --ut.expect(l_test2_suite.name).to_equal('test_package_2'); + --ut.expect(l_test2_suite.items.count).to_equal(3); + case l_test1_suite.items(i).self_type + when 'UT_SUITE' then + l_test2_suite := treat(l_test1_suite.items(i) as ut3_develop.ut_logical_suite); + ut.expect(l_test2_suite.name).to_equal('test_package_2'); + ut.expect(l_test2_suite.items.count).to_equal(3); + + l_test_proc := treat(l_test2_suite.items(1) as ut3_develop.ut_test); + ut.expect(l_test_proc.name in ('test1', 'test2','context_test')).to_be_true; + + l_test_proc := treat(l_test2_suite.items(2) as ut3_develop.ut_test); + ut.expect(l_test_proc.name in ('test1', 'test2','context_test')).to_be_true; + + l_test_proc := treat(l_test2_suite.items(3) as ut3_develop.ut_test); + ut.expect(l_test_proc.name in ('test1', 'test2','context_test')).to_be_true; + + when 'UT_TEST' then + l_test_proc := treat(l_test1_suite.items(i) as ut3_develop.ut_test); + ut.expect(l_test_proc.name in ('test1', 'test2')).to_be_true; + end case; + end loop; + when 'tests2' then + ut.expect(l_test_suite.items.count).to_equal(1); + l_test1_suite := treat(l_test_suite.items(1) as ut3_develop.ut_logical_suite); + ut.expect(l_test1_suite.name).to_equal('test_package_3'); + ut.expect(l_test1_suite.items.count).to_equal(3); + for i in 1 .. 3 loop + l_test_proc := treat(l_test1_suite.items(i) as ut3_develop.ut_test); + ut.expect(l_test_proc.name in ('test1', 'test2','disabled_test')).to_be_true; + end loop; + end case; + + end loop; + + end; + end test_suite_manager; / diff --git a/test/ut3_tester/core/test_suite_manager.pks b/test/ut3_tester/core/test_suite_manager.pks index 154df9ca6..bea8faf96 100644 --- a/test/ut3_tester/core/test_suite_manager.pks +++ b/test/ut3_tester/core/test_suite_manager.pks @@ -75,8 +75,14 @@ create or replace package test_suite_manager is --%test(Prepare runner for nonexisting package with schema) procedure test_search_nonexisting_pck; - - --%test(Prepare runner for nonexisting package without schema) + + --%test(Prepare runner for nonexisting package using wildcard filter) + procedure test_search_nonex_pck_wild; + + --%test(Prepare runner for nonexisting path using wildcard filter) + procedure test_search_nonex_path_wild; + + --%test(Prepare runner for nonexisting package without schema) procedure test_search_nonexist_sch_pck; --%test(Test description with comma) @@ -185,6 +191,18 @@ create or replace package test_suite_manager is --%aftertest(clean_remove_annot_test) procedure test_rem_cache_on_crt_anno; + --%context(wildcard_filters) + + --%test(Execute test_packages using a object_name with wildcard ) + procedure test_wild_card_obj_name; + + --%test(Execute test_packages using a procedure name with wildcard ) + procedure test_wild_card_prc_name; + + --%test(Execute test_packages using a path name with wildcard ) + procedure test_wild_card_path_name; + + --%endcontext end test_suite_manager; / From 83dbdaa4ba7ef57dcc8d86771cdb66d6eec19e7c Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Thu, 31 Mar 2022 15:40:28 +0100 Subject: [PATCH 0940/1096] Updating documentation. Adding get_suites_info override. --- docs/userguide/querying_suites.md | 10 +++++ docs/userguide/running-unit-tests.md | 28 +++++++++++++ source/api/ut_runner.pkb | 23 ++++++++++- source/api/ut_runner.pks | 9 ++++- source/core/ut_suite_cache_manager.pkb | 42 ++++++++++---------- source/core/ut_suite_cache_manager.pks | 9 +++-- source/core/ut_suite_manager.pkb | 55 ++++++++++++-------------- source/core/ut_suite_manager.pks | 10 ++--- 8 files changed, 122 insertions(+), 64 deletions(-) diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 2d947f391..b47b62083 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -39,6 +39,16 @@ To get a full information about suite `TEST_STUFF` including suite description, select * from table(ut_runner.get_suites_info(USER, 'TEST_STUFF')) where item_type = 'UT_TEST'; ``` +To get a full information about suites that have a path like `ut3:tests.test_package_*` including suite description, all contexts and tests in a suite +```sql +select * from table(ut_runner.get_suites_info('ut3:tests.test_package_*') where item_type = 'UT_TEST'; +``` + +To get a full information about suites that have object name like `test_package_*` including suite description, all contexts and tests in a suite +```sql +select * from table(ut_runner.get_suites_info('test_package_*')); +``` + ## Checking if schema contains tests Function `ut_runner.has_suites(a_owner)` returns boolean value indicating if given schema contains test suites. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index f392dd1e5..2a8f8e151 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -45,6 +45,10 @@ The **functions** can only be used in SELECT statements. They execute the specif ## ut.run procedures The examples below illustrate different ways and options to invoke `ut.run` procedures. +As part of the syntax you can use a wildcard character `*` to call test by part of his name or to call few tests that match a call. +Schema name is still mandatory and cannot contain a wildcard character whether is a suitepath or object. + + ```sql alter session set current_schema=hr; @@ -75,6 +79,14 @@ end; Executes all tests from all packages that are on the _com.my_org.my_project_ suitepath. Check the [annotations documentation](annotations.md) to find out about suitepaths and how they can be used to organize test packages for your project. +```sql +set serveroutput on +begin + ut.run('hr:com*'); +end; +``` + +Executes all tests from all packages that are on suitepath starting with _com_. ```sql set serveroutput on @@ -124,6 +136,22 @@ Using a list of items to execute allows you to execute a fine-grained set of tes List can be passed as a comma separated list or a list of *ut_varchar2_list objects* or as a list within ut_varchar2_list. +```sql +set serveroutput on +begin + ut.run('hr.test*'); +end; +``` +Executes all tests from schema _hr_ starting with name _test_. + +```sql +set serveroutput on +begin + ut.run('hr.test_apply_bonus.bonus_*'); +end; +``` +Executes all test procedures from package _hr.test_apply_bonus_ that starting with _bonus_. + **Note:** diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index cbf1971e7..c49f895a3 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -172,12 +172,31 @@ create or replace package body ut_runner is ut_annotation_manager.purge_cache(a_object_owner, a_object_type); end; - function get_suites_info(a_owner varchar2 := null, a_package_name varchar2 := null) return ut_suite_items_info pipelined is + function get_suites_info(a_owner varchar2, a_package_name varchar2) return ut_suite_items_info pipelined is l_cursor sys_refcursor; l_results ut_suite_items_info; c_bulk_limit constant integer := 100; + l_path varchar2(4000) := nvl(a_owner,sys_context('userenv', 'current_schema'))||'.'||nvl(a_package_name,'*'); begin - l_cursor := ut_suite_manager.get_suites_info( nvl(a_owner,sys_context('userenv', 'current_schema')), a_package_name ); + + l_cursor := ut_suite_manager.get_suites_info(ut_varchar2_list(l_path)); + loop + fetch l_cursor bulk collect into l_results limit c_bulk_limit; + for i in 1 .. l_results.count loop + pipe row (l_results(i)); + end loop; + exit when l_cursor%notfound; + end loop; + close l_cursor; + return; + end; + + function get_suites_info(a_path varchar2 := null) return ut_suite_items_info pipelined is + l_cursor sys_refcursor; + l_results ut_suite_items_info; + c_bulk_limit constant integer := 100; + begin + l_cursor := ut_suite_manager.get_suites_info(ut_varchar2_list(nvl(a_path,sys_context('userenv', 'current_schema')))); loop fetch l_cursor bulk collect into l_results limit c_bulk_limit; for i in 1 .. l_results.count loop diff --git a/source/api/ut_runner.pks b/source/api/ut_runner.pks index 3170dedee..e5afce691 100644 --- a/source/api/ut_runner.pks +++ b/source/api/ut_runner.pks @@ -104,7 +104,14 @@ create or replace package ut_runner authid current_user is * @param a_package_name name of unit test package to retrieve (optional), if NULL all unit test packages are returned * @return ut_suite_items_info table of objects */ - function get_suites_info(a_owner varchar2 := null, a_package_name varchar2 := null) return ut_suite_items_info pipelined; + function get_suites_info(a_owner varchar2, a_package_name varchar2) return ut_suite_items_info pipelined; + + /** + * Returns a pipelined collection containing information about unit test suites and the tests contained in them + * + * @param a_path a path from which we lookg for object or suite + */ + function get_suites_info(a_path varchar2 := null) return ut_suite_items_info pipelined; /** diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index fe0aaabae..95615e2d5 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -148,16 +148,20 @@ create or replace package body ut_suite_cache_manager is return l_results; end; - + /* + The object name is populate but suitepath not + We will use that object and try to match. + We can pass also a wildcard this will result in one to many. + + Get all data that do not have an wildcard and not require expanding. + We will take them as they are. + a)suite path is populated + b)suite path and object is empty so schema name is by default ( or passed) + */ function expand_paths(a_schema_paths ut_path_items) return ut_path_items is l_schema_paths ut_path_items:= ut_path_items(); begin - with paths_to_expand as ( - /* - The object name is populate but suitepath not - We will use that object and try to match. - We can pass also a wildcard this will result in one to many. - */ + with paths_to_expand as ( select /*+ no_parallel */ min(path) as suite_path,sp.schema_name as schema_name,nvl(c.object_name,sp.object_name) as object_name, nvl2(sp.procedure_name,c.name,null) as procedure_name from table(a_schema_paths) sp left outer join ut_suite_cache c @@ -174,12 +178,6 @@ create or replace package body ut_suite_cache_manager is and c.path like replace(sp.suite_path,'*','%')) where sp.suite_path is not null and instr(sp.suite_path,'*') > 0 union all - /* - Get all data that do not have an wildcard and not require expanding. - We will take them as they are. - a)suite path is populated - b)suite path and object is empty so schema name is by default ( or passed) - */ select /*+ no_parallel */ sp.suite_path as suite_path,sp.schema_name,sp.object_name,sp.procedure_name as procedure_name from table(a_schema_paths) sp where @@ -205,7 +203,6 @@ create or replace package body ut_suite_cache_manager is Were the path is populated we need to make sure we dont return duplicates as the wildcard can produce multiple results from same path and parents and child for each can be same resulting in duplicates - TODO: Verify that this not duplicate with a expand paths. */ function get_suite_items ( a_schema_paths ut_path_items @@ -484,22 +481,25 @@ create or replace package body ut_suite_cache_manager is end; function get_cached_suite_info( - a_object_owner varchar2, - a_object_name varchar2 + a_schema_paths ut_path_items + ) return ut_suite_cache_rows is + begin + return get_cached_suite_rows( a_schema_paths ); + end; + + function get_suite_items_info( + a_suite_cache_items ut_suite_cache_rows ) return ut_suite_items_info is - l_cache_rows ut_suite_cache_rows; l_results ut_suite_items_info; begin - l_cache_rows := get_cached_suite_rows( a_object_owner => a_object_owner, a_object_name =>a_object_name ); select /*+ no_parallel */ ut_suite_item_info( c.object_owner, c.object_name, c.name, c.description, c.self_type, c.line_no, c.path, c.disabled_flag, c.disabled_reason, c.tags ) bulk collect into l_results - from table(l_cache_rows) c; - - return l_results; + from table(a_suite_cache_items) c; + return l_results; end; function get_cached_packages( diff --git a/source/core/ut_suite_cache_manager.pks b/source/core/ut_suite_cache_manager.pks index 3e2ac6451..05bff7af9 100644 --- a/source/core/ut_suite_cache_manager.pks +++ b/source/core/ut_suite_cache_manager.pks @@ -68,10 +68,13 @@ create or replace package ut_suite_cache_manager authid definer is * Not to be used publicly. Used internally for building suites info. */ function get_cached_suite_info( - a_object_owner varchar2, - a_object_name varchar2 + a_schema_paths ut_path_items + ) return ut_suite_cache_rows; + + function get_suite_items_info( + a_suite_cache_items ut_suite_cache_rows ) return ut_suite_items_info; - + /* * Retrieves list of cached suite packages. * Returned data is not filtered by user access rights. diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 16beb0e36..cab24e607 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -533,8 +533,6 @@ create or replace package body ut_suite_manager is l_schema_paths ut_path_items; l_reconcile_paths ut_path_items; l_schema varchar2(4000); - l_suites_count pls_integer := 0; - l_index varchar2(4000 char); begin ut_event_manager.trigger_event('configure_execution_by_path - start'); a_suites := ut_suite_items(); @@ -567,37 +565,34 @@ create or replace package body ut_suite_manager is end configure_execution_by_path; function get_suites_info( - a_owner_name varchar2, - a_package_name varchar2 := null + a_paths ut_varchar2_list ) return sys_refcursor is - l_result sys_refcursor; - l_all_suite_info ut_suite_items_info; - l_owner_name varchar2(250) := ut_utils.qualified_sql_name(a_owner_name); - l_package_name varchar2(250) := ut_utils.qualified_sql_name(a_package_name); + l_result sys_refcursor; + l_all_suite_info ut_suite_items_info; + l_schema_names ut_varchar2_rows; + l_schema_paths ut_path_items; + l_paths ut_varchar2_list := a_paths; + l_schema varchar2(4000); + l_unfiltered_rows ut_suite_cache_rows; + l_filtered_rows ut_suite_cache_rows; + begin + l_schema_names := resolve_schema_names(l_paths); + --refresh cache + l_schema := l_schema_names.first; + while l_schema is not null loop + refresh_cache(upper(l_schema_names(l_schema))); + l_schema := l_schema_names.next(l_schema); + end loop; + l_schema_paths := ut_suite_cache_manager.get_schema_paths(l_paths); + l_unfiltered_rows := ut_suite_cache_manager.get_cached_suite_info(l_schema_paths); + l_filtered_rows := get_filtered_cursor(l_unfiltered_rows); + l_all_suite_info := ut_suite_cache_manager.get_suite_items_info(l_filtered_rows); + open l_result for + select /*+ no_parallel */ value(c) + from table(l_all_suite_info) c + order by c.object_owner, c.object_name, c.item_line_no; - refresh_cache(l_owner_name); - - l_all_suite_info := ut_suite_cache_manager.get_cached_suite_info( l_owner_name, l_package_name ); - if can_skip_all_objects_scan( l_owner_name ) then - open l_result for - select /*+ no_parallel */ value(c) - from table(l_all_suite_info) c - order by c.object_owner, c.object_name, c.item_line_no; - else - open l_result for - select /*+ no_parallel */ value(c) - from table(l_all_suite_info) c - where exists - ( select 1 - from all_objects a - where a.object_name = c.object_name - and a.owner = c.object_owner - and a.object_type = 'PACKAGE' - ) - or c.item_type = 'UT_LOGICAL_SUITE' - order by c.object_owner, c.object_name, c.item_line_no; - end if; return l_result; end; diff --git a/source/core/ut_suite_manager.pks b/source/core/ut_suite_manager.pks index 5ae98d72a..6c96500b3 100644 --- a/source/core/ut_suite_manager.pks +++ b/source/core/ut_suite_manager.pks @@ -79,15 +79,11 @@ create or replace package ut_suite_manager authid current_user is /** * Returns a ref cursor containing information about unit test suites and the tests contained in them * - * @param a_owner owner of unit tests to retrieve - * @param a_package_name name of test package (optional) - * @param a_procedure_name name of test procedure (optional) - * @return ut_suite_items_info table of objects + * @param a_paths list of paths to be resolved and return a suites. */ function get_suites_info( - a_owner_name varchar2, - a_package_name varchar2 := null - ) return sys_refcursor; + a_paths ut_varchar2_list + ) return sys_refcursor; /** * Returns true if given suite item exists From 52c0307bbb5d9c7de5d3a6bc334558377f424f4e Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Fri, 1 Apr 2022 00:33:09 +0100 Subject: [PATCH 0941/1096] Addresing sonar issues --- source/api/ut_runner.pkb | 5 ++++- source/core/ut_suite_cache_manager.pkb | 17 ++++++++--------- source/core/ut_suite_manager.pkb | 6 +----- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index c49f895a3..b05e93056 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -195,12 +195,15 @@ create or replace package body ut_runner is l_cursor sys_refcursor; l_results ut_suite_items_info; c_bulk_limit constant integer := 100; + i pls_integer; begin l_cursor := ut_suite_manager.get_suites_info(ut_varchar2_list(nvl(a_path,sys_context('userenv', 'current_schema')))); loop fetch l_cursor bulk collect into l_results limit c_bulk_limit; - for i in 1 .. l_results.count loop + i := l_results.first; + while (i is not null) loop pipe row (l_results(i)); + i := l_results.next(i); end loop; exit when l_cursor%notfound; end loop; diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index 95615e2d5..ba4510e62 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -131,8 +131,10 @@ create or replace package body ut_suite_cache_manager is c_package_path_regex constant varchar2(100) := '^([A-Za-z0-9$#_]+)(\.([A-Za-z0-9$#_\*]+))?(\.([A-Za-z0-9$#_\*]+))?$'; l_results ut_path_items := ut_path_items(); l_path_item ut_path_item; + i pls_integer; begin - for i in 1 .. a_paths.count loop + i := a_paths.first; + while (i is not null) loop l_results.extend; if a_paths(i) like '%:%' then l_path_item := ut_path_item(schema_name => upper(regexp_substr(a_paths(i),'^[^.:]+')), @@ -143,7 +145,8 @@ create or replace package body ut_suite_cache_manager is object_name => regexp_substr(a_paths(i), c_package_path_regex, subexpression => 3), procedure_name => regexp_substr(a_paths(i), c_package_path_regex, subexpression => 5)); l_results(l_results.last) := l_path_item; - end if; + end if; + i := a_paths.next(i); end loop; return l_results; @@ -189,7 +192,7 @@ create or replace package body ut_suite_cache_manager is bulk collect into l_schema_paths from (select schema_name,object_name,procedure_name,suite_path, - row_number() over ( partition by schema_name,object_name,procedure_name,suite_path order by 1) r_num + row_number() over ( partition by schema_name,object_name,procedure_name,suite_path order by 1) as r_num from paths_to_expand) where r_num = 1 ; return l_schema_paths; @@ -211,7 +214,7 @@ create or replace package body ut_suite_cache_manager is begin select obj bulk collect into l_suite_items from ( - select /*+ cardinality(c 500) */ value(c) as obj,row_number() over ( partition by path order by path asc) r_num + select /*+ cardinality(c 500) */ value(c) as obj,row_number() over ( partition by path order by path asc) as r_num from ut_suite_cache c, table(a_schema_paths) sp where c.object_owner = upper(sp.schema_name) @@ -301,7 +304,7 @@ create or replace package body ut_suite_cache_manager is l_procedure_name varchar2(250) := ut_utils.qualified_sql_name(a_procedure_name); l_schema_paths ut_path_items; begin - l_schema_paths := ut_path_items(ut_path_item(a_object_owner,a_object_name,a_procedure_name,a_path)); + l_schema_paths := ut_path_items(ut_path_item(l_object_owner,l_object_name,l_procedure_name,a_path)); return get_cached_suite_rows(l_schema_paths,a_random_seed,l_tags); end; @@ -314,10 +317,6 @@ create or replace package body ut_suite_cache_manager is l_suite_items ut_suite_cache_rows := ut_suite_cache_rows(); l_schema_paths ut_path_items; l_tags ut_varchar2_rows := coalesce(a_tags,ut_varchar2_rows()); - - l_suite_item_name varchar2(20); - l_paths ut_varchar2_rows; - l_schema varchar2(4000); l_sql varchar2(32767); begin diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index cab24e607..43df7f255 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -82,12 +82,9 @@ create or replace package body ut_suite_manager is l_schema := sys.dbms_assert.schema_name(upper(l_object)); exception when sys.dbms_assert.invalid_schema_name then - if l_object like '%*%' then + if l_object like '%*%' or ut_metadata.package_exists_in_cur_schema(upper(l_object)) then a_paths(i) := c_current_schema || '.' || a_paths(i); l_schema := c_current_schema; - elsif ut_metadata.package_exists_in_cur_schema(upper(l_object)) then - a_paths(i) := c_current_schema || '.' || a_paths(i); - l_schema := c_current_schema; else raise; end if; @@ -531,7 +528,6 @@ create or replace package body ut_suite_manager is l_paths ut_varchar2_list := a_paths; l_schema_names ut_varchar2_rows; l_schema_paths ut_path_items; - l_reconcile_paths ut_path_items; l_schema varchar2(4000); begin ut_event_manager.trigger_event('configure_execution_by_path - start'); From 8f8d257fc9de8f71eb6ed83bb62194f9fadef359 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Fri, 1 Apr 2022 01:02:39 +0100 Subject: [PATCH 0942/1096] Extra tests and cleanup of old code. --- source/core/ut_suite_cache_manager.pkb | 18 --------------- source/core/ut_suite_cache_manager.pks | 11 +-------- test/ut3_user/api/test_ut_runner.pkb | 32 ++++++++++++++++++++++++++ test/ut3_user/api/test_ut_runner.pks | 5 ++++ 4 files changed, 38 insertions(+), 28 deletions(-) diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index ba4510e62..c045310c0 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -290,24 +290,6 @@ create or replace package body ut_suite_cache_manager is return expand_paths(group_paths_by_schema(a_paths)); end; - function get_cached_suite_rows( - a_object_owner varchar2, - a_path varchar2 := null, - a_object_name varchar2 := null, - a_procedure_name varchar2 := null, - a_random_seed positive := null, - a_tags ut_varchar2_rows := null - ) return ut_suite_cache_rows is - l_tags ut_varchar2_rows := coalesce(a_tags,ut_varchar2_rows()); - l_object_owner varchar2(250) := ut_utils.qualified_sql_name(a_object_owner); - l_object_name varchar2(250) := ut_utils.qualified_sql_name(a_object_name); - l_procedure_name varchar2(250) := ut_utils.qualified_sql_name(a_procedure_name); - l_schema_paths ut_path_items; - begin - l_schema_paths := ut_path_items(ut_path_item(l_object_owner,l_object_name,l_procedure_name,a_path)); - return get_cached_suite_rows(l_schema_paths,a_random_seed,l_tags); - end; - function get_cached_suite_rows( a_schema_paths ut_path_items, a_random_seed positive := null, diff --git a/source/core/ut_suite_cache_manager.pks b/source/core/ut_suite_cache_manager.pks index 05bff7af9..6b12e7439 100644 --- a/source/core/ut_suite_cache_manager.pks +++ b/source/core/ut_suite_cache_manager.pks @@ -46,22 +46,13 @@ create or replace package ut_suite_cache_manager authid definer is * Not to be used publicly. Used internally for building suites at runtime. */ function get_cached_suite_rows( - a_object_owner varchar2, - a_path varchar2 := null, - a_object_name varchar2 := null, - a_procedure_name varchar2 := null, + a_schema_paths ut_path_items, a_random_seed positive := null, a_tags ut_varchar2_rows := null ) return ut_suite_cache_rows; function get_schema_paths(a_paths in ut_varchar2_list) return ut_path_items; - function get_cached_suite_rows( - a_schema_paths ut_path_items, - a_random_seed positive := null, - a_tags ut_varchar2_rows := null - ) return ut_suite_cache_rows; - /* * Retrieves suite item info rows from cache. * Returned data is not filtered by user access rights. diff --git a/test/ut3_user/api/test_ut_runner.pkb b/test/ut3_user/api/test_ut_runner.pkb index 80b1cd60b..b6b7c67e7 100644 --- a/test/ut3_user/api/test_ut_runner.pkb +++ b/test/ut3_user/api/test_ut_runner.pkb @@ -344,6 +344,38 @@ end;'; ut.expect(l_actual).to_equal(l_expected); end; + procedure test_get_suites_info_by_path is + l_expected sys_refcursor; + l_actual sys_refcursor; + begin + --Arrange + open l_expected for + select + 'UT3_USER' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'DUMMY_TEST_PACKAGE' item_name, + 'dummy_test_suite' item_description, 'UT_SUITE' item_type, 2 item_line_no, + 'some.path.dummy_test_package' path, 0 disabled_flag, null disabled_reason,null tags + from dual union all + select + 'UT3_USER' object_owner, 'DUMMY_TEST_PACKAGE' object_name, 'SOME_DUMMY_TEST_PROCEDURE' item_name, + 'dummy_test' item_description, 'UT_TEST' item_type, 6 item_line_no, + 'some.path.dummy_test_package.some_dummy_test_procedure' path, 0 disabled_flag, null disabled_reason,null tags + from dual union all + select + 'UT3_USER' object_owner, 'PATH' object_name, 'PATH' item_name, + null item_description, 'UT_LOGICAL_SUITE' item_type, null item_line_no, + 'some.path' path, 0 disabled_flag, null disabled_reason, null tags + from dual union all + select + 'UT3_USER' object_owner, 'SOME' object_name, 'SOME' item_name, + null item_description, 'UT_LOGICAL_SUITE' item_type, null item_line_no, + 'some' path, 0 disabled_flag, null disabled_reason, null tags + from dual; + --Act + open l_actual for select * from table(ut3_develop.ut_runner.get_suites_info('ut3_user:some.path.dummy_test_package')); + --Assert + ut.expect(l_actual).to_equal(l_expected); + end; + procedure test_get_reporters_list is l_expected sys_refcursor; l_actual sys_refcursor; diff --git a/test/ut3_user/api/test_ut_runner.pks b/test/ut3_user/api/test_ut_runner.pks index 08282e997..e003ba852 100644 --- a/test/ut3_user/api/test_ut_runner.pks +++ b/test/ut3_user/api/test_ut_runner.pks @@ -65,6 +65,11 @@ create or replace package test_ut_runner is --%aftertest(cleanup_cache) procedure test_get_suites_info_twotag; + --%test(get_suites_info returns a cursor containing records for a newly created test with passed path) + --%beforetest(setup_cache_objects) + --%aftertest(cleanup_cache) + procedure test_get_suites_info_by_path; + --%test(get_reporters_list returns a cursor containing all built-in reporters and information about output-reporter) --%beforetest(setup_cache_objects) --%aftertest(cleanup_cache) From 12be1234bdff3e0abd5b48e237a68519d5466b99 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Fri, 1 Apr 2022 07:39:34 +0100 Subject: [PATCH 0943/1096] Adding extra tests --- test/ut3_tester/core/test_suite_manager.pkb | 10 ++++++++++ test/ut3_tester/core/test_suite_manager.pks | 5 ++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/test/ut3_tester/core/test_suite_manager.pkb b/test/ut3_tester/core/test_suite_manager.pkb index 48ecf91f0..5baf5779d 100644 --- a/test/ut3_tester/core/test_suite_manager.pkb +++ b/test/ut3_tester/core/test_suite_manager.pkb @@ -955,6 +955,16 @@ end;]'; ut.expect(sqlerrm).to_be_like('%failing_non_*%'); end; + procedure test_search_nonex_prc_wild is + l_objects_to_run ut3_develop.ut_suite_items; + begin + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list('ut3_develop.test_package_1.nonexist*')); + ut.fail('Non existing package did not raise exception'); + exception + when others then + ut.expect(sqlerrm).to_be_like('%failing_non_*%'); + end; + procedure test_search_nonex_path_wild is l_objects_to_run ut3_develop.ut_suite_items; begin diff --git a/test/ut3_tester/core/test_suite_manager.pks b/test/ut3_tester/core/test_suite_manager.pks index bea8faf96..ccd4d586c 100644 --- a/test/ut3_tester/core/test_suite_manager.pks +++ b/test/ut3_tester/core/test_suite_manager.pks @@ -78,7 +78,10 @@ create or replace package test_suite_manager is --%test(Prepare runner for nonexisting package using wildcard filter) procedure test_search_nonex_pck_wild; - + + --%test(Prepare runner for nonexisting procedure using wildcard filter) + procedure test_search_nonex_prc_wild; + --%test(Prepare runner for nonexisting path using wildcard filter) procedure test_search_nonex_path_wild; From d5ee6cad38b05e94e58e3811ba0917ca3d8f6d2c Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Fri, 1 Apr 2022 11:19:11 +0100 Subject: [PATCH 0944/1096] Updating SQL to expand paths and extract suites. --- source/core/ut_suite_cache_manager.pkb | 50 +++++++++++++-------- test/ut3_tester/core/test_suite_manager.pkb | 4 +- 2 files changed, 33 insertions(+), 21 deletions(-) diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index c045310c0..7bd8e3423 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -151,28 +151,41 @@ create or replace package body ut_suite_cache_manager is return l_results; end; + /* - The object name is populate but suitepath not - We will use that object and try to match. - We can pass also a wildcard this will result in one to many. + First SQL queries for objects where procedure is null or its only wildcard. + We split that due to fact that we can use func min to combine rows. + + Second union is responsible expanding paths where the procedure filter is given + We cannot select min here as filter can cover only half of tests within + package. Even if the filter doesnt return anything we still capture a proc filter + name for error reporting later on. - Get all data that do not have an wildcard and not require expanding. - We will take them as they are. - a)suite path is populated - b)suite path and object is empty so schema name is by default ( or passed) + Third SQL cover scenario where a suitapath only is populated and wildcard is given + + Fourth SQL cover scenario where suitepath is populated with no filters */ function expand_paths(a_schema_paths ut_path_items) return ut_path_items is l_schema_paths ut_path_items:= ut_path_items(); begin with paths_to_expand as ( select /*+ no_parallel */ min(path) as suite_path,sp.schema_name as schema_name,nvl(c.object_name,sp.object_name) as object_name, - nvl2(sp.procedure_name,c.name,null) as procedure_name + null as procedure_name + from table(a_schema_paths) sp left outer join ut_suite_cache c + on ( c.object_owner = upper(sp.schema_name) + and c.object_name like replace(upper(sp.object_name),'*','%')) + where sp.suite_path is null and sp.object_name is not null + and ( sp.procedure_name is null or sp.procedure_name = '*') + group by sp.schema_name,nvl(c.object_name,sp.object_name) + union all + select /*+ no_parallel */ path as suite_path,sp.schema_name as schema_name,nvl(c.object_name,sp.object_name) as object_name, + nvl(c.name,sp.procedure_name) as procedure_name from table(a_schema_paths) sp left outer join ut_suite_cache c on ( c.object_owner = upper(sp.schema_name) and c.object_name like replace(upper(sp.object_name),'*','%') and c.name like nvl(replace(upper(sp.procedure_name),'*','%'), c.name)) where sp.suite_path is null and sp.object_name is not null - group by sp.schema_name,nvl(c.object_name,sp.object_name),nvl2(sp.procedure_name,c.name,null) + and (sp.procedure_name is not null and sp.procedure_name != '*') union all select /*+ no_parallel */ nvl(c.path,sp.suite_path) as suite_path,sp.schema_name,sp.object_name,sp.procedure_name as procedure_name from @@ -218,18 +231,17 @@ create or replace package body ut_suite_cache_manager is from ut_suite_cache c, table(a_schema_paths) sp where c.object_owner = upper(sp.schema_name) - and ( - (sp.suite_path is not null and - sp.suite_path||'.' like c.path||'.%' /*all parents and self*/ - or - ( c.path||'.' like sp.suite_path||'.%' /*all children and self*/ - and c.object_name like nvl(upper(sp.object_name),c.object_name) - and c.name like nvl(upper(sp.procedure_name),c.name) ) ) + and ((sp.suite_path is not null and sp.suite_path||'.' like c.path||'.%' /*all parents and self*/ + or + ( + c.path||'.' like sp.suite_path||'.%' /*all children and self*/ + and c.object_name like nvl(upper(sp.object_name),c.object_name) + and c.name like nvl(upper(sp.procedure_name),c.name) + )) or ( sp.suite_path is null - and c.object_name like nvl(upper(replace(sp.object_name,'*','%')),c.object_name) - and c.name like nvl(upper(replace(sp.procedure_name,'*','%')),c.name) - ))) where r_num = 1; + and c.object_name = nvl(upper(sp.object_name),c.object_name) + and c.name = nvl(upper(sp.procedure_name),c.name)))) where r_num =1; return l_suite_items; end; diff --git a/test/ut3_tester/core/test_suite_manager.pkb b/test/ut3_tester/core/test_suite_manager.pkb index 5baf5779d..684cc14fe 100644 --- a/test/ut3_tester/core/test_suite_manager.pkb +++ b/test/ut3_tester/core/test_suite_manager.pkb @@ -958,11 +958,11 @@ end;]'; procedure test_search_nonex_prc_wild is l_objects_to_run ut3_develop.ut_suite_items; begin - l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list('ut3_develop.test_package_1.nonexist*')); + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list('ut3_tester.test_package_1.nonexist*')); ut.fail('Non existing package did not raise exception'); exception when others then - ut.expect(sqlerrm).to_be_like('%failing_non_*%'); + ut.expect(sqlerrm).to_be_like('%nonexist*%'); end; procedure test_search_nonex_path_wild is From 2db8d635765b2c8e0d4d891a28bfce4d3d3f10ca Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Thu, 7 Apr 2022 00:24:16 +0100 Subject: [PATCH 0945/1096] Addressing issue with reconstruct_cache knocking off other levels. Solution was to introduce a sort order that work from bottom to top. --- source/core/ut_suite_cache_manager.pkb | 54 +++++++++++++++++++++----- 1 file changed, 44 insertions(+), 10 deletions(-) diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index 7bd8e3423..8777910b9 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -64,15 +64,10 @@ create or replace package body ut_suite_cache_manager is s.y, null, s.z ) as obj from logical_suite_data s - ), - items as ( - select obj from suite_items - union all - select obj from logical_suites ) - select /*+ no_parallel */ c.obj - from items c - order by c.obj.object_owner,{:random_seed:}]'; + select /*+ no_parallel */obj from suite_items + union all + select /*+ no_parallel */ obj from logical_suites]'; function get_missing_cache_objects(a_object_owner varchar2) return ut_varchar2_rows is l_result ut_varchar2_rows; @@ -293,6 +288,43 @@ create or replace package body ut_suite_cache_manager is return l_suite_tags; end; + /* + We will sort a suites in hierarchical structure. + Sorting from bottom to top so when we consolidate + we will go in proper order. + For random seed we will add an extra sort that can be null + */ + procedure sort_and_randomize_tests( + a_suite_rows in out ut_suite_cache_rows, + a_random_seed positive := null) + is + l_suite_rows ut_suite_cache_rows; + begin + with + extract_parent_child as ( + select s.path, substr(s.path,1,instr(s.path,'.',-1,1)-1) as parent_path,s.object_owner,s.line_no,a_random_seed random_seed + from table(a_suite_rows) s), + t1(path,parent_path,object_owner,line_no,random_seed) as ( + --Anchor memeber + select s.path, parent_path,s.object_owner,s.line_no,random_seed + from extract_parent_child s + where parent_path is null + union all + --Recursive member + select t2.path, t2.parent_path,t2.object_owner,t2.line_no,t2.random_seed + from t1,extract_parent_child t2 + where t2.parent_path = t1.path + and t1.object_owner = t2.object_owner) + search depth first by line_no desc,random_seed set order1 + select value(i) as obj + bulk collect into l_suite_rows + from t1 c + join table(a_suite_rows) i on i.object_owner = c.object_owner and i.path = c.path + order by order1 desc; + + a_suite_rows := l_suite_rows; + end; + /* * Public code */ @@ -308,6 +340,7 @@ create or replace package body ut_suite_cache_manager is a_tags ut_varchar2_rows := null ) return ut_suite_cache_rows is l_results ut_suite_cache_rows := ut_suite_cache_rows(); + l_results2 ut_suite_cache_rows := ut_suite_cache_rows(); l_suite_items ut_suite_cache_rows := ut_suite_cache_rows(); l_schema_paths ut_path_items; l_tags ut_varchar2_rows := coalesce(a_tags,ut_varchar2_rows()); @@ -316,7 +349,6 @@ create or replace package body ut_suite_cache_manager is l_schema_paths := a_schema_paths; l_sql := gc_get_bulk_cache_suite_sql; - l_sql := replace(l_sql,'{:random_seed:}',get_random_seed_sql(a_random_seed)); l_suite_items := get_suite_items(a_schema_paths); if l_tags.count > 0 then l_suite_items := get_tags_suites(l_suite_items,l_tags); @@ -325,7 +357,9 @@ create or replace package body ut_suite_cache_manager is execute immediate l_sql bulk collect into l_results - using l_suite_items, a_random_seed; + using l_suite_items; + + sort_and_randomize_tests(l_results,a_random_seed); return l_results; end; From d3396fef1fce55d8e25828e99aa2556ad3e336e5 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Thu, 7 Apr 2022 11:27:59 +0100 Subject: [PATCH 0946/1096] Update tests for random order --- source/core/ut_suite_cache_manager.pkb | 40 +++----------------------- test/ut3_user/api/test_ut_run.pkb | 2 +- 2 files changed, 5 insertions(+), 37 deletions(-) diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index 8777910b9..c76260212 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -88,40 +88,6 @@ create or replace package body ut_suite_cache_manager is return l_result; end; - function get_random_seed_sql(a_random_seed positive) return varchar2 is - begin - return case - when a_random_seed is null then q'[ - nlssort( - replace( - /*suite path until objects name (excluding contexts and test path) with trailing dot (full stop)*/ - substr( c.obj.path, 1, instr( c.obj.path, lower(c.obj.object_name), -1 ) + length(c.obj.object_name) ), - '.', - /*'.' replaced with chr(0) to assure that child elements come before parent when sorting in descending order*/ - chr(0) - ), - 'nls_sort=binary' - )desc nulls last, - case when c.obj.self_type = 'UT_SUITE_CONTEXT' then - ( select /*+ no_parallel */ max( x.line_no ) + 1 - from ut_suite_cache x - where c.obj.object_owner = x.object_owner - and c.obj.object_name = x.object_name - and x.path like c.obj.path || '.%' - ) - else - c.obj.line_no - end, - /*assures that child contexts come before parent contexts*/ - regexp_count(c.obj.path,'\.') desc, - :a_random_seed]' - else - ' ut_runner.hash_suite_path( - c.obj.path, :a_random_seed - ) desc nulls last' - end; - end; - function group_paths_by_schema(a_paths ut_varchar2_list) return ut_path_items is c_package_path_regex constant varchar2(100) := '^([A-Za-z0-9$#_]+)(\.([A-Za-z0-9$#_\*]+))?(\.([A-Za-z0-9$#_\*]+))?$'; l_results ut_path_items := ut_path_items(); @@ -302,7 +268,9 @@ create or replace package body ut_suite_cache_manager is begin with extract_parent_child as ( - select s.path, substr(s.path,1,instr(s.path,'.',-1,1)-1) as parent_path,s.object_owner,s.line_no,a_random_seed random_seed + select s.path, substr(s.path,1,instr(s.path,'.',-1,1)-1) as parent_path,s.object_owner, + case when a_random_seed is null then s.line_no else null end line_no, + case when a_random_seed is null then null else ut_runner.hash_suite_path(s.path, a_random_seed) end random_seed from table(a_suite_rows) s), t1(path,parent_path,object_owner,line_no,random_seed) as ( --Anchor memeber @@ -315,7 +283,7 @@ create or replace package body ut_suite_cache_manager is from t1,extract_parent_child t2 where t2.parent_path = t1.path and t1.object_owner = t2.object_owner) - search depth first by line_no desc,random_seed set order1 + search depth first by line_no desc,random_seed desc nulls last set order1 select value(i) as obj bulk collect into l_suite_rows from t1 c diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index 492efcba2..41b969359 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -854,7 +854,7 @@ Failures:% l_results ut3_develop.ut_varchar2_list; begin select * bulk collect into l_random_results - from table ( ut3_develop.ut.run( 'ut3_tester_helper.test_package_1', a_random_test_order_seed => 3 ) ) + from table ( ut3_develop.ut.run( 'ut3_tester_helper.test_package_1', a_random_test_order_seed => 6 ) ) where trim(column_value) is not null and column_value not like 'Finished in %' and column_value not like '%Tests were executed with random order %'; From 02d41a64b391781b911bca572f0f835bc1cee929 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Thu, 7 Apr 2022 11:39:03 +0100 Subject: [PATCH 0947/1096] Removing a hash function from api into utils package which is more suited for it. --- source/api/ut_runner.pkb | 31 -------------------------- source/api/ut_runner.pks | 5 ----- source/core/ut_suite_cache_manager.pkb | 2 +- source/core/ut_utils.pkb | 31 ++++++++++++++++++++++++++ source/core/ut_utils.pks | 5 +++++ 5 files changed, 37 insertions(+), 37 deletions(-) diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index b05e93056..b69a51a04 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -265,37 +265,6 @@ create or replace package body ut_runner is end loop; end; - function hash_suite_path(a_path varchar2, a_random_seed positiven) return varchar2 is - l_start_pos pls_integer := 1; - l_end_pos pls_integer := 1; - l_result varchar2(4000); - l_item varchar2(4000); - l_at_end boolean := false; - begin - if a_random_seed is null then - l_result := a_path; - end if; - if a_path is not null then - loop - l_end_pos := instr(a_path,'.',l_start_pos); - if l_end_pos = 0 then - l_end_pos := length(a_path)+1; - l_at_end := true; - end if; - l_item := substr(a_path,l_start_pos,l_end_pos-l_start_pos); - if l_item is not null then - l_result := - l_result || - ut_utils.get_hash( to_char( dbms_utility.get_hash_value( l_item, 1, a_random_seed ) ) ); - end if; - exit when l_at_end; - l_result := l_result || chr(0); - l_start_pos := l_end_pos + 1; - end loop; - end if; - return l_result; - end; - procedure coverage_start(a_coverage_run_id raw) is begin ut_coverage.coverage_start(a_coverage_run_id); diff --git a/source/api/ut_runner.pks b/source/api/ut_runner.pks index e5afce691..85eff1c93 100644 --- a/source/api/ut_runner.pks +++ b/source/api/ut_runner.pks @@ -151,11 +151,6 @@ create or replace package ut_runner authid current_user is */ function get_reporters_list return tt_reporters_info pipelined; - /* - * Returns a hash value of suitepath based on input path and random seed - */ - function hash_suite_path(a_path varchar2, a_random_seed positiven) return varchar2; - procedure coverage_start(a_coverage_run_id raw); procedure coverage_stop; diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index c76260212..d76a6412e 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -270,7 +270,7 @@ create or replace package body ut_suite_cache_manager is extract_parent_child as ( select s.path, substr(s.path,1,instr(s.path,'.',-1,1)-1) as parent_path,s.object_owner, case when a_random_seed is null then s.line_no else null end line_no, - case when a_random_seed is null then null else ut_runner.hash_suite_path(s.path, a_random_seed) end random_seed + case when a_random_seed is null then null else ut_utils.hash_suite_path(s.path, a_random_seed) end random_seed from table(a_suite_rows) s), t1(path,parent_path,object_owner,line_no,random_seed) as ( --Anchor memeber diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 3675e834d..10d9d2393 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -892,6 +892,37 @@ create or replace package body ut_utils is return case when a_data is null then null else dbms_crypto.hash(a_data, a_hash_type) end; end; + function hash_suite_path(a_path varchar2, a_random_seed positiven) return varchar2 is + l_start_pos pls_integer := 1; + l_end_pos pls_integer := 1; + l_result varchar2(4000); + l_item varchar2(4000); + l_at_end boolean := false; + begin + if a_random_seed is null then + l_result := a_path; + end if; + if a_path is not null then + loop + l_end_pos := instr(a_path,'.',l_start_pos); + if l_end_pos = 0 then + l_end_pos := length(a_path)+1; + l_at_end := true; + end if; + l_item := substr(a_path,l_start_pos,l_end_pos-l_start_pos); + if l_item is not null then + l_result := + l_result || + ut_utils.get_hash( to_char( dbms_utility.get_hash_value( l_item, 1, a_random_seed ) ) ); + end if; + exit when l_at_end; + l_result := l_result || chr(0); + l_start_pos := l_end_pos + 1; + end loop; + end if; + return l_result; + end; + function qualified_sql_name(a_name varchar2) return varchar2 is begin return diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index aeff16dd8..e5f48eb95 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -452,6 +452,11 @@ create or replace package ut_utils authid definer is */ function get_hash(a_data clob, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash; + /* + * Returns a hash value of suitepath based on input path and random seed + */ + function hash_suite_path(a_path varchar2, a_random_seed positiven) return varchar2; + /* * Verifies that the input string is a qualified SQL name using sys.dbms_assert.qualified_sql_name * If null value passed returns null From 274d80a3b93cad1401a305509b41df4a34a83215 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Thu, 7 Apr 2022 12:38:41 +0100 Subject: [PATCH 0948/1096] Fixing ordering --- source/core/ut_suite_cache_manager.pkb | 6 +++--- source/core/ut_suite_manager.pkb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index d76a6412e..d1d5b2e5c 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -259,6 +259,7 @@ create or replace package body ut_suite_cache_manager is Sorting from bottom to top so when we consolidate we will go in proper order. For random seed we will add an extra sort that can be null + TODO: Verify object owner join */ procedure sort_and_randomize_tests( a_suite_rows in out ut_suite_cache_rows, @@ -281,14 +282,13 @@ create or replace package body ut_suite_cache_manager is --Recursive member select t2.path, t2.parent_path,t2.object_owner,t2.line_no,t2.random_seed from t1,extract_parent_child t2 - where t2.parent_path = t1.path - and t1.object_owner = t2.object_owner) + where t2.parent_path = t1.path) search depth first by line_no desc,random_seed desc nulls last set order1 select value(i) as obj bulk collect into l_suite_rows from t1 c join table(a_suite_rows) i on i.object_owner = c.object_owner and i.path = c.path - order by order1 desc; + order by order1 desc; a_suite_rows := l_suite_rows; end; diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 43df7f255..bcf2fc417 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -279,7 +279,7 @@ create or replace package body ut_suite_manager is pragma inline(get_logical_suite, 'YES'); a_suites(a_suites.last) := get_logical_suite(l_rows, l_idx, l_level,l_prev_level, l_items_at_level ); end if; - if l_prev_level > l_level then + if l_prev_level > l_level then l_items_at_level(l_prev_level).delete; end if; l_prev_level := l_level; From 39377379eaed235e47962465f5240fee706f46cf Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Thu, 7 Apr 2022 13:00:02 +0100 Subject: [PATCH 0949/1096] Fixing a documentation --- docs/userguide/running-unit-tests.md | 8 +++----- source/core/types/ut_path_item.tpb | 2 +- source/core/types/ut_path_item.tps | 2 +- source/core/ut_suite_cache_manager.pkb | 6 ++++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 2a8f8e151..8a43e8386 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -45,10 +45,8 @@ The **functions** can only be used in SELECT statements. They execute the specif ## ut.run procedures The examples below illustrate different ways and options to invoke `ut.run` procedures. -As part of the syntax you can use a wildcard character `*` to call test by part of his name or to call few tests that match a call. -Schema name is still mandatory and cannot contain a wildcard character whether is a suitepath or object. - - +You can use a wildcard character `*` to call tests by part of their name or to call tests that are located on paths matched by part of path string. +Schema name cannot contain a wildcard character whether is in a suitepath call or call by object name. ```sql alter session set current_schema=hr; @@ -142,7 +140,7 @@ begin ut.run('hr.test*'); end; ``` -Executes all tests from schema _hr_ starting with name _test_. +Executes all tests in schema `hr` located in packages starting with name `test`. ```sql set serveroutput on diff --git a/source/core/types/ut_path_item.tpb b/source/core/types/ut_path_item.tpb index 3878b544c..6cdb2b8ad 100644 --- a/source/core/types/ut_path_item.tpb +++ b/source/core/types/ut_path_item.tpb @@ -39,4 +39,4 @@ create or replace type body ut_path_item as return; end; end; -/ \ No newline at end of file +/ diff --git a/source/core/types/ut_path_item.tps b/source/core/types/ut_path_item.tps index f6c64195c..c8ec81be5 100644 --- a/source/core/types/ut_path_item.tps +++ b/source/core/types/ut_path_item.tps @@ -23,4 +23,4 @@ create or replace type ut_path_item as object ( constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2, suite_path varchar2) return self as result, constructor function ut_path_item(self in out nocopy ut_path_item, schema_name varchar2, object_name varchar2,procedure_name varchar2,suite_path varchar2) return self as result ) -/ \ No newline at end of file +/ diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index d1d5b2e5c..f7e89eb96 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -258,8 +258,10 @@ create or replace package body ut_suite_cache_manager is We will sort a suites in hierarchical structure. Sorting from bottom to top so when we consolidate we will go in proper order. - For random seed we will add an extra sort that can be null - TODO: Verify object owner join + For random seed we will add an extra sort that can be null. + The object owner is irrelevant on joing via path as we already + resolved a list of test we want to use so as long they share a suitepath + they are correct. */ procedure sort_and_randomize_tests( a_suite_rows in out ut_suite_cache_rows, From 9296f382dc5a858032ed292a46611abe4cd91a3f Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Thu, 7 Apr 2022 13:24:42 +0100 Subject: [PATCH 0950/1096] Fixing indent --- source/core/ut_utils.pkb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 10d9d2393..162e50f8f 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -901,7 +901,7 @@ create or replace package body ut_utils is begin if a_random_seed is null then l_result := a_path; - end if; + end if; if a_path is not null then loop l_end_pos := instr(a_path,'.',l_start_pos); From 6ff7f38ba80a1bbc063feb7b696d0236f243dd40 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Tue, 12 Apr 2022 23:14:15 +0100 Subject: [PATCH 0951/1096] Peer review changes --- source/core/ut_suite_cache_manager.pkb | 27 ++++++++--------- source/core/ut_suite_cache_manager.pks | 9 ++++++ source/core/ut_suite_manager.pkb | 40 ++++++++++++-------------- source/core/ut_suite_manager.pks | 1 + source/create_grants.sql | 1 + 5 files changed, 42 insertions(+), 36 deletions(-) diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index f7e89eb96..4f8cb8f62 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -19,12 +19,11 @@ create or replace package body ut_suite_cache_manager is /* * Private code */ - - gc_get_bulk_cache_suite_sql constant varchar2(32767) := - q'[with + cursor c_get_bulk_cache_suite(cp_suite_items in ut_suite_cache_rows) is + with suite_items as ( select /*+ cardinality(c 500) */ value(c) as obj - from table(:suite_items) c), + from table(cp_suite_items) c), suitepaths as ( select distinct substr(c.obj.path,1,instr(c.obj.path,'.',-1)-1) as suitepath, c.obj.path as path, @@ -65,9 +64,9 @@ create or replace package body ut_suite_cache_manager is ) as obj from logical_suite_data s ) - select /*+ no_parallel */obj from suite_items + select /*+ no_parallel */ obj from suite_items union all - select /*+ no_parallel */ obj from logical_suites]'; + select /*+ no_parallel */ obj from logical_suites; function get_missing_cache_objects(a_object_owner varchar2) return ut_varchar2_rows is l_result ut_varchar2_rows; @@ -126,6 +125,9 @@ create or replace package body ut_suite_cache_manager is Fourth SQL cover scenario where suitepath is populated with no filters */ + + --TODO: Przenies w osobny with clause z nazwami jako opis. + -- i with clause na tablice. function expand_paths(a_schema_paths ut_path_items) return ut_path_items is l_schema_paths ut_path_items:= ut_path_items(); begin @@ -310,26 +312,21 @@ create or replace package body ut_suite_cache_manager is a_tags ut_varchar2_rows := null ) return ut_suite_cache_rows is l_results ut_suite_cache_rows := ut_suite_cache_rows(); - l_results2 ut_suite_cache_rows := ut_suite_cache_rows(); l_suite_items ut_suite_cache_rows := ut_suite_cache_rows(); l_schema_paths ut_path_items; l_tags ut_varchar2_rows := coalesce(a_tags,ut_varchar2_rows()); - l_sql varchar2(32767); begin l_schema_paths := a_schema_paths; - l_sql := gc_get_bulk_cache_suite_sql; l_suite_items := get_suite_items(a_schema_paths); if l_tags.count > 0 then l_suite_items := get_tags_suites(l_suite_items,l_tags); end if; - ut_event_manager.trigger_event(ut_event_manager.gc_debug, ut_key_anyvalues().put('l_sql',l_sql) ); - - execute immediate l_sql - bulk collect into l_results - using l_suite_items; + + open c_get_bulk_cache_suite(l_suite_items); + fetch c_get_bulk_cache_suite bulk collect into l_results; + close c_get_bulk_cache_suite; - sort_and_randomize_tests(l_results,a_random_seed); return l_results; end; diff --git a/source/core/ut_suite_cache_manager.pks b/source/core/ut_suite_cache_manager.pks index 6b12e7439..974babca5 100644 --- a/source/core/ut_suite_cache_manager.pks +++ b/source/core/ut_suite_cache_manager.pks @@ -40,6 +40,15 @@ create or replace package ut_suite_cache_manager authid definer is */ procedure remove_missing_objs_from_cache(a_schema_name varchar2); + /* + * We will sort a suites in hierarchical structure. + * Sorting from bottom to top so when we consolidate + * we will go in proper order. + */ + procedure sort_and_randomize_tests( + a_suite_rows in out ut_suite_cache_rows, + a_random_seed positive := null); + /* * Retrieves suite items data from cache. * Returned data is not filtered by user access rights. diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index bcf2fc417..b29b8134c 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -295,7 +295,8 @@ create or replace package body ut_suite_manager is end loop; close a_suite_data_cursor; end reconstruct_from_cache; - + + --TODO: daj do public ut_suite_cache_rows i zmienic na SQL function get_filtered_cursor( a_unfiltered_rows in ut_suite_cache_rows, a_skip_all_objects boolean := false @@ -306,26 +307,21 @@ create or replace package body ut_suite_manager is if ut_metadata.user_has_execute_any_proc() or a_skip_all_objects then l_result := a_unfiltered_rows; else - for i in ( - select /*+ no_parallel */ c.* from table(a_unfiltered_rows) c - where sys_context( 'userenv', 'current_user' ) = upper(c.object_owner) - union all - select /*+ no_parallel */ c.* from table(a_unfiltered_rows) c - where sys_context( 'userenv', 'current_user' ) != upper(c.object_owner) - and ( exists - ( select 1 - from all_objects a - where a.object_name = c.object_name - and a.owner = c.object_owner - and a.object_type = 'PACKAGE' - ) - or c.self_type = 'UT_LOGICAL_SUITE')) - loop - l_result.extend; - l_result(l_result.last) := ut_suite_cache_row(i.id,i.self_type,i.path,i.object_owner,i.object_name,i.name,i.line_no,i.parse_time, - i.description,i.rollback_type,i.disabled_flag,i.disabled_reason,i.warnings,i.before_all_list,i.after_all_list,i.before_each_list, - i.before_test_list,i.after_each_list,i.after_test_list,i.expected_error_codes,i.tags,i.item); - end loop; + select obj bulk collect into l_result + from ( + select /*+ no_parallel */ value(c) as obj from table(a_unfiltered_rows) c + where sys_context( 'userenv', 'current_user' ) = upper(c.object_owner) + union all + select /*+ no_parallel */ value(c) as obj from table(a_unfiltered_rows) c + where sys_context( 'userenv', 'current_user' ) != upper(c.object_owner) + and ( exists + ( select 1 + from all_objects a + where a.object_name = c.object_name + and a.owner = c.object_owner + and a.object_type = 'PACKAGE' + ) + or c.self_type = 'UT_LOGICAL_SUITE')); end if; return l_result; end; @@ -373,6 +369,8 @@ create or replace package body ut_suite_manager is l_filtered_rows := get_filtered_cursor(l_unfiltered_rows,a_skip_all_objects); reconcile_paths_and_suites(a_schema_paths,l_filtered_rows); + ut_suite_cache_manager.sort_and_randomize_tests(l_filtered_rows,a_random_seed); + open l_result for select * from table(l_filtered_rows); return l_result; diff --git a/source/core/ut_suite_manager.pks b/source/core/ut_suite_manager.pks index 6c96500b3..170b83f05 100644 --- a/source/core/ut_suite_manager.pks +++ b/source/core/ut_suite_manager.pks @@ -39,6 +39,7 @@ create or replace package ut_suite_manager authid current_user is * @return array containing root suites-ready to be executed * */ + --TODO:Zerknij czy mozna wywalic function configure_execution_by_path(a_paths ut_varchar2_list, a_random_seed positive := null) return ut_suite_items; /** diff --git a/source/create_grants.sql b/source/create_grants.sql index 6401b1522..8a44ab371 100644 --- a/source/create_grants.sql +++ b/source/create_grants.sql @@ -60,6 +60,7 @@ grant execute on &&ut3_owner..ut_file_mapping to &ut3_user; grant execute on &&ut3_owner..ut_file_mapper to &ut3_user; grant execute on &&ut3_owner..ut_suite_items_info to &ut3_user; grant execute on &&ut3_owner..ut_suite_item_info to &ut3_user; +grant execute on &&ut3_owner..ut_suite_cache_rows to &ut3_user; grant execute on &&ut3_owner..ut_run_info to &ut3_user; grant execute on &&ut3_owner..ut_coverage_options to &ut3_user; From ee7a98b97357667fd7229c3f6711e4bd7cb2576c Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Tue, 12 Apr 2022 23:24:56 +0100 Subject: [PATCH 0952/1096] Moving a SQL to be more readable. --- source/core/ut_suite_cache_manager.pkb | 38 +++++++++++++++++--------- source/core/ut_suite_manager.pkb | 1 - 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index 4f8cb8f62..ae34e1344 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -125,51 +125,63 @@ create or replace package body ut_suite_cache_manager is Fourth SQL cover scenario where suitepath is populated with no filters */ - - --TODO: Przenies w osobny with clause z nazwami jako opis. - -- i with clause na tablice. function expand_paths(a_schema_paths ut_path_items) return ut_path_items is l_schema_paths ut_path_items:= ut_path_items(); begin - with paths_to_expand as ( + with + schema_paths as ( + select * from table(a_schema_paths) + ), + paths_for_object as ( select /*+ no_parallel */ min(path) as suite_path,sp.schema_name as schema_name,nvl(c.object_name,sp.object_name) as object_name, null as procedure_name - from table(a_schema_paths) sp left outer join ut_suite_cache c + from schema_paths sp left outer join ut_suite_cache c on ( c.object_owner = upper(sp.schema_name) and c.object_name like replace(upper(sp.object_name),'*','%')) where sp.suite_path is null and sp.object_name is not null and ( sp.procedure_name is null or sp.procedure_name = '*') group by sp.schema_name,nvl(c.object_name,sp.object_name) - union all + ), + paths_for_procedures as ( select /*+ no_parallel */ path as suite_path,sp.schema_name as schema_name,nvl(c.object_name,sp.object_name) as object_name, nvl(c.name,sp.procedure_name) as procedure_name - from table(a_schema_paths) sp left outer join ut_suite_cache c + from schema_paths sp left outer join ut_suite_cache c on ( c.object_owner = upper(sp.schema_name) and c.object_name like replace(upper(sp.object_name),'*','%') and c.name like nvl(replace(upper(sp.procedure_name),'*','%'), c.name)) where sp.suite_path is null and sp.object_name is not null and (sp.procedure_name is not null and sp.procedure_name != '*') - union all + ), + paths_for_suite_path_with_ast as ( select /*+ no_parallel */ nvl(c.path,sp.suite_path) as suite_path,sp.schema_name,sp.object_name,sp.procedure_name as procedure_name - from - table(a_schema_paths) sp left outer join ut_suite_cache c on + from schema_paths sp left outer join ut_suite_cache c on ( c.object_owner = upper(sp.schema_name) and c.path like replace(sp.suite_path,'*','%')) where sp.suite_path is not null and instr(sp.suite_path,'*') > 0 - union all + ), + straigth_suite_paths as ( select /*+ no_parallel */ sp.suite_path as suite_path,sp.schema_name,sp.object_name,sp.procedure_name as procedure_name - from table(a_schema_paths) sp + from schema_paths sp where (sp.suite_path is not null and instr(sp.suite_path,'*') = 0) or (sp.suite_path is null and sp.object_name is null) + ), + all_suitepaths_together as ( + select * from paths_for_object + union all + select * from paths_for_procedures + union all + select * from paths_for_suite_path_with_ast + union all + select * from straigth_suite_paths ) select ut_path_item(schema_name,object_name,procedure_name,suite_path) bulk collect into l_schema_paths from (select schema_name,object_name,procedure_name,suite_path, row_number() over ( partition by schema_name,object_name,procedure_name,suite_path order by 1) as r_num - from paths_to_expand) + from all_suitepaths_together) where r_num = 1 ; return l_schema_paths; end; diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index b29b8134c..4c3542f23 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -296,7 +296,6 @@ create or replace package body ut_suite_manager is close a_suite_data_cursor; end reconstruct_from_cache; - --TODO: daj do public ut_suite_cache_rows i zmienic na SQL function get_filtered_cursor( a_unfiltered_rows in ut_suite_cache_rows, a_skip_all_objects boolean := false From a53cefa29e9d49d6b60255f0ded327e843c4502f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Wed, 13 Apr 2022 10:46:57 +0100 Subject: [PATCH 0953/1096] Apply suggestions from code review --- docs/userguide/running-unit-tests.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 8a43e8386..1a26ca203 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -84,7 +84,7 @@ begin end; ``` -Executes all tests from all packages that are on suitepath starting with _com_. +Executes all tests in schema `hr` from all packages that are on suitepath starting with `com`. ```sql set serveroutput on @@ -148,7 +148,7 @@ begin ut.run('hr.test_apply_bonus.bonus_*'); end; ``` -Executes all test procedures from package _hr.test_apply_bonus_ that starting with _bonus_. +Executes test procedures with names starting with `bonus` in package `hr.test_apply_bonus` . **Note:** From 011970f8f642e2d63d94c0f02027d7e59cf74cb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Wed, 13 Apr 2022 17:16:18 +0300 Subject: [PATCH 0954/1096] Apply suggestions from code review --- source/core/ut_suite_cache_manager.pkb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index ae34e1344..4c738ab64 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -258,12 +258,12 @@ create or replace package body ut_suite_cache_manager is from table(a_suite_items) c where exists ( select 1 from included_tags t - where t.path||'.' like c.path || '.%' /*all parents and self*/ - or c.path||'.' like t.path || '.%' /*all children and self*/ + where t.path||'.' like c.path || '.%' /*all ancestors and self*/ + or c.path||'.' like t.path || '.%' /*all descendants and self*/ ) and not exists ( select 1 from excluded_tags t - where c.path||'.' like t.path || '.%' /*all children and self*/ + where c.path||'.' like t.path || '.%' /*all descendants and self*/ ); return l_suite_tags; end; From 3437b689e2097b1bdae4b0daf22b09549e5eabee Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 15 Apr 2022 23:25:52 +0300 Subject: [PATCH 0955/1096] Fixed issue where schema last parse time was wrongly populated --- source/core/annotations/ut_annotation_manager.pkb | 8 +++----- source/core/ut_suite_cache_manager.pkb | 2 +- source/core/ut_suite_manager.pkb | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index 95d944843..16923bc23 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -61,15 +61,15 @@ create or replace package body ut_annotation_manager as l_refresh_needed boolean; l_objects_view varchar2(200) := ut_metadata.get_objects_view_name(); l_cached_objects ut_annotation_objs_cache_info; - l_result ut_annotation_objs_cache_info; + l_result ut_annotation_objs_cache_info := ut_annotation_objs_cache_info(); begin - ut_event_manager.trigger_event( 'get_objects_to_refresh - start' ); + ut_event_manager.trigger_event( 'get_objects_to_refresh - start', ut_key_anyvalues().put('ut_trigger_check.is_alive()',ut_trigger_check.is_alive()) ); l_refresh_needed := ( ut_trigger_check.is_alive() = false ) or a_modified_after is null; - l_cached_objects := ut_annotation_cache_manager.get_cached_objects_list( a_object_owner, a_object_type, a_modified_after ); if l_refresh_needed then --limit the list to objects that exist and are visible to the invoking user --enrich the list by info about cache validity + l_cached_objects := ut_annotation_cache_manager.get_cached_objects_list( a_object_owner, a_object_type, a_modified_after ); execute immediate 'select /*+ no_parallel cardinality(i '||ut_utils.scale_cardinality(cardinality(l_cached_objects))||') */ '||l_ut_owner||q'[.ut_annotation_obj_cache_info( @@ -94,8 +94,6 @@ create or replace package body ut_annotation_manager as else 'o.last_ddl_time >= cast(:a_modified_after as date)' end bulk collect into l_result using l_cached_objects, a_modified_after; - else - l_result := l_cached_objects; end if; ut_event_manager.trigger_event('get_objects_to_refresh - end (count='||l_result.count||')'); return l_result; diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index ad1634c10..1023a515b 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -297,7 +297,7 @@ create or replace package body ut_suite_cache_manager is if a_parse_time > l_cached_parse_time or l_cached_parse_time is null then update /*+ no_parallel */ ut_suite_cache_schema t - set t.parse_time = a_parse_time + set t.parse_time = greatest(t.parse_time,a_parse_time) where object_owner = l_object_owner; if sql%rowcount = 0 then diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 4bcb83afa..a11b0249c 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -366,7 +366,7 @@ create or replace package body ut_suite_manager is ) or c.self_type = 'UT_LOGICAL_SUITE'; end if; - + return l_result; end; @@ -578,7 +578,7 @@ create or replace package body ut_suite_manager is a_suites(i).set_rollback_type( a_suites(i).get_rollback_type() ); end loop; - ut_event_manager.trigger_event('configure_execution_by_path - start'); + ut_event_manager.trigger_event('configure_execution_by_path - end'); end configure_execution_by_path; function get_suites_info( From 6751290e503b45c589d83931743a2fa7dc402b12 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 15 Apr 2022 22:19:15 +0100 Subject: [PATCH 0956/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index ad0cad34c..4594b9864 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 9641132fd..746421e4a 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index c1eefa2dd..590fce081 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 5812e2cab..6400be9d1 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 140c3e3dd..e1a5cd7dd 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 9e4528342..085c06221 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index a2612c3b8..68a26ce8b 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 9c90a1865..645eda5f1 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 2c262abbf..0112c44d8 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 27dfc6c1f..a84d80f11 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 8e1872497..9dabeb2fd 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 3aa97dcb8..c29a40c7b 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 08308bc8a..1c631d0d5 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 11e08be1d..976630ae9 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 373830f95..8f4d0765a 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index d3fcfd520..e2f308c47 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index bf5cf8c7b..a5fb8a669 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.3943--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 027a06c21..3635bccad 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.13.3943-develop'; + gc_version constant varchar2(50) := 'v3.1.13.4003-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 221c2de768de9120dd3031a795dae82c5f6a6586 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sat, 16 Apr 2022 02:31:56 +0100 Subject: [PATCH 0957/1096] Address issue of not recognizing a correct nested level of suitepath. Added extra tests for different scenarios. --- source/core/ut_suite_cache_manager.pkb | 3 +- test/ut3_tester/core/test_suite_manager.pkb | 495 +++++++++++++++++++- test/ut3_tester/core/test_suite_manager.pks | 36 +- 3 files changed, 525 insertions(+), 9 deletions(-) diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index 4c738ab64..b12f415d2 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -156,7 +156,8 @@ create or replace package body ut_suite_cache_manager is select /*+ no_parallel */ nvl(c.path,sp.suite_path) as suite_path,sp.schema_name,sp.object_name,sp.procedure_name as procedure_name from schema_paths sp left outer join ut_suite_cache c on ( c.object_owner = upper(sp.schema_name) - and c.path like replace(sp.suite_path,'*','%')) + --and c.path like replace(sp.suite_path,'*','%')) + and regexp_like(c.path,'^'||replace(sp.suite_path,'*','[A-Za-z0-9$#_]*'))) where sp.suite_path is not null and instr(sp.suite_path,'*') > 0 ), straigth_suite_paths as ( diff --git a/test/ut3_tester/core/test_suite_manager.pkb b/test/ut3_tester/core/test_suite_manager.pkb index 684cc14fe..fbac0f3f5 100644 --- a/test/ut3_tester/core/test_suite_manager.pkb +++ b/test/ut3_tester/core/test_suite_manager.pkb @@ -278,8 +278,167 @@ end test_package_with_ctx;]'; end; end test_package_with_ctx;]'; + + execute immediate q'[create or replace package test1_frontwildcard is + + --%suite + --%displayname(test1_frontwildcard) + --%suitepath(front_wildcard) + --%rollback(manual) + + --%test + --%displayname(Test1 from test test1_frontwildcard) + procedure first_test; + + --%test + --%displayname(Test2 from test test1_frontwildcard) + procedure second_test; + +end test1_frontwildcard;]'; + + execute immediate q'[create or replace package body test1_frontwildcard is + + procedure first_test is + begin + ut.expect(1).to_equal(1); + end; + + procedure second_test is + begin + ut.expect(1).to_equal(2); + end; + +end test1_frontwildcard;]'; + + execute immediate q'[create or replace package test2_frontwildcard is + + --%suite + --%displayname(test2_frontwildcard) + --%suitepath(front_wildcard) + --%rollback(manual) + + --%test + --%displayname(Test1 from test package test2_frontwildcard) + procedure first_test; + +end test2_frontwildcard;]'; + + execute immediate q'[create or replace package body test2_frontwildcard is + + procedure first_test is + begin + ut.expect(1).to_equal(1); + end; + +end test2_frontwildcard;]'; + + execute immediate q'[create or replace package middle_test1_wildcard is + + --%suite + --%displayname(middle_test1_wildcard) + --%suitepath(wild_middle_card) + --%rollback(manual) + + --%test + --%displayname(Test1 from test middle_test1_wildcard) + procedure middle_first_test; + + --%test + --%displayname(Test2 from test middle_test1_wildcard) + procedure middle_second_test; + +end middle_test1_wildcard;]'; + + execute immediate q'[create or replace package body middle_test1_wildcard is + + procedure middle_first_test is + begin + ut.expect(1).to_equal(1); + end; + + procedure middle_second_test is + begin + ut.expect(1).to_equal(2); end; +end middle_test1_wildcard;]'; + + execute immediate q'[create or replace package middle_test2_wildcard is + + --%suite + --%displayname(middle_test2_wildcard) + --%suitepath(wild_middle_card) + --%rollback(manual) + + --%test + --%displayname(Test1 from test package middle_test2_wildcard) + procedure middle_first_test; + +end middle_test2_wildcard;]'; + + execute immediate q'[create or replace package body middle_test2_wildcard is + + procedure middle_first_test is + begin + ut.expect(1).to_equal(1); + end; + +end middle_test2_wildcard;]'; + + execute immediate q'[create or replace package test1_multi_wildcard is + + --%suite + --%displayname(test1_multi_wildcard) + --%suitepath(wildcard_multi_asterisks) + --%rollback(manual) + + --%test + --%displayname(Test1 from test test1_multi_wildcard) + procedure first_multi_test1; + + --%test + --%displayname(Test2 from test test1_multi_wildcard) + procedure second_multi_test2; + +end test1_multi_wildcard;]'; + + execute immediate q'[create or replace package body test1_multi_wildcard is + + procedure first_multi_test1 is + begin + ut.expect(1).to_equal(1); + end; + + procedure second_multi_test2 is + begin + ut.expect(1).to_equal(2); + end; + +end test1_multi_wildcard;]'; + + execute immediate q'[create or replace package test2_multi_wildcard is + + --%suite + --%displayname(test2_multi_wildcard) + --%suitepath(wildcard_multi_asterisks) + --%rollback(manual) + + --%test + --%displayname(Test1 from test package test2_multi_wildcard) + procedure first_multi_test1; + +end test2_multi_wildcard;]'; + + execute immediate q'[create or replace package body test2_multi_wildcard is + + procedure first_multi_test1 is + begin + ut.expect(1).to_equal(1); + end; + +end test2_multi_wildcard;]'; + + end; procedure drop_dummy_packages is pragma autonomous_transaction; @@ -288,6 +447,12 @@ end test_package_with_ctx;]'; execute immediate 'drop package test_package_2'; execute immediate 'drop package test_package_3'; execute immediate 'drop package test_package_with_ctx'; + execute immediate 'drop package test1_frontwildcard'; + execute immediate 'drop package test2_frontwildcard'; + execute immediate 'drop package middle_test1_wildcard'; + execute immediate 'drop package middle_test2_wildcard'; + execute immediate 'drop package test1_multi_wildcard'; + execute immediate 'drop package test2_multi_wildcard'; end; procedure test_schema_run is @@ -1671,8 +1836,7 @@ end;]'; l_objects_to_run ut3_develop.ut_suite_items; l_test_suite ut3_develop.ut_logical_suite; l_test1_suite ut3_develop.ut_logical_suite; - l_test2_suite ut3_develop.ut_logical_suite; - l_test3_suite ut3_develop.ut_logical_suite; + l_test2_suite ut3_develop.ut_logical_suite; l_ctx_suite ut3_develop.ut_logical_suite; l_test_proc ut3_develop.ut_test; begin @@ -1694,9 +1858,6 @@ end;]'; ut.expect(l_test1_suite.items.count).to_equal(3); for i in 1 ..3 loop - --l_test2_suite := treat(l_test1_suite.items(i) as ut3_develop.ut_logical_suite); - --ut.expect(l_test2_suite.name).to_equal('test_package_2'); - --ut.expect(l_test2_suite.items.count).to_equal(3); case l_test1_suite.items(i).self_type when 'UT_SUITE' then l_test2_suite := treat(l_test1_suite.items(i) as ut3_develop.ut_logical_suite); @@ -1732,5 +1893,329 @@ end;]'; end; + procedure test_wild_card_front_obj_name is + c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||'.*_frontwildcard'; + l_objects_to_run ut3_develop.ut_suite_items; + l_test_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_logical_suite; + l_test1_proc ut3_develop.ut_test; + l_test2_proc ut3_develop.ut_test; + begin + --Act + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); + ut.expect(l_test_suite.name).to_equal('front_wildcard'); + ut.expect(l_test_suite.items.count).to_equal(2); + + for i in 1 .. 2 loop + l_test1_suite := treat(l_test_suite.items(i) as ut3_develop.ut_logical_suite); + case l_test1_suite.name + when 'test1_frontwildcard' then + ut.expect(l_test1_suite.items.count).to_equal(2); + l_test1_proc := treat(l_test1_suite.items(1) as ut3_develop.ut_test); + ut.expect(l_test1_proc.name).to_equal('first_test'); + l_test2_proc := treat(l_test1_suite.items(2) as ut3_develop.ut_test); + ut.expect(l_test2_proc.name).to_equal('second_test'); + when 'test2_frontwildcard' then + ut.expect(l_test1_suite.items.count).to_equal(1); + l_test1_proc := treat(l_test1_suite.items(1) as ut3_develop.ut_test); + ut.expect(l_test1_proc.name).to_equal('first_test'); + end case; + + end loop; + end; + + procedure test_wild_card_front_prc_name is + c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||'.test1_frontwildcard.*_test'; + l_objects_to_run ut3_develop.ut_suite_items; + l_test_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_logical_suite; + l_test1_proc ut3_develop.ut_test; + l_test2_proc ut3_develop.ut_test; + begin + --Act + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); + ut.expect(l_test_suite.name).to_equal('front_wildcard'); + + l_test1_suite := treat(l_test_suite.items(1) as ut3_develop.ut_logical_suite); + ut.expect(l_test1_suite.name).to_equal('test1_frontwildcard'); + ut.expect(l_test1_suite.items.count).to_equal(2); + + l_test1_proc := treat(l_test1_suite.items(1) as ut3_develop.ut_test); + ut.expect(l_test1_proc.name).to_equal('first_test'); + + l_test2_proc := treat(l_test1_suite.items(2) as ut3_develop.ut_test); + ut.expect(l_test2_proc.name).to_equal('second_test'); + end; + + procedure test_wild_card_front_path_name is + c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||':*_wildcard'; + l_objects_to_run ut3_develop.ut_suite_items; + l_test_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_logical_suite; + l_test1_proc ut3_develop.ut_test; + l_test2_proc ut3_develop.ut_test; + begin + --Act + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); + ut.expect(l_test_suite.name).to_equal('front_wildcard'); + ut.expect(l_test_suite.items.count).to_equal(2); + + for i in 1 .. 2 loop + l_test1_suite := treat(l_test_suite.items(i) as ut3_develop.ut_logical_suite); + case l_test1_suite.name + when 'test1_frontwildcard' then + ut.expect(l_test1_suite.items.count).to_equal(2); + l_test1_proc := treat(l_test1_suite.items(1) as ut3_develop.ut_test); + ut.expect(l_test1_proc.name).to_equal('first_test'); + l_test2_proc := treat(l_test1_suite.items(2) as ut3_develop.ut_test); + ut.expect(l_test2_proc.name).to_equal('second_test'); + when 'test2_frontwildcard' then + ut.expect(l_test1_suite.items.count).to_equal(1); + l_test1_proc := treat(l_test1_suite.items(1) as ut3_develop.ut_test); + ut.expect(l_test1_proc.name).to_equal('first_test'); + end case; + + end loop; + end; + + procedure test_wild_card_mid_obj_name is + c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||'.middle_*_wildcard'; + l_objects_to_run ut3_develop.ut_suite_items; + l_test_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_logical_suite; + l_test1_proc ut3_develop.ut_test; + l_test2_proc ut3_develop.ut_test; + begin + --Act + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); + ut.expect(l_test_suite.name).to_equal('wild_middle_card'); + ut.expect(l_test_suite.items.count).to_equal(2); + + for i in 1 .. 2 loop + l_test1_suite := treat(l_test_suite.items(i) as ut3_develop.ut_logical_suite); + case l_test1_suite.name + when 'middle_test1_wildcard' then + ut.expect(l_test1_suite.items.count).to_equal(2); + l_test1_proc := treat(l_test1_suite.items(1) as ut3_develop.ut_test); + ut.expect(l_test1_proc.name).to_equal('middle_first_test'); + l_test2_proc := treat(l_test1_suite.items(2) as ut3_develop.ut_test); + ut.expect(l_test2_proc.name).to_equal('middle_second_test'); + when 'middle_test2_wildcard' then + ut.expect(l_test1_suite.items.count).to_equal(1); + l_test1_proc := treat(l_test1_suite.items(1) as ut3_develop.ut_test); + ut.expect(l_test1_proc.name).to_equal('middle_first_test'); + end case; + + end loop; + end; + + procedure test_wild_card_mid_prc_name is + c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||'.middle_test1_wildcard.middle_*_test'; + l_objects_to_run ut3_develop.ut_suite_items; + l_test_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_logical_suite; + l_test1_proc ut3_develop.ut_test; + l_test2_proc ut3_develop.ut_test; + begin + --Act + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); + ut.expect(l_test_suite.name).to_equal('wild_middle_card'); + + l_test1_suite := treat(l_test_suite.items(1) as ut3_develop.ut_logical_suite); + ut.expect(l_test1_suite.name).to_equal('middle_test1_wildcard'); + ut.expect(l_test1_suite.items.count).to_equal(2); + + l_test1_proc := treat(l_test1_suite.items(1) as ut3_develop.ut_test); + ut.expect(l_test1_proc.name).to_equal('middle_first_test'); + + l_test2_proc := treat(l_test1_suite.items(2) as ut3_develop.ut_test); + ut.expect(l_test2_proc.name).to_equal('middle_second_test'); + end; + + procedure test_wild_card_mid_path_name is + c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||':wild_*card'; + l_objects_to_run ut3_develop.ut_suite_items; + l_test_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_logical_suite; + l_test1_proc ut3_develop.ut_test; + l_test2_proc ut3_develop.ut_test; + begin + --Act + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); + ut.expect(l_test_suite.name).to_equal('wild_middle_card'); + ut.expect(l_test_suite.items.count).to_equal(2); + + for i in 1 .. 2 loop + l_test1_suite := treat(l_test_suite.items(i) as ut3_develop.ut_logical_suite); + case l_test1_suite.name + when 'middle_test1_wildcard' then + ut.expect(l_test1_suite.items.count).to_equal(2); + l_test1_proc := treat(l_test1_suite.items(1) as ut3_develop.ut_test); + ut.expect(l_test1_proc.name).to_equal('middle_first_test'); + l_test2_proc := treat(l_test1_suite.items(2) as ut3_develop.ut_test); + ut.expect(l_test2_proc.name).to_equal('middle_second_test'); + when 'middle_test2_wildcard' then + ut.expect(l_test1_suite.items.count).to_equal(1); + l_test1_proc := treat(l_test1_suite.items(1) as ut3_develop.ut_test); + ut.expect(l_test1_proc.name).to_equal('middle_first_test'); + end case; + + end loop; + end; + + procedure test_wild_card_mul_obj_name is + c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||'.*_multi_*card'; + l_objects_to_run ut3_develop.ut_suite_items; + l_test_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_logical_suite; + l_test1_proc ut3_develop.ut_test; + l_test2_proc ut3_develop.ut_test; + begin + --Act + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); + ut.expect(l_test_suite.name).to_equal('wildcard_multi_asterisks'); + ut.expect(l_test_suite.items.count).to_equal(2); + + for i in 1 .. 2 loop + l_test1_suite := treat(l_test_suite.items(i) as ut3_develop.ut_logical_suite); + case l_test1_suite.name + when 'test1_multi_wildcard' then + ut.expect(l_test1_suite.items.count).to_equal(2); + l_test1_proc := treat(l_test1_suite.items(1) as ut3_develop.ut_test); + ut.expect(l_test1_proc.name).to_equal('first_multi_test1'); + l_test2_proc := treat(l_test1_suite.items(2) as ut3_develop.ut_test); + ut.expect(l_test2_proc.name).to_equal('second_multi_test2'); + when 'test2_multi_wildcard' then + ut.expect(l_test1_suite.items.count).to_equal(1); + l_test1_proc := treat(l_test1_suite.items(1) as ut3_develop.ut_test); + ut.expect(l_test1_proc.name).to_equal('first_multi_test1'); + end case; + + end loop; + end; + + procedure test_wild_card_mul_prc_name is + c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||'.test1_multi_wildcard.*_multi_*'; + l_objects_to_run ut3_develop.ut_suite_items; + l_test_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_logical_suite; + l_test1_proc ut3_develop.ut_test; + l_test2_proc ut3_develop.ut_test; + begin + --Act + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); + ut.expect(l_test_suite.name).to_equal('wildcard_multi_asterisks'); + + l_test1_suite := treat(l_test_suite.items(1) as ut3_develop.ut_logical_suite); + ut.expect(l_test1_suite.name).to_equal('test1_multi_wildcard'); + ut.expect(l_test1_suite.items.count).to_equal(2); + + l_test1_proc := treat(l_test1_suite.items(1) as ut3_develop.ut_test); + ut.expect(l_test1_proc.name).to_equal('first_multi_test1'); + + l_test2_proc := treat(l_test1_suite.items(2) as ut3_develop.ut_test); + ut.expect(l_test2_proc.name).to_equal('second_multi_test2'); + end; + + procedure test_wild_card_mul_path_name is + c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||':wild*_multi_*risks'; + l_objects_to_run ut3_develop.ut_suite_items; + l_test_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_logical_suite; + l_test1_proc ut3_develop.ut_test; + l_test2_proc ut3_develop.ut_test; + begin + --Act + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); + ut.expect(l_test_suite.name).to_equal('wildcard_multi_asterisks'); + ut.expect(l_test_suite.items.count).to_equal(2); + + for i in 1 .. 2 loop + l_test1_suite := treat(l_test_suite.items(i) as ut3_develop.ut_logical_suite); + case l_test1_suite.name + when 'test1_multi_wildcard' then + ut.expect(l_test1_suite.items.count).to_equal(2); + l_test1_proc := treat(l_test1_suite.items(1) as ut3_develop.ut_test); + ut.expect(l_test1_proc.name).to_equal('first_multi_test1'); + l_test2_proc := treat(l_test1_suite.items(2) as ut3_develop.ut_test); + ut.expect(l_test2_proc.name).to_equal('second_multi_test2'); + when 'test2_multi_wildcard' then + ut.expect(l_test1_suite.items.count).to_equal(1); + l_test1_proc := treat(l_test1_suite.items(1) as ut3_develop.ut_test); + ut.expect(l_test1_proc.name).to_equal('first_multi_test1'); + end case; + + end loop; + end; + + procedure tst_wild_card_mul_lv_path_name is + c_path varchar2(100) := sys_context('USERENV', 'CURRENT_USER')||':wild*_multi_*risks.*_multi_wildcard.*_multi_test1'; + l_objects_to_run ut3_develop.ut_suite_items; + l_test_suite ut3_develop.ut_logical_suite; + l_test1_suite ut3_develop.ut_logical_suite; + l_test1_proc ut3_develop.ut_test; + l_test2_proc ut3_develop.ut_test; + begin + --Act + l_objects_to_run := ut3_develop.ut_suite_manager.configure_execution_by_path(ut3_develop.ut_varchar2_list(c_path)); + + --Assert + ut.expect(l_objects_to_run.count).to_equal(1); + l_test_suite := treat(l_objects_to_run(1) as ut3_develop.ut_logical_suite); + ut.expect(l_test_suite.name).to_equal('wildcard_multi_asterisks'); + ut.expect(l_test_suite.items.count).to_equal(2); + + for i in 1 .. 2 loop + l_test1_suite := treat(l_test_suite.items(i) as ut3_develop.ut_logical_suite); + case l_test1_suite.name + when 'test1_multi_wildcard' then + ut.expect(l_test1_suite.items.count).to_equal(1); + l_test1_proc := treat(l_test1_suite.items(1) as ut3_develop.ut_test); + ut.expect(l_test1_proc.name).to_equal('first_multi_test1'); + when 'test2_multi_wildcard' then + ut.expect(l_test1_suite.items.count).to_equal(1); + l_test1_proc := treat(l_test1_suite.items(1) as ut3_develop.ut_test); + ut.expect(l_test1_proc.name).to_equal('first_multi_test1'); + end case; + + end loop; + end; + end test_suite_manager; / diff --git a/test/ut3_tester/core/test_suite_manager.pks b/test/ut3_tester/core/test_suite_manager.pks index ccd4d586c..d9d4efc09 100644 --- a/test/ut3_tester/core/test_suite_manager.pks +++ b/test/ut3_tester/core/test_suite_manager.pks @@ -196,15 +196,45 @@ create or replace package test_suite_manager is --%context(wildcard_filters) - --%test(Execute test_packages using a object_name with wildcard ) + --%test(Execute test_packages using a object_name with wildcard at the end ) procedure test_wild_card_obj_name; - --%test(Execute test_packages using a procedure name with wildcard ) + --%test(Execute test_packages using a procedure name with wildcard at the end) procedure test_wild_card_prc_name; - --%test(Execute test_packages using a path name with wildcard ) + --%test(Execute test_packages using a path name with wildcard at the end) procedure test_wild_card_path_name; + --%test(Execute test_packages using a object_name with wildcard in the front) + procedure test_wild_card_front_obj_name; + + --%test(Execute test_packages using a procedure name with wildcard in the front) + procedure test_wild_card_front_prc_name; + + -- %test(Execute test_packages using a path name with wildcard in the front) + procedure test_wild_card_front_path_name; + + --%test(Execute test_packages using a object_name with wildcard in the middle) + procedure test_wild_card_mid_obj_name; + + --%test(Execute test_packages using a procedure name with wildcard in the middle) + procedure test_wild_card_mid_prc_name; + + -- %test(Execute test_packages using a path name with wildcard in the middle) + procedure test_wild_card_mid_path_name; + + --%test(Execute test_packages using a object_name with multiple wildcards) + procedure test_wild_card_mul_obj_name; + + --%test(Execute test_packages using a procedure name with multiple wildcards) + procedure test_wild_card_mul_prc_name; + + -- %test(Execute test_packages using a path name with multiple wildcards) + procedure test_wild_card_mul_path_name; + + -- %test(Execute test_packages using a path name with multiple wildcards on different level) + procedure tst_wild_card_mul_lv_path_name; + --%endcontext end test_suite_manager; From 51439d8eb4b81c1e1ab53c2430692c8db3c6eae7 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sat, 16 Apr 2022 02:39:48 +0100 Subject: [PATCH 0958/1096] Update documentation --- docs/userguide/running-unit-tests.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index c0efeba52..2288bf3f1 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -46,6 +46,7 @@ The **functions** can only be used in SELECT statements. They execute the specif The examples below illustrate different ways and options to invoke `ut.run` procedures. You can use a wildcard character `*` to call tests by part of their name or to call tests that are located on paths matched by part of path string. +Wildcard character can be placed anywhere on the path and can occur mutliple times. Schema name cannot contain a wildcard character whether is in a suitepath call or call by object name. ```sql @@ -86,6 +87,15 @@ end; Executes all tests in schema `hr` from all packages that are on suitepath starting with `com`. +```sql +set serveroutput on +begin + ut.run('hr:co*.my_*.my_*'); +end; +``` + +Executes all tests in schema `hr` from all packages that starting with `my_` and all tests starting with `my_*` that are on suitepath starting with `co` . + ```sql set serveroutput on begin From 0fc7ff6d4717e7208ce2fd73d831b55e2c4316f8 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sat, 16 Apr 2022 16:22:09 +0100 Subject: [PATCH 0959/1096] Fixing issue where parition by only path caused a duplicate level 1 across two owners being removed. --- source/core/ut_suite_cache_manager.pkb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index e525be7ea..6ed4f50f0 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -203,7 +203,7 @@ create or replace package body ut_suite_cache_manager is begin select obj bulk collect into l_suite_items from ( - select /*+ cardinality(c 500) */ value(c) as obj,row_number() over ( partition by path order by path asc) as r_num + select /*+ cardinality(c 500) */ value(c) as obj,row_number() over ( partition by path,object_owner order by path,object_owner asc) as r_num from ut_suite_cache c, table(a_schema_paths) sp where c.object_owner = upper(sp.schema_name) From 647b830df119f6931347bf5d37475e645c252896 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 17 Apr 2022 03:33:30 +0300 Subject: [PATCH 0960/1096] Fixed issue with suites getting duplicated when running tests across multiple schemas --- source/core/ut_suite_cache_manager.pkb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index 6ed4f50f0..d3e832a9b 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -287,11 +287,11 @@ create or replace package body ut_suite_cache_manager is with extract_parent_child as ( select s.path, substr(s.path,1,instr(s.path,'.',-1,1)-1) as parent_path,s.object_owner, - case when a_random_seed is null then s.line_no else null end line_no, - case when a_random_seed is null then null else ut_utils.hash_suite_path(s.path, a_random_seed) end random_seed + case when a_random_seed is null then s.line_no end line_no, + case when a_random_seed is not null then ut_utils.hash_suite_path(s.path, a_random_seed) end random_seed from table(a_suite_rows) s), t1(path,parent_path,object_owner,line_no,random_seed) as ( - --Anchor memeber + --Anchor member select s.path, parent_path,s.object_owner,s.line_no,random_seed from extract_parent_child s where parent_path is null @@ -299,7 +299,8 @@ create or replace package body ut_suite_cache_manager is --Recursive member select t2.path, t2.parent_path,t2.object_owner,t2.line_no,t2.random_seed from t1,extract_parent_child t2 - where t2.parent_path = t1.path) + where t2.parent_path = t1.path + and t2.object_owner = t1.object_owner) search depth first by line_no desc,random_seed desc nulls last set order1 select value(i) as obj bulk collect into l_suite_rows From 58f69979f8676aa1808b09ff09af30aa9f9e6f9d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 23 Apr 2022 10:47:40 +0100 Subject: [PATCH 0961/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 4594b9864..d0998977b 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 746421e4a..77de81572 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 590fce081..446fface8 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 6400be9d1..cc759f3ff 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index e1a5cd7dd..e3cd96e35 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 085c06221..08301acfe 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 68a26ce8b..7e40371fc 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 645eda5f1..48da86cac 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 0112c44d8..d3b0d3fee 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index a84d80f11..19a6e2da7 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 9dabeb2fd..23bfa4105 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index c29a40c7b..8fab1969a 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 1c631d0d5..4c334ae8a 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 0cfd513f3..460d024c6 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 8f4d0765a..3bd5662cf 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 2288bf3f1..6029aced1 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index a5fb8a669..e13a7e59d 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4003--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 995d83c10..21f6424d8 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.13.4003-develop'; + gc_version constant varchar2(50) := 'v3.1.13.4014-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From d88dd2d740919856853edd208ca11bb03133d515 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 26 May 2022 12:31:28 +0300 Subject: [PATCH 0962/1096] Updated slack link in feature request --- .github/ISSUE_TEMPLATE/feature_request.md | 2 +- docs/about/support.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 4cd72f51c..681bc7f3a 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -23,4 +23,4 @@ Add any other context or screenshots about the feature request here. > Please do not create issues for generic SQL or PL/SQL questions. There are other forums and communities to help you with those. See [ASKTom](https://asktom.oracle.com) for example. **Want to discuss** -If you want to discuss your issue, join [our SLACK chat](https://join.slack.com/t/utplsql/shared_invite/zt-d6zor80g-WWqAhbLWioJZUtLYeXetzA). +If you want to discuss your issue, join [our SLACK chat](https://join.slack.com/t/utplsql/shared_invite/zt-xwm68udy-4cF_3PNEyczYEbWr38W5ww). diff --git a/docs/about/support.md b/docs/about/support.md index cc759f3ff..178412fdb 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -3,4 +3,4 @@ # How to get support - Feel free to post questions, bugs or issues in the [issues area of GitHub](https://github.com/utPLSQL/utPLSQL/issues) -- [Join](https://join.slack.com/t/utplsql/shared_invite/zt-xwm68udy-4cF_3PNEyczYEbWr38W5ww) developers team on utPLSQL [Slack](https://utplsql.slack.com/) +- [Join](https://join.slack.com/t/utplsql/shared_invite/zt-xwm68udy-4cF_3PNEyczYEbWr38W5ww) developers team on [utPLSQL Slack](https://utplsql.slack.com/) From fc5c4af28ad9416de894670a92cdc3fe9081f4f4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 26 May 2022 10:50:51 +0100 Subject: [PATCH 0963/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index d0998977b..1de762d74 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 77de81572..5030fff0a 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 446fface8..71178988b 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 178412fdb..1c0679440 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index e3cd96e35..b79c845f5 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 08301acfe..2faf98dec 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 7e40371fc..933b1b119 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 48da86cac..85a4351ce 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index d3b0d3fee..b66b5dff7 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 19a6e2da7..6a8b3d4e3 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 23bfa4105..20f641e45 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 8fab1969a..cd2f41af6 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 4c334ae8a..fbe3b44a1 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 460d024c6..136770405 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 3bd5662cf..14d411aa6 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 6029aced1..d833b6c94 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index e13a7e59d..14e35a5b5 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4014--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 21f6424d8..6ef2c4a9a 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.13.4014-develop'; + gc_version constant varchar2(50) := 'v3.1.13.4015-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 4f944a6d223e9a5d037e42e97dad8c5e92e88b40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Thu, 28 Jul 2022 12:52:39 +0100 Subject: [PATCH 0964/1096] Fix uninstall scripts Fixing problem with uninstall script buffer overflow on DBMS_OUTPUT. Reolves: #1220 --- source/uninstall_objects.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index ab4069497..571d187a2 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -1,5 +1,4 @@ set echo off -set serverout on declare procedure drop_if_exists(a_object_type varchar2, a_object_name varchar2) is l_count integer; From aa9d2737be7c789c6d779a481edc6175d81677d2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 8 Aug 2022 13:24:24 +0100 Subject: [PATCH 0965/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 1de762d74..50660b2f2 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 5030fff0a..87d1283e6 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 71178988b..f05c9c428 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 1c0679440..fd4009308 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index b79c845f5..90deef32c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 2faf98dec..74fbdd89f 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 933b1b119..4bd01a6d3 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 85a4351ce..efbdae53c 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index b66b5dff7..f623877f7 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 6a8b3d4e3..644cad22e 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 20f641e45..fc8355f64 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index cd2f41af6..2a61ee10b 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index fbe3b44a1..eca9fd6d6 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 136770405..9e21d3635 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 14d411aa6..68b7694cd 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index d833b6c94..0f1e182ad 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 14e35a5b5..707ff8f4e 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4015--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 6ef2c4a9a..f7493229f 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.13.4015-develop'; + gc_version constant varchar2(50) := 'v3.1.13.4018-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 4e82973abad2e1b6dc8d91088f71a5a15d08f29d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Kukie=C5=82a?= <53443372+kukimik@users.noreply.github.com> Date: Mon, 8 Aug 2022 14:55:49 +0200 Subject: [PATCH 0966/1096] Fix dropped synonyms counter. --- source/uninstall_synonyms.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/uninstall_synonyms.sql b/source/uninstall_synonyms.sql index 569e5057d..2c96c03a4 100644 --- a/source/uninstall_synonyms.sql +++ b/source/uninstall_synonyms.sql @@ -15,10 +15,10 @@ begin and not exists (select 1 from all_objects o where o.owner = s.table_owner and o.object_name = s.table_name) ) loop - i := i + 1; begin execute immediate 'drop '||syn.syn_name; dbms_output.put_line('Dropped '||syn.syn_name||' for object '||syn.for_object); + i := i + 1; exception when others then dbms_output.put_line('FAILED to drop '||syn.syn_name||' for object '||syn.for_object); From 1bd302881bcadeefc4501f69c1aca9caafbf73fc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 15 Aug 2022 11:41:39 +0100 Subject: [PATCH 0967/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 50660b2f2..a465b7968 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 87d1283e6..208f59141 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index f05c9c428..a538b25f3 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index fd4009308..6416b668a 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 90deef32c..7c71123d4 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 74fbdd89f..ac712002c 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 4bd01a6d3..8dd117676 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index efbdae53c..acfc0559f 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index f623877f7..303a1a6d7 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 644cad22e..5a8cf3361 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index fc8355f64..65b9af484 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 2a61ee10b..c4dccfb51 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index eca9fd6d6..56f4d573b 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 9e21d3635..f3f4f3c1c 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 68b7694cd..3b4802357 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 0f1e182ad..5946f70b0 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 707ff8f4e..3d5b9d7ce 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4018--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index f7493229f..bc5d28826 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.13.4018-develop'; + gc_version constant varchar2(50) := 'v3.1.13.4021-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 53dc4d8526fa0a562fd11172315412da18168906 Mon Sep 17 00:00:00 2001 From: kukimik Date: Sun, 14 Aug 2022 22:52:34 +0200 Subject: [PATCH 0968/1096] Add a section on custom reporters. --- docs/userguide/reporters.md | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 68b7694cd..8431582a4 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -161,5 +161,20 @@ Some of the information in debug log might be redundant. > - db object names > - etc. - - \ No newline at end of file +# Custom reporters + +It is possible to add your own reporters by creating an appropriate object type. In principle, it has to be a subtype of `ut_reporter_base`. However, if the reporter is expected to produce output consumable by a client oustside of the database (e.g. the data has to be reported to the screen or to a file), then you should base it on `ut_output_reporter_base` (which is a subtype of `ut_reporter_base`). In contrast, if you would like to create a reporter that, for example, saves the data to a database table, then it should be based directly on `ut_reporter_base`. (Currently, all reporters in the utPLSQL framework are based on `ut_output_reporter_base`.) Coverage reporters are based on `ut_coverage_reporter_base` (a subtype of `ut_output_reporter_base`). + +If need to produce a colored text output from the custom reporter, then you can build it basing on `ut_console_reporter_base` (a subtype of `ut_output_reporter_base`). In many cases it may also be more convenient to create the custom reporter type under a more specialized type, like `ut_documentation_reporter` or `ut_junit_reporter`, and override just some of the functionality. + +It is recommended to create the reporter type in the schema where utPLSQL is installed (by default it is the `UT3` schema). Note that before running the utPLSQL uninstall scripts, all custom reporters should be dropped (cf. [the installation documentation](install.md)). In particular, when upgrading to a newer version of utPLSQL, one has to drop the custom reporters and recreate them after the upgrade. + +**Note:** +> It is possible, but cumbersome, to use another schema for storing the custom reporters. This requires to create a synonym for the base reporter type in the schema that is going to own the custom reporter, and to provide appropriate grants both to the owner of the custom reporter and to the user running the reporter. After upgrading or reinstalling utPLSQL, the extra privileges need to be recreated. This approach is not recommended. + +Assuming that the custom reporter type is created in the `UT3` schema, to run the tests using a custom reporter just call: `exec ut.run(ut3.custom_reporter_name());`, optionally providing parameter values to the `custom_reporter_name` constructor. + +One may get acquainted with the source code of the standard reporters bundled with utPLSQL (including the coverage reporters) by browsing the [`source/reporters/`](https://github.com/utPLSQL/utPLSQL/tree/develop/source/reporters) directory. The base reporter types `ut_reporter_base`, `ut_output_reporter_base` and `ut_console_reporter_base` are defined in [`source/core/types`](https://github.com/utPLSQL/utPLSQL/tree/develop/source/core/types). The base coverage reporter type `ut_coverage_reporter_base` is in [`source/core/coverage`](https://github.com/utPLSQL/utPLSQL/tree/develop/source/core/coverage). There are also two examples of custom reporters in [`examples/custom_reporters/`](https://github.com/utPLSQL/utPLSQL/tree/develop/examples/custom_reporters), both extending the functionality of `ut_documentation_reporter`: + +* `ut_custom_reporter` accepts an integer parameter `a_tab_size`; it alters the behaviour of `ut_documentation_reporter` by changing the size of the indentation according to the parameter value (by default the indentation is increased). +* `ut_expectations_reporter` accepts a `varchar2` parameter `a_report_all_expectations`; if its value is `'Y'` (which is the default), then the reporter shows the results of all expectations that are run. This stays in contrast with `ut_documentation_reporter`, which shows the results of all tests that are run, but only of the expectations that failed (keep in mind that a single test may consist of several expectations). From 3b003561e5f0a3eba46a4e4983e4970d9cc064aa Mon Sep 17 00:00:00 2001 From: Neil Barsema Date: Wed, 31 Aug 2022 11:21:34 +0200 Subject: [PATCH 0969/1096] Add explicit grants for public packages The privileges on the referenced packages are often revoked from PUBLIC as database hardening. Not relying on these grants being available makes the install script more robust. --- source/create_utplsql_owner.sql | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/source/create_utplsql_owner.sql b/source/create_utplsql_owner.sql index 1af2cf168..64bcb52ce 100644 --- a/source/create_utplsql_owner.sql +++ b/source/create_utplsql_owner.sql @@ -41,6 +41,11 @@ end; / grant execute on dbms_crypto to &ut3_owner_schema; +grant execute on dbms_lob to &ut3_owner_schema; +grant execute on dbms_xmlgen to &ut3_owner_schema; +grant execute on dbms_sql to &ut3_owner_schema; +grant execute on dbms_random to &ut3_owner_schema; + grant alter session to &ut3_owner_schema; From 4cdc7d424a8851b25b8c48bf15c22d6177c783d6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 9 Sep 2022 13:24:54 +0100 Subject: [PATCH 0970/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index a465b7968..d5edb4d77 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 208f59141..ec84e3b88 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index a538b25f3..d1734ae77 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 6416b668a..53b96d4b1 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 7c71123d4..0985a7c28 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index ac712002c..93e5fba8a 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 8dd117676..00f0303e7 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index acfc0559f..04d24629b 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 303a1a6d7..fca2bcbc7 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 5a8cf3361..7ddbde478 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 65b9af484..9121fa721 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index c4dccfb51..4294ebd2a 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 56f4d573b..37dc6c163 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index f3f4f3c1c..ccb5fea24 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 0d3626a04..cc23ca67f 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 5946f70b0..22d1ce405 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 3d5b9d7ce..bde427999 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4021--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index bc5d28826..029bc17f3 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.13.4021-develop'; + gc_version constant varchar2(50) := 'v3.1.13.4036-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From b77ae3c119d58e4a0042eb7ac74f56d4fb3702c5 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 19 Sep 2022 13:49:16 +0300 Subject: [PATCH 0971/1096] Fixing utPLSQL-cli download script documentation --- docs/userguide/running-unit-tests.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 22d1ce405..ca8ab0b4a 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -24,7 +24,7 @@ You may download the latest release of the command line client from [here](https ```bash #!/bin/bash # Get the url to latest release "zip" file -DOWNLOAD_URL=$(curl --silent https://api.github.com/repos/utPLSQL/utPLSQL-cli/releases/latest | awk '/zipball_url/ { print $2 }' | sed -r 's/"|,//g') +DOWNLOAD_URL=$(curl --silent https://api.github.com/repos/utPLSQL/utPLSQL-cli/releases/latest | awk '/browser_download_url/ { print $2 }' | grep ".zip\"" | sed 's/"//g') # Download the latest release "zip" file curl -Lk "${DOWNLOAD_URL}" -o utplsql-cli.zip # Extract downloaded "zip" file From 051c5257dd04c39561a23e7f403b778d43df094f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 19 Sep 2022 11:57:50 +0100 Subject: [PATCH 0972/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index d5edb4d77..25d6fbf77 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index ec84e3b88..b860bf718 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index d1734ae77..5dad05ae0 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 53b96d4b1..2be6c96ac 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 0985a7c28..c770d7fe5 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) # Introduction to utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 93e5fba8a..41511efed 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 00f0303e7..0f74c4692 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) # Annotations diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 04d24629b..422a294f0 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) # Best Practices diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index fca2bcbc7..430d2473e 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) # Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 7ddbde478..498ce88ef 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) # Exception handling and reporting diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 9121fa721..5762793b9 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) # Expectation concepts Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 4294ebd2a..3e5564e44 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 37dc6c163..2ba60144c 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) # Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index ccb5fea24..15f9952be 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) # Qyerying for test suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index cc23ca67f..b82ec7d32 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index ca8ab0b4a..7fa8263ad 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) # Running tests diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index bde427999..68256fa4f 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 029bc17f3..d25c365da 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.13.4036-develop'; + gc_version constant varchar2(50) := 'v3.1.13.4037-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From eb14593ac07e3f7a82f5bfdb4c2b8fb4a3ab3fdd Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 11 Oct 2022 22:32:46 +0300 Subject: [PATCH 0973/1096] Introducing MkDocs documentation --- mkdocs.yml | 74 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 68 insertions(+), 6 deletions(-) diff --git a/mkdocs.yml b/mkdocs.yml index f9a2687a8..e675c93f4 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,17 +1,79 @@ # Format documented here # http://www.mkdocs.org/user-guide/configuration/ -site_name: utPLSQL +site_url: http://utPLSQL.org/ +site_name: utPLSQL-framework site_description: utPLSQL Ultimate Unit Testing Framework for Oracle PL/SQL -copyright: Copyright © 2016 - 2018 utPLSQL Team -repo_url: https://github.com/utPLSQL/utPLSQL -theme: mkdocs +copyright: Copyright © 2016 - 2022 utPLSQL Team +#repo_url: https://github.com/utPLSQL/utPLSQL # disable for offline docs +theme: + name: material + palette: + # Palette toggle for light mode + - media: "(prefers-color-scheme: light)" + scheme: default + toggle: + icon: material/lightbulb-outline + name: Switch to dark mode + # Palette toggle for dark mode + - media: "(prefers-color-scheme: dark)" + scheme: slate + toggle: + icon: material/lightbulb + name: Switch to light mode + logo: assets/icon-transparent.png + favicon: assets/favicon.png + features: + - navigation.instant # disable for offline docs +# - navigation.indexes + - navigation.tabs + - navigation.tracking + - toc.follow + - toc.integrate + - search.suggest + - search.highlight +extra: +# homepage: http://jgebal.github.io/ +# homepage: http://utPLSQL.org/ + social: + - icon: fontawesome/brands/twitter + link: https://twitter.com/utPLSQL + - icon: fontawesome/brands/slack + link: https://join.slack.com/t/utplsql/shared_invite/zt-xwm68udy-4cF_3PNEyczYEbWr38W5ww + - icon: fontawesome/brands/github + link: https://github.com/utPLSQL + - icon: fontawesome/solid/envelope + link: mailto:utPLSQL@utPLSQL.org + consent: + title: Cookie consent + description: >- + We use cookies to recognize your repeated visits and preferences, as well + as to measure the effectiveness of our documentation and whether users + find what they're searching for. With your consent, you're helping us to + make our documentation better. + version: # disable for offline docs + provider: mike # disable for offline docs +markdown_extensions: + - pymdownx.highlight: + anchor_linenums: true + - pymdownx.inlinehilite + - pymdownx.snippets + - pymdownx.superfences + - toc: + permalink: true use_directory_urls: false strict: true +plugins: + - search + - mike + - git-revision-date-localized: # disable for offline docs + enable_creation_date: true # disable for offline docs + type: datetime # disable for offline docs + nav: - - Home: index.md - User Guide: + - index.md - Installation: userguide/install.md - Getting Started: userguide/getting-started.md - Annotations: userguide/annotations.md @@ -23,8 +85,8 @@ nav: - Upgrade utPLSQL: userguide/upgrade.md - Reporting: - Using reporters: userguide/reporters.md - - Reporting errors: userguide/exception-reporting.md - Code coverage: userguide/coverage.md + - Error handling and reporting: userguide/exception-reporting.md - About: - Project Details: about/project-details.md - License: about/license.md From c5ce09bffbf02b7fd41681b0f43f6c97f0d65f4f Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 11 Oct 2022 22:50:22 +0300 Subject: [PATCH 0974/1096] Adjusting documentation to work well with new MkDocs --- docs/index.md | 34 ++++--------------- docs/userguide/annotations.md | 4 +-- docs/userguide/best-practices.md | 2 -- docs/userguide/coverage.md | 7 +++- docs/userguide/exception-reporting.md | 3 +- docs/userguide/expectations.md | 17 ++++++---- docs/userguide/getting-started.md | 28 ++++++++-------- docs/userguide/install.md | 47 ++++++++++++++------------- docs/userguide/querying_suites.md | 3 -- docs/userguide/reporters.md | 20 ++++++------ docs/userguide/running-unit-tests.md | 24 +++++++------- 11 files changed, 83 insertions(+), 106 deletions(-) diff --git a/docs/index.md b/docs/index.md index 0985a7c28..f9b648b43 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,39 +1,17 @@ ![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) -# Introduction to utPLSQL +## What is utPLSQL utPLSQL is a Unit Testing framework for Oracle PL/SQL. The framework follows industry standards and best patterns of modern Unit Testing frameworks like [JUnit](http://junit.org/junit4/) and [RSpec](http://rspec.info/) - - - User Guide - - [Installation](userguide/install.md) - - [Getting Started](userguide/getting-started.md) - - [Annotations](userguide/annotations.md) - - [Expectations](userguide/expectations.md) - - [Advanced data comparison](userguide/advanced_data_comparison.md) - - [Running unit tests](userguide/running-unit-tests.md) - - [Querying for test suites](userguide/querying_suites.md) - - [Testing best practices](userguide/best-practices.md) - - [Upgrade utPLSQL](userguide/upgrade.md) - - Reporting - - [Using reporters](userguide/reporters.md) - - [Reporting errors](userguide/exception-reporting.md) - - [Code coverage](userguide/coverage.md) - - [Cheat-sheet](https://www.cheatography.com/jgebal/cheat-sheets/utplsql-v3-1-2/#downloads) - - About - - [Project Details](about/project-details.md) - - [License](about/license.md) - - [Support](about/support.md) - - [Authors](about/authors.md) - - [Version 2 to Version 3 Comparison](compare_version2_to_3.md) - -# Demo project + +## Demo project Have a look at our [demo project](https://github.com/utPLSQL/utPLSQL-demo-project/). It uses [Travis CI](https://travis-ci.org/utPLSQL/utPLSQL-demo-project) to build on every commit, runs all tests, publishes test results and code coverage to [SonarCloud](https://sonarcloud.io/project/overview?id=utPLSQL:utPLSQL-demo-project). -# Three steps +## Three steps With just three simple steps you can define and run your unit tests for PLSQL code. @@ -48,7 +26,7 @@ Here is how you can simply create tested code, unit tests and execute the tests Check out the sections on [annotations](userguide/annotations.md) and [expectations](userguide/expectations.md) to see how to define your tests. -# Command line +## Command line You can use the utPLSQL command line client [utPLSQL-cli](https://github.com/utPLSQL/utPLSQL-cli) to run tests without the need for Oracle Client or any IDE like SQLDeveloper/TOAD etc. @@ -60,7 +38,7 @@ Amongst many benefits they provide ability to: Download the [latest client](https://github.com/utPLSQL/utPLSQL-cli/releases/latest) and you are good to go. See [project readme](https://github.com/utPLSQL/utPLSQL-cli/blob/develop/README.md) for details. -# Coverage +## Coverage If you want to have code coverage gathered on your code , it's best to use `ut_run` to execute your tests with multiple reporters and have both test execution report as well as coverage report saved to a file. diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 00f0303e7..0a9a2d15d 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,7 +1,5 @@ ![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) -# Annotations - Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package. No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit. The framework runner searches for all the suitable annotated packages, automatically configures suites, forms the suite hierarchy, executes it and reports results in specified formats. @@ -38,7 +36,7 @@ There **can not** be any empty lines or comments between annotation line and pro There can be many annotations for a procedure. Valid procedure annotations example: -```sql +```sql linenums="1" package test_package is --%suite diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 04d24629b..a1924b8de 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,7 +1,5 @@ ![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) -# Best Practices - The following are best practices we at utPLSQL have learned about PL/SQL and Unit Testing. ## Test Isolation and Dependency diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index fca2bcbc7..7d77cb7ed 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,8 +1,8 @@ ![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) -# Coverage utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. Code coverage is gathered for the following source types: + * package bodies * type bodies * triggers @@ -15,6 +15,7 @@ Code coverage is gathered for the following source types: To obtain information about code coverage for unit tests, run utPLSQL with one of built-in code coverage reporters. The following code coverage reporters are supplied with utPLSQL: + * `ut_coverage_html_reporter` - generates a HTML coverage report providing summary and detailed information on code coverage. The HTML reporter is based on the open-source [simplecov-html](https://github.com/colszowka/simplecov-html) reporter for Ruby. It includes source code of the code that was covered (if the code is accessible for test user) * `ut_coveralls_reporter` - generates a [Coveralls compatible JSON](https://coveralls.zendesk.com/hc/en-us/articles/201774865-API-Introduction) coverage report providing detailed information on code coverage with line numbers. This coverage report is designed to be consumed by cloud services like [Coveralls](https://coveralls.io) * `ut_coverage_sonar_reporter` - generates a [Sonar Compatible XML](https://docs.sonarqube.org/latest/analysis/generic-test/) coverage report providing detailed information on code coverage with line numbers. This coverage report is designed to be consumed by services like [SonarQube](https://www.sonarqube.org/) and [SonarCloud](https://about.sonarcloud.io/) @@ -23,6 +24,7 @@ The following code coverage reporters are supplied with utPLSQL: ## Security model utPLSQL code coverage uses DBMS_PROFILER to gather information about the execution of code under test and therefore follows the [DBMS_PROFILER's Security Model](https://docs.oracle.com/database/121/ARPLS/d_profil.htm#ARPLS67465). In order to be able to gather coverage information, the user executing unit tests needs to be either: + * The owner of the code that is being tested * Have the following privileges to be able to gather coverage on code owned by other users: * `create any procedure` system privilege @@ -144,6 +146,7 @@ You may specify both _include_ and _exclude_ options to gain more control over w **Important notes** The order of priority is for evaluation of include/exclude filter parameters is as follows. + - if `a_source_file_mappings` is defined then all include/exclude parameters are ignored (see section below for usage of `a_source_file_mappings` parameter ) - else if `a_include_schema_expr` or `a_include_object_expr` parameter is specified then parameters `a_coverage_schemes` and `a_include_objects` are ignored - else if `a_include_objects` is specified then the coverage is gathered only on specified database objects. @@ -300,6 +303,7 @@ They are abstracted from database, schema names, packages, procedures and functi To be able to effectively use reporters dedicated for those tools, utPLSQL provides functionality for mapping database object names to project files. There are a few significant differences when running coverage on project files compared to running coverage on schema(s). + - Coverage is only reported on objects that were successfully mapped to project files. - Project files (database objects) that were not executed at all are not reported as fully uncovered. It is up to the consumer (Sonar/Coveralls) to determine if project file should be considered as 0% coverage or just ignored. @@ -335,6 +339,7 @@ C: ``` By default, utPLSQL will convert file paths into database objects using the following regular expression `/(((\w|[$#])+)\.)?((\w|[$#])+)\.(\w{3})$` + - object owner (if it is present) is identified by the expression in the second set of brackets - object name is identified by the expression in the fourth set of brackets - object type is identified by the expression in the sixth set of brackets diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 7ddbde478..b4cb033e7 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,12 +1,11 @@ ![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) -# Exception handling and reporting - The utPLSQL is responsible for handling exceptions wherever they occur in the test run. utPLSQL is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. The framework provides a full stacktrace for every exception that was thrown. The stacktrace is clean and does not include any utPLSQL library calls in it. To achieve rerunability, the package state invalidation exceptions (ORA-04068, ORA-04061) are not handled and test execution will be interrupted if such exceptions are encountered. This is because of how Oracle behaves on those exceptions. Test execution can fail for different reasons. The failures on different exceptions are handled as follows: + * A test package without body - each `--%test` is reported as failed with exception, nothing is executed * A test package with _invalid body_ - each `--%test` is reported as failed with exception, nothing is executed * A test package with _invalid spec_ - package is not considered a valid unit test package and is excluded from execution. When trying to run a test package with invalid spec explicitly, exception is raised. Only valid specifications are parsed for annotations diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 9121fa721..5856b77a1 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,6 +1,7 @@ ![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) -# Expectation concepts +## Expectation concepts + Validation of the code under test (the tested logic of procedure/function etc.) is performed by comparing the actual data against the expected data. utPLSQL uses expectations and matchers to perform the check on the data. @@ -82,12 +83,14 @@ SUCCESS **Note:** > The examples in the document will be only using shortcut syntax, to keep the document brief. -# Using expectations +## Using expectations + There are two ways to use expectations: - by invoking utPLSQL framework to execute suite(s) of utPLSQL tests - without invoking the utPLSQL framework - running expectations standalone ## Running expectations within utPLSQL framework + When expectations are ran as a part of a test suite, the framework tracks: - status of each expectation - outcomes (messages) produced by each expectation @@ -166,7 +169,7 @@ When expectations are invoked outside of utPLSQL framework the outputs from expe **Note:** > The examples in the document will be only using standalone expectations, to keep the document brief. -# Matchers +## Matchers utPLSQL provides the following matchers to perform checks on the expected and actual values. - `be_between( a_upper_bound {data-type}, a_lower_bound {data-type} )` @@ -312,7 +315,7 @@ FAILURE ``` Since NULL is neither *true* nor *false*, both expectations will report failure. -# Supported data types +## Supported data types The matrix below illustrates the data types supported by different matchers. @@ -336,7 +339,7 @@ The matrix below illustrates the data types supported by different matchers. | **be_within().of_()** | | | | X | X | X | X | X | | | | | | | | | **be_within_pct().of_()** | | | | | X | | | | | | | | | | | -# Expecting exceptions +## Expecting exceptions Testing is not limited to checking for happy-path scenarios. When writing tests, you often want to validate that in specific scenarios, an exception is thrown. @@ -385,7 +388,7 @@ Finished in .009229 seconds For more details see documentation of the [`--%throws` annotation.](annotations.md#throws-annotation) -# Matchers +## Matchers You can choose different matchers to validate that your PL/SQL code is working as expected. @@ -1747,7 +1750,7 @@ FAILURE at "anonymous block", line 32 ``` -# Comparing Json objects +## Comparing Json objects utPLSQL is capable of comparing json data-types of `json_element_t` **on Oracle 12.2 and above**, and also `json` **on Oracle 21 and above** diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 4294ebd2a..42b6b3641 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -7,7 +7,7 @@ utPLSQL is designed in a way that allows you to follow Below is an example of building a simple function with TDD. -# Gather requirements +## Gather requirements We have a requirement to build a function that will return a substring of a string that is passed to the function. @@ -17,12 +17,12 @@ The function should accept three parameters: - start_position - end_position -# Create a test +## Create a test We will start from the bare minimum and move step by step, executing tests every time we make minimal progress. This way, we assure we don't jump ahead too much and produce code that is untested or untestable. -## Create test package +### Create test package ```sql create or replace package test_betwnstr as @@ -43,7 +43,7 @@ Finished in .451423 seconds 0 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s) ``` -## Define specification for the test +### Define specification for the test ```sql create or replace package test_betwnstr as @@ -76,7 +76,7 @@ Finished in .509673 seconds Well our test is failing as the package specification requires a body. -## Define body of first test +### Define body of first test ```sql create or replace package body test_betwnstr as @@ -110,9 +110,9 @@ Finished in .415851 seconds Our test is failing as the test suite package body is invalid. Looks like we need to define the function we want to test. -# Implement code to fulfill the requirement +## Implement code to fulfill the requirement -## Define tested function +### Define tested function ```sql create or replace function betwnstr( a_string varchar2, a_start_pos integer, a_end_pos integer ) return varchar2 @@ -143,7 +143,7 @@ Finished in .375178 seconds So now we see that our test works but the function does not return the expected results. Let us fix this and continue from here. -## Fix the tested function +### Fix the tested function The function returned a string one character short, so we need to add 1 to the substr parameter. @@ -169,14 +169,14 @@ Finished in .006077 seconds So our test is now passing, great! -# Refactor +## Refactor Once our tests are passing, we can safely refactor (restructure) the code as we have a safety harness in place to ensure that after the restructuring and cleanup of the code, everything is still working. One thing worth mentioning is that refactoring of tests is as important as refactoring of code. Maintainability of both is equally important. -# Further requirements +## Further requirements It seems like our work is done. We have a function that returns a substring from start position to end position. As we move through the process of adding tests, it's very important to think about edge cases. @@ -195,7 +195,7 @@ Here is a list of edge cases for our function: We should define expected behavior for each of these edge cases. Once defined we can start implementing tests for those behaviors and adjust the tested function to meet the requirements specified in the tests. -## Add test for additional requirement +### Add test for additional requirement A new requirement was added: Start position zero - should be treated as start position one @@ -250,7 +250,7 @@ Finished in .232584 seconds Looks like our function does not work as expected for zero start position. -## Implementing the requirement +### Implementing the requirement Let's fix our function so that the new requirement is met @@ -281,7 +281,7 @@ Finished in .012718 seconds Great! We have made some visible progress. -## Refactoring +### Refactoring When all tests are passing we can proceed with a safe cleanup of our code. @@ -308,7 +308,7 @@ Finished in .013739 seconds 2 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s) ``` -# Remaining requirements +## Remaining requirements You may continue on with the remaining edge cases from here. diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 37dc6c163..dce1a2e2e 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,8 +1,9 @@ ![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) -# Supported database versions +## Supported database versions utPLSQL is continuously tested against following versions of Oracle databases + * 11g R2 * 12c * 12c R2 @@ -11,17 +12,17 @@ utPLSQL is continuously tested against following versions of Oracle databases We do our best to assure full compatibility with supported versions of Oracle databases [See](http://www.oracle.com/us/support/library/lifetime-support-technology-069183.pdf#page=6) -# Requirements +## Requirements utPLSQL will run on any Oracle Database version 11g relase 2 or above. -## Licensed features required +### Licensed features required utPLSQL doesn't require any extra licensed features of Oracle database. It can be installed on any Standard Edition Oracle Database. In fact, it even supports Oracle 11g XE which is a free Oracle Database version with minimal features and storage limits. -## Storage requirements +### Storage requirements utPLSQL will use tablespace for the following: - storage of annotation cache @@ -38,9 +39,9 @@ Profiler results may require regular purging to assure low space consumption. utPLSQl does not purge profiler tables as those tables can can be shared with other tools. -# Downloading utPLSQL +## Downloading utPLSQL -## Manual download +### Manual download - Go to GitHub releases page for utPLSQL [`https://github.com/utPLSQL/utPLSQL/releases`](https://github.com/utPLSQL/utPLSQL/releases) - Choose the version to download - latest is always greatest @@ -51,13 +52,13 @@ utPLSQl does not purge profiler tables as those tables can can be shared with ot The files have identical content but use different compression (tar / zip ) so choose whichever you prefer depending on your platform (Win/Mac/Unix/Linux). -## Scripted download of latest utPLSQL version +### Scripted download of latest utPLSQL version The below snippets can be used to download latest version of utPLSQL from github releases. After downloading follow the installation instructions in next sections of this document. -### Unix/Linux +#### Unix/Linux ```bash #!/bin/bash @@ -75,7 +76,7 @@ You may download with a one-liner if that is more convenient. curl -LOk $(curl --silent https://api.github.com/repos/utPLSQL/utPLSQL/releases/latest | awk '/browser_download_url/ { print $2 }' | grep ".zip\"" | sed 's/"//g') ``` -### Windows +#### Windows To run the script on windows you will need [PowerShell 3.0](https://blogs.technet.microsoft.com/heyscriptingguy/2013/06/02/weekend-scripter-install-powershell-3-0-on-windows-7/) or above. You will also need .NET 4.0 Framework or above. @@ -104,7 +105,7 @@ foreach ($i in $urlList) { } ``` -# Headless installation +## Headless installation utPLSQL can be installed with DDL trigger, to enable tracking of DDL changes to your unit test packages. This is the recommended installation approach, when you want to compile and run unit test packages in a schema containing huge amount of database packages (for example Oracle EBS installation schema). @@ -136,7 +137,7 @@ For Oracle 11g following users are excluded: > select username from all_users where oracle_maintained='Y'; >``` -## Installation without DDL trigger +### Installation without DDL trigger To install the utPLSQL into a new database schema and grant it to public, execute the script `install_headless.sql` as SYSDBA. @@ -152,7 +153,7 @@ cd source sqlplus sys/sys_pass@db as sysdba @install_headless.sql utp3 my_verySecret_password utp3_tablespace ``` -## Installation with DDL trigger +### Installation with DDL trigger To install the utPLSQL into a new database schema and grant it to public, execute the script `install_headless_with_trigger.sql` as SYSDBA. @@ -168,7 +169,7 @@ cd source sqlplus sys/sys_pass@db as sysdba @install_headless_with_trigger.sql utp3 my_verySecret_password utp3_tablespace ``` -# Recommended Schema +## Recommended Schema It is highly recommended to install utPLSQL in it's own schema. You are free to choose any name for this schema. Installing uPLSQL into a shared schema is really not recommended as you loose isolation of framework. @@ -190,9 +191,9 @@ utPLSQL is using [DBMS_PROFILER tables](https://docs.oracle.com/cd/E18283_01/app It is up to DBA to maintain the storage of the profiler tables. -# Manual installation procedure +## Manual installation procedure -## Creating schema for utPLSQL +### Creating schema for utPLSQL To create the utPLSQL schema and grant all the required privileges execute script `create_utplsql_owner.sql` from the `source` directory with parameters: - `user name` - the name of the user that will own of utPLSQL object @@ -205,7 +206,7 @@ cd source sqlplus sys/sys_password@database as sysdba @create_utPLSQL_owner.sql ut3 ut3 users ``` -## Installing utPLSQL +### Installing utPLSQL To install the utPLSQL framework into your database, go to `source` directory, run the `install.sql` providing the `schema_name` for utPLSQL as parameter. Schema must be created prior to calling the `install` script. You may install utPLSQL from any account that has sufficient privileges to create objects in other users schema. @@ -216,7 +217,7 @@ cd source sqlplus admin/admins_password@database @install.sql ut3 ``` -## Installing DDL trigger +### Installing DDL trigger To minimize startup time of utPLSQL framework (especially on a database with large schema) it is recommended to install utPLSQL DDL trigger to enable utPLSQL annotation to be updated at compile-time. It's recommended to install DDL trigger when connected as `SYSDBA` user. Trigger is created in utPLSQL schema. @@ -235,7 +236,7 @@ sqlplus admin/admins_password@database @install_ddl_trigger.sql ut3 >Trigger can be installed ant any point in time. -## Allowing other users to access the utPLSQL framework +### Allowing other users to access the utPLSQL framework In order to allow other users to access utPLSQL, synonyms must be created and privileges granted. You have two options: @@ -264,7 +265,7 @@ The following tools that support the SQL*Plus commands can be used to run the in - [SQLcl](http://www.oracle.com/technetwork/developer-tools/sqlcl/overview/index.html) - [Oracle SQL Developer](http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/index.html) -# Checking environment and utPLSQL version +## Checking environment and utPLSQL version To check the framework version execute the following query: ```sql @@ -278,7 +279,7 @@ select from dual; ``` -# Additional requirements +## Additional requirements In order to use the Code Coverage functionality of utPLSQL, users executing the tests must have the CREATE privilege on the PLSQL code that the coverage is gathered on. This is a requirement of [DBMS_PROFILER package](https://docs.oracle.com/cd/E18283_01/appdev.112/e16760/d_profil.htm#i999476). @@ -286,7 +287,7 @@ This is a requirement of [DBMS_PROFILER package](https://docs.oracle.com/cd/E182 In practice, user running tests for PLSQL code that he does not own, needs to have CREATE ANY PROCEDURE/CREATE ANY TRIGGER privileges. Running code coverage on objects that the user does not own will **not produce any coverage information** without those privileges. -# Uninstalling utPLSQL +## Uninstalling utPLSQL To uninstall run `uninstall.sql` and provide `schema_name` where utPLSQL is installed. @@ -308,11 +309,11 @@ i.e. the uninstall script provided with version 3.1.11 will not work correctly Alternatively you can drop the user that owns utPLSQL and re-create it using headless install. -# Version upgrade +## Version upgrade Currently, the only way to upgrade version of utPLSQL v3.0.0 and above is to remove the previous version and install the new version. -# Working with utPLSQL v2 +## Working with utPLSQL v2 If you are using utPLSQL v2, you can still install utPLSQL v3. The only requirement is that utPLSQL v3 needs to be installed in a different schema than utPLSQL v2. diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index ccb5fea24..317b9c766 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,8 +1,5 @@ ![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) -# Qyerying for test suites - - ## Obtaining information about suites utPLSQL framework provides ability to read inforamtion about unit test suites that exist in a schema. diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index cc23ca67f..08d7252d1 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -2,7 +2,7 @@ utPLSQL provides the following reporting formats. -# Documentation reporter +## Documentation reporter The `ut_documentation_reporter` is the default reporting format used by the framework. It provides a human readable test results. @@ -26,7 +26,7 @@ The documentation report provides the following information. - Summary with total number of tests, number of tests with status and timing for the execution -## Color output from documentation reporter +### Color output from documentation reporter When invoking tests with documentation reporter and your command line supports ANSICONSOLE (default on Unix) [available for Windows](http://adoxa.altervista.org/ansicon/), you can obtain the coloured outputs from the documentation reporter. @@ -41,7 +41,7 @@ Example outputs from documentation reporter. ![doc_reporter_outputs](../images/documentation_reporter_color.png) -# JUnit reporter +## JUnit reporter Most of continuous integration servers (like Jenkins) are capable of consuming unit test execution results in [JUnit](https://en.wikipedia.org/wiki/JUnit) format. The `ut_junit_reporter` in earlier version referred as `ut_xunit_reporter` is producing outcomes as JUnit-compatible XML unit test report, that can be used by CI servers to display their custom reports and provide metrics (like tests execution trends). @@ -63,7 +63,7 @@ Example of failure report details -# Teamcity reporter +## Teamcity reporter [Teamcity](https://www.jetbrains.com/teamcity/) is a CI server by Jetbrains. It supports JUnit reporting and additionally has it's own format of reporting that allows tracking of progress of a CI step/task as it executes. The TeamCity format developed by Jetbrains is supported by utPLSQL with `ut_teamcity_reporter`. @@ -83,7 +83,7 @@ Example of failure report details ![junit_reporter_outputs_errors](../images/teamcity_report_example_errors.png) -# Sonar test reporter +## Sonar test reporter If you are using [SonarQube](https://www.sonarqube.org/) or [SonarCloud](https://about.sonarcloud.io/) to do static code analysis for you PLSQL projects, your code analysis can benefit from code coverage and test results. utPLSQL provides two reporters to for SonarQube: - `ut_sonar_test_reporter` - provides an XML output of each test executed per each project test file (package) @@ -99,7 +99,7 @@ Providing invalid paths or paths to non-existing files will result in failure wh For details on how to invoke reporter with paths, see the **Coverage reporters** section. -# TFS / VSTS Reporter +## TFS / VSTS Reporter If you are using [TFS](https://www.visualstudio.com/tfs/) or [VSTS](https://www.visualstudio.com/team-services/) to do static code analysis for you PLSQL projects and run builds, your code analysis can benefit from code coverage and test results. TFS reporter is designed specifically to [work with Microsoft Team Fundation Server](https://docs.microsoft.com/en-us/vsts/build-release/tasks/test/publish-test-results?view=vsts) report format which is very old version of [JUnit](https://github.com/windyroad/JUnit-Schema/blob/master/JUnit.xsd). Main diffrence between standard JUnit is that elements cannot be nested and attribute skipped is not present. @@ -117,12 +117,12 @@ Details: ![tfs_junit_reporter_outputs](../images/tfs_details.png) -# Coverage reporters +## Coverage reporters utPLSQL comes with a set of build-in coverage reporters. Have a look into the [coverage documentation](coverage.md) to learn more about them. -# Debug reporter +## Debug reporter The `ut_debug_reporter` provides a highly verbose output containing thorough details about framework and test execution. @@ -161,11 +161,11 @@ Some of the information in debug log might be redundant. > - db object names > - etc. -# Custom reporters +## Custom reporters It is possible to add your own reporters by creating an appropriate object type. In principle, it has to be a subtype of `ut_reporter_base`. However, if the reporter is expected to produce output consumable by a client oustside of the database (e.g. the data has to be reported to the screen or to a file), then you should base it on `ut_output_reporter_base` (which is a subtype of `ut_reporter_base`). In contrast, if you would like to create a reporter that, for example, saves the data to a database table, then it should be based directly on `ut_reporter_base`. (Currently, all reporters in the utPLSQL framework are based on `ut_output_reporter_base`.) Coverage reporters are based on `ut_coverage_reporter_base` (a subtype of `ut_output_reporter_base`). -If need to produce a colored text output from the custom reporter, then you can build it basing on `ut_console_reporter_base` (a subtype of `ut_output_reporter_base`). In many cases it may also be more convenient to create the custom reporter type under a more specialized type, like `ut_documentation_reporter` or `ut_junit_reporter`, and override just some of the functionality. +If you need to produce a colored text output from the custom reporter, then you can build it basing on `ut_console_reporter_base` (a subtype of `ut_output_reporter_base`). In many cases it may also be more convenient to create the custom reporter type under a more specialized type, like `ut_documentation_reporter` or `ut_junit_reporter`, and override just some of the functionality. It is recommended to create the reporter type in the schema where utPLSQL is installed (by default it is the `UT3` schema). Note that before running the utPLSQL uninstall scripts, all custom reporters should be dropped (cf. [the installation documentation](install.md)). In particular, when upgrading to a newer version of utPLSQL, one has to drop the custom reporters and recreate them after the upgrade. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index ca8ab0b4a..bfaa287c7 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,7 +1,5 @@ ![version](https://img.shields.io/badge/version-v3.1.13.4036--develop-blue.svg) -# Running tests - utPLSQL framework provides two main entry points to run unit tests from within the database: - `ut.run` procedures and functions @@ -10,7 +8,7 @@ utPLSQL framework provides two main entry points to run unit tests from within t These two entry points differ in purpose and behavior. Most of the time you will want to use `ut.run` as `ut_runner.run` is designed for API integration and does not display the results to the screen. -# Running from CI servers and command line +## Running from CI servers and command line The best way to run your tests from CI server or command line is to use the [utPLSQL-cli](https://github.com/utPLSQL/utPLSQL-cli) command line client. @@ -32,7 +30,7 @@ unzip -q utplsql-cli.zip ``` -# ut.run +## ut.run The `ut` package contains overloaded `run` procedures and functions. The `run` API is designed to be called directly by a developer when using an IDE/SQL console to execute unit tests. @@ -42,7 +40,7 @@ A single line call is enough to execute a set of tests from one or more schemes. The **procedures** execute the specified tests and produce output to DBMS_OUTPUT using the specified reporter. The **functions** can only be used in SELECT statements. They execute the specified tests and produce outputs as a pipelined data stream to be consumed by a select statement. -## ut.run procedures +### ut.run procedures The examples below illustrate different ways and options to invoke `ut.run` procedures. You can use a wildcard character `*` to call tests by part of their name or to call tests that are located on paths matched by part of path string. @@ -179,7 +177,7 @@ Executes all tests from package _HR.TEST_APPLY_BONUS_ and provide outputs to DBM For details on build-in reporters look at [reporters documentation](reporters.md). -## ut.run functions +### ut.run functions The `ut.run` functions provide exactly the same functionality as the `ut.run` procedures. You may use the same sets of parameters with both functions and procedures. @@ -195,7 +193,7 @@ Example. select * from table(ut.run('hr.test_apply_bonus', ut_junit_reporter())); ``` -# ut_runner.run procedures +## ut_runner.run procedures The `ut_runner` package provides an API for integrating utPLSQL with other products. Maven, Jenkins, SQL Develper, PL/SQL Developer, TOAD and others can leverage this API to call utPLSQL. @@ -262,16 +260,16 @@ select ``` -# Order of test execution +## Order of test execution -## Default order +### Default order When unit tests are executed without random order, they are ordered by: - schema name - suite path or test package name if `--%suitepath` was not specified for that package - `--%test` line number in package -## Random order +### Random order You can force a test run to execute tests in random order by providing one of options to `ut.run`: - `a_random_test_order` - true/false for procedures and 1/0 for functions @@ -317,7 +315,7 @@ select * from table(ut.run('hr.test_apply_bonus', a_random_test_order_seed => 30 **Note** >Random order seed must be a positive number within range of 1 .. 1 000 000 000. -# Run by Tags +## Run by Tags In addition to the path, you can filter the tests to be run by specifying tags. Tags are defined in the test / context / suite with the `--%tags`-annotation ([Read more](annotations.md#tags)). Multiple tags are separated by comma. @@ -338,7 +336,7 @@ You can also exclude specific tags by adding a `-` (dash) in front of the tag select * from table(ut.run('hr.test_apply_bonus', a_tags => '-suite1')) ``` -# Keeping uncommitted data after test-run +## Keeping uncommitted data after test-run utPLSQL by default runs tests in autonomous transaction and performs automatic rollback to assure that tests do not impact one-another and do not have impact on the current session in your IDE. @@ -359,7 +357,7 @@ end; **Note:** >This option is not available when running tests using `ut.run` as a table function. -# Reports character-set encoding +## Reports character-set encoding To get properly encoded reports, when running utPLSQL with HTML/XML reports on data containing national characters you need to provide your client character set when calling `ut.run` functions and procedures. From 9afa968557aecfad696767f0301785df75e87744 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 12 Oct 2022 00:33:51 +0300 Subject: [PATCH 0975/1096] Adjusting MkDocs configuration --- mkdocs.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mkdocs.yml b/mkdocs.yml index e675c93f4..f88e451f0 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,11 +1,12 @@ # Format documented here # http://www.mkdocs.org/user-guide/configuration/ +# https://squidfunk.github.io/mkdocs-material/getting-started/ site_url: http://utPLSQL.org/ site_name: utPLSQL-framework -site_description: utPLSQL Ultimate Unit Testing Framework for Oracle PL/SQL +site_description: utPLSQL Ultimate Testing Framework for Oracle PL/SQL & SQL copyright: Copyright © 2016 - 2022 utPLSQL Team -#repo_url: https://github.com/utPLSQL/utPLSQL # disable for offline docs +repo_url: https://github.com/utPLSQL/utPLSQL theme: name: material palette: @@ -70,7 +71,7 @@ plugins: - git-revision-date-localized: # disable for offline docs enable_creation_date: true # disable for offline docs type: datetime # disable for offline docs - + nav: - User Guide: - index.md @@ -81,7 +82,7 @@ nav: - Advanced data comparison: userguide/advanced_data_comparison.md - Running unit tests: userguide/running-unit-tests.md - Querying for test suites: userguide/querying_suites.md - - Testing best pracitces: userguide/best-practices.md + - Testing best practices: userguide/best-practices.md - Upgrade utPLSQL: userguide/upgrade.md - Reporting: - Using reporters: userguide/reporters.md From 169d3b259ff1eb7b05f0baadf53ed5d197ca3509 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 14 Oct 2022 23:11:01 +0300 Subject: [PATCH 0976/1096] Added color stylesheet for mkdocs --- docs/stylesheets/extra.css | 12 ++++++++++++ mkdocs.yml | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 docs/stylesheets/extra.css diff --git a/docs/stylesheets/extra.css b/docs/stylesheets/extra.css new file mode 100644 index 000000000..7f05ab831 --- /dev/null +++ b/docs/stylesheets/extra.css @@ -0,0 +1,12 @@ +[data-md-color-scheme="default"] { + --md-primary-fg-color: #2f8bff; + --md-accent-fg-color: #1f5db0; + --md-accent-fg-color--transparent: #1f5db0; +} + +[data-md-color-scheme="slate"] { + --md-hue: 200; + --md-primary-fg-color: #2f8bff; + --md-accent-fg-color: #1f5db0; + --md-accent-fg-color--transparent: #1f5db0; +} diff --git a/mkdocs.yml b/mkdocs.yml index f88e451f0..ffa090034 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -6,7 +6,8 @@ site_url: http://utPLSQL.org/ site_name: utPLSQL-framework site_description: utPLSQL Ultimate Testing Framework for Oracle PL/SQL & SQL copyright: Copyright © 2016 - 2022 utPLSQL Team -repo_url: https://github.com/utPLSQL/utPLSQL +extra_css: + - stylesheets/extra.css theme: name: material palette: @@ -60,6 +61,9 @@ markdown_extensions: - pymdownx.inlinehilite - pymdownx.snippets - pymdownx.superfences + - pymdownx.caret + - pymdownx.mark + - pymdownx.tilde - toc: permalink: true use_directory_urls: false From 1e710da8cdcac43ff18a202af3f5d6edcb1970f7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 14 Oct 2022 21:22:21 +0100 Subject: [PATCH 0977/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 25d6fbf77..b376d5d4c 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index b860bf718..2e50760e4 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 5dad05ae0..dc6d9e59d 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 2be6c96ac..fd0cfce15 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 8bce25886..eeaf1b002 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) ## What is utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 41511efed..9805b2b13 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 83fe89885..e36e37d70 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package. No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit. diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 4ed6f48be..6e3d1f0c7 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) The following are best practices we at utPLSQL have learned about PL/SQL and Unit Testing. diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 01c27981d..453f2f794 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. Code coverage is gathered for the following source types: diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 362d60d3b..1aa179680 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) The utPLSQL is responsible for handling exceptions wherever they occur in the test run. utPLSQL is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. The framework provides a full stacktrace for every exception that was thrown. The stacktrace is clean and does not include any utPLSQL library calls in it. diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 25b304cdf..8744077fa 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) ## Expectation concepts diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 1b6dcab3c..99409fd95 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 8c35d4ca5..bcab40387 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) ## Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 46da230a4..bd3eea917 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) ## Obtaining information about suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index f55e77e88..94c13908a 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index b8fe358c5..f20d8722c 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) utPLSQL framework provides two main entry points to run unit tests from within the database: diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 68256fa4f..461702a47 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4037--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index d25c365da..08a6d95c7 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.13.4037-develop'; + gc_version constant varchar2(50) := 'v3.1.13.4041-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 519f06b8bca56d8a7c4166b728ae0c48392d3a23 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 14 Oct 2022 23:45:08 +0300 Subject: [PATCH 0978/1096] Adding back repo-url --- mkdocs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/mkdocs.yml b/mkdocs.yml index ffa090034..8543b4030 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -6,6 +6,7 @@ site_url: http://utPLSQL.org/ site_name: utPLSQL-framework site_description: utPLSQL Ultimate Testing Framework for Oracle PL/SQL & SQL copyright: Copyright © 2016 - 2022 utPLSQL Team +repo_url: https://github.com/utPLSQL/utPLSQL extra_css: - stylesheets/extra.css theme: From e1690f0dd2b522464129cfa063ff544bb6b91a1d Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 18 Aug 2022 21:19:12 +0300 Subject: [PATCH 0979/1096] Exclude Unit Test packages from coverage --- source/core/coverage/ut_coverage.pkb | 2 +- test/ut3_tester_helper/coverage_helper.pkb | 15 +++++++++++++++ .../test_coverage/test_extended_coverage.pkb | 16 ++++++++-------- .../test_coverage/test_proftab_coverage.pkb | 1 + 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/source/core/coverage/ut_coverage.pkb b/source/core/coverage/ut_coverage.pkb index f5eccc893..2f38803ad 100644 --- a/source/core/coverage/ut_coverage.pkb +++ b/source/core/coverage/ut_coverage.pkb @@ -167,7 +167,7 @@ create or replace package body ut_coverage is begin if not is_develop_mode() then --skip all the utplsql framework objects and all the unit test packages that could potentially be reported by coverage. - l_skip_objects := coalesce(ut_utils.get_utplsql_objects_list(),ut_object_names()); + l_skip_objects := coalesce( ut_utils.get_utplsql_objects_list() multiset union all ut_suite_manager.get_schema_ut_packages(a_coverage_options.schema_names) , ut_object_names() ); end if; --Regex exclusion override the standard exclusion objects. diff --git a/test/ut3_tester_helper/coverage_helper.pkb b/test/ut3_tester_helper/coverage_helper.pkb index fdfa32364..99f26e9f8 100644 --- a/test/ut3_tester_helper/coverage_helper.pkb +++ b/test/ut3_tester_helper/coverage_helper.pkb @@ -48,6 +48,20 @@ create or replace package body coverage_helper is end; end;]'; + execute immediate q'[create or replace package ut3_develop.some_other_package is + procedure do_stuff(i_input in number); + end;]'; + + execute immediate q'[create or replace package body ut3_develop.some_other_package is + procedure do_stuff(i_input in number) is + begin + if i_input = 2 then dbms_output.put_line('should not get here'); elsif i_input = 1 then dbms_output.put_line('should get here'); + else + dbms_output.put_line('should not get here'); + end if; + end; + end;]'; + execute immediate q'[create or replace package ut3_develop.test_dummy_coverage is --%suite(dummy coverage test) --%suitepath(coverage_testing) @@ -77,6 +91,7 @@ create or replace package body coverage_helper is pragma autonomous_transaction; begin begin execute immediate q'[drop package ut3_develop.test_dummy_coverage]'; exception when others then null; end; + begin execute immediate q'[drop package ut3_develop.some_other_package]'; exception when others then null; end; begin execute immediate q'[drop package ut3_develop.]'||covered_package_name; exception when others then null; end; end; diff --git a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb index 3c8781bc4..af029e254 100644 --- a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb +++ b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb @@ -113,9 +113,9 @@ create or replace package body test_extended_coverage is begin --Arrange l_expected := '%' || - '%%'; + '%%'; l_not_expected := '%' || - '%%'; + '%%'; --Act l_actual := ut3_tester_helper.coverage_helper.run_tests_as_job( @@ -140,9 +140,9 @@ create or replace package body test_extended_coverage is begin --Arrange l_expected := '%' || - '%%'; + '%%'; l_not_expected := '%' || - '%%'; + '%%'; --Act l_actual := ut3_tester_helper.coverage_helper.run_tests_as_job( @@ -167,9 +167,9 @@ create or replace package body test_extended_coverage is begin --Arrange l_expected := '%' || - '%%'; + '%%'; l_not_expected := '%' || - '%%'; + '%%'; --Act l_actual := ut3_tester_helper.coverage_helper.run_tests_as_job( @@ -194,9 +194,9 @@ create or replace package body test_extended_coverage is begin --Arrange l_expected := '%' || - '%%'; + '%%'; l_not_expected := '%' || - '%%'; + '%%'; --Act l_actual := ut3_tester_helper.coverage_helper.run_tests_as_job( diff --git a/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb b/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb index 7cad0a67e..f3aad5702 100644 --- a/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb +++ b/test/ut3_user/reporters/test_coverage/test_proftab_coverage.pkb @@ -66,6 +66,7 @@ create or replace package body test_proftab_coverage is ); --Assert ut.expect(l_actual).to_be_like(l_expected); + ut.expect(l_actual).not_to_be_like('%%'); end; procedure coverage_for_file is From 8ac32d7b2fae363924f22f84e685f30c6e62fdc4 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 6 Sep 2022 23:34:30 +0300 Subject: [PATCH 0980/1096] Exclude Unit Test packages from coverage --- source/core/coverage/ut_coverage.pkb | 2 +- source/core/ut_suite_manager.pkb | 16 ++++++++++++---- source/core/ut_suite_manager.pks | 2 +- test/ut3_tester_helper/run_helper.pkb | 2 +- .../test_coverage/test_extended_coverage.pkb | 9 +++++---- 5 files changed, 20 insertions(+), 11 deletions(-) diff --git a/source/core/coverage/ut_coverage.pkb b/source/core/coverage/ut_coverage.pkb index 2f38803ad..7eb5a34c2 100644 --- a/source/core/coverage/ut_coverage.pkb +++ b/source/core/coverage/ut_coverage.pkb @@ -167,7 +167,7 @@ create or replace package body ut_coverage is begin if not is_develop_mode() then --skip all the utplsql framework objects and all the unit test packages that could potentially be reported by coverage. - l_skip_objects := coalesce( ut_utils.get_utplsql_objects_list() multiset union all ut_suite_manager.get_schema_ut_packages(a_coverage_options.schema_names) , ut_object_names() ); + l_skip_objects := coalesce( ut_utils.get_utplsql_objects_list() multiset union all ut_suite_manager.get_schema_ut_packages(a_coverage_options.schema_names, a_coverage_options.include_schema_expr) , ut_object_names() ); end if; --Regex exclusion override the standard exclusion objects. diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 805fd608b..86f68c076 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -493,13 +493,21 @@ create or replace package body ut_suite_manager is return l_suites; end; - function get_schema_ut_packages(a_schema_names ut_varchar2_rows) return ut_object_names is + function get_schema_ut_packages(a_schema_names ut_varchar2_rows, a_schema_name_expr varchar2) return ut_object_names is + l_schema_names ut_varchar2_rows := a_schema_names; begin - for i in 1 .. a_schema_names.count loop - refresh_cache(a_schema_names(i)); + if a_schema_name_expr is not null then + select username + bulk collect into l_schema_names + from all_users + where regexp_like(username,a_schema_name_expr,'i'); + end if; + + for i in 1 .. l_schema_names.count loop + refresh_cache(l_schema_names(i)); end loop; - return ut_suite_cache_manager.get_cached_packages( a_schema_names ); + return ut_suite_cache_manager.get_cached_packages( l_schema_names ); end; function get_schema_names(a_paths ut_varchar2_list) return ut_varchar2_rows is diff --git a/source/core/ut_suite_manager.pks b/source/core/ut_suite_manager.pks index 170b83f05..65b3c0654 100644 --- a/source/core/ut_suite_manager.pks +++ b/source/core/ut_suite_manager.pks @@ -30,7 +30,7 @@ create or replace package ut_suite_manager authid current_user is * @param a_schema_names list of schemas to return the information for * @return array containing unit test schema and object names */ - function get_schema_ut_packages(a_schema_names ut_varchar2_rows) return ut_object_names; + function get_schema_ut_packages(a_schema_names ut_varchar2_rows, a_schema_name_expr varchar2) return ut_object_names; /** * Builds a hierarchical suites based on given suite-paths diff --git a/test/ut3_tester_helper/run_helper.pkb b/test/ut3_tester_helper/run_helper.pkb index 95f93f751..a132f4943 100644 --- a/test/ut3_tester_helper/run_helper.pkb +++ b/test/ut3_tester_helper/run_helper.pkb @@ -616,7 +616,7 @@ create or replace package body run_helper is function get_schema_ut_packages(a_owner in varchar2) return ut3_develop.ut_object_names is begin - return ut3_develop.ut_suite_manager.get_schema_ut_packages(ut3_develop.ut_varchar2_rows(a_owner)); + return ut3_develop.ut_suite_manager.get_schema_ut_packages(ut3_develop.ut_varchar2_rows(a_owner), null); end; function ut_output_buffer_tmp return t_out_buff_tab pipelined is diff --git a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb index af029e254..488ee3a20 100644 --- a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb +++ b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb @@ -112,9 +112,9 @@ create or replace package body test_extended_coverage is l_actual clob; begin --Arrange - l_expected := '%' || + l_expected := '%' || '%%'; - l_not_expected := '%' || + l_not_expected := '%' || '%%'; --Act l_actual := @@ -123,14 +123,15 @@ create or replace package body test_extended_coverage is ut3_develop.ut.run( a_paths => ut3_develop.ut_varchar2_list('ut3_develop.test_regex_dummy_cov', 'ut3_tester_helper.test_regex_dummy_cov'), a_reporter=> ut3_develop.ut_coverage_sonar_reporter( ), - a_include_schema_expr => '^ut3_develop', - a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_tester_helper.regex_dummy_cov' ) + a_include_schema_expr => '^ut3_tester_hel.*', + a_include_objects => ut3_develop.ut_varchar2_list( 'ut3_develop.regex_dummy_cov' ) ) ]' ); --Assert ut.expect(l_actual).to_be_like(l_expected); ut.expect(l_actual).not_to_be_like(l_not_expected); + ut.expect(l_actual).not_to_be_like('%ut3_tester_helper.test_regex_dummy_cov%'); end; procedure coverage_regex_include_object is From d825156df00b3e313ae4679d9706f09424fab17a Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 17 Oct 2022 00:45:14 +0300 Subject: [PATCH 0981/1096] Fixing failing test on 11g XE --- .../reporters/test_coverage/test_extended_coverage.pkb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb index 488ee3a20..d7f1b61d7 100644 --- a/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb +++ b/test/ut3_user/reporters/test_coverage/test_extended_coverage.pkb @@ -128,8 +128,10 @@ create or replace package body test_extended_coverage is ) ]' ); + --Assert - ut.expect(l_actual).to_be_like(l_expected); + --The below is a workaround for problem with large CLOB like comparison on 11g XE db. + ut.expect(to_char(substr(l_actual,instr(l_actual,''),2000))).to_be_like(l_expected); ut.expect(l_actual).not_to_be_like(l_not_expected); ut.expect(l_actual).not_to_be_like('%ut3_tester_helper.test_regex_dummy_cov%'); end; From a552566232bccb28cc266964e49e0057feceb87e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 17 Oct 2022 08:29:01 +0100 Subject: [PATCH 0982/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index b376d5d4c..d29968ea0 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 2e50760e4..3b2561064 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index dc6d9e59d..93ff86f47 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index fd0cfce15..8f5e3d012 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index eeaf1b002..4fe82c351 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) ## What is utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 9805b2b13..71b468da7 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index e36e37d70..41532a7bb 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package. No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit. diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 6e3d1f0c7..64edde630 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) The following are best practices we at utPLSQL have learned about PL/SQL and Unit Testing. diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 453f2f794..bc73e60b2 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. Code coverage is gathered for the following source types: diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 1aa179680..d1bbd9f9e 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) The utPLSQL is responsible for handling exceptions wherever they occur in the test run. utPLSQL is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. The framework provides a full stacktrace for every exception that was thrown. The stacktrace is clean and does not include any utPLSQL library calls in it. diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 8744077fa..e52a4ac7d 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) ## Expectation concepts diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 99409fd95..4a949a5b5 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index bcab40387..f63c08f2a 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) ## Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index bd3eea917..a52a432f8 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) ## Obtaining information about suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 94c13908a..92afa5ca3 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index f20d8722c..5cc8dcea3 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) utPLSQL framework provides two main entry points to run unit tests from within the database: diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 461702a47..54381ca25 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4041--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 08a6d95c7..66e1acdfd 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.13.4041-develop'; + gc_version constant varchar2(50) := 'v3.1.13.4049-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 10fd9e02d23ec95f7d9fec9810587a072217c02c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 17 Oct 2022 08:42:03 +0100 Subject: [PATCH 0983/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index d29968ea0..c5624601b 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 3b2561064..7338271be 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 93ff86f47..d8b755459 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 8f5e3d012..a3a4d3de7 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 4fe82c351..a30a4d6de 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) ## What is utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 71b468da7..fc5ba1063 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 41532a7bb..022f4896c 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package. No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit. diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 64edde630..9ac021c0e 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) The following are best practices we at utPLSQL have learned about PL/SQL and Unit Testing. diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index bc73e60b2..62c4d75ac 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. Code coverage is gathered for the following source types: diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index d1bbd9f9e..e6fd25e98 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) The utPLSQL is responsible for handling exceptions wherever they occur in the test run. utPLSQL is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. The framework provides a full stacktrace for every exception that was thrown. The stacktrace is clean and does not include any utPLSQL library calls in it. diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index e52a4ac7d..871bebcdf 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) ## Expectation concepts diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 4a949a5b5..aa92a6bdd 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index f63c08f2a..ade43890d 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) ## Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index a52a432f8..84f87c175 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) ## Obtaining information about suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 92afa5ca3..0f3c49a59 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 5cc8dcea3..f45fb2c17 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) utPLSQL framework provides two main entry points to run unit tests from within the database: diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 54381ca25..87320dd6b 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4049--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 66e1acdfd..3b6b56bbd 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.13.4049-develop'; + gc_version constant varchar2(50) := 'v3.1.13.4050-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 48505fbe05364660b65fca7e6934a652e4b74a03 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 17 Oct 2022 18:28:38 +0300 Subject: [PATCH 0984/1096] Adding support for long type names in tests. Resolves: #1235 --- .../data_values/ut_cursor_details.tpb | 4 ++++ .../expectations/test_expectation_anydata.pkb | 15 +++++++++++++++ .../expectations/test_expectation_anydata.pks | 6 ++++++ 3 files changed, 25 insertions(+) diff --git a/source/expectations/data_values/ut_cursor_details.tpb b/source/expectations/data_values/ut_cursor_details.tpb index adc705f65..b823ff944 100644 --- a/source/expectations/data_values/ut_cursor_details.tpb +++ b/source/expectations/data_values/ut_cursor_details.tpb @@ -91,7 +91,11 @@ create or replace type body ut_cursor_details as a_cursor_number in number ) return self as result is l_columns_count pls_integer; + $if dbms_db_version.version = 12 and dbms_db_version.release = 1 or dbms_db_version.version < 12 $then l_columns_desc dbms_sql.desc_tab3; + $else + l_columns_desc dbms_sql.desc_tab4; + $end l_is_collection boolean; l_hierarchy_level integer := 1; begin diff --git a/test/ut3_user/expectations/test_expectation_anydata.pkb b/test/ut3_user/expectations/test_expectation_anydata.pkb index 98938c107..bbac14ea2 100644 --- a/test/ut3_user/expectations/test_expectation_anydata.pkb +++ b/test/ut3_user/expectations/test_expectation_anydata.pkb @@ -1211,5 +1211,20 @@ Rows: [ 60 differences, showing first 20 ] ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; + + $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then + procedure long_names_object_types is + pragma autonomous_transaction; + begin + execute immediate 'create or replace type tp_r_ug_sportsman_invitation_result is object ( code number(18) )'; + execute immediate 'begin ut.expect(anydata.convertObject(tp_r_ug_sportsman_invitation_result(1))).to_equal(anydata.convertObject(tp_r_ug_sportsman_invitation_result(1))); end;'; + execute immediate 'drop type tp_r_ug_sportsman_invitation_result'; + exception + when others then + execute immediate 'drop type tp_r_ug_sportsman_invitation_result'; + raise; + end; + $end + end; / \ No newline at end of file diff --git a/test/ut3_user/expectations/test_expectation_anydata.pks b/test/ut3_user/expectations/test_expectation_anydata.pks index 2abb48b7f..81dea74eb 100644 --- a/test/ut3_user/expectations/test_expectation_anydata.pks +++ b/test/ut3_user/expectations/test_expectation_anydata.pks @@ -233,5 +233,11 @@ create or replace package test_expectation_anydata is --%test ( Reports success when comparing complex nested objects ) procedure complex_nested_object_success; + + $if dbms_db_version.version = 12 and dbms_db_version.release >= 2 or dbms_db_version.version > 12 $then + --%test ( Compares object types with long names - Issue #1235 ) + procedure long_names_object_types; + $end + end; / From 1eb52e1e209945477c4066004cdd2f5293290297 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 17 Oct 2022 20:33:42 +0300 Subject: [PATCH 0985/1096] Fixing unit test - needs to use ut3_develop sourcecode in test. --- .../expectations/test_expectation_anydata.pkb | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/test/ut3_user/expectations/test_expectation_anydata.pkb b/test/ut3_user/expectations/test_expectation_anydata.pkb index bbac14ea2..c56c31930 100644 --- a/test/ut3_user/expectations/test_expectation_anydata.pkb +++ b/test/ut3_user/expectations/test_expectation_anydata.pkb @@ -1216,12 +1216,24 @@ Rows: [ 60 differences, showing first 20 ] procedure long_names_object_types is pragma autonomous_transaction; begin - execute immediate 'create or replace type tp_r_ug_sportsman_invitation_result is object ( code number(18) )'; - execute immediate 'begin ut.expect(anydata.convertObject(tp_r_ug_sportsman_invitation_result(1))).to_equal(anydata.convertObject(tp_r_ug_sportsman_invitation_result(1))); end;'; - execute immediate 'drop type tp_r_ug_sportsman_invitation_result'; + execute immediate q'[create or replace type + very_long_type_name_valid_for_oracle_12_so_utPLSQL_should_allow_it_definitely_well_still_not_reached_128_but_wait_we_did_it + is object ( + code number(18) + )]'; + execute immediate q'[ + begin + ut3_develop.ut.expect(anydata.convertObject( + very_long_type_name_valid_for_oracle_12_so_utPLSQL_should_allow_it_definitely_well_still_not_reached_128_but_wait_we_did_it(1) + )).to_equal(anydata.convertObject( + very_long_type_name_valid_for_oracle_12_so_utPLSQL_should_allow_it_definitely_well_still_not_reached_128_but_wait_we_did_it(1) + )); + end;]'; + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + execute immediate 'drop type very_long_type_name_valid_for_oracle_12_so_utPLSQL_should_allow_it_definitely_well_still_not_reached_128_but_wait_we_did_it'; exception when others then - execute immediate 'drop type tp_r_ug_sportsman_invitation_result'; + execute immediate 'drop type very_long_type_name_valid_for_oracle_12_so_utPLSQL_should_allow_it_definitely_well_still_not_reached_128_but_wait_we_did_it'; raise; end; $end From de65f14d2f9f9debe88437468c7544d30d357742 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 17 Oct 2022 20:36:49 +0300 Subject: [PATCH 0986/1096] Improvements to local development scripts --- development/cleanup.sh | 4 ++-- development/install.sh | 4 ++-- development/refresh_sources.sh | 4 ++-- development/refresh_ut3.sh | 2 +- development/template.env.sh | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/development/cleanup.sh b/development/cleanup.sh index 33358302a..65f3ab0c1 100755 --- a/development/cleanup.sh +++ b/development/cleanup.sh @@ -1,9 +1,9 @@ -#!/usr/bin/env bash +#!/bin/bash #goto git root directory git rev-parse && cd "$(git rev-parse --show-cdup)" -. development/env.sh +. ./development/env.sh "${SQLCLI}" sys/${ORACLE_PWD}@//${CONNECTION_STR} AS SYSDBA <<-SQL set echo on diff --git a/development/install.sh b/development/install.sh index f3a62b0ec..468bafd38 100755 --- a/development/install.sh +++ b/development/install.sh @@ -1,9 +1,9 @@ -#!/usr/bin/env bash +#!/bin/bash #goto git root directory git rev-parse && cd "$(git rev-parse --show-cdup)" -. development/env.sh +. ./development/env.sh header="******************************************************************************************" if ! development/cleanup.sh; then diff --git a/development/refresh_sources.sh b/development/refresh_sources.sh index 7af3aaec0..b6ef51ef9 100755 --- a/development/refresh_sources.sh +++ b/development/refresh_sources.sh @@ -1,9 +1,9 @@ -#!/usr/bin/env bash +#!/bin/bash #goto git root directory git rev-parse && cd "$(git rev-parse --show-cdup)" -. development/env.sh +. ./development/env.sh # remove sub-direcotry containing main branch shallow copy rm -rf ${UTPLSQL_DIR:-utPLSQL_latest_release} diff --git a/development/refresh_ut3.sh b/development/refresh_ut3.sh index 570d3c86a..827af827d 100755 --- a/development/refresh_ut3.sh +++ b/development/refresh_ut3.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash #goto git root directory git rev-parse && cd "$(git rev-parse --show-cdup)" diff --git a/development/template.env.sh b/development/template.env.sh index e69aa81aa..7761a70c4 100755 --- a/development/template.env.sh +++ b/development/template.env.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash export SQLCLI=sql # For sqlcl client #export SQLCLI=sqlplus # For sqlplus client From 689bbd0e365ed919315c29727bc10fbfc0dadce8 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 17 Oct 2022 22:24:40 +0300 Subject: [PATCH 0987/1096] Fixing documentation build process Resolves: #1237 --- .github/workflows/build.yml | 12 ++-- .github/workflows/release.yml | 40 +++---------- mkdocs.yml | 3 + mkdocs_offline.yml | 103 ++++++++++++++++++++++++++++++++++ 4 files changed, 120 insertions(+), 38 deletions(-) create mode 100644 mkdocs_offline.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a0aae6b64..078d45e3b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -245,11 +245,13 @@ jobs: git commit -m 'Updated project version after build [skip ci]' git push --quiet origin HEAD:${CI_ACTION_REF_NAME} - - name: Copy and push documentation to utPLSQL-github-io repo - id: push-documentation - env: - API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }} - run: .github/scripts/push_docs_to_github_io.sh + - name: Build and publish documentation + run: | + pip install mkdocs + pip install mkdocs-git-revision-date-localized-plugin + pip install mkdocs-material + pip install mike + mike deploy -p develop dispatch: name: Dispatch downstream builds diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bd977d447..acac5f1aa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,36 +10,6 @@ defaults: jobs: - publish: - name: Deploy documentation - concurrency: publish - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - uses: c-py/action-dotenv-to-setenv@v2 - with: - env-file: .github/variables/.env - - uses: FranzDiebold/github-env-vars-action@v2 #https://github.com/marketplace/actions/github-environment-variables-action - - - name: Set buid version number env variables - run: .github/scripts/set_version_numbers_env.sh - - - name: Setup git config - run: | - git config --global user.email "github-actions[bot]@users.noreply.github.com" - git config --global user.name "github-actions[bot]" - - - name: Update project version & build number in source code and documentation - run: .github/scripts/update_project_version.sh - - - name: Copy and push documentation to utPLSQL-github-io repo - env: - API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }} - run: .github/scripts/push_docs_to_github_io.sh - upload_artifacts: name: Upload archives concurrency: upload @@ -54,7 +24,7 @@ jobs: env-file: .github/variables/.env - uses: FranzDiebold/github-env-vars-action@v2 #https://github.com/marketplace/actions/github-environment-variables-action - - name: Set buid version number env variables + - name: Set build version number env variables run: .github/scripts/set_version_numbers_env.sh - name: Update project version & build number in source code and documentation @@ -65,10 +35,14 @@ jobs: git config --global user.email "github-actions[bot]@users.noreply.github.com" git config --global user.name "github-actions[bot]" - - name: Build html documentation + - name: Build and publish documentation run: | pip install mkdocs - mkdocs build --clean --strict + pip install mkdocs-git-revision-date-localized-plugin + pip install mkdocs-material + pip install mike + mike deploy -p -u ${UTPLSQL_VERSION} latest + mkdocs build --clean -f mkdocs_offline.yml rm -rf docs/* cp -r -v site/* docs git add . diff --git a/mkdocs.yml b/mkdocs.yml index 8543b4030..487505097 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,7 +1,10 @@ # Format documented here # http://www.mkdocs.org/user-guide/configuration/ # https://squidfunk.github.io/mkdocs-material/getting-started/ +# See this document for list of plugins to disable for offline (local) documentation +# https://squidfunk.github.io/mkdocs-material/setup/building-for-offline-usage/ +edit_uri: "" site_url: http://utPLSQL.org/ site_name: utPLSQL-framework site_description: utPLSQL Ultimate Testing Framework for Oracle PL/SQL & SQL diff --git a/mkdocs_offline.yml b/mkdocs_offline.yml new file mode 100644 index 000000000..fe2255e59 --- /dev/null +++ b/mkdocs_offline.yml @@ -0,0 +1,103 @@ +# Format documented here +# http://www.mkdocs.org/user-guide/configuration/ +# https://squidfunk.github.io/mkdocs-material/getting-started/ +# See this document for list of plugins to disable for offline (local) documentation +# https://squidfunk.github.io/mkdocs-material/setup/building-for-offline-usage/ + +edit_uri: "" +site_url: http://utPLSQL.org/ +site_name: utPLSQL-framework +site_description: utPLSQL Ultimate Testing Framework for Oracle PL/SQL & SQL +copyright: Copyright © 2016 - 2022 utPLSQL Team +#repo_url: https://github.com/utPLSQL/utPLSQL # disable for offline docs +extra_css: + - stylesheets/extra.css +theme: + name: material + palette: + # Palette toggle for light mode + - media: "(prefers-color-scheme: light)" + scheme: default + toggle: + icon: material/lightbulb-outline + name: Switch to dark mode + # Palette toggle for dark mode + - media: "(prefers-color-scheme: dark)" + scheme: slate + toggle: + icon: material/lightbulb + name: Switch to light mode + logo: assets/icon-transparent.png + favicon: assets/favicon.png + features: +# - navigation.instant # disable for offline docs +# - navigation.indexes + - navigation.tabs + - navigation.tracking + - toc.follow + - toc.integrate + - search.suggest + - search.highlight +extra: +# homepage: http://jgebal.github.io/ +# homepage: http://utPLSQL.org/ + social: + - icon: fontawesome/brands/twitter + link: https://twitter.com/utPLSQL + - icon: fontawesome/brands/slack + link: https://join.slack.com/t/utplsql/shared_invite/zt-xwm68udy-4cF_3PNEyczYEbWr38W5ww + - icon: fontawesome/brands/github + link: https://github.com/utPLSQL + - icon: fontawesome/solid/envelope + link: mailto:utPLSQL@utPLSQL.org + consent: + title: Cookie consent + description: >- + We use cookies to recognize your repeated visits and preferences, as well + as to measure the effectiveness of our documentation and whether users + find what they're searching for. With your consent, you're helping us to + make our documentation better. +# version: # disable for offline docs +# provider: mike # disable for offline docs +markdown_extensions: + - pymdownx.highlight: + anchor_linenums: true + - pymdownx.inlinehilite + - pymdownx.snippets + - pymdownx.superfences + - pymdownx.caret + - pymdownx.mark + - pymdownx.tilde + - toc: + permalink: true +use_directory_urls: false +strict: true + +plugins: +# - search # disable for offline docs + - mike +# - git-revision-date-localized: # disable for offline docs +# enable_creation_date: true # disable for offline docs +# type: datetime # disable for offline docs + +nav: + - User Guide: + - index.md + - Installation: userguide/install.md + - Getting Started: userguide/getting-started.md + - Annotations: userguide/annotations.md + - Expectations: userguide/expectations.md + - Advanced data comparison: userguide/advanced_data_comparison.md + - Running unit tests: userguide/running-unit-tests.md + - Querying for test suites: userguide/querying_suites.md + - Testing best practices: userguide/best-practices.md + - Upgrade utPLSQL: userguide/upgrade.md + - Reporting: + - Using reporters: userguide/reporters.md + - Code coverage: userguide/coverage.md + - Error handling and reporting: userguide/exception-reporting.md + - About: + - Project Details: about/project-details.md + - License: about/license.md + - Support: about/support.md + - Authors: about/authors.md From 4223e0c889ca7ebbfa1003f6ee68ac0a25d8c666 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 17 Oct 2022 20:57:02 +0100 Subject: [PATCH 0988/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index c5624601b..6ca52629d 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 7338271be..9396f76fd 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index d8b755459..bbc477c40 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index a3a4d3de7..c880d0bcf 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index a30a4d6de..3ac670e12 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) ## What is utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index fc5ba1063..348b9a0fc 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 022f4896c..1ef87e075 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package. No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit. diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 9ac021c0e..5f9695a74 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) The following are best practices we at utPLSQL have learned about PL/SQL and Unit Testing. diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 62c4d75ac..e059fc62e 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. Code coverage is gathered for the following source types: diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index e6fd25e98..9490f36d0 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) The utPLSQL is responsible for handling exceptions wherever they occur in the test run. utPLSQL is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. The framework provides a full stacktrace for every exception that was thrown. The stacktrace is clean and does not include any utPLSQL library calls in it. diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 871bebcdf..b4bd7af17 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) ## Expectation concepts diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index aa92a6bdd..07310dd4f 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index ade43890d..ced4f00a8 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) ## Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 84f87c175..d943e01f2 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) ## Obtaining information about suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 0f3c49a59..fb19cb65c 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index f45fb2c17..b86332e13 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) utPLSQL framework provides two main entry points to run unit tests from within the database: diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 87320dd6b..c1128b84c 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4050--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 3b6b56bbd..227a359bb 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.13.4050-develop'; + gc_version constant varchar2(50) := 'v3.1.13.4055-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 8a3554d4e28e7e50e16418a1e61797c0ab6d488f Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 17 Oct 2022 22:59:22 +0300 Subject: [PATCH 0989/1096] Fixing documentation build process --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 078d45e3b..92bf0752e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -245,6 +245,11 @@ jobs: git commit -m 'Updated project version after build [skip ci]' git push --quiet origin HEAD:${CI_ACTION_REF_NAME} + - name: Setup git config + run: | + git config --global user.email "github-actions[bot]@users.noreply.github.com" + git config --global user.name "github-actions[bot]" + - name: Build and publish documentation run: | pip install mkdocs From 65cfab5dd0a47a2bb10ded89e7ea0c91e84a0d34 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 17 Oct 2022 21:10:44 +0100 Subject: [PATCH 0990/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 6ca52629d..5aba8c785 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 9396f76fd..afcd11531 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index bbc477c40..61e52a3ee 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index c880d0bcf..a152f7f22 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 3ac670e12..c95745506 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) ## What is utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 348b9a0fc..f7eb1d054 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 1ef87e075..854190837 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package. No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit. diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 5f9695a74..afab60ca0 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) The following are best practices we at utPLSQL have learned about PL/SQL and Unit Testing. diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index e059fc62e..efba68e78 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. Code coverage is gathered for the following source types: diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 9490f36d0..11526888a 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) The utPLSQL is responsible for handling exceptions wherever they occur in the test run. utPLSQL is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. The framework provides a full stacktrace for every exception that was thrown. The stacktrace is clean and does not include any utPLSQL library calls in it. diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index b4bd7af17..5984f4379 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) ## Expectation concepts diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 07310dd4f..4216e832a 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index ced4f00a8..439a0fe5d 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) ## Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index d943e01f2..5e037ef9d 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) ## Obtaining information about suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index fb19cb65c..9f7239f13 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index b86332e13..c095f468f 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) utPLSQL framework provides two main entry points to run unit tests from within the database: diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index c1128b84c..259b03f4c 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4055--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 227a359bb..8de2fcc6f 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.13.4055-develop'; + gc_version constant varchar2(50) := 'v3.1.13.4056-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 4e448448b138c93b1215764bdc1e95fb1038dbbb Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 17 Oct 2022 23:32:42 +0300 Subject: [PATCH 0991/1096] Adding missing images --- docs/assets/favicon.png | Bin 0 -> 76887 bytes docs/assets/icon-transparent.png | Bin 0 -> 33228 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 docs/assets/favicon.png create mode 100644 docs/assets/icon-transparent.png diff --git a/docs/assets/favicon.png b/docs/assets/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..7c34109d0bb66a2279905822ae733eaf4c5fed6c GIT binary patch literal 76887 zcmeGFcT`jP_CF5W8AZTR5$QH8AfQqrH6S7aQWTUXpfV7V5~%?~5(NdNh>C*rCW1&2 z=^#W01?fF>BGLk(lTbp+?<5ofaqisv`L6Z+^URuAv&K=+Iq$R2F0ZnEtgWfSvV&{K zh7B87R4<;tvSGs}BJdC4k8Qw@`0;%^4*YA2!#P#mKY+j7|M=?>@ZTF9uBe>bkXp?% zNdKP@MGeIb8`1-q$v3wG|GoY0MFWQo8$!zI|7`4e_WBU;gPe}a`i?qK3rE;Zd-Dx2 z7)->{*2=-`=3R3Us68ZXRF(_)NeAgaNy*;)rlTd)_JFRXjroQ%r%p>rpE@Ib8g$^a zxU~3LX)%d;i_OIwHqew*&nxP>m<&^xqpzF0js>8{LJJ)Z-``R!@TbT2T?e}FD15vj zrJy^s^}R45Jo}bSO1Pns;n;Mh_Zv!t4*W7cep(A(7e#C_Rn>myp=^8lk2?=_x9%1{ zckg=Mv8M_m@ESK-O(^ksnP%4jqANrK+bWh3rN!N4U{y3lk)KMIu#$rpWSH$$zWo3H z`~SBm;I<2|r+hiTa!#nTmLSY+F2^gllU#HY~Q4}`h_}pOPjGdW!8_p zqP7fT47sv94-#BpZJD`+GOV5>U zvC2WIc+S~vI`3`9g(xGtuWx%(j+Y;ZRw_Jm_j(a|Vo>z2f`G~k8HWc;B-zQmaK2W~_J9ZkGZ zIBvB|>c!PhLt8n;vMnwDWKUw-dKoJ9>T2{Iz8bTE4%;@{ofJ&S$X7Lw0UYz=5%B}E z%JFjDABM}4U9RV7<%PPQfq#~>YiMHjq*-~!9`EsHC90X;oyfsxL{1L(nuV7=al%x_ zh1II3IEiP5wK{Uuyy4!(GTi?MSEXh9r4y!E;AdeLy>HbX71`g_-uRBg{L+@>hWah+ z$s93%^g$K+^vd=N8X(Nt5a;x~9yy>b#6rYSB9BPJ30Aq5G-PW7%&K?O25#t_` z#NNK6#67c<#ipMB#FZDLz)98b`8Ze+P|d|B$$Z@;%t{P&3}k!X$zo$fj6+0*1CG_6 zhhUKTS>hF!XL3x*lJ?U|Cn)?|~X zr_I8G_Fc|05Gl0groe=Z8*!x&jHBd;L~N_AT=&*+lguyS?VR!nZ-prg!}iu%DCZrv@w`~Gxi8z+->L*OAbeSR|65n=H}k0$0b z7S=+J(c9_o;*j@;9gLSDDJ&f8LHwL{^2l9_F9td3v!g{~&T=FARv)Z2CU~hC{HC+t zKA20++)@r1$7!c!D)&G-V47fwoH4Q)rlx{FH;du6V?uv77NGv66ZZVwdeh%8KdZH0YjIdz@naMYM*Ks-`*SD~WB z7GIMEU>uw77BG`5Ic(0lF4`+QT6aL}szGG)dEM?U48r-Zgo zQMj=Pk|ZrNcIOu9MyAtK$Tmop-LeHdU`K zDvnz#+oLNw^gNUO(E6VM1?HWoAjbLG^6nvM(!{SuPEW8Q1pd4{#+%`xQ{3pcshMx9{JCE&YvhOFEaxsaC*lJLWsJSb(}_3y#@{L|uN-rQl7HADHY* zmAsW5IcSYIVI$&H5~;;>l^Qa8t&UqaFfom%9C!x$k!5B++R^0gk(dL7t+oU{UFc6l z-}mTESD}g=0mg>Uqt6i!4H?mMrttoPlA2!Zjg?yqa%4c5gp?hhLOuR$zr|Npv$ds%(8Ql2w3t<`Mh0pK?Xk*-_r7Xend>@zY z=OJazJsa^W!g$j)(QmKPHPn3*e-^6@6H#>_x1CK?XfmpeHya3VS1c$}4Q%ExrF=P& zGc@)^PuicADED_*5gC`vaqHqo zv+mVaWE8*V!s@)L>K2-e^(1N*1K$T8nh{hJ0KO@e)VvaNu(Zw8L&sfR%3;Cv(r?`@ zP7Vt&ImI;GFIr9!aUz#O<9lgM0-%0Sz*n4G%OIb%%dRwQiK^mEVr+Ci42<*WUhaPAB1g zv)rg!AY(+E5;7n#p1(J>8!PT?F3C4aB&RFL0XC zL&CVv+`77thm`-@uo+2ke2|`F0Fj?dO3<7Oq7D~62P*6hMrM@je@_cFZ=JtAMX*mJ zpN6mx>OH~$vH2J$#FVi^zv@8GJsY3${!Rs3gVB}Y8mtPp7YqjKam-n{p9~t(0+cKhQiGu ze?mGr!YhJ0N%INT6Y!VYfq1d8pPTe%Z8r*=G{JZ9U*?9)c5W1O|6)YBn-B|1JbKx5 zRZqUqm;jxp#Z$Xal5!_v9{~NAV*NQ!!G%`EIA*iPFP;3=hxUUhMGBicv11`GD8!_9 zn#l68Ye)A>H|Bh!&r`_>InJYd{6on7iwv<_p3xeS%42}*tdmGt3F~G;-9#S7&rYem zzgr=%(ZgR-3}ru6pf&eAeP83Q_~zOe`TM5%$f+`?9(nT=L~naS6Yk z^!oKqgs&j;h~h&aS>&ASTZpHJtm5~Hu@g}R;Z9?DeR2uZ+;lC@+m49=<3i0gucXiD z&hJ9_&)*zs{0lA9z4p5XsTOzMdu7QEbe-rLPfJq_y~l0G_?oDO7KfgeoT)Cb$x6WN^a1E=?| zF1-FAz<9}vGZ5c~EZk}Q9<0Rq2~3)8en($_MoC*MQg6=${j?1p zlIy2eTzcgLtRCWGNZPxIL7oO%lPn5Nf|e`Vz>^3@J0&x%dZ(2clMhBU>G;wtTF->d zcdA9jDal+3zzuAmZ@JHHdcQ7py4u7;+Z)5D zCD)eid&jthn!gBYLsgha%M%BoLqYT&5Yl>oWKDDU@lwk0U<9pz%oiUJ@*evZO120y zoW5)|!ar+#Gs#{5k820fnLyip^=A`Up!iE}|IMVhwiroVG{nij6f-SLDIChini4Xx zaRkmi_K9eMRamunp0OsBdLAuw=_?!ayNmPTSwJpU`*lA2S2OC`D+3dWytZO{*riTN zjuCCVQHCNCAMom~5=FqY)y2Gj7`)#qVb1twY}7*x`1t%&(>6XgPeGu|rb9U^`cXy` z@h@Alr3Uag>`6TdZ9=Jx1vjJ5x0_yi6;m{87glFDeS)hWI|!RN4`#MOYVYU`&h}pS zf&b+|ymHd>+3b9!0Q&7hXFC*$eOohYtQH`4(2JCFJ;w=|5`>EA8nHxjXc01M`;t_1Oj(3n(IyIEW%OdheF2mZCNh$d8IKk4nlV(swkr15*{f zLy1!}8~l-uzqmU|@iLY%U(l-#P)Cmbwg8@Udn?i4Uxl8`*Gic?&Kt0Oj`Yi##rPkt4f`d79czN`d|RWQo(?XMo1Ygh43%vqx{LC z2ENIH7j_m0fQusgo=H{j>^ujBq+{7tWMkUN?;UZTyI&93YJ2RU*Xn;2y{k~C-^`P- z4MgcF{YdjP^vH}>Ud`C$l4nJ<5l}GF247(hA{+DK+7H}le|BVf5T^r^|M+FD?jYI! zFkB~xT~3owX?G{cq|q8FY2)x0cCXXWI;d7XV7$&VRvo*Q%6Mw{aPgIBP$KZLF0>|e z*mhm0aOL|hJh=>5)bPsuY^Y{9p)dn#z7dK>fRnS&uo6aKL#RQLaA{qhV+Je1X4f(f zu+?MVe})7ZLsOqw@P(C?aUY?hP;)tlb)7B|vx)4SBx!XOe1Qt}D44Pmfpcw0&#Tfi zGz*w25Iht$ksK?-A5{J4(#01iN9Em#QX@8hEI@VV782F(ff=nX{Gn(dacVGduWkMi zX)~x>CpJZ{2`Xg#W{mOa)a4xoVNaJ-&lLP6h}73thJjBuz5R>Z_4E=T31HIefF~Ow zZzo^h^G=~K0x9FX&;nd|SyI2)G)6DJ8IXlFggXrDR+rE$LXdeOQm>~(`D*GmRBP>s zyI?iE39bI-hxfy)eih#Fn^tfa3$T(_SM-XzUxV8Hnvz!qb&5jmrfbmW6PL3iu>`Mx zw1}RZmm+l_B}zMbeEh|U24_@*zQY@=z#h4o-aUa={l>iGo%S;zu7znMv0fi&H+CAMr_ttT)7USQRxsg5Xclp^cX0;{c zcM0!U_+ZwDrx|$hy1!}#O43kTofqLMj3U~gQ6&guK>ba($x^5f)=}qOlO9e1d+5Kp z@U;WC*Kl9!R)65-Ju-ug5Uj=L%j*NW9A07L9A8E93`NN~&WbsXH&EYpvxdVIeUYT- z^B2|k=>FQsG%@|jAooUpq^mDrtN%K!9S(@dI@Wd~kQQ>rjZ})Be;LU=BuXjoht*%E z*`PU9WXF2Q$5*4fH1(cD6#g}sFp7%8YD-_# zLc|j=Y1VQQpt(-n#=U6YpOX>msWR9;IauMzN5?M%oyQvnBuA%k*Sve4Y+ffx z_(+PLDCs`-nzTZVdjjV^aLvEcM&0)^-<`)pqa^|VsT(Bs$ zH(v=DQZ^GRwZVN4Em3AEQpM28M*|V=w>&hBBO^a5Dl14F9|~h2(sUAcU8-_js>1Mo zG(cv)IQ{2)&0k`L;w-w~2@W3N7vhaRh9vjb<3UArTyUictpH#?`ZA>{e|l-gUO@Z) zU0Gg9LCL|=_N?Lq&Ww#T+fw3mXkc`_?u`y_5(DB4)5?$HE6VKHbI@(H?AXzF^r1`+ z_Dtvzofuee5L<}|EpUV@Mtroa>Dq)V zWs;M(77`yF(|oq&jwYOYZKwBX&r)JuKtJiTMc#dr4NXgBn4WfaSbDPzWTD0bUheS2 zYtw-6bq|!729b|y5v-qTUHX4KVKWdTbDpCos`5dm1Q>Wu0v(@OmP?t{m<;GVU$bpa z_a=LygW&?fu!aU*Y)JpRa9TB=jwru`mp|$Cg#uKN)-11@uU|WC$OchQi&bVK?Oj>t zSEGu}JGKbZk(1)r@!JJ|(N(Nh?JsVUNGSBDTy=Jqe?dvXYPSId9?-8gXP>llrSfB1 zLa|P#>M|7Nuj(te8DIb!?_bXI|0;}_-&xy==JypQbd7>u?!%E_LumlFaukM2+l*Lf zrKSA+eHJCUmfw(R~{+!#^h+zcruK1A^vv z*BKNSSmFJ$GAOC(=WDz&bp#UCz!ioJ=)Y(cGr#b)tZAwKBjfSQubTUzQ$3O#67vv? z9E(js20T~LL+gM)!f{$o(HuAaL7A`?^~u_#$h?}=U#odp?86p@hIz302qB-7!i%?n{!0P^MHr~z~kHu7NJ*@Blklay1W+H{)2m$xsoQ|^lRy8-T z&y`h&g5S&}gN^t%N;aa2LfobyRAaZf;~73Xj$M2qg3_;l^l|^f3tNyY{EAfnY%9^c zGRsrVU>@FF@%-aE+KZ&H?-^Dd0O%A9vi6tji490|^~CCK`s79GFh~91-@$Z6zC1bh z$M(Mg#%_5S`+pZtL%L-c#24_DO$tPEaUU3AySxv_%Ra%+{fL z0d#$#_Wuu%OjEagir7FW@M(@thLs}~igcpPTj5U8ShkX7-PeDgU6&Mvqm$|ChgUXJ z06}bWEOA3$e@S68SeG@r2m6-x5}(a;`b@86t=<(Ka_WZ3%NFeS_PoANA0rp}=>dSF z{HfLg`Z>mTv;sHWy?)#0mS*+cUI&B`{y0*YkTz4WSF04LCx#U$Jtj9chNABu=lXR3 zzMpO1!aTmBw?8nMg=xg0$EM*gC^#H!2vW>uMTMfTw>8~>}0 z{eR;;?pDizWX1bh!ct9U!?E$Zcqy8cz>FtUb3?~y$bVl(drqxO_r{P89Adx=ZiOeM zJ~bP{ao@g0n$CpzB*ZBdW=tDXyEne(?Tg;w>~U|k`s+X7Nb5-Q)>iLd+nTbROU|)?p+9sN&52oFYrbS~r*ytta{hlo=1+Kpv^5u}j;dY|6sOehv2`T*W z@s|Y=B2Nxi=SO4~`o1Vgv6Bgxh@%RyB&W-SJDANFWCT;^KVmzgMuI%ZJ=+Lv#xF8t zYAyvy!Czqu*&vfjIB+1@!n338pj*{Ww88TRek;~^y~c80fxXVJ>{uu_2`t6D<}NMshiE5>~Lrh<0NK3q83C zXN)!CufM*?S$TV1@IGo@GnxWzhgZCWcx@Zs{&lW7nI{z4=)oD+I;G>~Wu=3kt0jcm z6+6jDH}qv492$sm_U?Jj#&0?=mw*qt()J&;NM=#5@ukqN=`OJ%9O#%h zFXxbGA#%$8OnwJ+_vAC6MG1WE%OA8_=eZV0tNZL0;n0pVeE)J=mQ6{Y5pH+JOOafo z+b->QrmVv%I)d78^fSB95Xj)9>Vd_3Xhk29& z2HiuIA+0>p<^v>t?pVrsrkd{44EFv%;%K~X^_}*3c#TUT_EoJe-;k&&we}`F<3zx- zXEdgS-osUb+Q%OMMr{I!RS%_f{khxrjnn2qekY9Whici#c5>OtG@G(vT;O4+nJ*gX z!tt^zsmD9JtD0>i`-fx#_}=!Zw0H2`w3aLlB_Gev;MGW&mX+2Dh!g#z-vIszt9Vh7 zY@Iomr#@eqrBc(0UrXOFsP1IQN3zmvRaE*rNihOOh!o=c(E8(rHL5~c%gjZdwCc&t$;x_M{M|%SbuLj2|=?i_4U+9ac>u+qlC z$ovZensluz71Q+_K9m_0V5D=rFvLs;grxQ8e194*EjRdtPyIIa)I!KCj^t-nF-90* z_RH`c)XDjVDn%8wj$t7;!P)QeTYgHYnh!AavkV9>b(wc2#l{AO>DVG^gJ5FVp66;x z6mua-3e0|%30?L#-|n@?xMs{|`;wPJ2r*K^lft*nROV)-N@n&CJ5BK!WLNG(r(D1M zLd2fR!54YPy!T;G$~)om2m=NF`mdN4Wycdnxnq#Io6Xx-h|JcZrR#6?Rg))d#$+g> z6wHIy_4L8YA7o@@Iso!~@4aQAywfL%bw;Ke7rv1;lJ0f^Y;M4|2TtNA$-__I)_^mA z_~^{Iy^K9BSBB75 zSkqk2)lX~FiORw+jh$vChBOB+rs9?7^|LFKz0BkWiH!eDLFSjG#WSWvO-#|9n-FhFn+Z6^ zW5Y%aHbD=92EUq)hcSKr&80U!;bj@llgOT}NCL+M)6Qnh6&eWB%9?5IkGa(!#vb1j zQW0Fx_9Ov?yka{9smuCtvW;k;Z(n-{60{?r3;#PMOl$;!Hio7k5>S<6A$K!r5hV7o z)C4`+2dwNLsolF)&_AB8!xzFGX6godya^lUPj^P6KD2A(jRgq}$c{zn?NwI&5nDsG zR-M~2$(T;_cZ0*B*iA#y08aH=|k!RJP zAfKDKzrsp*=@-jrqFEmPDlYVam*=Haw=@wf4Q(dLng#Ik8Nj{~FFFfhSH3J=Uati{ z1xvIr4J;tb=Cg^$7_0kbQTgv#KeIIzeMg^&SL26(ApdOQ{sIR_@pt^`Ljl!oqdCX+ z+OQCVQ(GLLW%XY}OL;x;g0b@A!q(Uos3!#BX<4IuBwUB(b>zT%JK98+kk)Y|+sD}B z<+-)9EV6Lth(7!IJNasbL8*Fas-%kC?|6X+i(-7Xa!^_lV?bBFosdBzX3s=9M_@y> zGbI{Lohfeu8YWfxt_Ajb!8SEA#jo$Zy2<`BKT!S%I2tl0Si}r=Djzo{1?#gb4?6kq zx4+GEn}{GcpEaw=z?_`adbuGrn5BMa+u=n@Zz=D8E~-QfX3s>}#baM-XU;{C{Mq!a zw5G#Y46R(09iySE91Iv;b|qQLOabAu{@{nUkp`~;iVMB&MqS&hJg81b8_gzT>X=i~ zIqC(*&gIW@&uQx&s}SYu0A{MbEQJq&5RR$X z1~NnOecGhmohT8c{#tvLs%7;^49z_tQ%EeVv#4(_0hvom%1|L^_{1LHTvm_Lces@j zX^cxQcq%CxZTJ1rWXS%%ud+Kn4wzr17G07CJqWfiaK;Fu9ESoZ{SRV*I{AT}8&#}7 zFM#G8ediwD2I$~c$c*$u#YS)9D}_ZIaxhbMP%I()Va;3u;CwuK1Ug$8`n9?ZBm)Vq zzj0SygQ=K$BH%8Icc;u6$KS&xXV7+u1_U+07KPW1rAu9-XJhz z*n&ii(jn!zW@zD$SqMc3IC8Z^&DVQAjPVm2GQumc=fco;s#?%m-UYDPC2V1#7hbl9 zWNM44Mj^`5!H6;+q10E}sAH)>WerZn+F!SwRFSS54+5^fK+iAWuo|B36Z1dNH?65z zmc^pU*8y`QeBshexwrf9;Sdg~mYNF8LJZjq8#AIi!yTi1S}O%4FK0h=elgCg_ul#wb=vej-JzNteTzZa?(;C9>dSE-b7O%Cb^T~~wJdb-$E7-@&F(!}>{~Yv~A85X6yP~=hCB7Nz z{=(!;4K(PJ=B`B};tI|1J!$7WBbyJy{0Td?=7QPvc(NMCt^%>-_NW;(eP2MN25WBl zDWOWKyl@l6ISsITEP%-`@lG-qqTv1GS1UwbouV-#C$(uoc**dmO&_A>tJdu~A|ynR znvt6I>>=+Eqj>b`F?qBRV3;1XqbClfshGM7T=uwR{u5DR0oyjGG^Ngg9r^mStQ4SMW8iA1ijuvS*4N8`1AdfznzZ^Cr-H1qCQW47Nr-_Xg(@zgQ8Maw#5@=P3 zVMP}!Ui!2A?4o{l1s#vg1}gc?I_=G-0KsA!FDecD?zm6v&Og-C5V%truo-Cm_=Gp6 zC3voLr%e}L8+ci(oKRO2@J{_xnc^@yFqK*qFDw=}q<~TUA*`vrSh> zoG+}FL$=S?oNa@$$f_z)`YQOPt+gZvIq}y0FsC3S;LK7GC|z*k<#?ov1=OKv)pB6+ zAa|yQa5%59FR~E zm1z`;*o-}mD!`@y(R5rElW&AXP56Xp!-dQr>e?WdcL3jPYMftwNMw*xo4faYr?mxVwyf+)@0$R6{tqCp$xsHp-V zKkkh`+(C-`YWl$dDJ}OgqoYBQ(Y7oo^e0+0{Lm-ECdDp9a1J>|iw@p{(nV&Wr{5xP zI5=QHsFB=0WN<8S%#PtPM4%JPR(L0PxzMz3RQCfW;>1!5nka~$C zPyv#+O_8gIW_$k}`+-O9&(Jx_JHsTD`aU8rSCC#8H*p~DjD(#TpuT()GKkc}6WSF_ zHwa3NE;v!&me|g8Phm7n?Y^>amP|Du48j;wBpk)sdSO{!E4~Gv^oYqyuZN}c{`Uo>8=H^zC6K&F z>Y)7lwDUgDy@3Gtw(AM6oXm3>_*W1LL5-R-25#1;-pQ6$+%T2`>6e9c)R0rfwZ+zc z2mUEyO%`qP2c#Qi%sA$~Q{tA@3x6`X1w%@VU3=P1oC~q>^uX;YDW5rs6zAtGdNisP z00?fMZbmRhL?}6}%X=fKyUE2Y-Y=2L#0meI*PJeNO1< zLbqGASr!dq3PlT$$bc3-*bepS4lpfVBo#$s0fJ9?P|9|`xM4KAg!~xGqYfy9H@$}! zExGk%ZVvAg$(xS6i9Y@Gy%NQU+Ls=8J1J@eWd1Wo`!mgE!r!)=8Urm283ty2h)gcT z24DI9@Pe<j!{}D zBcL?*)?#WpJ+KKUD}q`(&d$RLcQezKmi!zyh|ZX^{8db(fuYuzu6U|IE0PDNxKs#0 zRj;ZaCa6pnMiCZHYpR3f?TgZc<%z=JnyLULvm8mvH`>WtPa)3rLWcGriEKlje?JA* zL}&}BES4039<2^We_YBqc8*44Du*K)PmXwDcZu02QQFjU+5ES`yDI-PmE|m1d+Y)F zh%XOrGs7o#)qat_HWG8TxSfYeq{kMbxcr?K{F^>J06V<1QdoSXn(OlC(K)&w|8ji# zCyUC@RAb^Wz%KGep)^5vc^X(#qR&O}1D2+k_ijcK&NJ9qd?~d9O8>poOuPN&^HKV| z{rf_lA^wRsX55$EYq{@%>y|bZ$W`;1?;H5|U3yqXkAm=fl5igG1R0lV`6LE{09C zeb16R+AqS1o1(Pvd)Y%kbKWDx9p{8PM%1-u$V+B!m}OC>WY`!#E6?W``I;eSa&h`% zr1;M-=+cDt%M`SNuK)q{qR6bhvC}BRE)Q!BJfvZ_t*J-;0LKzN<~!AwnAOb*+wcb~ zv3g69Pu=~Z*PDyz3Wz4Z6g$*RKW%DwZfBS#q5o9@t`K(NeB9qr&K zB62hH5#fx44mnHP0}hq?%S)sz*_GSIc3z%(mahhhQKqBk{KZ&)OPq)q~)RN z#k|9qQyif2A$`HOUx$oDC24*KLQjufH`>UdV_B;)LM=GqHU&JLogbFxcrHKMHAwny zB6j%Xc9wz1iS;`T=?h2}O`g;Dj0++hazane_rE56LnB7Y_e74*Gfwjiv}iig67H-e zf_&X?9~h>7+efMr+$7Zt=k<(Mqfh3`4g^oU+y~K~>n1nVmbCScnT2-fprg zy4BzcH{X$1HL=^gz!r)nCG73z4sitRSZ<|zmPJMys;Bu$`xW^Z`gb*Wom}Rm(m3)> zz!6?h$(8eB8|j3cLt49c^rn|W9giqn#}-$HbhISrMoZ3b7rb6+Kk|UKtNmYZ6@3@ul29F9N1{p=yl?g&+|JBfMoo(y05}`B&3wz z<)PCY-tv;GT&F^H76wCZkVB*~Z(8mp=sLA@@!)n)3b}R=3$*&hiU4TZY?J@D0W1PY zC^q6BRnNb)sO4Mi!AE1*)C1p_bIy2_RS8PZ7isV(hoOnnb8LWP9r(Pqf5XcY8|F&< z>NjX9eU#v+PYvl4V~Sq#H7_U~4KF$L%jKZP{m?T;jO)c$fT#zBqmJiDZ)j-EEEYdkQ8np?kF9}jD~Asy!Ivh`}HDt-;9bz)n!jRdC4 zfE?d`GOd$Xg_X7SM_r(oIi+e^B}GLmsldUn%B069$`{msQk}amV><#jetvC9wvnLn$Yu9ne|o z*P7V`;IpBl-jLBKdCM3?(0cU1-64-`a}9k zzV9MUgh^z=o?)#6vbjYP>jMm}R_(8#BOsz~GC55K1))WxA~Ap+82kP$Xbf$s3%ti*X~b$kXk%Yd+KzVy0rINFgH|fpkt2^*adSL>2Txh?L>5M zzQ2}{73)k`N`rIp)~lq;Rsb2fmO#z@lWTk|fr<8v(?Kh;fPc&}OM>)H9C+q>7rT2f z@lP`N>KH{FPbgP)W{KwX?(an2-z;cJR|{pE9AHh+GC(x79!54RoU%wn&l=&6YIU79 z*P92=^fyy(=X9H0T%QwtfKZAfM6p!2Wi?hbIR>RUXT?Z>s3bdl;W=QiI`@Il=FKX0 zxInYwdJpQY>2-IeNLwjLos&HmJnx|~R14W>rG}F(knVn1H*fA71HX!ezA|H zB$^!gj1IS33pD#eG-S|Qauq$h+JVHE7>$wF0L zcb~iV(%v^@9~(1$)s)d-JYftQxSf^IAThpQRO-?9tL)AQCLpP-UWhfCVFuBl`n1cB zPZm)68OJl6uaRbtLDWFs?79TGm%fTE3#;Q;W0F0o1fhgrdHyItCQ$SJ zQHpTt7ih`gxndcg<&?7qnProFV=Utze-pd6xF|j*$_o(;)_vE?l%Q$+-j$A$$NR)y z5)aSdKn-;TKVfCzkCNhQv%HaDTxz5gkRqH7k#s!qs99p}Z%|ir#gp|U_5epVbT1*1 zY^8_9RnkU5Odgv7qg_hYv@tR;L7io6|F2Zb;y7+ooI9H$i?Mm5XB*AddpHxK)Duv} z7caU&@>19pcrVE`BIjMq)xGg!XKBoATAXcpR*_kwEtUDMA~~gX5X#y7t^De+ZrAEu zS2Lu>Uj>hX`R7P`bu;Y@)X&j@suhY4?cFXuU4J*Ny^Oj3@k1?$@bq9~PN zdBX8vf4(qohs=uMkCnZ^Jvv3&IrAY*0^+%CrcCu78l&jGqs5gXfMRT|PxOAmppCn? z7m1nNuWv<7W7lD zynWFkdzQLI2F}g^Wfr|mce|=P3xN2G=muVKx)NoQ<(*}71*KnKn?+0PcEBQmG_wjl z_CV$-)?M|BbPeA|J9Zmym%m9?u|5Ge5m+sWG^GUseEhBNWrp&Tuc#zV^QUKNVl!G% z(&B^1Ar}HF@y?PFV;O+Rqizm)1aZouf#Z|Pen`NZQk6MM2+A_6##k{_5lq{l`xNDh~4QQ}sOjS%zd zsxx^q9ii6yBEDyYXJrh^g8$}HQ7RBd%2YlhNXdEdX`L{w`s6NIFMo!2zB2ys`V8Pt z^PZZxoeY%r-9U_7!pPV_O?C8?{|;>x(-_n&ZvQu1#F~1-+ch^gO1fS2M900{hH86r z&^Nm(17p!1{&wt}LxEU^bAr=!9_elo!sT_g!%Q!)3^Z@DazOo<`7YO~teH#gI#E(` zAmX4zAcxW%p(B(t$x6uKk;7ut zs65YSOC!P3-j~&s{MB1!qOQo>lRoC2Q)#7R+(W)7X}5sZTo{d(_smKS#NBn~-z<|k zX+M5{2Ui!cQzU~hAjS3FSz5&teOdU?8@^5-e>E%n3- zIdxO*M&l}*1gqAI!ZpsA40pY%+)nsRqqF9j;=>^7=*J(-th%6W9#*M#t#T@zuoe?B z8<*WIU2#frI-R#A1>WTiRyTSX%Yl=FT4VCa>kivUtA|NM~ih+Ah+q{!?y{d6x2^Z4mSb zm#5<#hm^3KbD!zZ>uZ(KAgRU{tc!I;secR{B^o(#)|uCP?eee{>%4Z(7FJ8aC(GF) zCdAOKGsE0NSo=<|J!h;?qaY#i>)Kf@JyY~o1loB3gCuki zKLFCrWvit!r}x`s$<~SmjY-9Q_3h9e?zTd8heS{xH$Ka2Y+)jx8xLJQeds%P{+CsS z|H;G@eH{i_elq{--}R0qUoZx5z69W|aykNN{L-iG z8t&vN)i|I^+jIVPccR(BUn=lAz8Jw}6Z=Z9$FH%&@B^&v?xLTMe4@_!&o-&Oj*GUa zpf4i3>QH0cyMwW-cCj&Bb+^m=W0nQ_4bW27pX9tpG_3Qwb7eA01OkXvkxb{0Xzk$}NDM}xW+%mt;cA7F^HLtGc z|CV!Bw+Zxh$^zC#=;}fk@BuWycal@9C!n*R0X^%_+cgBzPM5vmwX;3h!SMYI;wDqy z;SAueSm4=2%gufIhT|)iLk(SU&yX{|a>#r6*S3Fz`9w!#GZJzZYMhG1f9eag; z%VOC5F>8q5HpCzG0Vx5UYi8k2$trzeRM;?nbfvp7NwOk7*!XTwdq1iaI@ZGLvUR~8q zlq%mM?RUWFYBt`&$S(AxiwS!@k9M9a`r(PVl`kf$t?wQ^g8hu%%q59m=eQA z4(>auS1q`^%h3o&{BUFle~I#Nr1)Ks@u?vgL1LbbDEf#d_T{XE>_cF|>(T-ycD3p| zt?K9rt5TbZFjaE76Zf0Zu7a7SYI6>K6{VunY0()riSF6kjjla(izBqBdotE<{Np^c zW=Z?)95Imu#lBMAa-Uxo$qmovb82i%>w{#YWpWN z#m>@Yl}SwX>+?b3v5ynwb7EwR(%fDLw#skbN73a5Gj|{(R=1n;9M4qa3d~9wo1K3y z!7%vEdfEl=^jYfyA<(F8J{7C1g{o=1g9Y{&aX2}Ca%0Ryl)rliC>B=djSkK{zWPnn zhOMv}FtceW3TLQvPTm)b0-8(>vqUr?iW#xvE(U8gZe|(yW5qJ(p^IgaNmWH9 zY{VI@wjNfwS*51KENp+S*wxz<^E|=i*^Jdh^~2K-S^#70kA z8IrvZtl+h$b64-8UPs~meNofib*F?dDa|qp zj>AvffpiSr;*}bH3cm)xdA6dQdh~d;O3AXsMkl!p>njKF$?W^-FTANJ2b$7D^d_s2 zElhg=5ydP)&Q@y*N}bj(o;gNeqlq` zhiT$&$vwVC6-DUXAA}mVug8q6yZ(hC&q(gt=g*A_ZX$;teFVpS?!<%^9MkHWisMd| zh7W_7;E&?@(PMC3=)}9Ao)y7sBKg>DN(+OZd;E^-Qs#-wNV5cBPvl5dLz@$d@gHf8sVn41(UogkZmhA+uw?Vo0OD}{9V>#~JMe5$F_F$HL}Y$HqS2(b@6m zo>YM!$k(UozF;;!1O5<#iy51T4+~>UaomzY$@>SblQvceEQiru|Vj(75A?Q^#4 zH1|z$_*!FB{~oHDj;Xf#!{qgd*|EfXrB4!m?tT5m?*}Mw4h#W0`O+cLsN9(`%U;(UKo^i%YRMFBRZ7<<(pUUuYBx>|6J+G=OAvjL)Hggs zXu`K}(p^kFdVlC8CN947^o@)xNnhr#$jCeOv=5jX+iLJImOvDHx9+jmGdgb^t%#mD zEbD7Zu15CtT-zY;d~?N~(KRJ+#h*)ZImSX-_UqH4pizPqPV4lSv@)*?qlJB)o)a>8 zM%_Rg+yQUd3aV++ zQLGZ=1B<&WOJ?%}I`8&*%*^|5ufbDY@dpDZ2eh1>GHT8Hx8N&PtLyJnJ|@^ncT~vs zAck50%^x-afRz{Dw&ps6qa+&rm;g?Ru+Jyv5m*I-}a zDeZisG=*0?iY}*JZdq$7?0IE12E-VFujq){86Xpas90ht3k!?Wbn~3!`);$vg`a?Z zm2;+!JMH@TpXj&eT^fSu(TdY*i!s4unSp{9_6O3d zHn92W_s5=&-Qy_S`v1{(o?%U8>)W@24X~pipku*~N|P=|Wdvy=f>aeDAidWRQ2`YJ zJ0gTCMLN=?1XKo4k=|=WN+6U_5=tP+yY>!&pfhvMxvuyBjSnQ*W$m@sdY<2X-$wo& zmn;pH5VJgk?UcN%!3t9p)e`N{3i2cBrFQKAk0@3klAmT>^iawves5$`IjG1t9&rvv z^*YPi^r68@FZN`8-HG=RS2MUoCmrCyZB~}x2uZ0XseZgEp>#Q_QH*luw6|}dn3aQk z7;-{5r0DxKsc@_B6K1HLs5OE6zuLUB*fJLSMD|!;1Gn(h&7Xr?ir4p**^50brhzD9UXz); zh}0WvGvbe953IJFy3sn3meI1eG|zXCJogkIJJgZ}$qf{SOOp<7@b z-5XwhjC1DxjcsZ69KU2JJaPi)c^Y9a5>-YVFqagsU&+fU4`!ou?VuuhX^sH>WYIg) zL3U1>$Y@oCe~6O8sHvOBRt|o9v(eMfeEj!Pm3UTh$;=-qpnra=zDTOS2SFt^w9_32 z1)}qNuj1RgOIs>RjJn_Z9~bEOU`ZHBmQ0(HO`UDV21%KNM$)qJwZ(@eZBx8KS(j0H z@QmXmvu_@bYahA`L_?M5u=3syC}Lp+6rUs99tr91NHQfw+3uvCoeGT;dw9kN6>6TK zMK})I52)3B#7(ErpOWxvp7GyE##}2*KrE?!Fyb0EyS}NM;&bSBuWk8RcEe&UkuOKv zZRiqh2eu*Ep;OKvG0-Y(?9%YVZRIK*x`m1Z&ZhC`BOGL~mto%>?g;MjeM>&3RdhN| zg^w^L*s7Y_vidS;Cc@Na?{kM}_bGp^uu(354&$@x9?MU(DTm02hz#tHuB?dt25I_bzWtW6BV}c&h45Nr@K>Pgl(xJO6MTay8F0YO4%( zaxr~Xk#Q|Ixhk`=GRg~m0COp$|NEPZ;lV5m*+mLeIu~qJ%fsx8 z^_SYH)56F|`@!s*-1iut(P0OpR?z=wu(Zz<5}wI!H)+EpT4!9###))T-Ij8;Eb3i} zlqKqK-4CqpI%WZVs~0yPJMh_)A|B2F0!EB>+JJx`Qh+a=1~JyO$t-e1_S>&e=$W|%zw_+j4X^sRhgEl-Rrpe6Br3k#RNcX$gojXe=d!wo`@8G zPN#5K%XJyfy^1334-#_D;tp%I={FEQC2eMhazmwJo^dtA=>#c9*Ll9L_`WaieH}Mj z$sudsB+(M^2T>@S-HGsHZ1ihDl791wJw~>5o)x zP7@`0f7$VxD<)=7OG{~$0}*Mv%pd)te|3@k2T3YEcl@M2*^Vb(Cc7`p(bep{^=)?S zRL%Iq(lq^^p~zsW_xDC8|I;~b97I=7!h;qm%Sp4U>7e1=Z(Ibty2h}2bU)d=Y zeqxxXGkUZc>-ru(l&O#AIbM{6a)=OmNbw1Oi`8m(>AkznQv={j>Xd->a!$C_!J;{F z?bjJbbdZz0iyYFxdxljFve3ET}? zjA)A>4BPfZ7UFnP==N6`&R`l4t!A*tCG}oMNWME#nWZ1O?BFXu*< zb&(nf{m4=M;Y;x}|G)s?A0JkRj^EAu2R22(`py!+Ax&$6P5gu-VxgK5Jm6G+ITA$Y zvV2yRk3vHma+h?ymc{ABGopIzlyf~lY>&WSo_DT^=qMvzy*`3xD{S%#4tbA}FNIS? zdQC#tJfZ!i797Ub81Cyt$M}%zs+=U)_XV<+)wB+;-9?D@zc{F)#oKAUQsx=#hPxv! zCmMnkF|mVFl8aFkx2UNeLKbhS?Hk$~cQ3SQq?%|0O99&Ccy41*!#Nt~- zUEoR?LZQHX)Ygl!>EgNbE$JIB6(4E2z+zgP3X#4WB=z~%L1}>rJ@b0hsK@RrZQ})A z`!L|GMF(Z@-H%T7@Amx+5Bvo!5U>v;Zsa4d$9A!pA78&>2LJmWfKEfsX9s~xrmgiS zPV!J2F=xp)L$MLiZBlRDYh$gFufP6qy^I_qgX>^-=ibxx8P-KOp33>M8B`^|*?t?y zYt>)K#`)PRDm()SIMZLmxIJW-$kGqYNAe^=FswRTaM-T?y^7EeFeEhRcTOGuY52mj z+L{9iWId$=``{kJBU?8q=^zc1TxEh& z!!`H}&Wj#_T_)qoIk>_?fqEH37;gj3tSzK`((1WDT!dR~uL*0lk}=ecs|RwdrK3h> zm{d@rC?+I0f)fI`xU2a`zsXkA{{S!fDRm^hIgl z<5MF-rJUq1VGd)(kltgyb)=d4ZdMb%W?T9Cw?GI*f(cNseWG7N3BtadPCsXuxQlTT zG)!ggLQA(!u+0QHdG_CSyg{IfM5UQoHw#7$3<<^>s#x{j1)oNV-re6KJ*~ToFyIWH zaZa+8|*?-f9-wF4RR~~})S&rrb z^IrWsG>NBcgCh-~*&Payy2kDXpU}=R^SHI`XQk}4ygMeS3*J>18l)<(2mtvOP@}`L zuD<(5$cZ6>xaSx?h#{|0f_{l|7sB}UN7LOwu4f;@QwzVQ{cN3e)297HVMJz+k)2z2 z4*yIjS?+7YZ8^&!GjB)%sfPb^QDahR8C_?5{#CG0$LM4?k;KrL;k79bXH|efXrcob zRk>9dd|=4AD5#`wfaWh1|jY%2a$Q$30hT zF4fiCE3JGi3BqZ~i7lN^Q*ky8UsYiZ_}0~xu4q?c(%0wXIj4iDz^92DD28}cSut%8 zPjoXVq#7CmP>F_-k$FHDuZKAvD;J?~gb+QWW#!iNS($bXex>Zd(}!g;e21!eG3h~d zeS=dR<3dr)l^2{+Htd)05U;S&%w^Z2#1O2MUOA=4$Q`+TV77_3^JEdZC>7QPgvFqp z=>;B{w5x8@Cg#KFNXPiGzr5xTaNeCEpPuqi3K~qnFk?PK#J$=I*|=k{5Ysl)Ru{*K znu4&!ayj_z&2Bp*I;HA%o6_$ZTwy>2b2`U3k`m{_BD1m$6%y=I!`Xv5g+)~eDFH6O zvA5#pn0CH~w9X37B}2Q~a8O#whlGoi`+l;X#1+p&Vnl+E#<-t9`9**b{tSNdptWQC zo3fc^GDJZmoG-W+;c8@J3bEC5+~X{_z`ZP(!yN-L!~uBOI$ z-6}*Uh_W0e|7oW!=J8F7a1k?FwBL+ECzEix1E2I88?K@TF+eU;1-$`L-v?=ZWeSbv zeR?6tRNGPv(jT>2c~1lFM)4ALFI1tiGuwh({BqdY7*tzlGusHESYhG5#+o@q0uY`vsDmOiItM9bJ)E1P88)y z2>#0)|9koklVL7}qP0Iq%~(q%zFVV_iMz*yWyKL96~OGT^@t zC3F4aMd2hFfk3UhglsdLmVXzWkl`YU5DLf|-fs17|s7aS7!7LZdJ zb|xrpOFyUQUB{7gI;yeeRU3r-wqR2nyWCn1GsQg6D*zv$uN{LxZHUd#@KZtkk7z8sK56)I#=gIZ` zdGhG?6+5+hMPTMpP}=~yU>bY`uGnFp^$DctMxK8p zG_8ou{*rhxU30T$=Rj@55e|B#abTlG;f-74DI7U^u6+{*iC`w0=rbnr);E}LJMkb{bNhZ_t(3-!tjb-=2#@YUw-cWo&$#4SF1*cIebZQw zfr0SaNZOfJs}H{j|9&$>_Ae+x_RHyFL__=>J5*2@2qXkA3gkYYFzI8 zy^80V6DRYurHxNbz5Qygs-uBEP%cb4d!s5F#9zCOCCY9y){}tcrSD9T#?jABaxF;v z9eJuPjn3p`Bts0m$J->SiKzp};;n9Py4O7$6;vPuazLnhlW*De@tt*@y3 z-u%?jS?W^7 zA0qddPh2~0kEm?fNh;AB!;B6z_6nQ!hgpSU%rKEu6SfYQSgAqNtP&epY-EOsPH};L z-gK@KC~`o8YUaE5Zj8kkO(e}YlzbB!E z)1x8sb|G>>4Tp{=o=5MxPvHG_s&0FKEhR=!ceZx-7Y!wHs(|NhUeQjdQ&b~E6%0AOejk+hE97)`ZW`d zVj3VV-sj2s`}~Bm$gY>ny`p?oN5ro#l1rwnldx3>qoBkBS}QW08UJOpAO3XxiH{qd z@6EZ=cU_i{{sJU5xs9`JTfQXh0$79pb0hSB4O8q_uZ63VFb23JM|nP|iSs#dDfle{ zcUuA%L#v+z;agf@PxnhgCX+DcAyiBXnjvHo{+4HjJ>?b^C2-R1yN&A>lI|B_hTQV9 z;|K;m;1yuV2+{z(ZHiOwwf>Owzi^s3|p8}UyVyjs%cb=}D>L)Jp zB@M}1o2^WXe(=bFN)mKz@WaQjF8J@w?HA){K0cfE8da+jiHYOopRWbN1#xB>^p{cl zZ&^0~!Pb8Mf;R+W`%jpm)nD}w_{_UqEH=Rzd@IPJ`}+*yHQo(Sm;>Z(x@af$Th`4N z1JWjTE;6-o^cVBI#YF7iJoo>@XsBTg2{DKmD;LC~&S!D|4qJ0v zW=UpP6nKDS7O$>|`5$7I3K{tkl0VFl?Q#7mk4}lH*SH3L@I=`$B7y!nxlQO9ldN8h zW^KF49`;s&9+WLd$Vorv_xuPWpq=Qrvg9@6hi#Tlg_=Li%)bxgD8pOOvpDqZUlQc+ z7{z?qOZRBWnE@iJ4xKZqJIr;tD@L6%{D&{omIkD-vj%@aDXOeFn#vdLE0bg1)4t`+ zIg&ALeJOJvgRO;KCy&uZ(zrc2e(^oOaVH|U;Oxvj@2+RteiJuJN%FAdUG>#VtRSNxV5#MnRn zqEt11vIy;D0Q*UYM$a{qqJBdB3_XMrgHnpCZ$;lCNqm(*_e)x$)5B`568R^f9XcocL;1jjNu~5Xvq+4ENw3P+7UUMQr)YC zbP{?42Wj@se2WX%VbAOR!E0(aw#*A0ah2s{T`B)7Thk9qU#N%P+%M7)=$N;vGEQF86+J`nzyBU#6W67f{P6!x;Jedox$q z(Y!ry;GOP(fnC$vi}_j|4&)=@6RLtW(?ELUJY7+_$@08T_}zrepzHtxp%52qJR4q$ z{18DsEush3bMw9^kO=b9DKk{O+!MIDze#GqgHYw&-TQ#HfeUVDmZfzY(h?W0w zTtqEs4E-jPU+DBM$)CL=>lCme>6qtnT6X*Ewho)Z+YJJktPZ)h?N1_QTYWP5S8GO0 zPIdtJ0L0vH-eM6S=&-e6hF;+364=MRTE}1wQ?OdvBzpb;^bnxWP!W? zZE3k^;%pCuynPZpX=qbEjUS zS##NU*If}`!UM9OSnfmVyzTOE7pr5>cCri}?ekzBf92)zp zJGEXPl@qj|++{Qnc(Mx@R3ryQ;+@$gwfw)^Zze9hsWpe$8LR=W+%?S_=vx?Fiaf_p~SW){uR;g@as2-Jg{)v2od z`WE`AwS2Mr9ejkMLMqH=J!4`yxfk9N)x1~!DMhM}3he84P4KzsmN&LfcGfioRZYsi z1Q(`=d12sO9w3~{@vuAN>&83n_kQ+d07uZ81jZ%^@XPP?tk4|fJ&y!Bf-SjpUk7`v z#f*Daiz90&n}yz8sN$Dmn}6$pAmD#VM05CHz|%Zcdwq1bOhi{lQl;q~f#6f5ZcU02&`M*>Dke_$a@%}41J$gH}=FK zD?=@kWM1kxJ`x?-O3}VFd1_~UdZI@=Lu2*vHrr0X{Q;T|jOc|fnF(t!%cFJV?Zx@F zlSq;Nl&s2>lVXNSQbZ~1vYlMVbxrJrcz3k&5K3qPRq1|F&`u}k&}(f3^@E7?F_C#o zCa__?sG!LIJyN!`wo2wi&ef{z#-+!P7bdD&zHPu5`(yg{?~gZXdfL4m(hRapw)cUu zM!pt~W`#Nz`YgHcZyN`{ui+Tw9ni_PcB#_OK7c!E#6fBLb8<77ck*q9bO18EKZ>aR z>93uHvY0MbJ(9BI)$zZ02?#yl#$(_@iCj(Ap}QLDzDessiE!^syJ&pqY}Kj@y+VW z4;oVf(@KA^$3>S7FJpF#8J)9vbBg&1e)#H$Q(Yz5VbDM$#RMxlqa!TohD#QZoo%@s zec#k9J{6KZwBE1=trw+pxU}n|z7&4*Y1*o7iyLppf?IrqM4K`CHRp4(w^iSAwT?B` zhEfQH1rDgP z)mPc1se|SlCugwk<<*P)gfMew0)x29H5i*ZT<>Ey} zx|?g%Gd^<7*uTTs&voC#c^FxC3%82Z*q@cXp}o3CZ|}U&d%ocp!pJjj+MP08WJ!wb zROHI8=A?Hx<%h`<2QlSnw{rGMkHS5gl8UuzLc65aUR^HL#G1PB^X?}w*JO6BhWs*D z05dkp`ao_xx{o%XVg9_YCXTejXs`^pS~xcHD~Z#MLLJL$cb^EnRj1^5r(a@E_=%(y zjwu6-O*PACKKF9)`vfp4B4teuS87Oa<-D=bZ}n!2xc2d~n_)JM((>V{ zKg*2x1;hO%IEF~)#W;vo#V@cZ1ZpL676%V^K~gU;>L;ffB0bNJ9T8|d z;W+yik8C)A7a8KJuqCa&BT8z1eXX+jCdLR8q7=7ACf0H=pmiz;)drEuObfRXBm8(r z$#p9}4t%3kWF#sv%Zc}8YxC642!pEO>{grXVNq4gT=Q-kLh0M5Rlbz|i!Yr#*)`3C zEa%&u)hD6L)qksaN&(VY*r?k@q;irK@BeIa4KN`GZ7_CnvT9edsHk{BHE-W%U3cwu)rD4t3u-Z}tt)TKvB3S?a3{q}1ah!D zN+(LQJ5;K+-J2295O32r$u<@VZQCi^QOK`uthVhMa(@B$i_b-Kas&~05D1}DF* zKRR+H)f1?Gs_$);tY7bt*Cq4^qm8w8hM<;u#|6^S+0Q(_=B|%=mELmWKo!@!ZHb8j z1PiA%sN-BG8*8(rUI3Vt6sm&nk0h0Rj3ll8?2za7v~-uE;7BCN8ar(mIut;l$3-D>b0K4ej+JyMi+zFlFpVgSUc%Uo;JG&?xt@2&;PAB^=$AF>ScP zr@ve7-toJ|l|BBrKW-^^`>mv$jl3_ry(Dng%hUEdQ1a@u_@|=6rta|`mke!A7t>QY z8yg-KCH}}M-At7h4|nkKF-CGxwB)DUXVzc??RI3RsE|cGiyt|PT;|QerWbh~qj^P@ z28L8?lq@rFljM1y+@cidRO=#p^VF=xtNeE3lE9Q6N923_7xR6>(NdP!Z1?(lXMdG% z2Cu_<-JL+0pOeb1^wI!{Qxl+m-}c~c+F8$Q?yv(fFbCoz>;yJ;ns50M8v%TAu;0OSO6F}EF7XpjnUFo{nE|K)WXFr9#G`f?p+KUVj+>o*a7mU5Q?!VOEf z%f0ttdWri9(Gkp}AwyriWTT*kz_v9yfI?lKz(KAlee0N<$U)2jnVlj|p|@dM(v&^8 zLG9H9v3HAaMECoXz7$iV+PuaFpQ-LMT+kvp;w*!ogufl4W3}Gvd*| zV^$Yr-OaSa&ubHePeFDZ8^D6@-i5Wl@OG)p6ctZAW0cow!}Q~Zrk^#3uRvgq+v*vE zvctdAlsZM#t!ja{UF7(^7mF$9y^-gi1y6eq72HRfJHtz zXZWH+!8;`qqMR9qLr+8@)7Nji>mV}xVIE!q-lBqU4meRib-j4jGD2Z9oC6LJZ!qGv z#+XNpID)m9!$)ybuLS314>pkhl|bH=rp)O0z_I2L1ip=+VwY^LZwWub5ZN^k)nZpb z11#khFKeFk%5$Hq>U{@p7pn_w^;vQ!;BiA*#~cTK@l2C>%Re^mAhcPWCLG+&PWc-q z(_lH1Uf;BBak&DRTpO4so=q2ILBpYI3@#6#Y+2Z^Z!UAq*74RET`;0q`*a_(7qW<+ zsxks@*#R2-CoPzgQbdJ0SEljB;y*6%g3I~(*FW>2c$v9;WV&L(Qxk(Djl;3I?PK;M zR!UcMKR{4FiY&04a5rZGPL|^&#m{=q^Cs%0ScC%v4=q;bI_Fjy4 z_go0J9kHC`V8xl4Mp(PeVIovM7KXkZs{$ADiLqR>+{U~l-Qt~XtPK_BGXbpQFM@dL z?a&5>DsL2zt8;N##yA7ZP?fvPc?ZV(P=TzClqs$*BJ|XQ?`54nn1FYf1{CM(SjElo zu1u}{@gtJo>8``npRp_s3ID(xR}*W+cSzMoyWO>L`em|V(CGn;BLN;QAeSB`@+)%; z8asZc;48up7N1Z{1KNv%GrTyBBuHK4X4q&tf<+qRJ}j`rP}u`w!lEC~at}e6B6iu( zUla31XY0D=;JFTNdRkZ*y6MRJtP1l)b{gCP`#B``#2RS4c@@8fZiZi@e1P|;| z4xS#a#QdSlM#F9WvW}aQ{deMbQ!FEdmc86H^%5@f-AU&pZ(882G_B>!%PNO$D{1bp zT2eWidYxqjOY8!1OQJZ?e{(TWu&M^G6VlNAmVuF+YO z8|hbe)jtOEHWeU|S;**Ef9kk}JwT5xFkST3$lD#Jno9K4g;pK!j>#}N z#4(l{y~i^aoxlSZ2H>H3%OfJ0lgz&;v)CLwomo_{q z>XF=!n=lNmz+DeT$#kq&A*nhBgaOVPa(}nQG5RQ9PTxvI$bbbs)0=OqKYc>ZkFMcn zgESe|Cr4WJRunn@EFE`+UX0;~e5P;Y54Il_S2CNBMpj5PHeY-w{t#XaFBVq!46c={ zpIVZ!0dGwRha<@t zxU1S+$yNI=-!(GYLlI4Qt-4W~&YKefLSaU!<7SN0V0fqjB)8jU=)eeA_&LeH?XqQ2 zszCi#Fp(b4(nDSdb(D)!a5l-s9!WJ$G|Zj3&;IIIbl^L1Cs*7UFiZ{$!DsD1Zm-lY zImh$nfaw$Qy1Ba9>q5Qnnx?PrtasN>gr@<37G4i6+!6A6DF_a?r4t_YO5z_CS+-B=%cQwJAs(UJW$v+a|Y4aRt?qLz~3 zUik+))l#9`%;H3S@YBnDe_95}#B9~h_wk`-hUG1nx2`PgQj=H zogQZNC6xwNpGz$sKmSJaV+wJ;(81U`Fl~eEE&@`U2q*NeddWKlEd!a=WrnxcsxSwW zl~m+0869)wNsXXf_Hhe`;ff-Af^f_kFs9|;m;7h1&WhWldmj z9Zfb6;<^Ld+^{@x3IQFUHVPK(OlLwyqBMMp@;$(=faJo9y53mFVVnG}O*EyivClQT zub_-uHVS=GOZ~-IPeD#8j7=Yin>=+ik+l>bA^*WwU=Sb=l{TQ! z%}BkGaTo$@H@JHYrS)R5k-5-6{bTLz8BU`P)#Qvp)4@GD=#kqq2&by*dr)ocq7cv! zzWeJueOAukvOt)}UB{WRMq|NhNBpWh{$p=-XD&L3hYuJJtB<)|+ju1go9PI>9F{gB z70vF+F@bD(&=q=dar}sDA~@zp zxBL25tO#l1uFf*@vUT!`ZjjXQz@t>&5l&$3u$RC)95U8m_Dv3%-ID?HhwthuDMLpX z_Q6ZMf1E#nbhYD@H7Pl{?ys#{dHbg=BY3BL3SL>hzBRNLDVJ@N$Vq*4>da|m5RHtk zv~`+3-97H=YJ#sRbami6U8$`w+dkIViYRb9x@8VDhC%e$?jcT{x>9DKbT4K8cl{kz0>EI@MV)ZiEYw zL^*sr8GAKE%h}1mq}^768d)`1aMLtSbv7N$qz0bLYRs228Xo@){Jl&7NcrG#7Nndt z2V!ZEv(v{9(_{P^b1s1`ghv7swkCsqZH;-y4v6ats(uyo=*GkiMW7x z%aq9&%<7ULd6V_bGbBhYA%l-Y5IO3tPWE~#iM9$vdeG%Mxh^2&p>)qL$91dirzGXQ zp%xGGSx@BKQ4mS97pdn0jXKC(WNAbObLG#%USNRrKpFLoG=y zv%hZ#MVjyYJ&HQb_{Qr%`_?$=sI&S97QE5GdUx?yrTD5NWxYAYJT@#6^H4E{`QO#W z;s*~~@=~YPnh!rGO&`+r*z_b{&=mJPw<7GlEA2GLnW_!E`NvYZtn(pScqZuZw+~~4 zBDd?MnP17*8iR`mbB{Fc#W*U6_&AvRkxeCik#!QNRUI>?PjZCDgp%1NmYb99odK_( z3=w&7(fk*vzXL%1LN#4J#J!82*zJM>uTW4g1WHYX*f5B<*dOv(vOD|f$j-b73*knq z=$z>d*eCpTvdElmhO15kGvHiGc4VHbk3pLK_*;)M@b<+N-cft8na;IeSs*O5;-Jrj zw0MRc(&So*fQq4BWt7I4O{-jajgcgdGj76sdq*kHZ2wqVj>Hazivn~0jTJoq0x@ueKRgiI7E0G`$E^Mca_*D<(7apfzmP~?Zypp&+dbM1vOeL50jFV*jN z4^yAY=Me1ns;8=^VlO#zXG)mz&i6C*?QaG|Y`E&UU4_kE$C_2*jKuGai1^kda>j61 zMs({Bg;*sY^C9ibMCVx!<&<<+Ml*23e`{NHYf9GJpO8sx9c42+ki6x;Al%^2V5_wt z$4d#0hgG%3n?SNV8{Vm=!79h`RpFmD(IOUBIs2lPXHE~xyFY5GzJ4*#visyf$gE{y zd0x`=`ma8hrer{qPP6J;8T(Cr)V^q;vvVdJ@jjD1GySh|1|qj^Yv?D-mRPgdx(+{S zZwSUk+&q8`4xaqkEp06uEA)UTa6q}vyxcJ4&)G?t*t(2S(ySlxPCk#B*+wA)-RTcz znKHp|+z(ndt?SV40XAf{obH3b@{gg)2ga>Xe~B?P?}kY^*}mi??|B{O7}fRgzdQf= z&_F1qUh>#tX=;%N_!shyl<9a+xE|^0UH#4n!7360Y6~^gMpz))7nc8J+c{_i!s@?& zAVqb~v4|wd&A_paN&XNWH$B1b5R?>#&50pyZAlIR%g6FPhM+Ais~zdTn9v3=VnTLk z@+ej53$6d-TZ(wR6aY=y0QG-XRGOf>0Gch-_s(GXu<|U22B0KJ7|Vb$m#i_=za698QG}~zWfm<>ygEl{7<3u6E%*&dBx}J^yI(uzMZE<01wQ<6-GTSW>wF# zc>3OBgt>8jB)<=HocXyNxOQ>16p#(+SKoDQQcL##-wzmE(yO~o7n`~NivQ@#IsqB( zcUfZv>b=4;`gDa2R&UE%kpt8nnRTO&pqd@@MY|6C!(jVc2+%8mn^m&>w_K?7nX;5u zO}Zgo?ytwotS>0k7Ab;XO>S8|ELyM`7EAvR-liZ|kY)P*JE~{7^g=DnDb@a(m^K1i zE*OK2R4hxU`sDb-;)Zy)CHA>2X1@zQ-fTl`4PxNvU^iRHclkg1(rVuIDj&YXLAJW$ ziRf+~&Hn!Zr_bXNey2D!SV#osGHa9O&D_ezoQ+lW`DS~^B0WQa`~CbOLtvg7$D{v? zA$2=aPm4Db*e+|#06!%T>$SfV3-g2WKaHhd>GAWM<0XbILH|MsG8CFf*$8AjL!boj5V%a*emXLoLNLT)LJpRThLvT2wM)18EVEoUwD>;dF#c5I= z*u^^wb9y4;eR7(ID)#_K-YXUQw6wRISgX+g30P(-VIi?9Wc~sAAWL>ywHLltayAp+ z;dF5_PVow&1^y<2TR?LgNcj6?XVR*}sxH4Xbjo%8MkE})dBd((-h1x-bId_#J=JAh!xSGBaZG zy~k4=37Y@&xT89&54qvn<3dGKrEU^?qP3`F<>;5$MI+(If;NI_dZ`uo;TIOeVO}#T z*kd&N3en^FNE$`5>BX3p%L`V_T*RQ4F!J7-KJt}zv$+RyEnXx1hR)qRq}%^_#zgX| z$xK}BM&K`T=QM`NqxUe^U3nawtQ z%gs}{B(i?HdX2_$E-vz{JybZ0t;9?y)*7B$N%I!zFM3w__9AWI9%PWraC^ibw*#iz z%->rY$n<30%VLKO^>LZg{D?A6q-Rn`IvgVx(T84;urnP~0%z zweCJ#a}7uM4|ocvYu!yiaL7GaQqO52zH{=StaPnI5-~5E4q#L*KRiehdh0iFD3Y#u zFopr9Q>L38xBgdD-ABT3XuACfGP8Z;k-VoJ4Wmhv%dZtO2MLwGtvcS{>y;(GM_d(> znq3V{NQdYcilC`PluKyi5&4EsK7o4}_9~!+13lzJQx1aQKy#;`4{|zcv>&--RhdzW z^>M-|Ab-9Xzs8?U$Q198q&f{TT3)}%wCD4bAlCqp3A+lgy=*Y7+NlVxZ(WjbWv5wk zZlcKqv7OSDAwG?l{49@z7KUg&RQlNd?J6z>B{=v_^uYXIJgDp$hBCTvT%(116;rR8w3?E zpf{K#Q)0c&A)_m7LG}ReyCN=r$ytw}dTlN8A7B^KcYpK_iLbGte`^o6kAL>OY);Q} zc|wVP!Iy1sW6ods?H+Dsu5FhVcpkv0ZK;2GxNnYJG}($rg0|Owq_SxQHA4j&{}h_l zC<=(MxK__YK8@~t*Ye^DXOVa@PetR6ApC>=6EBcgrjzlP^@V<`V&3`o2RD@c2F*?r zB$o~3Jy5hEaFpP}TqGa0EpdGlvfp9+lw646a_kq;`Pg5e!(a-+wmXb9$AIWp_$7PT zw}DrrQxSc&?s?+C&w|#x8e+#}8D3UjR@C#OFNJkN&4j}0+ATkHS5?VWT9aieB5CWn zI&b)+l5w|o_%b8`iz`vho&kfM1Vq6|1{Z&DE=A%%c~xX~I088#;lPwPSs0X z78U5kut@Wfj;*%NCLLUZSvC1us5Egj&eK%|k`uptCIM zIQNDdpmh&+h-&%`!1Qq{Mo1Y=>M+I^7PJ%4le`203Xi3JpE%d`IiAYBjItfuC|iRy z;EaDNI3GY}JvU7;yhJp8=xDVTLqXQg7|?o`bd8ppUoGxu=11lEe6pnQ*_E?ZW|nhn zI9if++U=Dicnd_nTX8EsaPmV%_tol=^yg5_5UO(|1-g1+jOT@$f9{ke?G3Iy@Hgp1 zu<5Ba;P}de@>?_7Je_V{6_4vZV0bRy^hb_glJNQgjgxu_hifO(w_JG$w4J}`x>nQO>&9opH>qXw*9s|-e#y(9?<`j6Hb*K zlnyz$DM!x?VhcK+F4*c3ha){kKuQ`GrQEme-}vey!=k6jZx9L3JPs3-dz+n}jUj>re@L|bzw<<^Wz zcA`7^c=FI(%m-eC3tKo{BN_`Nx^Ek3$IkL;T^N z3hEWd=X1p-mT{3*Z?TNW!vS#_7m%S(T0EWtk7X;`!_3)zxA70zslDylftZNfW6k@w zEO^T3My}ld+kpziM-0bVT6wB)p|8$OUji;JKk=R6A)1CcprPYO{HAIuDK>wo4EYJ* zrOp;sQV03ao+Ic9U6d;PW*3O@=X$C8G$87Y{>J(B=vte5z(AsJPIb<-uji{qKpb!B z-S*z~;C}Z%*PJ`wQD^!?E_2-Wh-r88{zZWnI7sE+rK-?drE7I%u8f0a%cW=IWyVSR z;kr4pI9Kt?}FV;6v zso=(=0_Wd6O+~ooIqNx-*JEZM3|+Ms^&y%EwS3)naii@zdfNLYI@C~wwy$Vg5on_y z))sXi}Vd9mA?LPs9s7|4{p6h7taS0+LI>eF6K##E&k0vf!- zAlc!GA_D88@zLEOTJwKD zEvk2yMV3)w2MAlaR|d1yH?j-y+LCM&{U)T#d2_oE0?pmKWMcQ)Z{VO!n2v_`^$tA1 z-}eA7scluF+gW?ujM+-F+|h)agTQOraY;AiaTc#BKDPaha#oE+F~5;`$IR2ZoR>Fa zLNaCQ{TSb(S(UW|?&cbL)KUYbUSY@4v;Ku~67}e=NW<(>eWG~TsT2-8Fac(UC^dM2 zVtRQdJYMnV@k%nvsd!F>N+21c>|o>AF$tz_+S1PYuFs;0sgZW$%9;2>q5g zU+klio|D4(og1xUs#=Zqb@Yd}=?S;^NLPvX70>j6h289-R86ZN20$`7` z^WjM#`m4>OR&ruQ6FgaRaAXOwUe09?$BLYpiUZy4Hk>TwD89p5zLZZtl*6&kjiv@6 z=61rqZ1h~x*KkBWzE(h|L$6i5{Pmo+`OxFi^*ipyY5G=X?Ph6jLtEEnUD*=IoZ33w zBuCwWjI@&NZDP1*y-wzsuqtN`xxCvg@1&^fU&y}gjWm#c*OL*T`4*Fw41p~5QxSq_ za)2@Z_*CF*7z#lxG1POu`U*)O5La@G?vlTIcwv|65DzeY!R@JY%|7qy1ZCvFYVn$o z=kh1I;(o`sX7n4WdG5KcoNH-{whFMK8RIyCGIl`^3xs(A9m7r`bhJBh#cl=7UOG-! z<~h6dxt_?o5i3?4UiVCJ)%`Q0>4cO~-6nl!eO%Im!Eco7RAZyf{C`9xuK0t1#vLEB zZqVGc-1zyW%?6vUtl7Bfs@j<|TUPXl);ZF1Vvi35f0vkQA0b$)PJN#-waZT^qEf>o zH1!=#UVlHG-$~RZR(&IT&fX}ZKFG+$RW{BJwotzJaN#|*r|{Dh87@k%b*gOlV>g%d zQ(k7bEmX%)dUE!W<2`3XqPd~9aQ>&>;@QTK zqjdd>`mkoxaJQSMsHgVFNVJOAm*Y<-#?vMvY9NPcsjELOi5ZndHMMURa}OIvpvD5n zV=vkA`iPf88Wq+fJ`Rp}bxDCxM{fBQ`o)jc5p5ZAiNj&M8Gc274FB|L=Wk3sU@sNY zZau5YR^Wl8w^ugKSPshVvGL5Wo~0V-N(&(h#A|WKHyMZE?AxFc&1J6yae+d#v{BNL zLgijF^i2DYz-wdEJHuxjPQI|liM7Rd;>vnNd|735O z;g|-Wz&ntSIY&Kj%pDkjx%131UdzqvXW6|*O3qNGt3684++0K7#AzTS7T59}{r-B! zQ6XBQd|2@JkrALP>QY@3D>>*i9)57EoV@AnuI|T}5#L&~5~HdsXs=zgfwMHbYGTk& zQCieMM{)<&MXvxqXFnvktuarQ?o7fRdZI=&#?S4xD7I!Jhp+JeWR;duU^5d)JX9nj zQqUHR47F{0v^VXt|4MX zc#d84#kHyWYO$Q;ks;x%WBFDF+5NkzCm$yNB^RhOEV;6$g~6Q*j?9^FL% zgV`yy8MgAnXCSnCWt8=$AMLW{0z*XjH)cfYb zAs@7S$6q%|S_FUBqtX@_CozwG;Dgb{){Jlo}Q*qASC^hvV1VhRzyM5JOvQKT-!#~LhAbUwq@u55~gJrPc%E5O$x%O%3o9GxCK{%kj@3Hc1 z`YTJ*(-*yiE&$w5zMgj{OeJ>Q@klk=7TgDA zNYB?Vh$kP3Ne`R;$zgp2D+bw|252Zl_oen^k2_!DnT`YVfcfS0ZWTN~coKvOH_ShS ztoWSDzX0nm*K5MPPqaXv^b^qj=e2=$0sio@FH@3Nm*T8-m|=Zm$})DE6{Q=+czuB;9A^e*BRHOkv??i0>CH|1)SP=BTyqqbUO0mt(uU z_W{0lBa_J|E@ARNQ8r%P4)#%h8AvWiUqF2VRCdNl*J#?R1{>Cg{sAS5A#HHJPV`xX ztr-nQZ_?$apF+CBb|4MiF^FpI^18ZeJ1;Oeca)qqF;imLC#W%uhif^~rX(OsYR1x# zxubcimJuYqkzeH?_zKj$d%f(3#bVADt2^|b5m1kUO|;Ly1X1Zx2lY7^`hz35VRh6& zcu)05x(WK=2p5;&RwEw@5lc)HyksTjqs-<}90KsiXJXS)im*YrmDeKw&q4mQ4tj94 z&yV|d>!F8(4ZZ!>mNcUe4%(KUr)8WIG_-CYEk@90=Hjg&e=Na%53Sv!_wA`975Ej2_=zm(P+?)}8yghBk@8(^Q=H zsJEj=vT&S_a(l8aJV>5xAAaXNk#OE#C&b!)nO(dflLC!3hZQS9mJVz*6KHv{&{ zMpe5`&XMq{$@>`m;2jc^nd!MmGsqqsWrGICfqAVn^Z-78l--~^w|fWuQ0FRd0fK+N zl=P03*tN9-SEjO+ohB=CYD=%N9jLj9DZqncSMy_38e7K0>mi zv$t>bM{$o;@#5BQl%z#u9kj?!wirw(vX^Cybwc(rh?!y5-+j+wsm}A9 z=llAd*ZH$?Z|~20y{_v$7ma!FVV+Q9>AxD_UYy$3aV1lJ#!>C8Wst9(gI8cs=g9Gj zf_tLFYsQ!ub-=Fyeb;ZNN+ONV-LklfVbPy#d&)&9SMUuLi-h5sUh2XP>nvM0egYbO zf+ofDzE@0*$LT&W+N)T1fjMituQYegp>BN!3I@Ym0PH9X{}vu$Foz12QSNxeveLSJ z%M|Shy5tvRhaR7=uSyXH8$+v0S45S>@|PMftlKRxp9mVVfRRKhSc!w)piHS#M(uc^ zRZhw95d=7JU#F;6FdkV&p5QeVeD(zrCT8nY)fkW=GQ5&Cr+SvMk6_{;Z->hM{@ybv zNP~GWF4k!R&+7zl@6ee#6Yr{NGP%o> z-di>hr_>b8r7^#)Zk6?rg|rnqd&D~(-lZh(Wt*2h_yl-;@wQBcPQbi|_p1;mrEGYN z%~6kcj2;TVU%B!?_8G-uC(bSq@J@jx#0rnQ4;*ML1+3Tsf+LN%#Da_$)ygS-ba5N@ zv9kgiF9yvM_;JL5xq9G2HBh(%5@$LhlzJITI;~ZCU8+i~qNRCQH^+ySa&t1nbf$vU3m;mK*rF7JU+gM#E@GhFmn5;yO0O7=C zYt&HqozL=i_v_c_QzdFPANF(bZqa1%06<8u%2mgDs&9C@@#Gui86H2Tt4xo{nn9~H zlkFj`cVK^UknZ{-6!(Gr$(zS^@)H_9n3h)%0aw5haf|W5;phz=V+M0SyBWFPdB-{! z2ra-W|4|@$OOJyZXNh)U2lG&c3~|v6{z}e zih9l4*4}sWJ$HP~nAT80DPR|$DR0IVlC%SExmAv$?_y>Iun)1J zkTE6H7i#V`Sc|@I2HNe8LoOpSI#KGBM~F*jc#%a!^QvP@Y(2|&rS*_f#=H8i=Kb$| zF!EMUQAs`h++=&~U7$_DvByiw`RF*ySR^4#zs)@F`%h0hqAXE+^vFP{h6 z#RQ$=4Wxcvy)40WyukeRMwhBEu)5(jP%+}t8FsuaA_3b0uuFm-Td&?lBqRv6vnnob zNXsjhJb;w-86Se@8+e}p4{=~*!DRkWgXyi#m7Ye70F+Cy*Q}{i+#4ah=T0l8657Ir zR<5aP5dJ7|Yvdfj+A40%Y}v`}TMmM_<}W2%iBVN+m6gDcjlt!p)+V$XfDc=<%Z^^I z7N_hol@50y*UN?|N=(Dw1|{kF;>@dBK`|LtVg^E^`m){g`@EuO*6Cu;Gq{aA|VZuN* z@BDz0*xudnp$o1`vxc9bR}k#Pi5k{2qdP$tUl}O~DH*&TQJ6!k=(DRQWeeSEi3NBg ztJtG2=RV9_d*9PLpL2);(SmU^3G^C^TiwA}VWobL?jsiK&fW#oKi>vCV>P0}^`|Kl zKjHr09DB&JZ3y=kd8-02URKlljLtlb|;7|c@X)ujZz7a!|-I4K7bqt0TPX9pOs3F=QH)PbE^gOBY)$AhojEA{ky` z1oJsk63*D?*u*9bz6N$t*I={&=M{2kZbKXSCDLL4J zTsHbWOJyrNaRU`DhKsC)&Z-oAhR|dpY#60g)&vRjlHo6X5*=WQ&|g;^piGP`?WQi9 z=ow^CpXNb_CO59}dBffPnE47>2tQLLbJULLsjlju@}s;_TSpBjqp}$@nchYi$FB}9 zn+*%!X96h&KrWhTI$|M59^oscPDIt2myBoYz_Wm~Sj!3pzQyI64|udQX3`_as~$Ad z1{vAt-8B9UKlKpM=hwvnXgRBS16HQTnQOCCw;)|IFRPEqSXrO@+GRAFd4&XZz@hHf zZ&>nxcS^S(@M`sV!>}efV|BfmUrb4t9QIFHuNdG} zOupVn?olxF$^=+iY!FgGQMTutG|=9nO|z~mdw9IYqH8>&!XsV)EIj~4D0WU+V?UtT z4>3idU*h~|Z(-w#66!y{Wq~!p139k|10ue5`ur8!p6f9h^#W^=0ZFR?>PhlDsDCK4 z<;%pKcV4B=KKv|C+>XoNwiKrZv&A^do*HX@eDZjJ`fK(Pjl04{+fv+Z z!XSC&baiEQPIS4^g7Sf9+x@wqbw7gm+^DcfrM>Z(6lHzyUnrzODSxey{kd<0W0XCT zb0yAd?9)|ny0XEnFIv zrbPJa)Po{a#2Af8h)iY7cH~&lYu$h|U-RSpr_T=jbq<4h=)$>%_VZMlf9B+c2i{`g zvMp&VpdsACg83u5AS}jew=VB)K)0yV4(H}I__4`2BA{MZt67Vt%lH7zq&wwRrDa#6 zKIq+7dA#XN;i|0XvdlVc0dNaAcs)a^>J3KVmdQ}(FJprpBAT~;-0R&79Mm;Or(_fr zBM_Epv178n?$mW~4{!VZeV&&~4Rd%fisIK!{SxRp9jZ6rK*mX?x{S!5oBaocBT~U11*xD0`v9S>vymwV}1p7syR(Fg#&H0)>;W31Axsw z^Ouyx2U`Z9^*`pqK(1$W>^O{m|EAKyfHfDz_bztCAc4%CoPfTIg4_HrO3FEJ4>R6`QPiVI0R-N2Xa7 z$VMGUwHyO-`Jva-E-HsJN%i$knpGC)L9!pAw>Nq4Z}SZUW4lwqHk5CsG`l-o5KpVZ zzuy#Wca=VF7t!2g$SA6vi0!o}zRhY^{p5N|Ef-k4@>6?ZS;JcZe!=b!oX9RSAS+Xb zoU7kcHyfp5-Dr_I8k^&Qvi^=+laKO*;!Bc5bR_jMTp7_DqXDfWeJWTn=o|U73H_C& zBKjP}WWBT|t%9_`A?k79^9wPK(Fcbz{V*ocGtvDg|L%VYy}okO=#SvVK;R9W`SrHA zn++P@u@{vo%4iwbSh!OpEtwv3OZ#lf&%l6!@tF%KpMd(V>;{`Elm5qqg2{-$q)r{~ z%m}BW6P_HxEZ3vhPKDV=e)!W7bv>fQQ~OM|j`D84;yTerGh{SmwTrUf0<!B{MRpE8M?wA;l3&Nw=z92G#CwgRE)j`_V z6Jc3`z;ReIFW`7)r*{Rj4@*%;vG_DfB*WdVz5~(VOZ}Td@SE9WvjKSZBX>;&w$@NA zdLg}#ChQZ7-ZY;)PrM~jBIiu`*zO1XGkk1msYgI;F82G}6lo#tbxPAjd=%?Db*~xG z?xa6Ot3ZbNZP@nMnw$`_=jf15m$FRQg)%mxjngm%4oapp9aW93ocOsOGOdPJI6(1n z9`&NnR%FgP8SZ`9^s0`6b87T7b&xIiJn39tOH*g?ICQV4E2;O1@4I4Y*@pP#z%7W{ z$xmW@#uAb}krSZ@UQQviyqdoKG_=V2{?HRUBb3AtRO)BHDPTDf@dZ$40a&0#O%+xQ zTWM_<=Yj6B3qfKbr4TP$CmDCI)16HyJPJa5pLAF6Y?$ldOn}#!Ia=;%*_(up^**-z z$_?T;Yyr2Lb?A&&r~kc2M~nF_L2x@e7XsSNTR*Z}5g;&_+tjYhlS|(=*2MYrnG}A) z4U}2<;m0FEN{N5PN-!fcNRiT5=of+_*kPiep$7qMnh2MYKzg+& z3I^%DNZd32dbWMyUZIBiG#3&TLWT^kW|*sYp#&^)`(frd~i3^-}m(p{W-+XwX&IhrJ ze!zn%^>g2H=qhRG@QhR>wTAe7g%G}vwbDehD}S@0}?M_Xau649I7JS!X~E3%Q() z>=vYFatA{i+AZd!%QC5@Zk?HAe`?KfTYM7&*NrITqDqx;|B#f1P5%g{BDm7zxo4*t z%OJTBm&-4Crb_kUK{{b0lJy{B7z|uzE5*x;e)-xHmZ@0Z^XGhk^rXhm0--`F$!fn1 zMi1r070l1QC_CAJ4$6A=nrSzCtOcyP&vD0eUQLrAnjM^lsNp&pGM5~3uxp8hIx|BP z(%oOE!FY_%7e2hhX#4bOTYd!}==aHZJU5i#q4LpG-v4qJzX_}nV2}WJxE&z6EF`mQ z_JN7%xdb>QKSy_wPC3)!DeLM&6q$)rBjfn~##8i)(17r76<0+nX~fbDnTGetcwr@*;EV zQNSgy1Td?c-d$;D2gV}2xfEx)8mJbUMIgo5+2_en4w!oMy=ELcKafyrS!OgrD^?`p zdimxbV=WuH&E~?ryZ|E7{Z@lrwATD*G^u3`>X+6s=u`c$Vp*6derFH;AS6a3&c@b1 z&XlpH{A*xcB%hypcR}x{wvMy3Me3U<|MnCm4QoW&irh{@Y`Kgo@k}*_Oio3(d}SQEZH=FUbh`Uml+$N2yMpdE^sAjIGcE?~qA3FtsiDf!X)&ndbkXMOO^UA#u6Mu<>?z<-q#z zm;SxoNZUC}3yf&xnQm35hmopeX^c-#M6_dDmdzpMu(=)_K4@g`XE`VLg7fCoADbP# zrVWH(uw`B}dZ8J$YPpcw%D{PdK_iY!!c1DiLW=gin05jfaL*ZNq)Fr&-;X-7yJ~6T22Ss_+3J?_Jtc6e1>#0=+tU!;18oKw zR}M{6vs6Ze3Hpape8_P8eFEy96W$hSB7jPovj8G%>S50@}strhNy`&69rOl)*J5*r52&X zLkA4N#McA%Y3cjpEGu;n3N_mbGNG7bI^b+-9|Odqtk}dEAe@7e!O|Yf3=}S9Jh&LI zDGE?ySyQX+gK^Ye@hl0TwbE<^UbgR;&0Xa)GsR*IKwyWTXD^2lj@5rVp6< zX$v<4JiFhodW>+CC9qUA=R5MK)}pj0EA8jQ$QCUND*8 z_3xfS%^TOml*;9FF;D&-)vUReO&$M}aSa|g3`IxQx)fa_zQb}ShUGFkU3l^_(lH`* zz9)CS=q^*6`rjS}T;2&Zf5C$auJgKA1#aVEN%W~OjT=CCdb2m)_Ii|MPw#e2CK&he zR_QIj_6|kFX(?@WKwWXxKC=RR^T1&FSBssedVvsgj>z~Tivup1A)^a+NI+-Jxg?)u z$!h6&HEUC)`Y7penW(Ajm~+r&(=U7*zoHZLsaEau+IN-UBZJd7u;4TEy2sfd3@Ax4 zZFgB5i{<2hxCA6lfNlY#{fz;7o`9VnU1$peB)ng)s#(uBm_aYhN?7+XkSr1FIXgl1 zxoLwD<->jAWlq*Wjhz9$eJlRg;cL!U&=0ahMV~41_xrWM4+4{zz0ygxb55u-C={Ivj1-1uFMU`Hxo=l+oO{n44M0d*GuO|v>i2M+I4$7K@@S}{G zq~^sp{`(FhHj?L;4$eQB*Yjt#AxOv1P1X`T(RzQ)8d}I*qZ}X(RSR0>_#bavHFv>k z(>r$)7CsO(Q0aM+=Yr>4QVVjHLjRsUfs;yBMWHHFuW>PRU?_-BJAS7Yjc>wl>N))* z)gR+1@Ga-4=0!la*%+E+#w;x=LHbPc=uL~Esh)4P|8pdV*{mnPBUFW00?K8WM{nOwdvN~JdHsH_{O1H$H} zvVQ(MNuGreT5^0jSRGJR9ZW>bN9sm_C_6NJa1-IF!AVu(3$k5x4sJhugVUPmk>dgm z0oIRI&3va;1?<==-S%mpp~PcWjt@?ijC$gCu-4PF>P>|OFxqb>ypRg^QHD=zKN6&s_=Tg7e7Hc;&>liKYwD6PJ`mb(f%j2JpXwiZLmBZc& zM%c5Qw&3-}u+uh3%Ve*j@HIx+od^ z{}Eb&PZd}rOp4t!R8NLmoxgF%Rb-SGx0$jYzNLyjYB6={iNU6GPoaT%C)$2r!**MW zZDwaO#nf0%8XzQ(6frj(%qMefM&hsT(&1f$D_g=3IM1;u=+T~TBx=tp#Yxx+dc>{Y;thgj;7?e zPv%et(Eky@dJXe+qWE;w1%I61J$}u8CwuP~=z;fGM**8C7x$1@PU*kZJuITJ)$WBQ zYay3Z`svt|H#zj3j{7!kAtjV3M0(T<4^ZMEaD@?0GBqzd%3P)bM_AWHNd;bK4xJZUa2}@2f55Gtq@GpP~?+ zfi&NIoV_}Z9p*djxnuH#(k`n`R{=)NWhUPuRCjCUYa@9eXyDSFTPax&b92&s*fRgG z!PJE59+?Dw&^@w+ML3Q4g}}$M@*JS24z#~mvQ695Hf@su`>r>dnkrMMaTiU+#~75X z#|b9vmU`6$2OWdHu9dk1W$SelCdqeEq;p`4!Y*17Vk zz!*Qm>7jc1Y0N9&LzDIV%Ses4K9kdI>0gBlRB$`23?y4r(pekLSeicb#X1uJ!s%%J zDf+S&$NfWrYAEYbSX+k}JrbHQ7D&G9(Bn5O7FpZCA8l<3TrwJ<-mtFGwQFS@(rqejtm18xZ4m%}JmEGv;015r>Sv1)4b+GV%fwyHZPVr z3@gH~+P%2v2Wq~o;tV(*I*^# zR%s@vi$iaKD3tCnw;&boeZ9oF-A7&Zg0?gB_;V1A7=S^YP=x68p@Y22T z3@(lE3~^=(Gmh@)q|Uh-WuJ~)^R8LT#gOk8%H@LReIe44^WS6qyyGx0G*_LTd?N2+ zk~94Bv{mSe#MB_*(=}>dvo@FTb;o!0TN&M3GkId~NkD4!zrHO{@#_BnRvm0J$8}Y9 zwOV8{|67IxIrd>on~#mVxn&sn051ojhH%=JppDmXj05~ z9k0J35y%qIm{${8vcRZOR89G1G;ZeNP<_cxoZ-irPr!96C>BuDxM*dS{(NE=NG@@v zg&bN0!eF;O7WqA(5AZ(~&ogz|(*Z>|v()g0;sZECRX`;T2=WLYOlVG#e*whE&_!tN z@w{}@*%P-%j{#Z5 z(H*4O=g1N}FJ@Q=v9+Ah#^SW3?XegzTW8_*Jh}<*w*g#?J^!)hJdsN6VIY4Nw<83i z^|(h06H32#2#69DBZP?&=M_(bUiS84w9l^-u76k6fRb4(fG$TaC#J?9I`GUmxFWF0 z%GV8yF*I39BBYT4Ko7tq7?dsmV^Yn_x4%qTI0@jA?W(`!Y@E;+a?u}VS&efqx3&=- zZU>&ONM3+a?2dm$f9*1!)&}f_61k=OOOC4>!1?u(!1=oYjp02xybDf>xJR$#x@C3R zsKxb*`>ZNDnq%BXx+e${)i!9%jKMjN4}0e4Q@?T>f6cc*rF1a3&ik6zi^C2}g5sfx ztmtJ`O23u9u#O~nEJke{u(nr-q4b@j0!Z)0@$wJp;G$9OKe)FgmjtIjK%~=7Mwk?O zpr2(WKav-;eJ6W(pq5nJehrUJ%Wkg7$o_Mw$O1zC%kCt*-NI}VajFlcO9P~q^gKKM z{c%3pm^U8F1?}I-zJ$+}$fwn!#<(dZ6&b7kSQj&KyPWF!cRO4U?CG7Cd;mFm(wxo| zt}-RYwee+FvD1K04oU>N*R1?LkZW(gQi}h4pb`EZQWOzrCg%TYV=mdYou4_b`XxXw z>ZWtD$|X7QpL@_iW$c_*qe6P;o~N9l>Qd=s715+UGh=}2{XnDzQQflOovw6Rwy$@P z`Hu}O^|=3-P~I;G=C$CVc_(mb+kBZhrU&o`z%r9N)GXk&n*8&6^qo?_$R|Kr9g3ZP zh_$`f{y?%3B@WFK8Z>)Kw0-byUvcMg&e|zfKEjODzWu9Om;K4BB|dq)Y}tM_-Q!0u z{1Oa)EtA#u#3F4wEE!#!^zAg)5%-vVxlbiVi|vK|c;h*!Pk;3Se&`HO9dgHb{f>7{ zSXW>M%M$!%xAK4ebBpmse;U*N(Pb%|8{zdBl;`r#(Y&#_T^)C!C`|VtfCF-C@0g>1 zq8j~__^QM;opI7HXLZVq*A@3)3dw(4Rs6&EA9RL58=MrB{MtS~i)07`ub|} z?1sd_Tmh|rZc;OjFd9wm&zl2CxQT&}BXg9`0UP{p)eSJ_Nd`x5f38EN zVOb&VQNpC;O?k#bV+I8y{vPiHVtm`XWe*h=mU~@;VYEx7o3P>QZHjaOD`z$NLGVn* zzsbOvIprT*?lVpUc|`1{vdVcsQq698{65m&lE?f6wXE+=erLQI%S$bjB7PQoE1=evF0{E;jan^`A{Qj zIC?rfEA;`%?|7thlPG5r$ZXax`r>*E;G?B=3LrOqHgQQEYGMM5O(ytTT7JtW1&P)C zbu5UydRn$*C@-=Wh3oXV+!4JyaYadi4Zz=Gj`A0yw*P&4#hIFcv)a!JcH&Sa#;2Oy zIgGuyvy$7M6O*v7Z_*-zXx;@S(?+WOns{uyX}NRY7gHYSw}q1Z|I09>s_E8VE&3e% zO97wQTQ1rs9n?9*m%SGBIo{Y2Q~OxTdFye0|KQ>`h7(Tn>V)$}tZox?iu8{LwrD)T z7IEcZTdJCH!Ms)k7RgWR2)1%MhAN<2b|Br#WtfV30 zW5Bs+Gt)A*4Ee>%$VNWU$lCWVdhq6WKj1hVvii z6YQiDJR!gi(%*ZK3;EaJ)CZulekqTC4>XY@x^DI!Gzcttn5d<3x7Ve%T`7HbuZjdo zMspX=Irg{5{XZvtgFxEW70JkpM7|4mnj^p0mg0ffnnpevHWawldn_W|w?`wBhMfgqCvW%T0nRC=RMrH76-w6EXK6QE|y|sZEseC%%s2Vg{xV=q1fL@S*T*##X}(}pR<5+M5P!1Igm0`XKlUUU*c*#2i9 zn5D7XRGBE-t@%X&U02{@tl)0#t#{TEFkI{Xv*ks}o;ifDr(7@{S+_rd7XAQz`J*YZ zzov|^3sIJO_TU#}x)#>N^IKO^IZS(GwQ37V?(=QP^`JBPO7K`$;zoyh{qpnO(1hpP zIkaWAErR=7{@3Y-a`%VX^gd58icLhGc=$T{~M2)Jtz zozH1cV<)`E&uTVH&UX+v?Dc4h$dIlw;^x>1a){WrJ}hWkSGGh5hVfXD6n>8sjV+<9W5!@t&Koo zcW@%G+!Ggr#4`M~oV!Wn_vvl206H}M=Nj#i10L@XyJFm?VjEr0<8&pJt3<{IXUEXe zX?b~*9-=I`#m7|5Mw!T|_N{Qa$Y4kJ}d!xk=H1whq$&E#5FJ<3tcyw+005 zwi8GtHHhWz)EjbbnK`uT$(TtGuEp2%gfn! zhferoIiZ1E2hZcJgTXW?Q%-<0xc;9?Xl)UDq84>0I#RJPkE?P}x-Htw#TYsK#i{qk zo0X3lm>Q!2#p#RKt|a^O`LS=YaSE_u!_2HY)Xd|d$g+;J^bp@L?0$N2ld#`AiRtE2 zr=Yuqdy>pjccv&^!Rh{fTYmudvGDxA0$NU^aRZ(XUH&jyvL}()g+UZKb{ZJTL{V-& z*|SN-x7SJSG&X;nq3WPH8dPoK`ge>wb{z43T!3Z?xsVceCJ|T-yHN)|0K8C5dD@fh z(GpJS8XXo20wkn`O22S$2@p&y`v02u()p5ZIsZb@({r{d+hX5v{Ex(5V;n zHNiaju{$xWv72zU&F=9bv=|^)NucmgCAI0NEBb{;^`fe_Sq$>-0MPJg&S-^Shy(io z=5$ilzjiI>9pypt142Wg#Vn;p6%IEZLKI2WPOF8t+0xH(e`%2G7fdCMW0EoI=zZFC%F|_E|b@kX{DrX6sxIM2xsc>`0KW&6Ud^zS^V`$s>0vTg^=x$B&|; zgvin#m(!EE9##R1%x0gv>m}Phnb?&6e{3#2%QhgRou-~wX`v&79(f9=*ue)bqKNnU zxCjYl7HQ_Hl%tTS_>_w#mPDylXX+fG58$&kZU$@oo}5tcm4JN`Abxgu!4K@|X^Ned zrX@#omAE)}FZUcWzn*h-xKUun4#!Iypa+;w9g}TGHbFYx{N1DXgL0}yJ0pG3#>)ld z#*#r}RQz3lq14#drDQkWk1n*}6TrbP7gTD#6d}b|*K3^*?8=1SqNib3MzQ)M-pJ?yg$Kl zu)MKYR{@HDC?LuPE$xZI^(GYgeQG76GY@6LE}#lZNRbR>FI@4B8USCje#)92ry_&v z;rG)!XfWID376Hh9+=CaOXJQR0ldwrtq&1hIYareq9LutxOi7oq#*}HDRX^Goi|}Mozg6>MF&X8;wcVY{ySL?<5qqwK>3$XcFa) zy9Ler<~hmbpGox)a+6STGrTYVQ)m$7e)lWO#=}$hJ)=t|l2aQH$Q?MtWx(z4Ic-Rl z?Afc;9+u?grbcQV-w1E+DjZD14nTi$FhJ)KnBW$dJ`P^D)Zg8{v3mT>pS9~a*W^p#2ag6 zet&zdUG2KVg=mv+=%{-7XKR>nsC&No+LjBl)QqcNGlW8eP&>?@6uK!o-}6+o2(fU7 zq}UBscMbZa_b{$?w@gP>E1{E|GA2lUI!fmLmBJO`4>#B()DH5e(|0oH#yFSbL4hUK zme}RVE__2&si%2u{8!}M!3j8!zk>2FfR2t>L&MyUQRP|gV5;0~ikrmgfjgStAtL@= z@N!@3==4yRAat+O@gQI3zYf#=)a7mz>*(fQidYf426?$d@vHJpRD-;{7okZ7#iJIc zl)zka4f6WGe=x{US5$@q8{kfiUO1CtB0h}x+}&N^IXYFV=~X9a71XrK?{3=v43 z#0IEeB|IMcSYDZUx|^&D!Gz9L{m`2Rzb7cbaOmhu%7XzvwPuD9x=4V0&?PfV?W;By zE$0UwMS1H)*$Kf200@j=&cAQ!ucLiB9i;XgF|LF3GDIn)9FMD0Q~eqwv1u#e=CThQYV&Ldh~RxB$ZU{>iDz$24glv_ z0qDqmfX@VPeNW9{c~ZYL(ZhH=1g1dAIg2%~SRWhe=MxX#T%h6wEgR(> z+ApBC5lDzwCRTZ;7qJ&XpxyBt6rdef!iL(=dXoCDEyD3?Cm(Ad8>ri8%6z&{QRxN}e-s8$Qf?;*dwC{*vi4|nzi=RN72KkP@vrfVMZf|h3EuR+SiU1Gac)Z5Jyr(HWH zPo*4jS9XjS$Zz-{F`j>;e=L*MHy3w0-@hZnemh zibYjAAqRO2Cu9V-Z3rqKe9gH5$(7TadrEaQuvESC1(_a^8a1jUdpq2ED#SiyZ7O&Z ziyG(FUWM*PW`{||SqGEZ4<5GW^GK4#MN0j43TjV|zbq*_Gqoy?taX5##8Zsk>*NNU4lV>=LFBTM?1d^;vf3fUJ~h?cKG_ z#!XVB%TL|DanI`b3)`>iK>K}R-W>?!Io}}%)vX2ss%Q$hCq8}{ z5#5cER3F$$Z0A;FraT$~^)nsg_Od1t1kt=9d1@~*c|30JVN>wVYWA1we!6TPDj>H*J*OEQYKp z#5uvPZe5G?UeLCCu;JZg*Y^1rQ*gz z7sPpZ4R`A-r8gbqaqJav-&P2cPW)G(%88af05>%VOSlyr)I8eYCV zFD1pE1?tIVp-XSvbZ4{`dzZt;3fab=TlX=^?#iHD3W_({`|sr$z)zppHmS3OqS)12 z>y^TZmxKZ?i`Ai0qU@VKw+4cdCFFe9w#s>R&uSncYuVDZthtXAiD@cuWS^jw`>_NF zjj0h7rt}@>iYS_srkDBEj4Nr?K}Y({kGJa?g;0-*O(wY+OBAfUVP&NFcdv|pT<{)g{($|=3DW|Y&fc`z`RifIAmFA;Byqzx z7XC(F@Z+xhWHjm0P}jq(RL^~UE>DFDoc44rXZA?5?3T$L`aRpwSUhF2+gQSQE+y-g-8UB$ z)5)(a?=skr?IaR1C;KZCtc z`&id4h#XA`*Jl-2kQ;d*QBVH*AMQcNGQ_9X@Dinrb;^tkIJaR4*eih-q8~RJ)42{B z5+K|I01;ic@Mr@x8Gx5?kIP?`Mc!NCP`{q0)tLcEOI4bcXT%+42cGX~00%M&J&@^D zsUZkevizKPD1#^&LeQ@vaM$D0qexEDM;LFtZAeuuX_KS|;q2s%+(rSmt7D=FY*t+&rDX43(wDH?zxbbw}goXb%SEKu4WBKWr|K%Q(jN$u%F`XUo-+)RX8l z1vIUzmJiojnW=8v{Dg@oXQH3xhi7sA<%OpUbCPS<$#KcmC1{t!gt!;Gg(+9kve@57DoaNfQ2Wf0=o97x6v+qHDoYCPS3 zDz4E)i9G1@d6%x;xUE9-FG2W&Wo40iqtNV}XT|K=fR*zE)&)jhq9Rt<)N7PN zyql8|xiw!602HvyUIu7Q`2|_@^bKKT2I9`_Fz`xC97rtU)Ya<}do;WkC(-Wguj)@OM6Yhc-v*A-m;3xaOvzM*}`5slR0 zk8@V9tT`{;Aj^IP2Pbef8(ZagCURW~*0MTk%3ZOZ-RF7N1pTyiIy+Lrj9y@svy=0y zM!B0kY5FuvVsciy`nTkaa>Ku)HnZiDFD*}LSM@5xg&u$#VD7)-9Md@K2H=?X2fcJJ zx83@!H=PoAOl(+(vtZ;Vj*9iP{s}1@=@ZP@+OwQfm-()<8;bF3-UNH%CaWPZMZw}SQt~yQBUA%H+@Xp7X{x2Uzyuy_@ya1 zAcRN%z)qD)!XIU`f#=wf+nqH2^=%{N(~vUlXbTm5PX*5Tmq7n+rpabBd2c zBZqJG#-1l)h(8L_vy%eM#KuD!i)n?Q* z)|Jc3h%%gaM_iXJix6`_9g2>kIXP#*2|*F#LeQtfMyy6nWUeSJyAz5CcS3%H+`3qp zv;)w4zNhz?QnMh&=J1aC3Srs?FK34z9!?tnJX}#oeEM2xz09OwbBUGFSbX5IK--{W z8vuP;3qUWL14n;#5&bekL~WMlW7qRRAEU^_?h-||q?LL%SR1Filu9IsuSG_2t9%ti zr>_mLKJr3zF<_xG#nw48%HN^Pxa|~QXD7#gbQ{6b7FGzJ)oeF|h$D4Sz-O_sjEgp+ zGQt!GfAIOMF*?B>1Fv5Y`wwjVEPu1?k!PX1%cKBeA8A)pSy>j4Q!U%4j9&y!+e4o$ z6H=eh@12rkAC|c)vH%{*0Xr5ud6{r$xI1B5RI1R zbwdauE&#v$PfphNveG9flKSGfRFK}1UtP}$&v26)+Ko(R zkHuE2xt5?^Jyt)A?0&(Y;CD?uhDTh7JIsFUd!^TXx}K%J+LL49xC-fBye0fogaI zE9Bb!y)W~uMm%fwTK57UL(JekcFlTv_z`(VW+rXjPv4dC+V#;4NjFkU3aID|i6K;R zt0BO{XR0w+JXTa3lZC0yS&RA_`+3XJc`ohodXSPs`# zl6^!a*3rdi#jarNBi>u~1~Zf;F;;jH9sVhS`T#?NkmKo#9wACs;u&Afnv^mQc`e$G zSmqpfA{KZHuRPwEL;^-sQf}FXeCh#-nlqHy{ zG}Z2{ef#M;o2918=?Pv`K+A)%qlk*P!m<+B!1iQ#J$+ z=Cj47(B${5$eyx>-|I;r8j^$Y>yt@&PK=7l%Qs#pdw1EaS18%L?)pm)3oeg*tT^WP z00dQIOkJ8ZSgPcVT^~Lexg=Jrp|b3`7}%Sm5W4W>yxlUE#Nw zjv86$YMVRMU#61Bd`g-L&T&^%WtQF`LU!1<|2XU89;6xdwY__b_1QiLMHwylQA+8u zzc=s#%0rydL<#sD>J*B0)HrOytON$Nxq__u>_UCnAV_!Q4c5x%aP$tYETqGowt9-k zSB^Dk2KBMNzTTc05{Q9Q8Y4sX7Swpiuc9{%G5$k>l0BYeP~Pj6zEtd#z|m3n)|zz3 z#FwEVY-x4%@RUCz#6yib$0r^-;_K|}oPN4}-e<$c^LbUy1+6MJ4;TcO9OLBhkLeGI z5f0DWsWBGVDH<_9Z3EFM0dw^tCnsl7nXXZtW$T(e@v(k1_K=(Z(!L92`=WW`0ajW{1|I#!h{<{u^DDMA7j1c$Q87O{=SFWpoNi1d(B>?uqf1WD95ab+EkIv?4U z?qqk_Z+cF}Q_k4aX`(J9_ROaQA*}2Qx=_26c7~qDdJ+^k@n^+FRq8$S7ukU8hv}$u4iLr#?`Ku3_Wt8!3Bc!BUdhkcu66`MYDC4SZ@#&nUEL` zy)G-ey8bOjxY<1C{d!X64Ra$GVhD03$$w4cDQ+I=GTj`$?A7?QnmTS9{ z|ExmhUFWym1NG%de7*lN&y*XbG0>zEbE!-Z1Q&gaz~k-sf<~?k;C6$wT0VD#c_JcD zQtMQO^_$2GiV#sMcTy3Qt$EBuAmtAHP= z5Ikjs+ftkYt4PZv*5@EGG&WYu&E@3Sj(7OgFhKqsf^I*j))r~vPt**1U0UifBk^t?zx0n~BLH z2KjbO4SlLEgFU(Ov~z!M@Zsr8`|k->e&Qlhj5EQuZO*684J&$*hix9c0ruZG)2j03 z@0h1gpO(9oa=(D_@xu7K%NiOERP>f{-5Ypk5YOZ-O%^Mx->27E_mxD7fjw}q99yxU z-c!1)SE+=qlqCqZh$-J-sYjXaP>Ux?_Q!YV{Ui93N15CF_Zr9HC*mZfNG2o?!p-rjFRpkgP|9 z@@y5oB8o-Lk>6h7iVbka)X=LFLGb&*s{MQG!gD@^<%rHu^LMxVpiMU+J{z0<1I zwXh}4XSXS4Nk_O3?@b6${eEeEBlW7){{3;UmdWdbkTtcF=3PTX>W}?nCx>5C1j$02 zVvcsA)RCM?T^GH@A$4W;58C^VQlSC;TOrBdZ1IDyG`_u58Q`joF{G_$ZY6))bJZFs zPfN*<10@bZsFwANyE~0-T#w6J5_yJBQ?z8jqc`q%GxdUoICxm*)F9TdF6`9QEoCI(r@)X|(MZU{_;r6QE~c}RDAzvduYF6HDj zAz)*tF1KqFHWo_mvcqqcE&llNE9w<0T8%xbd)|j?{_%za)72P9a9`h1FSz+61=vqA zOBxBTwaW1s%BVIodi6*?)iz)UTi=_}k-l54WN2s`hO2&~b|LOr*jf;@lj`v{kN{Q% zNilMP+1JC#X+fckl$jERRi5{$6Q55#nHG~5C#(`4wOzND?0Hx6v&dWfTB1^$mSgJ0 zm2?Bb;PClAu{*!A!xSSE!Q|dC4Ui5F4p#B;F|3BFr(P#Wv4~zzuyi^BfnoKL)Zdd) z#lxj0!?t2?2mP`T<05Q=aqeKO=yXLca>g}p?TjYN`y0}e5-ztl=V%biJrn1^5GAoU zm)t#iuMmt)CTxirg(b4DGK>5k%XD(JUHYH5n48Q&X+pRACEq#&pghTDquG1?5 z4!wI0qvr_9nAhj<3By8KvZ7mv?pJLdvygxCLRuj?uk1-6wx`-06vW@t4BE#oV{d zMJ`z!rDrj;x>DaAnFvP|S~67;+=;s(JuTlp48OsdF!K1F-A6_KNsIw7HOOl<_CU0_ zI#K;Wu$ia*0t3spu~U4i5xL;CG%74xZkMvNPrf4Zc+T8*wanK~b7y6n)lti%QH^AW3)$-`~`S4&grGp_ZUy=A+ApeBX2CP?n(VVh1d26^ZA?? zYuJ*bTX-^whTq^w7~#7*OqfWOjZ2dd8nNmxsV@#@ax?1d2|Du60z^z%w)mwlpJ!%N#j;ok8x7&^zSk7F zQ8*ZCNnt6b+OSnw4L0@j z^K%C}QZ1uu&dC*vw+KE<*oh58`Lofves*~!ccZbS=P08D?F%>0GHntbY}M+&6J+&q zX?WV7TOSRcBj$>Yu)Ib%Q;=@P&&C$XjyKWQO*j*7*6l2hG+EcbdOEuYLrgX^tnjAllg)`rG{Fc&m1DdmYzs|Xv(SguVKb+2jjbkQ~N1`K+iN}2>* z?)aFdsXiR9~DO4B2h2i8eH5yZAyIpBh!FD(njN+_8)1(C&J7Q zBU|H8C9U9kWxy(auCdOS4gIy}&zWOa@3@#DA>!T9y^1pic8&R=iCnFer|5q2!wl;lG$hSjyu*bo}D|;L6`BDWQpi>M)vrb zX0uNRMf*he)@FFL3IzbJBw6aBoQseR@W`DKzHj#u7l3H*xyH{o4j0M)~HNcbUAvggv#V z$tvQELKz7%)fOkPmQ-W9d+8w7u<0W)h9pB#4~B7HHfpvhSsmR~rrYjnYme48t^iu< zwK#yO;sQg9jN9J#a1LcL&t@PWjKHNqYTV>eHtcue=lE3qQ3XH0B=Q z`gX^$Z7=s( ze$x;Y{D>)Kw*Z@6*&Z%$yhMRZD^xAr)9ReKq$&LMPC1EAXvf(!5f&-;G%*PYY%6X1 zsr+?ZQgIYM4R|stuEwiUh-`k}7);ZQLM^nUKEq2NGmgivuqmOQuqWKS#gQ5se{s8I z1p!rmZ07Z?UC{~D9G&2pRmd6gY_!{58Iv=8ed}iy%N|tyKF5D2d^+cb)n(i&w@cp)l5N(Zf6Z6HPueL|1wugGPjRo3uUv%6>~Rwc$qnd4p4Vl&fg9Jx=rGk8z?6 z1+~)bp%Yt;A0I|X2RMqQ-|ue+S+7@bstym1yxqG(%CVwR{garv@Xd}aj`Hj(hy1%K z@%)Sj6cm?)#0M2#a34< zTv8xuz4h9vK}t4oZ9?3hG5e0BWBP*;%-YJ**ubqA=sW}S*5;>ApK|Ny)ATQr2=L|N zPHKdZEk6*@e62=6$hiAx@~NMvg{f=F=;3UC^XS&=^@}evd2Zw?9$mz3r6B6AYu`fW zxqe*Go^5*7N|Ij~S1t~h z7**NSaCQ9^QOBp|$Svg;LsGc3ReJea&5emRClA<;+iXYN6;)N$9;~SL>U;~macYm^ zjF{PH9e-LP5z@_T*Lbsa$5}Rs&OU*gb3|FLO>VZebfF>Ztfs8pGcJ2Q%ik4CcW&ag z*1WvDrcLmadHD`iW-VI9RBhM4`B0Rk_C$O;FBV>hHN%jBG;Fi}_ZyM{y$1R;5t0GQ zu6duy&35pqRd`I>a}`q)$W*$X^z&#CASyHUES@svcuI&@>uL3FhgNyQ?CLyX*|a-i zp0b#txK$I|tbj)R?4nKc1|z)*yqF~&Saw8rnBGtQ`SWh)<-0Kta96~dUlbQFYLu3i z9`*A;k4%9cJZC2_GrkjqZkjNC>7HqfCzq&szS|gl>C&a}GEyFJUSX8LX^jOcZSVvxH)zZ zWB$L13wz8-9eEtY>Z8$X_5?3r1Ux3q--4Vf*I5+yC{j# z!!a!$C&x#DlR>j_yDzUp`nB~94Y(?z>T`y171F5m3m!zSxx0-$a@Ve{+&D#8M)vKf zwYBBA5t~46eP6CHMS;mZdyatRg5zV0o7Ry>`OZ|31P?_~k37x-6IZ9co9LBXY>z!v zq_BDM_`ct@BPLUrg9aF-&T_41Q#BGeDszz{?6KEk%j|`iOuSfnuErpQTddvrgHbI%&calPArxfl%F?uu zjFy#^)f6VxIwY7ey3}VS@}bV%6Y`;Z_dl?wwJWfT7?2m7)olBbzDXR}i-uQ^ajs_O zi=Hx*_ede`*O#Dy9<}f9EDN8$muEEsTQzLHoN=loez(yyz|U_KM@H8D6n+f_5>jS| zUQ}+d*6072EIMtPvnLrSdlekzyn8D*60sw%9DXfVipWW4oDx{FDE13M zgH@}sXT#|=*;3*4qv+P_q`NRdxo2D7RYY8OQe7G{^q?;q#a=;RaL&PGKry~ z#{kw4UkqNCGCyffc2cW?2Qy-%3I-Qz8|e91z?2i=^;Y$%8t3U=HFc*&3PpcS1-tua z!bbEuN7pa+JI4M#Yu4F>zd?LA^cq@M7zD)bK)9{PYT{oHr1*mRsp(=0lSgs^7Ln`b z;js!}5+o@|K*|m8{5m7c>aAh?zKoH?3HT8Z@O9rqN)XXMe($sR%ZwAmfg06@>(yiw z2UDj(AS-cI_Vh&J(uzCUuHD2if;Z#Tx334s=RL`jX*gUiKj08{eE${M^sY5u^Q&JnNZ1o}NlJr7?c8I>_>{Nrfmq_-REdWYwZA0#pxaUpF4_t9qV> zkheO2&M)Vz+gxs!d(JddurVT@d>)0Jh~-H5W`D?ah9ou6FTl}?27<5P$HxP!dvluF z_;y73?>jRD8N7BdxJfdw*)X)z`Uq=i!$Td)vgg$_ZKUwsv*H&@KOxAdA zcH4eazK$=mZ@-MhR)hV@3mO)wUbJU~F_G}?Y2p2fr+)i^V(HY87*a@wj{-AI8CPc* zt#@6#^$`!iHhd=-A6-IWW1kQcU#R2Q2y3TT7vB{gDkFt%xA_MIc%o5KZvhcw<2YBr0GR}*jbb+JpS=b)2=xiB%= zkrxChhNiEP85R#k)-yxMCq4FJdi%=WrPRMy{2Gz3t!@oI2RiFe5d8C7)Ujf=Zn?i5 zKnc_>c(xvq(1yNvk?%|@gVGKlyn6H7CaL`Rr0tc zrk@=<5SrNH;-c)0YoV!Dt=2`Md;kFJv==)ZW`gvGYZQOY6k-mnjfuE#0HjdvOC0Lf z8OW*7B`_)Kl^AY^J~qaF`N7`e(5tkyo-G3rJjB!^Ze< zB&5WQkQgREKsZd&0T8esz@Su%YmWtxnf}iKdN*&|E9?27WB2xAB`?4-5=9j}NrXf@ zoTW)^!Taw6TVYloWe}y#6S~SqNE9VMiaS=Zz>->i_jy$|tE~VbCTMbfdiJ!1{oPce zXDSN}()W#y4Q`_$G7)0H1*ozUb}xah@;y!eOzenWJz-t0Kc7eviQ zI4184FM1&WUa0|8)Hq%xU!;d|E5M_-VJ>aQG2OQGkAs})sk2m$ zc(YnYk|UhF@XQTiSPu=SYSid?81o5#^Zdg-WcflP8d&3aA3p)W&{xQw(T4$dq-Hio;z%8Xw?+f~_FdC6 z&U+Ab!L%HuA3oxdER?5P7w;H6 zTlMK)&axEI*{@zejJXY>e_jsYw-(cm!wNwZ;tgv1bnxA2W=3BpfIrqaGei0@057}8 zg9|k&+CdxQ_fXbX`>Mu~ly9|Qi(d8r44}n+R8KOnYz3l-!h$1xZ5fm1$d5;R(~(}L zrlyP@FaXShI+&U=ouvyX3Au%%Ukh4a9eh2ef2EldwO#5-9m^tDn|9u(Zaw`+c`Cdb zFO2JF(~hha3Rt6T-&oV(@g)R?X__E|%ve7tPsnfL|K?WEg22NXXo?K?wAq__ceydmfLQqbvWz<(6%#Kfb z1RDEtfEbB?V+vbzA`x zF!t4G7bE3|7th;$ZRop51Yf1xTb))~>|pV_7$7Nfm1Ka?1CK2Zo*AvM6PsIj5@MWO zW5iT7>D=@|+EE+S3jMA%apI|=IDUY|fQ;>en_UXxm*w|QVR#nW8~h4Tk@yF88HJ=S z`9%aM3+jproTGF~7YQ3e!(RlM<8PWFCwY&Kauz%;F*EPiT`Y=5SPpCI5y?iM)Lg9nQcur#0p=15V$=0b<&|73ikYF&y!}U5n@-f)8QiY9 zlA#a-TbI4qZj~|7Ofun^dy2>e>E`Xo8s>0P<@!3X`IfC>a%@8AkVcow^W(MHSHUqO z%nktQEh%h2Y~Iqt!=7pio-!GCqbRAVy<@V^%l(FQfY=${!I+I(u;Dp~@-=46vBN6X zN=Ust2gi(6)3H7vxlD(rEIBm>o(#NoMuL^{+55yQOb5xHv7_%7R_T{&Vq z);)Qz!UrQCx!&L#Y>11Lr6>Ic3)01%u8t^sNB=zfKo7?yFN$;f<#6QtR>XSDzA#2U zHc5bI_}CGuzoOj>K4yzIHO?aiD)sQ643k;~sPG@{4K-u2^&NRS~%u1aX;v60-fHwas@Mq{}@cr<` zvZn%&q$3>f=@N=)5)DmW7{gDwyTl8n1g=lFL|$McIh~ai$0A)rO-(KI>`k3M{&Ko` zQJZ(7ko|>jnG)_W#O!xv`07{&qEOiXpBX=c*Q?c=UO$h#W?wLdvziQj{w1VEsB({~ zG&e zUQQwBlMh#hifCwj2z0T6};UOFszzvP|Aosc=?&J!M66gSnTlbeVIMdSBnQ~i{WfM2mp$Kpb>8;Sk0;bw9fE>_GDtdH zuIlI}xipAm@!;Z^3~|W|I{cObxXdd!G(&J1wsWgcjaA$tW0mN(N{U5*&2Kgn<{avWIjmQ<1{$^il!YVj>5sf z?*7IPY{c%K0=E=NcjQBw@E0+k_;SdDF?l~!a>Gh#P?*fM&WXnrZ=AT!_HW4A!8no8 zGi2|gJkon{R{zLEVQi%iwXOsZJAf8@GGVMUbqgcEA#V5n67F7?XTO+&?^PODXOnUB0a}3}#zZXz?cQpj8dBS^`2a+%!ik!VS}cPCWQQhV!}Ne_aa-kL zQq)Yg`m%+?VIQb14?6FsQcg~;r>@#~b8ooc2ig8J7GgVf_PEC+15O2*mrPoPqdF|{ zV`Fv0Xij`%uhha8wJJTfF~k? zm#DP7`h_FrL!%&S!8u()uFm!Yb+M8aVlyaWpT1tfK3B zbZz!PFjiD>E-EBShxd6Ys4ge#IY&`6D31%hUpPdG*%=n|FP6yhf{;#C zdpx5&M4M79DoLQsu~%a9D&)ltyClG`>D=3o0#hCc@f1K;no_|25r<(Y9h9@KDUhAB z)=>fSoOIUHG)+?5jbF3?24oeky1OyYpH*wXX7Fux#e0;|ORvaE#awH=*BYVg$Q+_2W_&vInU?KGR&N-%w zT>N6SqMvI&Tmkajz_*n=f6#RRoNmSEY7LtUqfg>{><1@)oPm%@5(U_ZxnJox{bi3z zy{6icHH3NRd^7h)6uOKgLTj07?)PEBzgtMaw2Av7Okup8R4dDu7Po22Ub`qLD8%$` zY;1nsO6mUQn%;1CAgZz}hLs4S@rYm9s%5gP5yXwtM}JKrV+-3T1io&!3htIcGT^1j zek5rMYbn?BxIVJ*g4Qh_m z3JpCVE+gr90B61rDzW+z3A?BLT78+e%qR-jd`#L$LH*Y^GV-J@XW`0~C=*PIKxyh- z_49C=3L@VIk_wNU2YP{Zt0U@%y=oK%xzBRj!AX=+4xO3@*!5l=JtMG@)Cjin{ByO9 z9aNoL-v)tf9$JlUc>czJdAX~X8<9_WZ_D9sVA)~V)daPttGJ}TsuvnWtq)}R4sstl zC~ZGlMT^q%Pe*ocHRje-SKqBt(SR-5bm4xy0C^*MT(HR>q6JCE_1zXmVTuB$ZrW!S z*0WLAF(>L51YPOXA~$Q-Si`Q9It~-rPVI? zxP40{XENX$+MgT(3ScFJbu7t%QWD$1bUnSyJMr(5tDulSi?~hjEeUYf3!hrNxxMen z3m?~WW*=*t+Q$A#v`SMSG)LA@wpYcDIQ8Im-N*b=u;K;WtFw?q0UUpJfHmp!c9BzP zDcjDynSKtt0DG}?UhVicLI$bCr8J0p3#4c5Yl<0MlmpI^0wqB@IXSryZ0_6R)`(mw zIx!3wid;n`za#Kz!^6W1U)lZ?;zXIS_}0+8Mud#H6EDMD!pa2n8&<4bSL2A;lGJ)$ zNVzlHv2L|(7@#%fYXaA&vZbejX1x~^`C?SA?kURVl=}Z!$Q0jl7Teo@wk)J_j0!e= z0y1P9vF|v;?Cf0c^8&4;BgABX0G(|fvX@gl}1%n0wdI5|LzyiZr&dvmi-kWI{r{m^~5iOgPS3h zskpTYWpTiFZE9)?CC?ld&c&6d9Niv4w^EQ8zDNBtE@tN;fWDlpqL^zz_1j)syC-aV z&*Qej4TfPV`$Q|sSCyY@oGcc4bp3O-Yxh4dj^B`Cyvtt}yrRudR*fFM9!%M8TiP0ILRP|KJP=A!yw~ zPywA$bEq2Y0u<%V`*~`+{8z*zweKkxr+&B{Lo#MY&uBgu>~HH{tChJJBEfnfn?W`& z+b=k)7_7UkmAA5E?;g8ol4H6Qo=&S!zMW=UF)HVKJ8%6@$!q^~tM-qzHS0x}qbp$V z=rqrefrAa`ZfMbUUH^cHVH3F7&i1wr+r^7n89F?L2wClWof6|*L%JsPw^wg{FVwot z?~(f1wpI`AEoTCY%XWJvWo6#xnaV@U@uQe%ym;PgBaYCDs z3ZU@SAc)FH?sGiiH+tF2$jpqu>o1eN<4V%e9r^GrxpgbUp{#35p2d0f8yCmdFVW_i z&0I!{PGshxH*5VS5+ij|SEYWXXl`Z;m8V{4vNx;Y^>`F8A5+Ppcf2Zm%&J~WHh=f1 ztP=Kn{hBee%axOQ!yx&!JQ6h)zEx=@cX?bi;ygk>`Q#&q5;fV4%l+jKAI5k6ybXuV z8cgp!+&?&=br54ZkWGj80m{giPPf@mVAa?YE}sS#9}wsSO2vzfU9(?-xKEZ|)3o#6 zPpN;`7%Izv6id7$$>s#^`De|OfkKC2UTo~bSkE!IViv*ZBScKN2BK34u12Q`_%nc& ztIQ7gHvk+Y`4dh<`UI{$`1#*2{2$06FDv%9zGAMI1!zqe030X%vz247rza@Nev^)#q(!G{4aQ&_sAQI+BGddg-mC^2wc ziWaRb`NB*f2FII`5n^s(u?LElQ1Wy~9E(MCbhJ75qnF7eUg+YN&Q#t$7v4D`G02q!*%K5_aF~vl^Sh~yjG9DI7`_~4Fjq}7jvhbsu5OeRP6;JOK zC7`)fnh=5hY|3vpb$RugY_#QfDWZzYfAt*ov@2#;_r*@BxjBeOP7q!bQh*x^j)b;6 zrYw=TP4eo4Pu`ixN{~nWb21E+8|;7nw4%V&cK#x8_H{tLw8&|<>}~!7BC}2_-jAqS z&B&T@5*^0B!ZNXcD5SG8HYgV-dXlYM$QB3+q|7O}g@w>Nzn1jf4ibe-wHj2+2Rw-d zqW-S^{5a?8>EQhTKvesH6H_VOF#*Ysp#gb#l*EWfkpRKlT(STbv4}&jyX`w!M;cqt zueGiu-suK__PhhwWgh(qsE=fcJAJ~?!^=04L*fjUXvD%DvFD4d|N1J|TL!QtReai& zZmH>(*<;WpQ2XkYpx-zVB)Yt~Xl5V%FjZ-J(;{@&w{ntni2m>5{6D0r(i^TP2BeC9 zzdF6Q?gDrZ^B^J9MbYE}WkT<+6egEH3xB=pgqDIyKK;8sVi~?wnYa$D%Y9@x$_RraQ3+<=>|n<;=D(p)VzdAIS^NYRF?EI8Zx@wiUm~Q%_)z zv;hTPcv6;L28V79E_;CUb;$M2>9ykXs1K(`8i78Aiy-J@Pk=etDRJ&-jTx*asLch0 zs$%pz#A*R`;v+yGF&ae3H%`|cK75$kdHmcjV9?rDFyFU07KfG^R3wFm{XKwrmr0XH zR68^IP)?+p^f4U zS->GdYX0j;tU{%C4Vz1q#=T{uf!*%5klcmf1Bd)0Z11{)-;dA7l5QiT2~yDwGx!$Zp{}%#d39(>Bcw?O`3Q5%zp(SP|o}tY+s0K9gC?&4USB(lS81i_9vR7ynT_Ys>J&DN1`!~J%k*)oy8vhv%tH&p&sQH z(>7G;K}Org8)*l`^iZ)8ZTYQ=wq{cXnyVn0H+rd)E-EiCZMQieK0gvkwyWi|^Cxo-PrQ ze=c7x;l;-3tI;NMvF7W@-qG{e)lmC~pm#1lBF@E5Wip<59I!eWQ>zD&B;t$W{_%*ep7m%FR+5DH}0z z$oEte&KfX#=9IEGA5%1s4v)#uhVvv5M#0)Ig; z|NS<>e?pnG+y4hH`~Q1vLvZ@92lfTULIg4Zvgf#xWH;J3p!n4l0ww!%e7v}ZD`-R$ zFCczU$JJ?`UWzP1*PGN(YtVu(KXGodI{qD~UhHP!h_mMU_$Dw|`3*mw9Qv75E!y$w zZ=~>xyL5d1_S9_2Sx_^%xL79DVaX}nc9Th1$OCla*j_T|m?*2B61hk+-3#6 z4|p+T6LKfWp=V|6O7W*pBY>Nr%^76?@kxIIIgEG#<1n9-rcLj^31(`_ryN9*T04t< zJwM>RwenLGO!BVY#HGn)l9C>Wg3d)Y0S{TNERGM(GOGWTkQ8;$Y37y}7CME{k$3@K zTQvYH9F}ZdEGGdU`f*~771LIDC>wF*lt6>}&)o_lz`u0}ul=M}p$?Pwg-h zI!gy^&DZU?f$ynOFlZ@8^dWX6FbXlrKYR)FBGuaw%Ew#O_R;(yNTP62h<^WDLKHiOmhNjVpil)_*k21D zTcQFM@WiDWYHHZ3E`9#|SxmN7NH|-|#I;ywykUQ{LL3qaz{zegIX7L&)?N1=FJVQU z`*X1V$v8@wsR}qNQV%|*i!X!$Zm1wdiTN^y-WYg)-{%?tgyk4pS9;FvmjWwV@Ze{N z*>ey}=kyG{arr-FXhH^L2mr0AdF|Az6!ed^V?{3@G@CTrmU`w-_U0?=WJAtDL!}%P zSxTwl)4Te`9yy}p++m7u{Fg^G>`(ZNc0dUBKQ$tobl?J^6Q<~v&{gy)e5L*}rZUM4 zG-JjtB?DMIFMwKmocpV9!wRleYy2vQpM{Ohbd68s5JHmUKPEPe1QP=#8BpPStdO+C z?{8f+^t*CPR!=Hh*h6_y8Pb>CB~_*EQas=|A5ANW3+1D3U-kXo8*KmK$@vdIIO1ad zV_xS`+uVd2aa~Kxi6zDBT~Y*CsWun(swiR%r_22s_NWKBk`%~iSJM^rPzV{oSXz4_ z<^vg^kiGlC!AS8Rk{5t2z6A}&!8govF9c1=;?t@eeg@U7U_YhY&@O1wVa|O)IU~cl zsx`K*D3HHpz|T5N4{u@*GM1K97#bPb_1hN768KLg003}B;7PVz;2M*dP__XL+MH`P zYHbDd3`@POj3-{wE?+U-bG8fUaf^6JlO<-lRCrPGu$RHNdcM7mGy&}$n!iv7_K3H0#8drIsAIyVVK&ni4VU_ z-EL(>N*Yi~AY|=Uq}?JhjQ#8JJ`@4c`wf+49o&{~>euvvac!iYG`(@PXkpj-r;#m8 zHcwnQw@ARQAs%q=nl|ezQ->6XI*tjKd(j{G%=mX8%sM z{>|OljuaFMrDnbyHGoJZeInX?mr*5mUd+`0sh40w_(ZtUU0kY*3{d=#31}x@& zztLx{(cEV+YaJJH!!`TZ@fcGb)Me}{WHfd>Sv`}L;1sRLuc zvT$yp+W`%m|3l@^qs|GpMa;!L_#!*-9TAjmhkJ{k5fD5y`}lG5jTt?qd)k#a%-B>7 zk4x*;n0O*apC6a0DBBq?6F@X*efdDA;?_ju_K$w2k=JH+#QYnu|GVJ%k^o0dM>b&P zmiFaD=R~CFAXR&D$DR}7QT82dj=+)eiy<8saeECV6DIK+Dr?jhJzG8*Lq_xCquQ|^ zTdRB5KaB3(!nX$9BHg`OpT*HkcQpwsyX9-m_sy4#!K4@nPJ*{T0H4lLa2|? zH$!;>>Phk*Z11|4^3IwGP@mmA%(;4n-}mGC&6OVI`S%CT4(_k_xq} zrg7Jf*BR4An-AqW4yGpB2cGnMU*CQG?I-&MO~J`7lj8$z<^HFo`YO+R)l!RG!*3n8 zXipopwa~<>R<1q*`9=ACu?u)@D~F4nv!}ao?ziw~elyW(M(XTG{7$FU&Azs?0SJKB zD=jodARGT_x2E1%aKDYjSey{=NVM%XXJ)kO75Jqo)?@Nj_QtSxGqEe*V%c(`nH7KtTD~6TT(? z3E`?io`}}rsS?g0f%1H~9(+os!@rCRPBmES6Z^n?Mi`h%nKxCB35bjYAK8(Yb}sNQ zsu~&^HUO4@|0V#V!VEEj4x(u(K4@$ghNe~PFZOZfJ{+%y6w?&INq7AyE`-?r#dUyW~FWw6!2b2q)lX5LR0nG*q=WY-~-b-LoNp$-+&qu!k zG`B8evHyT%D#gAln!zV76YZq1ldtvKi>Z22L6Gp9;H~fP-yI#;uHkB-*q>Ov2;tWSMPSi^a*%C-Jrqx zA1qo8)7ds_5PT-`OOC>hyqCDNIte*+zp%gJh8 zxLDCZ=hAg7QFT*OcD%&@s7wXo5H!|Q%dK)8iTH2$=R-he%%Se$Iyt%? zG&ih2dPxKg3uX3Qb>3_=jWW04$I#@bYHzJb<(dBtD~mYddt#2sK&@DCy2WjMs>$L{ z$A2viq))WVa~%{@E-=|ybFcbW=0-H>5=^uMZn@a6d&Lr|-?<{dP8UJ76Rn@}4#?Q<1Oaf5~`<8^?6?SaOg)u&QK zkZ#li+~AWB-vp~iOp8Rq&?`3O35&A*H}h)#X1C5z(?E@&T}|h6S3v7Jcz2&{9aK^K z;8-Sz*+MFF=RLAv&m!PGAKb1on|D|B{wn9o(7Wvd3Y||oL>g4nMzXEF&?$UKAtZ*`_p1O(&w>rcE zqy}d%MuwmTz!_-ybBwwZlwUX`_G0H$cN(TL(n8>%u4+;h8Lj>|ndJRoz3ZkF?RfB0 zyacsPE5FfdH*uW;&h0^{$r1h?$5Yq>J)opb%-2W-Ro;YwrgOE6qg|ksLK)k0$7OeC zD?tc~Zk*h};`*@n&6B?jhN--;(I0<@>bYr6R%Kx$|yQui~b55KDfhv)Lo zelX8yT)WWoQrtn*_vM36z6H6=3e2t7|EdA1L_&yah}WLC)~F+1u#_$7lso_1{SV)C zy*B5p{xk!r5*ZWdsw=@$i_J6{%`LZ77ShE$+8z1*5OS*KNfMCBz5hCAr(AFPX}vN0 zmjH%#H3Q&V4R5;6n!B4@)w=H~5mI`IOaKrpMBjO<5B}-Pi=8(8Vzo+_d@0AoXXYI> z*6eZq6#A+Jn<94%Dh;UmS{u9({jI<*+kKa@yK7R2)veeuVc*cWb*0sV<7NOK9i{6y z^6k^-MU)cy(M%cbzPpqzXv^JTc_mKA#s*Ld%GD38?wv2p2pi?Ny$c#SI;c@Emtx|jW zy=Timhb9g4*#&3qs$iP)g+O5X7;y>N@!v|u`0%*|i!E)ZZA7m$ea)w7i z>OvY#Rux8}K@UNUG*bDi$whgb11q7H9$vT_*5uZ^w^UZod|^xW4%KYydi-%LL6E4n zi2iZAG97hija@*fk&A}9aHk%5k@Rw+IDw!nsb}LRUe|Vaxn*!ddglh(GNIM8j zFghv8pI-oL9{RspJIk;twy2LE8Wa=}kuCx0k}!w^BHe-rA}Afw-C&@XMnI766p#|7 zl}pEwmIe`!5+nr#-Zh8&et5sX_rrajd(W_EX3w5Id$0BX|CR`Bl@aAMUa_cvJodkb zo2bQcttC8#5WQB$2IFb|7qf+3YgviB3lg%2J+5O1KO9X<{@+QBjG6w=pOgL-{Lw-T zOS9m9%HX<}lye|~`uvL-c0h6l1p5=T-Y?HJ zGggy%MlcgY_{0fWvLGJ(ctc;I3`&7)w_5scV@GC;Ma34lf|4qQik-h2v)|?Gqe7uL zbQ*aH1K3zxv((u(*Vfi*C;pPGj1>F${q&LsWrC~_F%_7K@<4_NDgusu!`{^2-xvQ` zq-Bqi8b^XVkTEZfc08~k$0h2D(r{paUzCbadR<0dC<3QoX~@~ z#Yw8**}a@2H159_s@JlSCN~CUiD=<1K=kISt;eWja(IBeOmT^c@saNw+L2F-J zv$Y!}*3GzZ!x*5`z~~n9t2-YzSs1^6v0`0jZDplahv2iW{0fh`&5O!UfM^QzHWjF@ zHy&e174kTDCw_*J*NzKtGV*J4hMcbXvG;Th9l<6ws*o6i<-CH#S=F)yL{9DgL0b69O9s zTYT50A1_CL!R463&Hv_7KDDPqW%c|!Zbm-e8X%sit zi-WuD+n%9Av?ksv=dB%a2RecJEgPJTx2cvI7oaU95=EiyhuP|laWCVod(-I>@K#kI z&b^^B+m94ASoYXDQgNK)aDVM4X*GdxDx~Kyh<%b*GBW~3Dh0`fYVgt_nsyMsscwFn zXjI;tf)R0(EIX@=NycTSDX0b3U}nF|b-pYMlN5>NkBNQSW=7>Rh#CIUX?+rZ`JLd}m;6bz}r0Q5+{qKQxczB$|(C7PO;?UWjahI&HaYJ#3sZTda<2x}w zd`Suxm1@!M=*12T`)vI5{#Ev>^IgYFi`=A4_fq$w{L&V$L8|U+xcHP6CRj`aM$7NC z0@s5SFhU^uV=zKo?Du0UM7=~GyatdB?^3T&D{r*_KWpY~l_1_P`}@}-mJuH{C(gOn zF=u(pT)F~LL5%}}BDMdDAS<+&y`yIqzQw4Ag9sp%8fp&(=3nd!>ET{DjaU&htf#Gy zrWfvvLd*&>OI;jvMwgXMnFwb_ciW}DYmEv?7%W#!WjveFDlJ&b`0(MwUs?p-w}zMIRK5j5Rt|Y~w4hR*|I(tAo5AdgfR4dAS`3 zS+b2KoOg9~_wR!#625wfU-Vw9?=-gg%UGJ9px}E&D$Lm&zSjjWxJfT}tdBHA4(;-7 z9!TGA9ax(SBJAhEoJf`nR;^-!mD5wD;eDUZZ#*)|OVUgGz^ zJADPSfwkofKod9Q35dl)KYfCKKs@(x-qUmF@i&UGCT^B{=ccqg!*SoGJYWt#5-fb- zcalQ}(Ye2s@vR6!B6=*wK-Qu(dWOqRL-_3~13kU3!BY#(1LZ+c>`;0DLrD^bQmZT{ z2Y{@2F9t`}P`n~n{LN|)Py(fE!1P)1nljYo?Tsc#BP-|QhBXqgRW!=Bd4+dWt2*H) zhuZEH=O+#iWN9~i#h78|eq&&kd z5kInkLN<4lndg@Gt<>dD1|Kx4BAx1swY+x!IO*)tD8vdWWUt?S>?vpKC!*77^vkB2 zDSCQE>+LNQJag*coU+Pin-V`$#6$+GHxE|Mk2(+{k=5wut;y4)qx z-gu=N-8A^5G4e?oZ;;1phER*zo^xjW2ed3Mse{+nzIm0QpI~s?b{Y)nmRF^`?3m zx@4Xq2T{^HL?$ynzJl2Mvx3!7bC4_{Ruv+CT^C93v|$+Oi7d%fnQN(8!*H9P-;$%g zV+h~5{#`-}Sg4`>OnXAVfzHj$(+OGE^*T`yILCY1Qz6&!($fL+^)cXr}HZXdX9l*0KPD`kt>io4D@bEyj%ufiO|d7@kA{%fO9w) zO?w5_k?KeTRZY~xb+5?4vC`b!tnmq1Yih<<4!`rdK!9@r$43_Ov$)pXh%AW5^xP+;FY_-iH1%ag)(RoN z+_37=N3>sqNmobS>0g^^MNFOZpL0k#`&yH+#)+!%7=BJXIC8_}#l_Bw&t%YfHi<$D zm+gt6!weW9=jY^C0_;r=g4B`KU@ONlYV{gscQCjTH%DFOQI;^J!g^$tZ0p;>?n~v)4zR1YDsTZC;BlnA;OOUSdX!ug{(logYKnWS$9E<*Ay0)8#9br+dAi z%lynvL4q_r;h2Mbf@Auf{y7_5wb--%^XE)`Hu!iefK#>*WZJgd;pi>$jL`kvmAJ&h zs)g*cCM`7m&V7lsQJSO-&wXY2@oqmY`#|p=g6?W^^@o-$=8Io*HP(i0v_jCQ^BOL@RhrE4! zq`4;nFXOnw)cF!l1d=bVrCo(f%$3JSJCl>eCAg?`Zt(dP#R>)dQf{Iht9F>a0_It` zD5GTdmWn0Km84NHmhT?sAA!&3 z-{CmK1ff0y`J2R$aP7H4GTm5&d@+#d>jjw0>CL;(n|}nfnGvLsfu3MZ!_J}hy(RQ= zMf<=35rwiIVm>E{>zX$*{j$*}EFld?zA8G_REHsBV`o?8F*-@7+w>||iSwbr*{9Ru z;JXId+$b1J_d0?sD@Yf?*#3$TB4z@JVgBrla7@aPN0{~qct3=uc?ds~{krlDe8-^( ztIhOLXKa90Yu$hvj=(~R&dnnm@NfedOZaSD4PdL{o$bEtRZ|WZ`&1O+pkC?n$JaUo z$L)|L>$<){fzJdvC%htW_gg3CgPS_;n@Ozu0A3+O(>hpTOir6>CO%345PxbYg)0C%`aPmCh2IJn(yDiB)u zI!wg$WNCT%%p@sT`}iGz}l1H#I};jwWi>$;@2 zvpl6~-p(F)kwr^zJD;k!Uk#)u|2T*YIHpmUOfnopg~iM+BqyK@%WvTTO*K~~@Mj!LK!MyuFk8C6>LKqqVg3e&C^&gwfORfzHI{^Z8jV9J$(SBD3iY$it$zh$I`HioQRG+XWCa@j zd>^qXzFR)s(>}P=M+KUfqYThv>g(ZPQ88fp%=p{nQA?43kLZWj0bkZmFyvC~Nb(dW zBv6k?C+0tvI$6rzG7pLDN9%6+p1j`Obw7-LfkuWK(6cc7@Qo$hGwpuB{tA(Z+EkZbiMtt&5owcSiBf+LW82HiEubk5 zZCB>8B5LtW;-v%G(;1=(N)i<7uJ(kAK>ap^&PNo9>*aT299}QUfgF=-MSH2TKAAp& z9HA9~%zyr6LvI|KZzX0|lB8gIz+if~ukZ0XD;bLHcEplp=kdA?jZsmUSLn8jGF>2T zZuoy50Fqb+pw__reZ%?d7|(5iM4aVTMr)6D_4#`qUhBP(=~;eOOS-3q2uUGlakndr z4}G-pZ05@c)rCcX!9<`9aP|%DLtRT>ai^^Vlo8T@3Ebbgi9^b3X&J z8@sIh;@9pL#MUP>pgMaSUdYQXUV>YQLLJzcx786*lBwe^ag$_EgJ~N9Mm<{p*Q2B5 z@;K&-Bwr%VqmH1BK5fOgK<=~u);?wan1+!d5H$La{pPB~6-aCPEYEHcf>GB?8maMJ z=0Ey$4>dgp&Kpbvhas-EnP-|pzg;=o&L_XZ*RXy2@t=z~?*DQb2W$;8%Mi&p769T~ zd1YRn%V)IMZ{70l5=@8|sv1E2nFOjEAR86=<5!}X{HNkj>M~2Jg+hBa#nqiS+cE;A z>x~|Vy9{+#FImxJjpUf!uupPN7w?oCf0WBzBg2bVH1)$vX7%c;gSf@9IADx|8QfpM zFzg_iu3nE%qUu3W=lNTYn`zbPdedn$Z6qc#LO|Z9rt%WHXAESR6B!vSK5w>I?Ydj! zS5(Y!DpYMEGSCts$}0q*5~tC_y9l3Q8TiyloB#fMP7jwe@>xG)^oOj$$|+EQEqG1c zrnq;09B4^(PsGN593C%0=s_0qz$Q%pJ6DxlM9k%m1p*Ly#l9GxjuZ4wDMEyO#p&R_ zP~g5#ED_YIf7EKsoH=ukE9 z`lVVb#aN>*s;}$;B0^6Oi(8Y~EeQY@y zC+)Rq3K@;v%}1y!?;VtWORTF-C$wZN^1XS{`bpTY!Pb3(mkhl_48Wi$I>JnC7$t8o z^T)SqjKjg&ZqitpBA+;X;6x)`((Gu-nIRgjxcbAdDBqIe`XbDNEsv@BciCLIi!s9e zUAB+Q>Nu#nZZ9ZA;%i>~Xn6UOJah3WFO~g?D|_I9AT!aQwm2azt2iUCDbt(8?t})? zTxa(seH*w7`}m9x#|Dp=1}?X|Y@2JRE-CpKeXEQgQvVQ1pvm-udZ#3!w>Rk_iRyI# z8e*qipP8nM!V)l!zcLeM?oL7%^~2Bkp#b- z=DOQ1#n{5a0u{+y1e|zAvh+^wWq_r#VT$^{S=B4jTI9#Z;S5}}NbUFb&mXkjG%WMTPPy6>ta8|<-fM+R-7^B8 zN{5d^-~#FAhOh9OB*D72I21XN&m23Q=32^g6`86*wo2M!6_?Z^yBN*8iMICkzx>9> zr-s{TMmG`UtID@&Y1{S}o&EZqg30Vj%2jLg9+W+wYDDsMLg_2>I;l}68O&jTjCF}I0Un#EyzY9A`C-LYT-QkVm-Tv>U{j2ka&E;v!1Fe+o^bD_mrwip8FJ}oe zzQzMoLMTPyD)0o9@^9KycX@u@s=M7!)URAOJA38MG?Tlz5^FT|hTrsYt@_5n!PB@A zV~0lfZe%v-+Ee>jZszFd_}Ue7!-ex?lEix8A(xk6C6kQs-D9T2AB_Qps;bdzJ)0+@ zw_8c}ap|aI%KZ{09LxWzuI?rCOTTKO3|2@NP8 zg}xI_+w#Job1o~nT5KLpo5Dw)>QetC7(_nR&j!u!cgc;9I> zn%u^9^1?|>JJ0TY#C|rE}dL{I+y+$=%^VIN@=2*fspPvr1CQ!gcxdCme z(f<>8fpEj}=BgSBmX^J`Sc>#}$ip6GxYlB?kj$zvO?B#LE4l~x((mDg3TWrtNfQ3i z{}BF;kS(<7JUDSB0VB9Tu4oH3qJ}sX4;Zerk?(L^%BlVe=;4a~gEk<_Wsp2z`Bei_ zldqbog9a`I{5Fh1mFEnR6}b7!?G<7AQ~Y+DY|akZ>Gw}G6m4)7uyP-)a-^1#+a4^{ zP^7N!fqR2_{mP#7MpGVJ?9_McPc&JBk-KZt)AMj4O8zpESO)dXOuFO)?+-~ZOwoSd z9*{oOLoBur$p$3=HvLw&=-!TZYW(ZjGA#1mt*OCb+xrXWG8tSKC|oA4-gPBVZGXq05n)!JatxSA-6CR@Ivv22Eo?O}7OPQrHUSOxp& z;5OZJtwA0*;iuEZ{^k#+4o7_vJm@~!vRZ0w07ne_@2${4DsyiG7u`uyV!tw=s zuJ4SF9s(Ub96g2xt%u!M!d_>Tcnh3Zhebd8=<&^z;~Jiz8Uhfj9e?0%91ZUSjV_`P#x=3i*>UU3Bvde=QjRvyK`haE|+s zv6qk1kMzrh*;h_eO*_co%c_y{fTP| z34dOsFaif@BU`gAwq{1nPR!SYJ$FDBBGoKF;&yM}*S|`5!PxBjE#$H0)3wD8Gx1P` zrh$qrH{ zEZ{0_dhJQF0^TU+G%VPlgue6Fa?*`DP2VGZs$zciI8XbWTm>8?nvoB_jWk6=MQVc1 zm)Eir$X7;6rJM0TpNJ|y6kx~Pf)iDlWjGh@9!WoOa0qBp!{NO66o*46L-XU8=d;r7 z8=c5NO1JqdBC^n&l9G~SNR|$f*#yT{>U!9S3~8=3zP>v1$(|Mt(su7i{9y`ZD^5Q8 z@C%lK2QUFkcIrvmQzyxPxG5(w4jMg_YV48nipHhT7K}2vf8{3GCyLk} zY}17g2XM?=_W@25JxVXA?B@;9iW3AlP7i8DZZMY@M)z1GfefIO)>MjHLzRCXhN06q zkIZ%`lsYjzEp?(p9z?0z_OR2ZUbxlYuzMeAt|>v1LuNY$slL())mQ#--b@dHA~IEo zUb2h7<|lyvremJ9iz4?jV|G;9e~`AjHonJ%Py*g3;c4E18zO=5Ub!IYw1CDpy6j}i z9++M0(D`AbW^Au=2bLa8(g$*bg-8uzkY~X-W*6%n8M}ym5H|7e&Nootf7S!dySg}0 zdgld2tqK@6o6y)*jqj(pR`{q;wBLMG(RZN22b76RJohLkB?4(76Vem&=%&hx$F0;` zP-?~;xxzuNtidb&e$9JF0k&Xrywro652?h#I9M?oEKL=Kbtp;~i@^77`Ewwz;Z}yW zv3ia+gw@#Nar52axSS;W8f)#Y?WGagVm*KY#tvVb;DEt!i!fHGn){UB`)5@%{TO;^ zFZH5&oOi8iPuK@!hID0puD-l(+=!%cAP|FSoPx`dz;nj&aW%O*gqFG6*q-}O2Ww96 zowc*GdkOb&6W)^M^4V=b$c=a^7n8<$ht^T|x+TFw-XD#$-Y>E2uD;mQGi{HMVF95I z1#}!?Jx4*3H`4z3H!W9boLEsMygC2QCh$tEiy%VGs_Nkk%*mn<>7qZsUx~+fPt&W;&+K}dljYeMw?ulJNtlbI0ydRqftD9MXI~$y3f5wUvUz?d@ zS27 zCjren5==&yOM0H{D2G&dnq?(HtRk6bqlzDOh z(az}J9P;Trqmv*cAK)@s;}X&k@HTJoh5X7{vrXSo*VM{4ATC5vrx{tFSDEorjJS2) zx;Ox&F@EO(i7G%WeK9L9Z?W?I{lD2-%Ma~s%vyb=hDP^g^l;oFq17_173lnVf#{ZJ zc3nRRYISns+dr?$(rAP;5}?rk_(?BbboTwm(iXNxakE;fe}cv3R{v7vnikG(){lRE z=Jz(MwNod^$iw$f*kX_4iUMoonF(w(_4MNRLUL3vq?J+v+jSM@eNMr^ug4#1Dc>ix z&Qq~1j|B1%nNM@l!<^izHKzF8=g%<;IROC4UyGd!qCca_2gCJ@{*#j|Qh{&_^`PMZ z&c?fkRp^IT!1t+0b@gT%MqqJ$|n_ znD#Qi?mzGI&O6tf(z)m1mAWSf%l&~Ih0JA$(zZa9HYvVNVy}hfhDD=-?2=ju;W7o3 z%6sJ8l)QR)EKBk(6!y9#l9&cdw+#G|JHmRjT~Do|*$i)`3WTH1qOO+e;l4P^k2M-M z3$R(&u5GI@#jJ?7u3{yVyHh^v^%}p8ddDoK^ZvFE76kB~U5!+{!Ij8x*{5wT?0J7( zQBcioW&%g;RfeaRdG8Af5I-F)4@_M0nj#&yHMMAGEt>yx-)pM7|9$~YIVy>ZsGnwY zUhHdc?84|e0ZKI8c#LJ_T&L7px>ljauJubDYR1^3DVEVihJJ(i*7E6u(>uFDU3B>`n*AQxtyZPal-Pm#Kl-*DCxQ1X8p^JX0f8@Shrriq0mM);pKYMxz8}J=%C32+rWwzt&ZCE8) zPNtv`N@absu;yi~h!4vkX;8O464IAw98=Tn)QC}2bFi|rn_Ra^&%J;!E&?xn+k0i? z-gn30Y~}G5H*qG$y>Yir9M<;RpJ?;-Pfw)3s`lp~PyNU(YmiCF%U|Syn;4UXtJOSw z9p!6&U)H>aJzHQq$nJcnPZ;!>12j8t^gYo%v;foO67qS1{RAl3ku}rU!4r4unM0=6 zFMgA0M{Hj(8B$p(1xEY3KA^4()@qxowEw#Ge>d2?c zUu?Uj{bZa8D9k_($_M5RT+(0;;L!CB4908c8}4=vWRBKQ*_f8B|6KihUJp+f<`U?o z8dytQzDhwthaTZH<$q;C*ZCfQBLc|yd~irO_K?I6h=VF4BjX^*`6h znz2n(g6xtJ9-nBNzlBx*-ZX!6?DJCF9E~?(Gaseaym(*-_sd08GY;F2*u?|yC44*O z6^m+=MocgLnut>4uKW` zEWr76!hNNr6>5rfsf~&%{fojh1nio=StBmnU@QazN9R1YAGs~CMd%tDRKkTutgH<~ z9*B7yf`AgrhMcRV%|C-}OqH4>wFai#%=h;z#aU}wt&RxwqtwGcWWK9BJ_f+r)CYvq zDUPQ@kG)rOm%pU>XPy?Z`5JNE<;m{hvy)@@tuWtR-9|nqC4}4|*lzpwEz%SMp1KAr zBb~BaWWqb#)-ft{T734)iaAqP8n4XRq?=&xmpTT!NW`QC{3Cf-P-$eJ&1GuDpLE~! z-i>_%zY^F{N$TNVYVJkiEdm9aoZZ5$hTP36?5;)}M?BelF|A~;Y+|*RF|eWsLe+oP zB6S$E{=#o1R0uw|D6gonSAKJU%S(%KKQANMcW?wd3u8k9h-SjbMdOu=)7^BOX)>YV z{~e}JWmB(172IX`=SN9(_?1}AgB1$plL3glvmy?q!Giyw1bJ7hkne;`mC$16wpZs? z@7=zS1>0zmn#XHicA%}925|0U?Cpty9iw;G?}V2o)jDbTfR`j`cXP}od-UrlFPSIT zk$gcl4BA@{$yBkPD0JNG_ctn(3gTb<^KX|9HUDc6W%0$j=azrIb|zyW2gm7W%;HcI z>}Zc5yA^?Sv|tccF9hqwEhrL`(-U9dHI_ioj}aGsbL>h&a5h%RvfVR8oS0LNpV7 z%5-_$O5rR+KfZ2>LESXtUp6zbAgX~4)fxEcBbmLIoe5_rC^d_B4`eoiu}LvPbz0;R zrYj>=^TGs)SLdTFkschI-#?DSM)t^(DNj$M?e4@x>rzab7GV)s2)XXfHJCfvhMJUE zu(win3XdP@cn^8G!eL?a?p)Bj^$azsU`M>pCmn9L#>>GD*OVFD?xL$|AR#V^ROSW2 zcjoB;PxsqdX4-G9yBplxN2*y>BIUmNEx;aS_FL?Nz0L+Q|~RW!0xWNgi!hVZREsr<)csTe%TsU5i~E0v>6e= z46MM5$50~w4Ayked=O$BrD0?|ju2khL0TZHTC6XCSb~&ZR*(}SuSYY$H+c;#Z^fXc zn1lytkqG(gG)&sMjR?q@;eZqfmJ+>uHUp(=F~|W6Jf;nk;O}l9veGmxhlru3<#4HS zKrqSETVdLv$PtXdGoS;dHjZA_X8;|*80f8p8jr#T#yrh=Sv2W34{Y zgZMVt@tPHcji9q`4kM7dR3RFga|+kcZvDztd%L^-qtwlQ_Q-AxxsEE}XKNaiMn8s9 z1<=Se=Z`HWk4v-w5`kZFvb75wsB`=wd@OpX2+7!s;_@ljjud$X-&=y>K>&j4@MR5N zg;&kt6NOvYN(H=0v|+s4Cq^_|Z7?u&)5G_xAQSbjNb4nb=#jNfiR4CM0+fQ+!(niX zW=odVBe9$k`IOTqOqc~vnE8(#jpG8zP)W!0#~x6ovvVl_S~3gVwUs8+K;xSAT47IU z7*fL-T26-*(kN!wO>`N{1xpV?pxm7sU%&DR{~)C-oHWYWLAd<4OXL}5up@{N)C^xHX*MQLh6c&+E63Cf@1$K9K#@A z&;mn9d6WJq4Qe1oYkL2ymLZQFL?~sXBnM4#Y254pyk9Am+NJ6T{*RG$l>He|&{;q; zo)NMcj&DhtdxVoO!Fh@_NuLfu4g*dD^-ZA{H|Te>L|v)f+Z~zVCBOG_{m@vf)iJYJ z9y`Zw;9||5G%?YSh2ZBHwmy%=t$k2o3<5O@T9+ThzP?BHG{MLPz_v*r#Ltlr|DnYW zo~C?wEyRJn2eJ)s>mv^!(E^elq88A_O`%YS!8l6uAReAy97uPyWS4C8vIsX8jG^J= zSWpiEbDYVYU9&j&hu0Vq&6=~(5yGBUJ)}OynkDVzHR&{zQq(P)=G=MXdJ|BOS~(xh zAf}4CddJo-L}p`LxE=ZUsP!q^buVtk*U;*ocFJ}3|ND4tJXncKys-snwal^O=ejvI z;VvQK8cJFk0wZYWY}VikEF>89vO-P`GV1z3QwgHo-5R?gm z!hfSV#?c&PMVPN`aN-Vr20Fcrr`S7u75==x2YG3!U}{jN*;<5J6VmRNxS#JKQy8;5 zoOr|>f`K&7xcEce)Hzc?Ole%TQ9W(DGZSQOaRw{;$jb+%R_)^#3(f9A&;P&uvm;w@ Z!gMIwttjR#!iKb}bVpsTME23s{{aY_cD4Wj literal 0 HcmV?d00001 From 9f3ac159d49c8b8aa9b4922618814b45bd83c903 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 17 Oct 2022 21:41:48 +0100 Subject: [PATCH 0992/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 5aba8c785..cffceccd5 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index afcd11531..e3d36263f 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 61e52a3ee..35dd126bc 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index a152f7f22..6744fdcd7 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index c95745506..d0ed18395 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) ## What is utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index f7eb1d054..a0ccfcb2d 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 854190837..14b757ff8 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package. No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit. diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index afab60ca0..df76c3dd2 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) The following are best practices we at utPLSQL have learned about PL/SQL and Unit Testing. diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index efba68e78..1801468bc 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. Code coverage is gathered for the following source types: diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 11526888a..e0c5a0a5a 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) The utPLSQL is responsible for handling exceptions wherever they occur in the test run. utPLSQL is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. The framework provides a full stacktrace for every exception that was thrown. The stacktrace is clean and does not include any utPLSQL library calls in it. diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 5984f4379..8b0431989 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) ## Expectation concepts diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 4216e832a..6ba6caefc 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 439a0fe5d..5c822c8ba 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) ## Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 5e037ef9d..60907a8a8 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) ## Obtaining information about suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 9f7239f13..6736d343c 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index c095f468f..a5c7fc13b 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) utPLSQL framework provides two main entry points to run unit tests from within the database: diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 259b03f4c..5fd83508b 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4056--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 8de2fcc6f..ae5bf633c 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.13.4056-develop'; + gc_version constant varchar2(50) := 'v3.1.13.4057-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From c94472ec42875ed026da8149dd7c8ce29052d605 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 17 Oct 2022 21:54:12 +0100 Subject: [PATCH 0993/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index cffceccd5..c71ef0f58 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index e3d36263f..bbeccc95a 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 35dd126bc..20340b643 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 6744fdcd7..dc8499a3d 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index d0ed18395..a3167d01a 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) ## What is utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index a0ccfcb2d..dd95cac2a 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 14b757ff8..121fba868 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package. No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit. diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index df76c3dd2..a1bbde32c 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) The following are best practices we at utPLSQL have learned about PL/SQL and Unit Testing. diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 1801468bc..29439a243 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. Code coverage is gathered for the following source types: diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index e0c5a0a5a..7f26e718a 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) The utPLSQL is responsible for handling exceptions wherever they occur in the test run. utPLSQL is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. The framework provides a full stacktrace for every exception that was thrown. The stacktrace is clean and does not include any utPLSQL library calls in it. diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 8b0431989..fd6baf7c9 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) ## Expectation concepts diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 6ba6caefc..90f4e1c83 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 5c822c8ba..dd2c718e8 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) ## Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 60907a8a8..454d880c8 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) ## Obtaining information about suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 6736d343c..04f27bc8c 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index a5c7fc13b..bfdc93363 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) utPLSQL framework provides two main entry points to run unit tests from within the database: diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 5fd83508b..a123610c7 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4057--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index ae5bf633c..f0ce27228 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.13.4057-develop'; + gc_version constant varchar2(50) := 'v3.1.13.4058-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 24fa8ffb9f204fb80e30063ba67d21af45f6de8d Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 19 Oct 2022 00:33:15 +0300 Subject: [PATCH 0994/1096] Ability to report coverage on long lines. Sourcecode lines that result in more than 4000 chars after conversion to HTML should be reported successfully. Resolves: #1232 --- .../ut_coverage_report_html_helper.pkb | 15 +++-- .../test_html_coverage_reporter.pkb | 65 +++++++++++++++++++ .../test_html_coverage_reporter.pks | 8 +++ 3 files changed, 84 insertions(+), 4 deletions(-) diff --git a/source/reporters/ut_coverage_report_html_helper.pkb b/source/reporters/ut_coverage_report_html_helper.pkb index 2bb9a87d9..f7e0b5ed0 100644 --- a/source/reporters/ut_coverage_report_html_helper.pkb +++ b/source/reporters/ut_coverage_report_html_helper.pkb @@ -134,9 +134,11 @@ create or replace package body ut_coverage_report_html_helper is l_file_part varchar2(32767); l_result ut_varchar2_rows := ut_varchar2_rows(); l_coverage_pct number(5, 2); - l_coverage_block_pct number(5, 2); l_hits varchar2(30); l_blocks varchar2(30); + l_line_text varchar2(32767); + e_buffer_too_small exception; + pragma exception_init ( e_buffer_too_small, -19011 ); begin l_coverage_pct := coverage_pct(a_coverage_unit.covered_lines, a_coverage_unit.uncovered_lines); @@ -148,10 +150,16 @@ create or replace package body ut_coverage_report_html_helper is ut_utils.append_to_list(l_result, l_file_part); for line_no in 1 .. a_source_code.count loop + begin + l_line_text := dbms_xmlgen.convert(a_source_code(line_no)); + exception + when e_buffer_too_small then + l_line_text := dbms_xmlgen.convert(to_clob(a_source_code(line_no))); + end; if not a_coverage_unit.lines.exists(line_no) then l_file_part := '
  • - ' || (dbms_xmlgen.convert(a_source_code(line_no))) || + ' || l_line_text || '
    • '; else l_hits := to_char(a_coverage_unit.lines(line_no).executions); @@ -188,7 +196,7 @@ create or replace package body ut_coverage_report_html_helper is '    '; end if; l_file_part := l_file_part || ' - ' || (dbms_xmlgen.convert(a_source_code(line_no))) || + ' || l_line_text || ''; end if; ut_utils.append_to_list(l_result, l_file_part); @@ -222,7 +230,6 @@ create or replace package body ut_coverage_report_html_helper is l_file_part varchar2(32767); l_title varchar2(100) := 'All files'; l_coverage_pct number(5, 2); - l_coverage_block_pct number(5, 2); l_result ut_varchar2_rows; l_id varchar2(50) := object_id(a_title); l_unit_coverage ut_coverage.t_unit_coverage; diff --git a/test/ut3_user/reporters/test_coverage/test_html_coverage_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_html_coverage_reporter.pkb index d1645acae..ad14adb8c 100644 --- a/test/ut3_user/reporters/test_coverage/test_html_coverage_reporter.pkb +++ b/test/ut3_user/reporters/test_coverage/test_html_coverage_reporter.pkb @@ -32,5 +32,70 @@ create or replace package body test_html_coverage_reporter is ut.expect(l_actual).to_be_like(l_expected); end; + procedure setup_long_lines is + pragma autonomous_transaction; + begin + + execute immediate q'[create or replace type string_array is table of varchar2(5 char);]'; + execute immediate q'[ + create or replace function f return integer is + l_string_array string_array; + l_count integer; + begin + -- line is 1912 chars long, 1911 characters seem to be the max. line length that works (@formatter:off) + l_string_array := string_array('aahed', 'aalii', 'aargh', 'aarti', 'abaca', 'abaci', 'abacs', 'abaft', 'abaka', 'abamp', 'aband', 'abash', 'abask', 'abaya', 'abbas', 'abbed', 'abbes', 'abcee', 'abeam', 'abear', 'abele', 'abers', 'abets', 'abies', 'abler', 'ables', 'ablet', 'ablow', 'abmho', 'abohm', 'aboil', 'aboma', 'aboon', 'abord', 'abore', 'abram', 'abray', 'abrim', 'abrin', 'abris', 'absey', 'absit', 'abuna', 'abune', 'abuts', 'abuzz', 'abyes', 'abysm', 'acais', 'acari', 'accas', 'accoy', 'acerb', 'acers', 'aceta', 'achar', 'ached', 'aches', 'achoo', 'acids', 'acidy', 'acing', 'acini', 'ackee', 'acker', 'acmes', 'acmic', 'acned', 'acnes', 'acock', 'acold', 'acred', 'acres', 'acros', 'acted', 'actin', 'acton', 'acyls', 'adaws', 'adays', 'adbot', 'addax', 'added', 'adder', 'addio', 'addle', 'adeem', 'adhan', 'adieu', 'adios', 'adits', 'adman', 'admen', 'admix', 'adobo', 'adown', 'adoze', 'adrad', 'adred', 'adsum', 'aduki', 'adunc', 'adust', 'advew', 'adyta', 'adzed', 'adzes', 'aecia', 'aedes', 'aegis', 'aeons', 'aerie', 'aeros', 'aesir', 'afald', 'afara', 'afars', 'afear', 'aflaj', 'afore', 'afrit', 'afros', 'agama', 'agami', 'agars', 'agast', 'agave', 'agaze', 'agene', 'agers', 'agger', 'aggie', 'aggri', 'aggro', 'aggry', 'aghas', 'agila', 'agios', 'agism', 'agist', 'agita', 'aglee', 'aglet', 'agley', 'agloo', 'aglus', 'agmas', 'agoge', 'agone', 'agons', 'agood', 'agora', 'agria', 'agrin', 'agros', 'agued', 'agues', 'aguna', 'aguti', 'aheap', 'ahent', 'ahigh', 'ahind', 'ahing', 'ahint', 'ahold', 'ahull', 'ahuru', 'aidas', 'aided', 'aides', 'aidoi', 'aidos', 'aiery', 'aigas', 'aight', 'ailed', 'aimed', 'aimer', 'ainee', 'ainga', 'aioli', 'aired', 'airer', 'airns', 'airth', 'airts', 'aitch', 'aitus', 'aiver', 'aiyee', 'aizle', 'ajies', 'ajiva', 'ajuga', 'ajwan', 'akees', 'akela', 'akene', 'aking', 'akita', 'akkas', 'alaap', 'alack', 'alamo', 'aland', 'alane', 'alang', 'a'); + select count(*) into l_count from table(l_string_array); + return l_count; + end;]'; + + execute immediate q'[ + create or replace package test_f is + --%suite + + --%test + procedure crashing_ut_coverage_html_reporter; + end;]'; + + execute immediate q'[ + create or replace package body test_f is + procedure crashing_ut_coverage_html_reporter is + begin + ut3_develop.ut.expect(f()).to_be_greater_or_equal(1); + end; + end; + ]'; + end; + + procedure cleanup_long_lines is + pragma autonomous_transaction; + begin + execute immediate 'drop package test_f'; + execute immediate 'drop function f'; + execute immediate 'drop type string_array force'; + end; + + procedure report_long_lines is + l_expected varchar2(32767); + l_actual clob; + l_name varchar2(250); + begin + --Arrange + l_expected := '%l_string_array := string_array%'; + + l_actual := + ut3_tester_helper.coverage_helper.run_tests_as_job( + q'[ + ut3_develop.ut.run( + a_path => 'ut3_user.test_f', + a_reporter=> ut3_develop.ut_coverage_html_reporter(), + a_include_objects => ut3_develop.ut_varchar2_list( 'UT3_USER.F' ) + ) + ]' + ); + --Assert + ut.expect(l_actual).to_be_like(l_expected); + end; + + end test_html_coverage_reporter; / diff --git a/test/ut3_user/reporters/test_coverage/test_html_coverage_reporter.pks b/test/ut3_user/reporters/test_coverage/test_html_coverage_reporter.pks index 629d41793..a11f3e912 100644 --- a/test/ut3_user/reporters/test_coverage/test_html_coverage_reporter.pks +++ b/test/ut3_user/reporters/test_coverage/test_html_coverage_reporter.pks @@ -6,5 +6,13 @@ create or replace package test_html_coverage_reporter is --%test(reports on a project file mapped to database object in extended profiler coverage) procedure report_on_file; + procedure setup_long_lines; + procedure cleanup_long_lines; + + --%test(reports on lines exceeding 4000 chars after conversion to XML) + --%beforetest(setup_long_lines) + --%aftertest(cleanup_long_lines) + procedure report_long_lines; + end test_html_coverage_reporter; / From 82707159ee485915c55506d608d0e6143bf99247 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 19 Oct 2022 00:45:25 +0300 Subject: [PATCH 0995/1096] Fixing name that was too long for the test before 12.2 --- .../reporters/test_coverage/test_html_coverage_reporter.pkb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/ut3_user/reporters/test_coverage/test_html_coverage_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_html_coverage_reporter.pkb index ad14adb8c..2f2200116 100644 --- a/test/ut3_user/reporters/test_coverage/test_html_coverage_reporter.pkb +++ b/test/ut3_user/reporters/test_coverage/test_html_coverage_reporter.pkb @@ -53,12 +53,12 @@ create or replace package body test_html_coverage_reporter is --%suite --%test - procedure crashing_ut_coverage_html_reporter; + procedure fail_ut_coverage_html_reporter; end;]'; execute immediate q'[ create or replace package body test_f is - procedure crashing_ut_coverage_html_reporter is + procedure fail_ut_coverage_html_reporter is begin ut3_develop.ut.expect(f()).to_be_greater_or_equal(1); end; From 7925a75de38eaddde5952e92fd8f6ba5ab8500d5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 19 Oct 2022 21:23:40 +0100 Subject: [PATCH 0996/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index c71ef0f58..961ba3060 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index bbeccc95a..2b625c7d0 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 20340b643..a915f2a52 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index dc8499a3d..5d4ed97cf 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index a3167d01a..c391be166 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) ## What is utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index dd95cac2a..2acd290c9 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 121fba868..3e95d2852 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package. No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit. diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index a1bbde32c..b39ab803b 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) The following are best practices we at utPLSQL have learned about PL/SQL and Unit Testing. diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 29439a243..1a227d9e4 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. Code coverage is gathered for the following source types: diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 7f26e718a..d83142f9f 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) The utPLSQL is responsible for handling exceptions wherever they occur in the test run. utPLSQL is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. The framework provides a full stacktrace for every exception that was thrown. The stacktrace is clean and does not include any utPLSQL library calls in it. diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index fd6baf7c9..1c1974319 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) ## Expectation concepts diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 90f4e1c83..e9681bb7b 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index dd2c718e8..fca38c92e 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) ## Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 454d880c8..e7496320c 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) ## Obtaining information about suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 04f27bc8c..1f5ead1c5 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) utPLSQL provides the following reporting formats. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index bfdc93363..a87fe9836 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) utPLSQL framework provides two main entry points to run unit tests from within the database: diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index a123610c7..a219012fd 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4058--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index f0ce27228..06b17ccbf 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.13.4058-develop'; + gc_version constant varchar2(50) := 'v3.1.13.4063-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 9e03e76d0c3a193611430113e9b0477712bc8cee Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 27 Oct 2022 00:20:15 +0300 Subject: [PATCH 0997/1096] Improving documentation --- docs/index.md | 14 +- docs/userguide/advanced_data_comparison.md | 26 +- docs/userguide/annotations.md | 338 +++++++++++---------- docs/userguide/coverage.md | 152 +++++---- docs/userguide/exception-reporting.md | 30 +- docs/userguide/expectations.md | 149 ++++----- docs/userguide/getting-started.md | 16 +- docs/userguide/install.md | 34 +-- docs/userguide/querying_suites.md | 16 +- docs/userguide/reporters.md | 46 +-- docs/userguide/running-unit-tests.md | 52 ++-- mkdocs.yml | 4 +- mkdocs_offline.yml | 4 +- 13 files changed, 475 insertions(+), 406 deletions(-) diff --git a/docs/index.md b/docs/index.md index c391be166..bc7e1e63b 100644 --- a/docs/index.md +++ b/docs/index.md @@ -7,9 +7,15 @@ The framework follows industry standards and best patterns of modern Unit Testin ## Demo project -Have a look at our [demo project](https://github.com/utPLSQL/utPLSQL-demo-project/). +Have a look at [utPLSQL demo project](https://github.com/utPLSQL/utPLSQL-demo-project/) to see: -It uses [Travis CI](https://travis-ci.org/utPLSQL/utPLSQL-demo-project) to build on every commit, runs all tests, publishes test results and code coverage to [SonarCloud](https://sonarcloud.io/project/overview?id=utPLSQL:utPLSQL-demo-project). +- sample code and tests +- demo of deployment automation that leverages: + - Flyway / Liquidbase for scripting and deployment of DB changes + - Docker container with Oracle XE Database + - GitHub Actions and Azure Pipelines to orchestrate the deployment and testing process + - utPLSQL framework for writhing, execution of tests as well as reporting test results and code coverage + - [Sonar]((https://sonarcloud.io/project/overview?id=utPLSQL:utPLSQL-demo-project).) for code quality gate, test results and code coverage reporting ## Three steps @@ -31,6 +37,7 @@ Check out the sections on [annotations](userguide/annotations.md) and [expectati You can use the utPLSQL command line client [utPLSQL-cli](https://github.com/utPLSQL/utPLSQL-cli) to run tests without the need for Oracle Client or any IDE like SQLDeveloper/TOAD etc. Amongst many benefits they provide ability to: + * see the progress of test execution for long-running tests - real-time reporting * use many reporting formats simultaneously and save reports to files (publish) * map your project source files and test files into database objects @@ -40,8 +47,7 @@ See [project readme](https://github.com/utPLSQL/utPLSQL-cli/blob/develop/README. ## Coverage -If you want to have code coverage gathered on your code , it's best to use `ut_run` to execute your tests with multiple reporters and have both test execution report as well as coverage report saved to a file. - +It is best to use utPLSQL-cli or execute tests and gather code coverage from command line. Check out the [coverage documentation](userguide/coverage.md) for options of coverage reporting diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 2acd290c9..2e2d4af9f 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -48,7 +48,7 @@ When specifying column/attribute names, keep in mind that the names are **case s ## Excluding elements from data comparison Consider the following examples -```sql +```sql linenums="1" declare l_expected sys_refcursor; l_actual sys_refcursor; @@ -86,7 +86,7 @@ The actual data is equal/contains expected, when those columns are excluded. ## Selecting columns for data comparison Consider the following example -```sql +```sql linenums="1" declare l_actual sys_refcursor; l_expected sys_refcursor; @@ -125,7 +125,7 @@ The actual data is equal/contains expected, when only those columns are included You can chain the advanced options in an expectation and mix the `varchar2` with `ut_varchar2_list` arguments. When doing so, the final list of items to include/exclude will be a concatenation of all items. -```sql +```sql linenums="1" declare l_actual sys_refcursor; l_expected sys_refcursor; @@ -163,7 +163,7 @@ SUCCESS Example of `include / exclude` for anydata.convertCollection -```sql +```sql linenums="1" create or replace type person as object( name varchar2(100), age integer @@ -219,7 +219,7 @@ Unordered option allows for quick comparison of two compound data types without Result of such comparison will be limited to only information about row existing or not existing in given set without actual information about exact differences. -```sql +```sql linenums="1" declare l_actual sys_refcursor; l_expected sys_refcursor; @@ -267,7 +267,7 @@ The extra or missing rows will be presented to user as well as all non-matching Join by option can be used in conjunction with include or exclude options. However if any of the join keys is part of exclude set, comparison will fail and report to user that sets could not be joined on specific key, as the key was excluded. -```sql +```sql linenums="1" declare l_actual sys_refcursor; l_expected sys_refcursor; @@ -305,7 +305,7 @@ FAILURE You can use `join_by` syntax in combination with `contain` matcher. -```sql +```sql linenums="1" declare l_actual sys_refcursor; l_expected sys_refcursor; @@ -322,7 +322,7 @@ end; ``` Above test will indicate that in actual data-set -```sql +```sql linenums="1" FAILURE Actual: refcursor [ count = 28 ] was expected to contain: refcursor [ count = 29 ] Diff: @@ -335,7 +335,7 @@ FAILURE You can specify multiple columns in `join_by` -```sql +```sql linenums="1" declare l_actual sys_refcursor; l_expected sys_refcursor; @@ -371,7 +371,7 @@ To reference attribute as PK, use slash symbol `/` to separate nested elements. In the below example, cursors are joined using the `NAME` attribute of object in column `SOMEONE` -```sql +```sql linenums="1" create or replace type person as object( name varchar2(100), age integer @@ -414,7 +414,7 @@ FAILURE > `join_by` does not support joining on individual elements of nested table. You can still use data of the nested table as a PK value. > When collection is referenced in `join_by`, test will fail with appropriate message, as it cannot perform a join. -```sql +```sql linenums="1" create or replace type person as object( name varchar2(100), age integer @@ -463,7 +463,7 @@ You may provide items for `include`/`exclude`/`join_by` as a a ut_varchar2_list - nested table and varray items type attributes are nested under `` elements Example of a valid parameter to include columns: `RN`, `A_Column`, `SOME_COL` in data comparison. -```sql +```sql linenums="1" declare l_actual sys_refcursor; l_expected sys_refcursor; @@ -494,7 +494,7 @@ Expectations that compare compound data type data with `unordered_columns` optio This option can be useful whn we have no control over the ordering of the column or the column order is not of importance from testing perspective. -```sql +```sql linenums="1" declare l_actual sys_refcursor; l_expected sys_refcursor; diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 3e95d2852..2c13fb649 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -5,20 +5,21 @@ No additional configuration files or tables are needed for test cases. The annot The framework runner searches for all the suitable annotated packages, automatically configures suites, forms the suite hierarchy, executes it and reports results in specified formats. Annotation is defined by: + - single line comment `--` (double hyphen) - followed directly by a `%` (percent) - followed by annotation name - followed by optional annotation text placed in single brackets. -All of text between first opening bracket and last closing bracket in annotation line is considered to be annotation text +All text between first opening bracket and last closing bracket in annotation line is considered to be annotation text -Examples: -`--%suite(The name of my test suite)` - represents `suite` annotation with text `The name of my test suite` +For example `--%suite(The name of my test suite)` represents `suite` annotation with `The name of my test suite` as annotation text. -utPLSQL interprets the whole line of annotation and will treat all the text from the first opening bracket in the line to the last closing bracket +utPLSQL interprets the whole line of annotation and will treat text from the first opening bracket in the line to the last closing bracket in that line as annotation text -Example: - `--%suite(Stuff) -- we should name this ( correctly )` - represents `suite` annotation with text `Stuff) -- we should name this ( correctly ` +In below example we have a `suite` annotation with `Stuff) -- we should name this ( correctly ` as the annotation text + +`--%suite(Stuff) -- we should name this ( correctly )` Do not place comments within annotation line to avoid unexpected behaviors. @@ -57,7 +58,7 @@ end; ``` Invalid procedure annotations examples: -```sql +```sql linenums="1" package test_package is --%suite @@ -88,7 +89,7 @@ Those annotations placed at any place in package except directly before procedur We strongly recommend putting package level annotations at the very top of package except for the `--%context` annotations (described below) Valid package annotations example: -```sql +```sql linenums="1" package test_package is --%suite @@ -106,7 +107,7 @@ end; ``` Invalid package annotations examples: -```sql +```sql linenums="1" package test_package is --%suite --This is wrong as suite annotation is not a procedure annotation procedure irrelevant; @@ -120,29 +121,29 @@ end; ## Supported annotations -| Annotation |Level| Description | -| --- | --- | --- | -| `--%suite()` | Package | Mandatory. Marks package as a test suite. Optional suite description can be provided (see `displayname`). | -| `--%suitepath()` | Package | Similar to java package. The annotation allows logical grouping of suites into hierarchies. | -| `--%displayname()` | Package/procedure | Human-readable and meaningful description of a context/suite/test. Overrides the `` provided with `suite`/`test`/`context` annotation. This annotation is redundant and might be removed in future releases. | -| `--%test()` | Procedure | Denotes that the annotated procedure is a unit test procedure. Optional test description can be provided (see `displayname`). | -| `--%throws([,...])`| Procedure | Denotes that the annotated test procedure must throw one of the exceptions provided. Supported forms of exceptions are: numeric literals, numeric constant names, exception constant names, predefined Oracle exception names. | -| `--%beforeall` | Procedure | Denotes that the annotated procedure should be executed once before all elements of the suite. | -| `--%beforeall([[.].][,...])` | Package | Denotes that the mentioned procedure(s) should be executed once before all elements of the suite. | -| `--%afterall` | Procedure | Denotes that the annotated procedure should be executed once after all elements of the suite. | -| `--%afterall([[.].][,...])` | Package | Denotes that the mentioned procedure(s) should be executed once after all elements of the suite. | -| `--%beforeeach` | Procedure | Denotes that the annotated procedure should be executed before each `%test` procedure in the suite. | -| `--%beforeeach([[.].][,...])` | Package | Denotes that the mentioned procedure(s) should be executed before each `%test` procedure in the suite. | -| `--%aftereach` | Procedure | Denotes that the annotated procedure should be executed after each `%test` procedure in the suite. | -| `--%aftereach([[.].][,...])` | Package | Denotes that the mentioned procedure(s) should be executed after each `%test` procedure in the suite. | -| `--%beforetest([[.].][,...])` | Procedure | Denotes that mentioned procedure(s) should be executed before the annotated `%test` procedure. | -| `--%aftertest([[.].][,...])` | Procedure | Denotes that mentioned procedure(s) should be executed after the annotated `%test` procedure. | -| `--%rollback()` | Package/procedure | Defines transaction control. Supported values: `auto`(default) - a savepoint is created before invocation of each "before block" is and a rollback to specific savepoint is issued after each "after" block; `manual` - rollback is never issued automatically. Property can be overridden for child element (test in suite) | -| `--%disabled()` | Package/procedure | Used to disable a suite, whole context or a test. Disabled suites/contexts/tests do not get executed, they are however marked and reported as disabled in a test run. The reason that will be displayed next to disabled tests is decided based on hierarchy suites -> context -> test | -| `--%context()` | Package | Denotes start of a named context (sub-suite) in a suite package an optional description for context can be provided. | -| `--%name()` | Package | Denotes name for a context. Must be placed after the context annotation and before start of nested context. | -| `--%endcontext` | Package | Denotes end of a nested context (sub-suite) in a suite package | -| `--%tags` | Package/procedure | Used to label a test or a suite for purpose of identification | +| Annotation | Level | Description | +|------------------------------------------------------------|-------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `--%suite( )` | Package | Mandatory. Marks package as a test suite. Optional suite description can be provided (see `displayname`). | +| `--%suitepath( )` | Package | Similar to java package. The annotation allows logical grouping of suites into hierarchies. | +| `--%displayname( )` | Package/procedure | Human-readable and meaningful description of a context/suite/test. Overrides the `` provided with `suite`/`test`/`context` annotation. This annotation is redundant and might be removed in future releases. | +| `--%test( )` | Procedure | Denotes that the annotated procedure is a unit test procedure. Optional test description can be provided (see `displayname`). | +| `--%throws( [,...] )` | Procedure | Denotes that the annotated test procedure must throw one of the exceptions provided. Supported forms of exceptions are: numeric literals, numeric constant names, exception constant names, predefined Oracle exception names. | +| `--%beforeall` | Procedure | Denotes that the annotated procedure should be executed once before all elements of the suite. | +| `--%beforeall( [[.].][,...] )` | Package | Denotes that the mentioned procedure(s) should be executed once before all elements of the suite. | +| `--%afterall` | Procedure | Denotes that the annotated procedure should be executed once after all elements of the suite. | +| `--%afterall( [[.].][,...] )` | Package | Denotes that the mentioned procedure(s) should be executed once after all elements of the suite. | +| `--%beforeeach` | Procedure | Denotes that the annotated procedure should be executed before each `%test` procedure in the suite. | +| `--%beforeeach( [[.].][,...] )` | Package | Denotes that the mentioned procedure(s) should be executed before each `%test` procedure in the suite. | +| `--%aftereach` | Procedure | Denotes that the annotated procedure should be executed after each `%test` procedure in the suite. | +| `--%aftereach( [[.].][,...] )` | Package | Denotes that the mentioned procedure(s) should be executed after each `%test` procedure in the suite. | +| `--%beforetest( [[.].][,...] )` | Procedure | Denotes that mentioned procedure(s) should be executed before the annotated `%test` procedure. | +| `--%aftertest( [[.].][,...] )` | Procedure | Denotes that mentioned procedure(s) should be executed after the annotated `%test` procedure. | +| `--%rollback( )` | Package/procedure | Defines transaction control. Supported values: `auto`(default) - a savepoint is created before invocation of each "before block" is and a rollback to specific savepoint is issued after each "after" block; `manual` - rollback is never issued automatically. Property can be overridden for child element (test in suite) | +| `--%disabled( )` | Package/procedure | Used to disable a suite, whole context or a test. Disabled suites/contexts/tests do not get executed, they are however marked and reported as disabled in a test run. The reason that will be displayed next to disabled tests is decided based on hierarchy suites -> context -> test | +| `--%context( )` | Package | Denotes start of a named context (sub-suite) in a suite package an optional description for context can be provided. | +| `--%name( )` | Package | Denotes name for a context. Must be placed after the context annotation and before start of nested context. | +| `--%endcontext` | Package | Denotes end of a nested context (sub-suite) in a suite package | +| `--%tags` | Package/procedure | Used to label a test or a suite for purpose of identification | ### Suite @@ -162,13 +163,13 @@ If the parameters are placed without brackets or with incomplete brackets, they Suite package without description. -```sql +```sql linenums="1" create or replace package test_package as --%suite end; / ``` -```sql +```sql linenums="1" exec ut.run('test_package'); ``` ``` @@ -179,13 +180,13 @@ Finished in .002415 seconds ``` Suite package with description. -```sql +```sql linenums="1" create or replace package test_package as --%suite(Tests for a package) end; / ``` -```sql +```sql linenums="1" exec ut.run('test_package'); ``` ``` @@ -196,14 +197,14 @@ Finished in .001646 seconds ``` When multiple `--%suite` annotations are specified in package, the first annotation will be used and a warning message will appear indicating duplicate annotation. -```sql +```sql linenums="1" create or replace package test_package as --%suite(Tests for a package) --%suite(Bad annotation) end; / ``` -```sql +```sql linenums="1" exec ut.run('test_package'); ``` ``` @@ -221,14 +222,14 @@ Finished in .003318 seconds ``` When `--%suite` annotation is bound to procedure, it is ignored and results in package not getting recognized as test suite. -```sql +```sql linenums="1" create or replace package test_package as --%suite(Tests for a package) procedure some_proc; end; / ``` -```sql +```sql linenums="1" exec ut.run('test_package'); ``` ``` @@ -255,7 +256,7 @@ If `--%test` raises an unhandled exception the following will happen: - test execution will continue uninterrupted for rest of the suite Test procedure without description. -```sql +```sql linenums="1" create or replace package test_package as --%suite(Tests for a package) @@ -268,7 +269,7 @@ create or replace package body test_package as end; / ``` -```sql +```sql linenums="1" exec ut.run('test_package'); ``` ``` @@ -280,7 +281,7 @@ Finished in .004109 seconds ``` Test procedure with description. -```sql +```sql linenums="1" create or replace package test_package as --%suite(Tests for a package) @@ -294,7 +295,7 @@ end; / ``` -```sql +```sql linenums="1" exec ut.run('test_package'); ``` ``` @@ -306,7 +307,7 @@ Finished in .006828 seconds ``` When multiple `--%test` annotations are specified for a procedure, the first annotation will be used and a warning message will appear indicating duplicate annotation. -```sql +```sql linenums="1" create or replace package test_package as --%suite(Tests for a package) @@ -321,7 +322,7 @@ end; / ``` -```sql +```sql linenums="1" exec ut.run('test_package'); ``` ``` @@ -344,7 +345,7 @@ Marks annotated suite package or test procedure as disabled. You can provide the reason why the test is disabled that will be displayed in output. Disabling suite. -```sql +```sql linenums="1" create or replace package test_package as --%suite(Tests for a package) --%disabled(Reason for disabling suite) @@ -365,7 +366,7 @@ end; / ``` -```sql +```sql linenums="1" exec ut.run('test_package'); ``` ``` @@ -378,7 +379,7 @@ Finished in .001441 seconds ``` Disabling the context(s). -```sql +```sql linenums="1" create or replace package test_package as --%suite(Tests for a package) @@ -408,7 +409,7 @@ end; / ``` -```sql +```sql linenums="1" exec ut.run('test_package'); ``` ``` @@ -423,7 +424,7 @@ Finished in .005079 seconds ``` Disabling individual test(s). -```sql +```sql linenums="1" create or replace package test_package as --%suite(Tests for a package) @@ -444,7 +445,7 @@ end; / ``` -```sql +```sql linenums="1" exec ut.run('test_package'); ``` ``` @@ -461,7 +462,7 @@ Finished in .005868 seconds There are two possible ways to use the `--%beforeall` annotation. As a procedure level annotation: -```sql +```sql linenums="1" --%suite(Some test suite) --%beforeall @@ -473,7 +474,7 @@ procedure some_test; Marks annotated procedure to be executed before all test procedures in a suite. As a package level annotation (not associated with any procedure). -```sql +```sql linenums="1" --%suite(Some test suite) --%beforeall(to_be_executed_before_all, other_package.some_setup) @@ -490,6 +491,7 @@ Indicates that the procedure(s) mentioned as the annotation parameter are to be If `--%beforeall` raises an exception, suite content cannot be safely executed as the setup was not executed successfully for the suite. If `--%beforeall` raises an exception the following will happen: + - the `--%beforeall` procedures that follow the failed one, **will not be executed** - all `--%test` procedures and their `--%beforeeach`, `--%aftereach`, `--%beforetest` and `--%aftertest` procedures within suite package **will not be executed** - all `--%test` procedures **will be marked as failed** @@ -500,7 +502,7 @@ When multiple `--%beforeall` procedures are defined in a suite package, all of t For multiple `--%beforeall` procedures order of execution is defined by annotation position in the package specification. -```sql +```sql linenums="1" create or replace package test_package as --%suite(Tests for a package) @@ -528,9 +530,10 @@ end; / ``` -```sql +```sql linenums="1" exec ut.run('test_package'); ``` + ``` Tests for a package --- SETUP_STUFF invoked --- @@ -544,7 +547,7 @@ Finished in .012292 seconds In the below example a combination pacakge and procedure level `--%beforeall` annotations is used. The order of execution of the beforeall procedures is determined by the annotation position in package. All of the `--%beforeall` procedures get invoked before any test is executed in a suite. - ```sql +```sql linenums="1" create or replace package test_package as --%suite(Tests for a package) @@ -593,12 +596,13 @@ All of the `--%beforeall` procedures get invoked before any test is executed in procedure other_test is begin null; end; end; / - ``` +``` - ```sql +```sql linenums="1" exec ut.run('test_package'); - ``` - ``` +``` + +``` Tests for a package --- INITIAL_SETUP invoked --- --- ANOTHER_SETUP invoked --- @@ -609,11 +613,11 @@ Tests for a package Finished in .018944 seconds 2 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s) - ``` +``` When multiple `--%beforeall` annotations are specified for a procedure, the first annotation will be used and a warning message will appear indicating duplicate annotation. When procedure is annotated as both `--%beforeall` and `--%test`, the procedure will become a test and a warning message will appear indicating invalid annotation combination. -```sql +```sql linenums="1" create or replace package test_package as --%suite(Tests for a package) @@ -644,10 +648,11 @@ When procedure is annotated as both `--%beforeall` and `--%test`, the procedure / ``` - ```sql +```sql linenums="1" exec ut.run('test_package'); - ``` - ``` +``` + +``` Tests for a package --- INITIAL_SETUP invoked --- Description of tested behavior [.003 sec] @@ -665,7 +670,7 @@ Warnings: Finished in .012158 seconds 2 tests, 0 failed, 0 errored, 0 disabled, 2 warning(s) - ``` +``` ### Afterall @@ -673,7 +678,7 @@ Finished in .012158 seconds There are two possible ways to use the `--%afterall` annotation. As a procedure level annotation: -```sql +```sql linenums="1" --%suite(Some test suite) --%afterall @@ -685,7 +690,7 @@ procedure some_test; Marks annotated procedure to be executed after all test procedures in a suite. As a package level annotation (not associated with any procedure). -```sql +```sql linenums="1" --%suite(Some test suite) --%afterall(to_be_executed_after_all, other_package.some_cleanup) @@ -694,11 +699,12 @@ As a package level annotation (not associated with any procedure). procedure some_test; procedure to_be_executed_after_all; - ``` + Indicates that the procedure(s) mentioned as the annotation parameter are to be executed after all test procedures in a suite. If `--%afterall` raises an exception the following will happen: + - a warning will be raised, indicating that `--%afterall` procedure has failed - execution will continue uninterrupted for rest of the suite @@ -711,7 +717,7 @@ For multiple `--%afterall` procedures order of execution is defined by annotatio All rules defined for `--%beforeall` also apply for `--%afterall` annotation. See [beforeall](#Beforeall) for more details. -```sql +```sql linenums="1" create or replace package test_package as --%suite(Tests for a package) @@ -739,9 +745,10 @@ end; / ``` -```sql +```sql linenums="1" exec ut.run('test_package'); ``` + ``` Tests for a package Description of tested behavior [.003 sec] @@ -760,7 +767,7 @@ That means that the procedure will be executed as many times as there are test i There are two possible ways to use the `--%beforeeach` annotation. As a procedure level annotation: -```sql +```sql linenums="1" --%suite(Some test suite) --%beforeeach @@ -772,7 +779,7 @@ procedure some_test; Marks annotated procedure to be executed before each test procedures in a suite. As a package level annotation (not associated with any procedure). -```sql +```sql linenums="1" --%suite(Some test suite) --%beforeeach(to_be_executed_before_each, other_package.some_setup) @@ -781,14 +788,15 @@ As a package level annotation (not associated with any procedure). procedure some_test; procedure to_be_executed_before_each; - ``` + Indicates that the procedure(s) mentioned as the annotation parameter are to be executed before each test procedure in a suite. If a test is marked as disabled the `--%beforeeach` procedure is not invoked for that test. If `--%beforeeach` raises an unhandled exception the following will happen: + - the following `--%beforeeach` as well as all `--%beforetest` for that test **will not be executed** - the test will be marked as errored and exception stack trace will be captured and reported - the `--%aftertest`, `--%aftereach` procedures **will be executed** for the errored test @@ -801,7 +809,7 @@ When multiple `--%beforeeach` procedures are defined in a suite, all of them wil For multiple `--%beforeeach` procedures order of execution is defined by annotation position in the package specification. -```sql +```sql linenums="1" create or replace package test_package as --%suite(Tests for a package) @@ -842,9 +850,10 @@ end; / ``` -```sql +```sql linenums="1" exec ut.run('test_package'); ``` + ``` Tests for a package ---SETUP_STUFF invoked --- @@ -871,7 +880,7 @@ That means that the procedure will be executed as many times as there are test i There are two possible ways to use the `--%aftereach` annotation. As a procedure level annotation: -```sql +```sql linenums="1" --%suite(Some test suite) --%aftereach @@ -883,7 +892,7 @@ procedure some_test; Marks annotated procedure to be executed after each test procedures in a suite. As a package level annotation (not associated with any procedure). -```sql +```sql linenums="1" --%suite(Some test suite) --%aftereach(to_be_executed_after_each, other_package.some_setup) @@ -892,13 +901,14 @@ As a package level annotation (not associated with any procedure). procedure some_test; procedure to_be_executed_after_each; - ``` + Indicates that the procedure(s) mentioned as the annotation parameter are to be executed after each test procedure in a suite. If a test is marked as disabled the `--%aftereach` procedure is not invoked for that test. If `--%aftereach` raises an unhandled exception the following will happen: + - the test will be marked as errored and exception stack trace will be captured and reported - the `--%aftertest`, `--%aftereach` procedures **will be executed** for the errored test - the `--%afterall` procedures **will be executed** @@ -910,7 +920,7 @@ For multiple `--%aftereach` procedures order of execution is defined by the anno As a rule, the `--%aftereach` gets executed even if the associated `--%beforeeach`, `--%beforetest`, `--%test` or other `--%aftereach` procedures have raised unhandled exceptions. -```sql +```sql linenums="1" create or replace package test_package as --%suite(Tests for a package) @@ -950,7 +960,7 @@ create or replace package body test_package as end; / ``` -```sql +```sql linenums="1" exec ut.run('test_package'); ``` ``` @@ -972,6 +982,7 @@ See [beforeall](#Beforeall) for more examples. ### Beforetest Indicates specific setup procedure(s) to be executed for a test. The procedure(s) can be located either: + - within current package (package name is optional) - within another package @@ -982,6 +993,7 @@ The `--%beforetest` procedures are executed after invoking all `--%beforeeach` f If a test is marked as disabled the `--%beforetest` procedures are not invoked for that test. If `--%beforetest` raises an unhandled exception the following will happen: + - the following `--%beforetest` for that test **will not be executed** - the test will be marked as errored and exception stack trace will be captured and reported - the `--%aftertest`, `--%aftereach` procedures **will be executed** for the errored test @@ -991,12 +1003,13 @@ If `--%beforetest` raises an unhandled exception the following will happen: When multiple `--%beforetest` procedures are defined for a test, all of them will be executed before invoking the test. The order of execution for `--%beforetest` procedures is defined by: + - position of procedure on the list within single annotation - annotation position As a rule, the `--%beforetest` execution gets aborted if preceding `--%beforeeach` or `--%beforetest` failed. -```sql +```sql linenums="1" create or replace package test_package as --%suite(Tests for a package) @@ -1038,7 +1051,7 @@ create or replace package body test_package as end; / ``` -```sql +```sql linenums="1" exec ut.run('test_package'); ``` ``` @@ -1060,6 +1073,7 @@ Finished in .015185 seconds ### Aftertest Indicates specific cleanup procedure(s) to be executed for a test. The procedure(s) can be located either: + - within current package (package name is optional) - within another package @@ -1068,6 +1082,7 @@ The annotation need to be placed alongside `--%test` annotation. If a test is marked as disabled the `--%aftertest` procedures are not invoked for that test. If `--%aftertest` raises an unhandled exception the following will happen: + - the test will be marked as errored and exception stack trace will be captured and reported - the following `--%aftertest` and all `--%aftereach` procedures **will be executed** for the errored test - the `--%afterall` procedures **will be executed** @@ -1076,12 +1091,13 @@ If `--%aftertest` raises an unhandled exception the following will happen: When multiple `--%aftertest` procedures are defined for a test, all of them will be executed after invoking the test. The order of execution for `--%aftertest` procedures is defined by: + - position of procedure on the list within single annotation - annotation position As a rule, the `--%aftertest` gets executed even if the associated `--%beforeeach`, `--%beforetest`, `--%test` or other `--%aftertest` procedures have raised unhandled exceptions. -```sql +```sql linenums="1" create or replace package test_package as --%suite(Tests for a package) @@ -1123,7 +1139,7 @@ create or replace package body test_package as end; / ``` -```sql +```sql linenums="1" exec ut.run('test_package'); ``` ``` @@ -1158,6 +1174,7 @@ Contexts allow for creating sub-suites within a suite package and they allow for In essence, context behaves like a suite within a suite. Context have following characteristics: + - context starts with the `--%context` annotation and ends with `--%endcontext`. Everything placed between those two annotations belongs to that context - can have a description provided as parameter for example `--%context(Some interesting stuff)`. - can have a name provided with `--%name` annotation. This is different than with `suite` and `test` annotations, where name is taken from `package/procedure` name. @@ -1175,7 +1192,7 @@ Context have following characteristics: The below example illustrates usage of `--%context` for separating tests for individual procedures of package. Sample tables and code -```sql +```sql linenums="1" create table rooms ( room_key number primary key, name varchar2(100) not null @@ -1232,11 +1249,12 @@ end; ``` Below test suite defines: + - `--%beforeall` outside of context, that will be executed before all tests - `--%context(remove_rooms_by_name)` to group tests related to `remove_rooms_by_name` functionality - `--%context(add_rooms_content)` to group tests related to `add_rooms_content` functionality -```sql +```sql linenums="1" create or replace package test_rooms_management is gc_null_value_exception constant integer := -1400; @@ -1355,8 +1373,8 @@ end; / ``` -When te tests are executed -```sql +When the tests are executed +```sql linenums="1" exec ut.run('test_rooms_management'); ``` The following report is displayed @@ -1378,7 +1396,7 @@ Finished in .035261 seconds Example of nested contexts test suite specification. *Source - [slide 145](https://www.slideshare.net/Kevlin/structure-and-interpretation-of-test-cases/145?src=clipshare) of Structure and Interpretation of Test Cases by Kevlin Henney* -```sql +```sql linenums="1" create or replace package queue_spec as --%suite(Queue specification) @@ -1468,7 +1486,7 @@ The `--%name` can be useful when you would like to run only a specific context o Consider the below example. -```sql +```sql linenums="1" create or replace package queue_spec as --%suite(Queue specification) @@ -1501,22 +1519,22 @@ end; In the above code, suitepaths, context names and context descriptions will be as follows. -| suitepath | description | name | -|-----------|------------|------| -| queue_spec | Queue specification | queue_spec | -| queue_spec.context_#1 | A new queue | context_#1 | -| queue_spec.context_#2 | An empty queue | context_#2 | -| queue_spec.context_#3 | A non empty queue | context_#3 | -| queue_spec.context_#3.context_#1 | that is not full | context_#1 | -| queue_spec.context_#3.context_#2 | that is full | context_#2 | +| suitepath | description | name | +|----------------------------------|----------------------|------------| +| queue_spec | Queue specification | queue_spec | +| queue_spec.context_#1 | A new queue | context_#1 | +| queue_spec.context_#2 | An empty queue | context_#2 | +| queue_spec.context_#3 | A non empty queue | context_#3 | +| queue_spec.context_#3.context_#1 | that is not full | context_#1 | +| queue_spec.context_#3.context_#2 | that is full | context_#2 | In order to run only the tests for the context `A non empty queue that is not full` you will need to call utPLSQL as below: -```sql +```sql linenums="1" exec ut.run(':queue_spec.context_#3.context_#1'); ``` You can use `--%name` annotation to explicitly name contexts on suitepath. -```sql +```sql linenums="1" create or replace package queue_spec as --%suite(Queue specification) @@ -1554,23 +1572,25 @@ end; In the above code, suitepaths, context names and context descriptions will be as follows. -| suitepath | description | name | -|-----------|------------|------| -| queue_spec | Queue specification | queue_spec | -| queue_spec.a_new_queue | A new queue | a_new_queue | -| queue_spec.an_empty_queue | An empty queue | an_empty_queue | -| queue_spec.a_non_empty_queue | A non empty queue | a_non_empty_queue | -| queue_spec.a_non_empty_queue.that_is_not_full | that is not full | that_is_not_full | -| queue_spec.a_non_empty_queue.that_is_full | that is full | that_is_full | +| suitepath | description | name | +|-----------------------------------------------|-----------------------|-------------------| +| queue_spec | Queue specification | queue_spec | +| queue_spec.a_new_queue | A new queue | a_new_queue | +| queue_spec.an_empty_queue | An empty queue | an_empty_queue | +| queue_spec.a_non_empty_queue | A non empty queue | a_non_empty_queue | +| queue_spec.a_non_empty_queue.that_is_not_full | that is not full | that_is_not_full | +| queue_spec.a_non_empty_queue.that_is_full | that is full | that_is_full | The `--%name` annotation is only relevant for: + - running subsets of tests by given context suitepath - some of test reports, like `ut_junit_reporter` that use suitepath or test-suite element names (not descriptions) for reporting #### Name naming convention The value of `--%name` annotation must follow the following naming rules: + - cannot contain spaces - cannot contain a `.` (full stop/dot) - is case-insensitive @@ -1583,13 +1603,13 @@ It allows for grouping of tests / suites using various categorization and place e.g. -```sql +```sql linenums="1" --%tags(batch,daily,csv) ``` or -```sql +```sql linenums="1" --%tags(online,json) --%tags(api) ``` @@ -1603,7 +1623,7 @@ When a suite/context is tagged, all of its children will automatically inherit t Sample test suite package with tags. -```sql +```sql linenums="1" create or replace package ut_sample_test is --%suite(Sample Test Suite) @@ -1643,17 +1663,17 @@ end ut_sample_test; Execution of the test is done by using the parameter `a_tags` -```sql +```sql linenums="1" select * from table(ut.run(a_path => 'ut_sample_test',a_tags => 'api')); ``` The above call will execute all tests from `ut_sample_test` package as the whole suite is tagged with `api` -```sql +```sql linenums="1" select * from table(ut.run(a_tags => 'complex')); ``` The above call will execute only the `ut_sample_test.ut_refcursors1` test, as only the test `ut_refcursors1` is tagged with `complex` -```sql +```sql linenums="1" select * from table(ut.run(a_tags => 'fast')); ``` The above call will execute both `ut_sample_test.ut_refcursors1` and `ut_sample_test.ut_test` tests, as both tests are tagged with `fast` @@ -1677,7 +1697,7 @@ In order to do so, prefix the tag name to exclude with a `-` (dash) sign when in Examples (based on above sample test suite) -```sql +```sql linenums="1" select * from table(ut.run(a_tags => 'api,fast,-complex')); ``` The above call will execute all suites/contexts/tests that are marked with any of tags `api` or `fast` except those suites/contexts/tests that are marked as `complex`. @@ -1705,7 +1725,7 @@ If you want to create tests for your application it is recommended to structure The `--%suitepath` annotation is used for such grouping. Even though test packages are defined in a flat structure the `--%suitepath` is used by the framework to form them into a hierarchical structure. Your payments recognition test package might look like: -```sql +```sql linenums="1" create or replace package test_payment_recognition as --%suite(Payment recognition tests) @@ -1724,7 +1744,7 @@ end test_payment_recognition; ``` And payments set off test package: -```sql +```sql linenums="1" create or replace package test_payment_set_off as --%suite(Payment set off tests) @@ -1743,7 +1763,7 @@ When you execute tests for your application, the framework constructs a test sui The test report indicates which expectation has failed on the payments module. The payments recognition submodule is causing the failure as `recognize_by_num` has not met the expectations of the test. Grouping tests into modules and submodules using the `--%suitepath` annotation allows you to logically organize your project's flat structure of packages into functional groups. An additional advantage of such grouping is the fact that every element level of the grouping can be an actual unit test package containing a common module level setup for all of the submodules. So in addition to the packages mentioned above you could have the following package. -```sql +```sql linenums="1" create or replace package payments as --%suite(Payments) @@ -1758,6 +1778,7 @@ end payments; ``` When executing tests, `path` for executing tests can be provided in three ways: + * schema - execute all tests in the schema * [schema]:suite1[.suite2][.suite3]...[.procedure] - execute all tests by `suitepath` in all suites on path suite1[.suite2][.suite3]...[.procedure]. If schema is not provided, then the current schema is used. Example: `:all.rooms_tests` * [schema.]package[.procedure] - execute all tests in the specified test package. The whole hierarchy of suites in the schema is built before all before/after hooks or part suites for the provided suite package are executed as well. Example: `tests.test_contact.test_last_name_validator` or simply `test_contact.test_last_name_validator` if `tests` is the current schema. @@ -1798,6 +1819,7 @@ Keep in mind that when your test runs as autonomous transaction it will not see ### Throws The `--%throws` annotation allows you to specify a list of exceptions as one of: + - number literals - example `--%throws(-20134)` - variables of type exception defined in a package specification - example `--%throws(exc_pkg.c_exception_No_variable)` - variables of type number defined in a package specification - example `--%throws(exc_pkg.c_some_exception)` @@ -1814,9 +1836,9 @@ The framework will raise a warning, when `--%throws` annotation has invalid argu Annotation `--%throws(7894562, operaqk, -=1, -20496, pow74d, posdfk3)` will be interpreted as `--%throws(-20496)`. Please note that `NO_DATA_FOUND` exception is a special case in Oracle. To capture it use `NO_DATA_FOUND` named exception or `-1403` exception No. -​ + Example: -```sql +```sql linenums="1" create or replace package exc_pkg is c_e_option1 constant number := -20200; c_e_option2 constant varchar2(10) := '-20201'; @@ -1979,7 +2001,7 @@ Finished in .025784 seconds ## Order of execution -```sql +```sql linenums="1" create or replace package test_employee_pkg is --%suite(Employee management) @@ -2101,46 +2123,50 @@ When processing the test suite `test_employee_pkg` defined in [Example of annota rollback to savepoint 'before-suite' ``` -**Note** ->utPLSQL does not guarantee ordering of tests in suite. On contrary utPLSQL might give random order of tests/contexts in suite. -> ->Order of execution within multiple occurrences of `before`/`after` procedures is determined by the order of annotations in specific block (context/suite) of package specification. +!!! note + utPLSQL does not guarantee ordering of tests in suite. On contrary utPLSQL might give random order of tests/contexts in suite.
    + Order of execution within multiple occurrences of `before`/`after` procedures is determined by the order of annotations in specific block (context/suite) of package specification. ## sys_context It is possible to access information about currently running suite. The information is available by calling `sys_context( 'UT3_INFO', attribute )`. -It can be accessed from any procecure invoked as part of utPLSQL test execution. +It can be accessed from any procedure invoked as part of utPLSQL test execution. -**Note:** -> Context name is derived from schema name where utPLSQL is installed. -> The context name in below examples represents the default install schema -> `UT3` -> If you install utPLSQL into another schema the context name will be different. -> For example if utPLSQL is installed into `HR` schema, the context name will be `HR_INFO` +!!! note + Context name is derived from schema name where utPLSQL is installed.
    + The context name in below examples represents the default install schema -> `UT3`
    + If you install utPLSQL into another schema the context name will be different.
    + For example if utPLSQL is installed into `HR` schema, the context name will be `HR_INFO` Following attributes are populated: -- For entire duration of the test-run: - - `sys_context( 'UT3_INFO', 'COVERAGE_RUN_ID' );` - Value of COVERAGE_RUN_ID used by utPLSQL internally for coverage gathering - - `sys_context( 'UT3_INFO', 'RUN_PATHS' );` - list of suitepaths / suitenames used as input parameters for call to `ut.run(...)` or `ut_runner.run(...)` - - `sys_context( 'UT3_INFO', 'SUITE_DESCRIPTION' );` - the description of test suite that is currently being executed - - `sys_context( 'UT3_INFO', 'SUITE_PACKAGE' );` - the owner and name of test suite package that is currently being executed - - `sys_context( 'UT3_INFO', 'SUITE_PATH' );` - the suitepath for the test suite package that is currently being executed - - `sys_context( 'UT3_INFO', 'SUITE_START_TIME' );` - the execution start timestamp of test suite package that is currently being executed - - `sys_context( 'UT3_INFO', 'CURRENT_EXECUTABLE_NAME' );` - the owner.package.procedure of currently running test suite executable - - `sys_context( 'UT3_INFO', 'CURRENT_EXECUTABLE_TYPE' );` - the type of currently running test suite executable (one of: `beforeall`, `beforeeach`, `beforetest`, `test`, `aftertest`, `aftereach`, `afterall` - -- When running in suite context - - `sys_context( 'UT3_INFO', 'CONTEXT_DESCRIPTION' );` - the description of test suite context that is currently being executed - - `sys_context( 'UT3_INFO', 'CONTEXT_NAME' );` - the name of test suite context that is currently being executed - - `sys_context( 'UT3_INFO', 'CONTEXT_PATH' );` - the suitepath for the currently executed test suite context - - `sys_context( 'UT3_INFO', 'CONTEXT_START_TIME' );` - the execution start timestamp for the currently executed test suite context -- When running a suite executable procedure that is a `test` or `beforeeach`, `aftereach`, `beforetest`, `aftertest` - - `sys_context( 'UT3_INFO', 'TEST_DESCRIPTION' );` - the description of test for which the current executable is being invoked - - `sys_context( 'UT3_INFO', 'TEST_NAME' );` - the name of test for which the current executable is being invoked - - `sys_context( 'UT3_INFO', 'TEST_START_TIME' );` - the execution start timestamp of test that is currently being executed (the time when first `beforeeach`/`beforetest` was called for that test) + +| Name | Scope | Description | +|-------------------------|---------------|-----------------------------------------------------------------------------------------------------------------------------------------------------| +| COVERAGE_RUN_ID | run | Value of COVERAGE_RUN_ID used by utPLSQL internally for coverage gathering | +| RUN_PATHS | run | list of suitepaths / suitenames used as input parameters for call to `ut.run(...)` or `ut_runner.run(...)` | +| SUITE_DESCRIPTION | run | the description of test suite that is currently being executed | +| SUITE_PACKAGE | run | the owner and name of test suite package that is currently being executed | +| SUITE_PATH | run | the suitepath for the test suite package that is currently being executed | +| SUITE_START_TIME | run | the execution start timestamp of test suite package that is currently being executed | +| CURRENT_EXECUTABLE_NAME | run | the owner.package.procedure of currently running test suite executable | +| CURRENT_EXECUTABLE_TYPE | run | the type of currently running test suite executable (one of: `beforeall`, `beforeeach`, `beforetest`, `test`, `aftertest`, `aftereach`, `afterall` | + | CONTEXT_DESCRIPTION | suite context | the description of test suite context that is currently being executed | + | CONTEXT_NAME | suite context | the name of test suite context that is currently being executed | + | CONTEXT_PATH | suite context | the suitepath for the currently executed test suite context | + | CONTEXT_START_TIME | suite context | the execution start timestamp for the currently executed test suite context | +| TEST_DESCRIPTION | test* | the description of test for which the current executable is being invoked | +| TEST_NAME | test* | the name of test for which the current executable is being invoked | +| TEST_START_TIME | test* | the execution start timestamp of test that is currently being executed (the time when first `beforeeach`/`beforetest` was called for that test) | + +!!! note "Scopes" + - run - context information is available in any element of test run
    + - suite context - context information is available in any element nested within a suite context
    + - test* - context information is available when executing following procedure types: test, beforetest, aftertest, beforeeach or aftereach + Example: -```sql +```sql linenums="1" create or replace procedure which_procecure_called_me is begin dbms_output.put_line( @@ -2199,7 +2225,7 @@ end; / ``` -```sql +```sql linenums="1" exec ut.run('test_call'); ``` @@ -2232,14 +2258,14 @@ If you are in a situation where your database is controlled via CI/CD server and To build the annotation cache without actually invoking any tests, call `ut_runner.rebuild_annotation_cache(a_object_owner)` for every unit test owner for which you want to have the annotation cache prebuilt. Example: -```sql +```sql linenums="1" exec ut_runner.rebuild_annotation_cache('HR'); ``` To purge the annotation cache call `ut_runner.purge_cache(a_object_owner, a_object_type)`. Both parameters are optional and if not provided, all owners/object_types will be purged. Example: -```sql +```sql linenums="1" exec ut_runner.purge_cache('HR', 'PACKAGE'); ``` diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 1a227d9e4..20707e917 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -9,9 +9,14 @@ Code coverage is gathered for the following source types: * procedures * functions -**Note** +!!! note -> The package and type specifications are excluded from code coverage analysis. This limitation is introduced to avoid false-negatives. Typically package specifications contain no executable code. The only exception is initialization of global constants and variables in package specification. Since most package specifications are not executable at all, there is no information available on the number of lines covered and those would be reported as 0% covered, which is not desirable. + The package and type specifications are excluded from code coverage analysis. + This limitation is introduced to avoid false-negatives. + Typically package specifications contain no executable code. + The only exception is initialization of global constants and variables in package specification. + Since most package specifications are not executable at all, there is no information available + on the number of lines covered and those would be reported as 0% covered, which is not desirable. To obtain information about code coverage for unit tests, run utPLSQL with one of built-in code coverage reporters. The following code coverage reporters are supplied with utPLSQL: @@ -39,7 +44,7 @@ Using the code coverage functionality is as easy as using any other [reporter](r All you need to do, is pass the constructor of the reporter to the `ut.run` procedure call. Example: -```sql +```sql linenums="1" set serveroutput on begin ut.run(ut_coverage_html_reporter()); @@ -58,7 +63,7 @@ The report allow you to navigate to each source file and inspect line by line co ![Coverage Details page](../images/coverage_html_details.png) -#### Oracle 12.2 extended coverage with profiler and block coverage +### Oracle 12.2 extended coverage with profiler and block coverage Using data collected from profiler and block coverage running parallel we are able to enrich information about coverage. For every line recorded by the profiler if we have a partially covered same line in block coverage we will display that information presenting line as partially covered, displaying number of block and how many blocks have been covered in that line.The feature will be automatically enabled in the Oracle database version 12.2 and higher, for older versions current profiler will be used. @@ -89,8 +94,8 @@ The parameters used to execute tests determine if utPLSQL will be using one appr If parameter `a_source_file_mappings` or `a_source_files` is provided, then coverage is gathered on project files provided, otherwise coverage is gathered on schemas. -**Note** -> Regardless of the options provided, all unit test packages are excluded from the coverage report. Coverage reports provide information only about the **tested** code. +!!! note + Regardless of the options provided, all unit test packages are excluded from the coverage report. Coverage reports provide information only about the **tested** code. The default behavior of coverage reporting can be altered using invocation parameters. @@ -99,17 +104,16 @@ The default behavior of coverage reporting can be altered using invocation param To gather coverage for all objects in the **current schema** execute tests with coverage report as argument. This is the default reporting option and therefore additional coverage options don't need to be provided. -```sql +```sql linenums="1" exec ut.run(ut_coverage_html_reporter()); ``` -**Note** +!!! note -> When no filters are used, the size of the coverage report will depend two factors: -> - the type of report (does the report include source code or not) -> - the amount of source code in the database schema -> ->Keep in mind that for schemas containing a lot of code, it can take quite some time to produce the coverage report. + When no filters are used, the size of the coverage report will depend two factors:
    + - the type of report (does the report include source code or not)
    + - the amount of source code in the database schema
    + Keep in mind that for schemas containing a lot of code, it can take quite some time to produce the coverage report. #### Setting coverage schema(s) @@ -117,7 +121,7 @@ By default, coverage is gathered on the schema(s) derived from suite paths provi This is a valid approach as long as your test packages and tested code share the same schema. So when you run: -```sql +```sql linenums="1" exec ut.run(ut_varchar2_list('user_1','user_2'), ut_coverage_html_reporter()); ``` Coverage will be gathered on both `user_1` and `user_2` objects. @@ -126,13 +130,18 @@ If your tests live in a different schema from the tested code you may override t In the example below, coverage will still be gathered for `user_1` and `user_2` objects, even thought we run the tests located in schema `unit_test_schema` -```sql -exec ut.run('unit_test_schema', ut_coverage_html_reporter(), a_coverage_schemes => ut_varchar2_list('user_1','user_2') ); +```sql linenums="1" +begin + ut.run('unit_test_schema', ut_coverage_html_reporter(), + a_coverage_schemes => ut_varchar2_list('user_1','user_2') + ); +end; ``` #### Filtering objects in coverage reports Multiple parameters can be used to define the scope of coverage report. + - `a_source_file_mappings ( ut_file_mappings )` - map of filenames to database objects. It is used for file-based coverage - see below. - `a_include_schema_expr ( varchar(4000) )` - string of regex expression of schemas to be included in the coverage report. Case-insensitive. - `a_include_object_expr ( varchar(4000) )` - string of regex expression of objects ( without schema name ) to be included in the coverage report. Case-insensitive. @@ -144,22 +153,23 @@ Multiple parameters can be used to define the scope of coverage report. You may specify both _include_ and _exclude_ options to gain more control over what needs to be included / excluded from the coverage report. -**Important notes** -The order of priority is for evaluation of include/exclude filter parameters is as follows. -- if `a_source_file_mappings` is defined then all include/exclude parameters are ignored (see section below for usage of `a_source_file_mappings` parameter ) -- else if `a_include_schema_expr` or `a_include_object_expr` parameter is specified then parameters `a_coverage_schemes` and `a_include_objects` are ignored -- else if `a_include_objects` is specified then the coverage is gathered only on specified database objects. - - if `a_coverage_schemes` is specified then those schemas are used for objects in `a_include_objects` without schema name - - if `a_coverage_schemes` is not specified then schema from paths (`a_paths`) parameter are used for objects in `a_include_objects` without schema name -- else if, only the `a_coverage_schemes` is specified then the coverage is gathered only on specified database schemas -- else if no coverage specific parameters are provided coverage is gathered on all schemas specified in paths passed to run procedure -- else if no paths were specified, the coverage is gathered on current schema of the session running the tests +!!! warning "Important note" + The order of priority is for evaluation of include/exclude filter parameters is as follows.
    + - if `a_source_file_mappings` is defined then all include/exclude parameters are ignored (see section below for usage of `a_source_file_mappings` parameter )
    + - else if `a_include_schema_expr` or `a_include_object_expr` parameter is specified then parameters `a_coverage_schemes` and `a_include_objects` are ignored
    + - else if `a_include_objects` is specified then the coverage is gathered only on specified database objects.
    + - if `a_coverage_schemes` is specified then those schemas are used for objects in `a_include_objects` without schema name
    + - if `a_coverage_schemes` is not specified then schema from paths (`a_paths`) parameter are used for objects in `a_include_objects` without schema name
    + - else if, only the `a_coverage_schemes` is specified then the coverage is gathered only on specified database schemas
    + - else if no coverage specific parameters are provided coverage is gathered on all schemas specified in paths passed to run procedure
    + - else if no paths were specified, the coverage is gathered on current schema of the session running the tests + The exclude parameters are not mutually-exclusive and can be mixed together. All of exclude parameters are always applied. Example: Limiting coverage by schema regex. -```sql +```sql linenums="1" begin ut.run(ut_varchar2_list('user_1','user_2'), ut_coverage_html_reporter(), a_include_schema_expr => '^ut3_develop' @@ -169,7 +179,7 @@ end; Will result in showing coverage for all schemas that match regular expression `^ut3_develop` Example: Limiting coverage by schema regex with parameter `a_include_objects` ignored. -```sql +```sql linenums="1" begin ut.run(ut_varchar2_list('user_1','user_2'), ut_coverage_html_reporter(), a_include_schema_expr => '^ut3_develop', a_include_objects => ut_varchar2_list( 'ut3_tester_helper.regex_dummy_cov' ) @@ -179,7 +189,7 @@ end; Will result in showing coverage for all schemas that match regular expression `^ut3_develop`. Example: Limiting coverage by object regex. -```sql +```sql linenums="1" begin ut.run(ut_varchar2_list('user_1','user_2'), ut_coverage_html_reporter(), a_include_object_expr => 'regex123' @@ -189,7 +199,7 @@ end; Will result in showing coverage for all objects that name match regular expression `regex123`. Example: Limiting coverage by object regex with parameter `a_include_objects` ignored. -```sql +```sql linenums="1" begin ut.run(ut_varchar2_list('user_1','user_2'), ut_coverage_html_reporter(), a_include_object_expr => 'utl', a_include_objects => ut_varchar2_list( 'user_2.utils_package' ) @@ -199,7 +209,7 @@ end; Will result in showing coverage for all objects that name match regular expression `utl`. Example: Limiting coverage by excluding schema with regex. -```sql +```sql linenums="1" begin ut.run(ut_varchar2_list('user_1','user_2'), ut_coverage_html_reporter(), a_exclude_schema_expr => 'er_1$' @@ -209,7 +219,7 @@ end; Will result in showing coverage for objects in all schema except schemas that are matching regular expression `er_1$` Example: Limiting coverage by excluding schema with regex and excluding specific object. -```sql +```sql linenums="1" begin ut.run(ut_varchar2_list('user_1','user_2'), ut_coverage_html_reporter(), a_exclude_schema_expr => 'er_1$', a_exclude_objects => ut_varchar2_list( 'user_2.utils_package' ) @@ -220,7 +230,7 @@ Will result in showing coverage for objects in all schemas except schemas that a Will also exclude object `user_2.utils_package` from coverage report Example: Limiting coverage by excluding objects with regex. -```sql +```sql linenums="1" begin ut.run(ut_varchar2_list('user_1','user_2'), ut_coverage_html_reporter(), a_exclude_object_expr => 'utl' @@ -230,7 +240,7 @@ end; Will result in showing coverage for all objects that name is not matching regular expression `utl`. Example: Limiting coverage by excluding objects with regex with parameter `a_exclude_objects` ignored. -```sql +```sql linenums="1" begin ut.run(ut_varchar2_list('user_1','user_2'), ut_coverage_html_reporter(), a_exclude_object_expr => 'utl', a_exclude_objects => ut_varchar2_list( 'user_2.utils_package' ) @@ -242,14 +252,18 @@ Will also exclude object `user_2.utils_package` from coverage report Example: Limiting coverage by object name, for tested code located in the same schema as the unit tests. -```sql -exec ut.run(ut_varchar2_list('user_1','user_2'), ut_coverage_html_reporter(), a_include_objects=>ut_varchar2_list('award_bonus')); +```sql linenums="1" +begin + ut.run(ut_varchar2_list('user_1','user_2'), ut_coverage_html_reporter(), + a_include_objects=>ut_varchar2_list('award_bonus') + ); +end; ``` Executes all tests in schemas: `user_1` and `user_2`. Coverage will only be reported on objects `user_1.award_bonus`, `user_2.award_bonus` Example: Limiting coverage by object name, for tested code located in different schemas than the unit tests. -```sql +```sql linenums="1" begin ut.run( 'unit_test_schema', ut_coverage_html_reporter(), @@ -262,7 +276,7 @@ Executes all tests in schema `unit_test_schema`. Coverage will only be reported Objects that do not exist in the database but were specified in `a_include_objects` will be ignored. Example: Limiting coverage by object owner and name. -```sql +```sql linenums="1" begin ut.run( 'unit_test_schema', ut_coverage_html_reporter(), @@ -275,7 +289,7 @@ Executes all tests in schema `unit_test_schema`. Coverage will only be reported The `a_exclude_objects` can be used in the same way as `a_include_objects`. Example: Excluding objects from coverage report by providing a list of object owner/name to be excluded. -```sql +```sql linenums="1" begin ut.run( 'unit_test_schema.test_award_bonus', ut_coverage_html_reporter(), @@ -285,12 +299,12 @@ end; ``` Executes test `test_award_bonus` in schema `unit_test_schema`. Coverage will be reported on all objects in schema `ut3_user` except the `betwnstr` object. -**Note** -> Filtering using `a_include_objects` and `a_exclude_objects` is only applicable when gathering coverage for a schema. Those filters are not applied when reporting coverage on project files. +!!! note + Filtering using `a_include_objects` and `a_exclude_objects` is only applicable when gathering coverage for a schema. Those filters are not applied when reporting coverage on project files. -**Note** -> When running coverage on schema objects, all source code of package bodies, functions, procedures, type bodies and triggers that were not executed will be reported as having 0% code coverage and all source code lines will show as uncovered. -> This is different from the behavior when gathering coverage on project files. +!!! note + When running coverage on schema objects, all source code of package bodies, functions, procedures, type bodies and triggers that were not executed will be reported as having 0% code coverage and all source code lines will show as uncovered. + This is different from the behavior when gathering coverage on project files. ### Project based Coverage @@ -345,16 +359,17 @@ By default, utPLSQL will convert file paths into database objects using the foll - object type is identified by the expression in the sixth set of brackets -**Note** -> utPLSQL will replace any '\\' with '/' for the purpose of mapping files to objects. The paths shown in the results will remain (contain '\' where it was present). -> This is done to simplify the syntax of regular expressions. Regular expression will always use '/' as a directory separator on a file path regardless of whether you're on a Windows or Unix system. +!!! note + utPLSQL will replace any '\\' with '/' for the purpose of mapping files to objects. The paths shown in the results will remain (contain '\' where it was present). + This is done to simplify the syntax of regular expressions. Regular expression will always use '/' as a directory separator on a file path regardless of whether you're on a Windows or Unix system. -**Note** -> Below examples assume that you have downloaded latest version of [utPLSQL-cli](https://github.com/utPLSQL/utPLSQL-cli/releases) and extracted it into your projects root directory (my_project). -> The examples assume that you run the utPLSQL-cli from `my_project` directory. +!!! note + Below examples assume that you have downloaded latest version of [utPLSQL-cli](https://github.com/utPLSQL/utPLSQL-cli/releases) + and extracted it into your projects root directory + and that you run the utPLSQL-cli from that directory. Windows: -``` +```pwsh utPLSQL-cli\bin\utplsql run test_runner/pass@db_host:db_port/db_service_name ^ -p=hr,hotel ^ -source_path=sources ^ @@ -374,6 +389,7 @@ utPLSQL-cli/bin/utplsql run test_runner/pass@db_host:db_port/db_service_name \ ``` The above commands will: + - connect as user `test_runner` - run all utPLSQL v3 tests for users `hr`, `hotel` - map database code to project files in `sources` directory and save code coverage results into `coverage.html` @@ -424,7 +440,7 @@ Note that the owner/name/type subexpressions don't need to be explicitly specifi In the below example, they were specified explicitly only for `source_path`, `test_path` doesn't have subexpressions specified and so they are default (2/3/4). Windows: -``` +```pwsh utPLSQL-cli\bin\utplsql run test_runner/pass@db_url ^ -p=hr,hotel ^ -source_path=sources ^ @@ -487,7 +503,7 @@ For the database objects mapped to `souces` directory user `code_owner` will be For the database objects mapped to `tests` directory user `tests_owner` will be used. Windows: -``` +```pwsh utPLSQL-cli\bin\utplsql run test_runner/pass@db_url ^ -p=tests_owner ^ -source_path=sources -owner=code_owner ^ @@ -506,9 +522,9 @@ utPLSQL-cli/bin/utplsql run test_runner/pass@db_url \ -f=ut_sonar_test_reporter -o=test_results.xml ``` -**Note** -> When the project folder structure does not provide any information about source code owner and test owner, you can specify the owner for tests and owner for code explicitly. -> Such project configuration supports only single-owner for source code and single owner for tests. +!!! note + When the project folder structure does not provide any information about source code owner and test owner, you can specify the owner for tests and owner for code explicitly. + Such project configuration supports only single-owner for source code and single owner for tests. Tested code is mapped to files in `coverage.html` @@ -585,7 +601,7 @@ C: Windows: -``` +```pwsh utPLSQL-cli\bin\utplsql run test_runner/pass@db_url ^ -p=hr,hotel ^ -source_path=sources ^ @@ -636,7 +652,8 @@ Unit test code is mapped to files in `test_results.xml` #### Object-file mapping rules -In order to allow deterministic and accurate mapping of database source-code into project files, the project directory and file structure needs to meet certain criteria. +In order to allow deterministic and accurate mapping of database source-code into project files, the project directory and file structure needs to meet certain criteria. + - Source code is kept separate from test code (separate directories) - Each database (source-code) object is stored in an individual file. Package/type specification is kept separate from its body. - File name (file path) contains the name of database object @@ -650,6 +667,7 @@ In order to allow deterministic and accurate mapping of database source-code int The `ut.run` command provides interface to map project into database objects when executing tests. While it is much easier to perform mapping directly from command line, it is possible to achieve similar functionality from any SQL client. The main differences when using the `ut.run(...)` command, will be: + - you can only use single reporter and therefore will get only one report from test execution - you need to provide fill list of project files rather than point to `sources` and `tests` directories @@ -701,7 +719,7 @@ C: To execute all tests and map database source code into source file names you could use the following command in any SQL client: -```sql +```sql linenums="1" begin ut.run( ut_varchar2_list('hr','hotel'), @@ -733,7 +751,7 @@ end; ``` To execute all tests and map database tests code into test file names you could use the following command in any SQL client: -```sql +```sql linenums="1" begin ut.run( ut_varchar2_list('hr','hotel'), @@ -778,7 +796,7 @@ Following API calls enable the standalone coverage reporting. - `.get_report_cursor( ... )` - coverage reporters function producing coverage report as ref-cursor Example: -```sql +```sql linenums="1" --SESSION 1 -- gather coverage on code using specific coverage_run_id value declare @@ -795,7 +813,7 @@ end; / ``` -```sql +```sql linenums="1" --SESSION 2 -- alternative approach -- gather coverage on code using specific coverage_run_id value @@ -807,7 +825,7 @@ exec ut_runner.coverage_stop(); ``` -```sql +```sql linenums="1" --SESSION 1 or SESSION2 2 or SESSION 3 -- run after calls in SESSION 1 & 2 are finished -- retrieve coverage report in HTML format coverage_run_id value @@ -821,7 +839,7 @@ select * ); ``` -```sql +```sql linenums="1" --SESSION 1 or SESSION2 2 or SESSION 3 -- run after calls in SESSION 1 & 2 are finished declare @@ -839,20 +857,20 @@ end; ``` Specification of parameters for `get_report` and `get_report_cursor` -```sql +```sql linenums="1" function get_report( a_coverage_options ut_coverage_options, a_client_character_set varchar2 := null ) return ut_varchar2_rows pipelined ``` -```sql +```sql linenums="1" function get_report_cursor( a_coverage_options ut_coverage_options, a_client_character_set varchar2 := null ) return sys_refcursor ``` -```sql +```sql linenums="1" ut_coverage_options( coverage_run_id raw, schema_names ut_varchar2_rows := null, diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index d83142f9f..c795c5421 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,23 +1,29 @@ ![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) -The utPLSQL is responsible for handling exceptions wherever they occur in the test run. utPLSQL is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. -The framework provides a full stacktrace for every exception that was thrown. The stacktrace is clean and does not include any utPLSQL library calls in it. +utPLSQL is responsible for handling exceptions wherever they occur in the test run. The framework is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. +The framework provides a full stacktrace for every exception that was thrown. The reported stacktrace does not include any utPLSQL library calls in it. To achieve rerunability, the package state invalidation exceptions (ORA-04068, ORA-04061) are not handled and test execution will be interrupted if such exceptions are encountered. This is because of how Oracle behaves on those exceptions. Test execution can fail for different reasons. The failures on different exceptions are handled as follows: -* A test package without body - each `--%test` is reported as failed with exception, nothing is executed -* A test package with _invalid body_ - each `--%test` is reported as failed with exception, nothing is executed -* A test package with _invalid spec_ - package is not considered a valid unit test package and is excluded from execution. When trying to run a test package with invalid spec explicitly, exception is raised. Only valid specifications are parsed for annotations -* A test package that is raising an exception in `--%beforeall` - each `--%test` is reported as failed with exception, `--%test`, `--%beforeeach`, `--%beforetest`, `--%aftertest` and `--%aftereach` are not executed. `--%afterall` is executed to allow cleanup of whatever was done in `--%beforeall` -* A test package that is raising an exception in `--%beforeeach` - each `--%test` is reported as failed with exception, `--%test`, `--%beforetest` and `--%aftertest` is not executed. The `--%aftereach` and `--%afterall` blocks are getting executed to allow cleanup of whatever was done in `--%before...` blocks -* A test package that is raising an exception in `--%beforetest` - the `--%test` is reported as failed with exception, `--%test` is not executed. The `--%aftertest`, `--%aftereach` and `--%afterall` blocks are getting executed to allow cleanup of whatever was done in `--%before...` blocks -* A test package that is raising an exception in `--%test` - the `--%test` is reported as failed with exception. The execution of other blocks continues normally -* A test package that is raising an exception in `--%aftertest` - the `--%test` is reported as failed with exception. The execution of other blocks continues normally -* A test package that is raising an exception in `--%aftereach` - each `--%test` is reported as failed with exception. -* A test package that is raising an exception in `--%afterall` - all blocks of the package are executed, as the `--%afterall` is the last step of package execution. Exception in `--%afterall` is not affecting test results. A warning with exception stacktrace is displayed in the summary +| Problem / error | Framework behavior | +|----------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| A test package **without body** | each `--%test` is reported as failed with exception, nothing is executed | +| A test package with **invalid body** | each `--%test` is reported as failed with exception, nothing is executed | +| A test package with **invalid spec** | package is not considered a valid unit test package and is excluded from execution. When trying to run a test package with invalid spec explicitly, exception is raised. Only valid specifications are parsed for annotations | +| A test package that is raising an exception in `--%beforeall` | each `--%test` is reported as failed with exception, `--%test`, `--%beforeeach`, `--%beforetest`, `--%aftertest` and `--%aftereach` are not executed. `--%afterall` is executed to allow cleanup of whatever was done in `--%beforeall` | +| A test package that is raising an exception in `--%beforeeach` | each `--%test` is reported as failed with exception, `--%test`, `--%beforetest` and `--%aftertest` is not executed. The `--%aftereach` and `--%afterall` blocks are getting executed to allow cleanup of whatever was done in `--%before...` blocks | +| A test package that is raising an exception in `--%beforetest` | the `--%test` is reported as failed with exception, `--%test` is not executed. The `--%aftertest`, `--%aftereach` and `--%afterall` blocks are getting executed to allow cleanup of whatever was done in `--%before...` blocks | +| A test package that is raising an exception in `--%test` | the `--%test` is reported as failed with exception. The execution of other blocks continues normally | +| A test package that is raising an exception in `--%aftertest` | the `--%test` is reported as failed with exception. The execution of other blocks continues normally | +| A test package that is raising an exception in `--%aftereach` | each `--%test` is reported as failed with exception. | +| A test package that is raising an exception in `--%afterall` | all blocks of the package are executed, as the `--%afterall` is the last step of package execution. Exception in `--%afterall` is not affecting test results. A warning with exception stacktrace is displayed in the summary | +!!! warning + If an exception is thrown in an `afterall` procedure then **no failure reported by utPLSQL**.
    + Framework will only report a warning on the suite that the `afterall` belongs to. + Example of reporting with exception thrown in `%beforetest`: ```` Remove rooms by name diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 1c1974319..a972fa2e3 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -7,7 +7,7 @@ Validation of the code under test (the tested logic of procedure/function etc.) utPLSQL uses expectations and matchers to perform the check on the data. Example of an expectation -```sql +```sql linenums="1" begin ut.expect( 'the tested value' ).to_equal('the expected value'); end; @@ -22,6 +22,7 @@ FAILURE ``` Expectation is a combination of: + - the expected value - optional custom message for the expectation - the matcher used to perform comparison @@ -30,7 +31,7 @@ Expectation is a combination of: Matcher defines the comparison operation to be performed on expected (and actual) value. Pseudo-code: -```sql +```sql linenums="1" ut.expect( a_actual {data-type} [, a_message {varchar2}] ).to_( {matcher} ); ut.expect( a_actual {data-type} [, a_message {varchar2}] ).not_to( {matcher} ); ``` @@ -38,7 +39,7 @@ Pseudo-code: Expectations provide two variants of syntax that you can use. Both variants are functionally-equal but give different usage flexibility. Syntax where matcher is passed as parameter to the expectation: -```sql +```sql linenums="1" ut.expect( a_actual ).to_( {matcher} ); ut.expect( a_actual ).not_to( {matcher} ); -- example @@ -46,7 +47,7 @@ Syntax where matcher is passed as parameter to the expectation: ``` Shortcut syntax, where matcher is directly part of expectation: -```sql +```sql linenums="1" ut.expect( a_actual ).to_{matcher}; ut.expect( a_actual ).not_to_{matcher}; @@ -57,7 +58,7 @@ Shortcut syntax, where matcher is directly part of expectation: When using shortcut syntax you don't need to surround matcher with brackets. Shortcut syntax is provided for convenience. If you would like to perform more dynamic checks in your code, you could pass the matcher into a procedure like in the below example: -```sql +```sql linenums="1" declare procedure do_check( p_actual varchar2, p_matcher ut_matcher ) is begin @@ -80,8 +81,8 @@ SUCCESS Actual: 'Alibaba' (varchar2) was expected to match: 'ali' , modifiers 'i' ``` -**Note:** -> The examples in the document will be only using shortcut syntax, to keep the document brief. +!!! note + In order to keep the document brief, the examples in the document are only using the standalone expectations syntax. ## Using expectations @@ -91,17 +92,19 @@ There are two ways to use expectations: ## Running expectations within utPLSQL framework -When expectations are ran as a part of a test suite, the framework tracks: +When expectations are run as a part of a test suite, the framework tracks: + - status of each expectation - outcomes (messages) produced by each expectation - call stack to each expectation In this case: + - expectation results of are not sent directly to `dbms_output` - utPLSQL Reporters used when running suite decide on how the expectation results are formatted and displayed Example of test suite with an expectation: -```sql +```sql linenums="1" create or replace package test_divide as --%suite(Divide two numbers) @@ -159,15 +162,13 @@ Please read about different options for [running test suites](running-unit-tests ## Running expectations outside utPLSQL framework When expectations are invoked outside of utPLSQL framework the outputs from expectations are redirected straight to `dbms_output`. -**Note:** -> The output from expectation contains call stack trace only when expectation fails. -> Source code of the line which called the expectation is only reported when the line is part of in-database code (package) and the user calling expectation has privileges to see that source code. +!!! note + The output from expectation contains call stack trace only when expectation fails.
    + Source code of the line which called the expectation is only reported when the line is part of in-database code (package) and the user calling expectation has privileges to see that source code. -**Important** -> Please do not use expectations as part of your production code. They are not designed to be used as part of your code. Expectations are meant to be used only as part of your day-to-day testing activities. +!!! warning "**Important**" + Please do not use expectations as part of your production code. They are not designed to be used as part of your code. Expectations are meant to be used only as part of your day-to-day testing activities. -**Note:** -> The examples in the document will be only using standalone expectations, to keep the document brief. ## Matchers utPLSQL provides the following matchers to perform checks on the expected and actual values. @@ -193,7 +194,7 @@ You can provide a custom failure message by passing it as the second parameter t `ut.expect( a_actual {data-type}, a_message {varchar2} ).to_{matcher}` Example: -````sql +````sql linenums="1" exec ut.expect( 'supercat', 'checked superhero-animal was not a dog' ).to_equal('superdog'); ```` @@ -208,6 +209,7 @@ If the message is provided, it is being added to the normal failure message retu This is mostly useful when your expectations accept dynamic content, as you can provide additional context to make failing test results more readable. In most cases, there is no need to provide custom message to expectation. This is because utPLSQL identifies: + - The test used to execute the expectation - The line number where the expectation is placed in your test code - The line text of the expectation @@ -215,7 +217,7 @@ In most cases, there is no need to provide custom message to expectation. This i Custom message is useful, if your expectation is placed in a shared procedure to perform a check and your test is using the procedure multiple times. Example: -```sql +```sql linenums="1" create or replace package shared_expectation_test is --%suite @@ -265,6 +267,7 @@ Finished in .066344 seconds ``` In the tests results window you can see the list of failed expectations for a test as well as: + - the additional message for expectation - the reason why the expectation failed - the line number of the expectation @@ -276,7 +279,7 @@ In the tests results window you can see the list of failed expectations for a te Expectations provide a very convenient way to perform a check on a negated matcher. Syntax to check for matcher evaluating to true: -```sql +```sql linenums="1" begin ut.expect( a_actual {data-type} ).to_{matcher}; ut.expect( a_actual {data-type} ).to_( {matcher} ); @@ -284,7 +287,7 @@ end; ``` Syntax to check for matcher evaluating to false: -```sql +```sql linenums="1" begin ut.expect( a_actual {data-type} ).not_to_{matcher}; ut.expect( a_actual {data-type} ).not_to( {matcher} ); @@ -294,7 +297,7 @@ end; If a matcher evaluated to NULL, then both `to_` and `not_to` will cause the expectation to report failure. Example: -```sql +```sql linenums="1" declare l_actual boolean; begin @@ -346,7 +349,7 @@ Testing is not limited to checking for happy-path scenarios. When writing tests, Use the `--%throws` annotation, to test for expected exceptions. Example: -```sql +```sql linenums="1" create or replace function divide(x varchar2, y varchar2) return number is begin return x/y; @@ -397,7 +400,7 @@ You can choose different matchers to validate that your PL/SQL code is working a Validates that the actual value is between the lower and upper bound. Example: -```sql +```sql linenums="1" declare l_timestamp timestamp := current_timestamp; l_timestamp_tz timestamp with time zone := systimestamp; @@ -454,12 +457,12 @@ Unary matcher that validates if the provided dataset is empty. Can be used with `BLOB`,`CLOB`, `refcursor` or `nested table`/`varray` passed as `ANYDATA` -**Note:** -BLOB/CLOB that is initialized is not NULL but it is actually equal to `empty_blob()`/`empty_clob()`. +!!! note + BLOB/CLOB that is initialized is not NULL but it is actually equal to `empty_blob()`/`empty_clob()`. Example: -```sql +```sql linenums="1" declare l_cursor sys_refcursor; begin @@ -502,7 +505,7 @@ FAILURE Unary matcher that validates if the provided value is false. Usage: -```sql +```sql linenums="1" begin ut.expect( ( 1 = 0 ) ).to_be_false(); ut.expect( ( 1 = 1 ) ).to_( be_false() ); @@ -530,7 +533,7 @@ SUCCESS Checks if the actual value is greater or equal than the expected. Usage: -```sql +```sql linenums="1" begin ut.expect( sysdate ).to_be_greater_or_equal( sysdate - 1 ); ut.expect( sysdate ).to_( be_greater_or_equal( sysdate + 1 ) ); @@ -558,7 +561,7 @@ SUCCESS Checks if the actual value is greater than the expected. Usage: -```sql +```sql linenums="1" begin ut.expect( 2 ).to_be_greater_than( 1 ); ut.expect( 0 ).to_( be_greater_than( 1 ) ); @@ -586,7 +589,7 @@ SUCCESS Checks if the actual value is less or equal than the expected. Usage: -```sql +```sql linenums="1" begin ut.expect( 3 ).to_be_less_or_equal( 3 ); ut.expect( 4 ).to_( be_less_or_equal( 3 ) ); @@ -614,7 +617,7 @@ SUCCESS Checks if the actual value is less than the expected. Usage: -```sql +```sql linenums="1" begin ut.expect( 3 ).to_be_less_than( 2 ); ut.expect( 0 ).to_( be_less_than( 2 ) ); @@ -650,7 +653,7 @@ Parameters `a_mask` and `a_escape_char` represent valid parameters of the [Oracl If you use Oracle Database version 11.2.0.4, you may run into Oracle Bug 14402514: WRONG RESULTS WITH LIKE ON CLOB USING ESCAPE CHARACTER. In this case we recommend to use `match` instead of `be_like`. Usage: -```sql +```sql linenums="1" begin ut.expect( 'Lorem_impsum' ).to_be_like( '%rem%'); ut.expect( 'Lorem_impsum' ).to_be_like( '%rem\_i%', '\' ); @@ -680,7 +683,7 @@ SUCCESS Unary matcher that validates if the actual value is not null. Usage: -```sql +```sql linenums="1" begin ut.expect( to_clob('ABC') ).to_be_not_null(); ut.expect( to_clob('') ).to_( be_not_null() ); @@ -708,7 +711,7 @@ SUCCESS Unary matcher that validates if the actual value is null. Usage: -```sql +```sql linenums="1" begin ut.expect( '' ).to_be_null(); ut.expect( 0 ).to_( be_null() ); @@ -736,7 +739,7 @@ SUCCESS Unary matcher that validates if the provided value is true. Usage: -```sql +```sql linenums="1" begin ut.expect( ( 1 = 0 ) ).to_be_true(); ut.expect( ( 1 = 1 ) ).to_( be_true() ); @@ -766,7 +769,7 @@ Unary matcher that validates if the provided dataset count is equal to expected Can be used with `refcursor`, `json` or `table type` Usage: -```sql +```sql linenums="1" declare l_cursor sys_refcursor; l_collection ut_varchar2_list; @@ -806,7 +809,7 @@ Syntax: Parameters `a_pattern` and `a_modifiers` represent a valid regexp pattern accepted by [Oracle REGEXP_LIKE condition](https://docs.oracle.com/database/121/SQLRF/conditions007.htm#SQLRF00501) Usage: -```sql +```sql linenums="1" begin ut.expect( '123-456-ABcd' ).to_match( '\d{3}-\d{3}-[a-z]{4}', 'i' ); ut.expect( 'some value' ).to_( match( '^some.*' ) ) ; @@ -844,7 +847,7 @@ Syntax: `ut.expect( a_actual ).to_equal( a_expected [, a_nulls_are_equal])[.advanced_options]` Example usage -```sql +```sql linenums="1" declare l_actual varchar2(20); l_expected varchar2(20); @@ -911,10 +914,10 @@ FAILURE ``` -**Note:** ->**Comparing NULLs gives success by default ** -The `a_nulls_are_equal` parameter controls the behavior of a `null = null` comparison. -To change the behavior of `NULL = NULL` comparison pass the `a_nulls_are_equal => false` to the `equal` matcher. +!!! note + **by default, comparing NULL to NULL gives success**
    + The `a_nulls_are_equal` parameter controls the behavior of a `null = null` comparison.
    + To change the behavior of `NULL = NULL` comparison pass the `a_nulls_are_equal => false` to the `equal` matcher. ## contain @@ -931,7 +934,7 @@ The matcher will cause a test to fail if actual data set does not contain some o ![included_set](../images/venn21.gif) **Example 1.** -```sql +```sql linenums="1" declare l_actual sys_refcursor; l_expected sys_refcursor; @@ -963,7 +966,7 @@ FAILURE When duplicate rows are present in expected data set, actual data set must also include the same amount of duplicates. **Example 2.** -```sql +```sql linenums="1" declare l_actual ut_varchar2_list; l_expected ut_varchar2_list; @@ -991,7 +994,7 @@ The negated version of `contain` ( `not_to_contain` ) is successful only when al ![not_overlapping_set](../images/venn22.gif) **Example 3.** -```sql +```sql linenums="1" declare l_actual ut_varchar2_list; l_expected ut_varchar2_list; @@ -1028,7 +1031,7 @@ FAILURE **Example 4.** -```sql +```sql linenums="1" declare l_actual ut_varchar2_list; l_expected ut_varchar2_list; @@ -1061,7 +1064,7 @@ FAILURE **Example 5.** -```sql +```sql linenums="1" declare l_actual ut_varchar2_list; l_expected ut_varchar2_list; @@ -1134,7 +1137,7 @@ The distance must be expressed as a non-negative number or non-negative interval > The behavior is similar to a call to `months_between()` function with results rounded to full monts ie. round(months_between(date, date)) **Example 1.** -```sql +```sql linenums="1" begin ut.expect(3).to_be_within(1).of_(4); end; @@ -1142,7 +1145,7 @@ end; ``` **Example 2.** -```sql +```sql linenums="1" begin ut.expect(3).to_be_within(1).of_(5); end; @@ -1160,7 +1163,7 @@ Failures: ``` **Example 3.** -```sql +```sql linenums="1" begin ut.expect(sysdate).to_be_within(interval '1' day).of_(sysdate+2); end; @@ -1190,7 +1193,7 @@ The formula used for calcuation of expectation is: ``` **Example 1.** -```sql +```sql linenums="1" begin ut.expect(9).to_be_within_pct(10).of_(10); end; @@ -1206,6 +1209,7 @@ SUCCESS ## Comparing cursors, object types, nested tables and varrays utPLSQL is capable of comparing compound data-types including: + - ref cursors - object types - nested table/varray types @@ -1227,6 +1231,7 @@ utPLSQL is capable of comparing compound data-types including: See [issue #880](https://github.com/utPLSQL/utPLSQL/issues/880) for details. *Note: This behavior might be fixed in future releases, when utPLSQL is no longer depending on XMLType for compound data comparison.* utPLSQL offers advanced data-comparison options, for comparing compound data-types. The options allow you to: + - define columns/attributes to exclude from comparison - define columns/attributes to include in comparison - and more ... @@ -1237,6 +1242,7 @@ For details on available options and how to use them, read the [advanced data co When comparing compound data, utPLSQL will determine the difference between the expected and the actual data. The diff includes: + - differences in column names, column positions and column data-type for cursor data - only data in columns/rows that differ @@ -1246,9 +1252,9 @@ Consider the following expected cursor data | ID (NUMBER)| FIRST_NAME (VARCHAR2) | LAST_NAME (VARCHAR2) | SALARY (NUMBER) | |:----------:|:----------------------:|:----------------------:|:---------------:| -| 1 | JACK | SPARROW | 10000 | -| 2 | LUKE | SKYWALKER | 1000 | -| 3 | TONY | STARK | 1000000 | +| 1 | JACK | SPARROW | 10000 | +| 2 | LUKE | SKYWALKER | 1000 | +| 3 | TONY | STARK | 1000000 | And the actual cursor data: @@ -1261,6 +1267,7 @@ And the actual cursor data: The two data-sets above have the following differences: + - column ID is misplaced (should be first column but is last) - column SALARY has data-type VARCHAR2 but should be NUMBER - column GENDER exists in actual but not in the expected (it is an Extra column) @@ -1272,7 +1279,7 @@ The two data-sets above have the following differences: utPLSQL will report all of the above differences in a readable format to help you identify what is not correct in the compared dataset. Below example illustrates, how utPLSQL will report such differences. -```sql +```sql linenums="1" declare l_actual sys_refcursor; l_expected sys_refcursor; @@ -1320,11 +1327,13 @@ FAILURE ``` utPLSQL identifies and reports on columns: + - column misplacement - column data-type mismatch - extra/missing columns When comparing rows utPLSQL: + - reports only mismatched columns when rows match - reports columns existing in both data-sets when whole row is not matching - reports whole extra (not expected) row from actual when actual has extra rows @@ -1334,6 +1343,7 @@ When comparing rows utPLSQL: ### Object and nested table data-type comparison examples When comparing object type / nested table / varray, utPLSQL will check: + - if data-types match - if data in the compared elements is the same. @@ -1343,7 +1353,7 @@ When diffing, utPLSQL will not check name and data-type of individual attribute Below examples demonstrate how to compare object and nested table data-types. Object type comparison. -```sql +```sql linenums="1" create type department as object(name varchar2(30)) / @@ -1371,7 +1381,7 @@ FAILURE ``` Table type comparison. -```sql +```sql linenums="1" create type department as object(name varchar2(30)) / create type departments as table of department @@ -1409,7 +1419,7 @@ FAILURE ``` Some of the possible combinations of anydata and their results: -```sql +```sql linenums="1" clear screen set serverout on set feedback off @@ -1593,18 +1603,18 @@ FAILURE ### Comparing cursor data containing DATE fields -**Important note** +!!! warning "Important note" -utPLSQL uses XMLType internally to represent rows of the cursor data. This is by far the most flexible method and allows comparison of cursors containing LONG, CLOB, BLOB, user defined types and even nested cursors. -Due to the way Oracle handles DATE data type when converting from cursor data to XML, utPLSQL has no control over the DATE formatting. -The NLS_DATE_FORMAT setting from the moment the cursor was opened determines the formatting of dates used for cursor data comparison. -By default, Oracle NLS_DATE_FORMAT is timeless, so data of DATE datatype, will be compared ignoring the time component. + utPLSQL uses XMLType internally to represent rows of the cursor data. This is by far the most flexible method and allows comparison of cursors containing LONG, CLOB, BLOB, user defined types and even nested cursors.
    + Due to the way Oracle handles DATE data type when converting from cursor data to XML, utPLSQL has no control over the DATE formatting.
    + The NLS_DATE_FORMAT setting from the moment the cursor was opened determines the formatting of dates used for cursor data comparison.
    + By default, Oracle NLS_DATE_FORMAT is timeless, so data of DATE datatype, will be compared ignoring the time component.
    You should surround cursors and expectations with procedures `ut.set_nls`, `ut.reset_nls`. This way, the DATE data in cursors will be properly formatted for comparison using date-time format. The example below makes use of `ut.set_nls`, `ut.reset_nls`, so that the date in `l_expected` and `l_actual` is compared using date-time formatting. -```sql +```sql linenums="1" clear screen alter session set nls_date_format='yyyy-mm-dd'; set serverout on @@ -1649,6 +1659,7 @@ drop table events; ``` In the above example: + - The first expectation is successful, as the `l_expected` cursor contains different date-time then the cursor returned by `get_events` function call - The second expectation fails, as the column `event_date` will get compared as DATE without TIME (using default current session NLS date format) @@ -1687,7 +1698,7 @@ This applies to `timestamp`,`timestamp with timezone`, `timestamp with local tim Example below illustrates usage of `cast` operator to assure appropriate precision is applied on timestamp bind-variables in cursor result-set -```sql +```sql linenums="1" clear screen set serverout on set feedback off @@ -1754,8 +1765,8 @@ FAILURE utPLSQL is capable of comparing json data-types of `json_element_t` **on Oracle 12.2 and above**, and also `json` **on Oracle 21 and above** -**Note:** -> Whenever a database is upgraded to compatible version the utPLSQL needs to be reinstalled to pick up json changes. E.g. upgrade from 18c to 21c to enable `json` type compare. +!!! note + Whenever a database is upgraded to compatible version the utPLSQL needs to be reinstalled to pick up json changes. E.g. upgrade from 18c to 21c to enable `json` type compare. ### Notes on comparison of json data @@ -1769,7 +1780,7 @@ utPLSQL is capable of comparing json data-types of `json_element_t` **on Oracle Compare JSON example using `json_element_t`: -```sql +```sql linenums="1" declare l_expected json_element_t; l_actual json_element_t; @@ -1851,7 +1862,7 @@ FAILURE ``` Comparing parts of JSON example using `json_element_t` subtypes: -```sql +```sql linenums="1" declare l_actual json_object_t; l_actual_extract json_array_t; diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index e9681bb7b..c199d7095 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -24,7 +24,7 @@ This way, we assure we don't jump ahead too much and produce code that is untest ### Create test package -```sql +```sql linenums="1" create or replace package test_betwnstr as --%suite(Between string function) @@ -45,7 +45,7 @@ Finished in .451423 seconds ### Define specification for the test -```sql +```sql linenums="1" create or replace package test_betwnstr as --%suite(Between string function) @@ -78,7 +78,7 @@ Well our test is failing as the package specification requires a body. ### Define body of first test -```sql +```sql linenums="1" create or replace package body test_betwnstr as procedure basic_usage is @@ -114,7 +114,7 @@ Looks like we need to define the function we want to test. ### Define tested function -```sql +```sql linenums="1" create or replace function betwnstr( a_string varchar2, a_start_pos integer, a_end_pos integer ) return varchar2 is begin @@ -147,7 +147,7 @@ Let us fix this and continue from here. The function returned a string one character short, so we need to add 1 to the substr parameter. -```sql +```sql linenums="1" create or replace function betwnstr( a_string varchar2, a_start_pos integer, a_end_pos integer ) return varchar2 is begin @@ -200,7 +200,7 @@ Once defined we can start implementing tests for those behaviors and adjust the A new requirement was added: Start position zero - should be treated as start position one -```sql +```sql linenums="1" create or replace package test_betwnstr as --%suite(Between string function) @@ -254,7 +254,7 @@ Looks like our function does not work as expected for zero start position. Let's fix our function so that the new requirement is met -```sql +```sql linenums="1" create or replace function betwnstr( a_string varchar2, a_start_pos integer, a_end_pos integer ) return varchar2 is begin @@ -288,7 +288,7 @@ When all tests are passing we can proceed with a safe cleanup of our code. The function works well, but we use the `return` twice, which is not the best coding practice. An alternative implementation could be cleaner. -```sql +```sql linenums="1" create or replace function betwnstr( a_string varchar2, a_start_pos integer, a_end_pos integer ) return varchar2 is begin diff --git a/docs/userguide/install.md b/docs/userguide/install.md index fca38c92e..6dfa66140 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -116,26 +116,18 @@ This process can be time-consuming if DB schema is large. The headless scripts accept three optional parameters that define: - username to create as owner of utPLSQL (default `ut3`) - password for owner of utPLSQL (default `XNtxj8eEgA6X6b6f`) -- tablespace to use for storage of profiler data (default `users`) +- tablespace to use for storage of profiler and utPLSQL cache data (default `users`) The scripts need to be executed by `SYSDBA`, in order to grant access to `DBMS_LOCK` and `DBMS_CRYPTO` system packages. -**Note:** -> Grant on `DBMS_LOCK` is required only for installation on Oracle versions below 18c. For versions 18c and above, utPLSQL uses `DBMS_SESSION.SLEEP` so access to `DBMS_LOCK` package is no longer needed. - -**Note:** -> The user performing the installation must have the `ADMINISTER DATABASE TRIGGER` privilege. This is required for installation of trigger that is responsible for parsing annotations at at compile-time of a package. - -**Note:** -> When installing with DDL trigger, utPLSQL will not be registering unit tests for any of oracle-maintained schemas. -For Oracle 11g following users are excluded: -> ANONYMOUS, APPQOSSYS, AUDSYS, DBSFWUSER, DBSNMP, DIP, GGSYS, GSMADMIN_INTERNAL, GSMCATUSER, GSMUSER, ORACLE_OCM, OUTLN, REMOTE_SCHEDULER_AGENT, SYS, SYS$UMF, SYSBACKUP, SYSDG, SYSKM, SYSRAC, SYSTEM, WMSYS, XDB, XS$NULL -> -> For Oracle 12c and above the users returned by below query are excluded by utPLSQL: -> ->```sql -> select username from all_users where oracle_maintained='Y'; ->``` +!!! warning "Important" + - Grant on `DBMS_LOCK` is required only for installation on Oracle versions below 18c. For versions 18c and above, utPLSQL uses `DBMS_SESSION.SLEEP` so access to `DBMS_LOCK` package is no longer needed.
    + - The user performing the installation must have the `ADMINISTER DATABASE TRIGGER` privilege. This is required for installation of trigger that is responsible for parsing annotations at at compile-time of a package.
    + - When installed with DDL trigger, utPLSQL will not be registering unit tests for any of oracle-maintained schemas.
    + - For Oracle 11g following users are excluded:
    + ANONYMOUS, APPQOSSYS, AUDSYS, DBSFWUSER, DBSNMP, DIP, GGSYS, GSMADMIN_INTERNAL, GSMCATUSER, GSMUSER, ORACLE_OCM, OUTLN, REMOTE_SCHEDULER_AGENT, SYS, SYS$UMF, SYSBACKUP, SYSDG, SYSKM, SYSRAC, SYSTEM, WMSYS, XDB, XS$NULL
    + - For Oracle 12c and above the users returned by below query are excluded by utPLSQL:
    + `select username from all_users where oracle_maintained='Y';`
    ### Installation without DDL trigger @@ -232,8 +224,8 @@ cd source sqlplus admin/admins_password@database @install_ddl_trigger.sql ut3 ``` -**Note:** ->Trigger can be installed ant any point in time. +!!! note + Trigger can be installed ant any point in time after the utPLSQL installation. The framework will detect the presence of DDL trigger and act accordingly. ### Allowing other users to access the utPLSQL framework @@ -268,12 +260,12 @@ The following tools that support the SQL*Plus commands can be used to run the in ## Checking environment and utPLSQL version To check the framework version execute the following query: -```sql +```sql linenums="1" select substr(ut.version(),1,60) as ut_version from dual; ``` Additionally you may retrieve more information about your environment by executing the following query: -```sql +```sql linenums="1" select xmlserialize( content xmltype(ut_run_info()) as clob indent size = 2 ) from dual; diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index e7496320c..6ee0b546f 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -22,27 +22,27 @@ Querying the data from function provides the follwing details: - `tags` - tags associated with suites To get list of all test suites in current schema -```sql +```sql linenums="1" select * from table(ut_runner.get_suites_info()) where item_type = 'UT_SUITE'; ``` To get list of all tests for test suite `TEST_STUFF` in current user schema -```sql +```sql linenums="1" select * from table(ut_runner.get_suites_info(USER, 'TEST_STUFF')) where item_type = 'UT_TEST'; ``` To get a full information about suite `TEST_STUFF` including suite description, all contexts and tests in a suite -```sql +```sql linenums="1" select * from table(ut_runner.get_suites_info(USER, 'TEST_STUFF')) where item_type = 'UT_TEST'; ``` To get a full information about suites that have a path like `ut3:tests.test_package_*` including suite description, all contexts and tests in a suite -```sql +```sql linenums="1" select * from table(ut_runner.get_suites_info('ut3:tests.test_package_*') where item_type = 'UT_TEST'; ``` To get a full information about suites that have object name like `test_package_*` including suite description, all contexts and tests in a suite -```sql +```sql linenums="1" select * from table(ut_runner.get_suites_info('test_package_*')); ``` @@ -51,7 +51,7 @@ select * from table(ut_runner.get_suites_info('test_package_*')); Function `ut_runner.has_suites(a_owner)` returns boolean value indicating if given schema contains test suites. Example: -```sql +```sql linenums="1" begin if ut_runner.has_suites(USER) then dbms_output.put_line( 'User '||USER||' owns test suites' ); @@ -66,7 +66,7 @@ end; Function `ut_runner.is_suite(a_owner, a_package_name) ` returns boolean value indicating if given package is a test suites. Example: -```sql +```sql linenums="1" begin if ut_runner.is_suite(USER,'TEST_STUFF') then dbms_output.put_line( 'Package '||USER||'.TEST_STUFF is a test suite' ); @@ -81,7 +81,7 @@ end; Function `ut_runner.is_test(a_owner, a_package_name, a_procedure_name) ` returns boolean value indicating if given package is a test suites. Example: -```sql +```sql linenums="1" begin if ut_runner.is_test(USER,'TEST_STUFF','A_TEST_TO_CHECK_STUFF') then dbms_output.put_line( 'Procedure '||USER||'.TEST_STUFF.A_TEST_TO_CHECK_STUFF is a test' ); diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 1f5ead1c5..467116479 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,6 +1,6 @@ ![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) -utPLSQL provides the following reporting formats. +utPLSQL provides several reporting formats. The sections below describe most of them. ## Documentation reporter @@ -17,7 +17,8 @@ Example outputs from documentation reporter. ![doc_reporter_outputs](../images/documentation_reporter.png) -The documentation report provides the following information. +Documentation reporter provides the following information. + - Test suite name or test package name (nested with suitepath if suitepath is used) - Test description name or test procedure name - Information about test failing `(FAILED - n)` @@ -84,8 +85,11 @@ Example of failure report details ## Sonar test reporter -If you are using [SonarQube](https://www.sonarqube.org/) or [SonarCloud](https://about.sonarcloud.io/) to do static code analysis for you PLSQL projects, your code analysis can benefit from code coverage and test results. + +If you are using [SonarQube](https://www.sonarqube.org/) or [SonarCloud](https://about.sonarcloud.io/) to do static code analysis for you PLSQL projects, +your code analysis can benefit from code coverage and test results. utPLSQL provides two reporters to for SonarQube: + - `ut_sonar_test_reporter` - provides an XML output of each test executed per each project test file (package) - `ut_coverage_sonar_reporter` - provides XML output of code coverage per each project source file @@ -97,15 +101,15 @@ The paths to files can be relative to the project root directory (recommended) o Providing invalid paths or paths to non-existing files will result in failure when publishing test results/coverage results to sonar server. -For details on how to invoke reporter with paths, see the **Coverage reporters** section. +For details on how to invoke reporter with paths, see the [Code coverage](coverage.md) section. ## TFS / VSTS Reporter -If you are using [TFS](https://www.visualstudio.com/tfs/) or [VSTS](https://www.visualstudio.com/team-services/) to do static code analysis for you PLSQL projects and run builds, your code analysis can benefit from code coverage and test results. TFS reporter is designed specifically to [work with Microsoft Team Fundation Server](https://docs.microsoft.com/en-us/vsts/build-release/tasks/test/publish-test-results?view=vsts) report format which is very old version of [JUnit](https://github.com/windyroad/JUnit-Schema/blob/master/JUnit.xsd). -Main diffrence between standard JUnit is that elements cannot be nested and attribute skipped is not present. -utPLSQL provides test reporter to for TFS / VSTS server: -- `ut_tfs_junit_reporter` - provides an XML output of each test executed per each project test file (package) +If you are using [TFS](https://www.visualstudio.com/tfs/) or [VSTS](https://www.visualstudio.com/team-services/) to do static code analysis for you PLSQL projects and run builds, +your code analysis can benefit from code coverage and test results. TFS reporter is designed specifically to [work with Microsoft Team Fundation Server](https://docs.microsoft.com/en-us/vsts/build-release/tasks/test/publish-test-results?view=vsts) report format which is very old version of [JUnit](https://github.com/windyroad/JUnit-Schema/blob/master/JUnit.xsd). +Main difference between standard JUnit is that elements cannot be nested and attribute skipped is not present. +utPLSQL provides a dedicated `ut_tfs_junit_reporter` reporter to for TFS / VSTS servers. The reporter provides an XML output of each test executed per each project test file (package). Example of test report from TFS CI server. Summary: @@ -119,8 +123,8 @@ Details: ## Coverage reporters -utPLSQL comes with a set of build-in coverage reporters. Have a look into the [coverage documentation](coverage.md) to learn more about them. - +utPLSQL comes with a set of build-in coverage reporters. +[Code coverage](coverage.md) section describes in details how to use configure and use code coverage. ## Debug reporter @@ -131,6 +135,7 @@ Use this reporter only when you need to investigate framework issues or raise a Usage of this reporter might have impact on performance of test-suite execution. Amongst others, reporter provides the following information: + - framework version - database version - database OS @@ -152,25 +157,26 @@ Amongst others, reporter provides the following information: - every test - every expectation and it's result -Some of the information in debug log might be redundant. +Some information in debug log might be redundant. -**Note:** ->Some of the information in debug log may be sensitive. In particular: -> - expectation results and messages (logged even for successful runs) -> - test structure -> - db object names -> - etc. +!!! note + Some information in debug log may be sensitive. In particular:
    + - expectation results and messages (logged even for successful runs)
    + - test structure
    + - db object names
    + - etc. ## Custom reporters -It is possible to add your own reporters by creating an appropriate object type. In principle, it has to be a subtype of `ut_reporter_base`. However, if the reporter is expected to produce output consumable by a client oustside of the database (e.g. the data has to be reported to the screen or to a file), then you should base it on `ut_output_reporter_base` (which is a subtype of `ut_reporter_base`). In contrast, if you would like to create a reporter that, for example, saves the data to a database table, then it should be based directly on `ut_reporter_base`. (Currently, all reporters in the utPLSQL framework are based on `ut_output_reporter_base`.) Coverage reporters are based on `ut_coverage_reporter_base` (a subtype of `ut_output_reporter_base`). +It is possible to add your own reporters by creating an appropriate object type. +In principle, it has to be a subtype of `ut_reporter_base`. However, if the reporter is expected to produce output consumable by a client oustside of the database (e.g. the data has to be reported to the screen or to a file), then you should base it on `ut_output_reporter_base` (which is a subtype of `ut_reporter_base`). In contrast, if you would like to create a reporter that, for example, saves the data to a database table, then it should be based directly on `ut_reporter_base`. (Currently, all reporters in the utPLSQL framework are based on `ut_output_reporter_base`.) Coverage reporters are based on `ut_coverage_reporter_base` (a subtype of `ut_output_reporter_base`). If you need to produce a colored text output from the custom reporter, then you can build it basing on `ut_console_reporter_base` (a subtype of `ut_output_reporter_base`). In many cases it may also be more convenient to create the custom reporter type under a more specialized type, like `ut_documentation_reporter` or `ut_junit_reporter`, and override just some of the functionality. It is recommended to create the reporter type in the schema where utPLSQL is installed (by default it is the `UT3` schema). Note that before running the utPLSQL uninstall scripts, all custom reporters should be dropped (cf. [the installation documentation](install.md)). In particular, when upgrading to a newer version of utPLSQL, one has to drop the custom reporters and recreate them after the upgrade. -**Note:** -> It is possible, but cumbersome, to use another schema for storing the custom reporters. This requires to create a synonym for the base reporter type in the schema that is going to own the custom reporter, and to provide appropriate grants both to the owner of the custom reporter and to the user running the reporter. After upgrading or reinstalling utPLSQL, the extra privileges need to be recreated. This approach is not recommended. +!!! note + It is possible, but cumbersome, to use another schema for storing the custom reporters. This requires to create a synonym for the base reporter type in the schema that is going to own the custom reporter, and to provide appropriate grants both to the owner of the custom reporter and to the user running the reporter. After upgrading or reinstalling utPLSQL, the extra privileges need to be recreated. This approach is not recommended. Assuming that the custom reporter type is created in the `UT3` schema, to run the tests using a custom reporter just call: `exec ut.run(ut3.custom_reporter_name());`, optionally providing parameter values to the `custom_reporter_name` constructor. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index a87fe9836..18270e707 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -47,7 +47,7 @@ You can use a wildcard character `*` to call tests by part of their name or to c Wildcard character can be placed anywhere on the path and can occur mutliple times. Schema name cannot contain a wildcard character whether is in a suitepath call or call by object name. -```sql +```sql linenums="1" alter session set current_schema=hr; set serveroutput on begin @@ -57,7 +57,7 @@ end; Executes all tests in current schema (_HR_). -```sql +```sql linenums="1" set serveroutput on begin ut.run('HR'); @@ -66,7 +66,7 @@ end; Executes all tests in specified schema (_HR_). -```sql +```sql linenums="1" set serveroutput on begin ut.run('hr:com.my_org.my_project'); @@ -76,7 +76,7 @@ end; Executes all tests from all packages that are on the _com.my_org.my_project_ suitepath. Check the [annotations documentation](annotations.md) to find out about suitepaths and how they can be used to organize test packages for your project. -```sql +```sql linenums="1" set serveroutput on begin ut.run('hr:com*'); @@ -85,7 +85,7 @@ end; Executes all tests in schema `hr` from all packages that are on suitepath starting with `com`. -```sql +```sql linenums="1" set serveroutput on begin ut.run('hr:co*.my_*.my_*'); @@ -94,7 +94,7 @@ end; Executes all tests in schema `hr` from all packages that starting with `my_` and all tests starting with `my_*` that are on suitepath starting with `co` . -```sql +```sql linenums="1" set serveroutput on begin ut.run('hr.test_apply_bonus'); @@ -103,7 +103,7 @@ end; Executes all tests from package _hr.test_apply_bonus_. -```sql +```sql linenums="1" set serveroutput on begin ut.run('hr.test_apply_bonus.bonus_cannot_be_negative'); @@ -112,7 +112,7 @@ end; Executes single test procedure _hr.test_apply_bonus.bonus_cannot_be_negative_. -```sql +```sql linenums="1" set serveroutput on begin ut.run(ut_varchar2_list('hr.test_apply_bonus','cust')); @@ -120,7 +120,7 @@ end; ``` Executes all tests from package _hr.test_apply_bonus_ and all tests from schema _cust_. -```sql +```sql linenums="1" set serveroutput on begin ut.run(ut_varchar2_list('hr.test_apply_bonus,cust)'); @@ -129,7 +129,7 @@ end; Executes all tests from package _hr.test_apply_bonus_ and all tests from schema _cust_. -```sql +```sql linenums="1" set serveroutput on begin ut.run('hr.test_apply_bonus,cust'); @@ -142,7 +142,7 @@ Using a list of items to execute allows you to execute a fine-grained set of tes List can be passed as a comma separated list or a list of *ut_varchar2_list objects* or as a list within ut_varchar2_list. -```sql +```sql linenums="1" set serveroutput on begin ut.run('hr.test*'); @@ -150,7 +150,7 @@ end; ``` Executes all tests in schema `hr` located in packages starting with name `test`. -```sql +```sql linenums="1" set serveroutput on begin ut.run('hr.test_apply_bonus.bonus_*'); @@ -166,7 +166,7 @@ Executes test procedures with names starting with `bonus` in package `hr.test_ap The `ut.run` procedures and functions accept `a_reporter` attribute that defines the reporter to be used in the run. You can execute any set of tests with any of the predefined reporters. -```sql +```sql linenums="1" set serveroutput on begin ut.run('hr.test_apply_bonus', ut_junit_reporter()); @@ -189,7 +189,7 @@ Functions provide output as a pipelined stream and therefore need to be executed At the end of the run, the transaction is automatically rolled-back and all uncommitted changes are reverted. Example. -```sql +```sql linenums="1" select * from table(ut.run('hr.test_apply_bonus', ut_junit_reporter())); ``` @@ -222,7 +222,7 @@ Running with multiple reporters. - each reporter for each test-run must have a unique `reporter_id`. The `reporter_id` is used between two sessions to identify the data stream Example: -```sql +```sql linenums="1" --main test run ( session 1 ) declare l_reporter ut_realtime_reporter := ut_realtime_reporter(); @@ -234,7 +234,7 @@ end; / ``` -```sql +```sql linenums="1" --report consumer ( session 2 ) set arraysize 1 set pagesize 0 @@ -247,7 +247,7 @@ select * ); ``` -```sql +```sql linenums="1" --alternative version of report consumer ( session 2 ) set arraysize 1 set pagesize 0 @@ -279,14 +279,14 @@ When tests are executed with random order, randomization is applied to single le This is needed to maintain visibility and accessibility of common setup/cleanup `beforeall`/`afterall` in tests. Example: -```sql +```sql linenums="1" set serveroutput on begin ut.run('hr.test_apply_bonus', a_random_test_order => true); end; ``` -```sql +```sql linenums="1" select * from table(ut.run('hr.test_apply_bonus', a_random_test_order => 1)); ``` @@ -301,14 +301,14 @@ Tests were executed with random order seed '302980531'. If you want to re-run tests using previously generated seed, you may do so by running them with parameter `a_random_test_order_seed` Example: -```sql +```sql linenums="1" set serveroutput on begin ut.run('hr.test_apply_bonus', a_random_test_order_seed => 302980531); end; ``` -```sql +```sql linenums="1" select * from table(ut.run('hr.test_apply_bonus', a_random_test_order_seed => 302980531)); ``` @@ -321,18 +321,18 @@ In addition to the path, you can filter the tests to be run by specifying tags. Multiple tags are separated by comma. The framework applies `OR` logic to all specified tags so any test / suite that matches at least one tag will be included in the test run. -```sql +```sql linenums="1" begin ut.run('hr.test_apply_bonus', a_tags => 'test1,test2'); end; ``` -```sql +```sql linenums="1" select * from table(ut.run('hr.test_apply_bonus', a_tags => 'suite1')) ``` You can also exclude specific tags by adding a `-` (dash) in front of the tag -```sql +```sql linenums="1" select * from table(ut.run('hr.test_apply_bonus', a_tags => '-suite1')) ``` @@ -347,7 +347,7 @@ Setting this flag to true has following side-effects: - automatic rollback is forced to be disabled in test-run even if it was explicitly enabled by using annotation `--%rollback(manual) Example invocation: -```sql +```sql linenums="1" set serveroutput on begin ut.run('hr.test_apply_bonus', a_force_manual_rollback => true); @@ -366,7 +366,7 @@ If you run your tests using `utPLSQL-cli`, this is done automatically and no act To make sure that the reports will display your national characters properly when running from IDE like SQLDeveloper/TOAD/SQLPlus or sqlcl you need to provide the charaterset manualy to `ut.run`. Example call with characterset provided: -```sql +```sql linenums="1" begin ut.run('hr.test_apply_bonus', ut_junit_reporter(), a_client_character_set => 'Windows-1251'); end; diff --git a/mkdocs.yml b/mkdocs.yml index 487505097..713722620 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -60,11 +60,13 @@ extra: version: # disable for offline docs provider: mike # disable for offline docs markdown_extensions: + - admonition + - pymdownx.details + - pymdownx.superfences - pymdownx.highlight: anchor_linenums: true - pymdownx.inlinehilite - pymdownx.snippets - - pymdownx.superfences - pymdownx.caret - pymdownx.mark - pymdownx.tilde diff --git a/mkdocs_offline.yml b/mkdocs_offline.yml index fe2255e59..31c90615e 100644 --- a/mkdocs_offline.yml +++ b/mkdocs_offline.yml @@ -60,11 +60,13 @@ extra: # version: # disable for offline docs # provider: mike # disable for offline docs markdown_extensions: + - admonition + - pymdownx.details + - pymdownx.superfences - pymdownx.highlight: anchor_linenums: true - pymdownx.inlinehilite - pymdownx.snippets - - pymdownx.superfences - pymdownx.caret - pymdownx.mark - pymdownx.tilde From 535f682336801e450c22ae7bc8c7281e15164197 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 26 Oct 2022 22:28:55 +0100 Subject: [PATCH 0998/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 961ba3060..0a3d8196f 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 2b625c7d0..928066c17 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index a915f2a52..bae8cc5f9 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 5d4ed97cf..a0752effd 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index bc7e1e63b..6829b6ff6 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) ## What is utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 2e2d4af9f..da3ee4b59 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 2c13fb649..112e66dd5 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package. No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit. diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index b39ab803b..dedd8fe14 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) The following are best practices we at utPLSQL have learned about PL/SQL and Unit Testing. diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 20707e917..d3c0f1881 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. Code coverage is gathered for the following source types: diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index c795c5421..932c34f94 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) utPLSQL is responsible for handling exceptions wherever they occur in the test run. The framework is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. The framework provides a full stacktrace for every exception that was thrown. The reported stacktrace does not include any utPLSQL library calls in it. diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index a972fa2e3..e3378f69b 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) ## Expectation concepts diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index c199d7095..ac684258c 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 6dfa66140..4bf1a7ef6 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) ## Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 6ee0b546f..4376106c8 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) ## Obtaining information about suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 467116479..a7a8a3540 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) utPLSQL provides several reporting formats. The sections below describe most of them. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 18270e707..482aec796 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) utPLSQL framework provides two main entry points to run unit tests from within the database: diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index a219012fd..32f8b53f6 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4063--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 06b17ccbf..3c80498cb 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.13.4063-develop'; + gc_version constant varchar2(50) := 'v3.1.13.4064-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 05753e533c90b4f82af449728f27b5e5541e4aad Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 21 Nov 2022 23:37:15 +0200 Subject: [PATCH 0999/1096] Improving expectations documentation --- docs/userguide/expectations.md | 38 +++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index e3378f69b..242922d69 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -388,7 +388,7 @@ Finished in .009229 seconds 1 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s) ``` -For more details see documentation of the [`--%throws` annotation.](annotations.md#throws-annotation) +For more details see documentation of the [`--%throws` annotation.](annotations.md#throws) ## Matchers @@ -396,7 +396,7 @@ For more details see documentation of the [`--%throws` annotation.](annotations. You can choose different matchers to validate that your PL/SQL code is working as expected. -## be_between +### be_between Validates that the actual value is between the lower and upper bound. Example: @@ -452,7 +452,7 @@ SUCCESS Actual: 'Abb' (varchar2) was expected to be between: 'Aba' and 'Abc' ``` -## be_empty +### be_empty Unary matcher that validates if the provided dataset is empty. Can be used with `BLOB`,`CLOB`, `refcursor` or `nested table`/`varray` passed as `ANYDATA` @@ -501,7 +501,7 @@ FAILURE at "anonymous block", line 9 ``` -## be_false +### be_false Unary matcher that validates if the provided value is false. Usage: @@ -529,7 +529,7 @@ SUCCESS Actual: TRUE (boolean) was expected not to be false ``` -## be_greater_or_equal +### be_greater_or_equal Checks if the actual value is greater or equal than the expected. Usage: @@ -557,7 +557,7 @@ SUCCESS Actual: 2019-07-07T22:43:29 (date) was expected not to be greater or equal: 2019-07-08T22:43:29 (date) ``` -## be_greater_than +### be_greater_than Checks if the actual value is greater than the expected. Usage: @@ -585,7 +585,7 @@ SUCCESS Actual: 0 (number) was expected not to be greater than: 1 (number) ``` -## be_less_or_equal +### be_less_or_equal Checks if the actual value is less or equal than the expected. Usage: @@ -613,7 +613,7 @@ SUCCESS Actual: 4 (number) was expected not to be less or equal: 3 (number) ``` -## be_less_than +### be_less_than Checks if the actual value is less than the expected. Usage: @@ -641,7 +641,7 @@ FAILURE at "anonymous block", line 5 ``` -## be_like +### be_like Validates that the actual value is like the expected expression. Syntax: @@ -679,7 +679,7 @@ SUCCESS Actual: 'Lorem_impsum' (varchar2) was expected not to be like: '%reM%' ``` -## be_not_null +### be_not_null Unary matcher that validates if the actual value is not null. Usage: @@ -707,7 +707,7 @@ SUCCESS Actual: NULL (varchar2) was expected not to be not null ``` -## be_null +### be_null Unary matcher that validates if the actual value is null. Usage: @@ -735,7 +735,7 @@ SUCCESS Actual: 0 (number) was expected not to be null ``` -## be_true +### be_true Unary matcher that validates if the provided value is true. Usage: @@ -763,7 +763,7 @@ FAILURE at "anonymous block", line 5 ``` -## have_count +### have_count Unary matcher that validates if the provided dataset count is equal to expected value. Can be used with `refcursor`, `json` or `table type` @@ -799,7 +799,7 @@ FAILURE at "anonymous block", line 11 ``` -## match +### match Validates that the actual value is matching the expected regular expression. Syntax: @@ -833,7 +833,7 @@ FAILURE at "anonymous block", line 5 ``` -## equal +### equal The `equal` matcher is very restrictive. Test using this matcher succeeds only when the compared data-types are exactly the same. If you are comparing a `varchar2` to a `number`, it will fail even if the text contains the same numeric value as the number. The matcher will also fail when comparing a `timestamp` to a `timestamp with timezone` data-type etc. @@ -919,7 +919,7 @@ FAILURE The `a_nulls_are_equal` parameter controls the behavior of a `null = null` comparison.
    To change the behavior of `NULL = NULL` comparison pass the `a_nulls_are_equal => false` to the `equal` matcher. -## contain +### contain This matcher supports only compound data-types comparison. It check if the actual set contains all values of expected subset. @@ -1100,7 +1100,7 @@ SUCCESS DEF ``` -## to_be_within of +### to_be_within of Determines whether expected value is within range (tolerance) from another value. @@ -1181,7 +1181,7 @@ Failures: ``` -## to_be_within_pct of +### to_be_within_pct of Determines whether actual value is within percentage range of expected value. The matcher only works with `number` data-type. @@ -1603,7 +1603,7 @@ FAILURE ### Comparing cursor data containing DATE fields -!!! warning "Important note" +!!! warning "Important" utPLSQL uses XMLType internally to represent rows of the cursor data. This is by far the most flexible method and allows comparison of cursors containing LONG, CLOB, BLOB, user defined types and even nested cursors.
    Due to the way Oracle handles DATE data type when converting from cursor data to XML, utPLSQL has no control over the DATE formatting.
    From ce1a289959ddf284cbf0c03a3ed7ae13fcc07f99 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 21 Nov 2022 23:52:52 +0200 Subject: [PATCH 1000/1096] Changed to develop version of `mike` for mkdocs - see https://github.com/jimporter/mike/issues/123 --- .github/workflows/build.yml | 4 +++- .github/workflows/release.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 92bf0752e..904c9772a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -255,7 +255,9 @@ jobs: pip install mkdocs pip install mkdocs-git-revision-date-localized-plugin pip install mkdocs-material - pip install mike +# pip install mike +# using develop version of mike - see https://github.com/jimporter/mike/issues/123 + pip install git+https://github.com/jimporter/mike.git mike deploy -p develop dispatch: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index acac5f1aa..8a4423758 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,7 +40,9 @@ jobs: pip install mkdocs pip install mkdocs-git-revision-date-localized-plugin pip install mkdocs-material - pip install mike +# pip install mike +# using develop version of mike - see https://github.com/jimporter/mike/issues/123 + pip install git+https://github.com/jimporter/mike.git mike deploy -p -u ${UTPLSQL_VERSION} latest mkdocs build --clean -f mkdocs_offline.yml rm -rf docs/* From a216a3cb0e409db7a4bec13e2ec9616c8dd1c431 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 21 Nov 2022 23:52:52 +0200 Subject: [PATCH 1001/1096] Changed to develop version of `mike` for mkdocs - see https://github.com/jimporter/mike/issues/123 --- .github/workflows/build.yml | 2 -- .github/workflows/release.yml | 2 -- 2 files changed, 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 904c9772a..441a29d0d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -255,8 +255,6 @@ jobs: pip install mkdocs pip install mkdocs-git-revision-date-localized-plugin pip install mkdocs-material -# pip install mike -# using develop version of mike - see https://github.com/jimporter/mike/issues/123 pip install git+https://github.com/jimporter/mike.git mike deploy -p develop diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8a4423758..6ec82435f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,8 +40,6 @@ jobs: pip install mkdocs pip install mkdocs-git-revision-date-localized-plugin pip install mkdocs-material -# pip install mike -# using develop version of mike - see https://github.com/jimporter/mike/issues/123 pip install git+https://github.com/jimporter/mike.git mike deploy -p -u ${UTPLSQL_VERSION} latest mkdocs build --clean -f mkdocs_offline.yml From 7eaffbde89af288e04cb5ab6384341cd72d8f3f6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 21 Nov 2022 22:06:17 +0000 Subject: [PATCH 1002/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 0a3d8196f..83ccdcdf8 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 928066c17..c7336985b 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index bae8cc5f9..2a32da1e1 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index a0752effd..49c005679 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 6829b6ff6..3ce91e6b3 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) ## What is utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index da3ee4b59..e90367224 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 112e66dd5..441b2cae4 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package. No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit. diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index dedd8fe14..bda84931c 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) The following are best practices we at utPLSQL have learned about PL/SQL and Unit Testing. diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index d3c0f1881..028044c29 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. Code coverage is gathered for the following source types: diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 932c34f94..d39e11abc 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) utPLSQL is responsible for handling exceptions wherever they occur in the test run. The framework is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. The framework provides a full stacktrace for every exception that was thrown. The reported stacktrace does not include any utPLSQL library calls in it. diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 242922d69..dc38a1dbf 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) ## Expectation concepts diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index ac684258c..8608d1375 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 4bf1a7ef6..6883a123e 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) ## Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 4376106c8..056459fc7 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) ## Obtaining information about suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index a7a8a3540..ebecc840c 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) utPLSQL provides several reporting formats. The sections below describe most of them. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 482aec796..87e8fdc5a 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) utPLSQL framework provides two main entry points to run unit tests from within the database: diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 32f8b53f6..07861ae3e 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4064--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 3c80498cb..825683207 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.13.4064-develop'; + gc_version constant varchar2(50) := 'v3.1.13.4067-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 5508dff49c92a8691cc5cffa2ff0afc909cb6fb8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 11 Dec 2022 18:30:51 +0000 Subject: [PATCH 1003/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 83ccdcdf8..9428fddd5 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index c7336985b..d4dbf52cb 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 2a32da1e1..181f9ebe0 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 49c005679..beff5f9cd 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 3ce91e6b3..4b1219689 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) ## What is utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index e90367224..7f99edbdb 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 441b2cae4..2272eb321 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package. No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit. diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index bda84931c..2eac7a733 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) The following are best practices we at utPLSQL have learned about PL/SQL and Unit Testing. diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 028044c29..2e54cfba5 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. Code coverage is gathered for the following source types: diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index d39e11abc..43b362e35 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) utPLSQL is responsible for handling exceptions wherever they occur in the test run. The framework is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. The framework provides a full stacktrace for every exception that was thrown. The reported stacktrace does not include any utPLSQL library calls in it. diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index dc38a1dbf..bf5d53809 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) ## Expectation concepts diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 8608d1375..83f80b145 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 6883a123e..9fd89ea83 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) ## Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 056459fc7..faef86500 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) ## Obtaining information about suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index ebecc840c..3df400c98 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) utPLSQL provides several reporting formats. The sections below describe most of them. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 87e8fdc5a..363ef20b3 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) utPLSQL framework provides two main entry points to run unit tests from within the database: diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 07861ae3e..633346370 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4067--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 825683207..9dba896a9 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.13.4067-develop'; + gc_version constant varchar2(50) := 'v3.1.13.4068-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 45d20eb5fd6885456b35e9ff2856213671bf9757 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 11 Dec 2022 19:13:58 +0000 Subject: [PATCH 1004/1096] Updated project version after build [skip ci] --- VERSION | 2 +- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- sonar-project.properties | 2 +- source/core/ut_utils.pks | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/VERSION b/VERSION index d0237db61..ecbc73caf 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.13-develop +v3.1.13 diff --git a/docs/about/authors.md b/docs/about/authors.md index 9428fddd5..bb8b46bb2 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4069-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index d4dbf52cb..1381a7d43 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4069-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 181f9ebe0..b241fedd7 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4069-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index beff5f9cd..06d113450 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4069-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 4b1219689..26e95ff2f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4069-blue.svg) ## What is utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 7f99edbdb..629ef4237 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4069-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 2272eb321..a21fa7292 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4069-blue.svg) Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package. No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit. diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 2eac7a733..a5a9c40b6 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4069-blue.svg) The following are best practices we at utPLSQL have learned about PL/SQL and Unit Testing. diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 2e54cfba5..2220807ae 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4069-blue.svg) utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. Code coverage is gathered for the following source types: diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 43b362e35..f585ad14d 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4069-blue.svg) utPLSQL is responsible for handling exceptions wherever they occur in the test run. The framework is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. The framework provides a full stacktrace for every exception that was thrown. The reported stacktrace does not include any utPLSQL library calls in it. diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index bf5d53809..128b05b7b 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4069-blue.svg) ## Expectation concepts diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 83f80b145..60b3f54b7 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4069-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 9fd89ea83..3ac993327 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4069-blue.svg) ## Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index faef86500..913abf783 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4069-blue.svg) ## Obtaining information about suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 3df400c98..b7a516a87 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4069-blue.svg) utPLSQL provides several reporting formats. The sections below describe most of them. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 363ef20b3..84a71c0f1 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4069-blue.svg) utPLSQL framework provides two main entry points to run unit tests from within the database: diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 633346370..a081a0a1b 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4069-blue.svg) # Upgrading from version 2 diff --git a/sonar-project.properties b/sonar-project.properties index 5d6cefe12..77cc387a8 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -3,7 +3,7 @@ sonar.organization=utplsql sonar.projectKey=utPLSQL # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=utPLSQL -sonar.projectVersion=v3.1.13-develop +sonar.projectVersion=v3.1.13 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # Since SonarQube 4.2, this property is optional if sonar.modules is set. diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 9dba896a9..86f25f8fa 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.13.4068-develop'; + gc_version constant varchar2(50) := 'v3.1.13.4069'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From b84535d4532f928f6312777a7b402b36be3fb625 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 11 Dec 2022 21:17:50 +0200 Subject: [PATCH 1005/1096] Fixed documentation build process for release branch, --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 441a29d0d..0ec37efe2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -213,8 +213,7 @@ jobs: API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }} if: | github.repository == 'utPLSQL/utPLSQL' && - github.base_ref == null && - ( startsWith( github.ref, 'refs/heads/release/v' ) || github.ref == 'refs/heads/develop' ) + github.base_ref == null && github.ref == 'refs/heads/develop' steps: - name: 🔍 API_TOKEN_GITHUB if: env.API_TOKEN_GITHUB == '' From ebb59383d90e64a1b265fe85a7a0034f18ac9d29 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 11 Dec 2022 19:27:38 +0000 Subject: [PATCH 1006/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 9428fddd5..e8d37d574 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index d4dbf52cb..5b94283db 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 181f9ebe0..26c838e8a 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index beff5f9cd..d2580f63b 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 4b1219689..0f87193a4 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) ## What is utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 7f99edbdb..6bb8163e6 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 2272eb321..9913f9a90 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package. No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit. diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 2eac7a733..94db22808 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) The following are best practices we at utPLSQL have learned about PL/SQL and Unit Testing. diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 2e54cfba5..689732e0b 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. Code coverage is gathered for the following source types: diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 43b362e35..81024551e 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) utPLSQL is responsible for handling exceptions wherever they occur in the test run. The framework is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. The framework provides a full stacktrace for every exception that was thrown. The reported stacktrace does not include any utPLSQL library calls in it. diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index bf5d53809..b6854a8cd 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) ## Expectation concepts diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 83f80b145..aca1963a7 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 9fd89ea83..64d59877d 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) ## Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index faef86500..7957d106e 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) ## Obtaining information about suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 3df400c98..ab3a5b56c 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) utPLSQL provides several reporting formats. The sections below describe most of them. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 363ef20b3..dbcfc2b59 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) utPLSQL framework provides two main entry points to run unit tests from within the database: diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 633346370..f76e86f23 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4068--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 9dba896a9..f965536cb 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.13.4068-develop'; + gc_version constant varchar2(50) := 'v3.1.13.4070-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 1846c4fc638508f5cf7a86546e8d6dd572624a73 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 11 Dec 2022 22:18:30 +0200 Subject: [PATCH 1007/1096] Updated releasing.md --- development/releasing.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/development/releasing.md b/development/releasing.md index bcc89067a..4b9e2f7f9 100644 --- a/development/releasing.md +++ b/development/releasing.md @@ -3,7 +3,7 @@ To create a release follow the below steps ## Release preparation - - Create a **draft** of Release from the `main` branch using [github releases page](https://github.com/utPLSQL/utPLSQL/releases) and populate release description using information found on the issues and pull requests **since previous release**. + - Create a **draft** of a Release with version number `vX.Y.X` sourced from the `main` branch using [github releases page](https://github.com/utPLSQL/utPLSQL/releases) and populate release description using information found on the issues and pull requests **since previous release**. To find issues closed after certain date use [advanced filters](https://help.github.com/articles/searching-issues-and-pull-requests/#search-by-open-or-closed-state). Example: [`is:issue closed:>2018-07-22`](https://github.com/utPLSQL/utPLSQL/issues?utf8=%E2%9C%93&q=is%3Aissue+closed%3A%3E2018-07-22+) @@ -11,11 +11,9 @@ To create a release follow the below steps - create the release branch from `develop` branch and make sure to name the release branch: `release/vX.Y.Z` - update, commit and push at least one file change in the release branch, to kick off a build on [GithubActions](https://github.com/utPLSQL/utPLSQL/actions) or kick-off a build manually for that branch after it was created on github. - wait for the build to complete successfully as it will update the version to be release number (without develop) - - merge the release branch to `main` branch and wait for build on `main` branch to complete successfully (do not use Squash/rebase for merge operation) - - Publish the release on the `main` branch and tag it with version number `vX.Y.Z` - - Wait for the release build to finish successfully on Github Actions as this will upload release artifacts (`zip` and `tar.gz` files along with `md5`) - - After A Release build was completed successfully, merge main branch back into develop branch. - - At this point, main branch and release tag should be at the same commit version and artifacts should be uploaded into Github release. + - merge the release branch to `main` branch and publish [the previously prepared](#release-preparation) release draft. + - Wait for the [Github Actions `Release`](https://github.com/utPLSQL/utPLSQL/actions/workflows/release.yml) process to complete successfully. The process will upload release artifacts (`zip` and `tar.gz` files along with `md5`) + - After Release build was completed successfully, merge the `main` branch back into `develop` branch. At this point, main branch and release tag should be at the same commit version and artifacts should be uploaded into Github release. - After develop branch was built, increase the version number in `VERSION` file to represent next planned release version. - Clone `utplsql.githug.io` project and add a new announcement about next version being released in `_posts`. Use previous announcements as a template. Make sure to set date, time and post title properly. From 90d0e5d53e9673e270053be995885868535d81cd Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 11 Dec 2022 22:22:10 +0200 Subject: [PATCH 1008/1096] Fixed release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6ec82435f..a748d1cbd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -67,7 +67,7 @@ jobs: slack-workflow-status: if: always() name: Post Workflow Status To Slack - needs: [ publish, upload_artifacts ] + needs: [ upload_artifacts ] runs-on: ubuntu-latest steps: - name: Slack Workflow Notification From 86cd04dcf436eb1545105f70c4c207d5a78b7bbb Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 11 Dec 2022 22:58:00 +0200 Subject: [PATCH 1009/1096] Updated releasing.md --- development/releasing.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/development/releasing.md b/development/releasing.md index 4b9e2f7f9..2b9be317a 100644 --- a/development/releasing.md +++ b/development/releasing.md @@ -15,7 +15,10 @@ To create a release follow the below steps - Wait for the [Github Actions `Release`](https://github.com/utPLSQL/utPLSQL/actions/workflows/release.yml) process to complete successfully. The process will upload release artifacts (`zip` and `tar.gz` files along with `md5`) - After Release build was completed successfully, merge the `main` branch back into `develop` branch. At this point, main branch and release tag should be at the same commit version and artifacts should be uploaded into Github release. - After develop branch was built, increase the version number in `VERSION` file to represent next planned release version. - - Clone `utplsql.githug.io` project and add a new announcement about next version being released in `_posts`. Use previous announcements as a template. Make sure to set date, time and post title properly. + - Clone `utplsql.githug.io` project and: + - Add a new announcement about next version being released in `docs/_posts`. Use previous announcements as a template. Make sure to set date, time and post title properly. + - Add the post to list in `mkdocs.yml` file in root directory of that repository. + - Add the link to the post at the beginning of the `docs/index.md` file. The following will happen: - build executed on branch `release/vX.Y.Z-[something]` updates files `sonar-project.properties`, `VERSION` with project version derived from the release branch name From 315e5c6f07e1b3d299bebea722a022ffb60bbab6 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 21 Jan 2023 00:29:49 +0200 Subject: [PATCH 1010/1096] Updated version to 3.1.14 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index ecbc73caf..3b63c19c9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.13 +v3.1.14 From f72db1e7dacd09ee273e9df3c65d908db7b3e197 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 20 Jan 2023 22:38:37 +0000 Subject: [PATCH 1011/1096] Updated project version after build [skip ci] --- VERSION | 2 +- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- sonar-project.properties | 2 +- source/core/ut_utils.pks | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/VERSION b/VERSION index 3b63c19c9..5fcdcb942 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.1.14 +v3.1.14-develop diff --git a/docs/about/authors.md b/docs/about/authors.md index e8d37d574..cd50c02bf 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 5b94283db..52b771abc 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 26c838e8a..c869cfa4f 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index d2580f63b..ec7316027 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 0f87193a4..4a9108f8a 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) ## What is utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 6bb8163e6..dc7d2f0ad 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 9913f9a90..87ede5b5f 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package. No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit. diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 94db22808..905a27acb 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) The following are best practices we at utPLSQL have learned about PL/SQL and Unit Testing. diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 689732e0b..5e9331e6b 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. Code coverage is gathered for the following source types: diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 81024551e..0da0f5178 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) utPLSQL is responsible for handling exceptions wherever they occur in the test run. The framework is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. The framework provides a full stacktrace for every exception that was thrown. The reported stacktrace does not include any utPLSQL library calls in it. diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index b6854a8cd..0655700af 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) ## Expectation concepts diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index aca1963a7..a6948f9d7 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 64d59877d..ad3bfe97e 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) ## Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 7957d106e..8cb47b973 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) ## Obtaining information about suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index ab3a5b56c..3d0bf7d84 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) utPLSQL provides several reporting formats. The sections below describe most of them. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index dbcfc2b59..0ab199c08 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) utPLSQL framework provides two main entry points to run unit tests from within the database: diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index f76e86f23..1a554dfc9 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.13.4070--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) # Upgrading from version 2 diff --git a/sonar-project.properties b/sonar-project.properties index 77cc387a8..d088e9ccb 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -3,7 +3,7 @@ sonar.organization=utplsql sonar.projectKey=utPLSQL # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=utPLSQL -sonar.projectVersion=v3.1.13 +sonar.projectVersion=v3.1.14-develop # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # Since SonarQube 4.2, this property is optional if sonar.modules is set. diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index f965536cb..438abddd2 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.13.4070-develop'; + gc_version constant varchar2(50) := 'v3.1.14.4072-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From da6ee7089b4dcdab01b7782562f113b3f34ddab0 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 8 Feb 2023 21:50:46 +0200 Subject: [PATCH 1012/1096] Refactored output buffers to have better segregation of responsibilities. Changed behavior of output buffer `get_lines` procedure to stop immediately after consuming all produced data if producer has stopped. Changed behavior of output buffer `get_lines` procedure not to timeout after 4 hours, if producer is still running. --- docs/userguide/install.md | 2 +- .../coverage/ut_coverage_reporter_base.tpb | 2 - .../output_buffers/ut_output_buffer_base.tpb | 133 ++++++++++++++++- .../output_buffers/ut_output_buffer_base.tps | 21 ++- .../ut_output_clob_table_buffer.tpb | 134 +++++------------- .../ut_output_clob_table_buffer.tps | 10 +- .../output_buffers/ut_output_table_buffer.tpb | 133 +++++------------ .../output_buffers/ut_output_table_buffer.tps | 10 +- source/core/types/ut_output_reporter_base.tpb | 8 +- source/core/types/ut_output_reporter_base.tps | 3 +- source/create_utplsql_owner.sql | 10 +- test/ut3_tester/core/test_output_buffer.pkb | 25 +++- test/ut3_tester/core/test_output_buffer.pks | 25 +++- test/ut3_tester_helper/coverage_helper.pkb | 19 +-- 14 files changed, 277 insertions(+), 258 deletions(-) diff --git a/docs/userguide/install.md b/docs/userguide/install.md index ad3bfe97e..278bad788 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -121,7 +121,7 @@ The headless scripts accept three optional parameters that define: The scripts need to be executed by `SYSDBA`, in order to grant access to `DBMS_LOCK` and `DBMS_CRYPTO` system packages. !!! warning "Important" - - Grant on `DBMS_LOCK` is required only for installation on Oracle versions below 18c. For versions 18c and above, utPLSQL uses `DBMS_SESSION.SLEEP` so access to `DBMS_LOCK` package is no longer needed.
    + - `DBMS_LOCK` is required for session synchronization between main session and session consuming realtime reports.
    - The user performing the installation must have the `ADMINISTER DATABASE TRIGGER` privilege. This is required for installation of trigger that is responsible for parsing annotations at at compile-time of a package.
    - When installed with DDL trigger, utPLSQL will not be registering unit tests for any of oracle-maintained schemas.
    - For Oracle 11g following users are excluded:
    diff --git a/source/core/coverage/ut_coverage_reporter_base.tpb b/source/core/coverage/ut_coverage_reporter_base.tpb index aff4e6560..da2bd27ad 100644 --- a/source/core/coverage/ut_coverage_reporter_base.tpb +++ b/source/core/coverage/ut_coverage_reporter_base.tpb @@ -92,7 +92,6 @@ create or replace type body ut_coverage_reporter_base is ut_coverage_helper.cleanup_tmp_table(); (l_reporter as ut_output_reporter_base).before_calling_run(null); l_reporter.after_calling_run( ut_run( a_coverage_options => a_coverage_options, a_client_character_set => a_client_character_set ) ); - l_reporter.on_finalize(null); for i in (select /*+ no_parallel */ x.text from table(l_reporter.get_lines(1, 1)) x ) loop pipe row (i.text); end loop; @@ -106,7 +105,6 @@ create or replace type body ut_coverage_reporter_base is ut_coverage_helper.cleanup_tmp_table(); (l_reporter as ut_output_reporter_base).before_calling_run(null); l_reporter.after_calling_run( ut_run( a_coverage_options => a_coverage_options, a_client_character_set => a_client_character_set ) ); - l_reporter.on_finalize(null); open l_result for select /*+ no_parallel */ x.text from table(l_reporter.get_lines(1, 1)) x; return l_result; end; diff --git a/source/core/output_buffers/ut_output_buffer_base.tpb b/source/core/output_buffers/ut_output_buffer_base.tpb index 6d7964150..c3a137b42 100644 --- a/source/core/output_buffers/ut_output_buffer_base.tpb +++ b/source/core/output_buffers/ut_output_buffer_base.tpb @@ -24,7 +24,7 @@ create or replace type body ut_output_buffer_base is self.self_type := coalesce(a_self_type,self.self_type); self.output_id := coalesce(a_output_id, self.output_id, sys_guid()); self.start_date := coalesce(self.start_date, sysdate); - self.last_message_id := 0; + self.last_write_message_id := 0; select /*+ no_parallel */ count(*) into l_exists from ut_output_buffer_info_tmp where output_id = self.output_id; if ( l_exists > 0 ) then update /*+ no_parallel */ ut_output_buffer_info_tmp set start_date = self.start_date where output_id = self.output_id; @@ -32,10 +32,135 @@ create or replace type body ut_output_buffer_base is insert /*+ no_parallel */ into ut_output_buffer_info_tmp(output_id, start_date) values (self.output_id, self.start_date); end if; commit; + dbms_lock.allocate_unique( self.output_id, self.lock_handle); self.is_closed := 0; end; - member function get_lines_cursor(a_initial_timeout natural := null, a_timeout_sec natural := null) return sys_refcursor is + member procedure lock_buffer(a_timeout_sec number := null) is + l_status integer; + begin + l_status := dbms_lock.request( self.lock_handle, dbms_lock.x_mode, 5, false ); + if l_status != 0 then + raise_application_error(-20000, 'Cannot allocate lock for output buffer of reporter. lock request status = '||l_status||', lock handle = '||self.lock_handle||', self.output_id ='||self.output_id); + end if; + end; + + member procedure close(self in out nocopy ut_output_buffer_base) is + l_status integer; + begin + l_status := dbms_lock.release( self.lock_handle ); + if l_status != 0 then + raise_application_error(-20000, 'Cannot release lock for output buffer of reporter. Lock_handle = '||self.lock_handle||' status = '||l_status); + end if; + self.is_closed := 1; + end; + + + member procedure remove_buffer_info(self in ut_output_buffer_base) is + pragma autonomous_transaction; + begin + delete from ut_output_buffer_info_tmp a + where a.output_id = self.output_id; + commit; + end; + + member function get_lines(a_initial_timeout number := null, a_timeout_sec number := null) return ut_output_data_rows pipelined is + lc_init_wait_sec constant number := coalesce(a_initial_timeout, 10 ); + lc_100_milisec constant number(1,1) := 0.1; --sleep for 100 ms between checks + lc_500_milisec constant number(3,1) := 0.5; --sleep for 1 s when waiting long + lc_1_second constant number(3,1) := 1; + l_buffer_rowids ut_varchar2_rows; + l_buffer_data ut_output_data_rows; + l_finished_flags ut_integer_list; + l_last_read_message_id integer; + l_already_waited_sec number(10,2) := 0; + l_data_finished boolean := false; + l_finished boolean := false; + l_sleep_time number(2,1) := lc_100_milisec; + l_lock_status integer; + l_producer_started boolean := false; + l_producer_finished boolean := false; + function get_lock_status return integer is + l_result integer; + l_release_status integer; + begin + l_result := dbms_lock.request( self.lock_handle, dbms_lock.s_mode, 0, false ); + if l_result = 0 then + l_release_status := dbms_lock.release( self.lock_handle ); + end if; + return l_result; + end; + begin + while not l_finished loop + + --check if the lock is still there on output - if yes, the main session is still running and so don't stop + l_lock_status := get_lock_status(); + get_data_from_buffer_table( l_last_read_message_id, l_buffer_data, l_buffer_rowids, l_finished_flags ); + + --nothing fetched from output, wait and try again + if l_buffer_data.count = 0 then + + dbms_lock.sleep(l_sleep_time); + l_already_waited_sec := l_already_waited_sec + l_sleep_time; + + -- if waited more than lc_1_second seconds then increase wait period to minimize the CPU usage. + if l_already_waited_sec >= lc_1_second then + l_sleep_time := lc_500_milisec; + end if; + + else + + l_already_waited_sec := 0; + l_sleep_time := lc_100_milisec; + + for i in 1 .. l_buffer_data.count loop + if l_buffer_data(i).text is not null then + pipe row( l_buffer_data(i) ); + elsif l_finished_flags(i) = 1 then + l_data_finished := true; + exit; + end if; + end loop; + + remove_read_data(l_buffer_rowids); + + end if; + l_producer_started := (l_lock_status <> 0 or l_buffer_data.count > 0) or l_producer_started; + l_producer_finished := (l_producer_started and l_lock_status = 0 and l_buffer_data.count = 0) or l_producer_finished; + + if not l_producer_started and l_already_waited_sec >= lc_init_wait_sec then + + if lc_init_wait_sec > 0 then + self.remove_buffer_info(); + raise_application_error( + ut_utils.gc_out_buffer_timeout, + 'Timeout occurred while waiting for report data producer to start. Waited for: '||ut_utils.to_string( l_already_waited_sec )||' seconds.' + ); + else + l_finished := true; + end if; + + elsif not l_producer_finished and a_timeout_sec is not null and l_already_waited_sec >= a_timeout_sec then + + if a_timeout_sec > 0 then + self.remove_buffer_info(); + raise_application_error( + ut_utils.gc_out_buffer_timeout, + 'Timeout occurred while waiting for more data from producer. Waited for: '||ut_utils.to_string( l_already_waited_sec )||' seconds.' + ); + else + l_finished := true; + end if; + + elsif (l_data_finished or l_producer_finished) then + l_finished := true; + end if; + end loop; + self.remove_buffer_info(); + return; + end; + + member function get_lines_cursor(a_initial_timeout number := null, a_timeout_sec number := null) return sys_refcursor is l_lines sys_refcursor; begin open l_lines for @@ -44,7 +169,7 @@ create or replace type body ut_output_buffer_base is return l_lines; end; - member procedure lines_to_dbms_output(self in ut_output_buffer_base, a_initial_timeout natural := null, a_timeout_sec natural := null) is + member procedure lines_to_dbms_output(self in ut_output_buffer_base, a_initial_timeout number := null, a_timeout_sec number := null) is l_data sys_refcursor; l_clob clob; l_item_type varchar2(32767); @@ -63,7 +188,7 @@ create or replace type body ut_output_buffer_base is end; member procedure cleanup_buffer(self in ut_output_buffer_base, a_retention_time_sec natural := null) is - gc_buffer_retention_sec constant naturaln := coalesce(a_retention_time_sec, 60 * 60 * 24); -- 24 hours + gc_buffer_retention_sec constant naturaln := coalesce(a_retention_time_sec, 60 * 60 * 24 * 5); -- 5 days l_retention_days number := gc_buffer_retention_sec / (60 * 60 * 24); l_max_retention_date date := sysdate - l_retention_days; pragma autonomous_transaction; diff --git a/source/core/output_buffers/ut_output_buffer_base.tps b/source/core/output_buffers/ut_output_buffer_base.tps index 98a6847cd..8000ea2e7 100644 --- a/source/core/output_buffers/ut_output_buffer_base.tps +++ b/source/core/output_buffers/ut_output_buffer_base.tps @@ -19,16 +19,27 @@ create or replace type ut_output_buffer_base force authid definer as object( output_id raw(32), is_closed number(1,0), start_date date, - last_message_id number(38,0), + last_write_message_id number(38,0), + lock_handle varchar2(30 byte), self_type varchar2(250 byte), member procedure init(self in out nocopy ut_output_buffer_base, a_output_id raw := null, a_self_type varchar2 := null), - member function get_lines_cursor(a_initial_timeout natural := null, a_timeout_sec natural := null) return sys_refcursor, - member procedure lines_to_dbms_output(self in ut_output_buffer_base, a_initial_timeout natural := null, a_timeout_sec natural := null), + member procedure lock_buffer(a_timeout_sec number := null), + member function get_lines_cursor(a_initial_timeout number := null, a_timeout_sec number := null) return sys_refcursor, + member procedure lines_to_dbms_output(self in ut_output_buffer_base, a_initial_timeout number := null, a_timeout_sec number := null), member procedure cleanup_buffer(self in ut_output_buffer_base, a_retention_time_sec natural := null), - not instantiable member procedure close(self in out nocopy ut_output_buffer_base), + member procedure remove_buffer_info(self in ut_output_buffer_base), + not instantiable member procedure get_data_from_buffer_table( + self in ut_output_buffer_base, + a_last_read_message_id in out nocopy integer, + a_buffer_data out nocopy ut_output_data_rows, + a_buffer_rowids out nocopy ut_varchar2_rows, + a_finished_flags out nocopy ut_integer_list + ), + member procedure close(self in out nocopy ut_output_buffer_base), + not instantiable member procedure remove_read_data(self in ut_output_buffer_base, a_buffer_rowids ut_varchar2_rows), not instantiable member procedure send_line(self in out nocopy ut_output_buffer_base, a_text varchar2, a_item_type varchar2 := null), not instantiable member procedure send_lines(self in out nocopy ut_output_buffer_base, a_text_list ut_varchar2_rows, a_item_type varchar2 := null), not instantiable member procedure send_clob(self in out nocopy ut_output_buffer_base, a_text clob, a_item_type varchar2 := null), - not instantiable member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined + member function get_lines(a_initial_timeout number := null, a_timeout_sec number := null) return ut_output_data_rows pipelined ) not final not instantiable / diff --git a/source/core/output_buffers/ut_output_clob_table_buffer.tpb b/source/core/output_buffers/ut_output_clob_table_buffer.tpb index 66ff71c62..e47f0bcb0 100644 --- a/source/core/output_buffers/ut_output_clob_table_buffer.tpb +++ b/source/core/output_buffers/ut_output_clob_table_buffer.tpb @@ -22,23 +22,13 @@ create or replace type body ut_output_clob_table_buffer is return; end; - overriding member procedure close(self in out nocopy ut_output_clob_table_buffer) is - pragma autonomous_transaction; - begin - self.last_message_id := self.last_message_id + 1; - insert /*+ no_parallel */ into ut_output_clob_buffer_tmp(output_id, message_id, is_finished) - values (self.output_id, self.last_message_id, 1); - commit; - self.is_closed := 1; - end; - overriding member procedure send_line(self in out nocopy ut_output_clob_table_buffer, a_text varchar2, a_item_type varchar2 := null) is pragma autonomous_transaction; begin if a_text is not null or a_item_type is not null then - self.last_message_id := self.last_message_id + 1; + self.last_write_message_id := self.last_write_message_id + 1; insert /*+ no_parallel */ into ut_output_clob_buffer_tmp(output_id, message_id, text, item_type) - values (self.output_id, self.last_message_id, a_text, a_item_type); + values (self.output_id, self.last_write_message_id, a_text, a_item_type); end if; commit; end; @@ -47,10 +37,10 @@ create or replace type body ut_output_clob_table_buffer is pragma autonomous_transaction; begin insert /*+ no_parallel */ into ut_output_clob_buffer_tmp(output_id, message_id, text, item_type) - select /*+ no_parallel */ self.output_id, self.last_message_id + rownum, t.column_value, a_item_type + select /*+ no_parallel */ self.output_id, self.last_write_message_id + rownum, t.column_value, a_item_type from table(a_text_list) t where t.column_value is not null or a_item_type is not null; - self.last_message_id := self.last_message_id + SQL%rowcount; + self.last_write_message_id := self.last_write_message_id + SQL%rowcount; commit; end; @@ -58,99 +48,43 @@ create or replace type body ut_output_clob_table_buffer is pragma autonomous_transaction; begin if a_text is not null and a_text != empty_clob() or a_item_type is not null then - self.last_message_id := self.last_message_id + 1; + self.last_write_message_id := self.last_write_message_id + 1; insert /*+ no_parallel */ into ut_output_clob_buffer_tmp(output_id, message_id, text, item_type) - values (self.output_id, self.last_message_id, a_text, a_item_type); + values (self.output_id, self.last_write_message_id, a_text, a_item_type); end if; commit; end; - overriding member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined is - type t_rowid_tab is table of urowid; - l_message_rowids t_rowid_tab; - l_buffer_data ut_output_data_rows; - l_finished_flags ut_integer_list; - l_already_waited_for number(10,2) := 0; - l_finished boolean := false; - lc_init_wait_sec constant naturaln := coalesce(a_initial_timeout, 60 ); -- 1 minute - lc_max_wait_sec constant naturaln := coalesce(a_timeout_sec, 60 * 60 * 4); -- 4 hours - l_wait_for integer := lc_init_wait_sec; - lc_short_sleep_time constant number(1,1) := 0.1; --sleep for 100 ms between checks - lc_long_sleep_time constant number(1) := 1; --sleep for 1 s when waiting long - lc_long_wait_time constant number(1) := 1; --waiting more than 1 sec - l_sleep_time number(2,1) := lc_short_sleep_time; - lc_bulk_limit constant integer := 5000; - l_max_message_id integer := lc_bulk_limit; - - procedure remove_read_data(a_message_rowids t_rowid_tab) is - pragma autonomous_transaction; - begin - forall i in 1 .. a_message_rowids.count - delete from ut_output_clob_buffer_tmp a - where rowid = a_message_rowids(i); - commit; - end; + overriding member procedure get_data_from_buffer_table( + self in ut_output_clob_table_buffer, + a_last_read_message_id in out nocopy integer, + a_buffer_data out nocopy ut_output_data_rows, + a_buffer_rowids out nocopy ut_varchar2_rows, + a_finished_flags out nocopy ut_integer_list + ) is + lc_bulk_limit constant integer := 5000; + begin + a_last_read_message_id := coalesce(a_last_read_message_id, 0); + with ordered_buffer as ( + select /*+ no_parallel index(a) */ ut_output_data_row(a.text, a.item_type), rowidtochar(a.rowid), is_finished + from ut_output_clob_buffer_tmp a + where a.output_id = self.output_id + and a.message_id <= a_last_read_message_id + lc_bulk_limit + order by a.message_id + ) + select /*+ no_parallel */ b.* + bulk collect into a_buffer_data, a_buffer_rowids, a_finished_flags + from ordered_buffer b; + a_last_read_message_id := a_last_read_message_id + a_finished_flags.count; + end; - procedure remove_buffer_info is + overriding member procedure remove_read_data(self in ut_output_clob_table_buffer, a_buffer_rowids ut_varchar2_rows) is pragma autonomous_transaction; - begin - delete from ut_output_buffer_info_tmp a - where a.output_id = self.output_id; - commit; - end; - - begin - while not l_finished loop - with ordered_buffer as ( - select /*+ no_parallel index(a) */ a.rowid, ut_output_data_row(a.text, a.item_type), is_finished - from ut_output_clob_buffer_tmp a - where a.output_id = self.output_id - and a.message_id <= l_max_message_id - order by a.message_id - ) - select /*+ no_parallel */ b.* - bulk collect into l_message_rowids, l_buffer_data, l_finished_flags - from ordered_buffer b; - - --nothing fetched from output, wait and try again - if l_buffer_data.count = 0 then - $if dbms_db_version.version >= 18 $then - dbms_session.sleep(l_sleep_time); - $else - dbms_lock.sleep(l_sleep_time); - $end - l_already_waited_for := l_already_waited_for + l_sleep_time; - if l_already_waited_for > lc_long_wait_time then - l_sleep_time := lc_long_sleep_time; - end if; - else - --reset wait time - -- we wait lc_max_wait_sec for new message - l_wait_for := lc_max_wait_sec; - l_already_waited_for := 0; - l_sleep_time := lc_short_sleep_time; - for i in 1 .. l_buffer_data.count loop - if l_buffer_data(i).text is not null then - pipe row(l_buffer_data(i)); - elsif l_finished_flags(i) = 1 then - l_finished := true; - exit; - end if; - end loop; - remove_read_data(l_message_rowids); - l_max_message_id := l_max_message_id + lc_bulk_limit; - end if; - if l_finished or l_already_waited_for >= l_wait_for then - remove_buffer_info(); - if l_already_waited_for > 0 and l_already_waited_for >= l_wait_for then - raise_application_error( - ut_utils.gc_out_buffer_timeout, - 'Timeout occurred while waiting for output data. Waited for: '||l_already_waited_for||' seconds.' - ); - end if; - end if; - end loop; - return; + begin + forall i in 1 .. a_buffer_rowids.count + delete from ut_output_clob_buffer_tmp a + where rowid = chartorowid(a_buffer_rowids(i)); + commit; end; end; diff --git a/source/core/output_buffers/ut_output_clob_table_buffer.tps b/source/core/output_buffers/ut_output_clob_table_buffer.tps index 7b98efaba..ccd710a8f 100644 --- a/source/core/output_buffers/ut_output_clob_table_buffer.tps +++ b/source/core/output_buffers/ut_output_clob_table_buffer.tps @@ -20,7 +20,13 @@ create or replace type ut_output_clob_table_buffer under ut_output_buffer_base ( overriding member procedure send_line(self in out nocopy ut_output_clob_table_buffer, a_text varchar2, a_item_type varchar2 := null), overriding member procedure send_lines(self in out nocopy ut_output_clob_table_buffer, a_text_list ut_varchar2_rows, a_item_type varchar2 := null), overriding member procedure send_clob(self in out nocopy ut_output_clob_table_buffer, a_text clob, a_item_type varchar2 := null), - overriding member procedure close(self in out nocopy ut_output_clob_table_buffer), - overriding member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined + overriding member procedure get_data_from_buffer_table( + self in ut_output_clob_table_buffer, + a_last_read_message_id in out nocopy integer, + a_buffer_data out nocopy ut_output_data_rows, + a_buffer_rowids out nocopy ut_varchar2_rows, + a_finished_flags out nocopy ut_integer_list + ), + overriding member procedure remove_read_data(self in ut_output_clob_table_buffer, a_buffer_rowids ut_varchar2_rows) ) not final / diff --git a/source/core/output_buffers/ut_output_table_buffer.tpb b/source/core/output_buffers/ut_output_table_buffer.tpb index 1809a49d5..189baf075 100644 --- a/source/core/output_buffers/ut_output_table_buffer.tpb +++ b/source/core/output_buffers/ut_output_table_buffer.tpb @@ -22,16 +22,6 @@ create or replace type body ut_output_table_buffer is return; end; - overriding member procedure close(self in out nocopy ut_output_table_buffer) is - pragma autonomous_transaction; - begin - self.last_message_id := self.last_message_id + 1; - insert /*+ no_parallel */ into ut_output_buffer_tmp(output_id, message_id, is_finished) - values (self.output_id, self.last_message_id, 1); - commit; - self.is_closed := 1; - end; - overriding member procedure send_line(self in out nocopy ut_output_table_buffer, a_text varchar2, a_item_type varchar2 := null) is pragma autonomous_transaction; begin @@ -44,9 +34,9 @@ create or replace type body ut_output_table_buffer is a_item_type ); else - self.last_message_id := self.last_message_id + 1; + self.last_write_message_id := self.last_write_message_id + 1; insert /*+ no_parallel */ into ut_output_buffer_tmp(output_id, message_id, text, item_type) - values (self.output_id, self.last_message_id, a_text, a_item_type); + values (self.output_id, self.last_write_message_id, a_text, a_item_type); end if; commit; end if; @@ -56,10 +46,10 @@ create or replace type body ut_output_table_buffer is pragma autonomous_transaction; begin insert /*+ no_parallel */ into ut_output_buffer_tmp(output_id, message_id, text, item_type) - select /*+ no_parallel */ self.output_id, self.last_message_id + rownum, t.column_value, a_item_type + select /*+ no_parallel */ self.output_id, self.last_write_message_id + rownum, t.column_value, a_item_type from table(a_text_list) t where t.column_value is not null or a_item_type is not null; - self.last_message_id := self.last_message_id + SQL%rowcount; + self.last_write_message_id := self.last_write_message_id + SQL%rowcount; commit; end; @@ -75,100 +65,41 @@ create or replace type body ut_output_table_buffer is a_item_type ); else - self.last_message_id := self.last_message_id + 1; + self.last_write_message_id := self.last_write_message_id + 1; insert /*+ no_parallel */ into ut_output_buffer_tmp(output_id, message_id, text, item_type) - values (self.output_id, self.last_message_id, a_text, a_item_type); + values (self.output_id, self.last_write_message_id, a_text, a_item_type); end if; commit; end if; end; - overriding member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined is - l_buffer_data ut_varchar2_rows; - l_item_types ut_varchar2_rows; - l_finished_flags ut_integer_list; - l_already_waited_for number(10,2) := 0; - l_finished boolean := false; - lc_init_wait_sec constant naturaln := coalesce(a_initial_timeout, 60 ); -- 1 minute - lc_max_wait_sec constant naturaln := coalesce(a_timeout_sec, 60 * 60 * 4); -- 4 hours - l_wait_for integer := lc_init_wait_sec; - lc_short_sleep_time constant number(1,1) := 0.1; --sleep for 100 ms between checks - lc_long_sleep_time constant number(1) := 1; --sleep for 1 s when waiting long - lc_long_wait_time constant number(1) := 1; --waiting more than 1 sec - l_sleep_time number(2,1) := lc_short_sleep_time; - lc_bulk_limit constant integer := 5000; - l_max_message_id integer := lc_bulk_limit; - - procedure get_data_from_buffer( - a_max_message_id integer, - a_buffer_data out nocopy ut_varchar2_rows, - a_item_types out nocopy ut_varchar2_rows, - a_finished_flags out nocopy ut_integer_list - ) is - pragma autonomous_transaction; - begin - delete /*+ no_parallel */ from ( - select /*+ no_parallel */ * - from ut_output_buffer_tmp o - where o.output_id = self.output_id - and o.message_id <= a_max_message_id - order by o.message_id - ) d - returning d.text, d.item_type, d.is_finished - bulk collect into a_buffer_data, a_item_types, a_finished_flags; - commit; - - end; - - procedure remove_buffer_info is - pragma autonomous_transaction; - begin - delete from ut_output_buffer_info_tmp a - where a.output_id = self.output_id; - commit; - end; + overriding member procedure get_data_from_buffer_table( + self in ut_output_table_buffer, + a_last_read_message_id in out nocopy integer, + a_buffer_data out nocopy ut_output_data_rows, + a_buffer_rowids out nocopy ut_varchar2_rows, + a_finished_flags out nocopy ut_integer_list + ) is + lc_bulk_limit constant integer := 20000; + pragma autonomous_transaction; + begin + a_last_read_message_id := coalesce(a_last_read_message_id,0); + delete /*+ no_parallel */ from ( + select /*+ no_parallel */ * + from ut_output_buffer_tmp o + where o.output_id = self.output_id + and o.message_id <= a_last_read_message_id + lc_bulk_limit + order by o.message_id + ) d + returning ut_output_data_row(d.text, d.item_type), d.is_finished + bulk collect into a_buffer_data, a_finished_flags; + a_last_read_message_id := a_last_read_message_id + a_finished_flags.count; + commit; + end; - begin - while not l_finished loop - get_data_from_buffer( l_max_message_id, l_buffer_data, l_item_types, l_finished_flags); - --nothing fetched from output, wait and try again - if l_buffer_data.count = 0 then - $if dbms_db_version.version >= 18 $then - dbms_session.sleep(l_sleep_time); - $else - dbms_lock.sleep(l_sleep_time); - $end - l_already_waited_for := l_already_waited_for + l_sleep_time; - if l_already_waited_for > lc_long_wait_time then - l_sleep_time := lc_long_sleep_time; - end if; - else - --reset wait time - -- we wait lc_max_wait_sec for new message - l_wait_for := lc_max_wait_sec; - l_already_waited_for := 0; - l_sleep_time := lc_short_sleep_time; - for i in 1 .. l_buffer_data.count loop - if l_buffer_data(i) is not null then - pipe row(ut_output_data_row(l_buffer_data(i),l_item_types(i))); - elsif l_finished_flags(i) = 1 then - l_finished := true; - exit; - end if; - end loop; - l_max_message_id := l_max_message_id + lc_bulk_limit; - end if; - if l_finished or l_already_waited_for >= l_wait_for then - remove_buffer_info(); - if l_already_waited_for > 0 and l_already_waited_for >= l_wait_for then - raise_application_error( - ut_utils.gc_out_buffer_timeout, - 'Timeout occurred while waiting for output data. Waited for: '||l_already_waited_for||' seconds.' - ); - end if; - end if; - end loop; - return; + overriding member procedure remove_read_data(self in ut_output_table_buffer, a_buffer_rowids ut_varchar2_rows) is + begin + null; end; end; diff --git a/source/core/output_buffers/ut_output_table_buffer.tps b/source/core/output_buffers/ut_output_table_buffer.tps index 726b692f8..721e5eb8a 100644 --- a/source/core/output_buffers/ut_output_table_buffer.tps +++ b/source/core/output_buffers/ut_output_table_buffer.tps @@ -20,7 +20,13 @@ create or replace type ut_output_table_buffer under ut_output_buffer_base ( overriding member procedure send_line(self in out nocopy ut_output_table_buffer, a_text varchar2, a_item_type varchar2 := null), overriding member procedure send_lines(self in out nocopy ut_output_table_buffer, a_text_list ut_varchar2_rows, a_item_type varchar2 := null), overriding member procedure send_clob(self in out nocopy ut_output_table_buffer, a_text clob, a_item_type varchar2 := null), - overriding member procedure close(self in out nocopy ut_output_table_buffer), - overriding member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined + overriding member procedure get_data_from_buffer_table( + self in ut_output_table_buffer, + a_last_read_message_id in out nocopy integer, + a_buffer_data out nocopy ut_output_data_rows, + a_buffer_rowids out nocopy ut_varchar2_rows, + a_finished_flags out nocopy ut_integer_list + ), + overriding member procedure remove_read_data(self in ut_output_table_buffer, a_buffer_rowids ut_varchar2_rows) ) not final / diff --git a/source/core/types/ut_output_reporter_base.tpb b/source/core/types/ut_output_reporter_base.tpb index f6bb27b94..48970be5a 100644 --- a/source/core/types/ut_output_reporter_base.tpb +++ b/source/core/types/ut_output_reporter_base.tpb @@ -41,13 +41,6 @@ create or replace type body ut_output_reporter_base is return l_result; end; - overriding member procedure before_calling_run(self in out nocopy ut_output_reporter_base, a_run in ut_run) is - l_output_table_buffer ut_output_table_buffer; - begin - (self as ut_reporter_base).before_calling_run(a_run); - l_output_table_buffer := treat(self.output_buffer as ut_output_table_buffer); - end; - member procedure print_text(self in out nocopy ut_output_reporter_base, a_text varchar2, a_item_type varchar2 := null) is begin self.output_buffer.send_line(a_text, a_item_type); @@ -87,6 +80,7 @@ create or replace type body ut_output_reporter_base is overriding member procedure on_initialize(self in out nocopy ut_output_reporter_base, a_run in ut_run) is begin + self.output_buffer.lock_buffer(); self.output_buffer.send_line(null, 'initialize'); end; diff --git a/source/core/types/ut_output_reporter_base.tps b/source/core/types/ut_output_reporter_base.tps index 22f507f8d..21eed9957 100644 --- a/source/core/types/ut_output_reporter_base.tps +++ b/source/core/types/ut_output_reporter_base.tps @@ -20,8 +20,7 @@ create or replace type ut_output_reporter_base under ut_reporter_base( member procedure init(self in out nocopy ut_output_reporter_base, a_self_type varchar2, a_output_buffer ut_output_buffer_base := null), overriding member procedure set_reporter_id(self in out nocopy ut_output_reporter_base, a_reporter_id raw), member function set_reporter_id(self in ut_output_reporter_base, a_reporter_id raw) return ut_output_reporter_base, - overriding member procedure before_calling_run(self in out nocopy ut_output_reporter_base, a_run in ut_run), - + member procedure print_text(self in out nocopy ut_output_reporter_base, a_text varchar2, a_item_type varchar2 := null), member procedure print_text_lines(self in out nocopy ut_output_reporter_base, a_text_lines ut_varchar2_rows, a_item_type varchar2 := null), member procedure print_clob(self in out nocopy ut_output_reporter_base, a_clob clob, a_item_type varchar2 := null), diff --git a/source/create_utplsql_owner.sql b/source/create_utplsql_owner.sql index 64bcb52ce..d7e4f3040 100644 --- a/source/create_utplsql_owner.sql +++ b/source/create_utplsql_owner.sql @@ -31,15 +31,7 @@ create user &ut3_owner_schema identified by "&ut3_password" default tablespace & grant create session, create sequence, create procedure, create type, create table, create view, create synonym to &ut3_owner_schema; -begin - $if dbms_db_version.version < 18 $then - execute immediate 'grant execute on dbms_lock to &ut3_owner_schema'; - $else - null; - $end -end; -/ - +grant execute on dbms_lock to &ut3_owner_schema; grant execute on dbms_crypto to &ut3_owner_schema; grant execute on dbms_lob to &ut3_owner_schema; grant execute on dbms_xmlgen to &ut3_owner_schema; diff --git a/test/ut3_tester/core/test_output_buffer.pkb b/test/ut3_tester/core/test_output_buffer.pkb index 2e8b3337c..c5a4c07b1 100644 --- a/test/ut3_tester/core/test_output_buffer.pkb +++ b/test/ut3_tester/core/test_output_buffer.pkb @@ -16,12 +16,13 @@ create or replace package body test_output_buffer is || chr(13) || chr(10) || to_clob(lpad('a text', 31000, ',a text')) || to_clob(lpad('a text', 31000, ',a text')); l_expected_item_type := lpad('some item type',1000,'-'); --Act + l_buffer.lock_buffer(); l_buffer.send_clob(l_expected_text, l_expected_item_type); l_buffer.close(); select text, item_type into l_actual_text, l_actual_item_type - from table(l_buffer.get_lines(0,0)); + from table(l_buffer.get_lines(0.1,0.1)); --Assert ut.expect(l_actual_text).to_equal(l_expected_text); @@ -32,7 +33,14 @@ create or replace package body test_output_buffer is ut.expect(l_remaining).to_equal(0); end; - + + procedure test_wait_for_producer is + l_buffer ut3_develop.ut_output_buffer_base; + begin + l_buffer := ut3_develop.ut_output_clob_table_buffer(); + ut.expect( l_buffer.get_lines_cursor(0.1,0) ).to_be_empty(); + end; + procedure test_doesnt_send_on_null_text is l_cur sys_refcursor; l_result integer; @@ -86,11 +94,12 @@ create or replace package body test_output_buffer is begin --Arrange l_expected := 'a text'; + l_buffer.lock_buffer(); l_buffer.send_line(l_expected); l_start := localtimestamp; --Act begin - select text into l_result from table(l_buffer.get_lines(1,1)); + select text into l_result from table(l_buffer.get_lines(0,0.3)); ut.fail('Expected a timeout exception but nothing was raised'); exception when others then @@ -101,7 +110,7 @@ create or replace package body test_output_buffer is --Throws a timeout exception ut.expect(dbms_utility.format_error_stack()).to_match('ORA'||ut3_develop.ut_utils.gc_out_buffer_timeout); --Waited for one second - ut.expect(l_duration).to_be_greater_than(interval '0.99' second); + ut.expect(l_duration).to_be_greater_or_equal(interval '0.3' second); end; select count(1) into l_remaining from table(ut3_tester_helper.run_helper.ut_output_buffer_tmp) where output_id = l_buffer.output_id; @@ -116,13 +125,15 @@ create or replace package body test_output_buffer is l_buffer ut3_develop.ut_output_buffer_base; begin --Arrange - l_stale_buffer.start_date := sysdate - 2; + l_stale_buffer.start_date := sysdate - 10; --initialize with new start date l_stale_buffer.init(); + l_stale_buffer.lock_buffer(); l_stale_buffer.send_line('some text'); l_stale_buffer.close(); l_fresh_buffer := ut3_develop.ut_output_table_buffer(); + l_fresh_buffer.lock_buffer(); l_fresh_buffer.send_line('some text'); l_fresh_buffer.close(); @@ -131,9 +142,9 @@ create or replace package body test_output_buffer is --Assert -- Data in "fresh" buffer remains - ut.expect( l_fresh_buffer.get_lines_cursor(0,0), l_buffer.self_type ).to_have_count(1); + ut.expect( l_fresh_buffer.get_lines_cursor(0,0), l_fresh_buffer.self_type ).to_have_count(1); -- Data in "stale" buffer is purged and so the call to get_lines_cursor throws ORA-20218 - ut.expect( l_stale_buffer.get_lines_cursor(0,0), l_buffer.self_type ).to_be_empty(); + ut.expect( l_stale_buffer.get_lines_cursor(0,0), l_stale_buffer.self_type ).to_be_empty(); end; procedure test_purge_text_buffer is diff --git a/test/ut3_tester/core/test_output_buffer.pks b/test/ut3_tester/core/test_output_buffer.pks index 24c2c01eb..feaa337f8 100644 --- a/test/ut3_tester/core/test_output_buffer.pks +++ b/test/ut3_tester/core/test_output_buffer.pks @@ -2,10 +2,33 @@ create or replace package test_output_buffer is --%suite(output_buffer) --%suitepath(utplsql.ut3_tester.core) + + + --%context(Read and write within the same session) + + + --%endcontext + --%context(Buffer is read in a different session than buffer write) + + --reader will wait for a_initial_timeout seconds for the writer process to start and then it will finish with error + + --reader will wait forever (beyond a_initial_timeout) if the writer process is started and end of data row was not received from the buffer + + --reader stops after reading the end of data signal from the buffer + + --reader stops when writer process ends and all data was read from the buffer + + + --%endcontext + --%test(Receives a line from buffer table and deletes) procedure test_receive; + --%test(Waits specified time for producer to lock the buffer ) + --%throws(-20218) + procedure test_wait_for_producer; + --%test(Does not send line if null text given) procedure test_doesnt_send_on_null_text; @@ -19,11 +42,9 @@ create or replace package test_output_buffer is procedure test_waiting_for_data; --%test(Purges text buffer data older than one day and leaves the rest) - --%throws(-20218) procedure test_purge_text_buffer; --%test(Purges clob buffer data older than one day and leaves the rest) - --%throws(-20218) procedure test_purge_clob_buffer; end test_output_buffer; diff --git a/test/ut3_tester_helper/coverage_helper.pkb b/test/ut3_tester_helper/coverage_helper.pkb index 99f26e9f8..3823d9d0c 100644 --- a/test/ut3_tester_helper/coverage_helper.pkb +++ b/test/ut3_tester_helper/coverage_helper.pkb @@ -305,15 +305,6 @@ create or replace package body coverage_helper is return l_status; end; - procedure sleep(a_time number) is - begin - $if dbms_db_version.version >= 18 $then - dbms_session.sleep(a_time); - $else - dbms_lock.sleep(a_time ); - $end - end; - procedure run_job_and_wait_for_finish(a_job_action varchar2) is l_status varchar2(1000); l_job_name varchar2(30); @@ -323,7 +314,7 @@ create or replace package body coverage_helper is begin g_job_no := g_job_no + 1; l_job_name := 'utPLSQL_selftest_job_'||g_job_no; - sleep(0.15); + dbms_lock.sleep(0.15); dbms_scheduler.create_job( job_name => l_job_name, job_type => 'PLSQL_BLOCK', @@ -333,13 +324,13 @@ create or replace package body coverage_helper is auto_drop => TRUE, comments => 'one-time-job' ); - while (l_status is null or l_status not in ('SUCCEEDED','FAILED')) and i < 150 loop + while (l_status is null or l_status not in ('SUCCEEDED','FAILED')) and i < 300 loop l_status := get_job_status( l_job_name, l_timestamp ); - sleep(0.1); + dbms_lock.sleep(0.1); i := i + 1; end loop; commit; - if l_status = 'FAILED' then + if nvl(l_status,'null') <> 'SUCCEEDED' then raise_application_error(-20000, 'Running a scheduler job failed'); end if; end; @@ -378,7 +369,7 @@ create or replace package body coverage_helper is pragma autonomous_transaction; begin run_job_and_wait_for_finish( a_plsql_block ); - + dbms_lock.sleep(0.1); execute immediate q'[ declare l_results ut3_develop.ut_varchar2_list; From a64bd1428499ad207571cd93fcdda78d661d6d92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Thu, 9 Feb 2023 16:34:53 +0000 Subject: [PATCH 1013/1096] Update RunExampleTestSuiteWithCompositeReporter.sql --- .../RunExampleTestSuiteWithCompositeReporter.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/developer_examples/RunExampleTestSuiteWithCompositeReporter.sql b/examples/developer_examples/RunExampleTestSuiteWithCompositeReporter.sql index 468d176ed..e713fa02d 100644 --- a/examples/developer_examples/RunExampleTestSuiteWithCompositeReporter.sql +++ b/examples/developer_examples/RunExampleTestSuiteWithCompositeReporter.sql @@ -20,6 +20,7 @@ begin ut_event_manager.initialize(); ut_event_manager.add_listener(l_doc_reporter); ut_event_manager.add_listener(l_tc_reporter); + ut_event_manager.trigger_event(ut_event_manager.gc_initialize, l_run); l_suite := ut_suite(user, 'ut_exampletest',a_line_no=>1); l_suite.description := 'Test Suite Name'; From c1d5ab6c24cb94af1cc22877d31c4b4c13037822 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 10 Feb 2023 01:31:44 +0200 Subject: [PATCH 1014/1096] Extended schediler job timeout to 10 minutes to allow for slow execution on older DB versions. We should investigate to see why execution is so slow on 11.2 and 12.1 --- test/ut3_tester_helper/coverage_helper.pkb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/test/ut3_tester_helper/coverage_helper.pkb b/test/ut3_tester_helper/coverage_helper.pkb index 3823d9d0c..2a508ca6a 100644 --- a/test/ut3_tester_helper/coverage_helper.pkb +++ b/test/ut3_tester_helper/coverage_helper.pkb @@ -290,11 +290,11 @@ create or replace package body coverage_helper is ut3_develop.ut_runner.coverage_stop(); end; - function get_job_status(a_job_name varchar2, a_job_started_after timestamp with time zone) return varchar2 is - l_status varchar2(1000); + function get_job_status(a_job_name varchar2, a_job_started_after timestamp with time zone) return user_scheduler_job_run_details%rowtype is + l_result user_scheduler_job_run_details%rowtype; begin begin - select status into l_status + select * into l_result from user_scheduler_job_run_details where job_name = upper(a_job_name) and req_start_date >= a_job_started_after; @@ -302,11 +302,11 @@ create or replace package body coverage_helper is when no_data_found then null; end; - return l_status; + return l_result; end; procedure run_job_and_wait_for_finish(a_job_action varchar2) is - l_status varchar2(1000); + l_job_run_info user_scheduler_job_run_details%rowtype; l_job_name varchar2(30); l_timestamp timestamp with time zone := current_timestamp; i integer := 0; @@ -324,14 +324,14 @@ create or replace package body coverage_helper is auto_drop => TRUE, comments => 'one-time-job' ); - while (l_status is null or l_status not in ('SUCCEEDED','FAILED')) and i < 300 loop - l_status := get_job_status( l_job_name, l_timestamp ); + while (l_job_run_info.status is null or l_job_run_info.status not in ('SUCCEEDED','FAILED')) and i < 6000 loop + l_job_run_info := get_job_status( l_job_name, l_timestamp ); dbms_lock.sleep(0.1); i := i + 1; end loop; commit; - if nvl(l_status,'null') <> 'SUCCEEDED' then - raise_application_error(-20000, 'Running a scheduler job failed'); + if nvl(l_job_run_info.status,'null') <> 'SUCCEEDED' then + raise_application_error(-20000, 'Scheduler job '''||l_job_name||''', status='''||l_job_run_info.status||'''. Additional info: '||l_job_run_info.additional_info); end if; end; From 99447ed877c9deea0f21cda59ca2f326ad2914be Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 10 Feb 2023 12:35:52 +0200 Subject: [PATCH 1015/1096] Improving performance of output buffer processing. --- .../core/output_buffers/ut_output_buffer_base.tpb | 12 ++++++++---- .../core/output_buffers/ut_output_table_buffer.tpb | 14 ++++++++++++++ .../core/output_buffers/ut_output_table_buffer.tps | 1 + 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/source/core/output_buffers/ut_output_buffer_base.tpb b/source/core/output_buffers/ut_output_buffer_base.tpb index c3a137b42..c9cffe339 100644 --- a/source/core/output_buffers/ut_output_buffer_base.tpb +++ b/source/core/output_buffers/ut_output_buffer_base.tpb @@ -179,10 +179,14 @@ create or replace type body ut_output_buffer_base is loop fetch l_data into l_clob, l_item_type; exit when l_data%notfound; - l_lines := ut_utils.clob_to_table(l_clob); - for i in 1 .. l_lines.count loop - dbms_output.put_line(l_lines(i)); - end loop; + if dbms_lob.getlength(l_clob) > 32767 then + l_lines := ut_utils.clob_to_table(l_clob); + for i in 1 .. l_lines.count loop + dbms_output.put_line(l_lines(i)); + end loop; + else + dbms_output.put_line(l_clob); + end if; end loop; close l_data; end; diff --git a/source/core/output_buffers/ut_output_table_buffer.tpb b/source/core/output_buffers/ut_output_table_buffer.tpb index 189baf075..599b56846 100644 --- a/source/core/output_buffers/ut_output_table_buffer.tpb +++ b/source/core/output_buffers/ut_output_table_buffer.tpb @@ -73,6 +73,20 @@ create or replace type body ut_output_table_buffer is end if; end; + overriding member procedure lines_to_dbms_output(self in ut_output_table_buffer, a_initial_timeout number := null, a_timeout_sec number := null) is + l_data sys_refcursor; + l_text varchar2(32767); + l_item_type varchar2(32767); + begin + l_data := self.get_lines_cursor(a_initial_timeout, a_timeout_sec); + loop + fetch l_data into l_text, l_item_type; + exit when l_data%notfound; + dbms_output.put_line(l_text); + end loop; + close l_data; + end; + overriding member procedure get_data_from_buffer_table( self in ut_output_table_buffer, a_last_read_message_id in out nocopy integer, diff --git a/source/core/output_buffers/ut_output_table_buffer.tps b/source/core/output_buffers/ut_output_table_buffer.tps index 721e5eb8a..b7ef8a3e7 100644 --- a/source/core/output_buffers/ut_output_table_buffer.tps +++ b/source/core/output_buffers/ut_output_table_buffer.tps @@ -20,6 +20,7 @@ create or replace type ut_output_table_buffer under ut_output_buffer_base ( overriding member procedure send_line(self in out nocopy ut_output_table_buffer, a_text varchar2, a_item_type varchar2 := null), overriding member procedure send_lines(self in out nocopy ut_output_table_buffer, a_text_list ut_varchar2_rows, a_item_type varchar2 := null), overriding member procedure send_clob(self in out nocopy ut_output_table_buffer, a_text clob, a_item_type varchar2 := null), + overriding member procedure lines_to_dbms_output(self in ut_output_table_buffer, a_initial_timeout number := null, a_timeout_sec number := null), overriding member procedure get_data_from_buffer_table( self in ut_output_table_buffer, a_last_read_message_id in out nocopy integer, From 07f79e29e65e73e38c9219b3188c66f13acb02b4 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 10 Feb 2023 18:59:22 +0200 Subject: [PATCH 1016/1096] Fixed performance issues introduced with previous refactoring. --- .../output_buffers/ut_output_buffer_base.tpb | 129 ++++++------------ .../output_buffers/ut_output_buffer_base.tps | 13 +- .../ut_output_clob_table_buffer.tpb | 106 ++++++++++---- .../ut_output_clob_table_buffer.tps | 9 +- .../output_buffers/ut_output_table_buffer.tpb | 69 ++++++++-- .../output_buffers/ut_output_table_buffer.tps | 9 +- 6 files changed, 183 insertions(+), 152 deletions(-) diff --git a/source/core/output_buffers/ut_output_buffer_base.tpb b/source/core/output_buffers/ut_output_buffer_base.tpb index c9cffe339..be4c92bd8 100644 --- a/source/core/output_buffers/ut_output_buffer_base.tpb +++ b/source/core/output_buffers/ut_output_buffer_base.tpb @@ -64,100 +64,51 @@ create or replace type body ut_output_buffer_base is commit; end; - member function get_lines(a_initial_timeout number := null, a_timeout_sec number := null) return ut_output_data_rows pipelined is - lc_init_wait_sec constant number := coalesce(a_initial_timeout, 10 ); - lc_100_milisec constant number(1,1) := 0.1; --sleep for 100 ms between checks - lc_500_milisec constant number(3,1) := 0.5; --sleep for 1 s when waiting long - lc_1_second constant number(3,1) := 1; - l_buffer_rowids ut_varchar2_rows; - l_buffer_data ut_output_data_rows; - l_finished_flags ut_integer_list; - l_last_read_message_id integer; - l_already_waited_sec number(10,2) := 0; - l_data_finished boolean := false; - l_finished boolean := false; - l_sleep_time number(2,1) := lc_100_milisec; - l_lock_status integer; - l_producer_started boolean := false; - l_producer_finished boolean := false; - function get_lock_status return integer is - l_result integer; - l_release_status integer; - begin - l_result := dbms_lock.request( self.lock_handle, dbms_lock.s_mode, 0, false ); - if l_result = 0 then - l_release_status := dbms_lock.release( self.lock_handle ); - end if; - return l_result; - end; + member function timeout_producer_not_started( a_producer_started boolean, a_already_waited_sec number, a_init_wait_sec number ) return boolean + is + l_result boolean := false; begin - while not l_finished loop - - --check if the lock is still there on output - if yes, the main session is still running and so don't stop - l_lock_status := get_lock_status(); - get_data_from_buffer_table( l_last_read_message_id, l_buffer_data, l_buffer_rowids, l_finished_flags ); - - --nothing fetched from output, wait and try again - if l_buffer_data.count = 0 then - - dbms_lock.sleep(l_sleep_time); - l_already_waited_sec := l_already_waited_sec + l_sleep_time; - - -- if waited more than lc_1_second seconds then increase wait period to minimize the CPU usage. - if l_already_waited_sec >= lc_1_second then - l_sleep_time := lc_500_milisec; - end if; - + if not a_producer_started and a_already_waited_sec >= a_init_wait_sec then + if a_init_wait_sec > 0 then + self.remove_buffer_info(); + raise_application_error( + ut_utils.gc_out_buffer_timeout, + 'Timeout occurred while waiting for report data producer to start. Waited for: '||ut_utils.to_string( a_already_waited_sec )||' seconds.' + ); else - - l_already_waited_sec := 0; - l_sleep_time := lc_100_milisec; - - for i in 1 .. l_buffer_data.count loop - if l_buffer_data(i).text is not null then - pipe row( l_buffer_data(i) ); - elsif l_finished_flags(i) = 1 then - l_data_finished := true; - exit; - end if; - end loop; - - remove_read_data(l_buffer_rowids); - + l_result := true; end if; - l_producer_started := (l_lock_status <> 0 or l_buffer_data.count > 0) or l_producer_started; - l_producer_finished := (l_producer_started and l_lock_status = 0 and l_buffer_data.count = 0) or l_producer_finished; - - if not l_producer_started and l_already_waited_sec >= lc_init_wait_sec then - - if lc_init_wait_sec > 0 then - self.remove_buffer_info(); - raise_application_error( - ut_utils.gc_out_buffer_timeout, - 'Timeout occurred while waiting for report data producer to start. Waited for: '||ut_utils.to_string( l_already_waited_sec )||' seconds.' - ); - else - l_finished := true; - end if; - - elsif not l_producer_finished and a_timeout_sec is not null and l_already_waited_sec >= a_timeout_sec then - - if a_timeout_sec > 0 then - self.remove_buffer_info(); - raise_application_error( - ut_utils.gc_out_buffer_timeout, - 'Timeout occurred while waiting for more data from producer. Waited for: '||ut_utils.to_string( l_already_waited_sec )||' seconds.' - ); - else - l_finished := true; - end if; + end if; + return l_result; + end; - elsif (l_data_finished or l_producer_finished) then - l_finished := true; + member function timeout_producer_not_finished(a_producer_finished boolean, a_already_waited_sec number, a_timeout_sec number) return boolean + is + l_result boolean := false; + begin + if not a_producer_finished and a_timeout_sec is not null and a_already_waited_sec >= a_timeout_sec then + if a_timeout_sec > 0 then + self.remove_buffer_info(); + raise_application_error( + ut_utils.gc_out_buffer_timeout, + 'Timeout occurred while waiting for more data from producer. Waited for: '||ut_utils.to_string( a_already_waited_sec )||' seconds.' + ); + else + l_result := true; end if; - end loop; - self.remove_buffer_info(); - return; + end if; + return l_result; + end; + + member function get_lock_status return integer is + l_result integer; + l_release_status integer; + begin + l_result := dbms_lock.request( self.lock_handle, dbms_lock.s_mode, 0, false ); + if l_result = 0 then + l_release_status := dbms_lock.release( self.lock_handle ); + end if; + return l_result; end; member function get_lines_cursor(a_initial_timeout number := null, a_timeout_sec number := null) return sys_refcursor is diff --git a/source/core/output_buffers/ut_output_buffer_base.tps b/source/core/output_buffers/ut_output_buffer_base.tps index 8000ea2e7..53be365ae 100644 --- a/source/core/output_buffers/ut_output_buffer_base.tps +++ b/source/core/output_buffers/ut_output_buffer_base.tps @@ -24,22 +24,17 @@ create or replace type ut_output_buffer_base force authid definer as object( self_type varchar2(250 byte), member procedure init(self in out nocopy ut_output_buffer_base, a_output_id raw := null, a_self_type varchar2 := null), member procedure lock_buffer(a_timeout_sec number := null), + member function timeout_producer_not_started( a_producer_started boolean, a_already_waited_sec number, a_init_wait_sec number ) return boolean, + member function timeout_producer_not_finished(a_producer_finished boolean, a_already_waited_sec number, a_timeout_sec number) return boolean, + member function get_lock_status return integer, member function get_lines_cursor(a_initial_timeout number := null, a_timeout_sec number := null) return sys_refcursor, member procedure lines_to_dbms_output(self in ut_output_buffer_base, a_initial_timeout number := null, a_timeout_sec number := null), member procedure cleanup_buffer(self in ut_output_buffer_base, a_retention_time_sec natural := null), member procedure remove_buffer_info(self in ut_output_buffer_base), - not instantiable member procedure get_data_from_buffer_table( - self in ut_output_buffer_base, - a_last_read_message_id in out nocopy integer, - a_buffer_data out nocopy ut_output_data_rows, - a_buffer_rowids out nocopy ut_varchar2_rows, - a_finished_flags out nocopy ut_integer_list - ), member procedure close(self in out nocopy ut_output_buffer_base), - not instantiable member procedure remove_read_data(self in ut_output_buffer_base, a_buffer_rowids ut_varchar2_rows), not instantiable member procedure send_line(self in out nocopy ut_output_buffer_base, a_text varchar2, a_item_type varchar2 := null), not instantiable member procedure send_lines(self in out nocopy ut_output_buffer_base, a_text_list ut_varchar2_rows, a_item_type varchar2 := null), not instantiable member procedure send_clob(self in out nocopy ut_output_buffer_base, a_text clob, a_item_type varchar2 := null), - member function get_lines(a_initial_timeout number := null, a_timeout_sec number := null) return ut_output_data_rows pipelined + not instantiable member function get_lines(a_initial_timeout number := null, a_timeout_sec number := null) return ut_output_data_rows pipelined ) not final not instantiable / diff --git a/source/core/output_buffers/ut_output_clob_table_buffer.tpb b/source/core/output_buffers/ut_output_clob_table_buffer.tpb index e47f0bcb0..c4cfdb059 100644 --- a/source/core/output_buffers/ut_output_clob_table_buffer.tpb +++ b/source/core/output_buffers/ut_output_clob_table_buffer.tpb @@ -55,36 +55,86 @@ create or replace type body ut_output_clob_table_buffer is commit; end; - overriding member procedure get_data_from_buffer_table( - self in ut_output_clob_table_buffer, - a_last_read_message_id in out nocopy integer, - a_buffer_data out nocopy ut_output_data_rows, - a_buffer_rowids out nocopy ut_varchar2_rows, - a_finished_flags out nocopy ut_integer_list - ) is - lc_bulk_limit constant integer := 5000; - begin - a_last_read_message_id := coalesce(a_last_read_message_id, 0); - with ordered_buffer as ( - select /*+ no_parallel index(a) */ ut_output_data_row(a.text, a.item_type), rowidtochar(a.rowid), is_finished - from ut_output_clob_buffer_tmp a - where a.output_id = self.output_id - and a.message_id <= a_last_read_message_id + lc_bulk_limit - order by a.message_id - ) - select /*+ no_parallel */ b.* - bulk collect into a_buffer_data, a_buffer_rowids, a_finished_flags - from ordered_buffer b; - a_last_read_message_id := a_last_read_message_id + a_finished_flags.count; - end; + overriding member function get_lines(a_initial_timeout number := null, a_timeout_sec number := null) return ut_output_data_rows pipelined is + lc_init_wait_sec constant number := coalesce(a_initial_timeout, 10 ); + l_buffer_rowids ut_varchar2_rows; + l_buffer_data ut_output_data_rows; + l_finished_flags ut_integer_list; + l_last_read_message_id integer; + l_already_waited_sec number(10,2) := 0; + l_finished boolean := false; + l_sleep_time number(2,1); + l_lock_status integer; + l_producer_started boolean := false; + l_producer_finished boolean := false; + procedure get_data_from_buffer_table( + a_last_read_message_id in out nocopy integer, + a_buffer_data out nocopy ut_output_data_rows, + a_buffer_rowids out nocopy ut_varchar2_rows, + a_finished_flags out nocopy ut_integer_list + ) is + lc_bulk_limit constant integer := 5000; + begin + a_last_read_message_id := coalesce(a_last_read_message_id, 0); + with ordered_buffer as ( + select /*+ no_parallel index(a) */ ut_output_data_row(a.text, a.item_type), rowidtochar(a.rowid), is_finished + from ut_output_clob_buffer_tmp a + where a.output_id = self.output_id + and a.message_id <= a_last_read_message_id + lc_bulk_limit + order by a.message_id + ) + select /*+ no_parallel */ b.* + bulk collect into a_buffer_data, a_buffer_rowids, a_finished_flags + from ordered_buffer b; + a_last_read_message_id := a_last_read_message_id + a_finished_flags.count; + end; + + procedure remove_read_data(a_buffer_rowids ut_varchar2_rows) is + pragma autonomous_transaction; + begin + forall i in 1 .. a_buffer_rowids.count + delete from ut_output_clob_buffer_tmp a + where rowid = chartorowid(a_buffer_rowids(i)); + commit; + end; - overriding member procedure remove_read_data(self in ut_output_clob_table_buffer, a_buffer_rowids ut_varchar2_rows) is - pragma autonomous_transaction; begin - forall i in 1 .. a_buffer_rowids.count - delete from ut_output_clob_buffer_tmp a - where rowid = chartorowid(a_buffer_rowids(i)); - commit; + while not l_finished loop + + l_sleep_time := case when l_already_waited_sec >= 1 then 0.5 else 0.1 end; + l_lock_status := self.get_lock_status(); + get_data_from_buffer_table( l_last_read_message_id, l_buffer_data, l_buffer_rowids, l_finished_flags ); + + if l_buffer_data.count > 0 then + l_already_waited_sec := 0; + for i in 1 .. l_buffer_data.count loop + if l_buffer_data(i).text is not null then + pipe row( l_buffer_data(i) ); + elsif l_finished_flags(i) = 1 then + l_finished := true; + exit; + end if; + end loop; + remove_read_data(l_buffer_rowids); + else + --nothing fetched from output, wait. + dbms_lock.sleep(l_sleep_time); + l_already_waited_sec := l_already_waited_sec + l_sleep_time; + end if; + + l_producer_started := (l_lock_status <> 0 or l_buffer_data.count > 0) or l_producer_started; + l_producer_finished := (l_producer_started and l_lock_status = 0 and l_buffer_data.count = 0) or l_producer_finished; + + l_finished := + self.timeout_producer_not_finished(l_producer_finished, l_already_waited_sec, a_timeout_sec) + or self.timeout_producer_not_started(l_producer_started, l_already_waited_sec, lc_init_wait_sec) + or l_producer_finished + or l_finished; + + end loop; + + self.remove_buffer_info(); + return; end; end; diff --git a/source/core/output_buffers/ut_output_clob_table_buffer.tps b/source/core/output_buffers/ut_output_clob_table_buffer.tps index ccd710a8f..191e64c01 100644 --- a/source/core/output_buffers/ut_output_clob_table_buffer.tps +++ b/source/core/output_buffers/ut_output_clob_table_buffer.tps @@ -20,13 +20,6 @@ create or replace type ut_output_clob_table_buffer under ut_output_buffer_base ( overriding member procedure send_line(self in out nocopy ut_output_clob_table_buffer, a_text varchar2, a_item_type varchar2 := null), overriding member procedure send_lines(self in out nocopy ut_output_clob_table_buffer, a_text_list ut_varchar2_rows, a_item_type varchar2 := null), overriding member procedure send_clob(self in out nocopy ut_output_clob_table_buffer, a_text clob, a_item_type varchar2 := null), - overriding member procedure get_data_from_buffer_table( - self in ut_output_clob_table_buffer, - a_last_read_message_id in out nocopy integer, - a_buffer_data out nocopy ut_output_data_rows, - a_buffer_rowids out nocopy ut_varchar2_rows, - a_finished_flags out nocopy ut_integer_list - ), - overriding member procedure remove_read_data(self in ut_output_clob_table_buffer, a_buffer_rowids ut_varchar2_rows) + overriding member function get_lines(a_initial_timeout number := null, a_timeout_sec number := null) return ut_output_data_rows pipelined ) not final / diff --git a/source/core/output_buffers/ut_output_table_buffer.tpb b/source/core/output_buffers/ut_output_table_buffer.tpb index 599b56846..f38363e49 100644 --- a/source/core/output_buffers/ut_output_table_buffer.tpb +++ b/source/core/output_buffers/ut_output_table_buffer.tpb @@ -87,12 +87,29 @@ create or replace type body ut_output_table_buffer is close l_data; end; - overriding member procedure get_data_from_buffer_table( - self in ut_output_table_buffer, + /* Important note. + This function code is almost duplicated between two types for performance reasons. + The pipe row clause is much faster on VARCHAR2 then it is on clob. + That is the key reason for two implementations. + */ + overriding member function get_lines(a_initial_timeout number := null, a_timeout_sec number := null) return ut_output_data_rows pipelined is + lc_init_wait_sec constant number := coalesce(a_initial_timeout, 10 ); + l_buffer_texts ut_varchar2_rows; + l_buffer_item_types ut_varchar2_rows; + l_finished_flags ut_integer_list; + l_last_read_message_id integer; + l_already_waited_sec number(10,2) := 0; + l_finished boolean := false; + l_sleep_time number(2,1); + l_lock_status integer; + l_producer_started boolean := false; + l_producer_finished boolean := false; + + procedure get_data_from_buffer_table( a_last_read_message_id in out nocopy integer, - a_buffer_data out nocopy ut_output_data_rows, - a_buffer_rowids out nocopy ut_varchar2_rows, - a_finished_flags out nocopy ut_integer_list + a_buffer_texts out nocopy ut_varchar2_rows, + a_buffer_item_types out nocopy ut_varchar2_rows, + a_finished_flags out nocopy ut_integer_list ) is lc_bulk_limit constant integer := 20000; pragma autonomous_transaction; @@ -105,15 +122,47 @@ create or replace type body ut_output_table_buffer is and o.message_id <= a_last_read_message_id + lc_bulk_limit order by o.message_id ) d - returning ut_output_data_row(d.text, d.item_type), d.is_finished - bulk collect into a_buffer_data, a_finished_flags; + returning d.text, d.item_type, d.is_finished + bulk collect into a_buffer_texts, a_buffer_item_types, a_finished_flags; a_last_read_message_id := a_last_read_message_id + a_finished_flags.count; commit; end; - - overriding member procedure remove_read_data(self in ut_output_table_buffer, a_buffer_rowids ut_varchar2_rows) is begin - null; + while not l_finished loop + + l_sleep_time := case when l_already_waited_sec >= 1 then 0.5 else 0.1 end; + l_lock_status := self.get_lock_status(); + get_data_from_buffer_table( l_last_read_message_id, l_buffer_texts, l_buffer_item_types, l_finished_flags ); + + if l_buffer_texts.count > 0 then + l_already_waited_sec := 0; + for i in 1 .. l_buffer_texts.count loop + if l_buffer_texts(i) is not null then + pipe row( ut_output_data_row(l_buffer_texts(i), l_buffer_item_types(i)) ); + elsif l_finished_flags(i) = 1 then + l_finished := true; + exit; + end if; + end loop; + else + --nothing fetched from output, wait. + dbms_lock.sleep(l_sleep_time); + l_already_waited_sec := l_already_waited_sec + l_sleep_time; + end if; + + l_producer_started := (l_lock_status <> 0 or l_buffer_texts.count > 0) or l_producer_started; + l_producer_finished := (l_producer_started and l_lock_status = 0 and l_buffer_texts.count = 0) or l_producer_finished; + + l_finished := + self.timeout_producer_not_finished(l_producer_finished, l_already_waited_sec, a_timeout_sec) + or self.timeout_producer_not_started(l_producer_started, l_already_waited_sec, lc_init_wait_sec) + or l_producer_finished + or l_finished; + + end loop; + + self.remove_buffer_info(); + return; end; end; diff --git a/source/core/output_buffers/ut_output_table_buffer.tps b/source/core/output_buffers/ut_output_table_buffer.tps index b7ef8a3e7..154ce4de6 100644 --- a/source/core/output_buffers/ut_output_table_buffer.tps +++ b/source/core/output_buffers/ut_output_table_buffer.tps @@ -21,13 +21,6 @@ create or replace type ut_output_table_buffer under ut_output_buffer_base ( overriding member procedure send_lines(self in out nocopy ut_output_table_buffer, a_text_list ut_varchar2_rows, a_item_type varchar2 := null), overriding member procedure send_clob(self in out nocopy ut_output_table_buffer, a_text clob, a_item_type varchar2 := null), overriding member procedure lines_to_dbms_output(self in ut_output_table_buffer, a_initial_timeout number := null, a_timeout_sec number := null), - overriding member procedure get_data_from_buffer_table( - self in ut_output_table_buffer, - a_last_read_message_id in out nocopy integer, - a_buffer_data out nocopy ut_output_data_rows, - a_buffer_rowids out nocopy ut_varchar2_rows, - a_finished_flags out nocopy ut_integer_list - ), - overriding member procedure remove_read_data(self in ut_output_table_buffer, a_buffer_rowids ut_varchar2_rows) + overriding member function get_lines(a_initial_timeout number := null, a_timeout_sec number := null) return ut_output_data_rows pipelined ) not final / From 865785aa49c0258f9b1c1ad8291d07867300daf6 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Fri, 10 Feb 2023 19:18:31 +0200 Subject: [PATCH 1017/1096] Fixed failing test. --- development/refresh_sources.sh | 2 +- test/ut3_tester/core/test_output_buffer.pkb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/development/refresh_sources.sh b/development/refresh_sources.sh index b6ef51ef9..83518d7cc 100755 --- a/development/refresh_sources.sh +++ b/development/refresh_sources.sh @@ -12,7 +12,7 @@ git clone --depth=1 --branch=${SELFTESTING_BRANCH:-main} https://github.com/utPL rm -rf utPLSQL-cli/* # download latest release version of utPLSQL-cli -curl -Lk -o utPLSQL-cli.zip https://github.com/utPLSQL/utPLSQL-cli/releases/download/v${UTPLSQL_CLI_VERSION}/utPLSQL-cli.zip +curl -Lk -o utPLSQL-cli.zip https://github.com/utPLSQL/utPLSQL-cli/releases/download/${UTPLSQL_CLI_VERSION}/utPLSQL-cli.zip # unzip utPLSQL-cli and remove the zip file unzip utPLSQL-cli.zip && chmod u+x utPLSQL-cli/bin/utplsql && rm utPLSQL-cli.zip diff --git a/test/ut3_tester/core/test_output_buffer.pkb b/test/ut3_tester/core/test_output_buffer.pkb index c5a4c07b1..edb10e3e6 100644 --- a/test/ut3_tester/core/test_output_buffer.pkb +++ b/test/ut3_tester/core/test_output_buffer.pkb @@ -38,7 +38,7 @@ create or replace package body test_output_buffer is l_buffer ut3_develop.ut_output_buffer_base; begin l_buffer := ut3_develop.ut_output_clob_table_buffer(); - ut.expect( l_buffer.get_lines_cursor(0.1,0) ).to_be_empty(); + ut.expect( l_buffer.get_lines_cursor(0.1) ).to_be_empty(); end; procedure test_doesnt_send_on_null_text is From 33f5485645d074f6993402a4f11c8f350534dd43 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 11 Feb 2023 10:57:45 +0000 Subject: [PATCH 1018/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index cd50c02bf..9bd1a10c6 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 52b771abc..727b513eb 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index c869cfa4f..5f4b1d57c 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index ec7316027..cd2f76d49 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 4a9108f8a..b029f6206 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) ## What is utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index dc7d2f0ad..7a2f511aa 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 87ede5b5f..0e3b6446e 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package. No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit. diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 905a27acb..d41641303 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) The following are best practices we at utPLSQL have learned about PL/SQL and Unit Testing. diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 5e9331e6b..5e1c4cbdb 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. Code coverage is gathered for the following source types: diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 0da0f5178..8c986cb87 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) utPLSQL is responsible for handling exceptions wherever they occur in the test run. The framework is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. The framework provides a full stacktrace for every exception that was thrown. The reported stacktrace does not include any utPLSQL library calls in it. diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 0655700af..c116464de 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) ## Expectation concepts diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index a6948f9d7..4427f2f10 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 278bad788..7af30194d 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) ## Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 8cb47b973..68c689828 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) ## Obtaining information about suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 3d0bf7d84..75bd4df3d 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) utPLSQL provides several reporting formats. The sections below describe most of them. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 0ab199c08..07b192ce1 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) utPLSQL framework provides two main entry points to run unit tests from within the database: diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 1a554dfc9..bb66e6e0e 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4072--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 438abddd2..18a3d5952 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.14.4072-develop'; + gc_version constant varchar2(50) := 'v3.1.14.4085-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 28b6eaa53ec15e0fc11c8ff2531388d7e857c645 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sat, 11 Feb 2023 12:54:42 +0200 Subject: [PATCH 1019/1096] Small performance improvements to output buffer handling and some tests. --- source/api/ut.pkb | 12 +++++++++--- .../core/output_buffers/ut_output_table_buffer.tpb | 10 ++++++---- test/ut3_tester_helper/coverage_helper.pkb | 14 ++++++++++++++ 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/source/api/ut.pkb b/source/api/ut.pkb index 5c91e54d4..5e612efb4 100644 --- a/source/api/ut.pkb +++ b/source/api/ut.pkb @@ -222,10 +222,15 @@ create or replace package body ut is raise_if_packages_invalidated(); raise no_data_found; end if; - g_result_lines := ut_utils.clob_to_table(l_clob, ut_utils.gc_max_storage_varchar2_len); - g_result_line_no := g_result_lines.first; + if l_clob is not null and l_clob != empty_clob() then + if length(l_clob) > ut_utils.gc_max_storage_varchar2_len then + g_result_lines := ut_utils.clob_to_table(l_clob, ut_utils.gc_max_storage_varchar2_len); + else + g_result_lines := ut_varchar2_list(l_clob); + end if; + g_result_line_no := g_result_lines.first; + end if; end if; - if g_result_line_no is not null then l_result := g_result_lines(g_result_line_no); g_result_line_no := g_result_lines.next(g_result_line_no); @@ -274,6 +279,7 @@ create or replace package body ut is if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); loop + g_result_lines := ut_varchar2_list(); pipe row( get_report_outputs( l_results ) ); end loop; end if; diff --git a/source/core/output_buffers/ut_output_table_buffer.tpb b/source/core/output_buffers/ut_output_table_buffer.tpb index f38363e49..480ae9144 100644 --- a/source/core/output_buffers/ut_output_table_buffer.tpb +++ b/source/core/output_buffers/ut_output_table_buffer.tpb @@ -75,14 +75,16 @@ create or replace type body ut_output_table_buffer is overriding member procedure lines_to_dbms_output(self in ut_output_table_buffer, a_initial_timeout number := null, a_timeout_sec number := null) is l_data sys_refcursor; - l_text varchar2(32767); - l_item_type varchar2(32767); + l_text ut_varchar2_rows; + l_item_type ut_varchar2_rows; begin l_data := self.get_lines_cursor(a_initial_timeout, a_timeout_sec); loop - fetch l_data into l_text, l_item_type; + fetch l_data bulk collect into l_text, l_item_type limit 10000; + for idx in 1 .. l_text.count loop + dbms_output.put_line(l_text(idx)); + end loop; exit when l_data%notfound; - dbms_output.put_line(l_text); end loop; close l_data; end; diff --git a/test/ut3_tester_helper/coverage_helper.pkb b/test/ut3_tester_helper/coverage_helper.pkb index 2a508ca6a..d234967e4 100644 --- a/test/ut3_tester_helper/coverage_helper.pkb +++ b/test/ut3_tester_helper/coverage_helper.pkb @@ -489,16 +489,30 @@ create or replace package body coverage_helper is l_coverage_id raw(32) := sys_guid(); begin l_plsql_block := q'[ + declare + x dbms_output.chararr; + i integer := 100000; begin + execute immediate 'alter session set statistics_level=all'; +/* + dbms_hprof.start_profiling( + location => 'PLSHPROF_DIR' + , filename => 'profiler_utPLSQL_run_]'||rawtohex(l_coverage_id)||q'[.txt' + ); +*/ ut3_develop.ut_runner.coverage_start(']'||rawtohex(l_coverage_id)||q'['); ut3_develop.ut_coverage.set_develop_mode(a_develop_mode => true); --gather coverage on the command executed begin {a_run_command}; end; + dbms_output.get_lines(x,i); ut3_develop.ut_coverage.set_develop_mode(a_develop_mode => false); ut3_develop.ut_runner.coverage_stop(); --get the actual results of the command gathering the coverage insert into test_results select rownum as id, x.* from table( {a_run_command} ) x; commit; +/* + dbms_hprof.stop_profiling; +*/ end;]'; l_plsql_block := replace(l_plsql_block,'{a_run_command}',a_run_command); l_result_clob := run_code_as_job( l_plsql_block ); From 3a837f4ccf5021fbbb8d2a269653226601ca535d Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Tue, 14 Mar 2023 23:10:15 -0700 Subject: [PATCH 1020/1096] Address issue where the not_to(contain) executes a negated matcher without negated flag set causing refcursor compare sql generated inclusion comparision. --- source/expectations/matchers/ut_contain.tpb | 1 + source/expectations/ut_expectation.tpb | 4 +- .../expectations/test_expectations_cursor.pkb | 100 +++++++++++++++++- .../expectations/test_expectations_cursor.pks | 22 +++- 4 files changed, 122 insertions(+), 5 deletions(-) diff --git a/source/expectations/matchers/ut_contain.tpb b/source/expectations/matchers/ut_contain.tpb index 7591925f5..c9691f731 100644 --- a/source/expectations/matchers/ut_contain.tpb +++ b/source/expectations/matchers/ut_contain.tpb @@ -47,6 +47,7 @@ create or replace type body ut_contain as overriding member function run_matcher_negated(self in out nocopy ut_contain, a_actual ut_data_value) return boolean is begin + self.negated(); return run_matcher(a_actual); end; diff --git a/source/expectations/ut_expectation.tpb b/source/expectations/ut_expectation.tpb index a78c57eb7..309759d48 100644 --- a/source/expectations/ut_expectation.tpb +++ b/source/expectations/ut_expectation.tpb @@ -686,7 +686,7 @@ create or replace type body ut_expectation as member procedure not_to_contain(self in ut_expectation, a_expected sys_refcursor) is begin - self.not_to( ut_contain(a_expected).negated() ); + self.not_to( ut_contain(a_expected)); end; member procedure to_contain(self in ut_expectation, a_expected anydata) is @@ -696,7 +696,7 @@ create or replace type body ut_expectation as member procedure not_to_contain(self in ut_expectation, a_expected anydata) is begin - self.not_to( ut_contain(a_expected).negated() ); + self.not_to( ut_contain(a_expected)); end; member function to_be_within(a_dist number) return ut_be_within is diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index 952084fd3..7d0f308a8 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -2329,6 +2329,23 @@ Diff:% ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; + procedure cursor_not_to_contain2 + as + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + open l_expected for select 'TEST' username, -600 user_id from dual; + + open l_actual for select username, user_id from all_users + union all + select 'TEST1' username, -601 user_id from dual; + + --Act + ut3_develop.ut.expect(l_actual).not_to(ut3_develop.contain(l_expected)); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + procedure cursor_not_to_contain_fail is l_actual sys_refcursor; l_expected sys_refcursor; @@ -2359,6 +2376,37 @@ Diff:% ut.expect(l_actual_message).to_be_like(l_expected_message); end; + + procedure cursor_not_to_contain_fail2 is + l_actual sys_refcursor; + l_expected sys_refcursor; + l_expected_message varchar2(32767); + l_actual_message varchar2(32767); + begin + --Arrange + open l_expected for select 'TEST' username, -600 user_id from dual; + + open l_actual for select username, user_id from all_users + union all + select 'TEST' username, -600 user_id from dual; + + --Act + ut3_develop.ut.expect(l_actual).not_to(ut3_develop.contain(l_expected)); + --Assert + l_expected_message := q'[%Actual: (refcursor [ count = % ])% +%Data-types:% +%VARCHAR2NUMBER% +%Data:% +%was expected not to contain:(refcursor [ count = 1 ])% +%Data-types:% +%CHARNUMBER% +%Data:% +%TEST-600%]'; + l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1); + --Assert + ut.expect(l_actual_message).to_be_like(l_expected_message); + end; + procedure cursor_not_to_contain_joinby is l_actual sys_refcursor; l_expected sys_refcursor; @@ -2372,7 +2420,21 @@ Diff:% --Assert ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; - + + procedure cursor_not_to_contain_joinby2 is + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + --Arrange + open l_actual for select username,rownum * 10 user_id from all_users where rownum < 5; + open l_expected for select username||to_char(rownum) username ,rownum user_id from all_users where rownum < 5; + + --Act + ut3_develop.ut.expect(l_actual).not_to(ut3_develop.contain(l_expected).join_by('USER_ID')); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + procedure not_cont_join_incl_cols_as_lst is l_actual sys_refcursor; l_expected sys_refcursor; @@ -2386,6 +2448,19 @@ Diff:% ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; + procedure not_cont_join_incl_cols_as_lst2 is + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + --Arrange + open l_actual for select rownum as rn, 'b' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 10; + open l_expected for select rownum * 20 rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; + --Act + ut3_develop.ut.expect(l_actual).not_to(ut3_develop.contain(l_expected).include(ut3_develop.ut_varchar2_list('RN','//A_Column','SOME_COL')).join_by('RN')); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + procedure not_cont_join_excl_cols_as_lst is l_actual sys_refcursor; l_expected sys_refcursor; @@ -2399,6 +2474,19 @@ Diff:% ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; + procedure not_cont_join_excl_cols_as_lst2 is + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + --Arrange + open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'y' SOME_COL, 'd' "Some_Col" from dual a connect by level < 10; + open l_expected for select rownum * 20 as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4; + --Act + ut3_develop.ut.expect(l_actual).not_to(ut3_develop.contain(l_expected).exclude(ut3_develop.ut_varchar2_list('//Some_Col','A_COLUMN')).join_by('RN')); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + procedure to_contain_duplicates is l_actual sys_refcursor; l_expected sys_refcursor; @@ -2440,6 +2528,16 @@ Diff:% ut.expect(l_actual_message).to_be_like(l_expected_message); end; + procedure to_not_contain_fails_1245 is + c1 sys_refcursor; + c2 sys_refcursor; + begin + open c1 for select 'a' as letter from dual union all select 'b' from dual; + open c2 for select 'c' as letter from dual; + ut3_develop.ut.expect(c1).not_to(ut3_develop.contain(c2)); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + procedure udt_messg_format_eq is l_actual sys_refcursor; l_expected sys_refcursor; diff --git a/test/ut3_user/expectations/test_expectations_cursor.pks b/test/ut3_user/expectations/test_expectations_cursor.pks index 0ed249a49..e7a289247 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pks +++ b/test/ut3_user/expectations/test_expectations_cursor.pks @@ -376,24 +376,42 @@ create or replace package test_expectations_cursor is --%test( Cursor not to contains data from another cursor) procedure cursor_not_to_contain; + --%test( Cursor not_to[contain] data from another cursor) + procedure cursor_not_to_contain2; + --%test( Cursor fail not to contains data from another cursor) procedure cursor_not_to_contain_fail; - + + --%test( Cursor fail not_to[contain] data from another cursor) + procedure cursor_not_to_contain_fail2; + --%test( Cursor not contains data from another cursor with joinby clause) procedure cursor_not_to_contain_joinby; + --%test( Cursor not_to[contain] data from another cursor with joinby clause) + procedure cursor_not_to_contain_joinby2; + --%test(Cursor not contains data with of columns to include and join by value) procedure not_cont_join_incl_cols_as_lst; + --%test(Cursor not_to[contain] data with of columns to include and join by value) + procedure not_cont_join_incl_cols_as_lst2; + --%test(Cursor not contains data with of columns to exclude and join by value) procedure not_cont_join_excl_cols_as_lst; + --%test(Cursor not_to[contain] data with of columns to exclude and join by value) + procedure not_cont_join_excl_cols_as_lst2; + --%test(Cursor to contain duplicates) procedure to_contain_duplicates; --%test(Cursor to contain duplicates fail) procedure to_contain_duplicates_fail; - + + --%test(Cursor using not_to[contain] fails #1245) + procedure to_not_contain_fails_1245; + --%test(Display a message with a uer defined type with only type name not structure on equal) procedure udt_messg_format_eq; From 0707b2d8a8cb44b77abe327c46b596c7899bbb9a Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Tue, 14 Mar 2023 23:19:56 -0700 Subject: [PATCH 1021/1096] Fixing when test name is longer than 30 char --- test/ut3_user/expectations/test_expectations_cursor.pkb | 4 ++-- test/ut3_user/expectations/test_expectations_cursor.pks | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index 7d0f308a8..847cce9a0 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -2448,7 +2448,7 @@ Diff:% ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; - procedure not_cont_join_incl_cols_as_lst2 is + procedure not_con_join_incl_cols_as_lst2 is l_actual sys_refcursor; l_expected sys_refcursor; begin @@ -2474,7 +2474,7 @@ Diff:% ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; - procedure not_cont_join_excl_cols_as_lst2 is + procedure not_con_join_excl_cols_as_lst2 is l_actual sys_refcursor; l_expected sys_refcursor; begin diff --git a/test/ut3_user/expectations/test_expectations_cursor.pks b/test/ut3_user/expectations/test_expectations_cursor.pks index e7a289247..0f34486a9 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pks +++ b/test/ut3_user/expectations/test_expectations_cursor.pks @@ -395,13 +395,13 @@ create or replace package test_expectations_cursor is procedure not_cont_join_incl_cols_as_lst; --%test(Cursor not_to[contain] data with of columns to include and join by value) - procedure not_cont_join_incl_cols_as_lst2; + procedure not_con_join_incl_cols_as_lst2; --%test(Cursor not contains data with of columns to exclude and join by value) procedure not_cont_join_excl_cols_as_lst; --%test(Cursor not_to[contain] data with of columns to exclude and join by value) - procedure not_cont_join_excl_cols_as_lst2; + procedure not_con_join_excl_cols_as_lst2; --%test(Cursor to contain duplicates) procedure to_contain_duplicates; From 8460a3092ac4f6781bf8f07f5a0d26d31ab6fa71 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Wed, 15 Mar 2023 00:24:05 -0700 Subject: [PATCH 1022/1096] Update test --- .../expectations/test_expectation_anydata.pkb | 19 ++++++++++++++++++- .../expectations/test_expectation_anydata.pks | 3 +++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/test/ut3_user/expectations/test_expectation_anydata.pkb b/test/ut3_user/expectations/test_expectation_anydata.pkb index c56c31930..c70d41f9e 100644 --- a/test/ut3_user/expectations/test_expectation_anydata.pkb +++ b/test/ut3_user/expectations/test_expectation_anydata.pkb @@ -957,6 +957,23 @@ Rows: [ 60 differences, showing first 20 ] ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; + procedure collection_not_to_contain is + l_actual ut3_tester_helper.test_dummy_object_list; + l_expected ut3_tester_helper.test_dummy_object_list; + begin + --Arrange + select ut3_tester_helper.test_dummy_object( rownum, 'Something2 '||rownum, rownum+100) + bulk collect into l_actual + from dual connect by level <=4; + select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum) + bulk collect into l_expected + from dual connect by level <=2 + order by rownum desc; + --Act + ut3_develop.ut.expect(anydata.convertCollection(l_actual)).not_to_contain(anydata.convertCollection(l_expected)); + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); + end; + procedure object_to_contain is begin --Arrange @@ -967,7 +984,7 @@ Rows: [ 60 differences, showing first 20 ] ut3_develop.ut.expect(g_test_actual).to_contain(g_test_expected); ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0); end; - + procedure arr_empty_eq_arr_empty_unord is begin --Arrange diff --git a/test/ut3_user/expectations/test_expectation_anydata.pks b/test/ut3_user/expectations/test_expectation_anydata.pks index 81dea74eb..54c246bd3 100644 --- a/test/ut3_user/expectations/test_expectation_anydata.pks +++ b/test/ut3_user/expectations/test_expectation_anydata.pks @@ -195,6 +195,9 @@ create or replace package test_expectation_anydata is --%test( Success when anydata collection contains data from another anydata collection) procedure collection_to_contain; + --%test( Success when anydata collection not contains data from another anydata collection) + procedure collection_not_to_contain; + --%test( Success when anydata object contains data from another anydata) procedure object_to_contain; From 7597905bfe41bc1b3580919e670d00e76bd62f3d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 19 Mar 2023 17:05:14 +0000 Subject: [PATCH 1023/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 9bd1a10c6..d132d2085 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 727b513eb..21b82ee41 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 5f4b1d57c..9b423d5a8 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index cd2f76d49..d534857fa 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index b029f6206..d6884ba2d 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) ## What is utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 7a2f511aa..2c31a9a89 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 0e3b6446e..d193e2c20 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package. No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit. diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index d41641303..63c0e36e9 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) The following are best practices we at utPLSQL have learned about PL/SQL and Unit Testing. diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 5e1c4cbdb..f77717798 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. Code coverage is gathered for the following source types: diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 8c986cb87..e237bf4ef 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) utPLSQL is responsible for handling exceptions wherever they occur in the test run. The framework is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. The framework provides a full stacktrace for every exception that was thrown. The reported stacktrace does not include any utPLSQL library calls in it. diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index c116464de..8fa525a69 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) ## Expectation concepts diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 4427f2f10..d97d49464 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 7af30194d..934d07d72 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) ## Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 68c689828..9e16fd3e8 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) ## Obtaining information about suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 75bd4df3d..b3b0e338a 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) utPLSQL provides several reporting formats. The sections below describe most of them. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 07b192ce1..e8e431980 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) utPLSQL framework provides two main entry points to run unit tests from within the database: diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index bb66e6e0e..47772937e 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4085--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 18a3d5952..f92fbc2b0 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.14.4085-develop'; + gc_version constant varchar2(50) := 'v3.1.14.4094-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 521fe472bb634095a3a3081f5175933eec61d2aa Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 20 Mar 2023 00:20:15 +0200 Subject: [PATCH 1024/1096] Performance improvements in output buffer for reporters that only produce data after the whole run is finished. --- source/api/ut.pkb | 7 +- .../output_buffers/ut_output_bulk_buffer.tpb | 160 ++++++++++++++++++ .../output_buffers/ut_output_bulk_buffer.tps | 27 +++ source/core/ut_utils.pkb | 1 + source/install.sql | 2 + .../ut_coverage_cobertura_reporter.tpb | 2 +- .../reporters/ut_coverage_html_reporter.tpb | 2 +- .../reporters/ut_coverage_sonar_reporter.tpb | 9 +- source/reporters/ut_coveralls_reporter.tpb | 2 +- source/reporters/ut_junit_reporter.tpb | 2 +- source/reporters/ut_sonar_test_reporter.tpb | 2 +- source/reporters/ut_tfs_junit_reporter.tpb | 2 +- source/reporters/ut_xunit_reporter.tpb | 2 +- source/uninstall_objects.sql | 2 + test/ut3_tester_helper/coverage_helper.pkb | 2 +- 15 files changed, 214 insertions(+), 10 deletions(-) create mode 100644 source/core/output_buffers/ut_output_bulk_buffer.tpb create mode 100644 source/core/output_buffers/ut_output_bulk_buffer.tps diff --git a/source/api/ut.pkb b/source/api/ut.pkb index 5e612efb4..cff35b771 100644 --- a/source/api/ut.pkb +++ b/source/api/ut.pkb @@ -278,8 +278,8 @@ create or replace package body ut is ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); + g_result_lines := ut_varchar2_list(); loop - g_result_lines := ut_varchar2_list(); pipe row( get_report_outputs( l_results ) ); end loop; end if; @@ -326,6 +326,7 @@ create or replace package body ut is ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); + g_result_lines := ut_varchar2_list(); loop pipe row( get_report_outputs( l_results ) ); end loop; @@ -374,6 +375,7 @@ create or replace package body ut is ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); + g_result_lines := ut_varchar2_list(); loop pipe row( get_report_outputs( l_results ) ); end loop; @@ -422,6 +424,7 @@ create or replace package body ut is ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); + g_result_lines := ut_varchar2_list(); loop pipe row( get_report_outputs( l_results ) ); end loop; @@ -470,6 +473,7 @@ create or replace package body ut is ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); + g_result_lines := ut_varchar2_list(); loop pipe row( get_report_outputs( l_results ) ); end loop; @@ -518,6 +522,7 @@ create or replace package body ut is ); if l_reporter is of (ut_output_reporter_base) then l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor(); + g_result_lines := ut_varchar2_list(); loop pipe row( get_report_outputs( l_results ) ); end loop; diff --git a/source/core/output_buffers/ut_output_bulk_buffer.tpb b/source/core/output_buffers/ut_output_bulk_buffer.tpb new file mode 100644 index 000000000..49aa1e913 --- /dev/null +++ b/source/core/output_buffers/ut_output_bulk_buffer.tpb @@ -0,0 +1,160 @@ +create or replace type body ut_output_bulk_buffer is + /* + utPLSQL - Version 3 + Copyright 2016 - 2023 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + constructor function ut_output_bulk_buffer(self in out nocopy ut_output_bulk_buffer, a_output_id raw := null) return self as result is + begin + self.init(a_output_id, $$plsql_unit); + return; + end; + + overriding member procedure send_line(self in out nocopy ut_output_bulk_buffer, a_text varchar2, a_item_type varchar2 := null) is + pragma autonomous_transaction; + begin + if a_text is not null or a_item_type is not null then + if length(a_text) > ut_utils.gc_max_storage_varchar2_len then + self.send_lines( + ut_utils.convert_collection( + ut_utils.clob_to_table(a_text, ut_utils.gc_max_storage_varchar2_len) + ), + a_item_type + ); + else + self.last_write_message_id := self.last_write_message_id + 1; + insert /*+ no_parallel */ into ut_output_buffer_tmp(output_id, message_id, text, item_type) + values (self.output_id, self.last_write_message_id, a_text, a_item_type); + end if; + commit; + end if; + end; + + overriding member procedure send_lines(self in out nocopy ut_output_bulk_buffer, a_text_list ut_varchar2_rows, a_item_type varchar2 := null) is + pragma autonomous_transaction; + begin + insert /*+ no_parallel */ into ut_output_buffer_tmp(output_id, message_id, text, item_type) + select /*+ no_parallel */ self.output_id, self.last_write_message_id + rownum, t.column_value, a_item_type + from table(a_text_list) t + where t.column_value is not null or a_item_type is not null; + self.last_write_message_id := self.last_write_message_id + SQL%rowcount; + commit; + end; + + overriding member procedure send_clob(self in out nocopy ut_output_bulk_buffer, a_text clob, a_item_type varchar2 := null) is + pragma autonomous_transaction; + begin + if a_text is not null and a_text != empty_clob() or a_item_type is not null then + if length(a_text) > ut_utils.gc_max_storage_varchar2_len then + self.send_lines( + ut_utils.convert_collection( + ut_utils.clob_to_table(a_text, ut_utils.gc_max_storage_varchar2_len) + ), + a_item_type + ); + else + self.last_write_message_id := self.last_write_message_id + 1; + insert /*+ no_parallel */ into ut_output_buffer_tmp(output_id, message_id, text, item_type) + values (self.output_id, self.last_write_message_id, a_text, a_item_type); + end if; + commit; + end if; + end; + + overriding member procedure lines_to_dbms_output(self in ut_output_bulk_buffer, a_initial_timeout number := null, a_timeout_sec number := null) is + l_data sys_refcursor; + l_text ut_varchar2_rows; + l_item_type ut_varchar2_rows; + begin + l_data := self.get_lines_cursor(a_initial_timeout, a_timeout_sec); + loop + fetch l_data bulk collect into l_text, l_item_type limit 10000; + for idx in 1 .. l_text.count loop + dbms_output.put_line(l_text(idx)); + end loop; + exit when l_data%notfound; + end loop; + close l_data; + end; + + overriding member function get_lines_cursor(a_initial_timeout number := null, a_timeout_sec number := null) return sys_refcursor is + lc_init_wait_sec constant number := coalesce(a_initial_timeout, 30 ); + l_already_waited_sec number(10,2) := 0; + l_sleep_time number(2,1); + l_exists integer; + l_finished boolean := false; + l_data_produced boolean; + l_producer_active boolean := false; + l_producer_started boolean := false; + l_producer_finished boolean := false; + l_results sys_refcursor; + begin + + while not l_finished loop + + if not l_data_produced then + select /*+ no_parallel */ count(1) into l_exists + from ut_output_buffer_tmp o + where o.output_id = self.output_id and rownum = 1; + l_data_produced := (l_exists = 1); + end if; + + l_sleep_time := case when l_already_waited_sec >= 1 then 0.5 else 0.1 end; + l_producer_active := (self.get_lock_status() <> 0); + l_producer_started := (l_producer_active or l_data_produced ) or l_producer_started; + l_producer_finished := (l_producer_started and not l_producer_active) or l_producer_finished; + + l_finished := + self.timeout_producer_not_finished(l_producer_finished, l_already_waited_sec, a_timeout_sec) + or self.timeout_producer_not_started(l_producer_started, l_already_waited_sec, lc_init_wait_sec) + or l_producer_finished; + end loop; + + open l_results for + select /*+ no_parallel */ o.text, o.item_type + from ut_output_buffer_tmp o + where o.output_id = self.output_id + and o.text is not null + order by o.output_id, o.message_id; + + return l_results; + + end; + + /* Important note. + This function code is almost duplicated between two types for performance reasons. + The pipe row clause is much faster on VARCHAR2 then it is on clob. + That is the key reason for two implementations. + */ + overriding member function get_lines(a_initial_timeout number := null, a_timeout_sec number := null) return ut_output_data_rows pipelined is + l_data sys_refcursor; + l_text ut_varchar2_rows; + l_item_type ut_varchar2_rows; + begin + l_data := self.get_lines_cursor(a_initial_timeout, a_timeout_sec); + loop + fetch l_data bulk collect into l_text, l_item_type limit 10000; + for idx in 1 .. l_text.count loop + pipe row( ut_output_data_row(l_text(idx), l_item_type(idx)) ); + end loop; + exit when l_data%notfound; + end loop; + close l_data; + return; + self.remove_buffer_info(); + end; + +end; +/ diff --git a/source/core/output_buffers/ut_output_bulk_buffer.tps b/source/core/output_buffers/ut_output_bulk_buffer.tps new file mode 100644 index 000000000..d74d4ee14 --- /dev/null +++ b/source/core/output_buffers/ut_output_bulk_buffer.tps @@ -0,0 +1,27 @@ +create or replace type ut_output_bulk_buffer under ut_output_buffer_base ( + /* + utPLSQL - Version 3 + Copyright 2016 - 2023 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + constructor function ut_output_bulk_buffer(self in out nocopy ut_output_bulk_buffer, a_output_id raw := null) return self as result, + overriding member procedure send_line(self in out nocopy ut_output_bulk_buffer, a_text varchar2, a_item_type varchar2 := null), + overriding member procedure send_lines(self in out nocopy ut_output_bulk_buffer, a_text_list ut_varchar2_rows, a_item_type varchar2 := null), + overriding member procedure send_clob(self in out nocopy ut_output_bulk_buffer, a_text clob, a_item_type varchar2 := null), + overriding member procedure lines_to_dbms_output(self in ut_output_bulk_buffer, a_initial_timeout number := null, a_timeout_sec number := null), + overriding member function get_lines_cursor(a_initial_timeout number := null, a_timeout_sec number := null) return sys_refcursor, + overriding member function get_lines(a_initial_timeout number := null, a_timeout_sec number := null) return ut_output_data_rows pipelined +) not final +/ diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 162e50f8f..5114cecad 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -570,6 +570,7 @@ create or replace package body ut_utils is end loop; exit when l_lines_data%notfound; end loop; + close l_lines_data; execute immediate 'truncate table ut_dbms_output_cache'; commit; end; diff --git a/source/install.sql b/source/install.sql index 6f3c16801..0873d6a1e 100644 --- a/source/install.sql +++ b/source/install.sql @@ -120,6 +120,8 @@ create or replace context &&ut3_owner._info using &&ut3_owner..ut_session_contex @@install_component.sql 'core/output_buffers/ut_output_table_buffer.tpb' @@install_component.sql 'core/output_buffers/ut_output_clob_table_buffer.tps' @@install_component.sql 'core/output_buffers/ut_output_clob_table_buffer.tpb' +@@install_component.sql 'core/output_buffers/ut_output_bulk_buffer.tps' +@@install_component.sql 'core/output_buffers/ut_output_bulk_buffer.tpb' @@install_component.sql 'core/types/ut_output_reporter_base.tps' diff --git a/source/reporters/ut_coverage_cobertura_reporter.tpb b/source/reporters/ut_coverage_cobertura_reporter.tpb index 48082a6d4..50eb34631 100644 --- a/source/reporters/ut_coverage_cobertura_reporter.tpb +++ b/source/reporters/ut_coverage_cobertura_reporter.tpb @@ -20,7 +20,7 @@ create or replace type body ut_coverage_cobertura_reporter is self in out nocopy ut_coverage_cobertura_reporter ) return self as result is begin - self.init($$plsql_unit); + self.init($$plsql_unit,ut_output_bulk_buffer()); return; end; diff --git a/source/reporters/ut_coverage_html_reporter.tpb b/source/reporters/ut_coverage_html_reporter.tpb index c88c91a80..b1f9f6651 100644 --- a/source/reporters/ut_coverage_html_reporter.tpb +++ b/source/reporters/ut_coverage_html_reporter.tpb @@ -22,7 +22,7 @@ create or replace type body ut_coverage_html_reporter is a_html_report_assets_path varchar2 := null ) return self as result is begin - self.init($$plsql_unit); + self.init($$plsql_unit,ut_output_bulk_buffer()); self.project_name := a_project_name; assets_path := nvl(a_html_report_assets_path, ut_coverage_report_html_helper.get_default_html_assets_path()); return; diff --git a/source/reporters/ut_coverage_sonar_reporter.tpb b/source/reporters/ut_coverage_sonar_reporter.tpb index 8ee78dc24..1861a9be3 100644 --- a/source/reporters/ut_coverage_sonar_reporter.tpb +++ b/source/reporters/ut_coverage_sonar_reporter.tpb @@ -20,7 +20,7 @@ create or replace type body ut_coverage_sonar_reporter is self in out nocopy ut_coverage_sonar_reporter ) return self as result is begin - self.init($$plsql_unit); + self.init($$plsql_unit,ut_output_bulk_buffer()); return; end; @@ -84,6 +84,12 @@ create or replace type body ut_coverage_sonar_reporter is end; begin +-- execute immediate 'alter session set statistics_level=all'; +-- dbms_hprof.start_profiling( +-- location => 'PLSHPROF_DIR' +-- , filename => 'profiler_utPLSQL_run_on_'||$$plsql_unit||'_'||rawtohex(self.id)||'.txt' +-- ); +-- ut_coverage.coverage_stop(); self.print_text_lines( @@ -92,6 +98,7 @@ create or replace type body ut_coverage_sonar_reporter is a_run ) ); +-- dbms_hprof.stop_profiling; end; overriding member function get_description return varchar2 as diff --git a/source/reporters/ut_coveralls_reporter.tpb b/source/reporters/ut_coveralls_reporter.tpb index 3a54aa7f7..14672303e 100644 --- a/source/reporters/ut_coveralls_reporter.tpb +++ b/source/reporters/ut_coveralls_reporter.tpb @@ -20,7 +20,7 @@ create or replace type body ut_coveralls_reporter is self in out nocopy ut_coveralls_reporter ) return self as result is begin - self.init($$plsql_unit); + self.init($$plsql_unit,ut_output_bulk_buffer()); return; end; diff --git a/source/reporters/ut_junit_reporter.tpb b/source/reporters/ut_junit_reporter.tpb index 44affa030..3bceb52a4 100644 --- a/source/reporters/ut_junit_reporter.tpb +++ b/source/reporters/ut_junit_reporter.tpb @@ -18,7 +18,7 @@ create or replace type body ut_junit_reporter is constructor function ut_junit_reporter(self in out nocopy ut_junit_reporter) return self as result is begin - self.init($$plsql_unit); + self.init($$plsql_unit,ut_output_bulk_buffer()); return; end; diff --git a/source/reporters/ut_sonar_test_reporter.tpb b/source/reporters/ut_sonar_test_reporter.tpb index a3ec72241..7c46879d2 100644 --- a/source/reporters/ut_sonar_test_reporter.tpb +++ b/source/reporters/ut_sonar_test_reporter.tpb @@ -20,7 +20,7 @@ create or replace type body ut_sonar_test_reporter is self in out nocopy ut_sonar_test_reporter ) return self as result is begin - self.init($$plsql_unit); + self.init($$plsql_unit,ut_output_bulk_buffer()); return; end; diff --git a/source/reporters/ut_tfs_junit_reporter.tpb b/source/reporters/ut_tfs_junit_reporter.tpb index 710c3bc7f..e2d45a369 100644 --- a/source/reporters/ut_tfs_junit_reporter.tpb +++ b/source/reporters/ut_tfs_junit_reporter.tpb @@ -18,7 +18,7 @@ create or replace type body ut_tfs_junit_reporter is constructor function ut_tfs_junit_reporter(self in out nocopy ut_tfs_junit_reporter) return self as result is begin - self.init($$plsql_unit); + self.init($$plsql_unit,ut_output_bulk_buffer()); return; end; diff --git a/source/reporters/ut_xunit_reporter.tpb b/source/reporters/ut_xunit_reporter.tpb index eab0c8a3c..4612fb640 100644 --- a/source/reporters/ut_xunit_reporter.tpb +++ b/source/reporters/ut_xunit_reporter.tpb @@ -18,7 +18,7 @@ create or replace type body ut_xunit_reporter is constructor function ut_xunit_reporter(self in out nocopy ut_xunit_reporter) return self as result is begin - self.init($$plsql_unit); + self.init($$plsql_unit,ut_output_bulk_buffer()); return; end; diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index 571d187a2..9531736b9 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -323,6 +323,8 @@ drop type ut_output_table_buffer force; drop type ut_output_clob_table_buffer force; +drop type ut_output_bulk_buffer force; + drop type ut_output_buffer_base force; drop table ut_output_buffer_tmp purge; diff --git a/test/ut3_tester_helper/coverage_helper.pkb b/test/ut3_tester_helper/coverage_helper.pkb index d234967e4..ef14c586f 100644 --- a/test/ut3_tester_helper/coverage_helper.pkb +++ b/test/ut3_tester_helper/coverage_helper.pkb @@ -493,8 +493,8 @@ create or replace package body coverage_helper is x dbms_output.chararr; i integer := 100000; begin - execute immediate 'alter session set statistics_level=all'; /* + execute immediate 'alter session set statistics_level=all'; dbms_hprof.start_profiling( location => 'PLSHPROF_DIR' , filename => 'profiler_utPLSQL_run_]'||rawtohex(l_coverage_id)||q'[.txt' From 6c0b6e681954c389ca2763edcc6c56a7d142b586 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 20 Mar 2023 12:35:05 +0200 Subject: [PATCH 1025/1096] Fixes to new data-buffer implementation. --- .../core/output_buffers/ut_output_bulk_buffer.tpb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/source/core/output_buffers/ut_output_bulk_buffer.tpb b/source/core/output_buffers/ut_output_bulk_buffer.tpb index 49aa1e913..ceae07862 100644 --- a/source/core/output_buffers/ut_output_bulk_buffer.tpb +++ b/source/core/output_buffers/ut_output_bulk_buffer.tpb @@ -49,7 +49,7 @@ create or replace type body ut_output_bulk_buffer is select /*+ no_parallel */ self.output_id, self.last_write_message_id + rownum, t.column_value, a_item_type from table(a_text_list) t where t.column_value is not null or a_item_type is not null; - self.last_write_message_id := self.last_write_message_id + SQL%rowcount; + self.last_write_message_id := self.last_write_message_id + sql%rowcount; commit; end; @@ -87,15 +87,16 @@ create or replace type body ut_output_bulk_buffer is exit when l_data%notfound; end loop; close l_data; + self.remove_buffer_info(); end; overriding member function get_lines_cursor(a_initial_timeout number := null, a_timeout_sec number := null) return sys_refcursor is - lc_init_wait_sec constant number := coalesce(a_initial_timeout, 30 ); + lc_init_wait_sec constant number := coalesce(a_initial_timeout, 10 ); l_already_waited_sec number(10,2) := 0; l_sleep_time number(2,1); l_exists integer; l_finished boolean := false; - l_data_produced boolean; + l_data_produced boolean := false; l_producer_active boolean := false; l_producer_started boolean := false; l_producer_finished boolean := false; @@ -115,11 +116,13 @@ create or replace type body ut_output_bulk_buffer is l_producer_active := (self.get_lock_status() <> 0); l_producer_started := (l_producer_active or l_data_produced ) or l_producer_started; l_producer_finished := (l_producer_started and not l_producer_active) or l_producer_finished; - l_finished := self.timeout_producer_not_finished(l_producer_finished, l_already_waited_sec, a_timeout_sec) or self.timeout_producer_not_started(l_producer_started, l_already_waited_sec, lc_init_wait_sec) or l_producer_finished; + + dbms_lock.sleep(l_sleep_time); + l_already_waited_sec := l_already_waited_sec + l_sleep_time; end loop; open l_results for @@ -152,8 +155,8 @@ create or replace type body ut_output_bulk_buffer is exit when l_data%notfound; end loop; close l_data; - return; self.remove_buffer_info(); + return; end; end; From 0daab3389dbf3fd0a0ec28e800479cfff486d45c Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Mon, 27 Mar 2023 20:37:09 -0700 Subject: [PATCH 1026/1096] Checkpoint --- docs/userguide/annotations.md | 71 ++++++++++-- source/api/ut_runner.pkb | 14 +-- source/core/types/ut_run.tpb | 2 +- source/core/types/ut_run.tps | 6 +- source/core/ut_suite_builder.pkb | 2 +- source/core/ut_suite_cache_manager.pkb | 150 ++++++++++++++++++------- source/core/ut_suite_cache_manager.pks | 5 +- source/core/ut_suite_manager.pkb | 6 +- source/core/ut_suite_manager.pks | 2 +- source/core/ut_utils.pks | 4 + test/ut3_user/api/test_ut_run.pkb | 74 +++++++++++- test/ut3_user/api/test_ut_run.pks | 15 +++ 12 files changed, 280 insertions(+), 71 deletions(-) diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 0e3b6446e..7fd2c09fa 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1616,11 +1616,8 @@ or Tags are defined as a comma separated list within the `--%tags` annotation. -When executing a test run with tag filter applied, the framework will find all tests associated with the given tags and execute them. -The framework applies `OR` logic to all specified tags so any test / suite that matches at least one tag will be included in the test run. - -When a suite/context is tagged, all of its children will automatically inherit the tag and get executed along with the parent. Parent suite tests are not executed, but a suitepath hierarchy is kept. - +When a suite/context is tagged, all of its children will automatically inherit the tag and get executed along with the parent, unless they are excluded by tag expression. +Parent suite tests are not executed, but a suitepath hierarchy is kept. Sample test suite package with tags. ```sql linenums="1" @@ -1661,7 +1658,37 @@ end ut_sample_test; / ``` -Execution of the test is done by using the parameter `a_tags` +#### Tag Expressions + +Tag expressions are boolean expressions with the operators !, & and |. In addition, ( and ) can be used to adjust for operator precedence. + +Two special expressions are supported, any() and none(), which select all tests with any tags at all, and all tests without any tags, respectively. These special expressions may be combined with other expressions just like normal tags. + +| Operator | Meaning | +| -------- | --------| +| ! | not | +| & | and | +| \| | or | + +If you are tagging your tests across multiple dimensions, tag expressions help you to select which tests to execute. When tagging by test type (e.g., micro, integration, end-to-end) and feature (e.g., product, catalog, shipping), the following tag expressions can be useful. + + +| Tag Expression | Selection | +| -------- | --------| +| product | all tests for product | +| catalog \| shipping | all tests for catalog plus all tests for shipping | +| catalog & shipping | all tests for the intersection between catalog and shipping | +| product & !end-to-end | all tests for product, but not the end-to-end tests | +| (micro \| integration) & (product \| shipping) | all micro or integration tests for product or shipping | + + +Execution of the test is done by using the parameter `a_tags` with tag expressions + + +```sql linenums="1" +select * from table(ut.run(a_tags => 'fast||!complex')); +``` +The above call will execute all tests from `ut_sample_test` package as the whole suite is tagged with `api` because a suite meet expression condition. ```sql linenums="1" select * from table(ut.run(a_path => 'ut_sample_test',a_tags => 'api')); @@ -1683,8 +1710,14 @@ The above call will execute both `ut_sample_test.ut_refcursors1` and `ut_sample_ Tags must follow the below naming convention: - tag is case sensitive -- tag can contain special characters like `$#/\?-!` etc. -- tag cannot be an empty string +- tag must not contain any of the following reserved characters: + - comma (,) + - left or right parenthesis ((, )) + - ampersand (&) + - vertical bar (|) + - exclamation point (!) +- tag cannot be null or blank +- tag cannot contain whitespace - tag cannot start with a dash, e.g. `-some-stuff` is **not** a valid tag - tag cannot contain spaces, e.g. `test of batch`. To create a multi-word tag use underscores or dashes, e.g. `test_of_batch`, `test-of-batch` - leading and trailing spaces are ignored in tag name, e.g. `--%tags( tag1 , tag2 )` becomes `tag1` and `tag2` tag names @@ -1693,13 +1726,31 @@ Tags must follow the below naming convention: #### Excluding tests/suites by tags It is possible to exclude parts of test suites with tags. -In order to do so, prefix the tag name to exclude with a `-` (dash) sign when invoking the test run. - +In order to do so, prefix the tag name to exclude with a `!` (exclamation) sign when invoking the test run which is equivalent of `-` (dash) in legacy notation. Examples (based on above sample test suite) +```sql linenums="1" +select * from table(ut.run(a_tags => '(api|fast)&!complex')); +``` + +which is equivalent of legacy calling: + ```sql linenums="1" select * from table(ut.run(a_tags => 'api,fast,-complex')); ``` + +or + +```sql linenums="1" +select * from table(ut.run(a_tags => '(api|fast)&(!complex&!test1)')); +``` + +which is equivalent of legacy calling: + +```sql linenums="1" +select * from table(ut.run(a_tags => 'api,fast,-complex,-test1')); +``` + The above call will execute all suites/contexts/tests that are marked with any of tags `api` or `fast` except those suites/contexts/tests that are marked as `complex`. Given the above example package `ut_sample_test`, only `ut_sample_test.ut_test` will be executed. diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index b69a51a04..2760868e0 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -79,7 +79,8 @@ create or replace package body ut_runner is l_coverage_schema_names ut_varchar2_rows; l_paths ut_varchar2_list; l_random_test_order_seed positive; - l_tags ut_varchar2_rows := ut_varchar2_rows(); + l_tags varchar2(4000) := a_tags; + begin ut_event_manager.initialize(); if a_reporters is not empty then @@ -94,6 +95,11 @@ create or replace package body ut_runner is ut_event_manager.trigger_event(ut_event_manager.gc_initialize); ut_event_manager.trigger_event(ut_event_manager.gc_debug, ut_run_info()); + --Verify tag tag expression is valid + if regexp_like(l_tags,'[&|]{2,}|[!-]{2,}|[!-][&|]|[^-&|!]+[-!]|[-!|&][)]') + or (regexp_count(l_tags,'\(') <> regexp_count(l_tags,'\)')) then + raise_application_error(ut_utils.gc_invalid_tag_expression, 'Invalid Tag expression'); + end if; if a_random_test_order_seed is not null then l_random_test_order_seed := a_random_test_order_seed; elsif a_random_test_order then @@ -118,12 +124,6 @@ create or replace package body ut_runner is l_coverage_schema_names := ut_suite_manager.get_schema_names(l_paths); end if; - - if a_tags is not null then - l_tags := l_tags multiset union distinct ut_utils.convert_collection( - ut_utils.trim_list_elements(ut_utils.filter_list(ut_utils.string_to_table(a_tags,','),ut_utils.gc_word_no_space)) - ); - end if; l_run := ut_run( a_run_paths => l_paths, a_coverage_options => ut_coverage_options( diff --git a/source/core/types/ut_run.tpb b/source/core/types/ut_run.tpb index cdafb30fc..660c88791 100644 --- a/source/core/types/ut_run.tpb +++ b/source/core/types/ut_run.tpb @@ -24,7 +24,7 @@ create or replace type body ut_run as a_test_file_mappings ut_file_mappings := null, a_client_character_set varchar2 := null, a_random_test_order_seed positive := null, - a_run_tags ut_varchar2_rows := null + a_run_tags varchar2 := null ) return self as result is begin self.run_paths := a_run_paths; diff --git a/source/core/types/ut_run.tps b/source/core/types/ut_run.tps index debf847cd..8ce80d2a1 100644 --- a/source/core/types/ut_run.tps +++ b/source/core/types/ut_run.tps @@ -1,4 +1,4 @@ -create or replace type ut_run under ut_suite_item ( +create or replace type ut_run force under ut_suite_item ( /* utPLSQL - Version 3 Copyright 2016 - 2021 utPLSQL Project @@ -21,7 +21,7 @@ create or replace type ut_run under ut_suite_item ( project_name varchar2(4000), items ut_suite_items, run_paths ut_varchar2_list, - run_tags ut_varchar2_rows, + run_tags varchar2(4000), coverage_options ut_coverage_options, test_file_mappings ut_file_mappings, client_character_set varchar2(100), @@ -34,7 +34,7 @@ create or replace type ut_run under ut_suite_item ( a_test_file_mappings ut_file_mappings := null, a_client_character_set varchar2 := null, a_random_test_order_seed positive := null, - a_run_tags ut_varchar2_rows := null + a_run_tags varchar2 := null ) return self as result, overriding member procedure mark_as_skipped(self in out nocopy ut_run,a_skip_reason in varchar2), overriding member function do_execute(self in out nocopy ut_run) return boolean, diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index ebb113370..4aa2ff915 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -205,7 +205,7 @@ create or replace package body ut_suite_builder is l_tag_items := ut_utils.trim_list_elements(ut_utils.string_to_table(a_tags_ann_text(l_annotation_pos),',')); if l_tag_items is not empty then for i in 1 .. l_tag_items.count loop - if regexp_like(l_tag_items(i),'^[^-](\S)+$') then + if regexp_like(l_tag_items(i),'^[^-!&|](\S)+$') then l_tags_list.extend(); l_tags_list(l_tags_list.last) := l_tag_items(i); else diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index d3e832a9b..276f9427d 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -221,52 +221,118 @@ create or replace package body ut_suite_cache_manager is return l_suite_items; end; + /* + To support a legact tag notation + , = OR + - = NOT + we will perform a replace of that characters into + new notation. + || = OR + && = AND + ^ = NOT + */ + --TODO: How do we prevent when old notation reach 4k an new will be longer? + function replace_legacy_tag_notation(a_tags varchar2 + ) return varchar2 is + l_tags ut_varchar2_list := ut_utils.string_to_table(a_tags,','); + l_tags_include varchar2(2000); + l_tags_exclude varchar2(2000); + l_return_tag varchar2(4000); + begin + select listagg( t.column_value,' | ') + within group( order by column_value) + into l_tags_include + from table(l_tags) t + where t.column_value not like '-%'; + + select listagg( replace(t.column_value,'-','!'),' & ') + within group( order by column_value) + into l_tags_exclude + from table(l_tags) t + where t.column_value like '-%'; + + l_return_tag:= + case when l_tags_include is not null then + '('||l_tags_include||')' else null end || + case when l_tags_include is not null and l_tags_exclude is not null then + ' & ' else null end || + case when l_tags_exclude is not null then + '('||l_tags_exclude||')' else null end; + + return l_return_tag; + end; + + function create_where_filter(a_tags varchar2 + ) return varchar2 is + l_tags varchar2(4000):= replace(a_tags,' '); + begin + if instr(l_tags,',') > 0 or instr(l_tags,'-') > 0 then + l_tags := replace(replace_legacy_tag_notation(l_tags),' '); + end if; + l_tags := REGEXP_REPLACE(l_tags, + '(\(|\)|\||\!|\&)?([^|&!-]+)(\(|\)|\||\!|\&)?', + q'[\1q'<\2>' member of tags\3]'); + --replace operands to XPath + l_tags := REGEXP_REPLACE(l_tags, '\|',' or '); + l_tags := REGEXP_REPLACE(l_tags , '\&',' and '); + l_tags := REGEXP_REPLACE(l_tags,q'[(\!)(q'<[^|&!-]+>')( member of tags)]','\2 not \3'); + l_tags := '('||l_tags||')'; + return l_tags; + end; + /* Having a base set of suites we will do a further filter down if there are any tags defined. - */ + */ function get_tags_suites ( a_suite_items ut_suite_cache_rows, - a_tags ut_varchar2_rows + a_tags varchar2 ) return ut_suite_cache_rows is - l_suite_tags ut_suite_cache_rows := ut_suite_cache_rows(); - l_include_tags ut_varchar2_rows; - l_exclude_tags ut_varchar2_rows; + l_suite_tags ut_suite_cache_rows := ut_suite_cache_rows(); + l_sql varchar2(32000); + l_tags varchar2(4000):= create_where_filter(a_tags); begin - - select /*+ no_parallel */ column_value - bulk collect into l_include_tags - from table(a_tags) - where column_value not like '-%'; - - select /*+ no_parallel */ ltrim(column_value,'-') - bulk collect into l_exclude_tags - from table(a_tags) - where column_value like '-%'; - - with included_tags as ( - select c.path as path - from table(a_suite_items) c - where c.tags multiset intersect l_include_tags is not empty or l_include_tags is empty - ), - excluded_tags as ( - select c.path as path - from table(a_suite_items) c - where c.tags multiset intersect l_exclude_tags is not empty - ) - select value(c) as obj - bulk collect into l_suite_tags - from table(a_suite_items) c - where exists ( - select 1 from included_tags t - where t.path||'.' like c.path || '.%' /*all ancestors and self*/ - or c.path||'.' like t.path || '.%' /*all descendants and self*/ - ) - and not exists ( - select 1 from excluded_tags t - where c.path||'.' like t.path || '.%' /*all descendants and self*/ - ); - return l_suite_tags; + l_sql := + q'[ +with + suites_mv as ( + select c.id,value(c) as obj,c.path as path,c.self_type,c.object_owner,c.tags + from table(:suite_items) c + ), + suites_matching_expr as ( + select c.id,c.path as path,c.self_type,c.object_owner,c.tags + from suites_mv c + where c.self_type in ('UT_SUITE','UT_CONTEXT') + and ]'||l_tags||q'[ + ), + tests_matching_expr as ( + select c.id,c.path as path,c.self_type,c.object_owner,c.tags + from suites_mv c where c.self_type in ('UT_TEST') + and ]'||l_tags||q'[ + ), + tests_with_tags_inherited_from_suite as ( + select c.id,c.self_type,c.path,c.tags multiset union distinct t.tags tags,c.object_owner + from suites_mv c join suites_matching_expr t + on (c.path||'.' like t.path || '.%' /*all descendants and self*/ and c.object_owner = t.object_owner) + ), + tests_with_tags_promoted_to_suites as ( + select c.id,c.self_type,c.path,c.tags multiset union distinct t.tags tags,c.object_owner + from suites_mv c join tests_matching_expr t + on (t.path||'.' like c.path || '.%' /*all ancestors and self*/ and c.object_owner = t.object_owner) + ) + select obj from suites_mv c, + (select id,row_number() over (partition by id order by id) r_num from + (select id + from tests_with_tags_promoted_to_suites tst + where ]'||l_tags||q'[ + union all + select id from tests_with_tags_inherited_from_suite tst + where ]'||l_tags||q'[ + ) + ) t where c.id = t.id and r_num = 1 ]'; + + execute immediate l_sql bulk collect into l_suite_tags using a_suite_items; + return l_suite_tags; end; /* @@ -323,17 +389,17 @@ create or replace package body ut_suite_cache_manager is function get_cached_suite_rows( a_schema_paths ut_path_items, a_random_seed positive := null, - a_tags ut_varchar2_rows := null + a_tags varchar2 := null ) return ut_suite_cache_rows is l_results ut_suite_cache_rows := ut_suite_cache_rows(); l_suite_items ut_suite_cache_rows := ut_suite_cache_rows(); l_schema_paths ut_path_items; - l_tags ut_varchar2_rows := coalesce(a_tags,ut_varchar2_rows()); + l_tags varchar2(4000) := a_tags; begin l_schema_paths := a_schema_paths; l_suite_items := get_suite_items(a_schema_paths); - if l_tags.count > 0 then + if length(l_tags) > 0 then l_suite_items := get_tags_suites(l_suite_items,l_tags); end if; diff --git a/source/core/ut_suite_cache_manager.pks b/source/core/ut_suite_cache_manager.pks index 974babca5..72dd08800 100644 --- a/source/core/ut_suite_cache_manager.pks +++ b/source/core/ut_suite_cache_manager.pks @@ -57,7 +57,7 @@ create or replace package ut_suite_cache_manager authid definer is function get_cached_suite_rows( a_schema_paths ut_path_items, a_random_seed positive := null, - a_tags ut_varchar2_rows := null + a_tags varchar2 := null ) return ut_suite_cache_rows; function get_schema_paths(a_paths in ut_varchar2_list) return ut_path_items; @@ -95,5 +95,8 @@ create or replace package ut_suite_cache_manager authid definer is a_procedure_name varchar2 ) return boolean; + +function create_where_filter(a_tags varchar2 + ) return varchar2; end ut_suite_cache_manager; / diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 86f68c076..0f8629ded 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -352,7 +352,7 @@ create or replace package body ut_suite_manager is function get_cached_suite_data( a_schema_paths ut_path_items, a_random_seed positive, - a_tags ut_varchar2_rows := null, + a_tags varchar2 := null, a_skip_all_objects boolean := false ) return t_cached_suites_cursor is l_unfiltered_rows ut_suite_cache_rows; @@ -451,7 +451,7 @@ create or replace package body ut_suite_manager is a_schema_paths ut_path_items, a_suites in out nocopy ut_suite_items, a_random_seed positive, - a_tags ut_varchar2_rows := null + a_tags varchar2 := null ) is begin reconstruct_from_cache( @@ -528,7 +528,7 @@ create or replace package body ut_suite_manager is a_paths ut_varchar2_list, a_suites out nocopy ut_suite_items, a_random_seed positive := null, - a_tags ut_varchar2_rows := ut_varchar2_rows() + a_tags varchar2 := null ) is l_paths ut_varchar2_list := a_paths; l_schema_names ut_varchar2_rows; diff --git a/source/core/ut_suite_manager.pks b/source/core/ut_suite_manager.pks index 65b3c0654..07539139a 100644 --- a/source/core/ut_suite_manager.pks +++ b/source/core/ut_suite_manager.pks @@ -53,7 +53,7 @@ create or replace package ut_suite_manager authid current_user is a_paths in ut_varchar2_list, a_suites out nocopy ut_suite_items, a_random_seed in positive := null, - a_tags ut_varchar2_rows := ut_varchar2_rows() + a_tags in varchar2 := null ); /** diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 18a3d5952..f7f7b4f00 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -121,6 +121,10 @@ create or replace package ut_utils authid definer is ex_failed_open_cur exception; gc_failed_open_cur constant pls_integer := -20218; pragma exception_init (ex_failed_open_cur, -20218); + + ex_invalid_tag_expression exception; + gc_invalid_tag_expression constant pls_integer := -20219; + pragma exception_init (ex_invalid_tag_expression, -20219); gc_max_storage_varchar2_len constant integer := 4000; gc_max_output_string_length constant integer := 4000; diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index 41b969359..6f6e229c8 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -948,7 +948,7 @@ Failures:% procedure two_test_run_by_two_tags is l_results clob; begin - ut3_tester_helper.run_helper.run(a_tags => 'subtest1,subtest2'); + ut3_tester_helper.run_helper.run(a_tags => 'subtest1|subtest2'); l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); --Assert ut.expect( l_results ).to_be_like( '%test_package_1%' ); @@ -958,7 +958,21 @@ Failures:% ut.expect( l_results ).not_to_be_like( '%test_package_3%' ); ut.expect( l_results ).not_to_be_like( '%test_package_3%' ); end; - + + procedure two_test_run_by_two_tags_leg is + l_results clob; + begin + ut3_tester_helper.run_helper.run(a_tags => 'subtest1,subtest2'); + l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%test_package_1%' ); + ut.expect( l_results ).to_be_like( '%test_package_2%' ); + ut.expect( l_results ).not_to_be_like( '%test_package_1.test2%' ); + ut.expect( l_results ).not_to_be_like( '%test_package_2.test2%' ); + ut.expect( l_results ).not_to_be_like( '%test_package_3%' ); + ut.expect( l_results ).not_to_be_like( '%test_package_3%' ); + end; + procedure suite_with_children_tag is l_results clob; begin @@ -1078,6 +1092,20 @@ Failures:% procedure tag_run_func_path_list is l_results ut3_develop.ut_varchar2_list; + begin + l_results := ut3_tester_helper.run_helper.run(ut3_develop.ut_varchar2_list(':tests.test_package_1',':tests'),a_tags => 'suite1test1|suite2test1'); + --Assert + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_2%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1.test1%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_1.test2%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_2.test1%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2.test2%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_3%' ); + end; + + procedure tag_run_func_path_list_leg is + l_results ut3_develop.ut_varchar2_list; begin l_results := ut3_tester_helper.run_helper.run(ut3_develop.ut_varchar2_list(':tests.test_package_1',':tests'),a_tags => 'suite1test1,suite2test1'); --Assert @@ -1092,6 +1120,18 @@ Failures:% procedure tag_inc_exc_run_func_path_list is l_results ut3_develop.ut_varchar2_list; + begin + l_results := ut3_tester_helper.run_helper.run(ut3_develop.ut_varchar2_list(':tests.test_package_1',':tests'),a_tags => '(suite1test1|suite2test1)&!suite2'); + --Assert + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1.test1%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_1.test2%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_3%' ); + end; + + procedure tag_inc_exc_run_fun_pth_lst_lg is + l_results ut3_develop.ut_varchar2_list; begin l_results := ut3_tester_helper.run_helper.run(ut3_develop.ut_varchar2_list(':tests.test_package_1',':tests'),a_tags => 'suite1test1,suite2test1,-suite2'); --Assert @@ -1104,6 +1144,22 @@ Failures:% procedure tag_exclude_run_func_path_list is l_results ut3_develop.ut_varchar2_list; + begin + l_results := ut3_tester_helper.run_helper.run(ut3_develop.ut_varchar2_list(':tests,:tests2'),a_tags => '!suite1test2&!suite2test1&!test1suite3'); + --Assert + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_2%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_3%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1.test1%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_1.test2%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2.test1%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_2.test2%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_3.test1%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_3.test2%executed%' ); + end; + +procedure tag_exclude_run_fun_pth_lst_lg is + l_results ut3_develop.ut_varchar2_list; begin l_results := ut3_tester_helper.run_helper.run(ut3_develop.ut_varchar2_list(':tests,:tests2'),a_tags => '-suite1test2,-suite2test1,-test1suite3'); --Assert @@ -1120,6 +1176,20 @@ Failures:% procedure tag_include_exclude_run_func is l_results ut3_develop.ut_varchar2_list; + begin + l_results := ut3_tester_helper.run_helper.run(a_tags => '(suite1)&(!suite1test2&!suite2test1&!test1suite3)'); + --Assert + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_2%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_3%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1.test1%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_1.test2%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2.test1%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_2.test2%executed%' ); + end; + + procedure tag_include_exclude_run_fun_lg is + l_results ut3_develop.ut_varchar2_list; begin l_results := ut3_tester_helper.run_helper.run(a_tags => 'suite1,-suite1test2,-suite2test1,-test1suite3'); --Assert diff --git a/test/ut3_user/api/test_ut_run.pks b/test/ut3_user/api/test_ut_run.pks index b3be8700d..db02ee8f8 100644 --- a/test/ut3_user/api/test_ut_run.pks +++ b/test/ut3_user/api/test_ut_run.pks @@ -202,6 +202,9 @@ create or replace package test_ut_run is --%test(Execute tests by passing two tags) procedure two_test_run_by_two_tags; + --%test(Execute tests by passing two tags - Legacy notation) + procedure two_test_run_by_two_tags_leg; + --%test(Execute suite and all of its children) procedure suite_with_children_tag; @@ -235,15 +238,27 @@ create or replace package test_ut_run is --%test(Runs tests from given paths with paths list and a tag) procedure tag_run_func_path_list; + --%test(Runs tests from given paths with paths list and a tag - Legacy Notation) + procedure tag_run_func_path_list_leg; + --%test(Runs tests from given paths with paths list and include/exclude tags) procedure tag_inc_exc_run_func_path_list; + --%test(Runs tests from given paths with paths list and include/exclude tags - Legacy Notation) + procedure tag_inc_exc_run_fun_pth_lst_lg; + --%test(Runs tests from given path and excludes specific tags) procedure tag_exclude_run_func_path_list; + --%test(Runs tests from given path and excludes specific tags - Legacy Notation) + procedure tag_exclude_run_fun_pth_lst_lg; + --%test(Runs tests from given tags and exclude tags) procedure tag_include_exclude_run_func; + --%test(Runs tests from given tags and exclude tags - Legacy Notation) + procedure tag_include_exclude_run_fun_lg; + --%endcontext --%context(ut3_info context) From adbc76eb027f8425975b8277d4a10e2ec9ce7f7c Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Mon, 27 Mar 2023 23:04:34 -0700 Subject: [PATCH 1027/1096] Address too long identified in 11g. Address flaky expression checker to be reworked. --- source/api/ut_runner.pkb | 6 ++++-- source/core/ut_suite_cache_manager.pkb | 10 +++++----- source/core/ut_suite_cache_manager.pks | 5 +---- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index 2760868e0..94538eb69 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -95,11 +95,13 @@ create or replace package body ut_runner is ut_event_manager.trigger_event(ut_event_manager.gc_initialize); ut_event_manager.trigger_event(ut_event_manager.gc_debug, ut_run_info()); - --Verify tag tag expression is valid - if regexp_like(l_tags,'[&|]{2,}|[!-]{2,}|[!-][&|]|[^-&|!]+[-!]|[-!|&][)]') + --TODO:Verify tag tag expression is valid + /* + if regexp_like(l_tags,'[&|]{2,}|[!-]{2,}|[!-][&|]|[^-&|!,]+[-!]|[-!|&][)]') or (regexp_count(l_tags,'\(') <> regexp_count(l_tags,'\)')) then raise_application_error(ut_utils.gc_invalid_tag_expression, 'Invalid Tag expression'); end if; + */ if a_random_test_order_seed is not null then l_random_test_order_seed := a_random_test_order_seed; elsif a_random_test_order then diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index 276f9427d..ff18deabf 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -270,7 +270,7 @@ create or replace package body ut_suite_cache_manager is l_tags := replace(replace_legacy_tag_notation(l_tags),' '); end if; l_tags := REGEXP_REPLACE(l_tags, - '(\(|\)|\||\!|\&)?([^|&!-]+)(\(|\)|\||\!|\&)?', + '(\(|\)|\||\!|\&)?([^|&!-()]+)(\(|\)|\||\!|\&)?', q'[\1q'<\2>' member of tags\3]'); --replace operands to XPath l_tags := REGEXP_REPLACE(l_tags, '\|',' or '); @@ -310,12 +310,12 @@ with from suites_mv c where c.self_type in ('UT_TEST') and ]'||l_tags||q'[ ), - tests_with_tags_inherited_from_suite as ( + tests_with_tags_inh_from_suite as ( select c.id,c.self_type,c.path,c.tags multiset union distinct t.tags tags,c.object_owner from suites_mv c join suites_matching_expr t on (c.path||'.' like t.path || '.%' /*all descendants and self*/ and c.object_owner = t.object_owner) ), - tests_with_tags_promoted_to_suites as ( + tests_with_tags_prom_to_suite as ( select c.id,c.self_type,c.path,c.tags multiset union distinct t.tags tags,c.object_owner from suites_mv c join tests_matching_expr t on (t.path||'.' like c.path || '.%' /*all ancestors and self*/ and c.object_owner = t.object_owner) @@ -323,10 +323,10 @@ with select obj from suites_mv c, (select id,row_number() over (partition by id order by id) r_num from (select id - from tests_with_tags_promoted_to_suites tst + from tests_with_tags_prom_to_suite tst where ]'||l_tags||q'[ union all - select id from tests_with_tags_inherited_from_suite tst + select id from tests_with_tags_inh_from_suite tst where ]'||l_tags||q'[ ) ) t where c.id = t.id and r_num = 1 ]'; diff --git a/source/core/ut_suite_cache_manager.pks b/source/core/ut_suite_cache_manager.pks index 72dd08800..7f06e95eb 100644 --- a/source/core/ut_suite_cache_manager.pks +++ b/source/core/ut_suite_cache_manager.pks @@ -94,9 +94,6 @@ create or replace package ut_suite_cache_manager authid definer is a_package_name varchar2, a_procedure_name varchar2 ) return boolean; - - -function create_where_filter(a_tags varchar2 - ) return varchar2; + end ut_suite_cache_manager; / From 1478b0d21035398f3b6eccf82b37fa91adeb0e6b Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Wed, 29 Mar 2023 12:41:32 -0700 Subject: [PATCH 1028/1096] Adding validation for tag expression --- source/api/ut_runner.pkb | 7 +-- source/core/ut_utils.pkb | 63 +++++++++++++++++++++++++- source/core/ut_utils.pks | 2 + test/ut3_tester/core/test_ut_utils.pkb | 27 +++++++++++ test/ut3_tester/core/test_ut_utils.pks | 2 + 5 files changed, 95 insertions(+), 6 deletions(-) diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index 94538eb69..1ecaf1a42 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -95,13 +95,10 @@ create or replace package body ut_runner is ut_event_manager.trigger_event(ut_event_manager.gc_initialize); ut_event_manager.trigger_event(ut_event_manager.gc_debug, ut_run_info()); - --TODO:Verify tag tag expression is valid - /* - if regexp_like(l_tags,'[&|]{2,}|[!-]{2,}|[!-][&|]|[^-&|!,]+[-!]|[-!|&][)]') - or (regexp_count(l_tags,'\(') <> regexp_count(l_tags,'\)')) then + if ut_utils.valid_tag_expression(l_tags) = 0 then raise_application_error(ut_utils.gc_invalid_tag_expression, 'Invalid Tag expression'); end if; - */ + if a_random_test_order_seed is not null then l_random_test_order_seed := a_random_test_order_seed; elsif a_random_test_order then diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 162e50f8f..03ce1ad55 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -988,7 +988,68 @@ create or replace package body ut_utils is return l_result; end; - + + function valid_tag_expression(a_tags in varchar2) return number is + t_left_side ut_varchar2_list := ut_varchar2_list('|','&',','); + t_right_side ut_varchar2_list := ut_varchar2_list('!','-'); + l_left_side_expression varchar2(100) := '[|&,]'; + l_left_side_regex varchar(400) := '([^|&,]*)[|&,](.*)'; + l_left_side varchar2(4000); + + l_rigth_side_expression varchar2(100) := '[!-]'; + l_right_side_regex varchar(400) := '([!-])([^!-].*)'; + l_right_side varchar2(4000); + + l_tags varchar2(4000) := a_tags; + l_result number :=1; + begin + --Validate that we have closed up all brackets + if regexp_count(l_tags,'\(') <> regexp_count(l_tags,'\)') then + l_result := 0; + end if; + + --Remove brackets as we dont evaluate expression only validate. + l_tags := replace(replace(l_tags,'('),')'); + + --Check if there are any left side operators for first in order from left to right + if regexp_count(l_tags,l_left_side_expression) > 0 then + --Extract left part of operator and remaining of string to right + l_left_side := regexp_replace(l_tags,l_left_side_regex,'\1'); + l_right_side := regexp_replace(l_tags,l_left_side_regex,'\2'); + + --If left side is null that means that we used left side operator without + -- left and right e.g. &test + if l_left_side is null then + l_result := 0; + else + --Extract right side from left side expression if there is any !- + --Remove first negation tag to see if there is double negation + l_left_side := regexp_replace(l_left_side,l_right_side_regex,'\2'); + end if; + + + --check that on right side there is no extra negation + if regexp_count(l_left_side,l_rigth_side_expression) > 0 then + l_result := 0; + end if; + + --Now process right side of string + if l_right_side is not null then + l_result := least(l_result,valid_tag_expression(l_right_side)); + else + l_result := 0; + end if; + else + --We just process single tag. + l_left_side := l_tags; + l_left_side := regexp_replace(l_left_side,l_right_side_regex,'\2'); + if regexp_count(l_left_side,l_rigth_side_expression) > 0 then + l_result := 0; + end if; + end if; + + return l_result; + end; end ut_utils; / diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index f7f7b4f00..2975c3846 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -477,5 +477,7 @@ create or replace package ut_utils authid definer is */ function interval_to_text(a_interval yminterval_unconstrained) return varchar2; + function valid_tag_expression(a_tags in varchar2) return number; + end ut_utils; / diff --git a/test/ut3_tester/core/test_ut_utils.pkb b/test/ut3_tester/core/test_ut_utils.pkb index 4ed718777..52c9cdff8 100644 --- a/test/ut3_tester/core/test_ut_utils.pkb +++ b/test/ut3_tester/core/test_ut_utils.pkb @@ -489,5 +489,32 @@ end; ut.expect(l_expected).to_equal(l_actual); end; + procedure valid_tag_expressions is + begin + ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1')); + ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1|tag2')); + ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1&tag2')); + ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('!tag1')); + ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1|!tag2')); + ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1&!tag2')); + ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('!tag1|!tag2')); + ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('!tag1&!tag2')); + + ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1,tag2')); + ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('-tag1')); + ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1,-tag2')); + ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('-tag1,-tag2')); + + ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('(!tag1|!tag2)|tag3')); + ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('(!tag1&!tag2)|(tag3&tag4)')); + + ut.expect(0).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1|')); + ut.expect(0).to_equal(ut3_develop.ut_utils.valid_tag_expression('&!tag2')); + ut.expect(0).to_equal(ut3_develop.ut_utils.valid_tag_expression('!!tag1|!tag2')); + ut.expect(0).to_equal(ut3_develop.ut_utils.valid_tag_expression('!tag1&!tag2|')); + ut.expect(0).to_equal(ut3_develop.ut_utils.valid_tag_expression('((!tag1|!tag2)|tag3')); + + end; + end test_ut_utils; / diff --git a/test/ut3_tester/core/test_ut_utils.pks b/test/ut3_tester/core/test_ut_utils.pks index 4d83b5042..b87d3b2c6 100644 --- a/test/ut3_tester/core/test_ut_utils.pks +++ b/test/ut3_tester/core/test_ut_utils.pks @@ -154,6 +154,8 @@ create or replace package test_ut_utils is --%test(returns text representation of interval year to month for custom interval) procedure int_conv_ym_date; + --%test(Test to validate different type of expressions passed as tags) + procedure valid_tag_expressions; --%endcontext From b5ad7475b53f5b4b14d9805f9c56b8e36dde0883 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Wed, 29 Mar 2023 14:53:24 -0700 Subject: [PATCH 1029/1096] Comment out to see why its failing. --- source/api/ut_runner.pkb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index 1ecaf1a42..5f4912a24 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -94,10 +94,12 @@ create or replace package body ut_runner is ut_event_manager.trigger_event(ut_event_manager.gc_initialize); ut_event_manager.trigger_event(ut_event_manager.gc_debug, ut_run_info()); - + + /* if ut_utils.valid_tag_expression(l_tags) = 0 then raise_application_error(ut_utils.gc_invalid_tag_expression, 'Invalid Tag expression'); end if; + */ if a_random_test_order_seed is not null then l_random_test_order_seed := a_random_test_order_seed; From 06cb054aa72b8aca8115f277e673485321efc0ad Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Wed, 29 Mar 2023 15:10:34 -0700 Subject: [PATCH 1030/1096] Revert "Comment out to see why its failing." This reverts commit b5ad7475b53f5b4b14d9805f9c56b8e36dde0883. Revert "Adding validation for tag expression" This reverts commit 1478b0d21035398f3b6eccf82b37fa91adeb0e6b. --- source/api/ut_runner.pkb | 7 +-- source/core/ut_utils.pkb | 63 +------------------------- source/core/ut_utils.pks | 2 - test/ut3_tester/core/test_ut_utils.pkb | 27 ----------- test/ut3_tester/core/test_ut_utils.pks | 2 - 5 files changed, 5 insertions(+), 96 deletions(-) diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index 5f4912a24..94538eb69 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -94,13 +94,14 @@ create or replace package body ut_runner is ut_event_manager.trigger_event(ut_event_manager.gc_initialize); ut_event_manager.trigger_event(ut_event_manager.gc_debug, ut_run_info()); - + + --TODO:Verify tag tag expression is valid /* - if ut_utils.valid_tag_expression(l_tags) = 0 then + if regexp_like(l_tags,'[&|]{2,}|[!-]{2,}|[!-][&|]|[^-&|!,]+[-!]|[-!|&][)]') + or (regexp_count(l_tags,'\(') <> regexp_count(l_tags,'\)')) then raise_application_error(ut_utils.gc_invalid_tag_expression, 'Invalid Tag expression'); end if; */ - if a_random_test_order_seed is not null then l_random_test_order_seed := a_random_test_order_seed; elsif a_random_test_order then diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 03ce1ad55..162e50f8f 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -988,68 +988,7 @@ create or replace package body ut_utils is return l_result; end; - - function valid_tag_expression(a_tags in varchar2) return number is - t_left_side ut_varchar2_list := ut_varchar2_list('|','&',','); - t_right_side ut_varchar2_list := ut_varchar2_list('!','-'); - l_left_side_expression varchar2(100) := '[|&,]'; - l_left_side_regex varchar(400) := '([^|&,]*)[|&,](.*)'; - l_left_side varchar2(4000); - - l_rigth_side_expression varchar2(100) := '[!-]'; - l_right_side_regex varchar(400) := '([!-])([^!-].*)'; - l_right_side varchar2(4000); - - l_tags varchar2(4000) := a_tags; - l_result number :=1; - begin - --Validate that we have closed up all brackets - if regexp_count(l_tags,'\(') <> regexp_count(l_tags,'\)') then - l_result := 0; - end if; - - --Remove brackets as we dont evaluate expression only validate. - l_tags := replace(replace(l_tags,'('),')'); - - --Check if there are any left side operators for first in order from left to right - if regexp_count(l_tags,l_left_side_expression) > 0 then - --Extract left part of operator and remaining of string to right - l_left_side := regexp_replace(l_tags,l_left_side_regex,'\1'); - l_right_side := regexp_replace(l_tags,l_left_side_regex,'\2'); - - --If left side is null that means that we used left side operator without - -- left and right e.g. &test - if l_left_side is null then - l_result := 0; - else - --Extract right side from left side expression if there is any !- - --Remove first negation tag to see if there is double negation - l_left_side := regexp_replace(l_left_side,l_right_side_regex,'\2'); - end if; - - - --check that on right side there is no extra negation - if regexp_count(l_left_side,l_rigth_side_expression) > 0 then - l_result := 0; - end if; - - --Now process right side of string - if l_right_side is not null then - l_result := least(l_result,valid_tag_expression(l_right_side)); - else - l_result := 0; - end if; - else - --We just process single tag. - l_left_side := l_tags; - l_left_side := regexp_replace(l_left_side,l_right_side_regex,'\2'); - if regexp_count(l_left_side,l_rigth_side_expression) > 0 then - l_result := 0; - end if; - end if; - - return l_result; - end; + end ut_utils; / diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 2975c3846..f7f7b4f00 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -477,7 +477,5 @@ create or replace package ut_utils authid definer is */ function interval_to_text(a_interval yminterval_unconstrained) return varchar2; - function valid_tag_expression(a_tags in varchar2) return number; - end ut_utils; / diff --git a/test/ut3_tester/core/test_ut_utils.pkb b/test/ut3_tester/core/test_ut_utils.pkb index 52c9cdff8..4ed718777 100644 --- a/test/ut3_tester/core/test_ut_utils.pkb +++ b/test/ut3_tester/core/test_ut_utils.pkb @@ -489,32 +489,5 @@ end; ut.expect(l_expected).to_equal(l_actual); end; - procedure valid_tag_expressions is - begin - ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1')); - ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1|tag2')); - ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1&tag2')); - ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('!tag1')); - ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1|!tag2')); - ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1&!tag2')); - ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('!tag1|!tag2')); - ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('!tag1&!tag2')); - - ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1,tag2')); - ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('-tag1')); - ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1,-tag2')); - ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('-tag1,-tag2')); - - ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('(!tag1|!tag2)|tag3')); - ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('(!tag1&!tag2)|(tag3&tag4)')); - - ut.expect(0).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1|')); - ut.expect(0).to_equal(ut3_develop.ut_utils.valid_tag_expression('&!tag2')); - ut.expect(0).to_equal(ut3_develop.ut_utils.valid_tag_expression('!!tag1|!tag2')); - ut.expect(0).to_equal(ut3_develop.ut_utils.valid_tag_expression('!tag1&!tag2|')); - ut.expect(0).to_equal(ut3_develop.ut_utils.valid_tag_expression('((!tag1|!tag2)|tag3')); - - end; - end test_ut_utils; / diff --git a/test/ut3_tester/core/test_ut_utils.pks b/test/ut3_tester/core/test_ut_utils.pks index b87d3b2c6..4d83b5042 100644 --- a/test/ut3_tester/core/test_ut_utils.pks +++ b/test/ut3_tester/core/test_ut_utils.pks @@ -154,8 +154,6 @@ create or replace package test_ut_utils is --%test(returns text representation of interval year to month for custom interval) procedure int_conv_ym_date; - --%test(Test to validate different type of expressions passed as tags) - procedure valid_tag_expressions; --%endcontext From e87d39f992da9ff7fdb0cb2b653f6fc0380c6def Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Wed, 29 Mar 2023 15:17:46 -0700 Subject: [PATCH 1031/1096] Adding validate function, with no calls --- source/core/ut_utils.pkb | 61 ++++++++++++++++++++++++++++++++++++++++ source/core/ut_utils.pks | 7 ++++- 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 162e50f8f..14d0bc148 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -989,6 +989,67 @@ create or replace package body ut_utils is return l_result; end; + function valid_tag_expression(a_tags in varchar2) return number is + t_left_side ut_varchar2_list := ut_varchar2_list('|','&',','); + t_right_side ut_varchar2_list := ut_varchar2_list('!','-'); + l_left_side_expression varchar2(100) := '[|&,]'; + l_left_side_regex varchar(400) := '([^|&,]*)[|&,](.*)'; + l_left_side varchar2(4000); + + l_rigth_side_expression varchar2(100) := '[!-]'; + l_right_side_regex varchar(400) := '([!-])([^!-].*)'; + l_right_side varchar2(4000); + + l_tags varchar2(4000) := a_tags; + l_result number :=1; + begin + --Validate that we have closed up all brackets + if regexp_count(l_tags,'\(') <> regexp_count(l_tags,'\)') then + l_result := 0; + end if; + + --Remove brackets as we dont evaluate expression only validate. + l_tags := replace(replace(l_tags,'('),')'); + + --Check if there are any left side operators for first in order from left to right + if regexp_count(l_tags,l_left_side_expression) > 0 then + --Extract left part of operator and remaining of string to right + l_left_side := regexp_replace(l_tags,l_left_side_regex,'\1'); + l_right_side := regexp_replace(l_tags,l_left_side_regex,'\2'); + + --If left side is null that means that we used left side operator without + -- left and right e.g. &test + if l_left_side is null then + l_result := 0; + else + --Extract right side from left side expression if there is any !- + --Remove first negation tag to see if there is double negation + l_left_side := regexp_replace(l_left_side,l_right_side_regex,'\2'); + end if; + + + --check that on right side there is no extra negation + if regexp_count(l_left_side,l_rigth_side_expression) > 0 then + l_result := 0; + end if; + + --Now process right side of string + if l_right_side is not null then + l_result := least(l_result,valid_tag_expression(l_right_side)); + else + l_result := 0; + end if; + else + --We just process single tag. + l_left_side := l_tags; + l_left_side := regexp_replace(l_left_side,l_right_side_regex,'\2'); + if regexp_count(l_left_side,l_rigth_side_expression) > 0 then + l_result := 0; + end if; + end if; + + return l_result; + end; end ut_utils; / diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index f7f7b4f00..06c6956b4 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -476,6 +476,11 @@ create or replace package ut_utils authid definer is * Return value of interval in plain english */ function interval_to_text(a_interval yminterval_unconstrained) return varchar2; - + + /* + * Return number 1 or 0 if the list of tags is valid expression + */ + function valid_tag_expression(a_tags in varchar2) return number; + end ut_utils; / From 97537de9629c19313ccc6157ac95f323a2de6656 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Wed, 29 Mar 2023 15:29:07 -0700 Subject: [PATCH 1032/1096] Remove a & from text --- source/api/ut_runner.pkb | 7 ++----- source/core/ut_utils.pkb | 2 +- test/ut3_tester/core/test_ut_utils.pkb | 27 ++++++++++++++++++++++++++ test/ut3_tester/core/test_ut_utils.pks | 3 +++ 4 files changed, 33 insertions(+), 6 deletions(-) diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index 94538eb69..a2a69f464 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -95,13 +95,10 @@ create or replace package body ut_runner is ut_event_manager.trigger_event(ut_event_manager.gc_initialize); ut_event_manager.trigger_event(ut_event_manager.gc_debug, ut_run_info()); - --TODO:Verify tag tag expression is valid - /* - if regexp_like(l_tags,'[&|]{2,}|[!-]{2,}|[!-][&|]|[^-&|!,]+[-!]|[-!|&][)]') - or (regexp_count(l_tags,'\(') <> regexp_count(l_tags,'\)')) then + if ut_utils.valid_tag_expression(l_tags) = 0 then raise_application_error(ut_utils.gc_invalid_tag_expression, 'Invalid Tag expression'); end if; - */ + if a_random_test_order_seed is not null then l_random_test_order_seed := a_random_test_order_seed; elsif a_random_test_order then diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 14d0bc148..2a47d4d4b 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -1018,7 +1018,7 @@ create or replace package body ut_utils is l_right_side := regexp_replace(l_tags,l_left_side_regex,'\2'); --If left side is null that means that we used left side operator without - -- left and right e.g. &test + -- left and right e.g. |test if l_left_side is null then l_result := 0; else diff --git a/test/ut3_tester/core/test_ut_utils.pkb b/test/ut3_tester/core/test_ut_utils.pkb index 4ed718777..8a497b9f1 100644 --- a/test/ut3_tester/core/test_ut_utils.pkb +++ b/test/ut3_tester/core/test_ut_utils.pkb @@ -488,6 +488,33 @@ end; begin ut.expect(l_expected).to_equal(l_actual); end; + + procedure valid_tag_expressions is + begin + ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1')); + ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1|tag2')); + ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1&tag2')); + ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('!tag1')); + ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1|!tag2')); + ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1&!tag2')); + ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('!tag1|!tag2')); + ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('!tag1&!tag2')); + + ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1,tag2')); + ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('-tag1')); + ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1,-tag2')); + ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('-tag1,-tag2')); + + ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('(!tag1|!tag2)|tag3')); + ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('(!tag1&!tag2)|(tag3&tag4)')); + + ut.expect(0).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1|')); + ut.expect(0).to_equal(ut3_develop.ut_utils.valid_tag_expression('&!tag2')); + ut.expect(0).to_equal(ut3_develop.ut_utils.valid_tag_expression('!!tag1|!tag2')); + ut.expect(0).to_equal(ut3_develop.ut_utils.valid_tag_expression('!tag1&!tag2|')); + ut.expect(0).to_equal(ut3_develop.ut_utils.valid_tag_expression('((!tag1|!tag2)|tag3')); + + end; end test_ut_utils; / diff --git a/test/ut3_tester/core/test_ut_utils.pks b/test/ut3_tester/core/test_ut_utils.pks index 4d83b5042..0f8545a45 100644 --- a/test/ut3_tester/core/test_ut_utils.pks +++ b/test/ut3_tester/core/test_ut_utils.pks @@ -157,5 +157,8 @@ create or replace package test_ut_utils is --%endcontext + --%test(Test to validate different type of expressions passed as tags) + procedure valid_tag_expressions; + end test_ut_utils; / From 69092f249427dccd39ff0df26848cbd873701ef9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 30 Mar 2023 20:07:27 +0100 Subject: [PATCH 1033/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index d132d2085..a47004a3c 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 21b82ee41..8b6437299 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 9b423d5a8..02eabab07 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index d534857fa..aacb289f2 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index d6884ba2d..5e30a9fc6 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) ## What is utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 2c31a9a89..8db920ee7 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index d193e2c20..31b2fd442 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package. No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit. diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 63c0e36e9..b83fb78c3 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) The following are best practices we at utPLSQL have learned about PL/SQL and Unit Testing. diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index f77717798..04b3db380 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. Code coverage is gathered for the following source types: diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index e237bf4ef..a7b0ae0a5 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) utPLSQL is responsible for handling exceptions wherever they occur in the test run. The framework is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. The framework provides a full stacktrace for every exception that was thrown. The reported stacktrace does not include any utPLSQL library calls in it. diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 8fa525a69..2b436250e 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) ## Expectation concepts diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index d97d49464..37c22c882 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 934d07d72..00a74b288 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) ## Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 9e16fd3e8..164c0cbc0 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) ## Obtaining information about suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index b3b0e338a..e92558e3d 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) utPLSQL provides several reporting formats. The sections below describe most of them. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index e8e431980..978803b9a 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) utPLSQL framework provides two main entry points to run unit tests from within the database: diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 47772937e..794e75070 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4094--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index f92fbc2b0..e79ce1fa6 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.14.4094-develop'; + gc_version constant varchar2(50) := 'v3.1.14.4105-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 2a0f99affc9b6b43dfa9e6f00c053c0eada27b14 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Fri, 31 Mar 2023 08:29:14 -0700 Subject: [PATCH 1034/1096] Extra changes and added tests --- source/core/ut_suite_cache_manager.pkb | 6 +- test/ut3_tester_helper/run_helper.pkb | 94 ++++++++++++++++++++++++++ test/ut3_user/api/test_ut_run.pkb | 33 +++++++++ test/ut3_user/api/test_ut_run.pks | 3 + 4 files changed, 133 insertions(+), 3 deletions(-) diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index ff18deabf..ca7945c74 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -273,9 +273,9 @@ create or replace package body ut_suite_cache_manager is '(\(|\)|\||\!|\&)?([^|&!-()]+)(\(|\)|\||\!|\&)?', q'[\1q'<\2>' member of tags\3]'); --replace operands to XPath - l_tags := REGEXP_REPLACE(l_tags, '\|',' or '); - l_tags := REGEXP_REPLACE(l_tags , '\&',' and '); - l_tags := REGEXP_REPLACE(l_tags,q'[(\!)(q'<[^|&!-]+>')( member of tags)]','\2 not \3'); + l_tags := REPLACE(l_tags, '|',' or '); + l_tags := REPLACE(l_tags , '&',' and '); + l_tags := REGEXP_REPLACE(l_tags,q'[(\!)(q'<[^|&!]+?>')( member of tags)]','\2 not \3'); l_tags := '('||l_tags||')'; return l_tags; end; diff --git a/test/ut3_tester_helper/run_helper.pkb b/test/ut3_tester_helper/run_helper.pkb index a132f4943..c73564798 100644 --- a/test/ut3_tester_helper/run_helper.pkb +++ b/test/ut3_tester_helper/run_helper.pkb @@ -343,9 +343,100 @@ create or replace package body run_helper is end; end test_package_3; ]'; + + execute immediate q'[create or replace package test_tag_pkg_1 is + --%suite + --%tags(suite1,release_3_1_13,development,complex,end_to_end) + --%suitepath(suite1) + --%rollback(manual) + + --%test(Test1 from test_tag_pkg_1) + --%tags(test1,development,fast) + procedure test1; + + --%test(Test2 from test_tag_pkg_1) + --%tags(test2,production,slow,patch_3_1_13) + procedure test2; + + end test_tag_pkg_1; + ]'; + + execute immediate q'[create or replace package body test_tag_pkg_1 is + procedure test1 is + begin + dbms_output.put_line('test_tag_pkg_1.test1 executed'); + end; + procedure test2 is + begin + dbms_output.put_line('test_tag_pkg_1.test2 executed'); + end; + end test_tag_pkg_1; + ]'; + + execute immediate q'[create or replace package test_tag_pkg_2 is + --%suite + --%tags(suite2,release_3_1_12,development,simple) + --%suitepath(suite1.suite2) + --%rollback(manual) + + --%test(Test3 from test_tag_pkg_2) + --%tags(test3,development,fast) + procedure test3; + + --%test(Test4 from test_tag_pkg_1) + --%tags(test4,production,slow) + procedure test4; + + end test_tag_pkg_2; + ]'; + + execute immediate q'[create or replace package body test_tag_pkg_2 is + procedure test3 is + begin + dbms_output.put_line('test_tag_pkg_2.test3 executed'); + end; + procedure test4 is + begin + dbms_output.put_line('test_tag_pkg_2.test4 executed'); + end; + end test_tag_pkg_2; + ]'; + + execute immediate q'[create or replace package test_tag_pkg_3 is + --%suite + --%tags(suite3,release_3_1_13,production,simple,end_to_end) + --%suitepath(suite3) + --%rollback(manual) + + --%test(Test5 from test_tag_pkg_3) + --%tags(test5,release_3_1_13,production,patch_3_1_13) + procedure test5; + + --%test(Test6 from test_tag_pkg_3) + --%tags(test6,development,patch_3_1_14) + procedure test6; + + end test_tag_pkg_3; + ]'; + + execute immediate q'[create or replace package body test_tag_pkg_3 is + procedure test5 is + begin + dbms_output.put_line('test_tag_pkg_3.test5 executed'); + end; + procedure test6 is + begin + dbms_output.put_line('test_tag_pkg_3.test6 executed'); + end; + end test_tag_pkg_3; + ]'; + execute immediate q'[grant execute on test_package_1 to public]'; execute immediate q'[grant execute on test_package_2 to public]'; execute immediate q'[grant execute on test_package_3 to public]'; + execute immediate q'[grant execute on test_tag_pkg_1 to public]'; + execute immediate q'[grant execute on test_tag_pkg_2 to public]'; + execute immediate q'[grant execute on test_tag_pkg_3 to public]'; end; procedure drop_ut3_user_tests is @@ -354,6 +445,9 @@ create or replace package body run_helper is execute immediate q'[drop package test_package_1]'; execute immediate q'[drop package test_package_2]'; execute immediate q'[drop package test_package_3]'; + execute immediate q'[drop package test_tag_pkg_1]'; + execute immediate q'[drop package test_tag_pkg_2]'; + execute immediate q'[drop package test_tag_pkg_3]'; end; procedure create_test_suite is diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index 6f6e229c8..ee420f310 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -1202,6 +1202,39 @@ procedure tag_exclude_run_fun_pth_lst_lg is ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_2.test2%executed%' ); end; + procedure tag_complex_expressions is + l_results ut3_develop.ut_varchar2_list; + begin + l_results := ut3_tester_helper.run_helper.run(a_tags => 'release_3_1_13&(fast|simple)'); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_tag_pkg_3.test5 executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_tag_pkg_3.test6 executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_1.test1%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_1.test2%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2.test3%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2.test4%executed%' ); + + l_results := ut3_tester_helper.run_helper.run(a_tags => 'release_3_1_13&(!patch_3_1_13&!patch_3_1_14)'); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_tag_pkg_1.test1 executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_1.test2%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2.test3%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2.test4%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_3.test5%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_3.test6%executed%' ); + + l_results := ut3_tester_helper.run_helper.run(a_tags => 'release_3_1_13&(patch_3_1_13&!slow)'); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_tag_pkg_3.test5 executed%' ); + + l_results := ut3_tester_helper.run_helper.run(a_tags => '(simple&end_to_end)|(development&fast)'); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_tag_pkg_1.test1 executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_tag_pkg_2.test3 executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_tag_pkg_3.test5 executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_tag_pkg_3.test6 executed%' ); + + l_results := ut3_tester_helper.run_helper.run(a_tags => '(!development&end_to_end)'); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_tag_pkg_3.test5 executed%' ); + + end; + procedure set_application_info is begin dbms_application_info.set_module( gc_module, gc_action ); diff --git a/test/ut3_user/api/test_ut_run.pks b/test/ut3_user/api/test_ut_run.pks index db02ee8f8..40e870fe4 100644 --- a/test/ut3_user/api/test_ut_run.pks +++ b/test/ut3_user/api/test_ut_run.pks @@ -259,6 +259,9 @@ create or replace package test_ut_run is --%test(Runs tests from given tags and exclude tags - Legacy Notation) procedure tag_include_exclude_run_fun_lg; + --%test(Runs tests suing complex expressions) + procedure tag_complex_expressions; + --%endcontext --%context(ut3_info context) From b30688cae39ea3917c92427528a5649022e76a4b Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sat, 1 Apr 2023 08:31:13 -0700 Subject: [PATCH 1035/1096] Address sonar coverage issues. --- source/core/ut_suite_cache_manager.pkb | 14 ++++++++------ source/core/ut_utils.pkb | 14 ++++++++++---- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index ca7945c74..2ccf20721 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -227,11 +227,10 @@ create or replace package body ut_suite_cache_manager is - = NOT we will perform a replace of that characters into new notation. - || = OR - && = AND - ^ = NOT + | = OR + & = AND + ! = NOT */ - --TODO: How do we prevent when old notation reach 4k an new will be longer? function replace_legacy_tag_notation(a_tags varchar2 ) return varchar2 is l_tags ut_varchar2_list := ut_utils.string_to_table(a_tags,','); @@ -331,8 +330,11 @@ with ) ) t where c.id = t.id and r_num = 1 ]'; - execute immediate l_sql bulk collect into l_suite_tags using a_suite_items; - return l_suite_tags; + execute immediate l_sql bulk collect into l_suite_tags using a_suite_items; + return l_suite_tags; + exception when others then + --If the dynamic SQL fails we will fall gracefully with meaningfull message + raise_application_error(ut_utils.gc_invalid_tag_expression, 'Tag expression, causing error. If expression is correct please report error.'); end; /* diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 751971202..3747b029a 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -990,15 +990,21 @@ create or replace package body ut_utils is return l_result; end; + /* + Purpose of this function is to break down the tag expressions + We can separate operators on left and rigth side. + Left ones are AND and OR as they require an operator on left side to + be valid. Right side is NOT. + In each iteration we breakdown string into parts + + */ function valid_tag_expression(a_tags in varchar2) return number is - t_left_side ut_varchar2_list := ut_varchar2_list('|','&',','); - t_right_side ut_varchar2_list := ut_varchar2_list('!','-'); l_left_side_expression varchar2(100) := '[|&,]'; - l_left_side_regex varchar(400) := '([^|&,]*)[|&,](.*)'; + l_left_side_regex varchar2(400) := '([^|&,]*)[|&,](.*)'; l_left_side varchar2(4000); l_rigth_side_expression varchar2(100) := '[!-]'; - l_right_side_regex varchar(400) := '([!-])([^!-].*)'; + l_right_side_regex varchar2(400) := '([!-])([^!-].*)'; l_right_side varchar2(4000); l_tags varchar2(4000) := a_tags; From 0c41a0f22816b901e0b2adca5441e462feedb88a Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sat, 1 Apr 2023 09:19:43 -0700 Subject: [PATCH 1036/1096] Adding tests covering exception of invalid tags --- source/core/ut_suite_cache_manager.pkb | 5 +---- test/ut3_user/api/test_ut_run.pkb | 30 +++++++++++++++++++++++++- test/ut3_user/api/test_ut_run.pks | 4 ++++ 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index 2ccf20721..152b5c0f9 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -331,10 +331,7 @@ with ) t where c.id = t.id and r_num = 1 ]'; execute immediate l_sql bulk collect into l_suite_tags using a_suite_items; - return l_suite_tags; - exception when others then - --If the dynamic SQL fails we will fall gracefully with meaningfull message - raise_application_error(ut_utils.gc_invalid_tag_expression, 'Tag expression, causing error. If expression is correct please report error.'); + return l_suite_tags; end; /* diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index ee420f310..84dd11f9c 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -1223,16 +1223,44 @@ procedure tag_exclude_run_fun_pth_lst_lg is l_results := ut3_tester_helper.run_helper.run(a_tags => 'release_3_1_13&(patch_3_1_13&!slow)'); ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_tag_pkg_3.test5 executed%' ); - + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_1.test1%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_1.test2%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2.test3%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2.test4%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_3.test6%executed%' ); + l_results := ut3_tester_helper.run_helper.run(a_tags => '(simple&end_to_end)|(development&fast)'); ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_tag_pkg_1.test1 executed%' ); ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_tag_pkg_2.test3 executed%' ); ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_tag_pkg_3.test5 executed%' ); ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_tag_pkg_3.test6 executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_1.test2%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2.test4%executed%' ); l_results := ut3_tester_helper.run_helper.run(a_tags => '(!development&end_to_end)'); ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_tag_pkg_3.test5 executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_1.test1%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_1.test2%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2.test3%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2.test4%executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_3.test6%executed%' ); + + end; + + procedure invalid_tag_expression is + l_results ut3_develop.ut_varchar2_list; + begin + l_results := ut3_tester_helper.run_helper.run(a_tags => '(!!development&end_to_end)'); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_match('^\s*invalid_tag_expression \[[,\.0-9]+ sec\]\s*$','m'); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like('%(FAILED -%'); + + l_results := ut3_tester_helper.run_helper.run(a_tags => '(!development&&end_to_end)'); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_match('^\s*invalid_tag_expression \[[,\.0-9]+ sec\]\s*$','m'); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like('%(FAILED -%'); + l_results := ut3_tester_helper.run_helper.run(a_tags => '(!development&end_to_end|)'); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_match('^\s*invalid_tag_expression \[[,\.0-9]+ sec\]\s*$','m'); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like('%(FAILED -%'); end; procedure set_application_info is diff --git a/test/ut3_user/api/test_ut_run.pks b/test/ut3_user/api/test_ut_run.pks index 40e870fe4..c57788bff 100644 --- a/test/ut3_user/api/test_ut_run.pks +++ b/test/ut3_user/api/test_ut_run.pks @@ -262,6 +262,10 @@ create or replace package test_ut_run is --%test(Runs tests suing complex expressions) procedure tag_complex_expressions; + --%test(Testing invalid tag expression) + --%throws(-20219) + procedure invalid_tag_expression; + --%endcontext --%context(ut3_info context) From 543685dc94676110099af0b8af1a155918725cd5 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sat, 1 Apr 2023 11:26:17 -0700 Subject: [PATCH 1037/1096] Removing that , we will not implement that, there is no benefit at the moment. --- docs/userguide/annotations.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index f3cf73d4d..4017521b5 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1662,8 +1662,6 @@ end ut_sample_test; Tag expressions are boolean expressions with the operators !, & and |. In addition, ( and ) can be used to adjust for operator precedence. -Two special expressions are supported, any() and none(), which select all tests with any tags at all, and all tests without any tags, respectively. These special expressions may be combined with other expressions just like normal tags. - | Operator | Meaning | | -------- | --------| | ! | not | From 0d3cfa166beccb14b19debffa99bb392f85d8bbb Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sat, 1 Apr 2023 11:30:00 -0700 Subject: [PATCH 1038/1096] Removing force --- source/core/types/ut_run.tps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/types/ut_run.tps b/source/core/types/ut_run.tps index 8ce80d2a1..1878a2d46 100644 --- a/source/core/types/ut_run.tps +++ b/source/core/types/ut_run.tps @@ -1,4 +1,4 @@ -create or replace type ut_run force under ut_suite_item ( +create or replace type ut_run under ut_suite_item ( /* utPLSQL - Version 3 Copyright 2016 - 2021 utPLSQL Project From 20e317742e00f5299b2abd2675160d4b2cc38b86 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sun, 9 Apr 2023 18:47:21 -0700 Subject: [PATCH 1039/1096] Changing to use Dijkstra algorithm to parse infix notation into postfix ( Reverse Polish Notation). This allows us to more flexibility of using boolean expressions and not limited to flaky regex. --- source/api/ut_runner.pkb | 4 - source/core/types/ut_stack.tpb | 58 ++++++ source/core/types/ut_stack.tps | 26 +++ source/core/ut_suite_cache_manager.pkb | 21 +-- source/core/ut_utils.pkb | 245 ++++++++++++++++++++++++- source/core/ut_utils.pks | 25 +++ source/install.sql | 2 + test/ut3_user/api/test_ut_run.pkb | 2 +- 8 files changed, 363 insertions(+), 20 deletions(-) create mode 100644 source/core/types/ut_stack.tpb create mode 100644 source/core/types/ut_stack.tps diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index a2a69f464..3d4550cf9 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -95,10 +95,6 @@ create or replace package body ut_runner is ut_event_manager.trigger_event(ut_event_manager.gc_initialize); ut_event_manager.trigger_event(ut_event_manager.gc_debug, ut_run_info()); - if ut_utils.valid_tag_expression(l_tags) = 0 then - raise_application_error(ut_utils.gc_invalid_tag_expression, 'Invalid Tag expression'); - end if; - if a_random_test_order_seed is not null then l_random_test_order_seed := a_random_test_order_seed; elsif a_random_test_order then diff --git a/source/core/types/ut_stack.tpb b/source/core/types/ut_stack.tpb new file mode 100644 index 000000000..a7f7ab0c2 --- /dev/null +++ b/source/core/types/ut_stack.tpb @@ -0,0 +1,58 @@ +create or replace type body ut_stack as + /* + utPLSQL - Version 3 + Copyright 2016 - 2021 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + constructor function ut_stack( self in out nocopy ut_stack) return self as result is + begin + self.tokens := ut_varchar2_list(); + self.top := 0; + return; + end ut_stack; + + member function peek(self in out nocopy ut_stack) return varchar2 is + l_token varchar2(32767); + begin + if self.tokens.count =0 or self.tokens is null then + l_token := null; + else + l_token := self.tokens(self.tokens.last); + end if; + return l_token; + end; + + member procedure push(self in out nocopy ut_stack, a_token varchar2) is + begin + self.tokens.extend; + self.tokens(self.tokens.last) := a_token; + self.top := self.tokens.count; + end push; + + member procedure pop(self in out nocopy ut_stack,a_cnt in integer default 1) is + begin + self.tokens.trim(a_cnt); + self.top := self.tokens.count; + end pop; + + member function pop(self in out nocopy ut_stack) return varchar2 is + l_token varchar2(32767) := self.tokens(self.tokens.last); + begin + self.pop(); + return l_token; + end; +end; +/ + diff --git a/source/core/types/ut_stack.tps b/source/core/types/ut_stack.tps new file mode 100644 index 000000000..9851b9cc5 --- /dev/null +++ b/source/core/types/ut_stack.tps @@ -0,0 +1,26 @@ +create or replace type ut_stack as object ( + top integer, + tokens ut_varchar2_list, + /* + utPLSQL - Version 3 + Copyright 2016 - 2021 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + constructor function ut_stack( self in out nocopy ut_stack) return self as result, + member function peek(self in out nocopy ut_stack) return varchar2, + member procedure push(self in out nocopy ut_stack, a_token varchar2), + member procedure pop(self in out nocopy ut_stack,a_cnt in integer default 1), + member function pop(self in out nocopy ut_stack) return varchar2 +) + diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index 152b5c0f9..ae5460ef6 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -234,11 +234,11 @@ create or replace package body ut_suite_cache_manager is function replace_legacy_tag_notation(a_tags varchar2 ) return varchar2 is l_tags ut_varchar2_list := ut_utils.string_to_table(a_tags,','); - l_tags_include varchar2(2000); - l_tags_exclude varchar2(2000); + l_tags_include varchar2(4000); + l_tags_exclude varchar2(4000); l_return_tag varchar2(4000); begin - select listagg( t.column_value,' | ') + select listagg( t.column_value,'|') within group( order by column_value) into l_tags_include from table(l_tags) t @@ -268,15 +268,14 @@ create or replace package body ut_suite_cache_manager is if instr(l_tags,',') > 0 or instr(l_tags,'-') > 0 then l_tags := replace(replace_legacy_tag_notation(l_tags),' '); end if; - l_tags := REGEXP_REPLACE(l_tags, - '(\(|\)|\||\!|\&)?([^|&!-()]+)(\(|\)|\||\!|\&)?', - q'[\1q'<\2>' member of tags\3]'); - --replace operands to XPath + l_tags := ut_utils.convert_postfix_to_infix_where_sql(ut_utils.shunt_logical_expression(l_tags)); l_tags := REPLACE(l_tags, '|',' or '); - l_tags := REPLACE(l_tags , '&',' and '); - l_tags := REGEXP_REPLACE(l_tags,q'[(\!)(q'<[^|&!]+?>')( member of tags)]','\2 not \3'); - l_tags := '('||l_tags||')'; - return l_tags; + l_tags := REPLACE(l_tags ,'&',' and '); + l_tags := REPLACE(l_tags ,'!','not'); + return l_tags; + exception + when ut_utils.ex_invalid_tag_expression then + raise_application_error(ut_utils.gc_invalid_tag_expression, 'Invalid Tag expression'); end; /* diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 3747b029a..c09c15221 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -24,6 +24,16 @@ create or replace package body ut_utils is gc_full_valid_xml_name constant varchar2(50) := '^([_a-zA-Z])([_a-zA-Z0-9\.-])*$'; gc_owner_hash constant integer(11) := dbms_utility.get_hash_value( ut_owner(), 0, power(2,31)-1); + /** + * Constants use in postfix and infix transformations + */ + gc_operators constant ut_varchar2_list := ut_varchar2_list('|','&','!'); + gc_unary_operator constant ut_varchar2_list := ut_varchar2_list('!'); -- right side associative operator + gc_binary_operator constant ut_varchar2_list := ut_varchar2_list('|','&'); -- left side associative operator + + type t_precedence_table is table of number index by varchar2(1); + g_precedence t_precedence_table; + function surround_with(a_value varchar2, a_quote_char varchar2) return varchar2 is begin return case when a_quote_char is not null then a_quote_char||a_value||a_quote_char else a_value end; @@ -999,12 +1009,12 @@ create or replace package body ut_utils is */ function valid_tag_expression(a_tags in varchar2) return number is - l_left_side_expression varchar2(100) := '[|&,]'; - l_left_side_regex varchar2(400) := '([^|&,]*)[|&,](.*)'; + l_left_side_expression varchar2(10) := '[|&,]'; + l_left_side_regex varchar2(50) := '([^|&,]*)[|&,](.*)'; l_left_side varchar2(4000); - l_rigth_side_expression varchar2(100) := '[!-]'; - l_right_side_regex varchar2(400) := '([!-])([^!-].*)'; + l_rigth_side_expression varchar2(10) := '[!-]'; + l_right_side_regex varchar2(50) := '([!-])([^!-].*)'; l_right_side varchar2(4000); l_tags varchar2(4000) := a_tags; @@ -1058,5 +1068,232 @@ create or replace package body ut_utils is return l_result; end; + procedure build_tag_expression_filter(a_tags in varchar2,a_expression_tab in out t_expression_tab,a_parent_id varchar2 default null) is + l_left_side_expression varchar2(10) := '[|&,]'; + l_left_side_regex varchar2(50) := '([^|&,]*)([|&,])(.*)'; + l_left_side varchar2(4000); + + l_rigth_side_expression varchar2(10) := '[!-]'; + l_right_side_regex varchar2(50) := '([!-])([^!-].*)'; + l_right_side varchar2(4000); + + l_tags varchar2(4000) := a_tags; + l_result number :=1; + l_expression_rec t_expression_rec; + + begin + if a_expression_tab is null then + a_expression_tab := t_expression_tab(); + end if; + + l_expression_rec.id := sys_guid(); + l_expression_rec.parent_id := a_parent_id; + + if instr(substr(l_tags,1,1),'(',1,1) + instr(substr(l_tags,-1,1),')',-1,1) = 2 then + + if regexp_count(l_tags,l_right_side_regex) = 1 then + l_expression_rec.negated :=1; + l_tags := trim (leading '!' from l_tags); + end if; + + l_expression_rec.left_bracket := 1; + l_tags := trim(leading '(' from l_tags); + l_expression_rec.right_bracket := 1; + l_tags := trim(trailing ')' from l_tags); + end if; + + + --Check if there are any left side operators for first in order from left to right + if regexp_count(l_tags,l_left_side_expression) > 0 then + --Extract left part of operator and remaining of string to right + + --if there are bracketc extract it and record it + + l_left_side := regexp_replace(l_tags,l_left_side_regex,'\1'); + l_expression_rec.log_operator := regexp_replace(l_tags,l_left_side_regex,'\2'); + l_right_side := regexp_replace(l_tags,l_left_side_regex,'\3'); + a_expression_tab.extend; + a_expression_tab(a_expression_tab.last) := l_expression_rec; + + build_tag_expression_filter(l_left_side,a_expression_tab,l_expression_rec.id); + build_tag_expression_filter(l_right_side,a_expression_tab,l_expression_rec.id); + + else + if instr(substr(l_tags,1,1),'(',1,1) + instr(substr(l_tags,-1,1),')',-1,1) = 2 then + + if regexp_count(l_tags,l_right_side_regex) = 1 then + l_expression_rec.negated :=1; + l_tags := trim (leading '!' from l_tags); + end if; + + l_expression_rec.left_bracket := 1; + l_tags := trim(leading '(' from l_tags); + l_expression_rec.right_bracket := 1; + l_tags := trim(trailing ')' from l_tags); + end if; + l_expression_rec.expression := l_tags; + a_expression_tab.extend; + a_expression_tab(a_expression_tab.last) := l_expression_rec; + end if; + + end; + + /* + https://stackoverflow.com/questions/29634992/shunting-yard-validate-expression + */ + function shunt_logical_expression(a_tags in varchar2) return ut_varchar2_list is + l_tags varchar2(32767) := a_tags; + l_operator_stack ut_stack := ut_stack(); + l_input_tokens ut_varchar2_list := ut_varchar2_list(); + l_rnp_tokens ut_varchar2_list := ut_varchar2_list(); + l_token varchar2(32767); + l_expect_operand boolean := true; + l_expect_operator boolean := false; + begin + --Tokenize a string into operators and tags + select regexp_substr(l_tags,'([^!()|&]+)|([!()|&])', 1, level) as string_parts + bulk collect into l_input_tokens + from dual connect by regexp_substr (l_tags, '([^!()|&]+)|([!()|&])', 1, level) is not null; + + --Exuecute modified shunting algorithm + for token in 1..l_input_tokens.count loop + l_token := l_input_tokens(token); + if (l_token member of gc_operators and l_token member of gc_binary_operator) then + if not(l_expect_operator) then + raise ex_invalid_tag_expression; + end if; + while l_operator_stack.top > 0 and (g_precedence(l_operator_stack.peek) > g_precedence(l_token)) loop + l_rnp_tokens.extend; + l_rnp_tokens(l_rnp_tokens.last) := l_operator_stack.pop; + end loop; + l_operator_stack.push(l_input_tokens(token)); + l_expect_operand := true; + l_expect_operator:= false; + elsif (l_token member of gc_operators and l_token member of gc_unary_operator) then + if not(l_expect_operand) then + raise ex_invalid_tag_expression; + end if; + l_operator_stack.push(l_input_tokens(token)); + l_expect_operand := true; + l_expect_operator:= false; + elsif l_token = '(' then + if not(l_expect_operand) then + raise ex_invalid_tag_expression; + end if; + l_operator_stack.push(l_input_tokens(token)); + l_expect_operand := true; + l_expect_operator:= false; + elsif l_token = ')' then + if not(l_expect_operator) then + raise ex_invalid_tag_expression; + end if; + while l_operator_stack.peek <> '(' loop + l_rnp_tokens.extend; + l_rnp_tokens(l_rnp_tokens.last) := l_operator_stack.pop; + end loop; + l_operator_stack.pop; --Pop the open bracket and discard it + l_expect_operand := false; + l_expect_operator:= true; + else + if not(l_expect_operand) then + raise ex_invalid_tag_expression; + end if; + l_rnp_tokens.extend; + l_rnp_tokens(l_rnp_tokens.last) :=l_token; + l_expect_operator := true; + l_expect_operand := false; + end if; + + end loop; + + while l_operator_stack.top > 0 loop + if l_operator_stack.peek in ('(',')') then + raise ex_invalid_tag_expression; + end if; + l_rnp_tokens.extend; + l_rnp_tokens(l_rnp_tokens.last):=l_operator_stack.pop; + end loop; + + return l_rnp_tokens; + end shunt_logical_expression; + + procedure shunt_logical_expression(a_tags in varchar2) is + a_postfix ut_varchar2_list; + begin + a_postfix := ut_utils.shunt_logical_expression(a_tags); + end shunt_logical_expression; + + function convert_postfix_to_infix(a_postfix_exp in ut_varchar2_list) + return varchar2 is + l_infix_stack ut_stack := ut_stack(); + l_right_side varchar2(32767); + l_left_side varchar2(32767); + l_infix_exp varchar2(32767); + begin + for i in 1..a_postfix_exp.count loop + --If token is operand but also single tag + if a_postfix_exp(i) not member of gc_operators then --its operand + l_infix_stack.push(a_postfix_exp(i)); + --If token is unary operator not + elsif a_postfix_exp(i) member of gc_unary_operator then + l_right_side := l_infix_stack.pop; + l_infix_exp := '('||a_postfix_exp(i)||l_right_side||')'; + l_infix_stack.push(l_infix_exp); + --If token is binary operator + elsif a_postfix_exp(i) member of gc_binary_operator then + l_right_side := l_infix_stack.pop; + l_left_side := l_infix_stack.pop; + l_infix_exp := '('||l_left_side||a_postfix_exp(i)||l_right_side||')'; + l_infix_stack.push(l_infix_exp); + else + null; + end if; + end loop; + + return l_infix_stack.pop; + end; + + function convert_postfix_to_infix_where_sql(a_postfix_exp in ut_varchar2_list) + return varchar2 is + l_infix_stack ut_stack := ut_stack(); + l_right_side varchar2(32767); + l_left_side varchar2(32767); + l_infix_exp varchar2(32767); + l_member_token varchar2(20) := ' member of tags'; + begin + for i in 1..a_postfix_exp.count loop + --If token is operand but also single tag + if regexp_count(a_postfix_exp(i),'[!()|&]') = 0 then + l_infix_stack.push(q'[']'||a_postfix_exp(i)||q'[']'||l_member_token); + --If token is operand but containing other expressions + elsif a_postfix_exp(i) not member of gc_operators then + l_infix_stack.push(a_postfix_exp(i)); + --If token is unary operator not + elsif a_postfix_exp(i) member of gc_unary_operator then + l_right_side := l_infix_stack.pop; + l_infix_exp := a_postfix_exp(i)||'('||l_right_side||')'; + l_infix_stack.push(l_infix_exp); + --If token is binary operator + elsif a_postfix_exp(i) member of gc_binary_operator then + l_right_side := l_infix_stack.pop; + l_left_side := l_infix_stack.pop; + l_infix_exp := '('||l_left_side||a_postfix_exp(i)||l_right_side||')'; + l_infix_stack.push(l_infix_exp); + else + null; + end if; + end loop; + + return l_infix_stack.pop; + end; + +begin + --Define operator precedence + g_precedence('!'):=4; + g_precedence('&'):=3; + g_precedence('|'):=2; + g_precedence(')'):=1; + g_precedence('('):=1; + end ut_utils; / diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index e84818cba..2212454f4 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -482,5 +482,30 @@ create or replace package ut_utils authid definer is */ function valid_tag_expression(a_tags in varchar2) return number; + /* + * Return number 1 or 0 if the list of tags is valid expression + */ + procedure build_tag_expression_filter(a_tags in varchar2,a_expression_tab in out t_expression_tab,a_parent_id varchar2 default null); + + /* + * Function that uses Dijkstra algorithm to parse mathematical and logical expression + * and return a list of elements in Reverse Polish Notation ( postfix ) + * As part of execution it will validate expression. + */ + function shunt_logical_expression(a_tags in varchar2) return ut_varchar2_list; + + procedure shunt_logical_expression(a_tags in varchar2); + + /* + * Function that converts postfix notation into infix + */ + function convert_postfix_to_infix(a_postfix_exp in ut_varchar2_list) return varchar2; + + /* + * Function that converts postfix notation into infix and creating a string of sql filter + * that checking a tags collections for tags according to posted logic. + */ + function convert_postfix_to_infix_where_sql(a_postfix_exp in ut_varchar2_list) return varchar2; + end ut_utils; / diff --git a/source/install.sql b/source/install.sql index 0873d6a1e..a54977f94 100644 --- a/source/install.sql +++ b/source/install.sql @@ -50,6 +50,8 @@ create or replace context &&ut3_owner._info using &&ut3_owner..ut_session_contex @@install_component.sql 'core/types/ut_key_value_pairs.tps' @@install_component.sql 'core/types/ut_reporter_info.tps' @@install_component.sql 'core/types/ut_reporters_info.tps' +@@install_component.sql 'core/types/ut_stack.tps' +@@install_component.sql 'core/types/ut_stack.tpb' @@install_component.sql 'core/ut_utils.pks' @@install_component.sql 'core/ut_metadata.pks' @@install_component.sql 'core/ut_savepoint_seq.sql' diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index 84dd11f9c..7eb377f4b 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -1250,7 +1250,7 @@ procedure tag_exclude_run_fun_pth_lst_lg is procedure invalid_tag_expression is l_results ut3_develop.ut_varchar2_list; begin - l_results := ut3_tester_helper.run_helper.run(a_tags => '(!!development&end_to_end)'); + l_results := ut3_tester_helper.run_helper.run(a_tags => '(!development!&end_to_end)'); ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_match('^\s*invalid_tag_expression \[[,\.0-9]+ sec\]\s*$','m'); ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like('%(FAILED -%'); From f51cc993be376e456758b73a21680591fa9130d9 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sun, 9 Apr 2023 18:52:21 -0700 Subject: [PATCH 1040/1096] Missing slash at end of type --- source/core/types/ut_stack.tps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/types/ut_stack.tps b/source/core/types/ut_stack.tps index 9851b9cc5..7b8c145c2 100644 --- a/source/core/types/ut_stack.tps +++ b/source/core/types/ut_stack.tps @@ -23,4 +23,4 @@ create or replace type ut_stack as object ( member procedure pop(self in out nocopy ut_stack,a_cnt in integer default 1), member function pop(self in out nocopy ut_stack) return varchar2 ) - +/ \ No newline at end of file From 4b8e2ab124d7819b2a8a442b9fcd31d6d5d5666e Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sun, 9 Apr 2023 21:26:13 -0700 Subject: [PATCH 1041/1096] Cleanup. Fix object name length. --- source/core/ut_suite_cache_manager.pkb | 2 +- source/core/ut_utils.pkb | 144 +------------------------ source/core/ut_utils.pks | 12 +-- 3 files changed, 5 insertions(+), 153 deletions(-) diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index ae5460ef6..aea8c667e 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -268,7 +268,7 @@ create or replace package body ut_suite_cache_manager is if instr(l_tags,',') > 0 or instr(l_tags,'-') > 0 then l_tags := replace(replace_legacy_tag_notation(l_tags),' '); end if; - l_tags := ut_utils.convert_postfix_to_infix_where_sql(ut_utils.shunt_logical_expression(l_tags)); + l_tags := ut_utils.convert_postfix_to_infix(ut_utils.shunt_logical_expression(l_tags)); l_tags := REPLACE(l_tags, '|',' or '); l_tags := REPLACE(l_tags ,'&',' and '); l_tags := REPLACE(l_tags ,'!','not'); diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index c09c15221..028a0c756 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -1000,144 +1000,6 @@ create or replace package body ut_utils is return l_result; end; - /* - Purpose of this function is to break down the tag expressions - We can separate operators on left and rigth side. - Left ones are AND and OR as they require an operator on left side to - be valid. Right side is NOT. - In each iteration we breakdown string into parts - - */ - function valid_tag_expression(a_tags in varchar2) return number is - l_left_side_expression varchar2(10) := '[|&,]'; - l_left_side_regex varchar2(50) := '([^|&,]*)[|&,](.*)'; - l_left_side varchar2(4000); - - l_rigth_side_expression varchar2(10) := '[!-]'; - l_right_side_regex varchar2(50) := '([!-])([^!-].*)'; - l_right_side varchar2(4000); - - l_tags varchar2(4000) := a_tags; - l_result number :=1; - begin - --Validate that we have closed up all brackets - if regexp_count(l_tags,'\(') <> regexp_count(l_tags,'\)') then - l_result := 0; - end if; - - --Remove brackets as we dont evaluate expression only validate. - l_tags := replace(replace(l_tags,'('),')'); - - --Check if there are any left side operators for first in order from left to right - if regexp_count(l_tags,l_left_side_expression) > 0 then - --Extract left part of operator and remaining of string to right - l_left_side := regexp_replace(l_tags,l_left_side_regex,'\1'); - l_right_side := regexp_replace(l_tags,l_left_side_regex,'\2'); - - --If left side is null that means that we used left side operator without - -- left and right e.g. |test - if l_left_side is null then - l_result := 0; - else - --Extract right side from left side expression if there is any !- - --Remove first negation tag to see if there is double negation - l_left_side := regexp_replace(l_left_side,l_right_side_regex,'\2'); - end if; - - - --check that on right side there is no extra negation - if regexp_count(l_left_side,l_rigth_side_expression) > 0 then - l_result := 0; - end if; - - --Now process right side of string - if l_right_side is not null then - l_result := least(l_result,valid_tag_expression(l_right_side)); - else - l_result := 0; - end if; - else - --We just process single tag. - l_left_side := l_tags; - l_left_side := regexp_replace(l_left_side,l_right_side_regex,'\2'); - if regexp_count(l_left_side,l_rigth_side_expression) > 0 then - l_result := 0; - end if; - end if; - - return l_result; - end; - - procedure build_tag_expression_filter(a_tags in varchar2,a_expression_tab in out t_expression_tab,a_parent_id varchar2 default null) is - l_left_side_expression varchar2(10) := '[|&,]'; - l_left_side_regex varchar2(50) := '([^|&,]*)([|&,])(.*)'; - l_left_side varchar2(4000); - - l_rigth_side_expression varchar2(10) := '[!-]'; - l_right_side_regex varchar2(50) := '([!-])([^!-].*)'; - l_right_side varchar2(4000); - - l_tags varchar2(4000) := a_tags; - l_result number :=1; - l_expression_rec t_expression_rec; - - begin - if a_expression_tab is null then - a_expression_tab := t_expression_tab(); - end if; - - l_expression_rec.id := sys_guid(); - l_expression_rec.parent_id := a_parent_id; - - if instr(substr(l_tags,1,1),'(',1,1) + instr(substr(l_tags,-1,1),')',-1,1) = 2 then - - if regexp_count(l_tags,l_right_side_regex) = 1 then - l_expression_rec.negated :=1; - l_tags := trim (leading '!' from l_tags); - end if; - - l_expression_rec.left_bracket := 1; - l_tags := trim(leading '(' from l_tags); - l_expression_rec.right_bracket := 1; - l_tags := trim(trailing ')' from l_tags); - end if; - - - --Check if there are any left side operators for first in order from left to right - if regexp_count(l_tags,l_left_side_expression) > 0 then - --Extract left part of operator and remaining of string to right - - --if there are bracketc extract it and record it - - l_left_side := regexp_replace(l_tags,l_left_side_regex,'\1'); - l_expression_rec.log_operator := regexp_replace(l_tags,l_left_side_regex,'\2'); - l_right_side := regexp_replace(l_tags,l_left_side_regex,'\3'); - a_expression_tab.extend; - a_expression_tab(a_expression_tab.last) := l_expression_rec; - - build_tag_expression_filter(l_left_side,a_expression_tab,l_expression_rec.id); - build_tag_expression_filter(l_right_side,a_expression_tab,l_expression_rec.id); - - else - if instr(substr(l_tags,1,1),'(',1,1) + instr(substr(l_tags,-1,1),')',-1,1) = 2 then - - if regexp_count(l_tags,l_right_side_regex) = 1 then - l_expression_rec.negated :=1; - l_tags := trim (leading '!' from l_tags); - end if; - - l_expression_rec.left_bracket := 1; - l_tags := trim(leading '(' from l_tags); - l_expression_rec.right_bracket := 1; - l_tags := trim(trailing ')' from l_tags); - end if; - l_expression_rec.expression := l_tags; - a_expression_tab.extend; - a_expression_tab(a_expression_tab.last) := l_expression_rec; - end if; - - end; - /* https://stackoverflow.com/questions/29634992/shunting-yard-validate-expression */ @@ -1251,9 +1113,9 @@ create or replace package body ut_utils is end loop; return l_infix_stack.pop; - end; + end convert_postfix_to_infix; - function convert_postfix_to_infix_where_sql(a_postfix_exp in ut_varchar2_list) + function conv_postfix_to_infix_sql(a_postfix_exp in ut_varchar2_list) return varchar2 is l_infix_stack ut_stack := ut_stack(); l_right_side varchar2(32767); @@ -1285,7 +1147,7 @@ create or replace package body ut_utils is end loop; return l_infix_stack.pop; - end; + end conv_postfix_to_infix_sql; begin --Define operator precedence diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 2212454f4..4bc35466d 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -477,16 +477,6 @@ create or replace package ut_utils authid definer is */ function interval_to_text(a_interval yminterval_unconstrained) return varchar2; - /* - * Return number 1 or 0 if the list of tags is valid expression - */ - function valid_tag_expression(a_tags in varchar2) return number; - - /* - * Return number 1 or 0 if the list of tags is valid expression - */ - procedure build_tag_expression_filter(a_tags in varchar2,a_expression_tab in out t_expression_tab,a_parent_id varchar2 default null); - /* * Function that uses Dijkstra algorithm to parse mathematical and logical expression * and return a list of elements in Reverse Polish Notation ( postfix ) @@ -505,7 +495,7 @@ create or replace package ut_utils authid definer is * Function that converts postfix notation into infix and creating a string of sql filter * that checking a tags collections for tags according to posted logic. */ - function convert_postfix_to_infix_where_sql(a_postfix_exp in ut_varchar2_list) return varchar2; + function conv_postfix_to_infix_sql(a_postfix_exp in ut_varchar2_list) return varchar2; end ut_utils; / From 84e8684004ddbcc95318e24903fae9fd046bf12a Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Mon, 10 Apr 2023 13:29:07 -0700 Subject: [PATCH 1042/1096] Update tests after removed function --- test/ut3_tester/core/test_ut_utils.pkb | 27 -------------------------- test/ut3_tester/core/test_ut_utils.pks | 3 --- 2 files changed, 30 deletions(-) diff --git a/test/ut3_tester/core/test_ut_utils.pkb b/test/ut3_tester/core/test_ut_utils.pkb index 8a497b9f1..ec7e4f403 100644 --- a/test/ut3_tester/core/test_ut_utils.pkb +++ b/test/ut3_tester/core/test_ut_utils.pkb @@ -489,32 +489,5 @@ end; ut.expect(l_expected).to_equal(l_actual); end; - procedure valid_tag_expressions is - begin - ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1')); - ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1|tag2')); - ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1&tag2')); - ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('!tag1')); - ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1|!tag2')); - ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1&!tag2')); - ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('!tag1|!tag2')); - ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('!tag1&!tag2')); - - ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1,tag2')); - ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('-tag1')); - ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1,-tag2')); - ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('-tag1,-tag2')); - - ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('(!tag1|!tag2)|tag3')); - ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('(!tag1&!tag2)|(tag3&tag4)')); - - ut.expect(0).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1|')); - ut.expect(0).to_equal(ut3_develop.ut_utils.valid_tag_expression('&!tag2')); - ut.expect(0).to_equal(ut3_develop.ut_utils.valid_tag_expression('!!tag1|!tag2')); - ut.expect(0).to_equal(ut3_develop.ut_utils.valid_tag_expression('!tag1&!tag2|')); - ut.expect(0).to_equal(ut3_develop.ut_utils.valid_tag_expression('((!tag1|!tag2)|tag3')); - - end; - end test_ut_utils; / diff --git a/test/ut3_tester/core/test_ut_utils.pks b/test/ut3_tester/core/test_ut_utils.pks index 0f8545a45..4d83b5042 100644 --- a/test/ut3_tester/core/test_ut_utils.pks +++ b/test/ut3_tester/core/test_ut_utils.pks @@ -157,8 +157,5 @@ create or replace package test_ut_utils is --%endcontext - --%test(Test to validate different type of expressions passed as tags) - procedure valid_tag_expressions; - end test_ut_utils; / From 2e7a766f6169d0ad104448166ff3d0c84280b3e3 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Mon, 10 Apr 2023 13:57:54 -0700 Subject: [PATCH 1043/1096] Tidy up tests --- source/core/ut_suite_cache_manager.pkb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index aea8c667e..a9153c7bd 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -268,7 +268,7 @@ create or replace package body ut_suite_cache_manager is if instr(l_tags,',') > 0 or instr(l_tags,'-') > 0 then l_tags := replace(replace_legacy_tag_notation(l_tags),' '); end if; - l_tags := ut_utils.convert_postfix_to_infix(ut_utils.shunt_logical_expression(l_tags)); + l_tags := ut_utils.conv_postfix_to_infix_sql(ut_utils.shunt_logical_expression(l_tags)); l_tags := REPLACE(l_tags, '|',' or '); l_tags := REPLACE(l_tags ,'&',' and '); l_tags := REPLACE(l_tags ,'!','not'); From cbdf83aee9491bd39e4bc06f74f72745fd5a6ef3 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Mon, 10 Apr 2023 14:02:57 -0700 Subject: [PATCH 1044/1096] Added ut_stack to uninstall --- source/uninstall_objects.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index 9531736b9..1e21f0f95 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -267,6 +267,8 @@ end; drop package ut_utils; +drop type ut_stack force; + drop sequence ut_savepoint_seq; drop type ut_documentation_reporter force; From 436eb5bed919df6b512688511a6d121a71c3a320 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Mon, 10 Apr 2023 18:00:07 -0700 Subject: [PATCH 1045/1096] Addressing test failures and sonar smells --- source/core/ut_utils.pkb | 51 +++++++++++++++----------- test/ut3_tester/core/test_ut_utils.pkb | 35 ++++++++++++++++++ test/ut3_tester/core/test_ut_utils.pks | 6 +++ 3 files changed, 71 insertions(+), 21 deletions(-) diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 028a0c756..ac5f25645 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -1011,15 +1011,17 @@ create or replace package body ut_utils is l_token varchar2(32767); l_expect_operand boolean := true; l_expect_operator boolean := false; + l_idx pls_integer; begin --Tokenize a string into operators and tags select regexp_substr(l_tags,'([^!()|&]+)|([!()|&])', 1, level) as string_parts bulk collect into l_input_tokens from dual connect by regexp_substr (l_tags, '([^!()|&]+)|([!()|&])', 1, level) is not null; + l_idx := l_input_tokens.first; --Exuecute modified shunting algorithm - for token in 1..l_input_tokens.count loop - l_token := l_input_tokens(token); + WHILE (l_idx is not null) loop + l_token := l_input_tokens(l_idx); if (l_token member of gc_operators and l_token member of gc_binary_operator) then if not(l_expect_operator) then raise ex_invalid_tag_expression; @@ -1028,21 +1030,21 @@ create or replace package body ut_utils is l_rnp_tokens.extend; l_rnp_tokens(l_rnp_tokens.last) := l_operator_stack.pop; end loop; - l_operator_stack.push(l_input_tokens(token)); + l_operator_stack.push(l_input_tokens(l_idx)); l_expect_operand := true; l_expect_operator:= false; elsif (l_token member of gc_operators and l_token member of gc_unary_operator) then if not(l_expect_operand) then raise ex_invalid_tag_expression; end if; - l_operator_stack.push(l_input_tokens(token)); + l_operator_stack.push(l_input_tokens(l_idx)); l_expect_operand := true; l_expect_operator:= false; elsif l_token = '(' then if not(l_expect_operand) then raise ex_invalid_tag_expression; end if; - l_operator_stack.push(l_input_tokens(token)); + l_operator_stack.push(l_input_tokens(l_idx)); l_expect_operand := true; l_expect_operator:= false; elsif l_token = ')' then @@ -1066,6 +1068,7 @@ create or replace package body ut_utils is l_expect_operand := false; end if; + l_idx := l_input_tokens.next(l_idx); end loop; while l_operator_stack.top > 0 loop @@ -1091,25 +1094,28 @@ create or replace package body ut_utils is l_right_side varchar2(32767); l_left_side varchar2(32767); l_infix_exp varchar2(32767); + l_idx pls_integer; begin - for i in 1..a_postfix_exp.count loop + l_idx := a_postfix_exp.first; + while (l_idx is not null) loop --If token is operand but also single tag - if a_postfix_exp(i) not member of gc_operators then --its operand - l_infix_stack.push(a_postfix_exp(i)); + if a_postfix_exp(l_idx) not member of gc_operators then --its operand + l_infix_stack.push(a_postfix_exp(l_idx)); --If token is unary operator not - elsif a_postfix_exp(i) member of gc_unary_operator then + elsif a_postfix_exp(l_idx) member of gc_unary_operator then l_right_side := l_infix_stack.pop; - l_infix_exp := '('||a_postfix_exp(i)||l_right_side||')'; + l_infix_exp := '('||a_postfix_exp(l_idx)||l_right_side||')'; l_infix_stack.push(l_infix_exp); --If token is binary operator - elsif a_postfix_exp(i) member of gc_binary_operator then + elsif a_postfix_exp(l_idx) member of gc_binary_operator then l_right_side := l_infix_stack.pop; l_left_side := l_infix_stack.pop; - l_infix_exp := '('||l_left_side||a_postfix_exp(i)||l_right_side||')'; + l_infix_exp := '('||l_left_side||a_postfix_exp(l_idx)||l_right_side||')'; l_infix_stack.push(l_infix_exp); else null; end if; + l_idx := a_postfix_exp.next(l_idx); end loop; return l_infix_stack.pop; @@ -1122,28 +1128,31 @@ create or replace package body ut_utils is l_left_side varchar2(32767); l_infix_exp varchar2(32767); l_member_token varchar2(20) := ' member of tags'; + l_idx pls_integer; begin - for i in 1..a_postfix_exp.count loop + l_idx := a_postfix_exp.first; + while ( l_idx is not null) loop --If token is operand but also single tag - if regexp_count(a_postfix_exp(i),'[!()|&]') = 0 then - l_infix_stack.push(q'[']'||a_postfix_exp(i)||q'[']'||l_member_token); + if regexp_count(a_postfix_exp(l_idx),'[!()|&]') = 0 then + l_infix_stack.push(q'[']'||a_postfix_exp(l_idx)||q'[']'||l_member_token); --If token is operand but containing other expressions - elsif a_postfix_exp(i) not member of gc_operators then - l_infix_stack.push(a_postfix_exp(i)); + elsif a_postfix_exp(l_idx) not member of gc_operators then + l_infix_stack.push(a_postfix_exp(l_idx)); --If token is unary operator not - elsif a_postfix_exp(i) member of gc_unary_operator then + elsif a_postfix_exp(l_idx) member of gc_unary_operator then l_right_side := l_infix_stack.pop; - l_infix_exp := a_postfix_exp(i)||'('||l_right_side||')'; + l_infix_exp := a_postfix_exp(l_idx)||'('||l_right_side||')'; l_infix_stack.push(l_infix_exp); --If token is binary operator - elsif a_postfix_exp(i) member of gc_binary_operator then + elsif a_postfix_exp(l_idx) member of gc_binary_operator then l_right_side := l_infix_stack.pop; l_left_side := l_infix_stack.pop; - l_infix_exp := '('||l_left_side||a_postfix_exp(i)||l_right_side||')'; + l_infix_exp := '('||l_left_side||a_postfix_exp(l_idx)||l_right_side||')'; l_infix_stack.push(l_infix_exp); else null; end if; + l_idx := a_postfix_exp.next(l_idx); end loop; return l_infix_stack.pop; diff --git a/test/ut3_tester/core/test_ut_utils.pkb b/test/ut3_tester/core/test_ut_utils.pkb index ec7e4f403..1f64c621e 100644 --- a/test/ut3_tester/core/test_ut_utils.pkb +++ b/test/ut3_tester/core/test_ut_utils.pkb @@ -489,5 +489,40 @@ end; ut.expect(l_expected).to_equal(l_actual); end; + + procedure test_conversion_to_rpn is + l_postfix ut3_develop.ut_varchar2_list; + l_postfix_string varchar2(4000); + begin + l_postfix := ut3_develop.ut_utils.shunt_logical_expression('A'); + l_postfix_string := ut3_develop.ut_utils.table_to_clob(l_postfix,''); + ut.expect(l_postfix_string).to_equal('A'); + + l_postfix := ut3_develop.ut_utils.shunt_logical_expression('A|B'); + l_postfix_string := ut3_develop.ut_utils.table_to_clob(l_postfix,''); + ut.expect(l_postfix_string).to_equal('AB|'); + + l_postfix := ut3_develop.ut_utils.shunt_logical_expression('(a|b)|c&d'); + l_postfix_string := ut3_develop.ut_utils.table_to_clob(l_postfix,''); + ut.expect(l_postfix_string).to_equal('ab|cd&|'); + end; + + procedure test_conversion_from_rpn_to_infix is + l_postfix_rpn ut3_develop.ut_varchar2_list; + l_infix_string varchar2(4000); + begin + l_postfix_rpn := ut3_develop.ut_varchar2_list('A'); + l_infix_string := ut3_develop.ut_utils.convert_postfix_to_infix(l_postfix_rpn); + ut.expect(l_infix_string).to_equal('A'); + + l_postfix_rpn := ut3_develop.ut_varchar2_list('A','B','|'); + l_infix_string := ut3_develop.ut_utils.convert_postfix_to_infix(l_postfix_rpn); + ut.expect(l_infix_string).to_equal('(A|B)'); + + l_postfix_rpn := ut3_develop.ut_varchar2_list('a','b','|','c','d','&','|'); + l_infix_string := ut3_develop.ut_utils.convert_postfix_to_infix(l_postfix_rpn); + ut.expect(l_infix_string).to_equal('((a|b)|(c&d))'); + end; + end test_ut_utils; / diff --git a/test/ut3_tester/core/test_ut_utils.pks b/test/ut3_tester/core/test_ut_utils.pks index 4d83b5042..7bfd9b36e 100644 --- a/test/ut3_tester/core/test_ut_utils.pks +++ b/test/ut3_tester/core/test_ut_utils.pks @@ -156,6 +156,12 @@ create or replace package test_ut_utils is --%endcontext + + --%test( Test conversion of expression into Reverse Polish Notation) + procedure test_conversion_to_rpn; + + --%test( Test conversion of expression from Reverse Polish Notation into infix) + procedure test_conversion_from_rpn_to_infix; end test_ut_utils; / From 3d77514448e9720ad11589343d171723ad8f1c72 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Mon, 10 Apr 2023 18:08:42 -0700 Subject: [PATCH 1046/1096] Update name --- test/ut3_tester/core/test_ut_utils.pkb | 2 +- test/ut3_tester/core/test_ut_utils.pks | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/ut3_tester/core/test_ut_utils.pkb b/test/ut3_tester/core/test_ut_utils.pkb index 1f64c621e..126ada89c 100644 --- a/test/ut3_tester/core/test_ut_utils.pkb +++ b/test/ut3_tester/core/test_ut_utils.pkb @@ -507,7 +507,7 @@ end; ut.expect(l_postfix_string).to_equal('ab|cd&|'); end; - procedure test_conversion_from_rpn_to_infix is + procedure test_conv_from_rpn_to_infix is l_postfix_rpn ut3_develop.ut_varchar2_list; l_infix_string varchar2(4000); begin diff --git a/test/ut3_tester/core/test_ut_utils.pks b/test/ut3_tester/core/test_ut_utils.pks index 7bfd9b36e..6d11f65d1 100644 --- a/test/ut3_tester/core/test_ut_utils.pks +++ b/test/ut3_tester/core/test_ut_utils.pks @@ -161,7 +161,7 @@ create or replace package test_ut_utils is procedure test_conversion_to_rpn; --%test( Test conversion of expression from Reverse Polish Notation into infix) - procedure test_conversion_from_rpn_to_infix; + procedure test_conv_from_rpn_to_infix; end test_ut_utils; / From bf6959fc63c4c36ff24f62d28e8a5b1d6b323ce4 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Mon, 10 Apr 2023 20:39:25 -0700 Subject: [PATCH 1047/1096] Update tests and code --- source/core/ut_utils.pkb | 30 +++++++++++--------------- source/core/ut_utils.pks | 7 ++++-- test/ut3_tester/core/test_ut_utils.pkb | 29 +++++++++++++++++++++++-- test/ut3_tester/core/test_ut_utils.pks | 3 +++ test/ut3_user/api/test_ut_run.pkb | 15 ++++++++++++- 5 files changed, 62 insertions(+), 22 deletions(-) diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index ac5f25645..1c99a3a42 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -1000,24 +1000,30 @@ create or replace package body ut_utils is return l_result; end; + function tokenize_tags_string(a_tags in varchar2) return ut_varchar2_list is + l_tags_tokens ut_varchar2_list := ut_varchar2_list(); + begin + --Tokenize a string into operators and tags + select regexp_substr(a_tags,'([^!()|&]+)|([!()|&])', 1, level) as string_parts + bulk collect into l_tags_tokens + from dual connect by regexp_substr (a_tags, '([^!()|&]+)|([!()|&])', 1, level) is not null; + + return l_tags_tokens; + end; + /* https://stackoverflow.com/questions/29634992/shunting-yard-validate-expression */ function shunt_logical_expression(a_tags in varchar2) return ut_varchar2_list is l_tags varchar2(32767) := a_tags; l_operator_stack ut_stack := ut_stack(); - l_input_tokens ut_varchar2_list := ut_varchar2_list(); + l_input_tokens ut_varchar2_list := tokenize_tags_string(a_tags); l_rnp_tokens ut_varchar2_list := ut_varchar2_list(); l_token varchar2(32767); l_expect_operand boolean := true; l_expect_operator boolean := false; l_idx pls_integer; begin - --Tokenize a string into operators and tags - select regexp_substr(l_tags,'([^!()|&]+)|([!()|&])', 1, level) as string_parts - bulk collect into l_input_tokens - from dual connect by regexp_substr (l_tags, '([^!()|&]+)|([!()|&])', 1, level) is not null; - l_idx := l_input_tokens.first; --Exuecute modified shunting algorithm WHILE (l_idx is not null) loop @@ -1071,7 +1077,7 @@ create or replace package body ut_utils is l_idx := l_input_tokens.next(l_idx); end loop; - while l_operator_stack.top > 0 loop + while l_operator_stack.peek is not null loop if l_operator_stack.peek in ('(',')') then raise ex_invalid_tag_expression; end if; @@ -1082,12 +1088,6 @@ create or replace package body ut_utils is return l_rnp_tokens; end shunt_logical_expression; - procedure shunt_logical_expression(a_tags in varchar2) is - a_postfix ut_varchar2_list; - begin - a_postfix := ut_utils.shunt_logical_expression(a_tags); - end shunt_logical_expression; - function convert_postfix_to_infix(a_postfix_exp in ut_varchar2_list) return varchar2 is l_infix_stack ut_stack := ut_stack(); @@ -1112,8 +1112,6 @@ create or replace package body ut_utils is l_left_side := l_infix_stack.pop; l_infix_exp := '('||l_left_side||a_postfix_exp(l_idx)||l_right_side||')'; l_infix_stack.push(l_infix_exp); - else - null; end if; l_idx := a_postfix_exp.next(l_idx); end loop; @@ -1149,8 +1147,6 @@ create or replace package body ut_utils is l_left_side := l_infix_stack.pop; l_infix_exp := '('||l_left_side||a_postfix_exp(l_idx)||l_right_side||')'; l_infix_stack.push(l_infix_exp); - else - null; end if; l_idx := a_postfix_exp.next(l_idx); end loop; diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 4bc35466d..67b09b2f9 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -476,6 +476,11 @@ create or replace package ut_utils authid definer is * Return value of interval in plain english */ function interval_to_text(a_interval yminterval_unconstrained) return varchar2; + + /* + * Return table of tokens character by character + */ + function tokenize_tags_string(a_tags in varchar2) return ut_varchar2_list; /* * Function that uses Dijkstra algorithm to parse mathematical and logical expression @@ -484,8 +489,6 @@ create or replace package ut_utils authid definer is */ function shunt_logical_expression(a_tags in varchar2) return ut_varchar2_list; - procedure shunt_logical_expression(a_tags in varchar2); - /* * Function that converts postfix notation into infix */ diff --git a/test/ut3_tester/core/test_ut_utils.pkb b/test/ut3_tester/core/test_ut_utils.pkb index 126ada89c..22733c4ce 100644 --- a/test/ut3_tester/core/test_ut_utils.pkb +++ b/test/ut3_tester/core/test_ut_utils.pkb @@ -504,7 +504,11 @@ end; l_postfix := ut3_develop.ut_utils.shunt_logical_expression('(a|b)|c&d'); l_postfix_string := ut3_develop.ut_utils.table_to_clob(l_postfix,''); - ut.expect(l_postfix_string).to_equal('ab|cd&|'); + ut.expect(l_postfix_string).to_equal('ab|cd&|'); + + l_postfix := ut3_develop.ut_utils.shunt_logical_expression('!a|b'); + l_postfix_string := ut3_develop.ut_utils.table_to_clob(l_postfix,''); + ut.expect(l_postfix_string).to_equal('a!b|'); end; procedure test_conv_from_rpn_to_infix is @@ -521,7 +525,28 @@ end; l_postfix_rpn := ut3_develop.ut_varchar2_list('a','b','|','c','d','&','|'); l_infix_string := ut3_develop.ut_utils.convert_postfix_to_infix(l_postfix_rpn); - ut.expect(l_infix_string).to_equal('((a|b)|(c&d))'); + ut.expect(l_infix_string).to_equal('((a|b)|(c&d))'); + + l_postfix_rpn := ut3_develop.ut_varchar2_list('a','b','!','|'); + l_infix_string := ut3_develop.ut_utils.convert_postfix_to_infix(l_postfix_rpn); + ut.expect(l_infix_string).to_equal('(a|(!b))'); + end; + + procedure conv_from_rpn_to_sql_filter is + l_postfix_rpn ut3_develop.ut_varchar2_list; + l_infix_string varchar2(4000); + begin + l_postfix_rpn := ut3_develop.ut_varchar2_list('A'); + l_infix_string := ut3_develop.ut_utils.conv_postfix_to_infix_sql(l_postfix_rpn); + ut.expect(l_infix_string).to_equal(q'['A' member of tags]'); + + l_postfix_rpn := ut3_develop.ut_varchar2_list('A','B','|'); + l_infix_string := ut3_develop.ut_utils.conv_postfix_to_infix_sql(l_postfix_rpn); + ut.expect(l_infix_string).to_equal(q'[('A' member of tags|'B' member of tags)]'); + + l_postfix_rpn := ut3_develop.ut_varchar2_list('a','b','!','|'); + l_infix_string := ut3_develop.ut_utils.conv_postfix_to_infix_sql(l_postfix_rpn); + ut.expect(l_infix_string).to_equal(q'[('a' member of tags|!('b' member of tags))]'); end; end test_ut_utils; diff --git a/test/ut3_tester/core/test_ut_utils.pks b/test/ut3_tester/core/test_ut_utils.pks index 6d11f65d1..1561e1136 100644 --- a/test/ut3_tester/core/test_ut_utils.pks +++ b/test/ut3_tester/core/test_ut_utils.pks @@ -163,5 +163,8 @@ create or replace package test_ut_utils is --%test( Test conversion of expression from Reverse Polish Notation into infix) procedure test_conv_from_rpn_to_infix; + --%test( Test conversion of expression from Reverse Polish Notation into custom where filter for SQL) + procedure conv_from_rpn_to_sql_filter; + end test_ut_utils; / diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index 7eb377f4b..25b50343e 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -1260,7 +1260,20 @@ procedure tag_exclude_run_fun_pth_lst_lg is l_results := ut3_tester_helper.run_helper.run(a_tags => '(!development&end_to_end|)'); ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_match('^\s*invalid_tag_expression \[[,\.0-9]+ sec\]\s*$','m'); - ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like('%(FAILED -%'); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like('%(FAILED -%'); + + l_results := ut3_tester_helper.run_helper.run(a_tags => '(!development&!!end_to_end)'); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_match('^\s*invalid_tag_expression \[[,\.0-9]+ sec\]\s*$','m'); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like('%(FAILED -%'); + + l_results := ut3_tester_helper.run_helper.run(a_tags => '(&development&end_to_end)'); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_match('^\s*invalid_tag_expression \[[,\.0-9]+ sec\]\s*$','m'); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like('%(FAILED -%'); + + l_results := ut3_tester_helper.run_helper.run(a_tags => '(development|end_to_end))'); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_match('^\s*invalid_tag_expression \[[,\.0-9]+ sec\]\s*$','m'); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like('%(FAILED -%'); + end; procedure set_application_info is From d8233ff6587f81c0a0a6430a4f33747bc2723983 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Tue, 11 Apr 2023 20:33:04 -0700 Subject: [PATCH 1048/1096] fixing typo in docs --- docs/userguide/annotations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 4017521b5..8e5a5d1ca 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1684,7 +1684,7 @@ Execution of the test is done by using the parameter `a_tags` with tag expressio ```sql linenums="1" -select * from table(ut.run(a_tags => 'fast||!complex')); +select * from table(ut.run(a_tags => 'fast|!complex')); ``` The above call will execute all tests from `ut_sample_test` package as the whole suite is tagged with `api` because a suite meet expression condition. From bd860f602d458575d00010834e5ca28058ec09cb Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Tue, 11 Apr 2023 20:55:34 -0700 Subject: [PATCH 1049/1096] Removed unused variable --- source/core/ut_utils.pkb | 1 - 1 file changed, 1 deletion(-) diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 1c99a3a42..a8528fa86 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -1015,7 +1015,6 @@ create or replace package body ut_utils is https://stackoverflow.com/questions/29634992/shunting-yard-validate-expression */ function shunt_logical_expression(a_tags in varchar2) return ut_varchar2_list is - l_tags varchar2(32767) := a_tags; l_operator_stack ut_stack := ut_stack(); l_input_tokens ut_varchar2_list := tokenize_tags_string(a_tags); l_rnp_tokens ut_varchar2_list := ut_varchar2_list(); From e6a6a4cbf108b44932fb114c07e2d18f62ee687f Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 12 Apr 2023 19:54:56 +0300 Subject: [PATCH 1050/1096] Improvements to teamcity reporter (used by DataGrip and IntelliJ - JetBrains IDEs) The reporter will now report all errors and all failed expectations. The test description will be used instead of test name. --- source/reporters/ut_teamcity_reporter.tpb | 33 +++++++++------- .../reporters/ut_teamcity_reporter_helper.pkb | 2 - .../reporters/test_teamcity_reporter.pkb | 39 +++++++++++++++++-- .../reporters/test_teamcity_reporter.pks | 3 ++ 4 files changed, 58 insertions(+), 19 deletions(-) diff --git a/source/reporters/ut_teamcity_reporter.tpb b/source/reporters/ut_teamcity_reporter.tpb index 95bea32b8..e05dc994f 100644 --- a/source/reporters/ut_teamcity_reporter.tpb +++ b/source/reporters/ut_teamcity_reporter.tpb @@ -108,23 +108,28 @@ create or replace type body ut_teamcity_reporter is ut_teamcity_reporter_helper.test_failed( a_test_name => l_test_full_name, a_msg => 'Error occured', - a_details => - trim(l_std_err_msg) - || case when a_test.failed_expectations is not null - and a_test.failed_expectations.count>0 - then a_test.failed_expectations(1).message end + a_details => trim(l_std_err_msg) ) ); + for i in 1 .. a_test.failed_expectations.count loop + ut_utils.append_to_list( + l_results, + ut_teamcity_reporter_helper.test_failed( + a_test_name => l_test_full_name, + a_msg => a_test.failed_expectations(i).description, + a_details => a_test.failed_expectations(i).message ) + ); + end loop; elsif a_test.failed_expectations is not null and a_test.failed_expectations.count > 0 then - -- Teamcity supports only a single failure message - - ut_utils.append_to_list( - l_results, - ut_teamcity_reporter_helper.test_failed( - a_test_name => l_test_full_name, - a_msg => a_test.failed_expectations(a_test.failed_expectations.first).description, - a_details => a_test.failed_expectations(a_test.failed_expectations.first).message ) - ); + for i in 1 .. a_test.failed_expectations.count loop + ut_utils.append_to_list( + l_results, + ut_teamcity_reporter_helper.test_failed( + a_test_name => l_test_full_name, + a_msg => a_test.failed_expectations(i).description, + a_details => a_test.failed_expectations(i).message ) + ); + end loop; elsif a_test.result = ut_utils.gc_failure then ut_utils.append_to_list( l_results, diff --git a/source/reporters/ut_teamcity_reporter_helper.pkb b/source/reporters/ut_teamcity_reporter_helper.pkb index 84a9d19e8..1633d10aa 100644 --- a/source/reporters/ut_teamcity_reporter_helper.pkb +++ b/source/reporters/ut_teamcity_reporter_helper.pkb @@ -73,8 +73,6 @@ create or replace package body ut_teamcity_reporter_helper is 'true' when false then 'false' - else - null end; l_props('flowId') := a_flow_id; return message('testStarted', l_props); diff --git a/test/ut3_user/reporters/test_teamcity_reporter.pkb b/test/ut3_user/reporters/test_teamcity_reporter.pkb index ff550e488..cf7a925a1 100644 --- a/test/ut3_user/reporters/test_teamcity_reporter.pkb +++ b/test/ut3_user/reporters/test_teamcity_reporter.pkb @@ -31,12 +31,26 @@ create or replace package body test_teamcity_reporter as end; end;]'; + execute immediate q'[create or replace package check_multiple_failures is + --%suite + + --%test + procedure multi_failure; + end;]'; + execute immediate q'[create or replace package body check_multiple_failures is + procedure multi_failure is + begin + ut3_develop.ut.expect(1).to_be_null; + ut3_develop.ut.expect(2).to_equal(1); + ut3_develop.ut.expect('Bad').to_equal('Good'); + end; + end;]'; + end; procedure report_produces_expected_out is l_output_data ut3_develop.ut_varchar2_list; - l_output clob; l_expected varchar2(32767); begin l_expected := q'{%##teamcity[testSuiteStarted timestamp='%' name='org'] @@ -84,7 +98,6 @@ create or replace package body test_teamcity_reporter as procedure escape_special_chars is l_output_data ut3_develop.ut_varchar2_list; - l_output clob; l_expected varchar2(32767); begin l_expected := q'{%##teamcity[testSuiteStarted timestamp='%' name='A suite with |'quote|''] @@ -103,7 +116,6 @@ create or replace package body test_teamcity_reporter as procedure trims_long_output is l_output_data ut3_develop.ut_varchar2_list; - l_output clob; l_expected varchar2(32767); begin l_expected := q'{%##teamcity[testSuiteStarted timestamp='%' name='check_trims_long_output'] @@ -120,11 +132,32 @@ create or replace package body test_teamcity_reporter as ut.expect(ut3_tester_helper.main_helper.table_to_clob(l_output_data)).to_be_like(l_expected); end; + procedure report_mutiple_expectations is + l_output_data ut3_develop.ut_varchar2_list; + l_expected varchar2(32767); + begin + l_expected := q'{%##teamcity[testSuiteStarted timestamp='%' name='check_multiple_failures'] +%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3_user.check_multiple_failures.multi_failure'] +%##teamcity[testFailed timestamp='%' details='Actual: 1 (number) was expected to be null' name='ut3_user.check_multiple_failures.multi_failure'] +%##teamcity[testFailed timestamp='%' details='Actual: 2 (number) was expected to equal: 1 (number)' name='ut3_user.check_multiple_failures.multi_failure'] +%##teamcity[testFailed timestamp='%' details='Actual: |'Bad|' (varchar2) was expected to equal: |'Good|' (varchar2)' name='ut3_user.check_multiple_failures.multi_failure'] +%##teamcity[testFinished timestamp='%' duration='%' name='ut3_user.check_multiple_failures.multi_failure'] +%##teamcity[testSuiteFinished timestamp='%' name='check_multiple_failures']}'; + --act + select * + bulk collect into l_output_data + from table(ut3_develop.ut.run('check_multiple_failures',ut3_develop.ut_teamcity_reporter())); + + --assert + ut.expect(ut3_tester_helper.main_helper.table_to_clob(l_output_data)).to_be_like(l_expected); + end; + procedure remove_test_package is pragma autonomous_transaction; begin execute immediate 'drop package check_escape_special_chars'; execute immediate 'drop package check_trims_long_output'; + execute immediate 'drop package check_multiple_failures'; end; end; diff --git a/test/ut3_user/reporters/test_teamcity_reporter.pks b/test/ut3_user/reporters/test_teamcity_reporter.pks index f849751f1..30ae7e26b 100644 --- a/test/ut3_user/reporters/test_teamcity_reporter.pks +++ b/test/ut3_user/reporters/test_teamcity_reporter.pks @@ -15,6 +15,9 @@ create or replace package test_teamcity_reporter as --%test(Trims output so it fits into 4000 chars) procedure trims_long_output; + --%test(Reports failures on multiple expectations) + procedure report_mutiple_expectations; + --%afterall procedure remove_test_package; From 0497dcfadcac637d186fdbc0aa36338d178f597d Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 12 Apr 2023 20:02:14 +0300 Subject: [PATCH 1051/1096] Adding Oracle 23-free-developer-edition --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0ec37efe2..c2fe3971e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -58,6 +58,11 @@ jobs: oracle-sid: 'XE' oracle-version: "gvenzl/oracle-xe:21-slim" oracle-base: '/opt/oracle' + - id: 7 + db_version_name: '23free' + oracle-sid: 'FREEPDB1' + oracle-version: "gvenzl/oracle-free:23-slim" + oracle-base: '/opt/oracle' services: html_checker: From 55a2ecfcb73ff6389058423f41adf9e20279fc1c Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Wed, 12 Apr 2023 21:00:57 +0300 Subject: [PATCH 1052/1096] Adjusted tests for ORacle 23c (change of error message for ORA-06502) --- test/ut3_user/reporters/test_documentation_reporter.pkb | 2 +- test/ut3_user/reporters/test_teamcity_reporter.pkb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/ut3_user/reporters/test_documentation_reporter.pkb b/test/ut3_user/reporters/test_documentation_reporter.pkb index 6ace70c49..2a05679ff 100644 --- a/test/ut3_user/reporters/test_documentation_reporter.pkb +++ b/test/ut3_user/reporters/test_documentation_reporter.pkb @@ -37,7 +37,7 @@ Failures: % % 2) erroring_test - ORA-06502: PL/SQL: numeric or value error: character to number conversion error + ORA-06502: PL/SQL: %: character to number conversion error ORA-06512: at "UT3_USER.TEST_REPORTERS", line 44% ORA-06512: at line 6 Finished in % seconds diff --git a/test/ut3_user/reporters/test_teamcity_reporter.pkb b/test/ut3_user/reporters/test_teamcity_reporter.pkb index cf7a925a1..7c4c1e513 100644 --- a/test/ut3_user/reporters/test_teamcity_reporter.pkb +++ b/test/ut3_user/reporters/test_teamcity_reporter.pkb @@ -77,8 +77,8 @@ create or replace package body test_teamcity_reporter as -%##teamcity[testStdErr timestamp='%' name='ut3_user.test_reporters.erroring_test' out='Test exception:|nORA-06502: PL/SQL: numeric or value error: character to number conversion error|nORA-06512: at "UT3_USER.TEST_REPORTERS", line %|nORA-06512: at %|n'] -%##teamcity[testFailed timestamp='%' details='Test exception:|nORA-06502: PL/SQL: numeric or value error: character to number conversion error|nORA-06512: at "UT3_USER.TEST_REPORTERS", line %|nORA-06512: at %|n' message='Error occured' name='ut3_user.test_reporters.erroring_test'] +%##teamcity[testStdErr timestamp='%' name='ut3_user.test_reporters.erroring_test' out='Test exception:|nORA-06502: PL/SQL: %: character to number conversion error|nORA-06512: at "UT3_USER.TEST_REPORTERS", line %|nORA-06512: at %|n'] +%##teamcity[testFailed timestamp='%' details='Test exception:|nORA-06502: PL/SQL: %: character to number conversion error|nORA-06512: at "UT3_USER.TEST_REPORTERS", line %|nORA-06512: at %|n' message='Error occured' name='ut3_user.test_reporters.erroring_test'] %##teamcity[testFinished timestamp='%' duration='%' name='ut3_user.test_reporters.erroring_test'] %##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3_user.test_reporters.disabled_test'] %##teamcity[testIgnored timestamp='%' name='ut3_user.test_reporters.disabled_test'] From 313d5e9019f1253cc222821c802a11c8cdd7ed1a Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Wed, 12 Apr 2023 18:40:28 -0700 Subject: [PATCH 1053/1096] Stage 1 Resolving PR comments --- source/api/ut_runner.pkb | 8 ++-- source/core/types/ut_stack.tpb | 2 +- source/core/types/ut_stack.tps | 2 +- source/core/ut_suite_builder.pkb | 2 +- source/core/ut_suite_cache_manager.pkb | 62 +++++++++++++------------- source/core/ut_utils.pkb | 55 +++++------------------ source/core/ut_utils.pks | 5 --- test/ut3_tester/core/test_ut_utils.pkb | 21 --------- test/ut3_tester/core/test_ut_utils.pks | 3 -- 9 files changed, 50 insertions(+), 110 deletions(-) diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index 3d4550cf9..3ec2a5393 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -78,9 +78,7 @@ create or replace package body ut_runner is l_run ut_run; l_coverage_schema_names ut_varchar2_rows; l_paths ut_varchar2_list; - l_random_test_order_seed positive; - l_tags varchar2(4000) := a_tags; - + l_random_test_order_seed positive; begin ut_event_manager.initialize(); if a_reporters is not empty then @@ -135,10 +133,10 @@ create or replace package body ut_runner is a_test_file_mappings => set(a_test_file_mappings), a_client_character_set => a_client_character_set, a_random_test_order_seed => l_random_test_order_seed, - a_run_tags => l_tags + a_run_tags => a_tags ); - ut_suite_manager.configure_execution_by_path(l_paths, l_run.items, l_random_test_order_seed, l_tags); + ut_suite_manager.configure_execution_by_path(l_paths, l_run.items, l_random_test_order_seed, a_tags); if a_force_manual_rollback then l_run.set_rollback_type( a_rollback_type => ut_utils.gc_rollback_manual, a_force => true ); end if; diff --git a/source/core/types/ut_stack.tpb b/source/core/types/ut_stack.tpb index a7f7ab0c2..b5f4e8747 100644 --- a/source/core/types/ut_stack.tpb +++ b/source/core/types/ut_stack.tpb @@ -1,7 +1,7 @@ create or replace type body ut_stack as /* utPLSQL - Version 3 - Copyright 2016 - 2021 utPLSQL Project + Copyright 2016 - 2023 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/types/ut_stack.tps b/source/core/types/ut_stack.tps index 7b8c145c2..23112fdde 100644 --- a/source/core/types/ut_stack.tps +++ b/source/core/types/ut_stack.tps @@ -3,7 +3,7 @@ create or replace type ut_stack as object ( tokens ut_varchar2_list, /* utPLSQL - Version 3 - Copyright 2016 - 2021 utPLSQL Project + Copyright 2016 - 2023 utPLSQL Project Licensed under the Apache License, Version 2.0 (the "License"): you may not use this file except in compliance with the License. diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index 4aa2ff915..ebb113370 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -205,7 +205,7 @@ create or replace package body ut_suite_builder is l_tag_items := ut_utils.trim_list_elements(ut_utils.string_to_table(a_tags_ann_text(l_annotation_pos),',')); if l_tag_items is not empty then for i in 1 .. l_tag_items.count loop - if regexp_like(l_tag_items(i),'^[^-!&|](\S)+$') then + if regexp_like(l_tag_items(i),'^[^-](\S)+$') then l_tags_list.extend(); l_tags_list(l_tags_list.last) := l_tag_items(i); else diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index a9153c7bd..858069c8f 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -238,44 +238,46 @@ create or replace package body ut_suite_cache_manager is l_tags_exclude varchar2(4000); l_return_tag varchar2(4000); begin - select listagg( t.column_value,'|') - within group( order by column_value) - into l_tags_include - from table(l_tags) t - where t.column_value not like '-%'; - - select listagg( replace(t.column_value,'-','!'),' & ') - within group( order by column_value) - into l_tags_exclude - from table(l_tags) t - where t.column_value like '-%'; - - l_return_tag:= - case when l_tags_include is not null then - '('||l_tags_include||')' else null end || - case when l_tags_include is not null and l_tags_exclude is not null then - ' & ' else null end || - case when l_tags_exclude is not null then - '('||l_tags_exclude||')' else null end; + if instr(a_tags,',') > 0 or instr(a_tags,'-') > 0 then + + select '('||listagg( t.column_value,'|') + within group( order by column_value)||')' + into l_tags_include + from table(l_tags) t + where t.column_value not like '-%'; + select '('||listagg( replace(t.column_value,'-','!'),' & ') + within group( order by column_value)||')' + into l_tags_exclude + from table(l_tags) t + where t.column_value like '-%'; + + + l_return_tag:= + case + when l_tags_include <> '()' and l_tags_exclude <> '()' + then l_tags_include || ' & ' || l_tags_exclude + when l_tags_include <> '()' + then l_tags_include + when l_tags_exclude <> '()' + then l_tags_exclude + end; + else + l_return_tag := a_tags; + end if; return l_return_tag; end; function create_where_filter(a_tags varchar2 ) return varchar2 is - l_tags varchar2(4000):= replace(a_tags,' '); + l_tags varchar2(4000); begin - if instr(l_tags,',') > 0 or instr(l_tags,'-') > 0 then - l_tags := replace(replace_legacy_tag_notation(l_tags),' '); - end if; + l_tags := replace(replace_legacy_tag_notation(a_tags),' '); l_tags := ut_utils.conv_postfix_to_infix_sql(ut_utils.shunt_logical_expression(l_tags)); - l_tags := REPLACE(l_tags, '|',' or '); - l_tags := REPLACE(l_tags ,'&',' and '); - l_tags := REPLACE(l_tags ,'!','not'); - return l_tags; - exception - when ut_utils.ex_invalid_tag_expression then - raise_application_error(ut_utils.gc_invalid_tag_expression, 'Invalid Tag expression'); + l_tags := replace(l_tags, '|',' or '); + l_tags := replace(l_tags ,'&',' and '); + l_tags := replace(l_tags ,'!','not'); + return l_tags; end; /* diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index a8528fa86..6bcfbfeff 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -28,8 +28,8 @@ create or replace package body ut_utils is * Constants use in postfix and infix transformations */ gc_operators constant ut_varchar2_list := ut_varchar2_list('|','&','!'); - gc_unary_operator constant ut_varchar2_list := ut_varchar2_list('!'); -- right side associative operator - gc_binary_operator constant ut_varchar2_list := ut_varchar2_list('|','&'); -- left side associative operator + gc_unary_operators constant ut_varchar2_list := ut_varchar2_list('!'); -- right side associative operator + gc_binary_operators constant ut_varchar2_list := ut_varchar2_list('|','&'); -- left side associative operator type t_precedence_table is table of number index by varchar2(1); g_precedence t_precedence_table; @@ -1027,9 +1027,9 @@ create or replace package body ut_utils is --Exuecute modified shunting algorithm WHILE (l_idx is not null) loop l_token := l_input_tokens(l_idx); - if (l_token member of gc_operators and l_token member of gc_binary_operator) then + if (l_token member of gc_operators and l_token member of gc_binary_operators) then if not(l_expect_operator) then - raise ex_invalid_tag_expression; + raise_application_error(gc_invalid_tag_expression, 'Invalid Tag expression'); end if; while l_operator_stack.top > 0 and (g_precedence(l_operator_stack.peek) > g_precedence(l_token)) loop l_rnp_tokens.extend; @@ -1038,23 +1038,23 @@ create or replace package body ut_utils is l_operator_stack.push(l_input_tokens(l_idx)); l_expect_operand := true; l_expect_operator:= false; - elsif (l_token member of gc_operators and l_token member of gc_unary_operator) then + elsif (l_token member of gc_operators and l_token member of gc_unary_operators) then if not(l_expect_operand) then - raise ex_invalid_tag_expression; + raise_application_error(gc_invalid_tag_expression, 'Invalid Tag expression'); end if; l_operator_stack.push(l_input_tokens(l_idx)); l_expect_operand := true; l_expect_operator:= false; elsif l_token = '(' then if not(l_expect_operand) then - raise ex_invalid_tag_expression; + raise_application_error(gc_invalid_tag_expression, 'Invalid Tag expression'); end if; l_operator_stack.push(l_input_tokens(l_idx)); l_expect_operand := true; l_expect_operator:= false; elsif l_token = ')' then if not(l_expect_operator) then - raise ex_invalid_tag_expression; + raise_application_error(gc_invalid_tag_expression, 'Invalid Tag expression'); end if; while l_operator_stack.peek <> '(' loop l_rnp_tokens.extend; @@ -1065,7 +1065,7 @@ create or replace package body ut_utils is l_expect_operator:= true; else if not(l_expect_operand) then - raise ex_invalid_tag_expression; + raise_application_error(gc_invalid_tag_expression, 'Invalid Tag expression'); end if; l_rnp_tokens.extend; l_rnp_tokens(l_rnp_tokens.last) :=l_token; @@ -1078,7 +1078,7 @@ create or replace package body ut_utils is while l_operator_stack.peek is not null loop if l_operator_stack.peek in ('(',')') then - raise ex_invalid_tag_expression; + raise_application_error(gc_invalid_tag_expression, 'Invalid Tag expression'); end if; l_rnp_tokens.extend; l_rnp_tokens(l_rnp_tokens.last):=l_operator_stack.pop; @@ -1087,37 +1087,6 @@ create or replace package body ut_utils is return l_rnp_tokens; end shunt_logical_expression; - function convert_postfix_to_infix(a_postfix_exp in ut_varchar2_list) - return varchar2 is - l_infix_stack ut_stack := ut_stack(); - l_right_side varchar2(32767); - l_left_side varchar2(32767); - l_infix_exp varchar2(32767); - l_idx pls_integer; - begin - l_idx := a_postfix_exp.first; - while (l_idx is not null) loop - --If token is operand but also single tag - if a_postfix_exp(l_idx) not member of gc_operators then --its operand - l_infix_stack.push(a_postfix_exp(l_idx)); - --If token is unary operator not - elsif a_postfix_exp(l_idx) member of gc_unary_operator then - l_right_side := l_infix_stack.pop; - l_infix_exp := '('||a_postfix_exp(l_idx)||l_right_side||')'; - l_infix_stack.push(l_infix_exp); - --If token is binary operator - elsif a_postfix_exp(l_idx) member of gc_binary_operator then - l_right_side := l_infix_stack.pop; - l_left_side := l_infix_stack.pop; - l_infix_exp := '('||l_left_side||a_postfix_exp(l_idx)||l_right_side||')'; - l_infix_stack.push(l_infix_exp); - end if; - l_idx := a_postfix_exp.next(l_idx); - end loop; - - return l_infix_stack.pop; - end convert_postfix_to_infix; - function conv_postfix_to_infix_sql(a_postfix_exp in ut_varchar2_list) return varchar2 is l_infix_stack ut_stack := ut_stack(); @@ -1136,12 +1105,12 @@ create or replace package body ut_utils is elsif a_postfix_exp(l_idx) not member of gc_operators then l_infix_stack.push(a_postfix_exp(l_idx)); --If token is unary operator not - elsif a_postfix_exp(l_idx) member of gc_unary_operator then + elsif a_postfix_exp(l_idx) member of gc_unary_operators then l_right_side := l_infix_stack.pop; l_infix_exp := a_postfix_exp(l_idx)||'('||l_right_side||')'; l_infix_stack.push(l_infix_exp); --If token is binary operator - elsif a_postfix_exp(l_idx) member of gc_binary_operator then + elsif a_postfix_exp(l_idx) member of gc_binary_operators then l_right_side := l_infix_stack.pop; l_left_side := l_infix_stack.pop; l_infix_exp := '('||l_left_side||a_postfix_exp(l_idx)||l_right_side||')'; diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 67b09b2f9..a7f7752fb 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -489,11 +489,6 @@ create or replace package ut_utils authid definer is */ function shunt_logical_expression(a_tags in varchar2) return ut_varchar2_list; - /* - * Function that converts postfix notation into infix - */ - function convert_postfix_to_infix(a_postfix_exp in ut_varchar2_list) return varchar2; - /* * Function that converts postfix notation into infix and creating a string of sql filter * that checking a tags collections for tags according to posted logic. diff --git a/test/ut3_tester/core/test_ut_utils.pkb b/test/ut3_tester/core/test_ut_utils.pkb index 22733c4ce..8f3b57fd0 100644 --- a/test/ut3_tester/core/test_ut_utils.pkb +++ b/test/ut3_tester/core/test_ut_utils.pkb @@ -511,27 +511,6 @@ end; ut.expect(l_postfix_string).to_equal('a!b|'); end; - procedure test_conv_from_rpn_to_infix is - l_postfix_rpn ut3_develop.ut_varchar2_list; - l_infix_string varchar2(4000); - begin - l_postfix_rpn := ut3_develop.ut_varchar2_list('A'); - l_infix_string := ut3_develop.ut_utils.convert_postfix_to_infix(l_postfix_rpn); - ut.expect(l_infix_string).to_equal('A'); - - l_postfix_rpn := ut3_develop.ut_varchar2_list('A','B','|'); - l_infix_string := ut3_develop.ut_utils.convert_postfix_to_infix(l_postfix_rpn); - ut.expect(l_infix_string).to_equal('(A|B)'); - - l_postfix_rpn := ut3_develop.ut_varchar2_list('a','b','|','c','d','&','|'); - l_infix_string := ut3_develop.ut_utils.convert_postfix_to_infix(l_postfix_rpn); - ut.expect(l_infix_string).to_equal('((a|b)|(c&d))'); - - l_postfix_rpn := ut3_develop.ut_varchar2_list('a','b','!','|'); - l_infix_string := ut3_develop.ut_utils.convert_postfix_to_infix(l_postfix_rpn); - ut.expect(l_infix_string).to_equal('(a|(!b))'); - end; - procedure conv_from_rpn_to_sql_filter is l_postfix_rpn ut3_develop.ut_varchar2_list; l_infix_string varchar2(4000); diff --git a/test/ut3_tester/core/test_ut_utils.pks b/test/ut3_tester/core/test_ut_utils.pks index 1561e1136..a58082be0 100644 --- a/test/ut3_tester/core/test_ut_utils.pks +++ b/test/ut3_tester/core/test_ut_utils.pks @@ -160,9 +160,6 @@ create or replace package test_ut_utils is --%test( Test conversion of expression into Reverse Polish Notation) procedure test_conversion_to_rpn; - --%test( Test conversion of expression from Reverse Polish Notation into infix) - procedure test_conv_from_rpn_to_infix; - --%test( Test conversion of expression from Reverse Polish Notation into custom where filter for SQL) procedure conv_from_rpn_to_sql_filter; From 02a071cb43799b8b68aa12cddb8cba757e6654a2 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Thu, 13 Apr 2023 16:47:00 -0700 Subject: [PATCH 1054/1096] Separate tag logic. --- source/core/ut_suite_cache_manager.pkb | 143 +-------- source/core/ut_suite_cache_manager.pks | 9 +- source/core/ut_suite_manager.pkb | 15 +- source/core/ut_suite_tag_filter.pkb | 288 ++++++++++++++++++ source/core/ut_suite_tag_filter.pks | 48 +++ source/core/ut_utils.pkb | 140 --------- source/core/ut_utils.pks | 18 -- source/install.sql | 2 + test/install_ut3_tester_tests.sql | 2 + .../core/test_ut_suite_tag_filter.pkb | 42 +++ .../core/test_ut_suite_tag_filter.pks | 13 + test/ut3_tester/core/test_ut_utils.pkb | 39 --- test/ut3_tester/core/test_ut_utils.pks | 6 - 13 files changed, 423 insertions(+), 342 deletions(-) create mode 100644 source/core/ut_suite_tag_filter.pkb create mode 100644 source/core/ut_suite_tag_filter.pks create mode 100644 test/ut3_tester/core/test_ut_suite_tag_filter.pkb create mode 100644 test/ut3_tester/core/test_ut_suite_tag_filter.pks diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index 858069c8f..3bb679517 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -220,121 +220,7 @@ create or replace package body ut_suite_cache_manager is and c.name = nvl(upper(sp.procedure_name),c.name)))) where r_num =1; return l_suite_items; end; - - /* - To support a legact tag notation - , = OR - - = NOT - we will perform a replace of that characters into - new notation. - | = OR - & = AND - ! = NOT - */ - function replace_legacy_tag_notation(a_tags varchar2 - ) return varchar2 is - l_tags ut_varchar2_list := ut_utils.string_to_table(a_tags,','); - l_tags_include varchar2(4000); - l_tags_exclude varchar2(4000); - l_return_tag varchar2(4000); - begin - if instr(a_tags,',') > 0 or instr(a_tags,'-') > 0 then - - select '('||listagg( t.column_value,'|') - within group( order by column_value)||')' - into l_tags_include - from table(l_tags) t - where t.column_value not like '-%'; - select '('||listagg( replace(t.column_value,'-','!'),' & ') - within group( order by column_value)||')' - into l_tags_exclude - from table(l_tags) t - where t.column_value like '-%'; - - - l_return_tag:= - case - when l_tags_include <> '()' and l_tags_exclude <> '()' - then l_tags_include || ' & ' || l_tags_exclude - when l_tags_include <> '()' - then l_tags_include - when l_tags_exclude <> '()' - then l_tags_exclude - end; - else - l_return_tag := a_tags; - end if; - return l_return_tag; - end; - - function create_where_filter(a_tags varchar2 - ) return varchar2 is - l_tags varchar2(4000); - begin - l_tags := replace(replace_legacy_tag_notation(a_tags),' '); - l_tags := ut_utils.conv_postfix_to_infix_sql(ut_utils.shunt_logical_expression(l_tags)); - l_tags := replace(l_tags, '|',' or '); - l_tags := replace(l_tags ,'&',' and '); - l_tags := replace(l_tags ,'!','not'); - return l_tags; - end; - - /* - Having a base set of suites we will do a further filter down if there are - any tags defined. - */ - function get_tags_suites ( - a_suite_items ut_suite_cache_rows, - a_tags varchar2 - ) return ut_suite_cache_rows is - l_suite_tags ut_suite_cache_rows := ut_suite_cache_rows(); - l_sql varchar2(32000); - l_tags varchar2(4000):= create_where_filter(a_tags); - begin - l_sql := - q'[ -with - suites_mv as ( - select c.id,value(c) as obj,c.path as path,c.self_type,c.object_owner,c.tags - from table(:suite_items) c - ), - suites_matching_expr as ( - select c.id,c.path as path,c.self_type,c.object_owner,c.tags - from suites_mv c - where c.self_type in ('UT_SUITE','UT_CONTEXT') - and ]'||l_tags||q'[ - ), - tests_matching_expr as ( - select c.id,c.path as path,c.self_type,c.object_owner,c.tags - from suites_mv c where c.self_type in ('UT_TEST') - and ]'||l_tags||q'[ - ), - tests_with_tags_inh_from_suite as ( - select c.id,c.self_type,c.path,c.tags multiset union distinct t.tags tags,c.object_owner - from suites_mv c join suites_matching_expr t - on (c.path||'.' like t.path || '.%' /*all descendants and self*/ and c.object_owner = t.object_owner) - ), - tests_with_tags_prom_to_suite as ( - select c.id,c.self_type,c.path,c.tags multiset union distinct t.tags tags,c.object_owner - from suites_mv c join tests_matching_expr t - on (t.path||'.' like c.path || '.%' /*all ancestors and self*/ and c.object_owner = t.object_owner) - ) - select obj from suites_mv c, - (select id,row_number() over (partition by id order by id) r_num from - (select id - from tests_with_tags_prom_to_suite tst - where ]'||l_tags||q'[ - union all - select id from tests_with_tags_inh_from_suite tst - where ]'||l_tags||q'[ - ) - ) t where c.id = t.id and r_num = 1 ]'; - - execute immediate l_sql bulk collect into l_suite_tags using a_suite_items; - return l_suite_tags; - end; - /* We will sort a suites in hierarchical structure. Sorting from bottom to top so when we consolidate @@ -387,30 +273,29 @@ with end; function get_cached_suite_rows( - a_schema_paths ut_path_items, - a_random_seed positive := null, - a_tags varchar2 := null + a_suites_filtered ut_suite_cache_rows ) return ut_suite_cache_rows is l_results ut_suite_cache_rows := ut_suite_cache_rows(); - l_suite_items ut_suite_cache_rows := ut_suite_cache_rows(); - l_schema_paths ut_path_items; - l_tags varchar2(4000) := a_tags; begin - l_schema_paths := a_schema_paths; - l_suite_items := get_suite_items(a_schema_paths); - if length(l_tags) > 0 then - l_suite_items := get_tags_suites(l_suite_items,l_tags); - end if; - - open c_get_bulk_cache_suite(l_suite_items); + open c_get_bulk_cache_suite(a_suites_filtered); fetch c_get_bulk_cache_suite bulk collect into l_results; close c_get_bulk_cache_suite; return l_results; end; - + function get_cached_suites( + a_schema_paths ut_path_items, + a_random_seed positive := null + ) return ut_suite_cache_rows is + l_suite_items ut_suite_cache_rows := ut_suite_cache_rows(); + l_schema_paths ut_path_items; + begin + l_schema_paths := a_schema_paths; + l_suite_items := get_suite_items(a_schema_paths); + return l_suite_items; + end; function get_schema_parse_time(a_schema_name varchar2) return timestamp result_cache is l_cache_parse_time timestamp; @@ -558,7 +443,7 @@ with a_schema_paths ut_path_items ) return ut_suite_cache_rows is begin - return get_cached_suite_rows( a_schema_paths ); + return get_cached_suite_rows(get_cached_suites( a_schema_paths )); end; function get_suite_items_info( diff --git a/source/core/ut_suite_cache_manager.pks b/source/core/ut_suite_cache_manager.pks index 7f06e95eb..c217abeed 100644 --- a/source/core/ut_suite_cache_manager.pks +++ b/source/core/ut_suite_cache_manager.pks @@ -55,11 +55,14 @@ create or replace package ut_suite_cache_manager authid definer is * Not to be used publicly. Used internally for building suites at runtime. */ function get_cached_suite_rows( + a_suites_filtered ut_suite_cache_rows + ) return ut_suite_cache_rows; + + function get_cached_suites( a_schema_paths ut_path_items, - a_random_seed positive := null, - a_tags varchar2 := null + a_random_seed positive := null ) return ut_suite_cache_rows; - + function get_schema_paths(a_paths in ut_varchar2_list) return ut_path_items; /* diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index 0f8629ded..f8a2e002c 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -355,17 +355,18 @@ create or replace package body ut_suite_manager is a_tags varchar2 := null, a_skip_all_objects boolean := false ) return t_cached_suites_cursor is - l_unfiltered_rows ut_suite_cache_rows; - l_filtered_rows ut_suite_cache_rows; - l_result t_cached_suites_cursor; + l_unfiltered_rows ut_suite_cache_rows; + l_tag_filter_applied ut_suite_cache_rows; + l_filtered_rows ut_suite_cache_rows; + l_result t_cached_suites_cursor; begin - l_unfiltered_rows := ut_suite_cache_manager.get_cached_suite_rows( + l_unfiltered_rows := ut_suite_cache_manager.get_cached_suites( a_schema_paths, - a_random_seed, - a_tags + a_random_seed ); - l_filtered_rows := get_filtered_cursor(l_unfiltered_rows,a_skip_all_objects); + l_tag_filter_applied := ut_suite_tag_filter.apply(l_unfiltered_rows,a_tags); + l_filtered_rows := get_filtered_cursor(ut_suite_cache_manager.get_cached_suite_rows(l_tag_filter_applied),a_skip_all_objects); reconcile_paths_and_suites(a_schema_paths,l_filtered_rows); ut_suite_cache_manager.sort_and_randomize_tests(l_filtered_rows,a_random_seed); diff --git a/source/core/ut_suite_tag_filter.pkb b/source/core/ut_suite_tag_filter.pkb new file mode 100644 index 000000000..f1e055a27 --- /dev/null +++ b/source/core/ut_suite_tag_filter.pkb @@ -0,0 +1,288 @@ +create or replace package body ut_suite_tag_filter is + /* + utPLSQL - Version 3 + Copyright 2016 - 2023 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + /** + * Constants use in postfix and infix transformations + */ + gc_operators constant ut_varchar2_list := ut_varchar2_list('|','&','!'); + gc_unary_operators constant ut_varchar2_list := ut_varchar2_list('!'); -- right side associative operator + gc_binary_operators constant ut_varchar2_list := ut_varchar2_list('|','&'); -- left side associative operator + + type t_precedence_table is table of number index by varchar2(1); + g_precedence t_precedence_table; + + function tokenize_tags_string(a_tags in varchar2) return ut_varchar2_list is + l_tags_tokens ut_varchar2_list := ut_varchar2_list(); + begin + --Tokenize a string into operators and tags + select regexp_substr(a_tags,'([^!()|&]+)|([!()|&])', 1, level) as string_parts + bulk collect into l_tags_tokens + from dual connect by regexp_substr (a_tags, '([^!()|&]+)|([!()|&])', 1, level) is not null; + + return l_tags_tokens; + end; + + /* + To support a legact tag notation + , = OR + - = NOT + we will perform a replace of that characters into + new notation. + | = OR + & = AND + ! = NOT + */ + function replace_legacy_tag_notation(a_tags varchar2 + ) return varchar2 is + l_tags ut_varchar2_list := ut_utils.string_to_table(a_tags,','); + l_tags_include varchar2(4000); + l_tags_exclude varchar2(4000); + l_return_tag varchar2(4000); + begin + if instr(a_tags,',') > 0 or instr(a_tags,'-') > 0 then + + select '('||listagg( t.column_value,'|') + within group( order by column_value)||')' + into l_tags_include + from table(l_tags) t + where t.column_value not like '-%'; + + select '('||listagg( replace(t.column_value,'-','!'),' & ') + within group( order by column_value)||')' + into l_tags_exclude + from table(l_tags) t + where t.column_value like '-%'; + + + l_return_tag:= + case + when l_tags_include <> '()' and l_tags_exclude <> '()' + then l_tags_include || ' & ' || l_tags_exclude + when l_tags_include <> '()' + then l_tags_include + when l_tags_exclude <> '()' + then l_tags_exclude + end; + else + l_return_tag := a_tags; + end if; + return l_return_tag; + end; + + /* + https://stackoverflow.com/questions/29634992/shunting-yard-validate-expression + */ + function shunt_logical_expression(a_tags in varchar2) return ut_varchar2_list is + l_operator_stack ut_stack := ut_stack(); + l_input_tokens ut_varchar2_list := tokenize_tags_string(a_tags); + l_rnp_tokens ut_varchar2_list := ut_varchar2_list(); + l_token varchar2(32767); + l_expect_operand boolean := true; + l_expect_operator boolean := false; + l_idx pls_integer; + begin + l_idx := l_input_tokens.first; + --Exuecute modified shunting algorithm + WHILE (l_idx is not null) loop + l_token := l_input_tokens(l_idx); + if (l_token member of gc_operators and l_token member of gc_binary_operators) then + if not(l_expect_operator) then + raise_application_error(ut_utils.gc_invalid_tag_expression, 'Invalid Tag expression'); + end if; + while l_operator_stack.top > 0 and (g_precedence(l_operator_stack.peek) > g_precedence(l_token)) loop + l_rnp_tokens.extend; + l_rnp_tokens(l_rnp_tokens.last) := l_operator_stack.pop; + end loop; + l_operator_stack.push(l_input_tokens(l_idx)); + l_expect_operand := true; + l_expect_operator:= false; + elsif (l_token member of gc_operators and l_token member of gc_unary_operators) then + if not(l_expect_operand) then + raise_application_error(ut_utils.gc_invalid_tag_expression, 'Invalid Tag expression'); + end if; + l_operator_stack.push(l_input_tokens(l_idx)); + l_expect_operand := true; + l_expect_operator:= false; + elsif l_token = '(' then + if not(l_expect_operand) then + raise_application_error(ut_utils.gc_invalid_tag_expression, 'Invalid Tag expression'); + end if; + l_operator_stack.push(l_input_tokens(l_idx)); + l_expect_operand := true; + l_expect_operator:= false; + elsif l_token = ')' then + if not(l_expect_operator) then + raise_application_error(ut_utils.gc_invalid_tag_expression, 'Invalid Tag expression'); + end if; + while l_operator_stack.peek <> '(' loop + l_rnp_tokens.extend; + l_rnp_tokens(l_rnp_tokens.last) := l_operator_stack.pop; + end loop; + l_operator_stack.pop; --Pop the open bracket and discard it + l_expect_operand := false; + l_expect_operator:= true; + else + if not(l_expect_operand) then + raise_application_error(ut_utils.gc_invalid_tag_expression, 'Invalid Tag expression'); + end if; + l_rnp_tokens.extend; + l_rnp_tokens(l_rnp_tokens.last) :=l_token; + l_expect_operator := true; + l_expect_operand := false; + end if; + + l_idx := l_input_tokens.next(l_idx); + end loop; + + while l_operator_stack.peek is not null loop + if l_operator_stack.peek in ('(',')') then + raise_application_error(ut_utils.gc_invalid_tag_expression, 'Invalid Tag expression'); + end if; + l_rnp_tokens.extend; + l_rnp_tokens(l_rnp_tokens.last):=l_operator_stack.pop; + end loop; + + return l_rnp_tokens; + end shunt_logical_expression; + + function conv_postfix_to_infix_sql(a_postfix_exp in ut_varchar2_list) + return varchar2 is + l_infix_stack ut_stack := ut_stack(); + l_right_side varchar2(32767); + l_left_side varchar2(32767); + l_infix_exp varchar2(32767); + l_member_token varchar2(20) := ' member of tags'; + l_idx pls_integer; + begin + l_idx := a_postfix_exp.first; + while ( l_idx is not null) loop + --If token is operand but also single tag + if regexp_count(a_postfix_exp(l_idx),'[!()|&]') = 0 then + l_infix_stack.push(q'[']'||a_postfix_exp(l_idx)||q'[']'||l_member_token); + --If token is operand but containing other expressions + elsif a_postfix_exp(l_idx) not member of gc_operators then + l_infix_stack.push(a_postfix_exp(l_idx)); + --If token is unary operator not + elsif a_postfix_exp(l_idx) member of gc_unary_operators then + l_right_side := l_infix_stack.pop; + l_infix_exp := a_postfix_exp(l_idx)||'('||l_right_side||')'; + l_infix_stack.push(l_infix_exp); + --If token is binary operator + elsif a_postfix_exp(l_idx) member of gc_binary_operators then + l_right_side := l_infix_stack.pop; + l_left_side := l_infix_stack.pop; + l_infix_exp := '('||l_left_side||a_postfix_exp(l_idx)||l_right_side||')'; + l_infix_stack.push(l_infix_exp); + end if; + l_idx := a_postfix_exp.next(l_idx); + end loop; + + return l_infix_stack.pop; + end conv_postfix_to_infix_sql; + + function create_where_filter(a_tags varchar2 + ) return varchar2 is + l_tags varchar2(4000); + begin + l_tags := replace(replace_legacy_tag_notation(a_tags),' '); + l_tags := conv_postfix_to_infix_sql(shunt_logical_expression(l_tags)); + l_tags := replace(l_tags, '|',' or '); + l_tags := replace(l_tags ,'&',' and '); + l_tags := replace(l_tags ,'!','not'); + return l_tags; + end; + + + /* + Having a base set of suites we will do a further filter down if there are + any tags defined. + */ + function get_tags_suites ( + a_suite_items ut_suite_cache_rows, + a_tags varchar2 + ) return ut_suite_cache_rows is + l_suite_tags ut_suite_cache_rows := ut_suite_cache_rows(); + l_sql varchar2(32000); + l_tags varchar2(4000):= create_where_filter(a_tags); + begin + l_sql := + q'[ +with + suites_mv as ( + select c.id,value(c) as obj,c.path as path,c.self_type,c.object_owner,c.tags + from table(:suite_items) c + ), + suites_matching_expr as ( + select c.id,c.path as path,c.self_type,c.object_owner,c.tags + from suites_mv c + where c.self_type in ('UT_SUITE','UT_CONTEXT') + and ]'||l_tags||q'[ + ), + tests_matching_expr as ( + select c.id,c.path as path,c.self_type,c.object_owner,c.tags + from suites_mv c where c.self_type in ('UT_TEST') + and ]'||l_tags||q'[ + ), + tests_with_tags_inh_from_suite as ( + select c.id,c.self_type,c.path,c.tags multiset union distinct t.tags tags,c.object_owner + from suites_mv c join suites_matching_expr t + on (c.path||'.' like t.path || '.%' /*all descendants and self*/ and c.object_owner = t.object_owner) + ), + tests_with_tags_prom_to_suite as ( + select c.id,c.self_type,c.path,c.tags multiset union distinct t.tags tags,c.object_owner + from suites_mv c join tests_matching_expr t + on (t.path||'.' like c.path || '.%' /*all ancestors and self*/ and c.object_owner = t.object_owner) + ) + select obj from suites_mv c, + (select id,row_number() over (partition by id order by id) r_num from + (select id + from tests_with_tags_prom_to_suite tst + where ]'||l_tags||q'[ + union all + select id from tests_with_tags_inh_from_suite tst + where ]'||l_tags||q'[ + ) + ) t where c.id = t.id and r_num = 1 ]'; + + execute immediate l_sql bulk collect into l_suite_tags using a_suite_items; + return l_suite_tags; + end; + + function apply( + a_unfiltered_rows ut_suite_cache_rows, + a_tags varchar2 := null + ) return ut_suite_cache_rows is + l_suite_items ut_suite_cache_rows := a_unfiltered_rows; + begin + if length(a_tags) > 0 then + l_suite_items := get_tags_suites(l_suite_items,a_tags); + end if; + + return l_suite_items; + end; + +begin + --Define operators precedence + g_precedence('!'):=4; + g_precedence('&'):=3; + g_precedence('|'):=2; + g_precedence(')'):=1; + g_precedence('('):=1; + +end ut_suite_tag_filter; +/ diff --git a/source/core/ut_suite_tag_filter.pks b/source/core/ut_suite_tag_filter.pks new file mode 100644 index 000000000..787c72603 --- /dev/null +++ b/source/core/ut_suite_tag_filter.pks @@ -0,0 +1,48 @@ +create or replace package ut_suite_tag_filter authid definer is + /* + utPLSQL - Version 3 + Copyright 2016 - 2023 utPLSQL Project + + Licensed under the Apache License, Version 2.0 (the "License"): + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ + + /** + * Package that will filter suites by tags + * + */ + + /* + * Return table of tokens character by character + */ + function tokenize_tags_string(a_tags in varchar2) return ut_varchar2_list; + + /* + * Function that uses Dijkstra algorithm to parse mathematical and logical expression + * and return a list of elements in Reverse Polish Notation ( postfix ) + * As part of execution it will validate expression. + */ + function shunt_logical_expression(a_tags in varchar2) return ut_varchar2_list; + + /* + * Function that converts postfix notation into infix and creating a string of sql filter + * that checking a tags collections for tags according to posted logic. + */ + function conv_postfix_to_infix_sql(a_postfix_exp in ut_varchar2_list) return varchar2; + + function apply( + a_unfiltered_rows ut_suite_cache_rows, + a_tags varchar2 := null + ) return ut_suite_cache_rows; + +end ut_suite_tag_filter; +/ diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 6bcfbfeff..6f972e11c 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -24,15 +24,6 @@ create or replace package body ut_utils is gc_full_valid_xml_name constant varchar2(50) := '^([_a-zA-Z])([_a-zA-Z0-9\.-])*$'; gc_owner_hash constant integer(11) := dbms_utility.get_hash_value( ut_owner(), 0, power(2,31)-1); - /** - * Constants use in postfix and infix transformations - */ - gc_operators constant ut_varchar2_list := ut_varchar2_list('|','&','!'); - gc_unary_operators constant ut_varchar2_list := ut_varchar2_list('!'); -- right side associative operator - gc_binary_operators constant ut_varchar2_list := ut_varchar2_list('|','&'); -- left side associative operator - - type t_precedence_table is table of number index by varchar2(1); - g_precedence t_precedence_table; function surround_with(a_value varchar2, a_quote_char varchar2) return varchar2 is begin @@ -999,136 +990,5 @@ create or replace package body ut_utils is return l_result; end; - - function tokenize_tags_string(a_tags in varchar2) return ut_varchar2_list is - l_tags_tokens ut_varchar2_list := ut_varchar2_list(); - begin - --Tokenize a string into operators and tags - select regexp_substr(a_tags,'([^!()|&]+)|([!()|&])', 1, level) as string_parts - bulk collect into l_tags_tokens - from dual connect by regexp_substr (a_tags, '([^!()|&]+)|([!()|&])', 1, level) is not null; - - return l_tags_tokens; - end; - - /* - https://stackoverflow.com/questions/29634992/shunting-yard-validate-expression - */ - function shunt_logical_expression(a_tags in varchar2) return ut_varchar2_list is - l_operator_stack ut_stack := ut_stack(); - l_input_tokens ut_varchar2_list := tokenize_tags_string(a_tags); - l_rnp_tokens ut_varchar2_list := ut_varchar2_list(); - l_token varchar2(32767); - l_expect_operand boolean := true; - l_expect_operator boolean := false; - l_idx pls_integer; - begin - l_idx := l_input_tokens.first; - --Exuecute modified shunting algorithm - WHILE (l_idx is not null) loop - l_token := l_input_tokens(l_idx); - if (l_token member of gc_operators and l_token member of gc_binary_operators) then - if not(l_expect_operator) then - raise_application_error(gc_invalid_tag_expression, 'Invalid Tag expression'); - end if; - while l_operator_stack.top > 0 and (g_precedence(l_operator_stack.peek) > g_precedence(l_token)) loop - l_rnp_tokens.extend; - l_rnp_tokens(l_rnp_tokens.last) := l_operator_stack.pop; - end loop; - l_operator_stack.push(l_input_tokens(l_idx)); - l_expect_operand := true; - l_expect_operator:= false; - elsif (l_token member of gc_operators and l_token member of gc_unary_operators) then - if not(l_expect_operand) then - raise_application_error(gc_invalid_tag_expression, 'Invalid Tag expression'); - end if; - l_operator_stack.push(l_input_tokens(l_idx)); - l_expect_operand := true; - l_expect_operator:= false; - elsif l_token = '(' then - if not(l_expect_operand) then - raise_application_error(gc_invalid_tag_expression, 'Invalid Tag expression'); - end if; - l_operator_stack.push(l_input_tokens(l_idx)); - l_expect_operand := true; - l_expect_operator:= false; - elsif l_token = ')' then - if not(l_expect_operator) then - raise_application_error(gc_invalid_tag_expression, 'Invalid Tag expression'); - end if; - while l_operator_stack.peek <> '(' loop - l_rnp_tokens.extend; - l_rnp_tokens(l_rnp_tokens.last) := l_operator_stack.pop; - end loop; - l_operator_stack.pop; --Pop the open bracket and discard it - l_expect_operand := false; - l_expect_operator:= true; - else - if not(l_expect_operand) then - raise_application_error(gc_invalid_tag_expression, 'Invalid Tag expression'); - end if; - l_rnp_tokens.extend; - l_rnp_tokens(l_rnp_tokens.last) :=l_token; - l_expect_operator := true; - l_expect_operand := false; - end if; - - l_idx := l_input_tokens.next(l_idx); - end loop; - - while l_operator_stack.peek is not null loop - if l_operator_stack.peek in ('(',')') then - raise_application_error(gc_invalid_tag_expression, 'Invalid Tag expression'); - end if; - l_rnp_tokens.extend; - l_rnp_tokens(l_rnp_tokens.last):=l_operator_stack.pop; - end loop; - - return l_rnp_tokens; - end shunt_logical_expression; - - function conv_postfix_to_infix_sql(a_postfix_exp in ut_varchar2_list) - return varchar2 is - l_infix_stack ut_stack := ut_stack(); - l_right_side varchar2(32767); - l_left_side varchar2(32767); - l_infix_exp varchar2(32767); - l_member_token varchar2(20) := ' member of tags'; - l_idx pls_integer; - begin - l_idx := a_postfix_exp.first; - while ( l_idx is not null) loop - --If token is operand but also single tag - if regexp_count(a_postfix_exp(l_idx),'[!()|&]') = 0 then - l_infix_stack.push(q'[']'||a_postfix_exp(l_idx)||q'[']'||l_member_token); - --If token is operand but containing other expressions - elsif a_postfix_exp(l_idx) not member of gc_operators then - l_infix_stack.push(a_postfix_exp(l_idx)); - --If token is unary operator not - elsif a_postfix_exp(l_idx) member of gc_unary_operators then - l_right_side := l_infix_stack.pop; - l_infix_exp := a_postfix_exp(l_idx)||'('||l_right_side||')'; - l_infix_stack.push(l_infix_exp); - --If token is binary operator - elsif a_postfix_exp(l_idx) member of gc_binary_operators then - l_right_side := l_infix_stack.pop; - l_left_side := l_infix_stack.pop; - l_infix_exp := '('||l_left_side||a_postfix_exp(l_idx)||l_right_side||')'; - l_infix_stack.push(l_infix_exp); - end if; - l_idx := a_postfix_exp.next(l_idx); - end loop; - - return l_infix_stack.pop; - end conv_postfix_to_infix_sql; - -begin - --Define operator precedence - g_precedence('!'):=4; - g_precedence('&'):=3; - g_precedence('|'):=2; - g_precedence(')'):=1; - g_precedence('('):=1; - end ut_utils; / diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index a7f7752fb..b60fc4cdf 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -477,23 +477,5 @@ create or replace package ut_utils authid definer is */ function interval_to_text(a_interval yminterval_unconstrained) return varchar2; - /* - * Return table of tokens character by character - */ - function tokenize_tags_string(a_tags in varchar2) return ut_varchar2_list; - - /* - * Function that uses Dijkstra algorithm to parse mathematical and logical expression - * and return a list of elements in Reverse Polish Notation ( postfix ) - * As part of execution it will validate expression. - */ - function shunt_logical_expression(a_tags in varchar2) return ut_varchar2_list; - - /* - * Function that converts postfix notation into infix and creating a string of sql filter - * that checking a tags collections for tags according to posted logic. - */ - function conv_postfix_to_infix_sql(a_postfix_exp in ut_varchar2_list) return varchar2; - end ut_utils; / diff --git a/source/install.sql b/source/install.sql index a54977f94..827213e6c 100644 --- a/source/install.sql +++ b/source/install.sql @@ -155,6 +155,8 @@ create or replace context &&ut3_owner._info using &&ut3_owner..ut_session_contex @@install_component.sql 'core/ut_suite_cache_seq.sql' @@install_component.sql 'core/ut_suite_cache.sql' +@@install_component.sql 'core/ut_suite_tag_filter.pks' +@@install_component.sql 'core/ut_suite_tag_filter.pkb' @@install_component.sql 'core/ut_suite_cache_manager.pks' @@install_component.sql 'core/ut_suite_cache_manager.pkb' @@install_component.sql 'core/ut_suite_builder.pks' diff --git a/test/install_ut3_tester_tests.sql b/test/install_ut3_tester_tests.sql index 8163a39f2..cc96b2b64 100644 --- a/test/install_ut3_tester_tests.sql +++ b/test/install_ut3_tester_tests.sql @@ -17,6 +17,7 @@ alter session set plsql_optimize_level=0; @@ut3_tester/core/annotations/test_annot_disabled_reason.pks @@ut3_tester/core/expectations/test_expectation_processor.pks @@ut3_tester/core/test_ut_utils.pks +@@ut3_tester/core/test_ut_suite_tag_filter.pks @@ut3_tester/core/test_ut_test.pks @@ut3_tester/core/test_ut_suite.pks @@ut3_tester/core/test_ut_executable.pks @@ -35,6 +36,7 @@ alter session set plsql_optimize_level=0; @@ut3_tester/core/annotations/test_annot_disabled_reason.pkb @@ut3_tester/core/expectations/test_expectation_processor.pkb @@ut3_tester/core/test_ut_utils.pkb +@@ut3_tester/core/test_ut_suite_tag_filter.pkb @@ut3_tester/core/test_ut_test.pkb @@ut3_tester/core/test_ut_suite.pkb @@ut3_tester/core/test_ut_executable.pkb diff --git a/test/ut3_tester/core/test_ut_suite_tag_filter.pkb b/test/ut3_tester/core/test_ut_suite_tag_filter.pkb new file mode 100644 index 000000000..a1d0be1f7 --- /dev/null +++ b/test/ut3_tester/core/test_ut_suite_tag_filter.pkb @@ -0,0 +1,42 @@ +create or replace package body test_ut_suite_tag_filter is + + procedure test_conversion_to_rpn is + l_postfix ut3_develop.ut_varchar2_list; + l_postfix_string varchar2(4000); + begin + l_postfix := ut3_develop.ut_suite_tag_filter.shunt_logical_expression('A'); + l_postfix_string := ut3_develop.ut_utils.table_to_clob(l_postfix,''); + ut.expect(l_postfix_string).to_equal('A'); + + l_postfix := ut3_develop.ut_suite_tag_filter.shunt_logical_expression('A|B'); + l_postfix_string := ut3_develop.ut_utils.table_to_clob(l_postfix,''); + ut.expect(l_postfix_string).to_equal('AB|'); + + l_postfix := ut3_develop.ut_suite_tag_filter.shunt_logical_expression('(a|b)|c&d'); + l_postfix_string := ut3_develop.ut_utils.table_to_clob(l_postfix,''); + ut.expect(l_postfix_string).to_equal('ab|cd&|'); + + l_postfix := ut3_develop.ut_suite_tag_filter.shunt_logical_expression('!a|b'); + l_postfix_string := ut3_develop.ut_utils.table_to_clob(l_postfix,''); + ut.expect(l_postfix_string).to_equal('a!b|'); + end; + + procedure conv_from_rpn_to_sql_filter is + l_postfix_rpn ut3_develop.ut_varchar2_list; + l_infix_string varchar2(4000); + begin + l_postfix_rpn := ut3_develop.ut_varchar2_list('A'); + l_infix_string := ut3_develop.ut_suite_tag_filter.conv_postfix_to_infix_sql(l_postfix_rpn); + ut.expect(l_infix_string).to_equal(q'['A' member of tags]'); + + l_postfix_rpn := ut3_develop.ut_varchar2_list('A','B','|'); + l_infix_string := ut3_develop.ut_suite_tag_filter.conv_postfix_to_infix_sql(l_postfix_rpn); + ut.expect(l_infix_string).to_equal(q'[('A' member of tags|'B' member of tags)]'); + + l_postfix_rpn := ut3_develop.ut_varchar2_list('a','b','!','|'); + l_infix_string := ut3_develop.ut_suite_tag_filter.conv_postfix_to_infix_sql(l_postfix_rpn); + ut.expect(l_infix_string).to_equal(q'[('a' member of tags|!('b' member of tags))]'); + end; + +end test_ut_suite_tag_filter; +/ diff --git a/test/ut3_tester/core/test_ut_suite_tag_filter.pks b/test/ut3_tester/core/test_ut_suite_tag_filter.pks new file mode 100644 index 000000000..093fab856 --- /dev/null +++ b/test/ut3_tester/core/test_ut_suite_tag_filter.pks @@ -0,0 +1,13 @@ +create or replace package test_ut_suite_tag_filter is + + --%suite(ut_suite_tag_filter) + --%suitepath(utplsql.ut3_tester.core) + + --%test( Test conversion of expression into Reverse Polish Notation) + procedure test_conversion_to_rpn; + + --%test( Test conversion of expression from Reverse Polish Notation into custom where filter for SQL) + procedure conv_from_rpn_to_sql_filter; + +end test_ut_suite_tag_filter; +/ diff --git a/test/ut3_tester/core/test_ut_utils.pkb b/test/ut3_tester/core/test_ut_utils.pkb index 8f3b57fd0..ec7e4f403 100644 --- a/test/ut3_tester/core/test_ut_utils.pkb +++ b/test/ut3_tester/core/test_ut_utils.pkb @@ -489,44 +489,5 @@ end; ut.expect(l_expected).to_equal(l_actual); end; - - procedure test_conversion_to_rpn is - l_postfix ut3_develop.ut_varchar2_list; - l_postfix_string varchar2(4000); - begin - l_postfix := ut3_develop.ut_utils.shunt_logical_expression('A'); - l_postfix_string := ut3_develop.ut_utils.table_to_clob(l_postfix,''); - ut.expect(l_postfix_string).to_equal('A'); - - l_postfix := ut3_develop.ut_utils.shunt_logical_expression('A|B'); - l_postfix_string := ut3_develop.ut_utils.table_to_clob(l_postfix,''); - ut.expect(l_postfix_string).to_equal('AB|'); - - l_postfix := ut3_develop.ut_utils.shunt_logical_expression('(a|b)|c&d'); - l_postfix_string := ut3_develop.ut_utils.table_to_clob(l_postfix,''); - ut.expect(l_postfix_string).to_equal('ab|cd&|'); - - l_postfix := ut3_develop.ut_utils.shunt_logical_expression('!a|b'); - l_postfix_string := ut3_develop.ut_utils.table_to_clob(l_postfix,''); - ut.expect(l_postfix_string).to_equal('a!b|'); - end; - - procedure conv_from_rpn_to_sql_filter is - l_postfix_rpn ut3_develop.ut_varchar2_list; - l_infix_string varchar2(4000); - begin - l_postfix_rpn := ut3_develop.ut_varchar2_list('A'); - l_infix_string := ut3_develop.ut_utils.conv_postfix_to_infix_sql(l_postfix_rpn); - ut.expect(l_infix_string).to_equal(q'['A' member of tags]'); - - l_postfix_rpn := ut3_develop.ut_varchar2_list('A','B','|'); - l_infix_string := ut3_develop.ut_utils.conv_postfix_to_infix_sql(l_postfix_rpn); - ut.expect(l_infix_string).to_equal(q'[('A' member of tags|'B' member of tags)]'); - - l_postfix_rpn := ut3_develop.ut_varchar2_list('a','b','!','|'); - l_infix_string := ut3_develop.ut_utils.conv_postfix_to_infix_sql(l_postfix_rpn); - ut.expect(l_infix_string).to_equal(q'[('a' member of tags|!('b' member of tags))]'); - end; - end test_ut_utils; / diff --git a/test/ut3_tester/core/test_ut_utils.pks b/test/ut3_tester/core/test_ut_utils.pks index a58082be0..114b35e86 100644 --- a/test/ut3_tester/core/test_ut_utils.pks +++ b/test/ut3_tester/core/test_ut_utils.pks @@ -157,11 +157,5 @@ create or replace package test_ut_utils is --%endcontext - --%test( Test conversion of expression into Reverse Polish Notation) - procedure test_conversion_to_rpn; - - --%test( Test conversion of expression from Reverse Polish Notation into custom where filter for SQL) - procedure conv_from_rpn_to_sql_filter; - end test_ut_utils; / From b8b66ee715c6765d5fef1ad92d8c25513bf757c5 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Thu, 13 Apr 2023 17:00:41 -0700 Subject: [PATCH 1055/1096] Fix uninstall --- source/uninstall_objects.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index 1e21f0f95..f488b8b8d 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -95,6 +95,8 @@ drop package ut_suite_manager; drop package ut_suite_builder; +drop package ut_suite_tag_filter; + drop package ut_suite_cache_manager; drop table ut_suite_cache purge; From 077fdb11316cda8b99b9ccc909a1c9cb3de57267 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Fri, 14 Apr 2023 15:48:56 -0700 Subject: [PATCH 1056/1096] Various PR fixe --- docs/userguide/annotations.md | 82 +------------------ docs/userguide/running-unit-tests.md | 76 +++++++++++++++-- source/core/ut_suite_tag_filter.pkb | 18 ++-- source/core/ut_suite_tag_filter.pks | 2 +- .../core/test_ut_suite_tag_filter.pkb | 49 ++++++++++- .../core/test_ut_suite_tag_filter.pks | 20 +++++ 6 files changed, 145 insertions(+), 102 deletions(-) diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 8e5a5d1ca..552b02b52 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1616,7 +1616,7 @@ or Tags are defined as a comma separated list within the `--%tags` annotation. -When a suite/context is tagged, all of its children will automatically inherit the tag and get executed along with the parent, unless they are excluded by tag expression. +When a suite/context is tagged, all of its children will automatically inherit the tag and get executed along with the parent, unless they are excluded explicitly at runtime with a negated tag expression. Parent suite tests are not executed, but a suitepath hierarchy is kept. Sample test suite package with tags. @@ -1657,52 +1657,6 @@ create or replace package body ut_sample_test is end ut_sample_test; / ``` - -#### Tag Expressions - -Tag expressions are boolean expressions with the operators !, & and |. In addition, ( and ) can be used to adjust for operator precedence. - -| Operator | Meaning | -| -------- | --------| -| ! | not | -| & | and | -| \| | or | - -If you are tagging your tests across multiple dimensions, tag expressions help you to select which tests to execute. When tagging by test type (e.g., micro, integration, end-to-end) and feature (e.g., product, catalog, shipping), the following tag expressions can be useful. - - -| Tag Expression | Selection | -| -------- | --------| -| product | all tests for product | -| catalog \| shipping | all tests for catalog plus all tests for shipping | -| catalog & shipping | all tests for the intersection between catalog and shipping | -| product & !end-to-end | all tests for product, but not the end-to-end tests | -| (micro \| integration) & (product \| shipping) | all micro or integration tests for product or shipping | - - -Execution of the test is done by using the parameter `a_tags` with tag expressions - - -```sql linenums="1" -select * from table(ut.run(a_tags => 'fast|!complex')); -``` -The above call will execute all tests from `ut_sample_test` package as the whole suite is tagged with `api` because a suite meet expression condition. - -```sql linenums="1" -select * from table(ut.run(a_path => 'ut_sample_test',a_tags => 'api')); -``` -The above call will execute all tests from `ut_sample_test` package as the whole suite is tagged with `api` - -```sql linenums="1" -select * from table(ut.run(a_tags => 'complex')); -``` -The above call will execute only the `ut_sample_test.ut_refcursors1` test, as only the test `ut_refcursors1` is tagged with `complex` - -```sql linenums="1" -select * from table(ut.run(a_tags => 'fast')); -``` -The above call will execute both `ut_sample_test.ut_refcursors1` and `ut_sample_test.ut_test` tests, as both tests are tagged with `fast` - #### Tag naming convention Tags must follow the below naming convention: @@ -1715,45 +1669,11 @@ Tags must follow the below naming convention: - vertical bar (|) - exclamation point (!) - tag cannot be null or blank -- tag cannot contain whitespace - tag cannot start with a dash, e.g. `-some-stuff` is **not** a valid tag - tag cannot contain spaces, e.g. `test of batch`. To create a multi-word tag use underscores or dashes, e.g. `test_of_batch`, `test-of-batch` - leading and trailing spaces are ignored in tag name, e.g. `--%tags( tag1 , tag2 )` becomes `tag1` and `tag2` tag names -#### Excluding tests/suites by tags - -It is possible to exclude parts of test suites with tags. -In order to do so, prefix the tag name to exclude with a `!` (exclamation) sign when invoking the test run which is equivalent of `-` (dash) in legacy notation. -Examples (based on above sample test suite) - -```sql linenums="1" -select * from table(ut.run(a_tags => '(api|fast)&!complex')); -``` - -which is equivalent of legacy calling: - -```sql linenums="1" -select * from table(ut.run(a_tags => 'api,fast,-complex')); -``` - -or - -```sql linenums="1" -select * from table(ut.run(a_tags => '(api|fast)&(!complex&!test1)')); -``` - -which is equivalent of legacy calling: - -```sql linenums="1" -select * from table(ut.run(a_tags => 'api,fast,-complex,-test1')); -``` - -The above call will execute all suites/contexts/tests that are marked with any of tags `api` or `fast` except those suites/contexts/tests that are marked as `complex`. -Given the above example package `ut_sample_test`, only `ut_sample_test.ut_test` will be executed. - - - ### Suitepath It is very likely that the application for which you are going to introduce tests consists of many different packages, procedures and functions. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 978803b9a..9abc7c964 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -319,23 +319,85 @@ select * from table(ut.run('hr.test_apply_bonus', a_random_test_order_seed => 30 In addition to the path, you can filter the tests to be run by specifying tags. Tags are defined in the test / context / suite with the `--%tags`-annotation ([Read more](annotations.md#tags)). Multiple tags are separated by comma. -The framework applies `OR` logic to all specified tags so any test / suite that matches at least one tag will be included in the test run. + + +### Tag Expressions + +Tag expressions are boolean expressions with the operators !, & and |. In addition, ( and ) can be used to adjust for operator precedence. + +| Operator | Meaning | +| -------- | --------| +| ! | not | +| & | and | +| \| | or | + +If you are tagging your tests across multiple dimensions, tag expressions help you to select which tests to execute. When tagging by test type (e.g., micro, integration, end-to-end) and feature (e.g., product, catalog, shipping), the following tag expressions can be useful. + + +| Tag Expression | Selection | +| -------- | --------| +| product | all tests for product | +| catalog \| shipping | all tests for catalog plus all tests for shipping | +| catalog & shipping | all tests for the intersection between catalog and shipping | +| product & !end-to-end | all tests for product, but not the end-to-end tests | +| (micro \| integration) & (product \| shipping) | all micro or integration tests for product or shipping | + + +Execution of the test is done by using the parameter `a_tags` with tag expressions + ```sql linenums="1" -begin - ut.run('hr.test_apply_bonus', a_tags => 'test1,test2'); -end; +select * from table(ut.run(a_tags => 'fast|!complex')); +``` +The above call will execute all tests from `ut_sample_test` package as the whole suite is tagged with `api` because a suite meet expression condition. + +```sql linenums="1" +select * from table(ut.run(a_path => 'ut_sample_test',a_tags => 'api')); +``` +The above call will execute all tests from `ut_sample_test` package as the whole suite is tagged with `api` + +```sql linenums="1" +select * from table(ut.run(a_tags => 'complex')); ``` +The above call will execute only the `ut_sample_test.ut_refcursors1` test, as only the test `ut_refcursors1` is tagged with `complex` + ```sql linenums="1" -select * from table(ut.run('hr.test_apply_bonus', a_tags => 'suite1')) +select * from table(ut.run(a_tags => 'fast')); ``` +The above call will execute both `ut_sample_test.ut_refcursors1` and `ut_sample_test.ut_test` tests, as both tests are tagged with `fast` + +### Excluding tests/suites by tags -You can also exclude specific tags by adding a `-` (dash) in front of the tag +It is possible to exclude parts of test suites with tags. +In order to do so, prefix the tag name to exclude with a `!` (exclamation) sign when invoking the test run which is equivalent of `-` (dash) in legacy notation. +Examples (based on above sample test suite) ```sql linenums="1" -select * from table(ut.run('hr.test_apply_bonus', a_tags => '-suite1')) +select * from table(ut.run(a_tags => '(api|fast)&!complex')); ``` +which is equivalent of legacy calling: + +```sql linenums="1" +select * from table(ut.run(a_tags => 'api,fast,-complex')); +``` + +or + +```sql linenums="1" +select * from table(ut.run(a_tags => '(api|fast)&(!complex&!test1)')); +``` + +which is equivalent of legacy calling: + +```sql linenums="1" +select * from table(ut.run(a_tags => 'api,fast,-complex,-test1')); +``` + +The above call will execute all suites/contexts/tests that are marked with any of tags `api` or `fast` except those suites/contexts/tests that are marked as `complex`. +Given the above example package `ut_sample_test`, only `ut_sample_test.ut_test` will be executed. + + ## Keeping uncommitted data after test-run utPLSQL by default runs tests in autonomous transaction and performs automatic rollback to assure that tests do not impact one-another and do not have impact on the current session in your IDE. diff --git a/source/core/ut_suite_tag_filter.pkb b/source/core/ut_suite_tag_filter.pkb index f1e055a27..d5df54212 100644 --- a/source/core/ut_suite_tag_filter.pkb +++ b/source/core/ut_suite_tag_filter.pkb @@ -87,19 +87,18 @@ create or replace package body ut_suite_tag_filter is /* https://stackoverflow.com/questions/29634992/shunting-yard-validate-expression */ - function shunt_logical_expression(a_tags in varchar2) return ut_varchar2_list is + function shunt_logical_expression(a_tags in ut_varchar2_list) return ut_varchar2_list is l_operator_stack ut_stack := ut_stack(); - l_input_tokens ut_varchar2_list := tokenize_tags_string(a_tags); l_rnp_tokens ut_varchar2_list := ut_varchar2_list(); l_token varchar2(32767); l_expect_operand boolean := true; l_expect_operator boolean := false; l_idx pls_integer; begin - l_idx := l_input_tokens.first; + l_idx := a_tags.first; --Exuecute modified shunting algorithm WHILE (l_idx is not null) loop - l_token := l_input_tokens(l_idx); + l_token := a_tags(l_idx); if (l_token member of gc_operators and l_token member of gc_binary_operators) then if not(l_expect_operator) then raise_application_error(ut_utils.gc_invalid_tag_expression, 'Invalid Tag expression'); @@ -108,21 +107,21 @@ create or replace package body ut_suite_tag_filter is l_rnp_tokens.extend; l_rnp_tokens(l_rnp_tokens.last) := l_operator_stack.pop; end loop; - l_operator_stack.push(l_input_tokens(l_idx)); + l_operator_stack.push(a_tags(l_idx)); l_expect_operand := true; l_expect_operator:= false; elsif (l_token member of gc_operators and l_token member of gc_unary_operators) then if not(l_expect_operand) then raise_application_error(ut_utils.gc_invalid_tag_expression, 'Invalid Tag expression'); end if; - l_operator_stack.push(l_input_tokens(l_idx)); + l_operator_stack.push(a_tags(l_idx)); l_expect_operand := true; l_expect_operator:= false; elsif l_token = '(' then if not(l_expect_operand) then raise_application_error(ut_utils.gc_invalid_tag_expression, 'Invalid Tag expression'); end if; - l_operator_stack.push(l_input_tokens(l_idx)); + l_operator_stack.push(a_tags(l_idx)); l_expect_operand := true; l_expect_operator:= false; elsif l_token = ')' then @@ -146,7 +145,7 @@ create or replace package body ut_suite_tag_filter is l_expect_operand := false; end if; - l_idx := l_input_tokens.next(l_idx); + l_idx := a_tags.next(l_idx); end loop; while l_operator_stack.peek is not null loop @@ -198,9 +197,10 @@ create or replace package body ut_suite_tag_filter is function create_where_filter(a_tags varchar2 ) return varchar2 is l_tags varchar2(4000); + l_tokenized_tags ut_varchar2_list; begin l_tags := replace(replace_legacy_tag_notation(a_tags),' '); - l_tags := conv_postfix_to_infix_sql(shunt_logical_expression(l_tags)); + l_tags := conv_postfix_to_infix_sql(shunt_logical_expression(tokenize_tags_string(l_tags))); l_tags := replace(l_tags, '|',' or '); l_tags := replace(l_tags ,'&',' and '); l_tags := replace(l_tags ,'!','not'); diff --git a/source/core/ut_suite_tag_filter.pks b/source/core/ut_suite_tag_filter.pks index 787c72603..37ba19111 100644 --- a/source/core/ut_suite_tag_filter.pks +++ b/source/core/ut_suite_tag_filter.pks @@ -31,7 +31,7 @@ create or replace package ut_suite_tag_filter authid definer is * and return a list of elements in Reverse Polish Notation ( postfix ) * As part of execution it will validate expression. */ - function shunt_logical_expression(a_tags in varchar2) return ut_varchar2_list; + function shunt_logical_expression(a_tags in ut_varchar2_list) return ut_varchar2_list; /* * Function that converts postfix notation into infix and creating a string of sql filter diff --git a/test/ut3_tester/core/test_ut_suite_tag_filter.pkb b/test/ut3_tester/core/test_ut_suite_tag_filter.pkb index a1d0be1f7..a396c6d25 100644 --- a/test/ut3_tester/core/test_ut_suite_tag_filter.pkb +++ b/test/ut3_tester/core/test_ut_suite_tag_filter.pkb @@ -3,24 +3,65 @@ create or replace package body test_ut_suite_tag_filter is procedure test_conversion_to_rpn is l_postfix ut3_develop.ut_varchar2_list; l_postfix_string varchar2(4000); + l_input_token ut3_develop.ut_varchar2_list; begin - l_postfix := ut3_develop.ut_suite_tag_filter.shunt_logical_expression('A'); + l_input_token := ut3_develop.ut_suite_tag_filter.tokenize_tags_string('A'); + l_postfix := ut3_develop.ut_suite_tag_filter.shunt_logical_expression(l_input_token); l_postfix_string := ut3_develop.ut_utils.table_to_clob(l_postfix,''); ut.expect(l_postfix_string).to_equal('A'); - l_postfix := ut3_develop.ut_suite_tag_filter.shunt_logical_expression('A|B'); + l_input_token := ut3_develop.ut_suite_tag_filter.tokenize_tags_string('A|B'); + l_postfix := ut3_develop.ut_suite_tag_filter.shunt_logical_expression(l_input_token); l_postfix_string := ut3_develop.ut_utils.table_to_clob(l_postfix,''); ut.expect(l_postfix_string).to_equal('AB|'); - l_postfix := ut3_develop.ut_suite_tag_filter.shunt_logical_expression('(a|b)|c&d'); + l_input_token := ut3_develop.ut_suite_tag_filter.tokenize_tags_string('(a|b)|c&d'); + l_postfix := ut3_develop.ut_suite_tag_filter.shunt_logical_expression(l_input_token); l_postfix_string := ut3_develop.ut_utils.table_to_clob(l_postfix,''); ut.expect(l_postfix_string).to_equal('ab|cd&|'); - l_postfix := ut3_develop.ut_suite_tag_filter.shunt_logical_expression('!a|b'); + l_input_token := ut3_develop.ut_suite_tag_filter.tokenize_tags_string('!a|b'); + l_postfix := ut3_develop.ut_suite_tag_filter.shunt_logical_expression(l_input_token); l_postfix_string := ut3_develop.ut_utils.table_to_clob(l_postfix,''); ut.expect(l_postfix_string).to_equal('a!b|'); end; + procedure test_conversion_opr_by_opr is + l_postfix ut3_develop.ut_varchar2_list; + l_input_token ut3_develop.ut_varchar2_list; + begin + l_input_token := ut3_develop.ut_varchar2_list('A','B'); + l_postfix := ut3_develop.ut_suite_tag_filter.shunt_logical_expression(l_input_token); + ut.fail('Expected exception but nothing was raised'); + end; + + procedure test_conversion_oprd_by_opd is + l_postfix ut3_develop.ut_varchar2_list; + l_input_token ut3_develop.ut_varchar2_list; + begin + l_input_token := ut3_develop.ut_varchar2_list('|','|'); + l_postfix := ut3_develop.ut_suite_tag_filter.shunt_logical_expression(l_input_token); + ut.fail('Expected exception but nothing was raised'); + end; + + procedure test_conversion_lb_by_oper is + l_postfix ut3_develop.ut_varchar2_list; + l_input_token ut3_develop.ut_varchar2_list; + begin + l_input_token := ut3_develop.ut_varchar2_list('(','A','|','B',')','('); + l_postfix := ut3_develop.ut_suite_tag_filter.shunt_logical_expression(l_input_token); + ut.fail('Expected exception but nothing was raised'); + end; + + procedure test_conversion_rb_by_oprd is + l_postfix ut3_develop.ut_varchar2_list; + l_input_token ut3_develop.ut_varchar2_list; + begin + l_input_token := ut3_develop.ut_varchar2_list(')','A'); + l_postfix := ut3_develop.ut_suite_tag_filter.shunt_logical_expression(l_input_token); + ut.fail('Expected exception but nothing was raised'); + end; + procedure conv_from_rpn_to_sql_filter is l_postfix_rpn ut3_develop.ut_varchar2_list; l_infix_string varchar2(4000); diff --git a/test/ut3_tester/core/test_ut_suite_tag_filter.pks b/test/ut3_tester/core/test_ut_suite_tag_filter.pks index 093fab856..6d0b9ff69 100644 --- a/test/ut3_tester/core/test_ut_suite_tag_filter.pks +++ b/test/ut3_tester/core/test_ut_suite_tag_filter.pks @@ -3,9 +3,29 @@ create or replace package test_ut_suite_tag_filter is --%suite(ut_suite_tag_filter) --%suitepath(utplsql.ut3_tester.core) + --%context( Conversion to Reverse Polish Notation) + --%test( Test conversion of expression into Reverse Polish Notation) procedure test_conversion_to_rpn; + --%test( Operator is followed by operator) + --%throws(ut3_develop.ut_utils.gc_invalid_tag_expression) + procedure test_conversion_opr_by_opr; + + --%test( Operand is followed by operand) + --%throws(ut3_develop.ut_utils.gc_invalid_tag_expression) + procedure test_conversion_oprd_by_opd; + + --%test( Left Bracket is followed by operator) + --%throws(ut3_develop.ut_utils.gc_invalid_tag_expression) + procedure test_conversion_lb_by_oper; + + --%test( Right Bracket is followed by operand) + --%throws(ut3_develop.ut_utils.gc_invalid_tag_expression) + procedure test_conversion_rb_by_oprd; + + --%endcontext + --%test( Test conversion of expression from Reverse Polish Notation into custom where filter for SQL) procedure conv_from_rpn_to_sql_filter; From 01e53646ba0e37b02ca476832061053e5aa5e786 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Fri, 14 Apr 2023 23:21:35 -0700 Subject: [PATCH 1057/1096] Update tests and code --- source/core/ut_suite_tag_filter.pkb | 36 +++++++++---------- source/core/ut_suite_tag_filter.pks | 9 ++++- .../core/test_ut_suite_tag_filter.pkb | 23 ++++++------ .../core/test_ut_suite_tag_filter.pks | 4 +-- 4 files changed, 38 insertions(+), 34 deletions(-) diff --git a/source/core/ut_suite_tag_filter.pkb b/source/core/ut_suite_tag_filter.pkb index d5df54212..df125091d 100644 --- a/source/core/ut_suite_tag_filter.pkb +++ b/source/core/ut_suite_tag_filter.pkb @@ -22,7 +22,9 @@ create or replace package body ut_suite_tag_filter is gc_operators constant ut_varchar2_list := ut_varchar2_list('|','&','!'); gc_unary_operators constant ut_varchar2_list := ut_varchar2_list('!'); -- right side associative operator gc_binary_operators constant ut_varchar2_list := ut_varchar2_list('|','&'); -- left side associative operator - + gc_tags_column_name constant varchar2(250) := 'tags'; + gc_exception_msg constant varchar2(200) := 'Invalid tag expression'; + type t_precedence_table is table of number index by varchar2(1); g_precedence t_precedence_table; @@ -101,7 +103,7 @@ create or replace package body ut_suite_tag_filter is l_token := a_tags(l_idx); if (l_token member of gc_operators and l_token member of gc_binary_operators) then if not(l_expect_operator) then - raise_application_error(ut_utils.gc_invalid_tag_expression, 'Invalid Tag expression'); + raise_application_error(ut_utils.gc_invalid_tag_expression, gc_exception_msg); end if; while l_operator_stack.top > 0 and (g_precedence(l_operator_stack.peek) > g_precedence(l_token)) loop l_rnp_tokens.extend; @@ -112,21 +114,21 @@ create or replace package body ut_suite_tag_filter is l_expect_operator:= false; elsif (l_token member of gc_operators and l_token member of gc_unary_operators) then if not(l_expect_operand) then - raise_application_error(ut_utils.gc_invalid_tag_expression, 'Invalid Tag expression'); + raise_application_error(ut_utils.gc_invalid_tag_expression, gc_exception_msg); end if; l_operator_stack.push(a_tags(l_idx)); l_expect_operand := true; l_expect_operator:= false; elsif l_token = '(' then if not(l_expect_operand) then - raise_application_error(ut_utils.gc_invalid_tag_expression, 'Invalid Tag expression'); + raise_application_error(ut_utils.gc_invalid_tag_expression, gc_exception_msg); end if; l_operator_stack.push(a_tags(l_idx)); l_expect_operand := true; l_expect_operator:= false; elsif l_token = ')' then if not(l_expect_operator) then - raise_application_error(ut_utils.gc_invalid_tag_expression, 'Invalid Tag expression'); + raise_application_error(ut_utils.gc_invalid_tag_expression, gc_exception_msg); end if; while l_operator_stack.peek <> '(' loop l_rnp_tokens.extend; @@ -137,7 +139,7 @@ create or replace package body ut_suite_tag_filter is l_expect_operator:= true; else if not(l_expect_operand) then - raise_application_error(ut_utils.gc_invalid_tag_expression, 'Invalid Tag expression'); + raise_application_error(ut_utils.gc_invalid_tag_expression, gc_exception_msg); end if; l_rnp_tokens.extend; l_rnp_tokens(l_rnp_tokens.last) :=l_token; @@ -150,7 +152,7 @@ create or replace package body ut_suite_tag_filter is while l_operator_stack.peek is not null loop if l_operator_stack.peek in ('(',')') then - raise_application_error(ut_utils.gc_invalid_tag_expression, 'Invalid Tag expression'); + raise_application_error(ut_utils.gc_invalid_tag_expression, gc_exception_msg); end if; l_rnp_tokens.extend; l_rnp_tokens(l_rnp_tokens.last):=l_operator_stack.pop; @@ -159,13 +161,13 @@ create or replace package body ut_suite_tag_filter is return l_rnp_tokens; end shunt_logical_expression; - function conv_postfix_to_infix_sql(a_postfix_exp in ut_varchar2_list) + function conv_postfix_to_infix_sql(a_postfix_exp in ut_varchar2_list,a_tags_column_name in varchar2) return varchar2 is l_infix_stack ut_stack := ut_stack(); l_right_side varchar2(32767); l_left_side varchar2(32767); l_infix_exp varchar2(32767); - l_member_token varchar2(20) := ' member of tags'; + l_member_token varchar2(20) := ' member of '||a_tags_column_name; l_idx pls_integer; begin l_idx := a_postfix_exp.first; @@ -173,9 +175,6 @@ create or replace package body ut_suite_tag_filter is --If token is operand but also single tag if regexp_count(a_postfix_exp(l_idx),'[!()|&]') = 0 then l_infix_stack.push(q'[']'||a_postfix_exp(l_idx)||q'[']'||l_member_token); - --If token is operand but containing other expressions - elsif a_postfix_exp(l_idx) not member of gc_operators then - l_infix_stack.push(a_postfix_exp(l_idx)); --If token is unary operator not elsif a_postfix_exp(l_idx) member of gc_unary_operators then l_right_side := l_infix_stack.pop; @@ -197,10 +196,9 @@ create or replace package body ut_suite_tag_filter is function create_where_filter(a_tags varchar2 ) return varchar2 is l_tags varchar2(4000); - l_tokenized_tags ut_varchar2_list; begin l_tags := replace(replace_legacy_tag_notation(a_tags),' '); - l_tags := conv_postfix_to_infix_sql(shunt_logical_expression(tokenize_tags_string(l_tags))); + l_tags := conv_postfix_to_infix_sql(shunt_logical_expression(tokenize_tags_string(l_tags)),gc_tags_column_name); l_tags := replace(l_tags, '|',' or '); l_tags := replace(l_tags ,'&',' and '); l_tags := replace(l_tags ,'!','not'); @@ -224,7 +222,7 @@ create or replace package body ut_suite_tag_filter is q'[ with suites_mv as ( - select c.id,value(c) as obj,c.path as path,c.self_type,c.object_owner,c.tags + select c.id,value(c) as obj,c.path as path,c.self_type,c.object_owner,c.tags as ]'||gc_tags_column_name||q'[ from table(:suite_items) c ), suites_matching_expr as ( @@ -234,17 +232,17 @@ with and ]'||l_tags||q'[ ), tests_matching_expr as ( - select c.id,c.path as path,c.self_type,c.object_owner,c.tags - from suites_mv c where c.self_type in ('UT_TEST') + select c.id,c.path as path,c.self_type,c.object_owner,c.tags as ]'||gc_tags_column_name||q'[ + from suites_mv c where c.self_type in ('UT_TEST') and ]'||l_tags||q'[ ), tests_with_tags_inh_from_suite as ( - select c.id,c.self_type,c.path,c.tags multiset union distinct t.tags tags,c.object_owner + select c.id,c.self_type,c.path,c.tags multiset union distinct t.tags as ]'||gc_tags_column_name||q'[ ,c.object_owner from suites_mv c join suites_matching_expr t on (c.path||'.' like t.path || '.%' /*all descendants and self*/ and c.object_owner = t.object_owner) ), tests_with_tags_prom_to_suite as ( - select c.id,c.self_type,c.path,c.tags multiset union distinct t.tags tags,c.object_owner + select c.id,c.self_type,c.path,c.tags multiset union distinct t.tags as ]'||gc_tags_column_name||q'[ ,c.object_owner from suites_mv c join tests_matching_expr t on (t.path||'.' like c.path || '.%' /*all ancestors and self*/ and c.object_owner = t.object_owner) ) diff --git a/source/core/ut_suite_tag_filter.pks b/source/core/ut_suite_tag_filter.pks index 37ba19111..e824ae275 100644 --- a/source/core/ut_suite_tag_filter.pks +++ b/source/core/ut_suite_tag_filter.pks @@ -37,8 +37,15 @@ create or replace package ut_suite_tag_filter authid definer is * Function that converts postfix notation into infix and creating a string of sql filter * that checking a tags collections for tags according to posted logic. */ - function conv_postfix_to_infix_sql(a_postfix_exp in ut_varchar2_list) return varchar2; + function conv_postfix_to_infix_sql(a_postfix_exp in ut_varchar2_list,a_tags_column_name in varchar2) + return varchar2; + /* + * Generates a part where clause sql + */ + function create_where_filter(a_tags varchar2) + return varchar2; + function apply( a_unfiltered_rows ut_suite_cache_rows, a_tags varchar2 := null diff --git a/test/ut3_tester/core/test_ut_suite_tag_filter.pkb b/test/ut3_tester/core/test_ut_suite_tag_filter.pkb index a396c6d25..edfb27cfc 100644 --- a/test/ut3_tester/core/test_ut_suite_tag_filter.pkb +++ b/test/ut3_tester/core/test_ut_suite_tag_filter.pkb @@ -62,21 +62,20 @@ create or replace package body test_ut_suite_tag_filter is ut.fail('Expected exception but nothing was raised'); end; - procedure conv_from_rpn_to_sql_filter is - l_postfix_rpn ut3_develop.ut_varchar2_list; - l_infix_string varchar2(4000); + procedure conv_from_tag_to_sql_filter is + l_sql_filter varchar2(4000); begin - l_postfix_rpn := ut3_develop.ut_varchar2_list('A'); - l_infix_string := ut3_develop.ut_suite_tag_filter.conv_postfix_to_infix_sql(l_postfix_rpn); - ut.expect(l_infix_string).to_equal(q'['A' member of tags]'); + l_sql_filter := ut3_develop.ut_suite_tag_filter.create_where_filter('test1'); + ut.expect(l_sql_filter).to_equal(q'['test1' member of tags]'); - l_postfix_rpn := ut3_develop.ut_varchar2_list('A','B','|'); - l_infix_string := ut3_develop.ut_suite_tag_filter.conv_postfix_to_infix_sql(l_postfix_rpn); - ut.expect(l_infix_string).to_equal(q'[('A' member of tags|'B' member of tags)]'); + l_sql_filter := ut3_develop.ut_suite_tag_filter.create_where_filter('test1|test2'); + ut.expect(l_sql_filter).to_equal(q'[('test1' member of tags or 'test2' member of tags)]'); - l_postfix_rpn := ut3_develop.ut_varchar2_list('a','b','!','|'); - l_infix_string := ut3_develop.ut_suite_tag_filter.conv_postfix_to_infix_sql(l_postfix_rpn); - ut.expect(l_infix_string).to_equal(q'[('a' member of tags|!('b' member of tags))]'); + l_sql_filter := ut3_develop.ut_suite_tag_filter.create_where_filter('test1|!test2'); + ut.expect(l_sql_filter).to_equal(q'[('test1' member of tags or not('test2' member of tags))]'); + + l_sql_filter := ut3_develop.ut_suite_tag_filter.create_where_filter('test1&!test2'); + ut.expect(l_sql_filter).to_equal(q'[('test1' member of tags and not('test2' member of tags))]'); end; end test_ut_suite_tag_filter; diff --git a/test/ut3_tester/core/test_ut_suite_tag_filter.pks b/test/ut3_tester/core/test_ut_suite_tag_filter.pks index 6d0b9ff69..0f84b751b 100644 --- a/test/ut3_tester/core/test_ut_suite_tag_filter.pks +++ b/test/ut3_tester/core/test_ut_suite_tag_filter.pks @@ -26,8 +26,8 @@ create or replace package test_ut_suite_tag_filter is --%endcontext - --%test( Test conversion of expression from Reverse Polish Notation into custom where filter for SQL) - procedure conv_from_rpn_to_sql_filter; + --%test( Test conversion of expression from tag into custom where filter for SQL) + procedure conv_from_tag_to_sql_filter; end test_ut_suite_tag_filter; / From dc0b4a60dfa799b360245bc7c39480e11861f564 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Mon, 17 Apr 2023 19:37:03 -0700 Subject: [PATCH 1058/1096] Addressing changes via PR review. --- docs/userguide/annotations.md | 40 +----------- docs/userguide/running-unit-tests.md | 90 +++++++++++++++++++------- source/core/ut_suite_cache_manager.pkb | 14 +--- source/core/ut_suite_cache_manager.pks | 9 ++- source/core/ut_suite_manager.pkb | 5 +- 5 files changed, 75 insertions(+), 83 deletions(-) diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 552b02b52..17fb7d1f2 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1617,46 +1617,8 @@ or Tags are defined as a comma separated list within the `--%tags` annotation. When a suite/context is tagged, all of its children will automatically inherit the tag and get executed along with the parent, unless they are excluded explicitly at runtime with a negated tag expression. -Parent suite tests are not executed, but a suitepath hierarchy is kept. +See [running unit tests](running-unit-tests.md) for more information on using tags to filter test suites that are to be executed. -Sample test suite package with tags. -```sql linenums="1" -create or replace package ut_sample_test is - - --%suite(Sample Test Suite) - --%tags(api) - - --%test(Compare Ref Cursors) - --%tags(complex,fast) - procedure ut_refcursors1; - - --%test(Run equality test) - --%tags(simple,fast) - procedure ut_test; - -end ut_sample_test; -/ - -create or replace package body ut_sample_test is - - procedure ut_refcursors1 is - v_actual sys_refcursor; - v_expected sys_refcursor; - begin - open v_expected for select 1 as test from dual; - open v_actual for select 2 as test from dual; - - ut.expect(v_actual).to_equal(v_expected); - end; - - procedure ut_test is - begin - ut.expect(1).to_equal(0); - end; - -end ut_sample_test; -/ -``` #### Tag naming convention Tags must follow the below naming convention: diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 9abc7c964..7597ae72a 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -323,7 +323,7 @@ Multiple tags are separated by comma. ### Tag Expressions -Tag expressions are boolean expressions with the operators !, & and |. In addition, ( and ) can be used to adjust for operator precedence. +Tag expressions are boolean expressions created by combining tags with the `!`, `&`, `|` operators. Tag expressions can be grouped using `(` and `)` braces. Grouping tag expressions affects operator precedence. | Operator | Meaning | | -------- | --------| @@ -338,18 +338,76 @@ If you are tagging your tests across multiple dimensions, tag expressions help y | -------- | --------| | product | all tests for product | | catalog \| shipping | all tests for catalog plus all tests for shipping | -| catalog & shipping | all tests for the intersection between catalog and shipping | -| product & !end-to-end | all tests for product, but not the end-to-end tests | +| catalog & shipping | all tests that are tagged with both `catalog` and `shipping` tags | +| product & !end-to-end | all tests tagged `product`, except the tests tagged `end-to-end` | | (micro \| integration) & (product \| shipping) | all micro or integration tests for product or shipping | -Execution of the test is done by using the parameter `a_tags` with tag expressions +Taking the last expression above `(micro | integration) & (product | shipping)` +| --%tags |included in run | +| -------- | --------| +| micro | no | +| integration | no | +| micro | no | +| product | no | +| shipping | no | +| micro | no | +| micro, integration | no | +| product, shipping | no | +| micro, product | yes | +| micro, shipping | yes | +| integration, product | yes | +| integration, shipping | yes | +| integration, micro, shipping | yes | +| integration, micro, product | yes | +| integration, shipping ,product | yes | +| micro, shipping ,product | yes | +| integration, micro, shipping ,product | yes | + + +### Sample execution of test with tags. + +Execution of the test with tag expressions is done using the parameter `a_tags`. +Given a test package `ut_sample_test` defined below ```sql linenums="1" -select * from table(ut.run(a_tags => 'fast|!complex')); +create or replace package ut_sample_test is + + --%suite(Sample Test Suite) + --%tags(api) + + --%test(Compare Ref Cursors) + --%tags(complex,fast) + procedure ut_refcursors1; + + --%test(Run equality test) + --%tags(simple,fast) + procedure ut_test; + +end ut_sample_test; +/ + +create or replace package body ut_sample_test is + + procedure ut_refcursors1 is + v_actual sys_refcursor; + v_expected sys_refcursor; + begin + open v_expected for select 1 as test from dual; + open v_actual for select 2 as test from dual; + + ut.expect(v_actual).to_equal(v_expected); + end; + + procedure ut_test is + begin + ut.expect(1).to_equal(0); + end; + +end ut_sample_test; +/ ``` -The above call will execute all tests from `ut_sample_test` package as the whole suite is tagged with `api` because a suite meet expression condition. ```sql linenums="1" select * from table(ut.run(a_path => 'ut_sample_test',a_tags => 'api')); @@ -357,9 +415,9 @@ select * from table(ut.run(a_path => 'ut_sample_test',a_tags => 'api')); The above call will execute all tests from `ut_sample_test` package as the whole suite is tagged with `api` ```sql linenums="1" -select * from table(ut.run(a_tags => 'complex')); +select * from table(ut.run(a_tags => 'fast&complex')); ``` -The above call will execute only the `ut_sample_test.ut_refcursors1` test, as only the test `ut_refcursors1` is tagged with `complex` +The above call will execute only the `ut_sample_test.ut_refcursors1` test, as only the test `ut_refcursors1` is tagged with `complex` and `fast` ```sql linenums="1" select * from table(ut.run(a_tags => 'fast')); @@ -376,25 +434,13 @@ Examples (based on above sample test suite) select * from table(ut.run(a_tags => '(api|fast)&!complex')); ``` -which is equivalent of legacy calling: - -```sql linenums="1" -select * from table(ut.run(a_tags => 'api,fast,-complex')); -``` - or ```sql linenums="1" -select * from table(ut.run(a_tags => '(api|fast)&(!complex&!test1)')); -``` - -which is equivalent of legacy calling: - -```sql linenums="1" -select * from table(ut.run(a_tags => 'api,fast,-complex,-test1')); +select * from table(ut.run(a_tags => '(api|fast)&!complex&!test1')); ``` -The above call will execute all suites/contexts/tests that are marked with any of tags `api` or `fast` except those suites/contexts/tests that are marked as `complex`. +The above call will execute all suites/contexts/tests that are marked with any of tags `api` or `fast` except those suites/contexts/tests that are marked as `complex` and except those suites/contexts/tests that are marked as `test1`. Given the above example package `ut_sample_test`, only `ut_sample_test.ut_test` will be executed. diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index 3bb679517..680624f02 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -285,18 +285,6 @@ create or replace package body ut_suite_cache_manager is return l_results; end; - function get_cached_suites( - a_schema_paths ut_path_items, - a_random_seed positive := null - ) return ut_suite_cache_rows is - l_suite_items ut_suite_cache_rows := ut_suite_cache_rows(); - l_schema_paths ut_path_items; - begin - l_schema_paths := a_schema_paths; - l_suite_items := get_suite_items(a_schema_paths); - return l_suite_items; - end; - function get_schema_parse_time(a_schema_name varchar2) return timestamp result_cache is l_cache_parse_time timestamp; begin @@ -443,7 +431,7 @@ create or replace package body ut_suite_cache_manager is a_schema_paths ut_path_items ) return ut_suite_cache_rows is begin - return get_cached_suite_rows(get_cached_suites( a_schema_paths )); + return get_cached_suite_rows(get_suite_items(a_schema_paths)); end; function get_suite_items_info( diff --git a/source/core/ut_suite_cache_manager.pks b/source/core/ut_suite_cache_manager.pks index c217abeed..81b1e0136 100644 --- a/source/core/ut_suite_cache_manager.pks +++ b/source/core/ut_suite_cache_manager.pks @@ -58,11 +58,6 @@ create or replace package ut_suite_cache_manager authid definer is a_suites_filtered ut_suite_cache_rows ) return ut_suite_cache_rows; - function get_cached_suites( - a_schema_paths ut_path_items, - a_random_seed positive := null - ) return ut_suite_cache_rows; - function get_schema_paths(a_paths in ut_varchar2_list) return ut_path_items; /* @@ -77,6 +72,10 @@ create or replace package ut_suite_cache_manager authid definer is function get_suite_items_info( a_suite_cache_items ut_suite_cache_rows ) return ut_suite_items_info; + + function get_suite_items ( + a_schema_paths ut_path_items + ) return ut_suite_cache_rows; /* * Retrieves list of cached suite packages. diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index f8a2e002c..c46ba66b8 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -360,10 +360,7 @@ create or replace package body ut_suite_manager is l_filtered_rows ut_suite_cache_rows; l_result t_cached_suites_cursor; begin - l_unfiltered_rows := ut_suite_cache_manager.get_cached_suites( - a_schema_paths, - a_random_seed - ); + l_unfiltered_rows := ut_suite_cache_manager.get_suite_items(a_schema_paths); l_tag_filter_applied := ut_suite_tag_filter.apply(l_unfiltered_rows,a_tags); l_filtered_rows := get_filtered_cursor(ut_suite_cache_manager.get_cached_suite_rows(l_tag_filter_applied),a_skip_all_objects); From ef1c02b3eee5b3a5a71076f1db24a58765cddbda Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Tue, 18 Apr 2023 15:36:11 -0700 Subject: [PATCH 1059/1096] Update docs --- docs/userguide/running-unit-tests.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 7597ae72a..fb9a9f602 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -440,7 +440,13 @@ or select * from table(ut.run(a_tags => '(api|fast)&!complex&!test1')); ``` -The above call will execute all suites/contexts/tests that are marked with any of tags `api` or `fast` except those suites/contexts/tests that are marked as `complex` and except those suites/contexts/tests that are marked as `test1`. +which is equivalent of exclusion on whole expression + +```sql linenums="1" +select * from table(ut.run(a_tags => '(api|fast)&!(complex|test1)')); +``` + +The above calls will execute all suites/contexts/tests that are marked with any of tags `api` or `fast` except those suites/contexts/tests that are marked as `complex` and except those suites/contexts/tests that are marked as `test1`. Given the above example package `ut_sample_test`, only `ut_sample_test.ut_test` will be executed. From 1551ea5583152a0d0b726005906aa6e51f42c38a Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Tue, 25 Apr 2023 09:30:40 -0700 Subject: [PATCH 1060/1096] Adding any and none --- docs/userguide/annotations.md | 1 + docs/userguide/running-unit-tests.md | 75 ++++++++++++ source/core/ut_suite_tag_filter.pkb | 15 ++- test/ut3_tester_helper/run_helper.pkb | 160 +++++++++++++++++++++++++- test/ut3_user/api/test_ut_run.pkb | 25 ++++ 5 files changed, 271 insertions(+), 5 deletions(-) diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 17fb7d1f2..4ec6de59d 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1634,6 +1634,7 @@ Tags must follow the below naming convention: - tag cannot start with a dash, e.g. `-some-stuff` is **not** a valid tag - tag cannot contain spaces, e.g. `test of batch`. To create a multi-word tag use underscores or dashes, e.g. `test_of_batch`, `test-of-batch` - leading and trailing spaces are ignored in tag name, e.g. `--%tags( tag1 , tag2 )` becomes `tag1` and `tag2` tag names +- tag cannot be one of two reserved words : `none` and `any`, any tags with that will not be considered. ### Suitepath diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index fb9a9f602..b3a974d53 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -325,6 +325,8 @@ Multiple tags are separated by comma. Tag expressions are boolean expressions created by combining tags with the `!`, `&`, `|` operators. Tag expressions can be grouped using `(` and `)` braces. Grouping tag expressions affects operator precedence. +Two special expressions are supported, `any` and `none`, which select all tests with any tags at all, and all tests without any tags, respectively. These special expressions may be combined with other expressions just like normal tags. When using `none` be aware that if the suite is tagged it will exclude any tests and children belonging to that suite. + | Operator | Meaning | | -------- | --------| | ! | not | @@ -450,6 +452,79 @@ The above calls will execute all suites/contexts/tests that are marked with any Given the above example package `ut_sample_test`, only `ut_sample_test.ut_test` will be executed. +### Sample execution with `any` and `none` + +Given a sample test package: + +```sql linenums="1" +create or replace package ut_sample_test is + + --%suite(Sample Test Suite) + + --%test(Compare Ref Cursors) + --%tags(complex,fast) + procedure ut_refcursors1; + + --%test(Run equality test) + --%tags(simple,fast) + procedure ut_test; + + --%test(Run equality test no tag) + procedure ut_test_no_tag; + +end ut_sample_test; +/ + +create or replace package body ut_sample_test is + + procedure ut_refcursors1 is + v_actual sys_refcursor; + v_expected sys_refcursor; + begin + open v_expected for select 1 as test from dual; + open v_actual for select 2 as test from dual; + + ut.expect(v_actual).to_equal(v_expected); + end; + + procedure ut_test is + begin + ut.expect(1).to_equal(0); + end; + + procedure ut_test_no_tag is + begin + ut.expect(1).to_equal(0); + end; + +end ut_sample_test; +/ +``` + +```sql linenums="1" +select * from table(ut.run(a_path => 'ut_sample_test',a_tags => 'none')); +``` + +The above call will execute tests `ut_test_no_tag` + +```sql linenums="1" +select * from table(ut.run(a_path => 'ut_sample_test',a_tags => 'any')); +``` + +The above call will execute tests `ut_test` and `ut_refcursors1` + +```sql linenums="1" +select * from table(ut.run(a_path => 'ut_sample_test',a_tags => 'none|simple')); +``` + +The above call will execute tests `ut_test_no_tag` and `ut_test` + +```sql linenums="1" +select * from table(ut.run(a_tags => 'none|!simple')); +``` + +The above call will execute tests `ut_test_no_tag` and `ut_refcursors1` + ## Keeping uncommitted data after test-run utPLSQL by default runs tests in autonomous transaction and performs automatic rollback to assure that tests do not impact one-another and do not have impact on the current session in your IDE. diff --git a/source/core/ut_suite_tag_filter.pkb b/source/core/ut_suite_tag_filter.pkb index df125091d..2d9436301 100644 --- a/source/core/ut_suite_tag_filter.pkb +++ b/source/core/ut_suite_tag_filter.pkb @@ -22,9 +22,10 @@ create or replace package body ut_suite_tag_filter is gc_operators constant ut_varchar2_list := ut_varchar2_list('|','&','!'); gc_unary_operators constant ut_varchar2_list := ut_varchar2_list('!'); -- right side associative operator gc_binary_operators constant ut_varchar2_list := ut_varchar2_list('|','&'); -- left side associative operator + gc_reserved_tag_words constant ut_varchar2_list := ut_varchar2_list('none','any'); gc_tags_column_name constant varchar2(250) := 'tags'; gc_exception_msg constant varchar2(200) := 'Invalid tag expression'; - + type t_precedence_table is table of number index by varchar2(1); g_precedence t_precedence_table; @@ -172,8 +173,17 @@ create or replace package body ut_suite_tag_filter is begin l_idx := a_postfix_exp.first; while ( l_idx is not null) loop + --If the token we got is a none or any keyword + if a_postfix_exp(l_idx) member of gc_reserved_tag_words then + + l_infix_stack.push( + case + when a_postfix_exp(l_idx) = 'none' then '('||a_tags_column_name||' is empty or '||a_tags_column_name||' is null)' + else a_tags_column_name||' is not empty' + end + ); --If token is operand but also single tag - if regexp_count(a_postfix_exp(l_idx),'[!()|&]') = 0 then + elsif regexp_count(a_postfix_exp(l_idx),'[!()|&]') = 0 then l_infix_stack.push(q'[']'||a_postfix_exp(l_idx)||q'[']'||l_member_token); --If token is unary operator not elsif a_postfix_exp(l_idx) member of gc_unary_operators then @@ -256,7 +266,6 @@ with where ]'||l_tags||q'[ ) ) t where c.id = t.id and r_num = 1 ]'; - execute immediate l_sql bulk collect into l_suite_tags using a_suite_items; return l_suite_tags; end; diff --git a/test/ut3_tester_helper/run_helper.pkb b/test/ut3_tester_helper/run_helper.pkb index c73564798..6289b1642 100644 --- a/test/ut3_tester_helper/run_helper.pkb +++ b/test/ut3_tester_helper/run_helper.pkb @@ -431,12 +431,162 @@ create or replace package body run_helper is end test_tag_pkg_3; ]'; + execute immediate q'[create or replace package suite1_level1_pkg is + + --%suite(suite1_level1) + --%suitepath(any_none) + --%rollback(manual) + + --%test(Test 1 from Suite1 on level 1) + --%tags(suite1,level1,test1,test1_level1) + procedure test1_level1; + + --%test(Test 2 from Suite1 on level 1) + procedure test2_level1; + + end suite1_level1_pkg; + ]'; + + execute immediate q'[create or replace package body suite1_level1_pkg is + procedure test1_level1 is + begin + dbms_output.put_line('suite1_level1_pkg.test1_level1 executed'); + end; + procedure test2_level1 is + begin + dbms_output.put_line('suite1_level1_pkg.test2_level1 executed'); + end; + end suite1_level1_pkg; + ]'; + + execute immediate q'[create or replace package suite1_1_level2_pkg is + + --%suite(suite1_1_level2) + --%suitepath(any_none.suite1_level1) + --%rollback(manual) + + --%test(Test 1 from Suite1_2 on level 2) + --%tags(level2,test1,test1_level2) + procedure suite1_1_test1_level2; + + --%test(Test 2 from Suite1_2 on level 2) + procedure suite1_1_test2_level2; + + end suite1_1_level2_pkg; + ]'; + + execute immediate q'[create or replace package body suite1_1_level2_pkg is + procedure suite1_1_test1_level2 is + begin + dbms_output.put_line('suite1_1_level2_pkg.suite1_1_test1_level2 executed'); + end; + procedure suite1_1_test2_level2 is + begin + dbms_output.put_line('suite1_1_level2_pkg.suite1_1_test2_level2 executed'); + end; + end suite1_1_level2_pkg; + ]'; + + execute immediate q'[create or replace package suite1_2_level2_pkg is + + --%suite(suite1_2_level2) + --%tags(level2,suite1_2,suites) + --%suitepath(any_none.suite1_level1) + --%rollback(manual) + + --%test(Test 1 from Suite1_2 on level 2) + procedure suite1_2_test1_level2; + + --%test(Test 2 from Suite1_2 on level 2) + --%tags(level2,test2,test2_level2) + procedure suite1_2_test2_level1; + + end suite1_2_level2_pkg; + ]'; + + execute immediate q'[create or replace package body suite1_2_level2_pkg is + procedure suite1_2_test1_level2 is + begin + dbms_output.put_line('suite1_2_level2_pkg.suite1_2_test1_level2 executed'); + end; + procedure suite1_2_test2_level1 is + begin + dbms_output.put_line('suite1_2_level2_pkg.suite1_2_test2_level1 executed'); + end; + end suite1_2_level2_pkg; + ]'; + + execute immediate q'[create or replace package suite2_level1_pkg is + + --%suite(suite2_level1) + --%tags(level1,suite2,suites) + --%suitepath(any_none) + --%rollback(manual) + + --%test(Test 1 from Suite1 on level 1) + --%tags(suite2,level1,test1,test1_level1) + procedure test1_level1; + + --%test(Test 2 from Suite1 on level 1) + procedure test2_level1; + + end suite2_level1_pkg; + ]'; + + execute immediate q'[create or replace package body suite2_level1_pkg is + procedure test1_level1 is + begin + dbms_output.put_line('suite2_level1_pkg.test1_level1 executed'); + end; + procedure test2_level1 is + begin + dbms_output.put_line('suite2_level1_pkg.test2_level1 executed'); + end; + end suite2_level1_pkg; + ]'; + + execute immediate q'[create or replace package suite2_2_level2_pkg is + + --%suite(suite2_2_level2) + --%tags(level2,suite2_2,suites) + --%suitepath(any_none.suite2_level1) + --%rollback(manual) + + --%test(Test 1 from Suite2_2 on level 2) + procedure suite2_2_test1_level2; + + --%test(Test 2 from Suite2_2 on level 2) + --%tags(level2,test2,test2_level2) + procedure suite2_2_test2_level2; + + end suite2_2_level2_pkg; + ]'; + + execute immediate q'[create or replace package body suite2_2_level2_pkg is + procedure suite2_2_test1_level2 is + begin + dbms_output.put_line('suite2_2_level2_pkg.suite2_2_test1_level2 executed'); + end; + procedure suite2_2_test2_level2 is + begin + dbms_output.put_line('suite2_2_level2_pkg.suite2_2_test2_level2 executed'); + end; + end suite2_2_level2_pkg; + ]'; + + execute immediate q'[grant execute on test_package_1 to public]'; execute immediate q'[grant execute on test_package_2 to public]'; execute immediate q'[grant execute on test_package_3 to public]'; execute immediate q'[grant execute on test_tag_pkg_1 to public]'; execute immediate q'[grant execute on test_tag_pkg_2 to public]'; - execute immediate q'[grant execute on test_tag_pkg_3 to public]'; + execute immediate q'[grant execute on test_tag_pkg_3 to public]'; + + execute immediate q'[grant execute on suite1_level1_pkg to public]'; + execute immediate q'[grant execute on suite1_1_level2_pkg to public]'; + execute immediate q'[grant execute on suite1_2_level2_pkg to public]'; + execute immediate q'[grant execute on suite2_level1_pkg to public]'; + execute immediate q'[grant execute on suite2_2_level2_pkg to public]'; end; procedure drop_ut3_user_tests is @@ -447,7 +597,13 @@ create or replace package body run_helper is execute immediate q'[drop package test_package_3]'; execute immediate q'[drop package test_tag_pkg_1]'; execute immediate q'[drop package test_tag_pkg_2]'; - execute immediate q'[drop package test_tag_pkg_3]'; + execute immediate q'[drop package test_tag_pkg_3]'; + + execute immediate q'[drop package suite2_2_level2_pkg]'; + execute immediate q'[drop package suite2_level1_pkg]'; + execute immediate q'[drop package suite1_2_level2_pkg]'; + execute immediate q'[drop package suite1_level1_pkg]'; + execute immediate q'[drop package suite1_1_level2_pkg]'; end; procedure create_test_suite is diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index 25b50343e..e80235744 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -1244,6 +1244,31 @@ procedure tag_exclude_run_fun_pth_lst_lg is ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2.test3%executed%' ); ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2.test4%executed%' ); ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_3.test6%executed%' ); + + l_results := ut3_tester_helper.run_helper.run(a_tags => 'any'); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%suite2_level1_pkg.test1_level1 executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%suite2_level1_pkg.test2_level1 executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%suite1_level1_pkg.test1_level1 executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%suite2_2_level2_pkg.suite2_2_test1_level2 executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%suite2_2_level2_pkg.suite2_2_test2_level2 executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%suite1_2_level2_pkg.suite1_2_test1_level2 executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%suite1_2_level2_pkg.suite1_2_test2_level1 executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%suite1_1_level2_pkg.suite1_1_test1_level2 executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%suite1_level1_pkg.test2_level1 executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%suite1_1_level2_pkg.suite1_1_test2_level2 executed%' ); + + l_results := ut3_tester_helper.run_helper.run(a_tags => 'none'); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%suite1_level1_pkg.test2_level1 executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%suite1_1_level2_pkg.suite1_1_test2_level2 executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%suite2_level1_pkg.test1_level1 executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%suite2_level1_pkg.test2_level1 executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%suite1_level1_pkg.test1_level1 executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%suite2_2_level2_pkg.suite2_2_test1_level2 executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%suite2_2_level2_pkg.suite2_2_test2_level2 executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%suite1_2_level2_pkg.suite1_2_test1_level2 executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%suite1_2_level2_pkg.suite1_2_test2_level1 executed%' ); + ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%suite1_1_level2_pkg.suite1_1_test1_level2 executed%' ); + end; From 9dee7e0ffd4bfee0af948befd4f6b739506c11d1 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Tue, 25 Apr 2023 17:08:42 -0700 Subject: [PATCH 1061/1096] Update docs --- docs/userguide/running-unit-tests.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index b3a974d53..044ffdb35 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -325,7 +325,7 @@ Multiple tags are separated by comma. Tag expressions are boolean expressions created by combining tags with the `!`, `&`, `|` operators. Tag expressions can be grouped using `(` and `)` braces. Grouping tag expressions affects operator precedence. -Two special expressions are supported, `any` and `none`, which select all tests with any tags at all, and all tests without any tags, respectively. These special expressions may be combined with other expressions just like normal tags. When using `none` be aware that if the suite is tagged it will exclude any tests and children belonging to that suite. +Two special expressions are supported, `any` and `none`, which select all tests with any tags at all, and all tests without any tags, respectively. These special expressions may be combined with other expressions just like normal tags. When using `none` be aware that if the suite is tagged it will exclude any tests and suites below. | Operator | Meaning | | -------- | --------| From beb9a3a3207e208b7e5e2687b6d4751b4ee705b9 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Wed, 26 Apr 2023 17:30:32 -0700 Subject: [PATCH 1062/1096] Resolving PR --- docs/userguide/annotations.md | 2 +- docs/userguide/running-unit-tests.md | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 4ec6de59d..7c7015872 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1634,7 +1634,7 @@ Tags must follow the below naming convention: - tag cannot start with a dash, e.g. `-some-stuff` is **not** a valid tag - tag cannot contain spaces, e.g. `test of batch`. To create a multi-word tag use underscores or dashes, e.g. `test_of_batch`, `test-of-batch` - leading and trailing spaces are ignored in tag name, e.g. `--%tags( tag1 , tag2 )` becomes `tag1` and `tag2` tag names -- tag cannot be one of two reserved words : `none` and `any`, any tags with that will not be considered. +- tag cannot be one of two reserved words: `none` and `any`. `none` and `any` as a tag will be treated as no tag ### Suitepath diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 044ffdb35..e12fd6b32 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -325,7 +325,13 @@ Multiple tags are separated by comma. Tag expressions are boolean expressions created by combining tags with the `!`, `&`, `|` operators. Tag expressions can be grouped using `(` and `)` braces. Grouping tag expressions affects operator precedence. -Two special expressions are supported, `any` and `none`, which select all tests with any tags at all, and all tests without any tags, respectively. These special expressions may be combined with other expressions just like normal tags. When using `none` be aware that if the suite is tagged it will exclude any tests and suites below. +Two reserved keywords, `any` and `none`, can be used when creating a tag expression to run tests. +- `any` keyword represents tests and suites with any tags +- `none` keyword represents tests and suites without tags + +These keywords may be combined with other expressions just like normal tags. + +**Note:** When specifying `none`, be aware that it will exclude any tests/suites/contexts contained within a tagged suite. | Operator | Meaning | | -------- | --------| From 46ffe739386b92dc831a46227c17326bb85f459e Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Thu, 27 Apr 2023 11:48:26 -0700 Subject: [PATCH 1063/1096] Update note --- docs/userguide/running-unit-tests.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index e12fd6b32..2b18a3d3b 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -331,7 +331,8 @@ Two reserved keywords, `any` and `none`, can be used when creating a tag express These keywords may be combined with other expressions just like normal tags. -**Note:** When specifying `none`, be aware that it will exclude any tests/suites/contexts contained within a tagged suite. +!!! note + When specifying `none`, be aware that it will exclude any tests/suites/contexts contained within a tagged suite. | Operator | Meaning | | -------- | --------| From 73e9cf32bce4f0b8dbd38f7da63ad253b0ae42b6 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Thu, 27 Apr 2023 22:09:18 +0300 Subject: [PATCH 1064/1096] Added missing test for multiple expectation failures with exception thrown. --- test/ut3_user/reporters.pkb | 5 +-- .../reporters/test_teamcity_reporter.pkb | 37 ++++++++++++++++++- .../reporters/test_teamcity_reporter.pks | 5 ++- 3 files changed, 41 insertions(+), 6 deletions(-) diff --git a/test/ut3_user/reporters.pkb b/test/ut3_user/reporters.pkb index b6d43b144..031683615 100644 --- a/test/ut3_user/reporters.pkb +++ b/test/ut3_user/reporters.pkb @@ -90,11 +90,10 @@ as procedure erroring_test is - l_variable integer; + l_integer_variable integer; begin dbms_output.put_line(''); - l_variable := 'a string'; - ut3_develop.ut.expect(l_variable).to_equal(1); + l_integer_variable := 'a string'; end; procedure disabled_test diff --git a/test/ut3_user/reporters/test_teamcity_reporter.pkb b/test/ut3_user/reporters/test_teamcity_reporter.pkb index 7c4c1e513..517ddc037 100644 --- a/test/ut3_user/reporters/test_teamcity_reporter.pkb +++ b/test/ut3_user/reporters/test_teamcity_reporter.pkb @@ -36,6 +36,9 @@ create or replace package body test_teamcity_reporter as --%test procedure multi_failure; + + --%test + procedure multi_failure_on_error; end;]'; execute immediate q'[create or replace package body check_multiple_failures is procedure multi_failure is @@ -44,6 +47,14 @@ create or replace package body test_teamcity_reporter as ut3_develop.ut.expect(2).to_equal(1); ut3_develop.ut.expect('Bad').to_equal('Good'); end; + procedure multi_failure_on_error is + l_integer_variable integer; + begin + ut3_develop.ut.expect(1).to_be_null; + ut3_develop.ut.expect(2).to_equal(1); + ut3_develop.ut.expect('Bad').to_equal('Good'); + l_integer_variable := 'a string'; + end; end;]'; end; @@ -132,7 +143,7 @@ create or replace package body test_teamcity_reporter as ut.expect(ut3_tester_helper.main_helper.table_to_clob(l_output_data)).to_be_like(l_expected); end; - procedure report_mutiple_expectations is + procedure report_multiple_expectations is l_output_data ut3_develop.ut_varchar2_list; l_expected varchar2(32767); begin @@ -146,7 +157,29 @@ create or replace package body test_teamcity_reporter as --act select * bulk collect into l_output_data - from table(ut3_develop.ut.run('check_multiple_failures',ut3_develop.ut_teamcity_reporter())); + from table(ut3_develop.ut.run('check_multiple_failures.multi_failure',ut3_develop.ut_teamcity_reporter())); + + --assert + ut.expect(ut3_tester_helper.main_helper.table_to_clob(l_output_data)).to_be_like(l_expected); + end; + + procedure report_multiple_expect_on_err is + l_output_data ut3_develop.ut_varchar2_list; + l_expected varchar2(32767); + begin + l_expected := q'{%##teamcity[testSuiteStarted timestamp='%' name='check_multiple_failures'] +%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3_user.check_multiple_failures.multi_failure_on_error'] +%##teamcity[testStdErr timestamp='%' name='ut3_user.check_multiple_failures.multi_failure_on_error' out='Test exception:|nORA-06502: PL/SQL: %: character to number conversion error|nORA-06512: at "UT3_USER.CHECK_MULTIPLE_FAILURES", line %|nORA-06512: at %|n'] +%##teamcity[testFailed timestamp='%' details='Test exception:|nORA-06502: PL/SQL: %: character to number conversion error|nORA-06512: at "UT3_USER.CHECK_MULTIPLE_FAILURES", line %|nORA-06512: at %|n' message='Error occured' name='ut3_user.check_multiple_failures.multi_failure_on_error'] +%##teamcity[testFailed timestamp='%' details='Actual: 1 (number) was expected to be null' name='ut3_user.check_multiple_failures.multi_failure_on_error'] +%##teamcity[testFailed timestamp='%' details='Actual: 2 (number) was expected to equal: 1 (number)' name='ut3_user.check_multiple_failures.multi_failure_on_error'] +%##teamcity[testFailed timestamp='%' details='Actual: |'Bad|' (varchar2) was expected to equal: |'Good|' (varchar2)' name='ut3_user.check_multiple_failures.multi_failure_on_error'] +%##teamcity[testFinished timestamp='%' duration='%' name='ut3_user.check_multiple_failures.multi_failure_on_error'] +%##teamcity[testSuiteFinished timestamp='%' name='check_multiple_failures']}'; + --act + select * + bulk collect into l_output_data + from table(ut3_develop.ut.run('check_multiple_failures.multi_failure_on_error',ut3_develop.ut_teamcity_reporter())); --assert ut.expect(ut3_tester_helper.main_helper.table_to_clob(l_output_data)).to_be_like(l_expected); diff --git a/test/ut3_user/reporters/test_teamcity_reporter.pks b/test/ut3_user/reporters/test_teamcity_reporter.pks index 30ae7e26b..1b9277e7a 100644 --- a/test/ut3_user/reporters/test_teamcity_reporter.pks +++ b/test/ut3_user/reporters/test_teamcity_reporter.pks @@ -16,7 +16,10 @@ create or replace package test_teamcity_reporter as procedure trims_long_output; --%test(Reports failures on multiple expectations) - procedure report_mutiple_expectations; + procedure report_multiple_expectations; + + --%test(Reports failures on multiple expectations) + procedure report_multiple_expect_on_err; --%afterall procedure remove_test_package; From 6a32cbd572dd9cbbcb8858a32693cd6f41376267 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 28 Apr 2023 10:29:06 +0100 Subject: [PATCH 1065/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index a47004a3c..afdf64bdd 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 8b6437299..37bc28342 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 02eabab07..c4a36c2fc 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index aacb289f2..450bde3ad 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 5e30a9fc6..926b89912 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) ## What is utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 8db920ee7..2efea8de6 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 7c7015872..0ef65a9e8 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package. No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit. diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index b83fb78c3..3582c1968 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) The following are best practices we at utPLSQL have learned about PL/SQL and Unit Testing. diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 04b3db380..35cdd3a3f 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. Code coverage is gathered for the following source types: diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index a7b0ae0a5..bbda24125 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) utPLSQL is responsible for handling exceptions wherever they occur in the test run. The framework is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. The framework provides a full stacktrace for every exception that was thrown. The reported stacktrace does not include any utPLSQL library calls in it. diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 2b436250e..af07865b1 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) ## Expectation concepts diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 37c22c882..afd4ad124 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 00a74b288..7e6af19cd 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) ## Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 164c0cbc0..0a5584ba9 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) ## Obtaining information about suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index e92558e3d..ca62b674e 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) utPLSQL provides several reporting formats. The sections below describe most of them. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 2b18a3d3b..a24145f82 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) utPLSQL framework provides two main entry points to run unit tests from within the database: diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 794e75070..160c51fd4 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4105--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index b60fc4cdf..954d4f8be 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.14.4105-develop'; + gc_version constant varchar2(50) := 'v3.1.14.4167-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 962f6fd4446d8369af56360dcc591e2a7cc919f7 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 21 May 2023 12:54:53 +0300 Subject: [PATCH 1066/1096] Resolves #1252 Replaced all regexp ranges with posix representations to avoid NLS_SORT impact on regex behavior. --- .../core/annotations/ut_annotation_manager.pkb | 2 +- .../core/annotations/ut_annotation_parser.pkb | 2 +- source/core/types/ut_executable_test.tpb | 2 +- source/core/ut_expectation_processor.pkb | 12 ++++++------ source/core/ut_metadata.pkb | 2 +- source/core/ut_suite_cache_manager.pkb | 4 ++-- source/core/ut_suite_manager.pkb | 8 ++++---- source/core/ut_utils.pkb | 6 +++--- test/ut3_tester/core/test_suite_manager.pkb | 17 +++++++++++++++++ test/ut3_tester/core/test_suite_manager.pks | 10 ++++++++++ 10 files changed, 46 insertions(+), 19 deletions(-) diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb index 16923bc23..65f7b3e40 100644 --- a/source/core/annotations/ut_annotation_manager.pkb +++ b/source/core/annotations/ut_annotation_manager.pkb @@ -246,7 +246,7 @@ create or replace package body ut_annotation_manager as l_sql_clob := regexp_replace(l_sql_clob, '^(.*?\s*create(\s+or\s+replace)?(\s+(editionable|noneditionable))?\s+?)((package|type).*)', '\5', 1, 1, 'ni'); -- remove "OWNER." from create or replace statement. -- Owner is not supported along with AUTHID - see issue https://github.com/utPLSQL/utPLSQL/issues/1088 - l_sql_clob := regexp_replace(l_sql_clob, '^(package|type)\s+("?[a-zA-Z][a-zA-Z0-9#_$]*"?\.)(.*)', '\1 \3', 1, 1, 'ni'); + l_sql_clob := regexp_replace(l_sql_clob, '^(package|type)\s+("?[[:alpha:]][[:alnum:]$#_]*"?\.)(.*)', '\1 \3', 1, 1, 'ni'); l_sql_lines := ut_utils.convert_collection( ut_utils.clob_to_table(l_sql_clob) ); end if; open l_result for diff --git a/source/core/annotations/ut_annotation_parser.pkb b/source/core/annotations/ut_annotation_parser.pkb index f0271c957..10bb76b3c 100644 --- a/source/core/annotations/ut_annotation_parser.pkb +++ b/source/core/annotations/ut_annotation_parser.pkb @@ -25,7 +25,7 @@ create or replace package body ut_annotation_parser as gc_annot_comment_pattern constant varchar2(30) := '^( |'||chr(09)||')*-- *('||gc_annotation_qualifier||'.*?)$'; -- chr(09) is a tab character gc_comment_replacer_patter constant varchar2(50) := '{COMMENT#%N%}'; gc_comment_replacer_regex_ptrn constant varchar2(25) := '{COMMENT#(\d+)}'; - gc_regexp_identifier constant varchar2(50) := '[a-zA-Z][a-zA-Z0-9#_$]*'; + gc_regexp_identifier constant varchar2(50) := '[[:alpha:]][[:alnum:]$#_]*'; gc_annotation_block_pattern constant varchar2(200) := '(({COMMENT#.+}'||chr(10)||')+)( |'||chr(09)||')*(procedure|function)\s+(' || gc_regexp_identifier || ')'; gc_annotation_pattern constant varchar2(50) := gc_annotation_qualifier || gc_regexp_identifier || '[ '||chr(9)||']*(\(.*?\)\s*?$)?'; diff --git a/source/core/types/ut_executable_test.tpb b/source/core/types/ut_executable_test.tpb index c5a7f29a1..fa5872e04 100644 --- a/source/core/types/ut_executable_test.tpb +++ b/source/core/types/ut_executable_test.tpb @@ -159,7 +159,7 @@ create or replace type body ut_executable_test as if self.error_stack is null then l_fail_message := 'Expected one of exceptions ('||l_expected_error_codes||') but nothing was raised.'; else - l_actual_error_no := regexp_substr(self.error_stack, '^[a-zA-Z]{3}(-[0-9]+)', subexpression=>1); + l_actual_error_no := regexp_substr(self.error_stack, '^[[:alpha:]]{3}(-[0-9]+)', subexpression=>1); if not l_actual_error_no member of a_expected_error_codes or l_actual_error_no is null then l_fail_message := 'Actual: '||l_actual_error_no||' was expected to '; if cardinality(a_expected_error_codes) > 1 then diff --git a/source/core/ut_expectation_processor.pkb b/source/core/ut_expectation_processor.pkb index 77b734b30..c165a9ee5 100644 --- a/source/core/ut_expectation_processor.pkb +++ b/source/core/ut_expectation_processor.pkb @@ -159,17 +159,17 @@ create or replace package body ut_expectation_processor as -- when 11g and 12c reports only package name function cut_header_and_expectations( a_stack varchar2 ) return varchar2 is begin - return regexp_substr( a_stack, '(.*\.(UT_EQUAL|UT_BE_WITHIN[A-Z0-9#_$]*|UT_EXPECTATION[A-Z0-9#_$]*|UT|UTASSERT2?)(\.[A-Z0-9#_$]+)?\s+)+((.|\s)*)', 1, 1, 'm', 4); + return regexp_substr( a_stack, '(.*\.(UT_EQUAL|UT_BE_WITHIN[[:alnum:]$#_]*|UT_EXPECTATION[[:alnum:]$#_]*|UT|UTASSERT2?)(\.[[:alnum:]$#_]+)?\s+)+((.|\s)*)', 1, 1, 'm', 4); end; function cut_address_columns( a_stack varchar2 ) return varchar2 is begin - return regexp_replace( a_stack, '^(0x)?[0-9a-f]+\s+', '', 1, 0, 'mi' ); + return regexp_replace( a_stack, '^(0x)?[[:digit:]abcdef]+\s+', '', 1, 0, 'mi' ); end; function cut_framework_stack( a_stack varchar2 ) return varchar2 is begin return regexp_replace( a_stack, - '[0-9]+\s+anonymous\s+block\s+[0-9]+\s+package\s+body\s+sys\.dbms_sql(\.execute)?\s+[0-9]+\s+[0-9_$#a-z ]+\.ut_executable.*', + '[0-9]+\s+anonymous\s+block\s+[0-9]+\s+package\s+body\s+sys\.dbms_sql(\.execute)?\s+[0-9]+\s+[[:alnum:]_$# ]+\.ut_executable.*', '', 1, 1, 'mni' ); @@ -178,7 +178,7 @@ create or replace package body ut_expectation_processor as begin return regexp_replace( a_stack, - '([0-9]+)\s+(.* )?((anonymous block)|(([0-9_$#a-z]+\.[0-9_$#a-z]+(\.([0-9_$#a-z])+)?)))', + '([0-9]+)\s+(.* )?((anonymous block)|(([[:alnum:]$#_]+\.[[:alnum:]$#_]+(\.([[:alnum:]$#_])+)?)))', 'at "\3", line \1', 1, 0, 'i' ); end; @@ -190,8 +190,8 @@ create or replace package body ut_expectation_processor as l_caller_stack_line := regexp_substr(l_call_stack,'^(.*)'); if l_caller_stack_line like '%.%' then l_line_no := to_number( regexp_substr( l_caller_stack_line, ', line (\d+)', subexpression => 1 ) ); - l_owner := regexp_substr( l_caller_stack_line, 'at "([A-Za-z0-9$#_]+)\.(([A-Za-z0-9$#_]+)(\.([A-Za-z0-9$#_]+))?)", line (\d+)', subexpression => 1 ); - l_object_name := regexp_substr( l_caller_stack_line, 'at "([A-Za-z0-9$#_]+)\.(([A-Za-z0-9$#_]+)(\.([A-Za-z0-9$#_]+))?)", line (\d+)', subexpression => 3 ); + l_owner := regexp_substr( l_caller_stack_line, 'at "([[:alnum:]$#_]+)\.(([[:alnum:]$#_]+)(\.([[:alnum:]$#_]+))?)", line (\d+)', subexpression => 1 ); + l_object_name := regexp_substr( l_caller_stack_line, 'at "([[:alnum:]$#_]+)\.(([[:alnum:]$#_]+)(\.([[:alnum:]$#_]+))?)", line (\d+)', subexpression => 3 ); l_result := l_caller_stack_line || ' ' || rtrim(ut_metadata.get_source_definition_line(l_owner, l_object_name, l_line_no),chr(10)) || replace( l_call_stack, l_caller_stack_line ); diff --git a/source/core/ut_metadata.pkb b/source/core/ut_metadata.pkb index 700c0efb0..360b7b97d 100644 --- a/source/core/ut_metadata.pkb +++ b/source/core/ut_metadata.pkb @@ -304,7 +304,7 @@ create or replace package body ut_metadata as begin l_result := regexp_substr( a_full_object_name, - '^([A-Za-z0-9$#_]+|".*?")\.([A-Za-z0-9$#_]+|".*?")', subexpression => 2 + '^([[:alnum:]$#_]+|".*?")\.([[:alnum:]$#_]+|".*?")', subexpression => 2 ); if not l_result like '"%"' then l_result := upper(l_result); diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb index 680624f02..6d621c339 100644 --- a/source/core/ut_suite_cache_manager.pkb +++ b/source/core/ut_suite_cache_manager.pkb @@ -88,7 +88,7 @@ create or replace package body ut_suite_cache_manager is end; function group_paths_by_schema(a_paths ut_varchar2_list) return ut_path_items is - c_package_path_regex constant varchar2(100) := '^([A-Za-z0-9$#_]+)(\.([A-Za-z0-9$#_\*]+))?(\.([A-Za-z0-9$#_\*]+))?$'; + c_package_path_regex constant varchar2(100) := '^([[:alnum:]$#_]+)(\.([[:alnum:]$#_\*]+))?(\.([[:alnum:]$#_\*]+))?$'; l_results ut_path_items := ut_path_items(); l_path_item ut_path_item; i pls_integer; @@ -157,7 +157,7 @@ create or replace package body ut_suite_cache_manager is from schema_paths sp left outer join ut_suite_cache c on ( c.object_owner = upper(sp.schema_name) --and c.path like replace(sp.suite_path,'*','%')) - and regexp_like(c.path,'^'||replace(sp.suite_path,'*','[A-Za-z0-9$#_]*'))) + and regexp_like(c.path,'^'||replace(sp.suite_path,'*','[[:alnum:]$#_]*'))) where sp.suite_path is not null and instr(sp.suite_path,'*') > 0 ), straigth_suite_paths as ( diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb index c46ba66b8..c418de638 100644 --- a/source/core/ut_suite_manager.pkb +++ b/source/core/ut_suite_manager.pkb @@ -32,7 +32,7 @@ create or replace package body ut_suite_manager is for i in 1 .. a_paths.count loop l_path := a_paths(i); if l_path is null or not ( - regexp_like(l_path, '^[A-Za-z0-9$#_\*]+(\.[A-Za-z0-9$#_\*]+){0,2}$') or regexp_like(l_path, '^([A-Za-z0-9$#_]+)?:[A-Za-z0-9$#_\*]+(\.[A-Za-z0-9$#_\*]+)*$')) then + regexp_like(l_path, '^[[:alnum:]$#_\*]+(\.[[:alnum:]$#_\*]+){0,2}$') or regexp_like(l_path, '^([[:alnum:]$#_]+)?:[[:alnum:]$#_\*]+(\.[[:alnum:]$#_\*]+)*$')) then raise_application_error(ut_utils.gc_invalid_path_format, 'Invalid path format: ' || nvl(l_path, 'NULL')); end if; end loop; @@ -61,9 +61,9 @@ create or replace package body ut_suite_manager is for i in 1 .. a_paths.count loop --if path is suite-path - if regexp_like(a_paths(i), '^([A-Za-z0-9$#_]+)?:') then + if regexp_like(a_paths(i), '^([[:alnum:]$#_]+)?:') then --get schema name / path - l_schema := regexp_substr(a_paths(i), '^([A-Za-z0-9$#_]+)?:',subexpression => 1); + l_schema := regexp_substr(a_paths(i), '^([[:alnum:]$#_]+)?:',subexpression => 1); -- transform ":path1[.path2]" to "schema:path1[.path2]" if l_schema is not null then l_schema := sys.dbms_assert.schema_name(upper(l_schema)); @@ -78,7 +78,7 @@ create or replace package body ut_suite_manager is -- Object name or procedure is allowed to have filter char -- However this is not allowed on schema begin - l_object := regexp_substr(a_paths(i), '^[A-Za-z0-9$#_\*]+'); + l_object := regexp_substr(a_paths(i), '^[[:alnum:]$#_\*]+'); l_schema := sys.dbms_assert.schema_name(upper(l_object)); exception when sys.dbms_assert.invalid_schema_name then diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index 6f972e11c..f29e3b188 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -19,9 +19,9 @@ create or replace package body ut_utils is /** * Constants regex used to validate XML name */ - gc_invalid_first_xml_char constant varchar2(50) := '[^_a-zA-Z]'; - gc_invalid_xml_char constant varchar2(50) := '[^_a-zA-Z0-9\.-]'; - gc_full_valid_xml_name constant varchar2(50) := '^([_a-zA-Z])([_a-zA-Z0-9\.-])*$'; + gc_invalid_first_xml_char constant varchar2(50) := '[^_[:alpha:]]'; + gc_invalid_xml_char constant varchar2(50) := '[^_[:alnum:]\.-]'; + gc_full_valid_xml_name constant varchar2(50) := '^([[:alpha:]])([_[:alnum:]\.-])*$'; gc_owner_hash constant integer(11) := dbms_utility.get_hash_value( ut_owner(), 0, power(2,31)-1); diff --git a/test/ut3_tester/core/test_suite_manager.pkb b/test/ut3_tester/core/test_suite_manager.pkb index fbac0f3f5..c818ad212 100644 --- a/test/ut3_tester/core/test_suite_manager.pkb +++ b/test/ut3_tester/core/test_suite_manager.pkb @@ -2217,5 +2217,22 @@ end;]'; end loop; end; + --%test(Path validation does not fail on Estonian NLS_SORT - fix #1252) + procedure path_validate_nls_sort is + l_schema_names ut3_develop.ut_varchar2_rows; + begin + --Arrange + execute immediate q'[alter session set nls_sort='estonian']'; + --Act + l_schema_names := ut3_develop.ut_suite_manager.get_schema_names(ut3_develop.ut_varchar2_list('ut3')); + --Asseert + ut.expect(sqlcode).to_equal(0); + end; + + + procedure reset_nls_sort is + begin + execute immediate q'[alter session set nls_sort='binary']'; + end; end test_suite_manager; / diff --git a/test/ut3_tester/core/test_suite_manager.pks b/test/ut3_tester/core/test_suite_manager.pks index d9d4efc09..ac7818f4f 100644 --- a/test/ut3_tester/core/test_suite_manager.pks +++ b/test/ut3_tester/core/test_suite_manager.pks @@ -237,5 +237,15 @@ create or replace package test_suite_manager is --%endcontext + --%context(paths validation) + + --%test(Path validation does not fail on Estonian NLS_SORT - fix #1252) + --%aftertest(reset_nls_sort) + procedure path_validate_nls_sort; + + procedure reset_nls_sort; + + --%endcontext + end test_suite_manager; / From 6589b8468ecaaf85258873e6484c0183b770dc17 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 27 May 2023 12:42:57 +0100 Subject: [PATCH 1067/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index afdf64bdd..9d18766ae 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 37bc28342..a9cd17bc9 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index c4a36c2fc..0b1b005c6 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 450bde3ad..639dc2970 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 926b89912..bd908d60c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) ## What is utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 2efea8de6..eb3b311a5 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 0ef65a9e8..4f1c6b420 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package. No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit. diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 3582c1968..f5f889ca6 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) The following are best practices we at utPLSQL have learned about PL/SQL and Unit Testing. diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 35cdd3a3f..dbd584a7c 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. Code coverage is gathered for the following source types: diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index bbda24125..cad56f1b8 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) utPLSQL is responsible for handling exceptions wherever they occur in the test run. The framework is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. The framework provides a full stacktrace for every exception that was thrown. The reported stacktrace does not include any utPLSQL library calls in it. diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index af07865b1..67f851f36 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) ## Expectation concepts diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index afd4ad124..b2c67054e 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 7e6af19cd..4e1b3e903 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) ## Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 0a5584ba9..d68240a5d 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) ## Obtaining information about suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index ca62b674e..ca3878f9f 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) utPLSQL provides several reporting formats. The sections below describe most of them. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index a24145f82..4fdb74073 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) utPLSQL framework provides two main entry points to run unit tests from within the database: diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 160c51fd4..bd401f5d9 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4167--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 954d4f8be..90c165bbb 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.14.4167-develop'; + gc_version constant varchar2(50) := 'v3.1.14.4171-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 8b45b0d670d7212f4e1ffbc9635a4a1b2a621cf1 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 28 May 2023 16:00:15 +0300 Subject: [PATCH 1068/1096] Fix output length error and output buffer. When dealing with multibyte strings, the substring limit of 4000 **chars** is not correct. We need to apply a limit of 4000 **bytes** to both VARCHAR2 and to CLOB data types. This means we need to have a function to calculate lenght of CLOB in bytes. This is now added and all the conversions/trimming/string-splitting is done using the string length in **bytes** Additionally, a different approach (with sequences) was introduced into output buffers to avoid the sometime occurring PK violation on the output buffer tables. The new approach may add a but overhead on reading from / saving into buffer, but will definitely address the threat of PK errors. Resolves #1254 Resolves #1128 Replaced all regexp ranges with posix representations to avoid NLS_SORT impact on regex behavior. --- .../output_buffers/ut_output_buffer_base.tpb | 1 - .../output_buffers/ut_output_buffer_base.tps | 1 - .../output_buffers/ut_output_buffer_tmp.sql | 1 + .../output_buffers/ut_output_bulk_buffer.tpb | 9 ++-- .../ut_output_clob_buffer_tmp.sql | 2 + .../ut_output_clob_table_buffer.tpb | 17 ++----- .../output_buffers/ut_output_table_buffer.tpb | 27 ++++------ source/core/ut_utils.pkb | 48 ++++++++++++++--- source/core/ut_utils.pks | 5 ++ source/uninstall_objects.sql | 4 ++ test/ut3_tester/core/test_output_buffer.pkb | 51 ++++++++++++++++--- test/ut3_tester/core/test_output_buffer.pks | 6 +++ test/ut3_tester/core/test_ut_utils.pkb | 18 +++++++ test/ut3_tester/core/test_ut_utils.pks | 13 +++-- 14 files changed, 149 insertions(+), 54 deletions(-) diff --git a/source/core/output_buffers/ut_output_buffer_base.tpb b/source/core/output_buffers/ut_output_buffer_base.tpb index be4c92bd8..20cec335e 100644 --- a/source/core/output_buffers/ut_output_buffer_base.tpb +++ b/source/core/output_buffers/ut_output_buffer_base.tpb @@ -24,7 +24,6 @@ create or replace type body ut_output_buffer_base is self.self_type := coalesce(a_self_type,self.self_type); self.output_id := coalesce(a_output_id, self.output_id, sys_guid()); self.start_date := coalesce(self.start_date, sysdate); - self.last_write_message_id := 0; select /*+ no_parallel */ count(*) into l_exists from ut_output_buffer_info_tmp where output_id = self.output_id; if ( l_exists > 0 ) then update /*+ no_parallel */ ut_output_buffer_info_tmp set start_date = self.start_date where output_id = self.output_id; diff --git a/source/core/output_buffers/ut_output_buffer_base.tps b/source/core/output_buffers/ut_output_buffer_base.tps index 53be365ae..f2d9ec686 100644 --- a/source/core/output_buffers/ut_output_buffer_base.tps +++ b/source/core/output_buffers/ut_output_buffer_base.tps @@ -19,7 +19,6 @@ create or replace type ut_output_buffer_base force authid definer as object( output_id raw(32), is_closed number(1,0), start_date date, - last_write_message_id number(38,0), lock_handle varchar2(30 byte), self_type varchar2(250 byte), member procedure init(self in out nocopy ut_output_buffer_base, a_output_id raw := null, a_self_type varchar2 := null), diff --git a/source/core/output_buffers/ut_output_buffer_tmp.sql b/source/core/output_buffers/ut_output_buffer_tmp.sql index 57027817e..1ab19e534 100644 --- a/source/core/output_buffers/ut_output_buffer_tmp.sql +++ b/source/core/output_buffers/ut_output_buffer_tmp.sql @@ -30,3 +30,4 @@ create table ut_output_buffer_tmp( ) organization index nologging initrans 100 overflow nologging initrans 100; +create sequence ut_output_buffer_tmp_seq cache 20; diff --git a/source/core/output_buffers/ut_output_bulk_buffer.tpb b/source/core/output_buffers/ut_output_bulk_buffer.tpb index ceae07862..cfc173e95 100644 --- a/source/core/output_buffers/ut_output_bulk_buffer.tpb +++ b/source/core/output_buffers/ut_output_bulk_buffer.tpb @@ -34,9 +34,8 @@ create or replace type body ut_output_bulk_buffer is a_item_type ); else - self.last_write_message_id := self.last_write_message_id + 1; insert /*+ no_parallel */ into ut_output_buffer_tmp(output_id, message_id, text, item_type) - values (self.output_id, self.last_write_message_id, a_text, a_item_type); + values (self.output_id, ut_output_buffer_tmp_seq.nextval, a_text, a_item_type); end if; commit; end if; @@ -46,10 +45,9 @@ create or replace type body ut_output_bulk_buffer is pragma autonomous_transaction; begin insert /*+ no_parallel */ into ut_output_buffer_tmp(output_id, message_id, text, item_type) - select /*+ no_parallel */ self.output_id, self.last_write_message_id + rownum, t.column_value, a_item_type + select /*+ no_parallel */ self.output_id, ut_output_buffer_tmp_seq.nextval, t.column_value, a_item_type from table(a_text_list) t where t.column_value is not null or a_item_type is not null; - self.last_write_message_id := self.last_write_message_id + sql%rowcount; commit; end; @@ -65,9 +63,8 @@ create or replace type body ut_output_bulk_buffer is a_item_type ); else - self.last_write_message_id := self.last_write_message_id + 1; insert /*+ no_parallel */ into ut_output_buffer_tmp(output_id, message_id, text, item_type) - values (self.output_id, self.last_write_message_id, a_text, a_item_type); + values (self.output_id, ut_output_buffer_tmp_seq.nextval, a_text, a_item_type); end if; commit; end if; diff --git a/source/core/output_buffers/ut_output_clob_buffer_tmp.sql b/source/core/output_buffers/ut_output_clob_buffer_tmp.sql index 40dda121f..9ff9f7413 100644 --- a/source/core/output_buffers/ut_output_clob_buffer_tmp.sql +++ b/source/core/output_buffers/ut_output_clob_buffer_tmp.sql @@ -45,3 +45,5 @@ begin end; end; / + +create sequence ut_output_clob_buffer_tmp_seq cache 20; diff --git a/source/core/output_buffers/ut_output_clob_table_buffer.tpb b/source/core/output_buffers/ut_output_clob_table_buffer.tpb index c4cfdb059..3d49ab08d 100644 --- a/source/core/output_buffers/ut_output_clob_table_buffer.tpb +++ b/source/core/output_buffers/ut_output_clob_table_buffer.tpb @@ -26,9 +26,8 @@ create or replace type body ut_output_clob_table_buffer is pragma autonomous_transaction; begin if a_text is not null or a_item_type is not null then - self.last_write_message_id := self.last_write_message_id + 1; insert /*+ no_parallel */ into ut_output_clob_buffer_tmp(output_id, message_id, text, item_type) - values (self.output_id, self.last_write_message_id, a_text, a_item_type); + values (self.output_id, ut_output_clob_buffer_tmp_seq.nextval, a_text, a_item_type); end if; commit; end; @@ -37,10 +36,9 @@ create or replace type body ut_output_clob_table_buffer is pragma autonomous_transaction; begin insert /*+ no_parallel */ into ut_output_clob_buffer_tmp(output_id, message_id, text, item_type) - select /*+ no_parallel */ self.output_id, self.last_write_message_id + rownum, t.column_value, a_item_type + select /*+ no_parallel */ self.output_id, ut_output_clob_buffer_tmp_seq.nextval, t.column_value, a_item_type from table(a_text_list) t where t.column_value is not null or a_item_type is not null; - self.last_write_message_id := self.last_write_message_id + SQL%rowcount; commit; end; @@ -48,9 +46,8 @@ create or replace type body ut_output_clob_table_buffer is pragma autonomous_transaction; begin if a_text is not null and a_text != empty_clob() or a_item_type is not null then - self.last_write_message_id := self.last_write_message_id + 1; insert /*+ no_parallel */ into ut_output_clob_buffer_tmp(output_id, message_id, text, item_type) - values (self.output_id, self.last_write_message_id, a_text, a_item_type); + values (self.output_id, ut_output_clob_buffer_tmp_seq.nextval, a_text, a_item_type); end if; commit; end; @@ -60,7 +57,6 @@ create or replace type body ut_output_clob_table_buffer is l_buffer_rowids ut_varchar2_rows; l_buffer_data ut_output_data_rows; l_finished_flags ut_integer_list; - l_last_read_message_id integer; l_already_waited_sec number(10,2) := 0; l_finished boolean := false; l_sleep_time number(2,1); @@ -68,25 +64,22 @@ create or replace type body ut_output_clob_table_buffer is l_producer_started boolean := false; l_producer_finished boolean := false; procedure get_data_from_buffer_table( - a_last_read_message_id in out nocopy integer, a_buffer_data out nocopy ut_output_data_rows, a_buffer_rowids out nocopy ut_varchar2_rows, a_finished_flags out nocopy ut_integer_list ) is lc_bulk_limit constant integer := 5000; begin - a_last_read_message_id := coalesce(a_last_read_message_id, 0); with ordered_buffer as ( select /*+ no_parallel index(a) */ ut_output_data_row(a.text, a.item_type), rowidtochar(a.rowid), is_finished from ut_output_clob_buffer_tmp a where a.output_id = self.output_id - and a.message_id <= a_last_read_message_id + lc_bulk_limit + and a.message_id <= (select min(message_id) from ut_output_clob_buffer_tmp o where o.output_id = self.output_id) + lc_bulk_limit order by a.message_id ) select /*+ no_parallel */ b.* bulk collect into a_buffer_data, a_buffer_rowids, a_finished_flags from ordered_buffer b; - a_last_read_message_id := a_last_read_message_id + a_finished_flags.count; end; procedure remove_read_data(a_buffer_rowids ut_varchar2_rows) is @@ -103,7 +96,7 @@ create or replace type body ut_output_clob_table_buffer is l_sleep_time := case when l_already_waited_sec >= 1 then 0.5 else 0.1 end; l_lock_status := self.get_lock_status(); - get_data_from_buffer_table( l_last_read_message_id, l_buffer_data, l_buffer_rowids, l_finished_flags ); + get_data_from_buffer_table( l_buffer_data, l_buffer_rowids, l_finished_flags ); if l_buffer_data.count > 0 then l_already_waited_sec := 0; diff --git a/source/core/output_buffers/ut_output_table_buffer.tpb b/source/core/output_buffers/ut_output_table_buffer.tpb index 480ae9144..e8e2442a7 100644 --- a/source/core/output_buffers/ut_output_table_buffer.tpb +++ b/source/core/output_buffers/ut_output_table_buffer.tpb @@ -26,7 +26,7 @@ create or replace type body ut_output_table_buffer is pragma autonomous_transaction; begin if a_text is not null or a_item_type is not null then - if length(a_text) > ut_utils.gc_max_storage_varchar2_len then + if lengthb(a_text) > ut_utils.gc_max_storage_varchar2_len then self.send_lines( ut_utils.convert_collection( ut_utils.clob_to_table(a_text, ut_utils.gc_max_storage_varchar2_len) @@ -34,9 +34,8 @@ create or replace type body ut_output_table_buffer is a_item_type ); else - self.last_write_message_id := self.last_write_message_id + 1; insert /*+ no_parallel */ into ut_output_buffer_tmp(output_id, message_id, text, item_type) - values (self.output_id, self.last_write_message_id, a_text, a_item_type); + values (self.output_id, ut_output_buffer_tmp_seq.nextval, a_text, a_item_type); end if; commit; end if; @@ -46,10 +45,9 @@ create or replace type body ut_output_table_buffer is pragma autonomous_transaction; begin insert /*+ no_parallel */ into ut_output_buffer_tmp(output_id, message_id, text, item_type) - select /*+ no_parallel */ self.output_id, self.last_write_message_id + rownum, t.column_value, a_item_type + select /*+ no_parallel */ self.output_id, ut_output_buffer_tmp_seq.nextval, t.column_value, a_item_type from table(a_text_list) t where t.column_value is not null or a_item_type is not null; - self.last_write_message_id := self.last_write_message_id + SQL%rowcount; commit; end; @@ -57,7 +55,7 @@ create or replace type body ut_output_table_buffer is pragma autonomous_transaction; begin if a_text is not null and a_text != empty_clob() or a_item_type is not null then - if length(a_text) > ut_utils.gc_max_storage_varchar2_len then + if ut_utils.lengthb_clob(a_text) > ut_utils.gc_max_storage_varchar2_len then self.send_lines( ut_utils.convert_collection( ut_utils.clob_to_table(a_text, ut_utils.gc_max_storage_varchar2_len) @@ -65,9 +63,8 @@ create or replace type body ut_output_table_buffer is a_item_type ); else - self.last_write_message_id := self.last_write_message_id + 1; insert /*+ no_parallel */ into ut_output_buffer_tmp(output_id, message_id, text, item_type) - values (self.output_id, self.last_write_message_id, a_text, a_item_type); + values (self.output_id, ut_output_buffer_tmp_seq.nextval, a_text, a_item_type); end if; commit; end if; @@ -99,7 +96,6 @@ create or replace type body ut_output_table_buffer is l_buffer_texts ut_varchar2_rows; l_buffer_item_types ut_varchar2_rows; l_finished_flags ut_integer_list; - l_last_read_message_id integer; l_already_waited_sec number(10,2) := 0; l_finished boolean := false; l_sleep_time number(2,1); @@ -108,7 +104,6 @@ create or replace type body ut_output_table_buffer is l_producer_finished boolean := false; procedure get_data_from_buffer_table( - a_last_read_message_id in out nocopy integer, a_buffer_texts out nocopy ut_varchar2_rows, a_buffer_item_types out nocopy ut_varchar2_rows, a_finished_flags out nocopy ut_integer_list @@ -116,17 +111,15 @@ create or replace type body ut_output_table_buffer is lc_bulk_limit constant integer := 20000; pragma autonomous_transaction; begin - a_last_read_message_id := coalesce(a_last_read_message_id,0); delete /*+ no_parallel */ from ( select /*+ no_parallel */ * - from ut_output_buffer_tmp o - where o.output_id = self.output_id - and o.message_id <= a_last_read_message_id + lc_bulk_limit - order by o.message_id + from ut_output_buffer_tmp a + where a.output_id = self.output_id + and a.message_id <= (select min(message_id) from ut_output_buffer_tmp o where o.output_id = self.output_id) + lc_bulk_limit + order by a.message_id ) d returning d.text, d.item_type, d.is_finished bulk collect into a_buffer_texts, a_buffer_item_types, a_finished_flags; - a_last_read_message_id := a_last_read_message_id + a_finished_flags.count; commit; end; begin @@ -134,7 +127,7 @@ create or replace type body ut_output_table_buffer is l_sleep_time := case when l_already_waited_sec >= 1 then 0.5 else 0.1 end; l_lock_status := self.get_lock_status(); - get_data_from_buffer_table( l_last_read_message_id, l_buffer_texts, l_buffer_item_types, l_finished_flags ); + get_data_from_buffer_table( l_buffer_texts, l_buffer_item_types, l_finished_flags ); if l_buffer_texts.count > 0 then l_already_waited_sec := 0; diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb index f29e3b188..81d47221b 100644 --- a/source/core/ut_utils.pkb +++ b/source/core/ut_utils.pkb @@ -92,8 +92,8 @@ create or replace package body ut_utils is a_max_output_len in number := gc_max_output_string_length ) return varchar2 is l_result varchar2(32767); - c_length constant integer := coalesce( length( a_value ), 0 ); - c_max_input_string_length constant integer := a_max_output_len - coalesce( length( a_quote_char ) * 2, 0 ); + c_length constant integer := coalesce( lengthb( a_value ), 0 ); + c_max_input_string_length constant integer := a_max_output_len - coalesce( lengthb( a_quote_char ) * 2, 0 ); c_overflow_substr_len constant integer := c_max_input_string_length - gc_more_data_string_len; begin if c_length = 0 then @@ -112,8 +112,8 @@ create or replace package body ut_utils is a_max_output_len in number := gc_max_output_string_length ) return varchar2 is l_result varchar2(32767); - c_length constant integer := coalesce(dbms_lob.getlength(a_value), 0); - c_max_input_string_length constant integer := a_max_output_len - coalesce( length( a_quote_char ) * 2, 0 ); + c_length constant integer := coalesce(ut_utils.lengthb_clob(a_value), 0); + c_max_input_string_length constant integer := a_max_output_len - coalesce( lengthb( a_quote_char ) * 2, 0 ); c_overflow_substr_len constant integer := c_max_input_string_length - gc_more_data_string_len; begin if a_value is null then @@ -135,7 +135,7 @@ create or replace package body ut_utils is ) return varchar2 is l_result varchar2(32767); c_length constant integer := coalesce(dbms_lob.getlength(a_value), 0); - c_max_input_string_length constant integer := a_max_output_len - coalesce( length( a_quote_char ) * 2, 0 ); + c_max_input_string_length constant integer := a_max_output_len - coalesce( lengthb( a_quote_char ) * 2, 0 ); c_overflow_substr_len constant integer := c_max_input_string_length - gc_more_data_string_len; begin if a_value is null then @@ -412,7 +412,7 @@ create or replace package body ut_utils is if a_list is null then a_list := ut_varchar2_rows(); end if; - if length(a_item) > gc_max_storage_varchar2_len then + if lengthb(a_item) > gc_max_storage_varchar2_len then append_to_list( a_list, ut_utils.convert_collection( @@ -468,7 +468,7 @@ create or replace package body ut_utils is l_result := ut_varchar2_rows(); for i in 1 .. a_collection.count loop l_result.extend(); - l_result(i) := substr(a_collection(i),1,gc_max_storage_varchar2_len); + l_result(i) := substrb(a_collection(i),1,gc_max_storage_varchar2_len); end loop; end if; return l_result; @@ -990,5 +990,39 @@ create or replace package body ut_utils is return l_result; end; + + + /* + * Inspired by + * https://stackoverflow.com/a/48782891 + */ + function lengthb_clob( a_clob clob) return integer is + l_blob blob; + l_desc_offset PLS_INTEGER := 1; + l_src_offset PLS_INTEGER := 1; + l_lang PLS_INTEGER := 0; + l_warning PLS_INTEGER := 0; + l_result integer; + begin + if a_clob = empty_clob() then + l_result := 0; + elsif a_clob is not null then + dbms_lob.createtemporary(l_blob,true); + dbms_lob.converttoblob + ( l_blob + , a_clob + , dbms_lob.getlength(a_clob) + , l_desc_offset + , l_src_offset + , dbms_lob.default_csid + , l_lang + , l_warning + ); + l_result := length(l_blob); + dbms_lob.freetemporary(l_blob); + end if; + return l_result; + end; + end ut_utils; / diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 90c165bbb..ee5ed7876 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -476,6 +476,11 @@ create or replace package ut_utils authid definer is * Return value of interval in plain english */ function interval_to_text(a_interval yminterval_unconstrained) return varchar2; + + /* + * Return length of CLOB in bytes. Null for NULL + */ + function lengthb_clob( a_clob clob) return integer; end ut_utils; / diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index f488b8b8d..a0b53ba21 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -333,8 +333,12 @@ drop type ut_output_buffer_base force; drop table ut_output_buffer_tmp purge; +drop table ut_output_buffer_tmp_seq purge; + drop table ut_output_clob_buffer_tmp purge; +drop table ut_output_clob_buffer_tmp_seq purge; + drop table ut_output_buffer_info_tmp purge; drop package ut_session_context; diff --git a/test/ut3_tester/core/test_output_buffer.pkb b/test/ut3_tester/core/test_output_buffer.pkb index edb10e3e6..317e7e3d5 100644 --- a/test/ut3_tester/core/test_output_buffer.pkb +++ b/test/ut3_tester/core/test_output_buffer.pkb @@ -56,8 +56,8 @@ create or replace package body test_output_buffer is procedure test_doesnt_send_on_null_elem is - l_cur sys_refcursor; - l_result integer; + l_actual sys_refcursor; + l_expected sys_refcursor; l_buffer ut3_develop.ut_output_buffer_base := ut3_develop.ut_output_table_buffer(); l_message_id varchar2(255); l_text varchar2(4000); @@ -67,9 +67,12 @@ create or replace package body test_output_buffer is l_buffer.send_lines(ut3_develop.ut_varchar2_rows(null)); l_buffer.send_lines(ut3_develop.ut_varchar2_rows('test')); - select message_id, text into l_message_id, l_text from table(ut3_tester_helper.run_helper.ut_output_buffer_tmp); - ut.expect(l_message_id).to_equal('1'); - ut.expect(l_text).to_equal('test'); + open l_actual for + select text from table(ut3_tester_helper.run_helper.ut_output_buffer_tmp); + open l_expected for + select 'test' as text from dual; + + ut.expect(l_actual).to_equal(l_expected); end; procedure test_send_line is @@ -157,5 +160,41 @@ create or replace package body test_output_buffer is test_purge(ut3_develop.ut_output_clob_table_buffer()); end; -end test_output_buffer; + procedure text_buffer_send_multibyte is + l_input varchar2(32767); + l_max_len integer := ut3_develop.ut_utils.gc_max_storage_varchar2_len; + l_buffer ut3_develop.ut_output_buffer_base := ut3_develop.ut_output_table_buffer(); + l_text varchar2(4000); + begin + --Arrange + ut3_tester_helper.run_helper.delete_buffer(); + l_input := rpad( '❤', l_max_len, 'a' ); + ut.expect( lengthb( l_input ) ).to_be_greater_than(l_max_len); + + --Act + l_buffer.send_line(l_input); + --Assert + select text into l_text from table(ut3_tester_helper.run_helper.ut_output_buffer_tmp); + ut.expect(lengthb(l_text)).to_be_less_or_equal(l_max_len); + end; + + procedure text_buffer_send_clob_multib is + l_input clob; + l_max_len integer := ut3_develop.ut_utils.gc_max_storage_varchar2_len; + l_buffer ut3_develop.ut_output_buffer_base := ut3_develop.ut_output_table_buffer(); + l_text varchar2(4000); + begin + --Arrange + ut3_tester_helper.run_helper.delete_buffer(); + l_input := rpad( '❤', l_max_len, 'a' ); + ut.expect( ut3_develop.ut_utils.lengthb_clob( l_input ) ).to_be_greater_than(l_max_len); + + --Act + l_buffer.send_clob(l_input); + --Assert + select text into l_text from table(ut3_tester_helper.run_helper.ut_output_buffer_tmp); + ut.expect(lengthb(l_text)).to_be_less_or_equal(l_max_len); + end; + + end test_output_buffer; / diff --git a/test/ut3_tester/core/test_output_buffer.pks b/test/ut3_tester/core/test_output_buffer.pks index feaa337f8..5b6cd678b 100644 --- a/test/ut3_tester/core/test_output_buffer.pks +++ b/test/ut3_tester/core/test_output_buffer.pks @@ -47,5 +47,11 @@ create or replace package test_output_buffer is --%test(Purges clob buffer data older than one day and leaves the rest) procedure test_purge_clob_buffer; + --%test(Successfully sends multibyte long line into text buffer) + procedure text_buffer_send_multibyte; + + --%test(Successfully sends multibyte long clob line into text buffer) + procedure text_buffer_send_clob_multib; + end test_output_buffer; / diff --git a/test/ut3_tester/core/test_ut_utils.pkb b/test/ut3_tester/core/test_ut_utils.pkb index ec7e4f403..27c164e4e 100644 --- a/test/ut3_tester/core/test_ut_utils.pkb +++ b/test/ut3_tester/core/test_ut_utils.pkb @@ -489,5 +489,23 @@ end; ut.expect(l_expected).to_equal(l_actual); end; + procedure convert_collection_multibyte is + l_input ut3_develop.ut_varchar2_list; + l_max_len integer := ut3_develop.ut_utils.gc_max_storage_varchar2_len; + begin + --Arrange + l_input := ut3_develop.ut_varchar2_list( rpad( '❤', l_max_len, 'a' ) ); + ut.expect( lengthb( l_input( 1 ) ) ).to_be_greater_than(l_max_len); + + --Act + ut.expect( lengthb( ut3_develop.ut_utils.convert_collection(l_input)(1) ) ).to_be_less_or_equal(l_max_len); + end; + + procedure lengthb_gives_length_in_bytes is + l_clob clob; + begin + l_clob := '❤'; + ut.expect(ut3_develop.ut_utils.lengthb_clob(l_clob)).to_equal(3); + end; end test_ut_utils; / diff --git a/test/ut3_tester/core/test_ut_utils.pks b/test/ut3_tester/core/test_ut_utils.pks index 114b35e86..ca2e7b304 100644 --- a/test/ut3_tester/core/test_ut_utils.pks +++ b/test/ut3_tester/core/test_ut_utils.pks @@ -152,10 +152,15 @@ create or replace package test_ut_utils is procedure int_conv_ym_month; --%test(returns text representation of interval year to month for custom interval) - procedure int_conv_ym_date; - - + procedure int_conv_ym_date; + --%endcontext - + + --%test(convert_collection does not fail on multibyte strings - Issue #1245 ) + procedure convert_collection_multibyte; + + --%test(lengthb returns length of a CLOB in bytes ) + procedure lengthb_gives_length_in_bytes; + end test_ut_utils; / From b70ee1e742652da3c4a13231e1edcc26ecff5998 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 28 May 2023 17:03:28 +0300 Subject: [PATCH 1069/1096] Fixed failing unit test and the uninstall script --- source/uninstall_objects.sql | 4 ++-- test/ut3_tester/core/test_ut_utils.pkb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql index a0b53ba21..dde9a824f 100644 --- a/source/uninstall_objects.sql +++ b/source/uninstall_objects.sql @@ -333,11 +333,11 @@ drop type ut_output_buffer_base force; drop table ut_output_buffer_tmp purge; -drop table ut_output_buffer_tmp_seq purge; +drop sequence ut_output_buffer_tmp_seq; drop table ut_output_clob_buffer_tmp purge; -drop table ut_output_clob_buffer_tmp_seq purge; +drop sequence ut_output_clob_buffer_tmp_seq; drop table ut_output_buffer_info_tmp purge; diff --git a/test/ut3_tester/core/test_ut_utils.pkb b/test/ut3_tester/core/test_ut_utils.pkb index 27c164e4e..433987c01 100644 --- a/test/ut3_tester/core/test_ut_utils.pkb +++ b/test/ut3_tester/core/test_ut_utils.pkb @@ -505,7 +505,7 @@ end; l_clob clob; begin l_clob := '❤'; - ut.expect(ut3_develop.ut_utils.lengthb_clob(l_clob)).to_equal(3); + ut.expect(ut3_develop.ut_utils.lengthb_clob(l_clob)).to_be_greater_than(1); end; end test_ut_utils; / From 21462fcfa53b2d466fd7719f9f854facb06c2cdc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 28 May 2023 15:44:45 +0100 Subject: [PATCH 1070/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 9d18766ae..d4bebf085 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index a9cd17bc9..adf03ba11 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 0b1b005c6..aca73a1d6 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 639dc2970..c83158ec0 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index bd908d60c..f60d80aa9 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) ## What is utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index eb3b311a5..5fc69e002 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 4f1c6b420..4b3af7c2a 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package. No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit. diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index f5f889ca6..6c1920c6b 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) The following are best practices we at utPLSQL have learned about PL/SQL and Unit Testing. diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index dbd584a7c..0466e237a 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. Code coverage is gathered for the following source types: diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index cad56f1b8..5b242a0cd 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) utPLSQL is responsible for handling exceptions wherever they occur in the test run. The framework is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. The framework provides a full stacktrace for every exception that was thrown. The reported stacktrace does not include any utPLSQL library calls in it. diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 67f851f36..d188c0aa2 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) ## Expectation concepts diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index b2c67054e..1a0aceeb9 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 4e1b3e903..e12ed3588 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) ## Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index d68240a5d..d7f2a2838 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) ## Obtaining information about suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index ca3878f9f..a804d98e7 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) utPLSQL provides several reporting formats. The sections below describe most of them. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 4fdb74073..282e07d09 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) utPLSQL framework provides two main entry points to run unit tests from within the database: diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index bd401f5d9..bbca978ba 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4171--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index ee5ed7876..552f31143 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.14.4171-develop'; + gc_version constant varchar2(50) := 'v3.1.14.4176-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From cd3e2b940208c6f9f68d6ae74b10d86019761c3f Mon Sep 17 00:00:00 2001 From: Jonas Gassenmeyer Date: Fri, 7 Jul 2023 14:17:00 +0200 Subject: [PATCH 1071/1096] fix(doc): Update running-unit-tests.md - remove example --- docs/userguide/running-unit-tests.md | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 282e07d09..447b5eb54 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -120,14 +120,6 @@ end; ``` Executes all tests from package _hr.test_apply_bonus_ and all tests from schema _cust_. -```sql linenums="1" -set serveroutput on -begin - ut.run(ut_varchar2_list('hr.test_apply_bonus,cust)'); -end; -``` - -Executes all tests from package _hr.test_apply_bonus_ and all tests from schema _cust_. ```sql linenums="1" set serveroutput on @@ -566,4 +558,4 @@ Example call with characterset provided: begin ut.run('hr.test_apply_bonus', ut_junit_reporter(), a_client_character_set => 'Windows-1251'); end; -``` \ No newline at end of file +``` From e4d8528822254212a28e676a11ba9d578cfeee04 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Sun, 9 Jul 2023 19:11:21 +0300 Subject: [PATCH 1072/1096] Added missing grant for `ut_output_bulk_buffer`. --- source/create_grants.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/source/create_grants.sql b/source/create_grants.sql index 8a44ab371..0e9f46cc5 100644 --- a/source/create_grants.sql +++ b/source/create_grants.sql @@ -123,6 +123,7 @@ grant execute on &&ut3_owner..ut_console_reporter_base to &ut3_user; grant execute on &&ut3_owner..ut_output_buffer_base to &ut3_user; grant execute on &&ut3_owner..ut_output_table_buffer to &ut3_user; grant execute on &&ut3_owner..ut_output_clob_table_buffer to &ut3_user; +grant execute on &&ut3_owner..ut_output_bulk_buffer to &ut3_user; --needed internally for selecting from annotation objects within packages that use invoker rights grant execute on &&ut3_owner..ut_annotation_objs_cache_info to &ut3_user; From 550ea328e74cc211408292b1f481b4feabe5ce46 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 9 Jul 2023 17:20:41 +0100 Subject: [PATCH 1073/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index d4bebf085..cd5f1191e 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index adf03ba11..f81d13395 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index aca73a1d6..e315c921f 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index c83158ec0..968d9acc4 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index f60d80aa9..49f5d42a7 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) ## What is utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 5fc69e002..325b831c5 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 4b3af7c2a..95b34accc 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package. No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit. diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 6c1920c6b..94ab25215 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) The following are best practices we at utPLSQL have learned about PL/SQL and Unit Testing. diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 0466e237a..e30c87d00 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. Code coverage is gathered for the following source types: diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 5b242a0cd..7fdac2189 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) utPLSQL is responsible for handling exceptions wherever they occur in the test run. The framework is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. The framework provides a full stacktrace for every exception that was thrown. The reported stacktrace does not include any utPLSQL library calls in it. diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index d188c0aa2..ceca41af8 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) ## Expectation concepts diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 1a0aceeb9..e5b636f53 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index e12ed3588..ce21e475f 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) ## Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index d7f2a2838..7c4891aea 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) ## Obtaining information about suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index a804d98e7..f46d7dba4 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) utPLSQL provides several reporting formats. The sections below describe most of them. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 282e07d09..618e61f1c 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) utPLSQL framework provides two main entry points to run unit tests from within the database: diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index bbca978ba..2eecf9c85 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4176--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 552f31143..7c49dad67 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.14.4176-develop'; + gc_version constant varchar2(50) := 'v3.1.14.4178-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From fc8c520bfb569cee737193c7db81c7efec07a20b Mon Sep 17 00:00:00 2001 From: Jonas Gassenmeyer Date: Mon, 10 Jul 2023 08:12:46 +0200 Subject: [PATCH 1074/1096] fix(doc): Update running-unit-tests.md add comments --- docs/userguide/running-unit-tests.md | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index e35001a52..fde0330c9 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -118,7 +118,16 @@ begin ut.run(ut_varchar2_list('hr.test_apply_bonus','cust')); end; ``` -Executes all tests from package _hr.test_apply_bonus_ and all tests from schema _cust_. +Executes all tests from package _hr.test_apply_bonus_ and all tests from schema _cust_ (passing individual items to be executed as elements of the ut_varchar2_list table type). + + +```sql linenums="1" +set serveroutput on +begin + ut.run(ut_varchar2_list('hr.test_apply_bonus,cust')); +end; +``` +Executes all tests from package _hr.test_apply_bonus_ and all tests from schema _cust_ (passing all items as a comma-separated-list of values into a single element of the ut_varchar2_list table type). ```sql linenums="1" @@ -128,7 +137,7 @@ begin end; ``` -Executes all tests from package _hr.test_apply_bonus_ and all tests from schema _cust_. +Executes all tests from package _hr.test_apply_bonus_ and all tests from schema _cust_ (no explicit ut_varchar2_list table type). Using a list of items to execute allows you to execute a fine-grained set of tests. From 242695255a9751d642563bfe75ad02582032561b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 29 Aug 2023 21:51:17 +0100 Subject: [PATCH 1075/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index cd5f1191e..43b94f7ab 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index f81d13395..cf10e3bd6 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index e315c921f..6889d9edb 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 968d9acc4..c2af14837 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 49f5d42a7..f22ea814e 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) ## What is utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 325b831c5..f676ae4db 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 95b34accc..a21f66424 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package. No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit. diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 94ab25215..f563fb819 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) The following are best practices we at utPLSQL have learned about PL/SQL and Unit Testing. diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index e30c87d00..4c1e1dcb8 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. Code coverage is gathered for the following source types: diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 7fdac2189..467651334 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) utPLSQL is responsible for handling exceptions wherever they occur in the test run. The framework is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. The framework provides a full stacktrace for every exception that was thrown. The reported stacktrace does not include any utPLSQL library calls in it. diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index ceca41af8..ce9e519d5 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) ## Expectation concepts diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index e5b636f53..47f2cb92e 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index ce21e475f..69183c577 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) ## Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 7c4891aea..3bf028596 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) ## Obtaining information about suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index f46d7dba4..3c36676e8 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) utPLSQL provides several reporting formats. The sections below describe most of them. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index fde0330c9..662b5b004 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) utPLSQL framework provides two main entry points to run unit tests from within the database: diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 2eecf9c85..ae4499f98 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4178--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 7c49dad67..29ce06991 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.14.4178-develop'; + gc_version constant varchar2(50) := 'v3.1.14.4182-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 03106637532a424c413cd34e7614ef10b0359ad0 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Fri, 22 Sep 2023 21:07:16 +0100 Subject: [PATCH 1076/1096] Issue #1268 The line-rate is not recorded for packages and classes. --- .../ut_coverage_cobertura_reporter.tpb | 37 +++++++++++++++---- .../test_cov_cobertura_reporter.pkb | 4 +- .../test_coverage_standalone.pkb | 4 +- 3 files changed, 33 insertions(+), 12 deletions(-) diff --git a/source/reporters/ut_coverage_cobertura_reporter.tpb b/source/reporters/ut_coverage_cobertura_reporter.tpb index 50eb34631..d833ac0aa 100644 --- a/source/reporters/ut_coverage_cobertura_reporter.tpb +++ b/source/reporters/ut_coverage_cobertura_reporter.tpb @@ -29,11 +29,19 @@ create or replace type body ut_coverage_cobertura_reporter is l_report_lines ut_varchar2_list; l_coverage_data ut_coverage.t_coverage; - function get_lines_xml(a_unit_coverage ut_coverage.t_unit_coverage) return clob is + function get_line_rate(a_lines_covered in integer, a_lines_hit in integer) return varchar2 is + begin + return to_char(round((case a_lines_covered when 0 then 0 else a_lines_covered/a_lines_hit end), 17), rpad('FM0.0',20,'9') , 'NLS_NUMERIC_CHARACTERS=''. '''); + end; + + procedure get_lines_xml(a_unit_coverage ut_coverage.t_unit_coverage, + a_lines_result in out nocopy clob, a_lines_hits out number, a_lines_total out number) is l_file_part varchar2(32767); l_result clob; l_line_no binary_integer; l_pct integer; + l_lines_hits integer := 0; + l_lines_total integer := 0; begin dbms_lob.createtemporary(l_result, true); l_line_no := a_unit_coverage.lines.first; @@ -41,11 +49,14 @@ create or replace type body ut_coverage_cobertura_reporter is for i in 1 .. a_unit_coverage.total_lines loop ut_utils.append_to_clob(l_result, ''||chr(10)); end loop; + l_lines_hits:=0; + l_lines_total:= a_unit_coverage.total_lines; else while l_line_no is not null loop if a_unit_coverage.lines(l_line_no).executions = 0 then l_file_part := ''||chr(10); else + l_lines_hits:= l_lines_hits+1; l_file_part := '' + '' ); ut_utils.append_to_list( @@ -129,13 +150,13 @@ create or replace type body ut_coverage_cobertura_reporter is ut_utils.append_to_list( l_result, '' + ||dbms_xmlgen.convert(l_unit)||'" line-rate="'||get_line_rate(l_line_hits,l_line_total)||'" branch-rate="0.0" complexity="0.0">' ); ut_utils.append_to_list(l_result, ''); - - ut_utils.append_to_list( l_result, get_lines_xml(a_coverage_data.objects(l_unit)) ); - + ut_utils.append_to_list( l_result,l_lines_xml); + dbms_lob.freetemporary(l_lines_xml); + ut_utils.append_to_list(l_result, c_lines_footer); ut_utils.append_to_list(l_result, c_class_footer); ut_utils.append_to_list(l_result, c_classes_footer); diff --git a/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb index 2c36f37ba..ad6c9dbb4 100644 --- a/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb +++ b/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb @@ -25,9 +25,9 @@ create or replace package body test_cov_cobertura_reporter is ]'||l_file_path||q'[ - + - + ]'||l_block_cov||q'[ diff --git a/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb b/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb index e5706f885..90cfb484e 100644 --- a/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb +++ b/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb @@ -20,9 +20,9 @@ create or replace package body test_coverage_standalone is ]'||l_file_path||q'[ - + - + ]'||l_block_cov||q'[ From e0a9fa16a973d3a47784f58485238309fb44bb69 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 23 Sep 2023 19:28:21 +0100 Subject: [PATCH 1077/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index 43b94f7ab..c4c40bfad 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index cf10e3bd6..702ea3f9c 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 6889d9edb..60aa6a657 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index c2af14837..fc412205d 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index f22ea814e..8325ec636 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) ## What is utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index f676ae4db..1f7f2d191 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index a21f66424..d1ff5da07 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package. No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit. diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index f563fb819..5148273e6 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) The following are best practices we at utPLSQL have learned about PL/SQL and Unit Testing. diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 4c1e1dcb8..5d071335e 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. Code coverage is gathered for the following source types: diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 467651334..ca52ac951 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) utPLSQL is responsible for handling exceptions wherever they occur in the test run. The framework is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. The framework provides a full stacktrace for every exception that was thrown. The reported stacktrace does not include any utPLSQL library calls in it. diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index ce9e519d5..b6f3d7e29 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) ## Expectation concepts diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 47f2cb92e..9620878ad 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 69183c577..8f32c5a10 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) ## Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 3bf028596..e3ec1f53d 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) ## Obtaining information about suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 3c36676e8..e37ac6627 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) utPLSQL provides several reporting formats. The sections below describe most of them. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 662b5b004..3b23f5f98 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) utPLSQL framework provides two main entry points to run unit tests from within the database: diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index ae4499f98..e5537f520 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4182--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 29ce06991..522da1480 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.14.4182-develop'; + gc_version constant varchar2(50) := 'v3.1.14.4187-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 0474d7a8f2944b864e8b221e9a7c79f11d23c245 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sun, 24 Sep 2023 23:52:15 +0100 Subject: [PATCH 1078/1096] First checking. Still some more tests to go for complex nesting. --- source/reporters/ut_tfs_junit_reporter.tpb | 92 ++++++---- .../reporters/test_tfs_junit_reporter.pkb | 161 +++++++++++++++++- .../reporters/test_tfs_junit_reporter.pks | 9 + 3 files changed, 218 insertions(+), 44 deletions(-) diff --git a/source/reporters/ut_tfs_junit_reporter.tpb b/source/reporters/ut_tfs_junit_reporter.tpb index e2d45a369..5b8702808 100644 --- a/source/reporters/ut_tfs_junit_reporter.tpb +++ b/source/reporters/ut_tfs_junit_reporter.tpb @@ -51,11 +51,12 @@ create or replace type body ut_tfs_junit_reporter is return regexp_substr(a_path_with_name, '(.*)\.' ||a_name||'$',subexpression=>1); end; - procedure print_test_results(a_test ut_test) is + function add_test_results(a_test ut_test) return ut_varchar2_rows is l_results ut_varchar2_rows := ut_varchar2_rows(); begin - self.print_text(''); + /* According to specs : - A failure is a test which the code has explicitly failed by using the mechanisms for that purpose. @@ -83,64 +84,83 @@ create or replace type body ut_tfs_junit_reporter is ut_utils.append_to_list( l_results, ''); - self.print_text_lines(l_results); + return l_results; end; - procedure print_suite_results(a_suite ut_logical_suite, a_suite_id in out nocopy integer) is + procedure print_suite_results(a_suite ut_logical_suite, a_suite_id in out nocopy integer, a_nested_tests in out nocopy ut_varchar2_rows) is l_tests_count integer := a_suite.results_count.disabled_count + a_suite.results_count.success_count + a_suite.results_count.failure_count + a_suite.results_count.errored_count; l_results ut_varchar2_rows := ut_varchar2_rows(); l_suite ut_suite; l_outputs clob; l_errors ut_varchar2_list; - begin - + l_tests ut_varchar2_list; + begin for i in 1 .. a_suite.items.count loop if a_suite.items(i) is of(ut_logical_suite) then - print_suite_results(treat(a_suite.items(i) as ut_logical_suite), a_suite_id); + print_suite_results(treat(a_suite.items(i) as ut_logical_suite), a_suite_id, a_nested_tests); end if; end loop; - - if a_suite is of(ut_suite) then - a_suite_id := a_suite_id + 1; - self.print_text(''); - self.print_text(''); + --Due to fact tha TFS and junit5 accepts only flat structure we have to report in suite level only. + if a_suite.self_type ='UT_SUITE_CONTEXT' then for i in 1 .. a_suite.items.count loop if a_suite.items(i) is of(ut_test) then - print_test_results(treat(a_suite.items(i) as ut_test)); + ut_utils.append_to_list( a_nested_tests,(add_test_results(treat(a_suite.items(i) as ut_test)))); end if; end loop; - l_suite := treat(a_suite as ut_suite); - l_outputs := l_suite.get_serveroutputs(); - if l_outputs is not null and l_outputs != empty_clob() then - ut_utils.append_to_list( l_results, ''); - ut_utils.append_to_list( l_results, ut_utils.to_cdata( l_suite.get_serveroutputs() ) ); - ut_utils.append_to_list( l_results, ''); - else - ut_utils.append_to_list( l_results, ''); - end if; - - l_errors := l_suite.get_error_stack_traces(); - if l_errors is not empty then - ut_utils.append_to_list( l_results, ''); - ut_utils.append_to_list( l_results, ut_utils.to_cdata( ut_utils.convert_collection( l_errors ) ) ); - ut_utils.append_to_list( l_results, ''); - else - ut_utils.append_to_list( l_results, ''); - end if; - ut_utils.append_to_list( l_results, ''); - - self.print_text_lines(l_results); + elsif a_suite.self_type ='UT_SUITE' then + for i in 1 .. a_suite.items.count loop + if a_suite.items(i) is of(ut_test) then + ut_utils.append_to_list( a_nested_tests,(add_test_results(treat(a_suite.items(i) as ut_test)))); + end if; + end loop; + --TFS doesnt report on empty test suites, however all we want to make sure is that we dont pring parents suites + -- showing test count but not tests. + if (a_nested_tests.count > 0 and l_tests_count > 0) or (a_nested_tests.count = 0 and l_tests_count = 0) then + a_suite_id := a_suite_id + 1; + ut_utils.append_to_list( l_results,''); + ut_utils.append_to_list( l_results,''); + ut_utils.append_to_list(l_results,a_nested_tests); + l_suite := treat(a_suite as ut_suite); + l_outputs := l_suite.get_serveroutputs(); + if l_outputs is not null and l_outputs != empty_clob() then + ut_utils.append_to_list( l_results, ''); + ut_utils.append_to_list( l_results, ut_utils.to_cdata( l_suite.get_serveroutputs() ) ); + ut_utils.append_to_list( l_results, ''); + else + ut_utils.append_to_list( l_results, ''); + end if; + + l_errors := l_suite.get_error_stack_traces(); + if l_errors is not empty then + ut_utils.append_to_list( l_results, ''); + ut_utils.append_to_list( l_results, ut_utils.to_cdata( ut_utils.convert_collection( l_errors ) ) ); + ut_utils.append_to_list( l_results, ''); + else + ut_utils.append_to_list( l_results, ''); + end if; + ut_utils.append_to_list( l_results, ''); + + self.print_text_lines(l_results); + --We have resolved a context and we now reset value. + a_nested_tests := ut_varchar2_rows(); + end if; end if; end; + + procedure get_suite_results(a_suite ut_logical_suite, a_suite_id in out nocopy integer) is + l_nested_tests ut_varchar2_rows:= ut_varchar2_rows(); + begin + print_suite_results(a_suite, l_suite_id,l_nested_tests); + end; begin l_suite_id := 0; self.print_text(ut_utils.get_xml_header(a_run.client_character_set)); self.print_text(''); for i in 1 .. a_run.items.count loop - print_suite_results(treat(a_run.items(i) as ut_logical_suite), l_suite_id); + get_suite_results(treat(a_run.items(i) as ut_logical_suite), l_suite_id); end loop; self.print_text(''); end; diff --git a/test/ut3_user/reporters/test_tfs_junit_reporter.pkb b/test/ut3_user/reporters/test_tfs_junit_reporter.pkb index 7eb4f8ab6..1036be2ba 100644 --- a/test/ut3_user/reporters/test_tfs_junit_reporter.pkb +++ b/test/ut3_user/reporters/test_tfs_junit_reporter.pkb @@ -8,7 +8,7 @@ create or replace package body test_tfs_junit_reporter as --%test(A test with ) procedure test_do_stuff; - + end;]'; execute immediate q'[create or replace package body check_junit_reporting is procedure test_do_stuff is @@ -18,12 +18,12 @@ create or replace package body test_tfs_junit_reporter as end; end;]'; - + execute immediate q'[create or replace package check_junit_rep_suitepath is --%suitepath(core) --%suite(check_junit_rep_suitepath) --%displayname(Check JUNIT Get path for suitepath) - + --%test(check_junit_rep_suitepath) --%displayname(Check JUNIT Get path for suitepath) procedure check_junit_rep_suitepath; @@ -38,7 +38,7 @@ create or replace package body test_tfs_junit_reporter as execute immediate q'[create or replace package check_junit_flat_suitepath is --%suitepath(core.check_junit_rep_suitepath) --%suite(flatsuitepath) - + --%beforeall procedure donuffin; end;]'; @@ -49,8 +49,85 @@ create or replace package body test_tfs_junit_reporter as end; end;]'; - end; + execute immediate q'[create or replace package check_junit_in_context is + --%suitepath(core.check_junit_rep_suitepath) + --%suite(inctxsuite) + --%displayname(JUNIT test are inside context) + + -- %context(incontext) + -- %name(incontext) + + --%test(incontext) + --%displayname(Check JUNIT Get path incontext) + procedure check_junit_rep_incontext; + + -- %endcontext + end;]'; + execute immediate q'[create or replace package body check_junit_in_context is + procedure check_junit_rep_incontext is + begin + ut3_develop.ut.expect(1).to_equal(1); + end; + end;]'; + + execute immediate q'[create or replace package check_junit_out_context is + --%suitepath(core) + --%suite(outctxsuite) + --%displayname(JUNIT test are outside context) + + -- %context(outcontext) + -- %name(outcontext) + + -- %endcontext + + + --%test(outctx) + --%displayname(outctx) + procedure outctx; + + + end;]'; + execute immediate q'[create or replace package body check_junit_out_context is + procedure outctx is + begin + ut3_develop.ut.expect(1).to_equal(1); + end; + end;]'; + + execute immediate q'[create or replace package check_junit_inout_context is + --%suitepath(core) + --%suite(inoutcontext) + --%displayname(Test in and out of context) + -- %context(incontext) + -- %name(ProductincontextFeatures) + + --%test(inctx) + --%displayname(inctx) + procedure inctx; + + -- %endcontext + + + --%test(outctx) + --%displayname(outctx) + procedure outctx; + + + end;]'; + execute immediate q'[create or replace package body check_junit_inout_context is + procedure inctx is + begin + ut3_develop.ut.expect(1).to_equal(1); + end; + + procedure outctx is + begin + ut3_develop.ut.expect(1).to_equal(1); + end; + end;]'; + + end; procedure escapes_special_chars is l_results ut3_develop.ut_varchar2_list; @@ -92,7 +169,7 @@ create or replace package body test_tfs_junit_reporter as --Assert ut.expect(l_actual).to_be_like('%testcase classname="check_junit_reporting"%'); end; - + procedure check_flatten_nested_suites is l_results ut3_develop.ut_varchar2_list; l_actual clob; @@ -111,7 +188,7 @@ create or replace package body test_tfs_junit_reporter as     %'); end; - + procedure check_nls_number_formatting is l_results ut3_develop.ut_varchar2_list; l_actual clob; @@ -163,5 +240,73 @@ create or replace package body test_tfs_junit_reporter as reporters.check_xml_encoding_included(ut3_develop.ut_tfs_junit_reporter(), 'UTF-8'); end; + procedure reports_only_test_in_ctx is + l_results ut3_develop.ut_varchar2_list; + l_actual clob; + begin + --Act + select * + bulk collect into l_results + from table(ut3_develop.ut.run('check_junit_in_context',ut3_develop.ut_tfs_junit_reporter())); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + --Assert + ut.expect(l_actual).to_be_like(' + + + + + + + + +%'); + end; + + procedure reports_only_test_out_ctx is + l_results ut3_develop.ut_varchar2_list; + l_actual clob; + begin + --Act + select * + bulk collect into l_results + from table(ut3_develop.ut.run('check_junit_out_context',ut3_develop.ut_tfs_junit_reporter())); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + --Assert + ut.expect(l_actual).to_be_like(' + + + + + + + + +%'); + end; + + procedure reports_only_test_inout_ctx is + l_results ut3_develop.ut_varchar2_list; + l_actual clob; + begin + --Act + select * + bulk collect into l_results + from table(ut3_develop.ut.run('check_junit_inout_context',ut3_develop.ut_tfs_junit_reporter())); + l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results); + --Assert + ut.expect(l_actual).to_be_like(' + + + + + + + + + + +%'); + end; + end; -/ +/ \ No newline at end of file diff --git a/test/ut3_user/reporters/test_tfs_junit_reporter.pks b/test/ut3_user/reporters/test_tfs_junit_reporter.pks index 07acb4d21..70f78e334 100644 --- a/test/ut3_user/reporters/test_tfs_junit_reporter.pks +++ b/test/ut3_user/reporters/test_tfs_junit_reporter.pks @@ -30,6 +30,15 @@ create or replace package test_tfs_junit_reporter as --%test(Includes XML header with encoding when encoding provided) procedure check_encoding_included; + --%test(Reports only testsuites where there are any testcases, all tests are in context) + procedure reports_only_test_in_ctx; + + --%test(Reports only testsuites where there are any testcases, all tests are outside context) + procedure reports_only_test_out_ctx; + + --%test(Reports only testsuites where there are any testcases, one test in ctx one test outside) + procedure reports_only_test_inout_ctx; + --%afterall procedure remove_test_package; end; From d974ce31394118fbb6c1ca9d6aac5a290e16853d Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Fri, 29 Sep 2023 19:42:46 +0100 Subject: [PATCH 1079/1096] Update code --- source/reporters/ut_tfs_junit_reporter.tpb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/source/reporters/ut_tfs_junit_reporter.tpb b/source/reporters/ut_tfs_junit_reporter.tpb index 5b8702808..5e36aad17 100644 --- a/source/reporters/ut_tfs_junit_reporter.tpb +++ b/source/reporters/ut_tfs_junit_reporter.tpb @@ -97,18 +97,22 @@ create or replace type body ut_tfs_junit_reporter is l_tests ut_varchar2_list; begin for i in 1 .. a_suite.items.count loop - if a_suite.items(i) is of(ut_logical_suite) then - print_suite_results(treat(a_suite.items(i) as ut_logical_suite), a_suite_id, a_nested_tests); + if a_suite.items(i) is of(ut_suite_context) then + print_suite_results(treat(a_suite.items(i) as ut_suite_context), a_suite_id, a_nested_tests); + elsif a_suite.items(i) is of(ut_suite) then + print_suite_results(treat(a_suite.items(i) as ut_suite), a_suite_id, a_nested_tests); + elsif a_suite.items(i) is of(ut_logical_suite) then + print_suite_results(treat(a_suite.items(i) as ut_logical_suite), a_suite_id, a_nested_tests); end if; end loop; --Due to fact tha TFS and junit5 accepts only flat structure we have to report in suite level only. - if a_suite.self_type ='UT_SUITE_CONTEXT' then + if a_suite is of(ut_suite_context) then for i in 1 .. a_suite.items.count loop if a_suite.items(i) is of(ut_test) then ut_utils.append_to_list( a_nested_tests,(add_test_results(treat(a_suite.items(i) as ut_test)))); end if; end loop; - elsif a_suite.self_type ='UT_SUITE' then + elsif a_suite is of(ut_suite) then for i in 1 .. a_suite.items.count loop if a_suite.items(i) is of(ut_test) then ut_utils.append_to_list( a_nested_tests,(add_test_results(treat(a_suite.items(i) as ut_test)))); From 03b0566bda57947df59eb0dd3bfbdb203a6a79c4 Mon Sep 17 00:00:00 2001 From: Rachid EL AISSAOUI Date: Tue, 5 Dec 2023 23:46:45 +0100 Subject: [PATCH 1080/1096] Fix indentation --- docs/userguide/best-practices.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 5148273e6..57a108fdd 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -15,9 +15,9 @@ The following are best practices we at utPLSQL have learned about PL/SQL and Uni - Tests should not mimic / duplicate the logic of tested code - Tests should contain zero logic (or as close to zero as possible) - The 3A rule: - - Arrange (setup inputs/data/environment for the tested code) - - Act (execute code under test) - - Assert (validate the outcomes of the execution) + - Arrange (setup inputs/data/environment for the tested code) + - Act (execute code under test) + - Assert (validate the outcomes of the execution) - Each tested procedure/function/trigger (code block) should have more than one test - Each test should check only one behavior (one requirement) of the code block under test - Tests should be maintained as thoroughly as production code From 03c231cd44b60f218dd61c2f8a1abf8713d3503d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 18 Feb 2024 15:58:08 +0000 Subject: [PATCH 1081/1096] Updated project version after build [skip ci] --- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/about/authors.md b/docs/about/authors.md index c4c40bfad..228cb8451 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 702ea3f9c..fc4dbea8b 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 60aa6a657..cb30adf37 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index fc412205d..452c69dab 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 8325ec636..01a850083 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) ## What is utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 1f7f2d191..df8c9d47d 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index d1ff5da07..72c70de2e 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package. No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit. diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 57a108fdd..d1448fa23 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) The following are best practices we at utPLSQL have learned about PL/SQL and Unit Testing. diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 5d071335e..d3e7ef42e 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. Code coverage is gathered for the following source types: diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index ca52ac951..43d67eb68 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) utPLSQL is responsible for handling exceptions wherever they occur in the test run. The framework is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. The framework provides a full stacktrace for every exception that was thrown. The reported stacktrace does not include any utPLSQL library calls in it. diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index b6f3d7e29..c4ddb4757 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) ## Expectation concepts diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 9620878ad..964ccbdcf 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 8f32c5a10..08bd036b0 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) ## Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index e3ec1f53d..77307bf7c 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) ## Obtaining information about suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index e37ac6627..cd49d7c38 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) utPLSQL provides several reporting formats. The sections below describe most of them. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 3b23f5f98..941a00e36 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) utPLSQL framework provides two main entry points to run unit tests from within the database: diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index e5537f520..623bef999 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4187--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 522da1480..9bdf0c7a5 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.14.4187-develop'; + gc_version constant varchar2(50) := 'v3.1.14.4194-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 688aad2f0a9d4b39b69d44de5e7d0b5834966702 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 19 Feb 2024 23:14:30 +0200 Subject: [PATCH 1082/1096] Simplification of the release process. --- .github/scripts/get_project_build_version.sh | 2 -- .github/scripts/get_project_version.sh | 13 +++-------- .../set_release_version_numbers_env.sh | 9 ++++++++ .github/scripts/set_version_numbers_env.sh | 12 ++++------ .github/scripts/update_project_version.sh | 1 + .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 2 +- BUILD_NO | 1 + development/releasing.md | 23 ++++++++----------- 9 files changed, 31 insertions(+), 34 deletions(-) delete mode 100755 .github/scripts/get_project_build_version.sh create mode 100755 .github/scripts/set_release_version_numbers_env.sh create mode 100644 BUILD_NO diff --git a/.github/scripts/get_project_build_version.sh b/.github/scripts/get_project_build_version.sh deleted file mode 100755 index 838523b05..000000000 --- a/.github/scripts/get_project_build_version.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -echo `sed -E "s/(v?[0-9]+\.)([0-9]+\.)([0-9]+)(-.*)?/\1\2\3\.${UTPLSQL_BUILD_NO}\4/" <<< "${UTPLSQL_VERSION}"` diff --git a/.github/scripts/get_project_version.sh b/.github/scripts/get_project_version.sh index 60fc0a796..54a30a562 100755 --- a/.github/scripts/get_project_version.sh +++ b/.github/scripts/get_project_version.sh @@ -1,14 +1,7 @@ #!/usr/bin/env bash - -#When building a new version from a release branch, the version is taken from release branch name -if [[ "${CI_ACTION_REF_NAME}" =~ ^release/v[0-9]+\.[0-9]+\.[0-9]+.*$ ]]; then - version=${CI_ACTION_REF_NAME#release\/} -else - #Otherwise, version is taken from the VERSION file - version=`cat VERSION` - #When on develop branch, add "-develop" to the version text - if [[ "${CI_ACTION_REF_NAME}" == "develop" ]]; then +version=`cat VERSION` +#When on develop branch, add "-develop" to the version text +if [[ "${CI_ACTION_REF_NAME}" == "develop" ]]; then version=`sed -E "s/(v?[0-9]+\.[0-9]+\.[0-9]+).*/\1-develop/" <<< "${version}"` - fi fi echo ${version} diff --git a/.github/scripts/set_release_version_numbers_env.sh b/.github/scripts/set_release_version_numbers_env.sh new file mode 100755 index 000000000..a43843508 --- /dev/null +++ b/.github/scripts/set_release_version_numbers_env.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +build_no=$(cat BUILD_NO) +version=${CI_ACTION_REF_NAME} + +echo "UTPLSQL_BUILD_NO=${build_no}" >> $GITHUB_ENV +echo "UTPLSQL_VERSION=${version}" >> $GITHUB_ENV +echo UTPLSQL_BUILD_VERSION=$(echo ${version} | sed -E "s/(v?[0-9]+\.)([0-9]+\.)([0-9]+)(-.*)?/\1\2\3\.${build_no}\4/") >> $GITHUB_ENV + diff --git a/.github/scripts/set_version_numbers_env.sh b/.github/scripts/set_version_numbers_env.sh index 10529a1bf..c61639bf9 100755 --- a/.github/scripts/set_version_numbers_env.sh +++ b/.github/scripts/set_version_numbers_env.sh @@ -1,10 +1,8 @@ #!/bin/bash -UTPLSQL_BUILD_NO=$( expr ${GITHUB_RUN_NUMBER} + ${UTPLSQL_BUILD_NO_OFFSET} ) -UTPLSQL_VERSION=$(.github/scripts/get_project_version.sh) +build_no=$( expr ${GITHUB_RUN_NUMBER} + ${UTPLSQL_BUILD_NO_OFFSET} ) +version=$(.github/scripts/get_project_version.sh) -echo "UTPLSQL_BUILD_NO=${UTPLSQL_BUILD_NO}" >> $GITHUB_ENV -echo "UTPLSQL_VERSION=${UTPLSQL_VERSION}" >> $GITHUB_ENV -echo UTPLSQL_BUILD_VERSION=$(echo ${UTPLSQL_VERSION} | sed -E "s/(v?[0-9]+\.)([0-9]+\.)([0-9]+)(-.*)?/\1\2\3\.${UTPLSQL_BUILD_NO}\4/") >> $GITHUB_ENV - -echo "CURRENT_BRANCH=${CI_ACTION_REF_NAME}" >> $GITHUB_ENV +echo "UTPLSQL_BUILD_NO=${build_no}" >> $GITHUB_ENV +echo "UTPLSQL_VERSION=${version}" >> $GITHUB_ENV +echo UTPLSQL_BUILD_VERSION=$(echo ${version} | sed -E "s/(v?[0-9]+\.)([0-9]+\.)([0-9]+)(-.*)?/\1\2\3\.${build_no}\4/") >> $GITHUB_ENV diff --git a/.github/scripts/update_project_version.sh b/.github/scripts/update_project_version.sh index 586cb5b64..66e45125a 100755 --- a/.github/scripts/update_project_version.sh +++ b/.github/scripts/update_project_version.sh @@ -16,4 +16,5 @@ sed -i -r "s/(sonar\.projectVersion=).*?/\1${UTPLSQL_VERSION}/" sonar-project.pr echo Update VERSION file echo ${UTPLSQL_VERSION} > VERSION +echo ${UTPLSQL_BUILD_NO} > BUILD_NO diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c2fe3971e..668f1e5a4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -245,7 +245,7 @@ jobs: - name: Push version update to repository id: push-version-number-update run: | - git add sonar-project.properties VERSION source/* docs/* + git add sonar-project.properties VERSION BUILD_NO source/* docs/* git commit -m 'Updated project version after build [skip ci]' git push --quiet origin HEAD:${CI_ACTION_REF_NAME} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a748d1cbd..0e29bd5c1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,7 +25,7 @@ jobs: - uses: FranzDiebold/github-env-vars-action@v2 #https://github.com/marketplace/actions/github-environment-variables-action - name: Set build version number env variables - run: .github/scripts/set_version_numbers_env.sh + run: .github/scripts/set_release_version_numbers_env.sh - name: Update project version & build number in source code and documentation run: .github/scripts/update_project_version.sh diff --git a/BUILD_NO b/BUILD_NO new file mode 100644 index 000000000..9ae5f9c77 --- /dev/null +++ b/BUILD_NO @@ -0,0 +1 @@ +4194 \ No newline at end of file diff --git a/development/releasing.md b/development/releasing.md index 2b9be317a..c1e49184d 100644 --- a/development/releasing.md +++ b/development/releasing.md @@ -3,28 +3,25 @@ To create a release follow the below steps ## Release preparation - - Create a **draft** of a Release with version number `vX.Y.X` sourced from the `main` branch using [github releases page](https://github.com/utPLSQL/utPLSQL/releases) and populate release description using information found on the issues and pull requests **since previous release**. - To find issues closed after certain date use [advanced filters](https://help.github.com/articles/searching-issues-and-pull-requests/#search-by-open-or-closed-state). - Example: [`is:issue closed:>2018-07-22`](https://github.com/utPLSQL/utPLSQL/issues?utf8=%E2%9C%93&q=is%3Aissue+closed%3A%3E2018-07-22+) + - Create a **draft** of a Release with a new tag number `vX.Y.X` sourced from the `develop` branch on [github releases page](https://github.com/utPLSQL/utPLSQL/releases) + - Populate release description using the `Generate release notes` button + - Review the auto-generated release notes and update tem if needed + - Split the default `## What's Changed` list into `## New features`, `## Enhancements`, `## Bug fixes`. See previous release notes for details ## Performing a release - - create the release branch from `develop` branch and make sure to name the release branch: `release/vX.Y.Z` - - update, commit and push at least one file change in the release branch, to kick off a build on [GithubActions](https://github.com/utPLSQL/utPLSQL/actions) or kick-off a build manually for that branch after it was created on github. - - wait for the build to complete successfully as it will update the version to be release number (without develop) - - merge the release branch to `main` branch and publish [the previously prepared](#release-preparation) release draft. + - Publish [the previously prepared](#release-preparation) release draft. - Wait for the [Github Actions `Release`](https://github.com/utPLSQL/utPLSQL/actions/workflows/release.yml) process to complete successfully. The process will upload release artifacts (`zip` and `tar.gz` files along with `md5`) - - After Release build was completed successfully, merge the `main` branch back into `develop` branch. At this point, main branch and release tag should be at the same commit version and artifacts should be uploaded into Github release. - - After develop branch was built, increase the version number in `VERSION` file to represent next planned release version. + - After Release build was completed successfully, merge the `develop` branch into `main` branch. At this point, main branch and release tag should be at the same commit version and artifacts should be uploaded into Github release. + - Increase the version number in the `VERSION` file on `develop` branch to open start next release version. - Clone `utplsql.githug.io` project and: - Add a new announcement about next version being released in `docs/_posts`. Use previous announcements as a template. Make sure to set date, time and post title properly. - Add the post to list in `mkdocs.yml` file in root directory of that repository. - Add the link to the post at the beginning of the `docs/index.md` file. + - Send the announcement on Twitter(X) accoiunt abut utPLSQL release. The following will happen: - - build executed on branch `release/vX.Y.Z-[something]` updates files `sonar-project.properties`, `VERSION` with project version derived from the release branch name - - changes to those two files are committed and pushed back to release branch - - when a Github release is published, a new tag is added in on the repository and a release build is executed - - With Release build, the documentation for new release is published on `utplsql.github.io` and installation archives are added to the release. + - When a Github release is published, a new tag is added in on the repository and a release build is executed + - With Release action, the documentation for new release is published on `utplsql.github.io` and installation archives are added to the release. # Note: The utPLSQL installation files are uploaded by the release build process as release artifacts (separate `zip` and `tar.gz` files). From fc9382e27515762ca5a4cbfa747d54de47e2675c Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 19 Feb 2024 23:24:21 +0200 Subject: [PATCH 1083/1096] Fixed a flaky test when test runs in 0 seconds. --- test/ut3_user/api/test_ut_run.pkb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb index e80235744..f0cfd8373 100644 --- a/test/ut3_user/api/test_ut_run.pkb +++ b/test/ut3_user/api/test_ut_run.pkb @@ -742,7 +742,7 @@ Failures:% procedure remove_time_from_results(a_results in out nocopy ut3_develop.ut_varchar2_list) is begin for i in 1 .. a_results.count loop - a_results(i) := regexp_replace(a_results(i),'\[[0-9]*[\.,][0-9]+ sec\]',''); + a_results(i) := regexp_replace(a_results(i),'\[[0-9]*[\.,]?[0-9]+ sec\]',''); a_results(i) := regexp_replace(a_results(i),'Finished in [0-9]*[\.,][0-9]+ seconds',''); end loop; end; From 072dfbc1d0ed37f8da9c0ff87823906483ea3887 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 19 Feb 2024 21:41:43 +0000 Subject: [PATCH 1084/1096] Updated project version after build [skip ci] --- BUILD_NO | 2 +- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/BUILD_NO b/BUILD_NO index 9ae5f9c77..26de2ed80 100644 --- a/BUILD_NO +++ b/BUILD_NO @@ -1 +1 @@ -4194 \ No newline at end of file +4197 diff --git a/docs/about/authors.md b/docs/about/authors.md index 228cb8451..203d450d1 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index fc4dbea8b..28aea5fed 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index cb30adf37..8e6730847 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 452c69dab..0748fd479 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 01a850083..320784892 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) ## What is utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index df8c9d47d..34b4eddcc 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 72c70de2e..b3602ef10 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package. No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit. diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index d1448fa23..379024e73 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) The following are best practices we at utPLSQL have learned about PL/SQL and Unit Testing. diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index d3e7ef42e..24855cbb5 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. Code coverage is gathered for the following source types: diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index 43d67eb68..e2a8bc7da 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) utPLSQL is responsible for handling exceptions wherever they occur in the test run. The framework is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. The framework provides a full stacktrace for every exception that was thrown. The reported stacktrace does not include any utPLSQL library calls in it. diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index c4ddb4757..472c9654e 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) ## Expectation concepts diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 964ccbdcf..9c4d8813a 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 08bd036b0..c322639df 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) ## Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 77307bf7c..463bcef97 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) ## Obtaining information about suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index cd49d7c38..41468a3a5 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) utPLSQL provides several reporting formats. The sections below describe most of them. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 941a00e36..502bd49bd 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) utPLSQL framework provides two main entry points to run unit tests from within the database: diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 623bef999..cb49a0424 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4194--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 9bdf0c7a5..463aa1604 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.14.4194-develop'; + gc_version constant varchar2(50) := 'v3.1.14.4197-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 614a0e00bd0285c3a938de5cdf83a9c3aa547202 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Mon, 19 Feb 2024 23:47:32 +0200 Subject: [PATCH 1085/1096] Remove deprecated github actions and update releasing documentation. --- .github/workflows/build.yml | 4 ++-- .github/workflows/release.yml | 2 +- development/releasing.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 668f1e5a4..3d2f9a0a0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -88,7 +88,7 @@ jobs: --health-cmd healthcheck.sh steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: c-py/action-dotenv-to-setenv@v2 @@ -183,7 +183,7 @@ jobs: run: bash .github/scripts/validate_report_files.sh - name: Codecov - uses: codecov/codecov-action@v2 + uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos files: ./cobertura.xml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0e29bd5c1..1c4db5d59 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: c-py/action-dotenv-to-setenv@v2 diff --git a/development/releasing.md b/development/releasing.md index c1e49184d..ac2091632 100644 --- a/development/releasing.md +++ b/development/releasing.md @@ -6,7 +6,7 @@ To create a release follow the below steps - Create a **draft** of a Release with a new tag number `vX.Y.X` sourced from the `develop` branch on [github releases page](https://github.com/utPLSQL/utPLSQL/releases) - Populate release description using the `Generate release notes` button - Review the auto-generated release notes and update tem if needed - - Split the default `## What's Changed` list into `## New features`, `## Enhancements`, `## Bug fixes`. See previous release notes for details + - Optionally, split the default `## What's Changed` list into `## New features`, `## Enhancements`, `## Bug fixes`. See previous release notes for details ## Performing a release - Publish [the previously prepared](#release-preparation) release draft. From 5a42ce5ea71045b4cafa063ccc57781fa7ce09ae Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 19 Feb 2024 21:56:00 +0000 Subject: [PATCH 1086/1096] Updated project version after build [skip ci] --- BUILD_NO | 2 +- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/BUILD_NO b/BUILD_NO index 26de2ed80..8c8049510 100644 --- a/BUILD_NO +++ b/BUILD_NO @@ -1 +1 @@ -4197 +4198 diff --git a/docs/about/authors.md b/docs/about/authors.md index 203d450d1..541662a36 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index 28aea5fed..f07bdd4b4 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 8e6730847..0cd02e09e 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 0748fd479..195b194e3 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 320784892..8f1cc584e 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) ## What is utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 34b4eddcc..4068e2d09 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index b3602ef10..57cb29685 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package. No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit. diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index 379024e73..b016fdac0 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) The following are best practices we at utPLSQL have learned about PL/SQL and Unit Testing. diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index 24855cbb5..f48051ba5 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. Code coverage is gathered for the following source types: diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index e2a8bc7da..b580b7077 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) utPLSQL is responsible for handling exceptions wherever they occur in the test run. The framework is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. The framework provides a full stacktrace for every exception that was thrown. The reported stacktrace does not include any utPLSQL library calls in it. diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 472c9654e..19e77835a 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) ## Expectation concepts diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 9c4d8813a..1cf1f9d2f 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index c322639df..4fdd04af6 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) ## Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 463bcef97..2c6ae2d95 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) ## Obtaining information about suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 41468a3a5..8042fcd55 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) utPLSQL provides several reporting formats. The sections below describe most of them. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 502bd49bd..7f8f6d620 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) utPLSQL framework provides two main entry points to run unit tests from within the database: diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index cb49a0424..11410dd2b 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4197--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 463aa1604..36264fafc 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.14.4197-develop'; + gc_version constant varchar2(50) := 'v3.1.14.4198-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 42b923be7f4c46768c4f62eeb347b45590f11ad3 Mon Sep 17 00:00:00 2001 From: Jacek Gebal Date: Tue, 20 Feb 2024 00:39:24 +0200 Subject: [PATCH 1087/1096] Removed unneeded files from the release archives. --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitattributes b/.gitattributes index 5e0c801de..2cda5ad55 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6,6 +6,8 @@ test export-ignore .gitignore export-ignore .gitmodules export-ignore mkdocs.yml export-ignore +BUILD_NO export-ignore +mkdocs_offline.yml export-ignore sonar-project.properties export-ignore ^docs/** linguist-documentation *.pkb linguist-language=PLSQL From 629e6116887b1921f956ff6dd449ed9b9b1e29da Mon Sep 17 00:00:00 2001 From: bozo030 Date: Tue, 21 May 2024 11:59:34 +0200 Subject: [PATCH 1088/1096] Matcher shortcut syntax example fixed --- docs/userguide/expectations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index 19e77835a..ec24b570c 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -52,7 +52,7 @@ Shortcut syntax, where matcher is directly part of expectation: ut.expect( a_actual ).not_to_{matcher}; --example - ut.expect( 1 ).to_( be_null() ); + ut.expect( 1 ).to_be_null(); ``` When using shortcut syntax you don't need to surround matcher with brackets. Shortcut syntax is provided for convenience. From 3f4dc81ccaa2625b8da111e446105d6d51ef32de Mon Sep 17 00:00:00 2001 From: Samuel Nitsche Date: Tue, 17 Sep 2024 22:58:03 +0200 Subject: [PATCH 1089/1096] Update build.yml to use actions/upload-artifact@v4 as described in https://github.blog/news-insights/product-news/get-started-with-v4-of-github-actions-artifacts/ --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3d2f9a0a0..af2e4875d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -172,7 +172,7 @@ jobs: - name: Upload ORACLE_BASE/diag data Artifact id: upload if: ${{ always() && steps.run-tests.outcome == 'failure' }} - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: my-artifact$-${{matrix.db_version_name}} path: ${{github.workspace}}/database-diag From ca88e498e8e374776f76a5f63d136f2609c6c60c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Wed, 23 Oct 2024 00:30:02 +0300 Subject: [PATCH 1090/1096] Update test_realtime_reporter.pkb Fixing failing test for 23ai --- test/ut3_user/reporters/test_realtime_reporter.pkb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ut3_user/reporters/test_realtime_reporter.pkb b/test/ut3_user/reporters/test_realtime_reporter.pkb index 2dafa71d0..84053c3c9 100644 --- a/test/ut3_user/reporters/test_realtime_reporter.pkb +++ b/test/ut3_user/reporters/test_realtime_reporter.pkb @@ -408,7 +408,7 @@ create or replace package body test_realtime_reporter as from table(g_events) t where t.event_doc.extract('/event[@type="post-test"]/test/@id').getstringval() = 'realtime_reporting.check_realtime_reporting3.test_6_with_runtime_error'; - ut3_tester_helper.main_helper.append_to_list(l_expected_list, ''); l_expected := ut3_tester_helper.main_helper.table_to_clob(l_expected_list); From 5241c43e2b25d718a8ecc3e5c26820af852310ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20G=C4=99bal?= Date: Wed, 23 Oct 2024 00:38:54 +0300 Subject: [PATCH 1091/1096] Update test_documentation_reporter.pkb Fixed failing unit test --- test/ut3_user/reporters/test_documentation_reporter.pkb | 1 - 1 file changed, 1 deletion(-) diff --git a/test/ut3_user/reporters/test_documentation_reporter.pkb b/test/ut3_user/reporters/test_documentation_reporter.pkb index 2a05679ff..016cec256 100644 --- a/test/ut3_user/reporters/test_documentation_reporter.pkb +++ b/test/ut3_user/reporters/test_documentation_reporter.pkb @@ -34,7 +34,6 @@ Failures: "Fails as values are different" Actual: 'number [1] ' (varchar2) was expected to equal: 'number [2] ' (varchar2)% at "UT3_USER.TEST_REPORTERS%", line 36 ut3_develop.ut.expect('number [1] ','Fails as values are different').to_equal('number [2] '); -% % 2) erroring_test ORA-06502: PL/SQL: %: character to number conversion error From 1819ca766160a4b6c82090b7304512b68d08b063 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 22 Oct 2024 22:47:42 +0100 Subject: [PATCH 1092/1096] Updated project version after build [skip ci] --- BUILD_NO | 2 +- docs/about/authors.md | 2 +- docs/about/license.md | 2 +- docs/about/project-details.md | 2 +- docs/about/support.md | 2 +- docs/index.md | 2 +- docs/userguide/advanced_data_comparison.md | 2 +- docs/userguide/annotations.md | 2 +- docs/userguide/best-practices.md | 2 +- docs/userguide/coverage.md | 2 +- docs/userguide/exception-reporting.md | 2 +- docs/userguide/expectations.md | 2 +- docs/userguide/getting-started.md | 2 +- docs/userguide/install.md | 2 +- docs/userguide/querying_suites.md | 2 +- docs/userguide/reporters.md | 2 +- docs/userguide/running-unit-tests.md | 2 +- docs/userguide/upgrade.md | 2 +- source/core/ut_utils.pks | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/BUILD_NO b/BUILD_NO index 8c8049510..fab85b21d 100644 --- a/BUILD_NO +++ b/BUILD_NO @@ -1 +1 @@ -4198 +4206 diff --git a/docs/about/authors.md b/docs/about/authors.md index 541662a36..499398993 100644 --- a/docs/about/authors.md +++ b/docs/about/authors.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4206--develop-blue.svg) ### utPLSQL v3 Major Contributors diff --git a/docs/about/license.md b/docs/about/license.md index f07bdd4b4..03cc286eb 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4206--develop-blue.svg) # Version Information diff --git a/docs/about/project-details.md b/docs/about/project-details.md index 0cd02e09e..5579a943b 100644 --- a/docs/about/project-details.md +++ b/docs/about/project-details.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4206--develop-blue.svg) # utPLSQL Project Details diff --git a/docs/about/support.md b/docs/about/support.md index 195b194e3..6d68864bd 100644 --- a/docs/about/support.md +++ b/docs/about/support.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4206--develop-blue.svg) # How to get support diff --git a/docs/index.md b/docs/index.md index 8f1cc584e..b277c9d16 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4206--develop-blue.svg) ## What is utPLSQL diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md index 4068e2d09..45fca1871 100644 --- a/docs/userguide/advanced_data_comparison.md +++ b/docs/userguide/advanced_data_comparison.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4206--develop-blue.svg) # Advanced data comparison diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md index 57cb29685..31a91cac2 100644 --- a/docs/userguide/annotations.md +++ b/docs/userguide/annotations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4206--develop-blue.svg) Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package. No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit. diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md index b016fdac0..6becefc5c 100644 --- a/docs/userguide/best-practices.md +++ b/docs/userguide/best-practices.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4206--develop-blue.svg) The following are best practices we at utPLSQL have learned about PL/SQL and Unit Testing. diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index f48051ba5..c9015b438 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4206--develop-blue.svg) utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database. Code coverage is gathered for the following source types: diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md index b580b7077..824aaecd5 100644 --- a/docs/userguide/exception-reporting.md +++ b/docs/userguide/exception-reporting.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4206--develop-blue.svg) utPLSQL is responsible for handling exceptions wherever they occur in the test run. The framework is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception. The framework provides a full stacktrace for every exception that was thrown. The reported stacktrace does not include any utPLSQL library calls in it. diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md index ec24b570c..54c204d58 100644 --- a/docs/userguide/expectations.md +++ b/docs/userguide/expectations.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4206--develop-blue.svg) ## Expectation concepts diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md index 1cf1f9d2f..1ff54a7d6 100644 --- a/docs/userguide/getting-started.md +++ b/docs/userguide/getting-started.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4206--develop-blue.svg) # Getting started with TDD and utPLSQL diff --git a/docs/userguide/install.md b/docs/userguide/install.md index 4fdd04af6..9d8167739 100644 --- a/docs/userguide/install.md +++ b/docs/userguide/install.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4206--develop-blue.svg) ## Supported database versions diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md index 2c6ae2d95..24159fede 100644 --- a/docs/userguide/querying_suites.md +++ b/docs/userguide/querying_suites.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4206--develop-blue.svg) ## Obtaining information about suites diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 8042fcd55..9b1a7e75b 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4206--develop-blue.svg) utPLSQL provides several reporting formats. The sections below describe most of them. diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md index 7f8f6d620..375a05125 100644 --- a/docs/userguide/running-unit-tests.md +++ b/docs/userguide/running-unit-tests.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4206--develop-blue.svg) utPLSQL framework provides two main entry points to run unit tests from within the database: diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md index 11410dd2b..6fdaa6a48 100644 --- a/docs/userguide/upgrade.md +++ b/docs/userguide/upgrade.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-v3.1.14.4198--develop-blue.svg) +![version](https://img.shields.io/badge/version-v3.1.14.4206--develop-blue.svg) # Upgrading from version 2 diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks index 36264fafc..0e1e0a851 100644 --- a/source/core/ut_utils.pks +++ b/source/core/ut_utils.pks @@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is * */ - gc_version constant varchar2(50) := 'v3.1.14.4198-develop'; + gc_version constant varchar2(50) := 'v3.1.14.4206-develop'; subtype t_executable_type is varchar2(30); gc_before_all constant t_executable_type := 'beforeall'; From 808fcdfc31c17dac2fedc41a440f55d7f7bd9bbe Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sat, 29 Mar 2025 16:43:12 +0000 Subject: [PATCH 1093/1096] Update documentation for customer reporter --- docs/userguide/reporters.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md index 9b1a7e75b..24d1065fe 100644 --- a/docs/userguide/reporters.md +++ b/docs/userguide/reporters.md @@ -175,6 +175,16 @@ If you need to produce a colored text output from the custom reporter, then you It is recommended to create the reporter type in the schema where utPLSQL is installed (by default it is the `UT3` schema). Note that before running the utPLSQL uninstall scripts, all custom reporters should be dropped (cf. [the installation documentation](install.md)). In particular, when upgrading to a newer version of utPLSQL, one has to drop the custom reporters and recreate them after the upgrade. +!!! note + Please make sure that grants have been added and synonyms created for the custom reporter in order for reporter to be accessible the same way as other reporters. + Assuming that reporter with name `customer_reporter` was created in schema `UT3` +```sql + grant execute on ut3.custom_reporter to public; + create or replace public synonym custom_reporter for ut3.custom_reporter; +``` + + + !!! note It is possible, but cumbersome, to use another schema for storing the custom reporters. This requires to create a synonym for the base reporter type in the schema that is going to own the custom reporter, and to provide appropriate grants both to the owner of the custom reporter and to the user running the reporter. After upgrading or reinstalling utPLSQL, the extra privileges need to be recreated. This approach is not recommended. From 39ff2ed0090a22fe680f5de38a2aa87f31b95226 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Wed, 2 Apr 2025 20:41:46 +0100 Subject: [PATCH 1094/1096] Adding tests for issue 1293 --- .../expectations/test_expectations_cursor.pkb | 42 +++++++++++++++++++ .../expectations/test_expectations_cursor.pks | 6 +++ 2 files changed, 48 insertions(+) diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index 847cce9a0..867a5f3db 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -2950,5 +2950,47 @@ Rows: [ 2 differences ] ); end; + procedure cursor_joinby_compare_issue_1293 is + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + --Arrange + open l_expected for + select 'FOO' username, 12 from dual union all + select 'TEST' username, -600 user_id from dual + order by 1 desc; + open l_actual for + select 'FOO' username, 12 from dual union all + select 'TEST' username, -600 user_id from dual union all + -- DUPLICATE!!! + select 'TEST' username, -600 user_id from dual + order by 1 asc; + --Act + ut3_develop.ut.expect(l_actual).to_equal(l_expected).join_by('USERNAME'); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + + procedure cursor_not_joinby_compare_issue_1293 is + l_actual sys_refcursor; + l_expected sys_refcursor; + begin + --Arrange + open l_expected for + select 'FOO' username, 12 from dual union all + select 'TEST' username, -600 user_id from dual + order by 1 desc; + open l_actual for + select 'FOO' username, 12 from dual union all + select 'TEST' username, -600 user_id from dual union all + -- DUPLICATE!!! + select 'TEST' username, -600 user_id from dual + order by 1 asc; + --Act + ut3_develop.ut.expect(l_actual).to_equal(l_expected); + --Assert + ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); + end; + end; / diff --git a/test/ut3_user/expectations/test_expectations_cursor.pks b/test/ut3_user/expectations/test_expectations_cursor.pks index 0f34486a9..53f754322 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pks +++ b/test/ut3_user/expectations/test_expectations_cursor.pks @@ -485,5 +485,11 @@ create or replace package test_expectations_cursor is --%test( Multiple failures reported correctly - Issue #998 ) procedure multiple_cursor_expectations; + --%test( Compares cursors with duplicate rows using join by - Issue #1293 ) + procedure cursor_joinby_compare_issue_1293; + + --%test( Compares cursors with duplicate rows - Issue #1293 ) + procedure cursor_not_joinby_compare_issue_1293; + end; / From 85734ffec7f57efff073d833ee2d43de1a9ad0f2 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Thu, 3 Apr 2025 18:38:33 +0100 Subject: [PATCH 1095/1096] For a join by key we need to also compare by duplicate numbers to make sure that we have same amount of rows when rows are identical but row counts is different. --- source/expectations/data_values/ut_compound_data_helper.pkb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 4517cd43c..875ec760a 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -300,8 +300,8 @@ create or replace package body ut_compound_data_helper is ut_utils.append_to_clob(a_partition_stmt,' row_number() over (partition by '||l_partition_tmp||' order by '||l_partition_tmp||' ) '); if a_pk_table.count > 0 then - -- If key defined do the join or these and where on diffrences - a_join_by_stmt := ut_utils.table_to_clob(l_join_by_list, ' and '); + -- If key defined do the join or these and where on diffrences as well as on duplicate number when rows are same. + a_join_by_stmt := ' e."UT3$_Dup#No" = a."UT3$_Dup#No" and '||ut_utils.table_to_clob(l_join_by_list, ' and '); elsif a_unordered then -- If no key defined do the join on all columns a_join_by_stmt := ' e."UT3$_Dup#No" = a."UT3$_Dup#No" and '||ut_utils.table_to_clob(l_equal_list, ' and '); From 6f273df2752c7a0665debbc9532886ea01f8ff5a Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Thu, 3 Apr 2025 19:49:58 +0100 Subject: [PATCH 1096/1096] Change procedure nameto be less 30 to work for 11 and 12 --- test/ut3_user/expectations/test_expectations_cursor.pkb | 4 ++-- test/ut3_user/expectations/test_expectations_cursor.pks | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb index 867a5f3db..a4ef4e8f2 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pkb +++ b/test/ut3_user/expectations/test_expectations_cursor.pkb @@ -2950,7 +2950,7 @@ Rows: [ 2 differences ] ); end; - procedure cursor_joinby_compare_issue_1293 is + procedure cr_joinby_compare_issue_1293 is l_actual sys_refcursor; l_expected sys_refcursor; begin @@ -2971,7 +2971,7 @@ Rows: [ 2 differences ] ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_be_greater_than(0); end; - procedure cursor_not_joinby_compare_issue_1293 is + procedure cr_not_joinby_comp_issue_1293 is l_actual sys_refcursor; l_expected sys_refcursor; begin diff --git a/test/ut3_user/expectations/test_expectations_cursor.pks b/test/ut3_user/expectations/test_expectations_cursor.pks index 53f754322..8cceb5e01 100644 --- a/test/ut3_user/expectations/test_expectations_cursor.pks +++ b/test/ut3_user/expectations/test_expectations_cursor.pks @@ -486,10 +486,10 @@ create or replace package test_expectations_cursor is procedure multiple_cursor_expectations; --%test( Compares cursors with duplicate rows using join by - Issue #1293 ) - procedure cursor_joinby_compare_issue_1293; + procedure cr_joinby_compare_issue_1293; --%test( Compares cursors with duplicate rows - Issue #1293 ) - procedure cursor_not_joinby_compare_issue_1293; + procedure cr_not_joinby_comp_issue_1293; end; /